gentoo resync : 25.08.2018

4 files changed, 77 insertions, 67 deletions

diff --git a/dev-go/go-crypto/Manifest b/dev-go/go-crypto/Manifest
index 804a1919ac41..fd3a5057a875 100644
--- a/dev-go/go-crypto/Manifest
+++ b/dev-go/go-crypto/Manifest
@@ -1,6 +1,6 @@
-DIST go-crypto-0_pre20150808.tar.gz 876947 BLAKE2B c6da903ec7b5308114f2e2a364d6a2936dc24be4f8f274116c811740f712f13b2926a6f84b6160c450d921dbbeeb7ce48371e593cfa4d8abf80308f3cf07ac26 SHA512 86826102ff7242259d79a31e543a03192d6b68a06635b46ebac349111bb8451605df1ad9b249c08d75895c38fb4ebbbfc716d40c8c981485395164e87db5a519
 DIST go-crypto-0_pre20160126.tar.gz 902001 BLAKE2B 54d38a9aea69e01485417cbf8a900135730dca4bc79c9d5d1187eadb11a8dfca9ef6e72056c4ed4ad4a34b172379d94e6beb82ece9031411b8aa12af85200fb2 SHA512 168129ab9581b7348fb3285e045d99a0a837ac7bd65bf9f5e7a220fffbb9e2abf76da5f521c66eea7179eba0ad8da68d6f41cd9624ea40a9da25a18838427846
-EBUILD go-crypto-0_pre20150808.ebuild 1371 BLAKE2B d19720ef683fdc1094e418a9f28bee026b67a6714f38c9f8744440be745136816cdd9883951040965a527bcb2fb29ddf81217d72f07b3652cd7010b87a92e7fd SHA512 e95dd2cd871e32c5af4aee88fb15a5a42bfa0bbfa682f425ae147dabec99a450f1bc9bc1c9fb21de2ac654de218187f5c7acec81482dfa231e7eec26f964c3d9
+DIST go-crypto-0_pre20180816.tar.gz 1637516 BLAKE2B 800787412e1e52f70bc3df5b1b638e86ed2c66de86522786d7e3d8959f18d02426270d1f577ebaa8077d7d98c84ca7a358bed951c862a44b9293de8edebb17b4 SHA512 d2b730ba75b49b96f35969802b7321cd2efc89dcd2e8c0b8eaca545cb18287b34ad1c9ecbd07c6b4ace8708575d4586fbe1139d032a7038cc7221ad010d08074
 EBUILD go-crypto-0_pre20160126.ebuild 1691 BLAKE2B 0d894ff62289f1a8aa3b75c017e5246e4437c0b05fc2ae71a85f4369c82ada781a8540042932b4b769233792ead9901ad22b1b50439a5902f061774682141758 SHA512 a6d995f85bb6ba42c9539a96b19d84b18de9978d2ec3706678a5c1b337e7482203563935899ed171ff10f255feef34b7158bd68f7f58b7555da7c23ba61c858d
-EBUILD go-crypto-9999.ebuild 1063 BLAKE2B 833b19a7c104703922be8f66665158d1e084537658d7e3cab5689fb8dae33a94111b524a2907f1e63547ad95f547002392ed252cd6f6b5d85f195cb4e7e57516 SHA512 54ef740fc46c68e41949e2c1fc2102b269f9cf1232f930e78f1868d859df305d75eed827c15ceddba81f2b607d054196503b0a4d8c9b71b99ab9ecabf1aa9c30
+EBUILD go-crypto-0_pre20180816.ebuild 1305 BLAKE2B dcd94a85e937de412885f34115756083b44f41728e1d4f0c6f614afebe94c1b7af148bb571c97bc14629961f581dd281bb3d9975699710f59c29ac60febd884d SHA512 00578da069a3bc4ada9fef79b54d3de7464a243d1483b4dc785fd728edfceba409ad4c8da2ade77da277d97957da4a8f565b73532de232b8014a61733ceabed9
+EBUILD go-crypto-9999.ebuild 1437 BLAKE2B 35b40ea000b7873c199e0c09288ead176d530fe9d97bba3fd618aeb0f965cb302ad2ce78e578fa0e7061e679df64d424f7f5814cc896bc50b813d37d2896913f SHA512 faa5d234a6ad115fc218bcce357408c6027b7ece620b50ccfa6706fc94ded8384126fb0ff10a2d0e2cce28813e2414feb2557b47b2a217c702cb29b70771b602
 MISC metadata.xml 304 BLAKE2B d090eb82d7631d6984390d12c602fad54f5246bc6cb940403fd5be4b4ff85d6ac99469460c89a3e1c6751aab519229ad1ed615bd9782a24a864949a59dd5c355 SHA512 1e30936f145a4bac0db6816b1ab4ee6b5c38864774023e99d9724caf50e9039798d8675d41aa939c339d99ef59ccc2485bf3b5e3077f1e60d8b850bb607807b9
diff --git a/dev-go/go-crypto/go-crypto-0_pre20150808.ebuild b/dev-go/go-crypto/go-crypto-0_pre20150808.ebuild
deleted file mode 100644
index 32fa7915de5c..000000000000
--- a/dev-go/go-crypto/go-crypto-0_pre20150808.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-EGO_PN=golang.org/x/crypto/...
-EGO_SRC=golang.org/x/crypto
-
-if [[ ${PV} = *9999* ]]; then
-	inherit golang-vcs
-else
-	KEYWORDS="~amd64"
-	EGIT_COMMIT="83f1503f771a82af8a31f358eb825e9efb5dae6c"
-	SRC_URI="https://github.com/golang/crypto/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	inherit golang-vcs-snapshot
-fi
-inherit golang-build
-
-DESCRIPTION="Go supplementary cryptography libraries"
-HOMEPAGE="https://godoc.org/golang.org/x/crypto"
-LICENSE="BSD"
-SLOT="0/${PVR}"
-IUSE=""
-DEPEND=""
-RDEPEND=""
-
-src_prepare() {
-	# disable broken tests
-	sed -e 's:TestAgentForward(:_\0:' \
-		-i src/${EGO_SRC}/ssh/test/agent_unix_test.go || die
-	sed -e 's:TestRunCommandSuccess(:_\0:' \
-		-e 's:TestRunCommandStdin(:_\0:' \
-		-e 's:TestRunCommandStdinError(:_\0:' \
-		-e 's:TestRunCommandWeClosed(:_\0:' \
-		-e 's:TestFuncLargeRead(:_\0:' \
-		-e 's:TestKeyChange(:_\0:' \
-		-e 's:TestValidTerminalMode(:_\0:' \
-		-i src/${EGO_SRC}/ssh/test/session_test.go || die
-}
-
-src_compile() {
-	# Create a writable GOROOT in order to avoid sandbox violations.
-	cp -sR "$(go env GOROOT)" "${T}/goroot" || die
-	rm -rf "${T}/goroot/src/${EGO_SRC}" || die
-	rm -rf "${T}/goroot/pkg/$(go env GOOS)_$(go env GOARCH)/${EGO_SRC}" || die
-	export GOROOT="${T}/goroot"
-	golang-build_src_compile
-}
diff --git a/dev-go/go-crypto/go-crypto-0_pre20180816.ebuild b/dev-go/go-crypto/go-crypto-0_pre20180816.ebuild
new file mode 100644
index 000000000000..180bb7b462a2
--- /dev/null
+++ b/dev-go/go-crypto/go-crypto-0_pre20180816.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+EGO_PN=golang.org/x/crypto/...
+EGO_SRC=golang.org/x/crypto
+
+if [[ ${PV} = *9999* ]]; then
+	inherit golang-vcs
+else
+	KEYWORDS="~amd64 ~arm ~x86"
+	EGIT_COMMIT="aabede6cba87e37f413b3e60ebfc214f8eeca1b0"
+	SRC_URI="https://github.com/golang/crypto/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	inherit golang-vcs-snapshot
+fi
+inherit golang-build
+
+DESCRIPTION="Go supplementary cryptography libraries"
+HOMEPAGE="https://godoc.org/golang.org/x/crypto"
+LICENSE="BSD"
+SLOT="0/${PVR}"
+IUSE=""
+DEPEND=">=dev-go/go-sys-0_pre20180816:="
+RDEPEND=""
+
+src_prepare() {
+	default
+	sed -e 's:TestLockOpenSSHAgent(:_\0:' \
+		-i src/${EGO_SRC}/ssh/agent/client_test.go || die
+}
+
+src_compile() {
+	# Exclude $(get_golibdir_gopath) from GOPATH, for bug 577908 which may
+	# or may not manifest, depending on what libraries are installed.
+	mkdir -p "${T}/golibdir/src/golang.org/x" || die
+	ln -s "$(get_golibdir_gopath)/src/golang.org/x/sys" "${T}/golibdir/src/golang.org/x/sys" || die
+	GOPATH="${S}:${T}/golibdir" \
+		go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}" || die
+}
+
+src_test() {
+	# Exclude $(get_golibdir_gopath) from GOPATH
+	GOPATH="${S}:${T}/golibdir" \
+		go test -v -work -x "${EGO_PN}" || die
+}
diff --git a/dev-go/go-crypto/go-crypto-9999.ebuild b/dev-go/go-crypto/go-crypto-9999.ebuild
index 6cee16b68553..6a2b21ad3cb1 100644
--- a/dev-go/go-crypto/go-crypto-9999.ebuild
+++ b/dev-go/go-crypto/go-crypto-9999.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-EGO_PN=golang.org/x/crypto/...
+EAPI=6
 EGO_SRC=golang.org/x/crypto
+EGO_PN=${EGO_SRC}/...
 
 if [[ ${PV} = *9999* ]]; then
 	inherit golang-vcs
 else
-	KEYWORDS="~amd64"
-	EGIT_COMMIT="1e856cbfdf9bc25eefca75f83f25d55e35ae72e0"
+	KEYWORDS="~amd64 ~arm ~x86"
+	EGIT_COMMIT="aabede6cba87e37f413b3e60ebfc214f8eeca1b0"
 	SRC_URI="https://github.com/golang/crypto/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	inherit golang-vcs-snapshot
 fi
@@ -20,19 +20,31 @@ HOMEPAGE="https://godoc.org/golang.org/x/crypto"
 LICENSE="BSD"
 SLOT="0/${PVR}"
 IUSE=""
-DEPEND=""
+DEPEND=">=dev-go/go-sys-0_pre20180816:="
 RDEPEND=""
 
 src_prepare() {
-	# disable broken tests
-	sed -e 's:TestAgentForward(:_\0:' \
-		-i src/${EGO_SRC}/ssh/test/agent_unix_test.go || die
-	sed -e 's:TestRunCommandSuccess(:_\0:' \
-		-e 's:TestRunCommandStdin(:_\0:' \
-		-e 's:TestRunCommandStdinError(:_\0:' \
-		-e 's:TestRunCommandWeClosed(:_\0:' \
-		-e 's:TestFuncLargeRead(:_\0:' \
-		-e 's:TestKeyChange(:_\0:' \
-		-e 's:TestValidTerminalMode(:_\0:' \
-		-i src/${EGO_SRC}/ssh/test/session_test.go || die
+	default
+	sed -e 's:TestLockOpenSSHAgent(:_\0:' \
+		-i src/${EGO_SRC}/ssh/agent/client_test.go || die
+}
+
+src_compile() {
+	# Exclude $(get_golibdir_gopath) from GOPATH, for bug 577908 which may
+	# or may not manifest, depending on what libraries are installed.
+	mkdir -p "${T}/golibdir/src/golang.org/x" || die
+	ln -s "$(get_golibdir_gopath)/src/golang.org/x/sys" "${T}/golibdir/src/golang.org/x/sys" || die
+	GOPATH="${S}:${T}/golibdir" GOBIN="$(go env GOROOT)/bin" \
+		go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}" || die
+}
+
+src_test() {
+	# Exclude $(get_golibdir_gopath) from GOPATH
+	GOPATH="${S}:${T}/golibdir" GOBIN="$(go env GOROOT)/bin" \
+		go test -v -work -x "${EGO_PN}" || die
+}
+
+src_install() {
+	rm -rf "${S}/src/${EGO_SRC}/.git"* || die
+	golang_install_pkgs
 }