gentoo new year resync : 01.01.2021

3 files changed, 2 insertions, 48 deletions

diff --git a/dev-python/aws-sam-translator/Manifest b/dev-python/aws-sam-translator/Manifest
index 25dfc1752b41..153aebf1ceb9 100644
--- a/dev-python/aws-sam-translator/Manifest
+++ b/dev-python/aws-sam-translator/Manifest
@@ -1,9 +1,7 @@
-DIST aws-sam-translator-1.30.1.tar.gz 810865 BLAKE2B 2039e0724d05f7f9d8372b149f04427e0bd1a8a9b503e6dc49ee76cb4e7678d8f759317c43922d190a2bb55a446feffcbf448cdbc9343538b5c77d81b5545e5f SHA512 8fcdf0843f52c8424a78540cf2a9c3922070bcd34a2e0001a17b89b19b471dfbfc4fcd48211b80292d2f7b76eb2881152c68c4d4b56499ab38942c025226d49e
 DIST aws-sam-translator-1.31.0.tar.gz 813078 BLAKE2B ae87944bcfe7481db62c0556e1f20defbe5890bebd9b6bc8fe4f597b1ff463ec6382384832451becf5a49361149102a31316ca83e5933d12e0e7e18c9861b9c9 SHA512 fd2b775d2127cce9d78cd3c7ac4dd19f88a94be474f94e4db2486dc96bc88d9a3f621a80bd6dd0b9d70a42df32f3a9164c234a44ce69f84913aa6f4c59ae3682
 DIST aws-sam-translator-1.32.0.tar.gz 817649 BLAKE2B 34d606bb294700dac1d3385d173d737d3259f460d0ead302521eb4e2660d3781c49ce5db71e1721245068efdac03eefcfe8963d4915d1e1c60fd783880a95bc9 SHA512 e4adce238434983c56b69960fd673db88edf5b3e4f9356ca4dae508f5a7a8e6bbd3c84050ee606e1fbd578d8f58c5d8196890187e058b7ae2bc8249dbb8ac0d4
 DIST aws-sam-translator-1.33.0.tar.gz 817801 BLAKE2B 6e50f299b077f6d0240ee4db80450f766589c5349c323cd846c9ef42dc08bfcb7f8f80099c7d1ecf940d3ba1c2e4628842bf4b1f12e8fcc6c83100f5a375125d SHA512 72fadce4851d782e37e786132d98bcc364c92a1fa48addf715f0d2cf28e286e8cb8835de05fccc67c153d45ed8ba9fd3b7445333f8d96cd70b6c854b8b34c5d6
-EBUILD aws-sam-translator-1.30.1.ebuild 1300 BLAKE2B 653b444030665f83e9f4bab75995548e0438674ec88268fcb7cf7264b814aaf84f87268b955026a4adc87860d84c55a972bc00ffda181fddf6fec17b1296245c SHA512 1e458ca29205944eb9f970a715ba570fbfc1bd7993756fcc23b00a8ccdfbbab6b1d204781eb3e5891119978500e0c09cd01f74ba76ef7910ab27b0df27861d77
-EBUILD aws-sam-translator-1.31.0.ebuild 1302 BLAKE2B fc7ed0f3c8e070e6c0d43707f8cf760b06e353bc7bbbe2d04683f2bf0cd36ddabc3735192acdb929e934e22b0d883cedd802883c7c9495fbd153c7223ad883f3 SHA512 71cae066cdce8976c9efd7d0c5c764c8ebc3afc4e28ce545e1cc67172e9c53e81addca9cb0242f7b68c2e701f90c2c54a7d1e4696b07f2c090b8bda4ceedd672
+EBUILD aws-sam-translator-1.31.0.ebuild 1300 BLAKE2B 653b444030665f83e9f4bab75995548e0438674ec88268fcb7cf7264b814aaf84f87268b955026a4adc87860d84c55a972bc00ffda181fddf6fec17b1296245c SHA512 1e458ca29205944eb9f970a715ba570fbfc1bd7993756fcc23b00a8ccdfbbab6b1d204781eb3e5891119978500e0c09cd01f74ba76ef7910ab27b0df27861d77
 EBUILD aws-sam-translator-1.32.0-r1.ebuild 1332 BLAKE2B 8d6fefe0f96a5ee6749057b524020e6e72e600d2fcfe1abedce4626a5074902aa818b721bf6d92c5883b4baa22d8126a5b020b2b88255cfef13a4346a2368c02 SHA512 e52a886d455ce75d590a96f19a9dc7d0ee331f105ca4313c4799172b26800b6237c092a6f48ee7de52f81a1bffe8489bf414497ff4caa2aecbfb4109ef38d479
 EBUILD aws-sam-translator-1.33.0.ebuild 1332 BLAKE2B 8d6fefe0f96a5ee6749057b524020e6e72e600d2fcfe1abedce4626a5074902aa818b721bf6d92c5883b4baa22d8126a5b020b2b88255cfef13a4346a2368c02 SHA512 e52a886d455ce75d590a96f19a9dc7d0ee331f105ca4313c4799172b26800b6237c092a6f48ee7de52f81a1bffe8489bf414497ff4caa2aecbfb4109ef38d479
 MISC metadata.xml 602 BLAKE2B ce51fd399f69177920ab2a99807491640ee4fc4193c46279a05f442b608b420122ba8b7302b3fab1724ba2b3bad5519b51d86ff050713ad5bf9953acd843dba0 SHA512 829df35f0b222b1a3c2c17e813bcd2c8d8311e694ce0244877a9e492a91edb9597be906e7a449d7ac641787643fd355a0014e3e9ef113023066c9ccf52f32e65
diff --git a/dev-python/aws-sam-translator/aws-sam-translator-1.30.1.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.30.1.ebuild
deleted file mode 100644
index 21f682a67156..000000000000
--- a/dev-python/aws-sam-translator/aws-sam-translator-1.30.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# 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 ~arm ~arm64 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/aws-sam-translator-1.31.0.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.31.0.ebuild
index fa1227477627..21f682a67156 100644
--- a/dev-python/aws-sam-translator/aws-sam-translator-1.31.0.ebuild
+++ b/dev-python/aws-sam-translator/aws-sam-translator-1.31.0.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/serverless-application-model-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/boto3-1.5[${PYTHON_USEDEP}]