From 4a7e8a04f36caa88d1996b1dcdedb196bb4beb2f Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Mon, 15 May 2023 04:02:43 +0100
Subject: gentoo auto-resync : 15:05:2023 - 04:02:43

---
 Manifest                                           |  30 +-
 Manifest.files.gz                                  | Bin 29468 -> 29471 bytes
 app-emulation/Manifest.gz                          | Bin 15350 -> 15353 bytes
 app-emulation/wine-staging/Manifest                |  11 +-
 app-emulation/wine-staging/wine-staging-8.5.ebuild |   2 +-
 .../wine-staging/wine-staging-8.6.1.ebuild         |   2 +-
 app-emulation/wine-staging/wine-staging-8.7.ebuild |   2 +-
 app-emulation/wine-staging/wine-staging-8.8.ebuild | 376 +++++++++++++++++++++
 .../wine-staging/wine-staging-9999.ebuild          |   4 +-
 app-office/Manifest.gz                             | Bin 7898 -> 7900 bytes
 app-office/libreoffice-bin-debug/Manifest          |  10 +
 .../libreoffice-bin-debug-7.5.3.2.ebuild           |  85 +++++
 app-office/libreoffice-bin/Manifest                |  10 +
 .../libreoffice-bin/libreoffice-bin-7.5.3.2.ebuild | 261 ++++++++++++++
 dev-util/Manifest.gz                               | Bin 68452 -> 68447 bytes
 dev-util/nvidia-cuda-toolkit/Manifest              |   2 +
 .../nvidia-cuda-toolkit-12.1.1.ebuild              | 308 +++++++++++++++++
 games-engines/Manifest.gz                          | Bin 3386 -> 3386 bytes
 games-engines/odamex/Manifest                      |   2 +-
 games-engines/odamex/odamex-10.3.0-r1.ebuild       |  87 +++++
 games-engines/odamex/odamex-10.3.0.ebuild          |  87 -----
 metadata/Manifest.gz                               | Bin 3507 -> 3503 bytes
 metadata/dtd/timestamp.chk                         |   2 +-
 metadata/glsa/Manifest                             |  28 +-
 metadata/glsa/timestamp.chk                        |   2 +-
 metadata/md5-cache/Manifest.gz                     | Bin 28019 -> 28010 bytes
 metadata/md5-cache/app-emulation/Manifest.gz       | Bin 32893 -> 33054 bytes
 metadata/md5-cache/app-emulation/wine-staging-8.5  |   2 +-
 .../md5-cache/app-emulation/wine-staging-8.6.1     |   2 +-
 metadata/md5-cache/app-emulation/wine-staging-8.7  |   2 +-
 metadata/md5-cache/app-emulation/wine-staging-8.8  |  18 +
 metadata/md5-cache/app-emulation/wine-staging-9999 |   2 +-
 metadata/md5-cache/app-office/Manifest.gz          | Bin 10675 -> 11008 bytes
 .../md5-cache/app-office/libreoffice-bin-7.5.3.2   |  17 +
 .../app-office/libreoffice-bin-debug-7.5.3.2       |  13 +
 metadata/md5-cache/dev-util/Manifest.gz            | Bin 127553 -> 127709 bytes
 .../md5-cache/dev-util/nvidia-cuda-toolkit-12.1.1  |  15 +
 metadata/md5-cache/games-engines/Manifest.gz       | Bin 5050 -> 5048 bytes
 metadata/md5-cache/games-engines/odamex-10.3.0     |  17 -
 metadata/md5-cache/games-engines/odamex-10.3.0-r1  |  17 +
 metadata/md5-cache/sys-apps/Manifest.gz            | Bin 87423 -> 87115 bytes
 metadata/md5-cache/sys-apps/grep-3.10              |  16 -
 metadata/md5-cache/sys-apps/grep-3.10_p20230430    |  15 -
 metadata/md5-cache/sys-apps/grep-3.11              |  16 +
 metadata/md5-cache/sys-apps/grep-3.9               |  16 -
 metadata/md5-cache/sys-devel/Manifest.gz           | Bin 33870 -> 34025 bytes
 .../md5-cache/sys-devel/gcc-14.0.0_pre20230514     |  16 +
 metadata/md5-cache/sys-kernel/Manifest.gz          | Bin 26866 -> 27023 bytes
 metadata/md5-cache/sys-kernel/git-sources-6.4_rc2  |  15 +
 metadata/news/Manifest                             |  28 +-
 metadata/news/timestamp.chk                        |   2 +-
 metadata/timestamp                                 |   2 +-
 metadata/timestamp.chk                             |   2 +-
 metadata/timestamp.commit                          |   2 +-
 metadata/timestamp.x                               |   2 +-
 metadata/xml-schema/timestamp.chk                  |   2 +-
 sys-apps/Manifest.gz                               | Bin 49523 -> 49521 bytes
 sys-apps/grep/Manifest                             |  12 +-
 sys-apps/grep/grep-3.10.ebuild                     | 115 -------
 sys-apps/grep/grep-3.10_p20230430.ebuild           | 115 -------
 sys-apps/grep/grep-3.11.ebuild                     | 115 +++++++
 sys-apps/grep/grep-3.9.ebuild                      | 115 -------
 sys-devel/Manifest.gz                              | Bin 10640 -> 10638 bytes
 sys-devel/gcc/Manifest                             |   2 +
 sys-devel/gcc/gcc-14.0.0_pre20230514.ebuild        |  63 ++++
 sys-kernel/Manifest.gz                             | Bin 4418 -> 4415 bytes
 sys-kernel/git-sources/Manifest                    |   2 +
 sys-kernel/git-sources/git-sources-6.4_rc2.ebuild  |  41 +++
 68 files changed, 1560 insertions(+), 570 deletions(-)
 create mode 100644 app-emulation/wine-staging/wine-staging-8.8.ebuild
 create mode 100644 app-office/libreoffice-bin-debug/libreoffice-bin-debug-7.5.3.2.ebuild
 create mode 100644 app-office/libreoffice-bin/libreoffice-bin-7.5.3.2.ebuild
 create mode 100644 dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.1.1.ebuild
 create mode 100644 games-engines/odamex/odamex-10.3.0-r1.ebuild
 delete mode 100644 games-engines/odamex/odamex-10.3.0.ebuild
 create mode 100644 metadata/md5-cache/app-emulation/wine-staging-8.8
 create mode 100644 metadata/md5-cache/app-office/libreoffice-bin-7.5.3.2
 create mode 100644 metadata/md5-cache/app-office/libreoffice-bin-debug-7.5.3.2
 create mode 100644 metadata/md5-cache/dev-util/nvidia-cuda-toolkit-12.1.1
 delete mode 100644 metadata/md5-cache/games-engines/odamex-10.3.0
 create mode 100644 metadata/md5-cache/games-engines/odamex-10.3.0-r1
 delete mode 100644 metadata/md5-cache/sys-apps/grep-3.10
 delete mode 100644 metadata/md5-cache/sys-apps/grep-3.10_p20230430
 create mode 100644 metadata/md5-cache/sys-apps/grep-3.11
 delete mode 100644 metadata/md5-cache/sys-apps/grep-3.9
 create mode 100644 metadata/md5-cache/sys-devel/gcc-14.0.0_pre20230514
 create mode 100644 metadata/md5-cache/sys-kernel/git-sources-6.4_rc2
 delete mode 100644 sys-apps/grep/grep-3.10.ebuild
 delete mode 100644 sys-apps/grep/grep-3.10_p20230430.ebuild
 create mode 100644 sys-apps/grep/grep-3.11.ebuild
 delete mode 100644 sys-apps/grep/grep-3.9.ebuild
 create mode 100644 sys-devel/gcc/gcc-14.0.0_pre20230514.ebuild
 create mode 100644 sys-kernel/git-sources/git-sources-6.4_rc2.ebuild

diff --git a/Manifest b/Manifest
index a2c769f7fe58..dcc44bbe35b2 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29468 BLAKE2B c597f2730d44a97fee89e17b06616567f4be4c58718c6abab5122e395250bda73a773bf3c385634c12ffab7b4d6aa3f7928f2148db1af2002ce3127dec451cf9 SHA512 78f049cb97d7fb53bf2bbd21cdbdb1492c3d7d46e948a7e95db8843eda9612a4bf608a300fe2ed608d0007c182f506366d7e6f4d60c6059e536f78ee0829582c
-TIMESTAMP 2023-05-14T20:40:06Z
+MANIFEST Manifest.files.gz 29471 BLAKE2B 3036ef45dae354c2defc61ed442855a47a496986546748ceb3c71d8df21ef062646ecada58b33913b1bbfae91d5829220a210a5a23bd4f5c52080bcb499cd96f SHA512 0a63162dd4cf4bef431d0587b25f6934ad791cd54bf6a4f269d6fa73d86621f9e0e89f4573cfab0ccd798c8bc1ce02da9aac5997f50e977c0f7ba6ba01e8f07f
+TIMESTAMP 2023-05-15T02:40:04Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRhRyZfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRhm4RfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klChiRAAmBw56xPQdeugclFjQtEvYiBKprigXKZJ12WuDP9123hjk8CP/YkWZOqF
-wyodGdPj7tLMu0KRN59ZiJqyDJlRsjExPpbQcJuDSxq7Nn7zHOYy84YMa0590qcH
-HKhfjJ68LQwpJ7QAlJhTf1cqk0s3dk1rl0lxsl1/b8XKuasDbeZU/E8zk7GFyTlT
-DzZY3+NGjQb9v3TirbWOIm6DYEvWdzWSSnX7howY07EzrwUVz4Qm+3zsLAX34e/1
-YyN5bPH3SrqwdHAqxUb8pVwqZJr797h+7EzSfYQLQ6H5S1SVCL55Y3Sl5svtcCRH
-U4kVsuqK2D7Z+s9pNj8nkcyiRMO70vXef2KEnntWeGTaBSh9vXch+GtJBguDwBwX
-Xa8BGEIwvSrGks8uMBVYfE1sw56bIDge4J4OLsmL+W0c9mb+1a5gchG5f2PY7Gu2
-H2pVDb2TBifz4EUVXQjg7/s8rpuCfYAGItbclsWWn9y39Sagerx5IGkk3zR4bu/j
-JQi46ujigV6T39BDn1/oqXTIvWHXcYV68CcEnPm9pZtMGke2Xe7X2JSZx7p6+C++
-uh1XUHuKdbvtGOJWxAlWn4uPpb+oAT+qp8G5F4BfkCP2FKs2uy71XwwuNveMMmRu
-ejcqsJ2uyuTvb7bayjslgdn0rXR47NWE4QIJoKujt+D/J97UCAM=
-=vpni
+klAu9Q/+M6VtDVKMmyECNUgU8TemFSAkuo+volBvxzSjiRBBaVBYnFNu5Dk4wt8U
+oM8w1fAqn9epNrJf0UHN9mCHRlfY7BibtXpNm4rHpajOGoRMzP899A3/2mM/iVIp
+OeVJfC1df0SThJDU5tjVzZ9jh18v9KHs09d+J4I6sF0p0UovsUg9XbItnWCSNnYS
+SVUAzdxchkDwD6PGk5Y4ZlN1gx+Rt67fhb8Hmhno6+0dlM+ZmSsMeVz/qDpHuu3P
+aRRWUkbmEPr0WZcKu2WIoTC8i+37/xcXBtecqItqocscN9lNqi//cSgVAJlvGE4r
+wv/KVROK9tCD9flZ0awqPdpLdiJbp7bl/N13GepmC4p+YPQgXdq6A1mPuQ/7P868
+jVNAka/3tDhhHibuIbsKaXIroJJmHW9WuFkHscwjgwCfzU/aD5G65+3AgDZE1LVw
+bmRHSH2aISoIcUP1gdHMitk3vNfO+zjmeNM+ALujNDuGxk4hmY3kgANNUo+l4R5l
+c+2mb71a+tyV9YKzWOlpB/VM6k5mo42ISk8CxeKFfQxqm7AqXeprT7d3pfxXaMKL
+LOL4aE7853CvBUg6Kp4+0ussvaRFp/lBPj/lnRl6lLzfvhraEtnhNZkXtXvJlVBH
+odJ6U8pLtQKRFr3yS7YJrvSuZ3HTm9ksHziuuL+yS+jxky5bckA=
+=sGDr
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index d4cc75daec20..6f89a4152f86 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 9c08881cef91..2bb3d1c81adf 100644
Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ
diff --git a/app-emulation/wine-staging/Manifest b/app-emulation/wine-staging/Manifest
index 0f3f2b84d697..c7be2e3a79e2 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -4,13 +4,16 @@ DIST wine-8.0.tar.xz 29054044 BLAKE2B baf8f96b665119c9f38a148a2472dbe8f6ca8d4641
 DIST wine-8.5.tar.xz 29064032 BLAKE2B 35fa6d7ec88ff67d9acf13466b3618eb45d664bed0a9ee581e46cb6e7692395837c8c8e86dead1dbcad582ef29c674a0df4b7180addee837b466eba7fdcd350a SHA512 f6aaab8a32eb7bce7f48d21d99417c9e6e8fe41b3d36320762775ef954db7ddd4fcff01d56475f35038d814557834a41a9e3ae85e5cae8a1b820c5044b42a327
 DIST wine-8.6.tar.xz 29118124 BLAKE2B e4659785722f0c1adb9ce4a156fbafc8484977a5fe2f4a6e1d5eaf8f1f14c6787f080b9d389cdd8716eb7fd00ee2879fab2042af5dcb970530d2e19628442c73 SHA512 602680675f5e062121767769106199179c52a6dd93e97b9b8b4d8365134c72f7745e37d4e3edf6c89c553fb1bfe55b914e77177508fb4f032410d423359abba7
 DIST wine-8.7.tar.xz 29158096 BLAKE2B 73bd0b5a6eec8a2e37301d8b0f8e9be1ad757f07df3471b0cea17aac6716d456eea1d36fa22bd2451e6cc7662b2b36e4ca628d65216c60d5950f5b439fd2052c SHA512 0a7fe9ad86cf931527c2149207473bf4671d1098af7c21f1b740dfaa84486a8e235fea99b1cad035ff9c3eb20810caab53d51051d63efe626514b79309904d93
+DIST wine-8.8.tar.xz 29181484 BLAKE2B 43a79fb34f86382cbd8dd3b3aa16f104d02a8e86fd8d47afb157865b707b71674199c4ae748f8b3e3de4ae1e63d70a18fca0d09d7716c178a4c9c21d21c092ac SHA512 e56427680c940970153b1996841c70d540a0a2572ab980c4d77cf7225efd7c26c91ef9b0548b73d51e78afa55a7e324d5d93f6211f5eb5d5698ab9ff421e26de
 DIST wine-staging-8.0.tar.gz 9529620 BLAKE2B c9540195ea885d9f1e980232b0af471e92c61eb079cae35fdb3af5c13d4660b3466f751772440e38f15874082db296d16d1f1d68827a505b2dd949617eda0203 SHA512 76a729d7ced1ff634ddb455ddfaa66ca103b652f43cd152b57ada7431bb5fbb74f5e92bf2f4f329b6df6f5908130afad84e609cbce6df645d6cf8131e9b949f9
 DIST wine-staging-8.5.tar.gz 9530306 BLAKE2B 9457fb44aea427c2c09d6329f2f585ae7e14ca32950204019136616d73ad1b83b629297499197b91fb542784b8e5b6edd8743ee6a72794ce58ef5c6b1d27f308 SHA512 9d347c55a62f661bdcc102d373e05d162217b7b1348bdb6f2b114d20e35146862379d2cf03a96916bd1d52166a538af55d48e25a169cd6ee23818673bd35909a
 DIST wine-staging-8.6.1.tar.gz 9527141 BLAKE2B be43c642e6caa0f7e28a0aa45f736b839fe277a54c573955940523b6a27a0e4b7b5d531a027aab4a3c21a413fcac129dc16a7241700f2f848061fadafc9e695f SHA512 28bb066b55293e73df072cceb27a191365d6a319d859e6797bc443e830bb6ddd22cdbf7d9692b43e8eb7f2feb68ac1205aa440c60b37ab7c10ebeab83aa590ce
 DIST wine-staging-8.7.tar.gz 9524736 BLAKE2B 4ae32c77024c41fe660090889958e0016dc6e0d189c1cc938e305cc72297a924ea8209244374baa651ded3bdf62352f9b41e15bb163f200b9b0b3f18ccac2ea5 SHA512 42a32b3a5420f358085c510250f3204bc5eb7430c447e7bb5b25046245cf3c54f02684226daffedb65dce093cfa513424523e55d4d3a5b416fdff6e4e1e4a161
+DIST wine-staging-8.8.tar.gz 9509284 BLAKE2B f8a25b9a3a52b8bfc98d8eea6c22f9648d8e6040d12dd4a8a2dd13199ced954292f141c4b4ae4fc7748d5fa7f6b0fa1cdd535a27b1495150bdee5f50b940ab8d SHA512 7178ab98ca77a2892f9c827d1af51c9b98fe8c9559f6708fc63f73d3ebed96bd1a158179c5eed83d4c89bc57f0120e9cafddb1e0dbb77587054ae29a60eddaf5
 EBUILD wine-staging-8.0.ebuild 11470 BLAKE2B f988ebcc9231ef7cabe3b2da0c0519a051965dd9e3350ea226c02c02ea43a6cd67cbc277f4ccfa93296ad195c9341f3fad2441ec1c0259226e3620586928af13 SHA512 671959d80bdda9734f5509f4cdb9d4fbb59f97fec1705fb835e0e7b931c3efca627e8c336741c80f14478a205c832302400ab56f2049c2aab11f5511efe5b67d
-EBUILD wine-staging-8.5.ebuild 11657 BLAKE2B a7bad3b695c5f302b4b93a15e17333e1ed82323ff4b6ded6934a0cc06d9afd6db3f570a4443a735f897192f5c362512747c3e7b1c780cc906876cd09d08224d1 SHA512 bb0732750a148b98597fe389bae7f8ca89b4d820bd134b612b29b52212377e2be0c445cc4bd362a07625045e919b070a389c3ed57497a411324a764c4843ca90
-EBUILD wine-staging-8.6.1.ebuild 11675 BLAKE2B 6fb4f0133ac85c2b6db8bce5c84ddbba028238685cb824d7ee3c33a898ea69ef4b71e1cabfe28e8b0f51ce66bddc2ce867eb0b0a387152d923c8ba8163db8302 SHA512 a17a7812ab60f796e478fe86b996ae0c5e5b95e8f5938034055dd5bf038d28452ae3ae68b974c2ed557441658e0330d153ae9ef4cef08179977f61a5388f4dd9
-EBUILD wine-staging-8.7.ebuild 11697 BLAKE2B eaa74c9b521e106d56d9b4b8db31ede38791c6905a9f34f88bfc1df319dbef8897326ba9784895a503dae1b01cd82c83483752e57ead7014c0fcd3c22c58d8a1 SHA512 f5df024269ec03e0e8467c117b98540999a49d20484bf0356632669442eae341f82da4657ee805493fb6cd6bc30faff76c183686ed4e9562f562879727a115b4
-EBUILD wine-staging-9999.ebuild 11688 BLAKE2B 70f7acae6068c125bd7fc449809ab904bd6cfc8e9c197188ec681141dddd72c78a3ec9728d61efd58fd05a68f1195be687d6bc9a74e4980462cf87daef2cae6a SHA512 3941d407f0e35ace3a079309b763043c8d44462911895c6552cb1d393178b7c10f219277dd7c870b59045d52cda71519f0633001a5a766ac1b6e9c6cabe9173a
+EBUILD wine-staging-8.5.ebuild 11658 BLAKE2B d6753f0f2279d1a3650508e7589d9a4e99c314d84297b3e33cb605e652bee3cac8e3b87902a684fd58f46e3bf7f483e250ecd957d891c0710e8a0ed30997d529 SHA512 db58cd413b511aff416071187989aa6e313a92ed230b511a2869b614fcd4e47c0ce0cb46ace9891135c8f9ca2f265ca6978afec2173f60a5cf84df26af02fa44
+EBUILD wine-staging-8.6.1.ebuild 11676 BLAKE2B 9a8cccc8ed69b4a4e1ec893b62b409bb300520c9838ca4eaf8c6f1137958634add6fb1a06cd51a5ada4e6f853d3e08fceae27bf0aec1b114da42001614225f73 SHA512 206a50ba10a889efad7d946632370f1a561ddc62e3150473db863e39fae72be9616adfe3605f0c76e2cbac5ab8adadafbb4efd86869457d8d85fbbdaae3cdb87
+EBUILD wine-staging-8.7.ebuild 11698 BLAKE2B f2bd42b2238b459ff63fd1fd9893dca0e1f8c4035e3644af53089a24e12ec252261228b8a5db7aa1a7e0acbb847fd8c2370f15d079ab4a26a56637eaf37402e7 SHA512 7b438481f7cb552064922f72cc21cc5ef7bc3d893ffc29001c06f52135760ce6547c52dd3cf6cb058c7658a07b31811bb8c821dcc4e3b2a4a552a3d81be97d64
+EBUILD wine-staging-8.8.ebuild 11697 BLAKE2B d30b90315932767b0665eed8c4f81ed15149c5fe7825fc3e3a0b065e3af5cfe62d330a898c6c8f4ac44eccaf20d805eee5876b8c6f2afe520b51d451eb1ee2cb SHA512 a0bdc27c94a52fe90f5019190e25062414501ac0dd00a7be31d46ce91d7ba7f75f0536802bda7a8e8298244e8d33a13840d0a94219320ded33995f43d14a8657
+EBUILD wine-staging-9999.ebuild 11697 BLAKE2B d30b90315932767b0665eed8c4f81ed15149c5fe7825fc3e3a0b065e3af5cfe62d330a898c6c8f4ac44eccaf20d805eee5876b8c6f2afe520b51d451eb1ee2cb SHA512 a0bdc27c94a52fe90f5019190e25062414501ac0dd00a7be31d46ce91d7ba7f75f0536802bda7a8e8298244e8d33a13840d0a94219320ded33995f43d14a8657
 MISC metadata.xml 2390 BLAKE2B aa4087a0d17d80d3495f36fc3dc1c436a757a06f5df6113deb03c129ee7e3b9ed5967784fdc37c3f572f70d997f0a88d887a9c33f038501f87348b2c913f4327 SHA512 9dd1a6ccbefa7853a50b51242248e88bc690fc57446545bf2f946f7673bc8ff4ec1870909ee4060dcc07fe177c0e4118dd374874a1f467401db15f1d385b69ec
diff --git a/app-emulation/wine-staging/wine-staging-8.5.ebuild b/app-emulation/wine-staging/wine-staging-8.5.ebuild
index 1d9218bfa197..df75c4969c98 100644
--- a/app-emulation/wine-staging/wine-staging-8.5.ebuild
+++ b/app-emulation/wine-staging/wine-staging-8.5.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 MULTILIB_COMPAT=( abi_x86_{32,64} )
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
 inherit autotools edo flag-o-matic multilib multilib-build
 inherit python-any-r1 toolchain-funcs wrapper
 
diff --git a/app-emulation/wine-staging/wine-staging-8.6.1.ebuild b/app-emulation/wine-staging/wine-staging-8.6.1.ebuild
index cab12fde862c..18f222e446b5 100644
--- a/app-emulation/wine-staging/wine-staging-8.6.1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-8.6.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 MULTILIB_COMPAT=( abi_x86_{32,64} )
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
 inherit autotools edo flag-o-matic multilib multilib-build
 inherit python-any-r1 toolchain-funcs wrapper
 
diff --git a/app-emulation/wine-staging/wine-staging-8.7.ebuild b/app-emulation/wine-staging/wine-staging-8.7.ebuild
index f7296349f46f..bf02447a2a5e 100644
--- a/app-emulation/wine-staging/wine-staging-8.7.ebuild
+++ b/app-emulation/wine-staging/wine-staging-8.7.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 MULTILIB_COMPAT=( abi_x86_{32,64} )
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
 inherit autotools edo flag-o-matic multilib multilib-build
 inherit python-any-r1 toolchain-funcs wrapper
 
diff --git a/app-emulation/wine-staging/wine-staging-8.8.ebuild b/app-emulation/wine-staging/wine-staging-8.8.ebuild
new file mode 100644
index 000000000000..b969d1e39e6f
--- /dev/null
+++ b/app-emulation/wine-staging/wine-staging-8.8.ebuild
@@ -0,0 +1,376 @@
+# Copyright 2022-2023 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..11} )
+inherit autotools edo flag-o-matic multilib multilib-build
+inherit python-any-r1 toolchain-funcs wrapper
+
+WINE_GECKO=2.47.4
+WINE_MONO=7.4.0
+
+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-${PV}.tar.xz
+		https://github.com/wine-staging/wine-staging/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="-* ~amd64 ~x86"
+fi
+S="${WORKDIR}/wine-${PV}"
+
+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/"
+
+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 debug custom-cflags +fontconfig +gecko gphoto2
+	+gstreamer kerberos +mingw +mono netapi nls opencl +opengl osmesa
+	pcap perl pulseaudio samba scanner +sdl selinux smartcard +ssl
+	+truetype udev udisks +unwind usb v4l +vulkan wayland +xcomposite
+	xinerama"
+REQUIRED_USE="
+	X? ( truetype )
+	crossdev-mingw? ( mingw )" # bug #551124 for truetype
+
+# 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}] )"
+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}] )
+	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
+		)
+	)
+	dev-lang/perl
+	sys-devel/binutils
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	mingw? ( !crossdev-mingw? (
+		>=dev-util/mingw64-toolchain-10.0.0_p1-r2[${MULTILIB_USEDEP}]
+	) )
+	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
+)
+
+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}) $(usev abi_x86_32 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
+
+		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
+		-W winemenubuilder-Desktop_Icon_Path #652176
+		${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
+
+	# ensure .desktop calls this variant + slot
+	sed -i "/^Exec=/s/wine /${P} /" loader/wine.desktop || die
+
+	# always update for patches (including user's wrt #432348)
+	eautoreconf
+	tools/make_requests || die # perl
+}
+
+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
+		$(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)
+	)
+
+	tc-ld-force-bfd # builds with non-bfd but broken at runtime (bug #867097)
+	filter-lto # build failure
+	use mingw || filter-flags -fno-plt # build failure
+	use custom-cflags || strip-flags # can break in obscure ways at runtime
+	use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH}
+
+	# temporary workaround for tc-ld-force-bfd not yet enforcing with mold
+	# https://github.com/gentoo/gentoo/pull/28355
+	[[ $($(tc-getCC) ${LDFLAGS} -Wl,--version 2>/dev/null) == mold* ]] &&
+		append-ldflags -fuse-ld=bfd
+
+	# build using upstream's way (--with-wine64)
+	# order matters: 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
+
+		pe_arch=i386
+		if (( bits == 64 )); then
+			pe_arch=x86_64
+			: "${CROSSCC:=${CROSSCC_amd64:-x86_64-w64-mingw32-gcc}}"
+			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
+		: "${CROSSCC:=${CROSSCC_x86:-i686-w64-mingw32-gcc}}"
+
+		if use mingw; then
+			# CROSSCC is no longer recognized by Wine, but still use for now
+			# (future handling for CROSS* variables is subject to changes)
+			conf+=( ac_cv_prog_${pe_arch}_CC="${CROSSCC}" )
+
+			# use *FLAGS for mingw, but strip unsupported
+			: "${CROSSCFLAGS:=$(
+				# >=wine-7.21 configure.ac no longer adds -fno-strict by mistake
+				append-cflags '-fno-strict-aliasing'
+				filter-flags '-fstack-protector*' #870136
+				filter-flags '-mfunction-return=thunk*' #878849
+				CC=${CROSSCC} test-flags-CC ${CFLAGS:--O2})}"
+			: "${CROSSLDFLAGS:=$(
+				filter-flags '-fuse-ld=*'
+				CC=${CROSSCC} test-flags-CCLD ${LDFLAGS})}"
+			export CROSS{C,LD}FLAGS
+		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
+
+	# symlink for plain 'wine' and install its man pages if 64bit-only #404331
+	if use abi_x86_64 && use !abi_x86_32; then
+		dosym wine64 ${WINE_PREFIX}/bin/wine
+		dosym wine64-preloader ${WINE_PREFIX}/bin/wine-preloader
+		local man
+		for man in ../build64/loader/wine.*man; do
+			: "${man##*/wine}"
+			: "${_%.*}"
+			insinto ${WINE_DATADIR}/man/${_:+${_#.}/}man1
+			newins ${man} wine.1
+		done
+	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
+
+	# don't let portage try to strip PE files with the wrong
+	# strip executable and instead handle it here (saves ~120MB)
+	if use mingw; then
+		dostrip -x ${WINE_PREFIX}/wine/{i386,x86_64}-windows
+		use debug ||
+			find "${ED}"${WINE_PREFIX}/wine/*-windows -regex '.*\.\(a\|dll\|exe\)' \
+				-exec $(usex abi_x86_64 x86_64 i686)-w64-mingw32-strip --strip-unneeded {} + || die
+	fi
+
+	dodoc ANNOUNCE AUTHORS README* documentation/README*
+}
+
+pkg_postinst() {
+	eselect wine update --if-unset || die
+}
+
+pkg_postrm() {
+	eselect wine update --if-unset || die
+}
diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild
index bbf0f0ca9656..b969d1e39e6f 100644
--- a/app-emulation/wine-staging/wine-staging-9999.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 MULTILIB_COMPAT=( abi_x86_{32,64} )
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
 inherit autotools edo flag-o-matic multilib multilib-build
 inherit python-any-r1 toolchain-funcs wrapper
 
@@ -19,7 +19,7 @@ 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
-		https://gitlab.winehq.org/wine/wine-staging/-/archive/v${PV}/${P}.tar.bz2"
+		https://github.com/wine-staging/wine-staging/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="-* ~amd64 ~x86"
 fi
 S="${WORKDIR}/wine-${PV}"
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 9323910446a4..ddbb457aa8f6 100644
Binary files a/app-office/Manifest.gz and b/app-office/Manifest.gz differ
diff --git a/app-office/libreoffice-bin-debug/Manifest b/app-office/libreoffice-bin-debug/Manifest
index cba0c5c85f7b..670888d8258b 100644
--- a/app-office/libreoffice-bin-debug/Manifest
+++ b/app-office/libreoffice-bin-debug/Manifest
@@ -1,21 +1,31 @@
 DIST amd64-debug-libreoffice-7.4.6.2-r1.tar.xz 1537083264 BLAKE2B 96a3ec7dc44b1952e7b197bbc02a74547d9dd77d364d450c9e9115db0e800147430b9cd09a8e8249f7b253aaf2becd36f34a5cc947b7e382f5145098f534950f SHA512 06494eecb543b657111e0f1d8253ef50e0cc5afc7bce354424bd375cd8f2cb46fe9a71c28632740f52b54380a1e3c24baddeff977c35832504e3bdf223f7814c
 DIST amd64-debug-libreoffice-7.4.6.2.tar.xz 1539083164 BLAKE2B 9fbfb50c2fdd26b4d8d70119ab015c54fe271df01c98ae1a880edae3a1fcc6f4fdbe09203afe612bbbc038d256f15ee791e9c566a75bece143f3d994077d24e8 SHA512 3e1f63890c5bd7b8aba20f0b16c7da8fdf3cde46c187b790f88f1fde979855b750432383fe0e7e26c3bbca0d6e7d7758c89c5f9f7e3f0ff07ce23941d2052b67
+DIST amd64-debug-libreoffice-7.5.3.2.tar.xz 1438237360 BLAKE2B 928b352b148a796bd7dbd20800e33da79190bb9c70201c3fb40b1d2886695d32af8bed55889b5f3680f478029cd86b83b0fc74c167e691e10a445c1a7abe89af SHA512 41363fbe153968c643071e2d6330b5b18b42f5c8d163a3a31180250b5626bccecacff4db60c9c260e441c0e70f4b3629a6686579f830b05199a53042f5757c39
 DIST amd64-debug-libreoffice-gnome-7.4.6.2-r1.xd3 1435537 BLAKE2B 5309bd30fd7208cf1ab02033208fc6b6bd7ad2b2932c68a46e7d62176d79bc78ac05fbba4eff65fdca53535f4eb0c46ac5c73931d3e7f8d0f8fea0f6ca6649f6 SHA512 53da17002c28865acaed3a54cce75f3f52c40f88fefc66e09b54d4809011515db1bc0ba42a9aba8dd3677a6069da219862e79873c0ac8b5be3420040662ae56d
 DIST amd64-debug-libreoffice-gnome-7.4.6.2.xd3 1439342 BLAKE2B 19fa4ac46d2c59eb15ff434b3f33263c68889dd26009d7ea67ff574a68fea5a4d8226cff457926fecf907162b10e913c5e572b4994642acebd8b7d5cea839829 SHA512 20cca2d38b78eb9c5edc50c27760751c0f56bd831c0bb5b46095c16b0e46bee4998705384cf924aed72a648305934dc5078515f286e9ad5a189f5112cf28f7c5
+DIST amd64-debug-libreoffice-gnome-7.5.3.2.xd3 292160961 BLAKE2B bd2575ec62967c0b330d43c3ade71236c255bc54c0d89855e7c4c48974b8c0c04cecd4afd7468b9583e823414dcfb46df8734a3dfe3a56d9235bb25e4f5f7f2b SHA512 d066cab66d722828ff8135bc2d53a575fa3485c3227373ec890103eba237d95c296a77dda27e62a480cf6aaf88d0aa7df600dc256852c711a9fd9d99a4c14f8c
 DIST amd64-debug-libreoffice-gnome-java-7.4.6.2-r1.xd3 789863525 BLAKE2B 47e487a0df97005f38a4198de7cc64831c8514278865062427bd7c124a6d69b014e85d61b94d7db6dcffe9d3a3d56c0d6b81a88f685aace8a8c30ee3f1da1548 SHA512 5dc565e560755f3b02639bf202344327e52c997a777c0fd86ae2fb7557c8193af85b61e944f06418cdf98dac2ce732764826386dd21ce44cf129464521b64a03
 DIST amd64-debug-libreoffice-gnome-java-7.4.6.2.xd3 789537145 BLAKE2B 5821ac0aac4de9cf21702c36fdea1421ca22ef2a0357af152850344e63cfc687774c88b4b45e4bcd100d9148e4c72619f7b9dae6d2ff048f4bf48de8a53923d2 SHA512 fba03563aa0d297120b2b6a930dd45431e0b7c6a1ef0f1b31d57ae030136aa251c119660612b49525cac1064650bb2e61166c8cc65a4ce1dc0e0309884dcea19
+DIST amd64-debug-libreoffice-gnome-java-7.5.3.2.xd3 744201123 BLAKE2B b401019add0b903e4883665e080396f1b9815f5eb17dfbe6fb4194a2602ed23470feda86ec4d7fd6289378c0f77f3578dbd73eba58215ce281f422483e4fcc22 SHA512 f4e427fedbd62b8a73cd8c6f3298ad65078b59dcf00dc3327b04f3085d615071246e242f99999b424133a4ed3fdbd72d9c9706bfe7af8f55aa3585977891f0c1
 DIST amd64-debug-libreoffice-java-7.4.6.2-r1.xd3 788420818 BLAKE2B 6445598a1a793508e1630bdf0c25aefb10a05fed786806d5d56ea94a60cb572ae45ba9b79e8545c2414d2e0ab697e2a87e7cc272fb35631a1432f394616514b5 SHA512 30f602db799369bfbfc5bf7af570b74dd317add1aeee82888ad21626d96e73f51559bd3362619e9df513b4c31009e7d03111a265c55e2c47aeb0cc8a61a0a2e2
 DIST amd64-debug-libreoffice-java-7.4.6.2.xd3 788080379 BLAKE2B 4e4524eb5040fff153b6b961572eb8e3f82b107fc176bb974eb680a0d640d939f63c37a96460c22b7650d5c7307148cf54472434cee0f4a77feef0042cf6982d SHA512 63e146988c4ed6744e97a6f9b1dae7e8b977f341089dbb6f4a4ca30b4bb5ca0e0adc8e3a6a0d2eb1cf62818dcd3e1e6f79f956889b6d79472a5cb5226a576e2e
+DIST amd64-debug-libreoffice-java-7.5.3.2.xd3 742863493 BLAKE2B 992ce90e57ba7adfc551fda26b7ef43dbcea4969fbb7ba8372f1ad96956b0dab8795968c552e8248f52fd650e824dbe34989cf8122a2171ed0e4a997c0ba9d9b SHA512 5e39ad81360bf064de743e99cdecbd1ec004707f7ef423a46eb129fd0cde90bcfd42dbdcd6d2e7f20ac9a910783331a21a6baee7d76db51f7393a1f39cf2ba5d
 DIST amd64-debug-libreoffice-kde-7.4.6.2-r1.xd3 483468319 BLAKE2B 7a31392728c48fc8882b9fed70d667b9c575b4bd01ba6b6c66341631007d31cda817ebfba5b97567cc81ef8bb8c9c9b69334176a8fdbc35848d9658ed9d5d04d SHA512 35b32de8f2450ba13e4c64a081a8f6b65a56c66b1e0920c4f9da1bfddc701773f71ec35711e240d8170f9d9a053c2244aad785c4c89625a7c1f99bd81af03896
 DIST amd64-debug-libreoffice-kde-7.4.6.2.xd3 484349149 BLAKE2B 3e72807deaf6d4fff8c43f14a78ae3ce10f6da0a3b13c1784c1f8c2890bf0378f0c943ba507c1244970a4f21ecb5af3a7c241ed94807f01074123206daf73b4e SHA512 45dc37ae22ce619bd8bafd7013f16f2194479c0cb1e2404f9a0a8404f00ea82aa50ee87c46eebb104296d152a55f6c58c4938553094c4df41904c81819037c23
+DIST amd64-debug-libreoffice-kde-7.5.3.2.xd3 436624127 BLAKE2B e3c8f7ed73d674896fa0e1ea1d9ba3e718ea0da9460ad2367b5dfdd85d1fd409cf97d0de56f3260310623c536ccd317856b0357bc614c97d26aa2ce99b2f40da SHA512 36417733de834ba50560bf0295720ad7a2835772a2900649231c885a7148d7bf468feb02f1eca073c65cc278c80433de9f2e96cbcd239d683b7a0990de7865f5
 DIST amd64-debug-libreoffice-kde-java-7.4.6.2-r1.xd3 797248933 BLAKE2B 6066055a6a12eb747df6ad005eea649407c46383027c207962c50fc6eff4de8252e56c915c5b985aae885e0ee39e41c257a803943fe9166410be01eced769233 SHA512 85b5446707bf95384654ccbcc4d7cee41c5816cbe81c8117349df407ea13b3551e2cb1bab1368df2ee0f6eba3e5342fb30a4ad2d5d169842b82d00fe23752f53
 DIST amd64-debug-libreoffice-kde-java-7.4.6.2.xd3 797166654 BLAKE2B 10e7e1dcde798a804128fa9f5fb240029a3199f60a03a8f2429b389cab0bda99d6d6393a96e6da117a4f7d84e6bdb5f191752643a8c74f367cb39c15829c4c3e SHA512 b4202f14390906761fb421aeacef586194018a119d5838ccdfe6287cce2c72fb71ab82029c99ab3804b3a8104d3d893317588b48f200efd32110e7695bbc088e
+DIST amd64-debug-libreoffice-kde-java-7.5.3.2.xd3 747089491 BLAKE2B 7569d67c9796473c4822bd185aa52c3124d47c70f94da886ebc9c2aa673f465dddea4028b4ef491a69317beeea646abbfbb7ef942c044d4a7e4a1e3abad693e4 SHA512 6d63c11d3a7a458e8fbbbdcb4c78f9cf1fa69c032f47a958935bd0d2a6b9b6aac993983d77b0f0296356a448151f443bea8d8abdff64fd52b645887fe01f08fe
 DIST x86-debug-libreoffice-7.4.6.2-r1.tar.xz 8033940 BLAKE2B e49ce9b13a7880614edda845b623b0e111a077ab70ad2fa1800a5d152409e0a71304526b31adc026376b820216a0288a912e58540aa90875df25574a27a7bf9b SHA512 7eef12e5ac215ce4ff85f1176275e1ba11cf9f3d60fdca1e70ee70400436f54f8e609bcb8e05570e92e7070aafab2ffdc2da417c5ecb721bf8f89ec9a88a154b
 DIST x86-debug-libreoffice-7.4.6.2.tar.xz 8035536 BLAKE2B 972bdd33fa6ba802e2e682c63285a0219a1a65619c9e311a1df210c8162fd57f60897fa2ed9f09dbb507d8fa3860792d63196b5192100ff77b7d7326a2288a23 SHA512 9c61a9d29e77cffe5c438db86ba38423e46a719fa6842e05ec94344606a408177cc8df5bd633fd744188570acf57210ff57efdbbf5e23aa7b7ae228edc1a4b48
+DIST x86-debug-libreoffice-7.5.3.2.tar.xz 8094076 BLAKE2B 46a9a808cdbb58c95a5543c709b2891cd533c8900d63e06940583372c6cad415266bc319a590312b333f58f9aa2f4f1c8b3677cbd7a3215e81500adad6d21ebe SHA512 8b08e39535b4bb5a4aff35bb7e508192908907d7cbc9ce2712e0de4e3982643f0c22c2cd117046a5fa408b667e90d2889b47cac2e825a977aec966447fbe41da
 DIST x86-debug-libreoffice-gnome-7.4.6.2-r1.xd3 39137 BLAKE2B f0b80b64f07664ab47d3ee638344e9f62aa9ddc8e6e11fbbc5de61f00837ad7b008f407e093979b2dfb86f4eea30134fa289a3e19199c401d1bfdd7539dcde7f SHA512 bf53d16e504e97cf614e6e75d2eda320d77db80139fcc9b26df833af68051edeaf2771f25c1a339340d10a9954fabd71ee47c1c151da8eebc88c05e2466d0bb0
 DIST x86-debug-libreoffice-gnome-7.4.6.2.xd3 39249 BLAKE2B 346be25f8c1476829cb59408b4e8768540979c53b72549b8a7a08e1484aecc9397b15fc6777f313be4d168747ffc36effb940a6b787595e8b98506a25fe014b7 SHA512 360549e6220b7165a0999a61f0213c94ecb09d08fa8a09bc2705b87dcf6d5626d927bee9aeec5748f1c0db0c1fed166453d28b0d86678425855a599841e21c83
+DIST x86-debug-libreoffice-gnome-7.5.3.2.xd3 39572 BLAKE2B 674527dff6fe98c3d9ddecb62d41aba70ddd9013929f41fb7bbf50d1a846938e02b766b97532fddec8d8cc7cd05cd81af308f3ff29483dd7a384c08700fd228d SHA512 0791892e25c217a6ea6a89ecc66205605c228e142b2ee1dceb70b61a4177a7a23c327165b8bec9a0627c412f6436206c2ba0856df0edae0cd59aae6d9288694f
 DIST x86-debug-libreoffice-kde-7.4.6.2-r1.xd3 2737886 BLAKE2B cceb6db83e86b8e8fe59b36f852b9b95cdbfb37e9c9528b2b7bf4ab4e6824fdb8da2d4e8b8b23eff1464f7dc1ec829bc43853be8d729863e35fb752223fb97d7 SHA512 50a8669fb1c39fea343e6f9827a027371ae123d1c20767113e334c242d88b5abb31824cffcd836341e17249a15645a1d2507e739b38bcebdf38ef2c3e8836458
 DIST x86-debug-libreoffice-kde-7.4.6.2.xd3 2738141 BLAKE2B 9e872a15d8f9f387ee91e74d7acea7bbe0e04a109795c4fff87572d1c6e6f9845b78a406075bc7ccd90f364922d1e068ac6addbd8f5d7a6b73295593a265c4c8 SHA512 9f780682182b21b0e321dfc168cc7b6f6a41ccc0e669d703295c68811569774e8a923a53dc554ee2a3c0931f3653fc1b9036ea768f6d83b5046efac647590534
+DIST x86-debug-libreoffice-kde-7.5.3.2.xd3 2757424 BLAKE2B bf17f632bbd5d142ff3ca8dce14bab0775c016dc0d8803735162ac88e71d7ade8013ba7d9f0762a77c2fa0e8110aa10039d8b364e1faf7ff04cb41b47e164223 SHA512 015e224bcf27a7ea7e4493bbfa4bd3cce7756fd85ebe7bb91c73a5ca162701d6c331460ecb88a1ff3523568f3e608af9cac2acba8125e39ba7eff43b9556e89c
 EBUILD libreoffice-bin-debug-7.4.6.2-r1.ebuild 2536 BLAKE2B 4968d66bb8a4ad759c964896992ae58d89058c3c318aba1562ee1b4991ae9ea5a98fc12361e6201d2b0d8a8bbc708944a7115d49222618529e9865536bf112d5 SHA512 a9e7d0bc18d0856af77b97e42b8f40a36d6cf54697c1d6cf4f31f0465c852365faa745d40aa5215577a1861979d37fb4a770e91a6c5e4ab0f6ad5b3b8bc01b50
 EBUILD libreoffice-bin-debug-7.4.6.2.ebuild 2536 BLAKE2B 4968d66bb8a4ad759c964896992ae58d89058c3c318aba1562ee1b4991ae9ea5a98fc12361e6201d2b0d8a8bbc708944a7115d49222618529e9865536bf112d5 SHA512 a9e7d0bc18d0856af77b97e42b8f40a36d6cf54697c1d6cf4f31f0465c852365faa745d40aa5215577a1861979d37fb4a770e91a6c5e4ab0f6ad5b3b8bc01b50
+EBUILD libreoffice-bin-debug-7.5.3.2.ebuild 2538 BLAKE2B 6a0441250755a90e493461cb4ccc99ce4e2a5c0e0ccf74ff9e6ecc10e00b3b01c8a0b59c25ff0a2273139fffbb7efaa6376fb6a7f9f9eed7ac899bc6b951c3b1 SHA512 2c46d13509111ec32c2964b46fdc010d5cb827547e54424db4c34fe798bc0992e4ecc4dc49fc7b65e874c593c21077586e8c4e898b32fc7f06dacbefbf06e42f
 MISC metadata.xml 482 BLAKE2B 94bf0468867227f0b085d6ca86359e9ae852fb874ed95ffa6d9926cfcdc7173d5db4dfe1a0ed86daec746a4f867d42534465bb03402c5bd4d9ac6bb8101932d7 SHA512 d4f6a8f90659676fa509690059e462c1755e22792efeff0a571d8f04f9f167cbed22d5ce34928a4afbf2fc01bf7ea2b5e8f1a70d4a652a3df9153ed0ccbe1905
diff --git a/app-office/libreoffice-bin-debug/libreoffice-bin-debug-7.5.3.2.ebuild b/app-office/libreoffice-bin-debug/libreoffice-bin-debug-7.5.3.2.ebuild
new file mode 100644
index 000000000000..7c94beeb02c9
--- /dev/null
+++ b/app-office/libreoffice-bin-debug/libreoffice-bin-debug-7.5.3.2.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+BASE_PACKAGENAME="debug"
+BASE_AMD64_URI="https://tamiko.43-1.org/distfiles/amd64-${BASE_PACKAGENAME}-"
+BASE_X86_URI="https://tamiko.43-1.org/distfiles/x86-${BASE_PACKAGENAME}-"
+
+DESCRIPTION="LibreOffice, a full office productivity suite. Binary package, debug info"
+HOMEPAGE="https://www.libreoffice.org"
+SRC_URI_AMD64="
+	${BASE_AMD64_URI}libreoffice-${PVR}.tar.xz
+	kde? (
+		!java? ( ${BASE_AMD64_URI}libreoffice-kde-${PVR}.xd3 )
+		java? ( ${BASE_AMD64_URI}libreoffice-kde-java-${PVR}.xd3 )
+	)
+	gnome? (
+		!java? ( ${BASE_AMD64_URI}libreoffice-gnome-${PVR}.xd3 )
+		java? ( ${BASE_AMD64_URI}libreoffice-gnome-java-${PVR}.xd3 )
+	)
+	!kde? ( !gnome? (
+		java? ( ${BASE_AMD64_URI}libreoffice-java-${PVR}.xd3 )
+	) )
+"
+SRC_URI_X86="
+	${BASE_X86_URI}libreoffice-${PVR}.tar.xz
+	kde? (
+		${BASE_X86_URI}libreoffice-kde-${PVR}.xd3
+	)
+	gnome? (
+		${BASE_X86_URI}libreoffice-gnome-${PVR}.xd3
+	)
+"
+
+SRC_URI="
+	amd64? ( ${SRC_URI_AMD64} )
+	x86? ( ${SRC_URI_X86} )
+"
+
+IUSE="gnome java kde"
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+
+# the = is correct, the debug info needs to fit the exact binary
+RDEPEND="=app-office/${PN/-debug}-${PVR}[gnome=,java=,kde=]"
+
+DEPEND="dev-util/xdelta:3"
+
+RESTRICT="test strip"
+
+S="${WORKDIR}"
+
+QA_PREBUILT="/usr/*"
+
+src_unpack() {
+	einfo "Uncompressing distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar.xz"
+	xz -cd "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar.xz" > "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" || die
+
+	use x86 && use java && die "There is no build for x86 with Java support."
+
+	local patchname
+	use kde && patchname="-kde"
+	use gnome && patchname="-gnome"
+	use java && patchname="${patchname}-java"
+
+	if [[ -n "${patchname}" ]]; then
+		einfo "Patching distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar using ${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PVR}.xd3"
+		xdelta3 -d -s "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PVR}.xd3" "${WORKDIR}/tmpdist.tar" || die
+		mv "${WORKDIR}/tmpdist.tar" "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" || die
+	fi
+
+	einfo "Unpacking new ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar"
+	unpack "./${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar"
+}
+
+src_configure() { :; }
+
+src_compile() { :; }
+
+src_install() {
+	dodir /usr
+	cp -aR "${S}"/usr/* "${ED}"/usr/ || die
+}
diff --git a/app-office/libreoffice-bin/Manifest b/app-office/libreoffice-bin/Manifest
index 192ddd643897..9a5cdd0208cd 100644
--- a/app-office/libreoffice-bin/Manifest
+++ b/app-office/libreoffice-bin/Manifest
@@ -1,22 +1,32 @@
 AUX 50-libreoffice-bin 158 BLAKE2B 2091698f80fbe097785c60b20f636150a2ee65bf52639fa1bb4a92341d050146040ad8912c5f5e3ca22e48ac3d819053c9948e256fb1d0e0901f7645934bfb89 SHA512 2d1158f48ac80f9212578d020e5659e777ff494adc3abc94438cec6890b88741f92ea2ed3bb4585ffdabe531d55c6938ca9408e9ece5a438e67d480eb406ed50
 DIST amd64-bin-libreoffice-7.4.6.2-r1.tar.xz 146899000 BLAKE2B 8ba568744ffc0cac43b32c5f2ab7eb702a995eab091e407dba1641c202f481451adcc20f51c19c5e85bd8e2aec7517404bca4c732a93bdaf716c759aad6e4d73 SHA512 0eb87b4f47fbda8848e943153bf1025ff8b723902615f6de9da57c427c4d0e3cb107094dc228495c7eaf833bec2b0dbb3eea50371ed5212136728613f2b0c65a
 DIST amd64-bin-libreoffice-7.4.6.2.tar.xz 146854072 BLAKE2B 29e89876ed6cd6b76c25163b934dd5a647c5314dc9a4968111e91afa75bf7551ec078334af8529d209287def46a2dea9e4e7704f7a71aa9a0288ce9265ae95ca SHA512 3089455406af2d5f6ed7a1e716a741ce0920c3475ce9b0161c0492eb4c19c9fa03c798a0ce6cda7a61bc653ee2fa324c3930551994b884de628fe45513ad717c
+DIST amd64-bin-libreoffice-7.5.3.2.tar.xz 148541304 BLAKE2B 8bddc855788229cc2f986b1bdeda1c3e1feb2233d1778b382dd839fee5b0c5e1d7f7dbf70927fe4e5a5e45aef480c9563f6bb41304708f9bb7ba31f2e61bbdf3 SHA512 719e09dc8ab3775152c3d80ae820d189a538769869795308875b3961f4ed70db496498a006364f222e6273e642ac57614e085f9a886cea485a35dbff78c824ed
 DIST amd64-bin-libreoffice-gnome-7.4.6.2-r1.xd3 1533312 BLAKE2B 0e6753977b39de0e3bed8907e55a86d64fa5040982fec93ddd05f2f053497227f2ca80bcd60c080d1eb13d09a301e6f10eece1dfdab2fb693f7b944b5de54e5e SHA512 7c903d2ef7c66017727a774ac9974a07688326b9a86ea941769ed2a19a6dba01f1e55ef3e553a890a83fff4591c82fa36ba33f72f7861c07e25a4145784f392c
 DIST amd64-bin-libreoffice-gnome-7.4.6.2.xd3 1539785 BLAKE2B 262962089f76d2f1cec1fb412432561c0645127ddb3656ca0517b58846134ad95a8d8863bed21b52a05dfcb34705ea2b8f017b5d45232adc879d9a218e0f84f1 SHA512 40de33e533590fe71ec957d7852ef196cb4e285f64b261a5e02edbeae67d7bf40a436e3730c992ee6697b70bcf5f8c8ee788d9198a3f5f10ed4f592d61da718a
+DIST amd64-bin-libreoffice-gnome-7.5.3.2.xd3 1807491 BLAKE2B 27be2b48c2838929f31f9e600b46cf5d58cbd5593c16cc0b476b1cda368701acc3405bb1ba4cfa3095fe05361fd234a373aab59824cbfb7f9901080c4e79af70 SHA512 640a3526e2c12deaa41fda7141c3c30646b9f073975cc073bf28354919dcdb87550c7e0f5530ac38b6b1830eae34794ff04483ad4d21b51eadd3bafbe0709892
 DIST amd64-bin-libreoffice-gnome-java-7.4.6.2-r1.xd3 31491604 BLAKE2B b0307d9b611948181cfb865fa1f121b7cadac3f494aca18333c6aeb1ed64c0cbe44766178484bc1a6632cfd8babd7b88b90f892318c6d218573981228d35c99b SHA512 7fb89ab0c0e13ab0f530b388e39cee4d21b0345a6f89fb8ef22dcf0c6b9f242fa89fc5026c58658a2ae8623ce49766fc62d17cc817b75a5653a95fdb2a2ee4c8
 DIST amd64-bin-libreoffice-gnome-java-7.4.6.2.xd3 31563743 BLAKE2B c2414806ace6e642dd618ebce863339627b993f7d6d074290b6a3af1aa4884b3dfa520957ad3726471f57b8d1bacba40ee378722508607e83c5a63193f89d8fb SHA512 dde7dca009f9117af54b011ce78fa52072eb6d5b241f110861cef28b3279d5e3f3ff74b92a1b05be6b9e13d4efa88a65c31db0e814aa7ab6a9de252f1ff5d004
+DIST amd64-bin-libreoffice-gnome-java-7.5.3.2.xd3 30946222 BLAKE2B 2d969c129f9073e6ce47c9ca23a33513dddc1adad8c958910e2aba157c978e9d7f7f0c7f94f18637a9a55be84c679ae3722a125f3eafb1ab1a477a2085417563 SHA512 a349d22f7c9ac0b7fd24d6a98ed5ff221758e35daa4869aeb56f821c84b15ad9f31e642506ffcdf1754b046410af4eeae156c5e13b6d362c7f8dbfacef4add97
 DIST amd64-bin-libreoffice-java-7.4.6.2-r1.xd3 31442564 BLAKE2B 13bc3fce200c38cd668f6600d1fd892c3b07732ac0f59b8ab97d8bf6975d2a1d3d9b9a4c1659bc33a225c8926170d3b3faa47d31b5f6280114cb4b4f02704777 SHA512 60e76dfbe86573fada99240117384da072cc76a5610d4f4abbefb01c45d41d8a518da84f9c6e64391f9e28eb9bb0414a8d5839f05bd0ed1cde854002b9e21d7d
 DIST amd64-bin-libreoffice-java-7.4.6.2.xd3 31446539 BLAKE2B a78fc1cdf252e6eda76f753cfef275984a4cfe61437f8fd60dcbf8be91748d3f85488930fc28586fffb776513b90eb256c91b5118ef65320db548d60b427dc40 SHA512 aaa691a5faa2a5f95256f3fedaeaaead60ec1d4d456bcc9f44fd9a2886e01acde114c8556ca6decf96ae3b63b7bacd0400b45b3aabd26edd7880456f21d2c886
+DIST amd64-bin-libreoffice-java-7.5.3.2.xd3 30773858 BLAKE2B 63f4e099f829c56950c20e236dd3c11748b4e33dc6d04506602eeff5224e77e210f224f4b663beeca3ccdd2c7f121066851cf4fc93560460650520b955a47be3 SHA512 afa39292e3a4b6c115ca8005244e4ff7fb04eb5c96609e1c7acb940a15e2b3a1bc0ec659abb73be6c623a7943d402c35386d95a06336c30eea98f5fd706ec353
 DIST amd64-bin-libreoffice-kde-7.4.6.2-r1.xd3 21615543 BLAKE2B 1ac20a6e04161cc87d07319ffad89d286a9002a12d696bae98ed790dd88f722a3a9942333a09485790f3faea5edad4beb92bd1b7ec76ebe774241281e19c0b7f SHA512 0e84bbc3a7786ab9eb8eea0d6406a2e0d0b5a986406e7a175ddb24cdecc870a659f2e2b2b139b2f242579b9ddff2c1d58e547ed05194f7f0b57ebb7002ba9b84
 DIST amd64-bin-libreoffice-kde-7.4.6.2.xd3 21625101 BLAKE2B da27e7a9274d5ed16a14d3a11333d695d77ea07a4bf078f52002da8c6a29105ac748fa03523ff2b9789573214f83123b4c13a1c54a60c1641609b7877d64a1e8 SHA512 7afafdcb90c1a31affdcba98e3f36a4823fd11b4de8ade5ea66b1a112729680eb3da88e8025caaae7896848ce78e18bbe14e2ee52f06f4154292b0310765b8ef
+DIST amd64-bin-libreoffice-kde-7.5.3.2.xd3 20280507 BLAKE2B 93dce73d02fde3afa094332ee936ebaf582f095225de6e7b6e812f2fe8a0fd9c762148009540c2c97c4757f93c73be24ab7407670a479360f6a9642cb49aab90 SHA512 465339b53ced60a652ee4c252145de0366fda42015c853420ebd5a18748e7e9e744b8a504a543ef71cc4e4353957065dd6044c872708f2c079de621f9588ee36
 DIST amd64-bin-libreoffice-kde-java-7.4.6.2-r1.xd3 32246133 BLAKE2B d6ed1f861781fbc16897e8e2f5b71116afc484b54d81deac216a9b7bca8262807b815796db57062492894cd9948d031e954cb794df4415979081511e9bcb514b SHA512 454fa85837dd6607be221146a20346689af89a691b1a997c0703d7b3b888a0dcb4c8f668b1a70eaa82433cf993045e4c8483fb2744ef273dc9c7e69b1ef29dad
 DIST amd64-bin-libreoffice-kde-java-7.4.6.2.xd3 32196626 BLAKE2B 3c85f884a11b57ad134ea5a5d1849a1b9f4b17962e734f4a1ec5b6920f323f24776db96527c8f59afaf2573388cfbde10fb36221ffcfc8190b10a6bdfed64802 SHA512 951dde7f83f283a50f68ee0b22d4ae95a1656920a07e6e34a4747cff7da672ade09058986163f5b9c21c6888c4b6e5e13cd55b91face31c588f0d5759c244f1e
+DIST amd64-bin-libreoffice-kde-java-7.5.3.2.xd3 31316714 BLAKE2B 571a44144b2c2adeab25db77461eae11b897a69be12e10dfc53aae9b0b24f9f5f2c56161c8e5e3997ab6e469770ff7d8b8a7b0591da471a4ce3fa89db3d4b2e6 SHA512 3e7e972da16d87c1c14073137f782c9fb5719f7d55f6b94a1cf9102a87ac22d43d3fcd6d45f70802011dffc31aeda1fa15dbb59df9d84c065c4da3e590b6dcb6
 DIST x86-bin-libreoffice-7.4.6.2-r1.tar.xz 147948148 BLAKE2B fdb9cb33a19ff7962faaff345dbe629f07834b568ca5bf29afbcf89928602fab85e17ed979340fb72ee70b0f8729f4760d6a221631b92c6947fa8625117b94df SHA512 4cfb49ac4c4209d1f0293dba83fe444aeaaa4e764d48d41ac500d2a3e5dbf9c0f338a537184fb869a327ce3785262103dde86efd3f3d1d9a9cd80150f5db1fa0
 DIST x86-bin-libreoffice-7.4.6.2.tar.xz 147928192 BLAKE2B 450ddd4ff96d96ec03102ef88cd20442213ebb83fac1bf5f4ba5637459dd318530767798b26566cd694b7a229f96d5a5346da5ddc06366e20ec1498068645911 SHA512 b5f636f4444ab79572c31ab2cd3de026ddc96c7daf431617de05b9e8b08d2b988a4c521c593e16b7f665032de89c710b164226f7a0461b077877c8add874db46
+DIST x86-bin-libreoffice-7.5.3.2.tar.xz 150673172 BLAKE2B 90d69a066ac9f7705bd5fd2067de89faa346b1cb7536d0f22658554318b34353cebc570b9507e542bb6160f9e295c48739a490965bbca2f85871ce79037c1d17 SHA512 cba8321696740404e9c2e81c05a1de8e471db24cd2961cb8f5eda241aeee17d4675eb109819d5ba9363268c646c2028e8c7b495d4a6e29383316e40d3e3c6a06
 DIST x86-bin-libreoffice-gnome-7.4.6.2-r1.xd3 1515008 BLAKE2B cae5b8f417b61ea29e0952dacb6391b308154ca55961f5f06a7683ada7296e2c88a805dd8b5d70a8adf5d021ae821ea63c318defb269cd7b6db5759cd1b1340c SHA512 2adf137fd8807a99c3ee42f4bb79d1b8cb276d1fc1259420b62886edf888b43bfdc83bd954e8428c2b7c1c17469bced31cdc452a987774bf0e9b3f521d6425d1
 DIST x86-bin-libreoffice-gnome-7.4.6.2.xd3 1533290 BLAKE2B dd9efb55044ed4d15ed000ef0edd0bcdff65b87e9abdd38a624dd7ce188e9c2b42a3320305eac048f60be0c5e05480b8771d0dbf11166a47c6dc8caf3793708c SHA512 0b86b364768a232b2eb14d9e4e84cd7201cc16064a3b0108f9605ffa5585007fd2a3eeb1e7b8ba69e7fc9d30564d63aa095a8d60043f60364edd6bf4fae99815
+DIST x86-bin-libreoffice-gnome-7.5.3.2.xd3 1749063 BLAKE2B 4cec2c2e7551443850e0a858b0ac7f1d0888f329d8bf402f28bdd15f861ea8c2e8a1fa4c8e0ac01731bc7069c95f89d08f147108fecc219cb470a3e1b66c8b3e SHA512 f196808233dc18ed42aae0328209876c61b9b556d6ea3ebe87a674e46bff4aab8d1f5ad2f4b0b8e3de05fe0b6aa2c6244dcad677e41d7b510e63d0d032216855
 DIST x86-bin-libreoffice-kde-7.4.6.2-r1.xd3 19581148 BLAKE2B a24c7f6c6fc4a89ca8c6597079b17294eb2b77519482b8659a55a65753efcca63f74facf98941abc69f5249e88432ce68d0f85c87b439ca5ed80f1e44fa58e84 SHA512 6c4481ecd02cc4364ed276669711040bf8a6f9b0c7fce13dc7bd72466f0b4aee087c6fc55a8d0b1943ae11e1714c058e3a714b38363ab1bae54d23a1495ebe64
 DIST x86-bin-libreoffice-kde-7.4.6.2.xd3 20590446 BLAKE2B c09ea5c79402ddb5db668ac950f2497ed390c55f30660c06359db73da397f85433fc5cdf4bd716d2326d9727b1c49dcf0785c4c58a794a91f6a7cbf48ebb51ab SHA512 facc20e34da248e8a6dd94caeb27587aa9236594f299cb46bbee9353e64a478198f0077e5f9a4c66b379cce0b6551de010f0dd927a056a8650937b34870ab386
+DIST x86-bin-libreoffice-kde-7.5.3.2.xd3 19989837 BLAKE2B cc1844c9312b47b397823af3a8860b03ab3690f3e5e38190df6ab5f0a9ce537d961a309aa4ec99fd7ef65a0bf99a505cc8eb414dcc958c73d8b1dde80b543a77 SHA512 b0c1a6906b322831c39c248c816e5b203ed2c5a17dae9cf4e25a0d7361818f2a466860d4e9eeb04132ac797c5d7798a8f3651d97d25a5c64c4c135297f092f4e
 EBUILD libreoffice-bin-7.4.6.2-r1.ebuild 6400 BLAKE2B 81cd630863031778631f914a841a723ec22ab1f9f3baee17f7b2eeb00c9780dd31099189b0bd03aca3d73d27a9e0c4932413a3bc96312f29f98ae3068752aa25 SHA512 8b01333c8c8c9732e25ac1b899f3ad8cea0e8632abe5bd4f8d47577ed9af82d0bff45f45197f30892109480651c264e7b53755eea5feb664e568b7d781aba2d8
 EBUILD libreoffice-bin-7.4.6.2.ebuild 6400 BLAKE2B e38037fb48f6d1aed68e45887d700e00fac41aab75acf2227961fe732bb6384c950af2afa87d2e9dabc2bcd9b6f13ad08d2e1f9b7ef61f8f0d1f541defc8d784 SHA512 ef5b4b84899becc8b81e798ebd21b60f65f695e0d5a33fd37938d01b7a72bd151b057cd809323e2e571964ef16a9d9be3a4abbe10df5d50e0beb0339c673bc9d
+EBUILD libreoffice-bin-7.5.3.2.ebuild 6422 BLAKE2B 647fcca6610533aef5502d3ae39fb3f8896b0aa3a4e00a64b7666a6f43e22976a44085b69375599d72743eb5132fdff1788ed3814beb23ff5bb2e020cd663dc2 SHA512 298fdb35f4a348370f81d675a4b708e9177241adcc94aff4a0ce40eb935046e88c32d551fee7bd68508280e0840274b694d0273f9eb5f00c3905ca5a68387e53
 MISC metadata.xml 529 BLAKE2B a789c063d4ee905fd36dd0192d0f2769e0eeff96e69b9f27a2e75ca47a7bcb0ec841e68cd0d5299152df2b9b626bcf301066aa251e1b4ca2b74290d57c448c8e SHA512 b98d77cf995e824efcc392c185e616219d35976f43c343a1cfb1737fb44556edbd47b13d47924e3195159d0ec06e40f4909d0e7cd9deed7a8fa10928bc47becf
diff --git a/app-office/libreoffice-bin/libreoffice-bin-7.5.3.2.ebuild b/app-office/libreoffice-bin/libreoffice-bin-7.5.3.2.ebuild
new file mode 100644
index 000000000000..5044b8e3b7fa
--- /dev/null
+++ b/app-office/libreoffice-bin/libreoffice-bin-7.5.3.2.ebuild
@@ -0,0 +1,261 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+BASE_PACKAGENAME="bin"
+BASE_AMD64_URI="https://tamiko.43-1.org/distfiles/amd64-${BASE_PACKAGENAME}-"
+BASE_X86_URI="https://tamiko.43-1.org/distfiles/x86-${BASE_PACKAGENAME}-"
+
+PYTHON_COMPAT=( python3_11 )
+PYTHON_REQ_USE="xml(+)"
+
+inherit java-pkg-opt-2 python-single-r1 prefix toolchain-funcs xdg-utils
+
+DESCRIPTION="A full office productivity suite. Binary package"
+HOMEPAGE="https://www.libreoffice.org"
+SRC_URI_AMD64="
+	${BASE_AMD64_URI}libreoffice-${PVR}.tar.xz
+	kde? (
+		!java? ( ${BASE_AMD64_URI}libreoffice-kde-${PVR}.xd3 )
+		java? ( ${BASE_AMD64_URI}libreoffice-kde-java-${PVR}.xd3 )
+	)
+	gnome? (
+		!java? ( ${BASE_AMD64_URI}libreoffice-gnome-${PVR}.xd3 )
+		java? ( ${BASE_AMD64_URI}libreoffice-gnome-java-${PVR}.xd3 )
+	)
+	!kde? ( !gnome? (
+		java? ( ${BASE_AMD64_URI}libreoffice-java-${PVR}.xd3 )
+	) )
+"
+SRC_URI_X86="
+	${BASE_X86_URI}libreoffice-${PVR}.tar.xz
+	kde? (
+		${BASE_X86_URI}libreoffice-kde-${PVR}.xd3
+	)
+	gnome? (
+		${BASE_X86_URI}libreoffice-gnome-${PVR}.xd3
+	)
+"
+
+SRC_URI="
+	amd64? ( ${SRC_URI_AMD64} )
+	x86? ( ${SRC_URI_X86} )
+"
+
+IUSE="gnome java kde"
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+
+BIN_COMMON_DEPEND="
+	app-text/hunspell:0/1.7
+	=app-text/libexttextcat-3.4*
+	=app-text/libmwaw-0.3*
+	dev-cpp/abseil-cpp:0/20230125
+	dev-libs/boost:0/1.82.0
+	dev-libs/icu:0/73.1
+	dev-libs/liborcus:0/0.17
+	dev-libs/xmlsec:0/1.3
+	>=media-gfx/graphite2-1.3.10
+	media-libs/harfbuzz:0/6.0.0[icu]
+	media-libs/libjpeg-turbo:0/0.2
+	media-libs/libpng:0/16
+	media-libs/openjpeg:2/7
+	media-libs/zxing-cpp:0/3
+	sci-mathematics/lpsolve:0/55
+	>=sys-devel/gcc-12.2.1
+	>=sys-libs/glibc-2.36
+"
+
+# PLEASE place any restrictions that are specific to the binary builds
+# into the BIN_COMMON_DEPEND block above.
+# All dependencies below this point should remain identical to those in
+# the source ebuilds.
+
+COMMON_DEPEND="
+	${BIN_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/abseil-cpp:=
+	>=dev-cpp/clucene-2.3.3.4-r2
+	>=dev-cpp/libcmis-0.5.2-r2
+	dev-db/unixODBC
+	>=games-engines/box2d-2.4.1:0
+	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.17.2:0/0.17
+	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]
+	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/glu
+	virtual/opengl
+	x11-libs/cairo[X]
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	net-print/cups
+	sys-apps/dbus
+	gnome? (
+		dev-libs/glib:2
+		gnome-base/dconf
+		gnome-extra/evolution-data-server
+	)
+	media-libs/gstreamer:1.0
+	media-libs/gst-plugins-base:1.0
+	!kde? (
+		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
+	)
+	dev-db/mariadb-connector-c
+"
+
+RDEPEND="${COMMON_DEPEND}
+	acct-group/libreoffice
+	acct-user/libreoffice
+	!app-office/libreoffice
+	!app-office/openoffice
+	media-fonts/liberation-fonts
+	|| ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
+	java? ( virtual/jre:11 )
+	kde? ( kde-frameworks/breeze-icons:* )
+"
+
+PDEPEND="
+	=app-office/libreoffice-l10n-$(ver_cut 1-4)*
+"
+
+DEPEND="dev-util/xdelta:3"
+
+# only one flavor at a time
+REQUIRED_USE="kde? ( !gnome ) gnome? ( !kde ) ${PYTHON_REQUIRED_USE}"
+
+RESTRICT="test strip"
+
+S="${WORKDIR}"
+
+PYTHON_UPDATER_IGNORE="1"
+
+QA_PREBUILT="/usr/*"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	einfo "Uncompressing distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar.xz"
+	xz -cd "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar.xz" > "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" || die
+
+	use x86 && use java && die "There is no build for x86 with Java support."
+
+	local patchname
+	use kde && patchname="-kde"
+	use gnome && patchname="-gnome"
+	use java && patchname="${patchname}-java"
+
+	if [[ -n "${patchname}" ]]; then
+		einfo "Patching distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar using ${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PVR}.xd3"
+		xdelta3 -d -s "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PVR}.xd3" "${WORKDIR}/tmpdist.tar" || die
+		mv "${WORKDIR}/tmpdist.tar" "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" || die
+	fi
+
+	einfo "Unpacking new ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar"
+	unpack "./${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar"
+}
+
+src_prepare() {
+	cp "${FILESDIR}"/50-${PN} "${T}"
+	eprefixify "${T}"/50-${PN}
+	default
+}
+
+src_configure() { :; }
+
+src_compile() { :; }
+
+src_install() {
+	dodir /usr
+	cp -aR "${S}"/usr/* "${ED}"/usr/
+
+	# prevent revdep-rebuild from attempting to rebuild all the time
+	insinto /etc/revdep-rebuild && doins "${T}/50-${PN}"
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+
+	ewarn 'If you plan to use the Base application you should use a source build and enable java and firebird.'
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index ddeaba9b1159..41df277c91c1 100644
Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ
diff --git a/dev-util/nvidia-cuda-toolkit/Manifest b/dev-util/nvidia-cuda-toolkit/Manifest
index 0f60b8964dd6..98736c9e4212 100644
--- a/dev-util/nvidia-cuda-toolkit/Manifest
+++ b/dev-util/nvidia-cuda-toolkit/Manifest
@@ -3,8 +3,10 @@ DIST cuda_11.7.0_515.43.04_linux.run 3490450898 BLAKE2B f5984a3ae67a116f7944d8e1
 DIST cuda_11.8.0_520.61.05_linux.run 4336730777 BLAKE2B cfdb4a51c49ee504e56a4a95de4e477ef207b678527cbb633c1e83e667f1a62c0f67038befd0b10f7ae24cda9c8bc5c54293d06a05b2e45be6cf677e40f71f17 SHA512 e96e1389abed34b5093b3a1d4e6ae9f3d4f8406621b1475f378efae65868657efce22da03b5b4e0a548d9635e406b8690b18b17b186d03ecb3ca0703c5d5787a
 DIST cuda_12.0.1_525.85.12_linux.run 4207617207 BLAKE2B d99b70b253decb03f37e73c783771b50aa057c02b31a4fa629c4ba2ac91dce8f87b8316d205ee1393ab936e19aebd7753cff339d00f91dcd4cfe7a968f98364e SHA512 edd73c6e989e8469d73a8a8c4c927aa0654c1c299eff77c8b30dafd5da6e4e368626cec48978785f8e94fe8d1b7b73f1df6d5d03a80a6f58a07fa2d1f15c7f86
 DIST cuda_12.1.0_530.30.02_linux.run 4245586997 BLAKE2B 96695088ceef502da79f701d45d2706491e3dadd615776501125ca402e8f4f036dfc5e8d0b6b6cceea460e53ec2431b20bdaef5527c1e0d5cdea51a8e9b01704 SHA512 4a224475aa4baa202999c919c312615cee30283830a0a6a88ca24834548f8392dbc747fbb5fc8291797dff358c369b099cdd8a18a0e83f0768de747a3a7338de
+DIST cuda_12.1.1_530.30.02_linux.run 4317456991 BLAKE2B 562865cc63202906d0a5c2511387c3ded069c45576810b3076908730021125188017c96e88704b31f0401e29435f01dd87dfe33ca36fce8122683c27e1b928ea SHA512 2f5b07b6253a7268afa81345acc8be9fc3ab80f7f5c565d199f72ac74467d562eb83b72f87f33bafa90c88612b16366c3e209cbec1cb0b5907839e5823520323
 EBUILD nvidia-cuda-toolkit-11.7.0-r4.ebuild 7971 BLAKE2B 3c4d3872c27748286432d4880bba46e61c16c98e1cf6536c96a461bdf5bb33bc608f91f5806054b8bc441eb6614b04b8a9d97267d7f76d7c8ffeb0234fba19d3 SHA512 d0a32abbbb5700f3bd6925a380cca95cd03ff0a0fc77dfd259410359b8a785464fe81d91391741b01a56dd788d6e90019aa6d06237f19f4829b48041cf6250fc
 EBUILD nvidia-cuda-toolkit-11.8.0-r3.ebuild 7996 BLAKE2B 2b33d330b9865a62ef5789035107958034f26d16d416a1589c04e6d2444e94ecf752584043d1e55828baa3f1aa7a790dd1450edbe88b00a50793192fdbd29cb3 SHA512 3c4efaf3363dbe8e7d3bdd8b838d53bda3c4bbb029dee4bd389a8b0efa6d274b5cda1f5e62bfec45f1984771d08ac2a62e0836f94461824928e0e47828d03067
 EBUILD nvidia-cuda-toolkit-12.0.1-r1.ebuild 8695 BLAKE2B 29756d28b9e67350051556dee977dca4725309c372759abb9568f13b10885ab849782dab914aa230b38ab1de2646e81d07002dcb097b6ea4940352c3951e2982 SHA512 5fb8240ed117c299ed2935c5a57734740d46e5d62c7d6deeab896442d4fb59977b476e566399c1008b706547a0163d03bb9006ca8534021e240360f9a9d1f913
 EBUILD nvidia-cuda-toolkit-12.1.0-r1.ebuild 9138 BLAKE2B 9d90f50b37656dca322bd568bf07a6c226cbe0e6be529f4dea5dd8844ff9a77b6935d78ad19254d47350212b4d24cee9f49a0d18d73452a8242c406a08885269 SHA512 88aeb612b7adef115ee27b6dbcf0969da2689f72c0f01e5487719f43132a76aa2c62df7807c376a029fbcd19ce443390c744ac688645752a14fadbced3e85b23
+EBUILD nvidia-cuda-toolkit-12.1.1.ebuild 9138 BLAKE2B 9d90f50b37656dca322bd568bf07a6c226cbe0e6be529f4dea5dd8844ff9a77b6935d78ad19254d47350212b4d24cee9f49a0d18d73452a8242c406a08885269 SHA512 88aeb612b7adef115ee27b6dbcf0969da2689f72c0f01e5487719f43132a76aa2c62df7807c376a029fbcd19ce443390c744ac688645752a14fadbced3e85b23
 MISC metadata.xml 761 BLAKE2B a6ae653c6206cbc05349297499b6dde91bce6d543e10bd5ea915cfe9729dfa6f1eb954ae09c2e4d3997f51315ae090b38606c21b5099e750596ea66fdd93e817 SHA512 9133517d805201d25b651e48abed90394c88ef33a2571ab20b3b19d365f85a90478486c7c087c9150d7d9f6e4026873c5236c64ed649fd3bfc8f9b81479dcc59
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.1.1.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.1.1.ebuild
new file mode 100644
index 000000000000..138f95c19eb0
--- /dev/null
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.1.1.ebuild
@@ -0,0 +1,308 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit check-reqs toolchain-funcs unpacker
+
+DRIVER_PV="530.30.02"
+
+DESCRIPTION="NVIDIA CUDA Toolkit (compiler and friends)"
+HOMEPAGE="https://developer.nvidia.com/cuda-zone"
+SRC_URI="https://developer.download.nvidia.com/compute/cuda/${PV}/local_installers/cuda_${PV}_${DRIVER_PV}_linux.run"
+S="${WORKDIR}"
+
+LICENSE="NVIDIA-CUDA"
+SLOT="0/${PV}"
+KEYWORDS="-* ~amd64 ~amd64-linux"
+IUSE="debugger nsight profiler rdma vis-profiler sanitizer"
+RESTRICT="bindist mirror"
+
+# since CUDA 11, the bundled toolkit driver (== ${DRIVER_PV}) and the
+# actual required minimum driver version are different.
+RDEPEND="
+	<sys-devel/gcc-13_pre[cxx]
+	>=x11-drivers/nvidia-drivers-525.60.13
+	nsight? (
+		dev-libs/libpfm
+		dev-libs/wayland
+		|| (
+			dev-libs/openssl-compat:1.1.1
+			=dev-libs/openssl-1.1.1*
+		)
+		media-libs/tiff-compat:4
+		sys-libs/zlib
+	)
+	rdma? ( sys-cluster/rdma-core )
+	vis-profiler? (
+		>=virtual/jre-1.8:*
+	)"
+BDEPEND="nsight? ( dev-util/patchelf )"
+
+QA_PREBUILT="opt/cuda/*"
+CHECKREQS_DISK_BUILD="15000M"
+
+pkg_setup() {
+	check-reqs_pkg_setup
+}
+
+src_prepare() {
+	# ATTENTION: change requires revbump, see link below for supported GCC # versions
+	# https://docs.nvidia.com/cuda/cuda-installation-guide-linux/index.html#system-requirements
+	local cuda_supported_gcc="8.5 9.4 9.5 10 10.3 10.4 11 11.1 11.2 11.3 12 12.1 12.2"
+
+	sed \
+		-e "s:CUDA_SUPPORTED_GCC:${cuda_supported_gcc}:g" \
+		"${FILESDIR}"/cuda-config.in > "${T}"/cuda-config || die
+
+	default
+}
+
+src_install() {
+	local cudadir=/opt/cuda
+	local ecudadir="${EPREFIX}${cudadir}"
+	local pathextradirs ldpathextradirs
+	dodir ${cudadir}
+	into ${cudadir}
+
+	# Install standard sub packages
+	local builddirs=(
+		builds/cuda_{cccl,cudart,cuobjdump,cuxxfilt,demo_suite,nvcc,nvdisasm,nvml_dev,nvprune,nvrtc,nvtx,opencl}
+		builds/lib{cublas,cufft,cufile,curand,cusolver,cusparse,npp,nvjitlink,nvjpeg}
+		builds/nvidia_fs
+		$(usex profiler "builds/cuda_nvprof builds/cuda_cupti builds/cuda_profiler_api" "")
+		$(usex vis-profiler "builds/cuda_nvvp" "")
+		$(usex debugger "builds/cuda_gdb" "")
+	)
+
+	local d f
+	for d in "${builddirs[@]}"; do
+		ebegin "Installing ${d}"
+		[[ -d ${d} ]] || die "Directory does not exist: ${d}"
+
+		if [[ -d ${d}/bin ]]; then
+			for f in ${d}/bin/*; do
+				if [[ -f ${f} ]]; then
+					dobin "${f}"
+				else
+					insinto ${cudadir}/bin
+					doins -r "${f}"
+				fi
+			done
+		fi
+
+		insinto ${cudadir}
+		if [[ -d ${d}/targets ]]; then
+			doins -r "${d}"/targets
+		fi
+		if [[ -d ${d}/share ]]; then
+			doins -r "${d}"/share
+		fi
+		if [[ -d ${d}/extras ]]; then
+			doins -r "${d}"/extras
+		fi
+		eend $?
+	done
+	dobin "${T}"/cuda-config
+
+	doins builds/EULA.txt
+	# nvml and nvvm need special handling
+	ebegin "Installing nvvm"
+	doins -r builds/cuda_nvcc/nvvm
+	fperms +x ${cudadir}/nvvm/bin/cicc
+	eend $?
+
+	ebegin "Installing nvml"
+	doins -r builds/cuda_nvml_dev/nvml
+	eend $?
+
+	if use sanitizer; then
+		ebegin "Installing sanitizer"
+		dobin builds/integration/Sanitizer/compute-sanitizer
+		doins -r builds/cuda_sanitizer_api/compute-sanitizer
+		# special handling for the executable
+		fperms +x ${cudadir}/compute-sanitizer/compute-sanitizer
+		eend $?
+	fi
+
+	use debugger && ldpathextradirs+=":${ecudadir}/extras/Debugger/lib64"
+	use profiler && ldpathextradirs+=":${ecudadir}/extras/CUPTI/lib64"
+
+	if use vis-profiler; then
+		ebegin "Installing libnvvp"
+		doins -r builds/cuda_nvvp/libnvvp
+		# special handling for the executable
+		fperms +x ${cudadir}/libnvvp/nvvp
+		eend $?
+		pathextradirs+=":${ecudadir}/libnvvp"
+	fi
+
+	if use nsight; then
+		local ncu_dir=$(grep -o 'nsight-compute-[0-9][0-9\.]*' -m1 manifests/cuda_x86_64.xml)
+		ebegin "Installing ${ncu_dir}"
+		mv builds/nsight_compute builds/${ncu_dir} || die
+		doins -r builds/${ncu_dir}
+
+		# check this list on every bump
+		local exes=(
+			${ncu_dir}/ncu
+			${ncu_dir}/ncu-ui
+			${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/libexec/QtWebEngineProcess
+			${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/CrashReporter
+			${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/OpenGLVersionChecker
+			${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/QdstrmImporter
+			${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/ncu-ui
+			${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/ncu-ui.bin
+			${ncu_dir}/target/linux-desktop-glibc_2_11_3-x64/TreeLauncherSubreaper
+			${ncu_dir}/target/linux-desktop-glibc_2_11_3-x64/TreeLauncherTargetLdPreloadHelper
+			${ncu_dir}/target/linux-desktop-glibc_2_11_3-x64/ncu
+		)
+
+		dobin builds/integration/nsight-compute/{ncu,ncu-ui}
+		eend $?
+
+		# remove rdma libs (unless USE=rdma)
+		if ! use rdma; then
+			rm -r "${ED}"/${cudadir}/${ncu_dir}/host/target-linux-x64/CollectX || die
+		fi
+
+		local nsys_dir=$(grep -o 'nsight-systems-[0-9][0-9\.]*' -m1 manifests/cuda_x86_64.xml)
+		ebegin "Installing ${nsys_dir}"
+		mv builds/nsight_systems builds/${nsys_dir} || die
+		doins -r builds/${nsys_dir}
+
+		# check this list on every bump
+		exes+=(
+			${nsys_dir}/host-linux-x64/nsys-ui
+			${nsys_dir}/host-linux-x64/nsys-ui.bin
+			${nsys_dir}/host-linux-x64/ResolveSymbols
+			${nsys_dir}/host-linux-x64/ImportNvtxt
+			${nsys_dir}/host-linux-x64/CrashReporter
+			${nsys_dir}/host-linux-x64/QdstrmImporter
+			${nsys_dir}/host-linux-x64/libexec/QtWebEngineProcess
+			${nsys_dir}/target-linux-x64/nsys
+			${nsys_dir}/target-linux-x64/launcher
+			${nsys_dir}/target-linux-x64/nvgpucs
+			${nsys_dir}/target-linux-x64/nsys-launcher
+			${nsys_dir}/target-linux-x64/sqlite3
+			${nsys_dir}/target-linux-x64/python/bin/python
+		)
+
+		# remove rdma libs (unless USE=rdma)
+		if ! use rdma; then
+			rm -r "${ED}"/${cudadir}/${nsys_dir}/target-linux-x64/CollectX || die
+		fi
+
+		dobin builds/integration/nsight-systems/{nsight-sys,nsys,nsys-exporter,nsys-ui}
+		eend $?
+
+		# nsight scripts and binaries need to have their executable bit set, #691284
+		for f in "${exes[@]}"; do
+			fperms +x ${cudadir}/${f}
+		done
+
+		# fix broken RPATHs
+		patchelf --set-rpath '$ORIGIN' "${ED}"/${cudadir}/${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/libarrow.so || die
+		patchelf --set-rpath '$ORIGIN' "${ED}"/${cudadir}/${nsys_dir}/host-linux-x64/libarrow.so || die
+
+		# remove foreign archs (triggers SONAME warning, #749903)
+		rm -r "${ED}"/${cudadir}/${ncu_dir}/target/linux-desktop-glibc_2_19_0-ppc64le || die
+		rm -r "${ED}"/${cudadir}/${ncu_dir}/target/linux-desktop-t210-a64 || die
+
+		# unbundle libstdc++
+		rm "${ED}"/${cudadir}/${nsys_dir}/host-linux-x64/libstdc++.so.6 || die
+
+		# unbundle openssl
+		rm "${ED}"/${cudadir}/${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/libssl.so* || die
+		rm "${ED}"/${cudadir}/${nsys_dir}/host-linux-x64/libssl.so* || die
+
+		# unbundle libpfm
+		rm "${ED}"/${cudadir}/${nsys_dir}/host-linux-x64/libpfm.so* || die
+
+		# TODO: unbundle qt5
+		# TODO: unbundle boost
+		# TODO: unbundle icu
+		# TODO: unbundle mesa
+		# TODO: unbundle libSshClient
+		# TODO: unbundle sqlite
+	fi
+
+	exes=(
+			extras/demo_suite/bandwidthTest
+			extras/demo_suite/busGrind
+			extras/demo_suite/deviceQuery
+			extras/demo_suite/nbody
+			extras/demo_suite/oceanFFT
+			extras/demo_suite/randomFog
+			extras/demo_suite/vectorAdd
+	)
+
+	# remove rdma libs (unless USE=rdma)
+	if ! use rdma; then
+		rm "${ED}"/${cudadir}/targets/x86_64-linux/lib/libcufile_rdma* || die
+	fi
+
+	# set executable bit on demo_suite binaries
+	for f in "${exes[@]}"; do
+		fperms +x ${cudadir}/${f}
+	done
+
+	# Add include and lib symlinks
+	dosym targets/x86_64-linux/include ${ecudadir}/include
+	dosym targets/x86_64-linux/lib ${ecudadir}/lib64
+
+	# Remove bad symlinks
+	rm "${ED}"/${cudadir}/targets/x86_64-linux/include/include || die
+	rm "${ED}"/${cudadir}/targets/x86_64-linux/lib/lib64 || die
+
+	newenvd - 99cuda <<-EOF
+		PATH=${ecudadir}/bin${pathextradirs}
+		ROOTPATH=${ecudadir}/bin
+		LDPATH=${ecudadir}/lib64:${ecudadir}/nvvm/lib64${ldpathextradirs}
+	EOF
+
+	# Cuda prepackages libraries, don't revdep-build on them
+	insinto /etc/revdep-rebuild
+	newins - 80${PN} <<-EOF
+		SEARCH_DIRS_MASK="${ecudadir}"
+	EOF
+}
+
+pkg_postinst_check() {
+	local a="$("${EROOT}"/opt/cuda/bin/cuda-config -s)"
+	local b="0.0"
+	local v
+	for v in ${a}; do
+		ver_test "${v}" -gt "${b}" && b="${v}"
+	done
+
+	# if gcc and if not gcc-version is at least greatest supported
+	if tc-is-gcc && \
+		ver_test $(gcc-version) -gt "${b}"; then
+			ewarn
+			ewarn "gcc > ${b} will not work with CUDA"
+			ewarn "Make sure you set an earlier version of gcc with gcc-config"
+			ewarn "or append --compiler-bindir= pointing to a gcc bindir like"
+			ewarn "--compiler-bindir=${EPREFIX}/usr/*pc-linux-gnu/gcc-bin/gcc${b}"
+			ewarn "to the nvcc compiler flags"
+			ewarn
+	fi
+}
+
+pkg_postinst() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		pkg_postinst_check
+	fi
+
+	if use profiler || use nsight; then
+		einfo
+		einfo "nvidia-drivers restrict access to performance counters."
+		einfo "You'll need to either run profiling tools (nvprof, nsight) "
+		einfo "using sudo (needs cap SYS_ADMIN) or add the following line to "
+		einfo "a modprobe configuration file "
+		einfo "(e.g. /etc/modprobe.d/nvidia-prof.conf): "
+		einfo
+		einfo "options nvidia NVreg_RestrictProfilingToAdminUsers=0"
+		einfo
+	fi
+}
diff --git a/games-engines/Manifest.gz b/games-engines/Manifest.gz
index b9c66b857a10..d5e8679d2187 100644
Binary files a/games-engines/Manifest.gz and b/games-engines/Manifest.gz differ
diff --git a/games-engines/odamex/Manifest b/games-engines/odamex/Manifest
index a96dca5ab426..77cbd65e5f7a 100644
--- a/games-engines/odamex/Manifest
+++ b/games-engines/odamex/Manifest
@@ -1,4 +1,4 @@
 AUX odamex-10.3.0-unbundle-fltk.patch 3556 BLAKE2B 8aa1fd752c465a89566edab409c2df03ce1bae7a3ae1fdf3749fbce90cef81d1315f1f677f3090d676ad514df957a043cfd02c497d03673c248d55b02ee89768 SHA512 3facbcb43f0bc516e85c6030d66fc03c2c0b11d25ed30bac1947cbffd1f3123e173c46e02b198215dc5b4aac7fccbf1bfe9aeaf54db6c0d159d7bd6d3abd3797
 DIST odamex-src-10.3.0.tar.gz 24281159 BLAKE2B f38eacf700f21caa1300e46d926f6e07b97944326cd0ef9d22c3e14af82e91f39e88ae055d90442b81237888b90b8a1c478a54fd599b9648790260863916fb1f SHA512 902f4d20b9246ea94b50099e0ab2c6cd17faad68df344114e9963e100c35a4ac141f3d109b7affb8860a4e082a39ffcfdfcea45d9e6ada6efe09f01c3546f92b
-EBUILD odamex-10.3.0.ebuild 2182 BLAKE2B dd8212dc231eebd2edaf8d996f55a597a0442397c236a8c14d606e80f71529c4ba4bfdb98d649b7c78d7be7c1acd0f5bf02b385afddc83cf700c305fe5ad96b0 SHA512 19717d42600547edf0e8c6791c7a92b5b487bdfdf17e49481e4a7ddcb56991c8b567d26e20565b856e3bb80ef2f46b82ea83fe1fbc1fc4db3b58de12d791d94a
+EBUILD odamex-10.3.0-r1.ebuild 2182 BLAKE2B 81af80e1d38971828369a1b67ace9761809205d0145862781542bfbbd4b615074d663e0c35fa2e5d567f6b67416a0775bca24cd27a41a47c45ca298fb2008555 SHA512 795b9e65dbaaac5dedb5bf39f0ee5022f724f47b52bef3999cdb78da069734c7915a7489a884e239f6c233c77a6541eecfb74bd027c7919edf8100c867953cb6
 MISC metadata.xml 1438 BLAKE2B 2cd891e631cb9ee0182c30d9aa8a9e69089f32fb12b44f8e4a62372e40db8f89a9701411dcb3bb86937d50e035452359cb95d2bbd5b4a74d2057cb77872196ad SHA512 72f2858c111b40de8ba9da3b5d52f673ce0847fd4036e1582dc9ce56432b3e08a61ef650fc253072789a6d00167c8312158d8be374dbbfbdd5473ab75cb447af
diff --git a/games-engines/odamex/odamex-10.3.0-r1.ebuild b/games-engines/odamex/odamex-10.3.0-r1.ebuild
new file mode 100644
index 000000000000..594869339e54
--- /dev/null
+++ b/games-engines/odamex/odamex-10.3.0-r1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WX_GTK_VER="3.0-gtk3"
+inherit cmake desktop prefix wxwidgets xdg
+
+DESCRIPTION="Online multiplayer free software engine for DOOM"
+HOMEPAGE="https://odamex.net/"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${PN}-src-${PV}.tar.gz"
+
+LICENSE="GPL-2+ MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+client hidpi master +odalaunch portmidi server upnp X"
+REQUIRED_USE="|| ( client master server )"
+
+# protobuf is still bundled. Unfortunately an old version is required for C++98
+# compatibility. We could use C++11, but upstream is concerned about using a
+# completely different protobuf version on a multiplayer-focused engine.
+
+RDEPEND="
+	client? (
+		media-libs/libpng:0=
+		media-libs/libsdl2[joystick,sound,video]
+		media-libs/sdl2-mixer
+		net-misc/curl
+		!hidpi? ( x11-libs/fltk:1 )
+		portmidi? ( media-libs/portmidi )
+		X? ( x11-libs/libX11 )
+	)
+	odalaunch? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )
+	server? (
+		dev-libs/jsoncpp:=
+		upnp? ( net-libs/miniupnpc:= )
+	)"
+DEPEND="${RDEPEND}"
+BDEPEND="games-util/deutex"
+
+S="${WORKDIR}/${PN}-src-${PV}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-10.3.0-unbundle-fltk.patch
+)
+
+src_prepare() {
+	rm -r libraries/miniupnp || die
+	hprefixify common/d_main.cpp
+
+	use odalaunch && setup-wxwidgets
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_INTERNAL_FLTK=$(usex hidpi)
+		-DUSE_INTERNAL_JSONCPP=0
+		-DUSE_INTERNAL_LIBS=0
+		-DUSE_INTERNAL_MINIUPNP=0
+		-DBUILD_CLIENT=$(usex client)
+		-DBUILD_LAUNCHER=$(usex odalaunch)
+		-DBUILD_MASTER=$(usex master)
+		-DBUILD_SERVER=$(usex server)
+		-DBUILD_OR_FAIL=1
+		-DENABLE_PORTMIDI=$(usex portmidi)
+		-DUSE_MINIUPNP=$(usex upnp)
+	)
+	use client && mycmakeargs+=(-DCMAKE_DISABLE_FIND_PACKAGE_X11=$(usex !X))
+
+	cmake_src_configure
+}
+
+src_install() {
+	if use client ; then
+		newicon -s 128 "${S}/media/icon_${PN}_128.png" "${PN}.png"
+		make_desktop_entry "${PN}" "Odamex"
+
+		if use odalaunch ; then
+			newicon -s 128 "${S}/media/icon_odalaunch_128.png" "odalaunch.png"
+			make_desktop_entry odalaunch "Odamex Launcher" odalaunch
+		fi
+	fi
+
+	cmake_src_install
+}
diff --git a/games-engines/odamex/odamex-10.3.0.ebuild b/games-engines/odamex/odamex-10.3.0.ebuild
deleted file mode 100644
index 2cb036706235..000000000000
--- a/games-engines/odamex/odamex-10.3.0.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-WX_GTK_VER="3.2-gtk3"
-inherit cmake desktop prefix wxwidgets xdg
-
-DESCRIPTION="Online multiplayer free software engine for DOOM"
-HOMEPAGE="https://odamex.net/"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${PN}-src-${PV}.tar.gz"
-
-LICENSE="GPL-2+ MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="+client hidpi master +odalaunch portmidi server upnp X"
-REQUIRED_USE="|| ( client master server )"
-
-# protobuf is still bundled. Unfortunately an old version is required for C++98
-# compatibility. We could use C++11, but upstream is concerned about using a
-# completely different protobuf version on a multiplayer-focused engine.
-
-RDEPEND="
-	client? (
-		media-libs/libpng:0=
-		media-libs/libsdl2[joystick,sound,video]
-		media-libs/sdl2-mixer
-		net-misc/curl
-		!hidpi? ( x11-libs/fltk:1 )
-		portmidi? ( media-libs/portmidi )
-		X? ( x11-libs/libX11 )
-	)
-	odalaunch? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )
-	server? (
-		dev-libs/jsoncpp:=
-		upnp? ( net-libs/miniupnpc:= )
-	)"
-DEPEND="${RDEPEND}"
-BDEPEND="games-util/deutex"
-
-S="${WORKDIR}/${PN}-src-${PV}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-10.3.0-unbundle-fltk.patch
-)
-
-src_prepare() {
-	rm -r libraries/miniupnp || die
-	hprefixify common/d_main.cpp
-
-	use odalaunch && setup-wxwidgets
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_INTERNAL_FLTK=$(usex hidpi)
-		-DUSE_INTERNAL_JSONCPP=0
-		-DUSE_INTERNAL_LIBS=0
-		-DUSE_INTERNAL_MINIUPNP=0
-		-DBUILD_CLIENT=$(usex client)
-		-DBUILD_LAUNCHER=$(usex odalaunch)
-		-DBUILD_MASTER=$(usex master)
-		-DBUILD_SERVER=$(usex server)
-		-DBUILD_OR_FAIL=1
-		-DENABLE_PORTMIDI=$(usex portmidi)
-		-DUSE_MINIUPNP=$(usex upnp)
-	)
-	use client && mycmakeargs+=(-DCMAKE_DISABLE_FIND_PACKAGE_X11=$(usex !X))
-
-	cmake_src_configure
-}
-
-src_install() {
-	if use client ; then
-		newicon -s 128 "${S}/media/icon_${PN}_128.png" "${PN}.png"
-		make_desktop_entry "${PN}" "Odamex"
-
-		if use odalaunch ; then
-			newicon -s 128 "${S}/media/icon_odalaunch_128.png" "odalaunch.png"
-			make_desktop_entry odalaunch "Odamex Launcher" odalaunch
-		fi
-	fi
-
-	cmake_src_install
-}
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 79592a360546..b0fea95f0292 100644
Binary files a/metadata/Manifest.gz and b/metadata/Manifest.gz differ
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index b4a868b2514d..872e4b6474af 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sun, 14 May 2023 20:40:01 +0000
+Mon, 15 May 2023 02:40:00 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 4220961b20c5..7b40be3cf9aa 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 543888 BLAKE2B da15fb010da91c403608af1847df77a89c9a8a24b2f5c1999256191c31d7755cd7667c19867e75c2bbdd07063f4ce4dd641cf53415eb08b83e35cbb3d2cd35e2 SHA512 ac5e51b2bf8075889870e4eedfe469274eaf28945ed1e974bc76ae0576dc1aa0db2a5fdacfc15e8cfb28486195fad65b487cf50896a207c5fcad4ffae850adbc
-TIMESTAMP 2023-05-14T20:40:06Z
+TIMESTAMP 2023-05-15T02:40:04Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRhRyZfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRhm4RfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAcJRAAlR3rQINvQdUxzIdayc1mAJaB1e66eBMrp7WA4nXO7wSp4+0HPmyEeLmi
-jBBRjj+fFiJlIEpRMKL/GkpybOhN2p3VEkuBnFjyTI36Q3I0kbFlG9vvXXlTOMcv
-4y5B/b6g2EwoxAAOYDALHq7HlZIBgt/Z95fqJ0WnvnqdGiIDI8Yah03wg+XTqxC6
-fA74oEVSQidZXB/qwZ2DZB2H0k6+DupMN5HI4Y2nYd9L+q7JL1cfWty3LpJUT2ln
-15Vte7TkqzNd7DjV87cirQW8kWOHMMEBoA+dqYpy1+AR79obUg6sivpjvE0KUXdB
-budn+Yl//JugbicX0H5mRh72PDKQH29DPzVDGhnit84F2YQrU9Nfi/xl5CyQ72hX
-NRkPSdPD/eylfHwGWUhcvKVRtqa3QcTySLMoa8D4DK+sDVIiNxIhktPSjZ6a9OSL
-3LaZFGo8QpQ7YzSaxNKMGKFb+cN3WxYvVW8XJlfPpBXOD9UYINg5ct8dBZdg4ND3
-vPp8yBhmrwTyvtzpo7c/FCiA1494CQ5aajHd1piepyynmI1gK9merXOpFfJ9M8Ao
-xzj8r8NmE2w2gDDexsM9IEDh7oORiklwOiMsyzBVEKfaH5Ju5ppDSe+Rdzx1bE4g
-5vXO34J5gJOFqA74mSvoH+nGPMmA6H4ZRqlzSTQmjC0BvlrMYkI=
-=St3D
+klBWpA/+JzjD5p/7lgmY3no7wpWj4q1g1QW1shQlZLL30IB3JddqeNffTSWFsZlo
+1brk3T2Yx4S+C4t306T5AncU4u3kaGBCpRnktjwy29XsGyeWd3bDdL7sf55kx35P
+MXpXaMrh1HExlXlcWo8POvALELALz43NuMKtghw6qAYclGu3V4rIoc+SNDUgyKrK
+Q408cOtEp8FqIrTnyw5R+mb9hMIfMv7uMDN1dGseHkSpjR+dr0InStpFrXL3Pfjj
+HrvwSjNd2EqQQzNUADnAX/YsPWBgBXxjs+keLn9eHxKj1QZfkj87FFupIeID9iij
+w0JidN5qNq3boSBpjgvckSw27TEJMvQjopj0y6+vCIb9h14Dn6sM0fxdWFx8lXME
+cJAI7PI5iWm1tfCRJjNhp9oX7meLHLMb72giwkedqpwy54OQ+3LB/0XHdvO7HC9r
+eJBBy8pzXfke63zxic35ySnwXDMMlrhpAxyiRJ+8sbe0MUeWqI/ua4NHJI7b0C3k
+of5x0c0KTW63HJFmqW5Wcr30kSdAcKXUIRM0pQezbu+wezuNHwtJkFkPbQh4PhLx
+W77HmxoF+7EisexkRJ5q8hHlHgf7dregeiQYKs2EgNWsVE0we9etMzWu3xKET5NX
+IsP+BwwAjVlThSysZP/+zlAsmbjnBKGWtXfh47x5NRNcG27oGII=
+=WPw2
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index b56c8aa59b3e..872e4b6474af 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sun, 14 May 2023 20:40:02 +0000
+Mon, 15 May 2023 02:40:00 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index bea515396350..7bcf7a7cce0f 100644
Binary files a/metadata/md5-cache/Manifest.gz and b/metadata/md5-cache/Manifest.gz differ
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index 3f4022a3f86e..76159257810a 100644
Binary files a/metadata/md5-cache/app-emulation/Manifest.gz and b/metadata/md5-cache/app-emulation/Manifest.gz differ
diff --git a/metadata/md5-cache/app-emulation/wine-staging-8.5 b/metadata/md5-cache/app-emulation/wine-staging-8.5
index 6b67e601bef4..5c20397afccd 100644
--- a/metadata/md5-cache/app-emulation/wine-staging-8.5
+++ b/metadata/md5-cache/app-emulation/wine-staging-8.5
@@ -15,4 +15,4 @@ RESTRICT=test
 SLOT=8.5
 SRC_URI=https://dl.winehq.org/wine/source/8.x/wine-8.5.tar.xz https://github.com/wine-staging/wine-staging/archive/v8.5.tar.gz -> wine-staging-8.5.tar.gz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multilib-build	e8aed98bd43dbd25694310a660ad562c	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=4b6d593c13a04f1ef379ebf318af5a28
+_md5_=2ac8646cdcf3bdc525e16f2389734768
diff --git a/metadata/md5-cache/app-emulation/wine-staging-8.6.1 b/metadata/md5-cache/app-emulation/wine-staging-8.6.1
index eaba468d7a49..a35a66344f95 100644
--- a/metadata/md5-cache/app-emulation/wine-staging-8.6.1
+++ b/metadata/md5-cache/app-emulation/wine-staging-8.6.1
@@ -15,4 +15,4 @@ RESTRICT=test
 SLOT=8.6.1
 SRC_URI=https://dl.winehq.org/wine/source/8.x/wine-8.6.tar.xz https://github.com/wine-staging/wine-staging/archive/v8.6.1.tar.gz -> wine-staging-8.6.1.tar.gz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multilib-build	e8aed98bd43dbd25694310a660ad562c	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=01d629b600a4377f4d5ee35c50138c92
+_md5_=b0d02ba789060a2ae8dd765c554a1242
diff --git a/metadata/md5-cache/app-emulation/wine-staging-8.7 b/metadata/md5-cache/app-emulation/wine-staging-8.7
index 9dc79a7c2686..3e227ace6ad7 100644
--- a/metadata/md5-cache/app-emulation/wine-staging-8.7
+++ b/metadata/md5-cache/app-emulation/wine-staging-8.7
@@ -15,4 +15,4 @@ RESTRICT=test
 SLOT=8.7
 SRC_URI=https://dl.winehq.org/wine/source/8.x/wine-8.7.tar.xz https://github.com/wine-staging/wine-staging/archive/v8.7.tar.gz -> wine-staging-8.7.tar.gz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multilib-build	e8aed98bd43dbd25694310a660ad562c	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=cc961edad9112c9a4acd508c6b71a759
+_md5_=0818ef8d7319130d9ec152379e934bed
diff --git a/metadata/md5-cache/app-emulation/wine-staging-8.8 b/metadata/md5-cache/app-emulation/wine-staging-8.8
new file mode 100644
index 000000000000..b6e3090062e9
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/wine-staging-8.8
@@ -0,0 +1,18 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 ) || ( dev-vcs/git ( sys-apps/gawk sys-apps/util-linux ) ) dev-lang/perl sys-devel/binutils sys-devel/bison sys-devel/flex virtual/pkgconfig mingw? ( !crossdev-mingw? ( >=dev-util/mingw64-toolchain-10.0.0_p1-r2[abi_x86_32(-)?,abi_x86_64(-)?] ) ) nls? ( sys-devel/gettext ) wayland? ( dev-util/wayland-scanner ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup unpack
+DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXrender[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?] opengl? ( media-libs/libglvnd[X,abi_x86_32(-)?,abi_x86_64(-)?] osmesa? ( media-libs/mesa[osmesa,abi_x86_32(-)?,abi_x86_64(-)?] ) ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?] ) ) cups? ( net-print/cups[abi_x86_32(-)?,abi_x86_64(-)?] ) fontconfig? ( media-libs/fontconfig[abi_x86_32(-)?,abi_x86_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?] ) netapi? ( net-fs/samba[abi_x86_32(-)?,abi_x86_64(-)?] ) sdl? ( media-libs/libsdl2[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?] ) truetype? ( media-libs/freetype[abi_x86_32(-)?,abi_x86_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?] ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?] ) capi? ( net-libs/libcapi:=[abi_x86_32(-)?,abi_x86_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?] ) gstreamer? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?] media-libs/gst-plugins-base:1.0[abi_x86_32(-)?,abi_x86_64(-)?] media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?] ) pulseaudio? ( media-libs/libpulse[abi_x86_32(-)?,abi_x86_64(-)?] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)?,abi_x86_64(-)?] ) smartcard? ( sys-apps/pcsc-lite[abi_x86_32(-)?,abi_x86_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?] ) unwind? ( llvm-libunwind? ( sys-libs/llvm-libunwind[abi_x86_32(-)?,abi_x86_64(-)?] ) !llvm-libunwind? ( sys-libs/libunwind:=[abi_x86_32(-)?,abi_x86_64(-)?] ) ) usb? ( dev-libs/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?] ) wayland? ( dev-libs/wayland[abi_x86_32(-)?,abi_x86_64(-)?] ) sys-kernel/linux-headers X? ( x11-base/xorg-proto )
+DESCRIPTION=Free implementation of Windows(tm) on Unix, with Wine-Staging patchset
+EAPI=8
+HOMEPAGE=https://wiki.winehq.org/Wine-Staging https://gitlab.winehq.org/wine/wine-staging/
+IDEPEND=>=app-eselect/eselect-wine-2
+INHERIT=autotools edo flag-o-matic multilib multilib-build python-any-r1 toolchain-funcs wrapper
+IUSE=+X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups dos llvm-libunwind debug custom-cflags +fontconfig +gecko gphoto2 +gstreamer kerberos +mingw +mono netapi nls opencl +opengl osmesa pcap perl pulseaudio samba scanner +sdl selinux smartcard +ssl +truetype udev udisks +unwind usb v4l +vulkan wayland +xcomposite xinerama abi_x86_32 abi_x86_64
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=LGPL-2.1+ BSD-2 IJG MIT OPENLDAP ZLIB gsm libpng2 libtiff
+RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXrender[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?] opengl? ( media-libs/libglvnd[X,abi_x86_32(-)?,abi_x86_64(-)?] osmesa? ( media-libs/mesa[osmesa,abi_x86_32(-)?,abi_x86_64(-)?] ) ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?] ) ) cups? ( net-print/cups[abi_x86_32(-)?,abi_x86_64(-)?] ) fontconfig? ( media-libs/fontconfig[abi_x86_32(-)?,abi_x86_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?] ) netapi? ( net-fs/samba[abi_x86_32(-)?,abi_x86_64(-)?] ) sdl? ( media-libs/libsdl2[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?] ) truetype? ( media-libs/freetype[abi_x86_32(-)?,abi_x86_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?] ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?] ) capi? ( net-libs/libcapi:=[abi_x86_32(-)?,abi_x86_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?] ) gstreamer? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?] media-libs/gst-plugins-base:1.0[abi_x86_32(-)?,abi_x86_64(-)?] media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?] ) pulseaudio? ( media-libs/libpulse[abi_x86_32(-)?,abi_x86_64(-)?] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)?,abi_x86_64(-)?] ) smartcard? ( sys-apps/pcsc-lite[abi_x86_32(-)?,abi_x86_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?] ) unwind? ( llvm-libunwind? ( sys-libs/llvm-libunwind[abi_x86_32(-)?,abi_x86_64(-)?] ) !llvm-libunwind? ( sys-libs/libunwind:=[abi_x86_32(-)?,abi_x86_64(-)?] ) ) usb? ( dev-libs/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?] ) wayland? ( dev-libs/wayland[abi_x86_32(-)?,abi_x86_64(-)?] ) app-emulation/wine-desktop-common dos? ( || ( games-emulation/dosbox games-emulation/dosbox-staging ) ) gecko? ( app-emulation/wine-gecko:2.47.4[abi_x86_32(-)?,abi_x86_64(-)?] ) gstreamer? ( media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?] ) mono? ( app-emulation/wine-mono:7.4.0 ) perl? ( dev-lang/perl dev-perl/XML-LibXML ) samba? ( net-fs/samba[winbind] ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 )
+REQUIRED_USE=X? ( truetype ) crossdev-mingw? ( mingw ) || ( abi_x86_32 abi_x86_64 )
+RESTRICT=test
+SLOT=8.8
+SRC_URI=https://dl.winehq.org/wine/source/8.x/wine-8.8.tar.xz https://github.com/wine-staging/wine-staging/archive/v8.8.tar.gz -> wine-staging-8.8.tar.gz
+_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multilib-build	e8aed98bd43dbd25694310a660ad562c	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=4b652c1e166c9c92cb3bada3a01def02
diff --git a/metadata/md5-cache/app-emulation/wine-staging-9999 b/metadata/md5-cache/app-emulation/wine-staging-9999
index 2659562150b3..8b371d5e6e38 100644
--- a/metadata/md5-cache/app-emulation/wine-staging-9999
+++ b/metadata/md5-cache/app-emulation/wine-staging-9999
@@ -14,4 +14,4 @@ REQUIRED_USE=X? ( truetype ) crossdev-mingw? ( mingw ) || ( abi_x86_32 abi_x86_6
 RESTRICT=test
 SLOT=9999
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	git-r3	27e13c09a4c7e4c78ac812f74727e676	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multilib-build	e8aed98bd43dbd25694310a660ad562c	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=4fb17bf942544db8f163614cb0587087
+_md5_=4b652c1e166c9c92cb3bada3a01def02
diff --git a/metadata/md5-cache/app-office/Manifest.gz b/metadata/md5-cache/app-office/Manifest.gz
index 9f413f690809..cd430d5d5ace 100644
Binary files a/metadata/md5-cache/app-office/Manifest.gz and b/metadata/md5-cache/app-office/Manifest.gz differ
diff --git a/metadata/md5-cache/app-office/libreoffice-bin-7.5.3.2 b/metadata/md5-cache/app-office/libreoffice-bin-7.5.3.2
new file mode 100644
index 000000000000..adf17c8b2757
--- /dev/null
+++ b/metadata/md5-cache/app-office/libreoffice-bin-7.5.3.2
@@ -0,0 +1,17 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
+DEPEND=dev-util/xdelta:3 java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=A full office productivity suite. Binary package
+EAPI=7
+HOMEPAGE=https://www.libreoffice.org
+INHERIT=java-pkg-opt-2 python-single-r1 prefix toolchain-funcs xdg-utils
+IUSE=gnome java kde java +python_single_target_python3_11
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=LGPL-3
+PDEPEND==app-office/libreoffice-l10n-7.5.3.2*
+RDEPEND=app-text/hunspell:0/1.7 =app-text/libexttextcat-3.4* =app-text/libmwaw-0.3* dev-cpp/abseil-cpp:0/20230125 dev-libs/boost:0/1.82.0 dev-libs/icu:0/73.1 dev-libs/liborcus:0/0.17 dev-libs/xmlsec:0/1.3 >=media-gfx/graphite2-1.3.10 media-libs/harfbuzz:0/6.0.0[icu] media-libs/libjpeg-turbo:0/0.2 media-libs/libpng:0/16 media-libs/openjpeg:2/7 media-libs/zxing-cpp:0/3 sci-mathematics/lpsolve:0/55 >=sys-devel/gcc-12.2.1 >=sys-libs/glibc-2.36 python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[xml(+)] ) 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/abseil-cpp:= >=dev-cpp/clucene-2.3.3.4-r2 >=dev-cpp/libcmis-0.5.2-r2 dev-db/unixODBC >=games-engines/box2d-2.4.1:0 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.17.2:0/0.17 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] 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/glu virtual/opengl x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender net-print/cups sys-apps/dbus gnome? ( dev-libs/glib:2 gnome-base/dconf gnome-extra/evolution-data-server ) media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 !kde? ( 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 ) dev-db/mariadb-connector-c acct-group/libreoffice acct-user/libreoffice !app-office/libreoffice !app-office/openoffice media-fonts/liberation-fonts || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) java? ( virtual/jre:11 ) kde? ( kde-frameworks/breeze-icons:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=kde? ( !gnome ) gnome? ( !kde ) ^^ ( python_single_target_python3_11 )
+RESTRICT=test strip
+SLOT=0
+SRC_URI=amd64? ( https://tamiko.43-1.org/distfiles/amd64-bin-libreoffice-7.5.3.2.tar.xz kde? ( !java? ( https://tamiko.43-1.org/distfiles/amd64-bin-libreoffice-kde-7.5.3.2.xd3 ) java? ( https://tamiko.43-1.org/distfiles/amd64-bin-libreoffice-kde-java-7.5.3.2.xd3 ) ) gnome? ( !java? ( https://tamiko.43-1.org/distfiles/amd64-bin-libreoffice-gnome-7.5.3.2.xd3 ) java? ( https://tamiko.43-1.org/distfiles/amd64-bin-libreoffice-gnome-java-7.5.3.2.xd3 ) ) !kde? ( !gnome? ( java? ( https://tamiko.43-1.org/distfiles/amd64-bin-libreoffice-java-7.5.3.2.xd3 ) ) ) ) x86? ( https://tamiko.43-1.org/distfiles/x86-bin-libreoffice-7.5.3.2.tar.xz kde? ( https://tamiko.43-1.org/distfiles/x86-bin-libreoffice-kde-7.5.3.2.xd3 ) gnome? ( https://tamiko.43-1.org/distfiles/x86-bin-libreoffice-gnome-7.5.3.2.xd3 ) )
+_eclasses_=eapi8-dosym	741bfa77afb2a9321261501aca58c208	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=5131874e074a1e38da614d9cac101d4d
diff --git a/metadata/md5-cache/app-office/libreoffice-bin-debug-7.5.3.2 b/metadata/md5-cache/app-office/libreoffice-bin-debug-7.5.3.2
new file mode 100644
index 000000000000..289359fc6b4b
--- /dev/null
+++ b/metadata/md5-cache/app-office/libreoffice-bin-debug-7.5.3.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install unpack
+DEPEND=dev-util/xdelta:3
+DESCRIPTION=LibreOffice, a full office productivity suite. Binary package, debug info
+EAPI=7
+HOMEPAGE=https://www.libreoffice.org
+IUSE=gnome java kde
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=LGPL-3
+RDEPEND==app-office/libreoffice-bin-7.5.3.2[gnome=,java=,kde=]
+RESTRICT=test strip
+SLOT=0
+SRC_URI=amd64? ( https://tamiko.43-1.org/distfiles/amd64-debug-libreoffice-7.5.3.2.tar.xz kde? ( !java? ( https://tamiko.43-1.org/distfiles/amd64-debug-libreoffice-kde-7.5.3.2.xd3 ) java? ( https://tamiko.43-1.org/distfiles/amd64-debug-libreoffice-kde-java-7.5.3.2.xd3 ) ) gnome? ( !java? ( https://tamiko.43-1.org/distfiles/amd64-debug-libreoffice-gnome-7.5.3.2.xd3 ) java? ( https://tamiko.43-1.org/distfiles/amd64-debug-libreoffice-gnome-java-7.5.3.2.xd3 ) ) !kde? ( !gnome? ( java? ( https://tamiko.43-1.org/distfiles/amd64-debug-libreoffice-java-7.5.3.2.xd3 ) ) ) ) x86? ( https://tamiko.43-1.org/distfiles/x86-debug-libreoffice-7.5.3.2.tar.xz kde? ( https://tamiko.43-1.org/distfiles/x86-debug-libreoffice-kde-7.5.3.2.xd3 ) gnome? ( https://tamiko.43-1.org/distfiles/x86-debug-libreoffice-gnome-7.5.3.2.xd3 ) )
+_md5_=ed551fe5a035ac5b46924679493eff47
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 35e7e59fff79..24657714088e 100644
Binary files a/metadata/md5-cache/dev-util/Manifest.gz and b/metadata/md5-cache/dev-util/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-12.1.1 b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-12.1.1
new file mode 100644
index 000000000000..0f5f0dde0c45
--- /dev/null
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-12.1.1
@@ -0,0 +1,15 @@
+BDEPEND=nsight? ( dev-util/patchelf )
+DEFINED_PHASES=install postinst prepare pretend setup unpack
+DESCRIPTION=NVIDIA CUDA Toolkit (compiler and friends)
+EAPI=8
+HOMEPAGE=https://developer.nvidia.com/cuda-zone
+INHERIT=check-reqs toolchain-funcs unpacker
+IUSE=debugger nsight profiler rdma vis-profiler sanitizer
+KEYWORDS=-* ~amd64 ~amd64-linux
+LICENSE=NVIDIA-CUDA
+RDEPEND=<sys-devel/gcc-13_pre[cxx] >=x11-drivers/nvidia-drivers-525.60.13 nsight? ( dev-libs/libpfm dev-libs/wayland || ( dev-libs/openssl-compat:1.1.1 =dev-libs/openssl-1.1.1* ) media-libs/tiff-compat:4 sys-libs/zlib ) rdma? ( sys-cluster/rdma-core ) vis-profiler? ( >=virtual/jre-1.8:* )
+RESTRICT=bindist mirror
+SLOT=0/12.1.1
+SRC_URI=https://developer.download.nvidia.com/compute/cuda/12.1.1/local_installers/cuda_12.1.1_530.30.02_linux.run
+_eclasses_=check-reqs	a5f1e025c53d62f98bc24bd63d7d95e1	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	unpacker	aa6a4e924009232d8b78b31e932c30b5
+_md5_=db25a2837e43e7cce7b697ae9e336b54
diff --git a/metadata/md5-cache/games-engines/Manifest.gz b/metadata/md5-cache/games-engines/Manifest.gz
index 95610e38e957..2984e8424273 100644
Binary files a/metadata/md5-cache/games-engines/Manifest.gz and b/metadata/md5-cache/games-engines/Manifest.gz differ
diff --git a/metadata/md5-cache/games-engines/odamex-10.3.0 b/metadata/md5-cache/games-engines/odamex-10.3.0
deleted file mode 100644
index 7394d38d53f2..000000000000
--- a/metadata/md5-cache/games-engines/odamex-10.3.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=games-util/deutex >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=client? ( media-libs/libpng:0= media-libs/libsdl2[joystick,sound,video] media-libs/sdl2-mixer net-misc/curl !hidpi? ( x11-libs/fltk:1 ) portmidi? ( media-libs/portmidi ) X? ( x11-libs/libX11 ) ) odalaunch? ( x11-libs/wxGTK:3.2-gtk3[X] ) server? ( dev-libs/jsoncpp:= upnp? ( net-libs/miniupnpc:= ) )
-DESCRIPTION=Online multiplayer free software engine for DOOM
-EAPI=8
-HOMEPAGE=https://odamex.net/
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=cmake desktop prefix wxwidgets xdg
-IUSE=+client hidpi master +odalaunch portmidi server upnp X
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2+ MIT
-RDEPEND=client? ( media-libs/libpng:0= media-libs/libsdl2[joystick,sound,video] media-libs/sdl2-mixer net-misc/curl !hidpi? ( x11-libs/fltk:1 ) portmidi? ( media-libs/portmidi ) X? ( x11-libs/libX11 ) ) odalaunch? ( x11-libs/wxGTK:3.2-gtk3[X] ) server? ( dev-libs/jsoncpp:= upnp? ( net-libs/miniupnpc:= ) )
-REQUIRED_USE=|| ( client master server )
-SLOT=0
-SRC_URI=https://github.com/odamex/odamex/releases/download/10.3.0/odamex-src-10.3.0.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wxwidgets	9a707a3f9f1ea7aa703b1e46552291e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=f00c8e38cc3665d38fce5dc1f1a56052
diff --git a/metadata/md5-cache/games-engines/odamex-10.3.0-r1 b/metadata/md5-cache/games-engines/odamex-10.3.0-r1
new file mode 100644
index 000000000000..f3ea6085a1f0
--- /dev/null
+++ b/metadata/md5-cache/games-engines/odamex-10.3.0-r1
@@ -0,0 +1,17 @@
+BDEPEND=games-util/deutex >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=client? ( media-libs/libpng:0= media-libs/libsdl2[joystick,sound,video] media-libs/sdl2-mixer net-misc/curl !hidpi? ( x11-libs/fltk:1 ) portmidi? ( media-libs/portmidi ) X? ( x11-libs/libX11 ) ) odalaunch? ( x11-libs/wxGTK:3.0-gtk3[X] ) server? ( dev-libs/jsoncpp:= upnp? ( net-libs/miniupnpc:= ) )
+DESCRIPTION=Online multiplayer free software engine for DOOM
+EAPI=8
+HOMEPAGE=https://odamex.net/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=cmake desktop prefix wxwidgets xdg
+IUSE=+client hidpi master +odalaunch portmidi server upnp X
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2+ MIT
+RDEPEND=client? ( media-libs/libpng:0= media-libs/libsdl2[joystick,sound,video] media-libs/sdl2-mixer net-misc/curl !hidpi? ( x11-libs/fltk:1 ) portmidi? ( media-libs/portmidi ) X? ( x11-libs/libX11 ) ) odalaunch? ( x11-libs/wxGTK:3.0-gtk3[X] ) server? ( dev-libs/jsoncpp:= upnp? ( net-libs/miniupnpc:= ) )
+REQUIRED_USE=|| ( client master server )
+SLOT=0
+SRC_URI=https://github.com/odamex/odamex/releases/download/10.3.0/odamex-src-10.3.0.tar.gz
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wxwidgets	9a707a3f9f1ea7aa703b1e46552291e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=c9e85f2ae25a7e52297820c82c1baea5
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 57f03678bb90..7882964bf5a5 100644
Binary files a/metadata/md5-cache/sys-apps/Manifest.gz and b/metadata/md5-cache/sys-apps/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-apps/grep-3.10 b/metadata/md5-cache/sys-apps/grep-3.10
deleted file mode 100644
index 91e01c88ebdd..000000000000
--- a/metadata/md5-cache/sys-apps/grep-3.10
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig nls? ( sys-devel/gettext ) verify-sig? ( sec-keys/openpgp-keys-grep ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=configure install prepare unpack
-DEPEND=!static? ( pcre? ( >=dev-libs/libpcre2-7.8-r1 ) sparc? ( dev-libs/libsigsegv ) ) nls? ( virtual/libintl ) virtual/libiconv static? ( pcre? ( >=dev-libs/libpcre2-7.8-r1[static-libs(+)] ) sparc? ( dev-libs/libsigsegv ) )
-DESCRIPTION=GNU regular expression matcher
-EAPI=8
-HOMEPAGE=https://www.gnu.org/software/grep/
-INHERIT=flag-o-matic verify-sig
-IUSE=+egrep-fgrep nls pcre static verify-sig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-3+
-RDEPEND=!static? ( pcre? ( >=dev-libs/libpcre2-7.8-r1 ) sparc? ( dev-libs/libsigsegv ) ) nls? ( virtual/libintl ) virtual/libiconv
-REQUIRED_USE=static? ( !sparc )
-SLOT=0
-SRC_URI=mirror://gnu/grep/grep-3.10.tar.xz verify-sig? ( mirror://gnu/grep/grep-3.10.tar.xz.sig )
-_eclasses_=flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	104e1332efb829e2f7cbf89307a474f1	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
-_md5_=a1d7d1606f3b8eaa36d9b8c375e74a4b
diff --git a/metadata/md5-cache/sys-apps/grep-3.10_p20230430 b/metadata/md5-cache/sys-apps/grep-3.10_p20230430
deleted file mode 100644
index bc7efdd8e9e1..000000000000
--- a/metadata/md5-cache/sys-apps/grep-3.10_p20230430
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig nls? ( sys-devel/gettext ) verify-sig? ( sec-keys/openpgp-keys-grep ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=configure install prepare unpack
-DEPEND=!static? ( pcre? ( >=dev-libs/libpcre2-10.42-r1 ) sparc? ( dev-libs/libsigsegv ) ) nls? ( virtual/libintl ) virtual/libiconv static? ( pcre? ( >=dev-libs/libpcre2-10.42-r1[static-libs(+)] ) sparc? ( dev-libs/libsigsegv ) )
-DESCRIPTION=GNU regular expression matcher
-EAPI=8
-HOMEPAGE=https://www.gnu.org/software/grep/
-INHERIT=flag-o-matic verify-sig
-IUSE=+egrep-fgrep nls pcre static verify-sig
-LICENSE=GPL-3+
-RDEPEND=!static? ( pcre? ( >=dev-libs/libpcre2-10.42-r1 ) sparc? ( dev-libs/libsigsegv ) ) nls? ( virtual/libintl ) virtual/libiconv
-REQUIRED_USE=static? ( !sparc )
-SLOT=0
-SRC_URI=https://meyering.net/grep/grep-3.10.19-2ea9.tar.xz verify-sig? ( https://meyering.net/grep/grep-3.10.19-2ea9.tar.xz.sig )
-_eclasses_=flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	104e1332efb829e2f7cbf89307a474f1	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
-_md5_=6748f1ce35bd8e8771d38ddd6aa0950a
diff --git a/metadata/md5-cache/sys-apps/grep-3.11 b/metadata/md5-cache/sys-apps/grep-3.11
new file mode 100644
index 000000000000..3ddf905af98c
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/grep-3.11
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig nls? ( sys-devel/gettext ) verify-sig? ( sec-keys/openpgp-keys-grep ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=configure install prepare unpack
+DEPEND=!static? ( pcre? ( >=dev-libs/libpcre2-10.42-r1 ) sparc? ( dev-libs/libsigsegv ) ) nls? ( virtual/libintl ) virtual/libiconv static? ( pcre? ( >=dev-libs/libpcre2-10.42-r1[static-libs(+)] ) sparc? ( dev-libs/libsigsegv ) )
+DESCRIPTION=GNU regular expression matcher
+EAPI=8
+HOMEPAGE=https://www.gnu.org/software/grep/
+INHERIT=flag-o-matic verify-sig
+IUSE=+egrep-fgrep nls pcre static verify-sig
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-3+
+RDEPEND=!static? ( pcre? ( >=dev-libs/libpcre2-10.42-r1 ) sparc? ( dev-libs/libsigsegv ) ) nls? ( virtual/libintl ) virtual/libiconv
+REQUIRED_USE=static? ( !sparc )
+SLOT=0
+SRC_URI=mirror://gnu/grep/grep-3.11.tar.xz verify-sig? ( mirror://gnu/grep/grep-3.11.tar.xz.sig )
+_eclasses_=flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	104e1332efb829e2f7cbf89307a474f1	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
+_md5_=6748f1ce35bd8e8771d38ddd6aa0950a
diff --git a/metadata/md5-cache/sys-apps/grep-3.9 b/metadata/md5-cache/sys-apps/grep-3.9
deleted file mode 100644
index 5cd47defe668..000000000000
--- a/metadata/md5-cache/sys-apps/grep-3.9
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig nls? ( sys-devel/gettext ) verify-sig? ( sec-keys/openpgp-keys-grep ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=configure install prepare unpack
-DEPEND=!static? ( pcre? ( >=dev-libs/libpcre2-7.8-r1 ) sparc? ( dev-libs/libsigsegv ) ) nls? ( virtual/libintl ) virtual/libiconv static? ( pcre? ( >=dev-libs/libpcre2-7.8-r1[static-libs(+)] ) sparc? ( dev-libs/libsigsegv ) )
-DESCRIPTION=GNU regular expression matcher
-EAPI=8
-HOMEPAGE=https://www.gnu.org/software/grep/
-INHERIT=flag-o-matic verify-sig
-IUSE=+egrep-fgrep nls pcre static verify-sig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-3+
-RDEPEND=!static? ( pcre? ( >=dev-libs/libpcre2-7.8-r1 ) sparc? ( dev-libs/libsigsegv ) ) nls? ( virtual/libintl ) virtual/libiconv
-REQUIRED_USE=static? ( !sparc )
-SLOT=0
-SRC_URI=mirror://gnu/grep/grep-3.9.tar.xz verify-sig? ( mirror://gnu/grep/grep-3.9.tar.xz.sig )
-_eclasses_=flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	104e1332efb829e2f7cbf89307a474f1	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
-_md5_=bf4ea49176638c038d1a0ca1f2d21393
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index 4d99aacb4b04..f81833f08e40 100644
Binary files a/metadata/md5-cache/sys-devel/Manifest.gz and b/metadata/md5-cache/sys-devel/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-devel/gcc-14.0.0_pre20230514 b/metadata/md5-cache/sys-devel/gcc-14.0.0_pre20230514
new file mode 100644
index 000000000000..312b0acb6c72
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/gcc-14.0.0_pre20230514
@@ -0,0 +1,16 @@
+BDEPEND=>=sys-devel/binutils-2.30[cet(-)?] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) sys-apps/texinfo valgrind? ( dev-util/valgrind ) d? ( || ( sys-devel/gcc[d(-)] <sys-devel/gcc-12[d(-)] ) )
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
+DEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) sanitize? ( virtual/libcrypt ) systemtap? ( dev-util/systemtap ) zstd? ( app-arch/zstd:= )
+DESCRIPTION=The GNU Compiler Collection
+EAPI=8
+HOMEPAGE=https://gcc.gnu.org/
+INHERIT=toolchain
+IUSE=test vanilla +nls debug +cxx +nptl +fortran doc hardened multilib objc pgo objc-gc libssp objc++ openmp fixed-point go +sanitize graphite ada vtv jit +pie +ssp +pch systemtap d lto cet zstd valgrind custom-cflags ieee-long-double default-znow default-stack-clash-protection modula2 rust
+LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
+PDEPEND=>=sys-devel/gcc-config-2.3
+RDEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) zstd? ( app-arch/zstd:= )
+RESTRICT=!test? ( test )
+SLOT=14
+SRC_URI=mirror://gcc/snapshots/14-20230514/gcc-14-20230514.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-14.0.0-patches-1.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-14.0.0-musl-patches-1.tar.xz
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	104e1332efb829e2f7cbf89307a474f1	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	94cf9c843f9972a8cfb7c0f813b61d93	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=5583237859852463d8edef446a87a333
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index 274f6023c153..978cd05586f8 100644
Binary files a/metadata/md5-cache/sys-kernel/Manifest.gz and b/metadata/md5-cache/sys-kernel/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-kernel/git-sources-6.4_rc2 b/metadata/md5-cache/sys-kernel/git-sources-6.4_rc2
new file mode 100644
index 000000000000..defe64e5f227
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/git-sources-6.4_rc2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=>=sys-devel/patch-2.7.6-r4
+DESCRIPTION=The very latest -git version of the Linux kernel
+EAPI=8
+HOMEPAGE=https://www.kernel.org
+INHERIT=kernel-2
+IUSE=symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=6.4_rc2
+SRC_URI=https://git.kernel.org/torvalds/p/v6.4-rc2/v6.2 -> patch-6.4-rc2.patch https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.2.tar.xz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	5ec69098eb726d07eec2cf05ce4fbdfe	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=c152b1e7ab9fc06fdb114e19543dd1eb
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index fcab1492ed77..e348cf4c4f72 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 15668 BLAKE2B 449292f439e2a4f4fd7b4726028a046b309262c1c104b330b62b26428794c6a1ff66902103e9c2359f352f474b113cc9c85ddbbb187a374b6211d02e6ca79ff3 SHA512 e7b892ad549ad1d2a69c8cd56f9a18807e1e7a0c3b686e86ad5dca719913cab1270dea7dd5e376d522493285e5a8117f923772e2df0f2019b0c49a02107d6b03
-TIMESTAMP 2023-05-14T20:40:06Z
+TIMESTAMP 2023-05-15T02:40:04Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRhRyZfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRhm4RfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDbQBAAo3AkSZCokFpTLDUhuLwNMXi784f71u8aK4OdFejai78JeePJVp69r3RE
-brkfaW+ZemMmqnal691Zp9qHcsHjYbx2maooztc8/l5vES+OISPs0wflQvTyJq5A
-5xelSgtwfQTAso9+488F0hkAWOFtfHe9OrTJp12H7RhIIk7L78oFBBx8soCmGcdd
-iIb1iWwIfzvttVOzgxTigZZ/4Z1fknblliY99BcbL1+zpvj02SRxydqPMVxr0pKc
-FjOIcrnMnW1nc4x5hJf+QLRw2MvWAgt7tSEULJx/Xi7kZZPY0i9uhpghvbTEQbjV
-K9vlnxFfL3GUHBMWmEWky7hBKHpV3e9cIgSgH4hofWnYuJ5SO63rVLcxYDpa/q3V
-9c07zImUiTXAokpx/NXr18eyJsktLhnFnil2yhbEo0qyp7guG6RbnDlpAPytg8PM
-DcNw/NsqHC550YSGwwOoZzj6GnfGaxwnEekqq4tLMKLvE/jo7jgQphE5/RrNQ0PW
-5U1juW0ebNq+xVUo7jkYTICNdWrEEDcbXsMZ/PP6H3i6jBNQLdEVQhLaHdKjU+dJ
-qXoHcRSVcDTs6ZjBz6KuYBbtK5hsb5bQQlxhBAlSRHXJqQB8yuSKYFW+UIb7IJLJ
-GqOWZfgpifSWX5jMuvCj/lSWdrGcpuyMT9MPFaOK3WNeJyFvIGk=
-=lCip
+klDeCg//WhtTBGws9b94al3717op3Fd3qwd6JJe+BEaNDl7nFOXKSgkzDXBxrl35
+dC/3vuHzWrQ7lkYZ/gg5obsV13OyUTP3WndaBq81dn7yopEpoy3d+1XxSA5DbXOg
+aJs2t1V/EaPu84ycs1OXV0K+gYPQ34IkhkX7C7eBCLmCnNUaHnbxEfB0mklHM0Z+
+e36q1jTY3cBWJBypW3WVpoSHNS9z2Glih2SIHENRxiycnrMmplfcMmh0VmZARZfi
+UJCEImXJihDax6gw/VX4vWFoQqMG93u6NxVhRKU9rONFw+1wZe2GKitDHExtlWHw
+W30dfd5HlPU9Y2Ha3IXJtil0IKzXvnF1HpK1RXQP5PHWxQ+H1oyDwG35AyQMoWab
+IxqTl2Sd0e3r42hH6YboUhTcweYBsEk5JuMhcPf0QmGnR7phfsd0L8TPLiPvI9zL
+TsNGv1UDLmHldrOdllzLGssJuKU/Z+wp2JCaGH8xUaCfsyaDXAn6SAT0OkxxzTjb
+iFZLcc19CPbIRipTPxYkFyvGKJgfbs//xRVDBFXl4frtX5pvLFHHO+Y7CsMBeB/7
+wON9QVuYh0BpFRmelqOc6g148ERZUJruaULRdyDuDgJp7Q2QPy1BheBcPeTlUO15
+erPqXkNEjrWnOyzmrV4f4XTpR8Kq35+HYHy//WEyww7BzP1jOVQ=
+=XGjz
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index b56c8aa59b3e..872e4b6474af 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sun, 14 May 2023 20:40:02 +0000
+Mon, 15 May 2023 02:40:00 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index eb956e5bd910..b35ddc69fe29 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sun May 14 08:40:01 PM UTC 2023
+Mon May 15 02:40:00 AM UTC 2023
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 3878bb88874c..55ae22bdf8d6 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sun, 14 May 2023 20:45:01 +0000
+Mon, 15 May 2023 02:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 2c73add592fa..709897a86db8 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-02fe020d38a6570586e22204499eef6875a0a2e9 1684095203 2023-05-14T20:13:23+00:00
+2c4349600c4d07d6ad0f0f5118a58e997f23fa60 1684111457 2023-05-15T00:44:17+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 3b9ba8ffc323..4df70a2889b6 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1684096801 Sun 14 May 2023 08:40:01 PM UTC
+1684118401 Mon 15 May 2023 02:40:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index b4a868b2514d..872e4b6474af 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Sun, 14 May 2023 20:40:01 +0000
+Mon, 15 May 2023 02:40:00 +0000
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 4be9e169d303..b93dd28bfdf5 100644
Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ
diff --git a/sys-apps/grep/Manifest b/sys-apps/grep/Manifest
index e4da1fcba15b..a72cf1ed5a71 100644
--- a/sys-apps/grep/Manifest
+++ b/sys-apps/grep/Manifest
@@ -1,18 +1,12 @@
 AUX loong-fix-build.patch 859 BLAKE2B 1c37ecbf8f7c0148e1634691b36c5e526e1111c851bb34059cbc03b902e45f066b976899e8c155db0d8358f9f45ef39d8bd6a87616c885d9ceafaaa24905d39c SHA512 f97ea8dcd28957c58d4b08f91b3274ebcba9bef9fb93ea91576925d8cbb516781524c172f35dcfb2be4be17cb446ec6b8366d04d485eb5ec012b126be02b9c82
 AUX ppc-musl.patch 824 BLAKE2B b3476471c27a748a67f237d7f34ede06446417a310737d46686ff8103cb3f5c1c4a1cdd5e9c4adccf4511f667db473086b0ea7fa5242f36e3109f929d70728e7 SHA512 079e50b0f7d99bd7c45a33acd56a2fb000e50f7b4bc73fa18d246315b732550ceb75251ba12daf5fd2948be9252cd40804df3c2c797b47bf8b0cf173a1db4c7e
-DIST grep-3.10.19-2ea9.tar.xz 1702712 BLAKE2B 93b6d07703039d6ace2a989498eb760d58bb57e01658d371ac4d010af7c6831f3e2908d38c8deaa300ff0d30b69449e975f08863a327acd71f18c5a0cf01b16b SHA512 4048b151a8c9004fc5d4a21f5b40cb5703945ba5635fcf262f847ba95dfa5022c1dae51b8efcb7ab288910623761d3daaa6f2c9352f2db667f288c86e8ee8791
-DIST grep-3.10.19-2ea9.tar.xz.sig 833 BLAKE2B 867c954910e160e271e048aa0476ab552640a8c52b3e018d0482734f79cb3ae20dc5259077fe09e0bb93284c88b8fbfdea19756d966c5df230bfe5df9f6a77f8 SHA512 e37ce1fcd36aafcf9e89c7603ce23b7cde207fc6ab5291140048091dea47c47505a282b4b2c666472ddfcc1fc0212112311f2ab88cff592ed4db31e51db67d83
-DIST grep-3.10.tar.xz 1687464 BLAKE2B 5ff169a4ed39e8af1e6729fd2e1bafd39036a4f56cf831f990d58bf9e76bc7d8b055254ae7f60509be4e8bf2f3737edb15431a8ecfc7fc058578d2abea3d73b9 SHA512 865e8f3fd7afc68f1a52f5e1e1ee05fb9c6d6182201efb0dbdf6075347b0b1d2bf0784537a8f8dd4fb050d523f7a1d2fb5b9c3e3245087d0e6cc12d6e9d3961b
-DIST grep-3.10.tar.xz.sig 833 BLAKE2B 0b13c8c8955b4e38889cf79b426618e006b05bc3b224e0705b2cb592b1520a7fc751d5cc386371707a53c8b6888c4e1f9dd31c3ea2ef5cbf4c97ddef3ba7d037 SHA512 02224ff2d6b3a9a50d0e15f7a9b3c264aa717602d133ac32b36a7315bf29ec3b94ef7ec31ee979b199264d10003dc502e20f9bf932bb32b4abe4426ea564d4be
+DIST grep-3.11.tar.xz 1703776 BLAKE2B e21785bca20b5a090d32bb5dc525fb298af30165106ed4c289b1518ea3d2acdcacfd6309b12f13be29a4b958f19588546119c695deb2b7500d49dcff86357bdc SHA512 f254a1905a08c8173e12fbdd4fd8baed9a200217fba9d7641f0d78e4e002c1f2a621152d67027d9b25f0bb2430898f5233dc70909d8464fd13d7dd9298e65c42
+DIST grep-3.11.tar.xz.sig 833 BLAKE2B 5edfba20e3a9f54d25ae63cf04985382bf6afb0ca643979561321090614e68b5d234767b07e48211888722c52c441233093735e183ff69432d5ee2e6a4f53aea SHA512 487aba063373ca0594c519991f19b2a6a33b3da0d74735c890f3828fd0880e7e6f64495d2c8f9efa5da53d1eb2d446609bab2399a4b89dcb4510a632e31ffb54
 DIST grep-3.7.tar.xz 1641196 BLAKE2B acf03b1fe8065dac48d686de070bab9ecddae65c97f3b0e2be484e8abdd06d1fbdbb396f3d73dadadf9618aad2f02cf6416094bad64d5f2f15eab6b6b3adfeda SHA512 e9e45dcd40af8367f819f2b93c5e1b4e98a251a9aa251841fa67a875380fae52cfa27c68c6dbdd6a4dde1b1017ee0f6b9833ef6dd6e419d32d71b6df5e972b82
 DIST grep-3.7.tar.xz.sig 833 BLAKE2B 02a2850e22e8054dcfd02b6f08747a97d43dae9adb908516bdaed35750aa7f773832ad1b0b4c53d7b0ebc8f1fe2979e7938bbbeeb09ea00c11b4a0d5846c7b9c SHA512 9db28883b696fbbb0fad32f4ecd168954dc475d5f0a8f2b4f960ff615ef7dd8348a7caaee85a96287824472a29485ff921af121c582083ca5ad5c30960f99cf4
 DIST grep-3.8.tar.xz 1709536 BLAKE2B 24cf6f7aa35c85f59f508969ee9731c5be1e5c613e64e636f464bbdde917bb99ba739e4b82abf08da127ad0400d62e27d139f85142035745121d381982ec6c36 SHA512 2014519a80c6dcd799837e1bd7d9d5ebe8729ec54b0dc76981dac4755a9a8a9f200470cdcc911e2825bed8162e61da39e3dd60289f7393b48bf67314077d0c79
 DIST grep-3.8.tar.xz.sig 833 BLAKE2B 40f472389705375611015ba0eb85eb32643304b1a324877a75821d086a128a20d00df3d7cd960ec45709f40f21488bbcf993c6fe667ef23663688b33296e650b SHA512 8266b58485f225c2189814e3898c72e59d251b729e0c302d31f57abdb7ac2e6e28dde2c5c8095673b6f007b2a3ebc26db1dca910a7771aba80dad4b3c6761ee4
-DIST grep-3.9.tar.xz 1680380 BLAKE2B 33fefce2a831ad6f00f2eb1d8a063cf280635f2d9c481c98981f7a2ff143c846ab570a448c9c02c3ba08cf2c98612cb364d2d033baf92d62c4515315453cc6f9 SHA512 38aaa28bded9f6d1d527356e9e63bb1dafb4ec8f09e83f2d3bc86c1d6af1a5a8cb9895067375b5b8929ec2cba6ab71c369ed4c6e2a0f7a01dec3c11a6f4c1836
-DIST grep-3.9.tar.xz.sig 833 BLAKE2B bbb8a07986368755276c6648378afdbec44da2873574ebb0dce634b0e90da2cb6fd0eaf64969843e2fe65ae5e83aba6b1fea9fde9b246fbedf982393cf54b715 SHA512 d50e11d0d333c09a6afcae511c93cfb54d9dd0a6600f271abf5e103cbf8bdcf9b8606924d7c71770e20c35df5d5468dc339cea1f05d257776734e17f8378d891
-EBUILD grep-3.10.ebuild 3037 BLAKE2B d0942ea0641425a97b7380b4c688e20e2b0604552906dab23f24b7326274991341d52f7a7044f1df96e3cf6f43f1315bb75d8b9a8413fdb8a63a17b5b680c612 SHA512 d663b6bba3ea52ceff3c3be07a47a2f0589b48c27b216c6b66bf22f55a134a464a25c016692de698fd2d495905175037f93fcc3e689d2c8c5ef0fd0ac0b873a8
-EBUILD grep-3.10_p20230430.ebuild 3040 BLAKE2B 668151586a4415cacf1a49ba8ed177f42246a5d0304ea6a300a81eda32f6d26fbeb95fc309a0665fd4b05382564d473059029451be98ade680fe5543b41e70e5 SHA512 08b968ebc208125fc7b1d95cdbfab0f90d62943e38b9b71eb8dc70a86252b9a2b26295439f334cb3aac454a8c71e0edd8f648e9772d17e1135fb52fdc7111781
+EBUILD grep-3.11.ebuild 3040 BLAKE2B 668151586a4415cacf1a49ba8ed177f42246a5d0304ea6a300a81eda32f6d26fbeb95fc309a0665fd4b05382564d473059029451be98ade680fe5543b41e70e5 SHA512 08b968ebc208125fc7b1d95cdbfab0f90d62943e38b9b71eb8dc70a86252b9a2b26295439f334cb3aac454a8c71e0edd8f648e9772d17e1135fb52fdc7111781
 EBUILD grep-3.7.ebuild 2287 BLAKE2B f8d7f163f327da9d4b933db81d759660b23b5c774acb690e2552ff28214a9d0b1c7aea0bf7bc571d0d5de807aa7f56721a311e8c2a71a906f39f30798fa97b9a SHA512 91a4e5d3aed32ed19bf8ad5996349073ff743bc31e73c2ee8b2e3714bac150da26202a840a4acad823d977071ac5d65e101e61327a2776725ce1db021a9f49a5
 EBUILD grep-3.8-r1.ebuild 2875 BLAKE2B 07987a3cf83f86c6b3e58db2cdd3172aaab160dd6d49c614b477c2dee85c7095efcdea376e4d1252cc22205191c54a00a4f84f22aab63d3bd5dbbf47884dace7 SHA512 ca969d02cd68d6cd7165c3cf8e6c79e9f61d4bed857871349160603fdfe6267ca198fe96da134160f51d153122626184b0d23b59729bddba2fdab7c6a75b1745
-EBUILD grep-3.9.ebuild 3038 BLAKE2B 28e3a9d0245f300357aa6dccf44f18eff1bc6faac6046841a242245de37ecb0041a5f0573f33f9475dba6cb8c59f050cc64f8c8cf6edc05e4608d0d938da5b82 SHA512 6c6ba3eff140c5c1e8d3e755198d4ce6c68350052e8fdcf7b83b2e9d5c5e4f6c877377b455bf739e8ecc05d1b3c5af0432f5d2342f561a90685e56ccaf794000
 MISC metadata.xml 666 BLAKE2B 0c90e38d5363234474093ece5c9e0cbb99c01731a80c52869d700b7367fd74eec23f355653174b315f91ca7b41b4c5c9f5645ffaba043b3918c3c22c2c817ea4 SHA512 8e46c5c28b55063a7c74dfc637eb59785dc35651027e144acf4aea7f0ad7a4e43a3692946252acdf0d4a66ff8bdcfa89664fdf8bae71f1db688c06014c2a6a0f
diff --git a/sys-apps/grep/grep-3.10.ebuild b/sys-apps/grep/grep-3.10.ebuild
deleted file mode 100644
index 9b91be42e509..000000000000
--- a/sys-apps/grep/grep-3.10.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/grep.asc
-inherit flag-o-matic verify-sig
-
-DESCRIPTION="GNU regular expression matcher"
-HOMEPAGE="https://www.gnu.org/software/grep/"
-
-if [[ ${PV} == *_p* ]] ; then
-	# Subscribe to the 'platform-testers' ML to find these.
-	# Useful to test on our especially more niche arches and report issues upstream.
-	MY_COMMIT="8-026c"
-	MY_P=${PN}-$(ver_cut 1-2).${MY_COMMIT}
-	SRC_URI="https://meyering.net/${PN}/${MY_P}.tar.xz"
-	SRC_URI+=" verify-sig? ( https://meyering.net/${PN}/${MY_P}.tar.xz.sig )"
-	S="${WORKDIR}"/${MY_P}
-else
-	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-	SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="+egrep-fgrep nls pcre static"
-
-# We lack dev-libs/libsigsegv[static-libs] for now
-REQUIRED_USE="static? ( !sparc )"
-
-LIB_DEPEND="
-	pcre? ( >=dev-libs/libpcre2-7.8-r1[static-libs(+)] )
-	sparc? ( dev-libs/libsigsegv )
-"
-RDEPEND="
-	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
-	nls? ( virtual/libintl )
-	virtual/libiconv
-"
-DEPEND="
-	${RDEPEND}
-	static? ( ${LIB_DEPEND} )
-"
-BDEPEND="
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	verify-sig? ( sec-keys/openpgp-keys-grep )
-"
-
-DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
-
-QA_CONFIG_IMPL_DECL_SKIP=(
-	# Either gnulib FPs or fixed in newer autoconf, not worth autoreconf here for now?
-	MIN
-	alignof
-	static_assert
-)
-
-src_prepare() {
-	default
-
-	# bug #523898
-	sed -i \
-		-e "s:@SHELL@:${EPREFIX}/bin/sh:g" \
-		-e "s:@grep@:${EPREFIX}/bin/grep:" \
-		src/egrep.sh || die
-}
-
-src_configure() {
-	use static && append-ldflags -static
-
-	# We used to turn this off unconditionally (bug #673524) but we now
-	# allow it for cases where libsigsegv is better for userspace handling
-	# of stack overflows.
-	# In particular, it's necessary for sparc: bug #768135
-	export ac_cv_libsigsegv=$(usex sparc)
-
-	local myeconfargs=(
-		--bindir="${EPREFIX}"/bin
-		$(use_enable nls)
-		$(use_enable pcre perl-regexp)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	if use egrep-fgrep ; then
-		# Delete the upstream wrapper variants which warn on egrep+fgrep use
-		rm "${ED}"/bin/{egrep,fgrep} || die
-
-		into /
-		# Install egrep, fgrep which don't warn.
-		#
-		# We do this by default to avoid breakage in old scripts
-		# and such which don't expect unexpected output on stderr,
-		# we've had examples of builds failing because foo-config
-		# starts returning a warning.
-		#
-		# https://lists.gnu.org/archive/html/bug-grep/2022-10/msg00000.html
-		newbin - egrep <<-EOF
-		#!/usr/bin/env sh
-		exec "${EPREFIX}/bin/grep" -E "\$@"
-		EOF
-
-		newbin - fgrep <<-EOF
-		#!/usr/bin/env sh
-		exec "${EPREFIX}/bin/grep" -F "\$@"
-		EOF
-	fi
-}
diff --git a/sys-apps/grep/grep-3.10_p20230430.ebuild b/sys-apps/grep/grep-3.10_p20230430.ebuild
deleted file mode 100644
index 05138ad583b9..000000000000
--- a/sys-apps/grep/grep-3.10_p20230430.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/grep.asc
-inherit flag-o-matic verify-sig
-
-DESCRIPTION="GNU regular expression matcher"
-HOMEPAGE="https://www.gnu.org/software/grep/"
-
-if [[ ${PV} == *_p* ]] ; then
-	# Subscribe to the 'platform-testers' ML to find these.
-	# Useful to test on our especially more niche arches and report issues upstream.
-	MY_COMMIT="19-2ea9"
-	MY_P=${PN}-$(ver_cut 1-2).${MY_COMMIT}
-	SRC_URI="https://meyering.net/${PN}/${MY_P}.tar.xz"
-	SRC_URI+=" verify-sig? ( https://meyering.net/${PN}/${MY_P}.tar.xz.sig )"
-	S="${WORKDIR}"/${MY_P}
-else
-	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-	SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="+egrep-fgrep nls pcre static"
-
-# We lack dev-libs/libsigsegv[static-libs] for now
-REQUIRED_USE="static? ( !sparc )"
-
-LIB_DEPEND="
-	pcre? ( >=dev-libs/libpcre2-10.42-r1[static-libs(+)] )
-	sparc? ( dev-libs/libsigsegv )
-"
-RDEPEND="
-	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
-	nls? ( virtual/libintl )
-	virtual/libiconv
-"
-DEPEND="
-	${RDEPEND}
-	static? ( ${LIB_DEPEND} )
-"
-BDEPEND="
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	verify-sig? ( sec-keys/openpgp-keys-grep )
-"
-
-DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
-
-QA_CONFIG_IMPL_DECL_SKIP=(
-	# Either gnulib FPs or fixed in newer autoconf, not worth autoreconf here for now?
-	MIN
-	alignof
-	static_assert
-)
-
-src_prepare() {
-	default
-
-	# bug #523898
-	sed -i \
-		-e "s:@SHELL@:${EPREFIX}/bin/sh:g" \
-		-e "s:@grep@:${EPREFIX}/bin/grep:" \
-		src/egrep.sh || die
-}
-
-src_configure() {
-	use static && append-ldflags -static
-
-	# We used to turn this off unconditionally (bug #673524) but we now
-	# allow it for cases where libsigsegv is better for userspace handling
-	# of stack overflows.
-	# In particular, it's necessary for sparc: bug #768135
-	export ac_cv_libsigsegv=$(usex sparc)
-
-	local myeconfargs=(
-		--bindir="${EPREFIX}"/bin
-		$(use_enable nls)
-		$(use_enable pcre perl-regexp)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	if use egrep-fgrep ; then
-		# Delete the upstream wrapper variants which warn on egrep+fgrep use
-		rm "${ED}"/bin/{egrep,fgrep} || die
-
-		into /
-		# Install egrep, fgrep which don't warn.
-		#
-		# We do this by default to avoid breakage in old scripts
-		# and such which don't expect unexpected output on stderr,
-		# we've had examples of builds failing because foo-config
-		# starts returning a warning.
-		#
-		# https://lists.gnu.org/archive/html/bug-grep/2022-10/msg00000.html
-		newbin - egrep <<-EOF
-		#!/usr/bin/env sh
-		exec "${EPREFIX}/bin/grep" -E "\$@"
-		EOF
-
-		newbin - fgrep <<-EOF
-		#!/usr/bin/env sh
-		exec "${EPREFIX}/bin/grep" -F "\$@"
-		EOF
-	fi
-}
diff --git a/sys-apps/grep/grep-3.11.ebuild b/sys-apps/grep/grep-3.11.ebuild
new file mode 100644
index 000000000000..05138ad583b9
--- /dev/null
+++ b/sys-apps/grep/grep-3.11.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/grep.asc
+inherit flag-o-matic verify-sig
+
+DESCRIPTION="GNU regular expression matcher"
+HOMEPAGE="https://www.gnu.org/software/grep/"
+
+if [[ ${PV} == *_p* ]] ; then
+	# Subscribe to the 'platform-testers' ML to find these.
+	# Useful to test on our especially more niche arches and report issues upstream.
+	MY_COMMIT="19-2ea9"
+	MY_P=${PN}-$(ver_cut 1-2).${MY_COMMIT}
+	SRC_URI="https://meyering.net/${PN}/${MY_P}.tar.xz"
+	SRC_URI+=" verify-sig? ( https://meyering.net/${PN}/${MY_P}.tar.xz.sig )"
+	S="${WORKDIR}"/${MY_P}
+else
+	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
+	SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="+egrep-fgrep nls pcre static"
+
+# We lack dev-libs/libsigsegv[static-libs] for now
+REQUIRED_USE="static? ( !sparc )"
+
+LIB_DEPEND="
+	pcre? ( >=dev-libs/libpcre2-10.42-r1[static-libs(+)] )
+	sparc? ( dev-libs/libsigsegv )
+"
+RDEPEND="
+	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+	nls? ( virtual/libintl )
+	virtual/libiconv
+"
+DEPEND="
+	${RDEPEND}
+	static? ( ${LIB_DEPEND} )
+"
+BDEPEND="
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	verify-sig? ( sec-keys/openpgp-keys-grep )
+"
+
+DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+	# Either gnulib FPs or fixed in newer autoconf, not worth autoreconf here for now?
+	MIN
+	alignof
+	static_assert
+)
+
+src_prepare() {
+	default
+
+	# bug #523898
+	sed -i \
+		-e "s:@SHELL@:${EPREFIX}/bin/sh:g" \
+		-e "s:@grep@:${EPREFIX}/bin/grep:" \
+		src/egrep.sh || die
+}
+
+src_configure() {
+	use static && append-ldflags -static
+
+	# We used to turn this off unconditionally (bug #673524) but we now
+	# allow it for cases where libsigsegv is better for userspace handling
+	# of stack overflows.
+	# In particular, it's necessary for sparc: bug #768135
+	export ac_cv_libsigsegv=$(usex sparc)
+
+	local myeconfargs=(
+		--bindir="${EPREFIX}"/bin
+		$(use_enable nls)
+		$(use_enable pcre perl-regexp)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	if use egrep-fgrep ; then
+		# Delete the upstream wrapper variants which warn on egrep+fgrep use
+		rm "${ED}"/bin/{egrep,fgrep} || die
+
+		into /
+		# Install egrep, fgrep which don't warn.
+		#
+		# We do this by default to avoid breakage in old scripts
+		# and such which don't expect unexpected output on stderr,
+		# we've had examples of builds failing because foo-config
+		# starts returning a warning.
+		#
+		# https://lists.gnu.org/archive/html/bug-grep/2022-10/msg00000.html
+		newbin - egrep <<-EOF
+		#!/usr/bin/env sh
+		exec "${EPREFIX}/bin/grep" -E "\$@"
+		EOF
+
+		newbin - fgrep <<-EOF
+		#!/usr/bin/env sh
+		exec "${EPREFIX}/bin/grep" -F "\$@"
+		EOF
+	fi
+}
diff --git a/sys-apps/grep/grep-3.9.ebuild b/sys-apps/grep/grep-3.9.ebuild
deleted file mode 100644
index 602e426f3fda..000000000000
--- a/sys-apps/grep/grep-3.9.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/grep.asc
-inherit flag-o-matic verify-sig
-
-DESCRIPTION="GNU regular expression matcher"
-HOMEPAGE="https://www.gnu.org/software/grep/"
-
-if [[ ${PV} == *_p* ]] ; then
-	# Subscribe to the 'platform-testers' ML to find these.
-	# Useful to test on our especially more niche arches and report issues upstream.
-	MY_COMMIT="35-c860"
-	MY_P=${PN}-$(ver_cut 1-2).${MY_COMMIT}
-	SRC_URI="https://meyering.net/${PN}/${MY_P}.tar.xz"
-	SRC_URI+=" verify-sig? ( https://meyering.net/${PN}/${MY_P}.tar.xz.sig )"
-	S="${WORKDIR}"/${MY_P}
-else
-	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-	SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="+egrep-fgrep nls pcre static"
-
-# We lack dev-libs/libsigsegv[static-libs] for now
-REQUIRED_USE="static? ( !sparc )"
-
-LIB_DEPEND="
-	pcre? ( >=dev-libs/libpcre2-7.8-r1[static-libs(+)] )
-	sparc? ( dev-libs/libsigsegv )
-"
-RDEPEND="
-	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
-	nls? ( virtual/libintl )
-	virtual/libiconv
-"
-DEPEND="
-	${RDEPEND}
-	static? ( ${LIB_DEPEND} )
-"
-BDEPEND="
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	verify-sig? ( sec-keys/openpgp-keys-grep )
-"
-
-DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
-
-QA_CONFIG_IMPL_DECL_SKIP=(
-	# Either gnulib FPs or fixed in newer autoconf, not worth autoreconf here for now?
-	MIN
-	alignof
-	static_assert
-)
-
-src_prepare() {
-	default
-
-	# bug #523898
-	sed -i \
-		-e "s:@SHELL@:${EPREFIX}/bin/sh:g" \
-		-e "s:@grep@:${EPREFIX}/bin/grep:" \
-		src/egrep.sh || die
-}
-
-src_configure() {
-	use static && append-ldflags -static
-
-	# We used to turn this off unconditionally (bug #673524) but we now
-	# allow it for cases where libsigsegv is better for userspace handling
-	# of stack overflows.
-	# In particular, it's necessary for sparc: bug #768135
-	export ac_cv_libsigsegv=$(usex sparc)
-
-	local myeconfargs=(
-		--bindir="${EPREFIX}"/bin
-		$(use_enable nls)
-		$(use_enable pcre perl-regexp)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	if use egrep-fgrep ; then
-		# Delete the upstream wrapper variants which warn on egrep+fgrep use
-		rm "${ED}"/bin/{egrep,fgrep} || die
-
-		into /
-		# Install egrep, fgrep which don't warn.
-		#
-		# We do this by default to avoid breakage in old scripts
-		# and such which don't expect unexpected output on stderr,
-		# we've had examples of builds failing because foo-config
-		# starts returning a warning.
-		#
-		# https://lists.gnu.org/archive/html/bug-grep/2022-10/msg00000.html
-		newbin - egrep <<-EOF
-		#!/usr/bin/env sh
-		exec "${EPREFIX}/bin/grep" -E "\$@"
-		EOF
-
-		newbin - fgrep <<-EOF
-		#!/usr/bin/env sh
-		exec "${EPREFIX}/bin/grep" -F "\$@"
-		EOF
-	fi
-}
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 56e5d93a0a15..4b5ccfcb14de 100644
Binary files a/sys-devel/Manifest.gz and b/sys-devel/Manifest.gz differ
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 17bf59bdf92c..5ca06189e9c3 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -24,6 +24,7 @@ DIST gcc-13.2.0-musl-patches-2.tar.xz 5292 BLAKE2B c057d6574d03c05854edaa9f3fd40
 DIST gcc-13.2.0-patches-1.tar.xz 15792 BLAKE2B 2ffa9ac013c0f9a91eb93e87e3bc6c378d02cca32ad3f8a84d1249e257eb02b206ec10fa425738a4bae2ffb7db8506afcee2a8dd855357e4b48636608aa24e50 SHA512 917ea178f3696724f9ec08aebb6976f03c5edf8ee21bb4bad7e2d820507452f6dace6e847c4f342a52870642550f34da0346ee635a60ba0c1bff667e0e31d195
 DIST gcc-13.2.0-patches-2.tar.xz 12392 BLAKE2B 40ca4c230166e39d237e4b939669e51b991f58d0e1787c43f2bf468447de478604d28b6e9b20f5991bd01b9efad4860b30567c8df5d823cf6fc47678f9e6b672 SHA512 d00f559b2d6ad98f97a9328d2ce1593553fff727033690dfc13f520775e977b674fe14cc1ec7ab52b246e091a055812eaf4f93306145a4d2ad87a55707a3717b
 DIST gcc-14-20230507.tar.xz 84069364 BLAKE2B 579df5cf4b0d16aa29248259e235dd7c05454c8c5b999928cbf200d52997e0615391e06308e9e0a72f7a1f1903cb86305137eceb97cd8ddd0cf40b4a21a05a86 SHA512 1598b9565bc9554e91d5be2b58d8c0861b72e97b79aa952c084ae4731c0cd1ca37d107a70b6a26235bf59322c1f4de435389906b4fe6f29b6e65e1b566aff5ea
+DIST gcc-14-20230514.tar.xz 84081088 BLAKE2B e385298bac832374a4773bb4a30fa42f66262378417ce3850c62d69300c76e7a9feae8fb51285edabd9ffed423ac4b688c52bc18d76aa700f255e951ca60f237 SHA512 839a7fbe1210f54b0bcb26e10f9ac26d262924f8d19eef62e33a8bc066c00a549a0b49cff088f5e23656c66f26a28c0721e376cfdd97a54f6a9b2ba3680f5e01
 DIST gcc-14.0.0-musl-patches-1.tar.xz 3576 BLAKE2B 692baee8a7709905d53aeb150d73a3721c4ba47ee5f397cfb1b5be905cf003ca02b60c94ee294d90ac39645cd5cdf186c7a3aa950c47d8cf680c128ed705b807 SHA512 0592ab98a7142e404623a6511c67dff61e9ade32c3fb2c0e75b456306e0af3799ad13252b50b3d2fdd31e5815d7f0b16b0ad63ab8386fe4d78729fc9c182d617
 DIST gcc-14.0.0-patches-1.tar.xz 11612 BLAKE2B a3b0f3952cf7a6fb095817f4727ccb5cff24607a5c2bb67d280da4651177132ddcf398243998271c509ccaf3445d4843ff691a12d5c394dad8d9c70fc4a8120d SHA512 66701c2e4fd1a031ffcb353a3a9cd1fe25d3d62167065523097e41a3e48adf4218ecf08e382e3ea22014c561ba3a15681650c5538cda91d38c69cbbf04503a74
 DIST gcc-8.5.0-patches-4.tar.xz 18616 BLAKE2B 7594cbaea5daecf1a0b3d526c06aeba0a84c6da66aee2e105a51fda6be8d30a37ccc3814281b284a4582d892a1d556bca063551584edfc2525bed8ea5b6888e7 SHA512 1aa5742c361186637e7855f06feb1a4547e7d4d5de6e51f3d049e0ef3c19e2eff179465f52781739f59422035b7f8e4c0efa3844849f920f3c96acfdc37ca6a6
@@ -48,6 +49,7 @@ EBUILD gcc-13.1.1_p20230513.ebuild 1667 BLAKE2B f1b5e024192ec9018b8de8f9db0ee151
 EBUILD gcc-13.2.9999.ebuild 1593 BLAKE2B 6ada03c3a63cbdb90a06954f02809b1f7aec31130c010981554ef8df4db41d79d856ee514694b9f900983e7649cc94929e3050764ff6fef5a8227701710d423a SHA512 89b624dc6f8a1187f3d36f9988409c27e1e2133889a1135be0ecaa3aaa7c381f780cc20aa8095be9bc31c4e16b96128ba50dc17431305bf3f334025956a95746
 EBUILD gcc-14.0.0.9999.ebuild 1591 BLAKE2B 8a463d1b3d812a22a29a4aec27504bc138a69939b328f6fecf4eecaa90aa51acdb2e53fdf5ca5d69c5159019c354ad9ecaff218181f06fbbd9a0da43fc70c962 SHA512 67e09c08daf026d9c61f8feeafcd595c37103c04879641f6d79ef7ceeb0d44d84dd81bc340e77d031c8675a4ac858ea5a555fe0dc76fcce57991361b2d09c1b5
 EBUILD gcc-14.0.0_pre20230507.ebuild 1622 BLAKE2B 459d438085fc5382680372ccbe7223f56906207667619a7788c5ff1c2b573c363481c9857f64aa17f5a67ddf35d5a4c79b559dad70b8bf2593710b610c19335a SHA512 fe6b9cf8dcee281c71ef30a28f5da38922f2be6671573545f3a7b3b1db9220aa6236f3441fe3ad2d31b389ef752dbe68f1b75f45532565fd20e0bd01ebcdf77e
+EBUILD gcc-14.0.0_pre20230514.ebuild 1622 BLAKE2B 459d438085fc5382680372ccbe7223f56906207667619a7788c5ff1c2b573c363481c9857f64aa17f5a67ddf35d5a4c79b559dad70b8bf2593710b610c19335a SHA512 fe6b9cf8dcee281c71ef30a28f5da38922f2be6671573545f3a7b3b1db9220aa6236f3441fe3ad2d31b389ef752dbe68f1b75f45532565fd20e0bd01ebcdf77e
 EBUILD gcc-8.5.0-r1.ebuild 498 BLAKE2B e24f62fdb50bf2e9957cbb85c72adc96d369938a7f552735772de964f7023b8b34bd11e7e544d268cc308e25272084a728bd061f37c568d42ea65d55bb2a2e93 SHA512 f35b353e9f54eb3e1c6f8e0ea262458b41da9bddb993793aff79f765c4d93811744979d34e50c6470a9b2cfb63b7006bd284d819b7a98e56a8b3a34ae570ae76
 EBUILD gcc-9.5.0.ebuild 844 BLAKE2B 719c259a6f39c72f7d1748095a9e649d4ab3dde04b118125313ab9b915eb9cbd038592532185317080dbc46d73a8bd324b498462db73b12d23144cd58378dd9c SHA512 1ed19c79239d155be3b267fcad4d7230821406ba8fb2c11857168fc0e717c4edcd8d7fb0972bc6df0fbcfbd8a9f085aa023f452368278c0e7e0af014c1124d89
 MISC metadata.xml 5254 BLAKE2B b64569d62dd67c2f2dab441bb2c4a65bcd61b4c9d8ad7543e8f91c583501d72ed1474abf785e68c48de298d8391de3d94b9b4020086b2b0fa9cc477114a92e9e SHA512 f1307b7865dc4c2c843b5f498196bf5710e45e3292181b43687ebe85b5e9b26203c9c83ee7872efe2cd93595eca430de91e3a5fd6900f0f62c875308ccbb0303
diff --git a/sys-devel/gcc/gcc-14.0.0_pre20230514.ebuild b/sys-devel/gcc/gcc-14.0.0_pre20230514.ebuild
new file mode 100644
index 000000000000..1b25d3519a6e
--- /dev/null
+++ b/sys-devel/gcc/gcc-14.0.0_pre20230514.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+TOOLCHAIN_PATCH_DEV="sam"
+PATCH_VER="1"
+PATCH_GCC_VER="14.0.0"
+MUSL_VER="1"
+MUSL_GCC_VER="14.0.0"
+
+if [[ $(ver_cut 3) == 9999 ]] ; then
+	MY_PV_2=$(ver_cut 2)
+	MY_PV_3=$(($(ver_cut 3) - 9998))
+	if [[ ${MY_PV_2} == 0 ]] ; then
+		MY_PV_2=0
+		MY_PV_3=0
+	else
+		MY_PV_2=$(($(ver_cut 2) - 1))
+	fi
+
+	# e.g. 12.2.9999 -> 12.1.1
+	TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.${MY_PV_3}
+elif [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then
+	# Cheesy hack for RCs
+	MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 1)))-RC-$(ver_cut 5)
+	MY_P=${PN}-${MY_PV}
+	GCC_TARBALL_SRC_URI="mirror://gcc/snapshots/${MY_PV}/${MY_P}.tar.xz"
+	TOOLCHAIN_SET_S=no
+	S="${WORKDIR}"/${MY_P}
+fi
+
+inherit toolchain
+
+# Needs to be after inherit (for now?), bug #830908
+#EGIT_BRANCH=master
+
+# Don't keyword live ebuilds
+#if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
+#	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+#fi
+
+if [[ ${CATEGORY} != cross-* ]] ; then
+	# Technically only if USE=hardened *too* right now, but no point in complicating it further.
+	# If GCC is enabling CET by default, we need glibc to be built with support for it.
+	# bug #830454
+	RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )"
+	DEPEND="${RDEPEND}"
+	BDEPEND=">=${CATEGORY}/binutils-2.30[cet(-)?]"
+fi
+
+src_prepare() {
+	local p upstreamed_patches=(
+		# add them here
+	)
+	for p in "${upstreamed_patches[@]}"; do
+		rm -v "${WORKDIR}/patch/${p}" || die
+	done
+
+	toolchain_src_prepare
+
+	eapply_user
+}
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 62f461e45502..a1f10efb0c6f 100644
Binary files a/sys-kernel/Manifest.gz and b/sys-kernel/Manifest.gz differ
diff --git a/sys-kernel/git-sources/Manifest b/sys-kernel/git-sources/Manifest
index c992057792c4..88f2967d2217 100644
--- a/sys-kernel/git-sources/Manifest
+++ b/sys-kernel/git-sources/Manifest
@@ -1,4 +1,6 @@
 DIST linux-6.2.tar.xz 136430892 BLAKE2B 05b63254734ea685db437cb1c00a6da63eee74d7e99f4ed2d074aaa01ac4487813ab297d337a6855cdbcbb33346b631c4256ee3b06191adfb1be3615a56bdd6d SHA512 a01bee0b968b95183934fe3504516be7ef5811944a061f5aed05ecebaa27b5eb64e33232fd0a8dd622b3c8743bfe462ef7e464d381734d111a0ad6a6d9f66ddd
 DIST patch-6.4-rc1.patch 150354035 BLAKE2B a2f069cd47ad350fe811cf8abe2094afd8a107f7dec1eb978ccdecbd25e2beff27dafef569617d333facbd68c23be149719ac474c7bd1526dbd36b05424f4725 SHA512 eb31cb141d8ce6ffd0bdfc6b0a27e1e8bfa5bfe43e150e35d097afb3d8fca9bae811a85da337af8b5eceaac417d2cf19728e2f35125500b03fea03c86a4eeb9a
+DIST patch-6.4-rc2.patch 150656723 BLAKE2B 624d3779fac3e586aa6609d1714f59a5c61d9b8c2ced2afaf1700d3118b8b3c8cf8a4c878b2005a72d4ef456df86412334b5390ffd3e6d4bdfa4e8cd976ba0e2 SHA512 dcd1df2705c022d46ace14f80bb163a529f15e46251120c8e5c20aaf6fbbd0a97d45170ac4995ca96fa2b8adb7016ea24b0137cfe8914e1ea8b0d8c94c890413
 EBUILD git-sources-6.4_rc1.ebuild 1198 BLAKE2B 3109dfd7f79013ba600643edafe2380b41b39f6e4973d8b7b361c48a521136eec0f4e356ba4331a8072498149f16b900f354d6b6d369e97ae1c6f5e1506fe130 SHA512 57b67b0c6f52463e57950d3f000bd4aff95fee3979faa2fdc52e2af68bcb8c5a1f9a8aab968a136e6ff6ce36b501e914b964f96a098c08afa60517e9be801748
+EBUILD git-sources-6.4_rc2.ebuild 1198 BLAKE2B 3109dfd7f79013ba600643edafe2380b41b39f6e4973d8b7b361c48a521136eec0f4e356ba4331a8072498149f16b900f354d6b6d369e97ae1c6f5e1506fe130 SHA512 57b67b0c6f52463e57950d3f000bd4aff95fee3979faa2fdc52e2af68bcb8c5a1f9a8aab968a136e6ff6ce36b501e914b964f96a098c08afa60517e9be801748
 MISC metadata.xml 465 BLAKE2B 089bfb0e4af03b69d3d118d39713b54aac6912012cf0e9352d22b4b597abe5b1ef86863c37f6a0be2f81995f2a81a8d08bc7c2927d06ac2042b7b18ba02c77be SHA512 cb2bec5a8cce1e6da593f6ab11ceb854112fb4e828198793820699913f2f7cb2a9443e1cb15c42e16730891a27fe8dcd1713527c2ba2cfa56f6d2296f6f6e001
diff --git a/sys-kernel/git-sources/git-sources-6.4_rc2.ebuild b/sys-kernel/git-sources/git-sources-6.4_rc2.ebuild
new file mode 100644
index 000000000000..ae9a3401cdd2
--- /dev/null
+++ b/sys-kernel/git-sources/git-sources-6.4_rc2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+UNIPATCH_STRICTORDER="yes"
+K_NOUSENAME="yes"
+K_NOSETEXTRAVERSION="yes"
+K_NOUSEPR="yes"
+K_SECURITY_UNSUPPORTED="1"
+K_BASE_VER="6.2"
+K_EXP_GENPATCHES_NOUSE="1"
+K_FROM_GIT="yes"
+K_NODRYRUN="yes"
+ETYPE="sources"
+CKV="${PVR/-r/-git}"
+
+# only use this if it's not an _rc/_pre release
+[ "${PV/_pre}" == "${PV}" ] && [ "${PV/_rc}" == "${PV}" ] && OKV="${PV}"
+inherit kernel-2
+detect_version
+
+DESCRIPTION="The very latest -git version of the Linux kernel"
+HOMEPAGE="https://www.kernel.org"
+SRC_URI="${KERNEL_URI}"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE=""
+
+K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
+experimental nature. If you have any issues, try a matching vanilla-sources
+ebuild -- if the problem is not there, please contact the upstream kernel
+developers at https://bugzilla.kernel.org and on the linux-kernel mailing list to
+report the problem so it can be fixed in time for the next kernel release."
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	>=sys-devel/patch-2.7.6-r4"
+
+pkg_postinst() {
+	postinst_sources
+}
-- 
cgit v1.2.3