gentoo resync : 02.06.2019

3 files changed, 14 insertions, 14 deletions

diff --git a/dev-python/tox/Manifest b/dev-python/tox/Manifest
index 474194aebb17..3ffb468703f3 100644
--- a/dev-python/tox/Manifest
+++ b/dev-python/tox/Manifest
@@ -1,9 +1,9 @@
-AUX tox-3.10.0-skip-broken-tests.patch 2725 BLAKE2B 112b5be6c97c27ab531f88c01d4ba13452cf25bc46515bf6c6751951595124d257f85083d9a99c9cc8956370f0390facd07abbe1e9f21c627c531bff639eeef1 SHA512 67e93d9ba10c464f66170342e8bc20f48e57505b72b845effa7e8defb34eaef90ff4b3495847dc7696d5b50359ab032d207ea88dddcf669b3d315bed31e73b29
+AUX tox-3.12.1-skip-broken-tests.patch 2766 BLAKE2B f2776638f48909c18a14c0e556d7646584b382eb62d17bd0a72e6d10011f25818de0886df79eaa4bada5fb9b43797505b1c8df4fc7d97398741d2f719143c4e8 SHA512 cc14794264ce0d9ca4c36de868e823a46e84bea8867e6bb7b37f5e13723d3ec84af41bc0cc7586789cc14b4f6844a68d2c5057cf77d36950c2fa2e8152e1be61
 AUX tox-3.9.0-strip-setuptools_scm.patch 699 BLAKE2B 15c001c0523420c2ae22013cc6729b34b97f1a25f7cddcde53f752dc11e1329d66522eeebbbda00bce58781c96b622ce4cd22127902b5ddf34b43e5197577792 SHA512 6c23dfa907303a826595cc7ff897212272841b151b574596d401b87bd441d26599c12b36bc08a5659af3e6639c20773c866df7b53c4230bb3eea86986253eb07
 DIST tox-2.9.1.tar.gz 1855982 BLAKE2B 3e2f5fd3d3e45e54f96b0a6fc8f9e98bfba3b48540cc2922a897e016b5aabc9974772c9b897e0fab7b38b00f99478a063ad988ffa8b65fa53f684997334e492c SHA512 ff19b2bb7ac963379f1cccd4973ad9eb4dabfbda976cde7caba50ad010d8fa57c1cba91d63e3e0512e44cc7d350bc9270fbd9b30db1bd55f7d9c239e7623d066
-DIST tox-3.10.0.tar.gz 279571 BLAKE2B 7aa77dfee2fe3141626d13f37f2c711cd0891ae7b484f7fe6ab7731d35455a898964c52cedc954a6d4108137e2d73fe9628bb893aa7a337d8e69da15b8516811 SHA512 a1cadf3f8de494b5c7f2e8ae1be11fd42f29ae805b5761f6a22763c303625c860475c5435aaf437e6f2d0213be1ad826d9b6a0950aed21c054a94d492cc85047
+DIST tox-3.12.1.tar.gz 283964 BLAKE2B b7cb2394a721f281552d1f614a6059f7025390a4ea03fd970c85330dffb97f601f0c3f8c9c9b05f86b5b92e87ef80fba48676201550581562b8cf3f1b2afa34b SHA512 d7ed7ce17b03b5c8e3ba95e14f547c8dbb9a04ac38b98fb24c09261b5087ffc83b05e9a03607fa53ce61340a3ba69fc4121622f7fe338ce8ed402d25d59c7e6a
 DIST tox-3.2.1.tar.gz 268827 BLAKE2B 764835d04fb0c17f32eb8e2041b83f90d6a729b781a5b5b95e9ecb1162f1c29ed595d4a6369524b390a31853b8003485b27a3a12d63e84f49e92675f1a9bee13 SHA512 79f5a1c8f6e818fbb8444754e3767d880fc1fdfe63b46c518d37440fe2b2f3ce572865aff83d9492c24486fded49893cc31bd9b11254bac4db507260304bc76f
 EBUILD tox-2.9.1.ebuild 1307 BLAKE2B f9523dd73e57889bc345f1e6d9e47a70b5c63727bd029fd0cdeeba79ca0e6c523248c845270035d4e26d70f31ea788fe94e2d69529bb99625db2a1f49880553c SHA512 09987e74d9cdf82fee990dc7e1813ed8df54a8ffbc157413c6fa0b61763853640066c108b78556601d16f278bdd303d572f4721dcc8dbcd7f4183187f4fe4692
-EBUILD tox-3.10.0.ebuild 1422 BLAKE2B a5a50dbb389b09a6d65e07e24ddf0c6b35d41dd4e18d24312a07e29b823ff7ba1bcf50c6798e873727c764e87a899de49c05d7d80907e19221b69f0f40b3625f SHA512 9f6dd4aad20846936bc8937502e475fc17dd90a7c2d439a1ed6a43f2dcf6d21aae023346dcaade87e8fdb46c0be85dd54f8d7a41b0e8442bfb4f2fcdbd8e327c
+EBUILD tox-3.12.1.ebuild 1413 BLAKE2B e1e77b0c5a69bd9b03939d3ef4772cccc1f3fa1c2610f3e5d019bbd3c43db3f3ccdae375e33826f57ceb1ee1f2952ab7ed92148cf2b6545dc8643bedbbaabb41 SHA512 358fff5b4132a1748afce6c1f78d01f9ececee57853fa154d6169afd0a8a64c25ff8a6e753e2e2f5a46c718d3586541e3f8841318ff57b08de97cb0154662434
 EBUILD tox-3.2.1.ebuild 1953 BLAKE2B 20ef7befbe5fced2de522b65745e159fdbdc323c887eaad5feeda601bc68180651716913e8c84a5fe778a52ce3dcd0db2b7ee76309cd3e7583c2b90914c0ad74 SHA512 255146b77fedd2a709cb6b0bffeac1469811028d7dd806219107139bc27a171826dee2cb0d65672e8e206cd8c0d37fa5d84dab8d81b53aa6b5627b39a9e0e376
 MISC metadata.xml 465 BLAKE2B eba47520bf4a2f615fbfad7c26ac19af51d6b9c0ef8dff0212a6723376b34a0d17386f05b3f4dd3ab715b9af867fabc038c300fa8df357c648dedb03efbeed88 SHA512 9bcd58c451d7196c9870a04b76a504090ec217c7c88f47f17e141c5c9519fc41d24dfc83d97eb48b935d90b621a0ada1ed664fafffd7880e91627e56259b3c76
diff --git a/dev-python/tox/files/tox-3.10.0-skip-broken-tests.patch b/dev-python/tox/files/tox-3.12.1-skip-broken-tests.patch
index 56f692948d36..382bf2b158eb 100644
--- a/dev-python/tox/files/tox-3.10.0-skip-broken-tests.patch
+++ b/dev-python/tox/files/tox-3.12.1-skip-broken-tests.patch
@@ -12,10 +12,10 @@ index 6a8ac18..56dbe95 100644
      monkeypatch.setenv(str("TOX_REPORTER_TIMESTAMP"), str("1"))
      initproj(
 diff --git a/tests/unit/config/test_config.py b/tests/unit/config/test_config.py
-index c64ec1b..b16a4f2 100644
+index b814b7a..fe7ebe3 100644
 --- a/tests/unit/config/test_config.py
 +++ b/tests/unit/config/test_config.py
-@@ -1886,7 +1886,7 @@ class TestConfigTestEnv:
+@@ -1897,7 +1897,7 @@ class TestConfigTestEnv:
          for name, config in configs.items():
              assert config.basepython == "python{}.{}".format(name[2], name[3])
  
@@ -24,12 +24,12 @@ index c64ec1b..b16a4f2 100644
          with pytest.warns(UserWarning, match=r"conflicting basepython .*"):
              config = newconfig(
                  """
-diff --git a/tests/unit/test_interpreters.py b/tests/unit/test_interpreters.py
-index 1eba27e..af7930b 100644
---- a/tests/unit/test_interpreters.py
-+++ b/tests/unit/test_interpreters.py
-@@ -40,7 +40,7 @@ def test_locate_via_py(monkeypatch):
-     assert tox.interpreters.locate_via_py(spec)
+diff --git a/tests/unit/interpreters/test_interpreters.py b/tests/unit/interpreters/test_interpreters.py
+index ea6f65d..e4f0e92 100644
+--- a/tests/unit/interpreters/test_interpreters.py
++++ b/tests/unit/interpreters/test_interpreters.py
+@@ -28,7 +28,7 @@ def create_interpreters_instance():
+     return Interpreters(hook=pm.hook)
  
  
 -def test_tox_get_python_executable():
@@ -37,7 +37,7 @@ index 1eba27e..af7930b 100644
      class envconfig:
          basepython = sys.executable
          envname = "pyxx"
-@@ -84,7 +84,7 @@ def test_tox_get_python_executable():
+@@ -72,7 +72,7 @@ def test_tox_get_python_executable():
  
  
  @pytest.mark.skipif("sys.platform == 'win32'", reason="symlink execution unreliable on Windows")
diff --git a/dev-python/tox/tox-3.10.0.ebuild b/dev-python/tox/tox-3.12.1.ebuild
index 586d4e574d5c..95e8d9f9534b 100644
--- a/dev-python/tox/tox-3.10.0.ebuild
+++ b/dev-python/tox/tox-3.12.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} pypy{,3} )
+PYTHON_COMPAT=( python3_{5,6,7} pypy3 )
 
 inherit distutils-r1
 
@@ -39,7 +39,7 @@ DEPEND="${RDEPEND}
 
 # for some reason, --deselect doesn't work in tox's tests
 PATCHES=(
-	"${FILESDIR}/${PN}-3.10.0-skip-broken-tests.patch"
+	"${FILESDIR}/${PN}-3.12.1-skip-broken-tests.patch"
 	"${FILESDIR}/${PN}-3.9.0-strip-setuptools_scm.patch"
 )