gentoo auto-resync : 25:08:2023 - 03:53:16

10 files changed, 340 insertions, 735 deletions

diff --git a/app-antivirus/Manifest.gz b/app-antivirus/Manifest.gz
index 89c1bb83a5c5..2dc8df5f202d 100644
--- a/app-antivirus/Manifest.gz
+++ b/app-antivirus/Manifest.gz
diff --git a/app-antivirus/clamav/Manifest b/app-antivirus/clamav/Manifest
index a3514fb35dd3..d0edcf887587 100644
--- a/app-antivirus/clamav/Manifest
+++ b/app-antivirus/clamav/Manifest
@@ -47,7 +47,6 @@ DIST cexpr-0.6.0.crate 17966 BLAKE2B cb46f066eb1f4dbac00ec86dc3e562db7ee8ea5ff17
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
 DIST clamav-0.103.8.tar.gz 16524716 BLAKE2B 207a6087de9134586215a4f3fe02cb071135c38fac792f6cb2d4c4a3c9e596bff5dd0a0ac3dd9f6018771d866fa9e64223933f96cec3ee6e8ce17a743c3d952f SHA512 8e030fef5788cf4df8f4d878363df1e5d9abcaa209b9f998f57334ede481d755b33958b5e9bb82be9643cb7442814711e4c9978314cadd7eb9161fee03b74439
 DIST clamav-0.103.9.tar.gz 16530718 BLAKE2B 3eb4fb366769c46700e7fa3b2d508875b3c670436585c047fb399e02e2b89f289b56c0f412f85f0a125e98dd2b56e2f798747dd642897cd857ea984336cd641f SHA512 198b596144273e1113f69ad45776746c6cc444d3a5c0931ad74de16b18b3a901b2b5366327a26e53865cdd807a8c17115bd55fe33921bea53bfa8527048eea99
-DIST clamav-1.0.1.tar.gz 10320098 BLAKE2B f7672e4a5870e39d589c655215202f4a8beb3ec82e898086105452f6fcb55cb888fe33879fb04b85a290244aa9c556cbe96a379b4e790b04a5dcbed712f49c33 SHA512 521ebcc19e149b76e1d95c3d4e313ad83ec89703d68ef9b0bd74251bdb115c2d48b7cf0bf183f502118e495c7e1fb91665ff861642acd178c5b60f22e9e24433
 DIST clamav-1.0.2.tar.gz 10332308 BLAKE2B 98b95079bab6d4072fb301837d2c2a4f1c1b0f4feebc9c04a97f23408e7a17ee3d401c5ed087c70d8c324d49e9ee83afb363e884f62f8e4747d9c9306f8edc50 SHA512 6d3f52633e9a33c2608c3f8f33cf175e4ad5ed1639594f6683d23e47b9ef01305ff4f21643fcc7aacd5462bae1cc8022f609fe24c8181a148b545db84d8035c8
 DIST clamav-1.1.0.tar.gz 10297532 BLAKE2B 36629f9bf23a55591002517ecbad798484d351f060220ab554797d4acd356b89cc68f83f81a415d532c51fde33f1882ddaaa847c1935abb6b12d571b3976d66f SHA512 1a1cfd2e43518eafa127304704193e96162410d676fca6c868fd42f871412bbe91f379bb5c74abd89c14cfa3d580339bb79c10868776e46427a7afd9b55dc851
 DIST clamav-1.1.1.tar.gz 10297961 BLAKE2B 329743cfa232bbd5e05af08a243edbed121a416c16dd121aac18e193618dda525725bc2b8475282ca6fc20ae1908fa02aeb3253e9509c3dbf3ceb3a588174725 SHA512 c5426d4e3861996a784bda86bb7ef70a834313c57aa09c6225939a4908e67266312e0cf8e709a0a808fb0a6f48c6c8708c4e2f6e1930f8283b5453ed37424d9c
@@ -169,12 +168,10 @@ DIST png-0.17.9.crate 88839 BLAKE2B b218fcaa166f142ced8ae75a47bb587015d0a449210f
 DIST prettyplease-0.2.10.crate 56634 BLAKE2B f49c4fa42369d366f88656fbb716bacfc442b59d8ff47fa39e74238eca33f07aefd78289eea5a53055aed2522dff530de5130b0b319633b902fc895b03b47925 SHA512 80b10b3460cd37928d638f1223ced0c1b56047cd5be98722ee1cd37cfa3c991c8a78b3603d89349c22e201d653526e0321c5d685e0377bc75d5995e2428926f7
 DIST prettyplease-0.2.4.crate 53478 BLAKE2B d83d392c7e7e0a4fa082d5c84615b012cf1988ec0a475be99313f95bcee47a11eb8c710fb992a18c0c6627b39e27b39fa767c4fa4c1c48f54cc4698f14577697 SHA512 68ea70cdbccad0e91c251bb66b317e126bda3c34fbd2d50f95549f7ee3e48566a7eafb77f58e40e3f298bc2a34f2a5b0d900067c717b117602dc57284d789480
 DIST primal-check-0.3.3.crate 8720 BLAKE2B 9c7b5273a5df414c57b4104b9bf795b853b433da3a5d91a1b878ef9b7cdb6a810572dfb8fae11543a106760e449b886f6e10a12347f043171f5d7947b30f2b20 SHA512 d56fcee65802b1ca272515589574786dfd066099c55a536cb1076193242859074918651c4fa3c1a7dab4fd13ba91c8f6a2a5b0789a6cd24faffc092edf27d75e
-DIST proc-macro2-1.0.51.crate 41804 BLAKE2B 579e5a157da81cd8350a6407603e5f8102bb9b6618ea8e81ced1692a6a6f4b57bec35aeb965b643f2542f65a3b9965fbbcf7e0ade35cf159270583d34665a628 SHA512 10ad77a5d05437c1b2c40a8f82389d081e64993171aa6259e8dca98d9afb04f5fb870f2037ad626a280d59c1a89fd4482bead701d744d6fb7c893bd9e78dfc1f
 DIST proc-macro2-1.0.56.crate 44454 BLAKE2B b2a1f28979245a784a4b3a0af8cb04bd01ef3e7aba32c45122fc05a6cceddb1b7303890827f1a2cb99b0b2ae013cd772bffd6e94ea226f0030cde867d6c22aad SHA512 511fd8332eca47ed834736d405e18d53d83642cf528bebb8fd67fa5561e19b0a43c359b3e8020ecd28f9fafdb065c484ca360abc0287a0f97e94d4f779145f03
 DIST proc-macro2-1.0.64.crate 44848 BLAKE2B 4422122d9299eff3bfbb4507c4a117fef7c0906cab5a680933d482b7f9b49480bcb9c8172b412e70bf87dd0737b8532e90c310bf083f144292cc72190059ba3b SHA512 884fd14ff23c19420692e35a38f88bb6a766a09da105759cd958c315b9360a2c49cfe61ceaa3122307d44040195ec9dffb12b6d0ce224fbac5d3701621a12b04
 DIST proc-macro2-1.0.66.crate 43575 BLAKE2B 9eb3e816b00fcf625c280ba14ad269f5893d0523473a24de07c21945f6f932fbd08efb3c339b35d903245510e3f065e1478439b024a325f2bb9f97bc7bcbb18d SHA512 85f5a762f9411142e5ac28144bd380f07f0633ed2e44d8a2545be9fb8f42abaca6b5d45631b4be83b8e8b9beca7438bc52f25615c3a410a3a1249474b1aca407
 DIST qoi-0.4.1.crate 71135 BLAKE2B 8b4e2ebfdd6df425efb1326912e8db02258e570320fdeef465aa8b03f3248cd811bedaa17c15902f851083cc1db06a2b500aeddf734345eb25af0d835300b2f0 SHA512 884cde33bfb2d02716daa5f309890093bdb7b3f53eb06aca0b6eff0b7a66fd67cb8b9acd510d19e3ae7718930add971e871532a1605e4989639bf72f59329377
-DIST quote-1.0.23.crate 28058 BLAKE2B 81c483fa26b36b5c4dbe85b386a74f5bfeaa854a99c0d678374507613da916a60e3f5b14d4a4d295e1c9ef0413fa1f16447df8f19a9db8cb0485b7a5c327fdc1 SHA512 3bce6846dda94d285de15771549099e60df39c8395c498b372c90a240f77df31d6d9048127913ec1c7ed8f3a189470ade1db2bede406bb00fa715ea641ec87c2
 DIST quote-1.0.26.crate 28397 BLAKE2B b468a5e9350843ea81e540d17c9fcb302b46fbd450e10280c5fff6fd7c98a439df8c3d3d47e551bc6d67ed02052b5b5c65d215d5ff8ee34f045747e75c1ba37e SHA512 6fcfe4d31f601aa60beb858c25df217421b0a184d185eebc7a4cb9fbf97c687992b77bebd8671a9e6193716387c3e926fed9b75a08684eb2d9a5b155fbc321a5
 DIST quote-1.0.29.crate 28345 BLAKE2B 3aeb637a4139730348775caab4d48173650d8bdce08247263d741ccc657dfff7f2facff05725bcaa73486818d394c392c64ecbc61bae3f5b612104aec16ff289 SHA512 d686a3943dca059a8e79689c77e6e8f6dbfa9b16a1a7ecdd27099339b77a55334252eaa8b4340e79c35ebb1f6e4deeb3f6356dfd02484f9c724e66a74387e30b
 DIST rayon-1.6.1.crate 166330 BLAKE2B 5bbc439e0c88780b8d80cb36d4b4164e698a1189bd140e8c84d9f6a466023de0cd69a1f24c4217d595ae9af1f61aca6829461648152116c6bebeef0f0e686e50 SHA512 2e03585170e59f4388359817d67a43cd10a2244382615ae39bf84210db03a6dfec3b75d8a23800b8faaa31f45e8df4c44fbc343f02e18dd3dc0572c207791e73
@@ -288,14 +285,12 @@ DIST windows_x86_64_gnullvm-0.48.0.crate 366536 BLAKE2B 295dc3aef18c604d15799780
 DIST windows_x86_64_msvc-0.42.2.crate 666936 BLAKE2B bc3a456e7f8bc272f8978ec69506ec9d89f97b7582ebbe05d8bd57bdf8156ef62d0d2dc6137a97e81d54059d70db97a24af9a038adff357f5dfd28805d6193b5 SHA512 53a35f438903fceb59e36bd2ac331773fb8e6c8c5a6d984e79021761f91b3b4a23efe49d219667a4d0d23dcdbf906da9c24e74fb1cff93395b5c55ff524e3788
 DIST windows_x86_64_msvc-0.48.0.crate 671422 BLAKE2B abb063610dcc38581657133182b7d9efeed5553df67bd2bd6f30f1668a645186e4824f9ef556a5abc84ace10b1b437b6325bbda6df5a64ce880d7dcb743ac786 SHA512 6e598b8e3ac54912a8ebac01b0dd2c58fd282072527d7fedc7f6ebecdfb7dcb09ae46c22293bc0117849437f8b053db5e90406e7a38276f0f0afd06be3966795
 DIST zune-inflate-0.2.42.crate 37288 BLAKE2B 2d60c589607583826570c2877e1deae1a4dcf2c76ef705efc792cbf0f8bef2a1f4c4e75380efa890479b2cf168c34c7054b520aa799ccb20d43ae94526752458 SHA512 ea2c070a3df93c519f4360ee17fd1c51d8c6e194c61b391ab8c40d81c86bc7d2021bf08f97a106710806cdb16797d710b7722197edc9cce25de3c3752549bf09
-DIST zune-inflate-0.2.50.crate 37058 BLAKE2B 6e6686708ce4f83dc753cf93af7304e177568fe77dbef5b1feec6b38731da7ff077a2b1e02c24e270e013066c240c2a936b8a25a5a0a79f9f242831c1b46a810 SHA512 02fa9bbc4a30e145f034581212333788a24ad9756b1d2efef3a8b6967389fcb4258fe5c71936eb16b75238965021ae796525a754a94ff96d2d45f4e0509f74c0
 DIST zune-inflate-0.2.53.crate 36273 BLAKE2B f9541ae3a15422a13a731cd1f43df475dd9f5f0c3934247d70a61278e041f8b182ff3b7e053cdc38231c1f07187805e42e3656dda91a4f577817f9d46722b4e5 SHA512 6238def319045557a640f8a60f8c525b0749e6eed0c9856a52e0e33fc6f02d3a32a9c9145b317aee45bac3f2fe7a1e76eb14ac35519f6e895a2eec47cc5ad5d3
 DIST zune-inflate-0.2.54.crate 37973 BLAKE2B 8bdb532fae0da1d61fc9fc72ea72a9339116e1952e76ba7376f0ba0ea65101b88cd1e4766f516f21028a5ea3459e5590e7a54175a47f136cc572ed9abec2da2f SHA512 0de30f310121c1fed42612b7bcb50631d699195a77c7ce4094729f502e63d1ae38034d6054d95b6825e7e9a2afb7bb614ff123e12736163fee04a46ef1dc56bd
-EBUILD clamav-0.103.8.ebuild 7351 BLAKE2B 7468b98b543a72a4623ffa854c7f52ff9b60f5d9265fd76204c875e91ef9496b3eef26ce21bb2a2e2639365e2af04cf2e677a960f9231dd773ae7809748295b3 SHA512 cef00813cb2ba41fe74d8eefd800dd5923938c4276e398208da34e30c99d3364d5d1a891a04cbdc5c4dae117a763d00ed39b64ef6b6dbe88f301c54e5c2549e6
-EBUILD clamav-0.103.9.ebuild 7308 BLAKE2B 07ccaec2a97f6b9edb3eded4c3a45b1e4f3579c4a22dec19120e8d679efd7c8c9f3b8521df133b5b1cf04a0b8e2ec60efbb271702b45a39e14201596310626cf SHA512 0668767701f1657fa386cc607d5560dbcf9375f74db3b7dc5c324bf7cc3c4b0ee93b28d5f489f9cefa62bffb46ed99e74298b93fc588d2acddf42547549332c3
-EBUILD clamav-1.0.1.ebuild 10115 BLAKE2B c36b8e42a998d569003f03d7321f9dbcbb0c3a20cb7fc85ef9795f41f6d14debc0144d9dc704a2f8753c04956a816d38f8d2c81b17768fda87fca65ecb237a77 SHA512 000e9737f54f752368ee43f0271a821ab10abd188b2efc09a992bf727d1913d979e849f22e99881b64757915f79c0248325a57e887f550ed5a49fec092563186
-EBUILD clamav-1.0.2.ebuild 10062 BLAKE2B c08fad104936883b82b6ce9e14a0478224c06404dc869a826408b17df148a7b5fd3ea3fcb28882c71ff4e8363072abe4079f1154f6c1c964bbbdebd62228fb41 SHA512 ec0f61edc99cef96e597a93f9c7d6c2ce50425c4e59901649da24dc916bcca5ee97297b9524eb945e25983bad0a1bad66f1065a599a56a2e7f6739ead64a6359
-EBUILD clamav-1.1.0.ebuild 10780 BLAKE2B f067e77e5eca456e9601c6fbcc4cd43ab97bcb562a0d9d060edeeca1ec969e7a5f46cded0810c38a6b7dee5c4d5c6be6df5a10f93c8b6a69d8bd612ab29ecc23 SHA512 19108462a27d1cae95226cf5af17c485cd6704e544531ddad6857932740f767264144fd3b8eaa770998b219924579f2557c0463c8557dba9e1b56d81b843c702
-EBUILD clamav-1.1.1.ebuild 10785 BLAKE2B 24016ff671b529024d3c0a0069bfadc60850267d8dffca7c55baa4a2c90da0ac2bcba844f3ade6d3383e28033b04dd1990148666c5d35d04149e022064cfad66 SHA512 0d836e95825fcbbedd8e00cb60d6762e63dda5d0fa11e0d0387ec6c4d5370260e501f80a09b1aaff4370f37ca28a75b8b8d760f78178ca22541309ca69b021de
-EBUILD clamav-1.2.0_rc.ebuild 10736 BLAKE2B 0cca7f25ad05e5b4fb950b53e1937ff308f952ef7d6f28f2c96a32c2be15ba73aa95f42461187bb12671216c49958c2ddeb015b2d9f6bf9f87fd263c94e1c29c SHA512 131b24651aedba908183833fcdd723cd17f5511f54ddc6400e1b5320b0225baabfd00ac4aa95f19d92e91348cccb1aee2ea5d96ba559deba1695f2a67cc3d769
-MISC metadata.xml 1668 BLAKE2B f874f351a17a0bd2de2bd7d321b1910c89df30a6a306a280e7a02f823f359a8d3ed4385fca09bf4a50f36d70e813cd0f2aa9c70d3c1e0ce35234c4606007ffcd SHA512 bfb3ec70d3128d881d1a4c2ca1b9cb5ae61409020806fd6b1a1bc0546f12dbef027a326d104a6eeaad8bba27b0fc5e32fd204b87d0f4989944929dfd25547ff7
+EBUILD clamav-0.103.8.ebuild 7355 BLAKE2B 53c02c75d88e5512c07418044096dbc5437d413b2edd1728384338a3e1d10d82835a503a395db3fe1736d57a540028f43c629c99d7c57b3399531c71fab7502d SHA512 04f3fe2507121b9ef5f0ec1062a4896d63ff6eb75f6d7f4fb12e80d8364f85abc33e42f46d39021be9b3cbb8c10976340c827fe7d3d50657fe07e74e9c85ec9a
+EBUILD clamav-0.103.9.ebuild 7312 BLAKE2B 3bcd3a1eacf504fd6a0fc512629e4b6d272aed1ececd6e74f9ed0aa25121921f1bd9271b6653c6ea43c8c54f716576c1f2dd3b07c8a8bfc4a662fc0bbcf4b10f SHA512 c8c6c0c1a587b4a0f00a029fe9cb40b5603ee7a3252bd60a2cf775c768646ca38e6a7f4f0ba21d83e09633a1479af7f1c1c231c94cd24558d5220e74fafc9fab
+EBUILD clamav-1.0.2-r1.ebuild 10122 BLAKE2B a9269d57777f83bb4936456bd0f82fc770a0a2b17b60be3925800e9d9ca0c6f478e19ab81db63cfa98dae9b53fbfa6c3e679f6e4e258c32051410ff80a37287f SHA512 79a6c92eb10a4e0e667ff0f6ccbb7dcd4bdf4a7cbf94ddab96cf925d9a82d7e0425cd191cd67b34b3e66e67b7fb12943b817c5cd8ccb04a11d98a2082efb60e2
+EBUILD clamav-1.1.0.ebuild 10835 BLAKE2B 46cb4264f8456374a00b1cb1a33de8dbc85595defb1361c1a44d561059ec00aa49f1747a7fe2699458338b410ed003f126056a74d220989102e3c190640c4e33 SHA512 46fc7bfbf40aa1bc13475ccbd0836c7f9a1b1407e8dd9ec976325d93789e8031c0e05aae32880d61162bafbcf62ff39210e74a8ca93044ac564efd2237ab4773
+EBUILD clamav-1.1.1-r1.ebuild 10941 BLAKE2B 19e26f498f8cf882b1a09f9fd802ae0d78ce29a62295876ca849ef892df3014aab19954a16b261aaed67c8c09d43e4e7132c13427f98910c6d1330beef1ab5e7 SHA512 2e429ff255e197b3e4837e97b56731b16fa41693fb5baa11d155bc1105539dfb5c18e7efb3a08321c15e48b04dd4cc4b979d708524ea2750c1d13c7786a1dea3
+EBUILD clamav-1.2.0_rc.ebuild 10844 BLAKE2B abf8e8ad455c82c7bc058e7a168607c112ed77e89b353ac6d3367f2532ae483f75e4100592c9c476d07d1cbe607398091c76f61e2390821761456ee8772e9df4 SHA512 bda9c254af8ad01f4e3d023a565bda61b28fd1360387f4f84851aae350c7c968ed80851bfc8bec426a92979cfee3bbb4486ebfa88ce60301309d5bb59f05a6c8
+MISC metadata.xml 1730 BLAKE2B aba280ce07d3b1260cd558e66749acf65b47dc2878eda7e971492bd1851a487bff7eaaedc7f7279067efae11f428e78c46dcdfd50e4daeefd0b8a89ea37f9f10 SHA512 739eaa4f97410e9d4c5d4ce22be4867c4738b5d4ee92cc2b377a2f1505e705be6cfb3471482ab563eae10a64bdbeea19b82e23c371386201bd7f3b85a065f99d
diff --git a/app-antivirus/clamav/clamav-0.103.8.ebuild b/app-antivirus/clamav/clamav-0.103.8.ebuild
index 9e8d308efe80..08bddbfd8a2b 100644
--- a/app-antivirus/clamav/clamav-0.103.8.ebuild
+++ b/app-antivirus/clamav/clamav-0.103.8.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.clamav.net/"
 SRC_URI="https://www.clamav.net/downloads/production/${P}.tar.gz"
 
 LICENSE="GPL-2"
-SLOT="0"
+SLOT="0/lts"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="bzip2 doc clamonacc clamdtop clamsubmit iconv ipv6 libclamav-only milter metadata-analysis-api selinux systemd test xml"
 
diff --git a/app-antivirus/clamav/clamav-0.103.9.ebuild b/app-antivirus/clamav/clamav-0.103.9.ebuild
index 91357ed70800..9c9b8b889cd2 100644
--- a/app-antivirus/clamav/clamav-0.103.9.ebuild
+++ b/app-antivirus/clamav/clamav-0.103.9.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.clamav.net/"
 SRC_URI="https://www.clamav.net/downloads/production/${P}.tar.gz"
 
 LICENSE="GPL-2"
-SLOT="0"
+SLOT="0/lts"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="bzip2 doc clamonacc clamdtop clamsubmit iconv ipv6 libclamav-only milter metadata-analysis-api selinux systemd test xml"
 
diff --git a/app-antivirus/clamav/clamav-1.0.1.ebuild b/app-antivirus/clamav/clamav-1.0.2-r1.ebuild
index 3df69b59aceb..a84aae216d09 100644
--- a/app-antivirus/clamav/clamav-1.0.1.ebuild
+++ b/app-antivirus/clamav/clamav-1.0.2-r1.ebuild
@@ -4,139 +4,136 @@
 EAPI=8
 
 LLVM_MAX_SLOT=13
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 # Auto-Generated by cargo-ebuild 0.5.4
 CRATES="
-	adler-1.0.2
-	aho-corasick-0.7.20
-	ansi_term-0.12.1
-	atty-0.2.14
-	autocfg-1.1.0
-	bindgen-0.59.2
-	bit_field-0.10.1
-	bitflags-1.3.2
-	block-buffer-0.10.3
-	bumpalo-3.12.0
-	bytemuck-1.13.0
-	byteorder-1.4.3
-	cbindgen-0.20.0
-	cexpr-0.6.0
-	cfg-if-1.0.0
-	clang-sys-1.4.0
-	clap-2.34.0
-	color_quant-1.1.0
-	cpufeatures-0.2.5
-	crc32fast-1.3.2
-	crossbeam-channel-0.5.6
-	crossbeam-deque-0.8.2
-	crossbeam-epoch-0.9.13
-	crossbeam-utils-0.8.14
-	crunchy-0.2.2
-	crypto-common-0.1.6
-	digest-0.10.6
-	either-1.8.1
-	env_logger-0.9.3
-	exr-1.5.3
-	fastrand-1.9.0
-	flate2-1.0.25
-	flume-0.10.14
-	futures-core-0.3.26
-	futures-sink-0.3.26
-	generic-array-0.14.6
-	getrandom-0.2.8
-	gif-0.11.4
-	glob-0.3.1
-	half-2.2.1
-	hashbrown-0.12.3
-	heck-0.3.3
-	hermit-abi-0.1.19
-	hermit-abi-0.2.6
-	hex-0.4.3
-	humantime-2.1.0
-	image-0.24.5
-	indexmap-1.9.2
-	instant-0.1.12
-	itoa-1.0.5
-	jpeg-decoder-0.3.0
-	js-sys-0.3.61
-	lazy_static-1.4.0
-	lazycell-1.3.0
-	lebe-0.5.2
-	libc-0.2.139
-	libloading-0.7.4
-	lock_api-0.4.9
-	log-0.4.17
-	memchr-2.5.0
-	memoffset-0.7.1
-	minimal-lexical-0.2.1
-	miniz_oxide-0.6.2
-	nanorand-0.7.0
-	nom-7.1.3
-	num-complex-0.4.3
-	num-integer-0.1.45
-	num-rational-0.4.1
-	num-traits-0.2.15
-	num_cpus-1.15.0
-	once_cell-1.17.1
-	peeking_take_while-0.1.2
-	pin-project-1.0.12
-	pin-project-internal-1.0.12
-	png-0.17.7
-	primal-check-0.3.3
-	proc-macro2-1.0.51
-	quote-1.0.23
-	rayon-1.6.1
-	rayon-core-1.10.2
-	redox_syscall-0.2.16
-	regex-1.7.1
-	regex-syntax-0.6.28
-	remove_dir_all-0.5.3
-	rustc-hash-1.1.0
-	rustdct-0.7.1
-	rustfft-6.1.0
-	ryu-1.0.12
-	scoped_threadpool-0.1.9
-	scopeguard-1.1.0
-	serde-1.0.152
-	serde_derive-1.0.152
-	serde_json-1.0.93
-	sha2-0.10.6
-	shlex-1.1.0
-	simd-adler32-0.3.4
-	smallvec-1.10.0
-	spin-0.9.5
-	strength_reduce-0.2.4
-	strsim-0.8.0
-	syn-1.0.107
-	tempfile-3.3.0
-	termcolor-1.2.0
-	textwrap-0.11.0
-	thiserror-1.0.38
-	thiserror-impl-1.0.38
-	threadpool-1.8.1
-	tiff-0.8.1
-	toml-0.5.11
-	transpose-0.2.2
-	typenum-1.16.0
-	unicode-ident-1.0.6
-	unicode-segmentation-1.10.1
-	unicode-width-0.1.10
-	vec_map-0.8.2
-	version_check-0.9.4
-	wasi-0.11.0+wasi-snapshot-preview1
-	wasm-bindgen-0.2.84
-	wasm-bindgen-backend-0.2.84
-	wasm-bindgen-macro-0.2.84
-	wasm-bindgen-macro-support-0.2.84
-	wasm-bindgen-shared-0.2.84
-	weezl-0.1.7
-	which-4.4.0
-	winapi-0.3.9
-	winapi-i686-pc-windows-gnu-0.4.0
-	winapi-util-0.1.5
-	winapi-x86_64-pc-windows-gnu-0.4.0
-	zune-inflate-0.2.50
+	adler@1.0.2
+	ansi_term@0.12.1
+	atty@0.2.14
+	autocfg@1.1.0
+	bindgen@0.65.1
+	bit_field@0.10.1
+	bitflags@1.3.2
+	block-buffer@0.10.3
+	bumpalo@3.12.0
+	bytemuck@1.13.0
+	byteorder@1.4.3
+	cbindgen@0.20.0
+	cexpr@0.6.0
+	cfg-if@1.0.0
+	clang-sys@1.4.0
+	clap@2.34.0
+	color_quant@1.1.0
+	cpufeatures@0.2.5
+	crc32fast@1.3.2
+	crossbeam-channel@0.5.6
+	crossbeam-deque@0.8.2
+	crossbeam-epoch@0.9.13
+	crossbeam-utils@0.8.14
+	crunchy@0.2.2
+	crypto-common@0.1.6
+	digest@0.10.6
+	either@1.8.1
+	exr@1.5.3
+	fastrand@1.8.0
+	flate2@1.0.25
+	flume@0.10.14
+	futures-core@0.3.26
+	futures-sink@0.3.26
+	generic-array@0.14.6
+	getrandom@0.2.8
+	gif@0.11.4
+	glob@0.3.1
+	half@2.2.1
+	hashbrown@0.12.3
+	heck@0.3.3
+	hermit-abi@0.1.19
+	hermit-abi@0.2.6
+	hex@0.4.3
+	image@0.24.5
+	indexmap@1.9.2
+	instant@0.1.12
+	itoa@1.0.5
+	jpeg-decoder@0.3.0
+	js-sys@0.3.61
+	lazy_static@1.4.0
+	lazycell@1.3.0
+	lebe@0.5.2
+	libc@0.2.139
+	libloading@0.7.4
+	lock_api@0.4.9
+	log@0.4.17
+	memchr@2.5.0
+	memoffset@0.7.1
+	minimal-lexical@0.2.1
+	miniz_oxide@0.6.2
+	nanorand@0.7.0
+	nom@7.1.3
+	num-complex@0.4.3
+	num-integer@0.1.45
+	num-rational@0.4.1
+	num-traits@0.2.15
+	num_cpus@1.15.0
+	once_cell@1.17.0
+	peeking_take_while@0.1.2
+	pin-project@1.0.12
+	pin-project-internal@1.0.12
+	png@0.17.7
+	prettyplease@0.2.4
+	primal-check@0.3.3
+	proc-macro2@1.0.66
+	quote@1.0.26
+	rayon@1.6.1
+	rayon-core@1.10.2
+	redox_syscall@0.2.16
+	regex@1.7.1
+	regex-syntax@0.6.28
+	remove_dir_all@0.5.3
+	rustc-hash@1.1.0
+	rustdct@0.7.1
+	rustfft@6.1.0
+	ryu@1.0.12
+	scoped_threadpool@0.1.9
+	scopeguard@1.1.0
+	serde@1.0.152
+	serde_derive@1.0.152
+	serde_json@1.0.93
+	sha2@0.10.6
+	shlex@1.1.0
+	simd-adler32@0.3.4
+	smallvec@1.10.0
+	spin@0.9.5
+	strength_reduce@0.2.4
+	strsim@0.8.0
+	syn@1.0.107
+	syn@2.0.15
+	tempfile@3.3.0
+	textwrap@0.11.0
+	thiserror@1.0.38
+	thiserror-impl@1.0.38
+	threadpool@1.8.1
+	tiff@0.8.1
+	toml@0.5.11
+	transpose@0.2.2
+	typenum@1.16.0
+	unicode-ident@1.0.6
+	unicode-segmentation@1.10.1
+	unicode-width@0.1.10
+	vec_map@0.8.2
+	version_check@0.9.4
+	wasi@0.11.0+wasi-snapshot-preview1
+	wasm-bindgen@0.2.84
+	wasm-bindgen-backend@0.2.84
+	wasm-bindgen-macro@0.2.84
+	wasm-bindgen-macro-support@0.2.84
+	wasm-bindgen-shared@0.2.84
+	weezl@0.1.7
+	which@4.4.0
+	winapi@0.3.9
+	winapi-i686-pc-windows-gnu@0.4.0
+	winapi-x86_64-pc-windows-gnu@0.4.0
+	zune-inflate@0.2.42
 "
 
 inherit cargo cmake flag-o-matic llvm python-any-r1 systemd tmpfiles
@@ -146,15 +143,16 @@ MY_P=${P//_/-}
 DESCRIPTION="Clam Anti-Virus Scanner"
 HOMEPAGE="https://www.clamav.net/"
 SRC_URI="https://github.com/Cisco-Talos/clamav/archive/refs/tags/${MY_P}.tar.gz
-	$(cargo_crate_uris ${CRATES})"
+	${CARGO_CRATE_URIS}"
 S=${WORKDIR}/clamav-${MY_P}
 
 LICENSE="Apache-2.0 BSD GPL-2 ISC MIT MPL-2.0 Unicode-DFS-2016 ZLIB"
-SLOT="0"
+SLOT="0/lts"
 if [[ ${PV} != *_rc* ]] ; then
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 fi
-IUSE="doc clamonacc +clamapp experimental jit libclamav-only milter rar selinux systemd test"
+
+IUSE="doc clamonacc +clamapp experimental jit libclamav-only milter rar selinux +system-mspack systemd test"
 
 REQUIRED_USE="libclamav-only? ( !clamonacc !clamapp !milter )
 	clamonacc? ( clamapp )
@@ -166,13 +164,12 @@ RESTRICT="!test? ( test )"
 # Require acct-{user,group}/clamav at build time so that we can set
 # the permissions on /var/lib/clamav in src_install rather than in
 # pkg_postinst; calling "chown" on the live filesystem scares me.
-CDEPEND="
+COMMON_DEPEND="
 	acct-group/clamav
 	acct-user/clamav
 	app-arch/bzip2
 	dev-libs/json-c:=
 	dev-libs/libltdl
-	dev-libs/libmspack
 	dev-libs/libpcre2:=
 	dev-libs/libxml2
 	dev-libs/openssl:=
@@ -184,12 +181,15 @@ CDEPEND="
 	jit? ( <sys-devel/llvm-$((${LLVM_MAX_SLOT} + 1)):= )
 	milter? ( mail-filter/libmilter:= )
 	rar? ( app-arch/unrar )
+	system-mspack? ( dev-libs/libmspack )
 	test? ( dev-python/pytest )
 "
 
+# rust-bin < 1.71 has an executable stack
+# which is not supported on selinux #911589
 BDEPEND="
 	virtual/pkgconfig
-	>=virtual/rust-1.61
+	>=virtual/rust-1.71
 	doc? ( app-doc/doxygen )
 	test? (
 		${PYTHON_DEPS}
@@ -197,10 +197,10 @@ BDEPEND="
 	)
 "
 
-DEPEND="${CDEPEND}
+DEPEND="${COMMON_DEPEND}
 	test? ( dev-libs/check )"
 
-RDEPEND="${CDEPEND}
+RDEPEND="${COMMON_DEPEND}
 	selinux? ( sec-policy/selinux-clamav )"
 
 python_check_deps() {
@@ -212,10 +212,6 @@ pkg_setup() {
 	use test && python-any-r1_pkg_setup
 }
 
-PATCHES=(
-	"${FILESDIR}/${P}-select-python.patch"
-)
-
 src_configure() {
 	use elibc_musl && append-ldflags -lfts
 	use ppc64 && append-flags -mminimal-toc
@@ -230,7 +226,7 @@ src_configure() {
 		-DENABLE_CLAMONACC=$(usex clamonacc ON OFF)
 		-DENABLE_DOXYGEN=$(usex doc)
 		-DENABLE_EXPERIMENTAL=$(usex experimental ON OFF)
-		-DENABLE_EXTERNAL_MSPACK=ON
+		-DENABLE_EXTERNAL_MSPACK=$(usex system-mspack ON OFF)
 		-DENABLE_JSON_SHARED=ON
 		-DENABLE_MAN_PAGES=ON
 		-DENABLE_MILTER=$(usex milter ON OFF)
@@ -276,8 +272,6 @@ src_install() {
 	use milter && \
 		newinitd "${FILESDIR}/clamav-milter.initd" clamav-milter
 
-	rm -rf "${ED}"/var/lib/clamav || die
-
 	if ! use libclamav-only ; then
 		if use systemd ; then
 			# The tmpfiles entry is behind USE=systemd because the
@@ -338,7 +332,7 @@ src_install() {
 				fi
 			done
 
-			# These both need to be writable by the clamav user.
+			# These both need to be writable by the clamav user
 			# TODO: use syslog by default; that's what it's for.
 			diropts -o clamav -g clamav
 			keepdir /var/lib/clamav
diff --git a/app-antivirus/clamav/clamav-1.1.0.ebuild b/app-antivirus/clamav/clamav-1.1.0.ebuild
index d5c739513e2c..1a8f89dcd169 100644
--- a/app-antivirus/clamav/clamav-1.1.0.ebuild
+++ b/app-antivirus/clamav/clamav-1.1.0.ebuild
@@ -182,7 +182,8 @@ SRC_URI="https://github.com/Cisco-Talos/clamav/archive/refs/tags/${MY_P}.tar.gz
 S=${WORKDIR}/clamav-${MY_P}
 
 LICENSE="Apache-2.0 BSD GPL-2 ISC MIT MPL-2.0 Unicode-DFS-2016 ZLIB"
-SLOT="0"
+# 0/sts (short term support) if not an LTS release
+SLOT="0/sts"
 if [[ ${PV} != *_rc* ]] ; then
 	KEYWORDS="~alpha amd64 ~arm arm64 ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 fi
diff --git a/app-antivirus/clamav/clamav-1.0.2.ebuild b/app-antivirus/clamav/clamav-1.1.1-r1.ebuild
index c1e9c7469c90..739161f72c14 100644
--- a/app-antivirus/clamav/clamav-1.0.2.ebuild
+++ b/app-antivirus/clamav/clamav-1.1.1-r1.ebuild
@@ -4,136 +4,172 @@
 EAPI=8
 
 LLVM_MAX_SLOT=13
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 # Auto-Generated by cargo-ebuild 0.5.4
 CRATES="
-	adler-1.0.2
-	ansi_term-0.12.1
-	atty-0.2.14
-	autocfg-1.1.0
-	bindgen-0.65.1
-	bit_field-0.10.1
-	bitflags-1.3.2
-	block-buffer-0.10.3
-	bumpalo-3.12.0
-	bytemuck-1.13.0
-	byteorder-1.4.3
-	cbindgen-0.20.0
-	cexpr-0.6.0
-	cfg-if-1.0.0
-	clang-sys-1.4.0
-	clap-2.34.0
-	color_quant-1.1.0
-	cpufeatures-0.2.5
-	crc32fast-1.3.2
-	crossbeam-channel-0.5.6
-	crossbeam-deque-0.8.2
-	crossbeam-epoch-0.9.13
-	crossbeam-utils-0.8.14
-	crunchy-0.2.2
-	crypto-common-0.1.6
-	digest-0.10.6
-	either-1.8.1
-	exr-1.5.3
-	fastrand-1.8.0
-	flate2-1.0.25
-	flume-0.10.14
-	futures-core-0.3.26
-	futures-sink-0.3.26
-	generic-array-0.14.6
-	getrandom-0.2.8
-	gif-0.11.4
-	glob-0.3.1
-	half-2.2.1
-	hashbrown-0.12.3
-	heck-0.3.3
-	hermit-abi-0.1.19
-	hermit-abi-0.2.6
-	hex-0.4.3
-	image-0.24.5
-	indexmap-1.9.2
-	instant-0.1.12
-	itoa-1.0.5
-	jpeg-decoder-0.3.0
-	js-sys-0.3.61
-	lazy_static-1.4.0
-	lazycell-1.3.0
-	lebe-0.5.2
-	libc-0.2.139
-	libloading-0.7.4
-	lock_api-0.4.9
-	log-0.4.17
-	memchr-2.5.0
-	memoffset-0.7.1
-	minimal-lexical-0.2.1
-	miniz_oxide-0.6.2
-	nanorand-0.7.0
-	nom-7.1.3
-	num-complex-0.4.3
-	num-integer-0.1.45
-	num-rational-0.4.1
-	num-traits-0.2.15
-	num_cpus-1.15.0
-	once_cell-1.17.0
-	peeking_take_while-0.1.2
-	pin-project-1.0.12
-	pin-project-internal-1.0.12
-	png-0.17.7
-	prettyplease-0.2.4
-	primal-check-0.3.3
-	proc-macro2-1.0.66
-	quote-1.0.26
-	rayon-1.6.1
-	rayon-core-1.10.2
-	redox_syscall-0.2.16
-	regex-1.7.1
-	regex-syntax-0.6.28
-	remove_dir_all-0.5.3
-	rustc-hash-1.1.0
-	rustdct-0.7.1
-	rustfft-6.1.0
-	ryu-1.0.12
-	scoped_threadpool-0.1.9
-	scopeguard-1.1.0
-	serde-1.0.152
-	serde_derive-1.0.152
-	serde_json-1.0.93
-	sha2-0.10.6
-	shlex-1.1.0
-	simd-adler32-0.3.4
-	smallvec-1.10.0
-	spin-0.9.5
-	strength_reduce-0.2.4
-	strsim-0.8.0
-	syn-1.0.107
-	syn-2.0.15
-	tempfile-3.3.0
-	textwrap-0.11.0
-	thiserror-1.0.38
-	thiserror-impl-1.0.38
-	threadpool-1.8.1
-	tiff-0.8.1
-	toml-0.5.11
-	transpose-0.2.2
-	typenum-1.16.0
-	unicode-ident-1.0.6
-	unicode-segmentation-1.10.1
-	unicode-width-0.1.10
-	vec_map-0.8.2
-	version_check-0.9.4
-	wasi-0.11.0+wasi-snapshot-preview1
-	wasm-bindgen-0.2.84
-	wasm-bindgen-backend-0.2.84
-	wasm-bindgen-macro-0.2.84
-	wasm-bindgen-macro-support-0.2.84
-	wasm-bindgen-shared-0.2.84
-	weezl-0.1.7
-	which-4.4.0
-	winapi-0.3.9
-	winapi-i686-pc-windows-gnu-0.4.0
-	winapi-x86_64-pc-windows-gnu-0.4.0
-	zune-inflate-0.2.42
+	adler@1.0.2
+	aho-corasick@0.7.20
+	ansi_term@0.12.1
+	atty@0.2.14
+	autocfg@1.1.0
+	base64@0.21.0
+	bindgen@0.59.2
+	bit_field@0.10.2
+	bitflags@1.3.2
+	block-buffer@0.10.4
+	bumpalo@3.12.0
+	bytemuck@1.13.1
+	byteorder@1.4.3
+	cbindgen@0.24.3
+	cc@1.0.79
+	cexpr@0.6.0
+	cfg-if@1.0.0
+	clang-sys@1.6.1
+	clap@2.34.0
+	clap@3.2.23
+	clap_lex@0.2.4
+	color_quant@1.1.0
+	cpufeatures@0.2.6
+	crc32fast@1.3.2
+	crossbeam-channel@0.5.8
+	crossbeam-deque@0.8.3
+	crossbeam-epoch@0.9.14
+	crossbeam-utils@0.8.15
+	crunchy@0.2.2
+	crypto-common@0.1.6
+	digest@0.10.6
+	either@1.8.1
+	env_logger@0.9.3
+	errno@0.3.1
+	errno-dragonfly@0.1.2
+	exr@1.6.3
+	fastrand@1.9.0
+	fdeflate@0.3.0
+	flate2@1.0.25
+	flume@0.10.14
+	futures-core@0.3.28
+	futures-sink@0.3.28
+	generic-array@0.14.7
+	getrandom@0.2.9
+	gif@0.12.0
+	glob@0.3.1
+	half@2.2.1
+	hashbrown@0.12.3
+	heck@0.4.1
+	hermit-abi@0.1.19
+	hermit-abi@0.2.6
+	hermit-abi@0.3.1
+	hex@0.4.3
+	humantime@2.1.0
+	image@0.24.6
+	indexmap@1.9.3
+	instant@0.1.12
+	io-lifetimes@1.0.10
+	itoa@1.0.6
+	jpeg-decoder@0.3.0
+	js-sys@0.3.61
+	lazy_static@1.4.0
+	lazycell@1.3.0
+	lebe@0.5.2
+	libc@0.2.141
+	libloading@0.7.4
+	linux-raw-sys@0.3.1
+	lock_api@0.4.9
+	log@0.4.17
+	memchr@2.5.0
+	memoffset@0.8.0
+	minimal-lexical@0.2.1
+	miniz_oxide@0.6.2
+	miniz_oxide@0.7.1
+	nanorand@0.7.0
+	nom@7.1.3
+	num-complex@0.4.3
+	num-integer@0.1.45
+	num-rational@0.4.1
+	num-traits@0.2.15
+	num_cpus@1.15.0
+	once_cell@1.17.1
+	os_str_bytes@6.5.0
+	peeking_take_while@0.1.2
+	pin-project@1.0.12
+	pin-project-internal@1.0.12
+	png@0.17.8
+	primal-check@0.3.3
+	proc-macro2@1.0.66
+	qoi@0.4.1
+	quote@1.0.26
+	rayon@1.7.0
+	rayon-core@1.11.0
+	redox_syscall@0.3.5
+	regex@1.7.3
+	regex-syntax@0.6.29
+	rustc-hash@1.1.0
+	rustdct@0.7.1
+	rustfft@6.1.0
+	rustix@0.37.11
+	ryu@1.0.13
+	scopeguard@1.1.0
+	serde@1.0.160
+	serde_derive@1.0.160
+	serde_json@1.0.96
+	sha1@0.10.5
+	sha2@0.10.6
+	shlex@1.1.0
+	simd-adler32@0.3.5
+	smallvec@1.10.0
+	spin@0.9.8
+	strength_reduce@0.2.4
+	strsim@0.8.0
+	strsim@0.10.0
+	syn@1.0.109
+	syn@2.0.15
+	tempfile@3.5.0
+	termcolor@1.2.0
+	textwrap@0.11.0
+	textwrap@0.16.0
+	thiserror@1.0.40
+	thiserror-impl@1.0.40
+	tiff@0.8.1
+	toml@0.5.11
+	transpose@0.2.2
+	typenum@1.16.0
+	unicode-ident@1.0.8
+	unicode-segmentation@1.10.1
+	unicode-width@0.1.10
+	vec_map@0.8.2
+	version_check@0.9.4
+	wasi@0.11.0+wasi-snapshot-preview1
+	wasm-bindgen@0.2.84
+	wasm-bindgen-backend@0.2.84
+	wasm-bindgen-macro@0.2.84
+	wasm-bindgen-macro-support@0.2.84
+	wasm-bindgen-shared@0.2.84
+	weezl@0.1.7
+	which@4.4.0
+	winapi@0.3.9
+	winapi-i686-pc-windows-gnu@0.4.0
+	winapi-util@0.1.5
+	winapi-x86_64-pc-windows-gnu@0.4.0
+	windows-sys@0.45.0
+	windows-sys@0.48.0
+	windows-targets@0.42.2
+	windows-targets@0.48.0
+	windows_aarch64_gnullvm@0.42.2
+	windows_aarch64_gnullvm@0.48.0
+	windows_aarch64_msvc@0.42.2
+	windows_aarch64_msvc@0.48.0
+	windows_i686_gnu@0.42.2
+	windows_i686_gnu@0.48.0
+	windows_i686_msvc@0.42.2
+	windows_i686_msvc@0.48.0
+	windows_x86_64_gnu@0.42.2
+	windows_x86_64_gnu@0.48.0
+	windows_x86_64_gnullvm@0.42.2
+	windows_x86_64_gnullvm@0.48.0
+	windows_x86_64_msvc@0.42.2
+	windows_x86_64_msvc@0.48.0
+	zune-inflate@0.2.53
 "
 
 inherit cargo cmake flag-o-matic llvm python-any-r1 systemd tmpfiles
@@ -143,15 +179,17 @@ MY_P=${P//_/-}
 DESCRIPTION="Clam Anti-Virus Scanner"
 HOMEPAGE="https://www.clamav.net/"
 SRC_URI="https://github.com/Cisco-Talos/clamav/archive/refs/tags/${MY_P}.tar.gz
-	$(cargo_crate_uris ${CRATES})"
+	${CARGO_CRATE_URIS}"
 S=${WORKDIR}/clamav-${MY_P}
 
 LICENSE="Apache-2.0 BSD GPL-2 ISC MIT MPL-2.0 Unicode-DFS-2016 ZLIB"
-SLOT="0"
+# 0/sts (short term support) if not an LTS release
+SLOT="0/sts"
 if [[ ${PV} != *_rc* ]] ; then
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 fi
-IUSE="doc clamonacc +clamapp experimental jit libclamav-only milter rar selinux systemd test"
+
+IUSE="doc clamonacc +clamapp experimental jit libclamav-only milter rar selinux +system-mspack systemd test"
 
 REQUIRED_USE="libclamav-only? ( !clamonacc !clamapp !milter )
 	clamonacc? ( clamapp )
@@ -163,13 +201,12 @@ RESTRICT="!test? ( test )"
 # Require acct-{user,group}/clamav at build time so that we can set
 # the permissions on /var/lib/clamav in src_install rather than in
 # pkg_postinst; calling "chown" on the live filesystem scares me.
-CDEPEND="
+COMMON_DEPEND="
 	acct-group/clamav
 	acct-user/clamav
 	app-arch/bzip2
 	dev-libs/json-c:=
 	dev-libs/libltdl
-	dev-libs/libmspack
 	dev-libs/libpcre2:=
 	dev-libs/libxml2
 	dev-libs/openssl:=
@@ -181,12 +218,15 @@ CDEPEND="
 	jit? ( <sys-devel/llvm-$((${LLVM_MAX_SLOT} + 1)):= )
 	milter? ( mail-filter/libmilter:= )
 	rar? ( app-arch/unrar )
+	system-mspack? ( dev-libs/libmspack )
 	test? ( dev-python/pytest )
 "
 
+# rust-bin < 1.71 has an executable stack
+# which is not supported on selinux #911589
 BDEPEND="
 	virtual/pkgconfig
-	>=virtual/rust-1.61
+	>=virtual/rust-1.71
 	doc? ( app-doc/doxygen )
 	test? (
 		${PYTHON_DEPS}
@@ -194,10 +234,10 @@ BDEPEND="
 	)
 "
 
-DEPEND="${CDEPEND}
+DEPEND="${COMMON_DEPEND}
 	test? ( dev-libs/check )"
 
-RDEPEND="${CDEPEND}
+RDEPEND="${COMMON_DEPEND}
 	selinux? ( sec-policy/selinux-clamav )"
 
 python_check_deps() {
@@ -209,10 +249,6 @@ pkg_setup() {
 	use test && python-any-r1_pkg_setup
 }
 
-PATCHES=(
-	"${FILESDIR}/${PN}-1.0.1-select-python.patch"
-)
-
 src_configure() {
 	use elibc_musl && append-ldflags -lfts
 	use ppc64 && append-flags -mminimal-toc
@@ -227,7 +263,7 @@ src_configure() {
 		-DENABLE_CLAMONACC=$(usex clamonacc ON OFF)
 		-DENABLE_DOXYGEN=$(usex doc)
 		-DENABLE_EXPERIMENTAL=$(usex experimental ON OFF)
-		-DENABLE_EXTERNAL_MSPACK=ON
+		-DENABLE_EXTERNAL_MSPACK=$(usex system-mspack ON OFF)
 		-DENABLE_JSON_SHARED=ON
 		-DENABLE_MAN_PAGES=ON
 		-DENABLE_MILTER=$(usex milter ON OFF)
@@ -273,8 +309,6 @@ src_install() {
 	use milter && \
 		newinitd "${FILESDIR}/clamav-milter.initd" clamav-milter
 
-	rm -rf "${ED}"/var/lib/clamav || die
-
 	if ! use libclamav-only ; then
 		if use systemd ; then
 			# The tmpfiles entry is behind USE=systemd because the
@@ -335,7 +369,7 @@ src_install() {
 				fi
 			done
 
-			# These both need to be writable by the clamav user.
+			# These both need to be writable by the clamav user
 			# TODO: use syslog by default; that's what it's for.
 			diropts -o clamav -g clamav
 			keepdir /var/lib/clamav
diff --git a/app-antivirus/clamav/clamav-1.1.1.ebuild b/app-antivirus/clamav/clamav-1.1.1.ebuild
deleted file mode 100644
index 59f30870a34d..000000000000
--- a/app-antivirus/clamav/clamav-1.1.1.ebuild
+++ /dev/null
@@ -1,419 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_MAX_SLOT=13
-PYTHON_COMPAT=( python3_{9..11} )
-
-# Auto-Generated by cargo-ebuild 0.5.4
-CRATES="
-	adler-1.0.2
-	aho-corasick-0.7.20
-	ansi_term-0.12.1
-	atty-0.2.14
-	autocfg-1.1.0
-	base64-0.21.0
-	bindgen-0.59.2
-	bit_field-0.10.2
-	bitflags-1.3.2
-	block-buffer-0.10.4
-	bumpalo-3.12.0
-	bytemuck-1.13.1
-	byteorder-1.4.3
-	cbindgen-0.24.3
-	cc-1.0.79
-	cexpr-0.6.0
-	cfg-if-1.0.0
-	clang-sys-1.6.1
-	clap-2.34.0
-	clap-3.2.23
-	clap_lex-0.2.4
-	color_quant-1.1.0
-	cpufeatures-0.2.6
-	crc32fast-1.3.2
-	crossbeam-channel-0.5.8
-	crossbeam-deque-0.8.3
-	crossbeam-epoch-0.9.14
-	crossbeam-utils-0.8.15
-	crunchy-0.2.2
-	crypto-common-0.1.6
-	digest-0.10.6
-	either-1.8.1
-	env_logger-0.9.3
-	errno-0.3.1
-	errno-dragonfly-0.1.2
-	exr-1.6.3
-	fastrand-1.9.0
-	fdeflate-0.3.0
-	flate2-1.0.25
-	flume-0.10.14
-	futures-core-0.3.28
-	futures-sink-0.3.28
-	generic-array-0.14.7
-	getrandom-0.2.9
-	gif-0.12.0
-	glob-0.3.1
-	half-2.2.1
-	hashbrown-0.12.3
-	heck-0.4.1
-	hermit-abi-0.1.19
-	hermit-abi-0.2.6
-	hermit-abi-0.3.1
-	hex-0.4.3
-	humantime-2.1.0
-	image-0.24.6
-	indexmap-1.9.3
-	instant-0.1.12
-	io-lifetimes-1.0.10
-	itoa-1.0.6
-	jpeg-decoder-0.3.0
-	js-sys-0.3.61
-	lazy_static-1.4.0
-	lazycell-1.3.0
-	lebe-0.5.2
-	libc-0.2.141
-	libloading-0.7.4
-	linux-raw-sys-0.3.1
-	lock_api-0.4.9
-	log-0.4.17
-	memchr-2.5.0
-	memoffset-0.8.0
-	minimal-lexical-0.2.1
-	miniz_oxide-0.6.2
-	miniz_oxide-0.7.1
-	nanorand-0.7.0
-	nom-7.1.3
-	num-complex-0.4.3
-	num-integer-0.1.45
-	num-rational-0.4.1
-	num-traits-0.2.15
-	num_cpus-1.15.0
-	once_cell-1.17.1
-	os_str_bytes-6.5.0
-	peeking_take_while-0.1.2
-	pin-project-1.0.12
-	pin-project-internal-1.0.12
-	png-0.17.8
-	primal-check-0.3.3
-	proc-macro2-1.0.66
-	qoi-0.4.1
-	quote-1.0.26
-	rayon-1.7.0
-	rayon-core-1.11.0
-	redox_syscall-0.3.5
-	regex-1.7.3
-	regex-syntax-0.6.29
-	rustc-hash-1.1.0
-	rustdct-0.7.1
-	rustfft-6.1.0
-	rustix-0.37.11
-	ryu-1.0.13
-	scopeguard-1.1.0
-	serde-1.0.160
-	serde_derive-1.0.160
-	serde_json-1.0.96
-	sha1-0.10.5
-	sha2-0.10.6
-	shlex-1.1.0
-	simd-adler32-0.3.5
-	smallvec-1.10.0
-	spin-0.9.8
-	strength_reduce-0.2.4
-	strsim-0.8.0
-	strsim-0.10.0
-	syn-1.0.109
-	syn-2.0.15
-	tempfile-3.5.0
-	termcolor-1.2.0
-	textwrap-0.11.0
-	textwrap-0.16.0
-	thiserror-1.0.40
-	thiserror-impl-1.0.40
-	tiff-0.8.1
-	toml-0.5.11
-	transpose-0.2.2
-	typenum-1.16.0
-	unicode-ident-1.0.8
-	unicode-segmentation-1.10.1
-	unicode-width-0.1.10
-	vec_map-0.8.2
-	version_check-0.9.4
-	wasi-0.11.0+wasi-snapshot-preview1
-	wasm-bindgen-0.2.84
-	wasm-bindgen-backend-0.2.84
-	wasm-bindgen-macro-0.2.84
-	wasm-bindgen-macro-support-0.2.84
-	wasm-bindgen-shared-0.2.84
-	weezl-0.1.7
-	which-4.4.0
-	winapi-0.3.9
-	winapi-i686-pc-windows-gnu-0.4.0
-	winapi-util-0.1.5
-	winapi-x86_64-pc-windows-gnu-0.4.0
-	windows-sys-0.45.0
-	windows-sys-0.48.0
-	windows-targets-0.42.2
-	windows-targets-0.48.0
-	windows_aarch64_gnullvm-0.42.2
-	windows_aarch64_gnullvm-0.48.0
-	windows_aarch64_msvc-0.42.2
-	windows_aarch64_msvc-0.48.0
-	windows_i686_gnu-0.42.2
-	windows_i686_gnu-0.48.0
-	windows_i686_msvc-0.42.2
-	windows_i686_msvc-0.48.0
-	windows_x86_64_gnu-0.42.2
-	windows_x86_64_gnu-0.48.0
-	windows_x86_64_gnullvm-0.42.2
-	windows_x86_64_gnullvm-0.48.0
-	windows_x86_64_msvc-0.42.2
-	windows_x86_64_msvc-0.48.0
-	zune-inflate-0.2.53
-"
-
-inherit cargo cmake flag-o-matic llvm python-any-r1 systemd tmpfiles
-
-MY_P=${P//_/-}
-
-DESCRIPTION="Clam Anti-Virus Scanner"
-HOMEPAGE="https://www.clamav.net/"
-SRC_URI="https://github.com/Cisco-Talos/clamav/archive/refs/tags/${MY_P}.tar.gz
-	$(cargo_crate_uris ${CRATES})"
-S=${WORKDIR}/clamav-${MY_P}
-
-LICENSE="Apache-2.0 BSD GPL-2 ISC MIT MPL-2.0 Unicode-DFS-2016 ZLIB"
-SLOT="0"
-if [[ ${PV} != *_rc* ]] ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-fi
-IUSE="doc clamonacc +clamapp experimental jit libclamav-only milter rar selinux systemd test"
-
-REQUIRED_USE="libclamav-only? ( !clamonacc !clamapp !milter )
-	clamonacc? ( clamapp )
-	milter? ( clamapp )
-	test? ( !libclamav-only )"
-
-RESTRICT="!test? ( test )"
-
-# Require acct-{user,group}/clamav at build time so that we can set
-# the permissions on /var/lib/clamav in src_install rather than in
-# pkg_postinst; calling "chown" on the live filesystem scares me.
-CDEPEND="
-	acct-group/clamav
-	acct-user/clamav
-	app-arch/bzip2
-	dev-libs/json-c:=
-	dev-libs/libltdl
-	dev-libs/libmspack
-	dev-libs/libpcre2:=
-	dev-libs/libxml2
-	dev-libs/openssl:=
-	>=sys-libs/zlib-1.2.2:=
-	virtual/libiconv
-	!libclamav-only? ( net-misc/curl )
-	clamapp? ( sys-libs/ncurses:= net-misc/curl )
-	elibc_musl? ( sys-libs/fts-standalone )
-	jit? ( <sys-devel/llvm-$((${LLVM_MAX_SLOT} + 1)):= )
-	milter? ( mail-filter/libmilter:= )
-	rar? ( app-arch/unrar )
-	test? ( dev-python/pytest )
-"
-
-BDEPEND="
-	virtual/pkgconfig
-	>=virtual/rust-1.61
-	doc? ( app-doc/doxygen )
-	test? (
-		${PYTHON_DEPS}
-		$(python_gen_any_dep 'dev-python/pytest[${PYTHON_USEDEP}]')
-	)
-"
-
-DEPEND="${CDEPEND}
-	test? ( dev-libs/check )"
-
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-clamav )"
-
-python_check_deps() {
-	python_has_version -b "dev-python/pytest[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use jit && llvm_pkg_setup
-	use test && python-any-r1_pkg_setup
-}
-
-#PATCHES=(
-#)
-
-src_configure() {
-	use elibc_musl && append-ldflags -lfts
-	use ppc64 && append-flags -mminimal-toc
-
-	local mycmakeargs=(
-		-DAPP_CONFIG_DIRECTORY="${EPREFIX}"/etc/clamav
-		-DBYTECODE_RUNTIME=$(usex jit llvm interpreter)
-		-DCLAMAV_GROUP="clamav"
-		-DCLAMAV_USER="clamav"
-		-DDATABASE_DIRECTORY="${EPREFIX}"/var/lib/clamav
-		-DENABLE_APP=$(usex clamapp ON OFF)
-		-DENABLE_CLAMONACC=$(usex clamonacc ON OFF)
-		-DENABLE_DOXYGEN=$(usex doc)
-		-DENABLE_EXPERIMENTAL=$(usex experimental ON OFF)
-		-DENABLE_EXTERNAL_MSPACK=ON
-		-DENABLE_JSON_SHARED=ON
-		-DENABLE_MAN_PAGES=ON
-		-DENABLE_MILTER=$(usex milter ON OFF)
-		-DENABLE_SHARED_LIB=ON
-		-DENABLE_STATIC_LIB=OFF
-		-DENABLE_SYSTEMD=$(usex systemd ON OFF)
-		-DENABLE_TESTS=$(usex test ON OFF)
-		-DENABLE_UNRAR=$(usex rar ON OFF)
-		-DOPTIMIZE=ON
-	)
-
-	if use test ; then
-		# https://bugs.gentoo.org/818673
-		# Used to enable some more tests but doesn't behave well in
-		# sandbox necessarily(?) + needs certain debug symbols present
-		# in e.g. glibc.
-		mycmakeargs+=(
-			-DCMAKE_DISABLE_FIND_PACKAGE_Valgrind=ON
-			-DPYTHON_FIND_VERSION="${EPYTHON#python}"
-		)
-	fi
-
-	if use jit ; then
-		# Suppress CMake warnings that variables aren't consumed if we aren't using LLVM
-		# https://github.com/Cisco-Talos/clamav/blob/main/INSTALL.md#llvm-optional-see-bytecode-runtime-section
-		# https://github.com/Cisco-Talos/clamav/blob/main/INSTALL.md#bytecode-runtime
-		mycmakeargs+=(
-			-DLLVM_ROOT_DIR="$(get_llvm_prefix -d ${LLVM_MAX_SLOT})"
-			-DLLVM_FIND_VERSION="$(best_version sys-devel/llvm:${LLVM_MAX_SLOT} | cut -c 16-)"
-		)
-	fi
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	# init scripts
-	newinitd "${FILESDIR}/clamd.initd" clamd
-	newinitd "${FILESDIR}/freshclam.initd" freshclam
-	use clamonacc && \
-		newinitd "${FILESDIR}/clamonacc.initd" clamonacc
-	use milter && \
-		newinitd "${FILESDIR}/clamav-milter.initd" clamav-milter
-
-	rm -rf "${ED}"/var/lib/clamav || die
-
-	if ! use libclamav-only ; then
-		if use systemd ; then
-			# The tmpfiles entry is behind USE=systemd because the
-			# upstream OpenRC service files should (and do) ensure that
-			# the directories they need exist and have the correct
-			# permissions without the help of opentmpfiles. There are
-			# years-old root exploits in opentmpfiles, the design is
-			# fundamentally flawed, and the maintainer is not up to
-			# the task of fixing it.
-			dotmpfiles "${FILESDIR}/tmpfiles.d/clamav.conf"
-			systemd_newunit "${FILESDIR}/clamd_at.service-0.104.0" "clamd@.service"
-			systemd_dounit "${FILESDIR}/clamd.service"
-			systemd_newunit "${FILESDIR}/freshclamd.service-r1" \
-							"freshclamd.service"
-		fi
-
-		if use clamapp ; then
-			# Modify /etc/{clamd,freshclam}.conf to be usable out of the box
-			sed -e "s:^\(Example\):\# \1:" \
-				-e "s/^#\(PidFile .*\)/\1/" \
-				-e "s/^#\(LocalSocket .*\)/\1/" \
-				-e "s/^#\(User .*\)/\1/" \
-				-e "s:^\#\(LogFile\) .*:\1 ${EPREFIX}/var/log/clamav/clamd.log:" \
-				-e "s:^\#\(LogTime\).*:\1 yes:" \
-				-e "s/^#\(DatabaseDirectory .*\)/\1/" \
-				"${ED}"/etc/clamav/clamd.conf.sample > \
-				"${ED}"/etc/clamav/clamd.conf || die
-
-			sed -e "s:^\(Example\):\# \1:" \
-				-e "s/^#\(PidFile .*\)/\1/" \
-				-e "s/^#\(DatabaseOwner .*\)/\1/" \
-				-e "s:^\#\(UpdateLogFile\) .*:\1 ${EPREFIX}/var/log/clamav/freshclam.log:" \
-				-e "s:^\#\(NotifyClamd\).*:\1 ${EPREFIX}/etc/clamav/clamd.conf:" \
-				-e "s:^\#\(ScriptedUpdates\).*:\1 yes:" \
-				-e "s/^#\(DatabaseDirectory .*\)/\1/" \
-				"${ED}"/etc/clamav/freshclam.conf.sample > \
-				"${ED}"/etc/clamav/freshclam.conf || die
-
-			if use milter ; then
-				# Note: only keep the "unix" ClamdSocket and MilterSocket!
-				sed -e "s:^\(Example\):\# \1:" \
-					-e "s/^#\(PidFile .*\)/\1/" \
-					-e "s/^#\(ClamdSocket unix:.*\)/\1/" \
-					-e "s/^#\(User .*\)/\1/" \
-					-e "s/^#\(MilterSocket unix:.*\)/\1/" \
-					-e "s:^\#\(LogFile\) .*:\1 ${EPREFIX}/var/log/clamav/clamav-milter.log:" \
-					"${ED}"/etc/clamav/clamav-milter.conf.sample > \
-					"${ED}"/etc/clamav/clamav-milter.conf || die
-
-				systemd_newunit "${FILESDIR}/clamav-milter.service-0.104.0" clamav-milter.service
-			fi
-
-			local i
-			for i in clamd freshclam clamav-milter
-			do
-				if [[ -f "${ED}"/etc/"${i}".conf.sample ]] ; then
-					mv "${ED}"/etc/"${i}".conf{.sample,} || die
-				fi
-			done
-
-			# These both need to be writable by the clamav user.
-			# TODO: use syslog by default; that's what it's for.
-			diropts -o clamav -g clamav
-			keepdir /var/lib/clamav
-			keepdir /var/log/clamav
-		fi
-	fi
-
-	if use doc ; then
-		local HTML_DOCS=( docs/html/. )
-		einstalldocs
-	fi
-
-	# Don't install man pages for utilities we didn't install
-	if use libclamav-only ; then
-		rm -r "${ED}"/usr/share/man || die
-	fi
-
-	find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	if ! use libclamav-only ; then
-		if use systemd ; then
-			tmpfiles_process clamav.conf
-		fi
-	fi
-
-	if use milter ; then
-		elog "For simple instructions how to setup the clamav-milter read the"
-		elog "clamav-milter.README.gentoo in /usr/share/doc/${PF}"
-	fi
-
-	local databases=( "${EROOT}"/var/lib/clamav/main.c[lv]d )
-	if [[ ! -f "${databases}" ]] ; then
-		ewarn "You must run freshclam manually to populate the virus database"
-		ewarn "before starting clamav for the first time."
-	fi
-
-	 if ! systemd_is_booted ; then
-		ewarn "This version of ClamAV provides separate OpenRC services"
-		ewarn "for clamd, freshclam, clamav-milter, and clamonacc. The"
-		ewarn "clamd service now starts only the clamd daemon itself. You"
-		ewarn "should add freshclam (and perhaps clamav-milter) to any"
-		ewarn "runlevels that previously contained clamd."
-	fi
-}
diff --git a/app-antivirus/clamav/clamav-1.2.0_rc.ebuild b/app-antivirus/clamav/clamav-1.2.0_rc.ebuild
index 58bd5cfeb5d5..634cb887c9f3 100644
--- a/app-antivirus/clamav/clamav-1.2.0_rc.ebuild
+++ b/app-antivirus/clamav/clamav-1.2.0_rc.ebuild
@@ -169,12 +169,13 @@ SRC_URI="https://github.com/Cisco-Talos/clamav/archive/refs/tags/${MY_P}.tar.gz
 S=${WORKDIR}/clamav-${MY_P}
 
 LICENSE="Apache-2.0 BSD GPL-2 ISC MIT MPL-2.0 Unicode-DFS-2016 ZLIB"
-SLOT="0"
+# 0/sts (short term support) if not an LTS release
+SLOT="0/sts"
 if [[ ${PV} != *_rc* ]] ; then
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 fi
 
-IUSE="doc clamonacc +clamapp experimental jit libclamav-only milter rar selinux systemd test"
+IUSE="doc clamonacc +clamapp experimental jit libclamav-only milter rar selinux +system-mspack systemd test"
 
 REQUIRED_USE="libclamav-only? ( !clamonacc !clamapp !milter )
 	clamonacc? ( clamapp )
@@ -192,7 +193,6 @@ COMMON_DEPEND="
 	app-arch/bzip2
 	dev-libs/json-c:=
 	dev-libs/libltdl
-	dev-libs/libmspack
 	dev-libs/libpcre2:=
 	dev-libs/libxml2
 	dev-libs/openssl:=
@@ -204,12 +204,14 @@ COMMON_DEPEND="
 	jit? ( <sys-devel/llvm-$((${LLVM_MAX_SLOT} + 1)):= )
 	milter? ( mail-filter/libmilter:= )
 	rar? ( app-arch/unrar )
+	system-mspack? ( dev-libs/libmspack )
 	test? ( dev-python/pytest )
 "
-
+# rust-bin < 1.71 has an executable stack
+# which is not supported on selinux #911589
 BDEPEND="
 	virtual/pkgconfig
-	>=virtual/rust-1.61
+	>=virtual/rust-1.71
 	doc? ( app-doc/doxygen )
 	test? (
 		${PYTHON_DEPS}
@@ -246,7 +248,7 @@ src_configure() {
 		-DENABLE_CLAMONACC=$(usex clamonacc ON OFF)
 		-DENABLE_DOXYGEN=$(usex doc)
 		-DENABLE_EXPERIMENTAL=$(usex experimental ON OFF)
-		-DENABLE_EXTERNAL_MSPACK=ON
+		-DENABLE_EXTERNAL_MSPACK=$(usex system-mspack ON OFF)
 		-DENABLE_JSON_SHARED=ON
 		-DENABLE_MAN_PAGES=ON
 		-DENABLE_MILTER=$(usex milter ON OFF)
@@ -352,10 +354,8 @@ src_install() {
 				fi
 			done
 
-			# These both need to be writable by the clamav user;
-			# remove the installer-created empty directories
+			# These both need to be writable by the clamav user
 			# TODO: use syslog by default; that's what it's for.
-			rm -r "${ED}"/var/lib/clamav || die
 			diropts -o clamav -g clamav
 			keepdir /var/lib/clamav
 			keepdir /var/log/clamav
diff --git a/app-antivirus/clamav/metadata.xml b/app-antivirus/clamav/metadata.xml
index b28f9ad70e51..ad6c8d27e1b3 100644
--- a/app-antivirus/clamav/metadata.xml
+++ b/app-antivirus/clamav/metadata.xml
@@ -21,17 +21,17 @@
 		<flag name="clamapp">
 			Build applications (clamscan, clamd, clamdscan, clamonacc (also has its own USE flag), sigtool, clambc, clamav-milter (also requires milter USE flag), clamdtop, clamsubmit, clamconf).
 		</flag>
-		<flag name="clamonacc">Build the clamonacc on-access scanner</flag>
 		<flag name="clamdtop">A Top like tool which shows what clamd is currently scanning amongst other things</flag>
+		<flag name="clamonacc">Build the clamonacc on-access scanner</flag>
 		<flag name="clamsubmit">A tool to submit false positives / negatives</flag>
 		<flag name="experimental">Enable experimental features</flag>
 		<flag name="libclamav-only">Bypass building of libfreshclam and the ClamAV CLI applications.</flag>
 		<flag name="metadata-analysis-api">Enables collection of file property metadata using ClamAV API for analysis by ClamAV bytecode programs.</flag>
-		<flag name="xml">DMG and XAR support</flag>
 		<flag name="rar">RAR support</flag>
+		<flag name="system-mspack">Use <pkg>dev-libs/libmspack</pkg> instead of the version bundled with ClamAV</flag>
+		<flag name="xml">DMG and XAR support</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">Cisco-Talos/clamav</remote-id>
-		<remote-id type="sourceforge">clamav</remote-id>
 	</upstream>
 </pkgmetadata>