gentoo resync : 28.04.2021

11 files changed, 231 insertions, 118 deletions

diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest
index 9969988d13d0..8a6f2faae734 100644
--- a/app-admin/salt/Manifest
+++ b/app-admin/salt/Manifest
@@ -1,11 +1,8 @@
 AUX api-confd-1 179 BLAKE2B d014cadfb5dd99c85b1dee0e743f413fc5d6eb05629045bad5df108e6e96104b3b4f5e3736518baff5473c68d94906bb90cb7fe8167e136dd6603eb1087cc01c SHA512 de1d70050c2f911abb306c1b2253f2fdaac505a5ddd34937d7bef9dc9b876e9c6ed06e330a816fcafa38feaf67837235e78f2d97d149fef9fe20a29d945f8f22
-AUX api-initd-4 302 BLAKE2B 385e678ea2fe06f413e68a3812350df823318a2807805373377e747c3a82e524af114aeccab8a6e6e36b1419a3e0a6bf025749db585483906487767e76274376 SHA512 098fb6e1ba83270abd31f9cc3afdc159149276962fcf73ce0ae943df87ec26d0883990652614cdeef48912778780731f91efc972a22a75c4b10f3bd79a251a90
 AUX api-initd-5 540 BLAKE2B 11a4d14aaff3040484e9e704f68cc7562fe52694f7dc5eb6df0ab6cbac0cc4c4958c1f9cf13402a5f4f1c4361c93c44e71228a2f8f7f69b1c400a280c8934659 SHA512 81a0e3b01d95af5475f6fd12614134ca84c9d53b68648aba9b328947d6e92fae1889276d58cb3749e3e542f42dbda507d28531102549b4fc6c109e2f14146f8b
 AUX master-confd-1 188 BLAKE2B 8ac416a7ff64c73556f07a08268ea7d91547e242becd345ac35da7b64f6b2e4aba276e8920e7353bd2caeaffa3034349496b00622191793994bbd4d25faa3c3c SHA512 c58fc025a3654b59f79c6e23fe135d75ebad8b166bc5214f4842c3dd92192e3598480f9fd6960ad2dc36d3ee45ff971650c5e0156353c1c045650f86c9a68db9
-AUX master-initd-4 311 BLAKE2B 302e71b0328d47addd1508e1992ee56c719463d4b99af37b626835fefd28f9c3184e8441035f055992489b1084f1fdd45542466b359c206305e8174fef853478 SHA512 d44ea9fdf962ded6d0c6ac5a1f89ec8729a9a70517ba0f132c54696d32bc96030c64af09f48037867006bd3acdf4b6db759ca873717cd5a88701e42d06885bcc
 AUX master-initd-5 558 BLAKE2B 09a1485449b239b4f0d7e0514572084769c73b28053fc6ff9b4cbeb239358e7311784c15e883ddf5ca8310794e3d2bb851f2a765bb3aa17f8081ee008bfd130a SHA512 36b2d601d4dd3bd7b1758e77029b70916adbf8919c3ef04fd867ca25b143666d0c2f5834adddf05e7c2b013f04939f57e3396c888514e08f1679e6459a6ce7bb
 AUX minion-confd-1 188 BLAKE2B ad20094c30f9aa573397d347f9fb11acafba2f724b6c836d7ec57f10d4182c300a4b0ec572b5f3301174febdfc69c30752c3b0eabdfdf9f4963b03531db23523 SHA512 0051e13351cef8db81dc075a194bb384723f07d5591b5b4d3f3adf4180afaf7beced470ab79ceca9d1ec0dae62dbd72084eb76af009fc78411a011050a94a2ed
-AUX minion-initd-4 317 BLAKE2B 4c207bd26a72d5dded38e40f7869f46263272a841b978f138248d016a06e837c3aebebabd15314e3896b404058c3f5dd5e6a1cca48450b07b88b6edef6a8d7d2 SHA512 80790ed1b5f86b713ca6384d60253676b16b10c122810ed07b7119c3860bedfe40102f6b7de86d832f084d84f87bf9405ec282629f981767a534d2a53144845f
 AUX minion-initd-5 564 BLAKE2B 19f2d909b1a91b5cf22c932b04b794ef536c3a84fbd36676d4bf136c6af66ae4ea94abcf9657919cb4cf85ee88cc6e93df0e7373e0410823550cc45ebc8f5673 SHA512 c92165fe73157c9c3898f7c8c90e3b1626f704d4a8432237bd264463c66ba00e89a1d66e44b049703fd32ce48f771248b902e7183c4e31ee6611f938704b2583
 AUX salt-2017.7.0-dont-realpath-tmpdir.patch 834 BLAKE2B e70496f3ab18b954e7cacd29dbdee6ccbe0a07f139903360312db247926867a78513cd9022f492ce370eeafcc81bc4db545359036f8f5b0d2d64d3c5bb8aefc0 SHA512 33b69954e8112c0f76654d507df74a4cdd37e8227848f2ce0652b3ecee8b847253ccad33cada0e3dd1471c54c780dcc12d5e546c4ec43868511b95b0c7f71e17
 AUX salt-2019.2.0-skip-tests-that-oom-machine.patch 739 BLAKE2B c0e1b18c528ddcdc19e93061112d2c42aeca96f9091218e7ad6b4eadf11255079cecd6b9b9def576c663b4ba794d151db8fc32336b1c29c3da8e9c18c09582f3 SHA512 0bd8fc2ab73be8ffc9fdda65a60c7306dbfa9f76d874994ba09db7ef71678fca80c8fde5963d22b5bbbe3b933140a56f2173f4c109b47dd9e9c3c9a70062b0e3
@@ -15,26 +12,27 @@ AUX salt-3000.2-py38-abc.patch 2641 BLAKE2B 054fae62aee23528beaad9e4c9c8ac72c1f9
 AUX salt-3000.2-py38-logwarn.patch 4875 BLAKE2B f0ced7bad98983296561d223405d512077c0b70de12a8af613d4069842d3cb6167dd0da49c30fc881e985594f755ce0b063df311bbe84ae9cfc37896670aca52 SHA512 94ca1f73cbeb9d3ab93cb1c7afd4abce5318022a267342e4b348066c5508016891a3c05bd0ea867ae868794684bdc1bfd3e7779c4ea2a9cd60626d6513f8ba4e
 AUX salt-3000.2-py38.patch 1739 BLAKE2B 49591845a247f3e9fc092229950518b6ccb10035bc961a6193358a4be5b84b1e3d6fae69a5763b85966b1e115e8cf38378e2e88c66c3e10699ef47587aa3e7d7 SHA512 4a537c0e45c3287ddc71b91637b4b7f1d54e0dd4e524e91f39cabad08dda14ce5d2467c1f87bc81a098c36f0da1312b8e627189e0574d0ccecab064cba19acb9
 AUX salt-3000.2-tests.patch 587 BLAKE2B 5eb647ffd159bc56ce823c80fb384e7cd33e79c46baa3e607a772c6de1e8019c53908a2eb5111dd770b638c8088b76bee6c17f8cea9e17f3f7b8d3ab93568839 SHA512 ef6c1cd995a03d49ac2aaf65b516f0dc1ac9764e32392c67febdfd31d23ca178bb4f29a903b4d67f8792fe0fb903c03596cbfd1c1223e993189de890aa41b0c3
-AUX salt-3000.8-tests.patch 0 BLAKE2B 786a02f742015903c6c6fd852552d272912f4740e15847618a86e217f71f5419d25e1031afee585313896444934eb04b903a685b1448b755d56f701afe9be2ce SHA512 cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e
 AUX salt-3001.1-tests.patch 7149 BLAKE2B 3e5de0decdec9bc2ed1a6fcf2dd04c0c554f2b11a8bda45a797e811a332782eec9303ee8c81aca4f2fe646c392c63f151c0af6a3ef18db370914a2aa06afc485 SHA512 661f2ef797b1b338e43c33af80fbad0e2af9b22439b3bdf0ad6fda0b632961426a787dbf8e592c5a9b73c84af3a466c128eff15a519b83af2e9a74e0216ea014
 AUX salt-3001.6-tests.patch 766 BLAKE2B 979c29a00fe1d67529b204c1ce74ef8a94ed070bb17bca5404e1b8324c7e792493007056741b6fb7f519b4363c0c2191dae40eec97621457aaedac60990a9455 SHA512 b1fedcffdec0b3ee2e1195445944cad605c1558a4023f7836e23dc97b9b6adf105b6ad0ea526b93ae07a6b1917a0a355dd8d826ad87f95f0427de4a2a2153ee6
 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-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-tests.patch 5792 BLAKE2B 6a383c400bfb1f261d284844dc12bfabe4fc1741c5bc840131440ea991d64e61432f4e9ac4059d5bc8680b7752c6ceed16c474d0908b53657f15560a7c6f0e8f SHA512 fdb3eef283b62da9955cbe88d7f99f889c23147d3b60af7d49e4a54f61d158903ea77ff321764e0f3aa62b38ac7045d46d9f17ccfb2870c56b8b32baa856b6a8
 AUX salt-api.service 166 BLAKE2B 32d28ef4ef3c60942bed3fa3a01d70a9af387705844326cdf9339d7c887238a1e6817d78ffd1cb205a6397a2138c2389ea00bf53be84a17b23bea140279bf42c SHA512 bab6b8380c965bf16e23078ebe6f38d942300829d4c89ddf23b630bd57b4d371f80687d85dd9e0cc1b669f2ca882aecde1bc8d7d82382a02ed20e493d3f04702
 AUX salt-master.service 169 BLAKE2B 15e7a4f64cfa75eb8d8576a7d0b61ea0c9937c94fd2130fd6c123a82187f08b5ed533c168a7310fd94d9bd2cecf9d0ba94665c653a971ef61e5e18ffdf087a15 SHA512 87fe27fc0748f4191bd1c6883bb362c95cce8fe1f409e2679b229ddfd9de6c99438859dfa0a47b042977d659029ef56e406f1e8aa01761bff21af4784f9dd5f8
 AUX salt-minion.service 162 BLAKE2B 6f7b6b72e26d1651dbcb324b1e0cfef9f4b5a794f40566297c5bc469b351587db4d9805bed124774107efb64e6ed3e25fefa899b42a38064ee6fe26fd990ae58 SHA512 99f0a5c696e38b42b283416736a23e535ccc53095928b205914cf4b69c0df931a6752205985726527f7889b01dfece78466be28448458b15064edd04aca3e5ed
 AUX salt-syndic.service 169 BLAKE2B 0d00f20b4663804eaa4b6a1a1b32ed87b04d1f4df6a8e8e0b2a0e3d17f71e1bb53f71f6168446aaf3765692cd540217c4cdf5ab8dd9cb7032801aa798d8a9bc3 SHA512 b45509a22a18f573726a868fda1591eaf42ef44220960dda698274ba8ff1db8cdc302605133ab61b188e15017ba15c5f409f3ee64e026b635ac359eea7aad7d0
 AUX syndic-confd-1 188 BLAKE2B 98f13eb627963d65df26140f348c04eb8c253d444d36ecd1f5ef344ad89901b0a5ed62c64364e90595c2d2ee2766f30802a4a86a2555bbea343ab410292359af SHA512 35fe9bf4732c8a53b47099ffe5f9468d884ec3e2671451a6d52821dde6c70c63176b29ade0d700b99aaf47557f58179f780422843346bd3aa6513d9465ec9f58
-AUX syndic-initd-4 311 BLAKE2B aab3b44f65dedb30ea4eb573872c0253e4d7b438a533f22a4e887c1e6487682efce7f5b75d3bcf366ef706a9fb1578dce537ac5b50324239378cecbd0715ad5d SHA512 69cc10fa7d9f0f4a68d223272c08ee33af242a50eb9bbea919d61f6cb5baf1ce986b07d69fc0e47e2f6dffc0a11100c3bc0d836d2938c46aa364beecb47f07ef
 AUX syndic-initd-5 558 BLAKE2B 5e1ea25b57f56ad7bfb8be0c845e7da9f99af03c50c31ca2031e604267c680555d0d8a3ef6299ec588770f26dad19d262c8b9403391b60fb17c6811d7946107a SHA512 6e927925cf1e4d0f901bec10499a8ecf1193b99742cfda5f94f70d0ec743902b1b89728cb2e447b8b4879a9417d0d482b813161968dc9c2b2c7944b3af14df14
 DIST salt-3000.2-py38-misc.patch.gz 6250 BLAKE2B 68fff80a042e6bf208ea2d9692da7a7b1e29572f1ec3c850c14743bbf2821d231f933ec4e6d6eaad12acee0b7666888a37a72872b2b082c92d8db9de988fbbec SHA512 6d4a66323a423e630f7cc73b566ed96c452c8fc3d72c25a2dd86033c4774c1c8e8b8701e1d4ee92994d4148c398d704f419023e26d8b40c8fdd63f9d79d9d52f
-DIST salt-3000.5.tar.gz 15229450 BLAKE2B 135e9b9dcc461ac898231ce46e6a1359e6d60a43822320950bc0b83057f768dadf55320dd73df72d5bc917f324eef4661e6f75d8eb8e84aef958bd2df8924cfc SHA512 2579f65c24d22d77132057bd8cf37040d7d149624745dd68b4c44318be786580dcc34bf563f90d7de9ef5b726b2453bef4d8639bc8fbd9c5e691500520335317
 DIST salt-3000.8.tar.gz 15249139 BLAKE2B df306669ba11dd650621222ff9c69f5a6e16b6f431e9d93e6712ee95da43091bfe28416fe0d71988ed9ee70cb347755b779a356c50fa59c63c67a874ed1906f4 SHA512 a18d5bea3b3835f83d5b1e5315990d83f6c58c36df5589d5de0f8cc3a46db4c960b58032e29d56841a160b9b170cdbb81bca38dbbd72ccb5866ccc8a7da6e800
 DIST salt-3001.6.tar.gz 15736056 BLAKE2B 00e7674452e9d61c3cd487d27a3a1f3435c6b12dcc89008aa63c96814957b6ce8654f4d4d51dbce7b14027f0cee66fd2ea9602f6be18bf2f4beac11ae164f89f SHA512 e45c9cfddb64ab1c9d66b6b6b3e5ff8d9010c01307161e5013140b4362ee630cf912ab153d1afa72f56d18fc5353293b2f4b449caf8ee384d1e93204d490bf4c
 DIST salt-3002.5.tar.gz 15784880 BLAKE2B baa90bb0caea572dfbe12d92fb488ee0c4adef9a07221f394009cd43a62ffef18c57f2e7cdcfcd923807c7a3d02ce6833480f74d70250c29d311420f30514300 SHA512 dda2caa338f646ec51d2de6b0df10fbb27eceddbe8c797ae192b9ef1312d566ae71a243a3a95918fa375b125089aa29a73b1b908c5cc1b0451dccb582a4978a1
-EBUILD salt-3000.5.ebuild 6321 BLAKE2B ddaa02503b5d8301697bae784a4901348eec72152e9d91d21eff82640d3609b093aa2acd818554d96edf86921cfcdbf9cc39b3e0f9292fff919f903919a6c250 SHA512 6b405a1bd5234500907b8da8865ec0aa2583efe7700fb3f09776297a4592352fe13ab199ff1fd9bf50421e2f11b363b804f41823d6fbf8d993d56bf6a1d07ed6
-EBUILD salt-3000.8.ebuild 6643 BLAKE2B bdabee72e0bbcee48f471cf2d51a505913f8525f82db3a6eb0dece4f407e739863cbb5f17b0e8609285434b5c90690a8aac42b9bc66ebeddcf85d79780bbbabc SHA512 18a187909879be97b88072aba5ccfabf6e3222163142996d484934332974b762dd0f5b0ab88031c339ed992e14eeae5cdd2d88b95ea314579a9bfe683896f273
+DIST salt-3003.tar.gz 15830910 BLAKE2B ea4f02eece951c3fb4fcc480d00f7b531ac549b2e23ff9a210b73f749f9ba83e0402e02a59028f41f94958d17512e417b7c1b7015e8ee3aeac55be9b1374fe6f SHA512 7f631466372f303c03f2852a5cfba1ee5c6ba1636a6fe1e1622e90d0b1376ef9f670aa1b4754f3d9c8c7fe1b99fe1b4c49e140dc86d90d157a1ec1e73ba43c38
+EBUILD salt-3000.8.ebuild 6604 BLAKE2B 42804a4a943252ccd7572021818b9656a92d8068979539cba2ee2d2d3d213aa9de733825cde3fedb5f081875874a9b62078f35f1e14a001c098b17b9dc07047f SHA512 0ed96c86c80569ceffddc7d272c90f0e611f4bdd7f717f0893439f1a12d7e809e07cde460d3dab4605dc27822326db51ea821a00ac1a731be30eb8ff85c3ceee
 EBUILD salt-3001.6.ebuild 6227 BLAKE2B 7f121dbcfb2fda7f539a0bf26c5b48f7cde7bcaecb9ddb176f4e6c942a728a2e750ae549ce693aa150abb88a46d22774f10daeef11a5af89a0cc1391df8f3b01 SHA512 c905ec24b3ac053c38a849feb9dbb9c5d25f88c4d14f6cf31d125662d7c40d36ceb5860ee8a6bf04c84a19c379ea8bc6f7e0a1bad1d1a3ebc07601bcff27ad4f
 EBUILD salt-3002.5.ebuild 6263 BLAKE2B 1cf3e28bc9ec7df7ccc7c952468aa1cae3787ed2c5995fe93cd86c9c5310b31bedd1676f5211ca16a7d3c4820d0023eeabdae7db97cf3ffa5d69470bb94fcf56 SHA512 135061da2c87fbf120789b4ecb863233cf7abedfa7d91c37acfec6e1c689ce3aed33e4b4890d5b994ca9761d378dcc04a36b6ec2b068f5bcaf4d46fc3e532987
+EBUILD salt-3003.ebuild 6548 BLAKE2B 40748efe7afff7bd442c456825f84abee806f4e842dede8fa3d49251cafc9f927046f2b8c78e5cea4de4f60140391d0143bc722cfa7b9e574550bb2e25ab64ce SHA512 0f4b8fd85709a169d5ce810c1bd58ca4cba6f105eecaeb38dc1d3139345bed8ed71f28baecdfa2ab86add4d848a1bfea11d41ec47d3057de18a15c497e770493
 MISC metadata.xml 2361 BLAKE2B 37b7fc2f2981e2f09ecb22804831dbbeaa03d74436df5fd34d65b241330ab760b3618b3e3f497ae81e91714c1b6a4913b1305e49ef157896ef1c1e1a309cae4f SHA512 703ccabd91e0ecb08190f8349ec3588e4effe3ef295ae4e05b1d077399cc4aa52fee5f6a533ad4d29f0cfeac8221878f63fbd2e5af8604ab37ec00a68c940ef5
diff --git a/app-admin/salt/files/api-initd-4 b/app-admin/salt/files/api-initd-4
deleted file mode 100644
index a0cb8265047d..000000000000
--- a/app-admin/salt/files/api-initd-4
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-command="/usr/bin/salt-api"
-command_args="${SALT_OPTS}"
-command_background="1"
-pidfile="/var/run/salt-api.pid"
-name="SALT API daemon"
-retry="20"
-
-depend() {
-	use net logger
-}
diff --git a/app-admin/salt/files/master-initd-4 b/app-admin/salt/files/master-initd-4
deleted file mode 100644
index e07e72b0dae7..000000000000
--- a/app-admin/salt/files/master-initd-4
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-command="/usr/bin/salt-master"
-command_args="${SALT_OPTS}"
-command_background="1"
-pidfile="/var/run/salt-master.pid"
-name="SALT master daemon"
-retry="20"
-
-depend() {
-	use net logger
-}
diff --git a/app-admin/salt/files/minion-initd-4 b/app-admin/salt/files/minion-initd-4
deleted file mode 100644
index c658ccf5c1df..000000000000
--- a/app-admin/salt/files/minion-initd-4
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-command="/usr/bin/salt-minion"
-command_args="${SALT_OPTS}"
-command_background="1"
-pidfile="/var/run/salt-minion.pid"
-name="SALT minion daemon"
-retry="20"
-
-depend() {
-	need net
-	use logger
-}
diff --git a/app-admin/salt/files/salt-3000.8-tests.patch b/app-admin/salt/files/salt-3000.8-tests.patch
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/app-admin/salt/files/salt-3000.8-tests.patch
+++ /dev/null
diff --git a/app-admin/salt/files/salt-3003-gentoolkit-revdep.patch b/app-admin/salt/files/salt-3003-gentoolkit-revdep.patch
new file mode 100644
index 000000000000..f73b5a8790fd
--- /dev/null
+++ b/app-admin/salt/files/salt-3003-gentoolkit-revdep.patch
@@ -0,0 +1,13 @@
+diff --git a/salt/modules/gentoolkitmod.py b/salt/modules/gentoolkitmod.py
+index cc78c37114..f0949d19a8 100644
+--- a/salt/modules/gentoolkitmod.py
++++ b/salt/modules/gentoolkitmod.py
+@@ -49,7 +49,7 @@ def revdep_rebuild(lib=None):
+ 
+         salt '*' gentoolkit.revdep_rebuild
+     """
+-    cmd = "revdep-rebuild -i --quiet --no-progress"
++    cmd = "revdep-rebuild -i --quiet"
+     if lib is not None:
+         cmd += " --library={0}".format(lib)
+     return __salt__["cmd.retcode"](cmd, python_shell=False) == 0
diff --git a/app-admin/salt/files/salt-3003-skip-tests-that-oom-machine.patch b/app-admin/salt/files/salt-3003-skip-tests-that-oom-machine.patch
new file mode 100644
index 000000000000..804b6a8704f0
--- /dev/null
+++ b/app-admin/salt/files/salt-3003-skip-tests-that-oom-machine.patch
@@ -0,0 +1,20 @@
+diff --git a/tests/unit/modules/test_boto_apigateway.py b/tests/unit/modules/test_boto_apigateway.py
+index 6ee6aeb002..db9aeaee95 100644
+--- a/tests/unit/modules/test_boto_apigateway.py
++++ b/tests/unit/modules/test_boto_apigateway.py
+@@ -154,6 +154,7 @@ def _has_required_botocore():
+         return True
+ 
+ 
++@skipIf(True, "Causes machines to OOM")
+ class BotoApiGatewayTestCaseBase(TestCase, LoaderModuleMockMixin):
+     conn = None
+ 
+@@ -190,6 +191,7 @@ class BotoApiGatewayTestCaseBase(TestCase, LoaderModuleMockMixin):
+         self.addCleanup(delattr, self, "utils")
+ 
+ 
++@skipIf(True, "Causes machines to OOM")
+ class BotoApiGatewayTestCaseMixin:
+     def _diff_list_dicts(self, listdict1, listdict2, sortkey):
+         """
diff --git a/app-admin/salt/files/salt-3003-tests.patch b/app-admin/salt/files/salt-3003-tests.patch
new file mode 100644
index 000000000000..c3562c5a4448
--- /dev/null
+++ b/app-admin/salt/files/salt-3003-tests.patch
@@ -0,0 +1,139 @@
+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/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 4fd87d1c3f..02585a9e4e 100644
+--- a/tests/unit/ext/test_ipaddress.py
++++ b/tests/unit/ext/test_ipaddress.py
+@@ -2682,6 +2682,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/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 87fc6a342c..12d4c6a073 100644
+--- a/tests/unit/utils/test_vt.py
++++ b/tests/unit/utils/test_vt.py
+@@ -20,6 +20,8 @@ import subprocess
+ import sys
+ import time
+ 
++import pytest
++
+ # Import Salt libs
+ import salt.utils
+ import salt.utils.files
+@@ -274,6 +276,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
+@@ -341,6 +344,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/syndic-initd-4 b/app-admin/salt/files/syndic-initd-4
deleted file mode 100644
index 8908f2cfa850..000000000000
--- a/app-admin/salt/files/syndic-initd-4
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-command="/usr/bin/salt-syndic"
-command_args="${SALT_OPTS}"
-command_background="1"
-pidfile="/var/run/salt-syndic.pid"
-name="SALT syndic daemon"
-retry="20"
-
-depend() {
-	use net logger
-}
diff --git a/app-admin/salt/salt-3000.8.ebuild b/app-admin/salt/salt-3000.8.ebuild
index 5e9a9e68326a..8e8b915442da 100644
--- a/app-admin/salt/salt-3000.8.ebuild
+++ b/app-admin/salt/salt-3000.8.ebuild
@@ -117,7 +117,6 @@ PATCHES=(
 	"${WORKDIR}/salt-3000.2-py38-misc.patch"
 	"${FILESDIR}/salt-3000.2-py38-logwarn.patch"
 	"${FILESDIR}/salt-2019.2.8-ansible-roster-fix.patch"
-	"${FILESDIR}/salt-3000.8-tests.patch"
 )
 
 python_prepare_all() {
diff --git a/app-admin/salt/salt-3000.5.ebuild b/app-admin/salt/salt-3003.ebuild
index 648c82a92c41..75d913089566 100644
--- a/app-admin/salt/salt-3000.5.ebuild
+++ b/app-admin/salt/salt-3003.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
 inherit systemd distutils-r1
 
 DESCRIPTION="Salt is a remote execution and configuration manager"
@@ -16,9 +16,8 @@ if [[ ${PV} == 9999* ]]; then
 	EGIT_BRANCH="develop"
 	SRC_URI=""
 else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-		https://dev.gentoo.org/~chutzpah/dist/salt/salt-3000.2-py38-misc.patch.gz"
-	KEYWORDS="amd64 x86"
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~x86"
 fi
 
 LICENSE="Apache-2.0"
@@ -29,17 +28,18 @@ IUSE="cheetah cherrypy ldap libcloud libvirt genshi gnupg keyring mako
 
 RDEPEND="
 	sys-apps/pciutils
-	dev-python/distro[${PYTHON_USEDEP}]
+	>=dev-python/distro-1.5[${PYTHON_USEDEP}]
 	dev-python/jinja[${PYTHON_USEDEP}]
 	dev-python/libnacl[${PYTHON_USEDEP}]
-	>=dev-python/msgpack-0.5[${PYTHON_USEDEP}]
-	<dev-python/msgpack-1.0[${PYTHON_USEDEP}]
-	dev-python/pycryptodome[${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}]
-	libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] )
+	>=dev-python/toml-0.10.2[${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}] )
 	libvirt? (
@@ -77,19 +77,19 @@ BDEPEND="
 		${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/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-helpers-namespace[${PYTHON_USEDEP}]
-		>=dev-python/pytest-salt-2018.12.8[${PYTHON_USEDEP}]
+		>=dev-python/pytest-salt-factories-0.121.1[${PYTHON_USEDEP}]
 		dev-python/pytest-tempdir[${PYTHON_USEDEP}]
-		>=dev-python/SaltTesting-2016.5.11[${PYTHON_USEDEP}]
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-		!x86? ( >=dev-python/boto3-1.2.1[${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}]
+		>=dev-python/virtualenv-20.0.20[${PYTHON_USEDEP}]
+		!x86? ( >=dev-python/boto3-1.3.15[${PYTHON_USEDEP}] )
 	)"
 
 DOCS=( README.rst AUTHORS )
@@ -99,41 +99,46 @@ REQUIRED_USE="|| ( raet zeromq )
 RESTRICT="!test? ( test ) x86? ( test )"
 
 PATCHES=(
-	"${FILESDIR}/salt-2017.7.0-dont-realpath-tmpdir.patch"
-	"${FILESDIR}/salt-2019.2.0-skip-tests-that-oom-machine.patch"
-	"${FILESDIR}/salt-3000.1-tests.patch"
-	"${FILESDIR}/salt-3000.2-tests.patch"
-
-	# https://github.com/saltstack/salt/pull/55410
-	"${FILESDIR}/salt-3000.2-py38.patch"
-
-	# https://github.com/saltstack/salt/pull/55900
-	"${FILESDIR}/salt-3000.2-py38-abc.patch"
-
-	# misc py38 fixups
-	"${WORKDIR}/salt-3000.2-py38-misc.patch"
-	"${FILESDIR}/salt-3000.2-py38-logwarn.patch"
+	"${FILESDIR}/salt-3003-skip-tests-that-oom-machine.patch"
+	"${FILESDIR}/salt-3003-gentoolkit-revdep.patch"
+	"${FILESDIR}/salt-3002-tests.patch"
+	"${FILESDIR}/salt-3003-tests.patch"
 )
 
-python_prepare() {
-	# remove tests with external dependencies that may not be available
-	rm tests/unit/{test_zypp_plugins.py,utils/test_extend.py} || die
+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
 
+	# 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
 	# make sure pkg_resources doesn't bomb because pycrypto isn't installed
-	find . -name '*.txt' -print0 | xargs -0 sed -e '/pycrypto>/ d' -i || die
+	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
-
-	# allow the use of the renamed msgpack
-	sed -i '/^msgpack/d' requirements/base.txt || die
 }
 
 python_install_all() {
@@ -141,7 +146,7 @@ python_install_all() {
 	USE_SETUPTOOLS=1 distutils-r1_python_install_all
 
 	for svc in minion master syndic api; do
-		newinitd "${FILESDIR}"/${svc}-initd-4 salt-${svc}
+		newinitd "${FILESDIR}"/${svc}-initd-5 salt-${svc}
 		newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc}
 		systemd_dounit "${FILESDIR}"/salt-${svc}.service
 	done
@@ -151,26 +156,22 @@ python_install_all() {
 }
 
 python_test() {
-	local tempdir
 	# testsuite likes lots of files
-	ulimit -n 3072 || die
+	ulimit -n 4096 || die
 
 	# ${T} is too long a path for the tests to work
-	tempdir="$(mktemp -du --tmpdir=/tmp salt-XXX)"
-	mkdir "${T}/$(basename "${tempdir}")"
-
+	local TMPDIR
+	TMPDIR="$(mktemp --directory --tmpdir=/tmp ${P}-tests-XXXXX)"
 	(
-		cleanup() { rm -f "${tempdir}" || die; }
+		export TMPDIR
+		cleanup() { rm -rf "${TMPDIR}" || die; }
 
 		trap cleanup EXIT
 
-		addwrite "${tempdir}"
-		ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}" || die
+		addwrite "${TMPDIR}"
 
-		USE_SETUPTOOLS=1 SHELL="/bin/bash" \
-			TMPDIR="${tempdir}" \
-			${EPYTHON} tests/runtests.py \
-			--unit-tests --no-report --verbose \
+		USE_SETUPTOOLS=1 NO_INTERNET=1 SHELL="/bin/bash" \
+			"${EPYTHON}" -m pytest -vv \
 			|| die "testing failed with ${EPYTHON}"
 	)
 }