gentoo resync : 14.05.2020

3 files changed, 84 insertions, 26 deletions

diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 0357d58220d0..2b6f043160ff 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -1,6 +1,8 @@
 DIST boto3-1.10.2.tar.gz 272071 BLAKE2B 9c3b90ae751784946a84d0cf31ed0111526ed97b5be1fe5f256f725889f9819db632c6e6f217e3f01ebb0aa5594257a5bdaabd8dcc5f14ccb5bdd333b1c416c7 SHA512 37ea11f5ae9263aa5e97ce94f2834c987190ba2eac4a60bf9312bb643f1d204e48db7bef6ddc0d46ae124109ec6807589108b58f3024485de163fd8f83688b42
+DIST boto3-1.12.48.tar.gz 292124 BLAKE2B 0baf8fb4cfa040ba05b296d15a523a5de32677684143145b12dd54182d4fedbffa5656d36ab854006c0cc6009a1bca351bb5ac2ea757cb70b446924bcae625a8 SHA512 3cf5533dd5d9aa51cf46ef81ba25bb7afbc73b1e745ea5ae47935b22da290c7d2101e377b3225f970168201dde0bf2ee967e24eed86548f9045eb72840afea6b
 DIST boto3-1.9.122.tar.gz 258061 BLAKE2B 68903edd97e10693675e4c2fa77c2c54f2d3aab79307ee0a856f43aabe256f7782d027b0a23f433c593962c90f7364c26a87c27fe8770e67b5052e4ced73a9bc SHA512 31b8d8c2369b9076d825196d400c8a8b5579c38f87c7f41634eedbdaf6c2be01072018312e90e25d81b850c51f7c22a13fa565cd4e8b7672c238bad61e6a0810
 EBUILD boto3-1.10.2.ebuild 1232 BLAKE2B ea39ddf5aac9ceab82200259373aa821257c5662938abf976d444bd9ed950e7e4591d842fcb13b8f7a286f84e1ea555ba0d23b11e4ad3aa8b14fc38612b25d68 SHA512 2fcb3b55ab0ec0ab308bc5ca9014f6ff0ea199d47f1997fa7081f798667f70f9cb5d3d3f0396eacb20ca0163f82f508a7eef4717616032def79a1b581a112b26
+EBUILD boto3-1.12.48.ebuild 1293 BLAKE2B 92aad28866a299a2a734ff0d36a31a8bfd25e9ecef8e055415c99efee0cd5e23b0d1ab29830d70ca15531b830472b9e07f3cffff2e3c5085800a64a6cc138a1c SHA512 3d0310fccc683e421bce7b4eefca8c469bcaea84f191e6758b2aff6cd267910b7bb96bf0045c81eac26d5ffc11709a8cc0ae2ba6969f3d8b0d3b3e581d359805
 EBUILD boto3-1.9.122.ebuild 1230 BLAKE2B 28aca5308ca0056019875d735de0d04a7332a3f995358a7646d454a48c37ed95f7d731bbb56f6635d82504742dea02f87357ed679435ed6c40d33a5aec47449c SHA512 9da14dcf92737efed3232f787430800eb897cd010a4ba33d49090d8146beea685e355f8a47bbe962122c04d4a86d0994f4e3f66ce898f0acfd13cfb42f7f1556
-EBUILD boto3-9999.ebuild 1232 BLAKE2B ea39ddf5aac9ceab82200259373aa821257c5662938abf976d444bd9ed950e7e4591d842fcb13b8f7a286f84e1ea555ba0d23b11e4ad3aa8b14fc38612b25d68 SHA512 2fcb3b55ab0ec0ab308bc5ca9014f6ff0ea199d47f1997fa7081f798667f70f9cb5d3d3f0396eacb20ca0163f82f508a7eef4717616032def79a1b581a112b26
+EBUILD boto3-9999.ebuild 1286 BLAKE2B 5c835ede1c85a0d847b56c98e512fa34b95fe5edf01ed71eed44e0c849844a85070d03794cd57c1abde99e5f4c44e8c528ab987601ce33d426b49e20144155d3 SHA512 686f5d3e2a204b50ab55c518277ed718188aad5240e548aa31e01facaea330540cae9feb7fa5e56559af342cba6c0c09382e8805cfb6026440899c9a723221fe
 MISC metadata.xml 326 BLAKE2B 0ee2d830daa48d21aa34b2bec8f8b9d6ff03edaffc6bf8f5b47c05b5a83aa0947e22651dcf9ef4d8153b3b0f21913069a77bcfb7b25f55a67c147938bfd6c0a5 SHA512 0e38efcdc960343f3b92fdfca7d91719b2b3b66969cd100fd8e0d53eab876e062ffe2cfb370b605881631f1077861cd6e0aa1b103477933bfa949d297193e109
diff --git a/dev-python/boto3/boto3-1.12.48.ebuild b/dev-python/boto3/boto3-1.12.48.ebuild
new file mode 100644
index 000000000000..1d5780433f8a
--- /dev/null
+++ b/dev-python/boto3/boto3-1.12.48.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+inherit distutils-r1
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="https://github.com/boto/boto3"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-1.15.48[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (	${RDEPEND}
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+"
+
+RESTRICT="!test? ( test )"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# prevent an infinite loop
+	rm tests/functional/docs/test_smoke.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/boto3/boto3-9999.ebuild b/dev-python/boto3/boto3-9999.ebuild
index b19ce9f817ab..d996a7288df9 100644
--- a/dev-python/boto3/boto3-9999.ebuild
+++ b/dev-python/boto3/boto3-9999.ebuild
@@ -1,17 +1,16 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python3_6 python3_7 )
-
-inherit distutils-r1 vcs-snapshot
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+inherit distutils-r1
 
 DESCRIPTION="The AWS SDK for Python"
 HOMEPAGE="https://github.com/boto/boto3"
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
+IUSE="test"
 
 if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/boto/boto3"
@@ -22,33 +21,35 @@ else
 fi
 
 RDEPEND="
-	>=dev-python/botocore-1.12.4[${PYTHON_USEDEP}]
-	dev-python/jmespath[${PYTHON_USEDEP}]
-	dev-python/s3transfer[${PYTHON_USEDEP}]
+	>=dev-python/botocore-1.15.48[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
 "
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/guzzle_sphinx_theme[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-	test? (
-		${RDEPEND}
+BDEPEND="
+	test? (	${RDEPEND}
 		dev-python/mock[${PYTHON_USEDEP}]
 		dev-python/nose[${PYTHON_USEDEP}]
 	)
 "
 
-python_compile_all() {
-	use doc && emake -C docs html
+RESTRICT="!test? ( test )"
+
+distutils_enable_sphinx docs \
+	'dev-python/guzzle_sphinx_theme'
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# prevent an infinite loop
+	rm tests/functional/docs/test_smoke.py || die
+
+	distutils-r1_python_prepare_all
 }
 
 python_test() {
 	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
 }
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/build/html/. )
-
-	distutils-r1_python_install_all
-}