gentoo resync : 19.03.2019

4 files changed, 2 insertions, 159 deletions

diff --git a/dev-db/etcd/Manifest b/dev-db/etcd/Manifest
index bf4c0cc4bb6d..4136d5c87ee5 100644
--- a/dev-db/etcd/Manifest
+++ b/dev-db/etcd/Manifest
@@ -4,10 +4,6 @@ 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.10.tar.gz 3526904 BLAKE2B 8266212707f8fb280d55deba8dffb44e4d48b906c56034b174848fe6f237d5efba8c15ebea076d799db7f3ec560e2d188fdcc8fe26334ae1cbef0384fe8cf847 SHA512 848e241e816312307f74520b99aeabf7def6862093897035ace16cb230817d8e2681d7d2f1c1ac220d7c2b4c7c0a1262bbe3e4db927524f785de888566d2097c
-DIST etcd-3.3.11.tar.gz 3526863 BLAKE2B 5daf511e0d1d064a141a29de456aca0a837567052e3c742afc535405e04c90c70dd347b90960df2decadc53a38ceaf7acfad9346677cb17f892ece437cdf10e8 SHA512 4274c4988b6e7fe61dbcc88c88ed6647debd7a67c448b9101c77bebeef6400e65b9e2cc930f635c3f59105554411e1ac606c6a146ad6927a01d2e921b1a92949
 DIST etcd-3.3.12.tar.gz 3527586 BLAKE2B fdc4e3e9522c032d951045d4eda7f36743d4fbbb4ea8673bbe00bb38931cd7442910b0b54eeb6df0957439332df498389f3568ba7e8bdecfbd873fecfb3df86f SHA512 63ba6130bd93471260b8d90760455bccef2755e672a9df39224491188c69e4e3e8c1157cfb639c4002fb8a6d16950f7ff448a83e0acbc389162b742f3df6234f
-EBUILD etcd-3.3.10.ebuild 1945 BLAKE2B 784b63fd47b27837f2d8c344ca6318c8f54e47e24a034c068d24935c96f9867df36be67fbe406259524e989a8d17a0c1aa5210938e16363e34300afaed5e70b1 SHA512 a0f1d2555d205e46b82e8db5ebcaae808bf788c0c256f4355bd3792f8666f06bae7a6a9d6f3b24bfc6c88145a097ac1de2759a63f9e6a52c330aa4ebceb5269d
-EBUILD etcd-3.3.11.ebuild 1949 BLAKE2B 57a02f2ded70079e6da6520853058dfc5b069b3a6f965e6768bca48414cff077694b92ac2725f4fa0c6cde9bfe9938a16056a3cf73c7ae366863943a27a5115c SHA512 4370e03e5831a23aaa7826e8bd4ef73b384784ba79d4f904a73f4002e6bfcfa9d3164b20e451a59d6db49928e8fd1f59d1d501f1aa3b7110261def861e317aa3
-EBUILD etcd-3.3.12.ebuild 1949 BLAKE2B 6f0ad2fcb58afba2af80f01dc23c13af419d190e614d3027450195fbeb3e5c17d452c14c0e714c9774b0f4b0140d0f1992a554484a76be3e69fa3063147ba7ff SHA512 2861f5dcb65b7d13c4858751efbc8e9b51804fea1d87b8eea1170f90da58ebdde7839fe4d14c0e4aa5fc4824b0a5d584cbf773910ecbc9901a57fcc588988086
+EBUILD etcd-3.3.12.ebuild 1991 BLAKE2B 856a1e4bde495fcb961a7acb5a985a12b5bfeda9c962d88a42c538d1465368c697348588a641cb673a527f26dde96965ba614209e196d4596fc58041619bbb34 SHA512 17ed0233df8464b24f304dbe1727300c1eaf9ad79382a3aebb7a1dad8e281c6965a67406e064181f8f0beb90c502d05e126962563e83b620abe6675f93513ca2
 MISC metadata.xml 679 BLAKE2B 7374379a18107011df792be631428834334ad8e6da5cfe404f18555e8c168d3fc716a1c8d6cb5cf1d9ccd173737aecf93a165f846865dbb6ba4a76bd4669b446 SHA512 8070d8b51dd3319e8b159072db237dcc5299361c2f74fa086fc4cbc174cc6a5c8f7659310332b54b2275e2bc3d028323c4dfa5775e21693a339f54312582d2f0
diff --git a/dev-db/etcd/etcd-3.3.10.ebuild b/dev-db/etcd/etcd-3.3.10.ebuild
deleted file mode 100644
index b1e380183334..000000000000
--- a/dev-db/etcd/etcd-3.3.10.ebuild
+++ /dev/null
@@ -1,77 +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="27fc7e2"
-MY_PV="${PV/_rc/-rc.}"
-DESCRIPTION="Highly-available key value store for shared configuration and service discovery"
-HOMEPAGE="https://github.com/coreos/etcd"
-SRC_URI="https://${EGO_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="doc +server"
-DEPEND=">=dev-lang/go-1.9:="
-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 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.11.ebuild b/dev-db/etcd/etcd-3.3.11.ebuild
deleted file mode 100644
index 40c9067fb1d4..000000000000
--- a/dev-db/etcd/etcd-3.3.11.ebuild
+++ /dev/null
@@ -1,77 +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/etcd-io/etcd"
-GIT_COMMIT="2cf9e51"
-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"
-SLOT="0"
-IUSE="doc +server"
-DEPEND=">=dev-lang/go-1.10:="
-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 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.12.ebuild b/dev-db/etcd/etcd-3.3.12.ebuild
index 00de853590ff..de901b0d963b 100644
--- a/dev-db/etcd/etcd-3.3.12.ebuild
+++ b/dev-db/etcd/etcd-3.3.12.ebuild
@@ -39,6 +39,7 @@ pkg_setup() {
 }
 
 src_compile() {
+	export -n GOCACHE XDG_CACHE_HOME #651934
 	export GOPATH=${S}
 	pushd src/${EGO_PN} || die
 	GO_BUILD_FLAGS=-v ./build || die