Updating liguros repo21.1.2

9 files changed, 12 insertions, 234 deletions

diff --git a/dev-python/aws-sam-translator/Manifest b/dev-python/aws-sam-translator/Manifest
index ece3e7fbf071..0afa23359727 100644
--- a/dev-python/aws-sam-translator/Manifest
+++ b/dev-python/aws-sam-translator/Manifest
@@ -1,7 +1,2 @@
-DIST aws-sam-translator-1.27.0.tar.gz 795259 BLAKE2B e28bad80f5353002a2279149efd1e1e3e4575445c45cb275dd0896986633b6968c0a47487a08a056303e629289f9584a11c813a9bc134a3c261bb235d696aeb5 SHA512 e1c7c5fc0e7f4554f6122479da928f45642f6d2573141c8c1f1b6283a1d4419e58deadb298a12ee1d48daa24af2fef71879865af858f5b890648b1594f9c4e2c
-DIST aws-sam-translator-1.28.1.tar.gz 798846 BLAKE2B 6cb554f81f13e6a2196d2fbc64a043a855ecc6c8f5d3e2bb87ef41969b5ef804c2920e3d2f099ce1e1ebb697a2f3c49539e9c63514f15c2acab0cc109ba20ea1 SHA512 6404c908d281e5ac7cf6d61211fc584f7293d4d8d3d509d4386a12e056b684e498ed66fcfc299fbfcabdd12a770c9e56a5fb53c37d06412c60fb28c1f20dfdf6
-DIST aws-sam-translator-1.29.0.tar.gz 805869 BLAKE2B 89054fa7e2488b53daf73a78ae130ad4217775403855d19e22a922f841a36a5a476351f3eec08f1f4b269b12a7e5df1fcd72e301f8ee03896e049becac25c40e SHA512 906107a558dce3a48a263d350d0f475710fa2c5cec38bff2b01c747fc8a0b13851fc3b3c2a4e498c5f7977501215dbee753e455c64508d95754e076ffd8b1089
-DIST aws-sam-translator-1.30.0.tar.gz 810821 BLAKE2B cb7d13162512f793c33f617290d36ad78d2410ad225835ae175192b7e57ae29745a247e08f9b34a158837aca57a4f30bcb9f90f0c4b902ef238ba4e99a0f80ff SHA512 a521994bbbf461a7a28dc8861a751e9495c0684c7462bb5da6459dffbc69917291f2ca6d0480a6dc0264d954c37fccff8c9b3691992d2fe082ce981d31af21da
-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
diff --git a/dev-python/aws-sam-translator/aws-sam-translator-1.27.0.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.27.0.ebuild
deleted file mode 100644
index 448af770e389..000000000000
--- a/dev-python/aws-sam-translator/aws-sam-translator-1.27.0.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,7,8,9,10} )
-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.28.1.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.28.1.ebuild
deleted file mode 100644
index fcb2e80cc543..000000000000
--- a/dev-python/aws-sam-translator/aws-sam-translator-1.28.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,7,8,9,10} )
-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.29.0.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.29.0.ebuild
deleted file mode 100644
index fcb2e80cc543..000000000000
--- a/dev-python/aws-sam-translator/aws-sam-translator-1.29.0.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,7,8,9,10} )
-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.30.0.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.30.0.ebuild
deleted file mode 100644
index fcb2e80cc543..000000000000
--- a/dev-python/aws-sam-translator/aws-sam-translator-1.30.0.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,7,8,9,10} )
-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
deleted file mode 100644
index fcb2e80cc543..000000000000
--- a/dev-python/aws-sam-translator/aws-sam-translator-1.31.0.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,7,8,9,10} )
-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.32.0-r1.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.32.0-r1.ebuild
index 3514a65b6656..7616f2f08536 100644
--- a/dev-python/aws-sam-translator/aws-sam-translator-1.32.0-r1.ebuild
+++ b/dev-python/aws-sam-translator/aws-sam-translator-1.32.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,13 +7,14 @@ 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"
+HOMEPAGE="https://github.com/aws/serverless-application-model
+	https://pypi.org/project/aws-sam-translator/"
+SRC_URI="https://github.com/aws/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"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/boto3-1.5[${PYTHON_USEDEP}]
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.33.0.ebuild
index fcb2e80cc543..83cf8947e7f2 100644
--- a/dev-python/aws-sam-translator/aws-sam-translator-1.30.1.ebuild
+++ b/dev-python/aws-sam-translator/aws-sam-translator-1.33.0.ebuild
@@ -7,8 +7,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"
+HOMEPAGE="https://github.com/aws/serverless-application-model
+	https://pypi.org/project/aws-sam-translator/"
+SRC_URI="https://github.com/aws/serverless-application-model/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}/serverless-application-model-${PV}"
 
 LICENSE="Apache-2.0"
@@ -19,6 +20,7 @@ RDEPEND="
 	>=dev-python/boto3-1.5[${PYTHON_USEDEP}]
 	>=dev-python/jsonschema-2.6[${PYTHON_USEDEP}]
 	>=dev-python/six-1.11[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
 "
 BDEPEND="
 	test? (
diff --git a/dev-python/aws-sam-translator/metadata.xml b/dev-python/aws-sam-translator/metadata.xml
index 8df3848ea60e..90b35c100a1b 100644
--- a/dev-python/aws-sam-translator/metadata.xml
+++ b/dev-python/aws-sam-translator/metadata.xml
@@ -11,9 +11,9 @@
 	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
-		<remote-id type="github">awslabs/serverless-application-model</remote-id>
+		<remote-id type="github">aws/serverless-application-model</remote-id>
 		<remote-id type="pypi">aws-sam-translator</remote-id>
-		<bugs-to>https://github.com/awslabs/serverless-application-model/issues</bugs-to>
+		<bugs-to>https://github.com/aws/serverless-application-model/issues</bugs-to>
 	</upstream>
 	<origin>gentoo-staging</origin>
 </pkgmetadata>