From 407525b571b48cfd65e1ad7a02d250a927c967c9 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Fri, 1 Dec 2017 03:04:39 +0000
Subject: gentoo resync : 01.12.2017

---
 sys-cluster/Manifest.gz                            | Bin 15709 -> 15718 bytes
 sys-cluster/ampi/Manifest                          |   2 +-
 sys-cluster/ampi/ampi-0_pre20140616.ebuild         |   2 +-
 sys-cluster/drbd-utils/Manifest                    |   2 +-
 sys-cluster/drbd-utils/metadata.xml                |   8 +-
 sys-cluster/drbd/Manifest                          |   2 +-
 sys-cluster/drbd/metadata.xml                      |   8 +-
 sys-cluster/galera/Manifest                        |   4 +-
 sys-cluster/galera/galera-25.3.22.ebuild           |  87 ++++
 sys-cluster/glusterfs/Manifest                     |   8 +-
 sys-cluster/glusterfs/files/glusterd-r2.initd      |  32 --
 .../files/glusterfs-3.4.0-silent_rules.patch       |  23 -
 ...libraries-using-LIBADD-instead-of-LDFLAGS.patch |  54 --
 .../files/glusterfs-3.6.5-build-shared-only.patch  | 547 ---------------------
 sys-cluster/glusterfs/glusterfs-3.12.3.ebuild      |   2 +-
 sys-cluster/glusterfs/glusterfs-3.6.5.ebuild       | 182 -------
 sys-cluster/heat/Manifest                          |  22 +-
 sys-cluster/heat/heat-8.0.4.ebuild                 | 148 ------
 sys-cluster/heat/heat-8.0.5.ebuild                 |   2 +-
 sys-cluster/heat/heat-9.0.0.ebuild                 | 162 ------
 sys-cluster/heat/heat-9.0.1.ebuild                 |   2 +-
 sys-cluster/openmpi/Manifest                       |   8 +-
 sys-cluster/openmpi/openmpi-2.0.3.ebuild           | 175 -------
 sys-cluster/openmpi/openmpi-2.0.4.ebuild           | 175 +++++++
 sys-cluster/openmpi/openmpi-3.0.0.ebuild           | 171 +++++++
 sys-cluster/pacemaker/Manifest                     |   2 +-
 sys-cluster/pacemaker/metadata.xml                 |  35 +-
 sys-cluster/slurm/Manifest                         |   4 +-
 sys-cluster/slurm/slurm-16.05.11.ebuild            |   4 +-
 sys-cluster/slurm/slurm-17.02.9.ebuild             |   4 +-
 30 files changed, 490 insertions(+), 1387 deletions(-)
 create mode 100644 sys-cluster/galera/galera-25.3.22.ebuild
 delete mode 100644 sys-cluster/glusterfs/files/glusterd-r2.initd
 delete mode 100644 sys-cluster/glusterfs/files/glusterfs-3.4.0-silent_rules.patch
 delete mode 100644 sys-cluster/glusterfs/files/glusterfs-3.5.1-Add-libraries-using-LIBADD-instead-of-LDFLAGS.patch
 delete mode 100644 sys-cluster/glusterfs/files/glusterfs-3.6.5-build-shared-only.patch
 delete mode 100644 sys-cluster/glusterfs/glusterfs-3.6.5.ebuild
 delete mode 100644 sys-cluster/heat/heat-8.0.4.ebuild
 delete mode 100644 sys-cluster/heat/heat-9.0.0.ebuild
 delete mode 100644 sys-cluster/openmpi/openmpi-2.0.3.ebuild
 create mode 100644 sys-cluster/openmpi/openmpi-2.0.4.ebuild
 create mode 100644 sys-cluster/openmpi/openmpi-3.0.0.ebuild

(limited to 'sys-cluster')

diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index e6acee0bea36..2c4996acd5d0 100644
Binary files a/sys-cluster/Manifest.gz and b/sys-cluster/Manifest.gz differ
diff --git a/sys-cluster/ampi/Manifest b/sys-cluster/ampi/Manifest
index 0d8d078dd809..ea495fd7347b 100644
--- a/sys-cluster/ampi/Manifest
+++ b/sys-cluster/ampi/Manifest
@@ -1,3 +1,3 @@
 DIST ampi-0_pre20140616.tar.gz 1127315 SHA256 9c02f957f8221c5a85450fe52cd164f8062f23dadf2ba59ec5c92b2c862dadca SHA512 b6a8790c1686a32546194fa6c3818aa9d2ba08911621d5251e85a4114dad75e350f18560cf0527811c487f804265bc09a4b80faeab5eafbd670e4dfa103fe078 WHIRLPOOL f36e9b0e2958d8ad9c5fcb0a1794c536729b0bf488a77e585a84b7819981d78154c2a6b68f35844b87e62751bed97e479a367bac4c5c60ee32d08f72bef50f7a
-EBUILD ampi-0_pre20140616.ebuild 497 BLAKE2B 98ec5fa37d73da402f5a60be4932cc108ee93c3a4cf1bdf091c7133537bcf3d0c35441a7e3abd083daba9673cc806045be0826e69123ff4fc3ff5468515aea32 SHA512 9dc527dc582fa78a46bca59d816010e91de04714b732a49bc59d1c74439a437c01707f036991be003339463359b106b3401990dd9f6792fd706887e3e2ab7630
+EBUILD ampi-0_pre20140616.ebuild 504 BLAKE2B 489ec274df3abb3f8afe4fc925cae96883ce22045a5aafffc933efe935fa06920491f70a568bc4da9b26b3e4595bbaf1a939ed179aca3e43915affe22d8d1b37 SHA512 1e5b98b5c6b52a8625bf13791d01a8e290745b84e4255604e48d1dbb27e2fd14cc69513acd0743953d0c13755d7d60458567902cddd0191063ac79230356ec06
 MISC metadata.xml 257 BLAKE2B e4f657523a349a531d465953f61a55f61c3d1262af149695624b6f601aa464e39a1bceec34b26d97804e441ac6b45e48f930006a77e60e031a3e321b8297ed4a SHA512 ac9b4b4f3ef6a190cf1465bfac8aaf69c9c7b91e2cf3876e19a0b39264accaae12e301a2059bacff7781d0fb1f40499cb2930be0cd3f7ef9cb1a40d266ad059f
diff --git a/sys-cluster/ampi/ampi-0_pre20140616.ebuild b/sys-cluster/ampi/ampi-0_pre20140616.ebuild
index 016c13dbca2d..172b5edcbfaf 100644
--- a/sys-cluster/ampi/ampi-0_pre20140616.ebuild
+++ b/sys-cluster/ampi/ampi-0_pre20140616.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~jauhien/distfiles/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND="virtual/mpi"
 DEPEND="${RDEPEND}"
diff --git a/sys-cluster/drbd-utils/Manifest b/sys-cluster/drbd-utils/Manifest
index 898d097e4c5c..33c2aad7a210 100644
--- a/sys-cluster/drbd-utils/Manifest
+++ b/sys-cluster/drbd-utils/Manifest
@@ -5,4 +5,4 @@ DIST drbd-utils-8.9.6.tar.gz 788183 SHA256 297b77c9b3f88de2e7dae459234f2753ea4fc
 EBUILD drbd-utils-8.9.3.ebuild 2410 BLAKE2B 562b48faffe5e6c4e4e9984a3aea88dbf2d125c3822c361637588b40a01b0917e0a3fb67a4c25dd07001ed5263fde53c51210adf86b62ff63a5a8f5f6cc3818f SHA512 91530010427a1cbc5cc5ae8d6026954b626b21495dfc90c34ae92acead467813f7c7d929d32a3401b01b26cba31199c9ef78ad69d74484d59f924b51faf43928
 EBUILD drbd-utils-8.9.6-r1.ebuild 2422 BLAKE2B d26972f0f86e93b7038a963921c888aa797898f67fbe2f59aead44b3c4e6452b608dc8bb43346de0fa2b25569c5980ec41c44ea2c016c1613ae99658e00a3bfd SHA512 d2c4b3ccc0ebefc7212a9575a4042770764ad922b6fa99bf25b85df3ccd55e477101b0ea2c9a885aa61800b42041aa0c29460223329f88934aecea5debba53b8
 EBUILD drbd-utils-8.9.6.ebuild 2422 BLAKE2B d26972f0f86e93b7038a963921c888aa797898f67fbe2f59aead44b3c4e6452b608dc8bb43346de0fa2b25569c5980ec41c44ea2c016c1613ae99658e00a3bfd SHA512 d2c4b3ccc0ebefc7212a9575a4042770764ad922b6fa99bf25b85df3ccd55e477101b0ea2c9a885aa61800b42041aa0c29460223329f88934aecea5debba53b8
-MISC metadata.xml 684 BLAKE2B 851bad418fafcdd2877ef541e3e3c8e8047dd818b633562f48c96ae82ddbef32a2bf4671572a986ad1d93a9730a0f097e6aed9f7a5044a5996a37944763f5a42 SHA512 10f563a04424b8d23d6a54b2091c109f14370279bc08a6f489c308e612fba52da888ef152319485749a1807fc5daef7d7b1728ed2aa46dde74f877eff24a4ad5
+MISC metadata.xml 677 BLAKE2B 79183e6930396061e7cf5c881ced8b4e3082a2b0dfdb4520e9de6afd54269b35ba972efd7dd3c3bd67cd103fd7d40693575a9d87b7b437438d5226e6e3453b5e SHA512 b97a7c5bb6ffe6de872f535d595507cd155923c920b9e7836f9a50afa992300b0b27d43805491cbbe6c348ecf99fc24367c375b6416dae73bffb4b6706f4b89a
diff --git a/sys-cluster/drbd-utils/metadata.xml b/sys-cluster/drbd-utils/metadata.xml
index 19706db7b3c0..82f50565f990 100644
--- a/sys-cluster/drbd-utils/metadata.xml
+++ b/sys-cluster/drbd-utils/metadata.xml
@@ -2,16 +2,16 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
-  		<email>cluster@gentoo.org</email>
-  		<name>Gentoo Cluster Project</name>
+		<email>cluster@gentoo.org</email>
+		<name>Gentoo Cluster Project</name>
 	</maintainer>
 	<use>
-  		<flag name="xen">Enable Xen integration</flag>
+		<flag name="xen">Enable Xen integration</flag>
 		<flag name="pacemaker">Enable Pacemaker integration</flag>
 		<flag name="heartbeat">Enable Heartbeat integration</flag>
 	</use>
 	<longdescription>
-		The user space tools to control, configure the DRBD driver, as well as integration programs and scripts 
+		The user space tools to control, configure the DRBD driver, as well as integration programs and scripts
 		that glues the DRBD system to cluster management software and other system components.
 	</longdescription>
 </pkgmetadata>
diff --git a/sys-cluster/drbd/Manifest b/sys-cluster/drbd/Manifest
index ad189913d84b..9bd6b9df3b7d 100644
--- a/sys-cluster/drbd/Manifest
+++ b/sys-cluster/drbd/Manifest
@@ -27,4 +27,4 @@ EBUILD drbd-8.4.2.ebuild 2183 BLAKE2B 3590c85933b3a8c2516c3f46d4e01fcaf7b8a094f1
 EBUILD drbd-8.4.3-r1.ebuild 2207 BLAKE2B f669a856f6a12ddbb174ead05e214d7af290e2d8d542942331fab6e712d49f8ea8fb44f5f5abd46519a58711d1d0712a1678232e75e9482d95104b9ebdd0858f SHA512 f41956308b8c81ed835ce4b6958ea0af6c8377cf5201592ef69cf69925f4cd77f37ea017166ca59ea67e41667aa6f1575a1cb921e13062edf5c10861e297be38
 EBUILD drbd-8.4.3-r2.ebuild 2288 BLAKE2B f79e3cf636fa90a258ccf64f24e99a5d2c49b069476df25a4873c7a1f0f2a20332234f5c22188d0516f9887fa8988e3e602cccd08faaad689b4cf2bcd3241468 SHA512 4dfbddf8116874939c2ba457a3218763363066abd0bbe91579a7111a1edb0d9e635cf3524437054e8f3c212e8a370b5b5e2c6a7675b673e51e03190b1b844dd6
 EBUILD drbd-8.4.3.ebuild 2207 BLAKE2B f669a856f6a12ddbb174ead05e214d7af290e2d8d542942331fab6e712d49f8ea8fb44f5f5abd46519a58711d1d0712a1678232e75e9482d95104b9ebdd0858f SHA512 f41956308b8c81ed835ce4b6958ea0af6c8377cf5201592ef69cf69925f4cd77f37ea017166ca59ea67e41667aa6f1575a1cb921e13062edf5c10861e297be38
-MISC metadata.xml 684 BLAKE2B 851bad418fafcdd2877ef541e3e3c8e8047dd818b633562f48c96ae82ddbef32a2bf4671572a986ad1d93a9730a0f097e6aed9f7a5044a5996a37944763f5a42 SHA512 10f563a04424b8d23d6a54b2091c109f14370279bc08a6f489c308e612fba52da888ef152319485749a1807fc5daef7d7b1728ed2aa46dde74f877eff24a4ad5
+MISC metadata.xml 677 BLAKE2B 79183e6930396061e7cf5c881ced8b4e3082a2b0dfdb4520e9de6afd54269b35ba972efd7dd3c3bd67cd103fd7d40693575a9d87b7b437438d5226e6e3453b5e SHA512 b97a7c5bb6ffe6de872f535d595507cd155923c920b9e7836f9a50afa992300b0b27d43805491cbbe6c348ecf99fc24367c375b6416dae73bffb4b6706f4b89a
diff --git a/sys-cluster/drbd/metadata.xml b/sys-cluster/drbd/metadata.xml
index 19706db7b3c0..82f50565f990 100644
--- a/sys-cluster/drbd/metadata.xml
+++ b/sys-cluster/drbd/metadata.xml
@@ -2,16 +2,16 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
-  		<email>cluster@gentoo.org</email>
-  		<name>Gentoo Cluster Project</name>
+		<email>cluster@gentoo.org</email>
+		<name>Gentoo Cluster Project</name>
 	</maintainer>
 	<use>
-  		<flag name="xen">Enable Xen integration</flag>
+		<flag name="xen">Enable Xen integration</flag>
 		<flag name="pacemaker">Enable Pacemaker integration</flag>
 		<flag name="heartbeat">Enable Heartbeat integration</flag>
 	</use>
 	<longdescription>
-		The user space tools to control, configure the DRBD driver, as well as integration programs and scripts 
+		The user space tools to control, configure the DRBD driver, as well as integration programs and scripts
 		that glues the DRBD system to cluster management software and other system components.
 	</longdescription>
 </pkgmetadata>
diff --git a/sys-cluster/galera/Manifest b/sys-cluster/galera/Manifest
index 814a5eea093d..71c8583bdf6c 100644
--- a/sys-cluster/galera/Manifest
+++ b/sys-cluster/galera/Manifest
@@ -2,7 +2,9 @@ AUX galera-3.15-strip-extra-cflags.patch 2397 BLAKE2B 7d1d9e7b775e8ee26da152fb42
 AUX garb.cnf 612 BLAKE2B 6597e77fd29aacece48e89217004abc62ecaf7f6477b62d5a29ff1c3b5f18dca3cfbe6a4a115c324c945f6949e8fe227b8b9e4e94816d48eda53e9e2723100e5 SHA512 97b921109b242ad1a19326564b5f9da8a09eadd4771c2c86c727c1c30e35f92ffadbb38ce7d81bc88572d2c7b04466ad212432954e09d81417c4ed7f69ec4648
 AUX garb.sh 1029 BLAKE2B 452a4f3bf50b25f040784e03d428ba10a3580cee486a5cb283db90bee4bcefe951813fbfd4e38024fb05d1681adb74a697dfe48c4d0c47aaddf094204a818a95 SHA512 780eb8e7584d31ce24559e46724c7b981320f4706af0b9f0cd8d157247f853f51d3980178d0d234f64bcb097a4ee5493fe299d6800513403dbc7e0184c020902
 DIST galera-3-25.3.20.tar.gz 3319355 SHA256 aae9b44a7b06c0b0cd9e2f1b9bbaf9ca47c630076a6b7c66e8747e01fd343a64 SHA512 4531073bbd13542cf4b0ed06788ec0b857971bd2e0161b8df2d90072b134d5343216c012d2f712ff336209f6e34920e2aadf7b0f58f91d6ce365fb2b65ed7fbd WHIRLPOOL 9f311742a5d1a8b9550a971441bfb0f84b6876ff5d78740a22a06cf61ebd9a829a83706cb27b198be4e942d28c8a215ed29a3850f4ec72fa86266ccab534825f
-DIST galera-3-25.3.21.tar.gz 3317865 SHA256 1035b8a62cd3695ab2af8c8f1be785942d68a07123bb9bc051b51fc4b5735904 SHA512 04f9a879c1c161c84dc74c002467e60739186d49746255f0f60ad090cf9c3ff778610a3cfc58896c73c244355baefdd65109df8538c010d7a749e9ee1e88e033 WHIRLPOOL 5c95658be7895d00c9b9cd4fbc870e439ede7c71f6ba685c60086c071154c1f7f5c0b412fc1ac0a95d5b32d2ffecb981ddbcb3147f15a5ba500bfd2c12ccab36
+DIST galera-3-25.3.21.tar.gz 3317865 BLAKE2B e3f1fec764c171615d0db3a0375bf660185c3271470a0f9114299cc0159bf43cce7bdf4ad85cfb8e7fcd3d50917846ed3ce0726a3a5e371439f5ca0a1b2d63d6 SHA512 04f9a879c1c161c84dc74c002467e60739186d49746255f0f60ad090cf9c3ff778610a3cfc58896c73c244355baefdd65109df8538c010d7a749e9ee1e88e033
+DIST galera-3-25.3.22.tar.gz 3320337 BLAKE2B f55ac3f5dc18bb5aa0cf5f3fd8eee4cc7697324d3c62902303b36311dac06042b5a497be4beba2a202865cdd5866d37ca74239014ec3c3960847fe9bb3bc873f SHA512 4367ed8b36013e2c68c90d91b83a1929aa602bf82447f9d2382a1ad56f287867da543cdd995ed5791a1ba60f891fbc380afe1ecec983c2184f2050a83eed0fed
 EBUILD galera-25.3.20.ebuild 1816 BLAKE2B 6699e5f545d51d15f7b82c17ce56fa5733a817a820a80ab6b84e16f7eef3bf88baf6ebcae54af0f06072a2e299b83d8a87478271efd378fa2d19fa70c11e148b SHA512 ac38b5e8a74494baebc889fe312eca034dc7637c3aab2ccc560f6e8ac4d81e95e36e9a08b8f2a11e8020fc4c8e01a5b2fcb2d0d453d51c6b94a644f7f853fb4b
 EBUILD galera-25.3.21.ebuild 1828 BLAKE2B 01cf04ad9d25318480f7d44242c4295ca49bdbf4de6f7d5650707e323a57fe0fe0883057d7a3aef7729c4485a65eca51ae45797c97a3c47b283150ab848a9d9b SHA512 701753adad3fe6556f18d53990f0fb8eb9acc8625dff14b6ce2666e168ae19b68f78d08935ff735fbca8ac93102549ebc0bd46aea17a1effb9d64de67a0a4a84
+EBUILD galera-25.3.22.ebuild 1824 BLAKE2B 9a0b5ca6268fa6b82920323d801a7fb5d4b3b497b950e777bbfbe7264407655b81c25ac2817bc84db7e1deb45bfc3e8ccfa611a87b97e7b91877d0dd450ffcd8 SHA512 e6e1126a523a996d99ed0286ef1ef04005eb48d9e99300e421dcdb7330fe8823c91f8eb22138af0a5b51256b1ffbb6c1420ca6487fbfbd12d805faebf4aeea57
 MISC metadata.xml 462 BLAKE2B 1b0826bcb2bd93caa5f017b3c530d3bea18daac9f457dc79d6436d21f41b8c33d2979469df870cbc68428ba0110d17013bf9cd82f4f46d9be43bf996f7815e0c SHA512 b99987e53ae976905d3e493b09cbe35161f90b8ebfc88c4a9616b8722b0a0005c2427d509e15fdd7bbb30977266188452b3b6ec7479a943bce3a5922410246e2
diff --git a/sys-cluster/galera/galera-25.3.22.ebuild b/sys-cluster/galera/galera-25.3.22.ebuild
new file mode 100644
index 000000000000..2800a6fdeeb3
--- /dev/null
+++ b/sys-cluster/galera/galera-25.3.22.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_P="${PN}-3-${PV}"
+
+inherit 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://releases.galeracluster.com/${PN}-3/source/galera-3-${PV}.tar.gz"
+LICENSE="GPL-2 BSD"
+
+SLOT="0"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="cpu_flags_x86_sse4_2 garbd test"
+
+CDEPEND="
+	dev-libs/openssl:0=
+	>=dev-libs/boost-1.41:0=
+	"
+DEPEND="${DEPEND}
+	${CDEPEND}
+	dev-libs/check
+	>=sys-devel/gcc-4.4
+	>=dev-cpp/asio-1.10.1[ssl]
+	"
+#Run time only
+RDEPEND="${CDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+# Respect {C,LD}FLAGS.
+PATCHES=( "${FILESDIR}/galera-3.15-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=(
+		ssl=1
+		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/glusterfs/Manifest b/sys-cluster/glusterfs/Manifest
index ad94993189ca..77061312890e 100644
--- a/sys-cluster/glusterfs/Manifest
+++ b/sys-cluster/glusterfs/Manifest
@@ -1,18 +1,12 @@
 AUX 50glusterfs-mode-gentoo.el 169 BLAKE2B 461afb9f17ef9dee79348279e861039193400d61a926e9d8499351b7e42377cc1bffce6dc2c2d7f3b50b1de016a336bad69c7a79bb800b973288eef542baed85 SHA512 f90b3f49f53c08db5596a6795df64a834b390602a79fb79b56f6cfb6191c7ca8ce2bedd2885d049575e26cc3b321f80e2786e99055c02682f4fbf454d5ed5804
-AUX glusterd-r2.initd 749 BLAKE2B 7fc6fbd6de4b21eee1b55c344f8c9238b9589e7e8d66658abf5486d87ab63857e6dd8d677db67906c8e9a9a1349e16bcc3a7f0c53655f604562eb2a8c40c5898 SHA512 90b2ab62bd69f0a6f4ef9596ea4b287524650821251ff9cf6fe43f7f362e359c43615fd5ba68d4b5589af1a3e712a91cab69bb95b363b4e20efdf9e02a5e1e6a
 AUX glusterd-r3.initd 755 BLAKE2B 6b402725a6a53839ff718ae19f4917b61330f78ae6657480a218f06657d5d7db1c4b57efa275159be76bc84fd5b600a22bd4b374a8a6fbb56576799650ce89fe SHA512 d6f46374f48cf78c4114c786fbba4412764527cec020f43ab2a46000fcada98bdb6dfb67ba9db2be3e39a851cba1db97a7154e4cab6df7ce541c0157c781706c
 AUX glusterfs-3.12.2-poisoned-sysmacros.patch 431 BLAKE2B 4446b2ba5aad48dfe54c24e0cf802196d6ee4898a77f7a6950e2c1971550deddc7ff232dab021b4bfcb962f4544fa6bebba314b07942228298a5c38758c38442 SHA512 fb9f56254a90325bfc92d60af41075b51460d179eac7149cf1d0dc218d7cc7c9102eaf0591c2763df2fa68d2595f87dd3427d810bc182b61103bd5f9588c77db
 AUX glusterfs-3.12.2-silent_rules.patch 632 BLAKE2B f9aa9dfb128b7ba2bf212b3b59f1092dd94f24f43c91ec416af9e6c157a9a165581fad83f926e60557a236ca54ae7e2611fc927cd022bf0f931472d6ae1fba1d SHA512 81ec26ad0385b3c9e94c918a720ecea606cf5adf9f28aa57bfcd8de179e24b4feb344573820528716d6530079553bd3df7ac1cea39e3893b35573990fe3ffd1c
 AUX glusterfs-3.12.3-libtirpc.patch 1416 BLAKE2B 3b71ef845ddfd6a3c1e3c1b804e9fed421c27e5b1ad68eda21dbcd039022531e54dd5881f2bc3bad0b1ccc3d94f13b5253ae98dd8c83d2792c71e5965ff35e85 SHA512 adad49a9e3c3d190ba5f193f7ed5078a8cd143149965ff137327908845ab985478bb1e799b712b095101bd7773384147928eb08aff4d5b5572a4859be5c61915
-AUX glusterfs-3.4.0-silent_rules.patch 553 BLAKE2B 67ac66f19b0875b011ea05a006db8beaabf50578bc824f57ff9868f54635395c316a7f5f2163ae29176a1cdd905d815c3e7fce3e547fec37857844a81fabf5d2 SHA512 67fe230a667084f30960d4ed79f58c7da93edde086ca8614cb3f7160901cb87da471cce932cfae470033c5dfc92b00ed69fd0e32238bc0e9af770e1946f511ce
-AUX glusterfs-3.5.1-Add-libraries-using-LIBADD-instead-of-LDFLAGS.patch 2145 BLAKE2B 2126a62329664ca59b709dfed237246119f8a8fa2e614bc93138168a519f92f1616245a718dcebd7525bc07cc9453d7c0be1eb97755d4eecf44d2d247ebf1eb4 SHA512 22d4ead173579698a23b7d66e566e61410e5bc0178b1dc0b7346b18d7e8cf33a44873b83a09e6dab32b06e7df8285da4bb7eb730626c61c1b3d28e9e8ce86f00
-AUX glusterfs-3.6.5-build-shared-only.patch 27261 BLAKE2B 82e7d214775f816a523614c65ea6ba8bf83ee0a0b7705b4f537f483ba0a68fbea9868afee25dae911d2eeccec5f43f535c40e79a963069967739bddb1ae5bffa SHA512 cbaa02845022cb32aab1e419d13f8291b59aa6de78ccdd944af52d05defcd4ae9bb891c0f303f7d4870056e0777d70507b137aa9e38a4a13a267925a3cbc0277
 AUX glusterfs-r1.initd 3065 BLAKE2B 6bf49cfec1c6f685b4c72a79e956ca9823c742bca3d665f0bbffb59bbd2f81b314df62b8aab4eab5c4d23b9e88f43168160cb0faedece3307ddf2347f5282311 SHA512 28c5f401b2ff017d8faf7b290fa265cc5f1a9d60edf11dbae5801e943e7e0833fa8267880efa80c4fc07048d75afd446808c583d2b62a6c5a6bde25d317bde97
 AUX glusterfs.confd 129 BLAKE2B 17eeb707fe5ebeb335b0c64ce999268e5f5c6fb6d2ba48467f6f15e73f4c2e883b909da642e6144c637510302834c7c895ebf8b2558344c3bedc9cdc06a44766 SHA512 657c478dd3a60c144543821acd6a87f804d258d4679007aad5108790449e43eda7e0de8e8c0c8e13357a35afbb0d09065423101e5234285a9b96c9ac8b2e33b4
 AUX glusterfs.logrotate 611 BLAKE2B e79718d43b8123e8bcc63336977f972e58332536e0bccad84f3abb5e4afd87853d1c70ab689e2c454d94a8d74bb65122e7bf5a35150f60fb268c7757eea7b0d0 SHA512 568728fe77acecb686286b0be6c086fe3448d054d26da15c3846726a8f845ae963e6756c517b413a9eb4d6b646c61972887a35e89846d2d90d364b755e471791
 AUX glusterfs.vim 139 BLAKE2B 73fdcb49c0c252784718b461541d5483e118bf1b83f445a6ced3119600aa46c469291e19aa439e2c1e35ffc88c83a74977571d8ccfddf078f65c5c16a44ed3e0 SHA512 6ea3b56b71d7e206a57611dd68160b6b9242a19b5c927560f60881dc28d250f7958c50f788a7b9a41fb46010fdac2d67a8289b909ed1f05b793c900f37ccbfb7
 DIST glusterfs-3.12.3.tar.gz 7187644 BLAKE2B 736c6bb408b0bd289ce5ce0abcc7e8bf4b7f96e4e92a1e669f016b59fb16993b17f7cf50fed09a6eeb851b57054c7bf9e595b642c506b0aca567d7ae80de0e84 SHA512 f648b8324a69360b510c947e49918467c969dcc21b6a408b6916b780aa78c44abe027b6c84d696eed7d5f381b055edd3be1dfe4f3ea8f76d15d9319cd08cfa3d
-DIST glusterfs-3.6.5.tar.gz 6091408 SHA256 20d912ef35fb8350c50c39c15134a3558ee90d012203f049799c8eb67a61fd2a SHA512 7ca41855239818fc4c84cdb86e1f1d39502e781d5117a5ee50ea134f03f0823a8640ee9bda28f05463e8504aba9ddb12ac72e118f0ce7c3755c083033f5677ca WHIRLPOOL 9fc0592052d976d65fcc769c69d910fa6d909695162bccf80c1e799a2c54c531ab03a4afd3788951c231a214a22e5f8bb3613a83277858627425b86fd532ab5e
-EBUILD glusterfs-3.12.3.ebuild 6577 BLAKE2B 24c68258fd6d722d9300ce6ab96024fc6d1206e0d5c1bb5c812ece2b659a7e91227f4acc3436b43ef0f7d223da44a6403bd6cddb2a2c987426ebbf82b2ff115e SHA512 100937f67b93be5a5b18cebf7bc38398895781fc7e4bd83a5e83df429d631f69695fe7e767395202aadefd5376d15a32bc6f7fd53e3e251d22d1b393ddf7bb01
-EBUILD glusterfs-3.6.5.ebuild 5609 BLAKE2B 37d8a5df7c72ad82ab9c43f6d46a0df8e3e4e8b1686b034da2885c4d74a5d8433222122bb1383729b79a43b5f9be14f8987346591bf6cc56f6a8823a5c4d4725 SHA512 89629b74afb06c7409375a8c342873840436f6eaccbc4a29800b264090dd31f1dcfa391d77d655a6ecc73ce906a6d7b253e6a9065697ab920ac5e75ea64a1b45
+EBUILD glusterfs-3.12.3.ebuild 6574 BLAKE2B 6d1248d9dbb68d21d3181bcce41f0da31f3ca94f9d55190c74e759f14587e1b4c6912a7df4976f4c1a4b075ee84f304a64bbf97f47e6f4facd996cca97a3c84e SHA512 b4a7578df685eaad9c0e98eebe7c85919879ecdbf78c2e00204c67da12d08c2e7c80f16c8945cc321e94946deca7ae34b87977e8463b9020a22fa27e99ca38e5
 MISC metadata.xml 1658 BLAKE2B 8bddb420e7ff711d3de6270eb1a3e9c8fcc9e67ea36d567543a8e22699dc0011affcc9ca39fc01b3ee6bec0a59341d2305f3de94a986ec7afec736db54092550 SHA512 173e9829db764acf7effd75cbc057ad05238b04481a6a6622045740dd885f54a97e17238f60ac893b35322ad711eed88b6cb791c067054f4cfaa81d56df8795d
diff --git a/sys-cluster/glusterfs/files/glusterd-r2.initd b/sys-cluster/glusterfs/files/glusterd-r2.initd
deleted file mode 100644
index 924939400f30..000000000000
--- a/sys-cluster/glusterfs/files/glusterd-r2.initd
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-description="Gluster elastic volume management daemon"
-command="/usr/sbin/glusterd"
-pidfile="/var/run/${SVCNAME}.pid"
-command_args="-N"
-
-command_background="yes"
-
-depend() {
-	need net
-	before netmount
-}
-
-start_pre() {
-	# Ensure that the GlusterFS auxiliary mount parent directory exists
-	checkpath --directory --owner root:root --mode 0700 /var/run/gluster
-}
-
-start_post() {
-	local c=0
-	ebegin "Waiting for glusterd to start up"
-	while ! /usr/sbin/gluster volume list &>/dev/null && [ "${c}" -lt "${glusterd_max_wait_start-60}" ]; do
-		(( ++c ))
-	done
-	[ "${c}" -lt "${glusterd_max_wait_start-60}" ]
-	eend $?
-
-	return 0
-}
diff --git a/sys-cluster/glusterfs/files/glusterfs-3.4.0-silent_rules.patch b/sys-cluster/glusterfs/files/glusterfs-3.4.0-silent_rules.patch
deleted file mode 100644
index 1b79e0d079e4..000000000000
--- a/sys-cluster/glusterfs/files/glusterfs-3.4.0-silent_rules.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- configure.ac	2013-07-12 19:43:26.000000000 +0200
-+++ configure.ac2	2013-07-25 13:58:48.294091861 +0200
-@@ -10,20 +10,6 @@
- 
- AM_INIT_AUTOMAKE
- 
--m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES(yes)])
--
--if make --help 2>&1 | grep -q no-print-directory; then
--   AM_MAKEFLAGS="$AM_MAKEFLAGS --no-print-directory";
--fi
--
--if make --help 2>&1 | grep -q quiet; then
--   AM_MAKEFLAGS="$AM_MAKEFLAGS --quiet"
--fi
--
--if libtool --help 2>&1 | grep -q quiet; then
--   AM_LIBTOOLFLAGS="--quiet";
--fi
--
- AC_CONFIG_HEADERS([config.h])
- 
- AC_CONFIG_FILES([Makefile
diff --git a/sys-cluster/glusterfs/files/glusterfs-3.5.1-Add-libraries-using-LIBADD-instead-of-LDFLAGS.patch b/sys-cluster/glusterfs/files/glusterfs-3.5.1-Add-libraries-using-LIBADD-instead-of-LDFLAGS.patch
deleted file mode 100644
index 5c4df0c97025..000000000000
--- a/sys-cluster/glusterfs/files/glusterfs-3.5.1-Add-libraries-using-LIBADD-instead-of-LDFLAGS.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 8bfe3752c3a0a4db49a879048cdd089da6c45ed0 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Tiziano=20M=C3=BCller?= <tm@dev-zero.ch>
-Date: Thu, 26 Jun 2014 19:04:54 +0200
-Subject: [PATCH] Add libraries using LIBADD instead of LDFLAGS
-
----
- xlators/encryption/crypt/src/Makefile.am  | 6 +++---
- xlators/features/compress/src/Makefile.am | 4 ++--
- 2 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/xlators/encryption/crypt/src/Makefile.am b/xlators/encryption/crypt/src/Makefile.am
-index b13f650..d7ebac6 100644
---- a/xlators/encryption/crypt/src/Makefile.am
-+++ b/xlators/encryption/crypt/src/Makefile.am
-@@ -3,10 +3,10 @@ if ENABLE_CRYPT_XLATOR
- xlator_LTLIBRARIES = crypt.la
- xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/encryption
- 
--crypt_la_LDFLAGS = -module -avoid-version -lssl -lcrypto
-+crypt_la_LDFLAGS = -module -avoid-version
- 
- crypt_la_SOURCES = keys.c data.c metadata.c atom.c crypt.c
--crypt_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
-+crypt_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -lssl -lcrypto
- 
- noinst_HEADERS = crypt-common.h crypt-mem-types.h crypt.h metadata.h
- 
-@@ -21,4 +21,4 @@ else
- noinst_DIST = keys.c data.c metadata.c atom.c crypt.c
- noinst_HEADERS = crypt-common.h crypt-mem-types.h crypt.h metadata.h
- 
--endif
-\ No newline at end of file
-+endif
-diff --git a/xlators/features/compress/src/Makefile.am b/xlators/features/compress/src/Makefile.am
-index 0bf757c..d3abe03 100644
---- a/xlators/features/compress/src/Makefile.am
-+++ b/xlators/features/compress/src/Makefile.am
-@@ -4,10 +4,10 @@ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features
- 
- noinst_HEADERS = cdc.h cdc-mem-types.h
- 
--cdc_la_LDFLAGS = -module -avoid-version $(LIBZ_LIBS)
-+cdc_la_LDFLAGS = -module -avoid-version
- 
- cdc_la_SOURCES = cdc.c cdc-helper.c
--cdc_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
-+cdc_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la $(LIBZ_LIBS)
- 
- AM_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src -fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -D$(GF_HOST_OS) \
- -shared -nostartfiles  $(LIBZ_CFLAGS)
--- 
-1.9.2
-
diff --git a/sys-cluster/glusterfs/files/glusterfs-3.6.5-build-shared-only.patch b/sys-cluster/glusterfs/files/glusterfs-3.6.5-build-shared-only.patch
deleted file mode 100644
index af5332bc9b1e..000000000000
--- a/sys-cluster/glusterfs/files/glusterfs-3.6.5-build-shared-only.patch
+++ /dev/null
@@ -1,547 +0,0 @@
-diff -ur a/rpc/rpc-transport/rdma/src/Makefile.am b/rpc/rpc-transport/rdma/src/Makefile.am
---- a/rpc/rpc-transport/rdma/src/Makefile.am	2015-08-28 10:56:17.750192744 +0200
-+++ b/rpc/rpc-transport/rdma/src/Makefile.am	2015-08-28 11:00:36.322686236 +0200
-@@ -3,7 +3,7 @@
- transport_LTLIBRARIES = rdma.la
- transportdir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/rpc-transport
- 
--rdma_la_LDFLAGS = -module -avoid-version -nostartfiles
-+rdma_la_LDFLAGS = -module -avoid-version -nostartfiles -shared
- 
- rdma_la_SOURCES = rdma.c name.c
- rdma_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la     \
-Only in b/rpc/rpc-transport/rdma/src: Makefile.am.orig
-Only in b/rpc/rpc-transport/rdma/src: Makefile.am.rej
-diff -ur a/rpc/rpc-transport/socket/src/Makefile.am b/rpc/rpc-transport/socket/src/Makefile.am
---- a/rpc/rpc-transport/socket/src/Makefile.am	2015-08-28 10:56:17.750192744 +0200
-+++ b/rpc/rpc-transport/socket/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
-@@ -3,7 +3,7 @@
- rpctransport_LTLIBRARIES = socket.la
- rpctransportdir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/rpc-transport
- 
--socket_la_LDFLAGS = -module -avoid-version
-+socket_la_LDFLAGS = -module -avoid-version -shared
- 
- socket_la_SOURCES = socket.c name.c
- socket_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -lssl
-diff -ur a/xlators/cluster/afr/src/Makefile.am b/xlators/cluster/afr/src/Makefile.am
---- a/xlators/cluster/afr/src/Makefile.am	2015-08-28 10:56:17.740192649 +0200
-+++ b/xlators/cluster/afr/src/Makefile.am	2015-08-28 11:01:31.603219323 +0200
-@@ -10,11 +10,11 @@
- 	afr-self-heal-entry.c afr-self-heal-metadata.c afr-self-heald.c \
- 	afr-self-heal-name.c
- 
--afr_la_LDFLAGS = -module -avoid-version
-+afr_la_LDFLAGS = -module -avoid-version -shared
- afr_la_SOURCES = $(afr_common_source) $(AFR_SELFHEAL_SOURCES) afr.c
- afr_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
- 
--pump_la_LDFLAGS = -module -avoid-version
-+pump_la_LDFLAGS = -module -avoid-version -shared
- pump_la_SOURCES =  $(afr_common_source) $(AFR_SELFHEAL_SOURCES) pump.c
- pump_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
- 
-Only in b/xlators/cluster/afr/src: Makefile.am.orig
-Only in b/xlators/cluster/afr/src: Makefile.am.rej
-diff -ur a/xlators/cluster/dht/src/Makefile.am b/xlators/cluster/dht/src/Makefile.am
---- a/xlators/cluster/dht/src/Makefile.am	2015-08-28 10:56:17.740192649 +0200
-+++ b/xlators/cluster/dht/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
-@@ -11,13 +11,13 @@
- nufa_la_SOURCES = $(dht_common_source) nufa.c
- switch_la_SOURCES = $(dht_common_source) switch.c
- 
--dht_la_LDFLAGS = -module -avoid-version
-+dht_la_LDFLAGS = -module -avoid-version -shared
- dht_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
- 
--nufa_la_LDFLAGS = -module -avoid-version
-+nufa_la_LDFLAGS = -module -avoid-version -shared
- nufa_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
- 
--switch_la_LDFLAGS = -module -avoid-version
-+switch_la_LDFLAGS = -module -avoid-version -shared
- switch_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
- 
- noinst_HEADERS = dht-common.h dht-mem-types.h dht-messages.h dht-helper.h \
-Only in b/xlators/cluster/dht/src: Makefile.am.orig
-diff -ur a/xlators/cluster/stripe/src/Makefile.am b/xlators/cluster/stripe/src/Makefile.am
---- a/xlators/cluster/stripe/src/Makefile.am	2015-08-28 10:56:17.740192649 +0200
-+++ b/xlators/cluster/stripe/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
-@@ -1,7 +1,7 @@
- xlator_LTLIBRARIES = stripe.la
- xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/cluster
- 
--stripe_la_LDFLAGS = -module -avoid-version
-+stripe_la_LDFLAGS = -module -avoid-version -shared
- 
- stripe_la_SOURCES = stripe.c stripe-helpers.c \
- 	$(top_builddir)/xlators/lib/src/libxlator.c
-Only in b/xlators/cluster/stripe/src: Makefile.am.orig
-diff -ur a/xlators/debug/error-gen/src/Makefile.am b/xlators/debug/error-gen/src/Makefile.am
---- a/xlators/debug/error-gen/src/Makefile.am	2015-08-28 10:56:17.720192456 +0200
-+++ b/xlators/debug/error-gen/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
-@@ -2,7 +2,7 @@
- xlator_LTLIBRARIES = error-gen.la
- xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/debug
- 
--error_gen_la_LDFLAGS = -module -avoid-version
-+error_gen_la_LDFLAGS = -module -avoid-version -shared
- 
- error_gen_la_SOURCES = error-gen.c
- error_gen_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
-diff -ur a/xlators/debug/io-stats/src/Makefile.am b/xlators/debug/io-stats/src/Makefile.am
---- a/xlators/debug/io-stats/src/Makefile.am	2015-08-28 10:56:17.720192456 +0200
-+++ b/xlators/debug/io-stats/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
-@@ -2,7 +2,7 @@
- xlator_LTLIBRARIES = io-stats.la
- xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/debug
- 
--io_stats_la_LDFLAGS = -module -avoid-version
-+io_stats_la_LDFLAGS = -module -avoid-version -shared
- 
- io_stats_la_SOURCES = io-stats.c
- io_stats_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
-diff -ur a/xlators/debug/trace/src/Makefile.am b/xlators/debug/trace/src/Makefile.am
---- a/xlators/debug/trace/src/Makefile.am	2015-08-28 10:56:17.720192456 +0200
-+++ b/xlators/debug/trace/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
-@@ -2,7 +2,7 @@
- xlator_LTLIBRARIES = trace.la
- xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/debug
- 
--trace_la_LDFLAGS = -module -avoid-version
-+trace_la_LDFLAGS = -module -avoid-version -shared
- 
- trace_la_SOURCES = trace.c
- trace_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
-diff -ur a/xlators/encryption/crypt/src/Makefile.am b/xlators/encryption/crypt/src/Makefile.am
---- a/xlators/encryption/crypt/src/Makefile.am	2015-08-28 11:18:28.073021439 +0200
-+++ b/xlators/encryption/crypt/src/Makefile.am	2015-08-28 11:16:28.051864039 +0200
-@@ -3,7 +3,7 @@
- xlator_LTLIBRARIES = crypt.la
- xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/encryption
- 
--crypt_la_LDFLAGS = -module -avoid-version
-+crypt_la_LDFLAGS = -module -avoid-version -shared
- 
- crypt_la_SOURCES = keys.c data.c metadata.c atom.c crypt.c
- crypt_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -lssl -lcrypto
-Only in b/xlators/encryption/crypt/src: Makefile.am.orig
-Only in b/xlators/encryption/crypt/src: Makefile.am.rej
-diff -ur a/xlators/encryption/rot-13/src/Makefile.am b/xlators/encryption/rot-13/src/Makefile.am
---- a/xlators/encryption/rot-13/src/Makefile.am	2015-08-28 10:56:17.720192456 +0200
-+++ b/xlators/encryption/rot-13/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
-@@ -1,7 +1,7 @@
- xlator_LTLIBRARIES = rot-13.la
- xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/encryption
- 
--rot_13_la_LDFLAGS = -module -avoid-version
-+rot_13_la_LDFLAGS = -module -avoid-version -shared
- 
- rot_13_la_SOURCES = rot-13.c
- rot_13_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la 
-diff -ur a/xlators/features/changelog/src/Makefile.am b/xlators/features/changelog/src/Makefile.am
---- a/xlators/features/changelog/src/Makefile.am	2015-08-28 10:56:17.730192551 +0200
-+++ b/xlators/features/changelog/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
-@@ -5,7 +5,7 @@
- noinst_HEADERS = changelog-helpers.h changelog-mem-types.h changelog-rt.h \
- 	changelog-misc.h changelog-encoders.h changelog-notifier.h
- 
--changelog_la_LDFLAGS = -module -avoid-version
-+changelog_la_LDFLAGS = -module -avoid-version -shared
- 
- changelog_la_SOURCES = changelog.c changelog-rt.c changelog-helpers.c \
- 	changelog-encoders.c changelog-notifier.c changelog-barrier.c
-Only in b/xlators/features/changelog/src: Makefile.am.orig
-diff -ur a/xlators/features/compress/src/Makefile.am b/xlators/features/compress/src/Makefile.am
---- a/xlators/features/compress/src/Makefile.am	2015-08-28 11:18:28.073021439 +0200
-+++ b/xlators/features/compress/src/Makefile.am	2015-08-28 11:17:19.492360095 +0200
-@@ -4,7 +4,7 @@
- 
- noinst_HEADERS = cdc.h cdc-mem-types.h
- 
--cdc_la_LDFLAGS = -module -avoid-version
-+cdc_la_LDFLAGS = -module -avoid-version -shared
- 
- cdc_la_SOURCES = cdc.c cdc-helper.c
- cdc_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la $(LIBZ_LIBS)
-Only in b/xlators/features/compress/src: Makefile.am.rej
-diff -ur a/xlators/features/gfid-access/src/Makefile.am b/xlators/features/gfid-access/src/Makefile.am
---- a/xlators/features/gfid-access/src/Makefile.am	2015-08-28 10:56:17.730192551 +0200
-+++ b/xlators/features/gfid-access/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
-@@ -1,7 +1,7 @@
- xlator_LTLIBRARIES = gfid-access.la
- xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features
- 
--gfid_access_la_LDFLAGS = -module -avoid-version
-+gfid_access_la_LDFLAGS = -module -avoid-version -shared
- 
- gfid_access_la_SOURCES = gfid-access.c
- gfid_access_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
-diff -ur a/xlators/features/index/src/Makefile.am b/xlators/features/index/src/Makefile.am
---- a/xlators/features/index/src/Makefile.am	2015-08-28 10:56:17.730192551 +0200
-+++ b/xlators/features/index/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
-@@ -1,7 +1,7 @@
- xlator_LTLIBRARIES = index.la
- xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features
- 
--index_la_LDFLAGS = -module -avoid-version
-+index_la_LDFLAGS = -module -avoid-version -shared
- 
- index_la_SOURCES = index.c
- index_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
-diff -ur a/xlators/features/locks/src/Makefile.am b/xlators/features/locks/src/Makefile.am
---- a/xlators/features/locks/src/Makefile.am	2015-08-28 10:56:17.730192551 +0200
-+++ b/xlators/features/locks/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
-@@ -1,7 +1,7 @@
- xlator_LTLIBRARIES = locks.la
- xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features
- 
--locks_la_LDFLAGS = -module -avoid-version
-+locks_la_LDFLAGS = -module -avoid-version -shared
- 
- locks_la_SOURCES = common.c posix.c entrylk.c inodelk.c reservelk.c \
- 		   clear.c
-diff -ur a/xlators/features/mac-compat/src/Makefile.am b/xlators/features/mac-compat/src/Makefile.am
---- a/xlators/features/mac-compat/src/Makefile.am	2015-08-28 10:56:17.730192551 +0200
-+++ b/xlators/features/mac-compat/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
-@@ -1,7 +1,7 @@
- xlator_LTLIBRARIES = mac-compat.la
- xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features
- 
--mac_compat_la_LDFLAGS = -module -avoid-version
-+mac_compat_la_LDFLAGS = -module -avoid-version -shared
- 
- mac_compat_la_SOURCES = mac-compat.c
- mac_compat_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
-diff -ur a/xlators/features/marker/src/Makefile.am b/xlators/features/marker/src/Makefile.am
---- a/xlators/features/marker/src/Makefile.am	2015-08-28 10:56:17.730192551 +0200
-+++ b/xlators/features/marker/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
-@@ -1,7 +1,7 @@
- xlator_LTLIBRARIES = marker.la
- xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features
- 
--marker_la_LDFLAGS = -module -avoid-version
-+marker_la_LDFLAGS = -module -avoid-version -shared
- 
- marker_la_SOURCES = marker.c marker-quota.c marker-quota-helper.c marker-common.c
- marker_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
-diff -ur a/xlators/features/protect/src/Makefile.am b/xlators/features/protect/src/Makefile.am
---- a/xlators/features/protect/src/Makefile.am	2015-08-28 10:56:17.730192551 +0200
-+++ b/xlators/features/protect/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
-@@ -2,15 +2,15 @@
- 
- xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features
- 
--prot_dht_la_LDFLAGS = -module -avoid-version
-+prot_dht_la_LDFLAGS = -module -avoid-version -shared
- prot_dht_la_SOURCES = prot_dht.c
- prot_dht_la_LIBADD  = $(top_builddir)/libglusterfs/src/libglusterfs.la
- 
--prot_client_la_LDFLAGS = -module -avoid-version
-+prot_client_la_LDFLAGS = -module -avoid-version -shared
- prot_client_la_SOURCES = prot_client.c
- prot_client_la_LIBADD  = $(top_builddir)/libglusterfs/src/libglusterfs.la
- 
--prot_server_la_LDFLAGS = -module -avoid-version
-+prot_server_la_LDFLAGS = -module -avoid-version -shared
- prot_server_la_SOURCES = prot_server.c
- prot_server_la_LIBADD  = $(top_builddir)/libglusterfs/src/libglusterfs.la
- 
-diff -ur a/xlators/features/qemu-block/src/Makefile.am b/xlators/features/qemu-block/src/Makefile.am
---- a/xlators/features/qemu-block/src/Makefile.am	2015-08-28 10:56:17.730192551 +0200
-+++ b/xlators/features/qemu-block/src/Makefile.am	2015-08-28 11:03:19.464259458 +0200
-@@ -2,7 +2,7 @@
- xlator_LTLIBRARIES = qemu-block.la
- xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features
- 
--qemu_block_la_LDFLAGS = -module -avoid-version
-+qemu_block_la_LDFLAGS = -module -avoid-version -shared
- qemu_block_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la $(GLIB_LIBS) $(ZLIB_LIBS) -lrt
- 
- qemu_block_la_SOURCES_qemu = \
-Only in b/xlators/features/qemu-block/src: Makefile.am.orig
-Only in b/xlators/features/qemu-block/src: Makefile.am.rej
-diff -ur a/xlators/features/quiesce/src/Makefile.am b/xlators/features/quiesce/src/Makefile.am
---- a/xlators/features/quiesce/src/Makefile.am	2015-08-28 10:56:17.730192551 +0200
-+++ b/xlators/features/quiesce/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
-@@ -1,7 +1,7 @@
- xlator_LTLIBRARIES = quiesce.la
- xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features
- 
--quiesce_la_LDFLAGS = -module -avoid-version
-+quiesce_la_LDFLAGS = -module -avoid-version -shared
- 
- quiesce_la_SOURCES = quiesce.c
- quiesce_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
-diff -ur a/xlators/features/quota/src/Makefile.am b/xlators/features/quota/src/Makefile.am
---- a/xlators/features/quota/src/Makefile.am	2015-08-28 10:56:17.730192551 +0200
-+++ b/xlators/features/quota/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
-@@ -1,8 +1,8 @@
- xlator_LTLIBRARIES = quota.la quotad.la
- xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features
- 
--quota_la_LDFLAGS = -module -avoid-version
--quotad_la_LDFLAGS = -module -avoid-version
-+quota_la_LDFLAGS = -module -avoid-version -shared
-+quotad_la_LDFLAGS = -module -avoid-version -shared
- 
- quota_la_SOURCES = quota.c quota-enforcer-client.c
- quota_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
-diff -ur a/xlators/features/read-only/src/Makefile.am b/xlators/features/read-only/src/Makefile.am
---- a/xlators/features/read-only/src/Makefile.am	2015-08-28 10:56:17.730192551 +0200
-+++ b/xlators/features/read-only/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
-@@ -4,12 +4,12 @@
- 
- noinst_HEADERS = read-only-common.h
- 
--read_only_la_LDFLAGS = -module -avoid-version
-+read_only_la_LDFLAGS = -module -avoid-version -shared
- 
- read_only_la_SOURCES = read-only.c read-only-common.c
- read_only_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la 
- 
--worm_la_LDFLAGS = -module -avoid-version
-+worm_la_LDFLAGS = -module -avoid-version -shared
- 
- worm_la_SOURCES = read-only-common.c worm.c
- worm_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
-diff -ur a/xlators/mgmt/glusterd/src/Makefile.am b/xlators/mgmt/glusterd/src/Makefile.am
---- a/xlators/mgmt/glusterd/src/Makefile.am	2015-08-28 10:56:17.730192551 +0200
-+++ b/xlators/mgmt/glusterd/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
-@@ -1,7 +1,7 @@
- xlator_LTLIBRARIES = glusterd.la
- xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/mgmt
- glusterd_la_CPPFLAGS = $(AM_CPPFLAGS) "-DFILTERDIR=\"$(libdir)/glusterfs/$(PACKAGE_VERSION)/filter\""
--glusterd_la_LDFLAGS = -module -avoid-version
-+glusterd_la_LDFLAGS = -module -avoid-version -shared
- if ENABLE_BD_XLATOR
- glusterd_la_LDFLAGS += -llvm2app
- endif
-diff -ur a/xlators/mount/fuse/src/Makefile.am b/xlators/mount/fuse/src/Makefile.am
---- a/xlators/mount/fuse/src/Makefile.am	2015-08-28 10:56:17.720192456 +0200
-+++ b/xlators/mount/fuse/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
-@@ -26,7 +26,7 @@
- fuse_la_SOURCES = fuse-helpers.c fuse-resolve.c fuse-bridge.c \
- 	$(CONTRIBDIR)/fuse-lib/misc.c $(mount_source)
- 
--fuse_la_LDFLAGS = -module -avoid-version
-+fuse_la_LDFLAGS = -module -avoid-version -shared
- fuse_la_LIBADD = @GF_FUSE_LDADD@
- 
- AM_CPPFLAGS = $(GF_CPPFLAGS) \
-Only in b/xlators/mount/fuse/src: Makefile.am.orig
-diff -ur a/xlators/nfs/server/src/Makefile.am b/xlators/nfs/server/src/Makefile.am
---- a/xlators/nfs/server/src/Makefile.am	2015-08-28 10:56:17.740192649 +0200
-+++ b/xlators/nfs/server/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
-@@ -1,7 +1,7 @@
- xlator_LTLIBRARIES = server.la
- xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/nfs
- nfsrpclibdir = $(top_srcdir)/rpc/rpc-lib/src
--server_la_LDFLAGS = -module -avoid-version
-+server_la_LDFLAGS = -module -avoid-version -shared
- server_la_SOURCES = nfs.c nfs-common.c nfs-fops.c nfs-inodes.c \
- 	nfs-generics.c mount3.c nfs3-fh.c nfs3.c nfs3-helpers.c nlm4.c \
- 	nlmcbk_svc.c mount3udp_svc.c acl3.c
-diff -ur a/xlators/performance/io-cache/src/Makefile.am b/xlators/performance/io-cache/src/Makefile.am
---- a/xlators/performance/io-cache/src/Makefile.am	2015-08-28 10:56:17.730192551 +0200
-+++ b/xlators/performance/io-cache/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
-@@ -1,7 +1,7 @@
- xlator_LTLIBRARIES = io-cache.la
- xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/performance
- 
--io_cache_la_LDFLAGS = -module -avoid-version 
-+io_cache_la_LDFLAGS = -module -avoid-version -shared
- 
- io_cache_la_SOURCES = io-cache.c page.c ioc-inode.c
- io_cache_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
-diff -ur a/xlators/performance/io-threads/src/Makefile.am b/xlators/performance/io-threads/src/Makefile.am
---- a/xlators/performance/io-threads/src/Makefile.am	2015-08-28 10:56:17.730192551 +0200
-+++ b/xlators/performance/io-threads/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
-@@ -1,7 +1,7 @@
- xlator_LTLIBRARIES = io-threads.la
- xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/performance
- 
--io_threads_la_LDFLAGS = -module -avoid-version 
-+io_threads_la_LDFLAGS = -module -avoid-version -shared
- 
- io_threads_la_SOURCES = io-threads.c
- io_threads_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
-diff -ur a/xlators/performance/md-cache/src/Makefile.am b/xlators/performance/md-cache/src/Makefile.am
---- a/xlators/performance/md-cache/src/Makefile.am	2015-08-28 10:56:17.730192551 +0200
-+++ b/xlators/performance/md-cache/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
-@@ -1,7 +1,7 @@
- xlator_LTLIBRARIES = md-cache.la
- xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/performance
- 
--md_cache_la_LDFLAGS = -module -avoid-version
-+md_cache_la_LDFLAGS = -module -avoid-version -shared
- 
- md_cache_la_SOURCES = md-cache.c
- md_cache_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
-diff -ur a/xlators/performance/open-behind/src/Makefile.am b/xlators/performance/open-behind/src/Makefile.am
---- a/xlators/performance/open-behind/src/Makefile.am	2015-08-28 10:56:17.730192551 +0200
-+++ b/xlators/performance/open-behind/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
-@@ -1,7 +1,7 @@
- xlator_LTLIBRARIES = open-behind.la
- xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/performance
- 
--open_behind_la_LDFLAGS = -module -avoid-version
-+open_behind_la_LDFLAGS = -module -avoid-version -shared
- 
- open_behind_la_SOURCES = open-behind.c
- open_behind_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
-diff -ur a/xlators/performance/quick-read/src/Makefile.am b/xlators/performance/quick-read/src/Makefile.am
---- a/xlators/performance/quick-read/src/Makefile.am	2015-08-28 10:56:17.730192551 +0200
-+++ b/xlators/performance/quick-read/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
-@@ -1,7 +1,7 @@
- xlator_LTLIBRARIES = quick-read.la
- xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/performance
- 
--quick_read_la_LDFLAGS = -module -avoid-version 
-+quick_read_la_LDFLAGS = -module -avoid-version -shared
- 
- quick_read_la_SOURCES = quick-read.c
- quick_read_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
-diff -ur a/xlators/performance/read-ahead/src/Makefile.am b/xlators/performance/read-ahead/src/Makefile.am
---- a/xlators/performance/read-ahead/src/Makefile.am	2015-08-28 10:56:17.720192456 +0200
-+++ b/xlators/performance/read-ahead/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
-@@ -1,7 +1,7 @@
- xlator_LTLIBRARIES = read-ahead.la
- xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/performance
- 
--read_ahead_la_LDFLAGS = -module -avoid-version
-+read_ahead_la_LDFLAGS = -module -avoid-version -shared
- 
- read_ahead_la_SOURCES = read-ahead.c page.c
- read_ahead_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
-diff -ur a/xlators/performance/readdir-ahead/src/Makefile.am b/xlators/performance/readdir-ahead/src/Makefile.am
---- a/xlators/performance/readdir-ahead/src/Makefile.am	2015-08-28 10:56:17.730192551 +0200
-+++ b/xlators/performance/readdir-ahead/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
-@@ -1,7 +1,7 @@
- xlator_LTLIBRARIES = readdir-ahead.la
- xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/performance
- 
--readdir_ahead_la_LDFLAGS = -module -avoid-version
-+readdir_ahead_la_LDFLAGS = -module -avoid-version -shared
- 
- readdir_ahead_la_SOURCES = readdir-ahead.c
- readdir_ahead_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
-diff -ur a/xlators/performance/symlink-cache/src/Makefile.am b/xlators/performance/symlink-cache/src/Makefile.am
---- a/xlators/performance/symlink-cache/src/Makefile.am	2015-08-28 10:56:17.730192551 +0200
-+++ b/xlators/performance/symlink-cache/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
-@@ -1,7 +1,7 @@
- xlator_LTLIBRARIES = symlink-cache.la
- xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/testing/performance
- 
--symlink_cache_la_LDFLAGS = -module -avoid-version 
-+symlink_cache_la_LDFLAGS = -module -avoid-version -shared
- 
- symlink_cache_la_SOURCES = symlink-cache.c
- symlink_cache_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
-diff -ur a/xlators/performance/write-behind/src/Makefile.am b/xlators/performance/write-behind/src/Makefile.am
---- a/xlators/performance/write-behind/src/Makefile.am	2015-08-28 10:56:17.730192551 +0200
-+++ b/xlators/performance/write-behind/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
-@@ -1,7 +1,7 @@
- xlator_LTLIBRARIES = write-behind.la
- xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/performance
- 
--write_behind_la_LDFLAGS = -module -avoid-version 
-+write_behind_la_LDFLAGS = -module -avoid-version -shared
- 
- write_behind_la_SOURCES = write-behind.c
- write_behind_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
-diff -ur a/xlators/playground/template/src/Makefile.am b/xlators/playground/template/src/Makefile.am
---- a/xlators/playground/template/src/Makefile.am	2015-08-28 10:56:17.720192456 +0200
-+++ b/xlators/playground/template/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
-@@ -1,7 +1,7 @@
- xlator_LTLIBRARIES = template.la
- xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/testing/features
- 
--template_la_LDFLAGS = -module -avoid-version
-+template_la_LDFLAGS = -module -avoid-version -shared
- 
- template_la_SOURCES = template.c
- template_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
-diff -ur a/xlators/protocol/auth/addr/src/Makefile.am b/xlators/protocol/auth/addr/src/Makefile.am
---- a/xlators/protocol/auth/addr/src/Makefile.am	2015-08-28 10:56:17.740192649 +0200
-+++ b/xlators/protocol/auth/addr/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
-@@ -1,7 +1,7 @@
- auth_LTLIBRARIES = addr.la
- authdir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/auth
- 
--addr_la_LDFLAGS = -module -avoid-version
-+addr_la_LDFLAGS = -module -avoid-version -shared
- 
- addr_la_SOURCES = addr.c
- addr_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
-diff -ur a/xlators/protocol/auth/login/src/Makefile.am b/xlators/protocol/auth/login/src/Makefile.am
---- a/xlators/protocol/auth/login/src/Makefile.am	2015-08-28 10:56:17.740192649 +0200
-+++ b/xlators/protocol/auth/login/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
-@@ -1,7 +1,7 @@
- auth_LTLIBRARIES = login.la
- authdir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/auth
- 
--login_la_LDFLAGS = -module -avoid-version
-+login_la_LDFLAGS = -module -avoid-version -shared
- 
- login_la_SOURCES = login.c
- login_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
-diff -ur a/xlators/protocol/client/src/Makefile.am b/xlators/protocol/client/src/Makefile.am
---- a/xlators/protocol/client/src/Makefile.am	2015-08-28 10:56:17.740192649 +0200
-+++ b/xlators/protocol/client/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
-@@ -2,7 +2,7 @@
- xlator_LTLIBRARIES = client.la
- xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/protocol
- 
--client_la_LDFLAGS = -module -avoid-version
-+client_la_LDFLAGS = -module -avoid-version -shared
- 
- client_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la \
- 	$(top_builddir)/rpc/rpc-lib/src/libgfrpc.la \
-diff -ur a/xlators/protocol/server/src/Makefile.am b/xlators/protocol/server/src/Makefile.am
---- a/xlators/protocol/server/src/Makefile.am	2015-08-28 10:56:17.740192649 +0200
-+++ b/xlators/protocol/server/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
-@@ -1,7 +1,7 @@
- xlator_LTLIBRARIES = server.la
- xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/protocol
- 
--server_la_LDFLAGS = -module -avoid-version
-+server_la_LDFLAGS = -module -avoid-version -shared
- 
- server_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la \
- 	$(top_builddir)/rpc/rpc-lib/src/libgfrpc.la \
-diff -ur a/xlators/storage/bd/src/Makefile.am b/xlators/storage/bd/src/Makefile.am
---- a/xlators/storage/bd/src/Makefile.am	2015-08-28 10:56:17.720192456 +0200
-+++ b/xlators/storage/bd/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
-@@ -2,7 +2,7 @@
- xlator_LTLIBRARIES = bd.la
- xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/storage
- 
--bd_la_LDFLAGS = -module -avoid-version
-+bd_la_LDFLAGS = -module -avoid-version -shared
- LIBBD = -llvm2app -lrt
- bd_la_SOURCES = bd.c bd-helper.c bd-aio.c
- bd_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la $(LIBBD) $(LIBAIO)
-diff -ur a/xlators/storage/posix/src/Makefile.am b/xlators/storage/posix/src/Makefile.am
---- a/xlators/storage/posix/src/Makefile.am	2015-08-28 10:56:17.720192456 +0200
-+++ b/xlators/storage/posix/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
-@@ -2,7 +2,7 @@
- xlator_LTLIBRARIES = posix.la
- xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/storage
- 
--posix_la_LDFLAGS = -module -avoid-version
-+posix_la_LDFLAGS = -module -avoid-version -shared
- 
- posix_la_SOURCES = posix.c posix-helpers.c posix-handle.c posix-aio.c
- posix_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la $(LIBAIO)
-diff -ur a/xlators/system/posix-acl/src/Makefile.am b/xlators/system/posix-acl/src/Makefile.am
---- a/xlators/system/posix-acl/src/Makefile.am	2015-08-28 10:56:17.720192456 +0200
-+++ b/xlators/system/posix-acl/src/Makefile.am	2015-08-28 10:59:35.752102136 +0200
-@@ -1,6 +1,6 @@
- xlator_LTLIBRARIES = posix-acl.la
- xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/system
--posix_acl_la_LDFLAGS = -module -avoid-version
-+posix_acl_la_LDFLAGS = -module -avoid-version -shared
- posix_acl_la_SOURCES = posix-acl.c posix-acl-xattr.c
- posix_acl_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
- 
diff --git a/sys-cluster/glusterfs/glusterfs-3.12.3.ebuild b/sys-cluster/glusterfs/glusterfs-3.12.3.ebuild
index 6134e78493da..04036b762ed8 100644
--- a/sys-cluster/glusterfs/glusterfs-3.12.3.ebuild
+++ b/sys-cluster/glusterfs/glusterfs-3.12.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://download.gluster.org/pub/gluster/${PN}/$(get_version_component_
 
 LICENSE="|| ( GPL-2 LGPL-3+ )"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
 IUSE="bd-xlator crypt-xlator debug emacs +fuse +georeplication glupy infiniband +libtirpc qemu-block rsyslog static-libs +syslog systemtap test +tiering vim-syntax +xml"
 
 REQUIRED_USE="georeplication? ( ${PYTHON_REQUIRED_USE} )
diff --git a/sys-cluster/glusterfs/glusterfs-3.6.5.ebuild b/sys-cluster/glusterfs/glusterfs-3.6.5.ebuild
deleted file mode 100644
index 88fd9cdb3998..000000000000
--- a/sys-cluster/glusterfs/glusterfs-3.6.5.ebuild
+++ /dev/null
@@ -1,182 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-AUTOTOOLS_AUTORECONF=1
-
-inherit autotools-utils elisp-common eutils multilib python-single-r1 versionator
-
-DESCRIPTION="GlusterFS is a powerful network/cluster filesystem"
-HOMEPAGE="http://www.gluster.org/"
-SRC_URI="http://download.gluster.org/pub/gluster/${PN}/$(get_version_component_range '1-2')/${PV}/${P}.tar.gz"
-
-LICENSE="|| ( GPL-2 LGPL-3+ )"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="bd-xlator crypt-xlator debug emacs +fuse +georeplication glupy infiniband qemu-block rsyslog static-libs +syslog systemtap vim-syntax +xml"
-
-REQUIRED_USE="georeplication? ( ${PYTHON_REQUIRED_USE} )
-	glupy? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="bd-xlator? ( sys-fs/lvm2 )
-	emacs? ( virtual/emacs )
-	fuse? ( >=sys-fs/fuse-2.7.0 )
-	georeplication? ( ${PYTHON_DEPS} )
-	infiniband? ( sys-fabric/libibverbs:* sys-fabric/librdmacm:* )
-	qemu-block? ( dev-libs/glib:2 )
-	systemtap? ( dev-util/systemtap )
-	xml? ( dev-libs/libxml2 )
-	sys-libs/readline:=
-	dev-libs/libaio
-	dev-libs/openssl:=
-	|| ( sys-libs/glibc sys-libs/argp-standalone )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/bison
-	sys-devel/flex"
-
-SITEFILE="50${PN}-mode-gentoo.el"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.4.0-silent_rules.patch"
-	"${FILESDIR}/${PN}-3.5.1-Add-libraries-using-LIBADD-instead-of-LDFLAGS.patch"
-	"${FILESDIR}/${PN}-3.6.5-build-shared-only.patch"
-)
-
-DOCS=( AUTHORS ChangeLog NEWS README THANKS )
-
-# Maintainer notes:
-# * The build system will always configure & build argp-standalone but it'll never use it
-#   if the argp.h header is found in the system. Which should be the case with
-#   glibc or if argp-standalone is installed.
-
-pkg_setup() {
-	( use georeplication || use glupy ) && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	autotools-utils_src_prepare
-
-	# contrib/argp-standalone source dir is not clean...
-	cd contrib/argp-standalone
-	emake distclean
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-dependency-tracking
-		--disable-silent-rules
-		--disable-fusermount
-		$(use_enable debug)
-		$(use_enable bd-xlator)
-		$(use_enable crypt-xlator)
-		$(use_enable fuse fuse-client)
-		$(use_enable georeplication)
-		$(use_enable glupy)
-		$(use_enable infiniband ibverbs)
-		$(use_enable qemu-block)
-		$(use_enable static-libs static)
-		$(use_enable syslog)
-		$(use_enable systemtap)
-		$(use_enable xml xml-output)
-		--docdir=/usr/share/doc/${PF}
-		--localstatedir=/var
-	)
-	autotools-utils_src_configure
-}
-
-src_compile() {
-	autotools-utils_src_compile
-
-	use emacs && elisp-compile extras/glusterfs-mode.el
-}
-
-src_install() {
-	autotools-utils_src_install
-
-	rm \
-		"${D}"/etc/glusterfs/glusterfs-{georep-,}logrotate \
-		"${D}"/etc/glusterfs/gluster-rsyslog-*.conf \
-		"${D}"/usr/share/doc/${PF}/glusterfs{-mode.el,.vim} || die "removing false files failed"
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/glusterfs.logrotate glusterfs
-
-	if use rsyslog ; then
-		insinto /etc/rsyslog.d
-		newins extras/gluster-rsyslog-7.2.conf 60-gluster.conf
-	fi
-
-	if use emacs ; then
-		elisp-install ${PN} extras/glusterfs-mode.el*
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/ftdetect; doins "${FILESDIR}"/${PN}.vim
-		insinto /usr/share/vim/vimfiles/syntax; doins extras/${PN}.vim
-	fi
-
-	# insert some other tools which might be useful
-	insinto /usr/share/glusterfs/scripts
-	doins \
-		extras/backend-{cleanup,xattr-sanitize}.sh \
-		extras/clear_xattrs.sh \
-		extras/migrate-unify-to-distribute.sh
-
-	# correct permissions on installed scripts
-	# fperms 0755 /usr/share/glusterfs/scripts/*.sh
-	chmod 0755 "${ED}"/usr/share/glusterfs/scripts/*.sh || die
-
-	if use georeplication ; then
-		# move the gsync-sync-gfid tool to a binary path
-		# and set a symlink to be compliant with all other distros
-		mv "${ED}"/usr/{share/glusterfs/scripts/gsync-sync-gfid,libexec/glusterfs/} || die
-		dosym ../../../libexec/glusterfs/gsync-sync-gfid /usr/share/glusterfs/scripts/gsync-sync-gfid
-	fi
-
-	newinitd "${FILESDIR}/${PN}-r1.initd" glusterfsd
-	newinitd "${FILESDIR}/glusterd-r2.initd" glusterd
-	newconfd "${FILESDIR}/${PN}.confd" glusterfsd
-
-	keepdir /var/log/${PN}
-	keepdir /var/lib/glusterd
-
-	# QA
-	rm -rf "${ED}/var/run/" || die
-	use static-libs || find "${ED}"/usr/$(get_libdir)/ -type f -name '*.la' -delete
-
-	use georeplication && python_fix_shebang "${ED}"
-}
-
-pkg_postinst() {
-	elog "Starting with ${PN}-3.1.0, you can use the glusterd daemon to configure your"
-	elog "volumes dynamically. To do so, simply use the gluster CLI after running:"
-	elog "  /etc/init.d/glusterd start"
-	echo
-	elog "For static configurations, the glusterfsd startup script can be multiplexed."
-	elog "The default startup script uses /etc/conf.d/glusterfsd to configure the"
-	elog "separate service.  To create additional instances of the glusterfsd service"
-	elog "simply create a symlink to the glusterfsd startup script."
-	echo
-	elog "Example:"
-	elog "    # ln -s glusterfsd /etc/init.d/glusterfsd2"
-	elog "    # ${EDITOR} /etc/glusterfs/glusterfsd2.vol"
-	elog "You can now treat glusterfsd2 like any other service"
-	echo
-	ewarn "You need to use a ntp client to keep the clocks synchronized across all"
-	ewarn "of your servers. Setup a NTP synchronizing service before attempting to"
-	ewarn "run GlusterFS."
-
-	elog
-	elog "If you are upgrading from a previous version of ${PN}, please read:"
-	elog "  http://www.gluster.org/community/documentation/index.php/Upgrade_to_3.6"
-
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/sys-cluster/heat/Manifest b/sys-cluster/heat/Manifest
index 88a12a5ada30..276a19f62691 100644
--- a/sys-cluster/heat/Manifest
+++ b/sys-cluster/heat/Manifest
@@ -1,19 +1,13 @@
 AUX heat.initd 1349 BLAKE2B ebd912b20b9e78a92b30fe42f0617b1aa1f5d4bbf24b0684d0d15214a5ac66aa0b6fe8980057def7a9702c60af026c0b021c753bc3e84ffce461a23c9f86abdb SHA512 a2a2f45bb4268260ca88d7cb5c2df1e9d27041bf36fa59aadc7e39d85b79aad6992c70a3e8f9d580a493801c75299ab99191df23624ad70139f30758d8027492
 AUX heat.initd-2 463 BLAKE2B e9a795bbe1e8b5059f0169d6b04bb087f20af75beb31583b1157bf76e4ea7f3e94d026b193aa6b4b39be3bf997519478a0678f628fe39a8ede87a5129d456ed2 SHA512 8f92853d6bb21e6efae3a59bc2856bd496498297e43a5aa0350a3202e8a709cfd0791f77017b77d8b7845c3cf0d2b266273026c9cac869e3dbc749e36bf83c7c
-DIST heat-8.0.4.tar.gz 2304762 SHA256 7997dac0f35ad7fb236536959a46e843dab56dbce5694849585cb97affbbb198 SHA512 9846114813b743ba9abfb4ce6e9d3cdcddfb81a242fda83a9d22a9fc30017fec2464f3b75364d9be38d50218e79485f3405e429fac1830d163c50737b07c2865 WHIRLPOOL 8420bffb6e2b86528d9104abb981368fa2fe36b33057b0e02f1fcf9e9106a4cd58bdb833e459e38a64bd47b2f4955e15f589673b57442184e3bcd60894feab4b
-DIST heat-8.0.5.tar.gz 2309642 SHA256 8f17e09740ca1aafed4af3302b49fa425ad5a83c5ffa51de1b0aaa1b695578b6 SHA512 5ddb9a18ea0ce727b1900015d5690028bc92fe98e42dff3d609b504e5147608e3eefa54e7058ec0e8f6eefbcd3c92bb61eee29e604ce327a5b51250c6f68a1ad WHIRLPOOL 078b53006b75564230315729aa0a7d5f1ca0a790d30fd2e2ec3182f0f7357e6a45d239c7737b4c8370b1056e1f87d10c66367877917d563cb0f62aa9ca47cd89
-DIST heat-9.0.0.tar.gz 2359104 SHA256 36dbb46b72bf7b495ba8812804da7d4e9bb59481743e6e0499e904efdf4ee7be SHA512 d60cfd69807af5a51da6d236e5ccf482a5fd65f8bb2e5e8287eca587f27d0af570979b554a311037904a7c01cd8dcba43a5ef577261fb7f12a557ba6ff2ec58e WHIRLPOOL 43f9afaa57e84e7e29bba4754d3b7499afece40961891dafd6bf75da3032f79806dee6d4de91e0afd24ad53b97cf615e91df46646ed39b2df05fa53d36a31527
-DIST heat-9.0.1.tar.gz 2356475 SHA256 9d1facef9eb10e5236ad01a5249a774c58a2086db2f8a57ef97425e2ccc08dd8 SHA512 93c813bf9b7948ab5d1d261ae67cb942e35ee2cec37f8e3bfc534659725cc4aff97c731e230c1acff9308451cba64295ea47b1aae3df4b392834faf42397c0f1 WHIRLPOOL a20352592d218985e1619583cd4975e47c2b9e0bd9c4bcbbccde4608f8f137c94ffee4ca75c5941bf2c9ef798659d1e1378f54e4230477f90c98bf98f323e32f
-DIST heat.conf.sample-2017.1.9999 88798 SHA256 688a6fd65df3b9f004345c8cf739c5a553b6806213c399ac25846d1ad248e963 SHA512 5ea23f33ddc2b34414371a612041abd075694a7d63bb55efd1e75f313b4e9f35e0d68b420536bc474cd4896b0295d8763bdecbb07c71d29c462c14183159e560 WHIRLPOOL 9a91069136dcbf15d47a4b5df6521ca2740eb1a88feab57b28f2f921e517ae7557125b5ea877d4c9ed5314321c8de551270722809d270c1b8ae0245d2a75b515
-DIST heat.conf.sample-2017.2.9999 88901 SHA256 cb46fbbfa0e8ccccdc84c4637312f0d21b0c95037d2b3404623653c1b5eb0a92 SHA512 f62feaa4a0d27866876aed9f78099501247ae4b7deaefd04d77b1f4b2a1d1c991e6f3e68d9f82e3b6a4358c99fbffd90f14a05ff98105df0ef0db68ef8bc6932 WHIRLPOOL 284ad592883c8e42518872d603d097672056ba25a194569f31ee9244d1095f640f02097fda0a6539b47247ba580929d79ec173f1847bfc5e19bf45fb8cbe4720
-DIST heat.conf.sample-8.0.4 88798 SHA256 688a6fd65df3b9f004345c8cf739c5a553b6806213c399ac25846d1ad248e963 SHA512 5ea23f33ddc2b34414371a612041abd075694a7d63bb55efd1e75f313b4e9f35e0d68b420536bc474cd4896b0295d8763bdecbb07c71d29c462c14183159e560 WHIRLPOOL 9a91069136dcbf15d47a4b5df6521ca2740eb1a88feab57b28f2f921e517ae7557125b5ea877d4c9ed5314321c8de551270722809d270c1b8ae0245d2a75b515
-DIST heat.conf.sample-8.0.5 88798 SHA256 688a6fd65df3b9f004345c8cf739c5a553b6806213c399ac25846d1ad248e963 SHA512 5ea23f33ddc2b34414371a612041abd075694a7d63bb55efd1e75f313b4e9f35e0d68b420536bc474cd4896b0295d8763bdecbb07c71d29c462c14183159e560 WHIRLPOOL 9a91069136dcbf15d47a4b5df6521ca2740eb1a88feab57b28f2f921e517ae7557125b5ea877d4c9ed5314321c8de551270722809d270c1b8ae0245d2a75b515
-DIST heat.conf.sample-9.0.0 88901 SHA256 cb46fbbfa0e8ccccdc84c4637312f0d21b0c95037d2b3404623653c1b5eb0a92 SHA512 f62feaa4a0d27866876aed9f78099501247ae4b7deaefd04d77b1f4b2a1d1c991e6f3e68d9f82e3b6a4358c99fbffd90f14a05ff98105df0ef0db68ef8bc6932 WHIRLPOOL 284ad592883c8e42518872d603d097672056ba25a194569f31ee9244d1095f640f02097fda0a6539b47247ba580929d79ec173f1847bfc5e19bf45fb8cbe4720
-DIST heat.conf.sample-9.0.1 88901 SHA256 cb46fbbfa0e8ccccdc84c4637312f0d21b0c95037d2b3404623653c1b5eb0a92 SHA512 f62feaa4a0d27866876aed9f78099501247ae4b7deaefd04d77b1f4b2a1d1c991e6f3e68d9f82e3b6a4358c99fbffd90f14a05ff98105df0ef0db68ef8bc6932 WHIRLPOOL 284ad592883c8e42518872d603d097672056ba25a194569f31ee9244d1095f640f02097fda0a6539b47247ba580929d79ec173f1847bfc5e19bf45fb8cbe4720
+DIST heat-8.0.5.tar.gz 2309642 BLAKE2B 77e574368268fa1fc3c639266a4fba6c71901e7b5e4f50cf8e4fc5ec5f809fc5599345b4b8ff0d66969381d6ea17fc92a2e7002c083aabf8e45ca0289dc74012 SHA512 5ddb9a18ea0ce727b1900015d5690028bc92fe98e42dff3d609b504e5147608e3eefa54e7058ec0e8f6eefbcd3c92bb61eee29e604ce327a5b51250c6f68a1ad
+DIST heat-9.0.1.tar.gz 2356475 BLAKE2B 1af0565b9462b095a9c9c2c7a20350c049eac6cd07b623c575118d339ec7d918bb7455530e99057615287f09e594d657cf72d429e89b1366c0391ccfbafe9d07 SHA512 93c813bf9b7948ab5d1d261ae67cb942e35ee2cec37f8e3bfc534659725cc4aff97c731e230c1acff9308451cba64295ea47b1aae3df4b392834faf42397c0f1
+DIST heat.conf.sample-2017.1.9999 88798 BLAKE2B 5cfd2a466ba86dffffaa98bb9ab5793fa5315a1302e9e9d7c8f73549f1794971bf2ed3169c80e471a987658def9f706ea6246519a855e1cf623b7b89fe6b5e1d SHA512 5ea23f33ddc2b34414371a612041abd075694a7d63bb55efd1e75f313b4e9f35e0d68b420536bc474cd4896b0295d8763bdecbb07c71d29c462c14183159e560
+DIST heat.conf.sample-2017.2.9999 88901 BLAKE2B 050cfaacb46a8d9b79a17b7406acf6bca9be27a21f8278194021cadc69fb364c630ca0f0e7a320dfe9d46303d779eb8b5c31efaa9c25d3695caf70cab18b1b4d SHA512 f62feaa4a0d27866876aed9f78099501247ae4b7deaefd04d77b1f4b2a1d1c991e6f3e68d9f82e3b6a4358c99fbffd90f14a05ff98105df0ef0db68ef8bc6932
+DIST heat.conf.sample-8.0.5 88798 BLAKE2B 5cfd2a466ba86dffffaa98bb9ab5793fa5315a1302e9e9d7c8f73549f1794971bf2ed3169c80e471a987658def9f706ea6246519a855e1cf623b7b89fe6b5e1d SHA512 5ea23f33ddc2b34414371a612041abd075694a7d63bb55efd1e75f313b4e9f35e0d68b420536bc474cd4896b0295d8763bdecbb07c71d29c462c14183159e560
+DIST heat.conf.sample-9.0.1 88901 BLAKE2B 050cfaacb46a8d9b79a17b7406acf6bca9be27a21f8278194021cadc69fb364c630ca0f0e7a320dfe9d46303d779eb8b5c31efaa9c25d3695caf70cab18b1b4d SHA512 f62feaa4a0d27866876aed9f78099501247ae4b7deaefd04d77b1f4b2a1d1c991e6f3e68d9f82e3b6a4358c99fbffd90f14a05ff98105df0ef0db68ef8bc6932
 EBUILD heat-2017.1.9999.ebuild 5666 BLAKE2B e2ea89d7d4fb2c0858e168fbd38b039f36c95e63b1a61d48f5a71fe7be4d99f1fb0bd9c740d23671fac817f23b6a2c6786a6fef459fe0d5e753317f6f77d0c7a SHA512 3b99e7e4b8fa48d17e72b2e404c818da31ba668f63d76f4404ff42a6862f0918e4b9ac91fdc95977dda98c931ebd893cadba35553dcb437f563b75905b6ce058
 EBUILD heat-2017.2.9999.ebuild 6456 BLAKE2B eb38ccd3039c3c51a14a0e1450196610636e0c19f7938c8073c86b3ed947a8610b68e33d0654bbe882c4a6b12366ad7b1dc3346aaa1e22508730c4fabc196125 SHA512 5f57c8610494a03382c9f2e60716eb221b26e39f56354637960bfc2166437e0d217297911460c8d34a60b5f2dc00e2aa00d10f8b17d0d025c7d5341510e53a7f
-EBUILD heat-8.0.4.ebuild 5644 BLAKE2B 27ff33441c17fa00cb5b66d2d86f063424515b85d00b5149c057dd58666ed719ffff3580c1261421ec0a5f2d24ba2ee181535000e4a283f787a23d3482b7f292 SHA512 7cf53cd26567282869ce2aaf1b045cd30c16af63fe484fd238cae512ce8c8a04018d76d5fd7cb828a690d9d24526cdc5b259e7b3b0a4e786b090c41b290269cb
-EBUILD heat-8.0.5.ebuild 5646 BLAKE2B 3db8d7eef7ae99fdffe1a00c53ce954e65d134b6e04bf322d58cdb6729ce3ba124b3118f6e500149fe6fc191b6969e70e6529a01d5306c2c2e1a5b42aea9f38a SHA512 de3bdebe67dc127a7684cdf688b3625652d9c67ea0eaca1a301ebe67a43cda16c9289faa717b8aa8d737bb7580122efbf17d124b5496903b9caeac8f6f623bd5
-EBUILD heat-9.0.0.ebuild 6435 BLAKE2B cde7f731ad00bfd2c09f00c110de01e85942eae16e29bef82c382bd727daba2e2c4e7324110f15e4f41037e5a93d2b4450373e4f542aed03592cdeecc4429896 SHA512 2d4de5bd02b861ef4e6b306314629bd06c2c883b56e5493e8efda75cf7a62fc5a600002c401115ac34c019325fb858ddc059ae307cf2e7751dfdbd0b4c9d22eb
-EBUILD heat-9.0.1.ebuild 6376 BLAKE2B ecc4441faec1162d7f4b6303e43eb3a950225f857a68d913f04b241ba7d6886f5b4029cdf34c43cddb051c91872f7a0e16b8b6a69dc543f2428e2798858f07fc SHA512 94501769b5d8300e052126f1a818d236d76dbf9be9819c9b329f1fcb9b3d30c3814e93230a0fb0022434d050fd5ee45aa8c1f7afa5db959ea654e2990f172816
+EBUILD heat-8.0.5.ebuild 5644 BLAKE2B 27ff33441c17fa00cb5b66d2d86f063424515b85d00b5149c057dd58666ed719ffff3580c1261421ec0a5f2d24ba2ee181535000e4a283f787a23d3482b7f292 SHA512 7cf53cd26567282869ce2aaf1b045cd30c16af63fe484fd238cae512ce8c8a04018d76d5fd7cb828a690d9d24526cdc5b259e7b3b0a4e786b090c41b290269cb
+EBUILD heat-9.0.1.ebuild 6374 BLAKE2B f868ee02ab236c943e0cff4afe5325c1ec01a838847058017664267e8b722de028a14f3d8e0050e9dbfa96da6134ce3b7f2744c47d096c7ebb6acdd7acd09ce0 SHA512 00e5580c0cb6a14301029cfd6b34d244042e9a9d038a35b84137b0436de23a7031b586c521d24a5126a73bc8e3ef5bdcee26050377c473c488eda72476863ae7
 MISC metadata.xml 631 BLAKE2B 566d35b5533177a6d8b0ef428c9bd1a320aace6b43e186139c4b53cde224c1bf488340be8b6bcac14bf6c7a51212952dc13940d34edc38e24d7d2fbea5ce0c68 SHA512 44e741975cc462454bfd08fce461b019c5ef141997f272796052f7f3aa7297646304cdc7d75a2ed01319bcba753475ba5861306c3ac74f3d97218bce60d42429
diff --git a/sys-cluster/heat/heat-8.0.4.ebuild b/sys-cluster/heat/heat-8.0.4.ebuild
deleted file mode 100644
index 450961936893..000000000000
--- a/sys-cluster/heat/heat-8.0.4.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2017 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 orchistration engine."
-HOMEPAGE="https://launchpad.net/heat"
-SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz
-	https://dev.gentoo.org/~prometheanfire/dist/openstack/heat/heat.conf.sample.ocata -> heat.conf.sample-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="+mysql +memcached postgres sqlite"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	app-admin/sudo"
-
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	>=dev-python/croniter-0.3.4[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.0.0[${PYTHON_USEDEP}]
-	!~dev-python/cryptography-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-2.18.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/oslo-cache-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-config-3.18.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-db-4.15.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.11.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-5.14.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-policy-1.17.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-reports-0.6.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-service-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.18.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-ceilometerclient-2.5.0[${PYTHON_USEDEP}]
-	>=dev-python/python-cinderclient-1.6.0[${PYTHON_USEDEP}]
-	!~dev-python/python-cinderclient-1.7.0[${PYTHON_USEDEP}]
-	!~dev-python/python-cinderclient-1.7.1[${PYTHON_USEDEP}]
-	>=dev-python/python-designateclient-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/python-glanceclient-2.5.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-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-monascaclient-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/python-neutronclient-5.1.0[${PYTHON_USEDEP}]
-	>=dev-python/python-novaclient-6.0.0[${PYTHON_USEDEP}]
-	!~dev-python/python-novaclient-7.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-openstackclient-3.3.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/pytz-2013.6[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.10.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.12.2[${PYTHON_USEDEP}]
-	>=dev-python/tenacity-3.2.1[${PYTHON_USEDEP}]
-	>=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
-	!~dev-python/routes-2.0[${PYTHON_USEDEP}]
-	!~dev-python/routes-2.1[$(python_gen_usedep 'python2_7')]
-	!~dev-python/routes-2.3[${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.0[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.0[${PYTHON_USEDEP}]
-	)
-	postgres? (
-		>=dev-python/psycopg-2.5.0
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-		<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
-	)
-	>=dev-python/sqlalchemy-migrate-0.9.6[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.17.1[${PYTHON_USEDEP}]
-
-	>=dev-python/webob-1.6.0[${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-8.0.5.ebuild b/sys-cluster/heat/heat-8.0.5.ebuild
index ea586ee6ec43..450961936893 100644
--- a/sys-cluster/heat/heat-8.0.5.ebuild
+++ b/sys-cluster/heat/heat-8.0.5.ebuild
@@ -13,7 +13,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="+mysql +memcached postgres sqlite"
 REQUIRED_USE="|| ( mysql postgres sqlite )"
 
diff --git a/sys-cluster/heat/heat-9.0.0.ebuild b/sys-cluster/heat/heat-9.0.0.ebuild
deleted file mode 100644
index 09f2d28a2330..000000000000
--- a/sys-cluster/heat/heat-9.0.0.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2017 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 orchistration 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.3.0[${PYTHON_USEDEP}]
-	!~dev-python/python-openstackclient-3.10.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-2" 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.1.ebuild b/sys-cluster/heat/heat-9.0.1.ebuild
index 82f683093c85..782daec4a31b 100644
--- a/sys-cluster/heat/heat-9.0.1.ebuild
+++ b/sys-cluster/heat/heat-9.0.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/heat/heat.conf.sa
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="+mysql +memcached postgres sqlite"
 REQUIRED_USE="|| ( mysql postgres sqlite )"
 
diff --git a/sys-cluster/openmpi/Manifest b/sys-cluster/openmpi/Manifest
index c97060e8feb4..17365fa86da4 100644
--- a/sys-cluster/openmpi/Manifest
+++ b/sys-cluster/openmpi/Manifest
@@ -9,8 +9,9 @@ DIST openmpi-1.8.4.tar.bz2 13488749 SHA256 23158d916e92c80e2924016b746a93913ba7f
 DIST openmpi-1.8.7.tar.bz2 13228742 SHA256 da629e9bd820a379cfafe15f842ee9b628d7451856085ccc23ee75ab3e1b48c7 SHA512 953e007b00c9753bafc05d13e6f686c9aa47f76f55fcc4eda565174d410de059e07862b7e667d15df13afb80418661d9a8d5ee17fdcc211d3e044992cd9ceede WHIRLPOOL 374edbca97262217dfe405414deff2f6a3cacc06daec56e3356ea76f27804ef3caa3f37050dc8a81f257b83c1ced49fd5f66647c2cba4892fbe4ec9746a6f84e
 DIST openmpi-1.8.8.tar.bz2 13231433 SHA256 a28382d1e6a36f4073412dc00836ff2524e42b674da9caf6ca7377baad790b94 SHA512 8ca2e3ebb9d9ba0f33faba9bef76fe95293721b73619cbc18176611074a56c277e9ab6cae7fa6c87ace11f16151c1bc495b2a8dbc8ad064d5a8f89f5d431a660 WHIRLPOOL e36186452978ba7a368c83b84b8b089f6995450fa866b7b8300d32eec7e64a816abf5f301dc716bf25b3b45b987489952ffc4b7057f4407677f2a2df5ee67cdd
 DIST openmpi-2.0.2.tar.bz2 8311215 SHA256 cae396e643f9f91f0a795f8d8694adf7bacfb16f967c22fb39e9e28d477730d3 SHA512 87dc3c23db4b9cb92dbacc9b384b21ce8c4288fe4edc204fbf4a3bef70d8ac4329269e777ed190fa87933d78b73b9e5550ea3b925b2039599cfef3953567232a WHIRLPOOL 9403135fbf1682597c211b1ca0d1e300bd6f49294e9a70bf21f030c48a54f85d2d7ce8de8693dccaf81e2b46fbfd9a43a817bf598dc1f96e122b3f6ea6ffc3c6
-DIST openmpi-2.0.3.tar.bz2 8285131 SHA256 b52c0204c0e5954c9c57d383bb22b4181c09934f97783292927394d29f2a808a SHA512 158f90e3fac41540036d0c9cbcbf6abfe3f420c9f295d50a28f00e98181367769167dc3a59bb47ea34bdcd5a1c5a43bd2e77dad5b0c8b08d91f65340ff2b8547 WHIRLPOOL 07740f47814279f239aab0ef52f97fdd2c4a3ed5eb643ec5e9cf8b09d2096cbb8039f60d02153002c1035fc3514f7029b525b1fceb50bdbe05ec307c06fb7501
-DIST openmpi-2.1.2.tar.bz2 8278459 SHA256 3cc5804984c5329bdf88effc44f2971ed244a29b256e0011b8deda02178dd635 SHA512 8a27a67cab384f9f03efe69bfdd51a8e8790f47a156e3a7e34f26a29d033889653070981c0105f142a96f00293fc069536bd020ae28a97afb564eab747e60457 WHIRLPOOL 9dbae8a3b0a35a761a8436bc30a4af36ea3492914f726a0334b39efe3e053e430d85723745ad33ca56d82f2884722532d408b809c25ea478b54c27f52fa99276
+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
@@ -20,6 +21,7 @@ EBUILD openmpi-1.8.4-r4.ebuild 5032 BLAKE2B 4139eae8a8c37ddb8f3199c9d2f4603b106e
 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.3.ebuild 5869 BLAKE2B c6830795431c193caff8cd06124699c81b446a1c2214134243e44b895a3c97d65a5f372d6d3404c69c2d5965600488b753437bba49715da79973b008ae275115 SHA512 3806f6cb1b58c7065f8762c3991a2b4cac3d66c86402f7107bb9c683c53415f0091145a69640ddd0209eba8c0eaa1b831a4ae38143643d92d5656e25abc9419d
+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
 MISC metadata.xml 901 BLAKE2B 8cdef4e4438351cb99b59bafb932e4b2b960f08b4eaa9917ac2a5d97fd2423781b1ec27a16005ae6470b8f50509ae3c08c2d06f95e452bd2cf00505b7a79ac35 SHA512 6f30f50d2f2173a01e7ef0d4b808352be98b64945b6af1f05cfaa28024f6efccad28984fe0ad31094f8822c5e251c1270765d5905c7737e1b84302143fe4ac09
diff --git a/sys-cluster/openmpi/openmpi-2.0.3.ebuild b/sys-cluster/openmpi/openmpi-2.0.3.ebuild
deleted file mode 100644
index a711f2778004..000000000000
--- a/sys-cluster/openmpi/openmpi-2.0.3.ebuild
+++ /dev/null
@@ -1,175 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-FORTRAN_NEEDED=fortran
-
-inherit cuda flag-o-matic fortran-2 java-pkg-opt-2 toolchain-funcs versionator multilib-minimal
-
-MY_P=${P/-mpi}
-S=${WORKDIR}/${MY_P}
-
-IUSE_OPENMPI_FABRICS="
-	openmpi_fabrics_ofed
-	openmpi_fabrics_knem
-	openmpi_fabrics_psm"
-
-IUSE_OPENMPI_RM="
-	openmpi_rm_pbs
-	openmpi_rm_slurm"
-
-IUSE_OPENMPI_OFED_FEATURES="
-	openmpi_ofed_features_control-hdr-padding
-	openmpi_ofed_features_connectx-xrc
-	openmpi_ofed_features_udcm
-	openmpi_ofed_features_rdmacm
-	openmpi_ofed_features_dynamic-sl
-	openmpi_ofed_features_failover"
-
-DESCRIPTION="A high-performance message passing library (MPI)"
-HOMEPAGE="http://www.open-mpi.org"
-SRC_URI="http://www.open-mpi.org/software/ompi/v$(get_version_component_range 1-2)/downloads/${MY_P}.tar.bz2"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux"
-IUSE="cma cuda cxx elibc_FreeBSD 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 )
-	openmpi_rm_pbs? ( !openmpi_rm_slurm )
-	openmpi_fabrics_psm? ( openmpi_fabrics_ofed )
-	openmpi_ofed_features_control-hdr-padding? ( openmpi_fabrics_ofed )
-	openmpi_ofed_features_connectx-xrc? ( openmpi_fabrics_ofed )
-	openmpi_ofed_features_udcm? ( openmpi_fabrics_ofed )
-	openmpi_ofed_features_rdmacm? ( openmpi_fabrics_ofed )
-	openmpi_ofed_features_dynamic-sl? ( openmpi_fabrics_ofed )
-	openmpi_ofed_features_failover? ( openmpi_fabrics_ofed )"
-
-# dev-util/nvidia-cuda-toolkit is always multilib
-CDEPEND="
-	!sys-cluster/mpich
-	!sys-cluster/mpich2
-	!sys-cluster/nullmpi
-	!sys-cluster/mpiexec
-	>=dev-libs/libevent-2.0.22[${MULTILIB_USEDEP},threads]
-	dev-libs/libltdl:0[${MULTILIB_USEDEP}]
-	>=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 )
-	openmpi_fabrics_ofed? ( sys-fabric/ofed:* )
-	openmpi_fabrics_knem? ( sys-cluster/knem )
-	openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* )
-	openmpi_rm_pbs? ( sys-cluster/torque )
-	openmpi_rm_slurm? ( sys-cluster/slurm )
-	openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm:* )"
-
-RDEPEND="${CDEPEND}
-	java? ( >=virtual/jre-1.6 )"
-
-DEPEND="${CDEPEND}
-	java? ( >=virtual/jdk-1.6 )"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/mpi.h
-	/usr/include/openmpi/ompi/mpi/java/mpiJava.h
-)
-
-pkg_setup() {
-	fortran-2_pkg_setup
-	java-pkg-opt-2_pkg_setup
-
-	elog
-	elog "OpenMPI has an overwhelming count of configuration options."
-	elog "Don't forget the EXTRA_ECONF environment variable can let you"
-	elog "specify configure options if you find them necessary."
-	elog
-}
-
-src_prepare() {
-	default
-
-	# Necessary for scalibility, see
-	# http://www.open-mpi.org/community/lists/users/2008/09/6514.php
-	if use threads; then
-		echo 'oob_tcp_listen_mode = listen_thread' \
-			>> opal/etc/openmpi-mca-params.conf || die
-	fi
-}
-
-multilib_src_configure() {
-	if use java; then
-		# We must always build with the right -source and -target
-		# flags. Passing flags to javac isn't explicitly supported here
-		# but we can cheat by overriding the configure test for javac.
-		export ac_cv_path_JAVAC="$(java-pkg_get-javac) $(java-pkg_javac-args)"
-	fi
-
-	ECONF_SOURCE=${S} econf \
-		--sysconfdir="${EPREFIX}/etc/${PN}" \
-		--enable-pretty-print-stacktrace \
-		--enable-orterun-prefix-by-default \
-		--with-hwloc="${EPREFIX}/usr" \
-		--with-libltdl="${EPREFIX}/usr" \
-		--with-libevent="${EPREFIX}/usr" \
-		--enable-mpi-fortran=$(usex fortran all no) \
-		$(use_enable cxx mpi-cxx) \
-		$(use_with cma) \
-		$(use_with cuda cuda "${EPREFIX}"/opt/cuda) \
-		$(use_enable romio io-romio) \
-		$(use_enable heterogeneous) \
-		$(use_enable ipv6) \
-		$(multilib_native_use_enable java) \
-		$(multilib_native_use_enable java mpi-java) \
-		$(multilib_native_use_enable mpi-threads mpi-thread-multiple) \
-		$(multilib_native_use_with openmpi_fabrics_ofed verbs "${EPREFIX}"/usr) \
-		$(multilib_native_use_with openmpi_fabrics_knem knem "${EPREFIX}"/usr) \
-		$(multilib_native_use_with openmpi_fabrics_psm psm "${EPREFIX}"/usr) \
-		$(multilib_native_use_enable openmpi_ofed_features_control-hdr-padding openib-control-hdr-padding) \
-		$(multilib_native_use_enable openmpi_ofed_features_connectx-xrc openib-connectx-xrc) \
-		$(multilib_native_use_enable openmpi_ofed_features_rdmacm openib-rdmacm) \
-		$(multilib_native_use_enable openmpi_ofed_features_udcm openib-udcm) \
-		$(multilib_native_use_enable openmpi_ofed_features_dynamic-sl openib-dynamic-sl) \
-		$(multilib_native_use_enable openmpi_ofed_features_failover btl-openib-failover) \
-		$(multilib_native_use_with openmpi_rm_pbs tm) \
-		$(multilib_native_use_with openmpi_rm_slurm slurm)
-}
-
-multilib_src_test() {
-	# Doesn't work with the default src_test as the dry run (-n) fails.
-	emake -j1 check
-}
-
-multilib_src_install() {
-	default
-
-	# fortran header cannot be wrapped (bug #540508), workaround part 1
-	if multilib_is_native_abi && use fortran; then
-		mkdir "${T}"/fortran || die
-		mv "${ED}"usr/include/mpif* "${T}"/fortran || die
-	else
-		# some fortran files get installed unconditionally
-		rm "${ED}"usr/include/mpif* "${ED}"usr/bin/mpif* || die
-	fi
-}
-
-multilib_src_install_all() {
-	# fortran header cannot be wrapped (bug #540508), workaround part 2
-	if use fortran; then
-		mv "${T}"/fortran/mpif* "${ED}"usr/include || die
-	fi
-
-	# Remove la files, no static libs are installed and we have pkg-config
-	find "${ED}" -name '*.la' -delete || die
-
-	if use java; then
-		local mpi_jar="${ED}"usr/$(get_libdir)/mpi.jar
-		java-pkg_dojar "${mpi_jar}"
-		# We don't want to install the jar file twice
-		# so let's clean after ourselves.
-		rm "${mpi_jar}" || die
-	fi
-
-	einstalldocs
-}
diff --git a/sys-cluster/openmpi/openmpi-2.0.4.ebuild b/sys-cluster/openmpi/openmpi-2.0.4.ebuild
new file mode 100644
index 000000000000..e1517dff800c
--- /dev/null
+++ b/sys-cluster/openmpi/openmpi-2.0.4.ebuild
@@ -0,0 +1,175 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+FORTRAN_NEEDED=fortran
+
+inherit cuda flag-o-matic fortran-2 java-pkg-opt-2 toolchain-funcs versionator multilib-minimal
+
+MY_P=${P/-mpi}
+S=${WORKDIR}/${MY_P}
+
+IUSE_OPENMPI_FABRICS="
+	openmpi_fabrics_ofed
+	openmpi_fabrics_knem
+	openmpi_fabrics_psm"
+
+IUSE_OPENMPI_RM="
+	openmpi_rm_pbs
+	openmpi_rm_slurm"
+
+IUSE_OPENMPI_OFED_FEATURES="
+	openmpi_ofed_features_control-hdr-padding
+	openmpi_ofed_features_connectx-xrc
+	openmpi_ofed_features_udcm
+	openmpi_ofed_features_rdmacm
+	openmpi_ofed_features_dynamic-sl
+	openmpi_ofed_features_failover"
+
+DESCRIPTION="A high-performance message passing library (MPI)"
+HOMEPAGE="http://www.open-mpi.org"
+SRC_URI="http://www.open-mpi.org/software/ompi/v$(get_version_component_range 1-2)/downloads/${MY_P}.tar.bz2"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux"
+IUSE="cma cuda cxx elibc_FreeBSD 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 )
+	openmpi_rm_pbs? ( !openmpi_rm_slurm )
+	openmpi_fabrics_psm? ( openmpi_fabrics_ofed )
+	openmpi_ofed_features_control-hdr-padding? ( openmpi_fabrics_ofed )
+	openmpi_ofed_features_connectx-xrc? ( openmpi_fabrics_ofed )
+	openmpi_ofed_features_udcm? ( openmpi_fabrics_ofed )
+	openmpi_ofed_features_rdmacm? ( openmpi_fabrics_ofed )
+	openmpi_ofed_features_dynamic-sl? ( openmpi_fabrics_ofed )
+	openmpi_ofed_features_failover? ( openmpi_fabrics_ofed )"
+
+# dev-util/nvidia-cuda-toolkit is always multilib
+CDEPEND="
+	!sys-cluster/mpich
+	!sys-cluster/mpich2
+	!sys-cluster/nullmpi
+	!sys-cluster/mpiexec
+	>=dev-libs/libevent-2.0.22[${MULTILIB_USEDEP},threads]
+	dev-libs/libltdl:0[${MULTILIB_USEDEP}]
+	<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 )
+	openmpi_fabrics_ofed? ( sys-fabric/ofed:* )
+	openmpi_fabrics_knem? ( sys-cluster/knem )
+	openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* )
+	openmpi_rm_pbs? ( sys-cluster/torque )
+	openmpi_rm_slurm? ( sys-cluster/slurm )
+	openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm:* )"
+
+RDEPEND="${CDEPEND}
+	java? ( >=virtual/jre-1.6 )"
+
+DEPEND="${CDEPEND}
+	java? ( >=virtual/jdk-1.6 )"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/mpi.h
+	/usr/include/openmpi/ompi/mpi/java/mpiJava.h
+)
+
+pkg_setup() {
+	fortran-2_pkg_setup
+	java-pkg-opt-2_pkg_setup
+
+	elog
+	elog "OpenMPI has an overwhelming count of configuration options."
+	elog "Don't forget the EXTRA_ECONF environment variable can let you"
+	elog "specify configure options if you find them necessary."
+	elog
+}
+
+src_prepare() {
+	default
+
+	# Necessary for scalibility, see
+	# http://www.open-mpi.org/community/lists/users/2008/09/6514.php
+	if use threads; then
+		echo 'oob_tcp_listen_mode = listen_thread' \
+			>> opal/etc/openmpi-mca-params.conf || die
+	fi
+}
+
+multilib_src_configure() {
+	if use java; then
+		# We must always build with the right -source and -target
+		# flags. Passing flags to javac isn't explicitly supported here
+		# but we can cheat by overriding the configure test for javac.
+		export ac_cv_path_JAVAC="$(java-pkg_get-javac) $(java-pkg_javac-args)"
+	fi
+
+	ECONF_SOURCE=${S} econf \
+		--sysconfdir="${EPREFIX}/etc/${PN}" \
+		--enable-pretty-print-stacktrace \
+		--enable-orterun-prefix-by-default \
+		--with-hwloc="${EPREFIX}/usr" \
+		--with-libltdl="${EPREFIX}/usr" \
+		--with-libevent="${EPREFIX}/usr" \
+		--enable-mpi-fortran=$(usex fortran all no) \
+		$(use_enable cxx mpi-cxx) \
+		$(use_with cma) \
+		$(use_with cuda cuda "${EPREFIX}"/opt/cuda) \
+		$(use_enable romio io-romio) \
+		$(use_enable heterogeneous) \
+		$(use_enable ipv6) \
+		$(multilib_native_use_enable java) \
+		$(multilib_native_use_enable java mpi-java) \
+		$(multilib_native_use_enable mpi-threads mpi-thread-multiple) \
+		$(multilib_native_use_with openmpi_fabrics_ofed verbs "${EPREFIX}"/usr) \
+		$(multilib_native_use_with openmpi_fabrics_knem knem "${EPREFIX}"/usr) \
+		$(multilib_native_use_with openmpi_fabrics_psm psm "${EPREFIX}"/usr) \
+		$(multilib_native_use_enable openmpi_ofed_features_control-hdr-padding openib-control-hdr-padding) \
+		$(multilib_native_use_enable openmpi_ofed_features_connectx-xrc openib-connectx-xrc) \
+		$(multilib_native_use_enable openmpi_ofed_features_rdmacm openib-rdmacm) \
+		$(multilib_native_use_enable openmpi_ofed_features_udcm openib-udcm) \
+		$(multilib_native_use_enable openmpi_ofed_features_dynamic-sl openib-dynamic-sl) \
+		$(multilib_native_use_enable openmpi_ofed_features_failover btl-openib-failover) \
+		$(multilib_native_use_with openmpi_rm_pbs tm) \
+		$(multilib_native_use_with openmpi_rm_slurm slurm)
+}
+
+multilib_src_test() {
+	# Doesn't work with the default src_test as the dry run (-n) fails.
+	emake -j1 check
+}
+
+multilib_src_install() {
+	default
+
+	# fortran header cannot be wrapped (bug #540508), workaround part 1
+	if multilib_is_native_abi && use fortran; then
+		mkdir "${T}"/fortran || die
+		mv "${ED}"usr/include/mpif* "${T}"/fortran || die
+	else
+		# some fortran files get installed unconditionally
+		rm "${ED}"usr/include/mpif* "${ED}"usr/bin/mpif* || die
+	fi
+}
+
+multilib_src_install_all() {
+	# fortran header cannot be wrapped (bug #540508), workaround part 2
+	if use fortran; then
+		mv "${T}"/fortran/mpif* "${ED}"usr/include || die
+	fi
+
+	# Remove la files, no static libs are installed and we have pkg-config
+	find "${ED}" -name '*.la' -delete || die
+
+	if use java; then
+		local mpi_jar="${ED}"usr/$(get_libdir)/mpi.jar
+		java-pkg_dojar "${mpi_jar}"
+		# We don't want to install the jar file twice
+		# so let's clean after ourselves.
+		rm "${mpi_jar}" || die
+	fi
+
+	einstalldocs
+}
diff --git a/sys-cluster/openmpi/openmpi-3.0.0.ebuild b/sys-cluster/openmpi/openmpi-3.0.0.ebuild
new file mode 100644
index 000000000000..b50c4f2ad163
--- /dev/null
+++ b/sys-cluster/openmpi/openmpi-3.0.0.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+FORTRAN_NEEDED=fortran
+
+inherit cuda flag-o-matic fortran-2 java-pkg-opt-2 toolchain-funcs versionator multilib-minimal
+
+MY_P=${P/-mpi}
+S=${WORKDIR}/${MY_P}
+
+IUSE_OPENMPI_FABRICS="
+	openmpi_fabrics_ofed
+	openmpi_fabrics_knem
+	openmpi_fabrics_psm"
+
+IUSE_OPENMPI_RM="
+	openmpi_rm_pbs
+	openmpi_rm_slurm"
+
+IUSE_OPENMPI_OFED_FEATURES="
+	openmpi_ofed_features_control-hdr-padding
+	openmpi_ofed_features_udcm
+	openmpi_ofed_features_rdmacm
+	openmpi_ofed_features_dynamic-sl"
+
+DESCRIPTION="A high-performance message passing library (MPI)"
+HOMEPAGE="http://www.open-mpi.org"
+SRC_URI="http://www.open-mpi.org/software/ompi/v$(get_version_component_range 1-2)/downloads/${MY_P}.tar.bz2"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux"
+IUSE="cma cuda cxx elibc_FreeBSD fortran heterogeneous ipv6 java numa romio
+	${IUSE_OPENMPI_FABRICS} ${IUSE_OPENMPI_RM} ${IUSE_OPENMPI_OFED_FEATURES}"
+
+REQUIRED_USE="openmpi_rm_slurm? ( !openmpi_rm_pbs )
+	openmpi_rm_pbs? ( !openmpi_rm_slurm )
+	openmpi_fabrics_psm? ( openmpi_fabrics_ofed )
+	openmpi_ofed_features_control-hdr-padding? ( openmpi_fabrics_ofed )
+	openmpi_ofed_features_udcm? ( openmpi_fabrics_ofed )
+	openmpi_ofed_features_rdmacm? ( openmpi_fabrics_ofed )
+	openmpi_ofed_features_dynamic-sl? ( openmpi_fabrics_ofed )"
+
+# dev-util/nvidia-cuda-toolkit is always multilib
+CDEPEND="
+	!sys-cluster/mpich
+	!sys-cluster/mpich2
+	!sys-cluster/nullmpi
+	!sys-cluster/mpiexec
+	>=dev-libs/libevent-2.0.22[${MULTILIB_USEDEP},threads]
+	dev-libs/libltdl:0[${MULTILIB_USEDEP}]
+	>=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 )
+	openmpi_fabrics_ofed? ( sys-fabric/ofed:* )
+	openmpi_fabrics_knem? ( sys-cluster/knem )
+	openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* )
+	openmpi_rm_pbs? ( sys-cluster/torque )
+	openmpi_rm_slurm? ( sys-cluster/slurm )
+	openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm:* )"
+
+RDEPEND="${CDEPEND}
+	java? ( >=virtual/jre-1.6 )"
+
+DEPEND="${CDEPEND}
+	java? ( >=virtual/jdk-1.6 )"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/mpi.h
+	/usr/include/openmpi/ompi/mpi/java/mpiJava.h
+)
+
+pkg_setup() {
+	fortran-2_pkg_setup
+	java-pkg-opt-2_pkg_setup
+
+	elog
+	elog "OpenMPI has an overwhelming count of configuration options."
+	elog "Don't forget the EXTRA_ECONF environment variable can let you"
+	elog "specify configure options if you find them necessary."
+	elog
+}
+
+src_prepare() {
+	default
+
+	# Necessary for scalibility, see
+	# http://www.open-mpi.org/community/lists/users/2008/09/6514.php
+	echo 'oob_tcp_listen_mode = listen_thread' \
+		>> opal/etc/openmpi-mca-params.conf || die
+}
+
+multilib_src_configure() {
+	if use java; then
+		# We must always build with the right -source and -target
+		# flags. Passing flags to javac isn't explicitly supported here
+		# but we can cheat by overriding the configure test for javac.
+		export ac_cv_path_JAVAC="$(java-pkg_get-javac) $(java-pkg_javac-args)"
+	fi
+
+	ECONF_SOURCE=${S} econf \
+		--sysconfdir="${EPREFIX}/etc/${PN}" \
+		--enable-pretty-print-stacktrace \
+		--enable-orterun-prefix-by-default \
+		--with-hwloc="${EPREFIX}/usr" \
+		--with-libltdl="${EPREFIX}/usr" \
+		--with-libevent="${EPREFIX}/usr" \
+		--enable-mpi-fortran=$(usex fortran all no) \
+		$(use_enable cxx mpi-cxx) \
+		$(use_with cma) \
+		$(use_with cuda cuda "${EPREFIX}"/opt/cuda) \
+		$(use_enable romio io-romio) \
+		$(use_enable heterogeneous) \
+		$(use_enable ipv6) \
+		$(multilib_native_use_enable java) \
+		$(multilib_native_use_enable java mpi-java) \
+		$(multilib_native_use_with openmpi_fabrics_ofed verbs "${EPREFIX}"/usr) \
+		$(multilib_native_use_with openmpi_fabrics_knem knem "${EPREFIX}"/usr) \
+		$(multilib_native_use_with openmpi_fabrics_psm psm "${EPREFIX}"/usr) \
+		$(multilib_native_use_enable openmpi_ofed_features_control-hdr-padding openib-control-hdr-padding) \
+		$(multilib_native_use_enable openmpi_ofed_features_rdmacm openib-rdmacm) \
+		$(multilib_native_use_enable openmpi_ofed_features_udcm openib-udcm) \
+		$(multilib_native_use_enable openmpi_ofed_features_dynamic-sl openib-dynamic-sl) \
+		$(multilib_native_use_with openmpi_rm_pbs tm) \
+		$(multilib_native_use_with openmpi_rm_slurm slurm)
+}
+
+multilib_src_test() {
+	# Doesn't work with the default src_test as the dry run (-n) fails.
+	emake -j1 check
+}
+
+multilib_src_install() {
+	default
+
+	# fortran header cannot be wrapped (bug #540508), workaround part 1
+	if multilib_is_native_abi && use fortran; then
+		mkdir "${T}"/fortran || die
+		mv "${ED}"usr/include/mpif* "${T}"/fortran || die
+	else
+		# some fortran files get installed unconditionally
+		rm \
+			"${ED}"usr/include/mpif* \
+			"${ED}"usr/bin/mpif* \
+			"${ED}"usr/bin/oshfort \
+			"${ED}"usr/bin/shmemfort \
+			|| die
+	fi
+}
+
+multilib_src_install_all() {
+	# fortran header cannot be wrapped (bug #540508), workaround part 2
+	if use fortran; then
+		mv "${T}"/fortran/mpif* "${ED}"usr/include || die
+	fi
+
+	# Remove la files, no static libs are installed and we have pkg-config
+	find "${ED}" -name '*.la' -delete || die
+
+	if use java; then
+		local mpi_jar="${ED}"usr/$(get_libdir)/mpi.jar
+		java-pkg_dojar "${mpi_jar}"
+		# We don't want to install the jar file twice
+		# so let's clean after ourselves.
+		rm "${mpi_jar}" || die
+	fi
+
+	einstalldocs
+}
diff --git a/sys-cluster/pacemaker/Manifest b/sys-cluster/pacemaker/Manifest
index 156e49b23d9f..a78b065ab7b3 100644
--- a/sys-cluster/pacemaker/Manifest
+++ b/sys-cluster/pacemaker/Manifest
@@ -10,4 +10,4 @@ DIST Pacemaker-1.1.16.tar.gz 4897772 SHA256 dffcae035975669a66ab545d45216a637496
 EBUILD pacemaker-1.1.12-r2.ebuild 2357 BLAKE2B a4423891a7a40e11578db80f717e77d7f7757f3037657f8747ffa91ad6dc91be59c3727f7e08cb7e6f26164be1b6bfc20816127527a8db151f0cb67828bad261 SHA512 2d1eceed9491e95b2e87b37056ea8b63c1a0fc491ed88a91d4e80a0c79144714392887547f5491ec2c43c9eed272a217fc847097bd5e4dbc6517f8d5b34924f4
 EBUILD pacemaker-1.1.14.ebuild 2197 BLAKE2B 4f9f4f33b4718460a75561b73cf6c85290ae3dcb4fbb65fc2c7c5191aee95ac1f07429518b6dabcace1deeb41a415c42df0c0593bac650fb193e2ae1dfa9b20e SHA512 e39e2084d9a409df027cf3fa9f506e8b5076ac93c6217219d29e19d1b69585ce42094e4873ed8249366abb1b330dd13565a1b0363f5993946fa197ca908ff13c
 EBUILD pacemaker-1.1.16.ebuild 1800 BLAKE2B ecde13f0404966b2839eb47848a37760cfaad76878f6859967484c4e42e49527f7f1861538004aa2d7b651247671996cd0b61732421cc881434bf3d4a4550cab SHA512 549a2dc99b5d0df356c55bbd873cf96f3643e7b64984b3fa4687f0cafd5345cd57ce69ae5932a78687bbfa9b4bb861e032d311c0a5461397752dc78eb21e71bb
-MISC metadata.xml 983 BLAKE2B c5f369e1676ccfc99404948903b39fd47e6a84a52c561dfe689ed50cfeb34781dff730cedc23206c9a6b3a40c1d631ff7392e98ddbe02eebbba45052b16fee98 SHA512 0e0f2363d68a4bfb4918b0ca59eca6377c30f6a56a80eb9b12f14a13f59b2a52c3a74ae2152b9866a82b451c75bf14e6040d650733373237c3e9fcc68b38f157
+MISC metadata.xml 960 BLAKE2B a5d656c25a4a0663c4c9e9d01d69e5a84232d724f54ee895aa38a8d53e61f460b890df34d787536770ee64130799dc447dfb8dd2b32b984c933c71b38396c08a SHA512 1bec04a003d61dfcaffad2fa9ca2bcbf5504f35103c544749a9af251a32fe52c0b92cf4e0099eeffef63535b55d4393616093c13e7bee7e02170f57eca98e563
diff --git a/sys-cluster/pacemaker/metadata.xml b/sys-cluster/pacemaker/metadata.xml
index c486adbd93a7..0d3bda39fd28 100644
--- a/sys-cluster/pacemaker/metadata.xml
+++ b/sys-cluster/pacemaker/metadata.xml
@@ -1,21 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>cluster@gentoo.org</email>
-    <name>Gentoo Cluster Project</name>
-  </maintainer>
-  <longdescription>Pacemaker is a cluster resource manager.
-	  It achieves maximum availability for your cluster services (aka. resources) by detecting and 
-	  recovering from node and resource-level failures by making use of the messaging and membership 
-	  capabilities provided by your preferred cluster infrastructure (either OpenAIS or Heartbeat).
-   </longdescription>
-  <use>
-    <flag name="cman">Enable <pkg>sys-cluster/cman</pkg> support.</flag>
-    <flag name="heartbeat">Enable <pkg>sys-cluster/heartbeat</pkg> support.</flag>
-    <flag name="smtp">Enable SMTP support via <pkg>net-libs/libesmtp</pkg></flag>
-  </use>
-  <upstream>
-    <remote-id type="github">ClusterLabs/pacemaker</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>cluster@gentoo.org</email>
+		<name>Gentoo Cluster Project</name>
+	</maintainer>
+	<longdescription>
+		Pacemaker is a cluster resource manager.
+		It achieves maximum availability for your cluster services (aka. resources) by detecting and
+		recovering from node and resource-level failures by making use of the messaging and membership
+		capabilities provided by your preferred cluster infrastructure (either OpenAIS or Heartbeat).
+	</longdescription>
+	<use>
+		<flag name="cman">Enable <pkg>sys-cluster/cman</pkg> support.</flag>
+		<flag name="heartbeat">Enable <pkg>sys-cluster/heartbeat</pkg> support.</flag>
+		<flag name="smtp">Enable SMTP support via <pkg>net-libs/libesmtp</pkg></flag>
+	</use>
+	<upstream>
+		<remote-id type="github">ClusterLabs/pacemaker</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-cluster/slurm/Manifest b/sys-cluster/slurm/Manifest
index 19ecce9e0f1a..70186eb8c337 100644
--- a/sys-cluster/slurm/Manifest
+++ b/sys-cluster/slurm/Manifest
@@ -8,6 +8,6 @@ AUX slurmd.initd 1993 BLAKE2B 820153a8df6a5f1ce0d7db44d6c38170cc6ec7920f8d64743c
 AUX slurmdbd.initd 1709 BLAKE2B 12aa8ecb83991a4af8dbbd124d46d84c2c8b3c60756a42f9cb87df84dafb572553348e00eb720699a5d58020ca3fdf28a3357eb2903341a9d635ca4b399f5f8a SHA512 323852ab3ae1cbec55c51e54f7f7acc2e60a694e46a91454638b7f167f5dc0c1ecdba8bdb82641aee9ad303558c445d7551e774a6b470da279173b5c44123911
 DIST slurm-16.05.11.tar.bz2 6100281 SHA256 c797390a7de40b8b5bead77a92661de5f158c646e9abe6a93457f311e0aec330 SHA512 6922f6987a586288ea8229b4603b42c705ea159af4ceb3763790ba5cc2fb8dabf7747d7a27a886d50eeb3a7ed743c26b86354b9d05802c46ecd86b215ace85ba WHIRLPOOL 35b6dba438519f82a431bb4ac312afb8e65fe27eb3c72714ef204ee974ab4e7e3259ac1c763e4430f5fce18b4e737198cfe9c47b45de2d6fd7a29db72e020d2f
 DIST slurm-17.02.9.tar.bz2 6053443 SHA256 faf4704505dfc5b6fa199f099d36dbc3d23faf149251f36672631dbbbe3b1b71 SHA512 9a0b502a16b1fe61fd42ef92cb9cdc0eaa5abb4e9a3b0b6d87337ca0597223c4e132632f22b13a4a5109c03a3f422dd49df6421b637c446973e6d521fb23075c WHIRLPOOL d3320da3e2ec6e14e58ac759ab0e7f7741068f15c6c6569e36b622250d1617d68a6f17e4a91243994ae2d3ac69161268b1becf4bd31677f618fc93c1423e51fc
-EBUILD slurm-16.05.11.ebuild 7609 BLAKE2B bc0130d18f4f39cd68bdbaba1000fa005caaa4d790642145e52fe07dd2eb0acaaa2d0b6060023f225bbd665473b53d3d5e998dd22abde255f5955931f06b196e SHA512 e0222dcccc3a503d17c169a45fc1fb84e366c549090310bfbd9b3c8f97ef9b3f8bb2c7e11980fb4f88f23fa1af342994064e4f773a71f7b63d365219053e201a
-EBUILD slurm-17.02.9.ebuild 7030 BLAKE2B 1222d24b350ffc76db6f84c52168af13c0717ad1a08e37100d7d4f49ca2ba560c55b86fcbc461f072fdf51a0df3e7696bf60bdac0153264b01e33e2ec6be16fa SHA512 b12d7b1fa45d99880d70ea7066abaafb8fe5dd97b6c79f017810ffe1743698728b2be931bef605ca3b100b945d6ad61ddd3c1aad5ec43d808dde06dffea156f0
+EBUILD slurm-16.05.11.ebuild 7621 BLAKE2B 3bc53a9700d4f26b26819f007c21e269dfd4cf35d1d428367b0d75dcd273b2547844b311c30a134c928bb9895d57c38adbddec6460e63047e154953f8795e43b SHA512 0c389ecab3d99963e1d957d852da051d168864c7a39cddec1c6509dbbd6eb56dfedeecad2fb69b411f71834559c8a6cf7c1fb1d21bb9dcdb982bcf0fc6699c60
+EBUILD slurm-17.02.9.ebuild 7042 BLAKE2B 0b91317ab3a1042954baf44df9910dc77df326969984f7214e033e04ddd69b4654b74409f333b7907edfd5adef14a001816fdae1a51a2eadb08d073f3acaec14 SHA512 2591578099b94b137d7ec71fe2da59cb6bccce1210b0f7617ccb7972e4136a3ce9752c8c1f4071b8493870f3180a634d674a62e93f1d2255a2cc7d62b19c19dd
 MISC metadata.xml 563 BLAKE2B 26101a6dbee3ad181afe3c7b072a747c1640ca8d78ab3c16380eb3a636937c3f6b9b8469dfcb3bfb369e3f4ca8ee609f3666668976b36d6ce77657b14227a2d4 SHA512 31d52fcdcd9526f8dc9ac00d173986943303b74ff6c554f6be30f2c059a0e1cc54330871ec132c451ab6f23ac062b3a9161293c13f3fffa13343f964d6cb959b
diff --git a/sys-cluster/slurm/slurm-16.05.11.ebuild b/sys-cluster/slurm/slurm-16.05.11.ebuild
index 3438722b95d5..6f935a075773 100644
--- a/sys-cluster/slurm/slurm-16.05.11.ebuild
+++ b/sys-cluster/slurm/slurm-16.05.11.ebuild
@@ -22,7 +22,7 @@ else
 	S="${WORKDIR}/${MY_P}"
 fi
 
-inherit autotools eutils pam perl-module user ${INHERIT_GIT}
+inherit autotools eutils pam perl-module prefix user ${INHERIT_GIT}
 
 DESCRIPTION="SLURM: A Highly Scalable Resource Manager"
 HOMEPAGE="https://www.schedmd.com"
@@ -50,7 +50,7 @@ REQUIRED_USE="torque? ( perl )"
 LIBSLURM_PERL_S="${WORKDIR}/${P}/contribs/perlapi/libslurm/perl"
 LIBSLURMDB_PERL_S="${WORKDIR}/${P}/contribs/perlapi/libslurmdb/perl"
 
-RESTRICT="primaryuri"
+RESTRICT="primaryuri test"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-disable-sview.patch
diff --git a/sys-cluster/slurm/slurm-17.02.9.ebuild b/sys-cluster/slurm/slurm-17.02.9.ebuild
index 3f6085571b02..f4c3c841d3f7 100644
--- a/sys-cluster/slurm/slurm-17.02.9.ebuild
+++ b/sys-cluster/slurm/slurm-17.02.9.ebuild
@@ -22,7 +22,7 @@ else
 	S="${WORKDIR}/${MY_P}"
 fi
 
-inherit autotools eutils pam perl-module user ${INHERIT_GIT}
+inherit autotools eutils pam perl-module prefix user ${INHERIT_GIT}
 
 DESCRIPTION="A Highly Scalable Resource Manager"
 HOMEPAGE="https://www.schedmd.com"
@@ -50,7 +50,7 @@ REQUIRED_USE="torque? ( perl )"
 LIBSLURM_PERL_S="${WORKDIR}/${P}/contribs/perlapi/libslurm/perl"
 LIBSLURMDB_PERL_S="${WORKDIR}/${P}/contribs/perlapi/libslurmdb/perl"
 
-RESTRICT="primaryuri"
+RESTRICT="primaryuri test"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-disable-sview.patch
-- 
cgit v1.2.3