gentoo resync : 27.01.2018

18 files changed, 44 insertions, 171 deletions

diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index b877cbde0fba..0cac28e0e705 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/openmpi/Manifest b/sys-cluster/openmpi/Manifest
index 08fb109a5915..0c35a70099d4 100644
--- a/sys-cluster/openmpi/Manifest
+++ b/sys-cluster/openmpi/Manifest
@@ -12,16 +12,16 @@ DIST openmpi-2.0.2.tar.bz2 8311215 BLAKE2B 8dd0d7b95c396e9a0f05760136bbf62defd35
 DIST openmpi-2.0.4.tar.bz2 8272983 BLAKE2B 7d0a392fbc8c896cdccefb9bf0ff83fbd8db8a42d17f06cb23ac88ba896e2c75e1b1b7a79559d0ce3c2b881f197f54ce1bd8967c889bafe2b97f95fb6b957501 SHA512 2cccb83847d44f6282ec24f7bc12ab51b84dc5ac1a2a919ef0761847ff7cdcb31cfb1f38dca33df7063a98c27a64575a108002716d207cbba3a54773b999e6c5
 DIST openmpi-2.1.2.tar.bz2 8278459 BLAKE2B 83f6617322baad4fb13d399fa6a491d1d8dec1a5862974552a5f0cb033ab2a27eb0a44055e2670e3fbe79dbac68ed0130bdfec057cad48e474b814ccd56e59e6 SHA512 8a27a67cab384f9f03efe69bfdd51a8e8790f47a156e3a7e34f26a29d033889653070981c0105f142a96f00293fc069536bd020ae28a97afb564eab747e60457
 DIST openmpi-3.0.0.tar.bz2 9267606 BLAKE2B 9ee569a9c5f5918bb3d389a2945a2e7a5d98464afbd111eb2426a4e8296a23cf6d5b558554ce8126b13f910bd59acbb77e93ac297f3cf222c4bc764836b39ee6 SHA512 7e37eacf959a803d6d89dff4291b64a1f3d83bc7941b778a2fb13d12be0f205cb904e4a807d79676ad1e31fd99ffb15f255c8a227e830673455abb144f14616a
-EBUILD openmpi-1.10.7.ebuild 6355 BLAKE2B 3217a0e603cc8a1a2c9f2e9abf4d55e06e8cd8236ce257713c497a259734d62f634358fe6b4529884d740f7095bfa555fd2e9d4639f2b4d96409a57e594d13bc SHA512 1da5f322ebc8e7d0e4858bf005083370d1431559fa445eb0f0b80cdc9cf75d0493ab8db452784f87d052b38f434031b20c01f5eacd780eb720d69b9677b9e140
-EBUILD openmpi-1.4.3.ebuild 2571 BLAKE2B 82d9af83842020d3ec526b3abfdf413ce6408d563e50c761615a25f29a046cfa2b8aa9976954a266df35030a111f6dcb4482687ebc66d0ee4688c1fbb0151c38 SHA512 cbd64eaa022ca3861166ceb5a12b0d113d88c9cf4381c5f4eb9e1ca9c0b0006c2457e7639a2cabdd8118518f313bded89d80eb0b2ccd9a91dbb29018a3dd9efd
-EBUILD openmpi-1.4.5.ebuild 2580 BLAKE2B ec72a459e6ed9f8264e74700d541a303d52f1b1dced0f3b512041b415bfcee86e64e3661644107aee8c4cfe4528afdf84e79a23e91a3557e2837846feb6991df SHA512 a8b3f8628aa6f8379b959d2c3ea7ad4e8d9edf7c1e5a41e54e42959f831b53355a3dd0590a72e389f3864dcecafbc62f4b4cee03fe475455900e881598a290a1
-EBUILD openmpi-1.6.5-r1.ebuild 5294 BLAKE2B 1444b0787b6a32fccbe2bfb87f02b27305002221da5b6ae7ff2a11a6e727b3d5fe15a84f79b374263359d606ae1c14db9808c5edcfa2a569b460ef56e851a7ca SHA512 9598d7407d6af3fa0c726aebc087731fa612590127da79fe559a151fd339991fd955c2825538dcfbc0ef255efba47952cbfe7af591e629c590a31c73443390f6
-EBUILD openmpi-1.7.5-r1.ebuild 4989 BLAKE2B e2f22a357515aeb734c191422331e7f7207aae50c27b6fcc4572c3f195070fc42c163135e077869c11b8e8689cdb9d2d4d91fa78a4e7e3e52bd82b1575a2c5b5 SHA512 b69c89d38fed3d7345a12d783f8ef553cc1156e2f8058d990c8a866155a8aeca76b93a514f9980099dc378fdc49752392854d4c432af6cc17fc38e72cb2a7ae8
-EBUILD openmpi-1.8.4-r4.ebuild 5032 BLAKE2B 4139eae8a8c37ddb8f3199c9d2f4603b106ebc62f70b60c3221b2547f4546aaf2c105a1b5c44e2b33375a4398112e3c8f3b30e010f857aa54af2f2fa0fbe600d SHA512 2ebcedba5301d5e70b6c91f958ff902b83ab977187aec96956d468499880788851fe36996a04245c559a6c3eea447467620ac040e3d944c12ba18444c7fca634
-EBUILD openmpi-1.8.7-r1.ebuild 5544 BLAKE2B 9cd368c551d8d47477f524676d6aa1cd981b32a58041f624fbe2cf39c03290e829c4e404e6340334f559fe2065e507bf91f65aae59e3bfc57c07d4331216b962 SHA512 2b3de9e53b8cb911a5ab1a1181f734fb115f77b2ceeadaaf04eaaf776eb476150633d307431c7294a602ab48a6fb9c7172fbf057c1ec0d2155c8a5eb72953ef0
-EBUILD openmpi-1.8.8.ebuild 5550 BLAKE2B 06f87cf78851ae31b86f77ab1e8ef7c71ebb919e39e73df95b81e8aaffc38b1b1afb20c1972cf6328b51fe8d734baf274ef95b8450ebb2e7948b3b98b8a86e56 SHA512 51a5e3282133dbcc1d54e21f5f3957804c32df6d799d968dba43263cb7aba089fe9f7338b09c0e285b2d007758d446a8e64a02b2609a211b03bf984ec0fe3192
-EBUILD openmpi-2.0.2.ebuild 5865 BLAKE2B 6a89c033e8d1e0d77390f6b8d662137d46b4f4c5c326b4092a86746a3168003ad73bb3fd780ccd8b714ff4a90b03f68810adb8c5daf303039a0b7c59757e3682 SHA512 52b5c8c601d20988b06fb96d88b4afa4d81c759ab5526ced4f5844e7fd7b94003dfeca2ab50c9344352d448a0dfc88a09effd518dfc91cebabb311427ebd35af
-EBUILD openmpi-2.0.4.ebuild 5863 BLAKE2B de4495c7064fecd4b83f4ff03058ef1debb452461ca1f65b4d5117636719cfb3d8d8bca8cfc266f30efab816f690b4330a8cc126b491790ae702cc147013fec3 SHA512 bec1430b29d0bf95c349c61a2eee288a228bef721bc2a2587354679918610cd852fe032a48e16869ba8abfd9b15c9e0908f24b859b8ec89a67525ceab88d6a2e
-EBUILD openmpi-2.1.2.ebuild 5580 BLAKE2B 2ea31b522aab0aad425d75c9819bf52f17943df64f754656f6e1d8fe82621f97956537c3513332f1c1e163b00e0eaae79a8f22670d0e62f9916421dceeea43e0 SHA512 86bdd21e669732ee8bb13fb9b6461d75b7680dc5ee1ca90985562e479ab4df06f3bde2d7c4e765e3fbf893eb967f81d6092648eb16071e365ba008ab1dd0a2e5
-EBUILD openmpi-3.0.0.ebuild 5466 BLAKE2B bcd2bd17ad1083973abf4deabe650ea15ab96b9b016b4f3206f9f840bbeca00aafb3bce003be1f019d9319114c4e939017942676cccee0f3a21917bb35afb4c6 SHA512 25b3c1a816319b8113cc3e7b39dc7d425e10f820d8d5dbeee3dc3b28779da39cd59e9a9f1f9ac3fedc8329a33f4dc74b38cb9325677c034fbbc0ec32ef1b3ee9
+EBUILD openmpi-1.10.7.ebuild 6393 BLAKE2B aa12672c1001a3202bda64baef192936ce0b01d48f103d64a63392ea0b575518700739163b1b8be68c30569338d1e60c96891f5080833b52353c511810fe9878 SHA512 3d77924fd58fedefecfcd0670c856d1e7f5e84378b196427f1f9ac5b75989680718a88d4d6fcef2c97c92feaf08d1e1a8a41af0cf53f27655d674f5f469dfef3
+EBUILD openmpi-1.4.3.ebuild 2609 BLAKE2B 89a9c29abfeefec1a634d9e47d06d3711308eea7ee12f9caf6e606fc037a4dcde1de4d8b8f3af5a38b37f5507d5ab48de157905adf2405243288c91be81037b9 SHA512 2f9167f3560fbddf5add9b541ab04b50f995f7db19234c4f35187465d4e9b5399b9a4cf44aa2e879dd6e5419393a87b526059ea538c31b83db441affaa738324
+EBUILD openmpi-1.4.5.ebuild 2618 BLAKE2B 96f296ccf3769f447a191872fd0a8be6729efcf9faf4ae9d9e4b48378c0d0e82e19b87cac583b3e37f3ce450cdc97de3a5b53064e8b9e9dbf479d61fd66f7166 SHA512 19a6fe168a919c00d050f4765743a781fa7366d55e76e0c4577d06c41ea02f250e3d3271b57c9dacfdb1cbca4c83d98894ebab68d9e722f2674320da71c162db
+EBUILD openmpi-1.6.5-r1.ebuild 5332 BLAKE2B 0ec2290549071656df12ce053bfcfbea3cf2cb07a170e03a6ea984f3669415264d53f926328f80393d50d8b498a701c6bb54a5ea90ce96bbc9b405d104c88f67 SHA512 ed720f49baf180819f45bbf0e7da1ebb5b5c911ce85bc6a07c19bad85cb70f7c092eaf2789c3c5756fe22970039cb7323c039069167f90673c2ada17e072026d
+EBUILD openmpi-1.7.5-r1.ebuild 5027 BLAKE2B 845258cd2ccedde7ee293673a4ef963af102b9d195bf70990ff6f36c5d34f412e00dfb1d5a50ba6cf2f560f36e27d400704f6ac37bd59558447972955919b6c4 SHA512 c1d6ae9b3b7de3b199187427fc9e341d30fc1aaaa8af3d4b40a9c4cf041fd7b075b31183d8364b2ca8aa42faabff482ce0ec6c5e8d9e24e2b608bc6b20ecb281
+EBUILD openmpi-1.8.4-r4.ebuild 5070 BLAKE2B 4198a8d25c8ea1ecf338573dee0110e21b84b34a51a96887c161672d00aedf5e84ba1f9dd8d907fa33d089dfe34f7257d48938189049ec8f7324abdc03fcbb07 SHA512 e5bfe9b21e51525e9a5a014aaec2789ea0872a5892f98251adb704b93fb3fc59878d6e1341a1949524c03113ffe53e0ca14a00409ac1ad382cbd3720ec2ca463
+EBUILD openmpi-1.8.7-r1.ebuild 5582 BLAKE2B c6ee77fa3fe8727483fea9cef4595251e00c39f56222f991fd7b7a6e0b3cf383877eac3012a6a328a053375f955a1084c8e3e526d220799d63d0512d0e8a2484 SHA512 92a18ce195accaf97bfdde6537a7b1050cb30a8499e4ef2ab73fe6aa301e8a4e3590197d9581b4891f29f00d56ed8c4b219cc452aa95311b030abbfc6cbd49f9
+EBUILD openmpi-1.8.8.ebuild 5588 BLAKE2B c347599dee7a2181af1029bb0d952e4f9c1d92124785d8bb3e92c00fa76a4ff1b18b3e6f6071221971d6c3255136404d8d875a8b63df4420a321187d948b7402 SHA512 4ad186947a2da72e6957acfb9de023e9a02f47bf761971e7a200f9ff5f2c116d860d26f440cb5adca47b270edfe9bd48d459f1593ae47f7ee076303490a01f69
+EBUILD openmpi-2.0.2.ebuild 5903 BLAKE2B 514a877afbe8f190874068e484b0cac0d7dcb8ee535cb512191d27d12bc5ae475ee9c9424ea8992c408dea3bf6b83abcbdf70b4ced1453e0e43329600a548a40 SHA512 2ea34926ab67a3c92e7262643c9f655bbd36952c21e6f77c8de1b4d60eb649d1b7c9bc0e36f3a26af0716231e9cffb26351fc143c3d7ec52dba53ddf31e1f884
+EBUILD openmpi-2.0.4.ebuild 5901 BLAKE2B ad0b46dd7f73e8600771f7dcb3681afa5ae4d352e387b5ec9c5d18a3150840d23676296efe4555f3ed5e1f24b1dccb9715ff94977793bbd81d546effa29fca55 SHA512 397aa6c8c92446955adc52f38953190452166032757a5658cf18ed850beee04f38acdad1a90550ea66716cce22b16d67a1f3b146c6a17d6259060dd87fd77657
+EBUILD openmpi-2.1.2.ebuild 5618 BLAKE2B 7b271525a70585159fe3d74d5040ff1f4aabff28aadc5e4d5efafe1c9c2e9b6ff090d9a134be397a388fcd06ab6a080f2d119559d5e518333772b86a44b9c945 SHA512 f7644e47f09e6d051c477601076949a2404b719992663d594d3bc749d869e9c15962b50e7781feb1d85adbb448f43eb19ac8c0d517ceffdee3c60709fd8bfbd0
+EBUILD openmpi-3.0.0-r1.ebuild 5504 BLAKE2B 4650ff7d29b3124fdb3e39b837e414af0aa207d873d7ea6fe54a6ebdf9d7dc9bc456cfec1251485c0b2a57fa6a47ce0ef3ade350b047f58b7eae47b67b140a7b SHA512 3eb7b81014dcef1d06a1aab49495235c6f2f731f7ac54955d496d75a3015108d7683dad32ca0cc7c002446f7289c4742307b585c4f83b2d1e6157f97f8df3171
 MISC metadata.xml 901 BLAKE2B 8cdef4e4438351cb99b59bafb932e4b2b960f08b4eaa9917ac2a5d97fd2423781b1ec27a16005ae6470b8f50509ae3c08c2d06f95e452bd2cf00505b7a79ac35 SHA512 6f30f50d2f2173a01e7ef0d4b808352be98b64945b6af1f05cfaa28024f6efccad28984fe0ad31094f8822c5e251c1270765d5905c7737e1b84302143fe4ac09
diff --git a/sys-cluster/openmpi/openmpi-1.10.7.ebuild b/sys-cluster/openmpi/openmpi-1.10.7.ebuild
index b5f0b4edbf30..1e9755408ffe 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-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -63,7 +63,7 @@ CDEPEND="
 	>=sys-apps/hwloc-1.10.0-r2[${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 )
+	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 4b8de0f2d9e8..26a9f682d276 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-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -23,7 +23,7 @@ RDEPEND="
 		!dev-libs/libotf
 		!app-text/lcdf-typetools
 	)
-	elibc_FreeBSD? ( dev-libs/libexecinfo )
+	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 a810a5a3e3ce..86fb9bf1eeaa 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-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -25,7 +25,7 @@ RDEPEND="
 		!dev-libs/libotf
 		!app-text/lcdf-typetools
 	)
-	elibc_FreeBSD? ( dev-libs/libexecinfo )
+	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 51c493411e17..977ad9484e68 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-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -54,7 +54,7 @@ RDEPEND="
 	!sys-cluster/mpiexec
 	>=sys-apps/hwloc-1.3
 	dev-libs/libltdl:0
-	elibc_FreeBSD? ( dev-libs/libexecinfo )
+	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 )
diff --git a/sys-cluster/openmpi/openmpi-1.7.5-r1.ebuild b/sys-cluster/openmpi/openmpi-1.7.5-r1.ebuild
index ad59007d9d7b..efe14693943d 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-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -59,7 +59,7 @@ RDEPEND="
 	dev-libs/libltdl:0
 	>=sys-apps/hwloc-1.7.2
 	cuda? ( dev-util/nvidia-cuda-toolkit )
-	elibc_FreeBSD? ( dev-libs/libexecinfo )
+	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 )
diff --git a/sys-cluster/openmpi/openmpi-1.8.4-r4.ebuild b/sys-cluster/openmpi/openmpi-1.8.4-r4.ebuild
index f028d4301614..1eaa1042367a 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-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -62,7 +62,7 @@ RDEPEND="
 	>=sys-apps/hwloc-1.9.1[numa?]
 	sys-libs/zlib
 	cuda? ( dev-util/nvidia-cuda-toolkit )
-	elibc_FreeBSD? ( dev-libs/libexecinfo )
+	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 )
diff --git a/sys-cluster/openmpi/openmpi-1.8.7-r1.ebuild b/sys-cluster/openmpi/openmpi-1.8.7-r1.ebuild
index fccf7a7c8285..7c24c4df1221 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-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -62,7 +62,7 @@ CDEPEND="
 	>=sys-apps/hwloc-1.9.1[numa?]
 	sys-libs/zlib
 	cuda? ( dev-util/nvidia-cuda-toolkit )
-	elibc_FreeBSD? ( dev-libs/libexecinfo )
+	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 )
diff --git a/sys-cluster/openmpi/openmpi-1.8.8.ebuild b/sys-cluster/openmpi/openmpi-1.8.8.ebuild
index af6407a8a709..a940676eb17f 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-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -62,7 +62,7 @@ CDEPEND="
 	>=sys-apps/hwloc-1.9.1[numa?]
 	sys-libs/zlib
 	cuda? ( dev-util/nvidia-cuda-toolkit )
-	elibc_FreeBSD? ( dev-libs/libexecinfo )
+	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 )
diff --git a/sys-cluster/openmpi/openmpi-2.0.2.ebuild b/sys-cluster/openmpi/openmpi-2.0.2.ebuild
index 5553a3fcd9ce..6874cdda5d30 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-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -57,7 +57,7 @@ CDEPEND="
 	>=sys-apps/hwloc-1.11.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 )
+	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 e1517dff800c..4be809c2952b 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-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -57,7 +57,7 @@ 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 )
+	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.2.ebuild b/sys-cluster/openmpi/openmpi-2.1.2.ebuild
index 0ef453d9dc78..d27771af895e 100644
--- a/sys-cluster/openmpi/openmpi-2.1.2.ebuild
+++ b/sys-cluster/openmpi/openmpi-2.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -53,7 +53,7 @@ CDEPEND="
 	>=sys-apps/hwloc-1.11.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 )
+	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.0.ebuild b/sys-cluster/openmpi/openmpi-3.0.0-r1.ebuild
index b50c4f2ad163..3626af9f53e8 100644
--- a/sys-cluster/openmpi/openmpi-3.0.0.ebuild
+++ b/sys-cluster/openmpi/openmpi-3.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -53,7 +53,7 @@ CDEPEND="
 	>=sys-apps/hwloc-1.11.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 )
+	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/teleport/Manifest b/sys-cluster/teleport/Manifest
index 49b60358feb5..ffa5d115c4e7 100644
--- a/sys-cluster/teleport/Manifest
+++ b/sys-cluster/teleport/Manifest
@@ -4,11 +4,7 @@ AUX teleport.init.d 763 BLAKE2B b57826ab86550da58590546d484c78c05744699363de770e
 AUX teleport.service 209 BLAKE2B ee1f8561ec543a9571cccd5449a276bfdb581db2bccf5f47151159670a9588fc655dcecde69fa951c9a8fb5243033a56b656663bbec94753d5f4925fecd3a3a8 SHA512 c71665c287575b1e127fdf5c580552aeb17bff55627d537999964be3a86ba2b11dce9d46bf10ab8e909c65a9d94263ced590191b7ea9e5ee2f0c3f65a044816e
 AUX teleport.service.conf 90 BLAKE2B 7f12f281d73ac6573c882a7910e400f901ff6392e0c576e4b7076972f4ced046f709c8898766aaf38cc38fbfcf450b526d3045ff859eed2a48e19dbd92ec3131 SHA512 d17faa0deaf3c864e5159d3567e542e36d09c6ea0ac91c663d3ae9729d1bccf7d2139f1f48fec132eccc473e023ffdaed0b8f2ee75db5dedc6ff36f637f68e1c
 AUX teleport.yaml 5177 BLAKE2B 8280b9924497af772574faad5d01351d9c49dd1916dca8e3e0384579e7628b2c0b1833b72882231bfef4ae11b2fa9820a4785393ea8c9d00aef105263bbf5c15 SHA512 f9f854472d469d0822d5766517cc68364feca4f3345a69d616d073aaaf9af7be6f72aa55c7d0c801426c3fef42714c09b884e0e086a58a07208ebef0ffe3ca80
-DIST teleport-2.2.0.tar.gz 7229371 BLAKE2B 8425326e026e5ca23c43b11947d575efccda98e18519dbcd8b9fb4baa2fecf15b3d66b225b22f40e9d78e0e6d39bbed3c2c569b3d15b5af9099f0f4979259cbd SHA512 bec288983371bd3807b7ce994b1533a5e869d903251f8a8ce6315768a1d3ae95d72f832037345c36c9cd4789fbc449c54b86359988b1e74d4f46f9e0db6b3239
-DIST teleport-2.2.1.tar.gz 7235188 BLAKE2B 1f1272bdc96bac0eb424660a285232980063b1a82fec60d7ba80f227da34fa22052aae1eba3137ae73e62fc9c71a8037f067f16ac6b22014f3a82fdd88b444fb SHA512 011ffd8fdf42131455c32b8a8ed1ddee0181a8dcd3424dc9cf5ac96c53ce719d369e0bfac4392cc0dec14e78fed94732bbcb56c2db5987ee778ad29e4f7a749d
-DIST teleport-2.2.4.tar.gz 7234252 BLAKE2B 22c49e3659559ff6f8e55d3b60cf44fce00e67642d16457917b038cbbf48cc32db8caafbf39b70cef2ab39f0d8c1b3cb09e6ea1ab329e8e46c1fdf09b4a3aff2 SHA512 859bc34c90c4d1a504b9fa2958e49803c7af8bee3c2692d70590095ef0356a00cf963c5fc30613f3a7852b602fc7fbbd81ca99fc24ce51787f6d8d2e05af4762
-EBUILD teleport-2.2.0.ebuild 1542 BLAKE2B 698f8b48e6ea9ed1fd3305d83346ad1972beb675e86854b479bb5f7a790008505ab3ca54db1ce96489b190717617fbc346bcf02403dde192d6a7bb1ee2df4f80 SHA512 416f9685b2b50788476043d7130ac358b68621da05237ea84502220fe065dff96b10f44e29b068690c79a9a0f528dfabee7430a87e25ef4b86c64e1d288c78a8
-EBUILD teleport-2.2.1.ebuild 1542 BLAKE2B 698f8b48e6ea9ed1fd3305d83346ad1972beb675e86854b479bb5f7a790008505ab3ca54db1ce96489b190717617fbc346bcf02403dde192d6a7bb1ee2df4f80 SHA512 416f9685b2b50788476043d7130ac358b68621da05237ea84502220fe065dff96b10f44e29b068690c79a9a0f528dfabee7430a87e25ef4b86c64e1d288c78a8
-EBUILD teleport-2.2.4.ebuild 1542 BLAKE2B 698f8b48e6ea9ed1fd3305d83346ad1972beb675e86854b479bb5f7a790008505ab3ca54db1ce96489b190717617fbc346bcf02403dde192d6a7bb1ee2df4f80 SHA512 416f9685b2b50788476043d7130ac358b68621da05237ea84502220fe065dff96b10f44e29b068690c79a9a0f528dfabee7430a87e25ef4b86c64e1d288c78a8
+DIST teleport-2.4.0.tar.gz 9967298 BLAKE2B 26cb5610701c4c7deba0ba36b02f43928f4582cd81449045f58281b06a570eb5df762d21e5fef8f7f461855af3ac766fbafd1d2238b6916f9aaaaf07e20b7353 SHA512 4ed3a38fea4ba5acd52aa44cbc36d2bb1cda1fcb304d7787754b1165eefa3d1c8da65e76bf5c33a3f524ecf43b50145f2e850c927b35f2ec754ed90ed507c54d
+EBUILD teleport-2.4.0.ebuild 1219 BLAKE2B 08b15391673d1fb70c7bbd3897a55bab447bb9eb0f2de0550bdc8d0ee2e533c1f0c9c0b0636e4401cff6c915a0df6c116c921ad7a71652a49e14c93168a61b1c SHA512 0fef7d62e254ac354c32ce125b3ede4b747216e1e324651ad92718cf6569b7d713d79ae5652a4a17a03795d84a274e6b3948a31b69cd9cf911918500d6315fcd
 EBUILD teleport-9999.ebuild 1460 BLAKE2B 8ae106a5bdf26e8b8ffe36f83719a10d7ed3e10e875ba735eedd26d09141b3a016cd5f5dacd37657db6f9c399486038a5a5f1f02ceeb507fdf29159e331ac90e SHA512 74ff9bb734b5b47ad2ac475413af8721c818293eb8166bc99887f75f3e9fa4b8e66e5abeb6fcbf58bb8a4f63db34f010d85471b1a5a7cd1c28c70e43019fa2cd
 MISC metadata.xml 630 BLAKE2B ad22bb63ecf79ddd45b62fe0dcadd6d0d7fd475938b18ec868b56b0f4afe7ee5d3e0908eb0b13249a7c7b5031a3296bec406fea6fb487069a087c9e29dcf0ef2 SHA512 2aa911f2a91bfdea340b38715d69cbe59bcd460d34ac6d1d641f2badf2ba72f4e02cdd2f8a2ca387c9a9d19ea2c22e2be80ab4bb582d9395c1517b818f343c74
diff --git a/sys-cluster/teleport/teleport-2.2.1.ebuild b/sys-cluster/teleport/teleport-2.2.1.ebuild
deleted file mode 100644
index 90fddb344c0c..000000000000
--- a/sys-cluster/teleport/teleport-2.2.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils golang-build systemd user
-
-DESCRIPTION="Modern SSH server for teams managing distributed infrastructure"
-HOMEPAGE="https://gravitational.com/teleport"
-
-EGO_PN="github.com/gravitational/${PN}/..."
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3 golang-vcs
-	EGIT_REPO_URI="https://github.com/gravitational/${PN}.git"
-else
-	inherit golang-vcs-snapshot
-	SRC_URI="https://github.com/gravitational/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-RESTRICT="test"
-
-DEPEND="
-	app-arch/zip
-	>=dev-lang/go-1.8.3"
-RDEPEND=""
-
-PATCHES=( "${FILESDIR}"/${PN}-makefile-buildflags.patch )
-
-src_compile() {
-	BUILDFLAGS="" GOPATH="${S}" emake -C src/${EGO_PN%/*}
-	pushd src/${EGO_PN%/*}/web/dist >/dev/null || die
-	zip -qr "${S}/src/${EGO_PN%/*}/build/webassets.zip" . || die
-	popd >/dev/null || die
-	cat "${S}/src/${EGO_PN%/*}/build/webassets.zip" >> "src/${EGO_PN%/*}/build/${PN}" || die
-	zip -q -A "${S}/src/${EGO_PN%/*}/build/${PN}" || die
-}
-
-src_install() {
-	dodir /var/lib/${PN} /etc/${PN}
-	dobin src/${EGO_PN%/*}/build/{tsh,tctl,teleport}
-
-	insinto /etc/${PN}
-	doins "${FILESDIR}"/${PN}.yaml
-
-	newinitd "${FILESDIR}"/${PN}.init.d ${PN}
-	newconfd "${FILESDIR}"/${PN}.conf.d ${PN}
-
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	systemd_install_serviced "${FILESDIR}"/${PN}.service.conf ${PN}.service
-}
-
-src_test() {
-	GOPATH="${S}" emake -C src/${EGO_PN%/*} test
-}
diff --git a/sys-cluster/teleport/teleport-2.2.4.ebuild b/sys-cluster/teleport/teleport-2.2.4.ebuild
deleted file mode 100644
index 90fddb344c0c..000000000000
--- a/sys-cluster/teleport/teleport-2.2.4.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils golang-build systemd user
-
-DESCRIPTION="Modern SSH server for teams managing distributed infrastructure"
-HOMEPAGE="https://gravitational.com/teleport"
-
-EGO_PN="github.com/gravitational/${PN}/..."
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3 golang-vcs
-	EGIT_REPO_URI="https://github.com/gravitational/${PN}.git"
-else
-	inherit golang-vcs-snapshot
-	SRC_URI="https://github.com/gravitational/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-RESTRICT="test"
-
-DEPEND="
-	app-arch/zip
-	>=dev-lang/go-1.8.3"
-RDEPEND=""
-
-PATCHES=( "${FILESDIR}"/${PN}-makefile-buildflags.patch )
-
-src_compile() {
-	BUILDFLAGS="" GOPATH="${S}" emake -C src/${EGO_PN%/*}
-	pushd src/${EGO_PN%/*}/web/dist >/dev/null || die
-	zip -qr "${S}/src/${EGO_PN%/*}/build/webassets.zip" . || die
-	popd >/dev/null || die
-	cat "${S}/src/${EGO_PN%/*}/build/webassets.zip" >> "src/${EGO_PN%/*}/build/${PN}" || die
-	zip -q -A "${S}/src/${EGO_PN%/*}/build/${PN}" || die
-}
-
-src_install() {
-	dodir /var/lib/${PN} /etc/${PN}
-	dobin src/${EGO_PN%/*}/build/{tsh,tctl,teleport}
-
-	insinto /etc/${PN}
-	doins "${FILESDIR}"/${PN}.yaml
-
-	newinitd "${FILESDIR}"/${PN}.init.d ${PN}
-	newconfd "${FILESDIR}"/${PN}.conf.d ${PN}
-
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	systemd_install_serviced "${FILESDIR}"/${PN}.service.conf ${PN}.service
-}
-
-src_test() {
-	GOPATH="${S}" emake -C src/${EGO_PN%/*} test
-}
diff --git a/sys-cluster/teleport/teleport-2.2.0.ebuild b/sys-cluster/teleport/teleport-2.4.0.ebuild
index 90fddb344c0c..dc7173e18dc7 100644
--- a/sys-cluster/teleport/teleport-2.2.0.ebuild
+++ b/sys-cluster/teleport/teleport-2.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,29 +18,22 @@ else
 	KEYWORDS="~amd64 ~arm"
 fi
 
+IUSE=""
 LICENSE="Apache-2.0"
+RESTRICT="test strip"
 SLOT="0"
-IUSE=""
-RESTRICT="test"
 
 DEPEND="
 	app-arch/zip
 	>=dev-lang/go-1.8.3"
 RDEPEND=""
 
-PATCHES=( "${FILESDIR}"/${PN}-makefile-buildflags.patch )
-
 src_compile() {
-	BUILDFLAGS="" GOPATH="${S}" emake -C src/${EGO_PN%/*}
-	pushd src/${EGO_PN%/*}/web/dist >/dev/null || die
-	zip -qr "${S}/src/${EGO_PN%/*}/build/webassets.zip" . || die
-	popd >/dev/null || die
-	cat "${S}/src/${EGO_PN%/*}/build/webassets.zip" >> "src/${EGO_PN%/*}/build/${PN}" || die
-	zip -q -A "${S}/src/${EGO_PN%/*}/build/${PN}" || die
+	GOPATH="${S}" emake -j1 -C src/${EGO_PN%/*} full
 }
 
 src_install() {
-	dodir /var/lib/${PN} /etc/${PN}
+	keepdir /var/lib/${PN} /etc/${PN}
 	dobin src/${EGO_PN%/*}/build/{tsh,tctl,teleport}
 
 	insinto /etc/${PN}
@@ -54,5 +47,5 @@ src_install() {
 }
 
 src_test() {
-	GOPATH="${S}" emake -C src/${EGO_PN%/*} test
+	BUILDFLAGS="" GOPATH="${S}" emake -C src/${EGO_PN%/*} test
 }