gentoo resync : 02.04.2018

15 files changed, 383 insertions, 589 deletions

diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 7d20cf4a3b13..8ec5fa52ea3d 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/docker-compose/Manifest b/app-emulation/docker-compose/Manifest
index 5f5ddc817efb..84ef23e051d6 100644
--- a/app-emulation/docker-compose/Manifest
+++ b/app-emulation/docker-compose/Manifest
@@ -1,5 +1,7 @@
 DIST docker-compose-1.18.0.tar.gz 231256 BLAKE2B be9b57dd89a81734b850f61622a924a3ace5ace907c4d1365a18315ddfbe3f1a9a56b222766980d16d5eddbe6818caf94a5833c5cddac082fa230bf290977ee3 SHA512 9cf29d892f6419e9ef639e1b9edddecb47ddb5ba7f97830f732e463ee510ac5464d6d81f58a2bf4ae5e7aee78b3d2d4afd59e6e1b53974899edb3e090bcb991f
 DIST docker-compose-1.19.0.tar.gz 238307 BLAKE2B 2a7bbcf50c2cc591eba1d59db30cb0341e33e3f1ebe948e0b6762d9bffcdcc72d98e2da19fc549c5fabda192fca69a9d54e016601ddb4f4a94f0dc1c93f99a29 SHA512 f1d522621580a5130378508e6b15ad2e4708e9c5ff713627ca54308ab3e6bf000e21c55bbdf9585b2116e73648fdc773500a5415ab81a72dd2c69c9c07e71581
+DIST docker-compose-1.20.1.tar.gz 246159 BLAKE2B 32836f06239d6f1506ecebac48c8b56c58620d0ba309b8469c073ec3b048bf3743afb1ff6f63d2031df4bb316191d9cd32d5cf85a2cb86544254c6054a7dd502 SHA512 faba24ea501c4e4aaf04bddf1d498eaa7702385458ac7a41f6054e9153f9e03e1e6f50aebc5156d6a814d567aedea1d16ff532872a1765bbabbd3c8da47e36e0
 EBUILD docker-compose-1.18.0.ebuild 2421 BLAKE2B 070e116b0354b3965202ea93698a8846c032b774b2a16154d1be5ced36e963780675cad11fdb43b01baf6997b35b85b87907f32fc56ee5daa1191c1c7265eca0 SHA512 988e42951a910fbd70f9605483240ee7fca1c003adde6b1cb7aeb21cd70ef074b5a919db8bd4a8bd89c6dd158041ece024fcc8dc46e1e2c5d69e1de56d27acc7
 EBUILD docker-compose-1.19.0.ebuild 2422 BLAKE2B e1ae8b4b44640361fdc8fca0cdda1ce95340b3cfa564b2d6cf3e0785bf65057ea53e14b773204d1d7c93c142394b3800e78364eaa6cd0ce9372d24135ab73bff SHA512 1b283b87382f6cd0402dfdc4c97cbb16e1c2eb7da645b50bdcadd048054c769ddcf742b7067b686ab1d8288256e713f277d1e97b32c27821bd3c9ce507e4b7ee
+EBUILD docker-compose-1.20.1.ebuild 2422 BLAKE2B 5f465712c50acb6a47baa4ed2c306a418084f3bd761d5f48e085587610769c15b2c61190693c7ac9e50bef6e3aff7a1cbbfc0311c6090fe50992fc4cb7922a82 SHA512 f6a848ea0ea2cb4ef7d9c1715d6d2b4e4f9fe81af1ea79d3f151d00b00b9d3166f55720257c75138d9f80ea27e6a35fa49c6f26e09461c7c5861fcb2d1f9c52c
 MISC metadata.xml 322 BLAKE2B 4d738cf090acd0f720b7805c8dd1a2288a1779dcf4af21ab5aeb4cf81b609d0bd2a18cbe79c165f9c9e60b993a8b864e1e5c61cfa773c57b08aef468d93a0391 SHA512 6ecf808eb20a0f475101524b1f4b29db49d4fce9bc3408b3e806e225e4de7b5f0c7af019809c329969f25dd050ba164a09effccefea0d2ada8e8bcf9790d39f2
diff --git a/app-emulation/docker-compose/docker-compose-1.20.1.ebuild b/app-emulation/docker-compose/docker-compose-1.20.1.ebuild
new file mode 100644
index 000000000000..9e085b82c016
--- /dev/null
+++ b/app-emulation/docker-compose/docker-compose-1.20.1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit bash-completion-r1 distutils-r1 vcs-snapshot
+
+MY_PV=${PV/_/}
+
+DESCRIPTION="Multi-container orchestration for Docker"
+HOMEPAGE="https://www.docker.com/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${PN}-${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+CDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/cached-property-1.2.0[${PYTHON_USEDEP}]
+	<dev-python/cached-property-2[${PYTHON_USEDEP}]
+	>=dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}]
+	<dev-python/dockerpty-0.5[${PYTHON_USEDEP}]
+	>=dev-python/docker-py-3.1.4[${PYTHON_USEDEP}]
+	<dev-python/docker-py-4.0[${PYTHON_USEDEP}]
+	>=dev-python/docopt-0.6.1[${PYTHON_USEDEP}]
+	<dev-python/docopt-0.7[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.5.1[${PYTHON_USEDEP}]
+	<dev-python/jsonschema-3[${PYTHON_USEDEP}]
+	>=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}]
+	!~dev-python/PySocks-1.5.7[${PYTHON_USEDEP}]
+	<dev-python/PySocks-2[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
+	<dev-python/pyyaml-4[${PYTHON_USEDEP}]
+	!~dev-python/requests-2.11.0[${PYTHON_USEDEP}]
+	<dev-python/requests-2.19[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.6.1[${PYTHON_USEDEP}]
+	>=dev-python/six-1.3.0[${PYTHON_USEDEP}]
+	<dev-python/six-2[${PYTHON_USEDEP}]
+	>=dev-python/texttable-0.9[${PYTHON_USEDEP}]
+	<dev-python/texttable-0.10[${PYTHON_USEDEP}]
+	>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
+	<dev-python/websocket-client-1.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '>=dev-python/enum34-1.0.4[${PYTHON_USEDEP}]' 'python2_7' )
+	$(python_gen_cond_dep '<dev-python/enum34-2[${PYTHON_USEDEP}]' 'python2_7' )
+	$(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 'python2_7' )
+	$(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' )
+"
+DEPEND="
+	${CDEPEND}
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]' 'python2_7' )
+	)
+"
+RDEPEND="${CDEPEND}"
+
+python_test() {
+	${PYTHON} -m pytest tests/unit || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	newbashcomp contrib/completion/bash/docker-compose ${PN}
+
+	insinto /usr/share/zsh/site-functions
+	doins contrib/completion/zsh/*
+
+	distutils-r1_python_install_all
+}
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index e0d400e36636..e48327a0dec0 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -14,7 +14,7 @@ AUX libvirtd.tmpfiles.conf 36 BLAKE2B fa0e1dac4117dcb2a2e826c82c4c63e20156db47ab
 AUX virtlockd.init-r1 570 BLAKE2B 734d582d867b79649f863504fcd7c87fe3c59569b56b0996a6229d6eebadc9d4c356c10bbcf5637483fbc930d0c50233da4fffa357d423029b3828b7a3be56de SHA512 65a05d406200da9a534df5caa1b9cb2af97f0b03f64e6b4157322975fa754f59ae74fff9ec8301a6c0510e4b75e2b72a78cddf004a76109e18c375e83527cee5
 AUX virtlogd.init-r1 569 BLAKE2B 20df60c23cee575577592d41d1a9913923255633d12de789c036e6085f9e7b4360e017155c61e3688332b493a0e96ffca55753bcc67a33bb877539b80eef81fe SHA512 0a3e083e742f9e0d8206ab9a48c63bbd395bdc24e5551e2cbeddffa3fb576a817b73dbafe646c392a35c354d6b65426a9b6f3ce3dcafc30077715e90684968c1
 DIST libvirt-4.1.0.tar.xz 15046956 BLAKE2B e5d4fb47d6308b2f74d464b8a4b236fcda96ca71357847ce7bc9c787e89111ed99538e9f7815287d14af24db1bc774012682843edc1e067cdf710e82d0b349c9 SHA512 62d1a228adf3270cc6defe3cbf92dac8c4ce2c434c4d97219571ccef799a4f6304cfd1ba9938338356641285f53ac71145d7b398523021c5ea1dc8e3d49cf894
-EBUILD libvirt-4.1.0-r3.ebuild 9685 BLAKE2B eb830bf532808d54fc1e23638dc50d3a877e0a43c641172d0f5c4b0cbda1e87590fef45991b88f4d533303287dea5971e90cdfdbe391e8a4cf1c32843d1b1ece SHA512 3bea50c850d1490a73f562ff87f435a14b4259dcad59134c39d8cb2a29264d4490c5e10eebf18114b665eff716e53aa7fb30c94b41eca73a311e2baf742d7d85
+EBUILD libvirt-4.1.0-r3.ebuild 9689 BLAKE2B 6d451fd8db22117357afeb0fb64c02bddaf74a544098d5871f027d58caf1158f1ab17fe6972970fd7452ad94a92c33b0f49edb5966ad649679c71f48dafc7a02 SHA512 dad5c92f9912a11de6d07ec3bd23d69558745c93e8ae09f144fbea92293fac669a863185d2b307b686da4f2d3ce3d4339ef078c8af415ac532f7529d2e9ccda6
 EBUILD libvirt-4.1.0.ebuild 9678 BLAKE2B 4b2a697630bcda1b28eaf9d43c8f441fe905e7612da11502a2ef5452b733f15ffd2b47d47a8afbfe1cfa956a780abe354dca43ff2a5d85a6123c7b92c87ccbea SHA512 0fbe6b67c6c74fac74bbcc91451c18d1cdbcd52424352570c96f32972fdd6b0d9bc5f46a265b1e26afa432c69e9c4d9e41dae85dea4ec56ba3e1e121ccec58b6
 EBUILD libvirt-9999.ebuild 9845 BLAKE2B 6088d0682f657ce4b8137c7dbe28f325eb3814519383958cc558db8a0e8433d4f3c73a688174d6c9bf02d67d5f1e23f8951093d67288d24e89ce13a7d907cec7 SHA512 a895edde185daea93df3e1ffcd193724c796b72ee7eb6a8f4054c894ae8b14a91b45018eb0b0ee2b039d74a47be31ee95188fc0766552605d8bcdec6bc04b568
 MISC metadata.xml 3766 BLAKE2B 38d8b1dfb815871ca19c35c80ab390a422e1833b6ef09c6691889d5d6c01e25bb9fb5d187231456c443cb22764583312a56ed8e1a772f810b58050752ba9f2de SHA512 10d96f652bdcf32e34ea415a37de0c3c4aae3a716403a0ca73228af640788734119cbf4ade26a450cc3cda81ef6182391a6f590a851a6834d52394b7c81c49ed
diff --git a/app-emulation/libvirt/libvirt-4.1.0-r3.ebuild b/app-emulation/libvirt/libvirt-4.1.0-r3.ebuild
index 2b72c57c8481..3f1667724319 100644
--- a/app-emulation/libvirt/libvirt-4.1.0-r3.ebuild
+++ b/app-emulation/libvirt/libvirt-4.1.0-r3.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="git://libvirt.org/libvirt.git"
 	SRC_URI=""
-	KEYWORDS=""
+	KEYWORDS="amd64"
 	SLOT="0"
 else
 	# Versions with 4 numbers are stable updates:
@@ -18,7 +18,7 @@ else
 	else
 		SRC_URI="http://libvirt.org/sources/${P}.tar.xz"
 	fi
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 ~x86"
 	SLOT="0/${PV}"
 fi
 
diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest
index 70e96014cfd1..1b9c968587a5 100644
--- a/app-emulation/lxd/Manifest
+++ b/app-emulation/lxd/Manifest
@@ -8,92 +8,104 @@ AUX lxd-dont-go-get.patch 428 BLAKE2B fef476db95d5e3a2730d718b72725e5af86581dc0c
 AUX lxd.confd 589 BLAKE2B a4ee8e9643f7add254baf2f83900e15029577b69460818640220197af8ad56862c9c96b82d6a0c38bbe7023893a787b3eeda80e64359ed44863e9aa4c61cc07a SHA512 14892b2efa96f4938497a7ea0b7b2b7ab630b287c8444b666d24b4aa4fd7af265d2dcb91b4defdfa0b33da610cdc04dc3c8751f00df9209a7933bf30ea9f0790
 AUX lxd.initd 853 BLAKE2B 0b48de1a596767db356850adcb5682c5c351e7477b0d49d81aebf857a01e4eb75067087d323ba4b5d6fbf8765a76cf161ad2cfaa0eba480fb86e91fdb95b0e79 SHA512 960aceb2845cc3b454b2f916c73273f4b1ec6f87e5d569c27c8c58e0db153c084e03addbdcc91dc8761fc6f0e306261d87db73f8610fda197e55f9ec6756fd56
 AUX lxd.service 174 BLAKE2B 8686d57a79fbc3a9ec2e1a3197012599a5d6b81b62188e779cdb9a86f9f413fa485090c79dab8c4aa8891e0e35604b85fb1cdb1da313918b34a974b61699b24a SHA512 6f9d71d5c08c49653f28511bc793d1365604af6bf105789caea27f4685d721fbb283f888e3b7310997b73ff2fc5bb1a47e7500c4678cb3d39124cab723523140
-DIST github.com-dustinkirkland-golang-petname-1f4996aa8aa05ee066aaf9e3179d340b48c6da74.tar.gz 15087 BLAKE2B 475488d24d9a859a087367092d5b83e71b858d7dfcd72639e15284fb230b016754fcac64a8a3958380be6007828fa9c09ef86dc0dbfebe67a9d269948986113b SHA512 7f2d849104993e089aac6abc01844a559239110fbe257469ee918de26ef6d77cc29027324204b38613346c6f0579afc66bd721f56c2c2062354ac31f4e7fd7e3
+DIST github.com-CanonicalLtd-dqlite-9334841532709c77fc79e13a08408694e4bb3616.tar.gz 67246 BLAKE2B 05efc336d8ee21073261286f268bd071cf11f334c3544e0d267e44cbee5dbb642d20b62f2b293984fdd82e5351ada5330b412267b21e384376f9be12e7ea6346 SHA512 0bc787d886f275e8b228bbfda7c96e743bd514db59ed22c8e10ceae2d91c793d4675bf88d6de5bc197983dc43b627d3044e4cb586cf259f2de7e62f738991692
+DIST github.com-CanonicalLtd-go-grpc-sql-534b56d0c689ed437e6cff44868964d45d3ec85c.tar.gz 26922 BLAKE2B 9f330e00138535b5aa8cf5a98f0feb080e925f0068b5d499b73784a282321a975cf07df4d5b68aec39d3bae08cb9c762059d325b8677cc837f6e461efc565a6e SHA512 474bf9e04cc6f8a19ee3586478ee0887e29427092736295473c51535750c66e3d04bb96f75537edb5ee41bfb07f32cd070fbf3ea04fec8849d3d75a07577cd3d
+DIST github.com-CanonicalLtd-go-sqlite3-730012cee3364e7717c28f7e9b05ee6dd8684bae.tar.gz 2112277 BLAKE2B 7c6bd67e013f66d5889cb34170cf6f462b14799bc9ccab32037a19d6401677df211d9f9d90790b6a3d46e0673f18e16fce6dd53582f23d589ac4b2fb5570dbaf SHA512 5026475a1b673c3271434c458aa684f774019905d7d8f6d5aa861ffff1b8c8798eff3f97b9d47cd17d5a8bbb03316f54e0bd2bd06f51120c9e860a45efbfc574
+DIST github.com-CanonicalLtd-raft-http-e4290d0af830073ec140538e8974aa4393495ea1.tar.gz 14140 BLAKE2B 320ac66f57aea98553a6812a4b855ad8631d5ca1110985d7de4975bc7caa7a2b06aaa78b9d54d799d147854182f802d836a2c41a8c03ebe748fe7fd274dbcda0 SHA512 82ce95df9a1c492542d474f83abd46c19eb33b6ec8d7bfba7f8683101f66bea34341d031f2701b4128b42d7d8243ade0ee93242f64b69019028c84d5bea70344
+DIST github.com-CanonicalLtd-raft-membership-26ef52960f54c472f52fb3701f19f25319e1032e.tar.gz 8029 BLAKE2B a66d3e4c6e63135b681e0a31edb6dcdfccf849206ba95dbcdbc49ee33510d5261a240b647e753f1941e6d846c60c15e6e97cc3727ffd02a2bf65b9fea5f82521 SHA512 6ceb2c8e651e4841c242105c8293eff5859bd50d0effffe462853b04f759202e615e17c44ec29800e25298a394505a52021b6a6e69e9398e4ab2561c5cb26cb6
+DIST github.com-CanonicalLtd-raft-test-22441a088d5630ddd2e971eae68074d2b645f1b7.tar.gz 23472 BLAKE2B 790943f53cbbc4d8b2c19aefe8cfcab4b4a3d36bf0927e0e8cf9b7dbc97ce194084c6846991c34402bb1b342123d17b47da6a192196573240c34654d0cb62eb2 SHA512 e44cf16d2190c9680e3698d188a065b151458546855c88e343c08022a455312aa4f8191ce8b125f71aeb6b8b9054967b6374750ee3187192528399be2b5b29e7
+DIST github.com-armon-go-metrics-783273d703149aaeb9897cf58613d5af48861c25.tar.gz 22373 BLAKE2B dd4daca721ac0643f6ba4300966217ec57cb5d21c495029fb356badacfb4032a275807d7498a8fd1bd97315e70ee0c2d3501ae7e3bb072feea94787c5ca8f608 SHA512 a1a245cd9ccc07af7fc30bff358819389a18d1be21179626a2e79f0ccb82d71f7a4ad009d8919bbdfb547176346716c3f0b1f764f0e75171381a56aeb066685e
+DIST github.com-boltdb-bolt-fd01fc79c553a8e99d512a07e8e0c63d4a3ccfc5.tar.gz 83950 BLAKE2B 04b9aa5632ccf231f319e8d25309f024a2a60c84e8eafac8b4bc16152fb7581d1a563903034e47668d7e9c61fdd6828294342c5b84d843e70367e578864ba4dd SHA512 5effccc7dadb214ef5ce53092db48c04ae25a388962c58732190c34f4537b579ef645ae579df5d0de30645574ff753486a6f743bf4fd58ec1d2aff76ba537694
+DIST github.com-cpuguy83-go-md2man-48d8747a2ca13185e7cc8efe6e9fc196a83f71a5.tar.gz 87543 BLAKE2B 6305e0097e9b1d9a237d91a7cf1bc2c969f56a2efecb2dc1775d5a8773099672685085829f4b3b721f302ca0495396b4c08417f12d44247f4b143ff3677575ac SHA512 38b93ce7c4320287dad7fe307a9da55c474d57abd15ec58718d455e8721ae66ecb03823c13011ef93d9319d38d1c587039d288209efb6b806baa37e880b37ec9
 DIST github.com-dustinkirkland-golang-petname-d3c2ba80e75eeef10c5cf2fc76d2c809637376b3.tar.gz 15127 BLAKE2B 06338b4364d9554a1334c04bd9ea81df7539641ef5ce41d681670b7b65c06160ef67e4bd3ad2529dc7864537d5be6a91be53c5e96335f5dfcab198a8bcae9a9b SHA512 0f63f01857c30fdb179400b80e4391a12675ed17a981e9f55273fcd44e06df3bbecc127cf80bfd73afe1d4c30cf37638d0b581b2dde787abe2c8835dca8dbc2d
 DIST github.com-flosch-pongo2-5e81b817a0c48c1c57cdf1a9056cf76bdee02ca9.tar.gz 59915 BLAKE2B 763403cec3bcb27acd6654e7d2d57d198862b0d16c242ec975b46a7cca95560505b3373e8c4b7a53e7fc025523845bee16b90311f8bd341c0d2bfc28987ae0d4 SHA512 c40fc45b7a781067cc80a616b5a843977ff29071f7b36400631a7445d6fd8530144e73ecc1f406b2315be0725a214c62bfafb44f904b76d83384d8df488380ee
+DIST github.com-flosch-pongo2-97eac295f74b5fbb7fd3113e35f4ccf3c816e389.tar.gz 64365 BLAKE2B 43774ac445810c6f8be5540024662be24e50926037469334f0c832de941b5f2a2f71829eb83f67ee338058f92bd6f8f67e41241686b2066ebd9c7c81dfc6227c SHA512 fdbfb2b35d208ae28946952835230115701691d23c135a2df548fc33b3397ce9a786890b55e73a3cdbe2392aadafcf9667ebd54c8e78144f95050eae19d1918b
+DIST github.com-frankban-quicktest-536e76da5efc46dc247088384c2d2cea7da968aa.tar.gz 17127 BLAKE2B 0e395d3370fd4855b75682808776f726654a31910ec8859a1c5c5814078f8368a1b2098f18d765e4eeabf603d99e6bf026d5e118957f9ffadb3e3c7c1fd67306 SHA512 b429c472029240e6c3a66148d8492cdbef253cd2981793204ddf496fe92b0ce1f0dc4f133bc7d711dcac3ec92f90aeb14a52dde738da7fa52ec51acfb7fdf62a
 DIST github.com-go-check-check-20d25e2804050c1cd24a7eea1e7a6447dd0e74ec.tar.gz 30367 BLAKE2B c18a0f1aff1bde8e6fc533ea627377ca4de4830d84289355f68163855ec97ac47f537b3b2627568c31714ac3a7672ebf86d60452269c75c80c2cd7565d7c97a0 SHA512 94342de3aad4db1c4442062f4cf4e57c723a43bbcb0069a8bed3b719e3864eef7500a24c9c99c755114708d6822e9b23f296b6d0b2b46f32cc6ffc65944d1729
 DIST github.com-go-errgo-errgo-442357a80af5c6bf9b6d51ae791a39c3421004f3.tar.gz 7453 BLAKE2B 9f231836718860c023a487d0971e152656e0ff39dcd5efdfda8c62577dbf4ae82335bada308d44a4d0af5ec951e5608f40bb9e0a7567c1edce35664c98596744 SHA512 f54cdf5089b7e46f08f75f7f1b0bfb893b1cd0a36d08b925d5ba04d2fa6021e85fe0625235a9e712b09099e2f5cce46aa1700d12c12b0c54ab59c8d13030e820
+DIST github.com-go-httprequest-httprequest-1a21782420ea13c3c6fb1d03578f446b3248edb1.tar.gz 53584 BLAKE2B 94069eae161cfb28afbb278d73bd24331dec5a5c4c419635f6961e3a2d4fd7d8aec5fa9efc4e658732fb901f28ff5d12839f287e4de0a702fc6bdf42738280a2 SHA512 b469d9e60ca3dd3f028146dbe604bdc5ed0a74e50854a43fc451253c4f2f771432b378ca6c8f638ce181252817564fe3193c7df083f23257766dd1eca9bc899d
 DIST github.com-go-httprequest-httprequest-fdaf1bffa25560ba0920e3e29aae85d3677ab32e.tar.gz 52964 BLAKE2B f0dddcd38b9f8ac75a3e45473e22cfab1db88bef19f90431b16d1a3699ab56ef7f0d038ce837c0305600d69bc5ba64dffd344143cd0bc4a10aa5093ca32b0771 SHA512 60688f2e320afaeaeb824226bd586b9e9d7ccde00d9585401ac328d83195a23dc3e4e26b1848bc9998023b732a559963920860f21056416161c31304388aad4d
+DIST github.com-go-macaroon-bakery-macaroon-bakery-94012773d2874a067572bd16d7d11ae02968b47b.tar.gz 135429 BLAKE2B c62a447eed956da5fba2374d5ba8cb24a1b78698933cc3478d0b072a8446bf7d0db11bf2b514b526a7a9bda35895e32be970269c6cfea5eeac7fa83a6dd9df1b SHA512 82f7c0f6e36f2c662f77fca8890fad864f6d196b8034993692d00757dc0ac0aea0a8872cf24c2a2cc7c4c0c84575fceffdebabc802cee0f4842cd286edb6482e
 DIST github.com-go-macaroon-bakery-macaroon-bakery-ec9d2ad6796100720c154f614b6dea8798ec1181.tar.gz 124110 BLAKE2B c05d59504f7cd2d0cdb913b1d06898375fce112e71a1db0c1752628bc9939003a92ad608463cd0e1fa8d75945b9b5a76c0710ebb3ea126cfd67ea01b46229bff SHA512 2965b6441df2790e0378b962fb66672e2316902620223e4ca3a8ddf1ef38e2a76b9cda2a5013e664ef49073aed8f424e1713538626f6ce1929e81e3bacbef45f
 DIST github.com-go-macaroon-macaroon-bed2a428da6e56d950bed5b41fcbae3141e5b0d0.tar.gz 22383 BLAKE2B b2d89ccdf4ad0a8c29f44895697a9921d40b9316879f477f608fc5f59683f825a66357e5587d654a55ea80f0c79d6680f5dbb45590b2fea051fca4a7f23a9eb8 SHA512 7ec072cec42266cf8cdd44819c653b8d09b58622fdfa42fb12422c9727e6eb7326519fbeb247fa4840d8c87a5357ae0acd028a8d5757acedc3582810a5cc467b
 DIST github.com-go-mgo-mgo-3f83fa5005286a7fe593b055f0d7771a7dce4655.tar.gz 376880 BLAKE2B 800038e0870d8b943604bc5edf9ba566d20fed75f445834801955a19da6add891f96cbf5e19a93d520d90ccc4e9da911ab02cccb710fee67b3fe60e4409a717f SHA512 f0e7948d4672d29d3d0a741961ff8a75d30c556e157698118a32de10e2af8eb2ae6a61feea1c93aff313596d285a048a70dae7339c66760ebb91a1aecfb05845
 DIST github.com-go-retry-retry-01631078ef2fdce601e38cfe5f527fab24c9a6d2.tar.gz 9318 BLAKE2B d5eb408e4c4acf0c2304d951705a1f39f2b2663357f04402f5ee47bfc79182511e3a29568846bb902887aa5efb149ac6a4cf32ecae07a183f845ad8886fe0377 SHA512 71956a468472754313830a7f1afc844020e5ffc8bac4464e369562bde8c1cf5e11814fc110dcb00d243cbc6c13fe7a0423d29b73f0f420df8313666e645a7a24
-DIST github.com-go-stack-stack-817915b46b97fd7bb80e8ab6b69f01a53ac3eebf.tar.gz 6476 BLAKE2B 4d218f2e10d4e03476116012e5dc000b590786808b4679c170622d9d58ad79fa6794c3dcdded6cb878b346b3bacff16772f4778ea061c713595791345e7cbb29 SHA512 cbbdd7066249a571cc4d052e7907150f575e18c078078199b18f7557e3b12fc7c6969e6fe55773c951f3f954d296707d9e4c74ce26e3b6f408263774b0315a52
+DIST github.com-go-retry-retry-2d7c7c65cc71d024968d9ff4385d5e7ad3a83fcc.tar.gz 10395 BLAKE2B 80b7c027f113caf4d2bc88034c551beaea1555e8e89e4dd8e801cf92eb69a3ce89a05cf3ef17c73496a774e5e53e6e24fd93fffacde6c847feaf1e0a3bcd4fe2 SHA512 9d0ede95a8ca09f3fb5572d4df53c163dff0ffc2bfd6d5138f3260fa7e2f7b94bf352d4d3c1137dbcac5cbf6494113a1b0254a7fc8cc1189750e754eeaf79b6b
 DIST github.com-go-tomb-tomb-d5d1b5820637886def9eef33e03a27a9f166942c.tar.gz 5515 BLAKE2B 9ae2c00b43da5958392e0817f448d01374712ce7552c07be0de8204a7f16a7442b195695d51782a375da7aaa83019446438d52a8768317216a7812380be8c1b1 SHA512 03ac20f7608db7c4ce54cc1ad9dfa62d770c32e1806a131909cb5c1ca4a9708b482e58d0e1bda0dbaff56ed36558a96ce2d4453566813967a32eef5245012a8d
 DIST github.com-go-yaml-yaml-287cf08546ab5e7e37d55a84f7ed3fd1db036de5.tar.gz 64826 BLAKE2B 47e9182124037317bdfc31137a2715db979146688e637a586f5a7c4a12250d0fcffdbbaa8793e189421d189b1071f48d8588cfda9ac1f3e297bfc244f30bcae7 SHA512 429256bb847defb53dee5c960edc726455397045e7dc2e4833e0e9088f9ec11452e2198961080dc00b8eff9d165df5e0377f4039932df0e46cd960827b8f800d
-DIST github.com-go-yaml-yaml-cd8b52f8269e0feb286dfeef29f8fe4d5b397e0b.tar.gz 60805 BLAKE2B 1345bfb7c006a423513ca6d51d3a34360212b48e92e9902f7f32054e80706c8f8a2dfffbd7a290dd4bca5a31ccec9a5ec50fc8b8314e53711a339e248c646a48 SHA512 268498022f34c4b59b5b75443ee10fd4273203f4b77bfa11b08a792c004cf13e3010c34b4c15cee2b4e7f3c910648d9897700f60ab00b327d78c49e97497fe2b
-DIST github.com-go-yaml-yaml-eb3733d160e74a9c7e442f435eb3bea458e1d19f.tar.gz 64789 BLAKE2B a59db73ba751c932695913770550e115d46df28c4cff402325cf5324c97069e3acccb9faf39826a5da416f8c5b0cc69377cef41a6b1451afa82c7ae8bd620544 SHA512 9e34c34c907d1177e072eb5f3b421b8a3af0e68b490508691d745cdcf1145d9bcfd2592d909a4b05e7f12bfb62355d49861f6d2e1bd29b69cf026ef631965289
-DIST github.com-golang-crypto-2509b142fb2b797aa7587dad548f113b2c0f20ce.tar.gz 1435354 BLAKE2B ed4ead7ed45530a5d819a91d74a52f047fe6408ffa4720afd895bbc3df6bbdd6c9466259e7c141e72c827dce882bdedb9dac868e196407ab16ec8302898f6759 SHA512 5936b8fc25728b041d086bde5002f4d9fe1d8a55995df27e8efeff795ff980da55b42fe254c638c95ff0c80b9b659753786d32836d2124bcab30f63f80767c9d
+DIST github.com-go-yaml-yaml-5420a8b6744d3b0345ab293f6fcba19c978f1183.tar.gz 70322 BLAKE2B e4284bbc1825c0e78cf2818091d2d25c581fd5da86d66eb8f91877b8a92f62400962391efb911ff33ffbe3db1de432a892dcc3670f96710fdb7c2cb191309697 SHA512 a5c4cbfc12e932f161c827537ad8366d8c003f40c3959c39bba9b6032e3d381516998a046429ef0980072b717dab0ab1df6b1ef24a43e66e1bf4bda176302b49
+DIST github.com-golang-crypto-12892e8c234f4fe6f6803f052061de9057903bb2.tar.gz 1456649 BLAKE2B c86775bbd6ed4d9ad55756febe5e365db327b878649282e964072b9ec720ebaea5fde4797b9cca99428c2bb31f858a13d37cbf21ba4066ee15307ee2a220fa88 SHA512 1587d270b0191365fe6eed8e5e6f8f27b27a35236a612b225b952118bc63f8e374f98b249b47ad78643be27d27cfea16ec05aa006a2941e12cbdafb15745ea09
 DIST github.com-golang-crypto-d585fd2cc9195196078f516b69daff6744ef5e84.tar.gz 1443268 BLAKE2B 19bb8d2861225a14ba3f19b2ae96c6640833fea7da52228480634e715b7690afc94e605a5be1b70b263bb3045a0fbcf9f78211c431836d077cca7d076fec1686 SHA512 e82f87394d2a8d96779cc69c8803555b5d23eb02f3d38101ccb9142a892280c32b8123d61a309a041cf5034282b5269ea38b5d29e03c85ca3c62c4fc0802502e
-DIST github.com-golang-crypto-e1a4589e7d3ea14a3352255d04b6f1a418845e5e.tar.gz 1336856 BLAKE2B 076239faa59c88b8eab873097dea87dd579a4bb65a6b3a9f19ddacc0a6c05dac2a17917547ef8fabb46fbc5b56262b81330fc1281fb42d72107bf6df69edfc2c SHA512 c22fc86fbc22d6ec8157f89c075f07db8b72bf63ff97e06c907f555bf865cb77414c4fa2b9974407e43fa4f74b77710d3be9d2646f929fcfd5269b0ffc379914
-DIST github.com-golang-net-c73622c77280266305273cb545f54516ced95b93.tar.gz 926104 BLAKE2B c5b31791af99bfd82edcf233dd9291df58102383786b77dd131af858e5f7868dfb4faa63de5c85218b2458fc9dd9f8a0d735aaf28b4f6f2a1835201ce0f93b3a SHA512 ce014933d3b8a30057c99bca54e9ba630e1940d1afbba3b9c7ef9d4f3e78d2ad26fa5ea9f0cbb0ada877d651b67d449e099d287b4af1d320fbf0b9d50d8d169a
+DIST github.com-golang-glog-23def4e6c14b4da8ac2ed8007337bc5eb5007998.tar.gz 19688 BLAKE2B f9ff73060c3b10603472c3ea4f50b4afa6abb5a4e9e7ac43d2a6c2e62541d43ef9f0ef7a8759d9b3281d72e5f90c516ee174c91de9a640a5bdf6877700450d44 SHA512 e9e70cf2a2d74ca813d0cadc23d213a1112ca4d1167abb63d8e0929585fca90c3a5bab1f49db20095c48bf1fe03b4424353c33728d09a201334eb65770888dc5
+DIST github.com-golang-net-b68f30494add4df6bd8ef5e82803f308e7f7c59c.tar.gz 938028 BLAKE2B 04b66e87d3664ccff451349146ca886f56d8d306a82ceac0931b6b714cfd0e0fa88221986233f38a4f1dcac09be2222e23f03ecd761ff4cddaf422dd98a79641 SHA512 2f7120e4b3d6496f6e3e01d9df1c41e81b1fb7874fae1f6dfda1928f0df2dfa1a08f2522d44ef2209a3b251f6da4fb9a67041dc22a6f8262d7ae6701ddb6cc5b
 DIST github.com-golang-net-d866cfc389cec985d6fda2859936a575a55a3ab6.tar.gz 930024 BLAKE2B 9ab7175433046805426177276d963bdc356d488672e97cbd696e7d73f376af50a71ed5e8ba8c57e57ad0c6aa091bc8a54b1e67f09cf0085211363f4c33f077c5 SHA512 c841b5ab218f1ea6c8743264c72506ffa90372a7c8dc0fa1b1c22c965bf56e715ecf688acd22b5ecf747b7ded51f2f48fcdc859e4ce9d30911f48e3a6055d599
-DIST github.com-golang-net-e4fa1c5465ad6111f206fc92186b8c83d64adbe1.tar.gz 899910 BLAKE2B b28a878b9f0ff30ae9a0c73f11aed9de2f6dd000651c2e83c7d902c044c0741e90dd4f695356f6342aa100c8ee5b5d7d928de4ce7530de53d089e9c773112c09 SHA512 0a582e9aa0ecee1c881771715970129d8af5975cccbb797f1e2eeeea7989b17448b26c000ef49fc7a1ae02eddebdfbc52dd2cd9a82b0b3b667b4ee7f62346052
-DIST github.com-golang-protobuf-1643683e1b54a9e88ad26d98f81400c8c9d9f4f9.tar.gz 268489 BLAKE2B 76035d1202d11428885d94937f1616e62441f83a3af46de0c0b8a17227b9e6a04fa8161269ffd1894992e6b5a914848dda66f1b7f9f91d5f1a4a8b45ecd08fb7 SHA512 adb706f73ce1a0a9d369a556258494913f1760c2ffb509797330768d112fb4f70b55d80db59d41c933b27aa862a6c044a9d6d2c5de95f540b86a46a0eec99901
 DIST github.com-golang-protobuf-1e59b77b52bf8e4b449a57e6f79f21226d571845.tar.gz 268477 BLAKE2B af1775f715a7c8434fe46872d8edf75241c851fb93e1e3f888c5fa1b603397e68c3878c9c69afe618ff1b7ae3d0c219ec96b8648af2fd2c2c9424a33f1710a2e SHA512 07de72078a66528d864da78c88be36351cf79be5235ec9f4ed1d71061a56b9b216fd29984ccfb2a610223a86b80aba2b9ca28a0d36fc2346b23070e25e72e29b
-DIST github.com-golang-protobuf-5a0f697c9ed9d68fef0116532c6e05cfeae00e55.tar.gz 252930 BLAKE2B 8530a1c609a62d423e51cde6f2b07a3e779cde62cd6dddd2c39cfc25be81ccf909c6f2b2c66a1cabfc87560b05d5c4b2af4e6a4880a6f4ed9490518e01e3fe8a SHA512 ac284034ee27b275df8adb83ecf4eb85977cc9cf5266384a080df2beb2fdcb84af7e166cabaf76881b95eab4812997ab435adf0abd6068ed967f609b1747b6a7
-DIST github.com-golang-sync-8e0aa688b654ef28caa72506fa5ec8dba9fc7690.tar.gz 15564 BLAKE2B bee2981275544d8a0d7d466e7929615c6b5b82c9ae362d0fac871d6c16440eaf2586d603713e2163a0ca911c7d3a9035b9751d52a84f7fd1640bd7cd29693657 SHA512 f0886e671ef90cca524df16e5836e1beabcf1cda42d2445323b3ace61982454e105dd6d686ede44b758d4765cb834802bd44082fb6a497d393986d91690a651e
-DIST github.com-golang-sync-f52d1811a62927559de87708c8913c1650ce4f26.tar.gz 15326 BLAKE2B e7c7fb054b028989ef1a0f09ce32ae0fcb4444e61de08e12609112363ad33c7aa3742cfdcba1bb7d6674267c21f74dda0594c655da77ec8fdc5667fd300287e8 SHA512 912a5afe25c6854e14d72d9d0a897808ab9b67ba4f8428cd04fe7bb3ca815f1bd1b78667587fcd74967f88f44ea591b77616955dd130cc2f98eea922fdbacf61
+DIST github.com-golang-protobuf-e09c5db296004fbe3f74490e84dcd62c3c5ddb1b.tar.gz 269725 BLAKE2B a62a3f96c49d77776103a9bece69b615e00d4140c9de8b42fb7edac979c8a8d172bd21062d3d6e24ae01dba10b320ff208ff8c6916da2d84118da448afc8caf7 SHA512 f64fa42e7ed9701860e16b1cdedc9f6b029630b6f534ee403ede1223c0c7542c731735995ea9763f093b56146776902b6633e5b1691b1f1dd4ab84dea0092099
+DIST github.com-golang-sys-378d26f46672a356c46195c28f61bdb4c0a781dd.tar.gz 802874 BLAKE2B 5c75fd775a892c731fcd13fec47e4b5d3a832057b7c36d153f6771fb3f418bd2acff2183424824c24c7a41cccbfb886bf1b240fb7c537639245badf82b0ee265 SHA512 b335425a5aa5efe36306ee365f5fc551cdfd51ea927890e8adfe750051dd797f21d215e7d2860ccc996ccd32cef3993b88bc5576156fce1b3031564e4f12f83a
 DIST github.com-golang-sys-571f7bbbe08da2a8955aed9d4db316e78630e9a3.tar.gz 789287 BLAKE2B 65b5dea36632e0521d0bb8fb73ae69b89eb533628081f966da956d5f572d9611e817202675aaeefc69492428401067094e1c07cd038cba91bea7e50649b95fce SHA512 7fa096e1a1282155b614c02d3d190fdd94096d2e51447b4dca59dba255edc9316835036e0cc91aa7439047c17e63faf279018e0f6c9e8d2b0b9a12c7e553a93c
-DIST github.com-golang-sys-661970f62f5897bc0cd5fdca7e087ba8a98a8fa1.tar.gz 777769 BLAKE2B dd1733e9a5a5e8d4e1caef13b29827fde9e3f5fa5b0119e29cf4a0566affa8ed277e652e996b043e434d6d58cd500873ad4f53a2b4f094626e3f615db9b0af92 SHA512 44bd9dcefdd2ca5ec2bd89631d02ac870a3f05744f85016a6e6d7129a50b7c4ae5175be7098478256ee52a7a854e7fdb743bef8dc5b978c0a1d93205bdf39d0e
-DIST github.com-golang-text-6eab0e8f74e86c598ec3b6fad4888e0c11482d48.tar.gz 4625238 BLAKE2B a6bcc608bcbe42e03b19c2e8777623088fce206d2595444ad756f34982f50eb884aa87c92d7f23816b91d4e1b3f86e4d638c47866152f385674c7186debdcc67 SHA512 98c651a37fd60e62109d0eac3fe2a21473d7f270ec7a941f4a84485d3276da84b526d406baa185360ac842348320e9f373c124f9d88675e34d8126e71a9e8de9
-DIST github.com-golang-text-ccbd3f7822129ff389f8ca4858a9b9d4d910531c.tar.gz 4549711 BLAKE2B 4b6dc9e2f7b2d5d7cdbeb6e59ddcb76166b0decf04d304f9b815ff53e83c5d08ae95d5ebdd5103b6b048aa4e3e5b27111be28132c6f35ee8dfbbaa330958771e SHA512 78941350134b98f0dd72b0397796106b309cc50e34d0741bb1b4e8795a653f6364e35061b1f36def969ab81a2b07ef80fa135baca3054116d58358d53dea282b
-DIST github.com-golang-tools-2a5864fcfb595b4ee9a7607f1beb25778cf64c6e.tar.gz 2224136 BLAKE2B e40d7dd5f8411ff0c6eacf1e9d1b7b81d650050cd3f0df5e9ffb759091c8b06eea1459ee46e58299ec2ea1f197ae0ac1040ca6f8079a85df1adb0951e9678952 SHA512 dc36f88d348ae5c299c4909120caecab35964dbb85529e6e735bd507155173ab86b134cd39a1fdfc50b7f1f55345175604f29027b0b3e1acd7f3b312303aef70
-DIST github.com-golang-tools-9b61fcc4c548d69663d915801fc4b42a43b6cd9c.tar.gz 2246761 BLAKE2B 5cdd372a395a6de8e71cff04bfc9a59b4092dd1bea418eed005e17053a28aee31f5efedeca5c595978879e91d9338cdc85b4e0a9fadf6b5e7c244efa9b5b3d9f SHA512 4c2ab3079c149432fcaff400dbc6ad60f18e646f7ab21c2651fb1ca7d84f1adaa638de2e1f7d22f3d5c2715872843214f215b8e8b86b1c8da30d8723310db629
-DIST github.com-gorilla-mux-18fca31550181693b3a834a15b74b564b3605876.tar.gz 29433 BLAKE2B ded39fe2133e5ee0b50d70fb3290b222d0e7ffb20a30124897ac44f5829080a2d237ba938af42f66f782371aa6e8b4aa7f8bf70bcb0050f87c11cb4e6c08ac6c SHA512 5bf7e9a6e8b01b235f5a9e697b5749d5655e62816d74b2173b123814f70aa92c5e0bc84cf40f643905354374efdcf1ffe8838d3a55d7e3abec29fd12a2e0239e
+DIST github.com-golang-text-ece95c760240037f89ebcbdd7155ac8cb52e38fa.tar.gz 6563431 BLAKE2B b889252096070044687cc804b828a9b55a444895fde87a75d1ed7de89a9953d208ef7cf54ecd501ebd8240a9f42e7bcc2c6ed09cb76256e235b94cac122abd61 SHA512 0c1814462560a3cb3e5f1b8a82a321a66baae712cd415043b2c910427ec5217f5cc65cf0d64b07c113c3e06aca9260c28a06e19f1a535fa457a3c2a67e683b07
+DIST github.com-google-go-cmp-5411ab924f9ffa6566244a9e504bc347edacffd3.tar.gz 59673 BLAKE2B 4cece3bf0896acdd91d11dd23f557668799e7b0dfde5393789a80513f45dd902f69502bcd045fe15147d262c49de75d0f1cdad9ec62c03d156c46a70e0177bca SHA512 a4a1c43b62754995aa06fc1fa9da4899375b0d790b67c2d753bc558c7caaec450c82dce9199d2d5ffb689c77a32c2abd5934ed4d1d949f61e211e7807dede8fe
+DIST github.com-google-go-genproto-ab0870e398d5dd054b868c0db1481ab029b9a9f2.tar.gz 1675901 BLAKE2B 131df7130c7eeffcc5ff4df166d1a846bb0dea014686b613d48e0deb752d19f8c8d145b5bc067a6f3418f9acc12334bc81e81ba1b03946a3bd676ebcae86db0e SHA512 47aa6bcc63a35ee1277b5572d8bfa2f31b7a92fdea31db0fedce730c6fc96c32bc63b261f9e2b9d8ab60984573f77402ac86879db0067abe5de06f024a0f7f7d
+DIST github.com-gorilla-mux-4dbd923b0c9e99ff63ad54b0e9705ff92d3cdb06.tar.gz 37402 BLAKE2B 688b70aec3a5ca7b6b570dd8223e04f426d2118a2fc6eeee8f0f5ac39d68b9b3202bd84f839b9ca5a491b3eff4499b1374193beb3a84d65080894a24db8a2426 SHA512 da0af3e0fb6960a20698d0894fa6b290e9422dc494d41924af9038c1d260df6b7f4004568bd8f5cefbe73c22dc57c780d0b0eed9b3a004589ca5989441ad5e5a
 DIST github.com-gorilla-mux-5ab525f4fb1678e197ae59401e9050fa0b6cb5fd.tar.gz 33298 BLAKE2B 06f86b8f5a2794ac62a8088495ea7f62fc2e1afbed94d9c700be7ca00ab13fcce092b83e456a022893c46e7447e36f210189ed136271e34028829cac01058713 SHA512 a0e920b3aef17e2c81861343f41f26fe1f579a6589abac89fe00cdd2167f5f1a6fc0e2a1b2dbd69d0b3ea7e08f3c50297f0b7c952043259a220ec95b2ceb30f5
-DIST github.com-gorilla-mux-7625a85c14e615274a4ee4bc8654f72310a563e4.tar.gz 30474 BLAKE2B 07af8c5d7254305d9af846fd10577e03022074a15dd34fb493a3c7cfbbd87d44e2495c4bc52b612380b51bc2ad19d160ff6c1328efc62eba1f43ad390042628d SHA512 3f12ae4ee55ec8711781d83d8048a4900fef774e3328f9bd9f276cb765687224373149ddadafa70a9267257cc2c49f75f42963a2dcc8796a9fb4ba75952e0574
-DIST github.com-gorilla-websocket-71fa72d4842364bc5f74185f4161e0099ea3624a.tar.gz 42507 BLAKE2B 93da9f2c64c52cbf63355de54b46ee81525370b9ed24fa276da1d7a111f9053c6d66fef58429a6ab3ff86db00476d0c2ada890baa3c07034fda1b0d6e88422e8 SHA512 208c98effbcfbd96497d4affb9f11f9aba97d20a784515f43aef5378c32250109372919ae45aebffa8bdf3aec08b36a70578a81a68f329bd5be69ee3630445ec
-DIST github.com-gorilla-websocket-a91eba7f97777409bc2c443f5534d41dd20c5720.tar.gz 42927 BLAKE2B 1bc3f7d80918bf1d3dbd3e5ecd857ce751d5bb4e4b97d2b871ccddbd0d0aa640bf07c699a19998ef22caf41b3fc0c5b211a30432de9d7d51eabd7db8c09b086f SHA512 651d017498aca3fed375996a4cd77a5128396a14aaca4485e5480937f85d1ea8a734ec607d1658601ec6eb9b0b1e9a4756a0264c4dd86ac6bf2de556daa6693c
 DIST github.com-gorilla-websocket-cdedf21e585dae942951e34d6defc3215b4280fa.tar.gz 47287 BLAKE2B bc5baecc1779e821841c2b784aa7f43ee9e7a41ca2079c79538447a7645fbf5e87ae981b744ec973345da351114ea133f219d9ac1af5accfe470e8cdf1fca169 SHA512 88b7c5dacff563d88d3d4e06f57e2552ce10108beb239844323f58ff7829c9b717a8023e45805c5a9f649bfbf513d0384e0fab722968936deddc236048306686
+DIST github.com-gorilla-websocket-eb925808374e5ca90c83401a40d711dc08c0c0f6.tar.gz 47635 BLAKE2B e9cd95a26a420d12ce08910a4ad6bc8a2d8bd40eb9c8c5b31d3ebd396afb27f34a705721c6124b107b81f0f4afe66179c412bfc786ace46280aa4000110c2847 SHA512 d703679bd0b191a9de9f6322c8895781adca32509f91a8735367c61edbef494a61294e98775bf88827955845b15b58571b47810e252348aea252f2798bab187e
 DIST github.com-gosexy-gettext-74466a0a0c4a62fea38f44aa161d4bbfbe79dd6b.tar.gz 9682 BLAKE2B 2f8f662b5cfcfc00361a1aa1e658bb077da7dc42b220288691c92a9ca6555425a13f15b8fd8575e88ba8081e873687fc87b3a39c33efc80757323f7e70de17b5 SHA512 99a00ecfeb4226bba01dbef615f02b22f54959252c9fb99ed55f8c040026305fa54256f78eceb5c02ac6a77842c72fda43d1790590adfdcf3202095ad836a198
-DIST github.com-inconshreveable-log15-0decfc6c20d9ca0ad143b0e89dcaa20f810b4fb3.tar.gz 23111 BLAKE2B d6f267e62433424ac8bb9816b1290bc91b940584a88f1cdd42bcb8b9b7e46a0e0a9247ebbd73b338354befec3a05f7791b886a23d0db780059a8d5ee3aea1bfb SHA512 bdc21cacdf56c5e4e9b03dae107f646a25f1e757b4e1bd57d24bca92f7c4574f8b716e3f3a3ac756e77100e61688e743ffcc5388989268a95028060db9449cc7
-DIST github.com-inconshreveable-log15-b105bd37f74e5d9dc7b6ad7806715c7a2b83fd3f.tar.gz 24466 BLAKE2B ddc8701c45bbf21e845ceedb21a59a52c8124f8bf4773623734e98bd2b2d257623729ea6c20488ec6568382484f1901f169af6c44d9084a2d4b5f8a7924ce7b6 SHA512 f5add63516e3d4a0797cda4fde3568aefd392a2986186cdca8c060ca51a8d5d09d3ba990578942c6ebf0441f94b9f042f7379c5c3897b4210ab861998a597088
-DIST github.com-jessevdk-go-flags-5695738f733662da3e9afc2283bba6f3c879002d.tar.gz 54989 BLAKE2B 04f28a18f4541de0b80df2b33ef3364b5d01cd56ace7a492ca8b98789732ce667c5a79070536222b09de04dbeeb437da71456625ed5b851866dc53ae9183a74c SHA512 9f117c43a41ee7b8753ba8bcb9ad49ad5106ce01b3be617921ed9d1208bd5bc1c4c155d797f2b1f7134955b16f3d82e46de2b0a45e5e8808199e0173687719b1
-DIST github.com-jessevdk-go-flags-f88afde2fa19a30cf50ba4b05b3d13bc6bae3079.tar.gz 55513 BLAKE2B d90a23d54b7557e9686fb303da0a8bd08fd173697631df1e9eeb13b18afb9eba180754a7213d9cc50754bb03dfc0f8d2660c7779e5a06a175113916607bd0eec SHA512 386a0fcd1029b6c4055e8cbef535344e2508e4d6eeb7cec2c9e9d0f1a080ad86eae0a8f13ebe65b056be941af5170feb41a1798c6065bf781b6dba71bcb2c567
+DIST github.com-grpc-grpc-go-2dfcc11f7a6d4791ba627222d783eedf268b4b95.tar.gz 414123 BLAKE2B 628cc2695655c5aaa0d6d9eebf08a889ff9737a4080a5dd38974bb1ba54d114e23ae7aa2657d287cc9ad5af6f12cbbd064c3eca1d8b0e335b30815f034ec9de7 SHA512 5b74b2812d008df0cd9a95d879cfbdf19fef38438488035e57307060022567efc23959cc30181860610ad8a0f4376ff448ff6416c31d82509f0732abdbb6345c
+DIST github.com-hashicorp-go-immutable-radix-7f3cd4390caab3250a57f30efdb2a65dd7649ecf.tar.gz 18972 BLAKE2B b66c34ca0286353bd19154c735a8a2cc3d6469c68cb4a0a58a7709c29d472d37506366e56c2a6de2e1a6685bb312aa79c63100704668063c4297e9e70df980ad SHA512 3b237511fca5c8bf17f718cc8e71479e839be8db3b71a1abb418bd25fe0ed05d80e954a231093cc7f13bacbcf2a98b2d8d82b2586cbc3a7d6ab5aca75c817a1f
+DIST github.com-hashicorp-go-msgpack-fa3f63826f7c23912c15263591e65d54d080b458.tar.gz 49488 BLAKE2B 03d54419cc6fde9b6d51935d49ba2828471a06615e556355352837cc962608144afc505fa31375c0a1907c68752a633bd13618ae849141f853c0d83f4824ae38 SHA512 7e60a122cca007bf5455d6e15f77c24eaa5739deedc9e0c158282249e84698f873628bffa9eb7d23c1c59bda7632b1968ca770c8e1796e2d50750ac86e80fcb2
+DIST github.com-hashicorp-golang-lru-0fb14efe8c47ae851c0034ed7a448854d3d34cf3.tar.gz 12907 BLAKE2B 8c9abac355ad96db8511807b8ad01f62a0748801328e004d90776f3a3093d7ad08ec07f4fcf48d801f3bd233df3e13dc179fc74736bce0b8a201407cdd7abd68 SHA512 ad1b89546de54da93c81648b8bce3cf6dbb0b4595df670ea569f2f5fc9e297c6465f280e6ef443cafdb09430767fad70d4020069b512b496d6157f72499a697c
+DIST github.com-hashicorp-raft-a3fb4581fb07b16ecf1c3361580d4bdb17de9d98.tar.gz 107935 BLAKE2B d44309c27e97ec930c58812adb63e25734ffd4989563c329b1800a328bf5d782fd50a6fdcd5ef013c6979862278dcaf67959f689d8199627cb5fbdacd72eb2c4 SHA512 561d84ace998d039b4de91c78a2dc592b6d963cac61b69eaf3718bd3a2bea16507cb31aa13279719d30e131fe03223e6f0e740dd6b9bb7684fdb518526671fb3
+DIST github.com-hashicorp-raft-boltdb-6e5ba93211eaf8d9a2ad7e41ffad8c6f160f9fe3.tar.gz 9984 BLAKE2B 81183caaf779434c441494a2dd24baff8c4a51c6046a5e446054c85d6b77dfd046a407065d07f150ed57d0252d7140ed7d6eb2cd2aa2b119b7656038360be379 SHA512 a35b8a8bbb925fe0e60a3f502278181512a0401f74ebc1ce37d10605da592a590350975cee6e6ba4c6ca69b1da8725cfd777a0fc2db58c5753ac69bea805a966
 DIST github.com-juju-environschema-7359fc7857abe2b11b5b3e23811a9c64cb6b01e0.tar.gz 17589 BLAKE2B 9c5bda709623cf05123ec0435af3be8017f2d1b2a296e1be3a1a98eac410bc38ab3c3d98848725707cc407b1c42a48f784bf69433854191a83bbaddac356f0c8 SHA512 ffc9d445c01c3b4d810320b3ff230226f6de1beda50660b3ead7eb2b5a0098661aaa4c929bd36b1acdc442d4504dea6c1b12ad94b5a8d0c1e7f79bdfb2abe4d9
 DIST github.com-juju-errors-c7d06af17c68cd34c835053720b21f6549d9b0ee.tar.gz 16210 BLAKE2B 7202acb00a3126943989fd276b9991122895dcb99a5b6e6a966f58e634b037447bbf49316c6c59e98aa9183b77aa07d9b4c4c7ad758ade2704cc3cdcac84a9c7 SHA512 04dfe2f155724d98c31fa2d274a13e77efc34364ffae172fffbc8e14b72f68a6301e6f582c1ff9f37cb105d11a7b3197e2ffa635f410ffb64d54e7c6fd1b9d1a
 DIST github.com-juju-go4-40d72ab9641a2a8c36a9c46a51e28367115c8e59.tar.gz 49363 BLAKE2B c037d267cef945e9760cfb8fcfb366553e850423bf98610db03b51154455dd5c6d2d3de91bf37956249f4ffc1ed5fb850b0438fcdea2891929ab4e7de73be989 SHA512 aca20234f5693a48f5cca41eb59e8e2b1320feec05a7961a950e596d9bcc14ed86786d815e0372cced669548cfa9386e9bcf0eb774a42954fd7a2fd095e9890b
 DIST github.com-juju-gomaasapi-663f786f595ba1707f56f62f7f4f2284c47c0f1d.tar.gz 101563 BLAKE2B 5ea442af00c6a30ad54e2f75eb2da41c29fb24364b00ab8bd8995f1b4ca2205b32e1d90fcfe03c7517884b4ef830c471e03a118b89f65c21388332027fd8e0a6 SHA512 edca0adf9f48f1c656236203c8686b67f5926f736725a7d910a47804f5005aa642bf1cc8e5a9079c5c50a3cfe6d0c735a645e52a1aa1da5380735f76be9b1436
 DIST github.com-juju-httprequest-77d36ac4b71a6095506c0617d5881846478558cb.tar.gz 49764 BLAKE2B 98a666f5477f9cd46baa13b19918cd07c5b9f8f94390d87a67230331ffd292de99a430ecb5588de045cc2573c7dbfae0c40fe043778d6917f4dcfbcf25cc8961 SHA512 9ab66aebaa650c7d67accf9261f4eaf2ba28ff37846350719b0d83774502b29fd4b179913669f0b833b99142905b4892b71ea76d368c707567e8b4b01378d27f
 DIST github.com-juju-idmclient-15392b0e99abe5983297959c737b8d000e43b34c.tar.gz 28723 BLAKE2B a15138e673a26600fbcd8c36a34bcd3e7e904b3afa306fde7d59eb72fc454be797d27f0c05221d290aebc09c5db5f80b458d9a85cfb68358ad17d834b694abc5 SHA512 65d5e8af7873f856250843fd43b14ba8c8ebc114a8fe9734d4073db5dc046079c7fbed9cc3c78aad4c74f886aeb9009c00a009bc6e683f6b5f8162e25a7af7d3
+DIST github.com-juju-loggo-7f1609ff1f3fcf3519ed62ccaaa9e609ea287838.tar.gz 22456 BLAKE2B b19d6b04f435b529725ad717c4d63e5bcf85688423a2bbfef43f10b9d285e5e8100c97f4a933b5e62fbf9860afa5949c1b7079af2744a340c4dd944bffdfd602 SHA512 266b0004645bd960b8eb8ab584566358cc02a097f2e4ceadf6d4c6001fffe22bfe33b458f64b820b6451c6f85ddff5bd5ff77e41bf4b90d1c289c33b3763429e
 DIST github.com-juju-loggo-8232ab8918d91c72af1a9fb94d3edbe31d88b790.tar.gz 22060 BLAKE2B 9e6c4cc2ab50ea43f5471510d67f0f134bc2046c3524d571bf4c884a4c09f5df160f4013cf8e05939cddf039c687b3dce512408f7305f320f4b1d17cf209609a SHA512 74ccd8f6f8600a38154d6a12436566111f4073fbbcfa5f0eb57a1813ddd97398d6e906f0b9be09a4304f677870ee70127f4906e9902dd6d767e3ef467e224883
 DIST github.com-juju-names-54f00845ae470a362430a966fe17f35f8784ac92.tar.gz 26092 BLAKE2B ad9f347ad1e2315f40e39ff0601e425dd4567ae53a71884e851a954d08e67df586469e489645951b6c6058a9c4be053089c3c74d3f63208a70862f269261a7de SHA512 de1a6d8cdf82cf19f11354e98a69d1580f4717c92479445f750ac06ef918804e1d35d994e480bdca64b1ecdca91533ec4961dc057bee0d886759f1ade0e87d07
 DIST github.com-juju-persistent-cookiejar-d5e5a8405ef9633c84af42fbcc734ec8dd73c198.tar.gz 23237 BLAKE2B 16eca916ba084dacf905d61f66f9d6ca4f5041a49b3d8849bf2c3f5182db89f29ea9de5fcbde45d8fffd54699c150710447216db0d356cd51eaf784290429ebd SHA512 4e534e305b9433974fc3b5fac6aadad9430ca5b8905c733913360b2a7ee37aa504a546fc1413d43af4938143132618db9890cbd1d22b3a5b91475680a4af84ca
+DIST github.com-juju-retry-1998d01ba1c3eeb4a4728c4a50660025b2fe7c8f.tar.gz 8947 BLAKE2B a244ddec5b94e68af97b1d62e9df079b554b918427a477aa61d89937e24335219d97e1ea9e3fc91c7b3b12ac321b7a2357e1740907ec97d9d04e3625ee67ddee SHA512 972a43157abdd757de6001ea68b8031a9bd10fae88a064ff2b7a0907caba906933489d07b19d87df1fbb91e1c3caf882f77237ffc355801ac0b4e185b6b4d7e2
 DIST github.com-juju-schema-e4e05803c9a103fdfa880476044100ac17e54830.tar.gz 11859 BLAKE2B 86ac989a6426f3faf791494b319668c2cc86a82ae645301ca6855b50f9a26ff3ccbc241d6d1be261c5d2548952479c9b8ce1ff2db2a335e7b8f71539d42a7a0c SHA512 b9097f06b220c7db1b2fc4305ee28540dc66ff4b8eff7e16186c241430264fb4dd6e190c90fef91543072bfcb6681a5ec8215e890c522297dbbf25aabfacb154
+DIST github.com-juju-schema-e4f08199aa80d3194008c0bd2e14ef5edc0e6be6.tar.gz 11853 BLAKE2B d5f7bc5e11575a369f0207384fdde03bce3e129528f9b83e9b2203908c6cf50b73fdbd0100c02e699980443972c0b2db6281afdc91b28ff2fa5e91051a0ac99c SHA512 19884c689c22c1c1ff02f5b64e527937e7349fb14661e65d7ecd93a5ad9ea3877380521d97b5140269a4eadafe0282c85366be4d75aeb23178c6794e11195aff
+DIST github.com-juju-testing-43f926548f91d55be6bae26ecb7d2386c64e887c.tar.gz 63273 BLAKE2B 9a3e53fba209cf3822f08c7f353b086b2dd8781e9abb9328423bba1acf63fabbcecbd5297b4ec97b559a3999d38428d09fa2f8cd3b94084aca066063471004d2 SHA512 bed825bc5151bad01e8d7e3a64e847e15bf47270bbcf023c1b3c36044ba8dbcda5dc7bc88ff53779a29a84bc13691494673744c7c53eb0f0b528f8baa827f9a4
 DIST github.com-juju-utils-4d9b38694f1e441c16421e2320f2b2fbd97fa597.tar.gz 207854 BLAKE2B 284c0990484e76ecca5feba7e40700bb0315e855618554068f9bd5606372242ac49123c5f5f7b4c59e6c16331b07157aba3eec1e7d2589e70a1fe11f24c5cb45 SHA512 5ba34b5804f661c56b8ea94dcf17099f77c061559e859cc0dba057f7aede0998ae55cdf77abb0693b6d44eb7de8dcf1449a7cc4f644d03f3649e5e8575d297eb
+DIST github.com-juju-utils-d18e608d01400189bcda3e2669505cbd30e9dda9.tar.gz 208093 BLAKE2B ce7897f4ff4f68658a39bd558ed8be6f51e9b7bd5f991f000c087d1189304b6e5b71202b5467f284194749a522ba25197e6f691d4a6b7b4472f92cf6004d714a SHA512 cca6782a98322158ce2998fa3106a25139e2b25778556bdf0b2e55889adcace4610964354651be46bb6daa4a937a0b1e8a16fb56db32c79fdf71a33cf90a2c0b
 DIST github.com-juju-version-1f41e27e54f21acccf9b2dddae063a782a8a7ceb.tar.gz 6965 BLAKE2B d90780eed7a910c07d33e4debc5e877599935d6e377bc19560aeb46c83f93fe90fa323b9712a23b6ae4e4e78fba5c4b1aa9b2be308527b265493d8e25f363605 SHA512 80406755558ad1d1101ae93db00405d8305ad5bddbf3124f86e955ab351d3e7882588b7d13dc605f04413fc961f4fde5fe228058d178bcd666b377c9066f17ff
+DIST github.com-juju-version-b64dbd566305c836274f0268fa59183a52906b36.tar.gz 6963 BLAKE2B 64b050bfd3baacf6a784b4a6c50b4da7e7396c4cf1e9f8c8582ebbf5b73017249fe7678fbea849ca9db0a4e721120d1546b49abb4c8faf02951f0744ed3fe439 SHA512 14c753195f68d6e5c3bc68165e6e9813721e1d3c19381a191c39b590d1e4041f161185df2a0234719eb2d3e759bb4f485c5753ae8c0c14a2e47549764f424e8c
 DIST github.com-juju-webbrowser-54b8c57083b4afb7dc75da7f13e2967b2606a507.tar.gz 3930 BLAKE2B 58b8a759379dd8bd25805c41813d8ac6dff16253ec8ca063a7d93eeeaf7741451d08cebcd323299a8f828de7e87b2db3df63f3f31188eabd6862ab9cad4cde65 SHA512 ac04ae3adaa95fbd3278019629dd6ed12070a93697217098b1755998cbc6143c606e8176c172883fd27d55cea35b9877877b88a7fa5dd6dd4106477744c0b013
+DIST github.com-julienschmidt-httprouter-d1898390779332322e6b5ca5011da4bf249bb056.tar.gz 22912 BLAKE2B a02f766ef5e089af3bb8c30a1841f5e4471a69652ad6cf33c9050f8ea0ec95b95985776a26b163cc45392cb5aceef0265979a35fd9500c1db5fae3331fbe951a SHA512 93e9783f0be29090cab1f5f3c79c3c4801e8a7389e37845ba7113c2f78861ba81a668c3248630f90a663bcb1bc86bf3a81c0e1b33c4bbf6517e2731bfc7ef3b1
 DIST github.com-julienschmidt-httprouter-e1b9828bc9e5904baec057a154c09ca40fe7fae0.tar.gz 22461 BLAKE2B 159deb9cb8fe32f165bf96b9240f68c0fbf35873b6fe9f05c351f690e8a3713eed8a048fe2d917dc0f3622d0c4b84509771f20c9d4eeff8d380bd8b841d19748 SHA512 a8e1610caa188bcde29a603c05e2cc6914949637d17d4f8d7d0efa51edc4c348767af7fdf3072365ed2f26e0947112a5521a88fec383697243a85061b741462c
-DIST github.com-lxc-go-lxc-74fb852c18ea4341f85e49bb6f33635946aabda7.tar.gz 37089 BLAKE2B 340ab5b57141d0a2f2b313f048c93a0f0010f257747026b1b787a662d4fdf148ec1edf6378a59aaa00dcb05c151f000a3096b55494ee9dde88eb74b383ffa079 SHA512 260ced6801464464652f07b747e452b4b72e4ee0d318c82cce6a64673c34ea1844650a7c3c90a6391c58b7ba8c11ee7345564e2436a79b7014124f063a3bacbb
+DIST github.com-kr-pretty-cfb55aafdaf3ec08f0db22699ab822c50091b1c4.tar.gz 8505 BLAKE2B 3926171a1cc2bd3abea36f54461832e2c5fc289fe29746e8cbed9ec4b9968003034b4eeb743280fd4da3519f299be5e375dcdcae8f741b145c348edb0f2cb58f SHA512 64deea56fab06cda3516371262ae1407bcb3002ec3c44807b4b96c78aa7f64514dd8ba06575a751b74967d36663994308e4848f1b57383c91816293144d364da
+DIST github.com-kr-text-7cafcd837844e784b526369c9bce262804aebc60.tar.gz 8585 BLAKE2B 723d388af4f41ddbd7082c8358afffcef5dd274496ea15739f41acbfeb2b7496a97f8f045800cab2b9ca131e7bc1bee4e8fd3c72d423bfabfe18d2b305769413 SHA512 057f787ccb44f7a389983ea0cb286cb1bb876f9e032574d5a8c77d333436f230bb85eae649fd6202a48a6b5725ca8a73cdf004fd78d8edf0ddf624b621cd6a43
+DIST github.com-lxc-go-lxc-2660c429a942a4a21455765c7046dde612c1baa7.tar.gz 38186 BLAKE2B 988fc04845e0f5f144836f6e360224d05c176982b8b079336f7f3c78c8575f2c68cb7f0b296f859e04e67f1853cb82c2bd0a915e2524f2c116894b8009774bfa SHA512 24da7ec084cda93a6b8cebb4023de499c6459e65f7d0c6f414bff243eadbae761fcd6d6b607dd14d9e8c78dae7a19619e772c4086ed7f0c84de065c3fb3df786
 DIST github.com-lxc-go-lxc-a7d112aed2f5f57f565d6e557671eeef7e76811c.tar.gz 38226 BLAKE2B 62ad90e0a0ae511b8b94857ad8be761f3d8fb0678ee67321934a2be6a931b6623822c51a4f304e59127008d75f5d44a7dd897d35591e6414b906a16c45232466 SHA512 7c2fffc303e4c8f89676e9a704f64698f2c7e35bcdb7376a9917d89e611dba06a8a42267edd58ad8ca099f43cbde41c0c6a99b6950c0bbcdb9f49296ded4da50
-DIST github.com-lxc-go-lxc-de2c8bfd65a78752d6a70b4ad99114c6969363b0.tar.gz 36156 BLAKE2B fa61c104fea008df7cd4de6a7c62d60cdacee0b1a2e49300a4ccf6d94537d7ce0eea89fb54840d93916e0112e7b699e2cf249fd1c22a61510bb6f8e93ee17665 SHA512 57e84c66b8c8260e3d2631b37e5dabcaf5136e47ed4233489f8fd3b2cc8796c495dbc78390e4372b0cc54ee5920d1f469579f77de1c0291c3ae31dfd6b628dbb
 DIST github.com-lxc-lxd-a324ad91230e5353fe746d06636dc59211122e6c.tar.gz 883109 BLAKE2B 9f4b7cf665fe693addbc56b721e0a02e8f64002e7e8bfa2d9a084590f7076c6e991db22a60d4b4070cece7f223fefa5f8ca35a68121edee8fbc9bb1437fb9c7f SHA512 ae1f43fef4a33e48f9c2a002a5e32dd7177eda78449180e147b2b23c8442bc5ad3def120caf2a4e494b4e4b6f1415c51af999fa7c838e3710ce046e3f653b03b
+DIST github.com-lxc-lxd-e641ae45dc13cc27510c9d2127eece46ed9ac16b.tar.gz 1153341 BLAKE2B 55d0746f8bef0d3f3e928e9a5f4dfc0cc970abdfc69220a21d4160b8f83108aa9e063399b05a5932f406c99df563f08ff212fdc13511a7bcff765318ce431956 SHA512 38cfff2679aff2fe727d1f9d057c3ba0d15aec5f217925ac6f67c36c8df590fd17c080c719f885f84b3fcaac6762c705efcd2e89fe5036f997b629bb23184253
 DIST github.com-mattn-go-colorable-6fcc0c1fd9b620311d821b106a400b35dc95c497.tar.gz 8152 BLAKE2B 1bf8a085568b775c6aba6ef292be680e0ac522434b8563936f3061e8d44096b7a17e813b6b9818ecc3e5b3478259c1f364a48182cf46906336fea852e345d45f SHA512 da35fd75832c039baeb089dab06565ea7bda0eaddc14188a1ad21306b268322fd53f01cd48c652a0bae947139d8c8eb0086740edfa1ce7463625a9c9b2d9180b
-DIST github.com-mattn-go-colorable-ad5389df28cdac544c99bd7b9161a0b5b6ca9d1b.tar.gz 8089 BLAKE2B 315c9f5338909f59c10492e9a86bea26d6d039bf251657caffd998d07b4e3de5961d9d73b7f8b177af733207d149723578e61f93b1b8f72b186cb6c3cbae0e55 SHA512 0f458e6acfec266b58cd458bd05bc04617df0ef223ffa6a6c374decd29555a78441f3a17df7b5f782d96a25f56bcece061407e9778e25ceafeedafa014a45bb4
-DIST github.com-mattn-go-colorable-ded68f7a9561c023e790de24279db7ebf473ea80.tar.gz 7522 BLAKE2B 03acc68ae0f4faf3ff4f3e4afb4b77a1b40457e121483e37ad9b07efa72ed509b287299859ea516e05af5d537eae9df5e7ad43ebfca2a96ae32c738680c7d029 SHA512 ae09fd28e2aae98d0b73bf71ee7496d8d53e20232428d09e021ee8571ca7e990e85c0d9613c89851e2025624d317a26e1768f4e7af12294eb1a189a241bd8daf
+DIST github.com-mattn-go-colorable-efa589957cd060542a26d2dd7832fd6a6c6c3ade.tar.gz 8208 BLAKE2B 4cd558c21bd893f17280c05550015f2f8148344d50dbd958f7cc7fa68d06223d0e732ace81c445f0091357d6d0a1564efd7d246af5cf432de0d8728f5cb1d250 SHA512 fc274e5699b637e953b31e5014b759f0367d925c289f9eabd7538eaf916ec8a7613e3eaf6d8f9294869f54e943448cca21130daccf1717525aa123761026902e
 DIST github.com-mattn-go-isatty-6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c.tar.gz 3383 BLAKE2B 2034048312c4abc88a813d8ad83013f57e9a23477ecd847e92c3cf30e909e209f9a65acacf41d80b3569770c1400e338115c42fd48d358b66f68ccde69a9008d SHA512 1714a9e9ac7ad2ff30825328723b4c9a5c5f7544e876c6fe79b84c72ba1dd9bfcd6ded2308f6fcae8f1c893d22b84d6c72dfd30742edaa2a5b0d8e88eee27421
-DIST github.com-mattn-go-isatty-a5cdd64afdee435007ee3e9f6ed4684af949d568.tar.gz 3367 BLAKE2B 8b59d5944dfcceee679de77bed4533be45b7d5a23fecc1b2cc2ebac19da37e0caef51c58c9922a0c8fd9793a45fab9e7e10a1fbc0d3cc1bb92267720cbdd899f SHA512 16ccc654b77fbc405f7a72d6613376af53d18884288a070ec096df14e332ed387b81fc63daa2fe0d2b6e7a428fc00ab6da7da441f56a076d03b3327aacd0cee0
 DIST github.com-mattn-go-runewidth-97311d9f7767e3d6f422ea06661bc2c7a19e8a5d.tar.gz 22406 BLAKE2B e9f1d0da4d69c110a9b9ef0ec640dcb53bcc101288b15411367760b5710808f64eb8fe6f0d61f77ba89cad2f965da2d4f72d92e42a07986e1cc39777a050a8f8 SHA512 0452fbc64250169ea99fe4eb4e2ef4f81c7bce5b77572789186f749c9c502c29c7146f7ef57971b6b78db0abe33e9926931719dd610f59925e31e6dd6c0b8d70
-DIST github.com-mattn-go-sqlite3-615c193e01d8d462eef7ee390171506f531a1c9a.tar.gz 2030347 BLAKE2B 4b5c242f0eafc5a229e6198cb5c696beebb345c5a50cdd0b59ea0ea85b58972c8c3dcbbabfdd1e70d70a959f05783e8a0d21140b96c4dfeb0157386939cc2b72 SHA512 ee5ec75c9e1ac8ba5b21d4221af754055fb7f8fedca8c4a53b72c16a216eea570ecb436b14a3632cf5541b2053874d82898e601f27bbdaf97f2b230e64ee822b
-DIST github.com-mattn-go-sqlite3-83772a7051f5e30d8e59746a9e43dfa706b72f3b.tar.gz 2027317 BLAKE2B 527d5d7d938523993379e3e32cdd8186143676b42cff36ce944ab368e0761e042eb8484f743636eef5f023e5712307bbb3042731dc13537b1b38c9123a56b7ce SHA512 687b1c9f7b2f27be4ef0d924f691f17251fb84522647436d3e6d1ba5946208618156663d817d146f954ea07d31619c446a3023f9a811f113a3761cda0daebdec
+DIST github.com-mattn-go-runewidth-a9d6d1e4dc51df2130326793d49971f238839169.tar.gz 22882 BLAKE2B 4a9fb7eceb3bc3f32fac8bba304a971ba4387d3bb65799105682236b86a155c6921afb82f542bff4b90378bf6d47823f81a09999642d88b4f5e80521a1329674 SHA512 465b03ab84b9949d392ed8573dabb0b588fb92d410e027f45f4a58d9f9fbb8f9b03e33e5f9ed27f8d34146e9e26cbd8f229caa134278af203daef40859524202
 DIST github.com-mattn-go-sqlite3-d5ffb5c0cca8778699a929b236766f4a7af674e8.tar.gz 2071644 BLAKE2B e2aecc6c65f68120682afec947740c4c04dc464d09b19f92bcbe1660cc854be721d8b73734eb5aea701426336c88194768dd28b83ce96b4cdb1d1343105d5bda SHA512 daba1d9cfbed25f92fcedeae7588f31bfe8ad1eea30ae7e24fa4a83dee015f06858b05d6ead61d5a22cbf477070a275767132c030eb4697640cd8acd99816fe9
 DIST github.com-mpvl-subtest-f6e4cfd4b9ea1beb9fb5d53afba8c30804a02ae7.tar.gz 1066 BLAKE2B 15c502a85587ed58eb293667116bea860d9ac4986f3b0f13c695cf7de922a1cb1f574c4ae036e63e9caa56d93ba84055ce44eff862a8671d70a35ca681032970 SHA512 12668278478ea7e321ddaf46beb766d5607a9446a108550400c129754f7a701673e4331dc47336d75dab3d403d371656e72ce80555adc36d5ca708420fdb72c4
 DIST github.com-olekukonko-tablewriter-65fec0d89a572b4367094e2058d3ebe667de3b60.tar.gz 15185 BLAKE2B ba0e6cb42e67fddde9d4454c5757128842290daf6356bf44e05112d3759ef9373ae6ac7b82909f3cef7a31ac2b2612fc222861ca3f65190b24f80da9e2e0fa8e SHA512 48aa8d3e5795dc1d16486a1c418b60e51da254091081bc82116a66a7eac277c34814e0d8e598a7946dfbbc851b94a31d6d7e8032eb427bd858a5c3f56d3edbfd
-DIST github.com-olekukonko-tablewriter-a7a4c189eb47ed33ce7b35f2880070a0c82a67d4.tar.gz 15206 BLAKE2B 2048e228a2c9f24fb99cd9117cc90696589db657730d2f2866a629e6d8e9e31933659be3c250bed4d892d2660b9c3973819c7e1a0cbe5cddfb409a8e4d70228c SHA512 38bdb92ea0444dd0e32869f0d4f7f96c19997ef3382e9eb7a2eb0bf9475f8640e8d4f6639cbd48a7f12e90743b53a9c8bcbb0b6bc3e749f956446c6dfc6fc544
-DIST github.com-olekukonko-tablewriter-febf2d34b54a69ce7530036c7503b1c9fbfdf0bb.tar.gz 11822 BLAKE2B 89fad2365491ade50f4b309a598574bbbe4f3dc4140b37788d966983b3580ad5d682d4fe18c2059a5c29a24b232352683b4ea4a24cb8affa5df7078d2a6dcc1d SHA512 bfccf8eacd32840ec195c0e69d141fc24ca55d9f0832b38ad87e0c2292c61f5ff0731e83a19045ddebde4db8b9cd77b0b84214c5442f4cd4f8a892e77efce758
-DIST github.com-pborman-uuid-1b00554d822231195d1babd97ff4a781231955c9.tar.gz 12808 BLAKE2B e737f7b681ddf3a51949d16deda2c4abd062fc3247aab9835d5fb636eef0ec7f56b63c44da675fccb493798aeaf94115c2c5dbe25f84789ba52b419d5080328a SHA512 c332bd39781e7a3bd7125bbf26e62da2aca24bb89975491a4165a17580f3ffb99587e4620a9c9c17afff5d34865ae0b86065e1516ca325d0edc4dd84be269283
+DIST github.com-olekukonko-tablewriter-b8a9be070da40449e501c3c4730a889e42d87a9e.tar.gz 16790 BLAKE2B f69ec79cf7e3bfb6d7ee32139db6970b1f45edeb701bdb1b15de48f2a9b33a3eeab003e67e82de2c4b6597af4fd1d94064b7fd7d31b115491216d2e868ba6744 SHA512 697296bda248977a19c573ffe5ab8b2535becaf2d775229bab744b20f931e49ba83743b99201f2ac154ff2f8aab7ff1dae792d09e7be3b1d7e4963b5efffc53c
+DIST github.com-pborman-uuid-c65b2f87fee37d1c7854c9164a450713c28d50cd.tar.gz 13168 BLAKE2B 012484a585954b85c67c546e9d0c26f02e4ecdba772463bc19a3998cccab6a450ec70b62b5afd8fc7c5b7cf02815f46d84b073286e222a90e83bc59a2a1a427d SHA512 6e2190b5abdff228cd899d8a586e0aa6375486a9f0c8c5db1e1f1ca31daa3316c5f344f4f5a785c23ad0e70fa1f09faa847c6c96670db60c7c2cec0657c27c88
 DIST github.com-pborman-uuid-e533369306653d193b93dae055f6083cbf8ba54f.tar.gz 13157 BLAKE2B cc68f4a5f2d1e753d9aa471a4f5cde6dc38cc88b8e4558068701415d89cb7410b79ebd39a77152848b4f30d6af05dbb07c5a9b0c469822ef703d7419c9281b7a SHA512 e1142c36ee10c31c35dd82fec40376f83540cd2b30a0e250e83fcc1aa2f4133cd13c76338c82e6619760fada05be5b62b87ac7958bdcca736459dbb77535a4d0
-DIST github.com-pborman-uuid-e790cca94e6cc75c7064b1332e63811d4aae1a53.tar.gz 12805 BLAKE2B 8edb8dfbe4c1b57d3a4aea5134889949c3679b61813d70e210ef337bc5c8e25c95af56bb8fa4dad1a513d4ef88fb6ff9984dcfcb504bb0c55ae8526118feda93 SHA512 ab27b50c06384f20637e628d7e7289ff4b9f00f2fdb5e650aa7f4bf19bcd54cdd1b83fd9e3c45eede2ba8f35af9b177972597205ea29570b129f9a97e6c63c0e
+DIST github.com-pkg-errors-816c9085562cd7ee03e7f8188a1cfd942858cded.tar.gz 10916 BLAKE2B 9f55b1bf5dbd44aa6d9861d414c3746dd635483a2775877817b6135c9359011d39df7ed1fcb0fb855b4aa7fded62ca6dbda883d3a455c038b29e1861d211a9b1 SHA512 93f5c01490bb0a4fa8190a7bff00f4b872c411f2220d5cc4bae92e44e478de7aa80f693a4ff8f7f7cd5c5d85782e24e1e455823a632487e14567139225b814bb
 DIST github.com-rogpeppe-fastuuid-6724a57986aff9bff1a1770e9347036def7c89f6.tar.gz 2506 BLAKE2B 457d346a717b9ca9b5374369810a11d5e298949d6681e28a0e8cffca1e3e7d160eb67c3d607aae224f0865ec4ed4b0b21c11d9f316295f31efdf21cf4f70bf8a SHA512 ab6c7d2e32d9b72b4495e9465c03b0b97e1a869f464eb49f3eb522cb04f65b2a45f5359a52ce71af2f59cfd986e0d58a0a76dc02c2583ac46eb0e33efd425dd7
+DIST github.com-ryanfaerman-fsm-3dc1bc0980272fd56d81167a48a641dab8356e29.tar.gz 4808 BLAKE2B 9ab6998262fb759e6ecb3c00715dd65fa50bf67c34f214125077e57680d27e15fe8959f1e2d18439fb39753a6828b3fd21a7fd2ac3140aebce8ef13b2a246a42 SHA512 b011d684a3f6d00c3c72db72fdc7ec8011f2a9ad966500c50b5d11993c621bb9f23b681fad994c83b5a2802319e508956e603ad8c5591b157868303dc55f4011
+DIST github.com-spf13-cobra-4dab30cb33e6633c33c787106bafbfbfdde7842d.tar.gz 101259 BLAKE2B d2c53373011bf8aef9b6c5b3981aa3b2e64952f61cc99a0bd998ff3ca7e802950a4d91992e0e9b6d00ef736c2b8cdeab99fa879082c4fa141ce681599becf755 SHA512 d1e430177eab1e3ff6c85b23215e01099c4da3bae5a6029131ee1e2be6e876871934893c5f6050a2aed08900b75629794e1633577868ce6b163e26baecce7264
+DIST github.com-spf13-pflag-1cd4a0c365d95803411bec89fb7b76bade17053b.tar.gz 43062 BLAKE2B f63283f3175f8d251b00647bb3af874f8b413ff25c4ba43be005c4140b7db770c14f95058c3ee1f30c7c00fd8b82059dd507bf45a1a3ec8f5df7c9fa52f3ade2 SHA512 45f5d8d4e524c6009d05e83892b223bd4afc0572125dfccda10a5ea89883e48f360f92d6cbf14b09ef92355fb3757025e7abc3fdb946cb56a685c864fb3a0c95
 DIST github.com-stretchr-testify-2aa2c176b9dab406a6970f6a55f513e8a8c8b18f.tar.gz 94502 BLAKE2B 11d7fda9655c364de7c05a1ff0a2ead4b18261b016be89d66f118c6afdba7795bf55b54af64090121a0f789ce8708a85000298a5f032d3d578c36483bf64ae03 SHA512 b54e5d558d8419f1a5110c9803d8d120056264b4ccf0119207c1461a650c1a48fad35b4a6fdb681459be51f8bd6a728097e6c7c86bce0c0d828234aea6953ee0
-DIST github.com-stretchr-testify-f6abca593680b2315d2075e0f5e2a9751e3f431a.tar.gz 94237 BLAKE2B f23b1195bc4cc30e676f9388fac02d7aae93201f76c4e257ad95e5f20c0f5b160daec0072efaaea23a0d9ab8207ee94675f7126ab5dee9f37b26daba68826aa9 SHA512 3aaa245f70dcee49b08e5f677dfa2137b00cc0cbc18cd52d773722b951ec579e3f4e146f951de51973630488a9d9efc7c54462842c6fe5987cc099a44f04a03f
+DIST github.com-stretchr-testify-c679ae2cc0cb27ec3293fea7e254e47386f05d69.tar.gz 101524 BLAKE2B 00f01fe1b320c189bae451989c890ef950f33efe0bf68d4b3d50b6a7266c2e1b5a98d99171d3649bcf8b2e54b1cf723a293e971dc40425d4542259630f702fa3 SHA512 62cfcb8a3d8792927a542bc22a1c8f003d58b0be419deeb5ecd015c89618e5adf77aeb6e1e6524f6c8d9b6fe35174a7bff20f750a419d451b34527bf46e3a081
+DIST github.com-syndtr-gocapability-33e07d32887e1e06b7c025f27ce52f62c7990bc0.tar.gz 10087 BLAKE2B 6ec084841ff1d093ef369d9049506df04ed7ac9716d0c374d919f3daa1e58014f8b3a7024c66cb605b0b8bd2e1448ba892e0f4a1efcd8dd962fe12747fdef04f SHA512 4150f84c716b65c02ff13b40ef7c20be7d23ac7602c1d982e7548df37c7d141f0e74ac328073f04530b5af00bf09fb4769eacb978d8640cda1fdbba5c317856b
 DIST github.com-syndtr-gocapability-db04d3cc01c8b54962a58ec7e491717d06cfcc16.tar.gz 9899 BLAKE2B 584e75a9c47d28498aedb5c85b3409c79c84ec9fc47a5a9dc77aa117b4e48f681f72a12a03fafa566a405def40b4961bb7343cad0c6ecb3cd9da883a51ed20d6 SHA512 fdd8a3cc1add7570269df6ad8867fd9d2da7bbf751416a5376ff123dcf959be13912b766f5214123e20fabd242a629e02f3bdaf0680782805afb81f6f08a78ae
-DIST github.com-syndtr-gocapability-e7cb7fa329f456b3855136a2642b197bad7366ba.tar.gz 9894 BLAKE2B 02035226b535d3e029c421b1a3489160a23f474be970652fc153c5066ca50d6cdfc2cee8d3b120fd246a0af0b9a914b4f7a6f00801e20cdc5fca8d2d6bb8a1bf SHA512 ee2de5568b76b87723e80e081e16094093f09a6be68dd0920793e007d4b705808ec1eac7a15b4c0ce7ed20aff04978f4ade264ab5bf5bdc5e2fdc46db2f4116c
-DIST lxd-2.14.tar.gz 629982 BLAKE2B a55ec6c762e0a4769ec2be3d063a82d8f6b36af8d4997891d1b51fbf2eb181b5ee86dfbd9e494a0d7393a76062d8fcbbdc7aaefb9b37503357639f6fee4faf76 SHA512 a1b6d7eb055a29ba3c28f9184e6dbac5f279332a6445347bbf8f946ab23b0afb353ac146b379f22922fe678ce034c18dc9d5d2f2dd7704b8cce1730c29dfa9c3
-DIST lxd-2.19.tar.gz 756698 BLAKE2B 71c6d829735255cf6ac0e76db1157374bcc8f8138b1847eebe0b17fc38060572e860179d943e5538e6df13267c429da6c295357eebfa81f265a930fe43feb82b SHA512 18461bc5decacdb39ebf7839a376da9a02af428a324bd5642c2bc6f1bb2e5d5b3e03af1d4be333348b0f001f0ebb08e7d36bdcc1d2f928c6e588a8751c29e981
 DIST lxd-2.21.tar.gz 882352 BLAKE2B 80542bcc03c05667ee0207dfbfd2bf41c5a6ef69178aec06ad62fe3521ed012ed9b82c68c0254e0299e8e1dfd274a0622f32bde730480a950ab6ba15ddae5f4b SHA512 9a8ec3a97e4c861a80311dbdecbf5a485c0af85d6ba6b20680ca17e6ac877de3f27cfdcf0a111ba0db2b7c562dfe2f41336b562b7c13350c4543505b3c17357e
-EBUILD lxd-2.14-r1.ebuild 6704 BLAKE2B 99a46d88f25e2c7d090278e12c680f81242fea55aad14643964c6cc41bf03de1ccb3f467de82ab9cbef0b01d616bfdb6b1f6a73d89c9bdda037641bd3bdd554d SHA512 be9283675d4a47dbe425a449d331918121fd5b5da60a1797020e89053089757da7c637cdb0db2967565d1440018db19c705d5fd8112a9208905f50c99ca2b66c
-EBUILD lxd-2.19.ebuild 6605 BLAKE2B c39104cd32ac100377c6486219af4c7c8e448594501991f89314f9b6275a83080fa5adf956794efc3e36ab72205a42b8c642f04800f09a5995b3db4a391d4206 SHA512 45388ffb9cf442c6a0eb645f5302e48cce7aa721d6e016b953c730e63a1b2769cce2975f2edfb9162afaa196045363027e51bb09759428f0be0233d4260a7dff
+DIST lxd-3.0.0.tar.gz 1152282 BLAKE2B e84808c626064ba6985c08119905510c2a9659edca09887a55bfe006eaba4a624215d48978e18ab642f34e54e58fc1d2e04303c9db73c332df8c5d29568fb779 SHA512 b4de839d26080f2b14b1f6f04a92b000e1abaa0712377528b87ca79e01b9c46b7b6c7f7ce5365f37f7a0ae8a2459bcdc6010fcb2a238d78e34d090750ae070f3
 EBUILD lxd-2.21.ebuild 7883 BLAKE2B f933f15dd551c335bbe7cf95a9dbe35f4b272ff720e7aa080f984705e899e5da47c4e6f0617860896467bcec481a50591f6f3c0f731f1f2ff2df0178aaaf8882 SHA512 27167d7c8a2dc7aa988016cbb90bd3ae272732a709d8938ae3b77ffbacf12b818df27bf1ddaec9c3372403ad1380dcc7b9df6f8bce237742d02fb881b60aa552
+EBUILD lxd-3.0.0.ebuild 9944 BLAKE2B 710cb242086f23b7325c535d177322815ccf15d0e17421f4f8d91b525f5bfe2efc730bbcc64e4da93d1de4ca529af50e762dc4eb7c97ac1c3775796de758ac4a SHA512 d94e776eb43cbdf38850fe8d891326de862a4c53d45b65119f90327f7fbba04ba04fe8c6559ef2fccf521ccfb83b54729fc5a79e40a9050242b651e8c3aa151a
 MISC metadata.xml 952 BLAKE2B 1d16ed30ed5222c36a5ccd6355ad5f036fad77152533d8c0fb66fd2a43ad34c8136cb8044f9b5d2c8806d08711b20f7dcd883db57fde229c869382775a5bddff SHA512 962339d8aff6dd9c44e7642449468ffff20dccbdc45bdb614199d576ed4595edac356dd216ebaac50290ca7383630ab8e5355eeb05a76d91ad542cab7cd8a456
diff --git a/app-emulation/lxd/lxd-2.14-r1.ebuild b/app-emulation/lxd/lxd-2.14-r1.ebuild
deleted file mode 100644
index 85fcdff8d640..000000000000
--- a/app-emulation/lxd/lxd-2.14-r1.ebuild
+++ /dev/null
@@ -1,217 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Fast, dense and secure container management"
-HOMEPAGE="https://linuxcontainers.org/lxd/introduction/"
-EGO_PN_PARENT="github.com/lxc"
-EGO_PN="${EGO_PN_PARENT}/lxd"
-EGIT_COMMIT="4c32a1ff7267d4934870e2444dc1394fea5a78e4"
-EGO_VENDOR=(
-	"github.com/dustinkirkland/golang-petname 1f4996aa8aa05ee066aaf9e3179d340b48c6da74"
-	"github.com/golang/protobuf 5a0f697c9ed9d68fef0116532c6e05cfeae00e55"
-	"github.com/gorilla/mux 18fca31550181693b3a834a15b74b564b3605876"
-	"github.com/gorilla/websocket a91eba7f97777409bc2c443f5534d41dd20c5720"
-	"github.com/gosexy/gettext 74466a0a0c4a62fea38f44aa161d4bbfbe79dd6b"
-	"github.com/jessevdk/go-flags 5695738f733662da3e9afc2283bba6f3c879002d"
-	"github.com/mattn/go-colorable ded68f7a9561c023e790de24279db7ebf473ea80"
-	"github.com/mattn/go-runewidth 97311d9f7767e3d6f422ea06661bc2c7a19e8a5d"
-	"github.com/mattn/go-sqlite3 83772a7051f5e30d8e59746a9e43dfa706b72f3b"
-	"github.com/olekukonko/tablewriter febf2d34b54a69ce7530036c7503b1c9fbfdf0bb"
-	"github.com/pborman/uuid 1b00554d822231195d1babd97ff4a781231955c9"
-	"github.com/stretchr/testify f6abca593680b2315d2075e0f5e2a9751e3f431a"
-	"github.com/syndtr/gocapability e7cb7fa329f456b3855136a2642b197bad7366ba"
-	"golang.org/x/crypto e1a4589e7d3ea14a3352255d04b6f1a418845e5e github.com/golang/crypto"
-	"golang.org/x/net e4fa1c5465ad6111f206fc92186b8c83d64adbe1 github.com/golang/net"
-	"golang.org/x/sync f52d1811a62927559de87708c8913c1650ce4f26 github.com/golang/sync"
-	"golang.org/x/text ccbd3f7822129ff389f8ca4858a9b9d4d910531c github.com/golang/text"
-	"golang.org/x/tools 2a5864fcfb595b4ee9a7607f1beb25778cf64c6e github.com/golang/tools"
-	"gopkg.in/check.v1 20d25e2804050c1cd24a7eea1e7a6447dd0e74ec github.com/go-check/check"
-	"gopkg.in/flosch/pongo2.v3 5e81b817a0c48c1c57cdf1a9056cf76bdee02ca9 github.com/flosch/pongo2"
-	"gopkg.in/inconshreveable/log15.v2 b105bd37f74e5d9dc7b6ad7806715c7a2b83fd3f github.com/inconshreveable/log15"
-	"gopkg.in/lxc/go-lxc.v2 de2c8bfd65a78752d6a70b4ad99114c6969363b0 github.com/lxc/go-lxc"
-	"gopkg.in/tomb.v2 d5d1b5820637886def9eef33e03a27a9f166942c github.com/go-tomb/tomb"
-	"gopkg.in/yaml.v2 cd8b52f8269e0feb286dfeef29f8fe4d5b397e0b github.com/go-yaml/yaml"
-)
-
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64"
-
-PLOCALES="de el fr it ja nl ru sr sv tr"
-IUSE="+daemon nls test"
-
-# IUSE and PLOCALES must be defined before l10n inherited
-inherit bash-completion-r1 golang-build l10n linux-info systemd user golang-vcs-snapshot
-
-SRC_URI="${ARCHIVE_URI}
-	${EGO_VENDOR_URI}"
-
-DEPEND="
-	>=dev-lang/go-1.7.1
-	dev-libs/protobuf
-	nls? ( sys-devel/gettext )
-	test? (
-		app-misc/jq
-		dev-db/sqlite
-		net-misc/curl
-		sys-devel/gettext
-	)
-"
-
-RDEPEND="
-	daemon? (
-		app-arch/xz-utils
-		>=app-emulation/lxc-2.0.7[seccomp]
-		net-dns/dnsmasq[dhcp,ipv6]
-		net-misc/rsync[xattr]
-		sys-apps/iproute2[ipv6]
-		sys-fs/squashfs-tools
-		virtual/acl
-	)
-"
-
-CONFIG_CHECK="
-	~BRIDGE
-	~DUMMY
-	~IP6_NF_NAT
-	~IP6_NF_TARGET_MASQUERADE
-	~IPV6
-	~IP_NF_NAT
-	~IP_NF_TARGET_MASQUERADE
-	~MACVLAN
-	~NETFILTER_XT_MATCH_COMMENT
-	~NET_IPGRE
-	~NET_IPGRE_DEMUX
-	~NET_IPIP
-	~NF_NAT_MASQUERADE_IPV4
-	~NF_NAT_MASQUERADE_IPV6
-	~VXLAN
-"
-
-ERROR_BRIDGE="BRIDGE: needed for network commands"
-ERROR_DUMMY="DUMMY: needed for network commands"
-ERROR_IP6_NF_NAT="IP6_NF_NAT: needed for network commands"
-ERROR_IP6_NF_TARGET_MASQUERADE="IP6_NF_TARGET_MASQUERADE: needed for network commands"
-ERROR_IPV6="IPV6: needed for network commands"
-ERROR_IP_NF_NAT="IP_NF_NAT: needed for network commands"
-ERROR_IP_NF_TARGET_MASQUERADE="IP_NF_TARGET_MASQUERADE: needed for network commands"
-ERROR_MACVLAN="MACVLAN: needed for network commands"
-ERROR_NETFILTER_XT_MATCH_COMMENT="NETFILTER_XT_MATCH_COMMENT: needed for network commands"
-ERROR_NET_IPGRE="NET_IPGRE: needed for network commands"
-ERROR_NET_IPGRE_DEMUX="NET_IPGRE_DEMUX: needed for network commands"
-ERROR_NET_IPIP="NET_IPIP: needed for network commands"
-ERROR_NF_NAT_MASQUERADE_IPV4="NF_NAT_MASQUERADE_IPV4: needed for network commands"
-ERROR_NF_NAT_MASQUERADE_IPV6="NF_NAT_MASQUERADE_IPV6: needed for network commands"
-ERROR_VXLAN="VXLAN: needed for network commands"
-
-PATCHES=(
-	"${FILESDIR}/${P}-dont-go-get.patch"
-	# See https://github.com/lxc/lxd/pull/3390
-	"${FILESDIR}/${P}-fix-fr-po.patch"
-)
-
-# KNOWN ISSUES:
-# - Translations may not work.  I've been unsuccessful in forcing
-#   localized output.  Anyway, upstream (Canonical) doesn't install the
-#   message files.
-
-src_prepare() {
-	default_src_prepare
-
-	# Warn on unhandled locale changes
-	l10n_find_plocales_changes "${S}/src/${EGO_PN}/po" "" .po
-
-	# Examples in go-lxc make our build fail.
-	rm -rf "${S}/src/${EGO_PN}/vendor/gopkg.in/lxc/go-lxc.v2/examples" || die
-}
-
-src_compile() {
-	export GOPATH="${S}"
-
-	cd "${S}/src/${EGO_PN}" || die "Failed to change to deep src dir"
-
-	tmpgoroot="${T}/goroot"
-	if use daemon; then
-		# Build binaries
-		emake
-	else
-		# build client tool
-		emake client
-	fi
-
-	use nls && emake build-mo
-}
-
-src_test() {
-	if use daemon; then
-		# Go native tests should succeed
-		golang-build_src_test
-	fi
-}
-
-src_install() {
-	# Installs all src,pkg to /usr/lib/go-gentoo
-	golang-build_src_install
-
-	cd "${S}"
-	dobin bin/lxc
-	if use daemon; then
-		dosbin bin/lxd
-		dobin bin/fuidshift
-	fi
-
-	cd "src/${EGO_PN}"
-
-	if use nls; then
-		for lingua in ${PLOCALES}; do
-			if has ${lingua} ${LINGUAS-${lingua}}; then
-				domo po/${lingua}.mo
-			fi
-		done
-	fi
-
-	if use daemon; then
-		newinitd "${FILESDIR}"/${P}.initd lxd
-		newconfd "${FILESDIR}"/${P}.confd lxd
-
-		systemd_newunit "${FILESDIR}"/${P}.service ${PN}.service
-	fi
-
-	newbashcomp config/bash/lxd-client lxc
-
-	dodoc AUTHORS CONTRIBUTING.md README.md doc/*
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Consult https://wiki.gentoo.org/wiki/LXD for more information,"
-	einfo "including a Quick Start."
-
-	# The messaging below only applies to daemon installs
-	use daemon || return 0
-
-	# The control socket will be owned by (and writeable by) this group.
-	enewgroup lxd
-
-	# Ubuntu also defines an lxd user but it appears unused (the daemon
-	# must run as root)
-
-	einfo
-	einfo "Though not strictly required, some features are enabled at run-time"
-	einfo "when the relevant helper programs are detected:"
-	einfo "- sys-apps/apparmor"
-	einfo "- sys-fs/btrfs-progs"
-	einfo "- sys-fs/lvm2"
-	einfo "- sys-fs/lxcfs"
-	einfo "- sys-fs/zfs"
-	einfo "- sys-process/criu"
-	einfo
-	einfo "Since these features can't be disabled at build-time they are"
-	einfo "not USE-conditional."
-	einfo
-	einfo "Networks with bridge.mode=fan are unsupported due to requiring"
-	einfo "a patched kernel and iproute2."
-}
diff --git a/app-emulation/lxd/lxd-2.19.ebuild b/app-emulation/lxd/lxd-2.19.ebuild
deleted file mode 100644
index 097d737297f2..000000000000
--- a/app-emulation/lxd/lxd-2.19.ebuild
+++ /dev/null
@@ -1,207 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Fast, dense and secure container management"
-HOMEPAGE="https://linuxcontainers.org/lxd/introduction/"
-EGO_PN_PARENT="github.com/lxc"
-EGO_PN="${EGO_PN_PARENT}/lxd"
-
-# Maintained with https://github.com/hsoft/gentoo-ego-vendor-update
-# The "# branch" comments are there for the script, they're important.
-EGO_VENDOR=(
-	"github.com/dustinkirkland/golang-petname d3c2ba80e75eeef10c5cf2fc76d2c809637376b3"
-	"github.com/golang/protobuf 1643683e1b54a9e88ad26d98f81400c8c9d9f4f9"
-	"github.com/gorilla/mux 7625a85c14e615274a4ee4bc8654f72310a563e4"
-	"github.com/gorilla/websocket 71fa72d4842364bc5f74185f4161e0099ea3624a"
-	"github.com/gosexy/gettext 74466a0a0c4a62fea38f44aa161d4bbfbe79dd6b"
-	"github.com/jessevdk/go-flags f88afde2fa19a30cf50ba4b05b3d13bc6bae3079"
-	"github.com/mattn/go-colorable ad5389df28cdac544c99bd7b9161a0b5b6ca9d1b"
-	"github.com/mattn/go-runewidth 97311d9f7767e3d6f422ea06661bc2c7a19e8a5d"
-	"github.com/mattn/go-sqlite3 615c193e01d8d462eef7ee390171506f531a1c9a"
-	"github.com/olekukonko/tablewriter a7a4c189eb47ed33ce7b35f2880070a0c82a67d4"
-	"github.com/pborman/uuid e790cca94e6cc75c7064b1332e63811d4aae1a53"
-	"github.com/stretchr/testify 2aa2c176b9dab406a6970f6a55f513e8a8c8b18f"
-	"github.com/syndtr/gocapability db04d3cc01c8b54962a58ec7e491717d06cfcc16"
-	"github.com/go-stack/stack 817915b46b97fd7bb80e8ab6b69f01a53ac3eebf"
-	"github.com/mattn/go-isatty a5cdd64afdee435007ee3e9f6ed4684af949d568"
-	"github.com/juju/errors c7d06af17c68cd34c835053720b21f6549d9b0ee"
-	"golang.org/x/crypto 2509b142fb2b797aa7587dad548f113b2c0f20ce github.com/golang/crypto"
-	"golang.org/x/net c73622c77280266305273cb545f54516ced95b93 github.com/golang/net"
-	"golang.org/x/sync 8e0aa688b654ef28caa72506fa5ec8dba9fc7690 github.com/golang/sync"
-	"golang.org/x/text 6eab0e8f74e86c598ec3b6fad4888e0c11482d48 github.com/golang/text"
-	"golang.org/x/tools 9b61fcc4c548d69663d915801fc4b42a43b6cd9c github.com/golang/tools"
-	"golang.org/x/sys 661970f62f5897bc0cd5fdca7e087ba8a98a8fa1 github.com/golang/sys"
-	"gopkg.in/check.v1 20d25e2804050c1cd24a7eea1e7a6447dd0e74ec github.com/go-check/check" # branch v1
-	"gopkg.in/flosch/pongo2.v3 5e81b817a0c48c1c57cdf1a9056cf76bdee02ca9 github.com/flosch/pongo2" # branch v3
-	"gopkg.in/inconshreveable/log15.v2 0decfc6c20d9ca0ad143b0e89dcaa20f810b4fb3 github.com/inconshreveable/log15" # branch master
-	"gopkg.in/lxc/go-lxc.v2 74fb852c18ea4341f85e49bb6f33635946aabda7 github.com/lxc/go-lxc" # branch v2
-	"gopkg.in/tomb.v2 d5d1b5820637886def9eef33e03a27a9f166942c github.com/go-tomb/tomb" # branch v2
-	"gopkg.in/yaml.v2 eb3733d160e74a9c7e442f435eb3bea458e1d19f github.com/go-yaml/yaml" # branch v2
-)
-
-ARCHIVE_URI="https://${EGO_PN}/archive/${P}.tar.gz -> ${P}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE="+daemon +ipv6 +dnsmasq nls test"
-
-inherit bash-completion-r1 linux-info systemd user golang-vcs-snapshot
-
-SRC_URI="${ARCHIVE_URI}
-	${EGO_VENDOR_URI}"
-
-DEPEND="
-	>=dev-lang/go-1.7.1
-	dev-libs/protobuf
-	nls? ( sys-devel/gettext )
-	test? (
-		app-misc/jq
-		dev-db/sqlite
-		net-misc/curl
-		sys-devel/gettext
-	)
-"
-
-RDEPEND="
-	daemon? (
-		app-arch/xz-utils
-		>=app-emulation/lxc-2.0.7[seccomp]
-		dnsmasq? (
-			net-dns/dnsmasq[dhcp,ipv6?]
-		)
-		net-misc/rsync[xattr]
-		sys-apps/iproute2[ipv6?]
-		sys-fs/squashfs-tools
-		virtual/acl
-	)
-"
-
-CONFIG_CHECK="
-	~BRIDGE
-	~DUMMY
-	~IP6_NF_NAT
-	~IP6_NF_TARGET_MASQUERADE
-	~IPV6
-	~IP_NF_NAT
-	~IP_NF_TARGET_MASQUERADE
-	~MACVLAN
-	~NETFILTER_XT_MATCH_COMMENT
-	~NET_IPGRE
-	~NET_IPGRE_DEMUX
-	~NET_IPIP
-	~NF_NAT_MASQUERADE_IPV4
-	~NF_NAT_MASQUERADE_IPV6
-	~VXLAN
-"
-
-ERROR_BRIDGE="BRIDGE: needed for network commands"
-ERROR_DUMMY="DUMMY: needed for network commands"
-ERROR_IP6_NF_NAT="IP6_NF_NAT: needed for network commands"
-ERROR_IP6_NF_TARGET_MASQUERADE="IP6_NF_TARGET_MASQUERADE: needed for network commands"
-ERROR_IPV6="IPV6: needed for network commands"
-ERROR_IP_NF_NAT="IP_NF_NAT: needed for network commands"
-ERROR_IP_NF_TARGET_MASQUERADE="IP_NF_TARGET_MASQUERADE: needed for network commands"
-ERROR_MACVLAN="MACVLAN: needed for network commands"
-ERROR_NETFILTER_XT_MATCH_COMMENT="NETFILTER_XT_MATCH_COMMENT: needed for network commands"
-ERROR_NET_IPGRE="NET_IPGRE: needed for network commands"
-ERROR_NET_IPGRE_DEMUX="NET_IPGRE_DEMUX: needed for network commands"
-ERROR_NET_IPIP="NET_IPIP: needed for network commands"
-ERROR_NF_NAT_MASQUERADE_IPV4="NF_NAT_MASQUERADE_IPV4: needed for network commands"
-ERROR_NF_NAT_MASQUERADE_IPV6="NF_NAT_MASQUERADE_IPV6: needed for network commands"
-ERROR_VXLAN="VXLAN: needed for network commands"
-
-PATCHES=(
-	"${FILESDIR}/${P}-dont-go-get.patch"
-)
-
-src_prepare() {
-	default_src_prepare
-
-	# Examples in go-lxc make our build fail.
-	rm -rf "${S}/src/${EGO_PN}/vendor/gopkg.in/lxc/go-lxc.v2/examples" || die
-}
-
-src_compile() {
-	export GOPATH="${S}"
-
-	cd "${S}/src/${EGO_PN}" || die "Failed to change to deep src dir"
-
-	tmpgoroot="${T}/goroot"
-	if use daemon; then
-		# Build binaries
-		emake
-	else
-		# build client tool
-		emake client
-	fi
-
-	use nls && emake build-mo
-}
-
-src_test() {
-	if use daemon; then
-		export GOPATH="${S}"
-		cd "${S}/src/${EGO_PN}" || die "Failed to change to deep src dir"
-
-		emake check
-	fi
-}
-
-src_install() {
-	dobin bin/lxc
-	if use daemon; then
-		dosbin bin/lxd
-		dobin bin/fuidshift
-	fi
-
-	cd "src/${EGO_PN}" || die "can't cd into ${S}/src/${EGO_PN}"
-
-	if use nls; then
-		domo po/*.mo
-	fi
-
-	if use daemon; then
-		newinitd "${FILESDIR}"/${PN}.initd lxd
-		newconfd "${FILESDIR}"/${PN}.confd lxd
-
-		systemd_newunit "${FILESDIR}"/${PN}.service ${PN}.service
-	fi
-
-	newbashcomp config/bash/lxd-client lxc
-
-	dodoc AUTHORS README.md doc/*
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Consult https://wiki.gentoo.org/wiki/LXD for more information,"
-	einfo "including a Quick Start."
-
-	# The messaging below only applies to daemon installs
-	use daemon || return 0
-
-	# The control socket will be owned by (and writeable by) this group.
-	enewgroup lxd
-
-	# Ubuntu also defines an lxd user but it appears unused (the daemon
-	# must run as root)
-
-	einfo
-	einfo "Though not strictly required, some features are enabled at run-time"
-	einfo "when the relevant helper programs are detected:"
-	einfo "- sys-apps/apparmor"
-	einfo "- sys-fs/btrfs-progs"
-	einfo "- sys-fs/lvm2"
-	einfo "- sys-fs/lxcfs"
-	einfo "- sys-fs/zfs"
-	einfo "- sys-process/criu"
-	einfo
-	einfo "Since these features can't be disabled at build-time they are"
-	einfo "not USE-conditional."
-	einfo
-	einfo "Networks with bridge.mode=fan are unsupported due to requiring"
-	einfo "a patched kernel and iproute2."
-}
diff --git a/app-emulation/lxd/lxd-3.0.0.ebuild b/app-emulation/lxd/lxd-3.0.0.ebuild
new file mode 100644
index 000000000000..a8e19ac32379
--- /dev/null
+++ b/app-emulation/lxd/lxd-3.0.0.ebuild
@@ -0,0 +1,251 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Fast, dense and secure container management"
+HOMEPAGE="https://linuxcontainers.org/lxd/introduction/"
+EGO_PN_PARENT="github.com/lxc"
+EGO_PN="${EGO_PN_PARENT}/lxd"
+
+# Maintained with https://github.com/hsoft/gentoo-ego-vendor-update
+# The "# branch" comments are there for the script, they're important.
+EGO_VENDOR=(
+	"github.com/lxc/lxd e641ae45dc13cc27510c9d2127eece46ed9ac16b"
+	"github.com/CanonicalLtd/go-sqlite3 730012cee3364e7717c28f7e9b05ee6dd8684bae"
+	"github.com/CanonicalLtd/dqlite 9334841532709c77fc79e13a08408694e4bb3616"
+	"github.com/CanonicalLtd/go-grpc-sql 534b56d0c689ed437e6cff44868964d45d3ec85c"
+	"github.com/CanonicalLtd/raft-http e4290d0af830073ec140538e8974aa4393495ea1"
+	"github.com/CanonicalLtd/raft-membership 26ef52960f54c472f52fb3701f19f25319e1032e"
+	"github.com/CanonicalLtd/raft-test 22441a088d5630ddd2e971eae68074d2b645f1b7"
+	"github.com/dustinkirkland/golang-petname d3c2ba80e75eeef10c5cf2fc76d2c809637376b3"
+	"github.com/flosch/pongo2 97eac295f74b5fbb7fd3113e35f4ccf3c816e389"
+	"github.com/juju/errors c7d06af17c68cd34c835053720b21f6549d9b0ee"
+	"github.com/juju/idmclient 15392b0e99abe5983297959c737b8d000e43b34c"
+	"github.com/juju/httprequest 77d36ac4b71a6095506c0617d5881846478558cb"
+	"github.com/juju/utils d18e608d01400189bcda3e2669505cbd30e9dda9"
+	"github.com/juju/loggo 7f1609ff1f3fcf3519ed62ccaaa9e609ea287838"
+	"github.com/juju/webbrowser 54b8c57083b4afb7dc75da7f13e2967b2606a507"
+	"github.com/juju/gomaasapi 663f786f595ba1707f56f62f7f4f2284c47c0f1d"
+	"github.com/juju/schema e4f08199aa80d3194008c0bd2e14ef5edc0e6be6"
+	"github.com/juju/version b64dbd566305c836274f0268fa59183a52906b36"
+	"github.com/juju/persistent-cookiejar d5e5a8405ef9633c84af42fbcc734ec8dd73c198"
+	"github.com/juju/go4 40d72ab9641a2a8c36a9c46a51e28367115c8e59"
+	"github.com/juju/testing 43f926548f91d55be6bae26ecb7d2386c64e887c"
+	"github.com/juju/retry 1998d01ba1c3eeb4a4728c4a50660025b2fe7c8f"
+	"github.com/golang/protobuf e09c5db296004fbe3f74490e84dcd62c3c5ddb1b"
+	"github.com/golang/glog 23def4e6c14b4da8ac2ed8007337bc5eb5007998"
+	"github.com/gorilla/mux 4dbd923b0c9e99ff63ad54b0e9705ff92d3cdb06"
+	"github.com/gorilla/websocket eb925808374e5ca90c83401a40d711dc08c0c0f6"
+	"github.com/julienschmidt/httprouter d1898390779332322e6b5ca5011da4bf249bb056"
+	"github.com/rogpeppe/fastuuid 6724a57986aff9bff1a1770e9347036def7c89f6"
+	"github.com/pkg/errors 816c9085562cd7ee03e7f8188a1cfd942858cded"
+	"github.com/ryanfaerman/fsm 3dc1bc0980272fd56d81167a48a641dab8356e29"
+	"github.com/hashicorp/raft a3fb4581fb07b16ecf1c3361580d4bdb17de9d98"
+	"github.com/hashicorp/go-immutable-radix 7f3cd4390caab3250a57f30efdb2a65dd7649ecf"
+	"github.com/hashicorp/golang-lru 0fb14efe8c47ae851c0034ed7a448854d3d34cf3"
+	"github.com/hashicorp/go-msgpack fa3f63826f7c23912c15263591e65d54d080b458"
+	"github.com/hashicorp/raft-boltdb 6e5ba93211eaf8d9a2ad7e41ffad8c6f160f9fe3"
+	"github.com/armon/go-metrics 783273d703149aaeb9897cf58613d5af48861c25"
+	"github.com/stretchr/testify c679ae2cc0cb27ec3293fea7e254e47386f05d69"
+	"github.com/boltdb/bolt fd01fc79c553a8e99d512a07e8e0c63d4a3ccfc5"
+	"github.com/mattn/go-colorable efa589957cd060542a26d2dd7832fd6a6c6c3ade"
+	"github.com/mattn/go-isatty 6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c"
+	"github.com/mattn/go-runewidth a9d6d1e4dc51df2130326793d49971f238839169"
+	"github.com/syndtr/gocapability 33e07d32887e1e06b7c025f27ce52f62c7990bc0"
+	"github.com/pborman/uuid c65b2f87fee37d1c7854c9164a450713c28d50cd"
+	"github.com/spf13/cobra 4dab30cb33e6633c33c787106bafbfbfdde7842d"
+	"github.com/spf13/pflag 1cd4a0c365d95803411bec89fb7b76bade17053b"
+	"github.com/cpuguy83/go-md2man 48d8747a2ca13185e7cc8efe6e9fc196a83f71a5"
+	"github.com/gosexy/gettext 74466a0a0c4a62fea38f44aa161d4bbfbe79dd6b"
+	"github.com/frankban/quicktest 536e76da5efc46dc247088384c2d2cea7da968aa"
+	"github.com/google/go-cmp 5411ab924f9ffa6566244a9e504bc347edacffd3"
+	"github.com/kr/pretty cfb55aafdaf3ec08f0db22699ab822c50091b1c4"
+	"github.com/kr/text 7cafcd837844e784b526369c9bce262804aebc60"
+	"github.com/olekukonko/tablewriter b8a9be070da40449e501c3c4730a889e42d87a9e"
+	"google.golang.org/genproto ab0870e398d5dd054b868c0db1481ab029b9a9f2 github.com/google/go-genproto"
+	"google.golang.org/grpc 2dfcc11f7a6d4791ba627222d783eedf268b4b95 github.com/grpc/grpc-go"
+	"golang.org/x/crypto 12892e8c234f4fe6f6803f052061de9057903bb2 github.com/golang/crypto"
+	"golang.org/x/net b68f30494add4df6bd8ef5e82803f308e7f7c59c github.com/golang/net"
+	"golang.org/x/sys 378d26f46672a356c46195c28f61bdb4c0a781dd github.com/golang/sys"
+	"golang.org/x/text ece95c760240037f89ebcbdd7155ac8cb52e38fa github.com/golang/text"
+	"gopkg.in/errgo.v1 442357a80af5c6bf9b6d51ae791a39c3421004f3 github.com/go-errgo/errgo" # branch v1
+	"gopkg.in/juju/names.v2 54f00845ae470a362430a966fe17f35f8784ac92 github.com/juju/names" # branch v2
+	"gopkg.in/juju/environschema.v1 7359fc7857abe2b11b5b3e23811a9c64cb6b01e0 github.com/juju/environschema" # branch v1
+	"gopkg.in/yaml.v2 5420a8b6744d3b0345ab293f6fcba19c978f1183 github.com/go-yaml/yaml" # branch v2.2.1
+	"gopkg.in/macaroon-bakery.v2 94012773d2874a067572bd16d7d11ae02968b47b github.com/go-macaroon-bakery/macaroon-bakery" # branch v2.0.1
+	"gopkg.in/macaroon.v2 bed2a428da6e56d950bed5b41fcbae3141e5b0d0 github.com/go-macaroon/macaroon" # branch v2.0.0
+	"gopkg.in/httprequest.v1 1a21782420ea13c3c6fb1d03578f446b3248edb1 github.com/go-httprequest/httprequest" # branch v1.1.1
+	"gopkg.in/lxc/go-lxc.v2 2660c429a942a4a21455765c7046dde612c1baa7 github.com/lxc/go-lxc" # branch v2
+	"gopkg.in/tomb.v2 d5d1b5820637886def9eef33e03a27a9f166942c github.com/go-tomb/tomb" # branch v2
+	"gopkg.in/mgo.v2 3f83fa5005286a7fe593b055f0d7771a7dce4655 github.com/go-mgo/mgo" # branch v2
+	"gopkg.in/retry.v1 2d7c7c65cc71d024968d9ff4385d5e7ad3a83fcc github.com/go-retry/retry" # branch v1.0.0
+	"gopkg.in/check.v1 20d25e2804050c1cd24a7eea1e7a6447dd0e74ec github.com/go-check/check" # branch v1
+)
+
+ARCHIVE_URI="https://${EGO_PN}/archive/${P}.tar.gz -> ${P}.tar.gz"
+LICENSE="Apache-2.0 BSD BSD-2 LGPL-3 MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE="+daemon +ipv6 +dnsmasq nls test"
+
+inherit bash-completion-r1 linux-info systemd user golang-vcs-snapshot
+
+SRC_URI="${ARCHIVE_URI}
+	${EGO_VENDOR_URI}"
+
+DEPEND="
+	>=dev-lang/go-1.7.1
+	dev-libs/protobuf
+	nls? ( sys-devel/gettext )
+	test? (
+		app-misc/jq
+		dev-db/sqlite
+		net-misc/curl
+		sys-devel/gettext
+	)
+"
+
+RDEPEND="
+	daemon? (
+		app-arch/xz-utils
+		>=app-emulation/lxc-2.0.7[seccomp]
+		dnsmasq? (
+			net-dns/dnsmasq[dhcp,ipv6?]
+		)
+		net-misc/rsync[xattr]
+		sys-apps/iproute2[ipv6?]
+		sys-fs/squashfs-tools
+		virtual/acl
+	)
+"
+
+CONFIG_CHECK="
+	~BRIDGE
+	~DUMMY
+	~IP6_NF_NAT
+	~IP6_NF_TARGET_MASQUERADE
+	~IPV6
+	~IP_NF_NAT
+	~IP_NF_TARGET_MASQUERADE
+	~MACVLAN
+	~NETFILTER_XT_MATCH_COMMENT
+	~NET_IPGRE
+	~NET_IPGRE_DEMUX
+	~NET_IPIP
+	~NF_NAT_MASQUERADE_IPV4
+	~NF_NAT_MASQUERADE_IPV6
+	~VXLAN
+"
+
+ERROR_BRIDGE="BRIDGE: needed for network commands"
+ERROR_DUMMY="DUMMY: needed for network commands"
+ERROR_IP6_NF_NAT="IP6_NF_NAT: needed for network commands"
+ERROR_IP6_NF_TARGET_MASQUERADE="IP6_NF_TARGET_MASQUERADE: needed for network commands"
+ERROR_IPV6="IPV6: needed for network commands"
+ERROR_IP_NF_NAT="IP_NF_NAT: needed for network commands"
+ERROR_IP_NF_TARGET_MASQUERADE="IP_NF_TARGET_MASQUERADE: needed for network commands"
+ERROR_MACVLAN="MACVLAN: needed for network commands"
+ERROR_NETFILTER_XT_MATCH_COMMENT="NETFILTER_XT_MATCH_COMMENT: needed for network commands"
+ERROR_NET_IPGRE="NET_IPGRE: needed for network commands"
+ERROR_NET_IPGRE_DEMUX="NET_IPGRE_DEMUX: needed for network commands"
+ERROR_NET_IPIP="NET_IPIP: needed for network commands"
+ERROR_NF_NAT_MASQUERADE_IPV4="NF_NAT_MASQUERADE_IPV4: needed for network commands"
+ERROR_NF_NAT_MASQUERADE_IPV6="NF_NAT_MASQUERADE_IPV6: needed for network commands"
+ERROR_VXLAN="VXLAN: needed for network commands"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-dont-go-get.patch"
+)
+
+src_prepare() {
+	default_src_prepare
+
+	# Examples in go-lxc make our build fail.
+	rm -rf "${S}/src/${EGO_PN}/vendor/gopkg.in/lxc/go-lxc.v2/examples" || die
+}
+
+src_compile() {
+	export GOPATH="${S}"
+
+	cd "${S}/src/${EGO_PN}" || die "Failed to change to deep src dir"
+
+	tmpgoroot="${T}/goroot"
+	if use daemon; then
+		# Build binaries
+		emake
+	else
+		# build client tool
+		emake client
+	fi
+
+	use nls && emake build-mo
+}
+
+src_test() {
+	if use daemon; then
+		export GOPATH="${S}"
+		cd "${S}/src/${EGO_PN}" || die "Failed to change to deep src dir"
+
+		emake check
+	else
+		einfo "No tests to run for client-only builds"
+	fi
+}
+
+src_install() {
+	dobin bin/lxc
+	if use daemon; then
+		dosbin bin/lxd
+		dobin bin/fuidshift
+	fi
+
+	cd "src/${EGO_PN}" || die "can't cd into ${S}/src/${EGO_PN}"
+
+	if use nls; then
+		domo po/*.mo
+	fi
+
+	if use daemon; then
+		newinitd "${FILESDIR}"/${PN}.initd lxd
+		newconfd "${FILESDIR}"/${PN}.confd lxd
+
+		systemd_newunit "${FILESDIR}"/${PN}.service ${PN}.service
+	fi
+
+	newbashcomp scripts/bash/lxd-client lxc
+
+	dodoc AUTHORS README.md doc/*
+}
+
+pkg_postinst() {
+	einfo
+	einfo "Consult https://wiki.gentoo.org/wiki/LXD for more information,"
+	einfo "including a Quick Start."
+
+	# The messaging below only applies to daemon installs
+	use daemon || return 0
+
+	# The control socket will be owned by (and writeable by) this group.
+	enewgroup lxd
+
+	# Ubuntu also defines an lxd user but it appears unused (the daemon
+	# must run as root)
+
+	einfo
+	einfo "Though not strictly required, some features are enabled at run-time"
+	einfo "when the relevant helper programs are detected:"
+	einfo "- sys-apps/apparmor"
+	einfo "- sys-fs/btrfs-progs"
+	einfo "- sys-fs/lvm2"
+	einfo "- sys-fs/lxcfs"
+	einfo "- sys-fs/zfs"
+	einfo "- sys-process/criu"
+	einfo
+	einfo "Since these features can't be disabled at build-time they are"
+	einfo "not USE-conditional."
+	einfo
+	einfo "Networks with bridge.mode=fan are unsupported due to requiring"
+	einfo "a patched kernel and iproute2."
+}
diff --git a/app-emulation/spim/Manifest b/app-emulation/spim/Manifest
index 1029fbcea0be..92aad3d484b4 100644
--- a/app-emulation/spim/Manifest
+++ b/app-emulation/spim/Manifest
@@ -1,6 +1,5 @@
 AUX spim-8.0-r1-respect_env.patch 5058 BLAKE2B dabd459ef87e3c9db6304703d2067297f4be53af269ab9b1335dc38302c2e828ab6e9b357e45619fbe4dbdb375abb2dd91795e728a25e9772b3bdaf0a7e3e846 SHA512 adc8bb7815f15a0dfbd67e14875d7f5773c3b0153e9f031a957a9b6deeb0cf2dfd1983b835d7446467433c044a1caea0c13ba43ee5e4f77d5096cd62e2c27948
 AUX xspim.svg 8364 BLAKE2B 0a2f13b78c87e821b6d669a750ea1be0003442f75c20c5387954c1e6c11f99f80b9e1a42ea88bc4e894011ff08cb8b40450674ec415d1be18eb63d5e2a9b0188 SHA512 1860705ef2677b5bd84b7cdf4daf3143033050e5ed014e22d63fc3bec48a0a296a9767fa7cbf7ab71f31c5cc712e40be0799a9c43b96c789273de7604d57c0d5
 DIST spim-8.0.tar.gz 355204 BLAKE2B c7da952df552c5e070c601e7c3d251f15988d377e1c9943730f6cf8eee1e3b64ec4a05b56d4bdbc181b811aa349e3b08fccf0b9ccfc3efe2c0e410580e70dd7f SHA512 c4eb66863a931b74d6c6ecd92860d16fd6369c85caecba1e71a1149e73e708502d1070f17a9beb6d0af1368db1ee5a85c040b596866a1236275cdd410a661adf
-EBUILD spim-8.0-r2.ebuild 1570 BLAKE2B 6a03d3b73d84f3a7bbf2b97d31f24465e23762fcb43b30239b5448ed9effce184d7bd6fc5e2ffd0714e3c5be44f0051f219b69a940d443d466bf7e76cd2d1fda SHA512 743da7bb89dcadb1be9bdbdebc86b64594d8b37d666230809f3440fb2df2f547ba25c78cfd43f6cc0d828e4071905f4f7915d2d78f8f98fa9be3e3145051888f
-EBUILD spim-8.0-r3.ebuild 1545 BLAKE2B 8ee89cd9e6ed068034adbb048d3c85bb4513113ca57b9402b87bc6487d7055455ef4f095911a26b450e1a9c1224c2abe4d21336ae01607958153dd8c462263f9 SHA512 21de18c91b8d1dcdfda5363b66fff47a42a117286697b7931c16f1a03790a7298bea59c5112d3a3bae3ace1e5ff3cc303219f7e895819c5ebb295b406263df13
+EBUILD spim-8.0-r3.ebuild 1543 BLAKE2B 7e7f694046fbfafabd5bf74976a1b662ac886c69ad6aa6999b93370493955cfdced07aed29c9818ea6a3dfb2f49dc7558d0cbaf81edfe3fd980d9d47bb2dd5ca SHA512 0640e6d45ff599138ade6204c464fa35d9cdd1d017949e895d138d31705f25cea17532d80fd4f512fafb669632576bf5db041a5a0d3f5bfdd6344ac8ed6d0779
 MISC metadata.xml 465 BLAKE2B a26e388f7a6a0610e0fb4d4c59b0d1a60c3934927f41e0d953dfab8cef1c9fc5da06902263ba29d984db1f0d1d3f636d503b8fe605571f4976e9bbd3e28cf4be SHA512 624df1312b5a85232c892f18eb39a62877c085d79461cf875b46a107eeaf5b99a9062e8f175a62c80565d42b26144ab2227d2f97b2d67fe16e66890e2843fe6c
diff --git a/app-emulation/spim/spim-8.0-r2.ebuild b/app-emulation/spim/spim-8.0-r2.ebuild
deleted file mode 100644
index c50eac72bf8a..000000000000
--- a/app-emulation/spim/spim-8.0-r2.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="MIPS Simulator"
-HOMEPAGE="http://spimsimulator.sourceforge.net/"
-SRC_URI="http://www.cs.wisc.edu/~larus/SPIM/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="doc X"
-
-RDEPEND="X? ( media-fonts/font-adobe-100dpi
-	x11-libs/libXaw
-	x11-libs/libXp )"
-DEPEND="${RDEPEND}
-	X? ( x11-misc/imake
-		x11-proto/xproto )
-	>=sys-apps/sed-4
-	sys-devel/bison"
-# test hangs forever, disabling it
-RESTRICT="test"
-
-src_prepare() {
-	# fix bugs 240005 and 243588
-	eapply "${FILESDIR}/${P}-r1-respect_env.patch"
-
-	#fix bug 330389
-	sed -i -e 's:-12-\*-75-:-14-\*-100-:g' xspim/xspim.c || die
-
-	default
-}
-
-src_configure() {
-	tc-export CC
-	emake -C spim configuration
-
-	if use X; then
-		emake -C xspim configuration
-	fi
-}
-
-src_compile() {
-	emake DESTDIR="${EPREFIX}" -C spim
-
-	if use X; then
-		emake DESTDIR="${EPREFIX}" EXCEPTION_DIR=/var/lib/spim \
-			-C xspim -j1 xspim
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${ED}" -C spim install
-	newman Documentation/spim.man spim.1
-
-	if use X; then
-		emake DESTDIR="${ED}" -C xspim install
-		newman Documentation/xspim.man xspim.1
-	fi
-
-	doicon "${FILESDIR}"/xspim.svg
-	make_desktop_entry xspim xSPIM xspim "ComputerScience;Science;Education"
-
-	dodoc Documentation/SPIM.html
-	dodoc ChangeLog Documentation/BLURB README VERSION
-	if use doc ; then
-		dodoc Documentation/TeX/{cycle,spim}.ps
-	fi
-}
-
-src_test() {
-	emake -C spim test
-}
diff --git a/app-emulation/spim/spim-8.0-r3.ebuild b/app-emulation/spim/spim-8.0-r3.ebuild
index 9fe7e6643e19..00776564c323 100644
--- a/app-emulation/spim/spim-8.0-r3.ebuild
+++ b/app-emulation/spim/spim-8.0-r3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.cs.wisc.edu/~larus/SPIM/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="doc X"
 
 RDEPEND="
diff --git a/app-emulation/virt-what/Manifest b/app-emulation/virt-what/Manifest
index 56e58ade0d69..c916d65abd2d 100644
--- a/app-emulation/virt-what/Manifest
+++ b/app-emulation/virt-what/Manifest
@@ -1,7 +1,3 @@
-DIST virt-what-1.12.tar.gz 147144 BLAKE2B 288733209446a7f8d38d289cf9e6cea39274acb4771cc4a7320d265283b4428a2da647fe9a8703421a058f0223e6c5c4c2c83b64b6dbe9a2c189d99745847d70 SHA512 629e452419a01b86cd5442c4294b5aea6fc475522d7a350ac8e727b59e63948915c755fe6cae16f7824749059662bb0fbd4557a2aa56c098b407037a35881735
-DIST virt-what-1.15.tar.gz 163117 BLAKE2B bb91aa242afb2e83d7d1120d4aba78a13881513529a017de619eb3c2c2f4a653c52876838960872ca5f4ab286b196980c232e5c35457f7011a593306490464f1 SHA512 b85d02eb632328031be93dd33be1e42603e55182c4458fca9b9d98465ff7487fc399d01ebd117a8311960091c1b166547380b9a54c0054ebf2c0aa454d9a41e5
 DIST virt-what-1.18.tar.gz 173703 BLAKE2B c1ab6f331ca370572cedef06fd3eb9177ca8ef4302446eb46c737446a001e77a0825ec8771aade903e6194af3f4f745c3f35f1d9dbbb8a0550b493296878ade3 SHA512 8085a38111d5664f411f5bb9d2ee221bc22e5b0f2d993e8d518718b3f63b16ba73e052b1623c090493cf8fef52fd237ba823377503a32b4b7d03cc5380d5c613
-EBUILD virt-what-1.12.ebuild 496 BLAKE2B bcf0e9c634d5cb3a1afc14a58a389763812fcd22184f1985521e7d95405a89b9eeabcbd7d833361d2e36ba602a209b738e229cd3d13a9adbdf85045a2db3be2e SHA512 d1d376cd0270cfb18d2db9af21dc6e7968623f246ad70def2f89cc3a8a7535c2230fdaf98aef5f1b805719917fb337ad103a694790a88777c5441ac6b515cf28
-EBUILD virt-what-1.15.ebuild 486 BLAKE2B 7e2c70eb557f7646f0411e32bb4b9c3cdf9ee2e73f42202f5b51be7cdeeec748e756864d7034cc2333d48b5944222b85abfec8fd0946869088be4035da3ca84f SHA512 bd6be7716b1f6214ff64ac3c4b79414ed11a4958391083e0ebc8f80dedf2c2c99919d43e0ecebf06ce465b5535053d061dfdc24852111cba48eff12ced78d50d
 EBUILD virt-what-1.18.ebuild 609 BLAKE2B c2e183482354a5623ee7ac84a0f50d36d80065f1f803a9086e687f16416be6f1b62482d67d99890f2f1f61c371f6053b03eb2eb71c099c309a049474494aa57b SHA512 56ee0708fa083bee61d82106227238cbce18027557b75ffed68fdaecf47f6cafe84766a03f0c55d0ed7060af90b929cd6fa80453ff355adb2f5f00e70dffa7ed
 MISC metadata.xml 456 BLAKE2B 7f4f5daff8e3d30e59981cb50fcc8da98ee032dc33c16cb441f9aec580c101eab57fb25257a7298e32d6093a7ddb25c292f35858b0392bde2a2ec5e528b49079 SHA512 9b3ce56970ef01166980d6e5275bf4d740c47c044ab531cedeaac4e606d369f2c65b22fd8d8387332f0428ed7d9970d8b7e6363b48cb73c5b3326c7b463906bd
diff --git a/app-emulation/virt-what/virt-what-1.12.ebuild b/app-emulation/virt-what/virt-what-1.12.ebuild
deleted file mode 100644
index f1407df6ddbe..000000000000
--- a/app-emulation/virt-what/virt-what-1.12.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="Detects if the current machine is running in a virtual machine"
-HOMEPAGE="https://people.redhat.com/~rjones/virt-what/"
-SRC_URI="https://people.redhat.com/~rjones/virt-what/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 hppa ppc ppc64 sparc x86"
-IUSE="dmi"
-
-DEPEND="dev-lang/perl"
-RDEPEND="app-shells/bash
-		dmi? ( sys-apps/dmidecode )"
diff --git a/app-emulation/virt-what/virt-what-1.15.ebuild b/app-emulation/virt-what/virt-what-1.15.ebuild
deleted file mode 100644
index cdae6323c82b..000000000000
--- a/app-emulation/virt-what/virt-what-1.15.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Detects if the current machine is running in a virtual machine"
-HOMEPAGE="https://people.redhat.com/~rjones/virt-what/"
-SRC_URI="https://people.redhat.com/~rjones/virt-what/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="dmi"
-
-DEPEND="dev-lang/perl"
-RDEPEND="app-shells/bash
-		dmi? ( sys-apps/dmidecode )"