[gentoo-commits] repo/gentoo:master commit in: app-admin/salt/

["Patrick McLean" <chutzpah@gentoo.org>]

commit:     95e6a5e38087a4ffd8f3eab24238dff9806fdcf2
Author:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 21 22:12:54 2024 +0000
Commit:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Wed Feb 21 22:12:54 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95e6a5e3

app-admin/salt: add 3006.7, drop 3006.6

Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>

 app-admin/salt/Manifest                            |  2 +-
 .../{salt-3006.6.ebuild => salt-3006.7.ebuild}     | 32 ++++++++++++----------
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest
index b01595c16441..40943e28c8bc 100644
--- a/app-admin/salt/Manifest
+++ b/app-admin/salt/Manifest
@@ -6,4 +6,4 @@ DIST salt-3006.2.tar.gz 20411634 BLAKE2B dff474017918ef3ee0031856a2739282077205d
 DIST salt-3006.3.tar.gz 20461738 BLAKE2B dfa4698dbc611c9c4954b4631d11b685e1efc978915918ce6d8f1890bb4a230d234b6a191166ffff9243058d44530bfc14b43386c8bc295c035c6609d6bf3fa0 SHA512 9cced766db2144de445ed53b52c1551c986ba43774c40512fd07973862d6d3a361e25f55fcfeeb0e03ba44eec1051909834e5d0a352ead5ec6f418b15c909628
 DIST salt-3006.4.tar.gz 20465324 BLAKE2B 8cf9acf8850e9eefbff32f3e347d8773ed7e28f58a0a441af9ec0a4c87a0bba49ff2b82e6f5816511de7303e16d79246df8c0024464a5c267f3ef7e370c8be98 SHA512 c48c69730ba81d3e279cbb01cb26c743dd8b4945c2fc16a7c959472ab4050316fcdaee935e009b7f472bd3b08172ac69defe64774a2d93e143a050cd559997ef
 DIST salt-3006.5.tar.gz 20536455 BLAKE2B cf475dc5e919f6ab180578db2aae5f3655623b39b134d67609da4f607be909340c6e55c940cfb66f129cc75d40b5cdda094e866db116d8a45aa5eef26d8fa1eb SHA512 8aaf5c5d36d8aa17b3fe867cee470f7b3c5dd1f6abaf5bdb49a3df76d3498d0dc1fa305a069bc95ad057489db229454b38b0ea9c1ade1e46b5d9b57aeef10c23
-DIST salt-3006.6.tar.gz 20531374 BLAKE2B 17a80331e7771482849bed7927ef48d16ce6805f459ce58bdd1cb2595dad05c6d13ab2af84d4311c521b902035f67aac73c18b9dd9f5d271bde310a4c56c827d SHA512 05a3d853789cb8a890e3922a86e7336a7b4a1897af5022411907bd80a4d184d3061a658952ffe12b4d774b492f4bd79f218dd335eaa90eba1476638c861185f2
+DIST salt-3006.7.tar.gz 20562663 BLAKE2B b4ff9039509b1de7151060cb0e68252868d493e114e327a3c48bfc5584f67521a2106b41b77377f6d43ab5795399b6fe5860ce8e091459687c4a5b2378752729 SHA512 9d1759a7c0dfc9ad4fdc94460f0f3799483737207bfdc8ddd1424e5c6083ea74ef520f13c323d5cbd7f65c1d9bb13bbbeb5f2cafe6dcacbc2689e733794aef2d

diff --git a/app-admin/salt/salt-3006.6.ebuild b/app-admin/salt/salt-3006.7.ebuild
similarity index 98%
rename from app-admin/salt/salt-3006.6.ebuild
rename to app-admin/salt/salt-3006.7.ebuild
index 43f524622f51..18725f3ff3dd 100644
--- a/app-admin/salt/salt-3006.6.ebuild
+++ b/app-admin/salt/salt-3006.7.ebuild
@@ -98,6 +98,7 @@ BDEPEND="
 		dev-python/mako[${PYTHON_USEDEP}]
 		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
 		>=dev-python/moto-2.0.0[${PYTHON_USEDEP}]
+		<dev-python/moto-5[${PYTHON_USEDEP}]
 		dev-python/passlib[${PYTHON_USEDEP}]
 		dev-python/bcrypt[${PYTHON_USEDEP}]
 		dev-python/pip[${PYTHON_USEDEP}]
@@ -273,11 +274,11 @@ python_test() {
 
 		# don't like sandbox
 		tests/pytests/functional/fileserver/test_roots.py::test_symlink_list
-		tests/pytests/functional/modules/file/test_replace.py::test_append_if_not_found_no_match_newline
-		tests/pytests/functional/modules/file/test_replace.py::test_append_if_not_found_no_match_no_newline
-		tests/pytests/functional/modules/file/test_replace.py::test_append_if_not_found_empty_file
 		tests/pytests/functional/modules/file/test_replace.py::test_append_if_not_found_content
+		tests/pytests/functional/modules/file/test_replace.py::test_append_if_not_found_empty_file
 		tests/pytests/functional/modules/file/test_replace.py::test_append_if_not_found_no_append_on_match
+		tests/pytests/functional/modules/file/test_replace.py::test_append_if_not_found_no_match_newline
+		tests/pytests/functional/modules/file/test_replace.py::test_append_if_not_found_no_match_no_newline
 		tests/pytests/functional/modules/test_defaults.py::test_defaults_get
 		tests/pytests/functional/pillar/test_top.py::test_pillar_top_compound_match
 		tests/pytests/functional/states/file/test_append.py::test_file_append_check_cmd
@@ -286,27 +287,30 @@ python_test() {
 		tests/pytests/functional/states/file/test_directory.py::test_directory_clean_require_in_with_id
 		tests/pytests/functional/states/file/test_directory.py::test_directory_clean_require_with_name
 		tests/pytests/functional/states/file/test_keyvalue.py::test_keyvalue
-		tests/pytests/functional/states/file/test_managed.py::test_managed_file_with_grains_data
+		tests/pytests/functional/states/file/test_managed.py::test_file_managed_requisites
+		tests/pytests/functional/states/file/test_managed.py::test_issue_8947_utf8_sls
 		tests/pytests/functional/states/file/test_managed.py::test_managed_escaped_file_path
+		tests/pytests/functional/states/file/test_managed.py::test_managed_file_issue_51208
+		tests/pytests/functional/states/file/test_managed.py::test_managed_file_with_grains_data
 		tests/pytests/functional/states/file/test_managed.py::test_managed_latin1_diff
-		tests/pytests/functional/states/file/test_managed.py::test_managed_unicode_jinja_with_tojson_filter
 		tests/pytests/functional/states/file/test_managed.py::test_managed_source_hash_indifferent_case
-		tests/pytests/functional/states/file/test_managed.py::test_file_managed_requisites
-		tests/pytests/functional/states/file/test_managed.py::test_managed_file_issue_51208
+		tests/pytests/functional/states/file/test_managed.py::test_managed_unicode_jinja_with_tojson_filter
 		tests/pytests/functional/states/file/test_recurse.py::test_issue_2726_mode_kwarg
-		tests/pytests/functional/states/file/test_managed.py::test_issue_8947_utf8_sls
-		tests/pytests/functional/states/file/test_replace.py::test_file_replace_prerequired_issues_55775
 		tests/pytests/functional/states/file/test_replace.py::test_file_replace_check_cmd
+		tests/pytests/functional/states/file/test_replace.py::test_file_replace_prerequired_issues_55775
 		tests/pytests/functional/utils/functools/test_namespaced_function.py::test_namespacing
-		tests/pytests/unit/pillar/test_pillar.py::test_pillar_get_cache_disk
-		tests/pytests/unit/state/test_state_compiler.py::test_verify_high_too_many_functions_declared_error_message
-		tests/pytests/unit/utils/test_versions.py::test_warn_until_good_version_argument
 		tests/pytests/integration/modules/test_state.py::test_logging_and_state_output_order
 		tests/pytests/integration/modules/test_test.py::test_deprecation_warning_emits_deprecation_warnings
 		tests/pytests/unit/config/schemas/test_ssh.py::test_config_validate
-		tests/pytests/unit/test_ext_importers.py::test_tornado_import_override
-		tests/pytests/unit/modules/test_saltutil.py::test_list_extmods
+		tests/pytests/unit/grains/test_core.py::test_get_machine_id
+		tests/pytests/unit/loader/test_loader.py::test_named_loader_context_name_not_packed
 		tests/pytests/unit/modules/test_saltutil.py::test_clear_job_cache
+		tests/pytests/unit/modules/test_saltutil.py::test_list_extmods
+		tests/pytests/unit/pillar/test_pillar.py::test_pillar_get_cache_disk
+		tests/pytests/unit/state/test_state_compiler.py::test_verify_high_too_many_functions_declared_error_message
+		tests/pytests/unit/test_ext_importers.py::test_tornado_import_override
+		tests/pytests/unit/utils/test_rsax931.py::test_find_libcrypto_darwin_catalina
+		tests/pytests/unit/utils/test_versions.py::test_warn_until_good_version_argument
 		tests/unit/transport/test_ipc.py::IPCMessagePubSubCase::test_async_reading_streamclosederror
 
 		# tests that need network access