Gentoo Archives: gentoo-commits

From: Zac Medico <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-go/go-net/
Date: Sun, 31 Jul 2016 05:39:05
Message-Id: 1469943535.83e3b34445a2420eb0c0cd70b3a368e1129fd8e0.zmedico@gentoo
1 commit: 83e3b34445a2420eb0c0cd70b3a368e1129fd8e0
2 Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jul 31 05:36:07 2016 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Sun Jul 31 05:38:55 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83e3b344
7
8 dev-go/go-net: update 9999 ebuild for bug 589916
9
10 Package-Manager: portage-2.3.0
11
12 dev-go/go-net/go-net-9999.ebuild | 16 +++++++++++++---
13 1 file changed, 13 insertions(+), 3 deletions(-)
14
15 diff --git a/dev-go/go-net/go-net-9999.ebuild b/dev-go/go-net/go-net-9999.ebuild
16 index 1931db4..f978ad4 100644
17 --- a/dev-go/go-net/go-net-9999.ebuild
18 +++ b/dev-go/go-net/go-net-9999.ebuild
19 @@ -1,4 +1,4 @@
20 -# Copyright 1999-2015 Gentoo Foundation
21 +# Copyright 1999-2016 Gentoo Foundation
22 # Distributed under the terms of the GNU General Public License v2
23 # $Id$
24
25 @@ -10,7 +10,7 @@ if [[ ${PV} = *9999* ]]; then
26 inherit golang-vcs
27 else
28 KEYWORDS="~amd64"
29 - EGIT_COMMIT="dfe268fd2bb5c793f4c083803609fce9806c6f80"
30 + EGIT_COMMIT="b6d7b1396ec874c3b00f6c84cd4301a17c56c8ed"
31 SRC_URI="https://github.com/golang/net/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
32 inherit golang-vcs-snapshot
33 fi
34 @@ -21,7 +21,8 @@ HOMEPAGE="https://godoc.org/golang.org/x/net"
35 LICENSE="BSD"
36 SLOT="0/${PVR}"
37 IUSE=""
38 -DEPEND="dev-go/go-text:="
39 +DEPEND="dev-go/go-crypto:=
40 + dev-go/go-text:="
41 RDEPEND=""
42
43 src_prepare() {
44 @@ -32,3 +33,12 @@ src_prepare() {
45 -e 's:TestNonPrivilegedPing(:_\0:' \
46 -i src/${EGO_SRC}/icmp/ping_test.go || die
47 }
48 +
49 +src_compile() {
50 + # Create a writable GOROOT in order to avoid sandbox violations.
51 + cp -sR "$(go env GOROOT)" "${T}/goroot" || die
52 + rm -rf "${T}/goroot/src/${EGO_SRC}" || die
53 + rm -rf "${T}/goroot/pkg/$(go env GOOS)_$(go env GOARCH)/${EGO_SRC}" || die
54 + export GOROOT="${T}/goroot"
55 + golang-build_src_compile
56 +}