Sync with portage [Sun Jun 18 19:28:34 MSK 2023].

2023-06-18 19:28:34 +03:00 · 2023-06-18 19:28:34 +03:00 · 9a36552848
commit 9a36552848
parent 27dccff647
13491 changed files with 47346 additions and 38488 deletions
--- a/30
+++ b/30
@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512

-MANIFEST Manifest.files.gz 29285 BLAKE2B 4b03b2a1b853e52a341756ee4f1166bf31ae99ab312fb9c77f6ef5cab404c54b606ca32e9cb8d0ada12a7c47fa6825452512c28653585163731cd01d309147bd SHA512 1313e6556ad6a6caa773f08c4e23b9f765efb5e4e07fcd80b4b21403feef08d37eabb3fe5f4bd66defa2f06b7b490e17bcb992db5f8aa65adbf3d20d16ec6015
-TIMESTAMP 2023-06-16T12:09:53Z
+MANIFEST Manifest.files.gz 29276 BLAKE2B b3e7dfff9ece5443098b7a091a9d1572eedc58ec4b50d215ae7eccf7ba9937e13bb7ad11c0d116cff9faad68e892b14a85bf30d046fc89127961fc836832f310 SHA512 32f5dbb750676fb96c02e71d5ef4c1f85ad0fed9a42b8720bfe337f8aa38d3c86e588bc444f07a90d2dca1d40d6eff7ec703627d126dc2ed55338114ba8c9ae2
+TIMESTAMP 2023-06-18T15:39:59Z
 -----BEGIN PGP SIGNATURE-----

-iQKSBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmSMURFfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmSPJU9fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAypw/zBdsuATGooKHhn+9gtyUnavFa1eWFZ9VswAoyhMp8ALiOb5WfZa2eREKB
-mdxJobiE3Bcjk8eUI0zoPOaYRi3IS4XRr/WoaGwTYRrSDM0kj7+jgLwFVNUZ/dac
-qUdq6wiUSDgZYK9AbgVMtN0V7bGlG60DEr1Kk+NgiH0FWiqz+8wi+nBUIezGCTnM
-4+cH9R0cszgO/Rp51HwBqtq6u1WXjLBEN4jlV/56AOrdwwHiM/LKg0sEnd3TM9Ms
-zI3QnHLRyaMzzmO3QT+Z2y6f4vRH4FC7sZtj6eU5Z+B8rZaYvml6qVnET8+3xELg
-4jXCljFvMF3bKNqtiFOkgih8Ax4YonhOcM191FCA2gnHFY7htYcxA+CsjQ/Xk7jv
-BgWkL3r1DKNqVVq64iVSqNXfazKIAP1fkMIUqe+/Cm94SBC2cCmE0Q7nTXrE41nz
-Qo7meB8ggK6QXqsCp7MxbpxghYfq+vzLN/T7DQ7jjvKYqj7yVOYt0d/vRy+tXZhU
-5xUofG5e15/LVAIHI5AjrurOBByjrWIk2d8hMOI+W2VGgbEVWY4TG7a4asUXL1bv
-ZPUc97283Sya6X6LvgWo33naKj8D0787/6RJfY31lAsSZRuDeKFNzPKet3Se0w+l
-xwoJlG8UIzjfyKBbNpaF52j3bGp7EBJxJAi6n05iXKFrngCnJw==
-=+fbZ
+klAhzQ//V38Q+TwUwHjEMalw9CC+OozYvgECva9SvqdHPkYpedjixMHH54vWRtnd
+QrNTSGJCiqUE5zoVYjaVBplj7XzOz8dnT+taWD1OzFwFrQOKDy3e7M3g1Sy0b/C5
+QBaSdgGF3Wslre79SK3Qq0x0WHM3ldu0mz+5yQreXPifcPOfLMDZ2gzoMaZVJ0TD
+6Ak73j1gtWlKOAOu7yodLK/OvHaYYogUnSfngRbbTAHhyasHvis5RPZGVo2dF+9Q
+TmJqNK9NjGFlyLGOELQannfuFFVQSap4YLXOVPAa3HzbSETR36u8oJZpipC067l2
+wIyJDFxcPFpjPteTkRJzPdhyRgVENlgf1fhHdN8iX6BkwhTz5nLAztg/TPfTPINk
+Wm8VrdCFUev6a3YhmCH8PoTm8UoQoTR4bNlxWMh1WWt0dwfFW/9d8GH+b5PrgbXz
+MJGKRk9zyQAGq9cZq5Whu2+szNdpxUqD4lEUu9xYjnOqBIzu3aUuulIsn7I+VFhl
+ZGphKPhQYTylQN3/eZftlXJbXQ/BrokY2Lnk1FJzkip7AAdt34TzU7iE/kZW+7a/
+9iD5vcSbTTTgRnGrbnN0uuQ6MY1SfuvEa5Pr6r2W1mOS7Np1yYh1diZJjfEDY0qX
+I0xikMky94DaMnpyp2wYZw77kFArtyMZbd1u6zWU1Gf19qMGHSQ=
+=XG5a
 -----END PGP SIGNATURE-----
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
--- a/acct-user/Manifest.gz
+++ b/acct-user/Manifest.gz
--- a/acct-user/portage/Manifest
+++ b/acct-user/portage/Manifest
@ -1,2 +1,2 @@
-EBUILD portage-0.ebuild 232 BLAKE2B 40cb9f06a9ccd9f642a6b9a13ca6c85da337650ebe71843d3d84ba56f5e098a2451b62ffc8442dd0062b3c6ef9fb742796873346118412ca24fa64acb936d6d0 SHA512 0d4c30d57aec011970e7a5230b7a2ef9fe50eb5fdf1b5212fd88e3fb274424b01316ef8f8b552130d4c125f09771d8efea2a04336bf7c7cec6731f3b67ce6120
+EBUILD portage-0-r1.ebuild 237 BLAKE2B 50da337688798807174d65cdcbba8c5a19ec25ee9eee41a5a23127e48005a281d41a54281575d7afd7cf943fab6b258ddbc58c4fede601739a1d8d96e53f6ad8 SHA512 eababbb04a4d3887accc2aa003f5e099cd37f7580535e481829a36ce10dbed887d95b78d9fdba651daac10f19bb4e71866853bc1e60601eccb0126585df348f2
 MISC metadata.xml 224 BLAKE2B b8b01962c2bc1d5abaad41f5f9c1af011244a3a3c73ca8544a532a151b5afd90cd1a423ff4d796bd9dc76ac7504a385a850c5f6ceb4c8a5d76e44aa52452d24e SHA512 fa9628394e8600bac8ce6f6f75926875f02d5469f9f5e33f4ab3180504d1a4f614a72973fffb21513b73bf93e22e97d03a4b3fa5360c52e322a0d2919e1f47ae
--- a/acct-user/portage/portage-0-r1.ebuild
+++ b/acct-user/portage/portage-0-r1.ebuild
@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
--- a/app-admin/ansible-core/Manifest
+++ b/app-admin/ansible-core/Manifest
@ -6,6 +6,6 @@ DIST ansible-core-2.15.0.tar.gz 10801327 BLAKE2B 58d92d3d8cbc87d9c2c606317bae3b6
 EBUILD ansible-core-2.13.9.ebuild 1306 BLAKE2B 6305f4d4d83b581a94f7bb9e8501e541327c489215eeb2db26dd99086d25b8109a4cba21f982c67f04e978b7fd39d46a0ddb922ec503e60d6ff967ee1fcb9a18 SHA512 96b4ed14b611917f26c5eef7a618c9b6aeb3d84eda44f3292bdc448d50259a4c8618137ab655f326f49824695e0fb8e057109e68b5129c89e1d05df75e868958
 EBUILD ansible-core-2.14.5.ebuild 1351 BLAKE2B b00902f00b8f1371777e41651460ecd2925d20a165ee8e491ff7e4d7cd902d380eed501556bc8c393e2236f79818eeffff05f8e2f093408ca61cee70d0ee8642 SHA512 94e9821734f241f745301bea4676c7d7aee48628d61b910cd694d6d541a660fe226bf9e5b50129b5263221ef9986898f656831a63531ada6916ba63d4b620724
 EBUILD ansible-core-2.14.6.ebuild 1354 BLAKE2B b338058c316d4c5ba00e2af886f80b0d30e2d35b21e7c761a9ae4c07a0a538f04980c19de72eb19f8a3267482c3c6a50b8a3bdaaca42c101e84cae71439f53d7 SHA512 fb2b58338c253cde83c375882cc648a8dc7930408f3e235b146144b067ce754f2bbfcb8e1de8429e13d2eb693fa68f7bac89cbe1861c10424d26057ebd020936
-EBUILD ansible-core-2.15.0.ebuild 1309 BLAKE2B 5288758a95f5be33854ed6093801b954adbd067213b825eefb2ac56945f15cef99aae4d82e87de8af26b48068b0a98f424a12861efff111c2007e2f1f1d61420 SHA512 c9c81036d86440c692ccf304c229caa8929d1e34519831d62b627141192d33cf832462b3ef2fbe65ac8351f4b56cd3b3f898e0c829b45b5440a0753a88f0fc1e
+EBUILD ansible-core-2.15.0.ebuild 1306 BLAKE2B c77afe15bd0127bc975a099bd4c9989b71c78cb3b5159d79cf9f105d5189f3aa80615d7ab32827f98a0215aec31a94ac11efe433e461e60be1baf5dddb3f72ee SHA512 e374e539dd6f49bcab15a502d6ef7c4c31643ca1161992745517d1e08727d4f48beaf067209133908eef904ccbd054cd81ce2fa97639394d033ea94c1c3eb535
 EBUILD ansible-core-9999.ebuild 1309 BLAKE2B 5288758a95f5be33854ed6093801b954adbd067213b825eefb2ac56945f15cef99aae4d82e87de8af26b48068b0a98f424a12861efff111c2007e2f1f1d61420 SHA512 c9c81036d86440c692ccf304c229caa8929d1e34519831d62b627141192d33cf832462b3ef2fbe65ac8351f4b56cd3b3f898e0c829b45b5440a0753a88f0fc1e
 MISC metadata.xml 1042 BLAKE2B bf5f9a6d7f2b7a0465332ce47a343566749ac3e6b8c29d37c21140c69e56a3c58ba2bc6335b6839da43993dc427a12350506dc55b0f727856f16b173c0df90a4 SHA512 4adc7776bc6f02d91f2229ea96566e94b1e8155f75bac27d7391f87d6fc3100da425235f2c02dccd1ce7534abc9c30be0ab5a15ec9dc4278463f10dcf95e8b4d
--- a/app-admin/ansible-core/ansible-core-2.15.0.ebuild
+++ b/app-admin/ansible-core/ansible-core-2.15.0.ebuild
@ -18,7 +18,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_BRANCH="devel"
 else
 	inherit pypi
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
+	KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos"
 fi

 LICENSE="GPL-3"
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@ -3,5 +3,5 @@ DIST ansible-7.5.0.tar.gz 37716844 BLAKE2B 47f6fcb744a65b3dd4d8619acd0ca23561bb6
 DIST ansible-7.6.0.tar.gz 38452799 BLAKE2B 88b652b1b0bcbedb982606c7d7734fd11567cd492f4e0d617d7412e1bac8978fcef1f4201bb0338098204640e2b004d8921427c1d642bfbb15a7f95b134cb85e SHA512 4f8960356e0ff855d54b435ed691d1d4f7d38c1231269e35b3dbbee536a9d8d1aef2806d7ce38e863fe216e9fddb2f86ce55ba997a3bd1d8bb7f43c5c519ff72
 EBUILD ansible-6.7.0.ebuild 655 BLAKE2B b520b68ef90864d554ab8ee9c27447dd14da387130b32bc5d170a158c984aa5ea6f1023f298ebda3a0b751ece2ba7e2c7eebf688cc5c170216ad0e71af8fc960 SHA512 f4544642074e6c7d3d9753ef7a1a1f64f0f00934fd66b014068894f8bc6105cbfa6e43f2eb69c0a80745b17a6ed7504bcb8e2a941f4384859028bf17468b0254
 EBUILD ansible-7.5.0.ebuild 655 BLAKE2B 737b7e75834d55ee6bbbdc00797896cfed122cfba478bf076156befa70e873899a3b4313408030aaa3214175e7a45bf3c86c21b4e84c2de5940c42cb5e68780d SHA512 4765ba667b64e4eb5659423a8ccc1eb8e52bd6c0f4e287b4aa4f79877d11ef88b95bca3518413f93cea3b785c27f739754af64781f783fa7e46cb2d44c1d7b57
-EBUILD ansible-7.6.0.ebuild 658 BLAKE2B ffe6100a7745a7e1fc7f35564eda5985b002948292a58e199d608223dc7ca37879b02a3e71a40c7f005e8e33c153489ede0643d9a014205eef23467625b9d9c4 SHA512 8e5e4242bcdaf4169e87d19e82e91b80938134544309f67fad49148798ab20922eb17ccdef4752ef840674bd04d74123c7c15a105816181928247f1dce761780
+EBUILD ansible-7.6.0.ebuild 655 BLAKE2B 737b7e75834d55ee6bbbdc00797896cfed122cfba478bf076156befa70e873899a3b4313408030aaa3214175e7a45bf3c86c21b4e84c2de5940c42cb5e68780d SHA512 4765ba667b64e4eb5659423a8ccc1eb8e52bd6c0f4e287b4aa4f79877d11ef88b95bca3518413f93cea3b785c27f739754af64781f783fa7e46cb2d44c1d7b57
 MISC metadata.xml 731 BLAKE2B 26c756a1f3d67f68ba824b56b8a7a48f13e6586c761da02d61852c7669c419ecab686ed1bb59ac7e229038413fdf9c0521b11d005e8250b63380c1b5282586d2 SHA512 e6d8bf5b9748c6aaccae0fdeb3f187be80d5a956dbc57578f6fa344a667624a0a4ffbaba689d2f7bc812dd91fb3b959b3293260729ce7c995a20fe47b2cdf097
--- a/app-admin/ansible/ansible-7.6.0.ebuild
+++ b/app-admin/ansible/ansible-7.6.0.ebuild
@ -12,7 +12,7 @@ HOMEPAGE="https://www.ansible.com/"

 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos"
 RESTRICT="test"

 RDEPEND=">=app-admin/ansible-core-2.14.0
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@ -4,10 +4,12 @@ DIST aws-cli-1.27.151.gh.tar.gz 2433265 BLAKE2B a26710e9af6cca92db87394c15415ade
 DIST aws-cli-1.27.152.gh.tar.gz 2434279 BLAKE2B 4c7ff9c0df3aee2eb8d195941f0d443a0904f7becbf6d9484425d940ca2f686520a28e9ab196a634663f6b1662905352ad7548ec4ba2bbde770af74970a5bf99 SHA512 8039ff55f967091649e74f4a827044ebddeff7beb28cc4bc47ed817941c64cd6f6e274c705fbeb49ce58331514b4bc4b6622689f1740a6ef676983cf0224e942
 DIST aws-cli-1.27.153.gh.tar.gz 2436062 BLAKE2B e9351f70b36ffb15fcab233ba2c6845675749b34a16ddb6baac25acb712f7ce42fa531683684fa7deb4bde38c896eca6f5e47d6637f10e45c56d7e20eb99145e SHA512 6e48dfed4c7d09acc1d567952e921a926ac2a63cbf4c0ab27856a17336cb517157ff5e7a3685b9f6c7d2f2edc2aad7dd52079ac3b5cbb13ad0da65a772dc3099
 DIST aws-cli-1.27.154.gh.tar.gz 2436624 BLAKE2B 79f55cc001ba3286a125002304c350dbecc6582b0e52b1ab1c1460b15406a82b397907ab11c7fd92c0db4e952856cf6f7b2c7a0022ff4ddddf836b5f49a86461 SHA512 366ddc5274631c70e2e5735ead4d54cecfdc7b115d8168aff6fff25b3f842731a2938cd66da1c6897833fae7ac534945c848551ca5a07c7a52fe7d6f9f2b55f7
+DIST aws-cli-1.27.155.gh.tar.gz 2437165 BLAKE2B 59a757940ec6999567f1744d147078acbb3e0bf02390e40452d8a9ad04748d29d88e8bca70a666a5d7ed33d947f8a77433028033d732ae962f927dc42a799d9e SHA512 6d1cb53fb2e7b9b724bf9ecbbaac3549fd44d33134f1060a52d67867cbca935304bce440f99c92adedbd15b2295a2753df79e83b660b0d415a95ee10c1cc52d7
 EBUILD awscli-1.27.142.ebuild 2278 BLAKE2B a074ad11e996c7c4e5c0366e5e5d3856cb1bdd7984b8eaf9ac959108e0c5737b064be5d7a579f46669403efb0c3111e8814570f041106e920102cf2a6ddf3687 SHA512 060c06ae5d2295b74940bc86eabf279eeb7a81f7cafa4a9d89e9af8076feff5a23cc3f9bad5a631e75155af64b948abe4c0de7283883a53d4b1ee5791765176b
 EBUILD awscli-1.27.146.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
 EBUILD awscli-1.27.151.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
 EBUILD awscli-1.27.152.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
 EBUILD awscli-1.27.153.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
 EBUILD awscli-1.27.154.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
+EBUILD awscli-1.27.155.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
 MISC metadata.xml 385 BLAKE2B 5accfb180a91179cc6df539d42d1de06be3ebfec73f3edb719f5d59576103b9a8cb0c7c524c1042630e0cf99f068939a19f04c7b1b4a2acf9e072369df80d913 SHA512 ccb3d516326c5dbdf53068372ce25baecc137d21a04516374362212b969cc928dacbf743b4953da33f28482905798f069d09d19c88d9913f2b32648db25115ab
--- a/app-admin/awscli/awscli-1.27.155.ebuild
+++ b/app-admin/awscli/awscli-1.27.155.ebuild
@ -0,0 +1,80 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit bash-completion-r1 distutils-r1 multiprocessing
+
+MY_P=aws-cli-${PV}
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="
+	https://github.com/aws/aws-cli/
+	https://pypi.org/project/awscli/
+"
+SRC_URI="
+	https://github.com/aws/aws-cli/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+# botocore is x.(y+2).z
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/rsa[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	!app-admin/awscli-bin
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+	# strip overzealous upper bounds on requirements
+	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# TODO
+		tests/functional/eks/test_kubeconfig.py::TestKubeconfigLoader::test_load_simple
+		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_env_only
+		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_existing
+		tests/unit/customizations/eks/test_kubeconfig.py::TestKubeconfigValidator::test_valid
+	)
+
+	# integration tests require AWS credentials and Internet access
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
+}
+
+python_install_all() {
+	newbashcomp bin/aws_bash_completer aws
+
+	insinto /usr/share/zsh/site-functions
+	newins bin/aws_zsh_completer.sh _aws
+
+	distutils-r1_python_install_all
+
+	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
+}
--- a/app-admin/passwordsafe/Manifest
+++ b/app-admin/passwordsafe/Manifest
@ -2,6 +2,8 @@ AUX passwordsafe-1.15.0-gcc12-time.patch 306 BLAKE2B 03c0d2cefc7cab1b1342df38bd4
 AUX passwordsafe-1.15.0-gtest-no-gnu++11.patch 467 BLAKE2B d3d09e3ed71c722abf11b07edcbf5f430b0eb1f1b530824cacee9ad35c301e45a942c5494c5767ef2cc62f4b63c3a3f9fd39877f4de5821b5164d12640e302f8 SHA512 a1f133b23e2e8651e30e15335b3e06e570c960cd0e31d567bdceb6862ad0df6576182f8784e97ba6cf66b6777ac99a052f7e6a077c6274af32401f9156edd605
 DIST passwordsafe-1.15.0.tar.gz 15354159 BLAKE2B 699f80325884cba9bc6e5ffb33bea5c0b2c01f12ed7e4ea1226c4a64c761a8f20b8272e771261ca59aeeb49bfaa4ea83edc9af6c0aa9ae853e537b0f76f28aaa SHA512 803572afc479d608899e1166ef032a2a660fce122e03f89f59f8e9da9f7439e0eb1d602f77283200626f49d7e146e82edf8edee40060ff4cf6163e81bdf5f738
 DIST passwordsafe-1.16.0.tar.gz 15369804 BLAKE2B 344e77f74e588f41ba3696f5ea05cf054fca9f285437294033284561cbb83c76dc1311033b78673db0049132b7c9f37493c3698bb3b66e8e0a91ae63f7a83cdf SHA512 839de5072d6c9ec8fb82456e4516e51408be271ac8041b6dd9cf30990ac88914a139d96b40ee09764892acd8320abb2950d7f159a5b18c3d1549e58b922aa024
+DIST passwordsafe-1.17.0.tar.gz 15463920 BLAKE2B e64c73139c829b16b5f825d3c078f1cb3285cb15400be988e35b64e4ce701a5241e099a09092a576e487f709464b6fa5d5911f5f68e096d194329cd0214ac8cd SHA512 de1ef537c2f6c17e35d93a53cf46e86b7c1f1a4439282f8c2b98443845e3d381e113448acd739fc6ccdb5eee8ff7ebfd8c0e4306cda517ab623eaf5b9354d39d
 EBUILD passwordsafe-1.15.0.ebuild 1869 BLAKE2B 31576c5fc6aeafe6246e02c03c9b5d435b771f0139e54b536e6f10bffb4c4bbb0fafc55f51d0511dba84b2ffc959f3010ac0a0e61cf99d417109fef3076fdf37 SHA512 ddcb1d77847eb265a1b36b9259dc2390a6eaa5608f6a8da4e64ba3d72cfe61eee9c6df0ae530fefe2a031d62997f655c39fa54889538a13b76bf04ae1963461b
 EBUILD passwordsafe-1.16.0.ebuild 1850 BLAKE2B ed4eb9c0c89a8b22d5d14f6396e707875b4b160a181854279f9d47c8dd1d85e7f20932a7e21937625ae5eec24c526955582bca063c09ac984e29677b0829754c SHA512 273cd4981589bec56210457e914991772685c2f2cb2567ec5c96ec787c16575c544994c9f959abc66c1b4694a5dc627826996ba2dbf409202d3de4168748ec56
+EBUILD passwordsafe-1.17.0.ebuild 1787 BLAKE2B d480a3799bc32142c77d08b58688884ecc955a72349c178168eed8aba3b563f8332bcc42d77cee09b0e748e17ae975931e624b31332db3a264a595ea33c20208 SHA512 3c20159657a049884ba81350a0418b6b72c99caa257e7349de7bc3861615d0e88ef5cf2e42fa3a5fa317d26d0048622de4dadde7982c18e27b040bde45b95770
 MISC metadata.xml 714 BLAKE2B 336a69bebe009487ad72444b3805a0b332fc78aacff06566601a431d91d7799a750cf2b7aa9d61df26061a4a073c9a3fe478e80419256bdb472374eeee3c3599 SHA512 d0e6fb3b93211ca74371beecf4099bad8c9ef608d804942b961ed0ec954cebd690c3d6157caf200c07f22af3169728f2a541be334142bce060890b88cac4b246
--- a/app-admin/passwordsafe/passwordsafe-1.17.0.ebuild
+++ b/app-admin/passwordsafe/passwordsafe-1.17.0.ebuild
@ -0,0 +1,85 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WX_GTK_VER="3.0-gtk3"
+
+inherit cmake desktop optfeature wxwidgets xdg
+
+MY_PV="${PV/_beta/BETA}"
+DESCRIPTION="Password manager with wxGTK based frontend"
+HOMEPAGE="https://pwsafe.org/ https://github.com/pwsafe/pwsafe/"
+SRC_URI="https://github.com/pwsafe/pwsafe/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/pwsafe-${MY_PV}"
+
+LICENSE="Artistic-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="qr test +xml yubikey"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	net-misc/curl
+	sys-apps/util-linux
+	x11-libs/libXt
+	x11-libs/libXtst
+	x11-libs/wxGTK:${WX_GTK_VER}[X]
+	qr? ( media-gfx/qrencode )
+	xml? ( dev-libs/xerces-c )
+	yubikey? ( sys-auth/ykpers )"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+BDEPEND="
+	app-arch/zip
+	dev-lang/perl
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? ( dev-cpp/gtest )"
+
+src_configure() {
+	setup-wxwidgets
+
+	local mycmakeargs=(
+		-DNO_QR=$(usex !qr)
+		-DNO_GTEST=$(usex !test)
+		-DGTEST_BUILD=OFF
+		-DXML_XERCESC=$(usex xml)
+		-DNO_YUBI=$(usex !yubikey)
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	pushd "${BUILD_DIR}" || die
+
+	dobin pwsafe
+	dobin cli/pwsafe-cli
+	dosym pwsafe /usr/bin/${PN}
+	dosym pwsafe-cli /usr/bin/${PN}-cli
+
+	insinto /usr/share/locale
+	doins -r src/ui/wxWidgets/I18N/mos/*
+
+	insinto /usr/share/${PN}/help
+	doins help/*.zip
+
+	popd || die
+
+	newman docs/pwsafe.1 ${PN}.1
+
+	dodoc README.md README.LINUX.* SECURITY.md docs/{ReleaseNotes.md,ChangeLog.txt}
+
+	insinto /usr/share/${PN}
+	doins -r xml
+
+	doicon -s 48 install/graphics/pwsafe.png
+	newmenu install/desktop/pwsafe.desktop ${PN}.desktop
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	optfeature "on-screen keyboard for password entry" x11-misc/xvkbd
+}
--- a/app-admin/puppet-agent/Manifest
+++ b/app-admin/puppet-agent/Manifest
@ -3,6 +3,9 @@ DIST puppet-agent_7.24.0-1focal_amd64.deb 31418478 BLAKE2B 201c0a5adbeca2b6f572d
 DIST puppet-agent_7.24.0-1focal_arm64.deb 31160744 BLAKE2B 22dfc3f0855c2e88c7202f2a9d98efd4ad9ef3a191ab9b5b8c37a6869306a47d1225d568fec9f0fc52cdf236f8258b5ca206a360049cc39e1825f1f8afc5d4af SHA512 db1b7cb25a04d6aeedd7f3bb125fe0fcac420c2881f9f3aba729143e253908376cd118073753de018d8fd1a6d7f38139766b4ec4bfb23f840ca7ee32143a8a48
 DIST puppet-agent_8.0.0-1focal_amd64.deb 35686934 BLAKE2B 1604178a8ce2a9112e411d2054b013a9bba5e28d6ecbb119da112ffd01cb620a482c118b84313a95f50efac755c0cb3551b966d95d77ae242c5ca515d3f82d72 SHA512 df6fe25f582fe5339648cada3563cd3820e39ebe383cf8189bb2517e03e21477af6cffcdf4d1894960fd69a5c4168990c45a1f74789bca0881f31fd09dccf0d2
 DIST puppet-agent_8.0.0-1focal_arm64.deb 35445806 BLAKE2B b66669c98d44eadead8d9b09faf679dd9ca938bfba7cd5c67d9083cd856afa61ee416a389672a978d8b9394a0ec7b404fd97db4a181b4ffbbdb813aff2b3d697 SHA512 c47167e2be146eb18fab055fb5dc94583e3b53006ce71573c41d76016e0a9ef57ba8a9d9807e020763acbfbe243ebb4080a84773f3d7339beb408f4b437cc864
+DIST puppet-agent_8.1.0-1focal_amd64.deb 35868180 BLAKE2B 9c3c952a35670883aae31e05a47b5d23e79c3e53cf54760444a8d0dbf7d7ca6385b043ec82eb748d0b6e9573fcb79de457323ec46441f3dd5a60c14cc51aeaae SHA512 450b37c556f39d02d124009d276c70e8b8f46f75ff14df4ab13656a54ace2612441202e8fcf5a266ec25998ad05271eda2f1088580091009b8f2c98b1b8462d8
+DIST puppet-agent_8.1.0-1focal_arm64.deb 35364600 BLAKE2B 25965e453f13b936962bf8a786171dc7fce3fe4868f856352a6a46c463f8e84d32d44f3a7ca7f4d9ce21880a9d38a623b7dffe1c0dbcff5c4e48971776dce960 SHA512 1d77cb14600d38547deac90a57218d0559797f011b9acae708d745946a20299c6a802276aac9e06eba2b8e5ae631e2f9da030b11fdfa26ab656ed7c2db631d7b
 EBUILD puppet-agent-7.24.0.ebuild 2593 BLAKE2B a73b46e5e5bd8f3d8bbd45478bcb311a80d0f2b6ca84c23e13b70ca82820be978912ee1e0019c5efc05bcc2c1f30590117ff1d28e789238adbf085e6fd0709fc SHA512 b5e3e76e28d1abaed04fd2749333d465272aacef931531e29041dc19e6206dbf66bb468e64deaa861348bb36d7d45ddd236d9bc2be84df41dbba54c7f3c3e857
 EBUILD puppet-agent-8.0.0.ebuild 2595 BLAKE2B 0f775b39ea28e424db14aab962e1f502a01e086cabd065bff638e08dece28ae18b01f56f35e44730eac8ba356038ebf057abb20bcc4f3c6cbdd3bfeebc6fdd29 SHA512 047349be58b6d724e56696f604233ba488354d39cfb301431b6fdb971c91c92fd6ff48993a7b8403dac28cb43be2021ec9599dba79668e81355e7d3985f6d5a0
+EBUILD puppet-agent-8.1.0.ebuild 2596 BLAKE2B fd7e1f5460206eeb37cc94d8512d8b4a70a61e793bd08bedf277cba488598c8fe1ea9bd78a38c36113cc35b4d9a35630a3ac54ff2788f5720e843a951bcd8b8a SHA512 1c6bdd0baf7a8a93ee66c52b99b7bba80ba8ed2ca63bd372384229a205f9988f1c94595f2ee15a7b8d0f04a8e6b9716f9f8e2f951049c93436b83a229ca0e1d5
 MISC metadata.xml 1032 BLAKE2B 35156eb59a786ad7dab4ac5c281796af6a8f3dcad2b7ebc2c6af926aee6fcbffaef39f0f7119f1aefed42a1e8148f323ee4d3d5f77dfb4d3671317af6fd078cc SHA512 b624438f825e288802e516637dd38f775a63b4a4aabaa53c5adfd1f71f694018dbf3d47f1622a90d5da25a00aac696f9203c085190e574a586f3a3e4fe14f9d1
--- a/app-admin/puppet-agent/puppet-agent-8.1.0.ebuild
+++ b/app-admin/puppet-agent/puppet-agent-8.1.0.ebuild
@ -0,0 +1,91 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit systemd unpacker tmpfiles
+
+DESCRIPTION="general puppet client utils along with hiera and facter"
+HOMEPAGE="https://puppetlabs.com/"
+SRC_URI="amd64? ( http://apt.puppetlabs.com/pool/focal/puppet8/${PN:0:1}/${PN}/${PN}_${PV}-1focal_amd64.deb )
+arm64? ( http://apt.puppetlabs.com/pool/focal/puppet8/${PN:0:1}/${PN}/${PN}_${PV}-1focal_arm64.deb )"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="puppetdb selinux"
+RESTRICT="strip"
+
+# virtual/libcrypt:= is in here despite being a pre-built package
+# to ensure that the has_version logic for the symlink doesn't become stale
+CDEPEND="!app-admin/puppet
+	!dev-ruby/hiera
+	!dev-ruby/facter
+	app-emulation/virt-what
+	acct-user/puppet
+	acct-group/puppet
+	virtual/libcrypt:="
+
+DEPEND="
+	${CDEPEND}
+	app-admin/augeas"
+RDEPEND="${CDEPEND}
+	app-portage/eix
+	sys-apps/dmidecode
+	sys-libs/libselinux
+	sys-libs/glibc
+	sys-libs/readline:0/8
+	sys-libs/libxcrypt[compat]
+	sys-libs/ncurses:0[tinfo]
+	selinux? (
+		sys-libs/libselinux[ruby]
+		sec-policy/selinux-puppet
+	)
+	puppetdb? ( >=dev-ruby/puppetdb-termini-5.0.1 )"
+
+S=${WORKDIR}
+
+QA_PREBUILT="*"
+
+src_install() {
+	# conf.d
+	doconfd etc/default/puppet
+	doconfd etc/default/pxp-agent
+	# logrotate.d
+	insinto /etc/logrotate.d
+	doins etc/logrotate.d/pxp-agent
+	# puppet itself
+	insinto /etc/puppetlabs
+	doins -r etc/puppetlabs/*
+	# logdir for systemd
+	keepdir var/log/puppetlabs/puppet/
+	chmod 0750 var/log/puppetlabs/puppet/
+	# the rest
+	insinto /opt
+	dodir opt/puppetlabs/puppet/cache
+	doins -r opt/*
+	fperms 0750 /opt/puppetlabs/puppet/cache
+	# init
+	newinitd "${FILESDIR}/puppet.initd2" puppet
+	systemd_dounit lib/systemd/system/puppet.service
+	systemd_dounit lib/systemd/system/pxp-agent.service
+	newtmpfiles usr/lib/tmpfiles.d/puppet-agent.conf puppet-agent.conf
+	# symlinks
+	chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/"
+	dosym ../../opt/puppetlabs/bin/facter /usr/bin/facter
+	dosym ../../opt/puppetlabs/bin/hiera /usr/bin/hiera
+	dosym ../../opt/puppetlabs/bin/puppet /usr/bin/puppet
+
+	# Handling of the path to the crypt library during the ongoing migration
+	# from glibc[crypt] to libxcrypt
+	# https://www.gentoo.org/support/news-items/2021-07-23-libxcrypt-migration.html
+	if has_version "sys-libs/glibc[crypt]"; then
+		local crypt_target='../../../../usr/lib64/xcrypt/libcrypt.so.1'
+	else
+		local crypt_target='../../../../usr/lib/libcrypt.so.1'
+	fi
+	dosym $crypt_target /opt/puppetlabs/puppet/lib/libcrypt.so.1
+}
+
+pkg_postinst() {
+	tmpfiles_process puppet-agent.conf
+}
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@ -3,6 +3,8 @@ AUX puppet.init 760 BLAKE2B 1803b602178f711cb4a0784a8e74e5bc63b66db11ce4a9855f76
 AUX tmpfiles.d-2 35 BLAKE2B 333994788552e5c52273752f4e3c2947666737d03f9d340e16ada790607efe77da1ba9bb4852bc8274174fbb96ce0c7ae81062f7197e63ea4701e539b2650b3b SHA512 fdf00147c497bd822a14f0e42bad825a43ce0977ec6c0265d267dedeef56295e3ce319f7972d0ec2ab9f04f2407856947f4261d6e62054a36c6e1672b45f86f0
 DIST puppet-7.24.0.tar.gz 2823083 BLAKE2B f4a3862153a01b1d5ce1cc9d72a2446d91346c5e8ed762f8aeae260a67bd583c277cd4ea0f207021057d40c69078add06af88978522706dea59796bdd6071070 SHA512 bb881e7523fce72ca8941d363ebc12f0172aff61a28d49465b7977fdf0d004575f5677fad3f0858db109b1cf85e4d870becdaa7c6687db32eb6eecf849ed25e9
 DIST puppet-8.0.0.tar.gz 2874596 BLAKE2B 64a609c0375c942520f17bd6281225568b9803cd7af3e9f4da8311eb4f2680184174b0b5c992b243ba9680912b77038934bb3506ae28a964c64b0f1f8feca62e SHA512 78ba9d603831874fbecca7ce3e2802ed54188a71ad7d6f7a24fa3390330e41a7b43b074c6c51e32cfdf10ff92f6b087f8fbe9220ea65efb917f517776451ef56
+DIST puppet-8.1.0.tar.gz 2877086 BLAKE2B 24fde48d04790ca308ef80ca51021b69dd08f703eec49724f753aabe36b824d338d135e985a5741b7e412f807ee35edf7898d2bc12d61bd9243e3fc1540808e2 SHA512 7811d67f83c72d67d5d463ccddece8889868f302217229f748a1d95df8b64213d9ee86a34e42af3beed9fc55cf70a14f63e6b8a6fcd18feb259e1d027dc35259
 EBUILD puppet-7.24.0.ebuild 3667 BLAKE2B 596aba703f8e8154cde0c6dd8d11cde9118aac72546a3579bfbe43e69748b80e89ffed85baf5e0be36f5cb3e969837fe731523827581a60535df6f43ba9a5691 SHA512 9db45b40a7c9b7367583181a28dc5901c845fe814298a48fe1fe2ea9b3d7eec9c55ab3076f934902f1c8885deffc89eac90e8fa13d6a4fdf16e313f031d3cc6f
 EBUILD puppet-8.0.0-r2.ebuild 3492 BLAKE2B 9712521f8dad46f304896c7abac0ecd4a39653226e597099707ea2f0589aa56bb1b80cb13fee68f6f243fed1db1a51c524ce4ce646722475bce4bc20524fda79 SHA512 7ea8b62f82ce1b0a5e17ea01c27caa62879141cc92b1b220dfdfe2a7d15cbd214db634e7642f83d60e9453ed056fa9d3f0ff998d5d4222f8aaed1cc262a4c65e
+EBUILD puppet-8.1.0.ebuild 3494 BLAKE2B 9c322edb607f4814aa571eea93d9a1f1f0ee34864e2272fd752f1ca3f9e88e58d74e96da62c5c35259b3da8c6b3f46155f2a703a797bfae39903a59874ab5d51 SHA512 9ad6923e8105dcea2d31202233106ac5c5b040b8e542a99b6acf4ff680b01bce90fdcea543ef47056c8c751a51dbf6e59fa40a4ab70ad4c2e282fd591b09c94d
 MISC metadata.xml 1496 BLAKE2B cc2549141aaf5623f65be274fa8195fe6ee2826620050284ab0a7f60ba04832ecf8fe0e0890c470c98095946d1e4e7a0ef1fabd4d400c47d086fe173769f3d8c SHA512 1217b23c939409ae6cd15286b3304388893970276c80bf11284769946856ba1db20ea537fee5b7b2183305a24c88c926804e21f246f508e40cde41f45f1490bf
--- a/app-admin/puppet/puppet-8.1.0.ebuild
+++ b/app-admin/puppet/puppet-8.1.0.ebuild
@ -0,0 +1,128 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+USE_RUBY="ruby31"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_TASK_DOC="doc:all"
+RUBY_FAKEGEM_EXTRAINSTALL="locales"
+
+inherit ruby-fakegem systemd tmpfiles
+
+DESCRIPTION="A system automation and configuration management software"
+HOMEPAGE="https://puppet.com/"
+SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
+
+LICENSE="Apache-2.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+IUSE="augeas diff doc emacs hiera ldap rrdtool selinux shadow sqlite vim-syntax"
+RESTRICT="test"
+
+# <dev-ruby/concurrent-ruby-1.2 for bug #900206
+# - https://tickets.puppetlabs.com/browse/PUP-11722 (workaround, pinning)
+# - https://tickets.puppetlabs.com/browse/PUP-11723 (bug for fixing the pinning)
+ruby_add_rdepend "
+	hiera? ( dev-ruby/hiera )
+	dev-ruby/json:=
+	dev-ruby/semantic_puppet
+	>=dev-ruby/facter-3.0.0
+	dev-ruby/deep_merge
+	<dev-ruby/concurrent-ruby-1.2
+	augeas? ( dev-ruby/ruby-augeas )
+	diff? ( dev-ruby/diff-lcs )
+	doc? ( dev-ruby/rdoc )
+	ldap? ( dev-ruby/ruby-ldap )
+	shadow? ( dev-ruby/ruby-shadow )
+	sqlite? ( dev-ruby/sqlite3 )
+	virtual/ruby-ssl
+	dev-ruby/hocon"
+
+ruby_add_bdepend "
+	doc? ( dev-ruby/yard )
+	test? (
+		dev-ruby/mocha
+		dev-ruby/rack
+		dev-ruby/rspec-its
+	)"
+# this should go in the above lists, but isn't because of test deps not being keyworded
+#   dev-ruby/rspec-collection_matchers
+
+RDEPEND+=" ${RDEPEND}
+	rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
+	selinux? (
+		sys-libs/libselinux[ruby]
+		sec-policy/selinux-puppet
+	)
+	vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
+	>=app-portage/eix-0.18.0
+	acct-user/puppet
+	acct-group/puppet"
+PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )"
+
+all_ruby_prepare() {
+	# Avoid spec that require unpackaged json-schema.
+	rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
+
+	# fix systemd path
+	eapply -p0 "${FILESDIR}/puppet-systemd.patch"
+
+	# Avoid specs that can only run in the puppet.git repository. This
+	# should be narrowed down to the specific specs.
+	rm spec/integration/parser/compiler_spec.rb || die
+
+	# Avoid failing spec that need further investigation.
+	rm spec/unit/module_tool/metadata_spec.rb || die
+}
+
+each_ruby_install() {
+	each_fakegem_install
+#	dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" \
+#	"/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	# systemd stuffs
+	systemd_dounit "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
+
+	# tmpfiles stuff
+	newtmpfiles "${FILESDIR}/tmpfiles.d-2" "puppet.conf"
+
+	# openrc init stuff
+	newinitd "${FILESDIR}"/puppet.init puppet
+
+	keepdir /etc/puppetlabs/puppet/ssl
+
+	keepdir /var/lib/puppet/facts
+	keepdir /var/lib/puppet/files
+	fowners -R puppet:puppet /var/lib/puppet
+
+	fperms 0750 /var/lib/puppet
+
+	fperms 0750 /etc/puppetlabs
+	fperms 0750 /etc/puppetlabs/puppet
+	fperms 0750 /etc/puppetlabs/puppet/ssl
+	fowners -R :puppet /etc/puppetlabs
+	fowners -R :puppet /var/lib/puppet
+
+	# ext and examples files
+	for f in $(find ext examples -type f) ; do
+		docinto "$(dirname ${f})"
+		dodoc "${f}"
+	done
+}
+
+pkg_postinst() {
+	tmpfiles_process puppet.conf
+
+	elog
+	elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
+	elog "cause puppet to hang while installing packages."
+	elog
+	elog "Portage Puppet module with Gentoo-specific resources:"
+	elog "http://forge.puppetlabs.com/gentoo/portage"
+	elog
+}
--- a/app-admin/puppetserver/Manifest
+++ b/app-admin/puppetserver/Manifest
@ -2,6 +2,8 @@ AUX puppetserver.init 2138 BLAKE2B 6c157cb6bbe9e085ae67920abadf99ff97798115f784a
 AUX puppetserver.init-r1 2190 BLAKE2B 6e4b547af51989d678a52e0fb41e8b27a669d96aaa445998b532524651f2bf2349a26f8eb77ead92a9e0f613a5269fe464045937f318947c8c2878b93dad0d4f SHA512 de159346c4b1b5705d53337994cf77f4b70edd20d60f0e1338589be4ee67c4a1bddca5cfdf9a4e744ff9360676f86391a6675b137c3bef050d71f2964b885b58
 DIST puppetserver-7.11.0.tar.gz 59927771 BLAKE2B dcf2543ac6d5427f57bb451ff9cc6db6748522ffed6fd5a7e81bd63be899fbf722016975fdfca5154489bcaf93d973d11669dd455ad44c79b3be50ccc5e0f636 SHA512 4c9c8d05048ccc35fd729a9a37151451e97655eed131f7192be2dac7614c309ffa4cdb0dd77f1c9eb2666d7df630690faa52ad2b01266010533522b58fb06f79
 DIST puppetserver-8.0.0.tar.gz 60976845 BLAKE2B af9e389ec946ea20b7028535c12a0fbc99dc4ee0790cfb9625ae881e3024c96727e8eb671a25895ade878c5a2b264991a5b3f49dc7453e49ba85be0042ba0bc6 SHA512 1b67c472795c5baad5696f4b553fc95a3561b4fbb9fcd0cc7be2c168bbbbe3b788a6fc2d0821fa9d459c452a9e9ee754a6ba2f8b8cae55ab6490896bd228ce06
+DIST puppetserver-8.1.0.tar.gz 61109210 BLAKE2B 562f765d0f36926d16575d6c6fe9e55ee1d732f9288ae3ab0cfa653868de87f4de6176d616e49568298de754a94951e37d61e129b6723ca1f1da6bb3bb191d54 SHA512 a6112d8c4eeaa58dfcb72e91f60104a0918a3c55f8fce4e555b40fa42d0027aaddf94e8751ecd854240f3dcf6034233dc52a750ee7791e35f0a6a7a9609a8c35
 EBUILD puppetserver-7.11.0.ebuild 5355 BLAKE2B 5e11c389026d93c2ae38f28e2f8da12fe25bc65a1600a2f8051003b726e110498f7892355ff0e9ed556547db5cedc3c45c01253f3722f7ff7705f147585e2f82 SHA512 edfc5b094ea7db88c30cb71ecc3e3476b52789b37f7b893526db5dc7b96dbfd52a4e4bd2a38aa4164ebc8cd0b967cdd5b6af077a49fe242cf2c762b155c3ce16
 EBUILD puppetserver-8.0.0.ebuild 5352 BLAKE2B f9d2849e80e3baf2ed7567b7a744d75eb998dcc1b4bde77661033ffd5a90f17f6141c382dbea7c1cb8035b9e3a8e1a11a2739a94c79866fd5919c02deee63fcb SHA512 0e1e56bee2d15ad2f5dcba00be3d832fc62d6a284c716fed144238ec02ff996d3976919a6aa0bed16949bc1f320e246d6c3a2508405c86ff1336f70387842f3d
+EBUILD puppetserver-8.1.0.ebuild 5353 BLAKE2B 26b3b1609ac70de27e85785c4585f1680e7a0a9dedc5054287b8ad11e9d034e0758a60454c37e77391d371c0448ba43c595e7b857a94886811b256f1ef138a4f SHA512 179d2be55c15b9db7edac31d8f40ee3a3475a4a690370b957af5801f26c5c31c0c907fbd09fdbb55ed060cbbe89f9246f3408a470e5137e11dd1566971afed83
 MISC metadata.xml 341 BLAKE2B 6e19f31ed866283c5827f9ca2550ca99c12d8b9506fbc13447d8bdad3ceaae844d3b103fe6cced8f829a75b7b1c317ef43bd2d1e885e9b509f70b8646a9e5bf6 SHA512 72945305ef496758676dba53925ebbd5cd0d01935fe82708559f941d831bf6b2ce34444d5b85a16b116f577596b2647183fe7b7c6ef92080a8e332fc0226d7ac
--- a/app-admin/puppetserver/puppetserver-8.1.0.ebuild
+++ b/app-admin/puppetserver/puppetserver-8.1.0.ebuild
@ -0,0 +1,131 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd tmpfiles
+
+DESCRIPTION="Puppet Server is the next-generation application for managing Puppet agents"
+HOMEPAGE="http://docs.puppetlabs.com/puppetserver/"
+SRC_URI="https://downloads.puppetlabs.com/puppet/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="puppetdb"
+# will need the same keywords in puppet-agent (puppet-agent now has arm64)
+KEYWORDS="~amd64"
+
+RDEPEND+="
+		>=virtual/jdk-11
+		app-admin/puppet-agent[puppetdb?]"
+DEPEND+="acct-user/puppet
+	acct-group/puppet"
+
+src_prepare() {
+	sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/redhat/puppetserver.service || die
+	sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/bin/puppetserver || die
+	sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' install.sh || die
+	sed -i 's/var\/run/run/g' ext/config/conf.d/puppetserver.conf || die
+	sed -i 's/var\/run/run/g' ext/redhat/puppetserver.service || die
+	sed -i 's/var\/run/run/g' install.sh || die
+	default
+}
+
+src_compile() {
+		einfo "not compiling"
+}
+
+src_install() {
+	insinto /opt/puppetlabs/server/apps/puppetserver
+	insopts -m0774
+	doins ext/ezbake-functions.sh
+	insopts -m0644
+	doins ext/ezbake.manifest
+	doins puppet-server-release.jar
+	insinto /etc/puppetlabs/puppetserver
+	doins ext/config/logback.xml
+	doins ext/config/request-logging.xml
+	insinto /etc/puppetlabs/puppetserver/services.d
+	doins ext/system-config/services.d/bootstrap.cfg
+	doins ext/config/services.d/ca.cfg
+	insinto /etc/puppetlabs/puppetserver/conf.d
+	doins ext/config/conf.d/puppetserver.conf
+	doins ext/config/conf.d/auth.conf
+	doins ext/config/conf.d/global.conf
+	doins ext/config/conf.d/web-routes.conf
+	doins ext/config/conf.d/metrics.conf
+	doins ext/config/conf.d/webserver.conf
+	insopts -m0755
+	insinto /opt/puppetlabs/server/apps/puppetserver/scripts
+	doins install.sh
+	insinto /opt/puppetlabs/server/apps/puppetserver/cli/apps
+	doins ext/cli/ca
+	doins ext/cli/irb
+	doins ext/cli/foreground
+	doins ext/cli/gem
+	doins ext/cli/ruby
+	doins ext/cli/reload
+	doins ext/cli/start
+	doins ext/cli/stop
+	insinto /opt/puppetlabs/server/apps/puppetserver/cli
+	doins ext/cli_defaults/cli-defaults.sh
+	insinto /opt/puppetlabs/server/apps/puppetserver/bin
+	doins ext/bin/puppetserver
+	insopts -m0644
+	dodir /opt/puppetlabs/server/bin
+	dosym ../apps/puppetserver/bin/puppetserver /opt/puppetlabs/server/bin/puppetserver
+	dodir /opt/puppetlabs/bin
+	dosym ../server/apps/puppetserver/bin/puppetserver /opt/puppetlabs/bin/puppetserver
+	dosym ../../opt/puppetlabs/server/apps/puppetserver/bin/puppetserver /usr/bin/puppetserver
+	dodir /opt/puppetlabs/server/apps/puppetserver/config/services.d
+	# other sys stuff
+	dodir /etc/puppetlabs/code
+	# needed for systemd
+	keepdir /var/log/puppetlabs/puppetserver
+	dodir /etc/puppetlabs/puppet/ssl
+	fowners -R puppet:puppet /etc/puppetlabs/puppet/ssl
+	fperms -R 771 /etc/puppetlabs/puppet/ssl
+	# systemd type things
+	insinto /etc/systemd/system/puppetserver.service.d/
+	systemd_dounit ext/redhat/puppetserver.service
+	insinto /etc/default
+	newins ext/default puppetserver
+	# normal init type tasks
+	dosym ../default/puppetserver /etc/conf.d/puppetserver
+	newinitd "${FILESDIR}/puppetserver.init-r1" puppetserver
+	# misc
+	insinto /etc/logrotate.d
+	newins ext/puppetserver.logrotate.conf puppetserver
+	# cleanup
+	dodir /opt/puppetlabs/server/data/puppetserver/jruby-gems
+	fowners -R puppet:puppet /opt/puppetlabs/server/data
+	fperms -R 775 /opt/puppetlabs/server/data/puppetserver
+	fperms -R 700 /var/log/puppetlabs/puppetserver
+	insinto /opt/puppetlabs/server/data
+	doins ext/build-scripts/jruby-gem-list.txt
+	doins ext/build-scripts/mri-gem-list-no-dependencies.txt
+	newtmpfiles ext/puppetserver.tmpfiles.conf puppetserver.conf
+}
+
+pkg_postinst() {
+	tmpfiles_process puppetserver.conf
+
+	elog "to install you may want to run the following:"
+	elog
+	elog "puppet config set --section master vardir  /opt/puppetlabs/server/data/puppetserver"
+	elog "puppet config set --section master logdir  /var/log/puppetlabs/puppetserver"
+	elog "puppet config set --section master rundir  /run/puppetlabs/puppetserver"
+	elog "puppet config set --section master pidfile /run/puppetlabs/puppetserver/puppetserver.pid"
+	elog "puppet config set --section master codedir /etc/puppetlabs/code"
+	elog
+	elog "# install puppetserver gems"
+	elog "cd /opt/puppetlabs/server/apps/puppetserver"
+	elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/server/data/puppetserver/vendored-jruby-gems }\" > jruby.conf"
+	elog "while read LINE; do"
+	elog "  java -cp puppet-server-release.jar:jruby-9k.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install --no-document \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')"
+	elog "done < /opt/puppetlabs/server/data/jruby-gem-list.txt"
+	elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/puppet/lib/ruby/vendor_gems }\" > jruby.conf"
+	elog "while read LINE; do"
+	elog "  java -cp puppet-server-release.jar:jruby-9k.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install --no-document --ignore-dependencies \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')"
+	elog "done < /opt/puppetlabs/server/data/mri-gem-list-no-dependencies.txt"
+}
--- a/app-admin/sshguard/Manifest
+++ b/app-admin/sshguard/Manifest
@ -4,4 +4,4 @@ AUX sshguard.initd-r2 389 BLAKE2B b4098e0baf82e1c1f1978d6b3916fe9f2e67891d02b7b8
 DIST sshguard-2.4.2.tar.gz 835431 BLAKE2B f76cbe41ced4d23448ba09750d073a47dae263616c34ec2e2efd7d6367339d352925958b5d9d711a3c4a8c2da10fae2474384a3de14434c0dff19bd645325058 SHA512 f2fe35180af8698d4b2053e9ffbf17df9f033b0c2fcc045caa085467d14174e17aa266d2ef3ce9536037e54f7d3ea42de9e32e7faee65612894294793082862a
 EBUILD sshguard-2.4.2.ebuild 1100 BLAKE2B 1864b9b41ba272ed972776e14ba16877abf1921f48b0d55372563c023fdf5379c43cf13addeb9f8cabda96c3df18f3ee6a43c00fffee2fdd7224d4424d8a72ea SHA512 fb8ffd279ed992a6ad0d09b8157c430d6f6b8bc28c595e804ba2b86ccee0cf0a3e01288f1489b172e9f8d349ecd9ebaa7f00fce126ef2e43724082e87564bdaf
 EBUILD sshguard-99999.ebuild 1095 BLAKE2B c5d6d6d4450f4d98fe6f4486f05b93105ed46297068f960f82ca7df8410c15e8a731f7570f9afa7657b085f52df7fdf2c3796e83915c435967b9a00df44d1fec SHA512 3f3b35389987a9bd004425b3fe15a3ace3abdc6370341ae2af66cd7688b90106810e0e6da349179140c02b5a36f3a44246cd40f62c5596a23b8c711df95d77b9
-MISC metadata.xml 319 BLAKE2B 203bd5beb97490bf6884574375184b52f9b361150df9168e9210c89499e4287fe3988b4ae72bf11b727298a3ce3fe191a0ddbbe1428784608e61ebbd91b6c5e0 SHA512 360705633991f785460e1011f2e01e6557d7db088a856782d7ffdd6573d3a131068e8fa02c3f59a45e465a1df452388aa9305236e55e8bbc61e86a4a5647772a
+MISC metadata.xml 379 BLAKE2B bfd9648b2bbfa43688fbc1741cf4498579a51ad9daf0e52248298fbd421a1aeb6c7a4dd3ef7b8d688b2d651aefa11bafa40aab040a0fefdec4c5e00bcb8e52e9 SHA512 9c520aaceddb3dc48a29f29017b36b7b6898087d0ae61c2b093d3d8690a17d9e3adadf42056374eeed77380da6c148d421ba2115d06157c762f165cdd4c6bb80
--- a/app-admin/sshguard/metadata.xml
+++ b/app-admin/sshguard/metadata.xml
@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">sshguard</remote-id>
+		<remote-id type="bitbucket">sshguard/sshguard</remote-id>
 	</upstream>
 </pkgmetadata>
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@ -4,7 +4,7 @@ DIST sudo-1.9.12p2.tar.gz.sig 566 BLAKE2B fa679038c33d2bf1476b56944872d3a18b66bf
 DIST sudo-1.9.13p3.tar.gz 5100355 BLAKE2B 46218ecf4cf06d2280ccf4c257b12a6f697eda17b96a6b7aa56f6c7f22d847ec2a8036b9f615c3328d985656539c95f37a40c6c72dfa5f65786ab45a28cf353f SHA512 c0c5cd0c6308868afdad2ecf55b86fdcf1f49889b30831c9db3bc56a63dc3a07686c285c20b2500494b2a76653e2ec69196abdc583312609a5db1c81a6e4e737
 DIST sudo-1.9.13p3.tar.gz.sig 566 BLAKE2B 5b59c7178bf157b67500d972fe1b373bc86ab09345f59733cffa85700221ceec0d5be10bce4838f16e9238154c90a972570a7a933f48dbd56bc64b38dbc0043f SHA512 eebf36e86ebd03daca05838bc56d9b1fb7ea8584a83a9f0e03c5ff07e612d36472b23797c628eff1cf4301832d139de0de62ddc8b17e20f1498f769a4db1249a
 EBUILD sudo-1.9.12_p2.ebuild 7398 BLAKE2B 34cdf8e3ac4d0fa63f435d831ff572fa9afab5974f2910c4fd16bc3a20cae3a081cd59ed0d7fcd62f60086c338e69803ec80426087daf424ea3522354e9f7c17 SHA512 7ba2341ddfedc10c267946eaa33bd6c694c1429508b1e3dfa52fbe04a61eae17cd2801784f294da4f63f80cc745d66d80f07d7fc949b6d96a990926dc25836f6
-EBUILD sudo-1.9.13_p3-r1.ebuild 7474 BLAKE2B 4a8b0aeba7ec24fd0bca81006c031fe1796efb2c086819153e878f2a009c0dfaa2e883a8f89c2a6a120679de765579c060430387b5bc3c538f626c82f6a52f4e SHA512 98474e772bec7f0449be59d5b81c8a598194c06109707e75b830e9788fe3cd7ffb96b590debc61c92776f390df409065c89fdbf2c687fde0f3cbab7d6a0861e6
+EBUILD sudo-1.9.13_p3-r1.ebuild 7467 BLAKE2B f5ee11325d01317573186bce11061ad3c1a2aeeddb937185252d63f3a4855bfa3887e974c0effd65c2f4e13f6769d84f8ac6c89afe51f5508de9b7095c905256 SHA512 0d7b61c78652357c70973a539df634dcb79b135aba86c959424e4bc59f62b47bbadcac7742a5c8fc0d7ed8ad882c3eddb6a4e9a0660175a671c96db5d6e1dc08
 EBUILD sudo-1.9.13_p3.ebuild 7398 BLAKE2B 34cdf8e3ac4d0fa63f435d831ff572fa9afab5974f2910c4fd16bc3a20cae3a081cd59ed0d7fcd62f60086c338e69803ec80426087daf424ea3522354e9f7c17 SHA512 7ba2341ddfedc10c267946eaa33bd6c694c1429508b1e3dfa52fbe04a61eae17cd2801784f294da4f63f80cc745d66d80f07d7fc949b6d96a990926dc25836f6
 EBUILD sudo-9999.ebuild 7406 BLAKE2B db5807280c13b6af566ff9b4fe52ef59a84af4b83c1533e61756e2f070b79b39280e8c119cba4722c5caec2e0100054fd5e91144c3d02c4eb0d2a3d4b49f8fa6 SHA512 6ba837f09404f3db44fae8d30153d58fb7ba88f7542c3e0548593cfbe2a62d849582244098023103c0cceeb6342774a279611bd5357d07179597646b424e448a
 MISC metadata.xml 1107 BLAKE2B a18b1d280445ea98ba686021abf08ab47a5ac590795018c125008f2a8e44f7ea45e256e32a737781030960cb984bc16d8fd23175fd1e88b294e5036c86085367 SHA512 8cacbd9a1a23fc7734c5ad8b95c769b8506ec35490b5e3f69439bf71bd51d1eaf04fe699a82cbb3ac56182195fff570d75e3b20c33d86774480a2939122752a6
--- a/app-admin/sudo/sudo-1.9.13_p3-r1.ebuild
+++ b/app-admin/sudo/sudo-1.9.13_p3-r1.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-admin/terraform/Manifest
+++ b/app-admin/terraform/Manifest
@ -4,7 +4,10 @@ DIST terraform-1.4.2-deps.tar.xz 297847412 BLAKE2B 3a9cae729ae0f059f50a7f41a3300
 DIST terraform-1.4.2.tar.gz 5111071 BLAKE2B ec79eae36c9e462fa94afe2127343fd7f1e4e629b077fd6ccaea092cc53bfa74add2407070bc0925f81c12e51f758561e535aae298b8fee5d9fffa32b86bed57 SHA512 66b937dae65c12eddfca9a4b95294fe5fff2ccb79f2afcd8ec47d227e0a36f8edba4190939d59c80a78a0752c42e43085e30f09ea66fd06531dc9cfe30fd78f2
 DIST terraform-1.4.6-deps.tar.xz 297873376 BLAKE2B d4346810ea5dd0043524637192b8ba669d9d175857e2b96c1e40865ab7339b27f0e36651ead8bb122f7aae595202817b368d95f0cc38ac31a21e93834594eecb SHA512 59ae5a575ab8b971e2a890c4e87548b126b02941d0bc58103080f26a0c092851030a372b64324b0ec83eac85aa683a1a4211ce385d2461afd1584e2037faa255
 DIST terraform-1.4.6.tar.gz 5118386 BLAKE2B 8015945c4e1cc4fff91b2b72a26182cfba6430d0268b00ae7345b4f29690d8876dfc55ec535342ef194d0674b8b9360abb046f3e56161cbcef27d0c7e02c1cbc SHA512 635ebadb275218a348b8d386aeed72bc8cc740d931ee5feea896ced80709d83ba265d40e0a335ec816e9568e42272075e3213670df23e603e342d94f3f42830a
+DIST terraform-1.5.0-deps.tar.xz 297939668 BLAKE2B 12fc9e87096a08b1ac893e48872e0dc636afbcdb8c36b721ffeb5b34dff0ac377b5c1fa77d8679017bd98bb4973c34fd4055373fcb628ad63c02646c289f4692 SHA512 b6ceb57cd35c670526046f61bc3ab5f9677816d061b77079d1afe4ab8aa5665f894b3066b40ccf225bd73f12a21fc74610b7eb42907f1dbb1e1c0e1823804399
+DIST terraform-1.5.0.tar.gz 5389374 BLAKE2B be4026ccd9b077dcdc51e606693a9dc6fc12f9dee9d704c2f2347dcc43fd2232b31e5a7c3cdf407e3cf0f588f412c0fe9723fac70f2d872ed0723a3a7b827e28 SHA512 3b46ed8315881a5777ed346667e39ab896e595e9487340def7798c006afe5a63f49a47e20621b39d336582854129e22c63eb690e33648c408ccf5bc504add025
 EBUILD terraform-1.3.9.ebuild 882 BLAKE2B 17c22385917c18bc6f8cd4937999cc285409b6748623cc59564865c45ee9ba94bfd128522ec4bec548078365c28b1f996410d5891fdd8361ae8910e595961e1f SHA512 8b7034c259240de694d1e2ceb59f9ba7eb513782db6fe94a28559e3bb5314e0922a5fba80a5a5d1f5e34fe0ce9d3e486d7435e75029049b967d834b21b18405e
 EBUILD terraform-1.4.2.ebuild 883 BLAKE2B 454e0cf7bc2e38577050b9c36c459e564c695e8e8abd7213d5071b14e5eb68ee1c2338df91810cd837bbab2ee10399845e2db2ae0122fd7e6b02993a200f22f5 SHA512 c65842f8589425bacd5dcfd84d9de00df6ef4274ee260b2695b4c6ad1e81e29b8b2fac0b42c6e7ebc92effbfeb3adb7c18e170e913c3ffde5a24a04aadd3aedd
 EBUILD terraform-1.4.6.ebuild 883 BLAKE2B 454e0cf7bc2e38577050b9c36c459e564c695e8e8abd7213d5071b14e5eb68ee1c2338df91810cd837bbab2ee10399845e2db2ae0122fd7e6b02993a200f22f5 SHA512 c65842f8589425bacd5dcfd84d9de00df6ef4274ee260b2695b4c6ad1e81e29b8b2fac0b42c6e7ebc92effbfeb3adb7c18e170e913c3ffde5a24a04aadd3aedd
+EBUILD terraform-1.5.0.ebuild 883 BLAKE2B 454e0cf7bc2e38577050b9c36c459e564c695e8e8abd7213d5071b14e5eb68ee1c2338df91810cd837bbab2ee10399845e2db2ae0122fd7e6b02993a200f22f5 SHA512 c65842f8589425bacd5dcfd84d9de00df6ef4274ee260b2695b4c6ad1e81e29b8b2fac0b42c6e7ebc92effbfeb3adb7c18e170e913c3ffde5a24a04aadd3aedd
 MISC metadata.xml 1076 BLAKE2B 85b510c328c94106cb16527407d4694f6acc80d5aaa7ed677efc438be3522e52befc910b5b8805d2d1705bf1b0b220ed631e40bdbb1297779e96917158977f1a SHA512 06a6e462631d6ae026a127ea4c3f1cba4d84651d03011e08fa028adf2fbcb7dfbcd003d132d4a0ae58b7addafa5588270c3155d0cc400a3730628bd8bd716d95
--- a/app-admin/terraform/terraform-1.5.0.ebuild
+++ b/app-admin/terraform/terraform-1.5.0.ebuild
@ -0,0 +1,40 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module
+
+DESCRIPTION="A tool for building, changing, and combining infrastructure safely"
+HOMEPAGE="https://www.terraform.io/"
+SRC_URI="https://github.com/hashicorp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
+
+LICENSE="Apache-2.0 BSD BSD-2 MPL-2.0 MIT ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv"
+
+BDEPEND="dev-go/gox"
+
+RESTRICT="test"
+
+DOCS=( {README,CHANGELOG}.md )
+
+src_compile() {
+	export CGO_ENABLED=0
+	gox \
+		-os=$(go env GOOS) \
+		-arch=$(go env GOARCH) \
+		-output bin/terraform \
+		-verbose \
+		. || die
+}
+
+src_install() {
+	dobin bin/*
+	einstalldocs
+}
+
+pkg_postinst() {
+	elog "If you would like to install shell completions please run:"
+	elog "    terraform -install-autocomplete"
+}
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
--- a/app-arch/cpio/Manifest
+++ b/app-arch/cpio/Manifest
@ -7,5 +7,5 @@ DIST cpio-2.13-CVE-2021-38185.patch.xz 7844 BLAKE2B e338950e03c3eed3b4288435c9c7
 DIST cpio-2.13.tar.bz2 1354559 BLAKE2B 45d77723acb55f15c8574ab5a2fdff6fb1767629d177dd3416b0268e9f82ee6bdd11b4fa591ef020efccbdc3f4918cf77263169da1a0f6422dfe1a9712295778 SHA512 459398e69f7f48201c04d1080218c50f75edcf114ffcbb236644ff6fcade5fcc566929bdab2ebe9be5314828d6902e43b348a8adf28351df978c8989590e93a3
 DIST cpio-2.14.tar.bz2 1521004 BLAKE2B f2fa9f5bc39cd91f4755fdf27f43cff4d1c1f098639502689a01314762ad686bf357a1eda7f92e4c802e6e8335548ca31fc789cea056ef685c558892ddcbebd1 SHA512 2dc93a81e31b6fb7ff9976243d22ca7a84bb396c7ad09e0abfb5d5efae1164ebb319fb89be45045797f8c604b3e3d2ea0746e3cfe559aa86282ea4ec9a17da28
 EBUILD cpio-2.13-r5.ebuild 1470 BLAKE2B b386190f7ae374d4f85397ee78e2709238781b68b254aa41241bec7badf05e8e50a27f2991488289c6673ec4f1b252cbfdac725e99336121e2a55f31ea4cb17b SHA512 a1fd85b530866ab34a315fa76755acc65d5334eb1be32904e31e99ebec97ceac94737cdbc28d2df11f0c919d85f9c48ebe5d3b0d6980942cd4e262f2520883c3
-EBUILD cpio-2.14.ebuild 1152 BLAKE2B 327dc590f2a7ff1f3192ebcd244aed2ed9f3e32ab12125824d54db31f70c969db4ac2959d372801461b91ac49d7c73c66a4074b8088e2df4b61f17ff9edd1767 SHA512 f43c229df6476a38db0eed90275472fec4b6265cf15e3876dd37c495009f0b9b7fae7a01366723470007b76691ede66b58234c14a1be8cacd1e9dbbcac08e163
+EBUILD cpio-2.14.ebuild 1144 BLAKE2B 950b9b3535c5aa8453a118a54163983856defac3ffe1ee21ec7fe58430cf86e6aa5eaae5b6ba2221a2bac660ff979bee0e5cab02a2b0aadf715ef295bd203d93 SHA512 5eb0e4509993eeedf8a8d156d63b641bd0004d9c4b695f89a2c25d78703202d812d48e6bf942c2ba8146abdb34ffc1dc457d0fd42fc2ac05daf7232febab84ac
 MISC metadata.xml 328 BLAKE2B f8b8bff5b160351a92837553de20eda1da31a6c0594c1118e1f71b3cd19d9ea8d3420bdce943d83644f5ffc234950f95fb9229a213660767dc5281120085b26f SHA512 08e1c6a03b894946bf6332bf46c8a7534ed0998777b30cb9eecb9c746bb333b65fb41dfeeb6938cbc08d0ad0a303d752ea70a6a6a6ae2c5c2935b2b4e4d9928f
--- a/app-arch/cpio/cpio-2.14.ebuild
+++ b/app-arch/cpio/cpio-2.14.ebuild
@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/cpio/${P}.tar.bz2"

 LICENSE="GPL-3+"
 SLOT="0"
-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="nls"

 PDEPEND="
--- a/app-arch/dtrx/Manifest
+++ b/app-arch/dtrx/Manifest
@ -3,6 +3,6 @@ DIST dtrx-8.5.2.tar.gz 34112 BLAKE2B 01d13bc2f53bb8093c8c69acea6af4d80ef3c58dc61
 DIST dtrx-8.5.3.tar.gz 34147 BLAKE2B 156d2305f777b63870490736fd769a9d480f390d41ac0aa6acac16d4c5b21bb5b3f88d7b2cea6ecbf74511895bb3c3d923a6186d5189ebf3f7a5f4bb5db6c0f1 SHA512 0c29f0d9ca03d11206297669c20c3443c420db4aa0d91da54a5f6ac7236120af04a1a8d7e2e4f85b3d7e6c6050786cc0293bab02f424fe3be52a40f069d397be
 EBUILD dtrx-8.5.0.ebuild 1098 BLAKE2B 6c2022944f781903b8c466b54ed6627b3e5744d424e3e72a9efdeebcb49ad6db39d5710c8d853cbf9e2b8158ee8d8805e66ec918b6dd0dcc9b7df7c8cd580db0 SHA512 f7b010efa34cc5923691eb397e27ca437f901b25a6d7afc69e5c429daaaec18416063fff44d4aa2e1424b5704be2cc1772f1e803b53be975e9e0dcd80cca6238
 EBUILD dtrx-8.5.2.ebuild 1098 BLAKE2B 6c2022944f781903b8c466b54ed6627b3e5744d424e3e72a9efdeebcb49ad6db39d5710c8d853cbf9e2b8158ee8d8805e66ec918b6dd0dcc9b7df7c8cd580db0 SHA512 f7b010efa34cc5923691eb397e27ca437f901b25a6d7afc69e5c429daaaec18416063fff44d4aa2e1424b5704be2cc1772f1e803b53be975e9e0dcd80cca6238
-EBUILD dtrx-8.5.3.ebuild 1099 BLAKE2B f164bc3195a33313c112dd6b8144dbbdd8fbf3ad433fbdcf8057ee83580e82b77515509d79e4954c9d3dab951b62aae11b3eddc74acd9973ddac0bf7c51befbb SHA512 81294fc00ffc2ad8638f71a2658075de5ea90088a4568bd5e2aa95427ff3d6c1043c16358256428e063323e67c1278bf41229d2d5bb701a1f76704374eb5650c
+EBUILD dtrx-8.5.3.ebuild 1098 BLAKE2B 6c2022944f781903b8c466b54ed6627b3e5744d424e3e72a9efdeebcb49ad6db39d5710c8d853cbf9e2b8158ee8d8805e66ec918b6dd0dcc9b7df7c8cd580db0 SHA512 f7b010efa34cc5923691eb397e27ca437f901b25a6d7afc69e5c429daaaec18416063fff44d4aa2e1424b5704be2cc1772f1e803b53be975e9e0dcd80cca6238
 EBUILD dtrx-9999.ebuild 1080 BLAKE2B 473add785e51e2e1fdc1c7ab623671bb45639334e4817dff92d214410f629807a6a2e81a47f56145ca1ffa0327da9982633abd1d59eb72d55d223ad4bfb72e22 SHA512 ac336d34d9bf3ca95117b020acc8b5f6ec55533056e6a65d41d3cf6178b8ef9f04be8b6452109fdbede210a552add61104c26af375252ad43753b59d307e63a6
 MISC metadata.xml 439 BLAKE2B 7490943dfd8a50c9d0ba628b72b6e8367a148b942aba496744337559e1134e26bb1b8fc0741ac912607826b8084643a568198a578c95bc10315f868bcea7742a SHA512 69a3996fd3834a22f1a028873c1061cca325224cfdf321b4c01687d5099aff4e7ed6c601076eaca5b88affab20f0d46b921a13db838de7243d3973fe71a4ab42
--- a/app-arch/dtrx/dtrx-8.5.3.ebuild
+++ b/app-arch/dtrx/dtrx-8.5.3.ebuild
@ -17,7 +17,7 @@ if [[ ${PV} == *9999* ]] ; then
 	EGIT_REPO_URI="https://github.com/${PN}-py/${PN}.git"
 else
 	inherit pypi
-	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~riscv ~x86"
 fi

 LICENSE="GPL-3+"
--- a/app-arch/lha/Manifest
+++ b/app-arch/lha/Manifest
@ -1,4 +1,6 @@
 AUX lha-114i-file-list-from-stdin.patch 999 BLAKE2B f039b70dfbb82f9d2ada3df90621b4a10117c33e4a201c5f22f8093ede4da5ace496af62b24af0c7f59a8ab28a10afbb6cc2be4ccd1c427f5a4e796455f8cf69 SHA512 28c79640e0bc1b7e7e29f06bea319ebdb594568d5752f1067db472d054c91101fd5d9d769448e32463025d162adf70fd067a161a9aa4ad1b1e38aa0e8023173e
 DIST lha-114i_p20201004.tar.gz 220541 BLAKE2B 64268deb40de67d5f4888f7d4b4529fa1b6ca02c562bd041d9edd1ac9cc74ccfa43198c79310bd354806e3095f6aba8c97256b49686feb8c713e3d8110137103 SHA512 9a9337cbb6a3d71253597750301e37163c5b495e712f2374adf2ac0d19f731ed49482a3f8b639e4c48c7ef6fa7ed9f9081516d77548e9c88ed3b9ac037efeb06
+DIST lha-114i_p20210328.tar.gz 231115 BLAKE2B f9587fd2f99aa80498ed69f43efe189a6db12881c6ea748763e8ae071180a30578651db11cbba0216103f6a7741d37a0e55b2530a7e458046a7230f6101f05e7 SHA512 46fc722f9f15dbe75600c2aeecbf94357aa24da964bb03f8326d9d13affa2ea60d4ec5dd21a4f5014f2cbe4e06f4bb959aa8de89a5491e1600eafdd909b293d2
 EBUILD lha-114i_p20201004.ebuild 732 BLAKE2B e7b3f9fc6884a8bd72cc0ce67a64aba5e23f17aefca1ec86e2b5b4ed147db61a5a57c2101435304d981ab059f1190de7288d66cef3f8b99aa93cebb9d1756896 SHA512 86f5bb6003f421242156994d8b7277c06f010f5286e0d924b97993f76daddbf50718625c7b7260f03617da040c59b77de0220f8b01c21216a5629cc9fa3611cc
-MISC metadata.xml 314 BLAKE2B 4057e0abcfcc28a423ab5bda2a379438bd618a8dd47e65dc56d078be325469ac27d2099c3ef5bec092aecc124930106ccb74f9647fef2efa79b6080c320162fd SHA512 d9410431e832f45dd85c9d2d476ab3e2b8a5b322e40ba04f79a1eebe629977593543c507474d2496a822d29453b9988721ac9b1bb33a32efa6832496d75bd584
+EBUILD lha-114i_p20210328.ebuild 738 BLAKE2B d66a36c8673cc5b6d4fef49928c743d2f36e0a48a8f30d71285e4c123c5a4fe1f3c64ba5fb5fef99610084a87e73d554863b9e644d967ecb0ff04e78d24ddc48 SHA512 1008e86fd1c6be3dd43152e55ced01f552952c85492673139b6c66236cc44f230e73a1ff5e9aa5d5db21e93971867d87cb75df575c9c5bb27ecc8f60e61260f3
+MISC metadata.xml 366 BLAKE2B a7fc5ecb79726152b5a531145574116fe5cc90f91580ea2a206489319a930420ef7397bfb9bf857d9340f5d66e18d98d587977554ddcb6b73c5b590bbe0011a0 SHA512 a219c8eaa5817fb989ce891a170166338e338a9b0e275c6f88759b0d6df197adf8e141f1222b3e02e539994683f2dd1cf14d9c623c2c12bb8f3f57c38c55e2b4
--- a/app-arch/lha/lha-114i_p20210328.ebuild
+++ b/app-arch/lha/lha-114i_p20210328.ebuild
@ -0,0 +1,32 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+MY_COMMIT="26950220c9c7590fd603ecaa54a12a52371affed"
+
+DESCRIPTION="Utility for creating and opening lzh archives"
+HOMEPAGE="https://github.com/jca02266/lha https://lha.osdn.jp"
+SRC_URI="https://github.com/jca02266/lha/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="lha"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+S="${WORKDIR}/${PN}-${MY_COMMIT}"
+
+PATCHES=(
+	"${FILESDIR}"/${P/_p*}-file-list-from-stdin.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_install() {
+	default
+	dodoc olddoc/ChangeLog Hacking_of_LHa
+}
--- a/app-arch/lha/metadata.xml
+++ b/app-arch/lha/metadata.xml
@ -6,6 +6,7 @@
 		<name>James Le Cuirot</name>
 	</maintainer>
 	<upstream>
+		<remote-id type="github">jca02266/lha</remote-id>
 		<remote-id type="osdn">lha</remote-id>
 	</upstream>
 </pkgmetadata>
--- a/app-arch/lxqt-archiver/Manifest
+++ b/app-arch/lxqt-archiver/Manifest
@ -1,5 +1,3 @@
-DIST lxqt-archiver-0.7.0.tar.xz 181612 BLAKE2B 41ad378f20a9a8f3d7ccfc7406d480eecfad41c991781f503947b37ee26eec5de38b44ea318507dc209a2f2f6d68db65e0f9cdf61920a47fb2d02dd975960f86 SHA512 d86fd636b1b2345ead8c4dc0161311b3e361d274902c5b34b9aaccf1a0b9af46d329fbec0d2249197b8e1c837d6949f723451f67fdc9ca4c6b7f1c2cf59daeca
 DIST lxqt-archiver-0.8.0.tar.xz 181572 BLAKE2B 7bbd2b229cd8c546c86d742c13dac4bd00e24e85a146879290652a9ae41c9ced621738d06284fe285c81f2d5f8e43a5126b9bc61e286342cfb9d7fa935c330ee SHA512 70266581478e75505f708eccee4fd1680c1ff012dd4e99138d0c2d17fb8dfab24d9d5e5453d5d4a3f7a9b8437e8a980c3edf190f3e319400c46a655ba7db4898
-EBUILD lxqt-archiver-0.7.0.ebuild 1288 BLAKE2B 3e2a54ca740079896c95fee12b66e61823936e821b2ef96721d09c6bb092545ac388202b8bbbbb48af5f485c515a1a89358a1e11b4fc9fc93cb5d0613d529cfd SHA512 d32e1d1f22a83f20b5e2ad80b1ef9bf0708be0353507d7c0795b43106999dbbd0a7e487f456ffc180eb68edad1e2ca2b2cc4255769237c12b0548db22caa5cb9
 EBUILD lxqt-archiver-0.8.0.ebuild 1288 BLAKE2B 118d2169ef543d09e05b28254e30bd2205d649a3b9d5a23777495f94ff9f2e2455be91ca1ea121e7619ea6cdb9fbfd01dd6f1c661a3136676ce4c6008efb21ab SHA512 d87c725fe950729afa18388f9a2aff6d6dd4928e24ffc2249cbf64b2e665c1f3a2020ef6eb36dfb8454517f322e4524319d3e4561922886359435f640d2d0151
 MISC metadata.xml 330 BLAKE2B 1f25c787f9b43ef0ef62206ca9ab67dfab8b95b2786fc84248541159507290229b291b9f83541adc196b58a9dcad7c0f3abd18c5c899a98978dc72403386896d SHA512 12f4638550e157da50134bf6c7cb480bd49661b9655900efdbb12a023c4bd4cd13018d7caa672096329691cf8556f89c9d13d6710463048329c8e3bd5f04f6ee
--- a/app-arch/lxqt-archiver/lxqt-archiver-0.7.0.ebuild
+++ b/app-arch/lxqt-archiver/lxqt-archiver-0.7.0.ebuild
@ -1,53 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PV="$(ver_cut 1-2)"
-
-inherit cmake xdg-utils
-
-DESCRIPTION="Qt GUI File Archiver"
-HOMEPAGE="https://lxqt-project.org/"
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
-else
-	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~loong ~riscv x86"
-fi
-
-LICENSE="GPL-2 GPL-2+"
-SLOT="0"
-
-BDEPEND="
-	>=dev-qt/linguist-tools-5.15:5
-	>=dev-util/lxqt-build-tools-0.12.0
-"
-DEPEND="
-	dev-libs/glib:2
-	dev-libs/json-glib
-	>=dev-qt/qtcore-5.15:5
-	>=dev-qt/qtgui-5.15:5
-	>=dev-qt/qtwidgets-5.15:5
-	>=dev-qt/qtx11extras-5.15:5
-	>=x11-libs/libfm-qt-1.2:=
-"
-RDEPEND="${DEPEND}"
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-
-	elog "Please note that this is only a graphical front-end, and additional"
-	elog "packages are needed to have support for specific file formats."
-	elog "For example, to be able to work with the 7-Zip format, the"
-	elog "'app-arch/p7zip' package may be used."
-	elog "For the full list of supported formats, see the 'README.md' file:"
-	elog "https://github.com/lxqt/lxqt-archiver/blob/master/README.md"
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
--- a/app-arch/lzlib/Manifest
+++ b/app-arch/lzlib/Manifest
@ -1,4 +1,4 @@
 DIST lzlib-1.13.tar.gz 130005 BLAKE2B 88721890f111c2bb1901329e9cc39e7f581c220bb58bbc93098c34984b7557a80adff236f5755057099870ba20201f6b692925080b97965b4612d221d21cb33c SHA512 b9c4e5a9aca982984b497d1da2e1f0439b37b19acaf88a02f5af114b0a65a828c5ae235b3bd4f419ce001963de38a4d03445a6a1bd93f37e783e799abd75578d
 DIST lzlib-1.13.tar.gz.sig 72 BLAKE2B 66d7a9939a5e23874a6927545f265cf315d634a166d7f22cbe4f09ab88dbae778aa9c6f77e6d5e51fbaadc9a503f735fb2bc834475089a6046782f9af22b472f SHA512 1db7a91b3a84d70874c0ec92b2764ab6805e20a351438b975f4e72dd6a1dbe5a4448d47af2bb6d056bde9c6102df375454724d536efbdaa90cd7dbf08eb01c81
-EBUILD lzlib-1.13-r1.ebuild 1112 BLAKE2B 63d01d3088f031f7c5dd0f260a9237d1e24d6f4d8076405211d48df5186d56affbfb6933314677d92c5b3781f95a1392649eaec5bfd3833713b6138e39bb4119 SHA512 6ad8e668471c76b30cd1a755746637cdaa26934389f2e976b23a95eef203a47628a066eb0e376b44f36f9b4e939d578e764fb68ab6283a605fee2e21fd9bb6c6
+EBUILD lzlib-1.13-r1.ebuild 1119 BLAKE2B 045412a28361d01287a3c87449895f8a9af76cfca528f154ff147bc2d8bcec7851c3803ed7cd00ce0229796cb8c781528459d36971ec993f8795e747e0160f33 SHA512 33a7871ece11bb2f3aaac0845650c715ea6f3db704191a4b33091a768c4d74226cbf2d15dc5bf1111453e63c06679cc00a039bdc14e1b5ef9988e4c05108663f
 MISC metadata.xml 248 BLAKE2B f308d2aa052d11e427850af58bbebf95e7773f5562ed221f39043474b4c3827d724d49667edf1874272a5586a13201159f40e8f5eafb7e400e79c6566e1a6ac2 SHA512 b875c838394523483ae7d93585207eb3c642a345bbb08e1dcef3ceb737c813fa779e2f5479d48cdcc30732b8a0a9e6ecc648df940def6731e4dff43b23786e6d
--- a/app-arch/lzlib/lzlib-1.13-r1.ebuild
+++ b/app-arch/lzlib/lzlib-1.13-r1.ebuild
@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( https://download.savannah.gnu.org/releases/lzip/${PN}/$

 LICENSE="libstdc++" # fancy form of GPL-2+ with library exception
 SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"

 BDEPEND="verify-sig? ( sec-keys/openpgp-keys-antoniodiazdiaz )"

--- a/app-arch/xz-utils/Manifest
+++ b/app-arch/xz-utils/Manifest
@ -10,6 +10,6 @@ DIST xz-5.4.3.tar.gz.sig 566 BLAKE2B 1e3f86a2de532e77cae4c31928d57edeac81ca207e0
 EBUILD xz-utils-5.2.11.ebuild 2861 BLAKE2B 2f82998b46a1459000d734a6f826985331550b7d781ee6a6aef857d5f13c8f04973d3097ff292a3923b3e77c5ab0841009229125a5e47797b05da4aec640ccfc SHA512 37e4ff8983501593b5d1f528c2a960093834e57e647ef9963100aa876fde49a0534afafcce83ab2edded61307b885eb30fe33b972012361dc8f703b96a390a33
 EBUILD xz-utils-5.2.12.ebuild 2848 BLAKE2B 7e6c6dd50418e2a374edd75b4a4796d2421269e64dccdc51294700413301fefe1a3aa60a64580dd6f797aabb39122a579b5e95b80a68874110dd3960e063139a SHA512 a2a3e2bbd23295c2e2c9f05e495a7cb24b43a52e7cd1f440dad0dc79ec4cd5533686b407f1c8cd6c66ec697342e620841d50c8e545e0852003d13aa566c93d7c
 EBUILD xz-utils-5.4.2.ebuild 3178 BLAKE2B 855fa2339a86f5bc9ac2f5586a1c027d0ec9f7f62fbb159dc54cf05d5cd86dc408cf510aea3bafcfeea3f08cbaab5a998e65165dd5f3103a5a9ee6e9db72e0eb SHA512 eaa9b7aaf79ac42bc2ce22c713d7206c594872e31c66873d3c0e7560698d84bb9a629f44f5be6f2fb247ee9eb8656618af1f1902d750663d4b611fc51935a703
-EBUILD xz-utils-5.4.3.ebuild 3109 BLAKE2B b46142678c3fb5181c1c085cf9caac6c6b898f916d4a687545975d822bac60f75eacf6ef92d8f100a2c89cf9a44852fd2ca4e84004a0fbf0a5288a9f2a00f0e7 SHA512 244d9b2d6ddb4cd53bc92446b7f4b42f12af3e497478f1cde97c34c63529069304aecf87373d8fa342de8868c9fdddbafea4c498662f1b51227ee9dfd72de683
+EBUILD xz-utils-5.4.3.ebuild 3102 BLAKE2B dd71deb7a54da81dd04adf08642fe5dccb6f0546c68d2817f0ca38d4d48e649fb3496385b7192d46125ed658b18241db68b60f499d9be97782a5da3b68a26d76 SHA512 245957c439481caaf3e322b40f1e25dc6eec144a15e07eefd56fd23a3aecb775d5da4480abc2cd3dfc30ffcfa6a8e3a2003a623dc0ea7c054195fa1438e53005
 EBUILD xz-utils-9999.ebuild 3109 BLAKE2B b46142678c3fb5181c1c085cf9caac6c6b898f916d4a687545975d822bac60f75eacf6ef92d8f100a2c89cf9a44852fd2ca4e84004a0fbf0a5288a9f2a00f0e7 SHA512 244d9b2d6ddb4cd53bc92446b7f4b42f12af3e497478f1cde97c34c63529069304aecf87373d8fa342de8868c9fdddbafea4c498662f1b51227ee9dfd72de683
 MISC metadata.xml 663 BLAKE2B 7a6625813cb3bdbab8a37845c9c64ac53ff377db394f776357d4fff60fbfe7c7b0e954fdc15abcc8874dd6c0f9ee90bc6e179a00bc5d12cd2e7cedc6f998c019 SHA512 696e573853d5d401f22079492d8e2b5f3c27e9ec4b6095f5ff46f109366b1c65c11976123abed06f302b8f03aaa1b0c54884f0156fdfdce23f4bf28feaafd39c
--- a/app-arch/xz-utils/xz-utils-5.4.3.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.4.3.ebuild
@ -35,7 +35,7 @@ else
 	"

 	if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; 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

 	S="${WORKDIR}/${MY_P}"
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
--- a/app-backup/bareos/Manifest
+++ b/app-backup/bareos/Manifest
@ -5,21 +5,18 @@ AUX bareos-21.1.2-werror.patch 785 BLAKE2B b29c00d57818a911251b1ca48737267914013
 AUX bareos-22.0.2-werror.patch 945 BLAKE2B 54234731ec69337b89ff23e6f613f0fe9fafec5ff2b3b5bf2b121a33a49fd462890c877eb9c96f1e4d26507cf22f1c3ba58c9d6dec740e8b8bd13c518a070308 SHA512 a18159d42cb464cb573a5b9b6f008f323ed45b489dd1db3f6fd22ae0fa6ef40779118834d8f3f640bc6301ee55060c7b86c2b6f2d08dd7cf141ae9e0206e9db8
 AUX bareos-dir-21-r1.initd 362 BLAKE2B ed28503db1f91f41f97cc0f9bf83c9f7686a79c6945e82577b7f290df516b6e7ac403023e3aab8c86ef67f67cb3a99bd699fb2d1d0534d53d164c0143cef0e2d SHA512 fc2f217020206ff43238444910555338133370fe423959ca1b5ed53704d371db9993b3a42fe5d9c2065b12ba5a853f6f216ee7418d446466c8f0175a54dc6210
 AUX bareos-dir-21.confd 357 BLAKE2B 819a8c4bbf66a4a629128d3b23cc122fc340eb5672e406234d1a2960c30ed075989585e1e4801b2bde8f1edeca770d80b58e58bfcaeb45fa056afab4b610b013 SHA512 9858964a291ee9849e144f968a239758e3e6905bb5420717652114d8a583e3342e50f046efa41730f30cfc3f047b485251e93085fb13b327a6f2272d7c4c0309
-AUX bareos-dir-21.initd 541 BLAKE2B 07ec7d342948da390f26a7dbc2209b351ef1f56ada775a37505bd1a0d5d241e2198fa160c1f42dd05609a4b708aca8675684846bcdc038cf1f35d6c46be26c14 SHA512 0d1e1fb9d69bd003b6c99b4c0120c14a4e8bb9c5c112649d299e672623241f98453278667e315c13a0ab0e93b1c17a3d7c2b8f59544c2d764e32c691a1986f3e
 AUX bareos-dir-21.service 884 BLAKE2B c0a4fb957588136cd043be2670a03e05bd5ffad4ae87275636642961e0e105ff07fb0614490a71771bb7eecfb551e6f860d8d41104e56ea8c5d434c84c5602a8 SHA512 187e331f8495d27d14434bd71baace7051d254e2886c3814493600973cd830cb01f27153321821e0a3bd2356d55f39cf0878488297079ed80bcfb2693cc77809
 AUX bareos-dir.confd 640 BLAKE2B 0c80793f66ef9f3b46995a2dcf150b3d7a8a9f53ff97896887314ab31d6082949ac3db2c260b2fc7551c035183c31558cc853f768eca5b0bebdfa483280780b5 SHA512 af71699773ade63c98e2016f48b4d108f29a419a7533444245df4507a7ad7b807948986f9f850ce1f9af58fb445ecd44a5d880f68732b371a7a87dbc5a25ec7c
 AUX bareos-dir.initd 681 BLAKE2B a9c73a8e71a318746fdf8ed5894266ced8003e8cc56fa25d2b9810656875299af61862cdd58ab00ba8a241d0f4ff63fa6356eaf4d776ef836a5f12e453d0a72d SHA512 95da6492201ea5bf1b9bacce1a9dd7b2a864af4775158cbdac48f6c6feba26dbca3ea252133c7279f2be8b8220c0f5810b9fa1dd5ef5727c8d83eca64134ce90
 AUX bareos-dir.service 841 BLAKE2B e8c9508984f2823b334c3ef3c412f51e50666cd45aea1c5491a3ce6b1fadf09e7e0cb836d0658f5398209aa0a478c5a6b4fa1b67476e0fc317d6e25bc0fc54a8 SHA512 8f886d3c60959f009cf5f626f64071eb5d768ebf6c5ac0dd0c0c34d866d29563a2f0c68519363170ac35595cc743b432f46a54ce10bbfa530971f56b9914b0a9
 AUX bareos-fd-21-r1.initd 277 BLAKE2B 5a7472682a53dbd752be1c3f7fe4f5efcf8fc9400b92eab12824f9ae0a524e279010e05e9908db4522a955ee09cff72f34dfa6de9227fcb96c422a5eef6cebc1 SHA512 9828b8a296ca731d3dbc04380f728fff8831232c2ff04275760147b24d457aa518a43d5daf9cb808e84dbb9a100dc624eeb0fc73f1261060eae6e4d7264ce4c6
 AUX bareos-fd-21.confd 208 BLAKE2B 9bf3a34ee07741bdc22aa96f931c46349f8e3fd3147d8afe009904d171af2aabc14472f6c6a3d241ad395aaa0a1b575f37e0734eb6b10474bdc636294b32ab09 SHA512 4bdf1e9d5f2f7a85efdf9aaaa0d35daadf83e766afeccdba69a94490a2e59c0b46fbbbdb1dcd5be389603ac5a196fe35c0fb389bc241eab0bf414c9ec432451f
-AUX bareos-fd-21.initd 506 BLAKE2B 227045c6aa333b0cb62fe5ac2154183ac928dd1c3249324fec627c94861a0fe57bf98c2ba5917848b58bebedb251699eccbf352b6da7802f3b0125f8201665b8 SHA512 cf0403ca8f3efb5cfb57915df9203ff16ed69a72d8d0bc189f5f221d36233127d9ed5c8391a46969b0de5943ff4717f52ffae9a5afa1ae24e27631bd1c58b438
 AUX bareos-fd.confd 208 BLAKE2B a2c4692fd2736604ebd1f12d84f300bac8df46a08859ce61cca8417d2645f75bb14f24b5f4fcad70175b11d28a4c052116a1fe99028d634a2fe1fa89cf2c4313 SHA512 8134d37f9d74ced01e769c1a04461e0141cc88cc305441079d9e672d29083ff4ab329a2c36dd2bdc9b7f07204233ff1b6ebd72af2dcbb15af63759be9d0878bc
 AUX bareos-fd.initd 250 BLAKE2B 28d4f6b5ced14de5504bbb1594f72d10dbecfba81a754a2784087d6e544ef811160d711182bdb3efca9c5bc929dfa0781bc229059a8330800b587652d6748a60 SHA512 0005b20094f8e7d388455d73573243f46ba38f626d602b2b452e783a07fef66494a0bd1257d96748b4e9798f24d58788d824b2bf00fd1e13a0c2b44e415fc45e
 AUX bareos-fd.service 670 BLAKE2B b6a93c1ccc74d11c744783993ac68b31ec896e2bc7464fb7295677af86cd86a45c7bdae6c597c7eb2e9fb663a4757455b324260f96503e3d1632f9534b06048b SHA512 33304e148710f3ddb90d75e8803908646e43971e01ca590bb88f3ec03fd83c848123747a86c974ef4529eaadf77a31e24f833205bf810b0803cf0e46f846f5fa
 AUX bareos-gcc13-fixes.patch 4047 BLAKE2B 2f572888dc6efab15b245827165fea74b1bb0819c74b8367224f6a32b2b79427180ff2562fb473c188aaf1ec63512cafa54fefee860474da5dd1d2a36a2b8058 SHA512 4c42b780666cada8c7ffe5312783e756636d5080848e1dcc85d6b59973d1ce3078abfeb8f2375bded0b9418d61027304a24e48c209644513b4ab1f79f89501ac
 AUX bareos-sd-21-r1.initd 360 BLAKE2B 89fcefe6044205ec1302bb01ddf2650fe81746739aa5274c86e9af97aa8251ce0a822da3d74c3bad7510f3ea70cb40aaeff085a000f850287f7920293db36529 SHA512 1c00533a7885e31c4674b0fbb6c63d2ce2289d14dc546b66712f007d44a398bf0ef63b83b06716a0913f3b007dfd5bb7d6c65ce4d75354e036dfbe80187fcad3
 AUX bareos-sd-21.confd 360 BLAKE2B 36a73a27a635ec1a4c3d1592e896ba85c3c7d6e91c3c0a2e5057194b6fde8eff6576794c00c0838f27c8165fbc2c65c77f6e2e9cc684fa6c1f978b56701618a3 SHA512 eb5d942edb45d349804c90eb0379cfabca765d63277b21feb4f1937ef8b655b6ba9feb3b671b61f582996ff4f9740614c197ae990c00879731ec43d6da8f4286
-AUX bareos-sd-21.initd 512 BLAKE2B fec08730da8fad543bdae427296f9b942ed103be5a8c7fd9fd696537705e90a560a5e026b157e49833f27bfb00f4cc090ab1ffdb7e89f4a0bd59288e25b85f4f SHA512 407af1b90672959bee9206d3f241226e46a7c3091a79b91da70b6e5abb171f93dec53d5151713627096ec9fb81d0f7690a20bcf4c361abc8a018c6cc967db8b7
 AUX bareos-sd.confd 360 BLAKE2B d965bf4cf1db59982b57ee0b848f9f7156d695a37d2a3b4cb339ce5ac4b27717db6d609a71b8e318fb297a6065c6ce0c20d6e18180a9d47843de5299a43ce6cd SHA512 4077174b5b49f425d53ec36bde039cee0dc55204c1127467c01bb57c58e6495e000b032f060c5ae6d757472934127776667a78238bcc28fbbe7a713d3da18039
 AUX bareos-sd.initd 654 BLAKE2B 9cec4086c4ee0a5bbb2643a2e9179d09094281f6f93c99d1a3feeae5fff8a9ce1fdd259e09dce5f32c487209c87291d995d10b365d4f56dfbf1eb1aa245f919f SHA512 afb360c071118f72581d45c3db66a49e65c412d9aeb68e6b7d1dedc63b1b9cee4a81f9176d1ebfe800e284ba844d1f74bcfad69eec25d3dd41dcfc51832a7171
 AUX bareos-sd.service 812 BLAKE2B 7ac9754d98ea177614450045fbbaf7406592b30a280646eacdf31271a0cafd63e88ac463b1d94143ccac96c289de3f88a177edab665f073e7c7692037ffedb68 SHA512 6a0fdb3af03e9f94e0d755a3286aff36b41ab1f00a82e9864f6d3de6931691f6aba79aeb7fc952cec039e4174b545f53c23e96fcfbaed71192877d201b3086ad
--- a/app-backup/bareos/files/bareos-dir-21.initd
+++ b/app-backup/bareos/files/bareos-dir-21.initd
@ -1,22 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need postgresql
-	use dns bareos-fd bareos-sd
-}
-
-start() {
-	ebegin "Starting bareos director"
-	checkpath -d -m 0750 -o root:bareos /run/bareos
-	start-stop-daemon --start --quiet --exec /usr/sbin/bareos-dir \
-		-- -p /run/bareos/bareos-dir.9101.pid ${DIR_OPTIONS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping bareos director"
-	start-stop-daemon --stop --quiet --pidfile /run/bareos/bareos-dir.9101.pid
-	eend $?
-}
--- a/app-backup/bareos/files/bareos-fd-21.initd
+++ b/app-backup/bareos/files/bareos-fd-21.initd
@ -1,21 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	use dns
-}
-
-start() {
-	ebegin "Starting bareos file daemon"
-	checkpath -d -m 0750 -o root:bareos /run/bareos
-	start-stop-daemon --start --quiet --exec /usr/sbin/bareos-fd \
-		-- -p /run/bareos/bareos-fd.9102.pid ${FD_OPTIONS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping bareos file daemon"
-	start-stop-daemon --stop --quiet --pidfile /run/bareos/bareos-fd.9102.pid
-	eend $?
-}
--- a/app-backup/bareos/files/bareos-sd-21.initd
+++ b/app-backup/bareos/files/bareos-sd-21.initd
@ -1,21 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	use dns
-}
-
-start() {
-	ebegin "Starting bareos storage daemon"
-	checkpath -d -m 0750 -o root:bareos /run/bareos
-	start-stop-daemon --start --quiet --exec /usr/sbin/bareos-sd \
-		-- -p /run/bareos/bareos-sd.9103.pid ${SD_OPTIONS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping bareos storage daemon"
-	start-stop-daemon --stop --quiet --pidfile /run/bareos/bareos-sd.9103.pid
-	eend $?
-}
--- a/app-backup/snapper/Manifest
+++ b/app-backup/snapper/Manifest
@ -3,6 +3,8 @@ AUX snapper-0.10.1-testsuite.patch 2525 BLAKE2B 0ece146356113d456ef0a56e46e76eae
 AUX snapper-0.10.3-boost-1.81.patch 505 BLAKE2B 51111b4a6738efd7b9604c54dbb5754d3bef45ce5559d47902ea11cc4e550e5d14b41f5a65db19e631f0a3911fcba4149f153b527c2056cbf7186d41cd44bbc6 SHA512 b9d98ba08aef66b9ecefb4c9781569c71d198116e035307f96b02feb94a5284cf4aa963a11459e3f7d1c2519bc91f6214eac363d32ee129730f971f12ad0662e
 DIST snapper-0.10.3.tar.gz 409277 BLAKE2B bc4963081a24572015ff888b5cb85f3afa071e487a89e89f1a72d5b96391be69ad982c79ddfd71f020203d0c50ca07d67cbeb535cd6e57bc3d6ee269ef5c788e SHA512 74cb04d045304021564a0452769fdcde1764595a52e30947396c37fe4c36b3fba08d10505734bc0bd631986e933ee2bfaf67c871cba93a96e498fbfe5e2c6985
 DIST snapper-0.10.4.tar.gz 409357 BLAKE2B c2b33d917647118848dfd02315435d9dab21bcaade22b9da5a2d4d628c00731ecd9bbc7cedba223f618f336535ccba0ca92b065d572aab328337858dba76275f SHA512 f42bcfa541e1fff23f5057c9b38d93f31a28980ce1cd37e07bcf622ff9151bd98c42975610d59da0c33a9bee7d83290edbdd05e013839e4ca23f02e9a9f8c793
+DIST snapper-0.10.5.tar.gz 422114 BLAKE2B 35c4772fc84920755d5fe87cad4a73792692ab7a55bcbcae65f20bf2e0cbcfb79429a423a5b55a89dbfeba1ff0474741c884bc632daa997fbb86cec52b68e3ef SHA512 e710069374b805394d691f8060d2852e35960a965fd49bb59768ebcc53a615af1f36269adac2d916b5e3f1b3e42fb2a53049d8f1b8a6a8430e992fa0de49c235
 EBUILD snapper-0.10.3.ebuild 2083 BLAKE2B 78d21c76ce6f1cc5e2e852a4c9d0ec89d7f408e508abe0822614980b3407c9cd6cdd4f584e71e1009a3fc3b7e8f65195188a068672b443d8912e4b137879aca7 SHA512 994e79d4db8a382919a22088bfb7c79a2793d73a62be1bd12c6dcd1c30fe68149a054306cc002fdad356005d50bd5865700122f27ede96d4df5bdd5d269b0a85
 EBUILD snapper-0.10.4.ebuild 2048 BLAKE2B d730c1ea04297deeb262f9eba342bb54a93245575406ae913bd6d9b462ddbd25fe2f0afa0680bae2590f1dabb0d1a2b65076e6996d117839adfd926129eda5b1 SHA512 323eed8186bb058cd02eeccaa46efdbb4235f447a37aa5eacbb81095dbf40539284d22e88681985ad1799c410aff02b269e2970099b663d6e546627d76d67146
+EBUILD snapper-0.10.5.ebuild 2048 BLAKE2B 81d1af74eaf0c0154a8548f9752158a63e950317495100b70fb8eaf6aec6c0bc45888292e9215fa82891fd293c81652abf924527dd8bfb7d6640d73445e4a582 SHA512 3c2ec838a10edbbd9a3a7ff396d8b80cc56e5313f7fa0d995abab6c65c207d31ef86e550a7b419502042571beeda3472f3d3a55a9119aa44b8a1687844052962
 MISC metadata.xml 1331 BLAKE2B 891a27fbae2ed364a26952def66b3e9e62be7025580d7b89f559f284888efed53476f4a8f5bcd7209c3c4de8494913a05354059004ef6c3aa6c1829a3e093efb SHA512 add8dffdf453f079d09f06608cae732ce61e04a5fac1988afb0733c8d60a943efe054a4973e54ca1cf304ad3d3778fd8aa6b01fc16815a1f42f83048d58adb63
--- a/app-backup/snapper/snapper-0.10.5.ebuild
+++ b/app-backup/snapper/snapper-0.10.5.ebuild
@ -0,0 +1,89 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools systemd
+
+DESCRIPTION="Command-line program for btrfs and lvm snapshot management"
+HOMEPAGE="http://snapper.io/"
+SRC_URI="https://github.com/openSUSE/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+IUSE="doc lvm pam test systemd xattr"
+RESTRICT="test"
+
+RDEPEND="dev-libs/boost:=
+	dev-libs/json-c:=
+	dev-libs/libxml2
+	dev-libs/icu:=
+	sys-apps/acl
+	sys-apps/dbus
+	sys-apps/util-linux
+	>=sys-fs/btrfs-progs-3.17.1
+	sys-libs/zlib
+	virtual/libintl
+	lvm? ( sys-fs/lvm2 )
+	pam? ( sys-libs/pam )
+	xattr? ( sys-apps/attr )"
+
+DEPEND="${RDEPEND}
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/cron-confd.patch
+	"${FILESDIR}"/${PN}-0.10.1-testsuite.patch
+)
+
+src_prepare() {
+	default
+
+	sed -e "s,/usr/lib/systemd/system,$(systemd_get_systemunitdir),g" \
+		-i data/Makefile.* \
+		|| die "Failed to fix systemd services and timers installation path"
+	eautoreconf
+}
+
+src_configure() {
+	# ext4 code does not work anymore
+	# snapper does not build without btrfs
+	local myeconfargs=(
+		--disable-silent-rules
+		--with-conf="/etc/conf.d"
+		--enable-zypp
+		--enable-rollback
+		--enable-btrfs-quota
+		--disable-ext4
+		--enable-btrfs
+		$(use_enable doc)
+		$(use_enable lvm)
+		$(use_enable pam)
+		$(use_enable test tests)
+		$(use_enable systemd)
+		$(use_enable xattr xattrs)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	# Existing configuration file required to function
+	keepdir /etc/snapper/configs
+	newconfd data/sysconfig.snapper snapper
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	elog "In order to use Snapper, you need to set up"
+	elog "at least one config first. To do this, run:"
+	elog "snapper create-config <subvolume>"
+	elog "For more information, see man (8) snapper or"
+	elog "http://snapper.io/documentation.html and"
+	elog "https://wiki.gentoo.org/wiki/Snapper"
+}
--- a/app-containers/Manifest.gz
+++ b/app-containers/Manifest.gz
--- a/app-containers/distrobox/Manifest
+++ b/app-containers/distrobox/Manifest
@ -1,6 +1,6 @@
-DIST distrobox-1.4.1.tar.gz 231405 BLAKE2B 920fc2ccf20ad2b6af2a3ea3dfe5c209cd779d6490e6fb95110af5e74ce56354aa264f413c070a6814253a5c51e82be110b8fc86e536a4ae0881fa22afc16630 SHA512 6cee6b734bf22e678529b93f15cdf98f09506642ef5e204ae73590c29a85e205a16715588c9e49b1c39b71023ea906565078e9c2c1f6368df885d20bf37136e2
 DIST distrobox-1.4.2.1.tar.gz 235019 BLAKE2B dd512b183763a2e4c7e2b495bb50cc3fc3d764c48ce902b83e0b543587b60b458c6b9ae937057bfc91860dc415f9ad68fb648cf06faeeb56d0a4c27180e4c2e0 SHA512 d3bc1de91bf33b7ac500c0ae471feb28c9b1efdef6878bf1aed50ef394f69d2d36f99296f0a8182b139d9339558720b891f7dc1249a7f91c883c00bac5597283
-EBUILD distrobox-1.4.1.ebuild 722 BLAKE2B 199e4736b0acd141bdc427697b0c43f823c9a8228d0370e56c06100c99e98f1e7234ec38944f2afe937b682eea4a19b0463d0ee404e4e2d57fdc6fba000ad824 SHA512 45dc34339c58d55d2cfc742cd4b1ff9ccf846468ae8edb5930c187b1bc9f13ca89acf34e24f265fdfbd87493fcbc11ef4f021f81d55ae9e8e22e785ecf749a29
+DIST distrobox-1.5.0.tar.gz 5906290 BLAKE2B a1a3279e0644e140d38518e4f038bdd4fdb9170675443b3c8cb0c1b4144938a03449eab8b6259b20417069d58ba6e9e1bbb7124d50dd91e706e6f5397287d7c1 SHA512 3bd48b2715a6b9c2bd7457e84fca45e8893f90e6ea6d18d33c9581625e37f2169c03bc1029c339dd41cec6de8037063c040d3e2c22afb4995863171c8ff452c4
 EBUILD distrobox-1.4.2.1.ebuild 722 BLAKE2B 199e4736b0acd141bdc427697b0c43f823c9a8228d0370e56c06100c99e98f1e7234ec38944f2afe937b682eea4a19b0463d0ee404e4e2d57fdc6fba000ad824 SHA512 45dc34339c58d55d2cfc742cd4b1ff9ccf846468ae8edb5930c187b1bc9f13ca89acf34e24f265fdfbd87493fcbc11ef4f021f81d55ae9e8e22e785ecf749a29
+EBUILD distrobox-1.5.0.ebuild 723 BLAKE2B 5a7c80037a99b9731d779e5df9257a4c450175f1b936b7d856590f0f29009bbd73f5eb452e1db2ab848c9fc6a4354056d5509e6425df3363cecfbf52451fd436 SHA512 2772e5b244bd9e4758b52ecb916ca3fb06c86adc6db34c9b8970e99360f115dfd292640855159094eb66e58cc3c254db47129edf383ff2ecfccea8b416ebbdbf
 EBUILD distrobox-9999.ebuild 723 BLAKE2B 19fdaf771bc7ba3217245b84fd5eccc86285e106671dc44d37ffd94b4827849c68f327d80e91aae35c9ff5dca6f6a575770d96281066c6c27a7e7fde6fb95604 SHA512 ed1ab9ee3115fc409b9e2aefc2cd5063cc76d05e3fac891fe5ddea3dbb527cc576b76ff0f49e30c28e8b32e06a466968ae0b28bfd1f3f00b4613ff340b21dbfa
 MISC metadata.xml 957 BLAKE2B a02f57f2c65a9241edbc6a1e99170712ceca000977c2271ba51c5311e7718471585ea791ed8c978a86a961d02450623c05b5f9006d4386be2130df08341b0e49 SHA512 65f455bcfd246a8de0084e1534dc85f09435f1fad2590ba87dda0bed90d8fa976d3fad2142b2006a596e713d3d91f0d3d3156017cebacf9dc7883596edb0740f
--- a/app-containers/distrobox/distrobox-1.5.0.ebuild
+++ b/app-containers/distrobox/distrobox-1.5.0.ebuild
@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]] ; then
 else
 	SRC_URI="https://github.com/89luca89/${PN}/archive/${PV}.tar.gz
 		-> ${P}.tar.gz"
-	KEYWORDS="amd64 ~x86"
+	KEYWORDS="~amd64 ~x86"
 fi

 LICENSE="GPL-3"  # GPL-3.0-only !
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
--- a/app-crypt/qca/Manifest
+++ b/app-crypt/qca/Manifest
@ -4,5 +4,5 @@ DIST qca-2.3.5.tar.xz 741036 BLAKE2B 3948dc9b58a8ef03eec246cc14c7582d30e2513ea4b
 DIST qca-2.3.6.tar.xz 745864 BLAKE2B a3a5955215504b5703db304f241ae9c0c9b243c280cacb6180f631b3259b5f9a8af1c08b233f70e8e4130ac2e957dc3d8a99817b4dec2df0fab41b39bc54f8c8 SHA512 018bde919df28cfc9e5d6c5ad30724199a1a17437022751fb92bfc1ce691d8a56c62b661526e346f5a0c5ff7ffd556499f2ee25efe9f8b1698b3f8eee480811c
 EBUILD qca-2.3.5-r1.ebuild 1927 BLAKE2B 2c8deada2814ebe5c1f29d0ed5aa1331af687519d8acd4b901af41510ed846b104b512217516df272124435b6d14c6d9931fea1b77ed564fc4840aa0a7da3a31 SHA512 1f176e5a7d78c6c53a5e0ed7d20ad1647076f62d7dfa8e7691ead13a244308f5a8b1d6ae8baa97ca7296311e619589430ca95bb75b0a653e8890676c9e99b864
 EBUILD qca-2.3.6-r1.ebuild 1880 BLAKE2B cbcf607a8c064a1ae279ff35c461d5f300f8df8f6d72b5b90efd97572333dd1af9b6c812fd48cb7a0e9f0d599b68eaa34c10f414370a4685733ada81410a6503 SHA512 1416b00e7f1dba29ad54cd1e384652f2eef29a77e212e889dfc4ffa9adf9fbe8d8861f8a32a9ac3fbfeb7186d42f235f148b4e2c6cfccf460064703012033580
-EBUILD qca-2.3.6-r2.ebuild 2509 BLAKE2B f8c03aafb840507ea177eb734ecd9a46eec6186a4c8d4cbe3041558817cade3b626f5ec1ca6d1bd9fa89f6ef6f6385ebfee4ed4b99f41845377f32d725614354 SHA512 9c5ee6e25343bd529c3ab66312d5436db90020eee19e5d196f016fdb99b85504c43784fa7be54009f8e8cc30f31560d686423015e386d37ab3907da4e76be58f
+EBUILD qca-2.3.6-r2.ebuild 2550 BLAKE2B d87cb78dbf2260c082d4e8afabf7b77019e8ef75cbb80bc0fb8abd42981b709757c9432d38dfffaab8731a2a0721140d48088a8547397cab36956d57fe1ccee2 SHA512 ed4ca01439c5a4603e0db58ec29eee9d343f265fa808e2be14684efcf0f0ab85ca0ec8b0717b1d93d28998bc6bf5015103b7b70260293c3c441856d02271666d
 MISC metadata.xml 832 BLAKE2B 9044b545fa732c5f86c7dbb026630b4946a538ba77369eae28e894bf636ca60f6a31d7aad258fa19aee4c433d6d5a8e2a34a7c2850eef3a40d44261e592032b0 SHA512 b01bfe83343fdc265abc25922300cdc67f556a9a6f6db16918b0b3ee44c4e83db524695c5cb8952278f3e1f2e5d60a49bcc9312b35ab95f0ecc42e03764fb6bd
--- a/app-crypt/qca/qca-2.3.6-r2.ebuild
+++ b/app-crypt/qca/qca-2.3.6-r2.ebuild
@ -3,7 +3,7 @@

 EAPI=8

-inherit cmake kde.org multibuild qmake-utils
+inherit cmake kde.org multibuild out-of-source-utils qmake-utils

 DESCRIPTION="Qt Cryptographic Architecture (QCA)"
 HOMEPAGE="https://userbase.kde.org/QCA"
@ -89,6 +89,9 @@ src_configure() {

 src_compile() {
 	multibuild_foreach_variant cmake_src_compile
+	if use doc; then
+		multibuild_for_best_variant cmake_build doc
+	fi
 }

 src_test() {
@ -103,10 +106,7 @@ src_install() {
 	multibuild_foreach_variant cmake_src_install

 	if use doc; then
-		pushd "${BUILD_DIR}" >/dev/null || die
-		doxygen Doxyfile || die
-		dodoc -r apidocs/html
-		popd >/dev/null || die
+		multibuild_for_best_variant run_in_build_dir dodoc -r apidocs/html
 	fi

 	if use examples; then
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
--- a/app-editors/vscode/Manifest
+++ b/app-editors/vscode/Manifest
@ -8,6 +8,10 @@ DIST vscode-1.79.0-arm64.tar.gz 130967654 BLAKE2B fe5a484b12ad1ef6c9cccbe95cab14
 DIST vscode-1.79.1-amd64.tar.gz 134787612 BLAKE2B 65b8cd1695c92dc3d1cd3cf1ddd5b2e048ed8df3bd0d8284bff6a1980947adbc9fb85fe48a79ce20405151d33422c6f0677a4a2cf7cbb572eff6b866d9f951d1 SHA512 15f48715bffe22aceada44cc5da3b7e47983e3acb5ecc04aca5babe465f2da0c2dd143540f231ce6d8e3f6879d66b494d9be57afa23161ab65448430f294ea2c
 DIST vscode-1.79.1-arm.tar.gz 119311072 BLAKE2B 5f6a48fb3b915894aa90488c0c80fd47d886c614d46821a61a3d97899e4d8c02a22730944f50e1ecc4c7f729db19ef054e3e46be570d6a19e63a8b730084b41e SHA512 f61c3bb2570621c3e20b3b056e4d06178a674e63d9fbc132f885734ba5ec030456177657e81c7d2a98054dce4dde2ca6387d8c84841dc26c0dd6bcea1dc386aa
 DIST vscode-1.79.1-arm64.tar.gz 130964437 BLAKE2B ae7d5a14a0d31de1ac984f74805191d3323cad8861949c4cbf342e7f6e5b0a4d5ee046ad314be4eb39b33e17120a700964c9d7696922ac1fd487d7e1b5374915 SHA512 e99fed7bdf7b8557cdcaa4bfe5ee7509dd34a34e6643f522439736d84d172070586cf7216b9d06f3110bdb2487bbd389777ee2a14929c04c963db982196e2a87
+DIST vscode-1.79.2-amd64.tar.gz 134757908 BLAKE2B 8f92476935a7833cbb872d41b65d480540860a529f587009e1188d3aaa1dc61b19ca11ee472ebf7942d5f763bee940fb28b4066a67346094aa5efd519456fd5c SHA512 14aded59f7b083a1c57c50ff24064c242520c6520811541f5cd4daa9ab3878eae4a88c8e0ba54bfe3ec1023395e5b2f4f74cecd373d8bc43acbdb15fdd1fc47f
+DIST vscode-1.79.2-arm.tar.gz 119307976 BLAKE2B 89b48809c3306ff89057f7533c825bfce9f35792be4b308b254bc4e347ead14c3e89a00c70ce678287e2e8376a76997c4a43dbb4dd3209cfaebe4a432d5a0bfc SHA512 9f83a0ae95fb6fead3fe2da3ce96e6be336713a29bd28fa0db168ce3236d4eaf80067e9ca1ff0cd3ebb7d31d9789f262a0119524afe042f75b58bcb953937ca5
+DIST vscode-1.79.2-arm64.tar.gz 130972979 BLAKE2B da5c86ac8bfe4d7900aec6dbd61de03555e94a8c36ca504024b5fa0c217f2473fc13a1e0ef0fa32779ae0793f6574fceae693381370b068d574bc0d1fa8649e0 SHA512 76050ff4fd73a3cc285781f03c087388d8717d5fbb31807f271da9bca77d10ac909844dc9ec1b30e85dd5a76a76ac5b027d200acf0d4445c5d5fb88bdea1104a
 EBUILD vscode-1.79.0.ebuild 2862 BLAKE2B f935e3c07dd88704fa82bfa86cfa460bc58a8f769125bbd9a93b9963ead92bb83700263b8740ee0829938f32caf0f68f5867b9e884ad8774d544cb7c860cf911 SHA512 8327ee741916aa3a518b1996416dbe61af77c1d05a4c07e57528baf0cb50ddbb470e763d3b89211cc61f44472cf73941b709b14a82d71d54ddff3e86a8ea304f
 EBUILD vscode-1.79.1.ebuild 2862 BLAKE2B f935e3c07dd88704fa82bfa86cfa460bc58a8f769125bbd9a93b9963ead92bb83700263b8740ee0829938f32caf0f68f5867b9e884ad8774d544cb7c860cf911 SHA512 8327ee741916aa3a518b1996416dbe61af77c1d05a4c07e57528baf0cb50ddbb470e763d3b89211cc61f44472cf73941b709b14a82d71d54ddff3e86a8ea304f
+EBUILD vscode-1.79.2.ebuild 2862 BLAKE2B f935e3c07dd88704fa82bfa86cfa460bc58a8f769125bbd9a93b9963ead92bb83700263b8740ee0829938f32caf0f68f5867b9e884ad8774d544cb7c860cf911 SHA512 8327ee741916aa3a518b1996416dbe61af77c1d05a4c07e57528baf0cb50ddbb470e763d3b89211cc61f44472cf73941b709b14a82d71d54ddff3e86a8ea304f
 MISC metadata.xml 1058 BLAKE2B cf7606233d99e4429debe5ef824f235f1ff3083ab5553030453e982bfb5860dd5ccecca3792319665835d604b6ff2cb53ebd885bb959236784c62885087750b2 SHA512 961552953336ad9606c9fc004fc3e0fb8d7481a017b6ba5da683db5ba989f58d474ccb4ea3a001851b2cfe705e7fe3f70ba01a14dd1f048523e73af522d50410
--- a/app-editors/vscode/vscode-1.79.2.ebuild
+++ b/app-editors/vscode/vscode-1.79.2.ebuild
@ -0,0 +1,122 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop pax-utils xdg optfeature
+
+DESCRIPTION="Multiplatform Visual Studio Code from Microsoft"
+HOMEPAGE="https://code.visualstudio.com"
+SRC_URI="
+	amd64? ( https://update.code.visualstudio.com/${PV}/linux-x64/stable -> ${P}-amd64.tar.gz )
+	arm? ( https://update.code.visualstudio.com/${PV}/linux-armhf/stable -> ${P}-arm.tar.gz )
+	arm64? ( https://update.code.visualstudio.com/${PV}/linux-arm64/stable -> ${P}-arm64.tar.gz )
+"
+S="${WORKDIR}"
+
+RESTRICT="mirror strip bindist"
+
+LICENSE="
+	Apache-2.0
+	BSD
+	BSD-1
+	BSD-2
+	BSD-4
+	CC-BY-4.0
+	ISC
+	LGPL-2.1+
+	Microsoft-vscode
+	MIT
+	MPL-2.0
+	openssl
+	PYTHON
+	TextMate-bundle
+	Unlicense
+	UoI-NCSA
+	W3C
+"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~arm ~arm64"
+
+RDEPEND="
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	app-crypt/libsecret[crypt]
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	media-libs/alsa-lib
+	media-libs/mesa
+	net-print/cups
+	sys-apps/util-linux
+	sys-apps/dbus
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3
+	x11-libs/libdrm
+	x11-libs/libX11
+	x11-libs/libxcb
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libxkbcommon
+	x11-libs/libxkbfile
+	x11-libs/libXrandr
+	x11-libs/libxshmfence
+	x11-libs/pango
+"
+
+QA_PREBUILT="
+	/opt/vscode/bin/code-tunnel
+	/opt/vscode/chrome_crashpad_handler
+	/opt/vscode/chrome-sandbox
+	/opt/vscode/code
+	/opt/vscode/libEGL.so
+	/opt/vscode/libffmpeg.so
+	/opt/vscode/libGLESv2.so
+	/opt/vscode/libvk_swiftshader.so
+	/opt/vscode/libvulkan.so*
+	/opt/vscode/resources/app/extensions/*
+	/opt/vscode/resources/app/node_modules.asar.unpacked/*
+	/opt/vscode/swiftshader/libEGL.so
+	/opt/vscode/swiftshader/libGLESv2.so
+"
+
+src_install() {
+	if use amd64; then
+		cd "${WORKDIR}/VSCode-linux-x64" || die
+	elif use arm; then
+		cd "${WORKDIR}/VSCode-linux-armhf" || die
+	elif use arm64; then
+		cd "${WORKDIR}/VSCode-linux-arm64" || die
+	else
+		die "Visual Studio Code only supports amd64, arm and arm64"
+	fi
+
+	# Cleanup
+	rm -r ./resources/app/ThirdPartyNotices.txt || die
+
+	# Disable update server
+	sed -e "/updateUrl/d" -i ./resources/app/product.json || die
+
+	# Install
+	pax-mark m code
+	mkdir -p "${ED}/opt/${PN}" || die
+	cp -r . "${ED}/opt/${PN}" || die
+	fperms 4711 /opt/${PN}/chrome-sandbox
+
+	dosym -r "/opt/${PN}/bin/code" "usr/bin/vscode"
+	dosym -r "/opt/${PN}/bin/code" "usr/bin/code"
+	dosym -r "/opt/${PN}/bin/code-tunnel" "usr/bin/code-tunnel"
+	domenu "${FILESDIR}/vscode.desktop"
+	domenu "${FILESDIR}/vscode-url-handler.desktop"
+	domenu "${FILESDIR}/vscode-wayland.desktop"
+	domenu "${FILESDIR}/vscode-url-handler-wayland.desktop"
+	newicon "resources/app/resources/linux/code.png" "vscode.png"
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	optfeature "keyring support inside vscode" "gnome-base/gnome-keyring"
+}
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
--- a/app-emacs/ebuild-mode/Manifest
+++ b/app-emacs/ebuild-mode/Manifest
@ -1,6 +1,6 @@
 AUX 50ebuild-mode-gentoo-1.54.el 1509 BLAKE2B 98cf2a1672723ffaa3f4d2f57b4b67b897df56cc2d7352366b79df0578b927faae53c3cc703fa70cf23bd0b1006d8c49dd8e59fcaffa3a231fd7ec5e26c7dce5 SHA512 91c59e85ea79733c195985e4a33dfb1aec8ac13457c0dc3fe7353fb2616787ebde4393b671a2943b752725593929070b658c24955d5e2132b6e9b76daa749850
-DIST ebuild-mode-1.62.tar.xz 39080 BLAKE2B 91bb206f7ca3fecebc80d946d5840ce6e02610171d6179d360b188e270226e4f1dbe4ceddbc1e41f8e627c787b28454a20720d563bbabcffb3a99b7b10a1251d SHA512 9e7caafb45a7538dd66221d2a5dd9fef764c72f6f42db1ad1615e4017b7d4db14dcde09edfa0e8777a528af918e219521072040215d05a9c8a5cdc57ca395bd8
 DIST ebuild-mode-1.63.tar.xz 39600 BLAKE2B 1746e0ab558fd7b48dc778f2287b3a9f2b5f82f5e4e53e353b0b9c3de3436a8ec17f827d93cf1ff990dd780a33435ea946e19ac655fd0f39fee03beb07ce5509 SHA512 264678921d8a2e535fedcc06c9c0932a4898f3d33cc54d79107658d9a77048e00c5ec276d4c74dc55c2ba2c643024453542f16619fde473d417b446bbd78175c
-EBUILD ebuild-mode-1.62.ebuild 874 BLAKE2B 1c65faf2ee32a4c4a094ab9eef56342d61ec272000c15e3cef4c0a604a91af8e1157971e173919f95278375511c81393987de8677f713857cfc4400ebbe85b72 SHA512 e704314cd41d61debba4be29f21746501bc7893f55782f3933e276dfd5a3c198f56b7ce18fa7c04468d6ed3a43c573dad69591d5eff590f74f0af40a75ec39b7
+DIST ebuild-mode-1.64.tar.xz 39872 BLAKE2B e6309f91276093d40c322e0b639c10067ac95f305a7333d4335182fc6f0bec34141bb3cac1fd577657a5d795338b1da0d1f2212b2c5fd6502d958129a1e8167b SHA512 0c760946070882e93fb10dbad6f1ceb4977b2b9f0b7786c1a99ecde7b16874f840ac9877dc531503b216b0d030e779bb3d0f9cec9eeb40bb211ec6f20ebe0f88
 EBUILD ebuild-mode-1.63.ebuild 874 BLAKE2B 1c65faf2ee32a4c4a094ab9eef56342d61ec272000c15e3cef4c0a604a91af8e1157971e173919f95278375511c81393987de8677f713857cfc4400ebbe85b72 SHA512 e704314cd41d61debba4be29f21746501bc7893f55782f3933e276dfd5a3c198f56b7ce18fa7c04468d6ed3a43c573dad69591d5eff590f74f0af40a75ec39b7
+EBUILD ebuild-mode-1.64.ebuild 881 BLAKE2B e5790c63140728370663fd390818141969890060d2a01b9f83846c9dfa495608b7c844a07d1df81d429dd329a3f2f46e8c8e6075ce609e57cd8940765369da9f SHA512 391230d12863a5bdd0e7a3643d089d7bf09d82fff736a3abc9ce1de3130962890951274d91d4b595bce7d538673232aa8fe780a59afce342b964cf4226b18365
 MISC metadata.xml 483 BLAKE2B 203c30fd4195b63532c0462427658547b0805fb23b57c9a04c554eba8ef0a9b9bc7e3100a51c3cb7feb11d1dcb9472357e5e53640e9a94658e35594cd3369f56 SHA512 78804ced19849c5d88cf942117714db3302cb2187e93ab3924b5526d0c6aa973dbda2cdb5a67c9e0639d5ac3278ea8da9df1e20c2b3cb96231f3fee5fc6845fb
--- a/app-emacs/ebuild-mode/ebuild-mode-1.64.ebuild
+++ b/app-emacs/ebuild-mode/ebuild-mode-1.64.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"

 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"

 BDEPEND="sys-apps/texinfo"

--- a/app-emacs/erefactor/Manifest
+++ b/app-emacs/erefactor/Manifest
@ -0,0 +1,4 @@
+AUX 50erefactor-gentoo.el 986 BLAKE2B 3c524fa39f171861b6e253836dc12335a70c648bd6a78d3a9bf5cfc9967e9b23079e6686348a199c2c8034272d94e552d01bedd5f9d6eb4e01868e9c8095d47a SHA512 079bdb604fa0ae05e06cd4b3dfd1ed1ca6b5118a9101059f0a6068b6ec92a52d05fbaa40fa6826824926e77c985faaa689e4b0332a994a1630b7a2ee97e1e446
+DIST erefactor-0.7.2.tar.gz 12873 BLAKE2B 897caccbdd62817b56bb3237913edc709ca50af966bd7332edab0d0a6523b7623bb77cd2a0a6713fa59f0ea688d4c962f29b19abcce0db4b49d61c721ae2cad4 SHA512 fa6ce709948d169bf6beb1c25f9ecbc87d8d6f0d8fc1ad2972148ba3daee986387888c72aaa9f8813f29421ac31bd5e10a9e75e76b1871b911fefc2663b7c8e6
+EBUILD erefactor-0.7.2.ebuild 778 BLAKE2B eb4c6309f4f9cd9598192050a301ee719d09818d9b48efbd8ccdbd021744737609368e40dc1ef5afd3bb55fec72608f5b023e6ef7d7223d6b501279e95dc12da SHA512 317b39d60500e3606bd86e36eb9d6214b83e244cbe08a91a9249aae9979053dfffc50c168332a736deb901e451488e86a97548c75e084d9b23f1f84c010c5c27
+MISC metadata.xml 471 BLAKE2B ad3141379e53e7aafddbda0353d46f21cb3225ac1f2e0db256cc75bcd347d24d2b1a6eafc1bd04c75b3a444e093661b4dda35679a928530b6f6fb320c14852ee SHA512 f35e394136c4b3708688881b0f6f05670048bbc346af200250de160c5326642179544c5ef736f67a4d398963ac54b3bc4133c2c8e0f6d7525c9501bfbdc737dd
--- a/app-emacs/erefactor/erefactor-0.7.2.ebuild
+++ b/app-emacs/erefactor/erefactor-0.7.2.ebuild
@ -0,0 +1,29 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp
+
+DESCRIPTION="Emacs-Lisp refactoring utilities"
+HOMEPAGE="https://github.com/mhayashi1120/Emacs-erefactor/"
+
+if [[ ${PV} == *9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/mhayashi1120/Emacs-${PN}.git"
+else
+	[[ ${PV} == 0.7.2 ]] && COMMIT=bfe27a1b8c7cac0fe054e76113e941efa3775fe8
+	SRC_URI="https://github.com/mhayashi1120/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.md )
+SITEFILE="50${PN}-gentoo.el"
+
+# NOTE: Not "${PN}-test.el". The test file misses "(require '${PN})".
+elisp-enable-tests ert "${S}" -l ${PN}.el
--- a/app-emacs/erefactor/files/50erefactor-gentoo.el
+++ b/app-emacs/erefactor/files/50erefactor-gentoo.el
@ -0,0 +1,19 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'erefactor-add-current-defun "erefactor"
+  "Add current defun form to `load-history'." t)
+(autoload 'erefactor-change-prefix-in-buffer "erefactor"
+  "Rename symbol prefix with queries." t)
+(autoload 'erefactor-check-eval-mode "erefactor"
+  "Display compiling warnings when \\[eval-last-sexp], \\[eval-defun]" t)
+(autoload 'erefactor-eval-current-defun "erefactor"
+  "Evaluate current defun and add definition to `load-history'." t)
+(autoload 'erefactor-highlight-current-symbol "erefactor"
+  "Highlight current symbol in this buffer." t)
+(autoload 'erefactor-lint "erefactor"
+  "Execuet Elint in new Emacs process." t)
+(autoload 'erefactor-lint-by-emacsen "erefactor"
+  "Execute Elint in new Emacs processes." t)
+(autoload 'erefactor-rename-symbol-in-buffer "erefactor"
+  "Rename symbol at point resolving reference local variable." t)
+(autoload 'erefactor-rename-symbol-in-package "erefactor"
+  "Rename symbol at point with queries." t)
--- a/app-emacs/erefactor/metadata.xml
+++ b/app-emacs/erefactor/metadata.xml
@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="project">
+    <email>gnu-emacs@gentoo.org</email>
+    <name>Gentoo GNU Emacs project</name>
+  </maintainer>
+  <stabilize-allarches />
+  <upstream>
+    <bugs-to>https://github.com/mhayashi1120/Emacs-erefactor/issues/</bugs-to>
+    <remote-id type="github">mhayashi1120/Emacs-erefactor</remote-id>
+  </upstream>
+</pkgmetadata>
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@ -2,8 +2,6 @@ AUX README.gentoo-r3 2065 BLAKE2B f3677b916121126c431ba32e324bcc9f04b4dfeef1ee54
 AUX libvirt-6.0.0-fix_paths_in_libvirt-guests_sh.patch 1281 BLAKE2B 631f813ad29db29a6eb537ecd7b9d12aed097c5e0e01c07161adac1dec8a6f129bc098172fe6de4e78a2fbe5e67052005a7c5d1d17cbbb63ad27025662b9fa34 SHA512 dc80c9fc459207dd1ff77548054ea5a51c41a2d36e1b8917eca5f69293a86168af3da47466d8ff954a8b2e0ead9f28ed7d6c2c3671cf67d0ebb4039003a0dde2
 AUX libvirt-8.2.0-do-not-use-sysconfig.patch 8420 BLAKE2B 37856003bc58b69531be6b55fcc3304b71558b7a5306c2da3fbad2d5eac006ca3ebb54bd56f8e761363311a5c865d2cd072c418794fcb605562fc32f997c88a9 SHA512 84a693b870aebe0f87f518473d28d97e613b6069f497e6e49c3e8feffc96c2e709d0a7a3530c52d4d034c6b0bc7374ab61f40ddd2f071735c5baacdebcfca8b6
 AUX libvirt-8.2.0-fix-paths-for-apparmor.patch 2785 BLAKE2B 2b1daa96385ce09a078e1c152b222b274fcde1803497de8709d7569debc1537e9ee4f65a1f775636521ba351310ad13806005e1c02fa00224551244a79ace109 SHA512 be537022563bcf782381cdb99188becf1785de950124626e5ea13219a870a1c6c13834f2cb3c9cf4c364a66b5a7647bfa856a4c5e634dfac6a591c8c93e5ce9f
-AUX libvirt-8.7.0-meson-Stop-detecting-Wl-version-script.patch 2096 BLAKE2B f76ca851dce01ff8c7c1720290b4f732d666e90ed2414c5eaf8915377483a524153e44f7f36639cecec30781e8e764fe43bcb34f0b9d4fc226014b6a20087404 SHA512 7a619e64d952159b0790b6f0229cb165e372e9c74e6fba08492546039b7989ceacd3849bde700a23accbfbea7902b28b7807819ade94c8247d6882c469bf3adb
-AUX libvirt-9.2.0-meson-Stop-detecting-Wl-version-script.patch 1981 BLAKE2B 69625606757a2b77c9fe4f38b2921ae4f7fb3b929ff7a0a0b9b76b9af5b575264397ae2710398a58fe5af778ab71db3494e4ff597e4cd1595d93b078d002c2f4 SHA512 8e2186f3eecd6bcdf523d4be24a9961251118e4375a5f923009ad1ec83c2c1fd96147ecb540197f780a397d9ff67b35b1f16b5a5180dce1b0aeb7c7c5bfa9485
 AUX libvirt-9.4.0-do-not-use-sysconfig.patch 8195 BLAKE2B b731d57dc86fe725d3cbd47b6e691a414107d3594377bd1c73e19735368937a0983e407ec05700213d2ec5802e90f429fd5c7354cd03fb25d3acced952ab6f38 SHA512 2a2e08a6034ed37cafebde3b0fd27913d972d1e9f8816e10a9af951e99f10bd3b9bc7ada1ac50c5085e3fdd3d02301365d031eb6ce3b71102e4b3072d609f21b
 AUX libvirt-9.4.0-fix_paths_in_libvirt-guests_sh.patch 988 BLAKE2B 5936eafa5c300edad7ed368ec13063d31aea59e3daefeac59cf515ea44667f61aa63b0e2c2a5c88ace24c48cc132789cc5fa1a7c6c04c17e9ac61b114778e46d SHA512 5b80a5ec2898c1c821d0d49b9de67a256f82cb60879215ddde07c2a51f2e8a8b6893fec65617c27edec50cd51a362fb1fcdd21827e8de954f26879adcfa12418
 AUX libvirt-9.5.0-fix-paths-for-apparmor.patch 3618 BLAKE2B 23a7d0219252c1b46686c7554d5072dc5f8df37881d8faf11482465521167cd46f6bf1d1ffcc09e71f2bb32e392ba8d6a2493c9e5fdec1bba3afa1cf7fae17a4 SHA512 6c31e036da2c98aa3f9fdcab4b25ac7c7154930452850f33f6016374f76f820edfa4ad65b5326770dd6613ff9b1741aaa4ec741bee67a240dcc61331e16ede61
@ -14,21 +12,11 @@ AUX libvirtd.init-r19 1124 BLAKE2B 0effd71cd3dfda0892c37e4d6d69f5d6d02320a3f0793
 AUX libvirtd.tmpfiles.conf 36 BLAKE2B fa0e1dac4117dcb2a2e826c82c4c63e20156db47abf4088167484f1f3149a4998840cf1aba745621851d7e2653df5c7f7268d8d61be3a3731ea053a88f35c13b SHA512 2b1c3c64dd6fa03d8c2ae24e7ce4aa7d754913214542a68a4e99f10fbc251fd23ee26e297a957d7b4b70eec8ef028c41fc915da3a85fbbd16143bb92d1de3aed
 AUX virtlockd.init-r2 573 BLAKE2B 83bbd228bd59fa29f1d974bc5eec8af0b701328a0a64bbb9e2d9cb918d5d0b3c0d5e791afa18f47ffa2c429082083912fda3f2401c3c5b3d8d85ea8b7cacf440 SHA512 11bf7208e8da8cf7b907049100d095f4d6b5d215a0955fa620e50d6d541d3ecd9d779a7903c64feb25d17545c45491d52441e14a04f2c793f3b03dee7784c482
 AUX virtlogd.init-r2 572 BLAKE2B e6a86e34eda78fc032df17e1bd94095e357770f4036e19fff895266b58df7e31774f6004fec56fad9e69bf7d1afa5d898bdebe018013877f8844d05b3a46d509 SHA512 d5d83edee8a4bdf0dac79abc129ff7ec11573aa580e32963d7c7d47133e276a4427d8653683fc8b0a6c1c2aba631e5875c73454d6fef3bcac6dcaca542e69f34
-DIST libvirt-8.7.0.tar.xz 8937316 BLAKE2B 131d46206662627e952b6daa3ceeab187321ff5fb1984980bc2816dfedf730c6ccd4b5a1cbfb46f33cc9e84508621e2625fa661f06b9e35561e8de52906824e5 SHA512 35d33d0e0dab525e8f0a8a592d286e9d17fc5c5d1ff2fab5af5c40b85248481dd17b5c3daf64e8c6e1b8a93328eebee6ece3e95edacff208a81d8b78dc102d7a
-DIST libvirt-8.7.0.tar.xz.asc 833 BLAKE2B ebea1430670bcb44e9ffb4460388b2ab41e8b409d1513d09ac56b12f379621f5ad39af0dba9691b36220bbed5634ad24b2efda8315b41bb2e7f3f6a65e9b028c SHA512 5ac09b10de74283c474fb80cfe600a171d6b49039df73113702cda565889f6c6919e99aff6ce60538ee7fda52287ef035ee15e8f47e5f724384c6ec474e6bed8
-DIST libvirt-8.8.0.tar.xz 8941928 BLAKE2B f3b8cb4fe30a156884a03e5c873f3fcef0c8d13315c79b865f387ea053635ae2435a3b4d6e81c988cfcd087d55223450e7b874e24e4503479d152b417c398250 SHA512 868e49b369afe200c5af6e2cd0606de2eeebfa92523b5ad3c653203c8838d304bd0cdc5acfb3c4d4c33c0a87ab8e769b84cc62e3f06e055936c43573a23d7190
-DIST libvirt-8.8.0.tar.xz.asc 833 BLAKE2B 3919af7c208d9a5f863a9351cfcf72916ff67cbef26fe7b86bb3b1042b5556f75a4a0c5210cdb67aee79bd3706047d2d2244c967297dbf2aba2d28c625797361 SHA512 9bc3c0ae6f7fa9d6ee17ca183e218b0f2f6e413b303bd429cda090828ac0521c142178ca4c3c3bc6030c9e58f36ae5d33c7c8a9d6c8147f214e1740a78f66d2a
-DIST libvirt-8.9.0.tar.xz 8946352 BLAKE2B 537b6badb6171110e99561613fb1318144991107139401296248afb747ae6f9cfafcd17b2292b8d8dcc9188ff4206035ea814efa6c129bae50c0518f61be9b81 SHA512 10426d45d55bb18e8e5d4327d698fbc6efd83c5f515ac40a0fcd72048a77936fe0b422ac14bce9966a65379d262df294c314f854a97861a223a0cbc6a8fd2382
-DIST libvirt-8.9.0.tar.xz.asc 833 BLAKE2B a2054d0d9c8301aa0f8697253690b1ddd530a577bc789c7f38dc36a835134d0c8e5fc88536371c75da66afd9808540b9236e8d1247e4d7bd5f3a0aaf35c45f97 SHA512 087d5406ef23d6beee4a37e471d7d0aa433990b892f0beb7be76609fbdfcb69381acd59d63c62dcd2e2f9ccfcdefc35109cc175a0da4263e9b189981cb2baff1
-DIST libvirt-9.2.0.tar.xz 9182060 BLAKE2B 8b9ffc86e088de6b1ec6b38b649bded3abbbce8eec9c1ba19f31e73ecd7ee13a5c521a6e1fd8da9f308158dd05c87171aa443cd00f0c87a73f205e3d57a22567 SHA512 9afd4fcccb9ef39c1ed50eb0db94cd8b06cc5b60041cdb9aa5fe7b27e5ab11855f4b538d6868413725d603dc1a6090e0983207137dcd43ed2bbcfbeb6fc69c58
-DIST libvirt-9.2.0.tar.xz.asc 833 BLAKE2B 64882091890860119c92c6cb0337ea20bfdd8206f5db648cb505ee0d4673cfb8aa5996e6cf3152a7293df98592aa7187d10bb42b4ee979770e9b0040e6bb2d48 SHA512 3c47c5ea182c1310b56641cc2df5adf2f82ae9b35fdeccfddef42f3e2149499b23c61eeafd5e4995ef596ed003ab55b4b17d041dff72ae5f8851b355bfadfb78
 DIST libvirt-9.3.0.tar.xz 9246292 BLAKE2B 6e47a70ec247b37c1958e324d5bf7ebcbff6aca5a7a9860f437ebe6a969d569a449d3dd5720081ad27926f445bcbe10089cb3b1d27960decc6239306f82259f9 SHA512 b9349dcd7798c76d75bb20afad67d6e676758cb201acaf7aed5109f0e91422b2bcca964a2f19aa8dc4fd0eca2923902474e16e3839bf8b15aca827028e88ddb7
 DIST libvirt-9.3.0.tar.xz.asc 833 BLAKE2B 25810919210bd489ecfd85f172c472d52e911e90d651fac2c7fa4f73220890bd2448317448f0469e8abfe8ad5ea6f3eb6b321e6d989e64f6ad4b676a5a38312c SHA512 0b51a621cef616ac55ac40c9bf9da56d3e1d59b5e87bcd04deaac7f775faab8f30861e53112be2242d9c8c6be41f1ed1c29d345d96e39be0ac33ef0b01494c45
-EBUILD libvirt-8.7.0-r1.ebuild 9199 BLAKE2B 10a2adde30e931ea98af571b45c53fb9e285b1e49bb1cc4b97412c1e431f0deb2e4872f20b439809e7e6e0c19039068b9409aa20230b4537b5b2b787be95c587 SHA512 65e15a23eb130c66bbbbce3b1ea067c4f3d7c15378fe293784878e39fce6d9d3c2fe6e171893a07c6d46cf73a4e5a40d13c08035736924993a590a46d01bd378
-EBUILD libvirt-8.8.0-r1.ebuild 9204 BLAKE2B 2972a9db79b47e61799244b83914e7548e17013fc224398e010cdcdff39ce7abf7bfc3a8967d4a3123455f6d1758984e520d8e42e6b45cc839f4473c60f4820b SHA512 2f59288b8008f9fe9ded639957595a46e11b33a793ee42445c93868561e754a83fcbe2966c6609b6364a149fe7e382df536a80e21995390cd7e11d6e2fbe83a2
-EBUILD libvirt-8.9.0-r2.ebuild 9348 BLAKE2B 0b393fc319b5fc28ed26c3fe1f4bc05bb6cb8e11b4334912bb50d58ed3d672fb47df426c7ca7bb75e5a4e73c21cbdf70fb3dd1d7844d79f6fd908fedb1788ebc SHA512 17190c11584a9dbd63b9d402fbaa4c021a0ae0debc921ebaaf943e59af058003a3c8c3f2ad19740455a9e93801eee2de241a9783c3dd0e519fb46be7bd6f4ca3
-EBUILD libvirt-8.9.0.ebuild 9325 BLAKE2B 02f09e9101add4218c6b4765c70c91a098520e5c9dff96ef9dd6d88812c96a1df6b9aaa4833fe72abf98c1957c64ecefa3b837a232117a648d2b4546dd459c3c SHA512 c83a1a96f94883228790b49bd3f1d278c3f30831306a89a7b338c385839a87c405337a76e55dd1035ed34cbc40e841baca69630e89ff68cdf61ba7560b538624
-EBUILD libvirt-9.2.0.ebuild 9279 BLAKE2B b1cc43ad574f0202a7cbf946d304582c9a82550df0dd61bf0caa83eee8722b35b418c420a156e1c00ac8b3604d3356aaf7ab5f1836a6e9b972934b4a83dcd1a2 SHA512 741e9ed2462413871ca85af7edd1a0a5c8bfb7594756a7f483c2d4998d91a5dc41a916cfba6b4d86d6b17dda4cb1edc250c0078e944e76d487b0d8d0ddf5f343
+DIST libvirt-9.4.0.tar.xz 9250724 BLAKE2B 837a6eef509a43a0cd25a2ecaac9de95f21e903b553d5e56b404a689495e66bb0053866c9aea672cbe69130286d5a2ff2eb38ff447c77100e92bcb56cd244ee3 SHA512 8a8e3983c47c5ed5f4b50d90cb04e435717afddd27e16112ceeddda458d45c693daf65575f5d50274cfffcd1c83cbdd290819d8ece63f3bf9441b6bdaa309852
+DIST libvirt-9.4.0.tar.xz.asc 833 BLAKE2B 3a31f4097d8684a3a5e4b696c9bb49316a07c611a0cf1703e18653536af93d018ec44cbe5d0ce031e6f2c23a7c72691ded4c219faafa4bc770ad0dd7b616d0ce SHA512 710861b6b1c866be452e2da18a631076ad3ca3fbeb1728e561de08b34d16d2b49a0c390e7fa36eb35d0dc58fa35d5866ea6c573c84e9312b02880cdb969f7342
 EBUILD libvirt-9.3.0.ebuild 9338 BLAKE2B 199fe95d127cff893f2134bcf6cb5bc6226b505e576959f7495ffa6781cc4732128448f77d90356ad6de2527a2d94e2a0d32ae9ca6ecf394604980c7d982bf34 SHA512 0557c857c21bdd7237ce6dc6b13f229aa3528061bde1756ac401e3f2fb296c79d7570aaec8572b1b6e61e2aaa0134a0f823437dd05d5de0cb9f34649865f0e09
-EBUILD libvirt-9999.ebuild 9381 BLAKE2B 35925750945cd85380c6f57c6b2eb8c979c3c197eb1aeec7309b86cd6a33ce23502d69a7dc679da1fe0b0e37de8c5a076af5a35aba2b273a487f381d0e27036a SHA512 b293dc9a2f37932926ccfd62910b07c0c12e4a51c5607b33c3a7a6f1228af627ca290aa7149d2345cc4824585131f1a37755ad7c4fb133943202a812194db6c0
+EBUILD libvirt-9.4.0-r1.ebuild 9400 BLAKE2B de546ce87a8e8b1bae0f7545ed36fcee4a709ef982ed7a45fc35477b84270fbfdd956f52eb916b936858a29a032dcdc49e4200d31be84f573e70915c91ce1434 SHA512 c767c8ab6ffc917ae03ef93efb6835ec704ccbe5966e97d38c84b1a4c419043783d9cbb7b19684ad0351c6b40e3c533a25f5553d0a3d57b09758754286ae183c
+EBUILD libvirt-9999.ebuild 9382 BLAKE2B a3a1fc5991bb5a6ddd993f7287198b1abd45e22261809a7c44f66921bfe9db5d24c6175c38c1bf2aaf76445785cdf06bfd3a6f1ecc40bbefb1b16e453064ded7 SHA512 4a02df0467c64de5eae61ec4f176f714356ea8a827c1ab7813183a2f218292c62ff99fdefac6a1cb709c7cb748a59585bb9d80b89365086681713dd812c261dd
 MISC metadata.xml 3729 BLAKE2B 2e68676afb3820c7b8cd3d76b0a5c42886e246fc6b440ce49c71cbe60c124cdccd4ed8fb97f7153529b758d56dfba98b6a98a31b2fbff7e738f52bce796a3476 SHA512 0dfe519af8b740de9d41b1e2c40133026718a782b654a261c54cbe22b5f694cda8b73036c59411317757b73c40acaea77f70d7ab86ae8325e78d61151e6c64f1
--- a/app-emulation/libvirt/files/libvirt-8.7.0-meson-Stop-detecting-Wl-version-script.patch
+++ b/app-emulation/libvirt/files/libvirt-8.7.0-meson-Stop-detecting-Wl-version-script.patch
@ -1,55 +0,0 @@
-From ab5ce6ac561b9ef5d97ee8268df048b3432d7b8b Mon Sep 17 00:00:00 2001
-Message-Id: <ab5ce6ac561b9ef5d97ee8268df048b3432d7b8b.1679397051.git.mprivozn@redhat.com>
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Mon, 20 Mar 2023 13:38:27 +0100
-Subject: [PATCH] meson: Stop detecting -Wl,--version-script=
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-With its version 16.0, the LLVM's linker turned on
--no-undefined-version by default [1]. This breaks how we detect
--version-script= detection, because at the compile time there's
-no library built yet that we can use to make --version-script=
-happy. Unfortunately, meson does not provide a way to detect this
-either [2].
-
-But there's not much sense in detecting the argument either. We
-already special case some systems (windows, darwin) and do the
-check for others, which are expected to support versioned
-symbols, because of ELF. Worst case scenario - the error is
-reported during compile time rather than configure time.
-
-1: https://reviews.llvm.org/D135402
-2: https://github.com/mesonbuild/meson/issues/3047
-
-Resolves: https://bugs.gentoo.org/902211
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
-(cherry picked from commit 743fdb97c81f38adc6e9b55f402244f7982352f4)
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
---
- meson.build | 7 +------
- 1 file changed, 1 insertion(+), 6 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 0b3187ad88..53156329a4 100644
--- a/meson.build
-+++ b/meson.build
-@@ -514,12 +514,7 @@ elif host_machine.system() == 'darwin'
-   # macOS libraries don't support symbol versioning
-   version_script_flags = ''
- else
-  test_file = '@0@/src/libvirt_qemu.syms'.format(meson.source_root())
-  if cc.has_link_argument('-Wl,--version-script=@0@'.format(test_file))
-    version_script_flags = '-Wl,--version-script='
-  else
-    error('No supported version script link argument found.')
-  endif
-+  version_script_flags = '-Wl,--version-script='
- endif
- 
- libvirt_flat_namespace = []
-- 
-2.39.2
-
--- a/app-emulation/libvirt/files/libvirt-9.2.0-meson-Stop-detecting-Wl-version-script.patch
+++ b/app-emulation/libvirt/files/libvirt-9.2.0-meson-Stop-detecting-Wl-version-script.patch
@ -1,53 +0,0 @@
-From 743fdb97c81f38adc6e9b55f402244f7982352f4 Mon Sep 17 00:00:00 2001
-Message-Id: <743fdb97c81f38adc6e9b55f402244f7982352f4.1679396460.git.mprivozn@redhat.com>
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Mon, 20 Mar 2023 13:38:27 +0100
-Subject: [PATCH] meson: Stop detecting -Wl,--version-script=
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-With its version 16.0, the LLVM's linker turned on
--no-undefined-version by default [1]. This breaks how we detect
--version-script= detection, because at the compile time there's
-no library built yet that we can use to make --version-script=
-happy. Unfortunately, meson does not provide a way to detect this
-either [2].
-
-But there's not much sense in detecting the argument either. We
-already special case some systems (windows, darwin) and do the
-check for others, which are expected to support versioned
-symbols, because of ELF. Worst case scenario - the error is
-reported during compile time rather than configure time.
-
-1: https://reviews.llvm.org/D135402
-2: https://github.com/mesonbuild/meson/issues/3047
-
-Resolves: https://bugs.gentoo.org/902211
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
---
- meson.build | 7 +------
- 1 file changed, 1 insertion(+), 6 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index c35823a79a..a0682e8d0b 100644
--- a/meson.build
-+++ b/meson.build
-@@ -534,12 +534,7 @@ elif host_machine.system() == 'darwin'
-   # macOS libraries don't support symbol versioning
-   version_script_flags = ''
- else
-  test_file = '@0@/src/libvirt_qemu.syms'.format(meson.project_source_root())
-  if cc.has_link_argument('-Wl,--version-script=@0@'.format(test_file))
-    version_script_flags = '-Wl,--version-script='
-  else
-    error('No supported version script link argument found.')
-  endif
-+  version_script_flags = '-Wl,--version-script='
- endif
- 
- libvirt_flat_namespace = []
-- 
-2.39.2
-
--- a/app-emulation/libvirt/libvirt-8.7.0-r1.ebuild
+++ b/app-emulation/libvirt/libvirt-8.7.0-r1.ebuild
@ -1,353 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Packages which get releases together:
-# app-emacs/nxml-libvirt-schemas
-# dev-python/libvirt-python
-# dev-perl/Sys-Virt
-# app-emulation/libvirt
-# Please bump them together!
-
-PYTHON_COMPAT=( python3_{9..11} )
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/libvirt.org.asc
-inherit meson linux-info python-any-r1 readme.gentoo-r1 tmpfiles verify-sig
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.com/libvirt/libvirt.git"
-	EGIT_BRANCH="master"
-else
-	SRC_URI="https://libvirt.org/sources/${P}.tar.xz
-		verify-sig? ( https://libvirt.org/sources/${P}.tar.xz.asc )"
-	KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-fi
-
-DESCRIPTION="C toolkit to manipulate virtual machines"
-HOMEPAGE="https://www.libvirt.org/ https://gitlab.com/libvirt/libvirt/"
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-IUSE="
-	apparmor audit bash-completion +caps dtrace firewalld fuse glusterfs
-	iscsi iscsi-direct +libvirtd lvm libssh libssh2 lxc nfs nls numa openvz
-	parted pcap policykit +qemu rbd sasl selinux +udev
-	virtualbox +virt-network wireshark-plugins xen zfs
-"
-
-REQUIRED_USE="
-	firewalld? ( virt-network )
-	libvirtd? ( || ( lxc openvz qemu virtualbox xen ) )
-	lxc? ( caps libvirtd )
-	openvz? ( libvirtd )
-	qemu? ( libvirtd )
-	virt-network? ( libvirtd )
-	virtualbox? ( libvirtd )
-	xen? ( libvirtd )"
-
-BDEPEND="
-	app-text/xhtml1
-	dev-lang/perl
-	dev-libs/libxslt
-	dev-perl/XML-XPath
-	dev-python/docutils
-	virtual/pkgconfig
-	net-libs/rpcsvc-proto
-	bash-completion? ( >=app-shells/bash-completion-2.0 )
-	verify-sig? ( sec-keys/openpgp-keys-libvirt )"
-
-# gettext.sh command is used by the libvirt command wrappers, and it's
-# non-optional, so put it into RDEPEND.
-# We can use both libnl:1.1 and libnl:3, but if you have both installed, the
-# package will use 3 by default. Since we don't have slot pinning in an API,
-# we must go with the most recent
-RDEPEND="
-	acct-user/qemu
-	app-misc/scrub
-	>=dev-libs/glib-2.56.0
-	dev-libs/libgcrypt
-	dev-libs/libnl:3
-	>=dev-libs/libxml2-2.9.1
-	>=net-analyzer/openbsd-netcat-1.105-r1
-	>=net-libs/gnutls-3.2.0:=
-	net-libs/libtirpc:=
-	>=net-misc/curl-7.18.0
-	sys-apps/dbus
-	sys-apps/dmidecode
-	sys-devel/gettext
-	>=sys-libs/readline-7.0:=
-	virtual/acl
-	apparmor? ( sys-libs/libapparmor )
-	audit? ( sys-process/audit )
-	caps? ( sys-libs/libcap-ng )
-	dtrace? ( dev-util/systemtap )
-	firewalld? ( >=net-firewall/firewalld-0.6.3 )
-	fuse? ( sys-fs/fuse:= )
-	glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
-	iscsi? ( >=sys-block/open-iscsi-1.18.0 )
-	iscsi-direct? ( >=net-libs/libiscsi-1.18.0 )
-	libssh? ( >=net-libs/libssh-0.7:= )
-	libssh2? ( >=net-libs/libssh2-1.3 )
-	lvm? ( >=sys-fs/lvm2-2.02.48-r2[lvm] )
-	lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] )
-	nfs? ( net-fs/nfs-utils )
-	numa? (
-		>sys-process/numactl-2.0.2
-		sys-process/numad
-	)
-	parted? (
-		>=sys-block/parted-1.8[device-mapper]
-		sys-fs/lvm2[lvm]
-	)
-	pcap? ( >=net-libs/libpcap-1.8.0 )
-	policykit? (
-		acct-group/libvirt
-		>=sys-auth/polkit-0.9
-	)
-	qemu? (
-		>=app-emulation/qemu-4.2
-		>=dev-libs/yajl-2.0.3:=
-	)
-	rbd? ( sys-cluster/ceph )
-	sasl? ( >=dev-libs/cyrus-sasl-2.1.26 )
-	selinux? ( >=sys-libs/libselinux-2.0.85 )
-	virt-network? (
-		net-dns/dnsmasq[dhcp,ipv6(+),script]
-		net-firewall/ebtables
-		>=net-firewall/iptables-1.4.10[ipv6(+)]
-		net-misc/radvd
-		sys-apps/iproute2[-minimal]
-	)
-	wireshark-plugins? ( >=net-analyzer/wireshark-2.6.0:= )
-	xen? (
-		>=app-emulation/xen-4.9.0
-		app-emulation/xen-tools:=
-	)
-	udev? (
-		virtual/libudev:=
-		>=x11-libs/libpciaccess-0.10.9
-	)
-	zfs? ( sys-fs/zfs )
-	kernel_linux? ( sys-apps/util-linux )"
-DEPEND="${BDEPEND}
-	${RDEPEND}
-	${PYTHON_DEPS}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.0.0-fix_paths_in_libvirt-guests_sh.patch
-	"${FILESDIR}"/${PN}-8.2.0-do-not-use-sysconfig.patch
-	"${FILESDIR}"/${PN}-8.2.0-fix-paths-for-apparmor.patch
-	"${FILESDIR}"/${PN}-8.7.0-meson-Stop-detecting-Wl-version-script.patch
-)
-
-pkg_setup() {
-	# Check kernel configuration:
-	CONFIG_CHECK=""
-	use fuse && CONFIG_CHECK+="
-		~FUSE_FS"
-
-	use lvm && CONFIG_CHECK+="
-		~BLK_DEV_DM
-		~DM_MULTIPATH
-		~DM_SNAPSHOT"
-
-	use lxc && CONFIG_CHECK+="
-		~BLK_CGROUP
-		~CGROUP_CPUACCT
-		~CGROUP_DEVICE
-		~CGROUP_FREEZER
-		~CGROUP_NET_PRIO
-		~CGROUP_PERF
-		~CGROUPS
-		~CGROUP_SCHED
-		~CPUSETS
-		~IPC_NS
-		~MACVLAN
-		~NAMESPACES
-		~NET_CLS_CGROUP
-		~NET_NS
-		~PID_NS
-		~POSIX_MQUEUE
-		~SECURITYFS
-		~USER_NS
-		~UTS_NS
-		~VETH
-		~!GRKERNSEC_CHROOT_MOUNT
-		~!GRKERNSEC_CHROOT_DOUBLE
-		~!GRKERNSEC_CHROOT_PIVOT
-		~!GRKERNSEC_CHROOT_CHMOD
-		~!GRKERNSEC_CHROOT_CAPS"
-
-	kernel_is lt 4 7 && use lxc && CONFIG_CHECK+="
-		~DEVPTS_MULTIPLE_INSTANCES"
-
-	use virt-network && CONFIG_CHECK+="
-		~BRIDGE_EBT_MARK_T
-		~BRIDGE_NF_EBTABLES
-		~NETFILTER_ADVANCED
-		~NETFILTER_XT_CONNMARK
-		~NETFILTER_XT_MARK
-		~NETFILTER_XT_TARGET_CHECKSUM
-		~IP_NF_FILTER
-		~IP_NF_MANGLE
-		~IP_NF_NAT
-		~IP6_NF_FILTER
-		~IP6_NF_MANGLE
-		~IP6_NF_NAT"
-
-	# This was renamed in kernel commit v5.2-rc1~133^2~174^2~6
-	if use virt-network ; then
-		if kernel_is -lt 5 2 ; then
-			CONFIG_CHECK+="
-			~IP_NF_TARGET_MASQUERADE"
-		else
-			CONFIG_CHECK+="
-			~NETFILTER_XT_TARGET_MASQUERADE"
-		fi
-	fi
-
-	# Bandwidth Limiting Support
-	use virt-network && CONFIG_CHECK+="
-		~BRIDGE_EBT_T_NAT
-		~IP_NF_TARGET_REJECT
-		~NET_ACT_POLICE
-		~NET_CLS_FW
-		~NET_CLS_U32
-		~NET_SCH_HTB
-		~NET_SCH_INGRESS
-		~NET_SCH_SFQ"
-
-	ERROR_USER_NS="Optional depending on LXC configuration."
-
-	if [[ -n ${CONFIG_CHECK} ]]; then
-		linux-info_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	touch "${S}/.mailmap" || die
-
-	default
-	python_fix_shebang .
-
-	# Skip fragile tests which relies on pristine environment
-	# (Breaks because of sandbox environment variables)
-	# bug #802876
-	sed -i -e "/commandtest/d" tests/meson.build || die
-
-	# Tweak the init script:
-	cp "${FILESDIR}/libvirtd.init-r19" "${S}/libvirtd.init" || die
-	sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \
-		-i "${S}/libvirtd.init" || die "sed failed"
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature apparmor)
-		$(meson_feature apparmor apparmor_profiles)
-		$(meson_feature audit)
-		$(meson_feature caps capng)
-		$(meson_feature dtrace)
-		$(meson_feature firewalld)
-		$(meson_feature fuse)
-		$(meson_feature glusterfs)
-		$(meson_feature glusterfs storage_gluster)
-		$(meson_feature iscsi storage_iscsi)
-		$(meson_feature iscsi-direct storage_iscsi_direct)
-		$(meson_feature libvirtd driver_libvirtd)
-		$(meson_feature libssh)
-		$(meson_feature libssh2)
-		$(meson_feature lvm storage_lvm)
-		$(meson_feature lvm storage_mpath)
-		$(meson_feature lxc driver_lxc)
-		$(meson_feature nls)
-		$(meson_feature numa numactl)
-		$(meson_feature numa numad)
-		$(meson_feature openvz driver_openvz)
-		$(meson_feature parted storage_disk)
-		$(meson_feature pcap libpcap)
-		$(meson_feature policykit polkit)
-		$(meson_feature qemu driver_qemu)
-		$(meson_feature qemu yajl)
-		$(meson_feature rbd storage_rbd)
-		$(meson_feature sasl)
-		$(meson_feature selinux)
-		$(meson_feature udev)
-		$(meson_feature virt-network driver_network)
-		$(meson_feature virtualbox driver_vbox)
-		$(meson_feature wireshark-plugins wireshark_dissector)
-		$(meson_feature xen driver_libxl)
-		$(meson_feature zfs storage_zfs)
-
-		-Dnetcf=disabled
-		-Dsanlock=disabled
-		-Dopenwsman=disabled
-
-		-Ddriver_esx=enabled
-		-Dinit_script=systemd
-		-Dqemu_user=$(usex caps qemu root)
-		-Dqemu_group=$(usex caps qemu root)
-		-Ddriver_remote=enabled
-		-Dstorage_fs=enabled
-		-Ddriver_vmware=enabled
-
-		--localstatedir="${EPREFIX}/var"
-		-Drunstatedir="${EPREFIX}/run"
-		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
-	)
-
-	meson_src_configure
-}
-
-src_test() {
-	export VIR_TEST_DEBUG=1
-	# Don't run the syntax check tests, they're fragile and not relevant
-	# to us downstream anyway.
-	# We also crank up the timeout (as Fedora does) just to preempt failures
-	# on slower arches.
-	meson_src_test --no-suite syntax-check --timeout-multiplier 10
-}
-
-src_install() {
-	meson_src_install
-
-	# Depending on configuration option, libvirt will create some bogus
-	# directoreis. They are either not used, or libvirtd is able to create
-	# them on demand, so let's remove them.
-	#
-	# Note, we are using -f here so that rm does not fail or warn if the
-	# directory is nonexistent.
-	rm -rf "${D}"/etc/sysconfig
-	rm -rf "${D}"/var
-	rm -rf "${D}"/run
-
-	use libvirtd || return 0
-	# From here, only libvirtd-related instructions, be warned!
-
-	newtmpfiles "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf
-
-	newinitd "${S}/libvirtd.init" libvirtd
-	newinitd "${FILESDIR}/libvirt-guests.init-r4" libvirt-guests
-	newinitd "${FILESDIR}/virtlockd.init-r2" virtlockd
-	newinitd "${FILESDIR}/virtlogd.init-r2" virtlogd
-
-	newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd
-	newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests
-
-	DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r3")
-	DISABLE_AUTOFORMATTING=true
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
-		touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml || die
-	fi
-
-	use libvirtd || return 0
-	# From here, only libvirtd-related instructions, be warned!
-	tmpfiles_process libvirtd.conf
-	readme.gentoo_print_elog
-}
--- a/app-emulation/libvirt/libvirt-8.8.0-r1.ebuild
+++ b/app-emulation/libvirt/libvirt-8.8.0-r1.ebuild
@ -1,353 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Packages which get releases together:
-# app-emacs/nxml-libvirt-schemas
-# dev-python/libvirt-python
-# dev-perl/Sys-Virt
-# app-emulation/libvirt
-# Please bump them together!
-
-PYTHON_COMPAT=( python3_{9..11} )
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/libvirt.org.asc
-inherit meson linux-info python-any-r1 readme.gentoo-r1 tmpfiles verify-sig
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.com/libvirt/libvirt.git"
-	EGIT_BRANCH="master"
-else
-	SRC_URI="https://libvirt.org/sources/${P}.tar.xz
-		verify-sig? ( https://libvirt.org/sources/${P}.tar.xz.asc )"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-fi
-
-DESCRIPTION="C toolkit to manipulate virtual machines"
-HOMEPAGE="https://www.libvirt.org/ https://gitlab.com/libvirt/libvirt/"
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-IUSE="
-	apparmor audit bash-completion +caps dtrace firewalld fuse glusterfs
-	iscsi iscsi-direct +libvirtd lvm libssh libssh2 lxc nfs nls numa openvz
-	parted pcap policykit +qemu rbd sasl selinux +udev
-	virtualbox +virt-network wireshark-plugins xen zfs
-"
-
-REQUIRED_USE="
-	firewalld? ( virt-network )
-	libvirtd? ( || ( lxc openvz qemu virtualbox xen ) )
-	lxc? ( caps libvirtd )
-	openvz? ( libvirtd )
-	qemu? ( libvirtd )
-	virt-network? ( libvirtd )
-	virtualbox? ( libvirtd )
-	xen? ( libvirtd )"
-
-BDEPEND="
-	app-text/xhtml1
-	dev-lang/perl
-	dev-libs/libxslt
-	dev-perl/XML-XPath
-	dev-python/docutils
-	virtual/pkgconfig
-	net-libs/rpcsvc-proto
-	bash-completion? ( >=app-shells/bash-completion-2.0 )
-	verify-sig? ( sec-keys/openpgp-keys-libvirt )"
-
-# gettext.sh command is used by the libvirt command wrappers, and it's
-# non-optional, so put it into RDEPEND.
-# We can use both libnl:1.1 and libnl:3, but if you have both installed, the
-# package will use 3 by default. Since we don't have slot pinning in an API,
-# we must go with the most recent
-RDEPEND="
-	acct-user/qemu
-	app-misc/scrub
-	>=dev-libs/glib-2.56.0
-	dev-libs/libgcrypt
-	dev-libs/libnl:3
-	>=dev-libs/libxml2-2.9.1
-	>=net-analyzer/openbsd-netcat-1.105-r1
-	>=net-libs/gnutls-3.2.0:=
-	net-libs/libtirpc:=
-	>=net-misc/curl-7.18.0
-	sys-apps/dbus
-	sys-apps/dmidecode
-	sys-devel/gettext
-	>=sys-libs/readline-7.0:=
-	virtual/acl
-	apparmor? ( sys-libs/libapparmor )
-	audit? ( sys-process/audit )
-	caps? ( sys-libs/libcap-ng )
-	dtrace? ( dev-util/systemtap )
-	firewalld? ( >=net-firewall/firewalld-0.6.3 )
-	fuse? ( sys-fs/fuse:= )
-	glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
-	iscsi? ( >=sys-block/open-iscsi-1.18.0 )
-	iscsi-direct? ( >=net-libs/libiscsi-1.18.0 )
-	libssh? ( >=net-libs/libssh-0.8.1:= )
-	libssh2? ( >=net-libs/libssh2-1.3 )
-	lvm? ( >=sys-fs/lvm2-2.02.48-r2[lvm] )
-	lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] )
-	nfs? ( net-fs/nfs-utils )
-	numa? (
-		>sys-process/numactl-2.0.2
-		sys-process/numad
-	)
-	parted? (
-		>=sys-block/parted-1.8[device-mapper]
-		sys-fs/lvm2[lvm]
-	)
-	pcap? ( >=net-libs/libpcap-1.8.0 )
-	policykit? (
-		acct-group/libvirt
-		>=sys-auth/polkit-0.9
-	)
-	qemu? (
-		>=app-emulation/qemu-4.2
-		>=dev-libs/yajl-2.0.3:=
-	)
-	rbd? ( sys-cluster/ceph )
-	sasl? ( >=dev-libs/cyrus-sasl-2.1.26 )
-	selinux? ( >=sys-libs/libselinux-2.0.85 )
-	virt-network? (
-		net-dns/dnsmasq[dhcp,ipv6(+),script]
-		net-firewall/ebtables
-		>=net-firewall/iptables-1.4.10[ipv6(+)]
-		net-misc/radvd
-		sys-apps/iproute2[-minimal]
-	)
-	wireshark-plugins? ( >=net-analyzer/wireshark-2.6.0:= )
-	xen? (
-		>=app-emulation/xen-4.9.0
-		app-emulation/xen-tools:=
-	)
-	udev? (
-		virtual/libudev:=
-		>=x11-libs/libpciaccess-0.10.9
-	)
-	zfs? ( sys-fs/zfs )
-	kernel_linux? ( sys-apps/util-linux )"
-DEPEND="${BDEPEND}
-	${RDEPEND}
-	${PYTHON_DEPS}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.0.0-fix_paths_in_libvirt-guests_sh.patch
-	"${FILESDIR}"/${PN}-8.2.0-do-not-use-sysconfig.patch
-	"${FILESDIR}"/${PN}-8.2.0-fix-paths-for-apparmor.patch
-	"${FILESDIR}"/${PN}-8.7.0-meson-Stop-detecting-Wl-version-script.patch
-)
-
-pkg_setup() {
-	# Check kernel configuration:
-	CONFIG_CHECK=""
-	use fuse && CONFIG_CHECK+="
-		~FUSE_FS"
-
-	use lvm && CONFIG_CHECK+="
-		~BLK_DEV_DM
-		~DM_MULTIPATH
-		~DM_SNAPSHOT"
-
-	use lxc && CONFIG_CHECK+="
-		~BLK_CGROUP
-		~CGROUP_CPUACCT
-		~CGROUP_DEVICE
-		~CGROUP_FREEZER
-		~CGROUP_NET_PRIO
-		~CGROUP_PERF
-		~CGROUPS
-		~CGROUP_SCHED
-		~CPUSETS
-		~IPC_NS
-		~MACVLAN
-		~NAMESPACES
-		~NET_CLS_CGROUP
-		~NET_NS
-		~PID_NS
-		~POSIX_MQUEUE
-		~SECURITYFS
-		~USER_NS
-		~UTS_NS
-		~VETH
-		~!GRKERNSEC_CHROOT_MOUNT
-		~!GRKERNSEC_CHROOT_DOUBLE
-		~!GRKERNSEC_CHROOT_PIVOT
-		~!GRKERNSEC_CHROOT_CHMOD
-		~!GRKERNSEC_CHROOT_CAPS"
-
-	kernel_is lt 4 7 && use lxc && CONFIG_CHECK+="
-		~DEVPTS_MULTIPLE_INSTANCES"
-
-	use virt-network && CONFIG_CHECK+="
-		~BRIDGE_EBT_MARK_T
-		~BRIDGE_NF_EBTABLES
-		~NETFILTER_ADVANCED
-		~NETFILTER_XT_CONNMARK
-		~NETFILTER_XT_MARK
-		~NETFILTER_XT_TARGET_CHECKSUM
-		~IP_NF_FILTER
-		~IP_NF_MANGLE
-		~IP_NF_NAT
-		~IP6_NF_FILTER
-		~IP6_NF_MANGLE
-		~IP6_NF_NAT"
-
-	# This was renamed in kernel commit v5.2-rc1~133^2~174^2~6
-	if use virt-network ; then
-		if kernel_is -lt 5 2 ; then
-			CONFIG_CHECK+="
-			~IP_NF_TARGET_MASQUERADE"
-		else
-			CONFIG_CHECK+="
-			~NETFILTER_XT_TARGET_MASQUERADE"
-		fi
-	fi
-
-	# Bandwidth Limiting Support
-	use virt-network && CONFIG_CHECK+="
-		~BRIDGE_EBT_T_NAT
-		~IP_NF_TARGET_REJECT
-		~NET_ACT_POLICE
-		~NET_CLS_FW
-		~NET_CLS_U32
-		~NET_SCH_HTB
-		~NET_SCH_INGRESS
-		~NET_SCH_SFQ"
-
-	ERROR_USER_NS="Optional depending on LXC configuration."
-
-	if [[ -n ${CONFIG_CHECK} ]]; then
-		linux-info_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	touch "${S}/.mailmap" || die
-
-	default
-	python_fix_shebang .
-
-	# Skip fragile tests which relies on pristine environment
-	# (Breaks because of sandbox environment variables)
-	# bug #802876
-	sed -i -e "/commandtest/d" tests/meson.build || die
-
-	# Tweak the init script:
-	cp "${FILESDIR}/libvirtd.init-r19" "${S}/libvirtd.init" || die
-	sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \
-		-i "${S}/libvirtd.init" || die "sed failed"
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature apparmor)
-		$(meson_feature apparmor apparmor_profiles)
-		$(meson_feature audit)
-		$(meson_feature caps capng)
-		$(meson_feature dtrace)
-		$(meson_feature firewalld)
-		$(meson_feature fuse)
-		$(meson_feature glusterfs)
-		$(meson_feature glusterfs storage_gluster)
-		$(meson_feature iscsi storage_iscsi)
-		$(meson_feature iscsi-direct storage_iscsi_direct)
-		$(meson_feature libvirtd driver_libvirtd)
-		$(meson_feature libssh)
-		$(meson_feature libssh2)
-		$(meson_feature lvm storage_lvm)
-		$(meson_feature lvm storage_mpath)
-		$(meson_feature lxc driver_lxc)
-		$(meson_feature nls)
-		$(meson_feature numa numactl)
-		$(meson_feature numa numad)
-		$(meson_feature openvz driver_openvz)
-		$(meson_feature parted storage_disk)
-		$(meson_feature pcap libpcap)
-		$(meson_feature policykit polkit)
-		$(meson_feature qemu driver_qemu)
-		$(meson_feature qemu yajl)
-		$(meson_feature rbd storage_rbd)
-		$(meson_feature sasl)
-		$(meson_feature selinux)
-		$(meson_feature udev)
-		$(meson_feature virt-network driver_network)
-		$(meson_feature virtualbox driver_vbox)
-		$(meson_feature wireshark-plugins wireshark_dissector)
-		$(meson_feature xen driver_libxl)
-		$(meson_feature zfs storage_zfs)
-
-		-Dnetcf=disabled
-		-Dsanlock=disabled
-		-Dopenwsman=disabled
-
-		-Ddriver_esx=enabled
-		-Dinit_script=systemd
-		-Dqemu_user=$(usex caps qemu root)
-		-Dqemu_group=$(usex caps qemu root)
-		-Ddriver_remote=enabled
-		-Dstorage_fs=enabled
-		-Ddriver_vmware=enabled
-
-		--localstatedir="${EPREFIX}/var"
-		-Drunstatedir="${EPREFIX}/run"
-		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
-	)
-
-	meson_src_configure
-}
-
-src_test() {
-	export VIR_TEST_DEBUG=1
-	# Don't run the syntax check tests, they're fragile and not relevant
-	# to us downstream anyway.
-	# We also crank up the timeout (as Fedora does) just to preempt failures
-	# on slower arches.
-	meson_src_test --no-suite syntax-check --timeout-multiplier 10
-}
-
-src_install() {
-	meson_src_install
-
-	# Depending on configuration option, libvirt will create some bogus
-	# directoreis. They are either not used, or libvirtd is able to create
-	# them on demand, so let's remove them.
-	#
-	# Note, we are using -f here so that rm does not fail or warn if the
-	# directory is nonexistent.
-	rm -rf "${D}"/etc/sysconfig
-	rm -rf "${D}"/var
-	rm -rf "${D}"/run
-
-	use libvirtd || return 0
-	# From here, only libvirtd-related instructions, be warned!
-
-	newtmpfiles "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf
-
-	newinitd "${S}/libvirtd.init" libvirtd
-	newinitd "${FILESDIR}/libvirt-guests.init-r4" libvirt-guests
-	newinitd "${FILESDIR}/virtlockd.init-r2" virtlockd
-	newinitd "${FILESDIR}/virtlogd.init-r2" virtlogd
-
-	newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd
-	newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests
-
-	DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r3")
-	DISABLE_AUTOFORMATTING=true
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
-		touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml || die
-	fi
-
-	use libvirtd || return 0
-	# From here, only libvirtd-related instructions, be warned!
-	tmpfiles_process libvirtd.conf
-	readme.gentoo_print_elog
-}
--- a/app-emulation/libvirt/libvirt-8.9.0-r2.ebuild
+++ b/app-emulation/libvirt/libvirt-8.9.0-r2.ebuild
@ -1,360 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Packages which get releases together:
-# app-emacs/nxml-libvirt-schemas
-# dev-python/libvirt-python
-# dev-perl/Sys-Virt
-# app-emulation/libvirt
-# Please bump them together!
-
-PYTHON_COMPAT=( python3_{9..11} )
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/libvirt.org.asc
-inherit meson linux-info python-any-r1 readme.gentoo-r1 tmpfiles verify-sig
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.com/libvirt/libvirt.git"
-	EGIT_BRANCH="master"
-else
-	SRC_URI="https://libvirt.org/sources/${P}.tar.xz
-		verify-sig? ( https://libvirt.org/sources/${P}.tar.xz.asc )"
-	KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-fi
-
-DESCRIPTION="C toolkit to manipulate virtual machines"
-HOMEPAGE="https://www.libvirt.org/ https://gitlab.com/libvirt/libvirt/"
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-IUSE="
-	apparmor audit bash-completion +caps dtrace firewalld fuse glusterfs
-	iscsi iscsi-direct +libvirtd lvm libssh libssh2 lxc nfs nls numa openvz
-	parted pcap policykit +qemu rbd sasl selinux +udev
-	virtualbox +virt-network wireshark-plugins xen zfs
-"
-
-REQUIRED_USE="
-	firewalld? ( virt-network )
-	libvirtd? ( || ( lxc openvz qemu virtualbox xen ) )
-	lxc? ( caps libvirtd )
-	openvz? ( libvirtd )
-	qemu? ( libvirtd )
-	virt-network? ( libvirtd )
-	virtualbox? ( libvirtd )
-	xen? ( libvirtd )"
-
-BDEPEND="
-	app-text/xhtml1
-	dev-lang/perl
-	dev-libs/libxslt
-	dev-perl/XML-XPath
-	dev-python/docutils
-	virtual/pkgconfig
-	net-libs/rpcsvc-proto
-	bash-completion? ( >=app-shells/bash-completion-2.0 )
-	verify-sig? ( sec-keys/openpgp-keys-libvirt )"
-
-# gettext.sh command is used by the libvirt command wrappers, and it's
-# non-optional, so put it into RDEPEND.
-# We can use both libnl:1.1 and libnl:3, but if you have both installed, the
-# package will use 3 by default. Since we don't have slot pinning in an API,
-# we must go with the most recent.
-RDEPEND="
-	acct-user/qemu
-	app-misc/scrub
-	>=dev-libs/glib-2.56.0
-	dev-libs/libgcrypt
-	dev-libs/libnl:3
-	>=dev-libs/libxml2-2.9.1
-	>=net-analyzer/openbsd-netcat-1.105-r1
-	>=net-libs/gnutls-3.2.0:=
-	net-libs/libtirpc:=
-	>=net-misc/curl-7.18.0
-	sys-apps/dbus
-	sys-apps/dmidecode
-	sys-devel/gettext
-	>=sys-libs/readline-7.0:=
-	virtual/acl
-	apparmor? ( sys-libs/libapparmor )
-	audit? ( sys-process/audit )
-	caps? ( sys-libs/libcap-ng )
-	dtrace? ( dev-util/systemtap )
-	firewalld? ( >=net-firewall/firewalld-0.6.3 )
-	fuse? ( sys-fs/fuse:= )
-	glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
-	iscsi? ( >=sys-block/open-iscsi-1.18.0 )
-	iscsi-direct? ( >=net-libs/libiscsi-1.18.0 )
-	libssh? ( >=net-libs/libssh-0.8.1:= )
-	libssh2? ( >=net-libs/libssh2-1.3 )
-	lvm? ( >=sys-fs/lvm2-2.02.48-r2[lvm] )
-	lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] )
-	nfs? ( net-fs/nfs-utils )
-	numa? (
-		>sys-process/numactl-2.0.2
-		sys-process/numad
-	)
-	parted? (
-		>=sys-block/parted-1.8[device-mapper]
-		sys-fs/lvm2[lvm]
-	)
-	pcap? ( >=net-libs/libpcap-1.8.0 )
-	policykit? (
-		acct-group/libvirt
-		>=sys-auth/polkit-0.9
-	)
-	qemu? (
-		>=app-emulation/qemu-4.2
-		>=dev-libs/yajl-2.0.3:=
-	)
-	rbd? ( sys-cluster/ceph )
-	sasl? ( >=dev-libs/cyrus-sasl-2.1.26 )
-	selinux? ( >=sys-libs/libselinux-2.0.85 )
-	virt-network? (
-		net-dns/dnsmasq[dhcp,ipv6(+),script]
-		net-firewall/ebtables
-		>=net-firewall/iptables-1.4.10[ipv6(+)]
-		net-misc/radvd
-		sys-apps/iproute2[-minimal]
-	)
-	wireshark-plugins? ( >=net-analyzer/wireshark-2.6.0:= )
-	xen? (
-		>=app-emulation/xen-4.9.0
-		app-emulation/xen-tools:=
-	)
-	udev? (
-		virtual/libudev:=
-		>=x11-libs/libpciaccess-0.10.9
-	)
-	zfs? ( sys-fs/zfs )
-	kernel_linux? ( sys-apps/util-linux )"
-DEPEND="
-	${BDEPEND}
-	${RDEPEND}
-	${PYTHON_DEPS}
-"
-# The 'circular' dependency on dev-python/libvirt-python is because of
-# virt-qemu-qmp-proxy.
-PDEPEND="
-	qemu? ( dev-python/libvirt-python )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.0.0-fix_paths_in_libvirt-guests_sh.patch
-	"${FILESDIR}"/${PN}-8.2.0-do-not-use-sysconfig.patch
-	"${FILESDIR}"/${PN}-8.2.0-fix-paths-for-apparmor.patch
-	"${FILESDIR}"/${PN}-9.2.0-meson-Stop-detecting-Wl-version-script.patch
-)
-
-pkg_setup() {
-	# Check kernel configuration:
-	CONFIG_CHECK=""
-	use fuse && CONFIG_CHECK+="
-		~FUSE_FS"
-
-	use lvm && CONFIG_CHECK+="
-		~BLK_DEV_DM
-		~DM_MULTIPATH
-		~DM_SNAPSHOT"
-
-	use lxc && CONFIG_CHECK+="
-		~BLK_CGROUP
-		~CGROUP_CPUACCT
-		~CGROUP_DEVICE
-		~CGROUP_FREEZER
-		~CGROUP_NET_PRIO
-		~CGROUP_PERF
-		~CGROUPS
-		~CGROUP_SCHED
-		~CPUSETS
-		~IPC_NS
-		~MACVLAN
-		~NAMESPACES
-		~NET_CLS_CGROUP
-		~NET_NS
-		~PID_NS
-		~POSIX_MQUEUE
-		~SECURITYFS
-		~USER_NS
-		~UTS_NS
-		~VETH
-		~!GRKERNSEC_CHROOT_MOUNT
-		~!GRKERNSEC_CHROOT_DOUBLE
-		~!GRKERNSEC_CHROOT_PIVOT
-		~!GRKERNSEC_CHROOT_CHMOD
-		~!GRKERNSEC_CHROOT_CAPS"
-
-	kernel_is lt 4 7 && use lxc && CONFIG_CHECK+="
-		~DEVPTS_MULTIPLE_INSTANCES"
-
-	use virt-network && CONFIG_CHECK+="
-		~BRIDGE_EBT_MARK_T
-		~BRIDGE_NF_EBTABLES
-		~NETFILTER_ADVANCED
-		~NETFILTER_XT_CONNMARK
-		~NETFILTER_XT_MARK
-		~NETFILTER_XT_TARGET_CHECKSUM
-		~IP_NF_FILTER
-		~IP_NF_MANGLE
-		~IP_NF_NAT
-		~IP6_NF_FILTER
-		~IP6_NF_MANGLE
-		~IP6_NF_NAT"
-
-	# This was renamed in kernel commit v5.2-rc1~133^2~174^2~6
-	if use virt-network ; then
-		if kernel_is -lt 5 2 ; then
-			CONFIG_CHECK+="
-			~IP_NF_TARGET_MASQUERADE"
-		else
-			CONFIG_CHECK+="
-			~NETFILTER_XT_TARGET_MASQUERADE"
-		fi
-	fi
-
-	# Bandwidth Limiting Support
-	use virt-network && CONFIG_CHECK+="
-		~BRIDGE_EBT_T_NAT
-		~IP_NF_TARGET_REJECT
-		~NET_ACT_POLICE
-		~NET_CLS_FW
-		~NET_CLS_U32
-		~NET_SCH_HTB
-		~NET_SCH_INGRESS
-		~NET_SCH_SFQ"
-
-	ERROR_USER_NS="Optional depending on LXC configuration."
-
-	if [[ -n ${CONFIG_CHECK} ]]; then
-		linux-info_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	touch "${S}/.mailmap" || die
-
-	default
-	python_fix_shebang .
-
-	# Skip fragile tests which relies on pristine environment
-	# (Breaks because of sandbox environment variables)
-	# bug #802876
-	sed -i -e "/commandtest/d" tests/meson.build || die
-
-	# Tweak the init script:
-	cp "${FILESDIR}/libvirtd.init-r19" "${S}/libvirtd.init" || die
-	sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \
-		-i "${S}/libvirtd.init" || die "sed failed"
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature apparmor)
-		$(meson_feature apparmor apparmor_profiles)
-		$(meson_feature audit)
-		$(meson_feature caps capng)
-		$(meson_feature dtrace)
-		$(meson_feature firewalld)
-		$(meson_feature fuse)
-		$(meson_feature glusterfs)
-		$(meson_feature glusterfs storage_gluster)
-		$(meson_feature iscsi storage_iscsi)
-		$(meson_feature iscsi-direct storage_iscsi_direct)
-		$(meson_feature libvirtd driver_libvirtd)
-		$(meson_feature libssh)
-		$(meson_feature libssh2)
-		$(meson_feature lvm storage_lvm)
-		$(meson_feature lvm storage_mpath)
-		$(meson_feature lxc driver_lxc)
-		$(meson_feature nls)
-		$(meson_feature numa numactl)
-		$(meson_feature numa numad)
-		$(meson_feature openvz driver_openvz)
-		$(meson_feature parted storage_disk)
-		$(meson_feature pcap libpcap)
-		$(meson_feature policykit polkit)
-		$(meson_feature qemu driver_qemu)
-		$(meson_feature qemu yajl)
-		$(meson_feature rbd storage_rbd)
-		$(meson_feature sasl)
-		$(meson_feature selinux)
-		$(meson_feature udev)
-		$(meson_feature virt-network driver_network)
-		$(meson_feature virtualbox driver_vbox)
-		$(meson_feature wireshark-plugins wireshark_dissector)
-		$(meson_feature xen driver_libxl)
-		$(meson_feature zfs storage_zfs)
-
-		-Dnetcf=disabled
-		-Dsanlock=disabled
-		-Dopenwsman=disabled
-
-		-Ddriver_esx=enabled
-		-Dinit_script=systemd
-		-Dqemu_user=$(usex caps qemu root)
-		-Dqemu_group=$(usex caps qemu root)
-		-Ddriver_remote=enabled
-		-Dstorage_fs=enabled
-		-Ddriver_vmware=enabled
-
-		--localstatedir="${EPREFIX}/var"
-		-Drunstatedir="${EPREFIX}/run"
-		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
-	)
-
-	meson_src_configure
-}
-
-src_test() {
-	export VIR_TEST_DEBUG=1
-	# Don't run the syntax check tests, they're fragile and not relevant
-	# to us downstream anyway.
-	# We also crank up the timeout (as Fedora does) just to preempt failures
-	# on slower arches.
-	meson_src_test --no-suite syntax-check --timeout-multiplier 10
-}
-
-src_install() {
-	meson_src_install
-
-	# Depending on configuration option, libvirt will create some bogus
-	# directoreis. They are either not used, or libvirtd is able to create
-	# them on demand, so let's remove them.
-	#
-	# Note, we are using -f here so that rm does not fail or warn if the
-	# directory is nonexistent.
-	rm -rf "${D}"/etc/sysconfig
-	rm -rf "${D}"/var
-	rm -rf "${D}"/run
-
-	use libvirtd || return 0
-	# From here, only libvirtd-related instructions, be warned!
-
-	newtmpfiles "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf
-
-	newinitd "${S}/libvirtd.init" libvirtd
-	newinitd "${FILESDIR}/libvirt-guests.init-r4" libvirt-guests
-	newinitd "${FILESDIR}/virtlockd.init-r2" virtlockd
-	newinitd "${FILESDIR}/virtlogd.init-r2" virtlogd
-
-	newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd
-	newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests
-
-	DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r3")
-	DISABLE_AUTOFORMATTING=true
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
-		touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml || die
-	fi
-
-	use libvirtd || return 0
-	# From here, only libvirtd-related instructions, be warned!
-	tmpfiles_process libvirtd.conf
-	readme.gentoo_print_elog
-}
--- a/app-emulation/libvirt/libvirt-8.9.0.ebuild
+++ b/app-emulation/libvirt/libvirt-8.9.0.ebuild
@ -1,356 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Packages which get releases together:
-# app-emacs/nxml-libvirt-schemas
-# dev-python/libvirt-python
-# dev-perl/Sys-Virt
-# app-emulation/libvirt
-# Please bump them together!
-
-PYTHON_COMPAT=( python3_{9..11} )
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/libvirt.org.asc
-inherit meson linux-info python-any-r1 readme.gentoo-r1 tmpfiles verify-sig
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.com/libvirt/libvirt.git"
-	EGIT_BRANCH="master"
-else
-	SRC_URI="https://libvirt.org/sources/${P}.tar.xz
-		verify-sig? ( https://libvirt.org/sources/${P}.tar.xz.asc )"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-fi
-
-DESCRIPTION="C toolkit to manipulate virtual machines"
-HOMEPAGE="https://www.libvirt.org/ https://gitlab.com/libvirt/libvirt/"
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-IUSE="
-	apparmor audit bash-completion +caps dtrace firewalld fuse glusterfs
-	iscsi iscsi-direct +libvirtd lvm libssh libssh2 lxc nfs nls numa openvz
-	parted pcap policykit +qemu rbd sasl selinux +udev
-	virtualbox +virt-network wireshark-plugins xen zfs
-"
-
-REQUIRED_USE="
-	firewalld? ( virt-network )
-	libvirtd? ( || ( lxc openvz qemu virtualbox xen ) )
-	lxc? ( caps libvirtd )
-	openvz? ( libvirtd )
-	qemu? ( libvirtd )
-	virt-network? ( libvirtd )
-	virtualbox? ( libvirtd )
-	xen? ( libvirtd )"
-
-BDEPEND="
-	app-text/xhtml1
-	dev-lang/perl
-	dev-libs/libxslt
-	dev-perl/XML-XPath
-	dev-python/docutils
-	virtual/pkgconfig
-	net-libs/rpcsvc-proto
-	bash-completion? ( >=app-shells/bash-completion-2.0 )
-	verify-sig? ( sec-keys/openpgp-keys-libvirt )"
-
-# gettext.sh command is used by the libvirt command wrappers, and it's
-# non-optional, so put it into RDEPEND.
-# We can use both libnl:1.1 and libnl:3, but if you have both installed, the
-# package will use 3 by default. Since we don't have slot pinning in an API,
-# we must go with the most recent.
-# The 'circular' dependency on dev-python/libvirt-python is because of
-# virt-qemu-qmp-proxy.
-RDEPEND="
-	acct-user/qemu
-	app-misc/scrub
-	>=dev-libs/glib-2.56.0
-	dev-libs/libgcrypt
-	dev-libs/libnl:3
-	>=dev-libs/libxml2-2.9.1
-	>=net-analyzer/openbsd-netcat-1.105-r1
-	>=net-libs/gnutls-3.2.0:=
-	net-libs/libtirpc:=
-	>=net-misc/curl-7.18.0
-	sys-apps/dbus
-	sys-apps/dmidecode
-	sys-devel/gettext
-	>=sys-libs/readline-7.0:=
-	virtual/acl
-	apparmor? ( sys-libs/libapparmor )
-	audit? ( sys-process/audit )
-	caps? ( sys-libs/libcap-ng )
-	dtrace? ( dev-util/systemtap )
-	firewalld? ( >=net-firewall/firewalld-0.6.3 )
-	fuse? ( sys-fs/fuse:= )
-	glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
-	iscsi? ( >=sys-block/open-iscsi-1.18.0 )
-	iscsi-direct? ( >=net-libs/libiscsi-1.18.0 )
-	libssh? ( >=net-libs/libssh-0.8.1:= )
-	libssh2? ( >=net-libs/libssh2-1.3 )
-	lvm? ( >=sys-fs/lvm2-2.02.48-r2[lvm] )
-	lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] )
-	nfs? ( net-fs/nfs-utils )
-	numa? (
-		>sys-process/numactl-2.0.2
-		sys-process/numad
-	)
-	parted? (
-		>=sys-block/parted-1.8[device-mapper]
-		sys-fs/lvm2[lvm]
-	)
-	pcap? ( >=net-libs/libpcap-1.8.0 )
-	policykit? (
-		acct-group/libvirt
-		>=sys-auth/polkit-0.9
-	)
-	qemu? (
-		>=app-emulation/qemu-4.2
-		>=dev-libs/yajl-2.0.3:=
-		dev-python/libvirt-python
-	)
-	rbd? ( sys-cluster/ceph )
-	sasl? ( >=dev-libs/cyrus-sasl-2.1.26 )
-	selinux? ( >=sys-libs/libselinux-2.0.85 )
-	virt-network? (
-		net-dns/dnsmasq[dhcp,ipv6(+),script]
-		net-firewall/ebtables
-		>=net-firewall/iptables-1.4.10[ipv6(+)]
-		net-misc/radvd
-		sys-apps/iproute2[-minimal]
-	)
-	wireshark-plugins? ( >=net-analyzer/wireshark-2.6.0:= )
-	xen? (
-		>=app-emulation/xen-4.9.0
-		app-emulation/xen-tools:=
-	)
-	udev? (
-		virtual/libudev:=
-		>=x11-libs/libpciaccess-0.10.9
-	)
-	zfs? ( sys-fs/zfs )
-	kernel_linux? ( sys-apps/util-linux )"
-DEPEND="${BDEPEND}
-	${RDEPEND}
-	${PYTHON_DEPS}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.0.0-fix_paths_in_libvirt-guests_sh.patch
-	"${FILESDIR}"/${PN}-8.2.0-do-not-use-sysconfig.patch
-	"${FILESDIR}"/${PN}-8.2.0-fix-paths-for-apparmor.patch
-	"${FILESDIR}"/${PN}-9.2.0-meson-Stop-detecting-Wl-version-script.patch
-)
-
-pkg_setup() {
-	# Check kernel configuration:
-	CONFIG_CHECK=""
-	use fuse && CONFIG_CHECK+="
-		~FUSE_FS"
-
-	use lvm && CONFIG_CHECK+="
-		~BLK_DEV_DM
-		~DM_MULTIPATH
-		~DM_SNAPSHOT"
-
-	use lxc && CONFIG_CHECK+="
-		~BLK_CGROUP
-		~CGROUP_CPUACCT
-		~CGROUP_DEVICE
-		~CGROUP_FREEZER
-		~CGROUP_NET_PRIO
-		~CGROUP_PERF
-		~CGROUPS
-		~CGROUP_SCHED
-		~CPUSETS
-		~IPC_NS
-		~MACVLAN
-		~NAMESPACES
-		~NET_CLS_CGROUP
-		~NET_NS
-		~PID_NS
-		~POSIX_MQUEUE
-		~SECURITYFS
-		~USER_NS
-		~UTS_NS
-		~VETH
-		~!GRKERNSEC_CHROOT_MOUNT
-		~!GRKERNSEC_CHROOT_DOUBLE
-		~!GRKERNSEC_CHROOT_PIVOT
-		~!GRKERNSEC_CHROOT_CHMOD
-		~!GRKERNSEC_CHROOT_CAPS"
-
-	kernel_is lt 4 7 && use lxc && CONFIG_CHECK+="
-		~DEVPTS_MULTIPLE_INSTANCES"
-
-	use virt-network && CONFIG_CHECK+="
-		~BRIDGE_EBT_MARK_T
-		~BRIDGE_NF_EBTABLES
-		~NETFILTER_ADVANCED
-		~NETFILTER_XT_CONNMARK
-		~NETFILTER_XT_MARK
-		~NETFILTER_XT_TARGET_CHECKSUM
-		~IP_NF_FILTER
-		~IP_NF_MANGLE
-		~IP_NF_NAT
-		~IP6_NF_FILTER
-		~IP6_NF_MANGLE
-		~IP6_NF_NAT"
-
-	# This was renamed in kernel commit v5.2-rc1~133^2~174^2~6
-	if use virt-network ; then
-		if kernel_is -lt 5 2 ; then
-			CONFIG_CHECK+="
-			~IP_NF_TARGET_MASQUERADE"
-		else
-			CONFIG_CHECK+="
-			~NETFILTER_XT_TARGET_MASQUERADE"
-		fi
-	fi
-
-	# Bandwidth Limiting Support
-	use virt-network && CONFIG_CHECK+="
-		~BRIDGE_EBT_T_NAT
-		~IP_NF_TARGET_REJECT
-		~NET_ACT_POLICE
-		~NET_CLS_FW
-		~NET_CLS_U32
-		~NET_SCH_HTB
-		~NET_SCH_INGRESS
-		~NET_SCH_SFQ"
-
-	ERROR_USER_NS="Optional depending on LXC configuration."
-
-	if [[ -n ${CONFIG_CHECK} ]]; then
-		linux-info_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	touch "${S}/.mailmap" || die
-
-	default
-	python_fix_shebang .
-
-	# Skip fragile tests which relies on pristine environment
-	# (Breaks because of sandbox environment variables)
-	# bug #802876
-	sed -i -e "/commandtest/d" tests/meson.build || die
-
-	# Tweak the init script:
-	cp "${FILESDIR}/libvirtd.init-r19" "${S}/libvirtd.init" || die
-	sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \
-		-i "${S}/libvirtd.init" || die "sed failed"
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature apparmor)
-		$(meson_feature apparmor apparmor_profiles)
-		$(meson_feature audit)
-		$(meson_feature caps capng)
-		$(meson_feature dtrace)
-		$(meson_feature firewalld)
-		$(meson_feature fuse)
-		$(meson_feature glusterfs)
-		$(meson_feature glusterfs storage_gluster)
-		$(meson_feature iscsi storage_iscsi)
-		$(meson_feature iscsi-direct storage_iscsi_direct)
-		$(meson_feature libvirtd driver_libvirtd)
-		$(meson_feature libssh)
-		$(meson_feature libssh2)
-		$(meson_feature lvm storage_lvm)
-		$(meson_feature lvm storage_mpath)
-		$(meson_feature lxc driver_lxc)
-		$(meson_feature nls)
-		$(meson_feature numa numactl)
-		$(meson_feature numa numad)
-		$(meson_feature openvz driver_openvz)
-		$(meson_feature parted storage_disk)
-		$(meson_feature pcap libpcap)
-		$(meson_feature policykit polkit)
-		$(meson_feature qemu driver_qemu)
-		$(meson_feature qemu yajl)
-		$(meson_feature rbd storage_rbd)
-		$(meson_feature sasl)
-		$(meson_feature selinux)
-		$(meson_feature udev)
-		$(meson_feature virt-network driver_network)
-		$(meson_feature virtualbox driver_vbox)
-		$(meson_feature wireshark-plugins wireshark_dissector)
-		$(meson_feature xen driver_libxl)
-		$(meson_feature zfs storage_zfs)
-
-		-Dnetcf=disabled
-		-Dsanlock=disabled
-		-Dopenwsman=disabled
-
-		-Ddriver_esx=enabled
-		-Dinit_script=systemd
-		-Dqemu_user=$(usex caps qemu root)
-		-Dqemu_group=$(usex caps qemu root)
-		-Ddriver_remote=enabled
-		-Dstorage_fs=enabled
-		-Ddriver_vmware=enabled
-
-		--localstatedir="${EPREFIX}/var"
-		-Drunstatedir="${EPREFIX}/run"
-		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
-	)
-
-	meson_src_configure
-}
-
-src_test() {
-	export VIR_TEST_DEBUG=1
-	# Don't run the syntax check tests, they're fragile and not relevant
-	# to us downstream anyway.
-	# We also crank up the timeout (as Fedora does) just to preempt failures
-	# on slower arches.
-	meson_src_test --no-suite syntax-check --timeout-multiplier 10
-}
-
-src_install() {
-	meson_src_install
-
-	# Depending on configuration option, libvirt will create some bogus
-	# directoreis. They are either not used, or libvirtd is able to create
-	# them on demand, so let's remove them.
-	#
-	# Note, we are using -f here so that rm does not fail or warn if the
-	# directory is nonexistent.
-	rm -rf "${D}"/etc/sysconfig
-	rm -rf "${D}"/var
-	rm -rf "${D}"/run
-
-	use libvirtd || return 0
-	# From here, only libvirtd-related instructions, be warned!
-
-	newtmpfiles "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf
-
-	newinitd "${S}/libvirtd.init" libvirtd
-	newinitd "${FILESDIR}/libvirt-guests.init-r4" libvirt-guests
-	newinitd "${FILESDIR}/virtlockd.init-r2" virtlockd
-	newinitd "${FILESDIR}/virtlogd.init-r2" virtlogd
-
-	newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd
-	newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests
-
-	DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r3")
-	DISABLE_AUTOFORMATTING=true
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
-		touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml || die
-	fi
-
-	use libvirtd || return 0
-	# From here, only libvirtd-related instructions, be warned!
-	tmpfiles_process libvirtd.conf
-	readme.gentoo_print_elog
-}
--- a/app-emulation/libvirt/libvirt-9.4.0-r1.ebuild
+++ b/app-emulation/libvirt/libvirt-9.4.0-r1.ebuild
@ -31,9 +31,10 @@ SLOT="0/${PV}"
 IUSE="
 	apparmor audit bash-completion +caps dtrace firewalld fuse glusterfs
 	iscsi iscsi-direct +libvirtd lvm libssh libssh2 lxc nfs nls numa openvz
-	parted pcap policykit +qemu rbd sasl selinux +udev
+	parted pcap policykit +qemu rbd sasl selinux test +udev
 	virtualbox +virt-network wireshark-plugins xen zfs
 "
+RESTRICT="!test? ( test )"

 REQUIRED_USE="
 	firewalld? ( virt-network )
@ -106,6 +107,7 @@ RDEPEND="
 	)
 	qemu? (
 		>=app-emulation/qemu-4.2
+		app-crypt/swtpm
 		>=dev-libs/yajl-2.0.3:=
 	)
 	rbd? ( sys-cluster/ceph )
@ -141,9 +143,9 @@ PDEPEND="
 "

 PATCHES=(
-	"${FILESDIR}"/${PN}-6.0.0-fix_paths_in_libvirt-guests_sh.patch
-	"${FILESDIR}"/${PN}-8.2.0-do-not-use-sysconfig.patch
-	"${FILESDIR}"/${PN}-8.2.0-fix-paths-for-apparmor.patch
+	"${FILESDIR}"/${PN}-9.4.0-fix_paths_in_libvirt-guests_sh.patch
+	"${FILESDIR}"/${PN}-9.4.0-do-not-use-sysconfig.patch
+	"${FILESDIR}"/${PN}-9.5.0-fix-paths-for-apparmor.patch
 )

 pkg_setup() {
@ -280,6 +282,7 @@ src_configure() {
 		$(meson_feature rbd storage_rbd)
 		$(meson_feature sasl)
 		$(meson_feature selinux)
+		$(meson_feature test tests)
 		$(meson_feature udev)
 		$(meson_feature virt-network driver_network)
 		$(meson_feature virtualbox driver_vbox)
@ -300,6 +303,7 @@ src_configure() {
 		-Ddriver_vmware=enabled

 		--localstatedir="${EPREFIX}/var"
+		-Dinitconfdir="${EPREFIX}/etc/systemd"
 		-Drunstatedir="${EPREFIX}/run"
 		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
 	)
--- a/app-emulation/libvirt/libvirt-9999.ebuild
+++ b/app-emulation/libvirt/libvirt-9999.ebuild
@ -302,7 +302,7 @@ src_configure() {
 		-Ddriver_vmware=enabled

 		--localstatedir="${EPREFIX}/var"
-		-Dinitconfdir="${EPREFIX}/etc/conf.d"
+		-Dinitconfdir="${EPREFIX}/etc/systemd"
 		-Drunstatedir="${EPREFIX}/run"
 		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
 	)
--- a/app-emulation/qemu-guest-agent/Manifest
+++ b/app-emulation/qemu-guest-agent/Manifest
@ -7,7 +7,9 @@ AUX qemu-guest-agent-7.1.0-configure-Avoid-using-strings-binary.patch 2707 BLAKE
 DIST qemu-6.0.0.tar.xz 107333232 BLAKE2B 7746329d3e13782b7c346ce4052cc517cfc65cd9b2d514d199e4d5b8570ca79566ec04b0c114db2e97c84e68eb551e0d4cdce1b14b91a88fe08d2a5f682c1418 SHA512 ee3ff00aebec4d8891d2ff6dabe4e667e510b2a4fe3f6190aa34673a91ea32dcd2db2e9bf94c2f1bf05aa79788f17cfbbedc6027c0988ea08a92587b79ee05e4
 DIST qemu-7.1.0.tar.xz 121833004 BLAKE2B e05f91ce4993c7591a2df08b5fb017f8b8ec2141ab7bfd55d14730ea6b793ac1091de539992058392a5522d4e58beee92a87752707be58e3619b8213ef9f35bf SHA512 c60c5ff8ec99b7552e485768908920658fdd8035ff7a6fa370fb6881957dc8b7e5f18ff1a8f49bd6aa22909ede2a7c084986d8244f12074ccd33ebe40a0c411f
 DIST qemu-8.0.0.tar.xz 127835148 BLAKE2B 9b54aae10fe09691a26e68374723ded5fdda6409673b4de9461a25ee060cfd03968a16ddeadc21d48b9262e53aa6d4e5eb645376969f97c65807fad19607b04f SHA512 1f31d1e653dec2d35f1b7a5468ee3f471553b48eca8c8afafffcf9243c6b2260e78a5b73da3fe567f9b85d4133573eebd397747b3aec501fb24076263eb07b27
+DIST qemu-8.0.2.tar.xz 126707132 BLAKE2B f2b1a63e10c42aabfe39722c7732d0f04818ad367b769b3deb29c5bf9adcabc3aca1706f3c40fafeeb57ac1f7a61ded5066de32134c483e2fd27bc65b4b7d30a SHA512 4e915d33a662bf55b09247fb85150be376c92270d3764e3d6470c452cb70cc558f54e84de5610dd60a9eb3ea02d5d4277b1ec75c9804967d278fa8361c7f9b9a
 EBUILD qemu-guest-agent-6.0.0.ebuild 1674 BLAKE2B ad81005cee9c80175b2b2b1c0bad0138fc5f22428e9568df133c46ebf5ad27f53dc97161a1e88f37bde5b29874870173dd5813102745a31ef6367203a1024975 SHA512 7ce6fdd8a583059ed7cab97c5baba5e402e01019e05b16511afe89674d5a9fc06fc840c8b253bbf015beaa69ff65a9b557131bd1ce42af86f6b82e1ae282ad9d
 EBUILD qemu-guest-agent-7.1.0.ebuild 1754 BLAKE2B 532de7069a16db006f2a9611867f32376128fe061d4406904d6af1fb5da42caca4abe7925b8daa694e210f0c646ed7d6038a5fd1d3a0721e8bfcd31dcff934e7 SHA512 ebd0ea1cc2be832e12cde6d456c3e1e1899d464c281eec4944d7589c71107747fff97b74480622f4061265761171243192488ce13ef5b5464908a63c7df0a00f
 EBUILD qemu-guest-agent-8.0.0.ebuild 1684 BLAKE2B 5847f283493ade44de1b58eb955929cda76703f3edadebac676d978ca2909b10139eaaf8b46c4e1345c7837743a6fb8266dcc8fa44d416903d6bfa308261d5c6 SHA512 29ee2a7ab833bc6a19d4c57eb96e0448185f4db31592ff7838ea69921643ad5ca59506d9caa05fdff75161317ad19474dd92605bd485e7207b820bc358cfbbb1
+EBUILD qemu-guest-agent-8.0.2.ebuild 1686 BLAKE2B d8efe482367caaabe21bd2d98aca1c6af35b9b130e3425cd9ed76126ff539108723e4e4f1656e5feeac7272184cb9e59d7aa68c9698c47fc50dfa98697d78975 SHA512 4b53217dd4a83eeb5b70c0d01ef8866fcdf83875cd7afd72cd635d07bd601feea29f9cf3315ca4ea13eefd4b2bdb1875de17a12deffca1d3823e5db5e947d92b
 MISC metadata.xml 588 BLAKE2B 32aa23e19bdc88885534d8b58c9ad1aeabbcb94b4deb064c8cb10c72bc57999a677c8cdf9dd0fd389bd64a9b1a5dc379a20235a191e58f67ea671b5a7b92a1a8 SHA512 aee2dc28a40e0a68196eb4cff9450e6bc940565ee37d4405690e943c63ca9c05b66dcd6af69dbbdd6274cd4ac1c1b833ff15af4f3071ed0a2cd07358ac985866
--- a/app-emulation/qemu-guest-agent/qemu-guest-agent-8.0.2.ebuild
+++ b/app-emulation/qemu-guest-agent/qemu-guest-agent-8.0.2.ebuild
@ -0,0 +1,81 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit edo systemd toolchain-funcs python-any-r1 udev
+
+MY_PN="qemu"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="QEMU Guest Agent (qemu-ga) for use when running inside a VM"
+HOMEPAGE="https://wiki.qemu.org/Features/GuestAgent"
+SRC_URI="http://wiki.qemu.org/download/${MY_P}.tar.xz"
+
+LICENSE="GPL-2 BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="dev-libs/glib"
+DEPEND="${RDEPEND}"
+BDEPEND="${PYTHON_DEPS}
+	dev-lang/perl
+	dev-util/ninja"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+)
+
+src_configure() {
+	tc-export AR LD OBJCOPY RANLIB
+
+	local myconf=(
+		--prefix=/usr
+		--sysconfdir=/etc
+		--libdir="/usr/$(get_libdir)"
+		--localstatedir=/
+		--disable-bsd-user
+		--disable-linux-user
+		--disable-system
+		--disable-strip
+		--enable-tools
+		--disable-werror
+		--enable-guest-agent
+		--python="${PYTHON}"
+		--cc="$(tc-getCC)"
+		--cxx="$(tc-getCXX)"
+		--host-cc="$(tc-getBUILD_CC)"
+	)
+
+	edo ./configure "${myconf[@]}"
+}
+
+src_install() {
+	dobin build/qga/qemu-ga
+
+	# Normal init stuff
+	newinitd "${FILESDIR}/qemu-ga.init-r1" qemu-guest-agent
+	newconfd "${FILESDIR}/qemu-ga.conf-r1" qemu-guest-agent
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/qemu-ga.logrotate" qemu-guest-agent
+
+	# systemd stuff
+	udev_newrules "${FILESDIR}/qemu-ga-systemd.udev" 99-qemu-guest-agent.rules
+
+	systemd_newunit "${FILESDIR}/qemu-ga-systemd.service" \
+		qemu-guest-agent.service
+}
+
+pkg_postinst() {
+	elog "You should add 'qemu-guest-agent' to the default runlevel."
+	elog "e.g. rc-update add qemu-guest-agent default"
+	udev_reload
+}
+
+pkg_postrm() {
+	udev_reload
+}
--- a/app-emulation/spice-vdagent/Manifest
+++ b/app-emulation/spice-vdagent/Manifest
@ -1,9 +1,5 @@
 AUX spice-vdagent.confd-2 314 BLAKE2B 93d93f9e03e3aba9d889703ad24d08401222cf9d4b5fd0e72001bd0c0cf261d9f6879d1d0a89b51fc34dee2b15729425c694aca5522b1918f01edeea9b38b536 SHA512 ef3e02c65dd83ed0d4b1eaad9c6000a9d5d53fbbf2c19fe9604583f85478c92276b3b80554bd1573af6866e242c484f02da5c3500c0b4c430d3af0de755eed38
 AUX spice-vdagent.initd-4 1465 BLAKE2B f03734461fac2ec869b48a3e2b4c4bd7ebfe152f3d2563fb5005477ce1eebbc887ebe0cc8e317e5b80de073b3cc27dc1475e86b2127a7f4907470e398112d05e SHA512 a10614b9058f9a6d70d350d2764809646251fe555abf7127ce49b2e794545a72a500c9b6ab9e5dcc632253a1ed24017392b6d0446d469ffce954d00e5c96a6c8
-DIST spice-vdagent-0.19.0.tar.bz2 151356 BLAKE2B b7a99a7205d955b27edfe483746e3f267a6e0b7885c4b8146ba42d99b581cf4e1748b503a37a3d6b66623ef2515b42756f2e6a5a4775d56def7aa396bd0dfb4f SHA512 f5056dfe66df3ee8205549be22bbc8c17d2196c8448eda97f01659ff30c34d9929f330767d7fafec557dc5f7fb9b65eaf85973193b38df774042de9b72d6e60d
-DIST spice-vdagent-0.21.0.tar.bz2 164103 BLAKE2B 298122b334f880ffb8d77d3a7d822b70debce56d62bc3004bbac37445f10236a47706d23501ee3f82520c45b65deec12c9578cf4a8b9ac138df8b1c0b8cdb784 SHA512 1ff1a89e75301b1c2c89f26ba4bce8d4df29bbff6387ade128ce847ca30162a2bc731c70c10a8d129518e64bbca6b8271fd11ff3e340899182a65a5295051bff
 DIST spice-vdagent-0.22.1.tar.bz2 165560 BLAKE2B 4fd4318592d20d305d515c65d7491b90ac79bcc7f5bdfafd9df7858bdce24aa57c79f2121bbf9cbadec8e6297890f4b8598b9abcadcce5a9f39712b96deaa396 SHA512 5a4d2661145f33a0583880a128d925b15ca5aec05df83271c80f8baa0fcdd28fab0242301bc38443ccddf70fbdcfd76b5d30bb5a6b4b7c895c3cea0eb38bdf92
-EBUILD spice-vdagent-0.19.0-r1.ebuild 1420 BLAKE2B 5fdc3fe425aee257302f00416e82637fe8a612c21a15ded9b3ebd27bc50833607b25d920d3489a5d52e2897a968d906ced5684b996dc0014b9d2183068503501 SHA512 7945e81a166b6de6cd0f4b112fda21605473f35f27ce85777c7e31b798bc548cc2cdeccf53ae6936eb96e8a9c8a4f7d5259039c29f751fa5717c964dacc94044
-EBUILD spice-vdagent-0.21.0.ebuild 1487 BLAKE2B 77fabde2fad9b2178a5cdc0efc57a6968343d9c0937fb6256e2dfdfbce9ea7d98f8beac5451cb4bb3d659e49df83e542488053df644a7732df480f3a53ee19a5 SHA512 99eaa2b77f8273d36ba906ade6cb7b80c18c86ae92cfb969854ac747e546399a2549a42ce6af82e850a7a8d3dccb6fc6cd6b79392c07c428fc1bfbd558a03e08
-EBUILD spice-vdagent-0.22.1.ebuild 1551 BLAKE2B 66638ffcb5f74eb4f08a2f99ac88432b15dac3e636ce98e4436500f1804894396e25f720d78f8db2cbd3d462aaa058b415c831a419ee37f38435ecca19cabf61 SHA512 c822f5997795123f04d45ba492813fe7f6bc56f8b20f2db0bb364fbab064d0dee10598338720fc8a4e3069bf84d09ab00baf1a67034ec4636adeb48843a99f2d
+EBUILD spice-vdagent-0.22.1.ebuild 1582 BLAKE2B 24137d7cf2db78cb0c5ee8f5682528f1865cbf91d60dc2162a79388563a0330116082a86efcf68349d2051244acc3bec28b6e8040c069f7aa0b312b637609c22 SHA512 f8d4ae78a174e02aa858660a51b82451394ef173a5a2b680235eae5a7e80f7cfc512f88a8d418c9cfa2850a1bede160d6be7353bd02bedec1d0920ab17d69ef3
 MISC metadata.xml 272 BLAKE2B 27a9c4c06a3f01a09abd1c554d9682f0248cd486fa866be62e1e63fcd59c57df6ab036d307b91c4c509bf1190aa5a1620c5995e98fb518bad215eb94b024e2f6 SHA512 aaaaf0683baa09807a821ff4eff365008ee8f7cd7852fb042e7d0aa40cfcc8b192f3bd7bdee6c4cdaad2621b9ad42ea0a5784eb93e0923641e02f8aa24e562fe
--- a/app-emulation/spice-vdagent/spice-vdagent-0.19.0-r1.ebuild
+++ b/app-emulation/spice-vdagent/spice-vdagent-0.19.0-r1.ebuild
@ -1,63 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-info
-
-DESCRIPTION="SPICE VD Linux Guest Agent"
-HOMEPAGE="https://www.spice-space.org/"
-SRC_URI="https://www.spice-space.org/download/releases/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gtk selinux systemd"
-
-CDEPEND="
-	dev-libs/glib:2
-	>=app-emulation/spice-protocol-0.14.0
-	media-libs/alsa-lib
-	sys-apps/dbus
-	>=x11-libs/libpciaccess-0.10
-	x11-libs/libdrm
-	x11-libs/libXfixes
-	x11-libs/libXrandr
-	x11-libs/libX11
-	x11-libs/libXinerama
-	gtk? ( x11-libs/gtk+:3 )
-	systemd? ( sys-apps/systemd )"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-vdagent )"
-
-CONFIG_CHECK="~INPUT_UINPUT ~VIRTIO_CONSOLE"
-ERROR_INPUT_UINPUT="User level input support (INPUT_UINPUT) is required"
-ERROR_VIRTIO_CONSOLE="VirtIO console/serial device support (VIRTIO_CONSOLE) is required"
-
-src_configure() {
-	local opt=()
-	if use systemd; then
-		opt+=( --with-session-info=systemd )
-	else
-		opt+=( --with-session-info=none )
-	fi
-
-	econf \
-		--with-init-script=systemd \
-		--localstatedir="${EPREFIX}"/var \
-		$(use_with gtk) \
-		"${opt[@]}"
-}
-
-src_install() {
-	default
-
-	cd "${ED}" && rmdir -p var/run/spice-vdagentd || die
-
-	keepdir /var/log/spice-vdagentd
-
-	newinitd "${FILESDIR}/${PN}.initd-4" "${PN}"
-	newconfd "${FILESDIR}/${PN}.confd-2" "${PN}"
-}
--- a/app-emulation/spice-vdagent/spice-vdagent-0.21.0.ebuild
+++ b/app-emulation/spice-vdagent/spice-vdagent-0.21.0.ebuild
@ -1,67 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-info tmpfiles
-
-DESCRIPTION="SPICE VD Linux Guest Agent"
-HOMEPAGE="https://www.spice-space.org/"
-SRC_URI="https://www.spice-space.org/download/releases/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gtk selinux systemd"
-
-CDEPEND="
-	dev-libs/glib:2
-	>=app-emulation/spice-protocol-0.14.0
-	media-libs/alsa-lib
-	sys-apps/dbus
-	>=x11-libs/libpciaccess-0.10
-	x11-libs/libdrm
-	x11-libs/libXfixes
-	x11-libs/libXrandr
-	x11-libs/libX11
-	x11-libs/libXinerama
-	gtk? ( x11-libs/gtk+:3 )
-	systemd? ( sys-apps/systemd )"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-vdagent )"
-
-CONFIG_CHECK="~INPUT_UINPUT ~VIRTIO_CONSOLE"
-ERROR_INPUT_UINPUT="User level input support (INPUT_UINPUT) is required"
-ERROR_VIRTIO_CONSOLE="VirtIO console/serial device support (VIRTIO_CONSOLE) is required"
-
-src_configure() {
-	local opt=()
-	if use systemd; then
-		opt+=( --with-session-info=systemd )
-	else
-		opt+=( --with-session-info=none )
-	fi
-
-	econf \
-		--with-init-script=systemd \
-		--localstatedir="${EPREFIX}"/var \
-		$(use_with gtk) \
-		"${opt[@]}"
-}
-
-src_install() {
-	default
-
-	cd "${ED}" && rmdir -p var/run/spice-vdagentd || die
-
-	keepdir /var/log/spice-vdagentd
-
-	newinitd "${FILESDIR}/${PN}.initd-4" "${PN}"
-	newconfd "${FILESDIR}/${PN}.confd-2" "${PN}"
-}
-
-pkg_postinst() {
-	tmpfiles_process spice-vdagentd.conf
-}
--- a/app-emulation/spice-vdagent/spice-vdagent-0.22.1.ebuild
+++ b/app-emulation/spice-vdagent/spice-vdagent-0.22.1.ebuild
@ -67,3 +67,7 @@ pkg_postinst() {
 	udev_reload
 	tmpfiles_process spice-vdagentd.conf
 }
+
+pkg_postrm() {
+	udev_reload
+}
--- a/app-forensics/Manifest.gz
+++ b/app-forensics/Manifest.gz
--- a/app-forensics/aflplusplus/Manifest
+++ b/app-forensics/aflplusplus/Manifest
@ -1,4 +1,7 @@
 DIST aflplusplus-4.06c-patches.tar.xz 4360 BLAKE2B fb59065ef610e87d8bc822513822c150b592e0cdcf4f8f2d861b5dc4a5ded49a03b4ccc46636e24d69bdcee58f6882511f25a04cbc02565f9435c47be1b0829f SHA512 251db964ce6c7e1f59c6c1a8383c1fe4d362c7d336df4d13f0bc1f3c8583494e2b9c9f160fdd544174cc784afc1ae100310109d0d6a30c361b82f3ab50350afa
 DIST aflplusplus-4.06c.tar.gz 2859398 BLAKE2B bf26d6be364d01f91a5b60e2bca1ab48e2fed04571bbaee2fd74c31af1c3d53295808c5372bda8dc941232349e9113e09f2d0e8cadc5917fc4fc52e24bad9d60 SHA512 b585b244218e70e1120a81a5fbb7401d277174be13c5d5d507130ff7a7b25723ff29c2b3c820466ba847ff53ef016b23781edaccdfcdce904f6b93ec4d860140
-EBUILD aflplusplus-4.06c.ebuild 2052 BLAKE2B f779548b9fb4ab8ffcc36f83e6d06c8a7f786ced57f8aa36abc8a8416dde9f122a1eec7e99b705ae0c16e306a7f149f1922d93ffb51a82244d427333f39841af SHA512 961f9092fd3b0c058ce3d21b43e29b7e2b33aa2f708995c7af3247f9709776bcc06fe4ea1cf12f588e953a16888d58f7987353e16e53157b024181c014e00951
+DIST aflplusplus-4.07c-patches.tar.xz 4788 BLAKE2B de109198fbabfce2554459fee6a14f66002a952f5584ff265a6ff7d7646f520ed53a6d9c8c125a05eb5a4aa0c1cc675dca82647ad4c0965cdab10d3aa2f09467 SHA512 0ea4279b261d55cf209e32ca4b7fd7dc1181ec902dd7e4c7f36854d84f14037e643a543dcbb849927b41919c527303fc5877c9fab5b09c8988fbfab499b8f8bc
+DIST aflplusplus-4.07c.tar.gz 2878659 BLAKE2B c3c4c5507e29ed8015784378a13a55cb6b389dec915979749b1869496c16366ce876f1eecc91eb09d51cc58266a92296218cd5eda2a201f5cf4faaa2ea61942f SHA512 c62fce112d59ef5ffb847adab9a7ff8486d44e6316a391392979da19a8160b55f9af7f75fd39cdc98997b3e166f4f6a33ddf31b827c9414a1392657701ecb5e8
+EBUILD aflplusplus-4.06c-r2.ebuild 2074 BLAKE2B cc7e63fae36331ab1abd14c539dfc1c912dad896649e48fb6750354625a63201aaf6b07d50915751b16f038c7e675744cabe62ee53ba918a15a9f6eeada25ef0 SHA512 1328c66bdbcc50ccfb1bde6a58927490c587a83dd574cbaa8f839be150135e81300cadd67072f5b944d4ac70b0a927f768cc2cb8e4d7fdc36908067258a9e62b
+EBUILD aflplusplus-4.07c-r1.ebuild 2108 BLAKE2B f3cbb5c967fc4b352eeaf7d526d9349010bc52d9f59850b62395095a58af8f292cf67e942d6bd5d55d7f465bbcf3d775e6a94076524a9572177e45c7cd9c27d6 SHA512 adb1a72eb956c1cdf02e6e18c797afb0c42ff8b149c0926ba3de2ae33cfdbb96c9d91d4d2531e5d341c9402a8e5e60fa07e09da8e784fb13d0c7cd7c94c6994a
 MISC metadata.xml 328 BLAKE2B c9ad582740e9c2ad03a30fe0eaafb8ee19f0d9bc2e98cc7bcd14385a3407f84301479d324b92d3aecafdc1e5cfef1d2cfc8a15c2ecb5d8f2fa348d82de920128 SHA512 e56ce158f6764926c2ed4dc486f017ce75fa272ac8e6ad16e4a816f8c734d7313e3dc9cb007bab07efe73e59cab185312a02d6178296bfe25002719ce4975d14
--- a/app-forensics/aflplusplus/aflplusplus-4.06c-r2.ebuild
+++ b/app-forensics/aflplusplus/aflplusplus-4.06c-r2.ebuild
@ -27,10 +27,10 @@ RESTRICT="test"

 RDEPEND="
 	${PYTHON_DEPS}
-	>=sys-devel/llvm-13:=
+	<sys-devel/llvm-$((${LLVM_MAX_SLOT} + 1)):=
 	|| (
-		sys-devel/clang:13
 		sys-devel/clang:14
+		sys-devel/clang:15
 		sys-devel/clang:${LLVM_MAX_SLOT}
 	)
 	!app-forensics/afl"
--- a/app-forensics/aflplusplus/aflplusplus-4.07c-r1.ebuild
+++ b/app-forensics/aflplusplus/aflplusplus-4.07c-r1.ebuild
@ -0,0 +1,92 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+LLVM_MAX_SLOT=16
+inherit toolchain-funcs llvm optfeature python-single-r1
+
+AFL_PATCHSET="${PN}-4.07c-patches"
+DESCRIPTION="A fork of AFL, the popular compile-time instrumentation fuzzer"
+HOMEPAGE="https://github.com/AFLplusplus/AFLplusplus"
+SRC_URI="https://github.com/AFLplusplus/AFLplusplus/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${AFL_PATCHSET}.tar.xz"
+S="${WORKDIR}"/AFLplusplus-${PV}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# Tests involve heavy use of LD_PRELOAD in some cases
+# This isn't compatible with sandbox
+RESTRICT="test"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	<sys-devel/llvm-$((${LLVM_MAX_SLOT} + 1)):=
+	|| (
+		sys-devel/clang:14
+		sys-devel/clang:15
+		sys-devel/clang:${LLVM_MAX_SLOT}
+	)
+	!app-forensics/afl
+"
+DEPEND="
+	${RDEPEND}
+	test? ( dev-util/cmocka )
+"
+
+QA_FLAGS_IGNORED="
+	usr/lib.*/afl/afl-gcc-cmplog-pass.so
+	usr/lib.*/afl/afl-gcc-cmptrs-pass.so
+"
+QA_PREBUILT="usr/share/afl/testcases/others/elf/small_exec.elf"
+
+PATCHES=(
+	"${WORKDIR}"/${AFL_PATCHSET}
+)
+
+llvm_check_deps() {
+	has_version -b "sys-devel/clang:${LLVM_SLOT}" && \
+		has_version -b "sys-devel/llvm:${LLVM_SLOT}"
+}
+
+pkg_setup() {
+	llvm_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+mymake() {
+	emake \
+		CC="$(tc-getCC)" \
+		CXX="$(tc-getCXX)" \
+		CFLAGS_FLTO="" \
+		LLVM_CONFIG="$(get_llvm_prefix ${LLVM_MAX_SLOT})"/bin/llvm-config \
+		PREFIX="${EPREFIX}/usr" \
+		HELPER_PATH="${EPREFIX}/usr/$(get_libdir)/afl" \
+		DOC_PATH="${EPREFIX}/usr/share/doc/${PF}" \
+		MAN_PATH="${EPREFIX}/usr/share/man/man8" \
+		"$@"
+}
+
+src_compile() {
+	mymake
+}
+
+src_test() {
+	mymake test
+}
+
+src_install() {
+	mymake DESTDIR="${D}" install
+	dostrip -x /usr/share/afl/testcases/
+}
+
+pkg_postinst() {
+	# TODO: Any others?
+	optfeature "fuzzing with AFL_USE_ASAN" sys-libs/compiler-rt-sanitizers[asan]
+	optfeature "fuzzing with AFL_USE_MSAN" sys-libs/compiler-rt-sanitizers[msan]
+}
--- a/app-forensics/yara/Manifest
+++ b/app-forensics/yara/Manifest
@ -1,10 +1,8 @@
 AUX yara-4.2-test.patch 450 BLAKE2B b15319c9921e88504057deead820a884b963e2c240c5486fcfbaf51d7139932bd220de65f8f476f8a264529ac08fbec5ad9e40565d50a3157bb3b3ca783ff26e SHA512 36604637a5de0d6a9553b92b6f6e732cce312b7fe65dcdf70ea70e0a552251f2dd2b5916cad8c78138b946ee4b0bf558324cf944eff519e37af3c83efe61177a
 AUX yara-4.2.3-libmagic.patch 2690 BLAKE2B 904f2b47c16f5134f48ac8765b7cbe119e807ea113ccf6d62767ea67f9ebd7347884eab924591cf2c48802f984978fd504bef61c09717b0baaef55d212447880 SHA512 45a610e89fa9f2e1555291b2254baa8381beb3ef404223222cb5075660a43540cebab2529dd1542d2cebf52ad42e71715f332322f721451fe49a896313e79839
-DIST yara-4.2.3.tar.gz 1288334 BLAKE2B 4e92570e4dced5c1aa114065d791fc6780ea1281919eb1e908d4181fb5a966137c58d82ae09e8ba18edc69a25d542e3820d8e8de4ac62c0636e273e158086954 SHA512 1df23837d14d3f9f72db901190e7412241514a8914d72b753df32ad8a44c7a49ad8f14941a95de83754e4d1dd0f23d712d8e6a43916343341b92cb1bc66f3c09
-DIST yara-4.3.0.tar.gz 2179006 BLAKE2B 97d755c5ffea7fbfc61087f384f4b29543af794af64f86ee2fad10073905fd623480cc1be1c64c8ebf7561c9a8bd323ba5a3fad13044219f110e6a3d04816f36 SHA512 fe239ae2f29fac7b4dbdc0ec84eba057dd4d93c6ae3a53d6bc2a333cc15ed45b1ff5cb896faf02813be667ce191ccbe1d64549552ea4f0834804ad0ec4b29092
 DIST yara-4.3.1.tar.gz 2179177 BLAKE2B 071bd2201653b094f828a5ea1ca2dd08fb0e3e8ea0439784bd949fc9ebfeb3c1aa9408581c8808d2d648d988c3aaab676d61605b53446efa12d838898b7ffe16 SHA512 93a2243d54397e76175fa0106451965b7f3a1f1918307c2bae6193f3725b69f60f70c3901a12c1690368f5b37e973a65c63a299624a521d204b12b48d5efe496
-EBUILD yara-4.2.3.ebuild 1284 BLAKE2B 45912674a4be4d1f5cbcc307313d3e1c48806917716581521a2d367e60c65e7490cc5a6e8020013b42d728886d58080dc023593d663c2ed29b4b6c8035673205 SHA512 594237e4d050c5015bb41c950903e06e5a643867aef286e52a0f3002b0919bb8299c97c023f9447113e8e906a5f0ce8cd0c73a1db5af3e7a84078e52045bd04e
-EBUILD yara-4.3.0.ebuild 1269 BLAKE2B 3b9f001bb80ec39e7b3a77f270add2dfb6c339c53223bb14cabc1c5289787e5eee11c6b7347ec3098de72f1fc02a180e4ba22c6f80f00c46988c408cea5a2f2f SHA512 df58e0bd84dfcbfa2f74f1c647f510be06994d6dd3bd33f1ddf3952f285710d91dd0f90fd011f43ae51dea9df03f8254efc1e70380f30bd40d207c978f16bc06
+DIST yara-4.3.2.tar.gz 2179265 BLAKE2B cfcc18dbd4c69f5f640ef755a8d4efe5f7ec8e313153955644fbd2adc03d1c73cddc042e95c0c0629fd58780922eb3dc1c72a5ca1bd9ff767a9e3f41f1652c98 SHA512 dc77ec46a30ca2fff33b639166fc554c9c6d9e955642774e23da3ea7dbb25fe154cfd4ef83c9808920193028b9099258a63b3f1b9a66864a1f3905f0a8e8053f
 EBUILD yara-4.3.1.ebuild 1269 BLAKE2B 3b9f001bb80ec39e7b3a77f270add2dfb6c339c53223bb14cabc1c5289787e5eee11c6b7347ec3098de72f1fc02a180e4ba22c6f80f00c46988c408cea5a2f2f SHA512 df58e0bd84dfcbfa2f74f1c647f510be06994d6dd3bd33f1ddf3952f285710d91dd0f90fd011f43ae51dea9df03f8254efc1e70380f30bd40d207c978f16bc06
+EBUILD yara-4.3.2.ebuild 1299 BLAKE2B 1bfd0ff1ce1aa183bc0b605d3bbde4660fa8b97c3502426bc76335e9b74a9528232556c82fcf1fb1bc77f1c22711ae4af042585834567211e429474496d03b24 SHA512 56cf978196ec23ca63fa5846bd928ade3dfc607dc9f91c7e8a5471936bbd9086bef5da8fc3f32ee376116dab92ed5cb959c97752b891f997b46b478fec046d1a
 EBUILD yara-9999.ebuild 1271 BLAKE2B d96bc8732c7d227cbb42d34aa1fc0ec2fdd59eb0cf9e86034aae210e883591f8c5b3953217c5919c731515136754bbb0a3670887cb7bfbb6c2bad45140622f8d SHA512 60ed8c97271d032384048663f12575f80ab8a3ecbc75ac37b021ed9122162c1e964d2e2847d48eb37c8d8e0590db6ecfdb4e4b31deaa2030766370c715ef33a4
 MISC metadata.xml 1284 BLAKE2B 5e8b7f95170b97d4d55fda012f1108acfb0cae362d4da0f3559375d529194b5e4f9644d8ca3d0fc7e438b873f3827aec307dc664808a56561153679fc0bd5729 SHA512 64048379eb1d51afeee050ea906a8fa7bda9d5bdc78807d04c1f5f5b5a425b512de5facb6b79f23ed8d5517caf779ef327d7eb148ae2a32407904db05efb337f
--- a/app-forensics/yara/yara-4.2.3.ebuild
+++ b/app-forensics/yara/yara-4.2.3.ebuild
@ -1,60 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="A malware identification and classification tool"
-HOMEPAGE="https://virustotal.github.io/yara/"
-SRC_URI="https://github.com/virustotal/yara/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${PV/_/-}"
-
-LICENSE="Apache-2.0"
-SLOT="0/8"
-if [[ ${PV} != *_rc* ]] ; then
-	KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-fi
-IUSE="+dex +dotnet +cuckoo +macho +magic profiling python test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-libs/openssl:=
-	cuckoo? ( dev-libs/jansson:= )
-	magic? ( sys-apps/file:= )
-"
-RDEPEND="${DEPEND}"
-PDEPEND="python? ( =dev-python/yara-python-$(ver_cut 1)* )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-$(ver_cut 1-2)-test.patch"
-	"${FILESDIR}/${P}-libmagic.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable profiling) \
-		$(use_enable cuckoo) \
-		$(use_enable magic) \
-		$(use_enable dotnet) \
-		$(use_enable macho) \
-		$(use_enable dex) \
-		$(use_enable test static)
-}
-
-src_test() {
-	emake check
-}
-
-src_install() {
-	default
-
-	# TODO: Allow tests to work against dyn. lib rather than building
-	# statically just for tests.
-	find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
-}
--- a/app-forensics/yara/yara-4.3.2.ebuild
+++ b/app-forensics/yara/yara-4.3.2.ebuild
@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]]; then
 else
 	SRC_URI="https://github.com/virustotal/yara/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${PN}-${PV/_/-}"
-	KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 fi

 LICENSE="Apache-2.0"
@ -28,6 +28,7 @@ DEPEND="
 	magic? ( sys-apps/file:= )
 "
 RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
 PDEPEND="python? ( =dev-python/yara-python-$(ver_cut 1)* )"

 src_prepare() {
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
--- a/app-misc/broot/Manifest
+++ b/app-misc/broot/Manifest
@ -21,7 +21,6 @@ DIST bincode-1.3.3.crate 28958 BLAKE2B ea01d2efd8149ecba5e240ed989268b683d542a5f
 DIST bit_field-0.10.2.crate 10568 BLAKE2B 4dc92498b5f2befb9e3d8d5a7bcac478b7f905e708cb674e7589f23b60a3ade33b2c660c3f57105520aa863ef19787a00221e1f61914f090f9ec500961e3f70b SHA512 99bacb002aa9ef89cef1403429807042135898614df85e59475772b90d2d21972ddc77ef9b129ca931355ff11bfb3de66b55b828bbf792f76300fc5cfef066a8
 DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
 DIST block-0.1.6.crate 4077 BLAKE2B a2c11873b8cb1a1ea399ecc99ed45e5d0b9399bd88435cdea346910b8707b7da94eeef522dafa5cdb09929534472b2a096c03c373744a789962d4175fd1b110e SHA512 c278e3c0346cae423b533a8f5d6b822e788ec450c92ef0f5f559d5705764a0a11df49f0f66bb1c8af7e89bec8ec802934676b969e43f92255a38b210d0fbd710
-DIST broot-1.21.2.tar.gz 11095757 BLAKE2B 1a6a1e87915fa7fe32a88ed1bd1f35614f738f29fbab96006efc9220cd96bc66bdd01b62964b90481d174a848b4f70280155adb6fe17fdec21cc5208e30c1817 SHA512 3b873fdf8a503e4d9439f290a0dbcf7b46f07ea1a94e3ee19dd1a0b2561337b8f6ef9106cab4c15881f88827ab57030c0fc5cf1de2d1614312564f19dedc7848
 DIST broot-1.21.3.tar.gz 11095943 BLAKE2B 44b9e4c957efc1dda7a74c6f1a16bbb5d831aa63d1db32f1be12176e167bfb0747fa47cf9c123614d2ab317a579f635b5ea07611e4c4d9ae3886a43175bc52d5 SHA512 9528f5e5d3c387bd35c3459196a5dd4163b1fdce5b905c648729cf3e3c4ed9801e950c23173f7f7525d329fa4681113d9cf1b87b2d60dc65d4ac464a6c401e26
 DIST broot-1.22.1.tar.gz 11147450 BLAKE2B aa3f5cc12d308ed470d35db2e99d65b084dd23abbd471a330c0c1f03fcec70b68ee4b28c2feae6ac8f2caf604e47a8e03b2a5749f35bb9348d2380c5e7ebcf66 SHA512 f8925ba6e6b4cee6fb73de24b35b9c107be1b568424a8db43a29919ae0e83e7648ec935f0f2962aaf70c1bf5d89f6e522fdeb6c4d60f6b5051e696bd09918149
 DIST bstr-1.4.0.crate 345921 BLAKE2B 39a3cb366a7ceb784b7a6626f81338e8047498c5755ed60fce1f6460ea5aa907ab5df4bcf30a07ed699c7af7d2d0dbc48b2c5cb674b863c22fd63b5080b52fae SHA512 98dc7bdcc1a307eae2ed202b2b785a4ad27719c4b3289408edc710beabedb78d16b3042b41de04fca5dbdba19d8567df69c35431e33a3c02924820e1a601df36
@ -381,7 +380,6 @@ DIST xterm-query-0.2.0.crate 6342 BLAKE2B fd6a99cdc190d4e7bbf03467f1493c909cfd1c
 DIST yaml-rust-0.4.5.crate 47783 BLAKE2B 3e888c5cc7afb43eaf3aaab2b6f47b86df164a66eb54d4e166b965cc84b1e06cd17bd992a0d6ee175d9a73a76e2b44a13167246383ed054afcf3cc1710b309cb SHA512 7621dc8dfd5e7d4a7a8805b2a7e8319b63b852367655f2359d4e3e8fec6c4fad52d75c46ce1161e4c674eac0780b757ce9d34e664e304d8d2beec7afa0363ea0
 DIST zune-inflate-0.2.53.crate 36273 BLAKE2B f9541ae3a15422a13a731cd1f43df475dd9f5f0c3934247d70a61278e041f8b182ff3b7e053cdc38231c1f07187805e42e3656dda91a4f577817f9d46722b4e5 SHA512 6238def319045557a640f8a60f8c525b0749e6eed0c9856a52e0e33fc6f02d3a32a9c9145b317aee45bac3f2fe7a1e76eb14ac35519f6e895a2eec47cc5ad5d3
 DIST zune-inflate-0.2.54.crate 37973 BLAKE2B 8bdb532fae0da1d61fc9fc72ea72a9339116e1952e76ba7376f0ba0ea65101b88cd1e4766f516f21028a5ea3459e5590e7a54175a47f136cc572ed9abec2da2f SHA512 0de30f310121c1fed42612b7bcb50631d699195a77c7ce4094729f502e63d1ae38034d6054d95b6825e7e9a2afb7bb614ff123e12736163fee04a46ef1dc56bd
-EBUILD broot-1.21.2.ebuild 6762 BLAKE2B d27896c35ca2ecafd51db0eefbecba1f98dbe20895d987014caa0c6b61ec521ab9cfce55ef4efb4b44d727c83118d59707efaaed7b2d96c5b7751526bac85ddc SHA512 dbda3c534b59cd00b98b4d266aaf8f8a288da5a2d50450e1c11c74ea101e041d95cb76dd7e7aed1c6ed8b51855d6eba33c5685b8e125d1f22563d416a7273d9b
-EBUILD broot-1.21.3.ebuild 6763 BLAKE2B ec915c93a9f0b5f45384e57bfb54ac427dabb07d77cee717973b0a82aeeacc8fd6b8a3847918268518c7272eede53ce5ce5c2f03be7e697f929fd1fe4a490c8b SHA512 e7f3f16518c9d71cc711bb8467c2ead1eeee1895c722688a49fa41ed8066c4109451390fbd352e23f226714bbdf200cb8c93f7184266caa6d9b33a2390d4c462
+EBUILD broot-1.21.3.ebuild 6762 BLAKE2B d27896c35ca2ecafd51db0eefbecba1f98dbe20895d987014caa0c6b61ec521ab9cfce55ef4efb4b44d727c83118d59707efaaed7b2d96c5b7751526bac85ddc SHA512 dbda3c534b59cd00b98b4d266aaf8f8a288da5a2d50450e1c11c74ea101e041d95cb76dd7e7aed1c6ed8b51855d6eba33c5685b8e125d1f22563d416a7273d9b
 EBUILD broot-1.22.1.ebuild 6745 BLAKE2B dcffd1066ee2fae61b2d05962e8a2d6e5ea52ca582e407ffe8b47afe2c48c42cc0e91ef1875abd502647fd0097b528b8014cf161bdcff758cb462331d1106b9c SHA512 6f26d660b34a069149ec6abd2eb79245692adacc0d0a206ddc543f7951841a9eec6916435930ddaaf25056219520e9ebc5b0509a7863f5f64fde5de67955476d
 MISC metadata.xml 564 BLAKE2B 0c694d4996ceefd6b05c3ff74f313d775c820d3eb0ae327cc2c130a608fd8595c64aa1217599d61952c6ade05415eaac53056c3fad30ccb5347df134715bb573 SHA512 5533ba0526ff6cbb801696c8ddba2dc393b158bdc2cf5dedc3b245362d924172e4bd321412cd6976735bcabe01d5e7e191e11b2718412b5e389e9251ca5ea695
--- a/app-misc/broot/broot-1.21.2.ebuild
+++ b/app-misc/broot/broot-1.21.2.ebuild
@ -1,371 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CRATES="
-adler-1.0.2
-ahash-0.4.7
-ahash-0.7.6
-aho-corasick-0.7.20
-android_system_properties-0.1.5
-ansi_colours-1.2.1
-anyhow-1.0.70
-argh-0.1.10
-argh_derive-0.1.10
-argh_shared-0.1.10
-arrayref-0.3.7
-arrayvec-0.7.2
-atty-0.2.14
-autocfg-1.1.0
-base64-0.13.1
-base64-0.21.0
-bet-1.0.2
-bincode-1.3.3
-bit_field-0.10.2
-bitflags-1.3.2
-block-0.1.6
-bstr-1.4.0
-bumpalo-3.12.0
-bytemuck-1.13.1
-byteorder-1.4.3
-cc-1.0.79
-cfg-if-1.0.0
-char_reader-0.1.1
-chrono-0.4.24
-clap-3.2.23
-clap_complete-3.2.5
-clap_derive-3.2.18
-clap_lex-0.2.4
-cli-log-2.0.0
-clipboard-win-4.5.0
-clipboard_macos-0.1.0
-codespan-reporting-0.11.1
-color_quant-1.1.0
-coolor-0.5.0
-core-foundation-sys-0.8.3
-crc32fast-1.3.2
-crokey-0.4.3
-crokey-proc_macros-0.4.0
-crossbeam-0.8.2
-crossbeam-channel-0.5.7
-crossbeam-deque-0.8.3
-crossbeam-epoch-0.9.14
-crossbeam-queue-0.3.8
-crossbeam-utils-0.8.15
-crossterm-0.23.2
-crossterm_winapi-0.9.0
-crunchy-0.2.2
-csv-1.2.1
-csv-core-0.1.10
-csv2svg-0.1.8
-custom_error-1.9.2
-cxx-1.0.94
-cxx-build-1.0.94
-cxxbridge-flags-1.0.94
-cxxbridge-macro-1.0.94
-data-url-0.2.0
-deser-hjson-1.1.0
-directories-4.0.1
-directories-next-2.0.0
-dirs-sys-0.3.7
-dirs-sys-next-0.1.2
-doc-comment-0.3.3
-either-1.8.1
-errno-0.3.0
-errno-dragonfly-0.1.2
-error-code-2.3.1
-exr-1.6.3
-fallible-iterator-0.2.0
-fallible-streaming-iterator-0.1.9
-fastrand-1.9.0
-file-size-1.0.3
-flate2-1.0.25
-float-cmp-0.9.0
-flume-0.10.14
-fnv-1.0.7
-fontconfig-parser-0.5.2
-fontdb-0.10.0
-form_urlencoded-1.1.0
-futures-core-0.3.28
-futures-sink-0.3.28
-getrandom-0.2.8
-gif-0.11.4
-gif-0.12.0
-git2-0.14.4
-glassbench-0.3.4
-glob-0.3.1
-half-2.2.1
-hashbrown-0.12.3
-hashbrown-0.9.1
-hashlink-0.6.0
-heck-0.4.1
-hermit-abi-0.1.19
-hermit-abi-0.2.6
-hermit-abi-0.3.1
-iana-time-zone-0.1.55
-iana-time-zone-haiku-0.1.1
-id-arena-2.2.1
-idna-0.3.0
-image-0.24.6
-imagesize-0.10.1
-include_dir-0.7.3
-include_dir_macros-0.7.3
-indexmap-1.9.3
-instant-0.1.12
-io-lifetimes-1.0.9
-is_executable-1.0.1
-itoa-1.0.6
-jobserver-0.1.26
-jpeg-decoder-0.3.0
-js-sys-0.3.61
-kurbo-0.8.3
-lazy-regex-2.5.0
-lazy-regex-proc_macros-2.4.1
-lazy_static-1.4.0
-lebe-0.5.2
-lfs-core-0.11.1
-libc-0.2.140
-libgit2-sys-0.13.5+1.4.5
-libsqlite3-sys-0.20.1
-libz-sys-1.1.8
-line-wrap-0.1.1
-link-cplusplus-1.0.8
-linked-hash-map-0.5.6
-linux-raw-sys-0.3.0
-lock_api-0.4.9
-log-0.4.17
-malloc_buf-0.0.6
-memchr-2.5.0
-memmap2-0.5.10
-memoffset-0.6.5
-memoffset-0.8.0
-minimad-0.9.1
-minimad-0.11.0
-miniz_oxide-0.5.4
-miniz_oxide-0.6.2
-mio-0.8.6
-nanorand-0.7.0
-nix-0.22.3
-num-integer-0.1.45
-num-rational-0.4.1
-num-traits-0.2.15
-num_cpus-1.15.0
-objc-0.2.7
-objc-foundation-0.1.1
-objc_id-0.1.1
-once_cell-1.17.1
-onig-6.4.0
-onig_sys-69.8.1
-open-1.7.1
-opener-0.5.2
-os_str_bytes-6.5.0
-parking_lot-0.12.1
-parking_lot_core-0.9.7
-pathdiff-0.2.1
-percent-encoding-2.2.0
-phf-0.10.1
-phf_generator-0.10.0
-phf_macros-0.10.0
-phf_shared-0.10.0
-pico-args-0.5.0
-pin-project-1.0.12
-pin-project-internal-1.0.12
-pkg-config-0.3.26
-plist-1.4.3
-png-0.17.6
-ppv-lite86-0.2.17
-proc-macro-error-1.0.4
-proc-macro-error-attr-1.0.4
-proc-macro-hack-0.5.20+deprecated
-proc-macro2-1.0.54
-proc-status-0.1.1
-qoi-0.4.1
-quick-xml-0.22.0
-quick-xml-0.28.1
-quote-1.0.26
-rand-0.8.5
-rand_chacha-0.3.1
-rand_core-0.6.4
-rayon-1.7.0
-rayon-core-1.11.0
-rctree-0.5.0
-redox_syscall-0.2.16
-redox_syscall-0.3.5
-redox_users-0.4.3
-regex-1.7.3
-regex-automata-0.1.10
-regex-syntax-0.6.29
-resvg-0.28.0
-rgb-0.8.36
-roxmltree-0.15.1
-roxmltree-0.18.0
-rusqlite-0.24.2
-rustix-0.37.5
-rustybuzz-0.6.0
-ryu-1.0.13
-safemem-0.3.3
-same-file-1.0.6
-scopeguard-1.1.0
-scratch-1.0.5
-secular-1.0.1
-serde-1.0.159
-serde_derive-1.0.159
-serde_json-1.0.95
-signal-hook-0.3.15
-signal-hook-mio-0.2.3
-signal-hook-registry-1.4.1
-simd-adler32-0.3.5
-simplecss-0.2.1
-siphasher-0.3.10
-smallvec-1.10.0
-snafu-0.7.4
-snafu-derive-0.7.4
-spin-0.9.7
-splitty-1.0.1
-str-buf-1.0.6
-strict-0.1.4
-strict-num-0.1.0
-strsim-0.10.0
-svg-0.8.2
-svg-0.10.0
-svgfilters-0.4.0
-svgtypes-0.8.2
-syn-1.0.109
-syn-2.0.11
-syntect-no-panic-4.6.1
-tempfile-3.5.0
-termcolor-1.2.0
-termimad-0.20.6
-termimad-0.22.0
-terminal-clipboard-0.4.0
-terminal-light-1.1.1
-termux-clipboard-0.1.0
-textwrap-0.16.0
-thiserror-1.0.40
-thiserror-impl-1.0.40
-tiff-0.8.1
-time-0.1.45
-time-0.3.20
-time-core-0.1.0
-time-macros-0.2.8
-tiny-skia-0.8.3
-tiny-skia-path-0.8.3
-tinyvec-1.6.0
-tinyvec_macros-0.1.1
-toml-0.5.11
-ttf-parser-0.17.1
-umask-2.1.0
-unicode-bidi-0.3.13
-unicode-bidi-mirroring-0.1.0
-unicode-ccc-0.1.2
-unicode-general-category-0.6.0
-unicode-ident-1.0.8
-unicode-normalization-0.1.22
-unicode-script-0.5.5
-unicode-vo-0.1.0
-unicode-width-0.1.10
-url-2.3.1
-users-0.11.0
-usvg-0.28.0
-usvg-text-layout-0.28.0
-vcpkg-0.2.15
-version_check-0.9.4
-walkdir-2.3.3
-wasi-0.10.0+wasi-snapshot-preview1
-wasi-0.11.0+wasi-snapshot-preview1
-wasm-bindgen-0.2.84
-wasm-bindgen-backend-0.2.84
-wasm-bindgen-macro-0.2.84
-wasm-bindgen-macro-support-0.2.84
-wasm-bindgen-shared-0.2.84
-weezl-0.1.7
-which-4.4.0
-winapi-0.3.9
-winapi-i686-pc-windows-gnu-0.4.0
-winapi-util-0.1.5
-winapi-x86_64-pc-windows-gnu-0.4.0
-windows-0.47.0
-windows-sys-0.45.0
-windows-targets-0.42.2
-windows-targets-0.47.0
-windows_aarch64_gnullvm-0.42.2
-windows_aarch64_gnullvm-0.47.0
-windows_aarch64_msvc-0.42.2
-windows_aarch64_msvc-0.47.0
-windows_i686_gnu-0.42.2
-windows_i686_gnu-0.47.0
-windows_i686_msvc-0.42.2
-windows_i686_msvc-0.47.0
-windows_x86_64_gnu-0.42.2
-windows_x86_64_gnu-0.47.0
-windows_x86_64_gnullvm-0.42.2
-windows_x86_64_gnullvm-0.47.0
-windows_x86_64_msvc-0.42.2
-windows_x86_64_msvc-0.47.0
-x11-clipboard-0.5.3
-xcb-0.10.1
-xmlparser-0.13.5
-xterm-query-0.1.0
-xterm-query-0.2.0
-yaml-rust-0.4.5
-zune-inflate-0.2.53
-"
-
-inherit bash-completion-r1 cargo
-
-DESCRIPTION="A new way to see and navigate directory trees"
-HOMEPAGE="https://dystroy.org/broot/ https://github.com/Canop/broot"
-SRC_URI="https://github.com/Canop/broot/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	$(cargo_crate_uris)"
-
-LICENSE="Apache-2.0 BSD-2 BSD LGPL-3+ MIT ZLIB"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="X"
-
-RDEPEND="
-	dev-libs/libgit2:=
-	sys-libs/zlib
-	X? ( x11-libs/libxcb:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND=">=virtual/rust-1.65"
-
-QA_FLAGS_IGNORED="usr/bin/${PN}"
-
-src_configure() {
-	export RUSTFLAGS="-Cstrip=none ${RUSTFLAGS}" #835400
-	local myfeatures=( $(usev X clipboard) )
-
-	cargo_src_configure --no-default-features
-}
-
-src_prepare() {
-	default
-
-	local mandate=$(date -r man/page +'%Y/%m/%d' || die)
-	sed -e "s|#version|${PV}|" \
-		-e "s|#date|${mandate}|" \
-		man/page > "${T}"/${PN}.1 || die
-}
-
-src_install() {
-	cargo_src_install
-
-	doman "${T}"/${PN}.1
-
-	local build_dir=( target/$(usex debug{,} release)/build/${PN}-*/out )
-	cd ${build_dir[0]} || die
-
-	newbashcomp ${PN}.bash ${PN}
-	newbashcomp br.bash br
-
-	insinto /usr/share/zsh/site-functions
-	doins _${PN}
-	doins _br
-
-	insinto /usr/share/fish/vendor_completions.d
-	doins ${PN}.fish
-	doins br.fish
-}
--- a/app-misc/broot/broot-1.21.3.ebuild
+++ b/app-misc/broot/broot-1.21.3.ebuild
@ -321,7 +321,7 @@ SRC_URI="https://github.com/Canop/broot/archive/v${PV}.tar.gz -> ${P}.tar.gz

 LICENSE="Apache-2.0 BSD-2 BSD LGPL-3+ MIT ZLIB"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="X"

 RDEPEND="
--- a/app-misc/qtxdg-tools/Manifest
+++ b/app-misc/qtxdg-tools/Manifest
@ -1,7 +1,3 @@
-DIST qtxdg-tools-3.10.0.tar.xz 16704 BLAKE2B a43ebdaca879cbfc6f1b6cebcea4964c5486bd983b030a4b374605efeef9a9ad67e3176c95e33ad09c90df5e9432526dbf62ecfbb192df768509e213f57e383f SHA512 d5cdc14ceadf6b2ed7adaa7de383b9930d57d06a6c5294920764b403bcedfdb837de4a01e70f65f2957e18a9e866659406b88e35903376fb26b91f8620b95a55
 DIST qtxdg-tools-3.11.0.tar.xz 16716 BLAKE2B ef6b88e69b0b4e8896ba37f7b5f663234a5348759d430600396432f4abb52901001c54ec78bd706efa021b51d9ff514457ff8e123d5142a6562cd380dd5a15ee SHA512 da88f36130b7c23d1553bce252ddc783ae30ba91cd55fba065702376f6cc9c0353c0ad4bb099ed1b65964bd9d476ae431bfde46df110bccec832d3f57cbaa7f3
-DIST qtxdg-tools-3.9.1.tar.xz 16688 BLAKE2B c59032f55749616554036cded80050b3390f02741d6874d4e48ca943d0b37864d3565cc1bb0e39474cfbcc38b6b525e73c22a9e9d6277a319dd44a93935af982 SHA512 f5bea93ad927967edf13c07ee39a24297fbe06d03e450557afd519b26c3eeed6c9347747efbdc2e0c201a4d51f66cd80a5f2da143544149375d89f36baab5c3f
-EBUILD qtxdg-tools-3.10.0.ebuild 595 BLAKE2B f5c79bb4d5f4a47fef227fad87ca83d4ba64ea3b3346b0634d42e40fe3f5a739d73c57d555b15acf380699ab58789a6a812a1faff21954851bfcac77f9059bdb SHA512 bde5b9a28287a8af22849bd1aba91671bf88e529a3f63dded2387ebf20c7c860fcdffda5b99ea1b92e8eee31131c23f539181344062905d864de28dfd19247a3
 EBUILD qtxdg-tools-3.11.0.ebuild 600 BLAKE2B 8a66a2f000e598909459f5756926bd4d113fb2849c6498607e9576d2af102639d1c45d526090c9612bbc3730d8424f6c32f0cd15cf86c49a4ff23a081a1f17f7 SHA512 de016014c38a326121630d1ac16db6a0a0cc2792cb3d353218a3ccd8caa88bf04ee505f89c0cdc20c0ea73678c3b0d320d1e0d9d7d79c6d9366dd60f9cd74bef
-EBUILD qtxdg-tools-3.9.1.ebuild 594 BLAKE2B 10f2710ed78ad67642c62d4b6815ea89b804566f9157261fcdde49723449badd8d254cccedba2614aec56698c1ceaaaa2f23b49fb8cd5e4652c6edc5363d61a3 SHA512 b42baa96e996e239b0c6e36adbfe32452b6d0293dd39c537806e1d03c616610e8f139ceda7f5a24dd0ae20bb6599c741e4aaf89e7a091cf90ba729dc8c8a31fc
 MISC metadata.xml 318 BLAKE2B 0cfa3589deb6a2af8f05101ae300035d66d7bd7d0523f3196e005c82c1e0bea15d09feb3b44a2c1db94efccf15f13552e05cf1d38c6fbd7b359f75bea573adbf SHA512 321b105744b1138f2d444235800fa9680c11a92e4e22efccd994c9d103365e2ae449f39ac64f213dce2e895e9b8bcd94c311d1e90a4c00e1f4071a0cd8a68c54
--- a/app-misc/qtxdg-tools/qtxdg-tools-3.10.0.ebuild
+++ b/app-misc/qtxdg-tools/qtxdg-tools-3.10.0.ebuild
@ -1,27 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="User Tools from libqtxdg"
-HOMEPAGE="https://lxqt-project.org/"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
-else
-	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-
-BDEPEND=">=dev-util/lxqt-build-tools-0.12.0"
-RDEPEND="
-	>=dev-libs/libqtxdg-3.10.0
-	>=dev-qt/qtcore-5.15:5
-"
-DEPEND="${RDEPEND}"
--- a/app-misc/qtxdg-tools/qtxdg-tools-3.9.1.ebuild
+++ b/app-misc/qtxdg-tools/qtxdg-tools-3.9.1.ebuild
@ -1,27 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="User Tools from libqtxdg"
-HOMEPAGE="https://lxqt-project.org/"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
-else
-	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-
-BDEPEND=">=dev-util/lxqt-build-tools-0.11.0"
-RDEPEND="
-	>=dev-libs/libqtxdg-3.9.1
-	>=dev-qt/qtcore-5.15:5
-"
-DEPEND="${RDEPEND}"
--- a/app-misc/tracker-miners/Manifest
+++ b/app-misc/tracker-miners/Manifest
@ -1,5 +1,5 @@
 DIST tracker-miners-3.5.1.tar.xz 7513276 BLAKE2B e5edccbbf53a837a60afbdbcaa115dab034e2bec98a81fcabc6bd41009d5da7142683205fa97c1a2e1b306769ce46e95c6f3ee7e1a3e0de4274d2953e4964946 SHA512 cb09454536c5e4d0af20008fee8c82e78a14831fa21c2187a87e68eee52ef05d56a06d98166b20a466c0bdf7b65938725d0636ed5d7e10e936896d799afba2eb
 DIST tracker-miners-3.5.2.tar.xz 7513024 BLAKE2B 6f144bb5e263c08c32b940dd18f98faa4201cfa1c40fa9c97b7e0406b6ed1c9547b1925337e0b3a7e5448dd7c2518b78f62e04e5beab221a55f464506baa151b SHA512 adb29549c94c68a46e2c5ede8a51bac2d014f772a5dc1c63f5cc6950da7f941e735bf5858c3306d2ad988ce2f60126bc97e5db746afe757b9b7cbc4f90518648
 EBUILD tracker-miners-3.5.1.ebuild 4693 BLAKE2B 6a2b762d48023e0daf42567d17f0dcb20b12a0705f6e7f479905b0816b5996451639e5dac1621f2de87fe3a01d4291dbf5fff96839f7625ddb06d569666d6615 SHA512 0b58fc80e33e7c85ff475ea181df76ae130f778933a89b3d2d37eb3a610a6d98a411a0cfe3e88eb9460552072fe5e84b823f383f488fe9effe38990bc0afb16e
-EBUILD tracker-miners-3.5.2.ebuild 4696 BLAKE2B 8f42911bd0e407c02b8a280461f685a8d2a9512479453558994fea95fc826761b6bd9f737924a8548470686b68f7428a9042913471350c68df15957874d282b8 SHA512 a927d55a89eff531b0c9e3988c9b0cf83edfe72c633f892f68e22f052e0846c331c0dfcee1a09072d4fe247c0b507b443b9a0a28f1782212dec774f38fae6785
+EBUILD tracker-miners-3.5.2.ebuild 4693 BLAKE2B 6a2b762d48023e0daf42567d17f0dcb20b12a0705f6e7f479905b0816b5996451639e5dac1621f2de87fe3a01d4291dbf5fff96839f7625ddb06d569666d6615 SHA512 0b58fc80e33e7c85ff475ea181df76ae130f778933a89b3d2d37eb3a610a6d98a411a0cfe3e88eb9460552072fe5e84b823f383f488fe9effe38990bc0afb16e
 MISC metadata.xml 835 BLAKE2B a7f0c667be6eaaebcd62fd782c72831f8f95f778d2ff1ee36c278fc3a902761ca10d73fd7e6b15afa83d36a960d5f20dc765b62dc6f85022db01d9d0d356bcbd SHA512 9d348dbec07ab8e344dab0d6f3acdc48e91d80171e411353b233f8b49989f4152817c8ed522c234d5dd9a3849cdab3d46f41256702a5d50bbf1e591f112cddd5
--- a/app-misc/tracker-miners/tracker-miners-3.5.2.ebuild
+++ b/app-misc/tracker-miners/tracker-miners-3.5.2.ebuild
@ -16,7 +16,7 @@ IUSE="cue exif ffmpeg gif gsf +gstreamer iptc +iso +jpeg networkmanager +pdf +pl
 REQUIRED_USE="cue? ( gstreamer )" # cue is currently only supported via gstreamer, not ffmpeg
 RESTRICT="!test? ( test )"

-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"

 # tracker-2.1.7 currently always depends on ICU (theoretically could be libunistring instead); so choose ICU over enca always here for the time being (ICU is preferred)
 RDEPEND="
--- a/app-misc/tracker/Manifest
+++ b/app-misc/tracker/Manifest
@ -3,6 +3,6 @@ DIST tracker-3.5.1.tar.xz 2566076 BLAKE2B 5abb45c7cc5f9b7dca0fda90388c110448a3e2
 DIST tracker-3.5.2.tar.xz 2566540 BLAKE2B 53b8e26bf3f11c202b03a181b8817e931130b77648410ddf59e4d454bc60a209648779c5e1cbe1203b2529ebfe3fa9c5f39c6f862264e7807776c466cba26012 SHA512 e7162116c1089f4e1a06c6bf60e515b9dd9ce174a3ab8862d52c638004a1df7feb1d69c7b958051bdcff60202eaa58c29023e9a0012c0511d75d26e76a27cd10
 DIST tracker-3.5.3.tar.xz 2569412 BLAKE2B 8e35234f74eb4ae22c23661fedf6b3898e6daa41868d18473a9cbf998a7edbff893e63f15573585c130b8b7c40c65a4f5df8e057fd14dfe76dcfe2a9abed4cdb SHA512 ed75f7cbb75daab6597bab58937554b531bc2c32581148c2d828cb313644b198a057024c5202d0990237bc01119d1789f0fbc87868919fc2f00bcb40e76f7b23
 EBUILD tracker-3.5.1.ebuild 2462 BLAKE2B 0dfa199cd395c7d92c3665c3b5ffa888298bb44d2992d00ac7e8cb007d46aaafdfe07d050c0a45cb01c1070827829a7d3a187b98e48888097bb1dbc6ae10c63a SHA512 c3b63de9f4071b035a9be78d6ede1822324d1c181150b9c40fc415b6760a720017b097c550154d8f46f4c4728404513cd9252271365819a0a34c8a96c016ac18
-EBUILD tracker-3.5.2.ebuild 2541 BLAKE2B 179a40579740f795fa180d2b8ddc1716d90adccf2f2198a564a0bd4db37db2bcdc8e14764ae2fdc2d727ff1080f34628d84517d42174e4038a9a45c86024df7e SHA512 a87701d0eef8caba0267b40be8aa08cf0515adade22aef4d81512fcc25a2d863513683d7a5aed75e28cdacaa3b3c131edb7058fb820954f720d2c14479933fd7
+EBUILD tracker-3.5.2.ebuild 2540 BLAKE2B 0d5c8ebfb5c6f9eaddd09a2baa2d24a5445898db989e5fdb1db2e74f0f3798e794f08482d67f0409e094f3254b5b9851117182a389df8aabf4b9231282eabdd1 SHA512 6be0d239f720fff00d11b8507863da1191232d08e146da94e900ae4ea8a538c17db62018d2cfbdade556ceba57bcaa628c4a3af67e6f09da7685afc32f310492
 EBUILD tracker-3.5.3.ebuild 2465 BLAKE2B 0964aa9c58c5788897d76f7fcc6dd69aa1d9bcdcf14e47cff27373dc1ee66310fd7c69ba4a781400374adc2c5f1dddc9943bb3681174f73320c4d6d62d35da09 SHA512 bdbb921cb76db51066cab441ab361ec0bee01b6ae605a32304b1a525e99ae8bef56d0b0eedccd53c1d72f6813a3fe91849a3772e0f662c0709787cb4774b07c1
 MISC metadata.xml 586 BLAKE2B 8244e6f8d9491a0c224ed84f17ee6ad64b22e0c373243a319e7911739a7db6223ce47693ed5b31053b4465f35d20108db1469d74afcebb36b4516a53cbd7f98a SHA512 0a60b0e4b077bb03d02b7990511041695c5dff7a8a0972fa80abe9968b643ad5c2ba65182c079e8d5f3d1ef72a2c4dcc659d6ec283bf80813135c94cab2dddef
--- a/app-misc/tracker/tracker-3.5.2.ebuild
+++ b/app-misc/tracker/tracker-3.5.2.ebuild
@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Tracker https://gitlab.gnome.org/GNOME

 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="3/0" # libtracker-sparql-3.0 soname version
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE="gtk-doc +miners stemmer test vala"
 RESTRICT="!test? ( test )"

--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
--- a/app-portage/pycargoebuild/Manifest
+++ b/app-portage/pycargoebuild/Manifest
@ -1,3 +1,5 @@
 DIST pycargoebuild-0.6.3.gh.tar.gz 23545 BLAKE2B f5c13947d1b03a4ef1c48eca82fe3c1104f9407d06abd035c3997ee57dcb92d5066f1c976a176058d7ead4332930789d93b38dbe52faf4c42ca7b4b7e6603098 SHA512 96c2c3e2a4715b922b28c8af4fe5031be6fd224780d06ee9c38f1611c384804b0d870b7680b3e88911cf34e64bd38354ccabfcf8d5c693a83f1d8b45924dceff
+DIST pycargoebuild-0.7.gh.tar.gz 23613 BLAKE2B f05d149a40efea5dd25f3738c71dcbba7736349385a2e77ab728c7c43dd3ba7a28819ad40ec9098592705be54b2d1f3e4f69cf5b439a260794f6a1a1b46fc857 SHA512 a8204d0023e10342b6de6af33bc3cf0871ef8622fb8ce4f614a4c938909299cb3cf710aa0626b8a5bbc74fd372636a914018efebcef92d54c0cd03d3fa19f942
 EBUILD pycargoebuild-0.6.3.ebuild 687 BLAKE2B 75322f703a620caa7042ec37ade82361eeb285f467f7004d94c062698dd0e839146b2f4691c185e387a34bbf3890255fe4dbc879e1947e0e96d56f66035b4420 SHA512 c97a6327275593cf71521db093da049bc84cb73e33e5bd3f29b3d49319b856bc3215349e0a571656da1eb3471e738cd70145f96bd8fe32f8cba3bdec449f7100
+EBUILD pycargoebuild-0.7.ebuild 685 BLAKE2B fc13af8abe5b290a55bd5701eaebba65f8917ca953b3982a689e156fefecc9a4d911285bc28fdf0250cec57323fd90c193860b420310813206c9bc948c3e9e73 SHA512 6e8585b309673a193c771bb38ed9fafe0638882ab0b302062a97269ed20543a4b2dce0c90e8b8bb1d01dc28f7677d3b65763d4251eb9be86e602c008068bb056
 MISC metadata.xml 384 BLAKE2B a5c91cf81989cb7f2ff504cd9931e89cb85a2b17721818efbc436d13e68d673c4f384839c67eeec8fe24c1a78b112c3fe37ee1722d2d28f44c5a075ec8fe18ba SHA512 76ffa916e9630225aadb9a0d2073087fcb848b782f6e44c28c354533c5329ed337e609666ee7eba90ef1191be2a34e968d3bc06556cfafce32a43a22100cc6f0
--- a/app-portage/pycargoebuild/pycargoebuild-0.7.ebuild
+++ b/app-portage/pycargoebuild/pycargoebuild-0.7.ebuild
@ -0,0 +1,32 @@
+# Copyright 2022-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} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A generator for Rust/Cargo ebuilds written in Python"
+HOMEPAGE="
+	https://github.com/projg2/pycargoebuild/
+	https://pypi.org/project/pycargoebuild/
+"
+SRC_URI="
+	https://github.com/projg2/pycargoebuild/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
+
+RDEPEND="
+	dev-python/license-expression[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/tomli[${PYTHON_USEDEP}]
+	' 3.9 3.10)
+"
+
+distutils_enable_tests pytest
--- a/Show more
+++ b/Show more