4 files changed, 7 insertions, 44 deletions
diff --git a/app-admin/salt/ChangeLog b/app-admin/salt/ChangeLog
index 5ad7671c8eaf..bb5bf426901c 100644
--- a/app-admin/salt/ChangeLog
+++ b/app-admin/salt/ChangeLog
@@ -1,6 +1,12 @@
 # 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.66 2015/07/07 23:20:43 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/ChangeLog,v 1.67 2015/07/07 23:21:33 chutzpah Exp $
+
+  07 Jul 2015; Patrick McLean <chutzpah@gentoo.org>
+  -files/salt-2014.1.2-tests-nonroot.patch,
+  -files/salt-2014.1.5-minion-error.patch,
+  -files/salt-2014.1.5-tests-nonroot.patch:
+  Remove old patches.
 
 *salt-2015.5.3 (07 Jul 2015)
 
diff --git a/app-admin/salt/files/salt-2014.1.2-tests-nonroot.patch b/app-admin/salt/files/salt-2014.1.2-tests-nonroot.patch
deleted file mode 100644
index 7373ecbad291..000000000000
--- a/app-admin/salt/files/salt-2014.1.2-tests-nonroot.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/tests/unit/utils/verify_test.py b/tests/unit/utils/verify_test.py
-index 6e62359..c30bbe2 100644
---- a/tests/unit/utils/verify_test.py
-+++ b/tests/unit/utils/verify_test.py
-@@ -56,9 +56,6 @@ class TestVerify(TestCase):
-         zmq.__version__ = '2.1.0'
-         self.assertFalse(zmq_version())
- 
--    def test_user(self):
--        self.assertTrue(check_user(getpass.getuser()))
--
-     def test_no_user(self):
-         # Catch sys.stderr here since no logging is configured and
-         # check_user WILL write to sys.stderr
diff --git a/app-admin/salt/files/salt-2014.1.5-minion-error.patch b/app-admin/salt/files/salt-2014.1.5-minion-error.patch
deleted file mode 100644
index 19c9dd682599..000000000000
--- a/app-admin/salt/files/salt-2014.1.5-minion-error.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/salt/minion.py b/salt/minion.py
-index 47a23de..52a5849 100644
---- a/salt/minion.py
-+++ b/salt/minion.py
-@@ -461,8 +461,10 @@ class MultiMinion(object):
- 
-         while True:
-             for minion in minions.values():
--                if isinstance(minion, dict):
-+                if isinstance(minion, dict) and 'minion' in minion:
-                     minion = minion['minion']
-+                elif isinstance(minion, dict):
-+                    continue
-                 if not hasattr(minion, 'schedule'):
-                     continue
-                 try:
diff --git a/app-admin/salt/files/salt-2014.1.5-tests-nonroot.patch b/app-admin/salt/files/salt-2014.1.5-tests-nonroot.patch
deleted file mode 100644
index 778a8b9ad81a..000000000000
--- a/app-admin/salt/files/salt-2014.1.5-tests-nonroot.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/tests/unit/utils/verify_test.py b/tests/unit/utils/verify_test.py
-index fca9c1b..a6f4276 100644
---- a/tests/unit/utils/verify_test.py
-+++ b/tests/unit/utils/verify_test.py
-@@ -90,7 +90,7 @@ class TestVerify(TestCase):
-         self.assertEqual(dir_stat.st_gid, os.getgid())
-         self.assertEqual(dir_stat.st_mode & stat.S_IRWXU, stat.S_IRWXU)
-         self.assertEqual(dir_stat.st_mode & stat.S_IRWXG, stat.S_IRWXG)
--        self.assertEqual(dir_stat.st_mode & stat.S_IRWXO, 0)
-+        #self.assertEqual(dir_stat.st_mode & stat.S_IRWXO, 0)
- 
-     @requires_network(only_local_network=True)
-     def test_verify_socket(self):