From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 97262138335 for ; Thu, 26 Jul 2018 20:39:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8A757E0934; Thu, 26 Jul 2018 20:39:43 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 55DDCE093E for ; Thu, 26 Jul 2018 20:39:43 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3F2CA335CD4 for ; Thu, 26 Jul 2018 20:39:42 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4D30538A for ; Thu, 26 Jul 2018 20:39:40 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1532637573.137c6ece701b2ba359ce3a1cd17fc80bc6fa8f3a.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-cluster/teleport/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-cluster/teleport/teleport-9999.ebuild X-VCS-Directories: sys-cluster/teleport/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 137c6ece701b2ba359ce3a1cd17fc80bc6fa8f3a X-VCS-Branch: master Date: Thu, 26 Jul 2018 20:39:40 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: d0ecfe1d-ae3e-4a4f-9902-a515190b2f94 X-Archives-Hash: d4f24ca49c858aa0b7fa087497f96b9e commit: 137c6ece701b2ba359ce3a1cd17fc80bc6fa8f3a Author: Graeme Lawes gmail com> AuthorDate: Sun Jul 8 17:04:56 2018 +0000 Commit: Michał Górny gentoo org> CommitDate: Thu Jul 26 20:39:33 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=137c6ece sys-cluster/teleport-9999: use latest ebuild file sys-cluster/teleport/teleport-9999.ebuild | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/sys-cluster/teleport/teleport-9999.ebuild b/sys-cluster/teleport/teleport-9999.ebuild index a16c3c13370..1111454a646 100644 --- a/sys-cluster/teleport/teleport-9999.ebuild +++ b/sys-cluster/teleport/teleport-9999.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit eutils golang-build systemd user +inherit golang-build systemd DESCRIPTION="Modern SSH server for teams managing distributed infrastructure" HOMEPAGE="https://gravitational.com/teleport" @@ -15,29 +15,23 @@ if [[ ${PV} == "9999" ]] ; then else inherit golang-vcs-snapshot SRC_URI="https://github.com/gravitational/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64" + KEYWORDS="~amd64 ~arm" fi +IUSE="pam" LICENSE="Apache-2.0" +RESTRICT="test strip" SLOT="0" -IUSE="" -DEPEND=" - app-arch/zip - >=dev-lang/go-1.7" -RDEPEND="" +DEPEND="app-arch/zip" +RDEPEND="pam? ( sys-libs/pam )" src_compile() { - BUILDFLAGS="" GOPATH="${S}" emake -C src/${EGO_PN%/*} - pushd src/${EGO_PN%/*}/web/dist >/dev/null || die - zip -qr "${S}/src/${EGO_PN%/*}/build/webassets.zip" . || die - popd >/dev/null || die - cat "${S}/src/${EGO_PN%/*}/build/webassets.zip" >> "src/${EGO_PN%/*}/build/${PN}" || die - zip -q -A "${S}/src/${EGO_PN%/*}/build/${PN}" || die + BUILDFLAGS="" GOPATH="${S}" emake -j1 -C src/${EGO_PN%/*} full } src_install() { - dodir /var/lib/${PN} /etc/${PN} + keepdir /var/lib/${PN} /etc/${PN} dobin src/${EGO_PN%/*}/build/{tsh,tctl,teleport} insinto /etc/${PN} @@ -46,10 +40,10 @@ src_install() { newinitd "${FILESDIR}"/${PN}.init.d ${PN} newconfd "${FILESDIR}"/${PN}.conf.d ${PN} - systemd_dounit "${FILESDIR}"/${PN}.service + systemd_newunit "${FILESDIR}"/${PN}.service ${PN}.service systemd_install_serviced "${FILESDIR}"/${PN}.service.conf ${PN}.service } src_test() { - GOPATH="${S}" emake -C src/${EGO_PN%/*} test + BUILDFLAGS="" GOPATH="${S}" emake -C src/${EGO_PN%/*} test }