gentoo resync : 02.04.2018

6 files changed, 16 insertions, 30 deletions

diff --git a/sys-cluster/slurm/Manifest b/sys-cluster/slurm/Manifest
index d716f19469dc..712dc29be3e5 100644
--- a/sys-cluster/slurm/Manifest
+++ b/sys-cluster/slurm/Manifest
@@ -1,13 +1,12 @@
 AUX logrotate 360 BLAKE2B 36c5ce908a6434f03a3e140cd1fc0bfec50a6fa89d6120061a5a83d3b12d9a6137ae2fa3a83bd36f55f48c79d140f24d6933cda18fc79674e8b758cacc34a948 SHA512 f6edceef15960accbe72ddd34ff34934fa46b6d647c83e0d3a512d2ddc1ae6c60352e377cfa5332fd5cd817689e23680f7384f1b27fc49677b2e671e1bfe86b9
-AUX slurm-17.02.9-disable-sview.patch 2831 BLAKE2B d11df7a1b580f2d1064e5bc5107e257a35e95060f166c971523d24d55f19920c86ed231e88a207ae61c65b83eba33b309b33ed439c0ba09d0b1ea76119708d85 SHA512 3ea30226b721b982ddad78d538c280da78b311d66b0be63087ef606d7f9008731c583e276504b668d8fde74c45ac8aa80babf4d693eca1d274d27dc72479d5e7
-AUX slurm-17.11.4-buffer.patch 744 BLAKE2B 05c45fe1efe0a2238cbc9f595bc549f5d3e526a768c8c4eb5c81f29cff295d39ae103342dd7922f53f4f73268c534e6be9a422a532d7659b451f2e36ea624360 SHA512 33cb1c7317100f2ef5174adc2ff19e98f08c0d2470aa5794583b20bdb377f19189b75202cb153e73a91564119e068e8179775e087cb64bdd4f4c5167a95aee88
-AUX slurm-17.11.4-disable-sview.patch 2831 BLAKE2B d11df7a1b580f2d1064e5bc5107e257a35e95060f166c971523d24d55f19920c86ed231e88a207ae61c65b83eba33b309b33ed439c0ba09d0b1ea76119708d85 SHA512 3ea30226b721b982ddad78d538c280da78b311d66b0be63087ef606d7f9008731c583e276504b668d8fde74c45ac8aa80babf4d693eca1d274d27dc72479d5e7
+AUX slurm-17.02.10-disable-sview.patch 2831 BLAKE2B d11df7a1b580f2d1064e5bc5107e257a35e95060f166c971523d24d55f19920c86ed231e88a207ae61c65b83eba33b309b33ed439c0ba09d0b1ea76119708d85 SHA512 3ea30226b721b982ddad78d538c280da78b311d66b0be63087ef606d7f9008731c583e276504b668d8fde74c45ac8aa80babf4d693eca1d274d27dc72479d5e7
+AUX slurm-17.11.5-disable-sview.patch 2831 BLAKE2B d11df7a1b580f2d1064e5bc5107e257a35e95060f166c971523d24d55f19920c86ed231e88a207ae61c65b83eba33b309b33ed439c0ba09d0b1ea76119708d85 SHA512 3ea30226b721b982ddad78d538c280da78b311d66b0be63087ef606d7f9008731c583e276504b668d8fde74c45ac8aa80babf4d693eca1d274d27dc72479d5e7
 AUX slurm.confd 155 BLAKE2B 4f0793808328b88ffa2b32b1accab6c0dfe0b01dc84210fee6a674361ddf9ea7b3f15ccc775c354198577849ab0791d403b153adee476fc7f1237d2177275bab SHA512 e4d21cdb6a427f0beaef0e157202308f9e86a41dea4532ee98b274a5979b5e82ec2ca4ca2996f6cb59045fd8b01e815aaad71673e2011cead788de3d879aa11f
 AUX slurmctld.initd 1833 BLAKE2B 3cc18daa26fd4b7b5b3dce33aa3536d99ce6af53e64abd6e76045345750a8f6254f702aa3d7e93e8123b95b6a664ea1021fd6bac53d68a2010b4ebd3ee00a4da SHA512 14246262aaf70642237f2ad13194d2bdc64f72b26e34113c2e7d340cf7661c62c79c4f939c61684c98fc5181680c08dbc55807dea0e382a3b2d1e26d0e57ce1c
 AUX slurmd.initd 1993 BLAKE2B 820153a8df6a5f1ce0d7db44d6c38170cc6ec7920f8d64743c65aaa65002e4c47c25bd9c3069b6df7feffb24506408aa42c2a67c486f5700f2d61a49fb971ca0 SHA512 f58b68c3fb5e9109b6fa261cbb816ef240f9d1465229ec418f3a2bba9a1bc47ca22bf1386d7014ea62a23d0807d73b263c4a4df86e8c354fcb760af3cc9d0250
 AUX slurmdbd.initd 1709 BLAKE2B 12aa8ecb83991a4af8dbbd124d46d84c2c8b3c60756a42f9cb87df84dafb572553348e00eb720699a5d58020ca3fdf28a3357eb2903341a9d635ca4b399f5f8a SHA512 323852ab3ae1cbec55c51e54f7f7acc2e60a694e46a91454638b7f167f5dc0c1ecdba8bdb82641aee9ad303558c445d7551e774a6b470da279173b5c44123911
-DIST slurm-17.02.9.tar.bz2 6053443 BLAKE2B 73635de40d0f083de068306cae933a499a9df24790caf12859a64f7e61a0a77a4383137f5f6cf65699e6c07bd2e240c9cf74be4378124f71047e18e99bbbff55 SHA512 9a0b502a16b1fe61fd42ef92cb9cdc0eaa5abb4e9a3b0b6d87337ca0597223c4e132632f22b13a4a5109c03a3f422dd49df6421b637c446973e6d521fb23075c
-DIST slurm-17.11.4.tar.bz2 6203468 BLAKE2B 8f79fa83c6c196da6c1f47f83a763d044e86192ac584f4afad20ed1c57aac051b9f308c03d7d670ff9c974663d7931a6ccaae55dd49d2135fc08fb81c4aa50e4 SHA512 027f7dee51980f1351c56934ebdf510cf72c049544cdfbbfc450223b5e27a9d21b9f6fcf7a3a043b7cc18c913e9ce6dcd8d0153a5e7625c84cc9a67b69832962
-EBUILD slurm-17.02.9.ebuild 7042 BLAKE2B 0b91317ab3a1042954baf44df9910dc77df326969984f7214e033e04ddd69b4654b74409f333b7907edfd5adef14a001816fdae1a51a2eadb08d073f3acaec14 SHA512 2591578099b94b137d7ec71fe2da59cb6bccce1210b0f7617ccb7972e4136a3ce9752c8c1f4071b8493870f3180a634d674a62e93f1d2255a2cc7d62b19c19dd
-EBUILD slurm-17.11.4.ebuild 7277 BLAKE2B 4a840fe4296b6ba84a125b27690507e3accd4a858844c4e67d5dc8d73d02d430a624b9e9d39d5f81258e5dbecf2aae49cf311f1b0502173d9c094b4bae6642b8 SHA512 3886b8a1699cbbbc60dd114312386110fcfccf0ab2138439be4e18a56107dafb8a690fcad8d59e16f6f9f94e0c4df7e10e6f4980f8305d8a550a97e3c882cf77
+DIST slurm-17.02.10.tar.bz2 6056342 BLAKE2B 1e6f3af68371e75a880fc28e4c7931fa61372a52bf9ce7b089c9bc62c5660c57c1e4b74d93c4105e611b9702c3bf64f1b9713d26c21513cb83bc11edc258be40 SHA512 b6fbec81abc36dcb5cd742363c33caeecad6c42ee80fe7a13ddc81703b5f5c28f3ddd88bbfbabe94550257d46b56d2c0e0ded9da6b92617074c57358ba33d449
+DIST slurm-17.11.5.tar.bz2 6248551 BLAKE2B f41754eeee6f0f140600a9408ac4c12e0299f90d75c20fe92f11a63e3234558586618d549f3851cbe201af64b1e65b17fedf4187b0edac96ec9a4c64bbc5c0e1 SHA512 cb82e192bf0ab57fbc810fc3c9b32e90d4c28926b4a959514e3df51b63556b13d01057938d73da5bc0bea157bbd7712b1aad0712a913ad912bd7e6089fc0bd21
+EBUILD slurm-17.02.10.ebuild 7066 BLAKE2B ebbae89390de63480988c2ec650c47b64fe56fa1c389b440539539c177abeef66a001ba3dc1c1afc331aed3714dfdcc2d197e32790761d1125b24bed70003058 SHA512 e087ecdd0ec45817a24bea687a6cad0a4fe7c5a90b5d7d88d19b9807b77f5df57734a0a05a28cb19fbd089886e033f6b93a188598b9456d2ad318d8e7e87b128
+EBUILD slurm-17.11.5.ebuild 7341 BLAKE2B 5e0afb750740aaa199f018bd692b91058d330949c2bb6dc26471dd0903a5244dcfe53ae99778f7739bc15f0e615de98e5a07a8919c0d924e29345a0ac6464208 SHA512 a9c63def18957a40bad9dfbd2d16073b649a927c9e0e9459e7f42fae8157adf6c6899beed4157e5112c2f84cd54451dcdb16c1b1169be3648e6affc842e57d99
 MISC metadata.xml 563 BLAKE2B 26101a6dbee3ad181afe3c7b072a747c1640ca8d78ab3c16380eb3a636937c3f6b9b8469dfcb3bfb369e3f4ca8ee609f3666668976b36d6ce77657b14227a2d4 SHA512 31d52fcdcd9526f8dc9ac00d173986943303b74ff6c554f6be30f2c059a0e1cc54330871ec132c451ab6f23ac062b3a9161293c13f3fffa13343f964d6cb959b
diff --git a/sys-cluster/slurm/files/slurm-17.02.9-disable-sview.patch b/sys-cluster/slurm/files/slurm-17.02.10-disable-sview.patch
index f7e2c5b26739..f7e2c5b26739 100644
--- a/sys-cluster/slurm/files/slurm-17.02.9-disable-sview.patch
+++ b/sys-cluster/slurm/files/slurm-17.02.10-disable-sview.patch
diff --git a/sys-cluster/slurm/files/slurm-17.11.4-buffer.patch b/sys-cluster/slurm/files/slurm-17.11.4-buffer.patch
deleted file mode 100644
index eec43fb449c0..000000000000
--- a/sys-cluster/slurm/files/slurm-17.11.4-buffer.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- src/plugins/node_features/knl_cray/node_features_knl_cray.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/plugins/node_features/knl_cray/node_features_knl_cray.c b/src/plugins/node_features/knl_cray/node_features_knl_cray.c
-index 51f72df226..3a5ffef60d 100644
---- a/src/plugins/node_features/knl_cray/node_features_knl_cray.c
-+++ b/src/plugins/node_features/knl_cray/node_features_knl_cray.c
-@@ -2986,7 +2986,7 @@ extern void node_features_p_step_config(bool mem_sort, bitstr_t *numa_bitmap)
- 	if (mem_sort && (numa_available() != -1)) {
- 		struct stat sb;
- 		int buf_len, fd, i, len, rc;
--		char buf[8];
-+		char buf[10];
- 
- 		if (stat(ZONE_SORT_PATH, &sb) == -1) {
- 			rc = system(MODPROBE_PATH " zonesort_module");
diff --git a/sys-cluster/slurm/files/slurm-17.11.4-disable-sview.patch b/sys-cluster/slurm/files/slurm-17.11.5-disable-sview.patch
index f7e2c5b26739..f7e2c5b26739 100644
--- a/sys-cluster/slurm/files/slurm-17.11.4-disable-sview.patch
+++ b/sys-cluster/slurm/files/slurm-17.11.5-disable-sview.patch
diff --git a/sys-cluster/slurm/slurm-17.02.9.ebuild b/sys-cluster/slurm/slurm-17.02.10.ebuild
index f4c3c841d3f7..9387b9d53551 100644
--- a/sys-cluster/slurm/slurm-17.02.9.ebuild
+++ b/sys-cluster/slurm/slurm-17.02.10.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
@@ -35,6 +35,7 @@ DEPEND="
 	!sys-cluster/torque
 	!net-analyzer/slurm
 	!net-analyzer/sinfo
+	!sys-cluster/pmix[pmi]
 	mysql? ( virtual/mysql )
 	munge? ( sys-auth/munge )
 	pam? ( virtual/pam )
diff --git a/sys-cluster/slurm/slurm-17.11.4.ebuild b/sys-cluster/slurm/slurm-17.11.5.ebuild
index 0b943a40504f..dcd9cec0e6d0 100644
--- a/sys-cluster/slurm/slurm-17.11.4.ebuild
+++ b/sys-cluster/slurm/slurm-17.11.5.ebuild
@@ -22,25 +22,27 @@ else
 	S="${WORKDIR}/${MY_P}"
 fi
 
-inherit autotools eutils pam perl-module prefix user ${INHERIT_GIT}
+inherit autotools bash-completion-r1 eutils pam perl-module prefix user ${INHERIT_GIT}
 
 DESCRIPTION="A Highly Scalable Resource Manager"
 HOMEPAGE="https://www.schedmd.com"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="debug lua multiple-slurmd +munge mysql pam perl ssl static-libs torque"
+IUSE="debug lua multiple-slurmd +munge mysql pam perl ssl static-libs torque X"
 
 DEPEND="
 	!sys-cluster/torque
 	!net-analyzer/slurm
 	!net-analyzer/sinfo
+	sys-cluster/pmix[-pmi]
 	mysql? ( virtual/mysql )
 	munge? ( sys-auth/munge )
 	pam? ( virtual/pam )
 	ssl? ( dev-libs/openssl:0= )
 	lua? ( dev-lang/lua:0= )
 	!lua? ( !dev-lang/lua )
+	X? ( net-libs/libssh2 )
 	>=sys-apps/hwloc-1.1.1-r1"
 RDEPEND="${DEPEND}
 	dev-libs/libcgroup"
@@ -54,7 +56,6 @@ RESTRICT="primaryuri test"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-disable-sview.patch
-	"${FILESDIR}"/${P}-buffer.patch
 )
 
 src_unpack() {
@@ -104,6 +105,7 @@ src_configure() {
 	use mysql || myconf+=( --without-mysql_config )
 	econf "${myconf[@]}" \
 		$(use_enable pam) \
+		$(use_enable X x11) \
 		$(use_with ssl) \
 		$(use_with munge) \
 		$(use_enable static-libs static) \
@@ -180,9 +182,9 @@ src_install() {
 	insinto /etc/logrotate.d
 	newins "${FILESDIR}/logrotate" slurm
 
-	newbashcomp contribs/slurm_completion_help/slurm_completion.sh ${PN}
-	bashcomp_alias \
-		sreport sacctmgr scontrol squeue scancel sshare sbcast sinfo \
+	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
 }