1 |
commit: 3a53cec38986055834621629c810d5734cb5d4df |
2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Aug 19 23:57:16 2018 +0000 |
4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Aug 20 00:20:45 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a53cec3 |
7 |
|
8 |
dev-go/go-crypto: update 9999 ebuild |
9 |
|
10 |
Package-Manager: Portage-2.3.47, Repoman-2.3.10 |
11 |
|
12 |
dev-go/go-crypto/go-crypto-9999.ebuild | 46 +++++++++++++++++++++------------- |
13 |
1 file changed, 29 insertions(+), 17 deletions(-) |
14 |
|
15 |
diff --git a/dev-go/go-crypto/go-crypto-9999.ebuild b/dev-go/go-crypto/go-crypto-9999.ebuild |
16 |
index 6cee16b6855..6a2b21ad3cb 100644 |
17 |
--- a/dev-go/go-crypto/go-crypto-9999.ebuild |
18 |
+++ b/dev-go/go-crypto/go-crypto-9999.ebuild |
19 |
@@ -1,15 +1,15 @@ |
20 |
-# Copyright 1999-2016 Gentoo Foundation |
21 |
+# Copyright 1999-2018 Gentoo Foundation |
22 |
# Distributed under the terms of the GNU General Public License v2 |
23 |
|
24 |
-EAPI=5 |
25 |
-EGO_PN=golang.org/x/crypto/... |
26 |
+EAPI=6 |
27 |
EGO_SRC=golang.org/x/crypto |
28 |
+EGO_PN=${EGO_SRC}/... |
29 |
|
30 |
if [[ ${PV} = *9999* ]]; then |
31 |
inherit golang-vcs |
32 |
else |
33 |
- KEYWORDS="~amd64" |
34 |
- EGIT_COMMIT="1e856cbfdf9bc25eefca75f83f25d55e35ae72e0" |
35 |
+ KEYWORDS="~amd64 ~arm ~x86" |
36 |
+ EGIT_COMMIT="aabede6cba87e37f413b3e60ebfc214f8eeca1b0" |
37 |
SRC_URI="https://github.com/golang/crypto/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" |
38 |
inherit golang-vcs-snapshot |
39 |
fi |
40 |
@@ -20,19 +20,31 @@ HOMEPAGE="https://godoc.org/golang.org/x/crypto" |
41 |
LICENSE="BSD" |
42 |
SLOT="0/${PVR}" |
43 |
IUSE="" |
44 |
-DEPEND="" |
45 |
+DEPEND=">=dev-go/go-sys-0_pre20180816:=" |
46 |
RDEPEND="" |
47 |
|
48 |
src_prepare() { |
49 |
- # disable broken tests |
50 |
- sed -e 's:TestAgentForward(:_\0:' \ |
51 |
- -i src/${EGO_SRC}/ssh/test/agent_unix_test.go || die |
52 |
- sed -e 's:TestRunCommandSuccess(:_\0:' \ |
53 |
- -e 's:TestRunCommandStdin(:_\0:' \ |
54 |
- -e 's:TestRunCommandStdinError(:_\0:' \ |
55 |
- -e 's:TestRunCommandWeClosed(:_\0:' \ |
56 |
- -e 's:TestFuncLargeRead(:_\0:' \ |
57 |
- -e 's:TestKeyChange(:_\0:' \ |
58 |
- -e 's:TestValidTerminalMode(:_\0:' \ |
59 |
- -i src/${EGO_SRC}/ssh/test/session_test.go || die |
60 |
+ default |
61 |
+ sed -e 's:TestLockOpenSSHAgent(:_\0:' \ |
62 |
+ -i src/${EGO_SRC}/ssh/agent/client_test.go || die |
63 |
+} |
64 |
+ |
65 |
+src_compile() { |
66 |
+ # Exclude $(get_golibdir_gopath) from GOPATH, for bug 577908 which may |
67 |
+ # or may not manifest, depending on what libraries are installed. |
68 |
+ mkdir -p "${T}/golibdir/src/golang.org/x" || die |
69 |
+ ln -s "$(get_golibdir_gopath)/src/golang.org/x/sys" "${T}/golibdir/src/golang.org/x/sys" || die |
70 |
+ GOPATH="${S}:${T}/golibdir" GOBIN="$(go env GOROOT)/bin" \ |
71 |
+ go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}" || die |
72 |
+} |
73 |
+ |
74 |
+src_test() { |
75 |
+ # Exclude $(get_golibdir_gopath) from GOPATH |
76 |
+ GOPATH="${S}:${T}/golibdir" GOBIN="$(go env GOROOT)/bin" \ |
77 |
+ go test -v -work -x "${EGO_PN}" || die |
78 |
+} |
79 |
+ |
80 |
+src_install() { |
81 |
+ rm -rf "${S}/src/${EGO_SRC}/.git"* || die |
82 |
+ golang_install_pkgs |
83 |
} |