gentoo resync : 27.10.2018

5 files changed, 30 insertions, 26 deletions

diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest
index fb4c87cb007e..2ce5699d5550 100644
--- a/app-admin/salt/Manifest
+++ b/app-admin/salt/Manifest
@@ -10,7 +10,7 @@ AUX salt-2016.11.0-tmpdir.patch 1480 BLAKE2B c5501459ba32a5ef08317f4e1a247a7ac2a
 AUX salt-2016.3.1-dont-realpath-tmpdir.patch 853 BLAKE2B e78c50d1050adad0d21523229034a24f1fd2c977172f3135dbf09440ed6d7e292f0dd9c267c3277edfe8528bf38d269939d068b4af8671da08c64f5712c0d7e1 SHA512 a6bc22959975ac25df84c54437a1638e95d78c057920ced38b0accddca11eb33ad39f2a43dd05648584cd10b140f7ee509a8c6739c4d89d30500452c91795b79
 AUX salt-2016.3.4-test-nonexist-dirs.patch 1655 BLAKE2B 5e7907e0a10c4ee78b599ec98d38088c97889ae2002602db0c207fb210e2960e7b4b92c08f027854e6dd9205b000bb09e7b243346af755e6824561752e3ef2e9 SHA512 ee81b8104f066e1d161207fe82d8349eb8c40701544784a2b6e66842fe9e07d7edffa24cad8c5d2037e2e7fa0368c614ed177fdf7359c89255d068767968e8fd
 AUX salt-2017.7.0-dont-realpath-tmpdir.patch 834 BLAKE2B e70496f3ab18b954e7cacd29dbdee6ccbe0a07f139903360312db247926867a78513cd9022f492ce370eeafcc81bc4db545359036f8f5b0d2d64d3c5bb8aefc0 SHA512 33b69954e8112c0f76654d507df74a4cdd37e8227848f2ce0652b3ecee8b847253ccad33cada0e3dd1471c54c780dcc12d5e546c4ec43868511b95b0c7f71e17
-AUX salt-2017.7.3-tests.patch 3096 BLAKE2B bde978ec7d9ca3f303e859d8ecc728ee16e6b1753afe2325f95b0938ed2828ac5b3f80ac92451f6ab4bf7f08f141b71df88641da9694828657dd358059df9826 SHA512 0db8e8dffeabd9f7c0c619480425c58f4b58a486e1866062c8a482489bb79fd6f31c06020ed83e1903a346cbacb221ba541a2363d4e983e583313adb4652d22f
+AUX salt-2017.7.8-tests.patch 3303 BLAKE2B 4bce0b82f939a997aca6da94977a261b636e410678c40a50a446813a1704608350ab6e330d3dd7dbf541b373320adcca035d3e2a70e9c626f3bd7f8216bbff6e SHA512 b5ccf399bb62325bb1cf252c9d72296138fded7dc4890695e44c2fb43c5f4f4eec852057ad427ffdfb80124be21d7b5cbe2f7497ff7d9746e09f5ed3a652aba6
 AUX salt-2018.3.2-skip-zeromq-test-that-hangs.patch 2820 BLAKE2B e531bddf576322f8417e7e362bfed7aa21ce8f1edc1702074f250efc9118c755664bd2976282399b725c1f56362e37fa07064b9e4ac2a72c413a56b13d325cdd SHA512 72cbc1e7c8d59883bcbe8130fdbae6e1ccecfabe74069a7389e63f797609930036c593204ab441cff92933d3d35a24feb7db0dc76804d76608190e93a8bc6ed4
 AUX salt-api.service 166 BLAKE2B 32d28ef4ef3c60942bed3fa3a01d70a9af387705844326cdf9339d7c887238a1e6817d78ffd1cb205a6397a2138c2389ea00bf53be84a17b23bea140279bf42c SHA512 bab6b8380c965bf16e23078ebe6f38d942300829d4c89ddf23b630bd57b4d371f80687d85dd9e0cc1b669f2ca882aecde1bc8d7d82382a02ed20e493d3f04702
 AUX salt-master.service 169 BLAKE2B 15e7a4f64cfa75eb8d8576a7d0b61ea0c9937c94fd2130fd6c123a82187f08b5ed533c168a7310fd94d9bd2cecf9d0ba94665c653a971ef61e5e18ffdf087a15 SHA512 87fe27fc0748f4191bd1c6883bb362c95cce8fe1f409e2679b229ddfd9de6c99438859dfa0a47b042977d659029ef56e406f1e8aa01761bff21af4784f9dd5f8
@@ -18,10 +18,10 @@ AUX salt-minion.service 162 BLAKE2B 6f7b6b72e26d1651dbcb324b1e0cfef9f4b5a794f405
 AUX salt-syndic.service 169 BLAKE2B 0d00f20b4663804eaa4b6a1a1b32ed87b04d1f4df6a8e8e0b2a0e3d17f71e1bb53f71f6168446aaf3765692cd540217c4cdf5ab8dd9cb7032801aa798d8a9bc3 SHA512 b45509a22a18f573726a868fda1591eaf42ef44220960dda698274ba8ff1db8cdc302605133ab61b188e15017ba15c5f409f3ee64e026b635ac359eea7aad7d0
 AUX syndic-confd-1 188 BLAKE2B ad20094c30f9aa573397d347f9fb11acafba2f724b6c836d7ec57f10d4182c300a4b0ec572b5f3301174febdfc69c30752c3b0eabdfdf9f4963b03531db23523 SHA512 0051e13351cef8db81dc075a194bb384723f07d5591b5b4d3f3adf4180afaf7beced470ab79ceca9d1ec0dae62dbd72084eb76af009fc78411a011050a94a2ed
 AUX syndic-initd-4 311 BLAKE2B aab3b44f65dedb30ea4eb573872c0253e4d7b438a533f22a4e887c1e6487682efce7f5b75d3bcf366ef706a9fb1578dce537ac5b50324239378cecbd0715ad5d SHA512 69cc10fa7d9f0f4a68d223272c08ee33af242a50eb9bbea919d61f6cb5baf1ce986b07d69fc0e47e2f6dffc0a11100c3bc0d836d2938c46aa364beecb47f07ef
-DIST salt-2016.11.9.tar.gz 10062996 BLAKE2B 5176d04d07a69de21c9c136c201d334614c5675fd78e306a0160fae829b633441cd859f4ba1a0822dfbb9ae716475c53f6eb058187d4acc8a5770dd4ceace577 SHA512 896fd27c111e926e246b51d00b69d41c8f4d25ec0c034c9ff3dc5414f5e93592fd637cdeaecf02b3b98a4e5a7ce478bfda86b15497961078374608d76516593d
-DIST salt-2017.7.7.tar.gz 11131480 BLAKE2B ea01c8894433cf96697c830d58184bfefca52dcd1be9b1c398270acc229886eeb41edf83d1498fc500f23209fc4e56ba8471da88383bd4c1a9338262423477fb SHA512 01cba364e2dcb5021b2b3b738462645c84332bbf31c0fa82f017fc583a097dccde308fd86be54d2b429921f34c89a4a40b942385c3bc139eb11753d155664063
-DIST salt-2018.3.2.tar.gz 12996445 BLAKE2B 8411fb0891e23ce8e35157662a0a45c0c5b13b62f3fd21cc4bbe5152f923a98b27cb5bee4fb8cb3e6ec5c9daed1afa27baf4b570b94f9f40eddc0891f72829e9 SHA512 142ebe13638d7e6dd0aecc9f0325002d30e115fe8688f5f74cbeb7ff21020327d65ded0dcd845e55362b97568b696887fa22243d66d5eadef65f97152d4775d3
-EBUILD salt-2016.11.9-r2.ebuild 4813 BLAKE2B 63f1878b36fd4119ee145b799818fdcb33c8d1dc8c8b81627b03de4141a148d7457a63f6fe7b4b8c9fa00d8a2a3b09e2c844fe0f98252709c13ddfa78be96666 SHA512 40459666f806112619a1326547dfadd6aebf68e275b195744a5d113d92aed707048925467318ee753451cd0856e015b2fb7879bc0e27a7475572d6c99a1489a1
-EBUILD salt-2017.7.7.ebuild 4621 BLAKE2B cdf19dd14e998384dd0ef852ef6b3b8bd7d003c1fd7f63bd0cb7b0386aafdeb71825dbfdea5ebb76f594dca8865d93e350b621d8506f7fa8d4bb2db5e5055e6e SHA512 d93a6c6064af04b1562e67e207c187c31bdb05b7a23808a9e31557a09c445f9ba7ad449d4893c98b031876fa5ae8dc3542f6db12cf898b820bee8c31f16b60fd
-EBUILD salt-2018.3.2.ebuild 4905 BLAKE2B dc24d8c71e442b803a22190ccc3987f3fe4d8c79be3b283ed9d453e8d05a1db4ad483b283a9b39d9886cb076c58efa906e6fae8289091f9ad3916d42125d3128 SHA512 bdaf27fec5d8b3267b22bfd887939397efa36e43d59b7605f8a0a76c606005606eb459c43b0cba37cf6d4f4c67fabf8ea24fce92a4bed0aa786a6fcbceeeac30
+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.3.tar.gz 13953724 BLAKE2B 353f4ee23747f02200116157823b038fc8d361fb88f5f531a147d6c81497ba3f6cebf5a5abf4ac7f81199439bbf8a9cc46e03cdd76bfbb3c39f2b31a6158ca5c SHA512 f00ed83d5ec9d4767d7215fae8569ec560db61a0c8ded17469026e682e367c19811d33c6c53590a275ee24ad897a0eac09d8fde8ae9320d8706d6459ff3cc6da
+EBUILD salt-2016.11.10.ebuild 4810 BLAKE2B 988791356df3888838548cf8c5c8e76214bd7e985e32b1472877f60f74e907d7c5e4809c9178ff4e2bf0e71a29559acd84b54e7c0cb18b391147275138d90f7a SHA512 17468f174cb6dafd9841b6ecdc34278f586b28e3d4c41b6d5c12fbe3ab4c4e7695f00f6b62bfbddd980271059fac46030eecf7e7d6c44bd24e040034fa33fdb3
+EBUILD salt-2017.7.8.ebuild 4618 BLAKE2B 93d385676d3ae8c059c3d5391e0bee4624478b3e1946b08eb35e366e5fc4f86f7930fbcf27462edfaf09e4a3885fdab49bf729a7dbdb318d4df1155e3c26640f SHA512 1caa2092a3b8f9a8b2c85971ccde4047e0a6496f2d919980570f618496abb5f164414a2214a27c422e649fbf6edaba32cc94ea4bf1c08af8e19367801b15e7c6
+EBUILD salt-2018.3.3.ebuild 4909 BLAKE2B 0b7c998de374ff0dbff7b645652227b7dd8e392f868430b9746b1c891aa2c94f3afb528d1117b43d107b6404843508308ebe1e743aca8de3209a710fddae6ff7 SHA512 4a98eed9ab8791b32a048d83b15a8ce667cef21c472cbc03b79c57317cbf95ef192565c99f1d61f62afcd1a7f737d71b8493647a5c89ca0f16ceaa304964888b
 MISC metadata.xml 2288 BLAKE2B dbe7f76af8cd8a97d852536684e914e3759bd1f17e4bdea3c8c16da7c6485eee08151a8d4e41919c1ae89ba4f786783f899e23147159a4bade0009c7a668f741 SHA512 fdcea2f80fc87ab2a0db1643d71dd6d54e91d898594570af6a7505343c5d9a5a0ce4803d11460d7d3f6f533509b072819f958cbe31ca9183fabf811982526969
diff --git a/app-admin/salt/files/salt-2017.7.3-tests.patch b/app-admin/salt/files/salt-2017.7.8-tests.patch
index 9399bf873349..e428108c4614 100644
--- a/app-admin/salt/files/salt-2017.7.3-tests.patch
+++ b/app-admin/salt/files/salt-2017.7.8-tests.patch
@@ -1,25 +1,29 @@
 diff --git a/tests/unit/fileserver/test_roots.py b/tests/unit/fileserver/test_roots.py
-index cc9c8dbce9..a50a240c25 100644
+index 23f3b26874..bf0b55c385 100644
 --- a/tests/unit/fileserver/test_roots.py
 +++ b/tests/unit/fileserver/test_roots.py
-@@ -164,12 +164,6 @@ class RootsTest(TestCase, AdaptedConfigurationTestCaseMixin, LoaderModuleMockMix
+@@ -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):
--        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'})
--
+-        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):
  
+ class RootsLimitTraversalTest(TestCase, AdaptedConfigurationTestCaseMixin):
 diff --git a/tests/unit/modules/test_inspect_collector.py b/tests/unit/modules/test_inspect_collector.py
-index 0d37519a9e..c18be8d592 100644
+index c2a86d9e5e..421cab9b52 100644
 --- a/tests/unit/modules/test_inspect_collector.py
 +++ b/tests/unit/modules/test_inspect_collector.py
-@@ -59,44 +59,6 @@ class InspectorCollectorTestCase(TestCase):
+@@ -61,44 +61,6 @@ class InspectorCollectorTestCase(TestCase):
              inspector.pidfile,
              os.sep + os.sep.join(['foo', 'pid', 'bar.pid']))
  
diff --git a/app-admin/salt/salt-2016.11.9-r2.ebuild b/app-admin/salt/salt-2016.11.10.ebuild
index 7647ba045387..bf91e90ffefa 100644
--- a/app-admin/salt/salt-2016.11.9-r2.ebuild
+++ b/app-admin/salt/salt-2016.11.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,7 @@ if [[ ${PV} == 9999* ]]; then
 	KEYWORDS=""
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~x86 ~amd64"
+	KEYWORDS="~amd64 ~x86"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/app-admin/salt/salt-2017.7.7.ebuild b/app-admin/salt/salt-2017.7.8.ebuild
index bb76353c1a4d..af04cbe98e20 100644
--- a/app-admin/salt/salt-2017.7.7.ebuild
+++ b/app-admin/salt/salt-2017.7.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,7 @@ if [[ ${PV} == 9999* ]]; then
 	KEYWORDS=""
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~x86 ~amd64"
+	KEYWORDS="~amd64 ~x86"
 fi
 
 LICENSE="Apache-2.0"
@@ -94,7 +94,7 @@ RESTRICT="x86? ( test )"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-2017.7.0-dont-realpath-tmpdir.patch"
-	"${FILESDIR}/${PN}-2017.7.3-tests.patch"
+	"${FILESDIR}/${PN}-2017.7.8-tests.patch"
 )
 
 python_prepare() {
diff --git a/app-admin/salt/salt-2018.3.2.ebuild b/app-admin/salt/salt-2018.3.3.ebuild
index fff0c84f2aca..c66e94d5e7aa 100644
--- a/app-admin/salt/salt-2018.3.2.ebuild
+++ b/app-admin/salt/salt-2018.3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,7 @@ if [[ ${PV} == 9999* ]]; then
 	KEYWORDS=""
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~x86 ~amd64"
+	KEYWORDS="~amd64 ~x86"
 fi
 
 LICENSE="Apache-2.0"
@@ -96,14 +96,14 @@ RESTRICT="x86? ( test )"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-2017.7.0-dont-realpath-tmpdir.patch"
-	"${FILESDIR}/${PN}-2017.7.3-tests.patch"
+	"${FILESDIR}/${PN}-2017.7.8-tests.patch"
 	"${FILESDIR}/${PN}-2018.3.2-skip-zeromq-test-that-hangs.patch"
 )
 
 python_prepare() {
 	# remove tests with external dependencies that may not be available
 	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/modules/test_{file,boto_{vpc,secgroup,elb}}.py || die
 	rm tests/unit/states/test_boto_vpc.py || die
 	rm tests/unit/modules/test_{kubernetes,vsphere}.py || die