gentoo auto-resync : 06:06:2024 - 00:07:57

6 files changed, 94 insertions, 41 deletions

diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 97e98d00c9e4..aed47c9877a3 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index 6af76661a636..9e59af29954b 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -2,8 +2,10 @@ DIST aws-cli-1.32.108.gh.tar.gz 2728605 BLAKE2B 83606ebe909a4ee3d4f0d2875f56958b
 DIST aws-cli-1.32.113.gh.tar.gz 2730091 BLAKE2B d7c88dd962f1be64fc57f19a3ad247725efdd14b611f752200d333297f99993f896855bc307fcab8ec76c6c00b982dca2f507023211f6ce54bcb6380f71f9dd3 SHA512 9dcc017e8b8ab9d9aef26c7bcbaaeb7256e20ba4abf4fe80580561cb46a61fd5e79e5057dc38b05b1af22a7b03610c88a1babb63c9503b16176010d2903661cb
 DIST aws-cli-1.32.117.gh.tar.gz 2732508 BLAKE2B 699d7596ea0e417f624f72e801d2c6e5c5b73aa1485f830d09923f12d00091e9252517b8f29f20212ddcb18e13b25b43f9545c759c68246a8a9db0a1abb0b047 SHA512 00731d552b372d7d0cd8213f9d645fdaa1b5691b9ee01a0e09ccfce169c0ca97052c03300e824c2522a3ca98a107a67106a31f818884b0050c0f66ba4131d8cd
 DIST aws-cli-1.33.0.gh.tar.gz 2737941 BLAKE2B 1572e517dd627870611b54bae77bb7c6a3eddcb882af0f18a7da51e302dd4db97609d315416cb0acaa1898e08881779a79f9a22795e99de8aa79577d4b858e61 SHA512 4473b068cfc5848335fbcfa0237f1f00d8bb76cde6936d1f07bc6637c6721c3d6ea0172437fcbc99459a6a2508983d598583c8d80c66573752a80615202abf08
+DIST aws-cli-1.33.1.gh.tar.gz 2738329 BLAKE2B 46aea84b6ca6ca43d74bb24236aa3d8b9dbf71ad0197efb349001a6dfebd1d6309c9ed5b37a241a5b472263b2dd6e54a977b32ad2ff387891af863129089c5cc SHA512 2317c1f6c7b8c766ef381401eb45356cc297b35a9fd6431ba38f56f4b9c8e4880d3a71002bdcde088cb71002608c6ea9f15d5d08c50723f1a2f71d389e19408b
 EBUILD awscli-1.32.108.ebuild 3022 BLAKE2B eca1e9b920babafc0c226e1d3c0b23baa63965cffceacc71118d2e4a1302945d10294223300a94f9dec4b39e52c7bd8f44e35cbf7cf30c117f9d86fe93450326 SHA512 11de7ee4880fe2bd192c6c15081b598d4c9d2f18b28064908a855cb01283408542c8981841c531d546b6de9e2b932d2a23e2fe1a9e90030566af6b966c30fd97
 EBUILD awscli-1.32.113.ebuild 3029 BLAKE2B 580c774489759d94cbe5c77316c3afbb84d597198c391cd0ed89722c239fb23a87fc34378bd669e9104fbfaaa75a924c3d73e8df2c52693ba6fc135da827643d SHA512 4a31562305f7156e91d78023ed1f56e74de8fb1555323a5cd63611254daeb7491b8e323d00e38351d9bbc2a751f257290a6bb4bd91638e28f9c45acb8742c809
 EBUILD awscli-1.32.117.ebuild 3029 BLAKE2B 580c774489759d94cbe5c77316c3afbb84d597198c391cd0ed89722c239fb23a87fc34378bd669e9104fbfaaa75a924c3d73e8df2c52693ba6fc135da827643d SHA512 4a31562305f7156e91d78023ed1f56e74de8fb1555323a5cd63611254daeb7491b8e323d00e38351d9bbc2a751f257290a6bb4bd91638e28f9c45acb8742c809
 EBUILD awscli-1.33.0.ebuild 3055 BLAKE2B 1564ea4eaf31db7fef7e41b625d95906b7a57c0cd6160d9ec11e6c8cdec5460e0a12e889aa60f5b189bd9e24b0511b3d5a83a3755630c7d1478031c857c9ef93 SHA512 59151ce65e2beb06d0487e5779bf7c8916ecb7120b4e1781cdba8167205ca4f52666653b41f21d31ca89f3424249de030cc783bcc0f033e7502a0af82c4658dd
+EBUILD awscli-1.33.1.ebuild 3055 BLAKE2B 1564ea4eaf31db7fef7e41b625d95906b7a57c0cd6160d9ec11e6c8cdec5460e0a12e889aa60f5b189bd9e24b0511b3d5a83a3755630c7d1478031c857c9ef93 SHA512 59151ce65e2beb06d0487e5779bf7c8916ecb7120b4e1781cdba8167205ca4f52666653b41f21d31ca89f3424249de030cc783bcc0f033e7502a0af82c4658dd
 MISC metadata.xml 385 BLAKE2B 5accfb180a91179cc6df539d42d1de06be3ebfec73f3edb719f5d59576103b9a8cb0c7c524c1042630e0cf99f068939a19f04c7b1b4a2acf9e072369df80d913 SHA512 ccb3d516326c5dbdf53068372ce25baecc137d21a04516374362212b969cc928dacbf743b4953da33f28482905798f069d09d19c88d9913f2b32648db25115ab
diff --git a/app-admin/awscli/awscli-1.33.1.ebuild b/app-admin/awscli/awscli-1.33.1.ebuild
new file mode 100644
index 000000000000..a7a293c4a8e8
--- /dev/null
+++ b/app-admin/awscli/awscli-1.33.1.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/emacs-updater/Manifest b/app-admin/emacs-updater/Manifest
index 7d8ce56291c7..8c10acbd9ad3 100644
--- a/app-admin/emacs-updater/Manifest
+++ b/app-admin/emacs-updater/Manifest
@@ -1,5 +1,3 @@
-DIST emacs-updater-1.17.tar.xz 7236 BLAKE2B f39a19eba794cd57b25fbfc38998775a7818d98c81bbbdf485b33ed273815dfb3a74c26ca410f0e3b8e4bd46f2114b96155485cdcf87d5bec70a96dfe1a3a279 SHA512 461f496075bd7fc057290d40d408e5243ec464d8814abbe0c47c77a223b314ba2bcc35e20bf5e22e6dcee485a024ab93ced7155fa5212bc2d9c3b6362f168c52
 DIST emacs-updater-1.18.tar.xz 7360 BLAKE2B ff890584349d87a9cdcfe4576dd3bb1f8fc73b6cb086a5dd09fef3c8bf500a519f1aab810321680a5f5d4f1093455a6c54db42d900ee50fc39fcc03f0d6db69e SHA512 15c3b6e5ea7d1935a7e472d75409c0cb0dc9658142c1270a4a487eba822dbcd3ac32ffe60cb501859a7ccb7441efa1c7dd5d3a6cf481f69a583c5c8d5001051a
-EBUILD emacs-updater-1.17.ebuild 955 BLAKE2B eb95c81056fdb432b288c25e559e73158e51a83e1a16bc5af3b46abe188c30148f15ad01492f118980edff408b4c240cab439062625afb5a86d23c30096647dd SHA512 5e5b8a7e59b599e1f80acb0f6055a0117e3b3116cea445bbdb19750a43a192d2fd0d08671052b72b5b94e587c7d94975f4069fad871433b6fb6dcbec7cb5c2f0
-EBUILD emacs-updater-1.18.ebuild 962 BLAKE2B 6e4c2a9fc6dbc5368eecc6643a1a746b9da3d06de96e89ecfc5611601ee63acbc332727405a0086125793f6a902c2386575c8dd775a0d96343c5fedbbf6605df SHA512 bc61152c7f02913e42a84cef91ac7e2f9a611aa11f89acce38072fe10dc9974ca720aa201c2282945ca4b4cdf206bbd68f8359911c56111733d2a94d5f3adb29
+EBUILD emacs-updater-1.18.ebuild 955 BLAKE2B ea59d1460f3d33ff308c8cc6a60c73f159cc3c13eafd272c9682be9bbe783bb6319c6464298e631d16f0e476bad6d95f40f3cc845bfd876334afd99652665641 SHA512 50cbd869ea825271cc69dadb05e07ce3e37a7651579f9b2be21a7d067161e40a002c7aa1b344d55a763b2756b40d92e6600e3943116be05900befd59302f8571
 MISC metadata.xml 362 BLAKE2B 59c9e3025bdd347e4812d6485bda2b731a1b0adf2eec16aefdd6b0d3379a949cd99c637febfcab0c6314c457eafe0727a986196e4499aa29dbd297a6a0458d66 SHA512 5882c9372b62c44189426a1ea3ac975e29b70fc5b5d30a3f024edced82d9406e118e9acee91b1353c76eb65f19008e4bb1475f859509c933be48c03aa701394b
diff --git a/app-admin/emacs-updater/emacs-updater-1.17.ebuild b/app-admin/emacs-updater/emacs-updater-1.17.ebuild
deleted file mode 100644
index 193e60a52c26..000000000000
--- a/app-admin/emacs-updater/emacs-updater-1.17.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Rebuild Emacs packages"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Emacs"
-SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-DEPEND="|| ( sys-apps/util-linux app-misc/getopt )"
-RDEPEND="${DEPEND}
-	>=app-editors/emacs-23.1:*
-	>=app-portage/portage-utils-0.80"
-
-src_prepare() {
-	default
-
-	if ! has_version sys-apps/util-linux; then
-		# BSD ships a dumb getopt(1), so use getopt-long instead
-		sed -i -e '/^GETOPT=/s/getopt/&-long/' emacs-updater || die
-	fi
-
-	if [[ -n ${EPREFIX} ]]; then
-		sed -i -e "1s:/:${EPREFIX}/:" \
-			-e "s:^\([[:upper:]]*=\)/:\1${EPREFIX}/:" \
-			emacs-updater || die
-	fi
-}
-
-src_install() {
-	dosbin emacs-updater
-	doman emacs-updater.8
-}
diff --git a/app-admin/emacs-updater/emacs-updater-1.18.ebuild b/app-admin/emacs-updater/emacs-updater-1.18.ebuild
index f9cebdcb57a7..5c3df85ff7ea 100644
--- a/app-admin/emacs-updater/emacs-updater-1.18.ebuild
+++ b/app-admin/emacs-updater/emacs-updater-1.18.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 DEPEND="|| ( sys-apps/util-linux app-misc/getopt )"
 RDEPEND="${DEPEND}