gentoo resync : 12.05.2022

7 files changed, 25 insertions, 180 deletions

diff --git a/dev-python/moto/Manifest b/dev-python/moto/Manifest
index e167fbb89a20..f4223031743b 100644
--- a/dev-python/moto/Manifest
+++ b/dev-python/moto/Manifest
@@ -1,12 +1,9 @@
-AUX moto-3.1.1-32bit-time_t.patch 2672 BLAKE2B f83b1eaf96cf79396714e1f335dc4a18b288fba36acc9b71b69e0fbde793dbb4b3c6751e4a5cfc08d6a9918268e9c9cd86e7ae12977d437b5fc3a5deea2f2c02 SHA512 16e40775c2c1ce8b13e015da8ee5ce0b57b04a4d557aebea9b592a18f23f291e1190f8565408d18a643fee0da34efc94b3252ab706b94149538a93ce646d0141
-DIST moto-3.0.5.tar.gz 2219507 BLAKE2B 019e0f66d8a183f9d758c372252488e79692e140db19820b568279148d88181b944f547d3a213072a29fb61115b73b40b656d3a0657078c54ca1c6de001c65ab SHA512 0529711897a25ff969bf945abfda9e86ab0a310b6b273240b35c981960e04ed14f879a4a86e2251f9824d1d5bc9241afe4a0b964981c8a02a176bca459025359
-DIST moto-3.1.1.tar.gz 2236948 BLAKE2B 8ab52a59dc09f4819c1169d26fd198b13159635c2571fd27e38eaedc0a83fa5e7af0a7adba90db1c48658a849ff0b17e8d9c9750a47c6981960ac786f3d9a4e0 SHA512 2354886a9b3b46bb33b832495a94f1dcd10cf5cb00454b6e8b6b6838618842ca06f8577c1826bca02a10e2f723cf474a7c492cd9fb587bdb660deb118c17aa4d
-DIST moto-3.1.2.tar.gz 2245068 BLAKE2B f25a4476bfbbbd3cab77efc1ef2ceeb74b2b7ee9067aac4a02f90c6fd385c5ed0d66d3fd8171945e22dcd78555c9fdbec78656109b9f61fd15950c44b456d4ea SHA512 51dfef58069f09b4654aa59bef2ee0426c0e662af51d78013c19671b664ade78d2c664c20f19592236808ba7bcc50613700232e87be1ac8dcead4be2df36d39b
-DIST moto-3.1.3.tar.gz 2246198 BLAKE2B 935271da2b09b160c7ed8c8b1e2466b352d879c7b8bbe4406a410c301f9659fde3187ed76f2ad6695c79a667a44c698570dcb30206a0fe0b525a5e5bef72f40c SHA512 20963f9a1a99a2ac1654660284b3cb60439538da0d363baba92e813dd3c7bde815c125bc39cd1cf5c0cd883fba024dfda85b7e98a54141ad3e25311986c68c9a
-DIST moto-3.1.4.tar.gz 2256325 BLAKE2B d0b90eee9f77370ea48e95a5920b139825550850276760842e16ddbe340e09746a0ec6c4e4d9a57f8a68232d807b17920fff4bd88a9a75d0a72c8153cb5cbfb1 SHA512 3ec226dc19b46af50f4a266957e54292b65b9b198a5daf2f5eba6242cf2ab9a42ba743d0af1f30695de625e9fa222871890b497717ac2b9ed111b033f3804b25
-EBUILD moto-3.0.5.ebuild 4140 BLAKE2B b4bf0790620a560b228fccf99e0035fe9fdf58af326537f37d45ff0abd3f8ddf929062c348dcf39ea78f379b24d79ae1b102d1fa65c340c8bdcd911f71e71404 SHA512 ba1fd72d320c33566a46e1529ce4d1ea18622e0f91dc4f0ddb101ec9a8cdd5f6feccae97cd6acaadac0f4cbf4fd50e80c84c5c5d960ddbea81a36d40ac67cf40
-EBUILD moto-3.1.1.ebuild 3440 BLAKE2B 39962f6d7c6c4afa396c6c8fcb0214fd21b752e94f99533e6183a75be845b2b4d70a321905df41de36955e84e72161c50336b5753fca67deb19fdec95ed6983d SHA512 b41d702c3330cb04698e4def1f33d56300f381a2818f0dc33b0fa471a1f43c7837230daf26e4df6d40c95f1ca89950d29ec2a639512af59a5e4431e190de3a6b
-EBUILD moto-3.1.2.ebuild 3382 BLAKE2B 121f513d2e3bf850eb5c566f94b4b12f70e07f682c502920cf6fac95b3a6f8f542c3b6fc29e0499e7d03849532a4eae3a376a2bc40c50f5fb41573ca5d3fdd28 SHA512 f931acc8fc8dfb1f901469b3837f46acc2b4ed7058757c0705f64f4ed0336ff537a669eb8a5fc453dd14ad4e72ee81d223cb6377e749c0ead36a393f805d9432
-EBUILD moto-3.1.3.ebuild 3382 BLAKE2B 121f513d2e3bf850eb5c566f94b4b12f70e07f682c502920cf6fac95b3a6f8f542c3b6fc29e0499e7d03849532a4eae3a376a2bc40c50f5fb41573ca5d3fdd28 SHA512 f931acc8fc8dfb1f901469b3837f46acc2b4ed7058757c0705f64f4ed0336ff537a669eb8a5fc453dd14ad4e72ee81d223cb6377e749c0ead36a393f805d9432
-EBUILD moto-3.1.4.ebuild 3382 BLAKE2B 121f513d2e3bf850eb5c566f94b4b12f70e07f682c502920cf6fac95b3a6f8f542c3b6fc29e0499e7d03849532a4eae3a376a2bc40c50f5fb41573ca5d3fdd28 SHA512 f931acc8fc8dfb1f901469b3837f46acc2b4ed7058757c0705f64f4ed0336ff537a669eb8a5fc453dd14ad4e72ee81d223cb6377e749c0ead36a393f805d9432
+DIST moto-3.1.5.tar.gz 2282060 BLAKE2B f7b2cbf1de96b6d96b334e5b51bcdf69fb9645261564b28b290c19c37c27df5c25395ce54cc7d9c424f25cb381f4ddf13dc51456fb7baeec5e21b2da6abf725b SHA512 583c4e76a5acacdcce456cd953109b130dd53d6bf3e50d56d5ead6bfbdcd181109ce3df141686a4717687d3e1e8b33a73bdc7155c36aa5d064a4621e007ab17a
+DIST moto-3.1.6.tar.gz 2273226 BLAKE2B 91966fd315b3e5b4904ecc0e17c716bb47ecb6b644ccaad2cd52fb92754b79af0edb11573fadfd40b8ae75c17bad3429b6e2c4801424c4f30fea32689cd790d1 SHA512 f97ca412910ec9a0cf6d7e28b2ff2f2bf6a3d142a091f65eb4ccf8d53ae9d5362cccdbd24d72083f2d9c6200a3f6e400cca32c16965731d0fbd22239f9866d59
+DIST moto-3.1.7.tar.gz 2275858 BLAKE2B 7984da8df1ebf305ae11f16179612854b630e20eaeb834d85be4063becf73d0615183c93d242e162c7520225fee9eca149a9756fd507b9aaf8e19242fee3f25e SHA512 fed1c97515bed3640f6959cfba417ed27771d77a1b43e94877520ed582542eb61cc4f7d88c791834425b1a1614641a2c178f57787440af545ecf5b03fd6649f2
+DIST moto-3.1.8.tar.gz 2295468 BLAKE2B 0417e08d730d840f552c171d3ee7cfc07b395ffaa27b811c8f43426aebca6969b29111d481b9eb6d7fe1d4cadb4296027354b908512f03e0c45e2d9175b4376f SHA512 357b5841601f39732aa244d8ecd062b6812eed3d41cbf3a08138d826de5803cd631adc5b9fe2cae2d1e7553951906e49a8af464f97dfd5683f8099e475ca8b94
+EBUILD moto-3.1.5.ebuild 3783 BLAKE2B 2a10964580092a2fa6b56972a30bd04b4150a1902af028b600ad3ec4a098be88064cf5c14c4293b35ca87fd5b4a8e583f22a0d1e9820b0462af7b049255bc16a SHA512 0c4986fe5dae3ecb5183ab6fb60b7445a6bb7046f94fffd3c7e2f87e42efb3ca4c0d4f1e37033f0c72682a3fb6b35dbe3499334f203f3b2cf98da233a7a8f946
+EBUILD moto-3.1.6.ebuild 3785 BLAKE2B 5c1564be7993d5052755debb2d57e71f12a83d3fea3e30c089b5edae24f86621f4029287be2c5e6467c24c5fb53408859b2cd06ff6bae1ee33fe40751d040f39 SHA512 6d89d680ada9e7a1274b16c73cf62c901da07cd6ffc5b668dfc5658d183dbefa494b6f349178337402bf0bd04f7914d613382fc42566874d1b991340c5f74b33
+EBUILD moto-3.1.7.ebuild 3785 BLAKE2B 5c1564be7993d5052755debb2d57e71f12a83d3fea3e30c089b5edae24f86621f4029287be2c5e6467c24c5fb53408859b2cd06ff6bae1ee33fe40751d040f39 SHA512 6d89d680ada9e7a1274b16c73cf62c901da07cd6ffc5b668dfc5658d183dbefa494b6f349178337402bf0bd04f7914d613382fc42566874d1b991340c5f74b33
+EBUILD moto-3.1.8.ebuild 3785 BLAKE2B 5c1564be7993d5052755debb2d57e71f12a83d3fea3e30c089b5edae24f86621f4029287be2c5e6467c24c5fb53408859b2cd06ff6bae1ee33fe40751d040f39 SHA512 6d89d680ada9e7a1274b16c73cf62c901da07cd6ffc5b668dfc5658d183dbefa494b6f349178337402bf0bd04f7914d613382fc42566874d1b991340c5f74b33
 MISC metadata.xml 552 BLAKE2B c0162cc80007c1fda211c105b3e7391e3596ef11deb9257bab489f4b112f79ed115ca3f250bdf1b87aee0af258aa59056c8d062acebca7dec631acf3ec9eb2bb SHA512 3f7b3c5709bca51588e58f9eeb9bb363e2657a7e6483519ec7782eb047a5311d434e2459ccd3b495340f85f72a92da2f7cc6eb3de617e979bade7b8fc7b3c01d
diff --git a/dev-python/moto/files/moto-3.1.1-32bit-time_t.patch b/dev-python/moto/files/moto-3.1.1-32bit-time_t.patch
deleted file mode 100644
index f4ab312f0332..000000000000
--- a/dev-python/moto/files/moto-3.1.1-32bit-time_t.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 878ce5bfd58060324fe58cb0a84653c02d895be4 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Sun, 20 Mar 2022 10:19:18 +0100
-Subject: [PATCH] Fix test failures on systems with 32-bit time_t
-
-Skip tests if OverflowError is raised when boto3 is processing
-timestamps.  This is a known limitation of boto3 on 32-bit platforms
-(https://github.com/boto/botocore/issues/2355).
-
-Catching OverflowError is the best option here since some 32-bit
-platforms (e.g. NetBSD) use 64-bit time_t, and others are working
-on providing a switch to the 64-bit type (e.g. glibc).
----
- tests/test_acm/test_acm.py         |  5 ++++-
- tests/test_budgets/test_budgets.py | 14 ++++++++++----
- 2 files changed, 14 insertions(+), 5 deletions(-)
-
-diff --git a/tests/test_acm/test_acm.py b/tests/test_acm/test_acm.py
-index b48897c1..6594787a 100644
---- a/tests/test_acm/test_acm.py
-+++ b/tests/test_acm/test_acm.py
-@@ -160,7 +160,10 @@ def test_describe_certificate():
-     client = boto3.client("acm", region_name="eu-central-1")
-     arn = _import_cert(client)
- 
--    resp = client.describe_certificate(CertificateArn=arn)
-+    try:
-+        resp = client.describe_certificate(CertificateArn=arn)
-+    except OverflowError:
-+        pytest.skip("This test requires 64-bit time_t")
-     resp["Certificate"]["CertificateArn"].should.equal(arn)
-     resp["Certificate"]["DomainName"].should.equal(SERVER_COMMON_NAME)
-     resp["Certificate"]["Issuer"].should.equal("Moto")
-diff --git a/tests/test_budgets/test_budgets.py b/tests/test_budgets/test_budgets.py
-index 578a7298..b3de3121 100644
---- a/tests/test_budgets/test_budgets.py
-+++ b/tests/test_budgets/test_budgets.py
-@@ -22,9 +22,12 @@ def test_create_and_describe_budget_minimal_params():
-     )
-     resp["ResponseMetadata"]["HTTPStatusCode"].should.equal(200)
- 
--    budget = client.describe_budget(AccountId=ACCOUNT_ID, BudgetName="testbudget")[
--        "Budget"
--    ]
-+    try:
-+        budget = client.describe_budget(AccountId=ACCOUNT_ID, BudgetName="testbudget")[
-+            "Budget"
-+        ]
-+    except OverflowError:
-+        pytest.skip("This test requires 64-bit time_t")
-     budget.should.have.key("BudgetLimit")
-     budget["BudgetLimit"].should.have.key("Amount")
-     budget["BudgetLimit"]["Amount"].should.equal("10")
-@@ -140,7 +143,10 @@ def test_create_and_describe_all_budgets():
-         },
-     )
- 
--    res = client.describe_budgets(AccountId=ACCOUNT_ID)
-+    try:
-+        res = client.describe_budgets(AccountId=ACCOUNT_ID)
-+    except OverflowError:
-+        pytest.skip("This test requires 64-bit time_t")
-     res["Budgets"].should.have.length_of(1)
- 
- 
--- 
-2.35.1
-
diff --git a/dev-python/moto/moto-3.0.5.ebuild b/dev-python/moto/moto-3.0.5.ebuild
deleted file mode 100644
index 4c400131d65b..000000000000
--- a/dev-python/moto/moto-3.0.5.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-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 ~arm ~arm64 ~ppc64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/aws-xray-sdk-python-0.93[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/backports-tempfile[${PYTHON_USEDEP}]' python3_{6,7})
-	dev-python/boto[${PYTHON_USEDEP}]
-	dev-python/cfn-lint[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-3.3.1[${PYTHON_USEDEP}]
-	dev-python/cookies[${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/boto3[${PYTHON_USEDEP}]
-	dev-python/botocore[${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/flask-cors[${PYTHON_USEDEP}]
-	dev-python/more-itertools[${PYTHON_USEDEP}]
-	dev-python/pretty-yaml[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.1[${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/python-sshpubkeys[${PYTHON_USEDEP}]
-	>=dev-python/responses-0.9.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.5[${PYTHON_USEDEP}]
-	dev-python/xmltodict[${PYTHON_USEDEP}]
-	dev-python/werkzeug[${PYTHON_USEDEP}]
-	dev-python/zipp[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-		>=dev-python/sure-1.4.11[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/moto-3.1.1-32bit-time_t.patch
-)
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		tests/test_firehose/test_firehose_put.py::test_put_record_http_destination
-		tests/test_firehose/test_firehose_put.py::test_put_record_batch_http_destination
-		tests/test_sqs/test_sqs_cloudformation.py::test_describe_stack_subresources
-		tests/test_swf/responses/test_decision_tasks.py::test_respond_decision_task_completed_with_schedule_activity_task_boto3
-		tests/test_swf/responses/test_timeouts.py::test_activity_task_heartbeat_timeout_boto3
-		tests/test_swf/responses/test_timeouts.py::test_decision_task_start_to_close_timeout_boto3
-		tests/test_swf/responses/test_timeouts.py::test_workflow_execution_start_to_close_timeout_boto3
-		# broken code (local variable used referenced before definition)
-		tests/test_appsync/test_appsync_schema.py
-		# Needs network (or docker?) but not marked as such, bug #807031
-		# TODO: report upstream
-		tests/test_batch/test_batch_jobs.py::test_terminate_job
-		tests/test_batch/test_batch_jobs.py::test_cancel_pending_job
-		tests/test_batch/test_batch_jobs.py::test_cancel_running_job
-		tests/test_batch/test_batch_jobs.py::test_dependencies
-		tests/test_batch/test_batch_jobs.py::test_container_overrides
-		tests/test_cloudformation/test_cloudformation_custom_resources.py::test_create_custom_lambda_resource__verify_cfnresponse_failed
-		tests/test_cloudformation/test_cloudformation_stack_integration.py::test_lambda_function
-		tests/test_sqs/test_integration.py::test_invoke_function_from_sqs_exception
-		tests/test_sqs/test_sqs_integration.py::test_invoke_function_from_sqs_exception
-		# broken by new expat
-		tests/test_sts/test_sts.py::test_assume_role_with_saml
-		tests/test_sts/test_sts.py::test_assume_role_with_saml_should_not_rely_on_attribute_order
-		tests/test_sts/test_sts.py::test_assume_role_with_saml_should_respect_xml_namespaces
-		tests/test_sts/test_sts.py::test_assume_role_with_saml_should_retrieve_attribute_value_from_text_when_xml_tag_contains_xmlns_attributes
-		tests/test_sts/test_sts.py::test_assume_role_with_saml_should_default_session_duration_to_3600_seconds_when_saml_attribute_not_provided
-	)
-
-	# pytest-django causes freezegun try to mangle stuff inside django
-	# which fails when django is not really used
-	epytest -p no:django -m 'not network'
-}
diff --git a/dev-python/moto/moto-3.1.2.ebuild b/dev-python/moto/moto-3.1.5.ebuild
index 49b6647dfd22..9069529dd086 100644
--- a/dev-python/moto/moto-3.1.2.ebuild
+++ b/dev-python/moto/moto-3.1.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/aws-xray-sdk-python-0.93[${PYTHON_USEDEP}]
@@ -31,6 +31,7 @@ RDEPEND="
 	dev-python/flask[${PYTHON_USEDEP}]
 	dev-python/flask-cors[${PYTHON_USEDEP}]
 	dev-python/more-itertools[${PYTHON_USEDEP}]
+	dev-python/pyparsing[${PYTHON_USEDEP}]
 	dev-python/pretty-yaml[${PYTHON_USEDEP}]
 	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
 	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
@@ -76,6 +77,9 @@ python_test() {
 		tests/test_cloudformation/test_cloudformation_stack_integration.py::test_lambda_function
 		tests/test_sqs/test_integration.py::test_invoke_function_from_sqs_exception
 		tests/test_sqs/test_sqs_integration.py::test_invoke_function_from_sqs_exception
+		"tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda[match_events0-ObjectCreated:Put]"
+		"tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda[match_events1-ObjectCreated:Put]"
+		"tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda[match_events3-ObjectCreated:Put]"
 	)
 
 	# pytest-django causes freezegun try to mangle stuff inside django
diff --git a/dev-python/moto/moto-3.1.3.ebuild b/dev-python/moto/moto-3.1.6.ebuild
index 49b6647dfd22..a0c6ea25e7d8 100644
--- a/dev-python/moto/moto-3.1.3.ebuild
+++ b/dev-python/moto/moto-3.1.6.ebuild
@@ -31,6 +31,7 @@ RDEPEND="
 	dev-python/flask[${PYTHON_USEDEP}]
 	dev-python/flask-cors[${PYTHON_USEDEP}]
 	dev-python/more-itertools[${PYTHON_USEDEP}]
+	dev-python/pyparsing[${PYTHON_USEDEP}]
 	dev-python/pretty-yaml[${PYTHON_USEDEP}]
 	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
 	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
@@ -76,6 +77,9 @@ python_test() {
 		tests/test_cloudformation/test_cloudformation_stack_integration.py::test_lambda_function
 		tests/test_sqs/test_integration.py::test_invoke_function_from_sqs_exception
 		tests/test_sqs/test_sqs_integration.py::test_invoke_function_from_sqs_exception
+		"tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda[match_events0-ObjectCreated:Put]"
+		"tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda[match_events1-ObjectCreated:Put]"
+		"tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda[match_events3-ObjectCreated:Put]"
 	)
 
 	# pytest-django causes freezegun try to mangle stuff inside django
diff --git a/dev-python/moto/moto-3.1.4.ebuild b/dev-python/moto/moto-3.1.7.ebuild
index 49b6647dfd22..a0c6ea25e7d8 100644
--- a/dev-python/moto/moto-3.1.4.ebuild
+++ b/dev-python/moto/moto-3.1.7.ebuild
@@ -31,6 +31,7 @@ RDEPEND="
 	dev-python/flask[${PYTHON_USEDEP}]
 	dev-python/flask-cors[${PYTHON_USEDEP}]
 	dev-python/more-itertools[${PYTHON_USEDEP}]
+	dev-python/pyparsing[${PYTHON_USEDEP}]
 	dev-python/pretty-yaml[${PYTHON_USEDEP}]
 	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
 	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
@@ -76,6 +77,9 @@ python_test() {
 		tests/test_cloudformation/test_cloudformation_stack_integration.py::test_lambda_function
 		tests/test_sqs/test_integration.py::test_invoke_function_from_sqs_exception
 		tests/test_sqs/test_sqs_integration.py::test_invoke_function_from_sqs_exception
+		"tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda[match_events0-ObjectCreated:Put]"
+		"tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda[match_events1-ObjectCreated:Put]"
+		"tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda[match_events3-ObjectCreated:Put]"
 	)
 
 	# pytest-django causes freezegun try to mangle stuff inside django
diff --git a/dev-python/moto/moto-3.1.1.ebuild b/dev-python/moto/moto-3.1.8.ebuild
index 71834ad342e9..a0c6ea25e7d8 100644
--- a/dev-python/moto/moto-3.1.1.ebuild
+++ b/dev-python/moto/moto-3.1.8.ebuild
@@ -31,6 +31,7 @@ RDEPEND="
 	dev-python/flask[${PYTHON_USEDEP}]
 	dev-python/flask-cors[${PYTHON_USEDEP}]
 	dev-python/more-itertools[${PYTHON_USEDEP}]
+	dev-python/pyparsing[${PYTHON_USEDEP}]
 	dev-python/pretty-yaml[${PYTHON_USEDEP}]
 	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
 	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
@@ -54,10 +55,6 @@ BDEPEND="
 
 distutils_enable_tests pytest
 
-PATCHES=(
-	"${FILESDIR}"/moto-3.1.1-32bit-time_t.patch
-)
-
 python_test() {
 	local EPYTEST_DESELECT=(
 		# TODO
@@ -80,6 +77,9 @@ python_test() {
 		tests/test_cloudformation/test_cloudformation_stack_integration.py::test_lambda_function
 		tests/test_sqs/test_integration.py::test_invoke_function_from_sqs_exception
 		tests/test_sqs/test_sqs_integration.py::test_invoke_function_from_sqs_exception
+		"tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda[match_events0-ObjectCreated:Put]"
+		"tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda[match_events1-ObjectCreated:Put]"
+		"tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda[match_events3-ObjectCreated:Put]"
 	)
 
 	# pytest-django causes freezegun try to mangle stuff inside django