app-admin/salt: Remove redundant versions

Signed-off-by: Michał Górny <mgorny@gentoo.org>

9 files changed, 0 insertions, 513 deletions

diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest
index e289f5ad4bc8..72e7e1a90e3a 100644
--- a/app-admin/salt/Manifest
+++ b/app-admin/salt/Manifest
@@ -1,5 +1,3 @@
-DIST salt-2016.11.10.tar.gz 10058200 BLAKE2B 4b6a42f6bf56421bc19458686ec23a1f945ceeb68b4ce7059fde036ba98d677fc8b61cb0f0c6ab249304b2f07d1b0250f6b91e7c443e12868649bf88f4d44d43 SHA512 e767e2c4c20e3a49a748b2699e4c640610280c0ba1c5955d94daffc7c36991ee632f02a50e338c65b35da146e234c36cc732214174b9bc5cbd62316b9ee40c28
-DIST salt-2017.7.8.tar.gz 12060430 BLAKE2B b2dde1b6f43bbb9b9db29b70dfd57591ae0e490e35ec7f4895b68b444ff77f9e997321d73697f791d345756abf451f11891b5f78a97c537c35dfe8bd24c43bbc SHA512 1e5123ee3dc194a33cf5da1e68a0419230b2b4eea26e7f66bf2d64754f0dbef9012abfbd498015f6b675725e580d72abf13c151b106639597337498b1fd42238
 DIST salt-2018.3.4.tar.gz 14404085 BLAKE2B 932b30b1ba60aefd3a6874a8ebe4cb6c469d82e31f6acdbe8a5641d09e3316796b5403ef803a355cec6255c1aede8bac3b66af179bd1bbaa5418c7076229cef9 SHA512 f17e06fdbf4741f231d9e769be57de4f6079e9283881b4bafa0d23928d7626a1f9c02b9f49c654b29c3e6ee8ed3d3ddf42c21baecef158ad63a97dc87895b21b
 DIST salt-2019.2.0.tar.gz 14952746 BLAKE2B aa3bba4b7d9548a8d333c242fc0265a743f56ff1a259da7c8618d37b3b022e12f09ac594a09f0ceec80fd9d3a6b6b9ec35b33e879b7a124e6612f2ec2a63a01c SHA512 de5a976213d011c230e423a172952effddb87168367958b8657eaaaf8fd2a8bec8471f547b6ff9e896a17064a13d387dbc12e12c605c8a241062e3238bd19eca
 DIST salt-2019.2.2.tar.gz 14420887 BLAKE2B 84e8a0aa72b88a66a1020b695849926669728ee02f8cb51a14853b5e9c2ab692fe65810367e5d53268f7b234c10911f16d063ce665b3761432ab1d9c0aa52d16 SHA512 2bbf9765384f1f6c2336a3f421298c8900cf459e6d1ebc7fb89284014ef8db9f5215a68de2bb06dfa3404983160a0c4c589ffa3dc046611dd5409bd502938677
diff --git a/app-admin/salt/files/salt-2016.11.0-broken-tests.patch b/app-admin/salt/files/salt-2016.11.0-broken-tests.patch
deleted file mode 100644
index 5bb7a8e4c46b..000000000000
--- a/app-admin/salt/files/salt-2016.11.0-broken-tests.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/tests/unit/utils/extend_test.py b/tests/unit/utils/extend_test.py
-index f63a4896f7..54bf443d9a 100644
---- a/tests/unit/utils/extend_test.py
-+++ b/tests/unit/utils/extend_test.py
-@@ -38,18 +38,6 @@ class ExtendTestCase(TestCase):
-                 shutil.rmtree(self.out, True)
-         os.chdir(self.starting_dir)
- 
--    @patch('sys.exit', MagicMock)
--    def test_run(self):
--        out = salt.utils.extend.run('test', 'test', 'this description', integration.CODE_DIR, False)
--        self.out = out
--        year = date.today().strftime('%Y')
--        self.assertTrue(os.path.exists(out))
--        self.assertFalse(os.path.exists(os.path.join(out, 'template.yml')))
--        self.assertTrue(os.path.exists(os.path.join(out, 'directory')))
--        self.assertTrue(os.path.exists(os.path.join(out, 'directory', 'test.py')))
--        with salt.utils.fopen(os.path.join(out, 'directory', 'test.py'), 'r') as test_f:
--            self.assertEqual(test_f.read(), year)
--
- if __name__ == '__main__':
-     from unit import run_tests
-     run_tests(ExtendTestCase, needs_daemon=False)
diff --git a/app-admin/salt/files/salt-2016.11.0-remove-file-tree-test.patch b/app-admin/salt/files/salt-2016.11.0-remove-file-tree-test.patch
deleted file mode 100644
index 47d3257df671..000000000000
--- a/app-admin/salt/files/salt-2016.11.0-remove-file-tree-test.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git a/tests/unit/modules/inspect_collector_test.py b/tests/unit/modules/inspect_collector_test.py
-index 9105670526..e077bc3f44 100644
---- a/tests/unit/modules/inspect_collector_test.py
-+++ b/tests/unit/modules/inspect_collector_test.py
-@@ -52,29 +52,6 @@ class InspectorCollectorTestCase(TestCase):
-         self.assertEqual(inspector.pidfile, '/foo/pid/bar.pid')
- 
-     @patch("os.mkdir", MagicMock())
--    def test_file_tree(self):
--        '''
--        Test file tree.
--
--        :return:
--        '''
--
--        inspector = Inspector(cachedir='/test', piddir='/test', pidfilename='bar.pid')
--        tree_root = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'inspectlib', 'tree_test')
--        expected_tree = (['/a/a/dummy.a', '/a/b/dummy.b', '/b/b.1', '/b/b.2', '/b/b.3'],
--                         ['/a', '/a/a', '/a/b', '/a/c', '/b', '/c'],
--                         ['/a/a/dummy.ln.a', '/a/b/dummy.ln.b', '/a/c/b.1', '/b/b.4',
--                          '/b/b.5', '/c/b.1', '/c/b.2', '/c/b.3'])
--        tree_result = []
--        for chunk in inspector._get_all_files(tree_root):
--            buff = []
--            for pth in chunk:
--                buff.append(pth.replace(tree_root, ''))
--            tree_result.append(buff)
--        tree_result = tuple(tree_result)
--        self.assertEqual(expected_tree, tree_result)
--
--    @patch("os.mkdir", MagicMock())
-     def test_get_unmanaged_files(self):
-         '''
-         Test get_unmanaged_files.
diff --git a/app-admin/salt/files/salt-2016.11.0-tmpdir.patch b/app-admin/salt/files/salt-2016.11.0-tmpdir.patch
deleted file mode 100644
index 1cccb158aff0..000000000000
--- a/app-admin/salt/files/salt-2016.11.0-tmpdir.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git a/tests/unit/modules/qemu_nbd_test.py b/tests/unit/modules/qemu_nbd_test.py
-index 615e6b5670..fbd24aab86 100644
---- a/tests/unit/modules/qemu_nbd_test.py
-+++ b/tests/unit/modules/qemu_nbd_test.py
-@@ -77,6 +77,7 @@ class QemuNbdTestCase(TestCase):
-         Test if it mount the named image via qemu-nbd
-         and return the mounted roots
-         '''
-+        tmpdir = os.environ.get('TMPDIR', '/tmp')
-         mock = MagicMock(return_value=True)
-         with patch.dict(qemu_nbd.__salt__, {'cmd.run': mock}):
-             self.assertEqual(qemu_nbd.init('/srv/image.qcow2'), '')
-@@ -89,7 +90,7 @@ class QemuNbdTestCase(TestCase):
-                                  'mount.mount': mock,
-                                  'cmd.retcode': MagicMock(side_effect=[1, 0])}):
-                     self.assertDictEqual(qemu_nbd.init('/srv/image.qcow2'),
--                                         {'/tmp/nbd/nbd0/nbd0': '/dev/nbd0'})
-+                                         {os.path.join(tmpdir, 'nbd/nbd0/nbd0'): '/dev/nbd0'})
- 
-     # 'clear' function tests: 1
- 
-diff --git a/tests/unit/utils/context_test.py b/tests/unit/utils/context_test.py
-index 5249d56747..a27ee9ab61 100644
---- a/tests/unit/utils/context_test.py
-+++ b/tests/unit/utils/context_test.py
-@@ -18,7 +18,7 @@ import salt.payload
- import salt.utils
- 
- __context__ = {'a': 'b'}
--__opts__ = {'cachedir': '/tmp'}
-+__opts__ = {'cachedir': os.environ.get('TMPDIR', '/tmp')}
- 
- 
- @skipIf(NO_MOCK, NO_MOCK_REASON)
diff --git a/app-admin/salt/files/salt-2016.3.1-dont-realpath-tmpdir.patch b/app-admin/salt/files/salt-2016.3.1-dont-realpath-tmpdir.patch
deleted file mode 100644
index 3e4fa31c9042..000000000000
--- a/app-admin/salt/files/salt-2016.3.1-dont-realpath-tmpdir.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/tests/integration/__init__.py b/tests/integration/__init__.py
-index fc13bb6..6316fb5 100644
---- a/tests/integration/__init__.py
-+++ b/tests/integration/__init__.py
-@@ -77,12 +77,7 @@ if salt.utils.is_windows():
-     import win32api
- 
- 
--SYS_TMP_DIR = os.path.realpath(
--    # Avoid ${TMPDIR} and gettempdir() on MacOS as they yield a base path too long
--    # for unix sockets: ``error: AF_UNIX path too long``
--    # Gentoo Portage prefers ebuild tests are rooted in ${TMPDIR}
--    os.environ.get('TMPDIR', tempfile.gettempdir()) if not salt.utils.is_darwin() else '/tmp'
--)
-+SYS_TMP_DIR = os.environ.get('TMPDIR', tempfile.gettempdir()) if not salt.utils.is_darwin() else '/tmp'
- TMP = os.path.join(SYS_TMP_DIR, 'salt-tests-tmpdir')
- FILES = os.path.join(INTEGRATION_TEST_DIR, 'files')
- PYEXEC = 'python{0}.{1}'.format(*sys.version_info)
diff --git a/app-admin/salt/files/salt-2016.3.4-test-nonexist-dirs.patch b/app-admin/salt/files/salt-2016.3.4-test-nonexist-dirs.patch
deleted file mode 100644
index dd542d630adf..000000000000
--- a/app-admin/salt/files/salt-2016.3.4-test-nonexist-dirs.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git a/tests/unit/conf_test.py b/tests/unit/conf_test.py
-index cce0023423..c1324f4a61 100644
---- a/tests/unit/conf_test.py
-+++ b/tests/unit/conf_test.py
-@@ -140,6 +140,8 @@ class ConfTest(TestCase):
-         commented out. This test loops through all of the files in that directory to check
-         for any lines that are not commented or blank.
-         '''
-+        if not os.path.exists(SAMPLE_CONF_DIR + 'cloud.profiles.d/'):
-+            return
-         cloud_sample_files = os.listdir(SAMPLE_CONF_DIR + 'cloud.profiles.d/')
-         for conf_file in cloud_sample_files:
-             profile_conf = SAMPLE_CONF_DIR + 'cloud.profiles.d/' + conf_file
-@@ -158,6 +160,8 @@ class ConfTest(TestCase):
-         commented out. This test loops through all of the files in that directory to check
-         for any lines that are not commented or blank.
-         '''
-+        if not os.path.exists(SAMPLE_CONF_DIR + 'cloud.providers.d/'):
-+            return
-         cloud_sample_files = os.listdir(SAMPLE_CONF_DIR + 'cloud.providers.d/')
-         for conf_file in cloud_sample_files:
-             provider_conf = SAMPLE_CONF_DIR + 'cloud.providers.d/' + conf_file
-@@ -176,6 +180,9 @@ class ConfTest(TestCase):
-         commented out. This test loops through all of the files in that directory to check
-         for any lines that are not commented or blank.
-         '''
-+        if not os.path.exists(SAMPLE_CONF_DIR + 'cloud.maps.d/'):
-+            return
-+
-         cloud_sample_files = os.listdir(SAMPLE_CONF_DIR + 'cloud.maps.d/')
-         for conf_file in cloud_sample_files:
-             map_conf = SAMPLE_CONF_DIR + 'cloud.maps.d/' + conf_file
diff --git a/app-admin/salt/files/salt-2017.7.8-tests.patch b/app-admin/salt/files/salt-2017.7.8-tests.patch
deleted file mode 100644
index e428108c4614..000000000000
--- a/app-admin/salt/files/salt-2017.7.8-tests.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-diff --git a/tests/unit/fileserver/test_roots.py b/tests/unit/fileserver/test_roots.py
-index 23f3b26874..bf0b55c385 100644
---- a/tests/unit/fileserver/test_roots.py
-+++ b/tests/unit/fileserver/test_roots.py
-@@ -173,16 +173,6 @@ class RootsTest(TestCase, AdaptedConfigurationTestCaseMixin, LoaderModuleMockMix
-         ret = roots.dir_list({'saltenv': 'base'})
-         self.assertIn('empty_dir', ret)
- 
--    def test_symlink_list(self):
--        orig_file_roots = self.opts['file_roots']
--        try:
--            if self.test_symlink_list_file_roots:
--                self.opts['file_roots'] = self.test_symlink_list_file_roots
--            ret = roots.symlink_list({'saltenv': 'base'})
--            self.assertDictEqual(ret, {'dest_sym': 'source_sym'})
--        finally:
--            if self.test_symlink_list_file_roots:
--                self.opts['file_roots'] = orig_file_roots
- 
- 
- class RootsLimitTraversalTest(TestCase, AdaptedConfigurationTestCaseMixin):
-diff --git a/tests/unit/modules/test_inspect_collector.py b/tests/unit/modules/test_inspect_collector.py
-index c2a86d9e5e..421cab9b52 100644
---- a/tests/unit/modules/test_inspect_collector.py
-+++ b/tests/unit/modules/test_inspect_collector.py
-@@ -61,44 +61,6 @@ class InspectorCollectorTestCase(TestCase):
-             inspector.pidfile,
-             os.sep + os.sep.join(['foo', 'pid', 'bar.pid']))
- 
--    def test_file_tree(self):
--        '''
--        Test file tree.
--
--        :return:
--        '''
--
--        inspector = Inspector(cachedir=os.sep + 'test',
--                              piddir=os.sep + 'test',
--                              pidfilename='bar.pid')
--        tree_root = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'inspectlib', 'tree_test')
--        expected_tree = ([os.sep + os.sep.join(['a', 'a', 'dummy.a']),
--                          os.sep + os.sep.join(['a', 'b', 'dummy.b']),
--                          os.sep + os.sep.join(['b', 'b.1']),
--                          os.sep + os.sep.join(['b', 'b.2']),
--                          os.sep + os.sep.join(['b', 'b.3'])],
--                         [os.sep + 'a',
--                          os.sep + os.sep.join(['a', 'a']),
--                          os.sep + os.sep.join(['a', 'b']),
--                          os.sep + os.sep.join(['a', 'c']),
--                          os.sep + 'b',
--                          os.sep + 'c'],
--                         [os.sep + os.sep.join(['a', 'a', 'dummy.ln.a']),
--                          os.sep + os.sep.join(['a', 'b', 'dummy.ln.b']),
--                          os.sep + os.sep.join(['a', 'c', 'b.1']),
--                          os.sep + os.sep.join(['b', 'b.4']),
--                          os.sep + os.sep.join(['b', 'b.5']),
--                          os.sep + os.sep.join(['c', 'b.1']),
--                          os.sep + os.sep.join(['c', 'b.2']),
--                          os.sep + os.sep.join(['c', 'b.3'])])
--        tree_result = []
--        for chunk in inspector._get_all_files(tree_root):
--            buff = []
--            for pth in chunk:
--                buff.append(pth.replace(tree_root, ''))
--            tree_result.append(buff)
--        tree_result = tuple(tree_result)
--        self.assertEqual(expected_tree, tree_result)
- 
-     def test_get_unmanaged_files(self):
-         '''
diff --git a/app-admin/salt/salt-2016.11.10.ebuild b/app-admin/salt/salt-2016.11.10.ebuild
deleted file mode 100644
index 7ad0ca40863f..000000000000
--- a/app-admin/salt/salt-2016.11.10.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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://www.saltstack.com/resources/community/
-	https://github.com/saltstack"
-
-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="~amd64 ~x86"
-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:0=[-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/pycryptodome[${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="!test? ( test ) 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
-	rm tests/unit/states/pip_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
-
-	# allow the use of the renamed msgpack
-	sed -i '/^msgpack/d' requirements/base.txt || 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.8.ebuild b/app-admin/salt/salt-2017.7.8.ebuild
deleted file mode 100644
index de0fba5cc5ae..000000000000
--- a/app-admin/salt/salt-2017.7.8.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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://www.saltstack.com/resources/community/
-	https://github.com/saltstack"
-
-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="~amd64 ~x86"
-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}]
-	<www-servers/tornado-5.0[${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:0=[-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/pycryptodome[${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-2.0.0[${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="!test? ( test ) x86? ( test )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2017.7.0-dont-realpath-tmpdir.patch"
-	"${FILESDIR}/${PN}-2017.7.8-tests.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
-	rm tests/unit/modules/test_kubernetes.py || die
-	# allow the use of the renamed msgpack
-	sed -i '/^msgpack/d' requirements/base.txt || 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"
-}