Version bump.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xE3F69979BB4B8928DA78E3D17CBF44EF

4 files changed, 162 insertions, 15 deletions

diff --git a/app-admin/salt/ChangeLog b/app-admin/salt/ChangeLog
index eddb216bc20d..8befef52485a 100644
--- a/app-admin/salt/ChangeLog
+++ b/app-admin/salt/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-admin/salt
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/ChangeLog,v 1.62 2015/05/06 22:27:59 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/ChangeLog,v 1.63 2015/05/22 22:22:56 chutzpah Exp $
+
+*salt-2015.5.1 (22 May 2015)
+
+  22 May 2015; Patrick McLean <chutzpah@gentoo.org>
+  +files/salt-2015.5.1-skip-libvirt-test-on-nonroot.patch,
+  +salt-2015.5.1.ebuild:
+  Version bump.
 
 *salt-2015.5.0 (06 May 2015)
 
diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest
index 284d53391a96..9c61150d7957 100644
--- a/app-admin/salt/Manifest
+++ b/app-admin/salt/Manifest
@@ -17,6 +17,7 @@ AUX salt-2014.7.0-remove-pydsl-includes-test.patch 3593 SHA256 5445f3e0b2c9dbbaa
 AUX salt-2014.7.1-remove-pydsl-includes-test.patch 3605 SHA256 0f0433f63a1b4a1a203331177c0ea46e43f74e69465f157e53f68f0d317cfdc0 SHA512 fe56cb6b5f91586e9acba136601c9380f158a4dc3a0316a00b23703a5e5de7b8ae3cec7b3bd606e0b7a927f8a7fc28c57e5dd5f10755f34e9dbd6052c9dc9b50 WHIRLPOOL e3386852207693d5f3415ef7b35297bd0fb12ba25e41adfb2b5958c51e9e4337c46871eac9823876a316c9a2357877690c741d074cdfb00314b699346eba6e2d
 AUX salt-2014.7.5-archive-test.patch 773 SHA256 f3df263d59cf8886e4070a31bd29b53a0d146badb45b9c6df09f93bc51187500 SHA512 b2407054fbc0733ace0324f9083b4c2ec1913f3538cd4d8f7b823b63298a1f305a5a7b5f1786f9aa51d13aeefc3be9a678ab5057c59c27365bb7a799b2c8e2ba WHIRLPOOL 94d27893e55ff1561aa9018b2c6dfba4e86995dd9dfe415938389e9d5e5b2ee68ccadb019f87a86532c3ce6a4b0556b2079b41864fbe1c393d2f80c966c063fe
 AUX salt-2015.5.0-archive-test.patch 775 SHA256 0f99233d6a093455be9f39bb586d8270396eada07aaeada15486733c0e8a0e36 SHA512 424d849342e9ab192467057c766019c050a035d809409332f59c760968b884e4f9931c29416335f43da352490a8c02853addf7878fac23ed4911bdc2bd963499 WHIRLPOOL 11c18a503109fcaba58edf2ce3b98cc987cada8e3fc85d505979f12958a8e0a538104031ca2840028a2435d833c6fad3828609d70bb9e42ff1c8e9857afc7ec6
+AUX salt-2015.5.1-skip-libvirt-test-on-nonroot.patch 598 SHA256 9d60fe39b9a703f9be53853a07c88207690525057ba6d4fae7b7e84e0c138746 SHA512 f27ff2b46f98e8945cdf64e19cef025c389677b9aedb495fdfcbd5277fe92a93d4d8555b121d06f39c6d4c48e8e91a1da27c0bcb870617dc4049caba1393cea9 WHIRLPOOL 7fb1a4b7d63e24a934029e7e5ee79a5dafd6d482ccaac0162350bc5dde5a4460265d1c9e34fc43874d113ecf1a65ab4b41c49e43b81709f040293bb87bc86bb4
 AUX salt-api.service 166 SHA256 b4706ebbc243e44579327b07609499a587e4023a11d3928735b3b226ff504cb7 SHA512 bab6b8380c965bf16e23078ebe6f38d942300829d4c89ddf23b630bd57b4d371f80687d85dd9e0cc1b669f2ca882aecde1bc8d7d82382a02ed20e493d3f04702 WHIRLPOOL cfba8559ffd486c5e49f3a7d54e0d03a4ae72065029cbbdd9b96403acafb304b1e687dc205960526a51f096eee58680329422e6b4a26022eed7469387a4dd763
 AUX salt-master.service 169 SHA256 5a8c43e469c47ce8cc5b4175105ca6233daa47b411ebf4002aad84003cb9f4a6 SHA512 87fe27fc0748f4191bd1c6883bb362c95cce8fe1f409e2679b229ddfd9de6c99438859dfa0a47b042977d659029ef56e406f1e8aa01761bff21af4784f9dd5f8 WHIRLPOOL ebb632028483e8849eb8ab61677967477bd4f420277b1360b3c28424a5192615aecf2d62372df76d6dee8855e6cd5557075ce17bcf85a999d92a0734cf849628
 AUX salt-minion.service 162 SHA256 829f0f25e5ae73befaa107bd5d2317ec608e8be95d5f60f9650c01e5d19d07a6 SHA512 99f0a5c696e38b42b283416736a23e535ccc53095928b205914cf4b69c0df931a6752205985726527f7889b01dfece78466be28448458b15064edd04aca3e5ed WHIRLPOOL 50255e88a81c64d461b70b6d990545561f4e9cdbc1f4b0caf0048b8ca46eef3233f5d174b88b1e07bf52aaab5ba16355b72fdea675a0099578acab2d5cb27e1b
@@ -28,28 +29,30 @@ DIST salt-2014.1.13.tar.gz 2846659 SHA256 0ab37478e18e6490eccef4deb9f77a20c99ffc
 DIST salt-2014.7.4.tar.gz 3833928 SHA256 0adf4c138ebd26745b1d1157be0772d89da3582fe8a6622a8031cbe32a28e9f3 SHA512 8cbb9b26472b8980c36f0394a79bf872fd68a62bc886ba2a7fa35720db0a01c3a026e63c839a5c0dddc328c9555fa87aff4cfd71e3faaf01d6c1db01ae5bed64 WHIRLPOOL 1234c14e5fbb552cabb827d416e5ccbaccf9df03bac1ea72f32eeac33dc06d6afe0af0e83bff1682fbec0a52558a43945fccca8a9b08ace28c42a6c2c2016f01
 DIST salt-2014.7.5.tar.gz 3845643 SHA256 474d0a23866e42c664f46e04bc8ead87fc57ee16ff2cc8945248f1e0706f6eb8 SHA512 60e64db5125eb3c6f44cccf906ff0e8916cdcb31970e000785a81cf6ae95b38c681088f2fb3964fabc16667a26403ae30cb84cea3493d837d0b57aa86e771160 WHIRLPOOL b3600c1824cd49983cfe73567ec4a3861bdec88c5cc725ae8159e917e5074ade32aee29eafe5ec78fe4c87f2effc0f5f49627772e12468eb3a050b9395a45374
 DIST salt-2015.5.0.tar.gz 4432164 SHA256 e0d5b3ec220d8c956120bf2faa00bb7013e500eef7a697bc428cb179a136a5d2 SHA512 ad4f8f8f74412c58df7b021b923f368d493aeba412a73dc3137032cc9a61acf965f351e314d82fb4fab3a833ffd359218d27e6613e0cc0b6b6a8534b579af691 WHIRLPOOL 698c3b1118687111a5af540130e33ff281af9d5147ba372676595fa10452ab82a0ffd9df251a60370bb95d958f7ef21d8d7bc236a35cd013db5552d04ce15f77
+DIST salt-2015.5.1.tar.gz 4970135 SHA256 0edb1d0584f53e805ad6ffc21c163a637b23d187052ba2dbb7e641c2d7099c4d SHA512 0de9b3391f33940e230b21841dca05943edcf7a890c0cae8efdd39bcbaf46c27f71cefaf73861dc5b59b567c40c2f0cada04ccedc73cffd905a449795b2f8ecb WHIRLPOOL 4aaa899fa6fd13b60daba7bbef692db24020ffc54e03e4c5d194e32aaa1580430a5fc7bb70f0b87e1ed2710428ed9aa8e729fa4e1144fb42754c740e3e45405e
 DIST salt-vim-20141109.tar.gz 3783 SHA256 4989d111ad618ea3f5f7a7046a0ff6ce3ca6bc7f71fca90849f7c38947ab6d9a SHA512 d8d62ee827012e29586cf492f2881ee5870ed058828102f985e8b27300c115e01bb126f89decb15a19a8e206dc54c89856d4c31b3ff5320a36385cb5ed517a63 WHIRLPOOL 98026b2cdcb64665790475e3b20a7de294e5cefb390b414294756cad440bc040d9044ffd37a13f3c93af9be1a1bfd444710ff0df24895db624f49fddd16b5545
 EBUILD salt-2014.1.13.ebuild 2510 SHA256 40afc6b3781ffa7d4380d4968d960e8bcb0ac1c394e5ec6e5cee7b93371c6c0c SHA512 2322e59bea190fa10b0abd5945413e6544f4362123a93f9fdecdcbb9bb5dd9cb6ae07c80c1939dfcd70cf77aee1c481bccc1e125b10f7fd2e9bdc27a0c968039 WHIRLPOOL e5c3bc78f2d9f1c302df18fd8a8bd067089e5e989f798311c7c35a2c1c72f609e3c7614cf5f6c1c6a53cb95ce53992ba41ca4fa2f3d31981a23c00b6696001cd
 EBUILD salt-2014.7.4.ebuild 3259 SHA256 61242f51347b3391619f68bf659a2785e8076bf36b7d8eb9cc3884009bdf04a6 SHA512 a2eb756619e68a8b293d4518a716c33b329bdf71231e8316154677ab6abbd709fc33b06e48e7c344d2090011781d5d5e15c7e10a75330e367df24751d8b83636 WHIRLPOOL 9505970e0be53e4c8ce36cccfba469bc3c7444d0d91d4e23f9a66b5a83bed501d86dbb355a9b704d18bb3597b0b189d6fd7a75d9868de7aefb338bf67dafe211
 EBUILD salt-2014.7.5.ebuild 3308 SHA256 78ad9ab024212423fc24a5ea9da8ef5334ef4a944d953a7aa0c5b2ba0ffa8a42 SHA512 e2eba69874009f09f184987725e0d6fc4f705fc0a9e76db3a55cf67915fcab9cc3de77d243c1c79e26fc6df87e953d56a0c1a7fb35f14c89caa690f1f955462a WHIRLPOOL a0de949b24c74cbcd505481f034c58e309cc73c78199b38069df5ea019d4c1a7f4738e74bc9d5c428f6e1ae33752ac1ca74ddda4c35af196d4aecf9456ec145e
 EBUILD salt-2015.5.0.ebuild 3891 SHA256 36fda844385d7422291a82fb4c64d4d8dddc3dd243f4cb606988e804309e0315 SHA512 de4cf15a9c7e956c5ead7a9f1b1782a77d5610b654934d6f2f5ae326deb7474f23ed37b3c29b28387865af3446e9ecc233c5eafebfab655a0eb1238fb4734445 WHIRLPOOL 08ec5588b046d1e1e82d8050e6a72442edaf10cde7e9e48b4503a550066e35798f701c0660bb4163d9e5e914d48d255abffce511903e3abf918fd49b2dd86c6c
+EBUILD salt-2015.5.1.ebuild 3956 SHA256 6e33d42111bb185cd28a0262e9dab2d9918d8a2ad3910bc396da6a17c45ffc90 SHA512 705d084ff3a8caf5397140b485e7d728fd53b3c33bc20abf68aec4b14fe2fb69a2e4cc6e532a50ca3094462bc5ac61f54969439242a9e933d6b561591ef5df61 WHIRLPOOL fa804f26347706ac6a8dfde5c2f8d4a73cade181683a67b541add3c46625192ba2680cce12cd5dd3a8eb5cbc5ced71349c44a5f5298d22eef3f42756bc1ecf27
 EBUILD salt-9999.ebuild 3180 SHA256 effeffcda9616e178870f68068287fd34c02de92525e2fe36381c99199f17ada SHA512 0d3ddf76dfb69699c9e7cf163dd83d43a12b3ec893ebc84ed44db1e3b2d992684b2bcab8a2829457cc65c8c195e7f4d0d809bdee6191035848e16019db2de2a4 WHIRLPOOL d86fb53e41d3c2d555906925ede2819e527784628a87476e6a672b185fc9a94055036d966fd94fd72c0f6a31000ac2bfd454d904235f835341ad30b9ff446b50
-MISC ChangeLog 11636 SHA256 8488d4dded42b09540772c62afff30f4ddebed18a5f381335344118fd77809c6 SHA512 fa76bdce751486ebd65dda3953b8bee294868d751eaf7b8dc0bff3c4e5067b863cdf1e749e518ab1dc90169670fc9d1b6e679c45b9cef5ac6d61526552e0484b WHIRLPOOL a661b26b9a0f7d1c426137eea8c7d4e5cb90f1e5c3a53ee7e03169d0e0def89431d8f54e10769d9c115541b1940d7254804f2c2badaeeea8d2737188c267605c
+MISC ChangeLog 11819 SHA256 5af15cac4b1cdd3557effce94d73735c533eaae7798e26edb6e63f07cabc7234 SHA512 67b4757183c43396a60acc76aa92161495d76b3a532e20fe1b66bf37d0d68d3bc995a345a1ccd57a3474c3366136b2719d68a383d531a2713f4ad73e212e11df WHIRLPOOL 1edd6de1d8d5f04879cb723d0af0222b0d97c641363e35e6cc8afd156b96cb728618b69d13fa92cb75f59bb23e4c57d43caafe8953a427675a2e913299325ac0
 MISC metadata.xml 2056 SHA256 a3d26ff536797009bcea04c0048ac0fe5d1ebe537baddb4a6e79a6c7ffa99974 SHA512 4977522b4e0dcdaf03bf8994fb9b327524cd46c414ba204947af5404e97435003092033fdf8d1b8e43dc770494047fcc851e12f2c01077c8dcc015340df3c115 WHIRLPOOL 9c642c9175fb2b43dc3113b8bcfe92b41d541038dabdd3505a8e17a6af9720c588d6ab2579fe014ba2089984100bfe4f61d91bb1f53a6841885d4b8acf5ff693
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVSpV3AAoJEHy/RO9cNQiD4TkP/i4R6Tl/P/pvrRgH/eFENvtm
-ZEm9wjo30qCMsNPR6Xc6PCQrMHe+usQe/KXEn3csnH17LSgHeem7yXVQ3fcBJYtX
-AV/B8QIxK4GexH1wCPbPl3qVo5KA+E0sMoNQWesqVgo97aw+z+DNywP39h++5ywA
-hzFdY+Vvf+yC7zo7unT/QKZII4+JjowJ1JLEw5KDAGht7aeyRZ0AJS1968FmVHd9
-OcI1L2CWMi7Xx0FoqPeJstm8PGHklJ2rqO+LHgfenya72EZzOlKDEIxe1dcmN7Iv
-vjPiMXhsIDzl+MTln01vkB02pByi/afPCRuBJhgVqePjCvCVK2sQeC3wgRt3pTNP
-8S/IwdoDG2M8o7l8o1hKyxPG8WrKLzkDcDl5AizoOcS1BuSWAA2KpvkJeCpiwFr1
-6YtWhCOTE6wnvwlm4EdZvSxucXkDDzxUz7jgdmKYA/jTNncMd42yf4o2ckm1sk6+
-RHfNUeS9Quo4mJJTamqc/m9RXLgvNLFQCcUn5aIL6taaSbL2upqOSVSKW76kpye4
-C074IZ7JvPq8v6sEPVL1qjebykQITAq59bDuYBNh46HH5nT8wYPLJ2FyvchJBMtm
-lmnfkYKikWPDbOOZhOo+dYg7cdb0ZNJs5/e/ZwNd6gCLrNk/K6m8txL1+hOstT3g
-rbzleuT+Dz/rr5lzRfeN
-=YM6u
+iQIcBAEBCAAGBQJVX6xSAAoJEHy/RO9cNQiDQ2sQAI0bOWkdD6ihziXyKLwNgDFu
+ehLPBGZtO2Xg72GM0ExHGIPeWgGsYh0k8clLKr4yPUNaD5qQESJ6E4spruC939Up
+4rDGdYXGNpnUiFSK/FnVFxFYDdjTOrbFDoZlLgjQycqubK6KFS4u2pcuIA0hSlxg
+G+e18kBl2vaWLORspJEg//V/49FfiDrIMMV+Uyk/JLBRxBF5zVfHqKHysOxaMwjv
+0Hy/PHCRzZTz7PHGzMeBb/XgYn/ToBqrI23dWcCVEjTvcqkXk7fwlj8iWKMJVezS
+xhmEE0C6jM+L3tb6q3ob5xU6rnSrQbUnxR1JJWMlv3ReAXlXXgKLSfGvlgDYeEvS
+Awv7Mbaybthnk1xDFflXdSbnnwjR/VacGR/zTwRopO0cg9jS+d7iNG18BOPkRnKY
+Nv28fPPlD9bWy0wiipU2jMV50VaeeFGbWVrHVI7s+aGxEulpmruq6xiIGis8k0tR
+zs3ARpa9p4Dv1vsmfk19S7HmXz4TUS2hrA99PcbPHs5txQUsPfEHM02hCagQE4yW
+x+GQY+yNC3ax3g3fer8JZgQN0ZVaJiGE/ViCEEHb8i9re0NezmGjj011hyqWwbhq
+7CG9YTOodqIV08uPDHSfs9ABvliRpSD7nxWXNnsRVWfB3CevO4FpDsjyrbytDUyb
+EDE6/+DxWHHlnHyj9hSS
+=7q+a
 -----END PGP SIGNATURE-----
diff --git a/app-admin/salt/files/salt-2015.5.1-skip-libvirt-test-on-nonroot.patch b/app-admin/salt/files/salt-2015.5.1-skip-libvirt-test-on-nonroot.patch
new file mode 100644
index 000000000000..acb8a091ac48
--- /dev/null
+++ b/app-admin/salt/files/salt-2015.5.1-skip-libvirt-test-on-nonroot.patch
@@ -0,0 +1,20 @@
+diff --git a/tests/unit/states/libvirt_test.py b/tests/unit/states/libvirt_test.py
+index ec09542..477e5c3 100644
+--- a/tests/unit/states/libvirt_test.py
++++ b/tests/unit/states/libvirt_test.py
+@@ -4,6 +4,7 @@
+ '''
+ # Import Python libs
+ from __future__ import absolute_import
++import os
+ 
+ # Import Salt Testing Libs
+ from salttesting import skipIf, TestCase
+@@ -27,6 +28,7 @@ libvirt.__opts__ = {}
+ 
+ 
+ @skipIf(NO_MOCK, NO_MOCK_REASON)
++@skipIf(os.geteuid() != 0, 'You must be logged in as root to run this test')
+ class LibvirtTestCase(TestCase):
+     '''
+     Test cases for salt.states.libvirt
diff --git a/app-admin/salt/salt-2015.5.1.ebuild b/app-admin/salt/salt-2015.5.1.ebuild
new file mode 100644
index 000000000000..d2c3c9097b45
--- /dev/null
+++ b/app-admin/salt/salt-2015.5.1.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/salt-2015.5.1.ebuild,v 1.1 2015/05/22 22:22:56 chutzpah Exp $
+
+EAPI=5
+PYTHON_COMPAT=(python2_7)
+
+inherit eutils systemd vim-plugin distutils-r1
+
+DESCRIPTION="Salt is a remote execution and configuration manager"
+HOMEPAGE="http://saltstack.org/"
+SALT_VIM_HASH="20695f68e5895e5ae2b5884b78f5a2cd29897b05"
+
+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
+
+SRC_URI+=" vim-syntax? ( https://github.com/${PN}stack/${PN}-vim/archive/${SALT_VIM_HASH}.tar.gz -> salt-vim-20141109.tar.gz )"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb mysql neutron nova"
+IUSE+=" openssl 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.0[${PYTHON_USEDEP}]
+	libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] )
+	mako? ( dev-python/mako[${PYTHON_USEDEP}] )
+	ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
+	openssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] )
+	libvirt? ( dev-python/libvirt-python[${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/m2crypto-0.22.3[${PYTHON_USEDEP}]
+		dev-python/pycrypto[${PYTHON_USEDEP}]
+	)
+	cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] )
+	mongodb? ( dev-python/pymongo[${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}] )"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		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}]
+		>=dev-python/moto-0.3.6[${PYTHON_USEDEP}]
+		>=dev-python/SaltTesting-2015.2.16[${PYTHON_USEDEP}]
+		${RDEPEND}
+	)"
+
+DOCS=(README.rst AUTHORS)
+
+REQUIRED_USE="|| ( raet zeromq )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2014.7.1-remove-pydsl-includes-test.patch"
+	"${FILESDIR}/${PN}-2015.5.0-archive-test.patch"
+	"${FILESDIR}/${PN}-2015.5.1-skip-libvirt-test-on-nonroot.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}_test.py
+}
+
+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/*
+
+	use vim-syntax && S="${WORKDIR}/salt-vim-${SALT_VIM_HASH}" \
+		vim-plugin_src_install
+}
+
+python_test() {
+	# testsuite likes lots of files
+	ulimit -n 3072
+
+	# using ${T} for the TMPDIR makes some tests needs paths that exceed PATH_MAX
+	USE_SETUPTOOLS=1 SHELL="/bin/bash" TMPDIR="/tmp" \
+		${EPYTHON} tests/runtests.py \
+		--unit-tests --no-report --verbose || die "testing failed"
+}