gentoo resync : 13.10.2019

3 files changed, 54 insertions, 56 deletions

diff --git a/dev-go/go-protobuf/Manifest b/dev-go/go-protobuf/Manifest
index 21900947261a..aa61208b272f 100644
--- a/dev-go/go-protobuf/Manifest
+++ b/dev-go/go-protobuf/Manifest
@@ -1,6 +1,8 @@
-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-1.2.0.tar.gz 332565 BLAKE2B 6916341aaa30f593c9a27363d4d73c548d0f7a629adffeab927078bb3ebc64f59a5c568b7bb7999c7505d526ce0ead0c9163908080f24ecd6c7b94ed2db28335 SHA512 a0f596ee96f7501ee47da75ea234c1e29c0abb2c3fda731acd601a55880502ae90d70f6d3da9c9a35e493fd1bcb69971c062e16b1e49a0996137950dac2effac
-EBUILD go-protobuf-1.2.0.ebuild 1357 BLAKE2B 174002dde2600d8e0ecdfb42a196ac50c631cba7e1c52f9869648b7d630a16ac2cea7c7c25221e190a1032f6ae5d10713585f7f01cb3794c4aa65a296904d18f SHA512 be9add53c9a3a8b598927bf2c9d4697be0614e4484bf216e4a8211916b2e2f2b98fa314737469ae0d3757bef8c6f09a296938ca453fa5b6d3d5e3b6f88560b9a
+DIST github.com-golang-net-2ec189313ef0a07735684caebd1ba8b8ebca456f.tar.gz 1101182 BLAKE2B 70d0a91f559c3aafd9e385bedf6ee10d15a8146fd93a4e7c49744f7e129a9316ede1b207641e988ae4d484e6dff6fc4303471a9eb90f7c720cd25b20d293edaf SHA512 ddcbbd3e1cddd4dae68ccd47e31648fe9374db0c3e354adea6b9d50a026ae5c8d4477b747f956e8e793497c3d9e3b88d1ae31c29f859f7aec2824220d0e40ce0
+DIST github.com-golang-sys-b397fe3ad8ed895c98fa54584f61835a88e65ff5.tar.gz 1488020 BLAKE2B 0706578c7a65071352bf8f0ffcde90a6b2bf2bb455f8749c595d60c0340299c22b697527540096eb1b2b706614c7313ebf6ef517fb5bc7db220b4b9c4ac4a7f7 SHA512 9777166cc07a369d7758a0dd36a2759e1c356bcf7ee5d3ef906c31f038f5aaeefdad3987fd75d4f4c82bbdf750563c24c67e89ccc62ccc0964b9c39d7fe1e7d1
+DIST github.com-golang-text-v0.3.2.tar.gz 7168069 BLAKE2B c2412f4554e2a50fe0764c24cd52a0799d526cb78952839fa1c031c43e7c34a58f6c65d2e450a0ddd0447d5f749aa5104dd47dca5a2c4964e3dd6e2eb39313c3 SHA512 48156313c3ae4c01ea3a8b790ae829f50f2a53ea9ad7c14509749405da5cb7c98e6e1a2e9f3619e01393935d452b5b5e568b29719cd1f286570272d59508da58
+DIST github.com-google-go-genproto-c459b9ce5143dd819763d9329ff92a8e35e61bd9.tar.gz 5499674 BLAKE2B c29f4c14738464b2ebc4540d60c58b0cbe1333aa695aa3b6ea618e95786d92a2c4549af6efb04728ef0a8bf7e2ffb3f12f776770e1903167cc6808deff62097d SHA512 ede9c905317a4536881876e9dd14c761144babd3b7a443f07dbf68b3b0c9db157b4e7c9d27d1cb70b729a202d6960e89d1ffa598e325a25d110243de9bf4b3ee
+DIST github.com-grpc-grpc-go-v1.24.0.tar.gz 755074 BLAKE2B d3f65458971195db3329807e147811e3ac049d0b6775498efee7a98885dfbfd616bab490f5684341a9968bda6573b89ac008219d76b224a8c25994e97453b36f SHA512 479dbb72eaaec6fd6e48006b9b2ae636b5fd08b1fe5aeeed18c40d794b1ee4d4fe473b3d2cc77fe5ceaa1ddd00221a64d940d8fb228612c9ed3c83c7d1b4c756
+DIST go-protobuf-1.3.2.tar.gz 312285 BLAKE2B 381ae3c4bad3d3b3d489a3b66752e9e2405d17d9ed2c55aa1ec06ce6c18171b1c7625f6cc6e28490551a6410835f6e774a408de39f6e9ea9b3cddaf46e3b859a SHA512 ef9190f7773b18005760eb755a1dee25eff38c188687033362635e2431cf2c7372a59a3fec91acd6e4f63aa31d08391f7521a8dafef7895268b6a1a78735dd8a
+EBUILD go-protobuf-1.3.2.ebuild 1202 BLAKE2B 7ecd1eaae1fcdb94cc3ff80d8ad7c57532c05daa93f9949470652a12f0f7f9b6b79f409085bfded5e517b7102df7db9aee9d05b38b3a33b17ea28c3b1cc3a498 SHA512 6260725f0b6c876ed4919155e2378ab229ffddc6e184a2f59db255b2b3bff6b080116abc5f9db08a5afaa194e4c9dbecc9ce7f02018fd11356986f361c4cfa0e
 MISC metadata.xml 306 BLAKE2B 0a4acdd528bf97660b3a3932c1073caf0f1593c32a5c03c9375e877650a40dbaf86b9cbfa568a30caa78e2d4cc90d468f24f3f4fdad395758d57f2985059b441 SHA512 f2502a8d1135fa06f2e580cc0dbbbc63dfbe7a2cbe296fd99be657f33cd0681f4e01813b8b4047ddd188089f7b99934dead4618377d002a0365d066137d4ca61
diff --git a/dev-go/go-protobuf/go-protobuf-1.2.0.ebuild b/dev-go/go-protobuf/go-protobuf-1.2.0.ebuild
deleted file mode 100644
index 105944256a75..000000000000
--- a/dev-go/go-protobuf/go-protobuf-1.2.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_SRC="github.com/golang/protobuf"
-EGO_PN=${EGO_SRC}/...
-EGO_VENDOR=(
-	"google.golang.org/genproto af9cb2a35e7f169ec875002c1829c9b315cddc04 github.com/google/go-genproto"
-	"golang.org/x/net aaf60122140d3fcf75376d319f0554393160eb50 github.com/golang/net"
-	"golang.org/x/sync 1d60e4601c6fd243af51cc01ddf169918a5407ca github.com/golang/sync"
-)
-
-inherit golang-build golang-vcs-snapshot
-
-DESCRIPTION="Go support for Google's protocol buffers"
-HOMEPAGE="https://github.com/golang/protobuf"
-SRC_URI="https://${EGO_SRC}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	${EGO_VENDOR_URI}"
-LICENSE="BSD"
-SLOT="0/${PVR}"
-KEYWORDS="~amd64"
-IUSE="test"
-DEPEND="test? ( dev-libs/protobuf )"
-RDEPEND=""
-RESTRICT="!test? ( test )"
-
-src_prepare() {
-	default
-	# golden_test.go:113: golden file differs: deprecated/deprecated.pb.go
-	sed -e 's:^\(func \)\(TestGolden\):\1_\2:' \
-		-i src/${EGO_SRC}/protoc-gen-go/golden_test.go || die
-}
-
-src_compile() {
-	env GOPATH="${S}" \
-		go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}" || die
-}
-
-src_test() {
-	GOPATH="${S}" \
-		go test -v -work -x "${EGO_PN}" || die
-}
-
-src_install() {
-	rm -rf src/${EGO_SRC}/.git* || die
-	golang_install_pkgs
-	rm -rf "${D%/}$(get_golibdir_gopath)/src/${EGO_SRC}/vendor" || die
-
-	dobin bin/*
-}
diff --git a/dev-go/go-protobuf/go-protobuf-1.3.2.ebuild b/dev-go/go-protobuf/go-protobuf-1.3.2.ebuild
new file mode 100644
index 000000000000..09c2d10626fc
--- /dev/null
+++ b/dev-go/go-protobuf/go-protobuf-1.3.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit go-module
+
+EGO_VENDOR=(
+	"google.golang.org/grpc v1.24.0 github.com/grpc/grpc-go"
+	"golang.org/x/net 2ec189313ef0a07735684caebd1ba8b8ebca456f github.com/golang/net"
+	"google.golang.org/genproto c459b9ce5143dd819763d9329ff92a8e35e61bd9 github.com/google/go-genproto"
+	"golang.org/x/sys b397fe3ad8ed895c98fa54584f61835a88e65ff5 github.com/golang/sys"
+	"golang.org/x/text v0.3.2 github.com/golang/text"
+)
+
+DESCRIPTION="Go support for Google's protocol buffers"
+HOMEPAGE="https://github.com/golang/protobuf"
+SRC_URI="https://github.com/golang/protobuf/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	test? ( $(go-module_vendor_uris) )"
+# LICENSE omits licenses for EGO_VENDOR packages, since those are only
+# test dependencies which are not used at runtime.
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+DEPEND="test? ( dev-libs/protobuf )"
+RDEPEND=""
+RESTRICT="!test? ( test )"
+S=${WORKDIR}/${P#go-}
+
+src_unpack() {
+	if use test; then
+		go-module_src_unpack
+	else
+		default
+	fi
+}
+
+src_compile() {
+	export GOBIN=${S}/bin
+	default
+}
+
+src_install() {
+	dobin "${GOBIN}"/*
+	dodoc README.md
+}