gentoo auto-resync : 16:08:2023 - 03:28:34

11 files changed, 385 insertions, 173 deletions

diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 3e5ab0ceb357..bb029271cdb6 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/fetchlog/Manifest b/app-admin/fetchlog/Manifest
index 393f0fea210e..57ee72ba24a6 100644
--- a/app-admin/fetchlog/Manifest
+++ b/app-admin/fetchlog/Manifest
@@ -1,5 +1,4 @@
 AUX fetchlog-1.4-fix-build-system.patch 631 BLAKE2B ebbc0d0e90c5183a2ac396ffc26356223b5b8072100a9a6dc2f7fd0c9c94287213f7f8f8749e3e54612f7c777848012f92fccfbb02295345d578dcbd974f3091 SHA512 480a30e040f56e3e1cf21172dc7f7f060fa81a8a0efb95e15a20b7762444b356547435f3eacc4cdb7a504f3049f6b05a7fab219f6cab9d3fe7901968a69c796e
 DIST fetchlog-1.4.tar.gz 32393 BLAKE2B 2741c536dfb17414ffaf90cebd9f8c7c1a1c80edb30bc726f15aa6acd610a07afb926c2566d27b30125e7f4733c1abde8eb81c68d81f609bc05328cf90755d44 SHA512 51590c0cdfa8f4a15fcb4a436375d960c25f35d84558ab46def58f83c97da30caee449eea7c62c539da786a613c2b1e51dbc223d70d56c21daad6e9faf8a51ad
-EBUILD fetchlog-1.4-r1.ebuild 900 BLAKE2B 48b41cf53fcde1a31406c75cecc7193aad803c2f8ed495e25bda0e937297a8100aa22fff11c649e8c35503a2922bd65318ac424be30aec8721e58a3a07d582d3 SHA512 66f07ba3529482e64bb3e71c9ae46ffac291aebf379c64fb988e62b89e5e4c859b2eee0988192536ce9535a45a4c676e2f22254b6a7111253c086ba597fe70a7
 EBUILD fetchlog-1.4-r2.ebuild 891 BLAKE2B fe79be0290f4fa6373a1d3051c833c84fe6b903f3658a2dc0b5cd1322463a03cde79f5b3112ba16e9190e1a3bc93db3764442d3fafcc41290f4cd1940712e714 SHA512 76823b5dd5bef171b24e2cddef141a82598e43aa3029258ff54cba79102e94bd92f2be5e877b036326f1dd556e76b9b8045d81b41861f5bc11c8c093dcb6ab39
 MISC metadata.xml 251 BLAKE2B c119f716a25eaf3897a61c2ffb6d3f03c9981141aade031b0f8878ae448b0c75f4dad96d6528db0dfcb39623eddc30cb5afeac072d316f47bf4ecfef2be95743 SHA512 8b8b0e3a412b4283748a5b0a25577fcd95c896b7bc54fa0125be1da0cd39e517ee25105516cc034e30efb421c559844579dd3c935fb7693061cdcce362a63da4
diff --git a/app-admin/fetchlog/fetchlog-1.4-r1.ebuild b/app-admin/fetchlog/fetchlog-1.4-r1.ebuild
deleted file mode 100644
index 05c06f7fa1d1..000000000000
--- a/app-admin/fetchlog/fetchlog-1.4-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Displays the last new messages of a logfile"
-HOMEPAGE="https://fetchlog.sourceforge.net/"
-SRC_URI="mirror://sourceforge/fetchlog/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86"
-IUSE="snmp"
-
-RDEPEND="
-	snmp? (
-		>=dev-perl/Net-SNMP-4.0.1-r2
-		>=net-analyzer/net-snmp-5.0.6
-	)"
-DEPEND=""
-
-PATCHES=( "${FILESDIR}"/${PN}-1.4-fix-build-system.patch )
-
-src_configure() {
-	tc-export CC
-}
-
-src_install() {
-	dobin fetchlog
-	einstalldocs
-	dodoc *cfg*
-	doman fetchlog.1
-}
-
-pkg_preinst() {
-	elog
-	elog "This utility can be used together with Nagios"
-	elog "To make use of these features you need to"
-	elog "install net-analyzer/nagios."
-	elog "This feature depends on SNMP, so make use you"
-	elog "have 'snmp' in your USE flags"
-	elog
-}
diff --git a/app-admin/mktwpol/Manifest b/app-admin/mktwpol/Manifest
index 36ac5f28fb87..893f6e493c9a 100644
--- a/app-admin/mktwpol/Manifest
+++ b/app-admin/mktwpol/Manifest
@@ -1,4 +1,3 @@
 DIST mktwpol-1.0.1.tar.gz 60491 BLAKE2B 66d7db396bbf7e5b2c4dd537ac9bcd387298ae733348b63c6d5cb6df79e9440ea751c27eccec66978371fa81a17929d25fcfbeca6787abf8b49f087b54a6468d SHA512 aa44af97533f130b89b83c6f2a8878d290770b677f6fb9fe654b033f57fcfb3d063a6a6ddf29599aa066452d75911cf8053d65b21c37e322851a10f4381cb33d
 EBUILD mktwpol-1.0.1-r1.ebuild 1809 BLAKE2B ee15e4d5a3acf4454057c71ff2e02280ec7e59c46b3bb61aee92b8855383de5f3e4fc64d315f6d538c34ba1eb9c41f387961a2a38d9a769182a018cee868d83b SHA512 eeb543df7acb291cbf47a53c55d7e3020dea578c1d2fec69d7fa48baa1ae417973615d15feb9eb16b1ee83a43ba95eb3fbff1bd87039f56f6f465c60541cf00a
-EBUILD mktwpol-1.0.1.ebuild 2234 BLAKE2B 3001ec982eae364a451a4302315ab7a3d774edcfce9d2db38c78f472a5ebe48fd90a1ddcde4660bb8032d80f4176ea3ea80684cab278c54498209974062b0111 SHA512 293252ea909b2e62c0e72bab04493313a08c8de7a6348616752a2cdf9ed3170a60663c46981e7cca0e74de368dc320c1e62e6b85caf2366ba02ab6b85333cf52
 MISC metadata.xml 1737 BLAKE2B 7987f89f5a273694583540df9701e4b0d77b6e3b9af607bda1abcb5ffae723e8c423862a9c5c45d3776c7ff543951e4ee3039dcde1ec820c0da9baee55fde8a1 SHA512 40170b03ebf1abf0eaa2fe0bb98e7489c197aa0a3aade6f7d8ef7573d8833e173c38ae583e146fc0ee391c22da3363fb29faf3db442a0d894988fe9a1bc259d8
diff --git a/app-admin/mktwpol/mktwpol-1.0.1.ebuild b/app-admin/mktwpol/mktwpol-1.0.1.ebuild
deleted file mode 100644
index d9a3ada6c1fe..000000000000
--- a/app-admin/mktwpol/mktwpol-1.0.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Bash scripts to install tripwire and generate tripwire policy files"
-HOMEPAGE="https://sourceforge.net/projects/mktwpol"
-SRC_URI="mirror://sourceforge/mktwpol/${PF}.tar.gz"
-
-LICENSE="CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-RDEPEND="app-admin/tripwire"
-
-S=${WORKDIR}/${PF}
-
-src_prepare() {
-	default
-	sed -i -e 's:/usr/local:/usr:' Makefile || die
-}
-
-pkg_preinst() {
-	# one elog message for new/first installation
-	# different elog message when updating
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog
-		elog "To facilitate a new installation and setup of tripwire:"
-		elog " - Run: \`twsetup.sh\`"
-		elog
-		elog "To update tripwire database as packages are added or deleted:"
-		elog " - Run: \`mktwpol.sh -u\`"
-		elog
-		elog "Mktwpol is packaged with multiple policy-generating rules files."
-		elog "A default \"rules file\" is installed in /etc/tripwire"
-		elog "Alternatives are available in /usr/share/doc/${PF}"
-		elog
-		elog "mktwpol.sh uses the policy-generating rules file with the"
-		elog "most recent date.  To use an alternative \"rules file\","
-		elog "copy it from /usr/share/doc/${PF} to /etc/tripwire,"
-		elog " uncompress it, and \`touch\` it."
-		elog
-		elog "Read /usr/share/doc/${PF}/README for more tips."
-		elog
-	else
-		elog
-		elog "Version bump: mktwpol policy-generating rules have changed."
-		elog "Run \`mktwpol.sh -u\` to update tripwire policy and database."
-		elog
-		elog "Alternative policy-generating rules are in /usr/share/doc/${PF}"
-		elog "To use an alternative policy-generating rules file,"
-		elog "copy it to /etc/tripwire, uncompress and \`touch\` it."
-		elog
-	  fi
-	# ewarn message if a version change from 0.x.x
-	if [[ "${REPLACING_VERSIONS:0:1}" == "0" ]] ; then
-		ewarn
-		ewarn "Mktwpol default policy-generating rules no longer sort by package."
-		ewarn
-		ewarn "   This change does not reduce the scope of system inspection!"
-		ewarn "          It only affects the tripwire report format."
-		ewarn
-		ewarn "  The previous default reporting format is still available, at"
-		ewarn "  /usr/share/doc/${PF}/mktwpol-gentoo-packages.rules*"
-		ewarn
-	fi
-}
diff --git a/app-admin/petrovich/Manifest b/app-admin/petrovich/Manifest
index d11f510252af..7209dad43d86 100644
--- a/app-admin/petrovich/Manifest
+++ b/app-admin/petrovich/Manifest
@@ -1,6 +1,5 @@
 AUX petrovich-1.0.0-gentoo.diff 1135 BLAKE2B cfb4a284f943e6e7dd97f63ff14641ef0c1c5a962926f3220640d8b76804bfb4e754a62c11988b7352b796b1646739a969690336316f657b98e831fde5804a53 SHA512 cccefe0f88bdc0c4665e38c7e9760e273c5a40dfbbff086839128f2f3556e1e9c1094c2d7380045899d02e5c56aa84280c578a91cef86776e06841a40581b3df
 AUX petrovich.conf 135 BLAKE2B 37e803f0a90805af7f2888d24ca64fb5eb25e2795ac8fb6bbd52e4cd0614b1005b5ebb8cb401054f7ff77703f957ccb41ccfa9e9fa0033e2dbddc2ee216c99b7 SHA512 eaede98ec4921e5b9dae0c79f685d71c1001eed313529ff5c20a55f956d4eb2682880aebb56717f40c090feb92eeba6060aa96ecf45b94fb764cf76993febce1
 DIST petrovich-1.0.0.tar.gz 17844 BLAKE2B 31815188d72656c0dcb4a49f7c1511213ebaf049c2f3961e6aa0ce8ba74f7705b38b414745a73b9c78f05b6e164940e6eea92a8f885b96ad1afbe0f811411734 SHA512 5f30cffffba670ee6c6b53b93427f380c389ba60ee5717cb6ac632aacbd81fba514c0843db4d8e093e164fd8cf275f280a9da5a184b27c077789f2e359b05b5d
-EBUILD petrovich-1.0.0-r1.ebuild 621 BLAKE2B 70ad5a70796983199e5fe5398abd6e7ec3589190d162b2b0d5f1c2f341dcd6a865238a3f879fe1c5bd07b26fa14c2f2531f6b1b27b6f0bfec4f3aa7aadad8940 SHA512 d5f5210399fc709679412554e9842a90846d3de8bac0abd212cdc87580fafc1f04670980709111795b067a2e48b0b96932052bbc18f29925b14360112b4c89cc
 EBUILD petrovich-1.0.0-r2.ebuild 617 BLAKE2B 32f79f08c7b3b05fbbfe3670c4a8a408c7f86f53df4558f67434b2a605c81830b4011e3dbb0d697fe6c8c4d130b7784dc4a1a7caff53c6df027a4fa438428631 SHA512 d075cf3cd671d425bb47f5be26282e35fc325903d10ed8078f12e60923d6adc261b40927637ba844fca71655de5f778257348a3813dcad9724caecf832464c91
 MISC metadata.xml 247 BLAKE2B 5e9860b832a8c0bf40fc3a0b21d9be80258b7a63f969b816aa5edb1ba3fd847759e098ae30450bff70a352c7b1f5a3472c073345bdea4aec1881699766b95e23 SHA512 f61c388c2cc592cb4c2ca6a3a9c45ccecb77b38fda1584f7cf5c0d0f30d486b9f2628f0b79d6e2dc7b3c0f52d0f6dde4ceafbc520f07a6a34ba4e06b1f366d50
diff --git a/app-admin/petrovich/petrovich-1.0.0-r1.ebuild b/app-admin/petrovich/petrovich-1.0.0-r1.ebuild
deleted file mode 100644
index f5ca36fa2d0a..000000000000
--- a/app-admin/petrovich/petrovich-1.0.0-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Filesystem Integrity Checker"
-SRC_URI="mirror://sourceforge/petrovich/${P}.tar.gz"
-HOMEPAGE="https://sourceforge.net/projects/petrovich"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
-
-RDEPEND="virtual/perl-Digest-MD5"
-
-S="${WORKDIR}/${PN}"
-
-PATCHES=( "${FILESDIR}/${P}-gentoo.diff" )
-HTML_DOCS=( CHANGES.HTML LICENSE.HTML README.HTML TODO.HTML USAGE.HTML )
-
-src_install() {
-	dosbin "${PN}.pl"
-
-	insinto /etc
-	doins "${FILESDIR}/${PN}.conf"
-
-	dodir "/var/db/${PN}"
-
-	einstalldocs
-}
diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest
index c6051a1e06fd..fc0de5fe8754 100644
--- a/app-admin/salt/Manifest
+++ b/app-admin/salt/Manifest
@@ -16,6 +16,7 @@ AUX salt-3005.1-no-entry-points.patch 428 BLAKE2B 1bcf3b070afd01c56985290051a3cb
 AUX salt-3005.1-tests.patch 2367 BLAKE2B 467af423de22b4ddeb80fef3d4682976283116698b7c2551c4710e049d8ad7749a4eb07c541a427ed540fdea6a0e4f4e63d96988bafd92974cc3b1026e27fd03 SHA512 4ba3c36be9de377848880819fc4bacf72978a12e483bea90a4e5e7524d7212b5d554302000f6c628156ec5aafbf48d662dec2764d96253be74fa202c73e7fc67
 AUX salt-3006-skip-tests-that-oom-machine.patch 749 BLAKE2B 453e9db439bb87aa949cc150bafc7b39cc69a4e7189115e69bd7571d35c5eb34eba9d80d7ebb21c62bb454bf54217af7f5f8ef366dbeecc5250c1fee1d729420 SHA512 7d68020cc52ecc51e67861ed8465104b92b0c869823501d7966ab42df60f40049e5619453c1cd5238513c5e4afd1d46b1c5e3dd50830604555abd2a111a4601f
 AUX salt-3006-tests.patch 3196 BLAKE2B e364ce99d499acef5f337cf82ab670f9693b5bb5cb6db27e4253bcebed6645c189f17579858aca31d549c5386c460a93cfb75f60cbdc715939f90c9c039cad4c SHA512 cd35cef1def946f6354665867fd79c4c8457ea87813a710d9c1ff04bf3341903dc155542e4c2d062ccb7be96147f9892b66d12f573c831b7acb86176afba63c3
+AUX salt-3006.2-tests.patch 3598 BLAKE2B 5e8f8df73e905aa1807b6bdeed2f95bd5b12623beb368123091e5f9733dc81d7564b00b308232baa0603feb047ad693581648341e72ab2d263b438d12cc6c916 SHA512 c4dde9a456adfe70ebaf0ebdc8c1dd532e41c603a148ee15720f520f8366738d4fb4e0b6b27a6164ddf4d34d1e9d398c3299aaf3945fbba97c250b38e2dcacec
 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
@@ -23,7 +24,9 @@ AUX salt-syndic.service 169 BLAKE2B 0d00f20b4663804eaa4b6a1a1b32ed87b04d1f4df6a8
 AUX syndic-confd-1 188 BLAKE2B 98f13eb627963d65df26140f348c04eb8c253d444d36ecd1f5ef344ad89901b0a5ed62c64364e90595c2d2ee2766f30802a4a86a2555bbea343ab410292359af SHA512 35fe9bf4732c8a53b47099ffe5f9468d884ec3e2671451a6d52821dde6c70c63176b29ade0d700b99aaf47557f58179f780422843346bd3aa6513d9465ec9f58
 AUX syndic-initd-5 558 BLAKE2B 5e1ea25b57f56ad7bfb8be0c845e7da9f99af03c50c31ca2031e604267c680555d0d8a3ef6299ec588770f26dad19d262c8b9403391b60fb17c6811d7946107a SHA512 6e927925cf1e4d0f901bec10499a8ecf1193b99742cfda5f94f70d0ec743902b1b89728cb2e447b8b4879a9417d0d482b813161968dc9c2b2c7944b3af14df14
 DIST salt-3005.1.tar.gz 17914349 BLAKE2B 697c2068bf119e4a19f92a86ce880fec9375c10ba549cdcdd2182cfeaacce31c7bc4c4c91e1a609906b4c5373bb5e3120e0db47ede5b45ee20942d7b2d201e64 SHA512 391f995f0129f3d7104a0eea4fd83b18aa6ecae0fd7a2c77c1154e24b0bcd52cef4b63db12597c85737bb33ddf605e0c23370cef3bf47f9ea85af5b77d74dc50
-DIST salt-3006.0.tar.gz 20377846 BLAKE2B d39a55676f6bc5f70a558684811dd6175b633ceb5b73f4e95bd0137e7a507456f2e77099c05aca082591b9bdff1948632adc9f141e2f8ad26c4bfedd98af3d15 SHA512 999e2eb362607e1a8a0636c3bfa305fb070a5df309b837975a03a0bf02d25e4678eae38e8a1a356ea857a6d81cbb68aeb9f903a55dd221c7485d2f22b309dd77
+DIST salt-3005.2.tar.gz 17935313 BLAKE2B 550853b8245351b251438ac87d775e8b39d71ddc1eee0375f4bb29c04e2aacf5905ef9ac5373d9e7ff47a1cc8d6b9ce1a2a4c3d75b5647d4047bc06a5e526664 SHA512 07e7afc732a97006557d4556d60aa1854934893d0566bf8c295d4b1c01515988a1bf2798ce228f6b37e657de8fdfff51153ad2ea8d54baa6a5c377e30794f317
+DIST salt-3006.2.tar.gz 20411634 BLAKE2B dff474017918ef3ee0031856a2739282077205d8c2589809a91e5f1c3741cb26d2bd2458734ea4d3533118c881851dfd853f4ba4f1c631e7db28e95bc1b6f7f8 SHA512 2626cb5beb1b30fc63f554f5804f0d9b7e36b7c569c5f9049e5f5ac5a413e9d99a98b3d91089683338e3d3890ec973dff80782b4e41acb291872e45084fd2546
 EBUILD salt-3005.1-r1.ebuild 7234 BLAKE2B af8c85ad4abcd00244b52a73cc67fc31505395dc11282841bec155a4ae5c24694214f9e3a173f8ae09c25de2ae06f5eefdc3fd0aa27608908a78f664e18cf408 SHA512 1d790f172358abbac38351e1b5be50fa1e646fc7cb51179af428249e8dccd6452f51f25710ab73c91e0942df8098a9b97d6f579b8934a1f0e4d194cd7ec6961d
-EBUILD salt-3006.0.ebuild 7312 BLAKE2B a665de511a32e711592c4aba15c93bcfcef831d948bd4c019deca130758288f9956495edad74d67490730657204c0705b4f389c1414ee520149b60c452511c80 SHA512 46efb3f2532e3741768cf88bdc9bdda132319f352fafbe61f6f65c7589d060f52c70860a250ac43bffa7085c9eb1c29bc6a8d56cb7a30b6a0bb9c261786dc219
+EBUILD salt-3005.2.ebuild 9382 BLAKE2B 068d7d5a8e15ebb387b9534616693c74dd89d2b8839c21a57c50bcbdf83427b44a49796805b84b45be823007c0c6ea3828a17ac47a20576286e340c4ccaf0775 SHA512 da78be3da31b32b079129bc05547890e17bb3c67d8e4ba33f84be796c83fbaf31aae838df0f8c51153bca51960dfdfa41ca6af92dc77ef32760b5dba3f901e81
+EBUILD salt-3006.2.ebuild 8539 BLAKE2B 335093f353da0d42abedf7b836c1516239390ec64fe4acf0f58d23f1d4b467446304aec086587fd9901b3007d50d86743aaf26157d7706b0b4b511f814d3e7ab SHA512 d8690757e65594d3bef93e852d61efb4c771fc3d2d441ef79dae0cd585cb93854a77ed641f9ba65bce13eaba7f46475c90dd03c591d2e0f580ef4a53bf7b1532
 MISC metadata.xml 2304 BLAKE2B 8fac51fe1b0c0dae5fe71d88f1bf84df1de8cc8b3d836b59c3b2e82bfa085f57352e3aafd999766ae69104a8bd9798f2fffdb64e1df1e0a1ca8561dba1ef7d5e SHA512 7d3706c40c27dd67509bd638cd0550bb4822f0895fef929ecad21c218cdaa0512da443c901cc2b3a8d4afd9f5e9bc461622ac3bab2a332ccd9c64c4cbf99bf74
diff --git a/app-admin/salt/files/salt-3006.2-tests.patch b/app-admin/salt/files/salt-3006.2-tests.patch
new file mode 100644
index 000000000000..abec5157df30
--- /dev/null
+++ b/app-admin/salt/files/salt-3006.2-tests.patch
@@ -0,0 +1,114 @@
+diff --git a/tests/pytests/unit/modules/dockermod/test_module.py b/tests/pytests/unit/modules/dockermod/test_module.py
+index 8fb7806497..584d416412 100644
+--- a/tests/pytests/unit/modules/dockermod/test_module.py
++++ b/tests/pytests/unit/modules/dockermod/test_module.py
+@@ -354,10 +354,6 @@ def test_update_mine():
+         mine_mock.assert_called_once()
+ 
+ 
+-@pytest.mark.skipif(
+-    docker_mod.docker.version_info < (1, 5, 0),
+-    reason="docker module must be installed to run this test or is too old. >=1.5.0",
+-)
+ def test_list_networks():
+     """
+     test list networks.
+@@ -378,10 +374,6 @@ def test_list_networks():
+     client.networks.assert_called_once_with(names=["foo"], ids=["01234"])
+ 
+ 
+-@pytest.mark.skipif(
+-    docker_mod.docker.version_info < (1, 5, 0),
+-    reason="docker module must be installed to run this test or is too old. >=1.5.0",
+-)
+ def test_create_network():
+     """
+     test create network.
+@@ -422,10 +414,6 @@ def test_create_network():
+     )
+ 
+ 
+-@pytest.mark.skipif(
+-    docker_mod.docker.version_info < (1, 5, 0),
+-    reason="docker module must be installed to run this test or is too old. >=1.5.0",
+-)
+ def test_remove_network():
+     """
+     test remove network.
+@@ -444,10 +432,6 @@ def test_remove_network():
+     client.remove_network.assert_called_once_with("foo")
+ 
+ 
+-@pytest.mark.skipif(
+-    docker_mod.docker.version_info < (1, 5, 0),
+-    reason="docker module must be installed to run this test or is too old. >=1.5.0",
+-)
+ def test_inspect_network():
+     """
+     test inspect network.
+@@ -466,10 +450,6 @@ def test_inspect_network():
+     client.inspect_network.assert_called_once_with("foo")
+ 
+ 
+-@pytest.mark.skipif(
+-    docker_mod.docker.version_info < (1, 5, 0),
+-    reason="docker module must be installed to run this test or is too old. >=1.5.0",
+-)
+ def test_connect_container_to_network():
+     """
+     test connect_container_to_network
+@@ -491,10 +471,6 @@ def test_connect_container_to_network():
+     client.connect_container_to_network.assert_called_once_with("container", "foo")
+ 
+ 
+-@pytest.mark.skipif(
+-    docker_mod.docker.version_info < (1, 5, 0),
+-    reason="docker module must be installed to run this test or is too old. >=1.5.0",
+-)
+ def test_disconnect_container_from_network():
+     """
+     test disconnect_container_from_network
+@@ -513,10 +489,6 @@ def test_disconnect_container_from_network():
+     client.disconnect_container_from_network.assert_called_once_with("container", "foo")
+ 
+ 
+-@pytest.mark.skipif(
+-    docker_mod.docker.version_info < (1, 5, 0),
+-    reason="docker module must be installed to run this test or is too old. >=1.5.0",
+-)
+ def test_list_volumes():
+     """
+     test list volumes.
+@@ -539,10 +511,6 @@ def test_list_volumes():
+     )
+ 
+ 
+-@pytest.mark.skipif(
+-    docker_mod.docker.version_info < (1, 5, 0),
+-    reason="docker module must be installed to run this test or is too old. >=1.5.0",
+-)
+ def test_create_volume():
+     """
+     test create volume.
+@@ -569,10 +537,6 @@ def test_create_volume():
+     )
+ 
+ 
+-@pytest.mark.skipif(
+-    docker_mod.docker.version_info < (1, 5, 0),
+-    reason="docker module must be installed to run this test or is too old. >=1.5.0",
+-)
+ def test_remove_volume():
+     """
+     test remove volume.
+@@ -591,10 +555,6 @@ def test_remove_volume():
+     client.remove_volume.assert_called_once_with("foo")
+ 
+ 
+-@pytest.mark.skipif(
+-    docker_mod.docker.version_info < (1, 5, 0),
+-    reason="docker module must be installed to run this test or is too old. >=1.5.0",
+-)
+ def test_inspect_volume():
+     """
+     test inspect volume.
diff --git a/app-admin/salt/salt-3005.2.ebuild b/app-admin/salt/salt-3005.2.ebuild
new file mode 100644
index 000000000000..2d5c18e2ca63
--- /dev/null
+++ b/app-admin/salt/salt-3005.2.ebuild
@@ -0,0 +1,235 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_10 )
+
+DISTUTILS_USE_PEP517=setuptools
+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"
+else
+	inherit pypi
+	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~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-3.1.2[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/libnacl[${PYTHON_USEDEP}]
+	>=dev-python/msgpack-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/psutil-5.0.0[${PYTHON_USEDEP}]
+	>=dev-python/pycryptodome-3.9.8[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-6.0.1[${PYTHON_USEDEP}]
+	>=dev-python/markupsafe-2.1.2[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.31.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/tomli[${PYTHON_USEDEP}]
+	dev-python/watchdog[${PYTHON_USEDEP}]
+	libcloud? (
+		dev-python/aiohttp[${PYTHON_USEDEP}]
+		dev-python/aiosignal[${PYTHON_USEDEP}]
+		>=dev-python/apache-libcloud-2.5.0[${PYTHON_USEDEP}]
+		dev-python/async-timeout[${PYTHON_USEDEP}]
+	)
+	mako? ( dev-python/mako[${PYTHON_USEDEP}] )
+	ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
+	libvirt? (
+		dev-python/libvirt-python[${PYTHON_USEDEP}]
+	)
+	openssl? (
+		dev-libs/openssl:0=[-bindist(-)]
+		>=dev-python/pyopenssl-23.2.0[${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-3.2.2[${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[${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/apache-libcloud[${PYTHON_USEDEP}]
+		>=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
+		>=dev-python/certifi-2023.07.22[${PYTHON_USEDEP}]
+		dev-python/cherrypy[${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-2.0.0[${PYTHON_USEDEP}]
+		dev-python/passlib[${PYTHON_USEDEP}]
+		dev-python/pip[${PYTHON_USEDEP}]
+		>=dev-python/pyopenssl-23.0.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-7.2.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-salt-factories-1.0.0_rc17[${PYTHON_USEDEP}]
+		dev-python/pytest-tempdir[${PYTHON_USEDEP}]
+		dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}]
+		dev-python/pytest-subtests[${PYTHON_USEDEP}]
+		dev-python/pytest-shell-utilities[${PYTHON_USEDEP}]
+		dev-python/pytest-skip-markers[${PYTHON_USEDEP}]
+		dev-python/pytest-system-statistics[${PYTHON_USEDEP}]
+		dev-python/flaky[${PYTHON_USEDEP}]
+		net-dns/bind-tools
+		>=dev-python/virtualenv-20.3.0[${PYTHON_USEDEP}]
+		dev-util/yamllint[${PYTHON_USEDEP}]
+		!x86? ( >=dev-python/boto3-1.17.67[${PYTHON_USEDEP}] )
+	)
+"
+
+DOCS=( README.rst AUTHORS )
+
+REQUIRED_USE="|| ( raet zeromq )
+	test? ( cheetah genshi )"
+RESTRICT="!test? ( test ) x86? ( 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.1-tests.patch"
+	"${FILESDIR}/salt-3005-tests.patch"
+	"${FILESDIR}/salt-3005.1-no-entry-points.patch"
+	"${FILESDIR}/salt-3005.1-importlib-metadata-5-r1.patch"
+	"${FILESDIR}/salt-3005.1-tests.patch"
+	"${FILESDIR}/salt-3005.1-modules-file-python-3.11-host.patch"
+	"${FILESDIR}/salt-3006.2-tests.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_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
+	rm tests/pytests/functional/utils/test_async_event_publisher.py || die
+	rm tests/pytests/functional/runners/test_winrepo.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
+	rm tests/pytests/functional/modules/test_pip.py || die
+	rm tests/pytests/unit/client/ssh/test_ssh.py || die
+	rm -r tests/pytests/{integration,functional}/netapi tests/integration/netapi || die
+
+	# tests require root access
+	rm tests/integration/pillar/test_git_pillar.py || die
+	rm tests/integration/states/test_supervisord.py || die
+
+	# removes contextvars, see bug: https://bugs.gentoo.org/799431
+	sed -i '/^contextvars/d' requirements/base.txt || 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_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 -a EPYTEST_DESELECT=(
+		# doesn't like the distutils warning
+		tests/pytests/integration/cli/test_batch.py::test_batch_retcode
+		tests/pytests/integration/cli/test_batch.py::test_multiple_modules_in_batch
+		# hangs indefinitely
+		tests/pytests/unit/test_minion.py::test_master_type_disable
+		# needs root
+		tests/pytests/unit/modules/test_cmdmod.py::test_runas_env_sudo_group
+		# don't like sandbox
+		tests/unit/cloud/clouds/test_joyent.py::JoyentTestCase::test_query_instance_has_ip
+		tests/unit/cloud/clouds/test_joyent.py::JoyentTestCase::test_query_instance_init
+		tests/unit/cloud/clouds/test_joyent.py::JoyentTestCase::test_query_instance_ready
+		tests/unit/modules/test_win_ip.py::WinShadowTestCase::test_disable
+		tests/unit/modules/test_win_ip.py::WinShadowTestCase::test_enable
+		tests/unit/netapi/rest_tornado/test_saltnado.py::TestDisbatchLocal::test_when_is_finished_is_set_before_events_return_then_no_data_should_be_returned
+		tests/unit/netapi/rest_tornado/test_saltnado.py::TestDisbatchLocal::test_when_is_finished_then_all_collected_data_should_be_returned
+		tests/unit/netapi/rest_tornado/test_saltnado.py::TestDisbatchLocal::test_when_is_timed_out_is_set_before_other_events_are_completed_then_result_should_be_empty_dictionary
+		tests/unit/netapi/rest_tornado/test_saltnado.py::TestDisbatchLocal::test_when_is_timed_out_then_all_collected_data_should_be_returned
+		tests/unit/netapi/rest_tornado/test_saltnado.py::TestDisbatchLocal::test_when_min_wait_time_has_not_passed_then_disbatch_should_not_return_expected_data_until_time_has_passed
+		tests/unit/netapi/rest_tornado/test_saltnado.py::TestDisbatchLocal::test_when_minions_all_return_then_all_collected_data_should_be_returned
+		tests/unit/utils/test_vt.py::VTTestCase::test_split_multibyte_characters_shiftjis
+		tests/unit/utils/test_vt.py::VTTestCase::test_split_multibyte_characters_unicode
+		tests/pytests/unit/utils/test_vt.py::test_log_sanitize
+		tests/pytests/unit/test_master.py::test_fileserver_duration
+		tests/pytests/unit/modules/test_aptpkg.py::test_call_apt_dpkg_lock
+		tests/unit/utils/test_schema.py::ConfigTestCase::test_anyof_config_validation
+		tests/unit/utils/test_schema.py::ConfigTestCase::test_dict_config_validation
+		tests/unit/utils/test_schema.py::ConfigTestCase::test_hostname_config_validation
+		tests/unit/utils/test_schema.py::ConfigTestCase::test_not_config_validation
+		tests/unit/utils/test_schema.py::ConfigTestCase::test_oneof_config_validation
+		tests/unit/utils/test_schema.py::ConfigTestCase::test_optional_requirements_config_validation
+	)
+
+	# 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)" || die
+	(
+		export TMPDIR
+		cleanup() { rm -rf "${TMPDIR}" || die; }
+
+		trap cleanup EXIT
+
+		addwrite "${TMPDIR}"
+
+		USE_SETUPTOOLS=1 NO_INTERNET=1 SHELL="/bin/bash" \
+			epytest
+	)
+}
diff --git a/app-admin/salt/salt-3006.0.ebuild b/app-admin/salt/salt-3006.2.ebuild
index 5e8c420c6cdc..031e12b522fb 100644
--- a/app-admin/salt/salt-3006.0.ebuild
+++ b/app-admin/salt/salt-3006.2.ebuild
@@ -30,6 +30,7 @@ IUSE="
 
 RDEPEND="
 	sys-apps/pciutils
+	>=dev-python/cryptography-41.0.3[${PYTHON_USEDEP}]
 	>=dev-python/distro-1.5[${PYTHON_USEDEP}]
 	>=dev-python/jinja-3.1.2[${PYTHON_USEDEP}]
 	dev-python/jmespath[${PYTHON_USEDEP}]
@@ -39,9 +40,9 @@ RDEPEND="
 	>=dev-python/packaging-21.3[${PYTHON_USEDEP}]
 	>=dev-python/psutil-5.0.0[${PYTHON_USEDEP}]
 	>=dev-python/pycryptodome-3.9.8[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-6.0.1[${PYTHON_USEDEP}]
 	>=dev-python/markupsafe-2.1.2[${PYTHON_USEDEP}]
-	>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.31.0[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/tomli[${PYTHON_USEDEP}]
 	dev-python/watchdog[${PYTHON_USEDEP}]
@@ -58,7 +59,7 @@ RDEPEND="
 	)
 	openssl? (
 		dev-libs/openssl:0=[-bindist(-)]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		>=dev-python/pyopenssl-23.2.0[${PYTHON_USEDEP}]
 	)
 	raet? (
 		>=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}]
@@ -90,7 +91,7 @@ BDEPEND="
 		${RDEPEND}
 		dev-python/apache-libcloud[${PYTHON_USEDEP}]
 		>=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
-		>=dev-python/certifi-2022.12.07[${PYTHON_USEDEP}]
+		>=dev-python/certifi-2023.07.22[${PYTHON_USEDEP}]
 		dev-python/cherrypy[${PYTHON_USEDEP}]
 		>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
 		dev-python/mako[${PYTHON_USEDEP}]
@@ -101,7 +102,7 @@ BDEPEND="
 		dev-python/pip[${PYTHON_USEDEP}]
 		>=dev-python/pyopenssl-23.0.0[${PYTHON_USEDEP}]
 		>=dev-python/pytest-7.2.0[${PYTHON_USEDEP}]
-		>=dev-python/pytest-salt-factories-1.0.0_rc21[${PYTHON_USEDEP}]
+		>=dev-python/pytest-salt-factories-1.0.0_rc25[${PYTHON_USEDEP}]
 		dev-python/pytest-tempdir[${PYTHON_USEDEP}]
 		dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}]
 		dev-python/pytest-subtests[${PYTHON_USEDEP}]
@@ -128,6 +129,7 @@ PATCHES=(
 	"${FILESDIR}/salt-3005.1-no-entry-points.patch"
 	"${FILESDIR}/salt-3006-skip-tests-that-oom-machine.patch"
 	"${FILESDIR}/salt-3006-tests.patch"
+	"${FILESDIR}/salt-3006.2-tests.patch"
 )
 
 python_prepare_all() {
@@ -183,31 +185,35 @@ python_install_all() {
 }
 
 python_test() {
-	# testsuite likes lots of files
-	ulimit -n 4096 || die
-
-	local -a disable_tests=(
+	local -a EPYTEST_DESELECT=(
 		# doesn't like the distutils warning
-		batch_retcode
-		multiple_modules_in_batch
+		tests/pytests/integration/cli/test_batch.py::test_batch_retcode
+		tests/pytests/integration/cli/test_batch.py::test_multiple_modules_in_batch
 		# hangs indefinitely
-		master_type_disable
+		tests/pytests/unit/test_minion.py::test_master_type_disable
 		# needs root
-		runas_env_sudo_group
+		tests/pytests/unit/modules/test_cmdmod.py::test_runas_env_sudo_group
 		# don't like sandbox
-		split_multibyte_characters_{shiftjis,unicode}
-		log_sanitize
-		run_with_pre_flight_args
-		compile_template_str_mkstemp_cleanup
-		sync_with_handlers
-		deferred_write_on_flush
-		call_apt_dpkg_lock
-		enforce_nice_config
-		config_validation
+		tests/pytests/functional/cli/test_salt.py::test_versions_report
+		tests/unit/utils/test_vt.py::test_split_multibyte_characters_unicode
+		tests/unit/utils/test_vt.py::test_split_multibyte_characters_shiftjis
+		tests/pytests/unit/utils/test_vt.py::test_log_sanitize
+		tests/pytests/unit/client/ssh/test_single.py::test_run_with_pre_flight_args
+		tests/pytests/unit/modules/test_aptpkg.py::test_call_apt_dpkg_lock
+		tests/pytests/unit/test_template.py::test_compile_template_str_mkstemp_cleanup
+		tests/pytests/unit/_logging/handlers/test_deferred_stream_handler.py::test_deferred_write_on_flush
+		tests/pytests/unit/_logging/handlers/test_deferred_stream_handler.py::test_sync_with_handlers
+		tests/pytests/unit/modules/test_portage_config.py::test_enforce_nice_config
+		tests/unit/utils/test_schema.py::ConfigTestCase::test_anyof_config_validation
+		tests/unit/utils/test_schema.py::ConfigTestCase::test_dict_config_validation
+		tests/unit/utils/test_schema.py::ConfigTestCase::test_hostname_config_validation
+		tests/unit/utils/test_schema.py::ConfigTestCase::test_not_config_validation
+		tests/unit/utils/test_schema.py::ConfigTestCase::test_oneof_config_validation
+		tests/unit/utils/test_schema.py::ConfigTestCase::test_optional_requirements_config_validation
 	)
 
-	local textexpr
-	testexpr=$(printf 'not %s and ' "${disable_tests[@]}")
+	# testsuite likes lots of files
+	ulimit -n 4096 || die
 
 	# ${T} is too long a path for the tests to work
 	local TMPDIR
@@ -221,6 +227,6 @@ python_test() {
 		addwrite "${TMPDIR}"
 
 		USE_SETUPTOOLS=1 NO_INTERNET=1 SHELL="/bin/bash" \
-			epytest  -k "${testexpr%and }" -x
+			epytest
 	)
 }