gentoo resync : 15.12.2019

3 files changed, 27 insertions, 7 deletions

diff --git a/dev-python/coverage/Manifest b/dev-python/coverage/Manifest
index d68eadd7ab51..73d34e8d1be4 100644
--- a/dev-python/coverage/Manifest
+++ b/dev-python/coverage/Manifest
@@ -1,8 +1,8 @@
-AUX coverage-4.5.4-tests.patch 4122 BLAKE2B d720f526a171da06b54f6433235875148cf9c5b9f7660afa61eb48811c1c1c61cf57de49a37612f01277d03ed7a4d5473ac9bcda4a326e5be9c02d6062499abd SHA512 14b07e98c59600c2a6a8ef6bea61a80a5129fa034b5ecb87fca67a1ee784bc2d7a62256c2776e9600b3e1a076ffbd0d002187379f773715e9c536ec02e07b0fa
+AUX coverage-4.5.4-tests.patch 5117 BLAKE2B 2a0642f71b8504d542e97fdd3258670c0c505e66100962fb63cc876a3666ba3ba21f3b03fcc664661fce030e57b67e9309c379cd2e82ec3abb79abea3aee8844 SHA512 22caa44eb8e114ddf997d7cce1d762b7140422954df4155e1282a58ee9a79a69c102fd0790a80459f65d1d9313ad38a449118e7254aa1d7751e6abd2eaff9862
 DIST coverage-4.2.tar.gz 359873 BLAKE2B 4bca9c44922ad99203d65387267c62bee02b0368dfd70c758dbed959ebaa1352366603359865662cde863ca1518de21a4d33d22b86b78ff75c2c23aecf4d726c SHA512 17c508e65e8494bda51dc301eb99e24f39392cc3efe54eee5d94bf45021f91cb5e1acc192981974eb1725e01cd4590c80308bf9bb237a129c2de067bd4556e23
 DIST coverage-4.5.2.tar.gz 384845 BLAKE2B a7b4f249a68e025449d26ef8ee2194b9ce355c979d1f5192a7863a0ab0089f9deb3a8e63a39bef528ed7c58fbcc7cd4bc193fea3a135f5996a6655268a6b7a93 SHA512 0d98c8118648a319ac6f3b4c4c6f1ff8a92085bbe8276dd5504c8df4638933f920d7382d8e6de8e16bff43b62091310e0eab7b7722c6d28c976baedbfae3d03e
 DIST coverage-4.5.4.tar.gz 385185 BLAKE2B 9d040bff13cebd1cb7147f15c3ec03bb08648cf801b5b2bb046a6b5bcadb3d3886be8bf0a624d225f25d10a5ca82fe5fb88f55e44e92a0a3285836b837972970 SHA512 ba534e04fe35cbadc4b16735f25c08f579a49a6677ec106680f222f2dfb3d0f1e011d0962f1c2108c375173ac4588bea1619ecda05ff9ba6fd888daddfd27b0e
 EBUILD coverage-4.2.ebuild 1245 BLAKE2B ccd13bc4859a329781600fc33c74d6d40c12df18b1552eaeed4d6ef7eb1571f3ae51252cdcfb87de051647bfc4c3831a4e81fe6d09e5954b3d044d57be7576c7 SHA512 75a189500516f4f677410a9df61588ae256a246b3239b1c78f1ec04be5750238710871a39cd928a7f3bcd352025a72a2c3defcaa181ea6f65e82da92fd24a133
 EBUILD coverage-4.5.2.ebuild 1244 BLAKE2B 39420d4e3a6ec6f67391f9ee9f7824b28873c7ccdc4ab9515eef1b98d46a21e04d41536bf307326caea6d5d122344c5a16b8731cfee23d3246d34ef40228f8e1 SHA512 20e59c9a860d4d7d8eb914f2278f46186a4fc9f87824fbceda4869779eb82814dba2f6c98157da116df32cc871d9cbc15e459f190527544c9b58149be9b39fb2
-EBUILD coverage-4.5.4.ebuild 1697 BLAKE2B 7aa8c05eb0153992812c30adb4773f92815ac1164c51240c7bb4bb3573f9268d79b06583df634923ccfc117421cad004195990d2cead4cf9038d01d5a245524f SHA512 5b8b6bfe8935ee95735c2a3e5c59d03605bd443ccdb6c098c28583d6c568b9f8ba847fd5bc4902369a93515974f1dd5a7c537f2a1ff84504ef9a098748b2df29
+EBUILD coverage-4.5.4.ebuild 1724 BLAKE2B c354a8f3d927e387f1710e8d537f80f7b85f1e8efe6542d82730538f20b8cb04c72412b829130861c756a6e1a5e896eda10686a88f76e37ad5ec07a929926725 SHA512 dd8d4797250e9f51ee0d046ae2603b8cbc5297ef051be01922ca994aeccd90d5990581b72dd1538e3c339fdc709b9e1a251375d2e936e37f62cb6a65241d2c07
 MISC metadata.xml 713 BLAKE2B af0e3d7e3b503581edb2552d0eaddcc9cf3ea5cb92db247cbae4dc66edfb1da6608f472cd2e76e1c17537b6907b991fbf2b4c250792ba6654fd0d4924da599db SHA512 d836604218fc48fd477b27744c6f97a40c3102b859b25e327cd0775ecc54390db62c9f4096c8c54af26557c38dd48ae138a8bed742aaa759572189974522ede5
diff --git a/dev-python/coverage/coverage-4.5.4.ebuild b/dev-python/coverage/coverage-4.5.4.ebuild
index e0198d5dd4ea..c3ce1a9f6d65 100644
--- a/dev-python/coverage/coverage-4.5.4.ebuild
+++ b/dev-python/coverage/coverage-4.5.4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
+PYTHON_COMPAT=( python{2_7,3_{5,6,7,8}} pypy{,3} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~mips ~sparc"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/coverage/files/coverage-4.5.4-tests.patch b/dev-python/coverage/files/coverage-4.5.4-tests.patch
index 193c4e88ef91..779102c8f658 100644
--- a/dev-python/coverage/files/coverage-4.5.4-tests.patch
+++ b/dev-python/coverage/files/coverage-4.5.4-tests.patch
@@ -15,7 +15,7 @@ index 0370cf84..4e3cf1ca 100644
  
  clean("out_timid")
 diff --git a/tests/test_concurrency.py b/tests/test_concurrency.py
-index 578cc679..ae340099 100644
+index 578cc679..c875be86 100644
 --- a/tests/test_concurrency.py
 +++ b/tests/test_concurrency.py
 @@ -11,6 +11,7 @@ import time
@@ -26,7 +26,27 @@ index 578cc679..ae340099 100644
  import coverage
  from coverage import env
  from coverage.backward import import_local_file
-@@ -271,6 +272,7 @@ class ConcurrencyTest(CoverageTest):
+@@ -255,22 +256,27 @@ class ConcurrencyTest(CoverageTest):
+         code = SIMPLE.format(QLIMIT=self.QLIMIT)
+         self.try_some_code(code, "thread", threading)
+ 
++    @unittest.skipIf(env.PY2, "eventlet tests don't work with python tracer on python2")
+     def test_eventlet(self):
+         code = (EVENTLET + SUM_RANGE_Q + PRINT_SUM_RANGE).format(QLIMIT=self.QLIMIT)
+         self.try_some_code(code, "eventlet", eventlet)
+ 
++    @unittest.skipIf(env.PY2, "eventlet tests don't work with python tracer on python2")
+     def test_eventlet_simple_code(self):
+         code = SIMPLE.format(QLIMIT=self.QLIMIT)
+         self.try_some_code(code, "eventlet", eventlet)
+ 
++    @unittest.skipIf(env.PY2, "gevent tests don't work with python tracer on python2")
+     def test_gevent(self):
+         code = (GEVENT + SUM_RANGE_Q + PRINT_SUM_RANGE).format(QLIMIT=self.QLIMIT)
+         self.try_some_code(code, "gevent", gevent)
+ 
++    @unittest.skipIf(env.PY2, "gevent tests don't work with python tracer on python2")
+     def test_gevent_simple_code(self):
          code = SIMPLE.format(QLIMIT=self.QLIMIT)
          self.try_some_code(code, "gevent", gevent)
  
@@ -34,7 +54,7 @@ index 578cc679..ae340099 100644
      def test_greenlet(self):
          GREENLET = """\
              from greenlet import greenlet
-@@ -289,6 +291,7 @@ class ConcurrencyTest(CoverageTest):
+@@ -289,6 +295,7 @@ class ConcurrencyTest(CoverageTest):
              """
          self.try_some_code(GREENLET, "greenlet", greenlet, "hello world\n42\n")