gentoo auto-resync : 28:01:2025 - 22:42:58

7 files changed, 113 insertions, 33 deletions

diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 4fc9b9160053..48834bec06ad 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index 58f0cf76b43f..6f6aab1bac9f 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -1,7 +1,9 @@
 DIST aws-cli-1.36.38.gh.tar.gz 2879388 BLAKE2B 2780cfeb9e6ca61635638ad3df9a0e6cb81eeeb45d7573f5033f37a2366c907e1cc4661766a72d4b45ced5e52d5dae82bd61c2dec455a6e5763ae2605b1e8f0f SHA512 626b606d86cb877c562031c23da57385b5014046d97cbf6cb3f6e73bb528755ff4a12190211feffbe326533500d988e93f55090f242b2b49ae725fc509575780
 DIST aws-cli-1.37.2.gh.tar.gz 2882709 BLAKE2B be8e03342f8c105646c7a92bd9f4716952700cb1cee883669b532851f73b896dd3f55266851db0351348ca50e3d96ec78f296327545eaac1e5d4ceba58a71eeb SHA512 492ac75a47187a5579cae3211b7e4b9df34c7fcab8903cc52a61cc9dc6238f32268a04e45eb4edead76504636a85987355d4bf71f700df7c14dc215b45e8058b
 DIST aws-cli-1.37.6.gh.tar.gz 2896548 BLAKE2B c160d981fc9d2a9c3de69b6d7dfc9fc699ad9ebbd7bd81808a74371059362ee7616a00c1c4d61674f4d9e8ebb35c3047c11d43c8c4bbf4ad63e65771462cc556 SHA512 475637e353afef4177d9375f2b8f9c86732ff55040ee1dfdc307a5c7fb6392db983e75324ebabe8016fb5c8712c1433a194a0cff65eda1f930a86b9357aafe28
+DIST aws-cli-1.37.7.gh.tar.gz 2896370 BLAKE2B 267b2b72df708ee83969ef8c6e99176655c368cac6a6a92d50c52a28ffb0b7f645b47e8b9527cf6aadb29d50dc4b8a76ade12bb5947b20ea39b81845c74459ca SHA512 c53283a3e6eb85bab5dfd7cadb4a080552bd5bf63deaa46f6c52f96895e5b5facfcada518ad636e71a6fc697bc17ed963754221c471f987691f3893f01fa68e5
 EBUILD awscli-1.36.38.ebuild 3179 BLAKE2B 166dab27a2c434c083129b7cfd4dd2af3a1b7d60e98bca4c664a9540b62421228aaab77a2a654799c79b0003d81bab00c78e12bda5a931bcea30afff0ecc8c32 SHA512 10bead82e87c3c857b4fa2c4168629b4113d49b481374b95ad5813cd440d9f5d36d3e0413c28038176f31d11a873d41638e31329ef1360e5755b95a90f6e441b
 EBUILD awscli-1.37.2.ebuild 3169 BLAKE2B 5e19b6d6b837a3f62a7f54c25b76d2dcebbd709ada36d473cee53d0cfc2aa7b3de92cb12db09be4fafbd0b5c303761436b25bf3b4afe16cf0119481959e2b9c2 SHA512 0d30f1cd05a160c7d70f85cc5887d9333b9512421c74d394cae05799229c74c2edb307434f90b64353cd8963b85889546df20e3bf5e7a3fa8953ae2b4a6cecdb
 EBUILD awscli-1.37.6.ebuild 3169 BLAKE2B 5e19b6d6b837a3f62a7f54c25b76d2dcebbd709ada36d473cee53d0cfc2aa7b3de92cb12db09be4fafbd0b5c303761436b25bf3b4afe16cf0119481959e2b9c2 SHA512 0d30f1cd05a160c7d70f85cc5887d9333b9512421c74d394cae05799229c74c2edb307434f90b64353cd8963b85889546df20e3bf5e7a3fa8953ae2b4a6cecdb
+EBUILD awscli-1.37.7.ebuild 3169 BLAKE2B 5e19b6d6b837a3f62a7f54c25b76d2dcebbd709ada36d473cee53d0cfc2aa7b3de92cb12db09be4fafbd0b5c303761436b25bf3b4afe16cf0119481959e2b9c2 SHA512 0d30f1cd05a160c7d70f85cc5887d9333b9512421c74d394cae05799229c74c2edb307434f90b64353cd8963b85889546df20e3bf5e7a3fa8953ae2b4a6cecdb
 MISC metadata.xml 385 BLAKE2B 5accfb180a91179cc6df539d42d1de06be3ebfec73f3edb719f5d59576103b9a8cb0c7c524c1042630e0cf99f068939a19f04c7b1b4a2acf9e072369df80d913 SHA512 ccb3d516326c5dbdf53068372ce25baecc137d21a04516374362212b969cc928dacbf743b4953da33f28482905798f069d09d19c88d9913f2b32648db25115ab
diff --git a/app-admin/awscli/awscli-1.37.7.ebuild b/app-admin/awscli/awscli-1.37.7.ebuild
new file mode 100644
index 000000000000..4a8e0ae852e0
--- /dev/null
+++ b/app-admin/awscli/awscli-1.37.7.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2025 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
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) - 1)).$(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.11.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[@]}"
+
+		# flaky (some ordering?)
+		tests/functional/s3/test_cp_command.py::TestCPCommand::test_multipart_upload_with_checksum_algorithm_crc32
+	)
+	# 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/setools/Manifest b/app-admin/setools/Manifest
index 3148b430c5ef..5b76ba754a10 100644
--- a/app-admin/setools/Manifest
+++ b/app-admin/setools/Manifest
@@ -1,8 +1,7 @@
-AUX setools-4.4.2-remove-gui.patch 1131 BLAKE2B 54f1258b4b8318f02fd8ef14c4377eacb42254a406b4b9f339b94b0958da352bda028b4b49871ebcdaf1dfc4e37e51f5a0dd346c288270c149d828981c2b5413 SHA512 a827c435072f4a35c165a2492f18c4689144f352ff8fa84ca840dd4b31c59dbd4d4e7c249ad54fb60616e00daad5bc245604041c710141650f80cba01c9cecb0
 AUX setools-4.5.1-remove-gui.patch 1194 BLAKE2B 39c9fe32301b065bee51358694f4f79d342346c2c0d0efdfecacbaaf42eb77498f6923deeb618bf90c9b13ae2664c60fe6a69ecdf64059baee1234dbbfdc037c SHA512 5982941899261c66ca47e26ee35cf68fa9d57f7002a40bc567fa5419cf6905bf336cb3f12e3d5ba8798b826037a3352f33f39d80a9b7d0a736545084b361d520
 DIST setools-4.4.4.tar.bz2 262867 BLAKE2B d64605ef050a2d51531e2a180bff086da536aa8d5e5c8cb96a81e137f575d089f9e9ec117cf0de9864f07174d92258b27ebf8fbc462714ef50bbd6d9f80d0a60 SHA512 ef72a7244ba0c724c4aea3afc40d71427e9c0592715f81cccaa8917e96836a88807ea78039c11c261dd3b4d72294accd76ab4bd37447cd500772030245db3c6e
 DIST setools-4.5.1.tar.bz2 264998 BLAKE2B 479cec6f541c1e7125d641928ba49aee949e538612a478840cec2d70106dcf9f7fa5b8049c9d18c560587670ee624a3a744714667d52b99cff24c51e72026db7 SHA512 1045c223423fcb056ffbc2f93c4dc0ccc6ae078ce7d2acbe3a3c65de19440fe801b5b9f71038cde62bf9851f52d868c845aafbe33691ee531cf9854217e061d8
 EBUILD setools-4.4.4.ebuild 1353 BLAKE2B 87f4801abbcf91b3ef920460cb806b2bc51114b45619e2f51404e7959ed704b76a6d3c752d8ecef4cabd17514a83b1ec70c28202980d3a0333d8f5e7a176d90f SHA512 87493707fec2369723ac3f433fd73531d5db6baa1d54dc02d302ed9e73229f4a60f1c0aebd89cc84c7d82a1ce9a4b2a552c13d2373b36f15aee28f14eeb50ecf
-EBUILD setools-4.5.1.ebuild 1505 BLAKE2B 8ebb208b10ad9b5d12e8adc17270598bd00929aea7b6f2f7bca9fa1610788b15fe5177f09dbe65a25589ec4e281402914e9a9480d5c799cbe7067582e373d571 SHA512 5bd0edf91b419e06d4a10d4542f9b3e53185c4e522a2c8a7aeb8cb7d0673aed2df5f52d8caf83814d3eef366b6f584a8a51c9ed61da01079eb86f6aaaf31df01
-EBUILD setools-9999.ebuild 1402 BLAKE2B b9ef165dfc462cfe42858ff291ac5a6278db7db26ab9ee7dac0917985015feeacb1991d6fa35ebe37b29a9639abcc868f949502207e805a78d69beb7383e88f5 SHA512 cb31dc8c888f84288c15cf2aa0acbbd5aace3e841a96bd1e8afdcd6c9fc519253e90eaba8386d0cfee2d11cfa3b083875db5e0bfeb18b7fc99128b98ccf1dd10
+EBUILD setools-4.5.1.ebuild 1502 BLAKE2B 32e1a2bc39187418de801a0314eec4142f97212efa43d00ab0cc42ac1b3ee0a76820dc65f07504c277b49137b3ddc2d922dd76e65c6606073c194895fc5a4e94 SHA512 d4b073d0229a6a919d88b0e9ae131dce83c67c7220eb19206bdab408a0d5f4171e17ea100eee7704899e739e0a2bcaca0fb17a5e7a241599ebdac7b537d95add
+EBUILD setools-9999.ebuild 1511 BLAKE2B 3271aba051e17a4484304840b05486555814832a043f58a640515cdde7f72955cddc30a6f7a27fa01914465b5c9ab9aa8607114f4554c8398a9aaca5fa1cc4e6 SHA512 1a9a5fefa0c83f01358a5f31cd6929bf0e2b607669a24669e0575bdc144b7c07db36b62ff2ee392cfaabab89500e2b6a1532e07935ded45f04a9e8902c06f862
 MISC metadata.xml 335 BLAKE2B 81a7604472415bdf249d90f69e80a7a7c66f23597cba3005fc1fc825012ffdeb29bcb3f8f8b028ee35e0a076fe4863c25d79077718b28d5f658e68df2a703c5b SHA512 9115e12f13e78b8f63ec90a2ed71c5c731781415a77c2fd06bba358240261bf83183f14f2d38e5e9ffcafaee56de4df224b517afceb536d8e1e6af6f1eaa0938
diff --git a/app-admin/setools/files/setools-4.4.2-remove-gui.patch b/app-admin/setools/files/setools-4.4.2-remove-gui.patch
deleted file mode 100644
index 49d16ec66b56..000000000000
--- a/app-admin/setools/files/setools-4.4.2-remove-gui.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/setup.py
-+++ b/setup.py
-@@ -139,12 +139,10 @@ setup(name='setools',
-       author_email='pebenito@ieee.org',
-       url='https://github.com/SELinuxProject/setools',
-       cmdclass={'build_qhc': QtHelpCommand, 'clean': CleanCommand},
--      packages=['setools', 'setools.checker', 'setools.diff', 'setoolsgui', 'setoolsgui.apol'],
--      scripts=['apol', 'sediff', 'seinfo', 'seinfoflow', 'sesearch', 'sedta', 'sechecker'],
-+      packages=['setools', 'setools.checker', 'setools.diff'],
-+      scripts=['sediff', 'seinfo', 'seinfoflow', 'sesearch', 'sedta', 'sechecker'],
-       data_files=installed_data,
--      package_data={'': ['*.ui', '*.qhc', '*.qch'], 'setools': ['perm_map',
--                                                                'policyrep.pyi',
--                                                                'py.typed']},
-+      package_data={'setools': ['perm_map', 'policyrep.pyi', 'py.typed']},
-       ext_modules=cythonize(ext_py_mods, include_path=['setools/policyrep'],
-                             annotate=cython_annotate,
-                             compiler_directives={"language_level": 3,
diff --git a/app-admin/setools/setools-4.5.1.ebuild b/app-admin/setools/setools-4.5.1.ebuild
index 95837a85a83f..3bf6621425a8 100644
--- a/app-admin/setools/setools-4.5.1.ebuild
+++ b/app-admin/setools/setools-4.5.1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="8"
+EAPI=8
 
 DISTUTILS_EXT=1
 DISTUTILS_USE_PEP517=setuptools
@@ -12,7 +12,7 @@ inherit distutils-r1
 DESCRIPTION="Policy Analysis Tools for SELinux"
 HOMEPAGE="https://github.com/SELinuxProject/setools/wiki"
 
-if [[ ${PV} == 9999 ]] ; then
+if [[ ${PV} == *9999* ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/SELinuxProject/setools.git"
 	S="${WORKDIR}/${P}"
@@ -24,7 +24,7 @@ fi
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-IUSE="test X"
+IUSE="gui test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="${PYTHON_DEPS}
@@ -32,7 +32,7 @@ RDEPEND="${PYTHON_DEPS}
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	>=sys-libs/libsepol-3.2:=
 	>=sys-libs/libselinux-3.2:=
-	X? (
+	gui? (
 		dev-python/pyqt6[gui,widgets,${PYTHON_USEDEP}]
 		dev-python/pygraphviz[${PYTHON_USEDEP}]
 	)"
@@ -50,7 +50,7 @@ python_prepare_all() {
 	sed -i "s@^lib_dirs = .*@lib_dirs = ['${ROOT:-/}usr/$(get_libdir)']@" "${S}"/setup.py || \
 		die "failed to set lib_dirs"
 
-	use X || PATCHES+=( "${FILESDIR}"/setools-4.5.1-remove-gui.patch )
+	use gui || PATCHES+=( "${FILESDIR}"/${P}-remove-gui.patch )
 	distutils-r1_python_prepare_all
 }
 
diff --git a/app-admin/setools/setools-9999.ebuild b/app-admin/setools/setools-9999.ebuild
index 16398f7136ad..c7c56b0bb408 100644
--- a/app-admin/setools/setools-9999.ebuild
+++ b/app-admin/setools/setools-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="8"
+EAPI=8
 
 DISTUTILS_EXT=1
 DISTUTILS_USE_PEP517=setuptools
@@ -12,19 +12,19 @@ inherit distutils-r1
 DESCRIPTION="Policy Analysis Tools for SELinux"
 HOMEPAGE="https://github.com/SELinuxProject/setools/wiki"
 
-if [[ ${PV} == 9999 ]] ; then
+if [[ ${PV} == *9999* ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/SELinuxProject/setools.git"
 	S="${WORKDIR}/${P}"
 else
 	SRC_URI="https://github.com/SELinuxProject/setools/releases/download/${PV}/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
 	S="${WORKDIR}/${PN}"
 fi
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-IUSE="test X"
+IUSE="gui test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="${PYTHON_DEPS}
@@ -32,13 +32,15 @@ RDEPEND="${PYTHON_DEPS}
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	>=sys-libs/libsepol-3.2:=
 	>=sys-libs/libselinux-3.2:=
-	X? (
+	gui? (
 		dev-python/pyqt6[gui,widgets,${PYTHON_USEDEP}]
 		dev-python/pygraphviz[${PYTHON_USEDEP}]
 	)"
 DEPEND="${RDEPEND}"
 BDEPEND=">=dev-python/cython-0.29.14[${PYTHON_USEDEP}]
 	test? (
+		dev-python/pyqt6[gui,testlib,widgets,${PYTHON_USEDEP}]
+		dev-python/pytest-qt[${PYTHON_USEDEP}]
 		sys-apps/checkpolicy
 	)"
 
@@ -48,7 +50,7 @@ python_prepare_all() {
 	sed -i "s@^lib_dirs = .*@lib_dirs = ['${ROOT:-/}usr/$(get_libdir)']@" "${S}"/setup.py || \
 		die "failed to set lib_dirs"
 
-	use X || PATCHES+=( "${FILESDIR}"/setools-4.4.2-remove-gui.patch )
+	use gui || PATCHES+=( "${FILESDIR}"/${PN}-4.5.1-remove-gui.patch )
 	distutils-r1_python_prepare_all
 }