gentoo auto-resync : 01:04:2023 - 23:15:55

24 files changed, 64 insertions, 1127 deletions

diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 6c4284a08947..0138bf0ce078 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/fetchlog/Manifest b/app-admin/fetchlog/Manifest
index cae6270251c0..65f615ce4962 100644
--- a/app-admin/fetchlog/Manifest
+++ b/app-admin/fetchlog/Manifest
@@ -1,4 +1,5 @@
 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 898 BLAKE2B 1714dbc34feedf2d573816715af9797e341fb832a97dea0a75b9f786bdfa19bc4dfbd06a7bafaafb7643403c2bd2fd1c9813033e648580e074fcfa6a1f152406 SHA512 f24513e6d4baa6322a2c0e0c77da25fc331724b393fd9c9b9527e922f4bc647bbb6e31b5462a921f4e67f456747ed103915679fda1d9ac07501d13446d544ff9
+EBUILD fetchlog-1.4-r1.ebuild 900 BLAKE2B 48b41cf53fcde1a31406c75cecc7193aad803c2f8ed495e25bda0e937297a8100aa22fff11c649e8c35503a2922bd65318ac424be30aec8721e58a3a07d582d3 SHA512 66f07ba3529482e64bb3e71c9ae46ffac291aebf379c64fb988e62b89e5e4c859b2eee0988192536ce9535a45a4c676e2f22254b6a7111253c086ba597fe70a7
+EBUILD fetchlog-1.4-r2.ebuild 894 BLAKE2B 46fcacf205b7edd2e1e1cd38909d3fde254ed61e910d5e66933e747116e0100aca288ee663763ace87522ec58944a5f1a38b1d16a35e58385d6126fb4313aa1b SHA512 332250f0e3d6947cd011cb2b28902c8275e1ebb5844e69caf5f237d61ac6e1bc2a9a3b480674710b21b1131ae27c2577b50de3f5cdd6dfd69637507dbf6e1767
 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
index 0c118b1a4e6c..05c06f7fa1d1 100644
--- a/app-admin/fetchlog/fetchlog-1.4-r1.ebuild
+++ b/app-admin/fetchlog/fetchlog-1.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,10 +6,10 @@ EAPI=6
 inherit toolchain-funcs
 
 DESCRIPTION="Displays the last new messages of a logfile"
-HOMEPAGE="http://fetchlog.sourceforge.net/"
+HOMEPAGE="https://fetchlog.sourceforge.net/"
 SRC_URI="mirror://sourceforge/fetchlog/${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 ppc ~ppc64 x86"
 IUSE="snmp"
diff --git a/app-admin/fetchlog/fetchlog-1.4-r2.ebuild b/app-admin/fetchlog/fetchlog-1.4-r2.ebuild
new file mode 100644
index 000000000000..a7d6e064d1dd
--- /dev/null
+++ b/app-admin/fetchlog/fetchlog-1.4-r2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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
+	)"
+
+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 sure you"
+	elog "have 'snmp' in your USE flags"
+	elog
+}
diff --git a/app-admin/filewatcher/Manifest b/app-admin/filewatcher/Manifest
index 6e91f7c3471a..2b48e6a296b2 100644
--- a/app-admin/filewatcher/Manifest
+++ b/app-admin/filewatcher/Manifest
@@ -1,4 +1,4 @@
 AUX filewatcher.conf 567 BLAKE2B af300ec8d7c4017bfdff12423e409ed853ab39a7cf4cb3496a9d128de80d6d45137b3dfdead346d9777fd45a86baacd69f76e1d4157c05bd745c8e4b1872f579 SHA512 74108243a29e3993cf2c1b6bc4821907918e978a0bd7e6ca76c62172485ac94587a685c504fbb0a32a326e5537ebe00d0418f56229dc2031e3142773571ced14
 DIST filewatcher-2.4.6.tar.gz 37459 BLAKE2B 41fc1a6a289247d428cc3101eb9b437ae99d4b11c6df51c712a825cadba8ff8bc00cffa3cc4c4554565cebe596a821cac20a273453a186f2092ef93cb1752f7b SHA512 a6e1d2fb11f54352f963c21a1cbb42ceadcf3aff0ebf2b0e629d7827fada12c03531ecc9b9400afc65937830f92a0f16c54abd1cc034392351b72326943d6442
-EBUILD filewatcher-2.4.6-r1.ebuild 890 BLAKE2B e6671bd369acdf1c1c28094abd33989fe65decdd0320cff2ca1aab3fb660e5967b39ce81d8ef6a99e8aba90f5c9087a146b55ec17462c04d69b57c1c4297c88a SHA512 b0c53b07b6291277346de663325a8a88a1782ef752efe7a36a34d5d6584a0c154095ccb2ff56c3afab0711bbe866977ae40ba9c4213048f59c3e65b3361d28d4
+EBUILD filewatcher-2.4.6-r1.ebuild 888 BLAKE2B 2ba43c17fd68f5c38d6c407467592de57001b95f158efbe01ecc96ae5877fcffd90ba3a06564ed498dbfe0430fbeb1f72a059ec1ac1953d2244d87246b6ca05f SHA512 8aaf758465a376714817b4c41235d5bacc4261874812cb76b53d9d0c78f15f01ccbad03ae5d819d8c6165544dccddcd2113fbac8266a4c83441860c888e1a7a2
 MISC metadata.xml 249 BLAKE2B 5fba4adbcb6dfa8e9f15736d3bf926b49a7de6f28b93eeddd6fde5c6d622ee350eaf7debe114232e379a5bf7a2631117b797ee37b7b99e4fdf7b4f716add9083 SHA512 6aea4965d08e41035c54069894d8467d484ee4d83c9fe64b0da9c5175ec73dc10d4f9b09247f96044d5e546d78c69f4677c5f6740b79c1dffc2c4f30b96e2575
diff --git a/app-admin/filewatcher/filewatcher-2.4.6-r1.ebuild b/app-admin/filewatcher/filewatcher-2.4.6-r1.ebuild
index db9d3becf660..950b9a0df02f 100644
--- a/app-admin/filewatcher/filewatcher-2.4.6-r1.ebuild
+++ b/app-admin/filewatcher/filewatcher-2.4.6-r1.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="File control configuration system and IDS"
 HOMEPAGE="https://sourceforge.net/projects/filewatcher/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 
diff --git a/app-admin/mei-amt-check/Manifest b/app-admin/mei-amt-check/Manifest
index 1462f1b5461e..1ef70c599908 100644
--- a/app-admin/mei-amt-check/Manifest
+++ b/app-admin/mei-amt-check/Manifest
@@ -1,3 +1,3 @@
 DIST mei-amt-check-0_p20170515.tar.gz 10793 BLAKE2B 78244b1d7c31d30d4d3da8964628c867dbb1425f015ec96b595adfbdf182b8a6277556c1ddddeda62955ff6f052fdc19fc1925a15fd2f730234cdd7859423b93 SHA512 62ac6d3b2cacfc4770a076bffad1a4f8ba9233acef09b2e7bc77da545a67886b86e4076cceecd5ca8aab38c661cf8a1ddb178e7caf181b2da6171c467fbd8988
-EBUILD mei-amt-check-0_p20170515.ebuild 702 BLAKE2B 7d89739d180af45bed2e23d03101dcead722352f3231927a42761049b179ccf48c49e40e01f6e9e35fdafec0460bc5f60c1a612355305d6a64da7e475675c5e3 SHA512 875c018b4844f8df9e9335b2b5374798cb7f3f9a187ab3b2646955bddcbef28bb56f24768ed7798bd7195a632d88cfe0fd3d276a7914b42182c38855cdd5c1a6
+EBUILD mei-amt-check-0_p20170515.ebuild 705 BLAKE2B 3037380f09a6d95411385dfe92e2c59285262f1445e0974d6e1a8c1977c73c70ff94a4fef6dd1e2d5bed310f47073dbcd3a9c15c8481c3963196cbfc506c1e24 SHA512 581e1452e4db8d117cb9c5d1abe1a490ca0467e558f409b13862b24d46f06ea243e4692c0d7d58044778117f027409323116bcca75b706acd74e53623c16b026
 MISC metadata.xml 257 BLAKE2B c495f59f5998aebcfb846d539ffd06c91151827170fd1ce344f6092bc29eeea48b2a66a82fb3c220a0f10323b82d4e294500efef25604600995aac6240878a8e SHA512 260642c15d9992e651f92e52d0cefcd19faa599dc3d0c740e4c02629114891c5056629aeb089c9df8d2e9c06aa5948f99931efc9729de4bac6bd7f304a6a6d11
diff --git a/app-admin/mei-amt-check/mei-amt-check-0_p20170515.ebuild b/app-admin/mei-amt-check/mei-amt-check-0_p20170515.ebuild
index 7335bb484d59..cc63862630b8 100644
--- a/app-admin/mei-amt-check/mei-amt-check-0_p20170515.ebuild
+++ b/app-admin/mei-amt-check/mei-amt-check-0_p20170515.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit vcs-snapshot linux-info toolchain-funcs
 
@@ -10,10 +10,9 @@ HOMEPAGE="https://github.com/mjg59/mei-amt-check/"
 COMMIT="d07672120ce7a0c79e949e537f3d19efecec1700"
 SRC_URI="https://github.com/mjg59/mei-amt-check/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="|| ( BSD GPL-2 )"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 CONFIG_CHECK="~INTEL_MEI_ME"
 ERROR_INTEL_MEI_ME="Need to activate INTEL_MEI_ME to run the tool"
diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest
index 8d5eb7e6a550..c50d16b8232c 100644
--- a/app-admin/salt/Manifest
+++ b/app-admin/salt/Manifest
@@ -8,16 +8,9 @@ AUX salt-3002-tests.patch 1125 BLAKE2B 345c094c38a1b62190587062a86da4e0a516988fb
 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-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
-AUX salt-3004.2-importlib.patch 584 BLAKE2B f9ccf7a6205228dc12847d9c86b7d9e539fdbccc1e27a77fccf05622b53f58504226f2eb4aecb2a5bf95789cf72c43e86ab22cb190d62aca903b0d14373a3df0 SHA512 61b966f010445c8a594a5c618441b33e9f7feb9481972aa4c7246d977003c5605c152459eeebc0922c2d9d7e28436243f891e738856a86a88a82a7489825f52a
-AUX salt-3004.2-jinja-3.patch 589 BLAKE2B 249e81ea2760cbe75ff66bfd86cbfaab58ea673fea240bb9e787896b89645ef523c0d98305214bcce545a7372e8bc545b6ae385ca3311d71cf7bd6fd66f52c7c SHA512 6615f5824c5b53a426395bf7def9c8f54f3c753f28f3e3b23119849900f10686968cec0787d4ffa16bbbd763a19072348617165e1af6a0f87bb81e9fd8be20e6
-AUX salt-3004.2-pyzmq-23.patch 1605 BLAKE2B b0c3e9722f0ff88b586f7e9f863d246a35bc10789568e1f4c3f9728022032dc8686ba0988a35225d2d01d00198c8a00253ec33331e24d6c3a7100d4a10c576ab SHA512 57a5c5a23ec1fd450e1f24740d6cd1d4b29947de5b5d984b7a55c89791e7b7f0eef44390cd9f959210b6c27fdb325650edeb2a53b3302f925ad182ee4ac8ac1c
 AUX salt-3005-relax-pyzmq-dep.patch 332 BLAKE2B d22d94b7680fb81e642b83cb7d823137e7e208b43a1720b131401fb957bcb3deb6a0fe5ca87da528cdf60ac219820d259d0b03a905e17142c9cd4d939b4bacf1 SHA512 7c5b963436c3066bf8e8f528acf04ea8ddfa2a5a19adb9486f9888346d55e56fdfcd97a4a04db18d85476cb8ecc8a350343855d765387744706e43e868464f5e
 AUX salt-3005-tests.patch 4101 BLAKE2B 6a7d7dee4e631a7619bf1b7fa6bd08b93c0bf31342ce72f734bb645206604ffed9ae2ddae9cebe01401cbe100c224e97f18a69ede5f40a041158d1cd8878dc0f SHA512 cbc3b3d625ab8e20aa7b166dd6ddca1728c4bf562cc14d28fa684573c6ee1d42a270b0f029e5d978803a30103e7ad281d516afff66d18bf31308528fae79c00c
 AUX salt-3005.1-importlib-metadata-5-r1.patch 1162 BLAKE2B cbc8df0043881725eb00a6e45ccc03e25f95a6260b4a4b42343c69a6bd8edcf0bb45312644a8e6a66b50a0c4ce0aad7be454b1b8d54a786851b33c7d4b143e10 SHA512 7d2f8c86f22b238dabda0727c338e2e8d33e06a36fcccf5b3b508ac610899f2d6416d7c9e285e992f0d76fc9d04c126640b2b84a227f9a82f4973cb472a4a14a
-AUX salt-3005.1-importlib-metadata-5.patch 1498 BLAKE2B 20ec469e0cd53ffaffaa0f95e868f90d90030a0343705147f90738aea50aecfe0ee6610c53d6d44152ea03d4472daa286a1d1f6fb44b063038cc06f540d372b6 SHA512 22cad969c876a272316677af7436d66d7ae380b4ab2f86192f1e38d32bcb4c2c6efe7639c1f8bfff9bbb7aacdf60fef7c68a2de860e06cd3d80e73feeeb77599
 AUX salt-3005.1-modules-file-python-3.11-host.patch 4206 BLAKE2B 9cd3cb68b5c1a95475834ae917a2f6fbdbe3424c9f1e837a0e797b84e291e3530f86a2f7d2286e0070f433817ec06b2fd4d0a069b47acb1b0646653862337ece SHA512 4bc03979e1a4202d5ccb2b3159e178bc72c2a4be4297d7b9306479a5c7fe8cc81fc7d25474d80c2627e638db25e73cd4e8f7e1b25c8e15317e22986d63307823
 AUX salt-3005.1-no-entry-points.patch 428 BLAKE2B 1bcf3b070afd01c56985290051a3cb031d5ca83b42631eba5f05d7648eabf13bca44573811b767d739dc9bc6d0a5da6f99de87b57c678df79cc172fa6dd5495f SHA512 ed5712689a6d39da9c6a67f28a48d35bbd271a6a3b898cbb0e0493e1813cc99e64388fb60707e6fee95691e339336c2656278780115b39d285c380ded92fe3cb
 AUX salt-3005.1-tests.patch 2367 BLAKE2B 467af423de22b4ddeb80fef3d4682976283116698b7c2551c4710e049d8ad7749a4eb07c541a427ed540fdea6a0e4f4e63d96988bafd92974cc3b1026e27fd03 SHA512 4ba3c36be9de377848880819fc4bacf72978a12e483bea90a4e5e7524d7212b5d554302000f6c628156ec5aafbf48d662dec2764d96253be74fa202c73e7fc67
@@ -27,11 +20,6 @@ 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-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-3004.2-r2.ebuild 6525 BLAKE2B 41a9504844bd0d0666f9bbb6fc4bb460245bcc792908b7b58bfcaffd663cfa0ff98474277a463b9fc2dce4df9a142b555a32cb0640fedb43dd720c09c0d95a52 SHA512 9cfa16ff9f4f9c214e389342467ada2de70fe0ea10141cef7228b58c678a316f22932f160613acce878add5d4bef52b15f22745e69db1a898b9c85f3e8ab89e1
-EBUILD salt-3005-r1.ebuild 6973 BLAKE2B 45322d0eb4b8f62f9a177c8be25a723013c3076f8eea15b11245f9361c128537ca1347d359627f63b90f86d95ef806507eb0a1b6f3b2eb439b600b4af20a1b16 SHA512 0d0c67122ca3979bdd1f819a64a75caa148c5c0750a3b2dd024815f6c627475ad4557b284a7beaa7268ce0424502013079f72e24bbf931b47237c71ceee6e5e3
-EBUILD salt-3005.1-r1.ebuild 7221 BLAKE2B a1b5688af99c6bd7a61686fc4ce4d693da2f26968feb0b9b00285c1362326ae5de44c86d24ded0ec5bc80ac11b8f78590f9914cc826e4d0c126eb97ee8f19a84 SHA512 b231a52f12faef942177767e051e74e0f6ef1a0aaeacb6faf433a50dd9bd414d92eae6dc62102898499e659f19b97126bf523f7706a8d29b373891bb614f1ea0
-EBUILD salt-3005.1.ebuild 7207 BLAKE2B 1bd9d5b35ddc5e988da19381c157198f16a8ae08c2d920fefe51ac54ffeda5a795edc8f79abac8973dea9f29cca42d5a24cfda6363a00f6270a9f6432fc8179e SHA512 a09d8c7f4c36b53fa8bcf9b54cab5f484a0786ddbf61dd216cda0d5c3f94d8ac4b19a6ae00adfcac0c6b48a2963403f089af3f9f970efaadf5c16fa1233c1883
+EBUILD salt-3005.1-r1.ebuild 7220 BLAKE2B 5a045d17bcd6b6402a16963bf6df5875a09cbbaa70d35a8e6e730e918b040aa2905785b766379045f5a2c0c95b438fbd54d5ab256a3dc4a5ad24d7589c5cd479 SHA512 956f1ed2a31cb6962fa90cf63e37bfa4054cc7057305a7ecc957a96f6920f6360acd9b38cef32a56c85ee9117777cafb33f72ce0a6114b0bf39599e0850ed0bf
 MISC metadata.xml 2384 BLAKE2B 8ccb0cbfc8d0944e684f979731884c354655d28fd9029f8d9abae1a313734102952fb817617d54032dd5cafa64925d73ee2a3e8a38ae16d2ff9c1af8c53d514c SHA512 6a4e1b8f2e041ad1a83bf2c85c35ac30ae7db3a20aa868204661c1dde9abdfab1dff1392e2dab8a844472434b325355fea71702229de99f7751e841d063fc0da
diff --git a/app-admin/salt/files/salt-3004.1-py310.patch b/app-admin/salt/files/salt-3004.1-py310.patch
deleted file mode 100644
index 7e30d7687a66..000000000000
--- a/app-admin/salt/files/salt-3004.1-py310.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From a58bbbe058df8f45872c43a95992f6a7a7914ab9 Mon Sep 17 00:00:00 2001
-From: piterpunk <piterpunk@slackware.com>
-Date: Fri, 15 Oct 2021 11:03:20 -0300
-Subject: [PATCH] Fix _compat.py importlib logic for Python 3.10
-
-Use the same logic in _compat.py and entrypoints.py to load
-the same importlib.metadata. Python's built in implementation for
-Python >= 3.10 and the Salt one for others.
----
- salt/_compat.py | 30 +++++++++++++++++-------------
- 1 file changed, 17 insertions(+), 13 deletions(-)
-
-diff --git a/salt/_compat.py b/salt/_compat.py
-index 8149657bea61..a402f17a3c71 100644
---- a/salt/_compat.py
-+++ b/salt/_compat.py
-@@ -11,19 +11,23 @@
- else:
-     import salt.ext.ipaddress as ipaddress
- 
-+if sys.version_info >= (3, 10):
-+    # Python 3.10 will include a fix in importlib.metadata which allows us to
-+    # get the distribution of a loaded entry-point
-+    import importlib.metadata  # pylint: disable=no-member,no-name-in-module
-+else:
-+    # importlib_metadata before version 3.3.0 does not include the functionality we need.
-+    try:
-+        import importlib_metadata
- 
--# importlib_metadata before version 3.3.0 does not include the functionality we need.
--try:
--    import importlib_metadata
--
--    importlib_metadata_version = [
--        int(part)
--        for part in importlib_metadata.version("importlib_metadata").split(".")
--        if part.isdigit()
--    ]
--    if tuple(importlib_metadata_version) < (3, 3, 0):
-+        importlib_metadata_version = [
-+            int(part)
-+            for part in importlib_metadata.version("importlib_metadata").split(".")
-+            if part.isdigit()
-+        ]
-+        if tuple(importlib_metadata_version) < (3, 3, 0):
-+            # Use the vendored importlib_metadata
-+            import salt.ext.importlib_metadata as importlib_metadata
-+    except ImportError:
-         # Use the vendored importlib_metadata
-         import salt.ext.importlib_metadata as importlib_metadata
--except ImportError:
--    # Use the vendored importlib_metadata
--    import salt.ext.importlib_metadata as importlib_metadata
diff --git a/app-admin/salt/files/salt-3004.1-relax-pyzmq-dep.patch b/app-admin/salt/files/salt-3004.1-relax-pyzmq-dep.patch
deleted file mode 100644
index 99d432158215..000000000000
--- a/app-admin/salt/files/salt-3004.1-relax-pyzmq-dep.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/requirements/zeromq.txt b/requirements/zeromq.txt
-index 62cb775d87..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,<22.0.0 ; python_version < "3.9"
--pyzmq>19.0.2,<22.0.0 ; python_version >= "3.9"
-+pyzmq
diff --git a/app-admin/salt/files/salt-3004.1-tests.patch b/app-admin/salt/files/salt-3004.1-tests.patch
deleted file mode 100644
index 956cf1b0041c..000000000000
--- a/app-admin/salt/files/salt-3004.1-tests.patch
+++ /dev/null
@@ -1,311 +0,0 @@
-diff --git a/tests/pytests/functional/fileserver/test_roots.py b/tests/pytests/functional/fileserver/test_roots.py
-index c65efc8d52..9060fb61e2 100644
---- a/tests/pytests/functional/fileserver/test_roots.py
-+++ b/tests/pytests/functional/fileserver/test_roots.py
-@@ -15,6 +15,7 @@ def configure_loader_modules(base_env_state_tree_root_dir):
-     return {roots: {"__opts__": opts}}
- 
- 
-+@pytest.mark.skip("needs network access")
- # nox -e pytest-zeromq-3.8(coverage=False) -- -vvv --run-slow --run-destructive tests\pytests\functional\fileserver\test_roots.py
- def test_symlink_list(base_env_state_tree_root_dir):
-     with pytest.helpers.temp_file(
-diff --git a/tests/pytests/functional/pillar/test_gpg.py b/tests/pytests/functional/pillar/test_gpg.py
-index aaa4733f1d..b55cc9b4cf 100644
---- a/tests/pytests/functional/pillar/test_gpg.py
-+++ b/tests/pytests/functional/pillar/test_gpg.py
-@@ -203,7 +203,7 @@ def gpg_homedir(salt_master, pillar_state_tree):
-             universal_newlines=True,
-         )
-         ret = ProcessResult(
--            exitcode=proc.returncode,
-+            returncode=proc.returncode,
-             stdout=proc.stdout,
-             stderr=proc.stderr,
-             cmdline=proc.args,
-@@ -220,7 +220,7 @@ def gpg_homedir(salt_master, pillar_state_tree):
-             input=TEST_KEY,
-         )
-         ret = ProcessResult(
--            exitcode=proc.returncode,
-+            returncode=proc.returncode,
-             stdout=proc.stdout,
-             stderr=proc.stderr,
-             cmdline=proc.args,
-@@ -250,7 +250,7 @@ def gpg_homedir(salt_master, pillar_state_tree):
-                     input="KILLAGENT",
-                 )
-                 ret = ProcessResult(
--                    exitcode=proc.returncode,
-+                    returncode=proc.returncode,
-                     stdout=proc.stdout,
-                     stderr=proc.stderr,
-                     cmdline=proc.args,
-diff --git a/tests/pytests/integration/cli/test_salt_proxy.py b/tests/pytests/integration/cli/test_salt_proxy.py
-index c32c7e11e2..a9ee9fbd8d 100644
---- a/tests/pytests/integration/cli/test_salt_proxy.py
-+++ b/tests/pytests/integration/cli/test_salt_proxy.py
-@@ -40,6 +40,7 @@ def test_exit_status_no_proxyid(salt_master, proxy_minion_id):
-     assert "error: salt-proxy requires --proxyid" in exc.value.stderr, exc.value
- 
- 
-+@pytest.mark.skip("Currently broken")
- @pytest.mark.skip_on_windows(reason="Windows does not do user checks")
- def test_exit_status_unknown_user(salt_master, proxy_minion_id):
-     """
-@@ -66,7 +67,7 @@ def test_exit_status_unknown_argument(salt_master, proxy_minion_id):
-         factory = salt_master.salt_proxy_minion_daemon(proxy_minion_id)
-         factory.start("--unknown-argument", start_timeout=10, max_start_attempts=1)
- 
--    assert exc.value.exitcode == salt.defaults.exitcodes.EX_USAGE, exc.value
-+    assert exc.value.returncode == salt.defaults.exitcodes.EX_USAGE, exc.value
-     assert "Usage" in exc.value.stderr, exc.value
-     assert "no such option: --unknown-argument" in exc.value.stderr, exc.value
- 
-@@ -89,8 +90,8 @@ def test_exit_status_correct_usage(salt_master, proxy_minion_id, salt_cli):
-     assert factory.is_running()
-     # Let's issue a ping before terminating
-     ret = salt_cli.run("test.ping", minion_tgt=proxy_minion_id)
--    assert ret.exitcode == 0
-+    assert ret.returncode == 0
-     assert ret.json is True
-     # Terminate the proxy minion
-     ret = factory.terminate()
--    assert ret.exitcode == salt.defaults.exitcodes.EX_OK, ret
-+    assert ret.returncode == salt.defaults.exitcodes.EX_OK, ret
-diff --git a/tests/pytests/integration/sdb/test_vault.py b/tests/pytests/integration/sdb/test_vault.py
-index 7dc4c55417..6c48296a0c 100644
---- a/tests/pytests/integration/sdb/test_vault.py
-+++ b/tests/pytests/integration/sdb/test_vault.py
-@@ -107,7 +107,7 @@ def vault_container_version(request, salt_call_cli, vault_port):
-             if proc.returncode == 0:
-                 break
-             ret = ProcessResult(
--                exitcode=proc.returncode,
-+                returncode=proc.returncode,
-                 stdout=proc.stdout,
-                 stderr=proc.stderr,
-                 cmdline=proc.args,
-@@ -133,7 +133,7 @@ def vault_container_version(request, salt_call_cli, vault_port):
-         )
-         if proc.returncode != 0:
-             ret = ProcessResult(
--                exitcode=proc.returncode,
-+                returncode=proc.returncode,
-                 stdout=proc.stdout,
-                 stderr=proc.stderr,
-                 cmdline=proc.args,
-@@ -150,7 +150,7 @@ def vault_container_version(request, salt_call_cli, vault_port):
-                 universal_newlines=True,
-             )
-             ret = ProcessResult(
--                exitcode=proc.returncode,
-+                returncode=proc.returncode,
-                 stdout=proc.stdout,
-                 stderr=proc.stderr,
-                 cmdline=proc.args,
-diff --git a/tests/pytests/unit/modules/test_cmdmod.py b/tests/pytests/unit/modules/test_cmdmod.py
-index bc1d2818aa..3bd93862b7 100644
---- a/tests/pytests/unit/modules/test_cmdmod.py
-+++ b/tests/pytests/unit/modules/test_cmdmod.py
-@@ -440,6 +440,7 @@ def test_run_cwd_doesnt_exist_issue_7154():
-         cmdmod.run_all(cmd, cwd=cwd)
- 
- 
-+@pytest.mark.skip("needs root access")
- @pytest.mark.skip_on_darwin
- @pytest.mark.skip_on_windows
- def test_run_cwd_in_combination_with_runas():
-diff --git a/tests/pytests/unit/modules/test_portage_config.py b/tests/pytests/unit/modules/test_portage_config.py
-index 5cc6b90596..db37d2c4f1 100644
---- a/tests/pytests/unit/modules/test_portage_config.py
-+++ b/tests/pytests/unit/modules/test_portage_config.py
-@@ -29,6 +29,7 @@ def test_get_config_file_wildcards():
-         assert portage_config._get_config_file("mask", atom) == expected
- 
- 
-+@pytest.mark.skip("test needs root access")
- def test_enforce_nice_config(tmp_path):
-     atoms = [
-         ("*/*::repo", "repo"),
-diff --git a/tests/pytests/unit/state/test_state_compiler.py b/tests/pytests/unit/state/test_state_compiler.py
-index fc43cf154d..7aa511c9f7 100644
---- a/tests/pytests/unit/state/test_state_compiler.py
-+++ b/tests/pytests/unit/state/test_state_compiler.py
-@@ -679,6 +679,7 @@ def test_verify_retry_parsing():
-             assert set(expected_result).issubset(set(state_obj.call(low_data)))
- 
- 
-+@pytest.mark.skip("test requires root access")
- def test_render_requisite_require_disabled():
-     """
-     Test that the state compiler correctly deliver a rendering
-@@ -719,6 +720,7 @@ def test_render_requisite_require_disabled():
-         assert run_num == 0
- 
- 
-+@pytest.mark.skip("test requires root access")
- def test_render_requisite_require_in_disabled():
-     """
-     Test that the state compiler correctly deliver a rendering
-diff --git a/tests/pytests/unit/state/test_state_format_slots.py b/tests/pytests/unit/state/test_state_format_slots.py
-index 57b7bb2b87..7d2abce8d0 100644
---- a/tests/pytests/unit/state/test_state_format_slots.py
-+++ b/tests/pytests/unit/state/test_state_format_slots.py
-@@ -218,6 +218,7 @@ def test_slot_append(state_obj):
-     assert cdata == {"args": ["arg"], "kwargs": {"key": "value1thing~"}}
- 
- 
-+@pytest.mark.skip("test needs root")
- # Skip on windows like integration.modules.test_state.StateModuleTest.test_parallel_state_with_long_tag
- @skipIf(
-     salt.utils.platform.is_windows(),
-diff --git a/tests/pytests/unit/test_minion.py b/tests/pytests/unit/test_minion.py
-index 985ec99276..eb8a476e30 100644
---- a/tests/pytests/unit/test_minion.py
-+++ b/tests/pytests/unit/test_minion.py
-@@ -493,6 +493,7 @@ def test_scheduler_before_connect():
-             minion.destroy()
- 
- 
-+@pytest.mark.skip("test needs root access")
- def test_minion_module_refresh():
-     """
-     Tests that the 'module_refresh' just return in case there is no 'schedule'
-@@ -520,6 +521,7 @@ def test_minion_module_refresh():
-             minion.destroy()
- 
- 
-+@pytest.mark.skip("test needs root access")
- def test_minion_module_refresh_beacons_refresh():
-     """
-     Tests that 'module_refresh' calls beacons_refresh and that the
-diff --git a/tests/pytests/unit/test_version.py b/tests/pytests/unit/test_version.py
-index bc6bbfeadd..2653b558b0 100644
---- a/tests/pytests/unit/test_version.py
-+++ b/tests/pytests/unit/test_version.py
-@@ -140,6 +140,7 @@ def test_sha(commit, match):
-         assert ret is None
- 
- 
-+@pytest.mark.skip("test is broken if some optional deps aren't installed")
- def test_version_report_lines():
-     """
-     Validate padding in versions report is correct
-diff --git a/tests/support/helpers.py b/tests/support/helpers.py
-index d82b14cb90..751018162c 100644
---- a/tests/support/helpers.py
-+++ b/tests/support/helpers.py
-@@ -40,7 +40,7 @@ import salt.utils.platform
- import salt.utils.pycrypto
- import salt.utils.stringutils
- import salt.utils.versions
--from saltfactories.exceptions import FactoryFailure as ProcessFailed
-+from pytestshellutils.exceptions import FactoryFailure as ProcessFailed
- from saltfactories.utils.ports import get_unused_localhost_port
- from saltfactories.utils.processes import ProcessResult
- from tests.support.mock import patch
-@@ -1720,7 +1720,7 @@ class VirtualEnv:
-         kwargs.setdefault("env", self.environ)
-         proc = subprocess.run(args, check=False, **kwargs)
-         ret = ProcessResult(
--            exitcode=proc.returncode,
-+            returncode=proc.returncode,
-             stdout=proc.stdout,
-             stderr=proc.stderr,
-             cmdline=proc.args,
-@@ -1735,7 +1735,7 @@ class VirtualEnv:
-                     cmdline=proc.args,
-                     stdout=proc.stdout,
-                     stderr=proc.stderr,
--                    exitcode=proc.returncode,
-+                    returncode=proc.returncode,
-                 )
-         return ret
- 
-diff --git a/tests/unit/modules/test_boto_route53.py b/tests/unit/modules/test_boto_route53.py
-index 1d3d1393a9..df331761e2 100644
---- a/tests/unit/modules/test_boto_route53.py
-+++ b/tests/unit/modules/test_boto_route53.py
-@@ -4,6 +4,8 @@ from collections import namedtuple
- 
- import pkg_resources  # pylint: disable=3rd-party-module-not-gated
- 
-+import pytest
-+
- import salt.config
- import salt.loader
- import salt.utils.versions
-@@ -99,6 +101,7 @@ class BotoRoute53TestCase(TestCase, LoaderModuleMockMixin):
-     def tearDown(self):
-         del self.opts
- 
-+    @pytest.mark.skip("test currently broken")
-     @mock_route53_deprecated
-     def test_create_healthcheck(self):
-         """
-diff --git a/tests/unit/utils/test_parsers.py b/tests/unit/utils/test_parsers.py
-index 907c67f477..3f68cfe8f3 100644
---- a/tests/unit/utils/test_parsers.py
-+++ b/tests/unit/utils/test_parsers.py
-@@ -6,6 +6,8 @@ import os
- import shutil
- import tempfile
- 
-+import pytest
-+
- import salt.config
- import salt.log.setup as log
- import salt.syspaths
-@@ -983,6 +985,7 @@ class SaltRunOptionParserTestCase(ParserBase, TestCase):
-         if os.path.exists(self.log_file):
-             os.unlink(self.log_file)
- 
-+    @pytest.mark.skip("needs root access")
-     def test_jid_option(self):
-         jid = salt.utils.jid.gen_jid({})
-         args = ["--jid", jid]
-@@ -991,6 +994,7 @@ class SaltRunOptionParserTestCase(ParserBase, TestCase):
-         parser.parse_args(args)
-         assert parser.options.jid == jid
- 
-+    @pytest.mark.skip("needs root access")
-     def test_jid_option_invalid(self):
-         jid = salt.utils.jid.gen_jid({}) + "A"
-         args = ["--jid", jid]
-@@ -1041,6 +1045,7 @@ class SaltSSHOptionParserTestCase(ParserBase, TestCase):
-         if os.path.exists(self.ssh_log_file):
-             os.unlink(self.ssh_log_file)
- 
-+    @pytest.mark.skip("needs root access")
-     def test_jid_option(self):
-         jid = salt.utils.jid.gen_jid({})
-         args = ["--jid", jid] + self.args
-@@ -1049,6 +1054,7 @@ class SaltSSHOptionParserTestCase(ParserBase, TestCase):
-         parser.parse_args(args)
-         assert parser.options.jid == jid
- 
-+    @pytest.mark.skip("needs root access")
-     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_schema.py b/tests/unit/utils/test_schema.py
-index 8c648f5288..74b9bc6981 100644
---- a/tests/unit/utils/test_schema.py
-+++ b/tests/unit/utils/test_schema.py
-@@ -872,6 +872,7 @@ class ConfigTestCase(TestCase):
-             },
-         )
- 
-+    @skipIf(True, "Does not work in network sandbox")
-     @skipIf(HAS_JSONSCHEMA is False, "The 'jsonschema' library is missing")
-     def test_hostname_config_validation(self):
-         class TestConf(schema.Schema):
-@@ -2098,6 +2099,7 @@ class ConfigTestCase(TestCase):
-         item = schema.NotItem(item=schema.BooleanItem())
-         self.assertEqual(item.serialize(), {"not": item.item.serialize()})
- 
-+    @skipIf(True, "Does not work in network sandbox")
-     @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-3004.2-importlib.patch b/app-admin/salt/files/salt-3004.2-importlib.patch
deleted file mode 100644
index 599b17290d5b..000000000000
--- a/app-admin/salt/files/salt-3004.2-importlib.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/salt/_compat.py	2022-06-28 01:50:45.630746476 -0000
-+++ b/salt/_compat.py	2022-06-28 01:51:52.970217848 -0000
-@@ -14,7 +14,7 @@
- if sys.version_info >= (3, 10):
-     # Python 3.10 will include a fix in importlib.metadata which allows us to
-     # get the distribution of a loaded entry-point
--    import importlib.metadata  # pylint: disable=no-member,no-name-in-module
-+    import importlib.metadata as importlib_metadata  # pylint: disable=no-member,no-name-in-module
- else:
-     # importlib_metadata before version 3.3.0 does not include the functionality we need.
-     try:
diff --git a/app-admin/salt/files/salt-3004.2-jinja-3.patch b/app-admin/salt/files/salt-3004.2-jinja-3.patch
deleted file mode 100644
index 271921fd4564..000000000000
--- a/app-admin/salt/files/salt-3004.2-jinja-3.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/tests/unit/utils/test_jinja.py b/tests/unit/utils/test_jinja.py
-index 6502831aff..dec847364a 100644
---- a/tests/unit/utils/test_jinja.py
-+++ b/tests/unit/utils/test_jinja.py
-@@ -22,7 +22,8 @@ import salt.utils.files
- import salt.utils.json
- import salt.utils.stringutils
- import salt.utils.yaml
--from jinja2 import DictLoader, Environment, Markup, exceptions
-+from jinja2 import DictLoader, Environment, exceptions
-+from markupsafe import Markup
- from salt.exceptions import SaltRenderError
- from salt.utils.decorators.jinja import JinjaFilter
- from salt.utils.jinja import (
diff --git a/app-admin/salt/files/salt-3004.2-pyzmq-23.patch b/app-admin/salt/files/salt-3004.2-pyzmq-23.patch
deleted file mode 100644
index d912757ba7b8..000000000000
--- a/app-admin/salt/files/salt-3004.2-pyzmq-23.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff --git a/salt/log/handlers/logstash_mod.py b/salt/log/handlers/logstash_mod.py
-index bc462018f5..7e0d98c5ba 100644
---- a/salt/log/handlers/logstash_mod.py
-+++ b/salt/log/handlers/logstash_mod.py
-@@ -160,6 +160,8 @@ import logging
- import logging.handlers
- import os
- 
-+import zmq
-+
- import salt.utils.json
- import salt.utils.network
- import salt.utils.stringutils
-@@ -435,7 +437,7 @@ class ZMQLogstashHander(logging.Handler, NewStyleClassMixIn):
-                 # Above the defined high water mark(unsent messages), start
-                 # dropping them
-                 self._publisher.setsockopt(zmq.HWM, self._zmq_hwm)
--            except AttributeError:
-+            except (AttributeError, zmq.error.ZMQError):
-                 # In ZMQ >= 3.0, there are separate send and receive HWM
-                 # settings
-                 self._publisher.setsockopt(zmq.SNDHWM, self._zmq_hwm)
-diff --git a/salt/transport/zeromq.py b/salt/transport/zeromq.py
-index dc024d7eff..4c989095a5 100644
---- a/salt/transport/zeromq.py
-+++ b/salt/transport/zeromq.py
-@@ -902,7 +902,7 @@ class ZeroMQPubServerChannel(salt.transport.server.PubServerChannel):
-         try:
-             pub_sock.setsockopt(zmq.HWM, self.opts.get("pub_hwm", 1000))
-         # in zmq >= 3.0, there are separate send and receive HWM settings
--        except AttributeError:
-+        except (AttributeError, zmq.error.ZMQError):
-             # Set the High Water Marks. For more information on HWM, see:
-             # http://api.zeromq.org/4-1:zmq-setsockopt
-             pub_sock.setsockopt(zmq.SNDHWM, self.opts.get("pub_hwm", 1000))
diff --git a/app-admin/salt/files/salt-3005.1-importlib-metadata-5.patch b/app-admin/salt/files/salt-3005.1-importlib-metadata-5.patch
deleted file mode 100644
index e4b19d6bfd7f..000000000000
--- a/app-admin/salt/files/salt-3005.1-importlib-metadata-5.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-commit b676e6338a7c094cb3335d11f851ac0e12222017
-Author: MKLeb <calebb@vmware.com>
-Date:   Wed Oct 5 15:49:37 2022 -0400
-
-    Allow entrypoint compatibility for importlib-metadata>=5.0.0
-
-diff --git a/salt/utils/entrypoints.py b/salt/utils/entrypoints.py
-index 3effa0b494..ac65ae2df4 100644
---- a/salt/utils/entrypoints.py
-+++ b/salt/utils/entrypoints.py
-@@ -38,13 +38,20 @@ def iter_entry_points(group, name=None):
-     entry_points_listing = []
-     entry_points = importlib_metadata.entry_points()
- 
--    for entry_point_group, entry_points_list in entry_points.items():
--        if entry_point_group != group:
--            continue
--        for entry_point in entry_points_list:
--            if name is not None and entry_point.name != name:
-+    # pre importlib-metadata 5.0.0
-+    if hasattr(entry_points, "items"):
-+        for entry_point_group, entry_points_list in entry_points.items():
-+            if entry_point_group != group:
-                 continue
--            entry_points_listing.append(entry_point)
-+            for entry_point in entry_points_list:
-+                if name is not None and entry_point.name != name:
-+                    continue
-+                entry_points_listing.append(entry_point)
-+    # starting with importlib-metadata 5.0.0
-+    for entry_point in entry_points.select(group=group):
-+        if name is not None and entry_point.name != name:
-+            continue
-+        entry_points_listing.append(entry_point)
- 
-     return entry_points_listing
- 
diff --git a/app-admin/salt/salt-3004.2-r2.ebuild b/app-admin/salt/salt-3004.2-r2.ebuild
deleted file mode 100644
index f2a1fbff233e..000000000000
--- a/app-admin/salt/salt-3004.2-r2.ebuild
+++ /dev/null
@@ -1,197 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_10 )
-
-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 ~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.0[${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[${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-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/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-0.3.6[${PYTHON_USEDEP}]
-		dev-python/passlib
-		dev-python/pip[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		>=dev-python/pytest-salt-factories-1.0.0_rc13[${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.3.0[${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-3004.2-jinja-3.patch"
-	"${FILESDIR}/salt-3004.1-tests.patch"
-	"${FILESDIR}/salt-3004.1-relax-pyzmq-dep.patch"
-	"${FILESDIR}/salt-3004.1-py310.patch"
-	"${FILESDIR}/salt-3004.2-importlib.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
-	rm tests/pytests/functional/modules/test_pip.py || die
-	rm tests/pytests/unit/client/ssh/test_ssh.py || die
-
-	# tests require root access
-	rm tests/integration/pillar/test_git_pillar.py || die
-	rm tests/integration/states/test_supervisord.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-3005-r1.ebuild b/app-admin/salt/salt-3005-r1.ebuild
deleted file mode 100644
index 1ec597170af1..000000000000
--- a/app-admin/salt/salt-3005-r1.ebuild
+++ /dev/null
@@ -1,206 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_10 )
-
-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 ~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.0.3[${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[${PYTHON_USEDEP}]
-	>=dev-python/markupsafe-2.0.1[${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}]
-	<dev-python/importlib_metadata-5[${PYTHON_USEDEP}]
-	libcloud? (
-		dev-python/aiohttp[${PYTHON_USEDEP}]
-		dev-python/aiosignal[${PYTHON_USEDEP}]
-		dev-python/async-timeout[${PYTHON_USEDEP}]
-		>=dev-python/libcloud-2.5.0[${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[${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/boto-2.32.1[${PYTHON_USEDEP}]
-		dev-python/certifi[${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
-		dev-python/pip[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		>=dev-python/pytest-7.0.1[${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}]
-		dev-python/libcloud[${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-relax-pyzmq-dep.patch"
-	"${FILESDIR}/salt-3005-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
-
-	# 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}"
-	)
-}
diff --git a/app-admin/salt/salt-3005.1-r1.ebuild b/app-admin/salt/salt-3005.1-r1.ebuild
index f0e9fcb05059..fffa1500c0f6 100644
--- a/app-admin/salt/salt-3005.1-r1.ebuild
+++ b/app-admin/salt/salt-3005.1-r1.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == 9999* ]]; then
 	EGIT_BRANCH="develop"
 else
 	inherit pypi
-	KEYWORDS="~amd64 ~arm ~arm64 ~riscv x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/app-admin/salt/salt-3005.1.ebuild b/app-admin/salt/salt-3005.1.ebuild
deleted file mode 100644
index 1c1747cfaa93..000000000000
--- a/app-admin/salt/salt-3005.1.ebuild
+++ /dev/null
@@ -1,219 +0,0 @@
-# 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"
-	SRC_URI=""
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	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.0.3[${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[${PYTHON_USEDEP}]
-	>=dev-python/markupsafe-2.0.1[${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/aiohttp[${PYTHON_USEDEP}]
-		dev-python/aiosignal[${PYTHON_USEDEP}]
-		dev-python/async-timeout[${PYTHON_USEDEP}]
-		>=dev-python/libcloud-2.5.0[${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[${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/boto-2.32.1[${PYTHON_USEDEP}]
-		dev-python/certifi[${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
-		dev-python/pip[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		>=dev-python/pytest-7.0.1[${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}]
-		dev-python/libcloud[${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-relax-pyzmq-dep.patch"
-	"${FILESDIR}/salt-3005-tests.patch"
-	"${FILESDIR}/salt-3005.1-no-entry-points.patch"
-	"${FILESDIR}/salt-3005.1-importlib-metadata-5.patch"
-	"${FILESDIR}/salt-3005.1-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() {
-	# testsuite likes lots of files
-	ulimit -n 4096 || die
-
-	local -a disable_tests=(
-		# doesn't like the distutils warning
-		batch_retcode
-		multiple_modules_in_batch
-		# hangs indefinitely
-		master_type_disable
-		# needs root
-		runas_env_sudo_group
-		# don't like sandbox
-		split_multibyte_characters_{shiftjis,unicode}
-		# doesn't like sandbox env
-		log_sanitize
-	)
-	local textexpr
-	testexpr=$(printf 'not %s and ' "${disable_tests[@]}")
-
-	# ${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" \
-			"${EPYTHON}" -m pytest -vv -k "${testexpr%and }" \
-			|| die "testing failed with ${EPYTHON}"
-	)
-}
diff --git a/app-admin/sysstat/Manifest b/app-admin/sysstat/Manifest
index d4278c378eba..3c4e000bbe7c 100644
--- a/app-admin/sysstat/Manifest
+++ b/app-admin/sysstat/Manifest
@@ -1,6 +1,6 @@
 AUX sysstat.init.d 378 BLAKE2B fe781f1a53e183023da2b46ecefb37881eedf8e8df2623927b24f33aa3344776b39db038d598ad050f1d48462d52300fb17731f29b0a8ab9c800fbe379efa249 SHA512 328ee3d40d45a0b1702c74fe0195ce4444cc8f63cb0fa68ba40ca20cfa183dd7acf4fc846cd76a4bcf426a3b4064316061dbbf26ca20047711528399e17b20b4
 DIST sysstat-12.6.2.tar.gz 1455025 BLAKE2B aba2d8fd5fae8d6df740173d7ccd60beb0628c4c2205342f72ec03d6c48995d397de0d6f2cace24accf1a9274da37cf3bba86888717bc8d62d262ffd1c6f995e SHA512 376047de55598c6f671b999203809219a40206a9c58499399681af9ebe6048dd4da96c8ef5827d75cc369a7b69c3f1aadef1a5e8deec318a12b230d61f09fc08
 DIST sysstat-12.7.1.tar.gz 1464847 BLAKE2B dd4cb510d45879665945d7c3efcb9e1011f6b77d152c7f989ef6a3e8f203c05c1ca708959030cb864c31810ec27a5e880a9cfcd805f26c4f3537d55bdd9fd763 SHA512 5c1da0f5a1bf26091f029c5ea138f836616becb1e531843aa2c150a66ddc1f07b43cffeac98445855bf70319942fe22838a682c2f7685893bead7d8de7e9e2a8
-EBUILD sysstat-12.6.2.ebuild 1711 BLAKE2B 313c12c5b93011df55a75bc5622af45016902e5743f80dcdc44152a076f48b0927855c33da49365d8d92f0768d3d627a30146ad143ca2d412878f59001b1b0a6 SHA512 8960804c787c4e74343ea8cb76b100740f0572ed0fa549392f89c1effc750612081f66df86d09ddbafafea70ab2a858cf49f1069779543cc1eeb1ceed478b29e
+EBUILD sysstat-12.6.2.ebuild 1710 BLAKE2B 575b73d0afe41bfe83bf70bb2d4723d9c6324371b20bbdbf4fb0a62f8e27bc567c47f1050979ca24a0b4ab3afa32d0019bf3905bca5cc54c478f8ebf00e20e4b SHA512 8312739cca30d5fab338186fb1b16d6f7ed171694b3af0474b62a1616cbf27579af95ed93ada68600fd80173558e35de9a8e51256eb25fdc9d6cee12ad94a99e
 EBUILD sysstat-12.7.1.ebuild 1710 BLAKE2B a80b09459bcfcf523f7346545a3a904166e53f067a79eef11c7ad232f9133b01359158cef1f0a9c0b277ae9e2637d1dbbdce4fb8f7b700e1099622d59ee01f76 SHA512 1b3ef2572970945d0b2809755854d83d63eedbc738293c7d6edc0e8472499623dd1931b9ff77ee210770ccf53893e121d3a46b2864b530672dc5651b4891da64
 MISC metadata.xml 617 BLAKE2B e890e68addd784d7478e282d4518a7cab0d7ca4fc86ad44db58063e5c7027084b66d1e4fe63b702b992a60f0d9cd5816cf8ad6016b17e185760a820f08907579 SHA512 1dcf5a80e3f3cfdf1cc8cd3730847c6ed9107eec7286b37e1de01287189e8811e729e16328a283abe196443c5355d905d7c95104c43e23f7d4ce3c56e2fa4ad9
diff --git a/app-admin/sysstat/sysstat-12.6.2.ebuild b/app-admin/sysstat/sysstat-12.6.2.ebuild
index 679307b89766..30dcb45c66ce 100644
--- a/app-admin/sysstat/sysstat-12.6.2.ebuild
+++ b/app-admin/sysstat/sysstat-12.6.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="dcron debug nls lm-sensors lto selinux systemd"
 
 BDEPEND="
diff --git a/app-admin/xstow/Manifest b/app-admin/xstow/Manifest
index 78aa89a48d54..6f9dfb407bde 100644
--- a/app-admin/xstow/Manifest
+++ b/app-admin/xstow/Manifest
@@ -1,5 +1,5 @@
 AUX 99xstow 65 BLAKE2B c3d3dae69e0ed5251a996ddfb164795718974e1c2464176e680373fab25ceeb8a22392ac8de0dd489462e28bc48512c151f3f438ddc7f9bd093d5c63b46ba29b SHA512 0ade954fc07ba98be74d79e8ce842fc4e3e12f83d59f76eb78810251cc9e1612d963401be99f38002d94a2a32c9c2a32429f73d7ee69e97c12f6a05db14a3476
 AUX xstow-1.1.0-clang.patch 1092 BLAKE2B b00444730f525ce39c2692e7f1ab120b40d1e671d88c1c4f9b2b85f0c97ef34a89f12ba47c8eabd53464d05e5e3a94f28f84c3ce277072a983c34e188f149edd SHA512 804df13381f1d0f365303547c1b8e8b5fa2dd06e357596bd65ba349fe6b63e906491e78a19a6bf9190e7e8a81ae26b77a66f0f5290ff5b640f91024eca136537
 DIST xstow-1.1.0.tar.bz2 187761 BLAKE2B ed3822e638aedf8900a3baba62a5af9de9d7b98dcdf27ca81a6898353b9f5c7f767ec7d8e68ead4d5ef318af5a6eda2b1cc68a5c80a6a8ad2b9c8adf03ae3377 SHA512 30f2e0be0c2aba668b4cc781fe69ac74c2460cc681c6b47a55ee66af5c0f2ac14dee9fe2e95a288ce06059378407a2b99d2156430a5a6dcbf06def793f579015
-EBUILD xstow-1.1.0.ebuild 1225 BLAKE2B 7f58c2726265412a7544d99388a9ebb36d990045cca4fa52078005837b2a51369bd3bf132bc045c11ccd4f61e9d90a187e844095b8fd16fcf320949a04b3b98d SHA512 6ce9e4287bd20c77731e30206ecec2d2d740fdcbac36082f10174d43f99d6ce4a0a72c0ef3be165432e661421a0f7a80b7ec456427544e3401a4dca474279100
+EBUILD xstow-1.1.0.ebuild 1226 BLAKE2B 6a728a574e414f4ea966adaec835f1f61d3c0427eea5682d460daacd2161a87ae0e8b3c863bef1cee5658767c685e046da013376a22ed96a408c66174c441aa0 SHA512 ef32f0a0aaf528053932b5a020191cbe085dd99a3b7fd47f8b2459ed386d4ac667aa20f97f8a69cceb76caf12f600cd8402e2ddb136b82fe56e2ee480eeddfa8
 MISC metadata.xml 301 BLAKE2B aace14f4b6ef5f8874f165c8bf5f6c3df1c8a259a54f48cf8805a62baa9530bdeea7dbe85a9c445151fdac6a53674f1967bf960ef0c9b26e4ccc8923d89cef55 SHA512 dafc481314893bacf1024daa509819b09d99f7f7c2bbb0613ac092cc0e14eb61ec708ba1a6d5b3d48774855707481745d0da462b94a973dd88a22ec64cc667de
diff --git a/app-admin/xstow/xstow-1.1.0.ebuild b/app-admin/xstow/xstow-1.1.0.ebuild
index 7b39d09e8eeb..827b9a734e87 100644
--- a/app-admin/xstow/xstow-1.1.0.ebuild
+++ b/app-admin/xstow/xstow-1.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -6,7 +6,7 @@ EAPI=8
 inherit autotools
 
 DESCRIPTION="Replacement for GNU stow with extensions"
-HOMEPAGE="http://xstow.sourceforge.net/"
+HOMEPAGE="https://xstow.sourceforge.net/"
 SRC_URI="mirror://sourceforge/xstow/${P}.tar.bz2"
 
 LICENSE="GPL-2"