gentoo auto-resync : 20:11:2022 - 13:02:32

author: V3n3RiX <venerix@koprulu.sector> 2022-11-20 13:02:32 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2022-11-20 13:02:32 +0000
commit: 65c1a6f8d7210639cbdc1565ccee4758f45dfc45 (patch)
tree: d7bea8e8d228e76b177eccb0ffc1f45a58a1e2f7
parent: c4f077d9f57bf57fcded75904bf512075191d2d2 (diff)
175 files changed, 2885 insertions, 541 deletions
diff --git a/Manifest b/Manifest
index a08d0c2af174..b71610103437 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29665 BLAKE2B 11493f9c0654386050bcfeb40196264a025eed0a49e177498ac5b44b0e4c9fe9709bdccd36cc40db732cbc17cb1de0e9bb88a883315a99f567a83be8601905e8 SHA512 8aedc58f41ef4afcd004e5ad71e6f4fff688b9bb5b2d3dc44ec7868efd6328fc06f72b3b39b4e035c3f5dbdb87c516800b520ee1cd525f47e34426a750bdfaa7
-TIMESTAMP 2022-11-20T06:10:05Z
+MANIFEST Manifest.files.gz 29651 BLAKE2B 8c3065383ccf8d792ec13a51cd353bbb83d3aeb97d2ceb2e914b4deefa8d1cf6e57264386baf9edd204ef5901ca614674d84df0628825da0baf4c3ac4c0a7e83 SHA512 6a565bd867dbaf9649442441b2eb220f9589e07cf6f7063f36cdccf35f34c28fecffd9293bc0911ecf9d82649c07f37b3e3260a1537285ed0c77063bc6f4ea85
+TIMESTAMP 2022-11-20T12:10:02Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmN5xL1fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmN6GRpfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDQeA//aVdM2oDE1atAWTmYx85uiHFmF54tFhugqSPIL9h6EmELtpShrOyldMiO
-RENYOvhsGir/R9dLxO6dMrP4NwO90PLX8YJ3RYKl59X7W3lenylyEA3irky73oI+
-qhODmB2UcqBGYwbONBhxVGVjy1h+b7MBAB2woKbXdwrS1YLTxWuOuHnKfior5Wgx
-CBP6iYNhAUBP8X/w6zViTmH+DJDVIgNBhkwjQuARdVF3BbOBoj11iRTApGjetCy0
-9rVZ0aqy5SAdrp6WgY7G0Ag/SOv//tMzLJrwKj1DLXM8iOJh57ZOxURUV4lRQl5Q
-XdErMQSxwNf93SK3LA+PzELNWk7NrNkXvdxBO8UgdA3hdrvbtYpmabUikNdD6rmJ
-6zbZp9FaxXKO2qG4WD0wbvHMB3A2GcA2Yf6jEK3KnCx9Ixk/TSAgOM+57bir0xew
-78JvRTBL2uqtaBf6WG5bNE+tAQR9QlTz0TgrRX3FlU32rQCX8R+CXGyxhcZdVKeU
-M9tLgbXQFEXAMRlT5PuLdu33Viw/REZVN9IZ21MLCf7pQTGEN/k5oIdfvGX/3mT3
-rZwbqq8qdItRG0kmwiMQWpHIlSYwQFYMre4psdam2Kk2MOj5g5drMBQDYZV0QIFS
-ee6yWx/wGpswtFuPeDe36vnssqh/54z3YjkYcjRgyIXdk1I+5os=
-=o4AG
+klDd4BAApdOCo7IOhNMUWKelzUmZZg+4qC9L5B2Vn10SRcXFYoDg6eHe27zCELB7
+F3EmEScCofU75zuY4yS85IK5qpNzf0otpSxncTfeD4lqIvuNqY4jfFLyDyKMm6kR
+emw7cAR6kmyC8N7TKvn9L/7zeCK1DP9OgWw/aySxyKEvEyRuGgN6HKhEJ20EG0LM
+hZYo+zkg97qEsHmTfadFm2BDT5dI6fvkneyQs0pRgv0nEF609tmP5hPWyvZmhliP
++VfHPYoXAjC4YUKD6He8z1EokRieo616bgbGu5vUjHcBl/h+GsgghYHDTH8FO9rd
+p5frvEvGLGzIpR/Joq2m2Fw6cZx1bKJ4Hqf7c9YzoMZyMbUB1iPVFeWfp9UzrgKL
+kevSjgSvVBFq08rBLyCga+AHt50JzOVUTaV6cdLUV37UpnfaQL3t9RLm/lHTpEZC
+rDGP9mCKfBLHP+84STL56YMH14lDevX0Lz5m9zPqRPxGK35Rc3TRS2vh+rX+OGQJ
+3AcKWObmuyXjAa4vTJP8DNjJ/TKiMRd6qEVu4izPFz5AxHyxhl5W6c7bbM7U7Ccb
+1NAh9kQG1O9CH7G8X36TjeYVZunRgAYEV4Ug6x+le9YoDtHD/LF3WBsoA8LwWwsG
+WIoVC6p/ldLBg7EC7ef5YGLSjL8MAPXpfxeQ2XoCqIjSBa21bI0=
+=FAit
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 6197d2eb8f3f..b5930c75abc2 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index cfee28a0bd7f..68342f9e3ff6 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 335c95e11812..416ae144f4a0 100644
--- a/app-emulation/virtualbox-additions/Manifest
+++ b/app-emulation/virtualbox-additions/Manifest
@@ -1,5 +1,7 @@
 DIST VBoxGuestAdditions_6.1.40.iso 63883264 BLAKE2B b9a22604b7dc135e9944bb46e7fb59e6202e692dd75de89763c6fe432328f65bacf4d893221a5e6f90ed3236fd36af2f6608932402e0ae967eb1ed24f6b1153a SHA512 149311a826c20f9bc8212e7580d3b552b4cd82f7e9dbaf4e44f363807f8132f0a81eb39082fc8876fcd5fb527d7d7c8ae1b3b6d8372b9bb39273d88fbd84a185
 DIST VBoxGuestAdditions_7.0.2.iso 52957184 BLAKE2B 8740a9c57268b96995d9412a7799f1c5d7901619f909eb8bef244e3fbadf5a6d94f35f40fa437eb8eda563a77110723bfad4eac518a93fc00e7ee246fd820ac8 SHA512 8084e97b37c6a4471bea8df4ba8464b4c709b4c9b69141c92adec70c12bc32fab583fa20ab04135bcab67f4902b88dbc9539c88909ab65e3eef6bce4c93c692a
+DIST VBoxGuestAdditions_7.0.4.iso 52969472 BLAKE2B ac8d724fbbb928bf0ddb10994ec2d4cce31ce0a95f4765f663ade0ab459685e384e86224057705ae9820dede0b69a40018ab481ac6bb1eec3f4bbccbcb395a20 SHA512 cbbc2141a7d98992fa07756fdaadab49c8686d181037db675ceb9b8c3257edb05be1d3183198255259c93b5e01b5eb72a118a64a04051197edfe179fd2ebeac4
 EBUILD virtualbox-additions-6.1.40.ebuild 616 BLAKE2B a27ef3f2df7299725bd7cc949692f730c14926e3e6c8c2891039c381232e884722f8badcfc01148d23712a1d471cf2c112172e3e036458f04c6edee74ce495fa SHA512 3d4f31e4347d449e0e3713b977086d1f9d9bc1bb547c847a061656689eb07a8d15e89b2586b78146ef23d870cbda1d56158159a878320b1f88199c9ca75ef9e6
 EBUILD virtualbox-additions-7.0.2.ebuild 770 BLAKE2B cb9fd4121202d0aeaf6d64cedc56676cf3a442d56930d52fed2bd6949c68f0298930c37f27ab2dfe0ea96f627f8f41731963aa2a431fcf05e8adb624e51c7fb2 SHA512 fefb48d9b7bfd990fea3235a3c51fe13af59d87f99fdc8869d324a4c305ddcd0bb18726b6da8448e1c765bbc34e6618bbd2bd65111710c54b4a2bc947781ac81
+EBUILD virtualbox-additions-7.0.4.ebuild 770 BLAKE2B cb9fd4121202d0aeaf6d64cedc56676cf3a442d56930d52fed2bd6949c68f0298930c37f27ab2dfe0ea96f627f8f41731963aa2a431fcf05e8adb624e51c7fb2 SHA512 fefb48d9b7bfd990fea3235a3c51fe13af59d87f99fdc8869d324a4c305ddcd0bb18726b6da8448e1c765bbc34e6618bbd2bd65111710c54b4a2bc947781ac81
 MISC metadata.xml 255 BLAKE2B 9386ef3bdb55211441f303528b31f8ccd9ad9039744400e859574a424fa1f366a989fe78f5c10038f3dd9b06a6a389e4a7e643b3eac0dc93a79ac4cc3b4c5423 SHA512 6c158e12464285afd44b70d0653b65f65da1c523fc2b1b07eb6d2dec56f58234bb31cb9dc36238cd6dfc20031b4d58c04e7c1678cc9f917194403ad8a209513f
diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-7.0.4.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-7.0.4.ebuild
new file mode 100644
index 000000000000..a8e3c6f5b6e1
--- /dev/null
+++ b/app-emulation/virtualbox-additions/virtualbox-additions-7.0.4.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2022 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"
+
+# Reminder 7.0.2:
+# This package contains only the ISO, so the license is taken from COPYING
+# But if we check the source files, some still use MIT or GPL-2+
+# File a bug if the situation does not improve after a few more releases
+LICENSE="GPL-3 CDDL"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+
+S="${WORKDIR}"
+
+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 ca80e98f5873..3f8e9cca2468 100644
--- a/app-emulation/virtualbox-extpack-oracle/Manifest
+++ b/app-emulation/virtualbox-extpack-oracle/Manifest
@@ -1,5 +1,7 @@
 DIST Oracle_VM_VirtualBox_Extension_Pack-6.1.40.tar.gz 11233264 BLAKE2B c169747b6c0214bd850c5e639d5245e2084701c1ee764e8798a779545d95b8eb8ec0cf4622d5156c0a17126a6a522d041ec126984062b72e71a2283ae9652bd7 SHA512 6d8ff0f7f0c4eaaf9c6fcf965133fddc1d4057cffb98a10ade6cf0065e9f656bc49656bb3ac817694cbf9ca2fb4226f3e9ac9b1383ab07cdcbe05ffe18809ce1
 DIST Oracle_VM_VirtualBox_Extension_Pack-7.0.2.tar.gz 18515967 BLAKE2B c1b0a52b8dd80089130e0c7ed255d622144ef6271cfe71e120aa4be69fb9c04b83a33c78305eb6b6f44cb648d18170490c506e8ce765acb649de598abcae88ad SHA512 3d465b250051bef68b332b4908cbf1f0b07f32fddfec76a4e85de41e018beaf6bf7b29214dafbd05e6fcf3e3c694b621a05bfa98f12f56c1b3d224d9fff22f74
-EBUILD virtualbox-extpack-oracle-6.1.40.ebuild 1064 BLAKE2B 63d4c01cf703966e7c9a98be5df8dd0b81b51ce7781e8014bb8e37585cb4e02401e113cc925d43b494562c13beecf080a107ea10b6a45a5186ce7b91cd93c11d SHA512 61063ee060f2a0352a66de441128c5f21b52f41149067f0f3f544e627e7c2b018e1dcc608b6c228e21323eecbc4ace9eada07bdd8b192d9f785289ebf9c593d7
-EBUILD virtualbox-extpack-oracle-7.0.2.ebuild 736 BLAKE2B 340d20412992006621935f8ad9ab43eae521ab9d70b59b98aa7907a7f83fefc1120966593231670102b1cb6b1524fe39348587ba8728450cfd55e365cb8f780f SHA512 7f41305b7a40d93a7732cae86153124005c04154410f68a13badee28ca22b67a8f39baa565cdc66a9bc05ab4416c42d8a912303b853898c19b12f27fff357735
+DIST Oracle_VM_VirtualBox_Extension_Pack-7.0.4.tar.gz 18515711 BLAKE2B 07e8ef3d638e7985830b78147849ebada0a4f2140458ea76e236dac53efb867135b860d5c2d29545f4127de934d2b059be60849466cbf6763fcc558afaf4786a SHA512 405042ae9aeff48ce86ec6f7dba294a8be1d26e0a4b1c5a85daacc231d64243a30f301ba6a4108546a8a4b702d01b109bc0936abded572f71bdd147c178615a2
+EBUILD virtualbox-extpack-oracle-6.1.40.ebuild 1067 BLAKE2B 5506b06258807476a1713cedcc547d79a09387c752d7eb117db7a2745ce3748e035de82b4708bd0d36f80a9262beec76907ddec87493dd4aeab43e0145ca3c74 SHA512 82ce2b700e39495e56698bfec0d3d4725c0f1e4bc59fca8ae0a2cfc6df02956d341016bf8a34c35ea83f4572f144fceca65508e7e1d8c6b2f8185683832489e2
+EBUILD virtualbox-extpack-oracle-7.0.2.ebuild 739 BLAKE2B e7648bea90ad5359d9325eacd098b5a368cc78207323b227282b51719d1c4f9012852dc51f24813f47b35a9c1ee80b0d41b4c817e1f90d4b99a9b7361cf09674 SHA512 5ebddbff184a9ac528cc3eacd940dfd9278a4afc0f6254911c87567d062623f44452398511eb39f0f3d2c8125c78a05d05d747853f53dabae958eca3ea55d586
+EBUILD virtualbox-extpack-oracle-7.0.4.ebuild 739 BLAKE2B e7648bea90ad5359d9325eacd098b5a368cc78207323b227282b51719d1c4f9012852dc51f24813f47b35a9c1ee80b0d41b4c817e1f90d4b99a9b7361cf09674 SHA512 5ebddbff184a9ac528cc3eacd940dfd9278a4afc0f6254911c87567d062623f44452398511eb39f0f3d2c8125c78a05d05d747853f53dabae958eca3ea55d586
 MISC metadata.xml 255 BLAKE2B 9386ef3bdb55211441f303528b31f8ccd9ad9039744400e859574a424fa1f366a989fe78f5c10038f3dd9b06a6a389e4a7e643b3eac0dc93a79ac4cc3b4c5423 SHA512 6c158e12464285afd44b70d0653b65f65da1c523fc2b1b07eb6d2dec56f58234bb31cb9dc36238cd6dfc20031b4d58c04e7c1678cc9f917194403ad8a209513f
diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.1.40.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.1.40.ebuild
index 3dbb1658be56..831ab0b169c9 100644
--- a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.1.40.ebuild
+++ b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.1.40.ebuild
@@ -21,7 +21,7 @@ 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"
 
-LICENSE="PUEL"
+LICENSE="PUEL-11"
 SLOT="0/$(ver_cut 1-2)"
 [[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
 KEYWORDS="amd64"
diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-7.0.2.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-7.0.2.ebuild
index 199d4e6d70fa..ad26b79890fa 100644
--- a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-7.0.2.ebuild
+++ b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-7.0.2.ebuild
@@ -11,7 +11,7 @@ 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"
 
-LICENSE="PUEL"
+LICENSE="PUEL-11"
 SLOT="0/$(ver_cut 1-2)"
 KEYWORDS="~amd64"
 RESTRICT="bindist mirror strip"
diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-7.0.4.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-7.0.4.ebuild
new file mode 100644
index 000000000000..ad26b79890fa
--- /dev/null
+++ b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-7.0.4.ebuild
@@ -0,0 +1,29 @@
+# Copyright 2022 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"
+
+LICENSE="PUEL-11"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+RESTRICT="bindist mirror strip"
+
+RDEPEND="=app-emulation/virtualbox-${MY_PV}*"
+
+S="${WORKDIR}"
+
+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 42cd976a5fde..7b34fcf0016d 100644
--- a/app-emulation/virtualbox-guest-additions/Manifest
+++ b/app-emulation/virtualbox-guest-additions/Manifest
@@ -7,7 +7,9 @@ AUX virtualbox-guest-additions.service 411 BLAKE2B f5f1c24a94764ca72a04879c27cd9
 AUX xorg.conf.vbox 274 BLAKE2B 3a3035fcbdbd5810c54505f5a5e6deefa1540e5e01a038babb62a40bd5b2de2dc5b228cabe55612d92a522e6ae92aa7ff4ff2ab26772c3b54ce95ebac4e7fc5a SHA512 ac2b14970dc6667ceec2dbdae52bc92cbad4aff020898ede156454e8a8a703354f15c7e19cfbd2bdd15e251493fd05cacfe814cabee0f9b4cf155e44860ed4c9
 DIST VirtualBox-6.1.40.tar.bz2 165769795 BLAKE2B 5c216f23422be3fc4f7760881c666c57a516d12726ed8ef040bbdf918f1af53c69d204b22949e25f751cbe788b00c810c49c27b7c51c1837fd1c503a3eff202c SHA512 0dace071fe58500d0912fe4da4751de6840752375039554a56c8c753a0880a419c4a1ed7f1b0ebc51230f7099ca3f5d987dc7b91ad4d98dbd75bf63e3c27e096
 DIST VirtualBox-7.0.2.tar.bz2 199461536 BLAKE2B 94f7c2961c13530b6086bf4576f243b5b260f43ec445c8a2e411205989a9db229715502f2b76b8f3cb45a49ff565410701be90f1e850f069aae5579c0796b503 SHA512 c79d6365f83e1fde356a7f4a6ccd23bc7306d1b5b4be669634c575f08ba53338caca684758c9409ecef2b05ab6f9ad37dfa6075ad6afbc5d7909d46ee6794927
+DIST VirtualBox-7.0.4.tar.bz2 199658172 BLAKE2B 51bde109805e8f3e25f179a05fac532de7a428010955c7cc2a7c9e8c072246d69c5f51f8a51e39b6a1b9f246bd945edc38e0f0cc0630c357a5e9641c38dcac21 SHA512 70f2031c4897249177131795281bf6bd5a75166067d1921db70fd1e21f5638285b5a0c3298a7070e272ac2f093a60c35eb3cab4e5f7d16a68d17b211f637b0bc
 DIST virtualbox-patches-6.1.36.tar.bz2 2733 BLAKE2B dcfebfeca4873d382441515d48b4dfee9343bc7c83ea3cbb5002dbf7975143a79fae9a701b67dc35505e9ca03ff1b6293cb7c3279c4fdfda8ad21ba5fb9b7e87 SHA512 1bed5cdefbf8e7c4b0d9092ba4961ecf2262f27f35c71a91ef6f2e8fe8a1d92ed74f06bafbf58d70ba7165d933997f58073f4d4f4051e3ba5c0339b729066f57
 EBUILD virtualbox-guest-additions-6.1.40.ebuild 7752 BLAKE2B a16fdb2fb381209101aa022521ebf81d91064d87a8b184b6988bd18f1f3f5bc05bd5fdb8865776bfe210be127c74c913e34eff42aaf30192725fdbdf70201b49 SHA512 c813bb0e76300e0ab983dbde2887e2233fca2baeb3f76e97478f12f164ab6f146e5016429820a43a44d7b7d23b16f1f60ff5e1f9dfdfa17426d0fd579a059f42
 EBUILD virtualbox-guest-additions-7.0.2.ebuild 7833 BLAKE2B 8d8889005126d749038f3f4c7a1425e02945ca71c9071854bceb61b201c1aa9ad2588ba81c0a931a62e2ef912af6761484198ab67cedc913d1d851d11cb2a8f9 SHA512 718b05e3377f0503e3ab3001a4b3b74e2d64b90d2e10f153f2edf5aabce13f0029f34e4b67f740ec4224f3a37a67445f2cc3a72e9096732a0f5d4c94a83c9da6
+EBUILD virtualbox-guest-additions-7.0.4.ebuild 7839 BLAKE2B 3db54c024e784a3ae5229d19977fd5447943d7e962cf4325ce2cd85a0d7d0c81aa4405b462a13552b8ea73c96a84b3ab67b9ea1c8601a53a6fafb7f48496a507 SHA512 fed7e0411a9556f37fe95c37e9d4c65e444b5f65b2003f1a6dfece76790f6679008f80eed91c4b877de3f8adc7f6dd01adfaaef41bc92f05adbca805cd154f45
 MISC metadata.xml 255 BLAKE2B 9386ef3bdb55211441f303528b31f8ccd9ad9039744400e859574a424fa1f366a989fe78f5c10038f3dd9b06a6a389e4a7e643b3eac0dc93a79ac4cc3b4c5423 SHA512 6c158e12464285afd44b70d0653b65f65da1c523fc2b1b07eb6d2dec56f58234bb31cb9dc36238cd6dfc20031b4d58c04e7c1678cc9f917194403ad8a209513f
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-7.0.4.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-7.0.4.ebuild
new file mode 100644
index 000000000000..6e0fd6fb0fdc
--- /dev/null
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-7.0.4.ebuild
@@ -0,0 +1,287 @@
+# Copyright 2022 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"
+
+# Reminder: see the LICENSE related comment in app-emulation/virtualbox-additions ebuild
+LICENSE="GPL-2+ GPL-3 LGPL-2.1 MIT"
+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}
+	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}"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+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
+		$(usex 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 22105aa0fac4..309019cc7830 100644
--- a/app-emulation/virtualbox-modules/Manifest
+++ b/app-emulation/virtualbox-modules/Manifest
@@ -2,6 +2,8 @@ AUX create_vbox_modules_tarball.sh 896 BLAKE2B 4153a8fa67cd8fe7187f3c4232691b1de
 AUX virtualbox.conf-r1 30 BLAKE2B 6308dedc75e2677cbdc844b53f51359e6b5745d3510636b04d08512122aeb6db81a1a18af156a8b9acccad395d390b24f9c27ed47413382cb6101266762de230 SHA512 5c6d31f527ca2db8d7fbeea759ac328eff42803d7940fd81ef12af22eb09f8913a0e561c35db1963e2a8b398ee288692817b5c8f3d439f2a6fd381769ec2ac8a
 DIST vbox-kernel-module-src-6.1.40.tar.xz 680112 BLAKE2B 95bcb598bc3823c8bf4bfeb734a5d812a4830d072b186c999ed8632552550d0d21318bc50419fd18301cd6e8e58d091a4f6363c9ee86725d6bf8e74050b552d2 SHA512 8eec3c960077205d53b3d2a8367ce562edb02a6d90fe0a4bd06e1dfa256760e128b9895fc8005ceeb50a72eda6509533a28c6ee264d10a2cd30601ed5ced2eeb
 DIST vbox-kernel-module-src-7.0.2.tar.xz 719208 BLAKE2B 9e356c10b431f765dc7c13673c296b8acf6247304fe40f0a6accde30e1c1f2ab04f46ac18ac6350cb1c554f9d0aaf3cb831a5f737cbd7d50ae8efe48e312c8b4 SHA512 0c97b30ee14abeb62b9fbfe552da64f12f763cf3d35d5fda1dee595142f564f6220e61c15f73dcfd50853f4e4776bc73ba1808e5f78d7c2f5f2bf3522292d33e
+DIST vbox-kernel-module-src-7.0.4.tar.xz 719552 BLAKE2B 5db9ef68acb0da28096dbb89b746261dfac830b626fbed669c02eab6399e681b2c5667d0fe547c8cc8c7e1cbf66d4c6696d9badf0faa617ef2cd0d7372ec9cbe SHA512 521994ffcc27766ee5bbf19595c41a292ce266247249e8ed701fca802d0a1bb82883959eb10bc06bc78abfd6b5230605e6620717526ca528f0b2e1d8d62a8dc4
 EBUILD virtualbox-modules-6.1.40.ebuild 1876 BLAKE2B c6f4531dfa093528ca5adc4048b0d1f062df2be4fc01ae3a450b284b1b35352c95b00287d375c29cd51b2bd9b77b1b2bac84d74ccceedf65ac8e50f95366ea30 SHA512 a5850b902d83366c033d8b005615060910b07d8587d22b2ae93c211ae99e44ae5a73fa77aec0dfc8d7947e9b49d0873d93fa084f9b50a52206c0873c2a0f97d7
 EBUILD virtualbox-modules-7.0.2.ebuild 1884 BLAKE2B cb4693f97d2778d34264626db0dd0ebc9aaf0c244469f25363d664f8ec737147e41b86d13b0b10315983ca61ab644df7a9cdf2646233c570b0be25cbc652a03d SHA512 f01f71ff7da026e9c7b954c48bd7c31d5f6ef94522fc2a53602f4fe595b1382d0a53f216f26d18dc1265931380f9ed767c2c3b2d0922bd076b77e18857572d8c
+EBUILD virtualbox-modules-7.0.4.ebuild 1858 BLAKE2B 4a721e1d7d47360b15781a25c9d5a9262063720aea8faa7c49fe1075498a2524327ddf22429dc5052dd48f359bd27a415c50ab6509b4545eb954ce5885533330 SHA512 64667b80ea96a8d65c7a96f7fb4441ec33867117a1db5dca677ecdaf528d72863c3bb3d82d82a92d8d72fd2cabbc64b3c4bdb5c4a762ce3bbc7baa74bee8cd3f
 MISC metadata.xml 350 BLAKE2B 73c2e4a95e21ad17dd75df0650f98175056041c5f7446f5aaaf94fbf3c061bdb6fefdbc228ea9b5cbe1b4b0ef32b8a83e28324469189f4f16636e351c33f1bd8 SHA512 450af2c60e6d68a4d861f50ce23150e03ba94fb3a05c6506385c6ce69fd04d51106468538fc32b691b15d6b20933f70586719c4d572a900052581d8216d44f92
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-7.0.4.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-7.0.4.ebuild
new file mode 100644
index 000000000000..5894b581bca7
--- /dev/null
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-7.0.4.ebuild
@@ -0,0 +1,58 @@
+# Copyright 2022 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"
+
+LICENSE="GPL-3"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+
+S="${WORKDIR}"
+
+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 4496af5f9fdd..d58407152be6 100644
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@@ -12,11 +12,14 @@ AUX virtualbox-6.1.36-python3.10.patch 855 BLAKE2B b6df3e3bf9d9c8d6cfc21a1a21373
 AUX virtualbox-7.0.0-fix-compilation-clang.patch 1638 BLAKE2B 2c1c021a5b95ffdbd46982249c3a60e97d79db17994491c3c1774d7fc889d5b5a0da974d05859e21772b6f265bf1009ad3f13d19a5d264c7f8b4b2bacd6a9bdb SHA512 9c83dfb1550463fc9ddce68dd0648b12721ad1f9fa92fac2e7234ac8149fc5a1a5698a759d1352fc8003d737ce987fbc476ed9a9b350490cf52e42e1a08444dd
 AUX virtualbox-7.0.0-fix-compilation.patch 1845 BLAKE2B 6dd22251c53e064593113c61b6982caacba766e9e313c31797c20c84352d036fb9346e99d64172e9cab99da49d44a2ddb5592f197ca47d303ab13a068e571091 SHA512 60604e41787b226b14474a832eff5ac37ecc47bd353c51e95f1e2c9ba1948ea9b1a33b0148e9a01953ecbf151e82849b2997da253d74d7dd23593d9843af56ea
 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-ose-6-wrapper 3578 BLAKE2B c150e578212435268de3c5fb0eea701bc843ec2241dc3839d3d1e33604fc01f6bdff6ed0425ba6917072f652b8c29d0df9a550a92900ca13306fcd36521afbee SHA512 315d981f3e92f2e0134946f6bbb8ad4ea4228afb8f73aaed7feead59b3f55cef01cec4285a7fdaf30ce0931d8b69bda4698baebd63d11f2cd9dfe9d0591a0f40
 AUX virtualbox-vboxusb_tmpfilesd 35 BLAKE2B 56937e236a0e4d1a2aa085271e8ae0af9553fdf7c3b804af4d3fda3aa8dbc32d63762fee90bc949390cb9cd67f2f0111894c8af084731dab6920ae1675c69a64 SHA512 72e4602f5f214f8833486f5c787c263a10390e8bdf65b5615d67c35ec44048f02add12fe43b19f9c57a9d2f12d768c52e54fcfb9052c0611d06cc988a698c171
 DIST VirtualBox-6.1.40.tar.bz2 165769795 BLAKE2B 5c216f23422be3fc4f7760881c666c57a516d12726ed8ef040bbdf918f1af53c69d204b22949e25f751cbe788b00c810c49c27b7c51c1837fd1c503a3eff202c SHA512 0dace071fe58500d0912fe4da4751de6840752375039554a56c8c753a0880a419c4a1ed7f1b0ebc51230f7099ca3f5d987dc7b91ad4d98dbd75bf63e3c27e096
 DIST VirtualBox-7.0.2.tar.bz2 199461536 BLAKE2B 94f7c2961c13530b6086bf4576f243b5b260f43ec445c8a2e411205989a9db229715502f2b76b8f3cb45a49ff565410701be90f1e850f069aae5579c0796b503 SHA512 c79d6365f83e1fde356a7f4a6ccd23bc7306d1b5b4be669634c575f08ba53338caca684758c9409ecef2b05ab6f9ad37dfa6075ad6afbc5d7909d46ee6794927
+DIST VirtualBox-7.0.4.tar.bz2 199658172 BLAKE2B 51bde109805e8f3e25f179a05fac532de7a428010955c7cc2a7c9e8c072246d69c5f51f8a51e39b6a1b9f246bd945edc38e0f0cc0630c357a5e9641c38dcac21 SHA512 70f2031c4897249177131795281bf6bd5a75166067d1921db70fd1e21f5638285b5a0c3298a7070e272ac2f093a60c35eb3cab4e5f7d16a68d17b211f637b0bc
 DIST virtualbox-patches-6.1.36.tar.bz2 2733 BLAKE2B dcfebfeca4873d382441515d48b4dfee9343bc7c83ea3cbb5002dbf7975143a79fae9a701b67dc35505e9ca03ff1b6293cb7c3279c4fdfda8ad21ba5fb9b7e87 SHA512 1bed5cdefbf8e7c4b0d9092ba4961ecf2262f27f35c71a91ef6f2e8fe8a1d92ed74f06bafbf58d70ba7165d933997f58073f4d4f4051e3ba5c0339b729066f57
-EBUILD virtualbox-6.1.40.ebuild 18317 BLAKE2B bda3b31a13adbc1e1a66ef275e2be6b05b2447e63e5bc2a3140a3e320608d1a7d4cff9ae39a45fcf3a3cc81f0e7ca61140ba27aaf528d0f1473acee43c29c650 SHA512 fd40c238b5f7f0c8035295245df29959c198cefc1035c73daf92ca2dba10b3aece746fab3a58a72d91bd59feb8155f42f00b4ebaeb60f1a6df18195508648185
-EBUILD virtualbox-7.0.2.ebuild 19260 BLAKE2B 492cb8f9f590ad155d8e89ad0a232032f1c2b37f9a8e77fcdf5f46138ae0d2ffaa6b72be7b687d14c1402ecb01792fb3f255ae8dbb3eeb81f40f6840e783977d SHA512 d3bbfaee12a3bb5b50eb48f8106bfbb25d7173c3b0dac8affa25f96ecb9fc2f23b5e19ccf530d93cc3b16fedd6ccb27381c52c948c853611417d777b0078a431
+EBUILD virtualbox-6.1.40.ebuild 18338 BLAKE2B aa2b2cb1bece62809d6684197adfb736562f8f9d7b650f01e5f0862316be2a870536b5501e1d8c25f546fbf755004a181d89a90199d8de49e0d216c4a86f752a SHA512 4c0f08304b8e96ae48bf8b2073dc5e86ad3aa0f0d835e3b8744a3161c6b6b43b4d6f67d23dee7134220d579804f15ab03af7c12ecab9002644abd48619eb68bb
+EBUILD virtualbox-7.0.2.ebuild 19455 BLAKE2B 387d070776423dc7c63c38f919e12c78aabd2c1605bb7be6b471d605f32057797182612841f70442c366299de3bf5616b9bc6880e693d168c8c927fa9079f094 SHA512 367f413c924054f9a06ff2b0be5e235354aaedd194c2be657499a83e3a1762dcd09dd79914fb23ec08be883c52cbf9247016a44eb0913bdebdf5e589feabc0eb
+EBUILD virtualbox-7.0.4.ebuild 19484 BLAKE2B b491b23a5cc5f130a86e7fca8a039c2e8d8f98003e0c523c3b510ae5c822e9eef2f4a372a9ee84038a3d1643d11050010c215e38ff7a03af4ef452105728ebe8 SHA512 57c3942b797c0f71ba003294ed46e99fd9bf3cc474fb8ed077202264dd982a1c8ccf91922a75c694d929e37483f453b159dc6a640d248f19c5d1f0708b6adf63
 MISC metadata.xml 771 BLAKE2B 0a8fc6454533217d8edba15349eb95d9db1fa076e92c4ca951251d16d1c266e1ee1b1ca8ab41de963ffa010cdd7b73e86ab4e134f7e1b4dbfbb4925000caccf9 SHA512 7630419b477f31b5a2fa93d0909407470ebafda39180217b0f3d43943d5a0cc23b5db39310a9bd76261f23f1025c10d927e771d27fcf50c5789bb04b2c61c0b1
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
new file mode 100644
index 000000000000..4452d22fdfd2
--- /dev/null
+++ b/app-emulation/virtualbox/files/virtualbox-7.0.4-fix-compilation.patch
@@ -0,0 +1,26 @@
+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.40.ebuild b/app-emulation/virtualbox/virtualbox-6.1.40.ebuild
index 7067d184bf7e..cdb56ccbd418 100644
--- a/app-emulation/virtualbox/virtualbox-6.1.40.ebuild
+++ b/app-emulation/virtualbox/virtualbox-6.1.40.ebuild
@@ -95,6 +95,7 @@ DEPEND="
 	alsa? ( >=media-libs/alsa-lib-1.0.13 )
 	!headless? (
 		x11-libs/libXinerama
+		x11-libs/libXrandr
 		opengl? ( virtual/opengl )
 	)
 	java? ( virtual/jdk:1.8 )
diff --git a/app-emulation/virtualbox/virtualbox-7.0.2.ebuild b/app-emulation/virtualbox/virtualbox-7.0.2.ebuild
index 4a23f2b624d2..bc613d5df1fa 100644
--- a/app-emulation/virtualbox/virtualbox-7.0.2.ebuild
+++ b/app-emulation/virtualbox/virtualbox-7.0.2.ebuild
@@ -131,6 +131,7 @@ BDEPEND="
 		dev-texlive/texlive-latexextra
 		dev-texlive/texlive-fontsrecommended
 		dev-texlive/texlive-fontsextra
+		dev-qt/qthelp:5
 	)
 	java? ( virtual/jdk:1.8 )
 "
@@ -200,6 +201,11 @@ pkg_pretend() {
 		einfo "USE=\"headless\", this build will not include any X11/Qt frontend."
 	fi
 
+	if use headless && use sdl; then
+		einfo "You selected USE=\"headless sdl\", defaulting to"
+		einfo "USE=\"headless\", this build will not include SDL."
+	fi
+
 	if ! use opengl; then
 		einfo "No USE=\"opengl\" selected, this build will lack"
 		einfo "the OpenGL feature."
@@ -288,7 +294,7 @@ src_prepare() {
 		CFLAGS=${CFLAGS}
 	EOF
 
-	if use sdl; then
+	if ! use headless && use sdl; then
 		echo -e "\nVBOX_WITH_VBOXSDL=1" >> LocalConfig.kmk || die
 	fi
 
diff --git a/app-emulation/virtualbox/virtualbox-7.0.4.ebuild b/app-emulation/virtualbox/virtualbox-7.0.4.ebuild
new file mode 100644
index 000000000000..5794887625c9
--- /dev/null
+++ b/app-emulation/virtualbox/virtualbox-7.0.4.ebuild
@@ -0,0 +1,692 @@
+# Copyright 2022 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_{8..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+ 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 pam pch pulseaudio +opengl python +sdk +sdl +udev vboxwebsrv vnc"
+
+unset WATCOM #856769
+
+COMMON_DEPEND="
+	${PYTHON_DEPS}
+	acct-group/vboxusers
+	~app-emulation/virtualbox-modules-${PV}
+	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]
+		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(-)] )
+	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-libs/libxcb:=
+		x11-libs/libXcursor
+		x11-libs/libXext
+		x11-libs/libXinerama
+		x11-libs/libXmu
+		x11-libs/libXrandr
+		opengl? ( virtual/opengl )
+	)
+	java? ( virtual/jdk:1.8 )
+	opengl? (
+		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}
+	>=dev-lang/yasm-0.6.2
+	dev-libs/libIDL
+	dev-qt/linguist-tools:5
+	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
+	)
+	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
+
+	# 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
+
+	# 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
+
+	# 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
+}
+
+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
+
+		$(usex alsa '' --disable-alsa)
+		$(usex dbus '' --disable-dbus)
+		$(usex debug --build-debug '')
+		$(usex doc '' --disable-docs)
+		$(usex java '' --disable-java)
+		$(usex lvm '' --disable-devmapper)
+		$(usex pulseaudio '' --disable-pulse)
+		$(usex python '' --disable-python)
+		$(usex vboxwebsrv --enable-webservice '')
+		$(usex vnc --enable-vnc '')
+	)
+
+	if use gui || use sdl || use opengl; then
+		myconf+=(
+			$(usex opengl '' --disable-opengl)
+			$(usex gui '' --disable-qt)
+			$(usex 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
+		docompress -x /usr/share/doc/${PF}/qt
+		docinto qt
+		dodoc UserManual.q{ch,hc}
+	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-text/Manifest.gz b/app-text/Manifest.gz
index b30b1c226fff..4b497a48a867 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/coolreader/Manifest b/app-text/coolreader/Manifest
index f41a501f77b5..afdbc19a06b8 100644
--- a/app-text/coolreader/Manifest
+++ b/app-text/coolreader/Manifest
@@ -1,8 +1,4 @@
 AUX coolreader-wxwidgets.patch 3660 BLAKE2B f7f736e0b9aedffe80f8327e0e0090439bdb529dd4d3e69e9b60c77e815e53d3d9ced76442c174f180362a9a198133e12bd486c4fea139ee07066f2d424b20d9 SHA512 f33f90b9a7254dc20c42218e6fd6781ebbdef988b1c758748197b71a9fdb62e02cc3ce8bb465b9c462d5dc61e5cdcebc523110e1172d3208853bb0291d8017f7
-DIST coolreader-3.2.57.tar.gz 13281238 BLAKE2B 8a6739f38d72b13af7b79160dee8cfc08bd9e54d3698fd44c7f6ad8bd575b1f389c2c349c1e2ef71a55fb0068e9d64b5baa4a0a8b945cdb873e833178d81cbbe SHA512 d5bf46f7dbf19177a54742d5c300002c8b7a504052bd003d2e1a7380ac3460dbe648d7f923d26e6390e9296ce6b090c947204725ab2a30c78f26893868a61161
-DIST coolreader-3.2.58.tar.gz 13454079 BLAKE2B e3b85ffbb3e4023a8c0567879a4a67d21141c1025b58f7d2c5017cab773e989e797229529440167a8c83db810f599566a77aaaab06b34081472f0e4b20293ec9 SHA512 d1d3e60bf5b73c20617937850912d7c452863bd5c91f0154be320ad256f774f368039896ad5e8acfc3cafa7361e8c11ca526accf0a14dabb79f059255989bac6
 DIST coolreader-3.2.59.tar.gz 13596218 BLAKE2B a59d11aff93166de77add5d230539068172a81968414b9c38b6ca25f08bd7830b81c0b800055a4eefbd6bb1be94298bf74d240f981c928bd4514073d943bb33d SHA512 72fc05814ca4f6da5310f7b47fd7939bc1567e5dd7e7e75bc29e2b1436dc4901498622a770e89323581c3f0b3b9ec305050ca5917eceba4df4a07cff3e1748d6
-EBUILD coolreader-3.2.57-r2.ebuild 1842 BLAKE2B 647a7505a9dcaf911e578921e8717914cef1024d72747d3764daa0c0002061dfee09060f2b64cda4a1d84d43a24887e6f2c9e6119baec1312ae3ea7d6f880ea6 SHA512 f823e37f65570aae5072cc9245c3a39ac0e5510d4d2ca1edfe00614e48878948d2db1e501283bfc05db57cabf91bdbc9f6bf98c59b758d3cc4f49a66e08eacda
-EBUILD coolreader-3.2.58-r2.ebuild 1844 BLAKE2B 5c697ca212fedc718a1493f82dd8cac76dddecc0d4a8ba875e8e578788f0e4a5240bfe5a6dbaf09184fd8a244e30b586eebe5ea0a663441734b4c88a50eb8cfe SHA512 c0634cc6d7cc072c16b3407ac26ae46d570c88126de9a1cc6b4f2d8f83b14e4b91bcbb5333a58f56e73c943ab261889155aa9e99476082571d642c43068cca1a
 EBUILD coolreader-3.2.59-r3.ebuild 1936 BLAKE2B baf00032edc67c6e55938f111f9a86a5e1ecdc91853aa112eb5d68349ae0f2aa762fc2f9a5c192e42e5db4c4ed01142d11d73dca726fe5656e5d4028ac24721c SHA512 750b6576878ca62ceaf0e5cfbcb340f096c28d55b4862e081e812e3166e39dcd80c8996cfe0c7f6c7cddf268142d49ba98a4df27d9015fe99eab95892afcf069
 MISC metadata.xml 630 BLAKE2B e179265deb3518a96cea13ec64fb83105edd9475bd6c9c47462e804d3f1ab3b4bfdc3b1f8911d1724a11f667d74fa506877e9e7340e5b6565702e8479cf71982 SHA512 b7eed2a628b86440649977391e0fb18ba3422b66f54a46ec60ab39cb9f4ed997b8efeae51c2efadb152d93841d05ff3c00303269a7368e93c0bf2d55d2b1645e
diff --git a/app-text/coolreader/coolreader-3.2.57-r2.ebuild b/app-text/coolreader/coolreader-3.2.57-r2.ebuild
deleted file mode 100644
index ad4026fed226..000000000000
--- a/app-text/coolreader/coolreader-3.2.57-r2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-WX_GTK_VER="3.0-gtk3"
-PLOCALES="bg cs de es hu pl ru uk"
-inherit cmake plocale wxwidgets xdg
-
-CR_PV=$(ver_rs 3 '-')
-SRC_URI="https://github.com/buggins/${PN}/archive/cr${CR_PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-cr${CR_PV}"
-
-DESCRIPTION="CoolReader - reader of eBook files (fb2,epub,htm,rtf,txt)"
-HOMEPAGE="https://github.com/buggins/coolreader/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="wxwidgets"
-
-CDEPEND="sys-libs/zlib
-	media-libs/libpng:0
-	virtual/jpeg:0
-	media-libs/freetype
-	dev-libs/fribidi
-	media-libs/fontconfig
-	media-libs/harfbuzz:=
-	dev-libs/libunibreak:=
-	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER} )
-	!wxwidgets? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )"
-BDEPEND="${CDEPEND}
-	!wxwidgets? ( dev-qt/linguist-tools:5 )"
-RDEPEND="${CDEPEND}
-	wxwidgets? ( || ( media-fonts/liberation-fonts media-fonts/corefonts ) )"
-
-src_prepare() {
-	cmake_src_prepare
-	xdg_src_prepare
-
-	# locales
-	plocale_find_changes "${S}"/cr3qt/src/i18n 'cr3_' '.ts'
-	sed -e "s|SET(LANGUAGES .*)|SET(LANGUAGES $(plocale_get_locales))|" \
-		-i "${S}"/cr3qt/CMakeLists.txt \
-		|| die "sed CMakeLists.txt failed"
-}
-
-src_configure() {
-	CMAKE_USE_DIR="${S}"
-	CMAKE_BUILD_TYPE="Release"
-	if use wxwidgets; then
-		setup-wxwidgets
-		local mycmakeargs=(-D GUI=WX)
-	else
-		local mycmakeargs=(-D GUI=QT5)
-	fi
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	if ! use wxwidgets; then
-		mv "${D}"/usr/share/doc/cr3/changelog.gz "${D}"/usr/share/doc/${PF}/ || die "mv changelog.gz failed"
-		rmdir "${D}"/usr/share/doc/cr3 || die "rmdir doc/cr3 failed"
-		gunzip "${D}"/usr/share/doc/${PF}/changelog.gz || die "gunzip changelog.gz failed"
-		gunzip "${D}"/usr/share/man/man1/cr3.1.gz || die "gunzip cr3.1.gz failed"
-	fi
-}
diff --git a/app-text/coolreader/coolreader-3.2.58-r2.ebuild b/app-text/coolreader/coolreader-3.2.58-r2.ebuild
deleted file mode 100644
index b442f7697543..000000000000
--- a/app-text/coolreader/coolreader-3.2.58-r2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-WX_GTK_VER="3.0-gtk3"
-PLOCALES="bg cs de es hu pl ru uk"
-inherit cmake plocale wxwidgets xdg
-
-CR_PV=$(ver_rs 3 '-')
-SRC_URI="https://github.com/buggins/${PN}/archive/cr${CR_PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-cr${CR_PV}"
-
-DESCRIPTION="CoolReader - reader of eBook files (fb2,epub,htm,rtf,txt)"
-HOMEPAGE="https://github.com/buggins/coolreader/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="wxwidgets"
-
-CDEPEND="sys-libs/zlib
-	media-libs/libpng:0
-	virtual/jpeg:0
-	media-libs/freetype
-	dev-libs/fribidi
-	media-libs/fontconfig
-	media-libs/harfbuzz:=
-	dev-libs/libunibreak:=
-	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER} )
-	!wxwidgets? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )"
-BDEPEND="${CDEPEND}
-	!wxwidgets? ( dev-qt/linguist-tools:5 )"
-RDEPEND="${CDEPEND}
-	wxwidgets? ( || ( media-fonts/liberation-fonts media-fonts/corefonts ) )"
-
-src_prepare() {
-	cmake_src_prepare
-	xdg_src_prepare
-
-	# locales
-	plocale_find_changes "${S}"/cr3qt/src/i18n 'cr3_' '.ts'
-	sed -e "s|SET(LANGUAGES .*)|SET(LANGUAGES $(plocale_get_locales))|" \
-		-i "${S}"/cr3qt/CMakeLists.txt \
-		|| die "sed CMakeLists.txt failed"
-}
-
-src_configure() {
-	CMAKE_USE_DIR="${S}"
-	CMAKE_BUILD_TYPE="Release"
-	if use wxwidgets; then
-		setup-wxwidgets
-		local mycmakeargs=(-D GUI=WX)
-	else
-		local mycmakeargs=(-D GUI=QT5)
-	fi
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	if ! use wxwidgets; then
-		mv "${D}"/usr/share/doc/cr3/changelog.gz "${D}"/usr/share/doc/${PF}/ || die "mv changelog.gz failed"
-		rmdir "${D}"/usr/share/doc/cr3 || die "rmdir doc/cr3 failed"
-		gunzip "${D}"/usr/share/doc/${PF}/changelog.gz || die "gunzip changelog.gz failed"
-		gunzip "${D}"/usr/share/man/man1/cr3.1.gz || die "gunzip cr3.1.gz failed"
-	fi
-}
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 4b7aa28fc071..18633bd42814 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/icu4j/Manifest b/dev-java/icu4j/Manifest
index ec366f871d69..561f53719138 100644
--- a/dev-java/icu4j/Manifest
+++ b/dev-java/icu4j/Manifest
@@ -2,5 +2,5 @@ DIST SHASUM512.txt.asc 659 BLAKE2B 474c5dd9eb166181b488dcc2c225f490fc4a27cdec603
 DIST icu-72.1.tar.gz 67092974 BLAKE2B 2261c7969ddbfdb4e75e405646cc9f29b1f8dd21f98641b9318457d3cd27694833a9181f4888d2cb243ba65191fe9216a508684c1dbd5a85f36e06ae8fac7d9e SHA512 fee1278f16528867da63d95feee6864a1f62befa9cc0b006439e1b47cf6f3f0e6581692432129e465208b5bd7fcc44e1175f124e83157547b3d9a78f3a4944ab
 DIST icu4j-71.1.tar.gz 66177851 BLAKE2B 39c5f6e1a8adc6ee913a7a41dcbf733c1f50e6de3047c0c548bf39426102fccef1a03dd7cb4020bd56b32d0c565848f11cc5ce3f738519dd7d2820a670c40443 SHA512 cc9ccb3208d8079c4f8169713aa0ebb930e86cf6c72510a3b7de5824e6482f26166a2e530abaaecfb8338764b23ac215b2921a821167b41d6a3f23952e2718e6
 EBUILD icu4j-71.1.ebuild 6976 BLAKE2B edad2f317878150fb1ca1b2dc6a4efa02d7c0108909286397f4375ba59a9bb6fe6052036f2a6ac3963b9e7aec2e8bc42195235de48fd3369a61549669ebadc3a SHA512 a95dd47fc6eb4203a9774cc16af55326ebfc593c796bfc9ddd074e6cea257bdc6a4ac8cec59aaba01cb9d6fb7966bceddfce63952a9a2a78b91138a1e4d8f3c9
-EBUILD icu4j-72.1.ebuild 7270 BLAKE2B a0f9c1b8fcaa78bc540857dd51facc7caf77b3b47a07e8ff0bba0041f11551b047b61fe852dd33697d93466eebad197fdfde829e8e94a160c683c25fe2d9484e SHA512 bd10b670a46f3ce5985b95215da871ae5250fdfb986a4aa9740f1040102465be12b65397da69d8b638b5465dd26b6cf9d406700a33e140bd00f323d49320ee94
+EBUILD icu4j-72.1.ebuild 7267 BLAKE2B 1fe3dcd470a18350644982858a0b71a940fe5525351cf023eb526dffc8402b4a6784c8ae9d7a976f088710af50757040e198588b37b20a93ced5a4cc9bcfd891 SHA512 0cd9e4126523f401e4db55dfbd2f765258ff28cb12fddd0ac4159c58af13f102e4ad929536bc39bb7afa47705740446e4a6306452fcb3944bd8ae1a59a516a23
 MISC metadata.xml 408 BLAKE2B 8d73c37540d7adce52f3f5b316d7c322bdbbacc3fd2dea5e361352bff8efb3ec2a5b49ca4e7b97d15e8c668e52fe32f90ec1972bae78b9b3b3354973d8fc992a SHA512 eb7df20108b1ebcbf5dd9edd72c2089df2c675028824b4c04976e35b4c306dd459a40aa45b0ac7da5392552657cd1dbaf2fb17b269f9d58110a6ac40dc377b0c
diff --git a/dev-java/icu4j/icu4j-72.1.ebuild b/dev-java/icu4j/icu4j-72.1.ebuild
index 338379b560d8..9e24d160cf9f 100644
--- a/dev-java/icu4j/icu4j-72.1.ebuild
+++ b/dev-java/icu4j/icu4j-72.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/unicode-org/icu/archive/refs/tags/release-${PV/./-}.
 
 LICENSE="icu"
 SLOT="70"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~x86"
 
 DEPEND=">=virtual/jdk-1.8:*
 	test? ( dev-java/junitparams:0 )"
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index 67b374f73c7b..cf4df5c36e92 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
diff --git a/dev-ml/dune-private-libs/Manifest b/dev-ml/dune-private-libs/Manifest
index c61ea4e91966..a12bd79bd1a3 100644
--- a/dev-ml/dune-private-libs/Manifest
+++ b/dev-ml/dune-private-libs/Manifest
@@ -6,5 +6,5 @@ DIST dune-3.0.3.tar.gz 1725788 BLAKE2B 2de93c085f642c8381642a08b18bc21ad48097f32
 EBUILD dune-private-libs-2.8.4.ebuild 4114 BLAKE2B fade94617c408e800bcc4abbf6adf312307d620172a8dfd39215add9b487c559f83829d442d9da4763e6f33e68011518751ff6fa7222b410953e42aa5377d94a SHA512 76da3dd2a3c2d6fb9ca5f3433cf0315c9cd7664f5f0cb57daffaabf87b2f12eca779fa5feddf5483c59aa90b091c3715a1e49e3b61eb1e03297ccec655d0c0ca
 EBUILD dune-private-libs-2.9.1.ebuild 4114 BLAKE2B fade94617c408e800bcc4abbf6adf312307d620172a8dfd39215add9b487c559f83829d442d9da4763e6f33e68011518751ff6fa7222b410953e42aa5377d94a SHA512 76da3dd2a3c2d6fb9ca5f3433cf0315c9cd7664f5f0cb57daffaabf87b2f12eca779fa5feddf5483c59aa90b091c3715a1e49e3b61eb1e03297ccec655d0c0ca
 EBUILD dune-private-libs-2.9.3.ebuild 4430 BLAKE2B a77324e882f89eb08a241ebc17a4de86851851d513a6d210d4cd78ee21519e85316fec5da2c3b67ccf781423da46bbcff6ce0fe58221f1538aa72a14199af40c SHA512 d47796ff2cc00fa9eaa9f58433be4288c6401c0f95a8ebb1ccc3e4514f11c512e26c5e354168312df2b3d6f43cc44e4e23de0006d5d1db09689d04293a873d9d
-EBUILD dune-private-libs-3.0.3.ebuild 747 BLAKE2B 38bdeaaf2e30a6579bae771687b2cf16a409aa19ff686fe3d290915154b9ff855859cc6e5c542e3de1053135baa9910aa6e147df3eb45464788be21edc6d94c4 SHA512 c57fe6d4c070ff885f66728d76ec7e1b5508b2961bf51b5652b75752352ec8cc070d7f1694903e714ad44d8acf8a4ffa44093eda8d5be46925bee73d4ec3bbc2
+EBUILD dune-private-libs-3.0.3-r1.ebuild 864 BLAKE2B 501bf0290ce221b69348465d0a65e034ab3266f8e5c24a3e94cc6120ac2f77001bb33d60afae4c879c2029b463ed0a2eb98cfdd1653b8144e507147a7dba2995 SHA512 08157b52992d00ca4cf1b065969ddf7fac6591dd8490aabdeba264e52f7f439a38b4959b55d4bc74545bc073673468e6584f9a3c4d2bf98870ba9eeaee6e97b0
 MISC metadata.xml 413 BLAKE2B 68bcbe6d091780d3ea48707a42b402cfcc075b1ca0c58a8e145bc8ae6e89806361325f772e9e8b05484fc258f09e33c18fa329a494881e3275f534c65b283c15 SHA512 6520ccff6f2071125a07d0e6bc365c8a919ff32791af97fc633ef68b351de8295454884126334e182da7233744d489acfeb2519c3935990ad21eb20da3f5a1f9
diff --git a/dev-ml/dune-private-libs/dune-private-libs-3.0.3.ebuild b/dev-ml/dune-private-libs/dune-private-libs-3.0.3-r1.ebuild
index b15fa804ee33..5000ebb7def9 100644
--- a/dev-ml/dune-private-libs/dune-private-libs-3.0.3.ebuild
+++ b/dev-ml/dune-private-libs/dune-private-libs-3.0.3-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 inherit dune multiprocessing
 
-DESCRIPTION="A composable build system for OCaml"
+DESCRIPTION="Private libraries of Dune"
 HOMEPAGE="https://github.com/ocaml/dune"
 SRC_URI="https://github.com/ocaml/dune/archive/${PV}.tar.gz -> dune-${PV}.tar.gz"
 S="${WORKDIR}/dune-${PV}"
@@ -16,9 +16,13 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 IUSE="+ocamlopt"
 RESTRICT="test"
 
-BDEPEND="~dev-ml/dune-${PV}"
+BDEPEND=">=dev-ml/dune-3"
 DEPEND="
-	dev-ml/stdune:=
+	>=dev-ml/csexp-1.5:=[ocamlopt?]
+	dev-ml/pp:=[ocamlopt?]
+	~dev-ml/dyn-${PV}:=[ocamlopt?]
+	~dev-ml/stdune-${PV}:=[ocamlopt?]
+	>=dev-lang/ocaml-4.08
 "
 RDEPEND="${DEPEND}"
 
diff --git a/dev-ml/dyn/Manifest b/dev-ml/dyn/Manifest
index bb0fe494dfb7..089b6151705a 100644
--- a/dev-ml/dyn/Manifest
+++ b/dev-ml/dyn/Manifest
@@ -1,3 +1,3 @@
 DIST dune-3.0.3.tar.gz 1725788 BLAKE2B 2de93c085f642c8381642a08b18bc21ad48097f32397b3eddab9725deb267b089849b649705e1b72bb1b5b37f7531fd9e0cfb134174f0cb3a8ee2595c7dcf8ce SHA512 839e942bcf8189763d0d9b01614333bb2f036bce68c82959e51d2e9145b57067cb862b66781912391c1a0f531b8dddf2ffeafcee71c626169a437fe40feba155
-EBUILD dyn-3.0.3.ebuild 718 BLAKE2B 3bac5566705c1eb6b49eed073b387542fae5560d9e1c6fb78031baa4ddf2b532f44316a4682e9547bb079f7189c6703f38e76a25e635da17d78b489ee6b3f32d SHA512 ad99b1e5e38a95d2fae8adc50429f63ab215bdc07c306d2dfd9226bf42f8b19c038732935ceb2436a602e536c1cccc6c4863b877a835a8c6d0bdbc080909e09f
+EBUILD dyn-3.0.3-r1.ebuild 735 BLAKE2B 50178b1198063c8c4948fcdca0e2ee28788f9c028b315cb64f3f8ed94918e00bf7b5ef99cac87608c21394a854eb053f7f7dbe1527833a421bb1d1cb3a7e0db6 SHA512 03840527586ee0c0fce79d25467ac1345b6c526dd743284da848e1a020d663a4496cd098eacd4b5f03811367df8ccc7fabee9a596fb0932beaae1438f73fecf1
 MISC metadata.xml 308 BLAKE2B 555692890c7fe4dee18d07e140384b70278e2a4a0230916a01ab9e5306776e0ed0d979e9a3487423fa1779a166da3038dca13273811e36593bb2b821b60cdfe0 SHA512 e50e28cb6f41fda295f12af1b94aba12dda8a7091322c0e7093d19ee60615d449bc1806354043e572d70aff1284e16b644b188911adbca60a2a5c8299fcee748
diff --git a/dev-ml/dyn/dyn-3.0.3.ebuild b/dev-ml/dyn/dyn-3.0.3-r1.ebuild
index ba609c7fd471..c25478c40de7 100644
--- a/dev-ml/dyn/dyn-3.0.3.ebuild
+++ b/dev-ml/dyn/dyn-3.0.3-r1.ebuild
@@ -16,8 +16,9 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 IUSE="+ocamlopt"
 RESTRICT="test"
 
-BDEPEND="~dev-ml/dune-${PV}"
-DEPEND="dev-ml/ordering:="
+BDEPEND=">=dev-ml/dune-3"
+DEPEND="~dev-ml/ordering-${PV}:=
+	dev-ml/pp:="
 RDEPEND="${DEPEND}"
 
 src_configure() {
diff --git a/dev-ml/ordering/Manifest b/dev-ml/ordering/Manifest
index 153a15f4ec1d..e91b509b4cc3 100644
--- a/dev-ml/ordering/Manifest
+++ b/dev-ml/ordering/Manifest
@@ -1,3 +1,3 @@
 DIST dune-3.0.3.tar.gz 1725788 BLAKE2B 2de93c085f642c8381642a08b18bc21ad48097f32397b3eddab9725deb267b089849b649705e1b72bb1b5b37f7531fd9e0cfb134174f0cb3a8ee2595c7dcf8ce SHA512 839e942bcf8189763d0d9b01614333bb2f036bce68c82959e51d2e9145b57067cb862b66781912391c1a0f531b8dddf2ffeafcee71c626169a437fe40feba155
-EBUILD ordering-3.0.3.ebuild 705 BLAKE2B bc801175013b3c105f9539e0061c22830f53f6b8c2091e3e06b73edc50a9fe6dd4810a848b6f299b80829b7b1034b2c50b52b8a720442f3da27295f05df504db SHA512 e0ace6c90e7b83d20298f4d77910479fffb19b6fa1f7bccd7a6df8d76f7f61f82005789d1aed26cf798b318e71d28b04d6d02838ec21da2985c8d29411a124e3
+EBUILD ordering-3.0.3.ebuild 723 BLAKE2B ad341964914e19c0d9509ed4990ef2913d9c7338d72897fac8b82d03d0b6169caf15adcb62bed2a9beecfe85e00a8aedae938c7473e7e4f45bf28813eb3ab689 SHA512 5d128cc3d8edb9528e81d02017c07acbcbf8f70141e12875e9ee5a3384b47ee3308ab96959225a7c38ee43d2d07378884ba68eea910f65bec006bb92b3ac8c16
 MISC metadata.xml 308 BLAKE2B 555692890c7fe4dee18d07e140384b70278e2a4a0230916a01ab9e5306776e0ed0d979e9a3487423fa1779a166da3038dca13273811e36593bb2b821b60cdfe0 SHA512 e50e28cb6f41fda295f12af1b94aba12dda8a7091322c0e7093d19ee60615d449bc1806354043e572d70aff1284e16b644b188911adbca60a2a5c8299fcee748
diff --git a/dev-ml/ordering/ordering-3.0.3.ebuild b/dev-ml/ordering/ordering-3.0.3.ebuild
index 0c02ad290b06..5b971ed0de41 100644
--- a/dev-ml/ordering/ordering-3.0.3.ebuild
+++ b/dev-ml/ordering/ordering-3.0.3.ebuild
@@ -16,8 +16,8 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 IUSE="+ocamlopt"
 RESTRICT="test"
 
-BDEPEND="~dev-ml/dune-${PV}"
-DEPEND=""
+BDEPEND=">=dev-ml/dune-3"
+DEPEND=">=dev-lang/ocaml-4.08"
 RDEPEND="${DEPEND}"
 
 src_configure() {
diff --git a/dev-ml/stdune/Manifest b/dev-ml/stdune/Manifest
index 8317eb640ed3..00cf85f55ec9 100644
--- a/dev-ml/stdune/Manifest
+++ b/dev-ml/stdune/Manifest
@@ -1,3 +1,3 @@
 DIST dune-3.0.3.tar.gz 1725788 BLAKE2B 2de93c085f642c8381642a08b18bc21ad48097f32397b3eddab9725deb267b089849b649705e1b72bb1b5b37f7531fd9e0cfb134174f0cb3a8ee2595c7dcf8ce SHA512 839e942bcf8189763d0d9b01614333bb2f036bce68c82959e51d2e9145b57067cb862b66781912391c1a0f531b8dddf2ffeafcee71c626169a437fe40feba155
-EBUILD stdune-3.0.3.ebuild 771 BLAKE2B d137e7ef80ec8c60ee6f29d88019a78a59b80bb1f206c91fd7ca1a6d6250a33281994aff2a47153fcffd746b71d45010d592ec83fa83a63b471266edf4161132 SHA512 69175899051a074f8821033544ace4bcfe0b740804ffe4908e2cd1d7faa2837a2f003e922f607cc7dfa5398a89c762753ea68d3d69d2f48475c5133745ec590a
+EBUILD stdune-3.0.3-r1.ebuild 845 BLAKE2B 4011992b54716bd47eb10da5a4e09bd9da930ea75be0f6b4073b7410c3aebcbd56d542e391337af936cec2b8e240f5f53cc5fbdf693fb072a78d0bec6685696f SHA512 30d5e3cfb21628f9fa2846302e8e69e18f1b0f72af47399fb9e1b16faabac03549f2ee550a052468512550acf59a729aa445a31773def2a2bc465f58735d5290
 MISC metadata.xml 308 BLAKE2B 555692890c7fe4dee18d07e140384b70278e2a4a0230916a01ab9e5306776e0ed0d979e9a3487423fa1779a166da3038dca13273811e36593bb2b821b60cdfe0 SHA512 e50e28cb6f41fda295f12af1b94aba12dda8a7091322c0e7093d19ee60615d449bc1806354043e572d70aff1284e16b644b188911adbca60a2a5c8299fcee748
diff --git a/dev-ml/stdune/stdune-3.0.3.ebuild b/dev-ml/stdune/stdune-3.0.3-r1.ebuild
index 9a437d49b807..57914cc6d34c 100644
--- a/dev-ml/stdune/stdune-3.0.3.ebuild
+++ b/dev-ml/stdune/stdune-3.0.3-r1.ebuild
@@ -16,10 +16,12 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 IUSE="+ocamlopt"
 RESTRICT="test"
 
-BDEPEND="~dev-ml/dune-${PV}"
+BDEPEND=">=dev-ml/dune-3"
 DEPEND="
 	dev-ml/pp:=[ocamlopt?]
-	dev-ml/dyn:=[ocamlopt?]
+	~dev-ml/dyn-${PV}:=[ocamlopt?]
+	~dev-ml/ordering-${PV}:=[ocamlopt?]
+	>=dev-ml/csexp-1.5:=[ocamlopt?]
 "
 RDEPEND="${DEPEND}"
 
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 43f220c420bb..af4d47ea257e 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/astroid/Manifest b/dev-python/astroid/Manifest
index 7d61e69427a0..50815d324139 100644
--- a/dev-python/astroid/Manifest
+++ b/dev-python/astroid/Manifest
@@ -1,3 +1,5 @@
 DIST astroid-2.12.12.gh.tar.gz 437277 BLAKE2B a1f549db526b1012e76e1da480e779a35971e8985f452eaf5ce1bc6735c5210db5c2282685dbaa2f1720a1e1fa6cf6f2152fbb8c782243cd11e09acc427774da SHA512 61047c1aa31b5b0a80c604194a91341c474062e2f1094316ff9b03641ecfe3ddf25b4a3b26356561f9c16d8b5599694ecef275ce5846792a18bcc0a7ad3e720f
+DIST astroid-2.12.13.gh.tar.gz 437906 BLAKE2B c00462d44c9705dc5b46fc52915e6a44e53e840d5326427d235c9156bc4de58b184271338ebc10a4572e1aace8d4ababd3bd7e440a6ee585aa66d15dfe4117be SHA512 16d062b1a619663b157c4753f1744e56e7d0ef7cace12660feb7f6bc540e54be02638b52c1c877d3eb514e2d7423c4afc71e7d5464880bfd3724ff7ae6d7b90a
 EBUILD astroid-2.12.12.ebuild 1809 BLAKE2B 989055cbea9fa3c74f80b54efe69005c1d9f802aa9c0b6c91105ed77dbafd3406e955e98c4acd8b51a5dfc5126bcef001fa00a8d6dce186cb8011ffcb1cd7a07 SHA512 46c0adf7b503d3716baadad6fc9fb1fe61dff5ca4e11c5225354cdd57b0afb1a05e66a8650dff8e76fdd45062e16ba89c639e24405238c175e6e715b4a3a313f
+EBUILD astroid-2.12.13.ebuild 1817 BLAKE2B 8e495b2ba1a5ba50cd82944562d02f279cb9915cff1487ae13e3d752f0341213cb2be6b7a0ad3c88c9a0e09258c8b007ee557fdccfe821fb38d818015a141030 SHA512 18156ef33b1c5bde959cad1afc1309435eec1049e631edece13070713988d76b9ebe5574a15d64fd3098e62a7d74c3c3d6c1ebf500f6811aa7f76d35389d2617
 MISC metadata.xml 1143 BLAKE2B 1f6c4e004277eebed2e29cb935ef01e5f18fb0a526f99f0e875ae3815308dce0483b5274b4e23bed076464aa62a035937a7a3817e2d4a5fb9211b9043271e04c SHA512 56b07d0f08a49772661bc3d233cf1f628aa7c241c51b91d75dfbd44995e169d8ab5bbd99863d7b9b67792486346982a7b8eebefb462e7e212cd7dff920d80840
diff --git a/dev-python/astroid/astroid-2.12.13.ebuild b/dev-python/astroid/astroid-2.12.13.ebuild
new file mode 100644
index 000000000000..a7561581a64c
--- /dev/null
+++ b/dev-python/astroid/astroid-2.12.13.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Abstract Syntax Tree for logilab packages"
+HOMEPAGE="
+	https://github.com/PyCQA/astroid/
+	https://pypi.org/project/astroid/
+"
+SRC_URI="
+	https://github.com/PyCQA/astroid/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+# Version specified in pyproject.toml
+RDEPEND="
+	>=dev-python/lazy-object-proxy-1.4.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/typing-extensions-3.10[${PYTHON_USEDEP}]
+	<dev-python/wrapt-2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# no clue why it's broken
+		tests/unittest_modutils.py::GetModulePartTest::test_known_values_get_builtin_module_part
+		tests/unittest_brain_dataclasses.py::test_pydantic_field
+		tests/unittest_brain.py::SixBrainTest::test_from_imports
+		tests/unittest_regrtest.py::NonRegressionTests::test_numpy_distutils
+		# some problem with warnings (our options?)
+		tests/unittest_decorators.py::TestDeprecationDecorators::test_deprecated_default_argument_values_one_arg
+		tests/unittest_decorators.py::TestDeprecationDecorators::test_deprecated_default_argument_values_two_args
+		tests/unittest_scoped_nodes.py::test_deprecation_of_doc_attribute
+	)
+
+	# Faker causes sys.path_importer_cache keys to be overwritten
+	# with PosixPaths
+	epytest -p no:faker
+}
diff --git a/dev-python/cheroot/Manifest b/dev-python/cheroot/Manifest
index c63026c1447b..362343c08431 100644
--- a/dev-python/cheroot/Manifest
+++ b/dev-python/cheroot/Manifest
@@ -1,4 +1,7 @@
 AUX cheroot-8.6.0-remove-pypytools-dep.patch 2757 BLAKE2B 97628fd6590dbe41e34bf0b93bc1062c424097aeea26a86891e2d2fc049fb7ee7a990fc9b9d3dba9406bdd344e3c25cdd08907aaac11e64d78c73b3ccd9b3fa5 SHA512 ddc88d93c795ea25c56d0b2a1bfee1b0f9c900ec2594d69aa91c639575c86c1fb89accc95992587db76d5c4e438a34f2eceac480c60a5470aee5ecd996140e44
+AUX cheroot-9.0.0-remove-pypytools-dep.patch 731 BLAKE2B 9b0cd967e10d65a14ddc17d411f84e20641f73f89a0094be99f36c7c2924ee18e938ec3e7cd3852a90f6e2e0fb3efcec76652b0c6f2ab1d4b719769d822eab52 SHA512 5e3b9c8ed9ba6df645df9fa0eb9787f85ee01bf7a4dfa163c9d6ee281b65cab6303486af45f0b309f13b34e7567f11894048daf2cd1edc8bd1a1e594216317c3
 DIST cheroot-8.6.0.tar.gz 134779 BLAKE2B 97d1a9bf0a8d72d3204972934aa3ac4c97246b413edebd9f38caa802a5343acc426f137addfdc0faec58f6af2d62bc22023e93b14e1b0b07f6be9ffb12e78306 SHA512 26e48c935fe32d4ce3cf6ae20b5b272416ca53bd8496527c2958ec2ebe87529c831f283ae900e13271b610e39531b682df0376935ecc3bcfcca11c299cd2a893
+DIST cheroot-9.0.0.tar.gz 152562 BLAKE2B 5f5dd172cfc8fdd1318b22fc27060444a34343b6b83bbda4bd40c16d7cb0568c356f5fd14b0a7cdc74895d6707077ec54fcae54fb29b0d16a7c06e2cd36b1ee7 SHA512 86ea0dd2cb4cde25f86b489b1d0bb27e3e7c1ba5449759ccecaae689cdcb349b968fd0c8fb8bc8273deff5e32a078bf40f4342f0c5a1f53bb8d2b968f44a453b
 EBUILD cheroot-8.6.0-r1.ebuild 1872 BLAKE2B 4392d43c6eca572c07129963eef6d8ea0fed1a97dea212fe8eba15d1a12a9860e506a3ec1e41bc726272aae9a5228740ae8a02dfdb6b8e780c4bf8da3c5f05bf SHA512 d25b25098dd127bbf59f089b457599271e36eec82746e57b105934838133adab76fae1b65a7132fb129ac70eb62df4dbb982fa5e660e096ff0c75f3f05d68122
+EBUILD cheroot-9.0.0.ebuild 1969 BLAKE2B 0deffd50d152435a3171f587423f190663850c84184e0c9b7d5745949fd9af7bdef4c8f817ce4044b86e7f76e9573fab687a06341d4cd8c67c0b53a859a86d2a SHA512 58556ac85c2ae0d2e0eb9a264806ea59af91fe646440ff11575b089e45f1f8427668b47edf5c556709a5dc859fac1c3f7a3f541509f1b6e08180f5102c11f6e7
 MISC metadata.xml 391 BLAKE2B 1c9c2af2c1a8bcd3f1c426a87d1a2a97fb88a9a30f9c2f1802b8885329277fcfde1deadf635e419cd7f85a5685639709be33aa746d9f7a04c3ac7d832d084b42 SHA512 c194e8bed8d082ed4ce3f2a7f608085fdcf2ab8b7c730e5c6ad7438cf177ed1892565cdff0feda564681f59bf6aefc327e3d24da0a543c0f043934af27873e95
diff --git a/dev-python/cheroot/cheroot-9.0.0.ebuild b/dev-python/cheroot/cheroot-9.0.0.ebuild
new file mode 100644
index 000000000000..f16d3e17d8a7
--- /dev/null
+++ b/dev-python/cheroot/cheroot-9.0.0.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="High-performance, pure-Python HTTP server used by CherryPy"
+HOMEPAGE="
+	https://cherrypy.dev/
+	https://pypi.org/project/cheroot/
+	https://github.com/cherrypy/cheroot/
+"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="test-rust"
+
+RDEPEND="
+	>=dev-python/six-1.11.0[${PYTHON_USEDEP}]
+	>=dev-python/more-itertools-2.6[${PYTHON_USEDEP}]
+	dev-python/jaraco-functools[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/jaraco-context[${PYTHON_USEDEP}]
+		dev-python/jaraco-text[${PYTHON_USEDEP}]
+		dev-python/portend[${PYTHON_USEDEP}]
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+		>=dev-python/pytest-mock-1.11.0[${PYTHON_USEDEP}]
+		dev-python/requests-toolbelt[${PYTHON_USEDEP}]
+		dev-python/requests-unixsocket[${PYTHON_USEDEP}]
+		dev-python/urllib3[${PYTHON_USEDEP}]
+		test-rust? (
+			dev-python/pyopenssl[${PYTHON_USEDEP}]
+			dev-python/trustme[${PYTHON_USEDEP}]
+		)
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	sed -e '/--cov/d' \
+		-e '/--testmon/d' \
+		-e '/--numproc/d' \
+		-i pytest.ini || die
+
+	# broken
+	sed -i -e '/False.*localhost/d' cheroot/test/test_ssl.py || die
+	# pypytools is py2 stuff
+	sed -i -e '/pypytools/d' cheroot/test/test_server.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# requires pypytools, see above
+		cheroot/test/test_server.py::test_high_number_of_file_descriptors
+	)
+
+	local EPYTEST_IGNORE=()
+	if ! has_version "dev-python/pyopenssl[${PYTHON_USEDEP}]" ||
+		! has_version "dev-python/trustme[${PYTHON_USEDEP}]"
+	then
+		EPYTEST_IGNORE+=(
+			cheroot/test/test_ssl.py
+		)
+	fi
+
+	epytest -p no:flaky
+}
diff --git a/dev-python/cheroot/files/cheroot-9.0.0-remove-pypytools-dep.patch b/dev-python/cheroot/files/cheroot-9.0.0-remove-pypytools-dep.patch
new file mode 100644
index 000000000000..8e79b2c776f4
--- /dev/null
+++ b/dev-python/cheroot/files/cheroot-9.0.0-remove-pypytools-dep.patch
@@ -0,0 +1,21 @@
+diff --git a/cheroot/test/test_server.py b/cheroot/test/test_server.py
+index 5e0a6832..6f480f40 100644
+--- a/cheroot/test/test_server.py
++++ b/cheroot/test/test_server.py
+@@ -12,8 +12,6 @@ import pytest
+ import requests
+ import requests_unixsocket
+ 
+-from pypytools.gc.custom import DefaultGc
+-
+ from .._compat import bton, ntob
+ from .._compat import IS_LINUX, IS_MACOS, IS_WINDOWS, SYS_PLATFORM
+ from ..server import IS_UID_GID_RESOLVABLE, Gateway, HTTPServer
+@@ -324,6 +322,7 @@ def test_peercreds_unix_sock_with_lookup(
+         assert peercreds_text_resp.text == expected_textcreds
+ 
+ 
++@pytest.mark.skip("pypytools not packaged")
+ @pytest.mark.skipif(
+     IS_WINDOWS,
+     reason='This regression test is for a Linux bug, '
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index 60c491cffb5d..5361ff3c6f2d 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -2,8 +2,10 @@ DIST hypothesis-6.56.2.gh.tar.gz 9333277 BLAKE2B 6c75b48cd6e7300c05bd020003340aa
 DIST hypothesis-6.56.3.gh.tar.gz 9333288 BLAKE2B 9608542d8dbe97fec147eae1f9b2f06af2b08e3cc0807fefcfa97b0a8c1aa30a15df9f1114a13f5c719701a4d13ab09a808d0d09e271d9e0d69168ebc4183af4 SHA512 f410455e77c6e9dc3b9003ef3d4c21bd204d85bc567dfd0d420986dc255d8c1ff9f41d809d837286f02064f546a08eff0f89389906ab7023581cc1f5a5d18947
 DIST hypothesis-6.56.4.gh.tar.gz 9333399 BLAKE2B abe041212cff7ab1d6c2684706ae4d297bad160798152ce52dec9b5024a1aef2445947bb6e7c7fa69c1b3e9cd2e9335d7ac7f330e0910b987d3aa3f34f8c2f3e SHA512 80ce1d5c296fc304b4e1a09846db5e88d2f52a1d790a8717a2a4a506cdd08290392036c02339d3f9d8bf236866dbcd9256e543d0808f32896b172ed840165114
 DIST hypothesis-6.57.1.gh.tar.gz 9334332 BLAKE2B 5516e9ff84f11909eadc7888f2727f13731ef9d3ad91c15666d5ee11d32bafbc9361171b35d31c5231fe50ac9a734eb3a8edd612ed3f47d3bd6f2a851f751a65 SHA512 3cb24416a10cc1a1419844565913f8bdd95063d12e9ea7cbed16e6583e5d7da8a83d34d1fdb4060cf190341d21947a58f5871f44bc45bc0e84316111d530251d
+DIST hypothesis-6.58.0.gh.tar.gz 9335693 BLAKE2B 8e72b1ddd2a0c3bd07e5e865147e0befc7bbb42eb16e02704dbb79372e94161b6cc8f1f989b8541331e8488244c3d07e87d118ee43ba07a123de31cdb7b58bbb SHA512 91f128f333144859331e9a841d47d8414964955e14071a49e3d4504a9c9970e5f737c9036be8f20bdda1e620bb428809301d1008bfbd4b0aaa05757abeb8687d
 EBUILD hypothesis-6.56.2.ebuild 2132 BLAKE2B 46f1d1c0f69606e55673a002c305f72655f44ac456ea0e8cde03e7cfd12a074d915f00b29280637b150a4faa596dcd28e2527fc6762aa53893f245530c5a7eef SHA512 bb0602862ac4175e49605bb095ca8d9a027a964cda6e0cc51f03910f5186436646e25f25621cbfec777dbbf0e5fbb4f7a5a01ef646fc20bb84f75980daddf1b8
 EBUILD hypothesis-6.56.3.ebuild 2140 BLAKE2B b805e367bbbe90dc2037a89f3488677ea9eed9052283c25a2562d3a5af85b73d2e11a2019cf64a4a8c8d7dd180f8636f03519b0681afb61a38a6057bc707d097 SHA512 dfeb6198d076546f2654edc67fd6f0fcfaf1cdc65385ad90e01901c54e06f565a48d23af2ca48d1acfcd91cfbdc2b5072fb211f2fe02237b2bb6935a0682d07c
 EBUILD hypothesis-6.56.4.ebuild 2140 BLAKE2B b805e367bbbe90dc2037a89f3488677ea9eed9052283c25a2562d3a5af85b73d2e11a2019cf64a4a8c8d7dd180f8636f03519b0681afb61a38a6057bc707d097 SHA512 dfeb6198d076546f2654edc67fd6f0fcfaf1cdc65385ad90e01901c54e06f565a48d23af2ca48d1acfcd91cfbdc2b5072fb211f2fe02237b2bb6935a0682d07c
 EBUILD hypothesis-6.57.1.ebuild 2140 BLAKE2B b805e367bbbe90dc2037a89f3488677ea9eed9052283c25a2562d3a5af85b73d2e11a2019cf64a4a8c8d7dd180f8636f03519b0681afb61a38a6057bc707d097 SHA512 dfeb6198d076546f2654edc67fd6f0fcfaf1cdc65385ad90e01901c54e06f565a48d23af2ca48d1acfcd91cfbdc2b5072fb211f2fe02237b2bb6935a0682d07c
+EBUILD hypothesis-6.58.0.ebuild 2140 BLAKE2B b805e367bbbe90dc2037a89f3488677ea9eed9052283c25a2562d3a5af85b73d2e11a2019cf64a4a8c8d7dd180f8636f03519b0681afb61a38a6057bc707d097 SHA512 dfeb6198d076546f2654edc67fd6f0fcfaf1cdc65385ad90e01901c54e06f565a48d23af2ca48d1acfcd91cfbdc2b5072fb211f2fe02237b2bb6935a0682d07c
 MISC metadata.xml 756 BLAKE2B 26e40ab96ddcbd5751023e3c0cc9aa86e96d73ba02bca750ad15eb4301beb0318d3d694c54c2c2a2cb50937731af727411e8afb67e1a21e58e0ff611eeea9149 SHA512 cd48d35c5fe41aa9efcfea9eb7b2d78a4646658b5aab7533ca6492d4700032099fd34ca2dc45a6198c27351650c9e901c8b7c4d53ade2b56695d5e26ca371238
diff --git a/dev-python/hypothesis/hypothesis-6.58.0.ebuild b/dev-python/hypothesis/hypothesis-6.58.0.ebuild
new file mode 100644
index 000000000000..bbb3ede19663
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-6.58.0.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+CLI_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( "${CLI_COMPAT[@]}" python3_11 pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 multiprocessing optfeature
+
+TAG=hypothesis-python-${PV}
+MY_P=hypothesis-${TAG}
+DESCRIPTION="A library for property based testing"
+HOMEPAGE="
+	https://github.com/HypothesisWorks/hypothesis/
+	https://pypi.org/project/hypothesis/
+"
+SRC_URI="
+	https://github.com/HypothesisWorks/hypothesis/archive/${TAG}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S="${WORKDIR}/${MY_P}/hypothesis-python"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="cli"
+
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/exceptiongroup-1.0.0_rc8[${PYTHON_USEDEP}]
+	' 3.8 3.9 3.10)
+	cli? (
+		$(python_gen_cond_dep '
+			dev-python/black[${PYTHON_USEDEP}]
+			dev-python/click[${PYTHON_USEDEP}]
+		' "${CLI_COMPAT[@]}")
+	)
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		!!<dev-python/requests-toolbelt-0.10.1
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	# subtests are broken by warnings from random plugins
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=xdist.plugin,pytest_forked,_hypothesis_pytestplugin
+
+	epytest tests/cover tests/pytest tests/quality -n "$(makeopts_jobs)"
+}
+
+python_install() {
+	distutils-r1_python_install
+	if ! use cli || ! has "${EPYTHON}" "${CLI_COMPAT[@]/_/.}"; then
+		rm -r "${ED}/usr/bin" "${D}$(python_get_scriptdir)" || die
+	fi
+}
+
+pkg_postinst() {
+	optfeature "datetime support" dev-python/pytz
+	optfeature "dateutil support" dev-python/python-dateutil
+	optfeature "numpy support" dev-python/numpy
+	optfeature "django support" dev-python/django dev-python/pytz
+	optfeature "pandas support" dev-python/pandas
+	optfeature "pytest support" dev-python/pytest
+}
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index 7778bac6ff85..135edb3296c5 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -3,16 +3,21 @@ AUX numpy-1.22.4-py311.patch 1150 BLAKE2B b07b61133b70f59f350759d94fa45e9fe7ec6e
 DIST numpy-1.22.4.zip 11458830 BLAKE2B c999a42119e8d71942e4df4802ea22eef6c1ab65e11ad1f8364dd811c3df0eae1c7499055e76b523dc011bc9574f4060e17ecc3ea8bd35f5247fa17e3e188364 SHA512 bb2993459157c43f8c419de98be1c832f108b4eb6b96e1d20f406eccd782681ad8d0f8653637962ac592abe7d75719c17678ec97f035f6c87d4c7f939a1a8a48
 DIST numpy-1.23.3.tar.gz 10726039 BLAKE2B 4b6d38fc0363ea89f173a0cd65368b7c154b45f7f661098378f7ef31208008d5ff17ae58eab72bed921d166d630a4eca3441fc3097cd41a4a945b8f8180375cc SHA512 e690ea2906c91e567df2c801fbfe41652dabd37208faa99d6e068bda423dcc9f88be013478e9b6c1a339c36ef4c44b07a067d44e4e9c4b2e4f1344cbcb0598a9
 DIST numpy-1.23.4.tar.gz 10728765 BLAKE2B bbac44cc8a09a36537e25f90833c2ad7d1e4025e7d3eebd3c73ae2f12f1109520b58d2a779324f542aa1f2787f8b6c50ea907eb5ab7b7b84ebe3f3342c3d8a09 SHA512 727ca8950b0fbd5670e939b1c9c5cea852781ec4254d56a1659a91dc0430fc10b01ffdd16e1bb28a62319f91029e087024f4c6298bfc859a6050bfb507edcff8
+DIST numpy-1.23.5.tar.gz 10731755 BLAKE2B d2ed6d359a51343a1618f64604e4d5c030115caa63f2aadf2fc150775630e40fbebaad28f5657faae1365264fd45bc9efb00854bf9cd393b7628c96d6fc87db9 SHA512 8f3ece76dbe79bc887275332d25f851ade2087de3026de5fb7ed793590b3e7d274f590357296e152373b4e9a245d4d563393ba7198bca6d44631b941acb89c2c
 DIST numpy-html-1.22.4.zip 23724824 BLAKE2B 44ea3da0a703a024a629c8413dfffaf760458b185d19452da0e7e23c819e19833291e10ebd07bdda794077574b8852a368036dda8335c2753cd481740497502a SHA512 4077d9974bfd7f2c189025c3740350652e6f8e0b5727fbc9711a1c0118c1e4ecc281d4876baf1c6a5dc802d20178d6b04a2922f14e9c321cd3b68228b1e295c3
 DIST numpy-html-1.23.3.zip 27964271 BLAKE2B 0aa26d7c39f2d6b119e404dfb9642967770881ee0d640157a9ed11d16f21cd43109bed3c08f89fda457ec470292d945e2bf8b2dab56e4b36192d5e8eb3757b44 SHA512 218a2e893816af767c7cedd1f2256e05f68e59491c29277c95de653a206aaff35c5fe3bc6afd6d6d5ea7957748ec565593eb30d004e36e94c894ea4a6884902a
 DIST numpy-html-1.23.4.zip 27964271 BLAKE2B 0aa26d7c39f2d6b119e404dfb9642967770881ee0d640157a9ed11d16f21cd43109bed3c08f89fda457ec470292d945e2bf8b2dab56e4b36192d5e8eb3757b44 SHA512 218a2e893816af767c7cedd1f2256e05f68e59491c29277c95de653a206aaff35c5fe3bc6afd6d6d5ea7957748ec565593eb30d004e36e94c894ea4a6884902a
+DIST numpy-html-1.23.5.zip 27964271 BLAKE2B 0aa26d7c39f2d6b119e404dfb9642967770881ee0d640157a9ed11d16f21cd43109bed3c08f89fda457ec470292d945e2bf8b2dab56e4b36192d5e8eb3757b44 SHA512 218a2e893816af767c7cedd1f2256e05f68e59491c29277c95de653a206aaff35c5fe3bc6afd6d6d5ea7957748ec565593eb30d004e36e94c894ea4a6884902a
 DIST numpy-ref-1.22.4.pdf 7537013 BLAKE2B 702398fddde349901f9303f4788a3ae3cc4bb78b4d310e169fcc6193fd62b33947c89ede45ba9aaea55e74f6a6abc755d3d94428adce9a8163678c6718aec2da SHA512 c1617817f94ccdfe2bbdebdc9c6869beefa1369d5ab0897c1573d8fb5cb3de153f90d5588aae84a0f498fba57ad6bc5c0c5c2c3aefb119e2913e4ddf007cc8e1
 DIST numpy-ref-1.23.3.pdf 7715485 BLAKE2B 7fbb0ce29e86fc7cd4932a6a9f0221b579b6cae695231edfebf863e5b4c2920796d802ccf9ae3e05b331964ac7c4f51099578d91b6b7fb357c6de2110a5f7cba SHA512 6036c6a36f332b83f371c7530a6ba6f354b1334d667d2a52993a1e52aa9d94d524e216f768928a006c717ed4b4131879f6e491a294ecfd3a0d1b0f9f937a887a
 DIST numpy-ref-1.23.4.pdf 7715485 BLAKE2B 7fbb0ce29e86fc7cd4932a6a9f0221b579b6cae695231edfebf863e5b4c2920796d802ccf9ae3e05b331964ac7c4f51099578d91b6b7fb357c6de2110a5f7cba SHA512 6036c6a36f332b83f371c7530a6ba6f354b1334d667d2a52993a1e52aa9d94d524e216f768928a006c717ed4b4131879f6e491a294ecfd3a0d1b0f9f937a887a
+DIST numpy-ref-1.23.5.pdf 7715485 BLAKE2B 7fbb0ce29e86fc7cd4932a6a9f0221b579b6cae695231edfebf863e5b4c2920796d802ccf9ae3e05b331964ac7c4f51099578d91b6b7fb357c6de2110a5f7cba SHA512 6036c6a36f332b83f371c7530a6ba6f354b1334d667d2a52993a1e52aa9d94d524e216f768928a006c717ed4b4131879f6e491a294ecfd3a0d1b0f9f937a887a
 DIST numpy-user-1.22.4.pdf 3978348 BLAKE2B 87cc73cb1c406446eb9d86ea6cbaeac6ba13c7d2b2ffd47524483af1698c3efdfaafe61e987624c5ce01939494861413b271e9a96f49abbbe69d634b9be55c95 SHA512 8e04c0c90255038471de6ef0f8f4ed9e356d646b028bb16f667f3c59170eddaa0d86d48226462c5c17b8123b2a28a09982764979e9e76658b4e26cd0a976f3a1
 DIST numpy-user-1.23.3.pdf 4123384 BLAKE2B d4587c9f979e1ef4734768598d6e106f2b4b0c8222f901a6c4caf0920e41622201252c5bd172b16346e0357138b5ff27c59e56c851be5ae3b7712624bd9cc5b4 SHA512 58e1ab96d2cfbd96df205c86f0a1a09e204349f70d21df7f8481c21ded8b46f4b9ede3216d5cce6c2b9bfc0aacbecdfa198bdb2d4c258a0dd4acb6e3ba421f9c
 DIST numpy-user-1.23.4.pdf 4123384 BLAKE2B d4587c9f979e1ef4734768598d6e106f2b4b0c8222f901a6c4caf0920e41622201252c5bd172b16346e0357138b5ff27c59e56c851be5ae3b7712624bd9cc5b4 SHA512 58e1ab96d2cfbd96df205c86f0a1a09e204349f70d21df7f8481c21ded8b46f4b9ede3216d5cce6c2b9bfc0aacbecdfa198bdb2d4c258a0dd4acb6e3ba421f9c
+DIST numpy-user-1.23.5.pdf 4123384 BLAKE2B d4587c9f979e1ef4734768598d6e106f2b4b0c8222f901a6c4caf0920e41622201252c5bd172b16346e0357138b5ff27c59e56c851be5ae3b7712624bd9cc5b4 SHA512 58e1ab96d2cfbd96df205c86f0a1a09e204349f70d21df7f8481c21ded8b46f4b9ede3216d5cce6c2b9bfc0aacbecdfa198bdb2d4c258a0dd4acb6e3ba421f9c
 EBUILD numpy-1.22.4.ebuild 5017 BLAKE2B f96fc50d46976f644412066a0ca32f3f6cbe68e3af54076bd9567a827d2929cc5789483c54656f51cee2f3153f28382a3901ad0a79ddaef84e552be2ebe8e961 SHA512 368980e6e319284d242669515c225766c56805f95d53ee259b0e88b394132a9d1b0fdaa58c0577c5e12a9282755ce39701f6a8d463792d7a5cc0dd3d3340c6c6
 EBUILD numpy-1.23.3.ebuild 4896 BLAKE2B cb89f6fd839ea412a25830cc3c94f5b3faa6fc7b2db52ef9d7e5852ccd1825774e1d9df8de918bb0113877bc4a3d8acf56de5c74073db54ef9a7914e550fa61e SHA512 634586d63cdd62f6286a54109b2ca1e699668e8698ca4e21ee9e6726b2f46f2b47304036d3c87177b415c5657a0385792aef0c6a53da81364b9ca6a25a5af520
 EBUILD numpy-1.23.4.ebuild 4897 BLAKE2B 3f362d6b9119dd346e05f629f164b9d7ff02803581a36ef4f5beedd98bff322b55f04a29d2492ceacff7b858966d56d1518b2d8a3bb64fd1de18e8560515f31e SHA512 e8e96b1cba1ecfc2c3aabaf656693d2993168fbc9d1933e5c168792218ef96bb2f0daadd7863a74319665dc3b873ba2dffbf205301b8aec33856c503c9e4bca2
+EBUILD numpy-1.23.5.ebuild 4904 BLAKE2B dc24a0d2a22d985086a49bdaf0333cdae749fa6ea344252636eb0279dfb6a706cf9574cff1529b64918bc99b0bf0184f76fad4228aa25df22c34dae8ac328a73 SHA512 c4771518334b27985b86b1fc41d322e4523b8a35309052a07a506400b1355e48abe88667550dd69e8c0e6fb9d6481eb1c24cd6edd1aa08b603dc1bd433de087e
 MISC metadata.xml 932 BLAKE2B 7a4af31f613bab05ff542da48bf6ff1484d9df2459f559516e71329451dd739d3df0fead507c8033d94ab9ed516b68efe7f21819a8cd6ca303643d8c8bc34e86 SHA512 32cb8c1ab61521a02cbec38f6ea383f074e50d46aa3462ddcb85710f9d348e8e628cf2a5725e3cd921cc32f02885a1b5f02125639f0ec885384eeeff7f468a06
diff --git a/dev-python/numpy/numpy-1.23.5.ebuild b/dev-python/numpy/numpy-1.23.5.ebuild
new file mode 100644
index 000000000000..18d0a7787bc5
--- /dev/null
+++ b/dev-python/numpy/numpy-1.23.5.ebuild
@@ -0,0 +1,187 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_REQ_USE="threads(+)"
+
+FORTRAN_NEEDED=lapack
+
+inherit distutils-r1 flag-o-matic fortran-2 toolchain-funcs
+
+DOC_PV=${PV}
+# For when docs aren't ready yet, set to last version
+#DOC_PV=1.23.0
+DESCRIPTION="Fast array and numerical python library"
+HOMEPAGE="
+	https://numpy.org/
+	https://github.com/numpy/numpy/
+	https://pypi.org/project/numpy/
+"
+SRC_URI="
+	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	doc? (
+		https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-html.zip -> numpy-html-${DOC_PV}.zip
+		https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-ref.pdf -> numpy-ref-${DOC_PV}.pdf
+		https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-user.pdf -> numpy-user-${DOC_PV}.pdf
+	)
+"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc lapack"
+
+RDEPEND="
+	lapack? (
+		>=virtual/cblas-3.8
+		>=virtual/lapack-3.8
+	)
+"
+BDEPEND="
+	${RDEPEND}
+	>=dev-python/cython-0.29.30[${PYTHON_USEDEP}]
+	lapack? (
+		virtual/pkgconfig
+	)
+	doc? (
+		app-arch/unzip
+	)
+	test? (
+		>=dev-python/hypothesis-5.8.0[${PYTHON_USEDEP}]
+		>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
+		>=dev-python/cffi-1.14.0[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/numpy-1.22.0-no-hardcode-blasv2.patch
+)
+
+distutils_enable_tests pytest
+
+src_unpack() {
+	default
+	if use doc; then
+		unzip -qo "${DISTDIR}"/numpy-html-${DOC_PV}.zip -d html || die
+	fi
+}
+
+python_prepare_all() {
+	# Allow use with setuptools 60.x
+	# See numpy-1.22.1-revert-setuptools-upper-bound.patch for details
+	export SETUPTOOLS_USE_DISTUTILS=stdlib
+
+	if use lapack; then
+		local incdir="${EPREFIX}"/usr/include
+		local libdir="${EPREFIX}"/usr/$(get_libdir)
+		cat >> site.cfg <<-EOF || die
+			[blas]
+			include_dirs = ${incdir}
+			library_dirs = ${libdir}
+			blas_libs = cblas,blas
+			[lapack]
+			library_dirs = ${libdir}
+			lapack_libs = lapack
+		EOF
+	else
+		export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None
+	fi
+
+	export CC="$(tc-getCC) ${CFLAGS}"
+
+	append-flags -fno-strict-aliasing
+
+	# See progress in http://projects.scipy.org/scipy/numpy/ticket/573
+	# with the subtle difference that we don't want to break Darwin where
+	# -shared is not a valid linker argument
+	if [[ ${CHOST} != *-darwin* ]]; then
+		append-ldflags -shared
+	fi
+
+	# only one fortran to link with:
+	# linking with cblas and lapack library will force
+	# autodetecting and linking to all available fortran compilers
+	append-fflags -fPIC
+	if use lapack; then
+		NUMPY_FCONFIG="config_fc --noopt --noarch"
+		# workaround bug 335908
+		[[ $(tc-getFC) == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95"
+	fi
+
+	# don't version f2py, we will handle it.
+	sed -i -e '/f2py_exe/s: + os\.path.*$::' numpy/f2py/setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	export MAKEOPTS=-j1 #660754
+
+	distutils-r1_python_compile ${NUMPY_FCONFIG}
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# very disk- and memory-hungry
+		numpy/lib/tests/test_io.py::test_large_zip
+
+		# precision problems
+		numpy/core/tests/test_umath_accuracy.py::TestAccuracy::test_validate_transcendentals
+
+		# runs the whole test suite recursively, that's just crazy
+		numpy/core/tests/test_mem_policy.py::test_new_policy
+
+		# very slow, unlikely to be practically useful
+		numpy/typing/tests/test_typing.py
+	)
+
+	if use arm && [[ $(uname -m || echo "unknown") == "armv8l" ]] ; then
+		# Degenerate case. arm32 chroot on arm64.
+		# bug #774108
+		EPYTEST_DESELECT+=(
+			numpy/core/tests/test_cpu_features.py::Test_ARM_Features::test_features
+		)
+	fi
+
+	if use x86 ; then
+		EPYTEST_DESELECT+=(
+			# https://github.com/numpy/numpy/issues/18388
+			numpy/core/tests/test_umath.py::TestRemainder::test_float_remainder_overflow
+			# https://github.com/numpy/numpy/issues/18387
+			numpy/random/tests/test_generator_mt19937.py::TestRandomDist::test_pareto
+			# more precision problems
+			numpy/core/tests/test_einsum.py::TestEinsum::test_einsum_sums_int16
+		)
+	fi
+	if use arm || use x86 ; then
+		EPYTEST_DESELECT+=(
+			# too large for 32-bit platforms
+			numpy/core/tests/test_ufunc.py::TestUfunc::test_identityless_reduction_huge_array
+		)
+	fi
+
+	distutils_install_for_testing --single-version-externally-managed \
+		--record "${TMPDIR}/record.txt" ${NUMPY_FCONFIG}
+
+	cd "${TEST_DIR}/lib" || die
+	epytest -k "not _fuzz"
+}
+
+python_install() {
+	# https://github.com/numpy/numpy/issues/16005
+	local mydistutilsargs=( build_src )
+	distutils-r1_python_install ${NUMPY_FCONFIG}
+	python_optimize
+}
+
+python_install_all() {
+	local DOCS=( LICENSE.txt README.md THANKS.txt )
+
+	if use doc; then
+		local HTML_DOCS=( "${WORKDIR}"/html/. )
+		DOCS+=( "${DISTDIR}"/${PN}-{user,ref}-${DOC_PV}.pdf )
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pycairo/Manifest b/dev-python/pycairo/Manifest
index ce7dcc21dbac..b401782cace1 100644
--- a/dev-python/pycairo/Manifest
+++ b/dev-python/pycairo/Manifest
@@ -1,3 +1,5 @@
 DIST pycairo-1.21.0.tar.gz 340712 BLAKE2B 6578c75b478c14c641b5c0be44c3c633d32ecc09c4ef22a079024dd12b539d37f88efa6ce8aadb5a88a48b3cc793e573afe00eaa4e3ba563c3133cad72dacfe4 SHA512 0de226b05d0a358f3546e4a0d5bf342f124373718d4900c891a09c1ede11e3ed1fb9bee163c00acfc215044683ddf0b29c8573b7454f9c39f957a47d63c34baf
+DIST pycairo-1.22.0.tar.gz 342295 BLAKE2B b331a627aea3b5fabaf9bbc089b5bb975178ea3be6383207ebefa994900dd73ff503309474729c9ce7b69e41c6495dd83a0db0d51410bea9aa37b30975e39700 SHA512 2a8da5b905536291291655a237fd0c6c54a5fe91a38296cffdc187c0c35837bd3176045f4ab39e59e7f67947deba7ba076c5e6ffdb46256b4b180c42267f41b6
 EBUILD pycairo-1.21.0-r1.ebuild 1122 BLAKE2B 088bb708641ab60be2133d13057bce3155dc8fa78a61cb0913f70a4a3dd638a31c73368915f076ac12f9f1062d15bae499aeb1447a711f3158a52f489ddb9353 SHA512 3f88ee9496d7b8036ce20e84a0c955e2c92d032f8c7c18c131bc95ab9cdaa0f0edbf8cc682e45824562537c00670b2ddff21858842234572861e36fa44c6ce15
+EBUILD pycairo-1.22.0.ebuild 1184 BLAKE2B 39fd40fe16b66a55bffa0604c20df3ffa5bfb6386c22d2a2988571774d3e2669b0bdc509c299cb40784a3d2d7373dd8905b959b8f0b4fd6b3f1016c053862792 SHA512 6953dc63b7f06b72612cdc0f93f7440ce42387b336cc91ff68b08db169a70979c259d0a720d67e452060a0b76344a0208ae01bf3de60ab139a0c2f37a60ba257
 MISC metadata.xml 311 BLAKE2B 5d0e83f55c7abf1be229cb2d1595e8bc0fe0d1099363302c3f4dd721bf8a8c7981adfeea44fc2cb480b12afd9a440ebedf7e582a0ac4a53f9a8c8b2064947623 SHA512 ee62848f97608aad7cff520822a88d8bc2a182456eb251405a4043bf2d8097f89e085a978bfac96db17d2fe69b24c6b26ba803783b73c0532897c27e93149645
diff --git a/dev-python/pycairo/pycairo-1.22.0.ebuild b/dev-python/pycairo/pycairo-1.22.0.ebuild
new file mode 100644
index 000000000000..2c8700960b25
--- /dev/null
+++ b/dev-python/pycairo/pycairo-1.22.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for the cairo library"
+HOMEPAGE="
+	https://www.cairographics.org/pycairo/
+	https://github.com/pygobject/pycairo/
+	https://pypi.org/project/pycairo/
+"
+SRC_URI="
+	https://github.com/pygobject/${PN}/releases/download/v${PV}/${P}.tar.gz
+"
+
+LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="examples"
+
+BDEPEND="
+	test? (
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	>=x11-libs/cairo-1.15.10[svg(+)]
+"
+DEPEND="${RDEPEND}"
+
+distutils_enable_sphinx docs \
+	dev-python/sphinx_rtd_theme
+distutils_enable_tests pytest
+
+python_test() {
+	esetup.py build_tests
+	epytest
+}
+
+python_install() {
+	distutils-r1_python_install \
+		install_pkgconfig --pkgconfigdir="${EPREFIX}/usr/$(get_libdir)/pkgconfig"
+}
+
+python_install_all() {
+	if use examples; then
+		dodoc -r examples
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pylint/Manifest b/dev-python/pylint/Manifest
index dbf28bb731e7..1dc686537658 100644
--- a/dev-python/pylint/Manifest
+++ b/dev-python/pylint/Manifest
@@ -1,3 +1,5 @@
 DIST pylint-2.15.5.gh.tar.gz 1312932 BLAKE2B b8de4e16122ba0bea4cfd9ce3ec4a12abf5e408d7f9d60875eaac781a962c0d01af7691b3c110f2b895bcb7c2d47e0f868d5d52171594aaaecb53ea045a179b9 SHA512 a6e123ab516ef12be0651dbe144814d9f3f9263d61c259d79e9505ee3b4011b33e302281067aa5bacd504fa079f3a7aaceee4d1f9aad127bec8ebeddfeb2afbe
+DIST pylint-2.15.6.gh.tar.gz 1314945 BLAKE2B c084f419dbefb3346e75af204e576fb4b720f15f865ed8ab3e7bbd017edc3ad78c5c2f28ca26600bc40a79d8bcffc20bcde51144257374c8fbd8c63580d85192 SHA512 6e44c288dd243cb1cd8faec645edc9a60fa3fe852f189d2527c4382a415f16b612808f9d15072f5e22c4106a4ecc2f5746bea898ac76c9481a4d1eb8b30fd778
 EBUILD pylint-2.15.5.ebuild 2464 BLAKE2B 2bf3f42db574d61e67fa83910df8af134b4f8b32b831d0f521ef624009ebbef8308bed9acdaaaab02b5720412a1e618facf52e7bec3611eb71f5084ce382abfa SHA512 268783cbec0e35d9919a33e8b60fc4403b256b068eb2f2e124608ef3bcada544317daa16b99e43e628bb302c0e95400999b4e29e6e985b9782a473e577d3ccfc
+EBUILD pylint-2.15.6.ebuild 2472 BLAKE2B 19016922b61bf37c353823a2b08c3805b83d640c570a528fc3b41681d2aa4eb1f12b488092c241fded6fcfc050bbff82d9f805f5e6cd628f8aae76b4d67c71b5 SHA512 7108609cb88793acada884eb5ebebba6080d3afbf230887935c0b09e5a7d78b6cbf38a9b812161f7afee12aa9f54d3e5a89d0c65d4f081a8801c5b1177831761
 MISC metadata.xml 1100 BLAKE2B 97ec6bd2f6cf487afb93136e9ee58d0d5f8ad37e2ded456ed4f196e73fd37cddead2462d3592b44ca1a6c3722b1f194905238299f0c066945d1e22bdb18acc9b SHA512 0418d987879446fd76fe9b7fc4ee8b1c3c0d9bbab1d1fc3eb66eada0bc52f6b6480cf9852dc3a18b1915d2093642b9c87f24207e89b34d3e48c29a282a3ba979
diff --git a/dev-python/pylint/pylint-2.15.6.ebuild b/dev-python/pylint/pylint-2.15.6.ebuild
new file mode 100644
index 000000000000..09a9e2a10b7b
--- /dev/null
+++ b/dev-python/pylint/pylint-2.15.6.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Python code static checker"
+HOMEPAGE="
+	https://pypi.org/project/pylint/
+	https://github.com/PyCQA/pylint/
+"
+SRC_URI="
+	https://github.com/pycqa/pylint/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="examples"
+
+# Make sure to check https://github.com/PyCQA/pylint/blob/main/pyproject.toml#L34 on bumps
+# Adjust dep bounds!
+RDEPEND="
+	<dev-python/astroid-2.14[${PYTHON_USEDEP}]
+	>=dev-python/astroid-2.12.12[${PYTHON_USEDEP}]
+	>=dev-python/dill-0.2[${PYTHON_USEDEP}]
+	>=dev-python/isort-4.2.5[${PYTHON_USEDEP}]
+	<dev-python/isort-6[${PYTHON_USEDEP}]
+	>=dev-python/mccabe-0.6[${PYTHON_USEDEP}]
+	<dev-python/mccabe-0.8[${PYTHON_USEDEP}]
+	>=dev-python/platformdirs-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/tomlkit-0.10.1[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	' 3.8 3.9)
+	$(python_gen_cond_dep '
+		>=dev-python/tomli-1.1.0[${PYTHON_USEDEP}]
+	' 3.8 3.9 3.10)
+"
+BDEPEND="
+	test? (
+		>=dev-python/GitPython-3[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	rm -rf pylint || die
+
+	local EPYTEST_DESELECT=(
+		# No need to run the benchmarks
+		tests/benchmark/test_baseline_benchmarks.py
+
+		# TODO
+		'tests/test_functional.py::test_functional[forgotten_debug_statement_py37]'
+		'tests/test_functional.py::test_functional[dataclass_with_field]'
+		'tests/test_functional.py::test_functional[no_name_in_module]'
+		tests/checkers/unittest_typecheck.py::TestTypeChecker::test_nomember_on_c_extension_error_msg
+		tests/checkers/unittest_typecheck.py::TestTypeChecker::test_nomember_on_c_extension_info_msg
+		tests/config/pylint_config/test_run_pylint_config.py::test_invocation_of_pylint_config
+
+		# apparently fragile, needs unpickleable plugin
+		tests/test_check_parallel.py::TestCheckParallelFramework::test_linter_with_unpickleable_plugins_is_pickleable
+	)
+	epytest
+}
+
+python_install_all() {
+	if use examples ; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		docinto examples
+		dodoc -r examples/.
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/python-debian/Manifest b/dev-python/python-debian/Manifest
index 80da7a59867c..cc41fcacc3c6 100644
--- a/dev-python/python-debian/Manifest
+++ b/dev-python/python-debian/Manifest
@@ -1,3 +1,5 @@
 DIST python-debian_0.1.48.tar.xz 189096 BLAKE2B 3b273f1e90069e00a93aeb9c2333d20d479b057613c93325344f42a73230bd569160a487a25d1c7f90f7f00f42feeab55c9850cf44121e1ca423cd1f40a991a4 SHA512 85bd12ce8ade9b43d502bd60ac1ac826d9a81b5bf32262ff9377b4ba5a1c95306683098d10a64fd6a1331ed7eb44a7fb09ad90f0ee6c885d69ea16f85c4eda59
+DIST python-debian_0.1.49.tar.xz 191388 BLAKE2B 590e6f7877684caaa5a74f06d335bcf7808960968209cf18bb2cec7e81f33a3b0ff458bbe30264ae5fc015de9357dddb1522b5fd93bf33d0a7fabef1b7dd98f9 SHA512 201ceecdd8c1d3dc0cca0f661407bcfb825a1cba07c528858cc1123ab16afe0df50e338c8cd82ea24230812a9cc136220bd4f0dccbac19ad53efe48eaa25cf6f
 EBUILD python-debian-0.1.48.ebuild 963 BLAKE2B 71e8142ac149f35932ed279d9710442fff2b8a142274ca2b7b223af745e091a3cb9bbac14ce90694990b4ab036ef8156b5a422d57bce5a0aa30914ae0ed24c8c SHA512 3d2a3f4c197a54f1bef45d9efc312dc8203d409707a275551f8b69a4d9af03f891c8f9b1f422df49e18bb29e6a9a149f9c9d2aeabce88b2665c265d4ab6cb31b
+EBUILD python-debian-0.1.49.ebuild 980 BLAKE2B 94724555a2b363247740be1555991694c56a4be10babe0c9cf3200180f453b1299888d2df67cdfa4459a3764479d71d7302ff4bcb8328ecd840110c1d15992be SHA512 8bb876e645a799faf441700b9f4c37aa2bf25c6e36724dfd14bcd7c3fe2c8e7dfd182dbb302a5ab45d6f3becc65be471282459ba82c79a4c539b7af73dbf6715
 MISC metadata.xml 448 BLAKE2B bccb39bdfb24e81bc05028fc92033468f5256be096cb409b4413f69444d59d3d9a3469047337a7fec79ac707ddf4d269b44b20c725f7fc4935bd10335e1f9374 SHA512 8e3fb6ca4bf305e23a51ff56cf84648aad1e96d36aa7a4fb138f7136ea77a6a76a8985557ecb1c9da962479c8c9e36c253655d6e6602c1833f2a2230b44540aa
diff --git a/dev-python/python-debian/python-debian-0.1.49.ebuild b/dev-python/python-debian/python-debian-0.1.49.ebuild
new file mode 100644
index 000000000000..b1cc03134cca
--- /dev/null
+++ b/dev-python/python-debian/python-debian-0.1.49.ebuild
@@ -0,0 +1,48 @@
+# Copyright 2011-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python modules to work with Debian-related data formats"
+HOMEPAGE="
+	https://salsa.debian.org/python-debian-team/python-debian/
+	https://pypi.org/project/python-debian/
+"
+SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${PN}_${PV}.tar.xz"
+
+LICENSE="GPL-2 GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+RDEPEND="
+	dev-python/chardet[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		app-arch/dpkg
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# See debian/rules.
+	sed -e "s/__CHANGELOG_VERSION__/${PV}/" lib/debian/_version.py.in \
+		> lib/debian/_version.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	# See debian/rules.
+	"${EPYTHON}" lib/debian/doc-debtags > README.debtags || die
+}
+
+python_test() {
+	epytest --doctest-modules lib
+}
diff --git a/dev-python/pytools/Manifest b/dev-python/pytools/Manifest
index d7d2c1b1b1a6..213804f01858 100644
--- a/dev-python/pytools/Manifest
+++ b/dev-python/pytools/Manifest
@@ -1,3 +1,5 @@
 DIST pytools-2022.1.12.tar.gz 70346 BLAKE2B 6f3fc1b55185e0ea7e680a089d66c7f64b9d3312ebf02c3fdba776f49d6156ccb83f5eef9139f1c6f9e17448f102c38661c2cd07e33277923f9379a017e72194 SHA512 66a4a60b26ee543a774322583a22105f5e886cb86956b4edb95ae361a5aa6cff28b1bcf6ad84b9e2f68c81bb11f5a18bd2e8d0335343550a6e9bca4cb0e9c0e8
+DIST pytools-2022.1.13.tar.gz 71650 BLAKE2B d12a1081ae2dd063ff4bf04a8e364dc35730b89a1e937ff9a470d2c3a9a1f53f5eaa5eb328831f659f1db1f4e03d2522ad8a4126da67cc5b4ef3798589b4a309 SHA512 305c78659b2a32a3d64dbecd4ca2f860554690ec74455c3dfaf3c5434a3e37dfa9dd733d2e5a14736ef5a09bb2c923e7eedde6851e99472f87c849d005fd2e78
 EBUILD pytools-2022.1.12.ebuild 872 BLAKE2B 14f780554979838b3ce1f717836d6a6af0a19cf55ff9fac3925a5578e27526ff2daa78da64fd240d0cef9d483722045d03f6d32091aa2fa95d1f303762fc64aa SHA512 bf8bd973a4c88c160ac44f0069a166ff02f7e6a7509d2d0ac70f03f8593d03394af68a987e784d80001c4f70e6886632b00a08108e5e9c99db270d62422d678a
+EBUILD pytools-2022.1.13.ebuild 873 BLAKE2B 1c5166a57cf372cfc829a6ac48d9a8bd82d01d3d070102de3684f9c8704e153ed8170dd6484426041cdb8b9233b48415ca2a85efa99fb857d7a5bf0aabccb3ef SHA512 706aabb92944ff2201ba02423cd9e2a704607cb7ce797d26a8a11b683689eb77b60dfd0e538b0b49aa88eb79f3cb805621d8aa7101182c2bf2acb5ee39a3a310
 MISC metadata.xml 496 BLAKE2B d0067ed5726907ed3d635fc88dc33722335e7c853ee4a5a1c727faecdf6a78ab7de4261fe40c5c903908e1f2b8eb597ff3c014044fc7ea02bc357254d544da64 SHA512 c6b546564e9c54bccc55f83310ff194192be0673bfe552e18e29a82e87d2caf4c0d51e42d1675cf5b8f6dff1fa1410676f71c9c0c56273ba6efc4efc608c43d9
diff --git a/dev-python/pytools/pytools-2022.1.13.ebuild b/dev-python/pytools/pytools-2022.1.13.ebuild
new file mode 100644
index 000000000000..48afcbc4cb49
--- /dev/null
+++ b/dev-python/pytools/pytools-2022.1.13.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_REQ_USE='sqlite'
+
+inherit distutils-r1
+
+DESCRIPTION="Collection of tools missing from the Python standard library"
+HOMEPAGE="
+	https://mathema.tician.de/software/pytools/
+	https://github.com/inducer/pytools/
+	https://pypi.org/project/pytools/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64"
+
+# NB: numpy is now an "extra" (optional) dep -- we can remove it from
+# RDEPEND If revdeps don't need it
+RDEPEND="
+	>=dev-python/numpy-1.6.0[${PYTHON_USEDEP}]
+	>=dev-python/platformdirs-2.2.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/typing-extensions-4.0[${PYTHON_USEDEP}]
+	' 3.8 3.9 3.10)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/rpyc/Manifest b/dev-python/rpyc/Manifest
index 164571e92b6a..d27057b7fa77 100644
--- a/dev-python/rpyc/Manifest
+++ b/dev-python/rpyc/Manifest
@@ -1,3 +1,5 @@
 DIST rpyc-5.2.3.tar.gz 1267934 BLAKE2B 3c03d587293375f875de31d6a89ba07b47bd4f4ff9fd5c7b23ed0c83e420e9d2bab08844c3538299797203ac90e7e81b955db02de70bf1cee5ea59d8475a6848 SHA512 4be189a719be100886e08d9c2c0769d12b7d1c5e167c197ebee1a3db542e228f2124fea976e5af3680136b298ce4632c79b2f302128dff31ebf45dcf52a9743f
+DIST rpyc-5.2.3_p1.tar.gz 1269198 BLAKE2B 288568fcd34787850968d4e3fd9ca7c2d29e506f1331b746104760e678dfef43fd30b08f68b3bdda6df84d488f88dc76cfdd23d5a5ad0a4cefeab468ac6a1b0b SHA512 4b29899a51364779185d2b56f5d5ee4c650c40b8322e5594500222fdcec85414cdbabd41437467e2ff73124a79e8c9cde23dfe89138abb935732ccaba69de2bb
 EBUILD rpyc-5.2.3-r3.ebuild 2089 BLAKE2B 3d33a3520dca7ef1bbdfb477548e943ef76aee15bc8bf0f9e713d7108875e46d6ee5d9bb9d4610934a869a441a67a320889d0131c032351a9e963a077294640b SHA512 ada7525c16934719dd52ee96bce609d2831883a55bc544be8fe7ff341322a4ae21601e696c3ef5e8b4cac3468e9903e7b9155b1223b68c32dfce5f5c7d6aa8b0
+EBUILD rpyc-5.2.3_p1.ebuild 1936 BLAKE2B c79f627bc722b32027051cf245ed9263c5d53271e95f2f5c751b16bd8992cd617f35722e77ca06df5b72cee0c91c730f2e2d21623422729c42859ce53ee010a4 SHA512 6bffe86a512bb8bda622e1f7ef04cabc1d44f865a9fb8bc00f4259e85e985236f8f733c98870b93e348286a62a0a3b31c8b337870c0e48a3907c727b87cf89b7
 MISC metadata.xml 736 BLAKE2B d6f6d76b5118e6f8aef119b975572ba95875f89bc2a4b2bb072e1b1ccccfb4593845e16ea0c62a4436ce419a3792b89b7a995c36a2ce979cf85db0dbd5f6754f SHA512 7714c32ffeb31611fe41d2ec674b774fdd46b137a90bb52245b1dcc229f2577739d33d61788ec123cce0c4dec3da49a19fdcc4eb307ea3af26ae8c4195bb0d93
diff --git a/dev-python/rpyc/rpyc-5.2.3_p1.ebuild b/dev-python/rpyc/rpyc-5.2.3_p1.ebuild
new file mode 100644
index 000000000000..31fe074b28ed
--- /dev/null
+++ b/dev-python/rpyc/rpyc-5.2.3_p1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Remote Python Call (RPyC), a transparent and symmetric RPC library"
+HOMEPAGE="https://rpyc.readthedocs.io/en/latest/
+	https://pypi.org/project/rpyc/
+	https://github.com/tomerfiliba-org/rpyc"
+SRC_URI="https://dev.gentoo.org/~grozin/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# USE flags gdb, numpy are used *only* to run tests depending on these packages
+IUSE="test numpy gdb"
+RESTRICT="!test? ( test )"
+
+CDEPEND="numpy? ( dev-python/numpy[${PYTHON_USEDEP}] dev-python/pandas[${PYTHON_USEDEP}] )
+	gdb? ( sys-devel/gdb )"
+
+DEPEND="${CDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+RDEPEND="${CDEPEND}
+	dev-python/plumbum[${PYTHON_USEDEP}]"
+
+src_prepare() {
+	default
+
+	# Windows specific test
+	rm tests/test_win32pipes.py || die "rm tests/test_win32pipes.py failed"
+
+	# These tests require running sshd
+	rm tests/test_ssh.py tests/test_deploy.py || die "rm test_ssh.py test_deploy.py failed"
+
+	# This test requires internet access
+	rm tests/test_registry.py || die "rm test_registry.py failed"
+
+	# This test fails with NO_CIPHERS_AVAILABLE
+	rm tests/test_ssl.py || die "rm test_ssl.py failed"
+
+	# dev-python/gevent is being removed
+	rm tests/test_gevent_server.py || die "rm test_gevent_server.py failed"
+
+	if ! use numpy
+	then rm tests/test_service_pickle.py || die "rm test_service_pickle.py failed"
+	fi
+
+	if ! use gdb
+	then rm tests/test_gdb.py || die "rm test_gdb.py failed"
+	fi
+}
+
+python_test() {
+	# for some reason, when tests are run via pytest or nose, some of them hung
+	pushd tests > /dev/null || die "pushd tests failed"
+	for x in test_*.py
+	do PYTHONPATH="${WORKDIR}"/${P}-${EPYTHON/./_}/install/usr/lib/${EPYTHON}/site-packages ${EPYTHON} ${x} || die "${x} failed"
+	done
+	popd > /dev/null
+}
diff --git a/dev-python/tempora/Manifest b/dev-python/tempora/Manifest
index 5d6e1a9e3cc7..e4dda883174e 100644
--- a/dev-python/tempora/Manifest
+++ b/dev-python/tempora/Manifest
@@ -1,3 +1,5 @@
 DIST tempora-5.0.2.tar.gz 19530 BLAKE2B 9c07fc294ef77d9a12276578ffdde39ef58508075deb98c0a89d6179bc7c9cbb7633d20077801a1d99d5c016c72206f508e5d7cd6af5667704b025ffccabe552 SHA512 d0fe086b92e21622444b941c583e3432420b1826e60aa4b90bab31907a98b4989dd21ca99b5554e965f87e23c9d65d9bce8e434d801985f99f187b7dad2a715a
+DIST tempora-5.1.0.tar.gz 20402 BLAKE2B 8dcb70dd1491228c9f7daeda40a07e07236fa4f4aa8ad76ecb9514b922732468cbf4360726421420ce8478bba2287815a1473c5231afae82bda222a7401478e2 SHA512 33b48884c024f82e3220c2cc28a307bbb3c813a895df82640b5627266355c78cced3e5ab61df9b0619bf9697e18d70390939189ba31dd57c58fbb3e97b5db216
 EBUILD tempora-5.0.2.ebuild 840 BLAKE2B 3453d847b91ca395c060ab8291edaf66823c06a77356e7ba3caa12c7a0d2de2e7bdec7805664bf7784ba29138daa810b201a585c0e385849e1edad1ac7914e20 SHA512 1b3e9e60e79b6eed2361ffaeba4dd44197b97e455ebd6e3de98285bcc0079643474f7bef7ee1a8f587789512d46ce154c2746a07d825337d057a8070836ca0a9
+EBUILD tempora-5.1.0.ebuild 848 BLAKE2B 1f6ae881615d62931ccbf8be3f289ac07364fddbb6720bda37d1f6bd8d2695c86985648ecdf2a2c9837beded9d1a8db1ef2b959438677ee686a6c5cb99c20b6b SHA512 7fcc75fcab38246d9888a319a34df6ecd3bd4b9f45ad759fc726898b8a0018df3eb40855714808ed554d9c052536015a3aec827beff4ab5003b57cdcd2fdec64
 MISC metadata.xml 640 BLAKE2B 322432e820c99b65ad749062afc4536889b21fc7d1dd4fd2dd4d4caec382a90d98db38be3ead24136f8a3049b2d68120be72799361a30a6f788facdbdb4706e7 SHA512 4123ddc1643539c3152c6200860ff19f69164aa22c2f040617e9933d2b75737e8e96b9b617341156a8bbcfee579d40e1f17edf56a2759a06646987dce676c238
diff --git a/dev-python/tempora/tempora-5.1.0.ebuild b/dev-python/tempora/tempora-5.1.0.ebuild
new file mode 100644
index 000000000000..e32d2ca05b4c
--- /dev/null
+++ b/dev-python/tempora/tempora-5.1.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+MY_PN="${PN/-/.}"
+DESCRIPTION="Objects and routines pertaining to date and time"
+HOMEPAGE="https://github.com/jaraco/tempora"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	>=dev-python/jaraco-functools-1.20[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/pytest-freezegun[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/terminaltables/Manifest b/dev-python/terminaltables/Manifest
index a5982d721b55..10ab9706c15f 100644
--- a/dev-python/terminaltables/Manifest
+++ b/dev-python/terminaltables/Manifest
@@ -1,5 +1,5 @@
 AUX terminaltables-3.1.0-stdout.patch 789 BLAKE2B 2c9f166d4e303cc55bf2d6b9b0e1f9d947cd10a1a173abc5657b9dedfd637da05e374fdc9e997f9e758be9caa90f3a984032eade15e816de594d65268bb013ad SHA512 f6eb3ea11a7027886457dd720b0736fc11611d233b7971456141476a6b1d83fb0be33e14c5789a626da1ca0f0f2ca75983f496bc68660aa66d7f285a3c2be684
 DIST terminaltables-3.1.10.tar.gz 282122 BLAKE2B 53d5ecde38370f5b05d3eaae4b618ada6991214feadc7e826467dafede5baaf8292e47e6b2be903eb8ae6d46e3066314fe7950d7330056cd3053e0d643ad1a9e SHA512 84fa403cee4206b6b19de0206d89535bd2965a0796e1890dd9b0a9c6593c5f41d0d24b88ee9db426067c777712a4e810d67d4d0246496239a7a96b53a24e8174
-EBUILD terminaltables-3.1.10-r1.ebuild 867 BLAKE2B 9b25121c1850d3f91d11828db0173773ce6b0f6456fe866f1038e3e502061540633af0929bbda23d9cc2e21db89e4a2eb4c57e0fe85cca6dbdabdcd7cb695465 SHA512 cca079f30896117840efa89ec9cb1b7a9f26b0370e4e3b2cdc7d0246f16c73d5968ac2921e556f0246d46fb6a89d40c7dd51ec278bd81889dc93b7821388196d
-EBUILD terminaltables-9999.ebuild 763 BLAKE2B f5de6a875bee6e40cb126fdd42373f55d848a74913266327eff4a3b92fe3f778df6673bcfee4fa4640bf9f7c4931e6fa369ab7fbfb6cdcf4d6ba2ace87e10897 SHA512 f64f1009da77c261374bfe39d93d9a6e118523d79aa2cefa7f3c9e256e3c6c788e3666b8cabd2072647e8c718fb9de8ff0829285f4ea04df9faa671d931147d8
+EBUILD terminaltables-3.1.10-r1.ebuild 1027 BLAKE2B dc29922cad90b734ad2b38387c954e38d944caaf1bb55e7f6957e3a2501f066c35c1b915833da6f7f6b17953d0275679d28e196f706d4d5416505c9e8859423f SHA512 b4191009ccc71727428cb759a106eca6e6231cb36f89b2558784d978f628ea6f00d389dcf69fe7122f360bc2c2dec2f47d24ebf05cee0a19260bb41f3eb21abb
+EBUILD terminaltables-9999.ebuild 923 BLAKE2B 3044320c35419a7f19ee685bc904076e83ab6821ca88bc89b200d17ec035a6852bc50c78cedbbde2b8b84387addb5297554ab523e3d3afef5987c4572c2a184a SHA512 438e03a591c477e1ee9ac85dc3e26a7f761e75b0e5b091e8e2bef9d446cc92824c937a30639aed20d6e6cc39ea985d1adec268d91eeb35f25aeb369402d9c0ba
 MISC metadata.xml 499 BLAKE2B c69faec6e90ce8d085d4ab222b09bbf69ff55415e8a596ec9a940191a5df96cfbc7ac0c2ce087c4d1c8199941c844a4e28ad4783bd9a8c106edb75537f781db9 SHA512 71bf75a76067bed905cd34d1f0eeae629a2362b8cfa33b54f06b228314274467795f8e1a34a7adb02d54d7976635a420dcd40ea6e1b6dc6f256b4179af7eb76d
diff --git a/dev-python/terminaltables/terminaltables-3.1.10-r1.ebuild b/dev-python/terminaltables/terminaltables-3.1.10-r1.ebuild
index b08a653b797d..2e78fc2ba3c7 100644
--- a/dev-python/terminaltables/terminaltables-3.1.10-r1.ebuild
+++ b/dev-python/terminaltables/terminaltables-3.1.10-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
@@ -38,3 +38,10 @@ src_prepare() {
 
 	distutils-r1_src_prepare
 }
+
+python_test() {
+	# We override FORCE_COLOR otherwise termcolor
+	# would pick it up from env. and give unexpected
+	# output for tests.
+	FORCE_COLOR=1 epytest
+}
diff --git a/dev-python/terminaltables/terminaltables-9999.ebuild b/dev-python/terminaltables/terminaltables-9999.ebuild
index c5cb790fdd38..5b904f1c7220 100644
--- a/dev-python/terminaltables/terminaltables-9999.ebuild
+++ b/dev-python/terminaltables/terminaltables-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1 git-r3
 
@@ -32,3 +32,10 @@ src_prepare() {
 
 	distutils-r1_src_prepare
 }
+
+python_test() {
+	# We override FORCE_COLOR otherwise termcolor
+	# would pick it up from env. and give unexpected
+	# output for tests.
+	FORCE_COLOR=1 epytest
+}
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index bc144cdd1298..b57fed48cdb3 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/kbuild/Manifest b/dev-util/kbuild/Manifest
index e32242fb6d19..40e888b39c12 100644
--- a/dev-util/kbuild/Manifest
+++ b/dev-util/kbuild/Manifest
@@ -4,11 +4,15 @@ AUX kbuild-0.1.9998.3407-gold.patch 590 BLAKE2B 654459b94017d4bacae37151c71d4b43
 AUX kbuild-0.1.9998.3407-unknown_configure_opt.patch 697 BLAKE2B 5f974bc451a12f4b4c02656b501d07515c14499c53ee1fca00aec00cf28d6dd5faf690f262b79f34861a3bfd317a5bd37eb78cbeb61ce833d8117c2cd74e7813 SHA512 63435effcf109b40390574da09453314ffac109ffee79419cef81705b4f7ceb145f692c9a81b54dd0d58f69a1a6f80b9dc412baa5d416066f05300cc9eccc11e
 AUX kbuild-0.1.9998.3499-gold.patch 934 BLAKE2B 486b6154eeba1541f87856e0d4bddd89ee689393669161f60ae9f6b5ce3a199cf72187ac77d766e5c26b707af79b63b13f2cc597e7ee15ee1c46972401fe80d3 SHA512 5e885b504c095c062da0c2ed7836821c5ab95aa6b90e847070a87228a3e1456b9ae2dc2c463e0771552a504f0f309569e762667cd11aa891f5236b5402b77a08
 AUX kbuild-0.1.9998.3499-kash-no_separate_parser_allocator.patch 374 BLAKE2B 9ea9ac286217760b6933821ec3901a4e102bf8fe98517805b23e19e86a8ac86a81c93c72c13d69490d91c80c2e01581b5926f358f988b6b0de8e04ed0ba93820 SHA512 f83bcd523241d3b6bda3038d1c2a6a18ba2497d166f5a9704ba5f4a96b2d6857ea810ab2969b931b60b5818b69ea24cbeab2068cb92765704f7666874751e27d
+AUX kbuild-0.1.9998.3572-fix-bison.patch 375 BLAKE2B ab316943b88fac929e747d0c1062f827a2049238d29eaa26e81590b0982462f6428e5be52a82ca5325c6ed11e0771cf22ee2f70f719162ad4915199bb24bb1ff SHA512 870f8d8f5be776b490a21b018fe5aa5fd12251eb0319098cb4c2785524482e7174a77e45e8b1d28252b244de7571209b006bb36c16f616803dba64111e5f8a10
+AUX kbuild-0.1.9998.3572-fix-lto.patch 314 BLAKE2B 42a7c1d3f735870b92c6ffdaf0400c1db63389b430890a892c9b48b90a126508729baeef2fc45bd747c089856a26ec3d10b8a9bfedd4e25a6d6ffd6606ef770b SHA512 7bb2526b4c59533dbfc8ad7c53fb38985fec4cab17740f4a3965fa3e982ba42faaabfe8d78d94c83bd74c771dde9088b1446a6937f96d37808fe9597d6a049f9
 AUX kbuild-0.1.9998_pre20110817-kash-link-pthread.patch 296 BLAKE2B ffa7b0167e4a65c59510e20089a63d5c1949b5f14ce167725ee057d9ab75369758e491727d939a111de5bd63719b53a7744b08efe84d34cc81b4d7bba80a3522 SHA512 178da856a83631ca4d86a9b8c20e74b75b76426c177b87c26d4c4b3df86e72f3b6339e8f61948498ab9c4bf047119588f3df8ce78448160afa0840b2cf3aeabb
 AUX kbuild-0.1.9998_pre20120806-qa.patch 292 BLAKE2B 628ee52d1c147864dba48e37ae25a2ff9e82e38bc907f2771ee3599e9401b26e5b5d4e53a3958a4f8edb2a7c35794677bae141561cf515fd3587b9ac095a7bdd SHA512 2a311e2e79c1e85c3c2c26b3d187355167c237c334687494a8e532b84232340df44b0d896fe6638bf1a9d4ba1c5f1efb29978de3bac0490fe04f2e57f7fb1874
 DIST kbuild-0.1.9998.3407-src.tar.xz 2351596 BLAKE2B ed562a739831c465ba66b2c357b1ab52cb072e61fa597d96d9e66e1b57a7f790c7e37fc82ef7ff49114b0cb4cb623e558d96864e98ca36bd42fe16e58e863dc7 SHA512 0a1fddff595f7ccfdb65a1a660c82860f132796b42149b8b40808d0df489312dcd96402236150c8ec5ec32c1cc142ce7af1150e10fdb83bf798e4d690dd64314
 DIST kbuild-0.1.9998.3499-src.tar.xz 2371580 BLAKE2B 847c5c67ded37ca87228ff7164d6c7f2f670a57f2fd94d6d0bf4f8896266e7fe5442666c03dbda016564a52dc91d10be83f0d4b0ef5093db0f5210ac8d5f3aaa SHA512 eebdcd1d2fa71313edd764d45a4aa3580078af22d7c5fed32d3d139a4f41c4e028282fdfdda0ee9b617ed0e8e63b8f5d065b3cf6647f08fe446560938b7577fc
+DIST kbuild-0.1.9998.3572-src.tar.xz 3973848 BLAKE2B 103e42d719fd77bc5c55aea48bdfd01c8ad136529cc76cc8c1297f87e21e5d4e2e7149f9321c5174808613a84331dbea8bb4c0a7662eb2de9e1045c8ad365047 SHA512 96bb5e1759990bf3acaca4b0ba7c02926c6607b0cd94f7fca222b13eee5c3364c64b35e3473c5cee45fa094cb2b851ac9f3a3a9fe60cff894baf46238ccb4006
 EBUILD kbuild-0.1.9998.3407.ebuild 1780 BLAKE2B 52b4b1e13d6049fddc6e11edcbb3d881ba8abb1af48dfa6853331b5eec5a0d346d435f0a3e4e6ea747d1a27fcf6df190bbdfb950b12845c7192fbddd0fae6f16 SHA512 59976d3b48a2b65c2ac1d9e28e4a216bc641b1b0a6b64c0107ea864a57a95dee41d813cc5433e626b9223cee92151e7c361fee37bd7420fc20f03c7a74f49c8b
-EBUILD kbuild-0.1.9998.3499.ebuild 2482 BLAKE2B 2fe292cb15b169c1d96d8bd56293c88b946d0c147816acac41c4baabb3234320a261464b0e1ebef89d6176b82526fd90bea0fa67de36b83eafd183fc329dc5bd SHA512 4eab16d45ee87d399c26a9a8825acb192e1c43e01b8a3d68298db86c3dc576e0c0e40e4fc3456c442b0a032dd444b68c8240925beeab9fcc00f59475a129bcc2
-EBUILD kbuild-9999.ebuild 2496 BLAKE2B 6f281f51a26449a6e7996e735d7a6ef542bdac79706b003a1ec7326b18e34b9b55f648c755656704bbd22628086b41c6c4e5812cf7b0a7a9610e5935356e2059 SHA512 91470baceec88b442caa17802c1728ed14de9986f224706c780686387f2d6d2ed586216a6822e6957e5e752f1e853e7622ac980d19fffc82ffce02dcdd1fb84d
-MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
+EBUILD kbuild-0.1.9998.3499.ebuild 1909 BLAKE2B 67d33e930f6923bb2b5f83f4b24331dd9ad9d40d5b069b4a9654152d58bae2c7406bca0911b5d320fd4d1d51b27b54e762da2c3caab66676640ed78ed04500bf SHA512 fd84d39fa55c8560d50c1e7a535a9e79635499cae4da0b782e739a6a226c7a32c0b4b681c0006810ed3d5da01e7eacdadd74d239e761ca15b0782b32450fccd8
+EBUILD kbuild-0.1.9998.3572.ebuild 1713 BLAKE2B c6d6932ba08056f6d5c1f22ec93cd423c74e748b2aa41096f8f5d095f288d533ea35dd9fc91855fa4a1663512b565f9751d9dc72aff40466ac27a6b2b22df3e3 SHA512 1c4e662032e13d43fb47021ae11e28ec0b13348779fe665573665e51c12dbea2d6819c7341a3b48dd6d91aff37936b3e508a833e9883e24a1c6ca850b9385dac
+EBUILD kbuild-9999.ebuild 1941 BLAKE2B fa08124413eff8318c819d1e769cb39823d8094e8a170600c863cbe60e1be92cb294fc8ce4842fa551c862cc73166cb39f302c59978903c610c668b462046481 SHA512 826ab3a5d4c52e981992725ebca72d599e6f6972dd51ade9de2004c39a98bf1943cacfcfb1d73b63b0fffb20216f7e888974988666d7000512f61c30f87bd3a0
+MISC metadata.xml 249 BLAKE2B 3bc7510e014ef8df90da064f4ef969eab6cc3311951a6dd556ca7b6f4e2e74e229f12a16ceb641393d1ec1f89d1942718267ecc664a8136df194c40de94a58e4 SHA512 63f88d798d410e4fb6670d199a86a665ab61b09cb9508b4047f13fe73070c682231d35a27c9d2c1fd82a1b8a84676d857b534c96bd09f4562cf13d7fc8de36b2
diff --git a/dev-util/kbuild/files/kbuild-0.1.9998.3572-fix-bison.patch b/dev-util/kbuild/files/kbuild-0.1.9998.3572-fix-bison.patch
new file mode 100644
index 000000000000..822194b1c98b
--- /dev/null
+++ b/dev-util/kbuild/files/kbuild-0.1.9998.3572-fix-bison.patch
@@ -0,0 +1,15 @@
+--- a/src/kash/Makefile.kmk	2022-11-12 16:42:14.195927909 +0200
++++ b/src/kash/Makefile.kmk	2022-11-12 17:09:46.212159615 +0200
+@@ -210,8 +210,11 @@
+ kash_USES = lex yacc
+ kash_LEXTOOL = FLEX
+ kash_LEXFLAGS = -8
+-#kash_YACCTOOL = BISON
++ifneq (,$(shell bison -V))
++kash_YACCTOOL = BISON
++else
+ kash_YACCTOOL = YACC
++endif
+ kash_YACCFLAGS = -ld
+ kash_SOURCES += \
+ 	arith.y \
diff --git a/dev-util/kbuild/files/kbuild-0.1.9998.3572-fix-lto.patch b/dev-util/kbuild/files/kbuild-0.1.9998.3572-fix-lto.patch
new file mode 100644
index 000000000000..94eb14ee6cb6
--- /dev/null
+++ b/dev-util/kbuild/files/kbuild-0.1.9998.3572-fix-lto.patch
@@ -0,0 +1,11 @@
+--- a/src/kmk/remake.c
++++ b/src/kmk/remake.c
+@@ -417,7 +417,7 @@
+       if (!keep_going_flag && file->parent == 0)
+         {
+           const char *msg_joke = 0;
+-          extern struct dep *goals;
++          extern struct goaldep *goals;
+ 
+           /* classics */
+           if (!strcmp (file->name, "fire")
diff --git a/dev-util/kbuild/kbuild-0.1.9998.3499.ebuild b/dev-util/kbuild/kbuild-0.1.9998.3499.ebuild
index ef85feb53592..2954327d377c 100644
--- a/dev-util/kbuild/kbuild-0.1.9998.3499.ebuild
+++ b/dev-util/kbuild/kbuild-0.1.9998.3499.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -7,7 +7,7 @@ inherit autotools toolchain-funcs
 
 MY_P="${P}-src"
 DESCRIPTION="A makefile framework for writing simple makefiles for complex tasks"
-HOMEPAGE="http://svn.netlabs.org/kbuild/wiki"
+HOMEPAGE="https://trac.netlabs.org/kbuild/wiki"
 #SRC_URI="ftp://ftp.netlabs.org/pub/${PN}/${MY_P}.tar.gz"
 SRC_URI="https://dev.gentoo.org/~polynomial-c/${MY_P}.tar.xz"
 
@@ -16,20 +16,13 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-# We cannot depend on virtual/yacc until bug #734354 has been fixed
-DEPEND="
+BDEPEND="
 	sys-apps/texinfo
 	sys-devel/flex
 	sys-devel/gettext
 	virtual/pkgconfig
-	|| (
-		dev-util/byacc
-		dev-util/yacc
-		<sys-devel/bison-3.7
-	)
+	virtual/yacc
 "
-RDEPEND=""
-BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-0.1.9998.3407-unknown_configure_opt.patch"
@@ -40,6 +33,9 @@ PATCHES=(
 
 	# Please check on version bumps if this can be removed
 	"${FILESDIR}/${PN}-0.1.9998.3499-kash-no_separate_parser_allocator.patch"
+
+	"${FILESDIR}/${PN}-0.1.9998.3572-fix-bison.patch"
+	"${FILESDIR}/${PN}-0.1.9998.3572-fix-lto.patch"
 )
 
 pkg_setup() {
@@ -60,31 +56,14 @@ src_prepare() {
 	eautoreconf
 
 	sed -e "s@_LDFLAGS\.$(tc-arch)*.*=@& ${LDFLAGS}@g" \
+		-e "s@_CFLAGS\.$(tc-arch)*.*=@& ${CFLAGS}@g" \
+		-e "s@_CXXFLAGS\.$(tc-arch)*.*=@& ${CXXFLAGS}@g" \
 		-i "${S}"/Config.kmk || die #332225
 	tc-export CC PKG_CONFIG RANLIB #AR does not work here
 }
 
 src_compile() {
-	if [[ -z ${YACC} ]] ; then
-		# If the user hasn't picked one, let's prefer byacc > yacc > old bison for now.
-		# See bug #734354 - bison doesn't work here.
-		# We can remove this once Bison works again!
-		if has_version -b "dev-util/byacc" ; then
-			export YACC=byacc
-		elif has_version -b "dev-util/yacc" ; then
-			export YACC=yacc
-		elif has_version -b "<sys-devel/bison-3.7" ; then
-			export YACC=bison
-		else
-			die "This case shouldn't be possible; no suitable YACC impl installed."
-		fi
-
-		einfo "Chosen YACC=${YACC} for build..."
-	else
-		einfo "Chosen user-provided YACC=${YACC} for build..."
-	fi
-
-	kBuild/env.sh --full emake -f bootstrap.gmk AUTORECONF=true AR="$(tc-getAR)" YACC="${YACC}" \
+	kBuild/env.sh --full emake -f bootstrap.gmk AUTORECONF=true AR="$(tc-getAR)" \
 		|| die "bootstrap failed"
 }
 
diff --git a/dev-util/kbuild/kbuild-0.1.9998.3572.ebuild b/dev-util/kbuild/kbuild-0.1.9998.3572.ebuild
new file mode 100644
index 000000000000..185af8e39997
--- /dev/null
+++ b/dev-util/kbuild/kbuild-0.1.9998.3572.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="A makefile framework for writing simple makefiles for complex tasks"
+HOMEPAGE="https://trac.netlabs.org/kbuild/wiki"
+SRC_URI="https://dev.gentoo.org/~ceamac/${CATEGORY}/${PN}/${P}-src.tar.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+#KEYWORDS="~amd64 ~x86"	# for testing only.  This version is buggy
+IUSE=""
+
+BDEPEND="
+	sys-apps/texinfo
+	sys-devel/flex
+	sys-devel/gettext
+	virtual/pkgconfig
+	virtual/yacc
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.1.9998.3407-unknown_configure_opt.patch"
+	"${FILESDIR}/${PN}-0.1.5-gentoo-docdir.patch"
+	"${FILESDIR}/${PN}-0.1.9998_pre20120806-qa.patch"
+	"${FILESDIR}/${PN}-0.1.9998_pre20110817-kash-link-pthread.patch"
+	"${FILESDIR}/${PN}-0.1.9998.3572-fix-bison.patch"
+	"${FILESDIR}/${PN}-0.1.9998.3572-fix-lto.patch"
+)
+
+pkg_setup() {
+	# Package fails with distcc (bug #255371)
+	export DISTCC_DISABLE=1
+}
+
+src_prepare() {
+	default
+
+	# Add a file with the svn revision this package was pulled from
+	printf '%s\n' "KBUILD_SVN_REV := $(ver_cut 4)" \
+		> SvnInfo.kmk || die
+
+	cd "${S}/src/kmk" || die
+	eautoreconf
+	cd "${S}/src/sed" || die
+	eautoreconf
+
+	sed -e "s@_LDFLAGS\.$(tc-arch)*.*=@& ${LDFLAGS}@g" \
+		-e "s@_CFLAGS\.$(tc-arch)*.*=@& ${CFLAGS}@g" \
+		-e "s@_CXXFLAGS\.$(tc-arch)*.*=@& ${CXXFLAGS}@g" \
+		-i "${S}"/Config.kmk || die #332225
+	tc-export CC PKG_CONFIG RANLIB #AR does not work here
+}
+
+src_compile() {
+	kBuild/env.sh --full emake -f bootstrap.gmk AUTORECONF=true AR="$(tc-getAR)" \
+		|| die "bootstrap failed"
+}
+
+src_install() {
+	kBuild/env.sh kmk NIX_INSTALL_DIR=/usr PATH_INS="${D}" install \
+		|| die "install failed"
+}
diff --git a/dev-util/kbuild/kbuild-9999.ebuild b/dev-util/kbuild/kbuild-9999.ebuild
index b4bfd88222e3..15625b4196bf 100644
--- a/dev-util/kbuild/kbuild-9999.ebuild
+++ b/dev-util/kbuild/kbuild-9999.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools toolchain-funcs
 
 DESCRIPTION="A makefile framework for writing simple makefiles for complex tasks"
-HOMEPAGE="http://svn.netlabs.org/kbuild/wiki"
+HOMEPAGE="https://trac.netlabs.org/kbuild/wiki"
 if [[ "${PV}" == *9999 ]] ; then
 	inherit subversion
 	ESVN_REPO_URI="http://svn.netlabs.org/repos/kbuild/trunk"
@@ -20,19 +20,13 @@ LICENSE="GPL-3+"
 SLOT="0"
 IUSE=""
 
-# We cannot depend on virtual/yacc until bug #734354 has been fixed
-DEPEND="
+BDEPEND="
 	sys-apps/texinfo
 	sys-devel/flex
 	sys-devel/gettext
-	|| (
-		dev-util/byacc
-		dev-util/yacc
-		<sys-devel/bison-3.7
-	)
+	virtual/pkgconfig
+	virtual/yacc
 "
-RDEPEND=""
-BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-0.1.9998.3407-unknown_configure_opt.patch"
@@ -40,6 +34,8 @@ PATCHES=(
 	"${FILESDIR}/${PN}-0.1.9998_pre20120806-qa.patch"
 	"${FILESDIR}/${PN}-0.1.9998_pre20110817-kash-link-pthread.patch"
 	#"${FILESDIR}/${PN}-0.1.9998.3407-gold.patch"
+	"${FILESDIR}/${PN}-0.1.9998.3572-fix-bison.patch"
+	"${FILESDIR}/${PN}-0.1.9998.3572-fix-lto.patch"
 )
 
 pkg_setup() {
@@ -62,31 +58,14 @@ src_prepare() {
 	eautoreconf
 
 	sed -e "s@_LDFLAGS\.$(tc-arch)*.*=@& ${LDFLAGS}@g" \
+		-e "s@_CFLAGS\.$(tc-arch)*.*=@& ${CFLAGS}@g" \
+		-e "s@_CXXFLAGS\.$(tc-arch)*.*=@& ${CXXFLAGS}@g" \
 		-i "${S}"/Config.kmk || die #332225
 	tc-export CC PKG_CONFIG RANLIB #AR does not work here
 }
 
 src_compile() {
-	if [[ -z ${YACC} ]] ; then
-		# If the user hasn't picked one, let's prefer byacc > yacc > old bison for now.
-		# See bug #734354 - bison doesn't work here.
-		# We can remove this once Bison works again!
-		if has_version -b "dev-util/byacc" ; then
-			export YACC=byacc
-		elif has_version -b "dev-util/yacc" ; then
-			export YACC=yacc
-		elif has_version -b "<sys-devel/bison-3.7" ; then
-			export YACC=bison
-		else
-			die "This case shouldn't be possible; no suitable YACC impl installed."
-		fi
-
-		einfo "Chosen YACC=${YACC} for build..."
-	else
-		einfo "Chosen user-provided YACC=${YACC} for build..."
-	fi
-
-	kBuild/env.sh --full emake -f bootstrap.gmk AUTORECONF=true AR="$(tc-getAR)" YACC="${YACC}" \
+	kBuild/env.sh --full emake -f bootstrap.gmk AUTORECONF=true AR="$(tc-getAR)" \
 		|| die "bootstrap failed"
 }
 
diff --git a/dev-util/kbuild/metadata.xml b/dev-util/kbuild/metadata.xml
index 115e9d64a669..b22a815172dd 100644
--- a/dev-util/kbuild/metadata.xml
+++ b/dev-util/kbuild/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>ceamac@gentoo.org</email>
+		<name>Viorel Munteanu</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-util/rebar/Manifest b/dev-util/rebar/Manifest
index 20ac0313e2b1..9794f078e4e8 100644
--- a/dev-util/rebar/Manifest
+++ b/dev-util/rebar/Manifest
@@ -16,5 +16,5 @@ DIST relx-4.7.0.tar 76288 BLAKE2B 99af942824344a617dc19b771d5db697fd8d8a19776a67
 DIST ssl_verify_fun-1.1.6.tar 14848 BLAKE2B 31f8a92881803b1b93e2f65cf070449cd53af21b50f6aae7a9d036e28c17b2c093b2cb6238279191663ba011aab7fd604af8366ed8ae91b7b1d7c333f9de9ea8 SHA512 65980368629357ec16b37fd8ea1d42f7dbd7fa86318b329bec756e868b70eb4c93cf1bfe3dd34e1b6c011086ba32e11981d61e18fdad78564b77664e4d155a47
 EBUILD rebar-2.6.4-r1.ebuild 671 BLAKE2B e2634bb01418f81f97c9d30a91083efb2ed87416b7e42a48e83acd5f07956ce14e8fed23f782bbba6437139da730c2cdabe7d0c523a447966b43c6e2dabf8033 SHA512 95cd7d605d4a3fe6940be8fe90d42db7b413bd0b1983a4ed44cd511308244e64e88d49a70306c9262556a1717402c41e42849c7420f1e958dfc300ce631eb382
 EBUILD rebar-3.19.0.ebuild 2462 BLAKE2B 52b97493bde303b742e274dd294bde9df57a89b4bd4bce81034599e2297a73198373e9588da48fe54dc58e57b3100025a75fb78117c91fa76190a3b8795f8ffe SHA512 93c6921f3d94ebcf7d37f9e4f0d68717cb4e7e7924fac52297f95162940ba4ca8e2160b42cf37139721ad9c51ce63ab9cde1b71ba29491db2c1b409cc5e69c79
-EBUILD rebar-3.20.0.ebuild 1332 BLAKE2B 82f3176ba43bc84bc34f5ea45c415d824710d83b883fc4b0c25376e2e91fbe0f06857a8d1fbecc6f06de185ffaf0ab7914eb38cbfef70dd579bf1d69b9ede152 SHA512 8defe8a116fde21e602121cbb929041696d57debbef8a59d637507461783442ea6b1c954c5f1fcf3bcc601e24243053e13c3d5fe70f0b2a64b14dc258afc8647
+EBUILD rebar-3.20.0.ebuild 1360 BLAKE2B fa2e84097c9ff5e329262d17145ff7abca7122f357f560a59a35f168204e01fc46f18794e2e2660cebe7b33e77a62694a5482eebc56c5386890fcda726098dbd SHA512 7cbbd1cc19ac0e03c8e601340f7d315f82541bab665dda3513f93c7cc8024cbb0372b0fab139ba5c8aaaded723f4892daa254f66c6b91b50325b4d00a26d6d40
 MISC metadata.xml 361 BLAKE2B d58dbad87667d782d0b5d81f0d9166b4e93dc0dea86b7b665acd6463c945949425746085f1a36cc952ad0ca3bcd7acb949a855c2aa57eae8a18bfd16120da1ae SHA512 aa1aae5e0688d6e921d4018714a37f079a333282baff352d7faeef3b1810471be421c99a705b1b97de0cb5c846efb69b3ec4f018033cb56efc307164fb8871c3
diff --git a/dev-util/rebar/rebar-3.20.0.ebuild b/dev-util/rebar/rebar-3.20.0.ebuild
index 64591ebffb41..976fc3c4ceba 100644
--- a/dev-util/rebar/rebar-3.20.0.ebuild
+++ b/dev-util/rebar/rebar-3.20.0.ebuild
@@ -31,10 +31,13 @@ DEPEND="${RDEPEND}"
 
 src_unpack() {
 	unpack ${P}.tar.gz
-	mkdir "${S}"/vendor/meck || die
-	tar -O -xf "${DISTDIR}"/meck-${MECK_PV}.tar contents.tar.gz |
-		tar -xzf - -C "${S}"/vendor/meck
-	assert
+
+	if use test; then
+		mkdir "${S}"/vendor/meck || die
+		tar -O -xf "${DISTDIR}"/meck-${MECK_PV}.tar contents.tar.gz |
+			tar -xzf - -C "${S}"/vendor/meck
+		assert
+	fi
 }
 
 src_compile() {
diff --git a/games-arcade/Manifest.gz b/games-arcade/Manifest.gz
index 9f41c28f40f3..bacb07fb4c38 100644
--- a/games-arcade/Manifest.gz
+++ b/games-arcade/Manifest.gz
diff --git a/games-arcade/xbill/Manifest b/games-arcade/xbill/Manifest
index 60ce96bcf1d9..d7219128052c 100644
--- a/games-arcade/xbill/Manifest
+++ b/games-arcade/xbill/Manifest
@@ -2,5 +2,7 @@ AUX xbill-2.1-clang16.patch 1226 BLAKE2B cd2a7d2d341dee132ac0628bf3f4cb8f18101eb
 AUX xbill-2.1-gentoo.patch 9281 BLAKE2B 852ac415c5525daeb47f321c2e91d76a2af842b5e934a0082e481a940919cffff3c600cd373c76564741346d580db01eba8ce502ba7f47c627a3c66bf042aa5a SHA512 81bdcb950260b6d8b52b9857d1d09b351b422df5789319873ea6e6f2431559c6a0a5a963a87313ed23b2a496d570c6c02e50df2c22f4195c48506f7711a740b8
 AUX xbill-2.1-gtk2.patch 582 BLAKE2B d577b0ba7e6247594c616d0d439136d9e0a6378518085e5d29303dbdce065d21ab623d12a18716ce03c35bd00e2a73aa865553c3f541cfe48eacebf60116d467 SHA512 f25980493ccc86f42c0ac4d996b6ec1580011b7764e7b1ad80dd04698a094c0c1842512e544d62ffd527b9a08109f7389c1741f4837e5320accc128786dbc546
 DIST xbill-2.1.tar.gz 77610 BLAKE2B aeadc62fa01a3d37b1ae6388987e5d5e3a2d73b9c5afa99b9a2c61155eeb5fb2efc4a36dd2cbeb3fd2f677b385550146d75964afa5f7e83a27f6dc7a16db83c9 SHA512 127604d88258db0ec47084209c656f8817146d70b0fe16f5a1d79883415cf38200594834b39080d78c627104ae6d204f3c12caf127fa094108c4edfbfa98d966
+DIST xbill.png 49325 BLAKE2B a2b5cacee2f5aaf62bcea941dbde26c4cf17ef29c0018ecbd66aefb64e6d1240ac756a32b84d631e4675774b7a06d7c56756debe80df8252684181e0e638a9a0 SHA512 cb41e8603f400cf7b4f8fde2739e798872cefd6e45ff0ff17ddf1f02958f572195022adcdc7ac308cb4236fb79ff68433673cfbaefaf5ccdb426d6070f39e854
 EBUILD xbill-2.1-r5.ebuild 989 BLAKE2B 3b7ca5f87211d0d496f9e3eba719cf418dd012fe41a0388ddab1b8f2b4a2e09f5605cd8ef67e16af6b5f300c5effc286387be2b152378e164df3aaf2633020d8 SHA512 51f4a438867fab2b3f0f72520e73fbfbc171a088c166592644408d2cf5335a721f4da502abd3469a59782911468e69d8bc9caf4823fdc2c2f24d289ac38f941b
+EBUILD xbill-2.1-r6.ebuild 973 BLAKE2B 77dc37bc8c683e4f1c548ca6d9b18b0db9a94efd237faebb25ba8cd97429e62ca97eb907f4607157e7455153de92f46426b9f89620adf54ba593a51155b47bd1 SHA512 076f153fa5fc387cb149eb9c8b3e6bf3e62ea1aee67aeebec04e8a6963e3852aa5c92e98c6e9d479ccb3298ae4173872f1716347728fb746cf7776328c11f305
 MISC metadata.xml 250 BLAKE2B 8d44bd4c6e7d6491273e2015e36ddac74af7b94a124fd240ff030e16430f5c85e53ab812f0e3e94bb2e6d138f39b512bbe01ff98b0081cacc21a02d648ec7643 SHA512 80ac07a3cac10ad2e72e9989a130b7d2073934fe92914a9db2af4d0e769d4bf537770f8faba0654bbd64a7e85ee38cf1f9d03b4b9cd322864b1b2bb35087d610
diff --git a/games-arcade/xbill/xbill-2.1-r6.ebuild b/games-arcade/xbill/xbill-2.1-r6.ebuild
new file mode 100644
index 000000000000..fdff9e03b315
--- /dev/null
+++ b/games-arcade/xbill/xbill-2.1-r6.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools desktop
+
+DESCRIPTION="A game about an evil hacker called Bill!"
+HOMEPAGE="http://www.xbill.org/"
+SRC_URI="http://www.xbill.org/download/${P}.tar.gz
+	https://dashboard.snapcraft.io/site_media/appmedia/2018/04/xbill.png"
+
+LICENSE="GPL-1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	acct-group/gamestat
+	media-fonts/font-misc-misc
+	x11-libs/libXaw
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gentoo.patch
+	"${FILESDIR}"/${P}-clang16.patch
+)
+
+src_prepare() {
+	default
+	mv configure.in configure.ac || die
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-motif \
+		--disable-gtk \
+		--enable-athena
+}
+
+src_install() {
+	default
+	doicon "${DISTDIR}"/${PN}.png
+	make_desktop_entry ${PN} XBill ${PN}
+
+	fowners :gamestat /var/lib/xbill/scores /usr/bin/${PN}
+	fperms 664 /var/lib/xbill/scores
+}
diff --git a/licenses/Manifest.gz b/licenses/Manifest.gz
index 43367d6feec5..e49a96209ba6 100644
--- a/licenses/Manifest.gz
+++ b/licenses/Manifest.gz
diff --git a/licenses/PUEL-11 b/licenses/PUEL-11
new file mode 100644
index 000000000000..fe0231ed9667
--- /dev/null
+++ b/licenses/PUEL-11
@@ -0,0 +1,168 @@
+VirtualBox Extension Pack Personal Use and Evaluation License (PUEL)
+
+License version 11, 21 May 2020
+
+PLEASE READ THE FOLLOWING ORACLE VM VIRTUALBOX EXTENSION PACK PERSONAL
+USE AND EVALUATION LICENSE CAREFULLY BEFORE DOWNLOADING OR USING THE
+ORACLE SOFTWARE. THESE TERMS AND CONDITIONS CONSTITUTE A LEGAL AGREEMENT
+BETWEEN YOU AND ORACLE.
+
+ORACLE AMERICA, INC. ("ORACLE") IS WILLING TO LICENSE THE PRODUCT DEFINED
+IN SECTION 1 BELOW ONLY ON THE CONDITION THAT YOU ACCEPT ALL OF THE TERMS
+CONTAINED IN THIS VIRTUALBOX EXTENSION PACK PERSONAL USE AND EVALUATION
+LICENSE AGREEMENT ("AGREEMENT").
+
+IF YOU ARE AGREEING TO THIS LICENSE ON BEHALF OF AN ENTITY (RATHER THAN
+AS AN INDIVIDUAL HUMAN BEING), YOU REPRESENT THAT YOU HAVE THE APPROPRIATE
+AUTHORITY TO ACCEPT THESE TERMS AND CONDITIONS ON BEHALF OF SUCH ENTITY.
+
+1 SUBJECT OF AGREEMENT. This Agreement governs your use of the binary
+software package called "Oracle VM VirtualBox Extension Pack" (the
+"Product"), which contains a set of additional features for "Oracle
+VM VirtualBox" that enhance the operation of multiple virtual machines
+("Guest Computers") on a single physical computer ("Host Computer"). The
+Product consists of executable files in machine code, script files,
+data files, and all documentation and updates provided to You by Oracle.
+
+2 GRANT OF LICENSE. Oracle grants you a personal, non-exclusive,
+non-transferable, limited license without fees to reproduce, install,
+execute, and use internally the Product on Host Computers for
+your Personal Use, Educational Use, or Evaluation. "Personal Use"
+is noncommercial use solely by the person downloading the Product
+from Oracle on a single Host Computer, provided that no more than one
+client or remote computer is connected to that Host Computer and that
+client or remote computer is used solely to remotely view the Guest
+Computer(s). "Educational Use" is any use by teachers or students in
+an academic institution (schools, colleges and universities) as part of
+the institution's educational curriculum. "Evaluation" means testing the
+Product for up to thirty (30) days; after expiry of that term, you are
+no longer permitted to use the Product. Personal Use and/or Educational
+Use expressly exclude any use of the Product for commercial purposes or
+to operate, run, or act on behalf of or for the benefit of a business,
+organization, governmental organization, or educational institution.
+
+Oracle reserves all rights not expressly granted in this license.
+
+3 RESTRICTIONS AND RESERVATION OF RIGHTS.
+
+(1) The Product and copies thereof provided to you under this Agreement
+are copyrighted and licensed, not sold, to you by Oracle.
+
+(2) You may not do any of the following: (a) modify any part of the
+Product, except to the extent allowed in the documentation accompanying
+the Product; (b) rent, lease, lend, re-distribute, or encumber the
+Product; (c) remove or alter any proprietary legends or notices contained
+in the Product; or (d) decompile, or reverse engineer the Product
+(except to the extent permitted by applicable law).
+
+(3) The Product is not designed, licensed or intended for use in the
+design, construction, operation or maintenance of any nuclear facility
+and Oracle and its licensors disclaim any express or implied warranty
+of fitness for such uses.
+
+(4) No right, title or interest in or to any trademark, service mark, logo
+or trade name of Oracle or its licensors is granted under this Agreement.
+
+4 TERMINATION. The Agreement is effective on the date you receive the
+Product and remains effective until terminated. Your rights under this
+Agreement will terminate immediately without notice from Oracle if
+you materially breach it or take any action in derogation of Oracle's
+and/or its licensors' rights to the Product. Oracle may terminate this
+Agreement immediately should any part of the Product become or in Oracle's
+reasonable opinion likely to become the subject of a claim of intellectual
+property infringement or trade secret misappropriation. Upon termination,
+you will cease use of and destroy all copies of the Product under your
+control and confirm compliance in writing to Oracle. Neither termination
+of this Agreement nor any deletion or removal of the Product shall limit
+any obligations you may have to Oracle, or any rights and/or remedies that
+Oracle may have with respect to any past or future infringing use of the
+Product (including but not limited to any use of the Product outside the
+scope of the license provided in the Agreement). Sections 3-9, inclusive,
+will survive termination of the Agreement.
+
+5 DISCLAIMER OF WARRANTY. TO THE EXTENT NOT PROHIBITED BY APPLICABLE LAW,
+ORACLE PROVIDES THE PRODUCT "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER
+EXPRESS OR IMPLIED. WITHOUT LIMITING THE FOREGOING, ORACLE SPECIFICALLY
+DISCLAIMS ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+PARTICULAR PURPOSE, TITLE, AND NON-INFRINGEMENT. The entire risk as
+to the quality and performance of the Product is with you. Should it
+prove defective, you assume the cost of all necessary servicing, repair,
+or correction.
+
+6 LIMITATION OF LIABILITY. TO THE EXTENT NOT PROHIBITED BY APPLICABLE LAW,
+IN NO EVENT WILL ORACLE OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE,
+PROFIT, DATA, OR DATA USE, OR FOR SPECIAL, INDIRECT, CONSEQUENTIAL,
+INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED REGARDLESS OF THE THEORY
+OF LIABILITY, ARISING OUT OF OR RELATED TO THE USE OF OR INABILITY TO
+USE THE PRODUCT, EVEN IF ORACLE HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES. In no event will Oracle's liability to you, whether in
+contract, tort (including negligence), or otherwise, exceed the amount
+paid by you for the Product under this Agreement.
+
+7 SEPARATELY LICENSED THIRD PARTY TECHNOLOGY. The Product may contain
+or require the use of third party technology that is provided with
+the Product. Oracle may provide certain notices to you in the Product's
+documentation, readmes or notice files in connection with such third party
+technology. Third party technology will be licensed to you either under
+the terms of this Agreement or, if specified in the documentation, readmes
+or notice files, under Separate Terms. Your rights to use Separately
+Licensed Third Party Technology under Separate Terms are not restricted
+in any way by this Agreement. However, for clarity, notwithstanding the
+existence of a notice, third party technology that is not Separately
+Licensed Third Party Technology shall be deemed part of the Product and
+is licensed to You under the terms of this Agreement. "Separate Terms"
+refers to separate license terms that are specified in the Product's
+documentation, readmes or notice files and that apply to Separately
+Licensed Third Party Technology. "Separately Licensed Third Party
+Technology" refers to third party technology that is licensed under
+Separate Terms and not under the terms of this Agreement.
+
+8 EXPORT. Export laws and regulations of the United States and any other
+relevant local export laws and regulations apply to the Product. You
+agree that such export laws govern your use of the Product (including
+technical data) provided under this Agreement, and you agree to comply
+with all such export laws and regulations (including "deemed export" and
+"deemed re-export" regulations). You agree that no data, information,
+and/or Product (or direct product thereof) will be exported, directly or
+indirectly, in violation of these laws, or will be used for any purpose
+prohibited by these laws including, without limitation, nuclear, chemical,
+or biological weapons proliferation, or development of missile technology.
+
+9 U.S. GOVERNMENT END USERS. Oracle programs, including the Product,
+any operating system, integrated software, any programs installed on
+hardware, and/or documentation, delivered to U.S. Government end users
+are "commercial computer software" pursuant to the applicable Federal
+Acquisition Regulation and agency-specific supplemental regulations. As
+such, use, duplication, disclosure, modification, and adaptation of
+the programs, including any operating system, integrated software,
+any programs installed on the hardware, and/or documentation, shall
+be subject to license terms and license restrictions applicable to the
+programs. No other rights are granted to the U.S. Government.
+
+10 MISCELLANEOUS. This Agreement is the entire agreement between you
+and Oracle relating to its subject matter. It supersedes all prior or
+contemporaneous oral or written communications, proposals, representations
+and warranties and prevails over any conflicting or additional terms
+of any quote, order, acknowledgment, or other communication between
+the parties relating to its subject matter during the term of this
+Agreement. No modification of this Agreement will be binding, unless in
+writing and signed by an authorized representative of each party. If any
+provision of this Agreement is held to be unenforceable, this Agreement
+will remain in effect with the provision omitted, unless omission would
+frustrate the intent of the parties, in which case this Agreement will
+immediately terminate. This Agreement is governed by the laws of the
+State of California, USA, and you and Oracle agree to submit to the
+exclusive jurisdiction of, and venue in, the courts of San Francisco
+or Santa Clara counties in California in any dispute arising out of or
+relating to this Agreement. Upon 45 days written notice, Oracle may
+audit your use of the Product to confirm that you are in compliance
+with the terms of this Agreement. You agree to cooperate with Oracle's
+audit and provide reasonable assistance and access to information. Any
+such audit shall not unreasonably interfere with your normal business
+operations. You agree to pay within 30 days of written notification
+any fees applicable to your unlicensed use of the Product. You agree
+that Oracle shall not be responsible for any of your costs incurred in
+cooperating with the audit. If a legal action or proceeding is commenced
+by either party in connection with the enforcement of this Agreement,
+the prevailing party shall be entitled to its costs and attorneys'
+fees actually incurred in connection with such action or proceeding.
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index cec21c86260b..182db57ff5e2 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index d6171594f80d..4d7aeaaf691e 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sun, 20 Nov 2022 06:10:01 +0000
+Sun, 20 Nov 2022 12:09:58 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 62891927563f..1d1f6d32df5f 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 536244 BLAKE2B 47908e9e54099299278f14e5112b789aac78178d7406b6880e3986163e8e2aeec411757dbe131202da7291c508ea72a7d158f7fe08facf6e36a23a28a992a7d8 SHA512 ef16d73b0d889ec01efae4d55e398ba1b384a7b46066c129d82b336f46e8804d0dd1765c65c49d93842dc829696efc67759ac790655f316a70359fb8847d9e4e
-TIMESTAMP 2022-11-20T06:10:04Z
+TIMESTAMP 2022-11-20T12:10:01Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmN5xLxfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmN6GRlfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDmhw//XYO4ovC/uCzvvbE4YZ1E1NPWeWxPURBLmPxtM7LtmFLkxWK/vl9zSqdp
-9pQA8UxSDmDtnLdzONZhU943sgX7Q1XHOkP4wPEbEr11J9qZQXXv23V6N4+NUmOu
-OONohWpx5z3F+KMF6O6t++w8iiyxgqfs4YFvS1SwS07uv6ps2rcwAhJStNvJ38M2
-oQU/vvTYpV65uWfIE7QjkvEdHj6khg+whIg6ZFf2vKYYC8pgV4LmSRWBfBL/vgo3
-7mxY1vwCXziXkVV+hcaIWP+EDRYC5cjoNxf7rMySqYptCJD/wQg9d8ZEUUk8QsY9
-8osUKS3hfvi0HUxbe2pIWFIMMmWn6b5Jdlgu0RckSf7ph6Rn9HdoGYsjiNSpL3Mk
-5BqfvowTnSijlErB1nzZgFBgRT581vUsCgnkHFq/QohEmGghrwTN/tW5Rga9YdPP
-lUu5B6/+JADFf9CdmZ3Xc3b3rmksg0Uwc4Eow+4jH6pmiJsK2fJ2GY0UruVsOx1A
-3/k07+LQxWCQ0RY2coBhq2MPfGOsLSiKADrl1GFK2orbbqx1cPgAjkeuyxKEKbJ+
-uAjnz4tU+1wLto5wHOe7Vwpq+0+TIFtK/Z0dnxtwdrmdcKLWrHbsNTJeLlD5HCvL
-WeQTEWl5RF9kxul5y+MZOA1w6Aw9oqbGWQosoCWY7TIkor9bdo8=
-=a3vL
+klCOzQ//dEaciFHQcyRsxblRTte97lrEzzlmWuz4yH6uII2Kd5GtUjTOq938XOED
+qk57a6qwEx5Qow5NUcutyr8CP9aMY23Ekjq5yY4rsJ90NtNgIvXEeGzkalHHiPsQ
+/dK/pktbg1hS1w6eyUprGktw7XAUNm9tEOG9cLIUtiQuAnKCnEkYqq5p0lYocqdY
+RpESgvwKDRu6VGbYORZTgEKVsrVhIfCQIRLPewRiTbK67KeHOQiSuesG+LztMHBz
+6CofLE4pBdTtnOBfqNM7YJaym+VUtesj0DfW1H8qk2gYPoLPbaI8Op670ya7bizR
+Q2SJGjRI8dtcl7XKhI7E0MIyWLOT7/775++ksR6cejK0PI+Gnona1WdSP00WcchO
+elXH2tk3HD+TTMICao3DbqqR0SZh4Rq/Bf1mOpNg9kZGsU8pu2rrI86TQHhz5/YT
+whh/kZKxB/WYNATpz6wQHugCIMxKJjy0J3jJzdsdK2ZlUZhMqSYty5wwJhB8Dwjc
+DuMJf1sWATsgZ35no+N3V+ZYTT11pZYkE5sWZX7KCxFUlyzwubZIVrPQBLXl8wfd
+zE4nHiZSWcobo/QeOogfKCPIT67T3rB406lTiOFx0g6M6GSAIocUkfFYJvEPjbG8
+XOdp33LGU+g5K3KOWmri0xpcsgsYL5vCqiRCK0f7Uw5oegBS560=
+=tjMA
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index d6171594f80d..4d7aeaaf691e 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sun, 20 Nov 2022 06:10:01 +0000
+Sun, 20 Nov 2022 12:09:58 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 28b51c86d83a..c8d5ad86389a 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index 898e67bcfd4e..cfc7f625855d 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.40 b/metadata/md5-cache/app-emulation/virtualbox-6.1.40
index 954949e8be68..ffcb7d97d32b 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-6.1.40
+++ b/metadata/md5-cache/app-emulation/virtualbox-6.1.40
@@ -1,6 +1,6 @@
 BDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-util/kbuild-0.1.9998.3127 >=dev-lang/yasm-0.6.2 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_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) acct-group/vboxusers ~app-emulation/virtualbox-modules-6.1.40 dev-libs/libIDL >=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-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 ) vnc? ( >=net-libs/libvncserver-0.9.9 ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) !headless? ( x11-libs/libXinerama opengl? ( virtual/opengl ) ) java? ( virtual/jdk:1.8 ) pam? ( sys-libs/pam ) pax-kernel? ( sys-apps/elfix ) pulseaudio? ( media-sound/pulseaudio ) vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) acct-group/vboxusers ~app-emulation/virtualbox-modules-6.1.40 dev-libs/libIDL >=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-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 ) 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 ) vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] ) 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/
@@ -14,4 +14,4 @@ REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java ) ^^ ( python_sing
 SLOT=0/6.1
 SRC_URI=https://download.virtualbox.org/virtualbox/6.1.40/VirtualBox-6.1.40.tar.bz2 https://gitweb.gentoo.org/proj/virtualbox-patches.git/snapshot/virtualbox-patches-6.1.36.tar.bz2
 _eclasses_=desktop	7eb20ad915a0a318176d51bc2508ff5c	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	29a755b1291d64133634d80b0328f153	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=23ad66538303d25304a13a52d696d04c
+_md5_=99e792e09ef368bcf29c99091496931b
diff --git a/metadata/md5-cache/app-emulation/virtualbox-7.0.2 b/metadata/md5-cache/app-emulation/virtualbox-7.0.2
index a40aa8012046..e6e7290f4152 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-7.0.2
+++ b/metadata/md5-cache/app-emulation/virtualbox-7.0.2
@@ -1,4 +1,4 @@
-BDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-lang/yasm-0.6.2 dev-libs/libIDL dev-qt/linguist-tools:5 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 ) java? ( virtual/jdk:1.8 ) virtual/pkgconfig
+BDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-lang/yasm-0.6.2 dev-libs/libIDL dev-qt/linguist-tools:5 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 ) java? ( virtual/jdk:1.8 ) virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup
 DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) acct-group/vboxusers ~app-emulation/virtualbox-modules-7.0.2 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 ) !headless? ( x11-libs/libX11 x11-libs/libXt opengl? ( media-libs/libglvnd[X] ) qt5? ( 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 opengl? ( dev-qt/qtopengl:5 ) ) sdl? ( media-libs/libsdl:0[X,video] x11-libs/libXcursor ) ) lvm? ( sys-fs/lvm2 ) pam? ( sys-libs/pam ) vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] ) vnc? ( >=net-libs/libvncserver-0.9.9 ) >=dev-libs/libxslt-1.1.19 virtual/libcrypt:= alsa? ( >=media-libs/alsa-lib-1.0.13 ) opengl? ( virtual/glu ) !headless? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXinerama x11-libs/libXmu x11-libs/libxcb:= x11-libs/libXrandr opengl? ( virtual/opengl ) ) java? ( virtual/jdk:1.8 ) opus? ( media-libs/opus ) pax-kernel? ( sys-apps/elfix ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( x11-libs/libXinerama ) 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
@@ -14,4 +14,4 @@ REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java ) ^^ ( python_sing
 SLOT=0/7.0
 SRC_URI=https://download.virtualbox.org/virtualbox/7.0.2/VirtualBox-7.0.2.tar.bz2 https://gitweb.gentoo.org/proj/virtualbox-patches.git/snapshot/virtualbox-patches-6.1.36.tar.bz2
 _eclasses_=desktop	7eb20ad915a0a318176d51bc2508ff5c	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	29a755b1291d64133634d80b0328f153	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=81b16d5a6701987f93dbca8db0f4b7a2
+_md5_=11cd5db5541eea7513462dcdcfc1678f
diff --git a/metadata/md5-cache/app-emulation/virtualbox-7.0.4 b/metadata/md5-cache/app-emulation/virtualbox-7.0.4
new file mode 100644
index 000000000000..e067b30b4c5e
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/virtualbox-7.0.4
@@ -0,0 +1,17 @@
+BDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-lang/yasm-0.6.2 dev-libs/libIDL dev-qt/linguist-tools:5 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 ) java? ( virtual/jdk:1.8 ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup
+DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) acct-group/vboxusers ~app-emulation/virtualbox-modules-7.0.4 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] 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(-)] ) 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-libs/libxcb:= x11-libs/libXcursor x11-libs/libXext x11-libs/libXinerama x11-libs/libXmu x11-libs/libXrandr opengl? ( virtual/opengl ) ) java? ( virtual/jdk:1.8 ) opengl? ( 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 pam pch pulseaudio +opengl python +sdk +sdl +udev vboxwebsrv vnc java python_single_target_python3_8 python_single_target_python3_9 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_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) acct-group/vboxusers ~app-emulation/virtualbox-modules-7.0.4 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] 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(-)] ) 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_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
+SLOT=0/7.0
+SRC_URI=https://download.virtualbox.org/virtualbox/7.0.4/VirtualBox-7.0.4.tar.bz2 https://gitweb.gentoo.org/proj/virtualbox-patches.git/snapshot/virtualbox-patches-6.1.36.tar.bz2
+_eclasses_=desktop	7eb20ad915a0a318176d51bc2508ff5c	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	29a755b1291d64133634d80b0328f153	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=75f2430fbfc09144536c27be253fbd30
diff --git a/metadata/md5-cache/app-emulation/virtualbox-additions-7.0.4 b/metadata/md5-cache/app-emulation/virtualbox-additions-7.0.4
new file mode 100644
index 000000000000..4b9c06ae5e7a
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/virtualbox-additions-7.0.4
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=CD image containing guest additions for VirtualBox
+EAPI=8
+HOMEPAGE=https://www.virtualbox.org/
+KEYWORDS=~amd64
+LICENSE=GPL-3 CDDL
+SLOT=0/7.0
+SRC_URI=https://download.virtualbox.org/virtualbox/7.0.4/VBoxGuestAdditions_7.0.4.iso
+_md5_=5ff560bd3d3cbe5b5faf073f7723b872
diff --git a/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-6.1.40 b/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-6.1.40
index e3d50d97ff62..c864b0a0a3cd 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-6.1.40
+++ b/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-6.1.40
@@ -3,9 +3,9 @@ DESCRIPTION=PUEL extensions for VirtualBox
 EAPI=8
 HOMEPAGE=https://www.virtualbox.org/
 KEYWORDS=amd64
-LICENSE=PUEL
+LICENSE=PUEL-11
 RDEPEND==app-emulation/virtualbox-6.1.40*
 RESTRICT=bindist mirror strip
 SLOT=0/6.1
 SRC_URI=https://download.virtualbox.org/virtualbox/6.1.40/Oracle_VM_VirtualBox_Extension_Pack-6.1.40.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-6.1.40.tar.gz
-_md5_=d988507f4ab6c7672b56f93ab0d4ec29
+_md5_=843dc7e5376539882f63d40b7c2bd45e
diff --git a/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-7.0.2 b/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-7.0.2
index 6b069a250222..4a72b3daa433 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-7.0.2
+++ b/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-7.0.2
@@ -3,9 +3,9 @@ DESCRIPTION=PUEL extensions for VirtualBox
 EAPI=8
 HOMEPAGE=https://www.virtualbox.org/
 KEYWORDS=~amd64
-LICENSE=PUEL
+LICENSE=PUEL-11
 RDEPEND==app-emulation/virtualbox-7.0.2*
 RESTRICT=bindist mirror strip
 SLOT=0/7.0
 SRC_URI=https://download.virtualbox.org/virtualbox/7.0.2/Oracle_VM_VirtualBox_Extension_Pack-7.0.2.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-7.0.2.tar.gz
-_md5_=b33f014d73e8bc0fd6b89cb31fab3d82
+_md5_=cfd272ae8f4ea74e1d54debbb3b4cff7
diff --git a/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-7.0.4 b/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-7.0.4
new file mode 100644
index 000000000000..61900f56526e
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-7.0.4
@@ -0,0 +1,11 @@
+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.4*
+RESTRICT=bindist mirror strip
+SLOT=0/7.0
+SRC_URI=https://download.virtualbox.org/virtualbox/7.0.4/Oracle_VM_VirtualBox_Extension_Pack-7.0.4.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-7.0.4.tar.gz
+_md5_=cfd272ae8f4ea74e1d54debbb3b4cff7
diff --git a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-7.0.4 b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-7.0.4
new file mode 100644
index 000000000000..e65ee8a7d0b1
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-7.0.4
@@ -0,0 +1,16 @@
+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 ) 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:= ) ) sys-apps/sed 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-2+ GPL-3 LGPL-2.1 MIT
+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.4/VirtualBox-7.0.4.tar.bz2 https://gitweb.gentoo.org/proj/virtualbox-patches.git/snapshot/virtualbox-patches-6.1.36.tar.bz2
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	3167123d17b3550117c7e554fd22ca02	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152
+_md5_=993710cc61734d462fb0c38f9c1d3cbd
diff --git a/metadata/md5-cache/app-emulation/virtualbox-modules-7.0.4 b/metadata/md5-cache/app-emulation/virtualbox-modules-7.0.4
new file mode 100644
index 000000000000..04c0f2f54f47
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/virtualbox-modules-7.0.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst setup
+DEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) sys-apps/sed 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.4.tar.xz
+_eclasses_=linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	3167123d17b3550117c7e554fd22ca02	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=293ae2679f3f612ddc6bfbf636a5aabf
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 58971728312e..be01e7648106 100644
--- a/metadata/md5-cache/app-text/Manifest.gz
+++ b/metadata/md5-cache/app-text/Manifest.gz
diff --git a/metadata/md5-cache/app-text/coolreader-3.2.57-r2 b/metadata/md5-cache/app-text/coolreader-3.2.57-r2
deleted file mode 100644
index 3d78bffc38a2..000000000000
--- a/metadata/md5-cache/app-text/coolreader-3.2.57-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-libs/zlib media-libs/libpng:0 virtual/jpeg:0 media-libs/freetype dev-libs/fribidi media-libs/fontconfig media-libs/harfbuzz:= dev-libs/libunibreak:= wxwidgets? ( x11-libs/wxGTK:3.0-gtk3 ) !wxwidgets? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) !wxwidgets? ( dev-qt/linguist-tools:5 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=CoolReader - reader of eBook files (fb2,epub,htm,rtf,txt)
-EAPI=7
-HOMEPAGE=https://github.com/buggins/coolreader/
-INHERIT=cmake plocale wxwidgets xdg
-IUSE=wxwidgets
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=sys-libs/zlib media-libs/libpng:0 virtual/jpeg:0 media-libs/freetype dev-libs/fribidi media-libs/fontconfig media-libs/harfbuzz:= dev-libs/libunibreak:= wxwidgets? ( x11-libs/wxGTK:3.0-gtk3 ) !wxwidgets? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) wxwidgets? ( || ( media-fonts/liberation-fonts media-fonts/corefonts ) )
-SLOT=0
-SRC_URI=https://github.com/buggins/coolreader/archive/cr3.2.57.tar.gz -> coolreader-3.2.57.tar.gz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	plocale	7ce00136a77130df46fbbd5966f98a61	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	wxwidgets	c09e9b94378cadaf6ef86ec1534c0fd6	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=9225e17d0d0b48efca997af4c06a640a
diff --git a/metadata/md5-cache/app-text/coolreader-3.2.58-r2 b/metadata/md5-cache/app-text/coolreader-3.2.58-r2
deleted file mode 100644
index 78a39eed8ce0..000000000000
--- a/metadata/md5-cache/app-text/coolreader-3.2.58-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-libs/zlib media-libs/libpng:0 virtual/jpeg:0 media-libs/freetype dev-libs/fribidi media-libs/fontconfig media-libs/harfbuzz:= dev-libs/libunibreak:= wxwidgets? ( x11-libs/wxGTK:3.0-gtk3 ) !wxwidgets? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) !wxwidgets? ( dev-qt/linguist-tools:5 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=CoolReader - reader of eBook files (fb2,epub,htm,rtf,txt)
-EAPI=7
-HOMEPAGE=https://github.com/buggins/coolreader/
-INHERIT=cmake plocale wxwidgets xdg
-IUSE=wxwidgets
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=sys-libs/zlib media-libs/libpng:0 virtual/jpeg:0 media-libs/freetype dev-libs/fribidi media-libs/fontconfig media-libs/harfbuzz:= dev-libs/libunibreak:= wxwidgets? ( x11-libs/wxGTK:3.0-gtk3 ) !wxwidgets? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) wxwidgets? ( || ( media-fonts/liberation-fonts media-fonts/corefonts ) )
-SLOT=0
-SRC_URI=https://github.com/buggins/coolreader/archive/cr3.2.58.tar.gz -> coolreader-3.2.58.tar.gz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	plocale	7ce00136a77130df46fbbd5966f98a61	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	wxwidgets	c09e9b94378cadaf6ef86ec1534c0fd6	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=1288d7134e4b80d8001977880afaa6b8
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index 1b7c70cddbaf..f0d06866cc58 100644
--- a/metadata/md5-cache/dev-java/Manifest.gz
+++ b/metadata/md5-cache/dev-java/Manifest.gz
diff --git a/metadata/md5-cache/dev-java/icu4j-72.1 b/metadata/md5-cache/dev-java/icu4j-72.1
index f9706fbb24b5..7ac2eae1024f 100644
--- a/metadata/md5-cache/dev-java/icu4j-72.1
+++ b/metadata/md5-cache/dev-java/icu4j-72.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://icu.unicode.org
 INHERIT=java-pkg-2 java-pkg-simple verify-sig
 IUSE=doc source test verify-sig
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ppc64 ~x86
 LICENSE=icu
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=70
 SRC_URI=https://github.com/unicode-org/icu/archive/refs/tags/release-72-1.tar.gz -> icu-72.1.tar.gz https://github.com/unicode-org/icu/releases/download/release-72-1/SHASUM512.txt.asc
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	verify-sig	afb98fe4696292e4234ce36713fd4e9e
-_md5_=b34ddca41aa57ab1e745f8e5b7daefeb
+_md5_=4519fe82c6f059fe801481d3f1ebc8a8
diff --git a/metadata/md5-cache/dev-ml/Manifest.gz b/metadata/md5-cache/dev-ml/Manifest.gz
index 615196c8b8bb..449bcc1af720 100644
--- a/metadata/md5-cache/dev-ml/Manifest.gz
+++ b/metadata/md5-cache/dev-ml/Manifest.gz
diff --git a/metadata/md5-cache/dev-ml/dune-private-libs-3.0.3 b/metadata/md5-cache/dev-ml/dune-private-libs-3.0.3
deleted file mode 100644
index e458b2aa5b4c..000000000000
--- a/metadata/md5-cache/dev-ml/dune-private-libs-3.0.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=~dev-ml/dune-3.0.3 dev-ml/dune dev-lang/ocaml
-DEFINED_PHASES=compile configure install test
-DEPEND=dev-ml/stdune:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
-DESCRIPTION=A composable build system for OCaml
-EAPI=8
-HOMEPAGE=https://github.com/ocaml/dune
-INHERIT=dune multiprocessing
-IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-ml/stdune:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
-RESTRICT=test
-SLOT=0/3.0.3
-SRC_URI=https://github.com/ocaml/dune/archive/3.0.3.tar.gz -> dune-3.0.3.tar.gz
-_eclasses_=dune	c8f275f00adf2380fe0a57d8a249885c	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=e7275582790083f79260e9b59e427b52
diff --git a/metadata/md5-cache/dev-ml/dune-private-libs-3.0.3-r1 b/metadata/md5-cache/dev-ml/dune-private-libs-3.0.3-r1
new file mode 100644
index 000000000000..24390cd6d239
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/dune-private-libs-3.0.3-r1
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-ml/dune-3 dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile configure install test
+DEPEND=>=dev-ml/csexp-1.5:=[ocamlopt?] dev-ml/pp:=[ocamlopt?] ~dev-ml/dyn-3.0.3:=[ocamlopt?] ~dev-ml/stdune-3.0.3:=[ocamlopt?] >=dev-lang/ocaml-4.08 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DESCRIPTION=Private libraries of Dune
+EAPI=8
+HOMEPAGE=https://github.com/ocaml/dune
+INHERIT=dune multiprocessing
+IUSE=+ocamlopt
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-ml/csexp-1.5:=[ocamlopt?] dev-ml/pp:=[ocamlopt?] ~dev-ml/dyn-3.0.3:=[ocamlopt?] ~dev-ml/stdune-3.0.3:=[ocamlopt?] >=dev-lang/ocaml-4.08 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+RESTRICT=test
+SLOT=0/3.0.3
+SRC_URI=https://github.com/ocaml/dune/archive/3.0.3.tar.gz -> dune-3.0.3.tar.gz
+_eclasses_=dune	c8f275f00adf2380fe0a57d8a249885c	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
+_md5_=6c93d7f4280f8605f25f6e8721c62eea
diff --git a/metadata/md5-cache/dev-ml/dyn-3.0.3 b/metadata/md5-cache/dev-ml/dyn-3.0.3-r1
index a9a0e656aaaa..2b0b43afb677 100644
--- a/metadata/md5-cache/dev-ml/dyn-3.0.3
+++ b/metadata/md5-cache/dev-ml/dyn-3.0.3-r1
@@ -1,6 +1,6 @@
-BDEPEND=~dev-ml/dune-3.0.3 dev-ml/dune dev-lang/ocaml
+BDEPEND=>=dev-ml/dune-3 dev-ml/dune dev-lang/ocaml
 DEFINED_PHASES=compile configure install test
-DEPEND=dev-ml/ordering:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DEPEND=~dev-ml/ordering-3.0.3:= dev-ml/pp:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 DESCRIPTION=Dynamic type
 EAPI=8
 HOMEPAGE=https://github.com/ocaml/dune
@@ -8,9 +8,9 @@ INHERIT=dune multiprocessing
 IUSE=+ocamlopt
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
 LICENSE=Apache-2.0
-RDEPEND=dev-ml/ordering:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+RDEPEND=~dev-ml/ordering-3.0.3:= dev-ml/pp:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 RESTRICT=test
 SLOT=0/3.0.3
 SRC_URI=https://github.com/ocaml/dune/archive/3.0.3.tar.gz -> dune-3.0.3.tar.gz
 _eclasses_=dune	c8f275f00adf2380fe0a57d8a249885c	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=9a89f2b9eb2b8a5c3f12c4b626a32d7e
+_md5_=bfec9b2c71716830fef11de190bb6c64
diff --git a/metadata/md5-cache/dev-ml/ordering-3.0.3 b/metadata/md5-cache/dev-ml/ordering-3.0.3
index 7661a38767df..ef06a61224d9 100644
--- a/metadata/md5-cache/dev-ml/ordering-3.0.3
+++ b/metadata/md5-cache/dev-ml/ordering-3.0.3
@@ -1,6 +1,6 @@
-BDEPEND=~dev-ml/dune-3.0.3 dev-ml/dune dev-lang/ocaml
+BDEPEND=>=dev-ml/dune-3 dev-ml/dune dev-lang/ocaml
 DEFINED_PHASES=compile configure install test
-DEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DEPEND=>=dev-lang/ocaml-4.08 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 DESCRIPTION=Element ordering
 EAPI=8
 HOMEPAGE=https://github.com/ocaml/dune
@@ -8,9 +8,9 @@ INHERIT=dune multiprocessing
 IUSE=+ocamlopt
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
 LICENSE=Apache-2.0
-RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+RDEPEND=>=dev-lang/ocaml-4.08 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 RESTRICT=test
 SLOT=0/3.0.3
 SRC_URI=https://github.com/ocaml/dune/archive/3.0.3.tar.gz -> dune-3.0.3.tar.gz
 _eclasses_=dune	c8f275f00adf2380fe0a57d8a249885c	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=05325ec3d66fd51fa83e77bc699fdf23
+_md5_=ee76ddb21c01b78e285cbd21cddb2eeb
diff --git a/metadata/md5-cache/dev-ml/stdune-3.0.3 b/metadata/md5-cache/dev-ml/stdune-3.0.3-r1
index af7a44ce0761..a9d621bbca45 100644
--- a/metadata/md5-cache/dev-ml/stdune-3.0.3
+++ b/metadata/md5-cache/dev-ml/stdune-3.0.3-r1
@@ -1,6 +1,6 @@
-BDEPEND=~dev-ml/dune-3.0.3 dev-ml/dune dev-lang/ocaml
+BDEPEND=>=dev-ml/dune-3 dev-ml/dune dev-lang/ocaml
 DEFINED_PHASES=compile configure install test
-DEPEND=dev-ml/pp:=[ocamlopt?] dev-ml/dyn:=[ocamlopt?] >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DEPEND=dev-ml/pp:=[ocamlopt?] ~dev-ml/dyn-3.0.3:=[ocamlopt?] ~dev-ml/ordering-3.0.3:=[ocamlopt?] >=dev-ml/csexp-1.5:=[ocamlopt?] >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 DESCRIPTION=Dune's unstable standard library
 EAPI=8
 HOMEPAGE=https://github.com/ocaml/dune
@@ -8,9 +8,9 @@ INHERIT=dune multiprocessing
 IUSE=+ocamlopt
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
 LICENSE=Apache-2.0
-RDEPEND=dev-ml/pp:=[ocamlopt?] dev-ml/dyn:=[ocamlopt?] >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+RDEPEND=dev-ml/pp:=[ocamlopt?] ~dev-ml/dyn-3.0.3:=[ocamlopt?] ~dev-ml/ordering-3.0.3:=[ocamlopt?] >=dev-ml/csexp-1.5:=[ocamlopt?] >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 RESTRICT=test
 SLOT=0/3.0.3
 SRC_URI=https://github.com/ocaml/dune/archive/3.0.3.tar.gz -> dune-3.0.3.tar.gz
 _eclasses_=dune	c8f275f00adf2380fe0a57d8a249885c	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=8abac06946cfb825bb6fe4da08141953
+_md5_=7cf2713a342219613a51507cb3c13c79
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 777a8d81f888..9b46284fe023 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/astroid-2.12.13 b/metadata/md5-cache/dev-python/astroid-2.12.13
new file mode 100644
index 000000000000..b3cd1b09ed27
--- /dev/null
+++ b/metadata/md5-cache/dev-python/astroid-2.12.13
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/lazy-object-proxy-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/typing-extensions-3.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/wrapt-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Abstract Syntax Tree for logilab packages
+EAPI=8
+HOMEPAGE=https://github.com/PyCQA/astroid/ https://pypi.org/project/astroid/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-python/lazy-object-proxy-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/typing-extensions-3.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/wrapt-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/PyCQA/astroid/archive/v2.12.13.tar.gz -> astroid-2.12.13.gh.tar.gz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=6ec8c327dd30e582737f75d94d82c412
diff --git a/metadata/md5-cache/dev-python/cheroot-9.0.0 b/metadata/md5-cache/dev-python/cheroot-9.0.0
new file mode 100644
index 000000000000..59ae8faad8f4
--- /dev/null
+++ b/metadata/md5-cache/dev-python/cheroot-9.0.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/jaraco-context[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jaraco-text[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/portend[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-forked[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-mock-1.11.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests-toolbelt[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests-unixsocket[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/urllib3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test-rust? ( dev-python/pyopenssl[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/trustme[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) test? ( >=dev-python/six-1.11.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/more-itertools-2.6[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jaraco-functools[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=High-performance, pure-Python HTTP server used by CherryPy
+EAPI=8
+HOMEPAGE=https://cherrypy.dev/ https://pypi.org/project/cheroot/ https://github.com/cherrypy/cheroot/
+INHERIT=distutils-r1
+IUSE=test-rust test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=BSD
+RDEPEND=>=dev-python/six-1.11.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/more-itertools-2.6[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jaraco-functools[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/c/cheroot/cheroot-9.0.0.tar.gz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=ecf1a380f068b65c958fc849cbf3f594
diff --git a/metadata/md5-cache/dev-python/hypothesis-6.58.0 b/metadata/md5-cache/dev-python/hypothesis-6.58.0
new file mode 100644
index 000000000000..29ba4061efc0
--- /dev/null
+++ b/metadata/md5-cache/dev-python/hypothesis-6.58.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pexpect[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !!<dev-python/requests-toolbelt-0.10.1 ) test? ( >=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) cli? ( python_targets_python3_8? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) >=dev-python/pytest-7.1.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0=[threads(+),sqlite] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+),sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+),sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+),sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[threads(+),sqlite] ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=A library for property based testing
+EAPI=8
+HOMEPAGE=https://github.com/HypothesisWorks/hypothesis/ https://pypi.org/project/hypothesis/
+INHERIT=distutils-r1 multiprocessing optfeature
+IUSE=cli test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 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=MPL-2.0
+RDEPEND=>=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) cli? ( python_targets_python3_8? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0=[threads(+),sqlite] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+),sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+),sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+),sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[threads(+),sqlite] )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-6.58.0.tar.gz -> hypothesis-6.58.0.gh.tar.gz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=576ea89cdacb1d979c5220c96e136d06
diff --git a/metadata/md5-cache/dev-python/numpy-1.23.5 b/metadata/md5-cache/dev-python/numpy-1.23.5
new file mode 100644
index 000000000000..b730aada9538
--- /dev/null
+++ b/metadata/md5-cache/dev-python/numpy-1.23.5
@@ -0,0 +1,17 @@
+BDEPEND=lapack? ( >=virtual/cblas-3.8 >=virtual/lapack-3.8 ) >=dev-python/cython-0.29.30[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] lapack? ( virtual/pkgconfig ) doc? ( app-arch/unzip ) test? ( >=dev-python/hypothesis-5.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytz-2019.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cffi-1.14.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( lapack? ( >=virtual/cblas-3.8 >=virtual/lapack-3.8 ) >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[threads(+)] ) >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] lapack? ( virtual/fortran )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=lapack? ( virtual/fortran )
+DESCRIPTION=Fast array and numerical python library
+EAPI=8
+HOMEPAGE=https://numpy.org/ https://github.com/numpy/numpy/ https://pypi.org/project/numpy/
+INHERIT=distutils-r1 flag-o-matic fortran-2 toolchain-funcs
+IUSE=doc lapack test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=BSD
+RDEPEND=lapack? ( >=virtual/cblas-3.8 >=virtual/lapack-3.8 ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[threads(+)] ) lapack? ( virtual/fortran )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/n/numpy/numpy-1.23.5.tar.gz doc? ( https://numpy.org/doc/1.23/numpy-html.zip -> numpy-html-1.23.5.zip https://numpy.org/doc/1.23/numpy-ref.pdf -> numpy-ref-1.23.5.pdf https://numpy.org/doc/1.23/numpy-user.pdf -> numpy-user-1.23.5.pdf )
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	flag-o-matic	29a755b1291d64133634d80b0328f153	fortran-2	72d28c6872beb1e7cb99684b0ae4715d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=a8acf3156bdc74432fa7ce88eb7e38e3
diff --git a/metadata/md5-cache/dev-python/pycairo-1.22.0 b/metadata/md5-cache/dev-python/pycairo-1.22.0
new file mode 100644
index 000000000000..65b0b16851ce
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pycairo-1.22.0
@@ -0,0 +1,17 @@
+BDEPEND=test? ( dev-python/hypothesis[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.0_beta4:3.11[threads(+)] >=dev-python/sphinx-4.5.0-r1[python_targets_python3_11(-)] dev-python/sphinx_rtd_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10[threads(+)] >=dev-python/sphinx-4.5.0-r1[python_targets_python3_10(-)] dev-python/sphinx_rtd_theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9[threads(+)] >=dev-python/sphinx-4.5.0-r1[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8[threads(+)] >=dev-python/sphinx-4.5.0-r1[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.9_p1:0[threads(+)] >=dev-python/sphinx-4.5.0-r1[python_targets_pypy3(-)] dev-python/sphinx_rtd_theme[python_targets_pypy3(-)] ) ) ) test? ( >=x11-libs/cairo-1.15.10[svg(+)] >=dev-python/pytest-7.1.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0=[threads(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[threads(+)] ) >=dev-python/setuptools-65.3.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=x11-libs/cairo-1.15.10[svg(+)]
+DESCRIPTION=Python bindings for the cairo library
+EAPI=8
+HOMEPAGE=https://www.cairographics.org/pycairo/ https://github.com/pygobject/pycairo/ https://pypi.org/project/pycairo/
+INHERIT=distutils-r1
+IUSE=examples doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+LICENSE=|| ( LGPL-2.1 MPL-1.1 )
+RDEPEND=>=x11-libs/cairo-1.15.10[svg(+)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0=[threads(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[threads(+)] )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/pygobject/pycairo/releases/download/v1.22.0/pycairo-1.22.0.tar.gz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=be9a71fd15b14e545a8d33b68857a4b0
diff --git a/metadata/md5-cache/dev-python/pylint-2.15.6 b/metadata/md5-cache/dev-python/pylint-2.15.6
new file mode 100644
index 000000000000..4efc9d1a5cee
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pylint-2.15.6
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/GitPython-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-timeout[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( <dev-python/astroid-2.14[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/astroid-2.12.12[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/dill-0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/isort-4.2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/isort-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/mccabe-0.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/mccabe-0.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/platformdirs-2.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomlkit-0.10.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( >=dev-python/tomli-1.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/tomli-1.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/tomli-1.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[threads(+)] ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python code static checker
+EAPI=8
+HOMEPAGE=https://pypi.org/project/pylint/ https://github.com/PyCQA/pylint/
+INHERIT=distutils-r1
+IUSE=examples test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=<dev-python/astroid-2.14[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/astroid-2.12.12[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/dill-0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/isort-4.2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/isort-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/mccabe-0.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/mccabe-0.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/platformdirs-2.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomlkit-0.10.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( >=dev-python/tomli-1.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/tomli-1.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/tomli-1.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[threads(+)] )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/pycqa/pylint/archive/v2.15.6.tar.gz -> pylint-2.15.6.gh.tar.gz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=97f7e54e591229e6166b460d63667b3e
diff --git a/metadata/md5-cache/dev-python/python-debian-0.1.49 b/metadata/md5-cache/dev-python/python-debian-0.1.49
new file mode 100644
index 000000000000..de1f0b249223
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-debian-0.1.49
@@ -0,0 +1,16 @@
+BDEPEND=test? ( app-arch/dpkg ) test? ( dev-python/chardet[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python modules to work with Debian-related data formats
+EAPI=8
+HOMEPAGE=https://salsa.debian.org/python-debian-team/python-debian/ https://pypi.org/project/python-debian/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2 GPL-3
+RDEPEND=dev-python/chardet[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://debian/pool/main/p/python-debian/python-debian_0.1.49.tar.xz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=c8690756231ce2d2a524ba510fd92d86
diff --git a/metadata/md5-cache/dev-python/pytools-2022.1.13 b/metadata/md5-cache/dev-python/pytools-2022.1.13
new file mode 100644
index 000000000000..67dd31bad543
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pytools-2022.1.13
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/numpy-1.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/platformdirs-2.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-python/typing-extensions-4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/typing-extensions-4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/typing-extensions-4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[sqlite] ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Collection of tools missing from the Python standard library
+EAPI=8
+HOMEPAGE=https://mathema.tician.de/software/pytools/ https://github.com/inducer/pytools/ https://pypi.org/project/pytools/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~ppc64
+LICENSE=MIT
+RDEPEND=>=dev-python/numpy-1.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/platformdirs-2.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-python/typing-extensions-4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/typing-extensions-4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/typing-extensions-4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[sqlite] )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/p/pytools/pytools-2022.1.13.tar.gz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=ccf3f9d4690abb489cf9ae8f8737da95
diff --git a/metadata/md5-cache/dev-python/rpyc-5.2.3_p1 b/metadata/md5-cache/dev-python/rpyc-5.2.3_p1
new file mode 100644
index 000000000000..4d64719469d9
--- /dev/null
+++ b/metadata/md5-cache/dev-python/rpyc-5.2.3_p1
@@ -0,0 +1,17 @@
+BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hatchling-1.8.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=numpy? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pandas[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) gdb? ( sys-devel/gdb ) dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DESCRIPTION=Remote Python Call (RPyC), a transparent and symmetric RPC library
+EAPI=8
+HOMEPAGE=https://rpyc.readthedocs.io/en/latest/ https://pypi.org/project/rpyc/ https://github.com/tomerfiliba-org/rpyc
+INHERIT=distutils-r1
+IUSE=test numpy gdb python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=numpy? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pandas[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) gdb? ( sys-devel/gdb ) dev-python/plumbum[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~grozin/rpyc-5.2.3_p1.tar.gz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=e2f3d6f13207d331d541df1839383828
diff --git a/metadata/md5-cache/dev-python/tempora-5.1.0 b/metadata/md5-cache/dev-python/tempora-5.1.0
new file mode 100644
index 000000000000..53eb3f7a39b9
--- /dev/null
+++ b/metadata/md5-cache/dev-python/tempora-5.1.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/freezegun[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-freezegun[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/jaraco-functools-1.20[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytz[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Objects and routines pertaining to date and time
+EAPI=8
+HOMEPAGE=https://github.com/jaraco/tempora
+INHERIT=distutils-r1
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 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=MIT
+RDEPEND=>=dev-python/jaraco-functools-1.20[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytz[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/t/tempora/tempora-5.1.0.tar.gz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=12665392a5623d4a510b66ab5faa787f
diff --git a/metadata/md5-cache/dev-python/terminaltables-3.1.10-r1 b/metadata/md5-cache/dev-python/terminaltables-3.1.10-r1
index 39a91a091e9e..6d72b56a9d30 100644
--- a/metadata/md5-cache/dev-python/terminaltables-3.1.10-r1
+++ b/metadata/md5-cache/dev-python/terminaltables-3.1.10-r1
@@ -1,16 +1,16 @@
-BDEPEND=test? ( dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorclass[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/termcolor[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/poetry-core-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=test? ( dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorclass[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/termcolor[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/poetry-core-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Generate simple tables in terminals from a nested list of strings
 EAPI=8
 HOMEPAGE=https://robpol86.github.io/terminaltables/
 INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 x86
 LICENSE=MIT
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/matthewdeanmartin/terminaltables/archive/v3.1.10.tar.gz -> terminaltables-3.1.10.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=9af6ee37eae87c2caae72c0875487d57
+_md5_=17d1d22afb121c188212728baa1e07fb
diff --git a/metadata/md5-cache/dev-python/terminaltables-9999 b/metadata/md5-cache/dev-python/terminaltables-9999
index 976282586f4f..42814ad51553 100644
--- a/metadata/md5-cache/dev-python/terminaltables-9999
+++ b/metadata/md5-cache/dev-python/terminaltables-9999
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorclass[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/termcolor[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/poetry-core-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=test? ( dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorclass[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/termcolor[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/poetry-core-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DESCRIPTION=Generate simple tables in terminals from a nested list of strings
 EAPI=8
 HOMEPAGE=https://robpol86.github.io/terminaltables/
 INHERIT=distutils-r1 git-r3
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 LICENSE=MIT
 PROPERTIES=live
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	git-r3	2347f8fe2d392b2a091191f94be37e6f	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=055a427c10ef8a8c118b5b3dd7e42e7a
+_md5_=bae17fe4247456f2f75ce37bef2e34f4
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index c584012aa918..7979fbc69014 100644
--- a/metadata/md5-cache/dev-util/Manifest.gz
+++ b/metadata/md5-cache/dev-util/Manifest.gz
diff --git a/metadata/md5-cache/dev-util/kbuild-0.1.9998.3499 b/metadata/md5-cache/dev-util/kbuild-0.1.9998.3499
index 5514d2c2c584..5b983a750f04 100644
--- a/metadata/md5-cache/dev-util/kbuild-0.1.9998.3499
+++ b/metadata/md5-cache/dev-util/kbuild-0.1.9998.3499
@@ -1,13 +1,12 @@
-BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+BDEPEND=sys-apps/texinfo sys-devel/flex sys-devel/gettext virtual/pkgconfig virtual/yacc sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile install prepare setup
-DEPEND=sys-apps/texinfo sys-devel/flex sys-devel/gettext virtual/pkgconfig || ( dev-util/byacc dev-util/yacc <sys-devel/bison-3.7 )
 DESCRIPTION=A makefile framework for writing simple makefiles for complex tasks
 EAPI=8
-HOMEPAGE=http://svn.netlabs.org/kbuild/wiki
+HOMEPAGE=https://trac.netlabs.org/kbuild/wiki
 INHERIT=autotools toolchain-funcs
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~polynomial-c/kbuild-0.1.9998.3499-src.tar.xz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=74b220df1c5cbf2f1437045e6c2d44c3
+_md5_=daa7c5c9f1a9972e78face69ffb03243
diff --git a/metadata/md5-cache/dev-util/kbuild-0.1.9998.3572 b/metadata/md5-cache/dev-util/kbuild-0.1.9998.3572
new file mode 100644
index 000000000000..e6f56858d285
--- /dev/null
+++ b/metadata/md5-cache/dev-util/kbuild-0.1.9998.3572
@@ -0,0 +1,11 @@
+BDEPEND=sys-apps/texinfo sys-devel/flex sys-devel/gettext virtual/pkgconfig virtual/yacc sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile install prepare setup
+DESCRIPTION=A makefile framework for writing simple makefiles for complex tasks
+EAPI=8
+HOMEPAGE=https://trac.netlabs.org/kbuild/wiki
+INHERIT=autotools toolchain-funcs
+LICENSE=GPL-3+
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~ceamac/dev-util/kbuild/kbuild-0.1.9998.3572-src.tar.xz
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=83b3c4a897b9d5ee1872412a1db37eb5
diff --git a/metadata/md5-cache/dev-util/kbuild-9999 b/metadata/md5-cache/dev-util/kbuild-9999
index 33e973fb7dd4..32197a274a8c 100644
--- a/metadata/md5-cache/dev-util/kbuild-9999
+++ b/metadata/md5-cache/dev-util/kbuild-9999
@@ -1,12 +1,11 @@
-BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 dev-vcs/subversion[http(+)] net-misc/rsync
+BDEPEND=sys-apps/texinfo sys-devel/flex sys-devel/gettext virtual/pkgconfig virtual/yacc sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 dev-vcs/subversion[http(+)] net-misc/rsync
 DEFINED_PHASES=compile install preinst prepare setup unpack
-DEPEND=sys-apps/texinfo sys-devel/flex sys-devel/gettext || ( dev-util/byacc dev-util/yacc <sys-devel/bison-3.7 )
 DESCRIPTION=A makefile framework for writing simple makefiles for complex tasks
-EAPI=7
-HOMEPAGE=http://svn.netlabs.org/kbuild/wiki
+EAPI=8
+HOMEPAGE=https://trac.netlabs.org/kbuild/wiki
 INHERIT=autotools toolchain-funcs subversion
 LICENSE=GPL-3+
 PROPERTIES=live
 SLOT=0
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	estack	055c42df72f76a4f45ec92b35e83cd56	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	subversion	dee31e56422214d05644c2a3c900a148	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=95508841fd7f15969e1bbf7edd098e43
+_md5_=93c8cc4ff1e6261fdb5f28fc1c5d6b08
diff --git a/metadata/md5-cache/dev-util/rebar-3.20.0 b/metadata/md5-cache/dev-util/rebar-3.20.0
index 459eab37cc1b..51f19eaf9983 100644
--- a/metadata/md5-cache/dev-util/rebar-3.20.0
+++ b/metadata/md5-cache/dev-util/rebar-3.20.0
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=3
 SRC_URI=https://github.com/erlang/rebar3/archive/refs/tags/3.20.0.tar.gz -> rebar-3.20.0.tar.gz test? ( https://repo.hex.pm/tarballs/meck-0.8.13.tar )
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=657d6fa6b4b46961bab40cadf5c55201
+_md5_=c4f56afe6c1bef9d5c76ff6e601e1a8b
diff --git a/metadata/md5-cache/games-arcade/Manifest.gz b/metadata/md5-cache/games-arcade/Manifest.gz
index 5feb9e7e309d..fc36c963521a 100644
--- a/metadata/md5-cache/games-arcade/Manifest.gz
+++ b/metadata/md5-cache/games-arcade/Manifest.gz
diff --git a/metadata/md5-cache/games-arcade/xbill-2.1-r6 b/metadata/md5-cache/games-arcade/xbill-2.1-r6
new file mode 100644
index 000000000000..24c924d5d6d9
--- /dev/null
+++ b/metadata/md5-cache/games-arcade/xbill-2.1-r6
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare
+DEPEND=acct-group/gamestat media-fonts/font-misc-misc x11-libs/libXaw
+DESCRIPTION=A game about an evil hacker called Bill!
+EAPI=8
+HOMEPAGE=http://www.xbill.org/
+INHERIT=autotools desktop
+KEYWORDS=~alpha ~amd64 ~x86
+LICENSE=GPL-1
+RDEPEND=acct-group/gamestat media-fonts/font-misc-misc x11-libs/libXaw
+SLOT=0
+SRC_URI=http://www.xbill.org/download/xbill-2.1.tar.gz https://dashboard.snapcraft.io/site_media/appmedia/2018/04/xbill.png
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	desktop	7eb20ad915a0a318176d51bc2508ff5c	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=06a84f43b8a21c25c25d664452c7a81a
diff --git a/metadata/md5-cache/net-irc/Manifest.gz b/metadata/md5-cache/net-irc/Manifest.gz
index bffce032d143..2c85bc481c44 100644
--- a/metadata/md5-cache/net-irc/Manifest.gz
+++ b/metadata/md5-cache/net-irc/Manifest.gz
diff --git a/metadata/md5-cache/net-irc/limnoria-20220427 b/metadata/md5-cache/net-irc/limnoria-20221116
index 292ded10146d..0daae3639d1d 100644
--- a/metadata/md5-cache/net-irc/limnoria-20220427
+++ b/metadata/md5-cache/net-irc/limnoria-20221116
@@ -7,10 +7,10 @@ INHERIT=distutils-r1
 IUSE=crypt ssl test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~riscv ~x86
 LICENSE=BSD GPL-2 GPL-2+
-RDEPEND=dev-python/chardet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ecdsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/feedparser[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/PySocks[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sqlalchemy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] crypt? ( dev-python/python-gnupg[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ssl? ( dev-python/pyopenssl[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) !net-irc/supybot !net-irc/supybot-plugins python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
+RDEPEND=dev-python/chardet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ecdsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/feedparser[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/PySocks[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sqlalchemy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] crypt? ( dev-python/python-gnupg[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ssl? ( dev-python/pyopenssl[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/ProgVal/Limnoria/archive/master-2022-04-27.tar.gz -> limnoria-20220427.tar.gz
+SRC_URI=https://github.com/ProgVal/Limnoria/archive/master-2022-11-16.tar.gz -> limnoria-20221116.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=5d3bd2cbe2f7602aee9f3fb32abd1b3a
+_md5_=3ba8c6dc8f87fed452ff77bc25d9e1e5
diff --git a/metadata/md5-cache/net-irc/limnoria-plugins-chantracker-1.6_p20220312 b/metadata/md5-cache/net-irc/limnoria-plugins-chantracker-1.6_p20221109
index 8c2ca8ff4be4..ac680600e856 100644
--- a/metadata/md5-cache/net-irc/limnoria-plugins-chantracker-1.6_p20220312
+++ b/metadata/md5-cache/net-irc/limnoria-plugins-chantracker-1.6_p20221109
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=net-irc/limnoria
 SLOT=0
-SRC_URI=https://github.com/ncoevoet/ChanTracker/archive/2c94abb49a08ea47ab718018dfcaeaf8bf569d5f.tar.gz -> limnoria-plugins-chantracker-1.6_p20220312.tar.gz
+SRC_URI=https://github.com/ncoevoet/ChanTracker/archive/e50ca6fe0d8a8b6beb38a8ec5e37e770188b7d9c.tar.gz -> limnoria-plugins-chantracker-1.6_p20221109.tar.gz
 _eclasses_=vcs-snapshot	eab6d8533446763c2e9777d8bbd1594e
-_md5_=a0efcda6bee37323362edba0641efc99
+_md5_=4c8886576e3c82f8f5cc10bda92f5aeb
diff --git a/metadata/md5-cache/net-irc/limnoria-plugins-jlu5-20200105_p20210703 b/metadata/md5-cache/net-irc/limnoria-plugins-jlu5-20220201_p20221108
index 8b45ff70cbd3..94cc7cd38803 100644
--- a/metadata/md5-cache/net-irc/limnoria-plugins-jlu5-20200105_p20210703
+++ b/metadata/md5-cache/net-irc/limnoria-plugins-jlu5-20220201_p20221108
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 ~riscv ~x86
 LICENSE=BSD GPL-2+
 RDEPEND=net-irc/limnoria dev-python/beautifulsoup4
 SLOT=0
-SRC_URI=https://github.com/jlu5/SupyPlugins/archive/7e959b9f24632d0fa9f587da6e1cde951397ae97.tar.gz -> limnoria-plugins-jlu5-20200105_p20210703.tar.gz
+SRC_URI=https://github.com/jlu5/SupyPlugins/archive/9f6e6bff96fa7c849123054cd656f6e4af2cec94.tar.gz -> limnoria-plugins-jlu5-20220201_p20221108.tar.gz
 _eclasses_=vcs-snapshot	eab6d8533446763c2e9777d8bbd1594e
-_md5_=0825ad03896a5ee44070ca9db18380aa
+_md5_=6888fb77e3cfdac47c7c03f25f442566
diff --git a/metadata/md5-cache/net-irc/limnoria-plugins-progval-20211212 b/metadata/md5-cache/net-irc/limnoria-plugins-progval-20221113
index f26a8bf3da54..3cff6fe11d5d 100644
--- a/metadata/md5-cache/net-irc/limnoria-plugins-progval-20211212
+++ b/metadata/md5-cache/net-irc/limnoria-plugins-progval-20221113
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 ~riscv ~x86
 LICENSE=BSD GPL-2 GPL-3 MIT
 RDEPEND=net-irc/limnoria
 SLOT=0
-SRC_URI=https://github.com/ProgVal/Supybot-plugins/archive/e6a46a7e7eda8df0e1861f1ae290152857b902b5.tar.gz -> limnoria-plugins-progval-20211212.tar.gz
+SRC_URI=https://github.com/ProgVal/Supybot-plugins/archive/938bde510ae40ca0e2c7d832f7156fba2f0fa7ec.tar.gz -> limnoria-plugins-progval-20221113.tar.gz
 _eclasses_=vcs-snapshot	eab6d8533446763c2e9777d8bbd1594e
-_md5_=5dd264229b4f51eff5580067c2a07399
+_md5_=7217db4544f026f7554b6f4a3afc4ea5
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index d7d660812dbe..ce51292e569b 100644
--- a/metadata/md5-cache/net-libs/Manifest.gz
+++ b/metadata/md5-cache/net-libs/Manifest.gz
diff --git a/metadata/md5-cache/net-libs/rest-0.9.1 b/metadata/md5-cache/net-libs/rest-0.9.1
index c738022e6b18..1d37f0284b30 100644
--- a/metadata/md5-cache/net-libs/rest-0.9.1
+++ b/metadata/md5-cache/net-libs/rest-0.9.1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://wiki.gnome.org/Projects/Librest
 INHERIT=gnome.org meson vala
 IUSE=gtk-doc +introspection test vala
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.44.0:2 >=net-libs/libsoup-2.99.2:3.0 dev-libs/json-glib:0[introspection?] dev-libs/libxml2:2 app-misc/ca-certificates introspection? ( >=dev-libs/gobject-introspection-1.74.0:= )
 REQUIRED_USE=gtk-doc? ( introspection ) vala? ( introspection )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=1.0
 SRC_URI=mirror://gnome/sources/rest/0.9/rest-0.9.1.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	vala	160a8a30a6cb9aa601e5441c643a7c61
-_md5_=da2617ee3381c34b3f98b4a49e94456f
+_md5_=3aba6dac19216c4094964b23913f4aa1
diff --git a/metadata/md5-cache/net-wireless/Manifest.gz b/metadata/md5-cache/net-wireless/Manifest.gz
index 32effe596a56..5477c6d0e3bc 100644
--- a/metadata/md5-cache/net-wireless/Manifest.gz
+++ b/metadata/md5-cache/net-wireless/Manifest.gz
diff --git a/metadata/md5-cache/net-wireless/gr-scopy-0.0_p20220602 b/metadata/md5-cache/net-wireless/gr-scopy-0.0_p20220602
new file mode 100644
index 000000000000..dcab5842ebee
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/gr-scopy-0.0_p20220602
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=net-wireless/gnuradio-3.9.0.0:=[analog] sci-libs/volk:=
+DESCRIPTION=Scopy IIO blocks for GNU Radio
+EAPI=8
+HOMEPAGE=https://github.com/analogdevicesinc/gr-scopy
+INHERIT=cmake python-single-r1
+IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=net-wireless/gnuradio-3.9.0.0:=[analog] sci-libs/volk:=
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+SLOT=0
+SRC_URI=https://github.com/analogdevicesinc/gr-scopy/archive/a69ccb22578621a69acc187fc0d006b5a030a744.tar.gz -> gr-scopy-0.0_p20220602.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=9dc5e5251f9414a15438ec85de9655e9
diff --git a/metadata/md5-cache/net-wireless/gr-scopy-9999 b/metadata/md5-cache/net-wireless/gr-scopy-9999
index 6dfcf2150f1b..5f3494fe6994 100644
--- a/metadata/md5-cache/net-wireless/gr-scopy-9999
+++ b/metadata/md5-cache/net-wireless/gr-scopy-9999
@@ -1,6 +1,6 @@
 BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) =net-wireless/gnuradio-3.8*:= sci-libs/volk:= dev-libs/log4cpp:=
+DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=net-wireless/gnuradio-3.9.0.0:=[analog] sci-libs/volk:=
 DESCRIPTION=Scopy IIO blocks for GNU Radio
 EAPI=8
 HOMEPAGE=https://github.com/analogdevicesinc/gr-scopy
@@ -8,8 +8,8 @@ INHERIT=cmake python-single-r1 git-r3
 IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 LICENSE=GPL-3+
 PROPERTIES=live
-RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) =net-wireless/gnuradio-3.8*:= sci-libs/volk:= dev-libs/log4cpp:=
+RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=net-wireless/gnuradio-3.9.0.0:=[analog] sci-libs/volk:=
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 SLOT=0
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	git-r3	2347f8fe2d392b2a091191f94be37e6f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=9a560f4bf454a5d928807dc9914f3e2a
+_md5_=9dc5e5251f9414a15438ec85de9655e9
diff --git a/metadata/md5-cache/sci-chemistry/Manifest.gz b/metadata/md5-cache/sci-chemistry/Manifest.gz
index 5df670fc1156..81056823a4b4 100644
--- a/metadata/md5-cache/sci-chemistry/Manifest.gz
+++ b/metadata/md5-cache/sci-chemistry/Manifest.gz
diff --git a/metadata/md5-cache/sci-chemistry/molmol-2k_p2-r6 b/metadata/md5-cache/sci-chemistry/molmol-2k_p2-r6
index 60232b5a2c25..21b3e779f004 100644
--- a/metadata/md5-cache/sci-chemistry/molmol-2k_p2-r6
+++ b/metadata/md5-cache/sci-chemistry/molmol-2k_p2-r6
@@ -1,13 +1,13 @@
 DEFINED_PHASES=install prepare setup
 DEPEND=|| ( ( media-libs/mesa[X(+)] x11-libs/libGLw ) media-libs/mesa[motif(-),X(+)] ) media-libs/libjpeg-turbo:= media-libs/libpng:0= media-libs/tiff:0 sys-libs/zlib virtual/glu x11-libs/libXpm x11-libs/motif:0 x11-apps/xdpyinfo
 DESCRIPTION=Publication-quality molecular visualization package
-EAPI=7
+EAPI=8
 HOMEPAGE=http://www.csb.yale.edu/userguides/graphics/molmol/molmol_descrip.html http://pjf.net/science/molmol.html
-INHERIT=desktop prefix toolchain-funcs
+INHERIT=desktop toolchain-funcs
 KEYWORDS=amd64 ~ppc x86 ~amd64-linux ~x86-linux
 LICENSE=molmol
 RDEPEND=|| ( ( media-libs/mesa[X(+)] x11-libs/libGLw ) media-libs/mesa[motif(-),X(+)] ) media-libs/libjpeg-turbo:= media-libs/libpng:0= media-libs/tiff:0 sys-libs/zlib virtual/glu x11-libs/libXpm x11-libs/motif:0 x11-apps/xdpyinfo
 SLOT=0
-SRC_URI=ftp://ftp.mol.biol.ethz.ch/software/MOLMOL/unix-gzip/molmol-2k.2.0-src.tar.gz ftp://ftp.mol.biol.ethz.ch/software/MOLMOL/unix-gzip/molmol-2k.2.0-doc.tar.gz https://dev.gentoo.org/~soap/distfiles/molmol-patches.tbz2 https://dev.gentoo.org/~pacho/molmol/molmol.png
-_eclasses_=desktop	7eb20ad915a0a318176d51bc2508ff5c	multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=cd9fd03de806899b158ccb02cfb9e411
+SRC_URI=ftp://ftp.mol.biol.ethz.ch/software/MOLMOL/unix-gzip/molmol-2k.2.0-src.tar.gz ftp://ftp.mol.biol.ethz.ch/software/MOLMOL/unix-gzip/molmol-2k.2.0-doc.tar.gz https://dev.gentoo.org/~soap/distfiles/molmol-patches.tbz2 https://dev.gentoo.org/~pacho/molmol/molmol_256.png
+_eclasses_=desktop	7eb20ad915a0a318176d51bc2508ff5c	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=947d8a522aa917102ae253685e7ac2b9
diff --git a/metadata/md5-cache/sci-electronics/Manifest.gz b/metadata/md5-cache/sci-electronics/Manifest.gz
index 73a76224fc9f..55d89e5b110d 100644
--- a/metadata/md5-cache/sci-electronics/Manifest.gz
+++ b/metadata/md5-cache/sci-electronics/Manifest.gz
diff --git a/metadata/md5-cache/sci-electronics/xnec2c-4.4.11 b/metadata/md5-cache/sci-electronics/xnec2c-4.4.11
deleted file mode 100644
index 66044d5d8476..000000000000
--- a/metadata/md5-cache/sci-electronics/xnec2c-4.4.11
+++ /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 >=sys-devel/libtool-2.4
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=dev-libs/glib:2 x11-libs/gtk+:3 sys-devel/gettext
-DESCRIPTION=A GTK+ graphical interactive version of nec2c
-EAPI=8
-HOMEPAGE=https://www.xnec2c.org
-INHERIT=autotools xdg-utils
-IUSE=doc examples
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2 x11-libs/gtk+:3
-SLOT=0
-SRC_URI=https://www.xnec2c.org/releases/xnec2c-v4.4.11.tar.gz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=ad5698c281e6ee25e8b48e7700befaeb
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index 58f58378dcb7..f550dd179295 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/pf-sources-6.0_p5 b/metadata/md5-cache/sys-kernel/pf-sources-6.0_p5
new file mode 100644
index 000000000000..51356e27001e
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/pf-sources-6.0_p5
@@ -0,0 +1,15 @@
+BDEPEND=!build? ( sys-apps/sed )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Linux kernel fork that includes the pf-kernel patchset and Gentoo's genpatches
+EAPI=8
+HOMEPAGE=https://codeberg.org/pf-kernel/linux/wiki/README https://dev.gentoo.org/~mpagano/genpatches/
+INHERIT=kernel-2 optfeature
+IUSE=symlink build
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=6.0_p5
+SRC_URI=https://codeberg.org/pf-kernel/linux/archive/v6.0-pf5.tar.gz -> linux-6.0-pf5.tar.gz https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-6.0-1.base.tar.xz https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-6.0-1.extras.tar.xz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	222472d400d477278b203edbf50c3b98	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=5efebbcec7b9ad7645decc7fcd5fc620
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index 6075b13a1d12..49be3bf143cd 100644
--- a/metadata/md5-cache/sys-libs/Manifest.gz
+++ b/metadata/md5-cache/sys-libs/Manifest.gz
diff --git a/metadata/md5-cache/sys-libs/fortify-headers-0.7 b/metadata/md5-cache/sys-libs/fortify-headers-0.7
deleted file mode 100644
index 66af0a65381c..000000000000
--- a/metadata/md5-cache/sys-libs/fortify-headers-0.7
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=A standalone implementation of fortify source
-EAPI=7
-HOMEPAGE=http://git.2f30.org/fortify-headers/
-KEYWORDS=~amd64 ~arm ~mips ~ppc ~x86
-LICENSE=ISC
-SLOT=0
-SRC_URI=https://dl.2f30.org/releases/fortify-headers-0.7.tar.gz
-_md5_=bcc19332786a5f2489f9211d2224021d
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 3376cdaa4693..c2341ff72a4a 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 14242 BLAKE2B 0b13e07c0ca6808e9c7be85e35e3626d23fb1edd8d346aa34174e8a381746d4e0f7912ec2d9e56b2d4902ad8f96df1d0254cb4a06e557821467698c6e21ff2dc SHA512 d20534cff591c706bc93a22aa0eaec857a25d9b1f2bef947d8f1649aabc1ad076864e257f96ed26e8b8a505641dba77565f5f275310a46ae6fc904842f6368b3
-TIMESTAMP 2022-11-20T06:10:04Z
+TIMESTAMP 2022-11-20T12:10:01Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmN5xLxfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmN6GRlfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klA0qg//aOlMDAVte+4L1YQ+VnpWZQj8xhKaAl7YUnP95z2a4IRZxYrrzzI1qstR
-/FRoNqn+P0mipp+ciygAKFkbymvMZrJ10a1aQKZ8Afi9bJw16PPA5WW6kCh/0Kuc
-C1p04f5EeHCc03fnvG0REzgVRH3iW8o30xy8fnPSDty1vzzFAReF6HUPV4RPmTXL
-kdVFR4DOze72t6Qtk0GfdQ4luvpBP7/lhYN7dk/hBbVHbfc/yjWvu/Gq4lRsHAg9
-Ftu+fO8sCFilpZhecV5naJlUYqVEwyKCXU9IZB8yuGMwuvQ7KL4z9hP1uTG4fN0w
-HrZRnLTPvMYGJjvtstVfrirVVFIsFgmYS/qwGZIGck04j+22gopv+ApvJEzrqoKY
-mfPm57ir0H1uziX/7vqEzyT/sxdPt6lFk8UXekPRmWpuDIgt1tvc27PO6HE80wNs
-a8MnaNcc+OENtXNKi9jjjVUqAnDixI9C3BeTHJiiWS293nViHWirqHmRitUJQRQa
-4Ark8weoNsJi31UzbUwjA4ZKBXOHkduiVzSa6v4lme4cwEb+tE8lSR3Sl42aXrlP
-pRhKcdMTCH4IdtqBn6oOjMSl8ncbpUj/nt8wLIegFu3wh2ptFyDitWjDC/OgNCHV
-+Z3PWNMeKGm1YZ9L7CTmrvThBokJigw+NIB8ZgbRaYK/dhctyGw=
-=Zm1G
+klCjcg/8CecxZp+lkz4TJ/IikrUVWYjiy/MJo8mwP/TRlEu5hB+50mvWC3usTkyO
+ra62vdyrs/xdZz9f0etUPS+KZZZyzHNBnTWrsng2S/C8MuIKwkOSB5IgXzHTVJEB
+DPrXia5ULJU3tH3kJSrRv4RCojpXn3WSqNOap/vjePjD40GTrK8KMQSQMMuuTKzL
+OXkSKbqvy92c8dSG5ZMeQ5uDk1i12WatlNeu536rAJfWYXF8Xc3T3mRDXFq5tT+b
+Zv6SeTjaXFLIvqMYMFuE0HrG5PgJ+csyNMfrIldNouws8FOOfZIO4ciJI3HXvGK8
+EvxYiYCfkPsgyTbGE88X2cP7j6kTEsXwvmtXcelRSgLnWt2nee9MQCleWFcgLHI/
+MLyE9yffTsL3R3glSHO/4Eh/aVPYiXi1oGn7Nik+dekxGvjrhpSs5XN6HkusF/kw
+cl0NsKGfZTRv8SB0RgelETWyiY7GIZvTYp0bm7I4kf1FtYQ9Fw0imfCGbFx/In2t
+I9Qf1uKjGsdDM+J4W1tp+AEXx34RGSjfsmzZjsR01wz55h2uBN7oYE5gyeWfG3xf
+3EP8tR83wUe5HsGvxeIuKYfPd+BKLTg+wL8ejP9I6Nffd/zQpPk1Ke2ZmmvgS0qW
+NxBMa8VRlSaSYDyWvNoW1GHn/cNoQuyz96BM1QO/DqscnbF7DiI=
+=hFiN
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index d6171594f80d..4d7aeaaf691e 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sun, 20 Nov 2022 06:10:01 +0000
+Sun, 20 Nov 2022 12:09:58 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 80369c3d14e4..aab3c2817e95 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sun Nov 20 06:10:01 AM UTC 2022
+Sun Nov 20 12:09:58 PM UTC 2022
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index ed7174e89822..110b144cb5b9 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sun, 20 Nov 2022 06:15:01 +0000
+Sun, 20 Nov 2022 12:15:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 6f85dd886247..ac869af676e7 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-a963bbeb3cc264631096f43f6f6120a02d069f98 1668919948 2022-11-20T04:52:28+00:00
+503f91f1a20cf2ac4c4f16f875cd07d8080cbfff 1668942487 2022-11-20T11:08:07+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index b3d1ea2a6b71..926b19a52227 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1668924601 Sun 20 Nov 2022 06:10:01 AM UTC
+1668946201 Sun 20 Nov 2022 12:10:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index d6171594f80d..4d7aeaaf691e 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Sun, 20 Nov 2022 06:10:01 +0000
+Sun, 20 Nov 2022 12:09:58 +0000
diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index 36ff8e7b9c62..fc5d4f66a640 100644
--- a/net-irc/Manifest.gz
+++ b/net-irc/Manifest.gz
diff --git a/net-irc/limnoria-plugins-chantracker/Manifest b/net-irc/limnoria-plugins-chantracker/Manifest
index 8b40d03b0852..d44c5e86f29a 100644
--- a/net-irc/limnoria-plugins-chantracker/Manifest
+++ b/net-irc/limnoria-plugins-chantracker/Manifest
@@ -1,7 +1,7 @@
-DIST limnoria-plugins-chantracker-1.6_p20220312.tar.gz 52441 BLAKE2B 539038581ed988fc64216171d293271a811561903d23badcef36124d5ee80e26e1f67ff7d0e36e463aac92bc2442bc28766116bc9f92e5f86d8e14728180e192 SHA512 9e9cee65e3d19bab2c5079348bfbd598ecc71d3d8cc11bbcf76b79f39a14c9171c2a0a5e5ea7cf5550e9ab082ab6d764205f44e47bd1ea596d81ace68ca26075
 DIST limnoria-plugins-chantracker-1.6_p20220429.tar.gz 52444 BLAKE2B cbd4187b1b288402b45680a8a7ae080028e68d8409d01ef7c53ad99aae1c94336701a98fe66de29261cb12472ebc9102e31d2862c3da872fe9f55fd40b61cb0b SHA512 ff59e7f42c8fccc2214496e884ae8ef931b8e77839d898fb23fd2551bb91d1865134047fda9001892cd29b892ca4af6b959015d7e763bbeedaf7d13382af1113
 DIST limnoria-plugins-chantracker-1.6_p20220803.tar.gz 52514 BLAKE2B c6053e0c00b41ab7defeadd14bb2c740b33e51a5a2712d69a7867876c0563261444c934f6c3d58c0dab67ed2ce9839e1a3835f15ca9e744ff1468e543ecd3bc2 SHA512 d3ef76404c136c65251503418acbf9e8f9cf6125ea39e2845ccd4b8ce56faef936d5a4d780ae9aedb82b215cd4f3fa88dc51b9f8880b2fd1b9d05fe718646dad
-EBUILD limnoria-plugins-chantracker-1.6_p20220312.ebuild 1027 BLAKE2B c7624e161ad947486a5037a1f76ec24daacf271d2c4f95a89504dd977abad6053518b9f93584fcb9ed687be4fead1222b3ec0d99a738cc8693ebf2f00f17aa77 SHA512 1968064e467ed0529222cb8ea18c2b153b5c78ebbabba6cdc6b77999bde606f798a761b191655e29a0ef4c3f36b112da1024eb88128ff617bbec93ed25246c41
+DIST limnoria-plugins-chantracker-1.6_p20221109.tar.gz 52828 BLAKE2B 565464aa82e08d2c674dfc247863149b6a1bf667062306ba7cac564e797d94b72777b97c3fe60d0e612c4be052794103569f6b67e8678728a15417f9ce7655f8 SHA512 2e30e7edaeaa99382f8067c3632ae5bface9738d19223e752089ef9c8b16c3bd51f003d9c0206065b794e57cdc12728d018632b9a035183b69b4d8c532739804
 EBUILD limnoria-plugins-chantracker-1.6_p20220429.ebuild 1027 BLAKE2B 01bfb413516c2cae185c5f2efd49907dea0ec7d9c402c05f0e2e6b71dbc905927d136d5640ce3de38a018d64215a32ccf35031459397d5cd11a510e38eabdaa8 SHA512 8786a84f1d0db9f82f6b41fd919feb780dd84841b788885d5834977e1208db8cfd5bbe0aedc589c7aee2bea73c4df91bed35f5ca5aea473d5ead484c2789343d
 EBUILD limnoria-plugins-chantracker-1.6_p20220803.ebuild 1027 BLAKE2B 25f98428a11d37b5ab76d173d787b596e8554de5ee5da19e5c28619156363e252fcb8597649ab6a3f9c0c344b53667d721798bf62f75fac9507475b2bbaa7283 SHA512 c7f1999e69406c872fe0977c3b3010765ada473371bec97d2e03c0978c1f4ecdf97ce9d39575516e1a5e3599f5076e164aebb5a7f8b80c2114329a4e57bf410f
+EBUILD limnoria-plugins-chantracker-1.6_p20221109.ebuild 1027 BLAKE2B 6615759a664a4063d2d2316b3f22c72faa826f0fe4ca226baba618bf37a5a0bfc057466c18cc09ba5409133f0e672d9e0f523b6d0d2d4453e326ea0e2d68703a SHA512 b503898140ea641df80c915d757b9ed4e6197c966a915e12bbebd314c7a098d0582ba21445932c57eff801047012e35e8a91b66cb9b4d84cf17b3bdc4d08bdd8
 MISC metadata.xml 420 BLAKE2B 1a5976edab4e57dceef38076927cef9967fbe468237cdbfc83a5788a3dacd22890d02cbcf244eccd7c7cd370de3051340ab53c16a6df31eecce83105a1a2722f SHA512 cefb9ea55a31bae3c844b41d455e679d37e67b693cad0bb0173676bd1fb0684b4da05f2a6fc54bd6874f48f686f9c6e77a4aeb69ef8b8b866b40de3480b1b8da
diff --git a/net-irc/limnoria-plugins-chantracker/limnoria-plugins-chantracker-1.6_p20220312.ebuild b/net-irc/limnoria-plugins-chantracker/limnoria-plugins-chantracker-1.6_p20221109.ebuild
index 3af0db47e4ff..95fc75da97cd 100644
--- a/net-irc/limnoria-plugins-chantracker/limnoria-plugins-chantracker-1.6_p20220312.ebuild
+++ b/net-irc/limnoria-plugins-chantracker/limnoria-plugins-chantracker-1.6_p20221109.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit vcs-snapshot
 
-COMMIT="2c94abb49a08ea47ab718018dfcaeaf8bf569d5f"
+COMMIT="e50ca6fe0d8a8b6beb38a8ec5e37e770188b7d9c"
 
 DESCRIPTION="supybot ban management and channel flood/spam/repeat protections plugin"
 HOMEPAGE="https://github.com/ncoevoet/ChanTracker"
diff --git a/net-irc/limnoria-plugins-jlu5/Manifest b/net-irc/limnoria-plugins-jlu5/Manifest
index 66185a537f03..ccea00fc7e22 100644
--- a/net-irc/limnoria-plugins-jlu5/Manifest
+++ b/net-irc/limnoria-plugins-jlu5/Manifest
@@ -1,7 +1,7 @@
-DIST limnoria-plugins-jlu5-20200105_p20210703.tar.gz 98161 BLAKE2B 939f91bc4deff6bdd31b2c8897e6842a07f4e93c61b9b63b5753e13f85791ce907583664955fe0e471cbe567b6f1ba909ad4579984e41bd7d0de8f47b6dac781 SHA512 5e3608449eaccc0a6559107d1e5bc2279026d3ff0c2df60e3f06f3b7bec72dd779f385ffa91b4a5b0c6d051871c23f8c62744b91423c6b30e0935d2dcaa061b0
 DIST limnoria-plugins-jlu5-20210801.tar.gz 98414 BLAKE2B 6ad5bb32171fd9169cf5e31c7f360e95f5450445eef36e0274a49ce175f80fd8b4f629482dfd8b7adf93de847597548d75ffb61418077de6df9f09399b0c0960 SHA512 bd5aa8ece48064b7783d72a40595dee3fd78c7305d1b1d52e3c37b13476a28f6234d2ed0773ea9566e47d1454d7d6daa66fb16b1c5e1f0d5b81a305bff39eaac
 DIST limnoria-plugins-jlu5-20220201.tar.gz 93602 BLAKE2B 6585c459081314c93565b381c3a8ba90c53acb08cd72f690a4f46069c87edefcdc2fd5a60bd7b76239da92edcc490784bbc2f0e8ae67c6c564fcec0229b2e7e0 SHA512 1386654f182131b1f2c6acb495f1fdd7ab67970bfae0366cf73f5eddc7fcfb4e019ab0e7347f32f71f1f4d3369bb33b9237fbd01cb27e5ced71fe69c4c0e520f
-EBUILD limnoria-plugins-jlu5-20200105_p20210703.ebuild 1038 BLAKE2B ac97663735f35e2c03a6f4718b998ce7edad83ee8430b36aa0c98bbc775f90320517c9043bab8c2c1afc4a2ee85886e60928b513ddca656754b802dd0bbcbb56 SHA512 0cb581e88178803e2576f1a91350e37ceddac0853ad401080842e4a2cfbad7d2cae7f275293d42480e8d55ebf6eef649da85ac7dc565137564c1243309998b57
+DIST limnoria-plugins-jlu5-20220201_p20221108.tar.gz 102622 BLAKE2B 15e56e1523907c242ceda1effc3d2b788dc1fb4a266e7d70d8da052e2bda613d271ab8b379e7a86d42d5a2094f37d4d71cc64251696e751c19e674c782829c0c SHA512 73564d3a76a5fed0f0b70952f2091ec992d771bdbfe0749e0c7dfef35eb8463aa55ba8f33c36b044541c045d259081680ec2dea6dfd27de6b542896691103cb1
 EBUILD limnoria-plugins-jlu5-20210801.ebuild 1035 BLAKE2B 33844d8d1a3b8bce28fc90b391eee16792b2fdae1969c52e6b384d592d7a0b3b426516ef58943d3e1ac561ecdb596f1d533bea0d002bd0fa4a65096324128064 SHA512 0fc6b9c3adb1972d10a7612987cb6d6975ea438c79fdb06db52ff6ef7bd5701ff91e7aa57cd26a223282223ad1837f6446ee8a671981dd8313cde1becf401032
 EBUILD limnoria-plugins-jlu5-20220201.ebuild 1035 BLAKE2B 6350581a484f146c5028b1131fe4b395eb9422e900647051f66ec3cfa4be964a0e4155f874e21ea66c58e5f2866de397eae492ed88d82ab69e0093c58f14cd54 SHA512 d0bb80f1ca502b6c9ab59d17d3ebedc3374cb3135f78263e365b4a8c7e65208ce0471fbda3ec0967a427c358166407305ecb5e82aa19a2f3acc4d0235e8df463
+EBUILD limnoria-plugins-jlu5-20220201_p20221108.ebuild 1076 BLAKE2B 861bfc12fe216ade10b24ae74e6058d15b2a4fa8dea409c708d1c482ecf2096ab1fac90f77e30efc3befd244850fa77a2bb5d18db408f6b3f1574b71b515798c SHA512 4104dd39f668209f058dbe45de0db5cda5a6a7bc5867051373d341058568eb58048a4fc1154b4218c67e280fa3f2a8a293c80b995255d9c6bcf88dea793e2e35
 MISC metadata.xml 412 BLAKE2B 08533a6226538090f9c9c51f9096a016a19ee0f868cd8c0690bb790c41a384a487e954684343dd102a963d7e70f0e7512298a282b0ab9e886c61da0bc5fe0cf2 SHA512 aa8f2d38d6912e64bb8b5f7f301d9e6c7536c5ab6a4f537f74aedd897a4f9513fa88ab58365f483a36cc89025f50ac0604ae085e59777f34a68cd9458f6cd467
diff --git a/net-irc/limnoria-plugins-jlu5/limnoria-plugins-jlu5-20200105_p20210703.ebuild b/net-irc/limnoria-plugins-jlu5/limnoria-plugins-jlu5-20220201_p20221108.ebuild
index 247698fd431c..7cbb40b0749a 100644
--- a/net-irc/limnoria-plugins-jlu5/limnoria-plugins-jlu5-20200105_p20210703.ebuild
+++ b/net-irc/limnoria-plugins-jlu5/limnoria-plugins-jlu5-20220201_p20221108.ebuild
@@ -1,11 +1,12 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 inherit vcs-snapshot
 
-COMMIT="7e959b9f24632d0fa9f587da6e1cde951397ae97"
+MY_PV="${PV:0:4}.${PV:4:2}.${PV:6:2}"
+COMMIT="9f6e6bff96fa7c849123054cd656f6e4af2cec94"
 
 DESCRIPTION="A collection of plugins for the Limnoria IRC bot"
 HOMEPAGE="https://github.com/jlu5/SupyPlugins"
diff --git a/net-irc/limnoria-plugins-progval/Manifest b/net-irc/limnoria-plugins-progval/Manifest
index 1cfeae8792f9..d14d235827e0 100644
--- a/net-irc/limnoria-plugins-progval/Manifest
+++ b/net-irc/limnoria-plugins-progval/Manifest
@@ -1,7 +1,7 @@
-DIST limnoria-plugins-progval-20211212.tar.gz 4947598 BLAKE2B fa944d5f6c08918a65b518de5eb75fcd0c84adf63923f06310da18a31d87efcca59eff23c402543f3216e6fa0122956615264a744072bf870b3d1b2bcf155e9f SHA512 770da93037d331103c12a17cded7d62028d6212888c9edf51ad462f907b882aaaabb5322bdb443fc0e45a411302e145c96915f9226d20e863350c17a80b56d0b
 DIST limnoria-plugins-progval-20220205.tar.gz 4950629 BLAKE2B 242dd75aca7aa6af8ebcff9f6f13965986669819129cb30ffa46c4026680e6951ae92d646aeb9506a6031f08975df98110276e2aa69ec2bc4831a474ac1f3010 SHA512 4b405a3d845761592abcff16a0c7b0ef8820921cb9c02ac7cfe3db695b535503ba63ce9945bc396b238c74e36c2a8b3f004eefe945a33af8fc91e1c740b2897a
 DIST limnoria-plugins-progval-20220513.tar.gz 4951977 BLAKE2B e7acf8b023035cf74465287441ee8825ef6cfcbbd2279bfde8a8014ab0f29b21b381d991e1948558a1722897f2a16f2aca1942fbd118f74609c00ccf489f7540 SHA512 166967f6562946a1ee7c06a21788d7b806f1f9a56c0666dc1d515e894474dfd0da1cbb07259198410b07298ae992a3f352953f938aa850fbb9cb8da361dd58ed
-EBUILD limnoria-plugins-progval-20211212.ebuild 1048 BLAKE2B 241dd5d604b6b2bceff80b1b5bd88ccf6972a0fef730e9d17684260da348ba928ae6c4bfca93d3e17f3d5fa1a1296a165e8467d78eb73ba7f0e49cc1488606d2 SHA512 d20348e2eb3555d4a539a53f84613b47c44372b5febfa2e595973d4f5f65629c844b717bb45f985eca19f4fed9f441e9c7aabff3804889575789b3ef6d933eec
+DIST limnoria-plugins-progval-20221113.tar.gz 4952558 BLAKE2B 58c1fa35936a1a5961149f950b0d6e3f0f745f029cd02f3efc26ab6f7dffb836cee89374e09aaa91681b9ab3d8dbdd145cf52c273723acd15adacccb44a413fa SHA512 d1f46748c9efc7642347b6de55c3a3e8f506727815a706375e81f7cc9a8f4d906ddcbf52021049dd86399be7fb4d23d6fa37972dc33f72753b2588069b0bf687
 EBUILD limnoria-plugins-progval-20220205.ebuild 1048 BLAKE2B 357496b6b7e1410497116576b4140b22177e4fd8246a4b48b2d17882daa78217948ed7a988294e204fd14ab0fe4abd6a92f7691102a495a4661abe8dfa340b79 SHA512 5b4dda09369024f1717da186c4c3af3b40cb8e158da90ce88156298c35d84045e6a5a6fe2779c736959b83fbc005341d5819567c5f0d8b33471d52f4154898c5
 EBUILD limnoria-plugins-progval-20220513.ebuild 1048 BLAKE2B 6d17d3b76464796f48e78f9aca06ab4e35b1292c27db46851e59182b234b2ae847c0d2a7346ae19c9387d111748bd134699eb1fd9a5648e84d2ad14ba031487c SHA512 1e5b86e7dce088f5bafbe59132697066125f64d4419be7221d06358eb745abe78b7085698d5733a7f5bfbb2fa2e24bb9b097002ec5bd433bf7ed5f55327cf7b9
+EBUILD limnoria-plugins-progval-20221113.ebuild 1048 BLAKE2B 2b16af86185fc6d7662855af21c204e785fa06a859888c8bdebce2dc353a68203a1111796705056704684489aacf6e802ffb2a34387c2265a7559a4ac0108d75 SHA512 a7d30c8fcbb1ba2b8e1bad7a1b5d4a18827b2198300696a9697e034354a29e837a95626accf443ae151530ebe221a558547b405410ed94f9939e62e0df280952
 MISC metadata.xml 426 BLAKE2B a578b12eff0872427f4b3f8e3daeb729502db09f66ac4358a5a6d69d4f3764d9dae775d2cc3560572e8a503c308d646b69e690352257feb9bc9c39a9b183324d SHA512 6c978847187059655b25f7bc13301553f6cc4625e413fd045ceb06458b5019faa94ca1d5d842f712742d95aea64c4bb426b8551216e5418e27225aa3943ebe59
diff --git a/net-irc/limnoria-plugins-progval/limnoria-plugins-progval-20211212.ebuild b/net-irc/limnoria-plugins-progval/limnoria-plugins-progval-20221113.ebuild
index 76efbd11df13..ce1a80de8c45 100644
--- a/net-irc/limnoria-plugins-progval/limnoria-plugins-progval-20211212.ebuild
+++ b/net-irc/limnoria-plugins-progval/limnoria-plugins-progval-20221113.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 inherit vcs-snapshot
 
-COMMIT="e6a46a7e7eda8df0e1861f1ae290152857b902b5"
+COMMIT="938bde510ae40ca0e2c7d832f7156fba2f0fa7ec"
 
 DESCRIPTION="Collection of plugins for Supybot/Limnoria I wrote or forked"
 HOMEPAGE="https://github.com/ProgVal/Supybot-plugins"
diff --git a/net-irc/limnoria/Manifest b/net-irc/limnoria/Manifest
index e82265b1108f..6d313730efd8 100644
--- a/net-irc/limnoria/Manifest
+++ b/net-irc/limnoria/Manifest
@@ -1,8 +1,8 @@
-DIST limnoria-20220427.tar.gz 1119981 BLAKE2B 3346d0576c1928cf074198afa2b2b613bc9672ea68d5f395e691f97b7aaac989a5ee8f388d41d9e767eea0c495974b066b8fc2a9a0bf3a7aa9db8c52bcabcec1 SHA512 d4f617cec32ebfc67c738b542a55d2a1cd92a287a107dc84d516a1431abe0e4f440fa7b4f2a4b7fce18f24582cfdcb2ad2ed66ff2779e6a64ba7788840c1adf3
 DIST limnoria-20220814.tar.gz 1124320 BLAKE2B f2c32a444726d7e25560a7408c11c4c9d4536823eda2e4eb7b57b880f5d3aaf5c6e560d6b912c2e4b35b04e6d4f767f66aa5bd2411b9820644bef3372a34deb6 SHA512 7a7e73c9c4583310dbe0032e2b058977c102d01f7b9bea03c505153cbc45dadb88087186c036e05b1d07c7361d3e2d077a669a857241152a6726245b8b424317
 DIST limnoria-20220927.tar.gz 1125411 BLAKE2B f10c112c59e74ad018291df770ad9ae8829f90cb57125e7be066964e9987a069ff778dc8c3e562fe2f04627c173d611f6089975d0b44c47b72a9c41fcb429983 SHA512 9e8d57c34d1ff23e1772be618d9f9a8fae909200d3002ea97a95a5ba6545781d68194c4c796fa7f8683a0f3a267566ade01dd74f26110e7e0febef8ff739d88a
-EBUILD limnoria-20220427.ebuild 2433 BLAKE2B 2eef2bdd543796cd12faad25cd43875bd0d3a6c7c1153c9d11795b6a5d8d51c0b136d0347d53ea5b2380d09508a0d18155dd64306417ee002731d356df4dc9ca SHA512 83fc85d52c89521ab53c02706ab53db214148b7d1da197d2b87b81eea35539ca749a2bd333dcf21b480121aff54a061d0368c866a1c38cd4780fa7f8d5a781f9
+DIST limnoria-20221116.tar.gz 1125332 BLAKE2B b5007cb832ea98f41ad9513554177eab2cf7948b363c4cfad538a7e4c4f91390625bbf187e046118551da2fbe8272968acb1280b8d4ea19ffe2ac67b2b83af92 SHA512 3c26a36b7094d2a36397d7d0cfbb9b9503b6beaec123c6022146a5c241e5cc2ff70c56ad4064269b315d2f5c07e9e09853f27b251b35d3efc3065c4831742e2c
 EBUILD limnoria-20220814.ebuild 2389 BLAKE2B eb2c82070b7d5b181786ba17a7b2e19bb4836270b30fea97920c195adfbdc00660609a9346d0790b8b63ad7cfb1dcecf82e81bce01c512db4b3d08cd24b10897 SHA512 f72b1587d2e72e5ad5596661eab27aaa154688b7ab84fdb15fda3132c9cc791442a1a97c23d29d39f4b803eeb4c08de42414736e193156c9c9f0b87b1abad7a3
 EBUILD limnoria-20220927.ebuild 2389 BLAKE2B eb2c82070b7d5b181786ba17a7b2e19bb4836270b30fea97920c195adfbdc00660609a9346d0790b8b63ad7cfb1dcecf82e81bce01c512db4b3d08cd24b10897 SHA512 f72b1587d2e72e5ad5596661eab27aaa154688b7ab84fdb15fda3132c9cc791442a1a97c23d29d39f4b803eeb4c08de42414736e193156c9c9f0b87b1abad7a3
+EBUILD limnoria-20221116.ebuild 2389 BLAKE2B eb2c82070b7d5b181786ba17a7b2e19bb4836270b30fea97920c195adfbdc00660609a9346d0790b8b63ad7cfb1dcecf82e81bce01c512db4b3d08cd24b10897 SHA512 f72b1587d2e72e5ad5596661eab27aaa154688b7ab84fdb15fda3132c9cc791442a1a97c23d29d39f4b803eeb4c08de42414736e193156c9c9f0b87b1abad7a3
 EBUILD limnoria-99999999.ebuild 2411 BLAKE2B b46e0b57921b11eb31f746c7c88cf28f67dc96527a001271179d662900e8d4790f14438bd051997ad57dbb27b55013e09207082251eb0569fd383701251a46fa SHA512 7fbe0ae0db60c2b42bdf5ba4de49a0e689352b189600fa5c44c3faec8a898a283ffc11fdaaf49bfe86cc891beb5927b3012dd6e413fed96e6e24c326c45ea599
 MISC metadata.xml 428 BLAKE2B b5671a9d1bad38c23e299fbe21b84e74c6f2d7e99bcfd061d1a74ba9820bd361892fe75518c8f28f89433aa44e7db26e71a7538aad5f391bee801ad341991525 SHA512 d97770c2b4c2b80584d88d7f701e054b103170da71cb65494d42454005204d39b2b052ecefdefe08ac3f4e4e5e148be58a4d509a569e33325bf3c90e1027f875
diff --git a/net-irc/limnoria/limnoria-20220427.ebuild b/net-irc/limnoria/limnoria-20221116.ebuild
index 22a8760bc6c4..c54f729af75e 100644
--- a/net-irc/limnoria/limnoria-20220427.ebuild
+++ b/net-irc/limnoria/limnoria-20221116.ebuild
@@ -38,9 +38,7 @@ RDEPEND="
 	dev-python/PySocks[${PYTHON_USEDEP}]
 	dev-python/sqlalchemy[${PYTHON_USEDEP}]
 	crypt? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )
-	ssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] )
-	!net-irc/supybot
-	!net-irc/supybot-plugins"
+	ssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] )"
 BDEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}] )"
 
 python_prepare_all() {
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 3a63f8770353..5bb8255325d0 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/rest/Manifest b/net-libs/rest/Manifest
index e04a54be5125..fe9a430ff78d 100644
--- a/net-libs/rest/Manifest
+++ b/net-libs/rest/Manifest
@@ -1,5 +1,5 @@
 DIST rest-0.8.1.tar.xz 333376 BLAKE2B 595576f29ebe35121b7a896086abd3411ac3b2d324d2e50d646274c4060cfaffbd3b701eaae80afdc60d52c77bb5076135064648536378f2562f27c79c5738b7 SHA512 824a341db3827e4360abe03e33735918c68913c70d797699ef74271080a1985872006ec70fd994dc8fa3fbfef417e6fe979883c11286512d0ce623b8368e40c3
 DIST rest-0.9.1.tar.xz 71136 BLAKE2B 696a43db8a05d90cd2cb86cb2ffe22a817c7b0565c1e90e2508b0dffd3824fa46afef78c039d8911dc50f93c0afe1efbc783676c677b71bb7a2b5ad9ac5a1a26 SHA512 7fb219f571aec2b8d09d71e257e2b230bfb5c862e7e425fd540c96f6e2a22457df7d3df32838d71beec00ba54c7adbd0301d744bb0497c46b3a1413949304462
 EBUILD rest-0.8.1-r1.ebuild 1483 BLAKE2B fd647f2cc7b7e945644118a38d98035373188fc2839bda61e4ef72d484731be4179e48c7b043240b7e529597165ab29c38e06c18f1153cf2a2bc3b3a32998504 SHA512 d6035981ef8410bb5b593606d567b2ea4c837941e8b3ad32cb8cf7b283d4be055cdb4d0ad40a7e7b26aa464cbdff8c868cbf1aeadae4f17ba6a0ef4b9df20c6e
-EBUILD rest-0.9.1.ebuild 1353 BLAKE2B 6f4f00670ce909d731938a4d5b499cf8b0a382d8ad340d80602ca11b8d55b75a0e5d79735c1966b65675ad65a2e652c9d34f9026af7f9764c6542d7c0d96e9c2 SHA512 4787543a387ca1d2ed67f035b2746a7103cef6d54686c5d3578938be8e49fc490719976d33d289fd5b5a15768e868f63c4872d6c133f81a73d2473d150e03042
+EBUILD rest-0.9.1.ebuild 1360 BLAKE2B 2b8428bfbc824368c11cf5dae752f4d4677116b12136ae7807e8106e4d2686b035c5581938da92fcfe9158c14d626bfe40f0b39e90119c88f2faffc04178d76f SHA512 0461a2fefa68e9ae92845ab73e1928d89e1125ca792940004296b33a0552ed57538783691f6c96d36c691ca7df638ddecf2d9c4a534b616a6bdda9c5b619d145
 MISC metadata.xml 348 BLAKE2B aa9355d4d476aa865a65356707ef1264225ac5bec69af9ca70ed3ebbfe4a5745d8338f9799bd4636f65537d443328a6a4cc9fddd52ab8e88905e9cddff99ee2b SHA512 ac333dd016d4347bd6b342f2cc335254e53029c0db2f954b1ba8e9dfda4803785244a2dd149fde180f2b08271d53b84cbfbf5d5398feb85719e8a20b7672d3c0
diff --git a/net-libs/rest/rest-0.9.1.ebuild b/net-libs/rest/rest-0.9.1.ebuild
index 3996e0ab6c73..cde0aa02c8ed 100644
--- a/net-libs/rest/rest-0.9.1.ebuild
+++ b/net-libs/rest/rest-0.9.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Librest"
 
 LICENSE="LGPL-2.1"
 SLOT="1.0" # librest_soversion
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv"
 IUSE="gtk-doc +introspection test vala"
 REQUIRED_USE="
 	gtk-doc? ( introspection )
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 98b05e826a93..caff7aac8988 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/gr-scopy/Manifest b/net-wireless/gr-scopy/Manifest
index dd9eaa292f5a..4dd814963d69 100644
--- a/net-wireless/gr-scopy/Manifest
+++ b/net-wireless/gr-scopy/Manifest
@@ -1,4 +1,6 @@
 DIST gr-scopy-0.0_p20201005.tar.gz 204034 BLAKE2B 17d797822c7920186a6d875119d582fda7b74f9c23248d9821ba172f59b1df1433520e723e4dc6b1eca1f08fb7256893767794b584d7c0bd53aa2ede80cd2b92 SHA512 12c0e76008b0a7570a85707afe28a102541e02f10a55346c76cb7984e8435e20281e6406c86ee22e8b4fbe0211bb6657f88f36bdf6b3b76d4e24b2a3f12e6350
+DIST gr-scopy-0.0_p20220602.tar.gz 213557 BLAKE2B 9dcd1b1beb62fa8f18c478f8990339cbe064a6c60c2e68516f49634d838f42559f2b25527fed78b124b9373be5f9c475c66a4dcc57ea30e69127e7227220742f SHA512 28983f1380943b1cc02c34fe21c7f295e5d4bbf4611fdddc313b9f63624845485a8366bcae6e215d9fe228a51f004d051895af756b157d382c6da2f51a1ca432
 EBUILD gr-scopy-0.0_p20201005.ebuild 840 BLAKE2B a154cc758d473c91c3bfa6a7c9827b8acf85030c09e8b0bde55380daec3e42fb02d714c4c39032b2c1ccb462db385c3d1c0368401906b17665d3e8121c21aa9f SHA512 752d45d8e611d775f9ec2e6194f44b616c1b30efb563059dbca9e1ffd7e5287e011fc2fc74d63b2c1ef986740e20a77c085ec5849106fc701601eb4fb52dc1a0
-EBUILD gr-scopy-9999.ebuild 840 BLAKE2B a154cc758d473c91c3bfa6a7c9827b8acf85030c09e8b0bde55380daec3e42fb02d714c4c39032b2c1ccb462db385c3d1c0368401906b17665d3e8121c21aa9f SHA512 752d45d8e611d775f9ec2e6194f44b616c1b30efb563059dbca9e1ffd7e5287e011fc2fc74d63b2c1ef986740e20a77c085ec5849106fc701601eb4fb52dc1a0
+EBUILD gr-scopy-0.0_p20220602.ebuild 908 BLAKE2B b439ce3dc1133cceedd52cf5385377b0c930060c326e0b5ddf8794a4dde8d7ab0115db9d9930a6c72329cce2836de6352bdd79c5bfcd4fff7f35e5ed5248f615 SHA512 b2fbee5179b94439fe9100a89e484e30a6b2ee9049738617a0362fa6d772ffd08270ef6461e7e755ac14d16136123c9698429b8a848ad3bd697e1c958a4a98f9
+EBUILD gr-scopy-9999.ebuild 908 BLAKE2B b439ce3dc1133cceedd52cf5385377b0c930060c326e0b5ddf8794a4dde8d7ab0115db9d9930a6c72329cce2836de6352bdd79c5bfcd4fff7f35e5ed5248f615 SHA512 b2fbee5179b94439fe9100a89e484e30a6b2ee9049738617a0362fa6d772ffd08270ef6461e7e755ac14d16136123c9698429b8a848ad3bd697e1c958a4a98f9
 MISC metadata.xml 437 BLAKE2B 4a35ba663d2d8461738010b5f761fe998cbd778a39570ef834dd9ce758eb53b54abca782ef218fa89f536ebb1bf8e0de398b3e6711651d4df4aa0f32a27e4481 SHA512 2a44d3f8c5c72c69572e78427ee8ffd4bfc202a63e159e82c0b3f393d80176f473caf69d5460c217e602b44f92dd05a008c340014b518afeded662baf01c90ba
diff --git a/net-wireless/gr-scopy/gr-scopy-0.0_p20220602.ebuild b/net-wireless/gr-scopy/gr-scopy-0.0_p20220602.ebuild
new file mode 100644
index 000000000000..0ad510927c21
--- /dev/null
+++ b/net-wireless/gr-scopy/gr-scopy-0.0_p20220602.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit cmake python-single-r1
+
+DESCRIPTION="Scopy IIO blocks for GNU Radio"
+HOMEPAGE="https://github.com/analogdevicesinc/gr-scopy"
+if [ "${PV}" = "9999" ]; then
+	EGIT_REPO_URI="https://github.com/analogdevicesinc/gr-scopy.git"
+	EGIT_BRANCH="3.10"
+	inherit git-r3
+else
+	COMMIT="a69ccb22578621a69acc187fc0d006b5a030a744"
+	SRC_URI="https://github.com/analogdevicesinc/gr-scopy/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${COMMIT}"
+	KEYWORDS="~amd64 ~x86"
+fi
+LICENSE="GPL-3+"
+SLOT="0"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+RDEPEND="${PYTHON_DEPS}
+	>=net-wireless/gnuradio-3.9.0.0:=[analog]
+	sci-libs/volk:=
+	"
+DEPEND="${RDEPEND}"
+
+src_install() {
+	cmake_src_install
+	python_optimize
+	mv "${ED}/usr/share/doc/${PN}" "${ED}/usr/share/doc/${P}"
+}
diff --git a/net-wireless/gr-scopy/gr-scopy-9999.ebuild b/net-wireless/gr-scopy/gr-scopy-9999.ebuild
index f633fe307051..0ad510927c21 100644
--- a/net-wireless/gr-scopy/gr-scopy-9999.ebuild
+++ b/net-wireless/gr-scopy/gr-scopy-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{7,8,9,10} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit cmake python-single-r1
 
@@ -11,9 +11,10 @@ DESCRIPTION="Scopy IIO blocks for GNU Radio"
 HOMEPAGE="https://github.com/analogdevicesinc/gr-scopy"
 if [ "${PV}" = "9999" ]; then
 	EGIT_REPO_URI="https://github.com/analogdevicesinc/gr-scopy.git"
+	EGIT_BRANCH="3.10"
 	inherit git-r3
 else
-	COMMIT="f48b45cabe2a81f491137dbc220032ea65f080c3"
+	COMMIT="a69ccb22578621a69acc187fc0d006b5a030a744"
 	SRC_URI="https://github.com/analogdevicesinc/gr-scopy/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${PN}-${COMMIT}"
 	KEYWORDS="~amd64 ~x86"
@@ -23,13 +24,13 @@ SLOT="0"
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
 RDEPEND="${PYTHON_DEPS}
-	=net-wireless/gnuradio-3.8*:=
+	>=net-wireless/gnuradio-3.9.0.0:=[analog]
 	sci-libs/volk:=
-	dev-libs/log4cpp:=
 	"
 DEPEND="${RDEPEND}"
 
 src_install() {
 	cmake_src_install
 	python_optimize
+	mv "${ED}/usr/share/doc/${PN}" "${ED}/usr/share/doc/${P}"
 }
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 041740a0be54..4bdf7116cf1d 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/license_groups b/profiles/license_groups
index 12f4be7c010c..bb239d02faf6 100644
--- a/profiles/license_groups
+++ b/profiles/license_groups
@@ -73,7 +73,7 @@ BINARY-REDISTRIBUTABLE @FREE Amazon Atmel AVASYS bh-luxi bonnie Broadcom freedis
 
 # License agreements that try to take away your rights. These are more
 # restrictive than "all-rights-reserved" or require explicit approval.
-EULA 2dboy-EULA AMD-GPU-PRO-EULA android AnyDesk-TOS Aseprite-EULA baudline BCS bestcrypt CAPYBARA-EULA Coherent-Graphics ETQW f.lux FAH-EULA-2014 Flightradar24 Gameplay-Group-EULA geekbench genymotion GIMPS GOG-EULA google-chrome Intel-SDP Introversion JoyPixels LOKI-EULA MakeMKV-EULA Microsemi microsoft-edge Microsoft-vscode Mojang ms-teams-pre MTA-0.5 NVIDIA-CUDA NVIDIA-SDK OPERA-2018 PAPERS-PLEASE PassMark-EULA PICO-8 Primate-Plunge PUEL Q3AEULA-20000111 QUAKE4 RAR sfpg Sourcetrail SPS Steam supermicro Synology teamspeak3 teamspeak5 TeamViewer THINKTANKS TIK ubiquiti ut2003 ut2003-demo Vivaldi worklog-assistant WPS-EULA zi-labone
+EULA 2dboy-EULA AMD-GPU-PRO-EULA android AnyDesk-TOS Aseprite-EULA baudline BCS bestcrypt CAPYBARA-EULA Coherent-Graphics ETQW f.lux FAH-EULA-2014 Flightradar24 Gameplay-Group-EULA geekbench genymotion GIMPS GOG-EULA google-chrome Intel-SDP Introversion JoyPixels LOKI-EULA MakeMKV-EULA Microsemi microsoft-edge Microsoft-vscode Mojang ms-teams-pre MTA-0.5 NVIDIA-CUDA NVIDIA-SDK OPERA-2018 PAPERS-PLEASE PassMark-EULA PICO-8 Primate-Plunge PUEL PUEL-11 Q3AEULA-20000111 QUAKE4 RAR sfpg Sourcetrail SPS Steam supermicro Synology teamspeak3 teamspeak5 TeamViewer THINKTANKS TIK ubiquiti ut2003 ut2003-demo Vivaldi worklog-assistant WPS-EULA zi-labone
 
 # Deprecated license labels, used by repoman and pkgcheck
 #DEPRECATED (currently none)
diff --git a/sci-chemistry/Manifest.gz b/sci-chemistry/Manifest.gz
index d4465e2e3894..1decbab67aee 100644
--- a/sci-chemistry/Manifest.gz
+++ b/sci-chemistry/Manifest.gz
diff --git a/sci-chemistry/molmol/Manifest b/sci-chemistry/molmol/Manifest
index 299a35b080d6..b72f6ab6f2b2 100644
--- a/sci-chemistry/molmol/Manifest
+++ b/sci-chemistry/molmol/Manifest
@@ -1,6 +1,6 @@
 DIST molmol-2k.2.0-doc.tar.gz 1062297 BLAKE2B 082d4eea5544bab52ffc1ff6364c50304348f76759dd3125cd74d02e629383d4a566f28ac77ab89ecf5e17a82617b8f61525e6f454689840b27899827399d866 SHA512 131f747a5762859398ebe9b676a07df56c82c8864ecc035ec914f1dea74dafcd67f87993421dfe5899c640470c7e1e1ef03ae262b04a9b360ae329eb19a331fe
 DIST molmol-2k.2.0-src.tar.gz 1088805 BLAKE2B cd649604f6ee491d3a4485391ecdaa48dc1bc4bcd82865cd4a01ca460a6653f8cbba636050bfab9027b9b95dbefa28a8deeff7065b9b461f518001242af4a849 SHA512 6ab01a6fd3d19752634a2cf22919a20e43d195768bd4bdacd5f0bbe016c3058c94915bad4c7fa64dcd86576be39cad0ae112cb62f5e69ffb10041518101e7a9b
 DIST molmol-patches.tbz2 17528 BLAKE2B b91270a980f290edc169be00639e86b3272281c9fe237750f5778eab1605ed482c09bdaf90660a5edf74bd04b3e31adc755e77e39aea6c75d88b6db9bf47a6d6 SHA512 bd94baf0a378f40f854f396963edd9b9e4afc5c56462ee6f8b68889290afdb4c5d9b10878aa5619d0a70153453fe6ee8e7540064522c6db0291ae9162bba9287
-DIST molmol.png 509 BLAKE2B 981217602d128da2eb3765ca07580ed58164a4aa8c2d3e016cd54d9f5133418a7c87bbf0f8a83bcbd5d60ad568bf4938ce680eea315716166592e37f815b5aab SHA512 233d3be0c2e2759a8b064b4cf3708f96817f34eb2a397d5122b26a902864a0f1dca1762f8bcc6981cd030e2644cbedef9eb20c7756016fcf27565e3ed586c271
-EBUILD molmol-2k_p2-r6.ebuild 2255 BLAKE2B 9d316bf74d9e0055349d024e54b5c8ffe0a7b313c69be4cf895fc436f2e36de4a26bfe3b5243d1b6a92719058f12db36c7fe553b63841329e2d382c4c48ad80b SHA512 c0e54e06f617bc0468f43185c5cecd92cfc2117d9c643f2d163e9165a0f858310afed0b633bd1ed1b5e698871cd3095f125c89a0123ceb7eab0f109f999c36fc
+DIST molmol_256.png 22668 BLAKE2B c7d75b8e0d738b48790bea25e21ec60d57a8181253518c70d6f18d93c64eef3c9acf90213fdbdf2dde272e85a04a6442e4e4a9c375829f369380d88c9c0ca57c SHA512 5e7975f54a7462161dc630ee973e9a8126b9c120e0d8d6b62007384c970ce39792e52300edc25dc7a85209845801d749d9ecba02899f3e18b18f5a5fdbc28a97
+EBUILD molmol-2k_p2-r6.ebuild 2284 BLAKE2B 5b2e9555d316a85cf99546aee3eb95ff891f2de01a118ba346ddaa5498cdbfcb6b4ccd285e2e7a364502d77526e713d3b684e45eb9cf7a4ae2e7cf8bac5ab692 SHA512 b8c1811927337f96a4c97abb68ea18dec5eefd9fc3c3e141cb7b1d49523a7b575646dc5749e1929c56fd7f436422c46ec4b3386bd774624ab64f6dee3e4ea6d7
 MISC metadata.xml 272 BLAKE2B 531e98b72776bbe9126811b70943add0f6f43141b01cb75b17ac2c8d1cfb6a9b349022fd411894d2b8eeb0612a73db10aed4ba71f9624bd6dbd172a05fca2c76 SHA512 04f5575703aaaa95e575460ae3de428d3da173b3b741ab52b4aad31e381fef78b325f49f99622ec26a65024437759ea013fc525bd63ee553003c71afcc40d10c
diff --git a/sci-chemistry/molmol/molmol-2k_p2-r6.ebuild b/sci-chemistry/molmol/molmol-2k_p2-r6.ebuild
index 6667565a9c08..9972c4783b7b 100644
--- a/sci-chemistry/molmol/molmol-2k_p2-r6.ebuild
+++ b/sci-chemistry/molmol/molmol-2k_p2-r6.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-inherit desktop prefix toolchain-funcs
+EAPI=8
+inherit desktop toolchain-funcs
 
 MY_PV="${PV/_p/.}.0"
 MY_P="${PN}-${MY_PV}"
@@ -19,7 +19,7 @@ SRC_URI="
 	ftp://ftp.mol.biol.ethz.ch/software/MOLMOL/unix-gzip/${MY_P}-src.tar.gz
 	ftp://ftp.mol.biol.ethz.ch/software/MOLMOL/unix-gzip/${MY_P}-doc.tar.gz
 	https://dev.gentoo.org/~soap/distfiles/${PN}-patches.tbz2
-	https://dev.gentoo.org/~pacho/${PN}/${PN}.png
+	https://dev.gentoo.org/~pacho/${PN}/${PN}_256.png
 "
 
 LICENSE="molmol"
@@ -49,10 +49,9 @@ BDEPEND=""
 
 S="${WORKDIR}"
 
-MAKEOPTS="${MAKEOPTS} -j1"
-
 pkg_setup() {
 	MMDIR="/usr/$(get_libdir)/molmol"
+	MAKEOPTS="${MAKEOPTS} -j1" #880621
 }
 
 src_prepare() {
@@ -68,12 +67,12 @@ src_prepare() {
 	ln -s makedef.lnx "${S}"/makedef || die
 
 	sed \
-		-e "s:ksh:sh:" \
-		-e "s:^MOLMOLHOME.*:MOLMOLHOME=${EPREFIX}/${MMDIR};MOLMOLDEV=\"Motif/OpenGL\":" \
+		-e "s|ksh|sh|" \
+		-e "s|^MOLMOLHOME.*|MOLMOLHOME=${EPREFIX}/${MMDIR};MOLMOLDEV=\"Motif/OpenGL\"|" \
 		-i "${S}"/molmol || die
 	sed \
-		-e "s:^MCFLAGS.*:MCFLAGS = ${CFLAGS}:" \
-		-e "s:^CC.*:CC = $(tc-getCC):" \
+		-e "s|^MCFLAGS.*|MCFLAGS = ${CFLAGS}|" \
+		-e "s|^CC.*|CC = $(tc-getCC)|" \
 		-i "${S}"/makedef || die
 
 	eapply "${WORKDIR}"/patches/cast.patch
@@ -95,8 +94,8 @@ src_install() {
 	insinto ${MMDIR}
 	doins -r auxil help macros man setup tips
 
-	make_desktop_entry "${PN}"
-	doicon "${DISTDIR}/${PN}.png"
+	make_desktop_entry "${PN}" MOLMOL
+	newicon "${DISTDIR}/${PN}_256.png" "${PN}.png"
 
 	einstalldocs
 	dodoc HISTORY
diff --git a/sci-electronics/Manifest.gz b/sci-electronics/Manifest.gz
index 9c49e73262ee..07d0e4218a8e 100644
--- a/sci-electronics/Manifest.gz
+++ b/sci-electronics/Manifest.gz
diff --git a/sci-electronics/xnec2c/Manifest b/sci-electronics/xnec2c/Manifest
index a24a5ab8e580..f9d7c6541369 100644
--- a/sci-electronics/xnec2c/Manifest
+++ b/sci-electronics/xnec2c/Manifest
@@ -1,5 +1,3 @@
-DIST xnec2c-v4.4.11.tar.gz 1061014 BLAKE2B f7af594a1f97b0ad9d93b57235afaf04a8500768396c49608c96849b761828206f2c48afbdb067c9a4138732d4d4e6ad7f6f90a5a547487928efdfe77d3bad88 SHA512 9b5bf71ae45b4d70030eb78793d54d2aa8691afcfcb398b8b23be6508d77a510e5e8a26b6c978b9ea6031fbf5903fd765263d4b19691011187daf58feac612e2
 DIST xnec2c-v4.4.12.tar.gz 1496988 BLAKE2B dbcea1e24382b9f2bb6e881007b44dcf99b9caa7f970ecbb1363e1a0e232d9d1bda6fe68f90622d81cdc69b3b9ff6019dd4b123d6a79f8c6bd088dbd804354b8 SHA512 0d1711260d7f69633d9e6bb559f3b56c2a25414f75ed913c643c0aaad5e4062834ce6c7c7816741f65436173b331e6f8f957c4a624a77214414865bac94ab7e8
-EBUILD xnec2c-4.4.11.ebuild 987 BLAKE2B 8dd5bc27a43fc5fec236d579e288cc7eac8b067ddd7c4335d2c48c47e1fd3403eb878cda75ac3fd8e01173cf8f85e62786c416c26379a0bf933102c67354a88b SHA512 6e206d36ffdefe3879316477eb324dbb11c7d2e098f2bc96040cdc750ff9728e7049c9f28ac3d0db6729ff1e2117c12a4ec53624bd35ae31571ddd08d74dc18c
 EBUILD xnec2c-4.4.12.ebuild 987 BLAKE2B 8dd5bc27a43fc5fec236d579e288cc7eac8b067ddd7c4335d2c48c47e1fd3403eb878cda75ac3fd8e01173cf8f85e62786c416c26379a0bf933102c67354a88b SHA512 6e206d36ffdefe3879316477eb324dbb11c7d2e098f2bc96040cdc750ff9728e7049c9f28ac3d0db6729ff1e2117c12a4ec53624bd35ae31571ddd08d74dc18c
 MISC metadata.xml 1635 BLAKE2B 97a6599a38ecf5914360b4e5376fcb6be56890a91e0274027c327d69fd41459a740a5ad4e2255e48c676bfabbc60a5fc3abd13fa7f9157ac3572e24fa11752a3 SHA512 7564946c202c11ab3be96071962e07870fe97433fae5a9998dbf0cc62de0c83885fadb71741a824aa45e643641baa77bb887ea70687fa15559119fd22d83eed3
diff --git a/sci-electronics/xnec2c/xnec2c-4.4.11.ebuild b/sci-electronics/xnec2c/xnec2c-4.4.11.ebuild
deleted file mode 100644
index edc8563c6bd0..000000000000
--- a/sci-electronics/xnec2c/xnec2c-4.4.11.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools xdg-utils
-
-MY_P=${PN}-v${PV}
-
-DESCRIPTION="A GTK+ graphical interactive version of nec2c"
-HOMEPAGE="https://www.xnec2c.org"
-SRC_URI="https://www.xnec2c.org/releases/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc examples"
-
-RDEPEND="dev-libs/glib:2
-	x11-libs/gtk+:3"
-DEPEND="${RDEPEND}
-	sys-devel/gettext"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	eapply_user
-	eautoreconf
-}
-src_install() {
-	default
-	docompress -x /usr/share/man
-
-	rm -R "${D}/usr/share/doc/${P}" || die
-	dodoc AUTHORS README.md doc/*.txt
-	use doc && dodoc -r doc/*.html doc/images
-
-	if ! use examples ; then
-		rm -R "${D}/usr/share/${PN}/examples" || die
-	fi
-}
-
-pkg_postinst() {
-	xdg_mimeinfo_database_update
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_mimeinfo_database_update
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 0de27c100f27..7cdec2b9e68c 100644
--- a/sys-kernel/Manifest.gz
+++ b/sys-kernel/Manifest.gz
diff --git a/sys-kernel/pf-sources/Manifest b/sys-kernel/pf-sources/Manifest
index 283a04e22e90..e97fa769ee92 100644
--- a/sys-kernel/pf-sources/Manifest
+++ b/sys-kernel/pf-sources/Manifest
@@ -10,6 +10,7 @@ DIST linux-6.0-pf1.tar.gz 218275822 BLAKE2B bb283adca2398ef3e09a9c02e5a6609f898c
 DIST linux-6.0-pf2.tar.gz 218282377 BLAKE2B 753efa1e2e05255540301f9bbf9aa85eff8eb2c45c9092e9b9e09e288df626c93bab2621af6ee1758631ea7759890dc69a124201bde5151b429885a014cf782e SHA512 faa581fa6d3deda5ee67a82f49e19e7680f134fc198a50bd8a37bbe495c70663bea8e5887615e0d4315ef8086359c9da74fb3ecc222170a06f5b7702f6b2f8da
 DIST linux-6.0-pf3.tar.gz 218344594 BLAKE2B e71a0c0a9bd67f34610a59858c911b5a10c858baad18b18d459f973ce7499d194aebb5d3a8827e50eeab40bcd88e6e22a17903b534f6ef11e62febb0ead8a4b5 SHA512 9e075a088bc85eafaf24426f70ee46291b0e67b295598b20d6fa69e395cc13c41ecd36ef424ad08f3af814af3f3b3ac533e57dd8581ce016825bf6f87ee6aafe
 DIST linux-6.0-pf4.tar.gz 218368702 BLAKE2B d6585d02938abd1bc587dc5d6c3597bc8b961c0c7c05d2be906c46cc6d2872d5aafb9579ba8df485c1c270c0ee0f2c8e7d7ac68d431be02942aac40fe402df20 SHA512 29c63beee17c273b356be32dab73817c9c576c8bc3df65cc531dd38d2c0d640b239d5908f514d50eac4fee4bdc6e0e40c909cb6bd09acfa1d9f914bfddbc3423
+DIST linux-6.0-pf5.tar.gz 218385127 BLAKE2B 21dcb503b10decda6c02f6613f022d0f300be6366afcc205cd8b84f929f384822801d1eabe69a7b88b81218ade4d465e977fd2eb9a7d41d9c5665cbf43d8c08b SHA512 1711d15dbcd77d838a2b7c710debbb0c9ddcbee16922c35df85169dd61d028b6a2e62ca202488350dc4f4f512d6d2b2a3c70a6c269d114e2886c892be4caf327
 DIST prjc-519-r1-vd-test.patch 274504 BLAKE2B 87950689ffe97134100aa91d0ff89acd6f4e93b626ad7ab08af464a49457f16526cae7b863d53213dd129d47b6f97b3407ae7027b02656d9eba85942241e8d3f SHA512 d652b6060400329d051257fedee5d9f37a70554ab722e93a15f294d1c6229bfa227941461147e0128178b02875cdf838e0d71e89884d8c01e7549ee482213b71
 DIST prjc_v5.18-r2.patch 270353 BLAKE2B 15d7ed7a0eb6f7ad37feaf52ab7c383e1c7c3e72fb41a767c8d1151a0ad41255c216ede1e4938a041f3b628874ed61398c61dd7b0e0b62090730f2fd0f6a70db SHA512 25c558bd6281a09bb611c6cca68084b27d0f2e290d2c0575e88b6a94322fad86de6dbeda30eb77919edd5adff921ad445593d9478f115ec93fa2e4c7ed6b5c1e
 EBUILD pf-sources-5.18_p5.ebuild 2797 BLAKE2B c0b8bfafb97b85d6e74fd0eecddd7bc915dd1935001288c9123fe08890e0f82e3c91aff441c2fec3a42e374548b5fc31e616ca72fb3b226eaea0773cac6ea421 SHA512 e88beb6362b6526327c28d8a19e04a10149fead1e12edc2a134aa749bd19dbc89e3e14338c64afc57eeea117b310ad5ffa1e2b26b44fdc32eb60715bf2d1ce8c
@@ -18,4 +19,5 @@ EBUILD pf-sources-6.0_p1.ebuild 2541 BLAKE2B 49ec5755cca1d2d434fee7da13ea4e6dfb7
 EBUILD pf-sources-6.0_p2.ebuild 2541 BLAKE2B 49ec5755cca1d2d434fee7da13ea4e6dfb78f2aba92d5cd4572c86f033ef3269599182a5d9debccd87a1d675d8ba169f12412c6225f4836fe2d3396109a75075 SHA512 c33522d46904255b8801240464c95119c3917a09159a740b53cc11e336dcd8a1c1eb928c0b21e1b5d3d927e3d32983371196920c5fbeafe56cabbbd340def13c
 EBUILD pf-sources-6.0_p3.ebuild 2541 BLAKE2B 49ec5755cca1d2d434fee7da13ea4e6dfb78f2aba92d5cd4572c86f033ef3269599182a5d9debccd87a1d675d8ba169f12412c6225f4836fe2d3396109a75075 SHA512 c33522d46904255b8801240464c95119c3917a09159a740b53cc11e336dcd8a1c1eb928c0b21e1b5d3d927e3d32983371196920c5fbeafe56cabbbd340def13c
 EBUILD pf-sources-6.0_p4.ebuild 2541 BLAKE2B 49ec5755cca1d2d434fee7da13ea4e6dfb78f2aba92d5cd4572c86f033ef3269599182a5d9debccd87a1d675d8ba169f12412c6225f4836fe2d3396109a75075 SHA512 c33522d46904255b8801240464c95119c3917a09159a740b53cc11e336dcd8a1c1eb928c0b21e1b5d3d927e3d32983371196920c5fbeafe56cabbbd340def13c
+EBUILD pf-sources-6.0_p5.ebuild 2541 BLAKE2B 49ec5755cca1d2d434fee7da13ea4e6dfb78f2aba92d5cd4572c86f033ef3269599182a5d9debccd87a1d675d8ba169f12412c6225f4836fe2d3396109a75075 SHA512 c33522d46904255b8801240464c95119c3917a09159a740b53cc11e336dcd8a1c1eb928c0b21e1b5d3d927e3d32983371196920c5fbeafe56cabbbd340def13c
 MISC metadata.xml 346 BLAKE2B aac642a4971d6bc11e22a4885e5a4cfdaa36287a97883ed22368729e1db9bbe1baa382fc542d6f89582a0e4f43d2e78419d09716f6d215477454b72dc365e2ec SHA512 94e6a97663111931e68e8af0656691776c39b4e8cc4e96c4a257a9617413ea238400096b15729b1e3b91d60e030c6eae3789401c444692d3bf7daa7c80e78a72
diff --git a/sys-kernel/pf-sources/pf-sources-6.0_p5.ebuild b/sys-kernel/pf-sources/pf-sources-6.0_p5.ebuild
new file mode 100644
index 000000000000..3f80ddc991c8
--- /dev/null
+++ b/sys-kernel/pf-sources/pf-sources-6.0_p5.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Define what default functions to run
+ETYPE="sources"
+
+# No 'experimental' USE flag provided, but we still want to use genpatches
+K_EXP_GENPATCHES_NOUSE="1"
+
+# Just get basic genpatches, -pf patch set already includes vanilla-linux updates
+K_GENPATCHES_VER="1"
+
+# -pf already sets EXTRAVERSION to kernel Makefile
+K_NOSETEXTRAVERSION="1"
+
+# Not supported by the Gentoo security team
+K_SECURITY_UNSUPPORTED="1"
+
+# We want the very basic patches from gentoo-sources, experimental patch is
+# already included in pf-sources
+K_WANT_GENPATCHES="base extras"
+
+# major kernel version, e.g. 5.14
+SHPV="${PV/_p*/}"
+
+# Replace "_p" with "-pf"
+PFPV="${PV/_p/-pf}"
+
+inherit kernel-2 optfeature
+detect_version
+
+DESCRIPTION="Linux kernel fork that includes the pf-kernel patchset and Gentoo's genpatches"
+HOMEPAGE="https://codeberg.org/pf-kernel/linux/wiki/README
+	https://dev.gentoo.org/~mpagano/genpatches/"
+SRC_URI="https://codeberg.org/pf-kernel/linux/archive/v${PFPV}.tar.gz -> linux-${PFPV}.tar.gz
+	https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-${SHPV}-${K_GENPATCHES_VER}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-${SHPV}-${K_GENPATCHES_VER}.extras.tar.xz"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+S="${WORKDIR}/linux-${PFPV}"
+
+K_EXTRAEINFO="For more info on pf-sources and details on how to report problems,
+	see: ${HOMEPAGE}."
+
+pkg_setup() {
+	ewarn ""
+	ewarn "${PN} is *not* supported by the Gentoo Kernel Project in any way."
+	ewarn "If you need support, please contact the pf developers directly."
+	ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
+	ewarn "the ebuilds. Thank you."
+	ewarn ""
+
+	kernel-2_pkg_setup
+}
+
+src_unpack() {
+	# Since the Codeberg-hosted pf-sources include full kernel sources, we need to manually override
+	# the src_unpack phase because kernel-2_src_unpack() does a lot of unwanted magic here.
+	unpack ${A}
+
+	mv linux linux-${PFPV} || die "Failed to move source directory"
+}
+
+src_prepare() {
+	# kernel-2_src_prepare doesn't apply PATCHES(). After pf-sources moved to Codeberg, we need
+	# to manually eapply the genpatches too.
+	eapply "${WORKDIR}"/*.patch
+	default
+}
+
+pkg_postinst() {
+	# Fixes "wrongly" detected directory name, bgo#862534.
+	local KV_FULL="${PFPV}"
+	kernel-2_pkg_postinst
+
+	optfeature "userspace KSM helper" sys-process/uksmd
+}
+
+pkg_postrm() {
+	# Same here, bgo#862534.
+	local KV_FULL="${PFPV}"
+	kernel-2_pkg_postrm
+}
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 5ddae94c6b86..12652f2bdce0 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/fortify-headers/Manifest b/sys-libs/fortify-headers/Manifest
index 13e84916d4a2..526402a9c0a9 100644
--- a/sys-libs/fortify-headers/Manifest
+++ b/sys-libs/fortify-headers/Manifest
@@ -1,6 +1,4 @@
-DIST fortify-headers-0.7.tar.gz 5524 BLAKE2B 76ec4ee5b50bc77db05bf45a4a5550f3a369e5a49e333cd095613acbc04794d074103f3110c353a3283757f12cec866c45ed7d71ef4509667cae49926ee6953a SHA512 9335d5042f973904cf131d4894c71d3d25c84e82427500064a4ed3f798abd8051c3b52375a17c807ca89227115fa5ba9922939f0e86059a9f04fee61f0b69e53
 DIST fortify-headers-1.1.tar.gz 5510 BLAKE2B d0454ad3ba432c051aeabfffad82799fae4ef37c07a8d2b8efcc26cd867dea8b31586f312d2947cb7e6ef7eedcacc3bb68591be4409376cc702ffbbafe144ea0 SHA512 a39d6e7c002bf91085f712aa46bc3f53ff934cc963694a229fa82d84ff4a7556105212a84a231ab5367c01c6a1e385172173f1f4a34d5eb4d2d9c58472c23dd0
-EBUILD fortify-headers-0.7.ebuild 680 BLAKE2B fd47185e3f903b213c4bda571f8465d9671af0578dc81cf74fc8e4d8920c76933621810587bc742ba8895a0f4d3227c6782343058320767a9a7dc5244ecb4fe9 SHA512 ee2acda28a3ce7b7b39dcf679c1a7f8f8e5c1443b50d82e45d315214631d3b4ff4781f25e32620592f0ebb143800aa82ab5e5c4483f1f53c60a6c32da3d021ce
 EBUILD fortify-headers-1.1.ebuild 862 BLAKE2B db23bac223f4a359e7e984a5a6d364adc8d04e56d32791909a7b6e6bfe678d494fa67d0b6f3068df78c2690bf73ab7a6fef0ad5cf47654879c9afde2aa014a5f SHA512 4040d7ce9bdf4e2a6e6b34cce0abb46b6016419def5f4e31c738cc38abc6a2494c4619be68091b7aa78df973e0a5ba84b1461d5c7f848a7b9ffaf80b7f4c9518
 EBUILD fortify-headers-9999.ebuild 862 BLAKE2B db23bac223f4a359e7e984a5a6d364adc8d04e56d32791909a7b6e6bfe678d494fa67d0b6f3068df78c2690bf73ab7a6fef0ad5cf47654879c9afde2aa014a5f SHA512 4040d7ce9bdf4e2a6e6b34cce0abb46b6016419def5f4e31c738cc38abc6a2494c4619be68091b7aa78df973e0a5ba84b1461d5c7f848a7b9ffaf80b7f4c9518
 MISC metadata.xml 253 BLAKE2B abd5250029676d23201d38d764a87f155a72fdb12c27eb98faea12eb441fd986c1cf2f230265e7e7d257e5dcc81b6710ec90ebf8dbc3a6597a04c4fff95eb771 SHA512 96c2922337805fd36723b0f847b2b15365e7207a21d57f6c6ab7e3cf8ca089b781635eaaf3ef01cbe61c34ee8b3f4c1c6234242db390ccc3c3bf0b1ab660b467
diff --git a/sys-libs/fortify-headers/fortify-headers-0.7.ebuild b/sys-libs/fortify-headers/fortify-headers-0.7.ebuild
deleted file mode 100644
index 90e1ebc8b420..000000000000
--- a/sys-libs/fortify-headers/fortify-headers-0.7.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} == *9999* ]] ; then
-	EGIT_REPO_URI="git://git.2f30.org/fortify-headers"
-	inherit git-r3
-else
-	#SRC_URI="http://git.2f30.org/fortify-headers/snapshot/fortify-headers-${PV}.tar.gz"
-	SRC_URI="https://dl.2f30.org/releases/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86"
-fi
-
-DESCRIPTION="A standalone implementation of fortify source"
-HOMEPAGE="http://git.2f30.org/fortify-headers/"
-
-LICENSE="ISC"
-SLOT="0"
-
-src_prepare() {
-	sed -i -e 's|^PREFIX = /usr/local|PREFIX = /usr|g' Makefile || die
-	default
-}
-
-src_install() {
-	export DESTDIR="${ED}"
-	default
-}
author	V3n3RiX <venerix@koprulu.sector>	2022-11-20 13:02:32 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2022-11-20 13:02:32 +0000
commit	65c1a6f8d7210639cbdc1565ccee4758f45dfc45 (patch)
tree	d7bea8e8d228e76b177eccb0ffc1f45a58a1e2f7
parent	c4f077d9f57bf57fcded75904bf512075191d2d2 (diff)