Version bump, remove old.

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

6 files changed, 25 insertions, 238 deletions

diff --git a/app-admin/salt/ChangeLog b/app-admin/salt/ChangeLog
index fbdfd168a1d1..5ad7671c8eaf 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.65 2015/06/04 21:51:36 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/ChangeLog,v 1.66 2015/07/07 23:20:43 chutzpah Exp $
+
+*salt-2015.5.3 (07 Jul 2015)
+
+  07 Jul 2015; Patrick McLean <chutzpah@gentoo.org> +salt-2015.5.3.ebuild,
+  -files/salt-2015.5.2-timezone-test-gentoo.patch, -salt-2014.1.13.ebuild,
+  -salt-2015.5.0.ebuild, -salt-2015.5.2.ebuild:
+  Version bump, remove old.
 
 *salt-2015.5.2 (04 Jun 2015)
 
diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest
index 5e5cf94ecf47..9e8e81f8fab0 100644
--- a/app-admin/salt/Manifest
+++ b/app-admin/salt/Manifest
@@ -18,7 +18,6 @@ AUX salt-2014.7.1-remove-pydsl-includes-test.patch 3605 SHA256 0f0433f63a1b4a1a2
 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-2015.5.2-timezone-test-gentoo.patch 662 SHA256 6b5cd37469c894d4426d2cce734bec50d2691b20767ae4e76d8bc64f97bc833a SHA512 8be1388f33f38b8532885416bef52936558bb8bccb04516908aa60927d975f3fd04d3dfdf7cf9dd23daa9fc77f2a8ed0b2c058acdddfecef3af7a839c31534fa WHIRLPOOL b5163e5ef18cf500eb2db58d5aae3cc99c472321eb112bddeabe263789716d2e1378d0e81a01446fb3916cd773b9553434a45a418b06b48a629625d05c30806e
 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
@@ -26,36 +25,32 @@ 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
 AUX syndic-initd-4 422 SHA256 7c3fe247d36f47e998e70e0715e6dc58df54e9b9bd5cead577884bb74461809e SHA512 82507e1e541e43d3c6aa6ac1d6d8d0f8ceddbd530b62a93d1e2b400479995ee26760a00892e105b829617e7a6e930a3b042d3d499e76e07419adea7c23d56ff2 WHIRLPOOL 8c8b4734be0708997dac0d4e54415114790b9e54ead18de029d68c02f4561d1c8ddc93084b9623ef931801059cb4135ee73b60aa0d3cbc56a43f9747be30574f
-DIST salt-2014.1.13.tar.gz 2846659 SHA256 0ab37478e18e6490eccef4deb9f77a20c99ffcc6f97b48e25eb546f8b73f3c22 SHA512 967f7759cbeb55dba0842c8f6efa281a28afa3e9ad7fd0771c587629e8e601cdaf440573e2453e1f21ec3dafa01f0b042ecbd1faa515c9d088cefb19f6ce6629 WHIRLPOOL d992900416f55f857f7685b2110fad6aa43e5859005259dc7db66853aa57c74a8ac06c1894d4c4bf26959c61ccacdff3273c1cbf18039ec005d36fffbc30fbbb
 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-2015.5.2.tar.gz 5049112 SHA256 7a1432c2fa21a71cab2a4688b74dd116f0cc93d4b2f2b001246499fa00bbff2a SHA512 7f5ecce6ce2c8599fe85557a5f445460d1d4b7acc38fff09bcea22a8c4788d330b99d35caa37c7e7ed6c32a945bcd8698f5cd12170d1eeb5c0d94cd0e00ff9aa WHIRLPOOL 80630f3f2e241f49d59c6db24b4d73f4aa4c977627710a1bf286357ef9d24bcca7a3b7d5685b670681d14df9ccbf61990918d699ab562c52fb827795ed60f0b2
+DIST salt-2015.5.3.tar.gz 5389038 SHA256 f8b04dc8bd4b00ce803d31ce5fba033c2f20fa38cdc5a3bf54b4c47362fbe853 SHA512 61203cb9b82fe8ab84fa36d06f442aebcf5c5decfacb99f8df6b52320979699d168f9df7e9e675a13a8078feabbe9210a40e526627a213239760ea43d85f1298 WHIRLPOOL 160455263ee1a95faec1f03dfcd16f9b811e5ecb961a2db5c9545070ed74786c83592e008c1ed70a6ea358ba2491128d6081d57bf7c0a679bb99abb1555bbd21
 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-2015.5.2.ebuild 3948 SHA256 84928d1ef2f3a080790c2c0d10e9195665876c651b2917aa89f6fd788bda7f25 SHA512 d1fd0a3d8ef32292e2289a88bfe2205d94f23ea40ea9d2b8a2dbbef81c1345ebe0a090af57623270e9db988535184177bb5ecbca6a5a84c2914e0a6668edd7d9 WHIRLPOOL a08255d491da8637a757ca84780aae82fb1ce90cde92b3b73f7efdd761b0af0bcb2a164f10da21041c2b6cd30c48956e648494eab1e0c11271b30b8953193906
+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 12094 SHA256 2c08ede9410791c2f47ce474080cecac1eaf1685fbd1f004455e5031ecb74d46 SHA512 a44447ceea2ac012155cab98acf981aa53f6c7b3125771f1c54605f4e16fc3695de2eb4d461b51ee6b6f247c55ad068fcecf7e73bde117cc5af5e852b0d6fc3a WHIRLPOOL 0f1c6bb9a651bb1a3b0594f8ed831a95e9d5abe1ed81be6ed1a173b16495d63a2f2a2af3bf04ba679d1ac0b8e7e7839c8cdafdec386a4cad564598d2386157e4
+MISC ChangeLog 12351 SHA256 e8e6af64b6dae6480d8791d395b27635f04a89c5a2c5104a08f28531e2361314 SHA512 131303173dce250e0ce5d28eebb51a375a0dedd58b55bda8d6adaa3193fef217c6501a19754f3a101c0c9119967ff4e6dd87d5d57825744002b6fb52c1343d38 WHIRLPOOL 52af684001b10af7e3895daa79cbc535aa35f552e95b5bda1494faa7fab0cb5b945fcb2ee921d9abc97d56714b71823bd67931ef5b7dd63a3012ee093856f66f
 MISC metadata.xml 2172 SHA256 33f7844b022b1966e40b88ae9ebf3441bdcac9638aaeaa756010228e1147c615 SHA512 c9624c45b7062c17a466e296cdb3ba9d6f2d06dc8b42cca468df26d3c3fe2e1e608b9dc720aa71a3e540b59848484604fb490c78ee68b7b8bab37651f9a91383 WHIRLPOOL 8793ec93a1dca9552c2afd325c027296ae66c1a186d54209e01ff5b15ade9851ffbde532cce7d60ba05defa2187cf9920f9816480a1d68ba24cd67c2da5ae0e4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVcMhwAAoJEHy/RO9cNQiDaOAP/RMW5TNj18Uc6onirbO6/BJp
-dHKqXXJMvSi5M3Me+9BV3xdcdbLQV0vU69ZhFEm3JIwV0AOQXw879rA/99nQ5KHM
-9QqtF61+KQMKUdfFBWQLOdMncknlcJP4PUeXJUf/RWXfBTwQT1KSnQhPEvSZ9xJW
-KLoAE17txQWhtkdlmGs+JRMSmTu1gHOMNp+EZz4KS7mq++29zko1118bB7x23uAm
-Fg9EJQwN5DM2/Awl+aHfyeANHGhZWOWyoEdXNk3v7I9M3iSgqpdrfo1fJFIu3E63
-j/pnTe1wovZEwSi6kpFOGNEJVFe6yyEIwVwjosLmzDZPWx+KENUDfA9GumAbJNCr
-sAtRUX6vZ1GAHW7GpRVnjEvujwgIZlSdDwnQRvciS4pP3wanO0G8OLZBn4t3rNp5
-ET3QYcDqQYE0NNZG+zF7VQnROF6y/N4sUREaiK7V+Yd4dLcBWwpBKs3hTZfhJgeu
-JPiwy6NXhCzaqp70X9nxJjNfy1vza1/mWEZ8io3CySBgN8xYzw1M6VtlY6ABmf34
-qQk0kAQlfKHpKs54h3jFPl5vho9F5RKirYSMHRG3j57fQLZHEnkeX+tsQmfDpjNB
-Jw457dr0Fzfz9k2Ss3RoaowXcN9Liys7suIqx7On+V3fyT1zzd4w7sNuxVqne9V5
-ktfkCxxKVT3gh8xeezDH
-=qnEJ
+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
 -----END PGP SIGNATURE-----
diff --git a/app-admin/salt/files/salt-2015.5.2-timezone-test-gentoo.patch b/app-admin/salt/files/salt-2015.5.2-timezone-test-gentoo.patch
deleted file mode 100644
index 5001b097efe8..000000000000
--- a/app-admin/salt/files/salt-2015.5.2-timezone-test-gentoo.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/tests/unit/modules/timezone_test.py b/tests/unit/modules/timezone_test.py
-index 941e730..de9b9eb 100644
---- a/tests/unit/modules/timezone_test.py
-+++ b/tests/unit/modules/timezone_test.py
-@@ -57,7 +57,7 @@ class TimezoneTestCase(TestCase):
-                     self.assertEqual(timezone.get_zone(), '#\nA')
- 
-                 with patch.dict(timezone.__grains__, {'os_family': 'Gentoo'}):
--                    self.assertEqual(timezone.get_zone(), '')
-+                    self.assertEqual(timezone.get_zone(), '#\nA')
- 
-             with patch.dict(timezone.__grains__, {'os_family': 'FreeBSD'}):
-                 with patch.object(os, 'readlink',
diff --git a/app-admin/salt/salt-2014.1.13.ebuild b/app-admin/salt/salt-2014.1.13.ebuild
deleted file mode 100644
index 858390043802..000000000000
--- a/app-admin/salt/salt-2014.1.13.ebuild
+++ /dev/null
@@ -1,85 +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.1.13.ebuild,v 1.4 2015/04/17 21:29:28 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-2
-	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=""
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="ldap libcloud libvirt mako mongodb mysql openssl redis timelib test"
-
-RDEPEND=">=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}]
-		dev-python/msgpack[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/m2crypto[${PYTHON_USEDEP}]
-		dev-python/pycrypto[${PYTHON_USEDEP}]
-		dev-python/pycryptopp[${PYTHON_USEDEP}]
-		dev-python/jinja[${PYTHON_USEDEP}]
-		dev-python/setuptools[${PYTHON_USEDEP}]
-		libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] )
-		sys-apps/pciutils
-		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}] )
-		mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
-		mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
-		redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
-		timelib? ( dev-python/timelib[${PYTHON_USEDEP}] )"
-DEPEND="test? (
-			dev-python/pip
-			dev-python/virtualenv
-			dev-python/timelib
-			>=dev-python/SaltTesting-2014.4.24
-			${RDEPEND}
-		)"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2014.1.2-tests-nonroot.patch"
-	"${FILESDIR}/${PN}-2014.1.5-tests-nonroot.patch"
-)
-DOCS=(README.rst AUTHORS)
-
-python_prepare() {
-	sed -i '/install_requires=/ d' setup.py || die "sed failed"
-
-	# 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 conf/*
-}
-
-python_test() {
-	# testsuite likes lots of files
-	ulimit -n 3072
-	USE_SETUPTOOLS=1 SHELL="/bin/bash" TMPDIR=/tmp ./tests/runtests.py --unit-tests --no-report --verbose || die
-}
diff --git a/app-admin/salt/salt-2015.5.2.ebuild b/app-admin/salt/salt-2015.5.2.ebuild
deleted file mode 100644
index ece57145d66b..000000000000
--- a/app-admin/salt/salt-2015.5.2.ebuild
+++ /dev/null
@@ -1,117 +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-2015.5.2.ebuild,v 1.1 2015/06/04 21:51:36 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.2-timezone-test-gentoo.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"
-}
diff --git a/app-admin/salt/salt-2015.5.0.ebuild b/app-admin/salt/salt-2015.5.3.ebuild
index 719a885b73ff..a960a214b946 100644
--- a/app-admin/salt/salt-2015.5.0.ebuild
+++ b/app-admin/salt/salt-2015.5.3.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-2015.5.0.ebuild,v 1.1 2015/05/06 22:27:59 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/salt-2015.5.3.ebuild,v 1.1 2015/07/07 23:20:43 chutzpah Exp $
 
 EAPI=5
 PYTHON_COMPAT=(python2_7)