Gentoo Archives: gentoo-commits

From: Mike Gilbert <floppym@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/cli53/files/, app-admin/cli53/
Date: Tue, 30 Aug 2016 03:43:33
Message-Id: 1472528592.edd86ebc72fa11f7cdd939a5ea9cd34bf4de22de.floppym@gentoo
1 commit: edd86ebc72fa11f7cdd939a5ea9cd34bf4de22de
2 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
3 AuthorDate: Tue Aug 30 03:42:57 2016 +0000
4 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
5 CommitDate: Tue Aug 30 03:43:12 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=edd86ebc
7
8 app-admin/cli53: bump to 0.8.0
9
10 Package-Manager: portage-2.3.0_p22
11
12 app-admin/cli53/Manifest | 1 +
13 .../{cli53-9999.ebuild => cli53-0.8.0.ebuild} | 11 +++++++---
14 app-admin/cli53/cli53-9999.ebuild | 11 +++++++---
15 app-admin/cli53/files/cli53-ldflags.patch | 25 ++++++++++++++++++++++
16 4 files changed, 42 insertions(+), 6 deletions(-)
17
18 diff --git a/app-admin/cli53/Manifest b/app-admin/cli53/Manifest
19 index ab55c97..6de28a3 100644
20 --- a/app-admin/cli53/Manifest
21 +++ b/app-admin/cli53/Manifest
22 @@ -1 +1,2 @@
23 DIST cli53-0.7.4.tar.gz 3270107 SHA256 3cb89e6aa91676ffd0577798a4b06b056667d18ad836de4fa31c0564ee48474e SHA512 fb0fb7891dacf07b4a34861c6c93d8ab8c177710345cfb6d39feb56892d6b9fa8d39b1d933323a6649e3fefdb941cdc7d4940bbdb7040d41a99ea988c3b976fa WHIRLPOOL a62f999666215540afbd4bfbdc07366a772900520c21fb9e65dbcc7d7da6ea5c0354017c1ff1c1825ba84c777e7c1a07367ac521ce0aedaefe21ca2ec0c52871
24 +DIST cli53-0.8.0.tar.gz 4365177 SHA256 0a87de05110d9bba851ba3522a1072494256e31fa653f59331313bff21d5c160 SHA512 25094642796dfc13de470b20288b6e801437e826598414af9bbe65d6d1d0a76a5ada2dc4f732043e12d5a4e4b860f824381df04aeb847b0917414f9a3238432c WHIRLPOOL 5e36e8c957f1e6876bbb1834452be1526b62da84dd4ee5ba6273f9ff259e3bcb71c746d5c990346abd8d5914e2ccb887b3e4840a07620abd4ce49dcca7dea79b
25
26 diff --git a/app-admin/cli53/cli53-9999.ebuild b/app-admin/cli53/cli53-0.8.0.ebuild
27 similarity index 81%
28 copy from app-admin/cli53/cli53-9999.ebuild
29 copy to app-admin/cli53/cli53-0.8.0.ebuild
30 index 834f3a3..6a58229 100644
31 --- a/app-admin/cli53/cli53-9999.ebuild
32 +++ b/app-admin/cli53/cli53-0.8.0.ebuild
33 @@ -21,16 +21,21 @@ SLOT="0"
34 EGO_PN="github.com/barnybug/cli53"
35 S="${WORKDIR}/${P}/src/${EGO_PN}"
36
37 +PATCHES=(
38 + "${FILESDIR}"/cli53-ldflags.patch
39 +)
40 +
41 src_compile() {
42 + export GOPATH="${WORKDIR}/${P}"
43 if [[ ${PV} == 9999 ]]; then
44 - GOPATH="${WORKDIR}/${P}" emake build
45 + emake build
46 else
47 - GOPATH="${WORKDIR}/${P}" emake build version=${PV}
48 + emake build version=${PV}
49 fi
50 }
51
52 src_test() {
53 - GOPATH="${WORKDIR}/${P}" go test -v || die
54 + go test -v || die
55 }
56
57 src_install() {
58
59 diff --git a/app-admin/cli53/cli53-9999.ebuild b/app-admin/cli53/cli53-9999.ebuild
60 index 834f3a3..6a58229 100644
61 --- a/app-admin/cli53/cli53-9999.ebuild
62 +++ b/app-admin/cli53/cli53-9999.ebuild
63 @@ -21,16 +21,21 @@ SLOT="0"
64 EGO_PN="github.com/barnybug/cli53"
65 S="${WORKDIR}/${P}/src/${EGO_PN}"
66
67 +PATCHES=(
68 + "${FILESDIR}"/cli53-ldflags.patch
69 +)
70 +
71 src_compile() {
72 + export GOPATH="${WORKDIR}/${P}"
73 if [[ ${PV} == 9999 ]]; then
74 - GOPATH="${WORKDIR}/${P}" emake build
75 + emake build
76 else
77 - GOPATH="${WORKDIR}/${P}" emake build version=${PV}
78 + emake build version=${PV}
79 fi
80 }
81
82 src_test() {
83 - GOPATH="${WORKDIR}/${P}" go test -v || die
84 + go test -v || die
85 }
86
87 src_install() {
88
89 diff --git a/app-admin/cli53/files/cli53-ldflags.patch b/app-admin/cli53/files/cli53-ldflags.patch
90 new file mode 100644
91 index 00000000..37987c5
92 --- /dev/null
93 +++ b/app-admin/cli53/files/cli53-ldflags.patch
94 @@ -0,0 +1,25 @@
95 +From 832a36db6cbb259146ba306ceece92cfa1f45038 Mon Sep 17 00:00:00 2001
96 +From: Mike Gilbert <floppym@g.o>
97 +Date: Mon, 29 Aug 2016 23:31:59 -0400
98 +Subject: [PATCH] Don't strip debug symbols
99 +
100 +---
101 + Makefile | 2 +-
102 + 1 file changed, 1 insertion(+), 1 deletion(-)
103 +
104 +diff --git a/Makefile b/Makefile
105 +index 546767c..5253982 100644
106 +--- a/Makefile
107 ++++ b/Makefile
108 +@@ -2,7 +2,7 @@ export GO15VENDOREXPERIMENT=1
109 +
110 + version := $(shell git describe --always --dirty)
111 + exe = ./cmd/cli53
112 +-buildargs = -ldflags '-w -s -X github.com/barnybug/cli53.version=${version}'
113 ++buildargs = -ldflags '-X github.com/barnybug/cli53.version=${version}'
114 +
115 + .PHONY: all build install test coverage deps release
116 +
117 +--
118 +2.9.3
119 +