Sync with portage [Thu Aug 12 09:10:54 MSK 2021].

app-accessibility/kontrast/Manifest

@@ -1,2 +1 @@
-DIST kontrast-20.12.3.tar.xz 122468 BLAKE2B 4e29c034ba87781ffef03a37ecc7219eed488585bc47b0b3420950cdfe8fa92e9f4fd2a35dea76ac296318cb8c8be38fcf92061bca105fcfafa9dc9121afbabe SHA512 d6a4b60416f43bc1e9ba2539b13f33233c988417c7e8f05dd295d7e4946301943db9493123a07c48b0844c7aa55a22a3f1b898c3a00cccc6f6aae295d89d90c8
 DIST kontrast-21.04.3.tar.xz 123764 BLAKE2B 8788b3b0e479b39a2065be61ae2e4fdc34c393a12be6547b596be1dd60fce8d3c8a98b2d7bb8ac7626c75570c92b52cd13cbfec1c61470c09abba931e5c7d7ab SHA512 fc966e28e790d49e2c87d45c506a7cf5170115f6528821f8634ab2e767ba725b9c6934cdfec5a308c751ff1b83fc59bea31dc50a462a81d71f47652a8b974e2a

app-accessibility/kontrast/kontrast-20.12.3.ebuild

@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_RELEASE_SERVICE="true"
-KFMIN=5.74.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Tool to check contrast for colors to verify they are correctly accessible"
-HOMEPAGE="https://apps.kde.org/kontrast/"
-
-LICENSE="GPL-3+"
-SLOT="5"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-"
-RDEPEND="${DEPEND}
-	kde-plasma/xdg-desktop-portal-kde
-"

app-admin/awscli/Manifest

@@ -1,20 +1,5 @@
-DIST awscli-1.19.104.tar.gz 2024567 BLAKE2B 82662ffe6a05dd329210ff84962e1ad37ece63a8f964c3c6bb293f53fea3af151bb088150260b3b279730871b7e962f2c580385b21a56a8bc2f86b437fab92d4 SHA512 444e533219e23b5151bab29d2d65deb8de9008b883b08ae553dd322b3f4e96d3836fedabc7be0393303ea146a0b8ad8220d4f4de458bca00303dc0798e543840
 DIST awscli-1.19.112.tar.gz 2028010 BLAKE2B c5f973a2a0cf002038cdc46d0760f5e5fad942b1383f21819459d51fd3e3a17617e23d45d284345fac1760a812ffc81842068e8517bb500559a330ea8183968e SHA512 4ad9e960826baa057a2e72ddc2afce1012b766b5f691236435347c3e4ce210ee0b14003c16615262ec707d0c65b7f7f71a15fcf80a0fdfefb21ab6a28cfb1d55
-DIST awscli-1.20.0.tar.gz 2028152 BLAKE2B d746335fc3414e773fbf3cb60b68ea1242162c7fb6f9e8222bec1bff992ec08e7239b9279de70551d05a99b2bd2743e8e2b8f65e01655574a542660fbb4a6ad7 SHA512 0aa478e9c28afa922958881f2f7795c6925e342964fb171176c81bce1fc4a0529dc9eb2fefaa05b670376781671e1531bbfe5114d0f0a748c964c5ace2c79ee4
-DIST awscli-1.20.1.tar.gz 2028927 BLAKE2B bd535f1eba64987c8389c8003b90a1361e95db00a62f13138b35d0f4b6a5130b2e52e38663f4560bf58fe6b86e668ee142a0228001d8cde583d096ce81612264 SHA512 b704ff3f482dd2ccfdf78d01ccff214c9cb9f7b12b1af0a7c615b9567a931a8bc47a444dd8f136a958346750a60fb03a084993a7deb0c234448a9889918c97e6
-DIST awscli-1.20.10.tar.gz 2047053 BLAKE2B 1ad45d2703e82c2be1a2847c2312d7199ef55aa7df33568be890c6ce72e03e05cddafeb1cce5c76a5f363bd397f744f1c229fbd5ea518fc53d24f2711e628207 SHA512 9c56ccc0191b319aa7035bce72da9cf1f9e97c9600a202e706244a5eaff419f305c7d68dbcbc96bb622b219efcd56ad6691b149fbf3daf036ebf627987b306f5
-DIST awscli-1.20.11.tar.gz 2047295 BLAKE2B d27c2fa2c1f665fe8f691e6d7ddd19a52b0f28e3d648f96f78e5b7f8c58f06252c99e49e739f45e8e70b126d5d3fbcf7f08fb54f837c47c2d3708152496435ec SHA512 d4ae3becbc9fdd863396504c43e4c683827706a7016e73fbd5e412cb8654ec5a3c0e10ee2c4d90455dd5427cfd73fe183d723f43030e4e35916389313dad06d8
-DIST awscli-1.20.12.tar.gz 2047696 BLAKE2B d65157579f088e00b7fcb08fd73a5ab9e3ea2bcd7fe4e80734865a4185cb7f7299d9d74f6f59d8bc41e9f4aa71c0f1eda73282fc5e1804c2eb3dcee7f0fcb1a9 SHA512 1d5584586a0fa8c47aaf3ee7bff5af320138e7c25ba605fd4b4a4de498ae795ad822ba3079c68ea2ed0cc57f6fbe696f55110ff979c347b2a5e14f8bb9fca4b7
-DIST awscli-1.20.13.tar.gz 2048380 BLAKE2B 5c469b2b41f7e7aa55f98e4d566f2659cb4a68b18d0e2acba3485ef4622b5763cbe324b1c2e6ef679f7968c2b8ca43aa29d8619fba612bba69cf7f9e7229ee6e SHA512 3e569d14fb34d9ee833c7bfbd83a303b8f95d4b84a1ff8e503063ecc3f434bc5a5e59c6bbfca5134be1c76f06796fde4a9e9647af881bc5f02268c8c90971289
-DIST awscli-1.20.14.tar.gz 2049156 BLAKE2B 2eed59fbbd11918451d64c76c58838c9d599eee042450211ed88bd25210a32337cd0766dfa1173bc2ae6e1f88f6cbe4995c54ca979b0b068b3b1dd312236de5a SHA512 f12aa5805fcdf5e958c4bb0c1320c412656711255932ff6cbf9ab7c14b85792f04a02bbb1911346fed0508ddfd3e7b5e3b731317921e3545e0e14bfe9b9c7ce7
 DIST awscli-1.20.15.tar.gz 2048948 BLAKE2B e7d378c9cb1752f4b7e014578d07fdc5f7bd9c14dc5fa33328a29c8fb9c9fab27f404dbfeea5952c243aeb35b0800c7840303d5f1339512d74cee2e4a5d590a1 SHA512 34c482067c3534737956520e5f6f0b3d30296f6de06969fe3ab43146a3190e36b432ea3642917c91e82659d5e79337add973f3f79216214f6b03b5cd15b363f2
-DIST awscli-1.20.16.tar.gz 2049307 BLAKE2B 122eb7331a30c02455dd3928fa411e24ab1da9d3d90ff9a9b4279bbf8cb4e454714e56fc0c1b521fe0a447537c6ae8ff1db62e63b49ab5cbb7b212a497748e82 SHA512 45973fb775cb7f52f6e220f1e26c4af32f4737963d3cc3e01d4462c75479eeddb2c1f15a8ce645ac698d1d42fdbb81a56a9ff655ff9918b746dce26fb6e0eea7
-DIST awscli-1.20.17.tar.gz 2054619 BLAKE2B e6570c2eb40f72a7070c69e391151b73d7110eb9ff00cf30af64ea8adb754e9ae5436a3ac92def059704ab7883624f9809a6c575667cfa069a5eef43604b49b2 SHA512 b7ec91dc11a70acc2994a913143f7c9d082df4e691c6916558b255052e7a1b8ec24f803f6795aac4729353611f29fb84bfa99b1e328d07757f6600f9302fac86
-DIST awscli-1.20.2.tar.gz 2029411 BLAKE2B dad47f749af3c1e7bbeb291eb92889c7dc9bdc9e81ddb1fd3769897f94ba549123589a2ef8a34b88d8370cc6bb5ad45cc7b9fa06ec474620303a78ec3d64100e SHA512 6384a02a7bd3a8ea38cf46725daa25e7656e12c1f3f6465043efc223a82c605dbc916a26debc214ff6d364e81013e729acac424ccccc535785e8a3b68cfce2f6
-DIST awscli-1.20.3.tar.gz 2029411 BLAKE2B 6d8573709072ea3955696de0c65a32610446737a216f6c5dd4ecae4cffcb48ecac531cfc598517c037066d066cf0de01510c0740949450ad3a5925af79bd8c16 SHA512 2324800964de8b1af4ae39dcee15e8fc2bd5e11a239c245590a86fac6574d80b290fb9d967df82d6fdd412cd8b783fd209780e5e58846a16302fa13c6f3b93fb
-DIST awscli-1.20.4.tar.gz 2043470 BLAKE2B 58722fe4277a7950665913e8b9ae99de8017cfe8c4974a3524f917533499e830d2eea2ac0994022796b979869468b5f3a767727b4384f78e325e423ed003b1b3 SHA512 3066438ac58eb2afb83ae6fef516e09965ceea1e97897e4f5b5760046f28a2f822b16b90c0a9ee6a58c6cdabbfb2f0ce044caf41396093188290e2a7c1e8c4f3
-DIST awscli-1.20.5.tar.gz 2043880 BLAKE2B f4b833baf883479ed63e09de998b41e0e0e88006d4779b0be86396bafdb559cd8b158f30f012045f699b7c374a2e6584534534fd778ac7669016d23b06534080 SHA512 598163c27dce2ee166fd1d27cbca62c14c807118df99951963665a064fb71ba795726ef3ea46cc51bd2a51f256364c66edb88d1cdd8f319b2025c0cecfe9f6ca
-DIST awscli-1.20.6.tar.gz 2044686 BLAKE2B 6513afc020855a103c5a4ee2b2aa6fc7355f2ebc445d3a89403045a8111a6beef7b934640de020a43fdd670fd4efb2f02dc907826b6a8f3335f6119267dfba10 SHA512 f53a56ae1aed266a4c6bd9236b15a070feaca804ea5276dbe0ad01e006866a17f2ab965ff086640cf62e002da0033c9091c56de1eb4b89a25cbeed329fd63e08
+DIST awscli-1.20.18.tar.gz 2054961 BLAKE2B 0045a45638a6d4b24b876c3fa984ab8cb33eaa18bf1b8f3ceb8eb4faaffcdf3daacd141cfb4b96c56ab406c00742d823d2b772978d4a2f79b2f06a90c45411b3 SHA512 24292e57fdc4b95bd79c31fe153ba8dc1869bda842fe9e9d4b66d2bd8e0354e279d95f0dc4d656a359f58fef3a7e76c17ec80398c1f516339af2d27ac88c9b38
+DIST awscli-1.20.19.tar.gz 2055440 BLAKE2B 1f56bcc70a6c479a4a939f3eb8ab24bdc6b5b6d5220c35a4f8be04d97dc0d181716398fe6733ed1364ed700f53096195163f85f3ffb467f9edbfe37530efabcd SHA512 7f65593fe89c66cc20c5fa27f8301e5ad6db40b519ed054b052dd2023a32bfe0409c5d309480a7e4b82e70dcc200bac253414d19c4b5e54adaaf02204bfaf7b4
 DIST awscli-1.20.7.tar.gz 2045304 BLAKE2B d8f086d8d2eb36645e77fa3d9ae7c196ed3a3fddcc2a0218696f92bd69e10b453be1340b965a8d8e6697bbd3c45013d72de3ed0d31b5823515a5a0092a812858 SHA512 a41bd3ebc34a65add66ef95d5194ba07907a08f7368b0fcd6551af2070c46c4a509af47d30aeadabddce19d1a61200a58faf40a7e2f759e64915cfb2826666ab
-DIST awscli-1.20.8.tar.gz 2046203 BLAKE2B 12fb4b26f030667f43778fc713fc83becb2bb78b9f5b7b9de1faae1b74207e27487bc4731e234767b11ce152cfbfb5b41fcf66e4d4793b0a754a7634219d455a SHA512 11861a471a3d43305dbc2d18b50848849736c6e55a0ed6ae0d7bafe73389a6011100b6b0ccbec243ea2f2846e8e689412d04a68bcf8324027a03f31062807dec
-DIST awscli-1.20.9.tar.gz 2046575 BLAKE2B 68a99843ead460aa0de60368f1cd8d91c32840fb8a9d251aad0cd787a2e6fe968716436cf32c94b779f6718356b5303f417b850d6a8a31ab1519c385b5c93799 SHA512 655e6eef77a0759e77d2b2c1db922048cdd270d693d9bae08dea6576f3eb5fc4e20a050364ab3dfbaf3a54d9a8fc08c97a6329f30fcf51f38a4de456e76e2b5d

app-admin/awscli/awscli-1.19.104.ebuild

@@ -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
-}

app-admin/awscli/awscli-1.19.112.ebuild

@@ -15,7 +15,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-)"

app-admin/awscli/awscli-1.20.10.ebuild

@@ -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
-}

app-admin/awscli/awscli-1.20.11.ebuild

@@ -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
-}

app-admin/awscli/awscli-1.20.12.ebuild

@@ -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
-}

app-admin/awscli/awscli-1.20.13.ebuild

@@ -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
-}

app-admin/awscli/awscli-1.20.14.ebuild

@@ -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
-}

app-admin/awscli/awscli-1.20.16.ebuild

@@ -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
-}

app-admin/awscli/awscli-1.20.17.ebuild

@@ -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
-}

app-admin/awscli/awscli-1.20.2.ebuild

@@ -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
-}

app-admin/awscli/awscli-1.20.3.ebuild

@@ -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
-}

app-admin/awscli/awscli-1.20.4.ebuild

@@ -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
-}

app-admin/awscli/awscli-1.20.5.ebuild

@@ -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
-}

app-admin/awscli/awscli-1.20.6.ebuild

@@ -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
-}

app-admin/awscli/awscli-1.20.8.ebuild

@@ -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
-}

app-admin/awscli/awscli-1.20.9.ebuild

@@ -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
-}

app-admin/eclean-kernel/Manifest

@@ -2,3 +2,4 @@ DIST eclean-kernel-0.4.3.tar.gz 10650 BLAKE2B 228d17cfc5bed34e892dd6340498b87cbc
 DIST eclean-kernel-1.99.4.tar.bz2 78909 BLAKE2B 0cac3a001c3180c57bdf9a63366d9950928690328fd560f984c1d35bcf88712e897462a153bc3f0250ebbbb42518798e3407c3533351543ff32bd68ecee2ee5e SHA512 f3263b83b36878104e21fe122eb96a16c5c5a930b062fdd62d6a574db597644222d5a19d7833cbb894a955076b06bcb1a22c94d5f87c2787420dd1de32d0f789
 DIST eclean-kernel-2.99.1.tar.gz 18608 BLAKE2B 3573df9b90e35fb9ac9ee4f5522daae5e9287ecd8cf612a3b984d2db663bc692e0a0eb05dcbc8ada63c69d43c821a55be11ccc3167a8a0e88f261d86dff173b5 SHA512 a9d6ccd6b5fe75f25fdd00f4cee3fe1d1c8be950958a2a28941a634e119a1715471ef129c20e077cc21e3a3925f2b8584b901265183fe75ff18e42d43ca52e14
 DIST eclean-kernel-2.99.2.tar.gz 18743 BLAKE2B 493a3f54e92821c76dde0228b382dbca0f9e9d69543e0af2269bdcfb736ef7450179d804f1a97b9e7700d812110c5f32b2667724f7c60e3377a8384e557b2f5c SHA512 48bb628be93922698483208471ec76b47615e80b5a7dead108d4f938664c72b080aa3f54f67056ce4b661ef92fff74f93ef842da1e177225793d13f8a3e16032
+DIST eclean-kernel-2.99.3.tar.gz 20031 BLAKE2B 70830639eb00bde810e29361dec7c7b90f5b85b79b5be865f23cf45254cbf6139ef335fb5bfef08e2512512e57867df62f6468ce8de1da58cc9a4cfa27a26244 SHA512 edbe373b81a2eb5c7fca8794f9577c68ab66305e9085cc7535cd5d8a8fdd549b2035cb0b5f3e5a69cc735146c2eef81dc5c1f5284ef255420aca0cda9e518b14

app-admin/eclean-kernel/eclean-kernel-2.99.3.ebuild

@@ -0,0 +1,20 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+inherit distutils-r1
+
+DESCRIPTION="Remove outdated built kernels"
+HOMEPAGE="https://github.com/mgorny/eclean-kernel/"
+SRC_URI="https://github.com/mgorny/eclean-kernel/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="kernel_linux? ( dev-python/pymountboot[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest

app-admin/eclean-kernel/eclean-kernel-9999.ebuild

@@ -1,11 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python3_{7..9} )
-
 inherit distutils-r1 git-r3
 
 DESCRIPTION="Remove outdated built kernels"

app-admin/exo/Manifest

@@ -1 +1 @@
-DIST exo-1.38.0.tar.gz 5233640 BLAKE2B 11a0500690a5d9efe35d34b9f562265fb8ecee2d4d8e15c37ec4c2b99f1a5665120bffd5a8359e61c0763db530a3d3141deb08083b8289785e834861ba728b04 SHA512 f509eeacf1266893c8a3e4e09556987e33a533c1ebc64b6d39d7bd801fa5e11a6d8875c4111e760309ac6be0a6dbdcbcc227d0b4804c8f04e9d094c44ee9d0dd
+DIST exo-1.39.0.tar.gz 5484733 BLAKE2B caf4cb13254ef3d6489358cbd95cb5c2f0e87ca51f0fc8d5f4eef8923937d9481276d56aa6df23713b0ca37ff3939f1fc02b1c9eda7a34b369ac00e74f8ede18 SHA512 0c933d97d14fd15f6fe1f1059aa81473d3e29c15dd5e506958113287fa9488d761c736a828dd6e0aedb907f9724f2b6d591e0cce1f17434b8abe2d32c1c96bcd

app-admin/mcelog/Manifest

@@ -1,3 +1 @@
-DIST mcelog-175.tar.gz 315350 BLAKE2B a324af0f4961fb0f6f2af1b198e07a34c24fb5874edd550ca9bdfe452d84cf48d9565530a290a3cdba51eb4ad57f3bbe3d3c9b2beb6d3411195d6dccdb9dfd64 SHA512 992789817a3963a3f118121149bf9b217609f54d85a71c2adb671728cf04777ccb062033df68793afff5fb6a0080b50b4e6fa89cbcd0970d92ca4246155ea13a
-DIST mcelog-177.tar.gz 315474 BLAKE2B 8c6920b01ba836460067f322a17e5a69c2a9a447127ae583ddd151f3cd290aca039a63e95601789cd71c4ef75d4213e39918e08b600aeda3e06bb800119209c5 SHA512 b73d103c7b326e6aa2cb22a05b7df29e24f5b8f9e564a9d2d05627e0af80ee581d62b422e35a68cf3e43a3e1aaf905cccb08a65286c9f77c8c8c2ac41e880fbf
 DIST mcelog-178.tar.gz 315460 BLAKE2B 65d424f70c615a694dfb18a0d7049965280141858a2c527fbe1db806d675785a0edba161dd6ac4bf6660e1bb2334d394f98bc85058c17d79b2c25106297ae95e SHA512 f024908c877b489148e23bbb8b34d587d1b88e13e43bb401b4594eafb577a24a4b478fd4aa7e221d2d9e633b509b641123418dc36a52425193083d26d2ca60bb

app-admin/mcelog/mcelog-175.ebuild

@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit linux-info systemd toolchain-funcs
-
-DESCRIPTION="A tool to log and decode Machine Check Exceptions"
-HOMEPAGE="http://mcelog.org/"
-SRC_URI="https://github.com/andikleen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="selinux"
-
-RDEPEND="selinux? ( sec-policy/selinux-mcelog )"
-
-# TODO: add mce-inject to the tree to support test phase
-RESTRICT="test"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != buildonly ]]; then
-		local CONFIG_CHECK="~X86_MCE"
-		kernel_is -ge 4 12 && CONFIG_CHECK+=" ~X86_MCELOG_LEGACY"
-		check_extra_config
-	fi
-}
-
-src_prepare() {
-	eapply "${FILESDIR}"/${PN}-0.8_pre1-timestamp-${PN}.patch \
-		"${FILESDIR}"/${PN}-129-debugflags.patch
-	eapply_user
-	tc-export CC
-}
-
-src_install() {
-	default
-
-	insinto /etc/cron.daily
-	newins ${PN}.cron ${PN}
-
-	insinto /etc/logrotate.d/
-	newins ${PN}.logrotate ${PN}
-
-	newinitd "${FILESDIR}"/${PN}.init-r1 ${PN}
-	systemd_dounit ${PN}.service
-
-	dodoc *.pdf
-}
-
-pkg_postinst() {
-	einfo "The default configuration set is now installed in /etc/${PN}"
-	einfo "you might want to edit those files."
-	einfo
-	einfo "A sample cronjob is installed into /etc/cron.daily"
-	einfo "without executable bit (system service is the preferred method now)"
-}

app-admin/mcelog/mcelog-177-r1.ebuild

@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit linux-info systemd toolchain-funcs
-
-DESCRIPTION="A tool to log and decode Machine Check Exceptions"
-HOMEPAGE="http://mcelog.org/"
-SRC_URI="https://github.com/andikleen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="selinux"
-
-RDEPEND="selinux? ( sec-policy/selinux-mcelog )"
-
-# TODO: add mce-inject to the tree to support test phase
-RESTRICT="test"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != buildonly ]]; then
-		local CONFIG_CHECK="~X86_MCE"
-		kernel_is -ge 4 12 && CONFIG_CHECK+=" ~X86_MCELOG_LEGACY"
-		check_extra_config
-	fi
-}
-
-src_prepare() {
-	eapply "${FILESDIR}"/${PN}-0.8_pre1-timestamp-${PN}.patch \
-		"${FILESDIR}"/${PN}-129-debugflags.patch
-	eapply_user
-	tc-export CC
-}
-
-src_install() {
-	default
-
-	insinto /etc/logrotate.d/
-	newins ${PN}.logrotate ${PN}
-
-	newinitd "${FILESDIR}"/${PN}.init-r1 ${PN}
-	systemd_dounit ${PN}.service
-
-	dodoc *.pdf
-}
-
-pkg_postinst() {
-	einfo "The default configuration set is now installed in /etc/${PN}"
-	einfo "you might want to edit those files."
-}

app-admin/mcelog/mcelog-177.ebuild

@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit linux-info systemd toolchain-funcs
-
-DESCRIPTION="A tool to log and decode Machine Check Exceptions"
-HOMEPAGE="http://mcelog.org/"
-SRC_URI="https://github.com/andikleen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="selinux"
-
-RDEPEND="selinux? ( sec-policy/selinux-mcelog )"
-
-# TODO: add mce-inject to the tree to support test phase
-RESTRICT="test"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != buildonly ]]; then
-		local CONFIG_CHECK="~X86_MCE"
-		kernel_is -ge 4 12 && CONFIG_CHECK+=" ~X86_MCELOG_LEGACY"
-		check_extra_config
-	fi
-}
-
-src_prepare() {
-	eapply "${FILESDIR}"/${PN}-0.8_pre1-timestamp-${PN}.patch \
-		"${FILESDIR}"/${PN}-129-debugflags.patch
-	eapply_user
-	tc-export CC
-}
-
-src_install() {
-	default
-
-	insinto /etc/cron.daily
-	newins ${PN}.cron ${PN}
-
-	insinto /etc/logrotate.d/
-	newins ${PN}.logrotate ${PN}
-
-	newinitd "${FILESDIR}"/${PN}.init-r1 ${PN}
-	systemd_dounit ${PN}.service
-
-	dodoc *.pdf
-}
-
-pkg_postinst() {
-	einfo "The default configuration set is now installed in /etc/${PN}"
-	einfo "you might want to edit those files."
-	einfo
-	einfo "A sample cronjob is installed into /etc/cron.daily"
-	einfo "without executable bit (system service is the preferred method now)"
-}

app-admin/mcelog/mcelog-178.ebuild

@@ -11,7 +11,7 @@ SRC_URI="https://github.com/andikleen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="selinux"
 
 RDEPEND="selinux? ( sec-policy/selinux-mcelog )"

app-arch/lzlib/lzlib-1.12.ebuild

@@ -11,7 +11,7 @@ SRC_URI="https://download.savannah.gnu.org/releases/lzip/${PN}/${P}.tar.gz"
 
 LICENSE="libstdc++" # fancy form of GPL-2+ with library exception
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 src_configure() {

app-backup/btrbk/btrbk-0.31.2.ebuild

@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
 	SRC_URI=""
 else
 	SRC_URI="https://digint.ch/download/btrbk/releases/${P}.tar.xz"
-	KEYWORDS="amd64 arm arm64 ~x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
 
 DESCRIPTION="Tool for creating snapshots and remote backups of btrfs subvolumes"

app-cdr/dolphin-plugins-mountiso/Manifest

@@ -1,2 +1 @@
-DIST dolphin-plugins-20.12.3.tar.xz 239340 BLAKE2B 141e5d2bb6190edaef98cec2a271e41b916966118300d69f4eb5e7da15e51730476f23a20312b76fca0fc1490501e83528b4f0cb62f9f6c64e4caf5ac5b2cd37 SHA512 1d5303e92d912bc80c5260263b081205d36372f1f15205ebd3e705697a114f8481edd1ad31004d7906c3088d43a74cb1e33dac6e1196c247e702a544d67db11b
 DIST dolphin-plugins-21.04.3.tar.xz 253244 BLAKE2B c5c0e302dfc4eb82e2de1a635824bf8fd2c70bcac65c261253f0e52e7d9242fa339fe2dc619b927b0379477b2c80a22ec210080af8f2370e0a0182af3347df6a SHA512 e4beba0d596782951b149d42e930d76b12a36bea83f35eb0cff9e49b3e02d4b2aa55f4245d4b8708044a49770d477badc964752828eef4caeaefd4f16e5f9dad

app-cdr/dolphin-plugins-mountiso/dolphin-plugins-mountiso-20.12.3-r1.ebuild

@@ -1,69 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="false"
-KDE_RELEASE_SERVICE="true"
-KDE_ORG_CATEGORY="sdk"
-KDE_ORG_NAME="dolphin-plugins"
-MY_PLUGIN_NAME="mountiso"
-KFMIN=5.75.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Dolphin plugin for ISO loopback device mounting"
-HOMEPAGE="https://apps.kde.org/dolphin_plugins/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/dolphin-${PVCUT}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-dont-mount-ISO-multiple-times.patch" # KDE-bug 434617
-)
-
-src_prepare() {
-	ecm_src_prepare
-	# kxmlgui, qtnetwork only required by dropbox
-	ecm_punt_bogus_dep Qt5 Network
-	ecm_punt_bogus_dep KF5 XmlGui
-	# delete non-${PN} translations
-	if [[ ${KDE_BUILD_TYPE} = release ]]; then
-		find po -type f -name "*po" -and -not -name "*${MY_PLUGIN_NAME}plugin" -delete || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_${MY_PLUGIN_NAME}=ON
-		-DBUILD_bazaar=OFF
-		-DBUILD_dropbox=OFF
-		-DBUILD_git=OFF
-		-DBUILD_hg=OFF
-		-DBUILD_svn=OFF
-	)
-	ecm_src_configure
-}
-
-src_install() {
-	ecm_src_install
-	rm "${D}"/usr/share/metainfo/org.kde.dolphin-plugins.metainfo.xml || die
-}

app-crypt/acme/acme-1.17.0.ebuild

@@ -11,7 +11,7 @@ if [[ ${PV} == 9999* ]]; then
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/certbot/certbot/archive/v${PV}.tar.gz -> certbot-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 	S=${WORKDIR}/certbot-${PV}/acme
 fi
 

app-crypt/acme/acme-1.18.0.ebuild → app-crypt/acme/acme-1.18.0-r1.ebuild

@@ -1,10 +1,13 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-PYTHON_COMPAT=(python{3_7,3_8,3_9})
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
+inherit distutils-r1
+
 if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
 	inherit git-r3
@@ -15,20 +18,15 @@ else
 	S=${WORKDIR}/certbot-${PV}/acme
 fi
 
-inherit distutils-r1
-
 DESCRIPTION="An implementation of the ACME protocol"
 HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/chardet[${PYTHON_USEDEP}]
 	>=dev-python/cryptography-2.1.4[${PYTHON_USEDEP}]
-	>=dev-python/idna-2.0.0[${PYTHON_USEDEP}]
 	>=dev-python/josepy-1.1.0[${PYTHON_USEDEP}]
 	>=dev-python/pyopenssl-17.3.0[${PYTHON_USEDEP}]
 	dev-python/pyrfc3339[${PYTHON_USEDEP}]
@@ -36,34 +34,6 @@ RDEPEND="
 	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
 	>=dev-python/requests-toolbelt-0.3.0[${PYTHON_USEDEP}]
 "
-DEPEND="
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-	)
-	test? (
-		${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-src_compile() {
-	python_foreach_impl run_in_build_dir default
-	distutils-r1_src_compile
-	if use doc ; then
-		cd docs || die
-		sphinx-build -b html -d _build/doctrees   . _build/html
-	fi
-}
-
-python_test() {
-	nosetests -w ${PN} || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
 
-	distutils-r1_python_install_all
-}
+distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
+distutils_enable_tests pytest

app-crypt/acme/acme-9999.ebuild

@@ -1,10 +1,13 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-PYTHON_COMPAT=(python{3_7,3_8,3_9})
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
+inherit distutils-r1
+
 if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
 	inherit git-r3
@@ -15,54 +18,22 @@ else
 	S=${WORKDIR}/certbot-${PV}/acme
 fi
 
-inherit distutils-r1
-
 DESCRIPTION="An implementation of the ACME protocol"
 HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="
+	dev-python/chardet[${PYTHON_USEDEP}]
 	>=dev-python/cryptography-2.1.4[${PYTHON_USEDEP}]
-	>=dev-python/idna-2.0.0[${PYTHON_USEDEP}]
 	>=dev-python/josepy-1.1.0[${PYTHON_USEDEP}]
 	>=dev-python/pyopenssl-17.3.0[${PYTHON_USEDEP}]
 	dev-python/pyrfc3339[${PYTHON_USEDEP}]
 	dev-python/pytz[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.10[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
 	>=dev-python/requests-toolbelt-0.3.0[${PYTHON_USEDEP}]
 "
-DEPEND="
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-	)
-	test? (
-		${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-src_compile() {
-	python_foreach_impl run_in_build_dir default
-	distutils-r1_src_compile
-	if use doc ; then
-		cd docs || die
-		sphinx-build -b html -d _build/doctrees   . _build/html
-	fi
-}
-
-python_test() {
-	nosetests -w ${PN} || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
 
-	distutils-r1_python_install_all
-}
+distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
+distutils_enable_tests pytest

app-crypt/certbot-apache/certbot-apache-1.17.0.ebuild

@@ -11,7 +11,7 @@ if [[ ${PV} == 9999* ]]; then
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/${PN%-apache}/${PN%-apache}/archive/v${PV}.tar.gz -> ${PN%-apache}-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 	S=${WORKDIR}/${PN%-apache}-${PV}/${PN}
 fi
 

app-crypt/certbot-apache/certbot-apache-1.18.0.ebuild

@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=(python{3_7,3_8,3_9})
+
+PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 if [[ ${PV} == 9999* ]]; then
@@ -28,3 +29,5 @@ RDEPEND=">=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
 	dev-python/python-augeas[${PYTHON_USEDEP}]
 	dev-python/zope-component[${PYTHON_USEDEP}]
 	dev-python/zope-interface[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest

app-crypt/certbot-apache/certbot-apache-9999.ebuild

@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=(python{3_7,3_8,3_9})
+
+PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 if [[ ${PV} == 9999* ]]; then
@@ -28,3 +29,5 @@ RDEPEND=">=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
 	dev-python/python-augeas[${PYTHON_USEDEP}]
 	dev-python/zope-component[${PYTHON_USEDEP}]
 	dev-python/zope-interface[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest

app-crypt/certbot-nginx/certbot-nginx-1.17.0.ebuild

@@ -11,7 +11,7 @@ if [[ ${PV} == 9999* ]]; then
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/${PN%-nginx}/${PN%-nginx}/archive/v${PV}.tar.gz -> ${PN%-nginx}-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 	S=${WORKDIR}/${PN%-nginx}-${PV}/${PN}
 fi
 

app-crypt/certbot-nginx/certbot-nginx-1.18.0.ebuild

@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=(python{3_7,3_8,3_9})
+
+PYTHON_COMPAT=(python3_{8..10} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 if [[ ${PV} == 9999* ]]; then
@@ -30,3 +31,5 @@ RDEPEND="
 	>=dev-python/pyopenssl-17.3.0[${PYTHON_USEDEP}]
 	>=dev-python/pyparsing-2.2.0[${PYTHON_USEDEP}]
 	dev-python/zope-interface[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest

app-crypt/certbot-nginx/certbot-nginx-9999.ebuild

@@ -2,7 +2,8 @@