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-tools/
Date: Fri, 29 Nov 2019 17:15:11
Message-Id: 1575047697.0dbccec3e939bc88c482dbfa6b197b47fe4d1f20.zmedico@gentoo
1 commit: 0dbccec3e939bc88c482dbfa6b197b47fe4d1f20
2 Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
3 AuthorDate: Fri Nov 29 17:00:50 2019 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Fri Nov 29 17:14:57 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0dbccec3
7
8 dev-go/go-tools: Remove old version 0_pre20180817
9
10 Closes: https://bugs.gentoo.org/699584
11 Package-Manager: Portage-2.3.80, Repoman-2.3.19
12 Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
13
14 dev-go/go-tools/Manifest | 1 -
15 dev-go/go-tools/go-tools-0_pre20180817.ebuild | 75 ---------------------------
16 2 files changed, 76 deletions(-)
17
18 diff --git a/dev-go/go-tools/Manifest b/dev-go/go-tools/Manifest
19 index e4c226226f0..c19d83fa6fc 100644
20 --- a/dev-go/go-tools/Manifest
21 +++ b/dev-go/go-tools/Manifest
22 @@ -3,5 +3,4 @@ DIST github.com-golang-net-aaf60122140d3fcf75376d319f0554393160eb50.tar.gz 96520
23 DIST github.com-golang-sync-112230192c580c3556b8cee6403af37a4fc5f28c.tar.gz 16835 BLAKE2B 51efe53ea7ab1f11f8ff078fbfa91526b97a1d918101bdbc755aa500424dda860d3a11195c1e44d033eaf7e0d09e7f327e404ad9af84f4b9747d8805b53dcf10 SHA512 bd90bb14e688fa7613d83dc8718bbb688a2f05cc8eb8c3dfbbf71daa7dc08e35044803c4bf8e5d5aab625a612e986e6f76c822c437f52132581ac37e0e2e92f9
24 DIST github.com-golang-xerrors-a985d3407aa71f30cf86696ee0a2f409709f22e1.tar.gz 12271 BLAKE2B cdcaf0bbf67399c9176786118a622fc0912036b9b0611922dd3d32ace2cac65ac288136ef228ff526e626d36c16e6f8442ffbb5df0c84fd713a669c326fa350c SHA512 719b3a3e432a928f641e15b8553d3e2c2015b1c68c633e9f13f1d57cee634544bb857518fcd75124e41a448b4c219b80dd0c1823329eb4edfc715994d40331d5
25 DIST go-favicon-20181103162401.ico 5686 BLAKE2B 331d7684a569fc40fcd147eb812661f42b0ee3ca4c017515c33523b588b012763ce29f24bfce5bc7274e7560ff7dd8e872af43d2b51dc0722ac416b43c11f841 SHA512 0a6fe8bddbce99ed7fd035a3dc998dc9e893060854eee9d1c70bcc8de77b71fd3bd203b2de0f1c9a146f7d47555ab856389e16a372ee41f4ab57be611877fc16
26 -DIST go-tools-0_pre20180817.tar.gz 2321169 BLAKE2B d1ba93b36b62bfbf53770cab6c96019d1a96db0ff6521f591577d866f74a1f65ec24e41a06f81d0040be7122f2e0da734e68d0a72591040265b5f95b324645fe SHA512 1af6c4a58f4d1985dc55e4342d9a4f26ada646ffe87fafdb5bdf876ad972a9f826da257ff9a10956c24dbc90ed9d6935bb78b4f7d30f9e50493c60f7ce92edb1
27 DIST go-tools-0_pre20190911.tar.gz 2264380 BLAKE2B 049d961191eec5b3bd75d9ab1dea576a9b3700cdcd06fce39ae34844af7dc045d61cbe604c16c1fd355f38c0a3e5523c0162ca37c49bd7a7d28642fa2a5b4e5e SHA512 d72f71a8d3f1b14b165d60279dd4dc110ee59ae0e716cdfa9d23610d65972c03fea7191848e5a1b38dc6a2ce96050fdd919f3251e39c0dced11be9d47087a50c
28
29 diff --git a/dev-go/go-tools/go-tools-0_pre20180817.ebuild b/dev-go/go-tools/go-tools-0_pre20180817.ebuild
30 deleted file mode 100644
31 index 787b6a95386..00000000000
32 --- a/dev-go/go-tools/go-tools-0_pre20180817.ebuild
33 +++ /dev/null
34 @@ -1,75 +0,0 @@
35 -# Copyright 1999-2019 Gentoo Authors
36 -# Distributed under the terms of the GNU General Public License v2
37 -
38 -EAPI=6
39 -EGO_PN="golang.org/x/tools"
40 -
41 -# vendor the net package due to a circular dependency
42 -EGO_VENDOR=( "golang.org/x/net aaf60122140d3fcf75376d319f0554393160eb50 github.com/golang/net" )
43 -
44 -EGIT_COMMIT="7d1dc997617fb662918b6ea95efc19faa87e1cf8"
45 -ARCHIVE_URI="https://github.com/golang/tools/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
46 -KEYWORDS="~amd64 ~arm ~x86"
47 -inherit golang-build golang-vcs-snapshot
48 -
49 -DESCRIPTION="Tools that support the Go programming language (godoc, etc.)"
50 -HOMEPAGE="https://godoc.org/golang.org/x/tools"
51 -GO_FAVICON="go-favicon-20181103162401.ico"
52 -SRC_URI="${ARCHIVE_URI}
53 - ${EGO_VENDOR_URI}
54 - mirror://gentoo/${GO_FAVICON}
55 - https://dev.gentoo.org/~zmedico/distfiles/${GO_FAVICON}"
56 -LICENSE="BSD Apache-2.0 MIT"
57 -SLOT="0/${PVR}"
58 -
59 -src_prepare() {
60 - default
61 - # Add favicon to the godoc web interface (bug 551030)
62 - cp "${DISTDIR}"/${GO_FAVICON} "src/${EGO_PN}/godoc/static/favicon.ico" ||
63 - die
64 - sed -e 's:"example.html",:\0\n\t"favicon.ico",:' \
65 - -i src/${EGO_PN}/godoc/static/gen.go || die
66 - sed -e 's:<link type="text/css":<link rel="icon" type="image/png" href="/lib/godoc/favicon.ico">\n\0:' \
67 - -i src/${EGO_PN}/godoc/static/godoc.html || die
68 - sed -e 's:TestVeryLongFile(:_\0:' \
69 - -i src/${EGO_PN}/go/internal/gcimporter/bexport_test.go || die
70 - sed -e 's:TestLoadSyntaxOK(:_\0:' \
71 - -i src/${EGO_PN}/go/packages/packages_test.go || die
72 - sed -e 's:TestCgoOption(:_\0:' \
73 - -i src/${EGO_PN}/go/loader/stdlib_test.go || die
74 - sed -e 's:TestWebIndex(:_\0:' \
75 - -e 's:TestTypeAnalysis(:_\0:' \
76 - -i src/${EGO_PN}/cmd/godoc/godoc_test.go || die
77 - sed -e 's:TestImportStdLib(:_\0:' \
78 - -i src/${EGO_PN}/go/internal/gcimporter/gcimporter_test.go || die
79 - sed -e 's:TestVeryLongFile(:_\0:' \
80 - -i src/${EGO_PN}/go/internal/gcimporter/bexport_test.go || die
81 -}
82 -
83 -src_compile() {
84 - export -n GOCACHE XDG_CACHE_HOME #678964
85 - # Generate static.go with favicon included
86 - pushd src/golang.org/x/tools/godoc/static >/dev/null || die
87 - GOPATH="${S}:$(get_golibdir_gopath)" \
88 - go run makestatic.go || die
89 - popd >/dev/null
90 -
91 - GOPATH="${S}:$(get_golibdir_gopath)" \
92 - go install -v -work -x ${EGO_BUILD_FLAGS} $(cd "${S}/src/${EGO_PN}" && GOPATH="${S}" go list ./...) || die
93 -}
94 -
95 -src_test() {
96 - GOPATH="${S}:$(get_golibdir_gopath)" \
97 - go test -v -work -x "${EGO_PN}/..." || die
98 -}
99 -
100 -src_install() {
101 - rm -rf "${S}/src/${EGO_PN}/vendor" || die
102 - golang_install_pkgs
103 -
104 - # bug 558818: install binaries in $GOROOT/bin to avoid file collisions
105 - exeinto "$(go env GOROOT)/bin"
106 - doexe bin/*
107 - dodir /usr/bin
108 - ln "${ED}$(go env GOROOT)/bin/godoc" "${ED}usr/bin/godoc" || die
109 -}