gentoo Easter resync : 12.04.2020

6 files changed, 2 insertions, 104 deletions

diff --git a/dev-python/s3transfer/Manifest b/dev-python/s3transfer/Manifest
index c8d90289c5c7..b35cc33306d4 100644
--- a/dev-python/s3transfer/Manifest
+++ b/dev-python/s3transfer/Manifest
@@ -1,10 +1,5 @@
-AUX s3transfer-0.1.13-tests.patch 753 BLAKE2B 7b168d35c9287eade9b9e1ca0393c625f742d1a698df9996f9ddbe6cb892128badb3a77dc9804e3bc9905d0982f240c3dd5021459e3d050a7647e279efd93491 SHA512 3fd66ae7574ee5263582006292a19a782aa3c2d4ebef00e005b02d1cb5192a99c36325114e49aa13ddc2fa1cb8604f65f87dcac8994b2845eaa45b409a5b8ff6
-DIST s3transfer-0.1.13.tar.gz 103335 BLAKE2B bbc6e76647a9b531f0ef70912ddd17a186a5bbe4ecc9ed21de4674cdc20d39150be3212065bcdf6145c0721644c59d157fd528b79039bb091d750f28085bb476 SHA512 90aca5cacefa19cb8cb21b7b82c5f3383bc0478503557de9c2277db2f39d98f6e11ad74bf56ec84a1fc8c4a920337b0bcb34bfcf509a49f347144b7f13afb37c
 DIST s3transfer-0.2.0.tar.gz 118361 BLAKE2B 0cb0a29e6dfa82762084396db1950a9e1baf4de1d9c8b9f0db3dbf1e274636f60a89ceb959d55cc22fe41c4ce175ab53f414c5c44f08624cc43f0d289f768863 SHA512 2e37a13da67cdabb49deeb177fd9f8d6393128e757e6c9bd93c99eb95a3edbd14736025e284f3173e8247d23239abae3700d894ba0d138f970ceaff748aa6e9e
-DIST s3transfer-0.2.1.tar.gz 119635 BLAKE2B f8978afb2ca367238392974dc98c0a2547cf95c42f0dcce627694dda5d34ff07c92db1b838ea4cbb111db921ac9f0ab2bee81eeca99827d0731cf77ea111d70e SHA512 1494436fa74ba6eee26e96fb0d448062acddf4c4179e56baaa47d62785218d9e91c5fb50b6641e488d0c84cbaab53bd552b4277bb873cd170904074e6509b0e9
 DIST s3transfer-0.3.1.tar.gz 118716 BLAKE2B 26c25c0eb50b423c08e7ac64e902ab7cbb9e3dcb9cdc7386e6ead17f42ef18bcbb0d60f8334653220f797a03b8a877ae2487de25d8c95344f852d71bb0716408 SHA512 75df6f66d4b0d4a87a88a160cc1c962348331596ae346ebd198fbfb1e1c4d2c216b19627a0600d5a7966d0e683e0a46f6dbae47c9b44bdd65340400f93ed9b3c
-EBUILD s3transfer-0.1.13-r1.ebuild 951 BLAKE2B 432ae3693eed8c87e67798bd53de76768dbdf62093f85d5be6a3799b49df47dddfcbd4bc71d52d10fd02ca52ea2b652669d7254f8492f3cbbcdb194f8e761f4c SHA512 aaac2ecf1c421872558f024e6ef655104cc5ebdd5f51c13314fc120225048d48112adcc57d46adae4cb837f9c3ef61f96f5de0d485360ac4a0c15aaa5236c674
-EBUILD s3transfer-0.2.0.ebuild 895 BLAKE2B 019b69cc2aab9b4293f4c9262bb789fdb73bb08982e3fe06781707458a2716a3a38069156ccb9c6a9cbd307090e415ebe4ad286620464dac91842d183a67c124 SHA512 aa3e38634bc9146cfffd5e7018206af733b5a5685e9f15e679515b823b215890979bab01a9e9d7ed0864c4c66dd2e23758e9cf4b7d317a119dfdc3bcaf6e4b18
-EBUILD s3transfer-0.2.1.ebuild 897 BLAKE2B 851c461fe8afd5c641709989d9a976fbe52da7c05902fa056631130fb601398f4c67ae0b2103b991449e96146b1d5302adc17f475aa01df909b1ac23d2519aab SHA512 f2d4e554b51f60e0dd5d077cacb9f00acac39a08539efda984cc7677ead2aa392b93f243d41228fd424e1a09f4dbb2c2ed6ba5ae10da4c106427b9c7dd27e005
-EBUILD s3transfer-0.3.1.ebuild 1013 BLAKE2B 075e18ccd4ccd8335c354d7e948f3d594fb22a086a9770f62899d85f8e1231478b3ace1a7c5a35e0a6eb4ec2dbf3385dffbc6344ee218f0b39581d8f8e21b1d6 SHA512 3b1bc463053b26e24662e3222060e42a3ef38bc63bc3df33ae0ec26f6a1b7043e92151c137f3edfb3a411de0bc9b00e01d0e208dbb0f7872c5fc797f1a7c2d82
+EBUILD s3transfer-0.2.0.ebuild 820 BLAKE2B e2a74d75a9ee0b875f86c7a9b509c10595bc1ea5465db832711e43a50b487afea933085fa07a88d20b213a091aa3b126e4f028c844c7f3c712e038a9dff71ef1 SHA512 0f7b59b068a027b6aeb9dff065bddb9fe1fb0ec4f9c004613291aa6ea8964e1dcc1a0cadcf1f55674e06f3d86ce74d4110d11682dd341723441b715830bca6d7
+EBUILD s3transfer-0.3.1.ebuild 938 BLAKE2B f3d9c3c9cb666e293bad93f1d61d97982503112c56577b29c06a8d3f3dd6fbdf5dc433180b6ee229a37864061693390610064aebe95de34eb4adc0a6c22cba2e SHA512 e57ea0aa7e8140c1a930a7ebdd728f6754244ebde8f21b56041cfe3d615e2bccd4e0ab39308bd542b807dae1759f50d7d5deed031a13d39d9f9d246f4983d43f
 MISC metadata.xml 379 BLAKE2B 71ab13315921746f0b71ac09c3f7a5e4e182e4efc0dda7f0e9cd6fe2948f52eddde9b9fe7c117ced64f4e3f6646a2d15a1fd3630ab814b067a10dadd11448def SHA512 452e566006f5a6ec91765cdeb4fe75edbf890f3a8e495bca7d1db859a882109eecb252dca18f1d1e4dc970c62c7810b5e51cf1b5ab61553c76d4dc04e38bc5ee
diff --git a/dev-python/s3transfer/files/s3transfer-0.1.13-tests.patch b/dev-python/s3transfer/files/s3transfer-0.1.13-tests.patch
deleted file mode 100644
index 14445f338bf5..000000000000
--- a/dev-python/s3transfer/files/s3transfer-0.1.13-tests.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 67d2548f9e531650ee90e9518cf6559aabe98afd Mon Sep 17 00:00:00 2001
-From: Jordan Guymon <jogu.sd@gmail.com>
-Date: Fri, 31 Aug 2018 10:22:25 -0700
-Subject: [PATCH] Add whence to mock readable seek to fix functional test
-
----
- tests/functional/test_manager.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/functional/test_manager.py b/tests/functional/test_manager.py
-index 9d5702d..ec4175a 100644
---- a/tests/functional/test_manager.py
-+++ b/tests/functional/test_manager.py
-@@ -40,7 +40,7 @@ def signal_transferring(self):
-     def signal_not_transferring(self):
-         self.signal_not_transferring_call_count += 1
- 
--    def seek(self, where):
-+    def seek(self, where, whence=0):
-         pass
- 
-     def tell(self):
diff --git a/dev-python/s3transfer/s3transfer-0.1.13-r1.ebuild b/dev-python/s3transfer/s3transfer-0.1.13-r1.ebuild
deleted file mode 100644
index 0d4a941a9884..000000000000
--- a/dev-python/s3transfer/s3transfer-0.1.13-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 python3_7 )
-inherit distutils-r1
-
-DESCRIPTION="An Amazon S3 Transfer Manager"
-HOMEPAGE="https://github.com/boto/s3transfer"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="
-	dev-python/botocore[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/futures[${PYTHON_USEDEP}]' 'python2_7')
-"
-# Pin mock to 1.3.0 if testing failures due to mock occur.
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${CDEPEND}
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="${CDEPEND}"
-
-PATCHES=( "${FILESDIR}/s3transfer-0.1.13-tests.patch" )
-python_test() {
-	nosetests -v tests/unit/ tests/functional/ || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/s3transfer/s3transfer-0.2.0.ebuild b/dev-python/s3transfer/s3transfer-0.2.0.ebuild
index b6ed7f314dc5..633b1ff5ad76 100644
--- a/dev-python/s3transfer/s3transfer-0.2.0.ebuild
+++ b/dev-python/s3transfer/s3transfer-0.2.0.ebuild
@@ -18,7 +18,6 @@ RESTRICT="!test? ( test )"
 
 CDEPEND="
 	dev-python/botocore[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/futures[${PYTHON_USEDEP}]' 'python2_7')
 "
 # Pin mock to 1.3.0 if testing failures due to mock occur.
 DEPEND="
diff --git a/dev-python/s3transfer/s3transfer-0.2.1.ebuild b/dev-python/s3transfer/s3transfer-0.2.1.ebuild
deleted file mode 100644
index 5665584c83a6..000000000000
--- a/dev-python/s3transfer/s3transfer-0.2.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 python3_7 )
-inherit distutils-r1
-
-DESCRIPTION="An Amazon S3 Transfer Manager"
-HOMEPAGE="https://github.com/boto/s3transfer"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="
-	dev-python/botocore[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/futures[${PYTHON_USEDEP}]' 'python2_7')
-"
-# Pin mock to 1.3.0 if testing failures due to mock occur.
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${CDEPEND}
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="${CDEPEND}"
-
-python_test() {
-	nosetests -v tests/unit/ tests/functional/ || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/s3transfer/s3transfer-0.3.1.ebuild b/dev-python/s3transfer/s3transfer-0.3.1.ebuild
index 08b3fc79d87c..412287de37c5 100644
--- a/dev-python/s3transfer/s3transfer-0.3.1.ebuild
+++ b/dev-python/s3transfer/s3transfer-0.3.1.ebuild
@@ -20,7 +20,6 @@ RESTRICT="!test? ( test )"
 
 CDEPEND="
 	dev-python/botocore[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/futures[${PYTHON_USEDEP}]' 'python2_7')
 "
 # Pin mock to 1.3.0 if testing failures due to mock occur.
 DEPEND="