Remove old patches.

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

5 files changed, 21 insertions, 61 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/Manifest b/app-admin/salt/Manifest
index 9e8e81f8fab0..90104bce994d 100644
--- a/app-admin/salt/Manifest
+++ b/app-admin/salt/Manifest
@@ -10,9 +10,6 @@ AUX master-initd-4 422 SHA256 239071e57c37c9d5d9ca1f5b54155b9a9c31e06f32f01387eb
 AUX minion-confd-1 188 SHA256 286148f5391d42c04a62a13cc125fa2130b5821e50da913c5a20d3a913e5f2d1 SHA512 0051e13351cef8db81dc075a194bb384723f07d5591b5b4d3f3adf4180afaf7beced470ab79ceca9d1ec0dae62dbd72084eb76af009fc78411a011050a94a2ed WHIRLPOOL fed0dffe202d776cd5f1b74a28c5dac69b082603c9ddf695616a0a6bca5084b9589f1f4d03313f7271754166a9aa136c06aa61e6fd2e3b02d829798aa741c432
 AUX minion-initd-3 417 SHA256 06415d7f958210a4dd1490db5796b0d3c08392a81547f290776d9164dde786ae SHA512 3fe554e93e07aa90f6f568807301b622a5e3e120009f92e4cd534b0fe2c4affbb7f79f8e29bb6e5ef1f51458dfe98664e1a36e3414cdf06629c074d8a02839c0 WHIRLPOOL b70116cb10494034ae83c86eb1f31ea2a06775bc90ec099cb219721173b33df5203ffdca732df690704cc11c0813a8cba26a5f02edba1dad118b540656637833
 AUX minion-initd-4 428 SHA256 d1ff82d1f4db8b2bfc640c1cad3e2bfb525dd8ef2225cb4dc1018cf9021a2a34 SHA512 f623a034e1dc759ac29e97a94a20b141ca076680c603c2895487bc50577293bc7399c2341d1aae18ab93ee45b543c0e4913a095295ce16bc3c85a00f305313c5 WHIRLPOOL 30571747517cc2ec8fbef9b067413d04f4cb69d7baab255a1878bbf703370d1b091cde5f09ba35842860af3e269eb55a918c979b60395f4a3ecaa8584d7a6d4c
-AUX salt-2014.1.2-tests-nonroot.patch 537 SHA256 5b0e06027eb2663d215b8ffda773d8d4b7aac69489563a15f177d7f8049f1f46 SHA512 17de6c83da1660b35590d0acfcbbc1756c0699bf7b1de72157b4f3039fac00c7dfd1a3536662ad7322b39d7e710feb53c7174084a11c3248bc2f09d15010612c WHIRLPOOL 81233516139fa12627fe110aab27aba6cfd738cab9b996e980deb0eb11fac310279dcfc1920bfdc42f57788e523628dd7108d252046aec48c4659db4c8420c5f
-AUX salt-2014.1.5-minion-error.patch 578 SHA256 fe7ebaaa872958d8135ead8d00e717bda12aed270bb4357a675e6f16f1d81921 SHA512 cf6064ebe739731ec159634fe750100e121f45b87abc1e159e310efa0adcc6b1931af306b44384734e163d23a83ab659f3df744641bab97b0d42efcb4ee032dc WHIRLPOOL adf93fa5d76474752eb81ecf1ba3d6d0f861a740490550299dfe13977dbb8d01e46e82e01ff242af578aad5abbc913b4c790325bec7b725815abe203164f2431
-AUX salt-2014.1.5-tests-nonroot.patch 643 SHA256 3094a80bc6966a266dc0b5fae8cec2bed80df83399a805a7aac48b5df09800e5 SHA512 76f7ce52419951122943d0d33c9db29a2be539b1eba96b86885eb61553f65b885ca04dff68b2bdcd3c2184ce0cd04b2a0c4025c0bfa98f80b53300583f922587 WHIRLPOOL 127872ecf85b907987e1c55642ef42d8a8f3bac9419929f851de82b8e942982474dab986adb61a14263f1855a4ecc131e81dc354c6992416de0c07f0b7f0c3dc
 AUX salt-2014.7.0-remove-pydsl-includes-test.patch 3593 SHA256 5445f3e0b2c9dbbaae52c9f191fadfed55f07e453763f55c60053cde404ad8c9 SHA512 9055ebaa8c9a775166bfabdaa9c25caf4aeee4b0e7afb4f4cf6398fa2c588d0ec10f3c89d5099798d9732ca3ef28ebe1dd9be3f4525a9d970472f208f7e46ec9 WHIRLPOOL e6d9239c66901026ce3afce799e28cd3882a69b9d7c46ab2cc4f65cea62771cee027f2df06f2cda28ef31aee6bc6912e7d3af7ea6e90ce1abc6bd943f433498a
 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
@@ -35,22 +32,22 @@ EBUILD salt-2014.7.5.ebuild 3308 SHA256 78ad9ab024212423fc24a5ea9da8ef5334ef4a94
 EBUILD salt-2015.5.1.ebuild 3956 SHA256 6e33d42111bb185cd28a0262e9dab2d9918d8a2ad3910bc396da6a17c45ffc90 SHA512 705d084ff3a8caf5397140b485e7d728fd53b3c33bc20abf68aec4b14fe2fb69a2e4cc6e532a50ca3094462bc5ac61f54969439242a9e933d6b561591ef5df61 WHIRLPOOL fa804f26347706ac6a8dfde5c2f8d4a73cade181683a67b541add3c46625192ba2680cce12cd5dd3a8eb5cbc5ced71349c44a5f5298d22eef3f42756bc1ecf27
 EBUILD salt-2015.5.3.ebuild 3891 SHA256 fd5db5a6a64293d04c3a249b058f0f739d475b93fdd1e067f5a0b7a8ef38bca5 SHA512 3c243693914e07633bd5f2ec570a7d8595988194dd197f79c0bb57ad9c8bb02642109414cc7364375b47a17a0f4039ec0ba6557ca77f5fc2b0688eeb81744e36 WHIRLPOOL b5a5d294e759ef070256231441927cc14ee15ec311f3ca18b5e4351a3fe01fef714f6ce6530fa76f6a5597017bb5fce7be87c34adf8cd1d99dec46bbad09f7d2
 EBUILD salt-9999.ebuild 3180 SHA256 effeffcda9616e178870f68068287fd34c02de92525e2fe36381c99199f17ada SHA512 0d3ddf76dfb69699c9e7cf163dd83d43a12b3ec893ebc84ed44db1e3b2d992684b2bcab8a2829457cc65c8c195e7f4d0d809bdee6191035848e16019db2de2a4 WHIRLPOOL d86fb53e41d3c2d555906925ede2819e527784628a87476e6a672b185fc9a94055036d966fd94fd72c0f6a31000ac2bfd454d904235f835341ad30b9ff446b50
-MISC ChangeLog 12351 SHA256 e8e6af64b6dae6480d8791d395b27635f04a89c5a2c5104a08f28531e2361314 SHA512 131303173dce250e0ce5d28eebb51a375a0dedd58b55bda8d6adaa3193fef217c6501a19754f3a101c0c9119967ff4e6dd87d5d57825744002b6fb52c1343d38 WHIRLPOOL 52af684001b10af7e3895daa79cbc535aa35f552e95b5bda1494faa7fab0cb5b945fcb2ee921d9abc97d56714b71823bd67931ef5b7dd63a3012ee093856f66f
+MISC ChangeLog 12557 SHA256 b377310761177c31ab41e955e1a83e638d4c48ca3ab3f785a09fc7dfbcde4e6c SHA512 d364f9c749647bc9a3daa67e08ea79d09a598b35620b1971f797739fdc066a5700e5b5c8d0b412aab6766db67cc90a5ef871e1aeba61caae0496413b24d7177a WHIRLPOOL ac4da49c7b67666ba3b9b184b688a25d68ea7234d2556f9f25f34e3014b118ba743574519e93fca6447ba5450c52dd6079c91d873ccf1344cc9309c23bddacf2
 MISC metadata.xml 2172 SHA256 33f7844b022b1966e40b88ae9ebf3441bdcac9638aaeaa756010228e1147c615 SHA512 c9624c45b7062c17a466e296cdb3ba9d6f2d06dc8b42cca468df26d3c3fe2e1e608b9dc720aa71a3e540b59848484604fb490c78ee68b7b8bab37651f9a91383 WHIRLPOOL 8793ec93a1dca9552c2afd325c027296ae66c1a186d54209e01ff5b15ade9851ffbde532cce7d60ba05defa2187cf9920f9816480a1d68ba24cd67c2da5ae0e4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVnF7UAAoJEHy/RO9cNQiDns8P/1AqlgvKPu0LTFR7i8yee2Tz
-HlP85vcQACgQyDza/8aI1faMXuE9gom8MDs1Q7VXCfsD4JR7acvaKrF0QdNcq5AC
-G7fW1TTPO/cQVQp7/M1yut85YaGSYByOVoygwbgIALG9HJg3oANHOtUKUtUnnJDl
-G7V7NAkQg8lCcCiTFymYyK5ABmgUYjHfAB54U+zmkkRXvHmyBCf5zERpipop60Eo
-a1ikZT6ZHrI8dKvam8iQTy8piwLnYhvq610O/2R1D4B00VyzPdIcti2U9Z/2R5VR
-QuGpxq/R6YauPLLUM67HbZHP4WweVilCEje+brm6ahjevUIT8byoDF0fWt90kgzF
-WmgSDTz7XtMpaLa9LeeO6p2x1WXlJwze5Z+sZd4xRcwSv+F3Hs5rY8W9cy3Rg4IT
-7wOVgHQ8juDUiKJ16ZpaDSiz5dtKU+teiqHIdBkcOzdUH9oF7z1czxGFmxxklF+P
-mKB69w0ehTCUkbl4D0HcGsRgd5Fbcb9aQ+uDDjDfjr0emRrDuuWofrE6zNrk97nh
-bxQ0hKDXfl0U0QBcvAUvk16m+HpHWMoIt4exwI9Nec9UbNVpAZvQ6lri6Mqxft9A
-f+RfTjPdpXd9DAPQMrxkCin//Z7JxrzItJV8I5ITxWG4GGaTlVJPK+pL2jiW5cbP
-CLo+3DHn41ZuJ7PbP7GW
-=UF9U
+iQIcBAEBCAAGBQJVnF78AAoJEHy/RO9cNQiDWJgQALHflFqlDgUOU6b3EdHr/XrF
+d8zqzt3+NYsxN/fhZwonlslIbnxQ5Uizzr1OXLaipdYSGy6K3kKfWYxZMZlontxI
+2CqBAId8VOeBENjU/fKFGb8m6qfvBY9vVohqvpIDopglG3zSq7C4YPzom7pMHNrK
+psXLDtilFiNVSKQLc6R29d4FuGTUoIAOHYT5D0OMF5VoW8S7wd7Y3P14Zr977wTg
+qYhMCUcNF0rTwig6fH62uEU/ihBWgJHOrizB2E8nc5I7hNi8zoTmarhCcoYK0vN1
+f9WgcNid6vGU8xGWfavmfBeEf1FlHxujNUfgwkPl5OX0nD+n7AGcRrPKw8xqwPr5
+esqBz8cOV0/5F5lJNfZ2FMrokKaYXoap96rnAzCY/dMW0Q+afO2w8ENwJun6ZIGb
+MKkO4BZaDUgdlVWTYCyzgO03KO+DeOKyS2hdkytzOyFjCRVnubSdair4w2A9bIA2
+YQjqSmrsc0wzzrsW7ZGAcfFUFSEgVbKES8csW6+L5gvjX6lGFuTh1g/KJSQCfBds
+IDoAsLbAn/AFK8lhiGo6fZTZQxK3RObtDTScRMW7znI++r0WTYSfpooZIkhcmB03
+zcAvSqN1SJHTPJeWyMeKZPTD04fXRUN3x09san97KLD/K9jLV2jBHbr85ie7Ug9F
+6DKzBmr89PBJ9gZP+rgl
+=kjIq
 -----END PGP SIGNATURE-----
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):