gentoo resync : 12.10.2017

4 files changed, 439 insertions, 7 deletions

diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest
index 6d8f0b4c5ae8..32d96cedba80 100644
--- a/app-admin/salt/Manifest
+++ b/app-admin/salt/Manifest
@@ -31,16 +31,15 @@ AUX syndic-confd-1 188 SHA256 286148f5391d42c04a62a13cc125fa2130b5821e50da913c5a
 AUX syndic-initd-4 311 SHA256 86c1af171c7b13018f089fab6d045feabd72455f9453720ef36ae2011b9cb976 SHA512 69cc10fa7d9f0f4a68d223272c08ee33af242a50eb9bbea919d61f6cb5baf1ce986b07d69fc0e47e2f6dffc0a11100c3bc0d836d2938c46aa364beecb47f07ef WHIRLPOOL 0bc115ba99507a673c387ecacce4906d42ab93bd3c29016a1fac9621f61473c1b75f6236f69d449f3e393d2c05436b3a9185840ff20ad2d006e4397280c6843c
 DIST salt-2015.5.10.tar.gz 5693422 SHA256 863a96e70f8521af35fe11b10d25b3205a0bfbba9a8aee02e2842aa7106496fd SHA512 78a4cbe5c771208e957360689a25ae4e44566987e07e7fda54e6db9028485eacc6ad016c65c981090f9b5d95331e46048a094aecc27703b3956c06ab6ebad95d WHIRLPOOL 805b48df07707d85d8338251f26c72164a5421731fc11f5c933b72af97348a2f11ee35889f72ec032acbea275e98575d35786b56fd84a7917f8fdbc30567ae86
 DIST salt-2015.8.13.tar.gz 7036243 SHA256 cca82c9a4f267692660b098c1f76e54ab6a24131391893719bde0eb3a1ed2959 SHA512 ec8626f7360542bfeea90fc3d6fd9d9d015da4c2a6adf9957c22501ed9531b0a44d2cbc4853c41856b4cd46c142d2441884ec99700f3c0a5310cc428f9f1ec2a WHIRLPOOL c21f3bdc5fd674ea664c7e8fd58ef6685328a6ee3679850f3e9a085b1e604e1224a3323b906b47075fb8dd39f373583fb549e7b0f3f725d44928bcf716955a10
-DIST salt-2016.11.7.tar.gz 9409315 SHA256 279fa5bd73b5616620f628234575140f91df28b0d40d931569f179efabf27a2d SHA512 5bb52d75fafd57cd8efebe9b94dc3b53e39b476f6289e3509f1324fc86bb57a85d0ac832270c80629c04f301a749e018789c842e90cc3f2167445854e0f0ed99 WHIRLPOOL 984f297a23d59a129feaac40debc4aecaf64b2540cf62cae503c01cbe7413fdbeb58d18ed86b33b4da6f84a167bb7fed0fd502fca737720242dad91f7afad581
-DIST salt-2016.3.7.tar.gz 8516192 SHA256 3dd65ec44ca372c91b8254b625414cd7e795fdba274a07de902c3f33e199007b SHA512 78f3e23f7f05c8940bdb0359bc323cdb94c027d8abe554cffff8504d7e978f64f25d7b1f48450aed506e58ed8cbf9c272d95741dd330617809c663451f70b8d1 WHIRLPOOL 69e72d8a15310b5c1578de8c43d4a2f71cf1bdf3ae827a6283720f17a74972fd3d3fe84a95f045df77fdde82614ac6a30f549176fc44062569f40e8969e7f6fe
-DIST salt-2017.7.1.tar.gz 11408839 SHA256 fe868415d0e1162157186f4c5263e9af902b0571870ad2da210e7edf5ff5331d SHA512 c12db2361e04ce7bf4d663fafdeebdb318f210e0669d1ae26db6daf3dd19a7549b4151cb4e53acacda24d11eec7bbd06190b01cf4962d9027783ffd4617a2e52 WHIRLPOOL 6073ec85a4797ac6cc58f475f7f3bd5fa0d61b4d1228c514326d32644e2f6d1656e46196d1ad32d5c87d2bfa18eff5e786b9a1325d5e73387c33a591d8dd61d2
+DIST salt-2016.11.8.tar.gz 10142142 SHA256 e75f4178465d9198fcd5822643460c94d63de6221316367d5b85356ef8b1994a SHA512 0adc544ca460d13d2adb11b04575bd079a3dad1be3468bea7d32d0b74416b78546e4c86c75551bba09786be8e9810a6e30232414c4f5851cbc9a0fb4b894e0de WHIRLPOOL aa2ba8a4afbdd412e133364b4b034b7a34cb5af43fcbed929451624444440a07b143977ecf1db5cfcbbd53c98aedc15dae5ab8c246e48ab3b7c1053d30054b66
+DIST salt-2016.3.8.tar.gz 8519835 SHA256 9558379a11882348c1299ca094b638feb6bdf8f0d443d2055a71d0c9a52427e3 SHA512 bba41d4c70e278aa7196d292fb27b926dce32f4cc67c5b23b6c219ad59178b1a8b26e8adeb3a7bd587c25cc1c8ff36a207ea2a2f68d13d64f37a34f96f35ecd1 WHIRLPOOL 14e18eabd1287f05b0387455890f31c030ce6c84c831a12d0c691f76a3181dba0d3c12a15935c0f786c02fe6887d17a0fad492356814166c23865e3f98831f44
+DIST salt-2017.7.2.tar.gz 11471191 SHA256 ff3bc7de5abf01b8acbd144db5811b00867179b2353f5c6f7f19241e2eff2840 SHA512 959cec404f0fa7c00f78427cba902b8b9c2c0d95016fc70925d8da6d0b97a0284fc034ac92a5c5c313763db4fdcbd1b0391318596b77fe8e0cd1c7e4b3fa928b WHIRLPOOL 85e6ae3ba1a5b7c1e3e8546daec6ceb4ec60fb915409dd8000298b394b933f24a4b1d5740ebe230930bf8de76e7934d1ae3c919a058fdf6bf60638c260e6a585
 EBUILD salt-2015.5.10.ebuild 4120 SHA256 e43d362181f9daf161832757539fcfe556fdbfa62c6cb08e72ea04fe1d434409 SHA512 083d1fefcb43b825d0e52e9cde37802c146261b98dc45d5ad780753b35f80444931529ca2334671515f69d5f8de6af6eb38512ea6806d9d06af24464b13c1270 WHIRLPOOL ee70ede1d04d74884b33b5b6d7df91a46ec239060e1e449db7960df9daf5b787a4a6a0039434667cccbc6eb211a36477402ad8fa29743aded268bf05f9237e10
 EBUILD salt-2015.8.13-r1.ebuild 4539 SHA256 6b0a3e37090adc0987d9b2dd4017d3d6ca65f3f0542566902b6adc1f7f99781e SHA512 9f581b8892282b96044511bbf444c9e95b1d548d9f39fe972e97aa9e801d961071301eeb1df41734a0c33a100d70d43a6c0bc3b04e7cf7c469dcc19aef577330 WHIRLPOOL 050e08bfb759f4d11fd3a8323d7f150435f56e82e92e6bbff6a1aa17f5ecdd5130ae945f616569984071a27fcd8ccb4a21ae13174cc266c659ed12827f680b3c
 EBUILD salt-2015.8.13.ebuild 4481 SHA256 e2c5c61ccf9978ef29c9f77e71155ae90a50b87303a55c18ac1b49153b05d0e5 SHA512 e3a39c1c44ce16b6bb63a05d135cf46f1a0676a419d70441f0d051b5f6f8f8f3a6b961961d03d7cfcab71b50866fcb1234f76f800c29050dd900743eb29e4586 WHIRLPOOL 1025b6ced7cbfbf4564915970a0f0d4c074b120e78b609eab2567659f647cdae5d12026ad14982d9824a1e886543b71857b45a0653943cfc6d0a6f0b2d780e1a
-EBUILD salt-2016.11.7.ebuild 4623 SHA256 b99a61c53dfa6fd905d4570e41a81cdc3c9d724418d851c263b152c452508e4a SHA512 946eccb7bbe7175d81fa3746e6c87d7880ede9ed9c1f27106c2d6d782cbc001b05976fa113e2c5dc8b03c8b5d9a6ebfb0dd739250f82bf623ae4ab0f799f6738 WHIRLPOOL fd87ca9221dcf3772569bcbbd1e9b3de3f2ec5c4610582ca3ec8595400f0fdb5c98c0026d2b285380f22e3aeaf5ada48ba35aef9fd9bb2f25f9352f8b48c4ee7
-EBUILD salt-2016.3.7.ebuild 4480 SHA256 01c260d891ac85b05fe8ea46c504d60c4470d5fcb911f5bada765ed5f30b5bf5 SHA512 4633d977af7d07a4483af40f0722d42766c4ee2c801dfd506f9b9fbcfaaabe507af63ae7298374838a27486127b47464593e6b678c40ebf575fa2a4d40fe50bf WHIRLPOOL 235a160faeb64cd95f4cab92b8665c0692ed832db3df123490a6bce50abe311d17df53b071dc9c4a87b33fbd9eeacc2bdba626518a2a68f93e6b89292d25d3f7
-EBUILD salt-2017.7.1.ebuild 4331 SHA256 315b6d84b5a9f7cb124129332cd57e5a4f12eb8a8475cf099ba655b0034f0458 SHA512 91f78244df90369ca0f1251618c463ef0c5ae34c2a7569c8cc23dd2cd5d4fc9000c0da521846a82d938fd1a49506d567307898c1368ffeb98babc93eabe6821b WHIRLPOOL 653bdb2440f423ec3545c7c30146ab79749c60ca78939044de76b7d031b1b73dd7c33a0c6633d5ec8d92e5d5a80cf29ce996aaedecbccfdd9e5416ed9982bfca
-EBUILD salt-9999.ebuild 4247 SHA256 f07619d0622068fca3c858d382532d0febcc37e397cf86af8ef44f5797995d61 SHA512 c9a3230f8a99b13cb5604dcc76be3ccbb7a5d1698e8cf3bb70b14a25dc73317eee0b30055e6c53e7fff51fe9a8a4fda6317060582e64b156d6fdbfeca0bb4943 WHIRLPOOL cbc2894ccf5d5f4bade826cbf0b17066247620e43e6cf17fabb857ea12edb58daab15dd60f050fdd7dbe2da56783aae712dfbd63dac92c9ebc0f734af6ef81e9
+EBUILD salt-2016.11.8.ebuild 4623 SHA256 b99a61c53dfa6fd905d4570e41a81cdc3c9d724418d851c263b152c452508e4a SHA512 946eccb7bbe7175d81fa3746e6c87d7880ede9ed9c1f27106c2d6d782cbc001b05976fa113e2c5dc8b03c8b5d9a6ebfb0dd739250f82bf623ae4ab0f799f6738 WHIRLPOOL fd87ca9221dcf3772569bcbbd1e9b3de3f2ec5c4610582ca3ec8595400f0fdb5c98c0026d2b285380f22e3aeaf5ada48ba35aef9fd9bb2f25f9352f8b48c4ee7
+EBUILD salt-2016.3.8.ebuild 4670 SHA256 384ca2dd8486c136828ffc3e29f668173fdc45fcfaa6192528410b705784b21b SHA512 3c9133d50c9abee9fc4dad7fcf9c643c84b0f3f8399fb71dc7e92e105f5dc4666b66c1bb308fd6950fe81d79fadc2a0eeaba14c75d9c6a2fe8e8c1ebb3d5cf02 WHIRLPOOL 2c3faa3033ab715e829307bf0e123d5909dc60b78306889014889e33ca0f600dc2d841c887c99bdb827170fae49236c4cb4196c5a3779f9041676a9530290b0c
+EBUILD salt-2017.7.2.ebuild 4331 SHA256 315b6d84b5a9f7cb124129332cd57e5a4f12eb8a8475cf099ba655b0034f0458 SHA512 91f78244df90369ca0f1251618c463ef0c5ae34c2a7569c8cc23dd2cd5d4fc9000c0da521846a82d938fd1a49506d567307898c1368ffeb98babc93eabe6821b WHIRLPOOL 653bdb2440f423ec3545c7c30146ab79749c60ca78939044de76b7d031b1b73dd7c33a0c6633d5ec8d92e5d5a80cf29ce996aaedecbccfdd9e5416ed9982bfca
 MISC ChangeLog 12403 SHA256 298bea725d2152b7f69553d11f297509ed77ca25766db0bd2ef701cabf4af9cb SHA512 4d09eec2c3b202dce66d1930ac797047b5a8a62e23d9544f4b9e87b9c04f8154c2e22bb15a81d8c12d2c655b69e6caf14a3fb894091d5fcc0a0dc19ae4605a27 WHIRLPOOL 32f7fb99620f148d306f4ab71de645013ffacba2634da765c4857fbc27470a4266774bb4568d43d4c454d428c2bbf212d23d560003545463148715240343a322
 MISC ChangeLog-2015 12557 SHA256 b377310761177c31ab41e955e1a83e638d4c48ca3ab3f785a09fc7dfbcde4e6c SHA512 d364f9c749647bc9a3daa67e08ea79d09a598b35620b1971f797739fdc066a5700e5b5c8d0b412aab6766db67cc90a5ef871e1aeba61caae0496413b24d7177a WHIRLPOOL ac4da49c7b67666ba3b9b184b688a25d68ea7234d2556f9f25f34e3014b118ba743574519e93fca6447ba5450c52dd6079c91d873ccf1344cc9309c23bddacf2
 MISC metadata.xml 2288 SHA256 84db13520194dd4ed73cbf3eb01226be10f0800be4be988bac56960507bdb543 SHA512 fdcea2f80fc87ab2a0db1643d71dd6d54e91d898594570af6a7505343c5d9a5a0ce4803d11460d7d3f6f533509b072819f958cbe31ca9183fabf811982526969 WHIRLPOOL 50fbf4e2c309ddf255c5b867554f8c56600a81b71cf4b7ccbe43b7d2fb15430767b11573b834f9eaed9dfd45bcd802e50865f1e42662bfeb12dd1b16387645c4
diff --git a/app-admin/salt/salt-2016.11.8.ebuild b/app-admin/salt/salt-2016.11.8.ebuild
new file mode 100644
index 000000000000..e68adad560f9
--- /dev/null
+++ b/app-admin/salt/salt-2016.11.8.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils systemd distutils-r1
+
+DESCRIPTION="Salt is a remote execution and configuration manager"
+HOMEPAGE="https://saltstack.com/community/"
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/${PN}stack/${PN}.git"
+	EGIT_BRANCH="develop"
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~x86 ~amd64"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb mysql neutron nova"
+IUSE+=" openssl portage profile redis selinux test timelib raet +zeromq vim-syntax"
+
+RDEPEND="sys-apps/pciutils
+	dev-python/jinja[${PYTHON_USEDEP}]
+	>=dev-python/msgpack-0.3[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/markupsafe[${PYTHON_USEDEP}]
+	>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=www-servers/tornado-4.2.1[${PYTHON_USEDEP}]
+	virtual/python-futures[${PYTHON_USEDEP}]
+	libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] )
+	mako? ( dev-python/mako[${PYTHON_USEDEP}] )
+	ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
+	libvirt? ( dev-python/libvirt-python[${PYTHON_USEDEP}] )
+	openssl? (
+		dev-libs/openssl:*[-bindist]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+	)
+	raet? (
+		>=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}]
+		>=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}]
+		>=dev-python/raet-0.6.0[${PYTHON_USEDEP}]
+	)
+	zeromq? (
+		>=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}]
+		>=dev-python/pycrypto-2.6.1[${PYTHON_USEDEP}]
+	)
+	cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] )
+	mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
+	portage? ( sys-apps/portage[${PYTHON_USEDEP}] )
+	keyring? ( dev-python/keyring[${PYTHON_USEDEP}] )
+	mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
+	redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
+	selinux? ( sec-policy/selinux-salt )
+	timelib? ( dev-python/timelib[${PYTHON_USEDEP}] )
+	nova? ( >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}] )
+	neutron? ( >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}] )
+	gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )
+	profile? ( dev-python/yappi[${PYTHON_USEDEP}] )
+	vim-syntax? ( app-vim/salt-vim )"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/pip[${PYTHON_USEDEP}]
+		dev-python/virtualenv[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/timelib[${PYTHON_USEDEP}]
+		>=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
+		!x86? ( dev-python/boto3[${PYTHON_USEDEP}] )
+		>=dev-python/moto-0.3.6[${PYTHON_USEDEP}]
+		>=dev-python/SaltTesting-2016.5.11[${PYTHON_USEDEP}]
+		>=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}]
+		${RDEPEND}
+	)"
+
+DOCS=( README.rst AUTHORS )
+
+REQUIRED_USE="|| ( raet zeromq )"
+RESTRICT="x86? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2016.11.0-tmpdir.patch"
+	"${FILESDIR}/${PN}-2016.3.1-dont-realpath-tmpdir.patch"
+	"${FILESDIR}/${PN}-2016.3.4-test-nonexist-dirs.patch"
+	"${FILESDIR}/${PN}-2016.11.0-remove-file-tree-test.patch"
+	"${FILESDIR}/${PN}-2016.11.0-broken-tests.patch"
+)
+
+python_prepare() {
+	# this test fails because it trys to "pip install distribute"
+	rm tests/unit/{modules,states}/zcbuildout_test.py \
+		tests/unit/modules/{rh_ip,win_network,random_org}_test.py || die
+
+	# https://github.com/saltstack/salt/issues/39095
+	rm tests/unit/utils/parsers_test.py
+
+	# apparently libcloud does not know about this?
+	rm tests/unit/cloud/clouds/dimensiondata_test.py || die
+
+	# seriously? "ValueError: Missing (or not readable) key file: '/home/dany/PRIVKEY.pem'"
+	rm tests/unit/cloud/clouds/gce_test.py || die
+}
+
+python_install_all() {
+	local svc
+	USE_SETUPTOOLS=1 distutils-r1_python_install_all
+
+	for svc in minion master syndic api; do
+		newinitd "${FILESDIR}"/${svc}-initd-4 salt-${svc}
+		newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc}
+		systemd_dounit "${FILESDIR}"/salt-${svc}.service
+	done
+
+	insinto /etc/${PN}
+	doins -r conf/*
+}
+
+python_test() {
+	local tempdir
+	# testsuite likes lots of files
+	ulimit -n 3072 || die
+
+	# ${T} is too long a path for the tests to work
+	tempdir="$(mktemp -dup /tmp salt-XXX)"
+	mkdir "${T}/$(basename "${tempdir}")"
+
+	(
+		cleanup() { rm -f "${tempdir}"; }
+		trap cleanup EXIT
+
+		addwrite "${tempdir}"
+		ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}"
+
+		USE_SETUPTOOLS=1 SHELL="/bin/bash" \
+			TMPDIR="${tempdir}" \
+			${EPYTHON} tests/runtests.py \
+			--unit-tests --no-report --verbose
+
+	) || die "testing failed"
+}
diff --git a/app-admin/salt/salt-2016.3.8.ebuild b/app-admin/salt/salt-2016.3.8.ebuild
new file mode 100644
index 000000000000..655ea35eb46a
--- /dev/null
+++ b/app-admin/salt/salt-2016.3.8.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils systemd distutils-r1
+
+DESCRIPTION="Salt is a remote execution and configuration manager"
+HOMEPAGE="https://saltstack.com/community/"
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/${PN}stack/${PN}.git"
+	EGIT_BRANCH="develop"
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~x86 ~amd64"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb mysql neutron nova"
+IUSE+=" openssl portage profile redis selinux test timelib raet +zeromq vim-syntax"
+
+RDEPEND="sys-apps/pciutils
+	dev-python/jinja[${PYTHON_USEDEP}]
+	>=dev-python/msgpack-0.3[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/markupsafe[${PYTHON_USEDEP}]
+	>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=www-servers/tornado-4.2.1[${PYTHON_USEDEP}]
+	virtual/python-futures[${PYTHON_USEDEP}]
+	libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] )
+	mako? ( dev-python/mako[${PYTHON_USEDEP}] )
+	ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
+	libvirt? ( dev-python/libvirt-python[${PYTHON_USEDEP}] )
+	openssl? (
+		dev-libs/openssl:*[-bindist]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+	)
+	raet? (
+		>=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}]
+		>=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}]
+		>=dev-python/raet-0.6.0[${PYTHON_USEDEP}]
+	)
+	zeromq? (
+		>=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}]
+		>=dev-python/pycrypto-2.6.1[${PYTHON_USEDEP}]
+	)
+	cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] )
+	mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
+	portage? ( sys-apps/portage[${PYTHON_USEDEP}] )
+	keyring? ( dev-python/keyring[${PYTHON_USEDEP}] )
+	mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
+	redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
+	selinux? ( sec-policy/selinux-salt )
+	timelib? ( dev-python/timelib[${PYTHON_USEDEP}] )
+	nova? ( >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}] )
+	neutron? ( >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}] )
+	gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )
+	profile? ( dev-python/yappi[${PYTHON_USEDEP}] )
+	vim-syntax? ( app-vim/salt-vim )"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/pip[${PYTHON_USEDEP}]
+		dev-python/virtualenv[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/timelib[${PYTHON_USEDEP}]
+		>=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
+		!x86? ( dev-python/boto3[${PYTHON_USEDEP}] )
+		>=dev-python/moto-0.3.6[${PYTHON_USEDEP}]
+		>=dev-python/SaltTesting-2016.5.11[${PYTHON_USEDEP}]
+		>=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}]
+		${RDEPEND}
+	)"
+
+DOCS=( README.rst AUTHORS )
+
+REQUIRED_USE="|| ( raet zeromq )"
+RESTRICT="x86? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2016.3.5-tmpdir.patch"
+	"${FILESDIR}/${PN}-2016.3.1-dont-realpath-tmpdir.patch"
+	"${FILESDIR}/${PN}-2016.3.4-test-nonexist-dirs.patch"
+	"${FILESDIR}/${PN}-2016.3.4-dont-test-ordering.patch"
+)
+
+python_prepare() {
+	# this test fails because it trys to "pip install distribute"
+	rm tests/unit/{modules,states}/zcbuildout_test.py \
+		tests/unit/modules/{rh_ip,win_network,random_org}_test.py || die
+
+	# apparently libcloud does not know about this?
+	rm tests/unit/cloud/clouds/dimensiondata_test.py || die
+
+	# seriously? "ValueError: Missing (or not readable) key file: '/home/dany/PRIVKEY.pem'"
+	rm tests/unit/cloud/clouds/gce_test.py || die
+
+	# needs network access
+	rm tests/unit/modules/boto_{vpc,elb,secgroup}_test.py || die
+	rm tests/unit/states/boto_vpc_test.py || die
+	rm tests/unit/transport/{zeromq,tcp,req}_test.py || die
+}
+
+python_install_all() {
+	local svc
+	USE_SETUPTOOLS=1 distutils-r1_python_install_all
+
+	for svc in minion master syndic api; do
+		newinitd "${FILESDIR}"/${svc}-initd-4 salt-${svc}
+		newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc}
+		systemd_dounit "${FILESDIR}"/salt-${svc}.service
+	done
+
+	insinto /etc/${PN}
+	doins -r conf/*
+}
+
+python_test() {
+	local tempdir
+	# testsuite likes lots of files
+	ulimit -n 3072 || die
+
+	# ${T} is too long a path for the tests to work
+	tempdir="$(mktemp -dup /tmp salt-XXX)"
+	mkdir "${T}/$(basename "${tempdir}")"
+
+	(
+		cleanup() { rm -f "${tempdir}"; }
+		trap cleanup EXIT
+
+		addwrite "${tempdir}"
+		ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}"
+
+		USE_SETUPTOOLS=1 SHELL="/bin/bash" \
+			TMPDIR="${tempdir}" \
+			${EPYTHON} tests/runtests.py \
+			--unit-tests --no-report --verbose
+
+	) || die "testing failed"
+}
diff --git a/app-admin/salt/salt-2017.7.2.ebuild b/app-admin/salt/salt-2017.7.2.ebuild
new file mode 100644
index 000000000000..48c9f23243af
--- /dev/null
+++ b/app-admin/salt/salt-2017.7.2.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils systemd distutils-r1
+
+DESCRIPTION="Salt is a remote execution and configuration manager"
+HOMEPAGE="http://saltstack.org/"
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://github.com/${PN}stack/${PN}.git"
+	EGIT_BRANCH="develop"
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~x86 ~amd64"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb mysql neutron nova"
+IUSE+=" openssl portage profile redis selinux test timelib raet +zeromq vim-syntax"
+
+RDEPEND="sys-apps/pciutils
+	dev-python/jinja[${PYTHON_USEDEP}]
+	>=dev-python/msgpack-0.3[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/markupsafe[${PYTHON_USEDEP}]
+	>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=www-servers/tornado-4.2.1[${PYTHON_USEDEP}]
+	virtual/python-futures[${PYTHON_USEDEP}]
+	libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] )
+	mako? ( dev-python/mako[${PYTHON_USEDEP}] )
+	ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
+	libvirt? ( dev-python/libvirt-python[${PYTHON_USEDEP}] )
+	openssl? (
+		dev-libs/openssl:*[-bindist]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+	)
+	raet? (
+		>=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}]
+		>=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}]
+		>=dev-python/raet-0.6.0[${PYTHON_USEDEP}]
+	)
+	zeromq? (
+		>=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}]
+		>=dev-python/pycrypto-2.6.1[${PYTHON_USEDEP}]
+	)
+	cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] )
+	mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
+	portage? ( sys-apps/portage[${PYTHON_USEDEP}] )
+	keyring? ( dev-python/keyring[${PYTHON_USEDEP}] )
+	mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
+	redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
+	selinux? ( sec-policy/selinux-salt )
+	timelib? ( dev-python/timelib[${PYTHON_USEDEP}] )
+	nova? ( >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}] )
+	neutron? ( >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}] )
+	gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )
+	profile? ( dev-python/yappi[${PYTHON_USEDEP}] )
+	vim-syntax? ( app-vim/salt-vim )"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-salt[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pip[${PYTHON_USEDEP}]
+		dev-python/virtualenv[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/timelib[${PYTHON_USEDEP}]
+		>=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
+		!x86? ( >=dev-python/boto3-1.2.1[${PYTHON_USEDEP}] )
+		>=dev-python/moto-0.3.6[${PYTHON_USEDEP}]
+		>=dev-python/SaltTesting-2016.5.11[${PYTHON_USEDEP}]
+		>=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}]
+		${RDEPEND}
+	)"
+
+DOCS=( README.rst AUTHORS )
+
+REQUIRED_USE="|| ( raet zeromq )"
+RESTRICT="x86? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2017.7.0-dont-realpath-tmpdir.patch"
+)
+
+python_prepare() {
+	rm tests/unit/{test_zypp_plugins.py,utils/test_extend.py} || die
+	rm tests/unit/modules/test_boto_{vpc,secgroup,elb}.py || die
+	rm tests/unit/states/test_boto_vpc.py || die
+}
+
+python_install_all() {
+	local svc
+	USE_SETUPTOOLS=1 distutils-r1_python_install_all
+
+	for svc in minion master syndic api; do
+		newinitd "${FILESDIR}"/${svc}-initd-4 salt-${svc}
+		newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc}
+		systemd_dounit "${FILESDIR}"/salt-${svc}.service
+	done
+
+	insinto /etc/${PN}
+	doins -r conf/*
+}
+
+python_test() {
+	local tempdir
+	# testsuite likes lots of files
+	ulimit -n 3072 || die
+
+	# ${T} is too long a path for the tests to work
+	tempdir="$(mktemp -du --tmpdir=/tmp salt-XXX)"
+	mkdir "${T}/$(basename "${tempdir}")"
+	mkdir "${BUILD_DIR}"/../{templates,conf/cloud.{providers,profiles,maps}.d} || die
+
+	(
+		cleanup() {
+			rm -f "${tempdir}"
+			rmdir "${BUILD_DIR}"/../{templates,conf/cloud.{providers,profiles,maps}.d} || die
+		}
+
+		trap cleanup EXIT
+
+		addwrite "${tempdir}"
+		ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}"
+
+		USE_SETUPTOOLS=1 SHELL="/bin/bash" \
+			TMPDIR="${tempdir}" \
+			${EPYTHON} tests/runtests.py \
+			--unit-tests --no-report --verbose
+
+	) || die "testing failed"
+}