Move dev-python/{cfn-python-lint → cfn-lint}

Signed-off-by: Michał Górny <mgorny@gentoo.org>

12 files changed, 15 insertions, 27 deletions

diff --git a/dev-python/cfn-python-lint/Manifest b/dev-python/cfn-lint/Manifest
index 6ba2044bb1d7..6ba2044bb1d7 100644
--- a/dev-python/cfn-python-lint/Manifest
+++ b/dev-python/cfn-lint/Manifest
diff --git a/dev-python/cfn-python-lint/cfn-python-lint-0.50.0.ebuild b/dev-python/cfn-lint/cfn-lint-0.50.0.ebuild
index 348163842a48..827f630bb2ef 100644
--- a/dev-python/cfn-python-lint/cfn-python-lint-0.50.0.ebuild
+++ b/dev-python/cfn-lint/cfn-lint-0.50.0.ebuild
@@ -6,14 +6,11 @@ EAPI=7
 PYTHON_COMPAT=( python3_{8..9} )
 inherit distutils-r1
 
-# TODO: pkgmove to cfn-lint
-MY_P=${P/-python}
 DESCRIPTION="CloudFormation Linter"
 HOMEPAGE="https://pypi.org/project/cfn-lint/ https://github.com/aws-cloudformation/cfn-lint/"
 SRC_URI="
 	https://github.com/aws-cloudformation/cfn-lint/archive/v${PV}.tar.gz
-		-> ${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
+		-> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
@@ -41,7 +38,7 @@ BDEPEND="
 distutils_enable_tests --install unittest
 
 PATCHES=(
-	"${FILESDIR}/cfn-python-lint-0.30.1-tests.patch"
+	"${FILESDIR}/cfn-lint-0.30.1-tests.patch"
 )
 
 src_prepare() {
diff --git a/dev-python/cfn-python-lint/cfn-python-lint-0.51.0.ebuild b/dev-python/cfn-lint/cfn-lint-0.51.0.ebuild
index 2ca06957a777..6bfc86bbddae 100644
--- a/dev-python/cfn-python-lint/cfn-python-lint-0.51.0.ebuild
+++ b/dev-python/cfn-lint/cfn-lint-0.51.0.ebuild
@@ -6,14 +6,11 @@ EAPI=7
 PYTHON_COMPAT=( python3_{8..9} )
 inherit distutils-r1
 
-# TODO: pkgmove to cfn-lint
-MY_P=${P/-python}
 DESCRIPTION="CloudFormation Linter"
 HOMEPAGE="https://pypi.org/project/cfn-lint/ https://github.com/aws-cloudformation/cfn-lint/"
 SRC_URI="
 	https://github.com/aws-cloudformation/cfn-lint/archive/v${PV}.tar.gz
-		-> ${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
+		-> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
@@ -41,7 +38,7 @@ BDEPEND="
 distutils_enable_tests --install unittest
 
 PATCHES=(
-	"${FILESDIR}/cfn-python-lint-0.30.1-tests.patch"
+	"${FILESDIR}/cfn-lint-0.30.1-tests.patch"
 )
 
 src_prepare() {
diff --git a/dev-python/cfn-python-lint/cfn-python-lint-0.52.0.ebuild b/dev-python/cfn-lint/cfn-lint-0.52.0.ebuild
index 928f06df62fd..1213f702d34d 100644
--- a/dev-python/cfn-python-lint/cfn-python-lint-0.52.0.ebuild
+++ b/dev-python/cfn-lint/cfn-lint-0.52.0.ebuild
@@ -6,14 +6,11 @@ EAPI=8
 PYTHON_COMPAT=( python3_{8..9} )
 inherit distutils-r1
 
-# TODO: pkgmove to cfn-lint
-MY_P=${P/-python}
 DESCRIPTION="CloudFormation Linter"
 HOMEPAGE="https://pypi.org/project/cfn-lint/ https://github.com/aws-cloudformation/cfn-lint/"
 SRC_URI="
 	https://github.com/aws-cloudformation/cfn-lint/archive/v${PV}.tar.gz
-		-> ${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
+		-> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
@@ -41,7 +38,7 @@ BDEPEND="
 distutils_enable_tests --install unittest
 
 PATCHES=(
-	"${FILESDIR}/cfn-python-lint-0.30.1-tests.patch"
+	"${FILESDIR}/cfn-lint-0.30.1-tests.patch"
 )
 
 src_prepare() {
diff --git a/dev-python/cfn-python-lint/cfn-python-lint-0.53.0.ebuild b/dev-python/cfn-lint/cfn-lint-0.53.0.ebuild
index 5c43ac1c42b8..f483fd0763d2 100644
--- a/dev-python/cfn-python-lint/cfn-python-lint-0.53.0.ebuild
+++ b/dev-python/cfn-lint/cfn-lint-0.53.0.ebuild
@@ -6,14 +6,11 @@ EAPI=8
 PYTHON_COMPAT=( python3_{8..9} )
 inherit distutils-r1
 
-# TODO: pkgmove to cfn-lint
-MY_P=${P/-python}
 DESCRIPTION="CloudFormation Linter"
 HOMEPAGE="https://pypi.org/project/cfn-lint/ https://github.com/aws-cloudformation/cfn-lint/"
 SRC_URI="
 	https://github.com/aws-cloudformation/cfn-lint/archive/v${PV}.tar.gz
-		-> ${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
+		-> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
@@ -41,7 +38,7 @@ BDEPEND="
 distutils_enable_tests --install unittest
 
 PATCHES=(
-	"${FILESDIR}/cfn-python-lint-0.30.1-tests.patch"
+	"${FILESDIR}/cfn-lint-0.30.1-tests.patch"
 )
 
 src_prepare() {
diff --git a/dev-python/cfn-python-lint/files/cfn-python-lint-0.30.1-tests.patch b/dev-python/cfn-lint/files/cfn-lint-0.30.1-tests.patch
index 6c81aef9a7a8..6c81aef9a7a8 100644
--- a/dev-python/cfn-python-lint/files/cfn-python-lint-0.30.1-tests.patch
+++ b/dev-python/cfn-lint/files/cfn-lint-0.30.1-tests.patch
diff --git a/dev-python/cfn-python-lint/metadata.xml b/dev-python/cfn-lint/metadata.xml
index 270b9eef5dd1..4596000d2f7c 100644
--- a/dev-python/cfn-python-lint/metadata.xml
+++ b/dev-python/cfn-lint/metadata.xml
@@ -11,8 +11,8 @@
 	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
-		<remote-id type="github">aws-cloudformation/cfn-python-lint</remote-id>
+		<remote-id type="github">aws-cloudformation/cfn-lint</remote-id>
 		<remote-id type="pypi">cfn-lint</remote-id>
-		<bugs-to>https://github.com/aws-cloudformation/cfn-python-lint/issues</bugs-to>
+		<bugs-to>https://github.com/aws-cloudformation/cfn-lint/issues</bugs-to>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/moto/moto-2.0.10.ebuild b/dev-python/moto/moto-2.0.10.ebuild
index eb634172a25a..9dda3ad8ff09 100644
--- a/dev-python/moto/moto-2.0.10.ebuild
+++ b/dev-python/moto/moto-2.0.10.ebuild
@@ -18,7 +18,7 @@ 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-python-lint[${PYTHON_USEDEP}]
+	dev-python/cfn-lint[${PYTHON_USEDEP}]
 	>=dev-python/cryptography-3.3.1[${PYTHON_USEDEP}]
 	dev-python/cookies[${PYTHON_USEDEP}]
 	dev-python/dicttoxml[${PYTHON_USEDEP}]
diff --git a/dev-python/moto/moto-2.0.5.ebuild b/dev-python/moto/moto-2.0.5.ebuild
index 99d32309019c..fba6965bc569 100644
--- a/dev-python/moto/moto-2.0.5.ebuild
+++ b/dev-python/moto/moto-2.0.5.ebuild
@@ -18,7 +18,7 @@ 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-python-lint[${PYTHON_USEDEP}]
+	dev-python/cfn-lint[${PYTHON_USEDEP}]
 	>=dev-python/cryptography-3.3.1[${PYTHON_USEDEP}]
 	dev-python/cookies[${PYTHON_USEDEP}]
 	dev-python/dicttoxml[${PYTHON_USEDEP}]
diff --git a/dev-python/moto/moto-2.2.0.ebuild b/dev-python/moto/moto-2.2.0.ebuild
index 7c79594ac4fb..000f0ec8d51e 100644
--- a/dev-python/moto/moto-2.2.0.ebuild
+++ b/dev-python/moto/moto-2.2.0.ebuild
@@ -18,7 +18,7 @@ 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-python-lint[${PYTHON_USEDEP}]
+	dev-python/cfn-lint[${PYTHON_USEDEP}]
 	>=dev-python/cryptography-3.3.1[${PYTHON_USEDEP}]
 	dev-python/cookies[${PYTHON_USEDEP}]
 	dev-python/dicttoxml[${PYTHON_USEDEP}]
diff --git a/dev-python/moto/moto-2.2.2.ebuild b/dev-python/moto/moto-2.2.2.ebuild
index e01d705cfed1..afcc32f23366 100644
--- a/dev-python/moto/moto-2.2.2.ebuild
+++ b/dev-python/moto/moto-2.2.2.ebuild
@@ -18,7 +18,7 @@ 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-python-lint[${PYTHON_USEDEP}]
+	dev-python/cfn-lint[${PYTHON_USEDEP}]
 	>=dev-python/cryptography-3.3.1[${PYTHON_USEDEP}]
 	dev-python/cookies[${PYTHON_USEDEP}]
 	dev-python/dicttoxml[${PYTHON_USEDEP}]
diff --git a/dev-python/moto/moto-2.2.3.ebuild b/dev-python/moto/moto-2.2.3.ebuild
index e01d705cfed1..afcc32f23366 100644
--- a/dev-python/moto/moto-2.2.3.ebuild
+++ b/dev-python/moto/moto-2.2.3.ebuild
@@ -18,7 +18,7 @@ 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-python-lint[${PYTHON_USEDEP}]
+	dev-python/cfn-lint[${PYTHON_USEDEP}]
 	>=dev-python/cryptography-3.3.1[${PYTHON_USEDEP}]
 	dev-python/cookies[${PYTHON_USEDEP}]
 	dev-python/dicttoxml[${PYTHON_USEDEP}]