gentoo auto-resync : 17:08:2023 - 09:31:54

8 files changed, 133 insertions, 3 deletions

diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 789187ea72db..9cea2e4dff19 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index 76fffffd6736..601ca5ec9291 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -3,9 +3,11 @@ DIST aws-cli-1.29.20.gh.tar.gz 2499798 BLAKE2B e9a8d4a8f804132a5c6ea2c5d8ef99f49
 DIST aws-cli-1.29.25.gh.tar.gz 2502999 BLAKE2B 065a694d1079267676256dc125316993e6276466987a0c773786593d7f8dd0382d4e1dbf64531c81b33ea4c1b5deb59f7c1d22fea0560aef898fa1bdede58414 SHA512 3344650a4a1fd499d707f60d3922e64ade852488bb58ee999d13971c47f42904f8e464c99cd3dfc4d44b9d2c6c138f2b6f6c661303542f0b8d0bc8b7b50932c1
 DIST aws-cli-1.29.26.gh.tar.gz 2503354 BLAKE2B 46997ff0759ddd267fcfc227410d25c1a6810edae67faacd246025339975343e248669bc7dadca8454e36da0ec956c0cf279238274790cca3dea5fd11ab270a6 SHA512 5f528bc7b260b4a998aadf3418a282c68a963cca1f8f5929b74640fe7623d54472e8ae45d8b99bc8f294d1b046f72f181daabad6c01d49afe98edb91429e775b
 DIST aws-cli-1.29.27.gh.tar.gz 2509252 BLAKE2B 693184fd4c1886ecba870df6c9e2cf843c3e9f2dcadba0e0de657abd751ca19044267edf7899704c8f9a9ccb0dcab0af70f4d771b9def9760cede26c70686905 SHA512 1fc8bca504262395a5eb49106198c4ddd602a083a565c0d74853c3dd67bd797ec3a48c01951243e677a84670a0f2b2c2a79a46d5237cc3e1c5f1edd8f6066bc6
+DIST aws-cli-1.29.28.gh.tar.gz 2509294 BLAKE2B c3fbeebaead71029ce882cf7a88d72146127df063d48d02ba134c3dfe5e446d8d5ba8034caaa43615cf4d28f713a45ddc489f3be4ce60cf06c364b48e23f594b SHA512 bf0f73137025110c3de2cd88ac9b03aef4ad245795ca37a0b8fdc93de900686c6eddd63f20d160f211fd0fe9b7de106a82a537162337338cd5285fac47003c08
 EBUILD awscli-1.29.15.ebuild 2278 BLAKE2B a074ad11e996c7c4e5c0366e5e5d3856cb1bdd7984b8eaf9ac959108e0c5737b064be5d7a579f46669403efb0c3111e8814570f041106e920102cf2a6ddf3687 SHA512 060c06ae5d2295b74940bc86eabf279eeb7a81f7cafa4a9d89e9af8076feff5a23cc3f9bad5a631e75155af64b948abe4c0de7283883a53d4b1ee5791765176b
 EBUILD awscli-1.29.20.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
 EBUILD awscli-1.29.25.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
 EBUILD awscli-1.29.26.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
 EBUILD awscli-1.29.27.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
+EBUILD awscli-1.29.28.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
 MISC metadata.xml 385 BLAKE2B 5accfb180a91179cc6df539d42d1de06be3ebfec73f3edb719f5d59576103b9a8cb0c7c524c1042630e0cf99f068939a19f04c7b1b4a2acf9e072369df80d913 SHA512 ccb3d516326c5dbdf53068372ce25baecc137d21a04516374362212b969cc928dacbf743b4953da33f28482905798f069d09d19c88d9913f2b32648db25115ab
diff --git a/app-admin/awscli/awscli-1.29.28.ebuild b/app-admin/awscli/awscli-1.29.28.ebuild
new file mode 100644
index 000000000000..62c19f3a63fb
--- /dev/null
+++ b/app-admin/awscli/awscli-1.29.28.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2023 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 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~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
+}
diff --git a/app-admin/drush/Manifest b/app-admin/drush/Manifest
index c51df6567f8f..c86ce5c3f0ed 100644
--- a/app-admin/drush/Manifest
+++ b/app-admin/drush/Manifest
@@ -1,9 +1,10 @@
 AUX array-syntax.patch 2166 BLAKE2B 40c40456ea5f2deacb4f83f74abdb58300a1fd03f93544e05d0e4e58ec266422d5b2cffa0652b49022a6096801d8506779e2da5f11cabfbc2e15fb36f1a78fe1 SHA512 8fb8e243b885a40490b0e55a12e65639879e6adae60f2784e6c960338c9e842bb480d9d18d83c1dd834b8114c37c59a4709881936895faf0c3262878de62414a
+AUX drush-6.7.0-batch-signature-fix.patch 1545 BLAKE2B a23c3f57fc3dfeec789019734cc294435a09abfaa66f0ec860efa6ce9eaec82d950e6f15afce870e4009cb895e7e6f4936bde07937fc2996f6a49d0550325a13 SHA512 22507ad189429a14af6a2b6344bb9c803b4536f55b25c3ecf68be47f69eedb45953b25e574b9b03ed43b7f0b600c3f0db116b7f14c0c130cd73008b38d27d4f1
 AUX drush-6.7.0-dont-pass-null-to-strtoupper.patch 1076 BLAKE2B 3f2335b9d84e95705f38830d692902db9e460686e5b619840dc83116774a0fe5a7389bfe11cc213e2fcad398000a3b13d4c7cfba3c194d0df95d334fffad2b5f SHA512 5f506583a025f989d027519d5b64014274ddd69065890cc1ae3db1f89959b021dae849a25b9a35885f92b4e6ceb137990d13e0d1c0f7b0eb1b60bfac281ab008
 AUX drush-6.7.0-gzip-mime.patch 775 BLAKE2B 6ed1f540ecff96f798c6dedb97da136b8f43e46bc5696f8aeedaab2419641880d161562ea04b44cc565bb76a693bf1ac9183d1efefbe1d744977381b45be8a3d SHA512 67002c5653301823b9b8efee4c0c00ef0dda9ca05f516eb13d5a9b82dc5837c28c59fea038f881c90e0313bbcd30ff434d58a1736b00c6be73b8da3c46a9291d
 AUX drush-6.7.0-php8.0.patch 3341 BLAKE2B 681c7bef6f7007e52767c4429015791a8ceb1bbc3ca80c7a8a924e880b811433e67485e5211368dbf89f2f03400f960e06395d64fb67d6fbcb8d85a1c0ce08d1 SHA512 73d74911945a1e74c2ef361e0f1cf89656356062fdcb4c1f36ac9a07d7f62bd29488283fcbffbb2f41700a9a89f6273d8203052fbcadada48bb2002a098a64d4
 AUX update-bash-completion-script-for-2.1.patch 1332 BLAKE2B a54fa2cab268542a37f1020012cf7744106966419d2ba8415a2e2ead882feb3f3dc9bd9b1ab17f8592e5d021855f5361b05304efcc810362224935069ef1b897 SHA512 2e19a6be652684c1b1a2a9d6605c1404272391950408cd6ae964b2bdd9f95b1e59deec5111c1eaa563a92837ea394fcb2315a3032b2ab02996509b98eb7d1cf0
 DIST drush-6.7.0.tar.gz 511581 BLAKE2B d3a589e3de35afe120d790f96ffa7e88b530da1e1d04815b1dea2f05cd081ad7dc6f4b39fa6f19b5620b9913b952ab289ec538f1b7c0c0f298d3cd0129eb7026 SHA512 203870190dd8987ad3da71f7625476c1f94bc75513447a740fd8c16268fb9705bcbc3b2bffc49a44045998e3fa49fd5ee9d4c0634a1fb39605ba8e10b7373fa5
 EBUILD drush-6.7.0-r4.ebuild 1731 BLAKE2B 209588f8a0e5a2ec602600d8a5d10e465517230f102a7ab3af0753561469c2ad1fd06ca48dd06be0c18e79ef9f95c65a1bc142ce66adf7333606c08085a947d3 SHA512 492a35026e2c3e781c082a17e2a3d15fbad235bb5ed56bc50f98b501fb7c8f97efd0b98a807257fcbe0d0b420504a5ddeeef67339592dac7f49ad9a78defe0eb
-EBUILD drush-6.7.0-r5.ebuild 1788 BLAKE2B 2a7658b577625606c8cfeda4034e28ff52add96e2db8012d9afcf2092adae9924902ed921f6fc6fb8e3bca27b1ff7b3b9c642c220862dfa6269efc20c5f82286 SHA512 4bf2da1a45cdb1176d37fed7a953462f3a9d63d0e3d036d84fa03c728ab68cf3bed5b522c80aa8ccbedbb32b91e1a48d1a4ac45901dae359d3623c993c2d494e
+EBUILD drush-6.7.0-r6.ebuild 1834 BLAKE2B 63823d3a978773f3d91ad4c3591f8d7b5f301b83bab07caf140db30ba767e45c6273a1ecd707c090f5fa2cbaf20dd2e3cec76ba363956ebf49a71854c4575263 SHA512 c00eb1447ba68c748946dc68e8f24b9fc848b65fefe598684713ce007db211f2675ed285ea0402e29ec7ff7d4e69b4e884be16869a057bfd22e6ad2427f909dd
 MISC metadata.xml 532 BLAKE2B c6ca539149d500608519aa982f4a3ef7f8e15b472d5140b8569371df6585c9f80ea57d7802fee00267bfe76290f2b9836be20250472bd261500fd5de84b974f7 SHA512 ec95e30855e93d1d04eac73b3dcf538c2ab38fbeb44acb7f3f7f3c3c04af9a5adba7dc96181cc02f136ffd901e22aab362dadef70aa9f84b0dde78a70bd36716
diff --git a/app-admin/drush/drush-6.7.0-r5.ebuild b/app-admin/drush/drush-6.7.0-r6.ebuild
index a4f2be23bf54..88c5b8c4ab9b 100644
--- a/app-admin/drush/drush-6.7.0-r5.ebuild
+++ b/app-admin/drush/drush-6.7.0-r6.ebuild
@@ -24,6 +24,7 @@ PATCHES=(
 	"${FILESDIR}/${P}-php8.0.patch"
 	"${FILESDIR}/${P}-gzip-mime.patch"
 	"${FILESDIR}/${P}-dont-pass-null-to-strtoupper.patch"
+	"${FILESDIR}/${P}-batch-signature-fix.patch"
 )
 
 src_prepare() {
diff --git a/app-admin/drush/files/drush-6.7.0-batch-signature-fix.patch b/app-admin/drush/files/drush-6.7.0-batch-signature-fix.patch
new file mode 100644
index 000000000000..8d5aa74fed46
--- /dev/null
+++ b/app-admin/drush/files/drush-6.7.0-batch-signature-fix.patch
@@ -0,0 +1,46 @@
+From 31d7a945230eaf1f8ab94d5f782619434f7f2b8c Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Wed, 16 Aug 2023 21:21:39 -0400
+Subject: [PATCH 1/1] includes/batch.inc: synchronize sub and superclass
+ parameter names
+
+The DrushBatchContext class overrides the offsetSet() method of its
+superclass, ArrayObject, but changes the first parameter's name from
+$key to $name. This makes php-8.1 unhappy:
+
+  Error: Return type of DrushBatchContext::offsetSet($name, $value)
+  should either be compatible with ArrayObject::offsetSet(mixed $key,
+  mixed $value): void, or the #[\ReturnTypeWillChange] attribute should
+  be used to temporarily suppress the notice in .../batch.inc, line 37
+
+Renaming the parameter to $key throughout the function fixes the issue.
+---
+ includes/batch.inc | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/includes/batch.inc b/includes/batch.inc
+index dd4adc9..785f411 100644
+--- a/includes/batch.inc
++++ b/includes/batch.inc
+@@ -34,14 +34,14 @@
+  * @see _drush_batch_worker().
+  */
+ class DrushBatchContext extends ArrayObject {
+-  function offsetSet($name, $value) {
+-    if ($name == 'message') {
++  function offsetSet($key, $value) {
++    if ($key == 'message') {
+       drush_log(strip_tags($value), 'ok');
+     }
+-    elseif ($name == 'error_message') {
++    elseif ($key == 'error_message') {
+       drush_set_error('DRUSH_BATCH_ERROR', strip_tags($value));
+     }
+-    parent::offsetSet($name, $value);
++    parent::offsetSet($key, $value);
+   }
+ }
+ 
+-- 
+2.41.0
+
diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest
index 753b1d91da62..9f5c827d8906 100644
--- a/app-admin/rsyslog/Manifest
+++ b/app-admin/rsyslog/Manifest
@@ -18,5 +18,5 @@ DIST rsyslog-doc-8.2306.0.tar.gz 6637017 BLAKE2B 7b4157bbfcdba6c7ac824ef4369bb21
 EBUILD rsyslog-8.2210.0-r2.ebuild 13176 BLAKE2B 8a99355f5ae45c15f1e39b19cbc0d3ca4d08d20ccca21d381eb49d21d437109325a4572c4e08cac21167720548830fa0a8d390d6452afae97d79e858cc22f08b SHA512 4ae5f2a663f2dab7afe5133d4e7d7528c2078091da97b93753563c4e0619175f156f762199ddfd1cef87f3486b13d6ab22774e2a473e2124f7362edea3df6dec
 EBUILD rsyslog-8.2302.0.ebuild 13135 BLAKE2B 84fdc7404bb080cc57d8cc5e260df6646d6c84af17bad0e0eac1394f7556088dd45650422d9fb98bba64e9583baad5d047f223c5f58d893aa5893e2f4acc375f SHA512 5309c9083aae3407ab2f57849508a8e1b9e2b7e4a268f52c53977a3ee4b30a0a9670ede9b050eedc88cbcbad73f17e5896e3c234dd3fe938c61ebdd0017c2d06
 EBUILD rsyslog-8.2304.0.ebuild 13135 BLAKE2B 84fdc7404bb080cc57d8cc5e260df6646d6c84af17bad0e0eac1394f7556088dd45650422d9fb98bba64e9583baad5d047f223c5f58d893aa5893e2f4acc375f SHA512 5309c9083aae3407ab2f57849508a8e1b9e2b7e4a268f52c53977a3ee4b30a0a9670ede9b050eedc88cbcbad73f17e5896e3c234dd3fe938c61ebdd0017c2d06
-EBUILD rsyslog-8.2306.0.ebuild 13413 BLAKE2B 3a07b4369ae4865a4ec743bcbdd096a5e736b77640c4aeea899685127598b7cfa9e5503aefd3eb61bb882b132ac353bca2418ddf04e4f8b7583c668d5e4fc53f SHA512 4dd0a2a94673613fe3131aa1ffb9779cc356c4a61e970cfb7c2d43356ad77b7635958671edd58fd367951e585cee4a9b2e0a7fe8f3470923dc30585d0124399c
+EBUILD rsyslog-8.2306.0.ebuild 13412 BLAKE2B 2dc48afdbe39c4e9ba9b529aa5c42c258cbd3177c7c5173f30aaaa5a62c759b8e7801bc15446b3da75c48437d0e21a1c45c1e1562f084244e21ab23a6a58d139 SHA512 bbef272f801f5bfd0077da84799874fae91618ea8226968680943e64cd28093468cb539f7f32c6390256032ed6c72e0ae6f86e37133dc87cc2f18bbe45ce2b0f
 MISC metadata.xml 4688 BLAKE2B 61d9ef924def00bed85b9b164e95ae8f512e51a0f0090b61a5737ee93b21db69db642867ddb6076fda757ae10748b9172de42754839d01859529aec70760d04f SHA512 01bedda2baeefccffc765550ab2f8aa29235e7a3a3fc8b765beb205518785da9fb5905037ad9e8e6ba9385d2f009d260260e3c207bbf1eea5a5ce4834a004365
diff --git a/app-admin/rsyslog/rsyslog-8.2306.0.ebuild b/app-admin/rsyslog/rsyslog-8.2306.0.ebuild
index e8afe8f9d834..0b148e681fa4 100644
--- a/app-admin/rsyslog/rsyslog-8.2306.0.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.2306.0.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == "9999" ]]; then
 
 	inherit git-r3
 else
-	KEYWORDS="~amd64 arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~sparc x86"
+	KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ~ppc64 ~riscv ~sparc x86"
 
 	SRC_URI="
 		https://www.rsyslog.com/files/download/${PN}/${P}.tar.gz