gentoo auto-resync : 08:12:2022 - 21:16:36

5 files changed, 84 insertions, 4 deletions

diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 6dfe28206aee..f311850a1add 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/augeas/Manifest b/app-admin/augeas/Manifest
index 147dc59790ba..2a9bb6248da4 100644
--- a/app-admin/augeas/Manifest
+++ b/app-admin/augeas/Manifest
@@ -1,8 +1,8 @@
 AUX augeas-1.13.0-selinux.patch 661 BLAKE2B abd8430f4bf5a0c0d8033d1f265026b9cff64baf2898cbb522613b41ccde7314342c052ee7cf0d0f3b2d7295af96158c137aef57a7833cda08d435ed17c91e96 SHA512 4059e71ce3f4061fe658dab665e917a807e9f207e0d42b61687434d2368d748da536ae532c9451b9c360fedfc0e6f7fa67ed8926282fec1dbecaecc28f6b0790
 DIST augeas-1.12.0.tar.gz 2429279 BLAKE2B cd90203fec1a81b114d95bb50e168b852923136f34c83974d3427cbedd4eb0d335d3952057507b38ded5c7011be2b56725565ea106cb32a0ca43b7c81250b29e SHA512 4f61d4abbf338e915dfae212560d39792674bc757f05f500afa80c6170abc214ffb99cab2cf5bbd1c2338d11a6909e5fc3ff7112a2246fca69f7b39ac283da40
 DIST augeas-1.13.0.tar.gz 2562588 BLAKE2B 0a8e62c999a425b89bfa2b1b2cdf7c7894ca39b59d577ca2f7ce9bf33e51f2fffe2510518a8666d59fcf7f8479cae3b2a41efe4478830f89fa20d1fbeb6c9716 SHA512 a6a9ee76f3e48780df1928f2fdfa5cc826695fe6233ff90d069d05806cb020aed3c6b2ce6b9047925a203973eefcd7c254fc3ddd1db7473821c8ade4fda58d5f
-DIST augeas-1.14.0.tar.gz 905420 BLAKE2B 8aac3da6bb3714e28d311936cc54f05491fe7e8305a323f741c1cb3eca1d7f86fb566abf39a488d94266f3e7477ca951490802317f6d2f457a0805fcfab80234 SHA512 1f28bcde9681eda4f28daf0584c7e4702ddb8f45980575cdeabe0893d91a0587f858889eb0353b7fa5a3e2961388710ef72811f38c557f7f0130b01e23c8901c
+DIST augeas-1.14.0.tar.gz 2651463 BLAKE2B 428e708cfdc485feeb7fe80b8642c5b63a8563f508350ae4751a718888d187bab5d8ca8e82b5e9106527b86bb53d3c5a5a2a6e9ef35d18dae308030286039b6a SHA512 06ef6f735686ae09ec8733a3daf36f6838fa56e761dc6d89e5c44420ea2403a4649bec162b8e49b2c3fe32f0eced8413eba1f2c551103a43860bba823315f1ef
 EBUILD augeas-1.12.0.ebuild 957 BLAKE2B 8997535b7b70e25300dc2bb017be15fd724e6731590151ac9617bb7ec8e03901b3dedaa07dc5b54c3475a5fd86646bd38bfd2ca7a6d07dbc5b66aae8cfe7fd8e SHA512 f6402c7b79ff126af421b82598817edf2894542ac73b3ab32601a4d8e18c8e3b7f273cb55be83470123a7ebbea14a53cba93a3d6652075c22740791ab6ed23c4
 EBUILD augeas-1.13.0.ebuild 994 BLAKE2B 20dfcadd99468b39dc3e91f12819c3a4f9facc1f4816af061451c105df9be46d87fab7c2748e74728b8b8cc031c1ac40932b97b8d90f3f5be17f8096b4b89ff5 SHA512 498ad93664047f6dac51cd142d43a93609863c273899d087b6ed9b4f948484e399e06c3bf9902acdcf21eb879dbd4623cad4a73c3335e9820b115bae30702a0c
-EBUILD augeas-1.14.0.ebuild 1098 BLAKE2B 3ffb83795df57e686f3d7b551eef348275423b403876d679267e6204ae1a86fccb86991ee6d00ea6102c88fb17aea1ecd21de057bcdd198a5bc8177e1a553011 SHA512 ad50d9467b00b2cd40d194486847d87a9c8ac6e5bee954f87f2c704162e408efc98a1d6f0b9146e4631328536c5d22f015c926c05e3d5ae0c95b8f2c944133ba
+EBUILD augeas-1.14.0-r1.ebuild 960 BLAKE2B e2bb652802d5fe37c51238328b332a5cf45cc63026e3f25e03581f6f9910b56b36e1cfd8a915381cc2763d39d17aad57f6fae7be3d1ac95f032f687975f44622 SHA512 5b69deab39be708e7e38a5103971403730e601936b9c24341d1c49c6cd34a1f0a4f03be899e938c93bcdc7d3c276dab75697a61a4faf8f23914b73ab9d61685b
 MISC metadata.xml 788 BLAKE2B d8484727eaeaecc48fde1039c9081d9e1c9572487f9a327a8464dbe448f407efc649499c06d7eca01fdd5eefc51cf7a33ef1bcfbf7df683276904a3f7367e4cf SHA512 1f9528e412f4621928b9da5970bfb244193b763bd27e235e40ae62efd7981be831ca2beebb060e335e432cad1f52ab2bbef2536eca19095e9115db0efa3c4ca2
diff --git a/app-admin/augeas/augeas-1.14.0.ebuild b/app-admin/augeas/augeas-1.14.0-r1.ebuild
index 1379e3eb1d89..5641cdf7ae59 100644
--- a/app-admin/augeas/augeas-1.14.0.ebuild
+++ b/app-admin/augeas/augeas-1.14.0-r1.ebuild
@@ -8,7 +8,6 @@ inherit autotools
 DESCRIPTION="A library for changing configuration files"
 HOMEPAGE="http://augeas.net/"
 SRC_URI="https://github.com/hercules-team/augeas/releases/download/release-${PV}/${P}.tar.gz"
-SRC_URI="https://github.com/hercules-team/augeas/archive/refs/tags/release-${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
@@ -27,7 +26,6 @@ BDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}"/${P}-selinux.patch
 )
 
 src_prepare() {
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index d5cb948bb760..ca8f424dbae9 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -6,6 +6,7 @@ DIST aws-cli-1.27.21.gh.tar.gz 2316385 BLAKE2B d85449a12fc93fb30fc905df7aa8e24ca
 DIST aws-cli-1.27.22.gh.tar.gz 2317454 BLAKE2B b926d1e62dbea9bb2790881838dfe6e6747f0072a7035f6c1ab317911c982a34f174ecff0238c17c7227fcc4d1ee5da6d4374f1b99a560eff48f59d87157b12a SHA512 dae02f109d028d0b1be6fc8fe1c2dc977d3d5fdd3cb252a4f267ab451567f39914c4bf6ba91598d21fc408eb1cdbe300a005d87ccc1026e7cd311fd5b88643df
 DIST aws-cli-1.27.23.gh.tar.gz 2318518 BLAKE2B eb04dd0f7b1ea803246c00c4dede6662af5c62918276f41b65a63ddeddf4509ffe198309f62748da7fd41fefc4a26861275e1a03d367486ee496ed84d5367ad4 SHA512 b78c75ffff12f730863290f2cf0c568a5e4ff27a4761339ca32321cbd1693984c6b80dccf0c12e4d6f103cb64caf2ea6ad3aa780b39b092d62225850a6273d7d
 DIST aws-cli-1.27.24.gh.tar.gz 2319169 BLAKE2B 6677fc6d09298fc37d5aae5e9b4addc87ec873f765b59b55759c0e1dd0c65ab49234c8a8f8f979be4f4cd1361033e8e142568136e5024408dc5c839f34480274 SHA512 29d8956b665531ee3d5451fbb063f7393978f223e379fed0a61304cb6798241325191bd5ea9f76531c7009b8b0e32c849a0c4a445508751518ce33631ce6a9cd
+DIST aws-cli-1.27.25.gh.tar.gz 2319262 BLAKE2B 1207b7879a82c538be9d1ee3dc8a69f20c6334afdd8d35c63ca3d44f264316680aa4d7d01b19a216ca2693748977b83851a2b75f1fd55b85989f2749ab05e827 SHA512 e46f684b219d0bce61ffae0737b2c485a4fb359b7e3ad3ef6180d5378daa49bb049033073594c63f44150266041b4a78634aced1a34fc98f08f0ca8e371558e2
 DIST aws-cli-1.27.8.gh.tar.gz 2301766 BLAKE2B 1873d92b8d2f6d3f29a65b4177927a1a14034da71dbc95ff6abf3f49df6cf3ee192412eeea15be14c8cf9fca0a5603f2c76b80b280f4feb95e661055abcd8b60 SHA512 e53828cac1b3e10e2ddd45312d71cdb748216dbc37c3e9833e7a1320b236c3bef6a13204a38b946d9182430f169fca1ddc77d3d06c1c2c6e05978dc61f675168
 EBUILD awscli-1.27.11.ebuild 2261 BLAKE2B 8db2f30612572dabd673c4b33fb8fcf3005bc3aa7762c3abbbf12ffe50bb51f9b46a043d4b849682bfb585e0638b9f8a0849b241807516b442e013085bf2f1ad SHA512 03816a71b8cf31f9bd659cace763b9143a8700290f3cee354ead69fa3333f6faa47a9769db433bbf17f5cd7a76f27bfd1a4df8bdfbdb5bd393eb4e69e7ee882a
 EBUILD awscli-1.27.16.ebuild 2261 BLAKE2B 8db2f30612572dabd673c4b33fb8fcf3005bc3aa7762c3abbbf12ffe50bb51f9b46a043d4b849682bfb585e0638b9f8a0849b241807516b442e013085bf2f1ad SHA512 03816a71b8cf31f9bd659cace763b9143a8700290f3cee354ead69fa3333f6faa47a9769db433bbf17f5cd7a76f27bfd1a4df8bdfbdb5bd393eb4e69e7ee882a
@@ -15,5 +16,6 @@ EBUILD awscli-1.27.21.ebuild 2261 BLAKE2B 8db2f30612572dabd673c4b33fb8fcf3005bc3
 EBUILD awscli-1.27.22.ebuild 2261 BLAKE2B 8db2f30612572dabd673c4b33fb8fcf3005bc3aa7762c3abbbf12ffe50bb51f9b46a043d4b849682bfb585e0638b9f8a0849b241807516b442e013085bf2f1ad SHA512 03816a71b8cf31f9bd659cace763b9143a8700290f3cee354ead69fa3333f6faa47a9769db433bbf17f5cd7a76f27bfd1a4df8bdfbdb5bd393eb4e69e7ee882a
 EBUILD awscli-1.27.23.ebuild 2261 BLAKE2B 8db2f30612572dabd673c4b33fb8fcf3005bc3aa7762c3abbbf12ffe50bb51f9b46a043d4b849682bfb585e0638b9f8a0849b241807516b442e013085bf2f1ad SHA512 03816a71b8cf31f9bd659cace763b9143a8700290f3cee354ead69fa3333f6faa47a9769db433bbf17f5cd7a76f27bfd1a4df8bdfbdb5bd393eb4e69e7ee882a
 EBUILD awscli-1.27.24.ebuild 2261 BLAKE2B 8db2f30612572dabd673c4b33fb8fcf3005bc3aa7762c3abbbf12ffe50bb51f9b46a043d4b849682bfb585e0638b9f8a0849b241807516b442e013085bf2f1ad SHA512 03816a71b8cf31f9bd659cace763b9143a8700290f3cee354ead69fa3333f6faa47a9769db433bbf17f5cd7a76f27bfd1a4df8bdfbdb5bd393eb4e69e7ee882a
+EBUILD awscli-1.27.25.ebuild 2261 BLAKE2B 8db2f30612572dabd673c4b33fb8fcf3005bc3aa7762c3abbbf12ffe50bb51f9b46a043d4b849682bfb585e0638b9f8a0849b241807516b442e013085bf2f1ad SHA512 03816a71b8cf31f9bd659cace763b9143a8700290f3cee354ead69fa3333f6faa47a9769db433bbf17f5cd7a76f27bfd1a4df8bdfbdb5bd393eb4e69e7ee882a
 EBUILD awscli-1.27.8.ebuild 2259 BLAKE2B 64d00480a8171f321e7feb58458293b942f7eb6d97b2bdc63f0ed7327d04e56ae15a274df4ce5a49199db2451f336e2ae2e49d20d5b9f57c26a347bc42ba9639 SHA512 cc067d10df0d454b0f7f184d336d98f39ee65dfc847289984f1158c679869852e4820736afc856cbbba1ffa128627778b3c1248897bdde9b799631b5cd24a6d8
 MISC metadata.xml 385 BLAKE2B 5accfb180a91179cc6df539d42d1de06be3ebfec73f3edb719f5d59576103b9a8cb0c7c524c1042630e0cf99f068939a19f04c7b1b4a2acf9e072369df80d913 SHA512 ccb3d516326c5dbdf53068372ce25baecc137d21a04516374362212b969cc928dacbf743b4953da33f28482905798f069d09d19c88d9913f2b32648db25115ab
diff --git a/app-admin/awscli/awscli-1.27.25.ebuild b/app-admin/awscli/awscli-1.27.25.ebuild
new file mode 100644
index 000000000000..9bcb01ac11e2
--- /dev/null
+++ b/app-admin/awscli/awscli-1.27.25.ebuild
@@ -0,0 +1,80 @@
+# 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_{10..11} )
+
+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 ~riscv ~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}]
+	!app-admin/awscli-bin
+"
+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() {
+	local EPYTEST_DESELECT=(
+		# TODO
+		tests/functional/eks/test_kubeconfig.py::TestKubeconfigLoader::test_load_simple
+		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_env_only
+		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_existing
+		tests/unit/customizations/eks/test_kubeconfig.py::TestKubeconfigValidator::test_valid
+	)
+
+	# 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
+}