gentoo auto-resync : 21:02:2024 - 23:40:13

2 files changed, 20 insertions, 16 deletions

diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest
index d3ea403f4e65..47b879fb97bc 100644
--- a/app-admin/salt/Manifest
+++ b/app-admin/salt/Manifest
@@ -31,7 +31,7 @@ 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
 EBUILD salt-3005.1-r1.ebuild 7234 BLAKE2B af8c85ad4abcd00244b52a73cc67fc31505395dc11282841bec155a4ae5c24694214f9e3a173f8ae09c25de2ae06f5eefdc3fd0aa27608908a78f664e18cf408 SHA512 1d790f172358abbac38351e1b5be50fa1e646fc7cb51179af428249e8dccd6452f51f25710ab73c91e0942df8098a9b97d6f579b8934a1f0e4d194cd7ec6961d
 EBUILD salt-3005.3.ebuild 9382 BLAKE2B 068d7d5a8e15ebb387b9534616693c74dd89d2b8839c21a57c50bcbdf83427b44a49796805b84b45be823007c0c6ea3828a17ac47a20576286e340c4ccaf0775 SHA512 da78be3da31b32b079129bc05547890e17bb3c67d8e4ba33f84be796c83fbaf31aae838df0f8c51153bca51960dfdfa41ca6af92dc77ef32760b5dba3f901e81
 EBUILD salt-3005.4.ebuild 9382 BLAKE2B 068d7d5a8e15ebb387b9534616693c74dd89d2b8839c21a57c50bcbdf83427b44a49796805b84b45be823007c0c6ea3828a17ac47a20576286e340c4ccaf0775 SHA512 da78be3da31b32b079129bc05547890e17bb3c67d8e4ba33f84be796c83fbaf31aae838df0f8c51153bca51960dfdfa41ca6af92dc77ef32760b5dba3f901e81
@@ -40,5 +40,5 @@ EBUILD salt-3006.2.ebuild 8539 BLAKE2B 335093f353da0d42abedf7b836c1516239390ec64
 EBUILD salt-3006.3.ebuild 8903 BLAKE2B cbf034e5dec44f2b46cecf74dbc4d7b8df9782905024ff86ed3e5320172a1693027859036e79609e23aae00c50994a62aee8806928c46dd907411efcaaa2a0c7 SHA512 867092ef5873126ceee767ebf12df66acaade553df2d7d351441a7aff19fc90346c6805882b77be602e79e407ddf9f90e0885a746336b64e4ce3bb6422426f57
 EBUILD salt-3006.4.ebuild 8825 BLAKE2B 6789758984b1d9bc4e1e6fd61b6516a8bec88df9a3de73a5570f0717e52ed2f5796e03d6a1b2eb31ca67635b51b72f963b406ebd03e97f8be6a0dab7ec29836e SHA512 999951e1a35552ffc86ecccda556274f108d082df37163a8570879aa6029751dedec3ea76ce42f39ce5b3ff46ebdaedca46a2ddc5b6639952aba257830c0e522
 EBUILD salt-3006.5.ebuild 9589 BLAKE2B c90270c444f99da82b8a85e813c652f7cf4f6f5767160183de5162434bc4be3feb0060a2579c7191b189d8401625fc3acf003adea24d0c0aad9e027c3ffa20ef SHA512 1c67d2cc61e8594ee335f5da8c7ba53ea629fe389cd30fdb3f93d5b14b04592bff759fbe7b2ac7ce03d5524d9e9fb935e572119adc2c00861cf45422897d39fc
-EBUILD salt-3006.6.ebuild 14953 BLAKE2B cf647f3b29fdcb6d57231da98b8853f14a6ebcb8589480daf83f3c52941b6a6cb79a6918bf764384668e6d68989ee1dbaefc34cbb78ee71240ef1d6224afc7c3 SHA512 929a21112a9006a5abe5a2534746426ce1f2e2e6e8bcb65c1ac047f563c5b0b3635e2ffe75332253706857ffe33ed3d68efb036fd123507a72e796baf6c43c1a
+EBUILD salt-3006.7.ebuild 15220 BLAKE2B 585a08e0efe624f573454adc1b8894208e4ce5be462bc6a53f694a08613e920987364a31353a0e5f3e54f8697fdc54e781f45b5b55ef593404e94ab71c732f86 SHA512 6c591b101137442e7b3d0f98b386c185842a67afd33e7d8d47d2c73f3b5bf94cd431fa0db7d0ade51c26f84aab06e52c237993dd88fce848d4430296be902330
 MISC metadata.xml 2304 BLAKE2B 8fac51fe1b0c0dae5fe71d88f1bf84df1de8cc8b3d836b59c3b2e82bfa085f57352e3aafd999766ae69104a8bd9798f2fffdb64e1df1e0a1ca8561dba1ef7d5e SHA512 7d3706c40c27dd67509bd638cd0550bb4822f0895fef929ecad21c218cdaa0512da443c901cc2b3a8d4afd9f5e9bc461622ac3bab2a332ccd9c64c4cbf99bf74
diff --git a/app-admin/salt/salt-3006.6.ebuild b/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