Sync with portage [Sun Apr 21 21:50:02 MSK 2024].

2024-04-21 21:50:02 +03:00 · 2024-04-21 21:50:02 +03:00 · 520108ba08
commit 520108ba08
parent 5e17996a50
5753 changed files with 22845 additions and 27284 deletions
--- a/30
+++ b/30
@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512

-MANIFEST Manifest.files.gz 29748 BLAKE2B dbb55ac9fe456d0019d0d697a57288171087e5d99dc7b0a0df1070352cab1d2d35366c219c2809bff7ade0bf4c730b9e236079c42718b159519d7587337b5085 SHA512 b6427ac49aac3d6a92ee56b72f474a16ab5b69f12aaab3590148499859788148f459f96facb9eb49c50f63c7d858898c66d2af6c3789e475f41e04181cf6ad41
-TIMESTAMP 2024-04-19T15:10:23Z
+MANIFEST Manifest.files.gz 29781 BLAKE2B 6d071218437614a91655a588697aa7ebf514cbcd90b4487ca27e648745fe7733c98e0048bd1d693c48710056a66090ceaecc4d8a2749fce62b88958cf9b35333 SHA512 586228dafb817ae4383d14510f311af06430deeca9034c214cf591a242ba242a67fac0a72a0611518b4f35419aa4bcf6cffd2d689ca7c9105e3e2f523fa66880
+TIMESTAMP 2024-04-21T18:10:34Z
 -----BEGIN PGP SIGNATURE-----

-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmYiiV9fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmYlVppfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDygxAAgiSnaqw6V+Ob0MSwPVsWhdv2DzsS4JTMzJGubNfLw71jzZppk2ncb/2F
-g4WI0GE0h8s6YdyFi2taM7cX6SgdU1CowKJna7SY59QbUeIq1BPlT8ZDXGi5yvwT
-oBh2ujKqXkMsu4q1hTD4ribcpEZOAbAZrou4DDbufWzQcphqVrUYJvCZsJrLirnl
-YweE8Eq9vPKZ+OkXdxqWft24HMZf/Y70bve4/Kcdne/v9wVAMbka46dgWrQSKX8v
-gXKbLirl5uSigisY81u0ec0lm36LF9Wn0AouQScWaVmQ3joB/Y/A6e54FR2nJ2vI
-VHRKsL/63CdegccGUFEOe6tmhVXC9bw7AK1fQnmxPwv+PDz3msnPwtWLjk2vh2j2
-CrMMoW0fPbnYNXRVPOBlV87WeqyCIIPJ6Ku2li74a4vYT6YL/gW8iyv9tXQDwkfW
-feERZHbP9LY7QjpwXfc5c3LDy+bRVSOPalM9alcFkLIaPmiOVT9ZwWrLc6ElCRJD
-Jd/DNERZCdUTyU55tAOyFJo/ssARN8P+sDnSBxTHq/sWmN1RvyDH1vl4vRn7i6tn
-LyA6f3zcOjgp+l7jNJS8tMJpZX5ncHBnWIm869/PUcHtEDTihpRj2oBCIDxhv6Jb
-beuJD4ioBrvnvE6Jx/TcaT3FpK7KhVNP5W+Hobh6CjkP2wIsBso=
-=5B+x
+klBeYA/8Dx5faim3WCtOcQOYavgCuf5tXdhn/4fl95k4RLyOT4OcH9gUELHAA8CH
+fB4DETmbmLIDszwOXgq085IJ1HSGA/2Tv4sW9GTjS7dVderoA1jBEAbhpbapa42b
+HecOFGFMnpPDXs7rpjh8T5zYy6db5Ve9JhOBvQaLiIG7OxVdrrQ6Y/AOsnoPr+7y
+yNBraS6Xqx6mxtnFKUaCieFCVTT/r+O5ONg/hya1MWHl0iSoJ5x8RCfijksKV2rF
+BZ5uRcyft7+fI5y+l4wZhJnO4H59uw+M6rv6C9j/+IkOy+EPciElusVKp/QrYiiN
+3IK2xl7bUVdu03D8hrSGqEnROMsESP+wqDYPC0Rvbc991h2G002kfwVxBSiPDRUE
+yhf4kcbBLP2fKl2GZSOZIGBStBYnIAc5kEbNiFxVc7UXLBaqvVjzurKV2C+u4+WO
+iP2V4JABgPChddrUBHTgZdbkf/pqYMN7DCLmWCDV1wz+qHfwZu2wONS6zunxqbua
+uQ2yvNc0iFQHTPrFoPY/lBOJKGYba+om7FFnLEjVQFN/VQhK54Xl0QoqN43FB0zd
+fmJ/T1vbcLCOslWVKpMiKG55uAOmas+OPHvQbmkCvK7V27zsgCkXoVa1lv7ajcRb
+NhQhF22PVX1vekrEuxDEM7Gntuaejv9Hr24tjX7MCoea2Ju/mew=
+=g4s9
 -----END PGP SIGNATURE-----
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
--- a/app-admin/ansible-core/Manifest
+++ b/app-admin/ansible-core/Manifest
@ -4,10 +4,12 @@ DIST ansible-core-2.15.8.tar.gz 3160606 BLAKE2B 439a3f584940e5ab46b43b0b47395e06
 DIST ansible-core-2.16.2.tar.gz 3163899 BLAKE2B 6365dd573ae4a2f3ebfc870ae3ea399b268615333de2ddf7e21323189dfdd9bf61ae836b536c86d713f4a934468ed36835084e06e4b6d9b32c4b633f55353ad9 SHA512 6e2389fc6b34645c0f1566eca960da36616619a5ed5e35b46f3d659979fe519db20d89b4f598344a389f4b6ac33bb660ea91a1a6509002bbf4ac791ea3cb4cbd
 DIST ansible-core-2.16.4.tar.gz 3170397 BLAKE2B 8226641621ce4b2a8cd564f831cd21e36345b2db6680f8d9f3d3388a05ff66df74f4d286300dbb1b73601a0bf4a781d266e62e9fd0c894a79f89d545930c854a SHA512 d05737eec9a6a0e71891821acd4540576b3a993f59d88c12c2da8e7f075bc11c712e0eba850b3f7a2643e3c970f51938267fed6fa7f99f2c4c205b64f9b13259
 DIST ansible-core-2.16.5.tar.gz 3171617 BLAKE2B cb620cf9fc9fd509edb62bf75ab19b5ffe80f4d8520be76bbeb030c74953945295e0f4f30102f51d20247d2ce4a18b15e488e47b4346319f5442979593402821 SHA512 dbe5d68fbc3a0ef611791d6995297bca5bba6aed1f4871964136ea81810458646bc78c2146739f887de3c2e3017cf4e6d4d09652e41c2ca046c4bc88eca6c5d8
+DIST ansible_core-2.16.6.tar.gz 3176041 BLAKE2B 37aa15e8d9165eb89db0704f7670f78f3e3a50915e17bb1d56689e65e6cfc0bb15b7e01768d25c5d2a9a00802411a6eefdb9ad70aa38877d7115bc40faafea59 SHA512 cd9cc8783e13b073cbfaef889e20c8a7dfb732c91de4bae2b496a64ef47b0325c637b4ab2eadbd0c56cb004e95f5294aa1e1548675a90f06193d62defd553409
 EBUILD ansible-core-2.14.13-r1.ebuild 1350 BLAKE2B ce7e45f5a2c34e03bac3caa1b0496b3980b0861ecc3168c3c8d16d4c08370e2e5689c6c1a2d70b06cc47584b081b62291d7aaac42f5c4e5b9a2048fe4906061c SHA512 299eba1b7560ff846787004890998f068468d5497e4873afa6c3ad183e41df275c72f20d2a3c25d5438cd1ddd73e18dc73b94a617bad276e929ae41897422946
 EBUILD ansible-core-2.15.8-r1.ebuild 1305 BLAKE2B 8af6dc3e871bc702780081015d9bf13ebc4cb71ee245699d4500fbd198c7f902ac992854984d0f089d7229c67dac9a38bed5868f31384dff3a69c1ab86878ccb SHA512 075ab031f9097f31a4954a7b5f849540e59424c6b574ad8e00be29773853a58c24fd27992273c56ffa00534d224e8b8d2bde5cffd20831aca02cf27015c9f4b7
 EBUILD ansible-core-2.16.2-r1.ebuild 1305 BLAKE2B 8af6dc3e871bc702780081015d9bf13ebc4cb71ee245699d4500fbd198c7f902ac992854984d0f089d7229c67dac9a38bed5868f31384dff3a69c1ab86878ccb SHA512 075ab031f9097f31a4954a7b5f849540e59424c6b574ad8e00be29773853a58c24fd27992273c56ffa00534d224e8b8d2bde5cffd20831aca02cf27015c9f4b7
 EBUILD ansible-core-2.16.4-r1.ebuild 1305 BLAKE2B 2f5925e002265e39b89675e79d72fd68ee2f31163953142e3ee757779fa8ac0ae50f6423037d1d6151d3c52f7b886fcf68ed06356bc91cb4ca250a558d3e4d04 SHA512 b29a437edc4bdb7c90905e79bda632ca8c9def30828bee8e209c293384e9bdf8720a1e37403380a7df70737004bb700e0eeb0d8a0455722e63e7bdb4139c04a2
 EBUILD ansible-core-2.16.5.ebuild 1308 BLAKE2B a743d1539164abff26f1abe24a5659bb0018007a2aded8b965b3cc16447d9c5f62366e2a922f1e6e5dd4a2eeb1c163d4e368833f19c08feffc655fb33ea25afc SHA512 93c817bee718c2b5721da7aedbffe2d92e32b5437eb0eb3da90c6ae11c786895bcc9dd6f0aa1db0b0452b1173cae40b9ea662907e1529eaeb787b0d1af0ed958
+EBUILD ansible-core-2.16.6.ebuild 1288 BLAKE2B b43c1c447ce3cc8b745a362c32c81d6f4c47ced56863a8febe6bbde92e437f6347d9323c00362425ea0265ee33bea39185bb1c912ff2e4ca168047e111a5b5d5 SHA512 a32a4374fdfaa7ecf77b89be55a6ddc490fa7c9431d11a7994abeb6750d07f82093961c481cc8443b1f8707704f9603afe16d83390c895099b8052765c8f6165
 EBUILD ansible-core-9999.ebuild 1308 BLAKE2B a743d1539164abff26f1abe24a5659bb0018007a2aded8b965b3cc16447d9c5f62366e2a922f1e6e5dd4a2eeb1c163d4e368833f19c08feffc655fb33ea25afc SHA512 93c817bee718c2b5721da7aedbffe2d92e32b5437eb0eb3da90c6ae11c786895bcc9dd6f0aa1db0b0452b1173cae40b9ea662907e1529eaeb787b0d1af0ed958
 MISC metadata.xml 924 BLAKE2B 7dcd1be7a7eea2a5a762ec295d2d285242f9350d377abb1d633c6eb7cdd1eb8f59b02a6908924f424c0b5f42b2f6b3a153523439cc10caef51656c9f75bcd87c SHA512 a6fbf2ee3743ad9d54864c8d22b75cd506f17e1abd6963b3499de55675fed711abf4df6b9fe2589d8ea0b2f93311d06cfbcca7b99469107d708d2bee5cea0694
--- a/app-admin/ansible-core/ansible-core-2.16.6.ebuild
+++ b/app-admin/ansible-core/ansible-core-2.16.6.ebuild
@ -0,0 +1,53 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+DISTUTILS_USE_PEP517=setuptools
+
+inherit distutils-r1
+
+DESCRIPTION="Model-driven deployment, config management, and command execution framework"
+HOMEPAGE="https://www.ansible.com/"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ansible/ansible.git"
+	EGIT_BRANCH="devel"
+else
+	inherit pypi
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+RESTRICT="test"
+
+RDEPEND="
+	dev-python/paramiko[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/httplib2[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/netaddr[${PYTHON_USEDEP}]
+	dev-python/pexpect[${PYTHON_USEDEP}]
+	>=dev-python/resolvelib-0.5.3[${PYTHON_USEDEP}]
+	<dev-python/resolvelib-1.1.0[${PYTHON_USEDEP}]
+	net-misc/sshpass
+	virtual/ssh
+"
+BDEPEND="
+	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
+	test? (
+		dev-python/botocore[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+python_compile() {
+	export ANSIBLE_SKIP_CONFLICT_CHECK=1
+	distutils-r1_python_compile
+}
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@ -2,8 +2,10 @@ DIST ansible-7.7.0.tar.gz 40709642 BLAKE2B ee2f8d124f79ca3a3f131bfbc4f93e10d104a
 DIST ansible-8.7.0.tar.gz 49317896 BLAKE2B d5923753e368e908a569c5f8f261b1afe7c51d5381db190bf7de1e81f0a6359136581852faa2974f174e816944c66e2c0f625d3d62bdde324758309982c90de9 SHA512 6a67f8553c3fa56559e4a31ec627cfe2c5f42e147d94bea305ec4580af9ba8add136092b209a5a3d7f9022407e9d557484f044d23cb227973fe4e4341fed7983
 DIST ansible-9.1.0.tar.gz 48839908 BLAKE2B caa652b339fb93334bff7246d1bab6bbdd9672a096637aa0695cd94a7f50d0e5ca7a1bfeb559792833c97eb9d16486965776b609354dc05ca63b1474d43e767b SHA512 ec6d86b3d05e66053001720b6b7d7bd1dba8bd50917c913e1f08a63b0c94f76a5d69732c78e793d038622a0b8c652860290a89cee1dfb22491a81763923ef843
 DIST ansible-9.3.0.tar.gz 38240168 BLAKE2B 0cd243a21b12163fcb37f014a69f6041f9c48dae84d1aeea342713daf8150246efa14ac94f43890e449896d111f1839ebe2dba7d9c48c2359fb01e4aadfd270b SHA512 71eff05455aee0a013b69790145a73325ac7037fc509545a7cdca358aa54c1731f7dc6fb0169f602d668e9da9e41a0879ff48ba1243d372e02dae9382ac46c5c
+DIST ansible-9.4.0.tar.gz 38389836 BLAKE2B a2e08088565e6f248c1185ee96ac2365fc1385993d3f3fe68f941e8acb0e567c3defeec3ea376a30213921f02881bce0a0ac737323fc3ec82dc77d2d4a550dbd SHA512 4c75235a866f3f95cda8dd3b6c9d22b916ad117d54a86a30585f71c9015cd98db764afa225af5b2f6fa884af558ee488785e26c9e8b9e8be105062f069f065b2
 EBUILD ansible-7.7.0.ebuild 655 BLAKE2B 737b7e75834d55ee6bbbdc00797896cfed122cfba478bf076156befa70e873899a3b4313408030aaa3214175e7a45bf3c86c21b4e84c2de5940c42cb5e68780d SHA512 4765ba667b64e4eb5659423a8ccc1eb8e52bd6c0f4e287b4aa4f79877d11ef88b95bca3518413f93cea3b785c27f739754af64781f783fa7e46cb2d44c1d7b57
 EBUILD ansible-8.7.0.ebuild 655 BLAKE2B 74f7871faa2bfe26fa6e09ce2b5ac89121c3b608e08e0a9ec9bf5987a8460ca1102a1cf24293a5f58307d94fca6bed53670754183d4fb2ac09a2ab7541345e2a SHA512 4e1b54c8e83abd8ce1540e48c77ec6798fe0297c9e23f040551d7f5e5d17b9092fc22a0c8970e270198f1054558295c77467d95bc8844ee8e5a61f9eff8331fc
 EBUILD ansible-9.1.0.ebuild 688 BLAKE2B d7f4636e1d0ed7c0bea59ec9f9ab12524ba25e4efce66cf7aac18b845efa6be67d5936f0fb584274e9fb187d5641a0783d3dd7ccaf5ac7c39b8a27649b6dc3f9 SHA512 3975860add587c3d5512396f9b0586ffa9faaba010b685dc96694f3df1ee8176555dc6f844c41ca18a48138679a60e8d0063fa0c9eefc70005b1610b5788d8e1
 EBUILD ansible-9.3.0.ebuild 688 BLAKE2B d8bb8932a776dc3592f7b2d89c99a51e0cf3e1d299f15bda17a23140b77024c18cf5a379fbeb7e1ae2e481136d23a568a7582d6f50080baa4fe3b0d6c507e3c2 SHA512 8c6275fdfbe43c6ec137b5f9945616621950a3e191b05068ab1af9fc7ede679c0e49bdfbfc1a0da23e92b7f2c0d7ace0d06896a9491a44fb2eac8687179206c8
+EBUILD ansible-9.4.0.ebuild 688 BLAKE2B d8bb8932a776dc3592f7b2d89c99a51e0cf3e1d299f15bda17a23140b77024c18cf5a379fbeb7e1ae2e481136d23a568a7582d6f50080baa4fe3b0d6c507e3c2 SHA512 8c6275fdfbe43c6ec137b5f9945616621950a3e191b05068ab1af9fc7ede679c0e49bdfbfc1a0da23e92b7f2c0d7ace0d06896a9491a44fb2eac8687179206c8
 MISC metadata.xml 613 BLAKE2B 3460862f86354a10a4352fa85301b3eda6b04620abfdf7af7db3726ef8417147f630e9cf79205805c520499858fab7b2b1fb0099853a2b4f032ee57daeb32eff SHA512 ff4660cea07990a950bbd170df1d52d0e8150551e231baa4926e8e45011358c4a2dabd206d23519cc8cdf7d7b668b146d6906b312329acecff55cc8625c2a870
--- a/app-admin/ansible/ansible-9.4.0.ebuild
+++ b/app-admin/ansible/ansible-9.4.0.ebuild
@ -0,0 +1,29 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+DISTUTILS_USE_PEP517=setuptools
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Model-driven deployment, config management, and command execution framework"
+HOMEPAGE="https://www.ansible.com/"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos"
+RESTRICT="test"
+
+RDEPEND=">=app-admin/ansible-core-2.16.0
+	<app-admin/ansible-core-2.17"
+
+python_compile() {
+	local -x ANSIBLE_SKIP_CONFLICT_CHECK=1
+	distutils-r1_python_compile
+}
+python_install() {
+	local -x ANSIBLE_SKIP_CONFLICT_CHECK=1
+	distutils-r1_python_install
+}
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@ -1,13 +1,7 @@
-DIST aws-cli-1.32.74.gh.tar.gz 2682208 BLAKE2B aba8be6e597a6d07197bd06d51f167f7a2dbed317c630572585cd006f6edfceac054726a20afe20faf6de381cbb75e352a7d6ab9e232b6e669fd59ca5888e122 SHA512 2f19b7c383c91528f15b93b00df285bdf32685c08e41e4f8f3a62cbbd5cff2615ca98c5eb925a5a2a2d13b452a0a08658749f4f7a48045a537ee7ec7e23cd663
 DIST aws-cli-1.32.79.gh.tar.gz 2685785 BLAKE2B 3bbfad927d9d882e6b502f47919ce963df498c614a92730c5d6b1fb4efd7a8bd805a5c8cc82c705b97d8ee0ddbee4d6ddfa9cb46661fe7e9337add53bda3d9a1 SHA512 e0e369b6a5fca4d72365e54ef99c862e2d6f68caed61ac431516777e82ec8b292cf50516f379d8e94787b2a0ee58ad6e68d0951624f1ed742079295c4d2987ce
 DIST aws-cli-1.32.84.gh.tar.gz 2691519 BLAKE2B 4cb78f14975d74013803af0f6397d959294cca6046ee19c1a907ca3e60fd224539d39535416ddcc2713b1de653b78ba03965dc78415dd915e80d11fcd6fbe02f SHA512 19d2030201806b336ede2c5e09f761e39959a156057d68316180145232e54013f2e5fa57023146488d407aa7e655fdb2245058e45eb5c4d6778eecd867f6eac1
-DIST aws-cli-1.32.85.gh.tar.gz 2692681 BLAKE2B 1b74cd51dd71ce01b492f21de40d25e7ea4b2e3e3572cf2346b0fd293a4ba2dbb870acb1f0b2f41494f5fb065d5eb20c6e3f98a4035d7426bf6926535c8ef83e SHA512 7f471978f4a306944d30ad2cacd3feaea6a821be79aa814300a2833824328414f878ee2d0a6d42371d38e3d841530be7f25f0e14b81360e81182d9c9e35227b5
-DIST aws-cli-1.32.86.gh.tar.gz 2692809 BLAKE2B b0c9956d7b2b81f05b8f59ccbcd14baca3acb9f006ac965d0df06d86309bdd4d71c430514d22ef5c5c871e6009a174e8abc25b47ab8cd4471230e301bc0e50a1 SHA512 ab689fc5997bd14223e76307c1c4609950b5e4a62932163bd68d8a4d7a9c09db55b17c4377cba3901cd9518ac2b6ccc191fd9c7692dd0e188bfdd475bfcfc0ac
-DIST aws-cli-1.32.87.gh.tar.gz 2692945 BLAKE2B 5c22caaad9f9134013e96a665681de698510b77048dbbd2f84748b5dc3283dfc2f34aa62e8669265fe8e686e8497ab72d67bb401a343d9f036eb6ba2558cd0ff SHA512 48779efe4d2ee34e5f145fdf753619fd39ef48085705d7fe67e6b0d51c70fc2b0a43eb4a7d07c4d9befeb596d9c59b8725eea9b9619ac614b4cdd6dbdacc81a4
-EBUILD awscli-1.32.74.ebuild 3022 BLAKE2B eca1e9b920babafc0c226e1d3c0b23baa63965cffceacc71118d2e4a1302945d10294223300a94f9dec4b39e52c7bd8f44e35cbf7cf30c117f9d86fe93450326 SHA512 11de7ee4880fe2bd192c6c15081b598d4c9d2f18b28064908a855cb01283408542c8981841c531d546b6de9e2b932d2a23e2fe1a9e90030566af6b966c30fd97
-EBUILD awscli-1.32.79.ebuild 3029 BLAKE2B 580c774489759d94cbe5c77316c3afbb84d597198c391cd0ed89722c239fb23a87fc34378bd669e9104fbfaaa75a924c3d73e8df2c52693ba6fc135da827643d SHA512 4a31562305f7156e91d78023ed1f56e74de8fb1555323a5cd63611254daeb7491b8e323d00e38351d9bbc2a751f257290a6bb4bd91638e28f9c45acb8742c809
+DIST aws-cli-1.32.88.gh.tar.gz 2693435 BLAKE2B 043f4eb08711760b7f8e15a5eba879524788cb65823215ed9d1c8ee5337a085ab6975dfc1c90aea29b7137f050a6d4f201eba57e8c8c83c09625401d8075eb6c SHA512 cb0ed179b9549d988e19963607fe28ca6fb02c92280c451c8651a8149d60a929158f9ae04a1c764540648b8b42417e908cb956fe71ce787c4b788f83cc2ef488
+EBUILD awscli-1.32.79.ebuild 3022 BLAKE2B eca1e9b920babafc0c226e1d3c0b23baa63965cffceacc71118d2e4a1302945d10294223300a94f9dec4b39e52c7bd8f44e35cbf7cf30c117f9d86fe93450326 SHA512 11de7ee4880fe2bd192c6c15081b598d4c9d2f18b28064908a855cb01283408542c8981841c531d546b6de9e2b932d2a23e2fe1a9e90030566af6b966c30fd97
 EBUILD awscli-1.32.84.ebuild 3029 BLAKE2B 580c774489759d94cbe5c77316c3afbb84d597198c391cd0ed89722c239fb23a87fc34378bd669e9104fbfaaa75a924c3d73e8df2c52693ba6fc135da827643d SHA512 4a31562305f7156e91d78023ed1f56e74de8fb1555323a5cd63611254daeb7491b8e323d00e38351d9bbc2a751f257290a6bb4bd91638e28f9c45acb8742c809
-EBUILD awscli-1.32.85.ebuild 3029 BLAKE2B 580c774489759d94cbe5c77316c3afbb84d597198c391cd0ed89722c239fb23a87fc34378bd669e9104fbfaaa75a924c3d73e8df2c52693ba6fc135da827643d SHA512 4a31562305f7156e91d78023ed1f56e74de8fb1555323a5cd63611254daeb7491b8e323d00e38351d9bbc2a751f257290a6bb4bd91638e28f9c45acb8742c809
-EBUILD awscli-1.32.86.ebuild 3029 BLAKE2B 580c774489759d94cbe5c77316c3afbb84d597198c391cd0ed89722c239fb23a87fc34378bd669e9104fbfaaa75a924c3d73e8df2c52693ba6fc135da827643d SHA512 4a31562305f7156e91d78023ed1f56e74de8fb1555323a5cd63611254daeb7491b8e323d00e38351d9bbc2a751f257290a6bb4bd91638e28f9c45acb8742c809
-EBUILD awscli-1.32.87.ebuild 3029 BLAKE2B 580c774489759d94cbe5c77316c3afbb84d597198c391cd0ed89722c239fb23a87fc34378bd669e9104fbfaaa75a924c3d73e8df2c52693ba6fc135da827643d SHA512 4a31562305f7156e91d78023ed1f56e74de8fb1555323a5cd63611254daeb7491b8e323d00e38351d9bbc2a751f257290a6bb4bd91638e28f9c45acb8742c809
+EBUILD awscli-1.32.88.ebuild 3029 BLAKE2B 580c774489759d94cbe5c77316c3afbb84d597198c391cd0ed89722c239fb23a87fc34378bd669e9104fbfaaa75a924c3d73e8df2c52693ba6fc135da827643d SHA512 4a31562305f7156e91d78023ed1f56e74de8fb1555323a5cd63611254daeb7491b8e323d00e38351d9bbc2a751f257290a6bb4bd91638e28f9c45acb8742c809
 MISC metadata.xml 385 BLAKE2B 5accfb180a91179cc6df539d42d1de06be3ebfec73f3edb719f5d59576103b9a8cb0c7c524c1042630e0cf99f068939a19f04c7b1b4a2acf9e072369df80d913 SHA512 ccb3d516326c5dbdf53068372ce25baecc137d21a04516374362212b969cc928dacbf743b4953da33f28482905798f069d09d19c88d9913f2b32648db25115ab
--- a/app-admin/awscli/awscli-1.32.74.ebuild
+++ b/app-admin/awscli/awscli-1.32.74.ebuild
@ -1,90 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit bash-completion-r1 distutils-r1
-
-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.10.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	!app-admin/awscli-bin
-"
-BDEPEND="
-	test? (
-		dev-python/packaging[${PYTHON_USEDEP}]
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-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 serial_tests=(
-		tests/functional/ecs/test_execute_command.py::TestExecuteCommand::test_execute_command_success
-		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_{fails,success}
-		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_with_new_version_plugin_success
-		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking
-		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking_windows
-		tests/unit/customizations/codeartifact/test_adapter_login.py::TestNuGetLogin::test_login_nuget_sources_listed_with_backtracking
-		tests/unit/customizations/ecs/test_executecommand_startsession.py::TestExecuteCommand::test_execute_command_success
-		tests/unit/customizations/test_sessionmanager.py
-		tests/unit/test_compat.py::TestIgnoreUserSignals
-		tests/unit/test_help.py
-		tests/unit/test_utils.py::TestIgnoreCtrlC::test_ctrl_c_is_ignored
-	)
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	EPYTEST_XDIST= epytest "${serial_tests[@]}"
-
-	local EPYTEST_DESELECT=( "${serial_tests[@]}" )
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit}
-}
-
-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/awscli/awscli-1.32.79.ebuild
+++ b/app-admin/awscli/awscli-1.32.79.ebuild
@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}

 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+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-)"
--- a/app-admin/awscli/awscli-1.32.86.ebuild
+++ b/app-admin/awscli/awscli-1.32.86.ebuild
@ -1,90 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit bash-completion-r1 distutils-r1
-
-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.10.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	!app-admin/awscli-bin
-"
-BDEPEND="
-	test? (
-		dev-python/packaging[${PYTHON_USEDEP}]
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-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 serial_tests=(
-		tests/functional/ecs/test_execute_command.py::TestExecuteCommand::test_execute_command_success
-		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_{fails,success}
-		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_with_new_version_plugin_success
-		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking
-		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking_windows
-		tests/unit/customizations/codeartifact/test_adapter_login.py::TestNuGetLogin::test_login_nuget_sources_listed_with_backtracking
-		tests/unit/customizations/ecs/test_executecommand_startsession.py::TestExecuteCommand::test_execute_command_success
-		tests/unit/customizations/test_sessionmanager.py
-		tests/unit/test_compat.py::TestIgnoreUserSignals
-		tests/unit/test_help.py
-		tests/unit/test_utils.py::TestIgnoreCtrlC::test_ctrl_c_is_ignored
-	)
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	EPYTEST_XDIST= epytest "${serial_tests[@]}"
-
-	local EPYTEST_DESELECT=( "${serial_tests[@]}" )
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit}
-}
-
-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/awscli/awscli-1.32.87.ebuild
+++ b/app-admin/awscli/awscli-1.32.87.ebuild
@ -1,90 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit bash-completion-r1 distutils-r1
-
-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.10.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	!app-admin/awscli-bin
-"
-BDEPEND="
-	test? (
-		dev-python/packaging[${PYTHON_USEDEP}]
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-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 serial_tests=(
-		tests/functional/ecs/test_execute_command.py::TestExecuteCommand::test_execute_command_success
-		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_{fails,success}
-		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_with_new_version_plugin_success
-		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking
-		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking_windows
-		tests/unit/customizations/codeartifact/test_adapter_login.py::TestNuGetLogin::test_login_nuget_sources_listed_with_backtracking
-		tests/unit/customizations/ecs/test_executecommand_startsession.py::TestExecuteCommand::test_execute_command_success
-		tests/unit/customizations/test_sessionmanager.py
-		tests/unit/test_compat.py::TestIgnoreUserSignals
-		tests/unit/test_help.py
-		tests/unit/test_utils.py::TestIgnoreCtrlC::test_ctrl_c_is_ignored
-	)
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	EPYTEST_XDIST= epytest "${serial_tests[@]}"
-
-	local EPYTEST_DESELECT=( "${serial_tests[@]}" )
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit}
-}
-
-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/awscli/awscli-1.32.88.ebuild
+++ b/app-admin/awscli/awscli-1.32.88.ebuild
--- a/app-admin/checksec/Manifest
+++ b/app-admin/checksec/Manifest
@ -2,7 +2,9 @@ AUX checksec-1.7.2-path.patch 510 BLAKE2B d17d260f41cf0c7e71accfa4b728a9c35511d1
 DIST checksec-2.4.0.tar.gz 2242079 BLAKE2B c1878c1312d13591147f0efd1a2d535ae8e75292dbc53e7ba0802c8d165b18b4bc0b22a5cc3a9159ddcf05a1518d58c18cb54700ea5a52ff29d261068194b96a SHA512 1a02dfac48b5979cb5c2eb7b8f1fe290d3ac090726d1b95a14864bfc4bc3d32eefc10e2cc227c9dc01809c78fe003d1faea9b720d5cb5fbc16599fc0e2512947
 DIST checksec-2.5.0.tar.gz 2623122 BLAKE2B b4a876dfc8b9f02d5d74b6720b59ee216fbdab4e7df471aa4a78e7e6a98830b1b03f9a66d8b9dd344261fe1a253db4e5e9bede53f47e1fd171b2d23b0e04f031 SHA512 dd76061976d7f97c250b9d24b9cc7c6ea26c9df7e3521e3a1f39f56812485afaae6d60c611e1b7f4817b1585d10fc2116eaa032bb690e39a0243529e324943ab
 DIST checksec-2.6.0.tar.gz 2624551 BLAKE2B bfda79dfdfc672119d70612497893ba91f093719f95e2b387d27da81d7f8b50e2bc54e9d030d84db76dc2a599bb1f866608529149896259ce517450318640c82 SHA512 71ba0f24b7db0c7fa74dfeaa74b2722ffe792c77941316da916dc7aae888f147c81f98d1522f63b96aa3a76aff7bb1d98522a02efa312b3b3a9dd9a137239010
+DIST checksec-2.7.0.tar.gz 2631553 BLAKE2B c44bcc1a5090a29563ce7e8694ead74230d43f469a71e8388c06138afe5192280366315f3921961adddb367cbab81a1948f45096cbb64a7d8fdb6de849dc1698 SHA512 194a6f33042fcec94bbc463659066abdda644da42f68dd8001ba263a2679bd49a4443229cd5ddffd75afe693d255dc7f081c95eeeff940ac8a0e53313972f03b
 EBUILD checksec-2.4.0-r1.ebuild 827 BLAKE2B 76fc94cf9c59935f12211a0b69a8c6fc9be375748cbea1e0a64f1c60324447531b552f2c2416592fb8870e089c44e2ce82f65ed9faeacf1e0f17331aec4945de SHA512 77f722a412cbb276f37f1ca5bec92703427ace3d579cdd212a776d9ec2a79b649a8c48761c2495c6cd2c75ceae43980b68ec8d7fdfa308964b160768b26ce936
 EBUILD checksec-2.5.0-r1.ebuild 832 BLAKE2B c53e97b4fd3a9c04795d86650eadbe5bcc724d954ee368dfe9b05d3d82a2220fcbb8f27fe8088faa04b0408e35eb28dfa7dfeedb7a4d3de84221da36e1c18387 SHA512 3a9ed6b307d73ed8f9e7de248e88e204ee4336a247b3889a261f9d07ed033b741fc64060a068e40f9846c8057131314b9f27fc89bef85833e31662710c61f35c
 EBUILD checksec-2.6.0-r1.ebuild 788 BLAKE2B 8ce7153a9481f1752c3d72b8952ef485ed42aa0a347cd7e8030e03dcf3e497071ed79c0d87c26717eb99518ffa8a70e5899e971ff948d386168ba3ead7d97696 SHA512 87e6dfec27654b9003ce31c961689c283bee092d05cc05d9fef684c9d751ee28777c33c40e615b9e4e61ad5b6aa1f743b21888b340113671739ac299a9b84d54
+EBUILD checksec-2.7.0.ebuild 808 BLAKE2B b91bb3af289c14a39a7e0dd546f76c12b5e3139cdfb8e49b9b43e9b0ae79e25054f73138410a1a12b5f04ffd35cf7739add75e1da41cabb218c4f078030a0163 SHA512 6dda74f940d6c295527bf52518c952cbc4a2aefd1fc3e39028af96b3c0f3e6bd81e1d9c7c09ed67836b50640e6241f0ed15d4e71584dba01ae6cab0ae24e42f4
 MISC metadata.xml 335 BLAKE2B 99e07579c1f644b8fa7d4b52de2110716ff7aef864466b323567f923623b41b6b1eccdfab55a0acb64ab0d8400497aa0b48bbb2095b2e115ecffb693a3ae40fe SHA512 c48521c1ce01a289d48974025a9aa8e6d8e00437bb89e1f35f862764872f73a988e17e53a903cf2c4ccfbebbaaa1cf57e548fc1741fabb0f958e991b4e0a02e5
--- a/app-admin/checksec/checksec-2.7.0.ebuild
+++ b/app-admin/checksec/checksec-2.7.0.ebuild
@ -0,0 +1,37 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+MY_PN=${PN}.sh
+DESCRIPTION="Tool to check properties of executables (e.g. ASLR/PIE, RELRO, PaX, Canaries)"
+HOMEPAGE="https://github.com/slimm609/checksec.sh"
+SRC_URI="https://github.com/slimm609/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE=""
+
+S="${WORKDIR}"/${MY_PN}-${PV}
+
+RDEPEND="!<dev-util/pwntools-4.10.0_beta0-r2"
+
+DOCS=( ChangeLog README.md )
+
+src_prepare() {
+	sed 's,^pkg_release=false,pkg_release=true,' -i ${PN} || die
+	rm Makefile || die
+	default
+}
+
+src_install() {
+	default
+
+	doman extras/man/*
+
+	insinto /usr/share/zsh/site-functions
+	doins extras/zsh/_${PN}
+
+	dobin ${PN}
+}
--- a/app-admin/puppet-agent/Manifest
+++ b/app-admin/puppet-agent/Manifest
@ -7,8 +7,11 @@ DIST puppet-agent_8.5.0-1focal_amd64.deb 35945720 BLAKE2B 485fa3e93006c63265df27
 DIST puppet-agent_8.5.0-1focal_arm64.deb 35436786 BLAKE2B 712f893f05f9f75bf7af0cf40556f0746a81fabbd8e588ad598f59856bfe4948c53eb92e2eaa7a621507183c572d17ecb2b426b13a91bbd0b98cc2463070a60e SHA512 ce1752d13b2d4b9442ef11006e8bc0edf98e855df051491efd2760b6919c41f0dda2030910e5794658ae99d3b8341e9bf64aa57c65069f9d83a3f328f1d2dd41
 DIST puppet-agent_8.5.1-1focal_amd64.deb 35945834 BLAKE2B 8c839eabf8abbc6cf87ab8a1c942b97be7fc08b9053695d07a7fc4bbf69886192063553c43f81e73521327cf8b89af18fe43d41ef3f71229d218fe123426f50c SHA512 324ea532d005a1bbb0f25fdd411f3f68a1c18371cb494f8934d73d87c19e3bbf46c653a9afbe767ed2ab6e788115f31ccef4bd084351ee6f73e4e656aab5d65a
 DIST puppet-agent_8.5.1-1focal_arm64.deb 35436770 BLAKE2B 16ead6317dab6f8b65b8ea5269eec5593697f4da6d1ec0323e074f4eab3c8518dab10af48853e591aecc62c63a5ff4e135cf02bb1d7f7d565c5200bfae98ff86 SHA512 f3acc097563d9a56cb677df72250ee25ab0e1e361eb40a2cd36b3d694854edc3850f08099b916aefbc16580f78a194e9f3bf33b1cb585836d55c6e8dcf03a379
+DIST puppet-agent_8.6.0-1focal_amd64.deb 35966100 BLAKE2B a27e5fd32c73dd798612cc78a2e4abc150b425215592e9c7a88c7d3b54a2f6dcaffd557575e7c6f64116228fdd50e15a503f8b4c8c496c0f970ee772d5a88e6c SHA512 10a89f73219da6b59e63e8d2aba63968ef2236e773077c54ef6001b010b20b3e384676880cc10b8be4fc16336bb123783de88b0fd1d5c5d91c2455f410458363
+DIST puppet-agent_8.6.0-1focal_arm64.deb 35459524 BLAKE2B 5c9bc90eb3b2857176988acb41ebf0eed173077adabe74a6570ada92f9c2c829a57b949ea0c1cb1cae2e7b562b52882da58fab1552934e18bd676163c10e1924 SHA512 f91d82dcb66667891c6155e171739f34a174529a09c376fc7e1a829cd6862e52d26dc39ab3b0d273e32b56e52c62193c8d574d5164f3152bab6e50b4872c5e52
 EBUILD puppet-agent-7.24.0-r1.ebuild 2593 BLAKE2B 08fcc0a7e5887d7767d6f740501b862957a9436ef9e5b0f7ad89077a273d22e3f9ba13f2ae5e557f0f5526889cf5f92489fdd5165e0608c655f94bed6e08a002 SHA512 98d999200a527076993b9c8bb45fcce2d980b081c19afa058d7129193861ab89b323b2ea73886190cde8a633dffc96bf459b29facad8e3cbeef46be9029fac39
 EBUILD puppet-agent-8.4.0-r1.ebuild 2595 BLAKE2B ff037b9f14f6a93fca87738f3312fd68b81a8026b481c28fe2ba01a01bed9797e6f65884221f3578690ed87b50fb131e3998744a6721e9f284d6710144d53082 SHA512 947547718b3e6e3692282a91a747782de80c52cf229859b83ca762d4277a7f5e8c4f98f47fbe3f6156686d6d8634e1da3c47290fedd64c74cdde72e0f217da1b
 EBUILD puppet-agent-8.5.0.ebuild 2595 BLAKE2B ff037b9f14f6a93fca87738f3312fd68b81a8026b481c28fe2ba01a01bed9797e6f65884221f3578690ed87b50fb131e3998744a6721e9f284d6710144d53082 SHA512 947547718b3e6e3692282a91a747782de80c52cf229859b83ca762d4277a7f5e8c4f98f47fbe3f6156686d6d8634e1da3c47290fedd64c74cdde72e0f217da1b
 EBUILD puppet-agent-8.5.1.ebuild 2595 BLAKE2B ff037b9f14f6a93fca87738f3312fd68b81a8026b481c28fe2ba01a01bed9797e6f65884221f3578690ed87b50fb131e3998744a6721e9f284d6710144d53082 SHA512 947547718b3e6e3692282a91a747782de80c52cf229859b83ca762d4277a7f5e8c4f98f47fbe3f6156686d6d8634e1da3c47290fedd64c74cdde72e0f217da1b
+EBUILD puppet-agent-8.6.0.ebuild 2595 BLAKE2B ff037b9f14f6a93fca87738f3312fd68b81a8026b481c28fe2ba01a01bed9797e6f65884221f3578690ed87b50fb131e3998744a6721e9f284d6710144d53082 SHA512 947547718b3e6e3692282a91a747782de80c52cf229859b83ca762d4277a7f5e8c4f98f47fbe3f6156686d6d8634e1da3c47290fedd64c74cdde72e0f217da1b
 MISC metadata.xml 1032 BLAKE2B 35156eb59a786ad7dab4ac5c281796af6a8f3dcad2b7ebc2c6af926aee6fcbffaef39f0f7119f1aefed42a1e8148f323ee4d3d5f77dfb4d3671317af6fd078cc SHA512 b624438f825e288802e516637dd38f775a63b4a4aabaa53c5adfd1f71f694018dbf3d47f1622a90d5da25a00aac696f9203c085190e574a586f3a3e4fe14f9d1
--- a/app-admin/puppet-agent/puppet-agent-8.6.0.ebuild
+++ b/app-admin/puppet-agent/puppet-agent-8.6.0.ebuild
@ -0,0 +1,91 @@
+# Copyright 1999-2024 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
@ -7,10 +7,12 @@ DIST puppet-7.28.0.tar.gz 2827538 BLAKE2B 65f25d9de60ed1b511acb5c9d72370198f68f3
 DIST puppet-8.4.0.tar.gz 2882328 BLAKE2B de46a8fbdc7522f022d19953845c73e6872ed430a9380f157809bb95e7d7315063f136b5159468708dcb5dcb4353cc89eacffffbd4045458351c63261a6d9bd0 SHA512 23d5aede9ba55e4e63a7f815fd1d274e97d5d0c35aa1b5444c24b223a59d5d913ac5b4652acc2258b1721a213e4c24e1e8b4a146ca6a1b81a1536a51ed856270
 DIST puppet-8.5.0.tar.gz 1565122 BLAKE2B c787b981c64f2b52cc3c8998516599891980bb176cb3bce6596cb4b139fbae2f58e156fb007a3aa2bd2a5bb069dc63eb7fc36bde3f3533c27729fccfa19ee0e7 SHA512 1adf88f69b3b5a7071a2ee5dad66c3cd3fc1db57fdeaf7945f8cb167d1b76dcf12e85e17eefc418cda67952a4c75a6b43d320d0c0f1db610411d188304994cdc
 DIST puppet-8.5.1.tar.gz 1565085 BLAKE2B f352f9f70e090c4a32edd45ced5c01ed4eff891fb46c0f2d753ceeba43250960356ceb2d9047e7308732585ec114c5f728ec29a65b6a08348b74a9709ec92a89 SHA512 f1d661c34fc7c1381c6422ff7e027fdf4554a69939f5db926bf8a61a89583090fb8d28151f90093d3ca8037950ed911b0a5c7b8677a80ede72e83d9cbf89af7f
+DIST puppet-8.6.0.tar.gz 1567398 BLAKE2B 749cc055c6797e5715907fdb768264774efba62e4681733a59a457cfda9dd2682990a96331cc04d313a367e32b820ce351fb103e19891976e900d99c30ca7ba5 SHA512 b08d59b4ec79fec5f3dd2d37c9b6a9f016cf25068e507866ab8d545f59792b9af84e302675182a0318c792814f0bff2bf052c8953b6b44c5441fa2c692a9f04d
 EBUILD puppet-7.24.0-r1.ebuild 3667 BLAKE2B b23b5cc737843739d0244a7459eae5f3550a77770f2294f23c484a1cc907251784926e0bedf42b6b751089e5e0dfe13f098cd5885cfb7195982fd30a15cedce8 SHA512 e1bf9c6f1046f17c83f28eadd71a93f0f653fc9c00511b069860ca1738dfe09f2983b07272b6bce79c9b398d88bf4439d6809167f0d0b72c1d5ea2fe4f9e28eb
 EBUILD puppet-7.27.0-r1.ebuild 3461 BLAKE2B bcefb809d752b83637a74afcf8eea7c3ab945409474f1896e211718e8f33aff3b93d09c253f75a8baed3d687ea9f2338ff4ba4f61780a8c3a4830db49dc06d22 SHA512 82871cac6db38c905370cac15cae7f5dcfb4943dfe7be7a24e7ea5c8bdf278760b986178f63b533bfc5fc44bc5682ba7b32a6f2ecc804b200c3d58de671f2dbe
 EBUILD puppet-7.28.0-r1.ebuild 3459 BLAKE2B f083df765e3629172ad4aab5937e6b5e5afa637faaa274580b87eb2d0eba0bc0e27911fd801a6f93ff45ce6b994140c05630b64e4e8dd974d09b7a601d9e0c34 SHA512 b315f1a5ad8404440439c099cda0326c3bb2aef087f7a62dfea3e2a1c51b33b537a5ac838eeb62a40ccd261944e5630717e7d5a3f05ebf2250ab7157361d992a
 EBUILD puppet-8.4.0-r1.ebuild 3284 BLAKE2B 428c4b53e8f7cdb84473679c67b395f4381077c697d535b63fe610b2098a28ef9bd07d061f796c636da3713fcd815ab3543456f58e345eb4503a099720912cbb SHA512 a5edb63a61b4789e4b289ce7467334870cf36c6820b3f448bc0d66fb5a8ea99f2d8f58af54d86bc8f4d230993aba68cec97c288c5d29707b78fb961b5de8de39
 EBUILD puppet-8.5.0.ebuild 2886 BLAKE2B a808ca3839b275c44f4cfa7f5212cfe788ddcfd7572ce7e659f706140b85f33838d1a584ebf3ec8f7d9f58caf9f922224c038adfd4b050bed62f0df0b203ceb6 SHA512 f153d19dc2f918526bb13dcdd04499afd1ea390f7678f8513f9bdb06f8bf4713bd8f20b136a5acb195224a85f5cbed453091894b89e589673b6d139a040c4f58
 EBUILD puppet-8.5.1.ebuild 2886 BLAKE2B a808ca3839b275c44f4cfa7f5212cfe788ddcfd7572ce7e659f706140b85f33838d1a584ebf3ec8f7d9f58caf9f922224c038adfd4b050bed62f0df0b203ceb6 SHA512 f153d19dc2f918526bb13dcdd04499afd1ea390f7678f8513f9bdb06f8bf4713bd8f20b136a5acb195224a85f5cbed453091894b89e589673b6d139a040c4f58
+EBUILD puppet-8.6.0.ebuild 2886 BLAKE2B a808ca3839b275c44f4cfa7f5212cfe788ddcfd7572ce7e659f706140b85f33838d1a584ebf3ec8f7d9f58caf9f922224c038adfd4b050bed62f0df0b203ceb6 SHA512 f153d19dc2f918526bb13dcdd04499afd1ea390f7678f8513f9bdb06f8bf4713bd8f20b136a5acb195224a85f5cbed453091894b89e589673b6d139a040c4f58
 MISC metadata.xml 1496 BLAKE2B cc2549141aaf5623f65be274fa8195fe6ee2826620050284ab0a7f60ba04832ecf8fe0e0890c470c98095946d1e4e7a0ef1fabd4d400c47d086fe173769f3d8c SHA512 1217b23c939409ae6cd15286b3304388893970276c80bf11284769946856ba1db20ea537fee5b7b2183305a24c88c926804e21f246f508e40cde41f45f1490bf
--- a/app-admin/puppet/puppet-8.6.0.ebuild
+++ b/app-admin/puppet/puppet-8.6.0.ebuild
@ -0,0 +1,115 @@
+# Copyright 1999-2024 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"
+
+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
+	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() {
+	# fix systemd path
+	eapply -p0 "${FILESDIR}/puppet-systemd.patch"
+}
+
+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/puppetdb/Manifest
+++ b/app-admin/puppetdb/Manifest
@ -3,7 +3,9 @@ AUX puppetdb.initd-r2 1896 BLAKE2B 04f47dd0406c1f67d4f72a911b0db8b482e37673ec9a0
 DIST puppetdb-7.13.0.tar.gz 49917440 BLAKE2B 7cb01b2dbd6b6b22aad11a7fbcabff1c8452d51437bd0b3db3c8afe9d72bb853b66a9c8056c4c7c33f284efc4a90c788a05411fe6f80ae081ef817bb7f609bf3 SHA512 ba94031b3c15d38a2719390145e034be453a5f8368b5c53420bf3b371cc36a49f0b416447ec4d9de41ef0618b32ec806b9bae996ec3c4ca0ce05fb152940c2f2
 DIST puppetdb-8.2.0.tar.gz 59250096 BLAKE2B ed1009e87cad366a1d3399eb55b51d8aaad325f1b2da9c2fc5f77a1ad43581009ebc23f5e6756cd86430eb300d389a9022b14c29bdd4ea392cf956627df0f1fe SHA512 59d894710c2591566f9900a7fc1a396f971152e66ae423b54d73b0b9d474eaf4f58926fb6dc4815865dac8bd2dc458161685876ffdc9db5a3d049d0ffeb9b601
 DIST puppetdb-8.4.1.tar.gz 60378645 BLAKE2B eb107fd2016335f814ce9de5431abb2573fd71e8b1a37faf3dad0079ca464f15785bde79eaa49f343a8dd146b9977dbb9ce4e23bce61ba39e5526e422995a497 SHA512 89f405e5364eff1ecf1482ff620de1a7fbb818b3a7ab2463f6ff47fcba0552ac440639c72f2875de956127ea3da9a5d59aa3bb220e59d0994ed3683cac22309c
+DIST puppetdb-8.5.0.tar.gz 60440356 BLAKE2B 8c3116b040c91a1b406e56b419ddd7e31a5ecc7aae97c73b03fcecebeedefb1b8eed44ce54b07881cbbb025b79bfa076618c6fd6df861a6dcf03c047e7c8f480 SHA512 92808758271c43eabbd508fcb321b3e52a92d0aa860f2c9b42d1df6dcffedb41110c8cc2e72c599fa1762404112f1fc76699f449858a627dd1ca5caa84a2d381
 EBUILD puppetdb-7.13.0.ebuild 2705 BLAKE2B 7328385eb13d39f37a2affa82b49ed2fac94e68db460ff735fd4a78d26bed884b6047b4d6c5a91b7fd7f93a955e261f9f97cf0833b1d6fa67d06b65fa7eb7080 SHA512 2fccfbbab1518ca3bc804844948547f489a69b908ce04ac93ed88f2b5f241203bfe623e87a0900fddfc2b2ffe5636768bf0ef1258f1dd27d233fbfcbbbbef74b
 EBUILD puppetdb-8.2.0.ebuild 2702 BLAKE2B 41d534e1642cefba515a29e4528ba3645273b99b7eb8009035a7b51a8bc119faf9e40fdee84ae00afbb9a605c198b5b357b5195a7490ab31e3da0936165089d1 SHA512 8c68b1186a7b1b35711a78b802acf38e1bace13e2f334ec38f30c54dfc8ff6b8608f86f2b195f1aabb96e0f6bf2ef16df005aed32c98b1e2693b07f57ae6c103
 EBUILD puppetdb-8.4.1.ebuild 2702 BLAKE2B 764c25b8a8071be7f67fce96a88d61f06e98a0a25c07fc154b39a41c6fbf624954f94596dc2625a9471f5a6571bfcc669aa2930548d42ceafd0b78747b0d1f26 SHA512 63c7bd0dacaa4b4be81f26da9d023235fa82b80376aaa6e32fd846b14752230325185cc707e4b0b1b0277713464de694aa5b6c3c10147ac15d1b89130ea45f2b
+EBUILD puppetdb-8.5.0.ebuild 2702 BLAKE2B 764c25b8a8071be7f67fce96a88d61f06e98a0a25c07fc154b39a41c6fbf624954f94596dc2625a9471f5a6571bfcc669aa2930548d42ceafd0b78747b0d1f26 SHA512 63c7bd0dacaa4b4be81f26da9d023235fa82b80376aaa6e32fd846b14752230325185cc707e4b0b1b0277713464de694aa5b6c3c10147ac15d1b89130ea45f2b
 MISC metadata.xml 486 BLAKE2B e74960c88243252794d20dd51c071147de88663d4e610e8358013b77ffaeb13b35edb7a48575932a8a30e0916782063459fe14b57ffcb2962e16b5d73c66f9d9 SHA512 e87f0d39aa659c53cb9798929c08a853247870f9c9b7dc85c9610f7b2b9c2f10a226ffeadc738e263c6bbcde495c438fbfd7dd951c2cff18b66646da9475c7c6
--- a/app-admin/puppetdb/puppetdb-8.5.0.ebuild
+++ b/app-admin/puppetdb/puppetdb-8.5.0.ebuild
@ -0,0 +1,90 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd tmpfiles
+
+DESCRIPTION="PuppetDB collects data generated by Puppet"
+HOMEPAGE="http://docs.puppetlabs.com/puppetdb/"
+SRC_URI="https://downloads.puppetlabs.com/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+KEYWORDS="amd64 x86"
+
+RDEPEND+=">=virtual/jdk-11"
+DEPEND+="acct-user/puppetdb
+	acct-group/puppetdb"
+
+src_prepare() {
+	sed -i 's/sysconfig/conf\.d/g' ext/redhat/puppetdb.service || die
+	sed -i 's/sysconfig/conf\.d/g' ext/bin/puppetdb || die
+	sed -i 's/sysconfig/conf\.d/g' install.sh || die
+	sed -i 's/var\/run/run/g' ext/puppetdb.tmpfiles.conf || die
+	sed -i 's/var\/run/run/g' install.sh || die
+	default
+}
+
+src_compile() {
+		einfo "not compiling"
+}
+
+src_install() {
+	dodir /opt/puppetlabs/server/data/puppetdb
+	insinto /opt/puppetlabs/server/apps/puppetdb
+	insopts -m0744
+	doins ext/ezbake-functions.sh
+	insopts -m0644
+	doins ext/ezbake.manifest
+	doins puppetdb.jar
+	insinto /etc/puppetlabs/puppetdb
+	doins ext/config/logback.xml
+	doins ext/config/bootstrap.cfg
+	doins ext/config/request-logging.xml
+	insinto /etc/puppetlabs/puppetdb/conf.d
+	doins ext/config/conf.d/jetty.ini
+	doins ext/config/conf.d/repl.ini
+	doins ext/config/conf.d/database.ini
+	doins ext/config/conf.d/config.ini
+	doins ext/config/conf.d/auth.conf
+	insopts -m0755
+	insinto /opt/puppetlabs/server/apps/puppetdb/scripts
+	doins install.sh
+	insinto /opt/puppetlabs/server/apps/puppetdb/cli/apps
+	doins ext/cli/foreground
+	doins ext/cli/ssl-setup
+	doins ext/cli/config-migration
+	doins ext/cli/foreground
+	doins ext/cli/anonymize
+	doins ext/cli/reload
+	doins ext/cli/start
+	doins ext/cli/stop
+	insinto /opt/puppetlabs/server/apps/puppetdb/bin
+	doins ext/bin/puppetdb
+	insopts -m0644
+	dodir /opt/puppetlabs/server/bin
+	dosym ../apps/puppetdb/bin/puppetdb /opt/puppetlabs/server/bin/puppetdb
+	dodir /opt/puppetlabs/bin
+	dosym ../server/apps/puppetdb/bin/puppetdb /opt/puppetlabs/bin/puppetdb
+	dosym ../../opt/puppetlabs/server/apps/puppetdb/bin/puppetdb /usr/bin/puppetdb
+	# init type tasks
+	newconfd ext/default puppetdb
+	systemd_dounit ext/redhat/puppetdb.service
+	newtmpfiles ext/puppetdb.tmpfiles.conf puppetdb.conf
+	newinitd "${FILESDIR}/puppetdb.initd-r2" puppetdb
+	# misc
+	insinto /etc/logrotate.d
+	newins ext/puppetdb.logrotate.conf puppetdb
+	fowners -R puppetdb:puppetdb /opt/puppetlabs/server/data/puppetdb
+	fperms -R 770 /opt/puppetlabs/server/data/puppetdb
+}
+
+pkg_postinst() {
+	tmpfiles_process puppetdb.conf
+
+	elog "to install please run '/opt/puppetlabs/server/bin/puppetdb ssl-setup'"
+	elog
+	elog "to upgrade please run '/opt/puppetlabs/server/bin/puppetdb config-migration'"
+}
--- a/app-admin/puppetserver/Manifest
+++ b/app-admin/puppetserver/Manifest
@ -3,7 +3,9 @@ AUX puppetserver.init-r1 2190 BLAKE2B 6e4b547af51989d678a52e0fb41e8b27a669d96aaa
 DIST puppetserver-7.11.0.tar.gz 59927771 BLAKE2B dcf2543ac6d5427f57bb451ff9cc6db6748522ffed6fd5a7e81bd63be899fbf722016975fdfca5154489bcaf93d973d11669dd455ad44c79b3be50ccc5e0f636 SHA512 4c9c8d05048ccc35fd729a9a37151451e97655eed131f7192be2dac7614c309ffa4cdb0dd77f1c9eb2666d7df630690faa52ad2b01266010533522b58fb06f79
 DIST puppetserver-8.3.0.tar.gz 63318772 BLAKE2B 863337c364573b340b802b83f0593fdc510424bfbcf6c6b9f8a8e56729a4db689ce5d4c0d9e1a91399e123e05f42ed0547e6a2e86905d0166c189c79966cd9f3 SHA512 c9aa0f84f989dc544ee5d8d268f753b0961f6766531d832a2c99012701dd219d1c2abf4371835242b3445428a7518e86718552678b559b3bf9b027cbf72977fb
 DIST puppetserver-8.5.0.tar.gz 64463953 BLAKE2B 305f75165f919299301209c5a502237bf931342a9d0bf77d91f81f7801760faa421f1767eff283ac82e2cc49792b94126354b177e7b68bda9be61430d123621f SHA512 cb826e2450aa36380a93e95ee8055e6187944d2eecc6d5c339d4b183662d4a56d1e14847fd17b2bc50316f029dbe36791441947832686c9bfb6b0176edf7b22e
+DIST puppetserver-8.6.0.tar.gz 64667765 BLAKE2B bb367a2ed980a6335a6d1e2bc09ad10ccdcc636eee6b658cab5d4bc530f656c76d75545d17e11d7b58288867edcb39bd54af0ddfd5bde2f13cb5000ed33d0bd0 SHA512 e780c78371865e754a3a7fc5343b11f9a0319caf34dcf6ca998295243d1fa2137a617867782878d9bb735c96d5dd1f3e3174898eef240353d3af63eb87cdc4a2
 EBUILD puppetserver-7.11.0.ebuild 5355 BLAKE2B 5e11c389026d93c2ae38f28e2f8da12fe25bc65a1600a2f8051003b726e110498f7892355ff0e9ed556547db5cedc3c45c01253f3722f7ff7705f147585e2f82 SHA512 edfc5b094ea7db88c30cb71ecc3e3476b52789b37f7b893526db5dc7b96dbfd52a4e4bd2a38aa4164ebc8cd0b967cdd5b6af077a49fe242cf2c762b155c3ce16
 EBUILD puppetserver-8.3.0.ebuild 5352 BLAKE2B f9d2849e80e3baf2ed7567b7a744d75eb998dcc1b4bde77661033ffd5a90f17f6141c382dbea7c1cb8035b9e3a8e1a11a2739a94c79866fd5919c02deee63fcb SHA512 0e1e56bee2d15ad2f5dcba00be3d832fc62d6a284c716fed144238ec02ff996d3976919a6aa0bed16949bc1f320e246d6c3a2508405c86ff1336f70387842f3d
 EBUILD puppetserver-8.5.0.ebuild 5352 BLAKE2B 4d688a0e03cc3b86f224fdb05a08534d85c99828e1eebc8356ec953bb184a57d2bb9ff8ac3c475034d7e5c6d754e32d3d373e5447827851ac258babe8add4eaa SHA512 9babc7d5023bbc6d864e38b99783bc86d662e89c2a9442ef390822c257cfdd6ae44c31887c88f793f9c795a28a9095907488422d167518a1168c0278fa8b74a4
+EBUILD puppetserver-8.6.0.ebuild 5352 BLAKE2B 4d688a0e03cc3b86f224fdb05a08534d85c99828e1eebc8356ec953bb184a57d2bb9ff8ac3c475034d7e5c6d754e32d3d373e5447827851ac258babe8add4eaa SHA512 9babc7d5023bbc6d864e38b99783bc86d662e89c2a9442ef390822c257cfdd6ae44c31887c88f793f9c795a28a9095907488422d167518a1168c0278fa8b74a4
 MISC metadata.xml 341 BLAKE2B 6e19f31ed866283c5827f9ca2550ca99c12d8b9506fbc13447d8bdad3ceaae844d3b103fe6cced8f829a75b7b1c317ef43bd2d1e885e9b509f70b8646a9e5bf6 SHA512 72945305ef496758676dba53925ebbd5cd0d01935fe82708559f941d831bf6b2ce34444d5b85a16b116f577596b2647183fe7b7c6ef92080a8e332fc0226d7ac
--- a/app-admin/puppetserver/puppetserver-8.6.0.ebuild
+++ b/app-admin/puppetserver/puppetserver-8.6.0.ebuild
@ -0,0 +1,131 @@
+# Copyright 1999-2024 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-antivirus/Manifest.gz
+++ b/app-antivirus/Manifest.gz
--- a/app-antivirus/fangfrisch/Manifest
+++ b/app-antivirus/fangfrisch/Manifest
@ -6,5 +6,5 @@ AUX fangfrisch.timer 212 BLAKE2B debdcfa78e9583aa490be4e6c91834e134e1680b0f0f128
 DIST fangfrisch-1.6.1.gh.tar.gz 113497 BLAKE2B a37b5b29b31a1d0166112b8939e691acc1721a91bda9e364a90c0c8d4ea7b7d3e1a24b8849c9ef4f0632996ed7bbdfc7985ab04c44c8ca4d57df21294867fd32 SHA512 a16b39b6520d80f69c561bc2d56fef28acaca35a9da214be920cdd907f76d3d6674ed4aa1290ad11a9364ede11472594d7e331ecd21924fe23e005ef9501d4ac
 DIST fangfrisch-1.9.0.gh.tar.gz 127572 BLAKE2B c05c68f904a6e7c7d9f9c5b82bb63366f86653cd13a94276108f52e9c523280320c8aa55ba94ecf079ba938a77e11ca7dc557f4c8fd1b1c7f37179c087dd8605 SHA512 08cc36f20884fedb553de905b8faafce99fcef80e3bce7c0b264691b1a8d83b91a582c095b684f6f7a6af77fd4ed0405fa771a74bbeee3f1b255ff74a161d37e
 EBUILD fangfrisch-1.6.1.ebuild 1991 BLAKE2B 3d7b7ff401ceaf6fc2c9da3ffa3d68ae1ae11a616a747d52dcd2e59d97aab173ea3bb07b6142f7a795a70fec78b0b41075b0fdee10ebd1bcf217b817f766c130 SHA512 487495ea175f963c2aeda77710e4211afcc6444994a3f09876a5aecce66f123635117954a7ad1e4c9da661f77b3e3c1fad83b83459e932137b39f45376fda975
-EBUILD fangfrisch-1.9.0.ebuild 2081 BLAKE2B baa700cbb227c46c382502d3524d03aa5110ac967e6de205b9bdb1084c914125cf4ef1e5357126a162e72928bfcbe43b0b77808c8785eae2b933294e94430a31 SHA512 1b5e984df8e9287c4f92f0cec2114cbbc18623a68de08608d944fd7f1c6c57a70c476ed46fc7c1bbec982d4a01d0085bb1cb373d79ff61e47c0167f6b67b26f8
+EBUILD fangfrisch-1.9.0.ebuild 2079 BLAKE2B 272e65990456644591daae52d603477a6927edf739384126e051aaf89bcb37bc7a083041f624c61401d7bda9af5d46bb1f2a9687acae2760bc7ce29f64073b6d SHA512 6245d6e9cd1f84f4b5a29f10e68fc0d96369852576e97c4897b55c2348c1be404c1081c47911daf9fdf7e8c5e725927ff42e2d22c4c45fdb3deea8a4f6886663
 MISC metadata.xml 692 BLAKE2B 3896ef038265830e10720cde6131e2809084ea45302fee78ab5bba304cd56d5732b708e92119b37fa041d5a9bbd72ded926913a1ba7e4cc93ee7f2f310a53f19 SHA512 ac7bf47c11d46a81f1a81df4572b9592a5b12867db6797b7def523f73cde8b2f541e5dc8e59ff59b2b3e2cf7ba0fdc0ff5e7270913dd9b7bc718fa3e1b010771
--- a/app-antivirus/fangfrisch/fangfrisch-1.9.0.ebuild
+++ b/app-antivirus/fangfrisch/fangfrisch-1.9.0.ebuild
@ -37,7 +37,7 @@ database tables, then run the initdb command as shown above."

 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"

 DEPEND="
 	>=dev-python/requests-2.22.0[${PYTHON_USEDEP}]
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
--- a/app-arch/file-roller/Manifest
+++ b/app-arch/file-roller/Manifest
@ -1,4 +1,6 @@
 AUX 3.36-packages.match 672 BLAKE2B 6481af901bcd606a5cf4909736234bd9ab65c2ebe030819a47efd5354f479c25941f482e40478b9731a0afb2a2478d2f49e859d2a183c493726e7bed1c694a83 SHA512 7858d57c2da0587ae85a028dbf76a6524552a3e24f50bfa5b5a285484a2b50e2ba6f26af3b0fe637db671df5e49ba8cd71baf2ae807f6909fcfaa74c33495509
+DIST file-roller-44.1.tar.xz 927156 BLAKE2B 60ced1711298989eda90a675095b5e7b8f1e9b84b5f4cf364bce4683ba9eac6a8a4a1857b0248cd9a49ea2161cbc5c2c36df94ebc164e195de528ba50220d1da SHA512 de0d0ce93ecba822ec495227cd484cb164a81f8b5349033d80207acc19584985f0c88bfa766a46468349e2b16b020371e2e6b73b4fb7f2f18f40f115f2391b30
 DIST file-roller-44.tar.xz 924236 BLAKE2B 12eebd312afdec8f87141d384d1476be7296073f911791328158af1ab93fcb4092ee79e0c65743c36eaa28e06b5b59503357b6c4cff87b4896d3969a67d08e45 SHA512 d40ac036161397828ded2bab7bdf1c029ef0b53fad65e0922e6eeec40442eb7a9898a7d5c3208f6dfda3ad6f51b0771f248ab64c177769b655493a44c403f824
+EBUILD file-roller-44.1.ebuild 2524 BLAKE2B c6e5d436f8907d6f6449444766cd7bbca46b71a26ffeafff0844f9c592e14d12f333cf60348a033a49c17a8015e389629cfc74218266c24e32870cb45bb441fb SHA512 b13bba641d9f801574f977a2a9867d48dea8ba2d463052d42f7964cbf404defb73cf4049a74fe2bca9e0ea236efe8a780603eac2896683c7aa6d46c0f3ae2ee5
 EBUILD file-roller-44.ebuild 2521 BLAKE2B 61e0b1963e0cc26c9a388538701ca09f7aed711e751c52ba344cbcd653b82fab3591e3d3af3170e24e513db6d70db17c331a9f4ce505df77c2a7b8cbcabd1987 SHA512 5f818819cabcb6250e8ae65f9ad6da8edd00f4261637953e898a163c41c441cf570712c1c72c56a3f44074bbd055fc85001c803e7203f3cd7e603f1a5786f507
 MISC metadata.xml 544 BLAKE2B 395aff0ef64dd1ae52ecf07df0a723454f648ae54468c611a3d3c10c2930bf25413f892a02dca15dad5930ad24baa45adb2df41e740c4d2dbdce9104f8f89e0d SHA512 3639aa10a6e40e9ea901842e40b9e33857254a00f84aa61403fc663e8ef1f356850d77ffa9ee61c7fb05a1152a9cd1ab0adb972edd3d1020308da06680a64410
--- a/app-arch/file-roller/file-roller-44.1.ebuild
+++ b/app-arch/file-roller/file-roller-44.1.ebuild
@ -0,0 +1,103 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org gnome2-utils meson readme.gentoo-r1 xdg
+
+DESCRIPTION="Archive manager for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/FileRoller"
+
+LICENSE="GPL-2+ CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+IUSE="gtk-doc +introspection nautilus"
+REQUIRED_USE="gtk-doc? ( introspection )"
+
+# gdk-pixbuf used extensively in the source
+# cairo used in eggtreemultidnd.c
+# pango used in fr-window
+RDEPEND="
+	>=dev-libs/glib-2.38:2
+	>=gui-libs/gtk-4.8.1:4[introspection?]
+	>=gui-libs/libadwaita-1.2:1
+	nautilus? ( >=gnome-base/nautilus-43.0 )
+	>=dev-libs/json-glib-0.14
+	>=app-arch/libarchive-3.2:=
+	introspection? ( dev-libs/gobject-introspection )
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/pango
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	gtk-doc? ( dev-util/gi-docgen )
+"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+${PN} is a frontend for several archiving utilities. If you want a
+particular archive format support, see ${HOMEPAGE}
+and install the relevant package. For example:
+7-zip   - app-arch/p7zip
+ace     - app-arch/unace
+arj     - app-arch/arj
+brotli  - app-arch/brotli
+cpio    - app-alternatives/cpio
+deb     - app-arch/dpkg
+iso     - app-cdr/cdrtools
+jar,zip - app-arch/zip and app-arch/unzip
+lha     - app-arch/lha
+lzop    - app-arch/lzop
+lz4     - app-arch/lz4
+rar     - app-arch/unrar or app-arch/unar
+rpm     - app-arch/rpm
+unstuff - app-arch/stuffit
+zstd    - app-arch/zstd
+zoo     - app-arch/zoo"
+
+src_prepare() {
+	# File providing Gentoo package names for various archivers
+	cp -v "${FILESDIR}"/3.36-packages.match data/packages.match || die
+
+	default
+	xdg_environment_reset
+}
+
+src_configure() {
+	local emesonargs=(
+		-Drun-in-place=false
+		$(meson_feature nautilus nautilus-actions)
+		-Dnotification=enabled
+		-Duse_native_appchooser=false
+		-Dpackagekit=false
+		-Dlibarchive=enabled
+		$(meson_feature introspection)
+		$(meson_feature gtk-doc api_docs)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	if use gtk-doc; then
+		mkdir -p "${ED}"/usr/share/gtk-doc/ || die
+		mv "${ED}"/usr/share/doc/file-roller "${ED}"/usr/share/gtk-doc/file-roller || die
+	fi
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
--- a/app-arch/unrar/Manifest
+++ b/app-arch/unrar/Manifest
@ -3,9 +3,11 @@ DIST unrar-6.2.10.tar.gz 246383 BLAKE2B 6f7e7bf099f5a9de71c01b941c4cceaaf568709a
 DIST unrar-6.2.12.tar.gz 246918 BLAKE2B 3c7744ee5839b4d87362625a03f30e3cac3d74df988479692023b9c242c136044666ebf0470197b28b95171dae076faecf815ef50caffb747185b8433707612c SHA512 261ac3728f917f36a03c7c3c563d7775abdb06b598ab48a299d837e8fc0ca75ad885ec8e292aeb1775e87e775ed274e9e0f033001598229ec96db69d69824ddb
 DIST unrar-6.2.8.tar.gz 246249 BLAKE2B 3766f7ebd0379835cff7cce8bb2deaf86d3de7c4a37d211d8a41effeb13a5a9efc53deabb5f10cd7f49d8e144cd9c1a93cce2ca3ae74e8a2142ab3ae97ab4759 SHA512 9b956d0c4b6a13f9ff4d9e57de7284dc879070746e3792e7640481a5b5b8336142b21c4d0c66c64627630cafbed0ff019a41b8f8536299ac7cbfdb933f92f75a
 DIST unrar-6.2.9.tar.gz 246388 BLAKE2B 495af1b78d2213c6bac0e75462b3d5e9fc3bfea809bcbb672216da47cd483bcc5867b504358125c51147a0e1869568c8a822946ca8148f204eeb087671029d9d SHA512 80424348946a56b47c107b2cd78c8bc7ce7f223a4d923b137860ec50678c4f279114dd7cdc9eb6a2fa6ff8c8a059ab8d35e16e3feae9dd1433fe51479501b61c
+DIST unrar-7.0.7.tar.gz 258219 BLAKE2B 06897428ef6ae9b2e6ef3183f25c06447386c7b5ce1c1438ad0119507ccbd2f2b62ce9d45c4dc73241db4440a1f96c7d9a9f3f542c0a7967df9c08b8cd3141cb SHA512 7151a42742d4c34a8f03c58dae471f80788b76adbb52188759b7fc7357757f88fa9d980de006ce48732c40f326b92b79fb069e807c2b66d4387ee60433a8accb
 EBUILD unrar-6.2.10.ebuild 1757 BLAKE2B c32e0b9eeeb17edd6da47b44c48bda3c80e4336b90bf72bdbb14ad832f0c606a9a9ed4db73fd9cb13754ee0642648463369c2b2bbcdac19e026449793f2894d4 SHA512 dd6d4fd175014f57cde71ee88e877f27a3aaabb8987a0e22f9c9ca1eb9a4de8103fb2bbcf3cee74c8cc59e8ac3b53f2dd87592d6ff4b0dfbb27a0f198932fa84
 EBUILD unrar-6.2.12-r1.ebuild 2691 BLAKE2B ef37f5df5841ab3234966ef1e9101b451bc6004f6bb9a8f6838c7e1fd3a9ffaecac58d650e3eabb6f833b23ff1fc3ac698566ebf5074ebca3f161c98a8510a13 SHA512 3dee6dc18d9da3afd07bbc7a9f70f317d594f127daf61fe214275ef8c01b362ace4b35c8f12e2f3b2dd3ab4287e7a977f17b8d6dd1d2b4d3547e5e3bbe5ec7f5
 EBUILD unrar-6.2.12.ebuild 1764 BLAKE2B 6c5a664b281463eeda4fac4820e949918a9246d09bea462457634ffbbfcea66ef0f816fb60d98bee3b2888044728affd3d8063214bc91be5a4cf5ca94fb55185 SHA512 edbd86ac83a32d95a49d5e74664fee4e15dd61a38abbc4bda1c8f8773b868c7f9ec463613e6eb327bcf255d16f166699f03a8d4049ac840d152e373ef568f8c6
 EBUILD unrar-6.2.8.ebuild 1757 BLAKE2B c32e0b9eeeb17edd6da47b44c48bda3c80e4336b90bf72bdbb14ad832f0c606a9a9ed4db73fd9cb13754ee0642648463369c2b2bbcdac19e026449793f2894d4 SHA512 dd6d4fd175014f57cde71ee88e877f27a3aaabb8987a0e22f9c9ca1eb9a4de8103fb2bbcf3cee74c8cc59e8ac3b53f2dd87592d6ff4b0dfbb27a0f198932fa84
 EBUILD unrar-6.2.9.ebuild 1764 BLAKE2B 6c5a664b281463eeda4fac4820e949918a9246d09bea462457634ffbbfcea66ef0f816fb60d98bee3b2888044728affd3d8063214bc91be5a4cf5ca94fb55185 SHA512 edbd86ac83a32d95a49d5e74664fee4e15dd61a38abbc4bda1c8f8773b868c7f9ec463613e6eb327bcf255d16f166699f03a8d4049ac840d152e373ef568f8c6
+EBUILD unrar-7.0.7.ebuild 2698 BLAKE2B c004f0e12585670892401699c56ff9a1ed488980082b61bb98fa8279d1720b54c979b95d7745e78483d62d03d2f6588cf3b8a946fe9d5eee4788cbcbb29fae83 SHA512 16c9bf306cb1639e9da5342fb9b7ab76f8c83b294ca6fcd902f8001558b7db35d67cb33f3ea2f1d429fa18d523612d5a5254ba2cc85b698ed616788d544d7c5b
 MISC metadata.xml 409 BLAKE2B a84cfacf4a852caa6f6389b380eeb700e1c44c4af68cb2568a27db21c2b577838d9c57269dcdb5f08dfa989617eca978520082d36153ea503a5033c4cc9446af SHA512 fcdf5a345b3eb2b5093b60def127dd48fed068bf5caa92dc52524b4e398d49c39d8ee686b3f0695c781ab2d0d3ba486baec23f74f80e581b7a2f77e0c5709eaa
--- a/app-arch/unrar/unrar-7.0.7.ebuild
+++ b/app-arch/unrar/unrar-7.0.7.ebuild
@ -0,0 +1,79 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib toolchain-funcs
+
+MY_PN="${PN}src"
+
+DESCRIPTION="Uncompress rar files"
+HOMEPAGE="https://www.rarlab.com/rar_add.htm"
+SRC_URI="https://www.rarlab.com/rar/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/unrar"
+
+LICENSE="unRAR"
+SLOT="0/7" # subslot = soname version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
+PATCHES=( "${FILESDIR}/${PN}-6.2.6-honor-flags.patch" )
+
+src_prepare() {
+	default
+
+	local sed_args=( -e "/libunrar/s:.so:$(get_libname ${PV%.*.*}):" )
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		sed_args+=( -e "s:-shared:-dynamiclib -install_name ${EPREFIX}/usr/$(get_libdir)/libunrar$(get_libname ${PV%.*.*}):" )
+	else
+		sed_args+=( -e "s:-shared:& -Wl,-soname -Wl,libunrar$(get_libname ${PV%.*.*}):" )
+	fi
+	sed -i "${sed_args[@]}" makefile || die
+}
+
+src_configure() {
+	mkdir -p build-{lib,bin} || die
+	printf 'VPATH = ..\ninclude ../makefile' > build-lib/Makefile || die
+	cp build-{lib,bin}/Makefile || die
+}
+
+src_compile() {
+	unrar_make() {
+		emake AR="$(tc-getAR)" CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" STRIP=true "$@"
+	}
+
+	unrar_make CXXFLAGS+=" -fPIC" -C build-lib lib
+	ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname) || die
+	ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname ${PV}) || die
+
+	unrar_make -C build-bin
+}
+
+src_install() {
+	dobin build-bin/unrar
+	dodoc readme.txt
+
+	dolib.so build-lib/libunrar*
+
+	# unrar doesn't officially install headers, but unofficially, software
+	# depends on it anyway. There is no standard for where to install them,
+	# but the most common location (shared by nearly all vendors) is "unrar".
+	# FreeBSD alone uses "libunrar". Gentoo formerly used "libunrar6" and
+	# had a compat symlink for FreeBSD, then passed the compat location in
+	# ./configure scripts e.g. for sys-fs/rar2fs. Software in the wild
+	# seems to expect either "unrar" or "libunrar".
+	# See: https://bugs.gentoo.org/916036
+	#
+	# We now use the "standard" (hah) location, and keep the compat symlink but
+	# change the destination. The version-suffixed location lacks utility, but
+	# we would keep it if we could, just in case -- unfortunately portage is
+	# buggy: https://bugs.gentoo.org/834600
+	#
+	# Hopefully, no one has ever actually used it and therefore this does not
+	# matter. The odds are on our side, since it periodically changed location
+	# arbitrarily.
+	insinto /usr/include/unrar
+	doins *.hpp
+	dosym unrar /usr/include/libunrar
+
+	find "${ED}" -type f -name "*.a" -delete || die
+}
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
--- a/app-crypt/ccid/Manifest
+++ b/app-crypt/ccid/Manifest
@ -1,6 +1,9 @@
 AUX ccid-1.5.4-remove-flex-configure-dependency.patch 318 BLAKE2B 3bdd4d48a01c919392dea0b64077069c03165f15c6965bb98d92154f2af6812c22d37a8146cc5ae7f98ee74c546854410f6ce6d6de05963dd2c25d6e199b9885 SHA512 12d4d547acd8bf05ac6fc261e1dcda0c0186db4dd808d892c63a904236fc66c4c839505bb9b5e42642e83d5f35e5d505514f879608be0f64dd5884de5d8c43c0
+AUX ccid-1.5.5-remove-flex-configure-dependency.patch 293 BLAKE2B 3751cb537db0574557f370f93888ca7225e8bbd7451df907a5fc0e64c097a52c99c01f389631f5a105f915d6a8bbf46383baf130173b8dc04aecc7fe4ecb5e31 SHA512 6dc40cd954f58b588fe0ba7203449753d09b21dd559b2cef8f9b6abc7ee7bff180766900094c07895249fdd856f3b0463b25ba0ecebd732ea06a1036ca420a00
 DIST ccid-1.5.1.tar.bz2 702586 BLAKE2B 7b9e3c6daf03c186f34ac9b13bd960293a6481f9237ee52937ece1040bd3a79b7dab318e1244205a7feae992261ab5e82292d80ae023a4f621e0e7af7cdb9df5 SHA512 492bde96f5752e2a5316693c44e35e2d041785a00d15e094905c0aafad392f5329009d12801899367276328a582936ee53a1c5239c1813c4536001cb8a608f2e
 DIST ccid-1.5.4.tar.bz2 706834 BLAKE2B 8b7f08145808ac94d085eef62c204f8146892cb11f2ce811e46e674272cab016d602afb945c6e808ce3957a80e847c0de2815fedaf15fc8c935cafaccf102762 SHA512 4b30f4768aebf49486a1b1e959615fa077bd393bfdd9e52c15bdc8d6ed63ce27fa7cf82a067d1f80d8b3534c66194036925d3fea5af64b6a775779d38267c757
+DIST ccid-1.5.5.tar.bz2 708374 BLAKE2B a82986ead2dbb3241ef419ad16eb0fac835c5ab4fa988e5ee53cd1608a30a9381210a6fd013b6a059ca2835d55b4a41afa4064575e91b8eb356bff6d01d19add SHA512 9d2aebe645a5880bfad7d420ddab96811d1fd989c79afa28f5471ae53f36b6d45ee5e13b32ac4afcf59fc762ae835db7e6312ad6642b263158c2d9a30c7651bd
 EBUILD ccid-1.5.1.ebuild 940 BLAKE2B da6ac353e97b916126ef0990a80be03a92105c38e1ed4dc1893fad853df419188b10d381bc23d810a083427a0b35dea9066b705baf868ccb2d4bab1dfa39fec0 SHA512 e0264beda6138afc794d401cb2f0763820bce74047532063a113ebc072121e3e20221da74a633805a738a760272c38fc0e793456d115c97230d99e8e592791f7
 EBUILD ccid-1.5.4.ebuild 1062 BLAKE2B 8d448067c0c60c9484d59632dd5f590c094ddc21c05db31e7c6671150d7f7167682531d726533592ff2cf9fc76efcf61b546a0fc4495ff2584a70ac3aba65cb1 SHA512 656ac991b6b5a28f5540b9a95ccb8b87ea0c53873ee592f886100629d9085aa3b3b6a994c402034aad34b8b72ae798739168e17c47321260a40e592fa2d9d3d5
+EBUILD ccid-1.5.5.ebuild 1067 BLAKE2B f3c4deb3ed00e0272b48c2f109e0be507c1c652179cf6f24486840266642240d0b3071bc086c94966d045d23a572f5c8b12ca6f691778a413d919dff5eea0223 SHA512 fc9fed5771af1c895c40d6c5caa62c099db15baecb00d6014e4d8bd8f8d031ac6e0a1a7515d4c3fd1fa3a1b78a6a3f51913acbc2bd6ae43787aa6f70f255328a
 MISC metadata.xml 551 BLAKE2B 6290f9b5be875fb339b7414b02595a034946c7f612fc4f6b5f7edba4f88697181af0ed26231cd27ade41f5536aa62df26ee2bea002fc69cd716a648f45268cf5 SHA512 e7a7f47db4aba8712a7ea5c7efd63c76e0f5712588bca7dd9b8e7755f51cad0298a087ee7bedfcdc51b84866671f1436e2228359f1f2fbfe647f2e6a9f1e2ae5
--- a/app-crypt/ccid/ccid-1.5.5.ebuild
+++ b/app-crypt/ccid/ccid-1.5.5.ebuild
@ -0,0 +1,55 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools udev
+
+DESCRIPTION="CCID free software driver"
+HOMEPAGE="https://ccid.apdu.fr https://github.com/LudovicRousseau/CCID"
+SRC_URI="https://ccid.apdu.fr/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="twinserial +usb"
+
+RDEPEND="
+	>=sys-apps/pcsc-lite-1.8.3
+	twinserial? ( dev-lang/perl )
+	usb? ( virtual/libusb:1 )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-remove-flex-configure-dependency.patch
+)
+
+src_prepare() {
+	default
+
+	eautoconf
+}
+
+src_configure() {
+	econf \
+		LEX=: \
+		$(use_enable twinserial) \
+		$(use_enable usb libusb)
+}
+
+src_install() {
+	default
+	udev_newrules src/92_pcscd_ccid.rules 92-pcsc-ccid.rules
+}
+
+pkg_postinst() {
+	udev_reload
+	einfo "Check https://github.com/LudovicRousseau/CCID/blob/master/INSTALL"
+	einfo "for more info about how to configure and use ccid"
+}
+
+pkg_postrm() {
+	udev_reload
+}
--- a/app-crypt/ccid/files/ccid-1.5.5-remove-flex-configure-dependency.patch
+++ b/app-crypt/ccid/files/ccid-1.5.5-remove-flex-configure-dependency.patch
@ -0,0 +1,13 @@
+Bug: https://bugs.gentoo.org/221361
+Reverts upstream commit eec7cdf0 & 41270c2
+
+--- a/configure.ac
+++ b/configure.ac
+@@ -33,7 +33,5 @@
+ AC_PROG_MAKE_SET
+ AC_PROG_LN_S
+-AC_PROG_LEX([noyywrap])
+-AS_IF([test $LEX = ":"], [AC_MSG_ERROR([no lex or flex found])])
+ AM_PROG_AR
+ PKG_PROG_PKG_CONFIG
+
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
--- a/app-editors/hyx/Manifest
+++ b/app-editors/hyx/Manifest
@ -1,4 +1,6 @@
 AUX hyx-ldflags.patch 1013 BLAKE2B 829d0597ea4bddcbd0ed289aef1e92f667ffaf88bb57a82491c2ca0baae200cba1dd3d0c244d2e9e74bf82d4bb08e0db3252d9e3c7259e487d3e89c82ef00e62 SHA512 7ad16481d50940755422b473d8e52c03f44a14c4c369fe9c36c46a17180cfc3f4c567392d6f5328ba6491c86dff529b7d5db40ffb1100e84c0738c1e9b694faf
 DIST hyx-2021.06.09.tar.xz 13864 BLAKE2B 2c97364e1ae185e7dd63fdfb452637cb68b8ab0d76d0009ce515d6f0fe709d38b910f86dfa465ac6843c88feb997dfdc3c736e21bb0b4265a39440c054f75251 SHA512 43f990e29ce097f8e2378a4511a3097e2576fd72e16f3b5c81688702487c8715e7189cb4a368e344c5440a90a1c759d2f76e7831ab401fa814f7e5ff7e145bd8
+DIST hyx-2024.02.29.tar.xz 13964 BLAKE2B 8333f6fa1a2be76152d9753fd0c759bd82679cb09d936df5e4a6caba87c5ff81c141a5d47f79047601bbd85a1efd0f371a111db14a019c7fc6da4ed095a312a5 SHA512 b5c17b045d1c97106212745b1bb4c4052cfe7ac5a28ec0a2240764785410d7e68292d0ff976fbdc58172cd9433ce49b1cad89b767e09d5d6207088a6a60b4e85
 EBUILD hyx-2021.06.09.ebuild 501 BLAKE2B 155576583b33e417d0ae49801a4c73ae5bf15e4f8ad21abd8ba90317cb2c94eb8fdd8cbe56a9e6400d2d14227673ae283fcff4ac0cf970c2af3287fadd4bb122 SHA512 429dd38525f91a0dc1772edb9b381740d179da2e839cc2656d6391b283fbef7e2f7be984b944084a4401e4455f831ba223c889ce4181ccc6b4cd1a1e04536353
+EBUILD hyx-2024.02.29.ebuild 405 BLAKE2B 12476ac949877a8324b5180ef0f5eb344f3009d26616d74c41f32cfe00e6ad65aa7688ca9747d8395500f8d7c26e4e6dc20105e04e85fe7b30ad099887fd5e66 SHA512 03fccdc79d0f63dd09b4e502b0926d8b67d87520cde4b32156313e2344865ecb51201d39bb91d47bdc2cde7500a03ce0132a9500147b0a2fd80d523c418244f6
 MISC metadata.xml 411 BLAKE2B 065732e0003a64a4d9357f4e4a1165fe2fe8816fef95b006aab0409614e4e2c52e0aec9a2b7df22f22b828d5d0cf583a201f39b2197cb7104afcad49c68b6e64 SHA512 1c8ae48ab439e36b4c5e1bbbb1fec9f8113eafb0fde2a994ee64e9272b2209ec073a86ee15083d640d8cc8aafa4b1d9d289719fe77e0a87424314f02f74f7034
--- a/app-editors/hyx/hyx-2024.02.29.ebuild
+++ b/app-editors/hyx/hyx-2024.02.29.ebuild
@ -0,0 +1,22 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="A minimalistic console hex editor with vim-like controls"
+HOMEPAGE="https://yx7.cc/code/"
+SRC_URI="https://yx7.cc/code/hyx/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+src_compile() {
+	CC=$(tc-getCC) emake
+}
+
+src_install() {
+	dobin hyx
+}
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
--- a/app-emulation/firecracker-bin/Manifest
+++ b/app-emulation/firecracker-bin/Manifest
@ -2,6 +2,9 @@ DIST firecracker-v1.5.1-aarch64.tgz 9086440 BLAKE2B 30777522bdb23e80bc3a025691d5
 DIST firecracker-v1.5.1-x86_64.tgz 9411106 BLAKE2B 538b531ce5c8319dee042229a7cc7c44cdd2fc07c58c3089b6c2d29d10ad8a5a78f697b7781ac81bcf8b4127e778895ab72eed9e1e6febd410b6c0509c01ae1e SHA512 63a44fb79e9fb29abfbaa6c96550c5f2f361c3be5e188bb4562b089b4d3f1f4ab3ef60ad3ab163e961857e95090401dc4df859d2dd2a5f1a1372ed663188cfa3
 DIST firecracker-v1.6.0-aarch64.tgz 9105124 BLAKE2B bcc77e6701a4b9c7d80d7e60b13d4945d5f76918cc1741035f26df5af05c4c579802444c90c8972a7985d4df8e10f2b9954b5889eca92f5d95b02751481084db SHA512 71608a46bdb5be5240d4a88e812c13e753d81e4f4813a818ebfd782934add2c3769bd71788f5e2bed1a6e1d9bcfc3a914e018f1682cc6806012c3e283e44f401
 DIST firecracker-v1.6.0-x86_64.tgz 9425451 BLAKE2B bae5eb960c6d575724915cfd4cb50cdc85d6be44b47271a5d68662b7ce86a7356aad215097214b7d32dad9051f385188d83592588be1addc15727c633f10e4d1 SHA512 a00b0d1b8da02b167627169d316b6a88bd44b1f42eb2cbebad5c355485f2456288d2062cb63b1ddc4d636ae8f4fad3a15dc9404b5347e746a7b416758d6507d5
+DIST firecracker-v1.7.0-aarch64.tgz 8951358 BLAKE2B 813be9e38e318233b3b574e21e3f07e3eab82eba1a22ca2082a7e2b9312b8022fd288ac4b72dbfa82f8a8ab561e4877553c249913d290b0701773d53a28296a7 SHA512 1b78353e204569acace417a95bfd2075f909205d59c32cbce18438751d5aeaae8ac3e3d3791d153a30337037c01fd6622793aa200a7e21d51f98a886123c545d
+DIST firecracker-v1.7.0-x86_64.tgz 9038632 BLAKE2B 6473113f2cc8225fdf8fc6f8612874c46fda05c13ebda040b7998554fda3e9cc69fbfae9481dc9e5b3100f05b50a82525810deccebaf45665d67aca7ebc0dc23 SHA512 cca5390c81bb9b78865608729840f12a1e9b9ed072859853e1f2853312dc62a78f0206fa007174c5fc18a7bf7d6e4b905e954ecdf6c3b78782d65e9801a45a0b
 EBUILD firecracker-bin-1.5.1.ebuild 2844 BLAKE2B 12205b3bff19d4525d0feaf39d09c895ce0a11e5788ce3e91a1dbcc7ccaa91ffe767452da8e054829579fc9f828f2fe0450b9b0229dcf9959498a4c589b3ba87 SHA512 650cb54fc99ab9e59fc81ec9effab79021e558af12a0bb10dc2b2e8083bdf6ddd3cb7449f54cba3342a79f916bdee7191e7e4f1042ac1da380af910e4e54542b
 EBUILD firecracker-bin-1.6.0.ebuild 2844 BLAKE2B 77ce2d062b074370caaf1b5bb42c38667ed223c91cce738c39c0b6eec888d98073901743a07a46ef120f4c93013cef06183a73172f4f5dfcd7d583202f83bc20 SHA512 08c241b57db7423b11f1277194c3090150810c105cf270b6e1251d7fb986417b66ab15ae444e0388d1df19146799dd54520193081057934e60599d7856ada3d4
+EBUILD firecracker-bin-1.7.0.ebuild 2844 BLAKE2B 77ce2d062b074370caaf1b5bb42c38667ed223c91cce738c39c0b6eec888d98073901743a07a46ef120f4c93013cef06183a73172f4f5dfcd7d583202f83bc20 SHA512 08c241b57db7423b11f1277194c3090150810c105cf270b6e1251d7fb986417b66ab15ae444e0388d1df19146799dd54520193081057934e60599d7856ada3d4
 MISC metadata.xml 512 BLAKE2B 5088571672374708995301bad5f1427c9f33d89104ca971134bc5fc1afb70a6513a27ec88b938716c538db7ef8ff15b74fc7fce3aa70de49574fdbcd00a81a72 SHA512 dcb061c53e06929eb8ff6850a610ad8df17364089575b7d0f7f7e0a7ff2becb6cd446a666b2015745460f5a33f67e0a6f8df534bb03081866c0fb35bddb3460d
--- a/app-emulation/firecracker-bin/firecracker-bin-1.7.0.ebuild
+++ b/app-emulation/firecracker-bin/firecracker-bin-1.7.0.ebuild
@ -0,0 +1,87 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-info
+
+DESCRIPTION="Secure and fast microVMs for serverless computing (static build)"
+HOMEPAGE="https://firecracker-microvm.github.io https://github.com/firecracker-microvm/firecracker"
+SRC_URI="
+	amd64? (
+		https://github.com/firecracker-microvm/firecracker/releases/download/v${PV}/firecracker-v${PV}-x86_64.tgz
+	)
+	arm64? (
+		https://github.com/firecracker-microvm/firecracker/releases/download/v${PV}/firecracker-v${PV}-aarch64.tgz
+	)"
+
+LICENSE="|| ( Apache-2.0 MIT Apache-2.0-with-LLVM-exceptions ) MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+RESTRICT="test strip"
+
+RDEPEND="acct-group/kvm"
+
+QA_PREBUILT="usr/bin/cpu-template-helper
+	usr/bin/firecracker
+	usr/bin/jailer
+	usr/bin/rebase-snap
+	usr/bin/seccompiler-bin
+	usr/bin/snapshot-editor"
+
+S="${WORKDIR}"
+
+pkg_pretend() {
+	if use kernel_linux && kernel_is lt 4 14; then
+		eerror "Firecracker requires a host kernel of 4.14 or higher."
+	elif use kernel_linux; then
+		if ! linux_config_exists; then
+			eerror "Unable to check your kernel for KVM support"
+		else
+			CONFIG_CHECK="~KVM ~TUN ~BRIDGE"
+			ERROR_KVM="You must enable KVM in your kernel to continue"
+			ERROR_KVM_AMD="If you have an AMD CPU, you must enable KVM_AMD in"
+			ERROR_KVM_AMD+=" your kernel configuration."
+			ERROR_KVM_INTEL="If you have an Intel CPU, you must enable"
+			ERROR_KVM_INTEL+=" KVM_INTEL in your kernel configuration."
+			ERROR_TUN="You will need the Universal TUN/TAP driver compiled"
+			ERROR_TUN+=" into your kernel or loaded as a module to use"
+			ERROR_TUN+=" virtual network devices."
+			ERROR_BRIDGE="You will also need support for 802.1d"
+			ERROR_BRIDGE+=" Ethernet Bridging for some network configurations."
+
+			if use amd64 || use amd64-linux; then
+				if grep -q AuthenticAMD /proc/cpuinfo; then
+					CONFIG_CHECK+=" ~KVM_AMD"
+				elif grep -q GenuineIntel /proc/cpuinfo; then
+					CONFIG_CHECK+=" ~KVM_INTEL"
+				fi
+			fi
+
+			# Now do the actual checks setup above
+			check_extra_config
+		fi
+	fi
+}
+
+src_compile() { :; }
+
+src_install() {
+	local my_arch
+	if use amd64; then
+		my_arch=x86_64
+	elif use arm64; then
+		my_arch=aarch64
+	fi
+
+	dodoc "release-v${PV}-${my_arch}/firecracker_spec-v${PV}.yaml"
+	dodoc "release-v${PV}-${my_arch}/seccomp-filter-v${PV}-${my_arch}.json"
+
+	newbin "release-v${PV}-${my_arch}/cpu-template-helper-v${PV}-${my_arch}" cpu-template-helper
+	newbin "release-v${PV}-${my_arch}/firecracker-v${PV}-${my_arch}" firecracker
+	newbin "release-v${PV}-${my_arch}/jailer-v${PV}-${my_arch}" jailer
+	newbin "release-v${PV}-${my_arch}/rebase-snap-v${PV}-${my_arch}" rebase-snap
+	newbin "release-v${PV}-${my_arch}/seccompiler-bin-v${PV}-${my_arch}" seccompiler-bin
+	newbin "release-v${PV}-${my_arch}/snapshot-editor-v${PV}-${my_arch}" snapshot-editor
+}
--- a/app-emulation/vagrant/Manifest
+++ b/app-emulation/vagrant/Manifest
@ -1,6 +1,6 @@
 AUX vagrant.in 1893 BLAKE2B d1e66c07e2b923ae46cfd1b4ff50478ea6628710533df1b3b82f4f9eef4692d0a090eae0703664001a1d29418972b32f917cbc10314df95dbb981036b20be18e SHA512 d7d5e38cb10ea183ba4dacdbcdedd950eb05502fb1992f6d300bd70724b09881c934f46ba37b28fad56624ca2f6c604d024ef9d6dbd3e137c1f45b3e280026db
-DIST vagrant-2.3.7.tar.gz 3296042 BLAKE2B 720e16bed6f9088558f7a8a2af7925946c71d771fc732fd43fc277f160faa1d2c86bdb3eaab6ec0cf569e945a30593655f3551608f708ee74203392ba61ce11f SHA512 a65b1c48fad6eb04fc0097dc7c8dc4e37467c5e6406d1d384a017b127704ebd6872cd0cc69ef38b393c98d6fd58c39c806e7ef439c2b55a15bf66c3647595cc2
 DIST vagrant-2.4.0.tar.gz 3334706 BLAKE2B 62b720a83646e94c7608a2f8aa7acf985aea0a3532e0474aa45c229b054ea40a6e0b23ccdbfdbf7e27e3da9a4db5f57407656fe103ead0f5a98dc27dae5ebb57 SHA512 94e866b012303b65d33b72034f08305fc04c12be40aeb95247b786b53d14259b7b5062b372e3c87523390f0539848a0eafd45b28ad16a27badecd8888541243b
-EBUILD vagrant-2.3.7.ebuild 3378 BLAKE2B 1fec2008b52a3634cde5e922ed7b330dd7fdf44324843f7514a12ff813b9bae49646baae8a001d82cc0e4030b0fff9987565ca228e05369a2122aeaaf0b28bb0 SHA512 971543d0972d4ddd5442a874f0c9952569fe381ce8c07c284ab013a65b715b48271c1f9f92077219a5613bf800c80b7bcbab2f7b3643002103ef7ca43284820f
+DIST vagrant-2.4.1.tar.gz 3342333 BLAKE2B c24c7c30364cb9f03f6e43422ff05954dd877e22a5e244f62cd9ce4925bf10d064fc678dee40a7affd1b6cf49c82d2d2208ee47b92baa0cda4194419ed501be4 SHA512 12ce4a2161e99970f212f265bbc79d6af38bccc44feab95db8db3b8194e8080acb846d680d1006a4e3fb1beabac33f154a7507f43223f675ba1db09a24591893
 EBUILD vagrant-2.4.0-r1.ebuild 3427 BLAKE2B 2493fdfdccf53b0f64317eb8d6e94174f21e6d775f73a4e2a51db33475f6b55af5dbc60bfaaf7a48d7acdec9f6c46f7cebbd1b4319049c3d4a49b6c8911a7096 SHA512 44214078e9b9d3f70d774399ac88792886878bc0364b7efe67001f57942bf572f14c0380bab36bb434018e35ebb4e5d647c28b626ed1af495c1b14825294a67e
+EBUILD vagrant-2.4.1.ebuild 3434 BLAKE2B 007d7f2b909f8b4faa204b7a95ca51d2d6fcc9a6f86686e1ab7ac06d2be68f1c9dff65a3b6f6df50ea8045ca64fc45ef66f7edd1d08b74911ca8c872de214347 SHA512 e4d13b5e0f1dda99351c702c1d56d775952f0b10cb6d8167da30497475a841e219eb15035bec617052b5318df79fc7da9f8531b6270ff45cd62d15689673fa44
 MISC metadata.xml 455 BLAKE2B 01bf09c745e55dcdf7241dfdae1349fbb403f61249c0b05944347cb2f5cdf7d6a5fc7807a3f351145a41e4a5a94a5ba22195acee7c352539144277fff4696faf SHA512 1117ae7aca289842ab10ec2cf4443bf36ef7bdcd9efd0b6d1df1879f253cc137fea027a939c52f8d6990cae7a83bffafeb69f7b10660f27d278f19578ecccabd
--- a/app-emulation/vagrant/vagrant-2.4.1.ebuild
+++ b/app-emulation/vagrant/vagrant-2.4.1.ebuild
@ -1,11 +1,11 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=8

-USE_RUBY="ruby31"
+USE_RUBY="ruby31 ruby32 ruby33"

-RUBY_FAKEGEM_EXTENSIONS=(ext/vagrant_ssl/extconf.rb)
+RUBY_FAKEGEM_EXTENSIONS=(ext/vagrant/vagrant_ssl/extconf.rb)
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
 RUBY_FAKEGEM_GEMSPEC="vagrant.gemspec"
 RUBY_FAKEGEM_EXTRAINSTALL="keys plugins templates version.txt"
@ -19,7 +19,7 @@ DESCRIPTION="A tool for building and distributing development environments"
 HOMEPAGE="https://vagrantup.com/"
 SRC_URI="https://github.com/hashicorp/vagrant/archive/v${PV}.tar.gz -> ${P}.tar.gz"

-LICENSE="MIT"
+LICENSE="BUSL-1.1"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64"
 IUSE="test"
@ -37,7 +37,7 @@ ruby_add_rdepend "
 	>=dev-ruby/ed25519-1.3.0
 	dev-ruby/erubi
 	>=dev-ruby/googleapis-common-protos-types-1.3.0
-	dev-ruby/grpc
+	>=dev-ruby/grpc-1.59.2
 	>=dev-ruby/hashicorp-checkpoint-0.1.5
 	>=dev-ruby/i18n-1.12:1
 	>=dev-ruby/listen-3.7
@ -51,7 +51,7 @@ ruby_add_rdepend "
 	>=dev-ruby/rexml-3.2.0
 	>=dev-ruby/rgl-0.5.10
 	>=dev-ruby/rubyzip-2.3.2
-	>=dev-ruby/vagrant_cloud-3.0.5
+	>=dev-ruby/vagrant_cloud-3.1.1
 	>=dev-ruby/ipaddr-1.2.4
 "

@ -59,6 +59,7 @@ ruby_add_bdepend "
 	>=dev-ruby/rake-13.0.0
 	test? (
 		~app-emulation/vagrant-${PV}
+		dev-ruby/fake_ftp
 		dev-ruby/rake-compiler
 		>=dev-ruby/rspec-3.11
 		>=dev-ruby/rspec-its-1.3.0
--- a/app-emulation/virtio-win/Manifest
+++ b/app-emulation/virtio-win/Manifest
@ -1,8 +1,8 @@
 AUX README.gentoo 707 BLAKE2B 1a33b734540d0321aa91e4ad6b05f9f10b13fa2fdfe3ac28c2c54432bb5d0c773ae07e39c3c6e6e3da21b39f7b63d2df82ed1dd1d306133c2c0b9d407cfdffdc SHA512 42aa73f1a189521f67addfff3da3eb5ad6df81d5525284338812862dcd6f57b9be6af7625cec1a828318ac453de8d361480daf864a6cf32b713e316847bec722
-DIST virtio-win-0.1.225.iso 532060160 BLAKE2B ed0fbf486f0c576bed25f02ea09cfd957a00a42d85063feb1dd2977e2cd816601fe2b013e00abbccf07eb765da3b64b88b5675c95175fdc971a20d784c28d503 SHA512 c0a940ca747983d88876f805f7266a8aae61b83857983738d06e9d555569d2b42a9cddb77d535b4f9dbc4b1099583f8b6844f13e4bd98ea1f0f6aec22c6c9be7
 DIST virtio-win-0.1.229.iso 534818816 BLAKE2B 29442b70e5809fc935940497b4bc021f6fe890beba97605b048e0c5236764d08bc164974be25bf8331136ebbdf664ea440efe1f219129a30a171134bfe369942 SHA512 e9ccb513b07cb28ab490f5d4e299d0d52ade956f82e1a708e91c1ee3af9b142fa144af0fe5287d3bbb369f586857791952de45d1241058073f5a59c1f2f913ca
 DIST virtio-win-0.1.240.iso 627519488 BLAKE2B e5bbf3be166508c437cfc9b7922e93f4229a63cf9cf5dffd0c8ee2836c084b92cb30c76e1cc60432508504df2874ca461481db6664823b11a76cec5186743c97 SHA512 24e0f3d9c25835f2633d2823dade95aae4884aed95a5142d87efeb4aaed48dbc04a82a34ac5310676853008e0de271dfa0747b4c619ed20fa72ffe2e93fadcf3
-EBUILD virtio-win-0.1.225.2.ebuild 857 BLAKE2B 4629d2dd3c87acccbcbc6d4344c19b74e774ef0adedc0359125e9e47db59584a85ac9fd1ecb5d81e450419a86d17d44de4938305b95e5146a82c1898f09ec9e6 SHA512 7d53ff1deda119da09d5a10d36e7060932a1174685c5c82525dbf948f02c7c0c11aa804ca97131f4073e388b203d781458447089cc7fd0ae7d0829f6dddef8ce
+DIST virtio-win-0.1.248.iso 732352512 BLAKE2B b3161f020f59eadabc685155ac3a7c402762adf84fa85bc2e4f468df31adf0204b248963a11b84b18520aa815e6907cfb1618a527875a4fd72b2c2e09fc1ce5a SHA512 16cc0c58b5df6c7040893089f3eb29c074aed61d76dae6cd628d8a89a05f6223ac5d7f3f709a12417c147594a87a94cc808d1e04a6f1e407cc41f7c9f47790d1
 EBUILD virtio-win-0.1.229.1.ebuild 857 BLAKE2B 4629d2dd3c87acccbcbc6d4344c19b74e774ef0adedc0359125e9e47db59584a85ac9fd1ecb5d81e450419a86d17d44de4938305b95e5146a82c1898f09ec9e6 SHA512 7d53ff1deda119da09d5a10d36e7060932a1174685c5c82525dbf948f02c7c0c11aa804ca97131f4073e388b203d781458447089cc7fd0ae7d0829f6dddef8ce
 EBUILD virtio-win-0.1.240.1.ebuild 858 BLAKE2B 5eb9258a937492dde09ad905011f76ec5a83a91d1422e4acb23cdf4ef9f178464b8ce86993009d1ca4be7640209d4bdd6d3c2f12799865eabc783fd9829844f6 SHA512 95a1e230a35a36097485e6fd24231940c7090b5f9d1a381e40803f00b9275db647f5b1969676f303f1afb5d81ca0af52da79fc1ba3bd24352c52d25ad2065b01
+EBUILD virtio-win-0.1.248.1.ebuild 858 BLAKE2B 660a1b09aefbbef731bec51b8c9de8ad56bea68037ee1f134b7b6d764fac891f68c9f934f1aafe28e98d47c07b48280d860158347ef703b946991d4106d5f7e8 SHA512 91242ed5ff8117e2a1290bc07eb0ceac39d25465c36a83a39afb04ceac6de8292cb1ba7cdb6185298291c2e30d8998e4c9bff921fd42ec732e4b7fa826415260
 MISC metadata.xml 411 BLAKE2B a720d6789e46cf48d3d2a668b1edbc8bb6d6b837eebd19b1adfcc557dbb1313fccdd8fa174af0cc4e742c0d7f29d5f9ebef3de3e779819ab82a1ce8fc5635e27 SHA512 3729f816fad822a562ff5a8a1345c2ca20f990d35af5565008ef98370872ee0f313d0e89f0de27d08793a212737d6dd6662ce4c22b3c2a2bc43f7c8a69db46a4
--- a/app-emulation/virtio-win/virtio-win-0.1.248.1.ebuild
+++ b/app-emulation/virtio-win/virtio-win-0.1.248.1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=8
@ -14,7 +14,7 @@ SRC_URI="https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/archiv

 LICENSE="BSD Apache-2.0 GPL-2 GPL-2+ GPL-3+ LGPL-2+ Ms-RL"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="~amd64"
 S="${WORKDIR}"
 INSTALL_PATH=/usr/share/drivers/windows

--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@ -7,15 +7,18 @@ DIST wine-9.3.tar.xz 30098792 BLAKE2B fa6f0c73f0886918b035557a37c0553feeea5692ae
 DIST wine-9.4.tar.xz 30166096 BLAKE2B bd65086e6f6e11bc6c7cd65dba6e6997911851f1a2f25cad0b4f8100d695df3c76b0799768ab9047dfd5d8afc7c749a5e5c88003d2f4ca69f417387cc06d527d SHA512 fbc927b04f75fe48e52efb6599ffc84f27f1a08d180386e782c94b37b54ab2a3540ed6cd387d7a59f5aca4df2c9ac3e3c127c3067c16e2357e57b4b0a0ced99d
 DIST wine-9.5.tar.xz 30371420 BLAKE2B c14ebf02f0f5b91bc2b2517ff3630f22c6af7fdc827c5d024d809a383a65446284a5349c8109835112f5353f361088f4f32de1a3d04299fbf39deacbc0e8e8bf SHA512 8ccad8f6e6b1428886dee9fae771796e2021b4122cd96464350352bede25421406e6a6a0fdd63d8b99b896db8dc529aa6e05d6ac7966bee49ce3055b18a8af91
 DIST wine-9.6.tar.xz 30261488 BLAKE2B 53115a8a80593856679718b2055340860221701bc82a784a111a992f5e67b031d7407a16f6df6d4da67f382f30c35d2dd82af2a671a058a76b621c91199e426e SHA512 cc2ea5597636da8d392d1d63b9c135679eff69ea671dc6b53b6f2d44a890aee0e17275174485f6e8dd99c7db737eb82a800a2b05c4966f15e28167c5a6098922
+DIST wine-9.7.tar.xz 30281616 BLAKE2B 4d27f6f2dfd088a0590bfce7228c7eca25b66a9a04706ddecb25af6364e83100c15a78c8d46f3294a42dc7f3503756506f752a02d7058a72ce16716994b334bc SHA512 0c15c3a0901162a386126f2dc987b276b379cc027fc72d9e31cf3122614742f876f30a5f24a495f546cd9c5bd5efce096bd9ca190d0f378fea3d42a298a06e80
 DIST wine-staging-9.0.tar.gz 9577631 BLAKE2B 0012978f54c618e73d407dd49dccff02853912d0c015098889802518e8c51b280f5d60e11291335dafc68944ee01cbcb7fd6c5825ef10ae1520c7b82d9846718 SHA512 362209fcadcf029152b681c76beb231d0cc8de1609b994094f1dc88ab871fddda08b3d8c2fe36ceb38909a9d634c1ade864ca0f28a6a7715ec286a8b2884981f
 DIST wine-staging-9.3.tar.gz 9672031 BLAKE2B 9613d3ac8aab4208e1f4392e7fdf0f673a6159751665b2f0ab868b9140edaf32f1d4bbb5efe75458e4cce910385ebe6cec2b898f172bd0e0de87bdc675bfe221 SHA512 56a92cd8bbc1ba7fda9fea9d998efac44d2a805d4ebb4253a37ecff8edd51852773f848556935f05418f488698e1ec4cc52a79327f7f5d77390af90f95f9bdf6
 DIST wine-staging-9.4.1.tar.gz 9482082 BLAKE2B 59f0b513c7df9c46a8f6ff034a2f67b92f4bb19cb1375a8ff979b7ab01223d425daf7047bd5166e946599bafe5e3ce7aa2670f893f8f6871e8c692dbe0577617 SHA512 897d9c292fc7d399591490fb53c62e80caab9a16619a261a84fa5b2f4a6ae5c389a6a39f29925532841c8c74254e80aa7cb764f60cf64cd431526b347df559ca
 DIST wine-staging-9.5.tar.gz 9526239 BLAKE2B a6f5a351a3979fc81a0d8c6325da4f08021d19eb7ac6ad52906a6fcf19552f01bdc8fbebc9b33fc82e14cdd6e6d50347dc7bc73e622d589d2e9eec5d577d3158 SHA512 8c756fe505092e21dd37c709ac3917c305b70881c05270f0e188ccdf9ff36b9fd224adad424d37c6919637d2af55afbfba49079eb5b6708a6cf4f2dd98966784
 DIST wine-staging-9.6.tar.gz 9522775 BLAKE2B 5598d408774e3142d6de5ccddccb68d8e1e4544c43b5691751599e6b86df6b8899f6113b8b58d75fb8e032a6c7aed9ffbb3ecb1553aa2d7593d69513e9a0177a SHA512 83691eb560c860d40669a524196a522007c76420b5b5076da4f446a4180fee7558ef228cf1f4179eb78a6d36c8ab78fd2784ffc879b0aacbef7c72a7f88e7ed2
+DIST wine-staging-9.7.tar.gz 9573710 BLAKE2B 34eee97f51268c07d649f0ed498b5e92bbc8bb1d8cee860040ee660d968307a7d9d3b59305567c50338d2ce97b3071f615b8782ca74716b42904ae4514404316 SHA512 3c5f100f715c6b3399c356b304b8eca1e51706e03782f2f834965474a7efeca4174ae806dff85080cded93501e9cfcd097eca43230d9425c78ae73a6f4485c76
 EBUILD wine-staging-9.0.ebuild 14876 BLAKE2B 72117e7bf8a228954afa8f549aebfac550e533c3ef5eb26a9c0c17d8136e2f8508cc96870df2e32829d71e27daf4346b4cf0ffc021aa7d5004d66e4b2493ae0d SHA512 1aa5cf1f5257edf7fb4cf70f22b34f5b1d0f01bf77a0bbaf00f9446f4f88ba2055477855cbe438a6d92b2cc2bd1503b3b45d91a65117b1e75876f0d23fc52c27
 EBUILD wine-staging-9.3.ebuild 15006 BLAKE2B 8190038ce61f0af3c495261ccadada7c8dc2326af4423b7b812ef5ce259b59d2b3e2a94175a9513aa266906f213ded51280a3505fdb234548f747df06bab9c38 SHA512 60de26f08aa1358355b278a1937d1a96c66499370cd94b3a9bbb54c5c0fdbea3a3c5e26ed4d9d43ffc1f8adb4dfc74ad668dc9d4e20a58559e54006041f37fa6
 EBUILD wine-staging-9.4.1.ebuild 15049 BLAKE2B b1bc45572f1955269a7580f2982d1ab359e0b7540d639336445b909db980b072c851a55d8e3b22ce44ce93b9a1d618b96c9f1b0f6f7197999412e67df2677316 SHA512 2ee2f358fc07be3a0267f9300c2a729c8280b2161c157c03580d73734303273181d018423119ea672822218e1ee1e0f585dfc639bed7f8a80c9556c5a54843ec
 EBUILD wine-staging-9.5.ebuild 15006 BLAKE2B 8190038ce61f0af3c495261ccadada7c8dc2326af4423b7b812ef5ce259b59d2b3e2a94175a9513aa266906f213ded51280a3505fdb234548f747df06bab9c38 SHA512 60de26f08aa1358355b278a1937d1a96c66499370cd94b3a9bbb54c5c0fdbea3a3c5e26ed4d9d43ffc1f8adb4dfc74ad668dc9d4e20a58559e54006041f37fa6
 EBUILD wine-staging-9.6.ebuild 14824 BLAKE2B 22a363996b6c63adb9ecf82937262b41908efd23473bcc32544c3823660f534b1ddc9ec9a1ca6541c1ea57c6c1d4ffc1917c09c91b7138b739e97bbabfdfa9d4 SHA512 d359a30c596af124fdf5fe337a27be59e161c1f7e5764a287ef288dfe7dae7d3f247f227d9fc1ab9fba0962976cb07ef8c673899855153f3d7d5d994137604ec
+EBUILD wine-staging-9.7.ebuild 14824 BLAKE2B 22a363996b6c63adb9ecf82937262b41908efd23473bcc32544c3823660f534b1ddc9ec9a1ca6541c1ea57c6c1d4ffc1917c09c91b7138b739e97bbabfdfa9d4 SHA512 d359a30c596af124fdf5fe337a27be59e161c1f7e5764a287ef288dfe7dae7d3f247f227d9fc1ab9fba0962976cb07ef8c673899855153f3d7d5d994137604ec
 EBUILD wine-staging-9999.ebuild 14824 BLAKE2B 22a363996b6c63adb9ecf82937262b41908efd23473bcc32544c3823660f534b1ddc9ec9a1ca6541c1ea57c6c1d4ffc1917c09c91b7138b739e97bbabfdfa9d4 SHA512 d359a30c596af124fdf5fe337a27be59e161c1f7e5764a287ef288dfe7dae7d3f247f227d9fc1ab9fba0962976cb07ef8c673899855153f3d7d5d994137604ec
 MISC metadata.xml 2659 BLAKE2B 8a80b12643e82b98b71bc408e2fd79736da01c8f7d914c7a592cb685893ea3896bc44fecf0160faec803b284d3f6bb38cf36fb4745d9d43e0e1ced8702fcaf9d SHA512 a271e537318a4e90236c195f1f8c24c3255b5465345246627797d37238e2b6292d0734a9ab19542ee34fc1e9312dc4418694992f5ce3c53310228cc6bf14ef90
--- a/app-emulation/wine-staging/wine-staging-9.7.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9.7.ebuild
@ -0,0 +1,472 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MULTILIB_COMPAT=( abi_x86_{32,64} )
+PYTHON_COMPAT=( python3_{10..12} )
+inherit autotools edo flag-o-matic multilib multilib-build optfeature
+inherit prefix python-any-r1 toolchain-funcs wrapper
+
+WINE_GECKO=2.47.4
+WINE_MONO=9.0.0
+WINE_P=wine-$(ver_cut 1-2)
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine-staging.git"
+	WINE_EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine.git"
+else
+	(( $(ver_cut 2) )) && WINE_SDIR=$(ver_cut 1).x || WINE_SDIR=$(ver_cut 1).0
+	SRC_URI="
+		https://dl.winehq.org/wine/source/${WINE_SDIR}/${WINE_P}.tar.xz
+		https://github.com/wine-staging/wine-staging/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="-* ~amd64 ~x86"
+fi
+
+DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging patchset"
+HOMEPAGE="
+	https://wiki.winehq.org/Wine-Staging
+	https://gitlab.winehq.org/wine/wine-staging/
+"
+
+S="${WORKDIR}/${WINE_P}"
+
+LICENSE="LGPL-2.1+ BSD-2 IJG MIT OPENLDAP ZLIB gsm libpng2 libtiff"
+SLOT="${PV}"
+IUSE="
+	+X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups dos
+	llvm-libunwind custom-cflags +fontconfig +gecko gphoto2 +gstreamer
+	kerberos +mingw +mono netapi nls opencl +opengl osmesa pcap perl
+	pulseaudio samba scanner +sdl selinux smartcard +ssl +strip
+	+truetype udev udisks +unwind usb v4l +vulkan wayland wow64
+	+xcomposite xinerama
+"
+# bug #551124 for truetype
+# TODO: wow64 can be done without mingw if using clang (needs bug #912237)
+REQUIRED_USE="
+	X? ( truetype )
+	crossdev-mingw? ( mingw )
+	wow64? ( abi_x86_64 !abi_x86_32 mingw )
+"
+
+# tests are non-trivial to run, can hang easily, don't play well with
+# sandbox, and several need real opengl/vulkan or network access
+RESTRICT="test"
+
+# `grep WINE_CHECK_SONAME configure.ac` + if not directly linked
+WINE_DLOPEN_DEPEND="
+	X? (
+		x11-libs/libXcursor[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes[${MULTILIB_USEDEP}]
+		x11-libs/libXi[${MULTILIB_USEDEP}]
+		x11-libs/libXrandr[${MULTILIB_USEDEP}]
+		x11-libs/libXrender[${MULTILIB_USEDEP}]
+		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
+		opengl? (
+			media-libs/libglvnd[X,${MULTILIB_USEDEP}]
+			osmesa? ( media-libs/mesa[osmesa,${MULTILIB_USEDEP}] )
+		)
+		xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
+		xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
+	)
+	cups? ( net-print/cups[${MULTILIB_USEDEP}] )
+	fontconfig? ( media-libs/fontconfig[${MULTILIB_USEDEP}] )
+	kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
+	netapi? ( net-fs/samba[${MULTILIB_USEDEP}] )
+	sdl? ( media-libs/libsdl2[haptic,joystick,${MULTILIB_USEDEP}] )
+	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
+	truetype? ( media-libs/freetype[${MULTILIB_USEDEP}] )
+	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
+	vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )
+"
+WINE_COMMON_DEPEND="
+	${WINE_DLOPEN_DEPEND}
+	X? (
+		x11-libs/libX11[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+	)
+	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+	capi? ( net-libs/libcapi:=[${MULTILIB_USEDEP}] )
+	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
+	gstreamer? (
+		dev-libs/glib:2[${MULTILIB_USEDEP}]
+		media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}]
+		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
+	)
+	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
+	pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
+	pulseaudio? ( media-libs/libpulse[${MULTILIB_USEDEP}] )
+	scanner? ( media-gfx/sane-backends[${MULTILIB_USEDEP}] )
+	smartcard? ( sys-apps/pcsc-lite[${MULTILIB_USEDEP}] )
+	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
+	unwind? (
+		llvm-libunwind? ( sys-libs/llvm-libunwind[${MULTILIB_USEDEP}] )
+		!llvm-libunwind? ( sys-libs/libunwind:=[${MULTILIB_USEDEP}] )
+	)
+	usb? ( dev-libs/libusb:1[${MULTILIB_USEDEP}] )
+	wayland? (
+		dev-libs/wayland[${MULTILIB_USEDEP}]
+		x11-libs/libxkbcommon[${MULTILIB_USEDEP}]
+	)
+"
+RDEPEND="
+	${WINE_COMMON_DEPEND}
+	app-emulation/wine-desktop-common
+	dos? (
+		|| (
+			games-emulation/dosbox
+			games-emulation/dosbox-staging
+		)
+	)
+	gecko? (
+		app-emulation/wine-gecko:${WINE_GECKO}[${MULTILIB_USEDEP}]
+		wow64? ( app-emulation/wine-gecko[abi_x86_32] )
+	)
+	gstreamer? ( media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}] )
+	mono? ( app-emulation/wine-mono:${WINE_MONO} )
+	perl? (
+		dev-lang/perl
+		dev-perl/XML-LibXML
+	)
+	samba? ( net-fs/samba[winbind] )
+	selinux? ( sec-policy/selinux-wine )
+	udisks? ( sys-fs/udisks:2 )
+"
+DEPEND="
+	${WINE_COMMON_DEPEND}
+	sys-kernel/linux-headers
+	X? ( x11-base/xorg-proto )
+"
+# gitapply.sh prefers git but can fallback to patch+extras
+BDEPEND="
+	${PYTHON_DEPS}
+	|| (
+		dev-vcs/git
+		(
+			sys-apps/gawk
+			sys-apps/util-linux
+		)
+	)
+	|| (
+		sys-devel/binutils
+		sys-devel/lld
+	)
+	dev-lang/perl
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	mingw? ( !crossdev-mingw? (
+		>=dev-util/mingw64-toolchain-10.0.0_p1-r2[${MULTILIB_USEDEP}]
+		wow64? ( dev-util/mingw64-toolchain[abi_x86_32] )
+	) )
+	nls? ( sys-devel/gettext )
+	wayland? ( dev-util/wayland-scanner )
+"
+IDEPEND=">=app-eselect/eselect-wine-2"
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+	__clear_cache # unused on amd64+x86 (bug #900334)
+	res_getservers # false positive
+)
+QA_FLAGS_IGNORED="usr/lib/.*/wine/.*-unix/odbc32.so" # has no compiled objects
+QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-7.17-noexecstack.patch
+	"${FILESDIR}"/${PN}-7.20-unwind.patch
+	"${FILESDIR}"/${PN}-8.13-rpath.patch
+)
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	if use crossdev-mingw && [[ ! -v MINGW_BYPASS ]]; then
+		local mingw=-w64-mingw32
+		for mingw in $(usev abi_x86_64 x86_64${mingw}) \
+			$(use abi_x86_32 || use wow64 && echo i686${mingw}); do
+			if ! type -P ${mingw}-gcc >/dev/null; then
+				eerror "With USE=crossdev-mingw, you must prepare the MinGW toolchain"
+				eerror "yourself by installing sys-devel/crossdev then running:"
+				eerror
+				eerror "    crossdev --target ${mingw}"
+				eerror
+				eerror "For more information, please see: https://wiki.gentoo.org/wiki/Mingw"
+				die "USE=crossdev-mingw is enabled, but ${mingw}-gcc was not found"
+			fi
+		done
+	fi
+}
+
+src_unpack() {
+	if [[ ${PV} == *9999 ]]; then
+		EGIT_CHECKOUT_DIR=${WORKDIR}/${P}
+		git-r3_src_unpack
+
+		# hack: use subshell to preserve state (including what git-r3 unpack
+		# sets) for smart-live-rebuild as this is not the repo to look at
+		(
+			EGIT_COMMIT=$(<"${EGIT_CHECKOUT_DIR}"/staging/upstream-commit) || die
+			EGIT_REPO_URI=${WINE_EGIT_REPO_URI}
+			EGIT_CHECKOUT_DIR=${S}
+			einfo "Fetching Wine commit matching the current patchset by default (${EGIT_COMMIT})"
+			git-r3_src_unpack
+		)
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	local patchinstallargs=(
+		--all
+		--no-autoconf
+		${MY_WINE_STAGING_CONF}
+	)
+
+	edo "${PYTHON}" ../${P}/staging/patchinstall.py "${patchinstallargs[@]}"
+
+	# sanity check, bumping these has a history of oversights
+	local geckomono=$(sed -En '/^#define (GECKO|MONO)_VER/{s/[^0-9.]//gp}' \
+		dlls/appwiz.cpl/addons.c || die)
+	if [[ ${WINE_GECKO}$'\n'${WINE_MONO} != "${geckomono}" ]]; then
+		local gmfatal=
+		[[ ${PV} == *9999 ]] && gmfatal=nonfatal
+		${gmfatal} die -n "gecko/mono mismatch in ebuild, has: " ${geckomono} " (please file a bug)"
+	fi
+
+	default
+
+	if tc-is-clang; then
+		if use mingw; then
+			# -mabi=ms was ignored by <clang:16 then turned error in :17
+			# if used without --target *-windows, then gets used in install
+			# phase despite USE=mingw, drop as a quick fix for now
+			sed -i '/MSVCRTFLAGS=/s/-mabi=ms//' configure.ac || die
+		else
+			# fails in ./configure unless --enable-archs is passed, allow to
+			# bypass with EXTRA_ECONF but is currently considered unsupported
+			# (by Gentoo) as additional work is needed for (proper) support
+			# note: also fails w/ :17, but unsure if safe to drop w/o mingw
+			[[ ${EXTRA_ECONF} == *--enable-archs* ]] ||
+				die "building ${PN} with clang is only supported with USE=mingw"
+		fi
+	fi
+
+	# ensure .desktop calls this variant + slot
+	sed -i "/^Exec=/s/wine /${P} /" loader/wine.desktop || die
+
+	# datadir is not where wine-mono is installed, so prefixy alternate paths
+	hprefixify -w /get_mono_path/ dlls/mscoree/metahost.c
+
+	# always update for patches (including user's wrt #432348)
+	eautoreconf
+	tools/make_requests || die # perl
+	# tip: if need more for user patches, with portage can e.g. do
+	# echo "post_src_prepare() { tools/make_specfiles || die; }" \
+	#     > /etc/portage/env/app-emulation/wine-staging
+}
+
+src_configure() {
+	WINE_PREFIX=/usr/lib/${P}
+	WINE_DATADIR=/usr/share/${P}
+
+	local conf=(
+		--prefix="${EPREFIX}"${WINE_PREFIX}
+		--datadir="${EPREFIX}"${WINE_DATADIR}
+		--includedir="${EPREFIX}"/usr/include/${P}
+		--libdir="${EPREFIX}"${WINE_PREFIX}
+		--mandir="${EPREFIX}"${WINE_DATADIR}/man
+
+		$(usev wow64 --enable-archs=x86_64,i386)
+
+		$(use_enable gecko mshtml)
+		$(use_enable mono mscoree)
+		--disable-tests
+
+		$(use_with X x)
+		$(use_with alsa)
+		$(use_with capi)
+		$(use_with cups)
+		$(use_with fontconfig)
+		$(use_with gphoto2 gphoto)
+		$(use_with gstreamer)
+		$(use_with kerberos gssapi)
+		$(use_with kerberos krb5)
+		$(use_with mingw)
+		$(use_with netapi)
+		$(use_with nls gettext)
+		$(use_with opencl)
+		$(use_with opengl)
+		$(use_with osmesa)
+		--without-oss # media-sound/oss is not packaged (OSSv4)
+		$(use_with pcap)
+		$(use_with pulseaudio pulse)
+		$(use_with scanner sane)
+		$(use_with sdl)
+		$(use_with smartcard pcsclite)
+		$(use_with ssl gnutls)
+		$(use_with truetype freetype)
+		$(use_with udev)
+		$(use_with udisks dbus) # dbus is only used for udisks
+		$(use_with unwind)
+		$(use_with usb)
+		$(use_with v4l v4l2)
+		$(use_with vulkan)
+		$(use_with wayland)
+		$(use_with xcomposite)
+		$(use_with xinerama)
+	)
+
+	filter-lto # build failure
+	use custom-cflags || strip-flags # can break in obscure ways at runtime
+
+	# wine uses linker tricks unlikely to work with non-bfd/lld (bug #867097)
+	# (do self test until https://github.com/gentoo/gentoo/pull/28355)
+	if [[ $(LC_ALL=C $(tc-getCC) ${LDFLAGS} -Wl,--version 2>/dev/null) != @(LLD|GNU\ ld)* ]]
+	then
+		has_version -b sys-devel/binutils &&
+			append-ldflags -fuse-ld=bfd ||
+			append-ldflags -fuse-ld=lld
+		strip-unsupported-flags
+	fi
+
+	if use mingw; then
+		use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH}
+
+		# CROSSCC was formerly recognized by wine, thus been using similar
+		# variables (subject to change, esp. if ever make a mingw.eclass).
+		local mingwcc_amd64=${CROSSCC:-${CROSSCC_amd64:-x86_64-w64-mingw32-gcc}}
+		local mingwcc_x86=${CROSSCC:-${CROSSCC_x86:-i686-w64-mingw32-gcc}}
+		local -n mingwcc=mingwcc_$(usex abi_x86_64 amd64 x86)
+
+		conf+=(
+			ac_cv_prog_x86_64_CC="${mingwcc_amd64}"
+			ac_cv_prog_i386_CC="${mingwcc_x86}"
+
+			CROSSCFLAGS="${CROSSCFLAGS:-$(
+				filter-flags '-fstack-protector*' #870136
+				filter-flags '-mfunction-return=thunk*' #878849
+
+				# some bashrc-mv users tend to do CFLAGS="${LDFLAGS}" and then
+				# strip-unsupported-flags miss these during compile-only tests
+				# (primarily done for 23.0 profiles' -z, not full coverage)
+				filter-flags '-Wl,-z,*'
+
+				CC=${mingwcc} test-flags-CC ${CFLAGS:--O2}
+			)}"
+
+			CROSSLDFLAGS="${CROSSLDFLAGS:-$(
+				filter-flags '-fuse-ld=*'
+
+				CC=${mingwcc} test-flags-CCLD ${LDFLAGS}
+			)}"
+		)
+	fi
+
+	# order matters with multilib: configure+compile 64->32, install 32->64
+	local -i bits
+	for bits in $(usev abi_x86_64 64) $(usev abi_x86_32 32); do
+	(
+		einfo "Configuring ${PN} for ${bits}bits in ${WORKDIR}/build${bits} ..."
+
+		mkdir ../build${bits} || die
+		cd ../build${bits} || die
+
+		if (( bits == 64 )); then
+			conf+=( --enable-win64 )
+		elif use amd64; then
+			conf+=(
+				$(usev abi_x86_64 --with-wine64=../build64)
+				TARGETFLAGS=-m32 # for widl
+			)
+			# _setup is optional, but use over Wine's auto-detect (+#472038)
+			multilib_toolchain_setup x86
+		fi
+
+		ECONF_SOURCE=${S} econf "${conf[@]}"
+	)
+	done
+}
+
+src_compile() {
+	use abi_x86_64 && emake -C ../build64 # do first
+	use abi_x86_32 && emake -C ../build32
+}
+
+src_install() {
+	use abi_x86_32 && emake DESTDIR="${D}" -C ../build32 install
+	use abi_x86_64 && emake DESTDIR="${D}" -C ../build64 install # do last
+
+	# Ensure both wine64 and wine are available if USE=abi_x86_64 (wow64,
+	# -abi_x86_32, and/or EXTRA_ECONF could cause varying scenarios where
+	# one or the other could be missing and that is unexpected for users
+	# and some tools like winetricks)
+	if use abi_x86_64; then
+		if [[ -e ${ED}${WINE_PREFIX}/bin/wine64 && ! -e ${ED}${WINE_PREFIX}/bin/wine ]]; then
+			dosym wine64 ${WINE_PREFIX}/bin/wine
+			dosym wine64-preloader ${WINE_PREFIX}/bin/wine-preloader
+
+			# also install wine(1) man pages (incl. translations)
+			local man
+			for man in ../build64/loader/wine.*man; do
+				: "${man##*/wine}"
+				: "${_%.*}"
+				insinto ${WINE_DATADIR}/man/${_:+${_#.}/}man1
+				newins ${man} wine.1
+			done
+		elif [[ ! -e ${ED}${WINE_PREFIX}/bin/wine64 && -e ${ED}${WINE_PREFIX}/bin/wine ]]; then
+			dosym wine ${WINE_PREFIX}/bin/wine64
+			dosym wine-preloader ${WINE_PREFIX}/bin/wine64-preloader
+		fi
+	fi
+
+	use perl || rm "${ED}"${WINE_DATADIR}/man/man1/wine{dump,maker}.1 \
+		"${ED}"${WINE_PREFIX}/bin/{function_grep.pl,wine{dump,maker}} || die
+
+	# create variant wrappers for eselect-wine
+	local bin
+	for bin in "${ED}"${WINE_PREFIX}/bin/*; do
+		make_wrapper "${bin##*/}-${P#wine-}" "${bin#"${ED}"}"
+	done
+
+	if use mingw; then
+		# don't let portage try to strip PE files with the wrong
+		# strip executable and instead handle it here (saves ~120MB)
+		dostrip -x ${WINE_PREFIX}/wine/{i386,x86_64}-windows
+
+		if use strip; then
+			ebegin "Stripping Windows (PE) binaries"
+			find "${ED}"${WINE_PREFIX}/wine/*-windows -regex '.*\.\(a\|dll\|exe\)' \
+				-exec $(usex abi_x86_64 x86_64 i686)-w64-mingw32-strip --strip-unneeded {} +
+			eend ${?} || die
+		fi
+	fi
+
+	dodoc ANNOUNCE* AUTHORS README* documentation/README*
+}
+
+pkg_postinst() {
+	if use !abi_x86_32 && use !wow64; then
+		ewarn "32bit support is disabled. While 64bit applications themselves will"
+		ewarn "work, be warned that it is not unusual that installers or other helpers"
+		ewarn "will attempt to use 32bit and fail. If do not want full USE=abi_x86_32,"
+		ewarn "note the experimental/WIP USE=wow64 can allow 32bit without multilib."
+	elif use abi_x86_32 && { use opengl || use vulkan; } &&
+		has_version 'x11-drivers/nvidia-drivers[-abi_x86_32]'
+	then
+		ewarn "x11-drivers/nvidia-drivers is installed but is built without"
+		ewarn "USE=abi_x86_32 (ABI_X86=32), hardware acceleration with 32bit"
+		ewarn "applications under ${PN} will likely not be usable."
+	fi
+
+	optfeature "/dev/hidraw* access used for *some* controllers (e.g. DualShock4)" \
+		games-util/game-device-udev-rules
+
+	eselect wine update --if-unset || die
+}
+
+pkg_postrm() {
+	eselect wine update --if-unset || die
+}
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@ -10,6 +10,7 @@ DIST wine-9.3.tar.xz 30098792 BLAKE2B fa6f0c73f0886918b035557a37c0553feeea5692ae
 DIST wine-9.4.tar.xz 30166096 BLAKE2B bd65086e6f6e11bc6c7cd65dba6e6997911851f1a2f25cad0b4f8100d695df3c76b0799768ab9047dfd5d8afc7c749a5e5c88003d2f4ca69f417387cc06d527d SHA512 fbc927b04f75fe48e52efb6599ffc84f27f1a08d180386e782c94b37b54ab2a3540ed6cd387d7a59f5aca4df2c9ac3e3c127c3067c16e2357e57b4b0a0ced99d
 DIST wine-9.5.tar.xz 30371420 BLAKE2B c14ebf02f0f5b91bc2b2517ff3630f22c6af7fdc827c5d024d809a383a65446284a5349c8109835112f5353f361088f4f32de1a3d04299fbf39deacbc0e8e8bf SHA512 8ccad8f6e6b1428886dee9fae771796e2021b4122cd96464350352bede25421406e6a6a0fdd63d8b99b896db8dc529aa6e05d6ac7966bee49ce3055b18a8af91
 DIST wine-9.6.tar.xz 30261488 BLAKE2B 53115a8a80593856679718b2055340860221701bc82a784a111a992f5e67b031d7407a16f6df6d4da67f382f30c35d2dd82af2a671a058a76b621c91199e426e SHA512 cc2ea5597636da8d392d1d63b9c135679eff69ea671dc6b53b6f2d44a890aee0e17275174485f6e8dd99c7db737eb82a800a2b05c4966f15e28167c5a6098922
+DIST wine-9.7.tar.xz 30281616 BLAKE2B 4d27f6f2dfd088a0590bfce7228c7eca25b66a9a04706ddecb25af6364e83100c15a78c8d46f3294a42dc7f3503756506f752a02d7058a72ce16716994b334bc SHA512 0c15c3a0901162a386126f2dc987b276b379cc027fc72d9e31cf3122614742f876f30a5f24a495f546cd9c5bd5efce096bd9ca190d0f378fea3d42a298a06e80
 EBUILD wine-vanilla-7.0.2.ebuild 12063 BLAKE2B a7f8350b34e7dba8ebc5330d8c42f961d74a0dde81dbe68873eff3edf0c7c3c0c4eb224c2e530bea1a9e3e8eecdab558854b24d6cafaf18b3af321e0d43a96f2 SHA512 124f77719e2563d4aa370dacf4d7095808b72034792ece7b8ecd731e835f59d51bc107d496bc551a8a068026e79dec7654d2135f881b60f9bf976217d480cfb2
 EBUILD wine-vanilla-8.0.2.ebuild 12151 BLAKE2B ba780c4ff9c416715b289f2e90e924752ea0b1ca2af891b944784e0ed2c820f638c41d1cb76977b82d84daff452f411c930a2f4603530486b2b9891512828b66 SHA512 7568bf4769698edca24924cdba6991aee0a48ef215e1ee65dde993c5a38a95646c5baaead981b9826fce0696436560a9e3b2c3224be2ad185a8497c017d22aec
 EBUILD wine-vanilla-9.0.ebuild 13624 BLAKE2B 30440f86b3ac4249110cbaaeb87857c1ab887b238934433194f3adf6de1ad7d5bfe4c50d7d7acb5d22362c2b0b23c0e8a3ce0bf62252e15c847eb3826398b23d SHA512 7f75b451702d86706e0fdecb4ef2395c5873d254892a94c616a6a9812dd9d5c751cebc255e2d5bdde852468af3dfa55f873e563316f609b5d8afea2fcec1b6e8
@ -17,5 +18,6 @@ EBUILD wine-vanilla-9.3.ebuild 13756 BLAKE2B 90a043c49e5687f218489eafda64b7da036
 EBUILD wine-vanilla-9.4.ebuild 13794 BLAKE2B 050e426b00f84fe6fa68147b53fd090064fcfc1a003e59709337771c0f1d8d13381b6dd5510e3151e04f9f54c1d5577c6459077adff6d490dd2c5fa37e5670b8 SHA512 f2c4de8401263f9df3cb43642bb05bf0b605ac6f95be00d46d1991518109b20f4eed0835ef6be6cb9625d3261c738f5fda415687131546178eccc89267a2eb6a
 EBUILD wine-vanilla-9.5.ebuild 13756 BLAKE2B 90a043c49e5687f218489eafda64b7da0366716df7cc13ef5505835814eb3aa2092137e285402f04b28a8adacc21a4c8e233cbfccbcd88da326b9fbeac140246 SHA512 1e847fd8d35aa7a91e6567c9990d4a5acd1bff549e492079526299c7924309966b8558747d516c2ee708a4cc5615b7accce69a94a5d4fa047b95a4149670fa3e
 EBUILD wine-vanilla-9.6.ebuild 13756 BLAKE2B 90a043c49e5687f218489eafda64b7da0366716df7cc13ef5505835814eb3aa2092137e285402f04b28a8adacc21a4c8e233cbfccbcd88da326b9fbeac140246 SHA512 1e847fd8d35aa7a91e6567c9990d4a5acd1bff549e492079526299c7924309966b8558747d516c2ee708a4cc5615b7accce69a94a5d4fa047b95a4149670fa3e
+EBUILD wine-vanilla-9.7.ebuild 13756 BLAKE2B 90a043c49e5687f218489eafda64b7da0366716df7cc13ef5505835814eb3aa2092137e285402f04b28a8adacc21a4c8e233cbfccbcd88da326b9fbeac140246 SHA512 1e847fd8d35aa7a91e6567c9990d4a5acd1bff549e492079526299c7924309966b8558747d516c2ee708a4cc5615b7accce69a94a5d4fa047b95a4149670fa3e
 EBUILD wine-vanilla-9999.ebuild 13756 BLAKE2B 90a043c49e5687f218489eafda64b7da0366716df7cc13ef5505835814eb3aa2092137e285402f04b28a8adacc21a4c8e233cbfccbcd88da326b9fbeac140246 SHA512 1e847fd8d35aa7a91e6567c9990d4a5acd1bff549e492079526299c7924309966b8558747d516c2ee708a4cc5615b7accce69a94a5d4fa047b95a4149670fa3e
 MISC metadata.xml 2726 BLAKE2B 7dc7490fabcda06a27061726225890ee203fe7d22209697c3997f0ccdb4699bfaa09f983c22c4919ce75d2eab6ebdb1add9d9af04f24aee63bae81116fc04094 SHA512 5cdbb062462ae791ff9727d184935af3af147c0bd1e49846731941513301b720313b3356f56a8295780ab822e3117146c9a669d2d96efba6f072d84adba770e6
--- a/app-emulation/wine-vanilla/wine-vanilla-9.7.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9.7.ebuild
@ -0,0 +1,430 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MULTILIB_COMPAT=( abi_x86_{32,64} )
+inherit autotools flag-o-matic multilib multilib-build optfeature
+inherit prefix toolchain-funcs wrapper
+
+WINE_GECKO=2.47.4
+WINE_MONO=9.0.0
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine.git"
+else
+	(( $(ver_cut 2) )) && WINE_SDIR=$(ver_cut 1).x || WINE_SDIR=$(ver_cut 1).0
+	SRC_URI="https://dl.winehq.org/wine/source/${WINE_SDIR}/wine-${PV}.tar.xz"
+	S="${WORKDIR}/wine-${PV}"
+	KEYWORDS="-* ~amd64 ~x86"
+fi
+
+DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
+HOMEPAGE="
+	https://www.winehq.org/
+	https://gitlab.winehq.org/wine/wine/
+"
+
+LICENSE="LGPL-2.1+ BSD-2 IJG MIT OPENLDAP ZLIB gsm libpng2 libtiff"
+SLOT="${PV}"
+IUSE="
+	+X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups dos
+	llvm-libunwind custom-cflags +fontconfig +gecko gphoto2 +gstreamer
+	kerberos +mingw +mono netapi nls odbc opencl +opengl osmesa pcap
+	perl pulseaudio samba scanner +sdl selinux smartcard +ssl +strip
+	+truetype udev udisks +unwind usb v4l +vulkan wayland wow64
+	+xcomposite xinerama"
+# bug #551124 for truetype
+# TODO?: wow64 can be done without mingw if using clang (needs bug #912237)
+REQUIRED_USE="
+	X? ( truetype )
+	crossdev-mingw? ( mingw )
+	wow64? ( abi_x86_64 !abi_x86_32 mingw )
+"
+
+# tests are non-trivial to run, can hang easily, don't play well with
+# sandbox, and several need real opengl/vulkan or network access
+RESTRICT="test"
+
+# `grep WINE_CHECK_SONAME configure.ac` + if not directly linked
+WINE_DLOPEN_DEPEND="
+	X? (
+		x11-libs/libXcursor[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes[${MULTILIB_USEDEP}]
+		x11-libs/libXi[${MULTILIB_USEDEP}]
+		x11-libs/libXrandr[${MULTILIB_USEDEP}]
+		x11-libs/libXrender[${MULTILIB_USEDEP}]
+		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
+		opengl? (
+			media-libs/libglvnd[X,${MULTILIB_USEDEP}]
+			osmesa? ( media-libs/mesa[osmesa,${MULTILIB_USEDEP}] )
+		)
+		xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
+		xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
+	)
+	cups? ( net-print/cups[${MULTILIB_USEDEP}] )
+	fontconfig? ( media-libs/fontconfig[${MULTILIB_USEDEP}] )
+	kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
+	netapi? ( net-fs/samba[${MULTILIB_USEDEP}] )
+	odbc? ( dev-db/unixODBC[${MULTILIB_USEDEP}] )
+	sdl? ( media-libs/libsdl2[haptic,joystick,${MULTILIB_USEDEP}] )
+	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
+	truetype? ( media-libs/freetype[${MULTILIB_USEDEP}] )
+	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
+	vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )
+"
+WINE_COMMON_DEPEND="
+	${WINE_DLOPEN_DEPEND}
+	X? (
+		x11-libs/libX11[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+	)
+	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+	capi? ( net-libs/libcapi:=[${MULTILIB_USEDEP}] )
+	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
+	gstreamer? (
+		dev-libs/glib:2[${MULTILIB_USEDEP}]
+		media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}]
+		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
+	)
+	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
+	pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
+	pulseaudio? ( media-libs/libpulse[${MULTILIB_USEDEP}] )
+	scanner? ( media-gfx/sane-backends[${MULTILIB_USEDEP}] )
+	smartcard? ( sys-apps/pcsc-lite[${MULTILIB_USEDEP}] )
+	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
+	unwind? (
+		llvm-libunwind? ( sys-libs/llvm-libunwind[${MULTILIB_USEDEP}] )
+		!llvm-libunwind? ( sys-libs/libunwind:=[${MULTILIB_USEDEP}] )
+	)
+	usb? ( dev-libs/libusb:1[${MULTILIB_USEDEP}] )
+	wayland? (
+		dev-libs/wayland[${MULTILIB_USEDEP}]
+		x11-libs/libxkbcommon[${MULTILIB_USEDEP}]
+	)
+"
+RDEPEND="
+	${WINE_COMMON_DEPEND}
+	app-emulation/wine-desktop-common
+	dos? (
+		|| (
+			games-emulation/dosbox
+			games-emulation/dosbox-staging
+		)
+	)
+	gecko? (
+		app-emulation/wine-gecko:${WINE_GECKO}[${MULTILIB_USEDEP}]
+		wow64? ( app-emulation/wine-gecko[abi_x86_32] )
+	)
+	gstreamer? ( media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}] )
+	mono? ( app-emulation/wine-mono:${WINE_MONO} )
+	perl? (
+		dev-lang/perl
+		dev-perl/XML-LibXML
+	)
+	samba? ( net-fs/samba[winbind] )
+	selinux? ( sec-policy/selinux-wine )
+	udisks? ( sys-fs/udisks:2 )
+"
+DEPEND="
+	${WINE_COMMON_DEPEND}
+	sys-kernel/linux-headers
+	X? ( x11-base/xorg-proto )
+"
+BDEPEND="
+	|| (
+		sys-devel/binutils
+		sys-devel/lld
+	)
+	dev-lang/perl
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	mingw? ( !crossdev-mingw? (
+		>=dev-util/mingw64-toolchain-10.0.0_p1-r2[${MULTILIB_USEDEP}]
+		wow64? ( dev-util/mingw64-toolchain[abi_x86_32] )
+	) )
+	nls? ( sys-devel/gettext )
+	wayland? ( dev-util/wayland-scanner )
+"
+IDEPEND=">=app-eselect/eselect-wine-2"
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+	__clear_cache # unused on amd64+x86 (bug #900338)
+	res_getservers # false positive
+)
+QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-7.0-noexecstack.patch
+	"${FILESDIR}"/${PN}-7.20-unwind.patch
+	"${FILESDIR}"/${PN}-8.13-rpath.patch
+)
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	if use crossdev-mingw && [[ ! -v MINGW_BYPASS ]]; then
+		local mingw=-w64-mingw32
+		for mingw in $(usev abi_x86_64 x86_64${mingw}) \
+			$(use abi_x86_32 || use wow64 && echo i686${mingw}); do
+			if ! type -P ${mingw}-gcc >/dev/null; then
+				eerror "With USE=crossdev-mingw, you must prepare the MinGW toolchain"
+				eerror "yourself by installing sys-devel/crossdev then running:"
+				eerror
+				eerror "    crossdev --target ${mingw}"
+				eerror
+				eerror "For more information, please see: https://wiki.gentoo.org/wiki/Mingw"
+				die "USE=crossdev-mingw is enabled, but ${mingw}-gcc was not found"
+			fi
+		done
+	fi
+}
+
+src_prepare() {
+	# sanity check, bumping these has a history of oversights
+	local geckomono=$(sed -En '/^#define (GECKO|MONO)_VER/{s/[^0-9.]//gp}' \
+		dlls/appwiz.cpl/addons.c || die)
+	if [[ ${WINE_GECKO}$'\n'${WINE_MONO} != "${geckomono}" ]]; then
+		local gmfatal=
+		[[ ${PV} == *9999 ]] && gmfatal=nonfatal
+		${gmfatal} die -n "gecko/mono mismatch in ebuild, has: " ${geckomono} " (please file a bug)"
+	fi
+
+	default
+
+	if tc-is-clang; then
+		if use mingw; then
+			# -mabi=ms was ignored by <clang:16 then turned error in :17
+			# if used without --target *-windows, then gets used in install
+			# phase despite USE=mingw, drop as a quick fix for now
+			sed -i '/MSVCRTFLAGS=/s/-mabi=ms//' configure.ac || die
+		else
+			# fails in ./configure unless --enable-archs is passed, allow to
+			# bypass with EXTRA_ECONF but is currently considered unsupported
+			# (by Gentoo) as additional work is needed for (proper) support
+			# note: also fails w/ :17, but unsure if safe to drop w/o mingw
+			[[ ${EXTRA_ECONF} == *--enable-archs* ]] ||
+				die "building ${PN} with clang is only supported with USE=mingw"
+		fi
+	fi
+
+	# ensure .desktop calls this variant + slot
+	sed -i "/^Exec=/s/wine /${P} /" loader/wine.desktop || die
+
+	# datadir is not where wine-mono is installed, so prefixy alternate paths
+	hprefixify -w /get_mono_path/ dlls/mscoree/metahost.c
+
+	# always update for patches (including user's wrt #432348)
+	eautoreconf
+	tools/make_requests || die # perl
+	# tip: if need more for user patches, with portage can e.g. do
+	# echo "post_src_prepare() { tools/make_specfiles || die; }" \
+	#     > /etc/portage/env/app-emulation/wine-vanilla
+}
+
+src_configure() {
+	WINE_PREFIX=/usr/lib/${P}
+	WINE_DATADIR=/usr/share/${P}
+
+	local conf=(
+		--prefix="${EPREFIX}"${WINE_PREFIX}
+		--datadir="${EPREFIX}"${WINE_DATADIR}
+		--includedir="${EPREFIX}"/usr/include/${P}
+		--libdir="${EPREFIX}"${WINE_PREFIX}
+		--mandir="${EPREFIX}"${WINE_DATADIR}/man
+
+		$(usev wow64 --enable-archs=x86_64,i386)
+
+		$(use_enable gecko mshtml)
+		$(use_enable mono mscoree)
+		--disable-tests
+
+		$(use_with X x)
+		$(use_with alsa)
+		$(use_with capi)
+		$(use_with cups)
+		$(use_with fontconfig)
+		$(use_with gphoto2 gphoto)
+		$(use_with gstreamer)
+		$(use_with kerberos gssapi)
+		$(use_with kerberos krb5)
+		$(use_with mingw)
+		$(use_with netapi)
+		$(use_with nls gettext)
+		$(use_with opencl)
+		$(use_with opengl)
+		$(use_with osmesa)
+		--without-oss # media-sound/oss is not packaged (OSSv4)
+		$(use_with pcap)
+		$(use_with pulseaudio pulse)
+		$(use_with scanner sane)
+		$(use_with sdl)
+		$(use_with smartcard pcsclite)
+		$(use_with ssl gnutls)
+		$(use_with truetype freetype)
+		$(use_with udev)
+		$(use_with udisks dbus) # dbus is only used for udisks
+		$(use_with unwind)
+		$(use_with usb)
+		$(use_with v4l v4l2)
+		$(use_with vulkan)
+		$(use_with wayland)
+		$(use_with xcomposite)
+		$(use_with xinerama)
+		$(usev !odbc ac_cv_lib_soname_odbc=)
+	)
+
+	filter-lto # build failure
+	use custom-cflags || strip-flags # can break in obscure ways at runtime
+
+	# wine uses linker tricks unlikely to work with non-bfd/lld (bug #867097)
+	# (do self test until https://github.com/gentoo/gentoo/pull/28355)
+	if [[ $(LC_ALL=C $(tc-getCC) ${LDFLAGS} -Wl,--version 2>/dev/null) != @(LLD|GNU\ ld)* ]]
+	then
+		has_version -b sys-devel/binutils &&
+			append-ldflags -fuse-ld=bfd ||
+			append-ldflags -fuse-ld=lld
+		strip-unsupported-flags
+	fi
+
+	if use mingw; then
+		use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH}
+
+		# CROSSCC was formerly recognized by wine, thus been using similar
+		# variables (subject to change, esp. if ever make a mingw.eclass).
+		local mingwcc_amd64=${CROSSCC:-${CROSSCC_amd64:-x86_64-w64-mingw32-gcc}}
+		local mingwcc_x86=${CROSSCC:-${CROSSCC_x86:-i686-w64-mingw32-gcc}}
+		local -n mingwcc=mingwcc_$(usex abi_x86_64 amd64 x86)
+
+		conf+=(
+			ac_cv_prog_x86_64_CC="${mingwcc_amd64}"
+			ac_cv_prog_i386_CC="${mingwcc_x86}"
+
+			CROSSCFLAGS="${CROSSCFLAGS:-$(
+				filter-flags '-fstack-protector*' #870136
+				filter-flags '-mfunction-return=thunk*' #878849
+
+				# some bashrc-mv users tend to do CFLAGS="${LDFLAGS}" and then
+				# strip-unsupported-flags miss these during compile-only tests
+				# (primarily done for 23.0 profiles' -z, not full coverage)
+				filter-flags '-Wl,-z,*'
+
+				CC=${mingwcc} test-flags-CC ${CFLAGS:--O2}
+			)}"
+
+			CROSSLDFLAGS="${CROSSLDFLAGS:-$(
+				filter-flags '-fuse-ld=*'
+
+				CC=${mingwcc} test-flags-CCLD ${LDFLAGS}
+			)}"
+		)
+	fi
+
+	# order matters with multilib: configure+compile 64->32, install 32->64
+	local -i bits
+	for bits in $(usev abi_x86_64 64) $(usev abi_x86_32 32); do
+	(
+		einfo "Configuring ${PN} for ${bits}bits in ${WORKDIR}/build${bits} ..."
+
+		mkdir ../build${bits} || die
+		cd ../build${bits} || die
+
+		if (( bits == 64 )); then
+			conf+=( --enable-win64 )
+		elif use amd64; then
+			conf+=(
+				$(usev abi_x86_64 --with-wine64=../build64)
+				TARGETFLAGS=-m32 # for widl
+			)
+			# _setup is optional, but use over Wine's auto-detect (+#472038)
+			multilib_toolchain_setup x86
+		fi
+
+		ECONF_SOURCE=${S} econf "${conf[@]}"
+	)
+	done
+}
+
+src_compile() {
+	use abi_x86_64 && emake -C ../build64 # do first
+	use abi_x86_32 && emake -C ../build32
+}
+
+src_install() {
+	use abi_x86_32 && emake DESTDIR="${D}" -C ../build32 install
+	use abi_x86_64 && emake DESTDIR="${D}" -C ../build64 install # do last
+
+	# Ensure both wine64 and wine are available if USE=abi_x86_64 (wow64,
+	# -abi_x86_32, and/or EXTRA_ECONF could cause varying scenarios where
+	# one or the other could be missing and that is unexpected for users
+	# and some tools like winetricks)
+	if use abi_x86_64; then
+		if [[ -e ${ED}${WINE_PREFIX}/bin/wine64 && ! -e ${ED}${WINE_PREFIX}/bin/wine ]]; then
+			dosym wine64 ${WINE_PREFIX}/bin/wine
+			dosym wine64-preloader ${WINE_PREFIX}/bin/wine-preloader
+
+			# also install wine(1) man pages (incl. translations)
+			local man
+			for man in ../build64/loader/wine.*man; do
+				: "${man##*/wine}"
+				: "${_%.*}"
+				insinto ${WINE_DATADIR}/man/${_:+${_#.}/}man1
+				newins ${man} wine.1
+			done
+		elif [[ ! -e ${ED}${WINE_PREFIX}/bin/wine64 && -e ${ED}${WINE_PREFIX}/bin/wine ]]; then
+			dosym wine ${WINE_PREFIX}/bin/wine64
+			dosym wine-preloader ${WINE_PREFIX}/bin/wine64-preloader
+		fi
+	fi
+
+	use perl || rm "${ED}"${WINE_DATADIR}/man/man1/wine{dump,maker}.1 \
+		"${ED}"${WINE_PREFIX}/bin/{function_grep.pl,wine{dump,maker}} || die
+
+	# create variant wrappers for eselect-wine
+	local bin
+	for bin in "${ED}"${WINE_PREFIX}/bin/*; do
+		make_wrapper "${bin##*/}-${P#wine-}" "${bin#"${ED}"}"
+	done
+
+	if use mingw; then
+		# don't let portage try to strip PE files with the wrong
+		# strip executable and instead handle it here (saves ~120MB)
+		dostrip -x ${WINE_PREFIX}/wine/{i386,x86_64}-windows
+
+		if use strip; then
+			ebegin "Stripping Windows (PE) binaries"
+			find "${ED}"${WINE_PREFIX}/wine/*-windows -regex '.*\.\(a\|dll\|exe\)' \
+				-exec $(usex abi_x86_64 x86_64 i686)-w64-mingw32-strip --strip-unneeded {} +
+			eend ${?} || die
+		fi
+	fi
+
+	dodoc ANNOUNCE* AUTHORS README* documentation/README*
+}
+
+pkg_postinst() {
+	if use !abi_x86_32 && use !wow64; then
+		ewarn "32bit support is disabled. While 64bit applications themselves will"
+		ewarn "work, be warned that it is not unusual that installers or other helpers"
+		ewarn "will attempt to use 32bit and fail. If do not want full USE=abi_x86_32,"
+		ewarn "note the experimental/WIP USE=wow64 can allow 32bit without multilib."
+	elif use abi_x86_32 && { use opengl || use vulkan; } &&
+		has_version 'x11-drivers/nvidia-drivers[-abi_x86_32]'
+	then
+		ewarn "x11-drivers/nvidia-drivers is installed but is built without"
+		ewarn "USE=abi_x86_32 (ABI_X86=32), hardware acceleration with 32bit"
+		ewarn "applications under ${PN} will likely not be usable."
+	fi
+
+	optfeature "/dev/hidraw* access used for *some* controllers (e.g. DualShock4)" \
+		games-util/game-device-udev-rules
+
+	eselect wine update --if-unset || die
+}
+
+pkg_postrm() {
+	eselect wine update --if-unset || die
+}
--- a/app-eselect/Manifest.gz
+++ b/app-eselect/Manifest.gz
--- a/app-eselect/eselect-java/Manifest
+++ b/app-eselect/eselect-java/Manifest
@ -1,3 +1,5 @@
 DIST eselect-java-0.5.0.tar.bz2 14271 BLAKE2B dc285ad17b62043cc5085a586547a06a12c09f5a80f25dc423db9cb806baaa669a55106f605973fcae7103e35ec673ae2e3a6119730b1789e816a09079deabc8 SHA512 89724b96125911f0abc0363e0b2c9df75d0d52df1a5e16e80efa20a8de39b1bc0d411d297581b3440c944f498688e5dcffe5432f5e46836115d2eb620f31c03a
+DIST eselect-java-0.5.1.tar.bz2 14330 BLAKE2B a1333f2e1a40662cdca3ca6155f621efd4b4491fb83dd787d001b172d0baf6c960a217643a18dba5c262317613854cf62f79a9dbb0d621b2335499ada03cd03c SHA512 1a28667d635dae551b0432aa83e80b92733ed8a1c21c4d4a8d978c05e1e89034a0e073bd6fdf1f18569c48efbe17ad338bc95dde5b7e009ba87cad04f7e4a156
 EBUILD eselect-java-0.5.0.ebuild 1062 BLAKE2B c7abd7c4e5f570542e6630c2038a3cafc2ae1d000dd6621e71e826c66eb4d573c2f4432de303f822b2b6e6d390c9768d4d4bcbff1e772e60ac5c08b656531ba0 SHA512 44d77f583756d6c9508bbb449520b732b4f6fa8d45c738e892f344bf5dc9a2430ee198321a53be37b815a25904173066b09f888c3902dd000e3c65307ef7e8b0
+EBUILD eselect-java-0.5.1.ebuild 1066 BLAKE2B 4c21b75b4eb3dc3ffb0ccf57e6210414bfa4df77310e60d4556fa66a715c71a33f3b5e6afaff4595849be6fffb1b2bc6c0a03005aa94a021355e340d35150429 SHA512 bd7e72a4f831898bdc5cb8cea4c6e56e5230bb396469fd7dd9860236bb61237c1e27fe38bb8a813b5be035e4dd7b9f9825a6fa302eddab895b68e70b7cb37a61
 MISC metadata.xml 256 BLAKE2B 06034a9ec5059f1276335c4e4c5ec5203bccdecd555ff0c8c1d9d19db69f1540efc0c2265f4598fcd207d1b656a390c34908acd72600176a202d76ce64605270 SHA512 94123950f1f7bc7ec13f90d1c3f9f4c04deb2ac8997673683acf491733eb329a8b67658bd2fcfd11d2648823cbe4493ba14f0e549f711b477086d7ac98400e4e
--- a/app-eselect/eselect-java/eselect-java-0.5.1.ebuild
+++ b/app-eselect/eselect-java/eselect-java-0.5.1.ebuild
@ -0,0 +1,35 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="A set of eselect modules for Java"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Java"
+SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x64-solaris"
+
+RDEPEND="app-admin/eselect"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+pkg_postinst() {
+	local REMOVED=0
+
+	rm -v "${EROOT}"/usr/lib*/nsbrowser/plugins/javaplugin.so 2>/dev/null && REMOVED=1
+	rm -v "${EROOT}"/etc/java-config-2/current-icedtea-web-vm 2>/dev/null && REMOVED=1
+
+	if [[ ${REMOVED} = 1 ]]; then
+		elog "The eselect java-nsplugin module has been removed and your configuration"
+		elog "has been cleaned up. From now on, you may only install either Oracle or"
+		elog "IcedTea's plugin but not both. Note you can use IcedTea's plugin with an"
+		elog "Oracle VM. See the README installed with icedtea-web for more details."
+	fi
+}
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
--- a/app-misc/boxes/Manifest
+++ b/app-misc/boxes/Manifest
@ -1,6 +1,6 @@
-AUX boxes-2.2.0-fix-clang16-build.patch 309 BLAKE2B cde9c190dfbb57b94a48a8d68d459ccb6521fa2eacd5103e624acc1974346e3ecd3d8ec91431309a7e09d1e421babdac3307f05a9ac081fcffb84d2ff8b184c0 SHA512 84c0f84e3c07094f0e27b1d89a8094d43712c12d6b9bd79586d73440ae92f330eada9bf4d4438bfd7eaa8109f4197d0c8fbb7078f7678a2b5c97d2b87879923f
-DIST boxes-2.2.0.tar.gz 230099 BLAKE2B 4adb8ddde85cb31f32e98916d5ea2a57afcaa0470f796ba296cb3b80780f158a24b2bc5e9ba923b6a3b35b8f7781cd6ddacd89abadf6f2c07549be7ffe1458f4 SHA512 534d441c34316572d0c7e89f343a3bc5bb5a8466e4d4ed703fb2d14b714f5a6b224f7b0d408525d492da4610f9c5ffd8508e16d98a0781897567fb4aeb316f39
+AUX boxes-2.3.0-ncurses-gentoo.patch 644 BLAKE2B 8a01d5948379a268a3bb91076f35ebdc524aba16245b11bf04af0e18748c97ed7f29579ca85b5bf2c1b24cbfbef04ae1adff9a6fa2a619bd744f5883c47b8bfe SHA512 18c647b91ca5e2c0bcf1243eb3d78841d85c0275cbb766672c98b6198ec547714ef6166b58ace878bd52b40cd758dae3932bd2c605efb9156cf7f51d4d5557c8
 DIST boxes-2.2.1.tar.gz 230900 BLAKE2B 65ab0c8ad52d2764279397135b072bfa6f4bf86e465cc3a4778d30c5b19ce2c0d7c5f8636173529eca92754ee16d38b46a83b067b94315b1ea82448e4b1ac0a8 SHA512 0afa115d5ec01944878ef4d8f33e2887d123b172a0589eda53a04ba671916d9ef1d8299f9df9aeac8989807f86ca1b96b1c34aed03856643a89a07586b82e3b6
-EBUILD boxes-2.2.0.ebuild 1015 BLAKE2B eedfd20bc8967a00fc4d059e7f684795e24c3e574bf4ba9ea08b271df3fb3ed754bb3a416296e28b22060af02cd8504ae9c58307832d13bb05d4f672491cefb4 SHA512 286c7edc1f006a24ebb987018bb5772daa640a6e630020b89ac10ffb1710ad368295a4b6dff182a0fed8e7ebd9df90b91e9355c90d63dcfa8e39bfeb16305267
+DIST boxes-2.3.0.tar.gz 272302 BLAKE2B 282b41aee214f54aa3c8b237bc9f2e48e4144eebd6619880a38c7a71d9bf7bb434a250f29a05f20746530e8458bb0d062cd7e5bea88ebdf64030f090b1a8674a SHA512 d7580462ed5cf8a3299f528d7e4abea1c9733da2823c204bff69a804c72b768c4d3e8505b4d8881aae066f1fd95133cf9dc52e960333a82d8c529f85eb096fb4
 EBUILD boxes-2.2.1.ebuild 969 BLAKE2B 959469b5b406ab0b4a1b90e3f51702ce911309702425e6c2f1632e4054f437e23ff05f0e9f84ea13366a5d504ecdb079745083f6752270d70a867708966e850f SHA512 90ce6956a126bf01c068c905fe4fa2fa4c40573b7bdb2d6a21c9ce655a7b60908ed4c1e35f2c36aacd7a011fca701d7dc77c398f0530549820449869d8426873
+EBUILD boxes-2.3.0.ebuild 1052 BLAKE2B 077deb95e72d3cc4f69dcfb3138624e84260c89a5f895ce18f0325e5fe8dd93b6d34945ac898a6b20dc84402d7b9246275becb4774672ca9750992ebeda5139a SHA512 91c4641a619f19c1cecd93c08dbd55af27343da410af79a522c86e40004d5fea499dfe8c21d2e0f1683b2c5b63adfca5f9053b1788d8436e56cbef5176623d5f
 MISC metadata.xml 900 BLAKE2B ed21e2f334f908418be9025531cb81b38eb20c29a2d6824db34b60bc9cab117cf7390c223942b0a97b00a94cbf0a3d56d5991599bdc6ee2ae779cafd2ee9f423 SHA512 ff396d6d3de85f836cd7af967d783ce51ce17f4a542e5a800aec5929f0de1a27eb823014f1452045183eb437c960347c1c120ce38b60bead7f9a38eaef24e261
--- a/app-misc/boxes/boxes-2.3.0.ebuild
+++ b/app-misc/boxes/boxes-2.3.0.ebuild
@ -7,26 +7,29 @@ inherit toolchain-funcs

 DESCRIPTION="Draw any kind of boxes around your text"
 HOMEPAGE="https://boxes.thomasjensen.com/ https://github.com/ascii-boxes/boxes"
-SRC_URI="https://github.com/ascii-boxes/boxes/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/ascii-boxes/boxes/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"

 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"

 RDEPEND="
-	dev-libs/libpcre2[pcre32]
+	dev-libs/libpcre2:=[pcre32]
 	dev-libs/libunistring:=
+	sys-libs/ncurses:=
+"
+DEPEND="
+	${RDEPEND}
 "
-DEPEND="${RDEPEND}"
 BDEPEND="
 	app-alternatives/yacc
 	app-alternatives/lex
 	test? ( app-editors/vim-core )
 "

-PATCHES=( "${FILESDIR}/${P}-fix-clang16-build.patch" )
+PATCHES=( "${FILESDIR}/${P}-ncurses-gentoo.patch" )

 src_prepare() {
 	default
--- a/app-misc/boxes/files/boxes-2.2.0-fix-clang16-build.patch
+++ b/app-misc/boxes/files/boxes-2.2.0-fix-clang16-build.patch
@ -1,15 +0,0 @@
-change function prototype to work with c2x standard. Build fails with clang16 without this
-
-See: https://github.com/ascii-boxes/boxes/issues/106
-
--- a/src/remove.h
-+++ b/src/remove.h
-@@ -22,7 +22,7 @@
-
-
- int remove_box();
-void output_input();
-+void output_input(const int trim_only);
-
-
- #endif /*REMOVE_H*/
--- a/app-misc/boxes/files/boxes-2.3.0-ncurses-gentoo.patch
+++ b/app-misc/boxes/files/boxes-2.3.0-ncurses-gentoo.patch
@ -0,0 +1,15 @@
+Gentoo splits ncurses into several independent libraries. Therefore this needs to be linked with more than just -lncurses.
+
+Pascal Jäger <pascal.jaeger@leimstift.de> (2024-02-19)
+
+--- a/src/Makefile
+++ b/src/Makefile
+@@ -64,7 +64,7 @@ debug: flags_$(BOXES_PLATFORM) | $(OUT_DIR)
+ 	    CFLAGS_ADDTL="-ggdb3 $(CFLAGS_ADDTL)" flags_$(BOXES_PLATFORM) $(BOXES_EXECUTABLE_NAME)
+ 
+ boxes: $(ALL_OBJ) | check_dir
+-	$(CC) $(LDFLAGS) $^ -o $@ -lunistring -lpcre2-32 -lncurses
+	$(CC) $(LDFLAGS) $^ -o $@ -lunistring -lpcre2-32 $(shell pkg-config --libs ncurses)
+ 	if [ "$(STRIP)" = "true" ] ; then strip $@ ; fi
+ 
+ boxes.static: $(ALL_OBJ) | check_dir
--- a/app-misc/broot/Manifest
+++ b/app-misc/broot/Manifest
@ -423,5 +423,5 @@ DIST zerocopy-derive-0.7.32.crate 37623 BLAKE2B 8b583d39d7bf9c3dbbba578120751c66
 DIST zune-inflate-0.2.54.crate 37973 BLAKE2B 8bdb532fae0da1d61fc9fc72ea72a9339116e1952e76ba7376f0ba0ea65101b88cd1e4766f516f21028a5ea3459e5590e7a54175a47f136cc572ed9abec2da2f SHA512 0de30f310121c1fed42612b7bcb50631d699195a77c7ce4094729f502e63d1ae38034d6054d95b6825e7e9a2afb7bb614ff123e12736163fee04a46ef1dc56bd
 EBUILD broot-1.34.0.ebuild 6905 BLAKE2B 5fe1d038c5d8628d6172abca3b8e51bcc977af65f198ed9804fff5885f886b042dd2ba38a4ca38fd0036c36a5d6d690a911568f199eed07c202f798333b3b367 SHA512 4430932d388fa942861d8b091486507d1d3189429c2a5f8da34d831925a63da0ab28ddbe9098a1672503e2b8e965dce94232ebb49d4ee4c1536998b9fa329ab5
 EBUILD broot-1.35.0.ebuild 6917 BLAKE2B edfc129e15f33e91c006222c60ff0add91e5719addee21569dcece97f047095aaf076a48bc8c17d312c3b1e102c2418d96f58d1b61e0689e34d44fb68710153f SHA512 08c2838e8833c70e18b754c4d0a050c341edabe16371c5c472c422fe6c207af65283d59eaafdb051ba0b41b0753f113caabc487992129c3053dbdb6f968ce2d6
-EBUILD broot-1.36.1.ebuild 6964 BLAKE2B 5904066064aaa5e133811e0155ba7a86fcdeecfb4b7a5e10ad847e5151b506ec82e50e40ce3e044ff0a6b6b3de3640cb6e0b6ebd170cb23120f4bbaddec5916a SHA512 149a67ab117c49404fda503e1c2dbd22a6b3c46ed4909f8386ef20ea388b1e050c7c34d307afebd7539f37207e97b1a73f5f1514c49a452d452b28357b49064b
+EBUILD broot-1.36.1.ebuild 6963 BLAKE2B 0f8e33c48b6eced9d60d54fd6fb4f3bab5e886b8a0fb37c4ba098287888cc40ee174288acf3129c055d7f662dec93f813b45b3798f494ae61bae2b1821901310 SHA512 4b8281b4ae3d8fbfdb51ca9a7d8879df8e741953cc2c8af705634c32256c5894d88ba6db467d9abbe6be688bc2d7e119ca26b48ca70de1e9ea29cd4c47a9b2dc
 MISC metadata.xml 564 BLAKE2B 0c694d4996ceefd6b05c3ff74f313d775c820d3eb0ae327cc2c130a608fd8595c64aa1217599d61952c6ade05415eaac53056c3fad30ccb5347df134715bb573 SHA512 5533ba0526ff6cbb801696c8ddba2dc393b158bdc2cf5dedc3b245362d924172e4bd321412cd6976735bcabe01d5e7e191e11b2718412b5e389e9251ca5ea695
--- a/app-misc/broot/broot-1.36.1.ebuild
+++ b/app-misc/broot/broot-1.36.1.ebuild
@ -333,7 +333,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/piper/Manifest
+++ b/app-misc/piper/Manifest
@ -3,5 +3,6 @@ AUX piper-0.7-fix-tests.patch 3238 BLAKE2B 289ef09b85964cee3085403e1f26dca52ee29
 DIST piper-0.6.tar.gz 254653 BLAKE2B ea621e556e2ee6a98e334f2e61df70d700a9cb371dcd5bddc690b4a4c97543a6957bc339bddbde2cf91ac3b201d3bd70fe336974f17e36cfdcbb4895257af993 SHA512 9d76cbc5f3a91c68d10355a1b429c05873effcaa80086fb51c7d4a7bdbbb3e0faf42ec8ccad611a15f5c954d3014a8416e4a497c86167c227818771a24d108a0
 DIST piper-0.7.tar.gz 271658 BLAKE2B 8d3d411cc771a286ae0d7654b6d70f394e11edb182924619195b947d0d54df4db308e94aceebe0754ddd446538f1dce2ccb88dbf1cd44595b614d852e7394698 SHA512 fcbc30a4954ea6b0aa67c66052eab1e6b2d3039c927eeddcfc8b03d00f1c91e8f0ae80788ba0e4f053a612b03f594e74fd119dd11f52dd47608c99602e7e4940
 EBUILD piper-0.6.ebuild 1307 BLAKE2B ee3b8d47a1e3eca421244319196af651bf7cd8735332349100bb80cb0f40306a3ad8f01867ca3bbc81322fbb886737e29114415e6a4dcab657892c6f0e7e1e2e SHA512 f439dc02bf480a173409bd1cb0f5828b6546724a51de24721d7cc38e551830d9d5f6bf6412cace499fb4c5e9e7a9ca12c07116f5f00e5541692ad5a44fa97a50
-EBUILD piper-0.7.ebuild 1393 BLAKE2B 206d8630e3c203d8900192873b2221637eb7e124d112298b7f054c384fff9e7e637fc148222b9e98cce523e466a8984ab04718732c021df92ffbe8e75702c997 SHA512 6803fb07a7e3e7874716ba28f5a31962d73ea648f1c42ae36c35c67d8a2c581564a6d4a9de5826176b580a57d7608cf8567c15c736f7fd25154f3b4e6dea4b60
+EBUILD piper-0.7-r1.ebuild 1505 BLAKE2B fa7d49c3b254523cca097faca0bb9e9d2677753b6224a45109d065ff6eec1daf7ae70a12fdea821f6d8628f4db6a5e21de04ca7a898b5df9ce2d7e6d619517e2 SHA512 60a98d1e9dd2a424ac889587d9b859e9d46d6e2fd9782dd24348fb8ab7a006e77e86a04fb0105002e517a059116bb46f8ff4815d93ec76f2d855e7439c1ae927
+EBUILD piper-9999.ebuild 1405 BLAKE2B 84dbe91fc7e295d35fdecb2e09bc37d66990b5ae545f92f1a2530855a16b401415d1ea8ee678398d1f3493cee7cf15a5845967e7c6a6b490d25f404ea734b18c SHA512 1ffb37ac0a22dd30ff7c68179fd2311f8decdb40f9d16ef39e58e738c342188c3f1bc40d0010a56d83420ab74302384db8a3619b6ddf549180469474623ddda6
 MISC metadata.xml 1076 BLAKE2B 4c00bb84f4267ec8cad1f915ca0ed6ef35144aa8039eb8fde7a0674dde5320eb29ffc0ed840dd8dcf68af5663ab9816e779f05b492863bdc73305e878cf90e71 SHA512 44c9ef8d2171a168a116425d05832b58bd8490348e00d3d875fca2a957008cbc154fb7b66add99a4b1ff323aaf4cca716e25d47e3376b12188c85c67971ee70e
--- a/app-misc/piper/piper-0.7-r1.ebuild
+++ b/app-misc/piper/piper-0.7-r1.ebuild
@ -9,11 +9,17 @@ inherit meson python-single-r1 xdg

 DESCRIPTION="GTK application to configure gaming devices"
 HOMEPAGE="https://github.com/libratbag/piper"
-SRC_URI="https://github.com/libratbag/piper/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/libratbag/piper.git"
+else
+	SRC_URI="https://github.com/libratbag/piper/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
 IUSE="test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
--- a/app-misc/piper/piper-9999.ebuild
+++ b/app-misc/piper/piper-9999.ebuild
@ -0,0 +1,69 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit meson python-single-r1 xdg
+
+DESCRIPTION="GTK application to configure gaming devices"
+HOMEPAGE="https://github.com/libratbag/piper"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/libratbag/piper.git"
+else
+	SRC_URI="https://github.com/libratbag/piper/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/lxml[${PYTHON_USEDEP}]
+	')
+	virtual/pkgconfig
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/flake8[${PYTHON_USEDEP}]
+		')
+		dev-libs/appstream
+	)
+"
+RDEPEND="
+	${PYTHON_DEPS}
+	dev-libs/gobject-introspection
+	>=dev-libs/libratbag-0.14
+	gnome-base/librsvg[introspection]
+	x11-libs/gdk-pixbuf[introspection]
+	x11-libs/gtk+:3[introspection]
+	$(python_gen_cond_dep '
+		dev-python/evdev[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/pycairo[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
+	')
+"
+DEPEND="
+	${RDEPEND}
+	dev-libs/libevdev
+	virtual/libudev
+"
+
+src_configure() {
+	python_setup
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	python_optimize
+	python_fix_shebang "${ED}"/usr/bin/
+}
--- a/app-misc/recoll/Manifest
+++ b/app-misc/recoll/Manifest
@ -1,6 +1,6 @@
 DIST recoll-1.36.2.tar.gz 3129206 BLAKE2B 0631d8c88f56f3381dd899fa385cba84a720d9d3a49b19b9b344de9542d79e3e5d5e10008fd7dd098795df2a4c79a682ff9a10ff4f99243fa2f7abd99831b553 SHA512 4c7ce5b6f6213ba4cb9266dcd6ea26e56850aa984c343552464766c5036ac6fd2ac6e9e71157997e10e8ba0350d23a4ebc3f2d57978805aa2d33674aa2a6c8b0
 DIST recoll-1.37.4.tar.gz 3135691 BLAKE2B 1c9113cbccb812e522addbc7fec0aa0b958d8616aa1b753aa866e9bb96f78dc0a40bb79a4a8ad016286f2508f1d8dea172d308917a430fa4c98822feaba0d309 SHA512 9e5af5d00191658f23e6a5916718014827f12f4553d9429fe385c0bd1c72f2f49ae97e7d7b8121cb174b299ffe482aa547e4a3aabf2da92e9773bf9eb0f57814
 EBUILD recoll-1.36.2.ebuild 3162 BLAKE2B a951f27ad24013c68c353c12f2e5b043efe6721e9339674aa1ea9a955944fcb95db15070311b94b6166237c1a05c19f898c88bc8c719a7e09213e0274ac5fb25 SHA512 e705318e87add8f8a9cbd4ec33b20d0017dbac6c0648abfb3bf1ce289cf1a6daf02a1c52ba30fa780db0d0d96d3771277c239b3d4ca4e80089427923ccc5d625
-EBUILD recoll-1.37.4-r1.ebuild 3333 BLAKE2B 5d59a55a21bbc80cebfe164167d12eb291a439939f183927aa079806b10a71c9ac956c0c11042d42af6340aa6d0d5be5870aaea1f833c439decbf4334825e31a SHA512 5c24bec636a44a92f0503388dd15e1bf76fa03e1cab228bb1741701a668bdd1df67f75e273e2890eec728f433a50e837292cc1d0d2d6109e5a0be1f4c81f1f12
+EBUILD recoll-1.37.4-r1.ebuild 3331 BLAKE2B c8219b7c354fdf9b182f75cddb280e6519291389b15ac5b034e361683f10d5ddc2370c52c9b98e6d2ba07aca3193669e820297bc6b769119c46e532a478565c3 SHA512 36b2fa430f92531a3927c70665ff8376573327b17ec7a9f6fcd4a1d983f0123867001178edb1fca43163f3002cc41b9ec572f15f3dfbf053a95fd5ed6d2d5982
 EBUILD recoll-1.37.4.ebuild 3257 BLAKE2B e5ceb14c76e1d1fb82ade0ad340563bf4d9c7cbafe5dc3377c2ba94fedc708b7b48fd50a0a977db23639e36412f08948a793665ca6bb09db2f6d5640f3ee98d2 SHA512 a3101d1933c3e56d75206c45a5b6c908e253d3258a46baa91340b62641be0d9b8071b93e5562faa62f535cc1986373a4eaa65547d6f157f51a2c4c0bc9205cae
 MISC metadata.xml 1413 BLAKE2B ffeeae4a0a0d5553e7ee8bffc85262eff920ca0d2ee2c8db767662f6f37c4b9702123fdf1cc1f804e9d646819d8523a360018813233ec6277d9d4d819397a67e SHA512 855cbf30c1d6216d52c1655ed20caf622ce835a6c9c0798b871206c29e946bdde2759e25f2d3003c0c8478d8cda78b28f1c3c0435db26001b0ea323858355a69
--- a/app-misc/recoll/recoll-1.37.4-r1.ebuild
+++ b/app-misc/recoll/recoll-1.37.4-r1.ebuild
@ -13,7 +13,7 @@ SRC_URI="https://www.lesbonscomptes.com/recoll/${P}.tar.gz"

 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"

 IUSE="camelcase chm +inotify qt5 session +spell systemd webengine"
 REQUIRED_USE="
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
--- a/app-office/dia2code/Manifest
+++ b/app-office/dia2code/Manifest
@ -1,3 +1,4 @@
+AUX dia2code-1.0.0-fix-imports.patch 344 BLAKE2B ace6791540361f4981956d0a058d5875e41414f7f88f240341b268efea02e10ad3a59850608641faf0f02f7036988fcfd6426496a897e69bce0720910ede59ed SHA512 787447902ba5606dee0d68704b4d1e53b8e4097b9e152f3330c644226b13282ee0c110aa3fe6cbb1a7c17dad2ed02e52b18ce501305287ab97dfe6f7847c3602
 DIST dia2code-1.0.0.tar.gz 946967 BLAKE2B 48e6c29e9178032d17816726fe2b60c7a87518b898c22f0caec94b31d8cb10e50da4c093f178cad62f8c107bc55c3bbddef692e8608bbb73aed3afb156a2f2be SHA512 6669352e624fddc94aaaa36a30263ad591494d473ca09e662a9de90902e4b4a7a7eb6d3de9b28cf162c63ebeea36f86b33822d510ac87ce97c5f196c761bac85
-EBUILD dia2code-1.0.0.ebuild 679 BLAKE2B e5330f803b6456694de71723cde6164e53114de293b6e0b5f1edbd03937894872b2e5384ce403f8eba27de407e18feab02eb3d81166301b691226e73ac216fd1 SHA512 54449b0c01518112c01c3537c15d8ee407561e19cc6a6e46c0523e91af926682e422900da038970f1153caaa8952570bfe0bedf28f45891bf816e7a024a1fc34
+EBUILD dia2code-1.0.0-r1.ebuild 715 BLAKE2B a37b261b9a6ea96a6847011cf33277ea6f40cf19d831efb2f3fcee2eaa6fcbfc665e3962c087b462f9a16e72be8fc440df8b12ba472134202ce92eccae04a501 SHA512 68e485b9eb61bd9fe16cb5239ba0e9ac459a5aa7a899b5202dcfed722f87d0858f9921bf56351693524b2070627ba350861a0a548c5707ff5ce92fb3159f3cca
 MISC metadata.xml 332 BLAKE2B a61fd65558391c808252c9503105c26019cdbff7ef885e1775ea671ce4001667416c7ba01b543634ff6b0202fbd0607b45cca8bea2bbbf1da83e331a6795640d SHA512 e6c1fcfdc5c6691e262853909e409821eaf839dbf7ca76b6df2b34d35403774d6af330cf267056525136104eb25cf2bbec855d032772dcf3bb0fce6b8947de9d
--- a/app-office/dia2code/dia2code-1.0.0-r1.ebuild
+++ b/app-office/dia2code/dia2code-1.0.0-r1.ebuild
@ -1,7 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=6
+EAPI=8
+
 inherit gnome2

 DESCRIPTION="Convert UML diagrams produced with Dia to various source code flavours"
@ -10,20 +11,22 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"

 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~ia64 ~ppc ~sparc x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"

-RDEPEND="${DEPEND}"
-DEPEND="
-	dev-libs/libxml2
+RDEPEND="dev-libs/libxml2"
+DEPEND="${RDEPEND}
 	test? ( app-shells/bash )
 "

+PATCHES=(
+	"${FILESDIR}"/${P}-fix-imports.patch
+)
+
 src_prepare() {
 	# Script makes use of arrays
-	sed -e 's:/bin/sh:/bin/bash:' \
-		-i tests/tests.sh || die
+	sed -e 's:/bin/sh:/bin/bash:' -i tests/tests.sh || die
 	gnome2_src_prepare
 }

--- a/app-office/dia2code/files/dia2code-1.0.0-fix-imports.patch
+++ b/app-office/dia2code/files/dia2code-1.0.0-fix-imports.patch
@ -0,0 +1,12 @@
+https://bugs.gentoo.org/895298
+
+--- a/src/decls.hpp
+++ b/src/decls.hpp
+@@ -23,6 +23,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ #include "config.h"
+
+ #include "umlPackage.hpp"
+#include <cinttypes>
+
+ /* Package processing auxiliary structure:
+    "Declarations" are UML packages (which map to IDL module or C++
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@ -45,6 +45,5 @@ EBUILD libreoffice-24.2.3.1.ebuild 20418 BLAKE2B a4565590a86e64cfa92b6ad0f476aeb
 EBUILD libreoffice-24.2.9999.ebuild 20337 BLAKE2B 127d3de6087ca61860bad4a2987bd693df8b3116d11abeaba6cdea51cd0ccf12fc557db50e2b2720eb83f21d724384bbf01f2036a9803f2932efe3ef76d2c9f4 SHA512 2c37f139a05d5df7bc45d53082cc7e3dd1cc5cb71197682349fb4b809b35f0ddc9cf8ee7bd113be3233cae950960cd907154ab7f2c637fb8b5f5d2e4634e6a54
 EBUILD libreoffice-7.6.4.1.ebuild 19678 BLAKE2B 9437af453ccbf75140b39cb37ff2705630a2499295681fa129945ca6ed96b030a832ac997990e80ee3cfb7d7203f5e3a1e4375677e456e1ff11c6a4dce3a3178 SHA512 c8d41e5bbbc9cbf9f2cd1f3d4dd74aca9074287410c4a2e26e789ed939a691385c6d9c3f62c5144ad2f8af15a9be26206f2470e5908ab10f507b423c459873b0
 EBUILD libreoffice-7.6.6.3.ebuild 19793 BLAKE2B 1c3fba72db8736bd87527ed5e486bf15528ba12562c79754c24fe3f36b692e8be8d2c7db920fe8f1e94dc1f36108f3c86f816bdd9c248a2f7c0a353672ce55d3 SHA512 bfadf2e44a6219ebabe0df83288917c79283b8fcf2ae14493e0ebda0f6b8fbe19ce0bba1eb435e8ca1adb356c1163f8c8c45c7918673339015ee804af67398be
-EBUILD libreoffice-7.6.9999.ebuild 19670 BLAKE2B 3485289367b03f709aef887ae08a377f2ee1b33b6aac2cb9545d8a7a0d27fa1a98dfcf7bbe197cb168da2c454f1dd1a6671fe1c0567f2b9f473f53eae05509da SHA512 eedbaffa3957a00a93a517fd7a397d8050de64c45de846705d4277df8d49f1109c63572a163d8333ce02ea3e85a22f6cdaf116d5b57b7840d846a32015805695
 EBUILD libreoffice-9999.ebuild 20337 BLAKE2B 127d3de6087ca61860bad4a2987bd693df8b3116d11abeaba6cdea51cd0ccf12fc557db50e2b2720eb83f21d724384bbf01f2036a9803f2932efe3ef76d2c9f4 SHA512 2c37f139a05d5df7bc45d53082cc7e3dd1cc5cb71197682349fb4b809b35f0ddc9cf8ee7bd113be3233cae950960cd907154ab7f2c637fb8b5f5d2e4634e6a54
 MISC metadata.xml 1233 BLAKE2B f93989caf1340cda4c3327a3d3d033d224050848b32b9d80e0b093b024bf124d238f1aae9852d1a6173e8aee79314517dd12e589079e58378e5f63626a80957c SHA512 3af0cefdceeba7a45658a2151b0534f44b9dfe6d3af8374f3061cb098f607a36a2fe134e3c0280ce6d807b523f68e708b51e6f1b4178292a528405e18f12d686
--- a/app-office/libreoffice/libreoffice-7.6.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-7.6.9999.ebuild
@ -1,668 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-PYTHON_REQ_USE="threads(+),xml(+)"
-
-MY_PV="${PV/_alpha/.alpha}"
-MY_PV="${MY_PV/_beta/.beta}"
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make everyone happy.
-DEV_URI="
-	https://dev-builds.libreoffice.org/pre-releases/src
-	https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
-	https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
-"
-ADDONS_URI="https://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-# PATCHSET="${P}-patchset-01.tar.xz"
-
-[[ ${MY_PV} == *9999* ]] && inherit git-r3
-inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
-
-DESCRIPTION="A full office productivity suite"
-HOMEPAGE="https://www.libreoffice.org"
-SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
-
-# Split modules following git/tarballs; Core MUST be first!
-# Help is used for the image generator
-# Only release has the tarballs
-if [[ ${MY_PV} != *9999* ]]; then
-	for i in ${DEV_URI}; do
-		SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
-		SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
-	done
-	unset i
-fi
-unset DEV_URI
-
-# Really required addons
-# These are bundles that can't be removed for now due to huge patchsets.
-# If you want them gone, patches are welcome.
-ADDONS_SRC=(
-	# not packaged in Gentoo
-	"${ADDONS_URI}/dragonbox-1.1.3.tar.gz"
-	# not packaged in Gentoo, https://www.netlib.org/fp/dtoa.c
-	"${ADDONS_URI}/dtoa-20180411.tgz"
-	# not packaged in Gentoo, https://github.com/serge-sans-paille/frozen
-	"${ADDONS_URI}/frozen-1.1.1.tar.gz"
-	# not packaged in Gentoo, https://skia.org/
-	"${ADDONS_URI}/skia-m111-a31e897fb3dcbc96b2b40999751611d029bf5404.tar.xz"
-	"base? (
-		${ADDONS_URI}/commons-logging-1.2-src.tar.gz
-		${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
-		${ADDONS_URI}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
-		${ADDONS_URI}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
-		${ADDONS_URI}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
-		${ADDONS_URI}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
-		${ADDONS_URI}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
-		${ADDONS_URI}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
-		${ADDONS_URI}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
-		${ADDONS_URI}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
-		${ADDONS_URI}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
-		${ADDONS_URI}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
-	)"
-	"java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
-	# no release for 8 years, should we package it?
-	"libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
-	# Does not build with 1.6 rhino at all
-	"libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
-	# requirement of rhino
-	"libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
-	# not packageable
-	"odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
-)
-SRC_URI+=" ${ADDONS_SRC[*]}"
-
-unset ADDONS_URI
-unset ADDONS_SRC
-
-# Extensions that need extra work:
-LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
-
-IUSE="accessibility base bluetooth +branding clang coinmp +cups custom-cflags +dbus debug eds firebird
-googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres test valgrind vulkan
-$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	base? ( java )
-	bluetooth? ( dbus )
-	libreoffice_extensions_nlpsolver? ( java )
-	libreoffice_extensions_scripting-beanshell? ( java )
-	libreoffice_extensions_scripting-javascript? ( java )
-	libreoffice_extensions_wiki-publisher? ( java )
-"
-
-RESTRICT="!test? ( test )"
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-
-[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	app-arch/unzip
-	app-arch/zip
-	app-crypt/gpgme:=[cxx]
-	app-text/hunspell:=
-	>=app-text/libabw-0.1.0
-	>=app-text/libebook-0.1
-	app-text/libepubgen
-	>=app-text/libetonyek-0.1
-	app-text/libexttextcat
-	app-text/liblangtag
-	>=app-text/libmspub-0.1.0
-	>=app-text/libmwaw-0.3.21
-	>=app-text/libnumbertext-1.0.6
-	>=app-text/libodfgen-0.1.0
-	app-text/libqxp
-	app-text/libstaroffice
-	app-text/libwpd:0.10[tools]
-	app-text/libwpg:0.3
-	>=app-text/libwps-0.4
-	app-text/mythes
-	>=dev-cpp/clucene-2.3.3.4-r2
-	>=dev-cpp/libcmis-0.6.2:0=
-	dev-db/unixODBC
-	dev-lang/perl
-	dev-libs/boost:=[nls]
-	dev-libs/expat
-	dev-libs/hyphen
-	dev-libs/icu:=
-	dev-libs/libassuan
-	dev-libs/libgpg-error
-	>=dev-libs/liborcus-0.18.0:0/0.18
-	dev-libs/librevenge
-	dev-libs/libxml2
-	dev-libs/libxslt
-	dev-libs/nspr
-	dev-libs/nss
-	>=dev-libs/redland-1.0.16
-	>=dev-libs/xmlsec-1.2.35:=[nss]
-	>=games-engines/box2d-2.4.1:0
-	media-gfx/fontforge
-	media-gfx/graphite2
-	media-libs/fontconfig
-	>=media-libs/freetype-2.11.0-r1:2
-	>=media-libs/harfbuzz-5.1.0:=[graphite,icu]
-	media-libs/lcms:2
-	>=media-libs/libcdr-0.1.0
-	>=media-libs/libepoxy-1.3.1[X]
-	>=media-libs/libfreehand-0.1.0
-	media-libs/libjpeg-turbo:=
-	media-libs/libpagemaker
-	>=media-libs/libpng-1.4:0=
-	>=media-libs/libvisio-0.1.0
-	media-libs/libwebp:=
-	media-libs/libzmf
-	media-libs/openjpeg:=
-	media-libs/tiff:=
-	media-libs/zxing-cpp:=
-	net-misc/curl
-	sci-mathematics/lpsolve:=
-	sys-libs/zlib
-	virtual/opengl
-	x11-libs/cairo[X]
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	accessibility? (
-		$(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
-	)
-	bluetooth? (
-		dev-libs/glib:2
-		net-wireless/bluez
-	)
-	coinmp? ( sci-libs/coinor-mp )
-	cups? ( net-print/cups )
-	dbus? ( sys-apps/dbus )
-	eds? (
-		dev-libs/glib:2
-		>=gnome-base/dconf-0.40.0
-		gnome-extra/evolution-data-server
-	)
-	firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	gtk? (
-		app-accessibility/at-spi2-core:2
-		dev-libs/glib:2
-		dev-libs/gobject-introspection
-		gnome-base/dconf
-		media-libs/mesa[egl(+)]
-		x11-libs/gtk+:3[X]
-		x11-libs/pango
-	)
-	kde? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtx11extras:5
-		kde-frameworks/kconfig:5
-		kde-frameworks/kcoreaddons:5
-		kde-frameworks/ki18n:5
-		kde-frameworks/kio:5
-		kde-frameworks/kwindowsystem:5
-	)
-	ldap? ( net-nds/openldap:= )
-	libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
-	libreoffice_extensions_scripting-javascript? ( >=dev-java/rhino-1.7.14:1.6 )
-	mariadb? ( dev-db/mariadb-connector-c:= )
-	!mariadb? ( dev-db/mysql-connector-c:= )
-	pdfimport? ( >=app-text/poppler-22.06:=[cxx] )
-	postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
-"
-# FIXME: cppunit should be moved to test conditional
-#        after everything upstream is under gbuild
-#        as dmake execute tests right away
-#        tests apparently also need google-carlito-fonts (not packaged)
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/libatomic_ops-7.2d
-	dev-perl/Archive-Zip
-	>=dev-util/cppunit-1.14.0
-	>=dev-util/gperf-3.1
-	dev-util/mdds:1/2.1
-	media-libs/glm
-	x11-base/xorg-proto
-	x11-libs/libXt
-	x11-libs/libXtst
-	java? (
-		dev-java/ant:0
-		>=virtual/jdk-11
-	)
-	test? (
-		app-crypt/gnupg
-		dev-util/cppunit
-		media-fonts/dejavu
-		media-fonts/liberation-fonts
-	)
-	valgrind? ( dev-debug/valgrind )
-"
-RDEPEND="${COMMON_DEPEND}
-	acct-group/libreoffice
-	acct-user/libreoffice
-	!app-office/libreoffice-bin
-	!app-office/libreoffice-bin-debug
-	media-fonts/liberation-fonts
-	|| ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
-	java? ( >=virtual/jre-11 )
-	kde? ( kde-frameworks/breeze-icons:* )
-"
-BDEPEND="
-	dev-util/intltool
-	sys-apps/which
-	app-alternatives/yacc
-	app-alternatives/lex
-	sys-devel/gettext
-	virtual/pkgconfig
-	clang? (
-		|| (
-			(	sys-devel/clang:18
-				sys-devel/llvm:18
-				=sys-devel/lld-18*	)
-			(	sys-devel/clang:17
-				sys-devel/llvm:17
-				=sys-devel/lld-17*	)
-			(	sys-devel/clang:16
-				sys-devel/llvm:16
-				=sys-devel/lld-16*	)
-			(	sys-devel/clang:15
-				sys-devel/llvm:15
-				=sys-devel/lld-15*	)
-		)
-	)
-	odk? ( >=app-text/doxygen-1.8.4 )
-"
-if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
-	PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
-else
-	# Translations are not reliable on live ebuilds
-	# rather force people to use english only.
-	RDEPEND+=" !app-office/libreoffice-l10n"
-fi
-
-PATCHES=(
-	# "${WORKDIR}"/${PATCHSET/.tar.xz/}
-
-	# not upstreamable stuff
-	"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
-	"${FILESDIR}/${PN}-6.1-nomancompress.patch"
-	"${FILESDIR}/${PN}-7.2.0.4-qt5detect.patch"
-
-	# TODO: upstream
-	"${FILESDIR}/${PN}-7.6-unused-qt5network.patch"
-
-	# maybe upstreamable
-	"${FILESDIR}/${PN}-7.5.8.2-icu-74-compatibility.patch"
-)
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-_check_reqs() {
-	CHECKREQS_MEMORY="512M"
-	if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		CHECKREQS_DISK_BUILD="22G"
-	else
-		CHECKREQS_DISK_BUILD="6G"
-	fi
-	check-reqs_$1
-}
-
-pkg_pretend() {
-	use base ||
-		ewarn "If you plan to use Base application you must enable USE base."
-	use java ||
-		ewarn "Without USE java, several wizards are not going to be available."
-
-	[[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
-}
-
-pkg_setup() {
-	java-pkg-opt-2_pkg_setup
-	python-single-r1_pkg_setup
-	xdg_environment_reset
-
-	[[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
-}
-
-src_unpack() {
-	default
-
-	if [[ ${MY_PV} = *9999* ]]; then
-		local base_uri branch mypv
-		base_uri="https://anongit.freedesktop.org/git"
-		branch="master"
-		mypv=${MY_PV/.9999}
-		[[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
-		git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
-		git-r3_checkout "${base_uri}/${PN}/core"
-		LOCOREGIT_VERSION=${EGIT_VERSION}
-
-		git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
-		git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
-	fi
-}
-
-src_prepare() {
-	default
-
-	# sandbox violations on many systems, we don't need it. Bug #646406
-	sed -i \
-		-e "/KF5_CONFIG/s/kf5-config/no/" \
-		configure.ac || die "Failed to disable kf5-config"
-
-	AT_M4DIR="m4" eautoreconf
-	# hack in the autogen.sh
-	touch autogen.lastrun
-
-	# sed in the tests
-	sed -i \
-		-e "s#all : build unitcheck#all : build#g" \
-		solenv/gbuild/Module.mk || die
-	sed -i \
-		-e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
-		-e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
-		Makefile.in || die
-
-	sed -i \
-		-e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
-		-e "s,\$INSTALLDIRNAME.sh,${PN}," \
-		bin/distro-install-desktop-integration || die
-
-	if use branding; then
-		# hack...
-		mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
-	fi
-
-	# Don't list pdfimport support in desktop when built with none, bug # 605464
-	if ! use pdfimport; then
-		sed -i \
-			-e ":MimeType: s:application/pdf;::" \
-			-e ":Keywords: s:pdf;::" \
-			sysui/desktop/menus/draw.desktop || die
-	fi
-}
-
-src_configure() {
-	# Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
-	# Note: these are for Gentoo use ONLY. For your own distribution, please get
-	# your own set of keys. Feel free to contact chromium@gentoo.org for more info.
-	local google_default_client_id="329227923882.apps.googleusercontent.com"
-	local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
-
-	# Show flags set at the beginning
-	einfo "Preset CFLAGS:    ${CFLAGS}"
-	einfo "Preset LDFLAGS:   ${LDFLAGS}"
-
-	# Workaround for bug #915067
-	append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
-
-	if use clang ; then
-		# Force clang
-		einfo "Enforcing the use of clang due to USE=clang ..."
-		AR=llvm-ar
-		CC=${CHOST}-clang
-		CXX=${CHOST}-clang++
-		NM=llvm-nm
-		RANLIB=llvm-ranlib
-		LDFLAGS+=" -fuse-ld=lld"
-
-		# Workaround for bug #907905
-		filter-lto
-
-		# Not implemented by Clang, bug #903889
-		filter-flags -Wlto-type-mismatch -Werror=lto-type-mismatch
-	else
-		# Force gcc
-		einfo "Enforcing the use of gcc due to USE=-clang ..."
-		AR=gcc-ar
-		CC=${CHOST}-gcc
-		CXX=${CHOST}-g++
-		NM=gcc-nm
-		RANLIB=gcc-ranlib
-
-		# Apparently the Clang flags get used even for GCC builds sometimes.
-		# bug #838115
-		sed -i -e "s/-flto=thin/-flto/" solenv/gbuild/platform/com_GCC_defs.mk || die
-	fi
-
-	if use custom-cflags ; then
-		elog "USE=custom-cflags has been selected. You are on your own to make sure that"
-		elog "the build succeeds. Good luck!"
-	else
-		strip-flags
-	fi
-
-	export LO_CLANG_CC=${CC}
-	export LO_CLANG_CXX=${CXX}
-
-	# Show flags set at the end
-	einfo "  Used CFLAGS:    ${CFLAGS}"
-	einfo "  Used LDFLAGS:   ${LDFLAGS}"
-
-	# Ensure we use correct toolchain
-	tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
-
-	# optimization flags
-	export GMAKE_OPTIONS="${MAKEOPTS}"
-	# System python enablement:
-	export PYTHON_CFLAGS=$(python_get_CFLAGS)
-	export PYTHON_LIBS=$(python_get_LIBS)
-
-	use kde && export QT5DIR="$(qt5_get_bindir)/.."
-
-	local gentoo_buildid="Gentoo official package"
-	if [[ -n ${LOCOREGIT_VERSION} ]]; then
-		gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
-	fi
-
-	# system headers/libs/...: enforce using system packages
-	# --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
-	# --enable-cairo: ensure that cairo is always required
-	# --enable-*-link: link to the library rather than just dlopen on runtime
-	# --enable-release-build: build the libreoffice as release
-	# --disable-fetch-external: prevent dowloading during compile phase
-	# --enable-extension-integration: enable any extension integration support
-	# --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
-	# --disable-report-builder: too much java packages pulled in without pkgs
-	# --without-system-sane: just sane.h header that is used for scan in writer,
-	#   not linked or anything else, worthless to depend on
-	# --disable-pdfium: not yet packaged
-	local myeconfargs=(
-		--with-system-dicts
-		--with-system-epoxy
-		--with-system-headers
-		--with-system-jars
-		--with-system-libs
-		--enable-build-opensymbol
-		--enable-cairo-canvas
-		--enable-largefile
-		--enable-mergelibs
-		--enable-python=system
-		--enable-randr
-		--enable-release-build
-		--disable-breakpad
-		--disable-bundle-mariadb
-		--disable-ccache
-		--disable-epm
-		--disable-fetch-external
-		--disable-gtk3-kde5
-		--disable-online-update
-		--disable-openssl
-		--disable-pdfium
-		--disable-qt6
-		--with-extra-buildid="${gentoo_buildid}"
-		--enable-extension-integration
-		--with-external-dict-dir="${EPREFIX}/usr/share/myspell"
-		--with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
-		--with-external-thes-dir="${EPREFIX}/usr/share/myspell"
-		--with-external-tar="${DISTDIR}"
-		--with-lang=""
-		--with-parallelism=$(makeopts_jobs)
-		--with-system-openjpeg
-		--with-tls=nss
-		--with-vendor="Gentoo Foundation"
-		--with-x
-		--without-fonts
-		--without-myspell-dicts
-		--with-help="html"
-		--without-helppack-integration
-		--with-system-gpgmepp
-		--without-system-abseil
-		--without-system-dragonbox
-		--without-system-frozen
-		--without-system-jfreereport
-		--without-system-libfixmath
-		--without-system-sane
-		$(use_enable base report-builder)
-		$(use_enable bluetooth sdremote-bluetooth)
-		$(use_enable coinmp)
-		$(use_enable cups)
-		$(use_enable dbus)
-		$(use_enable debug)
-		$(use_enable eds evolution2)
-		$(use_enable firebird firebird-sdbc)
-		$(use_enable gstreamer gstreamer-1-0)
-		$(use_enable gtk gtk3)
-		$(use_enable kde kf5)
-		$(use_enable kde qt5)
-		$(use_enable ldap)
-		$(use_enable odk)
-		$(use_enable pdfimport)
-		$(use_enable postgres postgresql-sdbc)
-		$(use_enable vulkan skia)
-		$(use_with accessibility lxml)
-		$(use_with coinmp system-coinmp)
-		$(use_with googledrive gdrive-client-id ${google_default_client_id})
-		$(use_with googledrive gdrive-client-secret ${google_default_client_secret})
-		$(use_with java)
-		$(use_with odk doxygen)
-		$(use_with valgrind)
-	)
-
-	if use eds || use gtk; then
-		myeconfargs+=( --enable-dconf --enable-gio )
-	else
-		myeconfargs+=( --disable-dconf --disable-gio )
-	fi
-
-	# libreoffice extensions handling
-	for lo_xt in ${LO_EXTS}; do
-		if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
-			myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
-		else
-			myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
-		fi
-	done
-
-	if use java; then
-		# hsqldb: system one is too new
-		myeconfargs+=(
-			--without-junit
-			--without-system-hsqldb
-			--with-ant-home="${ANT_HOME}"
-			--with-jdk-home="${JAVA_HOME}"
-		)
-
-		use libreoffice_extensions_scripting-beanshell && \
-			myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
-
-		use libreoffice_extensions_scripting-javascript && \
-			myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 rhino.jar) )
-	fi
-
-	tc-is-lto && myeconfargs+=( --enable-lto )
-
-	MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	# more and more LO stuff tries to use OpenGL, including tests during build
-	# bug 501508, bug 540624, bug 545974 and probably more
-	addpredict /dev/dri
-	addpredict /dev/ati
-	addpredict /dev/nvidiactl
-
-	default
-}
-
-src_test() {
-	emake unitcheck
-	emake slowcheck
-}
-
-src_install() {
-	emake DESTDIR="${D}" distro-pack-install -o build -o check
-
-	# bug 593514
-	if use gtk; then
-		dosym libreoffice/program/liblibreofficekitgtk.so \
-			/usr/$(get_libdir)/liblibreofficekitgtk.so
-	fi
-
-	# bash completion aliases
-	bashcomp_alias \
-		libreoffice \
-		unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
-
-	if use branding; then
-		insinto /usr/$(get_libdir)/${PN}/program
-		newins "${WORKDIR}/branding-sofficerc" sofficerc
-		dodir /etc/env.d
-		echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
-	fi
-
-	# bug 703474
-	insinto /usr/include
-	doins -r include/LibreOfficeKit
-
-	local lodir=/usr/$(get_libdir)/libreoffice
-	# patching this would break tests
-	cat <<-EOF > "${T}"/uno.py
-import sys, os
-sys.path.append('${EPREFIX}${lodir}/program')
-os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:${EPREFIX}${lodir}/program/fundamentalrc')
-EOF
-	sed -e "/^import sys/d" -e "/^import os/d" \
-		-i "${D}"${lodir}/program/uno.py || die "cleanup dupl imports failed"
-	cat "${D}"${lodir}/program/uno.py >> "${T}"/uno.py || die
-	cp "${T}"/uno.py "${D}"${lodir}/program/uno.py || die
-
-	# more system pyuno mess
-	sed -e "/sOffice = \"\" # lets hope for the best/s:\"\":\"${EPREFIX}${lodir}/program\":" \
-		-i "${D}"${lodir}/program/officehelper.py || die
-
-	python_optimize "${D}"${lodir}/program
-	# link python bridge in site-packages, bug 667802
-	local py pyc loprogdir=/usr/$(get_libdir)/libreoffice/program
-	for py in uno.py unohelper.py officehelper.py; do
-		dosym -r ${loprogdir}/${py} $(python_get_sitedir)/${py}
-		while IFS="" read -d $'\0' -r pyc; do
-			pyc=${pyc//*\/}
-			dosym -r ${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
-		done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0)
-	done
-
-	newinitd "${FILESDIR}/libreoffice.initd" libreoffice
-	newconfd "${FILESDIR}/libreoffice.confd" libreoffice
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
--- a/app-office/worklog-assistant-bin/Manifest
+++ b/app-office/worklog-assistant-bin/Manifest
@ -1,4 +1,6 @@
 AUX worklog-assistant-bin-2.1.3580-fix-desktop.patch 554 BLAKE2B cdbd1525257e8f54ef1fbc1d03d2779155bcaabf6ca6da9741d741da6622b3be171ae1afc56be07ffca74468233b914ca1a032a8cdcaa828052b4b0eb161ca1c SHA512 0fc20285b4ad932762b44d19c9db08d7150f79c136f74d6ff9add6f7f510489f3b56f7637ca5c2b2fb44e6572ff2e117ab84ad39f83edeecaf7774197b502371
 DIST worklog-assistant-v2_2.1.3580_amd64.deb 31434440 BLAKE2B 44a85e3cefa652fac6d01d2b3dc0e1a32128d8c7e27b6177d2c3187b97011cf5cce7493d67e9f989e034f26bd88589e3d9960232a5da2dbadf909c26bede2ce9 SHA512 cac38acfd7e00a57f6869d1205920a27f5e6cc0525b09cc7b76350df38d5b6dd673779df22fdf55e8e327cb591a1c4738fe23645a6e42b6d2753af2eb330a646
+DIST worklog-assistant-v2_2.3.3900_amd64.deb 38333978 BLAKE2B 5e12d4ddaf6354e817959752fddf6b9409a47c3dd32de4c8e946ab9dc3c2d44333f43de77fe575300520070d65f6e22bb1f521eda22d3b572585758b92f1c4c9 SHA512 94b2c16e6e802fbe240f58f115626018e3d63feed8704fd6769d21657b6bf98387f325d4986ed4b096e7ca11d9c55b8dd6a471ccc57e68fd2c60bbca16a10ebb
 EBUILD worklog-assistant-bin-2.1.3580.ebuild 722 BLAKE2B f8213a08a24669448e8e08799deddcbf120fb8a0504b94383c12b7b3fc24b547f6e9030bc724aa3961e6a0ccd0ed295b58a44a3f06f5310e3e11be9abbe4976c SHA512 9dc7745e69dda6c52ad630a9503b43f9c5b0e1a9ae822e2c4182181da1aa217915b7fe720b8194217ae3189c86d6a4f2faf43635db138a4fd8444c1038d5cc8e
+EBUILD worklog-assistant-bin-2.3.3900.ebuild 638 BLAKE2B e3e86d21b81c30bbc9bab978de654cbbcaff98c1c5af44fc55f35efe04bc753bfcc1a9c45a4ae7614f0e3ee1cf3450abd7ccec80e8eebf11c56d02adcc98cecf SHA512 c46a7d8f4b91575de6153e21eab53636ce8e82ee4cb26526830cb24374c9b5e6547d8488fe1573364654331b2aeeed3762d0e883aa10690d6c9df37540d6da98
 MISC metadata.xml 399 BLAKE2B e6fa10afcb35bbcf9ffaa7998a22227159b37fd5701da2097a3f70085c2dcb2cc3c7cb3ea454b298141382c27e33bd385d6881ea4b70f6cdf76bb2377d968d7e SHA512 8ebce62b9f656263d0553f0a4c0de9ad62a0fa3f67f0f1497c89233a78565d0e6a09c09942a716459707fb335ac86c49e46bdb3e86d5279e9518c20c17445d8b
--- a/app-office/worklog-assistant-bin/worklog-assistant-bin-2.3.3900.ebuild
+++ b/app-office/worklog-assistant-bin/worklog-assistant-bin-2.3.3900.ebuild
@ -0,0 +1,30 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit unpacker
+
+DESCRIPTION="Hassle-free time tracking for JIRA self-hosted and OnDemand"
+HOMEPAGE="https://worklogassistant.com"
+SRC_URI="https://worklogassistant.com/downloads/${PN%-bin}-v2_${PV}_amd64.deb"
+S=${WORKDIR}
+
+LICENSE="worklog-assistant"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+RESTRICT="fetch bindist strip"
+
+QA_PREBUILT="opt/Worklog Assistant/*"
+
+src_prepare() {
+	default
+
+	rm -r etc/ || die
+}
+
+src_install() {
+	mv * "${ED}" || die
+
+	dosym -r "/opt/Worklog Assistant/bin/Worklog Assistant" /opt/bin/WorklogAssistant
+}
--- a/app-pda/Manifest.gz
+++ b/app-pda/Manifest.gz
--- a/app-pda/usbmuxd/Manifest
+++ b/app-pda/usbmuxd/Manifest
@ -1,4 +1,3 @@
 DIST usbmuxd-1.1.1.tar.bz2 345290 BLAKE2B 580dd4e2fb05d6c4803d774f7d43c8399219d8f0ce4191428cb4fccffcc941894d0381d5f0746997570dd24e395af3dda340b1910827f9c5ace7e2d9cc176c6a SHA512 0e8829c93aac147a6b949fe95592d6ad9ea36e1c04676cb85accb4670a65b31065706fc438556def17b55850081d6c07deb325ca02b9853335b6e0b1049ba1da
-EBUILD usbmuxd-1.1.1-r2.ebuild 1025 BLAKE2B 6b841506494ab7c4963d8c52033c87f3ee30ec0ad7ab5fdb50bbe80f12fe873edf251c7d5de346cffa8abd934c2afff879f6cd68a4bb8d5ac57bc8992a731b44 SHA512 6a250ac08dd22d8dcf2d6469af243c45e2fde7fd8671ecf354be0294ea5d4fd6c50a05a129722357ee6bbe081cc89c33111e11f9922db78efdb3a682f10c28fc
-EBUILD usbmuxd-1.1.1.ebuild 937 BLAKE2B 36c169ef63922661d3acab3dad7b0f9b895194c86506784842407b07ebac90b2a948b3661060992867c99523a889f4d846de2acb6987d06bba7db1bd15052db2 SHA512 37a996370c2266c90932ad23b44748b0c699cfd6e0f10fed695d9ec5852e9e288e207ba2546fc79b076d78ec7e3f5090bd03439bf952019a1b0d3be2d9a9f6b0
+EBUILD usbmuxd-1.1.1-r2.ebuild 1023 BLAKE2B 42f26117cb899eecc6e39ae3e1f0be4aa562f5e8b456e8d0ae3d15467f5d5293d3dd47016f681a91a6431ab52a706f1cba380023d1165675775fdf3e0810be89 SHA512 3800baa29fa37858d1a498c1e6bceeb8cbb666acd737364cc84a1adb3c92e2116b88fbf10b6f55b71bfebe8723735acb11417f09c9087d79294a411a80e4e02d
 MISC metadata.xml 489 BLAKE2B 59caec3b41e2864b320df6b86cb3169a03867f390f689d938512d28e99404c0d57d070ace55c3d04e83dd5d254222cc1e7affa334a684ac34f7a9900e8437f8b SHA512 4ffbbfc34b81774984931106df1ec706ee5bc5b635ef58f78daf3b54d9952d0e5799f69bf9cc7178e0849ed426ad31bc2e71aff4af33ff7dfca6bc9a0c605eac
--- a/app-pda/usbmuxd/usbmuxd-1.1.1-r2.ebuild
+++ b/app-pda/usbmuxd/usbmuxd-1.1.1-r2.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=8
@ -12,7 +12,7 @@ SRC_URI="https://github.com/libimobiledevice/usbmuxd/releases/download/${PV}/${P
 # src/utils.h is LGPL-2.1+, rest is found in COPYING*
 LICENSE="|| ( GPL-2 GPL-3 ) LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 IUSE="selinux systemd"

 DEPEND="
--- a/app-pda/usbmuxd/usbmuxd-1.1.1.ebuild
+++ b/app-pda/usbmuxd/usbmuxd-1.1.1.ebuild
@ -1,44 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools systemd udev
-
-DESCRIPTION="USB multiplex daemon for use with Apple iPhone/iPod Touch devices"
-HOMEPAGE="https://libimobiledevice.org/"
-SRC_URI="https://github.com/libimobiledevice/usbmuxd/releases/download/${PV}/${P}.tar.bz2"
-
-# src/utils.h is LGPL-2.1+, rest is found in COPYING*
-LICENSE="GPL-2 GPL-3 LGPL-2.1+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
-IUSE="selinux systemd"
-
-DEPEND="
-	acct-user/usbmux
-	>=app-pda/libimobiledevice-1.0:=
-	>=app-pda/libplist-2.0:=
-	virtual/libusb:1"
-
-RDEPEND="
-	${DEPEND}
-	virtual/udev
-	selinux? ( sec-policy/selinux-usbmuxd )
-"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_with systemd) \
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
-		--with-udevrulesdir="$(get_udevdir)"/rules.d
-}
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
--- a/app-portage/golop/Manifest
+++ b/app-portage/golop/Manifest
@ -1,4 +1,3 @@
 DIST golop-0.2.1.tar.gz 9315 BLAKE2B 0b0410910f17121f334c270f71dfb0fb4a1eb909893a241c3bbf1b4473d70be5b1b6d318d61d25e1379e30b8956a0ca37b3cbf2aeb6efcecd6ee14d6c3571c9b SHA512 65a12771784d3676001ed55ac389dfc26f5c2120240a3fbd6efc1954abc19be4d9e1de403dcec1c9de3f3385b2286a6836604fb0ffe9eb071467454bf8c41f56
-EBUILD golop-0.2.1.ebuild 637 BLAKE2B 1934871f83e5f45415a8ca0b5fea9f0c49e5a45bab2f7823210bb52b677c3f21b37dde8356ddeb487ab5f8d7f8cc7fd19f55f10ca1e23a119d226214070a2cf9 SHA512 eaf6c0ed7226ce7f49ca98eff8f7e101e023550b7e8587147c1d9e5e7c36a582ee44587b138812c27b339437d5d6423354632d2948f6aec07966069f570fa13d
-EBUILD golop-9999.ebuild 763 BLAKE2B ac86fee8ac66116601f8fa44ae56f55fc168ef818f495125efb82b25c2d1d4711e3fb7a7855c1600d186e09de8eff1b242b278b33e4625d7f918455d8cc5fd76 SHA512 6c0b8e8ef068c0271bbc2e3ba3058e1ef0de9ee13775c1d09f4dab9b436db57d83aaedc1b5bd94484a113bfae6cf86e8e1e37a5bbe8ec2d0003de0d18acdf5aa
+EBUILD golop-0.2.1-r1.ebuild 486 BLAKE2B 9b0e84889e237822cafb7fa3412ce0d88e2d01bca6600b03ed05790373d024953d1fe915732b29b943c1c8ee5f62d6e547f8399708972588d6ddedbafe464f42 SHA512 d3cebee0689d52e46414f107b5d92144e05c1eee7451eb64bc5b5c707b6943ed9231fdb89edaa600f97e685cc86d2d18b5d3a9db3c3869319468947baa1364ea
 MISC metadata.xml 384 BLAKE2B 766a5245cff7800b8837614f30eec53c1fc27317adbe0b21fa2700fe7731b309f6507b20b563e00b536060f732f7e678b5c93ea40c30cee76bf1dbe0260950df SHA512 89204b427541b0b5391be51e58d16b56acc37719f037b0509f84bcf721e3bcf43e65743b78e7fdeba6ffac9e105cd479663051899fb283c069832e6beaf995db
--- a/app-portage/golop/golop-0.2.1-r1.ebuild
+++ b/app-portage/golop/golop-0.2.1-r1.ebuild
@ -0,0 +1,25 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module
+
+DESCRIPTION="A pure Go re-implementation of genlop"
+HOMEPAGE="https://github.com/klausman/golop"
+SRC_URI="https://github.com/klausman/golop/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+src_compile() {
+	ego build -v -o ${PN}
+}
+
+src_install() {
+	dobin ${PN}
+
+	local DOCS=( README.md )
+	einstalldocs
+}
--- a/app-portage/golop/golop-0.2.1.ebuild
+++ b/app-portage/golop/golop-0.2.1.ebuild
@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-EGO_PN=github.com/klausman/golop
-
-if [[ ${PV} = *9999* ]]; then
-	inherit golang-vcs
-else
-	KEYWORDS="~amd64 ~riscv ~x86"
-	EGIT_COMMIT=v${PV}
-	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	inherit golang-vcs-snapshot
-fi
-inherit golang-build
-
-DESCRIPTION="A pure Go re-implementation of genlop"
-HOMEPAGE="https://github.com/klausman/golop"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-DEPEND=""
-RDEPEND=""
-
-src_install() {
-	dobin ${PN}
-
-	declare -a DOCS
-	DOCS+=( src/${EGO_PN}/README.md )
-	einstalldocs
-}
--- a/app-portage/golop/golop-9999.ebuild
+++ b/app-portage/golop/golop-9999.ebuild
@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-EGO_PN=github.com/klausman/golop
-
-if [[ ${PV} = *9999* ]]; then
-	inherit golang-vcs
-else
-	KEYWORDS="~amd64 ~x86"
-	EGIT_COMMIT=v${PV}
-	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	inherit golang-vcs-snapshot
-fi
-inherit golang-build prefix
-
-DESCRIPTION="A pure Go re-implementation of genlop"
-HOMEPAGE="https://github.com/klausman/golop"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-DEPEND=""
-RDEPEND=""
-
-src_prepare() {
-	sed -i -e 's@/var/log/emerge.log@'"${EPREFIX}"'&@g' src/github.com/klausman/golop/main.go || die
-	default
-}
-
-src_install() {
-	dobin ${PN}
-
-	declare -a DOCS
-	DOCS+=( src/${EGO_PN}/README.md )
-	einstalldocs
-}
--- a/app-portage/portage-utils/Manifest
+++ b/app-portage/portage-utils/Manifest
@ -1,8 +1,10 @@
 DIST portage-utils-0.95.tar.xz 1806140 BLAKE2B 5a468a7b4006073203ba634a5d70398e254ef5db7e9b71fbcf20bce68942f74acce1d42b5d315931f93e8698c8dd2f38f328fcc6fdaa86addba7dbcc21fce5fa SHA512 2d1f4b986a377249043259d8ada1a35a7dd55179f0ef5c2c18a4180c8f1f7064133ab2677426098e61b1355fa26cb0f8aa3c6ea06d46af4c4ba2df4eb53489a4
 DIST portage-utils-0.96.1.tar.xz 1807156 BLAKE2B 6bf334c0083e5e8b0d6206ff43d4df0e32a9576ddedbe055cb6ef903b5f11d0878512ace7f93ea37207181321ca160a8f721b3095b2bcbfcdbb353ba3f5d4873 SHA512 769e734e0738aa52408fd6c151706085148818a19b2ad1051684e2d54fe9f486f2e3a25e8fb408c83325cfb428644c6c0aa3b6d1bac0d2189680c70d9657bcbf
 DIST portage-utils-0.96.tar.xz 1806032 BLAKE2B 93ef9658a4b0bae7fb0527462bd9d0d19f396262818380d8ec2022c9fda596265c50adc262bdf296a4dd8c6b891b064316281d21444c8b903db20ca2463879e3 SHA512 cc32f53532c082544cabe505d8b90b947b6ab48742678aa98cbe9ba291625e8449ed0ecd90e01dc00b06c209b34001ad57a060918658e53d3babdc5c76ea7b02
+DIST portage-utils-0.97.tar.xz 1861616 BLAKE2B bdb4c6c1260a00304fb2c659629e0ddd4ca0378b1a060ea8b1f02ecb6060b4101c6e8984a6befd8b831a2b415fcdc5a51b6dac2fb203b36585f4a7d389ea0913 SHA512 f0f9ecf87df6e08b7f7dbdfe758c1a585a6836478d3adbcecdc2e33c9cfd78a5a10ae3090f0aa5ad0fa8a1eff88bf9e512d861b46bc77e5a536b46a3b36cd466
 EBUILD portage-utils-0.95-r1.ebuild 1584 BLAKE2B ac31f1b1f41e628f7e6b6f3a70bf274266912bd99f8eb4803a9d793017fbe09d489ea49b74d1100066481e8962e836864860146bba4ab412e98e682a9ad4a2ba SHA512 95fc8f824ec4cc84474cf33eb25df3b9cc8abdb1179672dbb8bb4762cea01c32c04a531ee430a6fdd85d5c321ff8d7f0dc22b1c9963e044bb7f3aab4c7991b2f
 EBUILD portage-utils-0.96-r1.ebuild 1584 BLAKE2B ac31f1b1f41e628f7e6b6f3a70bf274266912bd99f8eb4803a9d793017fbe09d489ea49b74d1100066481e8962e836864860146bba4ab412e98e682a9ad4a2ba SHA512 95fc8f824ec4cc84474cf33eb25df3b9cc8abdb1179672dbb8bb4762cea01c32c04a531ee430a6fdd85d5c321ff8d7f0dc22b1c9963e044bb7f3aab4c7991b2f
 EBUILD portage-utils-0.96.1.ebuild 1685 BLAKE2B 2a6d5c615ef36f1000feaa1ab82cabf3cd3098d8e95922578e6927904e73cfbd5327177665c3b391973d72c979623dc9d9f9b56bdb8ab0a334c2ed99b75b0043 SHA512 41a02b6dd19663fd3bac66f67bf4cbc7ccc963b9c3cfc28453e9e8d02dbe4f6c732efabd0c32b957ee3331c735ce4173bd320ade189d669d12102ef66ec19c78
-EBUILD portage-utils-9999.ebuild 1693 BLAKE2B 50f0304c702ccb077f5a6aae62366d6ea00efeb3b6895ec4be4db7bb937e28bd4c90da3129c4fb65705a50d01cc293e050fb29b062b8ed0ad7da19fb35479f60 SHA512 4aabbb86b697ec017b4005fd90b61e85db74bad5a51ae6a9f2a12741d59e39e5b46773271af7c22e21a92056715dd4779938b621bba187b27557ca0ce4f5bf23
+EBUILD portage-utils-0.97.ebuild 1498 BLAKE2B 36e8c8aed19ae42459f1be055f0b1cba08c502015c427c1b77631c48124701a8ff21be94c495cdb855077d366ccce844b18c3bb2853b48c2f2b45edb27b24396 SHA512 999abf23a49f27a65970ac0d51aafe2e037eb2911e49661db016d01d4e17e41415ca7d5c193c1a0e3106fafa2edd50a51b96b560feb6ca6bb8d79cf4ac1839bb
+EBUILD portage-utils-9999.ebuild 1498 BLAKE2B 36e8c8aed19ae42459f1be055f0b1cba08c502015c427c1b77631c48124701a8ff21be94c495cdb855077d366ccce844b18c3bb2853b48c2f2b45edb27b24396 SHA512 999abf23a49f27a65970ac0d51aafe2e037eb2911e49661db016d01d4e17e41415ca7d5c193c1a0e3106fafa2edd50a51b96b560feb6ca6bb8d79cf4ac1839bb
 MISC metadata.xml 634 BLAKE2B c978ccbc0b82eb167f0a2a836c6f3d1942e470d41c8f76fcae289ad8600b37cd314cf9ad6b33a5cd04087fb21862a4ccb2aeee77982e6086c3f90a61461f697b SHA512 778ad68a12e616f2a9e804cb01623cc4a33c0ea6e3d1fa2e653b98d1cdb1716dab36d601faa2fbff47a7aff22ad4ddf6f42fae839184ba748ff4f266b3c2f447
--- a/app-portage/portage-utils/portage-utils-0.97.ebuild
+++ b/app-portage/portage-utils/portage-utils-0.97.ebuild
@ -0,0 +1,70 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Small and fast Portage helper tools written in C"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Portage-utils"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3 autotools
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage-utils.git"
+else
+	SRC_URI="https://dev.gentoo.org/~grobian/distfiles/${P}.tar.xz"
+	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
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="openmp +qmanifest static"
+
+RDEPEND="
+	openmp? ( || (
+		sys-devel/gcc:*[openmp]
+		sys-libs/libomp
+	) )
+	qmanifest? (
+		!static? (
+			app-crypt/gpgme:=
+			app-crypt/libb2:=
+			sys-libs/zlib:=
+		)
+	)"
+DEPEND="${RDEPEND}
+	qmanifest? (
+		static? (
+			app-crypt/gpgme[static-libs]
+			app-crypt/libb2[static-libs]
+			sys-libs/zlib[static-libs]
+		)
+	)"
+BDEPEND="virtual/pkgconfig"
+
+# bug #898362, gnulib explicit checks
+QA_CONFIG_IMPL_DECL_SKIP=(
+	"MIN"
+	"unreachable"
+	"alignof"
+	"static_assert"
+)
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_prepare() {
+	default
+	[[ ${PV} == *9999 ]] && eautoreconf
+}
+
+src_configure() {
+	use static && append-ldflags -static
+
+	econf \
+		--disable-maintainer-mode \
+		--with-eprefix="${EPREFIX}" \
+		$(use_enable qmanifest) \
+		$(use_enable openmp)
+}
--- a/app-portage/portage-utils/portage-utils-9999.ebuild
+++ b/app-portage/portage-utils/portage-utils-9999.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=8
@ -18,7 +18,7 @@ fi

 LICENSE="GPL-2"
 SLOT="0"
-IUSE="openmp +qmanifest +qtegrity static"
+IUSE="openmp +qmanifest static"

 RDEPEND="
 	openmp? ( || (
@ -29,33 +29,26 @@ RDEPEND="
 		!static? (
 			app-crypt/gpgme:=
 			app-crypt/libb2:=
-			dev-libs/openssl:=
 			sys-libs/zlib:=
 		)
-	)
-	qtegrity? (
-		!static? (
-			dev-libs/openssl:=
-		)
 	)"
 DEPEND="${RDEPEND}
 	qmanifest? (
 		static? (
 			app-crypt/gpgme[static-libs]
 			app-crypt/libb2[static-libs]
-			dev-libs/openssl[static-libs]
 			sys-libs/zlib[static-libs]
 		)
-	)
-	qtegrity? (
-		static? (
-			dev-libs/openssl[static-libs]
-		)
 	)"
 BDEPEND="virtual/pkgconfig"

-# bug #898362, gnulib check explicitly looks for MIN in some headers
-QA_CONFIG_IMPL_DECL_SKIP="MIN"
+# bug #898362, gnulib explicit checks
+QA_CONFIG_IMPL_DECL_SKIP=(
+	"MIN"
+	"unreachable"
+	"alignof"
+	"static_assert"
+)

 pkg_setup() {
 	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
@ -73,6 +66,5 @@ src_configure() {
 		--disable-maintainer-mode \
 		--with-eprefix="${EPREFIX}" \
 		$(use_enable qmanifest) \
-		$(use_enable qtegrity) \
 		$(use_enable openmp)
 }
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@ -7,6 +7,9 @@ AUX bash-5.2_p21-wpointer-to-int.patch 512 BLAKE2B 0c7f5eb5b697abf15c1d17888a973
 AUX bash-5.2_p26-memory-leaks.patch 4357 BLAKE2B 1b9f08054b28fa0e73b7b3d4da2674efd75b3ce11392a078d5072ba8e466f4a9c504892f9a1f2f62e4dc39b22050e68d42bcbae8ebe537df699d0c884c89a0b9 SHA512 ad30a74b7f4ecf5f7446867baf9b177fb1036e384b61a2ed73b121b17b7f686f9bdf9295c5c251b11d165f80e6110a2768257a2460c7e93abe78a5f763b972e8
 AUX bash_logout 205 BLAKE2B b8c0266c3d1e31a714304a2b3b33389f042ae5bd497379f9b15ce31d47d1e3da73ba6536023953b00efe27b687e2ff45d94e3f01a13acc824dc12e31552c5b94 SHA512 7234250c03fc920996a381f9daef9e2d8ab1e1a29acdebed6669d8e0fe1c872a7fa343adf7d9ddc81225b0cd9eb223ba7ad1ff42448aff057fc6d6baa8f04a7d
 AUX bashrc 3494 BLAKE2B e9379c18fca85666cd347d1d8cf5c9859c5865ad7a3ded1ac5724bad6117924231e89dcc21f1a80931591e9a39c1acc3f7be8b2afe38986ea34b3b8fc12f5814 SHA512 a8fa416ab9265055e778fad3e4190ab5f57da0823c12d60a915bb77ba701fe93df8d16e041dd5747ed9db899a2516451b803db648aed0f85f0abb6d98c9414b8
+AUX bashrc-r1 535 BLAKE2B bac05d534c76162950cc6f5046496ef634773ab768f6dc71e4387d2138426fcc06b52b93553db8f51f575bd8aecaf07f353ae7951aa9bb917babb5a58d729ae6 SHA512 cee0680dc31a1f9048ddb0dd41fea808403f17d319a115539486290e14abb359dd461f91963f63fb2c2b6315576baaac999b2e40fe7b33aeb0561b4695b4b9c8
+AUX bashrc.d/10-gentoo-color.bash 2087 BLAKE2B 05c5fafacd862f9d2da1deab9cebc09bd2855103b5693d85bc92b13003d6ce1de183cdfd0e06c4b8102f7ab3e7ad0bda5a825d257e99f98a8a66b901d646ceb2 SHA512 89ee045c258489cffcfcf8ea19aeced957edfddcae6b5e94c6f57e07210e6695c9f8939dae7e0e32a5498deae040c80ab894ce1f80ee4a4a2dad3e47a5289fa7
+AUX bashrc.d/10-gentoo-title.bash 2062 BLAKE2B 8ccb72bb2a898db367a3c26da00ceb94d0a65b42b983bff19a793a7031d63f1f803e40d370c6aa289e2992b1ab812dbab41906c3f1cfaf9060bb6852d4585952 SHA512 75f7a37e8558d8b72632d0405cee68f13a01bbd4f82c983ac04b7515b6e470c108b6c01b01f25f974fba8b4c82a0e9d4d18d55b7da3877190345476c94714e40
 AUX dot-bash_logout 127 BLAKE2B 8290778aea3426f4c56e5a9e7328faa76f99001fc7ce3eeb3ec26624edcd918d7e946da9a63ffcd0cf0f739b528ccb9e764d448276fe4344b69ef2036fdd9921 SHA512 e0248b5087656a4dd3a4790ed8e6101866b922ccab36b510b3bf408dc0c583e70f323fbad0392e4ea6ca5dcbe73568733e0c0aa9c8ce6b00ff5f72bf3e9fd8fd
 AUX dot-bash_profile 204 BLAKE2B cdb5ece2bea3b47651e2c9ca8d48ef3b0c4b7e2d660632d79edf3cdcea8f5f5a061019739b977538b25f2ace9dcb46e25b30e2d566ea71f6c1ac05388e59c957 SHA512 97ad83696b7eb8b084a53530d1a3e7648722ae4199c91737ceb02b8238e7637b0770731f5140ffb552142311f79b140a041d7e1e5366ba60399b0019f164fce9
 AUX dot-bashrc 551 BLAKE2B e245955936f0e036073e7fe153bd01181ae7206a73b45b0411e8d1a6eb0b7131dce260755eed00d2639848eebaefacf7c13087d4315b17f85fbafa6eba4c9fd8 SHA512 518b62aa2fa30e7d1692847929a6ce8dae4eac93e8b16d223d1ae86f4d5b076bcbe1852c9034f321c013e17502db9f771979957c67f8e8a71ca4eea7bfe9cc1b
@ -449,6 +452,8 @@ EBUILD bash-4.4_p23-r2.ebuild 6356 BLAKE2B 7501ac7628fcd2f35d9ca6c2153190d252454
 EBUILD bash-5.0_p18-r2.ebuild 7680 BLAKE2B 6a615f5ef093b32e85bfe8a0fd270d9c636c5d178ba518a8382e1ad5f0a2e128ad85fec1c8441c416c836bdf83ad5ad0e154f79792a908fd6a97ef23750b1800 SHA512 43a8e61a3b754c5ff25a4c7c6c62c07be626c0e9c1515fcfa8a15e25a3b0aff9fa4d00275c2d64bcb506417a7babb6ee120cde118fd7c9255fade7245adeaaae
 EBUILD bash-5.1_p16-r6.ebuild 8844 BLAKE2B 11fffeaad92d1f30c0818232f3f2a79b7066dd95abdf949b17f3568bea4fb03dadd21cd888eae5f6f5400280747c0214824183b6619d60fa41683332d677865c SHA512 315896706efe51bd7305768217eb30363dbb1154efd460d3780b464ebcc49931aac5ee1e3142d9bd1fa007982e0c389cd68f66049882507ba9c31d2b9d639740
 EBUILD bash-5.1_p16-r7.ebuild 8906 BLAKE2B 5db7108b49a5dd2366aa3d06a35433fb82f6d5ee61134d277a2e811bfeaa5ba92b3192b33c211d0d26aed0e380d95670df396d6672635f6c335d77fbca06ec4c SHA512 415ce1a83da7784cc3543da6bbd01c8f07b82a4b6bdb24bcfc7518a402830d3c12788f5b911ed52ad6441b4a6b4928de4c1eb06bc3d0cf3a7e57fa34bbd889f9
+EBUILD bash-5.1_p16-r8.ebuild 10018 BLAKE2B 172af72af7ab1bb48a94991131c7567f33b31cc4ac322e6caa0d6013f0f1e5709322377537d5918c314a8c38979202849ef1133e8b00d67f9068ea7333af9b39 SHA512 ab1ccefe265c956ffff038b839daabd8f0303bb3b07d165c3260026f896808be6a9153a5ead7bdde28e49ec66fc8811ab5528720aa5cd9b86c45d0e0ba7fa3bc
+EBUILD bash-5.2_p26-r1.ebuild 11878 BLAKE2B dc6dd8f0fabaef5b3b67456e273e148047b250cad2a10c45fceb3bbd31ddbe957fcd531402e9677c48936b62658a507e353bf51c0e2d813324288c1957d9bfac SHA512 2f2c72689be5453ca8179bf71bb87e0e5281c7932afc8c437a1e233d9caf43a9d34a2097f0b0c3052cbeac3e9b7dff7e8fe3625e6f2e5f1749c02092a623a8da
 EBUILD bash-5.2_p26.ebuild 10766 BLAKE2B 9ba3f7d2cf9cf217c3632ce940bb21f7af94ab7fa9a6e5a90a73d3cdb82d0102fa624a786465f0b22c018d76542c740aace840ec8cdea663f071565e9deabf05 SHA512 2668927ab8ac0a0ea4b271efa87a56d2ecc61eb4827c12e0a361c6c17f0e7fae8035df6735e2b7327ab59caea08ac08d5ed5eb4e460a9998274234481f8e9573
 EBUILD bash-9999.ebuild 10533 BLAKE2B 71b66f51269d4810aedd89aa6371762fcece77ebd2e4e3de6f1139e73b15aad166c7802a755249b26502eb65ca707c9e54c5c5ef620fa590fbe9333c28b8730b SHA512 5235dc057c497b3aed582217a4d0ecf244240f8c005db4a448aa5877fbe0a6ad2fc5ccc9f96436f380020b9ee899c3543c4c2cf71fda6f3f893e4a6008ecd90d
 MISC metadata.xml 1009 BLAKE2B f71587b0a6d05b907f82b26be93b071290d91dc8f612f7b008a05eaa94d45be2ef8c1d992b7ac886648a9dcf964c30e8d9a7aff90d44835beb452e0d635b9533 SHA512 8aa1cb4c3206a76d10181394a91c315967fd9d3b359194f430f075fdd5a0b4b32149eec36b85412ef7e84b55e7b01955c75486b2df82b392a5acb3df8229a88d
--- a/app-shells/bash/bash-5.1_p16-r8.ebuild
+++ b/app-shells/bash/bash-5.1_p16-r8.ebuild
@ -0,0 +1,353 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/chetramey.asc
+inherit flag-o-matic toolchain-funcs prefix verify-sig
+
+# Uncomment if we have a patchset
+GENTOO_PATCH_DEV="sam"
+GENTOO_PATCH_VER="${PV}"
+
+# Official patchlevel
+# See ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/
+PLEVEL="${PV##*_p}"
+MY_PV="${PV/_p*}"
+MY_PV="${MY_PV/_/-}"
+MY_P="${PN}-${MY_PV}"
+MY_PATCHES=()
+
+is_release() {
+	case ${PV} in
+		*_alpha*|*_beta*|*_rc*)
+			return 1
+			;;
+		*)
+			return 0
+			;;
+	esac
+}
+
+[[ ${PV} != *_p* ]] && PLEVEL=0
+
+# The version of readline this bash normally ships with.
+READLINE_VER="8.1"
+
+DESCRIPTION="The standard GNU Bourne again shell"
+HOMEPAGE="https://tiswww.case.edu/php/chet/bash/bashtop.html"
+
+if is_release ; then
+	SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz"
+	SRC_URI+=" verify-sig? ( mirror://gnu/bash/${MY_P}.tar.gz.sig )"
+
+	if [[ ${PLEVEL} -gt 0 ]] ; then
+		# bash-5.1 -> bash51
+		my_p=${PN}$(ver_rs 1-2 '' $(ver_cut 1-2))
+
+		patch_url=
+		my_patch_index=
+
+		upstream_url_base="mirror://gnu/bash"
+		mirror_url_base="ftp://ftp.cwru.edu/pub/bash"
+
+		for ((my_patch_index=1; my_patch_index <= ${PLEVEL} ; my_patch_index++)) ; do
+			printf -v mangled_patch_ver ${my_p}-%03d ${my_patch_index}
+			patch_url="${upstream_url_base}/${MY_P}-patches/${mangled_patch_ver}"
+
+			SRC_URI+=" ${patch_url}"
+			SRC_URI+=" verify-sig? ( ${patch_url}.sig )"
+
+			# Add in the mirror URL too.
+			SRC_URI+=" ${patch_url/${upstream_url_base}/${mirror_url_base}}"
+			SRC_URI+=" verify-sig? ( ${patch_url/${upstream_url_base}/${mirror_url_base}} )"
+
+			MY_PATCHES+=( "${DISTDIR}"/${mangled_patch_ver} )
+		done
+
+		unset my_p patch_url my_patch_index upstream_url_base mirror_url_base
+	fi
+else
+	SRC_URI="ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz"
+	SRC_URI+=" verify-sig? ( ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz.sig )"
+fi
+
+if [[ -n ${GENTOO_PATCH_VER} ]] ; then
+	SRC_URI+=" https://dev.gentoo.org/~${GENTOO_PATCH_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${GENTOO_PATCH_VER}-patches.tar.xz"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+[[ "${PV}" == *_rc* ]] || \
+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="afs bashlogger examples mem-scramble +net nls plugins +readline"
+
+DEPEND="
+	>=sys-libs/ncurses-5.2-r2:0=
+	nls? ( virtual/libintl )
+	readline? ( >=sys-libs/readline-${READLINE_VER}:0= )
+"
+RDEPEND="
+	${DEPEND}
+"
+# We only need bison (yacc) when the .y files get patched (bash42-005, bash51-011)
+BDEPEND="sys-devel/bison
+	verify-sig? ( sec-keys/openpgp-keys-chetramey )"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	# Patches from Chet sent to bashbug ml
+	"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}-patches/${PN}-5.0-syslog-history-extern.patch
+
+	"${FILESDIR}"/${PN}-5.1_p16-configure-clang16.patch
+)
+
+pkg_setup() {
+	# bug #7332
+	if is-flag -malign-double ; then
+		eerror "Detected bad CFLAGS '-malign-double'.  Do not use this"
+		eerror "as it breaks LFS (struct stat64) on x86."
+		die "remove -malign-double from your CFLAGS mr ricer"
+	fi
+
+	if use bashlogger ; then
+		ewarn "The logging patch should ONLY be used in restricted (i.e. honeypot) envs."
+		ewarn "This will log ALL output you enter into the shell, you have been warned."
+	fi
+}
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+	else
+		if use verify-sig ; then
+			verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.gz{,.sig}
+
+			local patch
+			for patch in "${MY_PATCHES[@]}" ; do
+				verify-sig_verify_detached ${patch}{,.sig}
+			done
+		fi
+
+		unpack ${MY_P}.tar.gz
+
+		if [[ -n ${GENTOO_PATCH_VER} ]] ; then
+			unpack ${PN}-${GENTOO_PATCH_VER}-patches.tar.xz
+		fi
+	fi
+}
+
+src_prepare() {
+	# Include official patches
+	[[ ${PLEVEL} -gt 0 ]] && eapply -p0 "${MY_PATCHES[@]}"
+
+	# Clean out local libs so we know we use system ones w/releases.
+	if is_release ; then
+		rm -rf lib/{readline,termcap}/* || die
+		touch lib/{readline,termcap}/Makefile.in || die # for config.status
+		sed -ri -e 's:\$[{(](RL|HIST)_LIBSRC[)}]/[[:alpha:]_-]*\.h::g' Makefile.in || die
+	fi
+
+	# Prefixify hardcoded path names. No-op for non-prefix.
+	hprefixify pathnames.h.in
+
+	# Avoid regenerating docs after patches, bug #407985
+	sed -i -r '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in || die
+	touch -r . doc/* || die
+
+	eapply -p0 "${PATCHES[@]}"
+	eapply_user
+}
+
+src_configure() {
+	# Upstream only test with Bison and require GNUisms like YYEOF and
+	# YYERRCODE. The former at least may be in POSIX soon:
+	# https://www.austingroupbugs.net/view.php?id=1269.
+	# configure warns on use of non-Bison but doesn't abort. The result
+	# may misbehave at runtime.
+	unset YACC
+
+	local myconf=(
+		--disable-profiling
+
+		# Force linking with system curses ... the bundled termcap lib
+		# sucks bad compared to ncurses.  For the most part, ncurses
+		# is here because readline needs it.  But bash itself calls
+		# ncurses in one or two small places :(.
+		--with-curses
+
+		$(use_enable mem-scramble)
+		$(use_enable net net-redirections)
+		$(use_enable readline)
+		$(use_enable readline bang-history)
+		$(use_enable readline history)
+		$(use_with afs)
+		$(use_with mem-scramble bash-malloc)
+	)
+
+	# For descriptions of these, see config-top.h
+	# bashrc/#26952 bash_logout/#90488 ssh/#24762 mktemp/#574426
+	append-cppflags \
+		-DDEFAULT_PATH_VALUE=\'\""${EPREFIX}"/usr/local/sbin:"${EPREFIX}"/usr/local/bin:"${EPREFIX}"/usr/sbin:"${EPREFIX}"/usr/bin:"${EPREFIX}"/sbin:"${EPREFIX}"/bin\"\' \
+		-DSTANDARD_UTILS_PATH=\'\""${EPREFIX}"/bin:"${EPREFIX}"/usr/bin:"${EPREFIX}"/sbin:"${EPREFIX}"/usr/sbin\"\' \
+		-DSYS_BASHRC=\'\""${EPREFIX}"/etc/bash/bashrc\"\' \
+		-DSYS_BASH_LOGOUT=\'\""${EPREFIX}"/etc/bash/bash_logout\"\' \
+		-DNON_INTERACTIVE_LOGIN_SHELLS \
+		-DSSH_SOURCE_BASHRC \
+		$(use bashlogger && echo -DSYSLOG_HISTORY)
+
+	# Don't even think about building this statically without
+	# reading bug #7714 first.  If you still build it statically,
+	# don't come crying to us with bugs ;).
+	#use static && export LDFLAGS="${LDFLAGS} -static"
+	use nls || myconf+=( --disable-nls )
+
+	# Historically, we always used the builtin readline, but since
+	# our handling of SONAME upgrades has gotten much more stable
+	# in the PM (and the readline ebuild itself preserves the old
+	# libs during upgrades), linking against the system copy should
+	# be safe.
+	# Exact cached version here doesn't really matter as long as it
+	# is at least what's in the DEPEND up above.
+	export ac_cv_rl_version=${READLINE_VER%%_*}
+
+	if is_release ; then
+		# Use system readline only with released versions.
+		myconf+=( --with-installed-readline=. )
+	fi
+
+	if use plugins ; then
+		append-ldflags -Wl,-rpath,"${EPREFIX}"/usr/$(get_libdir)/bash
+	else
+		# Disable the plugins logic by hand since bash doesn't
+		# provide a way of doing it.
+		export ac_cv_func_dl{close,open,sym}=no \
+			ac_cv_lib_dl_dlopen=no ac_cv_header_dlfcn_h=no
+
+		sed -i \
+			-e '/LOCAL_LDFLAGS=/s:-rdynamic::' \
+			configure || die
+	fi
+
+	# bug #444070
+	tc-export AR
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	emake
+
+	if use plugins ; then
+		emake -C examples/loadables all others
+	fi
+}
+
+src_install() {
+	local d f
+
+	default
+
+	dodir /bin
+	mv "${ED}"/usr/bin/bash "${ED}"/bin/ || die
+	dosym bash /bin/rbash
+
+	insinto /etc/bash
+	doins "${FILESDIR}"/bash_logout
+	newins "$(prefixify_ro "${FILESDIR}"/bashrc-r1)" bashrc
+
+	insinto /etc/bash/bashrc.d
+	doins "${FILESDIR}"/bashrc.d/*.bash
+
+	insinto /etc/skel
+	for f in bash{_logout,_profile,rc} ; do
+		newins "${FILESDIR}"/dot-${f} .${f}
+	done
+
+	local sed_args=(
+		-e 's:#GNU#@::'
+		-e '/#@/d'
+	)
+
+	if ! use readline ; then
+		# bug #432338
+		sed_args+=(
+			-e '/^shopt -s histappend/s:^:#:'
+			-e 's:use_color=true:use_color=false:'
+		)
+	fi
+
+	sed -i \
+		"${sed_args[@]}" \
+		"${ED}"/etc/skel/.bashrc \
+		"${ED}"/etc/bash/bashrc || die
+
+	if use plugins ; then
+		exeinto /usr/$(get_libdir)/bash
+		doexe $(echo examples/loadables/*.o | sed 's:\.o::g')
+
+		insinto /usr/include/bash-plugins
+		doins *.h builtins/*.h include/*.h lib/{glob/glob.h,tilde/tilde.h}
+	fi
+
+	if use examples ; then
+		for d in examples/{functions,misc,scripts,startup-files} ; do
+			exeinto /usr/share/doc/${PF}/${d}
+			docinto ${d}
+			for f in ${d}/* ; do
+				if [[ ${f##*/} != PERMISSION ]] && [[ ${f##*/} != *README ]] ; then
+					doexe ${f}
+				else
+					dodoc ${f}
+				fi
+			done
+		done
+	fi
+
+	# Install bash_builtins.1 and rbash.1
+	emake -C doc DESTDIR="${D}" install_builtins
+	sed 's:bash\.1:man1/&:' doc/rbash.1 > "${T}"/rbash.1 || die
+	doman "${T}"/rbash.1
+
+	newdoc CWRU/changelog ChangeLog
+	dosym bash.info /usr/share/info/bashref.info
+}
+
+pkg_preinst() {
+	if [[ -e ${EROOT}/etc/bashrc ]] && [[ ! -d ${EROOT}/etc/bash ]] ; then
+		mkdir -p "${EROOT}"/etc/bash
+		mv -f "${EROOT}"/etc/bashrc "${EROOT}"/etc/bash/
+	fi
+}
+
+pkg_postinst() {
+	local old_ver
+
+	# If /bin/sh does not exist, provide it
+	if [[ ! -e ${EROOT}/bin/sh ]] ; then
+		ln -sf bash "${EROOT}"/bin/sh
+	fi
+
+	read -r old_ver <<<"${REPLACING_VERSIONS}"
+	if [[ ! $old_ver ]] ; then
+		:
+	elif ver_test "$old_ver" -ge "5.2" && ver_test "$old_ver" -ge "5.2_p26-r1" ; then
+		return
+	elif ver_test "$old_ver" -lt "5.2" && ver_test "$old_ver" -ge "5.1_p16-r8" ; then
+		return
+	fi
+
+	einfo "Files situated under /etc/bash/bashrc.d must now have a suffix of .sh or .bash."
+	einfo ""
+	einfo "Gentoo now defaults to defining PROMPT_COMMAND as an array. Depending on the"
+	einfo "characteristics of the operating environment, this array may contain commands"
+	einfo "to set the window and pane title. Users that choose to customise this variable"
+	einfo "in ~/.bashrc are advised to append their commands, using the following syntax."
+	einfo ""
+	einfo "PROMPT_COMMAND+=('custom command goes here')"
+	einfo ""
+	einfo "Alternatively, users that wish to opt out of Gentoo's window title setting"
+	einfo "behaviour may now do so by either unsetting PROMPT_COMMAND or by re-defining it"
+	einfo "as desired. Previously, there was no formally supported method of opting out."
+}
--- a/app-shells/bash/bash-5.2_p26-r1.ebuild
+++ b/app-shells/bash/bash-5.2_p26-r1.ebuild
@ -0,0 +1,400 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/chetramey.asc
+inherit flag-o-matic toolchain-funcs prefix verify-sig
+
+# Uncomment if we have a patchset
+#GENTOO_PATCH_DEV="sam"
+#GENTOO_PATCH_VER="${PV}"
+
+# Official patchlevel
+# See ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/
+PLEVEL="${PV##*_p}"
+MY_PV="${PV/_p*}"
+MY_PV="${MY_PV/_/-}"
+MY_P="${PN}-${MY_PV}"
+MY_PATCHES=()
+
+is_release() {
+	case ${PV} in
+		9999|*_alpha*|*_beta*|*_rc*)
+			return 1
+			;;
+		*)
+			return 0
+			;;
+	esac
+}
+
+[[ ${PV} != *_p* ]] && PLEVEL=0
+
+# The version of readline this bash normally ships with.
+# Note: right now, we don't use the system copy of readline for bash for non-releases.
+READLINE_VER="8.2_p1"
+
+DESCRIPTION="The standard GNU Bourne again shell"
+HOMEPAGE="https://tiswww.case.edu/php/chet/bash/bashtop.html https://git.savannah.gnu.org/cgit/bash.git"
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/bash.git"
+	EGIT_BRANCH=devel
+	inherit git-r3
+elif is_release ; then
+	SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz"
+	SRC_URI+=" verify-sig? ( mirror://gnu/bash/${MY_P}.tar.gz.sig )"
+
+	if [[ ${PLEVEL} -gt 0 ]] ; then
+		# bash-5.1 -> bash51
+		my_p=${PN}$(ver_rs 1-2 '' $(ver_cut 1-2))
+
+		patch_url=
+		my_patch_index=
+
+		upstream_url_base="mirror://gnu/bash"
+		mirror_url_base="ftp://ftp.cwru.edu/pub/bash"
+
+		for ((my_patch_index=1; my_patch_index <= ${PLEVEL} ; my_patch_index++)) ; do
+			printf -v mangled_patch_ver ${my_p}-%03d ${my_patch_index}
+			patch_url="${upstream_url_base}/${MY_P}-patches/${mangled_patch_ver}"
+
+			SRC_URI+=" ${patch_url}"
+			SRC_URI+=" verify-sig? ( ${patch_url}.sig )"
+
+			# Add in the mirror URL too.
+			SRC_URI+=" ${patch_url/${upstream_url_base}/${mirror_url_base}}"
+			SRC_URI+=" verify-sig? ( ${patch_url/${upstream_url_base}/${mirror_url_base}} )"
+
+			MY_PATCHES+=( "${DISTDIR}"/${mangled_patch_ver} )
+		done
+
+		unset my_p patch_url my_patch_index upstream_url_base mirror_url_base
+	fi
+else
+	SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz"
+	SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${MY_P}.tar.gz.sig ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz.sig )"
+fi
+
+if [[ -n ${GENTOO_PATCH_VER} ]] ; then
+	SRC_URI+=" https://dev.gentoo.org/~${GENTOO_PATCH_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${GENTOO_PATCH_VER}-patches.tar.xz"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+if is_release ; 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"
+fi
+IUSE="afs bashlogger examples mem-scramble +net nls plugins pgo +readline"
+
+DEPEND="
+	>=sys-libs/ncurses-5.2-r2:=
+	nls? ( virtual/libintl )
+"
+if is_release ; then
+	DEPEND+=" readline? ( >=sys-libs/readline-${READLINE_VER}:= )"
+fi
+RDEPEND="
+	${DEPEND}
+"
+# We only need bison (yacc) when the .y files get patched (bash42-005, bash51-011)
+BDEPEND="
+	pgo? ( dev-util/gperf )
+	verify-sig? ( sec-keys/openpgp-keys-chetramey )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+# EAPI 8 tries to append it but it doesn't exist here
+QA_CONFIGURE_OPTIONS="--disable-static"
+
+PATCHES=(
+	#"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}/
+
+	# Patches from Chet sent to bash-bug ml
+	"${FILESDIR}"/${PN}-5.0-syslog-history-extern.patch
+	"${FILESDIR}"/${PN}-5.2_p15-random-ub.patch
+	"${FILESDIR}"/${PN}-5.2_p15-configure-clang16.patch
+	"${FILESDIR}"/${PN}-5.2_p21-wpointer-to-int.patch
+	"${FILESDIR}"/${PN}-5.2_p21-configure-strtold.patch
+	"${FILESDIR}"/${PN}-5.2_p26-memory-leaks.patch
+)
+
+pkg_setup() {
+	# bug #7332
+	if is-flag -malign-double ; then
+		eerror "Detected bad CFLAGS '-malign-double'.  Do not use this"
+		eerror "as it breaks LFS (struct stat64) on x86."
+		die "remove -malign-double from your CFLAGS mr ricer"
+	fi
+
+	if use bashlogger ; then
+		ewarn "The logging patch should ONLY be used in restricted (i.e. honeypot) envs."
+		ewarn "This will log ALL output you enter into the shell, you have been warned."
+	fi
+}
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+	else
+		if use verify-sig ; then
+			verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.gz{,.sig}
+
+			local patch
+			for patch in "${MY_PATCHES[@]}" ; do
+				verify-sig_verify_detached ${patch}{,.sig}
+			done
+		fi
+
+		unpack ${MY_P}.tar.gz
+
+		if [[ -n ${GENTOO_PATCH_VER} ]] ; then
+			unpack ${PN}-${GENTOO_PATCH_VER}-patches.tar.xz
+		fi
+	fi
+}
+
+src_prepare() {
+	# Include official patches
+	[[ ${PLEVEL} -gt 0 ]] && eapply -p0 "${MY_PATCHES[@]}"
+
+	# Clean out local libs so we know we use system ones w/releases.
+	if is_release ; then
+		rm -rf lib/{readline,termcap}/* || die
+		touch lib/{readline,termcap}/Makefile.in || die # for config.status
+		sed -ri -e 's:\$[{(](RL|HIST)_LIBSRC[)}]/[[:alpha:]_-]*\.h::g' Makefile.in || die
+	fi
+
+	# Prefixify hardcoded path names. No-op for non-prefix.
+	hprefixify pathnames.h.in
+
+	# Avoid regenerating docs after patches, bug #407985
+	sed -i -r '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in || die
+	touch -r . doc/* || die
+
+	# Sometimes hangs (more noticeable w/ pgo), bug #907403.
+	rm tests/run-jobs || die
+
+	eapply -p0 "${PATCHES[@]}"
+	eapply_user
+}
+
+src_configure() {
+	# Upstream only test with Bison and require GNUisms like YYEOF and
+	# YYERRCODE. The former at least may be in POSIX soon:
+	# https://www.austingroupbugs.net/view.php?id=1269.
+	# configure warns on use of non-Bison but doesn't abort. The result
+	# may misbehave at runtime.
+	unset YACC
+
+	local myconf=(
+		--disable-profiling
+
+		# Force linking with system curses ... the bundled termcap lib
+		# sucks bad compared to ncurses.  For the most part, ncurses
+		# is here because readline needs it.  But bash itself calls
+		# ncurses in one or two small places :(.
+		--with-curses
+
+		$(use_enable mem-scramble)
+		$(use_enable net net-redirections)
+		$(use_enable readline)
+		$(use_enable readline bang-history)
+		$(use_enable readline history)
+		$(use_with afs)
+		$(use_with mem-scramble bash-malloc)
+	)
+
+	# For descriptions of these, see config-top.h
+	# bashrc/#26952 bash_logout/#90488 ssh/#24762 mktemp/#574426
+	append-cppflags \
+		-DDEFAULT_PATH_VALUE=\'\""${EPREFIX}"/usr/local/sbin:"${EPREFIX}"/usr/local/bin:"${EPREFIX}"/usr/sbin:"${EPREFIX}"/usr/bin:"${EPREFIX}"/sbin:"${EPREFIX}"/bin\"\' \
+		-DSTANDARD_UTILS_PATH=\'\""${EPREFIX}"/bin:"${EPREFIX}"/usr/bin:"${EPREFIX}"/sbin:"${EPREFIX}"/usr/sbin\"\' \
+		-DSYS_BASHRC=\'\""${EPREFIX}"/etc/bash/bashrc\"\' \
+		-DSYS_BASH_LOGOUT=\'\""${EPREFIX}"/etc/bash/bash_logout\"\' \
+		-DNON_INTERACTIVE_LOGIN_SHELLS \
+		-DSSH_SOURCE_BASHRC \
+		$(use bashlogger && echo -DSYSLOG_HISTORY)
+
+	# Don't even think about building this statically without
+	# reading bug #7714 first.  If you still build it statically,
+	# don't come crying to us with bugs ;).
+	#use static && export LDFLAGS="${LDFLAGS} -static"
+	use nls || myconf+=( --disable-nls )
+
+	if is_release ; then
+		# Historically, we always used the builtin readline, but since
+		# our handling of SONAME upgrades has gotten much more stable
+		# in the PM (and the readline ebuild itself preserves the old
+		# libs during upgrades), linking against the system copy should
+		# be safe.
+		# Exact cached version here doesn't really matter as long as it
+		# is at least what's in the DEPEND up above.
+		export ac_cv_rl_version=${READLINE_VER%%_*}
+
+		# Use system readline only with released versions.
+		myconf+=( --with-installed-readline=. )
+	fi
+
+	if use plugins ; then
+		append-ldflags -Wl,-rpath,"${EPREFIX}"/usr/$(get_libdir)/bash
+	else
+		# Disable the plugins logic by hand since bash doesn't
+		# provide a way of doing it.
+		export ac_cv_func_dl{close,open,sym}=no \
+			ac_cv_lib_dl_dlopen=no ac_cv_header_dlfcn_h=no
+
+		sed -i \
+			-e '/LOCAL_LDFLAGS=/s:-rdynamic::' \
+			configure || die
+	fi
+
+	# bug #444070
+	tc-export AR
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	# -fprofile-partial-training because upstream note the test suite isn't super comprehensive
+	# See https://documentation.suse.com/sbp/all/html/SBP-GCC-10/index.html#sec-gcc10-pgo
+	local pgo_generate_flags=$(usev pgo "-fprofile-update=atomic -fprofile-dir=${T}/pgo -fprofile-generate=${T}/pgo $(test-flags-CC -fprofile-partial-training)")
+	local pgo_use_flags=$(usev pgo "-fprofile-use=${T}/pgo -fprofile-dir=${T}/pgo $(test-flags-CC -fprofile-partial-training)")
+
+	emake CFLAGS="${CFLAGS} ${pgo_generate_flags}"
+	use plugins && emake -C examples/loadables CFLAGS="${CFLAGS} ${pgo_generate_flags}" all others
+
+	# Build Bash and run its tests to generate profiles.
+	if use pgo ; then
+		# Used in test suite.
+		unset A
+
+		emake CFLAGS="${CFLAGS} ${pgo_generate_flags}" -k check
+
+		if tc-is-clang; then
+			llvm-profdata merge "${T}"/pgo --output="${T}"/pgo/default.profdata || die
+		fi
+
+		# Rebuild Bash using the profiling data we just generated.
+		emake clean
+		emake CFLAGS="${CFLAGS} ${pgo_use_flags}"
+		use plugins && emake -C examples/loadables CFLAGS="${CFLAGS} ${pgo_use_flags}" all others
+	fi
+}
+
+src_test() {
+	# Used in test suite.
+	unset A
+
+	default
+}
+
+src_install() {
+	local d f
+
+	default
+
+	dodir /bin
+	mv "${ED}"/usr/bin/bash "${ED}"/bin/ || die
+	dosym bash /bin/rbash
+
+	insinto /etc/bash
+	doins "${FILESDIR}"/bash_logout
+	newins "$(prefixify_ro "${FILESDIR}"/bashrc-r1)" bashrc
+
+	insinto /etc/bash/bashrc.d
+	doins "${FILESDIR}"/bashrc.d/*.bash
+
+	insinto /etc/skel
+	for f in bash{_logout,_profile,rc} ; do
+		newins "${FILESDIR}"/dot-${f} .${f}
+	done
+
+	local sed_args=(
+		-e 's:#GNU#@::'
+		-e '/#@/d'
+	)
+
+	if ! use readline ; then
+		# bug #432338
+		sed_args+=(
+			-e '/^shopt -s histappend/s:^:#:'
+			-e 's:use_color=true:use_color=false:'
+		)
+	fi
+
+	sed -i \
+		"${sed_args[@]}" \
+		"${ED}"/etc/skel/.bashrc \
+		"${ED}"/etc/bash/bashrc || die
+
+	if use plugins ; then
+		exeinto /usr/$(get_libdir)/bash
+		doexe $(echo examples/loadables/*.o | sed 's:\.o::g')
+
+		insinto /usr/include/bash-plugins
+		doins *.h builtins/*.h include/*.h lib/{glob/glob.h,tilde/tilde.h}
+	fi
+
+	if use examples ; then
+		for d in examples/{functions,misc,scripts,startup-files} ; do
+			exeinto /usr/share/doc/${PF}/${d}
+			docinto ${d}
+			for f in ${d}/* ; do
+				if [[ ${f##*/} != PERMISSION ]] && [[ ${f##*/} != *README ]] ; then
+					doexe ${f}
+				else
+					dodoc ${f}
+				fi
+			done
+		done
+	fi
+
+	# Install bash_builtins.1 and rbash.1
+	emake -C doc DESTDIR="${D}" install_builtins
+	sed 's:bash\.1:man1/&:' doc/rbash.1 > "${T}"/rbash.1 || die
+	doman "${T}"/rbash.1
+
+	newdoc CWRU/changelog ChangeLog
+	dosym bash.info /usr/share/info/bashref.info
+}
+
+pkg_preinst() {
+	if [[ -e ${EROOT}/etc/bashrc ]] && [[ ! -d ${EROOT}/etc/bash ]] ; then
+		mkdir -p "${EROOT}"/etc/bash
+		mv -f "${EROOT}"/etc/bashrc "${EROOT}"/etc/bash/
+	fi
+}
+
+pkg_postinst() {
+	local old_ver
+
+	# If /bin/sh does not exist, provide it
+	if [[ ! -e ${EROOT}/bin/sh ]] ; then
+		ln -sf bash "${EROOT}"/bin/sh
+	fi
+
+	read -r old_ver <<<"${REPLACING_VERSIONS}"
+	if [[ ! $old_ver ]] ; then
+		:
+	elif ver_test "$old_ver" -ge "5.2" && ver_test "$old_ver" -ge "5.2_p26-r1" ; then
+		return
+	elif ver_test "$old_ver" -lt "5.2" && ver_test "$old_ver" -ge "5.1_p16-r8" ; then
+		return
+	fi
+
+	einfo "Files situated under /etc/bash/bashrc.d must now have a suffix of .sh or .bash."
+	einfo ""
+	einfo "Gentoo now defaults to defining PROMPT_COMMAND as an array. Depending on the"
+	einfo "characteristics of the operating environment, this array may contain commands"
+	einfo "to set the window and pane title. Users that choose to customise this variable"
+	einfo "in ~/.bashrc are advised to append their commands, using the following syntax."
+	einfo ""
+	einfo "PROMPT_COMMAND+=('custom command goes here')"
+	einfo ""
+	einfo "Alternatively, users that wish to opt out of Gentoo's window title setting"
+	einfo "behaviour may now do so by either unsetting PROMPT_COMMAND or by re-defining it"
+	einfo "as desired. Previously, there was no formally supported method of opting out."
+}
--- a/app-shells/bash/files/bashrc-r1
+++ b/app-shells/bash/files/bashrc-r1
@ -0,0 +1,21 @@
+# /etc/bash/bashrc
+
+# Proceed no further in the case of a non-interactive shell.
+if [[ $- != *i* ]]; then
+	return
+fi
+
+# Disable completion when the input buffer is empty. Requires readline support.
+shopt -s no_empty_cmd_completion 2>/dev/null
+
+# Append to HISTFILE rather than overwrite upon exiting, per bug #139609.
+shopt -s histappend
+
+# Initialise PROMPT_COMMAND as an array, which is permitted as of bash 5.1.
+PROMPT_COMMAND=()
+
+for _ in /etc/bash/bashrc.d/*; do
+	if [[ $_ == *.@(bash|sh) && -r $_ ]]; then
+		source "$_"
+	fi
+done
--- a/app-shells/bash/files/bashrc.d/10-gentoo-color.bash
+++ b/app-shells/bash/files/bashrc.d/10-gentoo-color.bash
@ -0,0 +1,67 @@
+# /etc/bash/bashrc.d/10-gentoo-color.bash
+
+if [[ ${NO_COLOR} ]]; then
+	# Respect the user's wish not to use color. See https://no-color.org/.
+	gentoo_color=0
+elif [[ ${COLORTERM@a} == *x* && ${COLORTERM} == @(24bit|truecolor) ]]; then
+	# The COLORTERM environment variable can reasonably be trusted here.
+	# See https://github.com/termstandard/colors for further information.
+	gentoo_color=1
+elif unset -v COLORTERM; ! gentoo_color=$(tput colors 2>/dev/null); then
+	# Either ncurses is not installed or no terminfo database could be
+	# found. Fall back to a whitelist which covers the majority of terminal
+	# emulators and virtual console implementations known to support color
+	# and which remain (somewhat) popular. This will rarely happen, so the
+	# list need not be exhaustive.
+	case ${TERM} in
+		*color*    |\
+		*direct*   |\
+		[Ekx]term* |\
+		alacritty  |\
+		aterm      |\
+		dtterm     |\
+		foot*      |\
+		jfbterm    |\
+		linux      |\
+		mlterm     |\
+		rxvt*      |\
+		screen*    |\
+		tmux*      |\
+		wsvt25*    ) gentoo_color=1
+	esac
+elif (( gentoo_color == 16777216 )); then
+	# Truecolor support is available. Advertise it.
+	export COLORTERM=truecolor
+fi
+
+if (( gentoo_color <= 0 )); then
+	# Define a prompt without color.
+	PS1='\u@\h \w \$ '
+elif (( EUID == 0 )); then
+	# If root, omit the username and print the hostname in red.
+	PS1='\[\e[01;31m\]\h\[\e[01;34m\] \w \$\[\e[00m\] '
+else
+	# Otherwise, print the username and hostname in green.
+	PS1='\[\e[01;32m\]\u@\h\[\e[01;34m\] \w \$\[\e[00m\] '
+fi
+
+if (( gentoo_color > 0 )); then
+	# Colorize the output of grep and several coreutils utilities.
+	for _ in diff dir egrep fgrep grep ls vdir; do
+		alias "$_=$_ --color=auto"
+	done
+
+	# Enable colors for ls(1) and some other utilities that respect the
+	# LS_COLORS variable. Prefer ~/.dir_colors, per bug #64489.
+	if hash dircolors 2>/dev/null; then
+		if [[ -f ~/.dir_colors ]]; then
+			eval "$(dircolors -b -- ~/.dir_colors)"
+		elif [[ -f /etc/DIR_COLORS ]]; then
+			eval "$(dircolors -b /etc/DIR_COLORS)"
+		else
+			eval "$(dircolors -b)"
+		fi
+	fi
+fi
+
+unset -v gentoo_color
--- a/app-shells/bash/files/bashrc.d/10-gentoo-title.bash
+++ b/app-shells/bash/files/bashrc.d/10-gentoo-title.bash
@ -0,0 +1,55 @@
+# /etc/bash/bashrc.d/10-gentoo-title.bash
+
+# Set window title with the Title Definition String sequence. For screen, the
+# sequence defines the window title (%t) and for tmux, the pane_title (#T).
+# For tmux to be affected requires that its allow-rename option be enabled.
+# https://www.gnu.org/software/screen/manual/html_node/Control-Sequences.html
+case ${TERM} in
+	screen*|tmux*)
+		genfun_set_pane_title() {
+			printf '\033k%s\033\\' "${HOSTNAME%%.*}"
+		}
+		PROMPT_COMMAND+=('genfun_set_pane_title')
+		;;
+	*)
+		# If the TTY is that of sshd(8) then proceed no further. Alas,
+		# there exist many operating environments in which the window
+		# title would otherwise not be restored upon ssh(1) exiting.
+		if [[ ${SSH_TTY} && ${SSH_TTY} == "$(tty)" ]]; then
+			return
+		fi
+esac
+
+# Assigns the basename of the current working directory, having sanitised it
+# with @Q parameter expansion. Useful for paths containing newlines and such.
+# As a special case, names consisting entirely of graphemes shall not undergo
+# the parameter expansion, for reasons of cleanliness.
+genfun_sanitise_cwd() {
+	_cwd=${PWD##*/}
+	if [[ ! ${_cwd} ]]; then
+		_cwd=${PWD}
+	elif [[ ${_cwd} == *[![:graph:]]* ]]; then
+		_cwd=${_cwd@Q}
+	fi
+}
+
+# Set window title with the Set Text Parameters sequence. For screen, the
+# sequence defines the hardstatus (%h) and for tmux, the window_name (#W).
+# For graphical terminal emulators, it is normal for the title bar be affected.
+# The only terminals permitted here are those for which there is empirical
+# evidence that the sequence is supported and that the UTF-8 character encoding
+# is handled correctly. Quite rightly, this precludes many vintage terminals.
+# https://invisible-island.net/xterm/ctlseqs/ctlseqs.html#h3-Operating-System-Commands
+case ${TERM} in
+	alacritty     |\
+	foot*         |\
+	rxvt-unicode* |\
+	screen*       |\
+	tmux*         |\
+	xterm*        )
+		genfun_set_win_title() {
+			genfun_sanitise_cwd
+			printf '\033]2;%s@%s - %s\007' "${USER}" "${HOSTNAME%%.*}" "${_cwd}"
+		}
+		PROMPT_COMMAND+=('genfun_set_win_title')
+esac
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
--- a/app-text/grip/Manifest
+++ b/app-text/grip/Manifest
@ -2,5 +2,5 @@ DIST grip-4.6.1.tar.gz 147894 BLAKE2B e4f6b5c72e98b5d8ec443c794e95ff0a4250526dd7
 DIST grip-4.6.2.tar.gz 152280 BLAKE2B 02a5fb21190fe167428fb36390a087094c064fc11bc2016579391b3568bd421c8f0920f7b325e5be8140ebd8e7f7a0c0e20085f9d8899daf3ee85f27f33ffa9d SHA512 e4dc38d25198a1670df7ecf950fc2c815c3e8507571d54d3df844547ee7db0d1a7cbbbaa23fd7daa1391eea12a2788890d5cee09aa64b8bf1039beeb78a5d25f
 EBUILD grip-4.6.1-r1.ebuild 701 BLAKE2B f3531271fbcb07bee5cb2c0629c4b583195358454a33441ca62d3a2a3bb7abad763c8ce500376d0c6478fccbde1961c02a2d18ea52311949e18207b2380909f8 SHA512 5505a7c85bba630db7b595da73378a59567c336734ecdf6d3dd143f9cf88f29c1df00ea31f1601a15d9ac20fbdfb5075e575b6b07e26008cd71ea7b94bc08a7c
 EBUILD grip-4.6.1.ebuild 718 BLAKE2B 46c9b7036d1e1ab927c72869db4902fefbec58baaf0f2720b6476c0bb473e96543367a5b15c201d8ecaeae58db585a75b7daf430f6ae8282489ebc2e9197b107 SHA512 dc3a96c6ab3f63943acd978736717d7206d2f0d60fef0c893042f0d457e52c1021b605c39c70f72f600d17eb22b64e29d98a279a1eb8e4fc3e1625032a5d7fe8
-EBUILD grip-4.6.2.ebuild 702 BLAKE2B d971e2c1b3b750128dbc877fbfcd9a692ea627a2e1dd538d2411404fb272b3d03287db08e0903f6cf9d1aeb83f90ce53d13fab7d505f3892c81bdd2b84d283b8 SHA512 6897ddcc852010f83898103207b7b29b85cad7efb6e26bae5bc0112cfd5e629902c2f7493a671dc5972c7a8858c04da4fc4a91be96adc9f36878dfc8204f6345
+EBUILD grip-4.6.2.ebuild 701 BLAKE2B 3704fd991cdebeca4f595c611cbaf2b412ef7143531139678d32c167ca2880d79f26fa15ce94ca2ca9307f8209fd8262dd49e6914bd2fa05d45636759ed810d3 SHA512 52d79a432a7f4237a5d0c493f6052c86c0a75de08c2b986c983c9c9f2d69e815186a9f90acce7bc30ab015c41e8b722e6b2850edb6da6ea6e45ebe4681a5bd2f
 MISC metadata.xml 365 BLAKE2B e01f58764eda42b4e6d7ece18b3f2996fe55e640d91cdba317f1f9677a59b114d7caab6c2ea7556f1962e30b8e2b453814179d7e978b52c4c07fe6e89d9a4978 SHA512 286ffe7168abf8d980ad5e713a31751241901246c6b2fe8372942e50bef53a70b3ff17045e99cb951c968309fcab5c9776a1fb26222c0ea4edfa467e8209eb4b
--- a/app-text/grip/grip-4.6.2.ebuild
+++ b/app-text/grip/grip-4.6.2.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=8
@ -13,7 +13,7 @@ LICENSE="MIT"

 SLOT="0"

-KEYWORDS="~amd64"
+KEYWORDS="amd64"

 RDEPEND="
 	!media-sound/grip
--- a/app-text/tesseract/Manifest
+++ b/app-text/tesseract/Manifest
@ -7,5 +7,5 @@ EBUILD tesseract-5.3.0.ebuild 2139 BLAKE2B 5b9be5f2561db2e2da0ad18eb2bfaf160000b
 EBUILD tesseract-5.3.2.ebuild 2099 BLAKE2B 9750268de2258a712c2d65cd41c192edfff0b3329a75307667f4a3e86998c4afad8f869b320f329356a38b580dc14766f57cc9e4621d86f46a12ff7afd1f5b0d SHA512 eaabba2b481d394b21db5e9a062ce1444e2c564b48108cbaae14ee94b74d9ba4de65521def4b7f5072bcd63aee43bdad1ecbe9ee82c4f93ea80f32e063934b61
 EBUILD tesseract-5.3.3.ebuild 2099 BLAKE2B 9750268de2258a712c2d65cd41c192edfff0b3329a75307667f4a3e86998c4afad8f869b320f329356a38b580dc14766f57cc9e4621d86f46a12ff7afd1f5b0d SHA512 eaabba2b481d394b21db5e9a062ce1444e2c564b48108cbaae14ee94b74d9ba4de65521def4b7f5072bcd63aee43bdad1ecbe9ee82c4f93ea80f32e063934b61
 EBUILD tesseract-5.3.4.ebuild 2099 BLAKE2B 9750268de2258a712c2d65cd41c192edfff0b3329a75307667f4a3e86998c4afad8f869b320f329356a38b580dc14766f57cc9e4621d86f46a12ff7afd1f5b0d SHA512 eaabba2b481d394b21db5e9a062ce1444e2c564b48108cbaae14ee94b74d9ba4de65521def4b7f5072bcd63aee43bdad1ecbe9ee82c4f93ea80f32e063934b61
-EBUILD tesseract-9999.ebuild 2016 BLAKE2B 13f02c2924444a125d1ec6e17d7898a75abdbb6692d88219361f01782be5c7141b8f4da00e0048213362aadfe5fcfb2fa8797d4e3aea200371c184f0649202b9 SHA512 1cf5bea583418a2f8f9a572e9941471406aa947c38b52cc307dd0ee08867c17b3412edefdd0e58e107acd8a2136a76a854fb79b310e883d34d437dcf1f0c30c2
+EBUILD tesseract-9999.ebuild 1864 BLAKE2B 5aaf23d01dc425180b0d07210d10e50526ac0037fc579feb42424c521830b64caa7ac00a8aa4a258b09c965037f9c368279d8d7c0376289c276d50237dd72d4f SHA512 0fce3ad6adf33ba6a87ffb8899a309bbbed66cc74eb4ba4f57b0c6bf8533a84dc7836eefd394f5b20cab2d6d2f3fd6aba2f778e79170bbb0bd5f53232ed4dda6
 MISC metadata.xml 1020 BLAKE2B 77f6c8f3962e00b65495fff0176e7765a9583de651db12b0e532ad5ff4b8005ede93d42d58093ae3b397c40d085963f47ef0e41cfed609b581c1a2f8231ccc72 SHA512 d9ea277a6ad9ec5178252863d60bac1244e372ab6c4f4ce3fe4f7220492e78dec2349742699031ed727251f87173e821c64dec44fb9787c08aad216cad64fa05
--- a/app-text/tesseract/tesseract-9999.ebuild
+++ b/app-text/tesseract/tesseract-9999.ebuild
@ -12,14 +12,9 @@ EGIT_REPO_URI="https://github.com/tesseract-ocr/${PN}.git"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS=""
-IUSE="doc float32 jpeg opencl openmp png static-libs tiff training webp"
+IUSE="doc float32 jpeg openmp png static-libs tiff training webp"

 COMMON_DEPEND=">=media-libs/leptonica-1.74:=[${MULTILIB_USEDEP},zlib,tiff?,jpeg?,png?,webp?]
-	opencl? (
-		virtual/opencl[${MULTILIB_USEDEP}]
-		media-libs/tiff:=[${MULTILIB_USEDEP}]
-		media-libs/leptonica:=[tiff]
-	)
 	training? (
 		dev-libs/icu:=
 		x11-libs/pango:=
@ -56,7 +51,6 @@ multilib_src_configure() {
 		--enable-shared
 		--disable-graphics
 		$(use_enable float32)
-		$(use_enable opencl)
 		$(use_enable openmp)
 		$(use_enable static-libs static)
 	)
--- a/app-vim/Manifest.gz
+++ b/app-vim/Manifest.gz
--- a/app-vim/gentoo-syntax/Manifest
+++ b/app-vim/gentoo-syntax/Manifest
@ -1,6 +1,4 @@
-DIST gentoo-syntax-13.tar.bz2 20995 BLAKE2B 90196be7b1f0bbbe8398f327cebe2bbbcffbf8db2e27debc321478911d2413de51ef29d3a94e936e1d92eb4d246237d66d4fa8742fd165e4043ceb2dd80beb9a SHA512 c695dd8c80b551307381a4fb0656adc07321cf60f88e1888ce3a2080343d458a35bb4bda785e233fa4907534b35114c83b5d4b5e3f3bd02d0d6c2dd7ab7deda1
 DIST gentoo-syntax-14.tar.bz2 20988 BLAKE2B 2f11628bec985ef486ad6f04b694df7a2b1e5ef34f5ddb364c7d9dea4a507d9bae4d8de6b00b33358cf651b4fc6816164f22f7760275a1fd0668b89927859cfb SHA512 63914ffb1911d83fa8991a901f9a23ccfc30f0170a6a730cb02919f4adf0ad34c70f4457e006b1c08a004448c6b9e85d97634a8ed8fdf0b4f98ef9fd804eef00
-EBUILD gentoo-syntax-13.ebuild 1200 BLAKE2B 9ed0951f9dfc4eb1f37ec1a195c608b2a208d032b92c8dd9c1911250924d0264bee185eff45dddec3681e05c7d2b8e975db57afae506b2d65ccc90cd83d4aba7 SHA512 e5d35275a915fda4a3c4457e5b2f71f0752580d26134dde0b79ba366c95cfc208e1a364a4deeb4733bd08ba5dc2f1806db0ff3f824ac07d693ec99dffd2112ec
-EBUILD gentoo-syntax-14.ebuild 1208 BLAKE2B 66e2a0eb04eda0d4660d5826d00ab95f54ffd5b32d0c227068a3d28e9a651f66c3910c12cf9d3026897c64f02d2f7021b6de0c0c309195c811c9e2b64acdd3e6 SHA512 b44dc2338d8184b9d41cfb616c5de5ab5f9ab40e3d4b242210cecc4b1889bbb55dea1aa0cc91d19ee8881564be7f7dd33ceca0f2f0a71111d59f405ec4d025a2
+EBUILD gentoo-syntax-14.ebuild 1200 BLAKE2B 9ed0951f9dfc4eb1f37ec1a195c608b2a208d032b92c8dd9c1911250924d0264bee185eff45dddec3681e05c7d2b8e975db57afae506b2d65ccc90cd83d4aba7 SHA512 e5d35275a915fda4a3c4457e5b2f71f0752580d26134dde0b79ba366c95cfc208e1a364a4deeb4733bd08ba5dc2f1806db0ff3f824ac07d693ec99dffd2112ec
 EBUILD gentoo-syntax-9999.ebuild 1076 BLAKE2B 0688da77100e073b40e8b72bd97a6c3cce176f73a36e89489a5536b73a1cd9896222c967c564aa8cac53c5be61be6e7495b4f460f413d899f23a250108d5eb4a SHA512 ee83565cc9c614275d5bbfc5cc33b19cc8af0d170837358e663a63f8de95d86c37f33995e878355dc482d5381ae9dd77fb891c2d484d5e2307d20d85f053a3b8
 MISC metadata.xml 646 BLAKE2B d33ab1ce3b852316a114a27c7768310491f51669a44a183c5b2fe639a0d2e65439759de9a83cb019467ef5d206470454bfe1939906d32c1a7fe6ebad0458e14b SHA512 a75bc08e066deac74dc6a8a9927e232be4facc31e0810121480c07e75549de2cbc974eff9f71f2c59fb17f0739bd0cd9cede9a048af4715047a796b6a5afea7d
--- a/app-vim/gentoo-syntax/gentoo-syntax-13.ebuild
+++ b/app-vim/gentoo-syntax/gentoo-syntax-13.ebuild
@ -1,42 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit vim-plugin
-
-DESCRIPTION="vim plugin: Gentoo and Portage syntax highlighting"
-HOMEPAGE="https://github.com/gentoo/gentoo-syntax"
-SRC_URI="https://gitweb.gentoo.org/proj/gentoo-syntax.git/snapshot/${P}.tar.bz2"
-
-LICENSE="vim"
-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"
-IUSE="ignore-glep31"
-
-VIM_PLUGIN_HELPFILES="gentoo-syntax"
-VIM_PLUGIN_MESSAGES="filetype"
-
-src_prepare() {
-	default
-	if use ignore-glep31 ; then
-		for f in ftplugin/*.vim ; do
-			ebegin "Removing UTF-8 rules from ${f} ..."
-			sed -i -e 's~\(setlocal fileencoding=utf-8\)~" \1~' ${f} \
-				|| die "waah! bad sed voodoo. need more goats."
-			eend $?
-		done
-	fi
-}
-
-pkg_postinst() {
-	vim-plugin_pkg_postinst
-
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		if use ignore-glep31 1>/dev/null ; then
-			ewarn "You have chosen to disable the rules which ensure GLEP 31"
-			ewarn "compliance. When editing ebuilds, please make sure you get"
-			ewarn "the character set correct."
-		fi
-	fi
-}
--- a/app-vim/gentoo-syntax/gentoo-syntax-14.ebuild
+++ b/app-vim/gentoo-syntax/gentoo-syntax-14.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://gitweb.gentoo.org/proj/gentoo-syntax.git/snapshot/${P}.tar.bz2"

 LICENSE="vim"
 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="ignore-glep31"

 VIM_PLUGIN_HELPFILES="gentoo-syntax"
--- a/Show more
+++ b/Show more