gentoo resync : 22.01.2019

3 files changed, 11 insertions, 10 deletions

diff --git a/dev-python/tox/Manifest b/dev-python/tox/Manifest
index f474db80a4bc..89a6dcd601ed 100644
--- a/dev-python/tox/Manifest
+++ b/dev-python/tox/Manifest
@@ -1,8 +1,8 @@
-AUX tox-3.6.0-skip-broken-tests.patch 1579 BLAKE2B 1de72f080eaab2b3da17dc5e2edfd5297072fc3cf03015113f633cfdf3596993197a75aab507b5c3b055bc7cc746093a1d0a5e95146d7a9ef562991c516eef07 SHA512 4f731f456bcf941f0120586d486c826970fdf9d28f475eba9e55d561a48c38ee43c4bb7551de636ea2f5f17c7267be3bacc949b1a5230c7c35f800efe2b398c7
+AUX tox-3.7.0-skip-broken-tests.patch 1607 BLAKE2B e25c18c9706914a8e7e209a7a9eaaa3407cd339b9d4fdfbfc13d3daf0598034b0f877491caa13fb21c777983e901ef3aa035b491b59aaca14f09c34af576ca55 SHA512 8a8b684ca56612016ef60df0082a71b0d21619600453f5f93f732d7676afa7785350a0d3d088146a5856820fe877ed186660968c54782b6aa14c79ad0ed879fd
 DIST tox-2.9.1.tar.gz 1855982 BLAKE2B 3e2f5fd3d3e45e54f96b0a6fc8f9e98bfba3b48540cc2922a897e016b5aabc9974772c9b897e0fab7b38b00f99478a063ad988ffa8b65fa53f684997334e492c SHA512 ff19b2bb7ac963379f1cccd4973ad9eb4dabfbda976cde7caba50ad010d8fa57c1cba91d63e3e0512e44cc7d350bc9270fbd9b30db1bd55f7d9c239e7623d066
 DIST tox-3.2.1.tar.gz 268827 BLAKE2B 764835d04fb0c17f32eb8e2041b83f90d6a729b781a5b5b95e9ecb1162f1c29ed595d4a6369524b390a31853b8003485b27a3a12d63e84f49e92675f1a9bee13 SHA512 79f5a1c8f6e818fbb8444754e3767d880fc1fdfe63b46c518d37440fe2b2f3ce572865aff83d9492c24486fded49893cc31bd9b11254bac4db507260304bc76f
-DIST tox-3.6.1.tar.gz 257471 BLAKE2B ab09a6e5f3a0de343dcea05008f6bfddc2be1e8949c5529c2a030dd4be32eb541a9d55037602efa58345210f34fa4d3f246d1a4260f7a9b77c0d473d8649673c SHA512 81edb0fc489731eb815f46cfa30677b077d4bb58d4e3e8bd7f887eaed3a2a950f7b49368af2bcb51ea07ca1821ff67145d543b8a370d642dd87d93952734249a
+DIST tox-3.7.0.tar.gz 267854 BLAKE2B 9b32e6010f47d00e5ad81b31a8b9e809162ec9438c8a98df3e86c37692a3040bc0158d106f5698cdb6e240be54db80ce8b3c4c8710732f85d9eedfe1a0814852 SHA512 7e12f3407c1ad51ae5839bdd7907c7b05654f3a145270573326fbe3903d22c6e63a930c242ecaf1eae746043da090703e48ead7e27973294711f45077217ed37
 EBUILD tox-2.9.1.ebuild 1307 BLAKE2B 1250817a04c4eccd2471adb950ce316092b95b0d8c015a606dac2f0854ee48e32de220a5171b36e56c240a67766e6e929d8e8052a069be3651fff04d0d0ca014 SHA512 672f5fb09123ca77fc4ff93da6c00a82b02e1119ea9dcf5858792ca01b07a17ff5d0137174dbce0ffbe75b15e5c2aaf26811f412a258da6c0c22b9101202c077
 EBUILD tox-3.2.1.ebuild 1940 BLAKE2B a8998a74cd660ccbe8ef03d079dc54c0126aad2451cad7403c4848c32d0ba80db99bffbbe66bab215b10b7165db82b7c4d4a50159cd8c0adc6b7adc99d922958 SHA512 3eb02da7e9481434cb64c3b4218037bc58d4c1b15177f37d7ff236b9daf0f097ee94e6f6bcbc0c6f9ad03f1a31d8c8c4a090003b9b1cd789ca5b3d8ff6c48c18
-EBUILD tox-3.6.1.ebuild 1216 BLAKE2B ce2e7c74af062bb7d2722252ae2fc538ad3ba2f7f1860131d2206b41c280e7529dbf06222694113265a3462e41445d709ecb2249a8d9f9ed267dbc9c2b62fae7 SHA512 74ab5fa44208967d5422ace3d3d4dffd2a28dc65fea349c7d66fdae778e3bcd80896afc7aabe88beae170d5b143f2ffe644247fef6984d6b5709d70c979487a0
+EBUILD tox-3.7.0.ebuild 1270 BLAKE2B af455ec8766bbb88af6eb36be75cc287d9b7ef977e91076ec1df07c75cbd686df6a6043c5445e8531f0e0dbaa30b5bd953589d17ad53d8fb2d22c5467a5130a3 SHA512 b4089abe7796147979f7c3709af0b07a89df482988d6d3a90a0fd3a1416fc7d265e809a9c09bdfe5cdd114b68da4e075645ec86aaf31dbc67fd7423984249ae1
 MISC metadata.xml 465 BLAKE2B eba47520bf4a2f615fbfad7c26ac19af51d6b9c0ef8dff0212a6723376b34a0d17386f05b3f4dd3ab715b9af867fabc038c300fa8df357c648dedb03efbeed88 SHA512 9bcd58c451d7196c9870a04b76a504090ec217c7c88f47f17e141c5c9519fc41d24dfc83d97eb48b935d90b621a0ada1ed664fafffd7880e91627e56259b3c76
diff --git a/dev-python/tox/files/tox-3.6.0-skip-broken-tests.patch b/dev-python/tox/files/tox-3.7.0-skip-broken-tests.patch
index ea39bb30c1c7..db625d8846c4 100644
--- a/dev-python/tox/files/tox-3.6.0-skip-broken-tests.patch
+++ b/dev-python/tox/files/tox-3.7.0-skip-broken-tests.patch
@@ -1,7 +1,7 @@
-diff --git a/tests/unit/test_config.py b/tests/unit/test_config.py
-index 08a1ced..86e3fb6 100644
---- a/tests/unit/test_config.py
-+++ b/tests/unit/test_config.py
+diff --git a/tests/unit/config/test_config.py b/tests/unit/config/test_config.py
+index ba00b06..b1e7764 100644
+--- a/tests/unit/config/test_config.py
++++ b/tests/unit/config/test_config.py
 @@ -1869,7 +1869,7 @@ class TestConfigTestEnv:
          for name, config in configs.items():
              assert config.basepython == "python{}.{}".format(name[2], name[3])
@@ -12,7 +12,7 @@ index 08a1ced..86e3fb6 100644
              config = newconfig(
                  """
 diff --git a/tests/unit/test_interpreters.py b/tests/unit/test_interpreters.py
-index 0787b95..51e2ccc 100644
+index 9320a10..869189f 100644
 --- a/tests/unit/test_interpreters.py
 +++ b/tests/unit/test_interpreters.py
 @@ -60,7 +60,7 @@ def test_locate_via_py(monkeypatch):
diff --git a/dev-python/tox/tox-3.6.1.ebuild b/dev-python/tox/tox-3.7.0.ebuild
index f50b9bdddb5e..4a32bc04c976 100644
--- a/dev-python/tox/tox-3.6.1.ebuild
+++ b/dev-python/tox/tox-3.7.0.ebuild
@@ -28,15 +28,16 @@ RDEPEND="
 	dev-python/toml[${PYTHON_USEDEP}]
 	dev-python/virtualenv[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-2[${PYTHON_USEDEP}]
 	test? (
+		>=dev-python/freezegun-0.3.11[${PYTHON_USEDEP}]
 		>=dev-python/pytest-3.6[${PYTHON_USEDEP}]
 		<dev-python/pytest-4.0
 		<dev-python/pytest-mock-2.0[${PYTHON_USEDEP}]
 	)"
 
 # for some reason, --deselect doesn't work in tox's tests
-PATCHES=( "${FILESDIR}/${PN}-3.6.0-skip-broken-tests.patch" )
+PATCHES=( "${FILESDIR}/${PN}-3.7.0-skip-broken-tests.patch" )
 
 python_test() {
 	pytest -v --no-network || die "Testsuite failed under ${EPYTHON}"