gentoo resync : 13.03.2018

14 files changed, 210 insertions, 268 deletions

diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index 2ee720202edf..89680543c30d 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest
index a1a4b7e81572..9ff6b751b31b 100644
--- a/sys-cluster/ceph/Manifest
+++ b/sys-cluster/ceph/Manifest
@@ -38,6 +38,7 @@ AUX ceph.initd-r4 1189 BLAKE2B 065554902fdd5c44fff69868e72817ee24916c6f93a3e332b
 AUX ceph.initd-r5 2178 BLAKE2B d943da59449e796a9c592e173654275b40ba3701fd6c694521a1975e3070ee465b9dbc2ba748cbd99d94e00a82d792ca88f6b4c1cd299572bdd3d8829adcedbe SHA512 4037639b6de65e0966f1aa850778b87f4f8f926af621f68155e98f103e233b7ebb2fba18a65ca150b16767bb80581259f4720c925ed00777d640f19471147c90
 AUX ceph.initd-r6 2180 BLAKE2B c262225412e6e5bf61d315f661721c27f97726dd5eb4cb8696845c29ab95d2ad29b011db6e8d488ce58d71ac875008588737a453de8472ef7f6bb9309fd4f100 SHA512 9f19186da7a6150b4d371fdd5523a07979ef9c318242422f04ed0178b33e6886ac1333cad8a41aa0d75af2aa08d7ee8ec9075d980d32fcddc8558d143a425a01
 AUX ceph.initd-r7 2197 BLAKE2B 7df3ab975cd14a3cc782ed58f8e6c2f0bfdc3f1b96383400490d7cab27b4d5afa6381cdb02843c1bbfe30f62e5d801ccecf2b61178013855e13ec504da84aa4c SHA512 93890b9e049ff5925ce56b524389873e22560315bf25c40ac86ec11dd2375d184215e7a217d863d4e32bb817a3e0577fdea71a76bb5d5c28ecbeb8544f1b763c
+AUX ceph.initd-r8 2357 BLAKE2B 24cda98e71748cdb4db4ceb7e26c2647734756c2586dce5bcca5d4de0d548c85626bd4a7d1a67b22664457a34561fdd1e510a4b0a6400616b76a857abd3c9b2f SHA512 8ebea5ae1a6b0c5641171cea1c4288919886e71e03c0accfbdba9ddf3989f14999dfe5933893aa116d47b1984539fab0b5000367fb90e105b8f60b4b92fe7454
 AUX ceph.logrotate 427 BLAKE2B 9677f1a2a4872addff71527c800dd06bf65e18b589de3869e2a742c43070de789d5089f8739367efb913a64aeec5a8b82f47c129fac580e7c34e4f8cdc8b7332 SHA512 6edace611f46683ca3b8d2154b86ec77cc241909704e0362b728a5f51c2a809c22e83d69df0d58ec6b3a6b8dc8ef2518c220cac920f51e63fe668cdfe1b48bae
 AUX envd-tcmalloc 48 BLAKE2B 4a0799ac6bbedfe5e701eead67600312d86f06143dbfd11d2c594c03d09bf13dfa645e5a0bde1189211ad20036dc4fcfce6758d3a5829d943eb337cc65783af9 SHA512 d180b1a888ec6d870ff523a3b10fd00eca479ee2586a236458af5ffaba21c84e7b8098da6d4bc08fb86c82c61a861dd3c3596a01063d734c329a92808682fc8c
 AUX rbdmap.initd 2373 BLAKE2B b88d79efc722e2de3d1f0269664a976ed45fbb0a1c9d46fcfd058ea64d3ae7fe27d13455f2ac5ca06663d77cfac1d2f9d86d12bba926541042ac09a8778a3a52 SHA512 bbd48d6987e52eaf6d02bccf3aecd06596465af4d3ac93063f9a814106de162a27bf1a33ae1646e669efb3c754f3ba57f395523293ad643b0d81ee588252216b
@@ -60,5 +61,5 @@ EBUILD ceph-10.2.9.ebuild 7150 BLAKE2B a9300913b99b4770fc85dec74cdb38b18b466272d
 EBUILD ceph-12.2.1.ebuild 7338 BLAKE2B cd4cccedaeb34e9057da645ba7640e1577b593dda3f3bf579c9f191a1c0cca616aa92f9c7dc2768bbf0ff2720ce62295ccd0bcf518a69f1d449b1bafb29473b1 SHA512 db604a52bc5302e0efee5cb3cae654dff61b7d9709d2f4ec0505ed56f7f82b3f7f7387f34c0738ed3143bdb77c90086b922e7bc891f3bc246149354644ab2179
 EBUILD ceph-12.2.2-r1.ebuild 7315 BLAKE2B 4ea06a4679902338bcfc631f16c3d3fe60efa59baee88d06579fbc54b4ffe12ac6b003551edbbd18f1ee3c42814c64f4efa948dec2a2881231620b2f0a5acc91 SHA512 806d2a6ce722da06e6430bc4e7b6091e858333b84631690d3b6702c0c158618a09368ec352b563c437ce8253cdf38a487011b6601ee78ce4adfe148191c303f4
 EBUILD ceph-12.2.2.ebuild 7315 BLAKE2B dee5111ca1f52b26f49f27384bbff20d339ab9dd9ad4eba77709f2f9af59c42480f1d55324e8691b9b86b7ee2615a68c473d2d389355c7d57fc2b2b19672f980 SHA512 af0421ed063be53baa3daef7a8ec0b9c7bfdf66180afa483ed3459a664fce463b4de65a23869577f616ff4149a40e8223ed27de792bbb2a9b001bf9baaed39ab
-EBUILD ceph-12.2.4.ebuild 7830 BLAKE2B 0fe909963c63f532cb7741f5945c53dcd848132ce8615e7da02036d81f237c78802d259de5ffb88197c434f68afdbf7c4d19b157ed9618d85e7c1668a692861f SHA512 d3fa0d44c471f542b8fd9a37823a16440719d163e6e8ce34980bb2021ac6b31432ac3a7032908807e87208b2324aff38f77b863f593e9bf25c46cb94d0b9e606
+EBUILD ceph-12.2.4-r1.ebuild 7830 BLAKE2B e4e2dba7a611a151ea8b766093608cad1e403e5d4db4f997e7f00f6256fc59386085b8c25d7b64e68b028cb5a5ee7835fff522ef7ec234dc4cf71d70d0e4c910 SHA512 3e1f4c51777d9168c7a9dccdbf0333ec23d702659673732ebe8106c852069f2b0133c7fb64e277e371afaee1a0d7a8918160e0483d9bc59340db2565838fe045
 MISC metadata.xml 1635 BLAKE2B a18aec5797d25bf4440d2900663e87b2a2b8ce9b7a64584bd4bb827e3a678d2ce67853d745b1d660f7309ca9004301fdd6dc2f6e3ac73c54a45945027185075f SHA512 38ceed3b5f66d428ef804f9bfeca3174ee8c54825c926c7426f1484647ea9141c2cda276c190b78299f6d99831d6242e2132524bc86cc032b82b3accae3224b2
diff --git a/sys-cluster/ceph/ceph-12.2.4.ebuild b/sys-cluster/ceph/ceph-12.2.4-r1.ebuild
index bc3dd0a718aa..1fbe80838494 100644
--- a/sys-cluster/ceph/ceph-12.2.4.ebuild
+++ b/sys-cluster/ceph/ceph-12.2.4-r1.ebuild
@@ -264,7 +264,7 @@ src_install() {
 	fowners -R ceph:ceph /var/lib/ceph /var/log/ceph
 
 	newinitd "${FILESDIR}/rbdmap.initd" rbdmap
-	newinitd "${FILESDIR}/${PN}.initd-r7" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd-r8" ${PN}
 	newconfd "${FILESDIR}/${PN}.confd-r4" ${PN}
 
 	insinto /etc/sysctl.d
diff --git a/sys-cluster/ceph/files/ceph.initd-r8 b/sys-cluster/ceph/files/ceph.initd-r8
new file mode 100644
index 000000000000..2f6c2601f168
--- /dev/null
+++ b/sys-cluster/ceph/files/ceph.initd-r8
@@ -0,0 +1,95 @@
+#!/sbin/openrc-run
+
+ceph_conf="${ceph_conf:-/etc/ceph/ceph.conf}"
+extra_commands="reload"
+daemon_type="${RC_SVCNAME#ceph-}"
+daemon_type="${daemon_type%%.*}"
+daemon_id="${RC_SVCNAME#ceph-*.}"
+daemon_id="${daemon_id:-0}"
+: ${rundir:=/run/ceph}
+: ${user:=ceph}
+: ${group:=ceph}
+: ${rc_ulimit:=-n 1048576 -u 1048576}
+
+pidfile="${rundir}/supervisor-${daemon_type}.${daemon_id}.pid"
+daemon_pidfile="${rundir}/${daemon_type}.${daemon_id}.pid"
+
+command="/usr/bin/${RC_SVCNAME%%.*}"
+command_args="-i ${daemon_id} --pid-file ${daemon_pidfile} -c ${ceph_conf}"
+command_args_foreground="--foreground"
+
+retry="${CEPH_TERMTIMEOUT:-TERM/120/KILL/5}"
+start_stop_daemon_args="--user ${user} --group ${group}"
+supervise_daemon_args="--user ${user} --group ${group}"
+
+: ${supervisor:=supervise-daemon}
+: ${stdout:=/var/log/ceph/ceph}
+: ${stderr:=/var/log/ceph/ceph}
+: ${respawn_delay:=10}
+: ${respawn_max:=5}
+: ${respawn_period:=1800}
+
+: ${osd_respawn_delay:=15}
+: ${osd_respawn_max:=10}
+
+: ${radosgw_respawn_max:=5}
+: ${radosgw_respawn_period:=30}
+
+depend() {
+	use dns logger
+	after net ntpd ntp-client chronyd
+	before netmount
+}
+
+is_type_valid() {
+	case ${daemon_type} in
+		mon|mds|osd|mgr|radosgw) return 0;;
+		*) return 1;;
+	esac
+}
+
+start_pre() {
+	export CEPH_CONF="${ceph_conf}"
+
+	checkpath -d -q -o "${user}:${group}" "${rundir}"
+
+	if ! is_type_valid ;then
+		eerror "Please give valid Ceph Server Type: mds, mon, osd"
+		return 1
+
+	elif pgrep -f "[c]eph-${daemon_type} -i ${daemon_id} "; then
+		eerror "${daemon_type}.${daemon_id} is still running, refusing to start"
+		return 1
+	fi
+
+	local arg_name arg_val
+	for arg_name in std{out,err} respawn_{delay,max,period}; do
+		eval arg_val="\${${daemon_type}_${arg_name}}"
+
+		if [ -z "${arg_val}" ]; then
+			eval arg_val="\${${arg_name}}"
+		else
+			eval "${arg_name}=\"${arg_val}\""
+		fi
+
+		if [ "${arg_name}" = "stderr" ] || [ "${arg_name}" = "stdout" ]; then
+			local log_file log_postfix
+			log_postfix=".${daemon_id}-${arg_name}.log"
+			log_file="${arg_val}"
+
+			if [ "${log_file}" != /dev/null ]
+				log_file="${log_file}${log_postfix}"
+			fi
+
+			supervise_daemon_args="${supervise_daemon_args} --${arg_name//_/-}=${log_file}"
+		fi
+	done
+}
+
+reload() {
+	ebegin "Reloading Ceph ${daemon_type}.${daemon_id}"
+	start-stop-daemon --signal 1 "${start_stop_daemon_args}"
+	eend ${?}
+}
+
+# vim:ft=gentoo-init-d:ts=4:sts=4:sw=4:noet:
diff --git a/sys-cluster/heat/Manifest b/sys-cluster/heat/Manifest
index 592959dfb2ef..dc5f95290cb6 100644
--- a/sys-cluster/heat/Manifest
+++ b/sys-cluster/heat/Manifest
@@ -1,15 +1,12 @@
 AUX heat.initd 463 BLAKE2B c855fe1b4fe73fe93874add659c49133d1f83653acbb37e7ab9927641883196abb620f53e6b31f5cc39e7c59875d4af29b3d5b14eb2a1d67556e7fbf129c7705 SHA512 d6685d7751dfd6ece714c2b96c2d07419f13556f6f3d065a108943cb3bc90c4a51b66313b3e53db4f47f0577c411e859c89984d4764462857eb1ca1990ca847c
 DIST heat-10.0.0.tar.gz 2349675 BLAKE2B 24968c117d19e69638dbddd6d25d34f05e1454f788187049f1f35a067e029afe141693f41b497031e2ebb039cea2475bcf13ad814a21844540d41f1a2e4260ef SHA512 43a5ab5330a830657cc5265875240d85d442404db1bb3ff7372acc28fc4b8f410414704a928765cf97eb550fa47d0bd228ad62efb098093552baba0f1e1305e9
-DIST heat-9.0.2.tar.gz 2364044 BLAKE2B ca2c6e1f504e7b443906e1c33d2105293313223d9af851a5c46719b5c74d95687d11ea2460f7fc3e818719c9132bb8e0041b4ae123d5a0eb12b5bff22606f474 SHA512 c27dbcd74abed231b5e375461c03e32d5a55c08d04619bf7f315baad14fb20e2041aa92656b7e597bc7c804533c6496f569ce450e81a52cab5735d6d84af2734
 DIST heat-9.0.3.tar.gz 2364843 BLAKE2B 4edbd6716a84e6003cd02511e8c8036c84510bd4d842d9a32caae7c837bee591fb46d3edc8786d8015b8ffd09d4dde7bde4f49a6994766af40284715b2b99713 SHA512 5db5f0189da095951963d2cf30c7c3279e40537041a66b3d13cfebd13ba4256b74db49ba6269e14b2c4e21d10b7b00e77d5b94050e30c436dc271b406e4e9432
 DIST heat.conf.sample-10.0.0 92161 BLAKE2B 745cdb4eb6006079201cfe31b6486a5d759a93d1deceb42c3e9c5224b9512437013a5f44eb0f81694949efad648559a1b4e436992a91986206e50b65c69a09b8 SHA512 44b9f0e5779a21afc73a2720181ffaf778d5e54f61db7b177b59a777985c6155dac1d6b535eed311be372236f4d39d0601a8814c5ad7aa0c48acf3771bf65120
 DIST heat.conf.sample-2017.2.9999 88901 BLAKE2B 050cfaacb46a8d9b79a17b7406acf6bca9be27a21f8278194021cadc69fb364c630ca0f0e7a320dfe9d46303d779eb8b5c31efaa9c25d3695caf70cab18b1b4d SHA512 f62feaa4a0d27866876aed9f78099501247ae4b7deaefd04d77b1f4b2a1d1c991e6f3e68d9f82e3b6a4358c99fbffd90f14a05ff98105df0ef0db68ef8bc6932
 DIST heat.conf.sample-2018.1.9999 92161 BLAKE2B 745cdb4eb6006079201cfe31b6486a5d759a93d1deceb42c3e9c5224b9512437013a5f44eb0f81694949efad648559a1b4e436992a91986206e50b65c69a09b8 SHA512 44b9f0e5779a21afc73a2720181ffaf778d5e54f61db7b177b59a777985c6155dac1d6b535eed311be372236f4d39d0601a8814c5ad7aa0c48acf3771bf65120
-DIST heat.conf.sample-9.0.2 88901 BLAKE2B 050cfaacb46a8d9b79a17b7406acf6bca9be27a21f8278194021cadc69fb364c630ca0f0e7a320dfe9d46303d779eb8b5c31efaa9c25d3695caf70cab18b1b4d SHA512 f62feaa4a0d27866876aed9f78099501247ae4b7deaefd04d77b1f4b2a1d1c991e6f3e68d9f82e3b6a4358c99fbffd90f14a05ff98105df0ef0db68ef8bc6932
 DIST heat.conf.sample-9.0.3 88901 BLAKE2B 050cfaacb46a8d9b79a17b7406acf6bca9be27a21f8278194021cadc69fb364c630ca0f0e7a320dfe9d46303d779eb8b5c31efaa9c25d3695caf70cab18b1b4d SHA512 f62feaa4a0d27866876aed9f78099501247ae4b7deaefd04d77b1f4b2a1d1c991e6f3e68d9f82e3b6a4358c99fbffd90f14a05ff98105df0ef0db68ef8bc6932
 EBUILD heat-10.0.0.ebuild 6321 BLAKE2B 0ac9baacc5a0131edfc317993e5c9cfd1546461cf86d5b15c0b77c170922013bb106bfc65603faf7dee2bcc442da6044329282ca2883938906d401b1a4cd2721 SHA512 6d9ed8fd03f8fe8da40d5f1da190de22aa08ca64e3921b6cd33afa0444d1cdb835dea6f203e0947b8a9ce21f481725c331a5c5e68ad0c675ff1bd461cc29bf7e
 EBUILD heat-2017.2.9999.ebuild 6631 BLAKE2B 697e6e82a1ca39a9585dc66f3ed2d3882d268deaf977842ceddec44135d2e0d354cc575c3fa2d3ccb42b0f68b452c967cf8b2ef500d5c08249acbd4414b20c35 SHA512 b063d4c92bf245da67a09416db1ba7825d8f852247b00a9f6a0d0b5dc77aa6ceea3e60afb7709e35574018281370e2b5aec82fdd57bc8d9792df61c701f6735e
 EBUILD heat-2018.1.9999.ebuild 6321 BLAKE2B 0ac9baacc5a0131edfc317993e5c9cfd1546461cf86d5b15c0b77c170922013bb106bfc65603faf7dee2bcc442da6044329282ca2883938906d401b1a4cd2721 SHA512 6d9ed8fd03f8fe8da40d5f1da190de22aa08ca64e3921b6cd33afa0444d1cdb835dea6f203e0947b8a9ce21f481725c331a5c5e68ad0c675ff1bd461cc29bf7e
-EBUILD heat-9.0.2.ebuild 6372 BLAKE2B a0682068a8ffea4911523ecee326819392b0570df172b380f8102b96702fbbf744b12c7f31e24672460d65fad7a42602e724572750ca77fe856182ad943e97da SHA512 03d0284b311abb2eaebbfa92c86914bbede58ad34f3d8498cf2d3dc8fbdb0d9a531247dfdfded6b824f9c538c4d2fdb109a5515b46d59242b1bed812174393a5
-EBUILD heat-9.0.3.ebuild 6631 BLAKE2B 697e6e82a1ca39a9585dc66f3ed2d3882d268deaf977842ceddec44135d2e0d354cc575c3fa2d3ccb42b0f68b452c967cf8b2ef500d5c08249acbd4414b20c35 SHA512 b063d4c92bf245da67a09416db1ba7825d8f852247b00a9f6a0d0b5dc77aa6ceea3e60afb7709e35574018281370e2b5aec82fdd57bc8d9792df61c701f6735e
+EBUILD heat-9.0.3.ebuild 6629 BLAKE2B 6e3d59ece3798ee799c83ebcc58615f75b8a3cba3f29e2f56d75aff65e2e6ff420885599a0df3e836659eda3523f2b061294fff7fc690e24c6b9e36be0ce132b SHA512 1c02447c0125c764c300402a589415bbd7a493e2522309433dda5edf39df3be28b04fb25d9970aed808be53e0331c9a04252de7887d5f9c619d7f60cf3f25671
 MISC metadata.xml 631 BLAKE2B 566d35b5533177a6d8b0ef428c9bd1a320aace6b43e186139c4b53cde224c1bf488340be8b6bcac14bf6c7a51212952dc13940d34edc38e24d7d2fbea5ce0c68 SHA512 44e741975cc462454bfd08fce461b019c5ef141997f272796052f7f3aa7297646304cdc7d75a2ed01319bcba753475ba5861306c3ac74f3d97218bce60d42429
diff --git a/sys-cluster/heat/heat-9.0.2.ebuild b/sys-cluster/heat/heat-9.0.2.ebuild
deleted file mode 100644
index 9de5bb7102cf..000000000000
--- a/sys-cluster/heat/heat-9.0.2.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-
-inherit distutils-r1 eutils linux-info user
-
-DESCRIPTION="A CloudFormation-compatible openstack-native cloud orchestration engine."
-HOMEPAGE="https://launchpad.net/heat"
-SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/heat/heat.conf.sample.pike -> heat.conf.sample-${PV}
-	https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="+mysql +memcached postgres sqlite"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	app-admin/sudo"
-
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/croniter-0.3.4[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.6.0[${PYTHON_USEDEP}]
-	!~dev-python/cryptography-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
-	!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
-	<dev-python/eventlet-0.21.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.1.0[${PYTHON_USEDEP}]
-	>=dev-python/keystonemiddleware-4.12.0[${PYTHON_USEDEP}]
-	>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
-	!~dev-python/lxml-3.7.0[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.13[${PYTHON_USEDEP}]
-	!~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}]
-	>=dev-python/openstacksdk-0.9.17[${PYTHON_USEDEP}]
-	>=dev-python/oslo-cache-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-4.0.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-config-4.3.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-config-4.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.14.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-db-4.24.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-i18n-3.15.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.22.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-5.24.2[${PYTHON_USEDEP}]
-	!~dev-python/oslo-messaging-5.25.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-3.27.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-policy-1.23.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-reports-0.6.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-service-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
-	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-versionedobjects-1.17.0[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
-	>=dev-python/aodhclient-0.7.0[${PYTHON_USEDEP}]
-	>=dev-python/python-barbicanclient-4.0.0[${PYTHON_USEDEP}]
-	!~dev-python/python-barbicanclient-4.5.0[${PYTHON_USEDEP}]
-	!~dev-python/python-barbicanclient-4.5.1[${PYTHON_USEDEP}]
-	>=dev-python/python-ceilometerclient-2.5.0[${PYTHON_USEDEP}]
-	>=dev-python/python-cinderclient-3.1.0[${PYTHON_USEDEP}]
-	>=dev-python/python-designateclient-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/python-glanceclient-2.8.0[${PYTHON_USEDEP}]
-	>=dev-python/python-heatclient-1.6.1[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/python-magnumclient-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-manilaclient-1.12.0[${PYTHON_USEDEP}]
-	>=dev-python/python-mistralclient-3.1.0[${PYTHON_USEDEP}]
-	>=dev-python/python-monascaclient-1.7.0[${PYTHON_USEDEP}]
-	>=dev-python/python-neutronclient-6.3.0[${PYTHON_USEDEP}]
-	>=dev-python/python-novaclient-9.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-openstackclient-3.11.0[${PYTHON_USEDEP}]
-	>=dev-python/python-saharaclient-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/python-senlinclient-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/python-swiftclient-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/python-troveclient-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/python-zaqarclient-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-zunclient-0.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.10.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/tenacity-3.2.1[${PYTHON_USEDEP}]
-	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	sqlite? (
-		>=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.5[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.6[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.7[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.8[sqlite,${PYTHON_USEDEP}]
-	)
-	mysql? (
-		>=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
-		!~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
-	)
-	postgres? (
-		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
-	)
-	>=dev-python/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
-	>=dev-python/yaql-1.1.0[${PYTHON_USEDEP}]"
-
-PATCHES=(
-)
-
-pkg_setup() {
-	enewgroup heat
-	enewuser heat -1 -1 /var/lib/heat heat
-}
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	diropts -m0750 -o heat -g heat
-	keepdir /etc/heat
-	dodir /etc/heat/environment.d
-	dodir /etc/heat/templates
-
-	for svc in api api-cfn engine; do
-		newinitd "${FILESDIR}/heat.initd" heat-${svc}
-	done
-
-	insinto /etc/heat
-	insopts -m0640 -o heat -g heat
-	newins "${DISTDIR}/heat.conf.sample-${PV}" "heat.conf.sample"
-	doins "etc/heat/api-paste.ini"
-	doins "etc/heat/policy.json"
-	insinto /etc/heat/templates
-	doins "etc/heat/templates/"*
-	insinto /etc/heat/environment.d
-	doins "etc/heat/environment.d/default.yaml"
-
-	dodir /var/log/heat
-	fowners heat:heat /var/log/heat
-}
diff --git a/sys-cluster/heat/heat-9.0.3.ebuild b/sys-cluster/heat/heat-9.0.3.ebuild
index 472f8a0a47db..88da01b25fb9 100644
--- a/sys-cluster/heat/heat-9.0.3.ebuild
+++ b/sys-cluster/heat/heat-9.0.3.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999 ]];then
 else
 	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/heat/heat.conf.sample.pike -> heat.conf.sample-${PV}
 		https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/sys-cluster/slurm/Manifest b/sys-cluster/slurm/Manifest
index 940475ff970e..d716f19469dc 100644
--- a/sys-cluster/slurm/Manifest
+++ b/sys-cluster/slurm/Manifest
@@ -1,13 +1,13 @@
 AUX logrotate 360 BLAKE2B 36c5ce908a6434f03a3e140cd1fc0bfec50a6fa89d6120061a5a83d3b12d9a6137ae2fa3a83bd36f55f48c79d140f24d6933cda18fc79674e8b758cacc34a948 SHA512 f6edceef15960accbe72ddd34ff34934fa46b6d647c83e0d3a512d2ddc1ae6c60352e377cfa5332fd5cd817689e23680f7384f1b27fc49677b2e671e1bfe86b9
-AUX slurm-16.05.11-disable-sview.patch 2317 BLAKE2B bcdacd63a962600705fbe7ea8318beaf16b586c9b3de2963d24c80742ba03afe40516028a7c13ea307efc32e053246172d7d4f96cc95c0202303120ee04dffaa SHA512 d351f3293976e49971a70fdfaf18247babfff870f6d8be216ad5beee8b866157405fd30afee832b29484064535dfa64eec17c720e8c6b72042481d17ac95eaff
-AUX slurm-16.05.11-sysmacros.patch 983 BLAKE2B 3439a38f2cb87be2977f9554b57434a580cb4377a61f7bd30374754651fefeaceea49aa916cdf5f128b2e563652badf5815200606fd8689375021824121b451c SHA512 f9c2ce668e1ec0c191b809ffe7d94d4a47623a0325b63dcc7a51cce6a95bf322e03f03c81f02f26162df20c320bf45d810bdc6f7ebbfecb1bf651a8dac88f04c
 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.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-16.05.11.tar.bz2 6100281 BLAKE2B d9e368f22f55c457e2fb6caaca0a496e6de1c0c77af891e62259db88fa7fca68d4df0731f1a6cada046341698e673860eb7d3883ef9dba8589fc01c7882a1735 SHA512 6922f6987a586288ea8229b4603b42c705ea159af4ceb3763790ba5cc2fb8dabf7747d7a27a886d50eeb3a7ed743c26b86354b9d05802c46ecd86b215ace85ba
 DIST slurm-17.02.9.tar.bz2 6053443 BLAKE2B 73635de40d0f083de068306cae933a499a9df24790caf12859a64f7e61a0a77a4383137f5f6cf65699e6c07bd2e240c9cf74be4378124f71047e18e99bbbff55 SHA512 9a0b502a16b1fe61fd42ef92cb9cdc0eaa5abb4e9a3b0b6d87337ca0597223c4e132632f22b13a4a5109c03a3f422dd49df6421b637c446973e6d521fb23075c
-EBUILD slurm-16.05.11.ebuild 7621 BLAKE2B 3bc53a9700d4f26b26819f007c21e269dfd4cf35d1d428367b0d75dcd273b2547844b311c30a134c928bb9895d57c38adbddec6460e63047e154953f8795e43b SHA512 0c389ecab3d99963e1d957d852da051d168864c7a39cddec1c6509dbbd6eb56dfedeecad2fb69b411f71834559c8a6cf7c1fb1d21bb9dcdb982bcf0fc6699c60
+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
 MISC metadata.xml 563 BLAKE2B 26101a6dbee3ad181afe3c7b072a747c1640ca8d78ab3c16380eb3a636937c3f6b9b8469dfcb3bfb369e3f4ca8ee609f3666668976b36d6ce77657b14227a2d4 SHA512 31d52fcdcd9526f8dc9ac00d173986943303b74ff6c554f6be30f2c059a0e1cc54330871ec132c451ab6f23ac062b3a9161293c13f3fffa13343f964d6cb959b
diff --git a/sys-cluster/slurm/files/slurm-16.05.11-sysmacros.patch b/sys-cluster/slurm/files/slurm-16.05.11-sysmacros.patch
deleted file mode 100644
index f9d22f479f89..000000000000
--- a/sys-cluster/slurm/files/slurm-16.05.11-sysmacros.patch
+++ /dev/null
@@ -1,34 +0,0 @@
- configure.ac                                  | 2 +-
- src/plugins/task/cgroup/task_cgroup_devices.c | 6 ++++++
- 2 files changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 869a989..2936983 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -141,7 +141,7 @@ AC_CHECK_HEADERS(mcheck.h values.h socket.h sys/socket.h  \
- AC_HEADER_SYS_WAIT
- AC_HEADER_TIME
- AC_HEADER_STDC
--
-+AC_HEADER_MAJOR
- 
- dnl Checks for structures.
- dnl
-diff --git a/src/plugins/task/cgroup/task_cgroup_devices.c b/src/plugins/task/cgroup/task_cgroup_devices.c
-index 554583c..9be99d8 100644
---- a/src/plugins/task/cgroup/task_cgroup_devices.c
-+++ b/src/plugins/task/cgroup/task_cgroup_devices.c
-@@ -42,6 +42,12 @@
- #include <sched.h>
- #include <glob.h>
- #include <sys/types.h>
-+#ifdef MAJOR_IN_MKDEV
-+#  include <sys/mkdev.h>
-+#endif
-+#ifdef MAJOR_IN_SYSMACROS
-+#  include <sys/sysmacros.h>
-+#endif
- #include <sys/stat.h>
- #include <slurm/slurm.h>
- #include <slurm/slurm_errno.h>
diff --git a/sys-cluster/slurm/files/slurm-17.11.4-buffer.patch b/sys-cluster/slurm/files/slurm-17.11.4-buffer.patch
new file mode 100644
index 000000000000..eec43fb449c0
--- /dev/null
+++ b/sys-cluster/slurm/files/slurm-17.11.4-buffer.patch
@@ -0,0 +1,16 @@
+ 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-16.05.11-disable-sview.patch b/sys-cluster/slurm/files/slurm-17.11.4-disable-sview.patch
index 1e4a5b4fae3a..f7e2c5b26739 100644
--- a/sys-cluster/slurm/files/slurm-16.05.11-disable-sview.patch
+++ b/sys-cluster/slurm/files/slurm-17.11.4-disable-sview.patch
@@ -1,7 +1,13 @@
-diff -urN slurm-16.05.2.orig/configure.ac slurm-16.05.2/configure.ac
---- slurm-16.05.2.orig/configure.ac	2016-07-07 02:51:37.000000000 +0300
-+++ slurm-16.05.2/configure.ac	2016-07-15 20:02:41.373270765 +0300
-@@ -261,44 +261,6 @@
+ configure.ac             | 39 ---------------------------------------
+ doc/man/man1/Makefile.am |  8 --------
+ src/Makefile.am          |  3 +--
+ 3 files changed, 1 insertion(+), 49 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 2f177ec..ff4d69b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -238,44 +238,6 @@ AC_SUBST(HAVE_SOME_CURSES)
  PKG_CHECK_MODULES([CHECK], [check >= 0.9.8], [ac_have_check="yes"], [ac_have_check="no"])
  AM_CONDITIONAL(HAVE_CHECK, test "x$ac_have_check" = "xyes")
  
@@ -43,10 +49,10 @@ diff -urN slurm-16.05.2.orig/configure.ac slurm-16.05.2/configure.ac
 -
 -AM_CONDITIONAL(BUILD_SVIEW, [test "x$ac_glib_test" = "xyes"] && [test "x$ac_gtk_test" = "xyes"])
 -
- X_AC_DATABASES
- 
  dnl Cray ALPS/Basil support depends on mySQL
-@@ -503,7 +465,6 @@
+ X_AC_CRAY
+ 
+@@ -477,7 +439,6 @@ AC_CONFIG_FILES([Makefile
  		 src/sshare/Makefile
  		 src/sstat/Makefile
  		 src/strigger/Makefile
@@ -54,16 +60,40 @@ diff -urN slurm-16.05.2.orig/configure.ac slurm-16.05.2/configure.ac
  		 src/plugins/Makefile
  		 src/plugins/accounting_storage/Makefile
  		 src/plugins/accounting_storage/common/Makefile
-diff -urN slurm-16.05.2.orig/src/Makefile.am slurm-16.05.2/src/Makefile.am
---- slurm-16.05.2.orig/src/Makefile.am	2016-07-07 02:51:37.000000000 +0300
-+++ slurm-16.05.2/src/Makefile.am	2016-07-15 20:02:41.373270765 +0300
-@@ -27,8 +27,7 @@
+diff --git a/doc/man/man1/Makefile.am b/doc/man/man1/Makefile.am
+index 246f16d..ba39af2 100644
+--- a/doc/man/man1/Makefile.am
++++ b/doc/man/man1/Makefile.am
+@@ -29,10 +29,6 @@ if WITH_BLCR
+ man1_MANS += srun_cr.1
+ endif
+ 
+-if BUILD_SVIEW
+-man1_MANS += sview.1
+-endif
+-
+ EXTRA_DIST = $(man1_MANS)
+ 
+ if HAVE_MAN2HTML
+@@ -65,10 +61,6 @@ if WITH_BLCR
+ html_DATA += srun_cr.html
+ endif
+ 
+-if BUILD_SVIEW
+-html_DATA += sview.html
+-endif
+-
+ MOSTLYCLEANFILES = ${html_DATA}
+ 
+ EXTRA_DIST += $(html_DATA)
+diff --git a/src/Makefile.am b/src/Makefile.am
+index bcd5aa7..a8cbf17 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -28,5 +28,4 @@ SUBDIRS =		\
  	srun_cr		\
  	sshare		\
  	sstat		\
 -	strigger	\
 -	sview
 +	strigger
- 
- if !REAL_BG_L_P_LOADED
- SUBDIRS += srun
diff --git a/sys-cluster/slurm/slurm-16.05.11.ebuild b/sys-cluster/slurm/slurm-17.11.4.ebuild
index 6f935a075773..0b943a40504f 100644
--- a/sys-cluster/slurm/slurm-16.05.11.ebuild
+++ b/sys-cluster/slurm/slurm-17.11.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
@@ -17,19 +17,19 @@ else
 	fi
 	MY_P="${PN}-${MY_PV}"
 	INHERIT_GIT=""
-	SRC_URI="https://www.schedmd.com/download/latest/${MY_P}.tar.bz2"
+	SRC_URI="https://download.schedmd.com/slurm/${MY_P}.tar.bz2"
 	KEYWORDS="~amd64 ~x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
 inherit autotools eutils pam perl-module prefix user ${INHERIT_GIT}
 
-DESCRIPTION="SLURM: A Highly Scalable Resource Manager"
+DESCRIPTION="A Highly Scalable Resource Manager"
 HOMEPAGE="https://www.schedmd.com"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="lua multiple-slurmd +munge mysql pam perl ssl static-libs torque"
+IUSE="debug lua multiple-slurmd +munge mysql pam perl ssl static-libs torque"
 
 DEPEND="
 	!sys-cluster/torque
@@ -54,7 +54,7 @@ RESTRICT="primaryuri test"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-disable-sview.patch
-	"${FILESDIR}"/${P}-sysmacros.patch
+	"${FILESDIR}"/${P}-buffer.patch
 )
 
 src_unpack() {
@@ -71,10 +71,8 @@ pkg_setup() {
 }
 
 src_prepare() {
-	if [ ${#PATCHES[0]} -ne 0 ]; then
-		epatch "${PATCHES[@]}"
-	fi
-	eapply_user
+	default
+
 	# pids should go to /var/run/slurm
 	sed -e "s:/var/run/slurmctld.pid:${EPREFIX}/var/run/slurm/slurmctld.pid:g" \
 		-e "s:/var/run/slurmd.pid:${EPREFIX}/var/run/slurm/slurmd.pid:g" \
@@ -101,6 +99,7 @@ src_configure() {
 			--docdir="${EPREFIX}/usr/share/doc/${P}"
 			--htmldir="${EPREFIX}/usr/share/doc/${P}"
 			)
+	use debug || myconf+=( --disable-debug )
 	use pam && myconf+=( --with-pam_dir=$(getpam_mod_dir) )
 	use mysql || myconf+=( --without-mysql_config )
 	econf "${myconf[@]}" \
@@ -113,19 +112,21 @@ src_configure() {
 	# --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
+	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"
-		mkdir -p "${S}/src/db_api/.libs"
-		touch "${S}/src/api/.libs/libslurm.so"
-		touch "${S}/src/db_api/.libs/libslurmdb.so"
-		cd "${LIBSLURM_PERL_S}"
+		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}"
+		cd "${LIBSLURMDB_PERL_S}" || die
 		S="${LIBSLURMDB_PERL_S}" SRC_PREP="no" perl-module_src_configure
-		cd "${S}"
-		rm -rf "${S}/src/api/.libs" "${S}/src/db_api/.libs"
+		cd "${S}" || die
+		rm -rf "${S}/src/api/.libs" "${S}/src/db_api/.libs" || die
 	fi
 }
 
@@ -133,26 +134,24 @@ src_compile() {
 	default
 	use pam && emake -C contribs/pam
 	if use perl ; then
-		cd "${LIBSLURM_PERL_S}"
+		cd "${LIBSLURM_PERL_S}" || die
 		S="${LIBSLURM_PERL_S}" perl-module_src_compile
-		cd "${LIBSLURMDB_PERL_S}"
+		cd "${LIBSLURMDB_PERL_S}" || die
 		S="${LIBSLURMDB_PERL_S}" perl-module_src_compile
-		cd "${S}"
-	fi
-	if use torque ; then
-		emake -C contribs/torque
+		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}"
+		cd "${LIBSLURM_PERL_S}" || die
 		S="${LIBSLURM_PERL_S}" perl-module_src_install
-		cd "${LIBSLURMDB_PERL_S}"
+		cd "${LIBSLURMDB_PERL_S}" || die
 		S="${LIBSLURMDB_PERL_S}" perl-module_src_install
-		cd "${S}"
+		cd "${S}" || die
 	fi
 	if use torque; then
 		emake DESTDIR="${D}" -C contribs/torque
@@ -162,30 +161,29 @@ src_install() {
 	# install sample configs
 	keepdir /etc/slurm
 	insinto /etc/slurm
-	doins etc/bluegene.conf.example
-	doins etc/cgroup.conf.example
-	doins etc/cgroup_allowed_devices_file.conf.example
-	doins etc/slurm.conf.example
-	doins etc/slurmdbd.conf.example
+	doins \
+		etc/bluegene.conf.example \
+		etc/cgroup.conf.example \
+		etc/cgroup_allowed_devices_file.conf.example \
+		etc/slurm.conf.example \
+		etc/slurmdbd.conf.example
 	exeinto /etc/slurm
-	doexe etc/cgroup.release_common.example
-	doexe etc/slurm.epilog.clean
+	doexe \
+		etc/slurm.epilog.clean
 	# 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
+	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
-	# cgroups support
-	exeinto /etc/slurm/cgroup
-	doexe etc/cgroup.release_common.example
-	mv "${ED}"/etc/slurm/cgroup/{cgroup.release_common.example,release_common} || die "Can't move cgroup.release_common.example"
-	ln -s release_common "${ED}"/etc/slurm/cgroup/release_cpuset  || die "Can't create symbolic link release_cpuset"
-	ln -s release_common "${ED}"/etc/slurm/cgroup/release_devices || die "Can't create symbolic link release_devices"
-	ln -s release_common "${ED}"/etc/slurm/cgroup/release_freezer || die "Can't create symbolic link release_freezer"
+
+	newbashcomp contribs/slurm_completion_help/slurm_completion.sh ${PN}
+	bashcomp_alias \
+		sreport sacctmgr scontrol squeue scancel sshare sbcast sinfo \
+		sprio sacct salloc sbatch srun sattach sdiag sstat
 }
 
 pkg_preinst() {
@@ -214,12 +212,12 @@ pkg_postinst() {
 	for folder_path in ${paths[@]}; do
 		create_folders_and_fix_permissions $folder_path
 	done
-	einfo
+	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."
-	einfo
+	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 "    General setup  --->"
diff --git a/sys-cluster/swift/Manifest b/sys-cluster/swift/Manifest
index 2f628b741254..df9d9b50f822 100644
--- a/sys-cluster/swift/Manifest
+++ b/sys-cluster/swift/Manifest
@@ -5,7 +5,7 @@ AUX swift-proxy.initd 1379 BLAKE2B 56453a557c0abfd6b07f65778ef14d8920bedc4133e0e
 DIST swift-2.16.0.tar.gz 2466084 BLAKE2B 9077e9745628ebd87f998ae963d19420e0410e29e02f8671dfb95b764d2bc4e5d97bd985e6d5d40496d152c6b931a03a789b372f94ad1b39cd17d3f0a6c9e658 SHA512 db67ee43931872dae9c8f7ff5732d0e075922e73a3660815f1ccb11a2310b94f887e293e9e5d4b1dda13c687365b7433ea9c575b209892f488647aed1a6f9696
 DIST swift-2.17.0.tar.gz 2527561 BLAKE2B baf8d2363bfd39062263542ddd01702e5f5847f3bbd2d227234da44ba742fa7e2bb6954569aab12082de67cfd785496a5530a0fc7613a0ad28d88bd62dbec9f8 SHA512 d5b13a63f549f1118eb1a27505a7444e09bedb532eed8e1ea34d370163dde2ce3e3911b9e4d6bea0d96f0a5c7d99bb103ed80ee8a547051fa29e9b4a09cced16
 EBUILD swift-2.16.0.ebuild 3698 BLAKE2B 971a44109dc7fbc2230be6db33db966eb1596969953bb1ce03d9133683223f9c17553602397d5555dc88515e6dc5c283f829903ffbfcef1cd63c2cf855c9d8ef SHA512 5fa5c18cd19412aae6e41a544058b29cde20c3a9d84c89c27767ec7f8bff4021a559562e44bbd11b722fd6950b3529734ec42ab9a8bee930e6200160b873953e
-EBUILD swift-2.17.0.ebuild 3700 BLAKE2B 5b55b5ecb033383dec349f3476d3ed873d00e048d237ec1b56189751dbe1a8b4d28e20a6bbe12461f6fc2ed9a5910d86e4e8c86bbb3cfd672558ec8fab9eaf96 SHA512 3a2b3cfe88c8979046514dbeb597ebdea9bf453c0dcb5e3a607fc2e3136e572d122b3b988597211adf686d095d3e98eb79e495f49005028e7d68f8e92eb18ebe
+EBUILD swift-2.17.0.ebuild 3698 BLAKE2B 4b120f81788a76de5a14012714fe0dc94d9d51cc6261737d6498cdbd1130c32e6553128ee8e268553c1fc8b51277ceba6b61c32cdcbf087647d806718e83c51e SHA512 d805c50cec482f3a76a283c7f604a8de8e0c3b580f0c43ab9d2ce7c0cb4e4735cfb4e08fdba05598625bc4dc4ab7e2157acaafc70bf568b5a8fb928cb94c91ea
 EBUILD swift-2017.2.9999.ebuild 3711 BLAKE2B 1ede70612136464f13d35f97decc571eb37b28e2bbb9a5414e0b0d74d14bdc5d68e54123e74e066fa4eaeb4071b19816415faccf524b4a4aef79aa7709b2ffc0 SHA512 9aaf45d59410e93fe55c9aacdd2c0de697ce6d076af71b703b7c51df14eecf5fb1edc0d0e62a95240092a624f586a7e79167b33688087a2363208f22f4191bff
 EBUILD swift-2018.1.9999.ebuild 3838 BLAKE2B ad33e64ef8a647ab8a253dca63cec07046180fcff33c75d0e117c13ac1ca6a0eb6610408199fef664d128ca69083431d72a4562cdcc7d8d529e1900f422afd94 SHA512 69e036871b6ed85745f6a88199554f3b3113c39e529a80a093b6675cc0a99ca243ee8f29daea5e620d7a03726e5c9317a47edac7df8e0a8fa0e99b806169ae04
 MISC metadata.xml 898 BLAKE2B 3d502769ba44cdc1e3a500929d60a1ed82d8540297b2dfddb6d6745ec9b5b56bd9fe7130a738858b9bac653b49634efae1841600325194d69ec30222b2e8b3f2 SHA512 3f9d2cf7538fe32010b811d3a49802eb085dde793b29d9590fe3032d63a743f620e3c1dcf1226b59aa5938ea239f440997a3d4d489f9887816621879e19a0c4c
diff --git a/sys-cluster/swift/swift-2.17.0.ebuild b/sys-cluster/swift/swift-2.17.0.ebuild
index b7e5a59b1a2f..9c09fe33ba4d 100644
--- a/sys-cluster/swift/swift-2.17.0.ebuild
+++ b/sys-cluster/swift/swift-2.17.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="proxy account container object +memcached"
 REQUIRED_USE="|| ( proxy account container object )"