gentoo resync : 25.08.2020

3 files changed, 6 insertions, 81 deletions

diff --git a/dev-python/moto/Manifest b/dev-python/moto/Manifest
index 6e697d335acb..19c5e09494e1 100644
--- a/dev-python/moto/Manifest
+++ b/dev-python/moto/Manifest
@@ -2,7 +2,5 @@ AUX moto-1.3.14-newer-botocore.patch 2398 BLAKE2B ea5ebf10d926cca1e9e5a804317bb9
 AUX moto-1.3.14-py39.patch 1372 BLAKE2B 620592a897b8f2ddf1973fa3f00a7c2c2512d3da02bf7f5a1474e6f8a934815cdaf00951898af292ebc5b38a0cc961d685c59fd8dd952d5fbe64dcff086d9d19 SHA512 336d9c1d399d2969cc603a3070285ebd4cc2f58bd8fa8d477fd6bde8cfc9a9a873c15b98fd2814f8c3b1cf591826101c024658f5b4468f40e6beaa229c8c8f50
 AUX moto-1.3.14-tests.patch 2306 BLAKE2B 83bf272204ba9128623ad13bfb4a468d6b2a4e5de89633b7915d2090be44b4a7823ca88ea6a706fd878e40434335a3d381e28b88806f7ed5f402fdb9977837a0 SHA512 549e1e6715f04b56729f5621f2806e8b9192ec9fd6e5bd4cacfdf4a1a5ee48ed8701f0a9acb5b1cc08e40efa4d3dc1ad5ff0821c794e97a9da6288dd3cd1be5a
 DIST moto-1.3.14.tar.gz 1829165 BLAKE2B 2ec30c4cc571492a9d2c08f66a39ad04cfc0baa7864db8a5be4ea9af24ecb59bad3e85c44fa8a7babc16bf66188cb6bef89484f1f302a11e6eec1f8dbf516492 SHA512 1fe7e9d49dadada82f24d6bef1c21419c414e027c21ed1099bd1eab7c269ac5638ed44a29d1557b37562a44b22a7c7251fc1ca8ba88cde6b82d39dbc620aa6a6
-DIST moto-1.3.8.tar.gz 1571716 BLAKE2B 8e79808d8488bcf8c15e8b5a55e93392ceb5f642f1f52c0af441cecb7adfe23a718f6d283e473e5dab82ddd21bcbed36ecb52b444cbd933405d13c8818e4f74d SHA512 901556249a2a28885b7f77e9f2c209b06391efcea66b78ce3c16edec14bcd03b251c37ef5d800d8f7a35180d59ce7568a68bcebf18e25b092eb5de801db6c587
-EBUILD moto-1.3.14-r1.ebuild 2775 BLAKE2B 9e2f967235cd50ee71dce187ee58238937de62db595a2951e43e4558f85424a796944fefa54e743c1ee226727b0bbe7703e087e79ca867b0932e13abbed77384 SHA512 141e31aa51209c5a466c649617912a8c4c753f6edae743d871a5d34214459b5c8d2dcc7073ec2842205d2f521fc773d05bb7f7fbb209feb8238d15db11b04ab3
-EBUILD moto-1.3.8-r1.ebuild 2428 BLAKE2B da88df8c1a6c5d180277821ddd25da4d7d6e59e234c8d83663185a26d19233d989c074fca40ad7200617f73f799cbaecdbb96a0e0b1d2b9e3c70c31b7b6d13c4 SHA512 114b88548e04b616ee787bb96c338dda79f66942b58f9072519ec3274196358bc7cc658e675c5cbc3beaaf219b4f54044b06ddcf366f8902852307504b17f440
+EBUILD moto-1.3.14-r3.ebuild 2875 BLAKE2B a59ffb75225e6df25c038a683deaec98fedc2c875c142696c828dd0d2a3daddb59c7c2af21417c4f9236473032d36e091bd4ed0c625316479338bce4efadb21d SHA512 f79e21f53adc1498d650446a17d1cd20ca10151be63778b880d2c61b3cb64459da23e3cf9fc70b9d89409fe4c962359bc33d062017abb41ca94fb2d82c0288e3
 MISC metadata.xml 486 BLAKE2B 5fbd350934c9a51d9b34d57a4031b6180acad41a2f981465b8ce78b76cf2ed25679fc4b5e9af59dab1e27cfe0eff2856419394902bcca26a2ffb7ece199d1838 SHA512 9e69d49c588ebbeef151cee987986de7a942a3daa9bf4d4f442314d7e47bd1ad8650c6190c6313e6f4303c03038313b6562d5e0a32ec536227c04e7702ef316f
diff --git a/dev-python/moto/moto-1.3.14-r1.ebuild b/dev-python/moto/moto-1.3.14-r3.ebuild
index 915c8ed2a58b..2d8ff45e4809 100644
--- a/dev-python/moto/moto-1.3.14-r1.ebuild
+++ b/dev-python/moto/moto-1.3.14-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 
 IUSE="test"
 RESTRICT="!test? ( test )"
@@ -32,6 +32,7 @@ RDEPEND="
 	>=dev-python/boto3-1.9.201[${PYTHON_USEDEP}]
 	>=dev-python/botocore-1.12.201[${PYTHON_USEDEP}]
 	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
 	dev-python/pretty-yaml[${PYTHON_USEDEP}]
 	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
 	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
@@ -48,7 +49,6 @@ RDEPEND="
 BDEPEND="
 	test? ( ${RDEPEND}
 		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
 		dev-python/nose[${PYTHON_USEDEP}]
 		dev-python/parameterized[${PYTHON_USEDEP}]
 		dev-python/responses[${PYTHON_USEDEP}]
@@ -69,6 +69,9 @@ python_prepare_all() {
 		-e '/cfn-lint/ d' \
 		-i setup.py moto.egg-info/requires.txt || die
 
+	sed -e 's|idna<2.9,>=2.5|idna>=2.5|' \
+		-i setup.py moto.egg-info/requires.txt || die
+
 	# Disable tests that fail with network-sandbox.
 	sed -e 's|^\(def \)\(test_context_manager()\)|\1_\2|' \
 		-e 's|^\(def \)\(test_decorator_start_and_stop()\)|\1_\2|' \
diff --git a/dev-python/moto/moto-1.3.8-r1.ebuild b/dev-python/moto/moto-1.3.8-r1.ebuild
deleted file mode 100644
index 49ed8ad77927..000000000000
--- a/dev-python/moto/moto-1.3.8-r1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Mock library for boto"
-HOMEPAGE="https://github.com/spulec/moto"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/aws-xray-sdk-python-0.93[${PYTHON_USEDEP}]
-	dev-python/backports-tempfile[${PYTHON_USEDEP}]
-	dev-python/cfn-python-lint[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-2.3.0[${PYTHON_USEDEP}]
-	dev-python/cookies[${PYTHON_USEDEP}]
-	dev-python/dicttoxml[${PYTHON_USEDEP}]
-	>=dev-python/docker-py-2.5.1[${PYTHON_USEDEP}]
-	>=dev-python/idna-2.5[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
-	>=dev-python/jsondiff-1.1.2[${PYTHON_USEDEP}]
-	>=dev-python/boto-2.36.0[${PYTHON_USEDEP}]
-	>=dev-python/boto3-1.9.86[${PYTHON_USEDEP}]
-	>=dev-python/botocore-1.12.86[${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/pretty-yaml[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/python-jose[${PYTHON_USEDEP}]
-	>=dev-python/responses-0.9.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.5[${PYTHON_USEDEP}]
-	dev-python/xmltodict[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9[${PYTHON_USEDEP}]
-	dev-python/werkzeug[${PYTHON_USEDEP}]
-"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND}
-			dev-python/freezegun[${PYTHON_USEDEP}]
-			dev-python/mock[${PYTHON_USEDEP}]
-			dev-python/nose[${PYTHON_USEDEP}]
-			dev-python/responses[${PYTHON_USEDEP}]
-			>=dev-python/sure-1.4.11[${PYTHON_USEDEP}]
-		  )
-"
-
-python_prepare_all() {
-	sed -e 's|==|>=|' \
-		-i setup.py moto.egg-info/requires.txt || die
-
-	# Disable tests that fail with network-sandbox.
-	sed -e 's|^\(def \)\(test_context_manager()\)|\1_\2|' \
-		-e 's|^\(def \)\(test_decorator_start_and_stop()\)|\1_\2|' \
-		-i tests/test_core/test_decorator_calls.py || die
-
-	# Disable tests that fail with userpriv.
-	sed -e 's|^\(def \)\(test_invoke_function_from_sns()\)|\1_\2|' \
-		-e 's|^\(def \)\(test_invoke_requestresponse_function()\)|\1_\2|' \
-		-i tests/test_awslambda/test_lambda.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	PYTHONPATH=${BUILDDIR}/lib \
-		nosetests -sv ./tests || die
-}