gentoo auto-resync : 10:01:2023 - 18:21:10

15 files changed, 9 insertions, 848 deletions

diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest
index ce8d69b96183..ed771b52534d 100644
--- a/app-admin/salt/Manifest
+++ b/app-admin/salt/Manifest
@@ -4,19 +4,10 @@ AUX master-confd-1 188 BLAKE2B 8ac416a7ff64c73556f07a08268ea7d91547e242becd345ac
 AUX master-initd-5 558 BLAKE2B 09a1485449b239b4f0d7e0514572084769c73b28053fc6ff9b4cbeb239358e7311784c15e883ddf5ca8310794e3d2bb851f2a765bb3aa17f8081ee008bfd130a SHA512 36b2d601d4dd3bd7b1758e77029b70916adbf8919c3ef04fd867ca25b143666d0c2f5834adddf05e7c2b013f04939f57e3396c888514e08f1679e6459a6ce7bb
 AUX minion-confd-1 188 BLAKE2B ad20094c30f9aa573397d347f9fb11acafba2f724b6c836d7ec57f10d4182c300a4b0ec572b5f3301174febdfc69c30752c3b0eabdfdf9f4963b03531db23523 SHA512 0051e13351cef8db81dc075a194bb384723f07d5591b5b4d3f3adf4180afaf7beced470ab79ceca9d1ec0dae62dbd72084eb76af009fc78411a011050a94a2ed
 AUX minion-initd-5 564 BLAKE2B 19f2d909b1a91b5cf22c932b04b794ef536c3a84fbd36676d4bf136c6af66ae4ea94abcf9657919cb4cf85ee88cc6e93df0e7373e0410823550cc45ebc8f5673 SHA512 c92165fe73157c9c3898f7c8c90e3b1626f704d4a8432237bd264463c66ba00e89a1d66e44b049703fd32ce48f771248b902e7183c4e31ee6611f938704b2583
-AUX salt-2019.2.0-skip-tests-that-oom-machine.patch 739 BLAKE2B c0e1b18c528ddcdc19e93061112d2c42aeca96f9091218e7ad6b4eadf11255079cecd6b9b9def576c663b4ba794d151db8fc32336b1c29c3da8e9c18c09582f3 SHA512 0bd8fc2ab73be8ffc9fdda65a60c7306dbfa9f76d874994ba09db7ef71678fca80c8fde5963d22b5bbbe3b933140a56f2173f4c109b47dd9e9c3c9a70062b0e3
-AUX salt-3002-dont-realpath-on-tmpdir.patch 1808 BLAKE2B 2ce464fef827cb98490b8a2c4aecbdaaa8bd53b3aef1acc96496bde162a0102064a400dff768c2cd5faddfe33a433922c5295b30dfef38e68841ebfe1a119644 SHA512 ce002f4fdf0d1e75cfbe9c2d3a6c98e08c21b0c436c500b70a0405c4ee10a1b1849446fab47dd681c71c9a847587fe97537de095768ecf650df9b53f3778ca62
 AUX salt-3002-tests.patch 1125 BLAKE2B 345c094c38a1b62190587062a86da4e0a516988fb2bbf98c295da87f0abd456cfc8f25c11fe10a1c4571d4eb25390c6d89b0e300bd2ae6d82212d1685af8ed30 SHA512 7f9d6f8c4a5d34381c516c72d77de6613ed646fb88f89b7c4180afebb0bf0ee34a99ed02a7e8d7a6836a61c01653fe97a13c8caa18898a507a03091cff8e9d30
-AUX salt-3002.5-tests.patch 1437 BLAKE2B 7c0ddc9ab12c7ed3d07e18a22623f5f9e24f47bf7e871ad7b71f0d1c482790f1ac994b628bbaa0692344deacf57526496c79f1aa7fc1a68092dea67392c0ce45 SHA512 1551757f01348d64de94b8b5830ad45333a06e1cd54d457702a33031b1f741ce12c23c9452e25d3498a0fa6a8c80ec425b0618809af7c3860ce1064946491cbb
-AUX salt-3002.7-tests.patch 439 BLAKE2B 241d1efab22509c73e23d1e4e397fff5c6dadd7481cf8156df5d8c2b79e6b332c3e55e40e00582ed57c67da61dbad97a8be6df62209bd435db638e6e8a9d06c6 SHA512 c9145592a810a135111079d39d9a28cd0f4b7530e19864ee87b144b44c951b9a43e876f935f05a8ea8428da7fe3cfbcc49020baf46baf7b840816b15aff3f190
-AUX salt-3002.8-relax-pyzmq-dep.patch 293 BLAKE2B 7c56c7ea6124e18e6d71f1266cbdcca26537a2a5a72a996412a59eddeba5987748e9079a3ca601cde9365c65aca9e0aef3ed5f6fc47cd8dbfac3a43c59f0a4ca SHA512 3906630838b8d915e3bad3e1dd649d3ab6b42697aa4b26bedf3ab9dee406dd000440073fab026a967ee261cc1e64d7e14fbe1016f1d5b47576bbae496bee215f
-AUX salt-3002.8-tests.patch 1531 BLAKE2B 8a8b02a0ad6099aac7722d8f8edd178b27817483ef9216ca3f00078231c13d2f5e3a551539956186933200d04349e67640aa691cb7e5f35e3f6a4ce3dfb71368 SHA512 e146a04570aa9524341216547d8a55a434499eb67c4be1167a0fee778ce93c172555816a5422462648ce5431106c47840e7c0f270b6087cf84058082a1a7341a
 AUX salt-3003-gentoolkit-revdep.patch 514 BLAKE2B aff27558a2043970feeb3eda70cf8e9112b5545af40ba215c7859520ef95a9824001274e837929ef6c25f8e1c35a8ac73f1033e63336bcbaf48dbd4b54c2d42c SHA512 c8a4649ac241f219cf576b0896f48dffc0d5a273118713829c0ad34594f77cffceaa4f06a4d0f47a17b13d6e71b5787fc27f8ee97c774e53a6d15d1b282f99b3
 AUX salt-3003-skip-tests-that-oom-machine.patch 732 BLAKE2B b9e10cf8d9ce7f36371fd30fcf592dce4933a05ca2d85c41b2159233272f2e7c90315fbd998c4064f3733b5b1944f9f96816418ed7eb434f3b9df324de2e859b SHA512 e7bc9c63d95a9af4e85372ca973c5023660c332b67486382ce898e7d60c3f50e2aca59e2634a2e87ab7fa8b34e45bfd3a781e04b8003108efbfcc67cd921aff4
 AUX salt-3003.1-tests.patch 1151 BLAKE2B b2f0d99bf4bd90a7ea85ae5cc6abb91dd078ad8a95b062863a21573067f3df6045fe23ffd1b3f397e28b90b25126798253e8a9001509ad786cee3f318a900321 SHA512 9340a1dd343af45467be63b1f6991cd06fa57ffc187bcff4a96c75a9666a1429b98ce5b497354bc4cb975c0f6bcd9a64dbfb819b6bfdba02bb5917446d0a36fc
-AUX salt-3003.3-tests.patch 9888 BLAKE2B b8785f6498246e3a61079721c060aebda15a595232600aad408e01cae052ccf15d0b482efd17c12de74bd227cabaf2e95812420f157bdc97edac60e9a25d1c44 SHA512 4709c63ffe1c8205672238855f07adcc28556d8d8fcb746402e07651552015ce8ae6754f2a6ec07545d58f4c018a27d14273e8cbba1ecfdc7a1527007ee7a928
-AUX salt-3003.4-relax-pyzmq-dep.patch 333 BLAKE2B 31596e398c420e04802f086e61ff59676a9687c199df0f7fcb9c7e6a804a3339e1c1960a0579cae0022f90c0e1a274aa90916b7a685239b54d47851246acbe1f SHA512 e9796a8cb0bcdc9d90f8a3d4e01d955a2ac1129edc3d572be7ddd472fd488bae933e80f6a107471c6660b61a16d9034cf4a80c7b8103a2c0b26b4392f5c70286
-AUX salt-3003.4-tests.patch 1982 BLAKE2B 920f9c7e587358cff0abf97f2dfe54ee523f82a35c238d193520e6bd30921cec993705dd93d0c8130d4794fe051e7236411afa552d311f2dcc30596c1bac2b51 SHA512 700cb7e9020383b0684898e4a6675174e552bed1ba7540cb773303ec151574707d142b888a99d5288e18236cf0d47169f1515041e4e6ca91204a0bc140f66898
 AUX salt-3004.1-py310.patch 2071 BLAKE2B 23f8db2e2bc7307fd58e535bf642e9c76172d03d49b3e86333ee82434adbaa5f437330fa951221f233bba9e09b514611180d19f1db2856ba7d0a3a231a4b385f SHA512 6eec860778ceab15f5ea4260b648cd96df52daaec900dd093257af97e873e8a5be1296d4181767846eb63277a0b903e92ab6550772046acd7a8dea72eb0447f8
 AUX salt-3004.1-relax-pyzmq-dep.patch 348 BLAKE2B 75a5947cf6f92fd08da25d50b9064d82c13eaf9f2f2f4ed627f8690ba8893b58de7ef2f0a976879ce94f8f542b9198c637021ba08bc067f3eb56aa40e9598c75 SHA512 7c48d3f86cd81d11077c80ca9536a85c9825299dd9c2a81fd43fc2c2781211d9bb72e4dd79381343851c3292210eab41de049006e608ceb340af31a84cd244bb
 AUX salt-3004.1-tests.patch 13025 BLAKE2B fd86808b3d43a25abb88f5d454dd2618d896aa8c8ff843d4f9b46ff32d98d07d245d308599d0a93814d80ff9b1cb120da4296b6f06f64825da4ce603ec37d4fb SHA512 4634fe96479c481fdb9daf8decd3632e9ed8daa9ab62942d71bd6c11e603ae5ac96acfdb68e4e91ec2c829efd33689fa122bc53979b7b5ce02ea63189bebe349
@@ -34,14 +25,10 @@ AUX salt-minion.service 162 BLAKE2B 6f7b6b72e26d1651dbcb324b1e0cfef9f4b5a794f405
 AUX salt-syndic.service 169 BLAKE2B 0d00f20b4663804eaa4b6a1a1b32ed87b04d1f4df6a8e8e0b2a0e3d17f71e1bb53f71f6168446aaf3765692cd540217c4cdf5ab8dd9cb7032801aa798d8a9bc3 SHA512 b45509a22a18f573726a868fda1591eaf42ef44220960dda698274ba8ff1db8cdc302605133ab61b188e15017ba15c5f409f3ee64e026b635ac359eea7aad7d0
 AUX syndic-confd-1 188 BLAKE2B 98f13eb627963d65df26140f348c04eb8c253d444d36ecd1f5ef344ad89901b0a5ed62c64364e90595c2d2ee2766f30802a4a86a2555bbea343ab410292359af SHA512 35fe9bf4732c8a53b47099ffe5f9468d884ec3e2671451a6d52821dde6c70c63176b29ade0d700b99aaf47557f58179f780422843346bd3aa6513d9465ec9f58
 AUX syndic-initd-5 558 BLAKE2B 5e1ea25b57f56ad7bfb8be0c845e7da9f99af03c50c31ca2031e604267c680555d0d8a3ef6299ec588770f26dad19d262c8b9403391b60fb17c6811d7946107a SHA512 6e927925cf1e4d0f901bec10499a8ecf1193b99742cfda5f94f70d0ec743902b1b89728cb2e447b8b4879a9417d0d482b813161968dc9c2b2c7944b3af14df14
-DIST salt-3002.9.tar.gz 15817470 BLAKE2B 31fb6dbb61a9f0ab22ca761810a934792e9fa9c78628f925e63d3d54d00fa4ea0b4aa806ba3ea92f7397ba3291281bf8989d9a288fb3114c7911cdebfc9acd6a SHA512 f34fd05960a68cba51f34cf8b7c737bd84d00472cec80628f082d16e54cf70705e191ac4b6690bf406a8a11e26c8155e4bdbdec34ede5f0721fd9b5e637a0ed1
-DIST salt-3003.5.tar.gz 16056545 BLAKE2B ede3f0c63175f093dca07bee1bfb659cc608336ae92f532fc45868bd7eca659498c42e5d44324492744b802ade088adac869277679989550e217c1a135d6566d SHA512 ebda2056b4d6d216a0689b919d00aa78f615c355d21703d1939dbb6b00e9ad9347be4ee5b861282521f2d337bf7bf2fdc85e6942016358088a094d854fb33be9
 DIST salt-3004.2.tar.gz 17685127 BLAKE2B a42e31d8a006488b3a6f341f817cde21ff86248d2b548d9914c429c62d7570cdf46cf2b41311cbb08ced7f9518e68156c6df3eb78e55cacfd4d40a4e7a54f52b SHA512 b2fa434f1d25eabac51d65d75bb020943eb71aff113d683e6f436a0f205bd3c7682b1b7acd4d9a62bf37a47eb0561293d263f3174d5e266f0998a1652fcae2ef
 DIST salt-3005.1.tar.gz 17914349 BLAKE2B 697c2068bf119e4a19f92a86ce880fec9375c10ba549cdcdd2182cfeaacce31c7bc4c4c91e1a609906b4c5373bb5e3120e0db47ede5b45ee20942d7b2d201e64 SHA512 391f995f0129f3d7104a0eea4fd83b18aa6ecae0fd7a2c77c1154e24b0bcd52cef4b63db12597c85737bb33ddf605e0c23370cef3bf47f9ea85af5b77d74dc50
 DIST salt-3005.tar.gz 17894520 BLAKE2B 67e755bdbe772991f620d09f61836f8ccfa2039722c3281ec4cfaa8ef76e34c57e4db861cc652545e37eb965ab765f6b6ba0250407d7d7448aa5d4685ad9492a SHA512 c2019a97a5a98b4810cdace826d5e0a6d2890a984da4b95109c1b9328a2fd11cafd2fb0ef9752adeea1d36f8b2a69b3a4a6a5a092b6a7f050c60ec52da314a18
-EBUILD salt-3002.9-r1.ebuild 6085 BLAKE2B 6a41f53f3e87b43c21f4713fdfe3d84441b57b93e85a414516a07c91fe0fda9227004e7e6de6f1014aff752b80b36e8dd534f0cf4cd668f26085e710cce53eff SHA512 f24d46e24a9eedba4809e261634ba2f8fe41a649f5246715683fbdba00a1d034b433801b119b0a7868f8b9ccdb4bb4b7b66f739170ec9f71e5899f99f322c6ed
-EBUILD salt-3003.5-r2.ebuild 6423 BLAKE2B 3580efca7073a310563ff3940a6590d6c24a982fe761d7fbbf075b6ed6aeaf75065af48e891c21668dd2b44b7030de28d8669e7742342371853e75dcc31c11da SHA512 533204ff503e40241f8222e8dab08071780322d957a8399f5476f9da4a53d1379e2cf5b77045e9597756f4f5f92d18e2275f996b2aa1d012f17463f3c7d2dad9
-EBUILD salt-3004.2-r2.ebuild 6533 BLAKE2B d5bf7a51958664827d878eba3a321b25a03311a96cac3c45bc28a18bd9121f899e5c2468174c54e34994a3aa97ef57f810b3fac9f4fa3240a4e5f1aaa19cdafb SHA512 874d073e4433afcaa8f8878ed33d1cb5ca1b652b264f0e39b0b0afb5c2e051b9f4aa8af9b9fb9fabb376338707bfdc1376e37851e546ad73bab521195a5dfe3b
-EBUILD salt-3005-r1.ebuild 6981 BLAKE2B 25b00014910b7bb67661b64eb94ea261fcdefd6278c1d7454d25654dcaf1c4896c0706726e9df46e740c7a13fddddb0e29604389db9d5ec0fe36288cec891c7d SHA512 1ad93554d0200b5d21d7ac1347dca0bb97aa7ffb622b136b3ccaee5dfaf670232a91189f4dfce0d057ccfb316781d999a960bd660ed6922b424d6db1fddffbee
-EBUILD salt-3005.1.ebuild 7215 BLAKE2B 2d171c462997346cd66681febbe27f8f4ee2df432b4fcb44ad62ea756b20667407710aed58236cfa4eddb1c948d1dc120a2814f038afbd9875ad3846dd629ef9 SHA512 b621b21f2f7db4b41a43db7614458b93bb81de6c09108a85250c811d7769c86cd7f42edf061ade6ccba39ce39d893b3d760ededaa4ead6994afbdaa43c0f28a0
+EBUILD salt-3004.2-r2.ebuild 6528 BLAKE2B ac76c30eef745bf6c794029c1bffe356fe6cd1b541ed3d1285502abf1422c627ea52a1ef52b9aa2433e121cd5090edc170143fb161516a765d203eb0dfb72f6f SHA512 bad1d8ac9bbb80f49db7b76b2622ebfa924b1424912e9c2137732319d82a9bfd6b7a84daed4b02a648b4d8d04d0d9ab38ada5dc4abf3de8b967ae669e8f6f318
+EBUILD salt-3005-r1.ebuild 6976 BLAKE2B c19b56458e4082af1f71640b4e87d4a0d4a09bb64d453c6fbe1ce204ad2cfda315c0875727defb7aec7038e62da2b8f19a0d18ae89a1c55ca6aebdec368f5363 SHA512 3db49d931481105faada8242254516d2aadf25d984e47cfe92f61985998727240fe8ed3bb4447b4bfb9cec92f8500745752f09d20743c304092cb14184867d1f
+EBUILD salt-3005.1.ebuild 7210 BLAKE2B d9e23571fd1fd2334e708ac9262101d63f7f48be1bf630ff880357797b287c1881ed0d6dc8f50eb9ea8262d21af1cf0eb0ddd96638eed4d12cfa581bcb814c9c SHA512 0eefaf18ef343a5eace392049460b4853d08a4e421b34e2d2893c93864ea4b573701f7ec8a8032da6be50856dde229a6c5cdee35c5fd00696825f21d9cfb496b
 MISC metadata.xml 2384 BLAKE2B 8ccb0cbfc8d0944e684f979731884c354655d28fd9029f8d9abae1a313734102952fb817617d54032dd5cafa64925d73ee2a3e8a38ae16d2ff9c1af8c53d514c SHA512 6a4e1b8f2e041ad1a83bf2c85c35ac30ae7db3a20aa868204661c1dde9abdfab1dff1392e2dab8a844472434b325355fea71702229de99f7751e841d063fc0da
diff --git a/app-admin/salt/files/salt-2019.2.0-skip-tests-that-oom-machine.patch b/app-admin/salt/files/salt-2019.2.0-skip-tests-that-oom-machine.patch
deleted file mode 100644
index d0172d739554..000000000000
--- a/app-admin/salt/files/salt-2019.2.0-skip-tests-that-oom-machine.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/tests/unit/modules/test_boto_apigateway.py b/tests/unit/modules/test_boto_apigateway.py
-index be26b3f093..ca971556d5 100644
---- a/tests/unit/modules/test_boto_apigateway.py
-+++ b/tests/unit/modules/test_boto_apigateway.py
-@@ -169,6 +169,7 @@ def _has_required_botocore():
-         return True
- 
- 
-+@skipIf(True, "Causes machines to OOM")
- class BotoApiGatewayTestCaseBase(TestCase, LoaderModuleMockMixin):
-     conn = None
- 
-@@ -207,6 +208,7 @@ class BotoApiGatewayTestCaseBase(TestCase, LoaderModuleMockMixin):
-         self.addCleanup(delattr, self, 'conn')
- 
- 
-+@skipIf(True, "Causes machines to OOM")
- class BotoApiGatewayTestCaseMixin(object):
-     def _diff_list_dicts(self, listdict1, listdict2, sortkey):
-         '''
diff --git a/app-admin/salt/files/salt-3002-dont-realpath-on-tmpdir.patch b/app-admin/salt/files/salt-3002-dont-realpath-on-tmpdir.patch
deleted file mode 100644
index 5ef68dcd1803..000000000000
--- a/app-admin/salt/files/salt-3002-dont-realpath-on-tmpdir.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff --git a/tests/integration/files/file/base/_modules/runtests_helpers.py b/tests/integration/files/file/base/_modules/runtests_helpers.py
-index 3ee0e2da5f..5b462f0a9e 100644
---- a/tests/integration/files/file/base/_modules/runtests_helpers.py
-+++ b/tests/integration/files/file/base/_modules/runtests_helpers.py
-@@ -18,7 +18,7 @@ try:
-     from tests.support.runtests import RUNTIME_VARS
- except ImportError:
-     # Salt SSH Tests
--    SYS_TMP_DIR = os.path.realpath(
-+    SYS_TMP_DIR = os.path.abspath(
-         # Avoid ${TMPDIR} and gettempdir() on MacOS as they yield a base path too long
-         # for unix sockets: ``error: AF_UNIX path too long``
-         # Gentoo Portage prefers ebuild tests are rooted in ${TMPDIR}
-diff --git a/tests/support/paths.py b/tests/support/paths.py
-index 5f28904858..26245fadf9 100644
---- a/tests/support/paths.py
-+++ b/tests/support/paths.py
-@@ -48,14 +48,12 @@ if TESTS_DIR not in sys.path:
-     sys.path.insert(1, TESTS_DIR)
- 
- SYS_TMP_DIR = os.path.abspath(
--    os.path.realpath(
--        # Avoid ${TMPDIR} and gettempdir() on MacOS as they yield a base path too long
--        # for unix sockets: ``error: AF_UNIX path too long``
--        # Gentoo Portage prefers ebuild tests are rooted in ${TMPDIR}
--        os.environ.get("TMPDIR", tempfile.gettempdir())
--        if not sys.platform.startswith("darwin")
--        else "/tmp"
--    )
-+    # Avoid ${TMPDIR} and gettempdir() on MacOS as they yield a base path too long
-+    # for unix sockets: ``error: AF_UNIX path too long``
-+    # Gentoo Portage prefers ebuild tests are rooted in ${TMPDIR}
-+    os.environ.get("TMPDIR", tempfile.gettempdir())
-+    if not sys.platform.startswith("darwin")
-+    else "/tmp"
- )
- TMP = os.path.join(SYS_TMP_DIR, "salt-tests-tmpdir")
- TMP_ROOT_DIR = os.path.join(TMP, "rootdir")
diff --git a/app-admin/salt/files/salt-3002.5-tests.patch b/app-admin/salt/files/salt-3002.5-tests.patch
deleted file mode 100644
index 5a2eb43c3a42..000000000000
--- a/app-admin/salt/files/salt-3002.5-tests.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- salt-3002.5/tests/unit/modules/test_cmdmod.py	2021-02-26 11:01:33.407219444 -0800
-+++ salt-3002.5-python3_7/tests/unit/modules/test_cmdmod.py	2021-02-26 11:01:47.709124416 -0800
-@@ -560,6 +560,7 @@
- 
-         self.assertEqual(ret["stdout"], salt.utils.stringutils.to_unicode(stdout))
- 
-+    @skipIf(True, "doesn't work in sandbox")
-     def test_run_all_output_loglevel_debug(self):
-         """
-         Test that specifying debug for loglevel
---- salt-3002.5//tests/unit/utils/test_thin.py	2021-02-26 13:30:47.841179546 -0800
-+++ salt-3002.5-python3_7//tests/unit/utils/test_thin.py	2021-02-26 13:41:33.681174531 -0800
-@@ -1275,6 +1275,7 @@
-     @skipIf(
-         salt.utils.platform.is_windows(), "salt-ssh does not deploy to/from windows"
-     )
-+    @skipIf(True, "does not work with network-sandbox")
-     def test_thin_dir(self):
-         """
-         Test the thin dir to make sure salt-call can run
---- salt-3002.5/tests/unit/modules/test_cmdmod.py	2021-02-26 13:30:48.014178373 -0800
-+++ salt-3002.5-python3_7/tests/unit/modules/test_cmdmod.py	2021-02-26 13:43:22.395441008 -0800
-@@ -439,6 +439,7 @@
- 
-     @skipIf(salt.utils.platform.is_windows(), "Do not run on Windows")
-     @skipIf(salt.utils.platform.is_darwin(), "Do not run on MacOS")
-+    @skipIf(True, "does not work with network-sandbox")
-     def test_run_cwd_in_combination_with_runas(self):
-         """
-         cmd.run executes command in the cwd directory
diff --git a/app-admin/salt/files/salt-3002.7-tests.patch b/app-admin/salt/files/salt-3002.7-tests.patch
deleted file mode 100644
index 828b7eee76eb..000000000000
--- a/app-admin/salt/files/salt-3002.7-tests.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/tests/unit/modules/test_boto_route53.py b/tests/unit/modules/test_boto_route53.py
-index e745f8f8c6..a2bb2a7ef2 100644
---- a/tests/unit/modules/test_boto_route53.py
-+++ b/tests/unit/modules/test_boto_route53.py
-@@ -80,6 +80,7 @@ def _has_required_moto():
-     return True
- 
- 
-+@skipIf(True, "skipping broken test")
- @skipIf(HAS_MOTO is False, "The moto module must be installed.")
- @skipIf(
-     _has_required_moto() is False,
diff --git a/app-admin/salt/files/salt-3002.8-relax-pyzmq-dep.patch b/app-admin/salt/files/salt-3002.8-relax-pyzmq-dep.patch
deleted file mode 100644
index e42a22b4e8b7..000000000000
--- a/app-admin/salt/files/salt-3002.8-relax-pyzmq-dep.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --git a/requirements/zeromq.txt b/requirements/zeromq.txt
-index 77c9bd8be1..ffa1589043 100644
---- a/requirements/zeromq.txt
-+++ b/requirements/zeromq.txt
-@@ -1,5 +1,4 @@
- -r base.txt
- -r crypto.txt
- 
--pyzmq>=17.0.0 ; python_version < "3.9"
--pyzmq>=19.0.2 ; python_version >= "3.9"
-+pyzmq
diff --git a/app-admin/salt/files/salt-3002.8-tests.patch b/app-admin/salt/files/salt-3002.8-tests.patch
deleted file mode 100644
index c94a0c106347..000000000000
--- a/app-admin/salt/files/salt-3002.8-tests.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/salt/transport/mixins/auth.py b/salt/transport/mixins/auth.py
-index de86773750..3ca09260a0 100644
---- a/salt/transport/mixins/auth.py
-+++ b/salt/transport/mixins/auth.py
-@@ -54,7 +54,7 @@ class AESPubClientMixin:
-     @salt.ext.tornado.gen.coroutine
-     def _decode_payload(self, payload):
-         # we need to decrypt it
--        log.trace("Decoding payload: %s", payload)
-+        log.debug("Decoding payload: %s", payload)
-         if payload["enc"] == "aes":
-             self._verify_master_signature(payload)
-             try:
-diff --git a/tests/unit/utils/test_schema.py b/tests/unit/utils/test_schema.py
-index 97bce1f10b..2ff5904b87 100644
---- a/tests/unit/utils/test_schema.py
-+++ b/tests/unit/utils/test_schema.py
-@@ -835,6 +835,7 @@ class ConfigTestCase(TestCase):
-         )
- 
-     @skipIf(HAS_JSONSCHEMA is False, "The 'jsonschema' library is missing")
-+    @skipIf(True, "Broken with newer versions of jsonschema")
-     def test_hostname_config_validation(self):
-         class TestConf(schema.Schema):
-             item = schema.HostnameItem(title="Item", description="Item description")
-@@ -2060,6 +2061,7 @@ class ConfigTestCase(TestCase):
-         item = schema.NotItem(item=schema.BooleanItem())
-         self.assertEqual(item.serialize(), {"not": item.item.serialize()})
- 
-+    @skipIf(True, "Broken with newer versions of jsonschema")
-     @skipIf(HAS_JSONSCHEMA is False, "The 'jsonschema' library is missing")
-     def test_not_config_validation(self):
-         class TestConf(schema.Schema):
diff --git a/app-admin/salt/files/salt-3003.3-tests.patch b/app-admin/salt/files/salt-3003.3-tests.patch
deleted file mode 100644
index 049d8c164c55..000000000000
--- a/app-admin/salt/files/salt-3003.3-tests.patch
+++ /dev/null
@@ -1,233 +0,0 @@
-diff --git a/salt/transport/ipc.py b/salt/transport/ipc.py
-index 29210d7522..4fd648116f 100644
---- a/salt/transport/ipc.py
-+++ b/salt/transport/ipc.py
-@@ -2,7 +2,6 @@
- IPC transport classes
- """
- 
--
- import errno
- import logging
- import socket
-@@ -20,6 +19,7 @@ from salt.ext.tornado.ioloop import IOLoop
- from salt.ext.tornado.ioloop import TimeoutError as TornadoTimeoutError
- from salt.ext.tornado.iostream import IOStream, StreamClosedError
- from salt.ext.tornado.locks import Lock
-+import tornado.iostream
- 
- log = logging.getLogger(__name__)
- 
-@@ -693,11 +693,11 @@ class IPCMessageSubscriber(IPCClient):
-                 if not first_sync_msg:
-                     # We read at least one piece of data and we're on sync run
-                     break
--        except TornadoTimeoutError:
-+        except TornadoTimeoutError if isinstance(TornadoTimeoutError, BaseException) else (salt.ext.tornado.ioloop.TimeoutError):
-             # In the timeout case, just return None.
-             # Keep 'self._read_stream_future' alive.
-             ret = None
--        except StreamClosedError as exc:
-+        except StreamClosedError if isinstance(StreamClosedError, BaseException) else (tornado.iostream.StreamClosedError) as exc:
-             log.trace("Subscriber disconnected from IPC %s", self.socket_path)
-             self._read_stream_future = None
-         except Exception as exc:  # pylint: disable=broad-except
-diff --git a/tests/integration/grains/test_core.py b/tests/integration/grains/test_core.py
-index 5f1cf11e24..8affb398ff 100644
---- a/tests/integration/grains/test_core.py
-+++ b/tests/integration/grains/test_core.py
-@@ -21,6 +21,7 @@ def _freebsd_or_openbsd():
-     return salt.utils.platform.is_freebsd() or salt.utils.platform.is_openbsd()
- 
- 
-+@pytest.mark.skip("Tests only should run on FreeBSD and OpenBSD")
- @pytest.mark.windows_whitelisted
- class TestGrainsCore(ModuleCase):
-     """
-diff --git a/tests/integration/states/test_x509.py b/tests/integration/states/test_x509.py
-index 2321689ef5..574de51e56 100644
---- a/tests/integration/states/test_x509.py
-+++ b/tests/integration/states/test_x509.py
-@@ -468,7 +468,7 @@ c9bcgp7D7xD+TxWWNj4CSXEccJgGr91StV+gFg4ARQ==
-             first_run[key]["changes"]["Certificate"]["New"]["Not After"],
-             "%Y-%m-%d %H:%M:%S",
-         )
--        self.assertEqual(29, (expiry - datetime.datetime.now()).days)
-+        self.assertEqual(30, (expiry - datetime.datetime.now()).days)
-         self.assertTrue(os.path.exists(crtfile), "Certificate was not created.")
- 
-         with salt.utils.files.fopen(crtfile, "r") as first_cert:
-@@ -485,14 +485,14 @@ c9bcgp7D7xD+TxWWNj4CSXEccJgGr91StV+gFg4ARQ==
-             },
-         )
-         self.assertEqual(
--            "Certificate needs renewal: 29 days remaining but it needs to be at least 90",
-+            "Certificate needs renewal: 30 days remaining but it needs to be at least 90",
-             second_run[key]["changes"]["Status"]["Old"],
-         )
-         expiry = datetime.datetime.strptime(
-             second_run[key]["changes"]["Certificate"]["New"]["Not After"],
-             "%Y-%m-%d %H:%M:%S",
-         )
--        self.assertEqual(179, (expiry - datetime.datetime.now()).days)
-+        self.assertEqual(180, (expiry - datetime.datetime.now()).days)
-         with salt.utils.files.fopen(crtfile, "r") as second_cert:
-             self.assertNotEqual(
-                 cert_contents,
-diff --git a/tests/pytests/functional/modules/state/requisites/test_listen.py b/tests/pytests/functional/modules/state/requisites/test_listen.py
-index b7a90d0ca0..26030f403b 100644
---- a/tests/pytests/functional/modules/state/requisites/test_listen.py
-+++ b/tests/pytests/functional/modules/state/requisites/test_listen.py
-@@ -292,43 +292,3 @@ def test_listen_requisite_resolution_names(state, state_tree):
-         assert "test_|-listener_service_|-nginx_|-mod_watch" in ret
-         assert "test_|-listener_service_|-crond_|-mod_watch" in ret
- 
--
--def test_onlyif_req(state, subtests):
--    onlyif = [{}]
--    state_id = "test_|-onlyif test_|-onlyif test_|-succeed_with_changes"
--    with subtests.test(onlyif=onlyif):
--        ret = state.single(
--            name="onlyif test", fun="test.succeed_with_changes", onlyif=onlyif
--        )
--        assert ret[state_id]["result"] is True
--        assert ret[state_id]["comment"] == "Success!"
--
--    onlyif = [{"fun": "test.true"}]
--    state_id = "test_|-onlyif test_|-onlyif test_|-succeed_without_changes"
--    with subtests.test(onlyif=onlyif):
--        ret = state.single(
--            name="onlyif test", fun="test.succeed_without_changes", onlyif=onlyif
--        )
--        assert ret[state_id]["result"] is True
--        assert not ret[state_id]["changes"]
--        assert ret[state_id]["comment"] == "Success!"
--
--    onlyif = [{"fun": "test.false"}]
--    state_id = "test_|-onlyif test_|-onlyif test_|-fail_with_changes"
--    with subtests.test(onlyif=onlyif):
--        ret = state.single(
--            name="onlyif test", fun="test.fail_with_changes", onlyif=onlyif
--        )
--        assert ret[state_id]["result"] is True
--        assert not ret[state_id]["changes"]
--        assert ret[state_id]["comment"] == "onlyif condition is false"
--
--    onlyif = [{"fun": "test.true"}]
--    state_id = "test_|-onlyif test_|-onlyif test_|-fail_with_changes"
--    with subtests.test(onlyif=onlyif):
--        ret = state.single(
--            name="onlyif test", fun="test.fail_with_changes", onlyif=onlyif
--        )
--        assert ret[state_id]["result"] is False
--        assert ret[state_id]["changes"]
--        assert ret[state_id]["comment"] == "Failure!"
-diff --git a/tests/pytests/unit/modules/test_cmdmod.py b/tests/pytests/unit/modules/test_cmdmod.py
-index 5424514160..0564b59593 100644
---- a/tests/pytests/unit/modules/test_cmdmod.py
-+++ b/tests/pytests/unit/modules/test_cmdmod.py
-@@ -438,6 +438,7 @@ def test_run_cwd_doesnt_exist_issue_7154():
- 
- @pytest.mark.skip_on_darwin
- @pytest.mark.skip_on_windows
-+@pytest.mark.skip("does not work in sandbox environment")
- def test_run_cwd_in_combination_with_runas():
-     """
-     cmd.run executes command in the cwd directory
-diff --git a/tests/unit/ext/test_ipaddress.py b/tests/unit/ext/test_ipaddress.py
-index 3b91757a03..5fa0f88e78 100644
---- a/tests/unit/ext/test_ipaddress.py
-+++ b/tests/unit/ext/test_ipaddress.py
-@@ -2707,6 +2707,7 @@ class IpaddrUnitTest(TestCase):
-             "2001:658:22a:cafe:200::1/::ffff:ffff:ffff:ffff",
-         )
- 
-+    @pytest.mark.skip("_cache no longer present in python3.8+")
-     def testNetworkElementCaching(self):
-         # V4 - make sure we're empty
-         self.assertNotIn("broadcast_address", self.ipv4_network._cache)
-diff --git a/tests/unit/modules/test_boto_route53.py b/tests/unit/modules/test_boto_route53.py
-index e745f8f8c6..ab36a90a79 100644
---- a/tests/unit/modules/test_boto_route53.py
-+++ b/tests/unit/modules/test_boto_route53.py
-@@ -80,6 +80,7 @@ def _has_required_moto():
-     return True
- 
- 
-+@skipIf(True, "test case appears to be broken")
- @skipIf(HAS_MOTO is False, "The moto module must be installed.")
- @skipIf(
-     _has_required_moto() is False,
-diff --git a/tests/unit/utils/test_parsers.py b/tests/unit/utils/test_parsers.py
-index 907c67f477..2429d27641 100644
---- a/tests/unit/utils/test_parsers.py
-+++ b/tests/unit/utils/test_parsers.py
-@@ -5,6 +5,7 @@
- import os
- import shutil
- import tempfile
-+import pytest
- 
- import salt.config
- import salt.log.setup as log
-@@ -983,6 +984,7 @@ class SaltRunOptionParserTestCase(ParserBase, TestCase):
-         if os.path.exists(self.log_file):
-             os.unlink(self.log_file)
- 
-+    @pytest.mark.skip("Tries to write to /var")
-     def test_jid_option(self):
-         jid = salt.utils.jid.gen_jid({})
-         args = ["--jid", jid]
-@@ -991,6 +993,7 @@ class SaltRunOptionParserTestCase(ParserBase, TestCase):
-         parser.parse_args(args)
-         assert parser.options.jid == jid
- 
-+    @pytest.mark.skip("Tries to write to /var")
-     def test_jid_option_invalid(self):
-         jid = salt.utils.jid.gen_jid({}) + "A"
-         args = ["--jid", jid]
-@@ -1041,6 +1044,7 @@ class SaltSSHOptionParserTestCase(ParserBase, TestCase):
-         if os.path.exists(self.ssh_log_file):
-             os.unlink(self.ssh_log_file)
- 
-+    @pytest.mark.skip("Tries to write to /var")
-     def test_jid_option(self):
-         jid = salt.utils.jid.gen_jid({})
-         args = ["--jid", jid] + self.args
-@@ -1049,6 +1053,7 @@ class SaltSSHOptionParserTestCase(ParserBase, TestCase):
-         parser.parse_args(args)
-         assert parser.options.jid == jid
- 
-+    @pytest.mark.skip("Tries to write to /var")
-     def test_jid_option_invalid(self):
-         jid = salt.utils.jid.gen_jid({}) + "A"
-         args = ["--jid", jid] + self.args
-diff --git a/tests/unit/utils/test_vt.py b/tests/unit/utils/test_vt.py
-index bf7a323e26..3c8ce3a128 100644
---- a/tests/unit/utils/test_vt.py
-+++ b/tests/unit/utils/test_vt.py
-@@ -17,6 +17,8 @@ import subprocess
- import sys
- import time
- 
-+import pytest
-+
- import salt.utils
- import salt.utils.files
- import salt.utils.platform
-@@ -275,6 +277,7 @@ class VTTestCase(TestCase):
-         salt.utils.platform.is_windows(), "Skip VT tests on windows, due to issue 54290"
-     )
-     @fixStdOutErrFileNoIfNeeded
-+    @pytest.mark.skip("Does not work in sandbox environment")
-     def test_split_multibyte_characters_unicode(self):
-         """
-             Tests that the vt correctly handles multibyte characters that are
-@@ -342,6 +345,7 @@ class VTTestCase(TestCase):
-         salt.utils.platform.is_windows(), "Skip VT tests on windows, due to issue 54290"
-     )
-     @fixStdOutErrFileNoIfNeeded
-+    @pytest.mark.skip("Does not work in sandbox environment")
-     def test_split_multibyte_characters_shiftjis(self):
-         """
-             Tests that the vt correctly handles multibyte characters that are
diff --git a/app-admin/salt/files/salt-3003.4-relax-pyzmq-dep.patch b/app-admin/salt/files/salt-3003.4-relax-pyzmq-dep.patch
deleted file mode 100644
index 7585af58ab11..000000000000
--- a/app-admin/salt/files/salt-3003.4-relax-pyzmq-dep.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/requirements/zeromq.txt b/requirements/zeromq.txt
-index 35d9014713..ffa1589043 100644
---- a/requirements/zeromq.txt
-+++ b/requirements/zeromq.txt
-@@ -1,6 +1,4 @@
- -r base.txt
- -r crypto.txt
- 
--pyzmq<=20.0.0 ; python_version < "3.6"
--pyzmq>=17.0.0 ; python_version < "3.9"
--pyzmq>=19.0.2 ; python_version >= "3.9"
-+pyzmq
diff --git a/app-admin/salt/files/salt-3003.4-tests.patch b/app-admin/salt/files/salt-3003.4-tests.patch
deleted file mode 100644
index 93fd4214021b..000000000000
--- a/app-admin/salt/files/salt-3003.4-tests.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff --git a/tests/conftest.py b/tests/conftest.py
-index 0fc1844bc8..32346da1f6 100644
---- a/tests/conftest.py
-+++ b/tests/conftest.py
-@@ -34,7 +34,6 @@ import salt.utils.files
- import salt.utils.path
- import salt.utils.platform
- import salt.utils.win_functions
--import saltfactories.utils.compat
- from salt.serializers import yaml
- from salt.utils.immutabletypes import freeze
- from tests.support.helpers import (
-@@ -465,9 +464,7 @@ def pytest_runtest_setup(item):
-         item._skipped_by_mark = True
-         pytest.skip(PRE_PYTEST_SKIP_REASON)
- 
--    if saltfactories.utils.compat.has_unittest_attr(
--        item, "__slow_test__"
--    ) or item.get_closest_marker("slow_test"):
-+    if item.get_closest_marker("slow_test"):
-         if item.config.getoption("--run-slow") is False:
-             item._skipped_by_mark = True
-             pytest.skip("Slow tests are disabled!")
-diff --git a/tests/unit/utils/test_schema.py b/tests/unit/utils/test_schema.py
-index ef7acdb7a3..22953556cb 100644
---- a/tests/unit/utils/test_schema.py
-+++ b/tests/unit/utils/test_schema.py
-@@ -1,6 +1,8 @@
- # pylint: disable=function-redefined
- import copy
- 
-+import pytest
-+
- import salt.utils.json
- import salt.utils.schema as schema
- import salt.utils.stringutils
-@@ -822,6 +824,7 @@ class ConfigTestCase(TestCase):
-             },
-         )
- 
-+    @pytest.mark.skip("broken with newer versions of jsonschema")
-     @skipIf(HAS_JSONSCHEMA is False, "The 'jsonschema' library is missing")
-     def test_hostname_config_validation(self):
-         class TestConf(schema.Schema):
-@@ -2048,6 +2051,7 @@ class ConfigTestCase(TestCase):
-         item = schema.NotItem(item=schema.BooleanItem())
-         self.assertEqual(item.serialize(), {"not": item.item.serialize()})
- 
-+    @pytest.mark.skip("broken with newer versions of jsonschema")
-     @skipIf(HAS_JSONSCHEMA is False, "The 'jsonschema' library is missing")
-     def test_not_config_validation(self):
-         class TestConf(schema.Schema):
diff --git a/app-admin/salt/salt-3002.9-r1.ebuild b/app-admin/salt/salt-3002.9-r1.ebuild
deleted file mode 100644
index 57cc741d1ea3..000000000000
--- a/app-admin/salt/salt-3002.9-r1.ebuild
+++ /dev/null
@@ -1,188 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8..9} )
-
-inherit systemd distutils-r1
-
-DESCRIPTION="Salt is a remote execution and configuration manager"
-HOMEPAGE="https://www.saltstack.com/resources/community/
-	https://github.com/saltstack"
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/${PN}stack/${PN}.git"
-	EGIT_BRANCH="develop"
-	SRC_URI=""
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="cheetah cherrypy ldap libcloud libvirt genshi gnupg keyring mako
-	mongodb neutron	nova openssl portage profile redis selinux test raet
-	+zeromq vim-syntax"
-
-RDEPEND="
-	sys-apps/pciutils
-	>=dev-python/distro-1.5[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/libnacl[${PYTHON_USEDEP}]
-	>=dev-python/msgpack-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/pycryptodome-3.9.8[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/markupsafe[${PYTHON_USEDEP}]
-	>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/tomli[${PYTHON_USEDEP}]
-	dev-python/watchdog[${PYTHON_USEDEP}]
-	libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] )
-	mako? ( dev-python/mako[${PYTHON_USEDEP}] )
-	ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
-	<dev-python/importlib_metadata-5[${PYTHON_USEDEP}]
-	libvirt? (
-		dev-python/libvirt-python[${PYTHON_USEDEP}]
-	)
-	openssl? (
-		dev-libs/openssl:0=[-bindist(-)]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-	)
-	raet? (
-		>=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}]
-		>=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}]
-		>=dev-python/raet-0.6.0[${PYTHON_USEDEP}]
-	)
-	cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] )
-	cheetah? ( dev-python/cheetah3[${PYTHON_USEDEP}] )
-	genshi? ( dev-python/genshi[${PYTHON_USEDEP}] )
-	mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
-	portage? ( sys-apps/portage[${PYTHON_USEDEP}] )
-	keyring? ( dev-python/keyring[${PYTHON_USEDEP}] )
-	redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
-	selinux? ( sec-policy/selinux-salt )
-	nova? (
-		>=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}]
-	)
-	neutron? (
-		>=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}]
-	)
-	gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )
-	profile? ( dev-python/yappi[${PYTHON_USEDEP}] )
-	vim-syntax? ( app-vim/salt-vim )
-	zeromq? ( >=dev-python/pyzmq-19.0.0[${PYTHON_USEDEP}] )
-"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		>=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
-		>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
-		>=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}]
-		dev-python/mako[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/moto-0.3.6[${PYTHON_USEDEP}]
-		dev-python/pip[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}]
-		>=dev-python/pytest-salt-factories-0.93.0[${PYTHON_USEDEP}]
-		dev-python/pytest-tempdir[${PYTHON_USEDEP}]
-		>=dev-python/virtualenv-20.0.20[${PYTHON_USEDEP}]
-		net-dns/bind-tools
-		!x86? ( >=dev-python/boto3-1.3.15[${PYTHON_USEDEP}] )
-	)"
-
-DOCS=( README.rst AUTHORS )
-
-REQUIRED_USE="
-	|| ( raet zeromq )
-	test? ( cheetah genshi )
-"
-RESTRICT="!test? ( test ) x86? ( test )"
-
-PATCHES=(
-	"${FILESDIR}/salt-2019.2.0-skip-tests-that-oom-machine.patch"
-	"${FILESDIR}/salt-3002-dont-realpath-on-tmpdir.patch"
-	"${FILESDIR}/salt-3002-tests.patch"
-	"${FILESDIR}/salt-3002.5-tests.patch"
-	"${FILESDIR}/salt-3002.7-tests.patch"
-	"${FILESDIR}/salt-3004.2-jinja-3.patch"
-	"${FILESDIR}/salt-3002.8-tests.patch"
-	"${FILESDIR}/salt-3002.8-relax-pyzmq-dep.patch"
-)
-
-python_prepare_all() {
-	# remove tests with external dependencies that may not be available, and
-	# tests that don't work in sandbox
-	rm tests/unit/{test_{zypp_plugins,module_names},utils/test_{extend,cache}}.py || die
-	rm tests/unit/modules/test_{file,boto_{vpc,secgroup,elb}}.py || die
-	rm tests/unit/states/test_boto_vpc.py || die
-	rm tests/support/gitfs.py tests/unit/runners/test_git_pillar.py || die
-	rm salt/utils/virtualbox.py || die
-
-	# tests that require network access
-	rm tests/unit/{states,modules}/test_zcbuildout.py || die
-
-	sed -i 's:log.trace(:log.debug(:' \
-		salt/fileserver/roots.py salt/grains/core.py salt/states/saltmod.py || die
-
-	# make sure pkg_resources doesn't bomb because pycrypto isn't installed
-	# make sure pkg_resources doesn't bomb because pycrypto isn't installed
-	find "${S}" -name '*.txt' -print0 | xargs -0 sed -e '/pycrypto>/ d ; /pycryptodomex/ d' -i || die
-	# pycryptodome rather than pycryptodomex
-	find "${S}" -name '*.py' -print0 | xargs -0 -- sed -i -e 's:Cryptodome:Crypto:g' -- || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_prepare() {
-	einfo "Fixing collections.abc warnings for ${EPYTHON}"
-	local abc
-	abc="$("${EPYTHON}" -c 'import collections.abc; print("|".join((c for c in dir(collections.abc) if not c.startswith("_"))))')" || die
-	find -name '*.py' -type f -print0 | xargs -0 sed -r -e "s:collections\\.(${abc}):collections.abc.\\1:g" -i || die
-}
-
-python_install_all() {
-	local svc
-	USE_SETUPTOOLS=1 distutils-r1_python_install_all
-
-	for svc in minion master syndic api; do
-		newinitd "${FILESDIR}"/${svc}-initd-5 salt-${svc}
-		newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc}
-		systemd_dounit "${FILESDIR}"/salt-${svc}.service
-	done
-
-	insinto /etc/${PN}
-	doins -r conf/*
-}
-
-python_test() {
-	local tempdir
-	# testsuite likes lots of files
-	ulimit -n 3072 || die
-
-	# ${T} is too long a path for the tests to work
-	tempdir="$(mktemp -du --tmpdir=/tmp salt-XXX)"
-	mkdir "${T}/$(basename "${tempdir}")"
-
-	(
-		cleanup() { rm -f "${tempdir}" || die; }
-
-		trap cleanup EXIT
-
-		addwrite "${tempdir}"
-		ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}" || die
-
-		USE_SETUPTOOLS=1 NO_INTERNET=1 SHELL="/bin/bash" \
-			TMPDIR="${tempdir}" \
-			${EPYTHON} tests/runtests.py \
-			--unit-tests --no-report --verbose \
-			|| die "testing failed with ${EPYTHON}"
-	)
-}
-
-pkg_postinst() {
-	:
-}
diff --git a/app-admin/salt/salt-3003.5-r2.ebuild b/app-admin/salt/salt-3003.5-r2.ebuild
deleted file mode 100644
index 32ca2ccd2aae..000000000000
--- a/app-admin/salt/salt-3003.5-r2.ebuild
+++ /dev/null
@@ -1,197 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8..9} )
-
-inherit systemd distutils-r1
-
-DESCRIPTION="Salt is a remote execution and configuration manager"
-HOMEPAGE="https://www.saltstack.com/resources/community/
-	https://github.com/saltstack"
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/${PN}stack/${PN}.git"
-	EGIT_BRANCH="develop"
-	SRC_URI=""
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="cheetah cherrypy ldap libcloud libvirt genshi gnupg keyring mako
-	mongodb neutron	nova openssl portage profile redis selinux test raet
-	+zeromq vim-syntax"
-
-RDEPEND="
-	sys-apps/pciutils
-	>=dev-python/distro-1.5[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/libnacl[${PYTHON_USEDEP}]
-	>=dev-python/msgpack-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/pycryptodome-3.9.8[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/markupsafe[${PYTHON_USEDEP}]
-	>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/tomli[${PYTHON_USEDEP}]
-	dev-python/watchdog[${PYTHON_USEDEP}]
-	libcloud? ( >=dev-python/libcloud-2.5.0[${PYTHON_USEDEP}] )
-	mako? ( dev-python/mako[${PYTHON_USEDEP}] )
-	ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
-	<dev-python/importlib_metadata-5[${PYTHON_USEDEP}]
-	libvirt? (
-		dev-python/libvirt-python[${PYTHON_USEDEP}]
-	)
-	openssl? (
-		dev-libs/openssl:0=[-bindist(-)]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-	)
-	raet? (
-		>=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}]
-		>=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}]
-		>=dev-python/raet-0.6.0[${PYTHON_USEDEP}]
-	)
-	cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] )
-	cheetah? ( dev-python/cheetah3[${PYTHON_USEDEP}] )
-	genshi? ( dev-python/genshi[${PYTHON_USEDEP}] )
-	mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
-	portage? ( sys-apps/portage[${PYTHON_USEDEP}] )
-	keyring? ( dev-python/keyring[${PYTHON_USEDEP}] )
-	redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
-	selinux? ( sec-policy/selinux-salt )
-	nova? (
-		>=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}]
-	)
-	neutron? (
-		>=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}]
-	)
-	gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )
-	profile? ( dev-python/yappi[${PYTHON_USEDEP}] )
-	vim-syntax? ( app-vim/salt-vim )
-	zeromq? ( >=dev-python/pyzmq-19.1.0[${PYTHON_USEDEP}] )
-"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		>=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
-		>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
-		dev-python/mako[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/moto-1.3.14[${PYTHON_USEDEP}]
-		dev-python/pip[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		=dev-python/pytest-salt-factories-0.121*[${PYTHON_USEDEP}]
-		dev-python/pytest-tempdir[${PYTHON_USEDEP}]
-		dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}]
-		dev-python/pytest-subtests[${PYTHON_USEDEP}]
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/libcloud[${PYTHON_USEDEP}]
-		net-dns/bind-tools
-		>=dev-python/virtualenv-20.0.20[${PYTHON_USEDEP}]
-		!x86? ( >=dev-python/boto3-1.19.63[${PYTHON_USEDEP}] )
-	)"
-
-DOCS=( README.rst AUTHORS )
-
-REQUIRED_USE="|| ( raet zeromq )
-	test? ( cheetah genshi )"
-RESTRICT="!test? ( test ) x86? ( test )"
-
-# tests currently broken
-RESTRICT+=" test"
-
-PATCHES=(
-	"${FILESDIR}/salt-3003-skip-tests-that-oom-machine.patch"
-	"${FILESDIR}/salt-3003-gentoolkit-revdep.patch"
-	"${FILESDIR}/salt-3002-tests.patch"
-	"${FILESDIR}/salt-3003.3-tests.patch"
-	"${FILESDIR}/salt-3003.1-tests.patch"
-	"${FILESDIR}/salt-3004.2-jinja-3.patch"
-	"${FILESDIR}/salt-3003.4-tests.patch"
-	"${FILESDIR}/salt-3003.4-relax-pyzmq-dep.patch"
-	"${FILESDIR}/salt-3004.2-pyzmq-23.patch"
-)
-
-python_prepare_all() {
-	# remove tests with external dependencies that may not be available, and
-	# tests that don't work in sandbox
-	rm tests/unit/{test_{zypp_plugins,module_names},utils/test_extend}.py || die
-	rm tests/unit/modules/test_{file,boto_{vpc,secgroup,elb}}.py || die
-	rm tests/unit/states/test_boto_vpc.py || die
-	rm tests/support/gitfs.py tests/unit/runners/test_git_pillar.py || die
-	rm tests/pytests/functional/transport/server/test_req_channel.py || die
-
-	# tests that require network access
-	rm tests/unit/{states,modules}/test_zcbuildout.py || die
-	rm -r tests/integration/cloud || die
-	rm -r tests/kitchen/tests/wordpress/tests || die
-	rm tests/kitchen/test_kitchen.py || die
-	rm tests/unit/modules/test_network.py || die
-
-	# tests require root access
-	rm tests/integration/pillar/test_git_pillar.py || die
-	rm tests/integration/states/test_supervisord.py || die
-	rm tests/pytests/unit/client/test_ssh.py || die
-
-	# make sure pkg_resources doesn't bomb because pycrypto isn't installed
-	find "${S}" -name '*.txt' -print0 | xargs -0 sed -e '/pycrypto>/ d ; /pycryptodomex/ d' -i || die
-	# pycryptodome rather than pycryptodomex
-	find "${S}" -name '*.py' -print0 | xargs -0 -- sed -i -e 's:Cryptodome:Crypto:g' -- || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_prepare() {
-	einfo "Fixing collections.abc warnings for ${EPYTHON}"
-	local abc
-	abc="$("${EPYTHON}" -c 'import collections.abc; print("|".join((c for c in dir(collections.abc) if not c.startswith("_"))))')" || die
-	find -name '*.py' -type f -print0 | xargs -0 sed -r -e "s:collections\\.(${abc}):collections.abc.\\1:g" -i || die
-
-	# removes contextvars, see bug: https://bugs.gentoo.org/799431
-	sed -i '/^contextvars/d' requirements/base.txt || die
-}
-
-python_install_all() {
-	local svc
-	USE_SETUPTOOLS=1 distutils-r1_python_install_all
-
-	for svc in minion master syndic api; do
-		newinitd "${FILESDIR}"/${svc}-initd-5 salt-${svc}
-		newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc}
-		systemd_dounit "${FILESDIR}"/salt-${svc}.service
-	done
-
-	insinto /etc/${PN}
-	doins -r conf/*
-}
-
-python_test() {
-	# testsuite likes lots of files
-	ulimit -n 4096 || die
-
-	# ${T} is too long a path for the tests to work
-	local TMPDIR
-	TMPDIR="$(mktemp --directory --tmpdir=/tmp ${PN}-XXXX)"
-	(
-		export TMPDIR
-		cleanup() { rm -rf "${TMPDIR}" || die; }
-
-		trap cleanup EXIT
-
-		addwrite "${TMPDIR}"
-
-		USE_SETUPTOOLS=1 NO_INTERNET=1 SHELL="/bin/bash" \
-			"${EPYTHON}" -m pytest -vv \
-			|| die "testing failed with ${EPYTHON}"
-	)
-}
-
-pkg_postinst() {
-	:
-}
diff --git a/app-admin/salt/salt-3004.2-r2.ebuild b/app-admin/salt/salt-3004.2-r2.ebuild
index c420cc03e20f..9a0c3a5933f5 100644
--- a/app-admin/salt/salt-3004.2-r2.ebuild
+++ b/app-admin/salt/salt-3004.2-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_10 )
 
 inherit systemd distutils-r1
 
diff --git a/app-admin/salt/salt-3005-r1.ebuild b/app-admin/salt/salt-3005-r1.ebuild
index 56568c4de1e6..47d410c70d15 100644
--- a/app-admin/salt/salt-3005-r1.ebuild
+++ b/app-admin/salt/salt-3005-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_10 )
 
 inherit systemd distutils-r1
 
diff --git a/app-admin/salt/salt-3005.1.ebuild b/app-admin/salt/salt-3005.1.ebuild
index f5eeccf44bb3..68afb794ae71 100644
--- a/app-admin/salt/salt-3005.1.ebuild
+++ b/app-admin/salt/salt-3005.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_10 )
 
 DISTUTILS_USE_PEP517=setuptools
 inherit systemd distutils-r1