dev-python/s3transfer: Fix for unbundled six from botocore

Signed-off-by: Michał Górny <mgorny@gentoo.org>

2 files changed, 40 insertions, 1 deletions

diff --git a/dev-python/s3transfer/s3transfer-0.5.0.ebuild b/dev-python/s3transfer/s3transfer-0.5.0-r1.ebuild
index dd99b39e54af..5f47c8971c71 100644
--- a/dev-python/s3transfer/s3transfer-0.5.0.ebuild
+++ b/dev-python/s3transfer/s3transfer-0.5.0-r1.ebuild
@@ -15,7 +15,7 @@ SLOT="0"
 KEYWORDS="amd64 arm arm64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
-	dev-python/botocore[${PYTHON_USEDEP}]
+	<dev-python/botocore-1.23[${PYTHON_USEDEP}]
 "
 BDEPEND="
 	test? (
diff --git a/dev-python/s3transfer/s3transfer-0.5.0-r2.ebuild b/dev-python/s3transfer/s3transfer-0.5.0-r2.ebuild
new file mode 100644
index 000000000000..2092d5f38974
--- /dev/null
+++ b/dev-python/s3transfer/s3transfer-0.5.0-r2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+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 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-python/botocore[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	epytest tests/{unit,functional}
+}