gentoo resync : 31.10.2017

6 files changed, 277 insertions, 1 deletions

diff --git a/sys-cluster/heat/Manifest b/sys-cluster/heat/Manifest
index 4a3fe1f42ccc..a625e14d5deb 100644
--- a/sys-cluster/heat/Manifest
+++ b/sys-cluster/heat/Manifest
@@ -3,15 +3,18 @@ AUX heat.initd-2 463 SHA256 2c7f4e524c7b8022aa5a68406655bdb3a47b9d6bd6a44329d971
 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
 EBUILD heat-2017.1.9999.ebuild 5666 SHA256 6a00fb00d27ca007fde4f73f112019af92cb6a5d79d578ff19a1cb05f7d1f368 SHA512 3b99e7e4b8fa48d17e72b2e404c818da31ba668f63d76f4404ff42a6862f0918e4b9ac91fdc95977dda98c931ebd893cadba35553dcb437f563b75905b6ce058 WHIRLPOOL 86a5eaf23be27bd19123ea137b1d3f78fe7b055c1855527677d619d45dd48ae9189d8a740927250f0eed193653c7cc3448b8a06da3c91d4935383506b21c53b9
 EBUILD heat-2017.2.9999.ebuild 6456 SHA256 2fe1669fee37a96e85605a9a968d9f3dbd1a8b2575af46b6c6d57584e4efd4aa SHA512 5f57c8610494a03382c9f2e60716eb221b26e39f56354637960bfc2166437e0d217297911460c8d34a60b5f2dc00e2aa00d10f8b17d0d025c7d5341510e53a7f WHIRLPOOL de4d89ebd301252ca63cb967abee76d6cb6d4ddacfc21e9ff8e81cbf1d5044f1ed4dd11ad8c6416959f285be8c7d7f5cc5fc1f0a2906401b814b9b5f4fddbd44
 EBUILD heat-8.0.4.ebuild 5644 SHA256 7f86f98db8c106c035b62da96aa43ee9ab19af49bb36d4f002999d8a16eb90f6 SHA512 7cf53cd26567282869ce2aaf1b045cd30c16af63fe484fd238cae512ce8c8a04018d76d5fd7cb828a690d9d24526cdc5b259e7b3b0a4e786b090c41b290269cb WHIRLPOOL 9b9fc8adda07a3d08b84600ba51afd7599110463564584d2e0fef574113ba1db50c10c0acf638c90773242441ec1e244defc0cb98abbf33fc0a8b8eceb66da5c
 EBUILD heat-8.0.5.ebuild 5646 SHA256 652794a279ca5b8e60fd736cbec75be4c12e18943d1f87b1489854ee5de51064 SHA512 de3bdebe67dc127a7684cdf688b3625652d9c67ea0eaca1a301ebe67a43cda16c9289faa717b8aa8d737bb7580122efbf17d124b5496903b9caeac8f6f623bd5 WHIRLPOOL da9e18015d8e8ed7dcfd230840807e9405e973f90618138006ab113f4c529ae62c017673e5e2fcf9f265b39a1f146aa37532be7ca87bd05d2f7fa743af78a698
 EBUILD heat-9.0.0.ebuild 6435 SHA256 6af699b66af71f9cd386b2784ff5d2f53326dbefa0769680cad695837900b4de SHA512 2d4de5bd02b861ef4e6b306314629bd06c2c883b56e5493e8efda75cf7a62fc5a600002c401115ac34c019325fb858ddc059ae307cf2e7751dfdbd0b4c9d22eb WHIRLPOOL 28f9bce391a7f3d7cfb8ea3ffb86fcace088f8bae779b660a2c1d117514d0e65dfd2081b9377f42500c55809a55ad4638e5edcded737e80aacb8064e690dbdf5
+EBUILD heat-9.0.1.ebuild 6376 SHA256 045df2e2a14a0a9252eba7caa007fb00948b8a8285869f546623dfedc191f8a8 SHA512 94501769b5d8300e052126f1a818d236d76dbf9be9819c9b329f1fcb9b3d30c3814e93230a0fb0022434d050fd5ee45aa8c1f7afa5db959ea654e2990f172816 WHIRLPOOL bba3763f669f4811010649870afd2ac92df4468fdc415101313a845ada27fdeade64c192f98a61b687b4fe912a56b6a6e23d2dd7eaaba60528bf177772e704ff
 MISC ChangeLog 1787 SHA256 3deab106bdcbb6a3b66d3c6a12797c9d36e1e77d24534669bf06759f5119981e SHA512 7d7b6abdfafe22c664c324317e6e9caa39f25d9ab8f49325534e414ec776ec7611538df92ac7b1dff370cc31c27f7b04a0c9346edc257bb46a48de9f858acc0a WHIRLPOOL a05b856678fccde635231f43c3275dee8b1f92aad8ff12988b2a03a087d61ac598f70d94e22efa9dc3630c99cd446ae5d84579db48f15043bbe00437d0ab8eef
 MISC metadata.xml 631 SHA256 d276373e28e559d61fd96704214c329d6e264841cde3147f0600e52ef877c5e6 SHA512 44e741975cc462454bfd08fce461b019c5ef141997f272796052f7f3aa7297646304cdc7d75a2ed01319bcba753475ba5861306c3ac74f3d97218bce60d42429 WHIRLPOOL cb83fb56d6316389e63043623c025abfc09352d6ade6a0aee9d442f8bf4603f09167b99aba5593ae4fa55be369b3c7ae442dc7ac5ed680c2d4a666a8c92baaef
diff --git a/sys-cluster/heat/heat-9.0.1.ebuild b/sys-cluster/heat/heat-9.0.1.ebuild
new file mode 100644
index 000000000000..82f683093c85
--- /dev/null
+++ b/sys-cluster/heat/heat-9.0.1.ebuild
@@ -0,0 +1,161 @@
+# 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.11.0[${PYTHON_USEDEP}]
+	>=dev-python/python-saharaclient-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/python-senlinclient-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/python-swiftclient-3.2.0[${PYTHON_USEDEP}]
+	>=dev-python/python-troveclient-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/python-zaqarclient-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/python-zunclient-0.2.0[${PYTHON_USEDEP}]
+	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.10.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	>=dev-python/tenacity-3.2.1[${PYTHON_USEDEP}]
+	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	sqlite? (
+		>=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[sqlite,${PYTHON_USEDEP}]
+	)
+	mysql? (
+		>=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
+		!~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
+	)
+	postgres? (
+		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
+	)
+	>=dev-python/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
+	>=dev-python/yaql-1.1.0[${PYTHON_USEDEP}]"
+
+PATCHES=(
+)
+
+pkg_setup() {
+	enewgroup heat
+	enewuser heat -1 -1 /var/lib/heat heat
+}
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	diropts -m0750 -o heat -g heat
+	keepdir /etc/heat
+	dodir /etc/heat/environment.d
+	dodir /etc/heat/templates
+
+	for svc in api api-cfn engine; do
+		newinitd "${FILESDIR}/heat.initd-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/singularity/Manifest b/sys-cluster/singularity/Manifest
index 8e3f35a19dc4..9f23444f084d 100644
--- a/sys-cluster/singularity/Manifest
+++ b/sys-cluster/singularity/Manifest
@@ -3,6 +3,6 @@ AUX singularity-2.3.1-slurm.patch 1597 SHA256 85e1995332f2589859de6cc590c06a04c0
 DIST singularity-2.3.1.tar.gz 643021 SHA256 dcccae9ff67a550d142c94e932c0fb59442dd59ae69ce1deeb7ba45829ef2cd7 SHA512 36c581e8dba57d133013c2fcfea26886b54a1a9a9165b011d2cebacb2a6249fe0f8e5aa91ed90f7a18855c658300682436c431a226629408f31422cc8a036600 WHIRLPOOL d9bb8604ce2afb6bb2b5b257eb88276a93987916cd4c08ecc800d98761f5d1ae54e48ed615d77b1c992bcc8bb6202e9bf5e04637d10d1126fba6d1c2619cb98c
 DIST singularity-2.4.tar.gz 689760 SHA256 34ca94250f15354819587364b21b0fdf7eebcff05110f8443caae8ed6961d7da SHA512 b445e73d9794f344ab72ce17d8f802390d0c0c153791b837f416254eadabf19365f1abd29f0b498be5486b600f32cd7fe53e5dc131eee3465ab890c9d6b171f4 WHIRLPOOL 5434f8da66b3863a0c45d17dbe716231b4f04587907ecd608f92d5becb2e34ae599cfebce2a6768a0745fc00ca70297ba7ca9e7370e7080139c8e3eca2b5428d
 EBUILD singularity-2.3.1.ebuild 952 SHA256 b45c03e3a2ca5de21b14144967c2da9727f477709332a9c32bc357c3de9dc815 SHA512 60ed34f1ab7543ae5f728b51595640dc671ebb514028dce2fb82c72f1d192ca896c761fe38b4c786641f1df678adfd45d855eac262b68ee00c2b1048072e6d2c WHIRLPOOL 07f332ecdc9de4af06a10941cec0db76c20b04695e6ecde0f11cbd02edaeffa134ff7188e595e8dab5f44849fad32403c246bc355f23ec1c645c0e6c9ad12bc4
-EBUILD singularity-2.4.ebuild 821 SHA256 449738c88c8cbd8e08708b7b5151e6be1ff67c2ff8b375296d6c2122994ba2cb SHA512 48bab7aae5fadefb6e5b1c4521b19d93360e2a7103cd865e71109b1be71084693705ac6c34e8430e135e127f69bf2c842007cc722d6a73d9ac7f4e6a9cc1b6f7 WHIRLPOOL 892a6bfae256d9b114c6ed209aba376ea7771309fd122083fa3721718c850e9d5f6faae6b86fcd7a161e23e07073fad60b6daeb82da38fd308d0a4ffa589d4b1
+EBUILD singularity-2.4.ebuild 859 SHA256 3d4fb2a75bfa5b72ef0599774b4555757f8e786064f78022e365d76480869f32 SHA512 e031db7fa7673b631096714279b4bcb8372386984b5606aa7c6811c240e4fb47c8860e4bf5e4bd2c66295c0004489f95b74135f66ce056567f179b5f34b11606 WHIRLPOOL 3707ee01317d6c3bd884e4be7a6f1ffaf4ce09e2355583a23e4a4e34612c812c29c123ec92cb235330ba93ac1b63d1d2eecd1157a60a714910d134e63bdcc7cd
 MISC ChangeLog 771 SHA256 37adb96a35be0b0dcb6bc1c64e47203bc7836c7d6cb944ca69db79007b0bd446 SHA512 1e6fb03f5d3c4329a3c22c8274610ee940406c8bfcdf0e0ec9b3c3caed4b51f2ff1e34079c76e27940eab7470c8c1447bf02fa5d3f9ff985006ec65f0be76536 WHIRLPOOL dcbfd8b7040b56025c5567b78237aeb14bda64684dc6995a9cef05c6da392d5c6fb5f56bdee89c720dec3c0f67e3b745105f0fc3ca1e0e55477725ce1df28627
 MISC metadata.xml 440 SHA256 f01b881c69a798ee1e24df0d25e7deef12e41a1bbad55dc9440e9f8c733fcc91 SHA512 d8363de6994afc68b776ee6330a56b6a5e6d3156f440633c01160a9e9967654e4a564e235fc126be9400f436ec099fb05bd7754739cf8221666913b244d3b559 WHIRLPOOL 012b025cbbb9a777ba198613d872d47cbc82336424d1eef7b15fdbb0f479b5f5d1617cfe734aad27d6b1c73a366f268355283d6e82f3f36d2fb2977bd79da5b8
diff --git a/sys-cluster/singularity/singularity-2.4.ebuild b/sys-cluster/singularity/singularity-2.4.ebuild
index 904c3ca6693e..b897f939dd0f 100644
--- a/sys-cluster/singularity/singularity-2.4.ebuild
+++ b/sys-cluster/singularity/singularity-2.4.ebuild
@@ -16,6 +16,10 @@ LICENSE="cctbx-2.0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="examples static-libs +suid"
 
+RDEPEND="
+	sys-fs/squashfs-tools:0
+"
+
 src_prepare() {
 	default
 	# automake version hardcoding
diff --git a/sys-cluster/util-vserver/Manifest b/sys-cluster/util-vserver/Manifest
index c5ddec8f02df..5652f5261e83 100644
--- a/sys-cluster/util-vserver/Manifest
+++ b/sys-cluster/util-vserver/Manifest
@@ -1,5 +1,6 @@
 AUX bash_completion 7568 SHA256 2232166a5aed9857a7a5c30adfdd4ea944e0608a29fad05f229b8cef2d61795d SHA512 b9e5745775121107da14540103bbf4943692a514cf3cd69b71c999a5e0eb1c81253b6ac4ca635cdb6e64cd1f1c1204dfecd4a6f83cbe7d5448625c53f80ed3bb WHIRLPOOL a17cc603408cf178c0d8299e6f36133715f6ec6c5a21c7440dca49338dde2280d24bb26852a21326ab2b62ac787ed84d06d0baf3097c0188f2448fbf055e79ab
 DIST util-vserver-0.30.216-pre3120.tar.gz 990833 SHA256 00df201b3f103a9f5663734b5931abe2e575ff1dabeb7c8035c1ba21c7f4b6d2 SHA512 eca7680a8b06fecd678b4dad5824c92b53d872b3e7ec9cc275425437fb7fcfb3991f58770096f20d8274e37927a39b64ed9db082ef806e76d0c603b2cd64ef32 WHIRLPOOL 4f2191a339786d2d911a3bf31051972c993f95621824d7dfc11d30755070bfab3da2eb4d85ac80139e022c44aaf2313fe0042991a91ae828b12217cadfd6a331
+EBUILD util-vserver-0.30.216_pre3120-r1.ebuild 2587 SHA256 ac5b2cfea43b05492a2ef64a1f55de5e915730191903b4b93c1aa9d07efa3392 SHA512 50ca8ce43ebd0b107f5b164c16b8cdb4aba3fdc445ef33f3f5a2d20f7bb2a8aa7d58e688e7fac8950377c77e28ea3cb16cdb3a695402129863dcc707b8839e66 WHIRLPOOL 57158ccd3e125deb8ed68b3a534c204eaa7ddd4d0c07fc9e414fb02a75a1daaf740f02ea4a24b72af1b93b7c866220a69673d13f001441f263f763a9299dd55f
 EBUILD util-vserver-0.30.216_pre3120.ebuild 2636 SHA256 c7bc346985fe12ba62c38ce1f943cb8cbacc2f6dcfb1c5d0f5c2d51cc972bfd5 SHA512 7a2be4456a29ee7abb0b0b612624c5e642f50789cf430edea9146e412e6b14324de90c2cc52c44a0313b9365017876910f545e9db8cb87647b3328684d04ff0e WHIRLPOOL 283291d3fba9436f0e295ac4f89b17c48d09187294ac11101baae0261efbc30edfec84d22791553377d17dc1999809338a65ca0f871d05063bcd959b5b265aed
 MISC ChangeLog 4101 SHA256 8dfd2b9b8d315e05fd9fbd212fed5b288d0707a25e89f732f5b196f37e145abe SHA512 74f863d4dde2c5b6bc7b3780a31d968d120b0e0aa9ea40da4cacd6fd6160f0c0ade506738392c3f6d78e47ebb25f27ea2cf4f8073560064454d06903cd5e3d53 WHIRLPOOL 289a430351b6ce292b9a2980cc8e72e8953c21897a44f31c9ed9741305e99d501e2f5aacc161c1cb554043e7805dbb6f9c949348c4b70bf812753f7c29c0a9d8
 MISC ChangeLog-2015 24548 SHA256 93b43b7f26553db1247ac1f183304e27436a238f858bce9e79117f76299c130a SHA512 d238343c79442c0a909e7256af1e19e00bdfae43b85feae3426e5fc2792963604ac3eaed155ccc9ddc22259075cbb7a97157a99370a931467642749d8e1c3d57 WHIRLPOOL 12befea47c8f7ab9478de392728fc57c6720d3eee55a0aad7ff6ba4e45277bf842a7bb48e584bf739d5106ec4533e85ff89149cfca92a939cadf20e1142f61ae
diff --git a/sys-cluster/util-vserver/util-vserver-0.30.216_pre3120-r1.ebuild b/sys-cluster/util-vserver/util-vserver-0.30.216_pre3120-r1.ebuild
new file mode 100644
index 000000000000..8a12d097f1f5
--- /dev/null
+++ b/sys-cluster/util-vserver/util-vserver-0.30.216_pre3120-r1.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils bash-completion-r1
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="Linux-VServer admin utilities"
+HOMEPAGE="http://www.nongnu.org/util-vserver/"
+SRC_URI="http://people.linux-vserver.org/~dhozac/t/uv-testing/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~sparc ~x86"
+
+CDEPEND="
+	net-misc/vconfig
+	dev-libs/beecrypt
+	sys-apps/iproute2
+	net-firewall/iptables"
+
+DEPEND="
+	${CDEPEND}
+	>dev-libs/dietlibc-0.33"
+
+RDEPEND="
+	${CDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	if [[ -z "${VDIRBASE}" ]]; then
+		einfo
+		einfo "You can change the default vserver base directory (/vservers)"
+		einfo "by setting the VDIRBASE environment variable."
+	fi
+
+	: ${VDIRBASE:=/vservers}
+
+	einfo
+	einfo "Using \"${VDIRBASE}\" as vserver base directory"
+	einfo
+}
+
+src_test() {
+	# do not use $D from portage by accident (#297982)
+	sed -i -e 's/^\$D //' "${S}"/src/testsuite/vunify-test.sh || die
+
+	default
+}
+
+src_configure() {
+	local myeconf=(
+		--with-vrootdir="${VDIRBASE}"
+		--with-initscripts=gentoo
+		--localstatedir=/var
+	)
+
+	econf "${myeconf[@]}"
+}
+
+src_compile() {
+	emake -j1
+}
+
+src_install() {
+	make DESTDIR="${D}" install install-distribution || die
+
+	# keep dirs
+	keepdir /var/cache/vservers
+	keepdir "${VDIRBASE}"
+	keepdir "${VDIRBASE}"/.pkg
+
+	# bash-completion
+	newbashcomp "${FILESDIR}"/bash_completion ${PN}
+
+	dodoc README ChangeLog NEWS AUTHORS THANKS util-vserver.spec
+}
+
+pkg_postinst() {
+	# Create VDIRBASE in postinst, so it is (a) not unmerged and (b) also
+	# present when merging.
+	mkdir -p "${VDIRBASE}" || die
+	if ! setattr --barrier "${VDIRBASE}"; then
+		ewarn "Filesystem on ${VDIRBASE} does not support chroot barriers."
+		ewarn "Chroot barrier is additional security measure that is used"
+		ewarn "when two vservers or the host system share the same filesystem."
+		ewarn "If you intend to use separate filesystem for every vserver"
+		ewarn "you can safely ignore this warning."
+		ewarn "To manually apply a barrier use: setattr --barrier ${VDIRBASE}"
+		ewarn "For details see: http://linux-vserver.org/Secure_chroot_Barrier"
+	fi
+
+	rm /etc/vservers/.defaults/vdirbase || die
+	ln -sf "${VDIRBASE}" /etc/vservers/.defaults/vdirbase || die
+
+	elog
+	elog "You have to run the vprocunhide command after every reboot"
+	elog "in order to setup /proc permissions correctly for vserver"
+	elog "use. An init script has been installed by this package."
+	elog "To use it you should add it to a runlevel:"
+	elog
+	elog " rc-update add vprocunhide default"
+	elog
+}