gentoo resync : 22.10.2018

7 files changed, 59 insertions, 67 deletions

diff --git a/dev-go/Manifest.gz b/dev-go/Manifest.gz
index 194c9d645dd5..251018b86ead 100644
--- a/dev-go/Manifest.gz
+++ b/dev-go/Manifest.gz
diff --git a/dev-go/go-bindata/Manifest b/dev-go/go-bindata/Manifest
index 11f267042299..1ff74c72a4e5 100644
--- a/dev-go/go-bindata/Manifest
+++ b/dev-go/go-bindata/Manifest
@@ -1,3 +1,3 @@
 DIST go-bindata-0_pre20151023.tar.gz 17860 BLAKE2B 281a4ccbac82af31017728dd309cc32852a959cbe4e468bb2cf7e05266de748a22d062d8863350caaa713a28efb3c0dc7543abcf1fd1812543364ed6ff166c65 SHA512 ed1d2fd1c5a833b6efdc731eb43f72fc072a701c447a926ad6c1f9be3c0f1ed92c689639d02a288230a49d53795f41092deab132389871a5b9f79abdc525fc43
-EBUILD go-bindata-0_pre20151023.ebuild 601 BLAKE2B 90c4070d09b39229e0a398c5d3e6d3524f35d95ba7565c3d4055914fccbb5fd651ce8b23d1d48d4de3c11950291a02a2ebe9972d867c53979205a92ee76d3c6d SHA512 e66e69d2366e910c7be09a1622e0f7cc148b3c47e377721dcb4368ee95086a12384fe0e7d13142d0482b040f743241cafcaac54123a553644bb3def10386d40c
+EBUILD go-bindata-0_pre20151023.ebuild 617 BLAKE2B 18f18747c43236052722c29fc10dbd6557d1db5c35c6a081de0f5c43457bd8ce867cc61a7359d6b610e41922c025be71fbfa4bd5c9e9b0bb060ac3a063857f29 SHA512 e30050887d94b8ab35c336aa509d46102f673236b0ae7ccc53af745cc16d8bd982f5f30d8ebd330550f9c93088af033a7431e6c350e0bdcd06892b7f96aed23e
 MISC metadata.xml 251 BLAKE2B 78b1289c2746a6805eeb73edc062b5309b69d11585038e4c26d863ad9c3b202b9ce1589a97e1e41f4b1c2472b45456dc0a555fd22387ffeea319d1fb3806c229 SHA512 d241954967f8571d47611771a1655e0719a0cdf7c339df0a8b7d184b01fb773a8e311465f18afcfe9dffcdbff427e1165bafb0aaca0d2837b2d1b55729b1b6cc
diff --git a/dev-go/go-bindata/go-bindata-0_pre20151023.ebuild b/dev-go/go-bindata/go-bindata-0_pre20151023.ebuild
index dac12764e414..9b145c321780 100644
--- a/dev-go/go-bindata/go-bindata-0_pre20151023.ebuild
+++ b/dev-go/go-bindata/go-bindata-0_pre20151023.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -17,6 +17,7 @@ SLOT="0/${PVR}"
 IUSE=""
 
 src_install() {
-	golang-build_src_install
+	GOBIN=${S}/bin \
+		golang-build_src_install
 	dobin bin/*
 }
diff --git a/dev-go/go-protobuf/Manifest b/dev-go/go-protobuf/Manifest
index cf571063feac..8ded7a48a880 100644
--- a/dev-go/go-protobuf/Manifest
+++ b/dev-go/go-protobuf/Manifest
@@ -1,6 +1,8 @@
-DIST go-protobuf-0_pre20150809.tar.gz 151982 BLAKE2B dc7722108d09f94395c204a3adb8cce46978daa73319012964863536e8e4d3eaaff1878097dab0a96cc94ebc66c1b2f8cc0f49e931c104392bd7d083f2f1af8f SHA512 04802b8d74ccaa17f9fc030badd0e74b6e47233ca5f1faab7c49f25bef2f06efd97aa4bf3f4783a7815958354744ddb9fee96d183aebbb03864069b0cc569564
+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
-EBUILD go-protobuf-0_pre20150809.ebuild 686 BLAKE2B 435ee51c180111b8818babe66a412ad31aae3449c1e1a521a8648e2225668860a40c18947c40dfdf0e86b64c563729549e9dd8b688e00956b1fa388d3c814f08 SHA512 94c4ed39b29d2732506822a976af59bf48e8df022860b5e1be49da9f926e26eef971c27db3ddf3f6a3a42251218ec0b65c8cc0e5d71220e877fb59449f45dae6
+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-9999.ebuild 650 BLAKE2B c5c9beaddf5254cdc6aad3594c0ae8cd8115dee87c68877b6e39e8ad1485db4746824fd5d01c604736e644767d6e8e7be14f24d98a38d107fe788f93c1c1445f SHA512 c7da0ff7370f425fa5c568b1c97eaa0a14dffd4c6fb3def3683b8085ac181505243f464807b60520c13631b494e66576b7bce39411c5f559fdbefd8eac380b0a
+EBUILD go-protobuf-1.2.0.ebuild 1299 BLAKE2B 709a597af78b1877469c46cb3b01a6bbd7c5963fa5b418ca1a954d1a704e385a136e6b64ec39a70971a5f7ec62f4775424430cac0200ddb298f1716ea033c46e SHA512 2af83b2a4e2599c1908b034f8aca6e39ec173700ed8a244432f1747af718dbac59552b823dfe43c7fc2af1e8245d19637bd8f01ea763c6d13be2a6adf63fe23e
 MISC metadata.xml 306 BLAKE2B 0a4acdd528bf97660b3a3932c1073caf0f1593c32a5c03c9375e877650a40dbaf86b9cbfa568a30caa78e2d4cc90d468f24f3f4fdad395758d57f2985059b441 SHA512 f2502a8d1135fa06f2e580cc0dbbbc63dfbe7a2cbe296fd99be657f33cd0681f4e01813b8b4047ddd188089f7b99934dead4618377d002a0365d066137d4ca61
diff --git a/dev-go/go-protobuf/go-protobuf-0_pre20150809.ebuild b/dev-go/go-protobuf/go-protobuf-0_pre20150809.ebuild
deleted file mode 100644
index f5a8b85107e9..000000000000
--- a/dev-go/go-protobuf/go-protobuf-0_pre20150809.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="68c687dc49948540b356a6b47931c9be4fcd0245"
-	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/${PV}"
-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
new file mode 100644
index 000000000000..06fee922c86c
--- /dev/null
+++ b/dev-go/go-protobuf/go-protobuf-1.2.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 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=""
+DEPEND=""
+RDEPEND=""
+
+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-9999.ebuild b/dev-go/go-protobuf/go-protobuf-9999.ebuild
deleted file mode 100644
index b94987b944e1..000000000000
--- a/dev-go/go-protobuf/go-protobuf-9999.ebuild
+++ /dev/null
@@ -1,30 +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="68c687dc49948540b356a6b47931c9be4fcd0245"
-	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/${PV}"
-IUSE=""
-DEPEND=""
-RDEPEND=""
-
-src_install() {
-	golang-build_src_install
-	dobin bin/*
-}