11 files changed, 59 insertions, 245 deletions
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index 106e396738f7..55cc9bcdd77b 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -1,18 +1,13 @@
-AUX awscli-1.19.47-py39.patch 2498 BLAKE2B 39f698d756422eecbb6a37bec572f00e184775b816f467d1b0275740b59678518db7ae44240476048c0f11d8d01403e8f9a03ad0f64414206fe77c15c4d695d0 SHA512 6a80d35495b63572e5e8ee6550a1c693d71adceaad79fba9d097668049a5c9d425b7eaaba008458cde8eb3e406e6e2850b6d43e6a610e9f28cb44278b231312a
-DIST awscli-1.20.28.tar.gz 2058578 BLAKE2B 3f6993a41f46ad9d8d45cebc0d5ea95a954e15c73d236426590c389aba6de6a99b6a5000f065f932733151c14f3112bacc25c670a05d2a991a976669ce54554e SHA512 b75974450cea3744ed15cf00ca82a35aa377c55e0ef67bb5536ed136e768d5030e6707f12e2e7de8bfce48296295ff4ed4c9f9b15c642104ea34c7492291135b
-DIST awscli-1.20.40.tar.gz 2071857 BLAKE2B b2511d610c13b4ddf8b1f5c6442f0939072eecf81d97805800bd83b6f481d744ad4344dace6e6553e3d4b7cbf9546f911398311cb04fb698a418579e784539a3 SHA512 aa39a8d67cd8efc63687929f19d5878269ce7f3155a0a64ca2f271251a334f57d2358aa4f0aee76415aee33fe23a1e3b19eb2c6dcfa21e8c0fb7409f5d29a001
-DIST awscli-1.20.47.tar.gz 2079314 BLAKE2B 2c202ed3e3527a6881c3f9ca73e8639732442948c6cd6a79fc3fe64de38ff56f7e595f0a0e4badeade81624f8a0323f435b63199a138ce90acb0a1785a326dcf SHA512 ad7be0753549c6f82f6f9a8631cbb8c56526ef17eb0152298bb78365735d4454ec4efb44a6858d01f31cff2ae54ad6a11e0afff3277dde2b70415d58bfb81c86
 DIST awscli-1.20.53.tar.gz 2081402 BLAKE2B 88d56df063ae6473122913e4713e17bfd8c32961477b8e723ed3c0c0b7dc72ccc4dfd8d897699e2060a2b65a198b96eccf77accdac9a21510aa56dba5423b76e SHA512 48576b535bdf6b9e6397eadd589c41eeec480d2eaf3035ca6e64bd86984aba9170a83b71c0f7f3f64cfaebaf5104fe3adcdaebace5166343fb3b772f5ad8ccfd
-DIST awscli-1.20.54.tar.gz 2082080 BLAKE2B 157e35ab297d18aa9739319801e28fabfbd9f68a2ea6215052d11821f96e8df022fe45ba9b34cc9e62ca59186fd16aeda453813f7ad86f96d2b6e483f8fd89a1 SHA512 845e5746808bb40ff41b4a3280bce7787fa6278f3b9176c8ae1237b06d1c6ea01a132ab8b4134d369380823d758c16317a1985ca9f307d17824d2cad5c92858e
-DIST awscli-1.20.55.tar.gz 2082482 BLAKE2B 5f8d9d84e6993e22ffd6f1e7e46b0afa2aecd12b4c2c18968e0f85d7544aced039a21b2245bfd66393bbb0d240f9b3119da7f745891b04f9156b677f613fbb63 SHA512 5d76c07417a3edcdff490ecdad9469f6f0f3077f4fccba9b6cf8518390df90d49d126e6c924a57333c5b68a97b833cb0bbb72133ddc63fd74893f888eca974a5
-DIST awscli-1.20.56.tar.gz 2082836 BLAKE2B e935334dba5aaa77cbd4fe3adb789c33c9fa80832bf4ad7517024787911e377020e8cdc38b0bd87db81571a2da888acd96306198a66748597495460292286938 SHA512 5b3bfebe217c05df70421b29c6a239a76493898717bd5db10ef7001e6c9af1488a52e6e25ab85b5ed725c87402a562ebe6849eb39743681c644143f17fccc3b6
-DIST awscli-1.20.57.tar.gz 2083414 BLAKE2B b3d21c0b8ceb0016def4aae9f2485dffd77bdd12a959b6c959d9c10cc3466fad9309a40102409ddf59d372bf95503a6bf87bc454d37400877a7cdc33564c0f45 SHA512 ad5d5a4de8083ce5198a49756da4ef6d630671c49ee0da0c15f06c9af1e92a9c98f2721b06df77adc47ea2b455e80e8aa92238a514039a213acbbf133753b430
-EBUILD awscli-1.20.28.ebuild 1465 BLAKE2B 0414a41a1f6a9234c4c74ed23e4ce30b1801ce885e556b290ede026239d537d38912c4557b11985e8e25d95916fbae319876900c46e89e5858ea051ee6a18373 SHA512 ed3d2f988845db9dfff03a8c64373a19dd7719945370e374092403c8a022a9a2f6acd294ed1ad857a40c76730a9a4c42d5a1da4b84cc5f37401317f63b19694f
-EBUILD awscli-1.20.40.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c
-EBUILD awscli-1.20.47.ebuild 1404 BLAKE2B 7fde5eebee2268092ca0ed774ea605f9080af17d87614f6892fbba1b1f44440bfb8ee88ca6714d54c6639e17d5955b22b01ef609dcb5154aaa98710a73e73521 SHA512 6319aa19de797f3d1d33d6499be8502efbb1f33df58f83874a79ddd0bfd59fb9837891cde5e8b3deec254dd8dcdc784d8f23985e4022b6e31a248bd5395dcaf1
-EBUILD awscli-1.20.53.ebuild 1308 BLAKE2B 954123736f61e3243edaf3df49a217a2d71bd060adb3f01193256df0c2a67c439666c38dd4687346ed9380c4b18f92b796f1ea7b4511c5a45bee0bad9fb3498f SHA512 acfa378c3478f288c30250ee9b914aefe6a2987c0d6ed312cc0147f38a22965a9a47046bd1c47812b1e129492140e07af40acb89ab70135b9d720f58db2611d5
-EBUILD awscli-1.20.54.ebuild 1308 BLAKE2B 954123736f61e3243edaf3df49a217a2d71bd060adb3f01193256df0c2a67c439666c38dd4687346ed9380c4b18f92b796f1ea7b4511c5a45bee0bad9fb3498f SHA512 acfa378c3478f288c30250ee9b914aefe6a2987c0d6ed312cc0147f38a22965a9a47046bd1c47812b1e129492140e07af40acb89ab70135b9d720f58db2611d5
-EBUILD awscli-1.20.55.ebuild 1308 BLAKE2B 954123736f61e3243edaf3df49a217a2d71bd060adb3f01193256df0c2a67c439666c38dd4687346ed9380c4b18f92b796f1ea7b4511c5a45bee0bad9fb3498f SHA512 acfa378c3478f288c30250ee9b914aefe6a2987c0d6ed312cc0147f38a22965a9a47046bd1c47812b1e129492140e07af40acb89ab70135b9d720f58db2611d5
-EBUILD awscli-1.20.56.ebuild 1308 BLAKE2B 954123736f61e3243edaf3df49a217a2d71bd060adb3f01193256df0c2a67c439666c38dd4687346ed9380c4b18f92b796f1ea7b4511c5a45bee0bad9fb3498f SHA512 acfa378c3478f288c30250ee9b914aefe6a2987c0d6ed312cc0147f38a22965a9a47046bd1c47812b1e129492140e07af40acb89ab70135b9d720f58db2611d5
-EBUILD awscli-1.20.57.ebuild 1308 BLAKE2B 954123736f61e3243edaf3df49a217a2d71bd060adb3f01193256df0c2a67c439666c38dd4687346ed9380c4b18f92b796f1ea7b4511c5a45bee0bad9fb3498f SHA512 acfa378c3478f288c30250ee9b914aefe6a2987c0d6ed312cc0147f38a22965a9a47046bd1c47812b1e129492140e07af40acb89ab70135b9d720f58db2611d5
+DIST awscli-1.20.60.tar.gz 2090278 BLAKE2B 107d4d34730769fe18729cc2a42a574c8b66d0715eabc67c1a236d828ee7623387ece4dd8b3a80818b68be7439ffb74ba2c48bac74323b2a9e960f53c0508bf3 SHA512 7c4a1d79434ca2497d814dace68b537e5bc120f03d4f63cf74280d8c83d4c68273d9c0b16e90b477c91e49498468e1717ba6ba1b057590fd89c0c2cc82b90383
+DIST awscli-1.20.61.tar.gz 2090747 BLAKE2B ddd0ca28f0f36a69e0d03a15bab142df35f4695a1e3f2c71f3507325050aceb088a53cb18dc17c80b7c90e8bba7aee377ab4bf336188ae19adb095df4cfd5bd2 SHA512 c0ed1fdd11022c897e31f83be97bddc2dbc8d53e6571ffb5c5592f406f88c30eeb36f7530b541a7102a4426b1bf14114db08667e3c03e3583f3130e3e50767e4
+DIST awscli-1.20.62.tar.gz 2091052 BLAKE2B 95043ddac83c71a6153eb84b9e2e48ea5659d300fdec3bf4c7d0356d214da7a5ec15a0777c1eb41f275a2ee6fdf7996d28082fe604825234226a415e9c12181c SHA512 6f33f1a02703b81813c56872f4a90e712ef60775854d88f256c1c6fa487678f6bc8f5d8a4345b2a064ff18afaf9f5e336f4af0257fc746d83a703fcc4a655bc4
+DIST awscli-1.20.63.tar.gz 2091148 BLAKE2B 12e6aebf29b5d91b191f87568fb605513c86d30c2a4d6b553ab2a0fb90b6aa0bd4b7024981671566f0646811f39a88bc16ac888f511c29b0e459f86440300304 SHA512 adb57d355a7ba70cf166ea1544df4274caaedbea1a2c4ba7895be600a76d8ef0129ca20c6d03d702c073d21dfa4f70fa3f5488266dc0cc5ef7f5d952b6d6ee6f
+DIST awscli-1.20.64.tar.gz 2091360 BLAKE2B 24a0838f1348a05392736f580816b968cd28a252ade31559241fadc5cb2a36dcb6f31c8743c484879fc523b0282381625cbabd58656a00cce0dcb81a6b0319d4 SHA512 a3c0b393e9a5e7aee0e4e4bab14f2cb2c0877b22ead0547d99b430e24bd927391536bbae8b612612b9437dc0dba2cd804a858bddc980d29a74afac434ddc3ab3
+EBUILD awscli-1.20.53.ebuild 1306 BLAKE2B 1b1be64ca6072a28230aa36c66bea67684784f2d44e040ecdb6694ce5f023168e170a36d3a3e133a9a8559d15dd0aced5e7a78af349f3691a883bc19f7f60318 SHA512 6b9579b86a827d2a4d46568d17899f3a45b047621abec213da57f70603021ab2ac57dbe1e127ee12aa41edc93aafd503db911e13ab744fcaf5ea6d8b5d60ad6c
+EBUILD awscli-1.20.60.ebuild 1308 BLAKE2B 954123736f61e3243edaf3df49a217a2d71bd060adb3f01193256df0c2a67c439666c38dd4687346ed9380c4b18f92b796f1ea7b4511c5a45bee0bad9fb3498f SHA512 acfa378c3478f288c30250ee9b914aefe6a2987c0d6ed312cc0147f38a22965a9a47046bd1c47812b1e129492140e07af40acb89ab70135b9d720f58db2611d5
+EBUILD awscli-1.20.61.ebuild 1308 BLAKE2B 954123736f61e3243edaf3df49a217a2d71bd060adb3f01193256df0c2a67c439666c38dd4687346ed9380c4b18f92b796f1ea7b4511c5a45bee0bad9fb3498f SHA512 acfa378c3478f288c30250ee9b914aefe6a2987c0d6ed312cc0147f38a22965a9a47046bd1c47812b1e129492140e07af40acb89ab70135b9d720f58db2611d5
+EBUILD awscli-1.20.62.ebuild 1308 BLAKE2B 954123736f61e3243edaf3df49a217a2d71bd060adb3f01193256df0c2a67c439666c38dd4687346ed9380c4b18f92b796f1ea7b4511c5a45bee0bad9fb3498f SHA512 acfa378c3478f288c30250ee9b914aefe6a2987c0d6ed312cc0147f38a22965a9a47046bd1c47812b1e129492140e07af40acb89ab70135b9d720f58db2611d5
+EBUILD awscli-1.20.63.ebuild 1308 BLAKE2B 954123736f61e3243edaf3df49a217a2d71bd060adb3f01193256df0c2a67c439666c38dd4687346ed9380c4b18f92b796f1ea7b4511c5a45bee0bad9fb3498f SHA512 acfa378c3478f288c30250ee9b914aefe6a2987c0d6ed312cc0147f38a22965a9a47046bd1c47812b1e129492140e07af40acb89ab70135b9d720f58db2611d5
+EBUILD awscli-1.20.64.ebuild 1308 BLAKE2B 954123736f61e3243edaf3df49a217a2d71bd060adb3f01193256df0c2a67c439666c38dd4687346ed9380c4b18f92b796f1ea7b4511c5a45bee0bad9fb3498f SHA512 acfa378c3478f288c30250ee9b914aefe6a2987c0d6ed312cc0147f38a22965a9a47046bd1c47812b1e129492140e07af40acb89ab70135b9d720f58db2611d5
 MISC metadata.xml 334 BLAKE2B 84c9f50e6c0d015aad36a7f625cddf90cf1137a8c2d445cc641cd4890d64261187c10fde59ee1a6c19b98cfdb6ff534c66ae7a7a48a00ec62d6984c9a1891750 SHA512 a845de531df2cd75abf23cdbfa613e586855b95ac4e96566ef193708d7ecf2ec7f7db72fd31b8af0ac4ccd57e51da9c6d129d426bfdc6c4feb57d7df8647f160
diff --git a/app-admin/awscli/awscli-1.20.28.ebuild b/app-admin/awscli/awscli-1.20.28.ebuild
deleted file mode 100644
index 4221a0155f55..000000000000
--- a/app-admin/awscli/awscli-1.20.28.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit bash-completion-r1 distutils-r1
-
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="https://pypi.org/project/awscli/"
-#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/aws-cli-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-# botocore is x.(y+1).z
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1)).$(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.4.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests --install nose
-
-PATCHES=(
-	"${FILESDIR}"/awscli-1.19.47-py39.patch
-)
-
-python_test() {
-	distutils_install_for_testing
-	# integration tests require AWS credentials and Internet access
-	nosetests -v tests/{functional,unit} ||
-		die "Tests failed for ${EPYTHON}"
-}
-
-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.20.40.ebuild b/app-admin/awscli/awscli-1.20.40.ebuild
deleted file mode 100644
index ff429f8d3a3e..000000000000
--- a/app-admin/awscli/awscli-1.20.40.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit bash-completion-r1 distutils-r1
-
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="https://pypi.org/project/awscli/"
-#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/aws-cli-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-# botocore is x.(y+1).z
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1)).$(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.4.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests --install nose
-
-PATCHES=(
-	"${FILESDIR}"/awscli-1.19.47-py39.patch
-)
-
-python_test() {
-	distutils_install_for_testing
-	# integration tests require AWS credentials and Internet access
-	nosetests -v tests/{functional,unit} ||
-		die "Tests failed for ${EPYTHON}"
-}
-
-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.20.47.ebuild b/app-admin/awscli/awscli-1.20.47.ebuild
deleted file mode 100644
index 95a3e5aaa0df..000000000000
--- a/app-admin/awscli/awscli-1.20.47.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit bash-completion-r1 distutils-r1
-
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="https://pypi.org/project/awscli/"
-#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/aws-cli-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-# botocore is x.(y+1).z
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1)).$(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.4.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests --install nose
-
-PATCHES=(
-	"${FILESDIR}"/awscli-1.19.47-py39.patch
-)
-
-python_test() {
-	distutils_install_for_testing
-	# integration tests require AWS credentials and Internet access
-	nosetests -v tests/{functional,unit} ||
-		die "Tests failed for ${EPYTHON}"
-}
-
-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.20.53.ebuild b/app-admin/awscli/awscli-1.20.53.ebuild
index 81d5997098c2..d2807dde6a53 100644
--- a/app-admin/awscli/awscli-1.20.53.ebuild
+++ b/app-admin/awscli/awscli-1.20.53.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/aws-cli-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 # botocore is x.(y+1).z
 BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1)).$(ver_cut 3-)"
diff --git a/app-admin/awscli/awscli-1.20.54.ebuild b/app-admin/awscli/awscli-1.20.60.ebuild
index 81d5997098c2..81d5997098c2 100644
--- a/app-admin/awscli/awscli-1.20.54.ebuild
+++ b/app-admin/awscli/awscli-1.20.60.ebuild
diff --git a/app-admin/awscli/awscli-1.20.55.ebuild b/app-admin/awscli/awscli-1.20.61.ebuild
index 81d5997098c2..81d5997098c2 100644
--- a/app-admin/awscli/awscli-1.20.55.ebuild
+++ b/app-admin/awscli/awscli-1.20.61.ebuild
diff --git a/app-admin/awscli/awscli-1.20.56.ebuild b/app-admin/awscli/awscli-1.20.62.ebuild
index 81d5997098c2..81d5997098c2 100644
--- a/app-admin/awscli/awscli-1.20.56.ebuild
+++ b/app-admin/awscli/awscli-1.20.62.ebuild
diff --git a/app-admin/awscli/awscli-1.20.57.ebuild b/app-admin/awscli/awscli-1.20.63.ebuild
index 81d5997098c2..81d5997098c2 100644
--- a/app-admin/awscli/awscli-1.20.57.ebuild
+++ b/app-admin/awscli/awscli-1.20.63.ebuild
diff --git a/app-admin/awscli/awscli-1.20.64.ebuild b/app-admin/awscli/awscli-1.20.64.ebuild
new file mode 100644
index 000000000000..81d5997098c2
--- /dev/null
+++ b/app-admin/awscli/awscli-1.20.64.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="https://pypi.org/project/awscli/"
+#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/aws-cli-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+# botocore is x.(y+1).z
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1)).$(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.4.0[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests --install pytest
+
+python_test() {
+	distutils_install_for_testing
+	# integration tests require AWS credentials and Internet access
+	epytest tests/{functional,unit}
+}
+
+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/files/awscli-1.19.47-py39.patch b/app-admin/awscli/files/awscli-1.19.47-py39.patch
deleted file mode 100644
index 4d1be8eab6d4..000000000000
--- a/app-admin/awscli/files/awscli-1.19.47-py39.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 85361123d2fa12eaedf912c046ffe39aebdd2bad Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Sat, 22 May 2021 19:42:14 +0200
-Subject: [PATCH] Replace use of deprecated base64.encodestring()
-
-Replace the uses of deprecated base64.encodestring() in favor
-of botocore.compat.encodebytes().  This fixes incompatibility with
-Python 3.9 where the former function has finally been removed.
----
- awscli/customizations/ec2/bundleinstance.py  | 4 +++-
- tests/functional/ec2/test_bundle_instance.py | 4 +++-
- 2 files changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/awscli/customizations/ec2/bundleinstance.py b/awscli/customizations/ec2/bundleinstance.py
-index f704ec301..775e75718 100644
---- a/awscli/customizations/ec2/bundleinstance.py
-+++ b/awscli/customizations/ec2/bundleinstance.py
-@@ -17,6 +17,8 @@ import hmac
- import base64
- import datetime
- 
-+from botocore.compat import encodebytes
-+
- from awscli.compat import six
- 
- from awscli.arguments import CustomArgument
-@@ -135,7 +137,7 @@ def _generate_signature(params):
-         policy = base64.b64encode(six.b(policy)).decode('utf-8')
-         new_hmac = hmac.new(sak.encode('utf-8'), digestmod=sha1)
-         new_hmac.update(six.b(policy))
--        ps = base64.encodestring(new_hmac.digest()).strip().decode('utf-8')
-+        ps = encodebytes(new_hmac.digest()).strip().decode('utf-8')
-         params['UploadPolicySignature'] = ps
-         del params['_SAK']
- 
-diff --git a/tests/functional/ec2/test_bundle_instance.py b/tests/functional/ec2/test_bundle_instance.py
-index 3eee363da..ca36d7cd5 100644
---- a/tests/functional/ec2/test_bundle_instance.py
-+++ b/tests/functional/ec2/test_bundle_instance.py
-@@ -17,6 +17,8 @@ import datetime
- import mock
- from six.moves import cStringIO
- 
-+from botocore.compat import encodebytes
-+
- import awscli.customizations.ec2.bundleinstance
- from awscli.compat import six
- from awscli.testutils import BaseAWSCommandParamsTest
-@@ -70,7 +72,7 @@ class TestBundleInstance(BaseAWSCommandParamsTest):
- 
-     def test_policy_provided(self):
-         policy = '{"notarealpolicy":true}'
--        base64policy = base64.encodestring(six.b(policy)).strip().decode('utf-8')
-+        base64policy = encodebytes(six.b(policy)).strip().decode('utf-8')
-         policy_signature = 'a5SmoLOxoM0MHpOdC25nE7KIafg='
-         args = ' --instance-id i-12345678 --owner-akid AKIAIOSFODNN7EXAMPLE'
-         args += ' --owner-sak wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY'
--- 
-2.31.1
-