gentoo resync : 06.08.2019

3 files changed, 16 insertions, 13 deletions

diff --git a/dev-db/etcd/Manifest b/dev-db/etcd/Manifest
index eea595fde91e..27d9f3b9e93c 100644
--- a/dev-db/etcd/Manifest
+++ b/dev-db/etcd/Manifest
@@ -4,8 +4,8 @@ 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.13.tar.gz 3372732 BLAKE2B 241dee0d9843eefc9aaefb35be8f649d242ab1417456cc3028c8eb2ff2af6a7a1c396f04029d87877d384247b8c7a51ec6ea2e0dd51af07ce48ecc91c613c380 SHA512 5b8cf9d8d8b0afd1551f414480f04837668729c10d5d81c5e9ffba3392bd2567f3798267c5e4dbe60f49dbdd859f668c6fe0d7924e0fd65f918ab3bd01d5751a
-DIST etcd-3.3.14.tar.gz 6342437 BLAKE2B 4bcf27829045e2f2f34c7628d6ed854a7ef5e6db02bd794d1135bb901486d8f3c1bf598c230fe7491e9db7273d3e5aa83bf4c941476ad3093423c14f377513b2 SHA512 76c8147168030310f0e4fa0c22670fd73369795ab6d98c0632c87b5947acf10af4adae58b46f042a482dc7a002044cfbdfbec962517018e2fdf211c381281dae
-EBUILD etcd-3.3.13.ebuild 1990 BLAKE2B 0dcfa21fd148dd9cfc7899a6432f3df5cfa0c678b39291bd4cc8c371e32932bf9d0f2fe97355572a621280c1200dfa3a9733be3f4fd2cebadf06f9e1fe06e435 SHA512 582ea4605eec3d812df40be5dffabc7c62be3652948f8d3dfae6f0c8553f507ce1ce6e135aa5b1b0c0c5fb52c970140a19c50cfd73bb905773ef17db9143c129
-EBUILD etcd-3.3.14.ebuild 2006 BLAKE2B 7e2c00213dd64e2ab82d7b94e606f7a258fa7d60c8a55b1f7a842f67c902d904e85959e81e457a2b43e06a6beb37ebdc07ca92b978eda8cea844a5555a12dcbb SHA512 58a239758efb92c53d5abd32ea49453e6d4ad4f606e660d3011c5ff7e7f26a42f533b6198360fec980d99bc3199da0febdda9d044dc5d3797be4e680785b5609
+DIST etcd-3.3.15.tar.gz 6271373 BLAKE2B 85786a2a4acaf144f80461a56775b8c91164e8f0c0034ef0741d98383ac400720ca69b855588a076dc174364330c0e12df73a36570983138e33a32cdbe69e22f SHA512 9fbc02c4aacb000335d558e9c5d4df672194d1b1b8511918efa35a6123bcd7f1a06ecc527f7ff01af7c7f0e818b4809918e640fd596ec51898bf511849f0a2c5
+DIST etcd-3.4.0.tar.gz 8931860 BLAKE2B abeb78866b751a3a124f1aaba2b6709402a51d0c5f36a45c8386816e4059172206c7e3420865209a53cecf7452a8c8b510a6fd50b5c7a9fefaac577e5d3c4413 SHA512 8e130cc76a2284c98bb72e3832e10e25e45c6fbaa5da7c6a7a2dd14a069d4fea7659b13c1450b87b869e5936bdad47606d0c65292febb7257369531ff2658674
+EBUILD etcd-3.3.15.ebuild 1989 BLAKE2B 533264f964f7fb88f11dfdd7114d104c8b0b47ae05512651d9f0d8492ab16ce678232637281da132fba9c34ebe7e5f7622a23f162b8bed564315153d65d5facd SHA512 aaaf9251fc4d5d411333e62f557d8477f603c261d319dbe823304a2c8840de286b842d2949ec3c0cc99cff41e84e627212e38619ed75adadf6089b793f424854
+EBUILD etcd-3.4.0.ebuild 2077 BLAKE2B 3f9fef30fe99652a34c6e221c57f0b6f3cff5ab504b53e012772f372652b6c9e7af9619f34e3408c478b8d97fe8b90a7c566bc98ab8c13da664a3f3bab53484c SHA512 cae7940cc3c7a402b66baf3719a5bbfad1c12e6edfda23fcaca0d5fc46ca00143d3db75041ca5fd8ee1eb0a11749dc338a9d0f2c37558509ffff3f9f433573ec
 MISC metadata.xml 679 BLAKE2B 7374379a18107011df792be631428834334ad8e6da5cfe404f18555e8c168d3fc716a1c8d6cb5cf1d9ccd173737aecf93a165f846865dbb6ba4a76bd4669b446 SHA512 8070d8b51dd3319e8b159072db237dcc5299361c2f74fa086fc4cbc174cc6a5c8f7659310332b54b2275e2bc3d028323c4dfa5775e21693a339f54312582d2f0
diff --git a/dev-db/etcd/etcd-3.3.14.ebuild b/dev-db/etcd/etcd-3.3.15.ebuild
index 4124cf6b9401..b3ed26c899a4 100644
--- a/dev-db/etcd/etcd-3.3.14.ebuild
+++ b/dev-db/etcd/etcd-3.3.15.ebuild
@@ -5,9 +5,9 @@ EAPI=6
 
 inherit user systemd golang-vcs-snapshot
 
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 EGO_PN="github.com/coreos/etcd"
-GIT_COMMIT="5cf5d88"
+GIT_COMMIT="94745a4"
 MY_PV="${PV/_rc/-rc.}"
 DESCRIPTION="Highly-available key value store for shared configuration and service discovery"
 HOMEPAGE="https://github.com/etcd-io/etcd"
@@ -73,6 +73,6 @@ src_install() {
 
 src_test() {
 	pushd src/${EGO_PN} || die
-	GO111MODULES=on ./test || die
+	./test || die
 	popd || die
 }
diff --git a/dev-db/etcd/etcd-3.3.13.ebuild b/dev-db/etcd/etcd-3.4.0.ebuild
index ba297d2a0313..97d43f62eaf2 100644
--- a/dev-db/etcd/etcd-3.3.13.ebuild
+++ b/dev-db/etcd/etcd-3.4.0.ebuild
@@ -5,17 +5,17 @@ EAPI=6
 
 inherit user systemd golang-vcs-snapshot
 
-KEYWORDS="amd64"
-EGO_PN="github.com/etcd-io/etcd"
-GIT_COMMIT="98d3084"
+KEYWORDS="~amd64"
+EGO_PN="go.etcd.io/etcd"
+GIT_COMMIT="898bd13"
 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="${HOMEPAGE}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="doc +server"
-DEPEND=">=dev-lang/go-1.10:="
+DEPEND=">=dev-lang/go-1.12:="
 RDEPEND="!dev-db/etcdctl"
 
 src_prepare() {
@@ -29,6 +29,9 @@ src_prepare() {
 	# 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
+
+	# Avoid network-sandbox violations since go-1.13
+	rm src/${EGO_PN}/go.mod || die
 }
 
 pkg_setup() {
@@ -73,6 +76,6 @@ src_install() {
 
 src_test() {
 	pushd src/${EGO_PN} || die
-	./test || die
+	GO111MODULES=off ./test || die
 	popd || die
 }