Remove old 2014.7 versions, unkeyword 2014.1.13 for security bug #546904.

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

5 files changed, 9 insertions, 240 deletions

diff --git a/app-admin/salt/ChangeLog b/app-admin/salt/ChangeLog
index 8b6357e677b9..377a775ef5cc 100644
--- a/app-admin/salt/ChangeLog
+++ b/app-admin/salt/ChangeLog
@@ -1,6 +1,10 @@
 # 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.58 2015/04/08 07:30:35 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/ChangeLog,v 1.59 2015/04/17 21:29:28 chutzpah Exp $
+
+  17 Apr 2015; Patrick McLean <chutzpah@gentoo.org> -salt-2014.7.0.ebuild,
+  -salt-2014.7.2.ebuild, salt-2014.1.13.ebuild:
+  Remove old 2014.7 versions, unkeyword 2014.1.13 for security bug #546904.
 
   08 Apr 2015; Michał Górny <mgorny@gentoo.org> salt-2014.1.13.ebuild:
   Remove old Python implementations
diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest
index 7ac32180dd86..fcb0b0e2ca44 100644
--- a/app-admin/salt/Manifest
+++ b/app-admin/salt/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX api-confd-1 188 SHA256 9f3f47a7af4d349a7c525455616139b5019d3b7d0290398ba8c50ab91a62d089 SHA512 c58fc025a3654b59f79c6e23fe135d75ebad8b166bc5214f4842c3dd92192e3598480f9fd6960ad2dc36d3ee45ff971650c5e0156353c1c045650f86c9a68db9 WHIRLPOOL 54070ebb3fe0e2338dac12541b198ba0dd07c5a80ef0eb1c92a3d65d30276a2446cf644a37274d51ab633074e9edb0044d022b9eeab549721b181c253abd5b30
 AUX api-initd-3 399 SHA256 5cba8ab47a33143ca60dc9807e128cb6f321f61d41d0519e7b710005ace90a08 SHA512 4ae5fa77f858aa37bb833d772147bd2a14a7d93fba1af8dce00a22e77101ae7047333c33fbd5d6dbbee7a193428efe3f40e2f58dce0f14345bf4bfb3a1bf91c3 WHIRLPOOL c419122a6c3b096655ea94836fa4930420dedcb3628e942d04366dba2ee22713a53abe02911add27dfe2caa9a4097e167e38aed18e8e9c48a7c576f0d1c672af
 AUX master-confd-1 188 SHA256 9f3f47a7af4d349a7c525455616139b5019d3b7d0290398ba8c50ab91a62d089 SHA512 c58fc025a3654b59f79c6e23fe135d75ebad8b166bc5214f4842c3dd92192e3598480f9fd6960ad2dc36d3ee45ff971650c5e0156353c1c045650f86c9a68db9 WHIRLPOOL 54070ebb3fe0e2338dac12541b198ba0dd07c5a80ef0eb1c92a3d65d30276a2446cf644a37274d51ab633074e9edb0044d022b9eeab549721b181c253abd5b30
@@ -19,32 +16,9 @@ AUX salt-syndic.service 169 SHA256 2199cd525392b3f6615acd2ef8b9c1b31be96c69f7e26
 AUX syndic-confd-1 188 SHA256 286148f5391d42c04a62a13cc125fa2130b5821e50da913c5a20d3a913e5f2d1 SHA512 0051e13351cef8db81dc075a194bb384723f07d5591b5b4d3f3adf4180afaf7beced470ab79ceca9d1ec0dae62dbd72084eb76af009fc78411a011050a94a2ed WHIRLPOOL fed0dffe202d776cd5f1b74a28c5dac69b082603c9ddf695616a0a6bca5084b9589f1f4d03313f7271754166a9aa136c06aa61e6fd2e3b02d829798aa741c432
 AUX syndic-initd-3 411 SHA256 2de9f69462bc3b575a69a150b6bba21a6e341477010d284cb77614e810a7bf8c SHA512 0be38f5ec653852459b28b319c1c1b99b0a22b2cbeeadc27ccdbbc574e0a138e3d11f44b257b818655ac156fc3c6e719cde6c98391173621488e2c3000b4313f WHIRLPOOL 88c0c3f8def37e3bc2fb96c5af679ee8813f03f537bcb4356eab07c3eedb01debd1844e87ecba0d8927cc43d81191ab00efea481e9f9143b8c647ab5ae160ed7
 DIST salt-2014.1.13.tar.gz 2846659 SHA256 0ab37478e18e6490eccef4deb9f77a20c99ffcc6f97b48e25eb546f8b73f3c22 SHA512 967f7759cbeb55dba0842c8f6efa281a28afa3e9ad7fd0771c587629e8e601cdaf440573e2453e1f21ec3dafa01f0b042ecbd1faa515c9d088cefb19f6ce6629 WHIRLPOOL d992900416f55f857f7685b2110fad6aa43e5859005259dc7db66853aa57c74a8ac06c1894d4c4bf26959c61ccacdff3273c1cbf18039ec005d36fffbc30fbbb
-DIST salt-2014.7.0.tar.gz 3518342 SHA256 d4a64436636a5e6839c1ae1d16052d2e965b9aed5c3c58735bd89fddb9a0ed5c SHA512 2954c9c3fa061823a315e26c5e5b34d8cf982a91b39f123dbeb85afa92451a5dd176394af9ae5667ffd5ab9463766ae08c5d5a00d5ef6d9107669b45b0c6778f WHIRLPOOL 348b49cdb852d3af40dd68592b1b6cd40f8088889a062f44767d23912eef61474571c35633cceee49fd0057df26662eb3e4b3d53b6f3f118c4c9e0b10f2df08f
-DIST salt-2014.7.2.tar.gz 3570683 SHA256 92e6b9afe764c836cd24aa210d98050bc0fdb4d8ee9f813edc504ea19651e505 SHA512 baf9e856a84e208fe3906100e10b31ca06992a90d64aecb7a95315c5048a6a627fc0cc56276302afcd1f0a4230c7bd564e37d0c09ebcb8eedad9ee6c96830da1 WHIRLPOOL 72b3511ecb3de0a5a97f883b7329ae1a92735fde39942c8f70679f358c8ef7f0115de518c79158505b91b517d22a0188dbf97c4bfa79fcdeeefe79dd43e53ac4
 DIST salt-2014.7.4.tar.gz 3833928 SHA256 0adf4c138ebd26745b1d1157be0772d89da3582fe8a6622a8031cbe32a28e9f3 SHA512 8cbb9b26472b8980c36f0394a79bf872fd68a62bc886ba2a7fa35720db0a01c3a026e63c839a5c0dddc328c9555fa87aff4cfd71e3faaf01d6c1db01ae5bed64 WHIRLPOOL 1234c14e5fbb552cabb827d416e5ccbaccf9df03bac1ea72f32eeac33dc06d6afe0af0e83bff1682fbec0a52558a43945fccca8a9b08ace28c42a6c2c2016f01
-EBUILD salt-2014.1.13.ebuild 2519 SHA256 9bd5882218d3d86ecb7a78ab38dac5663507e25336ad6d72d699f2c8d55b98bf SHA512 6fec19a959a14dcd5ab0ca68b5aa5bb043dc07e19faf8dbbc4f9eecb5e754a6f73a2e62bae06c785d10a6bc814702998727090026e1e9b076a20530abaf833c4 WHIRLPOOL 133289ebb90840b18bd6f0fa1a0012f4dd7221eb67a59dac8c8ae3e3ee089b29c184554bb6b3a555f02334fc7200cf2cf6ab25f438096a9cc4d8cdb892aedf02
-EBUILD salt-2014.7.0.ebuild 3120 SHA256 3f4b005d97b6f08211debdccad15646abf87e08c2991cac464dfc569acbbcb81 SHA512 f3da3fb7ebf637a20bcc7e262076ca37b16ac46838f141648d7cc38fdeb9e58098be3162a6c0e588f75edb925c346d639076d5517ca9725952d272269846eca9 WHIRLPOOL 0ded0c0c7247a006f1eb538ff367f755077aef5c5f961f954a932e75f089b3693ffb663b319204263f05cf77ecc2106edf34185a90e7c25cbc64e9c1325122f6
-EBUILD salt-2014.7.2.ebuild 3259 SHA256 88d301326e7192849235a7ec546ed46d8479e479693b1e3aeb7c3d4a4da66934 SHA512 6d027585c2e126929a823cd51d2b1c799324279c8e7d9cddaf4dc01408bd7fd86915fffc1656b72f65ef4e52ac1d3209e96f913762e36a31b4fef24068e63f4d WHIRLPOOL 7601250d54a7d2b6d3bc03d501c1b262529b0abc856603822a5ed21de26f4504eabd859295dcd2b8a4ed9643cec15b576b9c1dc1395988827b453feda3d8dcd5
+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-9999.ebuild 3180 SHA256 effeffcda9616e178870f68068287fd34c02de92525e2fe36381c99199f17ada SHA512 0d3ddf76dfb69699c9e7cf163dd83d43a12b3ec893ebc84ed44db1e3b2d992684b2bcab8a2829457cc65c8c195e7f4d0d809bdee6191035848e16019db2de2a4 WHIRLPOOL d86fb53e41d3c2d555906925ede2819e527784628a87476e6a672b185fc9a94055036d966fd94fd72c0f6a31000ac2bfd454d904235f835341ad30b9ff446b50
-MISC ChangeLog 10805 SHA256 4f58902c8221b3bc76073d8264043d2edaf6d534e548a21be4b89963fc259b54 SHA512 8cd5a9577f182039eff75dcccac923fa29cbe736272abb8343d12601ba370a1e8fb74d35647231f72a424fdb8afb7bc6038710c3195389c5906579715d8ff0a6 WHIRLPOOL b7b13343dd64ffe87d6f53a5286fa6efa48135d6b8237f0c39e9479c607811df6e40955469e085d694a99be33e85b0b68c4efa37eeb5c9acd57dd0b52339f7ed
+MISC ChangeLog 11007 SHA256 b6b28fbf57a55d3fa22bcaee6e8590b9ba1b82b21cbf5e108df87e4b52f2389e SHA512 c558d39ddca391b4ca47638bc695cf723d9cdf685f84fc08f0d7b376c404a8b1db815ccc529a398890d372322cfba528aaf363b8c7706dec68c9b2c34d9a247a WHIRLPOOL 3457b72a6dcda3db9ee46824bbba68b26a95c1accd9b514f367fcb27d9951809754e265c1a3c8cf9c052f6cc027826a6023e4d9faf7b05fc4cca6a9ab8a92202
 MISC metadata.xml 1973 SHA256 9cd6ed9773018e0d406f1155f704c6660bf703cf992c7aee3458f34f3c90cdea SHA512 b26708b1407e867af702927ef395415f838ca25354e8fa3451b30d632b112511d1a902a521f5b8e3bde1218b3c810e1ebc27ca247266a210e872df9a05e05950 WHIRLPOOL 27904b1812756d483e1b28502422a2ed9a1c0410987529dbf5996394baa31901ae5671430223fa350f5f7f4bb05f8c45a247b43376a55ae4330e1044d8faff46
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQJ8BAEBCABmBQJVJNl2XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOowAP/iV+HNHiaxHz7v39hi5qSemz
-wzdLvdoCdBpeLXrDYYn0mRStGCuoakR11byn99Kmkw3Db2659rwTy+gmH9VyNp8h
-gYtMu59MpDmaA0Wg31/v6BKsXjKRui9WUNDXyCjOe1t8Vx8TE/JWn2ooVuup51n+
-qGiEohnhAXcIUu3HjJgszyQigLkNG2hHEUcmpyXo7UU5/OHX8X7I911b3Xy5GndX
-F6HBTMmuIG8UMVUgORnynzLN6taniYfTllyc3yvHd8yeaoeD6HCh8/79UV6wIptY
-ia/Q8zVY6nSdEVqOFb4+ab6PdFHw9i+XxhhSdpmUM7QIGMXcx3kTY62mbIbd6QeP
-7hfgo5ORoa79HFI/wN4i/o/obIH2BNlN6b0QXVh1hCXGoZBSPxoRTam4woKgyf+t
-HAFalk6LJyhNkqpucb1f+Jc7FjuQ7sZYI71m3s7WaPYGvoxuiNF849SpwQD2OOcf
-6+Lyud6DEs55vce8n0oBO4YwZe3gC7tGmcqlPP6y0gFJEhWrggfF66mXvP/Y1mbW
-Dit39RTu8EmnGHaApUqYWyiQ0eayx8z3Pn1VzW51mZYh6O8E4onVSpyJAmoUt0E9
-kRzfSBGv+W9Q2yNVJ2CCQWLIUum/QggYF2d/F3ruMcMi+wIQ2/C31MO60AuWx7Wk
-JkkLcNpPS5FZUl09G+Gc
-=s2/i
------END PGP SIGNATURE-----
diff --git a/app-admin/salt/salt-2014.1.13.ebuild b/app-admin/salt/salt-2014.1.13.ebuild
index 76241d67e062..858390043802 100644
--- a/app-admin/salt/salt-2014.1.13.ebuild
+++ b/app-admin/salt/salt-2014.1.13.ebuild
@@ -1,6 +1,6 @@
 # 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-2014.1.13.ebuild,v 1.3 2015/04/08 07:30:35 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/salt-2014.1.13.ebuild,v 1.4 2015/04/17 21:29:28 chutzpah Exp $
 
 EAPI=5
 
@@ -19,7 +19,7 @@ if [[ ${PV} == 9999* ]]; then
 	KEYWORDS=""
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~x86 ~amd64"
+	KEYWORDS=""
 fi
 
 LICENSE="Apache-2.0"
diff --git a/app-admin/salt/salt-2014.7.0.ebuild b/app-admin/salt/salt-2014.7.0.ebuild
deleted file mode 100644
index 266adf80d545..000000000000
--- a/app-admin/salt/salt-2014.7.0.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/salt-2014.7.0.ebuild,v 1.1 2014/11/13 03:58:29 chutzpah Exp $
-
-EAPI=5
-PYTHON_COMPAT=(python2_7)
-
-inherit eutils distutils-r1 systemd
-
-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 nova"
-IUSE+=" openssl redis timelib raet +zeromq test"
-
-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}]
-	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[${PYTHON_USEDEP}]
-		dev-python/ioflo[${PYTHON_USEDEP}]
-		dev-python/raet[${PYTHON_USEDEP}]
-	)
-	zeromq? (
-		>=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}]
-		dev-python/m2crypto[${PYTHON_USEDEP}]
-		dev-python/pycrypto[${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}] )
-	timelib? ( dev-python/timelib[${PYTHON_USEDEP}] )
-	nova? ( >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}] )
-	gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )
-	cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] )"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pip[${PYTHON_USEDEP}]
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-		dev-python/timelib[${PYTHON_USEDEP}]
-		>=dev-python/SaltTesting-2014.4.24[${PYTHON_USEDEP}]
-		${RDEPEND}
-	)"
-
-DOCS=(README.rst AUTHORS)
-
-REQUIRED_USE="|| ( raet zeromq )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-remove-pydsl-includes-test.patch"
-)
-
-python_prepare() {
-	# this test fails because it trys to "pip install distribute"
-	rm tests/unit/{modules,states}/zcbuildout_test.py
-}
-
-python_install_all() {
-	USE_SETUPTOOLS=1 distutils-r1_python_install_all
-
-	for s in minion master syndic; do
-		newinitd "${FILESDIR}"/${s}-initd-3 salt-${s}
-		newconfd "${FILESDIR}"/${s}-confd-1 salt-${s}
-		systemd_dounit "${FILESDIR}"/salt-${s}.service
-	done
-
-	insinto /etc/${PN}
-	doins -r conf/*
-}
-
-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" \
-		./tests/runtests.py --unit-tests --no-report --verbose || die "testing failed"
-}
diff --git a/app-admin/salt/salt-2014.7.2.ebuild b/app-admin/salt/salt-2014.7.2.ebuild
deleted file mode 100644
index 56737010a7f0..000000000000
--- a/app-admin/salt/salt-2014.7.2.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# 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-2014.7.2.ebuild,v 1.1 2015/02/17 20:07:03 chutzpah Exp $
-
-EAPI=5
-PYTHON_COMPAT=(python2_7)
-
-inherit eutils distutils-r1 systemd
-
-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="api ldap libcloud libvirt gnupg keyring mako mongodb mysql nova"
-IUSE+=" openssl redis selinux timelib raet +zeromq test"
-
-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}]
-	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[${PYTHON_USEDEP}]
-		dev-python/ioflo[${PYTHON_USEDEP}]
-		dev-python/raet[${PYTHON_USEDEP}]
-	)
-	zeromq? (
-		>=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/m2crypto-0.22.3[${PYTHON_USEDEP}]
-		dev-python/pycrypto[${PYTHON_USEDEP}]
-	)
-	api? (
-		|| (
-			dev-python/cherrypy[${PYTHON_USEDEP}]
-			www-servers/tornado[${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}] )
-	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/timelib[${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"
-)
-
-python_prepare() {
-	# this test fails because it trys to "pip install distribute"
-	rm tests/unit/{modules,states}/zcbuildout_test.py
-}
-
-python_install_all() {
-	USE_SETUPTOOLS=1 distutils-r1_python_install_all
-
-	for s in minion master syndic $(use api && echo api); do
-		newinitd "${FILESDIR}"/${s}-initd-3 salt-${s}
-		newconfd "${FILESDIR}"/${s}-confd-1 salt-${s}
-		systemd_dounit "${FILESDIR}"/salt-${s}.service
-	done
-
-	insinto /etc/${PN}
-	doins -r conf/*
-}
-
-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"
-}