Sync with portage [Mon Aug 21 10:01:33 MSK 2023].

8 months ago · 22f67dce81
parent 6bc107584f
commit 22f67dce81
7841 changed files with 26014 additions and 46320 deletions
--- a/30
+++ b/30
@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512

-MANIFEST Manifest.files.gz 29291 BLAKE2B a705593e4c6102a36d2fa8ceddbaad6477cedd4c298b4a639d066d613733298fcc78d2a33baa1e16c15dedc32dd341ced4cbd748c4a06f2ad0a5dc973691e1fb SHA512 760ffc24c7b3c0fcba157b9b3bcc08644cce4105f8a3f94e106f0c0cd0e912570140c9d522613eed3026f55e71c029252b1c9f1e25d3b5f98a9e9193c03c4fd2
-TIMESTAMP 2023-08-19T08:40:06Z
+MANIFEST Manifest.files.gz 29310 BLAKE2B 311b34f5fa1f7f109a73061ef83b2efb8eba0914428855247bd58ccf6c6c5c2b13f9670e057cdb090c6649472a18d036f14fb6db7cb934ed682ea5aa2eaf8f6c SHA512 65d47f145f34fd417daff87c3dbbe92f77a0a4ae84289d723f0a870b3e2b865a1d026280a877b6672de5e427a2fecfde5bca5c641f8d1b7e6c792dbed9fa1826
+TIMESTAMP 2023-08-21T06:40:21Z
 -----BEGIN PGP SIGNATURE-----

-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmTgf+ZfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmTjBtVfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCuXRAAsEOBzr+ooN6I438oCDJ9Tov128Q9okA0pe7JL48ZruhZ6nmjMRu+91oN
-OmyFAwOrKvQHO8Oa1lf3byigeiG8MZK9WFs3Zyzvv/JaOGZUw7p/kF1bSnCb2bES
-GoF+P+Qf2jce916V5yBCs/+eHl+PM/WhKnoTENFFp1hG+KotWcAZAz+tFCRu+6rM
-B1RhMAIBKpIK8078FYWLZ3u/mMIthS6j+4R/mpZOCoQ7HQT64USavHCRiXxq2sNp
-SktcXYkSEz32wiItreiCepo324jq4L8HrKdxeO0vterdq1lKLZ//F/s2cY4j203q
-esSRXDgdDHJuUFPI3uKbLXhRLWC0VQ8ghiHVQmmYTK0eHtFO1tqIxJny5FrEtFVi
-VAQE3vzcXee1K8hsBh6yWzl1XIHyQmcp6tCXIOkvbo6aYzRvvISU5Z97zKQuEt0U
-fw9Oi4Cbz+kbE43PebUIw2InP0hQgkuJ1UFfECHCj0s3ufGus9EuR6qrDnvLYddB
-jgM4U0qa2FzRIyk7Gewf6BLxz/dwLqoqHo1aiRQ7hY/H7qOTvIKk1+39hpLKTG9W
-E427rbBdF2JY4QWimpO6OTlcXGhII7aPLnHe4bNw9NULoDXmAUmlfSdfEh/HtZXG
-lJWOeSVEqZuxa6492jBqQL0ysH0/xm3E7z8JB1JA/esnVRvLNlE=
-=2/OL
+klCaPhAApr5Bw4pzKhUxp9LQIMGlXBbh2xiKpCPzGdiSNCx0okQDssj7rviUk4n9
+Qho+RXZvzrLzSiaNueta5kXtzA/uy2j3OWR1rSMzM1CJ73rfdRZO8rEY+vHpbRFn
+pPiYiltEHTDXmhZLPEGLaC56NMU1JFXB3wIlWva6o5lhrTNM68qoMNBwLHq2Dy1c
+9NTte/EGrXiqk3yjCmMTNMkHZgj9hW/YIVShfasqGtmyYnwNtWLq3/vQ08AsqQtN
+hiuSuNH1WEZU4wG4pWBFtYmfm8fDsj/zmvZ8HMZA8miwzGq8bI7zbzF2Omq6Ky05
+FtW7QoHQGUOHL4KAieT95anVqGjOXIt0nMDDDAKEG3V510eDFmwTcP71fVbe8+yr
+Hd5aljO6jqiqvGNOPgHr6VBn7GI74/qrMCI4EMJBJKUuvl6zp9TwzMV50gRvPquN
+Zc9YiNWx1iO9R2YxF1HInRjaX6g+yV9wZI1cs4Ns+b3p/QoemL4GLtmTyjaQgpT3
+YqFMH+pF/d+mYvlEcdZw5SeOJxMXhK1lwFKVNeC32agdNRJlTixkcbi28dB69Zgt
+GQnRT+mSv1d0xUD9llHV5VqcNRsJEZMrKFYluGwjBH4KyM1ZrrIwIuVZkW/G3C6H
+0BgvFtGRBRNlt1EiSFPVQBd/709PexN+Ab9ba5pKLN+FFkwOGto=
+=T5ko
 -----END PGP SIGNATURE-----
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
--- a/app-admin/eclean-kernel/Manifest
+++ b/app-admin/eclean-kernel/Manifest
@ -1,4 +1,6 @@
 DIST eclean-kernel-2.99.5.gh.tar.gz 22868 BLAKE2B 38a441e61e5636f0f3882d4323da6f0c89877cdfda88845ef9f8564286fdaea92d50a653473cec7d9b6b74c6bd33766cb4223d7aa602bd6083a53c5ece7b5204 SHA512 3be8833e9cb51deaaeff2c47789a6947812d486eae9134e772963ccc5c00f9265e27c2ff360de3075d4e2cc7128d27b4b5293bb6e3a86c83274b3796d881084c
+DIST eclean_kernel-2.99.6.tar.gz 25016 BLAKE2B cd408888d0f816417fcecbbc5d8c829280ae7859e520dcf5ee9c876727e7046d450a23ad403e0bd485e0071fa688464d85d9180c62a075749d1e70fee1f24027 SHA512 364750a6a105c774910ec3c9cfe99115c88b4cd15dd6c6a50aa71ba7724ff1cb865044a0e8dc8a746993c01e3c6a8a6fe7da797c1e94e9d5bc834cc7e4d85308
 EBUILD eclean-kernel-2.99.5.ebuild 719 BLAKE2B 4be0f16fe32c7980c3a63e7443c2f440726274b64c2253e094e98b6e21ce66dde8056e46790c58c62547fa64d4c7bc7fa7ddddf551971eb271cdc10dd7da469b SHA512 71a3f6a56f7a2c56f9be013572076c22910692947b1196b3d1d25a03044fb28db556e0d60289fe50a264bbfca1a12c8c3e665bd181f42b0487457dc8dbc3b89e
-EBUILD eclean-kernel-9999.ebuild 662 BLAKE2B 43fbf6e7f74efa6f87120fea4f5f620e390cc0ed86c33e71fe4a27897793c02e7a06fb970ec00f16010f7f4b9535a87caa462945f5030e688a920c91c8387328 SHA512 85bd84c9148941595cf3f6a888c082c2cff2391d145191c36a6dd42eff146935c0531ad2a471184171502ec3b451602bc3b8356a4f98395ce7434fa38f1bf4ee
-MISC metadata.xml 618 BLAKE2B 1629b132706b5bdd9d30ab55b929b679d846523b1d9d40fdf26600917af18514c1774d8f5dfb2c39d0bf3476371aaf5f1f952b18269660862b7ae96f3c567e22 SHA512 a07b907aea8d1859d6fd7384a65b10cdfb9d0e19a9712f7e1dbf910b444d21a7c573a73549b6d1aedc7b234988a4911c6d759533a9ecba571002611ff26b3549
+EBUILD eclean-kernel-2.99.6.ebuild 675 BLAKE2B cb04424371226833135c92ea834be761d1f2deda54bf463cd365f356cf81de72541ac5810bde374f1eebfd6fea65bbd445fb4c72142611790ce6b5c62e373aff SHA512 38c0b10fa7fe02bbd2b9a5b202b6876a094ad1a2d1accaebea8542aae50b94d1092b187a45a0dccfb656ebf928cd7f788aca901623198d2083bb13e57056ffc3
+EBUILD eclean-kernel-9999.ebuild 663 BLAKE2B c4bfcf96ebc76a3faccd91899e34d27c9c23aaba636a6364642e44d8d83fa9e85a16989033e03b34f2f53db5efac6b22f2cc383b1230433540047668434e3ba1 SHA512 e119b4cad61db0a05b73d6f460566d896874f0cde341d2aa25f4790c5a6a691268b5e11c17de5077a273244a3f0e820cd96b2042998de95883067f5c16c903b1
+MISC metadata.xml 671 BLAKE2B 326b6aed5217dab530d48eb8fd9fd9891ebdcc7dc523c44832c6319a54817f5c4ede703a648b3bef5643500b89d32fbafea2cd051aa6677ec824e287f76d1eb3 SHA512 6d60c4c9943a7545630577a1d48193024265d4117c89687d952aed5d4391558cc8d1c73183da9cf12963f051b9e0342e5a5710a9e947737f08c14a991efd0851
--- a/app-admin/eclean-kernel/eclean-kernel-2.99.6.ebuild
+++ b/app-admin/eclean-kernel/eclean-kernel-2.99.6.ebuild
@ -0,0 +1,29 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Remove outdated built kernels"
+HOMEPAGE="
+	https://github.com/projg2/eclean-kernel/
+	https://pypi.org/project/eclean-kernel/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+IUSE="lz4 lzo zstd"
+
+RDEPEND="
+	kernel_linux? ( dev-python/pymountboot[${PYTHON_USEDEP}] )
+	lz4? ( dev-python/lz4[${PYTHON_USEDEP}] )
+	lzo? ( dev-python/python-lzo[${PYTHON_USEDEP}] )
+	zstd? ( dev-python/zstandard[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests pytest
--- a/app-admin/eclean-kernel/eclean-kernel-9999.ebuild
+++ b/app-admin/eclean-kernel/eclean-kernel-9999.ebuild
@ -4,7 +4,7 @@
 EAPI=8

 DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )

 inherit distutils-r1 git-r3

--- a/app-admin/eclean-kernel/metadata.xml
+++ b/app-admin/eclean-kernel/metadata.xml
@ -13,5 +13,6 @@
    </maintainer>
    <bugs-to>https://github.com/projg2/eclean-kernel2/issues/</bugs-to>
    <remote-id type="github">projg2/eclean-kernel2</remote-id>
+    <remote-id type="pypi">eclean-kernel</remote-id>
  </upstream>
 </pkgmetadata>
--- a/app-admin/rsyslog/Manifest
+++ b/app-admin/rsyslog/Manifest
@ -1,22 +1,18 @@
 AUX 50-default-r1.conf 1952 BLAKE2B dca027ea6073384a2ec5867722028f70599c51fd8c46672ce647e84a7de4b3a0dc5bfaf43f7317eddb902c4987266ae67f88b43375a51e82a3ffefbb61c4d099 SHA512 1bc4d8059d83de57ff44d34265b0c3881bab7889f51c044728ba462c9105c89425187f95b6b01d6d6d103abde22a9dff063e5d6b90027ed87e9f851f9b1ad5b3
 AUX README.gentoo 1126 BLAKE2B b7e3881605c2bacda7f415b3f3195e1ef405a8e9fc7fd627fd35b0ab90966cbb29c9a85fcf2df6092062c5af353d44a02d3451e3caa072f4fa44d681702e9807 SHA512 46fdf3350e2005d3ef588d50dfc6d474a1b5d3010329b656879a43cbbd7be0cd91944b88d3838f45f69c830fc28c42e7fac2cd52e0a4b24bb6780562d59ae384
 AUX rsyslog-8.2112.0-pr5024-configure.patch 1651 BLAKE2B d3e397df64141687fb049fe20ccde9941eb8449bb0b68154558cc8c72f09897c183ffe8c24982f3aa032947ab5a14601d4a903fb9c8923dfe0f757ccd887cacd SHA512 83fd6b2de1ca14b7bdf1920d5af5038dbc1ca24d8679909e5cd6427612457b7583ee8f0ddaeed42f0e0a926900c4b547b25680b08bec96a122ebe2ba7840a109
-AUX rsyslog-8.2210.0-5004-hostname.patch 1137 BLAKE2B dcc87e205a0ac1cbb40d4b7b4e489468e439974fe50273b3a49282bacca7849073845c2ca3949c8a979972352b79230c7a994ed9968ccf2a3353df2f425706a6 SHA512 51ece6d4860eff8795b1e8b9418e0f3b39358b8a094b88161a747dc75103a2c81d7c149d82e2eeda617fd3e582ec203b73786f7d054b1083d10f5e2bf7b3f93c
 AUX rsyslog-r1.logrotate 994 BLAKE2B 36dee881c2cb79ce69678c7cb12c71fb70d970e5e10728a8d2b8acf2c08f613cea9c2a74d78ed7b75333147a6b1a553fe281956990e044a9db651c7486690dee SHA512 5ca68b4eec5bebaed48edb69c85f8338273db847ab1cc6999ce7cfe06644dc3854c3040e0ebd8a4900c213b267b2a081e7901ceb4e58f9dfdc7dc036aff02b6c
 AUX rsyslog.conf 1562 BLAKE2B 3abbc4c13c8c1d3817ac9a7c7f048aa1a8d7f279bf638dc91d15a785ad42c1b34a61de0be33b4ffa218a655849aeceff3e8686384e1d77472417235ce453b546 SHA512 1720174fab020e2de590f3d6bbb03784aca1928fe05f7e75e02fb4597cb8b2ee755e6deb8e8f989060511044ae483f791f496f24e0eecaf27eb9e0b5e20a2c7a
 AUX rsyslog.confd-r1 1145 BLAKE2B 06e63c7500238dd31abddd105269714387b990a3530ad11443a8502ad68221c3f8e8b0db02ba3ad2b7010483364d36a5b526a461d3465972b74d2cd36ff08747 SHA512 a7f8621bdd490596b09f9a7583dd0c992006c55335b2e6e687bef4141bb18cd4bb43e23f590a138e9c8d5a3cbac0cc46c3b01c7d3ff9f9dd3c53418b13b0dd4a
 AUX rsyslog.initd-r1 1755 BLAKE2B 768dc0d2bcbf240b7a09e814d681ce65a319cd128ef40b9427edb3bc4def5239415f16b67629de70d61e12dc835a3e8e7049c183f0c667d301919ffa7e6a22e7 SHA512 e6de86a72e11d37427a17e07cebdfc26b5c6108b413d853255108acf3c55882fd79d03ed41c0a6c1a23babd55f2e4bf36e5c7fc3e98c19bc07dc4593cd2a07c3
 AUX rsyslog.service 644 BLAKE2B 311072ff896b07d82e9d88b34120b4fa903b7a84c5ac9686751bd88db5263c912e60a7be1e90fa50ecd3b10b14d046f525227b1feb39528ef488b8879d58ba84 SHA512 5d11cfe47ca797941815f51f08d4e8e308e4827bed9235ddf1174f3357d7279a3c8151e02f1cbd3cf3a6d2f7d5e2f68061d3e17fab6a0291f01c32f88e995039
-DIST rsyslog-8.2210.0.tar.gz 3266727 BLAKE2B fc94e7d9b7d828c35e6117ff44d40aa421b79ecd9072cc143177cb77ac6e84adaa5e2b9ae9a66e4bb70d8b93411715f63f0e3707e53c965ef892d9146ec43c92 SHA512 c665b7f7a3c5ef31c9b62b50f815cfbb52db0cbe4a06934f4f1c3cd2a56fb49c319d33857ee92ab843aa5894cac16c16b8eccdf83714f31ab57a95049c4af231
-DIST rsyslog-8.2302.0.tar.gz 3273655 BLAKE2B 41ab639dcc93e325b6e092bc7c2c8fa60ce6192ec20033665930573ed5944af5830fc91aa3e607501c2b4759775efcd55631f82096e18ff1df67f00c3e956d6b SHA512 ebdf179c320425a137d1d20eef15163b342165435879e55531aa0dd9ae459fa35266696cc80fecae63a7e1eef31be51ba4154360e5dbe3c00471a84883c03168
 DIST rsyslog-8.2304.0.tar.gz 3274047 BLAKE2B 13c0e200acf750e9b40b14153270b0f45358ac8be7a9d0e1fa879e686da9f5a3be3b7915e3c90757a42dbdfbf4c36301cfea213aafe5a0481e1b117f28cf3cf6 SHA512 ca8df2d1d38c78d853b1081c731d9f94cad653a915259b699f3a78a88bcf9c9d1d18b91667ef954fc96a0bd251aa3afd2b6264ce5a6b4ca700687a654507b64f
 DIST rsyslog-8.2306.0.tar.gz 3293380 BLAKE2B cb9ae3fa9f5c8c71491346323b7549d5997b116ec3141296e25871cb8be75f372d1de8b315a6a37e42dd649782790685b30705d1f91151d5561249da508e961d SHA512 4012ea18d49efa75438aa225fec1daafcaadc216cd5c0ecceccdc34688940bbdca9eb19bd9c401e834b023d9b9a5a0870529f7b855bb64c796a55538639dadfc
-DIST rsyslog-doc-8.2210.0.tar.gz 6572454 BLAKE2B feb865e3585ee441117f38de61748a6ca99767dae113cfcf2cd0d0a124cc692889be713134163fc91f4ab43b9fe530e3c7c0b84e4bd4e70081c4539297ae1406 SHA512 e7847a9307a91fdf87d6cf91d2391eb75869679905b9598310c456fb3fe1864fc06dbdc649778f5b3788e47ffda0a6d89cb894258e55db441f7df7e74b0ae9f4
-DIST rsyslog-doc-8.2302.0.tar.gz 6586882 BLAKE2B bd79d53670234df46fae79234e03bbee05129dcd5bfe36d74595ce90e91ed8efa2d32cc817dadc9634a67eab7b9e640ad686685495cff75ebb1ff16730c8e904 SHA512 b922a4ed3e7b7235aa4a00c26a45b3b9f3a092679a7ce324543eea0c59cb34ad5a0ee2cac3a37e8964a4bc059cbcc661932496c7ff5765ef4f2da19cb6d35ee2
+DIST rsyslog-8.2308.0.tar.gz 3346424 BLAKE2B fc55323ab9f7e88cc84f32f95531a8cad87aad22bbb7a23303033bb841c8badc4053a8a9fc302611aeb4288efc148708affa7d873e41b07521cbece7e3ccfc45 SHA512 f8bcbbfe2c5c0a7e56203fc4ff285594cfa27fa7c998db2fe065a3f06b9bc30692626787c509b1f5d081a4b176680183b651625c5e3ccb4580ac59f3980ae8a5
 DIST rsyslog-doc-8.2304.0.tar.gz 6586061 BLAKE2B 4680db37eaa8583e21865fafb62ba07ffa235f4184a43bf9a1930166aa26a3bccdc15c43ba26504d157339eb02b05ea95076cf738abc3323eef16e07b42de2af SHA512 1ce8a8cf40cb767e4e62016aa2513f93535a3bd3c47ef34bc1efca007f7afe5c84ca4d30e911903dc8ba529ede0a07feb05ace075b5ef6c1757e5727d11f112e
 DIST rsyslog-doc-8.2306.0.tar.gz 6637017 BLAKE2B 7b4157bbfcdba6c7ac824ef4369bb2141a33989d4e3d1a95ca6b347f3d3eaa98266f7b7a684a8aa0342a8a38f87d7ae144444f888133619e82fb4802ef12d314 SHA512 eb5df4285ed9f5afe884dae497ed77ad96050a9101e94c8d83125c893998094e27d4fad7b7a42391d72cfdc1bf2aeb9fac8f65d61d8aa5c49dda9d0cac81d777
-EBUILD rsyslog-8.2210.0-r2.ebuild 13176 BLAKE2B 8a99355f5ae45c15f1e39b19cbc0d3ca4d08d20ccca21d381eb49d21d437109325a4572c4e08cac21167720548830fa0a8d390d6452afae97d79e858cc22f08b SHA512 4ae5f2a663f2dab7afe5133d4e7d7528c2078091da97b93753563c4e0619175f156f762199ddfd1cef87f3486b13d6ab22774e2a473e2124f7362edea3df6dec
-EBUILD rsyslog-8.2302.0.ebuild 13135 BLAKE2B 84fdc7404bb080cc57d8cc5e260df6646d6c84af17bad0e0eac1394f7556088dd45650422d9fb98bba64e9583baad5d047f223c5f58d893aa5893e2f4acc375f SHA512 5309c9083aae3407ab2f57849508a8e1b9e2b7e4a268f52c53977a3ee4b30a0a9670ede9b050eedc88cbcbad73f17e5896e3c234dd3fe938c61ebdd0017c2d06
+DIST rsyslog-doc-8.2308.0.tar.gz 6668327 BLAKE2B ca82fa7b69b19ba03fd30adbdf2bdc37eb7f11c714ec7f79d4cfb352fcdf42aae4cf146a6911ec26212de64057ac23416bb2ca27e8001cbe9f9945fd7c7a931e SHA512 f0a581e2a7642d100cdca94125c39cf00acfc3339114ddad067d726f1526941f52ab33c0f5789f9cbd4197b3e1f3c841da86c71886fa97306990193db8d6c935
 EBUILD rsyslog-8.2304.0.ebuild 13135 BLAKE2B 84fdc7404bb080cc57d8cc5e260df6646d6c84af17bad0e0eac1394f7556088dd45650422d9fb98bba64e9583baad5d047f223c5f58d893aa5893e2f4acc375f SHA512 5309c9083aae3407ab2f57849508a8e1b9e2b7e4a268f52c53977a3ee4b30a0a9670ede9b050eedc88cbcbad73f17e5896e3c234dd3fe938c61ebdd0017c2d06
 EBUILD rsyslog-8.2306.0.ebuild 13412 BLAKE2B 2dc48afdbe39c4e9ba9b529aa5c42c258cbd3177c7c5173f30aaaa5a62c759b8e7801bc15446b3da75c48437d0e21a1c45c1e1562f084244e21ab23a6a58d139 SHA512 bbef272f801f5bfd0077da84799874fae91618ea8226968680943e64cd28093468cb539f7f32c6390256032ed6c72e0ae6f86e37133dc87cc2f18bbe45ce2b0f
+EBUILD rsyslog-8.2308.0.ebuild 13415 BLAKE2B 340fe3c33cee006cbf44ab6915cdca3d58b1d30cffcdbed274dae2d7b4ecc544fbacafb2d9f5cc2399438e4e9797c16c841e6f95102ef230df8976ae165a525f SHA512 752dd68915f9c1839ea6d523c7e6803135e0a589faaf91029d50fbe0768a698dc0c229e123e7b7c8fb3ee179cdcf9106708295febc184dc329f09cacb4c6b55d
 MISC metadata.xml 4688 BLAKE2B 61d9ef924def00bed85b9b164e95ae8f512e51a0f0090b61a5737ee93b21db69db642867ddb6076fda757ae10748b9172de42754839d01859529aec70760d04f SHA512 01bedda2baeefccffc765550ab2f8aa29235e7a3a3fc8b765beb205518785da9fb5905037ad9e8e6ba9385d2f009d260260e3c207bbf1eea5a5ce4834a004365
--- a/app-admin/rsyslog/files/rsyslog-8.2210.0-5004-hostname.patch
+++ b/app-admin/rsyslog/files/rsyslog-8.2210.0-5004-hostname.patch
@ -1,40 +0,0 @@
-From e2beca531157a4c0a27bcdda689bc53373e305b3 Mon Sep 17 00:00:00 2001
-From: Rainer Gerhards <rgerhards@adiscon.com>
-Date: Thu, 20 Oct 2022 18:08:11 +0200
-Subject: [PATCH] core bugfix: local hostname invalid if no global() config
- object given
-
-The local hostname is invalidly set to "[localhost]" on rsyslog startup
-if no global() config object is present in rsyslog.conf. Sending a HUP
-corrects the hostname.
-
-This is a regression from ba00a9f25293f
-
-closes https://github.com/rsyslog/rsyslog/issues/4975,
-closes https://github.com/rsyslog/rsyslog/issues/4825
---
- runtime/glbl.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/runtime/glbl.c b/runtime/glbl.c
-index 3a9350b903..ed9a307804 100644
--- a/runtime/glbl.c
-+++ b/runtime/glbl.c
-@@ -1396,6 +1396,7 @@ glblDoneLoadCnf(void)
- 		stddbg = -1;
- 	}
- 
-+finalize_it:
- 	/* we have now read the config. We need to query the local host name now
- 	 * as it was set by the config.
- 	 *
-@@ -1404,8 +1405,7 @@ glblDoneLoadCnf(void)
- 	 * are taken from that queue, the hostname will be adapted.
- 	 */
- 	queryLocalHostname();
-
-finalize_it:	RETiRet;
-+	RETiRet;
- }
- 
- 
--- a/app-admin/rsyslog/rsyslog-8.2210.0-r2.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.2210.0-r2.ebuild
@ -1,499 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit autotools linux-info python-any-r1 systemd
-
-DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
-HOMEPAGE="https://www.rsyslog.com/"
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git"
-
-	DOC_REPO_URI="https://github.com/rsyslog/${PN}-doc.git"
-
-	inherit git-r3
-else
-	KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc64 ~riscv ~sparc x86"
-
-	SRC_URI="
-		https://www.rsyslog.com/files/download/${PN}/${P}.tar.gz
-		doc? ( https://www.rsyslog.com/files/download/${PN}/${PN}-doc-${PV}.tar.gz )
-	"
-fi
-
-LICENSE="GPL-3 LGPL-3 Apache-2.0"
-SLOT="0"
-
-IUSE="clickhouse curl dbi debug doc elasticsearch +gcrypt gnutls imhttp"
-IUSE+=" impcap jemalloc kafka kerberos kubernetes mdblookup"
-IUSE+=" mongodb mysql normalize omhttp omhttpfs omudpspoof +openssl"
-IUSE+=" postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp +ssl"
-IUSE+=" systemd test usertools +uuid xxhash zeromq"
-
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	kubernetes? ( normalize )
-	ssl? ( || ( gnutls openssl ) )
-"
-
-BDEPEND=">=sys-devel/autoconf-archive-2015.02.24
-	sys-apps/lsb-release
-	virtual/pkgconfig
-	test? (
-		jemalloc? ( <sys-libs/libfaketime-0.9.7 )
-		!jemalloc? ( sys-libs/libfaketime )
-		${PYTHON_DEPS}
-	)"
-
-RDEPEND="
-	>=dev-libs/libfastjson-0.99.8:=
-	>=dev-libs/libestr-0.1.9
-	>=sys-libs/zlib-1.2.5
-	curl? ( >=net-misc/curl-7.35.0 )
-	dbi? ( >=dev-db/libdbi-0.8.3 )
-	elasticsearch? ( >=net-misc/curl-7.35.0 )
-	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= )
-	imhttp? (
-		dev-libs/apr-util
-		www-servers/civetweb
-		virtual/libcrypt:=
-	)
-	impcap? ( net-libs/libpcap )
-	jemalloc? ( >=dev-libs/jemalloc-3.3.1:= )
-	kafka? ( >=dev-libs/librdkafka-0.9.0.99:= )
-	kerberos? ( virtual/krb5 )
-	kubernetes? ( >=net-misc/curl-7.35.0 )
-	mdblookup? ( dev-libs/libmaxminddb:= )
-	mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= )
-	mysql? ( dev-db/mysql-connector-c:= )
-	normalize? (
-		>=dev-libs/liblognorm-2.0.3:=
-	)
-	clickhouse? ( >=net-misc/curl-7.35.0 )
-	omhttpfs? ( >=net-misc/curl-7.35.0 )
-	omudpspoof? ( >=net-libs/libnet-1.1.6 )
-	postgres? ( >=dev-db/postgresql-8.4.20:= )
-	rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= )
-	redis? (
-		>=dev-libs/hiredis-0.11.0:=
-		dev-libs/libevent[threads(+)]
-	)
-	relp? ( >=dev-libs/librelp-1.2.17:= )
-	rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] )
-	rfc5424hmac? (
-		>=dev-libs/openssl-0.9.8y:0=
-	)
-	snmp? ( >=net-analyzer/net-snmp-5.7.2 )
-	ssl? (
-		gnutls? ( >=net-libs/gnutls-2.12.23:0= )
-		openssl? (
-			dev-libs/openssl:0=
-		)
-	)
-	systemd? ( >=sys-apps/systemd-234 )
-	uuid? ( sys-apps/util-linux:0= )
-	xxhash? ( dev-libs/xxhash:= )
-	zeromq? (
-		>=net-libs/czmq-4:=[drafts]
-	)"
-
-DEPEND="
-	${RDEPEND}
-	elibc_musl? ( sys-libs/queue-standalone )
-"
-
-if [[ ${PV} == "9999" ]]; then
-	BDEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )"
-	BDEPEND+=" >=sys-devel/flex-2.5.39-r1"
-	BDEPEND+=" >=sys-devel/bison-2.4.3"
-	BDEPEND+=" >=dev-python/docutils-0.12"
-fi
-
-CONFIG_CHECK="~INOTIFY_USER"
-WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-8.2112.0-pr5024-configure.patch
-	"${FILESDIR}"/${P}-5004-hostname.patch
-)
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]]; then
-		git-r3_fetch
-		git-r3_checkout
-	else
-		unpack ${P}.tar.gz
-	fi
-
-	if use doc; then
-		if [[ ${PV} == "9999" ]]; then
-			local _EGIT_BRANCH=
-			if [[ -n "${EGIT_BRANCH}" ]]; then
-				# Cannot use rsyslog commits/branches for documentation repository
-				_EGIT_BRANCH=${EGIT_BRANCH}
-				unset EGIT_BRANCH
-			fi
-
-			git-r3_fetch "${DOC_REPO_URI}"
-			git-r3_checkout "${DOC_REPO_URI}" "${S}"/docs
-
-			if [[ -n "${_EGIT_BRANCH}" ]]; then
-				# Restore previous EGIT_BRANCH information
-				EGIT_BRANCH=${_EGIT_BRANCH}
-			fi
-		else
-			cd "${S}" || die "Cannot change dir into '${S}'"
-			mkdir docs || die "Failed to create docs directory"
-			cd docs || die "Failed to change dir into '${S}/docs'"
-			unpack ${PN}-doc-${PV}.tar.gz
-		fi
-	fi
-}
-
-src_prepare() {
-	default
-
-	# https://github.com/rsyslog/rsyslog/issues/3626
-	sed -i \
-		-e '\|^#!/bin/bash$|a exit 77' \
-		tests/mmkubernetes-cache-expir*.sh \
-		|| die "Failed to disabled known test failure mmkubernetes-cache-expir*.sh"
-
-	eautoreconf
-}
-
-src_configure() {
-	# Maintainer notes:
-	# * Guardtime support is missing because libgt isn't yet available
-	#   in portage.
-	# * Hadoop's HDFS file system output module is currently not
-	#   supported in Gentoo because nobody is able to test it
-	#   (JAVA dependency).
-	# * dev-libs/hiredis doesn't provide pkg-config (see #504614,
-	#   upstream PR 129 and 136) so we need to export HIREDIS_*
-	#   variables because rsyslog's build system depends on pkg-config.
-
-	if use redis; then
-		export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis"
-		export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include"
-	fi
-
-	local myeconfargs=(
-		--disable-debug-symbols
-		--disable-generate-man-pages
-		--without-valgrind-testbench
-		--disable-liblogging-stdlog
-		--disable-imfile-tests  # Some imfile tests fail (noticed in version 8.2208.0)
-		$(use_enable test testbench)
-		$(use_enable test libfaketime)
-		$(use_enable test extended-tests)
-		# Input Plugins without dependencies
-		--enable-imbatchreport
-		--enable-imdiag
-		--enable-imdocker
-		--enable-imfile
-		--enable-improg
-		--enable-impstats
-		--enable-imptcp
-		# Message Modificiation Plugins without dependencies
-		--enable-mmanon
-		--enable-mmaudit
-		--enable-mmcount
-		--enable-mmfields
-		--enable-mmjsonparse
-		--enable-mmpstrucdata
-		--enable-mmrm1stspace
-		--enable-mmsequence
-		--enable-mmtaghostname
-		--enable-mmutf8fix
-		# Output Modification Plugins without dependencies
-		--enable-mail
-		--enable-omprog
-		--enable-omruleset
-		--enable-omstdout
-		--enable-omuxsock
-		# Misc
-		--enable-fmhash
-		--enable-fmunflatten
-		$(use_enable xxhash fmhash-xxhash)
-		--enable-pmaixforwardedfrom
-		--enable-pmciscoios
-		--enable-pmcisconames
-		--enable-pmdb2diag
-		--enable-pmlastmsg
-		$(use_enable normalize pmnormalize)
-		--enable-pmnull
-		--enable-pmpanngfw
-		--enable-pmsnare
-		# DB
-		$(use_enable dbi libdbi)
-		$(use_enable mongodb ommongodb)
-		$(use_enable mysql)
-		$(use_enable postgres pgsql)
-		$(use_enable redis imhiredis)
-		$(use_enable redis omhiredis)
-		# Debug
-		$(use_enable debug)
-		$(use_enable debug diagtools)
-		$(use_enable debug valgrind)
-		# Misc
-		$(use_enable clickhouse)
-		$(use_enable curl fmhttp)
-		$(use_enable elasticsearch)
-		$(use_enable gcrypt libgcrypt)
-		$(use_enable imhttp)
-		$(use_enable impcap)
-		$(use_enable jemalloc)
-		$(use_enable kafka imkafka)
-		$(use_enable kafka omkafka)
-		$(use_enable kerberos gssapi-krb5)
-		$(use_enable kubernetes mmkubernetes)
-		$(use_enable normalize mmnormalize)
-		$(use_enable mdblookup mmdblookup)
-		$(use_enable omhttp)
-		$(use_enable omhttpfs)
-		$(use_enable omudpspoof)
-		$(use_enable rabbitmq omrabbitmq)
-		$(use_enable relp)
-		$(use_enable rfc3195)
-		$(use_enable rfc5424hmac mmrfc5424addhmac)
-		$(use_enable snmp)
-		$(use_enable snmp mmsnmptrapd)
-		$(use_enable gnutls)
-		$(use_enable openssl)
-		$(use_enable systemd imjournal)
-		$(use_enable systemd omjournal)
-		$(use_enable usertools)
-		$(use_enable uuid)
-		$(use_enable zeromq imczmq)
-		$(use_enable zeromq omczmq)
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	default
-
-	if use doc && [[ "${PV}" == "9999" ]]; then
-		einfo "Building documentation ..."
-		local doc_dir="${S}/docs"
-		cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!"
-		sphinx-build -b html source build || die "Building documentation failed!"
-	fi
-}
-
-src_test() {
-	local _has_increased_ulimit=
-
-	# Sometimes tests aren't executable (i.e. when added via patch)
-	einfo "Adjusting permissions of test scripts ..."
-	find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \
-		die "Failed to adjust test scripts permission"
-
-	if ulimit -n 3072; then
-		_has_increased_ulimit="true"
-	fi
-
-	if ! emake --jobs 1 check; then
-		eerror "Test suite failed! :("
-
-		if [[ -z "${_has_increased_ulimit}" ]]; then
-			eerror "Probably because open file limit couldn't be set to 3072."
-		fi
-
-		if has userpriv ${FEATURES}; then
-			eerror "Please try to reproduce the test suite failure with FEATURES=-userpriv " \
-				"before you submit a bug report."
-		fi
-
-	fi
-}
-
-src_install() {
-	local DOCS=(
-		AUTHORS
-		ChangeLog
-		"${FILESDIR}"/README.gentoo
-	)
-
-	use doc && local HTML_DOCS=( "${S}/docs/build/." )
-
-	default
-
-	newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
-	newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}
-
-	systemd_newunit "${FILESDIR}/${PN}.service" ${PN}.service
-
-	keepdir /var/empty/dev
-	keepdir /var/spool/${PN}
-	keepdir /etc/ssl/${PN}
-	keepdir /etc/${PN}.d
-
-	insinto /etc
-	newins "${FILESDIR}/${PN}.conf" ${PN}.conf
-
-	insinto /etc/rsyslog.d/
-	newins "${FILESDIR}/50-default-r1.conf" 50-default.conf
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}/${PN}-r1.logrotate" ${PN}
-
-	if use mysql; then
-		insinto /usr/share/${PN}/scripts/mysql
-		doins plugins/ommysql/createDB.sql
-	fi
-
-	if use postgres; then
-		insinto /usr/share/${PN}/scripts/pgsql
-		doins plugins/ompgsql/createDB.sql
-	fi
-
-	find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	local advertise_readme=0
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-
-		advertise_readme=1
-
-		if use mysql || use postgres; then
-			echo
-			elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:"
-			elog "  /usr/share/doc/${PF}/scripts"
-		fi
-
-		if use ssl; then
-			echo
-			elog "To create a default CA and certificates for your server and clients, run:"
-			elog "  emerge --config =${PF}"
-			elog "on your logging server. You can run it several times,"
-			elog "once for each logging client. The client certificates will be signed"
-			elog "using the CA certificate generated during the first run."
-		fi
-	fi
-
-	if [[ ${advertise_readme} -gt 0 ]]; then
-		# We need to show the README file location
-
-		echo ""
-		elog "Please read"
-		elog ""
-		elog "  ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*"
-		elog ""
-		elog "for more details."
-	fi
-}
-
-pkg_config() {
-	if ! use ssl; then
-		einfo "There is nothing to configure for rsyslog unless you"
-		einfo "used USE=ssl to build it."
-		return 0
-	fi
-
-	if ! hash certtool &>/dev/null; then
-		die "certtool not found! Is net-libs/gnutls[tools] is installed?"
-	fi
-
-	# Make sure the certificates directory exists
-	local CERTDIR="${EROOT}/etc/ssl/${PN}"
-	if [[ ! -d "${CERTDIR}" ]]; then
-		mkdir "${CERTDIR}" || die
-	fi
-	einfo "Your certificates will be stored in ${CERTDIR}"
-
-	# Create a default CA if needed
-	if [[ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]]; then
-		einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..."
-		certtool --generate-privkey \
-			--outfile "${CERTDIR}/${PN}_ca.privkey.pem" || die
-		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
-
-		cat > "${T}/${PF}.$$" <<- _EOF
-		cn = Portage automated CA
-		ca
-		cert_signing_key
-		expiration_days = 3650
-		_EOF
-
-		certtool --generate-self-signed \
-			--load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
-			--outfile "${CERTDIR}/${PN}_ca.cert.pem" \
-			--template "${T}/${PF}.$$" || die
-		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
-
-		# Create the server certificate
-		echo
-		einfon "Please type the Common Name of the SERVER you wish to create a certificate for: "
-		read -r CN
-
-		einfo "Creating private key and certificate for server ${CN}..."
-		certtool --generate-privkey \
-			--outfile "${CERTDIR}/${PN}_${CN}.key.pem" || die
-		chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
-
-		cat > "${T}/${PF}.$$" <<- _EOF
-		cn = ${CN}
-		tls_www_server
-		dns_name = ${CN}
-		expiration_days = 3650
-		_EOF
-
-		certtool --generate-certificate \
-			--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
-			--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
-			--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
-			--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
-			--template "${T}/${PF}.$$" &>/dev/null
-		chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
-
-	else
-		einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation."
-	fi
-
-	# Create a client certificate
-	echo
-	einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: "
-	read -r CN
-
-	einfo "Creating private key and certificate for client ${CN}..."
-	certtool --generate-privkey \
-		--outfile "${CERTDIR}/${PN}_${CN}.key.pem" || die
-	chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
-
-	cat > "${T}/${PF}.$$" <<- _EOF
-	cn = ${CN}
-	tls_www_client
-	dns_name = ${CN}
-	expiration_days = 3650
-	_EOF
-
-	certtool --generate-certificate \
-		--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
-		--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
-		--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
-		--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
-		--template "${T}/${PF}.$$" || die
-	chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
-
-	rm -f "${T}/${PF}.$$"
-
-	echo
-	einfo "Here is the documentation on how to encrypt your log traffic:"
-	einfo " https://www.rsyslog.com/doc/rsyslog_tls.html"
-}
--- a/app-admin/rsyslog/rsyslog-8.2308.0.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.2308.0.ebuild
@ -17,7 +17,7 @@ if [[ ${PV} == "9999" ]]; then

 	inherit git-r3
 else
-	KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc64 ~riscv ~sparc x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~sparc ~x86"

 	SRC_URI="
 		https://www.rsyslog.com/files/download/${PN}/${P}.tar.gz
@ -159,11 +159,21 @@ src_unpack() {
 src_prepare() {
 	default

-	# https://github.com/rsyslog/rsyslog/issues/3626
+	# Bug: https://github.com/rsyslog/rsyslog/issues/3626
 	sed -i \
 		-e '\|^#!/bin/bash$|a exit 77' \
 		tests/mmkubernetes-cache-expir*.sh \
-		|| die "Failed to disabled known test failure mmkubernetes-cache-expir*.sh"
+		|| die "Failed to disable known test failure mmkubernetes-cache-expir*.sh"
+
+	sed -i \
+		-e '\|^#!/bin/bash$|a exit 0' \
+		tests/omprog-close-unresponsive*.sh \
+		|| die "Failed to disable test omprog-close-unresponsive*.sh"
+
+	sed -i \
+		-e '\|^#!/bin/bash$|a exit 0' \
+		tests/uxsock_simple.sh \
+		|| die "Failed to disable test uxsock_simple.sh"

 	eautoreconf
 }
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@ -6,7 +6,7 @@ DIST sudo-1.9.14p2.tar.gz.sig 566 BLAKE2B f72469340cfbb5005540a7080410dcf7269496
 DIST sudo-1.9.14p3.tar.gz 5232320 BLAKE2B 702d0c5489658dfd35c5a57977431343d29e6c2d7bb44bb7a8fd9f7fc7b7094b3f3fe2348d1ab6b9aa037e2b5fd1019f127f45e99190bdfff077e94747dc17e1 SHA512 d4af836e3316c35d8b81a2c869ca199e8f2d5cb26dbd98b8ad031f29be62b154452afdf5a506ddabad21b80e5988a49f1f7c8f1ec44718ffcbd7e89ccbdef612
 DIST sudo-1.9.14p3.tar.gz.sig 566 BLAKE2B 61ea3ca0e6032ddabbfd7e5b56881f0e800b49eed0404738c1a28687160917a8ddde91378b915cb81c9576732629d398790eac31d300e536e117fa9bbf5b1f4a SHA512 e1723f589eb3b758bd7e7e0da158d21e9315976320f8d39159a97e801c9745768b42b7b16c697cdbb3917a3f3def0125acf868dc343b062834f9f0818d741608
 EBUILD sudo-1.9.13_p3-r1.ebuild 7466 BLAKE2B 6c880d950c1bc21c99e8e186b4602fc91b5511aa1bca7dcc1e21eeb93f39d8c802b7b5c1ddabc49ce9f42db9de05791c434574fb9bcca0a09868ca9135ef8db7 SHA512 4828c4aa791be701398466f7bf186321e6d1eca2eefa85142669ea6271563b566db334d2c77ad82746c0b36932b632e80a51bef861a222d55f6d0fd88c50b53e
-EBUILD sudo-1.9.14_p2.ebuild 7400 BLAKE2B dba757f1749e0eb25fcacf4c82eceadbdbc035ffd20d2af6631b96899bd563c562e1be72d8e8c650d7d043d2fcac5c66b4af658dc6d420092f1d1ee0a4fa22ea SHA512 620685cdbe7699dddc29f449b7aab04aa8f5c396ced3de0ecb0b37ab3deccb19bee4b584678b56e17524d8bdfd4620a739c65363b8c62078acf7bfe805c4d1a3
+EBUILD sudo-1.9.14_p2.ebuild 7396 BLAKE2B 6d606110b6b40f981b71a7b3101be0edb44c95e86dcc0b9017d5825cb2c821c72fcace7f35a7b48ff58e57a7af9165dbb2eebb4b88b677bc693ded9faec367b2 SHA512 7105c5fe4180cc5fcd634cb6e4aef382e0b1993c03179ffcf32fc6508171540e5688987b5a7b8f119eca83f4b8825e57423e67939900ddb6046c6c716789c7ba
 EBUILD sudo-1.9.14_p3.ebuild 7404 BLAKE2B 4ad89b1684fb5c57a7a32125a86f0d4c89a0545b511dfbd390336e8d55c679959bdd5c25b7a7922e609d6f1f13bdb1162abc53f082fcd523b19a84cdab9b53cb SHA512 c1e16ed74a5d085f3731f92a51460654083367e010b31368dc23d7f1a18895b4d3c3107407df7348ea60d7d4b444bb8a9d78e1e431e5d933cf1b89816ceadf6c
 EBUILD sudo-9999.ebuild 7404 BLAKE2B 4ad89b1684fb5c57a7a32125a86f0d4c89a0545b511dfbd390336e8d55c679959bdd5c25b7a7922e609d6f1f13bdb1162abc53f082fcd523b19a84cdab9b53cb SHA512 c1e16ed74a5d085f3731f92a51460654083367e010b31368dc23d7f1a18895b4d3c3107407df7348ea60d7d4b444bb8a9d78e1e431e5d933cf1b89816ceadf6c
 MISC metadata.xml 1107 BLAKE2B a18b1d280445ea98ba686021abf08ab47a5ac590795018c125008f2a8e44f7ea45e256e32a737781030960cb984bc16d8fd23175fd1e88b294e5036c86085367 SHA512 8cacbd9a1a23fc7734c5ad8b95c769b8506ec35490b5e3f69439bf71bd51d1eaf04fe699a82cbb3ac56182195fff570d75e3b20c33d86774480a2939122752a6
--- a/app-admin/sudo/sudo-1.9.14_p2.ebuild
+++ b/app-admin/sudo/sudo-1.9.14_p2.ebuild
@ -33,7 +33,7 @@ else
 	"

 	if [[ ${PV} != *_beta* && ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86"
+		KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 	fi

 	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-sudo )"
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
--- a/app-arch/gzip/Manifest
+++ b/app-arch/gzip/Manifest
@ -1,8 +1,8 @@
 AUX gzip-1.3.8-install-symlinks.patch 284 BLAKE2B f461a822371d56505aa3e436c4d611823dfe81ab72f9e1a2bd3547b8fbbae07d2108ac255a1a9dae604f9acb77744bda3a9eec2a575580558a4ca7042164c563 SHA512 4a20d61d48c456c4f5cca31b38e6f26460f781782c66ff4cd1b193eb1a48dd9fa88967989b2698b5e45a61d64c9ce3b87fba0f6b67bf507c5bb386a847f477fd
 DIST gzip-1.12.tar.xz 825548 BLAKE2B 7e2d482c08555f5fb0ff5408c0afe48c61034e9779eed6e3dd8046c847234c0a8a6bc34d49a934a54db0d73033e12c71a228d373551384a4cd663315071637e0 SHA512 116326fe991828227de150336a0c016f4fe932dfbb728a16b4a84965256d9929574a4f5cfaf3cf6bb4154972ef0d110f26ab472c93e62ec9a5fd7a5d65abea24
 DIST gzip-1.12.tar.xz.sig 833 BLAKE2B ab7b4a759ef163d67f20773607ba0408ea9f1f7c7c224f43635fc3752acc521b74dbea4ec9ebb58a2f4fa13ecae19e00779b4b56c2cb95976301445beff817aa SHA512 1f4702797f7c5f1873c2f9c2f6210ba23824455d17ee82f50f0bf24240ed5bdf0090cf85338ccf76ba82422f8b4ad3a329d8bbf1350cb094d7bd61aa45550397
-DIST gzip-1.12_p20221228.tar.xz 806448 BLAKE2B 278eb44caca7ee16ca5d0210673726a1daebef6da7eaf0a87fc24590cb4c53d4ebe2decb6b8975440e1eb2c2cfebb69f091c658f9a7430a1717f0477fec279da SHA512 87d1fccb9603ec336c89689337e3cf3cfef70054ab4416bd8380fee011e9f517555d80a2a009bd312a58c34fdaf48778e5f0e9bea350ae280b440a325a837866
-DIST gzip-1.12_p20221228.tar.xz.sig 833 BLAKE2B b59d4677d15e2461d5fa95b4d53e94914e14cad613a9766aa3e51bfcece84ec0c4dd752c0d124cb76cc2240f9460f809c5bbbab958522c795e94026c8d4206ef SHA512 09a3a6687c80d7ec7e97ebd4c679e4d162729232d77966352c2f7ddd45594d79039ff33a93592889137605412b18b7868ea19ba4f4d162a5912a3978b3d67dd2
+DIST gzip-1.13.tar.xz 838248 BLAKE2B f0e3b4c28bafcd3b59b65ac2d71218dc58d81b52c6921c1be038757c99e99184178c5d0e9674caa5099713b8b64e8c85cf061f4abfa20b73b478288f121fb05d SHA512 e3d4d4aa4b2e53fdad980620307257c91dfbbc40bcec9baa8d4e85e8327f55e2ece552c9baf209df7b66a07103ab92d4954ac53c86c57fbde5e1dd461143f94c
+DIST gzip-1.13.tar.xz.sig 833 BLAKE2B 42e38fa7b3a6b6d21a18308cf662844ed84e1a142a945f3f3142db0a14212c0e642de514abb1307ec12ee7bb9644472cc3aed40582d9c266ab24808acbca0215 SHA512 f95e016f61f4a67cb4cec6cede2510af6bb5567d72bbd3d70210a6d5cf3ee5fea8f0cbf8f7b612fa52f2ecfd9dba050d9cd4494075ce5ac4abac7b74eaa7ccbc
 EBUILD gzip-1.12-r4.ebuild 2087 BLAKE2B 0477a57de5136e871fc5a77e621b30e39ea6d8b915f9d43e141a6ba5fed822aa96af0e7dcd6ab9f59ea8aa53a683fd2296c58d60dce1a53c2655647f61ad9935 SHA512 eba891f8dd7463ecc3795dea84b15a1b80c60953111749215a6020dfdfb14c3f34cb63f6dccbd738958f873ff1be76d6fb0dfcac235240f4ad10a3f604c19abb
-EBUILD gzip-1.12_p20221228-r1.ebuild 2444 BLAKE2B cdb5944b2dbe30c40585819c0730a3301a8a9bc7253420e4600fe1675a64f1c45d6d3e80e2d6b68fc42cd4728045e93400dfa1d807d98c2f36ddf0dd07e80427 SHA512 a6147fec17733d046a34cbe6602e9f6872bd238ff3fb3c1dd62246fa1993fb173c8c16e220a78cc3440fd50925edd0f8410d47cb74f669f1e241472090e79764
+EBUILD gzip-1.13.ebuild 2444 BLAKE2B cdb5944b2dbe30c40585819c0730a3301a8a9bc7253420e4600fe1675a64f1c45d6d3e80e2d6b68fc42cd4728045e93400dfa1d807d98c2f36ddf0dd07e80427 SHA512 a6147fec17733d046a34cbe6602e9f6872bd238ff3fb3c1dd62246fa1993fb173c8c16e220a78cc3440fd50925edd0f8410d47cb74f669f1e241472090e79764
 MISC metadata.xml 433 BLAKE2B ec37d1a2da994967c16c5005c7267f5ea788dd5fea6e48e231c59313f8a779fac6241c790d292bb47b5586a734ad114774438785d6f394bad51d9f2818912e3d SHA512 98ed16e20a9c2c8210ca8a8261eecd0718b94fe8fcbf9a647b04b4912132b281b55e17f26ae41afa0429e2f2a9c3faa8b877da5f8f35a14f52a0a7482f6c1afb
--- a/app-arch/gzip/gzip-1.12_p20221228-r1.ebuild
+++ b/app-arch/gzip/gzip-1.12_p20221228-r1.ebuild
--- a/app-arch/libarchive/Manifest
+++ b/app-arch/libarchive/Manifest
@ -7,5 +7,5 @@ DIST libarchive-3.7.1.tar.xz 5254260 BLAKE2B 1a6fa4f5027effea3df1cfcd2d99b8b126f
 DIST libarchive-3.7.1.tar.xz.asc 659 BLAKE2B 5e72732d2e5a4f5f04f3510b3d81a148f23dffa10a3ebe709e816388c5a6e68c08ee2bbe36d81141d5ffa94ed64df3e4ca05994cda651c09589fda69a6a95e90 SHA512 6f6f6e5780c609bd9c6c359c210656f26afb585bda46988687e19d1e55f4f3260ea80bf11bfba1213fb3a3e1514c5c096692b4b9e96ffbadf06f85eb1227250a
 EBUILD libarchive-3.6.2-r1.ebuild 3842 BLAKE2B a50266df8498cdadbe66f1cf4b2ba0f8b697bca8ef1947581450be154609f39852c1128c417e2edccc0f9d015987ef202bb449af7c73bafdc6450564b662ec21 SHA512 356146837ea33ad2b5476b5676c1bc3d08d702c6c65f763472f67e939a671372420113ad9be986692c88984e2b274f5398eba66162a46d5619b46f696872faf8
 EBUILD libarchive-3.7.0.ebuild 4157 BLAKE2B 94e092769a55560e780c2691c518cec116c3dd5280a0a9e92b6e651847a331ef3309a9c8f347c4bff9b3f9b66babbd325597922c6e4e8404ca3924d670c5cb4e SHA512 002507e47c759a8c11be7773af5c4de58ad0433c0beac6d1544ea47d58c9377936ec69255fdad6015418cb9fbc65861294e5a6284eafd727eef2e058f4411edd
-EBUILD libarchive-3.7.1.ebuild 3982 BLAKE2B cbcc231e688a875e26297a5c2be38a378880c758ccd0b9093f673f8d346ba63ee5de98819363d6a8f900ca1949d4d781216ea320590f018331dbfb2f16e85e93 SHA512 7f3cb8736be1ecddcdecacc15c10f6c6095b14373d4efadec045d8b924faddb32cc5458936afa00c3a14e5e6d604c9666e858b9de10777190a4ff96eadc75813
+EBUILD libarchive-3.7.1.ebuild 3981 BLAKE2B 16c8fd17ab45eab3014bcf237d98811914322fb736f4bedd60938679dd3c6db31fb0b08ccd37f8607af3c50857059648f9039c621d224fdb9375742fcf447bea SHA512 ceb9669f4813b5f65bf132a38bb7d3db0dd1e2bb00255aba2104017f27b832333a2132d2ea4ba333004d2b08986ab21811d1d965101d8fbeff598aba29e91cf1
 MISC metadata.xml 1224 BLAKE2B 538433528de5543ad8e912ce0d072340be3f6eeefe16320ef48b3c30a35ebdff4a32055edf89f36e4479ab1468c620871fcb5ba91bd66e81798093b4d0345949 SHA512 9f53d623a02334f675c06edea2829ce52e78d85e3894e684ae920a678eb47046393b7a93808c7e1761d30a69faa5986cd4922ae7ef8f1e2ef221de39869bd12b
--- a/app-arch/libarchive/libarchive-3.7.1.ebuild
+++ b/app-arch/libarchive/libarchive-3.7.1.ebuild
@ -16,7 +16,7 @@ SRC_URI="

 LICENSE="BSD BSD-2 BSD-4 public-domain"
 SLOT="0/13"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="acl blake2 +bzip2 +e2fsprogs expat +iconv lz4 +lzma lzo nettle static-libs xattr zstd"
 VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/libarchive.org.asc

--- a/app-arch/pigz/Manifest
+++ b/app-arch/pigz/Manifest
@ -1,7 +1,10 @@
 AUX pigz-2.7-memcpy-ub.patch 863 BLAKE2B 33cb4879445cb296031b7579a358a8188e7d856506911c0a02cdc93b542feda0e617b53b566b005ed544ef2c4b14bf347a3bacd3822af61fa281a9e3ca369cc3 SHA512 4edb365718e6649264388e6f60be7867ae240f096f828ff3cf0ec355dcf93ca65c54453525e2103f71b8a16673d0e7908fb7f917316d3cde47113eab7eccc420
 AUX pigz-2.7-zlib-1.3.patch 740 BLAKE2B eafc2eae2bb31600c49f09cf5a9d13aebdc2c94698f1392d4252cae53167a4a34ee6c5c820436e18eea07bd2d7471f44b3faf2c39c56fe103c08f3b1a01a0b1d SHA512 467fd252b3ee1030c5bbb2642497353827036d15156a5ab27251c5c1022ca5b13628aa8a58c062785fd127bda33d2c7cf897892a6ac4637a81d7e5c7cb70f482
 DIST pigz-2.7.tar.gz 108102 BLAKE2B d391522fd6f8eb6918d671fb1c9517034941f3ae8e05ffcd7bece141e6dae110cde1560bad02bd2bcca2f868cdba2a8a16b5606ad6637d40d5ced5ec9bfffcc8 SHA512 9f9f61de4a0307fc057dc4e31a98bd8d706d9e709ecde0be02a871534fddf6a1fe1321158aa72708603aaaece43f83d2423b127f7689b6219b23aea4f989e8f5
+DIST pigz-2.8.tar.gz 121304 BLAKE2B 9f1ae8b5e0dd9d9b1f17bcdbc41d8a9d50fd9b9ba7c50eb0bc1b738105d05cc396d9ce8e01f58f6b2fa7247a7c7e9926c602a613b1bb3e3a117c8f5c919ce640 SHA512 ae3d9d593e1645d65f9ab77aa828600c9af4bb30d0a073da7ae3dd805e65b87efaf6a0efb980f2d0168e475ae506eba194547d6479956dabb9d88293a9078a7f
+DIST pigz-2.8.tar.gz.asc 235 BLAKE2B eb204079597d3e958da3672ba7f92481848bb7824da12b9306ff180add107175bed7bdd435dbc270170769a489c34a033d6ff547e8203cf1d71df6564381b43d SHA512 cb1dbca21d8fed25049693de02abf7489f61407d85f9a52d566c14e0194c6c393aed3edd2fd716d0ecedf7eeead6ae89d0cecc236caacd98740d14bd71e078db
 EBUILD pigz-2.7-r1.ebuild 917 BLAKE2B 40f60aa627bc4a8795efd87c84b0146dbce4227528d82d0d844d599768dc84f02a3a5eeb4ac0639ad88ccd749ff2fe1eb60212d262ca2b4479b7d2af70682285 SHA512 59bc668e396a30c8be5596be70e863f964abdc1e9446a2f09c82da480f057584a4f74b5a72b2557f21ce364a979aa3514e727c64e5358528926eed24d8773c5f
 EBUILD pigz-2.7-r2.ebuild 963 BLAKE2B 94429270ede5333b4c75ec88bfcb101b8d5439ab78571d078c2b71287e7c87d15f1194c47e9b34015aec73901932f34a7ed1d3f095a1bb86d77cf41fb4a40920 SHA512 6e8a460ed489a03632555bfb8902fb647e670f0aaa9896ff365007d64dabd3180e8e73f5333b24b64ba65149f8de8a70251d1034ea69998046d0d8a97fcf991c
 EBUILD pigz-2.7.ebuild 868 BLAKE2B 6d74bf44001679355699b496ad34d987c5336a021e45eca5646ea1d3c04d60ac134207f6e3a307771067910143983bb04651dbcca6f25d5b62c35084c06ea17c SHA512 256170660f02c10ef5bb0ed9c91426bfc29540a51345ccdd96e602d74e1b35b74cdf3969667346ba42e2403783ae9a5c79a58ca2410866b8a4b7da5740825333
+EBUILD pigz-2.8.ebuild 1096 BLAKE2B a16a72712df5a3f114f9d5fea1fdda92412cb3e0924f5c4832688918a5ade63a7544bdeac710348ddfb7f264c035a5feaf5cc24f4f7edd3863102dc5cc6669c3 SHA512 7e4880d3b4f04ceb1ba5ce80229e10b186c7507654ad768c608c0735459f0f49195b553013c1fc3f052b4ac3a2bc0a558e85d456f8ed29315c590e775c6e4725
 MISC metadata.xml 623 BLAKE2B d072cc2f7d8e182752cc3c4ae118ec674782f2e0cb08c4ca6b2d4d56a6e4621a837143bf782ae0f65af418f0a90c01f24b5603bfe7f75d0221be68f9d193d34f SHA512 3a7fdb19cf75dd27f1c7a30707ee23d8e4c300f5fa419820e7aaf9b75aa9c09add1dcc488e0241a75552cc91a45a37e8603285da7c631d1c7860a18c28929859
--- a/app-arch/pigz/pigz-2.8.ebuild
+++ b/app-arch/pigz/pigz-2.8.ebuild
@ -0,0 +1,41 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/madler.asc
+inherit toolchain-funcs flag-o-matic verify-sig
+
+DESCRIPTION="A parallel implementation of gzip"
+HOMEPAGE="https://www.zlib.net/pigz/"
+SRC_URI="
+	https://www.zlib.net/pigz/${P}.tar.gz
+	verify-sig? ( https://www.zlib.net/pigz/${P}-sig.txt -> ${P}.tar.gz.asc )
+"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos"
+IUSE="static test"
+RESTRICT="!test? ( test )"
+
+LIB_DEPEND=">=sys-libs/zlib-1.2.3[static-libs(+)]"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
+DEPEND="
+	${RDEPEND}
+	static? ( ${LIB_DEPEND} )
+	test? ( app-arch/ncompress )
+"
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-madler )"
+
+src_compile() {
+	use static && append-ldflags -static
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	dobin ${PN}
+	dosym ${PN} /usr/bin/un${PN}
+	dodoc README
+	doman ${PN}.1
+}
--- a/app-arch/rar/Manifest
+++ b/app-arch/rar/Manifest
@ -1,13 +1,5 @@
-DIST rarlinux-x32-621.tar.gz 627883 BLAKE2B 07957401eea5efad7295a4da31f56bdb5ea64935b193f594f8cd5755aca9b4ffded9a2df834216c604a65b1fb7c0ab99c59591afb7f54dc65c6d74ff0b37cc0a SHA512 3e83806ccc40edfdc0740ca416cac2480e475fad72be4e245d500272f817c35f4c1ed05f7a40918f463b182d52454a3c02bf469298d56b973977fbda2d261b60
-DIST rarlinux-x32-622.tar.gz 627428 BLAKE2B eeb78f7dac2777347d54d203645ca9861c89d4e9bf47e1afc369eadde789d837b9537bc602cf6bb9262b188f70ecbe236463f15e12ef986d5b542d6ccb1a3294 SHA512 0d0f2e374185afc6541aa54f059d4d21a4bc6eaddc8ca42fa054866db1ddfbf7022ecaf35dc3677198ad57e4d84f17e3dd02f501b6bc48ea0eb54ce9d5168c05
 DIST rarlinux-x32-623.tar.gz 627653 BLAKE2B fc7475374adaf4e53367c70f4b95aaa4e05e6b78aeece97f79f266bc73ed7fc00ad05eb0b4d91bc62b8b5373ff6c17a91536f5b6a670942e4a514e5a483e1ded SHA512 95d7319be5cbe8544a93cabfa457ac723b204c3a0799a2fa6408a21bdd75ad3b49e2c030242b6c0473c05c4079eba113158b525400e3612bda56d8fbc4af6c3a
-DIST rarlinux-x64-621.tar.gz 614402 BLAKE2B 8ab72e52aee82942a5917f6742fdb135e6be9187609e3a857103b8758385f85cde1e95bc2c13e87e20d6b39b1e5bb77da7f917b2ff8a01e6baece9b462dd9135 SHA512 3f990213b2366e1c829ec24f9cdb957a29de45f2d12b9a35de54709443f977aab495d5bfd13ab2b46d77b83283635c827b614a7c33585925ca4fd4d9405e1c90
-DIST rarlinux-x64-622.tar.gz 614091 BLAKE2B d158052f80dc300f7a5c189d14bf8fa484a857e459c7c117fe9da4e7fc86f5a41b9176742038f11b8564ea78b1cf137eb12dfddb0df1c44bd08c0d4cf8de3296 SHA512 a38a930c6861aca0f1c7ce28f4174f464b537f4bacaca52b065c5cf31d3c331421c481d522785471874e000df441d8ea810d36f7ecc8be9dc849c73683af47d9
 DIST rarlinux-x64-623.tar.gz 614350 BLAKE2B a9ce80c6ab920e1c74d9b5fa4af2a2e0e46b638a4aced4cb6e88068518c1c3d702f20b44d9ce7c7c5601096254f01d6992c2d4a97a16554f8cfc67ca3600ce2f SHA512 0aa3e9c6b08e12343b1637929a3ce807196205ecfc5f6c98c464f8d8f40c544ec594a3be514a02d0e3a86c0a5d5e68208c993ab9d94d847249547fbb713fcfe2
-DIST winrar-x64-621.exe 3585248 BLAKE2B b65643c87d422db0094ac54f855c34345f4d07780e5b91a0ee203e87ffd3e10091ef2338a269a3f01c40cc4324b4b3f2254614e42535681d896b627db918b8e8 SHA512 42f4bcbff08f08dd45097b9ac07444bb3e157d6e9055c307de3f1cf86b62900e9cdf5931cee305e0bb0991a6f5ef060196cc42a29b8fc7d233032036a42b1494
-DIST winrar-x64-622.exe 3594776 BLAKE2B f3c9e90e9a84951cb57522436e153b1d0c8c4f4e13a66126937ad68a5d773ee55b394c020f7fddfbebee8cc1b24721566e2a1cc5fcf0724108dbe5a5446d0a84 SHA512 f73a6b37f96db444c8099c8f41c444bc216ce57c26b1401d3be44531ed28aa2e59802b71c6191992602ef21fe7a6e20414af87d6d3ba0071acc89b9167a1718f
 DIST winrar-x64-623.exe 3595296 BLAKE2B 8ff54390827070ecd1f42f53d5010e150bd4ccf38dd9bb85a9ee0e3fffa3c489e72e79be0bdecb90d995f19f924bee643f3c1c433d4d932a9c90589f29491887 SHA512 5ba4cb71d9579b01e54835f9559ab39fddbff5f3bc262e0c9f67ea450d490122326d46ae8f8a55b503f96ba1e5963f31ca3ff477ff485bab0fc3e5eac793d8dd
-EBUILD rar-6.21.ebuild 2289 BLAKE2B 2a4ed068245b6907f8d2023318942ea1e0890cb1fb266d8fee61ebac35a436af747a428a26307b5d0135099a0ea5601a96f9531da63244b9e88a4d99923fb2dd SHA512 22661c82c6df0cdff56dcb3186b946a7b9f738bd6e6056363ff6da8ed4f151b7a54ad6d0991b80b2ccad06c2fd664fd538bf440b39151a1cd9fd0501917aaa4f
-EBUILD rar-6.22.ebuild 2289 BLAKE2B 2a4ed068245b6907f8d2023318942ea1e0890cb1fb266d8fee61ebac35a436af747a428a26307b5d0135099a0ea5601a96f9531da63244b9e88a4d99923fb2dd SHA512 22661c82c6df0cdff56dcb3186b946a7b9f738bd6e6056363ff6da8ed4f151b7a54ad6d0991b80b2ccad06c2fd664fd538bf440b39151a1cd9fd0501917aaa4f
-EBUILD rar-6.23.ebuild 2291 BLAKE2B 6894ac9518b0fd85197a2bab67a054b3a839216ab37d6b6bcbae43f3d7258378b16c00d33b9d6dc607df9a098a140c344c1ca0ea68265a82fe5927140bff46a8 SHA512 2062f218641661d914cd796fa53226e589c1f8e5bee1c139bea71f65b0d1984680f71202a021a61caaa4c03e6ff4f5bc1657e683d12d41b9190e20c8819d44a4
+EBUILD rar-6.23.ebuild 2289 BLAKE2B 2a4ed068245b6907f8d2023318942ea1e0890cb1fb266d8fee61ebac35a436af747a428a26307b5d0135099a0ea5601a96f9531da63244b9e88a4d99923fb2dd SHA512 22661c82c6df0cdff56dcb3186b946a7b9f738bd6e6056363ff6da8ed4f151b7a54ad6d0991b80b2ccad06c2fd664fd538bf440b39151a1cd9fd0501917aaa4f
 MISC metadata.xml 436 BLAKE2B 89434fe285ad2b7be02c6e0014bb0a8fd54772e899345cb1c6de1da1e7cf5396d490af746bad1af6449183a4970c70415178765d918488f047174e64c289ceee SHA512 c9d65d30420f8febc660ad83169a8ae95c11ffcc673ca0cbc16530367e441ff72636fdbe3948065270547cb043ab0e1114dd573e4bd8716089bd01f056a63ff6
--- a/app-arch/rar/rar-6.21.ebuild
+++ b/app-arch/rar/rar-6.21.ebuild
@ -1,120 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PV="${PV/./}"
-URI_AMD64="https://www.rarlab.com/rar/rarlinux-x64-${MY_PV}.tar.gz"
-URI_X86="https://www.rarlab.com/rar/rarlinux-x32-${MY_PV}.tar.gz"
-URI_WIN64="https://www.rarlab.com/rar/winrar-x64-${MY_PV}.exe"
-
-inherit unpacker
-
-DESCRIPTION="RAR compressor/uncompressor"
-HOMEPAGE="https://www.rarlab.com/"
-SRC_URI="
-	all-sfx? (
-		${URI_AMD64}
-		${URI_X86}
-		${URI_WIN64}
-	)
-	amd64? ( ${URI_AMD64} )
-	x86? ( ${URI_X86} )
-"
-S="${WORKDIR}/${PN}"
-
-LICENSE="BSD BSD-2 RAR"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE="all-sfx"
-RESTRICT="bindist mirror"
-
-RDEPEND="sys-libs/glibc"
-BDEPEND="all-sfx? ( app-arch/unrar )"
-
-DOCS=( "acknow.txt" "rar.txt" "readme.txt" "whatsnew.txt" )
-
-QA_PREBUILT="
-	opt/rar/default.sfx
-	opt/rar/default-elf32.sfx
-	opt/rar/default-elf64.sfx
-	opt/rar/default-win32.sfx
-	opt/rar/default-win64.sfx
-	opt/rar/unrar
-	opt/rar/rar
-	opt/rar/WinCon.SFX
-	opt/rar/WinCon64.SFX
-	opt/rar/Zip.SFX
-	opt/rar/Zip64.SFX
-"
-
-src_unpack() {
-	local _file
-
-	for _file in ${A}; do
-		if [[ "${_file}" == rarli* ]]; then
-			if [[ "${_file}" =~ x64 ]]; then
-				if ! use amd64; then
-					continue
-				fi
-
-				unpack "${_file}"
-			elif [[ ! "${_file}" =~ x64 ]]; then
-				if ! use x86; then
-					continue
-				fi
-
-				unpack "${_file}"
-			else
-				die "Unknown SRC file '${_file}'!"
-			fi
-		fi
-	done
-
-	if use all-sfx ; then
-		mkdir sfx
-		cd sfx
-		for _file in ${A}; do
-			if [[ "${_file}" == rarli* ]]; then
-				unpack "${_file}"
-				if [[ "${_file}" =~ x64 ]]; then
-					mv rar/default.sfx default-elf64.sfx || die
-				else
-					mv rar/default.sfx default-elf32.sfx || die
-				fi
-			elif [[ "${_file}" == winrar* ]]; then
-				ln -s "${DISTDIR}"/${_file} w64.rar || die
-				unpack_rar ./w64.rar
-				mv Default.SFX default-win32.sfx || die
-				mv Default64.SFX default-win64.sfx || die
-			else
-				die "Unknown SFX file '${_file}'!"
-			fi
-		done
-	fi
-}
-
-src_compile() { :; }
-
-src_install() {
-	exeinto /opt/rar
-	doexe rar unrar
-
-	insinto /opt/rar
-	doins rarfiles.lst
-
-	if use all-sfx; then
-		doins "${WORKDIR}"/sfx/*.{sfx,SFX}
-	else
-		doins default.sfx
-	fi
-
-	dodir /opt/bin
-	dosym ../rar/rar /opt/bin/rar
-	dosym ../rar/unrar /opt/bin/unrar
-
-	docinto html
-	dodoc order.htm
-
-	einstalldocs
-}
--- a/app-arch/rar/rar-6.22.ebuild
+++ b/app-arch/rar/rar-6.22.ebuild
@ -1,120 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PV="${PV/./}"
-URI_AMD64="https://www.rarlab.com/rar/rarlinux-x64-${MY_PV}.tar.gz"
-URI_X86="https://www.rarlab.com/rar/rarlinux-x32-${MY_PV}.tar.gz"
-URI_WIN64="https://www.rarlab.com/rar/winrar-x64-${MY_PV}.exe"
-
-inherit unpacker
-
-DESCRIPTION="RAR compressor/uncompressor"
-HOMEPAGE="https://www.rarlab.com/"
-SRC_URI="
-	all-sfx? (
-		${URI_AMD64}
-		${URI_X86}
-		${URI_WIN64}
-	)
-	amd64? ( ${URI_AMD64} )
-	x86? ( ${URI_X86} )
-"
-S="${WORKDIR}/${PN}"
-
-LICENSE="BSD BSD-2 RAR"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE="all-sfx"
-RESTRICT="bindist mirror"
-
-RDEPEND="sys-libs/glibc"
-BDEPEND="all-sfx? ( app-arch/unrar )"
-
-DOCS=( "acknow.txt" "rar.txt" "readme.txt" "whatsnew.txt" )
-
-QA_PREBUILT="
-	opt/rar/default.sfx
-	opt/rar/default-elf32.sfx
-	opt/rar/default-elf64.sfx
-	opt/rar/default-win32.sfx
-	opt/rar/default-win64.sfx
-	opt/rar/unrar
-	opt/rar/rar
-	opt/rar/WinCon.SFX
-	opt/rar/WinCon64.SFX
-	opt/rar/Zip.SFX
-	opt/rar/Zip64.SFX
-"
-
-src_unpack() {
-	local _file
-
-	for _file in ${A}; do
-		if [[ "${_file}" == rarli* ]]; then
-			if [[ "${_file}" =~ x64 ]]; then
-				if ! use amd64; then
-					continue
-				fi
-
-				unpack "${_file}"
-			elif [[ ! "${_file}" =~ x64 ]]; then
-				if ! use x86; then
-					continue
-				fi
-
-				unpack "${_file}"
-			else
-				die "Unknown SRC file '${_file}'!"
-			fi
-		fi
-	done
-
-	if use all-sfx ; then
-		mkdir sfx
-		cd sfx
-		for _file in ${A}; do
-			if [[ "${_file}" == rarli* ]]; then
-				unpack "${_file}"
-				if [[ "${_file}" =~ x64 ]]; then
-					mv rar/default.sfx default-elf64.sfx || die
-				else
-					mv rar/default.sfx default-elf32.sfx || die
-				fi
-			elif [[ "${_file}" == winrar* ]]; then
-				ln -s "${DISTDIR}"/${_file} w64.rar || die
-				unpack_rar ./w64.rar
-				mv Default.SFX default-win32.sfx || die
-				mv Default64.SFX default-win64.sfx || die
-			else
-				die "Unknown SFX file '${_file}'!"
-			fi
-		done
-	fi
-}
-
-src_compile() { :; }
-
-src_install() {
-	exeinto /opt/rar
-	doexe rar unrar
-
-	insinto /opt/rar
-	doins rarfiles.lst
-
-	if use all-sfx; then
-		doins "${WORKDIR}"/sfx/*.{sfx,SFX}
-	else
-		doins default.sfx
-	fi
-
-	dodir /opt/bin
-	dosym ../rar/rar /opt/bin/rar
-	dosym ../rar/unrar /opt/bin/unrar
-
-	docinto html
-	dodoc order.htm
-
-	einstalldocs
-}
--- a/app-arch/rar/rar-6.23.ebuild
+++ b/app-arch/rar/rar-6.23.ebuild
@ -25,7 +25,7 @@ S="${WORKDIR}/${PN}"

 LICENSE="BSD BSD-2 RAR"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 IUSE="all-sfx"
 RESTRICT="bindist mirror"

--- a/app-arch/tar/Manifest
+++ b/app-arch/tar/Manifest
@ -6,5 +6,5 @@ DIST tar-1.35.tar.xz 2317208 BLAKE2B e1a200d21f433cd7d917dd979db16919a9167056ae6
 DIST tar-1.35.tar.xz.sig 95 BLAKE2B 8501b55b700bc99b81f04519db1cd8f7bc3d87dd5bfefa25a3d979b23359f02dfb770f3dd66dca275baa70a99612cb85c1019faaf3a1f0bcf50c9815b8e32eca SHA512 00e5c95bf8015f75f59556a82ed7f50bddefe89754c7ff3c19411aee2f37626a5d65c33e18b87f7f8f96388d3f175fd095917419a3ad1c0fc9d6188088bac944
 EBUILD tar-1.34-r2.ebuild 2778 BLAKE2B 0d78f796a717b6dafc101265edc5e6513dd2d3a6d845bf7e79a8274b61501d423e6997621380af902f712085f29109f3f40feeb8b54c7d9919bb04fc0b480c84 SHA512 bfdb1fe21ca62d565a15cfe2740de4ed2ec605211419931a18c2fd4f4f69ec6d108af8ccef504b1b1442f2b124354dd5b2093a507cf3de3f06d7d6b3118f1e0a
 EBUILD tar-1.34-r3.ebuild 2837 BLAKE2B 223f90f72d269c2f643c75d6d3369ebfdb6eeaf5e6fc73d1fe1e1b5f704458a2833e546a556b36d13a1459d57503faf743fd0445b6da34c8fbfb03ccdbb6fb95 SHA512 1ed438c338943f40b8ddf8a87aca7c9761c8adaa9cf1f8f9338453a34ce82ad680cd033b12cd48be16cf099e65c215801b8b1f482b5c435d90c75e2a7ea7126d
-EBUILD tar-1.35.ebuild 3109 BLAKE2B 4143ca804f08ba13be15e66b1c5f6eb81052a81bf157f2726c6881edfe7240a472b30d4f3b8379c939fa6dc031dac0df527cb7d40b4b7e6c33db8655a040e6d7 SHA512 5bd86ed32e7151bb5d1c5c5362073482c9f79e5329fc288ffa82baf0eebd4f2e18c038bbd9584b69c06d5677047af7869af5785ef1774f4c87f27ed1c463d1cb
+EBUILD tar-1.35.ebuild 3107 BLAKE2B a01945b8fd3470e3bce0d92bd6481ef94a3a728ed537943ea473f08c370eead0a6ab8338ea48d2339e6a414a6b716b522152408fab414374b7572a3e473afc5a SHA512 8ab4f47062e348bdbc53ecdef0476f4e0cf56bae06155fa97d7a9552fe55b2e76a4fd20d62dd7d941ebf0652e1f3eb32f2db1691fd48a6cf1bc5806931e586fe
 MISC metadata.xml 388 BLAKE2B 85aba561c0c0ad8c72d8d33f66ef6504bed7747957059c19fc5b0267b048bbddbd1112239bd4d3bcdf1c2f465018a2128e086a253253205dd7b815c11f3cc6ca SHA512 83e4c69e150b6420ab2ef4b777d930fd5e0f5cc1244bf8cd9a7cf0f867219100578a4777043fccf5f95a6a44ee264b88381d94924f4f18c80cb2ff339efbce64
--- a/app-arch/tar/tar-1.35.ebuild
+++ b/app-arch/tar/tar-1.35.ebuild
@ -20,7 +20,7 @@ SRC_URI="
 LICENSE="GPL-3+"
 SLOT="0"
 if [[ -z "$(ver_cut 3)" || "$(ver_cut 3)" -lt 90 ]] ; then
-	KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 IUSE="acl minimal nls selinux xattr"

--- a/app-arch/unrar/Manifest
+++ b/app-arch/unrar/Manifest
@ -1,6 +1,8 @@
 AUX unrar-6.2.6-honor-flags.patch 1238 BLAKE2B 3006316800d6933f85935b0d1d4a224ae63d76d826c2a71f21ba148466d17e76e0a93f24d9c88015a8c58c4ca8f602ad25da48d097b80a078dbcc38a1a47715d SHA512 11cb495b661272b44078368318d2ec9f91e5d70bc79e5504c41a7d8e5207dc6b9afbad7cb36ac3188268f3797fa236bee55fcad8c95daeda2191a9e2a26dfd60
+DIST unrar-6.2.10.tar.gz 246383 BLAKE2B 6f7e7bf099f5a9de71c01b941c4cceaaf568709ac8b8e2f490f2f037c27adabc3bcde595e1330476f72204e6c5611e8c995c4c2842d9248731d876e67abc1086 SHA512 26e7febc4e62bcace7aa36e05d5341ab57813cc0c224c6a924ca909828879b0172d2cea9ab6cfdfe4bc3b51d49feb48f46df3874fa6f070f6062a15e1020271d
 DIST unrar-6.2.8.tar.gz 246249 BLAKE2B 3766f7ebd0379835cff7cce8bb2deaf86d3de7c4a37d211d8a41effeb13a5a9efc53deabb5f10cd7f49d8e144cd9c1a93cce2ca3ae74e8a2142ab3ae97ab4759 SHA512 9b956d0c4b6a13f9ff4d9e57de7284dc879070746e3792e7640481a5b5b8336142b21c4d0c66c64627630cafbed0ff019a41b8f8536299ac7cbfdb933f92f75a
 DIST unrar-6.2.9.tar.gz 246388 BLAKE2B 495af1b78d2213c6bac0e75462b3d5e9fc3bfea809bcbb672216da47cd483bcc5867b504358125c51147a0e1869568c8a822946ca8148f204eeb087671029d9d SHA512 80424348946a56b47c107b2cd78c8bc7ce7f223a4d923b137860ec50678c4f279114dd7cdc9eb6a2fa6ff8c8a059ab8d35e16e3feae9dd1433fe51479501b61c
+EBUILD unrar-6.2.10.ebuild 1764 BLAKE2B 6c5a664b281463eeda4fac4820e949918a9246d09bea462457634ffbbfcea66ef0f816fb60d98bee3b2888044728affd3d8063214bc91be5a4cf5ca94fb55185 SHA512 edbd86ac83a32d95a49d5e74664fee4e15dd61a38abbc4bda1c8f8773b868c7f9ec463613e6eb327bcf255d16f166699f03a8d4049ac840d152e373ef568f8c6
 EBUILD unrar-6.2.8.ebuild 1757 BLAKE2B c32e0b9eeeb17edd6da47b44c48bda3c80e4336b90bf72bdbb14ad832f0c606a9a9ed4db73fd9cb13754ee0642648463369c2b2bbcdac19e026449793f2894d4 SHA512 dd6d4fd175014f57cde71ee88e877f27a3aaabb8987a0e22f9c9ca1eb9a4de8103fb2bbcf3cee74c8cc59e8ac3b53f2dd87592d6ff4b0dfbb27a0f198932fa84
 EBUILD unrar-6.2.9.ebuild 1764 BLAKE2B 6c5a664b281463eeda4fac4820e949918a9246d09bea462457634ffbbfcea66ef0f816fb60d98bee3b2888044728affd3d8063214bc91be5a4cf5ca94fb55185 SHA512 edbd86ac83a32d95a49d5e74664fee4e15dd61a38abbc4bda1c8f8773b868c7f9ec463613e6eb327bcf255d16f166699f03a8d4049ac840d152e373ef568f8c6
 MISC metadata.xml 409 BLAKE2B a84cfacf4a852caa6f6389b380eeb700e1c44c4af68cb2568a27db21c2b577838d9c57269dcdb5f08dfa989617eca978520082d36153ea503a5033c4cc9446af SHA512 fcdf5a345b3eb2b5093b60def127dd48fed068bf5caa92dc52524b4e398d49c39d8ee686b3f0695c781ab2d0d3ba486baec23f74f80e581b7a2f77e0c5709eaa
--- a/app-arch/unrar/unrar-6.2.10.ebuild
+++ b/app-arch/unrar/unrar-6.2.10.ebuild
@ -0,0 +1,62 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib toolchain-funcs
+
+MY_PN="${PN}src"
+
+DESCRIPTION="Uncompress rar files"
+HOMEPAGE="https://www.rarlab.com/rar_add.htm"
+SRC_URI="https://www.rarlab.com/rar/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/unrar"
+
+LICENSE="unRAR"
+SLOT="0/6" # subslot = soname version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
+PATCHES=( "${FILESDIR}/${PN}-6.2.6-honor-flags.patch" )
+
+src_prepare() {
+	default
+
+	local sed_args=( -e "/libunrar/s:.so:$(get_libname ${PV%.*.*}):" )
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		sed_args+=( -e "s:-shared:-dynamiclib -install_name ${EPREFIX}/usr/$(get_libdir)/libunrar$(get_libname ${PV%.*.*}):" )
+	else
+		sed_args+=( -e "s:-shared:& -Wl,-soname -Wl,libunrar$(get_libname ${PV%.*.*}):" )
+	fi
+	sed -i "${sed_args[@]}" makefile || die
+}
+
+src_configure() {
+	mkdir -p build-{lib,bin} || die
+	printf 'VPATH = ..\ninclude ../makefile' > build-lib/Makefile || die
+	cp build-{lib,bin}/Makefile || die
+}
+
+src_compile() {
+	unrar_make() {
+		emake AR="$(tc-getAR)" CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" STRIP=true "$@"
+	}
+
+	unrar_make CXXFLAGS+=" -fPIC" -C build-lib lib
+	ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname) || die
+	ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname ${PV}) || die
+
+	unrar_make -C build-bin
+}
+
+src_install() {
+	dobin build-bin/unrar
+	dodoc readme.txt
+
+	dolib.so build-lib/libunrar*
+
+	insinto /usr/include/libunrar${PV%.*.*}
+	doins *.hpp
+	dosym libunrar${PV%.*.*} /usr/include/libunrar
+
+	find "${ED}" -type f -name "*.a" -delete || die
+}
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
--- a/app-backup/borgmatic/Manifest
+++ b/app-backup/borgmatic/Manifest
@ -5,9 +5,9 @@ AUX borgmatic-1.7.3-systemd_service_bin_path.patch 604 BLAKE2B 9b1c613ce2667d2b8
 DIST borgmatic-1.7.15.tar.gz 390819 BLAKE2B dc9086a0363afb8acbe943776cd6f388ba85a18e50554b5187c86e7054e7ff748ea878623d9b46c19564198faf5c566b137e54681812086115311970bc517455 SHA512 cf1f6da782a5ad547a76b9e4cb00cbd4ca4232cfb5dcd027c6fee9f1a3b97fda894f27c512007b449b8e11e939249060f63c3cdde29aee3aa86710200cf8d2db
 DIST borgmatic-1.7.8.tar.gz 350233 BLAKE2B 3fcd392983f73ec5e97f0dc6b96e211d7f1e1d1a4ce95c635c675cf043e796925df53c30c1e4f8eb1a095d9ec5ff81e90edee5ff2576f4683053d3108004afd9 SHA512 bcc65fdb7ea1171fb61deda9b1f69a00596e1e10a99508d336977b694bd8f93d74837aad9211bf1065b785220aaf1460a3ea403bf23fa4873d1bf4c6b4016525
 DIST borgmatic-1.8.0.tar.gz 388945 BLAKE2B f765f135f4c4a99216928764ce769854d4364b20959ed547c07f3f9a88fa756765caf85fa4e726e7fd2bbfc704b509e860619383f53e731d9b44911ad930b65b SHA512 3b94095dcc0c8f199e59caafc0a3ec06780b7b87b532d4e7d666d2f84a8920d3671e47a0fd156ce67eae1e7914307c789a7bcf826fba46c0a7a34d333a14cde1
-DIST borgmatic-1.8.1.tar.gz 392059 BLAKE2B 4f33063cbe22db596da275d80e5c9c93ad87ca0cb6d76dc31fbe25f3992af626e5a90ec437a4abdbde21ddb10f8a0bd90d8ebc70754a723204ac37416d1e0a6f SHA512 58164cb38cdf7be3979fcdf322671c36ecf1d1a79113a0a493f2e9911eb2e0e362d6811080ec87b04719ca0ecefcfb234daba546e61cd2017fcb7ce3988b4d56
+DIST borgmatic-1.8.2.tar.gz 396972 BLAKE2B d9444ec49c3d325d865d553fa1cb28de9416aa36e999ef6452c62a9a6519e58afbc922398c52f3a1de441fd8da02e5618bc03a67baae161677a15a1780209788 SHA512 8de49c071c54516d0fb3f0d918f05226ac00519cc0605eacf204795a239554764fd1f3b0f44f3110fc551d6a89e92a59ca34ddebbfb02bf3deabc326f81ccf9c
 EBUILD borgmatic-1.7.15.ebuild 2040 BLAKE2B c204fc85f282faf5e1b7834a2900d524c5bfa0bce9de4ff8b56736787d0c2c9f9beb3b75ef96dab3cf490a8b7008182d995465ef41c4ae4c884969e6a766358b SHA512 6aed82522fcc67f7c20234a2eae5810eb02f4d24cb297192fc56aa67b22193b62631fd47ed042eba995ce21ffbeb1189c0c3b092fbc54d6ac3ca454bbc18603f
 EBUILD borgmatic-1.7.8.ebuild 1643 BLAKE2B 9e05c2bfc9894d3e3636d17254cbd6d386d44fdb3305d16278be5a42d6bd56f3d1e0b81c53245b264d91118b10c03fc9515573146ad47b15b5b8148f77c849e5 SHA512 0c3788e897ab3a838548f456a6b3ccbc644d877f7ce83bbbbea59f9f586c3e69af44222016cfb0fe803e639baeebe61d7e77b5160b4ed7ea223add48c3dbca6b
 EBUILD borgmatic-1.8.0.ebuild 1992 BLAKE2B c45e0bb857401d5eda366e90597c79c66bfb6797178dd54ee251ff0b85fc647dbf9185040430aa18feafbfe528e0f3a92d2c71f99674749ad2ab9170a79ba7e1 SHA512 bf354928158c8044a01ef646698c5aaba164e0453aeee2c9fb89df90b3367dfd6eba88b0cc88c5a4fe9b53941c91fcfa7819c4cbc738ecf07e613068e79cbdfb
-EBUILD borgmatic-1.8.1.ebuild 1992 BLAKE2B c45e0bb857401d5eda366e90597c79c66bfb6797178dd54ee251ff0b85fc647dbf9185040430aa18feafbfe528e0f3a92d2c71f99674749ad2ab9170a79ba7e1 SHA512 bf354928158c8044a01ef646698c5aaba164e0453aeee2c9fb89df90b3367dfd6eba88b0cc88c5a4fe9b53941c91fcfa7819c4cbc738ecf07e613068e79cbdfb
+EBUILD borgmatic-1.8.2.ebuild 1992 BLAKE2B c45e0bb857401d5eda366e90597c79c66bfb6797178dd54ee251ff0b85fc647dbf9185040430aa18feafbfe528e0f3a92d2c71f99674749ad2ab9170a79ba7e1 SHA512 bf354928158c8044a01ef646698c5aaba164e0453aeee2c9fb89df90b3367dfd6eba88b0cc88c5a4fe9b53941c91fcfa7819c4cbc738ecf07e613068e79cbdfb
 MISC metadata.xml 380 BLAKE2B bd4f6eb451caa6b36d51dff099c7885ad2c30f2f9f5397e12049a28214601d67853f0dc604e6e42a566b8bf57acf0d9e39c685af8743cce72ec3b5b07adea72e SHA512 1d2c0a22d3b844b58ed35f3fae261a1d6906e5e1b0e69bbe364e0409f335b44f04089ea1d0e6144e2ddfcf066cc8ad85d14c0b22a28ddd22d235c48e1401569f
--- a/app-backup/borgmatic/borgmatic-1.8.2.ebuild
+++ b/app-backup/borgmatic/borgmatic-1.8.2.ebuild
--- a/app-backup/btrbk/Manifest
+++ b/app-backup/btrbk/Manifest
@ -1,4 +1,6 @@
+AUX btrbk-0.32.6-support-asciidoc.patch 2453 BLAKE2B 0c6ebb3fc102d103b1219693ba98f09452416f9f4b358859808a80b1660d879f2bde9216b68cac63cd0717b25f54fabe5706cbbbad787d871c03534483e059c6 SHA512 dc6fc53ed65880dae0d88be9004dcf318ac9eea287bad6439cd4303627bdf729ed84023542b9123c5d644df3e87867c5c0a75c414f60020b719e67ef4607ac6e
 DIST btrbk-0.32.6.tar.xz 111804 BLAKE2B f23e5f60e63bb1a9d5cc2f1339ac3e40a9cae5c0e3f626f1ad0e7396b8f9ebb00bce319835c9c708cdfe3c1cad3ef4e90985cb9c633be7091ffdbde93a10412c SHA512 5a21b3728aded1610ef9106d0460db12b07bbc6d62be199081baba92413b30ba0f7b4a77612d0bbb0910863be85f2c68eab3d02fabf1ea5a7f5fb22aeb1f7a38
 EBUILD btrbk-0.32.6-r1.ebuild 2383 BLAKE2B 6489bf667539dd1d915426682299a79b0244c4b7f1cf5cc2e6d2622ef301517ade7d3fc606a8ae0c5e95f1f681dca4adf58e2f0a525cdb88a2716dd8323d34d8 SHA512 8a49e3e2879052323084548575560c76c1e8bae849169309d57ace38375da6cc5eb830011989ce7cec981a86bcfd46dc52df68956664a2fe47f6cb715351e3cf
-EBUILD btrbk-9999.ebuild 2387 BLAKE2B 7dd1eedadeca915599a157007832bcd0c43e05f8f90230e63a34fc866e8df28b57c1d596644ccb8a19587b92dcaecedb1ffe025b8d2339c0043b9f45fd414862 SHA512 2f1f1fb17aaae7e8ea3dccec0e1b09813f89fff1b29dddb3cd1ca9e11dfff85158e1a0f14c2f329f8f5de55a77e52e205b35d9be3ac04ec1d65cb3b7efbf7583
+EBUILD btrbk-0.32.6-r2.ebuild 2486 BLAKE2B 989a1603597e1d97acf89cdf5b8a3ca113188304442784e8510a00b23cc008bcf16d11e6b31dbcd143cdefec7aaa1792c7edc12fe4b9e6222b524510aa5578f9 SHA512 e351ef5cc42f013888b7f4daf4a6060ee4a9d5b4b1660b0c635deff2a80497baf9760ed1acc047a9e36bbc0501ca7dee86f3966ea6e537984f31493908f3302a
+EBUILD btrbk-9999.ebuild 2430 BLAKE2B 35c75fbd2e3664392b6f1ae893e04e2b11e0881ddd4865e72d8debf4caa6581c430f3da25c202241b0cedc125a3e40bf8c312dc5d0e68758c864a5b50f8a52fd SHA512 c6338b7c24b1873678383508136902340aab6c388a2dfe8e43ae9923f393f119e8138b08e61b59d359a58435d17c9f12b5ef593031326d536ed9b1c0869bb164
 MISC metadata.xml 1075 BLAKE2B 9e352a1f9346ebb1cff94393f977dfb0c3714e53380ce2ed3c8eb53375d2ac74c95655556fb604bf538ae63ae00de9ed97cf9a02cadaec97c7117f9a621ca481 SHA512 681a2a38dc3ddba866d46bd9e88bc8549cb1ba297de965a1faecada4ac7b966a3603ce4b647544ba9dabfbbb59e1072cbecf550b580835ae1d1d79efcc3af7e5
--- a/app-backup/btrbk/btrbk-0.32.6-r2.ebuild
+++ b/app-backup/btrbk/btrbk-0.32.6-r2.ebuild
@ -0,0 +1,93 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/digint/btrbk.git"
+	inherit git-r3
+	SRC_URI=""
+else
+	SRC_URI="https://digint.ch/download/btrbk/releases/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+DESCRIPTION="Tool for creating snapshots and remote backups of btrfs subvolumes"
+HOMEPAGE="https://digint.ch/btrbk/"
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="+mbuffer +doc +lsbtr"
+
+RDEPEND="
+	dev-lang/perl
+	>=sys-fs/btrfs-progs-4.12
+	virtual/openssh
+	mbuffer? ( >=sys-block/mbuffer-20180505 )
+"
+BDEPEND="
+	doc? (
+		|| (
+			app-text/asciidoc
+			>=dev-ruby/asciidoctor-1.5.7
+		)
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-support-asciidoc.patch
+)
+
+src_compile() {
+	emake clean
+	use doc && emake -C doc
+}
+
+src_install() {
+	local targets="install-bin install-etc install-share install-systemd"
+	use doc && targets="${targets} install-man install-doc"
+	use lsbtr && targets="${targets} install-bin-links"
+	emake \
+		DESTDIR="${D}" \
+		DOCDIR="/usr/share/doc/${PF}" \
+		SYSTEMDDIR="$(systemd_get_systemunitdir)" \
+		${targets}
+}
+
+pkg_preinst() {
+	if has_version "<${CATEGORY}/${PN}-0.26.0" ; then
+		upgrade_0_26_0_warning="1"
+	fi
+	if has_version "<${CATEGORY}/${PN}-0.27.0" ; then
+		upgrade_0_27_0_warning="1"
+	fi
+}
+
+pkg_postinst() {
+	if [[ "${upgrade_0_26_0_warning}" == "1" ]]; then
+		ewarn "If you are using raw targets, make sure to run the"
+		ewarn "\"raw_suffix2sidecar\" utility in each target directory."
+	fi
+	if [[ "${upgrade_0_27_0_warning}" == "1" ]]; then
+		ewarn 'Due to a bugfix in the scheduler [1] [2], previously preserved'
+		ewarn 'monthly/yearly backups could get deleted when upgrading to'
+		ewarn 'btrbk-0.27.0.'
+		ewarn ''
+		ewarn 'Before upgrading to btrbk-0.27.0, make sure to stop all cron jobs'
+		ewarn 'or systemd timers calling btrbk.'
+		ewarn ''
+		ewarn 'After upgrading, run "btrbk prune --dry-run --print-schedule" and'
+		ewarn 'check if any snapshots/backups would get deleted. If you want to'
+		ewarn 'forcibly preserve a snapshot/backup forever, rename it:'
+		ewarn ''
+		ewarn '    mv mysubvol.YYYYMMDD mysubvol.YYYYMMDD.keep_forever'
+		ewarn ''
+		ewarn 'Note that btrbk ignores subvolumes with unknown naming scheme, e.g.'
+		ewarn '(".keep_forever" suffix in the example above).'
+		ewarn ''
+		ewarn '  [1] https://github.com/digint/btrbk/issues/217'
+		ewarn '  [2] https://github.com/digint/btrbk/commit/719fb5f'
+	fi
+}
--- a/app-backup/btrbk/btrbk-9999.ebuild
+++ b/app-backup/btrbk/btrbk-9999.ebuild
@ -16,16 +16,25 @@ fi

 DESCRIPTION="Tool for creating snapshots and remote backups of btrfs subvolumes"
 HOMEPAGE="https://digint.ch/btrbk/"
+
 LICENSE="GPL-3+"
 SLOT="0"
 IUSE="+mbuffer +doc +lsbtr"

-DEPEND="doc? ( >=dev-ruby/asciidoctor-1.5.7 )"
-
-RDEPEND="dev-lang/perl
+RDEPEND="
+	dev-lang/perl
+	>=sys-fs/btrfs-progs-4.12
 	virtual/openssh
 	mbuffer? ( >=sys-block/mbuffer-20180505 )
-	>=sys-fs/btrfs-progs-4.12"
+"
+BDEPEND="
+	doc? (
+		|| (
+			app-text/asciidoc
+			>=dev-ruby/asciidoctor-1.5.7
+		)
+	)
+"

 src_compile() {
 	emake clean
--- a/app-backup/btrbk/files/btrbk-0.32.6-support-asciidoc.patch
+++ b/app-backup/btrbk/files/btrbk-0.32.6-support-asciidoc.patch
@ -0,0 +1,58 @@
+https://github.com/digint/btrbk/commit/9dfee7bc32f392a599164ae4c2a0c24d418751ef
+
+From 9dfee7bc32f392a599164ae4c2a0c24d418751ef Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sat, 8 Jul 2023 23:44:53 +0100
+Subject: [PATCH] doc: allow asciidoc again
+
+This effectively reverts 0e63843195eb35c26386863d18a70a764a3efd04 and
+173319e7e1599ef9d08b985740e55020ebc2ea85.
+
+asciidoc has been revived (for a while now) and doesn't require Python 2. We
+still prefer asciidoctor and fallback to asciidoc/a2x if it's not available.
+
+Comparing the asciidoc and asciidoctor man pages, everything looks OK.
+
+Python tends to be available more readily in distribution build environments
+rather than the Ruby stack. Also, the pregenerated man pages are gone as of
+f132c94c655afa930a73423e6c1abf88d412f49d.
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/doc/Makefile
+++ b/doc/Makefile
+@@ -18,8 +18,19 @@ ifeq ($(COMPRESS), yes)
+ endif
+ 
+ # convert using "asciidoctor": <https://asciidoctor.org>
+-ASCIIDOCTOR_MANPAGE = asciidoctor -d manpage -b manpage
+-ASCIIDOCTOR_HTML    = asciidoctor -b html5 -d article
+# fallback to "a2x" from asciidoc package: <http://asciidoc.org>
+ifneq (, $(shell command -v asciidoctor 2> /dev/null))
+  ASCIIDOC_MANPAGE = asciidoctor -d manpage -b manpage
+  ASCIIDOC_HTML    = asciidoctor -b html5 -d article
+else ifneq (, $(shell command -v a2x 2> /dev/null))
+  # NOTE: using -L (--no-xmllint), as xmllint is a separate package on many distros.
+  ASCIIDOC_MANPAGE = a2x -L -d manpage -f manpage
+  ASCIIDOC_HTML    = asciidoc -b html -d article
+else
+  ASCIIDOC_ERR = $(error "please install either asciidoc or asciidoctor")
+  ASCIIDOC_MANPAGE = $(ASCIIDOC_ERR)
+  ASCIIDOC_HTML    = $(ASCIIDOC_ERR)
+endif
+ 
+ # reproducible builds: reference date is ":date:" attribute from asciidoc source
+ date_attr = $(shell sed -rn 's/:date:\s*//p' $(1))
+@@ -50,10 +61,10 @@ clean:
+ 	gzip -9 -n -c $< > $@
+ 
+ %.1 : %.1.asciidoc
+-	SOURCE_DATE_EPOCH=$(call source_date_epoch,$<) $(ASCIIDOCTOR_MANPAGE) -o $@ $<
+	SOURCE_DATE_EPOCH=$(call source_date_epoch,$<) $(ASCIIDOC_MANPAGE) $<
+ 
+ %.5 : %.5.asciidoc
+-	SOURCE_DATE_EPOCH=$(call source_date_epoch,$<) $(ASCIIDOCTOR_MANPAGE) -o $@ $<
+	SOURCE_DATE_EPOCH=$(call source_date_epoch,$<) $(ASCIIDOC_MANPAGE) $<
+ 
+ %.html : %.asciidoc
+-	SOURCE_DATE_EPOCH=$(call source_date_epoch,$<) $(ASCIIDOCTOR_HTML) -o $@ $<
+	SOURCE_DATE_EPOCH=$(call source_date_epoch,$<) $(ASCIIDOC_HTML) -o $@ $<
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
--- a/app-crypt/gpgme/Manifest
+++ b/app-crypt/gpgme/Manifest
@ -4,5 +4,5 @@ DIST gpgme-1.20.0.tar.bz2.sig 119 BLAKE2B 2f623dae9bbfa68eab7433854b4357dbcb1412
 DIST gpgme-1.21.0.tar.bz2 1830113 BLAKE2B 77000567fde5b78bf46352b25c81e7223506c00703360c87d3bd05afde29ef33d7f9f82e2dbe20f4e64bb6d99a0d8f442d88762d14a72b7ddabf5b38be62e130 SHA512 eb70813d22920d6d54459a4271259edf55d5833edfdd053551ca245521e06a8c19ed02dc93e0c53132a699e6d8c82499f50caf8e390af28468e3549470595b7d
 DIST gpgme-1.21.0.tar.bz2.sig 119 BLAKE2B ac19a5694e139be36ee9c6e28501d4a695166cfbc8f1561de7c7741a274f35cb0a67f779b5fc1ff58b5a11eeaa5e575c06233be65d01c40504efe16a759740ea SHA512 8a471333fd0fc6da50990c3aed67900a6b183cde0fcc449d37435289d8f309c68555c741281c06af9740ac088ae0b4747263da1dfd23d90b050185706948b227
 EBUILD gpgme-1.20.0.ebuild 4205 BLAKE2B b803af0f49fc477df55e2f3e6210e5358178f3dbc66a5d077e4e588ffce658b4073f3104ce13bc41b8c60f37894d395d00fafc3ece874f253dd3f14c8a924817 SHA512 7b8cb3e5dbf11130ff37dd78c367b8b58b0e2eaf43f3c8cb57982f425e07b7333eb0c1ff5a6dcdb583776a760c70198af551b89863df01c4842e4fbde0307ec4
-EBUILD gpgme-1.21.0.ebuild 4214 BLAKE2B 29776c122ed41a6b6272c2aa1dffcca325cf6d8a52aa635dfe2a6c744931dc64682b34f503cbff67c63496c04f12c2cedd3d9d2f549465128b0b4ca4b4038335 SHA512 9bfe1eb6a093251be457bef95e4f552d746423cb8a5cb398ef42a2bb5e5fee9a1ebfac303b25155d9f03c9255f444e71b2f1fdcdb176822d26830967c175b57a
+EBUILD gpgme-1.21.0.ebuild 4208 BLAKE2B 8635fc908abc5b8b0036388db7edc40abd8cf57de52f7fdbdbf4b15586d33f05d5a6e690e3da9cb9fb4b9e81c609b9e54925a2eee8dbbe5c50741d90a377834c SHA512 5bc7ae1b8a9565ef6f46ea2b6ecd148f9a44e035a3a86bb57606c70d27bda6a6565910c37d4887b35c31ba2ca4898fc3f4d82489b677bcfa908e3439f2e35d70
 MISC metadata.xml 333 BLAKE2B 6dd18b63ec1f7656ab8bd705242bec45d7820db8be31f326172cad400711e6d7268c156d6b81facfdfa79118c04728ac910a8f8de36a11454227a1399235a582 SHA512 21b8d7bf3f14b5ab7e2ea587027395cdd881ecddd5a4f70237cafc70dc904b396a33f70dd7ef37519df5a204f4e3a89d9ea6ffc221df41bd9cbf23e69863f12f
--- a/app-crypt/gpgme/gpgme-1.21.0.ebuild
+++ b/app-crypt/gpgme/gpgme-1.21.0.ebuild
@ -30,7 +30,7 @@ LICENSE="GPL-2 LGPL-2.1"
 # Bump FUDGE if a release is made which breaks ABI without changing SONAME.
 # (Reset to 0 if FUDGE != 0 if libgpgme/libgpgmepp/libqpggme change.)
 SLOT="1/11.6.15.2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="common-lisp static-libs +cxx python qt5 test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="qt5? ( cxx ) python? ( ${PYTHON_REQUIRED_USE} )"
--- a/app-crypt/hashcat/Manifest
+++ b/app-crypt/hashcat/Manifest
@ -1,13 +1,4 @@
-AUX hashcat-6.2.4-brainless.patch 1040 BLAKE2B 0bcdb5fce7b22f95844c5fcef1c92ee0d78a10830a91991033d5476057e883408b595486dcc5d3fb3fad1c4d6b0c05f5e0a5c16f4404aee613a97203f88d8ab6 SHA512 a00d84c8611d43870c4d46be78454350e17471ad4d8d9ac98528b8527cde81bb23deed931c01d042511b98c8962554fbdc965e62555f640cb19f2196418f4f7a
-AUX hashcat-6.2.4-pocl-quoting-include.patch 1480 BLAKE2B 4999e878010c8083e0ba708adafc46ee744ca4127f8f2442ae1c659a1ca59525f0a66ffb55e845ffb0da897259d7206c53534fec4a58c6daa6bdc25e28493fe9 SHA512 ed64891dc00a546b07e32aa65a30ea30bbb0b6aeacf616e43f59b0c28dfafcdc54dce8e194fdf0805187dbf57c6c0a9655153823734d7e9537ab150b798b7205
-DIST hashcat-6.2.1.tar.gz 5815254 BLAKE2B b6ce0edf7a7fe725570e557b6b414c8aad02e24933b2610be2607c895778d635543a90806aa40c3521f83f93de3b7556f04274d4f9893dacb53af82974df0be2 SHA512 435d8c66e1de14a4a95364eb06f41d10d221c4cf3286bed5ce333d3d07fe7ec2097fa57a3f925ef108a0c17091a65dc18b9c782f69ab8c0575061c14c9354563
-DIST hashcat-6.2.4.tar.gz 6269444 BLAKE2B 15d774253841350710e89bb6358f5fd615ef6e0645f271507d5bfc3e814be1533f78b83b90c11b24c7088ac60f2bb9098cf3410c4bedb5d53b0ccff4d840664c SHA512 bb18646794e168616e6f018b41c1a17c26bb0d8625aaeec0bd0d734efbc331008f432efde7b3d08e8838c995c771a406670812edaf7d605e7fdff9ef001aa954
-DIST hashcat-6.2.5.tar.gz 6341872 BLAKE2B e55a0aac0cb28041f92fc6685fb004058744e150d84d9b690bdb16bb7f4612edd12b987debcfc5d39d0c4e87bdd799148cae6974d47904c1e3d2953ceb32f076 SHA512 2b881146c625172c91cb74b33851473155dcde2421fba1b4acfba28116499b9cff832a62c4dbc24e16df06a827494f30699a7d0e5195d5ed107704f525255383
 DIST hashcat-6.2.6.tar.gz 14234640 BLAKE2B fbbebc0a35b920442d4e1fb5822a8b9867db62bcc2404fba514fe1f06f0aa859a116cbe204eed71d340ad826dcfffffadca6963e5eec875ae2fee59068968b61 SHA512 b5e4f40fb5ed0a47977243e1f95bf1deae0b04bd5ca26338395305c42573fe5b17557835f6f5d8b7402812e8eadda2b260d6b927ce99429fd1b87eb26f002f8a
-EBUILD hashcat-6.2.1-r1.ebuild 2778 BLAKE2B b7cc13c326c8e16e014a47587cfe1fd13655f541b61c6775ab272980fd4d6e8bd57065a85019fce9f8336df325a78275b5302efe0d282cd72c3bdd6b7e93115e SHA512 bcc110789c5a260a9a6f2deb2bc4649a058cb940bf4f6ca71f4d7c24030ca87417ccfa9207727929916e8e871dc5fc526fb13d4a26af27e278e45acddef68b5f
-EBUILD hashcat-6.2.4-r1.ebuild 2888 BLAKE2B dc79427a21aaac44371bd86e9b63761b0acedc6144d588993996728b1d3c9ab9529aed319a4b28a44eaa9b0dc8b397b9bf7808c05300b621b71cbccc40985fd5 SHA512 e6f596682a789b735c80ced40cff61f9c000a6c0b92742db5ad5c450f745304fa3c5f3315c65163b2d2168e0dc3fe6f3afaf8f8efb2088061644bbd707b51192
-EBUILD hashcat-6.2.4.ebuild 2834 BLAKE2B 3655e6a31038a45aa0106b501f902f828f0e7c818d3a53634218f0e1281aa06149c69dcdc49fbd4c96ee122150bb68cc0a5b7767ef9e9a286d9693c45f0c0ca4 SHA512 d453f5c9da614c8bb625d844d628739a78f4074d0283a6347e9f1157130f63c96d02612eb1cf6a092924e77e9939b5ad02a110aeb46ad4a4462043b59cd03050
-EBUILD hashcat-6.2.5.ebuild 2732 BLAKE2B f31745535c47efe9ba40229e3ad0a828b1c0b242938898d50bda7fa29ebdaa4cfefaec132afa531105ba850f385b8717b26bf4f274a3f7efa253664141027dba SHA512 ee2a40820af6eaf18abdf1045f382d28f316a7f7a7fe68223d58a86fb565733ad7010b7cd6de3869038a781dc453da9bc6cec3ecf21a1b14c3278685e964f059
 EBUILD hashcat-6.2.6.ebuild 2732 BLAKE2B 2e48b80c34b0dc76621e0cf3dd9d1700dcf11c967e89707145f1faef70461d6ce73780fa40aacfc2fb87b22dca0b88e7b303df596168ee62349b5a246839e8aa SHA512 828f723c75c7752ff05b127ab35b89be060d9777b4928c7494ac90e4b60acf142809e3aefbbc468384fef34b8ce52d14a1961c3e42840e3bbae1a20dd724abc7
-EBUILD hashcat-9999.ebuild 2778 BLAKE2B b7cc13c326c8e16e014a47587cfe1fd13655f541b61c6775ab272980fd4d6e8bd57065a85019fce9f8336df325a78275b5302efe0d282cd72c3bdd6b7e93115e SHA512 bcc110789c5a260a9a6f2deb2bc4649a058cb940bf4f6ca71f4d7c24030ca87417ccfa9207727929916e8e871dc5fc526fb13d4a26af27e278e45acddef68b5f
+EBUILD hashcat-9999.ebuild 2732 BLAKE2B 911bcb18ca12ab0543df78c68c5260fb48afd048c6c75705ee1b0fdca33bb4ddb0ce69771d8b6a69516b6b7a4880641168b3450761cdbc9c3e15c5ef9dee3884 SHA512 3901ac0fa5d87bff2da42923a4a5d4250d077d92945cab1c2354bbd7040a9091740fc09d8ba76accaf9edf868d0fddce796a16d4bbae5483ae00178190f3690a
 MISC metadata.xml 396 BLAKE2B ed0f4406e46280943a8ae7cb68486b8410653efa96e284b11d139aa201d3e64adc21abbc78021f247f8ab05da5a81483633f764917c160f776e42bb269b5ceab SHA512 482f749520452bc1dfc1e22d0cd0c694c7f1158526fbaaf6179d67e1617d17710d85ba2eb29dc65216635fd99c2f7796029604b40a447eb358fde9aca1b39ed7
--- a/app-crypt/hashcat/files/hashcat-6.2.4-brainless.patch
+++ b/app-crypt/hashcat/files/hashcat-6.2.4-brainless.patch
@ -1,41 +0,0 @@
-https://github.com/hashcat/hashcat/pull/2961#event-5251978340
-From 0d5aed883b45cf3c218cb71916b08d56ae3d25a3 Mon Sep 17 00:00:00 2001
-From: Miezhiko <Miezhiko@gmail.com>
-Date: Thu, 2 Sep 2021 17:52:27 +0400
-Subject: [PATCH] Fix compilation without brain
-
-Signed-off-by: Miezhiko <Miezhiko@gmail.com>
---
- src/hashcat.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/src/hashcat.c b/src/hashcat.c
-index 163d7408d..bf936ccc0 100644
--- a/src/hashcat.c
-+++ b/src/hashcat.c
-@@ -922,7 +922,10 @@ static int outer_loop (hashcat_ctx_t *hashcat_ctx)
- 
-   // clean up
- 
-+  #ifdef WITH_BRAIN
-   brain_ctx_destroy       (hashcat_ctx);
-+  #endif
-+
-   bitmap_ctx_destroy      (hashcat_ctx);
-   combinator_ctx_destroy  (hashcat_ctx);
-   cpt_ctx_destroy         (hashcat_ctx);
-@@ -1090,13 +1093,13 @@ int hashcat_session_init (hashcat_ctx_t *hashcat_ctx, const char *install_folder
-     }
-   }
-   #endif
-  #endif
- 
-   /**
-    * brain
-    */
- 
-   if (brain_ctx_init (hashcat_ctx) == -1) return -1;
-+  #endif
- 
-   /**
-    * logfile
--- a/app-crypt/hashcat/files/hashcat-6.2.4-pocl-quoting-include.patch
+++ b/app-crypt/hashcat/files/hashcat-6.2.4-pocl-quoting-include.patch
@ -1,34 +0,0 @@
-Fixes POCL include error.
-
-https://github.com/hashcat/hashcat/commit/8c14fd85eaf98f4cda3acf8f917edae696a3bb71
-https://github.com/hashcat/hashcat/issues/2950
-
-From: Jens Steube <jens.steube@gmail.com>
-Date: Sun, 5 Sep 2021 10:55:59 +0200
-Subject: [PATCH] POCL: Added a workaround for an issue in POCL that uses a
- quote character as part of the path itself given to a path for the -I option
-
--- a/src/backend.c
-+++ b/src/backend.c
-@@ -11365,7 +11365,19 @@ int backend_session_begin (hashcat_ctx_t *hashcat_ctx)
-     }
-     else
-     {
-      build_options_len += snprintf (build_options_buf + build_options_len, build_options_sz - build_options_len, "-D KERNEL_STATIC -I OpenCL -I \"%s\" ", folder_config->cpath_real);
-+      if (device_param->opencl_platform_vendor_id == VENDOR_ID_POCL)
-+      {
-+        // POCL doesn't like quotes in the include path, see:
-+        //   https://github.com/hashcat/hashcat/issues/2950
-+        // Maybe related:
-+        //   https://github.com/pocl/pocl/issues/962
-+
-+        build_options_len += snprintf (build_options_buf + build_options_len, build_options_sz - build_options_len, "-D KERNEL_STATIC -I OpenCL -I %s ", folder_config->cpath_real);
-+      }
-+      else
-+      {
-+        build_options_len += snprintf (build_options_buf + build_options_len, build_options_sz - build_options_len, "-D KERNEL_STATIC -I OpenCL -I \"%s\" ", folder_config->cpath_real);
-+      }
-     }
-
-     /* currently disabled, hangs NEO drivers since 20.09.
-
--- a/app-crypt/hashcat/hashcat-6.2.1-r1.ebuild
+++ b/app-crypt/hashcat/hashcat-6.2.1-r1.ebuild
@ -1,108 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit pax-utils toolchain-funcs
-
-DESCRIPTION="World's fastest and most advanced password recovery utility"
-HOMEPAGE="https://github.com/hashcat/hashcat"
-LICENSE="MIT"
-SLOT="0"
-if [ "${PV}" = "9999" ]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/hashcat/hashcat.git"
-else
-	KEYWORDS="~amd64"
-	SRC_URI="https://github.com/hashcat/hashcat/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-IUSE="brain video_cards_nvidia"
-DEPEND="
-	app-arch/lzma
-	app-arch/unrar
-	sys-libs/zlib[minizip]
-	brain? ( dev-libs/xxhash )
-	video_cards_nvidia? ( >x11-drivers/nvidia-drivers-440.64
-						|| ( dev-util/nvidia-cuda-toolkit
-							virtual/opencl )
-						)
-	!video_cards_nvidia? ( virtual/opencl )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	# remove bundled stuff
-	rm -r deps/OpenCL-Headers || die "Failed to remove bundled OpenCL Headers"
-	rm -r deps/xxHash || die "Failed to remove bundled xxHash"
-	# TODO: Gentoo's app-arch/lzma doesn't install the needed files
-	#rm -r deps/LZMA-SDK || die "Failed to remove bundled LZMA-SDK"
-	#rm -r deps || die "Failed to remove bundled deps"
-
-	# do not strip
-	sed -i "/LFLAGS                  += -s/d" src/Makefile
-	# do not add random CFLAGS
-	sed -i "s/-O2//" src/Makefile || die
-	#sed -i "#LZMA_SDK_INCLUDE#d" src/Makefile || die
-	# respect CC, CXX, AR
-	sed -i \
-		-e 's/:= gcc/:= $(CC)/' \
-		-e 's/:= g++/:= $(CXX)/' \
-		-e 's/:= ar/:= $(AR)/' \
-		src/Makefile || die
-
-	export PREFIX="${EPREFIX}"/usr
-	export LIBRARY_FOLDER="/usr/$(get_libdir)"
-	export DOCUMENT_FOLDER="/usr/share/doc/${PF}"
-
-	default
-}
-
-src_compile() {
-	tc-export CC CXX AR
-
-	# Use bundled unrar for now, bug #792720
-	emake \
-		SHARED=1 \
-		PRODUCTION=1 \
-		ENABLE_BRAIN=$(usex brain 1 0) \
-		USE_SYSTEM_LZMA=0 \
-		USE_SYSTEM_OPENCL=1 \
-		USE_SYSTEM_UNRAR=0 \
-		USE_SYSTEM_ZLIB=1 \
-		USE_SYSTEM_XXHASH=1 \
-		VERSION_PURE="${PV}"
-
-	pax-mark -mr hashcat
-}
-
-src_test() {
-	if use video_cards_nvidia; then
-		addwrite /dev/nvidia0
-		addwrite /dev/nvidiactl
-		addwrite /dev/nvidia-uvm
-		if [ ! -w /dev/nvidia0 ]; then
-			einfo "To run these tests, portage likely must be in the video group."
-			einfo "Please run \"gpasswd -a portage video\" if the tests will fail"
-		fi
-	#elif use vidia_cards_fglrx; then
-	#	addwrite /dev/ati
-	fi
-	#this always exits with 255 despite success
-	#./hashcat -b -m 2500 || die "Test failed"
-	LD_PRELOAD=./libhashcat.so.${PV} ./hashcat -a 3 -m 1500 nQCk49SiErOgk || die "Test failed"
-}
-
-src_install() {
-	emake \
-		DESTDIR="${ED}" \
-		SHARED=1 \
-		PRODUCTION=1 \
-		ENABLE_BRAIN=$(usex brain 1 0) \
-		USE_SYSTEM_LZMA=0 \
-		USE_SYSTEM_OPENCL=1 \
-		USE_SYSTEM_UNRAR=1 \
-		USE_SYSTEM_ZLIB=1 \
-		USE_SYSTEM_XXHASH=1 \
-		VERSION_PURE="${PV}" \
-		install
-}
--- a/app-crypt/hashcat/hashcat-6.2.4-r1.ebuild
+++ b/app-crypt/hashcat/hashcat-6.2.4-r1.ebuild
@ -1,113 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit pax-utils toolchain-funcs
-
-DESCRIPTION="World's fastest and most advanced password recovery utility"
-HOMEPAGE="https://github.com/hashcat/hashcat"
-LICENSE="MIT"
-SLOT="0"
-if [ "${PV}" = "9999" ]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/hashcat/hashcat.git"
-else
-	KEYWORDS="~amd64"
-	SRC_URI="https://github.com/hashcat/hashcat/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-IUSE="brain video_cards_nvidia"
-DEPEND="
-	app-arch/lzma
-	app-arch/unrar
-	sys-libs/zlib[minizip]
-	brain? ( dev-libs/xxhash )
-	video_cards_nvidia? ( >x11-drivers/nvidia-drivers-440.64
-						|| ( dev-util/nvidia-cuda-toolkit
-							virtual/opencl )
-						)
-	!video_cards_nvidia? ( virtual/opencl )"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.2.4-brainless.patch
-	"${FILESDIR}"/${PN}-6.2.4-pocl-quoting-include.patch
-)
-
-src_prepare() {
-	# remove bundled stuff
-	rm -r deps/OpenCL-Headers || die "Failed to remove bundled OpenCL Headers"
-	rm -r deps/xxHash || die "Failed to remove bundled xxHash"
-	# TODO: Gentoo's app-arch/lzma doesn't install the needed files
-	#rm -r deps/LZMA-SDK || die "Failed to remove bundled LZMA-SDK"
-	#rm -r deps || die "Failed to remove bundled deps"
-
-	# do not strip
-	sed -i "/LFLAGS                  += -s/d" src/Makefile
-	# do not add random CFLAGS
-	sed -i "s/-O2//" src/Makefile || die
-	#sed -i "#LZMA_SDK_INCLUDE#d" src/Makefile || die
-	# respect CC, CXX, AR
-	sed -i \
-		-e 's/:= gcc/:= $(CC)/' \
-		-e 's/:= g++/:= $(CXX)/' \
-		-e 's/:= ar/:= $(AR)/' \
-		src/Makefile || die
-
-	export PREFIX="${EPREFIX}"/usr
-	export LIBRARY_FOLDER="/usr/$(get_libdir)"
-	export DOCUMENT_FOLDER="/usr/share/doc/${PF}"
-
-	default
-}
-
-src_compile() {
-	tc-export CC CXX AR
-
-	# Use bundled unrar for now, bug #792720
-	emake \
-		SHARED=1 \
-		PRODUCTION=1 \
-		ENABLE_BRAIN=$(usex brain 1 0) \
-		USE_SYSTEM_LZMA=0 \
-		USE_SYSTEM_OPENCL=1 \
-		USE_SYSTEM_UNRAR=0 \
-		USE_SYSTEM_ZLIB=1 \
-		USE_SYSTEM_XXHASH=1 \
-		VERSION_PURE="${PV}"
-
-	pax-mark -mr hashcat
-}
-
-src_test() {
-	if use video_cards_nvidia; then
-		addwrite /dev/nvidia0
-		addwrite /dev/nvidiactl
-		addwrite /dev/nvidia-uvm
-		if [ ! -w /dev/nvidia0 ]; then
-			einfo "To run these tests, portage likely must be in the video group."
-			einfo "Please run \"gpasswd -a portage video\" if the tests will fail"
-		fi
-	#elif use vidia_cards_fglrx; then
-	#	addwrite /dev/ati
-	fi
-	#this always exits with 255 despite success
-	#./hashcat -b -m 2500 || die "Test failed"
-	LD_PRELOAD=./libhashcat.so.${PV} ./hashcat -a 3 -m 1500 nQCk49SiErOgk || die "Test failed"
-}
-
-src_install() {
-	emake \
-		DESTDIR="${ED}" \
-		SHARED=1 \
-		PRODUCTION=1 \
-		ENABLE_BRAIN=$(usex brain 1 0) \
-		USE_SYSTEM_LZMA=0 \
-		USE_SYSTEM_OPENCL=1 \
-		USE_SYSTEM_UNRAR=1 \
-		USE_SYSTEM_ZLIB=1 \
-		USE_SYSTEM_XXHASH=1 \
-		VERSION_PURE="${PV}" \
-		install
-}
--- a/app-crypt/hashcat/hashcat-6.2.4.ebuild
+++ b/app-crypt/hashcat/hashcat-6.2.4.ebuild
@ -1,112 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit pax-utils toolchain-funcs
-
-DESCRIPTION="World's fastest and most advanced password recovery utility"
-HOMEPAGE="https://github.com/hashcat/hashcat"
-LICENSE="MIT"
-SLOT="0"
-if [ "${PV}" = "9999" ]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/hashcat/hashcat.git"
-else
-	KEYWORDS="~amd64"
-	SRC_URI="https://github.com/hashcat/hashcat/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-IUSE="brain video_cards_nvidia"
-DEPEND="
-	app-arch/lzma
-	app-arch/unrar
-	sys-libs/zlib[minizip]
-	brain? ( dev-libs/xxhash )
-	video_cards_nvidia? ( >x11-drivers/nvidia-drivers-440.64
-						|| ( dev-util/nvidia-cuda-toolkit
-							virtual/opencl )
-						)
-	!video_cards_nvidia? ( virtual/opencl )"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.2.4-brainless.patch
-)
-
-src_prepare() {
-	# remove bundled stuff
-	rm -r deps/OpenCL-Headers || die "Failed to remove bundled OpenCL Headers"
-	rm -r deps/xxHash || die "Failed to remove bundled xxHash"
-	# TODO: Gentoo's app-arch/lzma doesn't install the needed files
-	#rm -r deps/LZMA-SDK || die "Failed to remove bundled LZMA-SDK"
-	#rm -r deps || die "Failed to remove bundled deps"
-
-	# do not strip
-	sed -i "/LFLAGS                  += -s/d" src/Makefile
-	# do not add random CFLAGS
-	sed -i "s/-O2//" src/Makefile || die
-	#sed -i "#LZMA_SDK_INCLUDE#d" src/Makefile || die
-	# respect CC, CXX, AR
-	sed -i \
-		-e 's/:= gcc/:= $(CC)/' \
-		-e 's/:= g++/:= $(CXX)/' \
-		-e 's/:= ar/:= $(AR)/' \
-		src/Makefile || die
-
-	export PREFIX="${EPREFIX}"/usr
-	export LIBRARY_FOLDER="/usr/$(get_libdir)"
-	export DOCUMENT_FOLDER="/usr/share/doc/${PF}"
-
-	default
-}
-
-src_compile() {
-	tc-export CC CXX AR
-
-	# Use bundled unrar for now, bug #792720
-	emake \
-		SHARED=1 \
-		PRODUCTION=1 \
-		ENABLE_BRAIN=$(usex brain 1 0) \
-		USE_SYSTEM_LZMA=0 \
-		USE_SYSTEM_OPENCL=1 \
-		USE_SYSTEM_UNRAR=0 \
-		USE_SYSTEM_ZLIB=1 \
-		USE_SYSTEM_XXHASH=1 \
-		VERSION_PURE="${PV}"
-
-	pax-mark -mr hashcat
-}
-
-src_test() {
-	if use video_cards_nvidia; then
-		addwrite /dev/nvidia0
-		addwrite /dev/nvidiactl
-		addwrite /dev/nvidia-uvm
-		if [ ! -w /dev/nvidia0 ]; then
-			einfo "To run these tests, portage likely must be in the video group."
-			einfo "Please run \"gpasswd -a portage video\" if the tests will fail"
-		fi
-	#elif use vidia_cards_fglrx; then
-	#	addwrite /dev/ati
-	fi
-	#this always exits with 255 despite success
-	#./hashcat -b -m 2500 || die "Test failed"
-	LD_PRELOAD=./libhashcat.so.${PV} ./hashcat -a 3 -m 1500 nQCk49SiErOgk || die "Test failed"
-}
-
-src_install() {
-	emake \
-		DESTDIR="${ED}" \
-		SHARED=1 \
-		PRODUCTION=1 \
-		ENABLE_BRAIN=$(usex brain 1 0) \
-		USE_SYSTEM_LZMA=0 \
-		USE_SYSTEM_OPENCL=1 \
-		USE_SYSTEM_UNRAR=1 \
-		USE_SYSTEM_ZLIB=1 \
-		USE_SYSTEM_XXHASH=1 \
-		VERSION_PURE="${PV}" \
-		install
-}
--- a/app-crypt/hashcat/hashcat-6.2.5.ebuild
+++ b/app-crypt/hashcat/hashcat-6.2.5.ebuild
@ -1,115 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit pax-utils toolchain-funcs
-
-DESCRIPTION="World's fastest and most advanced password recovery utility"
-HOMEPAGE="https://github.com/hashcat/hashcat"
-if [[ ${PV} == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/hashcat/hashcat.git"
-else
-	KEYWORDS="~amd64"
-	SRC_URI="https://github.com/hashcat/hashcat/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="brain video_cards_nvidia"
-
-DEPEND="app-arch/lzma
-	app-arch/unrar
-	sys-libs/zlib[minizip]
-	brain? ( dev-libs/xxhash )
-	video_cards_nvidia? (
-		>x11-drivers/nvidia-drivers-440.64
-		|| (
-			dev-util/nvidia-cuda-toolkit
-			virtual/opencl
-		)
-	)
-	!video_cards_nvidia? ( virtual/opencl )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	# Remove bundled stuff
-	rm -r deps/OpenCL-Headers || die "Failed to remove bundled OpenCL Headers"
-	rm -r deps/xxHash || die "Failed to remove bundled xxHash"
-
-	# TODO: Gentoo's app-arch/lzma doesn't install the needed files
-	#rm -r deps/LZMA-SDK || die "Failed to remove bundled LZMA-SDK"
-	#rm -r deps || die "Failed to remove bundled deps"
-
-	# Do not strip
-	sed -i "/LFLAGS                  += -s/d" src/Makefile || die
-
-	# Do not add random CFLAGS
-	sed -i "s/-O2//" src/Makefile || die
-
-	#sed -i "#LZMA_SDK_INCLUDE#d" src/Makefile || die
-
-	# Respect CC, CXX, AR
-	sed -i \
-		-e 's/:= gcc/:= $(CC)/' \
-		-e 's/:= g++/:= $(CXX)/' \
-		-e 's/:= ar/:= $(AR)/' \
-		src/Makefile || die
-
-	export PREFIX="${EPREFIX}"/usr
-	export LIBRARY_FOLDER="/usr/$(get_libdir)"
-	export DOCUMENT_FOLDER="/usr/share/doc/${PF}"
-
-	default
-}
-
-src_compile() {
-	tc-export CC CXX AR
-
-	# Use bundled unrar for now, bug #792720
-	emake \
-		SHARED=1 \
-		PRODUCTION=1 \
-		ENABLE_BRAIN=$(usex brain 1 0) \
-		USE_SYSTEM_LZMA=0 \
-		USE_SYSTEM_OPENCL=1 \
-		USE_SYSTEM_UNRAR=0 \
-		USE_SYSTEM_ZLIB=1 \
-		USE_SYSTEM_XXHASH=1 \
-		VERSION_PURE="${PV}"
-
-	pax-mark -mr hashcat
-}
-
-src_test() {
-	if use video_cards_nvidia; then
-		addwrite /dev/nvidia0
-		addwrite /dev/nvidiactl
-		addwrite /dev/nvidia-uvm
-
-		if [[ ! -w /dev/nvidia0 ]]; then
-			einfo "To run these tests, portage likely must be in the video group."
-			einfo "Please run \"gpasswd -a portage video\" if the tests will fail"
-		fi
-	fi
-
-	# This always exits with 255 despite success
-	#./hashcat -b -m 2500 || die "Test failed"
-	LD_PRELOAD=./libhashcat.so.${PV} ./hashcat -a 3 -m 1500 nQCk49SiErOgk || die "Test failed"
-}
-
-src_install() {
-	emake \
-		DESTDIR="${ED}" \
-		SHARED=1 \
-		PRODUCTION=1 \
-		ENABLE_BRAIN=$(usex brain 1 0) \
-		USE_SYSTEM_LZMA=0 \
-		USE_SYSTEM_OPENCL=1 \
-		USE_SYSTEM_UNRAR=1 \
-		USE_SYSTEM_ZLIB=1 \
-		USE_SYSTEM_XXHASH=1 \
-		VERSION_PURE="${PV}" \
-		install
-}
--- a/app-crypt/hashcat/hashcat-9999.ebuild
+++ b/app-crypt/hashcat/hashcat-9999.ebuild
@ -1,15 +1,13 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=7
+EAPI=8

 inherit pax-utils toolchain-funcs

 DESCRIPTION="World's fastest and most advanced password recovery utility"
 HOMEPAGE="https://github.com/hashcat/hashcat"
-LICENSE="MIT"
-SLOT="0"
-if [ "${PV}" = "9999" ]; then
+if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/hashcat/hashcat.git"
 else
@ -17,33 +15,42 @@ else
 	SRC_URI="https://github.com/hashcat/hashcat/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 fi

+LICENSE="MIT"
+SLOT="0"
 IUSE="brain video_cards_nvidia"
-DEPEND="
-	app-arch/lzma
+
+DEPEND="app-arch/lzma
 	app-arch/unrar
 	sys-libs/zlib[minizip]
 	brain? ( dev-libs/xxhash )
-	video_cards_nvidia? ( >x11-drivers/nvidia-drivers-440.64
-						|| ( dev-util/nvidia-cuda-toolkit
-							virtual/opencl )
-						)
+	video_cards_nvidia? (
+		>x11-drivers/nvidia-drivers-440.64
+		|| (
+			dev-util/nvidia-cuda-toolkit
+			virtual/opencl
+		)
+	)
 	!video_cards_nvidia? ( virtual/opencl )"
 RDEPEND="${DEPEND}"

 src_prepare() {
-	# remove bundled stuff
+	# Remove bundled stuff
 	rm -r deps/OpenCL-Headers || die "Failed to remove bundled OpenCL Headers"
 	rm -r deps/xxHash || die "Failed to remove bundled xxHash"
+
 	# TODO: Gentoo's app-arch/lzma doesn't install the needed files
 	#rm -r deps/LZMA-SDK || die "Failed to remove bundled LZMA-SDK"
 	#rm -r deps || die "Failed to remove bundled deps"

-	# do not strip
-	sed -i "/LFLAGS                  += -s/d" src/Makefile
-	# do not add random CFLAGS
+	# Do not strip
+	sed -i "/LFLAGS                  += -s/d" src/Makefile || die
+
+	# Do not add random CFLAGS
 	sed -i "s/-O2//" src/Makefile || die
+
 	#sed -i "#LZMA_SDK_INCLUDE#d" src/Makefile || die
-	# respect CC, CXX, AR
+
+	# Respect CC, CXX, AR
 	sed -i \
 		-e 's/:= gcc/:= $(CC)/' \
 		-e 's/:= g++/:= $(CXX)/' \
@ -80,14 +87,14 @@ src_test() {
 		addwrite /dev/nvidia0
 		addwrite /dev/nvidiactl
 		addwrite /dev/nvidia-uvm
-		if [ ! -w /dev/nvidia0 ]; then
+
+		if [[ ! -w /dev/nvidia0 ]]; then
 			einfo "To run these tests, portage likely must be in the video group."
 			einfo "Please run \"gpasswd -a portage video\" if the tests will fail"
 		fi
-	#elif use vidia_cards_fglrx; then
-	#	addwrite /dev/ati
 	fi
-	#this always exits with 255 despite success
+
+	# This always exits with 255 despite success
 	#./hashcat -b -m 2500 || die "Test failed"
 	LD_PRELOAD=./libhashcat.so.${PV} ./hashcat -a 3 -m 1500 nQCk49SiErOgk || die "Test failed"
 }
--- a/app-crypt/johntheripper/Manifest
+++ b/app-crypt/johntheripper/Manifest
@ -1,3 +1,3 @@
 DIST john-1.8.0.tar.xz 4468704 BLAKE2B 90d6acc03dc8d22ef869320723e4799e64e15b621cde327ad420595889a43242b182079fd306bb7741b766ddc5e1239e3bdd4f4e396a4ab1e86d635cbebf8f60 SHA512 e2820ecabd7ea4c7404c3d40f064994d0f5746b093c859a58fbf2588492ebcef411d9f3088c8e8ee726284ead969e26fdae834cdae3eb2d32408fc79ed906543
-EBUILD johntheripper-1.8.0-r1.ebuild 2870 BLAKE2B 182a3d5d10b39dd04e4d2cbd365ef8239874fb595c5df9190fcf34909c96d94877c40ab03a413cee6ad4f81fc32bb2f6d0d8dac7d48757b57b9b1f376e6619d1 SHA512 73a5788f1951065480a71b49c8335c2d0adf9cc6918d42a5348bb8120bdab2d10d6a9759e984900a24b147bd87ada80e000b0ee90683770479b6e28589dacfb3
+EBUILD johntheripper-1.8.0-r2.ebuild 2869 BLAKE2B 970038b161660bc47a1a92279c911010fb77fa5008c4bcc8cc4f90ce7cb374629282943cf1742a542d14b5e62442bff431ad956826bb7e1b5498886aa42f03d9 SHA512 199605c25f5d02064f5df1a323099c065f916c66fcd9910c60c6c1c74c2419abe59f652496158e320e09b099b31c270f413de590ce480e9bef5ce8fa900c0181
 MISC metadata.xml 409 BLAKE2B f8d40635490b818425ab465d2d34e41c05881a51860e7714161c50af9b061bea3801aefcbad8edb403f3af753b919621b709d23b0a86a0b303b903653f273fd5 SHA512 ed0271486767ec9b53851b534179307b2f160aea50f3a071b9d68aaa21265f5e0e5d031be3b00580e8f706b944ab7ec7aaa7c325485acf73655d899a8787ba13
--- a/app-crypt/johntheripper/johntheripper-1.8.0-r2.ebuild
+++ b/app-crypt/johntheripper/johntheripper-1.8.0-r2.ebuild
@ -1,7 +1,7 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=7
+EAPI=8

 inherit cuda flag-o-matic toolchain-funcs

@ -19,9 +19,9 @@ KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-lin
 CPU_FLAGS="cpu_flags_x86_mmx cpu_flags_x86_sse2 cpu_flags_x86_avx cpu_flags_x86_xop"
 IUSE="custom-cflags openmp ${CPU_FLAGS}"

-RDEPEND="sys-libs/zlib
+DEPEND="sys-libs/zlib
 	virtual/libcrypt:="
-DEPEND="${RDEPEND}
+RDEPEND="${DEPEND}
 	!app-crypt/johntheripper-jumbo"

 S="${WORKDIR}/${MY_P}"
--- a/app-crypt/libsecret/Manifest
+++ b/app-crypt/libsecret/Manifest
@ -1,3 +1,5 @@
 DIST libsecret-0.20.5.tar.xz 187340 BLAKE2B cde5094eaaf54f251c19afb015c39cc88435dafe6ee682ca8f9d1917dd5b3dc8cc1609cdbf2a3a42d2592c2a149bec5fe28b2f4ec179b92c0d0f07d2f14c1792 SHA512 61ca248aafd265e1f31d56c9084c68d880ebf03660ace3d4a6c6622ab306b56e921ac24647b6a60633bfa99c8a0407d4ae1aa6148511f289bf5ce2025b72692a
+DIST libsecret-0.21.0.tar.xz 190320 BLAKE2B 0775f1b80eea303793aa9c1e940e0cb47ada4cee10ebae947a7e17d5a749736a3219a7edf937693b32df5505c2dd96bffc523b4cfcb41c6a7f12cea0b43449b3 SHA512 666a67f3f06274ab57e1b6e3e855033ce244ab45b9b237851fc06f33ef7922179b5bcbe96a5dc50d1136cbb8d74c2d0af0af4d0ae9de918b4a63b36abb1f2b97
 EBUILD libsecret-0.20.5-r3.ebuild 3715 BLAKE2B 1cbe434ad110a2c29946911bee0198eff501ef726ef910c6e60a12d08a05c9c2097d6ad1f843fe6d4cc03ebd5f477fe893133fb88eb98d9674573b53356c5a26 SHA512 730a7f7aa89427a06d238565b721d67bbcc1ba3b5cc1386b401cb96ed30b6a0ff0f305dd07c30a018fa80e4ab2340820daf3570f38a9f49bc7fcaa930d0ad258
+EBUILD libsecret-0.21.0.ebuild 3741 BLAKE2B 48f6c42f1ab03d2ad4ac961f217d37f0aa21b202fe9a7062323bbfdd76f0f5bc45df6ee9e4af9f4b915f31741b21e74eb20783d650e42f4e1767686f0c939b5e SHA512 900fed4f31c8f1652e8c88262f87cf499111921a0fd657dd4bdc8733e78473ae063fb304f0bc7262d38bf36d8d498f15551d4ec5726ea9552a303ef35ec72a8b
 MISC metadata.xml 468 BLAKE2B 21e70edb5acfc8b52a7d10f0c9e9452b04d8124b3d52bb7f816019cc2cf6f50275c7cb19c8853aec0c5fb2a6c93d56dfed3f4e5b8c41e9b2c08c2eff5efc5206 SHA512 7cc80dd7bbef252a09524ad511e12e621fdceca3482411f605e4c8aabb66e473c10e6a2b446df866644a4749b58dd3bb6f83cf118ff9949e17ca4a427a3ce3de
--- a/app-crypt/libsecret/libsecret-0.21.0.ebuild
+++ b/app-crypt/libsecret/libsecret-0.21.0.ebuild
@ -0,0 +1,154 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit bash-completion-r1 gnome2 meson-multilib python-any-r1 vala virtualx
+
+DESCRIPTION="GObject library for accessing the freedesktop.org Secret Service API"
+HOMEPAGE="https://wiki.gnome.org/Projects/Libsecret"
+
+LICENSE="LGPL-2.1+ Apache-2.0" # Apache-2.0 license is used for tests only
+SLOT="0"
+
+IUSE="+crypt gtk-doc +introspection test test-rust tpm +vala"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="
+	vala? ( introspection )
+	gtk-doc? ( crypt )
+"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+DEPEND="
+	>=dev-libs/glib-2.44:2[${MULTILIB_USEDEP}]
+	crypt? ( >=dev-libs/libgcrypt-1.2.2:0=[${MULTILIB_USEDEP}] )
+	tpm? ( >=app-crypt/tpm2-tss-3.0.3:= )
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+RDEPEND="${DEPEND}"
+PDEPEND="virtual/secret-service"
+BDEPEND="
+	app-text/docbook-xml-dtd:4.2
+	dev-libs/libxslt
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	gtk-doc? (
+		app-text/docbook-xml-dtd:4.1.2
+		>=dev-util/gi-docgen-2021.7
+	)
+	test? (
+		$(python_gen_any_dep '
+			dev-python/mock[${PYTHON_USEDEP}]
+			dev-python/dbus-python[${PYTHON_USEDEP}]
+			introspection? ( dev-python/pygobject:3[${PYTHON_USEDEP}] )')
+		test-rust? ( introspection? ( >=dev-libs/gjs-1.32 ) )
+		tpm? (
+			app-crypt/swtpm
+			app-crypt/tpm2-abrmd
+			>=app-crypt/tpm2-tss-3.2.0:=
+		)
+	)
+	vala? ( $(vala_depend) )
+"
+
+dbus_run() {
+	(
+		# start isolated dbus session bus
+		dbus_data=$(dbus-launch --sh-syntax) || exit
+		eval "${dbus_data}"
+
+		$@
+		ret=${?}
+
+		kill "${DBUS_SESSION_BUS_PID}"
+		exit "${ret}"
+	) || die
+}
+
+tpm2_run_with_emulator() {
+	export XDG_CONFIG_HOME=${T}/.config/swtpm
+	"${BROOT}"/usr/share/swtpm/swtpm-create-user-config-files --overwrite || die
+
+	mkdir -p ${XDG_CONFIG_HOME}/mytpm1 || die
+	swtpm_setup_args=(
+		--tpm2
+		--tpmstate ${XDG_CONFIG_HOME}/mytpm1
+		--createek
+		--allow-signing
+		--decryption
+		--create-ek-cert
+		--create-platform-cert
+		--lock-nvram
+		--overwrite
+		--display
+	)
+	swtpm_setup "${swtpm_setup_args[@]}" || die
+
+	swtpm_socket_args=(
+		--tpm2
+		--tpmstate dir=${XDG_CONFIG_HOME}/mytpm1
+		--flags startup-clear
+		--ctrl type=unixio,path=${XDG_CONFIG_HOME}/mytpm1/swtpm.socket.ctrl
+		--server type=unixio,path=${XDG_CONFIG_HOME}/mytpm1/swtpm.socket
+		--pid file=${XDG_CONFIG_HOME}/mytpm1/swtpm.pid
+		--daemon
+	)
+	swtpm socket "${swtpm_socket_args[@]}" || die
+
+	tpm2_abrmd_args=(
+		--logger=stdout
+		--tcti=swtpm:path=${XDG_CONFIG_HOME}/mytpm1/swtpm.socket
+		--session
+		--flush-all
+	)
+	tpm2-abrmd "${tpm2_abrmd_args[@]}" &
+	export TCTI=tabrmd:bus_type=session
+
+	$@ || die
+
+	# When swtpm dies, tmp2-abrmd will exit
+	kill $(< ${XDG_CONFIG_HOME}/mytpm1/swtpm.pid) || die
+}
+
+python_check_deps() {
+	if use introspection; then
+		python_has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
+	fi
+	python_has_version "dev-python/mock[${PYTHON_USEDEP}]" &&
+	python_has_version "dev-python/dbus-python[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	use vala && vala_setup
+	default
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		$(meson_native_true manpage)
+		$(meson_use crypt gcrypt)
+		$(meson_native_use_bool vala vapi)
+		$(meson_native_use_bool gtk-doc gtk_doc)
+		$(meson_native_use_bool introspection)
+		-Dbashcompdir="$(get_bashcompdir)"
+		$(meson_native_enabled bash_completion)
+		$(meson_native_use_bool tpm tpm2)
+	)
+	meson_src_configure
+}
+
+multilib_src_test() {
+	if use tpm; then
+		dbus_run tpm2_run_with_emulator virtx meson test -C "${BUILD_DIR}"
+	else
+		virtx dbus-run-session meson test -C "${BUILD_DIR}"
+	fi
+}
--- a/app-crypt/sequoia-chameleon-gnupg/Manifest
+++ b/app-crypt/sequoia-chameleon-gnupg/Manifest
@ -360,5 +360,5 @@ DIST zbase32-0.1.2.crate 8721 BLAKE2B d7f5881c8d3f06f5fd78669ae6943ffa5ebe35b5e3
 DIST zeroize-1.3.0.crate 15913 BLAKE2B 571d96420e85e3d12100dcaff00d4721eae7296465cafce83db81293e801cd5a1f78b19986dc537fab208519a48e6a7df344d8e8a7053b094c1aa5bb90de083b SHA512 352a668a4c491cbd644368eb19f797709a41f3abf9a09028b6c1c4077710d48b74c3018e65112762a31403917f000340a0e57bc095a745e3f99300d6c25ca8bb
 DIST zeroize_derive-1.3.3.crate 10380 BLAKE2B 5ed1fd50f483e1eeec54584adb3d6e20f12987037edf859bd0ca1e9274c41be332edfd4a294d25a96ec811ab06299185148702f4317dbcf1c5e0a23e7e8116b0 SHA512 cfe53287c80866868ca435414efba32267f68b6b95dca9c11201365c9fc21444b1ca926fe8a2dd64c0978a8691e351108538bc7e1fc6f60feb83dde93f56b3c3
 EBUILD sequoia-chameleon-gnupg-0.3.1.ebuild 8278 BLAKE2B 048b80077686f06508a58324ebc4b9784ea9b8c6c82f9bbdab32de82ab4b6b7b125db636e87f09c292e82ff1fdc8dc34ae0ee0bc17c2b40881e9668f21fe92d2 SHA512 2a0fafe70adb723cae883e746df2fe96af45ce2342e5502e703e72fa5f79dfdc14467fe63b06509d03a5555d06e1809e66f152bf0bd0ff9caadacfb7bfbc163f
-EBUILD sequoia-chameleon-gnupg-0.3.2.ebuild 8278 BLAKE2B 8e175e0e49beb548c0f1ba1f52ee78fceb61c28a4778278b77bbde2cdca3c6e4d23a3ef98554fc3d18747555fb5aa9f0ea65a047d083b80b0910f4ce1f3f7938 SHA512 57296265ce4b72a3fcc7c5be557ea867abaf32c3533d29931edac7d87ad6af592d0b54e06e2490cae25d3e2dba01d407f4d6fd11d943b70f616a4501ef7594ed
+EBUILD sequoia-chameleon-gnupg-0.3.2-r1.ebuild 8315 BLAKE2B 48cfd4a276a2c39f8ceb961692d8aa3b301f98d6b26f93d52aea6f67a5066faa59c7cf1ec2e24da7fa6e725a6273bd67b38fb37a2c08b23ca9596ae1731c9fa1 SHA512 ac57c3423c8f738ab6aa52749070dd5aca2a5f34775d2df3048862cfbf6c510e32e70bf4e9ba0e2a6d794f1dfe8c142cc2756d198e9ea8072a7a3a72a3bf128a
 MISC metadata.xml 447 BLAKE2B a876bb1a6e3290305705c7b732d4225f658687095bcba12285f3c3e258177ffe9dd3ba0cd4e3b309dcb6e076906a8d568f9af1d932870ee1a4d471b9989a07cf SHA512 7d2d5e66179740cc71a73bc918c20ce0e022053841f60a1b8bbe71b9ef7df64457c39d2113e98043eaadc435953475823c0d8945e59f2ba3700b505680953afe
--- a/app-crypt/sequoia-chameleon-gnupg/sequoia-chameleon-gnupg-0.3.2-r1.ebuild
+++ b/app-crypt/sequoia-chameleon-gnupg/sequoia-chameleon-gnupg-0.3.2-r1.ebuild
@ -394,8 +394,10 @@ KEYWORDS="~amd64 ~arm64"
 RESTRICT="test"

 DEPEND="
+	dev-db/sqlite:3
 	dev-libs/gmp:=
 	dev-libs/nettle:=
+	dev-libs/openssl:=
 "
 RDEPEND="${DEPEND}"
 # Needed for bindgen
--- a/app-crypt/swtpm/Manifest
+++ b/app-crypt/swtpm/Manifest
@ -3,7 +3,9 @@ AUX swtpm-0.6.0-fix-localca-path.patch 1321 BLAKE2B 06d9e7409dda7554bd819a822e2e
 AUX swtpm-0.7.2-Conditionalize-test-dependencies.patch 1065 BLAKE2B 359cf6e692691317255d8c456abee7fe59a5370bf94f0bdd37ee6bb16ceb80340939f3f0a348398c6c93177690f4e2dc141d2b6c9f12319586c5a850dec2cd5c SHA512 8a2731b9d9c49fa2a8ea2732b20dbbd7264b1c93b00848e67f83e5d54f8ed150e97ff940422ccf46de21ae8d81fbf951314b3908ef0377d8548adebc4872474f
 DIST swtpm-0.7.3.tar.gz 354088 BLAKE2B 687e3161cbc08be68427648187ba2fb05749bcaaf9929b951eea4884bd4210c6105a2494f5e7d51915e5be1b700b13889cd83c96d22e00d621ea9336221ee67b SHA512 7f4cdf7ca2539f28e3a78e2a081b24983f3305905c7cafcac0957b14f5c06c8ee9485a0adaf3710561091f9ee85e00822fe1ff874389808218c1e17f938c45d9
 DIST swtpm-0.8.0.tar.gz 363951 BLAKE2B 8ec91961c5ac145dc5d1c3c4a609d18bc425caef0efb4d2b18c08c76acacefa619617b6e7b6e8e4e707117a29e3ff3c0198b63d81d24fc747435c6e06e48e8e9 SHA512 7f70c19f732404061be6168c96c0dd3ec91ed8b50dddcafcb50d810062ce0e83ad85360191f97db5db9dc034e01d91cebe3912449d896d2cde68fe060a0adb09
+DIST swtpm-0.8.1.tar.gz 364169 BLAKE2B 4b364ed581ea97d78c5c6248870503b1612d7d164b05b76c1f02644aade6fd09f204396f0a2d0db4e0ecec2792dc512f7c4393c44bf7ce447a3a7fbb8754594f SHA512 07276519b0e20c9c4167ce78e789d2072eb90172ed9bcba2a11eef46ee03a77860f7a2218f4dc013a2ddb8471079e3cbe43f8ab02174bd704a78aea8eee3d2fc
 EBUILD swtpm-0.7.3.ebuild 1416 BLAKE2B 4344cd948a48f8d6b576f058b3566dc836d7616af160ea19327df80e16f8b11b732b5425bdd1d94beeb144ec8ce7359bbb934ca915d3debf6e99315e12b102a6 SHA512 1ee0112873d63b7b33bd23496e0f92bf957da0cc5952fbe1302c79af1517312a50534a3c3dce70b407ce182efcb20775c3057898414ec45ce96fc1cdb7e04f1f
 EBUILD swtpm-0.8.0-r2.ebuild 1340 BLAKE2B 7d8fb65105ff3fee6014a30955a947a7de340215057172e895c9e52c016cf4851c7b4c9ed44c027cf0883768e932be15ea0f7c54936d1679711f495fee45f3d4 SHA512 15d98c5a6fcb9f00718071b6035a585a8347d321d8dab1646b36714b31f1b3126978c11e15d78f23c2d5191840df21ef6486df4d4b725207c8e9a19ede3a3013
 EBUILD swtpm-0.8.0.ebuild 1423 BLAKE2B a136fec1ca90e331569b9d8e0c8735fca8efba749dc27939d7d821cb9a00df8fb4bb34a352a94b087288758ad07f04d40ad7944c698841a429ac3994c547b370 SHA512 72bf70275da3c31c087db9498572685b0d052b82510311341aeff16ccc2df1f286e379aa4fca7beb624b0f99da27871993a9191ae931069b34ad2cb9234bc80d
+EBUILD swtpm-0.8.1.ebuild 1338 BLAKE2B ec3c20cbd28da305745fe34e2aafc2836fcee6cc9bb70d2ba5c1db3b431d48ad869033ef52fe7cb1298041c4c8955bc73f712b072f762563688f9f5b5a76791c SHA512 b9926b777609183d462d07a5bd443f08c9ab18e1dcc0924df5bd6b1877dd2231547e76dae74393e0681106e4fb59e5174fe3f73acb1ec2bc544f0736230266ef
 MISC metadata.xml 794 BLAKE2B dba4f05f021693e7404cf11c978290f95002956abe33e4a1296ea485854fa8f3bbbb66ef10f11393c68a9a4ef06218b379e250ef9c3e764d0460e7fcd8121014 SHA512 e7f0800df5a146f216ead60faabaf6b590fb02a0518895714a6b7666798588a3301bb86225296ac4fc65ea8c1d243dfcab97cf6eca9962ae40ce566add3af542
--- a/app-crypt/swtpm/swtpm-0.8.1.ebuild
+++ b/app-crypt/swtpm/swtpm-0.8.1.ebuild
@ -0,0 +1,66 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10,11} )
+
+inherit autotools python-any-r1
+
+DESCRIPTION="Libtpms-based TPM emulator"
+HOMEPAGE="https://github.com/stefanberger/swtpm"
+SRC_URI="https://github.com/stefanberger/swtpm/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+IUSE="fuse seccomp test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="fuse? (
+		dev-libs/glib:2
+		sys-fs/fuse:0
+	)
+	seccomp? ( sys-libs/libseccomp )
+	dev-libs/libtasn1:=
+	acct-group/tss
+	acct-user/tss
+	dev-libs/openssl:0=
+	dev-libs/json-glib
+	dev-libs/libtpms"
+
+DEPEND="${RDEPEND}
+	test? (
+		net-misc/socat
+		dev-tcltk/expect
+	)"
+
+BDEPEND="${PYTHON_DEPS}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.6.0-fix-localca-path.patch"
+	"${FILESDIR}/${PN}-0.5.0-build-sys-Remove-WError.patch"
+	"${FILESDIR}/${PN}-0.7.2-Conditionalize-test-dependencies.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--with-openssl \
+		--without-selinux \
+		$(use_with fuse cuse) \
+		$(use_with seccomp) \
+		$(use_enable test)
+}
+
+src_install() {
+	default
+	fowners -R tss:root /var/lib/swtpm-localca
+	fperms 750 /var/lib/swtpm-localca
+	keepdir /var/lib/swtpm-localca
+	find "${D}" -name '*.la' -delete || die
+}
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
--- a/app-editors/xemacs/Manifest
+++ b/app-editors/xemacs/Manifest
@ -26,6 +26,6 @@ EBUILD xemacs-21.4.24-r10.ebuild 7210 BLAKE2B d4ba5640df0f01408a3fa3ab1f345a570c
 EBUILD xemacs-21.4.24-r9.ebuild 7113 BLAKE2B b0cff6b002ee49f80b289e810c7f46c6864ccc60e7064a27857df148246999cb7c892a04bbf7e4d3cc37d55e49eb44bbf5a79fdb3d16983bbb3c5f4a01418e72 SHA512 1bf2721acc322fd1db5291ba54e43d0892ac5a925e88d7a69cc055cb7819d3ce341aef9e0a722ce329bcbb18f7cbc4380731a52c016b691f8382e33d21b0659d
 EBUILD xemacs-21.5.34-r12.ebuild 7398 BLAKE2B 164e4216ee89823cceaa87e264b44d195704e43d121364d4fee887ab16dceb7fc591dbeafd0ec4a748381ea870847c6bc197d6584656d5fb5b637ddf967fd5ea SHA512 74474d406b3b6ac27f52f57abe4b5a77e447a90630780d217efd872998d7a3ec8ac276ca2a6e6a56be89167bd4f8d7d6751ce4bb09d928034fbe3c6788d8fc4d
 EBUILD xemacs-21.5.34-r13.ebuild 7502 BLAKE2B cb7e76eec9c8efa4ed54c99576753f1c48f67f0c77fc9a2e123651c68a87804349f70612a1bf7ccd37f71f146477b58db222787e47b477dc2885e61ee368b264 SHA512 f85d415c55d205b1c8368fa0ef86ca5e2267d4dcdd3154539a76539c558ff0238819a5289b26574664ef92d97c87bbd0ed0bdefb8b07a0179012175cf3b85fda
-EBUILD xemacs-21.5.35.ebuild 7149 BLAKE2B 1b21bc84bde099af351d1485de16455b2c71104a18a67b398641e9f6526db2c3cf7318b5d6c8b48e8f1d3dfa9d13fc4e6f27833fa38d45d5b41170970e1bb52b SHA512 2b43dafd31180bddff3d477f333ed1a1c47a931d39153f3cab026b8b9cbc11dc9d56f9b9d3dea48233bb5023fcddd2b9c4c21d39dbb78e2b5d5a932913bc48cb
+EBUILD xemacs-21.5.35.ebuild 7144 BLAKE2B b970e504f65f9b8309bb5024ea3a880f7f46e03836ee8bb71a3a31cfeece0ac57dbe4f56c43893c62c3b42c3423f2a95ceb78d2431fe7eec8fcf2bda0d982e35 SHA512 1383a53fa8f3985b28401209dfdfa61cc6c7e21d61aa40fd32c813f363b5a1427f044d80ccd993cf3431de09785602802a043f6e8e36e8bbabb588380d8c6105
 EBUILD xemacs-21.5.9999.ebuild 7071 BLAKE2B 1290e111407fbde37ffac566bb1f6ac552c0ab6970beebaf0d465699c3ddce6fab777ccefe0634fd4eba7033658fdd6f0483c98c86f5041f1594d83cf6a7fa0c SHA512 24359322f293b251529d2ad6f06f4046080990d37a2ea068ca2bc85e4a41b85000b8409fef041de5e2a41313a6d69795c1da9e18b0162fa0c652e69e64371751
 MISC metadata.xml 756 BLAKE2B 1237bb18a737c4473990bd73a4a1fdd5788c743867b1f7c6d963f6acd21a7133fbe5b1c0921556a5152ab7f3116e635a6c6087dad15b5d2430a2d742c63a1a05 SHA512 65c0a9a02a9d11bde55cae161344803177203f4868f508c970d87fc7ea7b4f552f63d2e70ad2b1829efb8ff2ca641e1717672976f681ec56ad51dec2eebc8464
--- a/app-editors/xemacs/xemacs-21.5.35.ebuild
+++ b/app-editors/xemacs/xemacs-21.5.35.ebuild
@ -16,7 +16,7 @@ SRC_URI="http://ftp.xemacs.org/pub/xemacs/xemacs-$(ver_cut 1-2)/${P}.tar.gz

 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
 IUSE="alsa debug gif gpm pop postgres ldap xface nas dnd X jpeg tiff png motif freewnn xft xim athena neXt Xaw3d gdbm berkdb +bignum"

 X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps"
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
--- a/app-emacs/helm/Manifest
+++ b/app-emacs/helm/Manifest
@ -2,6 +2,8 @@ AUX 50helm-gentoo.el 79 BLAKE2B 7f188281cba0bf1f683977149ffa01f2bf6679cec1d73553
 AUX helm-3.8.8-no-autoload-check.patch 674 BLAKE2B 1cae635d26e3c5b41b585de585a87dab6cf37bd180cdea546c25fd12adbd8d9ed1e42e613164815b776455c991efdf075fcc4c19b4a812109c9508be76590db1 SHA512 14fdc3c5163389f11c9b684f569b9bc0e6e5ad4aaf9c2e170f66b05973e7a9a4744b0e293e167f2d714fa81f157b4b960bac07faf1e052a12167ad56ef131eda
 DIST helm-3.9.1.tar.gz 2370645 BLAKE2B 819f0bf8cbd3728a78e90da6955f799a8ad2320323a9a16eb72a4fcfe21c04995f0fd0072a7a8bf6fcf593dedc4c3b224f0310ec317b9e39f326b4c147343b1b SHA512 7cd5d93493a08ec173b6786ec4e0cbaf3a90473f7ef8f7564232cedc438ed01466faeb8aced07419aedadd1469c8c43fe6072ee725643e133ceb3004675dc3b7
 DIST helm-3.9.3.tar.gz 2373295 BLAKE2B ff34d5a68a1e25571c734185a37843d958b859096c22ca0222b64fb684a6de607d11b08f7beaa618f0017126c744f7f12dfe9d3ea03757874e485f4bdb5c2fc8 SHA512 4c1cce5eb93f89f388fb5da6a813f819867db6bc965ca378a788eaa5bf17c577b20034be9df57691737662d34809da4d86532b8b98765d6f102f84ee2169e80b
+DIST helm-3.9.4.tar.gz 2372828 BLAKE2B a1ca18531dcb1887d5a12b3536b05d68d6d40c7a41b9d3bd25f3cd286ccbd217bc45843007e208e84eafd5e3b4106d32461df87dd57d1a78d0a89f58cf933730 SHA512 17d5a99ea85481f7d4b9bea9fff2a602b0a824ad4f050b26e0225ec8e18025e6307434d4de31120786d3498f937a854ef4a080103df025be6a0e4718e7dd9161
 EBUILD helm-3.9.1.ebuild 724 BLAKE2B a6245954bd7351d3460bc36a816091187ee463d935675d4fa4c312903b9231622d569e05ba341dfadb4b2f78bbb60ade1c52102f2da95c446ae3789b4f56b802 SHA512 d72c9641147b836380e36aa50ae203740c6b25b32a333a436cf786a5bf1dadce5cea26e0f8a0b010e58168938655f03f4e922bd4b9e0e82b33decf9228eca587
 EBUILD helm-3.9.3.ebuild 726 BLAKE2B 7347a810765b4c6f9475c04699553151603648db65db533ec786ff4bbbdca9f00430d97803c80b710077ec262a9b31b19b9c1f22c0b03190a41918fecc5516a2 SHA512 0586031bc2f2ef226861a8be5f8763ed33e94b79e95aef9ec0e478ee87e19b4b8c13cafd6c00299fd49137d86065ed37d92ff058d52412e1b047212d24632a25
+EBUILD helm-3.9.4.ebuild 726 BLAKE2B 7347a810765b4c6f9475c04699553151603648db65db533ec786ff4bbbdca9f00430d97803c80b710077ec262a9b31b19b9c1f22c0b03190a41918fecc5516a2 SHA512 0586031bc2f2ef226861a8be5f8763ed33e94b79e95aef9ec0e478ee87e19b4b8c13cafd6c00299fd49137d86065ed37d92ff058d52412e1b047212d24632a25
 MISC metadata.xml 822 BLAKE2B 5de057ddb881d67550d3e8cd0be43d3328b8e7a38b98338ffccec147095cd5d8f8bc68695c797a872e2ed7e455859fc1d6170f414231016edab5a8d742ad2a40 SHA512 08367530e4e47577e1812d229b97094b9c012c4c91eb7e69f5724e98d8790327fe35fb9b480cf33eedd105f1fd85133c39397eda0426461d80bdee704a51c55a
--- a/app-emacs/helm/helm-3.9.4.ebuild
+++ b/app-emacs/helm/helm-3.9.4.ebuild
@ -0,0 +1,37 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp
+
+DESCRIPTION="Emacs incremental completion and selection narrowing framework"
+HOMEPAGE="https://emacs-helm.github.io/helm/
+	https://github.com/emacs-helm/helm/"
+SRC_URI="https://github.com/emacs-helm/${PN}/archive/v${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	app-emacs/async
+	app-emacs/popup
+"
+BDEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}"/${PN}-3.8.8-no-autoload-check.patch )
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+	elisp-compile *.el
+	elisp-make-autoload-file
+}
+
+src_install() {
+	elisp_src_install
+
+	exeinto /usr/bin/
+	doexe emacs-helm.sh
+}
--- a/app-emacs/rg/Manifest
+++ b/app-emacs/rg/Manifest
@ -1,6 +1,4 @@
 AUX 50rg-gentoo.el 66 BLAKE2B 51ca91eda1462dcbcd9ae5bd917ab44b5e1259afd72bfb5cb8eb884dacca545677d00e0feac5e7d90f8b49c5f308afc354f5df08d2cca275e78e008fa15b94a7 SHA512 84a87f247455cfeadd80335fa686c1bfee28b3a006249fc5894880c2e2848bbe4795c71dd212bfc2aae5e599755ae335653e5a78457d1e04324b8b5ca82ed2b3
-DIST rg-2.2.1.tar.gz 202686 BLAKE2B 43abfdc5d631d5551272788dc31f8767f2b638604f180dfd0cb96df8d142f97ec644482da660c279f1877ab77477e5f25810de3850439d0210be1e4040c77a98 SHA512 eac9c21db6a13299e24f3e6166ff45f378f44454bc02ad8c04b42580d03c67eb28fbaee17feaa53096b7dced2e4e7dbf64a50608c61fe9188530fa0102a0f240
 DIST rg-2.3.0.tar.gz 204996 BLAKE2B cc233f90a4bd56928053ebace2aa166c0210ddc9720b37b4e67e10e1082ed0ff744bef6d502666a8094d9c57c0afa2b9a32967b290443cc467f2865ea7b95330 SHA512 343626c35bdb26f2a300bac258af112230cf502900852456362f1adaa6bf6551d42d07ced59b8f864cab0663b559262f2e6f982f5b95cfffe1d04218fe6ebbbe
-EBUILD rg-2.2.1.ebuild 971 BLAKE2B 4a924baff9785630c479bd2f1cb84fa1ffe2b02c941944add93bce38d214d6d16429ce8f851c0a25a47f2d74c74bf27d63af15e70c0ad9bff5227547e2f9369c SHA512 c8cb15cd891712242ecf7330c9c0db32df100f982284bc096964e655d65c8c51a9afde74bd8b5d908caee333e37fe670c3ab24313a168e83094797aad11f41bc
 EBUILD rg-2.3.0.ebuild 971 BLAKE2B 4a924baff9785630c479bd2f1cb84fa1ffe2b02c941944add93bce38d214d6d16429ce8f851c0a25a47f2d74c74bf27d63af15e70c0ad9bff5227547e2f9369c SHA512 c8cb15cd891712242ecf7330c9c0db32df100f982284bc096964e655d65c8c51a9afde74bd8b5d908caee333e37fe670c3ab24313a168e83094797aad11f41bc
 MISC metadata.xml 1083 BLAKE2B aa777fe0b99335ca705401879d333e921bb480798c85a2213822461e4b60a5b8d660592d8dab7f1d81dff98dc2808aeff11992890842fc7657deee2516006288 SHA512 aca5ee92739a5e12ef60f539b74f2bb9449ec472d2ee2169528cb76cc716e0829427c9e3ddbb8ce7857266fc31a5143538a369afb59f5f00f26dd31e8af67d5c
--- a/app-emacs/rg/rg-2.2.1.ebuild
+++ b/app-emacs/rg/rg-2.2.1.ebuild
@ -1,54 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit elisp
-
-DESCRIPTION="GNU Emacs search tool based on ripgrep"
-HOMEPAGE="https://rgel.readthedocs.io/
-	https://github.com/dajva/rg.el/"
-SRC_URI="https://github.com/dajva/rg.el/archive/${PV}.tar.gz
-	-> ${P}.tar.gz"
-S="${WORKDIR}"/rg.el-${PV}
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	app-emacs/transient
-	app-emacs/wgrep
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	sys-apps/ripgrep
-"
-BDEPEND="
-	${COMMON_DEPEND}
-	test? (
-		app-emacs/ert-runner
-		app-emacs/s
-		app-emacs/undercover
-	)
-"
-
-DOCS=( README.md )
-ELISP_REMOVE="test/rg.el-test.el test/rg-isearch.el-test.el"
-SITEFILE="50${PN}-gentoo.el"
-
-src_compile() {
-	elisp_src_compile
-	elisp-make-autoload-file
-}
-
-src_test() {
-	ert-runner -L . -L test --reporter ert+duration --script test || die
-}
-
-src_install() {
-	elisp_src_install
-	doinfo rgel.info
-}
--- a/app-emacs/websocket/Manifest
+++ b/app-emacs/websocket/Manifest
@ -1,3 +1,5 @@
 DIST websocket-1.14_p20230305.tar.gz 27340 BLAKE2B 32b55fdff4bed7893d02bcafc67e473442803a492c31e565ec1487dc0e7211e505a517e460ca05f5f1f2d28d0852bced91cfbe9da98bcd6ed1e4598fe6bc4eb6 SHA512 6c4574387f8cae7d17a3a8e618678e9dc8d96d0301f3d20e236dae1820cdb2c7bb49e2f5bfe816670e9bac6a7be24b85f8ec9f8ea2aa248c6b5af302f227ae43
+DIST websocket-1.15.tar.gz 27231 BLAKE2B 4dafdb9bc2b2b499ee335acc00c8bb0316275ec5f5d4d3440a4dd89a17ce7999c211d2ec2b9df0457ea17ca6d70f57d7804eb8f3b6ffa4bbf8ed362bcc66618a SHA512 c2881dcb956d7803b16bd451f21a1c2f62181f2b88c0d4e9e067b040df573ad90d047e7cb637190d193e185b651fef1e7559833a1dffe24097ddb07623133d6e
 EBUILD websocket-1.14_p20230305.ebuild 853 BLAKE2B b6b1dca73dc3610578b6ce59e4feee91b848739bc501dd2b85d74eb83897a6e30f9e472f66acedc4a5d63c03f4f464e9d62b25293d056ed2b1d3580928b3f6dd SHA512 405d5ab01f42409788ec2123a4f37a92312e7ace4b0605aa30adadbf1ee672a369301bf9ad72d96a32ac50581426235207a34e06e4a5d2caba4de91d7b4cd44c
+EBUILD websocket-1.15.ebuild 867 BLAKE2B 9379d88dc92cab2f7915f662648637f538ce55b4430d3993b8ccbe3c659eda486401d547e72c141712b85218f9763efa63cec4811c55201bbc41698de6785e22 SHA512 9fc9e6443347ac6cf96129c1bf9ac3e88ae5d0349f3d02fcab999cd5db32b7e242ef4af4fb7c0b8a3b55e59bd3f37533327ba61e0b9b3b7cfa9de346801d04f3
 MISC metadata.xml 385 BLAKE2B 63b7e67552098fb0e1f8da3df87ad993a042f4f19d317819f7a5faa263858674b48d9b9db5459732d73aa11b7d9190a3c4e035e64e7555639dface01d9aaca13 SHA512 f02effffd7cb072e3d1835768354df8d939248c7a10e54b75e590efbc2a9f8b67431c77050fbbf9c13c94c1d1b69b6f6049cc93ded163980214890e55c4cd382
--- a/app-emacs/websocket/websocket-1.15.ebuild
+++ b/app-emacs/websocket/websocket-1.15.ebuild
@ -0,0 +1,43 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp
+
+DESCRIPTION="A websocket implementation in elisp"
+HOMEPAGE="https://github.com/ahyatt/emacs-websocket"
+
+if [[ ${PV} == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/ahyatt/emacs-websocket.git"
+	S="${WORKDIR}"/emacs-${P}
+else
+	[[ ${PV} == 1.15 ]] && COMMIT=40c208eaab99999d7c1e4bea883648da24c03be3
+
+	SRC_URI="https://github.com/ahyatt/emacs-${PN}/archive/${COMMIT}.tar.gz
+		-> ${P}.tar.gz"
+	S="${WORKDIR}"/emacs-${PN}-${COMMIT}
+
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+
+DOCS=( README.org )
+SITEFILE="50${PN}-gentoo.el"
+
+elisp-enable-tests ert "${S}"
+
+src_compile() {
+	elisp-compile ${PN}.el
+}
+
+src_install() {
+	elisp-install ${PN} websocket.{el,elc}
+	elisp-make-site-file "${SITEFILE}"
+
+	einstalldocs
+}
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
--- a/app-emulation/libvirt-snmp/Manifest
+++ b/app-emulation/libvirt-snmp/Manifest
@ -1,5 +1,5 @@
 AUX libvirt-snmp.confd 143 BLAKE2B 0781bbd4a4fc0f9f9f32347ae5b730ee643ccfacbc02ddacafca4fe3ba7af3418acd1a677f5d30547f2816717a29091a8305054c87549d675402fb639f12eb39 SHA512 15037f146e7d2f72c83927133b07477a8f0c79df417dc37f3d5a58081f4a9d5c950b5160f4c4b419b68430192a178cb9b8550106d4870ace264448a74de5862e
 AUX libvirt-snmp.initd-r1 639 BLAKE2B 46cc58e561aa341a27381cf1ff7925758dae2a8a119fb789645d5a602631b52d7d3325549da4b5b256f33c94e9a7d90200e5010d326184eab58a2d83d9bb72da SHA512 90db400497ea1ff10ffb0b8fe1ec9cfbbb066cdec0db9669924080ec64fd9b2e878c063eeb8ba7ffea0c3cd1f154a9074daab0bd6951de34e3d1183518dfdb18
 DIST libvirt-snmp-0.0.4.tar.gz 157859 BLAKE2B e2c8fcdd97ba9b55bd4d318c63f7738024c1360ee10aa4e685c2ea6ca02478206febff30f3e1a82eb1a2dadaa52a377cfbce538e12e33f4ea2fe10b1a089945d SHA512 dbf47e7983f9bd6fcff205fffd1f6006268cca774cf427d39dec84dc7de37b545c0dfcbb2c6f171f55d73487cdec13341097137e24de2dea58ce90494d281162
-EBUILD libvirt-snmp-0.0.4.ebuild 1011 BLAKE2B 6f67be77f23f65da23e3e90221af1221d06c2b1da00c4173b7258dbe6e700eba264504e13fa4e8509dd617268532e2371c5d257f711b5eb14d2bfd759fce0b3f SHA512 0c8171b568413bbebd2764ab0995abed371967d864fbc61c076955b2339199aa9cb9e19aba62d02576e11da6a5c49b12b43a8204fd989b88652be3978337ba44
-MISC metadata.xml 169 BLAKE2B 25149b73446be31f3ea3dd3a6394230987e7d4c601d1605fd3827b37bd99b3301c2e0edb95d0f59a4577ed27919f43c2cc02b1edf62c4012b935a82e709e0c05 SHA512 55c53f74b001bae56ba8c54581a4168335b6b3a28dac23a2102b76795d5fd41de33b8b3e1ec03f9acc6e7a3a77e93b1a6ff3e3967c3156dcbf22b5b5a6245ef5
+EBUILD libvirt-snmp-0.0.4.ebuild 1033 BLAKE2B 086dc0f5268dc175566c90258e5d9a29346aca3c03a76ff46f94b33bb4561a5ce8c84cd11af1f248e09b156b96b0cae0573c856610178e1c86097bd8a0c67464 SHA512 2923367b98b3d86d7f1035615b4beda6b8095d11cc7480536bf3d171b86850ac695b9c59dc1083e86d529d8fa1110a0f4a9a901087397f235ce28ff2687778ed
+MISC metadata.xml 253 BLAKE2B e2f2dc37dec865acaf75ab3cf8eec5b07230a50f77b31484d57c98d6c253d9cc775e3bfbd0b324a551add51eceb7ab16550f5207f0ddec45eb846af46d35d042 SHA512 88baeb17d7dfd51ba23199e87f21cd81d6ce72a80294baabae5a8130f336d4639c3026e5b38a96541292af1f69548a02192a099d67c907f6b8a06d6b2bca3c19
--- a/app-emulation/libvirt-snmp/libvirt-snmp-0.0.4.ebuild
+++ b/app-emulation/libvirt-snmp/libvirt-snmp-0.0.4.ebuild
@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7

 DESCRIPTION="Provides SNMP functionality for libvirt"
-HOMEPAGE="http://libvirt.org"
-SRC_URI="http://www.libvirt.org/sources/snmp/${P}.tar.gz"
+HOMEPAGE="https://wiki.libvirt.org/Libvirt-snmp.html"
+SRC_URI="https://download.libvirt.org/snmp/${P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
--- a/app-emulation/libvirt-snmp/metadata.xml
+++ b/app-emulation/libvirt-snmp/metadata.xml
@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="gitlab">libvirt/libvirt-snmp</remote-id>
+	</upstream>
 </pkgmetadata>
--- a/app-emulation/wine-mono/Manifest
+++ b/app-emulation/wine-mono/Manifest
@ -6,8 +6,11 @@ DIST wine-mono-7.4.1-x86.msi 87339008 BLAKE2B 571469f21f4b2f4483172ef88cd973f94d
 DIST wine-mono-7.4.1-x86.tar.xz 44433444 BLAKE2B 28adbcca630698e74e455fbe37b8cd60c3d836c503db6a2df20e4db3e12f549a5d1fae6a4c0ccd6068e2667f700fbfe09858b95f156ad8d660ef3804773179a0 SHA512 2d0b231ee6e34d23f1e2ae0d7995dd31caab352f30816302743f884f5da56a071e931dabb53f813dd5389c82bdab70057b1d5c6430f1f88ace93789e41962cb6
 DIST wine-mono-8.0.0-x86.msi 84587008 BLAKE2B ad2e94b89ef40497009b3a4c1df368482ad48f9061091ecf83298be54836aed7169f10c50e9df62e5aac7843afa087daf4fcc75a4b5c50153bd6f64e70396494 SHA512 579bd4914784b0e23120f9750b9b92d9416f1a66e6bb5ff7692ec88368f10d034fdf1c817032dadb8b4dd9758e34aff6e43f5085792239ffc28585f95e167c21
 DIST wine-mono-8.0.0-x86.tar.xz 42360588 BLAKE2B ef3ffceb788bb5683de105c20741be8d2ac63622edfa22cd60bf6fb5833ecab19b51ba5fe1ff6cd1a30425fd26ff861e4ad2d5eaf97d38251f66e88e54ab04ea SHA512 7ffa8a87c9e23d84fee789da83f29480d91b79915d3acaa15803699d8ee1575097e24c38fb0e23b22fc5b67f64287fa3f7979b1a077c08ed2f5b69643dcacd4f
+DIST wine-mono-8.0.1-x86.msi 84579328 BLAKE2B 946a0bf5a7e4fef8c6d40a9899a070fb4d6542ed6f4c632ded4edeab134e7fd6c17f1951cd3008b51c7f56eab95c0120bbf64212361a64653fb7bd4d54512a15 SHA512 06aed1bf24882987cd2eae99f9295faf450e0c1471381105ce794987cf37bb7feb7bc857e4dcd59a718b05b1676f227bf16abb472c1d1fc7f1902ec835de3156
+DIST wine-mono-8.0.1-x86.tar.xz 42365644 BLAKE2B 53ae5cb57c4571aa7071d13b99af59b24b2275c559fd062a2621413b1e17a3d0a2bda23f143df6dd2b7685e65d62ab8e800fd3f082be02faac54450c8d71faf1 SHA512 bd174ce5031df1a13a6cb050b735d32330ccd0de43ea29888a91c49db49b02f9b377e78ef9531eaa1b30eed79c6706d84624b87d784f73224581763ca9e63945
 EBUILD wine-mono-7.0.0.ebuild 612 BLAKE2B 39b9a3190973e810ad32da319b29e8448de94e7289b264579900c9261d32fe3bf101dd1b46e2fd71ba61d2fa4b073aceb59526e0fdb59b8e15abb55bd0eadb4b SHA512 eded1db18604b14f9a634d8364ed5013ec84821f32a31ee459f5aa38172f2f8f1b3e3d38e1527d87208e69d604dec49f01d8b9dc30ca70530aacc7e1f9039039
 EBUILD wine-mono-7.4.0.ebuild 662 BLAKE2B 1e4e33a1f0a9f6436d787091a0186b8f8d77a6678c5d86fac205720a02ae5fb21e6a40e3df33d8f1501af6974261ce23f3b47c0a558ea299b454fd439b19b7d3 SHA512 930cebc2ad75709cda8819b527c3bbd0c34c6e59fec7562197b8d1ad8fc3e0597b62a789e1e37951ce63fe8687158617f6d332cea585db4787b71de576ea0982
 EBUILD wine-mono-7.4.1.ebuild 663 BLAKE2B 3d798235636f745d0188af1021ebd9c6e962b0444046bc6dc82582d4b32e7a1f276d09e82978cfcfd052a2ae7c1dc344bc15d869dc9d45f71efa7caa19a923ca SHA512 a0950b3c89feb2eaa48a59e1fb2f77e982a5a39d9a1c790a04761998c73e5436264a1a01bca62571815c1b1de9c76f68e14198837eafa64bf1ed54133da13551
 EBUILD wine-mono-8.0.0.ebuild 664 BLAKE2B 5b6f81e3dfeab25abbb9e5259fad782b5e064a6ccd421ddff0a069484bd5613257fa12dc0cb4710e20c3c3de971119b041f39c61c375cd2d7fd61d2d7ebd9dff SHA512 1a9f450a43cf303fc3520a4abbafda47bdc72c7ca3cc738de869568d8051cec68e9030906709583689dae3e607b741aa5d94e2d06357786ad6cd0b7f94e312b0
+EBUILD wine-mono-8.0.1.ebuild 664 BLAKE2B 5b6f81e3dfeab25abbb9e5259fad782b5e064a6ccd421ddff0a069484bd5613257fa12dc0cb4710e20c3c3de971119b041f39c61c375cd2d7fd61d2d7ebd9dff SHA512 1a9f450a43cf303fc3520a4abbafda47bdc72c7ca3cc738de869568d8051cec68e9030906709583689dae3e607b741aa5d94e2d06357786ad6cd0b7f94e312b0
 MISC metadata.xml 746 BLAKE2B f9afe281dd6e667a39d5c42dc0580f7bd6581edf5271a0c54e7436e6398a69ea415e09425fd5df56342cbcd128cf24ad4c94f43d64d1d42bcdc528073c72e3b7 SHA512 83016f049bca7f127af165425648857df8e44c3d6cbcb33d849501ff1ddefbec590c38e8a59d3c69e4ab583c89ac4dabc9cba5d7fe8ada66eaffe5b4d55dd13b
--- a/app-emulation/wine-mono/wine-mono-8.0.1.ebuild
+++ b/app-emulation/wine-mono/wine-mono-8.0.1.ebuild
@ -0,0 +1,26 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Replacement for the .NET runtime and class libraries in Wine"
+HOMEPAGE="https://wiki.winehq.org/Mono"
+SRC_URI="
+	shared? ( https://github.com/madewokherd/wine-mono/releases/download/${P}/${P}-x86.tar.xz )
+	!shared? ( https://github.com/madewokherd/wine-mono/releases/download/${P}/${P}-x86.msi )"
+S="${WORKDIR}"
+
+LICENSE="BSD-2 GPL-2 LGPL-2.1 MIT MPL-1.1"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+shared"
+
+src_install() {
+	insinto /usr/share/wine/mono
+
+	if use shared; then
+		doins -r ${P}
+	else
+		doins "${DISTDIR}"/${P}-x86.msi
+	fi
+}
--- a/app-emulation/wine-proton/Manifest
+++ b/app-emulation/wine-proton/Manifest
@ -9,5 +9,5 @@ DIST proton-wine-7.0-6.tar.gz 45780326 BLAKE2B f140fcfdd1a47904c34a49d0795fa3326
 DIST proton-wine-8.0-3c.tar.gz 48254135 BLAKE2B fee58928555376f71579099d3fb39dbe2242516b671af1ca2507a135c3119422d6e168ed2a258d29c57a8fc33a026e5cf788d8362f238f1c0c4c7c81c9cbb147 SHA512 5d473534834ce8ea855d4ee2d39f1596117c0abab0925ee50875245ff6e1f49fe4684fe6f162e92a4b5e408795ff8c9b15b382fb013074216dd565143ecd9efc
 EBUILD wine-proton-7.0.6.ebuild 11223 BLAKE2B bc6e1cb69203b50ba060a68de497d930c3f57a7a95a53b1d00ba8950207e3ca145e28675d9ea9814259b5016147e64e58d381e34d9d84142d80f8f7c6f4fd9ab SHA512 3e19519468a16f2935f5508071cb763dd9ff8ef4d690de35e5281b4b4a0a58e5d4cd7a64f06d810022bd3cfc5164ab66cc598ce440a7654ac61fcf80170fa14d
 EBUILD wine-proton-8.0.3c.ebuild 11553 BLAKE2B 393a5c700a0ff0ee85cbd501d325de67583f7bcc5838790288a65076da44349baeaf07dfe9f8c4f606a034dbac80d72284da6198eda72efcf4596e771eb110da SHA512 a5387e0d5a031c159739c17fb9eef6cb095110c1b23a2862318737c0c65df4326cc68bdda7bc7d2e9a659829fea943305a861c2680719db91ddf8cfee4176326
-EBUILD wine-proton-8.0.9999.ebuild 11753 BLAKE2B 2c265c6f2f9ae4362d07fee019b0031bd00ed9c9bf61428cc1bf364e4f25dfa91aa382508ea36cd0e6ec3245a6a52551ffea866fdff14d21edc8584c44574680 SHA512 879bdf1e81e59586e7f96a771fbc4cb9e123098ea91dfc3b41175f4e31c476c047ef276da6d41f3be1387f9d12d5b10b9676c0038e5bb2435c32ab0efcc676ac
+EBUILD wine-proton-8.0.9999.ebuild 11753 BLAKE2B 761902ffa4b7c92f7a7254f857378b5103e43bb71606d115925f4fbf05e9c3fd581686f756600bf71fbd2a6624730e99a40f37787835a9cd57e1cd67b2c7d84c SHA512 4ee16a9494660d72170e54e9c00aa9b5e5b50c23cb445fe2624f8d21116629d941a4b5836ae55ac2274aa00bff9bee3480a5ae0c0c7c58926b21f9def7347ab1
 MISC metadata.xml 1222 BLAKE2B 75e8a33a16e4d718c5299ae719cdd009e9ac6f0d2eafb112c9e38e7d860a51d7f4d5be14912c1c812718b36fd4d71a9d3ddf2c68f5a076fc71f5d47fab120736 SHA512 3fc770b9d6f1e7cb7cba7fc28f90d5f51ad431f38e757dcb47b03543985d0919e29b6648b8c3f6bb6e1c7b172bb164cde35e2fea24564e476088c1a91e6131c8
--- a/app-emulation/wine-proton/wine-proton-8.0.9999.ebuild
+++ b/app-emulation/wine-proton/wine-proton-8.0.9999.ebuild
@ -9,7 +9,7 @@ inherit autotools flag-o-matic multilib multilib-build prefix
 inherit python-any-r1 readme.gentoo-r1 toolchain-funcs wrapper

 WINE_GECKO=2.47.3
-WINE_MONO=8.0.0
+WINE_MONO=8.0.1
 WINE_PV=$(ver_rs 2 -)

 if [[ ${PV} == *9999 ]]; then
--- a/app-forensics/Manifest.gz
+++ b/app-forensics/Manifest.gz
--- a/app-forensics/zzuf/Manifest
+++ b/app-forensics/zzuf/Manifest
@ -1,4 +1,9 @@
+AUX zzuf-0.15_autoconf-hardcoded-cflags.patch 389 BLAKE2B 5356631f9540712f575981ae18d403fbaf137cee27da0b0ae3b71d5635d8c16b735830153ab9ca6a8545177d6611e748781705907eaeff99fa1138c3660f969d SHA512 991556c38ef92736a80fa17683b2b4565f8f54077e990bba89f811e5a70a7b6346ecaaa0dc56284fe226515607c336f0c9d0e499f3fdc20bb53f70872fc40cc4
 AUX zzuf-0.15_autoconf-musl.patch 531 BLAKE2B 9987958b500847001be87954c802530414730b1a7e05f5e6c099ef8ba9f633abd7f32918094781c65247350541bdab582d6efc5e106752a71e4ae92046e6a93f SHA512 3fa95a57ef1bdc65894563f4f360c03646029d51535b46b79f5245691c55b113011dc5453c60717a48e21856ee2b3e00e98655417d3943d6e3a5a7cc26c48164
+AUX zzuf-0.15_implicit_functions.patch 720 BLAKE2B bdb49a4eaab4bf185275294390016eea89d37420ecba80ffd249ec44fe001c81f12c53ef2b85c722bccf8df4105e6c3dec691c0b71d013d667f9196a79047cef SHA512 1ae13a665f02cf4cff956459901fab18cff36939ad473777f7a9bf5492b9e213e74aee5d7b09d59e411e29da0dc93defb5f870a2af5318caada5b72782c3b80f
+AUX zzuf-0.15_use-after-free.patch 328 BLAKE2B 8c5afb5011fc9328be2a16182f4eab2e0054b357e44603c35c44c4ba01ecf7f9d3dcaa5b8b93d3a550556cad420ff50b6e0965bb8d0a04e04f600ea3b68f025d SHA512 7e800bba4a7fad4285885e13b8d5db7e368673ccccc854d44ab620e2cf5627464b3c5dddee83bc2bb24d914446de051e05909ceaa66c9c4bc894fdf2219f350d
 DIST zzuf-0.15_p20190208.tar.gz 140812 BLAKE2B 908661fdb51a5b2d5b188ac7df2731c5f069db8489651145f6d4a5cb0f02dc99fa10c3771a034645043f547ef92dfe9e3cfa3f1442dbad690d88ef620f2cfdd8 SHA512 e4d6b4356385642323520c1f1d476b572465881df539d0c6e7110ca7974da81b4b744896df7deac8b462707ca9e0db578ca0c118d6ba2da4bc78ffe31328f711
+DIST zzuf-0.15_p20220529.tar.gz 140825 BLAKE2B a36207082210e062575bed45eac4a83923cbe5f0e60c0b093053ac96abef085a0e6506d5b7db6b11ed7f0979462fbb92f69767ac548de1a1f96a12d84aac8584 SHA512 50e3c8908f579a70d41d7887ff7d87634f3b856ae82bb7ec6dccacccf363a6494d825e0b6debf683ed29408dcd5dc83dbb39c2d2000be0d79aee5f819d69185a
 EBUILD zzuf-0.15_p20190208.ebuild 892 BLAKE2B 2fa7df802d99c16973d81939debf7581a7cd1934da004a42e648b3d32807c6ff9305001d1536f09141f2ca576e888004fba5998bf3fae101791396ea27254c0f SHA512 aad31e25c28f230599576140b6de09f223d9529409aa6309edbc9f4c6953f94228efb182e88454e2d6199cc33da61f4d284538c04d033a4f9eb84f6249cf42ce
+EBUILD zzuf-0.15_p20220529.ebuild 1048 BLAKE2B 5e4ccfc195296461e53f738900c3a30cec4c2803a27d0b1d187446c70bf8787cdf0990053ab0b2f78fe5497eeaee34e88a802b345e41e5cf63a25088a8afcf46 SHA512 a8d656c5f93574ebf81551de406d5f9dba771e8c0f36311d83fda0b3b76a0342d5fd9b32a4119783031af7c09cd3f1afc83918c43e1c39fda19f62e486f55b75
 MISC metadata.xml 326 BLAKE2B 77312612bdbb6c967bc8523ea1a33026f919ce69162719a6b3a58f3708f33ce4019fadee44c1ad1f16eeca8e30d3bdf285f96be6db1e09b6a77cbf85c44212af SHA512 403ec74dd325185a7b5d121e3510b67600fc4ec549066e2e1d2db85f9271af1d6d6a68567170770f48c1d2f0bd75f5287b2eaf9c94ff2442e31652b06f6cacb0
--- a/app-forensics/zzuf/files/zzuf-0.15_autoconf-hardcoded-cflags.patch
+++ b/app-forensics/zzuf/files/zzuf-0.15_autoconf-hardcoded-cflags.patch
@ -0,0 +1,11 @@
+--- a/configure.ac
+++ b/configure.ac
+@@ -39,8 +39,6 @@
+ AC_MSG_RESULT($SONAME)
+ AC_DEFINE_UNQUOTED(SONAME, "$SONAME", [Define to the libzzuf full name])
+ 
+-# Optimizations
+-AC_TRY_CFLAGS(-g -O2, CFLAGS="${CFLAGS} -g -O2")
+ # Code qui fait des warnings == code de porc == deux baffes dans ta gueule
+ AC_TRY_CFLAGS(-Wall, CFLAGS="${CFLAGS} -Wall")
+ AC_TRY_CFLAGS(-W, CFLAGS="${CFLAGS} -W")
--- a/app-forensics/zzuf/files/zzuf-0.15_implicit_functions.patch
+++ b/app-forensics/zzuf/files/zzuf-0.15_implicit_functions.patch
@ -0,0 +1,32 @@
+--- a/src/libc_fcns.h
+++ b/src/libc_fcns.h
+@@ -0,0 +1,8 @@
+#ifndef _ZZUF_LIBC_FCNS_H
+#define _ZZUF_LIBC_FCNS_H
+
+/* Prototypes for internal libc functions zzuf hooks into */
+extern int __fseeko64(FILE *fp, off64_t offset, int whence);
+extern int _IO_getc(FILE *__fp);
+
+#endif
+--- a/src/libzzuf/lib-stream.c
+++ b/src/libzzuf/lib-stream.c
+@@ -57,6 +57,7 @@
+ #include "debug.h"
+ #include "fuzz.h"
+ #include "fd.h"
+#include "libc_fcns.h"
+ 
+ #if defined HAVE_FPOS64_T
+ #   define FPOS64_T fpos64_t
+--- a/src/zzat.c
+++ b/src/zzat.c
+@@ -51,6 +51,8 @@
+ 
+ #include "util/getopt.h"
+ 
+#include "libc_fcns.h"
+
+ static int run(char const *sequence, char const *file);
+ static void output(char const *buf, size_t len);
+ 
--- a/app-forensics/zzuf/files/zzuf-0.15_use-after-free.patch
+++ b/app-forensics/zzuf/files/zzuf-0.15_use-after-free.patch
@ -0,0 +1,20 @@
+--- a/test/zzone.c
+++ b/test/zzone.c
+@@ -64,14 +64,14 @@
+             last++;
+     }
+ 
+-    free(buf);
+-    free(tmp);
+-
+     size_t total = 0;
+     for (size_t i = last; i < size; i++)
+         total += countzeroes(buf[i]);
+     printf("%li\n", (long)total);
+ 
+    free(buf);
+    free(tmp);
+
+     return EXIT_SUCCESS;
+ }
+ 
--- a/app-forensics/zzuf/zzuf-0.15_p20220529.ebuild
+++ b/app-forensics/zzuf/zzuf-0.15_p20220529.ebuild
@ -0,0 +1,45 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools multilib-minimal
+
+EGIT_COMMIT="a7111e51eac3086264fcca0c7026de22b5ab55c7"
+DESCRIPTION="Transparent application input fuzzer"
+HOMEPAGE="http://caca.zoy.org/wiki/zzuf"
+SRC_URI="https://github.com/samhocevar/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="WTFPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~sparc ~x86"
+
+# Uses dlopen hack to hijack many libc functions.
+# Fails 2 tests with sandbox enabled: check-zzuf-A-autoinc check-utils
+RESTRICT="test"
+
+DOCS=( AUTHORS COPYING TODO )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.15_autoconf-hardcoded-cflags.patch
+	"${FILESDIR}"/${PN}-0.15_autoconf-musl.patch
+	"${FILESDIR}"/${PN}-0.15_implicit_functions.patch
+	"${FILESDIR}"/${PN}-0.15_use-after-free.patch
+)
+
+S="${WORKDIR}"/${PN}-${EGIT_COMMIT}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf
+}
+
+multilib_src_install_all() {
+	default
+
+	find "${ED}" -name '*.la' -delete || die
+}
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
--- a/app-i18n/mecab-skkserv/Manifest
+++ b/app-i18n/mecab-skkserv/Manifest
@ -1,7 +1,9 @@
 AUX mecab-skkserv-cflags.patch 312 BLAKE2B 015a99b1645a278f59a959db91d52fe15608ebea7ab87edecfff4e56276d594849ed70db9bbfd4d45a0f77d425ed77d69e2475eec0c62e59b4dd0a1e1cc810c2 SHA512 7b3ae93eab4d0a13701c590d7cfd033fb3d34aa085beb59224bcd60823829c87674e0ee8edff2f8d73c204c56be668673e6dabd3ac5f60da34afae927bcc1106
 AUX mecab-skkserv-dicrc.patch 146 BLAKE2B 7bf9969ad1d16f8f8a3cd1a8efaa970795ae3658f58fde4335732c0dd352b281fe9765bb09276cc72df0fbd3ccdf44c91e083b96e5cff71cb9d37e73d70f5ea5 SHA512 9c96b2c71e8c06c1a7e12c5c4952a9202d06943aebb1e96b63d00084f77822af657745dbf2c926358739723444a99be86537d638d3eea5728b4392a22471314d
 AUX mecab-skkserv-getopt.patch 347 BLAKE2B 02332389fb70107d58e45fcb57e8a0883e29bb795e48731d84be74289b6b49fb6e52a75bc0e0bbacc37c7b2e17dc685ee07fe62527b0ad2deb8f632a06331257 SHA512 0edd393e1ed32f1a31778eec668d1f4ec5fd598251473af4e9ba74db71a67298927d973f552d589359dbb29c70f89f9d8e7fdb3e154608199614bf84aa9d438c
+AUX mecab-skkserv-missing-strcmp-clang16.patch 292 BLAKE2B 478d77bf79a2352a869b65ca6d6ad3b983eb0980ec02d3271f5d83c66c803eff476de7d491ea3d77907a2c42b6b01dd676913e64b936bc05802b647c11ce8478 SHA512 aca978edc1acc6a0e1e9d319c040db1c3fd0008292849406b9de8fdd0b7c677511a0a5c3de5a6cf9404ccd03673ecf3abe5a5cf54db59d2ba4de185ef7e8509e
 AUX mecab-skkserv.xinetd 238 BLAKE2B cfb09ee995755129def89310cb16c512f030cbc3166bc67fffcb43c7031bc55bb7e582c2076853de5f32c809d4322363a681f085d943839ed387c31b1303a8aa SHA512 181ab3fb6abe4f4d7555db674881430d6149561459dbaca6fbc5081bfcba2154670e54a383dafd4b3339ed8f412a32d93f3c9024841c3b28c8c00808b5a5f366
 DIST mecab-skkserv-0.03.tar.gz 5398452 BLAKE2B 89327edb34a66e0acc42942bee09d835c5ca7d5834513d818914dbff1c74b838c964f2ddf79a4684dba551a4f0fda0d12f63086f7fac4b68dcddf89831aff44f SHA512 268621035391ec780b8aa04980d668afc83410853d25f06b4578dba3d4e3803ebfea42aabde1325fd80edad7524a4658480e40a00c6bfec1f04310a8d47bb2c9
+EBUILD mecab-skkserv-0.03-r1.ebuild 870 BLAKE2B e335ae488ff6112c3bdc860e92410238c291cc226278b8b81b08cdef79472cded932188f35a20254611b856806a9f34e8a6d7ff99e8f714a1962665aab87b081 SHA512 3a9272bcd8d2adde3deab1bd55b1ec26586cfc893a9b6446e63d3ad80a4e9c19e6654e2c90d987552ac445c9dcc4f5fb6d76d1e9ba22c3025a956d7e176024aa
 EBUILD mecab-skkserv-0.03.ebuild 823 BLAKE2B d381c7df93dd59a2a72fd5919d18ab1e3c35dfb316c3fe9968ff5ccb8f38e9eecb72ab3faf3a6942178c1676378db44b5c1374478f8f52cf2d786f616a89439e SHA512 66d8b8f387fa031891893f59f244c68200c2d0036758f87c67206f7471d158d52f3b0a24f3498fa4815aa515486f2605ba1010188a8b8e3c07cfec5e46402af8
 MISC metadata.xml 241 BLAKE2B d06d8c9218cb9736ecc414504678e9bff30ba6bffbd2b357e9a2ea990df4e73a21b8ad4db267eddfdbf73e8501dabe5a748c4ea9d26906d39425ab744b320216 SHA512 cff6b46a252b531091d1ef597e3f714f98d2ef4aa621662d8c2ec15e4f990cd811300d3439e1be003bd307d0c8d12e78f34cf7fd49f6d006d9362f0e6ccf6252
--- a/app-i18n/mecab-skkserv/files/mecab-skkserv-missing-strcmp-clang16.patch
+++ b/app-i18n/mecab-skkserv/files/mecab-skkserv-missing-strcmp-clang16.patch
@ -0,0 +1,11 @@
+Closes: https://bugs.gentoo.org/894518
+--- a/getopt.c
+++ b/getopt.c
+@@ -40,6 +40,7 @@
+ #endif
+ 
+ #include <stdio.h>
+#include <string.h>
+ 
+ /* Comment out all this code if we are using the GNU C Library, and are not
+    actually compiling the library itself.  This code is part of the GNU C
--- a/app-i18n/mecab-skkserv/mecab-skkserv-0.03-r1.ebuild
+++ b/app-i18n/mecab-skkserv/mecab-skkserv-0.03-r1.ebuild
@ -0,0 +1,42 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit autotools
+
+DESCRIPTION="mecab-skkserv is a Kana-Kanji conversion server using MeCab"
+HOMEPAGE="http://chasen.org/~taku/software/mecab-skkserv/"
+SRC_URI="http://chasen.org/~taku/software/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2 ipadic"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="app-text/mecab"
+RDEPEND="${DEPEND}
+	sys-apps/xinetd"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-cflags.patch
+	"${FILESDIR}"/${PN}-dicrc.patch
+	"${FILESDIR}"/${PN}-getopt.patch
+	"${FILESDIR}"/${PN}-missing-strcmp-clang16.patch
+)
+HTML_DOCS=( index.html ${PN}.css )
+
+src_prepare() {
+	sed -i "/^dictdir/s:lib:$(get_libdir):" Makefile.am
+
+	default
+	mv configure.{in,ac} || die
+	eautoreconf
+}
+
+src_install() {
+	default
+
+	insinto /etc/xinetd.d
+	newins "${FILESDIR}"/${PN}.xinetd ${PN}
+}
--- a/app-laptop/Manifest.gz
+++ b/app-laptop/Manifest.gz
--- a/app-laptop/mbpfan/Manifest
+++ b/app-laptop/mbpfan/Manifest
@ -1,4 +1,6 @@
+AUX mbpfan-2.3.0-clang16-build-fix.patch 273 BLAKE2B 92d11a6d902524085361bc801a8304d78ee44413016634f872f75dc6fea53959a8a893bfbb44d0fc4d6dbdccb9c666838f3dd284996fbb01ea729dbad4644d7b SHA512 d712c0a0e6b6e94b88d130fa11acfe4a73203b9cd5a4525bc1e635ca56e3d79dae356b2157e418a1b50564789836013f8f449a4d7c2dbb058242dfce84c5f318
 DIST mbpfan-2.3.0.tar.gz 40984 BLAKE2B ac593e94ee5915935767b221b3f8b29d416fadf3294b4930ba1b441838758c5014dc960c90e5ce35e3475793aaf68b2981641323dd9ea22dd50772cd54f75078 SHA512 676817d7d9b9e9fa866539d4b0e3edc8d0d22761807695961451fe1d5845c22031d45f53222d37c5ed967757b4cf80523a3af7d28084d9af11248798a463cdfd
+EBUILD mbpfan-2.3.0-r1.ebuild 1332 BLAKE2B 9a2c82c0ddca78cc0b712e6f322d098d0389d90c81ef1c797d133ae6f258bc4eee33b9f9c5b60c768ff44ad6171b2bcd7701eff4719118ab15132d75784dc1c8 SHA512 fff4e57a662a01e0b2a842d5f0a518e86b8af61d5abec2427eb4f2bdf96c6f4d32c9a01dd28b06cd56da47a07d0db5a46b915b9fb3cacd9dc97243301d158423
 EBUILD mbpfan-2.3.0.ebuild 1268 BLAKE2B 9b7f6dcd3bd869f12ebcad59d4a9793da704a1469f93353697b1185ec88253d0848f9a425a1a48402968d8252eabee8d978e7422096aafccc87c2863bcc1f6ea SHA512 a6a7a5d262e3dd4bcf6dc4bf5dae151493e35813533bad385858d3313a0883d2aa149789bf75b0e7a31da1a19cfc0d48eaee410e274dd648f0fbf7842c891bbe
 EBUILD mbpfan-9999.ebuild 1268 BLAKE2B d06dc087c6c857239069624770bdf8214847d44bc4f0156654e812666dd87fc2bcc2e3d04af0de513f655c58dbfcb6b3d57e919ef0adbf448aeede8352285780 SHA512 ced6de88ebfda6389f250234ed474373e64b759f970384f0866667e104e3760a14e911ca680ee286682e32deb6a3dbe78fee9cd6ac3210fbe60f91656a71a2ca
 MISC metadata.xml 690 BLAKE2B bde3ec1fac36fe5dd4f3fa628f16a7fb6fe64179ae8f9e8ee8edb651abec9da089d1e875db956931d4182d8975bd1de04c43104260e1bba04f01433f0741fe7e SHA512 bbec74e4ae64483001c35aa3963e9e681d63c4e6205b838b0dc0d952b461497c0ff3ad5d52e8714d1804f2935d4db8f69da6aa79b01964f0a6da99ed6eb5f89c
--- a/app-laptop/mbpfan/files/mbpfan-2.3.0-clang16-build-fix.patch
+++ b/app-laptop/mbpfan/files/mbpfan-2.3.0-clang16-build-fix.patch
@ -0,0 +1,12 @@
+Bug: https://bugs.gentoo.org/894522
+Upstream PR: https://github.com/linux-on-mac/mbpfan/pull/261
+--- a/src/util.c
+++ b/src/util.c
+@@ -1,6 +1,7 @@
+ #include <stdarg.h>
+ #include <stdio.h>
+ #define __USE_MISC
+#define _BSD_SOURCE
+ #include <syslog.h>
+ 
+ #include "global.h"
--- a/app-laptop/mbpfan/mbpfan-2.3.0-r1.ebuild
+++ b/app-laptop/mbpfan/mbpfan-2.3.0-r1.ebuild
@ -0,0 +1,51 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-info systemd toolchain-funcs
+
+DESCRIPTION="A simple daemon to control fan speed on all Macbook/Macbook Pros"
+HOMEPAGE="https://github.com/dgraziotin/mbpfan"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/dgraziotin/${PN}.git"
+else
+	SRC_URI="https://github.com/dgraziotin/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+RESTRICT="test" # will fail if the hardware is unavailable, not useful
+
+CONFIG_CHECK="~SENSORS_APPLESMC ~SENSORS_CORETEMP"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.3.0-clang16-build-fix.patch
+)
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	emake DESTDIR="${ED}" install
+
+	# Decompress the man page to enable PM auto compression
+	gzip -d "${ED}"/usr/share/man/man8/mbpfan.8.gz || die
+
+	# Remove the empty systemd unit directory
+	# It doesn't actually install the unit file
+	rmdir --ignore-fail-on-non-empty -p "${ED}"/lib/systemd/system || die
+	# Actually install the sytstemd unit file
+	systemd_dounit ${PN}.service
+	# Install openrc init file
+	newinitd ${PN}.init.gentoo ${PN}
+
+	# make install doesn't install the docs in the right place
+	rm -r "${ED}"/usr/share/doc/${PN} || die
+
+	einstalldocs
+}
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
--- a/app-misc/astrolog-ephemeris/Manifest
+++ b/app-misc/astrolog-ephemeris/Manifest
@ -1,4 +1,5 @@
 DIST ephemall.zip 4604012 BLAKE2B 0caee003272734a71a3f2d10871e1c034c9e9039f5cb0f09ed19d85122ba875794933d53624d6a379838a7f2c33728c2da9aaadbd91887fea018ecfc1c786557 SHA512 e7822cecb87466987107e84aae64d292dad31de9d2c268886869a37ea9e99bf81b2a530129c0f6538c6b55ad46b185e16ee0c5b0d8858acfe189f19e2595c6da
 EBUILD astrolog-ephemeris-5.40.ebuild 568 BLAKE2B 3a242b0e1a42141774fc58eac638cd8bee9f71d1dfee0de49369ffdd800aac01168956f30471246b25979de38dd0e3d752fbde7577a0f44ef964390941c31640 SHA512 58c9eb0512881ad47752e44d39d6bbef1f05f87b64229dce6be8e91370f290339190972d39d552e3ed29d0249b8dee13ee608b90be13257a7d97ffd02c863b12
 EBUILD astrolog-ephemeris-7.40.ebuild 608 BLAKE2B d7318b3966f6cac63047f77efc96774d348b4565ed63e464198703f8c72196e00ce69eb25697546d2e75cff3f74cf9ee327099f62bbcb41d60377616585891d9 SHA512 183d1f907fa811427f34d3732824a1075fe19c62ff6f9749e26666fa7382da4e216c346c3aa4e4927dfd09397b2278fb585f6cc6d6a50824925770b8ce2eff92
+EBUILD astrolog-ephemeris-7.60.ebuild 612 BLAKE2B b0156e7794613364c84eb1807e90fd77292158d1ccc101f00589f96146794b66a3076efed06b9fcf4d0d7798d89abaa2f505d67b6ccc27a6f796c3a2fd8410fc SHA512 8f2e9afd75ded9ed34716f0cbdbeb90ffb0ddb32b73f39dbd8aa08e6d188f4a98ee491bb1a91f5144897f461ea750937c37964a869eebe48d09742a5745909ea
 MISC metadata.xml 250 BLAKE2B 53ce4a2ec047c91819ecc665bad106707e80e4fbd9bd20cca22843c536beea3d124922de22b9c7986e39d232fb8b1f4752d4c8ee09933fe16383b475db861126 SHA512 667b310c205f016e11407f3e3fb0ad6fb1e530651b32da15e034523b0138e5fdf93b29d64311146bfdfa5bc5108f75e238136641f366e1e0b01e995ddae36aa5
--- a/app-misc/astrolog-ephemeris/astrolog-ephemeris-7.60.ebuild
+++ b/app-misc/astrolog-ephemeris/astrolog-ephemeris-7.60.ebuild
@ -0,0 +1,26 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Please bump with app-misc/astrolog
+
+DESCRIPTION="ephemeris files for optional extended accuracy of astrolog's calculations"
+HOMEPAGE="https://www.astrolog.org/astrolog.htm"
+SRC_URI="https://www.astrolog.org/ftp/ephem/ephemall.zip"
+
+LICENSE="astrolog"
+SLOT="0"
+# works fine on x86 - runs probably on other architectures, too
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+S="${WORKDIR}"
+
+RDEPEND="app-misc/astrolog"
+BDEPEND="app-arch/unzip"
+
+src_install() {
+	insinto /usr/share/astrolog
+	doins -r .
+}
--- a/app-misc/astrolog/Manifest
+++ b/app-misc/astrolog/Manifest
@ -1,3 +1,5 @@
+AUX astrolog-7.60-drop-resiters.patch 1354 BLAKE2B f986926b3ec4653bb17cb0363ebdf06896d68c140201a4ae714ba2aaf231717349c6e0426906e06561b1ef6f1e241d3b92d7020c357ecd438ebeeada617b9cfa SHA512 68bf5c0ade2c3cee96f198e3092930bff003e6913bfd5ae0fc16e7b381509f0bbb213c2d08009d4c9485e64be44293024a853b5efb19b837f700ffb292cb3593
 DIST ast74src.zip 4483648 BLAKE2B d15d3e5d98337c5c5884973d079cffda9144a5c9f43ab48dd38f782eeef089d9fd5fb3f5a01f1d607bd2134e6a774494d4cf7d99e117d3092c8787626436e778 SHA512 540bda7ee10cde0723f6bd4afe410e4e9c59168e31dbdbd0b3b62a9e77ae83a971543fc812876258e2b7b9636f880c74b9be5497c54e7dd0e9b444bad2edbf6b
 EBUILD astrolog-7.40.ebuild 1864 BLAKE2B 2e7e7b1902509516c193437dec820316e516c328ec44f5275d609990a512722909b0841b7780e86d162e0475275906579c978eea30503e42bd53c56d93e10a59 SHA512 495f9325356add4eefd40bb00c3c3271cf339b8304901f19fec0978893ef1891cc86372ad456e8653ce7b5447a0489126b9cb6fe059aecc648f3a1f527274c3d
+EBUILD astrolog-7.60.ebuild 1927 BLAKE2B dbef410b222c3b5490f87ec6a0b8c4113aac7f285bd92112509a0288604f09234fc9787176b0410d27ef84fcb1240eed049ec0c0b966971adccbb474e6fbbd11 SHA512 344871dde81b1ad19982cdab8e6d69b966889d3c1e19d2fa1d1a408d76fcb0844d4e4875493c7e5dd13efb79e4a5f6204ab601ea398bfb95ed1276e8df9801aa
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
--- a/app-misc/astrolog/astrolog-7.60.ebuild
+++ b/app-misc/astrolog/astrolog-7.60.ebuild
@ -0,0 +1,67 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Please bump with app-misc/astrolog-ephemeris
+
+inherit toolchain-funcs
+
+DESCRIPTION="A many featured astrology chart calculation program"
+HOMEPAGE="https://www.astrolog.org/astrolog.htm"
+SRC_URI="https://www.astrolog.org/ftp/ast74src.zip"
+
+LICENSE="astrolog"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="X"
+
+DEPEND="X? ( x11-libs/libX11 )"
+RDEPEND="${DEPEND}"
+BDEPEND="app-arch/unzip"
+
+S="${WORKDIR}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-7.60-drop-resiters.patch
+)
+
+src_prepare() {
+	default
+
+	# remove stripping of created binary, dump hardcoded CFLAGS,
+	# respect CC (bug #243606), and CFLAGS (bug #240057)
+	sed \
+		-e 's:strip:#strip:' -e 's:^CFLAGS = :#CFLAGS = :' \
+		-e 's:\tcc :\t$(CC) $(CFLAGS) $(LDFLAGS) :' \
+		-i Makefile || die
+
+	# we use /usr/share/astrolog for config and (optional) ephemeris-data-files
+	sed -i -e "s:~/astrolog:/usr/share/astrolog:g" astrolog.h || die
+
+	# if we do NOT use X, we disable it by removing the -lX11 from the Makefile
+	# and remove the "#define X11" and "#define MOUSE" from astrolog.h
+	use X || ( sed -i -e "s:-lm -lX11:-lm:g" Makefile || die
+		   sed -i -e "s:#define X11:/*#define X11:g" astrolog.h || die
+		   sed -i -e "s:#define MOUSE:/*#define MOUSE:g" astrolog.h || die)
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	dobin astrolog
+	dodoc astrolog.doc changes.doc
+	insinto /usr/share/astrolog
+	doins astrolog.as
+}
+
+pkg_postinst() {
+	elog "There is a sample config file /usr/share/astrolog/astrolog.as"
+	elog "astrolog looks in current dir for a file astrolog.as before"
+	elog "using the file in /usr/share/astrolog"
+	elog "If you want extended accuracy of astrolog's calculations you"
+	elog "can emerge the optional package \"astrolog-ephemeris\" which"
+	elog "needs ~32.9 MB additional diskspace for the ephemeris-files"
+}
--- a/app-misc/astrolog/files/astrolog-7.60-drop-resiters.patch
+++ b/app-misc/astrolog/files/astrolog-7.60-drop-resiters.patch
@ -0,0 +1,36 @@
+Bug: https://bugs.gentoo.org/894524
+Sent patch upstream, dev said they will take it in coming version,
+https://github.com/CruiserOne/Astrolog/pull/20#issuecomment-1666693982
+--- a/placalc.cpp
+++ b/placalc.cpp
+@@ -561,8 +561,8 @@ int hel(int planet, REAL8 t, REAL8 *al, REAL8 *ar, REAL8 *az, REAL8 *alp,
+ /* speed in radius, AU per day */
+ /* speed in z, AU per day */
+ {
+-  register struct elements *e;
+-  register struct eledata  *d;
+  struct elements *e;
+  struct eledata  *d;
+   REAL8 lk = 0.0;
+   REAL8 rk = 0.0;
+   REAL8 b, h1, sini, sinv, cosi, cosu, cosv, man, truanom, esquare,
+@@ -686,7 +686,7 @@ int hel(int planet, REAL8 t, REAL8 *al, REAL8 *ar, REAL8 *az, REAL8 *alp,
+ }
+ 
+ 
+-void disturb(register struct kor *k, REAL8 *al, REAL8 *ar, REAL8 lk, REAL8 rk,
+void disturb(struct kor *k, REAL8 *al, REAL8 *ar, REAL8 lk, REAL8 rk,
+   REAL8 man)
+ /* ENDMARK-terminated array of struct kor */
+ /* longitude in degrees, use a pointer to return value */
+--- a/placalc.h
+++ b/placalc.h
+@@ -256,7 +256,7 @@ extern REAL8 test_near_zero(REAL8);
+ extern REAL8 deltat(double);
+ extern void to_mean_ekl();
+ extern int afl2planet();
+-extern void disturb(register struct kor *, REAL8 *, REAL8 *, REAL8, REAL8,
+extern void disturb(struct kor *, REAL8 *, REAL8 *, REAL8, REAL8,
+   REAL8);
+ extern REAL8 fnu(REAL8, REAL8, REAL8);
+ 
--- a/app-misc/dvorak7min/Manifest
+++ b/app-misc/dvorak7min/Manifest
@ -1,6 +1,8 @@
+AUX dvorak7min-1.6.1-clang16-build-fix.patch 1222 BLAKE2B 9d5ab537aac82319080fbb0f5b3ccda46f636b270cfdb7001014ee552c6813ae58ada1ceced5cc11296cf875cf452822d56b7c53b341fcbb3040df45f5ae7033 SHA512 1e85d45252b136759d129f5357fd7991033cc5ee2812242adebb96692bda822a34cf92b520c3e3773aae8fe14b2a3e391762a44aefb5e24266fdc36deabf0e99
 AUX dvorak7min-1.6.1-debian-changes.patch 7956 BLAKE2B 77396f83105259f53556e6e47bc15291be00d7a822c5eecb52e95e525e10ee24f3a7cc6c731954de3b9a4228980bedc45b84f90c139c915766a53804a376f763 SHA512 274d9a33b59e18de206431b2fb4f1f37342b27dd4accb37dc16ee5470f4c6163f55c82d8b3466894ac20f3470d65ba05e8f332b0b489dc27814bcfe4270d4115
 AUX dvorak7min-1.6.1-makefile-flags.patch 684 BLAKE2B 94d9a24871d88f3d18e8804b3f09f5435dd1e5c4f084322dff2bb40213dfafd1ced7c931adc439b0ab8e089f080254bdff7dc58a7efc77b42da037ed10c9cfb3 SHA512 173858e4daaba8f6f764f4c9cb4aa8e7c6d513d1dff8bc3e2753a969bad15fd4d1a9e91a7da3b9a9353c67c40209b3f316d7f4394042329205d0d80dc9e1454c
 AUX dvorak7min-1.6.1-ncurses-pkg-config.patch 608 BLAKE2B 0541105aba889a65ed74dcca7696a5bc0fb983778cd81cb7225317b25e17d7bac856ea325f4eed0e1724588d7d7d2fc1a271b7a2ccbc2263d565eb63b24aa7cc SHA512 85e2a05b6ec78be488c3f5bc1a29286a4fbea08bae69f0cbd1901c5f3c03de9d5340900bb898316da61277f66b6ff0a209cae66b029ff5b57166af6ddc320542
 DIST dvorak7min-1.6.1.tar.gz 53115 BLAKE2B f884f1900a7de0422f076e3701f7b982d5c5cba70ae1805bd3540ebd109e9bbaaa9e439272ac530862eac9dca2c0ba67b1d0040aa58294b5cabba2fa126d04ae SHA512 17ed601f298673a51d73b2efeb1555d91337f34cfbcc099a71c11de38fecdb29747de9533abec9028c3abc9f04dc9090e4452bba1c53cdac8d65e86a760e8a7a
 EBUILD dvorak7min-1.6.1-r1.ebuild 822 BLAKE2B 0c6f7136df13e84db9661e73fb0b7cc89b4a46bb6118939606a0ea2a358e0e508cf29158fe5a3754a1111c1bcd40d371913fddd08d920b51a3cee4fdcb8bbaf1 SHA512 819ba083b42db6751cf69f32e48a074e6b74b5e283ee2edc73ff7ee0d989e381543bd674d910799787d6642719a747a211a83753cf83edd199036c3cb714976b
+EBUILD dvorak7min-1.6.1-r2.ebuild 876 BLAKE2B 35ce3379e0620a76c519fd7f2322d795381e3e2a6e8c5258417dd3e0346f33943ef631e2ffb0c085768a670abca3ee56ac148e140b7919fbbc38cbd600a3cd10 SHA512 98d337b2cc2541f548f576e0384d21031b29db5028644e70918a8dbf63ac5b725bac2dae73f79bef07a9c862bfc9c3d0ee2b40f74cfad2cc169369bf015c8a9a
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
--- a/app-misc/dvorak7min/dvorak7min-1.6.1-r2.ebuild
+++ b/app-misc/dvorak7min/dvorak7min-1.6.1-r2.ebuild
@ -0,0 +1,38 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Simple ncurses-based typing tutor for learning the Dvorak keyboard layout"
+HOMEPAGE="http://www.linalco.com/comunidad.html"
+SRC_URI="http://www.linalco.com/ragnar/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="sys-libs/ncurses:="
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.6.1-debian-changes.patch
+	"${FILESDIR}"/${PN}-1.6.1-makefile-flags.patch
+	"${FILESDIR}"/${PN}-1.6.1-ncurses-pkg-config.patch
+	"${FILESDIR}"/${PN}-1.6.1-clang16-build-fix.patch
+)
+
+src_compile() {
+	tc-export PKG_CONFIG
+	emake \
+		CC="$(tc-getCC)" \
+		PROF="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	dobin ${PN}
+	dodoc ChangeLog README
+}
--- a/app-misc/dvorak7min/files/dvorak7min-1.6.1-clang16-build-fix.patch
+++ b/app-misc/dvorak7min/files/dvorak7min-1.6.1-clang16-build-fix.patch
@ -0,0 +1,29 @@
+Bug: https://bugs.gentoo.org/894546
+--- a/dvorak7min.c
+++ b/dvorak7min.c
+@@ -41,6 +41,7 @@
+  *  
+  */
+ 
+#define _GNU_SOURCE
+ #include <strings.h>
+ #include <string.h>
+ #include <stdlib.h>
+@@ -435,7 +436,7 @@ void do_text (char * const text)
+ 	     timeCurrent = time(0);
+ 	     speed = calcSpeed (timeStart, timeCurrent, hits + misses);
+ 	     // Use WPS/WPM as better standards
+-	     mvprintw (LINES - 1, 0, "WPS %.2f  WPM %.2f Hits: %d Misses: %d Seconds: %d Ratio: %.2f%%", speed, speed * 60, hits, misses, time(0) - timeStart, ratio);
+	     mvprintw (LINES - 1, 0, "WPS %.2f  WPM %.2f Hits: %d Misses: %d Seconds: %ld Ratio: %.2f%%", speed, speed * 60, hits, misses, time(0) - timeStart, ratio);
+ 	     clrtoeol();
+ 	  }
+        } while (ch == ERR);
+@@ -521,7 +522,7 @@ void do_text (char * const text)
+     } else {
+        float ratio = hits - misses;
+        ratio = (ratio < 0) ? 0 : (100.0 * ratio / hits);
+-       mvprintw (0, 0, "Elapsed time: %d seconds", timeFinish - timeStart);
+       mvprintw (0, 0, "Elapsed time: %ld seconds", timeFinish - timeStart);
+        mvprintw (1, 0, "Total: %d  Misses: %d  Ratio: %.2f%%",
+                  hits + misses, misses,
+ 		 (float)100*(hits) / (hits + misses));
--- a/app-misc/fastfetch/Manifest
+++ b/app-misc/fastfetch/Manifest
@ -1,8 +1,10 @@
 AUX fastfetch-2.0.0-dont-fetch-yyjson.patch 843 BLAKE2B dc37cb21096ea415fa806265081f33fc48e735fe29b7ff5b742368aac6218bc9345145a81394d2936ca23c0e7fee05dd50a32ca3feb7182c3e11b8a833a6017d SHA512 c3a41cd0ed3b33b9ebc3bc9876c7db6ae9c71b8dfac7e92259a09372d059fcb032c6a34c10791758583b810de0f6db21c1ba8426e3611ae67ee97836329109cf
 DIST fastfetch-1.12.2.tar.gz 538194 BLAKE2B bc6badbc7f690dacbe1408479286a0d42ec687526f776ff4d2ec7b0eb767032e5781cbbe37778f4dc03a5d386979a9ae2aab84c466be997b82d9a9a6c81ea78f SHA512 a82a7c7ae365335c20d659a82215cf320c4c6b07ff127c4dad322a0a01f7ec57e34d229f4953108daadcd0d243c84f8504a3b4367df5e255e5a06e685fd6739a
 DIST fastfetch-2.0.0.tar.gz 663049 BLAKE2B 5836a04bd0cec14321810e5512d136b02b1aea68eb5a481a79426b9eef75dcf2c93008a6ac9b7877ce1a3b2758b4d53ddc52bd7b2fca0faad26834281f5da954 SHA512 bdd440130314b7865391b74105871842fb5241d858b5808a5e2e9091f1a2f7cdad4ff485d92bb6108dd4b3d09a847adbf4c90493623c974902d8d9bcf2abbc81
+DIST fastfetch-2.0.1.tar.gz 770261 BLAKE2B e3998bf4ad38d67d3831481d14378eea3097aaddf3956b1e962f91c573db30faca17ac1621b9a7b662bcca23fab654656336c9ec0c179f4f587e70986de5bc47 SHA512 c65bf027b58ddf6cde961a1cef0d147e3cdba3a4fd844de6b88639d556b84811ccfeb7e4601094e60309779232553b1387f255a612971bf0f05ed7cc0381f4a6
 EBUILD fastfetch-0.1.9999.ebuild 2964 BLAKE2B 273947170f50ecb9629efdf10027a7b6af5c98329470f97f7078e0082f8b128e9bf428c4d82b8df52a09d3b96fdc88d8c1bff79719838effaac43aacb32f7b00 SHA512 ead9d649523d9ec049bea90516a04f1fb2fc43618e4592f8faa8e0b309ac783e798baf0ccafc89ddd4a3cb23338f2544df65be4ca41f590048f53fc2d78d1028
 EBUILD fastfetch-0.2.9999.ebuild 2884 BLAKE2B cb3aba85dbd4ea7a8086d6bfd35ac053a6893f17cbbc8b916fa514f575c7407a0e68359b09d66243d52b4276d1d67f584eb41c46066542d5548610f4bc27b285 SHA512 40707f326072cff867587a0ba82f26ebd203920a3d2b4d9668f26ca9c0d4152a05555c2e6975fd1ecffa8ab8fea8a8cc4f975bf02a9113de781fd51969e3e5d8
 EBUILD fastfetch-1.12.2.ebuild 2838 BLAKE2B 1185a5c20a06bf6e6112f4cc8942eb10ff403f7db2a4edabc1264db19448cfd992da044619b767751bd3d25d1759a6e6a8440aa529e058226adfec8cbfc400b8 SHA512 47b8b945db6391ba18a7fd93c0a9c6d53ccf1d0ede37538dbcb5ed95975f3691bd3f87492860e5e61727aa020ba42acd18ef4e27ffa9b21dfaae10fea9e94752
 EBUILD fastfetch-2.0.0.ebuild 2964 BLAKE2B 273947170f50ecb9629efdf10027a7b6af5c98329470f97f7078e0082f8b128e9bf428c4d82b8df52a09d3b96fdc88d8c1bff79719838effaac43aacb32f7b00 SHA512 ead9d649523d9ec049bea90516a04f1fb2fc43618e4592f8faa8e0b309ac783e798baf0ccafc89ddd4a3cb23338f2544df65be4ca41f590048f53fc2d78d1028
+EBUILD fastfetch-2.0.1.ebuild 2930 BLAKE2B 191e9b4f8d03c1177434400513c120e9aa9bdec4eb49574cfda81c7d2e496665641e2e399d7a1b3b6e25368e4a2e74a5b64bca564aeb05e4ab96f24ddb976194 SHA512 edb5106bbc12ee018798c00affb5b72464091094439efc08377ef9686a3a88076df9f3744b2dfdb9d42f771c93205d57c06b4025fdb6f14c4d27ae885eda7b7e
 MISC metadata.xml 1159 BLAKE2B 967449a1aa6e5baae193e105181c750b35eba83ab0a9586e6ce461e158e59a1184f67d765e19ea3a4f0602b7be17f777fb2d30d11d123dae26163f7fc9440d57 SHA512 595cf9a0b99e97fcb4396807473545c4f59cb129013dfe0adc6885c60d7ea47e72cf4aef1df01f7bd8328ec6e89918980a2ecc69700923f099b1a7e573a83731
--- a/app-misc/fastfetch/fastfetch-2.0.1.ebuild
+++ b/app-misc/fastfetch/fastfetch-2.0.1.ebuild
@ -0,0 +1,105 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic
+
+DESCRIPTION="Fast system information tool"
+HOMEPAGE="https://github.com/fastfetch-cli/fastfetch"
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/fastfetch-cli/fastfetch.git"
+	[[ ${PV} == *0.1.9999 ]] && EGIT_BRANCH=master
+	[[ ${PV} == *0.2.9999 ]] && EGIT_BRANCH=dev
+	[[ "${EGIT_BRANCH}" == "" ]] && die "Please set a git branch"
+else
+	SRC_URI="https://github.com/fastfetch-cli/fastfetch/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="X chafa dbus ddcutil gnome imagemagick networkmanager opencl opengl osmesa pci pulseaudio sqlite vulkan wayland xcb xfce xrandr"
+
+# note - qa-vdb will always report errors because fastfetch loads the libs dynamically
+RDEPEND="
+	dev-libs/yyjson
+	sys-libs/zlib
+	X? ( x11-libs/libX11 )
+	chafa? ( media-gfx/chafa )
+	dbus? ( sys-apps/dbus )
+	ddcutil? ( app-misc/ddcutil:= )
+	gnome? (
+		dev-libs/glib
+		gnome-base/dconf
+	)
+	imagemagick? ( media-gfx/imagemagick:= )
+	networkmanager? ( net-misc/networkmanager )
+	opencl? ( virtual/opencl )
+	opengl? ( media-libs/libglvnd[X] )
+	osmesa? ( media-libs/mesa[osmesa] )
+	pci? ( sys-apps/pciutils )
+	pulseaudio? ( media-libs/libpulse )
+	sqlite? ( dev-db/sqlite:3 )
+	vulkan? ( media-libs/vulkan-loader )
+	wayland? ( dev-libs/wayland )
+	xcb? ( x11-libs/libxcb )
+	xfce? ( xfce-base/xfconf )
+	xrandr? ( x11-libs/libXrandr )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+REQUIRED_USE="
+	xrandr? ( X )
+	chafa? ( imagemagick )
+"
+
+src_configure() {
+	local fastfetch_enable_imagemagick7=no
+	local fastfetch_enable_imagemagick6=no
+	if use imagemagick; then
+		fastfetch_enable_imagemagick7=$(has_version '>=media-gfx/imagemagick-7.0.0' && echo yes || echo no)
+		fastfetch_enable_imagemagick6=$(has_version '<media-gfx/imagemagick-7.0.0' && echo yes || echo no)
+	fi
+
+	local mycmakeargs=(
+		-DENABLE_RPM=no
+		-DENABLE_ZLIB=yes
+		-DENABLE_SYSTEM_YYJSON=yes
+
+		-DENABLE_CHAFA=$(usex chafa)
+		-DENABLE_DBUS=$(usex dbus)
+		-DENABLE_DDCUTIL=$(usex ddcutil)
+		-DENABLE_DCONF=$(usex gnome)
+		-DENABLE_EGL=$(usex opengl)
+		-DENABLE_GIO=$(usex gnome)
+		-DENABLE_GLX=$(usex opengl)
+		-DENABLE_IMAGEMAGICK6=${fastfetch_enable_imagemagick6}
+		-DENABLE_IMAGEMAGICK7=${fastfetch_enable_imagemagick7}
+		-DENABLE_LIBNM=$(usex networkmanager)
+		-DENABLE_LIBPCI=$(usex pci)
+		-DENABLE_OPENCL=$(usex opencl)
+		-DENABLE_OSMESA=$(usex osmesa)
+		-DENABLE_PULSE=$(usex pulseaudio)
+		-DENABLE_SQLITE3=$(usex sqlite)
+		-DENABLE_VULKAN=$(usex vulkan)
+		-DENABLE_WAYLAND=$(usex wayland)
+		-DENABLE_X11=$(usex X)
+		-DENABLE_XCB=$(usex xcb)
+		-DENABLE_XCB_RANDR=$(usex xcb)
+		-DENABLE_XFCONF=$(usex xfce)
+		-DENABLE_XRANDR=$(usex xrandr)
+	)
+
+	append-cppflags -DNDEBUG
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	rm -r "${ED}"/usr/share/licenses || die
+}
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@ -1,10 +1,8 @@
 AUX mc-4.8.26-ncurses-mouse.patch 612 BLAKE2B ba3324dfee320a6c08c65ec8bf7784075f8a36c111ffa75129251674152cea68cde87844d5849c82111d4fad779c1d13992a7d765c4bc48b39d865ab1f89cbb6 SHA512 f97025ad7b3719b372368028ad9428e0cac67069d04e70b2e2923dd998a9f687f0807254bdc859218869e1666db80807fd53c19291e2921b420bc357e79d9406
-AUX mc-4.8.28-tests.patch 1308 BLAKE2B 37f2d2a3264386d558212741d95c68c9362676d727d4d2b47a690dd6ad97c15ff943b3950cc28456ffceda78e88645bd6f73958a592f425594e727cc383721cf SHA512 41499d5ee4a7d0bf3e08c6fad56c2d46e3761f4f7359db1351c4ca1358a9ba33be7979df55d19263214acb3ea01271278efccff72d32ea3cf8a3cfb84a964f47
 AUX mc-4.8.29-autoconf-c99.patch 849 BLAKE2B 7d9eb9b7f046dac592dee09e3598620c61167365aefb41186f4d60b803f17cf151280b9bf5facef7101f5297d9faa3b269c9b759095ad6bd01f79b4a8ee38211 SHA512 983de54aa05b09c9510945f4c3b83231779ee24808ec2cbbb2ce0e2b5743bb120d85edf0e9bd0d78e5aafb42601272997c2bcef9fb606de9e043d9619eba4485
 AUX mc-4.8.29-gentoo-tools.patch 413 BLAKE2B 53e3f8e5e711374bbc5e3bb868df5e3345eed8f8de4ec3cac486b63c210bb10e6832b60292c614b4bd5c65ae750c5b2c38430ac1da2c9f6febb2b686199463ff SHA512 38598f57f4905659bc5d69f4ae19510ce35e76c8e33fc5262c5c8d17742483ebd5aa61ddac29a5811e111fe8ca66e6418fa4d48567e3a4e7ec4406916834c6fa
-DIST mc-4.8.28.tar.xz 2333072 BLAKE2B f4218e6c166df85b7b3736f0fd1414c9507c72074f06001f12b114ce6c6fbbf3688ab850aa70f5063eb3920736f878e113eb39a5d261ccfc3ffa9dab473a8436 SHA512 ca3b3a57281e9387cb52bf1fcfc3f39a4d5f438aafc256dc492c192678824f67c983a852c759664efc5bc6d0de471c9b3929834f8301f6302ca1ebeee513fdfd
 DIST mc-4.8.29.tar.xz 2368164 BLAKE2B 0ecddf33b4b7b32918484bc7efe15ef1c9dda094814c85ceabf1b4bd9343507a33932b8cd050fdae2e683f9815ab6dd802ff8eb8e2215c6264be073bc5ac7e4d SHA512 c7e219eda34197d0294748cf5fd1a5dcfedfc17c20cfcf94c4dad5170f87095845f4fc0065e2868342125039c13cc3ba617804df74186816828e93ed71c1e9a3
-EBUILD mc-4.8.28-r2.ebuild 3115 BLAKE2B 733622aa4e6674702e3b691d9d9c8153ffc6c5bf3eada7b5a96535d7f1f2990d811ea1c1e29178cd9f14bb568acdb2a873b6fd9bb976d3ebe9b35f8f2dba01b0 SHA512 105c26047006b516c5a7b657cd309a924c78590793cfe523723022d2560a4ed37b6021b63be41b9885baffa7a39164e2d84d3442e7de49c7a11a72985e2501dc
+DIST mc-4.8.30.tar.xz 2380824 BLAKE2B 2bf759314abae39db7596426cba22f6eaac0efc58e7025f1a7ef1863496ea7a3c00d298d101123b9defb109e76e31fe988227fb5c1112e06051b3c7a5b3dc1b6 SHA512 f793f744eaff236c9952d477236dd775a24d9ddd7ff46940bfe2d06da5596bed91d6bd9c85250696da6dcdc0a1890dc01c736654df3f59039674eff38e12e68e
 EBUILD mc-4.8.29.ebuild 3169 BLAKE2B 45799991a3957bcfbce629af833b917cce30b72e8a1cdea82109f2277db5decc2d834b514917daccc0732409fb39fc9ae99f4a7200e8aa984ee2ea00d2d7fa77 SHA512 de440cd97097d9e0d90fb6756da921e51ddf56f682991bd49a5b4ec966bf230f7d0d4cdbb3d302d2621b801c2b8cc6328524fe5002dc4df13d35cbcafaab78c7
-EBUILD mc-9999.ebuild 3379 BLAKE2B 795bae9d8f9ba6bf14592a5ba6479c7b2f665bc56371269ad90b3603ccd54d4d0b8a26afcb57fb51476b89f742549b959b1ac8a9fcba0f3c6492360324f73866 SHA512 c8213de7aec56537d0225e76500b68943f3f9ac528251f27c3edc4296a6e25ff6c637a356e887dd1897dd3614fb8da9021871a1e17171ecdfd8bf7b8e955b7d1
+EBUILD mc-4.8.30.ebuild 3130 BLAKE2B 24786f5731c6e065f8f5abe9f1b971ac929dcc1eca66a8bdaebdc1e018a179506397f2d579e24bc50cb9a94d443cfa9cec80bd9ecdccef8c7a8eecf0132fe11b SHA512 51afba7b677296aa2ad847331512be954f555c2da01dc6269863873026c4a151f895ea5d35ee4b1902065e9e4a48707b62fa42140fe83d7331f43d4bbf11d01f
 MISC metadata.xml 623 BLAKE2B 780b4f47a79d96cfe18308032aedcf02040eb3b2b90a3241dc1a26d03c1fa6e801144b9a343731b96c9cde2554a34ed52235859851025fd074675fdb1f7c91d9 SHA512 85ab83892b0ad219dfc1112e1d3f2141c186c8cc1b274fd397a34bf68345a0821d3cf5a5421f9d6053e7e99178aa45724e1057a9386e4bdf9c5136d69232e776
--- a/app-misc/mc/files/mc-4.8.28-tests.patch
+++ b/app-misc/mc/files/mc-4.8.28-tests.patch
@ -1,35 +0,0 @@
-START_TEST uses the variable name _i, so GCC complains about redefining it with
-a different type here.
-
--- mc-4.8.28/tests/lib/strutil/filevercmp.c	2022-03-20 10:02:47.000000000 +0000
-+++ mc-4.8.28/tests/lib/strutil/filevercmp.c	2022-03-27 15:31:19.812120141 +0100
-@@ -353,20 +353,20 @@
- START_TEST (filevercmp_test5)
- /* *INDENT-ON* */
- {
-    size_t _i;
-+    size_t ii;
- 
-    for (_i = 0; _i < filevercmp_test_ds5_len; _i++)
-        for (; filevercmp_test_ds5[_i] != NULL; _i++)
-+    for (ii = 0; ii < filevercmp_test_ds5_len; ii++)
-+        for (; filevercmp_test_ds5[ii] != NULL; ii++)
-         {
-            const char *i = filevercmp_test_ds5[_i];
-            size_t _j;
-+            const char *i = filevercmp_test_ds5[ii];
-+            size_t jj;
- 
-            for (_j = _i; filevercmp_test_ds5[_j] != NULL; _j++)
-+            for (jj = ii; filevercmp_test_ds5[jj] != NULL; jj++)
-             {
-                const char *j = filevercmp_test_ds5[_j];
-+                const char *j = filevercmp_test_ds5[jj];
- 
-                ck_assert_int_eq (test_filevercmp (i, j), 0);
-                ck_assert_int_eq (test_filevercmp (j, i), 0);
-+                ck_assert_int_eq (test_filevercmp (i, j), 0);
-+                ck_assert_int_eq (test_filevercmp (j, i), 0);
-             }
-         }
- }
--- a/app-misc/mc/mc-4.8.28-r2.ebuild
+++ b/app-misc/mc/mc-4.8.28-r2.ebuild
@ -7,7 +7,7 @@ inherit autotools flag-o-matic

 MY_P="${P/_/-}"
 SRC_URI="http://ftp.midnight-commander.org/${MY_P}.tar.xz"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"

 DESCRIPTION="GNU Midnight Commander is a text based file manager"
 HOMEPAGE="https://midnight-commander.org"
@ -49,7 +49,7 @@ S="${WORKDIR}/${MY_P}"

 PATCHES=(
 	"${FILESDIR}"/${PN}-4.8.26-ncurses-mouse.patch
-	"${FILESDIR}"/${P}-tests.patch #836812
+	"${FILESDIR}"/${PN}-4.8.29-gentoo-tools.patch
 )

 src_prepare() {
--- a/Show More
+++ b/Show More