Gentoo Archives: gentoo-commits

From: Mike Gilbert <floppym@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/go/
Date: Thu, 23 Jan 2020 16:00:52
Message-Id: 1579795215.7da3980f6f899c200216d1f91a9a3ab92b0f7800.floppym@gentoo
1 commit: 7da3980f6f899c200216d1f91a9a3ab92b0f7800
2 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jan 23 16:00:15 2020 +0000
4 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
5 CommitDate: Thu Jan 23 16:00:15 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7da3980f
7
8 dev-lang/go: remove extraneous file
9
10 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
11
12 dev-lang/go/x | 28 ----------------------------
13 1 file changed, 28 deletions(-)
14
15 diff --git a/dev-lang/go/x b/dev-lang/go/x
16 deleted file mode 100644
17 index 14d7827f06b..00000000000
18 --- a/dev-lang/go/x
19 +++ /dev/null
20 @@ -1,28 +0,0 @@
21 -diff --git a/dev-lang/go/go-9999.ebuild b/dev-lang/go/go-9999.ebuild
22 -index 635b905c4d9..eb74459d848 100644
23 ---- a/dev-lang/go/go-9999.ebuild
24 -+++ b/dev-lang/go/go-9999.ebuild
25 -@@ -40,7 +40,9 @@ SLOT="0/${PV}"
26 - IUSE="gccgo"
27 -
28 - BDEPEND="gccgo? ( >=sys-devel/gcc-5[go(-)] )
29 -- !gccgo? ( >=dev-lang/go-bootstrap-1.13.6 )"
30 -+ !gccgo? ( ||(
31 -+ dev-lang/go
32 -+ dev-lang/go-bootstrap-1.13.6 ) )"
33 - RDEPEND="!<dev-go/go-tools-0_pre20150902"
34 -
35 - # These test data objects have writable/executable stacks.
36 -@@ -145,8 +147,11 @@ src_compile()
37 - ln -s "${go_binary}" "${GOROOT_BOOTSTRAP}/bin/go" || die
38 - elif has_version -b dev-lang/go-bootstrap; then
39 - export GOROOT_BOOTSTRAP="${BROOT}/usr/lib/go-bootstrap"
40 -+ elif has_version -b dev-lang/go; then
41 -+ export GOROOT_BOOTSTRAP="${BROOT}/usr/lib/go"
42 - else
43 -- die "Should not be here, please report a bug"
44 -+ eerror "Go cannot be built without go or go-bootstrap installed"
45 -+ die "Should not be here, please report a bug.
46 - fi
47 -
48 - export GOROOT_FINAL="${EPREFIX}"/usr/lib/go