Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-go/act/
Date: Mon, 07 Nov 2022 05:01:31
Message-Id: 1667797274.58d84841ee2d310d991242fdabe01274d08347f3.sam@gentoo
1 commit: 58d84841ee2d310d991242fdabe01274d08347f3
2 Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
3 AuthorDate: Tue Nov 1 09:47:43 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Mon Nov 7 05:01:14 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58d84841
7
8 dev-go/act: no longer use go-module
9
10 The package doesn't use the usual Go structure and fails to build with
11 changes to go-module.
12 Thanks to William Hubbs for the suggestion to go related changes.
13
14 Suggested-by: William Hubbs <williamh <AT> gentoo.org>
15 Closes: https://bugs.gentoo.org/877881
16 Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
17 Closes: https://github.com/gentoo/gentoo/pull/28072
18 Signed-off-by: Sam James <sam <AT> gentoo.org>
19
20 dev-go/act/act-1.6.0.ebuild | 39 ++++++---------------------------------
21 1 file changed, 6 insertions(+), 33 deletions(-)
22
23 diff --git a/dev-go/act/act-1.6.0.ebuild b/dev-go/act/act-1.6.0.ebuild
24 index 3a2dd997297d..4baa06a089d0 100644
25 --- a/dev-go/act/act-1.6.0.ebuild
26 +++ b/dev-go/act/act-1.6.0.ebuild
27 @@ -3,8 +3,6 @@
28
29 EAPI=8
30
31 -inherit go-module toolchain-funcs
32 -
33 DESCRIPTION="Automated Component Toolkit code generator"
34 HOMEPAGE="https://github.com/Autodesk/AutomaticComponentToolkit"
35 SRC_URI="https://github.com/Autodesk/AutomaticComponentToolkit/archive/v${PV}.tar.gz -> ${P}.tar.gz"
36 @@ -14,44 +12,19 @@ LICENSE="BSD-2"
37 SLOT="0"
38 KEYWORDS="amd64 ~arm64 x86"
39
40 -RESTRICT="test"
41 -
42 -# Package does not follow the usual go directory structure
43 -# Functions borrowed from dev-lang/go ebuild.
44 -go_arch() {
45 - # By chance most portage arch names match Go
46 - local portage_arch=$(tc-arch $@)
47 - case "${portage_arch}" in
48 - x86) echo 386;;
49 - x64-*) echo amd64;;
50 - *) echo "${portage_arch}";;
51 - esac
52 -}
53 +RESTRICT="strip test"
54
55 -go_arm() {
56 - case "${1:-${CHOST}}" in
57 - armv5*) echo 5;;
58 - armv6*) echo 6;;
59 - armv7*) echo 7;;
60 - *)
61 - die "unknown GOARM for ${1:-${CHOST}}"
62 - ;;
63 - esac
64 -}
65 +BDEPEND="dev-lang/go"
66
67 -src_compile() {
68 - export GOARCH=$(go_arch)
69 - export GOOS=linux
70 - if [[ ${ARCH} == arm ]]; then
71 - export GOARM=$(go_arm)
72 - fi
73 +QA_FLAGS_IGNORED="usr/bin/act"
74
75 - cd "${S}"/Source || die
76 +src_compile() {
77 + cd Source || die
78 go build -x -o ../${PN} *.go || die
79 }
80
81 src_install() {
82 - newbin "${S}"/${PN} ${PN}
83 + dobin ${PN}
84 einstalldocs
85 dodoc -r Documentation/.
86 }