Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-cluster/teleport/
Date: Thu, 26 Jul 2018 20:39:44
Message-Id: 1532637573.137c6ece701b2ba359ce3a1cd17fc80bc6fa8f3a.mgorny@gentoo
1 commit: 137c6ece701b2ba359ce3a1cd17fc80bc6fa8f3a
2 Author: Graeme Lawes <graemelawes <AT> gmail <DOT> com>
3 AuthorDate: Sun Jul 8 17:04:56 2018 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Thu Jul 26 20:39:33 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=137c6ece
7
8 sys-cluster/teleport-9999: use latest ebuild file
9
10 sys-cluster/teleport/teleport-9999.ebuild | 28 +++++++++++-----------------
11 1 file changed, 11 insertions(+), 17 deletions(-)
12
13 diff --git a/sys-cluster/teleport/teleport-9999.ebuild b/sys-cluster/teleport/teleport-9999.ebuild
14 index a16c3c13370..1111454a646 100644
15 --- a/sys-cluster/teleport/teleport-9999.ebuild
16 +++ b/sys-cluster/teleport/teleport-9999.ebuild
17 @@ -1,8 +1,8 @@
18 -# Copyright 1999-2017 Gentoo Foundation
19 +# Copyright 1999-2018 Gentoo Foundation
20 # Distributed under the terms of the GNU General Public License v2
21
22 EAPI=6
23 -inherit eutils golang-build systemd user
24 +inherit golang-build systemd
25
26 DESCRIPTION="Modern SSH server for teams managing distributed infrastructure"
27 HOMEPAGE="https://gravitational.com/teleport"
28 @@ -15,29 +15,23 @@ if [[ ${PV} == "9999" ]] ; then
29 else
30 inherit golang-vcs-snapshot
31 SRC_URI="https://github.com/gravitational/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
32 - KEYWORDS="~amd64"
33 + KEYWORDS="~amd64 ~arm"
34 fi
35
36 +IUSE="pam"
37 LICENSE="Apache-2.0"
38 +RESTRICT="test strip"
39 SLOT="0"
40 -IUSE=""
41
42 -DEPEND="
43 - app-arch/zip
44 - >=dev-lang/go-1.7"
45 -RDEPEND=""
46 +DEPEND="app-arch/zip"
47 +RDEPEND="pam? ( sys-libs/pam )"
48
49 src_compile() {
50 - BUILDFLAGS="" GOPATH="${S}" emake -C src/${EGO_PN%/*}
51 - pushd src/${EGO_PN%/*}/web/dist >/dev/null || die
52 - zip -qr "${S}/src/${EGO_PN%/*}/build/webassets.zip" . || die
53 - popd >/dev/null || die
54 - cat "${S}/src/${EGO_PN%/*}/build/webassets.zip" >> "src/${EGO_PN%/*}/build/${PN}" || die
55 - zip -q -A "${S}/src/${EGO_PN%/*}/build/${PN}" || die
56 + BUILDFLAGS="" GOPATH="${S}" emake -j1 -C src/${EGO_PN%/*} full
57 }
58
59 src_install() {
60 - dodir /var/lib/${PN} /etc/${PN}
61 + keepdir /var/lib/${PN} /etc/${PN}
62 dobin src/${EGO_PN%/*}/build/{tsh,tctl,teleport}
63
64 insinto /etc/${PN}
65 @@ -46,10 +40,10 @@ src_install() {
66 newinitd "${FILESDIR}"/${PN}.init.d ${PN}
67 newconfd "${FILESDIR}"/${PN}.conf.d ${PN}
68
69 - systemd_dounit "${FILESDIR}"/${PN}.service
70 + systemd_newunit "${FILESDIR}"/${PN}.service ${PN}.service
71 systemd_install_serviced "${FILESDIR}"/${PN}.service.conf ${PN}.service
72 }
73
74 src_test() {
75 - GOPATH="${S}" emake -C src/${EGO_PN%/*} test
76 + BUILDFLAGS="" GOPATH="${S}" emake -C src/${EGO_PN%/*} test
77 }