gentoo resync : 25.08.2020

9 files changed, 84 insertions, 382 deletions

diff --git a/dev-db/etcd/Manifest b/dev-db/etcd/Manifest
index c04004fa3d31..91eb100e66a3 100644
--- a/dev-db/etcd/Manifest
+++ b/dev-db/etcd/Manifest
@@ -4,20 +4,12 @@ AUX etcd.initd 821 BLAKE2B 5eba7f0e8d134ff45caba8c1eb3aaf6afb412082b9a5df95925f3
 AUX etcd.logrotated 104 BLAKE2B 3126c99db171af177d6d6368e7e53f3e5e07b9ae2926ff12cb0ff7fb877527df33a91dedcaa4bbbffa190b4f9c2f53868aeca093b93e9cad50718a23eb5fdd46 SHA512 64d3181a936f8bab635a17f90679041c2d70a712307928feae03a517ad02252fc37e25738979bc1ccd0657ef70439e65cb0306759bec3939e940ec382a02d94f
 AUX etcd.service 304 BLAKE2B ecffe9889f9530bf7172638a0273736abba2b3ea5c5540b5452d26fbaec17ab9c138db86b543c3c88fd3d16ce79487eb2c31ad7bbfb0c5b9cd11eede9b99bd2d SHA512 0074f77a17afe2bb4145f12a6eb312caa3e08cfe8bf35856b79d091ad8786c4223bd91c0a865e789ee9ba180f2672b31721742bb32efd0cd383bc747eb926961
 AUX etcd.tmpfiles.d.conf 76 BLAKE2B e5aa0ca42dd579e9c2ac8c6bdfce83f87ec79ce64d10e20b61ab3df45918747f588b9246085fec925bb39b772e061628aadd030a23a59b65a2fc2243eca1a7f9 SHA512 7324b74dcfe050dd7fbc318ca3ce9b5d58bce8fa2ce2d2d771664ef981c834375f7cbfebcb630cd61dab2a3f6bf6c3733ad04f752beadf7bb6fedcc80ff682ce
-DIST etcd-3.3.17.tar.gz 6507229 BLAKE2B e49b66a3a2bb5be254cb3400341d4f1454608a9923295826ce780fb5750b6182ec7ec35996ef538aa38863cacd0c0e3efd072ce5c3dae1e65509ce962964994d SHA512 73f8ddab1c27c77cedeb602201d01b433363c9550ec26b4729f2c5c114aefa4b90d444fd5a7696272c2cccdc8329e641f073ef9f39c7ea4e62837341dfc28641
-DIST etcd-3.3.18.tar.gz 6508732 BLAKE2B cce52ac9fa005388bafacf3d0bf049f3930de12d0cb50cc863655fdbc35cae2d647f64eddb699cb1ef7b3736687a9978cd120d181b274b663a1ac2b7eb549729 SHA512 1146baa8c424a6ddb4a2a10494e2f82ba0c22def1fcd3e041b871c060ca915267f1a2e1c455b017eded1908300ddbd8a3849ee3c5dda93489d9eeaaa90baf254
-DIST etcd-3.3.19.tar.gz 6509566 BLAKE2B 0037858daa134e63c6629defe099cc772b758e220a093e719b2d41c2e519a2c2d923d26e8635fb1f7cabe2ec0a0250236293c838d9c34d1745673211dc4f526c SHA512 9f21692466bcb240bac042f4e7ee6f4575c05312542827c7349257b87c9d4a1a625b200fcbb0852c86c192624cd02e9a8d80caa194d25d4b63aa5e33b100eac1
-DIST etcd-3.3.20.tar.gz 6509856 BLAKE2B 49e0ae7a56ce9e84664cd4395a91518c01e42346edc83bd61a84883da013b6cfda15c17cdb6ce5c44760574ee2101e7d39c32aaf458ceb1b505aea5ae787f1b6 SHA512 66aee553b053dea732ab3716676a05f5357a38ff0cb3ef8b6be4b80f4f54f0720578db9438b31e88bdb61aa662443d6b7993fa37af639208618bff76285ea7f9
-DIST etcd-3.4.3.tar.gz 8941589 BLAKE2B 127e4a8dd9495686ffc43099c3002e0e3c00ab661bce917ac298f69351e1226dff0efcaf9277c1e46449abafef965af8f612a127e1e30c381545073232a2ff50 SHA512 0bc1e857b707be1d348f5ab58a330d259dd30338c28580751142f643b2a081d1fe42a8859fa9463a734ff27f51929dc89f933f044b89d6e549a348add034d752
-DIST etcd-3.4.4.tar.gz 8940682 BLAKE2B c165fbb61d87d4a42261742bf302e6a04daa67e6ebea6f12314b77a9a12afd0e6b02e642b827e8b14fa77eedd207fe32c047f19f0487f54aba1e0db6774673f2 SHA512 81de69c422c58c73df8812127f29e49e1d81dacf47e26fe4b8a332b6b19f0242086c5e3b52fdbbbf08d91abe6213400887dc72e837effeec73a182a8caca9d20
-DIST etcd-3.4.5.tar.gz 8943585 BLAKE2B 6df1538ec1e65c6f1a7fc41c0ceb29ca126efe797c8e6e029dfd45cdfeadacd322a46e18f627cac6defd78d8a17ddf09b5a0918fb454bfbafd450084de972c5a SHA512 cd8845433e208cbe1cf0e0a001ee503d42b73f44ac0e0578d9ee8692f95262929c0cec3a2622f9cd3ea8d393a136de47a7e0d0875b4e0cd9d8eeddd45ca3bea5
-DIST etcd-3.4.7.tar.gz 8943976 BLAKE2B 7dd81324e78ef53577055c54e851680b2421524aea1148449cd1003391029e110c90bd607730955ac4081c49e846da08159553f8db7d768e15dda51b8bf657ca SHA512 18851be0cbe8dabc6be8ba0c61d783f21b1fb9403256166016767926c731f1d95a1adebad9f36d43c57a424a7ac88c49b1d1ce01c2aa065e5bbbff847eb9234a
-EBUILD etcd-3.3.17.ebuild 2003 BLAKE2B b17a2eb321060ae13b0fcd6ccc347b9449a3e113489431e95a96e3cec570c3f65adac65b446357eac95f0faaae0a2f33548fc51cd4bb05a37725a2529f076338 SHA512 41bdae1f83128670a89ab695a03a550d6ad29b29b977cf0e992c9c2a04d4110be651e7a15b615d34e83d1646a3573c8521b09a168d65069fb682846febb1f826
-EBUILD etcd-3.3.18.ebuild 2004 BLAKE2B ebbf4469e049005dae059bd5207a834b99ae01aef51a395df2e39f2b6e56018072e4c5eecb52f8ffe9199d95e0c82ba629b17e10f490215711a6700ed4d839c5 SHA512 cffde362cc2300daf694d5b32c4b83ab4c6f57d47199b9a2ce62719606e1a384e6df977ac27863ffe9b271064be6e1aad67b7b62f4284dd2f73c92a7756a1e67
-EBUILD etcd-3.3.19.ebuild 2004 BLAKE2B 665bd307525157ab80a1791766c37aee07036f4e2f19c676b1d80b168b5390218b4f903988262a6d8afe45151dc6da01e7013729da78493f713ae2d1ebeb076d SHA512 62bd2f93cb5cadb3c3bbab62af92be758fa2235565dd42f0b33876e9fca375ad79807593e004ae40d2b38d748f0e47d3f51f117cbd2dcff577332f5bee35ceed
-EBUILD etcd-3.3.20.ebuild 1999 BLAKE2B 1c5c7212be7ccb34b0c13b2fa1c1ad6dea1390d83fe8170b1a8b33c1d1ecb1855f9257c5bac3f8b35d157618dc92a9bacf83401c1d4e14a99857daceb965ef47 SHA512 b9bdfe5a7142459426c0b0748ebd013a479e25fb56132c82d1fef82d6c43e25a8c492df6fc12cbc31df555ad54d289606efaf622d1b2f978b1aab7d7fe985d7f
-EBUILD etcd-3.4.3.ebuild 2293 BLAKE2B 3e48ca6f1af6a37ee3bd15e3d2513638098def4fdc3bb409c18fe05eeb13ff20e3e32f0644d62e9bcc39c8ef06b4de73789ecda3dfcdceedbd5c349f7aec2378 SHA512 5efb197de44968897880100693bf16c213ffb59cdd51dd8abcc36eb57fdff31bed7d3850438a8511e23c28f370d8e3e1b49b810f3c58bab1cd150a2e22c11631
-EBUILD etcd-3.4.4.ebuild 1886 BLAKE2B 8fd02659a857dc9d4f543e8224661646ba7f8afff19af3f0e789226c1b2e7b71faf27c8a99c4f9f12c7744e4a3fd78f6e5bd85909d915385a1ac96a2e3060395 SHA512 130e0153f58d02b762ad27f35dfa0447684f4d55559bf49a3e3d31055192f33514a5925afa2e5a30b87214e178375763e6aff62fe67d6bc48b61ac6b4d80dd06
-EBUILD etcd-3.4.5.ebuild 1886 BLAKE2B 5a4e4377940c0eee13a57a4fc2e431b420161ab31bf539b489f03c97d7608e45dd00cf04a486d4abb7d29a865f8b71467750248a6f01369a35f483442eb91947 SHA512 a1c04e0604c0881aa8e3e582697e08aeaaec5232118b459c106986bc112af7a8e720a9eb1904c67cd03397d5e1ea943a2fdd126e95e6aa81fb5fe0506bd19dd8
-EBUILD etcd-3.4.7.ebuild 1903 BLAKE2B fae6ee9aff8c6b63f0c3310b6cdee880ed353eb4f15cb653b164fbd28e6851d8c6245f5ddbcde971fde3975cae571d26ed6b48647ed6bcf898c2120aba4402bc SHA512 0fd2225388e381dd0854ee2d1b6120508dcc91eaceafa9041d66af67106fd7f69f23c87b211bced33bfbafdb3781153480aad0d4abb138d16bff4443be595269
+DIST etcd-3.3.23.tar.gz 6526967 BLAKE2B b29cc691a45021ffb2bbf9528d66e2a4384bdf21bf8865a1062d38535e8823a7726790e4d1d5f7b1a9362a730668d2ea579422619c9e29837c290f8fd7edaea7 SHA512 28b689092b342f5d7b211b122f6fc22dcd62c54eec70d4108b5f933851cd145bdf26097927e70b6596af918c583ad3a4bd28acc4c0e93d7f67011789d66dc94b
+DIST etcd-3.3.24.tar.gz 6518759 BLAKE2B bff713b5f754e6ed86f4265be7691f5cf6ad0bc1576ef15a4364b34dda827bef4390024d7a9bb032907dc8a95d8d3884e9f2ddf5a37b3b7e4ab476a13e61b8ac SHA512 a3825a1d6ec886a5f30317929bafc1f5b2657f374a4cb7a0348786a7c4f6b073197b2bdeb4d725e78cf5c99cead3e38dbf468ea023b3e7689bdce857466a72d3
+DIST etcd-3.4.10.tar.gz 8954911 BLAKE2B ce800d9db0afdbeab5177b8138e494997a1df024acfa137a7138c6e205c26881c06544e8feeee7a6fd372382fce2eca5f73cb5139a3878339f1182703619cfae SHA512 104bfce77778df4704caafc45b731bb440060be1d802a42642f33cc6c2ad11b7f94c237c1b8a47c38d1e109b71b31cc6cd8a666796fe2dbc925722fee1c2c4da
+DIST etcd-3.4.11.tar.gz 8957210 BLAKE2B d8cc647bb4441222d6331bcb89f7a007e830d2d95d38fdff978f44f21b0266184fb6ba328d36a6d5996e9a4c2de4c86088714283ff24df4a8d66d75d0b35cb62 SHA512 c12bf650028755ff38f5624b507f95523279573a4aa1097438a7182afa949a63f2dc06d4223e52607bdff14a8653b570c05d814310ccfd3bacc5a57b286a8c7e
+EBUILD etcd-3.3.23.ebuild 2306 BLAKE2B 66394befa1bfd85fdc9069640022fdb447117a530d346e2ab8b7babaaa152b9b1227f5c8f9cac3c569b744caa3f55cf82488aac5d2f4dec04350b350af54bc3d SHA512 5fb2e4690541975147e32643aff2956caced1300b07f6bb69e14038ebe97ed5e56f3f55fae84cdc71c7225311028986eeee1917c5777472165cd67e2363cd9ee
+EBUILD etcd-3.3.24.ebuild 2021 BLAKE2B 710c9d1a96f1d12214ae0d03cfb1bbedb49311eb24827e47d4a9b82b93efa49213b016e056efb819148154bf3cd22160231b3edbc316af4693505c0995b168be SHA512 58ec157dcbf6aac4acea3e9216df0d2133e466aff815701c1d47cf6b946419e5ed3d98bf4ac0cf5938063285c157f58b70da383c9a83114009a172aa75e1b492
+EBUILD etcd-3.4.10.ebuild 2021 BLAKE2B 9e3fea4ff53b32f674f25339b40cc2f34b6f9ab738f15277776639d3279f1e1b1257c9af1ac7d175ee452f03ba4a5773e2214fe767b1d90023744149920edc33 SHA512 02ac09ae25b0d9c88d6d7393f10560b7c6dcbcf0893ec84f443bf4581dc7f5938f66896a2cc6f7566242488712e04ff3120899b36cf45215ea49c83bd161fe55
+EBUILD etcd-3.4.11.ebuild 2021 BLAKE2B 717e742acfdd33589971ac2ff7ea7101f31806bf55277f7e34a4288887678b4be943aa8d05a97e36e357a2a0c8354a78812791ce614a80eb1af8f4d21d413b69 SHA512 e4aada179c51082594c974761f219f95aa01c8c2bfc8c45272ca5983d13dca1765457dbe5140f1259f2cbc0a0d75d3266d6b2b1d8d26140f727ee39cc41fcbec
 MISC metadata.xml 573 BLAKE2B 48714fc34469739cf1fea338b8e686726692ee45be8f3b841e747cdb9f5f13f5e2964ced9423de8a2cde26fef9a0b9ee24e42c8ad6db43a4151194ee4b115029 SHA512 8162b96dd5984554115e7c889d3c6c015a5c07dc553baea6fd1d6263bde02b20bf0d9a411c93f06b537698958994f9d975782c8770cb33793776bf5fb7f999b7
diff --git a/dev-db/etcd/etcd-3.3.17.ebuild b/dev-db/etcd/etcd-3.3.17.ebuild
deleted file mode 100644
index 6290e49fcb13..000000000000
--- a/dev-db/etcd/etcd-3.3.17.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit user systemd golang-vcs-snapshot
-
-KEYWORDS="amd64"
-EGO_PN="github.com/coreos/etcd"
-GIT_COMMIT="6d80523"
-MY_PV="${PV/_rc/-rc.}"
-DESCRIPTION="Highly-available key value store for shared configuration and service discovery"
-HOMEPAGE="https://github.com/etcd-io/etcd"
-SRC_URI="https://${EGO_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="Apache-2.0 BSD BSD-2 MIT"
-SLOT="0"
-IUSE="doc +server"
-DEPEND=">=dev-lang/go-1.12:="
-RDEPEND="!dev-db/etcdctl"
-
-src_prepare() {
-	default
-	sed -e "s|GIT_SHA=.*|GIT_SHA=${GIT_COMMIT}|"\
-		-i "${S}"/src/${EGO_PN}/build || die
-	sed -e 's:\(for p in \)shellcheck :\1 :' \
-		-e 's:^			gofmt \\$:\\:' \
-		-e 's:^			govet \\$:\\:' \
-		-i "${S}"/src/${EGO_PN}/test || die
-	# missing ... in args forwarded to print-like function
-	sed -e 's:l\.Logger\.Panic(v):l.Logger.Panic(v...):' \
-		-i "${S}"/src/${EGO_PN}/raft/logger.go || die
-}
-
-pkg_setup() {
-	if use server; then
-		enewgroup ${PN}
-		enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
-	fi
-}
-
-src_compile() {
-	export -n GOCACHE XDG_CACHE_HOME #651934
-	export GOPATH=${S}
-	pushd src/${EGO_PN} || die
-	GO_BUILD_FLAGS=-v ./build || die
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin bin/etcdctl
-	use doc && dodoc -r Documentation
-	if use server; then
-		insinto /etc/${PN}
-		doins "${FILESDIR}/${PN}.conf"
-		dobin bin/etcd
-		dodoc README.md
-		systemd_dounit "${FILESDIR}/${PN}.service"
-		systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles.d.conf" ${PN}.conf
-		newinitd "${FILESDIR}"/${PN}.initd ${PN}
-		newconfd "${FILESDIR}"/${PN}.confd ${PN}
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-		keepdir /var/lib/${PN}
-		fowners ${PN}:${PN} /var/lib/${PN}
-		fperms 0700 /var/lib/${PN}
-		keepdir /var/log/${PN}
-		fowners ${PN}:${PN} /var/log/${PN}
-		fperms 755 /var/log/${PN}
-	fi
-	popd || die
-}
-
-src_test() {
-	pushd src/${EGO_PN} || die
-	./test || die
-	popd || die
-}
diff --git a/dev-db/etcd/etcd-3.3.18.ebuild b/dev-db/etcd/etcd-3.3.18.ebuild
deleted file mode 100644
index 76b45d139626..000000000000
--- a/dev-db/etcd/etcd-3.3.18.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit user systemd golang-vcs-snapshot
-
-KEYWORDS="~amd64"
-EGO_PN="github.com/coreos/etcd"
-GIT_COMMIT="3c8740a"
-MY_PV="${PV/_rc/-rc.}"
-DESCRIPTION="Highly-available key value store for shared configuration and service discovery"
-HOMEPAGE="https://github.com/etcd-io/etcd"
-SRC_URI="https://${EGO_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="Apache-2.0 BSD BSD-2 MIT"
-SLOT="0"
-IUSE="doc +server"
-DEPEND=">=dev-lang/go-1.12:="
-RDEPEND="!dev-db/etcdctl"
-
-src_prepare() {
-	default
-	sed -e "s|GIT_SHA=.*|GIT_SHA=${GIT_COMMIT}|"\
-		-i "${S}"/src/${EGO_PN}/build || die
-	sed -e 's:\(for p in \)shellcheck :\1 :' \
-		-e 's:^			gofmt \\$:\\:' \
-		-e 's:^			govet \\$:\\:' \
-		-i "${S}"/src/${EGO_PN}/test || die
-	# missing ... in args forwarded to print-like function
-	sed -e 's:l\.Logger\.Panic(v):l.Logger.Panic(v...):' \
-		-i "${S}"/src/${EGO_PN}/raft/logger.go || die
-}
-
-pkg_setup() {
-	if use server; then
-		enewgroup ${PN}
-		enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
-	fi
-}
-
-src_compile() {
-	export -n GOCACHE XDG_CACHE_HOME #651934
-	export GOPATH=${S}
-	pushd src/${EGO_PN} || die
-	GO_BUILD_FLAGS=-v ./build || die
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin bin/etcdctl
-	use doc && dodoc -r Documentation
-	if use server; then
-		insinto /etc/${PN}
-		doins "${FILESDIR}/${PN}.conf"
-		dobin bin/etcd
-		dodoc README.md
-		systemd_dounit "${FILESDIR}/${PN}.service"
-		systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles.d.conf" ${PN}.conf
-		newinitd "${FILESDIR}"/${PN}.initd ${PN}
-		newconfd "${FILESDIR}"/${PN}.confd ${PN}
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-		keepdir /var/lib/${PN}
-		fowners ${PN}:${PN} /var/lib/${PN}
-		fperms 0700 /var/lib/${PN}
-		keepdir /var/log/${PN}
-		fowners ${PN}:${PN} /var/log/${PN}
-		fperms 755 /var/log/${PN}
-	fi
-	popd || die
-}
-
-src_test() {
-	pushd src/${EGO_PN} || die
-	./test || die
-	popd || die
-}
diff --git a/dev-db/etcd/etcd-3.3.19.ebuild b/dev-db/etcd/etcd-3.3.19.ebuild
deleted file mode 100644
index be6c9f54d493..000000000000
--- a/dev-db/etcd/etcd-3.3.19.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit user systemd golang-vcs-snapshot
-
-KEYWORDS="~amd64"
-EGO_PN="github.com/coreos/etcd"
-GIT_COMMIT=67da93f73
-MY_PV="${PV/_rc/-rc.}"
-DESCRIPTION="Highly-available key value store for shared configuration and service discovery"
-HOMEPAGE="https://github.com/etcd-io/etcd"
-SRC_URI="https://${EGO_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="Apache-2.0 BSD BSD-2 MIT"
-SLOT="0"
-IUSE="doc +server"
-DEPEND=">=dev-lang/go-1.12:="
-RDEPEND="!dev-db/etcdctl"
-
-src_prepare() {
-	default
-	sed -e "s|GIT_SHA=.*|GIT_SHA=${GIT_COMMIT}|"\
-		-i "${S}"/src/${EGO_PN}/build || die
-	sed -e 's:\(for p in \)shellcheck :\1 :' \
-		-e 's:^			gofmt \\$:\\:' \
-		-e 's:^			govet \\$:\\:' \
-		-i "${S}"/src/${EGO_PN}/test || die
-	# missing ... in args forwarded to print-like function
-	sed -e 's:l\.Logger\.Panic(v):l.Logger.Panic(v...):' \
-		-i "${S}"/src/${EGO_PN}/raft/logger.go || die
-}
-
-pkg_setup() {
-	if use server; then
-		enewgroup ${PN}
-		enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
-	fi
-}
-
-src_compile() {
-	export -n GOCACHE XDG_CACHE_HOME #651934
-	export GOPATH=${S}
-	pushd src/${EGO_PN} || die
-	GO_BUILD_FLAGS=-v ./build || die
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin bin/etcdctl
-	use doc && dodoc -r Documentation
-	if use server; then
-		insinto /etc/${PN}
-		doins "${FILESDIR}/${PN}.conf"
-		dobin bin/etcd
-		dodoc README.md
-		systemd_dounit "${FILESDIR}/${PN}.service"
-		systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles.d.conf" ${PN}.conf
-		newinitd "${FILESDIR}"/${PN}.initd ${PN}
-		newconfd "${FILESDIR}"/${PN}.confd ${PN}
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-		keepdir /var/lib/${PN}
-		fowners ${PN}:${PN} /var/lib/${PN}
-		fperms 0700 /var/lib/${PN}
-		keepdir /var/log/${PN}
-		fowners ${PN}:${PN} /var/log/${PN}
-		fperms 755 /var/log/${PN}
-	fi
-	popd || die
-}
-
-src_test() {
-	pushd src/${EGO_PN} || die
-	./test || die
-	popd || die
-}
diff --git a/dev-db/etcd/etcd-3.4.5.ebuild b/dev-db/etcd/etcd-3.3.23.ebuild
index 8848dd8b39f6..d767c318c0c5 100644
--- a/dev-db/etcd/etcd-3.4.5.ebuild
+++ b/dev-db/etcd/etcd-3.3.23.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 inherit go-module systemd
-GIT_COMMIT=e784ba73c
+GIT_COMMIT=4873f5516
 MY_PV="${PV/_rc/-rc.}"
 
 DESCRIPTION="Highly-available key value store for shared configuration and service discovery"
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/etcd-io/etcd/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="Apache-2.0 BSD BSD-2 MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="doc +server"
 
 COMMON_DEPEND="server? (
@@ -23,7 +23,12 @@ DEPEND="${COMMON_DEPEND}"
 RDEPEND="${COMMON_DEPEND}
 	!dev-db/etcdctl"
 
+# Tests hang and emit this error:
+# Too many goroutines running after all test(s).
+RESTRICT="test"
+
 src_prepare() {
+	export GO_BUILD_FLAGS="-mod=vendor -v -x"
 	default
 	sed -e "s|GIT_SHA=.*|GIT_SHA=${GIT_COMMIT}|"\
 		-i "${S}"/build || die
@@ -39,10 +44,19 @@ src_prepare() {
 	sed -e 's:TestGetDefaultInterface(:_\0:' \
 		-e 's:TestGetDefaultHost(:_\0:' \
 		-i "${S}"/pkg/netutil/routes_linux_test.go || die
+
+	rm "${S}"/pkg/tlsutil/cipher_suites_test.go || die
+
+	sed -e "s|GO_BUILD_FLAGS=\"[^\"]*\"|GO_BUILD_FLAGS=\"${GO_BUILD_FLAGS}\"|" \
+		-e "s|go test |go test ${GO_BUILD_FLAGS} |" \
+		-i ./test || die
+
+	mkdir -p vendor/github.com/coreos || die
+	ln -s ../../.. vendor/github.com/coreos/etcd || die
 }
 
 src_compile() {
-	GO_BUILD_FLAGS=-v ./build || die
+	 ./build || die
 }
 
 src_install() {
diff --git a/dev-db/etcd/etcd-3.4.4.ebuild b/dev-db/etcd/etcd-3.3.24.ebuild
index ba0f54d54760..ebb677c1e00e 100644
--- a/dev-db/etcd/etcd-3.4.4.ebuild
+++ b/dev-db/etcd/etcd-3.3.24.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 inherit go-module systemd
-GIT_COMMIT=c65a9e2dd
+GIT_COMMIT=bdd57848d
 MY_PV="${PV/_rc/-rc.}"
 
 DESCRIPTION="Highly-available key value store for shared configuration and service discovery"
@@ -23,7 +23,12 @@ DEPEND="${COMMON_DEPEND}"
 RDEPEND="${COMMON_DEPEND}
 	!dev-db/etcdctl"
 
+# Tests fail with this error:
+# fatal error: checkptr: unsafe pointer conversion
+RESTRICT="test"
+
 src_prepare() {
+	export GO_BUILD_FLAGS="-mod=vendor -v -x"
 	default
 	sed -e "s|GIT_SHA=.*|GIT_SHA=${GIT_COMMIT}|"\
 		-i "${S}"/build || die
@@ -32,17 +37,19 @@ src_prepare() {
 		-e 's:^			govet \\$:\\:' \
 		-e 's:^			govet_shadow \\$:\\:' \
 		-i "${S}"/test || die
-	# missing ... in args forwarded to print-like function
-	sed -e 's:l\.Logger\.Panic(v):l.Logger.Panic(v...):' \
-		-i "${S}"/raft/logger.go || die
 
-	sed -e 's:TestGetDefaultInterface(:_\0:' \
-		-e 's:TestGetDefaultHost(:_\0:' \
-		-i "${S}"/pkg/netutil/routes_linux_test.go || die
+	sed -e "s|GO_BUILD_FLAGS=\"[^\"]*\"|GO_BUILD_FLAGS=\"${GO_BUILD_FLAGS}\"|" \
+		-e "s|go test |go test ${GO_BUILD_FLAGS} |" \
+		-i ./test || die
+
+	mkdir -p vendor/github.com/coreos || die
+	ln -s ../../.. vendor/github.com/coreos/etcd || die
+
+	echo 'module go.etcd.io/etcd' > go.mod || die
 }
 
 src_compile() {
-	GO_BUILD_FLAGS=-v ./build || die
+	 ./build || die
 }
 
 src_install() {
diff --git a/dev-db/etcd/etcd-3.4.7.ebuild b/dev-db/etcd/etcd-3.4.10.ebuild
index 2e8f38a668f5..55d46653132b 100644
--- a/dev-db/etcd/etcd-3.4.7.ebuild
+++ b/dev-db/etcd/etcd-3.4.10.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 inherit go-module systemd
-GIT_COMMIT=e694b7bb0
+GIT_COMMIT=18dfb9cca
 MY_PV="${PV/_rc/-rc.}"
 
 DESCRIPTION="Highly-available key value store for shared configuration and service discovery"
@@ -23,7 +23,12 @@ DEPEND="${COMMON_DEPEND}"
 RDEPEND="${COMMON_DEPEND}
 	!dev-db/etcdctl"
 
+# Tests fail with this error:
+# fatal error: checkptr: unsafe pointer conversion
+RESTRICT="test"
+
 src_prepare() {
+	export GO_BUILD_FLAGS="-mod=vendor -v -x"
 	default
 	sed -e "s|GIT_SHA=.*|GIT_SHA=${GIT_COMMIT}|"\
 		-i "${S}"/build || die
@@ -32,17 +37,19 @@ src_prepare() {
 		-e 's:^			govet \\$:\\:' \
 		-e 's:^			govet_shadow \\$:\\:' \
 		-i "${S}"/test || die
-	# missing ... in args forwarded to print-like function
-	sed -e 's:l\.Logger\.Panic(v):l.Logger.Panic(v...):' \
-		-i "${S}"/raft/logger.go || die
 
-	sed -e 's:TestGetDefaultInterface(:_\0:' \
-		-e 's:TestGetDefaultHost(:_\0:' \
-		-i "${S}"/pkg/netutil/routes_linux_test.go || die
+	sed -e "s|GO_BUILD_FLAGS=\"[^\"]*\"|GO_BUILD_FLAGS=\"${GO_BUILD_FLAGS}\"|" \
+		-e "s|go test |go test ${GO_BUILD_FLAGS} |" \
+		-i ./test || die
+
+	mkdir -p vendor/github.com/coreos || die
+	ln -s ../../.. vendor/github.com/coreos/etcd || die
+
+	echo 'module go.etcd.io/etcd' > go.mod || die
 }
 
 src_compile() {
-	GO_BUILD_FLAGS="-mod=vendor -v -x" ./build || die
+	 ./build || die
 }
 
 src_install() {
diff --git a/dev-db/etcd/etcd-3.3.20.ebuild b/dev-db/etcd/etcd-3.4.11.ebuild
index bb8da4b424e7..0c3cc8f2f4b1 100644
--- a/dev-db/etcd/etcd-3.3.20.ebuild
+++ b/dev-db/etcd/etcd-3.4.11.ebuild
@@ -1,53 +1,58 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
-inherit user systemd golang-vcs-snapshot
-
-KEYWORDS="~amd64"
-EGO_PN="github.com/coreos/etcd"
-GIT_COMMIT=9fd7e2b80
+EAPI=7
+inherit go-module systemd
+GIT_COMMIT=e71e0c5c8
 MY_PV="${PV/_rc/-rc.}"
+
 DESCRIPTION="Highly-available key value store for shared configuration and service discovery"
 HOMEPAGE="https://github.com/etcd-io/etcd"
-SRC_URI="https://${EGO_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/etcd-io/etcd/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
 LICENSE="Apache-2.0 BSD BSD-2 MIT"
 SLOT="0"
+KEYWORDS="~amd64"
 IUSE="doc +server"
 
 COMMON_DEPEND="server? (
 	acct-group/etcd
 	acct-user/etcd
 	)"
-DEPEND=">=dev-lang/go-1.12:=
-	${COMMON_DEPEND}"
-RDEPEND="!dev-db/etcdctl
-	${COMMON_DEPEND}"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	!dev-db/etcdctl"
+
+# Tests fail with this error:
+# fatal error: checkptr: unsafe pointer conversion
+RESTRICT="test"
 
 src_prepare() {
+	export GO_BUILD_FLAGS="-mod=vendor -v -x"
 	default
 	sed -e "s|GIT_SHA=.*|GIT_SHA=${GIT_COMMIT}|"\
-		-i "${S}"/src/${EGO_PN}/build || die
+		-i "${S}"/build || die
 	sed -e 's:\(for p in \)shellcheck :\1 :' \
 		-e 's:^			gofmt \\$:\\:' \
 		-e 's:^			govet \\$:\\:' \
-		-i "${S}"/src/${EGO_PN}/test || die
-	# missing ... in args forwarded to print-like function
-	sed -e 's:l\.Logger\.Panic(v):l.Logger.Panic(v...):' \
-		-i "${S}"/src/${EGO_PN}/raft/logger.go || die
+		-e 's:^			govet_shadow \\$:\\:' \
+		-i "${S}"/test || die
+
+	sed -e "s|GO_BUILD_FLAGS=\"[^\"]*\"|GO_BUILD_FLAGS=\"${GO_BUILD_FLAGS}\"|" \
+		-e "s|go test |go test ${GO_BUILD_FLAGS} |" \
+		-i ./test || die
+
+	mkdir -p vendor/github.com/coreos || die
+	ln -s ../../.. vendor/github.com/coreos/etcd || die
+
+	echo 'module go.etcd.io/etcd' > go.mod || die
 }
 
 src_compile() {
-	export -n GOCACHE XDG_CACHE_HOME #651934
-	export GOPATH=${S}
-	pushd src/${EGO_PN} || die
-	GO_BUILD_FLAGS=-v ./build || die
-	popd || die
+	 ./build || die
 }
 
 src_install() {
-	pushd src/${EGO_PN} || die
 	dobin bin/etcdctl
 	use doc && dodoc -r Documentation
 	if use server; then
@@ -68,11 +73,8 @@ src_install() {
 		fowners ${PN}:${PN} /var/log/${PN}
 		fperms 755 /var/log/${PN}
 	fi
-	popd || die
 }
 
 src_test() {
-	pushd src/${EGO_PN} || die
 	./test || die
-	popd || die
 }
diff --git a/dev-db/etcd/etcd-3.4.3.ebuild b/dev-db/etcd/etcd-3.4.3.ebuild
deleted file mode 100644
index c11f52d4d3ba..000000000000
--- a/dev-db/etcd/etcd-3.4.3.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit user systemd golang-vcs-snapshot
-
-KEYWORDS="~amd64"
-EGO_PN="go.etcd.io/etcd"
-GIT_COMMIT="3cf2f69"
-MY_PV="${PV/_rc/-rc.}"
-DESCRIPTION="Highly-available key value store for shared configuration and service discovery"
-HOMEPAGE="https://github.com/etcd-io/etcd"
-SRC_URI="https://github.com/etcd-io/etcd/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="Apache-2.0 BSD BSD-2 MIT"
-SLOT="0"
-IUSE="doc +server"
-DEPEND=">=dev-lang/go-1.12:="
-RDEPEND="!dev-db/etcdctl"
-
-src_prepare() {
-	default
-	sed -e "s|GIT_SHA=.*|GIT_SHA=${GIT_COMMIT}|"\
-		-i "${S}"/src/${EGO_PN}/build || die
-	sed -e 's:\(for p in \)shellcheck :\1 :' \
-		-e 's:^			gofmt \\$:\\:' \
-		-e 's:^			govet \\$:\\:' \
-		-e 's:^			govet_shadow \\$:\\:' \
-		-i "${S}"/src/${EGO_PN}/test || die
-	# missing ... in args forwarded to print-like function
-	sed -e 's:l\.Logger\.Panic(v):l.Logger.Panic(v...):' \
-		-i "${S}"/src/${EGO_PN}/raft/logger.go || die
-
-	sed -e 's:TestGetDefaultInterface(:_\0:' \
-		-e 's:TestGetDefaultHost(:_\0:' \
-		-i "${S}"/src/${EGO_PN}/pkg/netutil/routes_linux_test.go || die
-
-	# Avoid network-sandbox violations since go-1.13
-	rm src/${EGO_PN}/go.mod || die
-}
-
-pkg_setup() {
-	if use server; then
-		enewgroup ${PN}
-		enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
-	fi
-}
-
-src_compile() {
-	export -n GOCACHE XDG_CACHE_HOME #651934
-	export GOPATH=${S}
-	pushd src/${EGO_PN} || die
-	GO_BUILD_FLAGS=-v ./build || die
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin bin/etcdctl
-	use doc && dodoc -r Documentation
-	if use server; then
-		insinto /etc/${PN}
-		doins "${FILESDIR}/${PN}.conf"
-		dobin bin/etcd
-		dodoc README.md
-		systemd_dounit "${FILESDIR}/${PN}.service"
-		systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles.d.conf" ${PN}.conf
-		newinitd "${FILESDIR}"/${PN}.initd ${PN}
-		newconfd "${FILESDIR}"/${PN}.confd ${PN}
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-		keepdir /var/lib/${PN}
-		fowners ${PN}:${PN} /var/lib/${PN}
-		fperms 0700 /var/lib/${PN}
-		keepdir /var/log/${PN}
-		fowners ${PN}:${PN} /var/log/${PN}
-		fperms 755 /var/log/${PN}
-	fi
-	popd || die
-}
-
-src_test() {
-	pushd src/${EGO_PN} || die
-	GO111MODULE=off ./test || die
-	popd || die
-}