gentoo resync : 07.07.2018

5 files changed, 97 insertions, 20 deletions

diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest
index c337250d07d8..fb4c87cb007e 100644
--- a/app-admin/salt/Manifest
+++ b/app-admin/salt/Manifest
@@ -11,6 +11,7 @@ AUX salt-2016.3.1-dont-realpath-tmpdir.patch 853 BLAKE2B e78c50d1050adad0d215232
 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-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
 AUX salt-minion.service 162 BLAKE2B 6f7b6b72e26d1651dbcb324b1e0cfef9f4b5a794f40566297c5bc469b351587db4d9805bed124774107efb64e6ed3e25fefa899b42a38064ee6fe26fd990ae58 SHA512 99f0a5c696e38b42b283416736a23e535ccc53095928b205914cf4b69c0df931a6752205985726527f7889b01dfece78466be28448458b15064edd04aca3e5ed
@@ -18,9 +19,9 @@ AUX salt-syndic.service 169 BLAKE2B 0d00f20b4663804eaa4b6a1a1b32ed87b04d1f4df6a8
 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.5.tar.gz 11043026 BLAKE2B 9cae4e6ca3b0bac0dc0b9b9a5ae01e0bfb8e8b899aa029b324ac10c8c84024bbc419ace068cd0d2bff84ec6ddf1d13faf68ce34c68c19892c700c38e81da8c7c SHA512 684ffde7d98c73349b386c94de3d9fc09631a78c5d74e37e6dfd90fbb0c94decc529f56b1eba1559ce9932b16083f88e6495ff6cdf071b32a23028e9db47cc3d
-DIST salt-2018.3.0.tar.gz 13448567 BLAKE2B 9048f9e507ded238bfd54d0aabfefb56522b20ba2479c3bf5aefc47fff0b6ce516709ad6e9109441941a60596d4f06a43c1448a149225f3f87715327a190d313 SHA512 3d64a4d12d4ff7effe644b682b138d8f49fd00523e9cfe3e80bebff9c944a089fb41cbac92e63139633425f49c1eebeb99145290a0bdd1b4f306da86abe9b2e5
-EBUILD salt-2016.11.9-r1.ebuild 4715 BLAKE2B 32ce9ffe4698b20c9d0d73acc56ed01cf9bcc232c14b509a406f31ddadceed70e30ecd03368768f7e2c41e280adb5a8486e825d4597bbbff309f73e3b724b8c4 SHA512 e0a194c95bdc17e92d481612f171876925aea54eead946206e4b65632bde29b4da15d8ea7951e617aebf888958d708f5f3c9a6fde0004d56822ad6da8fcc209f
-EBUILD salt-2017.7.5.ebuild 4727 BLAKE2B 2b1a53cca64ed98ae9999f84bbb7da5dafad5e9b74b4248bf3728a07db3bff77c5ac959ebadb907ae31a15569390c2f01bfe288ea296e7f27df169258643836c SHA512 013670dec20115ca9e23e8f545abd3dbd66af5ab1b09a4c6118f3106caa2747b3000ffa47928427a5b8690e1e9bb647e44f8000275dcc07cee949915b3821ea4
-EBUILD salt-2018.3.0.ebuild 4892 BLAKE2B dffbb8de5ed43477c02b177e80528ed2c51f66e59f033da4d7e57bc2af13dab6a854cc3025d4cdcd63446ed7f873e3db1f2216bfe82802428d6d5f0fc598088c SHA512 8862e90908e207ef72fa7783739a279cf8315de4c2c76fb3624043cfd0e8f8adb23885d40a7e66b2dce26a1c7f1b9f55b86e5a8c0a5dd51ca53575d0dc13d497
+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
 MISC metadata.xml 2288 BLAKE2B dbe7f76af8cd8a97d852536684e914e3759bd1f17e4bdea3c8c16da7c6485eee08151a8d4e41919c1ae89ba4f786783f899e23147159a4bade0009c7a668f741 SHA512 fdcea2f80fc87ab2a0db1643d71dd6d54e91d898594570af6a7505343c5d9a5a0ce4803d11460d7d3f6f533509b072819f958cbe31ca9183fabf811982526969
diff --git a/app-admin/salt/files/salt-2018.3.2-skip-zeromq-test-that-hangs.patch b/app-admin/salt/files/salt-2018.3.2-skip-zeromq-test-that-hangs.patch
new file mode 100644
index 000000000000..7b94fafd447d
--- /dev/null
+++ b/app-admin/salt/files/salt-2018.3.2-skip-zeromq-test-that-hangs.patch
@@ -0,0 +1,79 @@
+diff --git a/tests/unit/transport/test_zeromq.py b/tests/unit/transport/test_zeromq.py
+index ccb337462e..97d2962e5e 100644
+--- a/tests/unit/transport/test_zeromq.py
++++ b/tests/unit/transport/test_zeromq.py
+@@ -45,6 +45,10 @@ ON_SUSE = False
+ if 'SuSE' in linux_distribution(full_distribution_name=False):
+     ON_SUSE = True
+ 
++ON_GENTOO = False
++if 'Gentoo' in linux_distribution(full_distribution_name=False):
++    ON_GENTOO = True
++
+ 
+ class BaseZMQReqCase(TestCase, AdaptedConfigurationTestCaseMixin):
+     '''
+@@ -122,63 +126,6 @@ class BaseZMQReqCase(TestCase, AdaptedConfigurationTestCaseMixin):
+         return payload, {'fun': 'send_clear'}
+ 
+ 
+-class ClearReqTestCases(BaseZMQReqCase, ReqChannelMixin):
+-    '''
+-    Test all of the clear msg stuff
+-    '''
+-    def setUp(self):
+-        self.channel = salt.transport.client.ReqChannel.factory(self.minion_config, crypt='clear')
+-
+-    def tearDown(self):
+-        del self.channel
+-
+-    @classmethod
+-    @tornado.gen.coroutine
+-    def _handle_payload(cls, payload):
+-        '''
+-        TODO: something besides echo
+-        '''
+-        raise tornado.gen.Return((payload, {'fun': 'send_clear'}))
+-
+-
+-@flaky
+-@skipIf(ON_SUSE, 'Skipping until https://github.com/saltstack/salt/issues/32902 gets fixed')
+-class AESReqTestCases(BaseZMQReqCase, ReqChannelMixin):
+-    def setUp(self):
+-        self.channel = salt.transport.client.ReqChannel.factory(self.minion_config)
+-
+-    def tearDown(self):
+-        del self.channel
+-
+-    @classmethod
+-    @tornado.gen.coroutine
+-    def _handle_payload(cls, payload):
+-        '''
+-        TODO: something besides echo
+-        '''
+-        raise tornado.gen.Return((payload, {'fun': 'send'}))
+-
+-    # TODO: make failed returns have a specific framing so we can raise the same exception
+-    # on encrypted channels
+-    #
+-    #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+-    #
+-    # WARNING: This test will fail randomly on any system with > 1 CPU core!!!
+-    #
+-    #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+-    def test_badload(self):
+-        '''
+-        Test a variety of bad requests, make sure that we get some sort of error
+-        '''
+-        # TODO: This test should be re-enabled when Jenkins moves to C7.
+-        # Once the version of salt-testing is increased to something newer than the September
+-        # release of salt-testing, the @flaky decorator should be applied to this test.
+-        msgs = ['', [], tuple()]
+-        for msg in msgs:
+-            with self.assertRaises(salt.exceptions.AuthenticationError):
+-                ret = self.channel.send(msg, timeout=5)
+-
+-
+ class BaseZMQPubCase(AsyncTestCase, AdaptedConfigurationTestCaseMixin):
+     '''
+     Test the req server/client pair
diff --git a/app-admin/salt/salt-2016.11.9-r1.ebuild b/app-admin/salt/salt-2016.11.9-r2.ebuild
index 9376c0488269..7647ba045387 100644
--- a/app-admin/salt/salt-2016.11.9-r1.ebuild
+++ b/app-admin/salt/salt-2016.11.9-r2.ebuild
@@ -49,7 +49,10 @@ RDEPEND="sys-apps/pciutils
 	)
 	zeromq? (
 		>=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/pycrypto-2.6.1[${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}] )
@@ -96,6 +99,7 @@ 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
diff --git a/app-admin/salt/salt-2017.7.5.ebuild b/app-admin/salt/salt-2017.7.7.ebuild
index 90c568f5533f..bb76353c1a4d 100644
--- a/app-admin/salt/salt-2017.7.5.ebuild
+++ b/app-admin/salt/salt-2017.7.7.ebuild
@@ -28,7 +28,6 @@ IUSE+=" openssl portage profile redis selinux test timelib raet +zeromq vim-synt
 RDEPEND="sys-apps/pciutils
 	dev-python/jinja[${PYTHON_USEDEP}]
 	>=dev-python/msgpack-0.3[${PYTHON_USEDEP}]
-	<dev-python/msgpack-0.5.5[${PYTHON_USEDEP}]
 	dev-python/pyyaml[${PYTHON_USEDEP}]
 	dev-python/markupsafe[${PYTHON_USEDEP}]
 	>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
@@ -51,10 +50,7 @@ RDEPEND="sys-apps/pciutils
 	)
 	zeromq? (
 		>=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}]
-		|| (
-			dev-python/pycryptodome[${PYTHON_USEDEP}]
-			>=dev-python/pycrypto-2.6.1[${PYTHON_USEDEP}]
-		)
+		dev-python/pycryptodome[${PYTHON_USEDEP}]
 	)
 	cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] )
 	mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
diff --git a/app-admin/salt/salt-2018.3.0.ebuild b/app-admin/salt/salt-2018.3.2.ebuild
index a9d68684042c..fff0c84f2aca 100644
--- a/app-admin/salt/salt-2018.3.0.ebuild
+++ b/app-admin/salt/salt-2018.3.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit eutils systemd distutils-r1
 
@@ -29,7 +29,6 @@ RDEPEND="sys-apps/pciutils
 	dev-python/jinja[${PYTHON_USEDEP}]
 	dev-python/libnacl[${PYTHON_USEDEP}]
 	>=dev-python/msgpack-0.3[${PYTHON_USEDEP}]
-	<dev-python/msgpack-0.5.5[${PYTHON_USEDEP}]
 	dev-python/pyyaml[${PYTHON_USEDEP}]
 	dev-python/markupsafe[${PYTHON_USEDEP}]
 	>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
@@ -52,10 +51,7 @@ RDEPEND="sys-apps/pciutils
 	)
 	zeromq? (
 		>=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}]
-		|| (
-			dev-python/pycryptodome[${PYTHON_USEDEP}]
-			>=dev-python/pycrypto-2.6.1[${PYTHON_USEDEP}]
-		)
+		dev-python/pycryptodome[${PYTHON_USEDEP}]
 	)
 	cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] )
 	mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
@@ -66,10 +62,10 @@ RDEPEND="sys-apps/pciutils
 		)
 	)
 	keyring? ( dev-python/keyring[${PYTHON_USEDEP}] )
-	mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
+	mysql? ( dev-python/mysql-python[$(python_gen_usedep 'python2*')] )
 	redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
 	selinux? ( sec-policy/selinux-salt )
-	timelib? ( dev-python/timelib[${PYTHON_USEDEP}] )
+	timelib? ( dev-python/timelib[$(python_gen_usedep 'python2*')] )
 	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}] )
@@ -84,7 +80,7 @@ DEPEND="dev-python/setuptools[${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/timelib[$(python_gen_usedep 'python2*')]
 		>=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}]
@@ -101,6 +97,7 @@ RESTRICT="x86? ( test )"
 PATCHES=(
 	"${FILESDIR}/${PN}-2017.7.0-dont-realpath-tmpdir.patch"
 	"${FILESDIR}/${PN}-2017.7.3-tests.patch"
+	"${FILESDIR}/${PN}-2018.3.2-skip-zeromq-test-that-hangs.patch"
 )
 
 python_prepare() {