gentoo resync : 13.06.2020

4 files changed, 54 insertions, 6 deletions

diff --git a/dev-python/aws-sam-translator/Manifest b/dev-python/aws-sam-translator/Manifest
index f11c796ab4b7..61ec749731bb 100644
--- a/dev-python/aws-sam-translator/Manifest
+++ b/dev-python/aws-sam-translator/Manifest
@@ -1,5 +1,7 @@
 DIST aws-sam-translator-1.11.0.tar.gz 96492 BLAKE2B 4025492501d17699b64041a94704d0ec491ffb02a4b7e48c2647101be4d504b6a8c08a9a043c2d964a51d1ef7b40e4fd1d993f9d3b38b5b75460a7d0117b9f49 SHA512 e008248ef3401ffe58590c6d68667f67e5963e416656daea545c8d938ab8cb5d8b1c9c7f5aea2d53cedfd74b1fb8677e99a93a8a78235198b18c14df957d0c74
 DIST aws-sam-translator-1.22.0.tar.gz 5092855 BLAKE2B 596d4162938889fd7fc1dcddfa7317bc772b2a5629940a2a0ce1329c8e05c063872ce15dce95d99aadbb80409c015c00a5ce0e4f066de2609f21008e3c5c1faa SHA512 070a9d72683251d11c3f3d41d5ae5e51249f27bd8c7890fb77254b81e9e1267fd2324dac7a246b2b1067210da9beb78cb97dc0f4a31b29e3990a300a05bd4a4a
+DIST aws-sam-translator-1.24.0.tar.gz 5142130 BLAKE2B 43c1f3741296a70af6560655363d144bd654d7184d3654b9aaee6dece52a2a5fd557f605040d46f530886abc9cb4ae55703f588bdfbf70e5eabedfda3f5e0d56 SHA512 f5278be23e9426c5b9be8960cfce442e8f1302afbe99aa76c119ed11b9de40151195534cdb8d72e3eb13f40af2f2efe54dfbd55c6bf3c5f8ce2450848bc047a5
 EBUILD aws-sam-translator-1.11.0.ebuild 824 BLAKE2B 65c797b5020337329d624225cdd4083a0b883c20523dce972f6aff6501c7398b8784de815be9430058269b8ef907d4c366fe207f922c563cecd15a7c1f6ad3aa SHA512 ba3b300c41aade2dc975e3b0a55d8f28cda4f33836f18f26733df6898b7cb84bbd8260d4e8b06374325da1fa082ac16a2a7e33998fd512affee21fe22a2f00e5
-EBUILD aws-sam-translator-1.22.0.ebuild 1341 BLAKE2B 07939310eb56db26f7025bdbbeec6f68634697d14170b2fa1d4735d91061f204ddd271d2031acbcfb326df4d01f667ad606c65d76294f46e4c38e87473335478 SHA512 a772b32e95af03673b9a84fd7730a44ed5d7cbaf5a3b619a3353c6af549faf4800d90af5aac8bd22329160e4802c8ee7cbd8815c4958a59b27cb0dde63e4df19
-MISC metadata.xml 485 BLAKE2B 10b9c47652be590d59b1947cacf9553a9b4ce84a48984f8b8d7f3084faea37d32d55521cbf3ae5850753745284e36b18013416c929cba11b2b5e92f51292db5f SHA512 c75c6b500543fbd58dc0ffa7a129619d27580935a407653ad65aeb8c38c7e56b1e5fe87191d53d9c5b336953270b120843587a1c5a3030b19e9f48fb690d78ca
+EBUILD aws-sam-translator-1.22.0.ebuild 1290 BLAKE2B 299963273afd44197a8bd2bb5be11ff17cdada8e694499642b033cf1e7f7b69d10d46739f04f4d294202db1782c0958b8e3c715b7fee291264680e83ac853de7 SHA512 3393395bbdf5bf71166a9ebd2956fce151ea4ce562d32b14cf877cf698b60a50a550e15356595e06ade6441fb697e5c5cc8fbdba72d73d24e2eca9468e55a983
+EBUILD aws-sam-translator-1.24.0.ebuild 1290 BLAKE2B 299963273afd44197a8bd2bb5be11ff17cdada8e694499642b033cf1e7f7b69d10d46739f04f4d294202db1782c0958b8e3c715b7fee291264680e83ac853de7 SHA512 3393395bbdf5bf71166a9ebd2956fce151ea4ce562d32b14cf877cf698b60a50a550e15356595e06ade6441fb697e5c5cc8fbdba72d73d24e2eca9468e55a983
+MISC metadata.xml 586 BLAKE2B 218aa559f6245f355cad9eb9cdb59734f2de73a88c9fe83cc17c78c2157e69968b5ac5b703b36743e4daafac249ba5d6866c2697d7081bc897f07ce6c457ac42 SHA512 8076d6c6af7184be3008268713819abe9027acd7be22155cc0130a8e626afc1fb45f64b63db6b86185942867293154835244842b889c24b0b05ab5d54d7734e0
diff --git a/dev-python/aws-sam-translator/aws-sam-translator-1.22.0.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.22.0.ebuild
index cea1f43cbc51..e570b035756d 100644
--- a/dev-python/aws-sam-translator/aws-sam-translator-1.22.0.ebuild
+++ b/dev-python/aws-sam-translator/aws-sam-translator-1.22.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 DISTUTILS_USE_SETUPTOOLS=bdepend
 inherit distutils-r1
 
@@ -14,7 +14,6 @@ S="${WORKDIR}/serverless-application-model-${PV}"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
 
 RDEPEND="
 	>=dev-python/boto3-1.5[${PYTHON_USEDEP}]
@@ -22,12 +21,11 @@ RDEPEND="
 	>=dev-python/six-1.11[${PYTHON_USEDEP}]
 "
 BDEPEND="
-	test? ( ${RDEPEND}
+	test? (
 		dev-python/mock[${PYTHON_USEDEP}]
 		dev-python/parameterized[${PYTHON_USEDEP}]
 	)
 "
-RESTRICT="!test? ( test )"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/aws-sam-translator/aws-sam-translator-1.24.0.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.24.0.ebuild
new file mode 100644
index 000000000000..e570b035756d
--- /dev/null
+++ b/dev-python/aws-sam-translator/aws-sam-translator-1.24.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+inherit distutils-r1
+
+DESCRIPTION="A library that transform SAM templates into AWS CloudFormation templates"
+HOMEPAGE="https://github.com/awslabs/serverless-application-model https://pypi.org/project/aws-sam-translator/"
+SRC_URI="https://github.com/awslabs/serverless-application-model/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/serverless-application-model-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/boto3-1.5[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.6[${PYTHON_USEDEP}]
+	>=dev-python/six-1.11[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# remove pytest-cov dependency
+	sed -r -e 's:--cov(-[[:graph:]]+|)[[:space:]]+[[:graph:]]+::g' \
+		-i pytest.ini || die
+
+	# don't install tests
+	sed -e 's:"tests",:"tests", "tests.*",:' -i setup.py || die
+
+	# deps are installed by ebuild, don't try to reinstall them via pip
+	truncate --size=0 requirements/*.txt || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/aws-sam-translator/metadata.xml b/dev-python/aws-sam-translator/metadata.xml
index de0ced977a97..d20a897dcc58 100644
--- a/dev-python/aws-sam-translator/metadata.xml
+++ b/dev-python/aws-sam-translator/metadata.xml
@@ -5,6 +5,10 @@
 		<email>zmedico@gentoo.org</email>
 		<name>Zac Medico</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">awslabs/serverless-application-model</remote-id>
 		<remote-id type="pypi">aws-sam-translator</remote-id>