1 |
commit: ebe1c81a3c9dc392338a76585794c2cd5e92f58b |
2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Feb 26 18:08:36 2016 +0000 |
4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Feb 26 18:10:09 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebe1c81a |
7 |
|
8 |
dev-go/go-oauth2: version bump to 0_pre20160222, fix bug 575722 |
9 |
|
10 |
Package-Manager: portage-2.2.27 |
11 |
|
12 |
dev-go/go-oauth2/Manifest | 3 +- |
13 |
dev-go/go-oauth2/go-oauth2-0_pre20160220.ebuild | 66 -------------- |
14 |
dev-go/go-oauth2/go-oauth2-0_pre20160222.ebuild | 113 ++++++++++++++++++++++++ |
15 |
3 files changed, 115 insertions(+), 67 deletions(-) |
16 |
|
17 |
diff --git a/dev-go/go-oauth2/Manifest b/dev-go/go-oauth2/Manifest |
18 |
index d7aa3d4..180b294 100644 |
19 |
--- a/dev-go/go-oauth2/Manifest |
20 |
+++ b/dev-go/go-oauth2/Manifest |
21 |
@@ -1,4 +1,5 @@ |
22 |
DIST gcloud-golang-872c736f496c2ba12786bedbb8325576bbdb33cf.tar.gz 217728 SHA256 d4dc2064cc999c9c527fe50a05c44357d3471379bea3f82a95bfebbaa5373552 SHA512 45f0533c842a59dfee3b6d3f1facb9535466119601644a9a2c8c8b4f573889713b1d82d0acdeef96ea246d47d79402d09592b25da3ffbf73953bd28bf5b92ed9 WHIRLPOOL fadd0c32fbfcca9c01ad0a11f64ea4625cda858e4d241bcad35cdc1292bf258a370f4fdd73ecb7bb613fc1f0e8a52154dc3582dbcd776517713468cb2ab7c18a |
23 |
DIST gcloud-golang-e34a32f9b0ecbc0784865fb2d47f3818c09521d4.tar.gz 168358 SHA256 817456c3b49ff6917604d201041d4f555e7f42328d5df036c68c26bf50c7455c SHA512 135124280cdbf0a9e62f811164b4b97f0ee5142736cc4a06efafd48162a89dd1a6f186264c925da27adc970c964ab0af75423025fd125b772ddb99320b816219 WHIRLPOOL 66a445585c17d0331b0ce24d9bde8c8942ba39d1d404e1b3b73cbaf173327ab0c43af5b7e980accf697100b12e3a544334a07f43f9f17ebac93ee7907b92b7ac |
24 |
+DIST go-net-0_pre20160216.tar.gz 741192 SHA256 482a17771601dc706945eee7e0c3a339d57a140dc3cb8adaa86e99ef28a8ea71 SHA512 75db9098b33ede5621fce36645ebe946fad911c815dae219d74242b15714d1b9a3d8544f5f8c90b58989cea3a46b5688d20f705cb24a7d31f201ec218e69e78f WHIRLPOOL 2a7dca88766e6ba010ed6b274a48e7db5cfc9084cbc16f46e2806d59519f91b296d64dead8485f191aff50168bad5b4f62ac670d17b30b90850a9906d85c6708 |
25 |
DIST go-oauth2-0_pre20150701.tar.gz 32040 SHA256 ce9b602dd7f05c819002d6400585c2f09e8e1880a0fe358a4d4f56a6594ccedd SHA512 d809e1d63c7b5a4b388616d930cb22978b1653e2314b208d12679242bdd0e9d72f275f5ade7aa468b1dcf3960aa70ff94183ae1dd04325b24cdd20ef4834880a WHIRLPOOL 984438676de52f635206a3bb19b77e7f05c9c78a2ce6beabbe82cc22fb28fa0c7e3717a596a9b0c967615574ad6e53da0510bc1ecd0a38edd23680622320d6a0 |
26 |
-DIST go-oauth2-0_pre20160220.tar.gz 32040 SHA256 ce9b602dd7f05c819002d6400585c2f09e8e1880a0fe358a4d4f56a6594ccedd SHA512 d809e1d63c7b5a4b388616d930cb22978b1653e2314b208d12679242bdd0e9d72f275f5ade7aa468b1dcf3960aa70ff94183ae1dd04325b24cdd20ef4834880a WHIRLPOOL 984438676de52f635206a3bb19b77e7f05c9c78a2ce6beabbe82cc22fb28fa0c7e3717a596a9b0c967615574ad6e53da0510bc1ecd0a38edd23680622320d6a0 |
27 |
+DIST go-oauth2-0_pre20160222.tar.gz 34556 SHA256 cb4123249901235e6ebfd074a5b1547cb4e3a4a7060b399b29950e60882ecd2f SHA512 23fbc7744fe35f893d385a308428d2a3b8ddbf45fa12c5b43d3dc619e6bb422f30ce80774a25b88a8f74f9343c57280546183b45364456e1c60aee96aa6d0f77 WHIRLPOOL 67c42a0b21861e7cd34b25c4d59359f791faf4f03a2759c94ae70e48cfbe24f27ca005f7e7afbbe7c8221fb47aa8a08dc19c19dc8e53b680d6bcaaeff10d2308 |
28 |
|
29 |
diff --git a/dev-go/go-oauth2/go-oauth2-0_pre20160220.ebuild b/dev-go/go-oauth2/go-oauth2-0_pre20160220.ebuild |
30 |
deleted file mode 100644 |
31 |
index e9cb971..0000000 |
32 |
--- a/dev-go/go-oauth2/go-oauth2-0_pre20160220.ebuild |
33 |
+++ /dev/null |
34 |
@@ -1,66 +0,0 @@ |
35 |
-# Copyright 1999-2016 Gentoo Foundation |
36 |
-# Distributed under the terms of the GNU General Public License v2 |
37 |
-# $Id$ |
38 |
- |
39 |
-EAPI=5 |
40 |
- |
41 |
-inherit eutils golang-base |
42 |
- |
43 |
-MY_PN=${PN##*-} |
44 |
-GO_PN=golang.org/x/${MY_PN} |
45 |
-EGIT_COMMIT="8914e5017ca260f2a3a1575b1e6868874050d95e" |
46 |
- |
47 |
-HOMEPAGE="https://godoc.org/${GO_PN}" |
48 |
-DESCRIPTION="Go client implementation for OAuth 2.0 spec" |
49 |
-SRC_URI=" |
50 |
- https://github.com/golang/${MY_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz |
51 |
- https://github.com/GoogleCloudPlatform/gcloud-golang/archive/872c736f496c2ba12786bedbb8325576bbdb33cf.tar.gz -> gcloud-golang-872c736f496c2ba12786bedbb8325576bbdb33cf.tar.gz" |
52 |
- |
53 |
-SLOT="0/${PVR}" |
54 |
-LICENSE="BSD" |
55 |
-KEYWORDS="~amd64" |
56 |
-IUSE="" |
57 |
- |
58 |
-DEPEND=" |
59 |
- dev-go/go-net:= |
60 |
- dev-go/go-tools" |
61 |
-RDEPEND="" |
62 |
- |
63 |
-S="${WORKDIR}/src/${GO_PN}" |
64 |
- |
65 |
-EGIT_CHECKOUT_DIR="${S}" |
66 |
-STRIP_MASK="*.a" |
67 |
- |
68 |
-src_unpack() { |
69 |
- default |
70 |
- mkdir -p src/${GO_PN%/*} || die |
71 |
- mv ${MY_PN}-${EGIT_COMMIT} src/${GO_PN} || die |
72 |
- |
73 |
- # Create a writable GOROOT in order to avoid sandbox violations. |
74 |
- export GOROOT="${WORKDIR}/goroot" GOPATH="${WORKDIR}/:$(get_golibdir_gopath)" |
75 |
- cp -sR "${EPREFIX}"/usr/lib/go "${GOROOT}" || die |
76 |
- rm -rf "${GOROOT}/src/${GO_PN}" || die |
77 |
- |
78 |
- mkdir -p "${GOROOT}/src/google.golang.org" || die |
79 |
- rm -rf "${GOROOT}/src/google.golang.org"/* || die |
80 |
- rm -rf "${GOROOT}/pkg/${KERNEL}_${ARCH}/google.golang.org" || die |
81 |
- mv gcloud-golang-872c736f496c2ba12786bedbb8325576bbdb33cf "${GOROOT}/src/google.golang.org/cloud" || die |
82 |
-} |
83 |
- |
84 |
-src_compile() { |
85 |
- go install -v -x -work google.golang.org/cloud/compute/metadata || die |
86 |
- go install -v -x -work ${GO_PN}/... || die |
87 |
-} |
88 |
- |
89 |
-src_test() { |
90 |
- # google/example_test.go imports appengine, introducing a circular dep |
91 |
- mv google/example_test.go{,_} |
92 |
- go test -x -v ${GO_PN}/... || die $? |
93 |
- mv google/example_test.go{_,} |
94 |
-} |
95 |
- |
96 |
-src_install() { |
97 |
- insinto "$(get_golibdir)" |
98 |
- insopts -m0644 -p # preserve timestamps for bug 551486 |
99 |
- doins -r "${WORKDIR}"/{pkg,src} |
100 |
-} |
101 |
|
102 |
diff --git a/dev-go/go-oauth2/go-oauth2-0_pre20160222.ebuild b/dev-go/go-oauth2/go-oauth2-0_pre20160222.ebuild |
103 |
new file mode 100644 |
104 |
index 0000000..2d1bb8e |
105 |
--- /dev/null |
106 |
+++ b/dev-go/go-oauth2/go-oauth2-0_pre20160222.ebuild |
107 |
@@ -0,0 +1,113 @@ |
108 |
+# Copyright 1999-2016 Gentoo Foundation |
109 |
+# Distributed under the terms of the GNU General Public License v2 |
110 |
+# $Id$ |
111 |
+ |
112 |
+EAPI=5 |
113 |
+ |
114 |
+inherit eutils golang-base |
115 |
+ |
116 |
+MY_PN=${PN##*-} |
117 |
+EGO_PN="golang.org/x/${MY_PN}/..." |
118 |
+EGIT_COMMIT="2cd4472c321b6cba78e029d99f0e7fe51032fd21" |
119 |
+ |
120 |
+HOMEPAGE="https://godoc.org/${EGO_PN%/*}" |
121 |
+DESCRIPTION="Go client implementation for OAuth 2.0 spec" |
122 |
+SRC_URI=" |
123 |
+ https://github.com/golang/${MY_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz |
124 |
+ https://github.com/golang/net/archive/b6d7b1396ec874c3b00f6c84cd4301a17c56c8ed.tar.gz -> go-net-0_pre20160216.tar.gz |
125 |
+ https://github.com/GoogleCloudPlatform/gcloud-golang/archive/872c736f496c2ba12786bedbb8325576bbdb33cf.tar.gz -> gcloud-golang-872c736f496c2ba12786bedbb8325576bbdb33cf.tar.gz" |
126 |
+ |
127 |
+SLOT="0/${PVR}" |
128 |
+LICENSE="BSD" |
129 |
+KEYWORDS="~amd64" |
130 |
+IUSE="" |
131 |
+ |
132 |
+DEPEND="dev-go/go-tools" |
133 |
+RDEPEND="" |
134 |
+ |
135 |
+EGIT_CHECKOUT_DIR="${S}" |
136 |
+STRIP_MASK="*.a" |
137 |
+ |
138 |
+get_archive_go_package() { |
139 |
+ local archive=${1} uri x |
140 |
+ case ${archive} in |
141 |
+ ${PN}-*) echo "oauth2-* golang.org/x/oauth2"; return;; |
142 |
+ gcloud-golang-*) echo "gcloud-golang-* google.golang.org/cloud"; return;; |
143 |
+ go-net-*) echo "net-* golang.org/x/net"; return;; |
144 |
+ esac |
145 |
+ for x in ${SRC_URI}; do |
146 |
+ if [[ ${x} == http* ]]; then |
147 |
+ uri=${x} |
148 |
+ elif [[ ${x} == ${archive} ]]; then |
149 |
+ break |
150 |
+ fi |
151 |
+ done |
152 |
+ uri=${uri#https://} |
153 |
+ uri=${uri%/archive/*} |
154 |
+ echo "${uri##*/}-* ${uri}" |
155 |
+} |
156 |
+ |
157 |
+unpack_go_packages() { |
158 |
+ local go_package pattern x |
159 |
+ # Unpack packages to appropriate locations for GOPATH |
160 |
+ for x in ${A}; do |
161 |
+ unpack ${x} |
162 |
+ if [[ ${x} == *.tar.gz ]]; then |
163 |
+ go_package=$(get_archive_go_package ${x}) |
164 |
+ pattern=${go_package%% *} |
165 |
+ go_package=${go_package##* } |
166 |
+ if [[ ${x%.tar.gz} -ef ${S} ]]; then |
167 |
+ mv "${S}"{,_} || die |
168 |
+ mkdir -p "${S}/src/${go_package%/*}" || die |
169 |
+ mv "${S}"_ "${S}/src/${go_package}" || die || die |
170 |
+ else |
171 |
+ mkdir -p "${S}/src/${go_package%/*}" || die |
172 |
+ for x in ${pattern}; do |
173 |
+ if [[ ! ${x} -ef ${S} ]]; then |
174 |
+ mv "${x}" "${S}/src/${go_package}" || die |
175 |
+ fi |
176 |
+ done |
177 |
+ fi |
178 |
+ fi |
179 |
+ done |
180 |
+} |
181 |
+ |
182 |
+src_unpack() { |
183 |
+ unpack_go_packages |
184 |
+ |
185 |
+ # Create a writable GOROOT in order to avoid sandbox violations. |
186 |
+ # Omit $(get_golibdir_gopath) from GOPATH, in order to avoid |
187 |
+ # more sandbox violations (bug 575722). |
188 |
+ GOROOT="${WORKDIR}/goroot" GOPATH="${S}" |
189 |
+ cp -sR "$(go env GOROOT)" "${GOROOT}" || die |
190 |
+ rm -rf "${GOROOT}/src/${EGO_PN%/*}" || die |
191 |
+ export GOROOT GOPATH |
192 |
+ |
193 |
+ mkdir -p "${GOROOT}/src/google.golang.org" || die |
194 |
+ rm -rf "${GOROOT}/src/google.golang.org"/* || die |
195 |
+ rm -rf "${GOROOT}/pkg/${KERNEL}_${ARCH}/google.golang.org" || die |
196 |
+} |
197 |
+ |
198 |
+src_compile() { |
199 |
+ GOROOT="${GOROOT}" GOPATH="${GOPATH}" \ |
200 |
+ go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}" || die |
201 |
+} |
202 |
+ |
203 |
+src_test() { |
204 |
+ # google/example_test.go imports appengine, introducing a circular dep |
205 |
+ mv src/${EGO_PN%/*}/google/example_test.go{,_} || die |
206 |
+ go test -x -v "${EGO_PN}" || die $? |
207 |
+ mv src/${EGO_PN%/*}/google/example_test.go{_,} || die |
208 |
+} |
209 |
+ |
210 |
+src_install() { |
211 |
+ golang_install_pkgs |
212 |
+} |
213 |
+ |
214 |
+golang_install_pkgs() { |
215 |
+ insinto $(dirname "${EPREFIX}$(get_golibdir)/src/${EGO_PN%/*}") |
216 |
+ rm -rf "${S}"/src/${EGO_PN%/*}/.git* |
217 |
+ doins -r "${S}"/src/${EGO_PN%/*} |
218 |
+ insinto $(dirname "${EPREFIX}$(get_golibdir)/pkg/$(go env GOOS)_$(go env GOARCH)/${EGO_PN%/*}") |
219 |
+ doins -r "${S}"/pkg/$(go env GOOS)_$(go env GOARCH)/${EGO_PN%/*}{,.a} |
220 |
+} |