gentoo auto-resync : 21:06:2024 - 00:11:18

12 files changed, 163 insertions, 99 deletions

diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index aa0826fccef7..0da59eb411f4 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/ansible-core/Manifest b/app-admin/ansible-core/Manifest
index cb1ed1915cc7..538bc3026f7d 100644
--- a/app-admin/ansible-core/Manifest
+++ b/app-admin/ansible-core/Manifest
@@ -1,11 +1,9 @@
 AUX resolvelib.patch 5731 BLAKE2B fdc0660ea786e02475e7e9735de6493cd6b96048c238ee050d1751a46cce12048112e495e1de48e1d1bb41d5d4415b16dfe294621bd0f6bbb0786c3df52dd35b SHA512 baf5f8c42c85628dffda987dc81b98f56f1a60857f4cc9e6f1b9938f4978d1ba4d84dc7904685dbe02e19a4b91a7a2f979772bbdd42268e6754bcd5208e40d37
 DIST ansible-core-2.14.13.tar.gz 3145413 BLAKE2B 75b11feaaefa9a63c6f83f64c796ceacf7c6b08322ac0b85f6dcf968db7b80cc97262ea6f8f839e5e41e800ad7cae610e96f312c1ae0f58882c8891246a81b8a SHA512 195885815d40448d8497eae9533a4104c4b9f17ab3a812d544a403f41d2e77e7be2c15bae5a6df07563499052beb273580a569d51b667d0a9c5a16e55b35258a
 DIST ansible-core-2.15.8.tar.gz 3160606 BLAKE2B 439a3f584940e5ab46b43b0b47395e0618a3ea52c67ebcd51667f31220cb038dda35506e7843d177d555b77a55a9d2c6245a916741ab1dcdf222c535afb5f83d SHA512 020191ef4b005abbf799204da68270bd4f13a85c7f23cb9dffe85b1c5c093c0ad86e061211ab9fcc8fd0be9367717fb0baadefb1ebecd3579471120fb2e8647f
-DIST ansible-core-2.16.5.tar.gz 3171617 BLAKE2B cb620cf9fc9fd509edb62bf75ab19b5ffe80f4d8520be76bbeb030c74953945295e0f4f30102f51d20247d2ce4a18b15e488e47b4346319f5442979593402821 SHA512 dbe5d68fbc3a0ef611791d6995297bca5bba6aed1f4871964136ea81810458646bc78c2146739f887de3c2e3017cf4e6d4d09652e41c2ca046c4bc88eca6c5d8
 DIST ansible_core-2.16.6.tar.gz 3176041 BLAKE2B 37aa15e8d9165eb89db0704f7670f78f3e3a50915e17bb1d56689e65e6cfc0bb15b7e01768d25c5d2a9a00802411a6eefdb9ad70aa38877d7115bc40faafea59 SHA512 cd9cc8783e13b073cbfaef889e20c8a7dfb732c91de4bae2b496a64ef47b0325c637b4ab2eadbd0c56cb004e95f5294aa1e1548675a90f06193d62defd553409
 EBUILD ansible-core-2.14.13-r1.ebuild 1350 BLAKE2B ce7e45f5a2c34e03bac3caa1b0496b3980b0861ecc3168c3c8d16d4c08370e2e5689c6c1a2d70b06cc47584b081b62291d7aaac42f5c4e5b9a2048fe4906061c SHA512 299eba1b7560ff846787004890998f068468d5497e4873afa6c3ad183e41df275c72f20d2a3c25d5438cd1ddd73e18dc73b94a617bad276e929ae41897422946
 EBUILD ansible-core-2.15.8-r1.ebuild 1305 BLAKE2B 8af6dc3e871bc702780081015d9bf13ebc4cb71ee245699d4500fbd198c7f902ac992854984d0f089d7229c67dac9a38bed5868f31384dff3a69c1ab86878ccb SHA512 075ab031f9097f31a4954a7b5f849540e59424c6b574ad8e00be29773853a58c24fd27992273c56ffa00534d224e8b8d2bde5cffd20831aca02cf27015c9f4b7
-EBUILD ansible-core-2.16.5.ebuild 1305 BLAKE2B 2f5925e002265e39b89675e79d72fd68ee2f31163953142e3ee757779fa8ac0ae50f6423037d1d6151d3c52f7b886fcf68ed06356bc91cb4ca250a558d3e4d04 SHA512 b29a437edc4bdb7c90905e79bda632ca8c9def30828bee8e209c293384e9bdf8720a1e37403380a7df70737004bb700e0eeb0d8a0455722e63e7bdb4139c04a2
 EBUILD ansible-core-2.16.6.ebuild 1285 BLAKE2B 628ab53b31fe1c63cc1bf1a9e2439d80458a070152e72cbac24da4edb99fdc8be7a75ae75c65a5d72f353763edb1d04cfdcf702218924333c5a8cb0243169c77 SHA512 561b953b0eacdfd98c1782e3bfe09196715380ce94071be4075bc534bc111f66ec73b4b4cf58aa012376dc8803e8556f5950b04db8ac5489e37ef42e0571c538
 EBUILD ansible-core-9999.ebuild 1308 BLAKE2B a743d1539164abff26f1abe24a5659bb0018007a2aded8b965b3cc16447d9c5f62366e2a922f1e6e5dd4a2eeb1c163d4e368833f19c08feffc655fb33ea25afc SHA512 93c817bee718c2b5721da7aedbffe2d92e32b5437eb0eb3da90c6ae11c786895bcc9dd6f0aa1db0b0452b1173cae40b9ea662907e1529eaeb787b0d1af0ed958
 MISC metadata.xml 924 BLAKE2B 7dcd1be7a7eea2a5a762ec295d2d285242f9350d377abb1d633c6eb7cdd1eb8f59b02a6908924f424c0b5f42b2f6b3a153523439cc10caef51656c9f75bcd87c SHA512 a6fbf2ee3743ad9d54864c8d22b75cd506f17e1abd6963b3499de55675fed711abf4df6b9fe2589d8ea0b2f93311d06cfbcca7b99469107d708d2bee5cea0694
diff --git a/app-admin/ansible-core/ansible-core-2.16.5.ebuild b/app-admin/ansible-core/ansible-core-2.16.5.ebuild
deleted file mode 100644
index 51f3b5d36db1..000000000000
--- a/app-admin/ansible-core/ansible-core-2.16.5.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-
-inherit distutils-r1
-
-DESCRIPTION="Model-driven deployment, config management, and command execution framework"
-HOMEPAGE="https://www.ansible.com/"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ansible/ansible.git"
-	EGIT_BRANCH="devel"
-else
-	inherit pypi
-	KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-RESTRICT="test"
-
-RDEPEND="
-	dev-python/paramiko[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/httplib2[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/netaddr[${PYTHON_USEDEP}]
-	dev-python/pexpect[${PYTHON_USEDEP}]
-	>=dev-python/resolvelib-0.5.3[${PYTHON_USEDEP}]
-	<dev-python/resolvelib-1.1.0[${PYTHON_USEDEP}]
-	net-misc/sshpass
-	virtual/ssh
-"
-BDEPEND="
-	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
-	test? (
-		dev-python/botocore[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_compile() {
-	export ANSIBLE_SKIP_CONFLICT_CHECK=1
-	distutils-r1_python_compile
-}
diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest
index c02954a34a30..cdce2aa8d48d 100644
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -1,9 +1,7 @@
 DIST ansible-7.7.0.tar.gz 40709642 BLAKE2B ee2f8d124f79ca3a3f131bfbc4f93e10d104a38262b7d60edd2a88284275fecdd3acf0e566a5cc81a1fb6a179a0b7c51215f2945d669be4c6af7aa2a4f31ade0 SHA512 7da6845c9a68f2b8c10cf3e4cc6ea347861d5b59daa6ac895731ac79b733c6724d234345054fe9e3bf4ea460345b9026492fda42dce22bfbc027c9b4de093fd9
 DIST ansible-8.7.0.tar.gz 49317896 BLAKE2B d5923753e368e908a569c5f8f261b1afe7c51d5381db190bf7de1e81f0a6359136581852faa2974f174e816944c66e2c0f625d3d62bdde324758309982c90de9 SHA512 6a67f8553c3fa56559e4a31ec627cfe2c5f42e147d94bea305ec4580af9ba8add136092b209a5a3d7f9022407e9d557484f044d23cb227973fe4e4341fed7983
-DIST ansible-9.3.0.tar.gz 38240168 BLAKE2B 0cd243a21b12163fcb37f014a69f6041f9c48dae84d1aeea342713daf8150246efa14ac94f43890e449896d111f1839ebe2dba7d9c48c2359fb01e4aadfd270b SHA512 71eff05455aee0a013b69790145a73325ac7037fc509545a7cdca358aa54c1731f7dc6fb0169f602d668e9da9e41a0879ff48ba1243d372e02dae9382ac46c5c
 DIST ansible-9.4.0.tar.gz 38389836 BLAKE2B a2e08088565e6f248c1185ee96ac2365fc1385993d3f3fe68f941e8acb0e567c3defeec3ea376a30213921f02881bce0a0ac737323fc3ec82dc77d2d4a550dbd SHA512 4c75235a866f3f95cda8dd3b6c9d22b916ad117d54a86a30585f71c9015cd98db764afa225af5b2f6fa884af558ee488785e26c9e8b9e8be105062f069f065b2
 EBUILD ansible-7.7.0.ebuild 655 BLAKE2B 737b7e75834d55ee6bbbdc00797896cfed122cfba478bf076156befa70e873899a3b4313408030aaa3214175e7a45bf3c86c21b4e84c2de5940c42cb5e68780d SHA512 4765ba667b64e4eb5659423a8ccc1eb8e52bd6c0f4e287b4aa4f79877d11ef88b95bca3518413f93cea3b785c27f739754af64781f783fa7e46cb2d44c1d7b57
 EBUILD ansible-8.7.0.ebuild 655 BLAKE2B 74f7871faa2bfe26fa6e09ce2b5ac89121c3b608e08e0a9ec9bf5987a8460ca1102a1cf24293a5f58307d94fca6bed53670754183d4fb2ac09a2ab7541345e2a SHA512 4e1b54c8e83abd8ce1540e48c77ec6798fe0297c9e23f040551d7f5e5d17b9092fc22a0c8970e270198f1054558295c77467d95bc8844ee8e5a61f9eff8331fc
-EBUILD ansible-9.3.0.ebuild 688 BLAKE2B d8bb8932a776dc3592f7b2d89c99a51e0cf3e1d299f15bda17a23140b77024c18cf5a379fbeb7e1ae2e481136d23a568a7582d6f50080baa4fe3b0d6c507e3c2 SHA512 8c6275fdfbe43c6ec137b5f9945616621950a3e191b05068ab1af9fc7ede679c0e49bdfbfc1a0da23e92b7f2c0d7ace0d06896a9491a44fb2eac8687179206c8
 EBUILD ansible-9.4.0.ebuild 688 BLAKE2B d8bb8932a776dc3592f7b2d89c99a51e0cf3e1d299f15bda17a23140b77024c18cf5a379fbeb7e1ae2e481136d23a568a7582d6f50080baa4fe3b0d6c507e3c2 SHA512 8c6275fdfbe43c6ec137b5f9945616621950a3e191b05068ab1af9fc7ede679c0e49bdfbfc1a0da23e92b7f2c0d7ace0d06896a9491a44fb2eac8687179206c8
 MISC metadata.xml 613 BLAKE2B 3460862f86354a10a4352fa85301b3eda6b04620abfdf7af7db3726ef8417147f630e9cf79205805c520499858fab7b2b1fb0099853a2b4f032ee57daeb32eff SHA512 ff4660cea07990a950bbd170df1d52d0e8150551e231baa4926e8e45011358c4a2dabd206d23519cc8cdf7d7b668b146d6906b312329acecff55cc8625c2a870
diff --git a/app-admin/ansible/ansible-9.3.0.ebuild b/app-admin/ansible/ansible-9.3.0.ebuild
deleted file mode 100644
index 51baea072b8f..000000000000
--- a/app-admin/ansible/ansible-9.3.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-DISTUTILS_USE_PEP517=setuptools
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Model-driven deployment, config management, and command execution framework"
-HOMEPAGE="https://www.ansible.com/"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos"
-RESTRICT="test"
-
-RDEPEND=">=app-admin/ansible-core-2.16.0
-	<app-admin/ansible-core-2.17"
-
-python_compile() {
-	local -x ANSIBLE_SKIP_CONFLICT_CHECK=1
-	distutils-r1_python_compile
-}
-python_install() {
-	local -x ANSIBLE_SKIP_CONFLICT_CHECK=1
-	distutils-r1_python_install
-}
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index 511422e0a7b1..bd2da8f3f735 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -1,11 +1,13 @@
 DIST aws-cli-1.32.117.gh.tar.gz 2732508 BLAKE2B 699d7596ea0e417f624f72e801d2c6e5c5b73aa1485f830d09923f12d00091e9252517b8f29f20212ddcb18e13b25b43f9545c759c68246a8a9db0a1abb0b047 SHA512 00731d552b372d7d0cd8213f9d645fdaa1b5691b9ee01a0e09ccfce169c0ca97052c03300e824c2522a3ca98a107a67106a31f818884b0050c0f66ba4131d8cd
 DIST aws-cli-1.33.10.gh.tar.gz 2748804 BLAKE2B c1fcfb37ee48a9c712daccde660fa2a1b66a85eab4a2cbefca575560c4068422bc16fa18e4803ccd923b0d50e3d17dec37a6e18ea82d09da7af438d8e415a28b SHA512 66d0829d6de4e4a09783860020907efbd50e4c57b7306bd9d16a9c5cd5566797327bf72326fe928d84430869e234ab8c0712794f62e6c6a4ecfcb8210749c0ec
 DIST aws-cli-1.33.11.gh.tar.gz 2750353 BLAKE2B 0ab7a387c9f8a4d147c05e806e374a0fe82e1da2cfaa4f72804fb6e04a686999f3657e99b43cb304f3f19520da95747e89f682d6a314f937c6c2f292b3bfb821 SHA512 940e88c18e824a44c62b3e12212bdff54eef7da3c07b2b0bdda5268519433b10818eb0c99c8ee57590cd3e10147637f33a34bb1ab3b5df4431d4c8f9a1ef3875
+DIST aws-cli-1.33.12.gh.tar.gz 2750564 BLAKE2B 690eabe17ad0dd00b315653c84e5717107efad7a9f702689447c4b85a57abbc8ffd8ec4cfb710d8c5b656c368b93cae3a0f399ac23fdd74caa42bf39cb0b695d SHA512 a988cd227bcd82f641a368ed66e00cbca48ce4825df25e5434cc7a23abd54a8676ac84fe48f5d4c1eac450493e4460fdb24e8cb4484e40542891410519417020
 DIST aws-cli-1.33.4.gh.tar.gz 2740224 BLAKE2B 40fb26f895a28e41e45c861194ca959490d1675e2f9926bbcb5b092d4496b20be3e68f4eb370ffef541bd607c41181d34caa4e5674fc262b60cd882401530153 SHA512 faeced07895fc891803136061839d499b372cbf89e6e642e2782120d2b1a50486e01ae07ba7ee04c9fe84ffefd0e329e000d76f38f5839b048bbfdab59a64785
 DIST aws-cli-1.33.9.gh.tar.gz 2744062 BLAKE2B d888e111d93ec22c6bbabf083d612b15845883e2e56814a37173f79c108e4fe25745dbba83d46f99f54e7ddcc2f471c81e3b568de7233eb7e0bb51ed25a89f7a SHA512 5bdb9873487570c841b582ee466d989705c2fc5827386356819507caa8e105b76b0101555f8a6ee485f38aaa433881470fdde5cb21f6fdc88243c92ce7c31a81
 EBUILD awscli-1.32.117.ebuild 3022 BLAKE2B eca1e9b920babafc0c226e1d3c0b23baa63965cffceacc71118d2e4a1302945d10294223300a94f9dec4b39e52c7bd8f44e35cbf7cf30c117f9d86fe93450326 SHA512 11de7ee4880fe2bd192c6c15081b598d4c9d2f18b28064908a855cb01283408542c8981841c531d546b6de9e2b932d2a23e2fe1a9e90030566af6b966c30fd97
 EBUILD awscli-1.33.10.ebuild 3055 BLAKE2B 1564ea4eaf31db7fef7e41b625d95906b7a57c0cd6160d9ec11e6c8cdec5460e0a12e889aa60f5b189bd9e24b0511b3d5a83a3755630c7d1478031c857c9ef93 SHA512 59151ce65e2beb06d0487e5779bf7c8916ecb7120b4e1781cdba8167205ca4f52666653b41f21d31ca89f3424249de030cc783bcc0f033e7502a0af82c4658dd
 EBUILD awscli-1.33.11.ebuild 3055 BLAKE2B 1564ea4eaf31db7fef7e41b625d95906b7a57c0cd6160d9ec11e6c8cdec5460e0a12e889aa60f5b189bd9e24b0511b3d5a83a3755630c7d1478031c857c9ef93 SHA512 59151ce65e2beb06d0487e5779bf7c8916ecb7120b4e1781cdba8167205ca4f52666653b41f21d31ca89f3424249de030cc783bcc0f033e7502a0af82c4658dd
+EBUILD awscli-1.33.12.ebuild 3055 BLAKE2B 1564ea4eaf31db7fef7e41b625d95906b7a57c0cd6160d9ec11e6c8cdec5460e0a12e889aa60f5b189bd9e24b0511b3d5a83a3755630c7d1478031c857c9ef93 SHA512 59151ce65e2beb06d0487e5779bf7c8916ecb7120b4e1781cdba8167205ca4f52666653b41f21d31ca89f3424249de030cc783bcc0f033e7502a0af82c4658dd
 EBUILD awscli-1.33.4.ebuild 3055 BLAKE2B 1564ea4eaf31db7fef7e41b625d95906b7a57c0cd6160d9ec11e6c8cdec5460e0a12e889aa60f5b189bd9e24b0511b3d5a83a3755630c7d1478031c857c9ef93 SHA512 59151ce65e2beb06d0487e5779bf7c8916ecb7120b4e1781cdba8167205ca4f52666653b41f21d31ca89f3424249de030cc783bcc0f033e7502a0af82c4658dd
 EBUILD awscli-1.33.9.ebuild 3055 BLAKE2B 1564ea4eaf31db7fef7e41b625d95906b7a57c0cd6160d9ec11e6c8cdec5460e0a12e889aa60f5b189bd9e24b0511b3d5a83a3755630c7d1478031c857c9ef93 SHA512 59151ce65e2beb06d0487e5779bf7c8916ecb7120b4e1781cdba8167205ca4f52666653b41f21d31ca89f3424249de030cc783bcc0f033e7502a0af82c4658dd
 MISC metadata.xml 385 BLAKE2B 5accfb180a91179cc6df539d42d1de06be3ebfec73f3edb719f5d59576103b9a8cb0c7c524c1042630e0cf99f068939a19f04c7b1b4a2acf9e072369df80d913 SHA512 ccb3d516326c5dbdf53068372ce25baecc137d21a04516374362212b969cc928dacbf743b4953da33f28482905798f069d09d19c88d9913f2b32648db25115ab
diff --git a/app-admin/awscli/awscli-1.33.12.ebuild b/app-admin/awscli/awscli-1.33.12.ebuild
new file mode 100644
index 000000000000..a7a293c4a8e8
--- /dev/null
+++ b/app-admin/awscli/awscli-1.33.12.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit bash-completion-r1 distutils-r1
+
+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+1).(z+118), sigh
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1 )).$(( $(ver_cut 3-) + 118 ))"
+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.10.0[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	!app-admin/awscli-bin
+"
+BDEPEND="
+	test? (
+		dev-python/packaging[${PYTHON_USEDEP}]
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_XDIST=1
+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 serial_tests=(
+		tests/functional/ecs/test_execute_command.py::TestExecuteCommand::test_execute_command_success
+		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_{fails,success}
+		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_with_new_version_plugin_success
+		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking
+		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking_windows
+		tests/unit/customizations/codeartifact/test_adapter_login.py::TestNuGetLogin::test_login_nuget_sources_listed_with_backtracking
+		tests/unit/customizations/ecs/test_executecommand_startsession.py::TestExecuteCommand::test_execute_command_success
+		tests/unit/customizations/test_sessionmanager.py
+		tests/unit/test_compat.py::TestIgnoreUserSignals
+		tests/unit/test_help.py
+		tests/unit/test_utils.py::TestIgnoreCtrlC::test_ctrl_c_is_ignored
+	)
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	EPYTEST_XDIST= epytest "${serial_tests[@]}"
+
+	local EPYTEST_DESELECT=( "${serial_tests[@]}" )
+	# 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/keepassxc/Manifest b/app-admin/keepassxc/Manifest
index f1be3e824b81..cfe01b10f30d 100644
--- a/app-admin/keepassxc/Manifest
+++ b/app-admin/keepassxc/Manifest
@@ -1,7 +1,8 @@
 AUX keepassxc-2.7.4-tests.patch 402 BLAKE2B d1d88059d70e8c43f51bdd94ba17222a919059efadc68712e4f6b8e72885f3088ed96793c8ad26f53000e76414b13b9ebcd52ea447b17e7822ce7d3245f30414 SHA512 e401e341c34a117395cb5852f561770a1f65904e6f649cdd2904a89f7b068c53f46e8509d2e4cafc3c213e2326a01838f719d360fde21d63f29962969f3d16ef
-DIST keepassxc-2.7.7-src.tar.xz 9734460 BLAKE2B d94c42334bbfde46f14f4b14612f4297c500da76ba8a82de26c4a450ee1cacb9a15517a84ef445441651dc33a71f9ca7bca63bb04d0a4e8eeb0380eded6e5477 SHA512 fd82e377bf6e57623c65f2bdd463ea59c6465fbe009552e1030ce0fe9d9177fc448b7b36a90a0da9ed2a2ed161c017d13cef618ae785f89110c038e1d9396926
+AUX keepassxc-2.7.9-tests.patch 473 BLAKE2B 3d260ca4dcd7b5dd67e3c98bc30b5dd0e2b87e9dc508f3b24f418f1a20e9aa45e5c4da375b737833dc88a33c1bc5a2512eb636a5ffd9fbb686360364ac9f346b SHA512 e321d866ecc632756af85324b2e5b9a58db6442c8361c2ce210d223de8a6435eb4233a967314109f3fa0416883ef5fe34827320881a448ddbf0204cbd5111123
 DIST keepassxc-2.7.8-src.tar.xz 9764860 BLAKE2B edc5af2b7bd6173f8df4fa20fca54e78c40610d29b02ac9f9920382b8ead3ea293e22e578c353ffc1a374a23f1117a2595570d1de7053a1d36bcb40ed8eceb04 SHA512 c4767ced36d45855b83569d0fcbcfd384ef51d204dd703b006508d55cd7ac94ac36b5476f122fbe1dc6ec301a785e026722e8f0f961d5e339e10997a3871741a
-EBUILD keepassxc-2.7.7-r2.ebuild 2475 BLAKE2B 16d23dc524610072a785e868b4c732b81d106eebbe72731f3ecaec8aafe2858e2d36e2fec4c86dc62c3b8abf6ce2e1ad1ea5ba392d6335150968b6989f6b9768 SHA512 c72d9249a3a33e45f97600185e90d3bf95a46e5472bf441c4ce5a7e4bff21210bd2a6e1942ae8d89367b39f5d44d95dde984077f1d671f076bfb1d8cde236e4f
+DIST keepassxc-2.7.9-src.tar.xz 9789312 BLAKE2B d9be3e577ae918160662558bb8bd724b5ca5982cb1bba5cda47f0dff042ea9a5c7393dd76ad195a7ba6c9b9e8371c4416840e4ff89e07c610d7351859586acfa SHA512 255102d3b3723a80cdd5f14cde2130b37807db226b48e985bcc2ab537b482e3fb23afde331e15ed02727e98b526d894aa4567f2e82039a2ad9d33a6ad9ea08a4
 EBUILD keepassxc-2.7.8.ebuild 2458 BLAKE2B bea0da6dfc99875329b9dace4a8aa5a7558d12000d82e04ad3cb3d73658279d84ce6269b3eb486421985b3919931b53ac82ce619550b192671961edf6ccc9c99 SHA512 55ea0c8a4af6f9998094e66749e0c34ce6c202c1e01f76f87aae83a74eec6f8869eaa7fe8b1d07cf31602201719dc9a47e456e7ea342b48b9d766547f84eefac
+EBUILD keepassxc-2.7.9.ebuild 2460 BLAKE2B 6e4dbf32994a329337652e1eea92eeedf419f7435e2794af2d0cd254a1c708d3a1af23ddee6b6de0290031063b3eded0bd1420484727bb7e7b690c81a784a3ec SHA512 454da236e266e96528baeb1db2ad884c2f4b379e3eb8d40fefd4b904ae15d918b5bde78bf65433b8b02e2bc2e6a33e039a6583adf0021e955d14f22001ec9664
 EBUILD keepassxc-9999.ebuild 2460 BLAKE2B be9ae94e8b24fb5a174760ddb98a9183f20a9239f8ce003016093b7734c7e98573c66a080c4fd250211af67d42e99faeb87619716255c5944a00b8b8718dbd52 SHA512 6afe18fe78f6e8fdc1b994a27fa16422624b2a2547e723ccd5dc542813aad253fd4fc9bb073bc5a47ac5c2bbc70d270e77ebc9f3e6354cb4d45497b09ca4039a
 MISC metadata.xml 1077 BLAKE2B 410793b2f278ccbddceb10a72e4a010f4b2d6fc81bd8a472b867e1230d43a0e6f461ff6459095d334536d462e2297c4978dbb247e3a5ccb82c36fd70c6f44b51 SHA512 d338787a7ea319d752c19314ee53ee1306293ae2dddeedd22bd010e990a1680fdd1b96c5173c653b4dbbe336d713a07f9fc1a771951fca8636b3973361787f20
diff --git a/app-admin/keepassxc/files/keepassxc-2.7.9-tests.patch b/app-admin/keepassxc/files/keepassxc-2.7.9-tests.patch
new file mode 100644
index 000000000000..153b3c721018
--- /dev/null
+++ b/app-admin/keepassxc/files/keepassxc-2.7.9-tests.patch
@@ -0,0 +1,12 @@
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -246,9 +246,6 @@ if(WITH_XC_NETWORKING OR WITH_XC_BROWSER)
+     add_unit_test(NAME testurltools SOURCES TestUrlTools.cpp LIBS ${TEST_LIBRARIES})
+ endif()
+ 
+-add_unit_test(NAME testcli SOURCES TestCli.cpp
+-        LIBS testsupport cli ${ZXCVBN_LIBRARIES} ${TEST_LIBRARIES})
+-target_compile_definitions(testcli PRIVATE KEEPASSX_CLI_PATH="$<TARGET_FILE:keepassxc-cli>")
+ 
+ if(WITH_GUI_TESTS)
+     add_subdirectory(gui)
diff --git a/app-admin/keepassxc/keepassxc-2.7.7-r2.ebuild b/app-admin/keepassxc/keepassxc-2.7.9.ebuild
index 6d17e534e3b4..fe31c46f4f47 100644
--- a/app-admin/keepassxc/keepassxc-2.7.7-r2.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.7.9.ebuild
@@ -9,20 +9,21 @@ DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition"
 HOMEPAGE="https://keepassxc.org/
 	https://github.com/keepassxreboot/keepassxc/"
 
-if [[ "${PV}" != *9999 ]] ; then
+if [[ "${PV}" = *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_BRANCH="develop"
+	EGIT_REPO_URI="https://github.com/keepassxreboot/${PN}"
+else
 	if [[ "${PV}" == *_beta* ]] ; then
-		SRC_URI="https://github.com/keepassxreboot/${PN}/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
+		SRC_URI="https://github.com/keepassxreboot/${PN}/archive/${PV/_/-}.tar.gz
+			-> ${P}.tar.gz"
 		S="${WORKDIR}/${P/_/-}"
 	else
 		SRC_URI="https://github.com/keepassxreboot/${PN}/releases/download/${PV}/${P}-src.tar.xz"
-
-		KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
 	fi
-else
-	inherit git-r3
 
-	EGIT_REPO_URI="https://github.com/keepassxreboot/${PN}"
-	[[ "${PV}" != 9999 ]] && EGIT_BRANCH="master"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 fi
 
 LICENSE="LGPL-2.1 GPL-2 GPL-3"
@@ -69,7 +70,7 @@ BDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}/${PN}-2.7.4-tests.patch"
+	"${FILESDIR}/${PN}-2.7.9-tests.patch"
 )
 
 src_prepare() {
@@ -104,7 +105,9 @@ src_configure() {
 		-DWITH_XC_X11="$(usex X)"
 	)
 	if [[ "${PV}" == *_beta* ]] ; then
-		mycmakeargs+=( -DOVERRIDE_VERSION="${PV/_/-}" )
+		mycmakeargs+=(
+			-DOVERRIDE_VERSION="${PV/_/-}"
+		)
 	fi
 	cmake_src_configure
 }
diff --git a/app-admin/xstow/Manifest b/app-admin/xstow/Manifest
index 883273c6b49d..f19f6ba044a3 100644
--- a/app-admin/xstow/Manifest
+++ b/app-admin/xstow/Manifest
@@ -1,5 +1,7 @@
 AUX 99xstow 65 BLAKE2B c3d3dae69e0ed5251a996ddfb164795718974e1c2464176e680373fab25ceeb8a22392ac8de0dd489462e28bc48512c151f3f438ddc7f9bd093d5c63b46ba29b SHA512 0ade954fc07ba98be74d79e8ce842fc4e3e12f83d59f76eb78810251cc9e1612d963401be99f38002d94a2a32c9c2a32429f73d7ee69e97c12f6a05db14a3476
 AUX xstow-1.1.0-clang.patch 1092 BLAKE2B b00444730f525ce39c2692e7f1ab120b40d1e671d88c1c4f9b2b85f0c97ef34a89f12ba47c8eabd53464d05e5e3a94f28f84c3ce277072a983c34e188f149edd SHA512 804df13381f1d0f365303547c1b8e8b5fa2dd06e357596bd65ba349fe6b63e906491e78a19a6bf9190e7e8a81ae26b77a66f0f5290ff5b640f91024eca136537
 DIST xstow-1.1.0.tar.bz2 187761 BLAKE2B ed3822e638aedf8900a3baba62a5af9de9d7b98dcdf27ca81a6898353b9f5c7f767ec7d8e68ead4d5ef318af5a6eda2b1cc68a5c80a6a8ad2b9c8adf03ae3377 SHA512 30f2e0be0c2aba668b4cc781fe69ac74c2460cc681c6b47a55ee66af5c0f2ac14dee9fe2e95a288ce06059378407a2b99d2156430a5a6dcbf06def793f579015
+DIST xstow-1.1.1.tar.bz2 188334 BLAKE2B 13b079b4c0bdfc68837d3674eb64852d6c8bd341541c927703eed7e302ce36328bc814c618972365b60bd7562a4a2398c6a881a0a42c5778523197e41cfde7df SHA512 86154bd562e1dcb068a2c766a849975a4e6c9c343d89d47f8dd339a03b73aceb2dfb8523e2bc40df3ceb673a1a9f7991737e982c0c1a2cc0bd9fcdf8fd7c3113
 EBUILD xstow-1.1.0.ebuild 1239 BLAKE2B b6d021bae09e316cf7789ec84747d6c4f9f5d26c4a0aa49633ecc108a70553b3653cb8a7cf972ea68de72f6f0820626bc9afb025d950f4cb10a5c01428edd16a SHA512 c49dc7ead25e07568eed7b380e9c95da10528fd40ebe5230fe85fd088ca0be30ae687f538c0eee18dd6a547649d7ac89b5c0c5948ec8bc0d3ac3fcbed5259b73
+EBUILD xstow-1.1.1.ebuild 1137 BLAKE2B e1311987801237784073743c1bd358c5ce29509a3dfc52c70fdfe062bbc8517047ae7f08eb56a9b01b01f87907cdc1d534c4daf2a0fd845bfb9b85f164dd4973 SHA512 924c3b9c5a0ba13321be39321aced246a3d27d0fbfb08e21ed266422a4ea141e13fd9078ea97c22546a91fd17c6c6ed641ca2ecdc50ed486ad971f57525d865e
 MISC metadata.xml 301 BLAKE2B aace14f4b6ef5f8874f165c8bf5f6c3df1c8a259a54f48cf8805a62baa9530bdeea7dbe85a9c445151fdac6a53674f1967bf960ef0c9b26e4ccc8923d89cef55 SHA512 dafc481314893bacf1024daa509819b09d99f7f7c2bbb0613ac092cc0e14eb61ec708ba1a6d5b3d48774855707481745d0da462b94a973dd88a22ec64cc667de
diff --git a/app-admin/xstow/xstow-1.1.1.ebuild b/app-admin/xstow/xstow-1.1.1.ebuild
new file mode 100644
index 000000000000..d6dcfa3ad50d
--- /dev/null
+++ b/app-admin/xstow/xstow-1.1.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Replacement for GNU stow with extensions"
+HOMEPAGE="https://github.com/majorkingleo/xstow"
+SRC_URI="https://github.com/majorkingleo/${PN}/releases/download/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="ncurses"
+
+DEPEND="ncurses? ( sys-libs/ncurses:= )"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	econf $(use_with ncurses curses)
+}
+
+src_install() {
+	emake DESTDIR="${D}" docdir="${EPREFIX}/usr/share/doc/${PF}/html" install
+	einstalldocs
+
+	# Create new STOWDIR
+	keepdir /var/lib/xstow
+
+	# Install env.d file to add STOWDIR to PATH and LDPATH
+	doenvd "${FILESDIR}"/99xstow
+}
+
+pkg_postinst() {
+	elog "We now recommend that you use /var/lib/xstow as your STOWDIR"
+	elog "instead of /usr/local in order to avoid conflicts with the"
+	elog "symlink from /usr/lib64 -> /usr/lib.  See Bug 246264"
+	elog "(regarding app-admin/stow, equally applicable to XStow) for"
+	elog "more details on this change."
+	elog "For your convenience, PATH has been updated to include"
+	elog "/var/lib/bin."
+}