gentoo resync : 04.08.2018

11 files changed, 174 insertions, 213 deletions

diff --git a/sys-cluster/teleport/Manifest b/sys-cluster/teleport/Manifest
index 7c6035f2cc29..5e1d46a511db 100644
--- a/sys-cluster/teleport/Manifest
+++ b/sys-cluster/teleport/Manifest
@@ -1,17 +1,12 @@
-AUX teleport-2.5.init.d 940 BLAKE2B a3b5fd197e6d8e173903aac6e9db4a684a986ab7d52227d40128ec16457990e78bc8345153b3c87558d3073b6acc7337050f4d21aa9f41acde8334aae8fc1c3e SHA512 9dd26daa519e9fef30b25ef5af505b8b35d8566eaa02f0ec47a6f7805227e94eb25ffb8fd007b73e7c3a91f9e783d47391c55dd8d659d683770aa9d5a02df923
-AUX teleport-2.5.service 310 BLAKE2B 410a8ca2e1273a0b9ef1ad93f4ff21f71ecedc979e52eb4f7e1b807b5434fba2b88bd1e0a5544ac68489d6e0db641cda4d76e606bed9cc96527156088b9b088b SHA512 72a43cce5f16bbed63e3b25917d3a4d63641b735acf63975c13c3cd2624c7971f40dc697d1da0d9b94b54e675e051d0a4e863696f7ebcea14f1c4b86e9e1218b
+AUX teleport-2.6.yaml 4823 BLAKE2B ed9fc1cf1d70872fb7e0798707f4bc6b121a0ac417a5062451937240abd9f51999a8990bdf6714abd9517118aa9dc87c2bfbf4f8b8e9e309a080cc5e04f10d68 SHA512 1430a78b89fd758e967acf76c3166b9c50017d6df2f4e6e23b6e683c39e5a1e5cb13012dc218482f38abaca14d45b7df7ba0a55d1598f13dd2c46732d12f1b45
 AUX teleport.conf.d 442 BLAKE2B 089128fa5d277f5b7cda5d054a079c4cfd7990b503df2ac6818c83f79ea73b7ded2abf7eed2a66cd32394483e5494502355837e03883085db8afd92e537bfb47 SHA512 e50e3d0030e467afcfaf42c8f56ba1c0397e3dc6a445981b3f1533d7a0a9e550aabdc8bff394a5b01e44d3445b1981e2e955ea38b079386f675df8a37d7d20de
-AUX teleport.init.d 763 BLAKE2B b57826ab86550da58590546d484c78c05744699363de770e55dbb494d41f545f26f373a32959d8a67b9f04bd03e43192b4fe8b325f17fae3f4cb9149c7dbef8d SHA512 ea8803c27ed1b89615183ed17b6772726c4cc2f976bc008d6752a5d10a814e381baccd7c6cc354120b3707f351f1cc6592a9f55f6aff2010946eca9f17566f46
-AUX teleport.service 209 BLAKE2B ee1f8561ec543a9571cccd5449a276bfdb581db2bccf5f47151159670a9588fc655dcecde69fa951c9a8fb5243033a56b656663bbec94753d5f4925fecd3a3a8 SHA512 c71665c287575b1e127fdf5c580552aeb17bff55627d537999964be3a86ba2b11dce9d46bf10ab8e909c65a9d94263ced590191b7ea9e5ee2f0c3f65a044816e
+AUX teleport.init.d 940 BLAKE2B a3b5fd197e6d8e173903aac6e9db4a684a986ab7d52227d40128ec16457990e78bc8345153b3c87558d3073b6acc7337050f4d21aa9f41acde8334aae8fc1c3e SHA512 9dd26daa519e9fef30b25ef5af505b8b35d8566eaa02f0ec47a6f7805227e94eb25ffb8fd007b73e7c3a91f9e783d47391c55dd8d659d683770aa9d5a02df923
+AUX teleport.service 310 BLAKE2B 410a8ca2e1273a0b9ef1ad93f4ff21f71ecedc979e52eb4f7e1b807b5434fba2b88bd1e0a5544ac68489d6e0db641cda4d76e606bed9cc96527156088b9b088b SHA512 72a43cce5f16bbed63e3b25917d3a4d63641b735acf63975c13c3cd2624c7971f40dc697d1da0d9b94b54e675e051d0a4e863696f7ebcea14f1c4b86e9e1218b
 AUX teleport.service.conf 90 BLAKE2B 7f12f281d73ac6573c882a7910e400f901ff6392e0c576e4b7076972f4ced046f709c8898766aaf38cc38fbfcf450b526d3045ff859eed2a48e19dbd92ec3131 SHA512 d17faa0deaf3c864e5159d3567e542e36d09c6ea0ac91c663d3ae9729d1bccf7d2139f1f48fec132eccc473e023ffdaed0b8f2ee75db5dedc6ff36f637f68e1c
 AUX teleport.yaml 5177 BLAKE2B 8280b9924497af772574faad5d01351d9c49dd1916dca8e3e0384579e7628b2c0b1833b72882231bfef4ae11b2fa9820a4785393ea8c9d00aef105263bbf5c15 SHA512 f9f854472d469d0822d5766517cc68364feca4f3345a69d616d073aaaf9af7be6f72aa55c7d0c801426c3fef42714c09b884e0e086a58a07208ebef0ffe3ca80
-DIST teleport-2.4.2.tar.gz 9975909 BLAKE2B 68916e1d15f49448e918b39b2a760f90eca292b07f61e51cfe125eb99c6b36d95a528cfec40b62cd61893ce81edbf5f26066eb59063214369402e2a62d07bd5e SHA512 f9c2f923e05c8fa0b82708955c944e1bd35da2e6bf8b673832e76c91b918a4bc6d6666797faf0f7572cfaa7341991ef8937cd9b374cdc273271aff45f96b2960
-DIST teleport-2.4.5.tar.gz 9975753 BLAKE2B cdb6e577cd565cf6760d73c92cac674571e9b1257d23b280bd96428cca4e7c593738a925d3632a80fed3e0868c5f3aac79800db19bbf2a2b92d495600bf014cc SHA512 15e7e3c52c058625eb525c7c9cda00186eba037edbed89d21fb090b87c05570a1636f328260d4c7445253b0f5b81f321ce0da7d2b7fc316a0a9938ed22cc6c9c
-DIST teleport-2.5.2.tar.gz 16211219 BLAKE2B 28d0d1bb8d01fba39e79a262744b69a9df27438b9dbb0a25cd23acd57b6004a7f2309e432c0db4188c2e023a0b0299fd64723acfd57c1328d2345bba08fff4a9 SHA512 58fad4015824b9077bbd13cc3c6a994e5a54ed367264477854da7b129eea04c4cba44a580650a259b01f390a9f2028d7501df2ac4ab4821d085bbfe1cd887ec5
-DIST teleport-2.5.6.tar.gz 16216649 BLAKE2B e5ae8645d59df2684601dab5c222399d89b356592774365ffbca4e3f2d9ed745f2839902ee1e244c7b7eb300230d771daa754bbbbe29fc8e79f833715094d4f2 SHA512 fae1eb53ff45115551c5002745303cd0e9a044557e6e56cda870a57531700bb68e23b59d2930ac2dd654b200732edc3ed9432e1bc0e9dbf0e7529e980599a323
-EBUILD teleport-2.4.2.ebuild 1219 BLAKE2B 08b15391673d1fb70c7bbd3897a55bab447bb9eb0f2de0550bdc8d0ee2e533c1f0c9c0b0636e4401cff6c915a0df6c116c921ad7a71652a49e14c93168a61b1c SHA512 0fef7d62e254ac354c32ce125b3ede4b747216e1e324651ad92718cf6569b7d713d79ae5652a4a17a03795d84a274e6b3948a31b69cd9cf911918500d6315fcd
-EBUILD teleport-2.4.5.ebuild 1301 BLAKE2B ef05c9c03c79593dc3e8f220ed7f2286a579b6f4e34178497a3cb3df1763d07d5a735b8a42cac2dca54861ce5ba70d6274b8f10c45d419e316daa5b82d47b7a0 SHA512 68c288276ceb06e4b282625c27eb3a078212d8f04f55805ada66b03175f4bcf3cdbd6814ac11f81f57870781b1f87ca48b74bc7245e60ad05993e55cf25f9df6
-EBUILD teleport-2.5.2.ebuild 1324 BLAKE2B 3a9dc6602f98680351cf2d22883f50963112f4593eb6e06b189017c51894c121ef5ffd2a3370e253de2994a5052716985c00f10b95474d24a7a616e3a4b9fbb8 SHA512 1bca06688e5abb025e04e815ceefb0d210d07c6d0764f34e323eb92447773695fd28e70989cbf9dc09031115ce90d36b5b9cc525323e8eab27aa6f81a592e22a
-EBUILD teleport-2.5.6.ebuild 1345 BLAKE2B f974410cd8078ba7dc9b6498b6c1b0619eab6f3352ab564aca4dbc4e525b1ee9d6e6adbd956affc2a3345233502540a2ef6f8a8de96b5113c59047ecebedcfaf SHA512 76797812ec4b2918edc7d91ce5913b23274b74621f62f62e43faae3adeca535137766f483f371ea66a5c7e04ecdef348fd71a5defddd0ae56dda6fd954f21923
-EBUILD teleport-9999.ebuild 1460 BLAKE2B 8ae106a5bdf26e8b8ffe36f83719a10d7ed3e10e875ba735eedd26d09141b3a016cd5f5dacd37657db6f9c399486038a5a5f1f02ceeb507fdf29159e331ac90e SHA512 74ff9bb734b5b47ad2ac475413af8721c818293eb8166bc99887f75f3e9fa4b8e66e5abeb6fcbf58bb8a4f63db34f010d85471b1a5a7cd1c28c70e43019fa2cd
+DIST teleport-2.5.8.tar.gz 16219666 BLAKE2B dd64ef4ca5b26e025e46c88d58e7ec226810b583c4b740416f6cc0caec5ea7d050c732368917ec34c5f8a36c7670d2903baa6c32203a2c5cac972e3a2b4bcbbb SHA512 070eebc889adde017641a833ee0e414c5f56848ac36fa96fb66e83062212307904e8264da758042765ba13d6a0c1b4f5314c1b0e90a2c37723ef1c0aa22889be
+DIST teleport-2.6.7.tar.gz 16655508 BLAKE2B a020ab999b7503cb7aec54ed81532baf9d08b98000f2c659f63859d89f7f2b5fb311c41d6fcafb7d9bf72ea1c97eecfc6ac621b7c90d74f5afe2717edb8b0402 SHA512 45002dcf7b99108ca6fffae94d6608188eb9b0bea05cd14068618bfb11c496cad5546e261f349fee70f2acb574e7fc44093683dd991001e01406da6982c5c4c3
+EBUILD teleport-2.5.8.ebuild 1302 BLAKE2B 052c06f2b2b00694483212d92e889e38f03e8e7834afeff7b9cdecde2397c82ff5e5ea6647e0e7c6c1a364a6c88f1be1ece55a38bd2d3c6fd0f8a91ce5b69838 SHA512 d8a4fab271d5cf26f76374914186f350f2740aa3fa696776d50b25f891d46a30d03757a4a527638eb60f32a881f32bc443a56d8cf274018db526f63b6f74aba5
+EBUILD teleport-2.6.7.ebuild 1253 BLAKE2B 3bfec03d58f100e08942cc138961af2b18e517db8551b495a2882824145f85c1c2e8434343ed84583b967d60de1414214f7b14f9c9c110cbdfbdbc067e69dd1e SHA512 ab51cd95e9e3ba9bf2c032dfa808c6d7fbd7d6819d83ba8fce0fe62d118e3788d09cc469b7a0d117f8058941ed1c2ba55a7b8621d131076d84c861946ee5dccd
+EBUILD teleport-9999.ebuild 1237 BLAKE2B 8b5f4312a98799074029bbb3ccc66105ba7534434b4a553905e467114fccfb2ae0636c71fe2d6556dff2c5fa2667fe9f8e36a36df74e7bf21fa4c3ff7da85a1e SHA512 e526b41dc228bbf1143ea15e879360e94e4ad6dd10764f4d31a07eb682605247ba4d653ed3d91f0e0dc076c015c796d9a24a2ff6bccbd91c73510385ca9d3030
 MISC metadata.xml 630 BLAKE2B ad22bb63ecf79ddd45b62fe0dcadd6d0d7fd475938b18ec868b56b0f4afe7ee5d3e0908eb0b13249a7c7b5031a3296bec406fea6fb487069a087c9e29dcf0ef2 SHA512 2aa911f2a91bfdea340b38715d69cbe59bcd460d34ac6d1d641f2badf2ba72f4e02cdd2f8a2ca387c9a9d19ea2c22e2be80ab4bb582d9395c1517b818f343c74
diff --git a/sys-cluster/teleport/files/teleport-2.5.init.d b/sys-cluster/teleport/files/teleport-2.5.init.d
deleted file mode 100644
index a951ec5318a0..000000000000
--- a/sys-cluster/teleport/files/teleport-2.5.init.d
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-: ${TELEPORT_CONFDIR:=/etc/teleport}
-: ${TELEPORT_PIDFILE:=/var/run/${SVCNAME}.pid}
-: ${TELEPORT_BINARY:=/usr/bin/teleport}
-: ${TELEPORT_LOGFILE:=/var/log/teleport.log}
-
-depend() {
-	need net
-}
-
-start() {
-	ebegin "Starting Teleport SSH Service"
-		start-stop-daemon --start --exec /usr/bin/teleport \
-		--background --make-pidfile --pidfile "${TELEPORT_PIDFILE}" \
-		--stderr "${TELEPORT_LOGFILE}" \
-		-- start --config="${TELEPORT_CONFDIR}/teleport.yaml" \
-		${TELEPORT_OPTS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping Teleport SSH Service"
-		start-stop-daemon --stop --exec /usr/bin/teleport \
-		--pidfile "${TELEPORT_PIDFILE}"
-	eend $?
-}
-
-reload() {
-	checkconfig || return 1
-	ebegin "Reloading ${SVCNAME}"
-	start-stop-daemon --signal HUP \
-	    --exec "${TELEPORT_BINARY}" --pidfile "${TELEPORT_PIDFILE}"
-	eend $?
-}
diff --git a/sys-cluster/teleport/files/teleport-2.5.service b/sys-cluster/teleport/files/teleport-2.5.service
deleted file mode 100644
index 37b38210aff4..000000000000
--- a/sys-cluster/teleport/files/teleport-2.5.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Teleport SSH Service
-After=network.target
-
-[Service]
-Type=simple
-Restart=on-failure
-ExecStart=/usr/bin/teleport start --config=/etc/teleport/teleport.yaml --pid-file=/var/run/teleport.pid
-ExecReload=/bin/kill -HUP $MAINPID
-PIDFile=/var/run/teleport.pid
-
-[Install]
-WantedBy=multi-user.target
diff --git a/sys-cluster/teleport/files/teleport-2.6.yaml b/sys-cluster/teleport/files/teleport-2.6.yaml
new file mode 100644
index 000000000000..384dea937c97
--- /dev/null
+++ b/sys-cluster/teleport/files/teleport-2.6.yaml
@@ -0,0 +1,130 @@
+# By default, this file should be stored in /etc/teleport.yaml
+## IMPORTANT ##
+#When editing YAML configuration, please pay attention to how your editor handles white space. YAML requires consistent handling of tab characters
+# This section of the configuration file applies to all teleport
+# services.
+teleport:
+    # nodename allows to assign an alternative name this node can be reached by.
+    # by default it's equal to hostname
+    # nodename: graviton
+
+    # Data directory where Teleport keeps its data, like keys/users for 
+    # authentication (if using the default BoltDB back-end)
+    data_dir: /var/lib/teleport
+
+    # one-time invitation token used to join a cluster. it is not used on 
+    # subsequent starts
+    auth_token: xxxx-token-xxxx
+
+    # when running in multi-homed or NATed environments Teleport nodes need 
+    # to know which IP it will be reachable at by other nodes
+    # public_addr: 10.1.0.5
+
+    # list of auth servers in a cluster. you will have more than one auth server
+    # if you configure teleport auth to run in HA configuration
+    auth_servers: 
+        - localhost:3025
+
+    # Teleport throttles all connections to avoid abuse. These settings allow
+    # you to adjust the default limits
+    connection_limits:
+        max_connections: 1000
+        max_users: 250
+
+    # Logging configuration. Possible output values are 'stdout', 'stderr' and 
+    # 'syslog'. Possible severity values are INFO, WARN and ERROR (default).
+    log:
+        output: stderr
+        severity: ERROR
+
+    # Type of storage used for keys. You need to configure this to use etcd
+    # backend if you want to run Teleport in HA configuration.
+    storage:
+        type: bolt
+
+# This section configures the 'auth service':
+auth_service:
+    enabled: yes
+
+    # defines the types and second factors the auth server supports
+    authentication:
+        # second_factor can be off, otp, or u2f
+        second_factor: otp
+
+        # this section is only used if using u2f
+        u2f:
+            # app_id should point to the Web UI.
+            app_id: https://localhost:3080
+
+            # facets should list all proxy servers.
+            facets:
+            - https://localhost
+            - https://localhost:3080
+
+    # IP and the port to bind to. Other Teleport nodes will be connecting to
+    # this port (AKA "Auth API" or "Cluster API") to validate client 
+    # certificates 
+    listen_addr: 0.0.0.0:3025
+
+    # Pre-defined tokens for adding new nodes to a cluster. Each token specifies
+    # the role a new node will be allowed to assume. The more secure way to 
+    # add nodes is to use `ttl node add --ttl` command to generate auto-expiring 
+    # tokens. 
+    #
+    # We recommend to use tools like `pwgen` to generate sufficiently random
+    # tokens of 32+ byte length.
+    tokens:
+        - "proxy,node:xxxxx"
+        - "auth:yyyy"
+
+    # Optional "cluster name" is needed when configuring trust between multiple
+    # auth servers. A cluster name is used as part of a signature in certificates
+    # generated by this CA.
+    # 
+    # By default an automatically generated GUID is used.
+    #
+    # IMPORTANT: if you change cluster_name, it will invalidate all generated 
+    # certificates and keys (may need to wipe out /var/lib/teleport directory)
+    cluster_name: "main"
+
+# This section configures the 'node service':
+ssh_service:
+    enabled: yes
+    # IP and the port for SSH service to bind to. 
+    listen_addr: 0.0.0.0:3022
+    # See explanation of labels in "Labeling Nodes" section below
+    labels:
+        role: master
+        type: postgres
+    # List (YAML array) of commands to periodically execute and use
+    # their output as labels. 
+    # See explanation of how this works in "Labeling Nodes" section below
+    commands:
+    - name: hostname
+      command: [/usr/bin/hostname]
+      period: 1m0s
+    - name: arch
+      command: [/usr/bin/uname, -p]
+      period: 1h0m0s
+
+# This section configures the 'proxy servie'
+proxy_service:
+    enabled: yes
+    # SSH forwarding/proxy address. Command line (CLI) clients always begin their
+    # SSH sessions by connecting to this port
+    listen_addr: 0.0.0.0:3023
+
+    # Reverse tunnel listening address. An auth server (CA) can establish an 
+    # outbound (from behind the firewall) connection to this address. 
+    # This will allow users of the outside CA to connect to behind-the-firewall 
+    # nodes.
+    tunnel_listen_addr: 0.0.0.0:3024
+
+    # The HTTPS listen address to serve the Web UI and also to authenticate the 
+    # command line (CLI) users via password+HOTP
+    web_listen_addr: 0.0.0.0:3080
+
+    # TLS certificate for the HTTPS connection. Configuring these properly is 
+    # critical for Teleport security.
+    https_key_file: /etc/teleport/teleport.key
+    https_cert_file: /etc/teleport/teleport.crt
diff --git a/sys-cluster/teleport/files/teleport.init.d b/sys-cluster/teleport/files/teleport.init.d
index a5d08b7f3f69..a951ec5318a0 100644
--- a/sys-cluster/teleport/files/teleport.init.d
+++ b/sys-cluster/teleport/files/teleport.init.d
@@ -18,7 +18,7 @@ start() {
 		--stderr "${TELEPORT_LOGFILE}" \
 		-- start --config="${TELEPORT_CONFDIR}/teleport.yaml" \
 		${TELEPORT_OPTS}
-		eend $?
+	eend $?
 }
 
 stop() {
@@ -27,3 +27,11 @@ stop() {
 		--pidfile "${TELEPORT_PIDFILE}"
 	eend $?
 }
+
+reload() {
+	checkconfig || return 1
+	ebegin "Reloading ${SVCNAME}"
+	start-stop-daemon --signal HUP \
+	    --exec "${TELEPORT_BINARY}" --pidfile "${TELEPORT_PIDFILE}"
+	eend $?
+}
diff --git a/sys-cluster/teleport/files/teleport.service b/sys-cluster/teleport/files/teleport.service
index b74734bbf9ef..37b38210aff4 100644
--- a/sys-cluster/teleport/files/teleport.service
+++ b/sys-cluster/teleport/files/teleport.service
@@ -1,11 +1,13 @@
 [Unit]
 Description=Teleport SSH Service
-After=network.target 
+After=network.target
 
 [Service]
 Type=simple
-Restart=always
-ExecStart=/usr/bin/teleport start --config=/etc/teleport/teleport.yaml
+Restart=on-failure
+ExecStart=/usr/bin/teleport start --config=/etc/teleport/teleport.yaml --pid-file=/var/run/teleport.pid
+ExecReload=/bin/kill -HUP $MAINPID
+PIDFile=/var/run/teleport.pid
 
 [Install]
 WantedBy=multi-user.target
diff --git a/sys-cluster/teleport/teleport-2.4.5.ebuild b/sys-cluster/teleport/teleport-2.4.5.ebuild
deleted file mode 100644
index 7592c615c45a..000000000000
--- a/sys-cluster/teleport/teleport-2.4.5.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2018 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
-
-IUSE=""
-LICENSE="Apache-2.0"
-RESTRICT="test strip"
-SLOT="0"
-
-DEPEND="
-	app-arch/zip
-	>=dev-lang/go-1.9.2"
-RDEPEND=""
-
-src_prepare() {
-	default
-
-	sed -i -e 's/-j 4/-j 1/g' src/${EGO_PN%/*}/Makefile
-}
-
-src_compile() {
-	GOPATH="${S}" emake -j1 -C src/${EGO_PN%/*} full
-}
-
-src_install() {
-	keepdir /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() {
-	BUILDFLAGS="" GOPATH="${S}" emake -C src/${EGO_PN%/*} test
-}
diff --git a/sys-cluster/teleport/teleport-2.5.2.ebuild b/sys-cluster/teleport/teleport-2.5.2.ebuild
deleted file mode 100644
index 4b4aeb53e588..000000000000
--- a/sys-cluster/teleport/teleport-2.5.2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2018 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
-
-IUSE=""
-LICENSE="Apache-2.0"
-RESTRICT="test strip"
-SLOT="0"
-
-DEPEND="
-	app-arch/zip
-	>=dev-lang/go-1.9.2"
-RDEPEND=""
-
-src_prepare() {
-	default
-
-	sed -i -e 's/-j 3/-j 1/g' src/${EGO_PN%/*}/Makefile
-}
-
-src_compile() {
-	GOPATH="${S}" emake -j1 -C src/${EGO_PN%/*} full
-}
-
-src_install() {
-	keepdir /var/lib/${PN} /etc/${PN}
-	dobin src/${EGO_PN%/*}/build/{tsh,tctl,teleport}
-
-	insinto /etc/${PN}
-	doins "${FILESDIR}"/${PN}.yaml
-
-	newinitd "${FILESDIR}"/${PN}-2.5.init.d ${PN}
-	newconfd "${FILESDIR}"/${PN}.conf.d ${PN}
-
-	systemd_newunit "${FILESDIR}"/${PN}-2.5.service ${PN}.service
-	systemd_install_serviced "${FILESDIR}"/${PN}.service.conf ${PN}.service
-}
-
-src_test() {
-	BUILDFLAGS="" GOPATH="${S}" emake -C src/${EGO_PN%/*} test
-}
diff --git a/sys-cluster/teleport/teleport-2.5.6.ebuild b/sys-cluster/teleport/teleport-2.5.8.ebuild
index 88cd1995a47f..597ac0e391f4 100644
--- a/sys-cluster/teleport/teleport-2.5.6.ebuild
+++ b/sys-cluster/teleport/teleport-2.5.8.ebuild
@@ -2,7 +2,7 @@
 # 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"
@@ -23,9 +23,7 @@ LICENSE="Apache-2.0"
 RESTRICT="test strip"
 SLOT="0"
 
-DEPEND="
-	app-arch/zip
-	>=dev-lang/go-1.9.2"
+DEPEND="app-arch/zip"
 RDEPEND=""
 
 src_prepare() {
@@ -45,10 +43,10 @@ src_install() {
 	insinto /etc/${PN}
 	doins "${FILESDIR}"/${PN}.yaml
 
-	newinitd "${FILESDIR}"/${PN}-2.5.init.d ${PN}
+	newinitd "${FILESDIR}"/${PN}.init.d ${PN}
 	newconfd "${FILESDIR}"/${PN}.conf.d ${PN}
 
-	systemd_newunit "${FILESDIR}"/${PN}-2.5.service ${PN}.service
+	systemd_newunit "${FILESDIR}"/${PN}.service ${PN}.service
 	systemd_install_serviced "${FILESDIR}"/${PN}.service.conf ${PN}.service
 }
 
diff --git a/sys-cluster/teleport/teleport-2.4.2.ebuild b/sys-cluster/teleport/teleport-2.6.7.ebuild
index dc7173e18dc7..a187d11ee22a 100644
--- a/sys-cluster/teleport/teleport-2.4.2.ebuild
+++ b/sys-cluster/teleport/teleport-2.6.7.ebuild
@@ -2,7 +2,7 @@
 # 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"
@@ -18,18 +18,16 @@ else
 	KEYWORDS="~amd64 ~arm"
 fi
 
-IUSE=""
+IUSE="pam"
 LICENSE="Apache-2.0"
 RESTRICT="test strip"
 SLOT="0"
 
-DEPEND="
-	app-arch/zip
-	>=dev-lang/go-1.8.3"
-RDEPEND=""
+DEPEND="app-arch/zip"
+RDEPEND="pam? ( sys-libs/pam )"
 
 src_compile() {
-	GOPATH="${S}" emake -j1 -C src/${EGO_PN%/*} full
+	BUILDFLAGS="" GOPATH="${S}" emake -j1 -C src/${EGO_PN%/*} full
 }
 
 src_install() {
@@ -37,12 +35,12 @@ src_install() {
 	dobin src/${EGO_PN%/*}/build/{tsh,tctl,teleport}
 
 	insinto /etc/${PN}
-	doins "${FILESDIR}"/${PN}.yaml
+	newins "${FILESDIR}"/${PN}-2.6.yaml ${PN}.yaml
 
 	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
 }
 
diff --git a/sys-cluster/teleport/teleport-9999.ebuild b/sys-cluster/teleport/teleport-9999.ebuild
index a16c3c133705..1111454a6462 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
 }