4 files changed, 8 insertions, 135 deletions
diff --git a/sys-cluster/teleport/Manifest b/sys-cluster/teleport/Manifest
index 49b60358feb5..ffa5d115c4e7 100644
--- a/sys-cluster/teleport/Manifest
+++ b/sys-cluster/teleport/Manifest
@@ -4,11 +4,7 @@ AUX teleport.init.d 763 BLAKE2B b57826ab86550da58590546d484c78c05744699363de770e
 AUX teleport.service 209 BLAKE2B ee1f8561ec543a9571cccd5449a276bfdb581db2bccf5f47151159670a9588fc655dcecde69fa951c9a8fb5243033a56b656663bbec94753d5f4925fecd3a3a8 SHA512 c71665c287575b1e127fdf5c580552aeb17bff55627d537999964be3a86ba2b11dce9d46bf10ab8e909c65a9d94263ced590191b7ea9e5ee2f0c3f65a044816e
 AUX teleport.service.conf 90 BLAKE2B 7f12f281d73ac6573c882a7910e400f901ff6392e0c576e4b7076972f4ced046f709c8898766aaf38cc38fbfcf450b526d3045ff859eed2a48e19dbd92ec3131 SHA512 d17faa0deaf3c864e5159d3567e542e36d09c6ea0ac91c663d3ae9729d1bccf7d2139f1f48fec132eccc473e023ffdaed0b8f2ee75db5dedc6ff36f637f68e1c
 AUX teleport.yaml 5177 BLAKE2B 8280b9924497af772574faad5d01351d9c49dd1916dca8e3e0384579e7628b2c0b1833b72882231bfef4ae11b2fa9820a4785393ea8c9d00aef105263bbf5c15 SHA512 f9f854472d469d0822d5766517cc68364feca4f3345a69d616d073aaaf9af7be6f72aa55c7d0c801426c3fef42714c09b884e0e086a58a07208ebef0ffe3ca80
-DIST teleport-2.2.0.tar.gz 7229371 BLAKE2B 8425326e026e5ca23c43b11947d575efccda98e18519dbcd8b9fb4baa2fecf15b3d66b225b22f40e9d78e0e6d39bbed3c2c569b3d15b5af9099f0f4979259cbd SHA512 bec288983371bd3807b7ce994b1533a5e869d903251f8a8ce6315768a1d3ae95d72f832037345c36c9cd4789fbc449c54b86359988b1e74d4f46f9e0db6b3239
-DIST teleport-2.2.1.tar.gz 7235188 BLAKE2B 1f1272bdc96bac0eb424660a285232980063b1a82fec60d7ba80f227da34fa22052aae1eba3137ae73e62fc9c71a8037f067f16ac6b22014f3a82fdd88b444fb SHA512 011ffd8fdf42131455c32b8a8ed1ddee0181a8dcd3424dc9cf5ac96c53ce719d369e0bfac4392cc0dec14e78fed94732bbcb56c2db5987ee778ad29e4f7a749d
-DIST teleport-2.2.4.tar.gz 7234252 BLAKE2B 22c49e3659559ff6f8e55d3b60cf44fce00e67642d16457917b038cbbf48cc32db8caafbf39b70cef2ab39f0d8c1b3cb09e6ea1ab329e8e46c1fdf09b4a3aff2 SHA512 859bc34c90c4d1a504b9fa2958e49803c7af8bee3c2692d70590095ef0356a00cf963c5fc30613f3a7852b602fc7fbbd81ca99fc24ce51787f6d8d2e05af4762
-EBUILD teleport-2.2.0.ebuild 1542 BLAKE2B 698f8b48e6ea9ed1fd3305d83346ad1972beb675e86854b479bb5f7a790008505ab3ca54db1ce96489b190717617fbc346bcf02403dde192d6a7bb1ee2df4f80 SHA512 416f9685b2b50788476043d7130ac358b68621da05237ea84502220fe065dff96b10f44e29b068690c79a9a0f528dfabee7430a87e25ef4b86c64e1d288c78a8
-EBUILD teleport-2.2.1.ebuild 1542 BLAKE2B 698f8b48e6ea9ed1fd3305d83346ad1972beb675e86854b479bb5f7a790008505ab3ca54db1ce96489b190717617fbc346bcf02403dde192d6a7bb1ee2df4f80 SHA512 416f9685b2b50788476043d7130ac358b68621da05237ea84502220fe065dff96b10f44e29b068690c79a9a0f528dfabee7430a87e25ef4b86c64e1d288c78a8
-EBUILD teleport-2.2.4.ebuild 1542 BLAKE2B 698f8b48e6ea9ed1fd3305d83346ad1972beb675e86854b479bb5f7a790008505ab3ca54db1ce96489b190717617fbc346bcf02403dde192d6a7bb1ee2df4f80 SHA512 416f9685b2b50788476043d7130ac358b68621da05237ea84502220fe065dff96b10f44e29b068690c79a9a0f528dfabee7430a87e25ef4b86c64e1d288c78a8
+DIST teleport-2.4.0.tar.gz 9967298 BLAKE2B 26cb5610701c4c7deba0ba36b02f43928f4582cd81449045f58281b06a570eb5df762d21e5fef8f7f461855af3ac766fbafd1d2238b6916f9aaaaf07e20b7353 SHA512 4ed3a38fea4ba5acd52aa44cbc36d2bb1cda1fcb304d7787754b1165eefa3d1c8da65e76bf5c33a3f524ecf43b50145f2e850c927b35f2ec754ed90ed507c54d
+EBUILD teleport-2.4.0.ebuild 1219 BLAKE2B 08b15391673d1fb70c7bbd3897a55bab447bb9eb0f2de0550bdc8d0ee2e533c1f0c9c0b0636e4401cff6c915a0df6c116c921ad7a71652a49e14c93168a61b1c SHA512 0fef7d62e254ac354c32ce125b3ede4b747216e1e324651ad92718cf6569b7d713d79ae5652a4a17a03795d84a274e6b3948a31b69cd9cf911918500d6315fcd
 EBUILD teleport-9999.ebuild 1460 BLAKE2B 8ae106a5bdf26e8b8ffe36f83719a10d7ed3e10e875ba735eedd26d09141b3a016cd5f5dacd37657db6f9c399486038a5a5f1f02ceeb507fdf29159e331ac90e SHA512 74ff9bb734b5b47ad2ac475413af8721c818293eb8166bc99887f75f3e9fa4b8e66e5abeb6fcbf58bb8a4f63db34f010d85471b1a5a7cd1c28c70e43019fa2cd
 MISC metadata.xml 630 BLAKE2B ad22bb63ecf79ddd45b62fe0dcadd6d0d7fd475938b18ec868b56b0f4afe7ee5d3e0908eb0b13249a7c7b5031a3296bec406fea6fb487069a087c9e29dcf0ef2 SHA512 2aa911f2a91bfdea340b38715d69cbe59bcd460d34ac6d1d641f2badf2ba72f4e02cdd2f8a2ca387c9a9d19ea2c22e2be80ab4bb582d9395c1517b818f343c74
diff --git a/sys-cluster/teleport/teleport-2.2.1.ebuild b/sys-cluster/teleport/teleport-2.2.1.ebuild
deleted file mode 100644
index 90fddb344c0c..000000000000
--- a/sys-cluster/teleport/teleport-2.2.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils golang-build systemd user
-
-DESCRIPTION="Modern SSH server for teams managing distributed infrastructure"
-HOMEPAGE="https://gravitational.com/teleport"
-
-EGO_PN="github.com/gravitational/${PN}/..."
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3 golang-vcs
-	EGIT_REPO_URI="https://github.com/gravitational/${PN}.git"
-else
-	inherit golang-vcs-snapshot
-	SRC_URI="https://github.com/gravitational/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-RESTRICT="test"
-
-DEPEND="
-	app-arch/zip
-	>=dev-lang/go-1.8.3"
-RDEPEND=""
-
-PATCHES=( "${FILESDIR}"/${PN}-makefile-buildflags.patch )
-
-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
-}
-
-src_install() {
-	dodir /var/lib/${PN} /etc/${PN}
-	dobin src/${EGO_PN%/*}/build/{tsh,tctl,teleport}
-
-	insinto /etc/${PN}
-	doins "${FILESDIR}"/${PN}.yaml
-
-	newinitd "${FILESDIR}"/${PN}.init.d ${PN}
-	newconfd "${FILESDIR}"/${PN}.conf.d ${PN}
-
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	systemd_install_serviced "${FILESDIR}"/${PN}.service.conf ${PN}.service
-}
-
-src_test() {
-	GOPATH="${S}" emake -C src/${EGO_PN%/*} test
-}
diff --git a/sys-cluster/teleport/teleport-2.2.4.ebuild b/sys-cluster/teleport/teleport-2.2.4.ebuild
deleted file mode 100644
index 90fddb344c0c..000000000000
--- a/sys-cluster/teleport/teleport-2.2.4.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils golang-build systemd user
-
-DESCRIPTION="Modern SSH server for teams managing distributed infrastructure"
-HOMEPAGE="https://gravitational.com/teleport"
-
-EGO_PN="github.com/gravitational/${PN}/..."
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3 golang-vcs
-	EGIT_REPO_URI="https://github.com/gravitational/${PN}.git"
-else
-	inherit golang-vcs-snapshot
-	SRC_URI="https://github.com/gravitational/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-RESTRICT="test"
-
-DEPEND="
-	app-arch/zip
-	>=dev-lang/go-1.8.3"
-RDEPEND=""
-
-PATCHES=( "${FILESDIR}"/${PN}-makefile-buildflags.patch )
-
-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
-}
-
-src_install() {
-	dodir /var/lib/${PN} /etc/${PN}
-	dobin src/${EGO_PN%/*}/build/{tsh,tctl,teleport}
-
-	insinto /etc/${PN}
-	doins "${FILESDIR}"/${PN}.yaml
-
-	newinitd "${FILESDIR}"/${PN}.init.d ${PN}
-	newconfd "${FILESDIR}"/${PN}.conf.d ${PN}
-
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	systemd_install_serviced "${FILESDIR}"/${PN}.service.conf ${PN}.service
-}
-
-src_test() {
-	GOPATH="${S}" emake -C src/${EGO_PN%/*} test
-}
diff --git a/sys-cluster/teleport/teleport-2.2.0.ebuild b/sys-cluster/teleport/teleport-2.4.0.ebuild
index 90fddb344c0c..dc7173e18dc7 100644
--- a/sys-cluster/teleport/teleport-2.2.0.ebuild
+++ b/sys-cluster/teleport/teleport-2.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,29 +18,22 @@ else
 	KEYWORDS="~amd64 ~arm"
 fi
 
+IUSE=""
 LICENSE="Apache-2.0"
+RESTRICT="test strip"
 SLOT="0"
-IUSE=""
-RESTRICT="test"
 
 DEPEND="
 	app-arch/zip
 	>=dev-lang/go-1.8.3"
 RDEPEND=""
 
-PATCHES=( "${FILESDIR}"/${PN}-makefile-buildflags.patch )
-
 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
+	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}
@@ -54,5 +47,5 @@ src_install() {
 }
 
 src_test() {
-	GOPATH="${S}" emake -C src/${EGO_PN%/*} test
+	BUILDFLAGS="" GOPATH="${S}" emake -C src/${EGO_PN%/*} test
 }