commit: 16641713a10d05b8c57effb3ccb70775443d2126
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 29 16:39:22 2022 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Wed Jun 29 16:39:55 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16641713
app-admin/awscli: add blocker on app-admin/awscli-bin
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
...cli-1.25.12.ebuild => awscli-1.25.12-r1.ebuild} | 1 +
...cli-1.25.13.ebuild => awscli-1.25.13-r1.ebuild} | 1 +
...cli-1.25.14.ebuild => awscli-1.25.14-r1.ebuild} | 1 +
...cli-1.25.15.ebuild => awscli-1.25.15-r1.ebuild} | 1 +
...cli-1.25.12.ebuild => awscli-1.25.16-r1.ebuild} | 1 +
app-admin/awscli/awscli-1.25.16.ebuild | 71 ----------------------
...cli-1.25.12.ebuild => awscli-1.25.17-r1.ebuild} | 1 +
app-admin/awscli/awscli-1.25.17.ebuild | 71 ----------------------
...cli-1.25.12.ebuild => awscli-1.25.18-r1.ebuild} | 1 +
app-admin/awscli/awscli-1.25.18.ebuild | 71 ----------------------
...cli-1.25.12.ebuild => awscli-1.25.19-r1.ebuild} | 1 +
app-admin/awscli/awscli-1.25.19.ebuild | 71 ----------------------
...wscli-1.25.7.ebuild => awscli-1.25.7-r1.ebuild} | 1 +
13 files changed, 9 insertions(+), 284 deletions(-)
diff --git a/app-admin/awscli/awscli-1.25.12.ebuild
b/app-admin/awscli/awscli-1.25.12-r1.ebuild
similarity index 98%
copy from app-admin/awscli/awscli-1.25.12.ebuild
copy to app-admin/awscli/awscli-1.25.12-r1.ebuild
index 4154af977ee6..9f176fa05cc8 100644
--- a/app-admin/awscli/awscli-1.25.12.ebuild
+++ b/app-admin/awscli/awscli-1.25.12-r1.ebuild
@@ -33,6 +33,7 @@ RDEPEND="
dev-python/rsa[${PYTHON_USEDEP}]
>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
dev-python/pyyaml[${PYTHON_USEDEP}]
+ !app-admin/awscli-bin
"
BDEPEND="
test? (
diff --git a/app-admin/awscli/awscli-1.25.13.ebuild
b/app-admin/awscli/awscli-1.25.13-r1.ebuild
similarity index 98%
rename from app-admin/awscli/awscli-1.25.13.ebuild
rename to app-admin/awscli/awscli-1.25.13-r1.ebuild
index 4154af977ee6..9f176fa05cc8 100644
--- a/app-admin/awscli/awscli-1.25.13.ebuild
+++ b/app-admin/awscli/awscli-1.25.13-r1.ebuild
@@ -33,6 +33,7 @@ RDEPEND="
dev-python/rsa[${PYTHON_USEDEP}]
>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
dev-python/pyyaml[${PYTHON_USEDEP}]
+ !app-admin/awscli-bin
"
BDEPEND="
test? (
diff --git a/app-admin/awscli/awscli-1.25.14.ebuild
b/app-admin/awscli/awscli-1.25.14-r1.ebuild
similarity index 98%
rename from app-admin/awscli/awscli-1.25.14.ebuild
rename to app-admin/awscli/awscli-1.25.14-r1.ebuild
index 4154af977ee6..9f176fa05cc8 100644
--- a/app-admin/awscli/awscli-1.25.14.ebuild
+++ b/app-admin/awscli/awscli-1.25.14-r1.ebuild
@@ -33,6 +33,7 @@ RDEPEND="
dev-python/rsa[${PYTHON_USEDEP}]
>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
dev-python/pyyaml[${PYTHON_USEDEP}]
+ !app-admin/awscli-bin
"
BDEPEND="
test? (
diff --git a/app-admin/awscli/awscli-1.25.15.ebuild
b/app-admin/awscli/awscli-1.25.15-r1.ebuild
similarity index 98%
rename from app-admin/awscli/awscli-1.25.15.ebuild
rename to app-admin/awscli/awscli-1.25.15-r1.ebuild
index 4154af977ee6..9f176fa05cc8 100644
--- a/app-admin/awscli/awscli-1.25.15.ebuild
+++ b/app-admin/awscli/awscli-1.25.15-r1.ebuild
@@ -33,6 +33,7 @@ RDEPEND="
dev-python/rsa[${PYTHON_USEDEP}]
>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
dev-python/pyyaml[${PYTHON_USEDEP}]
+ !app-admin/awscli-bin
"
BDEPEND="
test? (
diff --git a/app-admin/awscli/awscli-1.25.12.ebuild
b/app-admin/awscli/awscli-1.25.16-r1.ebuild
similarity index 98%
copy from app-admin/awscli/awscli-1.25.12.ebuild
copy to app-admin/awscli/awscli-1.25.16-r1.ebuild
index 4154af977ee6..9f176fa05cc8 100644
--- a/app-admin/awscli/awscli-1.25.12.ebuild
+++ b/app-admin/awscli/awscli-1.25.16-r1.ebuild
@@ -33,6 +33,7 @@ RDEPEND="
dev-python/rsa[${PYTHON_USEDEP}]
>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
dev-python/pyyaml[${PYTHON_USEDEP}]
+ !app-admin/awscli-bin
"
BDEPEND="
test? (
diff --git a/app-admin/awscli/awscli-1.25.16.ebuild
b/app-admin/awscli/awscli-1.25.16.ebuild
deleted file mode 100644
index 4154af977ee6..000000000000
--- a/app-admin/awscli/awscli-1.25.16.ebuild
+++ /dev/null
@@ -1,71 +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 bash-completion-r1 distutils-r1 multiprocessing
-
-MY_P=aws-cli-${PV}
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="
- https://github.com/aws/aws-cli/
- https://pypi.org/project/awscli/
-"
-SRC_URI="
- https://github.com/aws/aws-cli/archive/${PV}.tar.gz
- -> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-# botocore is x.(y+2).z
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
-RDEPEND="
- >=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
- dev-python/colorama[${PYTHON_USEDEP}]
- dev-python/docutils[${PYTHON_USEDEP}]
- dev-python/rsa[${PYTHON_USEDEP}]
- >=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
- test? (
- dev-python/pytest-forked[${PYTHON_USEDEP}]
- dev-python/pytest-xdist[${PYTHON_USEDEP}]
- )
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
- # do not rely on bundled deps in botocore (sic!)
- find -name '*.py' -exec sed -i \
- -e 's:from botocore[.]vendored import:import:' \
- -e 's:from botocore[.]vendored[.]:from :' \
- {} + || die
- # strip overzealous upper bounds on requirements
- sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
- distutils-r1_src_prepare
-}
-
-python_test() {
- # integration tests require AWS credentials and Internet access
- epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
-}
-
-python_install_all() {
- newbashcomp bin/aws_bash_completer aws
-
- insinto /usr/share/zsh/site-functions
- newins bin/aws_zsh_completer.sh _aws
-
- distutils-r1_python_install_all
-
- rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} ||
die
-}
diff --git a/app-admin/awscli/awscli-1.25.12.ebuild
b/app-admin/awscli/awscli-1.25.17-r1.ebuild
similarity index 98%
copy from app-admin/awscli/awscli-1.25.12.ebuild
copy to app-admin/awscli/awscli-1.25.17-r1.ebuild
index 4154af977ee6..9f176fa05cc8 100644
--- a/app-admin/awscli/awscli-1.25.12.ebuild
+++ b/app-admin/awscli/awscli-1.25.17-r1.ebuild
@@ -33,6 +33,7 @@ RDEPEND="
dev-python/rsa[${PYTHON_USEDEP}]
>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
dev-python/pyyaml[${PYTHON_USEDEP}]
+ !app-admin/awscli-bin
"
BDEPEND="
test? (
diff --git a/app-admin/awscli/awscli-1.25.17.ebuild
b/app-admin/awscli/awscli-1.25.17.ebuild
deleted file mode 100644
index 4154af977ee6..000000000000
--- a/app-admin/awscli/awscli-1.25.17.ebuild
+++ /dev/null
@@ -1,71 +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 bash-completion-r1 distutils-r1 multiprocessing
-
-MY_P=aws-cli-${PV}
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="
- https://github.com/aws/aws-cli/
- https://pypi.org/project/awscli/
-"
-SRC_URI="
- https://github.com/aws/aws-cli/archive/${PV}.tar.gz
- -> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-# botocore is x.(y+2).z
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
-RDEPEND="
- >=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
- dev-python/colorama[${PYTHON_USEDEP}]
- dev-python/docutils[${PYTHON_USEDEP}]
- dev-python/rsa[${PYTHON_USEDEP}]
- >=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
- test? (
- dev-python/pytest-forked[${PYTHON_USEDEP}]
- dev-python/pytest-xdist[${PYTHON_USEDEP}]
- )
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
- # do not rely on bundled deps in botocore (sic!)
- find -name '*.py' -exec sed -i \
- -e 's:from botocore[.]vendored import:import:' \
- -e 's:from botocore[.]vendored[.]:from :' \
- {} + || die
- # strip overzealous upper bounds on requirements
- sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
- distutils-r1_src_prepare
-}
-
-python_test() {
- # integration tests require AWS credentials and Internet access
- epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
-}
-
-python_install_all() {
- newbashcomp bin/aws_bash_completer aws
-
- insinto /usr/share/zsh/site-functions
- newins bin/aws_zsh_completer.sh _aws
-
- distutils-r1_python_install_all
-
- rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} ||
die
-}
diff --git a/app-admin/awscli/awscli-1.25.12.ebuild
b/app-admin/awscli/awscli-1.25.18-r1.ebuild
similarity index 98%
copy from app-admin/awscli/awscli-1.25.12.ebuild
copy to app-admin/awscli/awscli-1.25.18-r1.ebuild
index 4154af977ee6..9f176fa05cc8 100644
--- a/app-admin/awscli/awscli-1.25.12.ebuild
+++ b/app-admin/awscli/awscli-1.25.18-r1.ebuild
@@ -33,6 +33,7 @@ RDEPEND="
dev-python/rsa[${PYTHON_USEDEP}]
>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
dev-python/pyyaml[${PYTHON_USEDEP}]
+ !app-admin/awscli-bin
"
BDEPEND="
test? (
diff --git a/app-admin/awscli/awscli-1.25.18.ebuild
b/app-admin/awscli/awscli-1.25.18.ebuild
deleted file mode 100644
index 4154af977ee6..000000000000
--- a/app-admin/awscli/awscli-1.25.18.ebuild
+++ /dev/null
@@ -1,71 +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 bash-completion-r1 distutils-r1 multiprocessing
-
-MY_P=aws-cli-${PV}
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="
- https://github.com/aws/aws-cli/
- https://pypi.org/project/awscli/
-"
-SRC_URI="
- https://github.com/aws/aws-cli/archive/${PV}.tar.gz
- -> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-# botocore is x.(y+2).z
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
-RDEPEND="
- >=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
- dev-python/colorama[${PYTHON_USEDEP}]
- dev-python/docutils[${PYTHON_USEDEP}]
- dev-python/rsa[${PYTHON_USEDEP}]
- >=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
- test? (
- dev-python/pytest-forked[${PYTHON_USEDEP}]
- dev-python/pytest-xdist[${PYTHON_USEDEP}]
- )
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
- # do not rely on bundled deps in botocore (sic!)
- find -name '*.py' -exec sed -i \
- -e 's:from botocore[.]vendored import:import:' \
- -e 's:from botocore[.]vendored[.]:from :' \
- {} + || die
- # strip overzealous upper bounds on requirements
- sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
- distutils-r1_src_prepare
-}
-
-python_test() {
- # integration tests require AWS credentials and Internet access
- epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
-}
-
-python_install_all() {
- newbashcomp bin/aws_bash_completer aws
-
- insinto /usr/share/zsh/site-functions
- newins bin/aws_zsh_completer.sh _aws
-
- distutils-r1_python_install_all
-
- rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} ||
die
-}
diff --git a/app-admin/awscli/awscli-1.25.12.ebuild
b/app-admin/awscli/awscli-1.25.19-r1.ebuild
similarity index 98%
rename from app-admin/awscli/awscli-1.25.12.ebuild
rename to app-admin/awscli/awscli-1.25.19-r1.ebuild
index 4154af977ee6..9f176fa05cc8 100644
--- a/app-admin/awscli/awscli-1.25.12.ebuild
+++ b/app-admin/awscli/awscli-1.25.19-r1.ebuild
@@ -33,6 +33,7 @@ RDEPEND="
dev-python/rsa[${PYTHON_USEDEP}]
>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
dev-python/pyyaml[${PYTHON_USEDEP}]
+ !app-admin/awscli-bin
"
BDEPEND="
test? (
diff --git a/app-admin/awscli/awscli-1.25.19.ebuild
b/app-admin/awscli/awscli-1.25.19.ebuild
deleted file mode 100644
index 4154af977ee6..000000000000
--- a/app-admin/awscli/awscli-1.25.19.ebuild
+++ /dev/null
@@ -1,71 +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 bash-completion-r1 distutils-r1 multiprocessing
-
-MY_P=aws-cli-${PV}
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="
- https://github.com/aws/aws-cli/
- https://pypi.org/project/awscli/
-"
-SRC_URI="
- https://github.com/aws/aws-cli/archive/${PV}.tar.gz
- -> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-# botocore is x.(y+2).z
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
-RDEPEND="
- >=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
- dev-python/colorama[${PYTHON_USEDEP}]
- dev-python/docutils[${PYTHON_USEDEP}]
- dev-python/rsa[${PYTHON_USEDEP}]
- >=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
- test? (
- dev-python/pytest-forked[${PYTHON_USEDEP}]
- dev-python/pytest-xdist[${PYTHON_USEDEP}]
- )
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
- # do not rely on bundled deps in botocore (sic!)
- find -name '*.py' -exec sed -i \
- -e 's:from botocore[.]vendored import:import:' \
- -e 's:from botocore[.]vendored[.]:from :' \
- {} + || die
- # strip overzealous upper bounds on requirements
- sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
- distutils-r1_src_prepare
-}
-
-python_test() {
- # integration tests require AWS credentials and Internet access
- epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
-}
-
-python_install_all() {
- newbashcomp bin/aws_bash_completer aws
-
- insinto /usr/share/zsh/site-functions
- newins bin/aws_zsh_completer.sh _aws
-
- distutils-r1_python_install_all
-
- rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} ||
die
-}
diff --git a/app-admin/awscli/awscli-1.25.7.ebuild
b/app-admin/awscli/awscli-1.25.7-r1.ebuild
similarity index 98%
rename from app-admin/awscli/awscli-1.25.7.ebuild
rename to app-admin/awscli/awscli-1.25.7-r1.ebuild
index afcfc6c6018b..f241876330bb 100644
--- a/app-admin/awscli/awscli-1.25.7.ebuild
+++ b/app-admin/awscli/awscli-1.25.7-r1.ebuild
@@ -33,6 +33,7 @@ RDEPEND="
dev-python/rsa[${PYTHON_USEDEP}]
>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
dev-python/pyyaml[${PYTHON_USEDEP}]
+ !app-admin/awscli-bin
"
BDEPEND="
test? (
