gentoo resync : 08.06.2019

4 files changed, 5 insertions, 37 deletions

diff --git a/dev-go/Manifest.gz b/dev-go/Manifest.gz
index 11975216d3cb..b29977d742f8 100644
--- a/dev-go/Manifest.gz
+++ b/dev-go/Manifest.gz
diff --git a/dev-go/go-protobuf/Manifest b/dev-go/go-protobuf/Manifest
index 8ded7a48a880..21900947261a 100644
--- a/dev-go/go-protobuf/Manifest
+++ b/dev-go/go-protobuf/Manifest
@@ -1,8 +1,6 @@
 DIST github.com-golang-net-aaf60122140d3fcf75376d319f0554393160eb50.tar.gz 965206 BLAKE2B 018ab877bfa7208bb0ca9b4ede85077ed37c8ee3c7065569646e6c9704715d6810b0286276ea0fa9a271f12ffbe964b41f55ec762711c8a43ccea564607f3265 SHA512 d56f5608e64e8d883a782f0c460f08da20e7d01a97330fad35c8757420ac82fb84b657c3f64e3c4d90a08cc4d8905ab37225d6fab8472e8f1fd3d7be212df8b9
 DIST github.com-golang-sync-1d60e4601c6fd243af51cc01ddf169918a5407ca.tar.gz 16326 BLAKE2B d214c190a03006b726b4e5daa8320aa2f664572db46ac6a57545ccd3e98529c63fd5d9296e2afe0af0b781fcced4af52127d8079e72d116e0310688465e1882e SHA512 dc67de045513305edb3239b412b9154b44b6f408eace3cbbcf400c08d68322cec7090b9e6b22d63bcfaaec459e221d0e3f2c057aa19ae9b35a4a134dd72475c5
 DIST github.com-google-go-genproto-af9cb2a35e7f169ec875002c1829c9b315cddc04.tar.gz 2323831 BLAKE2B a614c74b60f8e347b47c8686807228ea76b021a918fc732b69293c8b59c1bc5396e320cbce6db87ab43b9a4fd649d19779874934bdd667f7cabf03165439c54a SHA512 a6524f31e8c4775195c245ffbe54c7f770591d46663ea86b8120ffd8efb3cf9269569fbf457b0d0272dc47177ccf3b413e858c2b437ee9892b5ac6698d07ed4d
-DIST go-protobuf-0_pre20160216.tar.gz 198638 BLAKE2B 21b1780d9e792263eaa1babbefff855fc506177b56d907650968ae96e13c6624982511cbeb3b2bf002ad724ab454e4450f6d7649b55297fb2756b528f9789283 SHA512 d7f446ce7b3f78d646abccdbcb92c423fcca99a51275b55f2a357b5e44c2a6b6d7ea59a39b654daa36e59aa39d3b094ed3fb3d6f53c789a4396fceaecbd5ace5
 DIST go-protobuf-1.2.0.tar.gz 332565 BLAKE2B 6916341aaa30f593c9a27363d4d73c548d0f7a629adffeab927078bb3ebc64f59a5c568b7bb7999c7505d526ce0ead0c9163908080f24ecd6c7b94ed2db28335 SHA512 a0f596ee96f7501ee47da75ea234c1e29c0abb2c3fda731acd601a55880502ae90d70f6d3da9c9a35e493fd1bcb69971c062e16b1e49a0996137950dac2effac
-EBUILD go-protobuf-0_pre20160216.ebuild 687 BLAKE2B 77d253b98d6b0c41858e06ddd5cef35e1b3104e643594b0ef4a7f56629ca34c05da51f86f7a0f05415ec97673a051b2a0f3594e3b40bcc50fb3aa67e3b291207 SHA512 15ea925abcd9e8be28b4992f09ac7c1dbe7001cda8cf23d37137b3396e4c56e60fc033c0425a5876b912c7af7a5edb09379d1346dcb76ae7b9f687509ee0e055
-EBUILD go-protobuf-1.2.0.ebuild 1299 BLAKE2B 709a597af78b1877469c46cb3b01a6bbd7c5963fa5b418ca1a954d1a704e385a136e6b64ec39a70971a5f7ec62f4775424430cac0200ddb298f1716ea033c46e SHA512 2af83b2a4e2599c1908b034f8aca6e39ec173700ed8a244432f1747af718dbac59552b823dfe43c7fc2af1e8245d19637bd8f01ea763c6d13be2a6adf63fe23e
+EBUILD go-protobuf-1.2.0.ebuild 1357 BLAKE2B 174002dde2600d8e0ecdfb42a196ac50c631cba7e1c52f9869648b7d630a16ac2cea7c7c25221e190a1032f6ae5d10713585f7f01cb3794c4aa65a296904d18f SHA512 be9add53c9a3a8b598927bf2c9d4697be0614e4484bf216e4a8211916b2e2f2b98fa314737469ae0d3757bef8c6f09a296938ca453fa5b6d3d5e3b6f88560b9a
 MISC metadata.xml 306 BLAKE2B 0a4acdd528bf97660b3a3932c1073caf0f1593c32a5c03c9375e877650a40dbaf86b9cbfa568a30caa78e2d4cc90d468f24f3f4fdad395758d57f2985059b441 SHA512 f2502a8d1135fa06f2e580cc0dbbbc63dfbe7a2cbe296fd99be657f33cd0681f4e01813b8b4047ddd188089f7b99934dead4618377d002a0365d066137d4ca61
diff --git a/dev-go/go-protobuf/go-protobuf-0_pre20160216.ebuild b/dev-go/go-protobuf/go-protobuf-0_pre20160216.ebuild
deleted file mode 100644
index 6fee793f301d..000000000000
--- a/dev-go/go-protobuf/go-protobuf-0_pre20160216.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-EGO_SRC=github.com/golang/protobuf
-EGO_PN=${EGO_SRC}/...
-
-if [[ ${PV} = *9999* ]]; then
-	inherit golang-vcs
-else
-	KEYWORDS="~amd64"
-	EGIT_COMMIT="127091107ff5f822298f1faa7487ffcf578adcf6"
-	SRC_URI="https://${EGO_SRC}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	inherit golang-vcs-snapshot
-fi
-inherit golang-build
-
-DESCRIPTION="Go support for Google's protocol buffers"
-HOMEPAGE="https://github.com/golang/protobuf"
-LICENSE="BSD"
-SLOT="0/${PVR}"
-IUSE=""
-DEPEND=""
-RDEPEND=""
-
-src_install() {
-	rm -rf src/${EGO_SRC}/.git* || die
-	golang-build_src_install
-	dobin bin/*
-}
diff --git a/dev-go/go-protobuf/go-protobuf-1.2.0.ebuild b/dev-go/go-protobuf/go-protobuf-1.2.0.ebuild
index 06fee922c86c..105944256a75 100644
--- a/dev-go/go-protobuf/go-protobuf-1.2.0.ebuild
+++ b/dev-go/go-protobuf/go-protobuf-1.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -20,9 +20,10 @@ SRC_URI="https://${EGO_SRC}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 LICENSE="BSD"
 SLOT="0/${PVR}"
 KEYWORDS="~amd64"
-IUSE=""
-DEPEND=""
+IUSE="test"
+DEPEND="test? ( dev-libs/protobuf )"
 RDEPEND=""
+RESTRICT="!test? ( test )"
 
 src_prepare() {
 	default