gentoo auto-resync : 11:07:2024 - 12:25:19

7 files changed, 95 insertions, 128 deletions

diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index aa1b1c5b1fd4..e142ec0cbadd 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index a5087c9a4696..00c08ca32f55 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -3,9 +3,11 @@ DIST aws-cli-1.33.18.gh.tar.gz 2752774 BLAKE2B 8f78ba78c3fac623f091344fb2710ac79
 DIST aws-cli-1.33.22.gh.tar.gz 2754043 BLAKE2B 8645a55cc6f0570ce0e69599e010c98019e63f2616af25467eefc0911f09148b64cdb35ba48e488801afe6aaa105f7dc54e1111acb49ed954cc036f9aaf933db SHA512 1425e1fd3df1a3639838517282f3fc6b63019e25288b38e8f56cd2316c6edb695c24a5dfb4ecf572139222bb16006fd55a9912f287c24c1bc16939bcc0f3a48a
 DIST aws-cli-1.33.23.gh.tar.gz 2753877 BLAKE2B e7babf49849a43a6f69b029ff3e27bcc1014498dfcc0a3711ca71aea7f992a3ac16ee21804767314d8141e7413a107227a66de45a83ea478782ef2b9028249a3 SHA512 22a81a95f2fea6ffd180c4003e074655cc6470e949ab4b99120dae17778fedbd56d11fcceb51f8d89eec4ef6a1b659cc986abf34fa26cd77cd5a58b59342f4aa
 DIST aws-cli-1.33.24.gh.tar.gz 2754563 BLAKE2B c2e2e8e939929909da58e055bc97d65fc4f6df254e596dd8aac57c2bf82dabba9eeb29c9c8c8d8fd1ccd22d8c7fe20127b9801963f127b5ba008c6918e1307c5 SHA512 d830150f802fd093076041f113bb052d9049828d02cd03d161f386e326ff7b56d151189d9e33f3d1e4e7871f6fdf5624f205962353e92436c0782b4f8effc127
+DIST aws-cli-1.33.25.gh.tar.gz 2755746 BLAKE2B 97349bb65e77c4689978d4498d688f75acd3a1fdaf0c0f742a7cc9175a12fb781cb43f36517c5bf69a34b3c4b7a9b3609ccc6942ed5829ba10af20e1ad98e841 SHA512 b086941b6d37f6333937a5060ff44aaa82977a55db3ac2b51a5091b457ab2d228044d4603c6b6633467cd566a84e6b6abe6d91e129697a97a233fc9cf104ff55
 EBUILD awscli-1.33.13.ebuild 3048 BLAKE2B 12780280e20a5681960cbfeaea03d9f3fcc292c8f1c1b2f174652dd6a76e0aad304e84a5acc67687f5585781bee6ad8568cafc6b02bf69aee39d180b1dfa7154 SHA512 805bcb6a01036c600f8a9423eda8459177d5729e11c6c9c17c4197ce06f5a0126b06cb3b760fee8f11cd81e2f962a67e982e79798aa6590099465818c3d6fc06
 EBUILD awscli-1.33.18.ebuild 3055 BLAKE2B 1564ea4eaf31db7fef7e41b625d95906b7a57c0cd6160d9ec11e6c8cdec5460e0a12e889aa60f5b189bd9e24b0511b3d5a83a3755630c7d1478031c857c9ef93 SHA512 59151ce65e2beb06d0487e5779bf7c8916ecb7120b4e1781cdba8167205ca4f52666653b41f21d31ca89f3424249de030cc783bcc0f033e7502a0af82c4658dd
 EBUILD awscli-1.33.22.ebuild 3055 BLAKE2B 442cc5222134bd9b622bc3f9f35b1882cc0ff4c8cfe9b5d1a5cae7fe09f1d7036d057ab1e231f5cb29370aaabea11be300ace2fbe634cb38c819b401a728afdb SHA512 00175b451b0c44db1b3e57fa56f4bd845c6b91a5409412e8b7580eaedea5c2c17e4841ad6fb1ae6d65cf94d302259493a961e8e1c4f30cf928be229bb8e0486a
 EBUILD awscli-1.33.23.ebuild 3055 BLAKE2B 442cc5222134bd9b622bc3f9f35b1882cc0ff4c8cfe9b5d1a5cae7fe09f1d7036d057ab1e231f5cb29370aaabea11be300ace2fbe634cb38c819b401a728afdb SHA512 00175b451b0c44db1b3e57fa56f4bd845c6b91a5409412e8b7580eaedea5c2c17e4841ad6fb1ae6d65cf94d302259493a961e8e1c4f30cf928be229bb8e0486a
 EBUILD awscli-1.33.24.ebuild 3055 BLAKE2B 442cc5222134bd9b622bc3f9f35b1882cc0ff4c8cfe9b5d1a5cae7fe09f1d7036d057ab1e231f5cb29370aaabea11be300ace2fbe634cb38c819b401a728afdb SHA512 00175b451b0c44db1b3e57fa56f4bd845c6b91a5409412e8b7580eaedea5c2c17e4841ad6fb1ae6d65cf94d302259493a961e8e1c4f30cf928be229bb8e0486a
+EBUILD awscli-1.33.25.ebuild 3055 BLAKE2B 442cc5222134bd9b622bc3f9f35b1882cc0ff4c8cfe9b5d1a5cae7fe09f1d7036d057ab1e231f5cb29370aaabea11be300ace2fbe634cb38c819b401a728afdb SHA512 00175b451b0c44db1b3e57fa56f4bd845c6b91a5409412e8b7580eaedea5c2c17e4841ad6fb1ae6d65cf94d302259493a961e8e1c4f30cf928be229bb8e0486a
 MISC metadata.xml 385 BLAKE2B 5accfb180a91179cc6df539d42d1de06be3ebfec73f3edb719f5d59576103b9a8cb0c7c524c1042630e0cf99f068939a19f04c7b1b4a2acf9e072369df80d913 SHA512 ccb3d516326c5dbdf53068372ce25baecc137d21a04516374362212b969cc928dacbf743b4953da33f28482905798f069d09d19c88d9913f2b32648db25115ab
diff --git a/app-admin/awscli/awscli-1.33.25.ebuild b/app-admin/awscli/awscli-1.33.25.ebuild
new file mode 100644
index 000000000000..c212ce9cac21
--- /dev/null
+++ b/app-admin/awscli/awscli-1.33.25.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..13} )
+
+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/monit/Manifest b/app-admin/monit/Manifest
index a17e29d8871c..8e6c3cbf9d1c 100644
--- a/app-admin/monit/Manifest
+++ b/app-admin/monit/Manifest
@@ -2,12 +2,8 @@ AUX monit.initd-5.0-r1 801 BLAKE2B adec89a1694095c128763bb3a2f31867d89b2a4ef1ab2
 AUX monit.logrotate 146 BLAKE2B 89bbe7c69f50dbca3f3c443d56da6eae6aab7a4976f90c209850b71410e5faa12c40d488d694a94635167ae245fd021cae6a855523dc6bcbb538bc6c29c07526 SHA512 bac426713adf8cc6dead70916cf3404229652cd85d0d4f4b436f9a4074a7a9cc3af03da6d91677645e349bcf6a614d0adf277676d04a54b7f67ba3ec6714903a
 AUX monit.pamd 120 BLAKE2B 76744f79babaa99fa2961f73158ca755f885e9ea8e20b76dcb29f8fd10be6b5804b09b3c90f59ada7ce81eab90713ba43d2b2f28a6abc278fdfc75b356af4e67 SHA512 75c5fbad1c04fc5c9c0de224df245d64f4e59e23f79f4037edcc94623795852900318747e8a71946cab406009834643e84e1cd40b27854951d5462e740712b5c
 AUX monit.service 226 BLAKE2B 3b3041900987acd5bb6faa770c6631f6554b2e4360520252369951b3f7f87a3dd96440a58c9d2c4973ce9980a00ab7085c92af1e6542ae10d679ba352d170b19 SHA512 3ca0499ebd21aee812b78883c144c0a346a8cb6106392544836bf76d594e96b7e77be4b32b8c3170273e8236b25000c268724148252d98a4b99131f8b0ce4e88
-DIST monit-5.29.0.tar.gz 1476102 BLAKE2B a4037c61e8d893b194317dc3c79d37f9b449d3524b91a06c0ff36a9c39016b12b0ce970c969fc10421412e6406c680714522379780cd80897a7a467f7b08450f SHA512 a69125bfa6fa9ea837f396e762a45e0cb41258c175d120c2af999ae1b500ce5cf5b57d774cc89299f70950a25ced5368c85455fffafd75677311c7912f86c49d
-DIST monit-5.31.0.tar.gz 1479644 BLAKE2B 3aee9e87acb287dbf9cdc26dd5cb5e693a52d7f88c4851f9c1101aec8060df250e75890815b7ec30e58324ec118bded8e25e6a17e694bec1c028941e2cff0141 SHA512 1259c57683389d7241db9524136cec7e42067e32dac79d97753211525c6451af2768c1023535d7d894dad7c5f6e7c3b3ac77bd8540bb53634f6d72587b522d42
-DIST monit-5.32.0.tar.gz 1480629 BLAKE2B 48b824365dca349914ffc066a19758f23fee122fb29b1aed5cecad6f97799a987752e3e59cbed488282738c755fdf4d7c95dbe85069f2e070c28f03a324e0a7f SHA512 dcb56bee23c5fef4abe08a2b1633e58b60c8863b335d651d26e87f5306b4f98bd4887d2bf6311c2fc11c9b99eb853226d836b9d212ab65c0f150872c7297e005
 DIST monit-5.33.0.tar.gz 1502487 BLAKE2B 770474f010067fe6388622e764a0d032495589dad24873dabd87ab0aa8edcff34d7a014a72c1c05aaa47104b12daf3dc542aa1d2d823d267814c9b5fd139e747 SHA512 f84edfc03a7386bb712c3d1e1e74801c5deea596f533bd898f342c8435e4b9f4225ec24a4daee11c4d23a5742e9f8a9c666ebaa1ba56f13842ac7214d1d70d4f
-EBUILD monit-5.29.0.ebuild 1265 BLAKE2B 5d51ce60c3ce56ff0d5499740e2ea0864145d4aed3fd1410bffeec4c184c7831bd22a277d12505cf7a12399b9a0d1ee157e0e64655910adf53adedaf195335a0 SHA512 03f9d3f8cd9e8fd8bfcbbdceaf0bb8a4cc2ce49ed80aaf0b006e1688f533867e20a73016e8e211b70bda3353aed30c483f150088d1f49825f975bd8960ce5ee7
-EBUILD monit-5.31.0.ebuild 1268 BLAKE2B 42e698df57fc83659cce8e9e4f9d5c14b158616fbfedbf3bf06a96c664014969769ce8fa581e64fd5b4d4f52ff8de44de916cd73d47a6571df55973a463b710c SHA512 8a54d32095c4df03557c02282c0b4042f719758912f78f2b068b8df186e03e1921d6d6885130fc2bdc80dc896f439632328cf9c29636c5bd300764ff63034aaf
-EBUILD monit-5.32.0.ebuild 1268 BLAKE2B 42e698df57fc83659cce8e9e4f9d5c14b158616fbfedbf3bf06a96c664014969769ce8fa581e64fd5b4d4f52ff8de44de916cd73d47a6571df55973a463b710c SHA512 8a54d32095c4df03557c02282c0b4042f719758912f78f2b068b8df186e03e1921d6d6885130fc2bdc80dc896f439632328cf9c29636c5bd300764ff63034aaf
+DIST monit-5.34.0.tar.gz 1486962 BLAKE2B e49e271f981d76b5d1f71818b7e6e1b1a2de56d8b1f856931c9abec053358dc6557e58fe3c37c5af9cf0f4e2c667ead5cff2ac96c6d8a2c70155cf301c6ffb44 SHA512 7e966b4437233a9be25c517620d77400bb865278975d62f6edc7d42a88d1780cbd233ce20f48da9a026b84a77d47796fb4f528409f064a99d08243ff3f3d2472
 EBUILD monit-5.33.0.ebuild 1265 BLAKE2B d96df7b758a63361c3d22650380152f71b8226c64ac9d8997627d0582eba722115e07ae6d50500e233c0331ea388b47d1b13c6469e81f35590d04c9289ebbb28 SHA512 bbae7158790630ce300325ff7b4ad7799a22bf161485e1a4114a728384b0180746a5ac097769f5d342705e013afa4cc0c76343d61e78a7614bb7ecca38fdee84
+EBUILD monit-5.34.0.ebuild 1244 BLAKE2B 21b3263f568fc10b8ccd26fd1962f9520caea036a3caaf2fce6910eb31091b713bae12b37f0224a2d916ae51006f6195cade6293611663f76b35a530fd345695 SHA512 ccdd05fbe8aee758454067abcca116bcebf303a166c8913b0b8e7aa1f5109063d3b88dba5c7934ea8e161a906055bb4dd15753d77322c32b0296877dd6a10c78
 MISC metadata.xml 248 BLAKE2B 2ac829e1663815f752e218e9ee474448a3d973c075939d578699f57790581498adfe9bad180a79fcc6ea0afc339f57d25cbcc0fdd430f82d192c23c03d15e465 SHA512 55c2e2e06f91e13fd73b9545c51d4169a47f040ead41eb1368479940b026def820de67137312b64a6203f80b57a421c8895ed690386a79086fa0ba6c3557aa47
diff --git a/app-admin/monit/monit-5.29.0.ebuild b/app-admin/monit/monit-5.29.0.ebuild
deleted file mode 100644
index 0787c2d3edd8..000000000000
--- a/app-admin/monit/monit-5.29.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1 pam systemd
-
-DESCRIPTION="Monitoring and managing daemons or similar programs running on a Unix system"
-HOMEPAGE="http://mmonit.com/monit/"
-SRC_URI="http://mmonit.com/monit/dist/${P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~riscv x86 ~amd64-linux"
-IUSE="ipv6 pam ssl"
-
-RDEPEND="sys-libs/zlib:=
-	virtual/libcrypt:=
-	pam? ( sys-libs/pam )
-	ssl? ( dev-libs/openssl:0= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-alternatives/yacc
-	app-alternatives/lex
-"
-
-src_prepare() {
-	default
-	sed -i -e '/^INSTALL_PROG/s/-s//' Makefile.in || die
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_with ipv6)
-		$(use_with pam)
-		$(use_with ssl)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/monit.logrotate monit
-
-	insinto /etc; insopts -m600; doins monitrc
-	newinitd "${FILESDIR}"/monit.initd-5.0-r1 monit
-	systemd_dounit system/startup/${PN}.service
-
-	use pam && newpamd "${FILESDIR}"/${PN}.pamd ${PN}
-
-	dobashcomp system/bash/monit
-}
-
-pkg_postinst() {
-	elog "Sample configurations are available at:"
-	elog "http://mmonit.com/monit/documentation/"
-}
diff --git a/app-admin/monit/monit-5.32.0.ebuild b/app-admin/monit/monit-5.32.0.ebuild
deleted file mode 100644
index 253ee81a7bac..000000000000
--- a/app-admin/monit/monit-5.32.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit bash-completion-r1 pam systemd
-
-DESCRIPTION="Monitoring and managing daemons or similar programs running on a Unix system"
-HOMEPAGE="http://mmonit.com/monit/"
-SRC_URI="http://mmonit.com/monit/dist/${P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux"
-IUSE="ipv6 pam ssl"
-
-RDEPEND="sys-libs/zlib:=
-	virtual/libcrypt:=
-	pam? ( sys-libs/pam )
-	ssl? ( dev-libs/openssl:0= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-alternatives/yacc
-	app-alternatives/lex
-"
-
-src_prepare() {
-	default
-	sed -i -e '/^INSTALL_PROG/s/-s//' Makefile.in || die
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_with ipv6)
-		$(use_with pam)
-		$(use_with ssl)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/monit.logrotate monit
-
-	insinto /etc; insopts -m600; doins monitrc
-	newinitd "${FILESDIR}"/monit.initd-5.0-r1 monit
-	systemd_dounit system/startup/${PN}.service
-
-	use pam && newpamd "${FILESDIR}"/${PN}.pamd ${PN}
-
-	dobashcomp system/bash/monit
-}
-
-pkg_postinst() {
-	elog "Sample configurations are available at:"
-	elog "http://mmonit.com/monit/documentation/"
-}
diff --git a/app-admin/monit/monit-5.31.0.ebuild b/app-admin/monit/monit-5.34.0.ebuild
index 253ee81a7bac..b64d7bf782e9 100644
--- a/app-admin/monit/monit-5.31.0.ebuild
+++ b/app-admin/monit/monit-5.34.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://mmonit.com/monit/dist/${P}.tar.gz"
 LICENSE="AGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux"
-IUSE="ipv6 pam ssl"
+IUSE="pam ssl"
 
 RDEPEND="sys-libs/zlib:=
 	virtual/libcrypt:=
@@ -32,7 +32,6 @@ src_prepare() {
 
 src_configure() {
 	local myeconfargs=(
-		$(use_with ipv6)
 		$(use_with pam)
 		$(use_with ssl)
 	)