gentoo auto-resync : 30:05:2023 - 09:20:33

author: V3n3RiX <venerix@koprulu.sector> 2023-05-30 09:20:33 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2023-05-30 09:20:33 +0100
commit: 70e4bd5c8f26b1f2baeb5146a841273b2cb15179 (patch)
tree: 82c39dda2ba79ec0993746bf42651c18a4beb137
parent: 37c470b10802509995e7ae6a6886506f79540dd8 (diff)
263 files changed, 1925 insertions, 7241 deletions
diff --git a/Manifest b/Manifest
index ecae1dc4c010..37f5e564efcd 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29491 BLAKE2B 44e653f163f03a33615ede05c25f1c3dcd176e666b691c1bc1891a13f6836331d1bd1660f5a33ada02b63a275d574c8a9642d1c29de6eba0b1ff16fa36ddac9d SHA512 792df4f8d145320e0c3fe93bfa183fac4123a48020ed4196731f8328aed3956618f1b3f759719f9bd0b64d198dbccc34d8d5792718d48ac70d5ed8aba591d149
-TIMESTAMP 2023-05-30T01:40:39Z
+MANIFEST Manifest.files.gz 29476 BLAKE2B bd9d491d32ebd3be2d317fe0c14f4d9ebbb83d7599887d4193986dc9769877c849a6016595b7a5e029445892e47511c5e7e45777c9bdf755effa7fbb7a6aa98a SHA512 2f0a95296106d441739a1554bb214f4b205ae8100c6b8e36ab335827384da031a741c91b4d44eab4025abdd6f3646240dc229d200c12eaf3e682a65dcf55881f
+TIMESTAMP 2023-05-30T07:40:07Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmR1VBdfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmR1qFdfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klD3Ag/7B0YuhSOjSRarsXSyAmUEnNMS8vICCU2BALPtvK22VZ8MLtpA0d9Z7c8P
-szAQKL6jn53tbllJQVSjdlC7p0ms6TntaBwHUfhH3NClGpzMGp6l7UW4fZvoqhpC
-CYtEqPvSHo4tSg/p5RiTJhiDxTHE2sYr1GsSRnUCNPwplghnboHbEzRVr+qr7t0r
-oQ7c09qRy1T2auKTTf6iHQbVYdwDwzintFaUsecIlwxOvpWThTbacjrOciJDDef7
-BsGA3jHSZ2bpqeduStlVYpj0Mvm0gEollPr3dFKuqoRxJbfsMA285DnYvLSQhP0/
-t7+Ci+l/FtBpKCS2EWRD01TuCpkgrQiX6dRSsZAXpDtPOsdhyh9h8XlfYcTXNYdy
-JR7obbmu7vQbY/WS5yZn8QQQahDqiqpcmyG0EH6wZ/SlqVg5jrr/9Rf2+0gy8gWi
-VaGf9eFYbVnrwtPbCn2J60EnBSLWMIP5bXfA2EBOpkj4JnjhtBZuUCcAYBr6+evP
-4Przj2tIto1jg5H6ZZ1ifZZZwfIDFcaUQV+/2CnFvrP+4QjlacinQBKMVECBuopg
-mfatLR1uTdwGX2YNEcu/XVDfuvmtk6DVuPtu065dnoTGOtghwfgwnwCVvzCsi9PM
-Cd/vr8TfOO+vbe+YM3OXFumnHW80aKhjRap3N60gZfd+iLAAHOc=
-=atAA
+klAiiQ//SewGvXghft1BbUD7FvaZ8cxNj6i1MnEOv12y+mrc9/dnNxYxG4v5WWh5
+/3ZS/BiH1Cpb5bE41IQWqXwuWp+zqoPVWb/m9nsq74Gm+6g51apKMjR9NMdIB9ru
+/r54z4L09UKsWBVks+/WdAMLrjhGvwhf2RRks7g0yM89P0wGfFl6hHijyqajU9Xv
+5d1e3Jty0+nfJbUERZj2f0gZL6OTDvveTmxuVH08CzfPoOQ/vdUvngO4CdMgeB0t
+a5BrNIUz7kpT4QLzQ1THxPssDDtjNXbbCvP1wFTDQxK7PD/tiPVYigEDaIvxNK1N
+lyni9qepDW3F9PJDt1ThQBLSw2ZeJvzP9d7IYEBF1PUAgWjwwJ7d1soSpUgO0418
+4YMJDRQXFo/fsTaKC3dvpefpLyoUJQR7soC8itg39wI8wpq8uQ+KTlQqeXn60wUR
+dZ0Ohq0ru7Hz+Dbh8oimipp5UrMx70YxrO8jO2KV66staizVtIAefNsUkN4KArzw
+1MOLA1GZIH5CtH83x5GP+HsIjkJTrbHzNDkFOUkhz8RPYRFgEAwK+WJ6yAPlgKjq
+t+0Q6OWFAxULsV3j7WPWJaSmU9v4Bs0UXEjN1MHlUyItVlKyeZJPkgc9bW6NAkR3
+lbh7/g2a8ranoQKBYR6aBittWdBXM3tLEjS3NsJcbUMBZcv2gYo=
+=c0q8
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 2711a2a2eb28..b242586da6c2 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-doc/Manifest.gz b/app-doc/Manifest.gz
index 747438e4f856..596d25f41198 100644
--- a/app-doc/Manifest.gz
+++ b/app-doc/Manifest.gz
diff --git a/app-doc/eclass-manpages/Manifest b/app-doc/eclass-manpages/Manifest
index 0eea517116f5..e5b8498dc52a 100644
--- a/app-doc/eclass-manpages/Manifest
+++ b/app-doc/eclass-manpages/Manifest
@@ -1,8 +1,10 @@
 DIST eclass-manpages-20230329.tar.xz 409168 BLAKE2B 5913afcf95174540546d238cc637689fe0c7de2013f4271ac3feee749eb2fede8b741e2409ba09060fd5c36941e36ee504be8a584201d04b368886f50abfd3ea SHA512 ee43c47f26b474acec2f778a5bf05c752198d2f5cce959a337eaa674465c92869e213dd4aea8243671825cea80bbfbec7040cac283354de4e8feeefeace46d32
 DIST eclass-manpages-20230417.tar.xz 409620 BLAKE2B 0e1b3cce23ee9f2a91b87c5de89819eca8fd50101e813ecf56c8a1d4147bf33006505425be95a2f1693ec084fbf9409c2aaf1dccf6d9cbf244e71ee1c0e1498d SHA512 2cef6f30e917979b9f56c11f953c27a8048842b432fc6641ea06daf479bc202d9ea2f8ce26769584f317bf3cde2c2f9736d2605546be1b1a10ea557177639de3
 DIST eclass-manpages-20230512.tar.xz 410888 BLAKE2B a6a26230b7e06a4a62c9e7a6695af3849ed0504ac24da4a2b05ce770a44b69224da6eedae960a7c0a43a9cadbac24b88ef76dd1b2cf9853e91c424e63136989a SHA512 e09513b23268fc5bc84dcea90f5c9901ae0b376379b4235dc599553c3664a29d72cef15787acf4ef3bb2cd9081b95891dc5c100e9f88b6f133b7fbee13c011ad
+DIST eclass-manpages-20230530.tar.xz 422768 BLAKE2B 1e2985175be537300aa31e87ea397eb103d0b5118f792ea46a06a9100ea4d0c15d25bccdd47e855a2d9b21fe3e0af1f22bdcf97997b1ce79a0c2b0a07b497812 SHA512 7471cd52678ae2f7f4e62c7f6acafa2ea7e7df2949db0280d443c9395c25dc45933050a4c8cdda0d69d0d181d7004c927c9366bfaeb3d2c65f60cd2d62f7c8ff
 EBUILD eclass-manpages-20230329.ebuild 760 BLAKE2B 4e30a5b7d8a53d687041068715f77689d581608c5790d5ddbe72ba88d2ac58d903f13d60c4bbad35497945060075c22f0b6ea6f2b4b6c8ec4a59b3e6cd920d2c SHA512 51eb4b98dd2a04c436dc0cdb5343f07d427656ae9cdb2fe36cff5a1abceef2f11ab618beab8000677109e351aa7ccf0ae98b4712f38abcc760e0ce87a6d330e3
 EBUILD eclass-manpages-20230417.ebuild 760 BLAKE2B 4e30a5b7d8a53d687041068715f77689d581608c5790d5ddbe72ba88d2ac58d903f13d60c4bbad35497945060075c22f0b6ea6f2b4b6c8ec4a59b3e6cd920d2c SHA512 51eb4b98dd2a04c436dc0cdb5343f07d427656ae9cdb2fe36cff5a1abceef2f11ab618beab8000677109e351aa7ccf0ae98b4712f38abcc760e0ce87a6d330e3
 EBUILD eclass-manpages-20230512.ebuild 759 BLAKE2B f8374a8491136b96a4a94943efd94c48c378a0dd45bb16af56c675efaa277c16b5fc91e9d59b952d852bc4de2cbbf2005ee32c10ec88015981a632ec582bb098 SHA512 b6167142c15cdf5a603c7ace12028e03846931bbdaf6cf7a269d295796c5cdbcc88ef0e070ed0edb9e094d280e44dc78568a19f43eaa03dd3648ae8feb2ed201
+EBUILD eclass-manpages-20230530.ebuild 759 BLAKE2B f8374a8491136b96a4a94943efd94c48c378a0dd45bb16af56c675efaa277c16b5fc91e9d59b952d852bc4de2cbbf2005ee32c10ec88015981a632ec582bb098 SHA512 b6167142c15cdf5a603c7ace12028e03846931bbdaf6cf7a269d295796c5cdbcc88ef0e070ed0edb9e094d280e44dc78568a19f43eaa03dd3648ae8feb2ed201
 EBUILD eclass-manpages-99999999.ebuild 717 BLAKE2B 539cacbb1e30897fcf7217eb7420273a11e342eb19ce270d6ded5f25a7dbab87cb6719cff57d4a63bf78d58dcaec565bdbca41f4689c5ee557adb09f60be6376 SHA512 b1a601332d1b82808a698d463026dc093a1afd93d93ef2845ff71773b79c4f12c6925f8b90101cda725e5b6c479c230aaf0d15fe8767e05648689dd9d1fcb0fb
 MISC metadata.xml 546 BLAKE2B 3fcaa67cd9ba2aebeae79ad37612fda556b7e42ec1692293d26201e82b7101cc8894e3fa8ed9acb4026fa0eb7e9c54ae6919872cd8e61c0f0d63ae3a323206b0 SHA512 6fb2a7db8da921bc6d3b22444ed401ef73c2a2d25ca4e4170234763ec98a108a63d05167660ce4e173d4e9604053269c04a66d617897045b2482b3febbc7e33c
diff --git a/app-doc/eclass-manpages/eclass-manpages-20230530.ebuild b/app-doc/eclass-manpages/eclass-manpages-20230530.ebuild
new file mode 100644
index 000000000000..a48746c8b4c9
--- /dev/null
+++ b/app-doc/eclass-manpages/eclass-manpages-20230530.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Instructions to make a dist tarball:
+# git clone https://github.com/projg2/eclass-to-manpage.git
+# cd eclass-to-manpage
+# make dist ECLASSDIR=~/g/eclass/
+
+DESCRIPTION="Collection of Gentoo eclass manpages"
+HOMEPAGE="https://github.com/projg2/eclass-to-manpage"
+SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+# Keep the keywords stable. No need to change to ~arch.
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+BDEPEND="sys-apps/gawk"
+
+src_install() {
+	emake install DESTDIR="${D}" PREFIX="${EPREFIX}/usr"
+}
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index f3d2b080610c..c7a18c20d1a7 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/virtualbox-additions/Manifest b/app-emulation/virtualbox-additions/Manifest
index 4d6732dc9e8d..1ccc9e69ecbd 100644
--- a/app-emulation/virtualbox-additions/Manifest
+++ b/app-emulation/virtualbox-additions/Manifest
@@ -1,9 +1,5 @@
-DIST VBoxGuestAdditions_6.1.42.iso 63946752 BLAKE2B 56cb4bcb256e9def35fa0c2ff2b9cc18ec52d8d8d5def2b2619861a0bee18970314b7c26a8413ba8317183612d0f4762d7b20524d4422ccdcf11e82455aed238 SHA512 b2bbe3e3defc1131eec1769b508fd604835ba0e28e4b77ddbaa838ee6d3b0b8a0b89841226750cc8b7dc8b5fa918b613b6c9083449cb1da9b6fe1f410d501315
 DIST VBoxGuestAdditions_6.1.44.iso 63952896 BLAKE2B afbcf9e3d648b4314cdee8ef008a4e0ca34d071bf4aa819f157c4414072ef341c1996b67a497b31b903c9e9f984a7800f1cd8caf7d1ccf54cddbadb499fc2a6e SHA512 19bc732f47883867ff3822eacf8d7cf88fa17e994b7b2d8d8081068be464d27402e2ca6ee0f1584d7fe9b2e8aa02c654827f353cb8ad1bb339d885b08367090e
-DIST VBoxGuestAdditions_7.0.6.iso 53049344 BLAKE2B df18a10dd6af3b4fd6a7d8e0d14b70d3a93274eb60b41e419c69ffe68bac3e5780782c32ace3a402c7755310f614ab42560d969f016f89d2ef5e32e06a6a260c SHA512 ba948b05209cad10d0772009af7529339faa44c31f75e0e10811887bd280f5fb7ed545dec315380ea99532bcbfc72833740c3c8b55502e8ec883d809c2bce47f
 DIST VBoxGuestAdditions_7.0.8.iso 53485568 BLAKE2B 6aed8e745d2c17899decdf40e7c5c5115be89f394bc59d824e3503c795ef935cae541c7f5959cb1c116dabc30fe7db3deb3acf47345159da5327f29d2ab00396 SHA512 6333f14da57e9d460b8866d58ab4adaefc8b673859ab2e62ededdcba2d14f46723d64d90c8f0bde3c321adfe887249ef043d137b25f9fc0bc5b663770ddf2205
-EBUILD virtualbox-additions-6.1.42.ebuild 567 BLAKE2B dc91227571c02c0556289d93bf3d862c6a06493cbeb92938c56f1ba5b47541f99726aa626b383c23d477d915c2d99e01b8014c3d0f807b22929aad8116886dfe SHA512 950099b0c5918477d47e74deeb4c1501e2f110b3cbbd9c132b71e1ea792bd59197d0d23f1dc0d93b87d98998210f77fcefeab620136e17fcfe2d8dd545acb0b4
 EBUILD virtualbox-additions-6.1.44.ebuild 567 BLAKE2B dc91227571c02c0556289d93bf3d862c6a06493cbeb92938c56f1ba5b47541f99726aa626b383c23d477d915c2d99e01b8014c3d0f807b22929aad8116886dfe SHA512 950099b0c5918477d47e74deeb4c1501e2f110b3cbbd9c132b71e1ea792bd59197d0d23f1dc0d93b87d98998210f77fcefeab620136e17fcfe2d8dd545acb0b4
-EBUILD virtualbox-additions-7.0.6.ebuild 555 BLAKE2B 2825d0a87644c02f55a5b0cc1cf70850309ae5e0db3f94dad42f8157a170abb09242bb7336c1a0ec600387141903c4d9fb7fc61c54bddca459931d6c8a9a9dac SHA512 a1c8d1d38d6e27b78019456acdaf3fe47c6863eb03391c1c1670015637d40320d24bc90f9f4d865e7d989a47e6d9b72d9150f716afe4bd2c8ad4c220f174fd3e
 EBUILD virtualbox-additions-7.0.8.ebuild 555 BLAKE2B 2825d0a87644c02f55a5b0cc1cf70850309ae5e0db3f94dad42f8157a170abb09242bb7336c1a0ec600387141903c4d9fb7fc61c54bddca459931d6c8a9a9dac SHA512 a1c8d1d38d6e27b78019456acdaf3fe47c6863eb03391c1c1670015637d40320d24bc90f9f4d865e7d989a47e6d9b72d9150f716afe4bd2c8ad4c220f174fd3e
 MISC metadata.xml 255 BLAKE2B 9386ef3bdb55211441f303528b31f8ccd9ad9039744400e859574a424fa1f366a989fe78f5c10038f3dd9b06a6a389e4a7e643b3eac0dc93a79ac4cc3b4c5423 SHA512 6c158e12464285afd44b70d0653b65f65da1c523fc2b1b07eb6d2dec56f58234bb31cb9dc36238cd6dfc20031b4d58c04e7c1678cc9f917194403ad8a209513f
diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-6.1.42.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-6.1.42.ebuild
deleted file mode 100644
index b2792ebc0e51..000000000000
--- a/app-emulation/virtualbox-additions/virtualbox-additions-6.1.42.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PN=VBoxGuestAdditions
-MY_P=${MY_PN}_${PV}
-
-DESCRIPTION="CD image containing guest additions for VirtualBox"
-HOMEPAGE="https://www.virtualbox.org/"
-SRC_URI="https://download.virtualbox.org/virtualbox/${PV}/${MY_P}.iso"
-S="${WORKDIR}"
-
-LICENSE="GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64"
-
-src_unpack() {
-	return 0
-}
-
-src_install() {
-	insinto /usr/share/${PN/-additions}
-	newins "${DISTDIR}"/${MY_P}.iso ${MY_PN}.iso
-}
diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-7.0.6.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-7.0.6.ebuild
deleted file mode 100644
index eef28dee0709..000000000000
--- a/app-emulation/virtualbox-additions/virtualbox-additions-7.0.6.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PN=VBoxGuestAdditions
-MY_P=${MY_PN}_${PV}
-
-DESCRIPTION="CD image containing guest additions for VirtualBox"
-HOMEPAGE="https://www.virtualbox.org/"
-SRC_URI="https://download.virtualbox.org/virtualbox/${PV}/${MY_P}.iso"
-S="${WORKDIR}"
-
-LICENSE="GPL-3 || ( GPL-3 CDDL )"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64"
-
-src_unpack() {
-	return 0
-}
-
-src_install() {
-	insinto /usr/share/${PN/-additions}
-	newins "${DISTDIR}"/${MY_P}.iso ${MY_PN}.iso
-}
diff --git a/app-emulation/virtualbox-extpack-oracle/Manifest b/app-emulation/virtualbox-extpack-oracle/Manifest
index afcd0cbd3565..007697650cb7 100644
--- a/app-emulation/virtualbox-extpack-oracle/Manifest
+++ b/app-emulation/virtualbox-extpack-oracle/Manifest
@@ -1,9 +1,5 @@
-DIST Oracle_VM_VirtualBox_Extension_Pack-6.1.42.tar.gz 11233419 BLAKE2B c380b83ae5e5cad91f83ad99805bd8627b3e1101840cc8bfcc352fdb44369ff73f7f9ae2503e3fb4aeeac2ce4182e69273a4758eb6c71dd60c89cfcadcc22cd1 SHA512 9b5643a37319113d7f9e93c49d88d7aef319060a7be4bdfb0f09044916f03a203ddeb6799b7d99c2c0f83faa7f610c72058649ef763af18f662781f8e0c10f83
 DIST Oracle_VM_VirtualBox_Extension_Pack-6.1.44.tar.gz 11233400 BLAKE2B 8e0046204956a86194f36a7e790956f1da8362f0c97e5c8c5f1c8965475255a42e1459a49004ebe0137124b23f7605200ef6a481169b684f7433803599982f35 SHA512 12b3cea7f3c54cf9f755bcc191d093ee2fd6a843626a2a5f8deb17bd0c1595492e16164bd5044795b9cc3ef6469d017ab575ca82269d76c7f5e47793313a0c3e
-DIST Oracle_VM_VirtualBox_Extension_Pack-7.0.6.tar.gz 18539414 BLAKE2B 5610d3a40a8e2c785821f2d38e498b4330db70700319fef056ced37cffc51492721bb7d796d94e94867f3c7c0680bdd27c2379938dd50f9de372a25b113fb5d1 SHA512 cc1c928bba49c4a851705036b81e7bd7a5e2348311eb80c6c880858d029db4df5e8720227292e1f8a168ca8be6e8479e3f5a02dc4d9800233e9b7623c602fe7c
 DIST Oracle_VM_VirtualBox_Extension_Pack-7.0.8.tar.gz 18678513 BLAKE2B b29edba975a71acbe2602221c7cc3ee349e4b530589568a879223edfa25137b7cb1e821b0273e1f622065d035b1832ce211df44d0832815482a3638e68475d8c SHA512 a128ebb9e318a7bfb0ff54902bc4e93cbdfbe4469921db30e45631ffc5c35c5f489a88efa1c1eb9fcc44abcbfc46bd0746b2f4a0c61f344a49b34890834d6e31
-EBUILD virtualbox-extpack-oracle-6.1.42.ebuild 742 BLAKE2B fa5331bfc4b311de2623b66c5379e1760a90f1b584bf42c8f53eaa7c7b46f51b2156ea4983e032eb70128ceba675f786410a5245157fc61402cb2b64f0948da6 SHA512 e6c936f477c19c6589844df4cb26a193d6b431ffcbc05379ab3b327f5f6a0096b5d48795fa34a675a2fea0929c40d2c7a4742717993fd5d9ab722b56def21266
 EBUILD virtualbox-extpack-oracle-6.1.44.ebuild 742 BLAKE2B fa5331bfc4b311de2623b66c5379e1760a90f1b584bf42c8f53eaa7c7b46f51b2156ea4983e032eb70128ceba675f786410a5245157fc61402cb2b64f0948da6 SHA512 e6c936f477c19c6589844df4cb26a193d6b431ffcbc05379ab3b327f5f6a0096b5d48795fa34a675a2fea0929c40d2c7a4742717993fd5d9ab722b56def21266
-EBUILD virtualbox-extpack-oracle-7.0.6.ebuild 742 BLAKE2B 9d21636185a31f656ec1ea779b7e5ebf475c39256b94541af1d8d32ecf0b33fc703d461054957441bb9b2e22a403a90fc7555acb06e06a798d4047da66d12ccc SHA512 75928ea546071159bddd68cd585d5821d8ceb179db21b5722cc68b7323181e600825117409e051399b86c2d1b7f471c7246dbbda74dbbc84aef351cf48fa1345
 EBUILD virtualbox-extpack-oracle-7.0.8.ebuild 742 BLAKE2B 9d21636185a31f656ec1ea779b7e5ebf475c39256b94541af1d8d32ecf0b33fc703d461054957441bb9b2e22a403a90fc7555acb06e06a798d4047da66d12ccc SHA512 75928ea546071159bddd68cd585d5821d8ceb179db21b5722cc68b7323181e600825117409e051399b86c2d1b7f471c7246dbbda74dbbc84aef351cf48fa1345
 MISC metadata.xml 255 BLAKE2B 9386ef3bdb55211441f303528b31f8ccd9ad9039744400e859574a424fa1f366a989fe78f5c10038f3dd9b06a6a389e4a7e643b3eac0dc93a79ac4cc3b4c5423 SHA512 6c158e12464285afd44b70d0653b65f65da1c523fc2b1b07eb6d2dec56f58234bb31cb9dc36238cd6dfc20031b4d58c04e7c1678cc9f917194403ad8a209513f
diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.1.42.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.1.42.ebuild
deleted file mode 100644
index 103374f36aab..000000000000
--- a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.1.42.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PV="$(ver_cut 1-3)"
-MY_PN="Oracle_VM_VirtualBox_Extension_Pack"
-MY_P="${MY_PN}-${MY_PV}"
-
-DESCRIPTION="PUEL extensions for VirtualBox"
-HOMEPAGE="https://www.virtualbox.org/"
-SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.vbox-extpack -> ${MY_P}.tar.gz"
-S="${WORKDIR}"
-
-LICENSE="PUEL-11"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64"
-RESTRICT="bindist mirror strip"
-
-RDEPEND=">=app-emulation/virtualbox-${MY_PV}"
-
-QA_PREBUILT="usr/lib*/virtualbox/ExtensionPacks/${MY_PN}/*"
-
-src_install() {
-	insinto /usr/$(get_libdir)/virtualbox/ExtensionPacks/${MY_PN}
-	doins -r linux.${ARCH}
-	doins ExtPack* PXE-Intel.rom
-}
diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-7.0.6.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-7.0.6.ebuild
deleted file mode 100644
index d7b777f8a797..000000000000
--- a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-7.0.6.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PV="$(ver_cut 1-3)"
-MY_PN="Oracle_VM_VirtualBox_Extension_Pack"
-MY_P="${MY_PN}-${MY_PV}"
-
-DESCRIPTION="PUEL extensions for VirtualBox"
-HOMEPAGE="https://www.virtualbox.org/"
-SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.vbox-extpack -> ${MY_P}.tar.gz"
-S="${WORKDIR}"
-
-LICENSE="PUEL-11"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64"
-RESTRICT="bindist mirror strip"
-
-RDEPEND="=app-emulation/virtualbox-${MY_PV}*"
-
-QA_PREBUILT="usr/lib*/virtualbox/ExtensionPacks/${MY_PN}/*"
-
-src_install() {
-	insinto /usr/$(get_libdir)/virtualbox/ExtensionPacks/${MY_PN}
-	doins -r linux.${ARCH}
-	doins ExtPack* PXE-Intel.rom
-}
diff --git a/app-emulation/virtualbox-guest-additions/Manifest b/app-emulation/virtualbox-guest-additions/Manifest
index 316841cb19de..6a34c1c9f7ef 100644
--- a/app-emulation/virtualbox-guest-additions/Manifest
+++ b/app-emulation/virtualbox-guest-additions/Manifest
@@ -7,14 +7,10 @@ AUX virtualbox-guest-additions-8.initd 538 BLAKE2B f720a0f9de10c5240f1ac8a590c4e
 AUX virtualbox-guest-additions-8.initd-r1 547 BLAKE2B 1b26fc26e95baa74d551f8a9cf62f698485d63a0487c4cc4fc9906b8ced191f078e2b794ef9db9488de9e92188c73812c16e37ff542f06e0d52a4dc62b631960 SHA512 81ccc8d3edd965feb55290cf1281a97a485f14fd1de07cd59479bd7746291d41abc45c2e7e209f17f7df057528be83c48f3e270b526e6b86d85c5ec4be2d3944
 AUX virtualbox-guest-additions.service 411 BLAKE2B f5f1c24a94764ca72a04879c27cd9fdc1e0c8a1440ac87674dad44a1493a9347e6e2b351ae2b71e050ba06ae9848168220d62981a9e0c984ea68bf48ea06b485 SHA512 b6226146f3591a778551e94ae2661e2ae3c6b761d20600d741eaaa03f43f0a2b841d2a44d9eec3a3768edb23b021cee94c7849d998ee4104ad60dad2df88df83
 AUX xorg.conf.vbox 274 BLAKE2B 3a3035fcbdbd5810c54505f5a5e6deefa1540e5e01a038babb62a40bd5b2de2dc5b228cabe55612d92a522e6ae92aa7ff4ff2ab26772c3b54ce95ebac4e7fc5a SHA512 ac2b14970dc6667ceec2dbdae52bc92cbad4aff020898ede156454e8a8a703354f15c7e19cfbd2bdd15e251493fd05cacfe814cabee0f9b4cf155e44860ed4c9
-DIST VirtualBox-6.1.42.tar.bz2 165554573 BLAKE2B 8419793d9e4c4d0804baba926443a27259b012ab90d1bb27c8f9d90b018ddbef83d1cc47e9f5b88e6e247f22c186603584a5ddee4b0c04fe842eba56f3fd103a SHA512 a4861b44ee85d6d1d72ba1d19b5598873503feeb6d562cf7d8c770cc9b466741bdfa5abe74dc4e7952ff189d14c6caf60f584731492c38f688a360baba019ab2
 DIST VirtualBox-6.1.44.tar.bz2 165775421 BLAKE2B e87d7175bc616784c79d02b595d81119cedc7f4df1822b71ca10b85d44d5cd1dacd999e7867a0bef8579ea715ef732b990cef63f3325fff0c139abe394d88ad7 SHA512 49c3baa1a40dcafcc6b31d0abcfecfcb24305de44e5efd3f68ba4443574e21b8cc34d7288e0fbc56730bc3be2bee07089b7dfed14848a88dc38a1433b6dda8af
-DIST VirtualBox-7.0.6.tar.bz2 199512172 BLAKE2B cfe4d7abd57dfdb0294177759e80aa9fda797b9b5433f214771a57764cb23404450169e8c7c30cda13de85b8e02a37024584c7b1f0b5a44b10b100aa66b8d5c5 SHA512 f9db7a154e392f550f50abe774fc6263eb0b6f86dccc069f2c5012fedbe2debbf5b8ba62cca44ea0d5d5475652188176bfb888266f69197677b22854f02b64a0
 DIST VirtualBox-7.0.8a.tar.bz2 199387757 BLAKE2B 0ba397825277ecbb851bd4ea94c85448e2966fd96ef8edcaf3102f8515553736d6ceee84c0647fa37443c1875256353fdd029d6c505aa99834079acb957b24a0 SHA512 fcbf907f6f7f2396ebff5a31af6ec00b38f09799380bac4847cc9044455832de058659edaa9f621b0054fa402bfacef1b5444498c9faeb3671d02da1505c952d
 DIST virtualbox-patches-6.1.36.tar.bz2 2733 BLAKE2B dcfebfeca4873d382441515d48b4dfee9343bc7c83ea3cbb5002dbf7975143a79fae9a701b67dc35505e9ca03ff1b6293cb7c3279c4fdfda8ad21ba5fb9b7e87 SHA512 1bed5cdefbf8e7c4b0d9092ba4961ecf2262f27f35c71a91ef6f2e8fe8a1d92ed74f06bafbf58d70ba7165d933997f58073f4d4f4051e3ba5c0339b729066f57
 DIST virtualbox-patches-7.0.8.tar.bz2 2733 BLAKE2B 044dfe02a5bd5e757091318b394b0e5918677b5bbce9caef4a18d4d8df54821559f0df6ffbdd6f52d4934bc4018e9c9d908571c5d3d8804fd3b0f22a7a1aed84 SHA512 93a06aa3f9508d3a8743ca8494a958159b5bc3fd7a0a08ff23414d05c4f31084cf0f1c82a3866e222c83e6996ba004546f0bd33c6eb9a90eec8e548b8b3f2fbf
-EBUILD virtualbox-guest-additions-6.1.42-r1.ebuild 7542 BLAKE2B 56d82883ea0c462e7c93f8753aba8964e5cf6d94cf4505ca7e90b7a35e00816b5d2d69ebc42fa38560dbb4df9430e6961c9aacc74ea4551b11d5a5f3c7e2ee72 SHA512 0112216e096e96a70b1405672c372dd317735bbf5f558556bc965ee02d2969b2a021ff1af808a7cfc9cbe1a2c349632ec24a30ffab96cb31e3a02d5e89c9ed4f
 EBUILD virtualbox-guest-additions-6.1.44.ebuild 8052 BLAKE2B c9016e7cf9d7203d42a6f4f04fb8ae0e148ee1897168af717f540621e9e773a3154193847bf40b9681f7857499ace96a28ead243d81ee2e151dda43ddd2c910e SHA512 aef00dc9471868ebaddb213f3376388ded2c703018fa28aa8ab8a1a06ce8339c4b0580b4a0fa7392016a2aba6ce4d9630a3d249e790b1764bd62c4e6e04ea884
-EBUILD virtualbox-guest-additions-7.0.6.ebuild 7868 BLAKE2B 5a75a2bda3ccd8640b5c87c2f108a7e330368144cb963920d5de9c8cd2ba6519da23cdf139aa85771636efeaa1507c272d559f8380674823b69ca57d600646ea SHA512 bcf48fe5b3f022d7b3727ed5e66a20263477760cbac8e79b67f985bd62387a6cdbe1ba7367702c01d79392bb4bb0f4979479f1fa0bec72efbc70273ebffe8fff
 EBUILD virtualbox-guest-additions-7.0.8-r1.ebuild 8561 BLAKE2B db90a5d48e39708d9e0ace1cd1d71140b1c57bef9d7512d6848404ee5c86d8af3ef004d3bd4617a9a2c43d5fcb994c19d2c48d1f68d2bba5cc0f83ca89d68b96 SHA512 57f48b19df665d1c1a36eff32d7a10dbdbcb76c0eeca710df6341e2b7851cf1f96ded9ca70ebb16d711b9b051e08b0df1ce59ec5485ddc51660b766e2d64b9d6
 MISC metadata.xml 255 BLAKE2B 9386ef3bdb55211441f303528b31f8ccd9ad9039744400e859574a424fa1f366a989fe78f5c10038f3dd9b06a6a389e4a7e643b3eac0dc93a79ac4cc3b4c5423 SHA512 6c158e12464285afd44b70d0653b65f65da1c523fc2b1b07eb6d2dec56f58234bb31cb9dc36238cd6dfc20031b4d58c04e7c1678cc9f917194403ad8a209513f
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.42-r1.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.42-r1.ebuild
deleted file mode 100644
index 62f724497153..000000000000
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.42-r1.ebuild
+++ /dev/null
@@ -1,283 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit edo linux-mod systemd toolchain-funcs udev
-
-MY_PN="VirtualBox"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="VirtualBox kernel modules and user-space tools for Gentoo guests"
-HOMEPAGE="https://www.virtualbox.org/"
-SRC_URI="https://download.virtualbox.org/virtualbox/${PV}/${MY_P}.tar.bz2
-	https://gitweb.gentoo.org/proj/virtualbox-patches.git/snapshot/virtualbox-patches-6.1.36.tar.bz2"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="GPL-2"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 x86"
-IUSE="X +dbus"
-
-# automount Error: VBoxServiceAutoMountWorker: Group "vboxsf" does not exist
-RDEPEND="
-	acct-group/vboxguest
-	acct-group/vboxsf
-	acct-user/vboxguest
-	sys-libs/pam
-	sys-libs/zlib
-	dbus? ( sys-apps/dbus )
-	X? (
-		x11-apps/xrandr
-		x11-apps/xrefresh
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXmu
-		x11-libs/libXt
-	)
-"
-DEPEND="
-	${RDEPEND}
-	X? (
-		x11-base/xorg-proto
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libXau
-		x11-libs/libXdmcp
-	)
-"
-BDEPEND="
-	>=dev-util/kbuild-0.1.9998.3127
-	<=dev-util/kbuild-0.1.9998.3500
-	>=dev-lang/yasm-0.6.2
-	sys-devel/bin86
-	sys-power/iasl
-"
-PDEPEND="
-	X? ( x11-drivers/xf86-video-vboxvideo )
-"
-
-BUILD_TARGETS="all"
-BUILD_TARGET_ARCH="${ARCH}"
-
-VBOX_MOD_SRC_DIR="${S}/out/linux.${ARCH}/release/bin/additions/src"
-MODULESD_VBOXSF_ALIASES=("fs-vboxsf vboxsf") # 485996
-
-pkg_setup() {
-	export DISTCC_DISABLE=1 #674256
-	MODULE_NAMES="vboxguest(misc:${VBOX_MOD_SRC_DIR}/vboxguest:${VBOX_MOD_SRC_DIR}/vboxguest)
-		vboxsf(misc:${VBOX_MOD_SRC_DIR}/vboxsf:${VBOX_MOD_SRC_DIR}/vboxsf)"
-	use X && MODULE_NAMES+=" vboxvideo(misc:${VBOX_MOD_SRC_DIR}/vboxvideo::${VBOX_MOD_SRC_DIR}/vboxvideo)"
-
-	linux-mod_pkg_setup
-}
-
-src_prepare() {
-	# Remove shipped binaries (kBuild,yasm), see bug #232775
-	rm -r kBuild/bin tools || die
-
-	# Provide kernel sources
-	pushd src/VBox/Additions &>/dev/null || die
-	ebegin "Extracting guest kernel module sources"
-	kmk GuestDrivers-src vboxguest-src vboxsf-src vboxvideo-src &>/dev/null
-	eend $? || die
-	popd &>/dev/null || die
-
-	# PaX fixes (see bug #298988)
-	pushd "${VBOX_MOD_SRC_DIR}" &>/dev/null || die
-	eapply "${FILESDIR}"/vboxguest-6.1.36-log-use-c99.patch
-	popd &>/dev/null || die
-
-	# Disable things unused or splitted into separate ebuilds
-	cp "${FILESDIR}/${PN}-5-localconfig" LocalConfig.kmk || die
-	use X || echo "VBOX_WITH_X11_ADDITIONS :=" >> LocalConfig.kmk
-
-	# Remove pointless GCC version check
-	sed -e '/^check_gcc$/d' -i configure || die
-
-	# Respect LDFLAGS (bug #759100)
-	sed -i -e '/TEMPLATE_VBOXR3EXE_LDFLAGS.linux[    ]*=/ s/$/ $(CCLDFLAGS)/' Config.kmk
-
-	eapply "${WORKDIR}/virtualbox-patches-6.1.36/patches"
-	eapply_user
-}
-
-src_configure() {
-	tc-export AR CC CXX LD RANLIB
-
-	# Build the user-space tools, warnings are harmless
-	local myconf=(
-		--with-gcc="$(tc-getCC)"
-		--with-g++="$(tc-getCXX)"
-
-		--nofatal
-		--disable-xpcom
-		--disable-sdl-ttf
-		--disable-pulse
-		--disable-alsa
-		$(usev !dbus --disable-dbus)
-		--target-arch=${ARCH}
-		--with-linux="${KV_OUT_DIR}"
-		--build-headless
-	)
-
-	# bug #843437
-	# Respect LDFLAGS (bug #759100)
-	# Cannot use LDFLAGS here because they also get passed to $(LD)
-	cat >> LocalConfig.kmk <<-EOF || die
-		CFLAGS=${CFLAGS}
-		CXXFLAGS=${CXXFLAGS}
-		CCLDFLAGS=${LDFLAGS}
-	EOF
-
-	edo ./configure "${myconf[@]}"
-}
-
-src_compile() {
-	source ./env.sh || die
-
-	# Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)
-	MAKEJOBS=$(grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS})
-	MAKELOAD=$(grep -Eo '(\-l|\-\-load-average)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS})
-	MAKEOPTS="${MAKEJOBS} ${MAKELOAD}"
-
-	local myemakeargs=(
-		VBOX_BUILD_PUBLISHER=_Gentoo
-		VBOX_ONLY_ADDITIONS=1
-
-		KBUILD_VERBOSE=2
-
-		AS="$(tc-getCC)"
-		CC="$(tc-getCC)"
-		CXX="$(tc-getCXX)"
-		LD="$(tc-getCC)"
-
-		TOOL_GCC3_CC="$(tc-getCC)"
-		TOOL_GCC3_CXX="$(tc-getCXX)"
-		TOOL_GCC3_LD="$(tc-getCC)"
-		TOOL_GCC3_AS="$(tc-getCC)"
-		TOOL_GCC3_AR="$(tc-getAR)"
-		TOOL_GCC3_OBJCOPY="$(tc-getOBJCOPY)"
-		#TOOL_GCC3_LD_SYSMOD="$(tc-getCC)"
-
-		TOOL_GXX3_CC="$(tc-getCC)"
-		TOOL_GXX3_CXX="$(tc-getCXX)"
-		TOOL_GXX3_LD="$(tc-getCXX)"
-		TOOL_GXX3_AS="$(tc-getCXX)"
-		TOOL_GXX3_AR="$(tc-getAR)"
-		TOOL_GXX3_OBJCOPY="$(tc-getOBJCOPY)"
-		#TOOL_GXX3_LD_SYSMOD="$(tc-getCXX)"
-
-		TOOL_GCC3_CFLAGS="${CFLAGS}"
-		TOOL_GCC3_CXXFLAGS="${CXXFLAGS}"
-		VBOX_GCC_OPT="${CXXFLAGS}"
-		VBOX_NM="$(tc-getNM)"
-		TOOL_YASM_AS=yasm
-	)
-
-	MAKE="kmk" emake "${myemakeargs[@]}"
-
-	# Now creating the kernel modules. We must do this _after_
-	# we compiled the user-space tools as we need two of the
-	# automatically generated header files. (>=3.2.0)
-	# Move this here for bug 836037
-	BUILD_PARAMS="KERN_DIR=/lib/modules/${KV_FULL}/build KERNOUT=${KV_OUT_DIR} KBUILD_EXTRA_SYMBOLS=${S}/Module.symvers"
-	linux-mod_src_compile
-}
-
-src_install() {
-	linux-mod_src_install
-
-	cd "${S}"/out/linux.${ARCH}/release/bin/additions || die
-
-	insinto /sbin
-	newins mount.vboxsf mount.vboxsf
-	fperms 4755 /sbin/mount.vboxsf
-
-	if use dbus; then
-		newinitd "${FILESDIR}"/${PN}-8.initd-r1 ${PN}
-	else
-		newinitd <(sed 's/ dbus\>//' "${FILESDIR}"/${PN}-8.initd-r1) ${PN}
-	fi
-
-	insinto /usr/sbin/
-	newins VBoxService vboxguest-service
-	fperms 0755 /usr/sbin/vboxguest-service
-
-	insinto /usr/bin
-	doins VBoxControl
-	fperms 0755 /usr/bin/VBoxControl
-
-	# VBoxClient user service and xrandr wrapper
-	if use X ; then
-		doins VBoxClient
-		fperms 0755 /usr/bin/VBoxClient
-		doins VBoxDRMClient
-		fperms 4755 /usr/bin/VBoxDRMClient
-
-		pushd "${S}"/src/VBox/Additions/x11/Installer &>/dev/null || die
-		newins 98vboxadd-xclient VBoxClient-all
-		fperms 0755 /usr/bin/VBoxClient-all
-		popd &>/dev/null || die
-	fi
-
-	# udev rule for vboxdrv
-	local udev_rules_dir="/lib/udev/rules.d"
-	dodir ${udev_rules_dir}
-	echo 'KERNEL=="vboxguest", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
-		>> "${ED}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \
-		|| die
-	echo 'KERNEL=="vboxuser", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
-		>> "${ED}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \
-		|| die
-
-	# VBoxClient autostart file
-	insinto /etc/xdg/autostart
-	doins "${FILESDIR}"/vboxclient.desktop
-
-	# sample xorg.conf
-	dodoc "${FILESDIR}"/xorg.conf.vbox
-	docompress -x "${ED}"/usr/share/doc/${PF}/xorg.conf.vbox
-
-	systemd_dounit "${FILESDIR}/${PN}.service"
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-	udev_reload
-	if ! use X ; then
-		elog "use flag X is off, enable it to install the"
-		elog "X Window System video driver."
-	fi
-	elog ""
-	elog "Please add users to the \"vboxguest\" group so they can"
-	elog "benefit from seamless mode, auto-resize and clipboard."
-	elog ""
-	elog "The vboxsf group has been added to make automount services work."
-	elog "These services are part of the shared folders support."
-	elog ""
-	elog "Please add:"
-	elog "/etc/init.d/${PN}"
-	elog "to the default runlevel in order to start"
-	elog "needed services."
-	elog "To use the VirtualBox X driver, use the following"
-	elog "file as your /etc/X11/xorg.conf:"
-	elog "    /usr/share/doc/${PF}/xorg.conf.vbox"
-	elog ""
-	elog "An autostart .desktop file has been installed to start"
-	elog "VBoxClient in desktop sessions."
-	elog ""
-	elog "You can mount shared folders with:"
-	elog "    mount -t vboxsf <shared_folder_name> <mount_point>"
-	elog ""
-	elog "Warning:"
-	elog "this ebuild is only needed if you are running gentoo"
-	elog "inside a VirtualBox Virtual Machine, you don't need"
-	elog "it to run VirtualBox itself."
-	elog ""
-}
-
-pkg_postrm() {
-	linux-mod_pkg_postrm
-	udev_reload
-}
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-7.0.6.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-7.0.6.ebuild
deleted file mode 100644
index b9e1f7b35839..000000000000
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-7.0.6.ebuild
+++ /dev/null
@@ -1,289 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit edo linux-mod systemd toolchain-funcs udev
-
-MY_PN="VirtualBox"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="VirtualBox kernel modules and user-space tools for Gentoo guests"
-HOMEPAGE="https://www.virtualbox.org/"
-SRC_URI="https://download.virtualbox.org/virtualbox/${PV}/${MY_P}.tar.bz2
-	https://gitweb.gentoo.org/proj/virtualbox-patches.git/snapshot/virtualbox-patches-6.1.36.tar.bz2"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-# Reminder: see the LICENSE related comment in app-emulation/virtualbox-additions ebuild
-LICENSE="GPL-3 LGPL-2.1+ MIT || ( GPL-3 CDDL )"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 x86"
-IUSE="+dbus gui"
-
-# automount Error: VBoxServiceAutoMountWorker: Group "vboxsf" does not exist
-# TODO: find out what this is, remove comment if obsolete
-
-RDEPEND="
-	acct-group/vboxguest
-	acct-group/vboxsf
-	acct-user/vboxguest
-	sys-libs/pam
-	sys-libs/zlib
-	dbus? ( sys-apps/dbus )
-	gui? (
-		x11-apps/xrandr
-		x11-apps/xrefresh
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXmu
-		x11-libs/libXt
-	)
-"
-# some libs here are indirect dependencies, and also needed at compile time.
-# keeping them in DEPEND to avoid warnings from qa-vdb.
-DEPEND="
-	${RDEPEND}
-	gui? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libXau
-		x11-libs/libXdmcp
-		x11-base/xorg-proto
-	)
-"
-BDEPEND="
-	>=dev-lang/yasm-0.6.2
-	>=dev-util/kbuild-0.1.9998.3127
-	sys-devel/bin86
-	sys-power/iasl
-"
-PDEPEND="
-	gui? ( x11-drivers/xf86-video-vboxvideo )
-"
-
-BUILD_TARGETS="all"
-BUILD_TARGET_ARCH="${ARCH}"
-
-VBOX_MOD_SRC_DIR="${S}/out/linux.${ARCH}/release/bin/additions/src"
-MODULESD_VBOXSF_ALIASES=("fs-vboxsf vboxsf") # 485996
-
-pkg_setup() {
-	export DISTCC_DISABLE=1 #674256
-	MODULE_NAMES="vboxguest(misc:${VBOX_MOD_SRC_DIR}/vboxguest:${VBOX_MOD_SRC_DIR}/vboxguest)
-		vboxsf(misc:${VBOX_MOD_SRC_DIR}/vboxsf:${VBOX_MOD_SRC_DIR}/vboxsf)"
-	use gui && MODULE_NAMES+=" vboxvideo(misc:${VBOX_MOD_SRC_DIR}/vboxvideo::${VBOX_MOD_SRC_DIR}/vboxvideo)"
-
-	linux-mod_pkg_setup
-}
-
-src_prepare() {
-	# Remove shipped binaries (kBuild,yasm), see bug #232775
-	rm -r kBuild/bin tools || die
-
-	# Provide kernel sources
-	pushd src/VBox/Additions &>/dev/null || die
-	ebegin "Extracting guest kernel module sources"
-	kmk GuestDrivers-src vboxguest-src vboxsf-src vboxvideo-src &>/dev/null
-	eend $? || die
-	popd &>/dev/null || die
-
-	# PaX fixes (see bug #298988)
-	pushd "${VBOX_MOD_SRC_DIR}" &>/dev/null || die
-	eapply "${FILESDIR}"/vboxguest-6.1.36-log-use-c99.patch
-	popd &>/dev/null || die
-
-	# Disable things unused or splitted into separate ebuilds
-	cp "${FILESDIR}/${PN}-5-localconfig" LocalConfig.kmk || die
-	if ! use gui; then
-		echo "VBOX_WITH_X11_ADDITIONS :=" >> LocalConfig.kmk || die
-	fi
-
-	# Remove pointless GCC version check
-	sed -e '/^check_gcc$/d' -i configure || die
-
-	# Respect LDFLAGS (bug #759100)
-	sed -i -e '/TEMPLATE_VBOXR3EXE_LDFLAGS.linux[    ]*=/ s/$/ $(CCLDFLAGS)/' Config.kmk || die
-
-	eapply "${WORKDIR}/virtualbox-patches-6.1.36/patches"
-	eapply_user
-}
-
-src_configure() {
-	tc-export AR CC CXX LD RANLIB
-
-	# Build the user-space tools, warnings are harmless
-	local myconf=(
-		--with-gcc="$(tc-getCC)"
-		--with-g++="$(tc-getCXX)"
-
-		--nofatal
-		--disable-xpcom
-		--disable-sdl-ttf
-		--disable-pulse
-		--disable-alsa
-		$(usev !dbus --disable-dbus)
-		--target-arch=${ARCH}
-		--with-linux="${KV_OUT_DIR}"
-		--build-headless
-	)
-
-	# bug #843437
-	# Respect LDFLAGS (bug #759100)
-	# Cannot use LDFLAGS here because they also get passed to $(LD)
-	cat >> LocalConfig.kmk <<-EOF || die
-		CFLAGS=${CFLAGS}
-		CXXFLAGS=${CXXFLAGS}
-		CCLDFLAGS=${LDFLAGS}
-	EOF
-
-	edo ./configure "${myconf[@]}"
-}
-
-src_compile() {
-	source ./env.sh || die
-
-	# Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)
-	MAKEJOBS=$(grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS})
-	MAKELOAD=$(grep -Eo '(\-l|\-\-load-average)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS})
-	MAKEOPTS="${MAKEJOBS} ${MAKELOAD}"
-
-	local myemakeargs=(
-		VBOX_BUILD_PUBLISHER=_Gentoo
-		VBOX_ONLY_ADDITIONS=1
-
-		KBUILD_VERBOSE=2
-
-		AS="$(tc-getCC)"
-		CC="$(tc-getCC)"
-		CXX="$(tc-getCXX)"
-		LD="$(tc-getCC)"
-
-		TOOL_GCC3_CC="$(tc-getCC)"
-		TOOL_GCC3_CXX="$(tc-getCXX)"
-		TOOL_GCC3_LD="$(tc-getCC)"
-		TOOL_GCC3_AS="$(tc-getCC)"
-		TOOL_GCC3_AR="$(tc-getAR)"
-		TOOL_GCC3_OBJCOPY="$(tc-getOBJCOPY)"
-		#TOOL_GCC3_LD_SYSMOD="$(tc-getCC)"
-
-		TOOL_GXX3_CC="$(tc-getCC)"
-		TOOL_GXX3_CXX="$(tc-getCXX)"
-		TOOL_GXX3_LD="$(tc-getCXX)"
-		TOOL_GXX3_AS="$(tc-getCXX)"
-		TOOL_GXX3_AR="$(tc-getAR)"
-		TOOL_GXX3_OBJCOPY="$(tc-getOBJCOPY)"
-		#TOOL_GXX3_LD_SYSMOD="$(tc-getCXX)"
-
-		TOOL_GCC3_CFLAGS="${CFLAGS}"
-		TOOL_GCC3_CXXFLAGS="${CXXFLAGS}"
-		VBOX_GCC_OPT="${CXXFLAGS}"
-		VBOX_NM="$(tc-getNM)"
-		TOOL_YASM_AS=yasm
-	)
-
-	MAKE="kmk" emake "${myemakeargs[@]}"
-
-	# Now creating the kernel modules. We must do this _after_
-	# we compiled the user-space tools as we need two of the
-	# automatically generated header files. (>=3.2.0)
-	# Move this here for bug 836037
-	BUILD_PARAMS="KERN_DIR=/lib/modules/${KV_FULL}/build KERNOUT=${KV_OUT_DIR} KBUILD_EXTRA_SYMBOLS=${S}/Module.symvers"
-	linux-mod_src_compile
-}
-
-src_install() {
-	linux-mod_src_install
-
-	cd "${S}"/out/linux.${ARCH}/release/bin/additions || die
-
-	insinto /sbin
-	newins mount.vboxsf mount.vboxsf
-	fperms 4755 /sbin/mount.vboxsf
-
-	if use dbus; then
-		newinitd "${FILESDIR}"/${PN}-8.initd-r1 ${PN}
-	else
-		newinitd <(sed 's/ dbus\>//' "${FILESDIR}"/${PN}-8.initd-r1) ${PN}
-	fi
-
-	insinto /usr/sbin/
-	newins VBoxService vboxguest-service
-	fperms 0755 /usr/sbin/vboxguest-service
-
-	insinto /usr/bin
-	doins VBoxControl
-	fperms 0755 /usr/bin/VBoxControl
-
-	# VBoxClient user service and xrandr wrapper
-	if use gui ; then
-		doins VBoxClient
-		fperms 0755 /usr/bin/VBoxClient
-		doins VBoxDRMClient
-		fperms 4755 /usr/bin/VBoxDRMClient
-
-		pushd "${S}"/src/VBox/Additions/x11/Installer &>/dev/null || die
-		newins 98vboxadd-xclient VBoxClient-all
-		fperms 0755 /usr/bin/VBoxClient-all
-		popd &>/dev/null || die
-	fi
-
-	# udev rule for vboxdrv
-	local udev_rules_dir="/lib/udev/rules.d"
-	dodir ${udev_rules_dir}
-	echo 'KERNEL=="vboxguest", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
-		>> "${ED}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \
-		|| die
-	echo 'KERNEL=="vboxuser", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
-		>> "${ED}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \
-		|| die
-
-	# VBoxClient autostart file
-	insinto /etc/xdg/autostart
-	doins "${FILESDIR}"/vboxclient.desktop
-
-	# sample xorg.conf
-	dodoc "${FILESDIR}"/xorg.conf.vbox
-	docompress -x "${ED}"/usr/share/doc/${PF}/xorg.conf.vbox
-
-	systemd_dounit "${FILESDIR}/${PN}.service"
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-	udev_reload
-	if ! use gui ; then
-		elog "use flag gui is off, enable it to install the"
-		elog "X Window System video driver."
-	fi
-	elog ""
-	elog "Please add users to the \"vboxguest\" group so they can"
-	elog "benefit from seamless mode, auto-resize and clipboard."
-	elog ""
-	elog "The vboxsf group has been added to make automount services work."
-	elog "These services are part of the shared folders support."
-	elog ""
-	elog "Please add:"
-	elog "/etc/init.d/${PN}"
-	elog "to the default runlevel in order to start"
-	elog "needed services."
-	elog "To use the VirtualBox X driver, use the following"
-	elog "file as your /etc/X11/xorg.conf:"
-	elog "    /usr/share/doc/${PF}/xorg.conf.vbox"
-	elog ""
-	elog "An autostart .desktop file has been installed to start"
-	elog "VBoxClient in desktop sessions."
-	elog ""
-	elog "You can mount shared folders with:"
-	elog "    mount -t vboxsf <shared_folder_name> <mount_point>"
-	elog ""
-	elog "Warning:"
-	elog "this ebuild is only needed if you are running gentoo"
-	elog "inside a VirtualBox Virtual Machine, you don't need"
-	elog "it to run VirtualBox itself."
-	elog ""
-}
-
-pkg_postrm() {
-	linux-mod_pkg_postrm
-	udev_reload
-}
diff --git a/app-emulation/virtualbox-modules/Manifest b/app-emulation/virtualbox-modules/Manifest
index 48c7d417013b..a122af534fa2 100644
--- a/app-emulation/virtualbox-modules/Manifest
+++ b/app-emulation/virtualbox-modules/Manifest
@@ -1,14 +1,8 @@
 AUX create_vbox_modules_tarball.sh 896 BLAKE2B 4153a8fa67cd8fe7187f3c4232691b1ded8e51315f41292f9fcc0adb294e9b235b0c2f1e91f6f728076ab85f687ea1ba2877dc44b511eaceb24e7d6e71a8bbd4 SHA512 c3154a13550817c581fa142e24081edfbdbc145315d34cc4569d12ad87a518fa0bf1443c053b50fdfdea6915bda1325ad973455ee85079294b83a49fd53f4771
 AUX virtualbox-modules-7.0.6-kernel-6.3.patch 1064 BLAKE2B cfdd3779ec7349c4fe9a13f9954dd1bce7ec98f76a6695c9b1e68e7939bdbd6251cd87fad15ad179effd4318722220cf4458495fe80229e3e3f986e9186c9be7 SHA512 b03845d549d3a2a4cf71eb24b723bb4ba401e08208ea9f3e02c1513afe1fe7a8ea75e9d2e051fc23cf183ee389fe661c4fa077bf10d15ba528109434b64b1875
 AUX virtualbox.conf-r1 30 BLAKE2B 6308dedc75e2677cbdc844b53f51359e6b5745d3510636b04d08512122aeb6db81a1a18af156a8b9acccad395d390b24f9c27ed47413382cb6101266762de230 SHA512 5c6d31f527ca2db8d7fbeea759ac328eff42803d7940fd81ef12af22eb09f8913a0e561c35db1963e2a8b398ee288692817b5c8f3d439f2a6fd381769ec2ac8a
-DIST vbox-kernel-module-src-6.1.42.tar.xz 679052 BLAKE2B d89324cee9cfc71e2762f5d2b7dfff33297b0d2eab5714ad9ddcfb762b1263ca17acbe5fdffe53170936fe0a0faffbc69989b62cdcc0b979f394fcff35f5b69c SHA512 3bb363c8f163b5958edc11c971122c35977275c0995eab832262277720c7486150939d50a0640170fa7a5cd32c1dc2918c5e3430ec90a836400d0a774b48d886
 DIST vbox-kernel-module-src-6.1.44.tar.xz 678920 BLAKE2B d18bd899205b1baa476b6a17b29c8f210238ddcf5949dd5f7b73e06854c85a816422b8f24045d3d0c1adb3cf1fcadbe089e61c2b9764262a14b04b2beaede8be SHA512 a682c94e61ad1c6090223348522123ee7ba87cdd69aaa0bc09a268068bebc2f9d7c8a156c52d82237999f26664790dddb1c8aca72ac4b5ba2133e35086f6516c
-DIST vbox-kernel-module-src-7.0.6.tar.xz 718156 BLAKE2B 9f855482c77b14e233ed247f7d94df7c23a00e0f9fca27926921f8c18fa6ab2205075f1b9be61429cfbee325d5f22805c850c0c79fd4fa9ccf7668dcb714f345 SHA512 fca794fd36203b296ce14d7d06022360bb9d94a6e06d8d9c77cc0221f63a898b6482b423e7deb6bd7b0355ee98fc3c7bbe11c9a1fa5dcf1d634eebc4fe537dc3
 DIST vbox-kernel-module-src-7.0.8.tar.xz 718032 BLAKE2B f8993f6668d12f6bb6a4ab81376e02b11f806012e9ef101ab7d1cbe17004ce34c9214691e1047aa0b5a82b25b91521b9c9ab20a8b7638136cc64e44f1dda89e6 SHA512 5f56a94cdac2490a2dfea3f006f7fb0229e7467d7a71029063c200d42dbf4fbeb65d3d0612f862c5c303f8cd5b60a9ab58dc7a8f593f128e7e6b3f89c53eaefc
-EBUILD virtualbox-modules-6.1.42-r1.ebuild 1932 BLAKE2B c850dc5b405aaf949124981f0a4a93209ba04b6e932fe8f69bde275c515685e7d9a35b3e83be8b192b4dfdb573b8e5a2f1ef3188248a1fa8157508ea3ae2dee1 SHA512 489c31a7c353fe14e2ca5e8dbf76ad9252615083cd7e95d92a98ce801c16815d2332d7157b97290ad94eb3c05900b8771403a24220c54b9dc230364fd6417c16
-EBUILD virtualbox-modules-6.1.42.ebuild 1861 BLAKE2B 2a4bb02e3b4ac8627c1683a728546506b709d68cfa0e3aa8a5f957801ee88c9412639b570a38197727146d1826e322c219a95d94c8bdfedc987c524b25ea6056 SHA512 4f382baa17e4a514fdad4094cfdd8abac5f3891d8cd344c895693d1af97a036daf6102264d0563184d8d72f601f50ca1dcf8ef151a0939da3448f874a6d75ea2
 EBUILD virtualbox-modules-6.1.44.ebuild 2452 BLAKE2B ac3c57ed8b03807848cb1b5d6e1c7e096e75ed6d002086aa4b07fbb33ad45b79efbd5e1d1592880550b8280eb0302272e1835071adf786ff4dd6ee79b60b65b8 SHA512 291bc97f33f713f0ab3136736f390a2bee33458313d7c23b20254dceaa74e5087dfa2c81c43296f6ff237de7ab193318f0282752c46ff403c12ee40919164d00
-EBUILD virtualbox-modules-7.0.6-r1.ebuild 1932 BLAKE2B fdfba91492faf7d72d05a272cbd47666e791eacca1d08d32096bf69ca5865694ee010a23070b0170eba11762f9642146615bd1130e1be8b378c36e0835c44c2c SHA512 1d0411915cb264827c49d02dc83d10fb9cc44dfbe7eb82f2982db761b8805d9f5ff56d2d5fb9dd0ce469eebc3ec026b39dd39fbebac31a3aeab497a1866b8664
-EBUILD virtualbox-modules-7.0.6.ebuild 1861 BLAKE2B f85afbdf42f018df9d567b5a6630b9b62745a78a116c7ce43db8b1bceab22bc481f58a5ba77225781eef1d3cf7e8d81c6829142917c3346044a3f59d36fabefa SHA512 a132c018784f1b16fac18257f4e33f68bf919c3d7cf3792aac18173a7cf01cd0efea2ddfba9a292f567ae62a39b4a35d95bd6d8fdb49970f1be74e51e2ad2bfb
 EBUILD virtualbox-modules-7.0.8.ebuild 2452 BLAKE2B a6450dbe26b3b841b6e5842f937ec5942c8dad219560c77e9e5fde28e44fadd3a3b60af9b43523148edcb2166eab584d1f2db0dfe0fccff3316f689e8705d211 SHA512 600466e3edf5bddc799b8a0f01b8873acfc855a5468c7c8c95969181db8483a170ced08d071169047fa38cd91452c7ac615c2a30855434750129825bd4e89e5d
 MISC metadata.xml 255 BLAKE2B 9386ef3bdb55211441f303528b31f8ccd9ad9039744400e859574a424fa1f366a989fe78f5c10038f3dd9b06a6a389e4a7e643b3eac0dc93a79ac4cc3b4c5423 SHA512 6c158e12464285afd44b70d0653b65f65da1c523fc2b1b07eb6d2dec56f58234bb31cb9dc36238cd6dfc20031b4d58c04e7c1678cc9f917194403ad8a209513f
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-6.1.42-r1.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-6.1.42-r1.ebuild
deleted file mode 100644
index 3258677a03ed..000000000000
--- a/app-emulation/virtualbox-modules/virtualbox-modules-6.1.42-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# XXX: the tarball here is just the kernel modules split out of the binary
-#      package that comes from VirtualBox-*.run
-# XXX: update: now it is split from virtualbox-*-Debian~bullseye_amd64.deb
-
-EAPI=8
-
-inherit linux-mod toolchain-funcs
-
-MY_P="vbox-kernel-module-src-${PV}"
-DESCRIPTION="Kernel Modules for Virtualbox"
-HOMEPAGE="https://www.virtualbox.org/"
-SRC_URI="https://dev.gentoo.org/~ceamac/${CATEGORY}/${PN}/${MY_P}.tar.xz"
-S="${WORKDIR}"
-
-LICENSE="GPL-2"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64"
-
-BUILD_TARGETS="all"
-MODULE_NAMES="vboxdrv(misc:${S}) vboxnetflt(misc:${S}) vboxnetadp(misc:${S})"
-MODULESD_VBOXDRV_ENABLED="yes"
-MODULESD_VBOXNETADP_ENABLED="no"
-MODULESD_VBOXNETFLT_ENABLED="no"
-
-PATCHES=(
-	"${FILESDIR}"/virtualbox-modules-7.0.6-kernel-6.3.patch
-)
-
-pkg_setup() {
-	linux-mod_pkg_setup
-	BUILD_PARAMS="CC=\"$(tc-getBUILD_CC)\" KERN_DIR=${KV_DIR} KERN_VER=${KV_FULL} O=${KV_OUT_DIR} V=1 KBUILD_VERBOSE=1"
-	if linux_chkconfig_present CC_IS_CLANG; then
-		ewarn "Warning: building ${PN} with a clang-built kernel is experimental."
-
-		BUILD_PARAMS+=' CC=${CHOST}-clang'
-		if linux_chkconfig_present LD_IS_LLD; then
-			BUILD_PARAMS+=' LD=ld.lld'
-			if linux_chkconfig_present LTO_CLANG_THIN; then
-				# kernel enables cache by default leading to sandbox violations
-				BUILD_PARAMS+=' ldflags-y=--thinlto-cache-dir= LDFLAGS_MODULE=--thinlto-cache-dir='
-			fi
-		fi
-	fi
-}
-
-src_install() {
-	linux-mod_src_install
-	insinto /usr/lib/modules-load.d/
-	newins "${FILESDIR}"/virtualbox.conf-r1 virtualbox.conf
-}
-
-pkg_postinst() {
-	# Remove vboxpci.ko from current running kernel
-	# This module is obsolete, removed in december 2019, so it may be missing.  No || die
-	# TODO: consider removing this line in the near future
-	find /lib/modules/${KV_FULL}/misc -type f -name "vboxpci.ko" -delete
-	linux-mod_pkg_postinst
-}
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-6.1.42.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-6.1.42.ebuild
deleted file mode 100644
index a941937c4147..000000000000
--- a/app-emulation/virtualbox-modules/virtualbox-modules-6.1.42.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# XXX: the tarball here is just the kernel modules split out of the binary
-#      package that comes from VirtualBox-*.run
-# XXX: update: now it is split from virtualbox-*-Debian~bullseye_amd64.deb
-
-EAPI=8
-
-inherit linux-mod toolchain-funcs
-
-MY_P="vbox-kernel-module-src-${PV}"
-DESCRIPTION="Kernel Modules for Virtualbox"
-HOMEPAGE="https://www.virtualbox.org/"
-SRC_URI="https://dev.gentoo.org/~ceamac/${CATEGORY}/${PN}/${MY_P}.tar.xz"
-S="${WORKDIR}"
-
-LICENSE="GPL-2"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64"
-
-BUILD_TARGETS="all"
-MODULE_NAMES="vboxdrv(misc:${S}) vboxnetflt(misc:${S}) vboxnetadp(misc:${S})"
-MODULESD_VBOXDRV_ENABLED="yes"
-MODULESD_VBOXNETADP_ENABLED="no"
-MODULESD_VBOXNETFLT_ENABLED="no"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-	BUILD_PARAMS="CC=\"$(tc-getBUILD_CC)\" KERN_DIR=${KV_DIR} KERN_VER=${KV_FULL} O=${KV_OUT_DIR} V=1 KBUILD_VERBOSE=1"
-	if linux_chkconfig_present CC_IS_CLANG; then
-		ewarn "Warning: building ${PN} with a clang-built kernel is experimental."
-
-		BUILD_PARAMS+=' CC=${CHOST}-clang'
-		if linux_chkconfig_present LD_IS_LLD; then
-			BUILD_PARAMS+=' LD=ld.lld'
-			if linux_chkconfig_present LTO_CLANG_THIN; then
-				# kernel enables cache by default leading to sandbox violations
-				BUILD_PARAMS+=' ldflags-y=--thinlto-cache-dir= LDFLAGS_MODULE=--thinlto-cache-dir='
-			fi
-		fi
-	fi
-}
-
-src_install() {
-	linux-mod_src_install
-	insinto /usr/lib/modules-load.d/
-	newins "${FILESDIR}"/virtualbox.conf-r1 virtualbox.conf
-}
-
-pkg_postinst() {
-	# Remove vboxpci.ko from current running kernel
-	# This module is obsolete, removed in december 2019, so it may be missing.  No || die
-	# TODO: consider removing this line in the near future
-	find /lib/modules/${KV_FULL}/misc -type f -name "vboxpci.ko" -delete
-	linux-mod_pkg_postinst
-}
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-7.0.6-r1.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-7.0.6-r1.ebuild
deleted file mode 100644
index e4544d662bf5..000000000000
--- a/app-emulation/virtualbox-modules/virtualbox-modules-7.0.6-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# XXX: the tarball here is just the kernel modules split out of the binary
-#      package that comes from VirtualBox-*.run
-# XXX: update: now it is split from virtualbox-*-Debian~bullseye_amd64.deb
-
-EAPI=8
-
-inherit linux-mod toolchain-funcs
-
-MY_P="vbox-kernel-module-src-${PV}"
-DESCRIPTION="Kernel Modules for Virtualbox"
-HOMEPAGE="https://www.virtualbox.org/"
-SRC_URI="https://dev.gentoo.org/~ceamac/${CATEGORY}/${PN}/${MY_P}.tar.xz"
-S="${WORKDIR}"
-
-LICENSE="GPL-3"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64"
-
-BUILD_TARGETS="all"
-MODULE_NAMES="vboxdrv(misc:${S}) vboxnetflt(misc:${S}) vboxnetadp(misc:${S})"
-MODULESD_VBOXDRV_ENABLED="yes"
-MODULESD_VBOXNETADP_ENABLED="no"
-MODULESD_VBOXNETFLT_ENABLED="no"
-
-PATCHES=(
-	"${FILESDIR}"/virtualbox-modules-7.0.6-kernel-6.3.patch
-)
-
-pkg_setup() {
-	linux-mod_pkg_setup
-	BUILD_PARAMS="CC=\"$(tc-getBUILD_CC)\" KERN_DIR=${KV_DIR} KERN_VER=${KV_FULL} O=${KV_OUT_DIR} V=1 KBUILD_VERBOSE=1"
-	if linux_chkconfig_present CC_IS_CLANG; then
-		ewarn "Warning: building ${PN} with a clang-built kernel is experimental."
-
-		BUILD_PARAMS+=' CC=${CHOST}-clang'
-		if linux_chkconfig_present LD_IS_LLD; then
-			BUILD_PARAMS+=' LD=ld.lld'
-			if linux_chkconfig_present LTO_CLANG_THIN; then
-				# kernel enables cache by default leading to sandbox violations
-				BUILD_PARAMS+=' ldflags-y=--thinlto-cache-dir= LDFLAGS_MODULE=--thinlto-cache-dir='
-			fi
-		fi
-	fi
-}
-
-src_install() {
-	linux-mod_src_install
-	insinto /usr/lib/modules-load.d/
-	newins "${FILESDIR}"/virtualbox.conf-r1 virtualbox.conf
-}
-
-pkg_postinst() {
-	# Remove vboxpci.ko from current running kernel
-	# This module is obsolete, removed in december 2019, so it may be missing.  No || die
-	# TODO: consider removing this line in the near future
-	find /lib/modules/${KV_FULL}/misc -type f -name "vboxpci.ko" -delete
-	linux-mod_pkg_postinst
-}
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-7.0.6.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-7.0.6.ebuild
deleted file mode 100644
index 59bc05a4e263..000000000000
--- a/app-emulation/virtualbox-modules/virtualbox-modules-7.0.6.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# XXX: the tarball here is just the kernel modules split out of the binary
-#      package that comes from VirtualBox-*.run
-# XXX: update: now it is split from virtualbox-*-Debian~bullseye_amd64.deb
-
-EAPI=8
-
-inherit linux-mod toolchain-funcs
-
-MY_P="vbox-kernel-module-src-${PV}"
-DESCRIPTION="Kernel Modules for Virtualbox"
-HOMEPAGE="https://www.virtualbox.org/"
-SRC_URI="https://dev.gentoo.org/~ceamac/${CATEGORY}/${PN}/${MY_P}.tar.xz"
-S="${WORKDIR}"
-
-LICENSE="GPL-3"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64"
-
-BUILD_TARGETS="all"
-MODULE_NAMES="vboxdrv(misc:${S}) vboxnetflt(misc:${S}) vboxnetadp(misc:${S})"
-MODULESD_VBOXDRV_ENABLED="yes"
-MODULESD_VBOXNETADP_ENABLED="no"
-MODULESD_VBOXNETFLT_ENABLED="no"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-	BUILD_PARAMS="CC=\"$(tc-getBUILD_CC)\" KERN_DIR=${KV_DIR} KERN_VER=${KV_FULL} O=${KV_OUT_DIR} V=1 KBUILD_VERBOSE=1"
-	if linux_chkconfig_present CC_IS_CLANG; then
-		ewarn "Warning: building ${PN} with a clang-built kernel is experimental."
-
-		BUILD_PARAMS+=' CC=${CHOST}-clang'
-		if linux_chkconfig_present LD_IS_LLD; then
-			BUILD_PARAMS+=' LD=ld.lld'
-			if linux_chkconfig_present LTO_CLANG_THIN; then
-				# kernel enables cache by default leading to sandbox violations
-				BUILD_PARAMS+=' ldflags-y=--thinlto-cache-dir= LDFLAGS_MODULE=--thinlto-cache-dir='
-			fi
-		fi
-	fi
-}
-
-src_install() {
-	linux-mod_src_install
-	insinto /usr/lib/modules-load.d/
-	newins "${FILESDIR}"/virtualbox.conf-r1 virtualbox.conf
-}
-
-pkg_postinst() {
-	# Remove vboxpci.ko from current running kernel
-	# This module is obsolete, removed in december 2019, so it may be missing.  No || die
-	# TODO: consider removing this line in the near future
-	find /lib/modules/${KV_FULL}/misc -type f -name "vboxpci.ko" -delete
-	linux-mod_pkg_postinst
-}
diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest
index 7316f856611b..dd17b58b8f50 100644
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@@ -9,8 +9,6 @@ AUX virtualbox-6.1.34-r3-python.patch 343 BLAKE2B 6eb68ba31ab57a1f2065a7d48ef751
 AUX virtualbox-6.1.36-fcf-protection.patch 374 BLAKE2B 6c7410ce1fa78aa7476c9b9a6f519c80957b3c7d55569f2ac02d3642d29574b9f8ed4b1c043cf14a899ff3cc67d7f7442bdd1ce27079b987783c36f38b39b49a SHA512 eb1f5d4ef64ea3306ae0489b3c7019a98e6f00c8a62ec8414c78bc8c14ab654ddae57c579557511e4144bf367ad3a2ea58dc5d9ba1a2c796f30fbbec0be7f414
 AUX virtualbox-6.1.42-python3_11.patch 2737 BLAKE2B a0dcd9afcdf2e07a55e3fba54e0eedc7e7072a126aa4791e676209f2c060745df9c32eba0378b9fc275591801947636411186aa2a3c8b5b1927fc93375815cd8 SHA512 7dd4101b7c10a3c1f4f4294c65a80cb392bb31a7cb8113bde59ee112d3d5c5e768daf1645d5b9c5b13ce49c08ed23b7a47064127c9e168743aeb66c614ef249f
 AUX virtualbox-7.0.0-fix-compilation-clang.patch 1638 BLAKE2B 2c1c021a5b95ffdbd46982249c3a60e97d79db17994491c3c1774d7fc889d5b5a0da974d05859e21772b6f265bf1009ad3f13d19a5d264c7f8b4b2bacd6a9bdb SHA512 9c83dfb1550463fc9ddce68dd0648b12721ad1f9fa92fac2e7234ac8149fc5a1a5698a759d1352fc8003d737ce987fbc476ed9a9b350490cf52e42e1a08444dd
-AUX virtualbox-7.0.0-python3_11.patch 3258 BLAKE2B 366b799159039caf3d7c41b06780aa80e131fe01b6b0985375a1bcf8de3cf98b611f5c19fdc1762d0de8e052fbe3cf117085c50b4f3e468e9eaf5a5545cf0f92 SHA512 ccc3ba08ec0ebebda9c17fd2a2bb53f2555da9e1c2dee5cf942b300d8c6e745ad46f3d12a5811a9e5c4c582ca796152b9a4fd92e66ab10b421bac0796106f4f9
-AUX virtualbox-7.0.4-fix-compilation.patch 919 BLAKE2B 656a41064773f0d96a3a31287e82537cf93e24d0794c3d4a24ba3378607028b8dc9a9b77a20ee001e2dbff5603043f8e306195610742461d4b1030ecdd3e9918 SHA512 7eb266aee12a489c5e89e1d2f682a421865aa459eb9ac5a9be9c59afa4e0cc8f9f2eb46650d73ef11cdc8c27a021ea37ef9c1150bddf818130d16c29d334651a
 AUX virtualbox-7.0.6-fix-libxml2.patch 15849 BLAKE2B 2a12ab133aeed3295fd9c1281a3a2f56526468a11f2b2426d3a3f8e3d912130b3eeaa21d6c537ff916e7c91499bb97ef8c3c8e11baea2866ad35e93cc3cf636f SHA512 042a4dbee2a5b665240cdd2af4bd5d88fe0da717f562afa1c7c89df634bc0c31a7bb38c34d0b928a4d38db13693a647db61f1c5ae963172b3fb6f83bd9441d3b
 AUX virtualbox-7.0.6-gcc-13.patch 579 BLAKE2B 50d629cafe1aff45ed08d712ab730555f2093336f28be38246c54a60ccbefab880b4b5a548b45e151c583749d347a26dc43fc5fef4e8c400c7bad424c9fa366a SHA512 34b5543c62044d530ee5927b367301f39d465d6177cfa2023578ff572d8e62eef2c5a06e1ec8d274fc582c017232b3603f668a1c09ec7774620e83245cdf90ba
 AUX virtualbox-7.0.8-disable-rebuild-iPxeBiosBin.patch 843 BLAKE2B bd7fef7afc725a247e9c84999786c27398ee9bdc4dd6f62f153202ab2f281ca8fb8445aa369aa1270a00acc6ba7f709f4d7923eea1acf02779827ba9ae2c2fa9 SHA512 d79b5be03417fbbf90634da5c63ac8975a950f559e42ed97a556edce28ada4d592b1807e89145e58caea1648486916bf0b7bf96e0843bad1cc3cace9048a3a4b
@@ -18,16 +16,11 @@ AUX virtualbox-7.0.8-mtune-keep-size.patch 401 BLAKE2B 8c4691d9b60030cdaa48e53be
 AUX virtualbox-7.0.8-python3_11.patch 3217 BLAKE2B 385be6d3c78e995006f146b89ab9dcc937331b970b0e79f2b0a87a41fd83fba482cb9b59d8a0eea0506eda5260ac65bcc6011907a507c0dcfa4726be440cfebc SHA512 dad06aa58161468d3e7a3733a77431f82b6c2e0b2a4f679ad0bf580feb6d2822b33d469b35a1760b086f2774a08045bfb6756e244ad1061158e2e305b6990a74
 AUX virtualbox-ose-6-wrapper 3578 BLAKE2B c150e578212435268de3c5fb0eea701bc843ec2241dc3839d3d1e33604fc01f6bdff6ed0425ba6917072f652b8c29d0df9a550a92900ca13306fcd36521afbee SHA512 315d981f3e92f2e0134946f6bbb8ad4ea4228afb8f73aaed7feead59b3f55cef01cec4285a7fdaf30ce0931d8b69bda4698baebd63d11f2cd9dfe9d0591a0f40
 AUX virtualbox-vboxusb_tmpfilesd 35 BLAKE2B 56937e236a0e4d1a2aa085271e8ae0af9553fdf7c3b804af4d3fda3aa8dbc32d63762fee90bc949390cb9cd67f2f0111894c8af084731dab6920ae1675c69a64 SHA512 72e4602f5f214f8833486f5c787c263a10390e8bdf65b5615d67c35ec44048f02add12fe43b19f9c57a9d2f12d768c52e54fcfb9052c0611d06cc988a698c171
-DIST VirtualBox-6.1.42.tar.bz2 165554573 BLAKE2B 8419793d9e4c4d0804baba926443a27259b012ab90d1bb27c8f9d90b018ddbef83d1cc47e9f5b88e6e247f22c186603584a5ddee4b0c04fe842eba56f3fd103a SHA512 a4861b44ee85d6d1d72ba1d19b5598873503feeb6d562cf7d8c770cc9b466741bdfa5abe74dc4e7952ff189d14c6caf60f584731492c38f688a360baba019ab2
 DIST VirtualBox-6.1.44.tar.bz2 165775421 BLAKE2B e87d7175bc616784c79d02b595d81119cedc7f4df1822b71ca10b85d44d5cd1dacd999e7867a0bef8579ea715ef732b990cef63f3325fff0c139abe394d88ad7 SHA512 49c3baa1a40dcafcc6b31d0abcfecfcb24305de44e5efd3f68ba4443574e21b8cc34d7288e0fbc56730bc3be2bee07089b7dfed14848a88dc38a1433b6dda8af
-DIST VirtualBox-7.0.6.tar.bz2 199512172 BLAKE2B cfe4d7abd57dfdb0294177759e80aa9fda797b9b5433f214771a57764cb23404450169e8c7c30cda13de85b8e02a37024584c7b1f0b5a44b10b100aa66b8d5c5 SHA512 f9db7a154e392f550f50abe774fc6263eb0b6f86dccc069f2c5012fedbe2debbf5b8ba62cca44ea0d5d5475652188176bfb888266f69197677b22854f02b64a0
 DIST VirtualBox-7.0.8a.tar.bz2 199387757 BLAKE2B 0ba397825277ecbb851bd4ea94c85448e2966fd96ef8edcaf3102f8515553736d6ceee84c0647fa37443c1875256353fdd029d6c505aa99834079acb957b24a0 SHA512 fcbf907f6f7f2396ebff5a31af6ec00b38f09799380bac4847cc9044455832de058659edaa9f621b0054fa402bfacef1b5444498c9faeb3671d02da1505c952d
-DIST virtualbox-help-7.0.6.tar.xz 3939412 BLAKE2B ea1326bccb3c2edc33ab37e122a7bedf79475d335e632ee62f99e0dce4b80de7634cbfe121c8c7ccd6588ff3b81effe7b20efe123cc44bc7b1ff4f6a851302a6 SHA512 ffb59f0c99c91b165a0b83d29317e04eee9097b0d0ac92a0d3e71558e70ec8b2807491a4633562a5e820e5f5a8e1339883031fd03de93d09a188f19b8b4d3a93
 DIST virtualbox-help-7.0.8.tar.xz 3941816 BLAKE2B f1c82ccc8a0d4e99f2302a7024a551e7e4a70348b193cf0c3a3b2917a717451c74d652555cadb278f6e27c47dac88a8121acfe9425bc0f5b82b5101475f384b3 SHA512 7483c4321492effb5b4329d48b363d8d2b3aaa248c0259cd06569497090aa438c39e94d6a5da4f511202f424e596f66e7580e37ffa5da66661fd0fadcd99c5ef
 DIST virtualbox-patches-6.1.36.tar.bz2 2733 BLAKE2B dcfebfeca4873d382441515d48b4dfee9343bc7c83ea3cbb5002dbf7975143a79fae9a701b67dc35505e9ca03ff1b6293cb7c3279c4fdfda8ad21ba5fb9b7e87 SHA512 1bed5cdefbf8e7c4b0d9092ba4961ecf2262f27f35c71a91ef6f2e8fe8a1d92ed74f06bafbf58d70ba7165d933997f58073f4d4f4051e3ba5c0339b729066f57
 DIST virtualbox-patches-7.0.8.tar.bz2 2733 BLAKE2B 044dfe02a5bd5e757091318b394b0e5918677b5bbce9caef4a18d4d8df54821559f0df6ffbdd6f52d4934bc4018e9c9d908571c5d3d8804fd3b0f22a7a1aed84 SHA512 93a06aa3f9508d3a8743ca8494a958159b5bc3fd7a0a08ff23414d05c4f31084cf0f1c82a3866e222c83e6996ba004546f0bd33c6eb9a90eec8e548b8b3f2fbf
-EBUILD virtualbox-6.1.42-r1.ebuild 18627 BLAKE2B e25ef4b3fc346ecd36c4a40ecf5aa629b5002d437dd8a81dd045d729ae987d481fc72e2dc38641b1e9a963a329703d2e316139e96decc964adb3a507cb8b3723 SHA512 580ba716c626f0fcff79b1f5fb3d159be44faf4fb763fa5838237d15f3076942306cbc4285fb6b2148f04988a972d8053cebf2305147db1d084b2780682b7e9f
 EBUILD virtualbox-6.1.44.ebuild 18624 BLAKE2B 8aed30ec5f1cc112e5379ccdbad23780af06b3f3852ac819f3637fe252633a30ae727fbf6f7a272be786f929d18c93d57286c83ded4d3e2a00609929b9c03748 SHA512 447529d4eba2f3cea4551ba0bc09f2cde5d01fc21b5780bfddcb6381cb5dfdc7e609c042ac21e53c1c762d1b1e123b5a16c6b5150cde836bb13351a97217e15f
-EBUILD virtualbox-7.0.6-r2.ebuild 20440 BLAKE2B 5925ff1df022209a93cd2f53c4103134dba95d7710825fe54dbccc128c8d0102ff8237d40fd5f19b2f16da97e1c1932cef3edce6c9fd7f082fb4a6b298540968 SHA512 06864016a987763f49ac5a7967e051dc0c3a3d5b282ca321159e15902e210da52e289d9902c2802da19a7f58b9b906fbb0c8098a9b3357fbdd265f247b0e4fc4
 EBUILD virtualbox-7.0.8a.ebuild 20647 BLAKE2B eec6de1dacef37a8367528b3848b562ffcebc48e53217a9e1c3587ff0161917d0e869dd24b34df10f57bddc120574f0a6854e8412f7ebf4805cd3ac1b6dc33a6 SHA512 d746f705c58b9452e6400e12d15690013e0e90cfa820bc3828f7bd0612318e01a1c5a03d434f870251e2b3c83d4fe346ffceefa928960de1f497c5eb89d1ffd0
 MISC metadata.xml 870 BLAKE2B 26f9370557a12c17465e7ca2d63902a2ce5b2d65fbdf40f3b890bd89aca28a1816424caf579f71b762876e8e91b292c5ecbcbad985e9da1e1472e66a2eaf6965 SHA512 eb2e9114dc343062e9afd3b933a5d355be790febb4a18f741347072d305b7d63ed40a6a3b9d11b91eb8602d5d2d4f5cf6c2ebde278fb0d0df48a5c5647374e33
diff --git a/app-emulation/virtualbox/files/virtualbox-7.0.0-python3_11.patch b/app-emulation/virtualbox/files/virtualbox-7.0.0-python3_11.patch
deleted file mode 100644
index cbdc1e1e2ad1..000000000000
--- a/app-emulation/virtualbox/files/virtualbox-7.0.0-python3_11.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-Add support for python 3.11
-
-Virtualbox 7.0.0 will only build a lib named VBoxPython3.so, regardless of the
-actual python version used when compiling.  Remove VBoxPython3m.so, we don't
-use it.
-
---- a/src/libs/xpcom18a4/python/Makefile.kmk
-+++ b/src/libs/xpcom18a4/python/Makefile.kmk
-@@ -30,7 +30,7 @@
- 
- #
- # List of supported Python versions, defining a number of
--# VBOX_PYTHON[26|27|31|32|32M|33|33M|34|34M|35|35M|36|36M|37|37M|38|38M|39|39M|310|310M|DEF]_[INC|LIB] variables
-+# VBOX_PYTHON[26|27|31|32|32M|33|33M|34|34M|35|35M|36|36M|37|37M|38|38M|39|39M|310|310M|311|311M|DEF]_[INC|LIB] variables
- # which get picked up below.
- #
- ifeq ($(KBUILD_TARGET),darwin) # Relatively predictable, don't script.
-@@ -702,6 +702,52 @@
-  endif
- endif
- 
-+ifdef VBOX_PYTHON311_INC
-+#
-+# Python 3.11 version
-+#
-+DLLS += VBoxPython3_11
-+VBoxPython3_11_EXTENDS    = VBoxPythonBase
-+VBoxPython3_11_EXTENDS_BY = appending
-+VBoxPython3_11_TEMPLATE   = XPCOM
-+VBoxPython3_11_INCS       = $(VBOX_PYTHON311_INC)
-+VBoxPython3_11_LIBS       = $(VBOX_PYTHON311_LIB)
-+
-+ ifdef VBOX_WITH_32_ON_64_MAIN_API
-+  ifdef VBOX_PYTHON311_LIB_X86
-+DLLS += VBoxPython3_11_x86
-+VBoxPython3_11_x86_EXTENDS    = VBoxPythonBase_x86
-+VBoxPython3_11_x86_EXTENDS_BY = appending
-+VBoxPython3_11_x86_TEMPLATE   = XPCOM
-+VBoxPython3_11_x86_INCS       = $(VBOX_PYTHON311_INC)
-+VBoxPython3_11_x86_LIBS       = $(VBOX_PYTHON311_LIB_X86)
-+  endif
-+ endif
-+endif
-+
-+ifdef VBOX_PYTHON311M_INC
-+#
-+# Python 3.11 version with pymalloc
-+#
-+DLLS += VBoxPython3_11m
-+VBoxPython3_11m_EXTENDS    = VBoxPythonBase_m
-+VBoxPython3_11m_EXTENDS_BY = appending
-+VBoxPython3_11m_TEMPLATE   = XPCOM
-+VBoxPython3_11m_INCS       = $(VBOX_PYTHON311M_INC)
-+VBoxPython3_11m_LIBS       = $(VBOX_PYTHON311M_LIB)
-+
-+ ifdef VBOX_WITH_32_ON_64_MAIN_API
-+  ifdef VBOX_PYTHON311M_LIB_X86
-+DLLS += VBoxPython3_11m_x86
-+VBoxPython3_11m_x86_EXTENDS    = VBoxPythonBase_x86_m
-+VBoxPython3_11m_x86_EXTENDS_BY = appending
-+VBoxPython3_11m_x86_TEMPLATE_  = XPCOM
-+VBoxPython3_11m_x86_INCS       = $(VBOX_PYTHON311M_INC)
-+VBoxPython3_11m_x86_LIBS       = $(VBOX_PYTHON311M_LIB_X86)
-+  endif
-+ endif
-+endif
-+
- ifdef VBOX_PYTHONDEF_INC
- #
- # Python without versioning
-@@ -744,18 +790,13 @@
- # TODO: ASSUMING that we don't need a different headers for pymalloc
- #       ('m' builds < 3.8) and CRT malloc.
- #
--VBOX_PYTHON_LIMITED_API_VER := $(firstword $(foreach ver, 35 36 38 39 310   34 33 \
-+VBOX_PYTHON_LIMITED_API_VER := $(firstword $(foreach ver, 35 36 38 39 310 311   34 33 \
- ,$(if-expr defined(VBOX_PYTHON$(ver)_INC),$(ver),)$(if-expr defined(VBOX_PYTHON$(ver)M_INC),$(ver)M,)))
-   ifneq ($(VBOX_PYTHON_LIMITED_API_VER),)
- DLLS += VBoxPython3
- VBoxPython3_EXTENDS      = VBoxPythonBase
- VBoxPython3_DEFS         = $(filter-out VBOX_PYXPCOM_VERSIONED,$(VBoxPythonBase_DEFS)) Py_LIMITED_API=0x03030000
- VBoxPython3_INCS         = $(VBoxPythonBase_INCS) $(VBOX_PYTHON$(VBOX_PYTHON_LIMITED_API_VER)_INC)
--
--DLLS += VBoxPython3m
--VBoxPython3m_EXTENDS     = VBoxPythonBase_m
--VBoxPython3m_DEFS        = $(filter-out VBOX_PYXPCOM_VERSIONED,$(VBoxPythonBase_m_DEFS)) Py_LIMITED_API=0x03030000
--VBoxPython3m_INCS        = $(VBoxPythonBase_m_INCS) $(VBOX_PYTHON$(VBOX_PYTHON_LIMITED_API_VER)_INC)
-   endif
-  endif # VBOX_WITH_PYTHON_LIMITED_API
- 
diff --git a/app-emulation/virtualbox/files/virtualbox-7.0.4-fix-compilation.patch b/app-emulation/virtualbox/files/virtualbox-7.0.4-fix-compilation.patch
deleted file mode 100644
index 4452d22fdfd2..000000000000
--- a/app-emulation/virtualbox/files/virtualbox-7.0.4-fix-compilation.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Fix compilation if VBOX_WITH_AUDIO_OSS is defined while VBOX_WITH_AUDIO_PULSE and VBOX_WITH_AUDIO_ALSA are not
-
---- a/src/VBox/Main/xml/Settings.cpp
-+++ b/src/VBox/Main/xml/Settings.cpp
-@@ -8931,6 +8931,9 @@
-     RTCLock lock(s_mtx);
-     if (s_enmLinuxDriver == AudioDriverType_Null)
-     {
-+# ifdef VBOX_WITH_AUDIO_OSS
-+	s_enmLinuxDriver = AudioDriverType_OSS;
-+# endif /* VBOX_WITH_AUDIO_OSS */
- # ifdef VBOX_WITH_AUDIO_PULSE
-         /* Check for the pulse library & that the pulse audio daemon is running. */
-         if (RTProcIsRunningByName("pulseaudio") &&
-@@ -8943,10 +8946,7 @@
-              if (RTLdrIsLoadable("libasound.so.2"))
-                 s_enmLinuxDriver = AudioDriverType_ALSA;
- # endif /* VBOX_WITH_AUDIO_ALSA */
--# ifdef VBOX_WITH_AUDIO_OSS
--             else
--                s_enmLinuxDriver = AudioDriverType_OSS;
--# endif /* VBOX_WITH_AUDIO_OSS */
-+	;
-     }
-     return s_enmLinuxDriver;
- 
diff --git a/app-emulation/virtualbox/virtualbox-6.1.42-r1.ebuild b/app-emulation/virtualbox/virtualbox-6.1.42-r1.ebuild
deleted file mode 100644
index 24ae3360623a..000000000000
--- a/app-emulation/virtualbox/virtualbox-6.1.42-r1.ebuild
+++ /dev/null
@@ -1,665 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# To add a new Python here:
-# 1. Patch src/libs/xpcom18a4/python/Makefile.kmk (copy the previous impl's logic)
-#    Do NOT skip this part. It'll end up silently not-building the Python extension
-#    or otherwise misbehaving if you do.
-#
-# 2. Then update PYTHON_COMPAT & set PYTHON_SINGLE_TARGET for testing w/ USE=python.
-#
-#  May need to look at other distros (e.g. Arch Linux) to find patches for newer
-#  Python versions as upstream tends to lag. Upstream may have patches on their
-#  trunk branch but not release branch.
-#
-#  See bug #785835, bug #856121.
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit desktop edo flag-o-matic java-pkg-opt-2 linux-info multilib optfeature pax-utils \
-	python-single-r1 tmpfiles toolchain-funcs udev xdg
-
-MY_PN="VirtualBox"
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Family of powerful x86 virtualization products for enterprise and home use"
-HOMEPAGE="https://www.virtualbox.org/"
-SRC_URI="https://download.virtualbox.org/virtualbox/${PV}/${MY_P}.tar.bz2
-	https://gitweb.gentoo.org/proj/virtualbox-patches.git/snapshot/virtualbox-patches-6.1.36.tar.bz2"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="GPL-2 dtrace? ( CDDL )"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64"
-IUSE="alsa debug doc dtrace headless java lvm +opus pam pax-kernel pch pulseaudio +opengl python +qt5 +sdk +sdl +udev vboxwebsrv vnc"
-
-unset WATCOM #856769
-
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-	acct-group/vboxusers
-	~app-emulation/virtualbox-modules-${PV}
-	>=dev-libs/libxslt-1.1.19
-	net-misc/curl
-	dev-libs/libxml2
-	media-libs/libpng:0=
-	media-libs/libvpx:0=
-	sys-libs/zlib:=
-	!headless? (
-		sdl? ( media-libs/libsdl:0[X,video] )
-		x11-base/xorg-proto
-		x11-libs/libX11
-		x11-libs/libxcb:=
-		x11-libs/libXcursor
-		x11-libs/libXext
-		x11-libs/libXmu
-		x11-libs/libXt
-		opengl? (
-			media-libs/libglvnd[X]
-			virtual/glu
-		)
-		qt5? (
-			dev-qt/qtcore:5
-			dev-qt/qtgui:5
-			dev-qt/qtprintsupport:5
-			dev-qt/qtwidgets:5
-			dev-qt/qtx11extras:5
-			opengl? ( dev-qt/qtopengl:5 )
-			x11-libs/libXinerama
-		)
-	)
-	dev-libs/openssl:0=
-	virtual/libcrypt:=
-	lvm? ( sys-fs/lvm2 )
-	opus? ( media-libs/opus )
-	udev? ( >=virtual/udev-171 )
-	vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] )
-	vnc? ( >=net-libs/libvncserver-0.9.9 )
-"
-# We're stuck on JDK (and JRE, I guess?) 1.8 because of need for wsimport
-# with USE="vboxwebsrv java". Note that we have to put things in DEPEND,
-# not (only, anyway) BDEPEND, as the eclass magic to set the environment variables
-# based on *DEPEND doesn't work for BDEPEND at least right now.
-#
-# There's a comment in Config.kmk about it
-# ("With Java 11 wsimport was removed, usually part of a separate install now.")
-# but it needs more investigation.
-#
-# See bug #878299 to track this issue.
-DEPEND="
-	${COMMON_DEPEND}
-	alsa? ( >=media-libs/alsa-lib-1.0.13 )
-	!headless? (
-		x11-libs/libXinerama
-		x11-libs/libXrandr
-		opengl? ( virtual/opengl )
-	)
-	java? ( virtual/jdk:1.8 )
-	pam? ( sys-libs/pam )
-	pax-kernel? ( sys-apps/elfix )
-	pulseaudio? ( media-sound/pulseaudio )
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	>=app-arch/tar-1.34-r2
-	>=dev-util/kbuild-0.1.9998.3127
-	<=dev-util/kbuild-0.1.9998.3500
-	>=dev-lang/yasm-0.6.2
-	dev-libs/libIDL
-	sys-apps/which
-	sys-devel/bin86
-	sys-libs/libcap
-	sys-power/iasl
-	virtual/pkgconfig
-	doc? (
-		app-text/docbook-sgml-dtd:4.4
-		dev-texlive/texlive-basic
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexrecommended
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-fontsrecommended
-		dev-texlive/texlive-fontsextra
-	)
-	java? ( virtual/jdk:1.8 )
-	qt5? ( dev-qt/linguist-tools:5 )
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	java? ( virtual/jre:1.8 )
-"
-
-QA_FLAGS_IGNORED="
-	usr/lib64/virtualbox/VBoxDDR0.r0
-	usr/lib64/virtualbox/VMMR0.r0
-	usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.r0
-	usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.debug
-"
-
-QA_TEXTRELS="
-	usr/lib64/virtualbox/VMMR0.r0
-	usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.r0
-"
-
-QA_EXECSTACK="
-	usr/lib64/virtualbox/iPxeBaseBin
-	usr/lib64/virtualbox/VMMR0.r0
-	usr/lib64/virtualbox/VBoxDDR0.r0
-	usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.r0
-	usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.debug
-"
-
-QA_WX_LOAD="
-	usr/lib64/virtualbox/iPxeBaseBin
-"
-
-QA_PRESTRIPPED="
-	usr/lib64/virtualbox/VMMR0.r0
-	usr/lib64/virtualbox/VBoxDDR0.r0
-	usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.r0
-"
-
-REQUIRED_USE="
-	java? ( sdk )
-	python? ( sdk )
-	vboxwebsrv? ( java )
-	${PYTHON_REQUIRED_USE}
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.1.26-configure-include-qt5-path.patch # bug #805365
-
-	# This patch is needed to avoid automagic detection based on a hardcoded
-	# list of Pythons in configure. It's necessary but not sufficient
-	# (see the rest of the ebuild's logic for the remainder) to handle
-	# proper Python selection.
-	"${FILESDIR}"/${PN}-6.1.34-r3-python.patch
-	"${FILESDIR}"/${PN}-6.1.42-python3_11.patch
-
-	# 865361
-	"${FILESDIR}"/${PN}-6.1.36-fcf-protection.patch
-
-	# Downloaded patchset
-	"${WORKDIR}"/virtualbox-patches-6.1.36/patches
-)
-
-pkg_pretend() {
-	if ! use headless && ! use qt5 ; then
-		einfo "No USE=\"qt5\" selected, this build will not include any Qt frontend."
-	elif use headless && use qt5 ; then
-		einfo "You selected USE=\"headless qt5\", defaulting to"
-		einfo "USE=\"headless\", this build will not include any X11/Qt frontend."
-	fi
-
-	if ! use opengl ; then
-		einfo "No USE=\"opengl\" selected, this build will lack"
-		einfo "the OpenGL feature."
-	fi
-	if ! use python ; then
-		einfo "You have disabled the \"python\" USE flag. This will only"
-		einfo "disable the python bindings being installed."
-	fi
-
-	# 749273
-	local d=${ROOT}
-	for i in usr "$(get_libdir)"; do
-		d="${d}/$i"
-		if [[ "$(stat -L -c "%g %u" "${d}")" != "0 0" ]]; then
-			die "${d} should be owned by root, VirtualBox will not start otherwise"
-		fi
-	done
-}
-
-pkg_setup() {
-	java-pkg-opt-2_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# Only add nopie patch when we're on hardened
-	if gcc-specs-pie ; then
-		eapply "${FILESDIR}"/050_virtualbox-5.2.8-nopie.patch
-	fi
-
-	# Remove shipped binaries (kBuild, yasm), see bug #232775
-	rm -r kBuild/bin tools || die
-
-	# Replace pointless GCC version check with something more sensible.
-	# This is needed for the qt5 version check.
-	sed -e 's@^check_gcc$@cc_maj="$(${CC} -dumpversion | cut -d. -f1)" ; cc_min="$(${CC} -dumpversion | cut -d. -f2)"@' \
-		-i configure || die
-
-	# Disable things unused or split into separate ebuilds
-	sed -e "s@MY_LIBDIR@$(get_libdir)@" \
-		"${FILESDIR}"/${PN}-5-localconfig > LocalConfig.kmk || die
-
-	if ! use pch ; then
-		# bug #753323
-		printf '\n%s\n' "VBOX_WITHOUT_PRECOMPILED_HEADERS=1" \
-			>> LocalConfig.kmk || die
-	fi
-
-	# Respect LDFLAGS
-	sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \
-		-i Config.kmk src/libs/xpcom18a4/Config.kmk || die
-
-	# Do not use hard-coded ld (related to bug #488176)
-	sed -e '/QUIET)ld /s@ld @$(LD) @' \
-		-i src/VBox/Devices/PC/ipxe/Makefile.kmk || die
-
-	# Use PAM only when pam USE flag is enbaled (bug #376531)
-	if ! use pam ; then
-		einfo "Disabling PAM removes the possibility to use the VRDP features."
-		sed -i 's@^.*VBOX_WITH_PAM@#VBOX_WITH_PAM@' Config.kmk || die
-		sed -i 's@\(.*/auth/Makefile.kmk.*\)@#\1@' \
-			src/VBox/HostServices/Makefile.kmk || die
-	fi
-
-	# add correct java path
-	if use java ; then
-		sed "s@/usr/lib/jvm/java-6-sun@$(java-config -O)@" \
-			-i "${S}"/Config.kmk || die
-		java-pkg-opt-2_src_prepare
-	fi
-
-	# 890561
-	echo -e "\nVBOX_GTAR=gtar" >> LocalConfig.kmk || die
-}
-
-src_configure() {
-	tc-ld-disable-gold # bug #488176
-
-	#856811 #864274
-	# cannot filter out only one flag, some combinations of these flags produce buggy executables
-	for i in abm avx avx2 bmi bmi2 fma fma4 popcnt; do
-		append-cflags $(test-flags-CC -mno-$i)
-		append-cxxflags $(test-flags-CXX -mno-$i)
-	done
-
-	tc-export AR CC CXX LD RANLIB
-	export HOST_CC="$(tc-getBUILD_CC)"
-
-	local myconf=(
-		--with-gcc="$(tc-getCC)"
-		--with-g++="$(tc-getCXX)"
-
-		--disable-dbus
-		--disable-kmods
-
-		$(usev !alsa --disable-alsa)
-		$(usev debug --build-debug)
-		$(usev !doc --disable-docs)
-		$(usev !java --disable-java)
-		$(usev !lvm --disable-devmapper)
-		$(usev !opus --disable-libopus)
-		$(usev !pulseaudio --disable-pulse)
-		$(usev !python --disable-python)
-		$(usev vboxwebsrv --enable-webservice)
-		$(usev vnc --enable-vnc)
-	)
-
-	if ! use headless ; then
-		myconf+=(
-			$(usev !opengl --disable-opengl)
-			$(usev !qt5 --disable-qt)
-			$(usev !sdl --disable-sdl)
-		)
-	else
-		myconf+=(
-			--build-headless
-			--disable-opengl
-		)
-	fi
-
-	if use amd64 && ! has_multilib_profile ; then
-		myconf+=( --disable-vmmraw )
-	fi
-
-	# bug #843437
-	cat >> LocalConfig.kmk <<-EOF || die
-		CXXFLAGS=${CXXFLAGS}
-		CFLAGS=${CFLAGS}
-	EOF
-
-	# not an autoconf script
-	edo ./configure "${myconf[@]}"
-
-	# Force usage of chosen Python implementation
-	# bug #856121, bug #785835
-	sed -i \
-		-e '/VBOX_WITH_PYTHON.*=/d' \
-		-e '/VBOX_PATH_PYTHON_INC.*=/d' \
-		-e '/VBOX_LIB_PYTHON.*=/d' \
-		AutoConfig.kmk || die
-
-	cat >> AutoConfig.kmk <<-EOF || die
-		VBOX_WITH_PYTHON=$(usev python 1)
-		VBOX_PATH_PYTHON_INC=$(python_get_includedir)
-		VBOX_LIB_PYTHON=$(python_get_library_path)
-	EOF
-
-	if use python ; then
-		local mangled_python="${EPYTHON#python}"
-		mangled_python="${mangled_python/.}"
-
-		# Stub out the script which defines what the Makefile ends up
-		# building for. gen_python_deps.py gets called by the Makefile
-		# with some args and it spits out a bunch of paths for a hardcoded
-		# list of Pythons. We just override it with what we're actually using.
-		# This minimises the amount of patching we have to do for new Pythons.
-		cat > src/libs/xpcom18a4/python/gen_python_deps.py <<-EOF || die
-			print("VBOX_PYTHON${mangled_python}_INC=$(python_get_includedir)")
-			print("VBOX_PYTHON${mangled_python}_LIB=$(python_get_library_path)")
-			print("VBOX_PYTHONDEF_INC=$(python_get_includedir)")
-			print("VBOX_PYTHONDEF_LIB=$(python_get_library_path)")
-		EOF
-
-		chmod +x src/libs/xpcom18a4/python/gen_python_deps.py || die
-	fi
-}
-
-src_compile() {
-	source ./env.sh || die
-
-	# Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)
-	MAKEJOBS=$(grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS})
-	MAKELOAD=$(grep -Eo '(\-l|\-\-load-average)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS})
-	MAKEOPTS="${MAKEJOBS} ${MAKELOAD}"
-
-	local myemakeargs=(
-		VBOX_BUILD_PUBLISHER=_Gentoo
-		VBOX_WITH_VBOXIMGMOUNT=1
-
-		KBUILD_VERBOSE=2
-
-		AS="$(tc-getCC)"
-		CC="$(tc-getCC)"
-		CXX="$(tc-getCXX)"
-
-		TOOL_GCC3_CC="$(tc-getCC)"
-		TOOL_GCC3_LD="$(tc-getCC)"
-		TOOL_GCC3_AS="$(tc-getCC)"
-		TOOL_GCC3_AR="$(tc-getAR)"
-		TOOL_GCC3_OBJCOPY="$(tc-getOBJCOPY)"
-
-		TOOL_GXX3_CC="$(tc-getCC)"
-		TOOL_GXX3_CXX="$(tc-getCXX)"
-		TOOL_GXX3_LD="$(tc-getCXX)"
-		TOOL_GXX3_AS="$(tc-getCXX)"
-		TOOL_GXX3_AR="$(tc-getAR)"
-		TOOL_GXX3_OBJCOPY="$(tc-getOBJCOPY)"
-
-		TOOL_GCC3_CFLAGS="${CFLAGS}"
-		TOOL_GCC3_CXXFLAGS="${CXXFLAGS}"
-		VBOX_GCC_OPT="${CXXFLAGS}"
-		VBOX_NM="$(tc-getNM)"
-
-		TOOL_YASM_AS=yasm
-	)
-
-	if use amd64 && has_multilib_profile ; then
-		myemakeargs+=(
-			CC32="$(tc-getCC) -m32"
-			CXX32="$(tc-getCXX) -m32"
-
-			TOOL_GCC32_CC="$(tc-getCC) -m32"
-			TOOL_GCC32_CXX="$(tc-getCXX) -m32"
-			TOOL_GCC32_LD="$(tc-getCC) -m32"
-			TOOL_GCC32_AS="$(tc-getCC) -m32"
-			TOOL_GCC32_AR="$(tc-getAR)"
-			TOOL_GCC32_OBJCOPY="$(tc-getOBJCOPY)"
-
-			TOOL_GXX32_CC="$(tc-getCC) -m32"
-			TOOL_GXX32_CXX="$(tc-getCXX) -m32"
-			TOOL_GXX32_LD="$(tc-getCXX) -m32"
-			TOOL_GXX32_AS="$(tc-getCXX) -m32"
-			TOOL_GXX32_AR="$(tc-getAR)"
-			TOOL_GXX32_OBJCOPY="$(tc-getOBJCOPY)"
-		)
-	fi
-
-	MAKE="kmk" emake "${myemakeargs[@]}" all
-}
-
-src_install() {
-	cd "${S}"/out/linux.${ARCH}/$(usex debug debug release)/bin || die
-
-	local vbox_inst_path="/usr/$(get_libdir)/${PN}" each size ico icofile
-
-	vbox_inst() {
-		local binary="${1}"
-		local perms="${2:-0750}"
-		local path="${3:-${vbox_inst_path}}"
-
-		[[ -n "${binary}" ]] || die "vbox_inst: No binary given!"
-		[[ ${perms} =~ ^[[:digit:]]+{4}$ ]] || die "vbox_inst: perms must consist of four digits."
-
-		insinto ${path}
-		doins ${binary}
-		fowners root:vboxusers ${path}/${binary}
-		fperms ${perms} ${path}/${binary}
-	}
-
-	# Create configuration files
-	insinto /etc/vbox
-	newins "${FILESDIR}/${PN}-4-config" vbox.cfg
-
-	# Set the correct libdir
-	sed \
-		-e "s@MY_LIBDIR@$(get_libdir)@" \
-		-i "${ED}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed"
-
-	# Install the wrapper script
-	exeinto ${vbox_inst_path}
-	newexe "${FILESDIR}/${PN}-ose-6-wrapper" "VBox"
-	fowners root:vboxusers ${vbox_inst_path}/VBox
-	fperms 0750 ${vbox_inst_path}/VBox
-
-	# Install binaries and libraries
-	insinto ${vbox_inst_path}
-	doins -r components
-
-	for each in VBox{Autostart,BalloonCtrl,BugReport,CpuReport,ExtPackHelperApp,Manage,SVC,Tunctl,VMMPreload,XPCOMIPCD} \
-		vboximg-mount *so *r0 iPxeBaseBin ; do
-		vbox_inst ${each}
-	done
-
-	# These binaries need to be suid root.
-	for each in VBox{Headless,Net{AdpCtl,DHCP,NAT}} ; do
-		vbox_inst ${each} 4750
-	done
-
-	# Install EFI Firmware files (bug #320757)
-	for each in VBoxEFI{32,64}.fd ; do
-		vbox_inst ${each} 0644
-	done
-
-	# VBoxSVC and VBoxManage need to be pax-marked (bug #403453)
-	# VBoxXPCOMIPCD (bug #524202)
-	for each in VBox{Headless,Manage,SVC,XPCOMIPCD} ; do
-		pax-mark -m "${ED}"${vbox_inst_path}/${each}
-	done
-
-	# Symlink binaries to the shipped wrapper
-	for each in vbox{autostart,balloonctrl,bugreport,headless,manage} \
-		VBox{Autostart,BalloonCtrl,BugReport,Headless,Manage,VRDP} ; do
-			dosym ${vbox_inst_path}/VBox /usr/bin/${each}
-	done
-	dosym ${vbox_inst_path}/VBoxTunctl /usr/bin/VBoxTunctl
-	dosym ${vbox_inst_path}/vboximg-mount /usr/bin/vboximg-mount
-
-	if use pam ; then
-		# VRDPAuth only works with this (bug #351949)
-		dosym VBoxAuth.so ${vbox_inst_path}/VRDPAuth.so
-	fi
-
-	# set an env-variable for 3rd party tools
-	echo -n "VBOX_APP_HOME=${vbox_inst_path}" > "${T}/90virtualbox"
-	doenvd "${T}/90virtualbox"
-
-	if ! use headless ; then
-		vbox_inst rdesktop-vrdp
-		if use sdl ; then
-			vbox_inst VBoxSDL 4750
-			pax-mark -m "${ED}"${vbox_inst_path}/VBoxSDL
-
-			for each in vboxsdl VBoxSDL ; do
-				dosym ${vbox_inst_path}/VBox /usr/bin/${each}
-			done
-		fi
-
-		if use qt5 ; then
-			vbox_inst VirtualBox
-			vbox_inst VirtualBoxVM 4750
-			for each in VirtualBox{,VM} ; do
-				pax-mark -m "${ED}"${vbox_inst_path}/${each}
-			done
-
-			if use opengl ; then
-				vbox_inst VBoxTestOGL
-				pax-mark -m "${ED}"${vbox_inst_path}/VBoxTestOGL
-			fi
-
-			for each in virtualbox{,vm} VirtualBox{,VM} ; do
-				dosym ${vbox_inst_path}/VBox /usr/bin/${each}
-			done
-
-			insinto /usr/share/${PN}
-			doins -r nls
-			doins -r UnattendedTemplates
-
-			domenu ${PN}.desktop
-		fi
-
-		pushd "${S}"/src/VBox/Artwork/OSE &>/dev/null || die
-		for size in 16 32 48 64 128 ; do
-			newicon -s ${size} ${PN}-${size}px.png ${PN}.png
-		done
-		newicon ${PN}-48px.png ${PN}.png
-		doicon -s scalable ${PN}.svg
-		popd &>/dev/null || die
-		pushd "${S}"/src/VBox/Artwork/other &>/dev/null || die
-		for size in 16 24 32 48 64 72 96 128 256 512 ; do
-			for ico in hdd ova ovf vbox{,-extpack} vdi vdh vmdk ; do
-				icofile="${PN}-${ico}-${size}px.png"
-				if [[ -f "${icofile}" ]] ; then
-					newicon -s ${size} ${icofile} ${PN}-${ico}.png
-				fi
-			done
-		done
-		popd &>/dev/null || die
-	fi
-
-	if use lvm ; then
-		vbox_inst VBoxVolInfo 4750
-		dosym ${vbox_inst_path}/VBoxVolInfo /usr/bin/VBoxVolInfo
-	fi
-
-	if use sdk ; then
-		insinto ${vbox_inst_path}
-		doins -r sdk
-
-		if use java ; then
-			java-pkg_regjar "${ED}/${vbox_inst_path}/sdk/bindings/xpcom/java/vboxjxpcom.jar"
-			java-pkg_regso "${ED}/${vbox_inst_path}/libvboxjxpcom.so"
-		fi
-	fi
-
-	if use udev ; then
-		local udevdir="$(get_udevdir)"
-		local udev_file="VBoxCreateUSBNode.sh"
-		local rules_file="10-virtualbox.rules"
-
-		insinto ${udevdir}
-		doins ${udev_file}
-		fowners root:vboxusers ${udevdir}/${udev_file}
-		fperms 0750 ${udevdir}/${udev_file}
-
-		insinto ${udevdir}/rules.d
-		sed "s@%UDEVDIR%@${udevdir}@" "${FILESDIR}"/${rules_file} \
-			> "${T}"/${rules_file} || die
-		doins "${T}"/${rules_file}
-	fi
-
-	if use vboxwebsrv ; then
-		vbox_inst vboxwebsrv
-		dosym ${vbox_inst_path}/VBox /usr/bin/vboxwebsrv
-		newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
-		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
-	fi
-
-	# Remove dead symlinks (bug #715338)
-	find "${ED}"/usr/$(get_libdir)/${PN} -xtype l -delete || die
-
-	# Fix version string in extensions or else they don't get accepted
-	# by the virtualbox host process (see bug #438930)
-	find ExtensionPacks -type f -name "ExtPack.xml" -exec sed -i '/Version/s@_Gentoo@@' {} \+ || die
-
-	local extensions_dir="${vbox_inst_path}/ExtensionPacks"
-
-	if use vnc ; then
-		insinto ${extensions_dir}
-		doins -r ExtensionPacks/VNC
-	fi
-
-	if use dtrace ; then
-		insinto ${extensions_dir}
-		doins -r ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack
-	fi
-
-	if use doc ; then
-		dodoc UserManual.pdf
-	fi
-
-	if use python ; then
-		local mangled_python="${EPYTHON#python}"
-		mangled_python="${mangled_python/./_}"
-
-		local python_path_ext="${ED}/usr/$(get_libdir)/virtualbox/VBoxPython${mangled_python}.so"
-		if [[ ! -x "${python_path_ext}" ]] ; then
-			eerror "Couldn't find ${python_path_ext}! Bindings were requested with USE=python"
-			eerror "but none were installed. This may happen if support for a Python target"
-			eerror "(listed in PYTHON_COMPAT in the ebuild) is incomplete within the Makefiles."
-			die "Incomplete installation of Python bindings! File a bug with Gentoo!"
-		fi
-	fi
-
-	newtmpfiles "${FILESDIR}"/${PN}-vboxusb_tmpfilesd ${PN}-vboxusb.conf
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if use udev ; then
-		udev_reload
-		udevadm trigger --subsystem-match=usb
-	fi
-
-	tmpfiles_process virtualbox-vboxusb.conf
-
-	if ! use headless && use qt5 ; then
-		elog "To launch VirtualBox just type: \"virtualbox\"."
-	fi
-
-	elog "You must be in the vboxusers group to use VirtualBox."
-	elog ""
-	elog "The latest user manual is available for download at:"
-	elog "https://download.virtualbox.org/virtualbox/${PV}/UserManual.pdf"
-	elog ""
-
-	optfeature "Advanced networking setups" net-misc/bridge-utils sys-apps/usermode-utilities
-	optfeature "USB2, USB3, PXE boot, and VRDP support" app-emulation/virtualbox-extpack-oracle
-	optfeature "Guest additions ISO" app-emulation/virtualbox-additions
-
-	if ! use udev ; then
-		ewarn "Without USE=udev, USB devices will likely not work in ${PN}."
-	fi
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-
-	use udev && udev_reload
-}
diff --git a/app-emulation/virtualbox/virtualbox-7.0.6-r2.ebuild b/app-emulation/virtualbox/virtualbox-7.0.6-r2.ebuild
deleted file mode 100644
index ebbe07aa2de2..000000000000
--- a/app-emulation/virtualbox/virtualbox-7.0.6-r2.ebuild
+++ /dev/null
@@ -1,730 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# To add a new Python here:
-# 1. Patch src/libs/xpcom18a4/python/Makefile.kmk (copy the previous impl's logic)
-#    Do NOT skip this part. It'll end up silently not-building the Python extension
-#    or otherwise misbehaving if you do.
-#
-# 2. Then update PYTHON_COMPAT & set PYTHON_SINGLE_TARGET for testing w/ USE=python.
-#
-#  May need to look at other distros (e.g. Arch Linux) to find patches for newer
-#  Python versions as upstream tends to lag. Upstream may have patches on their
-#  trunk branch but not release branch.
-#
-#  See bug #785835, bug #856121.
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit desktop edo flag-o-matic java-pkg-opt-2 linux-info multilib optfeature pax-utils \
-	python-single-r1 tmpfiles toolchain-funcs udev xdg
-
-MY_PN="VirtualBox"
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Family of powerful x86 virtualization products for enterprise and home use"
-HOMEPAGE="https://www.virtualbox.org/"
-SRC_URI="
-	https://download.virtualbox.org/virtualbox/${PV}/${MY_P}.tar.bz2
-	https://gitweb.gentoo.org/proj/virtualbox-patches.git/snapshot/virtualbox-patches-6.1.36.tar.bz2
-	gui? ( !doc? ( https://dev.gentoo.org/~ceamac/${CATEGORY}/${PN}/${PN}-help-${PV}.tar.xz ) )
-"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="GPL-2+ GPL-3 LGPL-2.1 MIT dtrace? ( CDDL )"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64"
-IUSE="alsa dbus debug doc dtrace +gui java lvm nls pam pch pulseaudio +opengl python +sdk +sdl +udev vboxwebsrv vde vnc"
-
-unset WATCOM #856769
-
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-	acct-group/vboxusers
-	~app-emulation/virtualbox-modules-${PV}
-	dev-libs/libtpms
-	dev-libs/libxml2
-	dev-libs/openssl:0=
-	media-libs/libpng:0=
-	media-libs/libvpx:0=
-	net-misc/curl
-	sys-libs/zlib
-	dbus? ( sys-apps/dbus )
-	gui? (
-		dev-qt/qtcore:5
-		dev-qt/qtdbus:5
-		dev-qt/qtgui:5
-		dev-qt/qthelp:5
-		dev-qt/qtprintsupport:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtx11extras:5
-		dev-qt/qtxml:5
-		x11-libs/libX11
-		x11-libs/libXt
-		opengl? ( dev-qt/qtopengl:5 )
-	)
-	lvm? ( sys-fs/lvm2 )
-	opengl? (
-		media-libs/libglvnd[X]
-		media-libs/vulkan-loader
-		x11-libs/libX11
-		x11-libs/libXt
-	)
-	pam? ( sys-libs/pam )
-	sdl? (
-		media-libs/libsdl:0[X,video]
-		x11-libs/libX11
-		x11-libs/libXcursor
-		x11-libs/libXt
-	)
-	vboxwebsrv? ( net-libs/gsoap[-gnutls(-),debug?] )
-	vde? ( net-misc/vde )
-	vnc? ( >=net-libs/libvncserver-0.9.9 )
-"
-# We're stuck on JDK (and JRE, I guess?) 1.8 because of need for wsimport
-# with USE="vboxwebsrv java". Note that we have to put things in DEPEND,
-# not (only, anyway) BDEPEND, as the eclass magic to set the environment variables
-# based on *DEPEND doesn't work for BDEPEND at least right now.
-#
-# There's a comment in Config.kmk about it
-# ("With Java 11 wsimport was removed, usually part of a separate install now.")
-# but it needs more investigation.
-#
-# See bug #878299 to track this issue.
-DEPEND="
-	${COMMON_DEPEND}
-	>=dev-libs/libxslt-1.1.19
-	virtual/libcrypt:=
-	alsa? ( >=media-libs/alsa-lib-1.0.13 )
-	gui? (
-		x11-base/xorg-proto
-		x11-libs/libxcb:=
-		x11-libs/libXcursor
-		x11-libs/libXext
-		x11-libs/libXinerama
-		x11-libs/libXmu
-		x11-libs/libXrandr
-	)
-	java? ( virtual/jdk:1.8 )
-	opengl? (
-		x11-base/xorg-proto
-		x11-libs/libXcursor
-		x11-libs/libXinerama
-		x11-libs/libXmu
-		x11-libs/libXrandr
-		virtual/glu
-	)
-	sdl? ( x11-libs/libXinerama )
-	pulseaudio? ( media-sound/pulseaudio )
-	udev? ( >=virtual/udev-171 )
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	gui? ( x11-libs/libxcb:= )
-	java? ( virtual/jre:1.8 )
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	>=app-arch/tar-1.34-r2
-	>=dev-lang/yasm-0.6.2
-	dev-libs/libIDL
-	dev-util/glslang
-	>=dev-util/kbuild-0.1.9998.3127
-	sys-apps/which
-	sys-devel/bin86
-	sys-libs/libcap
-	sys-power/iasl
-	virtual/pkgconfig
-	doc? (
-		app-text/docbook-sgml-dtd:4.4
-		app-text/docbook-xsl-ns-stylesheets
-		dev-texlive/texlive-basic
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexrecommended
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-fontsrecommended
-		dev-texlive/texlive-fontsextra
-		dev-qt/qthelp:5
-	)
-	gui? ( dev-qt/linguist-tools:5 )
-	nls? ( dev-qt/linguist-tools:5 )
-	java? ( virtual/jdk:1.8 )
-"
-
-QA_FLAGS_IGNORED="
-	usr/lib64/virtualbox/VBoxDDR0.r0
-	usr/lib64/virtualbox/VMMR0.r0
-	usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.r0
-	usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.debug
-"
-
-QA_TEXTRELS="
-	usr/lib64/virtualbox/VMMR0.r0
-	usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.r0
-"
-
-QA_EXECSTACK="
-	usr/lib64/virtualbox/iPxeBaseBin
-	usr/lib64/virtualbox/VMMR0.r0
-	usr/lib64/virtualbox/VBoxDDR0.r0
-	usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.r0
-	usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.debug
-"
-
-QA_WX_LOAD="
-	usr/lib64/virtualbox/iPxeBaseBin
-"
-
-QA_PRESTRIPPED="
-	usr/lib64/virtualbox/VMMR0.r0
-	usr/lib64/virtualbox/VBoxDDR0.r0
-	usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.r0
-"
-
-REQUIRED_USE="
-	java? ( sdk )
-	python? ( sdk )
-	vboxwebsrv? ( java )
-	${PYTHON_REQUIRED_USE}
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.1.26-configure-include-qt5-path.patch # bug #805365
-
-	# This patch is needed to avoid automagic detection based on a hardcoded
-	# list of Pythons in configure. It's necessary but not sufficient
-	# (see the rest of the ebuild's logic for the remainder) to handle
-	# proper Python selection.
-	"${FILESDIR}"/${PN}-6.1.34-r3-python.patch
-
-	# 865361
-	"${FILESDIR}"/${PN}-6.1.36-fcf-protection.patch
-
-	"${FILESDIR}"/${PN}-7.0.4-fix-compilation.patch
-	"${FILESDIR}"/${PN}-7.0.0-fix-compilation-clang.patch
-	"${FILESDIR}"/${PN}-7.0.0-python3_11.patch
-	"${FILESDIR}"/${PN}-7.0.6-gcc-13.patch
-	"${FILESDIR}"/${PN}-7.0.6-fix-libxml2.patch
-
-	# Downloaded patchset
-	"${WORKDIR}"/virtualbox-patches-6.1.36/patches
-)
-
-pkg_pretend() {
-	if ! use gui; then
-		einfo "No USE=\"gui\" selected, this build will not include any Qt frontend."
-	fi
-
-	if ! use opengl; then
-		einfo "No USE=\"opengl\" selected, this build will lack"
-		einfo "the OpenGL feature."
-	fi
-	if ! use python; then
-		einfo "You have disabled the \"python\" USE flag. This will only"
-		einfo "disable the python bindings being installed."
-	fi
-	if ! use nls && use gui; then
-		einfo "USE=\"gui\" also selects USE=\"nls\".  This build"
-		einfo "will have NLS support."
-	fi
-
-	# 749273
-	local d=${ROOT}
-	for i in usr "$(get_libdir)"; do
-		d="${d}/$i"
-		if [[ "$(stat -L -c "%g %u" "${d}")" != "0 0" ]]; then
-			die "${d} should be owned by root, VirtualBox will not start otherwise"
-		fi
-	done
-}
-
-pkg_setup() {
-	java-pkg-opt-2_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# Only add nopie patch when we're on hardened
-	if gcc-specs-pie; then
-		eapply "${FILESDIR}"/050_virtualbox-5.2.8-nopie.patch
-	fi
-
-	# Remove shipped binaries (kBuild, yasm) and tools, see bug #232775
-	rm -r kBuild/bin || die
-	# Remove everything in tools except kBuildUnits
-	find tools -mindepth 1 -maxdepth 1 -name kBuildUnits -prune -o -exec rm -r {} \+ || die
-
-	# Disable things unused or split into separate ebuilds
-	sed -e "s@MY_LIBDIR@$(get_libdir)@" \
-		"${FILESDIR}"/${PN}-5-localconfig > LocalConfig.kmk || die
-
-	if ! use pch; then
-		# bug #753323
-		printf '\n%s\n' "VBOX_WITHOUT_PRECOMPILED_HEADERS=1" \
-			>> LocalConfig.kmk || die
-	fi
-
-	# Respect LDFLAGS
-	sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \
-		-i Config.kmk src/libs/xpcom18a4/Config.kmk || die
-
-	# Do not use hard-coded ld (related to bug #488176)
-	sed -e '/QUIET)ld /s@ld @$(LD) @' \
-		-i src/VBox/Devices/PC/ipxe/Makefile.kmk || die
-
-	# Use PAM only when pam USE flag is enbaled (bug #376531)
-	if ! use pam; then
-		einfo "Disabling PAM removes the possibility to use the VRDP features."
-		sed -i 's@^.*VBOX_WITH_PAM@#VBOX_WITH_PAM@' Config.kmk || die
-		sed -i 's@\(.*/auth/Makefile.kmk.*\)@#\1@' \
-			src/VBox/HostServices/Makefile.kmk || die
-	fi
-
-	# add correct java path
-	if use java; then
-		sed "s@/usr/lib/jvm/java-6-sun@$(java-config -O)@" \
-			-i "${S}"/Config.kmk || die
-		java-pkg-opt-2_src_prepare
-	fi
-
-	#856811 #864274
-	# cannot filter out only one flag, some combinations of these flags produce buggy executables
-	for i in abm avx avx2 bmi bmi2 fma fma4 popcnt; do
-		append-cflags $(test-flags-CC -mno-$i)
-		append-cxxflags $(test-flags-CXX -mno-$i)
-	done
-
-	# bug #843437
-	cat >> LocalConfig.kmk <<-EOF || die
-		CXXFLAGS=${CXXFLAGS}
-		CFLAGS=${CFLAGS}
-	EOF
-
-	if use sdl; then
-		echo -e "\nVBOX_WITH_VBOXSDL=1" >> LocalConfig.kmk || die
-	fi
-
-	#443830
-	echo -e "\nVBOX_WITH_VBOX_IMG=1" >> LocalConfig.kmk || die
-
-	# clang assembler chokes on comments starting with /
-	if tc-is-clang; then
-		sed -i -e '/^\//d' src/libs/xpcom18a4/nsprpub/pr/src/md/unix/os_Linux_x86_64.s || die
-	fi
-
-	# fix doc generation
-	echo -e "\nVBOX_PATH_DOCBOOK=/usr/share/sgml/docbook/xsl-ns-stylesheets" >> LocalConfig.kmk || die
-	# replace xhtml names with numeric equivalents
-	find doc/manual -name \*.xml -exec sed -i \
-		-e 's/&nbsp;/\&#160;/g' \
-		-e 's/&ndash;/\&#8211;/g' \
-		-e 's/&larr;/\&#8592;/g' \
-		-e 's/&rarr;/\&#8594;/g' \
-		-e 's/&harr;/\&#8596;/g' {} \+ || die
-
-	# fix help path #891879
-	echo -e "\nVBOX_PATH_PACKAGE_DOCS=/usr/share/doc/${PF}" >> LocalConfig.kmk || die
-
-	# 489208
-	# Cannot patch the whole text, many translations.  Use sed instead to replace the command
-	find src/VBox/Frontends/VirtualBox/nls -name \*.ts -exec sed -i \
-		's/&apos;[^&]*\(vboxdrv setup\|vboxconfig\)&apos;/\&apos;emerge -1 virtualbox-modules\&apos;/' {} \+ || die
-	sed -i "s:'/sbin/vboxconfig':'emerge -1 virtualbox-modules':" \
-		src/VBox/Frontends/VirtualBox/src/main.cpp \
-		src/VBox/VMM/VMMR3/VM.cpp || die
-
-	# 890561
-	echo -e "\nVBOX_GTAR=gtar" >> LocalConfig.kmk || die
-
-	if ! use nls && ! use gui; then
-		cat >> LocalConfig.kmk <<-EOF || die
-			VBOX_WITH_NLS :=
-			VBOX_WITH_MAIN_NLS :=
-			VBOX_WITH_PUEL_NLS :=
-			VBOX_WITH_VBOXMANAGE_NLS :=
-		EOF
-	fi
-}
-
-src_configure() {
-	tc-ld-disable-gold # bug #488176
-
-	tc-export AR CC CXX LD RANLIB
-	export HOST_CC="$(tc-getBUILD_CC)"
-
-	local myconf=(
-		--with-gcc="$(tc-getCC)"
-		--with-g++="$(tc-getCXX)"
-
-		--disable-kmods
-
-		$(usev !alsa --disable-alsa)
-		$(usev !dbus --disable-dbus)
-		$(usev debug --build-debug)
-		$(usev !doc --disable-docs)
-		$(usev !java --disable-java)
-		$(usev !lvm --disable-devmapper)
-		$(usev !pulseaudio --disable-pulse)
-		$(usev !python --disable-python)
-		$(usev vboxwebsrv --enable-webservice)
-		$(usev vde --enable-vde)
-		$(usev vnc --enable-vnc)
-	)
-
-	if use gui || use sdl || use opengl; then
-		myconf+=(
-			$(usev !opengl --disable-opengl)
-			$(usev !gui --disable-qt)
-			$(usev !sdl --disable-sdl)
-		)
-	else
-		myconf+=(
-			--build-headless
-		)
-	fi
-
-	if use amd64 && ! has_multilib_profile; then
-		myconf+=( --disable-vmmraw )
-	fi
-
-	# not an autoconf script
-	edo ./configure "${myconf[@]}"
-
-	# Force usage of chosen Python implementation
-	# bug #856121, bug #785835
-	sed -i \
-		-e '/VBOX_WITH_PYTHON.*=/d' \
-		-e '/VBOX_PATH_PYTHON_INC.*=/d' \
-		-e '/VBOX_LIB_PYTHON.*=/d' \
-		AutoConfig.kmk || die
-
-	cat >> AutoConfig.kmk <<-EOF || die
-		VBOX_WITH_PYTHON=$(usev python 1)
-		VBOX_PATH_PYTHON_INC=$(python_get_includedir)
-		VBOX_LIB_PYTHON=$(python_get_library_path)
-	EOF
-
-	if use python; then
-		local mangled_python="${EPYTHON#python}"
-		mangled_python="${mangled_python/.}"
-
-		# Stub out the script which defines what the Makefile ends up
-		# building for. gen_python_deps.py gets called by the Makefile
-		# with some args and it spits out a bunch of paths for a hardcoded
-		# list of Pythons. We just override it with what we're actually using.
-		# This minimises the amount of patching we have to do for new Pythons.
-		cat > src/libs/xpcom18a4/python/gen_python_deps.py <<-EOF || die
-			print("VBOX_PYTHON${mangled_python}_INC=$(python_get_includedir)")
-			print("VBOX_PYTHON${mangled_python}_LIB=$(python_get_library_path)")
-			print("VBOX_PYTHONDEF_INC=$(python_get_includedir)")
-			print("VBOX_PYTHONDEF_LIB=$(python_get_library_path)")
-		EOF
-
-		chmod +x src/libs/xpcom18a4/python/gen_python_deps.py || die
-	fi
-}
-
-src_compile() {
-	source ./env.sh || die
-
-	# Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)
-	MAKEJOBS=$(grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS})
-	MAKELOAD=$(grep -Eo '(\-l|\-\-load-average)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS})
-	MAKEOPTS="${MAKEJOBS} ${MAKELOAD}"
-
-	local myemakeargs=(
-		VBOX_BUILD_PUBLISHER=_Gentoo
-		VBOX_WITH_VBOXIMGMOUNT=1
-
-		KBUILD_VERBOSE=2
-
-		AS="$(tc-getCC)"
-		CC="$(tc-getCC)"
-		CXX="$(tc-getCXX)"
-
-		TOOL_GCC3_CC="$(tc-getCC)"
-		TOOL_GCC3_LD="$(tc-getCC)"
-		TOOL_GCC3_AS="$(tc-getCC)"
-		TOOL_GCC3_AR="$(tc-getAR)"
-		TOOL_GCC3_OBJCOPY="$(tc-getOBJCOPY)"
-
-		TOOL_GXX3_CC="$(tc-getCC)"
-		TOOL_GXX3_CXX="$(tc-getCXX)"
-		TOOL_GXX3_LD="$(tc-getCXX)"
-		TOOL_GXX3_AS="$(tc-getCXX)"
-		TOOL_GXX3_AR="$(tc-getAR)"
-		TOOL_GXX3_OBJCOPY="$(tc-getOBJCOPY)"
-
-		TOOL_GCC3_CFLAGS="${CFLAGS}"
-		TOOL_GCC3_CXXFLAGS="${CXXFLAGS}"
-		VBOX_GCC_OPT="${CXXFLAGS}"
-		VBOX_NM="$(tc-getNM)"
-
-		TOOL_YASM_AS=yasm
-	)
-
-	if use amd64 && has_multilib_profile; then
-		myemakeargs+=(
-			CC32="$(tc-getCC) -m32"
-			CXX32="$(tc-getCXX) -m32"
-
-			TOOL_GCC32_CC="$(tc-getCC) -m32"
-			TOOL_GCC32_CXX="$(tc-getCXX) -m32"
-			TOOL_GCC32_LD="$(tc-getCC) -m32"
-			TOOL_GCC32_AS="$(tc-getCC) -m32"
-			TOOL_GCC32_AR="$(tc-getAR)"
-			TOOL_GCC32_OBJCOPY="$(tc-getOBJCOPY)"
-
-			TOOL_GXX32_CC="$(tc-getCC) -m32"
-			TOOL_GXX32_CXX="$(tc-getCXX) -m32"
-			TOOL_GXX32_LD="$(tc-getCXX) -m32"
-			TOOL_GXX32_AS="$(tc-getCXX) -m32"
-			TOOL_GXX32_AR="$(tc-getAR)"
-			TOOL_GXX32_OBJCOPY="$(tc-getOBJCOPY)"
-		)
-	fi
-
-	MAKE="kmk" emake "${myemakeargs[@]}" all
-}
-
-src_install() {
-	cd "${S}"/out/linux.${ARCH}/$(usex debug debug release)/bin || die
-
-	local vbox_inst_path="/usr/$(get_libdir)/${PN}" each size ico icofile
-
-	vbox_inst() {
-		local binary="${1}"
-		local perms="${2:-0750}"
-		local path="${3:-${vbox_inst_path}}"
-
-		[[ -n "${binary}" ]] || die "vbox_inst: No binary given!"
-		[[ ${perms} =~ ^[[:digit:]]+{4}$ ]] || die "vbox_inst: perms must consist of four digits."
-
-		insinto ${path}
-		doins ${binary}
-		fowners root:vboxusers ${path}/${binary}
-		fperms ${perms} ${path}/${binary}
-	}
-
-	# Create configuration files
-	insinto /etc/vbox
-	newins "${FILESDIR}/${PN}-4-config" vbox.cfg
-
-	# Set the correct libdir
-	sed \
-		-e "s@MY_LIBDIR@$(get_libdir)@" \
-		-i "${ED}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed"
-
-	# Install the wrapper script
-	exeinto ${vbox_inst_path}
-	newexe "${FILESDIR}/${PN}-ose-6-wrapper" "VBox"
-	fowners root:vboxusers ${vbox_inst_path}/VBox
-	fperms 0750 ${vbox_inst_path}/VBox
-
-	# Install binaries and libraries
-	insinto ${vbox_inst_path}
-	doins -r components
-
-	for each in VBox{Autostart,BalloonCtrl,BugReport,CpuReport,ExtPackHelperApp,Manage,SVC,VMMPreload,XPCOMIPCD} \
-		vboximg-mount vbox-img *so *r0; do
-		vbox_inst ${each}
-	done
-
-	# These binaries need to be suid root.
-	for each in VBox{Headless,Net{AdpCtl,DHCP,NAT}} ; do
-		vbox_inst ${each} 4750
-	done
-
-	# Install EFI Firmware files (bug #320757)
-	for each in VBoxEFI{32,64}.fd ; do
-		vbox_inst ${each} 0644
-	done
-
-	# VBoxSVC and VBoxManage need to be pax-marked (bug #403453)
-	# VBoxXPCOMIPCD (bug #524202)
-	for each in VBox{Headless,Manage,SVC,XPCOMIPCD} ; do
-		pax-mark -m "${ED}"${vbox_inst_path}/${each}
-	done
-
-	# Symlink binaries to the shipped wrapper
-	for each in vbox{autostart,balloonctrl,bugreport,headless,manage} \
-		VBox{Autostart,BalloonCtrl,BugReport,Headless,Manage,VRDP} ; do
-			dosym ${vbox_inst_path}/VBox /usr/bin/${each}
-	done
-	dosym ${vbox_inst_path}/vboximg-mount /usr/bin/vboximg-mount
-	dosym ${vbox_inst_path}/vbox-img /usr/bin/vbox-img
-
-	if use pam; then
-		# VRDPAuth only works with this (bug #351949)
-		dosym VBoxAuth.so ${vbox_inst_path}/VRDPAuth.so
-	fi
-
-	# set an env-variable for 3rd party tools
-	echo -n "VBOX_APP_HOME=${vbox_inst_path}" > "${T}/90virtualbox"
-	doenvd "${T}/90virtualbox"
-
-	if use sdl; then
-		vbox_inst VBoxSDL 4750
-		pax-mark -m "${ED}"${vbox_inst_path}/VBoxSDL
-
-		for each in vboxsdl VBoxSDL ; do
-			dosym ${vbox_inst_path}/VBox /usr/bin/${each}
-		done
-	fi
-
-	if use gui; then
-		vbox_inst VirtualBox
-		vbox_inst VirtualBoxVM 4750
-		for each in VirtualBox{,VM} ; do
-			pax-mark -m "${ED}"${vbox_inst_path}/${each}
-		done
-
-		if use opengl; then
-			vbox_inst VBoxTestOGL
-			pax-mark -m "${ED}"${vbox_inst_path}/VBoxTestOGL
-		fi
-
-		for each in virtualbox{,vm} VirtualBox{,VM} ; do
-			dosym ${vbox_inst_path}/VBox /usr/bin/${each}
-		done
-
-		insinto /usr/share/${PN}
-		doins -r nls
-		doins -r UnattendedTemplates
-
-		domenu ${PN}.desktop
-
-		pushd "${S}"/src/VBox/Artwork/OSE &>/dev/null || die
-		for size in 16 32 48 64 128 ; do
-			newicon -s ${size} ${PN}-${size}px.png ${PN}.png
-		done
-		newicon ${PN}-48px.png ${PN}.png
-		doicon -s scalable ${PN}.svg
-		popd &>/dev/null || die
-		pushd "${S}"/src/VBox/Artwork/other &>/dev/null || die
-		for size in 16 24 32 48 64 72 96 128 256 512 ; do
-			for ico in hdd ova ovf vbox{,-extpack} vdi vdh vmdk ; do
-				icofile="${PN}-${ico}-${size}px.png"
-				if [[ -f "${icofile}" ]]; then
-					newicon -s ${size} ${icofile} ${PN}-${ico}.png
-				fi
-			done
-		done
-		popd &>/dev/null || die
-	fi
-
-	if use lvm; then
-		vbox_inst VBoxVolInfo 4750
-		dosym ${vbox_inst_path}/VBoxVolInfo /usr/bin/VBoxVolInfo
-	fi
-
-	if use sdk; then
-		insinto ${vbox_inst_path}
-		doins -r sdk
-
-		if use java; then
-			java-pkg_regjar "${ED}/${vbox_inst_path}/sdk/bindings/xpcom/java/vboxjxpcom.jar"
-			java-pkg_regso "${ED}/${vbox_inst_path}/libvboxjxpcom.so"
-		fi
-	fi
-
-	if use udev; then
-		local udevdir="$(get_udevdir)"
-		local udev_file="VBoxCreateUSBNode.sh"
-		local rules_file="10-virtualbox.rules"
-
-		insinto ${udevdir}
-		doins ${udev_file}
-		fowners root:vboxusers ${udevdir}/${udev_file}
-		fperms 0750 ${udevdir}/${udev_file}
-
-		insinto ${udevdir}/rules.d
-		sed "s@%UDEVDIR%@${udevdir}@" "${FILESDIR}"/${rules_file} \
-			> "${T}"/${rules_file} || die
-		doins "${T}"/${rules_file}
-	fi
-
-	if use vboxwebsrv; then
-		vbox_inst vboxwebsrv
-		dosym ${vbox_inst_path}/VBox /usr/bin/vboxwebsrv
-		newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
-		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
-	fi
-
-	# Remove dead symlinks (bug #715338)
-	find "${ED}"/usr/$(get_libdir)/${PN} -xtype l -delete || die
-
-	# Fix version string in extensions or else they don't get accepted
-	# by the virtualbox host process (see bug #438930)
-	find ExtensionPacks -type f -name "ExtPack.xml" -exec sed -i '/Version/s@_Gentoo@@' {} \+ || die
-
-	local extensions_dir="${vbox_inst_path}/ExtensionPacks"
-
-	if use vnc; then
-		insinto ${extensions_dir}
-		doins -r ExtensionPacks/VNC
-	fi
-
-	if use dtrace; then
-		insinto ${extensions_dir}
-		doins -r ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack
-	fi
-
-	if use doc; then
-		dodoc UserManual.pdf UserManual.q{ch,hc}
-		docompress -x /usr/share/doc/${PF}
-	elif use gui; then
-		dodoc "${WORKDIR}"/${PN}-help-${PV}/UserManual.q{ch,hc}
-		docompress -x /usr/share/doc/${PF}
-	fi
-
-	if use python; then
-		local python_path_ext="${ED}/usr/$(get_libdir)/virtualbox/VBoxPython3.so"
-		if [[ ! -x "${python_path_ext}" ]]; then
-			eerror "Couldn't find ${python_path_ext}! Bindings were requested with USE=python"
-			eerror "but none were installed. This may happen if support for a Python target"
-			eerror "(listed in PYTHON_COMPAT in the ebuild) is incomplete within the Makefiles."
-			die "Incomplete installation of Python bindings! File a bug with Gentoo!"
-		fi
-	fi
-
-	newtmpfiles "${FILESDIR}"/${PN}-vboxusb_tmpfilesd ${PN}-vboxusb.conf
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if use udev; then
-		udev_reload
-		udevadm trigger --subsystem-match=usb
-	fi
-
-	tmpfiles_process virtualbox-vboxusb.conf
-
-	if use gui; then
-		elog "To launch VirtualBox just type: \"virtualbox\"."
-	fi
-
-	elog "You must be in the vboxusers group to use VirtualBox."
-	elog ""
-	elog "The latest user manual is available for download at:"
-	elog "https://download.virtualbox.org/virtualbox/${PV}/UserManual.pdf"
-	elog ""
-
-	optfeature "Advanced networking setups" net-misc/bridge-utils sys-apps/usermode-utilities
-	optfeature "USB2, USB3, PXE boot, and VRDP support" app-emulation/virtualbox-extpack-oracle
-	optfeature "Guest additions ISO" app-emulation/virtualbox-additions
-
-	if ! use udev; then
-		ewarn "Without USE=udev, USB devices will likely not work in ${PN}."
-	fi
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-
-	use udev && udev_reload
-}
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 0fa3f1ba0bdd..3e512f6b84bb 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/mosquitto/Manifest b/app-misc/mosquitto/Manifest
index 4175bc958be0..0d6a1dc29b3c 100644
--- a/app-misc/mosquitto/Manifest
+++ b/app-misc/mosquitto/Manifest
@@ -1,7 +1,5 @@
 AUX mosquitto 559 BLAKE2B 16a34850c13d9fd6007b5fbd26b4db9e31caa0ee91b8eee8dbca605c273756bf6c92458d5093eee56f603cce7f10956ee084403e188d49693a759538976f411f SHA512 0bb0e648484269c2a5396118340177af10fae9ccbe4973371f7c8f5e31c96ff97c5146680415c450bad63397baa5c076e7c994f897fd3af2fcce0d1e0965ee22
 AUX mosquitto.notify.service 332 BLAKE2B d11f57574ec2cadd6fdaf87080a81fe19a8a78c9b93bc34b388c55def3a5a4feb214700c63899f3cdd87ddb98ed43079035e8363d3f16a345dd0ca52ec7266c4 SHA512 08514d285c333e24a4f5ebba249a59742cf8ba372d434b022416a87f9f667c9c6ac9c64bc0c4c6624d0ea0665a1d15ba2ec244bf77479f5ee11d954595e06723
-AUX mosquitto.service 261 BLAKE2B 6ea8059914acf8730f2e7d04bfd5f79c59a335b65ddecb4773bb4418260c6ed6d0120eaa2e3f7ba4842fc7014e5b51d1ba376cf1db2009b7a55a53a4e6747221 SHA512 3552618733fc106705375c5a1126db72e356694705312072f27f18e21c142cd75ae3ff1f17854ce54cdee092ff9e01fd75c1a8a12d68f75ead8a3697c69623e9
 DIST mosquitto-2.0.15.tar.gz 792632 BLAKE2B a6e986998473c16efd4c5fc5fd743782e085b3e7e30bcdcb867f0ae87f85e608f5d50d0dcc5bbbcc2f25eb6a618ab2f287fdcba47660fa593fe1636d08eb183e SHA512 8a0c58222ea0b9304e7f096f6d13965478072baf1d1c9bc931b32a33f5ea8196c2dd54bde8d83fec7ed9cd413cb5fb115ce0a6701ca20664df52fdd7ca63ddaf
 EBUILD mosquitto-2.0.15-r1.ebuild 3047 BLAKE2B 58cd721382d9cf5cc26125ce8ad3e389a02746a4f8eb5554f095cfbcafb5c3cb21d620ac5c3a6eb8a6f6aa3f07ad3f5e3070e03ad6712b21a08e98bca5b12566 SHA512 5f36caf656def23fef2d515d38614fcc78411f78e924c8d48bd82883cc36d49d73e20e0fe1f4c4ec66bbb43456a833b6fb735fe588c1547dc4cdaba0e9c0c208
-EBUILD mosquitto-2.0.15.ebuild 2947 BLAKE2B 9420bbe6a629a7454e3247ca6ab846132f3ec7684aeb8f720e440aabbba24fb67c84e1f7d569c06bac75d1cce2b16d14bf4a0cdf64b463f501a5f7195fe344cb SHA512 a41f05daa456010c6e79dc4f7939fb26063bd5f249ca4ee99a8a2c9bf18f5e99b81a9eac674406cf0ed366e0ff2fef56055c81ca3dc2897d7ddd74edf4473db7
 MISC metadata.xml 612 BLAKE2B 414070cdd858c5fd76b266459ff7b2a66992e8b11e672212f78e366863cd221aa83516a546c69668217a06b087b7b81853fcdff332368355cd1ff8c1292f0c4e SHA512 64242d12473aad0f0d80865da2499679849f6b55f751d27c3cf38e0a5555a305a2cc59f8dfbe4b9d50f0a6b6bc85062b989511c7118045b2c9c3e1e0d1022747
diff --git a/app-misc/mosquitto/files/mosquitto.service b/app-misc/mosquitto/files/mosquitto.service
deleted file mode 100644
index ebdc28e3448a..000000000000
--- a/app-misc/mosquitto/files/mosquitto.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Mosquitto MQTT Broker daemon
-ConditionPathExists=/etc/mosquitto/mosquitto.conf
-Requires=network.target
-
-[Service]
-Type=simple
-ExecStart=/usr/sbin/mosquitto -c /etc/mosquitto/mosquitto.conf
-Restart=always
-
-[Install]
-WantedBy=multi-user.target
diff --git a/app-misc/mosquitto/mosquitto-2.0.15.ebuild b/app-misc/mosquitto/mosquitto-2.0.15.ebuild
deleted file mode 100644
index dc9f01d4b765..000000000000
--- a/app-misc/mosquitto/mosquitto-2.0.15.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit python-any-r1 systemd toolchain-funcs
-
-DESCRIPTION="An Open Source MQTT v3 Broker"
-HOMEPAGE="https://mosquitto.org/ https://github.com/eclipse/mosquitto"
-SRC_URI="https://mosquitto.org/files/source/${P}.tar.gz"
-
-LICENSE="EPL-1.0"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 x86"
-IUSE="bridge examples +persistence +srv ssl tcpd test websockets"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="test? ( bridge )"
-
-RDEPEND="
-	acct-user/mosquitto
-	acct-group/mosquitto
-	dev-libs/cJSON:=
-	srv? ( net-dns/c-ares:= )
-	ssl? (
-		dev-libs/openssl:0=
-	)
-	tcpd? ( sys-apps/tcp-wrappers )
-	websockets? ( net-libs/libwebsockets[lejp] )
-"
-DEPEND="
-	${RDEPEND}
-	test? ( dev-util/cunit )
-"
-BDEPEND="
-	test? ( ${PYTHON_DEPS} )
-"
-
-pkg_setup() {
-	use test && python_setup
-}
-
-_emake() {
-	local LIBDIR=$(get_libdir)
-	emake \
-		CC="$(tc-getCC)" \
-		CXX="$(tc-getCXX)" \
-		CLIENT_LDFLAGS="${LDFLAGS}" \
-		LIB_SUFFIX="${LIBDIR:3}" \
-		WITH_BRIDGE="$(usex bridge)" \
-		WITH_PERSISTENCE="$(usex persistence)" \
-		WITH_SRV="$(usex srv)" \
-		WITH_TLS="$(usex ssl)" \
-		WITH_WEBSOCKETS="$(usex websockets)" \
-		WITH_WRAP="$(usex tcpd)" \
-		"$@"
-}
-
-src_prepare() {
-	default
-	if use persistence; then
-		sed -i -e "/^#autosave_interval/s|^#||" \
-			-e "s|^#persistence false$|persistence true|" \
-			-e "/^#persistence_file/s|^#||" \
-			-e "s|#persistence_location|persistence_location /var/lib/mosquitto/|" \
-			mosquitto.conf || die
-	fi
-
-	# Remove failing tests
-	sed -i \
-		-e '/06-bridge-reconnect-local-out.py/d' \
-		test/broker/Makefile || die
-	sed -i \
-		-e '/02-subscribe-qos1-async2.test/d' \
-		test/lib/Makefile || die
-
-	# Extend test timeout to prevent spurious failures
-	sed -i -e 's/SUB_TIMEOUT=1/SUB_TIMEOUT=3/' \
-		test/client/test.sh || die
-
-	use test && python_fix_shebang test
-}
-
-src_compile() {
-	_emake
-}
-
-src_test() {
-	_emake test
-}
-
-src_install() {
-	_emake DESTDIR="${D}" prefix=/usr install
-	keepdir /var/lib/mosquitto
-	fowners mosquitto:mosquitto /var/lib/mosquitto
-	dodoc README.md CONTRIBUTING.md ChangeLog.txt
-	doinitd "${FILESDIR}"/mosquitto
-	insinto /etc/mosquitto
-	doins mosquitto.conf
-	insinto /usr/share/mosquitto
-	doins misc/letsencrypt/mosquitto-copy.sh
-	systemd_dounit "${FILESDIR}/mosquitto.service"
-
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		dodoc -r examples
-	fi
-}
-
-pkg_postinst() {
-	for v in ${REPLACING_VERSIONS}; do
-		if [[ $(ver_cut 1 "$v") -lt 2 ]]; then
-			elog
-			elog "Please read the migration guide at:"
-			elog "https://mosquitto.org/documentation/migrating-to-2-0/"
-			elog
-			elog "If you use Lets Encrypt TLS certificates, take note of"
-			elog "the changes required to run the daemon as the unprivileged"
-			elog "mosquitto user. The mosquitto-copy.sh script has been"
-			elog "installed to /usr/share/mosquitto/ for your convenience."
-			elog
-		fi
-	done
-}
diff --git a/app-misc/vit/Manifest b/app-misc/vit/Manifest
index 86977fe525ec..c17c66fa2c5e 100644
--- a/app-misc/vit/Manifest
+++ b/app-misc/vit/Manifest
@@ -1,5 +1,3 @@
-DIST vit-2.2.0.tar.gz 65815 BLAKE2B d7643490d00e5f4b1e3c2ed07d1df859c62696adaecb1225a83dc7c025b1c1f7fb3510c754b5a2f063ceedd5d3b361b9b0bef88436fecabab872c57bc8cd96ae SHA512 5301a6cd0e9d2226f006346feef900ebf984f4a98fa933ef20a3864d487e0393dc801ad66723dda956db411a1797f4e759bd161ddc4fe5c1185599c605d1532e
 DIST vit-2.3.0.tar.gz 72136 BLAKE2B d2988924d9fce8ac2a14f812654ab385bc84f112f3c4d5d150fa04e8151c4cbad7dc5d2d161cc890aa40ceb8a66ac629a1ff53f99531b6166747b379b45764c5 SHA512 49574ebb5dd3127936ec45ab825d927e221c96c32d0966d2c35220b27f5de1df556ff168769aca0b9c22e25f7b86e39d985d326fafe4a33712a3f0c5fa8d9d02
-EBUILD vit-2.2.0.ebuild 617 BLAKE2B a0b87e13f7ff951a69f7e471a0b44331fb27ab47121c8b5da5c8304285b1ce5d0afb040a3f0f8801809ef8a049bbcfed52993cf3724f77ce0a7c1cfd3d148dd3 SHA512 4b882d773cc464c09f9479ac932ab0f3c44dc3c756effc1bc584f43f2abf5885d8e0dab7a4ed9694b9f3be253ce6876888f61f33170b6d983bed9cc3612f3225
 EBUILD vit-2.3.0.ebuild 608 BLAKE2B 4869abe8585917099b69ed19d8a58a4a384acd819b388b65286e994eb6ca9eab6e737af6863dfd1a978c597f12dd7d1ec9a73a24bdc440ec7a5d4437187657e1 SHA512 83ef4590367988240e24ea114c6da47d30b68ad0e41b7e5c0fd51f3483e1c7040096306623e37086345e8d1d09b2305cbab79f39af6bbf545e3679a2ab9db4f2
 MISC metadata.xml 380 BLAKE2B f51041aedacd22c0004363cdf14a43c71991317d7b5779d15ab5d3356f66e1102d4b646639a821aa697265073946af94f23e10eaee9417450c97967225c5e1d9 SHA512 0d8c9b04a3a351c674398072bf33a2c50e7902c97b3011d4c0b3ac65f42b4190f13121b2b4a49e01315e2112ebefd05359a3ec010b4ab03a8ce4e33079f64c40
diff --git a/app-misc/vit/vit-2.2.0.ebuild b/app-misc/vit/vit-2.2.0.ebuild
deleted file mode 100644
index 0890db739edf..000000000000
--- a/app-misc/vit/vit-2.2.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_SINGLE_IMPL=yes
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A lightweight, fast, curses-based front end to Taskwarrior"
-HOMEPAGE="
-	https://github.com/vit-project/vit
-	https://pypi.org/project/vit/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-BDEPEND="
-	$(python_gen_cond_dep '
-		>=dev-python/tasklib-2.4.3[${PYTHON_USEDEP}]
-		>=dev-python/urwid-2.1.2[${PYTHON_USEDEP}]
-	')
-"
-RDEPEND="app-misc/task"
-
-distutils_enable_tests pytest
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 764958cb8ce1..311800ca978c 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/calcurse/Manifest b/app-office/calcurse/Manifest
index 70d4ecddbe0d..9f57cb8276f5 100644
--- a/app-office/calcurse/Manifest
+++ b/app-office/calcurse/Manifest
@@ -1,3 +1,5 @@
 DIST calcurse-4.8.0.tar.gz 716234 BLAKE2B 3fc703626d5e17b78ff42c0ef4f554585efd8223c2bd9d8c2f7add681602dc585cf066ed7c55a040b2585ad07513b26a5297b3b41f4c94a043f61ad2ad9094c2 SHA512 ea156c4320abf97fdb5abc29ff1f9bc659a3cab0e571295ed04b42dd742c4c45a7d5958dc2d386fc0ee7bd733969a6275405d5cf10cd645c75cb97b6b9e571d6
-EBUILD calcurse-4.8.0.ebuild 972 BLAKE2B 7179b3a691afd62d6691c59f6e9747308fe302d405288bda8e87b348caa2d0a8ebaa2ce685ad7d5bd2be384de69d37887a246327000c309a1ca55b59eb8db99c SHA512 0ba375048772df3453b9e15e03915a955cd271453ad87f675430a12faaa62dcb5717aca566eafdfe15902ba362abd6a3b84597d7aac427e92f48dfcd43578c2a
+DIST calcurse-4.8.1.tar.gz 730787 BLAKE2B 0c34b85313c3414dffc08635f6f37feb0a1e0f6c03bcf3b71a6cc95ed8fb4430ab1339abce72850364251884d707acb6cbbed0143d930f8bb76310ca5951b779 SHA512 a0a0bcfceb28a4e363168711a3c2de8f6e94d7f12aa78ff40f157c247ea6a41646bd218a1defba2d128b131ed0ab71c4d417820a0af0adbaa215011b11f0a040
+EBUILD calcurse-4.8.0-r1.ebuild 1061 BLAKE2B b004d683f1e131fc8dda1956bde6b6821dd1a0312476b7aa46bbd773797dc500f25e94a62ab120386d3536bf3b0d86e85728e8927d041700fd55c95b27d4acb9 SHA512 d3c088aa8ed0dc78ea08e24f307b8c744a72d8daf62b37493737865831668fb356b519d0175c3c84a6b00c27ee018b79d27946981c4c4ae8b7cc00bb7c3f11fb
+EBUILD calcurse-4.8.1.ebuild 1065 BLAKE2B 6ca2b80f51b4278b4e2dae3dcbf21c0c7bcdcfd7deca55d4a2f3838a711ec8a772c0eae136343ca446feec76ed5f05af90aa1e6140f6cae39c0e48b197bd2bee SHA512 725822ff3cb7dfc49d81b10b116730c09164184670b1074b8307f36d719481ee019c551b0d19894583178174ae0565fddea8f10631f9d59a254fd36355fdfdd6
 MISC metadata.xml 876 BLAKE2B b99953f6a4226dddb885201957911e1df6105e5bcbb2f69bbf20d35ef275d4c2a59388534ff1fc960285b9df8e96a4c9ce49a1aba945eab275fb418ee764d98c SHA512 c02a99a6f9ceeb94eee3f58d285f97e3d31d1bfaab82c410b9b48d0c9462190e834df8e3a8d634f8474a3ff519f2189d01ab02d6c2383fad54a8f4e6bd19c229
diff --git a/app-office/calcurse/calcurse-4.8.0.ebuild b/app-office/calcurse/calcurse-4.8.0-r1.ebuild
index a918b427a68f..4bdc06bd097d 100644
--- a/app-office/calcurse/calcurse-4.8.0.ebuild
+++ b/app-office/calcurse/calcurse-4.8.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{10..11} )
 
-inherit python-single-r1
+inherit autotools python-single-r1
 
 DESCRIPTION="A text-based calendar and scheduling application"
 HOMEPAGE="https://calcurse.org/"
@@ -19,6 +19,7 @@ IUSE="caldav doc"
 
 RDEPEND="
 	sys-libs/ncurses:0=
+	sys-libs/timezone-data
 	${PYTHON_DEPS}
 	caldav? (
 		$(python_gen_cond_dep '
@@ -32,6 +33,8 @@ DEPEND="
 	${RDEPEND}
 "
 
+BDEPEND="virtual/pkgconfig"
+
 src_configure() {
 	local myconf=(
 		$(use_enable doc docs)
@@ -42,7 +45,9 @@ src_configure() {
 
 src_compile() {
 	default
-	python_fix_shebang contrib/caldav/calcurse-caldav
+	if use caldav; then
+		python_fix_shebang contrib/caldav/calcurse-caldav
+	fi
 }
 
 src_install() {
diff --git a/app-office/calcurse/calcurse-4.8.1.ebuild b/app-office/calcurse/calcurse-4.8.1.ebuild
new file mode 100644
index 000000000000..3472aa9d4909
--- /dev/null
+++ b/app-office/calcurse/calcurse-4.8.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit autotools python-single-r1
+
+DESCRIPTION="A text-based calendar and scheduling application"
+HOMEPAGE="https://calcurse.org/"
+SRC_URI="https://calcurse.org/files/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+IUSE="caldav doc"
+
+RDEPEND="
+	sys-libs/ncurses:0=
+	sys-libs/timezone-data
+	${PYTHON_DEPS}
+	caldav? (
+		$(python_gen_cond_dep '
+			dev-python/httplib2[${PYTHON_USEDEP}]
+			dev-python/pyparsing[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+DEPEND="
+	${RDEPEND}
+"
+
+BDEPEND="virtual/pkgconfig"
+
+src_configure() {
+	local myconf=(
+		$(use_enable doc docs)
+		--without-asciidoc # do not use AsciiDoc to regenerate docs
+	)
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+}
+
+src_compile() {
+	default
+	if use caldav; then
+		python_fix_shebang contrib/caldav/calcurse-caldav
+	fi
+}
+
+src_install() {
+	docompress -x /usr/share/doc # decompress text files
+	default
+}
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 5adc62f6a4ba..defefdf50fb9 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/rapidfuzz-cpp/Manifest b/dev-cpp/rapidfuzz-cpp/Manifest
index 7db4ac21209a..68346102f576 100644
--- a/dev-cpp/rapidfuzz-cpp/Manifest
+++ b/dev-cpp/rapidfuzz-cpp/Manifest
@@ -1,12 +1,3 @@
-AUX rapidfuzz-cpp-1.11.2-gcc13.patch 655 BLAKE2B 43128a01d09354af15dc8d108d5eed127b349142c9632272681e474c5c3e2a6429217634d6013c5cbe5acc48868d1b3e8bd3956fa3492cb6c9d63143b994d2ab SHA512 78b4ad3383449d76bcd403dbf783c76e07ce2f6d1c334a480230d9960ea315c21344a484e441361d6a831bca0bd3a125f6864e602fdaae9eb5c5593f2a285fe4
-DIST rapidfuzz-cpp-1.10.1.gh.tar.gz 284749 BLAKE2B 530476df0120e0a864298f80d786df02e0bc77a9b3482b2be7ff94ed4c4c749828eddadcaae2e8958e991744842380c48e2ce1bfa59062dc592b6a8905dbc234 SHA512 9e33601b85189bca8ff1ff21e33f62fb674d6f6ce5713588f303b5879b02eba84e96421fea3c96cfc6a7393ad5a95c755176d7c17e7f4c81498516f163584bf6
-DIST rapidfuzz-cpp-1.10.2.gh.tar.gz 284978 BLAKE2B 5d2ef555ce2af009d4bb2fbf3e649e6cfc43ab3b20497d8e00c3f99d23173faf3425be4fcaec78820c969a336bb4255e6f680482aba657e838ecc4194e92db01 SHA512 65198df529005264ef94cb308eb09d6569ea805f46fbd42e6fedd18ac949722ff10ed30fbc41aaa986d790566168ff46c2b03ec5f7b6041b2f3e522e534f2ee2
-DIST rapidfuzz-cpp-1.10.4.gh.tar.gz 283916 BLAKE2B e0c3890628dd9303ff7d67d83df5a53f0466ccefd37fca6e56aa8613abc09fc16523e677cee3061425b2bd7720e5c6b26d43f51556ec7b1ef6d48583a1055a9e SHA512 11dfd3b5f869eaf11edcb2c075709416645c89ab6057dbcaf12eb5defd609c33e792265b131942f22e3e2661f8c00a653e23a83eb2ba4bd8c82a7d16960d3b3b
-DIST rapidfuzz-cpp-1.11.2.gh.tar.gz 285371 BLAKE2B c4ac8907f70dbb4718c30e58acca54938a5e53ff7af916a754ec77e353fe628e6db13576c195b35560913410399470cf0f78a23c0e691591786128f0f0ee0d11 SHA512 80ae15a6a3d75679a992d2bfd48de318ec9349cf972adfb94a1d1061e9a8af5e6ed354a1ae7c4cd6b2bb8af8b5382dd07c2be71cf7bb9e064a8f3a568139618f
 DIST rapidfuzz-cpp-1.11.3.gh.tar.gz 285399 BLAKE2B cc2aeda5e519481d718917738a62fb6747514f4fd4cf2d5a9399c4d3b0192e37f4d8e0ec3578bc84cfaba99f8644f13d1fa8af93629615c20f2d28e4507a4d4f SHA512 a27c26021e49b3b8aa0cf73947ce5696b00e32c94fedb00d8d97b4dcb76ebbf107df1813dc479a9bd26942c09577d0bb84b3aea3398f7d750ecd68de4486996c
-EBUILD rapidfuzz-cpp-1.10.1.ebuild 880 BLAKE2B 75a820e8e2e2fc095a96484d8c29d92293753b935224c38ee9466352927e86ba44c82396499ee854a088319a6982ad7f4713b645284725e1a785868d2c3b4047 SHA512 d40a32b45dc55e35871e5e79b307848da4fcc28bcceab5a70acbf47444a81041ec933966dafc7d8c5b13a00ad1db091ebef8d3fdf206a5e88a05e73d02d0efb0
-EBUILD rapidfuzz-cpp-1.10.2.ebuild 880 BLAKE2B 75a820e8e2e2fc095a96484d8c29d92293753b935224c38ee9466352927e86ba44c82396499ee854a088319a6982ad7f4713b645284725e1a785868d2c3b4047 SHA512 d40a32b45dc55e35871e5e79b307848da4fcc28bcceab5a70acbf47444a81041ec933966dafc7d8c5b13a00ad1db091ebef8d3fdf206a5e88a05e73d02d0efb0
-EBUILD rapidfuzz-cpp-1.10.4.ebuild 628 BLAKE2B a993450d45d526bb6aa07da65c5e94c1190957fae52697814e080e5598033b911e31a7eb9cea0f4e78a4b67600081f6f2a520fa51b93bb54600b891d096ad899 SHA512 3c58dad5b361e8dce1e79eafbe6906f14d71a35fc9b5ca3f823aba70cae1c204bb0390acc15ea6b56db681e950feca340b754ab3cc83f59d3c129f8850647816
-EBUILD rapidfuzz-cpp-1.11.2.ebuild 688 BLAKE2B 5e192f101867eb5c6850886749be0d28e189a746ec030902057c63cfc5018649bce3ba12b35bd7dc751706ffaa53af40a971aecf7cd85829a8e50c0626f7ed84 SHA512 2e831c09151fd0ab5d95601aab3a48de771033c3e9e185761b00c682b79d39b7e6c32ac7c1795d1698b412fae498c7751574819bf35d218cfcce1bfaae8c2732
 EBUILD rapidfuzz-cpp-1.11.3.ebuild 628 BLAKE2B a993450d45d526bb6aa07da65c5e94c1190957fae52697814e080e5598033b911e31a7eb9cea0f4e78a4b67600081f6f2a520fa51b93bb54600b891d096ad899 SHA512 3c58dad5b361e8dce1e79eafbe6906f14d71a35fc9b5ca3f823aba70cae1c204bb0390acc15ea6b56db681e950feca340b754ab3cc83f59d3c129f8850647816
 MISC metadata.xml 338 BLAKE2B 43c0cb99a03961ca48146b237a22fbf56c90312b7a39b57a3d01dd532f4f01891e713c802b372b4efb0af528198d8f2c0febae6ffec65da152e8e23f7a67b8a4 SHA512 a54d78c951d15319a2e467dc5d5692d9af5ef9e79c9c9135ee5e26853361ec6bcfebab8e82e3299314f9b7c8cd703365ff6d144e7e6876f486ca5f3a02a3b0f7
diff --git a/dev-cpp/rapidfuzz-cpp/files/rapidfuzz-cpp-1.11.2-gcc13.patch b/dev-cpp/rapidfuzz-cpp/files/rapidfuzz-cpp-1.11.2-gcc13.patch
deleted file mode 100644
index c3e8117d22e3..000000000000
--- a/dev-cpp/rapidfuzz-cpp/files/rapidfuzz-cpp-1.11.2-gcc13.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-https://github.com/maxbachmann/rapidfuzz-cpp/pull/102
-
-From f3c691bd8a0659ac3acb7510dab5a536f4d41e1b Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Tue, 18 Apr 2023 07:33:39 +0100
-Subject: [PATCH] Fix build with GCC 13
-
-GCC 13 (as usual for new compiler releases) shuffles around some internal includes so some
-are no longer transitively included.
-
-See https://gnu.org/software/gcc/gcc-13/porting_to.html.
-
-Bug: https://bugs.gentoo.org/895696
---- a/test/distance/examples/ocr.hpp
-+++ b/test/distance/examples/ocr.hpp
-@@ -1,4 +1,5 @@
- #pragma once
-+#include <cstdint>
- #include <string>
- 
- extern std::basic_string<uint8_t> ocr_example1;
-
diff --git a/dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-1.10.1.ebuild b/dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-1.10.1.ebuild
deleted file mode 100644
index 3e5e9ce8ba7e..000000000000
--- a/dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-1.10.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Rapid fuzzy string matching in C++"
-HOMEPAGE="https://github.com/maxbachmann/rapidfuzz-cpp/"
-SRC_URI="
-	https://github.com/maxbachmann/rapidfuzz-cpp/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	test? (
-		>=dev-cpp/catch-3
-	)
-"
-
-src_prepare() {
-	# apparently "C++ best practices" don't mind fetching random stuff
-	# at build time
-	sed -i -e '/aminya/,/^)/d' test/CMakeLists.txt || die
-	find -name 'CMakeLists.txt' -exec \
-		sed -i -e 's:project_warnings::' {} + || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DRAPIDFUZZ_BUILD_TESTING=$(usex test)
-	)
-	cmake_src_configure
-}
diff --git a/dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-1.10.2.ebuild b/dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-1.10.2.ebuild
deleted file mode 100644
index 3e5e9ce8ba7e..000000000000
--- a/dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-1.10.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Rapid fuzzy string matching in C++"
-HOMEPAGE="https://github.com/maxbachmann/rapidfuzz-cpp/"
-SRC_URI="
-	https://github.com/maxbachmann/rapidfuzz-cpp/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	test? (
-		>=dev-cpp/catch-3
-	)
-"
-
-src_prepare() {
-	# apparently "C++ best practices" don't mind fetching random stuff
-	# at build time
-	sed -i -e '/aminya/,/^)/d' test/CMakeLists.txt || die
-	find -name 'CMakeLists.txt' -exec \
-		sed -i -e 's:project_warnings::' {} + || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DRAPIDFUZZ_BUILD_TESTING=$(usex test)
-	)
-	cmake_src_configure
-}
diff --git a/dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-1.10.4.ebuild b/dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-1.10.4.ebuild
deleted file mode 100644
index e11823f7af67..000000000000
--- a/dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-1.10.4.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Rapid fuzzy string matching in C++"
-HOMEPAGE="https://github.com/maxbachmann/rapidfuzz-cpp/"
-SRC_URI="
-	https://github.com/maxbachmann/rapidfuzz-cpp/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	test? (
-		>=dev-cpp/catch-3
-	)
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DRAPIDFUZZ_BUILD_TESTING=$(usex test)
-	)
-	cmake_src_configure
-}
diff --git a/dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-1.11.2.ebuild b/dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-1.11.2.ebuild
deleted file mode 100644
index adba46f925b6..000000000000
--- a/dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-1.11.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Rapid fuzzy string matching in C++"
-HOMEPAGE="https://github.com/maxbachmann/rapidfuzz-cpp/"
-SRC_URI="
-	https://github.com/maxbachmann/rapidfuzz-cpp/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	test? (
-		>=dev-cpp/catch-3
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.11.2-gcc13.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DRAPIDFUZZ_BUILD_TESTING=$(usex test)
-	)
-	cmake_src_configure
-}
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 95d54d164a2b..cb784f89b253 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/bitarray/Manifest b/dev-python/bitarray/Manifest
index ed94ca4368a3..1fd07079f9ac 100644
--- a/dev-python/bitarray/Manifest
+++ b/dev-python/bitarray/Manifest
@@ -1,3 +1,5 @@
 DIST bitarray-2.7.3.tar.gz 123574 BLAKE2B 9a7a1b0025a7853434ae5e1c6e7bc5302668016f3cf8d569376644ced092ab1b3c28eeaabdf9d51d604e98a3f68f8f8d3002a87cc4dbfd897e30e6b162adf4aa SHA512 4ace2bfe78e06723bedbc263c7b2b163bbc5c35bde84f286390cbfffc8c513bbd4a4f5f775e6d0a863ded7b24cb555c7784e7dd067c3b9125abd8d62863ac684
+DIST bitarray-2.7.4.tar.gz 124644 BLAKE2B 7fc11eef67ec1424288952096acc6c629cc8281925a964cfbb384982eab9117b3def7a456dc740f9d5b7ee18dffa6c4747321dffed5f5e7fb674f5edf0324a88 SHA512 dbf92bfeae721319c928e336bc5afb8d146f2ad71fb57934dde489bc3db8db95a15690d8f1ca5c7354e44389043f194226afae5d9539495999ef486576639b6c
 EBUILD bitarray-2.7.3.ebuild 542 BLAKE2B f71d30dc15c12379f9a7a41f62effae2e6adef21ba04535eaf0289aa3aa00c17d78378c4de7b8b155697fd4f51d32ca735481f68ddacf756ca8de9d97f10d6b2 SHA512 54f3eb3aaf5e54227a453a0c24eb8aa705a5619748ea5970305b7ae685fe98a1ae01c5b832c6e97ca60faf3debd2952d07d9146da65e007c65bd12754149cbd8
+EBUILD bitarray-2.7.4.ebuild 544 BLAKE2B a07ca05602c006504534a6416b62a5176bd60ea3de6b3956283ae1c4b4ab08e41026249a7eaf81e1110bc1a104943093b04796d1e578a277667746f47d985b76 SHA512 d8edcd1ae9b639ac772a73728bef93480e2c129a38475cacac07da97a8f1f71360c0770fdc82b23f387621185a83eccd3ee396ad8a55d712a961635475be64fa
 MISC metadata.xml 1207 BLAKE2B 67a57c61a71655fcd94e7025fe4d30792b6921a40f151d827f4c936dbc96c2b81afd2f2a302cfbf15356a591be941268561545d7ac7bc0cdb19e3f87a03e4b4b SHA512 5069c6622d7840c402007c420169e679da08db020952f798fd4299d6f1b324ce8cead3ca2a9072b96d8d852d5630827833eb27d39a190153e8da46ac9f386b90
diff --git a/dev-python/bitarray/bitarray-2.7.4.ebuild b/dev-python/bitarray/bitarray-2.7.4.ebuild
new file mode 100644
index 000000000000..1a904d98ff80
--- /dev/null
+++ b/dev-python/bitarray/bitarray-2.7.4.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Efficient arrays of booleans -- C extension"
+HOMEPAGE="
+	https://github.com/ilanschnell/bitarray/
+	https://pypi.org/project/bitarray/
+"
+
+SLOT="0"
+LICENSE="PSF-2"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+python_test() {
+	"${EPYTHON}" bitarray/test_bitarray.py -v || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/coverage/Manifest b/dev-python/coverage/Manifest
index 42938016b67e..b841485bc28a 100644
--- a/dev-python/coverage/Manifest
+++ b/dev-python/coverage/Manifest
@@ -1,5 +1,7 @@
 DIST coverage-7.2.5.tar.gz 759465 BLAKE2B 79670165a2516047ce3b28c331ec62c7c578fbfe14bd1179be65e52c5e57923ffb0d365f9153a78134ed5d95e4e04a8eadb6df3cbc49559659cf8cb77aa9d611 SHA512 3c4ec5aaba06170c860baa23ba61fe6f19b95a433430f045272839c13cc5bf4fb12a2a030d987ad5713202c75273646639da1257c0a618658f090c8a9fee41a7
 DIST coverage-7.2.6.tar.gz 762287 BLAKE2B 68fbd5aeecb635773b509647d3d2ae3e0a46dbc34061ff0bc22ee96b0aedd77e9d9cc772f5a10ce6dbd33035765fb61325e39674804174c10a4f8bf930e5697f SHA512 b4ef257cb2ed4297e7e3f18193bec7f0ad3e81735ce4406f96fd41b0fd2becb9f16c65f3699ccb11f145f14c1c144b9d987308353d15969e47ce0b956cd8f8fc
+DIST coverage-7.2.7.tar.gz 762575 BLAKE2B 20a800c3cd62095aacdfa4853613a3fd579abacd9051878ee2b308360db181ad45b68a0866236666826efc510d4a0328273d63c78c42fa4a7419ac98f85cf3f4 SHA512 01ed5ef8ddb600b8a7443200b568eb5d8aa7d652f408617f78a2e1251a5f091ee05188a7d383acd530f29b688b67a4bf2dc2e1241efffe8b9d0f70f44c646f33
 EBUILD coverage-7.2.5.ebuild 2025 BLAKE2B 55c67695be6587338269e9d1645e0eded19179e4bed39fa3ac4005f1844e5d1178a46f72e74c1142889156a0c2236f5500985ace896feb67978a726c7e755689 SHA512 821f7eeb1876c641bc2e8c07c61aac2351abc911aa29077ed182e4e8d21ba7e1b18af80e8419409e53cbf18e3e1810efd49ae0ae6e8a86363fbbd58a6b9318f3
 EBUILD coverage-7.2.6.ebuild 2034 BLAKE2B 46883fc008f8fde85866ba8ed065140e6048cf9a7410ffe346f71bfe267dea9379652e4b205e617323472d87134501c6fdda654278ecd97d4c2f1f64bb4009c3 SHA512 5761721029a753a8de4ab6e285a1293badc81a827a87c32203b1417572929534d0c650d16b0faa6125c256aab4a6543637d8911c6c7445484a33e047e0021ddb
+EBUILD coverage-7.2.7.ebuild 2034 BLAKE2B 46883fc008f8fde85866ba8ed065140e6048cf9a7410ffe346f71bfe267dea9379652e4b205e617323472d87134501c6fdda654278ecd97d4c2f1f64bb4009c3 SHA512 5761721029a753a8de4ab6e285a1293badc81a827a87c32203b1417572929534d0c650d16b0faa6125c256aab4a6543637d8911c6c7445484a33e047e0021ddb
 MISC metadata.xml 771 BLAKE2B 38e9680d0851f70050aad987714a9dd2f95178b0bc3d794dc08726c0618d1ea98be32a413ac397f4b222e8a5d8fdc747b7f1677bcfe842bac4080537e85a03a9 SHA512 8c44c40348fe5d416d8b4016fe22cc9ae0b94fbaf181deb79aa737f87271992521b710c1208d0eeb7ef92d96fc8a7daac1ec6feb1ae081a80f13327b5b094064
diff --git a/dev-python/coverage/coverage-7.2.7.ebuild b/dev-python/coverage/coverage-7.2.7.ebuild
new file mode 100644
index 000000000000..fe37d315b48e
--- /dev/null
+++ b/dev-python/coverage/coverage-7.2.7.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite(+)"
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Code coverage measurement for Python"
+HOMEPAGE="
+	https://coverage.readthedocs.io/en/latest/
+	https://github.com/nedbat/coveragepy/
+	https://pypi.org/project/coverage/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/tomli[${PYTHON_USEDEP}]
+	' 3.{8..10})
+"
+BDEPEND="
+	test? (
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		>=dev-python/unittest-mixins-1.4[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/addopts/s:-q -n auto::' pyproject.toml || die
+	distutils-r1_src_prepare
+}
+
+test_tracer() {
+	local -x COVERAGE_TEST_TRACER=${1}
+	einfo "  Testing with the ${COVERAGE_TEST_TRACER} tracer ..."
+	epytest tests
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# TODO: fails because of additional "Terminated" print on SIGTERM
+		tests/test_concurrency.py::SigtermTest::test_sigterm_threading_saves_data
+	)
+	local EPYTEST_IGNORE=(
+		# pip these days insists on fetching build deps from Internet
+		tests/test_venv.py
+	)
+
+	"${EPYTHON}" igor.py zip_mods || die
+
+	local -x COVERAGE_TESTING=True
+	# TODO: figure out why they can't be imported inside test env
+	local -x COVERAGE_NO_CONTRACTS=1
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=_hypothesis_pytestplugin,flaky.flaky_pytest_plugin,xdist.plugin
+
+	local prev_opt=$(shopt -p nullglob)
+	shopt -s nullglob
+	local c_ext=( "${BUILD_DIR}/install$(python_get_sitedir)"/coverage/*.so )
+	${prev_opt}
+
+	if [[ -n ${c_ext} ]]; then
+		cp "${c_ext}" \
+			coverage/ || die
+		test_tracer c
+		rm coverage/*.so || die
+	else
+		test_tracer py
+	fi
+}
diff --git a/dev-python/flask-login/Manifest b/dev-python/flask-login/Manifest
index 479da03ea107..d4690c467e7b 100644
--- a/dev-python/flask-login/Manifest
+++ b/dev-python/flask-login/Manifest
@@ -1,5 +1,5 @@
 DIST flask-login-0.6.2-werkzeug-2.3.patch 7954 BLAKE2B 4f732dbaa6bdbc8827f52eb9c1d046f2128908df316a1ca94b11ce8033fa8fa506ae41255b8f0e32bc91feae8874b995c2f46d2b7f4fbc5f9020748c5be1db23 SHA512 911fb67e96006073af1df6cf39b4be6eac4aaee63bdcab8d7191b097acb441fd984b3929200db6c0f1f329a65df33acaffc08e88409010fa40f0a787dc47c427
 DIST flask-login-0.6.2.gh.tar.gz 48195 BLAKE2B 74d980f9900d9c583e03caa704cf637c5c6dac6a26e74bc008f47c18213764bafef16e33d9d28eee588b3c2f7d2a5895eae88e5adf755fe0448f7e74d5c65e74 SHA512 b286272ad5f7de2cfc913bee4a3eac46e4c1ce274bb12467009e1abae422f1a855aa49fd898778b8a2e937eebe9fbb387af11815267a2bc120cde943939111ec
-EBUILD flask-login-0.6.2-r1.ebuild 1027 BLAKE2B 1312e7f1728bd96f9d4af156806e2179655549e05c722188d7f6f88dda7fac16a7a10b6f3b876d6d66ae9b36d11b125ca6bd6bfd29f7d0642a34d899f4c327a7 SHA512 397c37ec41a3f0ae7ca99cad2d08fbdeb627dd21576707ab894a066d89c668876881defec5507772f270128905f86d7e8cd3bfc70bd0aa84a3196bc9884cfd1a
+EBUILD flask-login-0.6.2-r1.ebuild 1023 BLAKE2B 37f4c2dcd0e32c918b5dbe1875ce23ad1f461ea6d92fe423a9a6284648b59235c7c7d779edb803863312096d4675ef180abaf9af0eac03204e0b45e3d8ed9085 SHA512 05b81f69c9446aeabc160aeeb341ffbe3cd8eec09dde86b9128702eb9149664b128b821a24e8cd32968f2726d50164e0681730d942b375ce59104a9840f3813d
 EBUILD flask-login-0.6.2.ebuild 927 BLAKE2B 5480554191f01aed63fad897510b76f2ea15f0ba465b55520e2f7ee72e51c08e1ea6016e5c10bc82fd11c1563d987662ae07ee2b490c8b8ea257529ed58af97a SHA512 16c948795c1531a9c535b0d34215728b3ee1c76feedd93215defba436ff322584f441b5bffe6f96ccb593a32cee9ce7e7ac50a988d2659c0d47b35eb8b6b0d84
 MISC metadata.xml 404 BLAKE2B 8f8070dd3be696102c88bf75e22511b75432dfd17d21f6f3ce084cbae8092bc91ce1cbb7e47d691c7ac502afd58882ccd0bd1ea732df9239a4ec1b70e8728f19 SHA512 0b32444d9f1508697be1a19a6eb57efa5cbff443baf35958c24161d0b716a55d96b0caf66936925970904642fde975d94f4360b8b96d018ebe0fad24216769a4
diff --git a/dev-python/flask-login/flask-login-0.6.2-r1.ebuild b/dev-python/flask-login/flask-login-0.6.2-r1.ebuild
index 89c258f60b4f..aca2a2ea9e02 100644
--- a/dev-python/flask-login/flask-login-0.6.2-r1.ebuild
+++ b/dev-python/flask-login/flask-login-0.6.2-r1.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	>=dev-python/flask-1.0.4[${PYTHON_USEDEP}]
diff --git a/dev-python/flask/Manifest b/dev-python/flask/Manifest
index 326d178da8bd..0ff836cd9772 100644
--- a/dev-python/flask/Manifest
+++ b/dev-python/flask/Manifest
@@ -3,7 +3,7 @@ DIST Flask-2.2.5.tar.gz 697814 BLAKE2B 62d7bedf533f1e47c359c76e7a83e4edca15c3cac
 DIST Flask-2.3.1.tar.gz 686211 BLAKE2B 83998bccde3c3b0abc413c27e4db7589ebbd82cad025ca2926e977bb267248164d529f9bd7b04483070a05fde3c6ce90ed2014ab510c689da0210d3c32af9364 SHA512 371d85a9af74484d7d77dab1747f9d331e797fa2bfeb3f2c72aa679091852efa505c56f37c197d7cb2f02a77a6e88ec2f1ee8efe35fc65d2c23afe5b24d6f4db
 DIST Flask-2.3.2.tar.gz 686251 BLAKE2B d81553b100e88ab79218422d6d39bb8b186f436c3729985504d1f54536b5e0f783509dcfbf0791890e7c03928131ddd4b8894db51f27e4075c50248ebd7846a2 SHA512 7917c3658a1dec77decad2dbc067a1ae602a66007573f1ff26527c214dede2c455ca5e6490159922fac967ceea99bd880cf929d05e21ed49b08abf501d96e8f8
 EBUILD flask-2.2.3.ebuild 1440 BLAKE2B 285d96058313bcbd179afb10da1ac9e8451e0b209262951d7d0ac6ea527bcf07fa0fb82f736ee3dfaf5e9afaef95124dbdd1ffe91bf3248640cdd28acd357b39 SHA512 1595e3c1b70e2aec21ab368d3fc4a3dd1e35912da09bfbc6efa44854eff9a2b199c7949d24246a846621016496d079b574a26e79c187c87efc4040ac0d064e4a
-EBUILD flask-2.2.5.ebuild 1448 BLAKE2B 64ea6025e49b52dd44dbda773d9d7c1ffd894a868960307c926ea1a5fe37c9c335fef59f71c37a0f23b60000bf5e53fe7b4a33488097f5893b2cbf4b9569f742 SHA512 9e13793c11bb8e82ca8124ee2b2adacfa53f29e9253a7d9c65253f0cdefcbba85be8a409b9c35a43c5005c2fb2dce22d6ef1dba67106d7c829b80b7111aaa1eb
+EBUILD flask-2.2.5.ebuild 1440 BLAKE2B 285d96058313bcbd179afb10da1ac9e8451e0b209262951d7d0ac6ea527bcf07fa0fb82f736ee3dfaf5e9afaef95124dbdd1ffe91bf3248640cdd28acd357b39 SHA512 1595e3c1b70e2aec21ab368d3fc4a3dd1e35912da09bfbc6efa44854eff9a2b199c7949d24246a846621016496d079b574a26e79c187c87efc4040ac0d064e4a
 EBUILD flask-2.3.1.ebuild 1460 BLAKE2B 108dd7d59d54718cc61ca297bc042f45408a04ec4ef6769ccb8118f060a878986db818c89aa1b950dfec7b3a8cffa924866d671bcf9fa6bf5638126ac269bfef SHA512 9b1b67c4d15eba496a79a676178a18bb7bf5b3141c2133867ce05cd5470958a877764c1d61f33dff89fbae72c61e301e1ee2ca3c4de7530390504805cb8023c2
 EBUILD flask-2.3.2.ebuild 1615 BLAKE2B 7bdffcdaf68ecfff3d7a00f21f910c3b239a728441535ab7342c907c695081b40784ef9b0f2de778c3dbe0d2be5828a46815d0bdc9c06321d237eba2d6458d07 SHA512 b93e5bf5e959d579da84a48c23cc6bc911c1a5cca1d2cf8b0fd7ba26a049bcd5ccd938ded093ce052abb5af72a78d02238a8712890ad2ca91ee2c91d943c72d9
 MISC metadata.xml 386 BLAKE2B b449c54b966bc8943f7b7b12d6126867a89a2759eb749c08f7ad53a174e93ecad07f09b5e30c8562c63ab05df75a82e2f48f550ea8cf3a546f5afc2eef5a896d SHA512 123334db31948046e47f3cdbe0237cdec3dc2207485c8243d1e34e065436995423b6a89909563a6158741a8cc62a7fdad95923870a7114cf69e58ef715e7ec5c
diff --git a/dev-python/flask/flask-2.2.5.ebuild b/dev-python/flask/flask-2.2.5.ebuild
index a5d6cd13fc07..50981fdaf46e 100644
--- a/dev-python/flask/flask-2.2.5.ebuild
+++ b/dev-python/flask/flask-2.2.5.ebuild
@@ -21,7 +21,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	inherit pypi
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 
 LICENSE="BSD"
diff --git a/dev-python/icalendar/Manifest b/dev-python/icalendar/Manifest
index 30bd32b1f2fd..b7f9c71ec074 100644
--- a/dev-python/icalendar/Manifest
+++ b/dev-python/icalendar/Manifest
@@ -1,5 +1,7 @@
 DIST icalendar-5.0.5.tar.gz 103204 BLAKE2B 20887b535f595ab222f3aca8ac396a71b53975816663693f89277a03be41885780d0b15269cd5955e00eeda0867db46781ea2300f542bca1a18687d50e025989 SHA512 1c1e6c94e2caa07686bc12389c3a5b823478f1652695bc167af95c26f92bbd3d60fb4e540d74eb90db289c647bfd6e1c82e83ee8f89bc87b80100d8b6fe5dd90
 DIST icalendar-5.0.6.tar.gz 103352 BLAKE2B 642d5adace1358001f3691697443824a39347ab86cab2643f428e64cc47f1c231ed501b6d4fabe21a357ce357ed951467d41ccdbbce70bbe666b8aeda1c19e67 SHA512 696240e7e4efe57a194be5fa0e6158284e297277e72f7aea0bc547db5f638dae05ca8cafcadedb43673f1d9f19241f25516d90e8247a79660d8b2ef71c5da11a
+DIST icalendar-5.0.7.tar.gz 104099 BLAKE2B df45ee6b8c1ad5bfc558195e86e2456aae8f70613724ba16e74093e5454695d8d4ef2e0eb2e312dd2a94c3a12bc6e4febc21174e8380e249f2de906500a1cfc8 SHA512 c541e61d79b76123d119e51ee6d927795a7d675aded427a21bd38d0f069ea454e182a61ff86b96c7769c42560dfc20f7facb00dfe8a9cfa47da74b279d841b42
 EBUILD icalendar-5.0.5.ebuild 970 BLAKE2B 2e9b781f2c304954051b413dd5a0452d79b93359d65780b03e6fb989ea717b41aa7739ccc5f02f3ac0eb3714f65266edbf88a19a4625d48bd3bc7b4bea69c3e3 SHA512 3bd0182cff301cd0e743ff1e20a7042b4ca6afb1a932d3f3ad07a6a6942835235759c8fabf0ed459976c0bf8271a990bda4743806d6f671bd3ba2b5ecc5edd8e
 EBUILD icalendar-5.0.6.ebuild 973 BLAKE2B 6266670c66e7489a46f4f1768104dd4bb8e5a6cba514b3e0e05bdb94e561eddf6957f3a1c1bb697f89a0aac67234abd3ca79e1af9fb9da570f1c4f532f879496 SHA512 b7fe0166eec14a3f42669118a817f6f5f8d22e11ab05f806916068e3a0500ac684cf1b07093e24adecd4a1fa50e9acf5e9f43520cfed6e6a0f12b7141e2c49e2
+EBUILD icalendar-5.0.7.ebuild 973 BLAKE2B 6266670c66e7489a46f4f1768104dd4bb8e5a6cba514b3e0e05bdb94e561eddf6957f3a1c1bb697f89a0aac67234abd3ca79e1af9fb9da570f1c4f532f879496 SHA512 b7fe0166eec14a3f42669118a817f6f5f8d22e11ab05f806916068e3a0500ac684cf1b07093e24adecd4a1fa50e9acf5e9f43520cfed6e6a0f12b7141e2c49e2
 MISC metadata.xml 503 BLAKE2B 284f63e95eb2d3015979a14774f8ff9df0df701b81f8aa2c7583f52d05973cfede1db8eb7904203b854165e10640cc50a0e3cf14d9aff090d9ff657c53098cee SHA512 d206db3c1255c8e475c4289c548f0224c7fc507aae513d3c15706998892ef8450400a97bd07dc7d52142a03cad4abae3595d5315d8912586440df74096edea67
diff --git a/dev-python/icalendar/icalendar-5.0.7.ebuild b/dev-python/icalendar/icalendar-5.0.7.ebuild
new file mode 100644
index 000000000000..531c29848677
--- /dev/null
+++ b/dev-python/icalendar/icalendar-5.0.7.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Package used for parsing and generating iCalendar files (RFC 2445)"
+HOMEPAGE="
+	https://github.com/collective/icalendar/
+	https://pypi.org/project/icalendar/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/backports-zoneinfo[${PYTHON_USEDEP}]
+	' 3.8)
+"
+BDEPEND="
+	test? (
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# reset conf.py to not read version from an installed instance
+	sed -e "s:pkg_resources.get_distribution('icalendar').version:'${PV}':" \
+		-i docs/conf.py || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/immutabledict/Manifest b/dev-python/immutabledict/Manifest
index 7e0ced9e85da..f13cf3336ea9 100644
--- a/dev-python/immutabledict/Manifest
+++ b/dev-python/immutabledict/Manifest
@@ -1,3 +1,3 @@
 DIST immutabledict-2.2.4.tar.gz 4314 BLAKE2B fb971bd1a7f2e577131cd19d97e6eae840ad8ea4a3eda96ff54e20235202b791029e2f76b19980c54ab2679ad7147ef420e3ba237e01f5da303efa8108f218cd SHA512 436e39ac98ea9e8ad262113ef6d8ad629800adf29eda5c064e679167d57515d90165ec4a14e572281711f1a26ae0ea3f2164b6487024b20c31895f966fc0050a
-EBUILD immutabledict-2.2.4.ebuild 432 BLAKE2B 8d1df8264f81e9f0efd4ce23a15dfc4128aaa9fcbb778b1072a1188998f8ce2f574cf929984628cc56d5fc1d7bb6273a1326036f0084fadeb3924f3fadf9a512 SHA512 b4e030a95dc96967f51f9a3ec8f8ab80cd554dc39ea813394d81e8fc11de1b9017ac5add18f70da57bc972b40d352a79a06278ad66c6aa5e3a089c23aba41391
+EBUILD immutabledict-2.2.4.ebuild 431 BLAKE2B e2544106cf6934ee6009ab2a45cbf6012b66cfda7874c50d7a46b3cf8c97f0141033c53e9fe12365d2eab6352bf922be6f6d53462805a36d74a5d350282b7783 SHA512 9531498803bc784554579112ff6b4c01b2cd2145c89fb3fbb565431492b630b4caabcedc8b81a5fc403354f99460683fc4c259e3590bce265b9d1c0fabeaf972
 MISC metadata.xml 554 BLAKE2B 0b375fc6fe772da40d9e33ee6ba495a0c8f514816191621754f836ab45c87dd0430a3139b880e782db1b9ef12919824887ae61858386f438d7421e6e93a418e4 SHA512 064046ff49e9b536aaf0793fdf9c884f745f9c135897d40713961ccb308bbad27c94dad2ddfff42714122656fb398cf3ae849ab3a87f2a71aaf13d900203a55d
diff --git a/dev-python/immutabledict/immutabledict-2.2.4.ebuild b/dev-python/immutabledict/immutabledict-2.2.4.ebuild
index 2186bb61ba75..d1f63246357f 100644
--- a/dev-python/immutabledict/immutabledict-2.2.4.ebuild
+++ b/dev-python/immutabledict/immutabledict-2.2.4.ebuild
@@ -15,6 +15,6 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
+KEYWORDS="amd64 ~ppc64"
 
 distutils_enable_tests pytest
diff --git a/dev-python/jaraco-env/Manifest b/dev-python/jaraco-env/Manifest
new file mode 100644
index 000000000000..4122c65fbdfd
--- /dev/null
+++ b/dev-python/jaraco-env/Manifest
@@ -0,0 +1,3 @@
+DIST jaraco.env-1.0.0.tar.gz 6664 BLAKE2B c5559444d386fe34d6f639795f9adb68bc750452a7a3b2360971b07bc9876921466e6da9ff1f2d1891910c94891759de8550af0c4f9da311ae7443bfc7c3bdf1 SHA512 67879bd531bb1056bab0dfa47f92a7257e184b8db2a9bf3d588460070401e76e884cf3134ee4c01a6c517d48a0e111fec3a4759d305ee7608797816b27d33473
+EBUILD jaraco-env-1.0.0.ebuild 524 BLAKE2B bc95d9a3589da84c635fbc6f27a582d53b32aef336ea15204976a86fd1f6d6b3a8c997cf52891f1faf58fd488490a0a4ad940305b21cc6e7a0389a09ab452747 SHA512 7fe8c8418565147bdfeab07dc2116205bd55c64d983074fe5396339784ea7c414e0245a8b755be03f359f02f924a8f5430c1304b2558af0e8ab4d831a19b04d3
+MISC metadata.xml 460 BLAKE2B 13df19da03eef0a09ca1e4d70ebb30a8457d3fdba778a69779467c9830089f49203eb08ac4223533e1596e339adeefb02d9353b4298fc8d5b77d590371cfa44c SHA512 0b4c61f9e43910fc959a60af3c8f86356bab890f21c93da84687a1345e39fc5def993ea78934c4cc296491e6259095c3d532a19db6f903702d4a864611e27804
diff --git a/dev-python/jaraco-env/jaraco-env-1.0.0.ebuild b/dev-python/jaraco-env/jaraco-env-1.0.0.ebuild
new file mode 100644
index 000000000000..0ffb98b5fc45
--- /dev/null
+++ b/dev-python/jaraco-env/jaraco-env-1.0.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYPI_PN=${PN/-/.}
+PYTHON_COMPAT=( pypy3 python3_{10..12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Facilities for environment variables"
+HOMEPAGE="
+	https://github.com/jaraco/jaraco.env/
+	https://pypi.org/project/jaraco.env/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/jaraco-env/metadata.xml b/dev-python/jaraco-env/metadata.xml
new file mode 100644
index 000000000000..493b35446cb9
--- /dev/null
+++ b/dev-python/jaraco-env/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">jaraco.env</remote-id>
+		<remote-id type="github">jaraco/jaraco.env</remote-id>
+		<bugs-to>https://github.com/jaraco/jaraco.env/issues</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/jaraco-functools/Manifest b/dev-python/jaraco-functools/Manifest
index 38ed4ddb73ff..d68817369534 100644
--- a/dev-python/jaraco-functools/Manifest
+++ b/dev-python/jaraco-functools/Manifest
@@ -1,3 +1,5 @@
 DIST jaraco.functools-3.6.0.tar.gz 16054 BLAKE2B dad26dc73b696dfc62d21f1807a8340e770b35881f3877fdcf6e7e95080f0cd1a81339500c306f4afb2dda896a19ffffcc1715cfc4d37f36594d59af3fd58ac0 SHA512 f249e6cdcbd88e5c89663bcc0467687ea533dc70b7c9260880da8099380b5c925f05933527de6043aa0786709a0ca4d4b183cc18acab69d8e88f63a3360e9efb
+DIST jaraco.functools-3.7.0.tar.gz 16107 BLAKE2B 3a8419af3d104118144bba053c94d2f1db0972f3a908fa66cc69ec4dfe31bb6ecb1f1a2f43d7ccdbca0be5094d21e15d40d9f8d75b3ba66e606fced08150872f SHA512 37b33b526a3f3cff259c93c764bdde06015440bef025d9f5a177125a654abb23f96d71f0b4f4e73cdfe7274af1575a01d8e112f9d333cbe12f53b1583bae1d5a
 EBUILD jaraco-functools-3.6.0.ebuild 1495 BLAKE2B 8da7bd57038bf0a8cbe4f9eab4a4b06f3778c3a16ca7f5724c8e9d331828b9523b8c4fbb2b16bf3759e5caf99435592c7574afc4258ecc6c2c99d998ffcdc0b0 SHA512 b0044cf601f2e2a73911b4e3d4a8ecb51ac28c033ddb799824cdd26eb8345eb617878e1cf5d20aa40e65d0fa8f9d2df217e3ca6bf236c363350822aba098c523
+EBUILD jaraco-functools-3.7.0.ebuild 1503 BLAKE2B f9dfc8e7fd1e7145862e249d8cfa1529e1bcd00ab39835a2aa76eb9037643662c8c175cbcc557ee76e687b55430e945505ffe54fffd0cd711a1d72dcb2716f2f SHA512 006bc487e4ca6a5c739cbf10c25c6983be2a7dd6828236891599a004034f03f4320f5ab2745898d2d9e16162e810fe5e3096321259c88c80b978afdc9ce581d1
 MISC metadata.xml 570 BLAKE2B 5841838997ccd442b54b3eb9c20efa7956ca94c8e6430184990a16370891628b25fac7fe154b6777f606ac8f448e9b54d5cc71118656abee37179c6a18e6ce4e SHA512 15c90f04baad75fbc5e0b59d9dd661467bf5ae4df6e242a3f48b3fedeb8648c9ec690f459d033713002a604ed7acde9f023711583181551565ad395856ae9b25
diff --git a/dev-python/jaraco-functools/jaraco-functools-3.7.0.ebuild b/dev-python/jaraco-functools/jaraco-functools-3.7.0.ebuild
new file mode 100644
index 000000000000..0607441caa3f
--- /dev/null
+++ b/dev-python/jaraco-functools/jaraco-functools-3.7.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
+EAPI=7
+
+DISTUTILS_USE_PEP517=flit
+PYPI_NO_NORMALIZE=1
+PYPI_PN=${PN/-/.}
+PYTHON_COMPAT=( pypy3 python3_{10..12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Additional functions used by other projects by developer jaraco"
+HOMEPAGE="
+	https://github.com/jaraco/jaraco.functools/
+	https://pypi.org/project/jaraco.functools/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+
+RDEPEND="
+	>=dev-python/more-itertools-0.12.0-r1[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/jaraco-classes[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_configure() {
+	grep -q 'build-backend = "setuptools' pyproject.toml ||
+		die "Upstream changed build-backend, recheck"
+	# write a custom pyproject.toml to ease setuptools bootstrap
+	cat > pyproject.toml <<-EOF || die
+		[build-system]
+		requires = ["flit_core >=3.2,<4"]
+		build-backend = "flit_core.buildapi"
+
+		[project]
+		name = "jaraco.functools"
+		version = "${PV}"
+		description = "Functools like those found in stdlib"
+	EOF
+}
+
+python_install() {
+	distutils-r1_python_install
+	# rename to workaround a bug in pkg_resources
+	# https://bugs.gentoo.org/834522
+	mv "${D}$(python_get_sitedir)"/jaraco{_,.}functools-${PV}.dist-info || die
+}
diff --git a/dev-python/mkdocs-material/Manifest b/dev-python/mkdocs-material/Manifest
index 2411cff3f41f..f7931398bd36 100644
--- a/dev-python/mkdocs-material/Manifest
+++ b/dev-python/mkdocs-material/Manifest
@@ -4,11 +4,13 @@ DIST mkdocs-material-9.1.11.gh.tar.gz 14174425 BLAKE2B 8789f589d80a73d882b914014
 DIST mkdocs-material-9.1.12.gh.tar.gz 14175053 BLAKE2B 4d19e1a2360d4b60867973843a7d9d45f70410608053a751b4e169e0819ed33f7319f9df29471329268ec26e4db3f046fa7b5f254e88c4f5509f4ab3b1c278a4 SHA512 bb30a68986e2d29fce4c632f5aa72ed6ede3d7a1a8c6ce4725e11c7181ec41feda7d3446241dd3c253e2f6459fa083c948b482bfb43e6f7926103e273cea7375
 DIST mkdocs-material-9.1.13.gh.tar.gz 14211447 BLAKE2B 2e7bbe04514cc41a8e4086e9ca7bdac8223bf7105a2a0726a9c5dbcdcbdd88c59a273d716b251aee6183267e855ee12c507860b687734bac79e3db7ce148cbdc SHA512 d85cac68cef50b54f98f4fc2536e12efcfa8d04e62990e11d6bd46b204589063157769ab08c21e4157230241f590982bfe7b2bf698fba9f2ffa5febd92ee3fe6
 DIST mkdocs-material-9.1.14.gh.tar.gz 14213692 BLAKE2B 20bf12cc6f534e3c0167ef275713c5f5eb9a2ca877631c91724f8d7bf5a3314fb2ac64e457218fd84b1cc01f6fd472336e16b7825d932c0366cbaf7f098bc7be SHA512 1f3a203cd41f67ac75573439077c65f98c3ddd803b0b0f09d2c0c590a019ae30dc7ee336372c4221ced77c4d015ebef7cf0c016ce02889a7f4ddb8f43e1d3bbf
+DIST mkdocs-material-9.1.15.gh.tar.gz 14217712 BLAKE2B 316d19f8e3c8f8edd57481c692b7b1cb136c3b914a5fd12fcbf68b9a11d268b0965874c3657b1f9bc766713426e2873597ca387942f610d98f2e8ce88b1bf52a SHA512 29ee4d859a54fcfa627eebc3e88f2269c2f1cb6dbea6180a02216bf9c64bccc628ca45f6136725d1af41a532cc5d209dca4f862f62f79a89f2026b24a1e55b7d
 DIST mkdocs-material-9.1.9.gh.tar.gz 10937664 BLAKE2B ebb893deecbd545496542f714976337b6c57ab0b7413f53ec0e8635e3d3a668ce3b7dbd46ea2517855e077d271f147d1df7c9d838d80a3954ff8a9f63f7f7bce SHA512 0b2a42e8f035375f34ca23a1489d4d76c9733cd28e1dc98f25c8f5461a337ff533eb85c72d9b22a8d2af4694b1e0c74ea61bb62da91827562b1ecb4cf4e8867c
 EBUILD mkdocs-material-9.1.10.ebuild 1432 BLAKE2B e1aba66e5a5f4c3eda2d0dfa7d6da4702f498249ed5cca4dbadb469c963cd1213880a43afc384ba174b7a75af3d192618a93138d88b79b48d9067933c0c414c9 SHA512 e546e437f8ea3949fc413beeafdfae88060477739dea9b2223cfdc92b40b7e3d20217c516f3f3d8f56cd5e2e1807f6aee70102b98f44755ef866393470924f8c
 EBUILD mkdocs-material-9.1.11.ebuild 1432 BLAKE2B e1aba66e5a5f4c3eda2d0dfa7d6da4702f498249ed5cca4dbadb469c963cd1213880a43afc384ba174b7a75af3d192618a93138d88b79b48d9067933c0c414c9 SHA512 e546e437f8ea3949fc413beeafdfae88060477739dea9b2223cfdc92b40b7e3d20217c516f3f3d8f56cd5e2e1807f6aee70102b98f44755ef866393470924f8c
 EBUILD mkdocs-material-9.1.12.ebuild 1549 BLAKE2B d1d1661c9b7743b851efa84c142625c79f2be58470f9d3dc63c9fa03e3c502fcdfedb46b5c433612b67f001bee56301feaf6a02ba9ebc3d450b1c80d33460f45 SHA512 5e0a7ba6e1a371b25824addee3ad8827080cbec7709bc5e1fd1f8a308c73768a0a5ed9e8b90298178a5ff418de6a5c19782f10b7de79ef91bc80641a2d3884f5
 EBUILD mkdocs-material-9.1.13.ebuild 1549 BLAKE2B d1d1661c9b7743b851efa84c142625c79f2be58470f9d3dc63c9fa03e3c502fcdfedb46b5c433612b67f001bee56301feaf6a02ba9ebc3d450b1c80d33460f45 SHA512 5e0a7ba6e1a371b25824addee3ad8827080cbec7709bc5e1fd1f8a308c73768a0a5ed9e8b90298178a5ff418de6a5c19782f10b7de79ef91bc80641a2d3884f5
 EBUILD mkdocs-material-9.1.14.ebuild 1549 BLAKE2B d1d1661c9b7743b851efa84c142625c79f2be58470f9d3dc63c9fa03e3c502fcdfedb46b5c433612b67f001bee56301feaf6a02ba9ebc3d450b1c80d33460f45 SHA512 5e0a7ba6e1a371b25824addee3ad8827080cbec7709bc5e1fd1f8a308c73768a0a5ed9e8b90298178a5ff418de6a5c19782f10b7de79ef91bc80641a2d3884f5
+EBUILD mkdocs-material-9.1.15.ebuild 1549 BLAKE2B d1d1661c9b7743b851efa84c142625c79f2be58470f9d3dc63c9fa03e3c502fcdfedb46b5c433612b67f001bee56301feaf6a02ba9ebc3d450b1c80d33460f45 SHA512 5e0a7ba6e1a371b25824addee3ad8827080cbec7709bc5e1fd1f8a308c73768a0a5ed9e8b90298178a5ff418de6a5c19782f10b7de79ef91bc80641a2d3884f5
 EBUILD mkdocs-material-9.1.9.ebuild 1429 BLAKE2B 65de47921e3cabe74c7ecc3c65b07d2c5d3d43a10547a7fa0029643c1b90b2c0f8776ff7deb5027635cdbaba6c2010ae37c9c616a4b9302ec2ca1bf5f179eea5 SHA512 374430e00ecfa6e8349bc87f15570ec90ec3268b64ea8b3feb8902f33ec28a52556621474df28cefae45d0960281f71634c5e2e53ebb74158f0979f710a41cf7
 MISC metadata.xml 1146 BLAKE2B c9eb031eb40f303fdcc39f891cdd2d4317075deb030d0f8374f874ecd63bf73960427eb3ee485b5b28515f58689b1e1bf977ee7b565bf8f9275b115853044f2c SHA512 01db399842cb09af4823278f84fcf8c51ed42609a2e61d8e64964e1759e14d22ed2f32ec0565f19184575089a218dad4939337798cd3a5b39f5be55f5f7edb69
diff --git a/dev-python/mkdocs-material/mkdocs-material-9.1.15.ebuild b/dev-python/mkdocs-material/mkdocs-material-9.1.15.ebuild
new file mode 100644
index 000000000000..c6eb88bef19a
--- /dev/null
+++ b/dev-python/mkdocs-material/mkdocs-material-9.1.15.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{10..11} )
+
+DOCS_BUILDER="mkdocs"
+DOCS_DEPEND="
+	dev-python/mkdocs-material-extensions
+	dev-python/mkdocs-minify-plugin
+	dev-python/mkdocs-redirects
+"
+
+inherit distutils-r1 docs
+
+DESCRIPTION="A Material Design theme for MkDocs"
+HOMEPAGE="
+	https://github.com/squidfunk/mkdocs-material/
+	https://pypi.org/project/mkdocs-material/
+"
+SRC_URI="
+	https://github.com/squidfunk/${PN}/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="social"
+
+RDEPEND="
+	>=dev-python/colorama-0.4[${PYTHON_USEDEP}]
+	>=dev-python/jinja-3.0.2[${PYTHON_USEDEP}]
+	>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
+	>=dev-python/mkdocs-1.4.2[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.14[${PYTHON_USEDEP}]
+	>=dev-python/pymdown-extensions-9.9.1[${PYTHON_USEDEP}]
+	>=dev-python/regex-2022.4.24[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.26[${PYTHON_USEDEP}]
+	social? (
+		>=dev-python/pillow-9.0[${PYTHON_USEDEP}]
+		>=media-gfx/cairosvg-2.5[${PYTHON_USEDEP}]
+	)
+"
+
+# mkdocs-material-extensions depends on mkdocs-material creating a circular dep
+PDEPEND="
+	>=dev-python/mkdocs-material-extensions-1.1.0[${PYTHON_USEDEP}]
+"
+
+PATCHES=(
+	# simplify pyproject to remove extra deps for metadata
+	"${FILESDIR}/${PN}-8.5.7-simplify-build.patch"
+)
+
+src_prepare() {
+	echo "__version__ = '${PV}'" > gentoo_version.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/pip-run/Manifest b/dev-python/pip-run/Manifest
index fdb0b341001e..24c7000d3009 100644
--- a/dev-python/pip-run/Manifest
+++ b/dev-python/pip-run/Manifest
@@ -1,7 +1,9 @@
 DIST pip-run-10.0.7.tar.gz 32869 BLAKE2B ea5dfea09def536eced9436a114f12cbefccf26c4b37376a560dc1fffdd8167d019ec52d57666d7b4d77dc9c580a5f48455d945aa9ddb4340a7dca88f0ded309 SHA512 cd8780372f579005e40c77b3c2d9e582cd1a144e871eec205fd0bd2ff64eac837918211d3479088f56bd3043dbfd883502b2d6f7b01dc24448888f65fdd6920b
 DIST pip-run-10.1.1.tar.gz 33010 BLAKE2B 5a3dcd1e119b65718b465ecbd118d80de776252ecbd438344eb78abc2e4a69073417310ed096f0b604740762aa24af2788041476c93d919ea72812e1597327f5 SHA512 ddf61aa31012567ff21e943739a1e29066875db3c39ca77abfa409fd75abc599756ca8aeaf9bd23d19af46ad2747e7dec4a7d3cf76a444f59c19e769419dc59a
 DIST pip-run-10.2.0.tar.gz 33523 BLAKE2B 7d19c089da98dbba2faec969f490fcd5ea48881f4ccbbfaa283465ef083521aee7d82b9de8b03a89ec8b08005db1232cd9577030cb98c111b4a0e0f7294cca84 SHA512 b26a00c6ebd8e9e505e6b218fea7070b23b5926de44e1d5a762abb2a4ebd62b1bdda7e19c4092012daf068b518a2e127ab08099f6d1a7ddc643b3ba5bf999ed0
+DIST pip-run-11.0.0.tar.gz 33598 BLAKE2B 3951c6cf959e137aeec2acae17eb6fd9b63a1716f1fe8cac55c964cf6cd975d5085dc8e05f11f00b3dd404d8f12d351d0e3f9cdd486cf1a883f917e60ad91103 SHA512 3b6c3aee3bf340f6a18e3f0acda56ed6da00dc21054e9a20499151c89a44ca388611bb7df57f04fa9b580dacd65a26c9cc34589bc01638f7ac1cc6f1752e2e5b
 EBUILD pip-run-10.0.7.ebuild 1415 BLAKE2B 37eddbbd484c549b5a3c5274c0f4fe29c093c0c555c43e47a00de0127c4196f49c39e157a588e08c5b1a6ae6f19cbf206e47e67aa70a7718519a01d382ed3105 SHA512 0ba95169ac46a7649f8bce7ee8d5cc81e6cdcfc2c77f014a6692e1f2717351cfaf2bd529bde083ebc59853b452d8749ac36034768ef980ac6e2d1a307a3fd4a5
 EBUILD pip-run-10.1.1.ebuild 1510 BLAKE2B dc758aac78a5f9fac5c5572ca113dd766793222b4da1ea31ae38a24824c4007401c9c02088d57955061abd2b556b1742038ab960dc0e0494262bfae31ef80401 SHA512 1940163e757ddeb9b3122ef227e771f108eb25629768c58e245fbd446afb8293020e4a796426c9c9cc9b2571510ce71f631a8b5bd3db0c964c680a448607bac8
 EBUILD pip-run-10.2.0.ebuild 1510 BLAKE2B dc758aac78a5f9fac5c5572ca113dd766793222b4da1ea31ae38a24824c4007401c9c02088d57955061abd2b556b1742038ab960dc0e0494262bfae31ef80401 SHA512 1940163e757ddeb9b3122ef227e771f108eb25629768c58e245fbd446afb8293020e4a796426c9c9cc9b2571510ce71f631a8b5bd3db0c964c680a448607bac8
+EBUILD pip-run-11.0.0.ebuild 1483 BLAKE2B 643d98996fc03b9360ccba2bebd768e5f70756c106de1308c33ff4e2477e4d1754318e3061a25ddf2f33d36840b1c8804fc4d348a2d2e1ae1398b01089498385 SHA512 9e45fa8c2921f225d01d90bd4da0577bd1b8a3da5dddbe71fa4d0555c0c5a9aced145245f6938865b3c506877af34cf50052781ac759b9846a0143c1d1009975
 MISC metadata.xml 389 BLAKE2B bc573b4f57b4f8371ecef97266b8441d47e66d551f7088a7f312ca049f7debd90e989d24d59d7aff182795ae27e553d131f3875c789dc793532ff9c812bcaf20 SHA512 00b81cba684e7118a3ce79ec5cb6a27d6ad67064a2745ffead8dec51c7786c9441139b800868cad8854ff39d7e38163ab2c8fa5c7d3f328390b628f8342fb0ca
diff --git a/dev-python/pip-run/pip-run-11.0.0.ebuild b/dev-python/pip-run/pip-run-11.0.0.ebuild
new file mode 100644
index 000000000000..93aaa028f2f2
--- /dev/null
+++ b/dev-python/pip-run/pip-run-11.0.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Install packages and run Python with them"
+HOMEPAGE="
+	https://github.com/jaraco/pip-run/
+	https://pypi.org/project/pip-run/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/autocommand[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/importlib-resources[${PYTHON_USEDEP}]
+	' 3.8)
+	dev-python/jaraco-context[${PYTHON_USEDEP}]
+	dev-python/jaraco-env[${PYTHON_USEDEP}]
+	>=dev-python/jaraco-functools-3.7[${PYTHON_USEDEP}]
+	dev-python/jaraco-text[${PYTHON_USEDEP}]
+	>=dev-python/more-itertools-8.3[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/path[${PYTHON_USEDEP}]
+	dev-python/pip[${PYTHON_USEDEP}]
+	dev-python/platformdirs[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/jaraco-path[${PYTHON_USEDEP}]
+		>=dev-python/jaraco-test-5.3[${PYTHON_USEDEP}]
+		dev-python/pygments[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/nbformat[${PYTHON_USEDEP}]
+		' python3_{10..11})
+		dev-python/setuptools[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_IGNORE=()
+
+	if ! has_version "dev-python/nbformat[${PYTHON_USEDEP}]"; then
+		EPYTEST_IGNORE+=(
+			tests/test_scripts.py
+		)
+	fi
+
+	epytest -m "not network"
+}
diff --git a/dev-python/poetry-core/Manifest b/dev-python/poetry-core/Manifest
index d5f48d2afe33..2519a695335a 100644
--- a/dev-python/poetry-core/Manifest
+++ b/dev-python/poetry-core/Manifest
@@ -1,5 +1,8 @@
+AUX poetry-core-1.6.1-pypy3.patch 2127 BLAKE2B 65a7c7540c70502467cc5019e47cb9eef492d69efc8f27e513d5fea6ccaaf1dcb09a30e724e9b539adc4d9dc84d7aac8d9642855916a68ddf8242db7b69d4030 SHA512 8e18dba351b1b2babee0bb40d3c4f22136c78cfb11b45e6113d04596b313a0616dae17afe5326aaced776b35aedaeaf0b9b0cd09463028ecd936b1937899a049
 DIST poetry-core-1.5.2.gh.tar.gz 484004 BLAKE2B 56fe974bb37233ee75a220d35dab3d246b9a4145a3abd88981a0c2b9f51cb894b3534746638d7fa75a41451c856261b0b8e737af8778f78fcc9ae894a4b2430f SHA512 e0eab97bcf678f8fd329074d14cb394db8732666b0387384d273db49ec020ff34e15e9982e049bce62e9ba80443404de7646e66433164a2358f9802a8ce2fbb1
 DIST poetry-core-1.6.0.gh.tar.gz 476282 BLAKE2B 9c78b60b0578c9e882c468d8523587e8ddf799764efc1d343fdbcbc7e1ac56cc642ecfa5e74a6b134d190491e06105579951fd4bc8d41264358032c2a6bd5fb7 SHA512 a8a36feda81fdf5b74de77cb718680a12edda44d0b6e87f5b80704d7a5898780b89dfa8168c55e4e8b2352f1a6051072e7e9f35dc5936d1b0b24a1704063ed1d
+DIST poetry-core-1.6.1.gh.tar.gz 477291 BLAKE2B 4e1bd77302005d344693fe7a08b0c55e8a9ea0aad3112915a18950e40cc51116740b9eff5ae851b1d7280454716e3a86b1d8d37d85749f64fcef3bc726eeaf83 SHA512 53db0e4f4d5bc6ed2b201cd88a84e07dc6421e910292b8b5efb0dcce1af6e8c62836458a6409aac0394b5063b7c4a6be93784b0bce8592d74f61800f54916706
 EBUILD poetry-core-1.5.2.ebuild 1613 BLAKE2B e4e66b2b1bdb3ec1979e32319dd92a9feac9c202441e8e2e505ed8240d85d024c8d4f3e2ac9da5df1bf22c032aed2751410ef3451c2394f03ffe2d3ed9e715c8 SHA512 9405a57e388b8a4b54c140867cbe53ac2d7b9034046bc67ffce5dfaa89cdacdca9be7cea7cde1ffc09348c67f8d396801e3bce5eee848e6692be48584468356c
 EBUILD poetry-core-1.6.0.ebuild 1919 BLAKE2B 5ff26f37785adce3f7c82b83e1d631c115af35500f8ffaad0869e76c3fac8903da5a0537bbe87f5405bcda7e94adf7eca8038df4a10fec0f88c9fe3f61f49c9e SHA512 c7184c39071fb773e2b9131356a841f5fed8ce5dfa04fae305d296b58f51966e995bb6acb912c758afab69b09f148f09dd795f73fd3074612ba9a8d596971d28
+EBUILD poetry-core-1.6.1.ebuild 1964 BLAKE2B a0276ca4d430a4cafb45845c703536aafae00828964a4be20b7676a1539612985fb61f4e495da093759259f6aff42544f2c6591ef769c500a6f54e0daefd56ef SHA512 385a283fa23f1fbc38d858d58ca29643486bbf5cf71833d8fb369beb6dba3ca6477bce0c3e55f8efa43d71e049b716f49cc3e487d04c07ef56d42e4c6f685167
 MISC metadata.xml 382 BLAKE2B 82dfc3f146cf3b669fed67ab2e21694b00d5473fdf855cae9fb3a0481785b32c4cf1ed9743a5d64cd055c1cb544377f936a9ec26c9d1dec2cf5fbef6749f5587 SHA512 032fd4dca8f8138c2b527e517f041889e15600ccca876fc3c9e53050196186ad2a9346168bce9c4bae7ffd8a77ff4dd19cc2559fd1da1fd4c7c181056fd49a13
diff --git a/dev-python/poetry-core/files/poetry-core-1.6.1-pypy3.patch b/dev-python/poetry-core/files/poetry-core-1.6.1-pypy3.patch
new file mode 100644
index 000000000000..ab0979a71cf0
--- /dev/null
+++ b/dev-python/poetry-core/files/poetry-core-1.6.1-pypy3.patch
@@ -0,0 +1,60 @@
+From 12d231eeb3d853217dd6e0527da7e286cdc1346b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Randy=20D=C3=B6ring?=
+ <30527984+radoering@users.noreply.github.com>
+Date: Mon, 29 May 2023 18:40:35 +0200
+Subject: [PATCH 1/2] chore: update dev dependencies for Python 3.12
+ compatibility (#597)
+
+---
+ poetry.lock                             | 170 ++++++++++++------------
+ tests/masonry/builders/test_complete.py |   3 +-
+ tests/masonry/builders/test_wheel.py    |   5 +-
+ 3 files changed, 91 insertions(+), 87 deletions(-)
+
+diff --git a/tests/masonry/builders/test_complete.py b/tests/masonry/builders/test_complete.py
+index 4e4dff0..c9429c1 100644
+--- a/tests/masonry/builders/test_complete.py
++++ b/tests/masonry/builders/test_complete.py
+@@ -19,6 +19,7 @@ import pytest
+ from poetry.core import __version__
+ from poetry.core.factory import Factory
+ from poetry.core.masonry.builder import Builder
++from tests.masonry.builders.test_wheel import WHEEL_TAG_REGEX
+ 
+ 
+ if TYPE_CHECKING:
+@@ -82,7 +83,7 @@ def test_wheel_c_extension(project: str, exptected_c_dir: str) -> None:
+ Wheel-Version: 1.0
+ Generator: poetry-core {__version__}
+ Root-Is-Purelib: false
+-Tag: cp[23]_?\\d+-cp[23]_?\\d+m?u?-.+
++Tag: {WHEEL_TAG_REGEX}
+ $""",
+                 wheel_data,
+             )
+diff --git a/tests/masonry/builders/test_wheel.py b/tests/masonry/builders/test_wheel.py
+index d25d642..c41e4a5 100644
+--- a/tests/masonry/builders/test_wheel.py
++++ b/tests/masonry/builders/test_wheel.py
+@@ -25,6 +25,9 @@ if TYPE_CHECKING:
+ fixtures_dir = Path(__file__).parent / "fixtures"
+ 
+ 
++WHEEL_TAG_REGEX = "[cp]p[23]_?\\d+-(?:cp[23]_?\\d+m?u?|pypy[23]_?\\d+_pp\\d+)-.+"
++
++
+ @pytest.fixture(autouse=True)
+ def setup() -> Iterator[None]:
+     clear_samples_dist()
+@@ -365,7 +368,7 @@ def test_tag(in_venv_build: bool, mocker: MockerFixture) -> None:
+     if not in_venv_build:
+         mocker.patch("sys.executable", "other/python")
+ 
+-    assert re.match("^cp[23]_?\\d+-cp[23]_?\\d+m?u?-.+$", builder.tag)
++    assert re.match(f"^{WHEEL_TAG_REGEX}$", builder.tag)
+     if in_venv_build:
+         get_sys_tags_spy.assert_not_called()
+     else:
+-- 
+2.40.1
+
diff --git a/dev-python/poetry-core/poetry-core-1.6.1.ebuild b/dev-python/poetry-core/poetry-core-1.6.1.ebuild
new file mode 100644
index 000000000000..304711f93c75
--- /dev/null
+++ b/dev-python/poetry-core/poetry-core-1.6.1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=standalone
+PYTHON_TESTED=( pypy3 python3_{10..12} )
+PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
+
+inherit distutils-r1
+
+DESCRIPTION="Poetry PEP 517 Build Backend"
+HOMEPAGE="
+	https://github.com/python-poetry/poetry-core/
+	https://pypi.org/project/poetry-core/
+"
+SRC_URI="
+	https://github.com/python-poetry/poetry-core/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+# check inside src/poetry/core/_vendor/vendor.txt
+# (note that some are indirect deps)
+RDEPEND="
+	dev-python/jsonschema[${PYTHON_USEDEP}]
+	dev-python/lark[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/tomli[${PYTHON_USEDEP}]
+	' 3.9 3.10)
+"
+BDEPEND="
+	${RDEPEND}
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/build[${PYTHON_USEDEP}]
+			dev-python/pytest-mock[${PYTHON_USEDEP}]
+			dev-python/tomli-w[${PYTHON_USEDEP}]
+			dev-python/virtualenv[${PYTHON_USEDEP}]
+			dev-vcs/git
+		' "${PYTHON_TESTED[@]}")
+	)
+"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}/${P}-pypy3.patch"
+)
+
+EPYTEST_DESELECT=(
+	# These "fail" bacause of glob file path resulting from newer versions
+	# in our tree than vendored. But those don't affect anything.
+	tests/masonry/builders/test_sdist.py::test_default_with_excluded_data
+	tests/masonry/builders/test_wheel.py::test_default_src_with_excluded_data
+)
+
+src_prepare() {
+	# remove vendoring of dependencies
+	rm -r src/poetry/core/_vendor || die
+	sed -e '/__vendor_site__/d' -i src/poetry/core/__init__.py || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	if ! has "${EPYTHON/./_}" "${PYTHON_TESTED[@]}"; then
+		einfo "Skippin tests on ${EPYTHON} (unported deps)"
+		return
+	fi
+
+	# needed for migration from <1.1
+	distutils_write_namespace poetry
+	epytest
+}
diff --git a/dev-python/setuptools-rust/Manifest b/dev-python/setuptools-rust/Manifest
index 74821b3ee9c5..b845f95838a4 100644
--- a/dev-python/setuptools-rust/Manifest
+++ b/dev-python/setuptools-rust/Manifest
@@ -23,7 +23,6 @@ DIST log-0.4.14.crate 34582 BLAKE2B ddfba35947ae1f5905cd9ecb9eb862a78af6f00ee8b8
 DIST mac-0.1.1.crate 4838 BLAKE2B c87e9f9283f179acd28c189d02d9d3de0ec99f9cfbefa590daa2880c275894951c5b0b935b652ab6c8c0172ac59e87f52fd49b787b230e6730365dc076d17578 SHA512 dbc6def04c482911ace311f34be79992fa04042c7ce36b71459b5af5c1c43e9fa66b6b40f63f8c3647daba287bf1c1be9b1a8031ead1d855f99a988898c96f1a
 DIST markup5ever-0.10.1.crate 34668 BLAKE2B a13f39ba93a26a558a8f03ebbbaa98bf2c7caa4fd393be3e307acd5b59a6d91fa8fbf4deff234266cd55772d5047145cc80c5a215ff8eb5b2fddb88468ae4fb2 SHA512 447b0f44ea8b786688127aba1b6eed826dc0127658d293c22db74864381b5e7bc0584243dcc0ee19929d3e757521167c13a108155ed5c8e78375cb0fd3c6f7b7
 DIST matches-0.1.9.crate 2246 BLAKE2B de155202636c6a03ed68cdb21e8ef96e19b45be040a82943d2d7e5192c0ab5c253ab6d65f0b30b2689e21da79cba684af5be6e63c48266681aceba356f6eea41 SHA512 6a2809687d30ff04ea97bf9d1610d746e097699a4c3625ffd1b7b1e4a9673ece9d559058c9f760b99d6ab509024f7b338e7cfa6fe767499c983efa98bfb98305
-DIST memoffset-0.6.5.crate 7686 BLAKE2B 9a797388702389076c426052c3d54dc62802d5db8bc5c9c83990429f2ffaec4fab4c7dd3f09cd0704d1ea555e87976563bb43408ba54b5e66ce7e406d4604009 SHA512 11bdd9185b99dfee8e659e051b09ee301c7142a372a8117864745a5085c015436d2efbb1478192886f09cbc562529e209d2e3325d94938a64bc75b1d91d2bf3f
 DIST memoffset-0.8.0.crate 8912 BLAKE2B 19ad3abed21fc39461b0382b15a8cc312378aba36f042b1e5335012115d31b350a4e3bc720f1eea300d7d19b9b317f75a28d4ccd78ff3b31defd9e4b3147899c SHA512 47adcae0848ff967035e10543ea599c7af9c5bad387023eb4dc77c9e8d875994ec8139b9941b3ecc4fc17214d80944a47a3be174a45b334661914a5a7382dfbe
 DIST new_debug_unreachable-1.0.4.crate 2561 BLAKE2B 5c9831b04e2a44b2dd27816df0a331a8108991a84ebdfefe4e42f325ec3519ee50e89a99d490020a65a3d75acc371316c2253d2c6382453a0b15f4c3d5b96520 SHA512 6f964bb322aa8f2ff92078381dd720527600c6449e237b703278cbcf47b39a2581fddfc2f34ebb7cf31229e33d58de48bb5050e083fec6dad9aefddc1d771c85
 DIST nodrop-0.1.14.crate 7667 BLAKE2B 83aa728540908d2d2d9f82c18282d9a9d74ea01b5b836d83cd3f03d225ddbef9fd3fd13460895d744158af74fccf13b7edcd5bb1bc127c696e613de673e25863 SHA512 f583ef6104aa087e13c66a183d451d4cf350560476ca959ce4e0e8308db26ac9f31166c25aca3d50ccd972266d7595d89767655504566a4131a54607e8ed9376
@@ -40,15 +39,10 @@ DIST ppv-lite86-0.2.16.crate 22245 BLAKE2B 03cba61af42dc3a78ab8f6b03d833c028b7ed
 DIST precomputed-hash-0.1.1.crate 1640 BLAKE2B 64a37ef3edd317f771e833bb394f7c19bc9b8c844156c831d2b550692c7e2e36bce44ecf18dd9f2d0f0511346eaf0d2a0ebe792fc288ca0e94a93933f2051846 SHA512 a118a98286a47e2f0cf35d2678d0325c18b9b7d5bdf40ceadc16483b282307fd1498434d5bdfa25477a4f420d97c34d786e42e9fa70431b788b4b8fde9718e05
 DIST proc-macro-hack-0.5.19.crate 15556 BLAKE2B 98c22fc3e5f5fa8b6f44d15de42b6ffcc82ba3f98a07ffa48bcbc5d3abcfca6af136c5d0d8c7f1ca34261ed8f8c9c17a394231f97a4c342c81aa7f8b9e74b203 SHA512 9e4cbec41056438287f5b23086264c86e2f0cdc193064006556736377b2954229de13a585149b9995002c9aee3334ee2a80ae4afdcc96cabe7ed2bf718476952
 DIST proc-macro2-1.0.36.crate 41411 BLAKE2B d7d99aed41080b65680736d92dd027e21c9e9e0b03601915c000f5dea8f2b2d9126b116af32f2fb04b4fa407775f0131423055d0b62fdbfe87fa4ba7ec098beb SHA512 f31b0f2356af2746321c4f808ac9af87d21a5657c103ed6bc1383855e40caf49246cc8ec1edff58eacf193424abfc2163148b7298e527714e65e602f14b2e50a
-DIST pyo3-0.17.1.crate 394706 BLAKE2B 30d4d6285c977f0eb3581dd89e4d2cdb2c9badce3729c03f7f8f41bc0be9253bf4ef0d30b0c137007fb26cad02e17efdfbbe6d248829edf111be0ecf9c25a2fb SHA512 d5e28c9931abd06050e7dbf261024aeaf7a81b079b27cfdd610a2be08ee2e64c60f0c4d90eee28565a98a6ee34ba228e7085b7fecc85dfc504b66a6cf77dcfca
 DIST pyo3-0.18.2.crate 418755 BLAKE2B a45c27639d9c4c5a4e017b7e8d7580aba285ee11295f344809e30ac23b70e4541f2cb765dfeee20fdf4d441e1449f5cad4bd6308a52822eea3595305081d4b77 SHA512 b97ebc10939418d7fe3d6219921875cc7253f3aa7cd9d06b1486f8757c6d102377eb851b3a669c670423af2c80e389b736f0ce04a6cecb716c952413d06fe434
-DIST pyo3-build-config-0.17.1.crate 29232 BLAKE2B 76e95012c0c2713f41bd70c49ef06f5e48ee6d89cce158902eb7d2c805c241e6cadfbac426de35bd3078307f120814d06a39fd227e093982807e825b868a3308 SHA512 1ec2d8069a8eb247b3e152adb47f675ba3d05aaecf13f7d3a580bac128339b9220f9dcf9f984009e0e8d4b9e11415d0b563c0087fcdd1499acbe8d263b3330bd
 DIST pyo3-build-config-0.18.2.crate 29138 BLAKE2B ad37bacda5f0e5c8eaf382b3371de251b83c721dc2378a0bd3700462bb65273bcd4277589084f6af0a2959f17b370fe5e6a5699c8689107220333c57387bf0ae SHA512 01f544938d83a8283f5101f69673f8a39d2052186e7c712709be25c5ae17a11e7d68c2fd9b4bc7661fff9343ebf3ccc196c1259321061f048c59696692601ae1
-DIST pyo3-ffi-0.17.1.crate 62851 BLAKE2B f23c29b4ba41ef59dc0723fbf4622e3a1f32ca127cf76d72f5e4f8988da448bbe9a7a324fbb57233e5ac1369e60b1ed0ef02f7ebb1576a31447fe060919c63d0 SHA512 f67462e48b8acb8a9b01c93f9100a37b45801271598398a106d7fc7bf9721c51ba114fe6d0b919b2199e29fdc8a0945a79ba18d766d1f22a536ff75ed5902235
 DIST pyo3-ffi-0.18.2.crate 62903 BLAKE2B 31e52b73705c1e5f44e419f314b1674a722a604fb52be5d5e5ff2ae9881ec9f204c1f51760570ed4c210ea530bd9295a27beaf9b5631ef02370d42d3e4c0be18 SHA512 495dcf45154ce89b8cd3a3fe193938e199465cf510df1713f7ad82e0a138ac2f8f1b73ec80f8af72f79a4ed26a9f4e4e93d52357ad4f41a213ec0c7b602734b9
-DIST pyo3-macros-0.17.1.crate 7229 BLAKE2B ef54df6d41d309dfd6bee907e83c63c53352b0a5fdc910bb1617b999bf5cc316c0ec81e504200d72b69ea9819e2da3e74027106f6ae08d8de751b91bc4fee7c6 SHA512 2958728e8d9d5c99ad785aee9755bca4ae6bf8b5b8e13af4a00a4fce9250af51d64093aaef8f19c8861557eb8f6448de75c55b1c637968d481241ff2ae8abc3e
 DIST pyo3-macros-0.18.2.crate 7173 BLAKE2B dfa5792be03b3b1164471ef9ff4ee672fe8e57d0fc169ca04da1542d86262e7e526be079e303b8a4899bfa4b0680d38604f80263c71b33ead5bf0a60871f473c SHA512 a2c367b4b1556b16304ef0da4ed8961cc760d259da9fbdabf791ac910de4f1e9f193227f10ea4215a52c701bd0ee92311dc91d272b9364017e2f6ebde5698f72
-DIST pyo3-macros-backend-0.17.1.crate 49872 BLAKE2B 91d58229cdb012bfa701816d091309cf02e397a80e91663f050a800868cc7a7e54128c27c3b7a82467487c3c84b341baecaa2a36d0154a14602a272aa634421c SHA512 e4b706a80c9239d23c8c3b125d17e6f66ec64a442294d2cba3f21b50bd8ed839e6ef8816bacf9dcd9c5a15d4e0660f0594b4c1a213ffa3b59b19630720b76948
 DIST pyo3-macros-backend-0.18.2.crate 48722 BLAKE2B 662822ae71702cb7d173c1ac7ead49cecde0dc4545bc3f5f30fd9ef7fab5537c13509bc8f18b2a8d05d7fa7f6fc8d0378a44d67b85edadfdf6ca153fc698a7d4 SHA512 433d9287bf3cdf84291c8d04ca5b24ecab2186379db554d6b2cf271e8716a890dcdc0717b2a00267e85dc637520559ef8e883bde2e2b16dd8cd580c1468c2dc3
 DIST quote-1.0.16.crate 27566 BLAKE2B 3352f4ed2158cb8d29947d5435b7414ed223088887718f9d258f1f5d555034a4fbb79cbfb3cb772be4868be366853feabec777fba7f275ac36d8091eb3b371c7 SHA512 489f4dcaa8a8a2041b39fc8fc815fa7943c0a456881283398e4eb65f7b50f220a6e5493d60d1d5019a48b189ca217fd8c62056b552bf94b9329ec963cce01c74
 DIST rand-0.7.3.crate 112246 BLAKE2B ecc7c1bd70ac874c03bd8b7faa3016bb2d5ee5c19603280a12a45a81598f706e445971ee081e6ca410ab6f0f5f7a06d9315848cd556a2d8522a82024f6ff91e4 SHA512 f9b68ef9446f1ca2c8092c50990f15c1b4cb5529eeeac4df8d69755e0b7253c663c587775e7cb0a7298c31edb444975dda34926759306541f6d43d0d3cf57b7e
@@ -63,7 +57,6 @@ DIST selectors-0.22.0.crate 44199 BLAKE2B f749e0e53476b695b4937bc0cbf1add4f3f7d4
 DIST semver-1.0.6.crate 29941 BLAKE2B 1aad12eb93534a0a72fa1645a71fe4cc03121a2215520030d697e863427fa06edd9f63d05c522f696c5b9c1c45556803ae381cb4c77a2d4a7fc30f7363e3ecea SHA512 0470b9a3a6d398233d19a8240de3b0d18c4cd8f8fc6887658baac4053c88463d5de9b7145a564abd43f813e03b75a26050eedc1689450895953bc7f96b64859f
 DIST serde-1.0.136.crate 76158 BLAKE2B 44603c8eede428dce4211350497a443385ff0ddb0b43799170411110fd8908a56e9df801c72695723f4fcff5eb33384bcf92ef58eecb9c4924d5d9cc30e2f6c9 SHA512 d043ccfd6a1dc9a114a1a95530a63ed9342688d31d3aadeec600a9a9d47aad328be35b6f80080400ea4bb3f820ddd18cc5ce1e6ea1db28e02752962061e71019
 DIST servo_arc-0.1.1.crate 9817 BLAKE2B 88586ca0c969df8bfb3a04ba4a689606995876434877a2cd48a72b26451deb6fdcf65273aa9b03948adcbc66b2450301840910e5c4162b993535d69585c62128 SHA512 59d531dcf7a9191b8462ce395e713194994714b65275c0af412186f862be169d0c6fc5d86603332a1aacd8af9ace934dc78531b9cb576cf8179ec35709225447
-DIST setuptools-rust-1.5.2.gh.tar.gz 294274 BLAKE2B b0de905facd0fe110c25c037980826b09d64bab625be0a5be53ff981d37b02bba2b0aa3458ff0a95cdb1fb4ecdbafe08236167b76c1606c534dd8a4e04d68287 SHA512 e80d1296fd09c24b644d821e981261153ff19ae62d978fc8ee81c78e440d215f9d1e91e33d758effb94fcb64985937445940f2e2f032ad1b8c2aa39be79cf19d
 DIST setuptools-rust-1.6.0.gh.tar.gz 294915 BLAKE2B 1b59e917a951a0a60f7e2bb723c136bc8f7a2c92dcdf816dcf52c55bf2075e323766c3c0f6c61e9e9d519236f496a5462396ff35ae760afc1680664c0c0a9da0 SHA512 93945d06e8cb38c5764fa8ec12b039111b3ee677dfe66350a4f554f1c1622885a0dcef34a1b429172859bca1081df8b82c05ce81b6714c6d43cfa073ade75785
 DIST siphasher-0.3.10.crate 9889 BLAKE2B e5dd6d265340b4c9e4266ab1ff3a20f1fb87fd493b2d7b5fba32d26421cc858b38929e4ab96941d0c055375b8acebbd04236d994cadca324500ed05064b9bfc9 SHA512 f90425a2cccc9575d377bb92a765d34653ddef1ac12b7c63dc6d700aaa74b525787e11609061c2d3e44ea56fe0e4b8f93f7b13f0279b5de2e0f710c5caffd4ce
 DIST smallvec-1.8.0.crate 27992 BLAKE2B d02897eb4d3901805be86cafd5d3dc6768b31c2ee4d0a9d7eb455e2a21be2864ea83589f4ffde102dbbafb66e3c197707af770b5ef184b8e244d992189644b84 SHA512 17687cfa6aaf95a1df063adc3a412a7c41918a0d003eaac90f7d9e859fb8fa1d652eedee17a4cb3aaae9b33a2043f89e796519e3a7a3992b292f04049bf80b0c
@@ -81,6 +74,5 @@ DIST wasi-0.9.0+wasi-snapshot-preview1.crate 31521 BLAKE2B 716bdd2ec46d0bc9911c5
 DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
-EBUILD setuptools-rust-1.5.2.ebuild 3244 BLAKE2B e1d035dff9b73c16ec39beebfdd87c26d75e39972ef4534b0d9ca210ec9d566a839733f33e5a0163f15ae3a0a81dce3f003bbf01f4f3d23e7deb2a584e24d0d7 SHA512 85f6e974ae5c0c1552b5c78c0c4520a92869937479c5f1f58b4ba6cefb5fb4b74e795485ea292970dc945ef3ab7a5435535a6ec7f57866dba36cf68004072fc2
 EBUILD setuptools-rust-1.6.0.ebuild 3317 BLAKE2B 0ff46e2fdf6ecc15ecff7448ca44c32a36d6fabf59f7d1d60de6e6f53c03c67d3e336d20f45d6ab732a5ddcc974f4117821d4369369299af03fe09fa002ab5b1 SHA512 21abf39b8a2ac641b961b9d6a0819c8ab68c22de1bf7eb6d4eee244f595fe7e45a1d6825457219abe8c0b98b013634e04294b3a8ee297350c729610e23d1c272
 MISC metadata.xml 476 BLAKE2B c8f0ef0779f0a4412a7d9b97e1bb03e3bfb3c031209f489a100b30402d99224014e379712989afd0cb76c85be301dcf9a51e21e8f9195262c5920dd1db0703d1 SHA512 af74755e9e8fb61cbded2dc3e63cd20f95393ef2650bed9f81e299f7759ae79c63b45df8048cd0fe25397ec7db10156be681fa5278606a20481f78d5279b815b
diff --git a/dev-python/setuptools-rust/setuptools-rust-1.5.2.ebuild b/dev-python/setuptools-rust/setuptools-rust-1.5.2.ebuild
deleted file mode 100644
index c4a801abcc5e..000000000000
--- a/dev-python/setuptools-rust/setuptools-rust-1.5.2.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CARGO_OPTIONAL=yes
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-
-CRATES="
-	autocfg-1.1.0
-	bitflags-1.3.2
-	byteorder-1.4.3
-	cfg-if-1.0.0
-	convert_case-0.4.0
-	cssparser-0.27.2
-	cssparser-macros-0.6.0
-	derive_more-0.99.17
-	dtoa-0.4.8
-	dtoa-short-0.3.3
-	futf-0.1.5
-	fxhash-0.2.1
-	getrandom-0.1.16
-	html5ever-0.25.1
-	indoc-1.0.4
-	instant-0.1.12
-	itoa-0.4.8
-	kuchiki-0.8.1
-	lazy_static-1.4.0
-	libc-0.2.121
-	lock_api-0.4.6
-	log-0.4.14
-	mac-0.1.1
-	markup5ever-0.10.1
-	matches-0.1.9
-	memoffset-0.6.5
-	new_debug_unreachable-1.0.4
-	nodrop-0.1.14
-	once_cell-1.10.0
-	parking_lot-0.11.2
-	parking_lot_core-0.8.5
-	phf-0.8.0
-	phf_codegen-0.8.0
-	phf_generator-0.8.0
-	phf_macros-0.8.0
-	phf_shared-0.10.0
-	phf_shared-0.8.0
-	ppv-lite86-0.2.16
-	precomputed-hash-0.1.1
-	proc-macro2-1.0.36
-	proc-macro-hack-0.5.19
-	pyo3-0.17.1
-	pyo3-build-config-0.17.1
-	pyo3-ffi-0.17.1
-	pyo3-macros-0.17.1
-	pyo3-macros-backend-0.17.1
-	quote-1.0.16
-	rand-0.7.3
-	rand_chacha-0.2.2
-	rand_core-0.5.1
-	rand_hc-0.2.0
-	rand_pcg-0.2.1
-	redox_syscall-0.2.11
-	rustc_version-0.4.0
-	scopeguard-1.1.0
-	selectors-0.22.0
-	semver-1.0.6
-	serde-1.0.136
-	servo_arc-0.1.1
-	siphasher-0.3.10
-	smallvec-1.8.0
-	stable_deref_trait-1.2.0
-	string_cache-0.8.3
-	string_cache_codegen-0.5.1
-	syn-1.0.89
-	target-lexicon-0.12.3
-	tendril-0.4.3
-	thin-slice-0.1.1
-	unicode-xid-0.2.2
-	unindent-0.1.8
-	utf-8-0.7.6
-	wasi-0.9.0+wasi-snapshot-preview1
-	winapi-0.3.9
-	winapi-i686-pc-windows-gnu-0.4.0
-	winapi-x86_64-pc-windows-gnu-0.4.0
-"
-
-inherit distutils-r1 cargo
-
-DESCRIPTION="A plugin for setuptools to build Rust Python extensions"
-HOMEPAGE="
-	https://github.com/PyO3/setuptools-rust/
-	https://pypi.org/project/setuptools-rust/
-"
-SRC_URI="
-	https://github.com/PyO3/setuptools-rust/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-	test? ( $(cargo_crate_uris ${CRATES}) )
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	virtual/rust
-	<dev-python/semantic-version-3[${PYTHON_USEDEP}]
-	>=dev-python/semantic-version-2.8.2[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-62.4[${PYTHON_USEDEP}]
-	>=dev-python/typing-extensions-3.7.4.3[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/setuptools-62.4[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/cffi[${PYTHON_USEDEP}]
-		' 'python*')
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-src_unpack() {
-	cargo_src_unpack
-}
-
-python_test() {
-	local examples=(
-		html-py-ever
-		namespace_package
-		rust_with_cffi
-	)
-	for example_dir in ${examples[@]}; do
-		pushd examples/${example_dir} >/dev/null || die
-		einfo "Running ${example_dir} test"
-		esetup.py build --build-lib=build/lib
-
-		case ${example_dir} in
-			html-py-ever)
-				pushd tests >/dev/null || die
-				local -x PYTHONPATH=../build/lib
-				${EPYTHON} run_all.py || die "Tests failed with ${EPYTHON}"
-				popd >/dev/null || die
-				;;
-			*)
-				pushd build/lib >/dev/null || die
-				epytest ../../tests
-				popd >/dev/null || die
-				;;
-		esac
-
-		rm -rf build || die
-		popd >/dev/null || die
-	done
-}
diff --git a/dev-python/werkzeug/Manifest b/dev-python/werkzeug/Manifest
index a7460044856e..0fca66b96a38 100644
--- a/dev-python/werkzeug/Manifest
+++ b/dev-python/werkzeug/Manifest
@@ -1,14 +1,6 @@
 AUX werkzeug-2.3.4-iri-bytes.patch 2038 BLAKE2B 55fa8b29b1964017c1022bece78c692a18e062aec5e541f722d5604092662d79ccd9305bcb362d9a557a49d2e39cf417a2018341dffee8232a3b4a14acdfefc9 SHA512 e38e79d21b8e40de29bef81a626ec87aaeed57d511aefdead17744dd1b6dd88d3e2e55792577b2080c6fbc6fdbbd9094f53c0110d7256bbb9402f32d6f969754
 DIST werkzeug-2.2.3.gh.tar.gz 847768 BLAKE2B 7d0b891a2b15e4fc469c3d331cfb2565f452ae77f772f7ab8e6254aedd172f9115cd3ebd9c82e951ea7505c0e58d6b6f07fb643a8e87af505e04686cccf56cd4 SHA512 3968e663f67e41da5148a4aa1d8e047ffd88416fa8df665e359bbe87992e4e723e1c915eed59ae86b53dd18817e41cdcef059483bce7aa8ed7b388dd4add1482
-DIST werkzeug-2.3.0.gh.tar.gz 831666 BLAKE2B 2d4c792deab6e153794695e249ca97f24b5d70c7f912f7a6fd34b653a7e6e9e0fadb6178c3f388986d0c0dfc55fdbad9809894b70b38f32b3a6c7aaf4d1b4c3f SHA512 ec2bce1ae4311e99d931b96bb05fe98714e317e1d838edec1fd79a05e260ac544f680656b8d5957d123a59a94b40393eb12c3ca8d83e800cc46041b0c0968aea
-DIST werkzeug-2.3.1.gh.tar.gz 832058 BLAKE2B d92836c168339e4dfb07c27d8379548a6805e9aec884cb41b76b9b4196f982ec6d05a6e505bb2ad70e591e54a4a2cecd683b5b6b78a058f90adab704da154d1f SHA512 02b5feb1e4d5c7b24d7b890c579cd3211eb430101d14800ca6c1e2a244da90fee4d5c0cd4819ead58a2885df0c736c796720fd9a3378a1eabaf417aefaa5a919
-DIST werkzeug-2.3.2.gh.tar.gz 832353 BLAKE2B 61806869549e356f244eb808823813473e5d7e00b7b085720f02429d3c2f30ceffb0bf7daeb57f0ef0b94fe836c8d895bc8a4b0b2d284536297718f4f0912b64 SHA512 03b866cc7b2d539ade9284632e55dd66598a06596f3ef1de2b3af9081d8b3c6745eb94744faf7f93abe383615efb3453a41544975fbfb548582ca1912ad932dc
-DIST werkzeug-2.3.3.gh.tar.gz 832625 BLAKE2B 66a243af0b0158722184ef098280b1556a43c99c4266d9d0c28898474a36a2ac63096444994e792add7119b17ac94fd2b145055495a1ffbdf84983dfd0cc6928 SHA512 969dfc7412378ba9373f6fb3bee4129f4bbd3a502e7f320fedb29464005b1e2ee9afc9241128ef06271592a978d229ae2633cbaf8ae9e2161f4c099a09715adc
 DIST werkzeug-2.3.4.gh.tar.gz 833090 BLAKE2B e9d0134fa2a1355a2ef0df0f86cca6ea0f0a0c9b6ece98a6774ceab0a284c6a899e915688cb3e2e9f6192a7943cbcf20578d1e8f2f439dd8a9ab0f3d49361bcd SHA512 1e519fc88ac4438aa4dbd623ef8afc96a630df61d25a5a28154749f5c38593edefbb32163a632a5f38fa70d8cf2f1ae93633e54cfafe72d497ab70c99f9b2478
 EBUILD werkzeug-2.2.3.ebuild 1662 BLAKE2B 59159583aef75b5a349dfe04b8c688279109b672ec773f0507b065c8564e2e50ab04ef0b17c6597625fc8c23ae111cd0a93182b7249e75f36c8762d4a1e139fa SHA512 c6aa7b6b5c0c9eeb5fdab5917b7c30d969d4cbd5ffb47351687cb9df9110f269ca694e54d746d8eb2822dc3ec536b80d577f60ed8794036c8c00072216768555
-EBUILD werkzeug-2.3.0.ebuild 1671 BLAKE2B 77827a88928308662977df1e4a7a6af6e38b746a354b2172df832f350fd1fe688f9cf0c49e7b36cb8548611785be1e767ac0633287a1194288a0a4e15b7d6326 SHA512 a0f2741376ce584c282e4d3559e37b2822c26520086c2b5d2a83d5c4e33932281e3dc7fa092bda72f8e36997559de821541141a80c5690acc6fb84823f65e847
-EBUILD werkzeug-2.3.1.ebuild 1671 BLAKE2B 77827a88928308662977df1e4a7a6af6e38b746a354b2172df832f350fd1fe688f9cf0c49e7b36cb8548611785be1e767ac0633287a1194288a0a4e15b7d6326 SHA512 a0f2741376ce584c282e4d3559e37b2822c26520086c2b5d2a83d5c4e33932281e3dc7fa092bda72f8e36997559de821541141a80c5690acc6fb84823f65e847
-EBUILD werkzeug-2.3.2.ebuild 1671 BLAKE2B 77827a88928308662977df1e4a7a6af6e38b746a354b2172df832f350fd1fe688f9cf0c49e7b36cb8548611785be1e767ac0633287a1194288a0a4e15b7d6326 SHA512 a0f2741376ce584c282e4d3559e37b2822c26520086c2b5d2a83d5c4e33932281e3dc7fa092bda72f8e36997559de821541141a80c5690acc6fb84823f65e847
-EBUILD werkzeug-2.3.3.ebuild 1672 BLAKE2B 943a72bcad31dc64a83b17f9da97466825657d64c1b4f16aedcc39712b1f73608b6bde9b8f5e69351e7097e172b5df8a8c495a367515911ccdb02208eee79462 SHA512 8f08d4aca05e98cb469ad93029f645b46167388b6a22bf7ff5a4833c0bd4397a433f56e58868a23bf061ab765071dc6b606307c4f8d8c1a3541eac25f2b9330b
 EBUILD werkzeug-2.3.4-r1.ebuild 1768 BLAKE2B 0ff8d994ff47a5fbb44556656c1e320d0145c1edb35614320502b65a9a3ad44ff896696d27784a777b9e92f8d39655f3044ab04ec319a45320a51fbbba0dfdac SHA512 14be7cdeb0697d9a8aad107da9d503be4c52978b225b78000d6cd0eea61ddb708831166ce45283cdc4598018553e316d19c3474b5574fab1a8f1cc678f658b7b
 MISC metadata.xml 368 BLAKE2B 81932229098620395623f9149ac974f19fae9b65ad09943ee5c5d8d03c1e37e76061291c959fe5f004f531a244b3bb335c2a43dd66949c0be43493e45674d0e3 SHA512 67e5b5fea8052c0723820125271ea031ad984e0fe2af21d2423fc559bdc51dfe1d40f2fa5fe11e6d2b8b32216e716900080b859aad146c079ad2b390dd9844cf
diff --git a/dev-python/werkzeug/werkzeug-2.3.0.ebuild b/dev-python/werkzeug/werkzeug-2.3.0.ebuild
deleted file mode 100644
index 05c674f456c0..000000000000
--- a/dev-python/werkzeug/werkzeug-2.3.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Collection of various utilities for WSGI applications"
-HOMEPAGE="
-	https://palletsprojects.com/p/werkzeug/
-	https://pypi.org/project/Werkzeug/
-	https://github.com/pallets/werkzeug/
-"
-SRC_URI="
-	https://github.com/pallets/werkzeug/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="test-rust"
-
-RDEPEND="
-	>=dev-python/markupsafe-2.1.1[${PYTHON_USEDEP}]
-"
-# NOTE: remove the loong mask after greenlet gains support for loong
-# see https://github.com/python-greenlet/greenlet/pull/257
-BDEPEND="
-	test? (
-		dev-python/ephemeral-port-reserve[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/pytest-xprocess[${PYTHON_USEDEP}]
-		>=dev-python/watchdog-2.3[${PYTHON_USEDEP}]
-		test-rust? (
-			dev-python/cryptography[${PYTHON_USEDEP}]
-		)
-		!hppa? ( !ia64? ( !loong? (
-			$(python_gen_cond_dep '
-				dev-python/greenlet[${PYTHON_USEDEP}]
-			' 'python3*')
-		) ) )
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=()
-	if ! has_version "dev-python/cryptography[${PYTHON_USEDEP}]"; then
-		EPYTEST_DESELECT+=(
-			"tests/test_serving.py::test_server[https]"
-			tests/test_serving.py::test_ssl_dev_cert
-			tests/test_serving.py::test_ssl_object
-		)
-	fi
-
-	# the default portage tempdir is too long for AF_UNIX sockets
-	local -x TMPDIR=/tmp
-	epytest -p no:django -p no:httpbin tests
-}
diff --git a/dev-python/werkzeug/werkzeug-2.3.1.ebuild b/dev-python/werkzeug/werkzeug-2.3.1.ebuild
deleted file mode 100644
index 05c674f456c0..000000000000
--- a/dev-python/werkzeug/werkzeug-2.3.1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Collection of various utilities for WSGI applications"
-HOMEPAGE="
-	https://palletsprojects.com/p/werkzeug/
-	https://pypi.org/project/Werkzeug/
-	https://github.com/pallets/werkzeug/
-"
-SRC_URI="
-	https://github.com/pallets/werkzeug/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="test-rust"
-
-RDEPEND="
-	>=dev-python/markupsafe-2.1.1[${PYTHON_USEDEP}]
-"
-# NOTE: remove the loong mask after greenlet gains support for loong
-# see https://github.com/python-greenlet/greenlet/pull/257
-BDEPEND="
-	test? (
-		dev-python/ephemeral-port-reserve[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/pytest-xprocess[${PYTHON_USEDEP}]
-		>=dev-python/watchdog-2.3[${PYTHON_USEDEP}]
-		test-rust? (
-			dev-python/cryptography[${PYTHON_USEDEP}]
-		)
-		!hppa? ( !ia64? ( !loong? (
-			$(python_gen_cond_dep '
-				dev-python/greenlet[${PYTHON_USEDEP}]
-			' 'python3*')
-		) ) )
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=()
-	if ! has_version "dev-python/cryptography[${PYTHON_USEDEP}]"; then
-		EPYTEST_DESELECT+=(
-			"tests/test_serving.py::test_server[https]"
-			tests/test_serving.py::test_ssl_dev_cert
-			tests/test_serving.py::test_ssl_object
-		)
-	fi
-
-	# the default portage tempdir is too long for AF_UNIX sockets
-	local -x TMPDIR=/tmp
-	epytest -p no:django -p no:httpbin tests
-}
diff --git a/dev-python/werkzeug/werkzeug-2.3.2.ebuild b/dev-python/werkzeug/werkzeug-2.3.2.ebuild
deleted file mode 100644
index 05c674f456c0..000000000000
--- a/dev-python/werkzeug/werkzeug-2.3.2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Collection of various utilities for WSGI applications"
-HOMEPAGE="
-	https://palletsprojects.com/p/werkzeug/
-	https://pypi.org/project/Werkzeug/
-	https://github.com/pallets/werkzeug/
-"
-SRC_URI="
-	https://github.com/pallets/werkzeug/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="test-rust"
-
-RDEPEND="
-	>=dev-python/markupsafe-2.1.1[${PYTHON_USEDEP}]
-"
-# NOTE: remove the loong mask after greenlet gains support for loong
-# see https://github.com/python-greenlet/greenlet/pull/257
-BDEPEND="
-	test? (
-		dev-python/ephemeral-port-reserve[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/pytest-xprocess[${PYTHON_USEDEP}]
-		>=dev-python/watchdog-2.3[${PYTHON_USEDEP}]
-		test-rust? (
-			dev-python/cryptography[${PYTHON_USEDEP}]
-		)
-		!hppa? ( !ia64? ( !loong? (
-			$(python_gen_cond_dep '
-				dev-python/greenlet[${PYTHON_USEDEP}]
-			' 'python3*')
-		) ) )
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=()
-	if ! has_version "dev-python/cryptography[${PYTHON_USEDEP}]"; then
-		EPYTEST_DESELECT+=(
-			"tests/test_serving.py::test_server[https]"
-			tests/test_serving.py::test_ssl_dev_cert
-			tests/test_serving.py::test_ssl_object
-		)
-	fi
-
-	# the default portage tempdir is too long for AF_UNIX sockets
-	local -x TMPDIR=/tmp
-	epytest -p no:django -p no:httpbin tests
-}
diff --git a/dev-python/werkzeug/werkzeug-2.3.3.ebuild b/dev-python/werkzeug/werkzeug-2.3.3.ebuild
deleted file mode 100644
index 5b00c8084bee..000000000000
--- a/dev-python/werkzeug/werkzeug-2.3.3.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Collection of various utilities for WSGI applications"
-HOMEPAGE="
-	https://palletsprojects.com/p/werkzeug/
-	https://pypi.org/project/Werkzeug/
-	https://github.com/pallets/werkzeug/
-"
-SRC_URI="
-	https://github.com/pallets/werkzeug/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="test-rust"
-
-RDEPEND="
-	>=dev-python/markupsafe-2.1.1[${PYTHON_USEDEP}]
-"
-# NOTE: remove the loong mask after greenlet gains support for loong
-# see https://github.com/python-greenlet/greenlet/pull/257
-BDEPEND="
-	test? (
-		dev-python/ephemeral-port-reserve[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/pytest-xprocess[${PYTHON_USEDEP}]
-		>=dev-python/watchdog-2.3[${PYTHON_USEDEP}]
-		test-rust? (
-			dev-python/cryptography[${PYTHON_USEDEP}]
-		)
-		!hppa? ( !ia64? ( !loong? (
-			$(python_gen_cond_dep '
-				dev-python/greenlet[${PYTHON_USEDEP}]
-			' 'python3*')
-		) ) )
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=()
-	if ! has_version "dev-python/cryptography[${PYTHON_USEDEP}]"; then
-		EPYTEST_DESELECT+=(
-			"tests/test_serving.py::test_server[https]"
-			tests/test_serving.py::test_ssl_dev_cert
-			tests/test_serving.py::test_ssl_object
-		)
-	fi
-
-	# the default portage tempdir is too long for AF_UNIX sockets
-	local -x TMPDIR=/tmp
-	epytest -p no:django -p no:httpbin tests
-}
diff --git a/dev-python/yarl/Manifest b/dev-python/yarl/Manifest
index edbad58e77a9..a6b277631bf9 100644
--- a/dev-python/yarl/Manifest
+++ b/dev-python/yarl/Manifest
@@ -1,7 +1,3 @@
-DIST yarl-1.8.2.gh.tar.gz 109938 BLAKE2B 1f2cec38bb681f6a59f10253c75e74912d482cdbe0e639e3ba0a43b9d6ab7b7edc1558c9fffaffd7aad9fa905d884e856ff7f7b69dd103800ef62f7f05de90b5 SHA512 d5dcebcec06d520b48a1d879671a92371bd89eabb7be700c129fcc45e763ecc0370cbb5e88c7b9be05ecb3317370231293a8c076ed68d71a36fe953219dd27ea
-DIST yarl-1.9.1.tar.gz 184455 BLAKE2B 0d4127129832493e4ffa8e2389048d77c7df222809a551bb4ab8583e26b2a4db8876bf62bee7079bd4d1f1b9b55b4875678db84fca38c30b3453bd4117bd461c SHA512 a583bea632b96ef1448a5f28a03c139e822ddc7f5ee8c545994c2746b92022b9ea4d3d8c7ded374a9f3aca1ee22eacd1a31bf96d690eae1775954175393679d0
 DIST yarl-1.9.2.tar.gz 184673 BLAKE2B bb94131059d0cfaf88f04d62a44181245ebcb660cb44904f0b7e8d497905a16d0026aeff454b8179fab5342c6bf9c8d6aadade0d9f7c70321c71bbcc3998e9a3 SHA512 ffbb6df94220bb1561333f1ad69a70334328e2273ec5e91c2741f6fd5ca2f6dd38d5b5f617728797fce490accc2394a406a5f9b5b665af4746746229af0d7c5f
-EBUILD yarl-1.8.2.ebuild 910 BLAKE2B eb6b6d1b490406656d73a6d687370c4e5454a399e82a405de264724161fd46a0f5707ce3442943f3f37957b316b1036a07f91b6046213913cda64d7f0852b558 SHA512 4ba30aac419138b2bdfd6d2945b772a1b59927d11d5fb347018dfd7ed9a7dd6fa2ebfc533e861b440fb886835d6a25044e2efa9842fa29e5d1b586f624c95511
-EBUILD yarl-1.9.1.ebuild 857 BLAKE2B e60732429881eb3eb56e66ec7ea0d323100a161472fc3670be090f00cef7a160ebed615587eb0ab5d7a582568f3b65d2716343a96c710bc072473808efb5ca38 SHA512 45229167fb397c15b48e1f17f108b24dc23d57e35443af799fdd0559b5aa829a41f6e33b0f20bc98cb2c52f0243fa2eb7cb5d6d877651a885871cf39bd900ac3
 EBUILD yarl-1.9.2.ebuild 1341 BLAKE2B 92bab115f3719bcd29a8b21ccaec6fc24247d4bfd0189de7e8cb234ac23198012311d97290bd579b32515a258959ceffed71ba0b22182bca568fdbbeed4eb142 SHA512 0518ba27b67a1d72b0557c978017ff6a4db5e3506851a1b4fc6906cbba954804701ce6f26feaf69ac90fc45c3d928117ee84bba546047ea23908ce2cc5eaa1a2
 MISC metadata.xml 440 BLAKE2B 10fd0e37c9be76c5d1dd90b9fd1cb1e5161fc5a7d2b51bcb5658a8c187a67d5f9573241733c3f9570e9fb7767bf84b38a6f8b2c212596627bea4e1686b7eb41e SHA512 c9e340124ed93cb0d52a0ae5abd43c10528197893c3d5ab57a0eb7046ebae5b80119f7b033d6697110c4bc064c0a8581d904788f6969cb52a433064067898cbe
diff --git a/dev-python/yarl/yarl-1.8.2.ebuild b/dev-python/yarl/yarl-1.8.2.ebuild
deleted file mode 100644
index 85696bb73546..000000000000
--- a/dev-python/yarl/yarl-1.8.2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Yet another URL library"
-HOMEPAGE="
-	https://github.com/aio-libs/yarl/
-	https://pypi.org/project/yarl/
-"
-SRC_URI="
-	https://github.com/aio-libs/yarl/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="
-	>=dev-python/multidict-4.0[${PYTHON_USEDEP}]
-	>=dev-python/idna-2.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs \
-	dev-python/alabaster
-
-python_configure() {
-	> .install-cython || die
-	emake cythonize
-}
-
-python_test() {
-	cd tests || die
-	epytest --override-ini=addopts=
-}
diff --git a/dev-python/yarl/yarl-1.9.1.ebuild b/dev-python/yarl/yarl-1.9.1.ebuild
deleted file mode 100644
index 8cc9f27c1914..000000000000
--- a/dev-python/yarl/yarl-1.9.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Yet another URL library"
-HOMEPAGE="
-	https://github.com/aio-libs/yarl/
-	https://pypi.org/project/yarl/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-
-RDEPEND="
-	>=dev-python/multidict-4.0[${PYTHON_USEDEP}]
-	>=dev-python/idna-2.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/cython
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs \
-	dev-python/alabaster
-
-src_configure() {
-	set -- cython -3 yarl/_quoting_c.pyx
-	echo "${*}" >&2
-	"${@}" || die
-}
-
-python_test() {
-	cd tests || die
-	epytest --override-ini=addopts=
-}
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index d1018a6981a4..e44ac7ebfd1c 100644
--- a/eclass/Manifest.gz
+++ b/eclass/Manifest.gz
diff --git a/eclass/linux-mod-r1.eclass b/eclass/linux-mod-r1.eclass
index 595711008627..73e7e7f8ff0b 100644
--- a/eclass/linux-mod-r1.eclass
+++ b/eclass/linux-mod-r1.eclass
@@ -1058,7 +1058,13 @@ _modules_sanity_kernelversion() {
 			ewarn "with the current kernel (${KV_FULL}), it was either hardly"
 			ewarn "tested or is known broken. It is recommended to use one of:"
 			ewarn
-			ewarn "    <=sys-kernel/gentoo-kernel-${max}"
+			# fwiw we do not know what is *actually* used or wanted even with
+			# the USE, so stay a bit vague and always mention both dist+sources
+			if use dist-kernel; then
+				ewarn "    <=virtual/dist-kernel-${max} or"
+			else
+				ewarn "    <=sys-kernel/gentoo-kernel-${max} or"
+			fi
 			ewarn "    <=sys-kernel/gentoo-sources-${max}"
 			ewarn
 			ewarn "or equivalent rather than file downstream bug reports if run into"
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 825ab7d30279..883bc081a638 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/xdot/Manifest b/media-gfx/xdot/Manifest
index b497c9c5b237..41f534e44c23 100644
--- a/media-gfx/xdot/Manifest
+++ b/media-gfx/xdot/Manifest
@@ -1,6 +1,5 @@
 AUX backport-2ace1a1-issue-92.patch 5161 BLAKE2B a2974216dd5bfb64a53033f1a587a8d05181e3b894c3f5bbece7f3ec40014d38ee9185b8fb500dab78668319e1c91a9b8213a326a2df3ba6b347698082ed854f SHA512 58129ae687b0a8d78c0deb189519dbe3dd8b55484b3b9a6455f2bb0f607fcc5c43992ca6c841eadc576af46fac9f9ba5fb42f14b089c8864e60588ee72189ccb
 DIST xdot-1.2.tar.gz 136057 BLAKE2B 484a3513ec3d67dbc6e167f171e7f70977ba2472766f25aa7cc088235f99470bfac5fac67368ea53b633320752a928634840ff3dcccc6b96795d3b7c203db922 SHA512 b4d3b15114b982c7c38cc71c0602f6d1ba9874c7315c2b8c4a8a48bf7674e9b38bf19a0d4a2d319acc9a29cf8f177a651d4e213761e88b0b3cb26e95e8a92dda
 EBUILD xdot-1.2-r1.ebuild 1060 BLAKE2B b6a8fc4bfdce93a11f3d4c011888eb6017fd6652aa3b650d1dd6d85440258987c5f7c2efabff04156291ce17cbad8e1eb05115c17db6439d482c1be28c5aee1b SHA512 20aaa576d5a5a63f6373198643177120e73d29ad77113b82f0f89a8dae196def4ca115ed3843a974c099a45b060eb1b927fca575462ff6c9640f8bb804a17026
-EBUILD xdot-1.2.ebuild 823 BLAKE2B 196cd2ee59a9545bf0c36fbfec37715776f4acfc9599efcbfde357781e3b87c6220ff21c4bcaebddf042002b0f672e38f702ee9d9c4fb288caf8bddb9d700bd0 SHA512 0a5d9f1b3cbdc7b934254a54029612ab63c68c8d506d7e1fb15ffaa8805e1dca32e331d811bd36172569eb0d24b0ce70463a1fcf6e819b112601e348992306d8
 EBUILD xdot-9999.ebuild 1046 BLAKE2B 3c13fb67eb6f2e91f018c7d199f51b7cccd2b35b1b01d38e5c0bb8bceb5cd2c27a2ce1008479ae9986a664e6ca5f5882fcbb638857f0f8287514625acee57f4b SHA512 ddb93076f8006926ab05f28ce6462f11679a2313424e87cfb0ac42433f0013cdd3e85706baff321bf87b796f5db61acf06e29269548ac88c9abcb046b10b481d
 MISC metadata.xml 399 BLAKE2B 06318ca9aa1bb3f53733542916d19d28c03133866e868aefeba88d7e6e1b7594a628488471fe7f6853e02402a14db8501e056f5df9ae1429c4eca66ab7b6a492 SHA512 16caf359c45841ae27bfdeee51c7fdd71d6282548773e6f519cbcbfe43f9fa39c65322a610d2b3d5cb4471129cfa3738e6ee66ff6b6e94b4263d918fd44ff30c
diff --git a/media-gfx/xdot/xdot-1.2.ebuild b/media-gfx/xdot/xdot-1.2.ebuild
deleted file mode 100644
index 7040481efaae..000000000000
--- a/media-gfx/xdot/xdot-1.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{9..11} )
-
-MY_PN=xdot.py
-EGIT_REPO_URI="https://github.com/jrfonseca/${MY_PN}"
-
-if [[ ${PV} = 9999* ]]; then
-	GIT_ECLASS="git-r3"
-	SRC_URI=""
-else
-	KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86"
-	MY_P="${MY_PN}-${PV}"
-	S="${WORKDIR}/${MY_P}"
-	SRC_URI="https://github.com/jrfonseca/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-inherit ${GIT_ECLASS} distutils-r1
-
-DESCRIPTION="Interactive viewer for Graphviz dot files"
-HOMEPAGE="https://github.com/jrfonseca/xdot.py"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-
-DEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	media-gfx/graphviz
-"
-RDEPEND="${DEPEND}"
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index bddd0c6f12e6..f7999599268c 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/libmtp/Manifest b/media-libs/libmtp/Manifest
index 91af9c67b5d9..1798d21de256 100644
--- a/media-libs/libmtp/Manifest
+++ b/media-libs/libmtp/Manifest
@@ -1,7 +1,5 @@
 AUX libmtp-1.1.19-fix-docdir.patch 462 BLAKE2B 5c23a2b98a138fb6bc51d49c07d556cff17357ce604cc7e11bf652e180d560cfc1befb2957629a5bb9e46876721fa62d186dd7e0a4dc0e95b74f41a3d5620f9c SHA512 50e15c26fe110d551c350ec11e9fc2309f8dfb26039e824e7d59aa1e5b5250e012397ed30278578524eb579132b0206fae8d5c40f387dd71b93ac7fc261ac2e7
-DIST libmtp-1.1.20.tar.gz 860941 BLAKE2B f30dddf6fb2b4c17e7792412787f65d369f811741e64a77b781a50e70161f0047e53c7e9d9e70621f98482d6fd430c71bd46188df894ef76109c9cb3d9c02f19 SHA512 d0892909eb9b001b727690b991c7effd8c4b78054ba07d06e060979ff2fd78d0d6303d46906d3bc86e4edba6f8a8d3c970eb875372f572ed84019bc717f74018
 DIST libmtp-1.1.21.tar.gz 862703 BLAKE2B c6067d0e9c7e2410b950715d1f02243c835afacfb3eef2f250361d4075d378b2754dceadf5120c9a646413ea826f42291c530590861420f56140458558dccc8e SHA512 510f01f75de37a07c8ce54957a8fb74724538a7cfbdf1a86c201fda68573ef23fa578ff7baf2d9df938703b5776ded4ab1057c617125f3539e594bb5a1f3146f
-EBUILD libmtp-1.1.20.ebuild 1919 BLAKE2B 987f14665aeed026a6b06a4e59f39327b6dab5ff47122281d5c6cf7c4d03e24874b54154612c0b86727553441605a78ad1c392baadaa96c9423b4dc23350ece9 SHA512 6befe7987890738fb24b8c0846bb5243e73ef3159f5446765cd08216186fe1fa7ec00fed18c2dc1679a8eb0ab2905ba74694cf64d020e81a13ff4817d2975204
 EBUILD libmtp-1.1.21.ebuild 1919 BLAKE2B bb1995aae20277ff527d22420911901e09cc3b4899777b027ddbaa5fa6e41148f7f674f3f67119bd265b61f767dd0654a80d78c2ce426634b9d24b94a2f10640 SHA512 d1f145278cdfc26e6b1f79cb9580558d0267d24acffa53951173e9481fbaa9544b26c754dcdfdb9d611b8eb07446c5632d5d2bbc5190fe79cb913325777c6965
 EBUILD libmtp-9999.ebuild 1859 BLAKE2B d6c4d0516b3028951494178b3823090a56e03b1777871134a3b6152709ebf6c00e0e6caee12d38a00453245402ce5499ee7b568880195f6cf45256bd76255e3c SHA512 f102aba2ae7d1b10997dd3dc2676f1463b5dd14890fe74796c4490524acd6d706a2cb3709f876c2ffb3e035a9599a027ca2b76519c61663185bef663f00a6f0f
 MISC metadata.xml 448 BLAKE2B 4470bd44e384c19a8b2d1f75adfabecb196c26de90006c0929ac3598a8589759749b9f976a55b97ff124f65c405709c6dc83de9fbedfd3de73ff1a0f7ff9f4df SHA512 578112f8279c9b2497323891dbed49f025905004ca24f53f5cc2e62503861add2f0322886ba0762742939388dce7015825f3a69bcd48a41f96c0e7cfbc7e90be
diff --git a/media-libs/libmtp/libmtp-1.1.20.ebuild b/media-libs/libmtp/libmtp-1.1.20.ebuild
deleted file mode 100644
index 8649a60fd3f0..000000000000
--- a/media-libs/libmtp/libmtp-1.1.20.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit udev
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://git.code.sf.net/p/${PN}/code"
-	inherit autotools git-r3
-else
-	inherit libtool
-	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv x86"
-fi
-
-DESCRIPTION="Implementation of Microsoft's Media Transfer Protocol (MTP)"
-HOMEPAGE="http://libmtp.sourceforge.net/"
-
-LICENSE="LGPL-2.1" # LGPL-2+ and LGPL-2.1+ ?
-SLOT="0/9" # Based on SONAME of libmtp shared library
-IUSE="+crypt doc examples static-libs"
-
-RDEPEND="
-	acct-group/plugdev
-	virtual/libiconv
-	virtual/libusb:1
-	crypt? ( dev-libs/libgcrypt:0= )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	sys-devel/gettext
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-DOCS=( AUTHORS README TODO )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.1.19-fix-docdir.patch"
-)
-
-src_prepare() {
-	default
-
-	# ChangeLog says "RETIRING THIS FILE ..pause..  GIT" (Last entry from start of 2011)
-	rm ChangeLog || die
-
-	if [[ ${PV} == 9999* ]]; then
-		if [[ -e /usr/share/gettext/config.rpath ]]; then
-			cp /usr/share/gettext/config.rpath . || die
-		else
-			touch config.rpath || die # This is from upstream autogen.sh
-		fi
-		eautoreconf
-	else
-		# Needed to fix -fuse-ld=* filtering (e.g. lld)
-		# Can drop this once copyright year in libtool file included
-		# says >= 2021 (was 2014 at time of writing).
-		elibtoolize
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable crypt mtpz)
-		$(use_enable doc doxygen)
-		$(use_enable static-libs static)
-		--with-udev="$(get_udevdir)"
-		--with-udev-group=plugdev
-		--with-udev-mode=0660
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	find "${ED}" -name "*.la" -delete || die
-
-	if use examples; then
-		docinto examples
-		dodoc examples/*.{c,h,sh}
-	fi
-}
-
-pkg_postinst() {
-	udev_reload
-}
-
-pkg_postrm() {
-	udev_reload
-}
diff --git a/media-libs/portmidi/Manifest b/media-libs/portmidi/Manifest
index 57d63002cd66..f969d8e08fe9 100644
--- a/media-libs/portmidi/Manifest
+++ b/media-libs/portmidi/Manifest
@@ -1,7 +1,4 @@
-AUX portmidi-0.234-cmake.patch 13979 BLAKE2B cc6b4193e9008899c89545e2e416c75779d08a6ef100e7a37c21a7c745ac3416c31b044664ba439368c8bb0f3a7fde119343a86d31efe3482c4a88718affdd6d SHA512 b07cd643699084f8e02ffc53d3721a53dd17b421d8ff5b2889a14ab99ff709c14f68b30adc2e7db818cbe7884f93cab8290ff9466ac8616d0db58b3e7aab1f75
 AUX portmidi-2.0.4-cmake.patch 303 BLAKE2B e788d88f0ec46a9d326c2ffa3a0da6f828b826018007a0c5fa0c0bebc581dafbd6eeca4914bd24bd2fd30a8b61fda4fcee1e91dac792c5862972b08bddbf5c2f SHA512 103fcf619fcb188631b0b75bf77d9da7879b2d17491018be47d82beee4e5a54aaa86a02a4c0b0b044eba110e16dd08f8f20ca1aad716eb612686d9369cb50964
-DIST portmedia-code-r234.zip 1342298 BLAKE2B 3c3686b79ca0c8cbfaa6c44ae8c4f294630e1c5940576709ff1ca5854bfcfba1af7b067471656f2b39ae28cecea9b6c4403f72d5a2552355760c795eff123243 SHA512 cbc332d89bc465450b38245a83cc300dfd2e1e6de7c62284edf754ff4d8a9aa3dc49a395dcee535ed9688befb019186fa87fd6d8a3698898c2acbf3e6b7a0794
 DIST portmidi-2.0.4.tar.gz 263225 BLAKE2B fd8b002880ccfcff9f233e2fa5021fe4cf9da2f91b3ceaa36fe70f96818e174578f9a14b69bdbb58fab777c9a9e4ff939b86814a403860c7ec264dddc6f26e85 SHA512 d9f22d161e1dd9a4bde1971bb2b6e5352da51545f4fe5ecad11c55e7a535f0d88efce18d1c8fd91e93b70a7926150f86a0f53972ad92370e86556a8dd72dc194
-EBUILD portmidi-0.234.ebuild 2684 BLAKE2B 49312ecab4cf951da2144d964519e888c9a559058472ba40131b8b3b352fa65097a4d86a732c3246be4367ed57c2ecfe20fec5348cf67866f102ce2596093d9d SHA512 d24a52792f1bd38f0eaa60193c4233fa6817a5c02bbd6453de5a446274960795b96d83bcde33f16d7152abad09117294a53bfd3382f926268432ae31a4cf6d7c
 EBUILD portmidi-2.0.4.ebuild 1292 BLAKE2B 9dcd13148524ad34c57ba6aad827efb0db788d81b4a9f94f2fae485dbc7cc626bf2367c182fac4d47e765ffa28c75644b9bb4a62c699a87c09297755cfb371b8 SHA512 fda48db2cd1360e13d67c32cbee8519d8712b7412d21d357eec83311ad5cf4957d627784414d8e6d618d159b0144b21032faaf5fa79fb78c565b7eb19daf8191
 MISC metadata.xml 496 BLAKE2B 5890c7eb551287ad84661a78fbf8a3e3375a795c67aa8232cc69528c2247ef70e46e3cf12efeca8c5e01f02c07a2499250e8329b7bfd7ae56b8304a4a2af0328 SHA512 b879efddcd3197e07d28e51205819f7067ea9c4cec2900b5977c9fdc42510cb1e5edefc53e40152c529e008015943f8a9755a98b24685eead784284da8658e02
diff --git a/media-libs/portmidi/files/portmidi-0.234-cmake.patch b/media-libs/portmidi/files/portmidi-0.234-cmake.patch
deleted file mode 100644
index f4f1101ccb40..000000000000
--- a/media-libs/portmidi/files/portmidi-0.234-cmake.patch
+++ /dev/null
@@ -1,332 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 4919b78..9dc6e58 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -9,12 +9,11 @@ if(UNIX)
-   set(CMAKE_BUILD_TYPE Release CACHE STRING 
-       "Semicolon-separate list of supported configuration types")
-   # set default directories but don't override cached values...
--  set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CACHEFILE_DIR}/${CMAKE_BUILD_TYPE}
-+  set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-       CACHE STRING "libraries go here")
--  set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CACHEFILE_DIR}/${CMAKE_BUILD_TYPE}
-+  set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-       CACHE STRING "libraries go here")
--  set(CMAKE_RUNTIME_OUTPUT_DIRECTORY 
--      ${CMAKE_CACHEFILE_DIR}/${CMAKE_BUILD_TYPE}
-+  set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-       CACHE STRING "executables go here")
- 
- else(UNIX)
-@@ -68,10 +67,20 @@ endif(UNIX)
- include_directories(pm_common porttime)
- add_subdirectory(pm_common)
- 
--add_subdirectory(pm_test)
-+option(PORTMIDI_ENABLE_JAVA "Enable Java bindings support" ON)
-+option(PORTMIDI_ENABLE_STATIC "Build and install static libraries" OFF)
-+option(PORTMIDI_ENABLE_TEST "Build test programs" ON)
-+
-+if(PORTMIDI_ENABLE_TEST)
-+  add_subdirectory(pm_test)
-+endif(PORTMIDI_ENABLE_TEST)
- 
- add_subdirectory(pm_dylib)
- 
- # Cannot figure out how to make an xcode Java application with CMake
--add_subdirectory(pm_java)
-+if(PORTMIDI_ENABLE_JAVA)
-+  set(JAR_INSTALL_DIR share/java
-+      CACHE STRING "Define directory name for jar installation")
-+  add_subdirectory(pm_java)
-+endif(PORTMIDI_ENABLE_JAVA)
- 
-diff --git a/pm_common/CMakeLists.txt b/pm_common/CMakeLists.txt
-index cbeeade..92cbe27 100644
---- a/pm_common/CMakeLists.txt
-+++ b/pm_common/CMakeLists.txt
-@@ -44,9 +44,6 @@ set(CMAKE_C_FLAGS_RELEASE "${DEFAULT_RELEASE_FLAGS} ${LINUX_FLAGS}"
- 
- # first include the appropriate system-dependent file:
- if(UNIX)
--  # add the -g switch for Linux and Mac OS X (not used in Win32)
--  set (CMAKE_C_FLAGS_DEBUG "-g ${CMAKE_C_FLAGS_DEBUG}" 
--       CACHE STRING "enable extra checks for debugging" FORCE)
-   if(APPLE)
-     set(MACSRC pmmacosxcm pmmac readbinaryplist finddefault)
-     prepend_path(LIBSRC ../pm_mac/ ${MACSRC})
-@@ -62,19 +59,23 @@ if(UNIX)
-                              ${COREMIDI_LIB} ${CORESERVICES_LIB}
-         CACHE INTERNAL "")
- 
--    set(JAVAVM_LIB "${FRAMEWORK_PATH}/JavaVM.framework")
--    set(JAVA_INCLUDE_PATHS ${JAVAVM_LIB}/Headers)
-+    if(PORTMIDI_ENABLE_JAVA)
-+      set(JAVAVM_LIB "${FRAMEWORK_PATH}/JavaVM.framework")
-+      set(JAVA_INCLUDE_PATHS ${JAVAVM_LIB}/Headers)
-+    endif(PORTMIDI_ENABLE_JAVA)
-     message(STATUS "SYSROOT: " ${CMAKE_OSX_SYSROOT})
-   else(APPLE)
-     # LINUX settings...
--    include(FindJNI)
--    message(STATUS "JAVA_JVM_LIB_PATH is " ${JAVA_JVM_LIB_PATH})
--    message(STATUS "JAVA_INCLUDE_PATH is " ${JAVA_INCLUDE_PATH})
--    message(STATUS "JAVA_INCLUDE_PATH2 is " ${JAVA_INCLUDE_PATH2})
--    message(STATUS "JAVA_JVM_LIBRARY is " ${JAVA_JVM_LIBRARY})
--    set(JAVA_INCLUDE_PATHS ${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH2})
--    # libjvm.so is found relative to JAVA_INCLUDE_PATH:
--    set(JAVAVM_LIB ${JAVA_JVM_LIBRARY}/libjvm.so)
-+    if(PORTMIDI_ENABLE_JAVA)
-+      include(FindJNI)
-+      message(STATUS "JAVA_JVM_LIB_PATH is " ${JAVA_JVM_LIB_PATH})
-+      message(STATUS "JAVA_INCLUDE_PATH is " ${JAVA_INCLUDE_PATH})
-+      message(STATUS "JAVA_INCLUDE_PATH2 is " ${JAVA_INCLUDE_PATH2})
-+      message(STATUS "JAVA_JVM_LIBRARY is " ${JAVA_JVM_LIBRARY})
-+      set(JAVA_INCLUDE_PATHS ${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH2})
-+      # libjvm.so is found relative to JAVA_INCLUDE_PATH:
-+      set(JAVAVM_LIB ${JAVA_JVM_LIBRARY}/libjvm.so)
-+    endif(PORTMIDI_ENABLE_JAVA)
- 
-     set(LINUXSRC pmlinuxalsa pmlinux finddefault)
-     prepend_path(LIBSRC ../pm_linux/ ${LINUXSRC})
-@@ -88,10 +89,12 @@ else(UNIX)
-     # /MD is multithread DLL, /MT is multithread. Change to static:
-     include(../pm_win/static.cmake)
-     
--    include(FindJNI)
-+    if(PORTMIDI_ENABLE_JAVA)
-+      include(FindJNI)
- 
--    set(JAVA_INCLUDE_PATHS ${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH2})
--    # message(STATUS "JAVA_INCLUDE_PATHS: " ${JAVA_INCLUDE_PATHS})
-+      set(JAVA_INCLUDE_PATHS ${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH2})
-+      # message(STATUS "JAVA_INCLUDE_PATHS: " ${JAVA_INCLUDE_PATHS})
-+    endif(PORTMIDI_ENABLE_JAVA)
- 
-     set(WINSRC pmwin pmwinmm)
-     prepend_path(LIBSRC ../pm_win/ ${WINSRC})
-@@ -99,29 +102,43 @@ else(UNIX)
-     set(PM_NEEDED_LIBS winmm.lib)
-   endif(WIN32)
- endif(UNIX)
--set(JNI_EXTRA_LIBS ${PM_NEEDED_LIBS} ${JAVA_JVM_LIBRARY})
-+
-+if(PORTMIDI_ENABLE_JAVA)
-+  set(JNI_EXTRA_LIBS ${PM_NEEDED_LIBS} ${JAVA_JVM_LIBRARY})
-+endif(PORTMIDI_ENABLE_JAVA)
- 
- # this completes the list of library sources by adding shared code
- list(APPEND LIBSRC pmutil portmidi)
- 
- # now add the shared files to make the complete list of library sources
--add_library(portmidi-static ${LIBSRC})
--set_target_properties(portmidi-static PROPERTIES OUTPUT_NAME "portmidi_s")
--target_link_libraries(portmidi-static ${PM_NEEDED_LIBS})
--
--# define the jni library
--include_directories(${JAVA_INCLUDE_PATHS})
--
--set(JNISRC ${LIBSRC} ../pm_java/pmjni/pmjni.c)
--add_library(pmjni SHARED ${JNISRC})
--target_link_libraries(pmjni ${JNI_EXTRA_LIBS})
--set_target_properties(pmjni PROPERTIES EXECUTABLE_EXTENSION "jnilib")
-+if(PORTMIDI_ENABLE_STATIC)
-+  add_library(portmidi-static ${LIBSRC})
-+  set_target_properties(portmidi-static PROPERTIES OUTPUT_NAME "portmidi")
-+  target_link_libraries(portmidi-static ${PM_NEEDED_LIBS})
-+endif(PORTMIDI_ENABLE_STATIC)
-+
-+if(PORTMIDI_ENABLE_JAVA)
-+  # define the jni library
-+  include_directories(${JAVA_INCLUDE_PATHS})
-+
-+  set(JNISRC ${LIBSRC} ../pm_java/pmjni/pmjni.c)
-+  add_library(pmjni SHARED ${JNISRC})
-+  target_link_libraries(pmjni ${JNI_EXTRA_LIBS})
-+  set_target_properties(pmjni PROPERTIES EXECUTABLE_EXTENSION "jnilib")
-+endif(PORTMIDI_ENABLE_JAVA)
- 
- # install the libraries (Linux and Mac OS X command line)
- if(UNIX)
--  INSTALL(TARGETS portmidi-static pmjni
--    LIBRARY DESTINATION /usr/local/lib
--    ARCHIVE DESTINATION /usr/local/lib)
-+  if(PORTMIDI_ENABLE_STATIC)
-+    INSTALL(TARGETS portmidi-static
-+      LIBRARY DESTINATION lib${LIB_SUFFIX}
-+      ARCHIVE DESTINATION lib${LIB_SUFFIX})
-+  endif(PORTMIDI_ENABLE_STATIC)
-+  if(PORTMIDI_ENABLE_JAVA)
-+    INSTALL(TARGETS pmjni
-+      LIBRARY DESTINATION lib${LIB_SUFFIX}
-+      ARCHIVE DESTINATION lib${LIB_SUFFIX})
-+  endif(PORTMIDI_ENABLE_JAVA)
- # .h files installed by pm_dylib/CMakeLists.txt, so don't need them here
- #  INSTALL(FILES portmidi.h ../porttime/porttime.h
- #    DESTINATION /usr/local/include)
-diff --git a/pm_dylib/CMakeLists.txt b/pm_dylib/CMakeLists.txt
-index f693dd6..c0e1449 100644
---- a/pm_dylib/CMakeLists.txt
-+++ b/pm_dylib/CMakeLists.txt
-@@ -39,9 +39,6 @@ set(CMAKE_C_FLAGS_RELEASE "${DEFAULT_RELEASE_FLAGS} ${LINUX_FLAGS}"
- 
- # first include the appropriate system-dependent file:
- if(UNIX)
--  # add the -g switch for Linux and Mac OS X (not used in Win32)
--  set (CMAKE_C_FLAGS_DEBUG "-g ${CMAKE_C_FLAGS_DEBUG}" 
--       CACHE STRING "enable extra checks for debugging" FORCE)
-   if(APPLE)
-     set(MACSRC pmmacosxcm pmmac readbinaryplist finddefault)
-     prepend_path(LIBSRC ../pm_mac/ ${MACSRC})
-@@ -63,7 +60,8 @@ if(UNIX)
-     message(STATUS "SYSROOT: " ${CMAKE_OSX_SYSROOT})
-   else(APPLE)
-     # LINUX settings...
--    include(FindJNI)
-+    if(PORTMIDI_ENABLE_JAVA)
-+      include(FindJNI)
-     # message(STATUS "JAVA_JVM_LIB_PATH is " ${JAVA_JVM_LIB_PATH})
-     # message(STATUS "JAVA_INCLUDE_PATH is " ${JAVA_INCLUDE_PATH})
-     # note: should use JAVA_JVM_LIB_PATH, but it is not set properly
-@@ -75,11 +73,8 @@ if(UNIX)
-     # JAVA_INCLUDE_PATH2; if no, then we need to make both JAVA_INCLUDE_PATH
-     # and JAVA_INCLUDE_PATH2 set by user (will need clear documentation
-     # because JAVA_INCLUDE_PATH2 is pretty obscure)
--    set(JAVA_INCLUDE_PATH  ${JAVA_INCLUDE_PATH-UNKNOWN}
--        CACHE STRING "where to find Java SDK include directory")
--    set(JAVA_INCLUDE_PATHS ${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH}/linux)
--    # libjvm.so is found relative to JAVA_INCLUDE_PATH:
--    set(JAVAVM_LIB ${JAVA_INCLUDE_PATH}/../jre/lib/i386/client/libjvm.so)
-+      set(JAVAVM_LIB ${JAVA_JVM_LIBRARY})
-+    endif(PORTMIDI_ENABLE_JAVA)
- 
-     set(LINUXSRC pmlinuxalsa pmlinux finddefault)
-     prepend_path(LIBSRC ../pm_linux/ ${LINUXSRC})
-@@ -91,13 +86,15 @@ else(UNIX)
-   if(WIN32)
-     # /MDd is multithread debug DLL, /MTd is multithread debug
-     # /MD is multithread DLL, /MT is multithread 
--    
--    include(FindJNI)
--    # note: should use JAVA_JVM_LIB_PATH, but it is not set properly
--    set(JAVAVM_LIB ${JAVA_INCLUDE_PATH}/../lib/jvm.lib)
- 
--    set(JAVA_INCLUDE_PATHS ${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH2})
--    # message(STATUS "JAVA_INCLUDE_PATHS: " ${JAVA_INCLUDE_PATHS})
-+    if(PORTMIDI_ENABLE_JAVA)
-+      include(FindJNI)
-+      # note: should use JAVA_JVM_LIB_PATH, but it is not set properly
-+      set(JAVAVM_LIB ${JAVA_INCLUDE_PATH}/../lib/jvm.lib)
-+
-+      set(JAVA_INCLUDE_PATHS ${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH2})
-+      # message(STATUS "JAVA_INCLUDE_PATHS: " ${JAVA_INCLUDE_PATHS})
-+    endif(PORTMIDI_ENABLE_JAVA)
- 
-     set(WINSRC pmwin pmwinmm)
-     prepend_path(LIBSRC ../pm_win/ ${WINSRC})
-@@ -106,7 +103,10 @@ else(UNIX)
-     # message(STATUS "JAVAVM_LIB: " ${JAVAVM_LIB})
-   endif(WIN32)
- endif(UNIX)
-+
-+if(PORTMIDI_ENABLE_JAVA)
- set(JNI_EXTRA_LIBS ${PM_NEEDED_LIBS} ${JAVAVM_LIB})
-+endif(PORTMIDI_ENABLE_JAVA)
- 
- # this completes the list of library sources by adding shared code
- set(SHARED_FILES pmutil portmidi)
-@@ -120,8 +120,8 @@ target_link_libraries(portmidi-dynamic ${PM_NEEDED_LIBS})
- # install the libraries (Linux and Mac OS X command line)
- if(UNIX)
-   INSTALL(TARGETS portmidi-dynamic
--    LIBRARY DESTINATION /usr/local/lib
--    ARCHIVE DESTINATION /usr/local/lib)
-+    LIBRARY DESTINATION lib${LIB_SUFFIX}
-+    ARCHIVE DESTINATION lib${LIB_SUFFIX})
-   INSTALL(FILES ../pm_common/portmidi.h ../porttime/porttime.h
--    DESTINATION /usr/local/include)
-+    DESTINATION include)
- endif(UNIX)
-diff --git a/pm_java/CMakeLists.txt b/pm_java/CMakeLists.txt
-index 9d79923..9ed2b09 100644
---- a/pm_java/CMakeLists.txt
-+++ b/pm_java/CMakeLists.txt
-@@ -5,43 +5,25 @@ if(UNIX)
-     # java not dealt with in CMake -- see pm_mac/pm_mac.xcodeproj
-   else(APPLE)
-     # linux
--    set(JPORTMIDICLASS JPortMidi.class JPortMidiException.class
--    		       JPortMidiApi.class)
--    set(PMDEFAULTSCLASS PmDefaultsFrame.class PmDefaults.class)
--    prepend_path(JPORTMIDICLASS2 jportmidi/ ${JPORTMIDICLASS})
--    prepend_path(PMDEFAULTSCLASS2 pmdefaults/ ${PMDEFAULTSCLASS})
--    set(PMDEFAULTS_ALL_CLASSES ${JPORTMIDICLASS2} ${PMDEFAULTSCLASS2})
--    # message(STATUS "PMDEFAULTS_ALL_CLASSES is " ${PMDEFAULTS_ALL_CLASSES})
--    add_custom_command(OUTPUT pmdefaults/PmDefaultsFrame.class
--        COMMAND javac -classpath . pmdefaults/PmDefaultsFrame.java
--	MAIN_DEPENDENCY pmdefaults/PmDefaultsFrame.java
--	DEPENDS pmdefaults/PmDefaults.java
--	WORKING_DIRECTORY .)
--    add_custom_command(OUTPUT pmdefaults/PmDefaults.class
--        COMMAND javac -classpath . pmdefaults/PmDefaults.java
--	MAIN_DEPENDENCY pmdefaults/PmDefaults.java
--	DEPENDS pmdefaults/PmDefaultsFrame.java
--	WORKING_DIRECTORY .)
--    add_custom_command(OUTPUT ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/pmdefaults.jar
--        COMMAND	cp pmdefaults/portmusic_logo.png .
--        COMMAND	jar cmf pmdefaults/manifest.txt pmdefaults.jar
--		pmdefaults/*.class portmusic_logo.png jportmidi/*.class
--  	COMMAND chmod +x pmdefaults/pmdefaults
--	COMMAND cp pmdefaults/pmdefaults ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
--	COMMAND mv pmdefaults.jar ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
--	COMMAND rm portmusic_logo.png
--	MAIN_DEPENDENCY pmdefaults/PmDefaults.class
--	DEPENDS ${PMDEFAULTS_ALL_CLASSES}
--	WORKING_DIRECTORY .)
--    add_custom_target(pmdefaults_target ALL 
--        DEPENDS ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/pmdefaults.jar)
-+    set(JAVA_CLASSES jportmidi pmdefaults)
-+    add_custom_command(OUTPUT ${JAVA_CLASSES}
-+            COMMAND javac -d ${CMAKE_CURRENT_BINARY_DIR} jportmidi/*.java pmdefaults/*.java
-+            WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
-+    add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/pmdefaults.jar
-+            DEPENDS ${JAVA_CLASSES}
-+            COMMAND jar cmf pmdefaults/manifest.txt ${CMAKE_CURRENT_BINARY_DIR}/pmdefaults.jar
-+            -C pmdefaults portmusic_logo.png -C ${CMAKE_CURRENT_BINARY_DIR} jportmidi
-+            -C ${CMAKE_CURRENT_BINARY_DIR} pmdefaults
-+            WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
-+    add_custom_target(pmdefaults.jar ALL
-+            DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/pmdefaults.jar)
-     # message(STATUS "add_custom_target: pmdefaults.jar")
- 
-     # install the libraries (Linux only)
--    INSTALL(FILES ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/pmdefaults.jar
--      DESTINATION /usr/share/java)
--    INSTALL(PROGRAMS ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/pmdefaults
--      DESTINATION /usr/local/bin)
-+    INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/pmdefaults.jar
-+      DESTINATION ${JAR_INSTALL_DIR})
-+    INSTALL(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/pmdefaults/pmdefaults
-+      DESTINATION bin)
-   endif(APPLE)
- endif(UNIX)
- # In windows, use pm_java/make.bat
-diff --git a/pm_test/CMakeLists.txt b/pm_test/CMakeLists.txt
-index 4fda450..5d683d8 100644
---- a/pm_test/CMakeLists.txt
-+++ b/pm_test/CMakeLists.txt
-@@ -10,10 +10,12 @@ if(WIN32)
- include(../pm_win/static.cmake)
- endif(WIN32)
- 
-+set(CMAKE_SKIP_BUILD_RPATH TRUE)
-+
- macro(make_a_test name)
-   add_executable(${name} ${name}.c)
--  target_link_libraries(${name} portmidi-static ${PM_NEEDED_LIBS})
--  add_dependencies(${name} portmidi-static)
-+  target_link_libraries(${name} portmidi-dynamic ${PM_NEEDED_LIBS})
-+  add_dependencies(${name} portmidi-dynamic)
- endmacro(make_a_test)
- 
- make_a_test(test)
diff --git a/media-libs/portmidi/portmidi-0.234.ebuild b/media-libs/portmidi/portmidi-0.234.ebuild
deleted file mode 100644
index 95a6697d9a83..000000000000
--- a/media-libs/portmidi/portmidi-0.234.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ninja: error: build.ninja:521: multiple rules generate pm_java/pmdefaults.jar [-w dupbuild=err]
-CMAKE_MAKEFILE_GENERATOR="emake"
-# Python bindings dropped b/c of bug #855077
-inherit cmake desktop xdg java-pkg-opt-2
-
-MY_P="portmedia-code-r$(ver_cut 2)"
-
-DESCRIPTION="Library for real time MIDI input and output"
-HOMEPAGE="http://portmedia.sourceforge.net/"
-SRC_URI="mirror://sourceforge/project/portmedia/${MY_P}.zip"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
-IUSE="debug doc java static-libs test-programs"
-
-BDEPEND="
-	app-arch/unzip
-	doc? (
-		app-doc/doxygen
-		dev-texlive/texlive-fontsrecommended
-		dev-texlive/texlive-latexextra
-		virtual/latex-base
-	)
-"
-CDEPEND="
-	media-libs/alsa-lib
-"
-RDEPEND="${CDEPEND}
-	java? ( >=virtual/jre-1.8:* )
-"
-DEPEND="
-	${CDEPEND}
-	java? ( >=virtual/jdk-1.8:* )
-"
-
-S="${WORKDIR}/${MY_P}/${PN}/trunk"
-MAKEOPTS+=" -j1"
-
-PATCHES=(
-	# fix parallel make failures, fix java support, and allow optional
-	# components like test programs and static libs to be skipped
-	"${FILESDIR}"/${P}-cmake.patch
-)
-
-pkg_setup() {
-	use java && java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	# install wrapper for pmdefaults
-	if use java ; then
-		cat > pm_java/pmdefaults/pmdefaults <<-EOF
-			#!/bin/sh
-			java -Djava.library.path="${EPREFIX}/usr/$(get_libdir)/" \\
-				-jar "${EPREFIX}/usr/share/${PN}/lib/pmdefaults.jar"
-		EOF
-		[[ $? -ne 0 ]] && die "cat pmdefaults failed"
-	fi
-}
-
-src_configure() {
-	if use debug ; then
-		CMAKE_BUILD_TYPE=Debug
-	else
-		CMAKE_BUILD_TYPE=Release
-	fi
-
-	local mycmakeargs=(
-		-DPORTMIDI_ENABLE_JAVA=$(usex java)
-		-DPORTMIDI_ENABLE_STATIC=$(usex static-libs)
-		-DPORTMIDI_ENABLE_TEST=$(usex test-programs)
-	)
-
-	if use java ; then
-		mycmakeargs+=(-DJAR_INSTALL_DIR="${EPREFIX}/usr/share/${PN}/lib")
-	fi
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-
-	if use doc ; then
-		doxygen || die "doxygen failed"
-		pushd latex > /dev/null
-		VARTEXFONTS="${T}"/fonts emake
-		popd > /dev/null
-	fi
-}
-
-src_install() {
-	cmake_src_install
-
-	dodoc CHANGELOG.txt README.txt pm_linux/README_LINUX.txt
-
-	use doc && dodoc latex/refman.pdf
-
-	if use java ; then
-		newdoc pm_java/README.txt README_JAVA.txt
-		newicon pm_java/pmdefaults/pmdefaults-icon.png pmdefaults.png
-		make_desktop_entry pmdefaults Pmdefaults pmdefaults "AudioVideo;Audio;Midi;"
-	fi
-
-	if use test-programs ; then
-		exeinto /usr/$(get_libdir)/${PN}
-		local app
-		for app in latency midiclock midithread midithru mm qtest sysex test ; do
-			doexe "${BUILD_DIR}"/${app}
-		done
-	fi
-}
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 51871bb43088..73efdf6e1f91 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index 552b149c991b..db014e8711a6 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -1,9 +1,5 @@
 AUX ardour-6.8-metadata.patch 653 BLAKE2B 3929d825fd8de5205d0f5aa8d0172e6374ca9ffd195789386b756ae540e1842a9902592b8b6d74019c52f134e8cb9886085e23277ef022883c4425dc580c5bc9 SHA512 963f3cfcd00a3fb15cb9875f7fc31a8294058898b6fab94feb32f786369643139b1e8787ecc47a4ea6a33dabe6bd90f564b6009e0d6e482d8e5129534c789972
-DIST Ardour-6.9.0.tar.bz2 12297369 BLAKE2B 62037130b9f2d15a7f527b549c552a281105298dc85e3019d0f7ac09cb791f2b5460c4a7bd2f2098ccade6b87c70a16e6414691d90ec4baafeb6065f26d10a66 SHA512 ace45f5bfe6d0c9e4bb1712ae53ebaee2f15f883045650cae3ddcae251d4fd2f645ba745effb739b47c73a0568ae9e8ae443b711dd610584e04575fd9046b234
-DIST Ardour-7.3.0.tar.bz2 12897398 BLAKE2B 518de10fd43220e843c775c9374347cf827562ff979a99ecdb9507f69daad642345a1c2ddec6f601511b599167a6904905dcdd25ac15f71616c3cb432897545d SHA512 4c0119768015aea447ea5c4ef15708a6440e189bd3578aca74b8ea2cac86920a8c8bd975e03f2af25108f76231d8afccf0003e6a2f8de1de28bcdce9085fe98c
 DIST Ardour-7.4.0.tar.bz2 12940403 BLAKE2B 4f3ca19e44a9ab5908fb6a6cf29adefb6a7abf4a9f43f810f0a0fdbe8fc1e11cdb49e2a66336fddb0e5d49a0780ac5af7b9363d2f14d9e309b787ceb8c8dd060 SHA512 2533167986a8b7550848e03475931fcd1409f188abed0c7c2a5999869995a73576976d02080cf2ac310113b57ff62d39031615c92cb4fafbe5d96edfc3a4ec45
-EBUILD ardour-6.9-r2.ebuild 4834 BLAKE2B 3b0568b144269aa0f87eb90bb424f8443a908aca53315be34d269eade4622d1146b3ffec15e73bf64f8a1c3d8a6ed0e0e64162c827d11bda373885a80ef9a634 SHA512 4c97ce34e52e1730a013f4f420f17c4a1b07f26fa9e2c057e78703de944e3cd7abde808cd4ea089f3aaae3bc8d91b2da7d37a4a42e2fd44e37d3c822954080ed
-EBUILD ardour-7.3-r1.ebuild 4997 BLAKE2B fc11c3dc63c5d5a1416d19728f0a2ddfc296ec58679a5370c3f44f6390f14796cc9c0e79d100508b7673defa631dba3f9d3f53c769365ea1809886d3582f1d24 SHA512 7e214c6268d23d06b4e98f9f007c018c12ecf0a69cdf61c9a22b531593deba8cf719aaaabd8c2d1fb29fd8fa2cf2195e494fe4a219689f46ab029caf730ec1f3
 EBUILD ardour-7.4-r2.ebuild 4993 BLAKE2B 71bbc532229a483cb822c9e3d84123feaa1720c08655b2ae64be3bf872ab88b7d5e32955bf457026e98d721736eb65f658a0bfe4bbc6a0acb98438c5d30938d6 SHA512 dfe27a9baf9b748af9bb5a7f77963ec41a623b78df4c62e029dbcbdccf0f18d3339741227c60086d37620cc61d29fd7222a6fc557e793fec3c4b3afea8f21ed4
 EBUILD ardour-9999.ebuild 4995 BLAKE2B 7185e40173864410eb0b913ac1f8dac790b16c4bf5a85d79c9c49c0c273bafab156c41db648f118afa19b87c41e065a70ec13056341bb258254496c654025000 SHA512 be40fe998b330347b5c0bbdc34cec6fbb652e60ee1edc00dab467a52b5ed60f28b2d511a7fead485a8949796937ab568fc55751fa4c564df37e693d53bf367aa
 MISC metadata.xml 451 BLAKE2B 0ed571ca79f0d4b92239239982f04abf725365df169290e4a02f6d8f580cf801f70d8bc93414b4549c8172ff43864d5c49fa987caeec58e1b2331ffe01a69ae6 SHA512 504bd817356c7ee57c64193584b3fc5b3bc70f5224d5a531ac5ecf8fb974728639e75b77bb9e7c5ad77cf6099123361b9ec6211b855edb4761acd95b8cb7abcb
diff --git a/media-sound/ardour/ardour-6.9-r2.ebuild b/media-sound/ardour/ardour-6.9-r2.ebuild
deleted file mode 100644
index 7d328f9b56f6..000000000000
--- a/media-sound/ardour/ardour-6.9-r2.ebuild
+++ /dev/null
@@ -1,183 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE='threads(+)'
-PLOCALES="cs de el en_GB es eu fr it ja nn pl pt pt_PT ru sv zh"
-inherit toolchain-funcs flag-o-matic plocale python-any-r1 waf-utils desktop xdg
-
-DESCRIPTION="Digital Audio Workstation"
-HOMEPAGE="https://ardour.org/"
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://git.ardour.org/ardour/ardour.git"
-	inherit git-r3
-else
-	KEYWORDS="amd64 x86"
-	SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/Ardour-${PV}.0.tar.bz2"
-	S="${WORKDIR}/Ardour-${PV}.0"
-fi
-
-LICENSE="GPL-2"
-SLOT="6"
-IUSE="doc jack nls phonehome pulseaudio cpu_flags_ppc_altivec cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow"
-
-RDEPEND="
-	dev-cpp/glibmm:2
-	dev-cpp/gtkmm:2.4
-	dev-libs/boost:=
-	dev-libs/glib:2
-	dev-libs/libsigc++:2
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	>=gnome-base/libgnomecanvas-2
-	media-libs/alsa-lib
-	media-libs/aubio
-	media-libs/flac:=
-	media-libs/freetype:2
-	media-libs/libart_lgpl
-	media-libs/liblo
-	media-libs/liblrdf
-	media-libs/libsamplerate
-	media-libs/libsndfile
-	media-libs/libsoundtouch
-	media-libs/raptor:2
-	media-libs/rubberband
-	media-libs/taglib
-	media-libs/vamp-plugin-sdk
-	net-misc/curl
-	sys-libs/readline:0=
-	sci-libs/fftw:3.0[threads]
-	virtual/libusb:1
-	x11-libs/cairo
-	x11-libs/gtk+:2
-	x11-libs/pango
-	jack? ( virtual/jack )
-	pulseaudio? ( media-sound/pulseaudio )
-	media-libs/lilv
-	media-libs/sratom
-	dev-libs/sord
-	media-libs/suil[X,gtk2]
-	media-libs/lv2"
-#	!bundled-libs? ( media-sound/fluidsynth ) at least libltc is missing to be able to unbundle...
-
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-util/itstool
-	sys-devel/gettext
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen[dot] )
-	jack? ( virtual/jack )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-6.8-metadata.patch"
-)
-
-pkg_pretend() {
-	[[ $(tc-getLD) == *gold* ]] && (has_version sci-libs/fftw[openmp] || has_version sci-libs/fftw[threads]) && \
-		ewarn "Linking with gold linker might produce broken executable, see bug #733972"
-}
-
-pkg_setup() {
-	if has_version \>=dev-libs/libsigc++-2.6 ; then
-		append-cxxflags -std=c++11
-	fi
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	xdg_src_prepare
-
-	sed 's/'full-optimization\'\ :\ \\[.*'/'full-optimization\'\ :\ \'\','/' -i "${S}"/wscript || die
-	MARCH=$(get-flag march)
-	OPTFLAGS=""
-	if use cpu_flags_x86_sse; then
-		if [[ ${MARCH} == "i686" ]] || [[ ${MARCH} == "i486" ]]; then
-			elog "You enabled sse but use an march that does not support sse!"
-			elog "We add -msse to the flags now, but please consider switching your march in make.conf!"
-		fi
-		OPTFLAGS="sse"
-	fi
-	if use cpu_flags_x86_mmx; then
-		if [[ ${MARCH} == "i486" ]]; then
-			elog "You enabled mmx with i486 set as march! You have been warned!"
-		fi
-		OPTFLAGS="${OPTFLAGS} mmx"
-	fi
-	if use cpu_flags_x86_3dnow; then
-		OPTFLAGS="${OPTFLAGS} 3dnow"
-	fi
-	sed 's/flag_line\ =\ o.*/flag_line\ =\ \": '"${OPTFLAGS}"' just some place holders\"/' \
-		-i "${S}"/wscript || die
-	sed 's/cpu\ ==\ .*/cpu\ ==\ "LeaveMarchAsIs":/' -i "${S}"/wscript || die
-	append-flags "-lboost_system"
-	python_fix_shebang "${S}"/wscript
-	python_fix_shebang "${S}"/waf
-	my_lcmsg() {
-		rm -f {gtk2_ardour,gtk2_ardour/appdata,libs/ardour,libs/gtkmm2ext}/po/${1}.po
-	}
-	plocale_for_each_disabled_locale my_lcmsg
-}
-
-src_configure() {
-	# avoid bug https://bugs.gentoo.org/800067
-	local -x AS="$(tc-getCC) -c"
-
-	local backends="alsa,dummy"
-	use jack && backends+=",jack"
-	use pulseaudio && backends+=",pulseaudio"
-
-	tc-export CC CXX
-	mkdir -p "${D}"
-	local myconf=(
-		--configdir=/etc
-		--freedesktop
-		--noconfirm
-		--optimize
-		--with-backends=${backends}
-		$({ use cpu_flags_ppc_altivec || use cpu_flags_x86_sse; } && \
-			echo "--fpu-optimization" || echo "--no-fpu-optimization")
-		$(usex doc "--docs" '')
-		$(usex nls "--nls" "--no-nls")
-		$(usex phonehome "--phone-home" "--no-phone-home")
-		# not possible right now  --use-external-libs
-	)
-
-	waf-utils_src_configure "${myconf[@]}"
-}
-
-src_compile() {
-	waf-utils_src_compile
-	use nls && waf-utils_src_compile i18n
-}
-
-src_install() {
-	local s
-
-	waf-utils_src_install
-
-	mv ${PN}.1 ${PN}${SLOT}.1 || die
-	doman ${PN}${SLOT}.1
-
-	for s in 16 22 32 48 256 512; do
-		newicon -s ${s} gtk2_ardour/resources/Ardour-icon_${s}px.png ardour${SLOT}.png
-	done
-
-	sed -i \
-		-e "s/\(^Name=\).*/\1Ardour ${SLOT}/" \
-		-e 's/;AudioEditing;/;X-AudioEditing;/' \
-		build/gtk2_ardour/ardour${SLOT}.desktop || die
-	domenu build/gtk2_ardour/ardour${SLOT}.desktop
-
-	insinto /usr/share/mime/packages
-	newins build/gtk2_ardour/ardour.xml ardour${SLOT}.xml
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	elog "Please do _not_ report problems with the package to ${PN} upstream."
-	elog "If you think you've found a bug, check the upstream binary package"
-	elog "before you report anything to upstream."
-}
diff --git a/media-sound/ardour/ardour-7.3-r1.ebuild b/media-sound/ardour/ardour-7.3-r1.ebuild
deleted file mode 100644
index b956ddf4cfa5..000000000000
--- a/media-sound/ardour/ardour-7.3-r1.ebuild
+++ /dev/null
@@ -1,186 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE='threads(+)'
-PLOCALES="ca cs de el en_GB es eu fr it ja ko nn pl pt pt_PT ru sv zh"
-inherit toolchain-funcs flag-o-matic plocale python-any-r1 waf-utils desktop xdg
-
-DESCRIPTION="Digital Audio Workstation"
-HOMEPAGE="https://ardour.org/"
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://git.ardour.org/ardour/ardour.git"
-	inherit git-r3
-else
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/Ardour-${PV}.0.tar.bz2"
-	S="${WORKDIR}/Ardour-${PV}.0"
-fi
-
-LICENSE="GPL-2"
-SLOT="7"
-IUSE="doc jack nls phonehome pulseaudio cpu_flags_ppc_altivec cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow"
-
-RDEPEND="
-	dev-cpp/glibmm:2
-	dev-cpp/gtkmm:2.4
-	dev-libs/boost:=
-	dev-libs/glib:2
-	dev-libs/libsigc++:2
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	>=gnome-base/libgnomecanvas-2
-	media-libs/alsa-lib
-	media-libs/aubio
-	media-libs/flac:=
-	media-libs/freetype:2
-	media-libs/libart_lgpl
-	media-libs/liblo
-	media-libs/liblrdf
-	media-libs/libsamplerate
-	media-libs/libsndfile
-	media-libs/libsoundtouch
-	media-libs/raptor:2
-	media-libs/rubberband
-	media-libs/taglib
-	media-libs/vamp-plugin-sdk
-	net-misc/curl
-	sys-libs/readline:0=
-	sci-libs/fftw:3.0[threads]
-	virtual/libusb:1
-	x11-libs/cairo
-	x11-libs/gtk+:2
-	x11-libs/pango
-	jack? ( virtual/jack )
-	pulseaudio? ( media-sound/pulseaudio )
-	media-libs/lilv
-	media-libs/sratom
-	dev-libs/sord
-	media-libs/suil[X,gtk2]
-	media-libs/lv2"
-#	!bundled-libs? ( media-sound/fluidsynth ) at least libltc is missing to be able to unbundle...
-
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-util/itstool
-	sys-devel/gettext
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen[dot] )
-	jack? ( virtual/jack )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-6.8-metadata.patch"
-)
-
-pkg_pretend() {
-	[[ $(tc-getLD) == *gold* ]] && (has_version sci-libs/fftw[openmp] || has_version sci-libs/fftw[threads]) && \
-		ewarn "Linking with gold linker might produce broken executable, see bug #733972"
-}
-
-pkg_setup() {
-	if has_version \>=dev-libs/libsigc++-2.6 ; then
-		append-cxxflags -std=c++11
-	fi
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	sed 's/'full-optimization\'\ :\ \\[.*'/'full-optimization\'\ :\ \'\','/' -i "${S}"/wscript || die
-	MARCH=$(get-flag march)
-	OPTFLAGS=""
-	if use cpu_flags_x86_sse; then
-		if [[ ${MARCH} == "i686" ]] || [[ ${MARCH} == "i486" ]]; then
-			elog "You enabled sse but use an march that does not support sse!"
-			elog "We add -msse to the flags now, but please consider switching your march in make.conf!"
-		fi
-		OPTFLAGS="sse"
-	fi
-	if use cpu_flags_x86_mmx; then
-		if [[ ${MARCH} == "i486" ]]; then
-			elog "You enabled mmx with i486 set as march! You have been warned!"
-		fi
-		OPTFLAGS="${OPTFLAGS} mmx"
-	fi
-	if use cpu_flags_x86_3dnow; then
-		OPTFLAGS="${OPTFLAGS} 3dnow"
-	fi
-	sed 's/flag_line\ =\ o.*/flag_line\ =\ \": '"${OPTFLAGS}"' just some place holders\"/' \
-		-i "${S}"/wscript || die
-	sed 's/cpu\ ==\ .*/cpu\ ==\ "LeaveMarchAsIs":/' -i "${S}"/wscript || die
-	append-flags "-lboost_system"
-	python_fix_shebang "${S}"/wscript
-	python_fix_shebang "${S}"/waf
-	my_lcmsg() {
-		rm -f {gtk2_ardour,gtk2_ardour/appdata,libs/ardour,libs/gtkmm2ext}/po/${1}.po
-	}
-	plocale_for_each_disabled_locale my_lcmsg
-}
-
-src_configure() {
-	# avoid bug https://bugs.gentoo.org/800067
-	local -x AS="$(tc-getCC) -c"
-
-	local backends="alsa,dummy"
-	use jack && backends+=",jack"
-	use pulseaudio && backends+=",pulseaudio"
-
-	tc-export CC CXX
-	mkdir -p "${D}"
-	local myconf=(
-		--configdir=/etc
-		--freedesktop
-		--noconfirm
-		--optimize
-		--with-backends=${backends}
-		$({ use cpu_flags_ppc_altivec || use cpu_flags_x86_sse; } && \
-			echo "--fpu-optimization" || echo "--no-fpu-optimization")
-		$(usex doc "--docs" '')
-		$(usex nls "--nls" "--no-nls")
-		$(usex phonehome "--phone-home" "--no-phone-home")
-		# not possible right now  --use-external-libs
-	)
-
-	waf-utils_src_configure "${myconf[@]}"
-}
-
-src_compile() {
-	waf-utils_src_compile
-	use nls && waf-utils_src_compile i18n
-}
-
-src_install() {
-	local s
-
-	waf-utils_src_install
-
-	mv ${PN}.1 ${PN}${SLOT}.1 || die
-	doman ${PN}${SLOT}.1
-
-	for s in 16 22 32 48 256 512; do
-		newicon -s ${s} gtk2_ardour/resources/Ardour-icon_${s}px.png ardour${SLOT}.png
-	done
-
-	# the build system still installs ardour6.png files so we get rid of those to not conflict with ardour:6
-	find "${D}/usr/share/icons/" -name ardour6.png -delete
-
-	sed -i \
-		-e "s/\(^Name=\).*/\1Ardour ${SLOT}/" \
-		-e 's/;AudioEditing;/;X-AudioEditing;/' \
-		build/gtk2_ardour/ardour${SLOT}.desktop || die
-	domenu build/gtk2_ardour/ardour${SLOT}.desktop
-
-	insinto /usr/share/mime/packages
-	newins build/gtk2_ardour/ardour.xml ardour${SLOT}.xml
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	elog "Please do _not_ report problems with the package to ${PN} upstream."
-	elog "If you think you've found a bug, check the upstream binary package"
-	elog "before you report anything to upstream."
-}
diff --git a/media-sound/flacon/Manifest b/media-sound/flacon/Manifest
index 4ec5ed0778ea..cd67f126412a 100644
--- a/media-sound/flacon/Manifest
+++ b/media-sound/flacon/Manifest
@@ -2,7 +2,7 @@ AUX flacon-9.0.0-no-man-compress.patch 1425 BLAKE2B 9f21a5b8a8b2ec0986b0d5902b15
 DIST flacon-10.0.0.tar.gz 3802889 BLAKE2B e99be9ad2da98e84455426df853bb38cecb91a6c66cb3f532459637adee97078fb034d3c5b5cc905b74756adbf6c11276f589d450c1506fba2dace264efe8b9c SHA512 55744b3ef46f298e8082ab172b8e0b5ad428ec3c965ae69befe7f9abb4e87417cf2373385240000471c92391d243ef3b33f25ae565c8e9497021d3b619a5ac1a
 DIST flacon-9.1.0.tar.gz 3769110 BLAKE2B 9e0c4aaef3f6019a8c8196a204e8281ca4250df441ea14127d9347f26557091e87019388bd2942afc39e45a7864d653e2ae887f665ce190f18e646448c3f8e3e SHA512 be35c61e082be7d05bebee5f99192201f91e90f3a80827ac5808e6798f7ed0ada28ab7c2456702c443be51356ec192cd059408c2c3feb5b48b5bab048d0efb00
 DIST flacon-9.4.0.tar.gz 3772714 BLAKE2B b45d6f934e80ae1d3546c1c54fdab22dac38d7ccf01b903a8c820145465c5732d34d6118bafcbbb4bde8c5bb528a707ebbee8b6a53ab5a1c29f1562a52c61382 SHA512 9dfd4ce558c4e3ce902c3b2e43b3c3fb94606f68dd550f774e3704d19ce6a28e887a7410054d6becfe3d20166aa687b7689821d6ee095e4efdc30e35a85e70ad
-EBUILD flacon-10.0.0.ebuild 1970 BLAKE2B 69a914c145eddf893b5515265c566369c410dc0922468a6d248749063873ce443978ad212c313f2028ddfa5a63faa4e081a8c71c112893b5a27d0a2954c08e15 SHA512 9f1c8233913a2570b1a9ecb3ec077a145a35948c46345dc80e9b320c822aa9230ce21f12d6e09a46aeb8e8b890647c5282eea651fb098208e8015ce896b7b7d5
+EBUILD flacon-10.0.0.ebuild 1968 BLAKE2B 617e901bcfa75ed73913f1f1f3b7b282a0a5573bf9ad6234fee6f659608192a460756b84fe201f5fddc8e0d5dcf09ac17b41532c8113cf1b29c0769ec7dd8671 SHA512 4ed0c69d3fb814822b603ce80d136c3618e85875b70743d3c321a6b15b4121109d915670a623a551a3f49b6fa5ecf0456bb846264a464f609ba9de6a57447950
 EBUILD flacon-9.1.0.ebuild 1976 BLAKE2B 0f6ec4c849a6e153628d3df0dcb151f348b053f9eb51107e356739ececa758d3b1045cd6dddc8c82a5888bb4896571c5aef632fdc6b5dc2acb22f090dd8dc957 SHA512 541ad3c226597af60122fd717dd310003df537217d13d9c70f4ee96bc604dbf21993cec2b4f81cfdb6ca687d6e565fb6823c3b018adfa6985fdee073a6fe25e4
 EBUILD flacon-9.4.0.ebuild 2090 BLAKE2B 6ac21eca944e1bea177ca4d001d8afeda2eb854c47f26b68aeddde1b29f443bcaa2219e6898dc457a781bfcc404dad9155609c3e5813b562b961081c679b6426 SHA512 6d59a351e5095152f21516e22c8eeda5b80c634fe3b4849506836c5837819c646ab8716b72a1772ad6cb20bd5c1d59e53063ecdcd9b230bea066aed69e5fe914
 MISC metadata.xml 483 BLAKE2B 795d557d1298374afb1a7b7e944258091e5a1a33cbba44ffb89d2b41545a13bc079ea406012351256e9aa3be08aa0277adb6757e68ac5d55e3fd636bce5efca9 SHA512 3d744c253befad102285251d40d891aef8ddab615f095a717951706fd64ac12f4fc7191d1b5ce0c4e9c3870eec5b427fcf5158771349a4a8c5219f7b797386ac
diff --git a/media-sound/flacon/flacon-10.0.0.ebuild b/media-sound/flacon/flacon-10.0.0.ebuild
index 5ae4223ddc54..c9709c275785 100644
--- a/media-sound/flacon/flacon-10.0.0.ebuild
+++ b/media-sound/flacon/flacon-10.0.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/flacon/flacon/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 BDEPEND="
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 071357c4fe23..8d6cd80de978 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index d1a3241b7044..e40e47dcea3e 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Tue, 30 May 2023 01:40:36 +0000
+Tue, 30 May 2023 07:40:03 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 836f6cd6ea99..d365191b2b99 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 544687 BLAKE2B f185c90f005db85bd4e0d1708998052d0d2289a9f94bfd93a7ffb51913b1e481a56e5ca19941ab2f92db9291e0e1c9e1da0d44394dec36f2b34c271c64831787 SHA512 46dc19fdb07a3192911d391fee8bca4fcd72d974b1d9edc45c622f777c5c3339e8c736786975ed154ae6b89e2520ac117c014bcb76cc8f2efcf40aad5bfd71e4
-TIMESTAMP 2023-05-30T01:40:39Z
+MANIFEST Manifest.files.gz 546124 BLAKE2B 03eedd2cb5221fcee8277950d4f0eaa63c4d89fcff016ce8237c33b86bf66d041421b4e3f1a61bf4adc37506d7e39938fe03c96872837bf059265711ec94186b SHA512 976cf7b2e2c60b59da2ac608b5352a8e04d8b7f36613abe781d8b94ac705640f28c73207f611bff76acea9c931e7346fde7aa7b850f0d9e03738d3eaa8c5ff00
+TIMESTAMP 2023-05-30T07:40:06Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmR1VBdfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmR1qFZfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDiYRAAknmNDFfTUJuGUXdXgu+XJMEuov5Cx5/y1k05aarYVJgQ32T+HX9Y34H5
-Uwc4/AVEXhOjfRXuUFT36xpDlXoWOgcPYw3YWlHajIP94A4T8nblQXLFjc5OeGGV
-R7KTvrqPjokZX3m+ooURqZno91H1a0qvq3nJDrQGqu8osajk3KrFGzs/oSGCoLBJ
-vcg688SMXko9z8ujYPMjolzfzqIGjuCyPVltJOuRT8wTIgrWpxvh5Ye4VwTFoV/t
-75ah/Wv3yT4LFTswFzWIE2E0TRq7QQ11aQpLAQ24hc4nUfYDO7vEZvyKNnJua6sM
-Ea807P8R7YGMapKzdGS5Nq4nz6Ifh8+fJTaE0MAtQ7aF6QWIrbXmWk+EbSktVEOl
-aGcIp2bmq0mIAWqrtySKMrXk2cjAQ+euinF/8RsukxTZa9DmmENcoB6tYdJXck2L
-TaeZgHSjDcZk/QbTOg31A2kODRhUpet7rIEW0EjplDQsOKpB9lddBOdPU2JPvdPI
-rrBb0AX8enZj4Bu99VGx3D/NKQiW5G4KmKVXqMQBz85mpdkqL3VlDpXNqIssDqXy
-rGpelEObGr8txR9YfEd6ACAItiU8cMsqclYYC7YwW3OUc9W+1uyYfAH9iX49xNE1
-5aRKEsKhc/1NV4lGVNVtYevN+++RUa/DQMR0cUcMLjsv+ZScUzU=
-=Ap7b
+klBPxw//XylJGfUi5PU7Kk86PAwfSOAMdJdm7CePUTrGEon5omjz3cvT2V1KPeNa
+odEsYxRXD1BudmGfHYB5rYPQounN2nQaLruQSGYAd/Qqj8F0W1NySF8T87ET5IdV
+CJ46QBJan+ykdioOveQY19YmqKIiOtdaGEZCldHBktyznkqXIPgmy4ySDs3r+EcC
+DTWReA8uCSfZtfOuf0hIx1f6rGQt4/dA/SBtrsgh96GYuSEMjsnlb15Ohr7man72
+Cgpr5fVd/gVBg2fzUbROlD8iWjiutzfz91Abx8eh6mE4uPKjDwxa6EtFeZCAAe3K
+/BZljGMwkDeoBeOa90NQc/shSDarAnkXWKl1C1DuWd0uwff2ZvHMYPJPlgY3lfmZ
+DkLuCHtDyMSFJxP5ovnLgUTeHuMwV5aFc/81rv0Q05ZkS1bFMbwcIUuOsdcmdmXJ
+aPvC+mSWs3TeQkA828brRSdV3j1rG7JNN0S4kngQbbYs3OD0BfzG3/f/+2ONCuk4
+9J1FKj22qhNsajwrOJw5XxfbQksfrhZGbIB3LrYNR6zrus1oFJmdQqBhgsvOd6lg
+j1zijx30AM/aFJ2O2NK7xQlUTDhpcL2UJLhMWkpGOb12dTbcMZrzMml7tkLRblOf
+sRxD+inovK0pCvKfS3h8Ol1jISHy6DJW7eAWURjazsanjs60gAk=
+=5cra
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/Manifest.files.gz b/metadata/glsa/Manifest.files.gz
index 036873cf9df9..9a5625ef76fc 100644
--- a/metadata/glsa/Manifest.files.gz
+++ b/metadata/glsa/Manifest.files.gz
diff --git a/metadata/glsa/glsa-202305-29.xml b/metadata/glsa/glsa-202305-29.xml
new file mode 100644
index 000000000000..7e7de5c3348c
--- /dev/null
+++ b/metadata/glsa/glsa-202305-29.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="202305-29">
+    <title>squashfs-tools: Multiple Vulnerabilities</title>
+    <synopsis>Multiple vulnerabilities have been discovered in squashfs-tools, the worst of which can result in an arbitrary file write.</synopsis>
+    <product type="ebuild">squashfs-tools</product>
+    <announced>2023-05-30</announced>
+    <revised count="1">2023-05-30</revised>
+    <bug>810706</bug>
+    <bug>813654</bug>
+    <access>remote</access>
+    <affected>
+        <package name="sys-fs/squashfs-tools" auto="yes" arch="*">
+            <unaffected range="ge">4.5_p20210914</unaffected>
+            <vulnerable range="lt">4.5_p20210914</vulnerable>
+        </package>
+    </affected>
+    <background>
+        <p>Squashfs is a compressed read-only filesystem for Linux. Squashfs is intended for general read-only filesystem use, for archival use (i.e. in cases where a .tar.gz file may be used), and in constrained block device/memory systems (e.g. embedded systems) where low overhead is needed.</p>
+    </background>
+    <description>
+        <p>Multiple vulnerabilities have been discovered in squashfs-tools. Please review the CVE identifiers referenced below for details.</p>
+    </description>
+    <impact type="normal">
+        <p>Please review the referenced CVE identifiers for details.</p>
+    </impact>
+    <workaround>
+        <p>There is no known workaround at this time.</p>
+    </workaround>
+    <resolution>
+        <p>All squashfs-tools users should upgrade to the latest version:</p>
+        
+        <code>
+          # emerge --sync
+          # emerge --ask --oneshot --verbose ">=sys-fs/squashfs-tools-4.5_p20210914"
+        </code>
+    </resolution>
+    <references>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-40153">CVE-2021-40153</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-41072">CVE-2021-41072</uri>
+    </references>
+    <metadata tag="requester" timestamp="2023-05-30T02:54:28.530142Z">ajak</metadata>
+    <metadata tag="submitter" timestamp="2023-05-30T02:54:28.552180Z">ajak</metadata>
+</glsa>
+\ No newline at end of file
diff --git a/metadata/glsa/glsa-202305-30.xml b/metadata/glsa/glsa-202305-30.xml
new file mode 100644
index 000000000000..502bd0aefbd9
--- /dev/null
+++ b/metadata/glsa/glsa-202305-30.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="202305-30">
+    <title>X.Org X server, XWayland: Multiple Vulnerabilities</title>
+    <synopsis>Multiple vulnerabilities have been discovered in the Xorg Server and XWayland, the worst of which can result in privilege escalation or remote code execution.</synopsis>
+    <product type="ebuild">xorg-server,xwayland</product>
+    <announced>2023-05-30</announced>
+    <revised count="1">2023-05-30</revised>
+    <bug>829208</bug>
+    <bug>877459</bug>
+    <bug>885825</bug>
+    <bug>893438</bug>
+    <bug>903547</bug>
+    <access>remote</access>
+    <affected>
+        <package name="x11-base/xorg-server" auto="yes" arch="*">
+            <unaffected range="ge">21.1.8</unaffected>
+            <vulnerable range="lt">21.1.8</vulnerable>
+        </package>
+        <package name="x11-base/xwayland" auto="yes" arch="*">
+            <unaffected range="ge">23.1.1</unaffected>
+            <vulnerable range="lt">23.1.1</vulnerable>
+        </package>
+    </affected>
+    <background>
+        <p>The X Window System is a graphical windowing system based on a client/server model.</p>
+    </background>
+    <description>
+        <p>Multiple vulnerabilities have been discovered in X.Org X server, XWayland. Please review the CVE identifiers referenced below for details.</p>
+    </description>
+    <impact type="high">
+        <p>Please review the referenced CVE identifiers for details.</p>
+    </impact>
+    <workaround>
+        <p>There is no known workaround at this time.</p>
+    </workaround>
+    <resolution>
+        <p>All X.Org X server users should upgrade to the latest version:</p>
+        
+        <code>
+          # emerge --sync
+          # emerge --ask --oneshot --verbose ">=x11-base/xorg-server-21.1.8"
+        </code>
+        
+        <p>All XWayland users should upgrade to the latest version:</p>
+        
+        <code>
+          # emerge --sync
+          # emerge --ask --oneshot --verbose ">=x11-base/xwayland-23.1.1"
+        </code>
+    </resolution>
+    <references>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-4008">CVE-2021-4008</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-4009">CVE-2021-4009</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-4010">CVE-2021-4010</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2021-4011">CVE-2021-4011</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-3550">CVE-2022-3550</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-3551">CVE-2022-3551</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-3553">CVE-2022-3553</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-4283">CVE-2022-4283</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-46283">CVE-2022-46283</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-46340">CVE-2022-46340</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-46341">CVE-2022-46341</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-46342">CVE-2022-46342</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-46343">CVE-2022-46343</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-46344">CVE-2022-46344</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-0494">CVE-2023-0494</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-1393">CVE-2023-1393</uri>
+        <uri>ZDI-CAN-19596</uri>
+    </references>
+    <metadata tag="requester" timestamp="2023-05-30T02:54:51.090310Z">ajak</metadata>
+    <metadata tag="submitter" timestamp="2023-05-30T02:54:51.098055Z">ajak</metadata>
+</glsa>
+\ No newline at end of file
diff --git a/metadata/glsa/glsa-202305-31.xml b/metadata/glsa/glsa-202305-31.xml
new file mode 100644
index 000000000000..6a035f95e151
--- /dev/null
+++ b/metadata/glsa/glsa-202305-31.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="202305-31">
+    <title>LibTIFF: Multiple Vulnerabilities</title>
+    <synopsis>Multiple vulnerabilities have been found in LibTIFF, the worst of which could result in arbitrary code execution.</synopsis>
+    <product type="ebuild">tiff</product>
+    <announced>2023-05-30</announced>
+    <revised count="1">2023-05-30</revised>
+    <bug>891839</bug>
+    <bug>895900</bug>
+    <access>remote</access>
+    <affected>
+        <package name="media-libs/tiff" auto="yes" arch="*">
+            <unaffected range="ge">4.5.0-r2</unaffected>
+            <vulnerable range="lt">4.5.0-r2</vulnerable>
+        </package>
+    </affected>
+    <background>
+        <p>LibTIFF provides support for reading and manipulating TIFF (Tagged Image File Format) images.</p>
+    </background>
+    <description>
+        <p>Multiple vulnerabilities have been discovered in LibTIFF. Please review the CVE identifiers referenced below for details.</p>
+    </description>
+    <impact type="normal">
+        <p>Please review the referenced CVE identifiers for details.</p>
+    </impact>
+    <workaround>
+        <p>There is no known workaround at this time.</p>
+    </workaround>
+    <resolution>
+        <p>All LibTIFF users should upgrade to the latest version:</p>
+        
+        <code>
+          # emerge --sync
+          # emerge --ask --oneshot --verbose ">=media-libs/tiff-4.5.0-r2"
+        </code>
+    </resolution>
+    <references>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-48281">CVE-2022-48281</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-0795">CVE-2023-0795</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-0796">CVE-2023-0796</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-0797">CVE-2023-0797</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-0798">CVE-2023-0798</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-0799">CVE-2023-0799</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-0800">CVE-2023-0800</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-0801">CVE-2023-0801</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-0802">CVE-2023-0802</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-0803">CVE-2023-0803</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-0804">CVE-2023-0804</uri>
+    </references>
+    <metadata tag="requester" timestamp="2023-05-30T03:01:32.709725Z">ajak</metadata>
+    <metadata tag="submitter" timestamp="2023-05-30T03:01:32.715272Z">ajak</metadata>
+</glsa>
+\ No newline at end of file
diff --git a/metadata/glsa/glsa-202305-32.xml b/metadata/glsa/glsa-202305-32.xml
new file mode 100644
index 000000000000..c5c8459f06f7
--- /dev/null
+++ b/metadata/glsa/glsa-202305-32.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="202305-32">
+    <title>WebKitGTK+: Multiple Vulnerabilities</title>
+    <synopsis>Multiple vulnerabilities have been found in WebkitGTK+, the worst of which could result in arbitrary code execution.</synopsis>
+    <product type="ebuild">webkit-gtk</product>
+    <announced>2023-05-30</announced>
+    <revised count="1">2023-05-30</revised>
+    <bug>871732</bug>
+    <bug>879571</bug>
+    <bug>888563</bug>
+    <bug>905346</bug>
+    <bug>905349</bug>
+    <bug>905351</bug>
+    <access>remote</access>
+    <affected>
+        <package name="net-libs/webkit-gtk" auto="yes" arch="*">
+            <unaffected range="ge">2.40.1</unaffected>
+            <vulnerable range="lt">2.40.1</vulnerable>
+        </package>
+    </affected>
+    <background>
+        <p>WebKitGTK+ is a full-featured port of the WebKit rendering engine, suitable for projects requiring any kind of web integration, from hybrid HTML/CSS applications to full-fledged web browsers.</p>
+    </background>
+    <description>
+        <p>Multiple vulnerabilities have been discovered in WebKitGTK+. Please review the CVE identifiers referenced below for details.</p>
+    </description>
+    <impact type="high">
+        <p>Please review the referenced CVE identifiers for details.</p>
+    </impact>
+    <workaround>
+        <p>There is no known workaround at this time.</p>
+    </workaround>
+    <resolution>
+        <p>All WebKitGTK+ users should upgrade to the latest version:</p>
+        
+        <code>
+          # emerge --sync
+          # emerge --ask --oneshot --verbose ">=net-libs/webkit-gtk-2.40.1"
+        </code>
+    </resolution>
+    <references>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-32885">CVE-2022-32885</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-32886">CVE-2022-32886</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-32888">CVE-2022-32888</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-32891">CVE-2022-32891</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-32923">CVE-2022-32923</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-42799">CVE-2022-42799</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-42823">CVE-2022-42823</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-42824">CVE-2022-42824</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-42826">CVE-2022-42826</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-42852">CVE-2022-42852</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-42856">CVE-2022-42856</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-42863">CVE-2022-42863</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-42867">CVE-2022-42867</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-46691">CVE-2022-46691</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-46692">CVE-2022-46692</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-46698">CVE-2022-46698</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-46699">CVE-2022-46699</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-46700">CVE-2022-46700</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-23517">CVE-2023-23517</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-23518">CVE-2023-23518</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-23529">CVE-2023-23529</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-25358">CVE-2023-25358</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-25360">CVE-2023-25360</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-25361">CVE-2023-25361</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-25362">CVE-2023-25362</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-25363">CVE-2023-25363</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-27932">CVE-2023-27932</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-27954">CVE-2023-27954</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-28205">CVE-2023-28205</uri>
+        <uri link="https://webkitgtk.org/security/WSA-2022-0009.html">WSA-2022-0009</uri>
+        <uri link="https://webkitgtk.org/security/WSA-2022-0010.html">WSA-2022-0010</uri>
+        <uri link="https://webkitgtk.org/security/WSA-2023-0001.html">WSA-2023-0001</uri>
+        <uri link="https://webkitgtk.org/security/WSA-2023-0002.html">WSA-2023-0002</uri>
+        <uri link="https://webkitgtk.org/security/WSA-2023-0003.html">WSA-2023-0003</uri>
+    </references>
+    <metadata tag="requester" timestamp="2023-05-30T03:01:57.042063Z">ajak</metadata>
+    <metadata tag="submitter" timestamp="2023-05-30T03:01:57.045898Z">ajak</metadata>
+</glsa>
+\ No newline at end of file
diff --git a/metadata/glsa/glsa-202305-33.xml b/metadata/glsa/glsa-202305-33.xml
new file mode 100644
index 000000000000..a4f315de2700
--- /dev/null
+++ b/metadata/glsa/glsa-202305-33.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="202305-33">
+    <title>OpenImageIO: Multiple Vulnerabilities</title>
+    <synopsis>Multiple vulnerabilities have been found in OpenImageIO, the worst of which could result in arbitrary code execution.</synopsis>
+    <product type="ebuild">openimageio</product>
+    <announced>2023-05-30</announced>
+    <revised count="1">2023-05-30</revised>
+    <bug>879255</bug>
+    <bug>884085</bug>
+    <bug>888045</bug>
+    <access>remote</access>
+    <affected>
+        <package name="media-libs/openimageio" auto="yes" arch="*">
+            <unaffected range="ge">2.4.6.0</unaffected>
+            <vulnerable range="lt">2.4.6.0</vulnerable>
+        </package>
+    </affected>
+    <background>
+        <p>OpenImageIO is a library for reading and writing images.</p>
+    </background>
+    <description>
+        <p>Multiple vulnerabilities have been discovered in OpenImageIO. Please review the CVE identifiers referenced below for details.</p>
+    </description>
+    <impact type="normal">
+        <p>Please review the referenced CVE identifiers for details.</p>
+    </impact>
+    <workaround>
+        <p>There is no known workaround at this time.</p>
+    </workaround>
+    <resolution>
+        <p>All OpenImageIO users should upgrade to the latest version:</p>
+        
+        <code>
+          # emerge --sync
+          # emerge --ask --oneshot --verbose ">=media-libs/openimageio-2.4.6.0"
+        </code>
+    </resolution>
+    <references>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-4198">CVE-2022-4198</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-36354">CVE-2022-36354</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-38143">CVE-2022-38143</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-41639">CVE-2022-41639</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-41649">CVE-2022-41649</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-41684">CVE-2022-41684</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-41794">CVE-2022-41794</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-41837">CVE-2022-41837</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-41838">CVE-2022-41838</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-41977">CVE-2022-41977</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-41981">CVE-2022-41981</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-41988">CVE-2022-41988</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-41999">CVE-2022-41999</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-43592">CVE-2022-43592</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-43593">CVE-2022-43593</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-43594">CVE-2022-43594</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-43595">CVE-2022-43595</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-43596">CVE-2022-43596</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-43597">CVE-2022-43597</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-43598">CVE-2022-43598</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-43599">CVE-2022-43599</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-43600">CVE-2022-43600</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-43601">CVE-2022-43601</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-43602">CVE-2022-43602</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-43603">CVE-2022-43603</uri>
+        <uri>TALOS-2022-1626</uri>
+        <uri>TALOS-2022-1627</uri>
+        <uri>TALOS-2022-1628</uri>
+        <uri>TALOS-2022-1629</uri>
+        <uri>TALOS-2022-1630</uri>
+        <uri>TALOS-2022-1632</uri>
+        <uri>TALOS-2022-1633</uri>
+        <uri>TALOS-2022-1634</uri>
+        <uri>TALOS-2022-1635</uri>
+        <uri>TALOS-2022-1643</uri>
+        <uri>TALOS-2022-1651</uri>
+        <uri>TALOS-2022-1652</uri>
+        <uri>TALOS-2022-1653</uri>
+        <uri>TALOS-2022-1654</uri>
+        <uri>TALOS-2022-1655</uri>
+        <uri>TALOS-2022-1656</uri>
+        <uri>TALOS-2022-1657</uri>
+    </references>
+    <metadata tag="requester" timestamp="2023-05-30T03:02:13.174119Z">ajak</metadata>
+    <metadata tag="submitter" timestamp="2023-05-30T03:02:13.176617Z">ajak</metadata>
+</glsa>
+\ No newline at end of file
diff --git a/metadata/glsa/glsa-202305-34.xml b/metadata/glsa/glsa-202305-34.xml
new file mode 100644
index 000000000000..602cbbcbd79f
--- /dev/null
+++ b/metadata/glsa/glsa-202305-34.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="202305-34">
+    <title>CGAL: Multiple Vulnerabilities</title>
+    <synopsis>Multiple vulnerabilities have been found in CGAL, the worst of which could result in arbitrary code execution.</synopsis>
+    <product type="ebuild">cgal</product>
+    <announced>2023-05-30</announced>
+    <revised count="1">2023-05-30</revised>
+    <bug>774261</bug>
+    <access>remote</access>
+    <affected>
+        <package name="sci-mathematics/cgal" auto="yes" arch="*">
+            <unaffected range="ge">5.4.1</unaffected>
+            <vulnerable range="lt">5.4.1</vulnerable>
+        </package>
+    </affected>
+    <background>
+        <p>CGAL is a C++ library for geometric algorithms and data structures.</p>
+    </background>
+    <description>
+        <p>Multiple vulnerabilities have been discovered in CGAL. Please review the CVE identifiers referenced below for details.</p>
+    </description>
+    <impact type="high">
+        <p>Please review the referenced CVE identifiers for details.</p>
+    </impact>
+    <workaround>
+        <p>There is no known workaround at this time.</p>
+    </workaround>
+    <resolution>
+        <p>All CGAL users should upgrade to the latest version:</p>
+        
+        <code>
+          # emerge --sync
+          # emerge --ask --oneshot --verbose ">=sci-mathematics/cgal-5.4.1"
+        </code>
+    </resolution>
+    <references>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-28601">CVE-2020-28601</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-28602">CVE-2020-28602</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-28603">CVE-2020-28603</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-28604">CVE-2020-28604</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-28605">CVE-2020-28605</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-28606">CVE-2020-28606</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-28607">CVE-2020-28607</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-28608">CVE-2020-28608</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-28610">CVE-2020-28610</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-28611">CVE-2020-28611</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-28612">CVE-2020-28612</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-28613">CVE-2020-28613</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-28614">CVE-2020-28614</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-28615">CVE-2020-28615</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-28616">CVE-2020-28616</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-28617">CVE-2020-28617</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-28618">CVE-2020-28618</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-28619">CVE-2020-28619</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-28620">CVE-2020-28620</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-28621">CVE-2020-28621</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-28622">CVE-2020-28622</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-28623">CVE-2020-28623</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-28624">CVE-2020-28624</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-28625">CVE-2020-28625</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-28626">CVE-2020-28626</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-28627">CVE-2020-28627</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-28628">CVE-2020-28628</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-28629">CVE-2020-28629</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-28630">CVE-2020-28630</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-28631">CVE-2020-28631</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-28632">CVE-2020-28632</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-28633">CVE-2020-28633</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-28634">CVE-2020-28634</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-28635">CVE-2020-28635</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-28636">CVE-2020-28636</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-35628">CVE-2020-35628</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-35629">CVE-2020-35629</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-35630">CVE-2020-35630</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-35631">CVE-2020-35631</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-35632">CVE-2020-35632</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-35633">CVE-2020-35633</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-35634">CVE-2020-35634</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-35635">CVE-2020-35635</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-35636">CVE-2020-35636</uri>
+    </references>
+    <metadata tag="requester" timestamp="2023-05-30T03:02:29.788917Z">ajak</metadata>
+    <metadata tag="submitter" timestamp="2023-05-30T03:02:29.791841Z">ajak</metadata>
+</glsa>
+\ No newline at end of file
diff --git a/metadata/glsa/glsa-202305-35.xml b/metadata/glsa/glsa-202305-35.xml
new file mode 100644
index 000000000000..46e5337b62b3
--- /dev/null
+++ b/metadata/glsa/glsa-202305-35.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="202305-35">
+    <title>Mozilla Firefox: Multiple Vulnerabilities</title>
+    <synopsis>Multiple vulnerabilities have been discovered in Mozilla Firefox, the worst of which could result in arbitrary code execution.</synopsis>
+    <product type="ebuild">firefox,firefox-bin</product>
+    <announced>2023-05-30</announced>
+    <revised count="1">2023-05-30</revised>
+    <bug>895962</bug>
+    <bug>903618</bug>
+    <bug>905889</bug>
+    <access>remote</access>
+    <affected>
+        <package name="www-client/firefox" auto="yes" arch="*">
+            <unaffected range="ge" slot="esr">102.10.0</unaffected>
+            <unaffected range="ge" slot="rapid">112.0</unaffected>
+            <vulnerable range="lt" slot="esr">102.10.0</vulnerable>
+            <vulnerable range="lt" slot="rapid">112.0</vulnerable>
+        </package>
+        <package name="www-client/firefox-bin" auto="yes" arch="*">
+            <unaffected range="ge" slot="esr">102.10.0</unaffected>
+            <unaffected range="ge" slot="rapid">112.0</unaffected>
+            <vulnerable range="lt" slot="esr">102.10.0</vulnerable>
+            <vulnerable range="lt" slot="rapid">112.0</vulnerable>
+        </package>
+    </affected>
+    <background>
+        <p>Mozilla Firefox is a popular open-source web browser from the Mozilla project.</p>
+    </background>
+    <description>
+        <p>Multiple vulnerabilities have been discovered in Mozilla Firefox. Please review the CVE identifiers referenced below for details.</p>
+    </description>
+    <impact type="high">
+        <p>Please review the referenced CVE identifiers for details.</p>
+    </impact>
+    <workaround>
+        <p>There is no known workaround at this time.</p>
+    </workaround>
+    <resolution>
+        <p>All Mozilla Firefox ESR binary users should upgrade to the latest version:</p>
+        
+        <code>
+          # emerge --sync
+          # emerge --ask --oneshot --verbose ">=www-client/firefox-bin-102.10.0:esr"
+        </code>
+        
+        <p>All Mozilla Firefox ESR users should upgrade to the latest version:</p>
+        
+        <code>
+          # emerge --sync
+          # emerge --ask --oneshot --verbose ">=www-client/firefox-102.10.0:esr"
+        </code>
+        
+        <p>All Mozilla Firefox binary users should upgrade to the latest version:</p>
+        
+        <code>
+          # emerge --sync
+          # emerge --ask --oneshot --verbose ">=www-client/firefox-bin-112.0:rapid"
+        </code>
+        
+        <p>All Mozilla Firefox users should upgrade to the latest version:</p>
+        
+        <code>
+          # emerge --sync
+          # emerge --ask --oneshot --verbose ">=www-client/firefox-112.0:rapid"
+        </code>
+    </resolution>
+    <references>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-0767">CVE-2023-0767</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-1945">CVE-2023-1945</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-1999">CVE-2023-1999</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-25728">CVE-2023-25728</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-25729">CVE-2023-25729</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-25730">CVE-2023-25730</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-25731">CVE-2023-25731</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-25732">CVE-2023-25732</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-25734">CVE-2023-25734</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-25735">CVE-2023-25735</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-25737">CVE-2023-25737</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-25738">CVE-2023-25738</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-25739">CVE-2023-25739</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-25742">CVE-2023-25742</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-25746">CVE-2023-25746</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-25748">CVE-2023-25748</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-25749">CVE-2023-25749</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-25750">CVE-2023-25750</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-25751">CVE-2023-25751</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-25752">CVE-2023-25752</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-28159">CVE-2023-28159</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-28160">CVE-2023-28160</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-28161">CVE-2023-28161</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-28162">CVE-2023-28162</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-28163">CVE-2023-28163</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-28164">CVE-2023-28164</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-28176">CVE-2023-28176</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-28177">CVE-2023-28177</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-29533">CVE-2023-29533</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-29535">CVE-2023-29535</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-29536">CVE-2023-29536</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-29537">CVE-2023-29537</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-29538">CVE-2023-29538</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-29539">CVE-2023-29539</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-29540">CVE-2023-29540</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-29541">CVE-2023-29541</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-29543">CVE-2023-29543</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-29544">CVE-2023-29544</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-29547">CVE-2023-29547</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-29548">CVE-2023-29548</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-29549">CVE-2023-29549</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-29550">CVE-2023-29550</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-29551">CVE-2023-29551</uri>
+    </references>
+    <metadata tag="requester" timestamp="2023-05-30T03:02:42.943248Z">ajak</metadata>
+    <metadata tag="submitter" timestamp="2023-05-30T03:02:42.946108Z">ajak</metadata>
+</glsa>
+\ No newline at end of file
diff --git a/metadata/glsa/glsa-202305-36.xml b/metadata/glsa/glsa-202305-36.xml
new file mode 100644
index 000000000000..efba568c154a
--- /dev/null
+++ b/metadata/glsa/glsa-202305-36.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="202305-36">
+    <title>Mozilla Thunderbird: Multiple Vulnerabilities</title>
+    <synopsis>Multiple vulnerabilities have been discovered in Mozilla Thunderbird, the worst of which could result in arbitrary code execution.</synopsis>
+    <product type="ebuild">thunderbird,thunderbird-bin</product>
+    <announced>2023-05-30</announced>
+    <revised count="1">2023-05-30</revised>
+    <bug>895960</bug>
+    <bug>903619</bug>
+    <bug>905890</bug>
+    <access>remote</access>
+    <affected>
+        <package name="mail-client/thunderbird" auto="yes" arch="*">
+            <unaffected range="ge">102.10.0</unaffected>
+            <vulnerable range="lt">102.10.0</vulnerable>
+        </package>
+        <package name="mail-client/thunderbird-bin" auto="yes" arch="*">
+            <unaffected range="ge">102.10.0</unaffected>
+            <vulnerable range="lt">102.10.0</vulnerable>
+        </package>
+    </affected>
+    <background>
+        <p>Mozilla Thunderbird is a popular open-source email client from the Mozilla project.</p>
+    </background>
+    <description>
+        <p>Multiple vulnerabilities have been discovered in Mozilla Thunderbird. Please review the CVE identifiers referenced below for details.</p>
+    </description>
+    <impact type="high">
+        <p>Please review the referenced CVE identifiers for details.</p>
+    </impact>
+    <workaround>
+        <p>There is no known workaround at this time.</p>
+    </workaround>
+    <resolution>
+        <p>All Mozilla Thunderbird users should upgrade to the latest version:</p>
+        
+        <code>
+          # emerge --sync
+          # emerge --ask --oneshot --verbose ">=mail-client/thunderbird-102.10.0"
+        </code>
+        
+        <p>All Mozilla Thunderbird binary users should upgrade to the latest version:</p>
+        
+        <code>
+          # emerge --sync
+          # emerge --ask --oneshot --verbose ">=mail-client/thunderbird-bin-102.10.0"
+        </code>
+    </resolution>
+    <references>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-0616">CVE-2023-0616</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-0767">CVE-2023-0767</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-1945">CVE-2023-1945</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-1999">CVE-2023-1999</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-25728">CVE-2023-25728</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-25729">CVE-2023-25729</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-25730">CVE-2023-25730</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-25732">CVE-2023-25732</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-25734">CVE-2023-25734</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-25735">CVE-2023-25735</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-25737">CVE-2023-25737</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-25738">CVE-2023-25738</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-25739">CVE-2023-25739</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-25740">CVE-2023-25740</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-25741">CVE-2023-25741</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-25742">CVE-2023-25742</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-25743">CVE-2023-25743</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-25744">CVE-2023-25744</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-25745">CVE-2023-25745</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-25746">CVE-2023-25746</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-25751">CVE-2023-25751</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-25752">CVE-2023-25752</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-28162">CVE-2023-28162</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-28163">CVE-2023-28163</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-28164">CVE-2023-28164</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-28176">CVE-2023-28176</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-28427">CVE-2023-28427</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-29533">CVE-2023-29533</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-29535">CVE-2023-29535</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-29536">CVE-2023-29536</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-29539">CVE-2023-29539</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-29541">CVE-2023-29541</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-29548">CVE-2023-29548</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-29550">CVE-2023-29550</uri>
+    </references>
+    <metadata tag="requester" timestamp="2023-05-30T03:02:57.393863Z">ajak</metadata>
+    <metadata tag="submitter" timestamp="2023-05-30T03:02:57.397152Z">ajak</metadata>
+</glsa>
+\ No newline at end of file
diff --git a/metadata/glsa/glsa-202305-37.xml b/metadata/glsa/glsa-202305-37.xml
new file mode 100644
index 000000000000..2382658ef7eb
--- /dev/null
+++ b/metadata/glsa/glsa-202305-37.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="202305-37">
+    <title>Apache Tomcat: Multiple Vulnerabilities</title>
+    <synopsis>Multiple vulnerabilities have been found in Apache Tomcat, the worst of which could result in denial of service.</synopsis>
+    <product type="ebuild">tomcat</product>
+    <announced>2023-05-30</announced>
+    <revised count="1">2023-05-30</revised>
+    <bug>878911</bug>
+    <bug>889596</bug>
+    <bug>896370</bug>
+    <bug>907387</bug>
+    <access>remote</access>
+    <affected>
+        <package name="www-servers/tomcat" auto="yes" arch="*">
+            <unaffected range="ge">10.1.8</unaffected>
+            <vulnerable range="lt">10.1.8</vulnerable>
+        </package>
+    </affected>
+    <background>
+        <p>Apache Tomcat is a Servlet-3.0/JSP-2.2 Container.</p>
+    </background>
+    <description>
+        <p>Multiple vulnerabilities have been discovered in Apache Tomcat. Please review the CVE identifiers referenced below for details.</p>
+    </description>
+    <impact type="low">
+        <p>Please review the referenced CVE identifiers for details.</p>
+    </impact>
+    <workaround>
+        <p>There is no known workaround at this time.</p>
+    </workaround>
+    <resolution>
+        <p>All Apache Tomcat users should upgrade to the latest version:</p>
+        
+        <code>
+          # emerge --sync
+          # emerge --ask --oneshot --verbose ">=www-servers/tomcat-10.1.8"
+        </code>
+    </resolution>
+    <references>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-42252">CVE-2022-42252</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2022-45143">CVE-2022-45143</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-24998">CVE-2023-24998</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-28709">CVE-2023-28709</uri>
+    </references>
+    <metadata tag="requester" timestamp="2023-05-30T03:03:08.445610Z">ajak</metadata>
+    <metadata tag="submitter" timestamp="2023-05-30T03:03:08.449048Z">ajak</metadata>
+</glsa>
+\ No newline at end of file
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index d1a3241b7044..e40e47dcea3e 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Tue, 30 May 2023 01:40:36 +0000
+Tue, 30 May 2023 07:40:03 +0000
diff --git a/metadata/glsa/timestamp.commit b/metadata/glsa/timestamp.commit
index 017e9675d21e..d6ce6e44c475 100644
--- a/metadata/glsa/timestamp.commit
+++ b/metadata/glsa/timestamp.commit
@@ -1 +1 @@
-a6a400bae6d717caa4806a3987d3810b3c66d0f3 1685319141 2023-05-29T00:12:21+00:00
+a8b85191c046076a4e4d12c8541d49e1473aaa66 1685415904 2023-05-30T03:05:04+00:00
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 01b3e7c83f40..ed745e46aa10 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index 8e368b6aeb15..b17d1ed4eb7e 100644
--- a/metadata/md5-cache/app-admin/Manifest.gz
+++ b/metadata/md5-cache/app-admin/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/ryzen_smu-0.1.2_p20211205-r1 b/metadata/md5-cache/app-admin/ryzen_smu-0.1.2_p20211205-r1
index 8a418b0e5d32..5f4330cd7acb 100644
--- a/metadata/md5-cache/app-admin/ryzen_smu-0.1.2_p20211205-r1
+++ b/metadata/md5-cache/app-admin/ryzen_smu-0.1.2_p20211205-r1
@@ -12,5 +12,5 @@ LICENSE=GPL-2
 RDEPEND=sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~slashbeast/distfiles/ryzen_smu/ryzen_smu-0.1.2_p20211205.tar.xz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	linux-mod-r1	a4ec8e7a025dc8f628435bdd3da9714d	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	linux-mod-r1	9687a35031c8f66a0cb2b0c3ccf5a0ae	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
 _md5_=52bb7b293546b7f0a4248a9c0f0c9b65
diff --git a/metadata/md5-cache/app-doc/Manifest.gz b/metadata/md5-cache/app-doc/Manifest.gz
index 7b5f0f83de97..43d661ef2bb9 100644
--- a/metadata/md5-cache/app-doc/Manifest.gz
+++ b/metadata/md5-cache/app-doc/Manifest.gz
diff --git a/metadata/md5-cache/app-doc/eclass-manpages-20230530 b/metadata/md5-cache/app-doc/eclass-manpages-20230530
new file mode 100644
index 000000000000..10ec8ea35a24
--- /dev/null
+++ b/metadata/md5-cache/app-doc/eclass-manpages-20230530
@@ -0,0 +1,10 @@
+BDEPEND=sys-apps/gawk
+DEFINED_PHASES=install
+DESCRIPTION=Collection of Gentoo eclass manpages
+EAPI=8
+HOMEPAGE=https://github.com/projg2/eclass-to-manpage
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~sam/distfiles/app-doc/eclass-manpages/eclass-manpages-20230530.tar.xz
+_md5_=cb3b9d0e260ddff47dac940223edf491
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index 263fe409cafc..84cd6df3b407 100644
--- a/metadata/md5-cache/app-emulation/Manifest.gz
+++ b/metadata/md5-cache/app-emulation/Manifest.gz
diff --git a/metadata/md5-cache/app-emulation/virtualbox-6.1.42-r1 b/metadata/md5-cache/app-emulation/virtualbox-6.1.42-r1
deleted file mode 100644
index 1872d58fa714..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-6.1.42-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=python_single_target_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) >=app-arch/tar-1.34-r2 >=dev-util/kbuild-0.1.9998.3127 <=dev-util/kbuild-0.1.9998.3500 >=dev-lang/yasm-0.6.2 dev-libs/libIDL sys-apps/which sys-devel/bin86 sys-libs/libcap sys-power/iasl virtual/pkgconfig doc? ( app-text/docbook-sgml-dtd:4.4 dev-texlive/texlive-basic dev-texlive/texlive-latex dev-texlive/texlive-latexrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-fontsrecommended dev-texlive/texlive-fontsextra ) java? ( virtual/jdk:1.8 ) qt5? ( dev-qt/linguist-tools:5 ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup
-DEPEND=python_single_target_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) acct-group/vboxusers ~app-emulation/virtualbox-modules-6.1.42 >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/libxml2 media-libs/libpng:0= media-libs/libvpx:0= sys-libs/zlib:= !headless? ( sdl? ( media-libs/libsdl:0[X,video] ) x11-base/xorg-proto x11-libs/libX11 x11-libs/libxcb:= x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt opengl? ( media-libs/libglvnd[X] virtual/glu ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 opengl? ( dev-qt/qtopengl:5 ) x11-libs/libXinerama ) ) dev-libs/openssl:0= virtual/libcrypt:= lvm? ( sys-fs/lvm2 ) opus? ( media-libs/opus ) udev? ( >=virtual/udev-171 ) vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] ) vnc? ( >=net-libs/libvncserver-0.9.9 ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) !headless? ( x11-libs/libXinerama x11-libs/libXrandr opengl? ( virtual/opengl ) ) java? ( virtual/jdk:1.8 ) pam? ( sys-libs/pam ) pax-kernel? ( sys-apps/elfix ) pulseaudio? ( media-sound/pulseaudio ) java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=Family of powerful x86 virtualization products for enterprise and home use
-EAPI=8
-HOMEPAGE=https://www.virtualbox.org/
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=desktop edo flag-o-matic java-pkg-opt-2 linux-info multilib optfeature pax-utils python-single-r1 tmpfiles toolchain-funcs udev xdg
-IUSE=alsa debug doc dtrace headless java lvm +opus pam pax-kernel pch pulseaudio +opengl python +qt5 +sdk +sdl +udev vboxwebsrv vnc java python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=amd64
-LICENSE=GPL-2 dtrace? ( CDDL )
-RDEPEND=python_single_target_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) acct-group/vboxusers ~app-emulation/virtualbox-modules-6.1.42 >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/libxml2 media-libs/libpng:0= media-libs/libvpx:0= sys-libs/zlib:= !headless? ( sdl? ( media-libs/libsdl:0[X,video] ) x11-base/xorg-proto x11-libs/libX11 x11-libs/libxcb:= x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt opengl? ( media-libs/libglvnd[X] virtual/glu ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 opengl? ( dev-qt/qtopengl:5 ) x11-libs/libXinerama ) ) dev-libs/openssl:0= virtual/libcrypt:= lvm? ( sys-fs/lvm2 ) opus? ( media-libs/opus ) udev? ( >=virtual/udev-171 ) vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] ) vnc? ( >=net-libs/libvncserver-0.9.9 ) java? ( virtual/jre:1.8 ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
-REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java ) ^^ ( python_single_target_python3_10 python_single_target_python3_11 )
-SLOT=0/6.1
-SRC_URI=https://download.virtualbox.org/virtualbox/6.1.42/VirtualBox-6.1.42.tar.bz2 https://gitweb.gentoo.org/proj/virtualbox-patches.git/snapshot/virtualbox-patches-6.1.36.tar.bz2
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	udev	eec0bbab06977f1cfc5597269c1fa152	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=c829257bc0e3e5c59757383e153232f9
diff --git a/metadata/md5-cache/app-emulation/virtualbox-7.0.6-r2 b/metadata/md5-cache/app-emulation/virtualbox-7.0.6-r2
deleted file mode 100644
index 98f9b5f0022a..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-7.0.6-r2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=python_single_target_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) >=app-arch/tar-1.34-r2 >=dev-lang/yasm-0.6.2 dev-libs/libIDL dev-util/glslang >=dev-util/kbuild-0.1.9998.3127 sys-apps/which sys-devel/bin86 sys-libs/libcap sys-power/iasl virtual/pkgconfig doc? ( app-text/docbook-sgml-dtd:4.4 app-text/docbook-xsl-ns-stylesheets dev-texlive/texlive-basic dev-texlive/texlive-latex dev-texlive/texlive-latexrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-fontsrecommended dev-texlive/texlive-fontsextra dev-qt/qthelp:5 ) gui? ( dev-qt/linguist-tools:5 ) nls? ( dev-qt/linguist-tools:5 ) java? ( virtual/jdk:1.8 ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup
-DEPEND=python_single_target_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) acct-group/vboxusers ~app-emulation/virtualbox-modules-7.0.6 dev-libs/libtpms dev-libs/libxml2 dev-libs/openssl:0= media-libs/libpng:0= media-libs/libvpx:0= net-misc/curl sys-libs/zlib dbus? ( sys-apps/dbus ) gui? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 x11-libs/libX11 x11-libs/libXt opengl? ( dev-qt/qtopengl:5 ) ) lvm? ( sys-fs/lvm2 ) opengl? ( media-libs/libglvnd[X] media-libs/vulkan-loader x11-libs/libX11 x11-libs/libXt ) pam? ( sys-libs/pam ) sdl? ( media-libs/libsdl:0[X,video] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXt ) vboxwebsrv? ( net-libs/gsoap[-gnutls(-),debug?] ) vde? ( net-misc/vde ) vnc? ( >=net-libs/libvncserver-0.9.9 ) >=dev-libs/libxslt-1.1.19 virtual/libcrypt:= alsa? ( >=media-libs/alsa-lib-1.0.13 ) gui? ( x11-base/xorg-proto x11-libs/libxcb:= x11-libs/libXcursor x11-libs/libXext x11-libs/libXinerama x11-libs/libXmu x11-libs/libXrandr ) java? ( virtual/jdk:1.8 ) opengl? ( x11-base/xorg-proto x11-libs/libXcursor x11-libs/libXinerama x11-libs/libXmu x11-libs/libXrandr virtual/glu ) sdl? ( x11-libs/libXinerama ) pulseaudio? ( media-sound/pulseaudio ) udev? ( >=virtual/udev-171 ) java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=Family of powerful x86 virtualization products for enterprise and home use
-EAPI=8
-HOMEPAGE=https://www.virtualbox.org/
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=desktop edo flag-o-matic java-pkg-opt-2 linux-info multilib optfeature pax-utils python-single-r1 tmpfiles toolchain-funcs udev xdg
-IUSE=alsa dbus debug doc dtrace +gui java lvm nls pam pch pulseaudio +opengl python +sdk +sdl +udev vboxwebsrv vde vnc java python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=amd64
-LICENSE=GPL-2+ GPL-3 LGPL-2.1 MIT dtrace? ( CDDL )
-RDEPEND=python_single_target_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) acct-group/vboxusers ~app-emulation/virtualbox-modules-7.0.6 dev-libs/libtpms dev-libs/libxml2 dev-libs/openssl:0= media-libs/libpng:0= media-libs/libvpx:0= net-misc/curl sys-libs/zlib dbus? ( sys-apps/dbus ) gui? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 x11-libs/libX11 x11-libs/libXt opengl? ( dev-qt/qtopengl:5 ) ) lvm? ( sys-fs/lvm2 ) opengl? ( media-libs/libglvnd[X] media-libs/vulkan-loader x11-libs/libX11 x11-libs/libXt ) pam? ( sys-libs/pam ) sdl? ( media-libs/libsdl:0[X,video] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXt ) vboxwebsrv? ( net-libs/gsoap[-gnutls(-),debug?] ) vde? ( net-misc/vde ) vnc? ( >=net-libs/libvncserver-0.9.9 ) gui? ( x11-libs/libxcb:= ) java? ( virtual/jre:1.8 ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
-REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java ) ^^ ( python_single_target_python3_10 python_single_target_python3_11 )
-SLOT=0/7.0
-SRC_URI=https://download.virtualbox.org/virtualbox/7.0.6/VirtualBox-7.0.6.tar.bz2 https://gitweb.gentoo.org/proj/virtualbox-patches.git/snapshot/virtualbox-patches-6.1.36.tar.bz2 gui? ( !doc? ( https://dev.gentoo.org/~ceamac/app-emulation/virtualbox/virtualbox-help-7.0.6.tar.xz ) )
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	udev	eec0bbab06977f1cfc5597269c1fa152	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=264b69e758da4a0a486a1545bc360dbd
diff --git a/metadata/md5-cache/app-emulation/virtualbox-additions-6.1.42 b/metadata/md5-cache/app-emulation/virtualbox-additions-6.1.42
deleted file mode 100644
index 0e14c574384f..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-additions-6.1.42
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=CD image containing guest additions for VirtualBox
-EAPI=8
-HOMEPAGE=https://www.virtualbox.org/
-KEYWORDS=amd64
-LICENSE=GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL
-SLOT=0/6.1
-SRC_URI=https://download.virtualbox.org/virtualbox/6.1.42/VBoxGuestAdditions_6.1.42.iso
-_md5_=dd0ac3c05a8800a7b4b4d449f4edbcbd
diff --git a/metadata/md5-cache/app-emulation/virtualbox-additions-7.0.6 b/metadata/md5-cache/app-emulation/virtualbox-additions-7.0.6
deleted file mode 100644
index 13ab587b364b..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-additions-7.0.6
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=CD image containing guest additions for VirtualBox
-EAPI=8
-HOMEPAGE=https://www.virtualbox.org/
-KEYWORDS=amd64
-LICENSE=GPL-3 || ( GPL-3 CDDL )
-SLOT=0/7.0
-SRC_URI=https://download.virtualbox.org/virtualbox/7.0.6/VBoxGuestAdditions_7.0.6.iso
-_md5_=599338637ce226f39d7741070f38a2bb
diff --git a/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-6.1.42 b/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-6.1.42
deleted file mode 100644
index 7446dbae8cec..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-6.1.42
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=PUEL extensions for VirtualBox
-EAPI=8
-HOMEPAGE=https://www.virtualbox.org/
-KEYWORDS=amd64
-LICENSE=PUEL-11
-RDEPEND=>=app-emulation/virtualbox-6.1.42
-RESTRICT=bindist mirror strip
-SLOT=0/6.1
-SRC_URI=https://download.virtualbox.org/virtualbox/6.1.42/Oracle_VM_VirtualBox_Extension_Pack-6.1.42.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-6.1.42.tar.gz
-_md5_=c4dc3a414047b0a1026410c5e1237975
diff --git a/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-7.0.6 b/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-7.0.6
deleted file mode 100644
index 7b2b1c0b9480..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-7.0.6
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=PUEL extensions for VirtualBox
-EAPI=8
-HOMEPAGE=https://www.virtualbox.org/
-KEYWORDS=amd64
-LICENSE=PUEL-11
-RDEPEND==app-emulation/virtualbox-7.0.6*
-RESTRICT=bindist mirror strip
-SLOT=0/7.0
-SRC_URI=https://download.virtualbox.org/virtualbox/7.0.6/Oracle_VM_VirtualBox_Extension_Pack-7.0.6.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-7.0.6.tar.gz
-_md5_=b818492f651083e98974c2c653b32dc1
diff --git a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.42-r1 b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.42-r1
deleted file mode 100644
index f8608da3f498..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.42-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-util/kbuild-0.1.9998.3127 <=dev-util/kbuild-0.1.9998.3500 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-power/iasl virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=acct-group/vboxguest acct-group/vboxsf acct-user/vboxguest sys-libs/pam sys-libs/zlib dbus? ( sys-apps/dbus ) X? ( x11-apps/xrandr x11-apps/xrefresh x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXt ) X? ( x11-base/xorg-proto x11-libs/libICE x11-libs/libSM x11-libs/libXau x11-libs/libXdmcp ) kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) kernel_linux? ( virtual/linux-sources virtual/libelf )
-DESCRIPTION=VirtualBox kernel modules and user-space tools for Gentoo guests
-EAPI=8
-HOMEPAGE=https://www.virtualbox.org/
-INHERIT=edo linux-mod systemd toolchain-funcs udev
-IUSE=X +dbus dist-kernel
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-PDEPEND=X? ( x11-drivers/xf86-video-vboxvideo )
-RDEPEND=acct-group/vboxguest acct-group/vboxsf acct-user/vboxguest sys-libs/pam sys-libs/zlib dbus? ( sys-apps/dbus ) X? ( x11-apps/xrandr x11-apps/xrefresh x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXt ) kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
-SLOT=0/6.1
-SRC_URI=https://download.virtualbox.org/virtualbox/6.1.42/VirtualBox-6.1.42.tar.bz2 https://gitweb.gentoo.org/proj/virtualbox-patches.git/snapshot/virtualbox-patches-6.1.36.tar.bz2
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	linux-mod	073dc5c9bc044e85d704b503ebc764a2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=42c14ce86148be3278d6a89bd7b095be
diff --git a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-7.0.6 b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-7.0.6
deleted file mode 100644
index 3378e6c0becd..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-7.0.6
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-lang/yasm-0.6.2 >=dev-util/kbuild-0.1.9998.3127 sys-devel/bin86 sys-power/iasl virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=acct-group/vboxguest acct-group/vboxsf acct-user/vboxguest sys-libs/pam sys-libs/zlib dbus? ( sys-apps/dbus ) gui? ( x11-apps/xrandr x11-apps/xrefresh x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXt ) gui? ( x11-libs/libICE x11-libs/libSM x11-libs/libXau x11-libs/libXdmcp x11-base/xorg-proto ) kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) kernel_linux? ( virtual/linux-sources virtual/libelf )
-DESCRIPTION=VirtualBox kernel modules and user-space tools for Gentoo guests
-EAPI=8
-HOMEPAGE=https://www.virtualbox.org/
-INHERIT=edo linux-mod systemd toolchain-funcs udev
-IUSE=+dbus gui dist-kernel
-KEYWORDS=amd64 x86
-LICENSE=GPL-3 LGPL-2.1+ MIT || ( GPL-3 CDDL )
-PDEPEND=gui? ( x11-drivers/xf86-video-vboxvideo )
-RDEPEND=acct-group/vboxguest acct-group/vboxsf acct-user/vboxguest sys-libs/pam sys-libs/zlib dbus? ( sys-apps/dbus ) gui? ( x11-apps/xrandr x11-apps/xrefresh x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXt ) kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
-SLOT=0/7.0
-SRC_URI=https://download.virtualbox.org/virtualbox/7.0.6/VirtualBox-7.0.6.tar.bz2 https://gitweb.gentoo.org/proj/virtualbox-patches.git/snapshot/virtualbox-patches-6.1.36.tar.bz2
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	linux-mod	073dc5c9bc044e85d704b503ebc764a2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=165bc4331bc3a0412a354c7589e3c993
diff --git a/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.42 b/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.42
deleted file mode 100644
index 43a6df78265d..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.42
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst setup
-DEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) kernel_linux? ( virtual/linux-sources virtual/libelf )
-DESCRIPTION=Kernel Modules for Virtualbox
-EAPI=8
-HOMEPAGE=https://www.virtualbox.org/
-INHERIT=linux-mod toolchain-funcs
-IUSE=dist-kernel
-KEYWORDS=amd64
-LICENSE=GPL-2
-RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
-SLOT=0/6.1
-SRC_URI=https://dev.gentoo.org/~ceamac/app-emulation/virtualbox-modules/vbox-kernel-module-src-6.1.42.tar.xz
-_eclasses_=linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	linux-mod	073dc5c9bc044e85d704b503ebc764a2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=4a64f75e659f9fcc82994fb0fb87e5b4
diff --git a/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.42-r1 b/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.42-r1
deleted file mode 100644
index dab6e838a292..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.42-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst setup
-DEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) kernel_linux? ( virtual/linux-sources virtual/libelf )
-DESCRIPTION=Kernel Modules for Virtualbox
-EAPI=8
-HOMEPAGE=https://www.virtualbox.org/
-INHERIT=linux-mod toolchain-funcs
-IUSE=dist-kernel
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
-SLOT=0/6.1
-SRC_URI=https://dev.gentoo.org/~ceamac/app-emulation/virtualbox-modules/vbox-kernel-module-src-6.1.42.tar.xz
-_eclasses_=linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	linux-mod	073dc5c9bc044e85d704b503ebc764a2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=fd1a71c8beb441aea6b16a5e22109e48
diff --git a/metadata/md5-cache/app-emulation/virtualbox-modules-7.0.6 b/metadata/md5-cache/app-emulation/virtualbox-modules-7.0.6
deleted file mode 100644
index ceae5419d2af..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-modules-7.0.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst setup
-DEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) kernel_linux? ( virtual/linux-sources virtual/libelf )
-DESCRIPTION=Kernel Modules for Virtualbox
-EAPI=8
-HOMEPAGE=https://www.virtualbox.org/
-INHERIT=linux-mod toolchain-funcs
-IUSE=dist-kernel
-KEYWORDS=amd64
-LICENSE=GPL-3
-RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
-SLOT=0/7.0
-SRC_URI=https://dev.gentoo.org/~ceamac/app-emulation/virtualbox-modules/vbox-kernel-module-src-7.0.6.tar.xz
-_eclasses_=linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	linux-mod	073dc5c9bc044e85d704b503ebc764a2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=5aaf3f3a078f892230800cb8be62d2b9
diff --git a/metadata/md5-cache/app-emulation/virtualbox-modules-7.0.6-r1 b/metadata/md5-cache/app-emulation/virtualbox-modules-7.0.6-r1
deleted file mode 100644
index 06a365aa7818..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-modules-7.0.6-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst setup
-DEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) kernel_linux? ( virtual/linux-sources virtual/libelf )
-DESCRIPTION=Kernel Modules for Virtualbox
-EAPI=8
-HOMEPAGE=https://www.virtualbox.org/
-INHERIT=linux-mod toolchain-funcs
-IUSE=dist-kernel
-KEYWORDS=~amd64
-LICENSE=GPL-3
-RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
-SLOT=0/7.0
-SRC_URI=https://dev.gentoo.org/~ceamac/app-emulation/virtualbox-modules/vbox-kernel-module-src-7.0.6.tar.xz
-_eclasses_=linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	linux-mod	073dc5c9bc044e85d704b503ebc764a2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=d25b2dea2bcbd7d410b099a278a4bbae
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index 8858fca4f1eb..fc736e612c10 100644
--- a/metadata/md5-cache/app-misc/Manifest.gz
+++ b/metadata/md5-cache/app-misc/Manifest.gz
diff --git a/metadata/md5-cache/app-misc/mosquitto-2.0.15 b/metadata/md5-cache/app-misc/mosquitto-2.0.15
deleted file mode 100644
index ea8d56f1d89d..000000000000
--- a/metadata/md5-cache/app-misc/mosquitto-2.0.15
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( || ( >=dev-lang/python-3.11.3:3.11 >=dev-lang/python-3.10.11:3.10 ) ) virtual/pkgconfig
-DEFINED_PHASES=compile install postinst prepare setup test
-DEPEND=acct-user/mosquitto acct-group/mosquitto dev-libs/cJSON:= srv? ( net-dns/c-ares:= ) ssl? ( dev-libs/openssl:0= ) tcpd? ( sys-apps/tcp-wrappers ) websockets? ( net-libs/libwebsockets[lejp] ) test? ( dev-util/cunit )
-DESCRIPTION=An Open Source MQTT v3 Broker
-EAPI=8
-HOMEPAGE=https://mosquitto.org/ https://github.com/eclipse/mosquitto
-INHERIT=python-any-r1 systemd toolchain-funcs
-IUSE=bridge examples +persistence +srv ssl tcpd test websockets
-KEYWORDS=amd64 arm ~arm64 x86
-LICENSE=EPL-1.0
-RDEPEND=acct-user/mosquitto acct-group/mosquitto dev-libs/cJSON:= srv? ( net-dns/c-ares:= ) ssl? ( dev-libs/openssl:0= ) tcpd? ( sys-apps/tcp-wrappers ) websockets? ( net-libs/libwebsockets[lejp] )
-REQUIRED_USE=test? ( bridge )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://mosquitto.org/files/source/mosquitto-2.0.15.tar.gz
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=331ffb421fa00e6848b0ec83a32e144c
diff --git a/metadata/md5-cache/app-misc/vit-2.2.0 b/metadata/md5-cache/app-misc/vit-2.2.0
deleted file mode 100644
index ac3ac78e187a..000000000000
--- a/metadata/md5-cache/app-misc/vit-2.2.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_single_target_python3_10? ( >=dev-python/tasklib-2.4.3[python_targets_python3_10(-)] >=dev-python/urwid-2.1.2[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/tasklib-2.4.3[python_targets_python3_11(-)] >=dev-python/urwid-2.1.2[python_targets_python3_11(-)] ) test? ( app-misc/task python_single_target_python3_10? ( >=dev-python/pytest-7.3.1[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/pytest-7.3.1[python_targets_python3_11(-)] ) ) python_single_target_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) python_single_target_python3_10? ( >=dev-python/gpep517-13[python_targets_python3_10(-)] >=dev-python/setuptools-67.7.2[python_targets_python3_10(-)] >=dev-python/wheel-0.40.0[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/gpep517-13[python_targets_python3_11(-)] >=dev-python/setuptools-67.7.2[python_targets_python3_11(-)] >=dev-python/wheel-0.40.0[python_targets_python3_11(-)] )
-DEFINED_PHASES=compile configure install prepare setup test
-DESCRIPTION=A lightweight, fast, curses-based front end to Taskwarrior
-EAPI=8
-HOMEPAGE=https://github.com/vit-project/vit https://pypi.org/project/vit/
-INHERIT=distutils-r1 pypi
-IUSE=test python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=app-misc/task python_single_target_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.3:3.11 )
-REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/v/vit/vit-2.2.0.tar.gz
-_eclasses_=distutils-r1	57f007adcdf3953627f14277c7eae6e0	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=24b88ec2cd8e403c8a23237c00c8e7e8
diff --git a/metadata/md5-cache/app-office/Manifest.gz b/metadata/md5-cache/app-office/Manifest.gz
index 59f41c5e446a..7776622cd13e 100644
--- a/metadata/md5-cache/app-office/Manifest.gz
+++ b/metadata/md5-cache/app-office/Manifest.gz
diff --git a/metadata/md5-cache/app-office/calcurse-4.8.0 b/metadata/md5-cache/app-office/calcurse-4.8.0
deleted file mode 100644
index 9de0ae339b1c..000000000000
--- a/metadata/md5-cache/app-office/calcurse-4.8.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install setup
-DEPEND=sys-libs/ncurses:0= python_single_target_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) caldav? ( python_single_target_python3_10? ( dev-python/httplib2[python_targets_python3_10(-)] dev-python/pyparsing[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/httplib2[python_targets_python3_11(-)] dev-python/pyparsing[python_targets_python3_11(-)] ) )
-DESCRIPTION=A text-based calendar and scheduling application
-EAPI=8
-HOMEPAGE=https://calcurse.org/
-INHERIT=python-single-r1
-IUSE=caldav doc python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=amd64 ~arm64 ppc ppc64 x86
-LICENSE=BSD-2
-RDEPEND=sys-libs/ncurses:0= python_single_target_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) caldav? ( python_single_target_python3_10? ( dev-python/httplib2[python_targets_python3_10(-)] dev-python/pyparsing[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/httplib2[python_targets_python3_11(-)] dev-python/pyparsing[python_targets_python3_11(-)] ) )
-REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 )
-SLOT=0
-SRC_URI=https://calcurse.org/files/calcurse-4.8.0.tar.gz
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=00c82b40d732c29b27ed1ee94e025d77
diff --git a/metadata/md5-cache/app-office/calcurse-4.8.0-r1 b/metadata/md5-cache/app-office/calcurse-4.8.0-r1
new file mode 100644
index 000000000000..bf7e56511458
--- /dev/null
+++ b/metadata/md5-cache/app-office/calcurse-4.8.0-r1
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig 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 setup
+DEPEND=sys-libs/ncurses:0= sys-libs/timezone-data python_single_target_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) caldav? ( python_single_target_python3_10? ( dev-python/httplib2[python_targets_python3_10(-)] dev-python/pyparsing[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/httplib2[python_targets_python3_11(-)] dev-python/pyparsing[python_targets_python3_11(-)] ) )
+DESCRIPTION=A text-based calendar and scheduling application
+EAPI=8
+HOMEPAGE=https://calcurse.org/
+INHERIT=autotools python-single-r1
+IUSE=caldav doc python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=amd64 ~arm64 ppc ppc64 x86
+LICENSE=BSD-2
+RDEPEND=sys-libs/ncurses:0= sys-libs/timezone-data python_single_target_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) caldav? ( python_single_target_python3_10? ( dev-python/httplib2[python_targets_python3_10(-)] dev-python/pyparsing[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/httplib2[python_targets_python3_11(-)] dev-python/pyparsing[python_targets_python3_11(-)] ) )
+REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 )
+SLOT=0
+SRC_URI=https://calcurse.org/files/calcurse-4.8.0.tar.gz
+_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=0f87b735f50ec35aa65a96adacebb3ae
diff --git a/metadata/md5-cache/app-office/calcurse-4.8.1 b/metadata/md5-cache/app-office/calcurse-4.8.1
new file mode 100644
index 000000000000..22f6db3d784b
--- /dev/null
+++ b/metadata/md5-cache/app-office/calcurse-4.8.1
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig 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 setup
+DEPEND=sys-libs/ncurses:0= sys-libs/timezone-data python_single_target_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) caldav? ( python_single_target_python3_10? ( dev-python/httplib2[python_targets_python3_10(-)] dev-python/pyparsing[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/httplib2[python_targets_python3_11(-)] dev-python/pyparsing[python_targets_python3_11(-)] ) )
+DESCRIPTION=A text-based calendar and scheduling application
+EAPI=8
+HOMEPAGE=https://calcurse.org/
+INHERIT=autotools python-single-r1
+IUSE=caldav doc python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=BSD-2
+RDEPEND=sys-libs/ncurses:0= sys-libs/timezone-data python_single_target_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) caldav? ( python_single_target_python3_10? ( dev-python/httplib2[python_targets_python3_10(-)] dev-python/pyparsing[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/httplib2[python_targets_python3_11(-)] dev-python/pyparsing[python_targets_python3_11(-)] ) )
+REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 )
+SLOT=0
+SRC_URI=https://calcurse.org/files/calcurse-4.8.1.tar.gz
+_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=ada505f72b506f3c7fcc7e028b2f862e
diff --git a/metadata/md5-cache/dev-cpp/Manifest.gz b/metadata/md5-cache/dev-cpp/Manifest.gz
index 6991e4a9988f..829516cd9953 100644
--- a/metadata/md5-cache/dev-cpp/Manifest.gz
+++ b/metadata/md5-cache/dev-cpp/Manifest.gz
diff --git a/metadata/md5-cache/dev-cpp/rapidfuzz-cpp-1.10.1 b/metadata/md5-cache/dev-cpp/rapidfuzz-cpp-1.10.1
deleted file mode 100644
index 21b0c10a81f4..000000000000
--- a/metadata/md5-cache/dev-cpp/rapidfuzz-cpp-1.10.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=test? ( >=dev-cpp/catch-3 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Rapid fuzzy string matching in C++
-EAPI=8
-HOMEPAGE=https://github.com/maxbachmann/rapidfuzz-cpp/
-INHERIT=cmake
-IUSE=test
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=MIT
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/maxbachmann/rapidfuzz-cpp/archive/v1.10.1.tar.gz -> rapidfuzz-cpp-1.10.1.gh.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=2360b736ef35c1bc5cec31fe3d4006d3
diff --git a/metadata/md5-cache/dev-cpp/rapidfuzz-cpp-1.10.2 b/metadata/md5-cache/dev-cpp/rapidfuzz-cpp-1.10.2
deleted file mode 100644
index 09f68dd968d3..000000000000
--- a/metadata/md5-cache/dev-cpp/rapidfuzz-cpp-1.10.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=test? ( >=dev-cpp/catch-3 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Rapid fuzzy string matching in C++
-EAPI=8
-HOMEPAGE=https://github.com/maxbachmann/rapidfuzz-cpp/
-INHERIT=cmake
-IUSE=test
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=MIT
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/maxbachmann/rapidfuzz-cpp/archive/v1.10.2.tar.gz -> rapidfuzz-cpp-1.10.2.gh.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=2360b736ef35c1bc5cec31fe3d4006d3
diff --git a/metadata/md5-cache/dev-cpp/rapidfuzz-cpp-1.10.4 b/metadata/md5-cache/dev-cpp/rapidfuzz-cpp-1.10.4
deleted file mode 100644
index 64678a0fdd5c..000000000000
--- a/metadata/md5-cache/dev-cpp/rapidfuzz-cpp-1.10.4
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=test? ( >=dev-cpp/catch-3 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Rapid fuzzy string matching in C++
-EAPI=8
-HOMEPAGE=https://github.com/maxbachmann/rapidfuzz-cpp/
-INHERIT=cmake
-IUSE=test
-KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=MIT
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/maxbachmann/rapidfuzz-cpp/archive/v1.10.4.tar.gz -> rapidfuzz-cpp-1.10.4.gh.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=352420b559a7657b95a6be8ca3b2330a
diff --git a/metadata/md5-cache/dev-cpp/rapidfuzz-cpp-1.11.2 b/metadata/md5-cache/dev-cpp/rapidfuzz-cpp-1.11.2
deleted file mode 100644
index 36bf1ea91705..000000000000
--- a/metadata/md5-cache/dev-cpp/rapidfuzz-cpp-1.11.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=test? ( >=dev-cpp/catch-3 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Rapid fuzzy string matching in C++
-EAPI=8
-HOMEPAGE=https://github.com/maxbachmann/rapidfuzz-cpp/
-INHERIT=cmake
-IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=MIT
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/maxbachmann/rapidfuzz-cpp/archive/v1.11.2.tar.gz -> rapidfuzz-cpp-1.11.2.gh.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=a75b935b23ca2f195f661becba924324
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 980f64a6db48..8cf1a8b0586d 100644
--- a/metadata/md5-cache/dev-python/Manifest.gz
+++ b/metadata/md5-cache/dev-python/Manifest.gz
diff --git a/metadata/md5-cache/dev-python/bitarray-2.7.4 b/metadata/md5-cache/dev-python/bitarray-2.7.4
new file mode 100644
index 000000000000..025c89d6ffc0
--- /dev/null
+++ b/metadata/md5-cache/dev-python/bitarray-2.7.4
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta1:3.12 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.7.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/wheel-0.40.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta1:3.12 )
+DESCRIPTION=Efficient arrays of booleans -- C extension
+EAPI=8
+HOMEPAGE=https://github.com/ilanschnell/bitarray/ https://pypi.org/project/bitarray/
+INHERIT=distutils-r1 pypi
+IUSE=python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 debug
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=PSF-2
+RDEPEND=python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta1:3.12 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/b/bitarray/bitarray-2.7.4.tar.gz
+_eclasses_=distutils-r1	57f007adcdf3953627f14277c7eae6e0	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=e30463673007a78151b94570673b38e7
diff --git a/metadata/md5-cache/dev-python/coverage-7.2.7 b/metadata/md5-cache/dev-python/coverage-7.2.7
new file mode 100644
index 000000000000..703d9c790748
--- /dev/null
+++ b/metadata/md5-cache/dev-python/coverage-7.2.7
@@ -0,0 +1,17 @@
+BDEPEND=test? ( dev-python/flaky[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/hypothesis[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/unittest-mixins-1.4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( python_targets_pypy3? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) >=dev-python/pytest-7.3.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0=[threads(+),sqlite(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10[threads(+),sqlite(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11[threads(+),sqlite(+)] ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta1:3.12[threads(+),sqlite(+)] ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.7.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/wheel-0.40.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0=[threads(+),sqlite(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10[threads(+),sqlite(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11[threads(+),sqlite(+)] ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta1:3.12[threads(+),sqlite(+)] )
+DESCRIPTION=Code coverage measurement for Python
+EAPI=8
+HOMEPAGE=https://coverage.readthedocs.io/en/latest/ https://github.com/nedbat/coveragepy/ https://pypi.org/project/coverage/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 debug
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=BSD
+RDEPEND=python_targets_pypy3? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0=[threads(+),sqlite(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10[threads(+),sqlite(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11[threads(+),sqlite(+)] ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta1:3.12[threads(+),sqlite(+)] )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/c/coverage/coverage-7.2.7.tar.gz
+_eclasses_=distutils-r1	57f007adcdf3953627f14277c7eae6e0	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=d98021eac54cb1176772ccf97fd8c92d
diff --git a/metadata/md5-cache/dev-python/flask-2.2.5 b/metadata/md5-cache/dev-python/flask-2.2.5
index 90e63132aff7..45ee84e10d5b 100644
--- a/metadata/md5-cache/dev-python/flask-2.2.5
+++ b/metadata/md5-cache/dev-python/flask-2.2.5
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://palletsprojects.com/p/flask/ https://github.com/pallets/flask/ https://pypi.org/project/Flask/
 INHERIT=distutils-r1 pypi
 IUSE=examples doc test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=BSD
 RDEPEND=>=dev-python/click-8.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/blinker[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/itsdangerous-2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jinja-3.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/werkzeug-2.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/importlib-metadata-3.6.0[python_targets_pypy3(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/F/Flask/Flask-2.2.5.tar.gz
 _eclasses_=distutils-r1	57f007adcdf3953627f14277c7eae6e0	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=187dbe5e17df09f8ea890fc297e13d1d
+_md5_=b3dbf854e7d91f07871a6c797a96b7fc
diff --git a/metadata/md5-cache/dev-python/flask-login-0.6.2-r1 b/metadata/md5-cache/dev-python/flask-login-0.6.2-r1
index 38ba7433cb13..240879827ca7 100644
--- a/metadata/md5-cache/dev-python/flask-login-0.6.2-r1
+++ b/metadata/md5-cache/dev-python/flask-login-0.6.2-r1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/maxcountryman/flask-login/ https://pypi.org/project/Flask-Login/
 INHERIT=distutils-r1
 IUSE=doc test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=BSD
 RDEPEND=>=dev-python/flask-1.0.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/werkzeug-2.3.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/maxcountryman/flask-login/archive/0.6.2.tar.gz -> flask-login-0.6.2.gh.tar.gz https://github.com/maxcountryman/flask-login/pull/743.patch -> flask-login-0.6.2-werkzeug-2.3.patch
 _eclasses_=distutils-r1	57f007adcdf3953627f14277c7eae6e0	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=27e700f730aee0a3b48b512404b74eb2
+_md5_=fa099abbe4d27282b16df5d537481823
diff --git a/metadata/md5-cache/dev-python/icalendar-5.0.7 b/metadata/md5-cache/dev-python/icalendar-5.0.7
new file mode 100644
index 000000000000..312564f5305d
--- /dev/null
+++ b/metadata/md5-cache/dev-python/icalendar-5.0.7
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/hypothesis[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) doc? ( || ( ( >=dev-lang/python-3.12.0_beta1:3.12 >=dev-python/sphinx-5.3.0[python_targets_python3_12(-)] ) ( >=dev-lang/python-3.11.3:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.11:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] ) ) ) test? ( dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytz[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta1:3.12 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.7.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/wheel-0.40.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Package used for parsing and generating iCalendar files (RFC 2445)
+EAPI=8
+HOMEPAGE=https://github.com/collective/icalendar/ https://pypi.org/project/icalendar/
+INHERIT=distutils-r1 pypi
+IUSE=doc test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+LICENSE=BSD
+RDEPEND=dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytz[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta1:3.12 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/i/icalendar/icalendar-5.0.7.tar.gz
+_eclasses_=distutils-r1	57f007adcdf3953627f14277c7eae6e0	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=404e932e2f5c07427baa92043dfc75e5
diff --git a/metadata/md5-cache/dev-python/immutabledict-2.2.4 b/metadata/md5-cache/dev-python/immutabledict-2.2.4
index fa8925fe9a33..e970e3075aa4 100644
--- a/metadata/md5-cache/dev-python/immutabledict-2.2.4
+++ b/metadata/md5-cache/dev-python/immutabledict-2.2.4
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/corenting/immutabledict/ https://pypi.org/project/immutabledict/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~amd64 ~ppc64
+KEYWORDS=amd64 ~ppc64
 LICENSE=MIT
 RDEPEND=python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta1:3.12 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/i/immutabledict/immutabledict-2.2.4.tar.gz
 _eclasses_=distutils-r1	57f007adcdf3953627f14277c7eae6e0	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=4a2e94c591c30e8ff19f9f5753921cbd
+_md5_=0e9d2d9fbacac219943dca81f13eeda8
diff --git a/metadata/md5-cache/dev-python/jaraco-env-1.0.0 b/metadata/md5-cache/dev-python/jaraco-env-1.0.0
new file mode 100644
index 000000000000..abc38c8a1f3b
--- /dev/null
+++ b/metadata/md5-cache/dev-python/jaraco-env-1.0.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/setuptools-scm[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( >=dev-python/pytest-7.3.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta1:3.12 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.7.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/wheel-0.40.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Facilities for environment variables
+EAPI=8
+HOMEPAGE=https://github.com/jaraco/jaraco.env/ https://pypi.org/project/jaraco.env/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta1:3.12 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/j/jaraco.env/jaraco.env-1.0.0.tar.gz
+_eclasses_=distutils-r1	57f007adcdf3953627f14277c7eae6e0	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=3bd71a20dc2bcc3e940827a32fc4d1e7
diff --git a/metadata/md5-cache/dev-python/jaraco-functools-3.7.0 b/metadata/md5-cache/dev-python/jaraco-functools-3.7.0
new file mode 100644
index 000000000000..1768846c2a82
--- /dev/null
+++ b/metadata/md5-cache/dev-python/jaraco-functools-3.7.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/jaraco-classes[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( >=dev-python/more-itertools-0.12.0-r1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.3.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta1:3.12 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/flit-core-3.8.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Additional functions used by other projects by developer jaraco
+EAPI=7
+HOMEPAGE=https://github.com/jaraco/jaraco.functools/ https://pypi.org/project/jaraco.functools/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+LICENSE=MIT
+RDEPEND=>=dev-python/more-itertools-0.12.0-r1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta1:3.12 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/j/jaraco.functools/jaraco.functools-3.7.0.tar.gz
+_eclasses_=distutils-r1	57f007adcdf3953627f14277c7eae6e0	eapi8-dosym	741bfa77afb2a9321261501aca58c208	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=0b2c0689d48c0f8181608eea69238806
diff --git a/metadata/md5-cache/dev-python/mkdocs-material-9.1.15 b/metadata/md5-cache/dev-python/mkdocs-material-9.1.15
new file mode 100644
index 000000000000..52b82830608a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/mkdocs-material-9.1.15
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hatchling-1.17.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] doc? ( || ( ( >=dev-lang/python-3.11.3:3.11 dev-python/mkdocs[python_targets_python3_11(-)] dev-python/mkdocs-material-extensions[python_targets_python3_11(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_11(-)] dev-python/mkdocs-redirects[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.11:3.10 dev-python/mkdocs[python_targets_python3_10(-)] dev-python/mkdocs-material-extensions[python_targets_python3_10(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_10(-)] dev-python/mkdocs-redirects[python_targets_python3_10(-)] ) ) )
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A Material Design theme for MkDocs
+EAPI=8
+HOMEPAGE=https://github.com/squidfunk/mkdocs-material/ https://pypi.org/project/mkdocs-material/
+INHERIT=distutils-r1 docs
+IUSE=social python_targets_python3_10 python_targets_python3_11 doc
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+LICENSE=MIT
+PDEPEND=>=dev-python/mkdocs-material-extensions-1.1.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+RDEPEND=>=dev-python/colorama-0.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jinja-3.0.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/markdown-3.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/mkdocs-1.4.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pygments-2.14[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pymdown-extensions-9.9.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/regex-2022.4.24[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.26[python_targets_python3_10(-)?,python_targets_python3_11(-)?] social? ( >=dev-python/pillow-9.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=media-gfx/cairosvg-2.5[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+SLOT=0
+SRC_URI=https://github.com/squidfunk/mkdocs-material/archive/9.1.15.tar.gz -> mkdocs-material-9.1.15.gh.tar.gz
+_eclasses_=distutils-r1	57f007adcdf3953627f14277c7eae6e0	docs	7b9e167549c44efa7994614f33ba6d7a	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=9ffb20d47e2625505ccc9524af451c06
diff --git a/metadata/md5-cache/dev-python/pip-run-11.0.0 b/metadata/md5-cache/dev-python/pip-run-11.0.0
new file mode 100644
index 000000000000..18f0fb35ccaf
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pip-run-11.0.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/jaraco-path[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jaraco-test-5.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pygments[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-python/nbformat[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/nbformat[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( dev-python/autocommand[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/jaraco-context[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/jaraco-env[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jaraco-functools-3.7[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/jaraco-text[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/more-itertools-8.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/path[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/platformdirs[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.3.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta1:3.12 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.7.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/wheel-0.40.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Install packages and run Python with them
+EAPI=8
+HOMEPAGE=https://github.com/jaraco/pip-run/ https://pypi.org/project/pip-run/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=dev-python/autocommand[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/jaraco-context[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/jaraco-env[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jaraco-functools-3.7[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/jaraco-text[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/more-itertools-8.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/path[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/platformdirs[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta1:3.12 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/p/pip-run/pip-run-11.0.0.tar.gz
+_eclasses_=distutils-r1	57f007adcdf3953627f14277c7eae6e0	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=0df4abf224a23c79c1af84a7814ea70c
diff --git a/metadata/md5-cache/dev-python/poetry-core-1.6.1 b/metadata/md5-cache/dev-python/poetry-core-1.6.1
new file mode 100644
index 000000000000..57dc383be0f7
--- /dev/null
+++ b/metadata/md5-cache/dev-python/poetry-core-1.6.1
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/jsonschema[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/lark[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) test? ( python_targets_pypy3? ( dev-python/build[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-mock[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/tomli-w[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/virtualenv[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-vcs/git ) python_targets_python3_10? ( dev-python/build[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-mock[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/tomli-w[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/virtualenv[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-vcs/git ) python_targets_python3_11? ( dev-python/build[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-mock[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/tomli-w[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/virtualenv[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-vcs/git ) python_targets_python3_12? ( dev-python/build[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-mock[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/tomli-w[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/virtualenv[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-vcs/git ) ) test? ( dev-python/jsonschema[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/lark[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) >=dev-python/pytest-7.3.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta1:3.12 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Poetry PEP 517 Build Backend
+EAPI=8
+HOMEPAGE=https://github.com/python-poetry/poetry-core/ https://pypi.org/project/poetry-core/
+INHERIT=distutils-r1
+IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=dev-python/jsonschema[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/lark[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta1:3.12 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/python-poetry/poetry-core/archive/1.6.1.tar.gz -> poetry-core-1.6.1.gh.tar.gz
+_eclasses_=distutils-r1	57f007adcdf3953627f14277c7eae6e0	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=207c61a4d0a1fee2d0328d412eac1e5e
diff --git a/metadata/md5-cache/dev-python/setuptools-rust-1.5.2 b/metadata/md5-cache/dev-python/setuptools-rust-1.5.2
deleted file mode 100644
index 4cc1c11772d2..000000000000
--- a/metadata/md5-cache/dev-python/setuptools-rust-1.5.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-python/setuptools-62.4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( virtual/rust <dev-python/semantic-version-3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/semantic-version-2.8.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/typing-extensions-3.7.4.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/beautifulsoup4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( dev-python/cffi[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/cffi[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) dev-python/lxml[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.7.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.40.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test unpack
-DESCRIPTION=A plugin for setuptools to build Rust Python extensions
-EAPI=8
-HOMEPAGE=https://github.com/PyO3/setuptools-rust/ https://pypi.org/project/setuptools-rust/
-INHERIT=distutils-r1 cargo
-IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 debug
-KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=MIT
-RDEPEND=virtual/rust <dev-python/semantic-version-3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/semantic-version-2.8.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/typing-extensions-3.7.4.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/PyO3/setuptools-rust/archive/v1.5.2.tar.gz -> setuptools-rust-1.5.2.gh.tar.gz test? ( https://crates.io/api/v1/crates/autocfg/1.1.0/download -> autocfg-1.1.0.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/byteorder/1.4.3/download -> byteorder-1.4.3.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/convert_case/0.4.0/download -> convert_case-0.4.0.crate https://crates.io/api/v1/crates/cssparser/0.27.2/download -> cssparser-0.27.2.crate https://crates.io/api/v1/crates/cssparser-macros/0.6.0/download -> cssparser-macros-0.6.0.crate https://crates.io/api/v1/crates/derive_more/0.99.17/download -> derive_more-0.99.17.crate https://crates.io/api/v1/crates/dtoa/0.4.8/download -> dtoa-0.4.8.crate https://crates.io/api/v1/crates/dtoa-short/0.3.3/download -> dtoa-short-0.3.3.crate https://crates.io/api/v1/crates/futf/0.1.5/download -> futf-0.1.5.crate https://crates.io/api/v1/crates/fxhash/0.2.1/download -> fxhash-0.2.1.crate https://crates.io/api/v1/crates/getrandom/0.1.16/download -> getrandom-0.1.16.crate https://crates.io/api/v1/crates/html5ever/0.25.1/download -> html5ever-0.25.1.crate https://crates.io/api/v1/crates/indoc/1.0.4/download -> indoc-1.0.4.crate https://crates.io/api/v1/crates/instant/0.1.12/download -> instant-0.1.12.crate https://crates.io/api/v1/crates/itoa/0.4.8/download -> itoa-0.4.8.crate https://crates.io/api/v1/crates/kuchiki/0.8.1/download -> kuchiki-0.8.1.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.121/download -> libc-0.2.121.crate https://crates.io/api/v1/crates/lock_api/0.4.6/download -> lock_api-0.4.6.crate https://crates.io/api/v1/crates/log/0.4.14/download -> log-0.4.14.crate https://crates.io/api/v1/crates/mac/0.1.1/download -> mac-0.1.1.crate https://crates.io/api/v1/crates/markup5ever/0.10.1/download -> markup5ever-0.10.1.crate https://crates.io/api/v1/crates/matches/0.1.9/download -> matches-0.1.9.crate https://crates.io/api/v1/crates/memoffset/0.6.5/download -> memoffset-0.6.5.crate https://crates.io/api/v1/crates/new_debug_unreachable/1.0.4/download -> new_debug_unreachable-1.0.4.crate https://crates.io/api/v1/crates/nodrop/0.1.14/download -> nodrop-0.1.14.crate https://crates.io/api/v1/crates/once_cell/1.10.0/download -> once_cell-1.10.0.crate https://crates.io/api/v1/crates/parking_lot/0.11.2/download -> parking_lot-0.11.2.crate https://crates.io/api/v1/crates/parking_lot_core/0.8.5/download -> parking_lot_core-0.8.5.crate https://crates.io/api/v1/crates/phf/0.8.0/download -> phf-0.8.0.crate https://crates.io/api/v1/crates/phf_codegen/0.8.0/download -> phf_codegen-0.8.0.crate https://crates.io/api/v1/crates/phf_generator/0.8.0/download -> phf_generator-0.8.0.crate https://crates.io/api/v1/crates/phf_macros/0.8.0/download -> phf_macros-0.8.0.crate https://crates.io/api/v1/crates/phf_shared/0.10.0/download -> phf_shared-0.10.0.crate https://crates.io/api/v1/crates/phf_shared/0.8.0/download -> phf_shared-0.8.0.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.16/download -> ppv-lite86-0.2.16.crate https://crates.io/api/v1/crates/precomputed-hash/0.1.1/download -> precomputed-hash-0.1.1.crate https://crates.io/api/v1/crates/proc-macro2/1.0.36/download -> proc-macro2-1.0.36.crate https://crates.io/api/v1/crates/proc-macro-hack/0.5.19/download -> proc-macro-hack-0.5.19.crate https://crates.io/api/v1/crates/pyo3/0.17.1/download -> pyo3-0.17.1.crate https://crates.io/api/v1/crates/pyo3-build-config/0.17.1/download -> pyo3-build-config-0.17.1.crate https://crates.io/api/v1/crates/pyo3-ffi/0.17.1/download -> pyo3-ffi-0.17.1.crate https://crates.io/api/v1/crates/pyo3-macros/0.17.1/download -> pyo3-macros-0.17.1.crate https://crates.io/api/v1/crates/pyo3-macros-backend/0.17.1/download -> pyo3-macros-backend-0.17.1.crate https://crates.io/api/v1/crates/quote/1.0.16/download -> quote-1.0.16.crate https://crates.io/api/v1/crates/rand/0.7.3/download -> rand-0.7.3.crate https://crates.io/api/v1/crates/rand_chacha/0.2.2/download -> rand_chacha-0.2.2.crate https://crates.io/api/v1/crates/rand_core/0.5.1/download -> rand_core-0.5.1.crate https://crates.io/api/v1/crates/rand_hc/0.2.0/download -> rand_hc-0.2.0.crate https://crates.io/api/v1/crates/rand_pcg/0.2.1/download -> rand_pcg-0.2.1.crate https://crates.io/api/v1/crates/redox_syscall/0.2.11/download -> redox_syscall-0.2.11.crate https://crates.io/api/v1/crates/rustc_version/0.4.0/download -> rustc_version-0.4.0.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/selectors/0.22.0/download -> selectors-0.22.0.crate https://crates.io/api/v1/crates/semver/1.0.6/download -> semver-1.0.6.crate https://crates.io/api/v1/crates/serde/1.0.136/download -> serde-1.0.136.crate https://crates.io/api/v1/crates/servo_arc/0.1.1/download -> servo_arc-0.1.1.crate https://crates.io/api/v1/crates/siphasher/0.3.10/download -> siphasher-0.3.10.crate https://crates.io/api/v1/crates/smallvec/1.8.0/download -> smallvec-1.8.0.crate https://crates.io/api/v1/crates/stable_deref_trait/1.2.0/download -> stable_deref_trait-1.2.0.crate https://crates.io/api/v1/crates/string_cache/0.8.3/download -> string_cache-0.8.3.crate https://crates.io/api/v1/crates/string_cache_codegen/0.5.1/download -> string_cache_codegen-0.5.1.crate https://crates.io/api/v1/crates/syn/1.0.89/download -> syn-1.0.89.crate https://crates.io/api/v1/crates/target-lexicon/0.12.3/download -> target-lexicon-0.12.3.crate https://crates.io/api/v1/crates/tendril/0.4.3/download -> tendril-0.4.3.crate https://crates.io/api/v1/crates/thin-slice/0.1.1/download -> thin-slice-0.1.1.crate https://crates.io/api/v1/crates/unicode-xid/0.2.2/download -> unicode-xid-0.2.2.crate https://crates.io/api/v1/crates/unindent/0.1.8/download -> unindent-0.1.8.crate https://crates.io/api/v1/crates/utf-8/0.7.6/download -> utf-8-0.7.6.crate https://crates.io/api/v1/crates/wasi/0.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate )
-_eclasses_=cargo	2e0a4a329a7dc5dfe20dcb05e6c36935	distutils-r1	57f007adcdf3953627f14277c7eae6e0	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=040ddeab8cc87e560ebded8227a3cec1
diff --git a/metadata/md5-cache/dev-python/werkzeug-2.3.0 b/metadata/md5-cache/dev-python/werkzeug-2.3.0
deleted file mode 100644
index 91abf2b65c5e..000000000000
--- a/metadata/md5-cache/dev-python/werkzeug-2.3.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/ephemeral-port-reserve[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-timeout[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xprocess[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/watchdog-2.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test-rust? ( dev-python/cryptography[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) !hppa? ( !ia64? ( !loong? ( python_targets_python3_10? ( dev-python/greenlet[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/greenlet[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) ) ) ) test? ( >=dev-python/markupsafe-2.1.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.3.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.7.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.40.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Collection of various utilities for WSGI applications
-EAPI=8
-HOMEPAGE=https://palletsprojects.com/p/werkzeug/ https://pypi.org/project/Werkzeug/ https://github.com/pallets/werkzeug/
-INHERIT=distutils-r1
-IUSE=test-rust test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=BSD
-RDEPEND=>=dev-python/markupsafe-2.1.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/pallets/werkzeug/archive/2.3.0.tar.gz -> werkzeug-2.3.0.gh.tar.gz
-_eclasses_=distutils-r1	57f007adcdf3953627f14277c7eae6e0	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=cfa5aa737a4dc982691ae7c8c8d5ea33
diff --git a/metadata/md5-cache/dev-python/werkzeug-2.3.1 b/metadata/md5-cache/dev-python/werkzeug-2.3.1
deleted file mode 100644
index 454d133c435d..000000000000
--- a/metadata/md5-cache/dev-python/werkzeug-2.3.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/ephemeral-port-reserve[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-timeout[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xprocess[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/watchdog-2.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test-rust? ( dev-python/cryptography[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) !hppa? ( !ia64? ( !loong? ( python_targets_python3_10? ( dev-python/greenlet[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/greenlet[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) ) ) ) test? ( >=dev-python/markupsafe-2.1.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.3.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.7.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.40.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Collection of various utilities for WSGI applications
-EAPI=8
-HOMEPAGE=https://palletsprojects.com/p/werkzeug/ https://pypi.org/project/Werkzeug/ https://github.com/pallets/werkzeug/
-INHERIT=distutils-r1
-IUSE=test-rust test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=BSD
-RDEPEND=>=dev-python/markupsafe-2.1.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/pallets/werkzeug/archive/2.3.1.tar.gz -> werkzeug-2.3.1.gh.tar.gz
-_eclasses_=distutils-r1	57f007adcdf3953627f14277c7eae6e0	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=cfa5aa737a4dc982691ae7c8c8d5ea33
diff --git a/metadata/md5-cache/dev-python/werkzeug-2.3.2 b/metadata/md5-cache/dev-python/werkzeug-2.3.2
deleted file mode 100644
index fdeadaaae622..000000000000
--- a/metadata/md5-cache/dev-python/werkzeug-2.3.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/ephemeral-port-reserve[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-timeout[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xprocess[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/watchdog-2.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test-rust? ( dev-python/cryptography[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) !hppa? ( !ia64? ( !loong? ( python_targets_python3_10? ( dev-python/greenlet[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/greenlet[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) ) ) ) test? ( >=dev-python/markupsafe-2.1.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.3.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.7.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.40.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Collection of various utilities for WSGI applications
-EAPI=8
-HOMEPAGE=https://palletsprojects.com/p/werkzeug/ https://pypi.org/project/Werkzeug/ https://github.com/pallets/werkzeug/
-INHERIT=distutils-r1
-IUSE=test-rust test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=BSD
-RDEPEND=>=dev-python/markupsafe-2.1.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/pallets/werkzeug/archive/2.3.2.tar.gz -> werkzeug-2.3.2.gh.tar.gz
-_eclasses_=distutils-r1	57f007adcdf3953627f14277c7eae6e0	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=cfa5aa737a4dc982691ae7c8c8d5ea33
diff --git a/metadata/md5-cache/dev-python/werkzeug-2.3.3 b/metadata/md5-cache/dev-python/werkzeug-2.3.3
deleted file mode 100644
index 65c26d3be1fc..000000000000
--- a/metadata/md5-cache/dev-python/werkzeug-2.3.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/ephemeral-port-reserve[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-timeout[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xprocess[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/watchdog-2.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test-rust? ( dev-python/cryptography[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) !hppa? ( !ia64? ( !loong? ( python_targets_python3_10? ( dev-python/greenlet[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/greenlet[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) ) ) ) test? ( >=dev-python/markupsafe-2.1.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.3.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.7.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.40.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Collection of various utilities for WSGI applications
-EAPI=8
-HOMEPAGE=https://palletsprojects.com/p/werkzeug/ https://pypi.org/project/Werkzeug/ https://github.com/pallets/werkzeug/
-INHERIT=distutils-r1
-IUSE=test-rust test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=BSD
-RDEPEND=>=dev-python/markupsafe-2.1.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/pallets/werkzeug/archive/2.3.3.tar.gz -> werkzeug-2.3.3.gh.tar.gz
-_eclasses_=distutils-r1	57f007adcdf3953627f14277c7eae6e0	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=d46da30e433af710c9143c4947204687
diff --git a/metadata/md5-cache/dev-python/yarl-1.8.2 b/metadata/md5-cache/dev-python/yarl-1.8.2
deleted file mode 100644
index 9411ee67e668..000000000000
--- a/metadata/md5-cache/dev-python/yarl-1.8.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/cython[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( >=dev-python/multidict-4.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/idna-2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.3.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.3:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/alabaster[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.11:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/alabaster[python_targets_python3_10(-)] ) ( >=dev-python/pypy3-7.3.11_p1:0 >=dev-python/sphinx-5.3.0[python_targets_pypy3(-)] dev-python/alabaster[python_targets_pypy3(-)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.7.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.40.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Yet another URL library
-EAPI=8
-HOMEPAGE=https://github.com/aio-libs/yarl/ https://pypi.org/project/yarl/
-INHERIT=distutils-r1
-IUSE=test doc python_targets_pypy3 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/multidict-4.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/idna-2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/aio-libs/yarl/archive/v1.8.2.tar.gz -> yarl-1.8.2.gh.tar.gz
-_eclasses_=distutils-r1	57f007adcdf3953627f14277c7eae6e0	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=979c6500996b69aeb0fb4b0e77cba393
diff --git a/metadata/md5-cache/dev-python/yarl-1.9.1 b/metadata/md5-cache/dev-python/yarl-1.9.1
deleted file mode 100644
index cab0d7075090..000000000000
--- a/metadata/md5-cache/dev-python/yarl-1.9.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-python/cython test? ( >=dev-python/multidict-4.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/idna-2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.3.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.3:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/alabaster[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.11:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/alabaster[python_targets_python3_10(-)] ) ( >=dev-python/pypy3-7.3.11_p1:0 >=dev-python/sphinx-5.3.0[python_targets_pypy3(-)] dev-python/alabaster[python_targets_pypy3(-)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.7.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.40.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 )
-DESCRIPTION=Yet another URL library
-EAPI=8
-HOMEPAGE=https://github.com/aio-libs/yarl/ https://pypi.org/project/yarl/
-INHERIT=distutils-r1 pypi
-IUSE=test doc python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 debug
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/multidict-4.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/idna-2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/y/yarl/yarl-1.9.1.tar.gz
-_eclasses_=distutils-r1	57f007adcdf3953627f14277c7eae6e0	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=550de7ec1685660eb6e8688dd06056ee
diff --git a/metadata/md5-cache/games-util/Manifest.gz b/metadata/md5-cache/games-util/Manifest.gz
index 69fefce5c1a5..3628d66355eb 100644
--- a/metadata/md5-cache/games-util/Manifest.gz
+++ b/metadata/md5-cache/games-util/Manifest.gz
diff --git a/metadata/md5-cache/games-util/xpadneo-0.9.5-r1 b/metadata/md5-cache/games-util/xpadneo-0.9.5-r1
index 1851fc450566..3c901470147f 100644
--- a/metadata/md5-cache/games-util/xpadneo-0.9.5-r1
+++ b/metadata/md5-cache/games-util/xpadneo-0.9.5-r1
@@ -12,5 +12,5 @@ LICENSE=GPL-3
 RDEPEND=sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= )
 SLOT=0
 SRC_URI=https://github.com/atar-axis/xpadneo/archive/v0.9.5.tar.gz -> xpadneo-0.9.5.tar.gz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	linux-mod-r1	a4ec8e7a025dc8f628435bdd3da9714d	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	udev	eec0bbab06977f1cfc5597269c1fa152
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	linux-mod-r1	9687a35031c8f66a0cb2b0c3ccf5a0ae	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	udev	eec0bbab06977f1cfc5597269c1fa152
 _md5_=88c9c786edec3da5a64c72798cc31f4a
diff --git a/metadata/md5-cache/games-util/xpadneo-9999 b/metadata/md5-cache/games-util/xpadneo-9999
index 2e87658991c1..74d4659a6888 100644
--- a/metadata/md5-cache/games-util/xpadneo-9999
+++ b/metadata/md5-cache/games-util/xpadneo-9999
@@ -11,5 +11,5 @@ LICENSE=GPL-3
 PROPERTIES=live
 RDEPEND=sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= )
 SLOT=0
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	git-r3	27e13c09a4c7e4c78ac812f74727e676	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	linux-mod-r1	a4ec8e7a025dc8f628435bdd3da9714d	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	udev	eec0bbab06977f1cfc5597269c1fa152
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	git-r3	27e13c09a4c7e4c78ac812f74727e676	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	linux-mod-r1	9687a35031c8f66a0cb2b0c3ccf5a0ae	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	udev	eec0bbab06977f1cfc5597269c1fa152
 _md5_=88c9c786edec3da5a64c72798cc31f4a
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index 870e41a535f6..17deb1cc0e7f 100644
--- a/metadata/md5-cache/media-gfx/Manifest.gz
+++ b/metadata/md5-cache/media-gfx/Manifest.gz
diff --git a/metadata/md5-cache/media-gfx/xdot-1.2 b/metadata/md5-cache/media-gfx/xdot-1.2
deleted file mode 100644
index 17a69fd16533..000000000000
--- a/metadata/md5-cache/media-gfx/xdot-1.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) >=dev-python/setuptools-65.7.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/numpy[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pycairo[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pygobject:3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] media-gfx/graphviz
-DESCRIPTION=Interactive viewer for Graphviz dot files
-EAPI=7
-HOMEPAGE=https://github.com/jrfonseca/xdot.py
-INHERIT=distutils-r1
-IUSE=python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86
-LICENSE=LGPL-2+
-RDEPEND=dev-python/numpy[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pycairo[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pygobject:3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] media-gfx/graphviz python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-SLOT=0
-SRC_URI=https://github.com/jrfonseca/xdot.py/archive/1.2.tar.gz -> xdot-1.2.tar.gz
-_eclasses_=distutils-r1	57f007adcdf3953627f14277c7eae6e0	eapi8-dosym	741bfa77afb2a9321261501aca58c208	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=1de346838b71a0b0ff9b945c01265b48
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 78a143e10de4..70815332b9de 100644
--- a/metadata/md5-cache/media-libs/Manifest.gz
+++ b/metadata/md5-cache/media-libs/Manifest.gz
diff --git a/metadata/md5-cache/media-libs/libmtp-1.1.20 b/metadata/md5-cache/media-libs/libmtp-1.1.20
deleted file mode 100644
index 5ec652e86969..000000000000
--- a/metadata/md5-cache/media-libs/libmtp-1.1.20
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gettext virtual/pkgconfig doc? ( app-doc/doxygen ) virtual/pkgconfig >=app-portage/elt-patches-20170815
-DEFINED_PHASES=configure install postinst postrm prepare
-DEPEND=acct-group/plugdev virtual/libiconv virtual/libusb:1 crypt? ( dev-libs/libgcrypt:0= )
-DESCRIPTION=Implementation of Microsoft's Media Transfer Protocol (MTP)
-EAPI=8
-HOMEPAGE=http://libmtp.sourceforge.net/
-INHERIT=udev libtool
-IUSE=+crypt doc examples static-libs
-KEYWORDS=amd64 ~arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv x86
-LICENSE=LGPL-2.1
-RDEPEND=acct-group/plugdev virtual/libiconv virtual/libusb:1 crypt? ( dev-libs/libgcrypt:0= )
-SLOT=0/9
-SRC_URI=mirror://sourceforge/libmtp/libmtp-1.1.20.tar.gz
-_eclasses_=libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=b2d188b62f443d33821821e770c11ea0
diff --git a/metadata/md5-cache/media-libs/portmidi-0.234 b/metadata/md5-cache/media-libs/portmidi-0.234
deleted file mode 100644
index 8209d2db6f83..000000000000
--- a/metadata/md5-cache/media-libs/portmidi-0.234
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-arch/unzip doc? ( app-doc/doxygen dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexextra virtual/latex-base ) sys-devel/make >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=media-libs/alsa-lib java? ( >=virtual/jdk-1.8:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=Library for real time MIDI input and output
-EAPI=8
-HOMEPAGE=http://portmedia.sourceforge.net/
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=cmake desktop xdg java-pkg-opt-2
-IUSE=debug doc java static-libs test-programs java
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86
-LICENSE=MIT
-RDEPEND=media-libs/alsa-lib java? ( >=virtual/jre-1.8:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
-SLOT=0
-SRC_URI=mirror://sourceforge/project/portmedia/portmedia-code-r234.zip
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=10d9f26615de09d1626b60f1ebb4f5b9
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index dc44534822c9..32368d5af207 100644
--- a/metadata/md5-cache/media-sound/Manifest.gz
+++ b/metadata/md5-cache/media-sound/Manifest.gz
diff --git a/metadata/md5-cache/media-sound/ardour-6.9-r2 b/metadata/md5-cache/media-sound/ardour-6.9-r2
deleted file mode 100644
index a824fddefc1e..000000000000
--- a/metadata/md5-cache/media-sound/ardour-6.9-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup
-DEPEND=dev-cpp/glibmm:2 dev-cpp/gtkmm:2.4 dev-libs/boost:= dev-libs/glib:2 dev-libs/libsigc++:2 dev-libs/libxml2:2 dev-libs/libxslt >=gnome-base/libgnomecanvas-2 media-libs/alsa-lib media-libs/aubio media-libs/flac:= media-libs/freetype:2 media-libs/libart_lgpl media-libs/liblo media-libs/liblrdf media-libs/libsamplerate media-libs/libsndfile media-libs/libsoundtouch media-libs/raptor:2 media-libs/rubberband media-libs/taglib media-libs/vamp-plugin-sdk net-misc/curl sys-libs/readline:0= sci-libs/fftw:3.0[threads] virtual/libusb:1 x11-libs/cairo x11-libs/gtk+:2 x11-libs/pango jack? ( virtual/jack ) pulseaudio? ( media-sound/pulseaudio ) media-libs/lilv media-libs/sratom dev-libs/sord media-libs/suil[X,gtk2] media-libs/lv2 || ( >=dev-lang/python-3.11.3:3.11[threads(+)] >=dev-lang/python-3.10.11:3.10[threads(+)] ) dev-util/itstool sys-devel/gettext virtual/pkgconfig doc? ( app-doc/doxygen[dot] ) jack? ( virtual/jack ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Digital Audio Workstation
-EAPI=7
-HOMEPAGE=https://ardour.org/
-INHERIT=toolchain-funcs flag-o-matic plocale python-any-r1 waf-utils desktop xdg
-IUSE=doc jack nls phonehome pulseaudio cpu_flags_ppc_altivec cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-cpp/glibmm:2 dev-cpp/gtkmm:2.4 dev-libs/boost:= dev-libs/glib:2 dev-libs/libsigc++:2 dev-libs/libxml2:2 dev-libs/libxslt >=gnome-base/libgnomecanvas-2 media-libs/alsa-lib media-libs/aubio media-libs/flac:= media-libs/freetype:2 media-libs/libart_lgpl media-libs/liblo media-libs/liblrdf media-libs/libsamplerate media-libs/libsndfile media-libs/libsoundtouch media-libs/raptor:2 media-libs/rubberband media-libs/taglib media-libs/vamp-plugin-sdk net-misc/curl sys-libs/readline:0= sci-libs/fftw:3.0[threads] virtual/libusb:1 x11-libs/cairo x11-libs/gtk+:2 x11-libs/pango jack? ( virtual/jack ) pulseaudio? ( media-sound/pulseaudio ) media-libs/lilv media-libs/sratom dev-libs/sord media-libs/suil[X,gtk2] media-libs/lv2
-SLOT=6
-SRC_URI=https://dev.gentoo.org/~fordfrog/distfiles/Ardour-6.9.0.tar.bz2
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	eapi8-dosym	741bfa77afb2a9321261501aca58c208	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	plocale	950fbaec7deeba41b5bcc0572cca99b9	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	waf-utils	be1df8dc616c09387b18633b4155fcb5	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=0aa393dcc5b2352d4b580a801ce31ed6
diff --git a/metadata/md5-cache/media-sound/ardour-7.3-r1 b/metadata/md5-cache/media-sound/ardour-7.3-r1
deleted file mode 100644
index ef50ae56625e..000000000000
--- a/metadata/md5-cache/media-sound/ardour-7.3-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup
-DEPEND=dev-cpp/glibmm:2 dev-cpp/gtkmm:2.4 dev-libs/boost:= dev-libs/glib:2 dev-libs/libsigc++:2 dev-libs/libxml2:2 dev-libs/libxslt >=gnome-base/libgnomecanvas-2 media-libs/alsa-lib media-libs/aubio media-libs/flac:= media-libs/freetype:2 media-libs/libart_lgpl media-libs/liblo media-libs/liblrdf media-libs/libsamplerate media-libs/libsndfile media-libs/libsoundtouch media-libs/raptor:2 media-libs/rubberband media-libs/taglib media-libs/vamp-plugin-sdk net-misc/curl sys-libs/readline:0= sci-libs/fftw:3.0[threads] virtual/libusb:1 x11-libs/cairo x11-libs/gtk+:2 x11-libs/pango jack? ( virtual/jack ) pulseaudio? ( media-sound/pulseaudio ) media-libs/lilv media-libs/sratom dev-libs/sord media-libs/suil[X,gtk2] media-libs/lv2 || ( >=dev-lang/python-3.11.3:3.11[threads(+)] >=dev-lang/python-3.10.11:3.10[threads(+)] ) dev-util/itstool sys-devel/gettext virtual/pkgconfig doc? ( app-doc/doxygen[dot] ) jack? ( virtual/jack )
-DESCRIPTION=Digital Audio Workstation
-EAPI=8
-HOMEPAGE=https://ardour.org/
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=toolchain-funcs flag-o-matic plocale python-any-r1 waf-utils desktop xdg
-IUSE=doc jack nls phonehome pulseaudio cpu_flags_ppc_altivec cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-cpp/glibmm:2 dev-cpp/gtkmm:2.4 dev-libs/boost:= dev-libs/glib:2 dev-libs/libsigc++:2 dev-libs/libxml2:2 dev-libs/libxslt >=gnome-base/libgnomecanvas-2 media-libs/alsa-lib media-libs/aubio media-libs/flac:= media-libs/freetype:2 media-libs/libart_lgpl media-libs/liblo media-libs/liblrdf media-libs/libsamplerate media-libs/libsndfile media-libs/libsoundtouch media-libs/raptor:2 media-libs/rubberband media-libs/taglib media-libs/vamp-plugin-sdk net-misc/curl sys-libs/readline:0= sci-libs/fftw:3.0[threads] virtual/libusb:1 x11-libs/cairo x11-libs/gtk+:2 x11-libs/pango jack? ( virtual/jack ) pulseaudio? ( media-sound/pulseaudio ) media-libs/lilv media-libs/sratom dev-libs/sord media-libs/suil[X,gtk2] media-libs/lv2
-SLOT=7
-SRC_URI=https://dev.gentoo.org/~fordfrog/distfiles/Ardour-7.3.0.tar.bz2
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	plocale	950fbaec7deeba41b5bcc0572cca99b9	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	waf-utils	be1df8dc616c09387b18633b4155fcb5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=6b28ed1d0e1ebbc86bea47f08295355f
diff --git a/metadata/md5-cache/media-sound/flacon-10.0.0 b/metadata/md5-cache/media-sound/flacon-10.0.0
index 4746e377b8da..731e02136e6d 100644
--- a/metadata/md5-cache/media-sound/flacon-10.0.0
+++ b/metadata/md5-cache/media-sound/flacon-10.0.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://flacon.github.io/
 INHERIT=check-reqs cmake optfeature virtualx xdg-utils
 IUSE=test test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=app-i18n/uchardet dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 media-libs/taglib
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/flacon/flacon/archive/v10.0.0.tar.gz -> flacon-10.0.0.tar.gz
 _eclasses_=check-reqs	a5f1e025c53d62f98bc24bd63d7d95e1	cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=e6e27d770ecb00c95dbf4736753684db
+_md5_=c36485dc8c5ae1635aadb00c36463ced
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index e11a5a05c486..31286a847cf8 100644
--- a/metadata/md5-cache/net-im/Manifest.gz
+++ b/metadata/md5-cache/net-im/Manifest.gz
diff --git a/metadata/md5-cache/net-im/synapse-1.82.0-r1 b/metadata/md5-cache/net-im/synapse-1.82.0-r1
index c5f4b97c6d86..a928376a4ccf 100644
--- a/metadata/md5-cache/net-im/synapse-1.82.0-r1
+++ b/metadata/md5-cache/net-im/synapse-1.82.0-r1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://matrix.org/ https://github.com/matrix-org/synapse/
 INHERIT=cargo distutils-r1 multiprocessing optfeature systemd
 IUSE=postgres systemd test debug python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~ppc64
+KEYWORDS=amd64 ~ppc64
 LICENSE=Apache-2.0 Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD MIT Unicode-DFS-2016
 RDEPEND=acct-user/synapse acct-group/synapse dev-python/attrs[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/bcrypt[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/bleach[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/canonicaljson-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/cryptography[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ijson[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/immutabledict[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jinja-3.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jsonschema[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/matrix-common-1.3.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/msgpack[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/netaddr[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/phonenumbers[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pillow[python_targets_python3_10(-)?,python_targets_python3_11(-)?,webp] dev-python/prometheus-client[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyasn1-modules[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyasn1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pydantic[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pymacaroons[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyopenssl[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/service_identity[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/signedjson[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sortedcontainers[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/treq[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/twisted[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/typing-extensions[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/unpaddedbase64[python_targets_python3_10(-)?,python_targets_python3_11(-)?] postgres? ( dev-python/psycopg:2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) systemd? ( dev-python/python-systemd[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/matrix-org/synapse/archive/v1.82.0.tar.gz -> synapse-1.82.0.gh.tar.gz https://crates.io/api/v1/crates/aho-corasick/0.7.19/download -> aho-corasick-0.7.19.crate https://crates.io/api/v1/crates/anyhow/1.0.70/download -> anyhow-1.0.70.crate https://crates.io/api/v1/crates/arc-swap/1.5.1/download -> arc-swap-1.5.1.crate https://crates.io/api/v1/crates/autocfg/1.1.0/download -> autocfg-1.1.0.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/blake2/0.10.6/download -> blake2-0.10.6.crate https://crates.io/api/v1/crates/block-buffer/0.10.3/download -> block-buffer-0.10.3.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/crypto-common/0.1.6/download -> crypto-common-0.1.6.crate https://crates.io/api/v1/crates/digest/0.10.5/download -> digest-0.10.5.crate https://crates.io/api/v1/crates/generic-array/0.14.6/download -> generic-array-0.14.6.crate https://crates.io/api/v1/crates/hex/0.4.3/download -> hex-0.4.3.crate https://crates.io/api/v1/crates/indoc/1.0.7/download -> indoc-1.0.7.crate https://crates.io/api/v1/crates/itoa/1.0.4/download -> itoa-1.0.4.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.135/download -> libc-0.2.135.crate https://crates.io/api/v1/crates/lock_api/0.4.9/download -> lock_api-0.4.9.crate https://crates.io/api/v1/crates/log/0.4.17/download -> log-0.4.17.crate https://crates.io/api/v1/crates/memchr/2.5.0/download -> memchr-2.5.0.crate https://crates.io/api/v1/crates/memoffset/0.6.5/download -> memoffset-0.6.5.crate https://crates.io/api/v1/crates/once_cell/1.15.0/download -> once_cell-1.15.0.crate https://crates.io/api/v1/crates/parking_lot/0.12.1/download -> parking_lot-0.12.1.crate https://crates.io/api/v1/crates/parking_lot_core/0.9.3/download -> parking_lot_core-0.9.3.crate https://crates.io/api/v1/crates/proc-macro2/1.0.52/download -> proc-macro2-1.0.52.crate https://crates.io/api/v1/crates/pyo3/0.17.3/download -> pyo3-0.17.3.crate https://crates.io/api/v1/crates/pyo3-build-config/0.17.3/download -> pyo3-build-config-0.17.3.crate https://crates.io/api/v1/crates/pyo3-ffi/0.17.3/download -> pyo3-ffi-0.17.3.crate https://crates.io/api/v1/crates/pyo3-log/0.8.1/download -> pyo3-log-0.8.1.crate https://crates.io/api/v1/crates/pyo3-macros/0.17.3/download -> pyo3-macros-0.17.3.crate https://crates.io/api/v1/crates/pyo3-macros-backend/0.17.3/download -> pyo3-macros-backend-0.17.3.crate https://crates.io/api/v1/crates/pythonize/0.17.0/download -> pythonize-0.17.0.crate https://crates.io/api/v1/crates/quote/1.0.26/download -> quote-1.0.26.crate https://crates.io/api/v1/crates/redox_syscall/0.2.16/download -> redox_syscall-0.2.16.crate https://crates.io/api/v1/crates/regex/1.7.3/download -> regex-1.7.3.crate https://crates.io/api/v1/crates/regex-syntax/0.6.29/download -> regex-syntax-0.6.29.crate https://crates.io/api/v1/crates/ryu/1.0.11/download -> ryu-1.0.11.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/serde/1.0.160/download -> serde-1.0.160.crate https://crates.io/api/v1/crates/serde_derive/1.0.160/download -> serde_derive-1.0.160.crate https://crates.io/api/v1/crates/serde_json/1.0.96/download -> serde_json-1.0.96.crate https://crates.io/api/v1/crates/smallvec/1.10.0/download -> smallvec-1.10.0.crate https://crates.io/api/v1/crates/subtle/2.4.1/download -> subtle-2.4.1.crate https://crates.io/api/v1/crates/syn/1.0.104/download -> syn-1.0.104.crate https://crates.io/api/v1/crates/syn/2.0.10/download -> syn-2.0.10.crate https://crates.io/api/v1/crates/target-lexicon/0.12.4/download -> target-lexicon-0.12.4.crate https://crates.io/api/v1/crates/typenum/1.15.0/download -> typenum-1.15.0.crate https://crates.io/api/v1/crates/unicode-ident/1.0.5/download -> unicode-ident-1.0.5.crate https://crates.io/api/v1/crates/unindent/0.1.10/download -> unindent-0.1.10.crate https://crates.io/api/v1/crates/version_check/0.9.4/download -> version_check-0.9.4.crate https://crates.io/api/v1/crates/windows-sys/0.36.1/download -> windows-sys-0.36.1.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.36.1/download -> windows_aarch64_msvc-0.36.1.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.36.1/download -> windows_i686_gnu-0.36.1.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.36.1/download -> windows_i686_msvc-0.36.1.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.36.1/download -> windows_x86_64_gnu-0.36.1.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.36.1/download -> windows_x86_64_msvc-0.36.1.crate
 _eclasses_=cargo	2e0a4a329a7dc5dfe20dcb05e6c36935	distutils-r1	57f007adcdf3953627f14277c7eae6e0	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=bfaad896355dd1020af4d1206cf258c5
+_md5_=5a9e77d1762dd947b34479a5a2409c8d
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index c73fb9e08727..0114e98a8d7b 100644
--- a/metadata/md5-cache/net-misc/Manifest.gz
+++ b/metadata/md5-cache/net-misc/Manifest.gz
diff --git a/metadata/md5-cache/net-misc/tigervnc-1.13.1 b/metadata/md5-cache/net-misc/tigervnc-1.13.1
deleted file mode 100644
index b8607aeed87d..000000000000
--- a/metadata/md5-cache/net-misc/tigervnc-1.13.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=virtual/pkgconfig nls? ( sys-devel/gettext ) 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 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/gmp:= dev-libs/nettle:= media-libs/libjpeg-turbo:= sys-libs/zlib:= x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/pixman gnutls? ( net-libs/gnutls:= ) nls? ( virtual/libiconv ) server? ( dev-libs/libbsd dev-libs/openssl:0= sys-libs/pam x11-libs/libXau x11-libs/libXdamage x11-libs/libXdmcp x11-libs/libXfixes x11-libs/libXfont2 x11-libs/libXtst x11-libs/pixman x11-libs/xtrans x11-apps/xauth x11-apps/xinit x11-apps/xkbcomp x11-apps/xsetroot x11-misc/xkeyboard-config opengl? ( media-libs/libglvnd[X] ) !net-misc/turbovnc[server] ) viewer? ( media-video/ffmpeg:= x11-libs/fltk:1 x11-libs/libXi x11-libs/libXrender !net-misc/turbovnc[viewer] ) drm? ( x11-libs/libdrm ) server? ( media-fonts/font-util x11-base/xorg-proto x11-libs/libxcvt x11-libs/libXi x11-libs/libxkbfile x11-libs/libXrender x11-misc/util-macros opengl? ( media-libs/mesa ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=Remote desktop viewer display system
-EAPI=8
-HOMEPAGE=https://tigervnc.org
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=autotools cmake flag-o-matic java-pkg-opt-2 optfeature systemd xdg
-IUSE=dri3 +drm gnutls java nls +opengl +server +viewer xinerama java
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/gmp:= dev-libs/nettle:= media-libs/libjpeg-turbo:= sys-libs/zlib:= x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/pixman gnutls? ( net-libs/gnutls:= ) nls? ( virtual/libiconv ) server? ( dev-libs/libbsd dev-libs/openssl:0= sys-libs/pam x11-libs/libXau x11-libs/libXdamage x11-libs/libXdmcp x11-libs/libXfixes x11-libs/libXfont2 x11-libs/libXtst x11-libs/pixman x11-libs/xtrans x11-apps/xauth x11-apps/xinit x11-apps/xkbcomp x11-apps/xsetroot x11-misc/xkeyboard-config opengl? ( media-libs/libglvnd[X] ) !net-misc/turbovnc[server] ) viewer? ( media-video/ffmpeg:= x11-libs/fltk:1 x11-libs/libXi x11-libs/libXrender !net-misc/turbovnc[viewer] ) java? ( virtual/jre:1.8 ) server? ( dev-lang/perl sys-process/psmisc ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=dri3? ( drm ) java? ( viewer ) opengl? ( server ) || ( server viewer )
-SLOT=0
-SRC_URI=server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-21.1.1.tar.xz ) https://github.com/TigerVNC/tigervnc/archive/v1.13.1.tar.gz -> tigervnc-1.13.1.tar.gz
-_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=a1aa7929b0f5e9ec220cb2b004294099
diff --git a/metadata/md5-cache/net-p2p/Manifest.gz b/metadata/md5-cache/net-p2p/Manifest.gz
index f08540144297..c7a3a1a905fd 100644
--- a/metadata/md5-cache/net-p2p/Manifest.gz
+++ b/metadata/md5-cache/net-p2p/Manifest.gz
diff --git a/metadata/md5-cache/net-p2p/freenet-0.7.5_p1491 b/metadata/md5-cache/net-p2p/freenet-0.7.5_p1491
deleted file mode 100644
index 9014238bb0ae..000000000000
--- a/metadata/md5-cache/net-p2p/freenet-0.7.5_p1491
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=app-arch/unzip >=virtual/jdk-1.8 dev-java/bcprov:0 dev-java/commons-compress:0 dev-java/fec:0 dev-java/java-service-wrapper:0 dev-java/jbitcollider-core:0 dev-java/jna:4 dev-java/lzma:0 dev-java/lzmajio:0 dev-java/mersennetwister:0 nss? ( dev-libs/nss ) test? ( dev-java/junit:0 dev-java/ant-junit:0 ) dev-java/ant-core:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
-DESCRIPTION=An encrypted network without censorship
-EAPI=7
-HOMEPAGE=https://freenetproject.org/
-INHERIT=java-pkg-2 java-ant-2 systemd
-IUSE=+nss test doc source
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ GPL-2 MIT BSD-2 Apache-2.0
-PDEPEND=net-libs/NativeThread:0
-RDEPEND=>=virtual/jre-1.8 net-libs/nativebiginteger:0 dev-java/bcprov:0 dev-java/commons-compress:0 dev-java/fec:0 dev-java/java-service-wrapper:0 dev-java/jbitcollider-core:0 dev-java/jna:4 dev-java/lzma:0 dev-java/lzmajio:0 dev-java/mersennetwister:0 nss? ( dev-libs/nss ) acct-user/freenet acct-group/freenet >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/freenet/fred/archive/build01491.zip -> freenet-0.7.5_p1491.zip https://github.com/freenet/seedrefs/archive/build01480.zip -> seednodes-0.7.5_p1480.zip mirror://gentoo/freenet-ant-1.7.1.jar
-_eclasses_=java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=8bd94dd316d12a45eff3a4788956aef5
diff --git a/metadata/md5-cache/net-p2p/freenet-0.7.5_p1491-r1 b/metadata/md5-cache/net-p2p/freenet-0.7.5_p1491-r1
deleted file mode 100644
index e804e959bf82..000000000000
--- a/metadata/md5-cache/net-p2p/freenet-0.7.5_p1491-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=app-arch/unzip >=virtual/jdk-1.8 dev-java/bcprov:0 dev-java/commons-compress:0 dev-java/fec:0 dev-java/java-service-wrapper:0 dev-java/jbitcollider-core:0 dev-java/jna:4 dev-java/lzma:0 dev-java/lzmajio:0 dev-java/mersennetwister:0 nss? ( dev-libs/nss ) test? ( dev-java/junit:0 dev-java/ant-junit:0 ) dev-java/ant-core:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
-DESCRIPTION=An encrypted network without censorship
-EAPI=7
-HOMEPAGE=https://freenetproject.org/
-INHERIT=java-pkg-2 java-ant-2 systemd
-IUSE=+nss test doc source
-KEYWORDS=amd64 ~x86
-LICENSE=GPL-2+ GPL-2 MIT BSD-2 Apache-2.0
-PDEPEND=net-libs/NativeThread:0
-RDEPEND=>=virtual/jre-1.8 net-libs/nativebiginteger:0 dev-java/bcprov:0 dev-java/commons-compress:0 dev-java/fec:0 dev-java/java-service-wrapper:0 dev-java/jbitcollider-core:0 dev-java/jna:4 dev-java/lzma:0 dev-java/lzmajio:0 dev-java/mersennetwister:0 nss? ( dev-libs/nss ) acct-user/freenet acct-group/freenet >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/freenet/fred/archive/build01491.zip -> freenet-0.7.5_p1491.zip https://github.com/freenet/seedrefs/archive/build01480.zip -> seednodes-0.7.5_p1480.zip mirror://gentoo/freenet-ant-1.7.1.jar
-_eclasses_=java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=78c9b384e09ef3d4b970eaa902a85c41
diff --git a/metadata/md5-cache/net-p2p/freenet-0.7.5_p1492 b/metadata/md5-cache/net-p2p/freenet-0.7.5_p1492
deleted file mode 100644
index 432449589722..000000000000
--- a/metadata/md5-cache/net-p2p/freenet-0.7.5_p1492
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=app-arch/unzip >=virtual/jdk-1.8 dev-java/bcprov:0 dev-java/commons-compress:0 dev-java/fec:0 dev-java/java-service-wrapper:0 dev-java/jbitcollider-core:0 dev-java/jna:4 dev-java/lzma:0 dev-java/lzmajio:0 dev-java/mersennetwister:0 nss? ( dev-libs/nss ) test? ( dev-java/junit:0 dev-java/ant-junit:0 ) dev-java/ant-core:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
-DESCRIPTION=An encrypted network without censorship
-EAPI=7
-HOMEPAGE=https://freenetproject.org/
-INHERIT=java-pkg-2 java-ant-2 systemd
-IUSE=+nss test doc source
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2+ GPL-2 MIT BSD-2 Apache-2.0
-PDEPEND=net-libs/NativeThread:0
-RDEPEND=>=virtual/jre-1.8 net-libs/nativebiginteger:0 dev-java/bcprov:0 dev-java/commons-compress:0 dev-java/fec:0 dev-java/java-service-wrapper:0 dev-java/jbitcollider-core:0 dev-java/jna:4 dev-java/lzma:0 dev-java/lzmajio:0 dev-java/mersennetwister:0 nss? ( dev-libs/nss ) acct-user/freenet acct-group/freenet >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/freenet/fred/archive/build01492.zip -> freenet-0.7.5_p1492.zip https://github.com/freenet/seedrefs/archive/build01480.zip -> seednodes-0.7.5_p1480.zip mirror://gentoo/freenet-ant-1.7.1.jar
-_eclasses_=java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=788b7a0004f7232f6532923c5fbe78e5
diff --git a/metadata/md5-cache/net-p2p/freenet-0.7.5_p1493 b/metadata/md5-cache/net-p2p/freenet-0.7.5_p1493
deleted file mode 100644
index 8f4e147b192a..000000000000
--- a/metadata/md5-cache/net-p2p/freenet-0.7.5_p1493
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=app-arch/unzip >=virtual/jdk-1.8 dev-java/bcprov:0 dev-java/commons-compress:0 dev-java/fec:0 dev-java/java-service-wrapper:0 dev-java/jbitcollider-core:0 dev-java/jna:4 dev-java/lzma:0 dev-java/lzmajio:0 dev-java/mersennetwister:0 nss? ( dev-libs/nss ) test? ( dev-java/junit:0 dev-java/ant-junit:0 ) dev-java/ant-core:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
-DESCRIPTION=An encrypted network without censorship
-EAPI=7
-HOMEPAGE=https://freenetproject.org/
-INHERIT=java-pkg-2 java-ant-2 systemd
-IUSE=+nss test doc source
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2+ GPL-2 MIT BSD-2 Apache-2.0
-PDEPEND=net-libs/NativeThread:0
-RDEPEND=>=virtual/jre-1.8 net-libs/nativebiginteger:0 dev-java/bcprov:0 dev-java/commons-compress:0 dev-java/fec:0 dev-java/java-service-wrapper:0 dev-java/jbitcollider-core:0 dev-java/jna:4 dev-java/lzma:0 dev-java/lzmajio:0 dev-java/mersennetwister:0 nss? ( dev-libs/nss ) acct-user/freenet acct-group/freenet >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/freenet/fred/archive/build01493.zip -> freenet-0.7.5_p1493.zip https://github.com/freenet/seedrefs/archive/build01480.zip -> seednodes-0.7.5_p1480.zip mirror://gentoo/freenet-ant-1.7.1.jar
-_eclasses_=java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=6f1a55e6fc1a2c33d0ae79358d668ff4
diff --git a/metadata/md5-cache/net-p2p/freenet-0.7.5_p1493-r1 b/metadata/md5-cache/net-p2p/freenet-0.7.5_p1493-r1
deleted file mode 100644
index 7d19440570ba..000000000000
--- a/metadata/md5-cache/net-p2p/freenet-0.7.5_p1493-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=app-arch/unzip >=virtual/jdk-1.8 dev-java/bcprov:0 dev-java/commons-compress:0 dev-java/fec:0 dev-java/java-service-wrapper:0 dev-java/jbitcollider-core:0 dev-java/jna:4 dev-java/lzma:0 dev-java/lzmajio:0 dev-java/mersennetwister:0 nss? ( dev-libs/nss ) test? ( dev-java/junit:0 dev-java/ant-junit:0 ) dev-java/ant-core:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
-DESCRIPTION=An encrypted network without censorship
-EAPI=7
-HOMEPAGE=https://freenetproject.org/
-INHERIT=java-pkg-2 java-ant-2 systemd
-IUSE=+nss test doc source
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2+ GPL-2 MIT BSD-2 Apache-2.0
-PDEPEND=net-libs/NativeThread:0
-RDEPEND=>=virtual/jre-1.8 net-libs/nativebiginteger:0 dev-java/bcprov:0 dev-java/commons-compress:0 dev-java/fec:0 dev-java/java-service-wrapper:0 dev-java/jbitcollider-core:0 dev-java/jna:4 dev-java/lzma:0 dev-java/lzmajio:0 dev-java/mersennetwister:0 nss? ( dev-libs/nss ) acct-user/freenet acct-group/freenet >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/freenet/fred/archive/build01493.zip -> freenet-0.7.5_p1493.zip https://github.com/freenet/seedrefs/archive/build01480.zip -> seednodes-0.7.5_p1480.zip mirror://gentoo/freenet-ant-1.7.1.jar
-_eclasses_=java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=eb44b7118dce1904b49182bfaacfd006
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index 69d0f842f652..4eab865c9e7d 100644
--- a/metadata/md5-cache/sci-libs/Manifest.gz
+++ b/metadata/md5-cache/sci-libs/Manifest.gz
diff --git a/metadata/md5-cache/sci-libs/gdal-3.7.0 b/metadata/md5-cache/sci-libs/gdal-3.7.0
index 87b9bd035abc..d605876b07b1 100644
--- a/metadata/md5-cache/sci-libs/gdal-3.7.0
+++ b/metadata/md5-cache/sci-libs/gdal-3.7.0
@@ -1,6 +1,6 @@
-BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen ) java? ( dev-java/ant-core dev-lang/swig >=virtual/jdk-1.8:* ) python? ( dev-lang/swig python_single_target_python3_10? ( dev-python/setuptools[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/setuptools[python_targets_python3_11(-)] ) ) test? ( python_single_target_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) dev-cpp/gtest ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen ) java? ( dev-java/ant-core dev-lang/swig ) python? ( dev-lang/swig python_single_target_python3_10? ( dev-python/setuptools[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/setuptools[python_targets_python3_11(-)] ) ) test? ( python_single_target_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) dev-cpp/gtest ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst preinst prepare setup test
-DEPEND=dev-libs/expat dev-libs/json-c:= dev-libs/libpcre2 dev-libs/libxml2:2 dev-libs/openssl:= media-libs/tiff >=sci-libs/libgeotiff-1.5.1-r1:= >=sci-libs/proj-6.0.0:= sys-libs/zlib[minizip(+)] armadillo? ( sci-libs/armadillo:=[lapack] ) curl? ( net-misc/curl ) fits? ( sci-libs/cfitsio:= ) geos? ( >=sci-libs/geos-3.8.0 ) gif? ( media-libs/giflib:= ) gml? ( >=dev-libs/xerces-c-3.1 ) heif? ( media-libs/libheif:= ) hdf5? ( >=sci-libs/hdf5-1.6.4:=[cxx,szip] ) jpeg? ( media-libs/libjpeg-turbo:= ) jpeg2k? ( media-libs/openjpeg:2= ) lzma? ( || ( app-arch/xz-utils app-arch/lzma ) ) mysql? ( virtual/mysql ) netcdf? ( sci-libs/netcdf:= ) odbc? ( dev-db/unixODBC ) ogdi? ( >=sci-libs/ogdi-4.1.0-r1 ) opencl? ( virtual/opencl ) oracle? ( dev-db/oracle-instantclient:= ) pdf? ( app-text/poppler:= ) png? ( media-libs/libpng:= ) postgres? ( >=dev-db/postgresql-8.4:= ) python? ( python_single_target_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) python_single_target_python3_10? ( dev-python/numpy[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/numpy[python_targets_python3_11(-)] ) ) spatialite? ( dev-db/spatialite ) sqlite? ( dev-db/sqlite:3 ) webp? ( media-libs/libwebp:= ) xls? ( dev-libs/freexl ) zstd? ( app-arch/zstd:= ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DEPEND=dev-libs/expat dev-libs/json-c:= dev-libs/libpcre2 dev-libs/libxml2:2 dev-libs/openssl:= media-libs/tiff >=sci-libs/libgeotiff-1.5.1-r1:= >=sci-libs/proj-6.0.0:= sys-libs/zlib[minizip(+)] armadillo? ( sci-libs/armadillo:=[lapack] ) curl? ( net-misc/curl ) fits? ( sci-libs/cfitsio:= ) geos? ( >=sci-libs/geos-3.8.0 ) gif? ( media-libs/giflib:= ) gml? ( >=dev-libs/xerces-c-3.1 ) heif? ( media-libs/libheif:= ) hdf5? ( >=sci-libs/hdf5-1.6.4:=[cxx,szip] ) java? ( >=virtual/jdk-1.8:* ) jpeg? ( media-libs/libjpeg-turbo:= ) jpeg2k? ( media-libs/openjpeg:2= ) lzma? ( || ( app-arch/xz-utils app-arch/lzma ) ) mysql? ( virtual/mysql ) netcdf? ( sci-libs/netcdf:= ) odbc? ( dev-db/unixODBC ) ogdi? ( >=sci-libs/ogdi-4.1.0-r1 ) opencl? ( virtual/opencl ) oracle? ( dev-db/oracle-instantclient:= ) pdf? ( app-text/poppler:= ) png? ( media-libs/libpng:= ) postgres? ( >=dev-db/postgresql-8.4:= ) python? ( python_single_target_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) python_single_target_python3_10? ( dev-python/numpy[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/numpy[python_targets_python3_11(-)] ) ) spatialite? ( dev-db/spatialite ) sqlite? ( dev-db/sqlite:3 ) webp? ( media-libs/libwebp:= ) xls? ( dev-libs/freexl ) zstd? ( app-arch/zstd:= ) java? ( >=dev-java/java-config-2.2.0-r3 )
 DESCRIPTION=Translator library for raster geospatial data formats (includes OGR support)
 EAPI=8
 HOMEPAGE=https://gdal.org/
@@ -8,10 +8,10 @@ INHERIT=cmake java-pkg-opt-2 python-single-r1
 IUSE=armadillo +curl cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_ssse3 doc fits geos gif gml hdf5 heif java jpeg jpeg2k lzma mysql netcdf odbc ogdi opencl oracle pdf png postgres python spatialite sqlite test webp xls zstd java python_single_target_python3_10 python_single_target_python3_11
 KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=BSD Info-ZIP MIT
-RDEPEND=dev-libs/expat dev-libs/json-c:= dev-libs/libpcre2 dev-libs/libxml2:2 dev-libs/openssl:= media-libs/tiff >=sci-libs/libgeotiff-1.5.1-r1:= >=sci-libs/proj-6.0.0:= sys-libs/zlib[minizip(+)] armadillo? ( sci-libs/armadillo:=[lapack] ) curl? ( net-misc/curl ) fits? ( sci-libs/cfitsio:= ) geos? ( >=sci-libs/geos-3.8.0 ) gif? ( media-libs/giflib:= ) gml? ( >=dev-libs/xerces-c-3.1 ) heif? ( media-libs/libheif:= ) hdf5? ( >=sci-libs/hdf5-1.6.4:=[cxx,szip] ) jpeg? ( media-libs/libjpeg-turbo:= ) jpeg2k? ( media-libs/openjpeg:2= ) lzma? ( || ( app-arch/xz-utils app-arch/lzma ) ) mysql? ( virtual/mysql ) netcdf? ( sci-libs/netcdf:= ) odbc? ( dev-db/unixODBC ) ogdi? ( >=sci-libs/ogdi-4.1.0-r1 ) opencl? ( virtual/opencl ) oracle? ( dev-db/oracle-instantclient:= ) pdf? ( app-text/poppler:= ) png? ( media-libs/libpng:= ) postgres? ( >=dev-db/postgresql-8.4:= ) python? ( python_single_target_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) python_single_target_python3_10? ( dev-python/numpy[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/numpy[python_targets_python3_11(-)] ) ) spatialite? ( dev-db/spatialite ) sqlite? ( dev-db/sqlite:3 ) webp? ( media-libs/libwebp:= ) xls? ( dev-libs/freexl ) zstd? ( app-arch/zstd:= ) java? ( >=virtual/jre-1.8:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
+RDEPEND=dev-libs/expat dev-libs/json-c:= dev-libs/libpcre2 dev-libs/libxml2:2 dev-libs/openssl:= media-libs/tiff >=sci-libs/libgeotiff-1.5.1-r1:= >=sci-libs/proj-6.0.0:= sys-libs/zlib[minizip(+)] armadillo? ( sci-libs/armadillo:=[lapack] ) curl? ( net-misc/curl ) fits? ( sci-libs/cfitsio:= ) geos? ( >=sci-libs/geos-3.8.0 ) gif? ( media-libs/giflib:= ) gml? ( >=dev-libs/xerces-c-3.1 ) heif? ( media-libs/libheif:= ) hdf5? ( >=sci-libs/hdf5-1.6.4:=[cxx,szip] ) java? ( >=virtual/jdk-1.8:* ) jpeg? ( media-libs/libjpeg-turbo:= ) jpeg2k? ( media-libs/openjpeg:2= ) lzma? ( || ( app-arch/xz-utils app-arch/lzma ) ) mysql? ( virtual/mysql ) netcdf? ( sci-libs/netcdf:= ) odbc? ( dev-db/unixODBC ) ogdi? ( >=sci-libs/ogdi-4.1.0-r1 ) opencl? ( virtual/opencl ) oracle? ( dev-db/oracle-instantclient:= ) pdf? ( app-text/poppler:= ) png? ( media-libs/libpng:= ) postgres? ( >=dev-db/postgresql-8.4:= ) python? ( python_single_target_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) python_single_target_python3_10? ( dev-python/numpy[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/numpy[python_targets_python3_11(-)] ) ) spatialite? ( dev-db/spatialite ) sqlite? ( dev-db/sqlite:3 ) webp? ( media-libs/libwebp:= ) xls? ( dev-libs/freexl ) zstd? ( app-arch/zstd:= ) java? ( >=virtual/jre-1.8:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_10 python_single_target_python3_11 ) ) spatialite? ( sqlite ) test? ( ^^ ( python_single_target_python3_10 python_single_target_python3_11 ) )
 RESTRICT=!test? ( test )
 SLOT=0/33
 SRC_URI=https://download.osgeo.org/gdal/3.7.0/gdal-3.7.0.tar.xz test? ( https://download.osgeo.org/gdal/3.7.0/gdalautotest-3.7.0.tar.gz )
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=493db9757496c138aeac2b6dd286fb40
+_md5_=d6c136362eb466636cef5af7cfd81183
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index 9e68e73bc93f..fa4e288f03af 100644
--- a/metadata/md5-cache/sys-fs/Manifest.gz
+++ b/metadata/md5-cache/sys-fs/Manifest.gz
diff --git a/metadata/md5-cache/sys-fs/f2fs-tools-1.15.0-r2 b/metadata/md5-cache/sys-fs/f2fs-tools-1.15.0-r2
deleted file mode 100644
index fbcca92ff759..000000000000
--- a/metadata/md5-cache/sys-fs/f2fs-tools-1.15.0-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=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=configure install prepare
-DEPEND=selinux? ( sys-libs/libselinux ) elibc_musl? ( sys-libs/queue-standalone )
-DESCRIPTION=Tools for Flash-Friendly File System (F2FS)
-EAPI=8
-HOMEPAGE=https://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/about/
-INHERIT=autotools
-IUSE=selinux
-KEYWORDS=amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv x86
-LICENSE=GPL-2
-RDEPEND=selinux? ( sys-libs/libselinux ) elibc_musl? ( sys-libs/queue-standalone )
-SLOT=0/9
-SRC_URI=https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git/snapshot/f2fs-tools-1.15.0.tar.gz
-_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=94a3fcc53ea85403e7a2f5f459f1a92a
diff --git a/metadata/md5-cache/sys-fs/zfs-auto-snapshot-1.2.4-r3 b/metadata/md5-cache/sys-fs/zfs-auto-snapshot-1.2.4-r3
index e20ccd02a5a8..81852cf16113 100644
--- a/metadata/md5-cache/sys-fs/zfs-auto-snapshot-1.2.4-r3
+++ b/metadata/md5-cache/sys-fs/zfs-auto-snapshot-1.2.4-r3
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/zfsonlinux/zfs-auto-snapshot
 INHERIT=prefix readme.gentoo-r1 systemd
 IUSE=+cron +default-exclude systemd
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv
 LICENSE=GPL-2+
 RDEPEND=sys-fs/zfs !systemd? ( virtual/cron )
 REQUIRED_USE=!systemd? ( cron )
 SLOT=0
 SRC_URI=https://github.com/zfsonlinux/zfs-auto-snapshot/archive/upstream/1.2.4.tar.gz -> zfs-auto-snapshot-upstream-1.2.4.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	prefix	eab3c99d77fe00506c109c8a736186f7	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=9645577876625eddbad8558fa3dde232
+_md5_=59d138075b99adfc30698f98414d62f5
diff --git a/metadata/md5-cache/sys-fs/zfs-kmod-2.1.11-r1 b/metadata/md5-cache/sys-fs/zfs-kmod-2.1.11-r1
new file mode 100644
index 000000000000..672d550fdac0
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/zfs-kmod-2.1.11-r1
@@ -0,0 +1,18 @@
+BDEPEND=dev-lang/perl app-alternatives/awk verify-sig? ( sec-keys/openpgp-keys-openzfs ) 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 sys-apps/kmod[tools] modules-sign? ( dev-libs/openssl virtual/pkgconfig ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install postinst prepare pretend setup unpack
+DEPEND=virtual/linux-sources
+DESCRIPTION=Linux ZFS kernel module for sys-fs/zfs
+EAPI=8
+HOMEPAGE=https://github.com/openzfs/zfs
+IDEPEND=sys-apps/kmod[tools]
+INHERIT=autotools dist-kernel-utils flag-o-matic linux-mod-r1 multiprocessing verify-sig
+IUSE=custom-cflags debug +rootfs +dist-kernel-cap dist-kernel modules-sign +strip verify-sig
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~sparc
+LICENSE=CDDL MIT debug? ( GPL-2+ )
+PDEPEND=dist-kernel? ( ~sys-fs/zfs-2.1.11[dist-kernel] )
+RDEPEND=dist-kernel-cap? ( dist-kernel? ( <virtual/dist-kernel-6.3 ) ) sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= )
+RESTRICT=test
+SLOT=0/2.1.11-r1
+SRC_URI=https://github.com/openzfs/zfs/releases/download/zfs-2.1.11/zfs-2.1.11.tar.gz verify-sig? ( https://github.com/openzfs/zfs/releases/download/zfs-2.1.11/zfs-2.1.11.tar.gz.asc )
+_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	dist-kernel-utils	557a93bd51735200952a735894f6628e	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	linux-mod-r1	9687a35031c8f66a0cb2b0c3ccf5a0ae	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
+_md5_=966847c203c58ce10458fd1d723cd44e
diff --git a/metadata/md5-cache/sys-fs/zfs-kmod-9999 b/metadata/md5-cache/sys-fs/zfs-kmod-9999
index ed3e46564404..c5d15c477561 100644
--- a/metadata/md5-cache/sys-fs/zfs-kmod-9999
+++ b/metadata/md5-cache/sys-fs/zfs-kmod-9999
@@ -1,16 +1,17 @@
-BDEPEND=dev-lang/perl app-alternatives/awk 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 >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
-DEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) kernel_linux? ( virtual/linux-sources virtual/libelf )
+BDEPEND=dev-lang/perl app-alternatives/awk 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 sys-apps/kmod[tools] modules-sign? ( dev-libs/openssl virtual/pkgconfig ) >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure install postinst prepare pretend setup unpack
+DEPEND=virtual/linux-sources
 DESCRIPTION=Linux ZFS kernel module for sys-fs/zfs
 EAPI=8
 HOMEPAGE=https://github.com/openzfs/zfs
-INHERIT=autotools dist-kernel-utils flag-o-matic linux-mod toolchain-funcs git-r3
-IUSE=custom-cflags debug +rootfs dist-kernel
+IDEPEND=sys-apps/kmod[tools]
+INHERIT=autotools dist-kernel-utils flag-o-matic linux-mod-r1 multiprocessing git-r3
+IUSE=custom-cflags debug +rootfs dist-kernel modules-sign +strip
 LICENSE=CDDL MIT debug? ( GPL-2+ )
 PDEPEND=dist-kernel? ( ~sys-fs/zfs-9999[dist-kernel] )
 PROPERTIES=live
-RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
-RESTRICT=debug? ( strip ) test
+RDEPEND=sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= )
+RESTRICT=test
 SLOT=0/9999
-_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	dist-kernel-utils	557a93bd51735200952a735894f6628e	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	git-r3	27e13c09a4c7e4c78ac812f74727e676	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	linux-mod	073dc5c9bc044e85d704b503ebc764a2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=e0ce15e5d5ad89c3ca779848e74432c2
+_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	dist-kernel-utils	557a93bd51735200952a735894f6628e	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	git-r3	27e13c09a4c7e4c78ac812f74727e676	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	linux-mod-r1	9687a35031c8f66a0cb2b0c3ccf5a0ae	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=f88d0eb3f8504fddd6d616c09cb5e94c
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index 821cb1676b71..3b0ac735f61a 100644
--- a/metadata/md5-cache/sys-kernel/Manifest.gz
+++ b/metadata/md5-cache/sys-kernel/Manifest.gz
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.14.311_p146 b/metadata/md5-cache/sys-kernel/rt-sources-4.14.314_p147
index d0bbf548467d..ba7b1e175c4a 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-4.14.311_p146
+++ b/metadata/md5-cache/sys-kernel/rt-sources-4.14.314_p147
@@ -8,7 +8,7 @@ KEYWORDS=~amd64 ~arm64
 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=4.14.311_p146
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.14.311.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/patch-4.14.311-rt146.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patch-4.14.311-rt146.patch.xz
+SLOT=4.14.314_p147
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.14.314.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/patch-4.14.314-rt147.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/4.14/older/patch-4.14.314-rt147.patch.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	5ec69098eb726d07eec2cf05ce4fbdfe	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
 _md5_=79671f006cc62d6ead0bc41cedac4020
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-5.10.176_p86 b/metadata/md5-cache/sys-kernel/rt-sources-5.10.179_p87
index 59d810f7e200..b7f9aace9fce 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-5.10.176_p86
+++ b/metadata/md5-cache/sys-kernel/rt-sources-5.10.179_p87
@@ -8,7 +8,7 @@ KEYWORDS=~amd64 ~arm64
 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=5.10.176_p86
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.10.176.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//5.10-gnu/deblob-5.10 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//5.10-gnu/deblob-check -> deblob-check-5.10 ) https://www.kernel.org/pub/linux/kernel/projects/rt/5.10/patch-5.10.176-rt86.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/5.10/older/patch-5.10.176-rt86.patch.xz
+SLOT=5.10.179_p87
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.10.179.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//5.10-gnu/deblob-5.10 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//5.10-gnu/deblob-check -> deblob-check-5.10 ) https://www.kernel.org/pub/linux/kernel/projects/rt/5.10/patch-5.10.179-rt87.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/5.10/older/patch-5.10.179-rt87.patch.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	5ec69098eb726d07eec2cf05ce4fbdfe	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
 _md5_=f6a9c79ff5e6b5ea13a6fa587de67550
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-5.15.107_p62 b/metadata/md5-cache/sys-kernel/rt-sources-5.15.113_p64
index 745313c5b93d..3b30156f7ade 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-5.15.107_p62
+++ b/metadata/md5-cache/sys-kernel/rt-sources-5.15.113_p64
@@ -8,7 +8,7 @@ KEYWORDS=~amd64 ~arm64
 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=5.15.107_p62
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.15.107.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.15.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//5.15-gnu/deblob-5.15 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//5.15-gnu/deblob-check -> deblob-check-5.15 ) https://www.kernel.org/pub/linux/kernel/projects/rt/5.15/patch-5.15.107-rt62.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/5.15/older/patch-5.15.107-rt62.patch.xz
+SLOT=5.15.113_p64
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.15.113.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.15.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//5.15-gnu/deblob-5.15 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//5.15-gnu/deblob-check -> deblob-check-5.15 ) https://www.kernel.org/pub/linux/kernel/projects/rt/5.15/patch-5.15.113-rt64.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/5.15/older/patch-5.15.113-rt64.patch.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	5ec69098eb726d07eec2cf05ce4fbdfe	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
 _md5_=f6a9c79ff5e6b5ea13a6fa587de67550
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-6.1.26_p8 b/metadata/md5-cache/sys-kernel/rt-sources-6.1.28_p10
index 57f9e5dda98e..bba0e4630162 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-6.1.26_p8
+++ b/metadata/md5-cache/sys-kernel/rt-sources-6.1.28_p10
@@ -8,7 +8,7 @@ KEYWORDS=~amd64 ~arm64
 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.1.26_p8
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v6.x/patch-6.1.26.xz https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.1.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//6.1-gnu/deblob-6.1 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//6.1-gnu/deblob-check -> deblob-check-6.1 ) https://www.kernel.org/pub/linux/kernel/projects/rt/6.1/patch-6.1.26-rt8.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/6.1/older/patch-6.1.26-rt8.patch.xz
+SLOT=6.1.28_p10
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v6.x/patch-6.1.28.xz https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.1.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//6.1-gnu/deblob-6.1 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//6.1-gnu/deblob-check -> deblob-check-6.1 ) https://www.kernel.org/pub/linux/kernel/projects/rt/6.1/patch-6.1.28-rt10.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/6.1/older/patch-6.1.28-rt10.patch.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	5ec69098eb726d07eec2cf05ce4fbdfe	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
 _md5_=f6a9c79ff5e6b5ea13a6fa587de67550
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.15.112 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.15.113
index 6c3a68cc3253..4bf33fcf288d 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-5.15.112
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-5.15.113
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sp
 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=5.15.112
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.15.112.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.15.tar.xz
+SLOT=5.15.113
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.15.113.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.15.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	5ec69098eb726d07eec2cf05ce4fbdfe	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
 _md5_=06a11745e46e233e9ae03efa92a371cd
diff --git a/metadata/md5-cache/sys-process/Manifest.gz b/metadata/md5-cache/sys-process/Manifest.gz
index bdc913a864bf..e18c0990e946 100644
--- a/metadata/md5-cache/sys-process/Manifest.gz
+++ b/metadata/md5-cache/sys-process/Manifest.gz
diff --git a/metadata/md5-cache/sys-process/atop-2.9.0 b/metadata/md5-cache/sys-process/atop-2.9.0
deleted file mode 100644
index 15d10fc101a0..000000000000
--- a/metadata/md5-cache/sys-process/atop-2.9.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup
-DEPEND=sys-libs/ncurses:= >=sys-process/acct-6.6.4-r1 modules? ( sys-libs/zlib ) modules? ( kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) ) modules? ( kernel_linux? ( virtual/linux-sources virtual/libelf ) )
-DESCRIPTION=Resource-specific view of processes
-EAPI=8
-HOMEPAGE=https://www.atoptool.nl/ https://github.com/Atoptool/atop
-INHERIT=linux-info linux-mod systemd toolchain-funcs
-IUSE=dist-kernel modules
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses:= >=sys-process/acct-6.6.4-r1 modules? ( sys-libs/zlib ) modules? ( kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) )
-SLOT=0
-SRC_URI=https://github.com/Atoptool/atop/archive/v2.9.0.tar.gz -> atop-2.9.0.tar.gz modules? ( https://www.atoptool.nl/download/netatop-3.1.tar.gz )
-_eclasses_=linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	linux-mod	073dc5c9bc044e85d704b503ebc764a2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=b3c12321691d9d3e43a763bfbe6c3cac
diff --git a/metadata/md5-cache/sys-process/atop-2.9.0-r1 b/metadata/md5-cache/sys-process/atop-2.9.0-r1
new file mode 100644
index 000000000000..cd9c5b0726a8
--- /dev/null
+++ b/metadata/md5-cache/sys-process/atop-2.9.0-r1
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig modules? ( sys-apps/kmod[tools] modules-sign? ( dev-libs/openssl virtual/pkgconfig ) ) virtual/pkgconfig
+DEFINED_PHASES=compile install postinst prepare pretend setup
+DEPEND=sys-libs/ncurses:= sys-libs/zlib >=sys-process/acct-6.6.4-r1 modules? ( virtual/linux-sources )
+DESCRIPTION=Resource-specific view of processes
+EAPI=8
+HOMEPAGE=https://www.atoptool.nl/ https://github.com/Atoptool/atop
+IDEPEND=modules? ( sys-apps/kmod[tools] )
+INHERIT=linux-mod-r1 systemd toolchain-funcs
+IUSE=dist-kernel modules-sign +strip modules
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=sys-libs/ncurses:= sys-libs/zlib >=sys-process/acct-6.6.4-r1 modules? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
+SLOT=0
+SRC_URI=https://github.com/Atoptool/atop/archive/v2.9.0.tar.gz -> atop-2.9.0.tar.gz modules? ( https://www.atoptool.nl/download/netatop-3.1.tar.gz )
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	linux-mod-r1	9687a35031c8f66a0cb2b0c3ccf5a0ae	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=b6df5d42b3fe049c6134f1586376f71b
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index 72e4045af062..ab3c826df449 100644
--- a/metadata/md5-cache/www-apps/Manifest.gz
+++ b/metadata/md5-cache/www-apps/Manifest.gz
diff --git a/metadata/md5-cache/www-apps/gitea-1.18.3 b/metadata/md5-cache/www-apps/gitea-1.18.3
deleted file mode 100644
index e18d101af232..000000000000
--- a/metadata/md5-cache/www-apps/gitea-1.18.3
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=>=dev-lang/go-1.18 app-arch/unzip virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare unpack
-DEPEND=acct? ( acct-group/git acct-user/git[gitea] ) pam? ( sys-libs/pam )
-DESCRIPTION=A painless self-hosted Git service
-EAPI=8
-HOMEPAGE=https://gitea.io https://github.com/go-gitea/gitea
-IDEPEND=filecaps? ( sys-libs/libcap )
-INHERIT=fcaps go-module tmpfiles systemd flag-o-matic
-IUSE=+acct pam sqlite pie +filecaps
-KEYWORDS=amd64 ~arm ~arm64 ~riscv ~x86
-LICENSE=Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0
-RDEPEND=acct? ( acct-group/git acct-user/git[gitea] ) pam? ( sys-libs/pam ) dev-vcs/git virtual/tmpfiles
-RESTRICT=test strip
-SLOT=0
-SRC_URI=https://github.com/go-gitea/gitea/releases/download/v1.18.3/gitea-src-1.18.3.tar.gz -> gitea-1.18.3.tar.gz
-_eclasses_=fcaps	c0a086b957a1b183a8d136eabf02f191	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	go-module	9c75e51a48520b2f01471c1f91762882	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=00d825b58b5efc42dcb59004ee9d8eb2
diff --git a/metadata/md5-cache/www-apps/gitea-1.18.5 b/metadata/md5-cache/www-apps/gitea-1.18.5
deleted file mode 100644
index 62638330534e..000000000000
--- a/metadata/md5-cache/www-apps/gitea-1.18.5
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=>=dev-lang/go-1.18 app-arch/unzip virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare unpack
-DEPEND=acct? ( acct-group/git acct-user/git[gitea] ) pam? ( sys-libs/pam )
-DESCRIPTION=A painless self-hosted Git service
-EAPI=8
-HOMEPAGE=https://gitea.io https://github.com/go-gitea/gitea
-IDEPEND=filecaps? ( sys-libs/libcap )
-INHERIT=fcaps go-module tmpfiles systemd flag-o-matic
-IUSE=+acct pam sqlite pie +filecaps
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
-LICENSE=Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0
-RDEPEND=acct? ( acct-group/git acct-user/git[gitea] ) pam? ( sys-libs/pam ) dev-vcs/git virtual/tmpfiles
-RESTRICT=test strip
-SLOT=0
-SRC_URI=https://github.com/go-gitea/gitea/releases/download/v1.18.5/gitea-src-1.18.5.tar.gz -> gitea-1.18.5.tar.gz
-_eclasses_=fcaps	c0a086b957a1b183a8d136eabf02f191	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	go-module	9c75e51a48520b2f01471c1f91762882	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=c36caa91ba2d300f0d65d411c1aa031c
diff --git a/metadata/md5-cache/www-plugins/Manifest.gz b/metadata/md5-cache/www-plugins/Manifest.gz
index c4497e02991a..94774750483e 100644
--- a/metadata/md5-cache/www-plugins/Manifest.gz
+++ b/metadata/md5-cache/www-plugins/Manifest.gz
diff --git a/metadata/md5-cache/www-plugins/browserpass-3.0.10 b/metadata/md5-cache/www-plugins/browserpass-3.0.10
deleted file mode 100644
index c1e79afdecdf..000000000000
--- a/metadata/md5-cache/www-plugins/browserpass-3.0.10
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-lang/go-1.18 app-arch/unzip
-DEFINED_PHASES=compile install unpack
-DESCRIPTION=WebExtension host binary for app-admin/pass, a UNIX password manager
-EAPI=8
-HOMEPAGE=https://github.com/browserpass/browserpass-native
-INHERIT=go-module
-KEYWORDS=~amd64
-LICENSE=BSD ISC MIT
-RDEPEND=app-crypt/gnupg
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://github.com/browserpass/browserpass-native/archive/3.0.10.tar.gz -> browserpass-3.0.10.tar.gz https://dev.gentoo.org/~mattst88/distfiles/browserpass-3.0.10-deps.tar.xz
-_eclasses_=go-module	9c75e51a48520b2f01471c1f91762882	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=d668fb0e0e216fc265a78c722c21b3ce
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 66020d994e39..c1d2d35c98ed 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 15850 BLAKE2B f8a24ac4773896d3e2d3ac7daac96705bb587c68e5945981d4f8b934b213a0a634607e00cc3481f4c847f66ae537f4bfd1c12852438720d6cf5d711fe74f3237 SHA512 29367a48def7059bf0b6fab4e38cd0ba8266ac4b865394c346e798632efcf7c41364d99e462d98a52192ae8270db65e57b9f15ae208bef7ce4c3cfd98163dee1
-TIMESTAMP 2023-05-30T01:40:39Z
+TIMESTAMP 2023-05-30T07:40:06Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmR1VBdfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmR1qFZfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDd2BAAnw/MdYRqf574rCQV0a4zVA1HA0h/wX7eyp7djWPdmVuUGt3sSZCf1CRB
-vmePwQB2ZAwUBy6+WmX5AuhfYPoHumk/fkS+OTePIo7Jk77wbkzPUxGmhXaRjuCR
-9Q74YmJS54Rl55JL6Eamj+Z2cVru9b4LfHcsf+DjY8OIlrcASCe04W7p3gi4KSYq
-ad6LQTAbyVDjFafyVqKKnUj2leXor2vU7PtcWy6nmWoY1g48H8CpZcq5KTu9I5gE
-y+R2KeTd4Fz6kVOmt2dljV7HWz2Yz0D2cpH6kqpKUnjOczXhH96dmRat1e/wylnu
-MexxuvDlb+LGrK76qjD5Cli6hDQfumY5tb3rrZyhFBm8xEEzU0P2r+DCYY+B5FT+
-g27DMlecun5tAdlfSqqoSgLkY7Fr33krZ0IWoCi3H20xYeQPdv4agHqDUmV0YWP8
-1h5CFcW5fLUWyo2tVn9aPbQQ5stD0t4Ydfk0SiLsheChTll99YvdjjnonO7glKGg
-g3LMuHjUFqphU32lSwGfYQvz5tzkQCi42+jkhIS7O1Si0boqvD43MypSGr6YT+FD
-4u9C4ZXRaFMkN4AhXzo6zS12d/w0xs40fVlU7yn/KaavO5YpbK9Uua+N6gC0FN8T
-CvP1XgNyec7thp8qWgG8L8tROL0zkBL5ds3Z11lM+18rgRpozCo=
-=bD7R
+klC6Bw/+O1+zhfbAU9DoTs2uWL8ZntvA04f9RHWZk0oNQYXvbYbgdhp1orStDyHo
+xxuI9KGm9bNR561rqicKfpiflLe56BsSJZ/kUSfPerMl5/DaLUT5/8KBOtcw78pT
+SDeGxWN7CGAz3SRNCODNRNYnrRQOKAZb58ii4ig3pg47uwgqS7g2CyQofhFr1wHv
+dL/mlF+sJD7lg36Jo/leCgK163hzFfs0T9JRqscCXCiBY/epe9Od1tMqLMfrgdWO
+KvomkvvNG+FLFG1s7+5yxSq36ORCGASYFXaAchSsd41bFMgAI3qc7y1mQGHNubyv
+gU11ignpTBoCOrtirDeZzUKDccR9dFdZFcJ/EyuwvGQvJQJpaCPLr8JyXu75dNh9
+xeBrtNYosFNdQw++Ym4E7uDG8ceSvfeyUJf5+m8mL9VI8bvOZmTbgnPMHRlgZeTa
+kc4os1Sqrmd2xtYP6kMQsMgAIHBlpS+A6zbRqnOA71RW8KI1SWL+3fRlSAcdhHYJ
+j2jWN8lOEmk/2Rudv/mhRRgSuaARgCbLpdG2eXOih5VemnpWv4jZTfpb7CqQOwcJ
+c31PXK+mdX0QUXbQO0ec3C4r2db9Q08u6Sbvrf/a4/4KWB2hJ340zUOPx9V+F3Kl
+XG+eGeSd7dfjJBBzZjEtjZ87gT9pIgPovGsIM7PT3xTc8bLpoxs=
+=evT7
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index d1a3241b7044..e40e47dcea3e 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Tue, 30 May 2023 01:40:36 +0000
+Tue, 30 May 2023 07:40:03 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index ed951af41abf..9668213485fb 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Tue May 30 01:40:36 AM UTC 2023
+Tue May 30 07:40:02 AM UTC 2023
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 662d35a647e0..e401b571b68d 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Tue, 30 May 2023 01:45:01 +0000
+Tue, 30 May 2023 07:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 2d625988aab6..123b32fa7b49 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-780a29cd9228988031ed0243d764d478d0482045 1685410030 2023-05-30T01:27:10+00:00
+1563522335c692ad42e259d7764dc24a4e181a9c 1685429936 2023-05-30T06:58:56+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 537cd162e498..fc0751e3140a 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1685410801 Tue 30 May 2023 01:40:01 AM UTC
+1685432401 Tue 30 May 2023 07:40:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index d1a3241b7044..e40e47dcea3e 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Tue, 30 May 2023 01:40:36 +0000
+Tue, 30 May 2023 07:40:03 +0000
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 9f387c353024..cf1fb5f8f27c 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/synapse/Manifest b/net-im/synapse/Manifest
index 29cad46b6e32..fcc4e697074b 100644
--- a/net-im/synapse/Manifest
+++ b/net-im/synapse/Manifest
@@ -73,7 +73,7 @@ DIST windows_i686_msvc-0.36.1.crate 724575 BLAKE2B cf964bec007d8432e2009644cf7f8
 DIST windows_x86_64_gnu-0.36.1.crate 790934 BLAKE2B 9dec5d966bdc89efbc81989acca242d519f51676ec37487df2bfacd6bfbc5a8de2871be72c5b96a073a899c666e3a39aa60d493e7df39fa90efe869fb744a332 SHA512 598b69e4f2cd3d68f910d526a66dadb465ff30a8c261c9a4455aa1c5b952d23c04f8edaa063cd16fb43564c116a13f06d607f3a0a9c7495054b8bfe1c04d1865
 DIST windows_x86_64_msvc-0.36.1.crate 661999 BLAKE2B 4cf967f10d4ce148bac967598168752d1996b4ddf5278a8fca53360566c37c1a014bfb4dfdc0ae2d96e01196c42eb4906ea80d8e9dd23b9e9f3163631c9e253e SHA512 89c22ed51a74f531662d80ae0fa5e0215728db1e6caf3c13eaeba95a93548b43c00b8474f52553ac866ac83c203b6c22dc44fbc870e882a4c9c97ba54b87c631
 EBUILD synapse-1.79.0.ebuild 5356 BLAKE2B 0539284c6bfd01f92b995fe0a694a1aad90d95f323920e9d23d90b6b725725bef3de1c9773b9306a04aa1874b55025ce097113c798b354208365a21b9edcdfeb SHA512 034a0d1048a984b3334ee79ef06a262ffc03c1ccd8ef1347c3a8f9c9e58b231c4f5d01526a43b1126bfaf19e46c3b594c34bacc3ac3c7fd5da0636dbd38f202d
-EBUILD synapse-1.82.0-r1.ebuild 5380 BLAKE2B 59fb1bf474fb7f2800a56841d824dc2bc2caec0e471ef9a23f224b399728db4bf8cce18d971dcf239f333a47b5931aaaf5ef68684e7e8b93fe9d166a346f501f SHA512 5c0298c5e5288aa7d7c643437b5ce26843a433cf8cee00421d5b83ed0e76307b779e76c16f9492d58bafa6689caa32e13c06c9d24aa7cb7cd4362bc4e81a9c6f
+EBUILD synapse-1.82.0-r1.ebuild 5379 BLAKE2B c296b48d89c78decaa13e0087d4148ff4abf8a1e6a504bae3b217ca5d72448def4fc29bcbaf01d82cfa23722b7046e9043e5775781305af05523c7bae17b797a SHA512 cd491f0a548b37f1d8093ce2e720bf4459f2babd333c26e71e65c10186b540b830c9c652dd63eaf16998d74cc64bc30c38864336e161c5660a0d2610339a5c32
 EBUILD synapse-1.83.0.ebuild 5381 BLAKE2B f16fe4e670b190a65dd12e9fae7cdd5776efb4ab36e2a4d7e80e9f9acdd07dd0d1b6171aaf07816898b45a21fef27c6f7e39212e339e5b56b52db09570d9e374 SHA512 d1d87772d2c474f5bf6de14fb10748c23eaf85c5e71e8e8f409cf3d7a5f4bf2fda771a9c082047c4574303c765d49f1ebb39eb149df7898d02dacbdc918fb110
 EBUILD synapse-1.84.1.ebuild 5447 BLAKE2B 61591facca826aa5468ba189501bb91a0ac0ac8cac03e48922f4e62db7f5d8d6db17ec2fb71ddbdb58cfbec76e3815daa2438c2345b5ed952bf036a24c6ff094 SHA512 dd65941991288a5c4e566ecd470d496bcfd0bf8dd9d3873e0cce9aacf9cda6382c3cc37c90bb5dc82111d08397f849e903ef38c4fe0aa31b354fb0f1d50161fe
 MISC metadata.xml 526 BLAKE2B f76d0a86c40485c2428fa949fd54650f31696ce94f0d81bfea53c13604ec287230ad2fdc094f767703ecf3864e111e2b89b091fe766172ab63e809df2a7c95ab SHA512 fd5d919dd64dc2d3d2a6be8d7cabe83d722936f27f2cdcf351bbb4a7e862b6a64f94c2581a71ac27052d21595843ce61a8c94e6802c8857bc310187b38544456
diff --git a/net-im/synapse/synapse-1.82.0-r1.ebuild b/net-im/synapse/synapse-1.82.0-r1.ebuild
index f365352e9466..f350bba869ab 100644
--- a/net-im/synapse/synapse-1.82.0-r1.ebuild
+++ b/net-im/synapse/synapse-1.82.0-r1.ebuild
@@ -83,7 +83,7 @@ LICENSE+="
 	Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD MIT Unicode-DFS-2016
 "
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
+KEYWORDS="amd64 ~ppc64"
 IUSE="postgres systemd test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index bb5159b181df..ed160b230c0c 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest
index 26e7ec410506..bc29d81cc800 100644
--- a/net-misc/tigervnc/Manifest
+++ b/net-misc/tigervnc/Manifest
@@ -4,9 +4,7 @@ AUX tigervnc-1.12.0.confd 665 BLAKE2B 1525706e3e60727ed0f3eeb0dcfc849ea2b92463d9
 AUX tigervnc-1.12.0.initd 2149 BLAKE2B 7d7389128816ad07ba0890d57c113834fc325b00729a5e3979dca5c25e9940690aab9e10d7e6a94a8645002cc15dcbd54137636b373c99f86454a5873870ed72 SHA512 c1047acf1211c4073a4581d5bfe78dec00320e0749b44608224cc478ac335233cd7beacbd161f61330fe28c2a6fa8de137b2c80e9ebda9d92f90b062f489eecb
 AUX tigervnc-1.12.80-disable-server-and-pam.patch 1394 BLAKE2B fcda4d2199dce67a189e3b3aba7e88e41d2325e79147de7a5e0a414aff2583ac0bda1de7e372b907527177612eaeb2462294dbf578f5342701e9d274f09e4f78 SHA512 ec1fa15f70ff508636c02cf3b945b7e372fb391c674e47c6c0cbfc871400a3fc6f0847dae62cf7eb5d56afae121b9aec8d19359319ca0e7e04df03b3bec3cc5e
 DIST tigervnc-1.13.1.tar.gz 1989081 BLAKE2B 3f4d395c2788a4d475dcd42793c43f249264db586da85f99d7e0f64ea37854831c61bb5c99945578f8dbeac5ee30e0f7b46fa7f215768c70e750d50689cd4e7a SHA512 9190dbcd3b57ba52286c158c0675104d68463d7e3ea8e23493514b64451ddb511f3daf0f177339bc231155daea376d9c8dc58216663e10aa12f67468f4559da5
-DIST xorg-server-21.1.1.tar.xz 4958508 BLAKE2B fadac208773700b91003ef18d46e6f2c6b501e59b7491c943f406641e9ff3837a8126034c023e9b6d2d4131ee438c1ef94fa458af1828d4be325519b47069a79 SHA512 8608ed9c1537c95e8a3adea5e3e372a3c5eb841f8e27c84283093f22fb1909e16a800006510da684b13f8f237f33b8a4be3e2537f5f9ab9af4c5ad12770eef0d
 DIST xorg-server-21.1.8.tar.xz 4980208 BLAKE2B a223efe6d14b55bd133b7f8db75b7720ea0ae58f1eced0f6b20caf6e7045e7649a0923a1c6db5d649265375e6768fa9811477d2fa0da52d7a1e65cf4511535d2 SHA512 6104b3620ed2e1e27d9a8e963388bbe8785a764585b1bc03dbf5d719a92894773dda580d377ca18ceeab353e65a5d23cc947bab84a4012f9dd1eca31cac36937
 EBUILD tigervnc-1.13.1-r1.ebuild 5268 BLAKE2B b4ef6ba1f8c7bd77d2ad2ca1dd0a23c5e8e6855410961bbcf35cf55c70cfadecc26056a6148dd7b3bbeee395d0335cae9a1b402eeeb8c12c90d70b03e0b165c6 SHA512 19a891a3833d9cece8cb6e1a277ab1564f42f36c690b66a6aa43ef38d2b4204bf372f73ea1000e12af5a14b8acaa7233e317848f28d9f94c8ca4c5eed2aa7c5b
-EBUILD tigervnc-1.13.1.ebuild 5283 BLAKE2B 1e019a6ed98be9dfcbba682d9e86277a6f0a2c65ae01b40f530e487723ff353a58a9d96c86c97a6f091617c0bd1317bf4f98b8659910d4e103dd22d45d8504d1 SHA512 a2985fed7f368b90c513fe6a9f53e1317d0c6820644982c64ebced4ddd711166229794fed5a93b391c80eb6487c9584bffe01c5d69bc75d58ca6f100bced2030
 EBUILD tigervnc-9999.ebuild 5273 BLAKE2B 5f37d30b30a1785612d36ef3ee1e829bb4979a617d674b823af1cb1f330826c5656bddf44ba999045d91d0eb1554f864e6c6afc2a5925d77de94711929732a62 SHA512 743f8834ca3a9f82089b082a7f4caf161b3dfd9296051aaec3744f79d1a42132cc3c1f57aacfe3103ee42e0a3541988c84a411dd8e619605b85892cdea93b395
 MISC metadata.xml 602 BLAKE2B cd3ae9a2fa5758627621230b5bc005b46c65d028764c5578d7684ae7aaa6403d301a59476e2aae6fa4a7a1f38cd0d8c23a7db3a784666aa2f375267444c48658 SHA512 16c1ccff038df995cbe4bace496636e41f1de9c28ad25c45d49f63485d3b7b71d9682866ff1b005acc7b401d66112c1709048298a77fb1c0baadc879fa236743
diff --git a/net-misc/tigervnc/tigervnc-1.13.1.ebuild b/net-misc/tigervnc/tigervnc-1.13.1.ebuild
deleted file mode 100644
index 8084b2b74a7b..000000000000
--- a/net-misc/tigervnc/tigervnc-1.13.1.ebuild
+++ /dev/null
@@ -1,227 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CMAKE_IN_SOURCE_BUILD=1
-inherit autotools cmake flag-o-matic java-pkg-opt-2 optfeature systemd xdg
-
-XSERVER_VERSION="21.1.1"
-
-DESCRIPTION="Remote desktop viewer display system"
-HOMEPAGE="https://tigervnc.org"
-SRC_URI="server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.xz )"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/TigerVNC/tigervnc/"
-else
-	SRC_URI+=" https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="dri3 +drm gnutls java nls +opengl +server +viewer xinerama"
-REQUIRED_USE="
-	dri3? ( drm )
-	java? ( viewer )
-	opengl? ( server )
-	|| ( server viewer )
-"
-
-# TODO: sys-libs/libselinux
-COMMON_DEPEND="
-	dev-libs/gmp:=
-	dev-libs/nettle:=
-	media-libs/libjpeg-turbo:=
-	sys-libs/zlib:=
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrandr
-	x11-libs/pixman
-	gnutls? ( net-libs/gnutls:= )
-	nls? ( virtual/libiconv )
-	server? (
-		dev-libs/libbsd
-		dev-libs/openssl:0=
-		sys-libs/pam
-		x11-libs/libXau
-		x11-libs/libXdamage
-		x11-libs/libXdmcp
-		x11-libs/libXfixes
-		x11-libs/libXfont2
-		x11-libs/libXtst
-		x11-libs/pixman
-		x11-libs/xtrans
-		x11-apps/xauth
-		x11-apps/xinit
-		x11-apps/xkbcomp
-		x11-apps/xsetroot
-		x11-misc/xkeyboard-config
-		opengl? ( media-libs/libglvnd[X] )
-		!net-misc/turbovnc[server]
-	)
-	viewer? (
-		media-video/ffmpeg:=
-		x11-libs/fltk:1
-		x11-libs/libXi
-		x11-libs/libXrender
-		!net-misc/turbovnc[viewer]
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	java? ( virtual/jre:1.8 )
-	server? (
-		dev-lang/perl
-		sys-process/psmisc
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	drm? ( x11-libs/libdrm )
-	server? (
-		media-fonts/font-util
-		x11-base/xorg-proto
-		x11-libs/libxcvt
-		x11-libs/libXi
-		x11-libs/libxkbfile
-		x11-libs/libXrender
-		x11-misc/util-macros
-		opengl? ( media-libs/mesa )
-	)
-"
-BDEPEND="
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-PATCHES=(
-	# Restore Java viewer
-	"${FILESDIR}"/${PN}-1.11.0-install-java-viewer.patch
-	"${FILESDIR}"/${PN}-1.12.0-xsession-path.patch
-	"${FILESDIR}"/${PN}-1.12.80-disable-server-and-pam.patch
-)
-[[ ${PV} == *9999 ]] && PATCHES+=( "${FILESDIR}"/${PN}-1.13.80-depend-po-files.patch )
-
-src_unpack() {
-	if [[ ${PV} == *9999 ]]; then
-		git-r3_src_unpack
-		use server && unpack xorg-server-${XSERVER_VERSION}.tar.xz
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	if use server; then
-		cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/. unix/xserver || die
-	fi
-
-	cmake_src_prepare
-
-	if use server; then
-		cd unix/xserver || die
-		eapply ../xserver${XSERVER_VERSION}.patch
-		eautoreconf
-		sed -i 's:\(present.h\):../present/\1:' os/utils.c || die
-		sed -i '/strcmp.*-fakescreenfps/,/^        \}/d' os/utils.c || die
-
-		if use drm; then
-			cd "${WORKDIR}" && \
-			sed -i 's:\(drm_fourcc.h\):libdrm/\1:' $(grep drm_fourcc.h -rl .) || die
-		fi
-	fi
-}
-
-src_configure() {
-	if use arm || use hppa; then
-		append-flags "-fPIC"
-	fi
-
-	local mycmakeargs=(
-		-DENABLE_GNUTLS=$(usex gnutls)
-		-DENABLE_NLS=$(usex nls)
-		-DBUILD_JAVA=$(usex java)
-		-DBUILD_SERVER=$(usex server)
-		-DBUILD_VIEWER=$(usex viewer)
-	)
-
-	cmake_src_configure
-
-	if use server; then
-		cd unix/xserver || die
-		econf \
-			$(use_enable opengl glx) \
-			$(use_enable drm libdrm) \
-			--disable-config-hal \
-			--disable-config-udev \
-			--disable-devel-docs \
-			--disable-dri \
-			$(use_enable dri3) \
-			--disable-glamor \
-			--disable-kdrive \
-			--disable-libunwind \
-			--disable-linux-acpi \
-			--disable-record \
-			--disable-selective-werror \
-			--disable-static \
-			--disable-unit-tests \
-			--disable-xephyr \
-			$(use_enable xinerama) \
-			--disable-xnest \
-			--disable-xorg \
-			--disable-xvfb \
-			--disable-xwin \
-			--enable-dri2 \
-			--with-pic \
-			--without-dtrace \
-			--disable-present \
-			--with-sha1=libcrypto
-	fi
-}
-
-src_compile() {
-	cmake_src_compile
-
-	if use server; then
-		# deps of the vnc module and the module itself
-		local d subdirs=(
-			fb xfixes Xext dbe $(usex opengl glx "") $(usev dri3) randr render
-			damageext miext Xi xkb composite dix mi os hw/vnc
-		)
-		for d in "${subdirs[@]}"; do
-			emake -C unix/xserver/"${d}"
-		done
-	fi
-}
-
-src_install() {
-	cmake_src_install
-
-	if use server; then
-		emake -C unix/xserver/hw/vnc DESTDIR="${D}" install
-		rm -v "${ED}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la || die
-
-		newconfd "${FILESDIR}"/${PN}-1.12.0.confd ${PN}
-		newinitd "${FILESDIR}"/${PN}-1.12.0.initd ${PN}
-
-		systemd_douserunit unix/vncserver/vncserver@.service
-
-		# comment out pam_selinux.so, the server does not start if missing
-		# part of bug #746227
-		sed -i -e '/pam_selinux/s/^/#/' "${ED}"/etc/pam.d/tigervnc || die
-
-		# install vncserver to /usr/bin too, see bug #836620
-		dosym -r /usr/libexec/vncserver /usr/bin/vncserver
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	local OPTIONAL_DM="gnome-base/gdm x11-misc/lightdm x11-misc/sddm x11-misc/slim"
-	use server && \
-		optfeature "keeping track of the xorg-server module" net-misc/tigervnc-xorg-module && \
-		optfeature_header "Install any additional display manager package:" && \
-		optfeature "proper session support" ${OPTIONAL_DM}
-}
diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index c5c93bd3767d..62e258ede35e 100644
--- a/net-p2p/Manifest.gz
+++ b/net-p2p/Manifest.gz
diff --git a/net-p2p/freenet/Manifest b/net-p2p/freenet/Manifest
index a6b1889634b3..4089f9489048 100644
--- a/net-p2p/freenet/Manifest
+++ b/net-p2p/freenet/Manifest
@@ -1,28 +1,12 @@
-AUX 0.7.5_p1475-remove-git.patch 926 BLAKE2B 258b60eb73ee7ae78b6722a56a5e059131a51c1a0b402209b0f769e12fc960aed414033c058dca959ed546cf039e692aadcc0aa7fdda7ded9fb767f95e1de485 SHA512 d24cc1ecd7a991927d8e65378b9dabe1e7e75d8902a40cc6ae7bf19104133e9708da8768ee38230f93fc41609324ae3a9f7f7998ba261c4f4f3254d38ffaa792
-AUX 0.7.5_p1483-ext.patch 991 BLAKE2B 82397c986c5496c25593df490f116a9c5fa6169c3e6f402c0671a41458052164e56a6bb41f07ea4e131693b643a51047b4c87317bc527fc95aba1f4d04868809 SHA512 8dc5abc99f9f10a29e56956508c6c013ec543133802d628d324ade3aab58f5a31b85d289b65a80a170b9e26a17cf650de4f2ba244bf9d2d443852374fe026af4
-AUX 0.7.5_p1491-update-for-jna-5.x.patch 1437 BLAKE2B bcb3df80313ed83a6b3827a2523efe3a8c87ddbf3d24737bdc6d3e0e714ec2e1bbc0e016d9fc142ebd702f3b963be45d0f094df96fe17ef2c093bd273bcc396f SHA512 f720166e09512fb5bd0a241bc7a1fb532ba67ad2ba8705fa2dd4ccc4eb64f12200af285d85af1a990f407bcdfb898a8f7a8dfd0cf0b4c8d3a7019bce0bb3988f
-AUX build-clean.xml 18184 BLAKE2B 5cc7287b1475b830b1fe9708f6cb53316fd611e6a5757ea7ca403ccc7e7a6b3797454345c28a6fd21c7c35d0bf491ac207dc2b3098c48a9ef24bfb342fa72f67 SHA512 74a4a77d900d225264606c7413a14aa9fd526c9324165493e955a6efb5f32ffad1aa735dd13570f4f6fe764baab8f0170945d75bafeb28c82b5fba9826bc0f40
-AUX build.properties 2655 BLAKE2B 137de56b6118d7306c036d7ed00fee314446bd9b221d39c04ddf0e45235d03df9b8596127153eb713d2f6f790a99f94f33f095f8b880d5251f2fbfd0c69d61cb SHA512 dd7bf150ced2aa08a7250818f59b931908ea341917bce812d641cf2c77eea60bcf6d264d5caa99bb3669e6e93b8798af3e43629b33983bdeda70f94b17f6cd81
 AUX freenet 474 BLAKE2B f50fbfaaaf6a919ac15b078a627eb1b2fbc9e6b6c83e4229ae4032e64436926c40410f1182bdbc6bcd005677d9ef9c5be252fbd008ad6fffb6df5bfce38a2148 SHA512 8bfaf754106cd5476f96554932d3a394efbfbbdd51d6a62b32259e3c65ef562cf92f0f7fb2a2cb768037312780a990cdd05f758e23c4cc57e7543aaaed85f285
-AUX freenet-0.7.5_p1474-wrapper.conf 949 BLAKE2B 6832683015aff6db0ad2b4116a6b8aea2ca23c1ac38da72ae71ac3a339a2efe69a7bab37911035d82a15d6ff725fb8d481deae42bd1bbaf0ad62119194674354 SHA512 a6d30afc502176a6e0bab480368553c1df50add8fe18b65cede38be752c989125999cbb8bedfd68641623fd4498e19610c16d02fcf9d951da450a9612301cdeb
 AUX freenet-0.7.5_p1491-wrapper.conf 1126 BLAKE2B 9be1699e36487de28868a1f4a191de4d50fe92d8ea550c73f07dee99466ed5d6455a8c1d31690fa660b18a291702a43349629ace158d9ac97ba6f47bd95069f5 SHA512 26bfd9cc3e2f172b08c9bd5970ad2420d3c9f44023cfa9a3978fa59a92956019b4eff5b64b0fe913587baba242915779a87613bd6daa3318c314e78a56b7ec1e
 AUX freenet-0.7.5_p1497-ignore-failing-tests.patch 1461 BLAKE2B db1dcd717e3d59898926706109c52035b4e89f906f521df4a52a39b1aa1a7d430d04e22c04b6406b77a658d1f9ff58b6094532eeae7b4b3f1b6138451e13f97e SHA512 361f87db09f72a663a9452d7c7e6a7e38cca65cccb42e0ea8110e3122ba60f9540167003d133ab6a035b5255ccecd7e5777f1f5aef5019571556a937cae79556
-AUX freenet.initd 509 BLAKE2B e6d2aa034ae60a8b37008674fca475380a1b3a8e16ddd153fb6e12ff7963376b83ffae5ff48ae520cf4d1051acfae18c4c55e00960f6ff7192120bdb0559cd17 SHA512 c9f5b1a3210d389192b9390d5160ea2490bc89d4de6024dad7f6bd9b552b3130ad6d2f76ca3bfdf8fb8327175625377babb8064f901835254b3d4c4971f694a2
 AUX freenet.service 271 BLAKE2B 7d47ad525f4bb13e07c50a0bdf19f1ef234d5219e82f426254c316abc4517180c22267a245ca022edf68e615a2865fe0dd08f694ee5ee2ced8c5391b3c5e33ad SHA512 2f3d4ec0ba05eff328e8176cbe130176a82a1bb432599de44ab78ca27e9c96e0eafe0871f12b0165247f941a2e929635a6abe6cd61351b1305c0d0e8cff83d2b
 AUX run.sh-20090501 16217 BLAKE2B 249254104ca2d0a20131a5d6b36a07b14fe6407d1915d75ecf98a617de6e532def710975ff1b2e0b580f7148099cd7f6915d8adc0b15e1f67af4fc4713e0e5af SHA512 ba97f1e370ffb7c9ea109b7d529430581a588d8d7e121ec09865e9e8932f2901477f7f43e7d0b95c7c95c2c42db05870e5d811528f91f78b48b68a539c804e67
-DIST freenet-0.7.5_p1491.zip 7827005 BLAKE2B 422f3050dbfdc829d1614b2f65262a063710028255582f7952c7ee4195f62af34d2b52ae74e5f7af2d92fd7e0db2800b6b2c24b8259e55485e1ce89929fccb40 SHA512 6b09816f9fb77003462c06e090d9ca572db9360990f2c9ba43908f30cef47dca8f89044f13ab503ea406cb7a42c07b0cba87e114c80d971ce990e0869e7dd1c3
-DIST freenet-0.7.5_p1492.zip 7844187 BLAKE2B 59dc274d1904448d9be608f34beb3fd942fe5f45a34c4be8e5c02939f5681796f8b3afe2fa70bb9a62d25bc45eb0f699c9949689fad79c11acef40b1b57e9849 SHA512 e5d40954e84ccd327b2935d222b1174c4720f1ee2c35ec41554f4d90b4cac6ab21d5655612dde2a844fbcaf13c5edfe405c0effe5c8200b77657aeecc09d1976
-DIST freenet-0.7.5_p1493.zip 8507217 BLAKE2B af8eb65ada0c5bf698314d721e615c75b57ec0136b1a593ec0960398ae952ae4115cbcec3d1da22a1c624c5f434b032bb68103f2a2ad68e8d1a7f5fb17fc3167 SHA512 3a34648e59e4201a2e66a8d87fa45b2a311d5dbfea3de96d44f797c8a6bc74c35e9d495ea6f93e04003f8bae79026d1f929f28f56b4abaa2c581cc18a0d06104
 DIST freenet-ant-1.7.1.jar 1327167 BLAKE2B 408ec04ef6be58490bc6be200bd2ae1946aa4e22a9e01c9ef00351316f7ec0e23b055ed0907c16eaf5a60d153d3b96e4c447884df752e13d16520b3360581895 SHA512 2c84378d995fed0630169fffab020bde89c3edb7b3bc1e14e2251ed71be684dc2520fdeed8bae382de362984e25a31dcd59326ef8735f8066166c1e8d98ca408
 DIST freenet-build01497-source.tar.bz2 6387097 BLAKE2B 1476793b1084bef4c596648f0d83b808da80e5d0ccddaede5c2b41264f70919dc73e7b2a020437da88bc5b6266a3866398d9a1204cf8ebef9d17b5d9a0a697c4 SHA512 f9c15ebbd7e04b241de767851254169b4d1f94b66afa910784eb9bf6a22db43d0786bd7323f92fde48b59b0c4f73a75ec64646dcc47e5aa908108fb7fb0712fa
 DIST freenet-build01497-source.tar.bz2.sig 566 BLAKE2B fb1d3169942d4a1fd50aadd03011cc8907c5f5784ddfa1a20ecf0956bb8b1e0e2fbd58d93d904edb93c1781bca39a8043e56f6e73a9da927dece905ce4c570e7 SHA512 0453a6bb146531bbcdd7c1e249d3d82731400985fad5d38277cb8687fa01fd8b43e7d3164c7c22d2e8605f6e03e125bc767ffcde51b880acedbcdd45f1009ffb
 DIST pebble-3.1.6.jar 318370 BLAKE2B c3ea059ebc960764cf32a2390773926f1c4e8b0be3aaee7739adfc9529a30dfd0dab3cec0c7519be991d43eed87025db9b64f230cca0622eba16e0e64371243d SHA512 abbf9f8d5c7e23cb658970f670e4e78e62d12433a6683506f14c9c0334257d0d93089d83348691b033704e661f7c1954859e9630e1d94a461a5acf7f336f88dd
 DIST seednodes-0.7.5_p1480.tar.gz 12364 BLAKE2B edb4e2a5c7424b51f0afb8234c7e486d56fe92e9201ab7ed7658366f070225f8def1b5412a31367e434ab4afae393caa16e7bdd7307f1d870607105fd5076638 SHA512 a2662a29f5721cd1523eb68b8787b074baec990327207b9ff444c91e644738a610e5216064aef00c62d6aca8ba66b2035a3175f63d45c1e0e8efc816b2a38660
-DIST seednodes-0.7.5_p1480.zip 24935 BLAKE2B 2a297cb7e429a3db06882b703241d420fd7225192afd500f2ff5a3521b1a53c4d62fc2d5b4c0a6ed4d62fa3cd4da64a42da04459dea81701d98faf36b4642eb8 SHA512 cde40562156627818e3384cb8ca29ac02cc52eb9e02c3b0627d7786b4b7deace79b3a840f61c551a25f4d771190558fb277b3f63a71994c30c7b28a2c2f85497
-EBUILD freenet-0.7.5_p1491-r1.ebuild 4881 BLAKE2B 342a7fd667dc4a2a0ff504784a184df10c5fc716c69dc18b4d70891a3a470593a63d21dd55c69857fa0e579b4ed65509bc0b54fcec7910e9220df37c7e27f2bd SHA512 8cae0cef31285330a2edd1618824df75ce8cbd27acea5bc5acde7b83d731aa5bc1a935e9785434918cec41d46d307b94ff051c9f6eae172d78cbfee83f11cb79
-EBUILD freenet-0.7.5_p1491.ebuild 4819 BLAKE2B 33df7b2784ed3a63b1dca0955858f358589d609a185fbb6d21200c6039cf0cb35c230ee05e95d22320bbc8d97ff2525599c7fcb2a6eaddb36e9239c810af6dc2 SHA512 453557ddd46fd6e92b858db79cf8ab46d285d435653f9f123d5ffeb7d554865a569e54adf74bc2fdb6846e2c487ac64507f7736a58e9d8c55983a7893d1f2a2b
-EBUILD freenet-0.7.5_p1492.ebuild 4887 BLAKE2B 75099a50aacc2d31b58ee4a7724c2b88d4ee773db9ba64e2a01f5ebd5b0df5da64ae198d32ecaa06b39f4971d22ce77255d713ab280dfcd7faa48e23512a3eaa SHA512 c40be5d910e307fa9cca5cde28912011429b419543a16e3b3290c4eede9036c71de5a9959348fbb3d04a7535d27beeb4f03cabbebcd0a87abd07f33d97b6f022
-EBUILD freenet-0.7.5_p1493-r1.ebuild 5778 BLAKE2B 8ba275d0f4ce3bc4e2119a6b15d7e0928049c47d012ff2c2836450f01a80923345560b445501cd91138244765b403799ecee6332d19cc2d5ff2741c139a4da0a SHA512 2fac80eea21d4cc90139c40e0561a3fae8e80af2aa407629eb4c9d33f3ee0468e3851f3db97e24456475e725dfe02ebc7118ba2011d4d610ba5cea52e3921e3f
-EBUILD freenet-0.7.5_p1493.ebuild 4832 BLAKE2B 3712071bc38f8f6dd346daeef84184db469a02fce3a5c2d8b4a7704104e8f01096bc9db24fc816706ed60235c470a0556ff3b852f06906b46c27c3fcdeb3f8a6 SHA512 2c0f6ecd3a1443ff7a1e9e09862575abfb38724054d64b75f21f015c54f5ce3c3ea858b47d3da1bd819b29249d155018d3c9fcc0a932443c09918cdbbe2669f0
 EBUILD freenet-0.7.5_p1497.ebuild 6449 BLAKE2B 0938a6824d760416c7b0e3cd81116aef12cd49d039cfdeb294ea354cbde3b1b1957b583fcf3a335d9deb286b565d39f4f23b318ce117396ae6f052bfc1b18483 SHA512 99ffc43cd96d8b6be05479c093d0f155c6234fef737b284b1af0b079e64bd7f63405dba5ff76b09df0fea5476d6aaf37ad376ce646a85a7b871f76f0616a2708
 MISC metadata.xml 343 BLAKE2B 707e39491d683cb2d209ce3bb5dae43549ccef291cc72db30bbb5fecdac28cb8e5541c71fc3e23d08394db31a75048b59cb4019756adbd58ac192a209678fbaa SHA512 1c1e42b15ec4527191bed42ce236666bd9afd83189dd0cd7c4ec0e31c97e240d3a91ec7d503aafc73c24afbf25bcc56ff6e7332a2d0bef0afa4ab6ee8f9ff8ba
diff --git a/net-p2p/freenet/files/0.7.5_p1475-remove-git.patch b/net-p2p/freenet/files/0.7.5_p1475-remove-git.patch
deleted file mode 100644
index 5cebf6e948ef..000000000000
--- a/net-p2p/freenet/files/0.7.5_p1475-remove-git.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Naur a/build-clean.xml b/build-clean.xml
---- a/build-clean.xml	2016-10-10 18:26:04.056935377 +0200
-+++ b/build-clean.xml	2016-10-10 18:47:11.662036536 +0200
-@@ -59,18 +59,8 @@
- 	<assertions><enable/></assertions>
- 
- 	<!-- set version string based on git-describe -->
--	<exec executable="git" failifexecutionfails="false"
--		errorProperty="git.errror" outputproperty="git.describe" resultproperty="git.result">
--		<arg value="describe" />
--		<arg value="--always" />
--		<arg value="--abbrev=4" />
--		<arg value="--dirty" />
--	</exec>
--	<condition property="git.revision" value="${git.describe}" else="@unknown@">
--		<and>
--			<equals arg1="${git.result}" arg2="0" />
--			<isset property="git.describe" />
--		</and>
-+	<condition property="git.revision" value="@unknown@" else="@unknown@">
-+		<isset property="git.describe" />
- 	</condition>
- 
- 	<!-- =================================================================== -->
diff --git a/net-p2p/freenet/files/0.7.5_p1483-ext.patch b/net-p2p/freenet/files/0.7.5_p1483-ext.patch
deleted file mode 100644
index 5b778dd619f4..000000000000
--- a/net-p2p/freenet/files/0.7.5_p1483-ext.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/freenet/node/NodeStarter.java	2019-03-17 12:44:12.000000000 +0100
-+++ src/freenet/node/NodeStarter.java.new	2019-03-17 12:58:51.000000000 +0100
-@@ -51,8 +51,8 @@
- 	public static final String extRevisionNumber;
- 
- 	static {
--		extBuildNumber = ExtVersion.extBuildNumber();
--		extRevisionNumber = ExtVersion.extRevisionNumber();
-+		extBuildNumber = 29;
-+		extRevisionNumber = "";
- 	}
- 
- 	private FreenetFilePersistentConfig cfg;
-@@ -109,7 +109,7 @@
- 			System.out.println("Usage: $ java freenet.node.Node <configFile>");
- 			return Integer.valueOf(-1);
- 		}
--		String builtWithMessage = "freenet.jar built with freenet-ext.jar Build #" + ExtVersion.buildNumber + " r" + ExtVersion.cvsRevision+" running with ext build "+extBuildNumber+" r" + extRevisionNumber;
-+		String builtWithMessage = "freenet.jar built with freenet-ext.jar Build #" + extBuildNumber +" running with ext build "+extBuildNumber;
- 		Logger.normal(this, builtWithMessage);
- 		System.out.println(builtWithMessage);
- 
diff --git a/net-p2p/freenet/files/0.7.5_p1491-update-for-jna-5.x.patch b/net-p2p/freenet/files/0.7.5_p1491-update-for-jna-5.x.patch
deleted file mode 100644
index 788a48040b17..000000000000
--- a/net-p2p/freenet/files/0.7.5_p1491-update-for-jna-5.x.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 830b4bb3948bd69fbd9b10001940f1775051114a Mon Sep 17 00:00:00 2001
-From: Yuan Liao <liaoyuan@gmail.com>
-Date: Sun, 23 Jan 2022 10:09:17 -0800
-Subject: [PATCH] Replace Pointer.SIZE with Native.POINTER_SIZE for JNA 5.x
-
-This patch is backward compatible with JNA 4.x because
-Native.POINTER_SIZE is present in both 4.x and 5.x.
-
-Bug: https://github.com/kaitoy/pcap4j/issues/191
-Bug: https://bugs.gentoo.org/830847
-Signed-off-by: Yuan Liao <liaoyuan@gmail.com>
----
- src/freenet/io/comm/UdpSocketHandler.java | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/freenet/io/comm/UdpSocketHandler.java b/src/freenet/io/comm/UdpSocketHandler.java
-index 0cd975f16..c004613a9 100644
---- a/src/freenet/io/comm/UdpSocketHandler.java
-+++ b/src/freenet/io/comm/UdpSocketHandler.java
-@@ -120,7 +120,7 @@ public class UdpSocketHandler implements PrioRunnable, PacketSocketHandler, Port
- 			    return false;
- 			int ret = -1;
- 			try {
--			    ret = socketOptionsHolder.setsockopt(fd, SOCKET_level.IPPROTO_IPV6.linux, p.option_name.linux, new IntByReference(p.linux).getPointer(), Pointer.SIZE);
-+			    ret = socketOptionsHolder.setsockopt(fd, SOCKET_level.IPPROTO_IPV6.linux, p.option_name.linux, new IntByReference(p.linux).getPointer(), Native.POINTER_SIZE);
- 			} catch(Exception e) { Logger.normal(UdpSocketHandler.class, e.getMessage(),e); } //if it fails that's fine
- 			return (ret == 0 ? true : false);
- 		}
--- 
-2.34.1
-
diff --git a/net-p2p/freenet/files/build-clean.xml b/net-p2p/freenet/files/build-clean.xml
deleted file mode 100644
index 89698df2675f..000000000000
--- a/net-p2p/freenet/files/build-clean.xml
+++ /dev/null
@@ -1,421 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="freenet" default="package" basedir=".">
-	<description>
-Freenet is free software that lets you publish and retrieve information without
-fear of censorship. To achieve this, the network is entirely decentralized, and
-all actions are anonymous. Without anonymity, there can never be true freedom
-of speech, and without decentralization the network would be vulnerable to attack.
-
-This file is to build Freenet entirely from source. The builder is responsible
-for satisfying all library dependencies, e.g. via override.properties. Package
-maintainers may prefer to use this instead of build.xml.
-	</description>
-
-	<!-- =================================================================== -->
-	<!-- Global properties                                                   -->
-	<!-- =================================================================== -->
-
-	<!-- user overrides (properties are immutable, so set overrides first) -->
-	<property file="override.properties"/>
-	<property file="build.properties"/>
-	<property file="dependencies.properties"/>
-
-	<property name="version.src" value="freenet/node/Version.java" />
-	<property name="version.make" value="freenet/node/Version.class" />
-
-	<path id="lib.path">
-		<fileset dir="${lib.contrib.dir}" includes="${lib.contrib.jars}"/>
-		<fileset dir="${lib.dir}" includes="${lib.jars}"/>
-		<fileset dir="/usr/share/java" includes="${lib.jars}" erroronmissingdir="false"/>
-	</path>
-	<path id="libtest.path">
-		<path refid="lib.path"/>
-		<fileset dir="${lib.dir}" includes="${libtest.jars}"/>
-		<fileset dir="/usr/share/java" includes="${libtest.jars}" erroronmissingdir="false"/>
-		<pathelement path="${main.make}"/>
-		<pathelement path="${test.make}"/>
-	</path>
-
-	<property name="gjs.dst" value="${main.src}/freenet/clients/http/staticfiles/freenetjs"/>
-	<property name="gjs.dir" value="generator/js"/>
-	<path id="gjs.lib.path">
-		<fileset dir="${gjs.dir}" includes="lib/*.jar"/>
-		<pathelement location="${gjs.dir}/war/WEB-INF/classes"/>
-		<fileset dir="${lib.dir}" includes="${gjs.lib.jars}"/>
-	</path>
-
-	<path id="pmd.classpath">
-		<fileset dir="${pmd.dir}" erroronmissingdir="false" includes="lib/*.jar"/>
-	</path>
-
-	<property environment="env"/>
-	<property name="keystore" value="${env.jarsignerStoreLocation}"/>
-	<property name="keystore_alias" value="${env.jarsignerAlias}"/>
-	<property name="keystore_pass" value="${env.jarsignerStorePassword}"/>
-	<property name="key_pass" value="${env.jarsignerCodeSigningKeyPassword}"/>
-
-	<property name="jar.dst" value="${main.dst}/freenet.jar"/>
-
-	<assertions><enable/></assertions>
-
-	<!-- set version string based on git-describe -->
-	<exec executable="git" failifexecutionfails="false"
-		errorProperty="git.errror" outputproperty="git.describe" resultproperty="git.result">
-		<arg value="describe" />
-		<arg value="--always" />
-		<arg value="--abbrev=4" />
-		<arg value="--dirty" />
-	</exec>
-	<condition property="git.revision" value="${git.describe}" else="@unknown@">
-		<and>
-			<equals arg1="${git.result}" arg2="0" />
-			<isset property="git.describe" />
-		</and>
-	</condition>
-
-	<!-- =================================================================== -->
-	<!-- Miscellaneous                                                       -->
-	<!-- =================================================================== -->
-
-	<target name="dist" depends="clean-all, all" description="clean-build everything"/>
-
-	<target name="sign" description="Sign the distribution" depends="package">
-		<echo message="Signing the distribution"/>
-		<signjar jar="${jar.dst}" strict="false" tsaurl="http://timestamp.comodoca.com/rfc3161" alias="${keystore_alias}" keystore="${keystore}" storepass="${keystore_pass}" keypass="${key_pass}" sigalg="SHA256withRSA" digestalg="SHA-256"/>
-		<!-- TODO: Should have strict="true", but it was introduced in Java 7, which we cannot yet require. -->
-		<verifyjar jar="${jar.dst}" alias="${keystore_alias}" keystore="${keystore}" storepass="${keystore_pass}" keypass="${key_pass}"/>
-	</target>
-
-	<target name="all" depends="package, doc, findbugs, pmd, cpd" description="build everything, incl. docs, GWT js"/>
-
-	<target name="clean-all" depends="clean, clean-doc, clean-gjs" description="clean all build products, incl. docs, GWT js"/>
-
-	<target name="help" description="display help on parameters">
-		<echo message="For main build targets, see `ant -p`"/>
-		<echo message=""/>
-		<echo message="Test parameters (-Dtest.PARAM=true)"/>
-		<echo message="  skip        Skip all tests"/>
-		<echo message="  verbose     Report additional information"/>
-		<echo message="  benchmark   Run benchmark tests"/>
-		<echo message="  extensive   Run extensive tests"/>
-		<echo message=""/>
-		<echo message="Misc parameters (-DPARAM=VALUE)"/>
-		<echo message="  javac.args  Command line arguments to pass to javac"/>
-		<echo message=""/>
-	</target>
-
-	<target name="findbugs" depends="package" unless="${findbugs.skip}">
-		<antcall target="libdep-findbugs"/>
-		<echo message="Running Findbugs"/>
-		<taskdef name="findbugs" classname="edu.umd.cs.findbugs.anttask.FindBugsTask" classpath="${findbugs.path}"/>
-
-		<findbugs home="${findbugs.dir}"
-		output="xml"
-		outputFile="${test.dst}/findbugs.xml"
-		warningsProperty="findbugs.module.warnings"
-		failOnError="true"
-		jvmargs="-Xmx1536m -XX:MaxPermSize=384m -XX:ReservedCodeCacheSize=128m" >
-		<auxClasspath refid="lib.path" />
-		<sourcePath path="${main.src}" />
-		<class location="${jar.dst}" />
-		</findbugs>
-	</target>
-
-	<target name="pmd" depends="package" unless="${pmd.skip}">
-		<antcall target="libdep-pmd"/>
-		<echo message="Running PMD"/>
-		<taskdef name="pmd" classname="net.sourceforge.pmd.ant.PMDTask" classpathref="pmd.classpath"/>
-		<pmd rulesetfiles="rulesets/java/design.xml" encoding="utf-8">
-			<formatter type="xml" toFile="${test.dst}/pmd.xml"/>
-			<fileset dir="${main.src}">
-				<include name="**/*.java"/>
-			</fileset>
-		</pmd>
-	</target>
-
-	<target name="cpd" depends="package" unless="${cpd.skip}">
-		<antcall target="libdep-cpd"/>
-		<echo message="Running CPD"/>
-		<taskdef name="cpd" classname="net.sourceforge.pmd.cpd.CPDTask" classpathref="pmd.classpath"/>
-		<cpd minimumTokenCount="100" format="xml" outputFile="${test.dst}/cpd.xml">
-			<fileset dir="${main.src}">
-				<include name="**/*.java"/>
-			</fileset>
-		</cpd>	
-	</target>
-
-	<target name="debug">
-		<echoproperties/>
-	</target>
-
-	<!-- =================================================================== -->
-	<!-- Library dependencies                                                -->
-	<!-- =================================================================== -->
-
-	<!--
-	currently we only check for the most common cases of missing libraries.
-	this does result in less clear error messages for more obscure setups, e.g.
-	if you have debian's gwt-dev.jar but not commons-collections3.jar. however,
-	to cover all scenarios would be a pain.
-	-->
-
-	<target name="env">
-		<available property="lib.contrib.present" classname="freenet.node.ExtVersion" classpathref="lib.path"/>
-		<available property="lib.bouncycastle.present" classname="org.bouncycastle.crypto.signers.HMacDSAKCalculator" classpathref="lib.path"/>
-		<available property="lib.junit.present" classname="org.junit.runners.JUnit4" classpathref="libtest.path"/>
-		<available property="lib.hamcrest.present" classname="org.hamcrest.SelfDescribing" classpathref="libtest.path"/>
-		<available property="lib.findbugs.present" classname="edu.umd.cs.findbugs.anttask.FindBugsTask" classpath="${findbugs.path}"/>
-		<available property="lib.pmd.present" classname="net.sourceforge.pmd.ant.PMDTask" classpathref="pmd.classpath"/>
-		<available property="lib.cpd.present" classname="net.sourceforge.pmd.cpd.CPDTask" classpathref="pmd.classpath"/>
-		<available property="gjs.lib.gwt-user.present" classname="com.google.gwt.user.client.Window" classpathref="gjs.lib.path"/>
-		<available property="gjs.lib.gwt-dev.present" classname="com.google.gwt.dev.About" classpathref="gjs.lib.path"/>
-		<condition property="gjs.lib.gwt.present">
-			<and>
-				<isset property="gjs.lib.gwt-user.present"/>
-				<isset property="gjs.lib.gwt-dev.present"/>
-			</and>
-		</condition>
-	</target>
-
-	<target name="libdep-ext" depends="env" unless="lib.contrib.present">
-		<fail message="freenet-ext not available"/>
-	</target>
-
-	<target name="libdep-bc" depends="env" unless="lib.bouncycastle.present">
-		<fail message="Bouncycastle not available (or not recent enough); try https://www.bouncycastle.org/download/${bc.jar}"/>
-	</target>
-
-	<target name="libdep-junit" depends="env" unless="lib.junit.present">
-		<fail message="JUnit4 not available"/>
-	</target>
-
-	<target name="libdep-hamcrest" depends="env" unless="lib.hamcrest.present">
-		<fail message="Hamcrest-core not available"/>
-	</target>
-
-	<target name="libdep-findbugs" depends="env" unless="lib.findbugs.present">
-		<fail message="findbugs not available"/>
-	</target>
-
-	<target name="libdep-pmd" depends="env" unless="lib.pmd.present">
-		<fail message="PMD not available"/>
-	</target>
-
-	<target name="libdep-cpd" depends="env" unless="lib.cpd.present">
-		<fail message="CPD not available"/>
-	</target>
-
-	<target name="libdep-gwt-user" depends="env" unless="gjs.lib.gwt-user.present">
-		<fail message="GWT-user not present"/>
-	</target>
-
-	<target name="libdep-gwt-dev" depends="env" unless="gjs.lib.gwt-dev.present">
-		<fail message="GWT-dev not present"/>
-	</target>
-
-	<!-- =================================================================== -->
-	<!-- Standard build                                                      -->
-	<!-- =================================================================== -->
-
-	<target name="init">
-		<mkdir dir="${main.make}"/>
-		<mkdir dir="${main.dst}"/>
-		<mkdir dir="${test.make}"/>
-		<mkdir dir="${test.dst}"/>
-	</target>
-
-	<target name="dep" depends="ensure-ext, ensure-bc, ensure-gjs"/>
-
-	<target name="check-version-file">
-		<uptodate property="version.uptodate"
-		  targetfile="${main.make}/${version.src}"
-		  srcfile="${main.src}/${version.src}"/>
-	</target>
-
-	<target name="build-version-file" depends="check-version-file" unless="version.uptodate">
-		<!-- Create the Version file with patched revision number in ${main.make} -->
-		<copy file="${main.src}/${version.src}" tofile="${main.make}/${version.src}" overwrite="true" />
-		<delete file="${main.make}/${version.make}" quiet="true" />
-		<replace file="${main.make}/${version.src}">
-			<replacefilter token="@custom@" value="${git.revision}"/>
-		</replace>
-		<echo message="Updated build version to ${git.revision} in ${main.make}/${version.src}"/>
-	</target>
-
-	<target name="build" depends="init, dep, build-version-file">
-		<!-- Create the time stamp -->
-		<tstamp/>
-		<!-- Create the build directory structure used by compile -->
-		<javac srcdir="${main.src}" destdir="${main.make}" debug="on" source="1.7" target="1.7" includeAntRuntime="false" encoding="UTF-8">
-			<compilerarg line="${javac.args}"/>
-			<classpath refid="lib.path"/>
-			<!-- tell javac to find Version.java in ${main.make}, not ${main.src} -->
-			<sourcepath><pathelement path="${main.make}"/></sourcepath>
-			<!-- following a very temporary list of files to be build -->
-			<include name="**/*.java"/>
-			<exclude name="**/package-info.java"/>
-			<exclude name="${version.src}"/>
-		</javac>
-
-		<!-- Force compile of Version.java in case compile of ${main.src} didn't trigger it -->
-		<javac srcdir="${main.make}" destdir="${main.make}" debug="on" source="1.7" target="1.7" includeAntRuntime="false" encoding="UTF-8">
-			<compilerarg line="${javac.args}"/>
-			<classpath refid="lib.path"/>
-			<include name="${version.src}"/>
-		</javac>
-
-		<!-- Copy web interface static files to the build dir -->
-		<copy todir="${main.make}/freenet/clients/http/staticfiles">
-			<fileset dir="${main.src}/freenet/clients/http/staticfiles"/>
-		</copy>
-		<!-- Copy translation files to the build dir -->
-		<copy todir="${main.make}/freenet/l10n">
-			<fileset dir="${main.src}/freenet/l10n">
-				<include name="freenet.l10n.*.properties"/>
-				<include name="iso-*.tab"/>
-			</fileset>
-		</copy>
-		<!-- Copy the dependencies.properties file -->
-		<copy todir="${main.make}" file="dependencies.properties"/>
-	</target>
-
-	<target name="package-only" depends="build">
-		<property name="lib.contrib.loc" location="${lib.contrib.dir}" />
-		<property name="lib.loc" location="${lib.dir}" />
-		<pathconvert property="lib.jars.package" refid="lib.path" pathsep=" ">
-			<map from="${lib.contrib.loc}/" to=""/>
-			<map from="${lib.loc}/" to=""/>
-		</pathconvert>
-		<jar jarfile="${jar.dst}" basedir="${main.make}">
-			<manifest>
-				<attribute name="Permissions" value="all-permissions"/>
-				<attribute name="Application-Name" value="Freenet REference Daemon"/>
-
-				<attribute name="Required-Ext-Version" value="29"/>
-				<attribute name="Recommended-Ext-Version" value="29"/>
-				<section name="common">
-					<attribute name="Specification-Title" value="Freenet"/>
-					<attribute name="Specification-Version" value="0.7.5"/>
-					<attribute name="Specification-Vendor" value="freenetproject.org"/>
-					<attribute name="Implementation-Title" value="Freenet"/>
-					<attribute name="Implementation-Version" value="0.7.5 ${git.revision}"/>
-					<attribute name="Implementation-Vendor" value="freenetproject.org"/>
-				</section>
-			</manifest>
-			<exclude name="${version.src}"/>
-		</jar>
-	</target>
-
-	<target name="package" depends="unit, package-only" description="build standard binary packages (Freenet daemon)"/>
-
-	<target name="unit-build" depends="build" unless="${test.skip}">
-		<antcall target="libdep-junit"/>
-		<antcall target="libdep-hamcrest"/>
-		<javac srcdir="${test.src}" destdir="${test.make}" debug="on" source="1.7" target="1.7" includeAntRuntime="false" encoding="UTF-8">
-			<compilerarg line="${javac.args}"/>
-			<classpath refid="libtest.path"/>
-			<include name="**/*.java"/>
-			<exclude name="*.java"/>
-		</javac>
-		<copy todir="${test.make}/freenet/client/filter/png" overwrite="true">
-			<fileset dir="${test.src}/freenet/client/filter/png"/>
-		</copy>
-		<copy todir="${test.make}/freenet/client/filter/bmp" overwrite="true">
-			<fileset dir="${test.src}/freenet/client/filter/bmp"/>
-		</copy>
-		<copy todir="${test.make}/freenet/client/filter/mp3" overwrite="true">
-			<fileset dir="${test.src}/freenet/client/filter/mp3"/>
-		</copy>
-		<copy todir="${test.make}/freenet/client/filter/gif" overwrite="true">
-			<fileset dir="${test.src}/freenet/client/filter/gif"/>
-		</copy>
-		<copy todir="${test.make}/freenet/crypt/ciphers/rijndael-gladman-test-data" overwrite="true">
-			<fileset dir="${test.src}/freenet/crypt/ciphers/rijndael-gladman-test-data"/>
-		</copy>
-		<copy todir="${test.make}/freenet/l10n" overwrite="true">
-			<fileset dir="${test.src}/freenet/l10n" includes="*.properties"/>
-		</copy>
-	</target>
-
-	<target name="unit" depends="unit-build" unless="${test.skip}">
-		<junit printsummary="yes" haltonfailure="${test.haltonfailure}" logfailedtests="yes" showoutput="yes" filtertrace="no" fork="on" forkmode="perTest" maxmemory="256m" dir="${test.dst}">
-			<classpath refid="libtest.path"/>
-			<formatter type="plain" usefile="false"/>
-			<formatter type="xml" if="${test.xml_output}"/>
-			<formatter classname="org.apache.tools.ant.taskdefs.optional.junit.TearDownOnVmCrash" usefile="false"/>
-			<test if="test.class" name="${test.class}" todir="${test.dst}"/>
-			<batchtest unless="test.class" fork="yes" todir="${test.dst}">
-				<fileset dir="${test.make}" includes="**/*Test.class"/>
-			</batchtest>
-			<sysproperty key="test.verbose" value="${test.verbose}"/>
-			<sysproperty key="test.benchmark" value="${test.benchmark}"/>
-			<sysproperty key="test.extensive" value="${test.extensive}"/>
-			<!-- TODO source needs to be edited too; the old variables were "benchmark" and "extensiveTesting" -->
-			<assertions><enable/></assertions>
-		</junit>
-	</target>
-
-	<target name="clean" description="clean standard build products">
-		<delete dir="${main.make}"/>
-		<delete dir="${main.dst}"/>
-		<delete dir="${test.make}"/>
-		<delete dir="${test.dst}"/>
-	</target>
-
-	<!-- =================================================================== -->
-	<!-- Dependencies (contrib, ie. freenet-ext.jar)                         -->
-	<!-- =================================================================== -->
-
-	<target name="ensure-ext" depends="libdep-ext">
-		<!-- clean build does nothing, since this is external library. -->
-	</target>
-
-	<target name="ensure-bc" depends="libdep-bc">
-		<!-- clean build does nothing, since this is external library. -->
-	</target>
-
-	<!-- =================================================================== -->
-	<!-- Generate GWT code                                                   -->
-	<!-- =================================================================== -->
-
-	<target name="env-gjs">
-		<available property="gjs.present" file="${gjs.dst}" type="dir"/>
-	</target>
-
-	<target name="ensure-gjs" depends="env-gjs" unless="gjs.present">
-		<antcall target="build-gjs"/>
-	</target>
-
-	<target name="build-gjs" depends="libdep-gwt-user, libdep-gwt-dev">
-		<ant antfile="build.xml" dir="${gjs.dir}">
-			<reference refid="gjs.lib.path" torefid="project.class.path"/>
-		</ant>
-	</target>
-
-	<target name="clean-gjs">
-		<ant antfile="build.xml" dir="${gjs.dir}" target="deleteGenerated"/>
-	</target>
-
-	<!-- =================================================================== -->
-	<!-- Documentation                                                       -->
-	<!-- =================================================================== -->
-
-	<target name="init-doc" unless="${doc.skip}">
-		<mkdir dir="${doc.api}"/>
-	</target>
-
-	<target name="javadoc" depends="init-doc, dep" unless="${doc.skip}">
-		<javadoc classpathref="lib.path" sourcepath="${main.src}" destdir="${doc.api}" use="true">
-			<link href="http://docs.oracle.com/javase/6/docs/api/"/>
-		</javadoc>
-	</target>
-
-	<target name="doc" depends="javadoc" description="build documentation">
-		<!-- currently freenet has no other documentation apart from javadocs -->
-	</target>
-
-	<target name="clean-doc" unless="${doc.skip}">
-		<delete dir="${doc.api}"/>
-	</target>
-
-</project>
diff --git a/net-p2p/freenet/files/build.properties b/net-p2p/freenet/files/build.properties
deleted file mode 100644
index 21fecf30c803..000000000000
--- a/net-p2p/freenet/files/build.properties
+++ /dev/null
@@ -1,95 +0,0 @@
-##
-# Properties you can set to affect the build process.
-#
-# This file contains default values that are checked-in to version control.
-#
-# End users should not edit this file to set machine-specific properties;
-# instead, create a new file called override.properties and set them there.
-#
-
-################################################################################
-## build files/directories
-
-main.src=src
-main.make=build/main
-main.dst=dist
-
-test.src=test
-test.make=build/test
-test.dst=run
-
-doc.src=doc
-doc.dst=javadoc
-doc.api=javadoc
-
-################################################################################
-## external dependencies
-
-# dir for common library jars
-lib.dir = lib
-
-# dir for freenet library jars (aka freenet-ext or "contrib" jars)
-lib.contrib.dir = lib/freenet
-## if you use the git submodule in ./contrib (legacy-27 branch)
-## by running `git submodule init && git submodule update`
-## contrib.ant is needed for the old legacy layout
-#lib.contrib.dir = contrib/freenet_ext
-#contrib.ant = ${lib.contrib.dir}/build.xml
-## if you clone the contrib package separately (master branch)
-#lib.contrib.dir = ../contrib/freenet-ext/dist
-
-# dir that freenet library jars will be installed to, relative to freenet.jar
-lib.contrib.dir.rel = freenet
-
-# jars from ${lib.dir} to use
-bc.jar = bcprov-jdk15on-154.jar
-lib.jars = ${bc.jar}
-#lib.jars = wrapper.jar db-je.jar bdb-je.jar commons-compress.jar
-
-# jars from ${lib.dir} to use, for tests
-libtest.jars = junit4.jar hamcrest-core.jar
-
-# jars from ${lib.contrib.dir} to use
-lib.contrib.jars = freenet-ext.jar bitcollider-core.jar db4o.jar lzmajio.jar mantissa.jar \
- wrapper.jar db-je.jar bdb-je.jar commons-compress.jar
-
-# jars from ${lib.dir} to use, for compiling GWT javascript
-gjs.lib.jars = null
-#gjs.lib.jars = gwt-dev-linux.jar gwt-dev-windows.jar gwt-dev.jar gwt-user.jar \
-# commons-collections3.jar ant.jar eclipse-ecj.jar
-
-findbugs.dir = findbugs
-findbugs.path = ${findbugs.dir}/lib/findbugs-ant.jar
-
-pmd.dir =
-################################################################################
-## build tool options
-
-# Javac
-javac.args=-Xlint -Xlint:-deprecation
-
-# Test properties
-test.skip=false
-test.verbose=false
-test.benchmark=false
-test.extensive=false
-test.xml_output=true
-test.haltonfailure=yes
-
-# select a single test to run
-#test.class=
-
-# Build javadoc
-doc.skip=false
-
-# Run findbugs
-findbugs.skip=false
-pmd.skip=false
-cpd.skip=false
-
-################################################################################
-## misc options
-
-# Hack around property expansion not featured in ant <= 1.7.1
-# see http://ant.apache.org/manual/properties.html#if+unless
-true=true
diff --git a/net-p2p/freenet/files/freenet-0.7.5_p1474-wrapper.conf b/net-p2p/freenet/files/freenet-0.7.5_p1474-wrapper.conf
deleted file mode 100644
index 7ec6cd01bcad..000000000000
--- a/net-p2p/freenet/files/freenet-0.7.5_p1474-wrapper.conf
+++ /dev/null
@@ -1,27 +0,0 @@
-wrapper.java.command=java
-wrapper.working.dir=/var/freenet/
-wrapper.java.mainclass=freenet.node.NodeStarter
-wrapper.java.library.path.1=/usr/lib
-wrapper.java.initmemory=60
-wrapper.java.maxmemory=1024
-wrapper.java.additional.1=-Dnetworkaddress.cache.ttl=0
-wrapper.java.additional.2=-Dnetworkaddress.cache.negative.ttl=0
-wrapper.java.additional.3=-enableassertions:freenet
-# You might want to set the following line if you have changed java.maxmemory
-wrapper.java.additional.4=-XX:MaxPermSize=1024M
-
-wrapper.app.parameter.1=freenet.ini
-wrapper.console.format=PM
-wrapper.console.loglevel=INFO
-wrapper.logfile=wrapper.log
-wrapper.logfile.format=LPTM
-wrapper.logfile.loglevel=INFO
-wrapper.logfile.maxsize=2M
-wrapper.logfile.maxfiles=3
-wrapper.syslog.loglevel=NONE
-wrapper.console.title=Freenet 0.7
-wrapper.jvm_exit.timeout=120
-wrapper.restart.reload_configuration=TRUE
-wrapper.filter.trigger.1=java.lang.OutOfMemoryError
-wrapper.filter.action.1=RESTART
-
diff --git a/net-p2p/freenet/files/freenet.initd b/net-p2p/freenet/files/freenet.initd
deleted file mode 100755
index 75e957e579cc..000000000000
--- a/net-p2p/freenet/files/freenet.initd
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-start() {
-	start-stop-daemon --start --user freenet --chdir /var/freenet/ --background --stdout=/var/freenet/freenet.log --stderr=/var/freenet/freenet.log --make-pidfile --pidfile=/var/run/freenet.pid --name freenet --exec java -- -cp $classpath $additional_options $configurable_options $target
-}
-
-stop() {
-	start-stop-daemon --stop --user freenet --pidfile=/var/run/freenet.pid
-}
diff --git a/net-p2p/freenet/freenet-0.7.5_p1491-r1.ebuild b/net-p2p/freenet/freenet-0.7.5_p1491-r1.ebuild
deleted file mode 100644
index 5205069d8205..000000000000
--- a/net-p2p/freenet/freenet-0.7.5_p1491-r1.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2 systemd
-
-DESCRIPTION="An encrypted network without censorship"
-HOMEPAGE="https://freenetproject.org/"
-#	https://github.com/${PN}/seedrefs/archive/build0${PV#*p}.zip -> seednodes-${PV}.zip
-SRC_URI="
-	https://github.com/${PN}/fred/archive/build0${PV#*p}.zip -> ${P}.zip
-	https://github.com/${PN}/seedrefs/archive/build01480.zip -> seednodes-0.7.5_p1480.zip
-	mirror://gentoo/freenet-ant-1.7.1.jar"
-
-LICENSE="GPL-2+ GPL-2 MIT BSD-2 Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="+nss test"
-
-CDEPEND="dev-java/bcprov:0
-	dev-java/commons-compress:0
-	dev-java/fec:0
-	dev-java/java-service-wrapper:0
-	dev-java/jbitcollider-core:0
-	dev-java/jna:4
-	dev-java/lzma:0
-	dev-java/lzmajio:0
-	dev-java/mersennetwister:0
-	nss? ( dev-libs/nss )"
-
-DEPEND="
-	app-arch/unzip
-	>=virtual/jdk-1.8
-	${CDEPEND}
-	test? (
-		dev-java/junit:0
-		dev-java/ant-junit:0
-	)
-	dev-java/ant-core:0"
-
-RDEPEND="
-	>=virtual/jre-1.8
-	net-libs/nativebiginteger:0
-	${CDEPEND}
-	acct-user/freenet
-	acct-group/freenet"
-
-PDEPEND="net-libs/NativeThread:0"
-
-JAVA_PKG_BSFIX_NAME+=" build-clean.xml"
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-JAVA_ANT_CLASSPATH_TAGS+=" javadoc"
-JAVA_ANT_ENCODING="utf8"
-
-EANT_BUILD_TARGET="package"
-EANT_TEST_TARGET="unit"
-EANT_BUILD_XML="build-clean.xml"
-EANT_GENTOO_CLASSPATH="bcprov,commons-compress,fec,java-service-wrapper,jbitcollider-core,jna-4,lzma,lzmajio,mersennetwister"
-EANT_EXTRA_ARGS="-Dsuppress.gjs=true -Dlib.contrib.present=true -Dlib.bouncycastle.present=true -Dlib.junit.present=true -Dtest.skip=true"
-
-S="${WORKDIR}/fred-build0${PV#*p}"
-
-RESTRICT="test" # they're broken in the last release.
-
-pkg_setup() {
-	has_version dev-java/icedtea[cacao] && {
-		ewarn "dev-java/icedtea was built with cacao USE flag."
-		ewarn "freenet may compile with it, but it will refuse to run."
-		ewarn "Please remerge dev-java/icedtea without cacao USE flag,"
-		ewarn "if you plan to use it for running freenet."
-	}
-	java-pkg-2_pkg_setup
-}
-
-src_unpack() {
-#	unpack ${P}.zip seednodes-${PV}.zip
-	unpack ${P}.zip seednodes-0.7.5_p1480.zip
-}
-
-src_prepare() {
-#	cat "${WORKDIR}"/seedrefs-build0${PV#*p}/* > "${S}"/seednodes.fref
-	cat "${WORKDIR}"/seedrefs-build01480/* > "${S}"/seednodes.fref
-	cp "${FILESDIR}"/freenet-0.7.5_p1491-wrapper.conf freenet-wrapper.conf || die
-	cp "${FILESDIR}"/run.sh-20090501 run.sh || die
-	cp "${FILESDIR}"/build-clean.xml build-clean.xml || die
-	cp "${FILESDIR}"/build.properties build.properties || die
-
-	eapply -p1 "${FILESDIR}/"0.7.5_p1491-update-for-jna-5.x.patch
-	eapply -p0 "${FILESDIR}"/0.7.5_p1483-ext.patch
-	eapply -p1 "${FILESDIR}/"0.7.5_p1475-remove-git.patch
-
-	sed -i -e "s:=/usr/lib:=/usr/$(get_libdir):g" \
-		freenet-wrapper.conf || die "sed failed"
-
-	echo "wrapper.java.classpath.1=/usr/share/freenet/lib/freenet.jar" >> freenet-wrapper.conf || die
-	if use nss; then
-		echo "wrapper.java.additional.6=-Dfreenet.jce.use.NSS=true" >> freenet-wrapper.conf || die
-	fi
-	local i=2 pkg jars jar
-	local ifs_original=${IFS}
-	IFS=","
-	for pkg in ${EANT_GENTOO_CLASSPATH} ; do
-		jars="$(java-pkg_getjars ${pkg})"
-		for jar in ${jars} ; do
-			echo "wrapper.java.classpath.$((i++))=${jar}" >> freenet-wrapper.conf || die
-		done
-	done
-	IFS=${ifs_original}
-	echo "wrapper.java.classpath.$((i++))=/usr/share/freenet/lib/ant.jar" >> freenet-wrapper.conf || die
-	echo "wrapper.java.library.path.2=/usr/$(get_libdir)/java-service-wrapper" >> freenet-wrapper.conf || die
-	echo "wrapper.java.library.path.3=/usr/$(get_libdir)/jna-4" >> freenet-wrapper.conf || die
-
-	cp "${DISTDIR}"/freenet-ant-1.7.1.jar lib/ant.jar || die
-	eapply_user
-}
-
-EANT_TEST_EXTRA_ARGS="-Dtest.skip=false"
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_dojar dist/freenet.jar
-	java-pkg_newjar "${DISTDIR}"/freenet-ant-1.7.1.jar ant.jar
-
-	if has_version =sys-apps/baselayout-2*; then
-		doinitd "${FILESDIR}"/freenet
-	else
-		newinitd "${FILESDIR}"/freenet.old freenet
-	fi
-
-	systemd_dounit "${FILESDIR}"/freenet.service
-
-	dodoc AUTHORS
-	newdoc README.md README
-	insinto /etc
-	doins freenet-wrapper.conf
-	insinto /var/freenet
-	doins run.sh seednodes.fref
-	fperms +x /var/freenet/run.sh
-	use doc && java-pkg_dojavadoc javadoc
-	use source && java-pkg_dosrc src
-}
-
-pkg_postinst() {
-	elog " "
-	elog "1. Start freenet with /etc/init.d/freenet start."
-	elog "2. Open localhost:8888 in your browser for the web interface."
-	#workaround for previously existing freenet user
-	[[ $(stat --format="%U" /var/freenet) == "freenet" ]] || chown \
-		freenet:freenet /var/freenet
-}
-
-pkg_postrm() {
-	if ! [[ -e /usr/share/freenet/lib/freenet.jar ]] ; then
-		elog " "
-		elog "If you dont want to use freenet any more"
-		elog "and dont want to keep your identity/other stuff"
-		elog "remember to do 'rm -rf /var/freenet' to remove everything"
-	fi
-}
diff --git a/net-p2p/freenet/freenet-0.7.5_p1491.ebuild b/net-p2p/freenet/freenet-0.7.5_p1491.ebuild
deleted file mode 100644
index 9c2352f70072..000000000000
--- a/net-p2p/freenet/freenet-0.7.5_p1491.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2 systemd
-
-DESCRIPTION="An encrypted network without censorship"
-HOMEPAGE="https://freenetproject.org/"
-#	https://github.com/${PN}/seedrefs/archive/build0${PV#*p}.zip -> seednodes-${PV}.zip
-SRC_URI="
-	https://github.com/${PN}/fred/archive/build0${PV#*p}.zip -> ${P}.zip
-	https://github.com/${PN}/seedrefs/archive/build01480.zip -> seednodes-0.7.5_p1480.zip
-	mirror://gentoo/freenet-ant-1.7.1.jar"
-
-LICENSE="GPL-2+ GPL-2 MIT BSD-2 Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+nss test"
-
-CDEPEND="dev-java/bcprov:0
-	dev-java/commons-compress:0
-	dev-java/fec:0
-	dev-java/java-service-wrapper:0
-	dev-java/jbitcollider-core:0
-	dev-java/jna:4
-	dev-java/lzma:0
-	dev-java/lzmajio:0
-	dev-java/mersennetwister:0
-	nss? ( dev-libs/nss )"
-
-DEPEND="
-	app-arch/unzip
-	>=virtual/jdk-1.8
-	${CDEPEND}
-	test? (
-		dev-java/junit:0
-		dev-java/ant-junit:0
-	)
-	dev-java/ant-core:0"
-
-RDEPEND="
-	>=virtual/jre-1.8
-	net-libs/nativebiginteger:0
-	${CDEPEND}
-	acct-user/freenet
-	acct-group/freenet"
-
-PDEPEND="net-libs/NativeThread:0"
-
-JAVA_PKG_BSFIX_NAME+=" build-clean.xml"
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-JAVA_ANT_CLASSPATH_TAGS+=" javadoc"
-JAVA_ANT_ENCODING="utf8"
-
-EANT_BUILD_TARGET="package"
-EANT_TEST_TARGET="unit"
-EANT_BUILD_XML="build-clean.xml"
-EANT_GENTOO_CLASSPATH="bcprov,commons-compress,fec,java-service-wrapper,jbitcollider-core,jna-4,lzma,lzmajio,mersennetwister"
-EANT_EXTRA_ARGS="-Dsuppress.gjs=true -Dlib.contrib.present=true -Dlib.bouncycastle.present=true -Dlib.junit.present=true -Dtest.skip=true"
-
-S="${WORKDIR}/fred-build0${PV#*p}"
-
-RESTRICT="test" # they're broken in the last release.
-
-pkg_setup() {
-	has_version dev-java/icedtea[cacao] && {
-		ewarn "dev-java/icedtea was built with cacao USE flag."
-		ewarn "freenet may compile with it, but it will refuse to run."
-		ewarn "Please remerge dev-java/icedtea without cacao USE flag,"
-		ewarn "if you plan to use it for running freenet."
-	}
-	java-pkg-2_pkg_setup
-}
-
-src_unpack() {
-#	unpack ${P}.zip seednodes-${PV}.zip
-	unpack ${P}.zip seednodes-0.7.5_p1480.zip
-}
-
-src_prepare() {
-#	cat "${WORKDIR}"/seedrefs-build0${PV#*p}/* > "${S}"/seednodes.fref
-	cat "${WORKDIR}"/seedrefs-build01480/* > "${S}"/seednodes.fref
-	cp "${FILESDIR}"/freenet-0.7.5_p1474-wrapper.conf freenet-wrapper.conf || die
-	cp "${FILESDIR}"/run.sh-20090501 run.sh || die
-	cp "${FILESDIR}"/build-clean.xml build-clean.xml || die
-	cp "${FILESDIR}"/build.properties build.properties || die
-
-	eapply -p0 "${FILESDIR}"/0.7.5_p1483-ext.patch
-	eapply -p1 "${FILESDIR}/"0.7.5_p1475-remove-git.patch
-
-	sed -i -e "s:=/usr/lib:=/usr/$(get_libdir):g" \
-		freenet-wrapper.conf || die "sed failed"
-
-	echo "wrapper.java.classpath.1=/usr/share/freenet/lib/freenet.jar" >> freenet-wrapper.conf || die
-	if use nss; then
-		echo "wrapper.java.additional.5=-Dfreenet.jce.use.NSS=true" >> freenet-wrapper.conf || die
-	fi
-	local i=2 pkg jars jar
-	local ifs_original=${IFS}
-	IFS=","
-	for pkg in ${EANT_GENTOO_CLASSPATH} ; do
-		jars="$(java-pkg_getjars ${pkg})"
-		for jar in ${jars} ; do
-			echo "wrapper.java.classpath.$((i++))=${jar}" >> freenet-wrapper.conf || die
-		done
-	done
-	IFS=${ifs_original}
-	echo "wrapper.java.classpath.$((i++))=/usr/share/freenet/lib/ant.jar" >> freenet-wrapper.conf || die
-	echo "wrapper.java.library.path.2=/usr/$(get_libdir)/java-service-wrapper" >> freenet-wrapper.conf || die
-	echo "wrapper.java.library.path.3=/usr/$(get_libdir)/jna-4" >> freenet-wrapper.conf || die
-
-	cp "${DISTDIR}"/freenet-ant-1.7.1.jar lib/ant.jar || die
-	eapply_user
-}
-
-EANT_TEST_EXTRA_ARGS="-Dtest.skip=false"
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_dojar dist/freenet.jar
-	java-pkg_newjar "${DISTDIR}"/freenet-ant-1.7.1.jar ant.jar
-
-	if has_version =sys-apps/baselayout-2*; then
-		doinitd "${FILESDIR}"/freenet
-	else
-		newinitd "${FILESDIR}"/freenet.old freenet
-	fi
-
-	systemd_dounit "${FILESDIR}"/freenet.service
-
-	dodoc AUTHORS
-	newdoc README.md README
-	insinto /etc
-	doins freenet-wrapper.conf
-	insinto /var/freenet
-	doins run.sh seednodes.fref
-	fperms +x /var/freenet/run.sh
-	use doc && java-pkg_dojavadoc javadoc
-	use source && java-pkg_dosrc src
-}
-
-pkg_postinst() {
-	elog " "
-	elog "1. Start freenet with /etc/init.d/freenet start."
-	elog "2. Open localhost:8888 in your browser for the web interface."
-	#workaround for previously existing freenet user
-	[[ $(stat --format="%U" /var/freenet) == "freenet" ]] || chown \
-		freenet:freenet /var/freenet
-}
-
-pkg_postrm() {
-	if ! [[ -e /usr/share/freenet/lib/freenet.jar ]] ; then
-		elog " "
-		elog "If you dont want to use freenet any more"
-		elog "and dont want to keep your identity/other stuff"
-		elog "remember to do 'rm -rf /var/freenet' to remove everything"
-	fi
-}
diff --git a/net-p2p/freenet/freenet-0.7.5_p1492.ebuild b/net-p2p/freenet/freenet-0.7.5_p1492.ebuild
deleted file mode 100644
index e501d6fa4dbf..000000000000
--- a/net-p2p/freenet/freenet-0.7.5_p1492.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2 systemd
-
-DESCRIPTION="An encrypted network without censorship"
-HOMEPAGE="https://freenetproject.org/"
-#	https://github.com/${PN}/seedrefs/archive/build0${PV#*p}.zip -> seednodes-${PV}.zip
-SRC_URI="
-	https://github.com/${PN}/fred/archive/build0${PV#*p}.zip -> ${P}.zip
-	https://github.com/${PN}/seedrefs/archive/build01480.zip -> seednodes-0.7.5_p1480.zip
-	mirror://gentoo/freenet-ant-1.7.1.jar"
-
-LICENSE="GPL-2+ GPL-2 MIT BSD-2 Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+nss test"
-
-CDEPEND="dev-java/bcprov:0
-	dev-java/commons-compress:0
-	dev-java/fec:0
-	dev-java/java-service-wrapper:0
-	dev-java/jbitcollider-core:0
-	dev-java/jna:4
-	dev-java/lzma:0
-	dev-java/lzmajio:0
-	dev-java/mersennetwister:0
-	nss? ( dev-libs/nss )"
-
-DEPEND="
-	app-arch/unzip
-	>=virtual/jdk-1.8
-	${CDEPEND}
-	test? (
-		dev-java/junit:0
-		dev-java/ant-junit:0
-	)
-	dev-java/ant-core:0"
-
-RDEPEND="
-	>=virtual/jre-1.8
-	net-libs/nativebiginteger:0
-	${CDEPEND}
-	acct-user/freenet
-	acct-group/freenet"
-
-PDEPEND="net-libs/NativeThread:0"
-
-JAVA_PKG_BSFIX_NAME+=" build-clean.xml"
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-JAVA_ANT_CLASSPATH_TAGS+=" javadoc"
-JAVA_ANT_ENCODING="utf8"
-
-EANT_BUILD_TARGET="package"
-EANT_TEST_TARGET="unit"
-EANT_BUILD_XML="build-clean.xml"
-EANT_GENTOO_CLASSPATH="bcprov,commons-compress,fec,java-service-wrapper,jbitcollider-core,jna-4,lzma,lzmajio,mersennetwister"
-EANT_EXTRA_ARGS="-Dsuppress.gjs=true -Dlib.contrib.present=true -Dlib.bouncycastle.present=true -Dlib.junit.present=true -Dtest.skip=true"
-
-S="${WORKDIR}/fred-build0${PV#*p}"
-
-RESTRICT="test" # they're broken in the last release.
-
-pkg_setup() {
-	has_version dev-java/icedtea[cacao] && {
-		ewarn "dev-java/icedtea was built with cacao USE flag."
-		ewarn "freenet may compile with it, but it will refuse to run."
-		ewarn "Please remerge dev-java/icedtea without cacao USE flag,"
-		ewarn "if you plan to use it for running freenet."
-	}
-	java-pkg-2_pkg_setup
-}
-
-src_unpack() {
-#	unpack ${P}.zip seednodes-${PV}.zip
-	unpack ${P}.zip seednodes-0.7.5_p1480.zip
-}
-
-src_prepare() {
-#	cat "${WORKDIR}"/seedrefs-build0${PV#*p}/* > "${S}"/seednodes.fref
-	cat "${WORKDIR}"/seedrefs-build01480/* > "${S}"/seednodes.fref
-	cp "${FILESDIR}"/freenet-0.7.5_p1491-wrapper.conf freenet-wrapper.conf || die
-	cp "${FILESDIR}"/run.sh-20090501 run.sh || die
-	cp "${FILESDIR}"/build-clean.xml build-clean.xml || die
-	cp "${FILESDIR}"/build.properties build.properties || die
-
-	eapply -p1 "${FILESDIR}/"0.7.5_p1491-update-for-jna-5.x.patch
-	eapply -p0 "${FILESDIR}"/0.7.5_p1483-ext.patch
-	eapply -p1 "${FILESDIR}/"0.7.5_p1475-remove-git.patch
-
-	sed -i -e "s:=/usr/lib:=/usr/$(get_libdir):g" \
-		freenet-wrapper.conf || die "sed failed"
-
-	echo "wrapper.java.classpath.1=/usr/share/freenet/lib/freenet.jar" >> freenet-wrapper.conf || die
-	if use nss; then
-		echo "wrapper.java.additional.6=-Dfreenet.jce.use.NSS=true" >> freenet-wrapper.conf || die
-	fi
-	local i=2 pkg jars jar
-	local ifs_original=${IFS}
-	IFS=","
-	for pkg in ${EANT_GENTOO_CLASSPATH} ; do
-		jars="$(java-pkg_getjars ${pkg})"
-		for jar in ${jars} ; do
-			echo "wrapper.java.classpath.$((i++))=${jar}" >> freenet-wrapper.conf || die
-		done
-	done
-	IFS=${ifs_original}
-	echo "wrapper.java.classpath.$((i++))=/usr/share/freenet/lib/ant.jar" >> freenet-wrapper.conf || die
-	echo "wrapper.java.library.path.2=/usr/$(get_libdir)/java-service-wrapper" >> freenet-wrapper.conf || die
-	echo "wrapper.java.library.path.3=/usr/$(get_libdir)/jna-4" >> freenet-wrapper.conf || die
-
-	cp "${DISTDIR}"/freenet-ant-1.7.1.jar lib/ant.jar || die
-	eapply_user
-}
-
-EANT_TEST_EXTRA_ARGS="-Dtest.skip=false"
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_dojar dist/freenet.jar
-	java-pkg_newjar "${DISTDIR}"/freenet-ant-1.7.1.jar ant.jar
-
-	if has_version =sys-apps/baselayout-2*; then
-		doinitd "${FILESDIR}"/freenet
-	else
-		newinitd "${FILESDIR}"/freenet.old freenet
-	fi
-
-	systemd_dounit "${FILESDIR}"/freenet.service
-
-	dodoc AUTHORS
-	newdoc README.md README
-	insinto /etc
-	doins freenet-wrapper.conf
-	insinto /var/freenet
-	doins run.sh seednodes.fref
-	fperms +x /var/freenet/run.sh
-	use doc && java-pkg_dojavadoc javadoc
-	use source && java-pkg_dosrc src
-}
-
-pkg_postinst() {
-	elog " "
-	elog "1. Start freenet with /etc/init.d/freenet start."
-	elog "2. Open localhost:8888 in your browser for the web interface."
-	#workaround for previously existing freenet user
-	[[ $(stat --format="%U" /var/freenet) == "freenet" ]] || chown \
-		freenet:freenet /var/freenet
-}
-
-pkg_postrm() {
-	if ! [[ -e /usr/share/freenet/lib/freenet.jar ]] ; then
-		elog " "
-		elog "If you dont want to use freenet any more"
-		elog "and dont want to keep your identity/other stuff"
-		elog "remember to do 'rm -rf /var/freenet' to remove everything"
-	fi
-}
diff --git a/net-p2p/freenet/freenet-0.7.5_p1493-r1.ebuild b/net-p2p/freenet/freenet-0.7.5_p1493-r1.ebuild
deleted file mode 100644
index dc8909dae308..000000000000
--- a/net-p2p/freenet/freenet-0.7.5_p1493-r1.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2 systemd
-
-DESCRIPTION="An encrypted network without censorship"
-HOMEPAGE="https://freenetproject.org/"
-#	https://github.com/${PN}/seedrefs/archive/build0${PV#*p}.zip -> seednodes-${PV}.zip
-SRC_URI="
-	https://github.com/${PN}/fred/archive/build0${PV#*p}.zip -> ${P}.zip
-	https://github.com/${PN}/seedrefs/archive/build01480.zip -> seednodes-0.7.5_p1480.zip
-	mirror://gentoo/freenet-ant-1.7.1.jar"
-
-LICENSE="GPL-2+ GPL-2 MIT BSD-2 Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="+nss test"
-
-CDEPEND="dev-java/bcprov:0
-	dev-java/commons-compress:0
-	dev-java/fec:0
-	dev-java/java-service-wrapper:0
-	dev-java/jbitcollider-core:0
-	dev-java/jna:4
-	dev-java/lzma:0
-	dev-java/lzmajio:0
-	dev-java/mersennetwister:0
-	nss? ( dev-libs/nss )"
-
-DEPEND="
-	app-arch/unzip
-	>=virtual/jdk-1.8
-	${CDEPEND}
-	test? (
-		dev-java/junit:0
-		dev-java/ant-junit:0
-	)
-	dev-java/ant-core:0"
-
-RDEPEND="
-	>=virtual/jre-1.8
-	net-libs/nativebiginteger:0
-	${CDEPEND}
-	acct-user/freenet
-	acct-group/freenet"
-
-PDEPEND="net-libs/NativeThread:0"
-
-JAVA_PKG_BSFIX_NAME+=" build-clean.xml"
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-JAVA_ANT_CLASSPATH_TAGS+=" javadoc"
-JAVA_ANT_ENCODING="utf8"
-
-EANT_BUILD_TARGET="package"
-EANT_TEST_TARGET="unit"
-EANT_BUILD_XML="build-clean.xml"
-EANT_GENTOO_CLASSPATH="bcprov,commons-compress,fec,java-service-wrapper,jbitcollider-core,jna-4,lzma,lzmajio,mersennetwister"
-EANT_EXTRA_ARGS="-Dsuppress.gjs=true -Dlib.contrib.present=true -Dlib.bouncycastle.present=true -Dlib.junit.present=true -Dtest.skip=true"
-
-S="${WORKDIR}/fred-build0${PV#*p}"
-
-RESTRICT="test" # they're broken in the last release.
-
-pkg_setup() {
-	has_version dev-java/icedtea[cacao] && {
-		ewarn "dev-java/icedtea was built with cacao USE flag."
-		ewarn "freenet may compile with it, but it will refuse to run."
-		ewarn "Please remerge dev-java/icedtea without cacao USE flag,"
-		ewarn "if you plan to use it for running freenet."
-	}
-	java-pkg-2_pkg_setup
-}
-
-src_unpack() {
-#	unpack ${P}.zip seednodes-${PV}.zip
-	unpack ${P}.zip seednodes-0.7.5_p1480.zip
-}
-
-src_prepare() {
-#	cat "${WORKDIR}"/seedrefs-build0${PV#*p}/* > "${S}"/seednodes.fref
-	cat "${WORKDIR}"/seedrefs-build01480/* > "${S}"/seednodes.fref
-	cp "${FILESDIR}"/freenet-0.7.5_p1491-wrapper.conf freenet-wrapper.conf || die
-	cp "${FILESDIR}"/run.sh-20090501 run.sh || die
-	cp "${FILESDIR}"/build-clean.xml build-clean.xml || die
-	cp "${FILESDIR}"/build.properties build.properties || die
-
-	eapply -p0 "${FILESDIR}"/0.7.5_p1483-ext.patch
-	eapply -p1 "${FILESDIR}/"0.7.5_p1475-remove-git.patch
-
-	sed -i -e "s:=/usr/lib:=/usr/$(get_libdir):g" \
-		freenet-wrapper.conf || die "sed failed"
-
-	echo "wrapper.java.classpath.1=/usr/share/freenet/lib/freenet.jar" >> freenet-wrapper.conf || die
-	if use nss; then
-		echo "wrapper.java.additional.11=-Dfreenet.jce.use.NSS=true" >> freenet-wrapper.conf || die
-	else
-		sed -i -e "s:Dfreenet.jce.use.NSS=tru:Dfreenet.jce.use.NSS=false:g" freenet.confd || die
-	fi
-	local i=2 pkg jars jar classpath
-	classpath="/usr/share/freenet/lib/freenet.jar"
-	local ifs_original=${IFS}
-	IFS=","
-	for pkg in ${EANT_GENTOO_CLASSPATH} ; do
-		jars="$(java-pkg_getjars ${pkg})"
-		for jar in ${jars} ; do
-			echo "wrapper.java.classpath.$((i++))=${jar}" >> freenet-wrapper.conf || die
-			classpath="${classpath}":"${jar}"
-
-		done
-	done
-	IFS=${ifs_original}
-	echo "wrapper.java.classpath.$((i++))=/usr/share/freenet/lib/ant.jar" >> freenet-wrapper.conf || die
-	classpath="${classpath}":/usr/share/freenet/lib/ant.jar
-	echo "classpath=\"""${classpath}""\"" > freenet.confd || die
-	echo "wrapper.java.library.path.2=/usr/$(get_libdir)/java-service-wrapper" >> freenet-wrapper.conf || die
-	echo "wrapper.java.library.path.3=/usr/$(get_libdir)/jna-4" >> freenet-wrapper.conf || die
-	echo "additional_options=\"-Dfreenet.jce.use.NSS=true -Djna.nosys=false -Dnetworkaddress.cache.ttl=0 -Dnetworkaddress.cache.negative.ttl=0 -enableassertions:freenet -Djava.library.path=/usr/$(get_libdir)/jna-4\"" >> freenet.confd || die
-	echo "target=\"freenet.node.NodeStarter\"" >> freenet.confd || die
-	echo "configurable_options=\"-Djava.initmemory=60 -Djava.maxmemory=1024 -XX:MaxPermSize=1024M\"" >> freenet.confd || die
-
-	cp "${DISTDIR}"/freenet-ant-1.7.1.jar lib/ant.jar || die
-	eapply_user
-}
-
-EANT_TEST_EXTRA_ARGS="-Dtest.skip=false"
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_dojar dist/freenet.jar
-	java-pkg_newjar "${DISTDIR}"/freenet-ant-1.7.1.jar ant.jar
-
-	if has_version =sys-apps/baselayout-2*; then
-#this uses java-service-wrapper, which is currently broken, bug 878869
-#		doinitd "${FILESDIR}"/freenet
-#this does directly start freenet without the wrapper
-		newinitd "${FILESDIR}"/freenet.initd freenet
-		newconfd freenet.confd freenet
-	else
-		newinitd "${FILESDIR}"/freenet.old freenet
-	fi
-
-	systemd_dounit "${FILESDIR}"/freenet.service
-
-	dodoc AUTHORS
-	newdoc README.md README
-	insinto /etc
-	doins freenet-wrapper.conf
-	insinto /var/freenet
-	doins run.sh seednodes.fref
-	fperms +x /var/freenet/run.sh
-	use doc && java-pkg_dojavadoc javadoc
-	use source && java-pkg_dosrc src
-}
-
-pkg_postinst() {
-	elog " "
-	elog "1. Start freenet with /etc/init.d/freenet start."
-	elog "2. Open localhost:8888 in your browser for the web interface."
-	#workaround for previously existing freenet user
-	[[ $(stat --format="%U" /var/freenet) == "freenet" ]] || chown \
-		freenet:freenet /var/freenet
-}
-
-pkg_postrm() {
-	if ! [[ -e /usr/share/freenet/lib/freenet.jar ]] ; then
-		elog " "
-		elog "If you dont want to use freenet any more"
-		elog "and dont want to keep your identity/other stuff"
-		elog "remember to do 'rm -rf /var/freenet' to remove everything"
-	fi
-}
diff --git a/net-p2p/freenet/freenet-0.7.5_p1493.ebuild b/net-p2p/freenet/freenet-0.7.5_p1493.ebuild
deleted file mode 100644
index 494391e226e5..000000000000
--- a/net-p2p/freenet/freenet-0.7.5_p1493.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2 systemd
-
-DESCRIPTION="An encrypted network without censorship"
-HOMEPAGE="https://freenetproject.org/"
-#	https://github.com/${PN}/seedrefs/archive/build0${PV#*p}.zip -> seednodes-${PV}.zip
-SRC_URI="
-	https://github.com/${PN}/fred/archive/build0${PV#*p}.zip -> ${P}.zip
-	https://github.com/${PN}/seedrefs/archive/build01480.zip -> seednodes-0.7.5_p1480.zip
-	mirror://gentoo/freenet-ant-1.7.1.jar"
-
-LICENSE="GPL-2+ GPL-2 MIT BSD-2 Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="+nss test"
-
-CDEPEND="dev-java/bcprov:0
-	dev-java/commons-compress:0
-	dev-java/fec:0
-	dev-java/java-service-wrapper:0
-	dev-java/jbitcollider-core:0
-	dev-java/jna:4
-	dev-java/lzma:0
-	dev-java/lzmajio:0
-	dev-java/mersennetwister:0
-	nss? ( dev-libs/nss )"
-
-DEPEND="
-	app-arch/unzip
-	>=virtual/jdk-1.8
-	${CDEPEND}
-	test? (
-		dev-java/junit:0
-		dev-java/ant-junit:0
-	)
-	dev-java/ant-core:0"
-
-RDEPEND="
-	>=virtual/jre-1.8
-	net-libs/nativebiginteger:0
-	${CDEPEND}
-	acct-user/freenet
-	acct-group/freenet"
-
-PDEPEND="net-libs/NativeThread:0"
-
-JAVA_PKG_BSFIX_NAME+=" build-clean.xml"
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-JAVA_ANT_CLASSPATH_TAGS+=" javadoc"
-JAVA_ANT_ENCODING="utf8"
-
-EANT_BUILD_TARGET="package"
-EANT_TEST_TARGET="unit"
-EANT_BUILD_XML="build-clean.xml"
-EANT_GENTOO_CLASSPATH="bcprov,commons-compress,fec,java-service-wrapper,jbitcollider-core,jna-4,lzma,lzmajio,mersennetwister"
-EANT_EXTRA_ARGS="-Dsuppress.gjs=true -Dlib.contrib.present=true -Dlib.bouncycastle.present=true -Dlib.junit.present=true -Dtest.skip=true"
-
-S="${WORKDIR}/fred-build0${PV#*p}"
-
-RESTRICT="test" # they're broken in the last release.
-
-pkg_setup() {
-	has_version dev-java/icedtea[cacao] && {
-		ewarn "dev-java/icedtea was built with cacao USE flag."
-		ewarn "freenet may compile with it, but it will refuse to run."
-		ewarn "Please remerge dev-java/icedtea without cacao USE flag,"
-		ewarn "if you plan to use it for running freenet."
-	}
-	java-pkg-2_pkg_setup
-}
-
-src_unpack() {
-#	unpack ${P}.zip seednodes-${PV}.zip
-	unpack ${P}.zip seednodes-0.7.5_p1480.zip
-}
-
-src_prepare() {
-#	cat "${WORKDIR}"/seedrefs-build0${PV#*p}/* > "${S}"/seednodes.fref
-	cat "${WORKDIR}"/seedrefs-build01480/* > "${S}"/seednodes.fref
-	cp "${FILESDIR}"/freenet-0.7.5_p1491-wrapper.conf freenet-wrapper.conf || die
-	cp "${FILESDIR}"/run.sh-20090501 run.sh || die
-	cp "${FILESDIR}"/build-clean.xml build-clean.xml || die
-	cp "${FILESDIR}"/build.properties build.properties || die
-
-	eapply -p0 "${FILESDIR}"/0.7.5_p1483-ext.patch
-	eapply -p1 "${FILESDIR}/"0.7.5_p1475-remove-git.patch
-
-	sed -i -e "s:=/usr/lib:=/usr/$(get_libdir):g" \
-		freenet-wrapper.conf || die "sed failed"
-
-	echo "wrapper.java.classpath.1=/usr/share/freenet/lib/freenet.jar" >> freenet-wrapper.conf || die
-	if use nss; then
-		echo "wrapper.java.additional.11=-Dfreenet.jce.use.NSS=true" >> freenet-wrapper.conf || die
-	fi
-	local i=2 pkg jars jar
-	local ifs_original=${IFS}
-	IFS=","
-	for pkg in ${EANT_GENTOO_CLASSPATH} ; do
-		jars="$(java-pkg_getjars ${pkg})"
-		for jar in ${jars} ; do
-			echo "wrapper.java.classpath.$((i++))=${jar}" >> freenet-wrapper.conf || die
-		done
-	done
-	IFS=${ifs_original}
-	echo "wrapper.java.classpath.$((i++))=/usr/share/freenet/lib/ant.jar" >> freenet-wrapper.conf || die
-	echo "wrapper.java.library.path.2=/usr/$(get_libdir)/java-service-wrapper" >> freenet-wrapper.conf || die
-	echo "wrapper.java.library.path.3=/usr/$(get_libdir)/jna-4" >> freenet-wrapper.conf || die
-
-	cp "${DISTDIR}"/freenet-ant-1.7.1.jar lib/ant.jar || die
-	eapply_user
-}
-
-EANT_TEST_EXTRA_ARGS="-Dtest.skip=false"
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_dojar dist/freenet.jar
-	java-pkg_newjar "${DISTDIR}"/freenet-ant-1.7.1.jar ant.jar
-
-	if has_version =sys-apps/baselayout-2*; then
-		doinitd "${FILESDIR}"/freenet
-	else
-		newinitd "${FILESDIR}"/freenet.old freenet
-	fi
-
-	systemd_dounit "${FILESDIR}"/freenet.service
-
-	dodoc AUTHORS
-	newdoc README.md README
-	insinto /etc
-	doins freenet-wrapper.conf
-	insinto /var/freenet
-	doins run.sh seednodes.fref
-	fperms +x /var/freenet/run.sh
-	use doc && java-pkg_dojavadoc javadoc
-	use source && java-pkg_dosrc src
-}
-
-pkg_postinst() {
-	elog " "
-	elog "1. Start freenet with /etc/init.d/freenet start."
-	elog "2. Open localhost:8888 in your browser for the web interface."
-	#workaround for previously existing freenet user
-	[[ $(stat --format="%U" /var/freenet) == "freenet" ]] || chown \
-		freenet:freenet /var/freenet
-}
-
-pkg_postrm() {
-	if ! [[ -e /usr/share/freenet/lib/freenet.jar ]] ; then
-		elog " "
-		elog "If you dont want to use freenet any more"
-		elog "and dont want to keep your identity/other stuff"
-		elog "remember to do 'rm -rf /var/freenet' to remove everything"
-	fi
-}
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index c5a8927732dc..419cacda7285 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 41f71eefbdd4..889138df2657 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -8303,6 +8303,7 @@ sys-fs/zfs:rootfs - Enable dependencies required for booting off a pool containi
 sys-fs/zfs:test-suite - Install regression test suite
 sys-fs/zfs-auto-snapshot:cron - Install /etc/cron.* files
 sys-fs/zfs-auto-snapshot:default-exclude - Only take snapshots of datasets with com.sun:auto-snapshot=true property set
+sys-fs/zfs-kmod:dist-kernel-cap - Prevents upgrading to an unsupported kernel version when combined with USE=dist-kernel
 sys-fs/zfs-kmod:rootfs - Pull dependencies and check kernel options required for root-on-zfs
 sys-kernel/genkernel:firmware - Prefer system firmware sys-kernel/linux-firmware over local copy.
 sys-kernel/gentoo-kernel:hardened - Use selection of hardening options recommended by Kernel Self Protection Project
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 24f7e388c930..44887fc34dff 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index 26a415939d8c..d2df50a1c4fe 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -11,5 +11,5 @@ DIST gdalautotest-3.7.0.tar.gz 13785892 BLAKE2B cac18436ad2acb558e27e8ba3f1f2c22
 EBUILD gdal-3.5.3-r1.ebuild 6692 BLAKE2B 2648c9ba25041e36dbb482964b2b5cdabddee82170232f1372b1f3436c16041e6675234407d5fb38d85a17753216fb29e6f41bdee417312ba78d0ef7b3173cae SHA512 9af7d1da2dbbb461e400ffad40e94546e08e40aeb2ef89db367e6b4981798ec0321e9a17e655c2fa46aedc89ae0739f1ee04c15a77d382fec4b30802156d2491
 EBUILD gdal-3.6.2.ebuild 6761 BLAKE2B f792b599ddaeea5d8601b6669c5a13a076cd171469fc647b532286b4ae9011c4eee1131b13c8bd1c14d602deaf9431c7fa8d91e78f68a7198b38d5fad12ec103 SHA512 6096e471435679fdd5a4d307e3225a7965164806fd1080ab26ae6161088f9e85cc017ca42b41ab0b2570b32f4710aa3da4998d4c703a274b9e69bee13eb53865
 EBUILD gdal-3.6.4.ebuild 6772 BLAKE2B 63e9d689bfbb54948a43756f47acb6aec7030f4fffda1fd5f2ca8d6a8ea9e2aa93ffe7e1c18404ec58e66ba9f94f648f004c7aa4497e1e2cdb9647c0bbd8bd79 SHA512 735ff9adbbc31ee5ac934a832637b35db99e9b64e67110c014a958f485692ae1e2d479bc2642bf35924e38bc3306c086386ae031b783ae03b1938f7586dff750
-EBUILD gdal-3.7.0.ebuild 7740 BLAKE2B 871cc02626618847a4cd720459950ad103ec5124fab169b9c3359b5c3b4525aeba0618cbd04047022353495ab7de3e2d3253b42cb7caa4527d928b3ed89aeae9 SHA512 629569da1a7d6b474ac12d935787b1f68e4948434900c1fc3bdf8a8f0872c3660fa68260ebff827cb904dcc6a1da700c9a0c1c209c768ffde94b21fb70acfe48
+EBUILD gdal-3.7.0.ebuild 7522 BLAKE2B 610681e6002e266ba379f44b9c38aef9a2ec95cea8610ff0abb75d05d5512ddaa3f5c9cff33205bfc6b771988c7d98220d2a37899c24508e0f0756f13b7cb07b SHA512 491204c658be1e8614032ba9aa874ebd965234cf5be528a30417e7df1d0ee6561dbe7d25b7a7cce67b922cbd33ed0c2bbfed7a957fa53eb5eb4cf1f92617215c
 MISC metadata.xml 1348 BLAKE2B 6666f26bc5f48bbfe1971736c6737420fefa7949cd6e1b74c649ae53cb51b756ebba42bb934930af83de254bebc4e4268f60a04ed2fb1aa8835b9abbdb3968b2 SHA512 b5b90368a48679c780dbe89b73ddee9e2c74639bf1a2c9f39dd4a3cdbb005878cd2197271f2ddc23d9611feaf79c0239b32d655d8a29592ad6d87a402970b726
diff --git a/sci-libs/gdal/gdal-3.7.0.ebuild b/sci-libs/gdal/gdal-3.7.0.ebuild
index 8e85dac1b17e..7c62bbd95436 100644
--- a/sci-libs/gdal/gdal-3.7.0.ebuild
+++ b/sci-libs/gdal/gdal-3.7.0.ebuild
@@ -29,7 +29,6 @@ BDEPEND="
 	java? (
 		dev-java/ant-core
 		dev-lang/swig
-		>=virtual/jdk-1.8:*
 	)
 	python? (
 		dev-lang/swig
@@ -60,6 +59,9 @@ DEPEND="
 	gml? ( >=dev-libs/xerces-c-3.1 )
 	heif? ( media-libs/libheif:= )
 	hdf5? ( >=sci-libs/hdf5-1.6.4:=[cxx,szip] )
+	java? (
+		>=virtual/jdk-1.8:*
+	)
 	jpeg? ( media-libs/libjpeg-turbo:= )
 	jpeg2k? ( media-libs/openjpeg:2= )
 	lzma? ( || (
@@ -212,9 +214,6 @@ src_configure() {
 		# Bindings
 		-DBUILD_PYTHON_BINDINGS=$(usex python)
 		-DBUILD_JAVA_BINDINGS=$(usex java)
-		$(usev java -DJAVA_AWT_LIBRARY=/etc/java-config-2/current-system-vm/lib)
-		$(usev java -DJAVA_JVM_LIBRARY=/etc/java-config-2/current-system-vm/lib)
-		$(usev java -DJAVA_INCLUDE_PATH=/etc/java-config-2/current-system-vm/include)
 		# bug #845369
 		-DBUILD_CSHARP_BINDINGS=OFF
 
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 53fbc68950c6..507d16106fa5 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/f2fs-tools/Manifest b/sys-fs/f2fs-tools/Manifest
index f412ac87cda0..3f8e9837662f 100644
--- a/sys-fs/f2fs-tools/Manifest
+++ b/sys-fs/f2fs-tools/Manifest
@@ -1,7 +1,4 @@
-AUX f2fs-tools-1.15.0-lz4-1.9.4.patch 819 BLAKE2B 0bedeb4362cf2a85e172cc5bf8b4d61f0f198f50032e431164513e3f92440a66d7e868b963c5e701332285e4045d88da3098094ab7b027d95a9b6b4f561a80f1 SHA512 11bb74d95ae1f182fb6c71f690d835e2225d96d00eccf9e85e35a2ea2dd8f06fbf15785d29ad57cee9ae4d8bf05a8c64d45ce0b9824cf25416fe43f1d0aeeb85
-DIST f2fs-tools-1.15.0.tar.gz 387663 BLAKE2B 1e55f87c839cee6431d9a83e9786201e9b6b872be27c8b92854b30b0fd1c651a9b7235ce93e70c530bfa7a4e9f4dfd309c72702b3338a4aa96e365b29424fb1d SHA512 61e40f16296091b55cec2dbdc6306af6abc2d3f854f39ef03a741b7f6f47348f915498375789f017f8da27fa7d27c79c905dd047693518adde503ea7ebf89387
 DIST f2fs-tools-1.16.0.tar.gz 265507 BLAKE2B a4fb94ff879198652a2922a0101b7e34aad156c3536e5a20c1cb2e36a6a734d92d3f97b2570eb702d029ef1d6c03d6123113fc1aa5658ba979401e0691b7b447 SHA512 ea198cebf7c5bb0c42c9b53bc80484495c403b1ed1354eb7cb7b4f63ed9a5c81653a76eaf1bc35067171fa5fd99b1564178c5440c21b6b025f4e83b9def82680
-EBUILD f2fs-tools-1.15.0-r2.ebuild 1015 BLAKE2B 169d07791116015ca1bb5817ab185293b1ae7b90d018cc424362456898888f5c93efe0485ab197d39075cadab5f39881f5d893443ecec3d3576f4c51051586fe SHA512 ce32a182737e83d8970528b4d6020ef6d9b6af3179a8591eb51df80951b6032f17bb86bc5b2455c771e5f4273a645718b2b60b34654a8764cc0fb836ffa713a4
 EBUILD f2fs-tools-1.16.0.ebuild 1148 BLAKE2B 89db0546409f639f727197ca0ff518bbe401cd45a49062c73586f9fe1eca0ddaddca83b8e68540e15ed0832a78bca638aae9cb747f9232b23eb643a3778c2332 SHA512 6d32619a2a8bdb8ef630c04e24eceb6353e4bec7cca53b47cf8a79a68ed69c2f31f47c3f764e2b91b4f9efe6ae89f8679be04c16a6aa1da647786ab588f5f805
 EBUILD f2fs-tools-9999.ebuild 1087 BLAKE2B 0c99aaa8bd3f97ef49676cf6dba244704a6605fcfe8998e24816e764e80e86cd42d8c1b6518fddcde670be18eb1de289b4d53e0e6fbf8152d05ef504a1aacca3 SHA512 5b9ff6f624bbac4ce7d903424ca28fbaf73de7efb3e06d7fdb24e5dbfba058e19b22874288af2a27f9e9475f0f2d11c30efd5ee2adfdccbe3557a958db1a24d2
 MISC metadata.xml 505 BLAKE2B 97772236b6d7113c38a9d8920ac2b0d949ee55f9971a94caa8b4ebfb1e91a6d6bffc97702b4f952867afb8cffea7972ef17f1ba8f390f4195a465aa90c2f915b SHA512 7a80d22b56aeb5f59203cb2853a63d8a3b1af955051d1c307ce5af2b3c3ae999481a37938b674532807dbffa715a725a384905995532d72d18761b3732540b76
diff --git a/sys-fs/f2fs-tools/f2fs-tools-1.15.0-r2.ebuild b/sys-fs/f2fs-tools/f2fs-tools-1.15.0-r2.ebuild
deleted file mode 100644
index 72236b8baf0b..000000000000
--- a/sys-fs/f2fs-tools/f2fs-tools-1.15.0-r2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="Tools for Flash-Friendly File System (F2FS)"
-HOMEPAGE="https://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/about/"
-SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/${PN}.git/snapshot/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/9"
-KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv x86"
-IUSE="selinux"
-
-RDEPEND="
-	selinux? ( sys-libs/libselinux )
-	elibc_musl? ( sys-libs/queue-standalone )"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.15.0-lz4-1.9.4.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# This is required to install to /sbin, bug #481110
-	econf \
-		--bindir="${EPREFIX}"/sbin \
-		--disable-static \
-		$(use_with selinux)
-}
-
-src_install() {
-	default
-	find "${D}" -name "*.la" -delete || die
-	# Collides with sg3_utils
-	# https://bugs.gentoo.org/880899
-	rm "${ED}/usr/sbin/sg_write_buffer" || die
-}
diff --git a/sys-fs/f2fs-tools/files/f2fs-tools-1.15.0-lz4-1.9.4.patch b/sys-fs/f2fs-tools/files/f2fs-tools-1.15.0-lz4-1.9.4.patch
deleted file mode 100644
index 4194054271db..000000000000
--- a/sys-fs/f2fs-tools/files/f2fs-tools-1.15.0-lz4-1.9.4.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-https://bugs.gentoo.org/867691
-https://github.com/jaegeuk/f2fs-tools/commit/b9e0985dc2e8f0a15faca21fa208afae57593486
-
-From: Jaegeuk Kim <jaegeuk@kernel.org>
-Date: Mon, 29 Aug 2022 11:03:35 -0700
-Subject: [PATCH] f2fs-tools: fix build error on lz4-1.9.4
-
-LZ4_STREAMSIZE_U64 is undefined in new lz4 lib.
-
-Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
---- a/fsck/compress.c
-+++ b/fsck/compress.c
-@@ -32,10 +32,7 @@
- #ifdef HAVE_LIBLZ4
- #define LZ4_MEMORY_USAGE		14
- #define LZ4_MAX_INPUT_SIZE		0x7E000000 /* 2 113 929 216 bytes */
--#ifndef LZ4_STREAMSIZE
--#define LZ4_STREAMSIZE			(LZ4_STREAMSIZE_U64 * sizeof(long long))
--#endif
--#define LZ4_MEM_COMPRESS		LZ4_STREAMSIZE
-+#define LZ4_MEM_COMPRESS		sizeof(LZ4_stream_t)
- #define LZ4_ACCELERATION_DEFAULT	1
- #define LZ4_WORK_SIZE			ALIGN_UP(LZ4_MEM_COMPRESS, 8)
- #endif
-
diff --git a/sys-fs/zfs-auto-snapshot/Manifest b/sys-fs/zfs-auto-snapshot/Manifest
index 6e970047cc92..75ee51855fa5 100644
--- a/sys-fs/zfs-auto-snapshot/Manifest
+++ b/sys-fs/zfs-auto-snapshot/Manifest
@@ -13,6 +13,6 @@ AUX zfs-auto-snapshot-weekly.timer 150 BLAKE2B 655187add790017f8328edae33e88eb0a
 AUX zfs-auto-snapshot.target 360 BLAKE2B 17be6ab113a8849d5244fd36140d1165c4e919df2a04f4b16aa591c1c92b29243b1be4f2243bcc6a8ef015b0cc1fb53b183da1c83668e4e7e0b609f7301a3372 SHA512 f607dada27e4be409184152b93e2079eecf12f5eba76f2dbe42bdbf4793603063c23813e752bfd829a081eeb6d09c86bc18ab75d65bff87b2c1d4f998abac516
 DIST zfs-auto-snapshot-upstream-1.2.4.tar.gz 13375 BLAKE2B 2a44cdecb7c4bb432c1804dba9a6674289aced9664ae0fcc6a33b604b128d852fce459367316f11961747594516916da51072ed10f84d0c01ea8cca553ce7eec SHA512 26382303fce8b90dfb40f69fcab92308e88c17c147b4a566c5d32f2e9aa241d64f5da56ad82b4becb824ba01a470037a724460d35676a1d46de9c578c02a57d9
 EBUILD zfs-auto-snapshot-1.2.4-r2.ebuild 2589 BLAKE2B ae75763d83d7919ee78a695be66425cfd97c04036be844fc9582cc7ed49a3dd60ddcf7ce733c8464597f217370c6650cc78afcebafdf1da0bd9f4c4dcbd7a1dc SHA512 be518c8387dc7b4e5142bf094f9556aa05c39bec2c884bf9a3a5edd7f61f6533c743f75ed6cee0fd38a7037622c22f2c2196dd91419aff7ac61cb020cf6d669a
-EBUILD zfs-auto-snapshot-1.2.4-r3.ebuild 2633 BLAKE2B 8d6c345b21d2599896ac70a58abd438b3c32869186896a1157cd4b19241c97c3dc0a8b7f3cd08d892eee0e84dae53eb13d0e09b08c4b3507ec3cb964cdbd5342 SHA512 242b6be67f4ae39b811d6758ba81e1ca82147bb85e48879d0c19c1eadff1bae2d3bd1773f0fbe239ac339eb89cc65b5c5788775fd0c8d0cd2ac41cc04c2dde7f
+EBUILD zfs-auto-snapshot-1.2.4-r3.ebuild 2632 BLAKE2B 28124f72de4d232c34f7d477d4ca02b7056c2495f857ac34b3426c474c84043e24983491b7a669d7e57f253daeed0a5e4427a9b6e4407de1c79c0d68692826c5 SHA512 624f81f5743be12598dc3cbfd8402dc0bd1dd6808f697881d1fa873d3cd3ae1266bfd2cf4d2bb8a6df7350575b25c0b1cf5f681d208a8191ed4e891ad078042f
 EBUILD zfs-auto-snapshot-9999.ebuild 2592 BLAKE2B 4e1fe442bca545372a3c2c4a7ca7456fa134f3d994975bda29c504cf826063b54f0cdd14d49270a7272e0cd37e1785e59d33a0c5b7b916204797395c8a3f2848 SHA512 c5d895bfa2e784771952e0cbdb233db8baef0bebe6db37afc82e3bdd5f847da92780a0f5a788b275287594e7937c76a3683b228c1c93a5ff260806461e67a6b3
 MISC metadata.xml 965 BLAKE2B 4f9cc98f893bcaab842d31a7fe9d3db7d24e34a5cb612137830298bce8450a82636970ba20d69ad31bd36d121cf253deaea7ce3e9435df656a768b9922d2b2ff SHA512 0a816ae56452f48cfc286ae8f0c0ff17ba8e174ec6312ba97c09614568fbad07b4024722e3466406f590579bc614ab85731f6dcd3f873a7256d64f8c7054658e
diff --git a/sys-fs/zfs-auto-snapshot/zfs-auto-snapshot-1.2.4-r3.ebuild b/sys-fs/zfs-auto-snapshot/zfs-auto-snapshot-1.2.4-r3.ebuild
index e503554be28a..8338ae98ab90 100644
--- a/sys-fs/zfs-auto-snapshot/zfs-auto-snapshot-1.2.4-r3.ebuild
+++ b/sys-fs/zfs-auto-snapshot/zfs-auto-snapshot-1.2.4-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	MY_P="${PN}-upstream-${PV}"
 	SRC_URI="https://github.com/zfsonlinux/${PN}/archive/upstream/${PV}.tar.gz -> ${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv"
+	KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
index df942702f7fb..9f53aebf0ef8 100644
--- a/sys-fs/zfs-kmod/Manifest
+++ b/sys-fs/zfs-kmod/Manifest
@@ -1,5 +1,6 @@
 AUX 2.1.10-Revert-ZFS_IOC_COUNT_FILLED-does-unnecessary-txg_wai.patch 1932 BLAKE2B 761f1ed4a17c946fb08aa46c3b9defb0672897311dc61225f28298af7569f6350b264cb917696c091ebbf2a95aec8e2005385d27d3f996b99cc424ae0b503082 SHA512 ebdb7c6562eba403397b17dc0830f5c10a80b339ff62f52b569b4ddc28660e8ba353f2e54927e546812fe17539249ba6d1757d5cc150d3a2a75f41e702bcd239
 AUX 2.1.7-ppc64-ieee128-compat.patch 6889 BLAKE2B 9214915ed5b1d149927d46f749903fbb9b4d243d993041b8c6db039dcb7a3968a315f211e010ef9373b721336d45daef264d951e7ea1e0aed01818ebccae9d02 SHA512 4e3edbe396d0c1fdb7b286417b2bf7fe114b392e09158b3f5d3e3d1c4844bf0d59263309883363175dacd63194fd0d6a120ace35c83989d0546dae825bbb91bd
+AUX zfs-kmod-2.1.11-gentoo.patch 1076 BLAKE2B d2b0fe2ff1ac31c2a2a184141f107010dae61d2de465462b8177db1a07918be2bd2fc4d4570ad8758da87ef14cf3878db062fe9eb5b53fa3156e7db5c06073d4 SHA512 9e103aae75036e52f89e79c4d4ed3cffe670ef423cda7c2f936533b9329e994c7a02d241289f6565e9d086e5b0bdd6865ab3677c3ad84eaadf3abe310977b6a8
 AUX zfs-kmod-2.1.6-fgrep.patch 2183 BLAKE2B b8c9b58cc6d94e9ddeacbe3c5eca9d040f1c6fba84b814c8c553d5c1e15334765d3190286a4ad2298762bc54f66a8b89ef69d115cfbd5a25d928170a1d46a770 SHA512 f65e7ffa8cfd00da7ad6d1fcbf5d61172c52e55ea2630f719b49750692c1c046e8baed0e04cadc841adbd804cf861ec712b0d07dbbcae7c1c3b475326045ae8c
 DIST zfs-2.1.10.tar.gz 35101856 BLAKE2B 5b1a17d192097f5eab1ef3192217fa34b276b6f344a5114a5411be43208616ac682ae2129ae9da15b4ba6207171ae82140f823041a8067441459d51d994df271 SHA512 3189c6f822c7b6caba650a43f321114ef0bd42b72f566c44ba2400005c61cc3d420149a72520aed5b94494c51c35629a6f645273941774d964f2b61c31c366b2
 DIST zfs-2.1.10.tar.gz.asc 836 BLAKE2B 5a6b408932cb4f39f5a226598527115aa4fa6c105c8b8ad9f236a5909a948150db712bb1f35e4e16a2b7fc7e434530f93c6a6cd2aab40d628b1ded9891694578 SHA512 a45bcce13e7261f90feda51a131fa0c86e2d3c2711286a462072fb120ccbc85719c2bbecb441147a057accffb841ca82df0ba65e1abc0ece9dea8a97cfa31af5
@@ -10,8 +11,9 @@ DIST zfs-2.1.7.tar.gz.asc 836 BLAKE2B 648fb818860a1cecc2ec42f23102e0466c038bfe48
 DIST zfs-2.1.9.tar.gz 35106538 BLAKE2B d7553cc162687531b254089e29e2e15e2eb6b362cecd8e70c24bbb5dbffbde82036ad2d416f4caeceaa324bee8a2e59d9e3cd8a3bf55a2e3c0718c7af9562812 SHA512 a3c410abe911be7d3d66af8ad7023a810eb4ae3284001e544c3a34275eb17a4916a7c094936a2628a590007c007eea84673efa9f3201fd9f24c499fd5ed3ed75
 DIST zfs-2.1.9.tar.gz.asc 836 BLAKE2B 1e76525eab338398dd6ff7539ea4e7d18847d0f40e9093d813ec93fce5fa4c16e09f91c0805ba01a29190f673d131f85442c13035166d6f2d007a7e42dc15486 SHA512 35e1213fcac0458e1243355beba021dfefef455df2b341fbc4b10047f9ed4747df84e319d10ffe4bbcd572fbf014019e0dec200eb4e7d3c116fb805369182cb0
 EBUILD zfs-kmod-2.1.10-r1.ebuild 5576 BLAKE2B 815dd6a12488b0a17e67edc6b77709dc67c8c4eaa12b636fc878df712ce39c3abf5b80960d56cfa314ed9257a3b810b5c067305febd6af451dd6346246ce2f13 SHA512 d77feb3c9ac5698c8d1db64ff22dcd96bff54144e674ad1ef254fa5d1c047c5e0f29b165c037ece23dee9abe89f4ce0e93d1e71267841c69d209ab9dc1a7e65e
+EBUILD zfs-kmod-2.1.11-r1.ebuild 4037 BLAKE2B 7627f4d740f94b6f3682603553c07a9d48a362111a4ca99f02bf51e792c4e3683b17418288bf031ab941e81062289cb6256f0e559e238a60fe942a4a4045e3d2 SHA512 4ac66f8c38397ab60b1ffc1bf15beab0116fe68b25959ddd5eb52d08b2238287f89bcda024b76da62beef00f9f0543055df78b12bf9f1d9dc9c776a03aed1290
 EBUILD zfs-kmod-2.1.11.ebuild 5435 BLAKE2B 792a37580d9cc5452a9b200751d82d337a61f42f01db006b31d1a26b14c0e4c12c654addad3c2eb8b7368062c277dd32bc9e10d8e124e05d66caa753efaf7432 SHA512 ac23176a1c1bba0a6309d4f4c8d2114b2a720409789759c88a94264041495c01d6f3dbc8c8e2515428ca33b87d56886bb535e46015e5c1848bf924e1006629a0
 EBUILD zfs-kmod-2.1.7.ebuild 5580 BLAKE2B 5e4ef24ec54cf5dda899cf9151de0df0a2ef981a9f6a465ab381392dfe8a9214aecc29da61e83c8b317eb568abaa1abff6231660e1c608f709c88d6610da5264 SHA512 253c5cda1e71b51bd2938151ae62872e780a3e2ff3129ef14d39176697f23693c4692da167a3cfa9b386d8521bed63e5345ea8adb60b480d3bac44b198f7a477
 EBUILD zfs-kmod-2.1.9.ebuild 5432 BLAKE2B 1f3473798cb522c80b1d9d244aad191c0118ebaafc8d2041cfad82513b16d68221467473efed4a7b084a44cd0a19331089510ddc402fa064cb15bf21914766ff SHA512 ed69ee9fcfb0ab1db51c1e3ee2a0a155a3eccdd1d297f83dffc3376ef20558e0421e441db0b00302cc2dd499e1693e4b63bbb95102da800e42635f00be2e7f54
-EBUILD zfs-kmod-9999.ebuild 6569 BLAKE2B 2bf117650742e0044bf78d4838c0f8b1a2895d4bac31df742be78ce93aa321074840233d825b8844d01a2de0d1923d0f42bacb53109b7c034592babdb5c4dde9 SHA512 f0342de93072653647992b0b1c22c81f026697446b721fb44cde9808beea93651d58323ebdefb783adfc9eb3b2d8ff02fb267fdf6e4109e1b2355e1867ffedba
-MISC metadata.xml 651 BLAKE2B 477c5d768a2eddab7bc0c14d0845801e25bfd9298fe229a132d7ff11a8560988d0230ec5d4b1447df32f58b9754df0cbe989f2a5600cd3fa99124ea4edc45cdd SHA512 d9bf0598c87bcdaab7d81dd5502caf1400f3c8d3834a6770630d85ed365cd4ebb3beeebae72d2d4d49bcdd0aa6cd709aa57cb2af4195dfc04a9c0cef89cfd724
+EBUILD zfs-kmod-9999.ebuild 5367 BLAKE2B 9b1c77345362ca3f60bbcd2897288778794beb86f5ca3ff3fdd58fb78aee59a510d47c8045941d3c6e2602bf909cc7bb51418692db76ba33166069037ebbaea1 SHA512 156d64dd90d22a63bdefcbadcc0639fa27c896f6ca7cf56e96246afe35a72d6ffd1023d0ec982de2c4f7fd62aebf7381ba78442c4b97480f363959a2ba4a24c2
+MISC metadata.xml 776 BLAKE2B 4c48182f7ceee679b4d947a70cb232980969b59bdc425463a929b6ae8be5f79450a3869bf3cc4d00069b65cda8a06f42eba29a7974c5e1b34a2998992901bcbe SHA512 f3f0af7dcdd26a01fc1b00af46ff64e7e6d7bb83a2225ea4cbff5c1a56651ddfdf3e7f59af914833f52828b9d059c6a8cb7f32037319abed129c40987349745f
diff --git a/sys-fs/zfs-kmod/files/zfs-kmod-2.1.11-gentoo.patch b/sys-fs/zfs-kmod/files/zfs-kmod-2.1.11-gentoo.patch
new file mode 100644
index 000000000000..53c5f27b3bed
--- /dev/null
+++ b/sys-fs/zfs-kmod/files/zfs-kmod-2.1.11-gentoo.patch
@@ -0,0 +1,24 @@
+Hack to pass the full linux-mod-r1 toolchain to make during ./configure.
+Not needed at build time given can pass it normally then.
+
+Eclass has workarounds, compiler/version matching, and its own set of
+user variables which creates disparity between ebuilds if not used.
+
+For the (normal) alternative: KERNEL_{CC,LD} alone is insufficient,
+but combining with KERNEL_LLVM=1 when CC_IS_CLANG will allow it
+to work for *most* people (will likely still need KERNEL_LD from
+linux-mod-r1, or ThinLTO kernels may fail with sandbox violations).
+
+Note KERNEL_* also cause failure if they contain spaces.
+
+https://bugs.gentoo.org/865157
+--- a/config/kernel.m4
++++ b/config/kernel.m4
+@@ -646,6 +646,5 @@
+ 	AC_TRY_COMMAND([
+ 	    KBUILD_MODPOST_NOFINAL="$5" KBUILD_MODPOST_WARN="$6"
+-	    make modules -k -j$TEST_JOBS ${KERNEL_CC:+CC=$KERNEL_CC}
+-	    ${KERNEL_LD:+LD=$KERNEL_LD} ${KERNEL_LLVM:+LLVM=$KERNEL_LLVM}
++	    make modules -k -j$TEST_JOBS '${GENTOO_MAKEARGS_EVAL}'
+ 	    CONFIG_MODULES=y CFLAGS_MODULE=-DCONFIG_MODULES
+ 	    -C $LINUX_OBJ $ARCH_UM M=$PWD/$1 >$1/build.log 2>&1])
diff --git a/sys-fs/zfs-kmod/metadata.xml b/sys-fs/zfs-kmod/metadata.xml
index 936f4ff82c8e..7e27782c6aeb 100644
--- a/sys-fs/zfs-kmod/metadata.xml
+++ b/sys-fs/zfs-kmod/metadata.xml
@@ -10,6 +10,7 @@
 		<name>Sam James</name>
 	</maintainer>
 	<use>
+		<flag name="dist-kernel-cap">Prevents upgrading to an unsupported kernel version when combined with USE=dist-kernel</flag>
 		<flag name="rootfs">Pull dependencies and check kernel options required for root-on-zfs</flag>
 	</use>
 	<upstream>
diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.1.11-r1.ebuild b/sys-fs/zfs-kmod/zfs-kmod-2.1.11-r1.ebuild
new file mode 100644
index 000000000000..cd38e7bd2037
--- /dev/null
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.1.11-r1.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools dist-kernel-utils flag-o-matic linux-mod-r1 multiprocessing
+
+DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs"
+HOMEPAGE="https://github.com/openzfs/zfs"
+
+MODULES_KERNEL_MAX=6.2
+MODULES_KERNEL_MIN=3.10
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/openzfs/zfs.git"
+	unset MODULES_KERNEL_MAX
+else
+	inherit verify-sig
+
+	MY_PV=${PV/_rc/-rc}
+
+	SRC_URI="https://github.com/openzfs/zfs/releases/download/zfs-${MY_PV}/zfs-${MY_PV}.tar.gz"
+	SRC_URI+=" verify-sig? ( https://github.com/openzfs/zfs/releases/download/zfs-${MY_PV}/zfs-${MY_PV}.tar.gz.asc )"
+	S="${WORKDIR}/zfs-${PV%_rc?}"
+	VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/openzfs.asc
+
+	if [[ ${PV} != *_rc* ]] ; then
+		KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~sparc"
+	fi
+fi
+
+LICENSE="CDDL MIT debug? ( GPL-2+ )"
+SLOT="0/${PVR}"
+IUSE="custom-cflags debug +rootfs"
+RESTRICT="test"
+
+BDEPEND="
+	dev-lang/perl
+	app-alternatives/awk
+"
+
+if [[ ${PV} != 9999 ]] ; then
+	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-openzfs )"
+
+	IUSE+=" +dist-kernel-cap"
+	RDEPEND="
+		dist-kernel-cap? ( dist-kernel? (
+			<virtual/dist-kernel-${MODULES_KERNEL_MAX%%.*}.$(( ${MODULES_KERNEL_MAX##*.} + 1))
+		) )
+	"
+fi
+
+# Used to suggest matching USE, but without suggesting to disable
+PDEPEND="dist-kernel? ( ~sys-fs/zfs-${PV}[dist-kernel] )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.1.11-gentoo.patch
+)
+
+pkg_pretend() {
+	use rootfs || return 0
+
+	if has_version virtual/dist-kernel && ! use dist-kernel; then
+		ewarn "You have virtual/dist-kernel installed, but"
+		ewarn "USE=\"dist-kernel\" is not enabled for ${CATEGORY}/${PN}"
+		ewarn "It's recommended to globally enable dist-kernel USE flag"
+		ewarn "to auto-trigger initrd rebuilds with kernel updates"
+	fi
+}
+
+pkg_setup() {
+	local CONFIG_CHECK="
+		EFI_PARTITION
+		ZLIB_DEFLATE
+		ZLIB_INFLATE
+		!DEBUG_LOCK_ALLOC
+		!PAX_KERNEXEC_PLUGIN_METHOD_OR
+	"
+	use debug && CONFIG_CHECK+="
+		DEBUG_INFO
+		FRAME_POINTER
+		!DEBUG_INFO_REDUCED
+	"
+	use rootfs && CONFIG_CHECK+="
+		BLK_DEV_INITRD
+		DEVTMPFS
+	"
+
+	kernel_is -lt 5 && CONFIG_CHECK+=" IOSCHED_NOOP"
+
+	linux-mod-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# Run unconditionally (bug #792627)
+	eautoreconf
+
+	if [[ ${PV} != 9999 ]] ; then
+		# Set module revision number
+		sed -Ei "s/(Release:.*)1/\1${PR}-gentoo/" META || die
+	fi
+}
+
+src_configure() {
+	use custom-cflags || strip-flags
+	filter-ldflags -Wl,*
+
+	local myconf=(
+		--bindir="${EPREFIX}"/bin
+		--sbindir="${EPREFIX}"/sbin
+		--with-config=kernel
+		--with-linux="${KV_DIR}"
+		--with-linux-obj="${KV_OUT_DIR}"
+		$(use_enable debug)
+
+		# See gentoo.patch
+		GENTOO_MAKEARGS_EVAL="${MODULES_MAKEARGS[*]@Q}"
+		TEST_JOBS="$(makeopts_jobs)"
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	emake "${MODULES_MAKEARGS[@]}"
+}
+
+src_install() {
+	emake "${MODULES_MAKEARGS[@]}" DESTDIR="${ED}" install
+	modules_post_process
+
+	dodoc AUTHORS COPYRIGHT META README.md
+}
+
+pkg_postinst() {
+	linux-mod-r1_pkg_postinst
+
+	if [[ -z ${ROOT} ]] && use dist-kernel ; then
+		dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}"
+	fi
+
+	if use x86 || use arm ; then
+		ewarn "32-bit kernels will likely require increasing vmalloc to"
+		ewarn "at least 256M and decreasing zfs_arc_max to some value less than that."
+	fi
+
+	if has_version sys-boot/grub ; then
+		ewarn "This version of OpenZFS includes support for new feature flags"
+		ewarn "that are incompatible with previous versions. GRUB2 support for"
+		ewarn "/boot with the new feature flags is not yet available."
+		ewarn "Do *NOT* upgrade root pools to use the new feature flags."
+		ewarn "Any new pools will be created with the new feature flags by default"
+		ewarn "and will not be compatible with older versions of OpenZFS. To"
+		ewarn "create a new pool that is backward compatible wih GRUB2, use "
+		ewarn
+		ewarn "zpool create -o compatibility=grub2 ..."
+		ewarn
+		ewarn "Refer to /usr/share/zfs/compatibility.d/grub2 for list of features."
+	fi
+}
diff --git a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
index 1df8508ad03d..82ac6d7c464a 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
@@ -3,29 +3,29 @@
 
 EAPI=8
 
-inherit autotools dist-kernel-utils flag-o-matic linux-mod toolchain-funcs
+inherit autotools dist-kernel-utils flag-o-matic linux-mod-r1 multiprocessing
 
 DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs"
 HOMEPAGE="https://github.com/openzfs/zfs"
 
-if [[ ${PV} == "9999" ]]; then
+MODULES_KERNEL_MAX=6.2
+MODULES_KERNEL_MIN=3.10
+
+if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/openzfs/zfs.git"
+	unset MODULES_KERNEL_MAX
 else
-	VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/openzfs.asc
 	inherit verify-sig
 
-	MY_PV="${PV/_rc/-rc}"
+	MY_PV=${PV/_rc/-rc}
+
 	SRC_URI="https://github.com/openzfs/zfs/releases/download/zfs-${MY_PV}/zfs-${MY_PV}.tar.gz"
 	SRC_URI+=" verify-sig? ( https://github.com/openzfs/zfs/releases/download/zfs-${MY_PV}/zfs-${MY_PV}.tar.gz.asc )"
 	S="${WORKDIR}/zfs-${PV%_rc?}"
-	ZFS_KERNEL_COMPAT="6.2"
-
-	# increments minor eg 5.14 -> 5.15, and still supports override.
-	ZFS_KERNEL_DEP="${ZFS_KERNEL_COMPAT_OVERRIDE:-${ZFS_KERNEL_COMPAT}}"
-	ZFS_KERNEL_DEP="${ZFS_KERNEL_DEP%%.*}.$(( ${ZFS_KERNEL_DEP##*.} + 1))"
+	VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/openzfs.asc
 
-	if [[ ${PV} != *_rc* ]]; then
+	if [[ ${PV} != *_rc* ]] ; then
 		KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~sparc"
 	fi
 fi
@@ -33,32 +33,30 @@ fi
 LICENSE="CDDL MIT debug? ( GPL-2+ )"
 SLOT="0/${PVR}"
 IUSE="custom-cflags debug +rootfs"
-
-RDEPEND="${DEPEND}"
+RESTRICT="test"
 
 BDEPEND="
 	dev-lang/perl
 	app-alternatives/awk
 "
 
-# we want dist-kernel block in BDEPEND because of portage resolver.
-# since linux-mod.eclass already sets version-unbounded dep, portage
-# will pull new versions. So we set it in BDEPEND which takes priority.
-# and we don't need in in git ebuild.
-if [[ ${PV} != "9999" ]] ; then
-	BDEPEND+="
-		verify-sig? ( sec-keys/openpgp-keys-openzfs )
-		dist-kernel? ( <virtual/dist-kernel-${ZFS_KERNEL_DEP}:= )
+if [[ ${PV} != 9999 ]] ; then
+	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-openzfs )"
+
+	IUSE+=" +dist-kernel-cap"
+	RDEPEND="
+		dist-kernel-cap? ( dist-kernel? (
+			<virtual/dist-kernel-${MODULES_KERNEL_MAX%%.*}.$(( ${MODULES_KERNEL_MAX##*.} + 1))
+		) )
 	"
 fi
 
-# PDEPEND in this form is needed to trick portage suggest
-# enabling dist-kernel if only 1 package have it set
+# Used to suggest matching USE, but without suggesting to disable
 PDEPEND="dist-kernel? ( ~sys-fs/zfs-${PV}[dist-kernel] )"
 
-RESTRICT="debug? ( strip ) test"
-
-DOCS=( AUTHORS COPYRIGHT META README.md )
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.1.11-gentoo.patch
+)
 
 pkg_pretend() {
 	use rootfs || return 0
@@ -72,44 +70,26 @@ pkg_pretend() {
 }
 
 pkg_setup() {
-	CONFIG_CHECK="
-		!DEBUG_LOCK_ALLOC
+	local CONFIG_CHECK="
 		EFI_PARTITION
-		MODULES
-		!PAX_KERNEXEC_PLUGIN_METHOD_OR
-		!TRIM_UNUSED_KSYMS
 		ZLIB_DEFLATE
 		ZLIB_INFLATE
+		!DEBUG_LOCK_ALLOC
+		!PAX_KERNEXEC_PLUGIN_METHOD_OR
 	"
-
-	use debug && CONFIG_CHECK="${CONFIG_CHECK}
-		FRAME_POINTER
+	use debug && CONFIG_CHECK+="
 		DEBUG_INFO
+		FRAME_POINTER
 		!DEBUG_INFO_REDUCED
 	"
-
-	use rootfs && \
-		CONFIG_CHECK="${CONFIG_CHECK}
-			BLK_DEV_INITRD
-			DEVTMPFS
+	use rootfs && CONFIG_CHECK+="
+		BLK_DEV_INITRD
+		DEVTMPFS
 	"
 
-	kernel_is -lt 5 && CONFIG_CHECK="${CONFIG_CHECK} IOSCHED_NOOP"
+	kernel_is -lt 5 && CONFIG_CHECK+=" IOSCHED_NOOP"
 
-	if [[ ${PV} != "9999" ]]; then
-		local kv_major_max kv_minor_max zcompat
-		zcompat="${ZFS_KERNEL_COMPAT_OVERRIDE:-${ZFS_KERNEL_COMPAT}}"
-		kv_major_max="${zcompat%%.*}"
-		zcompat="${zcompat#*.}"
-		kv_minor_max="${zcompat%%.*}"
-		kernel_is -le "${kv_major_max}" "${kv_minor_max}" || die \
-			"Linux ${kv_major_max}.${kv_minor_max} is the latest supported version"
-
-	fi
-
-	kernel_is -ge 3 10 || die "Linux 3.10 or newer required"
-
-	linux-mod_pkg_setup
+	linux-mod-r1_pkg_setup
 }
 
 src_prepare() {
@@ -118,60 +98,41 @@ src_prepare() {
 	# Run unconditionally (bug #792627)
 	eautoreconf
 
-	if [[ ${PV} != "9999" ]]; then
+	if [[ ${PV} != 9999 ]] ; then
 		# Set module revision number
-		sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" META || die "Could not set Gentoo release"
+		sed -Ei "s/(Release:.*)1/\1${PR}-gentoo/" META || die
 	fi
 }
 
 src_configure() {
-	set_arch_to_kernel
-
 	use custom-cflags || strip-flags
-
 	filter-ldflags -Wl,*
 
-	# Set CROSS_COMPILE in the environment.
-	# This allows the user to override it via make.conf or via a local Makefile.
-	# https://bugs.gentoo.org/811600
-	export CROSS_COMPILE=${CROSS_COMPILE-${CHOST}-}
-
 	local myconf=(
-		HOSTCC="$(tc-getBUILD_CC)"
-		--bindir="${EPREFIX}/bin"
-		--sbindir="${EPREFIX}/sbin"
+		--bindir="${EPREFIX}"/bin
+		--sbindir="${EPREFIX}"/sbin
 		--with-config=kernel
 		--with-linux="${KV_DIR}"
 		--with-linux-obj="${KV_OUT_DIR}"
 		$(use_enable debug)
+
+		# See gentoo.patch
+		GENTOO_MAKEARGS_EVAL="${MODULES_MAKEARGS[*]@Q}"
+		TEST_JOBS="$(makeopts_jobs)"
 	)
 
 	econf "${myconf[@]}"
 }
 
 src_compile() {
-	set_arch_to_kernel
-
-	myemakeargs=(
-		HOSTCC="$(tc-getBUILD_CC)"
-		V=1
-	)
-
-	emake "${myemakeargs[@]}"
+	emake "${MODULES_MAKEARGS[@]}"
 }
 
 src_install() {
-	set_arch_to_kernel
+	emake "${MODULES_MAKEARGS[@]}" DESTDIR="${ED}" install
+	modules_post_process
 
-	myemakeargs+=(
-		DEPMOD=:
-		# INSTALL_MOD_PATH ?= $(DESTDIR) in module/Makefile
-		DESTDIR="${D}"
-	)
-
-	emake "${myemakeargs[@]}" install
-
-	einstalldocs
+	dodoc AUTHORS COPYRIGHT META README.md
 }
 
 _old_layout_cleanup() {
@@ -190,7 +151,7 @@ _old_layout_cleanup() {
 
 	# kernel/module/Kconfig contains possible compressed extentions.
 	local kext kextfiles
-	for kext in .ko{,.{gz,xz,zst}}; do
+		for kext in .ko{,.{gz,xz,zst}}; do
 		kextfiles+=( "${olddir[@]/%/${kext}}" )
 	done
 
@@ -214,19 +175,19 @@ pkg_postinst() {
 	# we check first array member, if glob above did not exand, it will be "zfs.ko*" and -f will return false.
 	# if glob expanded -f will do correct file precense check.
 	[[ -f ${newko[0]} ]] && _old_layout_cleanup
-	linux-mod_pkg_postinst
 
-	if [[ -z ${ROOT} ]] && use dist-kernel; then
-		set_arch_to_pkgmgr
+	linux-mod-r1_pkg_postinst
+
+	if [[ -z ${ROOT} ]] && use dist-kernel ; then
 		dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}"
 	fi
 
-	if use x86 || use arm; then
+	if use x86 || use arm ; then
 		ewarn "32-bit kernels will likely require increasing vmalloc to"
 		ewarn "at least 256M and decreasing zfs_arc_max to some value less than that."
 	fi
 
-	if has_version sys-boot/grub; then
+	if has_version sys-boot/grub ; then
 		ewarn "This version of OpenZFS includes support for new feature flags"
 		ewarn "that are incompatible with previous versions. GRUB2 support for"
 		ewarn "/boot with the new feature flags is not yet available."
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index e98c23953045..5c775ea0323c 100644
--- a/sys-kernel/Manifest.gz
+++ b/sys-kernel/Manifest.gz
diff --git a/sys-kernel/rt-sources/Manifest b/sys-kernel/rt-sources/Manifest
index 2b4c98aacc10..778d8b491dbf 100644
--- a/sys-kernel/rt-sources/Manifest
+++ b/sys-kernel/rt-sources/Manifest
@@ -14,28 +14,28 @@ DIST linux-5.15.tar.xz 121913744 BLAKE2B 3921274b23f7938abdf3ed9334534b4581e13d7
 DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
 DIST linux-6.0.tar.xz 133886176 BLAKE2B c09a9c877ac0fac83dc31d2d04d96f0a3331d4ed78e3ad4edfd4dc077e1c11d0c49f419fdac4008b5c93d1b09c2b724e12ef0b38371ad0962908abf85dfa95fa SHA512 bac41a7aeb6e809616cee2f13dcd1c45e829dfd1ccf60aee1dc4c46b1e28532f4485c7d819a32940de84fdfbf89db80a4e919bce8a74b2948c5a01551771b714
 DIST linux-6.1.tar.xz 134728520 BLAKE2B ae60257860b2bd1bd708d183f0443afc60ebbd2b3d535c45e44c2e541bd0928530a3b62de6385dd4e4726ebbedcc0a871d4f3ffb4105b9f1f6d8ed7467f5688e SHA512 6ed2a73c2699d0810e54753715635736fc370288ad5ce95c594f2379959b0e418665cd71bc512a0273fe226fe90074d8b10d14c209080a6466498417a4fdda68
-DIST patch-4.14.311-rt146.patch.xz 243544 BLAKE2B a7c21414d0a64084ae81042d3584ac164b9a8a16971ff13f63a51688412d9506bd688f7b594fb3450b4edcc6ec295af05f67c6e03ae41fd38ff85f23375b1de1 SHA512 ecbef7ac115e92b5fb40815062cbb1e3137c9b277ab6d522ecd6fdb11c078366660583d72de93547853d484b48ae9aa4afa25305f6dde1c21094e1dcd198898a
-DIST patch-4.14.311.xz 5062424 BLAKE2B 06b9ae2da911607809ba897f9d852110fb7924b6693881bc54daacee21c8f3ebcc167747418f7f0c334cd9aa96de808d8fe4ff07bea1f0e2d36849d95c31494c SHA512 f34566a87f835013e88ef497590daff6c7b1527a7c8527f4c6f0a6029cb3c94ff0eada7c8847566b8aaaccc514d25142eb2c27542ab0f779368134d3f466077b
+DIST patch-4.14.314-rt147.patch.xz 243592 BLAKE2B 0bb00f8fd5fc5922c0396b7863ec2017ce707358dca1a4cc9cfe1ef409d3dc98095d73d6db2edc20dee1f3262697ea9ebd108db19995b7ebb79e23a131bd8bdf SHA512 c8e66702739607494cb08e5a065e9a09c445a0e87a1c206f7e8336ab9f31c8a5bed9a79a64de7d52fdd8ca6b51e748bccf2299762c46ed1ad9bd5892e219094f
+DIST patch-4.14.314.xz 5079908 BLAKE2B a6701b5fe178e1a84b20bf34f3045edfdcc5698923cca7344c9072d96ee448a7877477d81db643f579ef39c5a27c597f905961c01d1a853025670e9898605e36 SHA512 129d040d0c2e132e6acdb4e0cbd665f612ee11c431733bdeba489b53453abb4be006fae2beeac21c6ed03b15bb99cf7681ae208b36749cb65266942345b236fe
 DIST patch-4.19.280-rt123.patch.xz 168120 BLAKE2B 351dfb52fb24f7e25e76eb77150c8dc68751dec2531b9d288802ddb4667f485d9b9ce4486abf1486567987c425c8465f59a6b4867d4766319af65c7e217b8679 SHA512 41a89d1bd8ca50044420b05c3ca2c9c98d1b0eeb2e8eaeaf582ab71f47f9aaf0b0f6c2d68921c2b2af81b377a9a64bf7853f203bcb12aa21485cda8a1e367948
 DIST patch-4.19.280.xz 5298824 BLAKE2B bfd7f3e73c1c34dc53501a1d4e1498c2a93d3cad07fb6703da1d2c0b819f96a1e3990b98909c9099816b0018a6006b07b48f0d5e1d38bf78b78868b32b93c3bd SHA512 968ddae5628e7a1f2b1260179586eef943fa664eac4b6b4945d49d93a5bf94ab0e8bca789cd545ed125c7caa0e0ea4441c8a5360b010cee39888092c7aade346
 DIST patch-4.9.327-rt197.patch.xz 169900 BLAKE2B 432b68f260db4970c3bd844a4d1a8709ceaaee86df6a77bd4be6260f53b1491f900cb63fd59efbcd55161e6c5629274fd555a05d97baef15bd68103194b2c6c1 SHA512 acfbe50962fb2fe6b215be10f076427161950098f33278bf5a51c3a28dd70203923e92b2a43b635fb2fe4fb791f4fd532eb4db378b094baa8abaa9fbfeaed822
 DIST patch-4.9.327.xz 4449004 BLAKE2B b48aa23af600cafe5117854b76105c9c65adf9f2f026927367781cd360c61c551b174d2ea73eb02543e626408b27bf3bb8cfed62d9c36e9bac6d22c7e1099a48 SHA512 d6a5421cfbd70ff20664cbf05f9c955f03b55c3e22306f7adfd87ed760794817fd7d2211e5d92b169df64d8578717a9250c7ea6ca312bf10287a7283bf66d0e6
-DIST patch-5.10.176-rt86.patch.xz 171044 BLAKE2B da24333ea54bc11f15cbf7da03cc6a8d23bcc15253b0ea2c4c0155bff1ba1abcaba12e71cfec64e7a7dcef3a246569e72e174222c8ec23f97947700bb5836b51 SHA512 fcc8da740b152488cea4ca6f5d48a4180097472bbef135befaa54a651aaf309a81491a2e622a36e6e9a6aa32ea78742d7ec7cc1de80f03ff00dcbdc2a2e34ea8
-DIST patch-5.10.176.xz 4502716 BLAKE2B f5e3ac584d7d50dec23dd23880398b576a1adcfd0f31251f8b0f68b54e250f1ab67a8e7e6c10e910892c52e0681b0c32a9b153b2fe727c7c117332171c79e329 SHA512 d9e63b37991995123f45ea08287f6b7d978293acba505ee44f4bc8bd61fd6df70cf45e65a8ebacd05d894bbf74208748c702528ba232d4c115ebe78a1c65e612
-DIST patch-5.15.107-rt62.patch.xz 77116 BLAKE2B 6991e755081df47cd256b59db0380f2f168e6aab9e615c6d7f60ff0e4addb03cef960aaced89005719df5b8b4672e84ec54babc40c9563ffb5cdec7932366733 SHA512 d7a288cc7fc5ce6a97127e48e6dd27c2ef194827eac9af4da96d17806a3b0a96af6613d00dc732f9389e4799771f7d694b4e782c8163656b3280405477b59425
-DIST patch-5.15.107.xz 3867112 BLAKE2B 44ad474d664539d57e82bfabfc7bca05a15f43454d899880d65d09cbec1b40b2a30389ad7f5b35d78230f4d971e7223dc59bb1ae5a446522e03bdbdf1e2b3a9a SHA512 51570990fa1ab00fe9a7f2c08854236057a008f63bee51cf5c2bb16165f4a06944ec8b915412cbd21aa77eac324c03b431e201386dd6258f7367d9fc8ddd6734
+DIST patch-5.10.179-rt87.patch.xz 171100 BLAKE2B 3aa688ac72f636e2621f5c438aa6e1b41699c01d8bb53de4baa0e113f5a4cc455c71a4fca12ac1aa36d16c9f45731133d4eb81d5961b7f88337e672fe73a7319 SHA512 c24f7067f295e7cc6380e9004790f9aa65ae317cbb2b8fd87db90b2db83c3d27476dd175385eb5e457184211532c030a07bbe70645f3a1b14623c995fb9cd8c9
+DIST patch-5.10.179.xz 4578340 BLAKE2B 4b7d732b9f73afb7de9bdf642905f6adc8b37b847530d4b2a7d0d7b48c070e971a67773c6c6fbc1dd58385431515fb3234ce418f5e7a90af482269f13737ece6 SHA512 b9116ed7fbd858e52cd761f46837c6975e928244bc1d3718cbfeb03742ef707caf050b1ed60ed311ed886aae87529b2ba6e324da4cc93685806a3f5f0d15343c
+DIST patch-5.15.113-rt64.patch.xz 77112 BLAKE2B 2532fe71e4250f1cb4524c1becbc43e30dc9eabd7527f9be9ec66bee7320ef315b5764984fcdb676b8a48f25f3964e2a386689a9e45a3e472a1c3af1179735e6 SHA512 eb08fa96e9fed52f27fe06b0b47c93b7d2df84e05838604c6ced22f872080041184d2bf351d4ec1dc7310f88ab18e06e0df5868da7ab17564871b1d4ac6f2106
+DIST patch-5.15.113.xz 4110072 BLAKE2B f973f4249e71e61760bc9a32cdea137d9c1326e2e78adc423d620e216a769f419267310bdfea5c374a2f3fd9cb761f998a27dc2ba43a42c6296e99723628764a SHA512 37c003d30ec72ba18c0eb3ddfc5245423942333edee51efa2a32c6eb0f1fdf26d75394f3ad5afcf8917b84648bdd4c50afa56bee0cb18c224030b42ecd9b91a3
 DIST patch-5.4.242-rt81.patch.xz 183132 BLAKE2B 0c56be2a5abe762dd5bffba6bbb749a4b7a753d09046c25b17e4c926a0241b1ab67fecc1e6607de7c74bf01d67d2e9daa2a3ad54db912588734978790d68d359 SHA512 fb9fa32dd0976e5ee86d45b69b92416c5850edc95d868ad4f20d7dfe1ed1d4a0dd0432ed5b8f89997c32ed86dd7e76e7a57c7de4acf05b8fd54c8b2be4e1e55a
 DIST patch-5.4.242.xz 4711468 BLAKE2B 7cd14f8183c45f3bad3df92e46a74242d2091efb3693b1fd098d81409c8d47e15c6a4bd08545972d38c8b41d26941ad2b686ae4732d648b1926d70d7bc931f97 SHA512 b7ac45533559e3d0f802dd392868062b2f3099d9384f5d95502dce518008f038123c3ae5a04e220a6ec39c993f7e29b8c0db01659cd9010591ae34c4a5e8d9b2
 DIST patch-6.0.5-rt14.patch.xz 59916 BLAKE2B be06477b7733cb280bbb8ab1cc2b4c611d5b133d97e2459877a8aac0c82a6fa74cba7a7640b49ba6dd9d0abd61a9f9682affb032a8b9f0097874fff35fea9b71 SHA512 3e36e45f16499ddbd7029723363ff4cf6e7cd9503ba49f9ce0dbb960b34855c8411abccd32838f9f162412b4a1749f676432e463fce8066496f256313c99d79e
 DIST patch-6.0.5.xz 274580 BLAKE2B b1fd53745b1858f92ded90a78d8060e1c916a8b6c256f96188331e5ac80242a40a83d14377ad0befec5415135925821cb264489cee63fe4ad432ba00c64983ff SHA512 c4ac4387c490e73b8d91d13fbea9a1e065be4bacf9535177e625561adb2411908a546f9c4327748aab6bbfc021f30887f3e5df5d6019c6cfe00fe5bf64aad2eb
-DIST patch-6.1.26-rt8.patch.xz 48656 BLAKE2B 99509a60641a0fbfe5ea91d25ff333ca55900a17586c979eef0edb75886af646917e69ee3300a1caecefa8976410228e77a21e14efe9fde989cf7de4a5203d85 SHA512 c8e170824a8f094ae2c4846d0fd335eb615d909b5f1f52037e3adec17ce625b45844b585b5c169ec2ac1cad26ae38f246ca235c4295035594353d7d50a3c5fca
-DIST patch-6.1.26.xz 1399944 BLAKE2B 1e28a40ea02b75f8c22e63ee6af0624a45327425755624a5a19b71af0ca68440457fc92e572765474cfa95dcea6a5cbe7bc5e63e6f10a0f8d4616fa35ce8afcd SHA512 dc18d896b9b55a86d0c592da196a9b8993b32ed710d41eb7c288d97ba97c0e698782fa9fa9018bfce61d519d6af655fa32d5a018a318b0abc72baa8957188708
-EBUILD rt-sources-4.14.311_p146.ebuild 1422 BLAKE2B fce4ffdda967dff1564cd13c9b05cf198b3dbc8af655bd1798e2bafe04fa4fa9136b9b0a8c45520e7d94a9b8391f2e8f1264172bf73eb460c6403efc2490b10c SHA512 f333ad7f5a2cb12941bc11027b6a8ce7765e9288cf35bed7e22ee47aebbc13a84eb590e3d9f3196b387a8687a69d5b2b62fed3497d61ef0c0270d136e2a143b2
+DIST patch-6.1.28-rt10.patch.xz 48628 BLAKE2B 22946307fe1f8dfb46dcddbb7c9793f006444df5d277f43d099af52a555169fefb2ab1e693121d7ee62734e72c55e404e6dfd935c083c596c4dcff50d7c5843d SHA512 94d2fb9cd1e5010884129017ae1d661701a3faffdeafaac0757700bd0402aedbc6820f77ebe04bc819f03c098b2d6eeb9b5d7ea94be2cab43b982c13393e8aa6
+DIST patch-6.1.28.xz 1589864 BLAKE2B 4a464de77a1e4a135ccb441e1972d6511d49d34a0ef8b52316ea82ccd620445ac0d8492df1b4a84e1732f53e09b141a54cc0bbec6e444c3f7b91dd65eaca87d3 SHA512 d67359b560c093f9651f7f49f9a9ea0f470dc3ecef59a2080ce9826017522cff53e9cb7473cd506a0d6761343dd7d5ecd5d628dc724ee2f85325dc070ae438aa
+EBUILD rt-sources-4.14.314_p147.ebuild 1422 BLAKE2B fce4ffdda967dff1564cd13c9b05cf198b3dbc8af655bd1798e2bafe04fa4fa9136b9b0a8c45520e7d94a9b8391f2e8f1264172bf73eb460c6403efc2490b10c SHA512 f333ad7f5a2cb12941bc11027b6a8ce7765e9288cf35bed7e22ee47aebbc13a84eb590e3d9f3196b387a8687a69d5b2b62fed3497d61ef0c0270d136e2a143b2
 EBUILD rt-sources-4.19.280_p123.ebuild 1422 BLAKE2B fce4ffdda967dff1564cd13c9b05cf198b3dbc8af655bd1798e2bafe04fa4fa9136b9b0a8c45520e7d94a9b8391f2e8f1264172bf73eb460c6403efc2490b10c SHA512 f333ad7f5a2cb12941bc11027b6a8ce7765e9288cf35bed7e22ee47aebbc13a84eb590e3d9f3196b387a8687a69d5b2b62fed3497d61ef0c0270d136e2a143b2
 EBUILD rt-sources-4.9.327_p197.ebuild 1422 BLAKE2B 78b1bfe2ddf38279cb8d714b80f8123db0cd5fcb4626cc5a60550ce1a9573631bfeb71de9018c9609efa95a29971fbd73e00217ad2b56a840efc6391bf045b04 SHA512 00aa2b9086b99ff329ff856457aef5cf6d366533b72ecd85aeba4d6b29afe19c986d17c12e4d40edbdbce52a992eb619bd5fbb6019519d2a192d7c31eac1d308
-EBUILD rt-sources-5.10.176_p86.ebuild 1440 BLAKE2B 748f625c56954717e0e7798829e9a31d48061582c3d10ad87efcb9b863d19856e2b86fbc9c99732445385c3844a11737964bc85075b8409eff0e3c8f21b29b14 SHA512 9cf1bdef0fafb9aaeda8456f53820aecae7f4bddc7135861815ff53e1b241c9d0e078007c4839202d54942247c66c528956e74fd21914f8e34de0ea4904c1fb3
-EBUILD rt-sources-5.15.107_p62.ebuild 1440 BLAKE2B 748f625c56954717e0e7798829e9a31d48061582c3d10ad87efcb9b863d19856e2b86fbc9c99732445385c3844a11737964bc85075b8409eff0e3c8f21b29b14 SHA512 9cf1bdef0fafb9aaeda8456f53820aecae7f4bddc7135861815ff53e1b241c9d0e078007c4839202d54942247c66c528956e74fd21914f8e34de0ea4904c1fb3
+EBUILD rt-sources-5.10.179_p87.ebuild 1440 BLAKE2B 748f625c56954717e0e7798829e9a31d48061582c3d10ad87efcb9b863d19856e2b86fbc9c99732445385c3844a11737964bc85075b8409eff0e3c8f21b29b14 SHA512 9cf1bdef0fafb9aaeda8456f53820aecae7f4bddc7135861815ff53e1b241c9d0e078007c4839202d54942247c66c528956e74fd21914f8e34de0ea4904c1fb3
+EBUILD rt-sources-5.15.113_p64.ebuild 1440 BLAKE2B 748f625c56954717e0e7798829e9a31d48061582c3d10ad87efcb9b863d19856e2b86fbc9c99732445385c3844a11737964bc85075b8409eff0e3c8f21b29b14 SHA512 9cf1bdef0fafb9aaeda8456f53820aecae7f4bddc7135861815ff53e1b241c9d0e078007c4839202d54942247c66c528956e74fd21914f8e34de0ea4904c1fb3
 EBUILD rt-sources-5.4.242_p81.ebuild 1422 BLAKE2B fce4ffdda967dff1564cd13c9b05cf198b3dbc8af655bd1798e2bafe04fa4fa9136b9b0a8c45520e7d94a9b8391f2e8f1264172bf73eb460c6403efc2490b10c SHA512 f333ad7f5a2cb12941bc11027b6a8ce7765e9288cf35bed7e22ee47aebbc13a84eb590e3d9f3196b387a8687a69d5b2b62fed3497d61ef0c0270d136e2a143b2
 EBUILD rt-sources-6.0.5_p14.ebuild 1440 BLAKE2B 3f21c1c4a224731b17de0ce5f62e3713f90e6df36e2e243fbff8308da8316737eedc275174771a8a6666adef069a74a3a6098e34868d0a99bb5d17526f7dd44a SHA512 c34766b92f4f8a8f16d17b63103cb2cca3cfc4d73d71b5284ff715a9759689dd289145bc5ddbaa62244f5e81db9959f54dd1c68effdda8d71dacb1636dec15b2
-EBUILD rt-sources-6.1.26_p8.ebuild 1440 BLAKE2B 748f625c56954717e0e7798829e9a31d48061582c3d10ad87efcb9b863d19856e2b86fbc9c99732445385c3844a11737964bc85075b8409eff0e3c8f21b29b14 SHA512 9cf1bdef0fafb9aaeda8456f53820aecae7f4bddc7135861815ff53e1b241c9d0e078007c4839202d54942247c66c528956e74fd21914f8e34de0ea4904c1fb3
+EBUILD rt-sources-6.1.28_p10.ebuild 1440 BLAKE2B 748f625c56954717e0e7798829e9a31d48061582c3d10ad87efcb9b863d19856e2b86fbc9c99732445385c3844a11737964bc85075b8409eff0e3c8f21b29b14 SHA512 9cf1bdef0fafb9aaeda8456f53820aecae7f4bddc7135861815ff53e1b241c9d0e078007c4839202d54942247c66c528956e74fd21914f8e34de0ea4904c1fb3
 MISC metadata.xml 426 BLAKE2B 89cc1d5f99d265e074847c32bd90c678e47e5a6a01706f3bf92211d82db4bf2d4397fb8dd62aa11bfbd25ab463633fc62a991d89e719ae0c5e608f1bafa0c3ee SHA512 bbed525e3e382d7fce0ac05a015b816b423b426fac03519d6c8f49a9dfa1b1c6035e9fc85d97198a680e4e0dc20af2f44815b3de7a0393b06d7ce0b5c0dd0145
diff --git a/sys-kernel/rt-sources/rt-sources-4.14.311_p146.ebuild b/sys-kernel/rt-sources/rt-sources-4.14.314_p147.ebuild
index 0ec82ff6dffb..0ec82ff6dffb 100644
--- a/sys-kernel/rt-sources/rt-sources-4.14.311_p146.ebuild
+++ b/sys-kernel/rt-sources/rt-sources-4.14.314_p147.ebuild
diff --git a/sys-kernel/rt-sources/rt-sources-5.10.176_p86.ebuild b/sys-kernel/rt-sources/rt-sources-5.10.179_p87.ebuild
index 03c59e4fb6e4..03c59e4fb6e4 100644
--- a/sys-kernel/rt-sources/rt-sources-5.10.176_p86.ebuild
+++ b/sys-kernel/rt-sources/rt-sources-5.10.179_p87.ebuild
diff --git a/sys-kernel/rt-sources/rt-sources-5.15.107_p62.ebuild b/sys-kernel/rt-sources/rt-sources-5.15.113_p64.ebuild
index 03c59e4fb6e4..03c59e4fb6e4 100644
--- a/sys-kernel/rt-sources/rt-sources-5.15.107_p62.ebuild
+++ b/sys-kernel/rt-sources/rt-sources-5.15.113_p64.ebuild
diff --git a/sys-kernel/rt-sources/rt-sources-6.1.26_p8.ebuild b/sys-kernel/rt-sources/rt-sources-6.1.28_p10.ebuild
index 03c59e4fb6e4..03c59e4fb6e4 100644
--- a/sys-kernel/rt-sources/rt-sources-6.1.26_p8.ebuild
+++ b/sys-kernel/rt-sources/rt-sources-6.1.28_p10.ebuild
diff --git a/sys-kernel/vanilla-sources/Manifest b/sys-kernel/vanilla-sources/Manifest
index a8499c173963..a3a800db69f9 100644
--- a/sys-kernel/vanilla-sources/Manifest
+++ b/sys-kernel/vanilla-sources/Manifest
@@ -9,7 +9,7 @@ DIST linux-6.3.tar.xz 136891752 BLAKE2B f1887c8924efa8d0cb14c4e604affd0b0168bcf2
 DIST patch-4.14.315.xz 5093748 BLAKE2B 15e5840f1136727da6e9113d0f9c84440723d1482561de0340692b092d01fd64a88b7178daa8d736b2d44fda8c24b2ad633d5da12c02ada7784c29ef3942903c SHA512 b0688c74c8de0778698dbb6735a835f33fd470caeba24d07dbab2a3257b15e6114bec2722b099bfa62e9cf3e0bfa9938ea9fa8e2ab17be5ef6ff5351e83fc0ea
 DIST patch-4.19.283.xz 5353748 BLAKE2B 8d92c9a02960302c11a52f50b117edfe2f8e4c9ea256e42ce4a368ce33d4cda2c2dbafbe55bd4b99099fc40c18c96cb039483ff9f958bc5ef51b3dfb642eaef9 SHA512 09e9a804fac9b1958dad56ea13b9561f98ff0ff41d4738584d0e6f108d87d8183cf3c1edbe4c6c6e8c31e127fc75bdbc51bc7bc49dc4bff078d79ca423f85bf6
 DIST patch-5.10.180.xz 4649100 BLAKE2B e8ef962a108298004c7fa654d54b11d12d86bb84c15d97d36bfd483b6f816e9923692257ebde3bc4983b87aaa780885ce9f3ac73860130c364ca3d4f0786369e SHA512 ce31e7e48d52258cd91a828251f05b8eec1d0c1c3193b61240b4f6952134d6b6b2e7c82935d07f95171afad6be8cc717968e86c569346e199238b1ca999e8e48
-DIST patch-5.15.112.xz 4056984 BLAKE2B 257ab82b08537e7503dd5ae8fc70cdd87e7c1d49b9c9695e82f4ae24ee8c59a5804ab8215ec2c8b226387385852baed5af4c0b803e15f0847c3d03f680212ddb SHA512 f21939ba51bbe5be3e2eb01e27ab32d7f39839e4a3bfdf4fb9a08c4c193e3a63b2ac84fec524486dfcf8c66b521c2bc85bac37714fc58121dc911ca75ea86c9e
+DIST patch-5.15.113.xz 4110072 BLAKE2B f973f4249e71e61760bc9a32cdea137d9c1326e2e78adc423d620e216a769f419267310bdfea5c374a2f3fd9cb761f998a27dc2ba43a42c6296e99723628764a SHA512 37c003d30ec72ba18c0eb3ddfc5245423942333edee51efa2a32c6eb0f1fdf26d75394f3ad5afcf8917b84648bdd4c50afa56bee0cb18c224030b42ecd9b91a3
 DIST patch-5.4.243.xz 4766864 BLAKE2B 5b1966464cf023b4a18668035381e8b277d2298dc0e8c86130de7044818e0e6c7c2685e2c1dbe8d7f7db13ca7c166376ad50a6126018fcffa6f542a61028d92e SHA512 38d1978c1b794a10e0476bdc9bf640a06a5174aecb4933342c81e70c11f049e1a690a7323c8a31d245b5472e98dbc63796c5b3085d040a67792f7cd8e1249af1
 DIST patch-6.1.30.xz 1768452 BLAKE2B a4b4d44ee200a08921aafdc0ff97d3d84b552be94f267eb4fcf6df425e5becbc0c8ad1c5cea87dd19ca03ac7d27b320b996f8430fa23a0ac67041c747b02b6fb SHA512 366a6a3029392559e35e2a7c14474b15dffaa5d517df9cda3bd2bb171fbcd6bf82d526ada2298945c87c9a7a0b87c8ac1ac7fe64969bf133e4b6f8cbf67b9bec
 DIST patch-6.2.16.xz 1047540 BLAKE2B 0caa2b99a921a3ff15fdc9c000fce8388e5bab077fc71cdb01dbb770d71466229b13fdda48e98726359dfdac1c83fc0f6635a99df6002bb660c665372bdfeae7 SHA512 7b9eb6ab132afcc2caf13a28bc730cb5dba9ce7148a5b892e0147b97ee059e6a82fdf5876246545a282d3fcca6d2898c5f2f0c308f9200d959fb2eecbf87bf3f
@@ -17,7 +17,7 @@ DIST patch-6.3.4.xz 454372 BLAKE2B 4621cd1bac4a29669558a5c1d9e05db8db89e8151cdf7
 EBUILD vanilla-sources-4.14.315.ebuild 432 BLAKE2B 231885066aa053aebef45736afd51c83480460ad089ca2ccbf40e9d610f10bf1e70d75cff9c0da9529c220f0715470fb28243753782740012f139f0d37ada94b SHA512 4c41937ff77fb3ea6887eb08406d381150ed3b8b5bb008ae5def527fce7288d89a9f7b803a5bb34ca147cefbfae5e71d3bc5f15b92f9ed4f49d875300fba60a9
 EBUILD vanilla-sources-4.19.283.ebuild 432 BLAKE2B 231885066aa053aebef45736afd51c83480460ad089ca2ccbf40e9d610f10bf1e70d75cff9c0da9529c220f0715470fb28243753782740012f139f0d37ada94b SHA512 4c41937ff77fb3ea6887eb08406d381150ed3b8b5bb008ae5def527fce7288d89a9f7b803a5bb34ca147cefbfae5e71d3bc5f15b92f9ed4f49d875300fba60a9
 EBUILD vanilla-sources-5.10.180.ebuild 432 BLAKE2B 231885066aa053aebef45736afd51c83480460ad089ca2ccbf40e9d610f10bf1e70d75cff9c0da9529c220f0715470fb28243753782740012f139f0d37ada94b SHA512 4c41937ff77fb3ea6887eb08406d381150ed3b8b5bb008ae5def527fce7288d89a9f7b803a5bb34ca147cefbfae5e71d3bc5f15b92f9ed4f49d875300fba60a9
-EBUILD vanilla-sources-5.15.112.ebuild 432 BLAKE2B 231885066aa053aebef45736afd51c83480460ad089ca2ccbf40e9d610f10bf1e70d75cff9c0da9529c220f0715470fb28243753782740012f139f0d37ada94b SHA512 4c41937ff77fb3ea6887eb08406d381150ed3b8b5bb008ae5def527fce7288d89a9f7b803a5bb34ca147cefbfae5e71d3bc5f15b92f9ed4f49d875300fba60a9
+EBUILD vanilla-sources-5.15.113.ebuild 432 BLAKE2B 231885066aa053aebef45736afd51c83480460ad089ca2ccbf40e9d610f10bf1e70d75cff9c0da9529c220f0715470fb28243753782740012f139f0d37ada94b SHA512 4c41937ff77fb3ea6887eb08406d381150ed3b8b5bb008ae5def527fce7288d89a9f7b803a5bb34ca147cefbfae5e71d3bc5f15b92f9ed4f49d875300fba60a9
 EBUILD vanilla-sources-5.4.243.ebuild 432 BLAKE2B 231885066aa053aebef45736afd51c83480460ad089ca2ccbf40e9d610f10bf1e70d75cff9c0da9529c220f0715470fb28243753782740012f139f0d37ada94b SHA512 4c41937ff77fb3ea6887eb08406d381150ed3b8b5bb008ae5def527fce7288d89a9f7b803a5bb34ca147cefbfae5e71d3bc5f15b92f9ed4f49d875300fba60a9
 EBUILD vanilla-sources-6.1.30.ebuild 439 BLAKE2B cbc87f55813e90aed1096e41ce4845597dc379a363cdba59dd4bf455176814aea6d7bc66699ee16d6ffaf7bbf4de7351d4592df4f03049407ef4009fc06a8d2b SHA512 c8187b4946370840fbf77ce77844bc1c05f19ad8505e1e6604209a17798b3865f2c0bbe52e818da051d77256a72e01ea350652046f83fdda45e1bdb11816cca3
 EBUILD vanilla-sources-6.2.16.ebuild 439 BLAKE2B cbc87f55813e90aed1096e41ce4845597dc379a363cdba59dd4bf455176814aea6d7bc66699ee16d6ffaf7bbf4de7351d4592df4f03049407ef4009fc06a8d2b SHA512 c8187b4946370840fbf77ce77844bc1c05f19ad8505e1e6604209a17798b3865f2c0bbe52e818da051d77256a72e01ea350652046f83fdda45e1bdb11816cca3
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.15.112.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.15.113.ebuild
index c04a9a5d6ea8..c04a9a5d6ea8 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-5.15.112.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-5.15.113.ebuild
diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index 62b84bf54696..6b7836cb188d 100644
--- a/sys-process/Manifest.gz
+++ b/sys-process/Manifest.gz
diff --git a/sys-process/atop/Manifest b/sys-process/atop/Manifest
index deecad171114..067c63992ffd 100644
--- a/sys-process/atop/Manifest
+++ b/sys-process/atop/Manifest
@@ -1,5 +1,6 @@
 AUX atop-2.6.0-build.patch 911 BLAKE2B d67b53d297d2e05ce098eca6e2f99ee2314652755d01671a72bc2501913419461bbafd7f054a58ff62dc90434960cdcbb335e397e6c7316670aca902fcd504d7 SHA512 9798131103ed5d34210a00d0e7fc82f4a50bd5a2c6bc12dc67d6a34192a0bb8bcc38777311d5a6562af9434766b26ad9fc2c4452a8da1b28316a816c3316761d
 AUX atop-2.7.0-netatop-makefile.patch 901 BLAKE2B 8bd0550e117f6bb8b9143b910681817096f6449fa6143f04378bf86a2ed990eec862af8199044496d659b14f01cff1e56be41741e4102c10ee2ccae4ef4f2106 SHA512 46c034f9ee9b743811f54f7afbc88a72c8ef8f768f749841a52cea3502efcbafe6b04e21045823028599d88984cbbf03ec26eef90592a4c3d6b53296c80b7937
+AUX atop-2.9.0-netatop-makefile.patch 897 BLAKE2B f1f05008e329ea4b96a6b43336fa5df5356c011f6b5eaf3080766e4314040f0629f58f86e9957f095897079f7490fc954ea1ae2556cf8dd7e948497ccdb4d0b4 SHA512 2bd5988ed31af5a528e351ea58a072a06d7d297c7f89591a8b530e507fc342e2aa762c6344cdd8380affeda1e29bb071aee54e4b20379d5a11e21c797ab8fa80
 AUX atop.rc-r2 268 BLAKE2B d0673e73ee13d7ac5f1c31544f8f9ba8aefe14c2ebf4e90b090d5a64a308bdd2e42b4131ea5c931e9e2f2386139343cfceb7c04c1378ebd3a260a5d55d0dd5b6 SHA512 07699f1190faa3a8343314b5c8419e7ea49280fef664334f03558907eb5654bc33c7f4baa3fa54cc6f07866c378c984ff81e020e69f0b146c68b8503ab010d0c
 AUX atop.service 190 BLAKE2B 905a7b42d38b3ab25916c90d7b50c52721f9b061c99e8ce5b9d8cc6c452d1dfeba5478389471778e2a988fd058301bae001139c1396bd9c4a76f2b7f79968377 SHA512 194e9703f34b6a1c749ed5bae3e8708dc625d30e174e285a0998c8aa0d2b1b34da70a3d1db86380abc40615b28a5bdb37b2d511be983da5fd7f154b9686ba343
 AUX atopacct.rc 1054 BLAKE2B 80f301506d805ae54552f088c53bf18cab1ee52b76a37387500176e61eba317059b10c9955d13ac5718547253401ec21f0add4b189e5d04ff724af43c8c50b73 SHA512 ddb026c4ebf63dccc6f49b2b7db829d7ba0388da080a65562bac3f2d7ebacc95093099a0fc9d636af5462ace4a9e118eacfe3eb626a70245e7c5c1e874866f02
@@ -11,5 +12,5 @@ DIST atop-2.9.0.tar.gz 282412 BLAKE2B 8531eee3bffabfb3cacdb6bea4c4a1b7ea56da8781
 DIST netatop-3.1.tar.gz 22812 BLAKE2B 1b1faebf1392a57db6b4662192f90821289c8fc40c2c1ee0ad61feeeee6477c4d091744a1e82cdd987baf59f8dd71fc6d242d6dd294b8fb29b9447a9d5055996 SHA512 b12fd2287d89d3a8277f8fb540a19e6d26aa26c3f88e7ae2e6601b63f78d642e73b8d16cf351f6979ce7bbf53251b9c1faa76798a87f70cf3dcf51279eb0db68
 EBUILD atop-2.7.1-r1.ebuild 2410 BLAKE2B c18f5c29c904d586563459d392edbda0f6a67baf3a0b24f827a7b2cef97e2ff031c6ac1ff8070e7dec6ff0e6b490020affed5043cc387eeac34d8f7644649914 SHA512 8f302fa0d71d7e2cf3bb889c4ed1706fa3b66c84837994cf7b1fc7903870c6cb4cefc554b268890fb33ac1caacce1cd0a1d1fe5b50e6cbca6d2b36d0f34ea792
 EBUILD atop-2.8.1.ebuild 2451 BLAKE2B d79c76e712e2ec0f30bf91b0dbea59f711c5b7b79bc0ecf61c13056277774324f69c2173fa68910bee425526224f25e500446039790d0b4cdb5bc0ce7922ef12 SHA512 1b74732cc14ca020e35257a1110f3fbb83c85845fc75578e923a46ff75835a0fa9ddb7a7c03c9b281151e60c3157003870bdd35294f9576e7f44ba54e9e7351e
-EBUILD atop-2.9.0.ebuild 2454 BLAKE2B a3339b1a6e574bcbf4f40aa0f3db247f2f29737a0272730eb0e88db3ea453ddd34e8b4ee4eccab882c1a41ccce6d49f38de4826f1f6cada77b14c32fa8f84f10 SHA512 17e9d67492aa07be1e325f13d6da847adcfae6d92834a678a1951342ab0c09308e4373ae11367eaf4178db74f4bbd0cc484e8f0e35779cad97292ce74e3ac6e4
+EBUILD atop-2.9.0-r1.ebuild 2422 BLAKE2B 1655f3404be6073babbf643a3728ce1cc8be29f65a055ee7aa264ce1d6f7e52087682aa3d1994671e37b841f6850071abc3bb1d92d91d2a380020b41ddf24949 SHA512 134ddbde421a08a25ee5aed953f7376f3217bc5eec7e2697b2d53a6018b1a61b0900a282f8a91c23deab911c4c0cf131fcc7bf0eb5fa129bcfaf20fee06b1406
 MISC metadata.xml 438 BLAKE2B 39c4d236c004f4b9856dd64ee810c64f41ec5097c259d2ee51d2e3c01b75d04aeb49d19f25bbb6aba131d4fc31fae9b2f4d3706cb1358ccdc95a4caca9967ca8 SHA512 7dfb13251330c915a8e8373f4f4a58113a5dac2a036e79d9ec9bc72c76ed7756f6706cb01c65b0f77458818485383199747fde1cd935b855e1c08c6f02e3c274
diff --git a/sys-process/atop/atop-2.9.0.ebuild b/sys-process/atop/atop-2.9.0-r1.ebuild
index 948c12e87582..9bd1a191304c 100644
--- a/sys-process/atop/atop-2.9.0.ebuild
+++ b/sys-process/atop/atop-2.9.0-r1.ebuild
@@ -8,11 +8,11 @@ EAPI=8
 NETATOP_VER=3.1
 
 # Controls 'netatop' kernel module
-MODULES_OPTIONAL_USE="modules"
-NETATOP_P=net${PN}-${NETATOP_VER}
+MODULES_OPTIONAL_IUSE="modules"
+NETATOP_P=netatop-${NETATOP_VER}
 NETATOP_S="${WORKDIR}"/${NETATOP_P}
 
-inherit linux-info linux-mod systemd toolchain-funcs
+inherit linux-mod-r1 systemd toolchain-funcs
 
 DESCRIPTION="Resource-specific view of processes"
 HOMEPAGE="https://www.atoptool.nl/ https://github.com/Atoptool/atop"
@@ -26,8 +26,8 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-l
 
 RDEPEND="
 	sys-libs/ncurses:=
+	sys-libs/zlib
 	>=sys-process/acct-6.6.4-r1
-	modules? ( sys-libs/zlib )
 "
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
@@ -48,7 +48,7 @@ src_prepare() {
 
 	if use modules ; then
 		cd "${WORKDIR}"/${NETATOP_P} || die
-		eapply -p1 "${FILESDIR}"/${PN}-2.7.0-netatop-makefile.patch
+		eapply "${FILESDIR}"/${PN}-2.9.0-netatop-makefile.patch
 		cd "${S}" || die
 	fi
 
@@ -57,31 +57,27 @@ src_prepare() {
 	# bug #191926
 	sed -i 's: root : :' atop.cronsysv || die
 
-	# prefixify
+	# Prefixify
 	sed -i "s:/\(usr\|etc\|var\):${EPREFIX}/\1:g" Makefile || die
 }
 
-src_configure() {
-	default
-
-	BUILD_TARGETS="netatop.ko"
-	MODULE_NAMES="netatop(:${NETATOP_S}/module)"
-}
-
 src_compile() {
 	default
 
-	linux-mod_src_compile
-}
-
-src_install() {
-	linux-mod_src_install
+	local modlist=( "netatop=:../${NETATOP_P}/module::netatop.ko" )
+	linux-mod-r1_src_compile
 
 	if use modules ; then
 		# netatop's Makefile tries to build the kernel module for us
 		# so let's just replicate parts of it here.
 		emake -C "${NETATOP_S}"/daemon all
+	fi
+}
 
+src_install() {
+	linux-mod-r1_src_install
+
+	if use modules ; then
 		dosbin "${NETATOP_S}"/daemon/netatopd
 		doman "${NETATOP_S}"/man/*
 
diff --git a/sys-process/atop/files/atop-2.9.0-netatop-makefile.patch b/sys-process/atop/files/atop-2.9.0-netatop-makefile.patch
new file mode 100644
index 000000000000..30710369fd46
--- /dev/null
+++ b/sys-process/atop/files/atop-2.9.0-netatop-makefile.patch
@@ -0,0 +1,42 @@
+--- a/daemon/Makefile
++++ b/daemon/Makefile
+@@ -6,7 +6,7 @@
+ all:		netatopd
+ 
+ netatopd:	netatopd.o Makefile
+-		$(CC) netatopd.o -o netatopd -lz
++		$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) netatopd.o -o netatopd -lz
+ 
+ clean:
+ 		rm -f *.o netatopd
+--- a/Makefile
++++ b/Makefile
+@@ -1,7 +1,7 @@
+ all:
+ 		./mkversion
+-		cd module; make
+-		cd daemon; make
++		$(MAKE) -C module
++		$(MAKE) -C daemon
+ 
+ install:	module/netatop.ko daemon/netatopd
+ 		install -d /lib/modules/`uname -r`/extra
+@@ -14,5 +14,5 @@
+ 		install man/netatopd.8 -t /usr/share/man/man8
+ 
+ clean:
+-		cd module; make clean
+-		cd daemon; make clean
++		$(MAKE) -C module clean
++		$(MAKE) -C daemon clean
+--- a/module/Makefile
++++ b/module/Makefile
+@@ -7,7 +7,7 @@
+ 
+ $(MYMODULE).ko: $(MYMODULE).c 
+ 		echo start the make
+-		make -C $(KERNDIR) M=$(THISDIR) modules
++		$(MAKE) -C $(KERNDIR) M=$(THISDIR) modules
+ 
+ clean:
+ 	rm -f *.o *.ko
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index f3432b0738dd..157fc21ad006 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/gitea/Manifest b/www-apps/gitea/Manifest
index ecb358f69503..3123ff1c08e4 100644
--- a/www-apps/gitea/Manifest
+++ b/www-apps/gitea/Manifest
@@ -1,12 +1,8 @@
 AUX gitea.confd-r1 243 BLAKE2B 87caa8371f53f52b0a85f720342f9f358dedec9240ab78998655a03df6bf3f301fe077afabdca1b1895dbcab2fa05748735d6f38f9b3ad53534fe8ae6e72db49 SHA512 485dc9d0b86d0a7b3ba958aac9de1129aa0ffbb47219419d38811f2accca2539e49dd93cc4a24b21f1c3802b024aa8449f54e320e8a16197f201532edeca6836
 AUX gitea.initd-r3 802 BLAKE2B 2e33e95f7d2762986184d45b0bbb250cc5e04fffc4e4b006233b28e5b57be69eef1d83441adebe2b94681585edaf77f9da4eb97930f91e75c1b1a5cd8d137633 SHA512 5ff2e653180a0601734fcd055dfffdfdc12363736ed2e56c8576c802398b90f4025b44002cbb9a3fd1e0c2d4c169f62d460381c6c549746d3390e55fc1c677d1
 AUX gitea.service-r3 732 BLAKE2B 8227349f9ffe5dbf7c59efc3b1e250bf8184a72d37958c0ce0a2d8affabaadcb6aaf271b1402c7ac127b80d534f4f72b888ccdce7aa5f7a7cf86a0efe0e719e0 SHA512 7c8aa33dcea56b6fccac23095f7b84225f1c85541cd5eb3536d2901e638c391e025bd9db28bd10c26ef91e5a8fe2d12a878040cf21d4b983858a19f2cac7d1b0
-DIST gitea-1.18.3.tar.gz 55493166 BLAKE2B 6a0bb385244c212f577b99b54cd621bf4b9b4f7bdd77bf199e2667fcb5b77638136b2c26b0a46d755d5aea359f0eea251762f759b461377d459092c0017ed972 SHA512 4dabcafad5f4f9804f369cf248b351db68e80f193a4b2a5901f8c13b7cb6051b6b5ef1f283037376e545c3b76aabe703e947d1780ed4a4e630ec68adffa8afff
-DIST gitea-1.18.5.tar.gz 55521804 BLAKE2B fe413fce8bdba68a9ea1a75f66a69c899ca7fca367e9f3e2bbad7f506d3dd2019f634e708ff7079f31c98ccdab5605187dff20118e91675f33e2f28cee547aab SHA512 20b502a11969691e5f331844453aedc5bd1708ff13e0615b7186b00f8fa6fe8de2b2c6ec1af052bfd6f87a07c92e1118e58aacf35f59bde32d587ba400adda8a
 DIST gitea-1.19.1.tar.gz 55618243 BLAKE2B f6ebaaad8eb78cc322b0e0d087e9bd8d881a74de1916db29219a21147b50adf50166a8304115ec41b8f84f5f6e7711144ab8cb427682827005ec0c73b2212494 SHA512 6c0328fb3edc09dee484d5a94eb636454003326131384b8fc1e4d495e08b55e155971121101f8eafcb1693c348153eb186bf9b3533d28afc9a6a5a4c3b0d857a
 DIST gitea-1.19.3.tar.gz 55634848 BLAKE2B 6d33b7d47039f0e34578d0c0e74d4ec77e485e9a1977ba81295fb1b8b10e103a4801530145d71aa97dba69ea115752f027c79c2f70022a65c35d4119a4553a77 SHA512 e77372f2354d433f7703d49c3d30238bad3ad6cd0722d4e0fa374692a8a0d6314bb8327807ec2b992ec84de420e09d48aaa3af16ad37b0ee0beb5540f395688f
-EBUILD gitea-1.18.3.ebuild 3317 BLAKE2B 373516970228b3d36fee0a00f18a702a27ba10494206bd91fef72d7701cd63091a52af2a89d68c9dd49e76321de2515c5d2e16d9b8ef0ca78e5b4f52e19cb4bd SHA512 5bd792b6b74dbc14347eb1b12bc2d189f7b8562e74f8b61f376d0b08a07e6937a06f318651b8f068b3e502ecd8471dd194ca565b4a134f4450471fb7ecfdf524
-EBUILD gitea-1.18.5.ebuild 3318 BLAKE2B 57884a646fbbd41307512525ee2c5e090fd05034bec931f488dd47aa7150b7ece83cb35d981f07d6cfaba472e85c9d5a1b50a2804cf2ba036a9f18e742de6cba SHA512 43b930517c439174e7a3615a56d423a4daf27f572e6cdd5a42d43b0c56f385886534d3c19766d5364c56d48694a558ea43b50d8edbed0b0dad4acffa93876caa
 EBUILD gitea-1.19.1.ebuild 3317 BLAKE2B 373516970228b3d36fee0a00f18a702a27ba10494206bd91fef72d7701cd63091a52af2a89d68c9dd49e76321de2515c5d2e16d9b8ef0ca78e5b4f52e19cb4bd SHA512 5bd792b6b74dbc14347eb1b12bc2d189f7b8562e74f8b61f376d0b08a07e6937a06f318651b8f068b3e502ecd8471dd194ca565b4a134f4450471fb7ecfdf524
 EBUILD gitea-1.19.3.ebuild 2875 BLAKE2B 5d43ede5c6a8e57c2b4f15ed0faea3618138e9e825c2e3352e9de71779e5dacd5832c0c759743225a197c1e399e52a55ad4b9dd3d62b64cf35ac7d7dd25afcf4 SHA512 98f025c0cb6e900549c76e7377361d275df4903048ef16f4f19d8b158db78eb23d3d366ee1fa9128beb21de5dc8e6c113e6345bca2c32e6dbcc82f0182addaa4
 MISC metadata.xml 339 BLAKE2B 6117542b37ffbb9dc5aa2420c5846c95864b632cb35e1c69acea24d0eaed05767b0c3607a58bc9ab8e54596927072f1c7c5cb795ee44d076b7ac027d0ee65a58 SHA512 9b05184ccba06361a7dfdecced7ad53d887065763bbbc736aedc791d9089f146f99fbbd6a483bdaf47a6ee5d4965dfc2a66e6990bea1beb599baf621c2c16471
diff --git a/www-apps/gitea/gitea-1.18.3.ebuild b/www-apps/gitea/gitea-1.18.3.ebuild
deleted file mode 100644
index c317c8a02e52..000000000000
--- a/www-apps/gitea/gitea-1.18.3.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 2016-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit fcaps go-module tmpfiles systemd flag-o-matic
-
-DESCRIPTION="A painless self-hosted Git service"
-HOMEPAGE="https://gitea.io https://github.com/go-gitea/gitea"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/go-gitea/gitea.git"
-else
-	SRC_URI="https://github.com/go-gitea/gitea/releases/download/v${PV}/gitea-src-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~riscv ~x86"
-fi
-
-S="${WORKDIR}/${PN}-src-${PV}"
-
-LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0"
-SLOT="0"
-IUSE="+acct pam sqlite pie"
-
-DEPEND="
-	acct? (
-		acct-group/git
-		acct-user/git[gitea] )
-	pam? ( sys-libs/pam )"
-RDEPEND="${DEPEND}
-	dev-vcs/git"
-
-DOCS=(
-	custom/conf/app.example.ini CONTRIBUTING.md README.md
-)
-FILECAPS=(
-	-m 711 cap_net_bind_service+ep usr/bin/gitea
-)
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-
-	local sedcmds=(
-		-e "s#^ROOT =#ROOT = ${EPREFIX}/var/lib/gitea/gitea-repositories#"
-		-e "s#^ROOT_PATH =#ROOT_PATH = ${EPREFIX}/var/log/gitea#"
-		-e "s#^APP_DATA_PATH = data#APP_DATA_PATH = ${EPREFIX}/var/lib/gitea/data#"
-		-e "s#^HTTP_ADDR = 0.0.0.0#HTTP_ADDR = 127.0.0.1#"
-		-e "s#^MODE = console#MODE = file#"
-		-e "s#^LEVEL = Trace#LEVEL = Info#"
-		-e "s#^LOG_SQL = true#LOG_SQL = false#"
-		-e "s#^DISABLE_ROUTER_LOG = false#DISABLE_ROUTER_LOG = true#"
-	)
-
-	sed -i "${sedcmds[@]}" custom/conf/app.example.ini || die
-	if use sqlite ; then
-		sed -i -e "s#^DB_TYPE = .*#DB_TYPE = sqlite3#" custom/conf/app.example.ini || die
-	fi
-}
-
-src_configure() {
-	# bug 832756 - PIE build issues
-	filter-flags -fPIE
-	filter-ldflags -fPIE -pie
-}
-
-src_compile() {
-	local gitea_tags=(
-		bindata
-		$(usev pam)
-		$(usex sqlite 'sqlite sqlite_unlock_notify' '')
-	)
-	local gitea_settings=(
-		"-X code.gitea.io/gitea/modules/setting.CustomConf=${EPREFIX}/etc/gitea/app.ini"
-		"-X code.gitea.io/gitea/modules/setting.CustomPath=${EPREFIX}/var/lib/gitea/custom"
-		"-X code.gitea.io/gitea/modules/setting.AppWorkPath=${EPREFIX}/var/lib/gitea"
-	)
-	local makeenv=(
-		DRONE_TAG="${PV}"
-		LDFLAGS="-extldflags \"${LDFLAGS}\" ${gitea_settings[*]}"
-		TAGS="${gitea_tags[*]}"
-	)
-
-	GOFLAGS=""
-	if use pie ; then
-		GOFLAGS+="-buildmode=pie"
-	fi
-
-	env "${makeenv[@]}" emake EXTRA_GOFLAGS="${GOFLAGS}" backend
-}
-
-src_install() {
-	dobin gitea
-
-	einstalldocs
-
-	newconfd "${FILESDIR}/gitea.confd-r1" gitea
-	newinitd "${FILESDIR}/gitea.initd-r3" gitea
-	newtmpfiles - gitea.conf <<-EOF
-		d /run/gitea 0755 git git
-	EOF
-	systemd_newunit "${FILESDIR}"/gitea.service-r3 gitea.service
-
-	insinto /etc/gitea
-	newins custom/conf/app.example.ini app.ini
-	if use acct; then
-		fowners root:git /etc/gitea/{,app.ini}
-		fperms g+w,o-rwx /etc/gitea/{,app.ini}
-
-		diropts -m0750 -o git -g git
-		keepdir /var/lib/gitea /var/lib/gitea/custom /var/lib/gitea/data
-		keepdir /var/log/gitea
-	fi
-}
-
-pkg_postinst() {
-	fcaps_pkg_postinst
-	tmpfiles_process gitea.conf
-
-	ewarn "The default JWT signing algorithm changed in 1.15.0 from HS256 (symmetric) to"
-	ewarn "RS256 (asymmetric). Gitea OAuth2 tokens (and potentially client secrets) will"
-	ewarn "need to be regenerated unless you change your JWT_SIGNING_ALGORITHM back to HS256."
-	ewarn "For other breaking changes, see <https://github.com/go-gitea/gitea/releases/tag/v1.15.0>."
-}
diff --git a/www-apps/gitea/gitea-1.18.5.ebuild b/www-apps/gitea/gitea-1.18.5.ebuild
deleted file mode 100644
index 14e3dc8458e3..000000000000
--- a/www-apps/gitea/gitea-1.18.5.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 2016-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit fcaps go-module tmpfiles systemd flag-o-matic
-
-DESCRIPTION="A painless self-hosted Git service"
-HOMEPAGE="https://gitea.io https://github.com/go-gitea/gitea"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/go-gitea/gitea.git"
-else
-	SRC_URI="https://github.com/go-gitea/gitea/releases/download/v${PV}/gitea-src-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-fi
-
-S="${WORKDIR}/${PN}-src-${PV}"
-
-LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0"
-SLOT="0"
-IUSE="+acct pam sqlite pie"
-
-DEPEND="
-	acct? (
-		acct-group/git
-		acct-user/git[gitea] )
-	pam? ( sys-libs/pam )"
-RDEPEND="${DEPEND}
-	dev-vcs/git"
-
-DOCS=(
-	custom/conf/app.example.ini CONTRIBUTING.md README.md
-)
-FILECAPS=(
-	-m 711 cap_net_bind_service+ep usr/bin/gitea
-)
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-
-	local sedcmds=(
-		-e "s#^ROOT =#ROOT = ${EPREFIX}/var/lib/gitea/gitea-repositories#"
-		-e "s#^ROOT_PATH =#ROOT_PATH = ${EPREFIX}/var/log/gitea#"
-		-e "s#^APP_DATA_PATH = data#APP_DATA_PATH = ${EPREFIX}/var/lib/gitea/data#"
-		-e "s#^HTTP_ADDR = 0.0.0.0#HTTP_ADDR = 127.0.0.1#"
-		-e "s#^MODE = console#MODE = file#"
-		-e "s#^LEVEL = Trace#LEVEL = Info#"
-		-e "s#^LOG_SQL = true#LOG_SQL = false#"
-		-e "s#^DISABLE_ROUTER_LOG = false#DISABLE_ROUTER_LOG = true#"
-	)
-
-	sed -i "${sedcmds[@]}" custom/conf/app.example.ini || die
-	if use sqlite ; then
-		sed -i -e "s#^DB_TYPE = .*#DB_TYPE = sqlite3#" custom/conf/app.example.ini || die
-	fi
-}
-
-src_configure() {
-	# bug 832756 - PIE build issues
-	filter-flags -fPIE
-	filter-ldflags -fPIE -pie
-}
-
-src_compile() {
-	local gitea_tags=(
-		bindata
-		$(usev pam)
-		$(usex sqlite 'sqlite sqlite_unlock_notify' '')
-	)
-	local gitea_settings=(
-		"-X code.gitea.io/gitea/modules/setting.CustomConf=${EPREFIX}/etc/gitea/app.ini"
-		"-X code.gitea.io/gitea/modules/setting.CustomPath=${EPREFIX}/var/lib/gitea/custom"
-		"-X code.gitea.io/gitea/modules/setting.AppWorkPath=${EPREFIX}/var/lib/gitea"
-	)
-	local makeenv=(
-		DRONE_TAG="${PV}"
-		LDFLAGS="-extldflags \"${LDFLAGS}\" ${gitea_settings[*]}"
-		TAGS="${gitea_tags[*]}"
-	)
-
-	GOFLAGS=""
-	if use pie ; then
-		GOFLAGS+="-buildmode=pie"
-	fi
-
-	env "${makeenv[@]}" emake EXTRA_GOFLAGS="${GOFLAGS}" backend
-}
-
-src_install() {
-	dobin gitea
-
-	einstalldocs
-
-	newconfd "${FILESDIR}/gitea.confd-r1" gitea
-	newinitd "${FILESDIR}/gitea.initd-r3" gitea
-	newtmpfiles - gitea.conf <<-EOF
-		d /run/gitea 0755 git git
-	EOF
-	systemd_newunit "${FILESDIR}"/gitea.service-r3 gitea.service
-
-	insinto /etc/gitea
-	newins custom/conf/app.example.ini app.ini
-	if use acct; then
-		fowners root:git /etc/gitea/{,app.ini}
-		fperms g+w,o-rwx /etc/gitea/{,app.ini}
-
-		diropts -m0750 -o git -g git
-		keepdir /var/lib/gitea /var/lib/gitea/custom /var/lib/gitea/data
-		keepdir /var/log/gitea
-	fi
-}
-
-pkg_postinst() {
-	fcaps_pkg_postinst
-	tmpfiles_process gitea.conf
-
-	ewarn "The default JWT signing algorithm changed in 1.15.0 from HS256 (symmetric) to"
-	ewarn "RS256 (asymmetric). Gitea OAuth2 tokens (and potentially client secrets) will"
-	ewarn "need to be regenerated unless you change your JWT_SIGNING_ALGORITHM back to HS256."
-	ewarn "For other breaking changes, see <https://github.com/go-gitea/gitea/releases/tag/v1.15.0>."
-}
diff --git a/www-plugins/Manifest.gz b/www-plugins/Manifest.gz
index 00fa193ae574..91d8c4da0caa 100644
--- a/www-plugins/Manifest.gz
+++ b/www-plugins/Manifest.gz
diff --git a/www-plugins/browserpass/Manifest b/www-plugins/browserpass/Manifest
index 79208a9c890a..ace163fbfefd 100644
--- a/www-plugins/browserpass/Manifest
+++ b/www-plugins/browserpass/Manifest
@@ -1,7 +1,4 @@
-DIST browserpass-3.0.10-deps.tar.xz 2508704 BLAKE2B 893aa8116bf6d021a9a8ca2b2fd7bcdc4686e8d3060a42255f702881b65c4cf20971e4c69b2f92520b9ad73439ffb92b73bc1013947a317840e4bdf090ea6439 SHA512 44e48d60e9656ef7b4ad74aebb9d2aa38ad42c77873143f857a1908daa81089544ef1b9cbc367e2566c910243e869a17203a8ecddd06650ff63c830defdf8244
-DIST browserpass-3.0.10.tar.gz 19242 BLAKE2B 822fb82b30b3f0faab5aad40af534f94b12636b476c9f704d8e1bd874e4dde2b2f4645553a43fcc79741aa06e30eac48bd26af8d6f868db0901330ecfaee6d35 SHA512 c8be34d3b0bd53f0d14f620826a223df44847ec7a2d6ee9fd9af776e640157bac2064a5eb21116942701d97e385f1d0bbf2c705a043e03ca62448db872c97c38
 DIST browserpass-3.1.0-deps.tar.xz 2416968 BLAKE2B e591c9dac93efea35daeeac6935319b6e6e1e5145a5eaeea1cec1252b24c6c036f54f11e552400a146e883c6f7efcaa3b1dd2fca023a84b632be8facfc253644 SHA512 27cdac3d42009cad45f58b3501eeeaca0daa921c071a675c11048951a0843656225f35772e3101a9149275afafa6567989072df4de20a0c49e2c693b41554131
 DIST browserpass-3.1.0.tar.gz 21835 BLAKE2B a6551f25681a2895a26654e2cc54451b3a08c6ab4cc5376e01fe1273f0866ebe44dec04de5ac113a1902b153884b3b7693a2675c8188d31360e83e860966fadf SHA512 ca5b1c7b805e66e1ccea7c0a69b26ccceb307ae4707b7b284e79169d810e79c118ac174d893b589ca82051cddd08ae0e047dc339960c2faf261075cdaef25a3f
-EBUILD browserpass-3.0.10.ebuild 1306 BLAKE2B 81bcc9b5579a9995b7640dc7553ce019cefab5a3958980c7d00bc83a104cc9ecbe4c07d356dd6fd3cc7dd0d4c170598fa9efedf9d5e37d19ed6b2425896f8fbc SHA512 92a9638155d86a4f54272312c6a62acec48837c219eb73d85fbcc7e17965937b537417ade34b4c9d8d190669d02bec3c21c3d83f40a19b37b3495924ae07f1bb
 EBUILD browserpass-3.1.0.ebuild 1432 BLAKE2B 1f5816aa89989eaf3559979ff70f648607503a1c235e950f3e1797ee8cebfccee64f288c17bf05fb64ae1afdc36d93b21d020b315ceb1611aaa751e26038efe2 SHA512 aeccbcd4e018234118d1df53fada92a5cba5093790587bd7a7b428fedb0b248700219e3ce984c6f0e69915ca02b85f8713ffeecc29f97812bbfae0401e39f768
 MISC metadata.xml 342 BLAKE2B ea657b30c4b0cd212b496131cc90ce7c86b5a1bdea4a89ef7765bae9a7a883460eec49a62e544cc98344fc5f5decb6eebd48f79307070b51b83059a3cf9d53d2 SHA512 4f7bd38cd2b8140db80079983b036e60655fb71e26d2cbdce3b642e1a044e4c0584d2e741b0b14e3514c244190dd275334f099a4f4ed033e76f9385891f64429
diff --git a/www-plugins/browserpass/browserpass-3.0.10.ebuild b/www-plugins/browserpass/browserpass-3.0.10.ebuild
deleted file mode 100644
index ccca3aa0379f..000000000000
--- a/www-plugins/browserpass/browserpass-3.0.10.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit go-module
-MY_PN=browserpass-native
-
-DESCRIPTION="WebExtension host binary for app-admin/pass, a UNIX password manager"
-HOMEPAGE="https://github.com/browserpass/browserpass-native"
-
-SRC_URI="https://github.com/browserpass/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~mattst88/distfiles/${P}-deps.tar.xz"
-
-LICENSE="BSD ISC MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-RDEPEND="app-crypt/gnupg"
-
-S="${WORKDIR}"/${MY_PN}-${PV}
-
-src_compile() {
-	ego build || die
-
-	sed -e "s|%%replace%%|${EPREFIX}/usr/libexec/browserpass-native|" \
-		-i browser-files/firefox-host.json browser-files/chromium-host.json || die
-}
-
-src_install() {
-	exeinto /usr/libexec
-	doexe browserpass-native
-
-	insinto /usr/lib/mozilla/native-messaging-hosts
-	newins browser-files/firefox-host.json com.github.browserpass.native.json
-
-	insinto /usr/lib64/mozilla/native-messaging-hosts
-	newins browser-files/firefox-host.json com.github.browserpass.native.json
-
-	insinto /etc/chromium/native-messaging-hosts
-	newins browser-files/chromium-host.json com.github.browserpass.native.json
-
-	insinto /etc/opt/chrome/native-messaging-hosts
-	newins browser-files/chromium-host.json com.github.browserpass.native.json
-}
author	V3n3RiX <venerix@koprulu.sector>	2023-05-30 09:20:33 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2023-05-30 09:20:33 +0100
commit	70e4bd5c8f26b1f2baeb5146a841273b2cb15179 (patch)
tree	82c39dda2ba79ec0993746bf42651c18a4beb137
parent	37c470b10802509995e7ae6a6886506f79540dd8 (diff)