From b284a3168fa91a038925d2ecf5e4791011ea5e7d Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Mon, 18 Nov 2019 10:15:03 +0000
Subject: gentoo resync : 18.11.2019

---
 sys-cluster/Manifest.gz                          | Bin 13542 -> 13539 bytes
 sys-cluster/ceph/Manifest                        |   2 +-
 sys-cluster/ceph/ceph-14.2.4-r1.ebuild           |   5 +-
 sys-cluster/galera/Manifest                      |  11 +-
 sys-cluster/galera/files/garb.init               |  35 +++
 sys-cluster/galera/galera-25.3.25.ebuild         |   1 +
 sys-cluster/galera/galera-25.3.26.ebuild         |   1 +
 sys-cluster/galera/galera-25.3.28.ebuild         |  90 ++++++++
 sys-cluster/galera/galera-26.4.2.ebuild          |   1 +
 sys-cluster/galera/galera-26.4.3.ebuild          |  81 +++++++
 sys-cluster/nova/Manifest                        |   3 +
 sys-cluster/nova/nova-20.0.1.ebuild              | 220 +++++++++++++++++++
 sys-cluster/openmpi/Manifest                     |  30 +--
 sys-cluster/openmpi/openmpi-1.10.7.ebuild        |   5 +-
 sys-cluster/openmpi/openmpi-1.4.3.ebuild         |   5 +-
 sys-cluster/openmpi/openmpi-1.4.5.ebuild         |   5 +-
 sys-cluster/openmpi/openmpi-1.6.5-r1.ebuild      |   8 +-
 sys-cluster/openmpi/openmpi-1.7.5-r1.ebuild      |   8 +-
 sys-cluster/openmpi/openmpi-1.8.4-r4.ebuild      |   8 +-
 sys-cluster/openmpi/openmpi-1.8.7-r1.ebuild      |   8 +-
 sys-cluster/openmpi/openmpi-1.8.8.ebuild         |   8 +-
 sys-cluster/openmpi/openmpi-2.0.2.ebuild         |   5 +-
 sys-cluster/openmpi/openmpi-2.0.4.ebuild         |   5 +-
 sys-cluster/openmpi/openmpi-2.1.6.ebuild         |   3 +-
 sys-cluster/openmpi/openmpi-3.0.4.ebuild         |   3 +-
 sys-cluster/openmpi/openmpi-3.1.4.ebuild         |   3 +-
 sys-cluster/openmpi/openmpi-4.0.1-r1.ebuild      |   3 +-
 sys-cluster/openmpi/openmpi-4.0.2.ebuild         |   3 +-
 sys-cluster/pacemaker/Manifest                   |   1 +
 sys-cluster/pacemaker/pacemaker-1.1.19-r1.ebuild |  80 +++++++
 sys-cluster/slurm/Manifest                       |   2 +
 sys-cluster/slurm/slurm-19.05.4.1.ebuild         | 266 +++++++++++++++++++++++
 sys-cluster/spark-bin/Manifest                   |   4 +-
 sys-cluster/spark-bin/spark-bin-2.3.1-r1.ebuild  |  61 ++++++
 sys-cluster/spark-bin/spark-bin-2.3.1.ebuild     |  61 ------
 sys-cluster/spark-bin/spark-bin-2.4.4-r1.ebuild  |  61 ++++++
 sys-cluster/spark-bin/spark-bin-2.4.4.ebuild     |  61 ------
 sys-cluster/teleport/Manifest                    |   4 +
 sys-cluster/teleport/teleport-4.0.10.ebuild      |  50 +++++
 sys-cluster/teleport/teleport-4.1.4.ebuild       |  50 +++++
 40 files changed, 1061 insertions(+), 200 deletions(-)
 create mode 100644 sys-cluster/galera/files/garb.init
 create mode 100644 sys-cluster/galera/galera-25.3.28.ebuild
 create mode 100644 sys-cluster/galera/galera-26.4.3.ebuild
 create mode 100644 sys-cluster/nova/nova-20.0.1.ebuild
 create mode 100644 sys-cluster/pacemaker/pacemaker-1.1.19-r1.ebuild
 create mode 100644 sys-cluster/slurm/slurm-19.05.4.1.ebuild
 create mode 100644 sys-cluster/spark-bin/spark-bin-2.3.1-r1.ebuild
 delete mode 100644 sys-cluster/spark-bin/spark-bin-2.3.1.ebuild
 create mode 100644 sys-cluster/spark-bin/spark-bin-2.4.4-r1.ebuild
 delete mode 100644 sys-cluster/spark-bin/spark-bin-2.4.4.ebuild
 create mode 100644 sys-cluster/teleport/teleport-4.0.10.ebuild
 create mode 100644 sys-cluster/teleport/teleport-4.1.4.ebuild

(limited to 'sys-cluster')

diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index c7fb88da82b5..2b4a4a6ffce5 100644
Binary files a/sys-cluster/Manifest.gz and b/sys-cluster/Manifest.gz differ
diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest
index 877c3a806de9..8ed321f8ab19 100644
--- a/sys-cluster/ceph/Manifest
+++ b/sys-cluster/ceph/Manifest
@@ -59,5 +59,5 @@ EBUILD ceph-12.2.12-r2.ebuild 8390 BLAKE2B dbbf53017559230bfc03f4cf267e325e5c2c1
 EBUILD ceph-12.2.8-r1.ebuild 7886 BLAKE2B e99590739ce73d96895c282108d3b945bb0e13bdb73e34b06d2da5c9e7d74dc4fdceddfb6330a106b775c612c7cca6b67325b83389f1c6d5af712e59a6f1fd55 SHA512 ab8d2a1ee7c4a7d7179f81e18dc601a18da365663351d88cf6dfee32e2aaaf40412bc2fde98d7c07012f79f8b6c19bac773ef97b872a32b663748ce41a5954c1
 EBUILD ceph-13.2.5-r4.ebuild 9007 BLAKE2B fc84d7fee8572582743979cd3da76cdd337667843410f8efb167ec80442d006b6d4c1c947ffeeb9c6265c47116a6cf15a012f4277c619cb55ad942b0e95f6cdb SHA512 eec2780a80d98b3a535a33c86efaae4112605b8c6e220b61beb9956ece895a8807024fe71f86b626c89b3ca8af3b94a4c0e990c47e9951cc31490a90c1841ff3
 EBUILD ceph-13.2.6.ebuild 9133 BLAKE2B d5990d637edaa460b90eadc0b97c8952b2e7688c4916f0978bb15e9c2b99c206f3be5c2f57ded889393e5ba32fa63bf08a89138ea96a7045b6a47a3cd59d0381 SHA512 7a510c208b8b15fe124aafba24d25c0f181bc2ff61710d274e59c383f5d0a27ef83fbbd6b19e1020953887a0a4221769d88e8f75e720d0af3fa93ba5d9c50792
-EBUILD ceph-14.2.4-r1.ebuild 9945 BLAKE2B f5aa6e5f8341fd59eb697bf876e86515b48c9ede34286c0c3b0241f1f5ca26178f29d6c0080de56306fd522dfd49722472d444116db5af929fc220a7623edff0 SHA512 de6c0549824599cd43984794a2ccff68cf3526cadb53a87f743eda5ac9be759664eff0b478dfdda2a7645da4b24c3a3b39757d707bc981c9a6103bf07270990a
+EBUILD ceph-14.2.4-r1.ebuild 10019 BLAKE2B 2429f9e8a00619a84061448a90445913bb8134d203ad539a2f68d851de095ab5362eb99d8b10378fb7ef3f9ad3b8702d36135866f02c30df499b6094d9f89cac SHA512 fe643c2b3f36152b54fd843da858bac2103d762cb3928a57c7d63f64051a9859160906ce1dd61b5e9afe47029e8ec22c8f79808042ba721665624ea9fa151e26
 MISC metadata.xml 1588 BLAKE2B c3a1f7afa0e61fc589e60ec00bc1702a6f953bbbbc1ab6a8582fe08bad9f6af9217350641399bc7de4dfb69a79ee0e41b46d971eef53348f3b568c6dcd439273 SHA512 ac2196349f897b7dfafaa924cda3f4eb094233bd04e7949b9f8fafd135775202c3c1bdc11cc4a931e752fb40b9d1c86524cdd849a23d364e4f2aa240bbdf1250
diff --git a/sys-cluster/ceph/ceph-14.2.4-r1.ebuild b/sys-cluster/ceph/ceph-14.2.4-r1.ebuild
index b5c3ff61473f..b56ddd9c3f0c 100644
--- a/sys-cluster/ceph/ceph-14.2.4-r1.ebuild
+++ b/sys-cluster/ceph/ceph-14.2.4-r1.ebuild
@@ -348,8 +348,9 @@ src_install() {
 	python_fix_shebang "${ED}"/usr/{,s}bin/
 
 	# python_fix_shebang apparently is not idempotent
-	sed -i -r  's:(/usr/lib/python-exec/python[0-9]\.[0-9]/python)[0-9]\.[0-9]:\1:' \
-		"${ED}"/usr/sbin/{mount.*,ceph-volume{,-systemd}} || die "sed failed"
+	local shebang_regex='(/usr/lib/python-exec/python[0-9]\.[0-9]/python)[0-9]\.[0-9]'
+	grep -r -E -l --null "${shebang_regex}" "${ED}"/usr/{s,}bin/ \
+		| xargs --null --no-run-if-empty -- sed -i -r  "s:${shebang_regex}:\1:" || die
 
 	local -a rados_classes=( "${ED}/usr/$(get_libdir)/rados-classes"/* )
 	dostrip -x "${rados_classes[@]#${ED}}"
diff --git a/sys-cluster/galera/Manifest b/sys-cluster/galera/Manifest
index ad2ed195bd59..b1bab2f149c0 100644
--- a/sys-cluster/galera/Manifest
+++ b/sys-cluster/galera/Manifest
@@ -1,11 +1,16 @@
 AUX galera-3.15-strip-extra-cflags.patch 2397 BLAKE2B 7d1d9e7b775e8ee26da152fb42c4b19e65e1084e471d4c7613a661206ee05fa280c29266be4ae66c0b1001de3062a6396c3b45917fcf3d4090b8afe229a7e680 SHA512 4f41398faaa138543ff6fd24b2aac9aa329dabf74d6355ea5c620db64e3112e27e17c15bf7e1dae1e7ddbe92795cedd65a9d6e52bd07b66f3fe27dde2ffc7cad
 AUX galera-4.1-strip-extra-cflags.patch 2747 BLAKE2B 314e020bdbce2d3080d28c4d5bf5ad438affc8075736c38b77d713e59749a4eabce3a38b6c918b1768f48b99ec5c860813c3441291d0834ebf6d6ed545d30576 SHA512 0458705897861d4bc225326077ae379fb1c921aa65a102a24f2fba5c866c52a549c47bed929801c06ebb0c484136c1179a56b2fd750abd6aabc7a6a74fc18c2f
 AUX garb.cnf 612 BLAKE2B 6597e77fd29aacece48e89217004abc62ecaf7f6477b62d5a29ff1c3b5f18dca3cfbe6a4a115c324c945f6949e8fe227b8b9e4e94816d48eda53e9e2723100e5 SHA512 97b921109b242ad1a19326564b5f9da8a09eadd4771c2c86c727c1c30e35f92ffadbb38ce7d81bc88572d2c7b04466ad212432954e09d81417c4ed7f69ec4648
+AUX garb.init 840 BLAKE2B f492ad2db62515ca13ac88fb6e1dba01db950fe7104b7f4bc039ada9d0205bdbf8d11e489eb4cf2a9c5f30096654a9ae2aa5d1582f2149753cf3a1cc1b17e7b2 SHA512 d677be3e2ad2d718497bff25a23d44615731f6422907811ca59d89873f891208888b7eab6bc349a1e77ea00e51aa3d903c86227cb6cf4fa39d478c3619caaa4d
 AUX garb.sh 1029 BLAKE2B 452a4f3bf50b25f040784e03d428ba10a3580cee486a5cb283db90bee4bcefe951813fbfd4e38024fb05d1681adb74a697dfe48c4d0c47aaddf094204a818a95 SHA512 780eb8e7584d31ce24559e46724c7b981320f4706af0b9f0cd8d157247f853f51d3980178d0d234f64bcb097a4ee5493fe299d6800513403dbc7e0184c020902
 DIST galera-25.3.26.tar.gz 3386588 BLAKE2B ca78a32dbaa6fd9eb46c40ddb26c97c788e529ad44040b4f720099b7aef2cee13631663cc5ecb7153288c12e7b4b156f988ff56633885e7ee75a0664cb1a90d4 SHA512 c462e70e8394ac4cfebca94320199ca4e012db100369788f3efdf1a04a8185908954e575fdb5714524931feeea432c2ed6f8d6ff985b1a47bdb16b4c4f54bdc4
+DIST galera-25.3.28.tar.gz 3390722 BLAKE2B 4e399b0f00c7303c11622c3807bc8a7b9b3b5c7747175560905b68abb67d557dde752019c313ba1de961ac2970fbf89d277583ee9c55c142cb1822873d7ab611 SHA512 8ff135022e820fc6a1d33ea1fa6e8677702ed7a7fbf460d45c28cdfe287c666949027989c3152311641debf183f3e8062f561c9935e51d3355df8ba087c5d132
 DIST galera-26.4.2.tar.gz 3499538 BLAKE2B 4531b246da119528192ce85364a344f56aeb83b05b6de0a87fed5cb34f7e23497b9576e4014899c58af23d045501989ccdb51a25ee27b4e32aeb5d1be1054115 SHA512 6c500dbcdc9156421c628c842a00985b3e7c440ad2facbd893f98c846426bf0607ca28152fef99a587146cefb376883ef083d498562d96fcedecf4935a3d466f
+DIST galera-26.4.3.tar.gz 3507925 BLAKE2B fb15724dd1477cbabffe6d76e6fee0425a86d335289a61e8b3fbb51b5dd84f8a6259d3ce1cf808fb5b2f2299c2b9f28988a87d0dc67667a02a53e12ba911d976 SHA512 857c6b1965871a5801d3cd7396fec8259e0b72a397b5fb92e63f374531fdb03dbecd5d5ebfdf2f0dc388d87c0ae25b357d02581c8d5889803d04c0a2f2583b52
 DIST galera-3-25.3.25.tar.gz 3373347 BLAKE2B 892c5824d88d7ceb0db16f72d9fad9ac7074435a6cacf3fea1599af0be811cc1a0b476d0a15353d0cf854a201ca5e60808392a41125c780bd97b844a4fd55216 SHA512 bc9f02c796c7289034f5b285a8f6a0e668c78302546b47c70cbe3927467993baae8835cf54978fb5276251a6d04a84d6952eaee4e6c7c5fd488543fd53d07b03
-EBUILD galera-25.3.25.ebuild 1894 BLAKE2B 966c5c85e5b66b34223acf4e3c1a4451605259c19e0698068cb36ca80beff80d2b47d93bc111adb9061230cb1163b93248e09c72c33265da4ca464c3de814a66 SHA512 de45fd6c64e0329563d4e2e6b8aefda5c81d839359b37366c8f958613d5cb1c2723f8900848a7caa67492832394fb4cbb13c6e512b2ca3435cdee7093f2c826d
-EBUILD galera-25.3.26.ebuild 1913 BLAKE2B 928d84e64eaf0691173b9ebe663c66d2b91635ef818bb12bac0b720393686d0500727226fb99e8e02568feb39ed91964029d278fdcda7389c072194af8eb713c SHA512 c17cac0dd0c4f8c5e7915c20dcc81db99651acb93edf65858947478f3a52f1668ac880180519600a85cc2f296c3e17b92d2f316a2d4ad3283d169bff711037ed
-EBUILD galera-26.4.2.ebuild 1867 BLAKE2B 152c033d2433d8b0d33d30303511b6cff76de88fc3e43a443718be02efec11b3f6d76ae005deffd826e3da15ee2593759bda087d25ce539636d0f8e56f99add7 SHA512 c1671876dd299d5b935cd17ad91af04414bf0cee2a2ecaab0f317c84c617f3e87e27939b21bc7792f10927c325172c4b93eb68beccd3427f5eeacbbe01b1d488
+EBUILD galera-25.3.25.ebuild 1921 BLAKE2B ba3f24609c661cb8372faa296c7a5b1ac6f0e321cd044e5227e2112060d7f72b38c89cda9b97081815789b47774324a145b652426dffcef9f14037a429af5a21 SHA512 c5ee0331c7ea348a6d59c78d09d214413711e2711de6d68ad29f704b6be8c7b8517f7cb317e51d226995cd9e2304ad5afdc544ddca805ff9eccde1a8569fbeb3
+EBUILD galera-25.3.26.ebuild 1940 BLAKE2B 30f4214e8457bbe5657063ba12fa37f16888ee4928d094689070c0272fbd2471147d7c8b604db61174054c1baf0a19179ff001113445fc31c4df30be29019d57 SHA512 9d13b8300d0d907d8289c4b7e72dfeba11218aac66b60fb1b235a5d16f22592be90fdf9984ecd2dafa58e66c95c6f01877ff690539e7f73bbc9da974a2319da0
+EBUILD galera-25.3.28.ebuild 1940 BLAKE2B 1fef8ac231b929fb4e3dceb990ca65249ffe4b7f40c69f34e01c9e73fae6749a0c8ad2ef51122a8c825f0f95098f69ef05471fba6559e1a56b2b4843d2aa4122 SHA512 05eb56bbd931349018a8e4dae326ddc62b27b56ff5b81a9c10b7ad354298c8b2411520edc2fc12e2a35267d14b6b80918ebf2032001c7286267bf3a0c9bde2ab
+EBUILD galera-26.4.2.ebuild 1894 BLAKE2B e2e663253b96ae48fab2e5209a42a9a3b966a4c29304857922af862707548e0db8a88480857faf86a9507f71ebb287784a2d1f8e2b7e7016af5b8171b0a696e0 SHA512 76c27d5ea4fae06c388c6f22a8fd5e80c6dac7f319b8dff70804e890064e44f63737d1b82d1b83e479a6eefd8bd652e99b2c8ede2d77f6a20ae69513a4a5dc11
+EBUILD galera-26.4.3.ebuild 1798 BLAKE2B df2a27c02c1516f27cf58b10b176bac225317c7b005dabe9ab3f52cb0822b90812bf9e420f66ab8b6f39d0182062942382a965af64a27372a9f76af1413dfdd2 SHA512 f31d82807ffeeae6a641e92386ccf7f174bf2bb55c44785308acca02a5b761028e90bac9f7c437856a4470371412c315b1fb54e52de6b0ba1a3e8779c72eb22c
 MISC metadata.xml 462 BLAKE2B 1b0826bcb2bd93caa5f017b3c530d3bea18daac9f457dc79d6436d21f41b8c33d2979469df870cbc68428ba0110d17013bf9cd82f4f46d9be43bf996f7815e0c SHA512 b99987e53ae976905d3e493b09cbe35161f90b8ebfc88c4a9616b8722b0a0005c2427d509e15fdd7bbb30977266188452b3b6ec7479a943bce3a5922410246e2
diff --git a/sys-cluster/galera/files/garb.init b/sys-cluster/galera/files/garb.init
new file mode 100644
index 000000000000..5bf57a7a683e
--- /dev/null
+++ b/sys-cluster/galera/files/garb.init
@@ -0,0 +1,35 @@
+#!/sbin/openrc-run
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+command="/usr/bin/garbd"
+pidfile="${PIDFILE:-/var/run/garbd}"
+command_background="yes"
+command_args=""
+command_user="nobody"
+
+depend() {
+	use net
+	after mysql
+}
+
+start_pre() {
+	if [ -z "${GALERA_NODES}" ]; then
+		eerror "List of GALERA_NODES is not configured"
+		return 1
+	fi
+
+	if [ -z "${GALERA_GROUP}" ]; then
+		eerror "GALERA_GROUP name is not configured"
+		return 1
+	fi
+
+	GALERA_PORT=${GALERA_PORT:-4567}
+
+	local OPTIONS="-a gcomm://${GALERA_NODES// /,} -g ${GALERA_GROUP}"
+	[ -n "${GALERA_OPTIONS}" ] && OPTIONS="${OPTIONS} -o ${GALERA_OPTIONS}"
+	[ -n "${LOG_FILE}" ]       && OPTIONS="${OPTIONS} -l ${LOG_FILE}"
+	[ -n "${NODE_NAME}" ]      && OPTIONS="${OPTIONS} -n ${NODE_NAME}"
+
+	command_args="${OPTIONS}"
+}
diff --git a/sys-cluster/galera/galera-25.3.25.ebuild b/sys-cluster/galera/galera-25.3.25.ebuild
index ea4bc722561c..a067a4a0b4e1 100644
--- a/sys-cluster/galera/galera-25.3.25.ebuild
+++ b/sys-cluster/galera/galera-25.3.25.ebuild
@@ -17,6 +17,7 @@ SLOT="0"
 
 KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ppc64 x86"
 IUSE="cpu_flags_x86_sse4_2 garbd test"
+RESTRICT="!test? ( test )"
 
 CDEPEND="
 	dev-libs/openssl:0=
diff --git a/sys-cluster/galera/galera-25.3.26.ebuild b/sys-cluster/galera/galera-25.3.26.ebuild
index cb0e18917305..f0d9ad274790 100644
--- a/sys-cluster/galera/galera-25.3.26.ebuild
+++ b/sys-cluster/galera/galera-25.3.26.ebuild
@@ -17,6 +17,7 @@ SLOT="0"
 
 KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
 IUSE="cpu_flags_x86_sse4_2 garbd test"
+RESTRICT="!test? ( test )"
 
 CDEPEND="
 	dev-libs/openssl:0=
diff --git a/sys-cluster/galera/galera-25.3.28.ebuild b/sys-cluster/galera/galera-25.3.28.ebuild
new file mode 100644
index 000000000000..22212d135640
--- /dev/null
+++ b/sys-cluster/galera/galera-25.3.28.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+
+MY_P="${PN}-3-${PV}"
+
+inherit python-any-r1 scons-utils toolchain-funcs user flag-o-matic
+DESCRIPTION="Synchronous multi-master replication engine that provides the wsrep API"
+HOMEPAGE="http://galeracluster.com"
+SRC_URI="http://nyc2.mirrors.digitalocean.com/mariadb/mariadb-10.3.20/${P}/src/${P}.tar.gz"
+LICENSE="GPL-2 BSD"
+
+SLOT="0"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="cpu_flags_x86_sse4_2 garbd test"
+RESTRICT="!test? ( test )"
+
+CDEPEND="
+	dev-libs/openssl:0=
+	>=dev-libs/boost-1.41:0=
+	"
+BDEPEND=">=sys-devel/gcc-4.4"
+DEPEND="${BDEPEND}
+	${CDEPEND}
+	dev-libs/check
+	>=dev-cpp/asio-1.10.1[ssl]
+	<dev-cpp/asio-1.12.0
+	"
+#Run time only
+RDEPEND="${CDEPEND}"
+
+#S="${WORKDIR}/${MY_P}"
+# Respect {C,LD}FLAGS.
+PATCHES=( "${FILESDIR}/galera-4.1-strip-extra-cflags.patch" )
+
+pkg_preinst() {
+	if use garbd ; then
+		enewgroup garbd
+		enewuser garbd -1 -1 -1 garbd
+	fi
+}
+
+src_prepare() {
+	default
+
+	# Remove bundled dev-cpp/asio
+	rm -r "${S}/asio" || die
+
+	#Remove optional garbd daemon
+	if ! use garbd ; then
+		rm -r "${S}/garb" || die
+	fi
+}
+
+src_configure() {
+	tc-export CC CXX
+	# Uses hardware specific code that seems to depend on SSE4.2
+	if use cpu_flags_x86_sse4_2 ; then
+		append-cflags -msse4.2
+	else
+		append-cflags -DCRC32C_NO_HARDWARE
+	fi
+	# strict_build_flags=0 disables -Werror, -pedantic, -Weffc++,
+	# and -Wold-style-cast
+	MYSCONS=(
+		tests=$(usex test 1 0)
+		strict_build_flags=0
+		system_asio=1
+	)
+}
+
+src_compile() {
+	escons --warn=no-missing-sconscript "${MYSCONS[@]}"
+}
+
+src_install() {
+	dodoc scripts/packages/README scripts/packages/README-MySQL
+	if use garbd ; then
+		dobin garb/garbd
+		newconfd "${FILESDIR}/garb.cnf" garbd
+		newinitd "${FILESDIR}/garb.sh" garbd
+		doman man/garbd.8
+	fi
+	exeinto /usr/$(get_libdir)/${PN}
+	doexe libgalera_smm.so
+}
diff --git a/sys-cluster/galera/galera-26.4.2.ebuild b/sys-cluster/galera/galera-26.4.2.ebuild
index 1e75a442128e..a270153de4f6 100644
--- a/sys-cluster/galera/galera-26.4.2.ebuild
+++ b/sys-cluster/galera/galera-26.4.2.ebuild
@@ -16,6 +16,7 @@ SLOT="0"
 
 KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
 IUSE="cpu_flags_x86_sse4_2 garbd test"
+RESTRICT="!test? ( test )"
 
 CDEPEND="
 	dev-libs/openssl:0=
diff --git a/sys-cluster/galera/galera-26.4.3.ebuild b/sys-cluster/galera/galera-26.4.3.ebuild
new file mode 100644
index 000000000000..19657aed1251
--- /dev/null
+++ b/sys-cluster/galera/galera-26.4.3.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+
+inherit python-any-r1 scons-utils toolchain-funcs flag-o-matic
+
+DESCRIPTION="Synchronous multi-master replication engine that provides the wsrep API"
+HOMEPAGE="http://galeracluster.com"
+SRC_URI="http://nyc2.mirrors.digitalocean.com/mariadb/mariadb-10.4.10/${P}/src/${P}.tar.gz"
+LICENSE="GPL-2 BSD"
+
+SLOT="0"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="cpu_flags_x86_sse4_2 garbd test"
+RESTRICT="!test? ( test )"
+
+CDEPEND="
+	dev-libs/openssl:0=
+	>=dev-libs/boost-1.41:0=
+	"
+BDEPEND=">=sys-devel/gcc-4.4"
+DEPEND="${BDEPEND}
+	${CDEPEND}
+	dev-libs/check
+	>=dev-cpp/asio-1.10.1[ssl]
+	<dev-cpp/asio-1.12.0
+	"
+#Run time only
+RDEPEND="${CDEPEND}"
+
+# Respect {C,LD}FLAGS.
+PATCHES=( "${FILESDIR}/galera-4.1-strip-extra-cflags.patch" )
+
+src_prepare() {
+	default
+
+	# Remove bundled dev-cpp/asio
+	rm -r "${S}/asio" || die
+
+	#Remove optional garbd daemon
+	if ! use garbd ; then
+		rm -r "${S}/garb" || die
+	fi
+}
+
+src_configure() {
+	tc-export CC CXX
+	# Uses hardware specific code that seems to depend on SSE4.2
+	if use cpu_flags_x86_sse4_2 ; then
+		append-cflags -msse4.2
+	else
+		append-cflags -DCRC32C_NO_HARDWARE
+	fi
+	# strict_build_flags=0 disables -Werror, -pedantic, -Weffc++,
+	# and -Wold-style-cast
+	MYSCONS=(
+		tests=$(usex test 1 0)
+		strict_build_flags=0
+		system_asio=1
+	)
+}
+
+src_compile() {
+	escons --warn=no-missing-sconscript "${MYSCONS[@]}"
+}
+
+src_install() {
+	dodoc scripts/packages/README scripts/packages/README-MySQL
+	if use garbd ; then
+		dobin garb/garbd
+		newconfd "${FILESDIR}/garb.cnf" garbd
+		newinitd "${FILESDIR}/garb.init" garbd
+		doman man/garbd.8
+	fi
+	exeinto /usr/$(get_libdir)/${PN}
+	doexe libgalera_smm.so
+}
diff --git a/sys-cluster/nova/Manifest b/sys-cluster/nova/Manifest
index 37687c11f091..1c40f2d2d854 100644
--- a/sys-cluster/nova/Manifest
+++ b/sys-cluster/nova/Manifest
@@ -6,15 +6,18 @@ AUX scsi-openscsi-link.sh 2777 BLAKE2B 84c14df2b1c49fe6210a4abf4387229aaa4fcd0c9
 DIST nova-18.2.3.tar.gz 11450952 BLAKE2B 1e0b0afefe8281ab9024394194697d3aea81169da7a003a07890dfc11bd38511d39315152dab1b9a1d17b2d1c8109102112b245957e727d053de7fd67ad0c757 SHA512 1dcb3fa2ea80afcd5739efad01f3d65723a754fc8d79639e54cd3fbd6e4e4125593799a123b4572c63f8c074a10c244d91814f15d2c7135066d55cd2a991f7fc
 DIST nova-19.0.3.tar.gz 11646820 BLAKE2B 31aa6ef44609f5698f24168fc79cd9c6d5dd2c5b0da5eed277ccd8d1aa4ee7d6a07a1318bd7f964dd141dbca8f0297a2d677ad2fdf949fcc7a72970d099197e9 SHA512 4869d705c165a909e13b27ac383b7be52f9d5925fbe9d8779f773d0b1ce87b6ae7642c4551e01f57c24221e6fe120a3e2b5de41d73dfdcd73f82252b48a2af39
 DIST nova-20.0.0.tar.gz 11585568 BLAKE2B 950fe23bfae72f9c960ef8f3929c077293fdf55f9e0400e6567643c418df648495223d0ac7f736d6c64c2c44f88939d689a6069a4ddf78705c11d250022c8211 SHA512 8d1a961a4ec4e2567de6b16d35fa008472759d4e3d29d06927b1bd23e928478bf40f90619c950e70f38203f75eec7b024c7336bab24a7dad4892ce5111fb1f37
+DIST nova-20.0.1.tar.gz 11587774 BLAKE2B 62f7b6d4ab83533e4462f16978a2f95ceca3d6594029f87dbb170f3abc19917a4449ec95b007adae16c2e290649a560404d12e738a83bc8ad4bbbc1a4554d074 SHA512 3c83a1061696bb6e830e1e518ceea5e5b6405673373df674926b8c01955ea71714bf484906db3dc556209fb895c052003b54477d6a2791df0905244abbf9abe0
 DIST nova.conf.sample-18.2.3 387334 BLAKE2B a51b8cdc644ee60390cde3a30ba8f64a339695887b57b2640da39b5a8d34dfec51664b1249955a6cf9202ae19e8e0a8bcd805d4b87d2f6c99a5a6294cc955577 SHA512 be9fbab15ea1cac6d3cd1d186aab904454ef17801f9f4b2f1a37c6e46b4c69fed22a7724846049ebd343beff7753d8db408abae52ad3fca0693d70414c6afc61
 DIST nova.conf.sample-19.0.3 387769 BLAKE2B 2b4668e78765469c5ee518a8c340a09407a8f7e9bf3f87a6919b820db0ce2f38499827dbea58994490c8db3a648eef2c95521f7c62b3ae37606bb249492b4b12 SHA512 4facb96c111945f472654788e1ac3d52808b0c45e36c87b873cd1355d36b71922fa94b11d66ec5a8b250739072ecdec394dd4f852a8eb57dbd900c61c71ba770
 DIST nova.conf.sample-20.0.0 220110 BLAKE2B af98687c895ee091cc2e8d668eb50b52cc94618081f8a50b544faebed29b2b3a5dfa38309da70dcc6d0083792605b810081b50c15a6c960947e0c782f25717ab SHA512 cc6cce95943b06d60dfc1f85b87d527662eeb57388dca4a6037078b517302b86fd7f752c6e9e43c59c10be83ac5955f21c08284bbc946ffe2171f5bfa6edff38
+DIST nova.conf.sample-20.0.1 220110 BLAKE2B af98687c895ee091cc2e8d668eb50b52cc94618081f8a50b544faebed29b2b3a5dfa38309da70dcc6d0083792605b810081b50c15a6c960947e0c782f25717ab SHA512 cc6cce95943b06d60dfc1f85b87d527662eeb57388dca4a6037078b517302b86fd7f752c6e9e43c59c10be83ac5955f21c08284bbc946ffe2171f5bfa6edff38
 DIST nova.conf.sample-2018.2.9999 387334 BLAKE2B a51b8cdc644ee60390cde3a30ba8f64a339695887b57b2640da39b5a8d34dfec51664b1249955a6cf9202ae19e8e0a8bcd805d4b87d2f6c99a5a6294cc955577 SHA512 be9fbab15ea1cac6d3cd1d186aab904454ef17801f9f4b2f1a37c6e46b4c69fed22a7724846049ebd343beff7753d8db408abae52ad3fca0693d70414c6afc61
 DIST nova.conf.sample-2019.1.9999 387769 BLAKE2B 2b4668e78765469c5ee518a8c340a09407a8f7e9bf3f87a6919b820db0ce2f38499827dbea58994490c8db3a648eef2c95521f7c62b3ae37606bb249492b4b12 SHA512 4facb96c111945f472654788e1ac3d52808b0c45e36c87b873cd1355d36b71922fa94b11d66ec5a8b250739072ecdec394dd4f852a8eb57dbd900c61c71ba770
 DIST nova.conf.sample-2019.2.9999 220110 BLAKE2B af98687c895ee091cc2e8d668eb50b52cc94618081f8a50b544faebed29b2b3a5dfa38309da70dcc6d0083792605b810081b50c15a6c960947e0c782f25717ab SHA512 cc6cce95943b06d60dfc1f85b87d527662eeb57388dca4a6037078b517302b86fd7f752c6e9e43c59c10be83ac5955f21c08284bbc946ffe2171f5bfa6edff38
 EBUILD nova-18.2.3.ebuild 9493 BLAKE2B 1b9ec29a2a6ff3eb43933d2871d5c7c2caec586cbd2e15df1b79e98a39e852de164b43647c1c00ff2a3557d39c6b697686bee3a3c53a9201a8b0726e88406356 SHA512 fbb3e4561c7b5ff86da1216ad3ab9e891da0564ce77b290d1abeec910a13738da14b46caf902ddf388513f835e15dd0774811ec885ba6b919894db349c9a7b57
 EBUILD nova-19.0.3.ebuild 9582 BLAKE2B 285306242428951b117928d492e8babe5786e03e4065e8556395c7cf67afaea3c10d04acc6cb74907a23aa44535b4c8661635dafe0727ade47fdae1359395a38 SHA512 9d61543f6809972a18843d122a3c098f956f27f1954e179fb0bbe235c974bc01c255c400563b4c21d4ffcb991174792548991c402aebedb76851d05cb9c15486
 EBUILD nova-20.0.0.ebuild 7910 BLAKE2B bd87a12c33c67dcf08318ea0db235150ed3594018a5e2e18c05c17e789f44fc67c8714ee0bd541390c6bf2ec5877fb520b01ad73a4e4755e240522c40354133c SHA512 116e616c76ffadb59df78d5dae314daaf77b52494a616b5ec1104cc35fff78fe80cb020d64341b1a2f20a81e526a2a54f3921021c99bcb1384a69ede007450c3
+EBUILD nova-20.0.1.ebuild 7910 BLAKE2B bd87a12c33c67dcf08318ea0db235150ed3594018a5e2e18c05c17e789f44fc67c8714ee0bd541390c6bf2ec5877fb520b01ad73a4e4755e240522c40354133c SHA512 116e616c76ffadb59df78d5dae314daaf77b52494a616b5ec1104cc35fff78fe80cb020d64341b1a2f20a81e526a2a54f3921021c99bcb1384a69ede007450c3
 EBUILD nova-2018.2.9999.ebuild 9496 BLAKE2B c962c25fe0107327d30eb0fde3163e4722763db4e2b3b0ff0250f9dbee071807db7a5dd9404e4425d758cb6408efafa571f79fa50cd0756355ca6754513668e6 SHA512 62756e826de4bed6fa6d185e92defe459e9e32ca53b7b860c882896e0dd306d04918cd932c25311d0700ccefc3effb16e5fadcc4e17d7e2074088d90e3f49734
 EBUILD nova-2019.1.9999.ebuild 9354 BLAKE2B 92302f07eb36bcf62aaefaa51cec5795692823fa886978c70bbbcae000fa46f6b4baeb355831fa58bc8a9bd8fd57fe4dde23c7d50a250d6492c080929979c375 SHA512 cca0284a3e11f5b4509bc755e1390aa383809d8acb7baaa40345d41d09da9222ac7aa968fe14fa95528268410a1bc5f474c3acc7145256709109a4c26278ebd4
 EBUILD nova-2019.2.9999.ebuild 7910 BLAKE2B bd87a12c33c67dcf08318ea0db235150ed3594018a5e2e18c05c17e789f44fc67c8714ee0bd541390c6bf2ec5877fb520b01ad73a4e4755e240522c40354133c SHA512 116e616c76ffadb59df78d5dae314daaf77b52494a616b5ec1104cc35fff78fe80cb020d64341b1a2f20a81e526a2a54f3921021c99bcb1384a69ede007450c3
diff --git a/sys-cluster/nova/nova-20.0.1.ebuild b/sys-cluster/nova/nova-20.0.1.ebuild
new file mode 100644
index 000000000000..01dac558c9cb
--- /dev/null
+++ b/sys-cluster/nova/nova-20.0.1.ebuild
@@ -0,0 +1,220 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit distutils-r1 eutils linux-info multilib user
+
+DESCRIPTION="Cloud computing fabric controller (main part of an IaaS system) in Python"
+HOMEPAGE="https://launchpad.net/nova"
+
+if [[ ${PV} == *9999 ]];then
+	inherit git-r3
+	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/train/nova.conf.sample -> nova.conf.sample-${PV}"
+	EGIT_REPO_URI="https://github.com/openstack/nova.git"
+	EGIT_BRANCH="stable/train"
+else
+	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/train/nova.conf.sample -> nova.conf.sample-${PV}
+	https://tarballs.openstack.org/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="+compute compute-only iscsi +memcached +mysql +novncproxy openvswitch postgres +rabbitmq sqlite"
+REQUIRED_USE="
+	!compute-only? ( || ( mysql postgres sqlite ) )
+	compute-only? ( compute !rabbitmq !memcached !mysql !postgres !sqlite )"
+
+CDEPEND="
+	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
+DEPEND="
+	${CDEPEND}
+	app-admin/sudo"
+
+RDEPEND="
+	${CDEPEND}
+	compute-only? (
+		>=dev-python/sqlalchemy-1.2.19[${PYTHON_USEDEP}]
+	)
+	sqlite? (
+		>=dev-python/sqlalchemy-1.2.19[sqlite,${PYTHON_USEDEP}]
+	)
+	mysql? (
+		>=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
+		!~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.2.19[${PYTHON_USEDEP}]
+	)
+	postgres? (
+		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.2.19[${PYTHON_USEDEP}]
+	)
+	>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
+	>=dev-python/eventlet-0.20.0[${PYTHON_USEDEP}]
+	!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.10[${PYTHON_USEDEP}]
+	>=dev-python/keystonemiddleware-4.17.0[${PYTHON_USEDEP}]
+	>=dev-python/lxml-2.4.1[${PYTHON_USEDEP}]
+	!~dev-python/lxml-3.7.0[${PYTHON_USEDEP}]
+	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-2.7[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.8.2[${PYTHON_USEDEP}]
+	>=dev-python/greenlet-0.4.10[${PYTHON_USEDEP}]
+	!~dev-python/greenlet-0.4.14[${PYTHON_USEDEP}]
+	>=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
+	>=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
+	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
+	>=dev-python/paramiko-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
+	virtual/python-enum34[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}]
+	>=dev-python/python-cinderclient-3.3.0[${PYTHON_USEDEP}]
+	!~dev-python/python-cinderclient-4.0.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.16.0[${PYTHON_USEDEP}]
+	>=dev-python/python-neutronclient-6.7.0[${PYTHON_USEDEP}]
+	>=dev-python/python-glanceclient-2.8.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	>=dev-python/websockify-0.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-cache-1.26.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-6.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-reports-1.18.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.21.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-upgradecheck-0.1.1[${PYTHON_USEDEP}]
+	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.40.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-4.44.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-rootwrap-5.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-messaging-7.0.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-policy-1.35.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-privsep-1.33.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-service-1.40.1[${PYTHON_USEDEP}]
+	>=dev-python/rfc3986-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
+	>=dev-python/psutil-3.2.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-versionedobjects-1.35.0[${PYTHON_USEDEP}]
+	>=dev-python/os-brick-2.6.1[${PYTHON_USEDEP}]
+	>=dev-python/os-resource-classes-0.4.0[${PYTHON_USEDEP}]
+	>=dev-python/os-traits-0.16.0[${PYTHON_USEDEP}]
+	>=dev-python/os-vif-1.14.0[${PYTHON_USEDEP}]
+	>=dev-python/os-win-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/castellan-0.16.0[${PYTHON_USEDEP}]
+	>=dev-python/microversion-parse-0.2.1[${PYTHON_USEDEP}]
+	>=dev-python/os-xenapi-0.3.3[${PYTHON_USEDEP}]
+	>=dev-python/tooz-1.58.0[${PYTHON_USEDEP}]
+	>=dev-python/cursive-0.2.1[${PYTHON_USEDEP}]
+	>=dev-python/pypowervm-1.1.15[${PYTHON_USEDEP}]
+	>=dev-python/retrying-1.3.3[${PYTHON_USEDEP}]
+	>=dev-python/os-service-types-1.7.0[${PYTHON_USEDEP}]
+	>=dev-python/taskflow-2.16.0[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}]
+	>=dev-python/zVMCloudConnector-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/futurist-1.8.0[$(python_gen_usedep 'python2_7')]
+	>=dev-python/openstacksdk-0.35.0[${PYTHON_USEDEP}]
+	dev-python/libvirt-python[${PYTHON_USEDEP}]
+	app-emulation/libvirt[iscsi?]
+	app-emulation/spice-html5
+	novncproxy? ( www-apps/novnc )
+	sys-apps/iproute2
+	openvswitch? ( net-misc/openvswitch )
+	rabbitmq? ( net-misc/rabbitmq-server )
+	memcached? (
+		net-misc/memcached
+		>=dev-python/python-memcached-1.58
+	)
+	sys-fs/sysfsutils
+	sys-fs/multipath-tools
+	net-misc/bridge-utils
+	compute? (
+		app-cdr/cdrtools
+		sys-fs/dosfstools
+		app-emulation/qemu
+	)
+	iscsi? (
+		sys-fs/lsscsi
+		>=sys-block/open-iscsi-2.0.873-r1
+	)"
+
+#PATCHES=(
+#)
+
+pkg_setup() {
+	linux-info_pkg_setup
+	CONFIG_CHECK_MODULES="BLK_DEV_NBD VHOST_NET IP6_NF_FILTER IP6_NF_IPTABLES IP_NF_TARGET_REJECT \
+	IP_NF_MANGLE IP_NF_TARGET_MASQUERADE NF_NAT_IPV4 IP_NF_FILTER IP_NF_IPTABLES \
+	NF_CONNTRACK_IPV4 NF_DEFRAG_IPV4 NF_NAT_IPV4 NF_NAT NF_CONNTRACK NETFILTER_XTABLES \
+	ISCSI_TCP SCSI_DH DM_MULTIPATH DM_SNAPSHOT"
+	if linux_config_exists; then
+		for module in ${CONFIG_CHECK_MODULES}; do
+			linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled in kernel"
+		done
+	fi
+	enewgroup nova
+	enewuser nova -1 -1 /var/lib/nova nova
+}
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use !compute-only; then
+		for svc in api conductor consoleauth network scheduler spicehtml5proxy xvpvncproxy; do
+			newinitd "${FILESDIR}/nova.initd" "nova-${svc}"
+		done
+	fi
+	use compute && newinitd "${FILESDIR}/nova.initd" "nova-compute"
+	use novncproxy && newinitd "${FILESDIR}/nova.initd" "nova-novncproxy"
+
+	diropts -m 0750 -o nova -g qemu
+	dodir /var/log/nova /var/lib/nova/instances
+	diropts -m 0750 -o nova -g nova
+
+	insinto /etc/nova
+	insopts -m 0640 -o nova -g nova
+	newins "${DISTDIR}/nova.conf.sample-${PV}" "nova.conf.sample"
+	doins "${FILESDIR}/nova-compute.conf"
+	doins "${S}/etc/nova/"*
+	# rootwrap filters
+	insopts -m 0644
+	insinto /etc/nova/rootwrap.d
+	doins "etc/nova/rootwrap.d/api-metadata.filters"
+	doins "etc/nova/rootwrap.d/compute.filters"
+	doins "etc/nova/rootwrap.d/network.filters"
+
+	# add sudoers definitions for user nova
+	insinto /etc/sudoers.d/
+	insopts -m 0600 -o root -g root
+	doins "${FILESDIR}/nova-sudoers"
+
+	if use iscsi ; then
+		# Install udev rules for handle iscsi disk with right links under /dev
+		udev_newrules "${FILESDIR}/openstack-scsi-disk.rules" 60-openstack-scsi-disk.rules
+
+		insinto /etc/nova/
+		doins "${FILESDIR}/scsi-openscsi-link.sh"
+	fi
+	rm -r "${ED}/usr/etc"
+}
+
+pkg_postinst() {
+	if use iscsi ; then
+		elog "iscsid needs to be running if you want cinder to connect"
+	fi
+}
diff --git a/sys-cluster/openmpi/Manifest b/sys-cluster/openmpi/Manifest
index c642d4691696..6ab8bad722a6 100644
--- a/sys-cluster/openmpi/Manifest
+++ b/sys-cluster/openmpi/Manifest
@@ -15,19 +15,19 @@ DIST openmpi-3.0.4.tar.bz2 9308341 BLAKE2B 84536082f8415c9a0e41db01d96d64bffc463
 DIST openmpi-3.1.4.tar.bz2 9468371 BLAKE2B 70a93aa170086f43b2eb4f9b7c74673065bd309ae7a4c8f478a6db7523167fd1d25af19f87661149f6dd6033898ab47b86690a0421a01aa6f5a4d70478072e0e SHA512 5b4aafffc79fd85cb94a11a6e2fac563b142ac532191009eb35826c432ed3c391a6616e2ca92eacbf36137468eadb7c0f7ddc787034bc95c4214232ed5128338
 DIST openmpi-4.0.1.tar.bz2 9838152 BLAKE2B 75657940e37c23fbe88032f116588960c6bcf34c4928d77b45e8fde6fb51e814f521adb6c5155cb588fff9d1b382c2470873d90979a68598ff13e1aa205fc811 SHA512 09f35dc2e44b4f84aab9c5af9d81f90bbdb030e4d90800a5d3ffae88cb32b7faecc9bea0abb113da53c21f73e9d19db68f961f997bc47bdd28d83a87beee0731
 DIST openmpi-4.0.2.tar.bz2 9819372 BLAKE2B 000faa8ff032f9aa6bf5f0a14fb9a363080cfcdd7c6f8ab90bc9507fd7a473d70502574ee1e75c88acecb06c516a643ef7b9e804fb580be9fc860b7b1fb1cc5d SHA512 634d45d989f1e0b8848bfb4eb4527c7edd76d4fccd77a5f8d85a46a5822f97ba653adf13df857c87ae56a8117b4ae2d45ec24249c6ee41a562446d4112ddb770
-EBUILD openmpi-1.10.7.ebuild 6381 BLAKE2B 7d07db3b67d2df22416e862f2e3493be1bebb27beddf2aa333c6f45518ece0397ca360c354266dc84c1cd73af7a700064579279398c483d39064b923f2507d7f SHA512 956982cfffd3f7971031f7861ce93343665be39641d03afd6e2e0be8af0fdbe943e8ad3456ccc3b8159857cd292ee2c5b6e7dffa882cf530210976d3b242ee01
-EBUILD openmpi-1.4.3.ebuild 2618 BLAKE2B a030b33a0fae59cf7e75cc8252af897ba703f95e259f938872182dfa97c86f587eb2259594f75114f939c7b0961490452ff3c11c2ed3a6b60ae3f2974d926446 SHA512 5c47bdf1192a6d2b95fa35c217a27ff6f69c0ca1bf5c5be3ff43f7785b354c214a371697006275efc08fc9ec3bf27d284db45a7f5d6cb1af9937c42340f79f83
-EBUILD openmpi-1.4.5.ebuild 2627 BLAKE2B 3aef1a37d78c175dcf3e3a47321a52f03d2fd61b1dde797ac811b2444d100b29e3eb4686d9961848573055af62ce41f114055eb729e2cec469e5edbc630ec4aa SHA512 4c31cc8ae2986222645c873f30ba0aa53f612524e4019428c3d803a83d0d947b08770317b440749a93ef7485e71c174a39436589b4a73786253a5289a8d7e2bb
-EBUILD openmpi-1.6.5-r1.ebuild 5326 BLAKE2B 2a38e14ff9e8d5119a22cb25b5771630a7c853080b069aab0ba4dbc794b651c2bb6366d03ebc86337641fa7318d3bb7d556f48a44a9e5401d8ff7215d6e7c61b SHA512 524f47d13a1909994e7180921fe77231380ee132f8dafc5db5b686ff63c56efcdfb84a2a04bc147c19e5ee58f1afca6aef9e7bbd1bcb7af55d21e3c5d35181a5
-EBUILD openmpi-1.7.5-r1.ebuild 5019 BLAKE2B 85fca959dd300c198ede83845eb9e67424054ff9e86d445d2507388e7f12ef9797838276bfd1620b8f29c7d9ce2f87cbddc1bae7fba7986f7ff17f83d7e45121 SHA512 a2f82e743951201881f5f5c961c0db8203fd1c19cadf4c7c3259f4f7dda8ed3b8cb0d07b0ad6655d942b74f9992c04819e55f5a75bbe71d3b036c08ed7add223
-EBUILD openmpi-1.8.4-r4.ebuild 5062 BLAKE2B 2a71a8bfd84776474798e98e0563bd946861d4d334d19d3d6547a01286495fd4fe45fcecd21e880c2577c9228a592ada45351c3428397e78cae8b84b402f7938 SHA512 e88998fdcf77089fd006462661d877e93d0248e8aca111e3d5a57a3a8373c2e1c6093dc85048d4aef510b5a2f0f703524f3fd85d7ed25c9626ac2b263cb5c831
-EBUILD openmpi-1.8.7-r1.ebuild 5574 BLAKE2B 3192dfacaac68be54d505f953bb1eb08d4ba9a59560dd6815633c469c65136886f75926766cd517c82625c315628c121f40bf010895a869e01341b7f79c2b316 SHA512 a48d10fa04b34f93b72a775b2c528e402866c971930d9de2adba5031a4e96ec9565f8d5ef6c60510efbb3d95f440daf85837f04742fd82a992f0350dae3ecb38
-EBUILD openmpi-1.8.8.ebuild 5580 BLAKE2B f03a2531624daacc577729fb999326b593ffbef2c5162abd35c226852185897c5e21f8a8c282f5f7ded025ee817271f0340ff24fdba75def1176aad46b03f978 SHA512 429c4190e042665f567512e16f8114ea9050d0bd1dfdec6a02673205af5db3a82568a83cc2ed1367d65b6e11ee4605df95eb10472047ea62fba553567d8072ae
-EBUILD openmpi-2.0.2.ebuild 5991 BLAKE2B 87efa938e2831679fc127b47e61b652f43eea220eaa75787fb0f317ba88fe3f7da5ccad99c02465c6f77dbc012e9e1519d74fe941f43337cd15a1bd80a966e7e SHA512 acf85696469690e2006b6e195414d5ae9404c2f5e2b84dd15b7fecaa566eb468303f895465b7bcf1962e6ebd1a2c23fb2aa47aa4aeee5e40f1d0a2b99de610f4
-EBUILD openmpi-2.0.4.ebuild 5995 BLAKE2B f0e8b0971b2e9cdae4a46b771bee622a4c3558455df9d59ac09624a784865df79268201535bd8aff0cd782425dc95fdec4235f2fe1dbf1d2be1d55c5fc8bc20f SHA512 dd4e1c687c56ae395ff209e4f1c6e22b74b78a83373850ada084c7d6391f6442d6607125c3f3027e3b40837ffce6b7bfa3ef7ec810e614e6337bc5c383ec1a35
-EBUILD openmpi-2.1.6.ebuild 5606 BLAKE2B 2303401b7048a5e5a05552f79e964e45f1d0df2d315c993ebb05bac0f46fd156cd1cdb98ab47e1e730bbfb162343e6a457e69432c4901dcf236f88721dc3ad90 SHA512 e0ed1db674b40c82bbe85a22dbfcdd0271c95e76769799708be0ca2c652910ef378d7ea07c1a87d6b0bdd2557a6920b02cb75f4aaa702bef114a1ed505e7abc2
-EBUILD openmpi-3.0.4.ebuild 5492 BLAKE2B 18dcd4347f186116781da19bce63083d0f0bda9c4096e8a38bcd066bea3d655fa348fed4a5b8ac760e110ec91ec205fc33d91dd407d57165362b3c03ae4e37e5 SHA512 fe63abca4c2883e5801ef1886a06e0300031400bdb2a28f39099159185c33f9998b6bc3066f4b9b9b6e0d7d86f98e8bdbe724050b7eeead3c83320bd1148588e
-EBUILD openmpi-3.1.4.ebuild 5492 BLAKE2B 18dcd4347f186116781da19bce63083d0f0bda9c4096e8a38bcd066bea3d655fa348fed4a5b8ac760e110ec91ec205fc33d91dd407d57165362b3c03ae4e37e5 SHA512 fe63abca4c2883e5801ef1886a06e0300031400bdb2a28f39099159185c33f9998b6bc3066f4b9b9b6e0d7d86f98e8bdbe724050b7eeead3c83320bd1148588e
-EBUILD openmpi-4.0.1-r1.ebuild 5434 BLAKE2B 30b8695cacf0f65506d99a63df4cccac15af7aaac3ad54b75ca3240b646fe6a6efc5952426b61b12fa1c35c9aab1303d98a9ecc19293dd9804f4bb9e5efa7aa9 SHA512 de78d49aea8df2db7e9e2c43d8d577e95c5a3064afe2f988ad45fa463d5ae8b3e87d12c626b24048354ece58bfdb50b7894e634d00f2b5a9febfea2bc7eabaf0
-EBUILD openmpi-4.0.2.ebuild 5434 BLAKE2B 30b8695cacf0f65506d99a63df4cccac15af7aaac3ad54b75ca3240b646fe6a6efc5952426b61b12fa1c35c9aab1303d98a9ecc19293dd9804f4bb9e5efa7aa9 SHA512 de78d49aea8df2db7e9e2c43d8d577e95c5a3064afe2f988ad45fa463d5ae8b3e87d12c626b24048354ece58bfdb50b7894e634d00f2b5a9febfea2bc7eabaf0
+EBUILD openmpi-1.10.7.ebuild 6285 BLAKE2B a012fecf048e0e1d2a0c9d759953885990e2cdacb69fcf87d263cb5e6c066fc42c1b79b1c958aa0cd521cf53fd82d59f5ec72bf169145214cbba8d8961025eda SHA512 d037215aa2acfc7a689fccbea4c5d04739b548095ccf9ceec671dfd3353b2ed6688e54f87c09a5215b0e2c0324782a0f73631ea28694b461906df8032f7bc3dc
+EBUILD openmpi-1.4.3.ebuild 2522 BLAKE2B f6b0e4f440b72bb0e310ac0c0e68b06b3b05afdbe803241924e30b54cd0bbafea55491940a31868d8fe96641f2a5bdb33a7b01acc7674d4ae0651bccf96299e2 SHA512 753ec1fdb88fa278dd7da8bba1c8459aa3b6c180e39346ab4f2b42f705bde3bda75a9a67b088e5e199156fd972a2469bd6f2f8da459330271b496ad08f2a03a1
+EBUILD openmpi-1.4.5.ebuild 2531 BLAKE2B ebe284697fae78a1d21506a135fd3448b60519d0fb26ad34b7280d3f386e27525ccedae3078e4bbdb3f136417975d6252789d84057f7d630217454afbc7d18af SHA512 a6652fa977209a2f2ed7d91af80dfc9d5d5dd64845ae5ba7704e31ff3acfe84c7797e21da1a3877214f9e931507e75e63d387553694e95eefb8fdce2351335ff
+EBUILD openmpi-1.6.5-r1.ebuild 5095 BLAKE2B 0e40379248ef9add08c83403e9410ebce562ab7637cd17a2bd8cac55876f0f5433431518e238c7d85b0db539ad5a2b7f32644f31eb206da92386cf92c9d2fa15 SHA512 72396fd5ab78b4ce189b3b70c29190d1a40e9a206da5d46dc9fa8d7a3a18043557fb3639c65d27ca56d8d51d327b07a25d3bf172b6861d3004dd9aa4b54e57bf
+EBUILD openmpi-1.7.5-r1.ebuild 4788 BLAKE2B 40ac5e971a39ae9d58ada5a0f6c69e4134ca66178c42cffaab14011638a0c1140d512e2dc6d86b34ed7425402899e4b0cd0a706af9535c93be8e7b82c8300629 SHA512 d573905d38ef9c04940f11053b9da015b09f4ef178f50c3d9fcefe7b7b306d91db8f3a3c1b2f1b33736942d3c594be9e72369766d25ae88b1c6489b131ff7077
+EBUILD openmpi-1.8.4-r4.ebuild 4831 BLAKE2B b4f268dfff7f54f9b5e9aa46582fdc3fc37bb5fc523c8bf12ca24eb3930cbc2bce115cf16c1cb0a9fb4b224a6d27d1d6863bb34f339ee62d9b4624e1409b3754 SHA512 db5360e809406a3dea9ab19582659cbd35259ea5baa623062b348e4636fbbcb5b173a2564d9634c19e6b5d0539c19905971fa6d1c8cb98c0103b2e044033fd61
+EBUILD openmpi-1.8.7-r1.ebuild 5343 BLAKE2B 0fa8d2b5e82ef2eb6538a4cd8e8536ece19c248e780745c234f71b1e05c4de80c4d2576aebf9b6bf5d4fa6c6f21b790a1b883eb01f179e4fcc82989f45d14112 SHA512 525e55337d1579b0e4ef6c551538dd2335ca80f7c1db4c700885acc3cadedfc234434e813a55e02641d4997d2357af6198dd868c29dbf40f3fa21e6bb39d4738
+EBUILD openmpi-1.8.8.ebuild 5349 BLAKE2B 51b10dad619b8ee0a796aa96cf4979cf315a0786225f5f9b28aff2f1806f01d771f221df8c1958b3ea92b773504e122f2fd1e6b35be169e2a3069edd2ded7207 SHA512 30e8158dbe74ab5e437b5e659cf290a10cfc8a6fa2e2428d6951a065ca37ca1a91ffe7466b24d9e0da588cb5e6886fe7d00daaa4a18403e996eee0c310748f30
+EBUILD openmpi-2.0.2.ebuild 5895 BLAKE2B 54083652e78d0ca04be20c1446ee46b903d5e21c7a81cd9b2bc5300bf721d060a04f0ac621f80f72cc96785f3f1694d538e4e7502f23995b49f26acb70a3325f SHA512 104fccd6ec11772e8787d72bece2908711c3fda93a22b48daf03a3fc070faf40c961366171d2a17c6cb85c582e5e9710e69a687cf52a492cea94a27f7bc77c42
+EBUILD openmpi-2.0.4.ebuild 5899 BLAKE2B 1a495bfcffbd62d456fac2a95e18af701ca6fb0d95adf56587dad9f3519e2d7f70674953534bc7bbfd11c32356d2637961b9d1dee3b76f2b63651c26873454bb SHA512 3b3db523b5d477bf6fd52a370af63d6e0aee1390efd9b597b378a7380dc4f3b18f5a900dde49fddfdd239956026c555bf645adc79f7f52b0e91bc8c009d05e04
+EBUILD openmpi-2.1.6.ebuild 5513 BLAKE2B 1f4e90e16643bbde9eaf39fe12514370ef29ef8bb2efd1cc8f65a2e1a35a4fdac7d77808a4e3764083e6e1f72c43cc2a10e125ba7917be1135fa68b5fc96fb9a SHA512 e9bc83cffaeff5008f041d6661b5d547bc3de22e5b0445dde293adc34e7e98b99b35bf52335871cd1beba8397661cee383a28092134fbda7056d9cc47fd50aac
+EBUILD openmpi-3.0.4.ebuild 5399 BLAKE2B daac9298114db476cff1915f48b03ca045eb50b487a83845eaef6a4d448f3ece2a1db60c233a1586b01f0cf754b14ee9447dd15eb4add2011e088dca321d8e5a SHA512 434ebba25c99fbb087ea7bb7dc40f43cefab9b660bed65b6772e640722786f33b8a17811872141a0715b6509715e898274397c4c796a2f31196e3a68731a93fd
+EBUILD openmpi-3.1.4.ebuild 5399 BLAKE2B daac9298114db476cff1915f48b03ca045eb50b487a83845eaef6a4d448f3ece2a1db60c233a1586b01f0cf754b14ee9447dd15eb4add2011e088dca321d8e5a SHA512 434ebba25c99fbb087ea7bb7dc40f43cefab9b660bed65b6772e640722786f33b8a17811872141a0715b6509715e898274397c4c796a2f31196e3a68731a93fd
+EBUILD openmpi-4.0.1-r1.ebuild 5341 BLAKE2B 323615263b4e803de715a7cab0b8d01d34f693122b93bf08a9a4abd70e8430c29c2974515be71132284ef649ddd0f9b771ccecc218121dcb13f97bda5cc223f3 SHA512 e6b17cb28c0cbf78932ff6edda4c3bc012012f723c8407be0c8d9b472933b4edf1173cb78a0a50f398561e2938a702cb871babe537670966364b0266b0b7026a
+EBUILD openmpi-4.0.2.ebuild 5341 BLAKE2B 323615263b4e803de715a7cab0b8d01d34f693122b93bf08a9a4abd70e8430c29c2974515be71132284ef649ddd0f9b771ccecc218121dcb13f97bda5cc223f3 SHA512 e6b17cb28c0cbf78932ff6edda4c3bc012012f723c8407be0c8d9b472933b4edf1173cb78a0a50f398561e2938a702cb871babe537670966364b0266b0b7026a
 MISC metadata.xml 928 BLAKE2B f6cacb50815977ad28b83ec24725021a140db9592152d2a9e238da051058287c01c73ac557392946f83949caee2f75a847ba5e82c4b6f816ab3f8288aa38b719 SHA512 a7ba5e4bfc8e6c1a74667f31c4d8df580699fa84766cbc597a66c1a0ed12ece60bf1f683fcbd30529b042588ae4460741b4eef407e232532a3eede1766326f1e
diff --git a/sys-cluster/openmpi/openmpi-1.10.7.ebuild b/sys-cluster/openmpi/openmpi-1.10.7.ebuild
index 0e6ce190c374..adce58ce204b 100644
--- a/sys-cluster/openmpi/openmpi-1.10.7.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.10.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -33,7 +33,7 @@ SRC_URI="http://www.open-mpi.org/software/ompi/v$(get_version_component_range 1-
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
-IUSE="cma cuda +cxx elibc_FreeBSD fortran heterogeneous ipv6 java mpi-threads numa romio threads vt
+IUSE="cma cuda +cxx fortran heterogeneous ipv6 java mpi-threads numa romio threads vt
 	${IUSE_OPENMPI_FABRICS} ${IUSE_OPENMPI_RM} ${IUSE_OPENMPI_OFED_FEATURES}"
 
 REQUIRED_USE="openmpi_rm_slurm? ( !openmpi_rm_pbs )
@@ -64,7 +64,6 @@ CDEPEND="
 	<sys-apps/hwloc-2[${MULTILIB_USEDEP},numa?]
 	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
 	cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 )
-	elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )
 	openmpi_fabrics_ofed? ( sys-fabric/ofed:* )
 	openmpi_fabrics_knem? ( sys-cluster/knem )
 	openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* )
diff --git a/sys-cluster/openmpi/openmpi-1.4.3.ebuild b/sys-cluster/openmpi/openmpi-1.4.3.ebuild
index 1c7c5aaf0513..8bf92f0e2f57 100644
--- a/sys-cluster/openmpi/openmpi-1.4.3.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.4.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -16,14 +16,13 @@ LICENSE="BSD"
 SLOT="0"
 RESTRICT="mpi-threads? ( test )"
 KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
-IUSE="+cxx elibc_FreeBSD fortran heterogeneous ipv6 mpi-threads pbs romio threads vt"
+IUSE="+cxx fortran heterogeneous ipv6 mpi-threads pbs romio threads vt"
 RDEPEND="
 	pbs? ( sys-cluster/torque )
 	vt? (
 		!dev-libs/libotf
 		!app-text/lcdf-typetools
 	)
-	elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )
 	!sys-cluster/mpich
 	!sys-cluster/mpich2
 	!sys-cluster/mpiexec
diff --git a/sys-cluster/openmpi/openmpi-1.4.5.ebuild b/sys-cluster/openmpi/openmpi-1.4.5.ebuild
index a533b92ca6ba..ad3f8b66f21a 100644
--- a/sys-cluster/openmpi/openmpi-1.4.5.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.4.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -18,14 +18,13 @@ SLOT="0"
 RESTRICT="mpi-threads? ( test )"
 
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="+cxx elibc_FreeBSD fortran heterogeneous ipv6 mpi-threads pbs romio threads vt"
+IUSE="+cxx fortran heterogeneous ipv6 mpi-threads pbs romio threads vt"
 RDEPEND="
 	pbs? ( sys-cluster/torque )
 	vt? (
 		!dev-libs/libotf
 		!app-text/lcdf-typetools
 	)
-	elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )
 	!sys-cluster/mpich
 	!sys-cluster/mpich2
 	!sys-cluster/mpiexec
diff --git a/sys-cluster/openmpi/openmpi-1.6.5-r1.ebuild b/sys-cluster/openmpi/openmpi-1.6.5-r1.ebuild
index 3600523ee5a2..94fbe5f02330 100644
--- a/sys-cluster/openmpi/openmpi-1.6.5-r1.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.6.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,6 @@ IUSE_OPENMPI_FABRICS="
 	openmpi_fabrics_dapl
 	openmpi_fabrics_ofed
 	openmpi_fabrics_knem
-	openmpi_fabrics_open-mx
 	openmpi_fabrics_psm
 	openmpi_fabrics_sctp"
 
@@ -36,7 +35,7 @@ SRC_URI="http://www.open-mpi.org/software/ompi/v$(get_version_component_range 1-
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
-IUSE="+cxx elibc_FreeBSD fortran heterogeneous ipv6 mpi-threads romio threads vt
+IUSE="+cxx fortran heterogeneous ipv6 mpi-threads romio threads vt
 	${IUSE_OPENMPI_FABRICS} ${IUSE_OPENMPI_RM} ${IUSE_OPENMPI_OFED_FEATURES}"
 
 REQUIRED_USE="openmpi_rm_slurm? ( !openmpi_rm_pbs )
@@ -55,11 +54,9 @@ RDEPEND="
 	!sys-cluster/pmix
 	<sys-apps/hwloc-2
 	dev-libs/libltdl:0
-	elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )
 	openmpi_fabrics_dapl? ( sys-fabric/dapl )
 	openmpi_fabrics_ofed? ( sys-fabric/ofed )
 	openmpi_fabrics_knem? ( sys-cluster/knem )
-	openmpi_fabrics_open-mx? ( sys-cluster/open-mx )
 	openmpi_fabrics_psm? ( sys-fabric/infinipath-psm )
 	openmpi_fabrics_sctp? ( net-misc/lksctp-tools )
 	openmpi_rm_pbs? ( sys-cluster/torque )
@@ -146,7 +143,6 @@ src_configure() {
 		$(use_with openmpi_fabrics_dapl udapl "${EPREFIX}"/usr) \
 		$(use_with openmpi_fabrics_ofed openib "${EPREFIX}"/usr) \
 		$(use_with openmpi_fabrics_knem knem "${EPREFIX}"/usr) \
-		$(use_with openmpi_fabrics_open-mx mx "${EPREFIX}"/usr) \
 		$(use_with openmpi_fabrics_psm psm "${EPREFIX}"/usr) \
 		$(use_enable openmpi_ofed_features_control-hdr-padding openib-control-hdr-padding) \
 		$(use_enable openmpi_ofed_features_connectx-xrc openib-connectx-xrc) \
diff --git a/sys-cluster/openmpi/openmpi-1.7.5-r1.ebuild b/sys-cluster/openmpi/openmpi-1.7.5-r1.ebuild
index 8c0bcae38a87..0c59f5e20d45 100644
--- a/sys-cluster/openmpi/openmpi-1.7.5-r1.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.7.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,6 @@ S=${WORKDIR}/${MY_P}
 IUSE_OPENMPI_FABRICS="
 	openmpi_fabrics_ofed
 	openmpi_fabrics_knem
-	openmpi_fabrics_open-mx
 	openmpi_fabrics_psm"
 
 IUSE_OPENMPI_RM="
@@ -33,7 +32,7 @@ SRC_URI="http://www.open-mpi.org/software/ompi/v$(get_version_component_range 1-
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
-IUSE="cma cuda +cxx elibc_FreeBSD fortran heterogeneous ipv6 mpi-threads romio threads vt
+IUSE="cma cuda +cxx fortran heterogeneous ipv6 mpi-threads romio threads vt
 	${IUSE_OPENMPI_FABRICS} ${IUSE_OPENMPI_RM} ${IUSE_OPENMPI_OFED_FEATURES}"
 
 REQUIRED_USE="openmpi_rm_slurm? ( !openmpi_rm_pbs )
@@ -60,10 +59,8 @@ RDEPEND="
 	dev-libs/libltdl:0
 	<sys-apps/hwloc-2
 	cuda? ( dev-util/nvidia-cuda-toolkit )
-	elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )
 	openmpi_fabrics_ofed? ( sys-fabric/ofed )
 	openmpi_fabrics_knem? ( sys-cluster/knem )
-	openmpi_fabrics_open-mx? ( sys-cluster/open-mx )
 	openmpi_fabrics_psm? ( sys-fabric/infinipath-psm )
 	openmpi_rm_pbs? ( sys-cluster/torque )
 	openmpi_rm_slurm? ( sys-cluster/slurm )
@@ -139,7 +136,6 @@ src_configure() {
 		$(use_enable ipv6) \
 		$(use_with openmpi_fabrics_ofed verbs "${EPREFIX}"/usr) \
 		$(use_with openmpi_fabrics_knem knem "${EPREFIX}"/usr) \
-		$(use_with openmpi_fabrics_open-mx mx "${EPREFIX}"/usr) \
 		$(use_with openmpi_fabrics_psm psm "${EPREFIX}"/usr) \
 		$(use_enable openmpi_ofed_features_control-hdr-padding openib-control-hdr-padding) \
 		$(use_enable openmpi_ofed_features_connectx-xrc openib-connectx-xrc) \
diff --git a/sys-cluster/openmpi/openmpi-1.8.4-r4.ebuild b/sys-cluster/openmpi/openmpi-1.8.4-r4.ebuild
index bd218f14d8dc..b445c75dae49 100644
--- a/sys-cluster/openmpi/openmpi-1.8.4-r4.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.8.4-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,6 @@ S=${WORKDIR}/${MY_P}
 IUSE_OPENMPI_FABRICS="
 	openmpi_fabrics_ofed
 	openmpi_fabrics_knem
-	openmpi_fabrics_open-mx
 	openmpi_fabrics_psm"
 
 IUSE_OPENMPI_RM="
@@ -34,7 +33,7 @@ SRC_URI="http://www.open-mpi.org/software/ompi/v$(get_version_component_range 1-
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="alpha ~amd64 ~ia64 ppc ppc64 sparc ~x86 ~amd64-linux"
-IUSE="cma cuda +cxx elibc_FreeBSD fortran heterogeneous ipv6 mpi-threads numa romio threads vt
+IUSE="cma cuda +cxx fortran heterogeneous ipv6 mpi-threads numa romio threads vt
 	${IUSE_OPENMPI_FABRICS} ${IUSE_OPENMPI_RM} ${IUSE_OPENMPI_OFED_FEATURES}"
 
 REQUIRED_USE="openmpi_rm_slurm? ( !openmpi_rm_pbs )
@@ -63,10 +62,8 @@ RDEPEND="
 	<sys-apps/hwloc-2[numa?]
 	sys-libs/zlib
 	cuda? ( dev-util/nvidia-cuda-toolkit )
-	elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )
 	openmpi_fabrics_ofed? ( sys-fabric/ofed )
 	openmpi_fabrics_knem? ( sys-cluster/knem )
-	openmpi_fabrics_open-mx? ( sys-cluster/open-mx )
 	openmpi_fabrics_psm? ( sys-fabric/infinipath-psm )
 	openmpi_rm_pbs? ( sys-cluster/torque )
 	openmpi_rm_slurm? ( sys-cluster/slurm )
@@ -137,7 +134,6 @@ src_configure() {
 		$(use_enable ipv6) \
 		$(use_with openmpi_fabrics_ofed verbs "${EPREFIX}"/usr) \
 		$(use_with openmpi_fabrics_knem knem "${EPREFIX}"/usr) \
-		$(use_with openmpi_fabrics_open-mx mx "${EPREFIX}"/usr) \
 		$(use_with openmpi_fabrics_psm psm "${EPREFIX}"/usr) \
 		$(use_enable openmpi_ofed_features_control-hdr-padding openib-control-hdr-padding) \
 		$(use_enable openmpi_ofed_features_connectx-xrc openib-connectx-xrc) \
diff --git a/sys-cluster/openmpi/openmpi-1.8.7-r1.ebuild b/sys-cluster/openmpi/openmpi-1.8.7-r1.ebuild
index 360723425357..876003287360 100644
--- a/sys-cluster/openmpi/openmpi-1.8.7-r1.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.8.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,6 @@ S=${WORKDIR}/${MY_P}
 IUSE_OPENMPI_FABRICS="
 	openmpi_fabrics_ofed
 	openmpi_fabrics_knem
-	openmpi_fabrics_open-mx
 	openmpi_fabrics_psm"
 
 IUSE_OPENMPI_RM="
@@ -34,7 +33,7 @@ SRC_URI="http://www.open-mpi.org/software/ompi/v$(get_version_component_range 1-
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
-IUSE="cma cuda +cxx elibc_FreeBSD fortran heterogeneous ipv6 java mpi-threads numa romio threads vt
+IUSE="cma cuda +cxx fortran heterogeneous ipv6 java mpi-threads numa romio threads vt
 	${IUSE_OPENMPI_FABRICS} ${IUSE_OPENMPI_RM} ${IUSE_OPENMPI_OFED_FEATURES}"
 
 REQUIRED_USE="openmpi_rm_slurm? ( !openmpi_rm_pbs )
@@ -63,10 +62,8 @@ CDEPEND="
 	<sys-apps/hwloc-2[numa?]
 	sys-libs/zlib
 	cuda? ( dev-util/nvidia-cuda-toolkit )
-	elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )
 	openmpi_fabrics_ofed? ( sys-fabric/ofed )
 	openmpi_fabrics_knem? ( sys-cluster/knem )
-	openmpi_fabrics_open-mx? ( sys-cluster/open-mx )
 	openmpi_fabrics_psm? ( sys-fabric/infinipath-psm )
 	openmpi_rm_pbs? ( sys-cluster/torque )
 	openmpi_rm_slurm? ( sys-cluster/slurm )
@@ -140,7 +137,6 @@ src_configure() {
 		$(use_enable mpi-threads mpi-thread-multiple) \
 		$(use_with openmpi_fabrics_ofed verbs "${EPREFIX}"/usr) \
 		$(use_with openmpi_fabrics_knem knem "${EPREFIX}"/usr) \
-		$(use_with openmpi_fabrics_open-mx mx "${EPREFIX}"/usr) \
 		$(use_with openmpi_fabrics_psm psm "${EPREFIX}"/usr) \
 		$(use_enable openmpi_ofed_features_control-hdr-padding openib-control-hdr-padding) \
 		$(use_enable openmpi_ofed_features_connectx-xrc openib-connectx-xrc) \
diff --git a/sys-cluster/openmpi/openmpi-1.8.8.ebuild b/sys-cluster/openmpi/openmpi-1.8.8.ebuild
index 3e7db1e7dfd5..0907f4880539 100644
--- a/sys-cluster/openmpi/openmpi-1.8.8.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.8.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,6 @@ S=${WORKDIR}/${MY_P}
 IUSE_OPENMPI_FABRICS="
 	openmpi_fabrics_ofed
 	openmpi_fabrics_knem
-	openmpi_fabrics_open-mx
 	openmpi_fabrics_psm"
 
 IUSE_OPENMPI_RM="
@@ -34,7 +33,7 @@ SRC_URI="http://www.open-mpi.org/software/ompi/v$(get_version_component_range 1-
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
-IUSE="cma cuda +cxx elibc_FreeBSD fortran heterogeneous ipv6 java mpi-threads numa romio threads vt
+IUSE="cma cuda +cxx fortran heterogeneous ipv6 java mpi-threads numa romio threads vt
 	${IUSE_OPENMPI_FABRICS} ${IUSE_OPENMPI_RM} ${IUSE_OPENMPI_OFED_FEATURES}"
 
 REQUIRED_USE="openmpi_rm_slurm? ( !openmpi_rm_pbs )
@@ -63,10 +62,8 @@ CDEPEND="
 	<sys-apps/hwloc-2[numa?]
 	sys-libs/zlib
 	cuda? ( dev-util/nvidia-cuda-toolkit )
-	elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )
 	openmpi_fabrics_ofed? ( sys-fabric/ofed:* )
 	openmpi_fabrics_knem? ( sys-cluster/knem )
-	openmpi_fabrics_open-mx? ( sys-cluster/open-mx )
 	openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* )
 	openmpi_rm_pbs? ( sys-cluster/torque )
 	openmpi_rm_slurm? ( sys-cluster/slurm )
@@ -140,7 +137,6 @@ src_configure() {
 		$(use_enable mpi-threads mpi-thread-multiple) \
 		$(use_with openmpi_fabrics_ofed verbs "${EPREFIX}"/usr) \
 		$(use_with openmpi_fabrics_knem knem "${EPREFIX}"/usr) \
-		$(use_with openmpi_fabrics_open-mx mx "${EPREFIX}"/usr) \
 		$(use_with openmpi_fabrics_psm psm "${EPREFIX}"/usr) \
 		$(use_enable openmpi_ofed_features_control-hdr-padding openib-control-hdr-padding) \
 		$(use_enable openmpi_ofed_features_connectx-xrc openib-connectx-xrc) \
diff --git a/sys-cluster/openmpi/openmpi-2.0.2.ebuild b/sys-cluster/openmpi/openmpi-2.0.2.ebuild
index 4c907476d293..22ab86ab5cd5 100644
--- a/sys-cluster/openmpi/openmpi-2.0.2.ebuild
+++ b/sys-cluster/openmpi/openmpi-2.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -33,7 +33,7 @@ SRC_URI="http://www.open-mpi.org/software/ompi/v$(get_version_component_range 1-
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux"
-IUSE="cma cuda cxx elibc_FreeBSD fortran heterogeneous ipv6 java mpi-threads numa romio threads
+IUSE="cma cuda cxx fortran heterogeneous ipv6 java mpi-threads numa romio threads
 	${IUSE_OPENMPI_FABRICS} ${IUSE_OPENMPI_RM} ${IUSE_OPENMPI_OFED_FEATURES}"
 
 REQUIRED_USE="openmpi_rm_slurm? ( !openmpi_rm_pbs )
@@ -58,7 +58,6 @@ CDEPEND="
 	<sys-apps/hwloc-2[${MULTILIB_USEDEP},numa?]
 	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
 	cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 )
-	elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )
 	openmpi_fabrics_ofed? ( sys-fabric/ofed:* )
 	openmpi_fabrics_knem? ( sys-cluster/knem )
 	openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* )
diff --git a/sys-cluster/openmpi/openmpi-2.0.4.ebuild b/sys-cluster/openmpi/openmpi-2.0.4.ebuild
index 37249c6d1c32..6d45ab300608 100644
--- a/sys-cluster/openmpi/openmpi-2.0.4.ebuild
+++ b/sys-cluster/openmpi/openmpi-2.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -33,7 +33,7 @@ SRC_URI="http://www.open-mpi.org/software/ompi/v$(get_version_component_range 1-
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
-IUSE="cma cuda cxx elibc_FreeBSD fortran heterogeneous ipv6 java mpi-threads numa romio threads
+IUSE="cma cuda cxx fortran heterogeneous ipv6 java mpi-threads numa romio threads
 	${IUSE_OPENMPI_FABRICS} ${IUSE_OPENMPI_RM} ${IUSE_OPENMPI_OFED_FEATURES}"
 
 REQUIRED_USE="openmpi_rm_slurm? ( !openmpi_rm_pbs )
@@ -58,7 +58,6 @@ CDEPEND="
 	<sys-apps/hwloc-2[${MULTILIB_USEDEP},numa?]
 	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
 	cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 )
-	elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )
 	openmpi_fabrics_ofed? ( sys-fabric/ofed:* )
 	openmpi_fabrics_knem? ( sys-cluster/knem )
 	openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* )
diff --git a/sys-cluster/openmpi/openmpi-2.1.6.ebuild b/sys-cluster/openmpi/openmpi-2.1.6.ebuild
index 64de440db4e4..1ceddfc03e6b 100644
--- a/sys-cluster/openmpi/openmpi-2.1.6.ebuild
+++ b/sys-cluster/openmpi/openmpi-2.1.6.ebuild
@@ -31,7 +31,7 @@ SRC_URI="http://www.open-mpi.org/software/ompi/v$(get_version_component_range 1-
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
-IUSE="cma cuda cxx elibc_FreeBSD fortran heterogeneous ipv6 java mpi-threads numa romio threads
+IUSE="cma cuda cxx fortran heterogeneous ipv6 java mpi-threads numa romio threads
 	${IUSE_OPENMPI_FABRICS} ${IUSE_OPENMPI_RM} ${IUSE_OPENMPI_OFED_FEATURES}"
 
 REQUIRED_USE="openmpi_rm_slurm? ( !openmpi_rm_pbs )
@@ -54,7 +54,6 @@ CDEPEND="
 	<sys-apps/hwloc-2[${MULTILIB_USEDEP},numa?]
 	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
 	cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 )
-	elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )
 	openmpi_fabrics_ofed? ( sys-fabric/ofed:* )
 	openmpi_fabrics_knem? ( sys-cluster/knem )
 	openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* )
diff --git a/sys-cluster/openmpi/openmpi-3.0.4.ebuild b/sys-cluster/openmpi/openmpi-3.0.4.ebuild
index e8849f89e7cf..d02b39b55b43 100644
--- a/sys-cluster/openmpi/openmpi-3.0.4.ebuild
+++ b/sys-cluster/openmpi/openmpi-3.0.4.ebuild
@@ -31,7 +31,7 @@ SRC_URI="http://www.open-mpi.org/software/ompi/v$(get_version_component_range 1-
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
-IUSE="cma cuda cxx elibc_FreeBSD fortran heterogeneous ipv6 java numa romio
+IUSE="cma cuda cxx fortran heterogeneous ipv6 java numa romio
 	${IUSE_OPENMPI_FABRICS} ${IUSE_OPENMPI_RM} ${IUSE_OPENMPI_OFED_FEATURES}"
 
 REQUIRED_USE="openmpi_rm_slurm? ( !openmpi_rm_pbs )
@@ -54,7 +54,6 @@ CDEPEND="
 	<sys-apps/hwloc-2[${MULTILIB_USEDEP},numa?]
 	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
 	cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 )
-	elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )
 	openmpi_fabrics_ofed? ( sys-fabric/ofed:* )
 	openmpi_fabrics_knem? ( sys-cluster/knem )
 	openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* )
diff --git a/sys-cluster/openmpi/openmpi-3.1.4.ebuild b/sys-cluster/openmpi/openmpi-3.1.4.ebuild
index e8849f89e7cf..d02b39b55b43 100644
--- a/sys-cluster/openmpi/openmpi-3.1.4.ebuild
+++ b/sys-cluster/openmpi/openmpi-3.1.4.ebuild
@@ -31,7 +31,7 @@ SRC_URI="http://www.open-mpi.org/software/ompi/v$(get_version_component_range 1-
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
-IUSE="cma cuda cxx elibc_FreeBSD fortran heterogeneous ipv6 java numa romio
+IUSE="cma cuda cxx fortran heterogeneous ipv6 java numa romio
 	${IUSE_OPENMPI_FABRICS} ${IUSE_OPENMPI_RM} ${IUSE_OPENMPI_OFED_FEATURES}"
 
 REQUIRED_USE="openmpi_rm_slurm? ( !openmpi_rm_pbs )
@@ -54,7 +54,6 @@ CDEPEND="
 	<sys-apps/hwloc-2[${MULTILIB_USEDEP},numa?]
 	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
 	cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 )
-	elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )
 	openmpi_fabrics_ofed? ( sys-fabric/ofed:* )
 	openmpi_fabrics_knem? ( sys-cluster/knem )
 	openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* )
diff --git a/sys-cluster/openmpi/openmpi-4.0.1-r1.ebuild b/sys-cluster/openmpi/openmpi-4.0.1-r1.ebuild
index aaf63224f630..44ace1d10c6c 100644
--- a/sys-cluster/openmpi/openmpi-4.0.1-r1.ebuild
+++ b/sys-cluster/openmpi/openmpi-4.0.1-r1.ebuild
@@ -31,7 +31,7 @@ SRC_URI="http://www.open-mpi.org/software/ompi/v$(ver_cut 1-2)/downloads/${MY_P}
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
-IUSE="cma cuda cxx elibc_FreeBSD fortran heterogeneous ipv6 java romio
+IUSE="cma cuda cxx fortran heterogeneous ipv6 java romio
 	${IUSE_OPENMPI_FABRICS} ${IUSE_OPENMPI_RM} ${IUSE_OPENMPI_OFED_FEATURES}"
 
 REQUIRED_USE="openmpi_rm_slurm? ( !openmpi_rm_pbs )
@@ -52,7 +52,6 @@ CDEPEND="
 	>=sys-apps/hwloc-2.0.2[${MULTILIB_USEDEP}]
 	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
 	cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= )
-	elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )
 	openmpi_fabrics_ofed? ( sys-fabric/ofed:* )
 	openmpi_fabrics_knem? ( sys-cluster/knem )
 	openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* )
diff --git a/sys-cluster/openmpi/openmpi-4.0.2.ebuild b/sys-cluster/openmpi/openmpi-4.0.2.ebuild
index aaf63224f630..44ace1d10c6c 100644
--- a/sys-cluster/openmpi/openmpi-4.0.2.ebuild
+++ b/sys-cluster/openmpi/openmpi-4.0.2.ebuild
@@ -31,7 +31,7 @@ SRC_URI="http://www.open-mpi.org/software/ompi/v$(ver_cut 1-2)/downloads/${MY_P}
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
-IUSE="cma cuda cxx elibc_FreeBSD fortran heterogeneous ipv6 java romio
+IUSE="cma cuda cxx fortran heterogeneous ipv6 java romio
 	${IUSE_OPENMPI_FABRICS} ${IUSE_OPENMPI_RM} ${IUSE_OPENMPI_OFED_FEATURES}"
 
 REQUIRED_USE="openmpi_rm_slurm? ( !openmpi_rm_pbs )
@@ -52,7 +52,6 @@ CDEPEND="
 	>=sys-apps/hwloc-2.0.2[${MULTILIB_USEDEP}]
 	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
 	cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= )
-	elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )
 	openmpi_fabrics_ofed? ( sys-fabric/ofed:* )
 	openmpi_fabrics_knem? ( sys-cluster/knem )
 	openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* )
diff --git a/sys-cluster/pacemaker/Manifest b/sys-cluster/pacemaker/Manifest
index e9d87b9558d7..f862f3e05908 100644
--- a/sys-cluster/pacemaker/Manifest
+++ b/sys-cluster/pacemaker/Manifest
@@ -3,5 +3,6 @@ AUX pacemaker.service 105 BLAKE2B 2b77b0c81427ab418bb5af372fb4938a7c630a9bb1e412
 DIST Pacemaker-1.1.16.tar.gz 4897772 BLAKE2B a6ea8b3e5f6ef776a67d8895a0361945c5bcd98ecd861c0fd8d8b3c474a6f14c816e1f36da1dccd429ab8d92c53a9dd071796968d5080d6a900518df200fafbd SHA512 967c860fab7b9e73dd8643e6d09083a2a1298a77d71c3b138187803c89153bee7219da13e6b94b20f2881b53ba7fc1c8584a43ff058a265e76708fd5dbccf534
 DIST Pacemaker-1.1.19.tar.gz 5369381 BLAKE2B 9134f014b4da61c01bb2533ad33201400335d9e722e064f5e838df851777cfd17115430bd4623b08b97330bfe98340091f06a98c06dd125761053e79f0375dd2 SHA512 c41403441a3ba7a4fb81b6c3e84d7eff5ee951e1040918597ea8462284c83dc6f572607d4903b1238c55757f1eca78132878a172da4e3b5db2dbfe0831c34548
 EBUILD pacemaker-1.1.16.ebuild 1717 BLAKE2B bd304b1002434499f249ae7e1086137f2feff3d733924513f0d7ed1af3b6293ac4515844ff3360ecf319f2de77eb7fd3cace492e9641649f9ad1c8bbfe1da621 SHA512 2cde996f9d0eb1dec1f534adf05d3390ac2c78bb891898ebe5bcc6f27ec9d1eff571880441a25aa260c8fcfc4c61af8260ab47499e47f88dd377c252854d29ee
+EBUILD pacemaker-1.1.19-r1.ebuild 1738 BLAKE2B bd9a796bb21206a028af54cd018226abb8b1dbb69e9f6bbf85ee77bfd454ef796d389972ba299a02ceda9d2b28fa367fe45155147b66b06aab8a1142e6cd2d16 SHA512 8eef712ebbb65c8c46026a95127b5e1c1f33c28ecf8d3e3ac687ff8004b5c81ca57502549b1755003fccbf454a55de303fb9ca8335b9c1c411c48c1dd8953cd5
 EBUILD pacemaker-1.1.19.ebuild 1720 BLAKE2B 13e9d97d068ddfb22e41219d1a86471084132dcbaa78637a5d9f40a7ad291861b5f9ce9bfbb5ab26172e7b07726f2a92be97ace5cba26dc543ec7c9b7921752f SHA512 67d65c32128d13bc9403c55d736b7f4bceba9cfff49d6889798c6d86d69cea6812899119e391f33967f9adaf302182f33ba133ec1d0d10aa1d2c2eab16b4166e
 MISC metadata.xml 889 BLAKE2B 9b52f88582de605852765e0956640e713e68584066410f472beecccbf69db5a8b7226aaf4ce12851b45fd6945d0cde5cd7e524a873599bf35d4e3cf03a6dd8a5 SHA512 dbfaa3e72fbe361e1648a0a1dfd3e0f153489d005f052fc4ddd1468480d53c84a49bb18c0cfc16ac3f2f409f2ff673ec554faae562452420b898167b8650654f
diff --git a/sys-cluster/pacemaker/pacemaker-1.1.19-r1.ebuild b/sys-cluster/pacemaker/pacemaker-1.1.19-r1.ebuild
new file mode 100644
index 000000000000..ed65ac8337a0
--- /dev/null
+++ b/sys-cluster/pacemaker/pacemaker-1.1.19-r1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit autotools python-single-r1
+
+MY_PN="${PN^}"
+MY_P="${MY_PN}-${PV/_/-}"
+
+DESCRIPTION="Pacemaker CRM"
+HOMEPAGE="http://www.linux-ha.org/wiki/Pacemaker"
+SRC_URI="https://github.com/ClusterLabs/${PN}/archive/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+IUSE="acl heartbeat smtp snmp"
+
+DEPEND="${PYTHON_DEPS}
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	sys-cluster/cluster-glue
+	>=sys-cluster/libqb-0.14.0
+	sys-cluster/resource-agents
+
+	heartbeat?	( >=sys-cluster/heartbeat-3.0.0 )
+	!heartbeat?	( sys-cluster/corosync )
+	smtp?		( net-libs/libesmtp )
+	snmp?		( net-analyzer/net-snmp )
+"
+RDEPEND="${DEPEND}"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+S="${WORKDIR}/${PN}-${MY_P}"
+
+src_prepare() {
+	default
+	sed -i -e "s/ -ggdb//g" configure.ac || die
+	eautoreconf
+	python_fix_shebang .
+}
+
+src_configure() {
+	# appends lib to localstatedir automatically
+	local myconf=(
+		--libdir="/usr/$(get_libdir)"
+		--localstatedir=/var
+		--disable-dependency-tracking
+		--disable-fatal-warnings
+		--disable-static
+		--without-cs-quorum
+		--without-cman
+		$(use_with acl)
+		$(use_with heartbeat)
+		$(use_with smtp esmtp)
+		$(use_with snmp)
+	)
+
+	if use heartbeat ; then
+		myconf+=( --without-corosync )
+	else
+		myconf+=( --with-ais )
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	rm -rf "${D}/var/run" "${D}/etc/init.d"
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}" || die
+	if has_version "<sys-cluster/corosync-2.0"; then
+		insinto /etc/corosync/service.d
+		newins "${FILESDIR}/${PN}.service" "${PN}" || die
+	fi
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/sys-cluster/slurm/Manifest b/sys-cluster/slurm/Manifest
index 832f1267c85a..ecc3f0dfceb9 100644
--- a/sys-cluster/slurm/Manifest
+++ b/sys-cluster/slurm/Manifest
@@ -6,7 +6,9 @@ AUX slurmctld.initd 1842 BLAKE2B 25c9fd76dc888544888abb2790d8a0ae66254c0f8807bf4
 AUX slurmd.initd 2001 BLAKE2B a0464ee0407406c7ceadd8e78f0229f5c6eda7081a691e24e609caa50f627d9bbf9c2d57bc6746b9c719a66cf2f4b0d756ecbbaf3bcd070846ad5ced6b289c9d SHA512 bb9447c25d2e96de1aea5935084ea78ea403701bd655d89d1a9d1d21bdbf88bdbae3888cfd618aabcc86dd8808401157ff84402ef35c4e138263457fd954046a
 AUX slurmdbd.initd 1717 BLAKE2B e177a937f8bd97bb2f45e479e0f34b23cc23ab44b0000165a856ff8476560638a567baecad8aa8d57aeb76062f248039da7f440ddca8f5827e4729136a10d7de SHA512 6d21f667f4222ab62dc8d7f648e00205da982612d58b98e8e35e6b6602b3ad31c03e5130402437c77d3677b424da7b5226e2bfa8c5d29bc908fd618fc02697a8
 DIST slurm-18.08.7.tar.bz2 6186006 BLAKE2B a5458f72cbe93bc1103c2c7f3d428ae14239cb092edad2c683e448dda35f3e108fef0d9a3a86599da6058c9c98a86dafed9a087ffe6e8d7425db9cdb879954b3 SHA512 d0047086f1b716877cc5bb39539bf96a8fd08b1851c85fd85112c6432c1ce2a0f29fc9dd8803094c8fa44d063cec5f417e6bed231b6d338934ff4b48424a5a93
+DIST slurm-19-05-4-1.tar.gz 8446001 BLAKE2B d3b1524a72d7969b14788b93c7d64b03faf159b71b1ed8fb30782980b7b39e9f4a1d1435f4fbdce722ed9585e7d3285f9a84322c5a5d2f44d5e084bb38019ae4 SHA512 ecee26b23fc72ea4b6eb3039aada1814b5932d75eaf61501a31b97ac8f7b600864f2429a36de068f1f1cde178fa1383f2c53192af5b1a62766e3ffe48be4395c
 DIST slurm-19.05.3-2.tar.bz2 6233270 BLAKE2B be59d157e99353340f9801f0adac21cfb8c3051f8d6a1bd94ad76fc05d0f83d1f933f72bf4e33b603521ec94cc859185bf56ecbcab674fcbff526164dd39d3cc SHA512 15d63f1ba693458b220ece5512210f1dba52273946809b338e33d684b9daadecd3cc77fda84c1b3bf8b03bc0fe8b8be0f429a96a1bf72a8b5c8cf169e0e1f5bb
 EBUILD slurm-18.08.7.ebuild 8062 BLAKE2B b3534281cbb333b2ec2376a86b361324d34356d1cd1a48d01e4189070ca85d5d668165e34bedeb776f9342e5954c1fe2955ad0ef5cd199616194b488b39f1c86 SHA512 237ac5e4db3616906d5f40dc417a53ff6dc2b276ac178c287e578579528b20989bf27c32bea286681e95cf35f72ef17000736330598d4c9d827712d82c7ecda4
 EBUILD slurm-19.05.3.2.ebuild 8000 BLAKE2B e150b57f5e125dbd200a27baee3487b738acd88e1ac8f3955a9cd13a8ebc1b260f390c1c3d207c3856029f906d5a0b55ed9a59de0ed7b8c5c5eed401f147e2af SHA512 94bc73f29ea276cabc863a9b4c62aac4b043ba93a43bcaaaf64c7d34c8bf8e25916c05991071ea72075735ef7e653013c76d98efaa5e2e053c9253fdd30b0ec4
+EBUILD slurm-19.05.4.1.ebuild 8046 BLAKE2B 7a20345c3cca566b6fa0f7908880080adf2052732c50c1665da56a45fcf35580dd1911da3fcc803c4961957f7a7a2a4883bd9eb5c63f3a8f2191c71d1f461e5d SHA512 d5b615b0c664d734f709538ee9e8eb38d53e1710bb87864102bf3a5034b55351df32f95f987e1640536f753b0246937a6455e6442f9811a91404c1f1299198e6
 MISC metadata.xml 1199 BLAKE2B b52e7cae7554d439e7f25da2a80d98993d5c7f7abd5ba8b76c09bf60731b035040f976ac1bfc3c153f81b8feed89e2ceb5e6b676c25cc7b6219c4bcd87bd7e50 SHA512 8f48d582e61789373fc07ffd1db123cb8f43d337b03611972e480179ca5b43f2866392203f470d3d69784f2aae79cbcffdf583cba0aa4a9c25969f2c72a3f55f
diff --git a/sys-cluster/slurm/slurm-19.05.4.1.ebuild b/sys-cluster/slurm/slurm-19.05.4.1.ebuild
new file mode 100644
index 000000000000..2bfe56a32f5a
--- /dev/null
+++ b/sys-cluster/slurm/slurm-19.05.4.1.ebuild
@@ -0,0 +1,266 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/SchedMD/slurm.git"
+	INHERIT_GIT="git-r3"
+	SRC_URI=""
+	KEYWORDS=""
+	MY_P="${P}"
+else
+	if [[ ${PV} == *pre* || ${PV} == *rc* ]]; then
+		MY_PV=$(ver_rs '-0.') # pre-releases or release-candidate
+	else
+		MY_PV=$(ver_rs 1-3 '-') # stable releases
+	fi
+	MY_P="${PN}-${MY_PV}"
+	INHERIT_GIT=""
+	SRC_URI="https://github.com/SchedMD/slurm/archive/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+inherit autotools bash-completion-r1 pam perl-module prefix toolchain-funcs systemd ${INHERIT_GIT}
+
+DESCRIPTION="A Highly Scalable Resource Manager"
+HOMEPAGE="https://www.schedmd.com https://github.com/SchedMD/slurm"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug hdf5 html ipmi json lua multiple-slurmd +munge mysql netloc numa ofed pam perl slurmdbd ssl static-libs ucx torque X"
+
+COMMON_DEPEND="
+	!sys-cluster/torque
+	!net-analyzer/slurm
+	!net-analyzer/sinfo
+	|| ( sys-cluster/pmix[-pmi] >=sys-cluster/openmpi-2.0.0 )
+	mysql? (
+		|| ( dev-db/mariadb-connector-c dev-db/mysql-connector-c )
+		slurmdbd? ( || ( dev-db/mariadb dev-db/mysql ) )
+		)
+	munge? ( sys-auth/munge )
+	pam? ( sys-libs/pam )
+	ssl? ( dev-libs/openssl:0= )
+	lua? ( dev-lang/lua:0= )
+	!lua? ( !dev-lang/lua )
+	ipmi? ( sys-libs/freeipmi )
+	json? ( dev-libs/json-c:= )
+	amd64? ( netloc? ( sys-apps/netloc ) )
+	hdf5? ( sci-libs/hdf5:= )
+	numa? ( sys-process/numactl )
+	ofed? ( sys-fabric/ofed )
+	ucx? ( sys-cluster/ucx )
+	X? ( net-libs/libssh2 )
+	>=sys-apps/hwloc-1.1.1-r1
+	sys-libs/ncurses:0=
+	app-arch/lz4:0=
+	sys-libs/readline:0="
+DEPEND="${COMMON_DEPEND}
+	html? ( sys-apps/man2html )"
+RDEPEND="${OMMON_DEPEND}
+	acct-user/slurm
+	acct-group/slurm
+	dev-libs/libcgroup"
+
+REQUIRED_USE="torque? ( perl )"
+
+S="${WORKDIR}/${PN}-${MY_P}"
+
+LIBSLURM_PERL_S="${WORKDIR}/${MY_P}/contribs/perlapi/libslurm/perl"
+LIBSLURMDB_PERL_S="${WORKDIR}/${MY_P}/contribs/perlapi/libslurmdb/perl"
+
+RESTRICT="test"
+
+src_unpack() {
+	if [[ ${PV} == *9999* ]]; then
+		git-r3_src_unpack
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	tc-ld-disable-gold
+	default
+
+	# pids should go to /var/run/slurm
+	sed \
+		-e 's:/tmp:/var/tmp:g' \
+		-e "s:/var/run/slurmctld.pid:${EPREFIX}/run/slurm/slurmctld.pid:g" \
+		-e "s:/var/run/slurmd.pid:${EPREFIX}/run/slurm/slurmd.pid:g" \
+		-e "s:StateSaveLocation=.*:StateSaveLocation=${EPREFIX}/var/spool/slurm:g" \
+		-e "s:SlurmdSpoolDir=.*:SlurmdSpoolDir=${EPREFIX}/var/spool/slurm/slurmd:g" \
+		-i "${S}/etc/slurm.conf.example" \
+		|| die "Can't sed for /var/run/slurmctld.pid"
+	sed \
+		-e "s:/var/run/slurmdbd.pid:${EPREFIX}/run/slurm/slurmdbd.pid:g" \
+		-i "${S}/etc/slurmdbd.conf.example" \
+		|| die "Can't sed for /var/run/slurmdbd.pid"
+	# gentooify systemd services
+	sed \
+		-e 's:sysconfig/.*:conf.d/slurm:g' \
+		-e 's:var/run/:run/slurm/:g' \
+		-e '/^EnvironmentFile=.*/d' \
+		-i "${S}/etc"/*.service.in \
+		|| die "Can't sed systemd services for sysconfig or var/run/"
+
+	hprefixify auxdir/{ax_check_zlib,x_ac_{lz4,ofed,munge}}.m4
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		--sysconfdir="${EPREFIX}/etc/${PN}"
+		--with-hwloc="${EPREFIX}/usr"
+		--docdir="${EPREFIX}/usr/share/doc/${P}"
+		--htmldir="${EPREFIX}/usr/share/doc/${P}"
+	)
+	use pam && myconf+=( --with-pam_dir=$(getpam_mod_dir) )
+	use mysql || myconf+=( --without-mysql_config )
+	use amd64 && myconf+=( $(use_with netloc) )
+	econf "${myconf[@]}" \
+		$(use_enable debug) \
+		$(use_enable pam) \
+		$(use_enable X x11) \
+		$(use_with ssl) \
+		$(use_with munge) \
+		$(use_with json) \
+		$(use_with hdf5) \
+		$(use_with ofed) \
+		$(use_with ucx) \
+		$(use_enable static-libs static) \
+		$(use_enable multiple-slurmd)
+
+	# --htmldir does not seems to propagate... Documentations are installed
+	# in /usr/share/doc/slurm-2.3.0/html
+	# instead of /usr/share/doc/slurm-2.3.0.2/html
+	sed \
+		-e "s|htmldir = .*/html|htmldir = \${prefix}/share/doc/slurm-${PVR}/html|g" \
+		-i doc/html/Makefile || die
+	if use perl ; then
+		# small hack to make it compile
+		mkdir -p "${S}/src/api/.libs" || die
+		mkdir -p "${S}/src/db_api/.libs" || die
+		touch "${S}/src/api/.libs/libslurm.so" || die
+		touch "${S}/src/db_api/.libs/libslurmdb.so" || die
+		cd "${LIBSLURM_PERL_S}" || die
+		S="${LIBSLURM_PERL_S}" SRC_PREP="no" perl-module_src_configure
+		cd "${LIBSLURMDB_PERL_S}" || die
+		S="${LIBSLURMDB_PERL_S}" SRC_PREP="no" perl-module_src_configure
+		cd "${S}" || die
+		rm -rf "${S}/src/api/.libs" "${S}/src/db_api/.libs" || die
+	fi
+}
+
+src_compile() {
+	default
+	use pam && emake -C contribs/pam
+	if use perl ; then
+		cd "${LIBSLURM_PERL_S}" || die
+		S="${LIBSLURM_PERL_S}" perl-module_src_compile
+		cd "${LIBSLURMDB_PERL_S}" || die
+		S="${LIBSLURMDB_PERL_S}" perl-module_src_compile
+		cd "${S}" || die
+	fi
+	use torque && emake -C contribs/torque
+}
+
+src_install() {
+	default
+	use pam && emake DESTDIR="${D}" -C contribs/pam install
+	if use perl; then
+		cd "${LIBSLURM_PERL_S}" || die
+		S="${LIBSLURM_PERL_S}" perl-module_src_install
+		cd "${LIBSLURMDB_PERL_S}" || die
+		S="${LIBSLURMDB_PERL_S}" perl-module_src_install
+		cd "${S}" || die
+	fi
+	if use torque; then
+		emake DESTDIR="${D}" -C contribs/torque
+		rm -f "${D}"/usr/bin/mpiexec || die
+	fi
+	use static-libs || find "${ED}" -name '*.la' -exec rm {} +
+	# install sample configs
+	keepdir /etc/slurm
+	insinto /etc/slurm
+	doins \
+		etc/bluegene.conf.example \
+		etc/cgroup.conf.example \
+		etc/slurm.conf.example \
+		etc/slurmdbd.conf.example
+	exeinto /etc/slurm
+	keepdir /etc/slurm/layouts.d
+	insinto /etc/slurm/layouts.d
+	newins etc/layouts.d.power.conf.example power.conf.example
+	newins etc/layouts.d.power_cpufreq.conf.example power_cpufreq.conf.example
+	newins etc/layouts.d.unit.conf.example unit.conf.example
+	# install init.d files
+	newinitd "$(prefixify_ro "${FILESDIR}/slurmd.initd")" slurmd
+	newinitd "$(prefixify_ro "${FILESDIR}/slurmctld.initd")" slurmctld
+	newinitd "$(prefixify_ro "${FILESDIR}/slurmdbd.initd")" slurmdbd
+	# install conf.d files
+	newconfd "${FILESDIR}/slurm.confd" slurm
+	# install logrotate file
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/logrotate" slurm
+	# install bashcomp
+	newbashcomp contribs/slurm_completion_help/slurm_completion.sh scontrol
+	bashcomp_alias scontrol \
+		sreport sacctmgr squeue scancel sshare sbcast sinfo \
+		sprio sacct salloc sbatch srun sattach sdiag sstat
+	# install systemd files
+	systemd_newtmpfilesd "${FILESDIR}/slurm.tmpfiles" slurm.conf
+	systemd_dounit etc/slurmd.service etc/slurmctld.service etc/slurmdbd.service
+}
+
+pkg_preinst() {
+	if use munge; then
+		sed -i 's,\(SLURM_USE_MUNGE=\).*,\11,' "${D}"/etc/conf.d/slurm || die
+	fi
+}
+
+create_folders_and_fix_permissions() {
+	einfo "Fixing permissions in ${@}"
+	mkdir -p ${@} || die
+	chown -R ${PN}:${PN} ${@} || die
+}
+
+pkg_postinst() {
+	paths=(
+		"${EROOT}"/var/${PN}/checkpoint
+		"${EROOT}"/var/${PN}
+		"${EROOT}"/var/spool/${PN}/slurmd
+		"${EROOT}"/var/spool/${PN}
+		"${EROOT}"/var/log/${PN}
+		/var/tmp/${PN}/${PN}d
+		/var/tmp/${PN}
+		/run/${PN}
+	)
+	local folder_path
+	for folder_path in ${paths[@]}; do
+		create_folders_and_fix_permissions $folder_path
+	done
+	echo
+
+	elog "Please visit the file '/usr/share/doc/${P}/html/configurator.html"
+	elog "through a (javascript enabled) browser to create a configureation file."
+	elog "Copy that file to /etc/slurm/slurm.conf on all nodes (including the headnode) of your cluster."
+	echo
+	elog "For cgroup support, please see https://www.schedmd.com/slurmdocs/cgroup.conf.html"
+	elog "Your kernel must be compiled with the wanted cgroup feature:"
+	elog "    For the proctrack plugin:"
+	elog "        freezer"
+	elog "    For the task plugin:"
+	elog "        cpuset, memory, devices"
+	elog "    For the accounting plugin:"
+	elog "        cpuacct, memory, blkio"
+	elog "Then, set these options in /etc/slurm/slurm.conf:"
+	elog "    ProctrackType=proctrack/cgroup"
+	elog "    TaskPlugin=task/cgroup"
+	einfo
+	ewarn "Paths were created for slurm. Please use these paths in /etc/slurm/slurm.conf:"
+	for folder_path in ${paths[@]}; do
+		ewarn "    ${folder_path}"
+	done
+}
diff --git a/sys-cluster/spark-bin/Manifest b/sys-cluster/spark-bin/Manifest
index 2e163dfb3375..d2ed875787bf 100644
--- a/sys-cluster/spark-bin/Manifest
+++ b/sys-cluster/spark-bin/Manifest
@@ -1,6 +1,6 @@
 AUX 99spark 26 BLAKE2B c25fe3d379a16c8a51764ea5b4c27d8f34869687c882141f0428d102d921eb65fea8ac253e407fe07fd4cce1232dd513728b1340bc0bcd21bd19ce0aed0c2420 SHA512 6d64d751f1504bea332b16078804abcaf21c8ea9c69f94fef3a8929b6d6cb1107ec899a5dc49770997243cbfda61edbcfa4d505da29220a71f5be38c1008f4f0
 DIST spark-bin-2.3.1.tgz 225883783 BLAKE2B d89e83a54aaabd39c5fa0d9c51a1bb5635f60ded4869672a387d13d87fffbb48385d4fbf67b55a96e709f27348f73a089624a0563c98eaba31f93d74bf4548ee SHA512 dc3a97f3d99791d363e4f70a622b84d6e313bd852f6fdbc777d31eab44cbc112ceeaa20f7bf835492fb654f48ae57e9969f93d3b0e6ec92076d1c5e1b40b4696
 DIST spark-bin-2.4.4.tgz 230091034 BLAKE2B 66f7e7bae6fe6959f233adc085560cf1b80a641b4018eb334d77f390eb88f5ab898e1ea59c1c17ca15a122f4f98eea4670ea7152bc2c83f6cb76cd11d3f586ec SHA512 2e3a5c853b9f28c7d4525c0adcb0d971b73ad47d5cce138c85335b9f53a6519540d3923cb0b5cee41e386e49ae8a409a51ab7194ba11a254e037a848d0c4a9e5
-EBUILD spark-bin-2.3.1.ebuild 1414 BLAKE2B f103c0fc60b8914834cfafb9d100f21d7299dd4d03a06ff4c6ef88ed303374a54b42cfc297ca5918fb62066b9572c2111b3568b816f79a74e34aab79073e5e12 SHA512 e9fae04c42a84609bf483b9abb879e5ce5c1716604790d3f0478feace9f0df7604993751e8748c6a8495bf10e7d8826a56da53a1d2da07363fdaad28d30d661a
-EBUILD spark-bin-2.4.4.ebuild 1414 BLAKE2B eac5901a30018631d781380efe54edf419b3e542d8a7a514d6e3bd0eae558bf120b64a1cfed96947e7aa5e6f72020a5d94cd8ba588e46cafeaa0b32f651c25aa SHA512 3f25749852cf2eaa914e3aeedddc3765ca58b44eeb19352de3aa2177ca13b023837c1e899eb11ec582b1d9bd159be0f5bb1bb068da0c3f84776d5f50df8273e9
+EBUILD spark-bin-2.3.1-r1.ebuild 1345 BLAKE2B 8e981f59a0cf2b62f38115b866aab1b31cc280accd02cc2e2c24342b3531302b3a38185a66894231589e0303afa11374919bae72c7ff9e357785b1e9b3566920 SHA512 36dcac657747a7b05f2048b7fe298d78425782d15c3d443cc5caec61785f2cb4eaf3aef82e1c5aa270b1ed6b7e283626b6e8180b2d99ccf8a3a34e8a1c0af04d
+EBUILD spark-bin-2.4.4-r1.ebuild 1345 BLAKE2B ce90de6e0fb044c4ab8a240156497456ce8076617df5cab3a486f5f05a06741d7fc6b561d3c029852ef085e6336315a4ff33fb098d2c1edab2eca1d436d54d2b SHA512 88290cc874a8734426fecccbdb971d97cf72ccb0a60b8d37e4c527b68f39c9ee2488ed427b8c5f5ea464c93bcd6bcd29ec1e4eb2ee774c19c97e1b741331c961
 MISC metadata.xml 499 BLAKE2B 7116e88708f7dafb75197e46237ea5d405bc703feadece0bb65766537f64bd2f7ea2b34cf4a4c94d4f25d74f040b6cf5eb0b0072a20600a9d206087b38f63831 SHA512 273279c1235d9888e5b30073044687584699f7f26fd696f019c5b11545f32095319b6bfe52196ed6846cf74c8ffaa2c7f6c9f3a29749fa3315f18adba917094c
diff --git a/sys-cluster/spark-bin/spark-bin-2.3.1-r1.ebuild b/sys-cluster/spark-bin/spark-bin-2.3.1-r1.ebuild
new file mode 100644
index 000000000000..b459784e9977
--- /dev/null
+++ b/sys-cluster/spark-bin/spark-bin-2.3.1-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit java-pkg-2
+
+DESCRIPTION="Lightning-fast unified analytics engine"
+HOMEPAGE="https://spark.apache.org"
+SRC_URI="mirror://apache/spark/spark-${PV}/spark-${PV}-bin-hadoop2.7.tgz -> ${P}.tgz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=virtual/jre-1.8"
+
+DEPEND="
+	>=virtual/jdk-1.8"
+
+S="${WORKDIR}/spark-${PV}-bin-hadoop2.7"
+
+DOCS=( LICENSE NOTICE README.md RELEASE )
+
+# Nothing to compile here.
+src_compile() { :; }
+
+src_install() {
+	dodir usr/lib/spark
+	into usr/lib/spark
+
+	dobin bin/beeline \
+		bin/find-spark-home \
+		bin/pyspark \
+		bin/spark-class \
+		bin/spark-shell \
+		bin/spark-sql \
+		bin/spark-submit
+
+	insinto usr/lib/spark/bin
+	doins bin/load-spark-env.sh
+
+	insinto usr/lib/spark
+	doins -r conf
+	doins -r jars
+	doins -r python
+	doins -r sbin
+	doins -r yarn
+
+	dosym ../lib/spark/bin/beeline /usr/bin/beeline
+	dosym ../lib/spark/bin/find-spark-home /usr/bin/find-spark-home
+	dosym ../lib/spark/bin/pyspark /usr/bin/pyspark
+	dosym ../lib/spark/bin/spark-class /usr/bin/spark-class
+	dosym ../lib/spark/bin/spark-shell /usr/bin/spark-shell
+	dosym ../lib/spark/bin/spark-sql /usr/bin/spark-sql
+	dosym ../lib/spark/bin/spark-submit /usr/bin/spark-submit
+
+	doenvd "${FILESDIR}"/99spark
+	einstalldocs
+}
diff --git a/sys-cluster/spark-bin/spark-bin-2.3.1.ebuild b/sys-cluster/spark-bin/spark-bin-2.3.1.ebuild
deleted file mode 100644
index 3742cb97bf5a..000000000000
--- a/sys-cluster/spark-bin/spark-bin-2.3.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit java-pkg-2
-
-DESCRIPTION="Lightning-fast unified analytics engine"
-HOMEPAGE="https://spark.apache.org"
-SRC_URI="mirror://apache/spark/spark-${PV}/spark-${PV}-bin-hadoop2.7.tgz -> ${P}.tgz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	>=virtual/jre-1.8"
-
-DEPEND="
-	>=virtual/jdk-1.8"
-
-S="${WORKDIR}/spark-${PV}-bin-hadoop2.7"
-
-DOCS=( LICENSE NOTICE README.md RELEASE )
-
-# Nothing to compile here.
-src_compile() { :; }
-
-src_install() {
-	dodir usr/lib/spark
-	into usr/lib/spark
-
-	dobin bin/beeline \
-		bin/find-spark-home \
-		bin/pyspark \
-		bin/spark-class \
-		bin/spark-shell \
-		bin/spark-sql \
-		bin/spark-submit
-
-	insinto usr/lib/spark/bin
-	doins bin/load-spark-env.sh
-
-	insinto usr/lib/spark
-	doins -r conf
-	doins -r jars
-	doins -r python
-	doins -r sbin
-	doins -r yarn
-
-	dosym "${ED%/}"/usr/lib/spark/bin/beeline /usr/bin/beeline
-	dosym "${ED%/}"/usr/lib/spark/bin/pyspark /usr/bin/pyspark
-	dosym "${ED%/}"/usr/lib/spark/bin/pyspark /usr/bin/find-spark-home
-	dosym "${ED%/}"/usr/lib/spark/bin/spark-class /usr/bin/spark-class
-	dosym "${ED%/}"/usr/lib/spark/bin/spark-shell /usr/bin/spark-shell
-	dosym "${ED%/}"/usr/lib/spark/bin/spark-sql /usr/bin/spark-sql
-	dosym "${ED%/}"/usr/lib/spark/bin/spark-submit /usr/bin/spark-submit
-
-	doenvd "${FILESDIR}"/99spark
-	einstalldocs
-}
diff --git a/sys-cluster/spark-bin/spark-bin-2.4.4-r1.ebuild b/sys-cluster/spark-bin/spark-bin-2.4.4-r1.ebuild
new file mode 100644
index 000000000000..63bb7e0eeb47
--- /dev/null
+++ b/sys-cluster/spark-bin/spark-bin-2.4.4-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit java-pkg-2
+
+DESCRIPTION="Lightning-fast unified analytics engine"
+HOMEPAGE="https://spark.apache.org"
+SRC_URI="mirror://apache/spark/spark-${PV}/spark-${PV}-bin-hadoop2.7.tgz -> ${P}.tgz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=virtual/jre-1.8"
+
+DEPEND="
+	>=virtual/jdk-1.8"
+
+S="${WORKDIR}/spark-${PV}-bin-hadoop2.7"
+
+DOCS=( LICENSE NOTICE README.md RELEASE )
+
+# Nothing to compile here.
+src_compile() { :; }
+
+src_install() {
+	dodir usr/lib/spark
+	into usr/lib/spark
+
+	dobin bin/beeline \
+		bin/find-spark-home \
+		bin/pyspark \
+		bin/spark-class \
+		bin/spark-shell \
+		bin/spark-sql \
+		bin/spark-submit
+
+	insinto usr/lib/spark/bin
+	doins bin/load-spark-env.sh
+
+	insinto usr/lib/spark
+	doins -r conf
+	doins -r jars
+	doins -r python
+	doins -r sbin
+	doins -r yarn
+
+	dosym ../lib/spark/bin/beeline /usr/bin/beeline
+	dosym ../lib/spark/bin/find-spark-home /usr/bin/find-spark-home
+	dosym ../lib/spark/bin/pyspark /usr/bin/pyspark
+	dosym ../lib/spark/bin/spark-class /usr/bin/spark-class
+	dosym ../lib/spark/bin/spark-shell /usr/bin/spark-shell
+	dosym ../lib/spark/bin/spark-sql /usr/bin/spark-sql
+	dosym ../lib/spark/bin/spark-submit /usr/bin/spark-submit
+
+	doenvd "${FILESDIR}"/99spark
+	einstalldocs
+}
diff --git a/sys-cluster/spark-bin/spark-bin-2.4.4.ebuild b/sys-cluster/spark-bin/spark-bin-2.4.4.ebuild
deleted file mode 100644
index ecd0c7b00f8a..000000000000
--- a/sys-cluster/spark-bin/spark-bin-2.4.4.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit java-pkg-2
-
-DESCRIPTION="Lightning-fast unified analytics engine"
-HOMEPAGE="https://spark.apache.org"
-SRC_URI="mirror://apache/spark/spark-${PV}/spark-${PV}-bin-hadoop2.7.tgz -> ${P}.tgz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	>=virtual/jre-1.8"
-
-DEPEND="
-	>=virtual/jdk-1.8"
-
-S="${WORKDIR}/spark-${PV}-bin-hadoop2.7"
-
-DOCS=( LICENSE NOTICE README.md RELEASE )
-
-# Nothing to compile here.
-src_compile() { :; }
-
-src_install() {
-	dodir usr/lib/spark
-	into usr/lib/spark
-
-	dobin bin/beeline \
-		bin/find-spark-home \
-		bin/pyspark \
-		bin/spark-class \
-		bin/spark-shell \
-		bin/spark-sql \
-		bin/spark-submit
-
-	insinto usr/lib/spark/bin
-	doins bin/load-spark-env.sh
-
-	insinto usr/lib/spark
-	doins -r conf
-	doins -r jars
-	doins -r python
-	doins -r sbin
-	doins -r yarn
-
-	dosym "${ED%/}"/usr/lib/spark/bin/beeline /usr/bin/beeline
-	dosym "${ED%/}"/usr/lib/spark/bin/pyspark /usr/bin/pyspark
-	dosym "${ED%/}"/usr/lib/spark/bin/pyspark /usr/bin/find-spark-home
-	dosym "${ED%/}"/usr/lib/spark/bin/spark-class /usr/bin/spark-class
-	dosym "${ED%/}"/usr/lib/spark/bin/spark-shell /usr/bin/spark-shell
-	dosym "${ED%/}"/usr/lib/spark/bin/spark-sql /usr/bin/spark-sql
-	dosym "${ED%/}"/usr/lib/spark/bin/spark-submit /usr/bin/spark-submit
-
-	doenvd "${FILESDIR}"/99spark
-	einstalldocs
-}
diff --git a/sys-cluster/teleport/Manifest b/sys-cluster/teleport/Manifest
index be13fcdf3f81..547b70dd6689 100644
--- a/sys-cluster/teleport/Manifest
+++ b/sys-cluster/teleport/Manifest
@@ -3,9 +3,13 @@ AUX teleport.init.d 940 BLAKE2B a3b5fd197e6d8e173903aac6e9db4a684a986ab7d52227d4
 AUX teleport.service 310 BLAKE2B 410a8ca2e1273a0b9ef1ad93f4ff21f71ecedc979e52eb4f7e1b807b5434fba2b88bd1e0a5544ac68489d6e0db641cda4d76e606bed9cc96527156088b9b088b SHA512 72a43cce5f16bbed63e3b25917d3a4d63641b735acf63975c13c3cd2624c7971f40dc697d1da0d9b94b54e675e051d0a4e863696f7ebcea14f1c4b86e9e1218b
 AUX teleport.service.conf 90 BLAKE2B 7f12f281d73ac6573c882a7910e400f901ff6392e0c576e4b7076972f4ced046f709c8898766aaf38cc38fbfcf450b526d3045ff859eed2a48e19dbd92ec3131 SHA512 d17faa0deaf3c864e5159d3567e542e36d09c6ea0ac91c663d3ae9729d1bccf7d2139f1f48fec132eccc473e023ffdaed0b8f2ee75db5dedc6ff36f637f68e1c
 AUX teleport.yaml 10168 BLAKE2B c84b33deabb616f58eb7b42224040405eb524749a98647e94bde8d3044e39ef2cd79baff6e8135e61f4b5db86ebc20f7f24b819459b944427386140d716490b2 SHA512 9893764ff11d0c499b30b5dd41c2e56dcf5719baa2d172ee5d500b5c9f7f81af9901f8cd2de8799f5520793f5be6755efc757c518659eca5d1ef89f9fb7a9e24
+DIST teleport-4.0.10.tar.gz 34928382 BLAKE2B f6e418cd3be87e8a559cef20c7761b3da13f30ae176f5d7665a3c50debbb538048fdf32373adac49f061f9b62b75360dc3b65db39c22838ad661a69df578bafa SHA512 67ebf37737ab9e5cf475bd99d94450ee3dd1f94a2611110f838f4e8882f20e8cafe5d43aa12cff223641b3a9b98b9f07549a7c2ec248c7000eddedae2964f5e2
 DIST teleport-4.0.9.tar.gz 34927445 BLAKE2B 267ef0ab269efc405f0522a6442d9b626dea62c800717cf01a9f0bdf40a34015b218c58cbd0e5ccbdd17634e91516ece35f6bbfb17864411ef02ae60cf3391eb SHA512 6a9fb59780d4da7f62a2f204f7f2e4321a7b73d9fd60e2de7d7ac1cdcf05e24895115e754aacdbdb75f4c21d40f1e42808e7f4e6bbb54df461167b45ebb7de24
 DIST teleport-4.1.1.tar.gz 42243379 BLAKE2B e01a32546bf3ecf52162d004ad24661160193e1586a98d045d83df63f01fc519ae2a6d4ad945da25a6509c153aacc3e23429be343914c35720f1b62da28d3e72 SHA512 7ed950ac7089052ec54872d9cf2ee12351a944268169ff442f0b1c91b3ad58fdf49c3c17839c8f330ae3c6192e9f4244a41cc2ba88f58b8f5435e334007348a5
+DIST teleport-4.1.4.tar.gz 42353194 BLAKE2B 905babaa899b80816b826a920f75dde55619ef7b476da6b3277347128a7301853241abcda852617363bfeb6fa432ef8f49d4b9444cde79e8e38ba9a79e2ec6dc SHA512 5aa8e872802924e03839d4311b346cf1ef00c786e77a62e43a7b182c49f8cee7430e153c5d9ce8400beba332c715d21cdffef7c75be86992e0290d3795b38f12
+EBUILD teleport-4.0.10.ebuild 1255 BLAKE2B 8d8e22edf8d468fc5348561291e273e72b40fd8a880a31f9f03464b745e813af576dd3ce8c70b4da638e7b4392b4e07d4ff8dc502b20c0c1f9d70fbcda90ed86 SHA512 1bc10a27fd1d9375f1a109b0f5bdd69d45c7399ab9a6c0cd8777c244f791cf01967847d3668a86723784588612539687f11a9bc1850fe79b92552d7b953c2c13
 EBUILD teleport-4.0.9.ebuild 1255 BLAKE2B 8d8e22edf8d468fc5348561291e273e72b40fd8a880a31f9f03464b745e813af576dd3ce8c70b4da638e7b4392b4e07d4ff8dc502b20c0c1f9d70fbcda90ed86 SHA512 1bc10a27fd1d9375f1a109b0f5bdd69d45c7399ab9a6c0cd8777c244f791cf01967847d3668a86723784588612539687f11a9bc1850fe79b92552d7b953c2c13
 EBUILD teleport-4.1.1.ebuild 1255 BLAKE2B 8d8e22edf8d468fc5348561291e273e72b40fd8a880a31f9f03464b745e813af576dd3ce8c70b4da638e7b4392b4e07d4ff8dc502b20c0c1f9d70fbcda90ed86 SHA512 1bc10a27fd1d9375f1a109b0f5bdd69d45c7399ab9a6c0cd8777c244f791cf01967847d3668a86723784588612539687f11a9bc1850fe79b92552d7b953c2c13
+EBUILD teleport-4.1.4.ebuild 1255 BLAKE2B 8d8e22edf8d468fc5348561291e273e72b40fd8a880a31f9f03464b745e813af576dd3ce8c70b4da638e7b4392b4e07d4ff8dc502b20c0c1f9d70fbcda90ed86 SHA512 1bc10a27fd1d9375f1a109b0f5bdd69d45c7399ab9a6c0cd8777c244f791cf01967847d3668a86723784588612539687f11a9bc1850fe79b92552d7b953c2c13
 EBUILD teleport-9999.ebuild 1243 BLAKE2B 58785b5537bcf47366cafe481ba1855e1acf1e6f4f1b5939195b58d3b3fced5690d9c0933c856111b834df50e9ab857d42ba826eb9664c2f51ee740c5a6e9442 SHA512 54b817d0e5be7872af7c52982842f94dee9573922c5450cd89aa3c507fc81d06e56eedcc505fda16ab0b96866184f5a226a7de2a745d121b9205ddaeb912f32a
 MISC metadata.xml 630 BLAKE2B ad22bb63ecf79ddd45b62fe0dcadd6d0d7fd475938b18ec868b56b0f4afe7ee5d3e0908eb0b13249a7c7b5031a3296bec406fea6fb487069a087c9e29dcf0ef2 SHA512 2aa911f2a91bfdea340b38715d69cbe59bcd460d34ac6d1d641f2badf2ba72f4e02cdd2f8a2ca387c9a9d19ea2c22e2be80ab4bb582d9395c1517b818f343c74
diff --git a/sys-cluster/teleport/teleport-4.0.10.ebuild b/sys-cluster/teleport/teleport-4.0.10.ebuild
new file mode 100644
index 000000000000..5421480e2d1b
--- /dev/null
+++ b/sys-cluster/teleport/teleport-4.0.10.ebuild
@@ -0,0 +1,50 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit golang-build systemd
+
+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="pam"
+LICENSE="Apache-2.0 MIT BSD ISC"
+RESTRICT="test strip"
+SLOT="0"
+
+BDEPEND="app-arch/zip"
+RDEPEND="pam? ( sys-libs/pam )"
+
+src_compile() {
+	BUILDFLAGS="" 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}
+	newins "${FILESDIR}"/${PN}.yaml ${PN}.yaml
+
+	newinitd "${FILESDIR}"/${PN}.init.d ${PN}
+	newconfd "${FILESDIR}"/${PN}.conf.d ${PN}
+
+	systemd_newunit "${FILESDIR}"/${PN}.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-4.1.4.ebuild b/sys-cluster/teleport/teleport-4.1.4.ebuild
new file mode 100644
index 000000000000..5421480e2d1b
--- /dev/null
+++ b/sys-cluster/teleport/teleport-4.1.4.ebuild
@@ -0,0 +1,50 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit golang-build systemd
+
+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="pam"
+LICENSE="Apache-2.0 MIT BSD ISC"
+RESTRICT="test strip"
+SLOT="0"
+
+BDEPEND="app-arch/zip"
+RDEPEND="pam? ( sys-libs/pam )"
+
+src_compile() {
+	BUILDFLAGS="" 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}
+	newins "${FILESDIR}"/${PN}.yaml ${PN}.yaml
+
+	newinitd "${FILESDIR}"/${PN}.init.d ${PN}
+	newconfd "${FILESDIR}"/${PN}.conf.d ${PN}
+
+	systemd_newunit "${FILESDIR}"/${PN}.service ${PN}.service
+	systemd_install_serviced "${FILESDIR}"/${PN}.service.conf ${PN}.service
+}
+
+src_test() {
+	BUILDFLAGS="" GOPATH="${S}" emake -C src/${EGO_PN%/*} test
+}
-- 
cgit v1.2.3