gentoo resync : 03.11.2017

4 files changed, 30 insertions, 21 deletions

diff --git a/app-emulation/containerd/Manifest b/app-emulation/containerd/Manifest
index 0bffcf5c88b2..b67aa75a9c62 100644
--- a/app-emulation/containerd/Manifest
+++ b/app-emulation/containerd/Manifest
@@ -1,11 +1,11 @@
 DIST containerd-0.2.5_p20170308.tar.gz 1021631 SHA256 d08d3d0758b76f7de0e8f503b74e1562d8c0a1014cb4baf4cd34e246751cec4c SHA512 8b00862a7b54490a8342bcc0eddaa7e8c86d1e05c02f5173b9f4a08321425f8d75d1fb0665e86bc79249294354977693c21d6a4d8405866ff8058da9772e2ecc WHIRLPOOL ed658d10f927fff4d9591930bdf855fc0ed259ca538d4361ce3cffcc5943dcfe39121242f1c9ef950897761016a8450b3a2117c0be0b8b0ebffeab330fe30b5d
-DIST containerd-0.2.9.tar.gz 1228977 SHA256 2360fec91d40e4e93757f964f07c74e35b6bfe838252b1cc814a176e1cd1c604 SHA512 6f0de476668e6b86a0cd5e1ea0f6dac24e0e68fe2dd52b8915dbafa5ffab137a5eea866c216f8184ffa6e4750c7b69bce3d46552e8be283a15ce676ea4356fc8 WHIRLPOOL b9fdd57af3cf39e6a5efdd67f0302ad38d6634d20aa3eb45431d2900f5fbb7dc62d624b07a5028bbb09ae763e07103e37703cf52f3e14e7af72fc2198d9c7876
 DIST containerd-0.2.9_p20170605.tar.gz 1229549 SHA256 c506121c49e3bfea27018aa77e09e4734067f84ae85b6ef75ec31b488a91ae54 SHA512 900cf9c251c4de0f9848fb5bf26537226c1361d1a64a0fba853bda3805cb141fc2a849442fe885f0ee228b3e3a7018440af18898b484a54a7b75b4a86538aaa9 WHIRLPOOL 880f19a994f623b7cd8c3f771b5c56468681de349ae4196e60ffcb5a34d42ef423d8eefc82c07134c9e50c33bc0ecbfc1a9e47c3df987050d8dcb82da0178d80
 DIST containerd-0.2.9_p20170917.tar.gz 1140788 SHA256 4d2b6e30bcc6c4bb901d6b9f19b5ac1d4a2d9b17075a9b1f110102920d01f64a SHA512 c749bda691197ec8a7603db9ad92f2800a3f065143430a660333b7862518deb4c158a1c1fd01671dff438b40988d4a64d8f06bab05496b8728c6e2f57cd7da0a WHIRLPOOL 75cb3467a94af50bef52377f309d7c85386475789fab3d2758679f022b516735728a1ac2c54307954a14100c4f84059d8fd5e8376270fdd69e572cff43453fa0
+DIST containerd-1.0.0_beta2.tar.gz 3681494 SHA256 3130384a814bc0a43fe3b76e2bbb2db2372fdc96490b76f8b278362ebc0d3fb1 SHA512 cecb4d2e0dccbc27c1e59f3e49f8fd5b08445988e49aa4b8a2a5910851509d51e001b5295905288c29fee2d91eadf2180a6b86947e130abe1b33a9a01416a286 WHIRLPOOL 4d526904a146971d57adbde6102e4fe42e0d303b102e721e34aaea3f54ef3176586dedf31a347f52d95a6e5c1850454b31ab3e5c6195b868929d32fde6218eb3
 EBUILD containerd-0.2.5_p20170308.ebuild 971 SHA256 357c0c0c8399ca40b0222d95cd467b595a0877fdf694429329d8a9f299b6e5e9 SHA512 f519a8755010a178a1c96e266e86d4b2177d1d60498f68d51394bb4546fd33d4ac281480d0daf43a8adc0784e5057e8789f05aa77ed28e79197e7b2483671ab7 WHIRLPOOL 95af6f5c16e68ebebebad4d494d1bd9844d38a9073c0ecd522684c30fb6a06ad6b0417837cb6c053e9dbd137c56155e4955ab5e7575fe63dc92564bc93dc7016
-EBUILD containerd-0.2.9.ebuild 1001 SHA256 c07047e6f19d55893171c223d44ddad4f0b1649e23da7af67b1a0d6281cb7b4e SHA512 57492b30f3852cfc235212de64b6efba8e2785cbdeb0acdf6fac9cbac653532693e5472f765a5f41dca9e8af0e3ed1f847e18c2e48dc745e355d0df01b60a5ad WHIRLPOOL a024ef762464c97cd51553418006f55fe78dfcfce1956f59aeacb9432a4265095c581883b36baeb6962ab5a6ed56e11e8c2a2345388b3c88257ef4320e100617
-EBUILD containerd-0.2.9_p20170605.ebuild 1001 SHA256 76cc9d2eba27a3a48c6d7d96804496f122f6bb46228f281e07ad9cf617c89287 SHA512 8c562f29fe227fc9f9f26b5fcf17f553a48c65a2413fb971d5f4ec7945659a86f74ed59062832c0dd80cc81f7ccda901f568bd39743f64e3000946111348a38c WHIRLPOOL 60af398e7c692f14e1d8b0c7a14c11a53548ec88ee599fd8fa7199c042c2e1fdb92c9166f7fa8a606e28d34ab009ff9fea08582f55e6fbf823b7580b9dd64ef3
+EBUILD containerd-0.2.9_p20170605.ebuild 1000 SHA256 d8b66bb902a1e5ca6c58efc0c1b534832457bda08825f55ae6c177458761c9c8 SHA512 adec8a0e7d4d2e4dc200d470c1cbd2dbd38daf2ae2b931c9d32f5cd1b7c580cc1222c628c2e9b22fb64098c800c956a636e6167d6c7a6f391ec280b77a438a04 WHIRLPOOL 744713fcdd4726983c9cd4c1959446d9631d523e62aa28ee47b5ca679609d59701bc0f7c122c58e65325fa24917e68752e882ee4d9a0998328e88b717920070f
 EBUILD containerd-0.2.9_p20170917.ebuild 1001 SHA256 e05ed2f3fabbd8d0466506292b0a75e607ca3de9d3e799681eee9754ad5e1313 SHA512 d206822a85e56f2226b1099b98605800bb3f1aad7aac1846ece87c75b740e6e6aacee0def14925c96ea8ff86cf21622e5821e6112a39ea75edef1dfbeaf71b1f WHIRLPOOL 0eff2136f756f39b09dd1205052d3e6f5efa6d9f6dd5fc2ce8eef8e8b539946cab211812b6682275a79bbbb31a32c63a203cdeb62381ad309c39336512170c97
-EBUILD containerd-9999.ebuild 929 SHA256 46f91c0f86a04a209d291f588ddd8e04e3106f35366e943caea68ad9d2d5eec6 SHA512 c6a3cf6625ed2b919f1486b285a2a15de6b7457cee2acc7278210accb5548aa98e0de7e7729b27f10789e2ae4862445322f920c46b2d29ae7bcd213960b92979 WHIRLPOOL d88d73cfc2b479a36051448dd19dbfb9af7fcb8c95640858593d2fc786bd8a669842f4303a9ed01210fd8deba5e75a73507b947a05e2db2a77a6313e4fe67a9a
+EBUILD containerd-1.0.0_beta2.ebuild 1228 SHA256 036490a9b30c448eb8912f7eb1e2630dc21b7751e31fdab757d7a9424eba7c36 SHA512 77a154a7a0d4f10e247e9f2b4a1f3c0b44f7cfad18c59f86afe25e77fccd3686a1e96d34603aae24889ad422037aa7cda8c80822f7168544bd2af0b6e828e9ed WHIRLPOOL 9a3162aec6cdac742c3aeabda449ad0934a1ff7dc8aa3a45fa8cbac252595081dd809c4712dacf389653ff47bf7eb3be27d918a6f48fad18c4ba320a437f480f
+EBUILD containerd-9999.ebuild 965 SHA256 b7e8d103eb3c8439cab6cbc0eeb7a0766a4611eb2f1dad0b68f7f299aa5fc912 SHA512 b2acd6bd1c237a1058cec02875877d82e2e8c568bf3143cca020c64e13a0649975e3adcdb68540216e8ce1bcdbc7141eda8476c1c01ee2ca313120eca2850012 WHIRLPOOL 6ea886f31c397d58103e7f7892826dbabe71e3c3318d81cb71c79f17a035ac3e52a68a71a3ba42ccab251d3ca9442101eabdf776a21146d89eef985a2ac790f1
 MISC ChangeLog 3648 SHA256 23d267d9839cf9ddd25ec70935aa9cb0d751f1e1fec5fe04b0ab363ac5305df4 SHA512 6692f12dbd09bdfa0f7aef7a9d96e31679f2f8c0ea83c0ee265cf84557ad3cf644410c7372142206509925ac99e500adc9b73390d7868c1a014e76a2fdfc8b9d WHIRLPOOL 7cced3a814774acce4c1afe07e5522845f70f084aeb9975dba4351e357b653b1559267e17b4561029a39c014e149ecbad2501e0ed094ad361414794df9dc7d94
 MISC metadata.xml 909 SHA256 649d7ed77a830933c54e829d88186959f369abb5575e6b5c51f76496da04e95e SHA512 bc18fe0db42a7d9eccc8757f18a92ab3c46f1941f0cc28e0ed4c7be2569b7cec64e1ef49bbddbaab2afea5925f67bb4f6a06f4d1015e29e73c9742f475731d03 WHIRLPOOL 52e6bdcbefc6b473da57e3920fc67d0d593e0028e87f9d4497bc095416ff630671634ef089d62f153e9cfd25c1efb702968fa3d4ef04e4c7f21bf776b2c40c00
diff --git a/app-emulation/containerd/containerd-0.2.9_p20170605.ebuild b/app-emulation/containerd/containerd-0.2.9_p20170605.ebuild
index 70e979be3fa9..e574004b67ee 100644
--- a/app-emulation/containerd/containerd-0.2.9_p20170605.ebuild
+++ b/app-emulation/containerd/containerd-0.2.9_p20170605.ebuild
@@ -12,7 +12,7 @@ else
 	MY_PV="${PV/_/-}"
 	EGIT_COMMIT="6e23458c129b551d5c9871e5174f6b1b7f6d1170"
 	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/containerd/containerd-0.2.9.ebuild b/app-emulation/containerd/containerd-1.0.0_beta2.ebuild
index 3849a49ca7a0..a9b3d5c5ae5a 100644
--- a/app-emulation/containerd/containerd-0.2.9.ebuild
+++ b/app-emulation/containerd/containerd-1.0.0_beta2.ebuild
@@ -2,15 +2,16 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-EGO_PN="github.com/${PN}/${PN}"
+EGO_PN="github.com/containerd/${PN}"
 
 inherit toolchain-funcs
 
 if [[ ${PV} == *9999 ]]; then
 	inherit golang-vcs
 else
-	MY_PV="${PV/_/-}"
-	EGIT_COMMIT="cfb82a876ecc11b5ca0977d1733adbe58599088a"
+	MY_PV="${PV/_beta/-beta.}"
+	EGIT_COMMIT="v${MY_PV}"
+	CONTAINERD_COMMIT="a543c93"
 	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~ppc64"
 	inherit golang-vcs-snapshot
@@ -23,20 +24,28 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="hardened +seccomp"
 
-DEPEND=""
-RDEPEND=">=app-emulation/docker-runc-1.0.0_rc3_p20170607
+DEPEND="sys-fs/btrfs-progs"
+RDEPEND="|| ( >=app-emulation/docker-runc-1.0.0_rc4
+	>=app-emulation/runc-1.0.0_rc4 )
 	seccomp? ( sys-libs/libseccomp )"
 
 S=${WORKDIR}/${P}/src/${EGO_PN}
 
-RESTRICT="test"
+src_prepare() {
+	default
+	if [[ ${PV} != *9999* ]]; then
+		sed -i -e "s/git describe --match.*$/echo ${PV})/"\
+			-e "s/git rev-parse HEAD.*$/echo $CONTAINERD_COMMIT)/"\
+			Makefile || die
+	fi
+}
 
 src_compile() {
-	local options=( $(usex seccomp "seccomp" '') )
+	local options=( $(usex seccomp "seccomp" "") )
 	export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor
-	LDFLAGS=$(usex hardened '-extldflags -fno-PIC' '') emake GIT_COMMIT="$EGIT_COMMIT" BUILDTAGS="${options[@]}"
+	LDFLAGS=$(usex hardened '-extldflags -fno-PIC' '') emake BUILDTAGS="${options[@]}"
 }
 
 src_install() {
-	dobin bin/containerd* bin/ctr
+	dobin bin/containerd{-shim,-stress,} bin/ctr
 }
diff --git a/app-emulation/containerd/containerd-9999.ebuild b/app-emulation/containerd/containerd-9999.ebuild
index 42467124d22e..345b3fa9b966 100644
--- a/app-emulation/containerd/containerd-9999.ebuild
+++ b/app-emulation/containerd/containerd-9999.ebuild
@@ -1,18 +1,18 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-EGO_PN="github.com/docker/${PN}"
+EGO_PN="github.com/containerd/${PN}"
 
 inherit toolchain-funcs
 
 if [[ ${PV} == *9999 ]]; then
 	inherit golang-vcs
 else
-	MY_PV="${PV/_/-}"
+	MY_PV="${PV/_beta/-beta.}"
 	EGIT_COMMIT="v${MY_PV}"
 	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64"
+	KEYWORDS="~amd64 ~arm ~ppc64"
 	inherit golang-vcs-snapshot
 fi
 
@@ -24,17 +24,17 @@ SLOT="0"
 IUSE="hardened +seccomp"
 
 DEPEND=""
-RDEPEND=">=app-emulation/runc-1.0.0_rc2
+RDEPEND=">=app-emulation/runc-1.0.0_rc4
 	seccomp? ( sys-libs/libseccomp )"
 
 S=${WORKDIR}/${P}/src/${EGO_PN}
 
 src_compile() {
-	local options=( $(usex seccomp "seccomp") )
+	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
+	dobin bin/containerd{-shim,-stress,} bin/ctr
 }