gentoo auto-resync : 12:04:2023 - 23:42:09

100 files changed, 1141 insertions, 463 deletions

diff --git a/Manifest b/Manifest
index ca45e14c2719..66ce46a86d89 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29466 BLAKE2B 6b7fadbebe5fa53c5b95c74d2e0111e108922272b2f0adc636732e94a9db7751bf86d01f80644889c04a955330e4802e03d6559756e3b16f797d5437cacf8e9e SHA512 8f4c92694ff7621189578732a740591bee3058ba41f1ee3a790b6096a2e4cea495e975390cb1184e496d6c1faa822bf8b129884b94098fe9cc7e63e258a69c2e
-TIMESTAMP 2023-04-12T16:09:39Z
+MANIFEST Manifest.files.gz 29488 BLAKE2B 0873bd62e09852769e0cdcc318d862b60caee7834dd1b9d90c5ffb2b5f95b575f97709aa3189aedf6fe0717ff65c67e5bae62be5666888b071a87f281ff7feb8 SHA512 e6288d200c8e521996b7e4949105ed73389c7157a887ed4535b028b34b5809d619d3d43eace17674e55ca0e22395bd8da56d2171bc1c0e7479e5d5119d6f49d3
+TIMESTAMP 2023-04-12T22:09:40Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmQ218NfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmQ3LCRfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBFgRAAg1eF0m59yBlyroQBgfgFI8QgirkOozbCfSId1qNCVhLaK+WRT3D4itch
-Fn1OE0LZcoDTUXO7vxGMaqVoD4hqNlKZx136Rib6Zm1v3dEvb56sKNMeSyw+z36N
-Js5C+vVT7QKSO9v5ZHaMo5SXX9gCosQ728V8aCWvxNPLveoYIbD262NnEd58pjF7
-L4/e0auYfJE6Km16X+tq8IUrkmKUw+cyrKH4GNFuxGjai3iptjjlB6ibN7BYo1uR
-Gt5uzdQJJIN4UTMGRLTD5P53ZDVLGYo42mwY3ox32m4gL2NkthYga3Q3GoLfDNED
-J7g4t0CDbphyINAShbIi7jpmPmcTXHsWWU1XLxlJYizIL82hisDfllttpSbLkwA4
-z3sIQGRbm1mvox2Zu/lvRxMcHpDSYbtJTHSRKS+q5tjZpvede/HAawU6yPmMHpKP
-vF0RYn3kkBYFm67JWENEQv7tTq+G9vPHdV32vHPMq5HDuXASFEVxoVcjQcl/klky
-vZOH9oJe1paeSdSI+4LF6yI9YmVfI49H0J0ypqcMelsilTynr0ijbTGq2xe5Bh5X
-zJFTSwOHUMT/hurY1+69F35gMmJ+pLNLuamFRkf+MwkGoBwrTWHYTPxNZ3HqyO5t
-fY0Pczf7joWmFv8GLF91gXIRGa0NsagDmtf2DB7bXaOMmmSM+M0=
-=g9zG
+klAOTA/+INsxjaXToiuC6mSJIZ2fnJQWgxaKgDUow6RpOsOOGkuyXtnHDQuAU9Ny
+SxDedJ0EYLeSluOHhjSFIw/o3KWCGZLK8BDK5dVxqbTki8hr0wb2ixowwZwfdcUa
+WIAGoW8gy0N7cv3gbaAkONYDaKDCy2hVf3RzITXCAIo5T38CzrslEXUfaZe2pEyw
+W/Gbsb4mZ108PfSnHlF24JldPlnhcrfDsALzcq24R6t4ZcdLCJEHXHZaWUdt4NSd
+ajAuZy5jV7HeKBNNQHGEwyhM2Fv5aHEOx73Wb56Ko0zWVf0e5Fdlhsgfk+DokWZh
+kXrC/oIi+c8gmKsrPxSOd/B1aDEUEFEv2lGz8k3Qp9JeuLGcAAjHhWG+6Tc+E18H
+fMg94B+W7lW6SOrf4RZdNg4eoIb9FWdgqZBxMJ5AoUv9vzr33HE+DVEC7YnFHuvm
+VmmxYm1SV0/JEIOjDvHOuJx/rvBoQFNXAbfwkPilfLtSogmcfmxpJqSsxVesE9O2
+0o8AS1m+7TKJAsP3O756dSMbH4ktIWtpJ4Wbw/MDJ5sKhm1JNOAXaxK8iV6WCJnU
+4i2cKzffo+NISB9nPSBUOZ9Gg1e5l6GUZyeEaW93BAJ+Ggi/5xF3y2FOvWeIp9lY
+zx5U/EpGoIGhqm4KL8dckwszy1ffh4Tan8x601zYO/JBYicSFiU=
+=QETu
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index d9fd421d8d39..57d5e8b1b099 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-containers/Manifest.gz b/app-containers/Manifest.gz
index 8ebb60e863f4..4f84c58d9796 100644
--- a/app-containers/Manifest.gz
+++ b/app-containers/Manifest.gz
diff --git a/app-containers/docker-compose/Manifest b/app-containers/docker-compose/Manifest
index b5ccc9c9ff70..f821a4989ba0 100644
--- a/app-containers/docker-compose/Manifest
+++ b/app-containers/docker-compose/Manifest
@@ -1,16 +1,10 @@
 AUX docker-compose-1.29.0-setup-py.patch 1858 BLAKE2B 9a53ffec0449fe1fa110b21617bc3e804829625abc6205f10962f568acbdfa7c38ffeec7e7feb0fe585b95555ff786223b3a7c24e960738cea0dfa7803be3f59 SHA512 66a25230e8d7f294c7baa3053cee508623d85e8453eb758f7f80aed9416aef9018c8878e9c0db6b96e657bb450508d442d6b055e11e80996ef3aba276d98fe63
 AUX docker-compose-1.29.2-tests-unit-cli-test-py.patch 900 BLAKE2B 400b1fac44687d05a10543519e0829ab4534342b3f39f9a0e2ac2e42ae7bc4e46f1d432734069e7097d2c18767144ab8e40af6b0ac8fe7984f2cc7fc822276f0 SHA512 e64e1c5b4e90b3a7b04a5dc52ac2e77545a5ce70128b6780d3e6fa6724877359a488ddf75c375db21f8382881779d20a4d58e5a1a927008c26bf8601e5fcf3ef
 DIST docker-compose-1.29.2.gh.tar.gz 320320 BLAKE2B 2d1a6375127fa09661822f7148665161b45bbd234c93444ae31c1d926513fcbc9fb845f8af01d8f11788f24b7517bff5f6cea2a5da9ade897891f2dd728f26bd SHA512 09f2ae2ae7a17ab5fb3e22580f7a80f1a8253f7ad9fc8f29aca432911bcde46ed22030ff3073cdd7eff3d55aaba17f56e628a178ec05c3a9b4f28495d6045111
-DIST docker-compose-2.12.2-deps.tar.xz 139592724 BLAKE2B fd0e375e9cefe802d6d557763838959712f31391c2ac4e5e41d37ce2b6df209c35e86f255197ccb39ca04dc9ea9b04de29347570d0d1b0ed5a0b2d094c5e24a7 SHA512 af4e431dbb4735fa1a2aff2271e052479b4e4dac83f2d7a733aac9aab0ac33e00499d81b6c8a6a36aa330618a89c44993c5b27349752678ce1ac41921f12dfbe
-DIST docker-compose-2.12.2.tar.gz 305198 BLAKE2B a39a0c2266abc442f1c65ac00da9dd380df85d2aaa9429898461f12138fe64a7a6c74a45b3bb734419b7093ec69a44b49dfc57ff264a2d3cb576a78a0720db03 SHA512 dfb82ecc5a984d7193da164924c1e430d07b6378028dac7264b8084da2e315e5c5091803a5db79fe27ed06b002c62b295d873b9371bd19d4550a37a28f8ec952
-DIST docker-compose-2.16.0-deps.tar.xz 194381032 BLAKE2B 69f06124ac0b2e520b9948e4aab48c0ee9a9c5bef62ca70d70695dfe2ea3c51f69ec2b45f3e1b180b314d520a5d7028d81d5b2d760a747cb2c935c9621be374b SHA512 fd552426ac6befc55efd7dd505dc70a512dd736f12395cf7f107bdd508f95d4bf37d78ebf05e9daa4ac25fce0139c988ffd90cf2822fea8d7cf6666b6b834f8e
-DIST docker-compose-2.16.0.tar.gz 302946 BLAKE2B 3f2e03151be62982749c884af574f13798c2a85ffdf2736641a1df165fcd80c29fa611ad55a0655de6c5cf911783cd3b98392ddc4375b09da0179d774eea4959 SHA512 2158c829de298529e3192cb8e201c554f89fa7554a81eae858470db30b41d03925aa4dce9ef6d22c295625abf67ab181f851f05818dc76e2a5d6c46554d5ca3f
 DIST docker-compose-2.17.2-deps.tar.xz 194695756 BLAKE2B 2a0ce1c41d09186f36ea4a935977a35edd80d013b6face813ac9622345ffa1ed8e090537ad990c4ee488ecccfe0575f92bb17f8baa0b8dc2104f75d18fac3877 SHA512 4649405eb0e49641265e514ef89cdae47806958611014ab9a9479848e857d85a5c3352ab44ff9ec39af1ca6fab67b6a2ae6c457d44690c1c1bcc3824aeb6fc07
 DIST docker-compose-2.17.2.tar.gz 310664 BLAKE2B bb36afe02b85dd4f64e6eefdb542cc954e03c11f5f3b39bcd5d84b8b4ea87218e222a89a9f20aa2b6e89afc6edd0e7ef68ccc98cbe4e26be5fe2a07f189ea07e SHA512 e0afb5ac5867f3fbe4c3216710f6f529832310e69cc8943f47d6e67fbbcc7c7541a589f6b42eed54c0415c10851dd635c0b73c4ca31dd0969c6bf68de2b40b8b
 EBUILD docker-compose-1.29.2-r1.ebuild 1918 BLAKE2B bf3402c6139087a39c13b23710b981f36d7e6f8802ae40d9fabc7360109b2332c8b6d9042c46248c75655aded07ad6ea6a9a69a25c1fcf43a0f53999adf54c25 SHA512 86b1860c5414c7ae77f41e8b4d379332762f10bf5000d944d04ea4384b1baa1d4e9653c98bef32aa8baae4d0c520b5fe23b54fe44286a14c4210e447399a6186
 EBUILD docker-compose-1.29.2-r2.ebuild 1969 BLAKE2B 1b64296bae273bb6ff90991988d94b6470fafe365915183d52e8d56106702fc30d856dc6e23eb7c094bbc4f12bee70ead77d03a31512dd89fed6824ae3151c43 SHA512 43f0a4ab7009a6a4516f30a7432a9a11c60b33a8e845eb9ad0d64f1e9f091cb2fbb32baa04cbdc034d9fa23709ec79cfe2dba12d19588b5b33326c4696d595bc
 EBUILD docker-compose-1.29.2-r3.ebuild 2003 BLAKE2B d1e7de7c5a30ba4bf7d0de36de4da1778e66f20c761cd4edc8801d093dec2c5f882d9997ad60ab039ac048c1692af628a0c3bda94c0989e04f6c269c5caa73cb SHA512 acae66015644f268d94778edc88565016e6a171cc8e4185a9c9607375efc775dc866b8354296db03e2bdfc0dd11691c09ea76f2244618c075e7777dd664ad55e
-EBUILD docker-compose-2.12.2.ebuild 1143 BLAKE2B 65406f19f5454c903ac34ce63653083ec4533707c5e507e56c767f8529b1fdf397573cac69efef2981c77314feced2b5a7723cd6ded71ecd422787b5ad0347ed SHA512 5ba4e727da997ecc072a8ee09b60d5986f7313c8b6c097680c07b67c156cc59f912256b99075de1c0b91f66e81ded4a0411099f89585a7f3c4f26bd0a2a6aa4f
-EBUILD docker-compose-2.16.0.ebuild 1142 BLAKE2B b1889ef6e4657930147d8541a0c6a53eb013f9a81b756d0898617cfe4cb74c2bdb493c34a2707ccef44da87f37273d9cde3e6aacc33d61575155d2acdb7d238e SHA512 921964225e698658fbc716cbde486d3a8e9f062fe11a220aadc7e14a535a0e8a39820af50c228b4ed7b18bcc064a76c270c20f5db0e56d14190538551062383b
 EBUILD docker-compose-2.17.2.ebuild 1158 BLAKE2B e2ee9eb582a2558a1f7cf82a15205184cef7774cc1269fafc389deda3e7b042b46588a52d9f94fef5f3afaabd1c31918ba1e5bbade867e412645bd284c191dea SHA512 2fd7c2e56a6935d4c3f294bbeb4f18d8951060f9f385ce976c2ef8edcb734cfb104788f258e30a32f4c31d101f6010dd595c4da8bcfa1868e71963767e34da12
 MISC metadata.xml 544 BLAKE2B d515d07ee7d2045db1d4a2a0e8f0e797e23b01dea7ab164d9bffc85bc00ddc18a050f296db0a80df8a65c9c554d6e189218a1939b07b29ea823e5eea65d803e6 SHA512 17c3b4e7be1318a36aa744e185d7f7d5571107cecc98eed8fce07b4d905273409b95a202129440082f29be57d6a44eabda43730e8f47cc7c63c04d6d0ed05645
diff --git a/app-containers/docker-compose/docker-compose-2.12.2.ebuild b/app-containers/docker-compose/docker-compose-2.12.2.ebuild
deleted file mode 100644
index 67d20deb634b..000000000000
--- a/app-containers/docker-compose/docker-compose-2.12.2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 2018-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit bash-completion-r1 go-module
-MY_PV=${PV/_/-}
-
-DESCRIPTION="Multi-container orchestration for Docker"
-HOMEPAGE="https://github.com/docker/compose"
-SRC_URI="https://github.com/docker/compose/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="~amd64 ~arm64"
-
-RDEPEND=">=app-containers/docker-cli-20.10.3"
-
-S="${WORKDIR}/compose-${MY_PV}"
-
-src_prepare() {
-	default
-	# do not strip
-	sed -i -e 's/-s -w//' Makefile || die
-}
-
-src_compile() {
-	emake VERSION=v${PV}
-}
-
-src_test() {
-	emake test
-}
-
-src_install() {
-	exeinto /usr/libexec/docker/cli-plugins
-	doexe bin/build/docker-compose
-	dodoc README.md
-}
-
-pkg_postinst() {
-	ewarn
-	ewarn "docker-compose 2.x is a sub command of docker"
-	ewarn "Use 'docker compose' from the command line instead of"
-	ewarn "'docker-compose'"
-	ewarn "If you need to keep 1.x around, please run the following"
-	ewarn "command before your next --depclean"
-	ewarn "# emerge --noreplace docker-compose:0"
-}
diff --git a/app-containers/docker-compose/docker-compose-2.16.0.ebuild b/app-containers/docker-compose/docker-compose-2.16.0.ebuild
deleted file mode 100644
index a8e67ae22e10..000000000000
--- a/app-containers/docker-compose/docker-compose-2.16.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 2018-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit bash-completion-r1 go-module
-MY_PV=${PV/_/-}
-
-DESCRIPTION="Multi-container orchestration for Docker"
-HOMEPAGE="https://github.com/docker/compose"
-SRC_URI="https://github.com/docker/compose/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="~amd64 ~arm64"
-
-RDEPEND=">=app-containers/docker-cli-23.0.0"
-
-S="${WORKDIR}/compose-${MY_PV}"
-
-src_prepare() {
-	default
-	# do not strip
-	sed -i -e 's/-s -w//' Makefile || die
-}
-
-src_compile() {
-	emake VERSION=v${PV}
-}
-
-src_test() {
-	emake test
-}
-
-src_install() {
-	exeinto /usr/libexec/docker/cli-plugins
-	doexe bin/build/docker-compose
-	dodoc README.md
-}
-
-pkg_postinst() {
-	ewarn
-	ewarn "docker-compose 2.x is a sub command of docker"
-	ewarn "Use 'docker compose' from the command line instead of"
-	ewarn "'docker-compose'"
-	ewarn "If you need to keep 1.x around, please run the following"
-	ewarn "command before your next --depclean"
-	ewarn "# emerge --noreplace docker-compose:0"
-}
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 93b3bbe4b971..fcaf86f253ff 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/sleef/Manifest b/dev-libs/sleef/Manifest
index 3625790b3981..c1108ca8edb1 100644
--- a/dev-libs/sleef/Manifest
+++ b/dev-libs/sleef/Manifest
@@ -1,5 +1,6 @@
 AUX sleef-3.5.1-gentoo.patch 1261 BLAKE2B cef8f55c1e24e0366636965a7838caf2f1f204dd6bf76b3521bf4e8f2819af461394a743417999245a3cdcd204069914b03285234f073bdbd45852dc6d2b62ba SHA512 2dc7a8f1dd4e061df24ddc0061ca9e6b1fb06d6660a95c9a9bf33b90c419cc36fb2ab7c1c9aeb40cb019f459a7552aa3aae8e9189d7d0c5caf21fbc4390c49eb
+AUX sleef-3.5.1-mpfr42.patch 903 BLAKE2B 1726946ab5ea9b7e1c3756694d6cbbf0fd182aa0c49423c037b840f11f050f780914981a0af198d4f82531c73cbabd20655be1da5a4aab6c184d9c43e96ac337 SHA512 7ac5ee743a0a622ca7b8b37d0c2b8a5a22fe9eb3f6ca14240f457de26c6bec6326d127dbbebfe8cb3dd20702968db2f0193cabcb3f23b08e225a8085da08f510
 AUX sleef-3.5.1-riscv.patch 529 BLAKE2B ca2669ccae99ca413eb00082efea611186f9d620b6e6918f967597b0c54b3e9439c4f3687105babda5cf6072e739991548ccaab2b51960e7043f00e791c78728 SHA512 066c7ac1d53b517c5ba16216fde80320e3adf6297eb90d747f8d91cc115a021682f75c69f1d8fe1034b4f35ef9a723000c2848721020890e0ed74bfea944a8cc
 DIST sleef-3.5.1.tar.gz 1210108 BLAKE2B e10e23cb830252dd2ed34e24bfd79b5e812640572afedad899cccd462019c7a4e41c7b3b9f0ff5a77549fc45dbc51ae0ebeeada4c38f011cdac0262d2982ade8 SHA512 e8e4e5028db52998c6b82bd462622c08d670e4e85273327f1c3bdbd900827dd7793b217c2876ca1229b6f672493bb96f40140e14366390cccea0e6780689e128
-EBUILD sleef-3.5.1-r1.ebuild 675 BLAKE2B 070b7c2bd5f95785d2c6599ce4d76da17e9b8fdeb738a2917dae3eba9e91db97ae2c8f335beaa4f25d778038a284648810ba86d55976ba6bc187641041954d58 SHA512 a8bbc812ab16124eabb2934ddfdde88ecfd61b6e6d98b1f8490ca340b8be370eef0f3dedf56f57d90d15eb8efebce37446fcd55652176489cf39d6a06f9d20e2
+EBUILD sleef-3.5.1-r1.ebuild 830 BLAKE2B 200727933f7de6e5e82f5ee04e1fdd1bec7e771f2a3119d5446e5ad3adb6c905c49f21841a8f9ff4f54e0a4c3ad56f3e1a5b4bfe02fb294c6febea17bf658479 SHA512 49b3a6e5260c783856048a0280bf92a76c906e644a13cd358687cbeb1c857a3a3d51f33aec897f98cd359221a1ecc48c94b568f58a384a92ac5b8c385eadf2b9
 MISC metadata.xml 327 BLAKE2B 983705672ddaa295e873a6fe7a7e7caf7c4d3fdd7c587fa2bff53e457e580ad1958108931e50df7f27303aa75937a702f3cae3d830b3f34760b95f06ca15458a SHA512 8cc8e6126c425e73d9431937f2bedc7dbb68f294359beaf4923e4105284465a7cb4c678693afdf3a16469f9d1a846d7543b550bbd5d100f369a0f93b6bd90c7a
diff --git a/dev-libs/sleef/files/sleef-3.5.1-mpfr42.patch b/dev-libs/sleef/files/sleef-3.5.1-mpfr42.patch
new file mode 100644
index 000000000000..0ae5706974f2
--- /dev/null
+++ b/dev-libs/sleef/files/sleef-3.5.1-mpfr42.patch
@@ -0,0 +1,30 @@
+--- a/src/libm-tester/testerutil.h	2023-04-12 22:07:52.400469592 +0200
++++ b/src/libm-tester/testerutil.h	2023-04-12 22:08:03.404312574 +0200
+@@ -90,7 +90,5 @@
+ double countULPsp(float d, mpfr_t c);
+ double countULP2sp(float d, mpfr_t c);
+ 
+-void mpfr_sinpi(mpfr_t ret, mpfr_t arg, mpfr_rnd_t rnd);
+-void mpfr_cospi(mpfr_t ret, mpfr_t arg, mpfr_rnd_t rnd);
+ void mpfr_lgamma_nosign(mpfr_t ret, mpfr_t arg, mpfr_rnd_t rnd);
+ #endif
+--- a/src/libm-tester/testerutil.c	2023-04-12 22:07:55.045431845 +0200
++++ b/src/libm-tester/testerutil.c	2023-04-12 22:08:23.275029908 +0200
+@@ -289,7 +289,7 @@
+ }
+ 
+ //
+-
++#if 0
+ void mpfr_sinpi(mpfr_t ret, mpfr_t arg, mpfr_rnd_t rnd) {
+   mpfr_t frpi, frd;
+   mpfr_inits(frpi, frd, NULL);
+@@ -315,7 +315,7 @@
+ 
+   mpfr_clears(frpi, frd, NULL);
+ }
+-
++#endif
+ void mpfr_lgamma_nosign(mpfr_t ret, mpfr_t arg, mpfr_rnd_t rnd) {
+   int s;
+   mpfr_lgamma(ret, &s, arg, rnd);
diff --git a/dev-libs/sleef/sleef-3.5.1-r1.ebuild b/dev-libs/sleef/sleef-3.5.1-r1.ebuild
index 5a8a35abfeb7..f2ba71fa3929 100644
--- a/dev-libs/sleef/sleef-3.5.1-r1.ebuild
+++ b/dev-libs/sleef/sleef-3.5.1-r1.ebuild
@@ -18,11 +18,14 @@ RESTRICT="!test? ( test )"
 
 DEPEND=""
 RDEPEND="${DEPEND}"
-BDEPEND=""
+BDEPEND="
+	test? ( >=dev-libs/mpfr-4.2 )
+"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-gentoo.patch
 	"${FILESDIR}"/${P}-riscv.patch
+	"${FILESDIR}"/${P}-mpfr42.patch
 )
 
 src_configure() {
@@ -34,3 +37,11 @@ src_configure() {
 
 	cmake_src_configure
 }
+
+src_test() {
+
+	local myctestargs=(
+		-E "iut(y)?purec(fma)?_scalar"
+	)
+	cmake_src_test
+}
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index dc87bbcf173f..ab2c10e7e858 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/pytesseract/Manifest b/dev-python/pytesseract/Manifest
index 8f74c5762a80..f6faf61e8942 100644
--- a/dev-python/pytesseract/Manifest
+++ b/dev-python/pytesseract/Manifest
@@ -1,3 +1,3 @@
 DIST pytesseract-0.3.10.tar.gz 1098547 BLAKE2B d89f9082d8c7236b97bb96441809a19f494aacd23d4c02d5b7fb1b742616e7b26c249d49fceecc4f652792cdc3d7f2a79cd580a3360157f81205ff04d65afb10 SHA512 de77f0497c2bf60c1febf439ed13f0a8978aa23df76aadb789f8151177b73f45229799bd6b236aa7356a5145064f892e5b528a2d5a396849348f5b22f4343e16
-EBUILD pytesseract-0.3.10-r1.ebuild 698 BLAKE2B b66a3dd49fb7f845e6babbd9d4073a069ef1d154d071c3308b7d01958d8eee92399008ac0ca2b15367464a126d61c2f09cab34a333742e40c5ad31f7b6de6d8d SHA512 f55056e8b0610dd3312a215afcce8a1c7a9d06aab0ca70135aa86a891b1d12eb7a0a5e7f81b4e88b79c14d8d98adb1d060125925fd4914695afdc34e8e20797c
+EBUILD pytesseract-0.3.10-r1.ebuild 703 BLAKE2B ef8ed3ce277b71d78c9c9a45e85516a78949ea53e899a2183d4d71dabfdf37ff94783fe40e923637426d64ea6597478a0b1fd1b04e81b9c75d0a6321dc6951e5 SHA512 c4b6b525f41438043d50a40808ee3ddf8b113d491506b1dca56e9d8f3ee43f60bb5e7ccb29c4f48305eb1abc1ca176af064008d56b845cc875324812f029d3e0
 MISC metadata.xml 928 BLAKE2B 69397ac26f64a9c741e906d4ff1f105319cd5baa00ca5bebac019f2f2d0e2f55f6ddb4e55e54f068da58663cef00923b423aa13a460d21c5701d088a97f7b52b SHA512 d566881fe46eae8c9d86bcca464f718db30f7bda710d58acc6563920d07cdeb3be727980dcf1611b3653c9c8ca0b60fb01584efbf84c4b9f9e0287d8db760bc8
diff --git a/dev-python/pytesseract/pytesseract-0.3.10-r1.ebuild b/dev-python/pytesseract/pytesseract-0.3.10-r1.ebuild
index b891f475f097..6360947cee37 100644
--- a/dev-python/pytesseract/pytesseract-0.3.10-r1.ebuild
+++ b/dev-python/pytesseract/pytesseract-0.3.10-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/madmaze/${PN}/archive/refs/tags/v${PV}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 
 DEPEND=""
 RDEPEND="${DEPEND}
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 393553a7ea93..32d05031f298 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/connection_pool/Manifest b/dev-ruby/connection_pool/Manifest
index 28e0c691fd07..b2598c672894 100644
--- a/dev-ruby/connection_pool/Manifest
+++ b/dev-ruby/connection_pool/Manifest
@@ -2,6 +2,6 @@ DIST connection_pool-2.2.5.gem 14848 BLAKE2B d3e21e5d3c330fb501e9890260c0fed003f
 DIST connection_pool-2.3.0.tar.gz 10656 BLAKE2B 235ddcf6956c53bff276c27b47f3dd21f008cad4eea07692cad186117e6d6a986acb1fa1e2eeb29a9bb72f5ee5e3b7c80927e711ebdf00ceec9af2f02ca37e25 SHA512 8f9c9c1c738b5321b52c28033bb7ac8f6697edfe584f858ce4891514c65730ccb950db9136f059991c4fe1d1386b18883d7b61557aeeb687c602a09229dcb38f
 DIST connection_pool-2.4.0.tar.gz 11243 BLAKE2B b8fcb164473863dfa4d4cd0a2f511f006ab0369a3890639115b42755eb6a50f1e8e37e1b2bdba0a4ac203ef05e5fde84cc95b0f10f547b56effbaa19df0ee64e SHA512 7b3d732da657ecdd1ebe2fa1600c0d723496be9c89397db3da06d854daba07aa959750527ec2c08bdf5a41e30df2ee04407fe76260440848db9b426c508a3544
 EBUILD connection_pool-2.2.5.ebuild 771 BLAKE2B 9a1cbea11bea0f33cb19d07ea2f83adf0b190be605b4837783562b5959ddae606d36dab38897846c5662dce51564efdf6783154fda5b6a0f3d2c40ac58e8b68b SHA512 20c2f5366a0ef29f49949b1321e6cb8889e230a8cf0ae3656c28b371da43b446ba93a2c182e7da78825e1e785bc8aae612a64f846dba492148a7a7352248ff8e
-EBUILD connection_pool-2.3.0.ebuild 907 BLAKE2B 33d0c971c39fcb13184b07b1798b4fd75688c15edfd46f3f5494a71373c4709e2805dfbdf333b75ec98536803cb029d7be2865b0a72539fc5477875d98d46520 SHA512 c511894bef0fa9499558d5dc9b81f1c54619532ef51b45e7c721d04f8ef06aa5fb161c204378994d23ff13d908521aa68885c3e85f2cb2f47db8a97e7be16e10
+EBUILD connection_pool-2.3.0.ebuild 906 BLAKE2B eef14f538d1d98aac2ef5ca112a0334cf0b49a863ffa47fc984fda0751a8819b7241558beb076f721015464669129ef40bebfb770482c6e2a13f5eeffe36683d SHA512 6db882fa44bc6a0ea9f9eba5f6f5c0e0f02b5b0ba82fd288df62450f17613913c82182cdb62d39097273355cc69a2b542c41750aba2ba726656b19dd8cecd243
 EBUILD connection_pool-2.4.0.ebuild 910 BLAKE2B ec95cb63c7c5a976d769e75681a944acdb5401470f00ae65cbdb1a8060fd106ac6aa81cd0eb7da888df3274f451be532cc9ce957629c63a39b5a4492385924a5 SHA512 7e0aea27b9e571c35c60b5e96fae43a7ee9756266350d216c26f7066a5cd486fd5e1264b8dcda278b23efde1665316b8887b559b5d0e462efbf5ad977bba2fa0
 MISC metadata.xml 350 BLAKE2B 9a703bda88725974dbaaf272241eed5ac6da6789fd05221852d904b53b506861c85b93f7a8a0c43c6ae4f75864ad1a9e8686f1edd44231f55671b2be80745dd7 SHA512 7cf078db32bc0d8f6f5b02516027dd0231b2276cfae19b7ede7adca0342e96a994233c78decf9ba83ec7bf4cda66525192cd6fff0f27fd4e3689e557b97d90b1
diff --git a/dev-ruby/connection_pool/connection_pool-2.3.0.ebuild b/dev-ruby/connection_pool/connection_pool-2.3.0.ebuild
index 973014e7d7cf..9937d3537269 100644
--- a/dev-ruby/connection_pool/connection_pool-2.3.0.ebuild
+++ b/dev-ruby/connection_pool/connection_pool-2.3.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/mperham/connection_pool/archive/v${PV}.tar.gz -> ${P
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 ~hppa ~loong ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE=""
 
 ruby_add_bdepend "test? ( >=dev-ruby/minitest-5 )"
diff --git a/kde-plasma/Manifest.gz b/kde-plasma/Manifest.gz
index 545cb20c5dbc..e18b2f2cd78f 100644
--- a/kde-plasma/Manifest.gz
+++ b/kde-plasma/Manifest.gz
diff --git a/kde-plasma/kpipewire/Manifest b/kde-plasma/kpipewire/Manifest
index 3a42ff080416..2065b138d13b 100644
--- a/kde-plasma/kpipewire/Manifest
+++ b/kde-plasma/kpipewire/Manifest
@@ -1,5 +1,6 @@
 DIST kpipewire-5.26.5.tar.xz 52848 BLAKE2B c77263dd20d419fc590a1257b8934257f40f9c7751b4c1542db30fc4ba5814ae1076190d9fe08325398a9bc85f7321c6ed1059bf0b010debe20346110d211661 SHA512 59783fe9cb46ae467bc907a04bb0f499bdd23a39c607d7f0203dc550f2268a36e1914d55df90f167328f9b2644144642540e3d20ba27c6f1b66beff1c807d0d1
+DIST kpipewire-5.27.4-patchset-1.tar.xz 2392 BLAKE2B d4664e2b3ed78f026e6ef9321c4b108f858745c9f2c577092203824ea907a28e5a4b668d40185c6ec523468ff1f3709d21f7de9fbb3b6b190518d326f1e8aaa5 SHA512 367cab179b3df70907b0940cf7b584a430e28d0b6795c215cbc71a8a0bd9e544b6a1439982df6b71ed31215be757330b1cd5c111a0ce8c771705d790fbc78944
 DIST kpipewire-5.27.4.tar.xz 59316 BLAKE2B 72bae7d19fdc86057d03b715fdc6123f81e79d5d4b82b7619cbb155cedccbe61cf814099ca78e0271458b142d7652e3efe45df75a397cd95b5309fbb1ad2db29 SHA512 b052b9e14c945f31066776a9c1a69201bc11cc3878d67db8f2e3496a0e5a3a5b0edd20856a32781d1d01a88f54ff37592e2347e1cab87e7e333e31fe4e81f25d
 EBUILD kpipewire-5.26.5.ebuild 974 BLAKE2B 28f2f30dccb788a7603d33810b5b21b1715f9a1e363ef371a07ce661bf3d8efa7af6442ef4fea00c77b28337e636786af7e664b0e438fa397382567d706eb2de SHA512 da503f7bb5ca3f6a0704967af94b98fff9c0cd94a180a3590629cc2495e5f84cc4ca384cba56d5ca762443560d848c701a9ccebbe53e94a7b68d0023ff00cf9d
-EBUILD kpipewire-5.27.4.ebuild 978 BLAKE2B 1e83a12cdda77793c8287659de5fe20a2df38b42826dc4405a44dc02df1211cfb96ff475bf2d686776b0dd50ca38ef896334cde95a85dfe11814eca577d122b6 SHA512 037a34d000755beff96f79a5f76fe72e0a6d05c26f64c454cec5213a5d3eedec228139590eae0df9d934a22c8cb5701735d9f979f5455e3825448ebc7cbca604
+EBUILD kpipewire-5.27.4-r1.ebuild 1113 BLAKE2B b1ba58be33e7592dfcc78bd8c9db5b30a6d7172166b928ed3083a29e2052e92f8673f8b3d1fde19efaf5ee205829a134aa0d107e95f97970f9c3e63431604340 SHA512 5d09d07b24574f956e1257685048909eab878024815df61927544e7bfc3cb73b66f84a48079da5935dcef2f090cf9771a837892337fbebf711a7de547a2c3bcf
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/kpipewire/kpipewire-5.27.4.ebuild b/kde-plasma/kpipewire/kpipewire-5.27.4-r1.ebuild
index 5f6ed12010de..3f3c5da1ae40 100644
--- a/kde-plasma/kpipewire/kpipewire-5.27.4.ebuild
+++ b/kde-plasma/kpipewire/kpipewire-5.27.4-r1.ebuild
@@ -9,6 +9,7 @@ QTMIN=5.15.7
 inherit ecm plasma.kde.org
 
 DESCRIPTION="Components relating to Flatpak pipewire use in Plasma"
+SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${P}-patchset-1.tar.xz"
 
 LICENSE="LGPL-2.1+"
 SLOT="5"
@@ -39,3 +40,5 @@ RDEPEND="${COMMON_DEPEND}
 	x11-themes/sound-theme-freedesktop
 "
 BDEPEND=">=dev-qt/qtwaylandscanner-${QTMIN}:5"
+
+PATCHES=( "${WORKDIR}/${P}-patchset-1" ) # KDE-bug 467593
diff --git a/kde-plasma/kwin/Manifest b/kde-plasma/kwin/Manifest
index a87a211f9238..3849def5c461 100644
--- a/kde-plasma/kwin/Manifest
+++ b/kde-plasma/kwin/Manifest
@@ -1,8 +1,7 @@
 AUX kwin-5.21.80-gstreamer-optional.patch 971 BLAKE2B f31d18f865a9108ff1bfb711ea95a281295487090be982719a8623faeb5fbc645b8c55468fdfa8482fc052b1546bb2445e4b150c10b239e1ca149f1402b97bff SHA512 cf08106ca39cb455044c47da104b66eb470b72573803a3a1fd6be0eaa58f80b9b7a163898a3234f28552214a1aa3d651f633490377bf87ec4d883878b115b7bc
 AUX kwin-5.26.80-gstreamer-optional.patch 948 BLAKE2B 880e77ce6462c115953471dfd4985cc4891a05a910323c1760e01870f04a6930d6d4680811701e12094f1bc3eabbba6b097535408b9148dea4beca31496c7e35 SHA512 66e839c7d603873d675b96430ae48d89366a7f1c5019686c9471ef4fd66449bc4bc22752856665a5d90ab8e503e40d307c4671ac0c2f2991b869e211f7b46c86
 DIST kwin-5.26.5.tar.xz 6658216 BLAKE2B 8e49136fb1b38a6fad3ef6f71f130236e121f54e98519133e615a83dad9a6fe620e279d6e769d70aff393b07c541bb70779eb974bf0c1dacb29e61e3b1ac69f0 SHA512 ef374b18fdedbb5322e0abba9f5dcd023391d96c7564c22e3a73a8fc030ef682f892f68fc618175da17527ec5fbd786e0efb452f5e52f29ffb1237eee912b5d8
-DIST kwin-5.27.4-patchset-1.tar.xz 2804 BLAKE2B 97a11b4f340daf3fe03fb594382b9d78cedcbe00beda2331b705cbe71a3172938f9bf2dc0e6154b4269c872177707f6eeaa96f8f3ec5c2f905b375391b1e14e4 SHA512 33e0266602da80f8f6fd7d1e76160901491687d937c8a4594864a6a624e53a11be6b6a71cb2b8d13844f5bbccd8ce6fc3881b8d6fbf13184a4b97a6b1df23078
-DIST kwin-5.27.4.tar.xz 7610240 BLAKE2B c2ba194f6d9a2d62892cc9c17fcc7d8642197611d01f234bfdc5a0e56add896446f609e79b069275d130ee52b1150b39bfa435d7e5fb49bb6e35f73049f85f6c SHA512 13e8abc5de4c1b76d078e9f98bba46362314d4a99008afa390dfc51ec1dcd5fe85cde38ac5e021f0ffff9060db038a0f9de84626c1135bacd781cd631904e247
+DIST kwin-5.27.4.1.tar.xz 7621340 BLAKE2B 53f8001542f03be032fcf09d214e5e1d8be56bfcb506c5440aba7ea2b37515770b4c865e10d11a76722ee0fe2a8376c7a07311ff44d5adacca0c5969425f5cc3 SHA512 b686fce07d48b52f987e459ff42dd29da3cbd80beea1f4f1a7cb52f49a6cce9ad167e549ac876697bc820d158fd7fdbaa39fb1261b3573cb374e058ea09e1bbf
 EBUILD kwin-5.26.5.ebuild 4235 BLAKE2B aed6c507f9ab53a1e34551bf96d9c4112868b34972882cd3e7d62c52ef3bdb90bbee20a7135cd8659ab0f6f8f8529a63a6cecab80152a17f74eb862b37a27250 SHA512 e76f9bd1ae0af250d76a55ab1be41266f6a4697b31df060cedb9c0a5f41d0a1b51bdcedde58ae065e8c296ac0e687ebd87a57533f102169b4541a24f2d39f3f6
-EBUILD kwin-5.27.4-r1.ebuild 4383 BLAKE2B b22ec6de508f24f03f5c90c5953b75e8c31d14e3f93d6728c91f8f7864a9de22bc93c9dae154e26ee170d3045fe730435e16007ecada229dfb896449d9da10fd SHA512 78aad351d6f6aeb24f4bf8900d849863c4c59d6fd208ac3c402d0984d3b00b640a4e3978715deb0969479193d988fa9fedb982302db06c2aecdbb44c29f30056
+EBUILD kwin-5.27.4.1.ebuild 4239 BLAKE2B 9d1c87a9d24b8a344fe299c4d60c4d0bbb1d2f4996fdfc9d92966b9fb38561377907f5a48016b84ae7c35134ccddb1902563c0237fade23f816bdb65fb915f28 SHA512 836a9a772c26a92800334af64a53c3e8185eb4c04b75d78312278f3078f8212248a5a0cb5b3fe91f1e9c23dc0af63c1fa95048220a7ff83f5a5e8d7943599248
 MISC metadata.xml 505 BLAKE2B 41f9200ff14d77161bb0863065be67315f5459fa8232da5f0cf18aacd8abb15f7e858277a59a219e59f777fbd2d2d1f035c941d1a06e459b01935b70921e678d SHA512 19c2af1c8b56be6989b617adc24fc0a8bc33d4913eecf22a4ecef3c1a2cf2994e814655f3a885a75ad17613af1dc41b6babb5e4375a3e217f0cc5842ba969a29
diff --git a/kde-plasma/kwin/kwin-5.27.4-r1.ebuild b/kde-plasma/kwin/kwin-5.27.4.1.ebuild
index cecfdc3410e8..beb16fbcca7d 100644
--- a/kde-plasma/kwin/kwin-5.27.4-r1.ebuild
+++ b/kde-plasma/kwin/kwin-5.27.4.1.ebuild
@@ -12,7 +12,6 @@ VIRTUALX_REQUIRED="test"
 inherit ecm plasma.kde.org optfeature
 
 DESCRIPTION="Flexible, composited Window Manager for windowing systems on Linux"
-SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${P}-patchset-1.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="5"
@@ -104,8 +103,6 @@ BDEPEND="
 "
 PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:5"
 
-PATCHES=( "${WORKDIR}/${P}-patchset-1" ) # KDE-bug 468235 and more
-
 src_prepare() {
 	ecm_src_prepare
 	use multimedia || eapply "${FILESDIR}/${PN}-5.26.80-gstreamer-optional.patch"
diff --git a/mail-mta/Manifest.gz b/mail-mta/Manifest.gz
index 376cda847b77..90f54fcdd0f8 100644
--- a/mail-mta/Manifest.gz
+++ b/mail-mta/Manifest.gz
diff --git a/mail-mta/courier/Manifest b/mail-mta/courier/Manifest
index 7b55ff193226..b1969cb0aeca 100644
--- a/mail-mta/courier/Manifest
+++ b/mail-mta/courier/Manifest
@@ -11,5 +11,6 @@ EBUILD courier-1.1.5-r3.ebuild 9233 BLAKE2B d0c7f609140f624ee3b971f240766b80bc46
 EBUILD courier-1.1.8-r2.ebuild 9239 BLAKE2B 37bdf7f22ac01545fe89f6a3d63a58ab984c5f27efd0d8a6a5d751b15bd184afb53e92ad04e7fce78cae5557dc960e22ca3135aee5334603804ab00e29a02b47 SHA512 46489020884af61bac01a18dca9704a931ba81ad07f08873511baa15fc401c722c52f882c136eadc36cc46d3f590e48bb7aacff54b129b265384baaf0618da3f
 EBUILD courier-1.2.2-r1.ebuild 9457 BLAKE2B 4a8e8dcc45fd9381fb735419c3ba0b445b1f3585d525992f8b165cad294732b3190059374b917a00b38625445b0d574ac9d42697ae2d4af613a918770f483b43 SHA512 5b89f7e14d600edcd90f98eadd1ac0774c83905fa77607884a447ed2a2bd8a1552b91ef3c87e5afa5fc46975a0cda15c8a5b5729a4166501c58b35dea2cb32f2
 EBUILD courier-1.2.2.ebuild 9263 BLAKE2B e5656abf60207172da2e27674b32e4a45d6874c20130c13634c0df07e5e4049ce9bb398eb4e2a0397b94839257cf0cf043d63b3cd2f40d18a974079cfa24f367 SHA512 1ac12e88befc9f6f1e7f9a2ee4e72697c47b4f4575b9ed7dc1ef3df67ee4fe7d9976786f993d394da1956b2fa1f59a8d26739788f16b025e29dee6fed7ee66fc
+EBUILD courier-1.2.3-r1.ebuild 9264 BLAKE2B dc4c4fd2545f16a65437845481230c770a8c180580d67d375927e07d4b1e0462362aa709b6ca29577aaf7573d78920872b5a0e133365875d6bb332a9606ff83e SHA512 e19eb3febe4e230845e11909289562df9b2d92d873a5bd5a549bc60e846dd880f825ac78446f259a6324f1ce59bca6d0acfbc828df1b9e6b648ca1eca661b9e4
 EBUILD courier-1.2.3.ebuild 9263 BLAKE2B e5656abf60207172da2e27674b32e4a45d6874c20130c13634c0df07e5e4049ce9bb398eb4e2a0397b94839257cf0cf043d63b3cd2f40d18a974079cfa24f367 SHA512 1ac12e88befc9f6f1e7f9a2ee4e72697c47b4f4575b9ed7dc1ef3df67ee4fe7d9976786f993d394da1956b2fa1f59a8d26739788f16b025e29dee6fed7ee66fc
 MISC metadata.xml 756 BLAKE2B e3d128790b1620d9005c9a14cef1c452488fc8e465b235791cc196f431cb2ea8348aba342b0867282878d0c73392694be0db0686dc048d9345b286c3bccf1cab SHA512 c3fcd1ba4b22f91b1acf49faeee41562a7963b51d37e1593156086b79a1eb4172a12e7226b71a9aa55b5a4ef7d734351752451a2300375d061ae20481778b273
diff --git a/mail-mta/courier/courier-1.2.3-r1.ebuild b/mail-mta/courier/courier-1.2.3-r1.ebuild
new file mode 100644
index 000000000000..5a2068123d54
--- /dev/null
+++ b/mail-mta/courier/courier-1.2.3-r1.ebuild
@@ -0,0 +1,311 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic
+
+DESCRIPTION="An MTA designed specifically for maildirs"
+HOMEPAGE="https://www.courier-mta.org/"
+SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="postgres ldap mysql pam nls ipv6 spell fax crypt norewrite \
+	fam web webmail gnutls"
+
+DEPEND="
+	>=net-libs/courier-authlib-0.72.0
+	>=net-libs/courier-unicode-2.2.6:=
+	net-dns/libidn2:=
+	gnutls? ( net-libs/gnutls:= )
+	!gnutls? (
+		dev-libs/openssl:0=
+	)
+	>=sys-libs/gdbm-1.8.0:=
+	dev-libs/libpcre2
+	app-misc/mime-types
+	fax? ( >=media-libs/netpbm-9.12 app-text/ghostscript-gpl >=net-dialup/mgetty-1.1.28 )
+	pam? ( sys-libs/pam )
+	mysql? ( dev-db/mysql-connector-c )
+	ldap? ( >=net-nds/openldap-1.2.11:= )
+	postgres? ( dev-db/postgresql:= )
+	spell? ( app-text/aspell )
+	fam? ( virtual/fam )
+	!mail-filter/maildrop
+	!mail-mta/esmtp
+	!mail-mta/exim
+	!mail-mta/msmtp[mta]
+	!mail-mta/netqmail
+	!mail-mta/nullmailer
+	!mail-mta/postfix
+	!mail-mta/sendmail
+	!mail-mta/ssmtp[mta]
+	!mail-mta/opensmtpd
+	!net-mail/dot-forward
+	!sys-apps/ucspi-tcp
+	"
+
+RDEPEND="${DEPEND}
+	dev-lang/perl
+	sys-process/procps"
+
+# get rid of old style virtual/imapd - bug 350792
+# all blockers really needed?
+RDEPEND="${RDEPEND}
+	!net-mail/courier-imap
+	!net-mail/cyrus-imapd"
+
+PDEPEND="pam? ( net-mail/mailbase )
+	crypt? ( >=app-crypt/gnupg-1.0.4 )"
+
+src_prepare() {
+	use norewrite && eapply "${FILESDIR}/norewrite.patch"
+	default
+}
+
+src_configure() {
+	filter-flags '-fomit-frame-pointer'
+
+	local myconf
+	myconf=""
+
+	use ldap && myconf="${myconf} --with-ldapconfig=/etc/courier/maildropldap.conf"
+
+	econf ${myconf} \
+		$(use_with fam) \
+		$(use_with ipv6) \
+		$(use_with spell ispell) \
+		$(use_with ldap ldapaliasd) \
+		$(use_enable ldap maildroldap) \
+		$(use_with gnutls) \
+		--with-notice=unicode \
+		--enable-mimetypes=/etc/mime.types \
+		--prefix=/usr \
+		--disable-root-check \
+		--mandir=/usr/share/man \
+		--sysconfdir=/etc/courier \
+		--datadir=/usr/share/courier \
+		--sharedstatedir=/var/lib/courier/com \
+		--localstatedir=/var/lib/courier \
+		--with-piddir=/var/run/courier \
+		--with-authdaemonvar=/var/lib/courier/authdaemon \
+		--with-mailuser=mail \
+		--with-mailgroup=mail \
+		--with-paranoid-smtpext \
+		--with-db=gdbm \
+		--disable-autorenamesent \
+		--cache-file="${S}/configuring.cache" \
+		--host="${CHOST}" debug=true || die "./configure"
+}
+
+src_compile() {
+	default
+}
+
+etc_courier() {
+	# Import existing /etc/courier/file if it exists.
+	# Add option only if it was not already set or even commented out
+	file="${1}" ; word="`echo \"${2}\" | sed -e\"s|=.*$||\" -e\"s|^.*opt ||\"`"
+	[ ! -e "${D}/etc/courier/${file}" ] && [ -e "/etc/courier/${file}" ] && \
+			cp "/etc/courier/${file}" "${D}/etc/courier/${file}"
+	grep -q "${word}" "${D}/etc/courier/${file}" || \
+		echo "${2}" >> "${D}/etc/courier/${file}"
+}
+
+etc_courier_chg() {
+	file="${1}" ; key="${2}" ; value="${3}" ; section="${4}"
+	[ -z "${section}" ] && section="${2}"
+	grep -q "${key}" "${file}" && elog "Changing ${file}: ${key} to ${value}"
+	sed -i -e"/\#\#NAME: ${section}/,+30 s|${key}=.*|${key}=\"${value}\"|g" ${file}
+}
+
+src_install() {
+	local f
+	diropts -o mail -g mail
+	keepdir /var/lib/courier/tmp
+	keepdir /var/lib/courier/msgs
+	make install DESTDIR="${D}" || die "install"
+	make install-configure DESTDIR="${D}" || die "install-configure"
+
+	# init script takes care of this
+	rm -rf "${D}/var/run"
+
+	# Get rid of files we dont want
+	if ! use webmail ; then
+		rm -rf "${D}/usr/$(get_libdir)/courier/courier/webmail" \
+			"${D}/usr/$(get_libdir)/courier/courier/sqwebmaild" \
+			"${D}/usr/share/courier/sqwebmail/" \
+			"${D}/usr/sbin/webmaild" \
+			"${D}/usr/sbin/webgpg" \
+			"${D}/etc/courier/webmail.authpam" \
+			"${D}/var/lib/courier/webmail-logincache" \
+			"${D}"/etc/courier/sqwebmaild*
+	fi
+
+	if ! use web ; then
+		rm -rf "${D}/usr/share/courier/courierwebadmin/" \
+			"${D}/etc/courier/webadmin"
+	fi
+
+	for dir2keep in $(cd "${D}" && find ./var/lib/courier -type d) ; do
+		keepdir "$dir2keep" || die "failed running keepdir: $dir2keep"
+	done
+
+	newinitd "${FILESDIR}/courier-init-r4" "courier"
+	use fam || sed -i -e's|^.*use famd$||g' "${D}/etc/init.d/courier"
+
+	cd "${D}/etc/courier"
+	if use webmail ; then
+		insinto /etc/courier
+		newins "${FILESDIR}/apache-sqwebmail.inc" apache-sqwebmail.inc
+	fi
+
+	for f in *.dist ; do cp "${f}" "${f%%.dist}" ; done
+	if use ldap ; then
+		[ -e ldapaliasrc ] &&  ( chown root:mail ldapaliasrc ; chmod 640 ldapaliasrc )
+	else
+		rm -f ldapaliasrc
+	fi
+
+	( [ -e /etc/courier/sizelimit ] && cat /etc/courier/sizelimit || echo 0 ) \
+		> "${D}/etc/courier/sizelimit"
+	etc_courier maildroprc ""
+	etc_courier esmtproutes ""
+	etc_courier backuprelay ""
+	etc_courier locallowercase ""
+	etc_courier bofh "opt BOFHBADMIME=accept"
+	etc_courier bofh "opt BOFHSPFTRUSTME=1"
+	etc_courier bofh "opt BOFHSPFHELO=pass,neutral,unknown,none,error,softfail,fail"
+	etc_courier bofh "opt BOFHSPFHELO=pass,neutral,unknown,none"
+	etc_courier bofh "opt BOFHSPFFROM=all"
+	etc_courier bofh "opt BOFHSPFMAILFROM=all"
+	etc_courier bofh "#opt BOFHSPFHARDERROR=fail"
+	etc_courier esmtpd "BOFHBADMIME=accept"
+	etc_courier esmtpd-ssl "BOFHBADMIME=accept"
+	etc_courier esmtpd-msa "BOFHBADMIME=accept"
+
+	use fam && etc_courier_chg imapd IMAP_CAPABILITY "IMAP4rev1 UIDPLUS CHILDREN NAMESPACE THREAD=ORDEREDSUBJECT THREAD=REFERENCES SORT QUOTA AUTH=CRAM-MD5 AUTH=CRAM-SHA1 AUTH=CRAM-SHA256 IDLE"
+	use fam || etc_courier_chg imapd IMAP_CAPABILITY "IMAP4rev1 UIDPLUS CHILDREN NAMESPACE THREAD=ORDEREDSUBJECT THREAD=REFERENCES SORT QUOTA AUTH=CRAM-MD5 AUTH=CRAM-SHA1 AUTH=CRAM-SHA256"
+
+	# Fix for a sandbox violation on subsequential merges
+	# - ticho@gentoo.org, 2005-07-10
+	dosym ../share/courier/pop3d /usr/sbin/courier-pop3d
+	dosym ../share/courier/pop3d-ssl /usr/sbin/courier-pop3d-ssl
+	dosym ../share/courier/imapd /usr/sbin/courier-imapd
+	dosym ../share/courier/imapd-ssl /usr/sbin/courier-imapd-ssl
+
+	cd "${S}"
+	cp imap/README README.imap
+	use nls && cp unicode/README README.unicode
+	dodoc AUTHORS BENCHMARKS COPYING* ChangeLog* INSTALL NEWS README* TODO courier/doc/*.txt
+	dodoc libs/tcpd/README.couriertls
+	mv "${D}/usr/share/courier/htmldoc" "${D}/usr/share/doc/${PF}/html"
+
+	if use webmail ; then
+		insinto /usr/$(get_libdir)/courier/courier
+		insopts -m 755 -o mail -g mail
+		doins "${S}/courier/webmaild"
+	fi
+
+	if use web ; then
+		insinto /etc/courier/webadmin
+		insopts -m 400 -o mail -g mail
+		doins "${FILESDIR}/password.dist"
+	fi
+
+	# avoid name collisions in /usr/sbin, make webadmin match
+	cd "${D}/usr/sbin"
+	for f in imapd imapd-ssl pop3d pop3d-ssl ; do mv "${f}" "courier-${f}" ; done
+	if use web ; then
+		sed -i -e 's:\$sbindir\/imapd:\$sbindir\/courier-imapd:g' \
+			-e 's:\$sbindir\/imapd-ssl:\$sbindir\/courier-imapd-ssl:g' \
+			"${D}/usr/share/courier/courierwebadmin/admin-40imap.pl" \
+			|| ewarn "failed to fix webadmin"
+		sed -i -e 's:\$sbindir\/pop3d:\$sbindir\/courier-pop3d:g' \
+			-e 's:\$sbindir\/pop3d-ssl:\$sbindir\/courier-pop3d-ssl:g' \
+			"${D}/usr/share/courier/courierwebadmin/admin-45pop3.pl" \
+			|| ewarn "failed to fix webadmin"
+	fi
+
+	# users should be able to send mail. Could be restricted with suictl.
+	chmod u+s "${D}/usr/bin/sendmail"
+
+	dosym ../bin/sendmail /usr/sbin/sendmail
+}
+
+src_test() {
+	if [ `whoami` != 'root' ]; then
+		# Disable valgrind checks
+		echo '#!/bin/sh' > libs/imap/testsuitevalgrind
+		echo '#!/bin/sh' > libs/maildir/testsuitevalgrind
+		sed -i -e 's:VALGRIND=:#VALGRIND=:g' libs/maildrop/Makefile*
+		emake -j1 check
+	else
+		einfo "make check skipped, can't run as root."
+		einfo "You can enable it with FEATURES=\"userpriv\""
+	fi
+}
+
+pkg_postinst() {
+	use fam && elog "fam daemon is needed for courier-imapd" \
+		|| ewarn "courier was built without fam support"
+}
+
+pkg_config() {
+	mailhost="$(hostname)"
+	export mailhost
+
+	domainname="$(domainname)"
+	if [ "x$domainname" = "x(none)" ] ; then
+		domainname="$(echo ${mailhost} | sed -e "s/[^\.]*\.\(.*\)/\1/")"
+	fi
+	export domainname
+
+	if [[ -z "${ROOT}" ]] ; then
+		file="${ROOT}/etc/courier/locals"
+		if [ ! -f "${file}" ] ; then
+			echo "localhost" > "${file}";
+			echo "${domainname}" >> "${file}";
+		fi
+		file="${ROOT}/etc/courier/esmtpacceptmailfor.dir/${domainname}"
+		if [ ! -f "${file}" ] ; then
+			echo "${domainname}" > "${file}"
+			/usr/sbin/makeacceptmailfor
+		fi
+
+		file="${ROOT}/etc/courier/smtpaccess/${domainname}"
+		if [ ! -f "${file}" ]
+		then
+			netstat -nr | grep "^[1-9]" | while read network gateway netmask rest
+			do
+				i=1
+				net=""
+				TIFS="${IFS}"
+				IFS="."
+				for o in "${netmask}"
+				do
+					if [ "${o}" == "255" ]
+					then
+						[ "_${net}" == "_" ] || net="${net}."
+						t="$(echo "${network}" | cut -d " " -f ${i})"
+						net="${net}${t}"
+					fi
+					i="$((${i} + 1))"
+				done
+				IFS="${TIFS}"
+				echo "doing configuration - relay control for the network ${net} !"
+				echo "${net}	allow,RELAYCLIENT" >> ${file}
+			done
+			/usr/sbin/makesmtpaccess
+		fi
+	fi
+
+	echo "creating cert for esmtpd-ssl:"
+	/usr/sbin/mkesmtpdcert
+	echo "creating cert for imapd-ssl:"
+	/usr/sbin/mkpop3dcert
+	echo "creating cert for pop3d-ssl:"
+	/usr/sbin/mkimapdcert
+}
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index 9bc1c402f595..0643920005ca 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -3,7 +3,9 @@ AUX postfix.service 662 BLAKE2B dcf9ceb71ad483b580d126fcb5ac68889cdeb898df3333d3
 AUX smtp.pass 29 BLAKE2B 589915bd2856fa64e22caa12fca54ef342eb07606de38d3879c13ac395413c84de6c3b733c83cc0625a4433167efcc7d504b2f87fa26c05b2facde9c3d103021 SHA512 a8a940099a77ea0547004daf5392a6efc0cd643f10072803d65e37763012464ad25b1b925ae9e32bffb3c3e8a5d4b2d3bb5619a174d58fdc4ea5d4090db0d365
 AUX smtp.sasl 42 BLAKE2B 67e9108101779b6027fa1e5cc7c9256a606d440e15bb037a0da186e6b4983ab26e88ede2f0604737c78144c03e182f66005062f1d49e10443d1ddb9757461d1f SHA512 a48e2bd173c4443dd2c389f6973a541dbcba4223b52b42b409a68d934a7fc82a98d4027267befcd5db6ec628cce6a9dffdf044e6fbd774b6e748f07f4106db47
 DIST postfix-3.7.4.tar.gz 4833834 BLAKE2B edb716ef4576d339189f11b535a62f3c6f8f28613723d916f13cdd2d37228aa8768dacdb9d8616c83f0ded3a3c801c45747375ea6cfa505b668a7163c4637128 SHA512 972738291b960c90fe83861d55b1288900416167adb353418956e69bcc709a6daf84fbfde11d573eebba030654d27abc8d55f90661a2b880ccfb3a334064c236
-DIST postfix-3.8-20230409.tar.gz 4825559 BLAKE2B 5bf02050c396b11ea2825a274418949615c928d44bc30e60a76f0873348f16d67fef972ba1b9616c3872874fc43825b9734e4d3b7752eef38ade32427042bd4b SHA512 77f0eb14a04fe4ac1f836856c7da1976e5a7a04fe032718fc19bd06bf5b08d152cb2747e93b8563d6c51662f0c6e77d81baafce3fd438b2bd4cd84cf7e627cfc
+DIST postfix-3.8.0-RC1.tar.gz 4856059 BLAKE2B 9059099d2abfa1dd7e17ebfef07a96eaac36fde3c406e85ef219cba6ce39d8abd5ca9a955d8eaec4f8a8db0497adba975fb48a4c900476b2d2333993c8880b4d SHA512 70e11dd99c21c9ab86b02fea123011c936fc4ad360fc934dda9037ea4a65bba52044fba4b6287dcebcd07c07734164e7fdb34f974df980ee2f16911f2ba47da5
+DIST postfix-3.9-20230412.tar.gz 4826826 BLAKE2B 7a2f40de42ee0d5203d9b81de7eda5b4ca7fe4d1229042ef8d794222f72b720201d265dc527513fac45406fe4aa6bbe3483f8794b6e85afc9cd40355a43c92d1 SHA512 6f965cd03042c674743c129f7482ccc7ff96195952d324997a7871539d8789bdb1433a9a6a30ac3fb7c9689a9a61935bc9460952f272dcc5f39188b176c26ed9
 EBUILD postfix-3.7.4.ebuild 8023 BLAKE2B f1ed37c430536e96591beceb346144d28bf5eee3a1f93d7d41d4db3f3ed36b9fea7847cbf0c3b278a8ee99ec93ad91797a8fccfad5104717deec5bf4ef18396e SHA512 0676646a5d0bc5187779b707593b8c6ac438c2f13524c4105bc4955feb57ed40aa86df78b740bec4cfa651ce22e44075d8fe6bbecbe44ad591842634856403cf
-EBUILD postfix-3.8_pre20230409.ebuild 8198 BLAKE2B 3a4bad841ef4154c8ac20c78ebe4e2bcae9023f92d52bf2d94945aae20bda2ca214942e58c598b7646f755bb0aebcf0966ac1dad334d4996b454d78f062c974a SHA512 c7d29ef876d85afcfc8c3e6d9e888e0f266cd30c0552c6f1e8ac3b462ec3c76b7244a202bf379053728264322b559f60aff0f5484fc7abdf9576e82af0155406
+EBUILD postfix-3.8.0_rc1.ebuild 8196 BLAKE2B cd5dd1fead1f37a73ca3b2ffd232db629b617470d6543cd3d6b0fd34ce6b82a2bcfd7cac91a81719fcbb5097cd478548227cc01aa16aa71249ea7c923ee61c64 SHA512 38285f7690cc46d9adb91dfa0d49e58987b45f673b85d09e5acc65658c5cb865129e8c279a95d5eeb4276bcea7ea72e6c293c071cc05639710686681591a2b15
+EBUILD postfix-3.9_pre20230412.ebuild 8199 BLAKE2B 4415e28f87a7a5a1df454e45f4d296845f7cc1947a7df900cf25d4fa1c4c73158e831d78e5d0d427ab5d09f96536803a56d2dcb2a71f142d288a631a4219e5ed SHA512 50a2464559afd3582603876caeb44db9a733344d7ff9524b8b68015b0ee5412526703db6b4b62a955f60e4e7bd4545a811ce0552d69e9346c0196e05fc1be86a
 MISC metadata.xml 853 BLAKE2B 96b2b5c531692f1eba1bc4c543ba4df77754d11802e9754ac102907d00dc1284fe449384d3c8c4e53c343e3424f79cf654b7a0c6a112d0ec973f8da585045ff7 SHA512 15c4521a70f25d8d5261c1c981d7ab41cdf542a1630c6857037e0b3e3ab0a51f6dbb4edee9ee9857d0b7a130c5da6f475e1be6a02728edecb23defa004be48eb
diff --git a/mail-mta/postfix/postfix-3.8.0_rc1.ebuild b/mail-mta/postfix/postfix-3.8.0_rc1.ebuild
new file mode 100644
index 000000000000..60e7bcd6704e
--- /dev/null
+++ b/mail-mta/postfix/postfix-3.8.0_rc1.ebuild
@@ -0,0 +1,297 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit pam systemd toolchain-funcs
+
+MY_PV="${PV/_rc/-RC}"
+MY_SRC="${PN}-${MY_PV}"
+MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official"
+RC_VER="2.7"
+
+DESCRIPTION="A fast and secure drop-in replacement for sendmail"
+HOMEPAGE="http://www.postfix.org/"
+SRC_URI="${MY_URI}/${MY_SRC}.tar.gz"
+
+LICENSE="|| ( IBM EPL-2.0 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="+berkdb cdb dovecot-sasl +eai ldap ldap-bind lmdb mbox memcached mysql nis pam postgres sasl selinux sqlite ssl"
+
+DEPEND="
+	acct-group/postfix
+	acct-group/postdrop
+	acct-user/postfix
+	dev-libs/libpcre2:0
+	dev-lang/perl
+	berkdb? ( >=sys-libs/db-3.2:* )
+	cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) )
+	eai? ( dev-libs/icu:= )
+	ldap? ( net-nds/openldap:= )
+	ldap-bind? ( net-nds/openldap:=[sasl] )
+	lmdb? ( >=dev-db/lmdb-0.9.11:= )
+	mysql? ( dev-db/mysql-connector-c:0= )
+	nis? ( net-libs/libnsl:= )
+	pam? ( sys-libs/pam )
+	postgres? ( dev-db/postgresql:* )
+	sasl? (  >=dev-libs/cyrus-sasl-2 )
+	sqlite? ( dev-db/sqlite:3 )
+	ssl? ( >=dev-libs/openssl-1.1.1:0= )
+	"
+
+RDEPEND="${DEPEND}
+	memcached? ( net-misc/memcached )
+	net-mail/mailbase
+	!mail-mta/courier
+	!mail-mta/esmtp
+	!mail-mta/exim
+	!mail-mta/msmtp[mta]
+	!mail-mta/netqmail
+	!mail-mta/nullmailer
+	!mail-mta/sendmail
+	!mail-mta/opensmtpd
+	!mail-mta/ssmtp[mta]
+	selinux? ( sec-policy/selinux-postfix )"
+
+# require at least one of db implementations for newalias (and postmap)
+# command to function correctly
+REQUIRED_USE="
+	|| ( berkdb cdb lmdb )
+	ldap-bind? ( ldap sasl )
+	"
+
+S="${WORKDIR}/${MY_SRC}"
+
+src_prepare() {
+	default
+	sed -i -e "/^#define ALIAS_DB_MAP/s|:/etc/aliases|:/etc/mail/aliases|" \
+		src/util/sys_defs.h || die "sed failed"
+	# change default paths to better comply with portage standard paths
+	sed -i -e "s:/usr/local/:/usr/:g" conf/master.cf || die "sed failed"
+}
+
+src_configure() {
+	for name in CDB LDAP LMDB MYSQL PCRE PGSQL SDBM SQLITE
+	do
+		local AUXLIBS_${name}=""
+	done
+
+	# Make sure LDFLAGS get passed down to the executables.
+	local mycc="" mylibs="${LDFLAGS} -ldl"
+
+	# libpcre is EOL. prefer libpcre2
+	mycc=" -DHAS_PCRE=2"
+	AUXLIBS_PCRE="$(pcre2-config --libs8)"
+
+	use pam && mylibs="${mylibs} -lpam"
+
+	if use ldap; then
+		mycc="${mycc} -DHAS_LDAP"
+		AUXLIBS_LDAP="-lldap -llber"
+	fi
+
+	if use mysql; then
+		mycc="${mycc} -DHAS_MYSQL $(mysql_config --include)"
+		AUXLIBS_MYSQL="$(mysql_config --libs)"
+	fi
+
+	if use postgres; then
+		mycc="${mycc} -DHAS_PGSQL -I$(pg_config --includedir)"
+		AUXLIBS_PGSQL="-L$(pg_config --libdir) -lpq"
+	fi
+
+	if use sqlite; then
+		mycc="${mycc} -DHAS_SQLITE"
+		AUXLIBS_SQLITE="-lsqlite3 -lpthread"
+	fi
+
+	if use ssl; then
+		mycc="${mycc} -DUSE_TLS"
+		mylibs="${mylibs} -lssl -lcrypto"
+	fi
+
+	if use lmdb; then
+		mycc="${mycc} -DHAS_LMDB"
+		AUXLIBS_LMDB="-llmdb -lpthread"
+	fi
+
+	if ! use eai; then
+		mycc="${mycc} -DNO_EAI"
+	fi
+
+	# broken. and "in other words, not supported" by upstream.
+	# Use inet_protocols setting in main.cf
+	#if ! use ipv6; then
+	#	mycc="${mycc} -DNO_IPV6"
+	#fi
+
+	if use sasl; then
+		if use dovecot-sasl; then
+			# Set dovecot as default.
+			mycc="${mycc} -DDEF_SASL_SERVER=\\\"dovecot\\\""
+		fi
+		if use ldap-bind; then
+			mycc="${mycc} -DUSE_LDAP_SASL"
+		fi
+		mycc="${mycc} -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl"
+		mylibs="${mylibs} -lsasl2"
+	elif use dovecot-sasl; then
+		mycc="${mycc} -DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\""
+	fi
+
+	if ! use nis; then
+		mycc="${mycc} -DNO_NIS"
+	fi
+
+	if ! use berkdb; then
+		mycc="${mycc} -DNO_DB"
+		# change default database type
+		if use lmdb; then
+			mycc="${mycc} -DDEF_DB_TYPE=\\\"lmdb\\\""
+		elif use cdb; then
+			mycc="${mycc} -DDEF_DB_TYPE=\\\"cdb\\\""
+		fi
+	fi
+
+	if use cdb; then
+		mycc="${mycc} -DHAS_CDB -I/usr/include/cdb"
+		# Tinycdb is preferred.
+		if has_version dev-db/tinycdb ; then
+			AUXLIBS_CDB="-lcdb"
+		else
+			CDB_PATH="/usr/$(get_libdir)"
+			for i in cdb.a alloc.a buffer.a unix.a byte.a ; do
+				AUXLIBS_CDB="${AUXLIBS_CDB} ${CDB_PATH}/${i}"
+			done
+		fi
+	fi
+
+	sed -i -e "/^RANLIB/s/ranlib/$(tc-getRANLIB)/g" "${S}"/makedefs
+	sed -i -e "/^AR/s/ar/$(tc-getAR)/g" "${S}"/makedefs
+
+	emake makefiles shared=yes dynamicmaps=no pie=yes \
+		shlib_directory="/usr/$(get_libdir)/postfix/MAIL_VERSION" \
+		DEBUG="" CC="$(tc-getCC)" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" \
+		AUXLIBS_CDB="${AUXLIBS_CDB}" AUXLIBS_LDAP="${AUXLIBS_LDAP}" \
+		AUXLIBS_LMDB="${AUXLIBS_LMDB}" AUXLIBS_MYSQL="${AUXLIBS_MYSQL}" \
+		AUXLIBS_PCRE="${AUXLIBS_PCRE}" AUXLIBS_PGSQL="${AUXLIBS_PGSQL}" \
+		AUXLIBS_SQLITE="${AUXLIBS_SQLITE}"
+}
+
+src_install() {
+	LD_LIBRARY_PATH="${S}/lib" \
+	/bin/sh postfix-install \
+		-non-interactive \
+		install_root="${D}" \
+		config_directory="/etc/postfix" \
+		manpage_directory="/usr/share/man" \
+		command_directory="/usr/sbin" \
+		mailq_path="/usr/bin/mailq" \
+		newaliases_path="/usr/bin/newaliases" \
+		sendmail_path="/usr/sbin/sendmail" \
+		|| die "postfix-install failed"
+
+	# Fix spool removal on upgrade
+	rm -Rf "${D}"/var
+	keepdir /var/spool/postfix
+
+	# Install rmail for UUCP, closes bug #19127
+	dobin auxiliary/rmail/rmail
+
+	# Provide another link for legacy FSH
+	dosym ../sbin/sendmail /usr/$(get_libdir)/sendmail
+
+	# Install qshape, posttls-finger, collate and tlstype
+	dobin auxiliary/qshape/qshape.pl
+	doman man/man1/qshape.1
+	dobin bin/posttls-finger
+	doman man/man1/posttls-finger.1
+	dobin auxiliary/collate/collate.pl
+	newdoc auxiliary/collate/README README.collate
+	dobin auxiliary/collate/tlstype.pl
+	dodoc auxiliary/collate/README.tlstype
+
+	# Performance tuning tools and their manuals
+	dosbin bin/smtp-{source,sink} bin/qmqp-{source,sink}
+	doman man/man1/smtp-{source,sink}.1 man/man1/qmqp-{source,sink}.1
+
+	# Set proper permissions on required files/directories
+	keepdir /var/lib/postfix
+	fowners -R postfix:postfix /var/lib/postfix
+	fperms 0750 /var/lib/postfix
+	fowners root:postdrop /usr/sbin/post{drop,queue,log}
+	fperms 02755 /usr/sbin/post{drop,queue,log}
+
+	keepdir /etc/postfix
+	keepdir /etc/postfix/postfix-files.d
+	if use mbox; then
+		mypostconf="mail_spool_directory=/var/mail"
+	else
+		mypostconf="home_mailbox=.maildir/"
+	fi
+	LD_LIBRARY_PATH="${S}/lib" \
+	"${D}"/usr/sbin/postconf -c "${D}"/etc/postfix \
+		-e ${mypostconf} || die "postconf failed"
+
+	insinto /etc/postfix
+	newins "${FILESDIR}"/smtp.pass saslpass
+	fperms 600 /etc/postfix/saslpass
+
+	newinitd "${FILESDIR}"/postfix.rc6.${RC_VER} postfix
+	# do not start mysql/postgres unnecessarily - bug #359913
+	use mysql || sed -i -e "s/mysql //" "${D}/etc/init.d/postfix"
+	use postgres || sed -i -e "s/postgresql //" "${D}/etc/init.d/postfix"
+
+	dodoc *README COMPATIBILITY HISTORY PORTING RELEASE_NOTES*
+	dodoc -r README_FILES/ examples/
+	# postfix set-permissions expects uncompressed man files
+	docompress -x /usr/share/man
+
+	if use pam; then
+		pamd_mimic_system smtp auth account
+	fi
+
+	if use sasl; then
+		insinto /etc/sasl2
+		newins "${FILESDIR}"/smtp.sasl smtpd.conf
+	fi
+
+	# header files
+	insinto /usr/include/postfix
+	doins include/*.h
+
+	if has_version mail-mta/postfix; then
+		# let the sysadmin decide when to change the compatibility_level
+		sed -i -e /^compatibility_level/"s/^/#/" "${D}"/etc/postfix/main.cf || die
+	fi
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+}
+
+pkg_postinst() {
+	# do not assume berkdb
+	if [[ ! -e /etc/mail/aliases.db \
+	   && ! -e /etc/mail/aliases.cdb \
+	   && ! -e /etc/mail/aliases.lmdb ]] ; then
+		ewarn
+		ewarn "You must edit /etc/mail/aliases to suit your needs"
+		ewarn "and then run /usr/bin/newaliases. Postfix will not"
+		ewarn "work correctly without it."
+		ewarn
+	fi
+
+	# check and fix file permissions
+	"${EROOT}"/usr/sbin/postfix set-permissions
+
+	# hint for configuring tls
+	if use ssl ; then
+		if "${EROOT}"/usr/sbin/postfix tls all-default-client; then
+			elog "To configure client side TLS settings, please run:"
+			elog "${EROOT}"/usr/sbin/postfix tls enable-client
+		fi
+		if "${EROOT}"/usr/sbin/postfix tls all-default-server; then
+			elog "To configure server side TLS settings, please run:"
+			elog "${EROOT}"/usr/sbin/postfix tls enable-server
+		fi
+	fi
+}
diff --git a/mail-mta/postfix/postfix-3.8_pre20230409.ebuild b/mail-mta/postfix/postfix-3.9_pre20230412.ebuild
index 3921e4699e0e..809c17c943f1 100644
--- a/mail-mta/postfix/postfix-3.8_pre20230409.ebuild
+++ b/mail-mta/postfix/postfix-3.9_pre20230412.ebuild
@@ -16,7 +16,7 @@ SRC_URI="${MY_URI}/${MY_SRC}.tar.gz"
 LICENSE="|| ( IBM EPL-2.0 )"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="berkdb cdb dovecot-sasl +eai ldap ldap-bind lmdb mbox memcached mysql nis pam postgres sasl selinux sqlite ssl"
+IUSE="+berkdb cdb dovecot-sasl +eai ldap ldap-bind lmdb mbox memcached mysql nis pam postgres sasl selinux sqlite ssl"
 
 DEPEND="
 	acct-group/postfix
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 5141d34462c9..61dd69ab58e1 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index ad331724d479..f96a21ae7e8c 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Wed, 12 Apr 2023 16:09:35 +0000
+Wed, 12 Apr 2023 22:09:36 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index d444d8641fa3..bfc1385e18a7 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 540216 BLAKE2B d30aef090eaffb1f3ce91f96dfcc44f7a5d1a954885fba68126dee1aa21a3de740e45dd7106f5d3ba2b51e48eda29870b954e2a90cc8bfa9dc1ac93912daadef SHA512 f9ff42d8d58ea6e6bae5d32f95af7bcddc333ce0478d31cfefb14e85c8d99eaf4d3d9a0802c961e3f7e7d8f3696894cb1d1d0e81db3807d1796858a550f0351f
-TIMESTAMP 2023-04-12T16:09:38Z
+TIMESTAMP 2023-04-12T22:09:39Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmQ218JfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmQ3LCNfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBz7hAAp4DrHeUEWtivfi9TKNiU/rXNlv3Xt/0s6EWMdrZmuu4z3zH9PyTA6jKb
-Me91EjqVuHm+9NdweQgYV/AUePriH5rHOTFyjpAFC8kemqZbgXeil3O+2XThSLUI
-FglBJJQiqMx7UBJBbGF2Q53tQMyp8VR8eukhU/xVZ00QLgf4+ttQAxcvLI41gJB5
-goRBW/+nj1f60qdNSw4/im359uMYJefaBVYE0E8jqVfg3LPJEXe/p2AYFIq7mwvx
-nHNEBoYRMVkNZNx8O4XS/6eSt4KwcaHt5HTgfFsLMoJBrvd83R5o2Ps6yu1+tNM9
-w/YyNK1xTSmthKYkZQADlMCEGYdo3K8vQwlg8t+yocoERnWmwDYZuDjfpcWY0GIH
-PczVO56INBSVa1PLEI2szw27xVsE5NElMn/pQFSiTBcC8kt7HurD1y/+bQs6sfFg
-rBfQyO31Rg71iUiyz8XEzIP0wsovm2XwcLRpkfrZu8L7nGzoe7HcxLCBS6aRM20D
-mcCI2eYKaDcgoZTSlLD9kIANYH5ZDzIvrmZTU3IDzrwJG+v6lpjqtN6xXChOj1xQ
-T2ky0H51iSR8336E06jfettEqoEGTThSn7FOMtDxbJLxLrUURU3q9DLjImu7QYX2
-kCxZ1HXay0FB7WH9yDgJ7Ygd8wpulNxl64dEdcWM9CcawY0YggI=
-=Na9i
+klAD/g/9F3Lg8hnoURCXiKSGoDOtoSwLnD/9uWx97JzVJWtby5p2fwlQ8kV+jvEt
+VVenXQDTjBRYE4VPInPNcM0FC6L8CR7vquXJemas8U5EBORdxdnpKIZjhfKTcHpV
+xj48y+3j6K34hTaJSrTSMuWj2Wssnoo6GlomGJIasWrpxfGr7qYD1SCIYOrf2JdB
+39fsng98XHXTY15dXU0Mitsw3rPUJ8eD18xHeAKc4960QzR1jFCVHu5B3XFMQNAG
+Ft6w+8zTQfo7i1v51PeEHvYCWHGSQ63dJw8VL6EtYasDXT2WOUaCSV2PwqdkPJMV
++6zw9o9LOqhO0bS+I/hyO+YjoCtmi5t/LmuiFD/TzFrxt29bLFa6b4+bKwCaM6XC
+OKPJQvEWL7zXbqdAF/bCBP9wtwy+52jMJbemvy+D1NQ6ORlABYIUO3p/lhWrGUSj
+7kWDy52MlAU72Ol5otJLRpE6IzXp1Mpbp9ssnfwuIQQXyIieDKz7zCuuMgdVsf15
+h3uq3jgKrBidzLQzBC1vjq5i2RTAPLx2JqngAasMiXctKsRG6QITgYDjw64p5MXF
+CFx0dpqhNi6+ZkY65UTAyU9nXT9WjGg5fnj/lhbTjc//uSjPMhzpvw2Msp/SMwCx
+NC++QI7+GKPqC0kODD1M7lDaldLZ+yxd6PGTDtb8Q2/IJc1eRHY=
+=jHAz
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index ad331724d479..f96a21ae7e8c 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Wed, 12 Apr 2023 16:09:35 +0000
+Wed, 12 Apr 2023 22:09:36 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 3f4391751c0b..4f5b1bf04734 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-containers/Manifest.gz b/metadata/md5-cache/app-containers/Manifest.gz
index 97e8823382bd..1345ba683418 100644
--- a/metadata/md5-cache/app-containers/Manifest.gz
+++ b/metadata/md5-cache/app-containers/Manifest.gz
diff --git a/metadata/md5-cache/app-containers/docker-compose-2.12.2 b/metadata/md5-cache/app-containers/docker-compose-2.12.2
deleted file mode 100644
index 832c423f32b1..000000000000
--- a/metadata/md5-cache/app-containers/docker-compose-2.12.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-lang/go-1.18 app-arch/unzip
-DEFINED_PHASES=compile install postinst prepare test unpack
-DESCRIPTION=Multi-container orchestration for Docker
-EAPI=8
-HOMEPAGE=https://github.com/docker/compose
-INHERIT=bash-completion-r1 go-module
-KEYWORDS=~amd64 ~arm64
-LICENSE=Apache-2.0
-RDEPEND=>=app-containers/docker-cli-20.10.3
-RESTRICT=strip
-SLOT=2
-SRC_URI=https://github.com/docker/compose/archive/v2.12.2.tar.gz -> docker-compose-2.12.2.tar.gz https://dev.gentoo.org/~williamh/dist/docker-compose-2.12.2-deps.tar.xz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	f9700c7efec1fd4955363169e9930c1c	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=7219f85a6b88d3542ab86a010056b26f
diff --git a/metadata/md5-cache/app-containers/docker-compose-2.16.0 b/metadata/md5-cache/app-containers/docker-compose-2.16.0
deleted file mode 100644
index 7195bcab87f5..000000000000
--- a/metadata/md5-cache/app-containers/docker-compose-2.16.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-lang/go-1.18 app-arch/unzip
-DEFINED_PHASES=compile install postinst prepare test unpack
-DESCRIPTION=Multi-container orchestration for Docker
-EAPI=8
-HOMEPAGE=https://github.com/docker/compose
-INHERIT=bash-completion-r1 go-module
-KEYWORDS=~amd64 ~arm64
-LICENSE=Apache-2.0
-RDEPEND=>=app-containers/docker-cli-23.0.0
-RESTRICT=strip
-SLOT=2
-SRC_URI=https://github.com/docker/compose/archive/v2.16.0.tar.gz -> docker-compose-2.16.0.tar.gz https://dev.gentoo.org/~williamh/dist/docker-compose-2.16.0-deps.tar.xz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	f9700c7efec1fd4955363169e9930c1c	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=02282714e8f291adfc32d0b25daac477
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index e0a0468e2c71..dd6e96dd5e4a 100644
--- a/metadata/md5-cache/dev-libs/Manifest.gz
+++ b/metadata/md5-cache/dev-libs/Manifest.gz
diff --git a/metadata/md5-cache/dev-libs/sleef-3.5.1-r1 b/metadata/md5-cache/dev-libs/sleef-3.5.1-r1
index 97aadd94c5a8..eeccd1c3faa6 100644
--- a/metadata/md5-cache/dev-libs/sleef-3.5.1-r1
+++ b/metadata/md5-cache/dev-libs/sleef-3.5.1-r1
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+BDEPEND=test? ( >=dev-libs/mpfr-4.2 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Implements vectorized versions of C standard math functions
 EAPI=8
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/shibatch/sleef/archive/refs/tags/3.5.1.tar.gz -> sleef-3.5.1.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=6a7a42271cbe5cf599886052ee1fe533
+_md5_=bdc4b3c31119d3f76430ac17c26296b1
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 53d9e2ba299d..5fd8fea54935 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/pytesseract-0.3.10-r1 b/metadata/md5-cache/dev-python/pytesseract-0.3.10-r1
index fe88f6c203f5..98c611cc6417 100644
--- a/metadata/md5-cache/dev-python/pytesseract-0.3.10-r1
+++ b/metadata/md5-cache/dev-python/pytesseract-0.3.10-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/madmaze/pytesseract
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/pillow[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] app-text/tesseract python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/madmaze/pytesseract/archive/refs/tags/v0.3.10.tar.gz -> pytesseract-0.3.10.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=bd4e2492b686ca5c789ca733b540ff6a
+_md5_=890a34fc93750d5b8b20bbcaebc431b0
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index 3a7215a08176..77fc9e42ec72 100644
--- a/metadata/md5-cache/dev-ruby/Manifest.gz
+++ b/metadata/md5-cache/dev-ruby/Manifest.gz
diff --git a/metadata/md5-cache/dev-ruby/connection_pool-2.3.0 b/metadata/md5-cache/dev-ruby/connection_pool-2.3.0
index 9495d9809efe..bd24b6aa4691 100644
--- a/metadata/md5-cache/dev-ruby/connection_pool-2.3.0
+++ b/metadata/md5-cache/dev-ruby/connection_pool-2.3.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/mperham/connection_pool
 INHERIT=ruby-fakegem
 IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 test test
-KEYWORDS=~amd64 arm arm64 ~hppa ~loong ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~hppa ~loong ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mperham/connection_pool/archive/v2.3.0.tar.gz -> connection_pool-2.3.0.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	52594c9f6d00a877106c877d3dd1acee	ruby-ng	76a677328d71b04b457f26be67717028	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=8f34e23cdae2fc5f5801be09f1c80b47
+_md5_=19b811652180f1c5d61e75ba39996340
diff --git a/metadata/md5-cache/kde-plasma/Manifest.gz b/metadata/md5-cache/kde-plasma/Manifest.gz
index 879411e886ec..c53557480d2b 100644
--- a/metadata/md5-cache/kde-plasma/Manifest.gz
+++ b/metadata/md5-cache/kde-plasma/Manifest.gz
diff --git a/metadata/md5-cache/kde-plasma/kpipewire-5.27.4 b/metadata/md5-cache/kde-plasma/kpipewire-5.27.4-r1
index 3e7ad0168b50..7c5a5b300c97 100644
--- a/metadata/md5-cache/kde-plasma/kpipewire-5.27.4
+++ b/metadata/md5-cache/kde-plasma/kpipewire-5.27.4-r1
@@ -12,6 +12,6 @@ LICENSE=LGPL-2.1+
 RDEPEND=dev-libs/wayland >=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtdeclarative-5.15.7:5 >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtwayland-5.15.7:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kwayland-5.102.0:5 media-libs/libepoxy media-libs/libglvnd media-video/ffmpeg:= >=media-video/pipewire-0.3:= x11-libs/libdrm >=dev-qt/qtquickcontrols2-5.15.7:5 >=kde-frameworks/kirigami-5.102.0:5 x11-themes/sound-theme-freedesktop || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test )
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.27.4/kpipewire-5.27.4.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.27.4/kpipewire-5.27.4.tar.xz https://dev.gentoo.org/~asturm/distfiles/kpipewire-5.27.4-patchset-1.tar.xz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	ecm	15862358f80ef4da6fd9d7dde64e9148	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	kde.org	dc60243572471279b11120514b85b558	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	plasma.kde.org	53d92c8467317e55e197227d2ddef69a	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=ea375a50635c64b624d686123f3fbb79
+_md5_=efa698edfe5d8b7e16798fdda792ea26
diff --git a/metadata/md5-cache/kde-plasma/kwin-5.27.4-r1 b/metadata/md5-cache/kde-plasma/kwin-5.27.4.1
index 9287f63d849d..38d8b41911a1 100644
--- a/metadata/md5-cache/kde-plasma/kwin-5.27.4-r1
+++ b/metadata/md5-cache/kde-plasma/kwin-5.27.4.1
@@ -13,6 +13,6 @@ PDEPEND=>=kde-plasma/kde-cli-tools-5.27.4:5
 RDEPEND=>=dev-libs/libinput-1.19 >=dev-libs/wayland-1.21.0 >=dev-qt/qtconcurrent-5.15.7:5 >=dev-qt/qtdbus-5.15.7:5 >=dev-qt/qtdeclarative-5.15.7:5 >=dev-qt/qtgui-5.15.7:5=[egl,gles2-only=,libinput] >=dev-qt/qtwayland-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=dev-qt/qtx11extras-5.15.7:5 >=kde-frameworks/kactivities-5.102.0:5 >=kde-frameworks/kauth-5.102.0:5 >=kde-frameworks/kcmutils-5.102.0:5 >=kde-frameworks/kconfig-5.102.0:5[qml] >=kde-frameworks/kconfigwidgets-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kcrash-5.102.0:5 >=kde-frameworks/kdbusaddons-5.102.0:5 >=kde-frameworks/kdeclarative-5.102.0:5 >=kde-frameworks/kglobalaccel-5.102.0:5=[X] >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kidletime-5.102.0:5= >=kde-frameworks/kitemviews-5.102.0:5 >=kde-frameworks/knewstuff-5.102.0:5 >=kde-frameworks/knotifications-5.102.0:5 >=kde-frameworks/kpackage-5.102.0:5 >=kde-frameworks/kservice-5.102.0:5 >=kde-frameworks/kwayland-5.102.0:5 >=kde-frameworks/kwidgetsaddons-5.102.0:5 >=kde-frameworks/kwindowsystem-5.102.0:5=[X] >=kde-frameworks/kxmlgui-5.102.0:5 >=kde-frameworks/plasma-5.102.0:5 >=kde-plasma/breeze-5.27.4:5 >=kde-plasma/kdecoration-5.27.4:5 media-libs/fontconfig media-libs/freetype media-libs/lcms:2 media-libs/libepoxy media-libs/libglvnd >=media-libs/mesa-21.3[egl(+),gbm(+),wayland,X] virtual/libudev:= x11-libs/libX11 x11-libs/libXi >=x11-libs/libdrm-2.4.112 >=x11-libs/libxcb-1.10 >=x11-libs/libxcvt-0.1.1 >=x11-libs/libxkbcommon-1.5.0 x11-libs/xcb-util-cursor x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm accessibility? ( media-libs/libqaccessibilityclient:5 ) caps? ( sys-libs/libcap ) gles2-only? ( media-libs/mesa[gles2] ) lock? ( >=kde-plasma/kscreenlocker-5.27.4:5 ) plasma? ( >=kde-frameworks/krunner-5.102.0:5 ) screencast? ( >=media-video/pipewire-0.3:= ) !kde-plasma/kwayland-server >=dev-qt/qtquickcontrols-5.15.7:5 >=dev-qt/qtquickcontrols2-5.15.7:5 >=dev-qt/qtvirtualkeyboard-5.15.7:5 >=kde-frameworks/kirigami-5.102.0:5 >=kde-frameworks/kitemmodels-5.102.0:5[qml] sys-apps/hwdata x11-base/xwayland multimedia? ( >=dev-qt/qtmultimedia-5.15.7:5[gstreamer,qml] ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=test !test? ( test ) !test? ( test )
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.27.4/kwin-5.27.4.tar.xz https://dev.gentoo.org/~asturm/distfiles/kwin-5.27.4-patchset-1.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.27.4/kwin-5.27.4.1.tar.xz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	ecm	15862358f80ef4da6fd9d7dde64e9148	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	kde.org	dc60243572471279b11120514b85b558	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	plasma.kde.org	53d92c8467317e55e197227d2ddef69a	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=f580c9daef8d34aca0932471abdee49e
+_md5_=3fc5d7a33e1fb18cf7701d6782889af4
diff --git a/metadata/md5-cache/mail-mta/Manifest.gz b/metadata/md5-cache/mail-mta/Manifest.gz
index 19c25b63a271..eb81b729e091 100644
--- a/metadata/md5-cache/mail-mta/Manifest.gz
+++ b/metadata/md5-cache/mail-mta/Manifest.gz
diff --git a/metadata/md5-cache/mail-mta/courier-1.2.3-r1 b/metadata/md5-cache/mail-mta/courier-1.2.3-r1
new file mode 100644
index 000000000000..8f132aea4aa1
--- /dev/null
+++ b/metadata/md5-cache/mail-mta/courier-1.2.3-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile config configure install postinst prepare test
+DEPEND=>=net-libs/courier-authlib-0.72.0 >=net-libs/courier-unicode-2.2.6:= net-dns/libidn2:= gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/openssl:0= ) >=sys-libs/gdbm-1.8.0:= dev-libs/libpcre2 app-misc/mime-types fax? ( >=media-libs/netpbm-9.12 app-text/ghostscript-gpl >=net-dialup/mgetty-1.1.28 ) pam? ( sys-libs/pam ) mysql? ( dev-db/mysql-connector-c ) ldap? ( >=net-nds/openldap-1.2.11:= ) postgres? ( dev-db/postgresql:= ) spell? ( app-text/aspell ) fam? ( virtual/fam ) !mail-filter/maildrop !mail-mta/esmtp !mail-mta/exim !mail-mta/msmtp[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/sendmail !mail-mta/ssmtp[mta] !mail-mta/opensmtpd !net-mail/dot-forward !sys-apps/ucspi-tcp
+DESCRIPTION=An MTA designed specifically for maildirs
+EAPI=8
+HOMEPAGE=https://www.courier-mta.org/
+INHERIT=flag-o-matic
+IUSE=postgres ldap mysql pam nls ipv6 spell fax crypt norewrite fam web webmail gnutls
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-3
+PDEPEND=pam? ( net-mail/mailbase ) crypt? ( >=app-crypt/gnupg-1.0.4 )
+RDEPEND=>=net-libs/courier-authlib-0.72.0 >=net-libs/courier-unicode-2.2.6:= net-dns/libidn2:= gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/openssl:0= ) >=sys-libs/gdbm-1.8.0:= dev-libs/libpcre2 app-misc/mime-types fax? ( >=media-libs/netpbm-9.12 app-text/ghostscript-gpl >=net-dialup/mgetty-1.1.28 ) pam? ( sys-libs/pam ) mysql? ( dev-db/mysql-connector-c ) ldap? ( >=net-nds/openldap-1.2.11:= ) postgres? ( dev-db/postgresql:= ) spell? ( app-text/aspell ) fam? ( virtual/fam ) !mail-filter/maildrop !mail-mta/esmtp !mail-mta/exim !mail-mta/msmtp[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/sendmail !mail-mta/ssmtp[mta] !mail-mta/opensmtpd !net-mail/dot-forward !sys-apps/ucspi-tcp dev-lang/perl sys-process/procps !net-mail/courier-imap !net-mail/cyrus-imapd
+SLOT=0
+SRC_URI=mirror://sourceforge/courier/courier-1.2.3.tar.bz2
+_eclasses_=flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=211db838de31622a9a706e01a8310eed
diff --git a/metadata/md5-cache/mail-mta/postfix-3.8.0_rc1 b/metadata/md5-cache/mail-mta/postfix-3.8.0_rc1
new file mode 100644
index 000000000000..8948d5420b21
--- /dev/null
+++ b/metadata/md5-cache/mail-mta/postfix-3.8.0_rc1
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=acct-group/postfix acct-group/postdrop acct-user/postfix dev-libs/libpcre2:0 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) ) eai? ( dev-libs/icu:= ) ldap? ( net-nds/openldap:= ) ldap-bind? ( net-nds/openldap:=[sasl] ) lmdb? ( >=dev-db/lmdb-0.9.11:= ) mysql? ( dev-db/mysql-connector-c:0= ) nis? ( net-libs/libnsl:= ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:* ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( >=dev-libs/openssl-1.1.1:0= )
+DESCRIPTION=A fast and secure drop-in replacement for sendmail
+EAPI=8
+HOMEPAGE=http://www.postfix.org/
+INHERIT=pam systemd toolchain-funcs
+IUSE=+berkdb cdb dovecot-sasl +eai ldap ldap-bind lmdb mbox memcached mysql nis pam postgres sasl selinux sqlite ssl
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=|| ( IBM EPL-2.0 )
+RDEPEND=acct-group/postfix acct-group/postdrop acct-user/postfix dev-libs/libpcre2:0 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) ) eai? ( dev-libs/icu:= ) ldap? ( net-nds/openldap:= ) ldap-bind? ( net-nds/openldap:=[sasl] ) lmdb? ( >=dev-db/lmdb-0.9.11:= ) mysql? ( dev-db/mysql-connector-c:0= ) nis? ( net-libs/libnsl:= ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:* ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( >=dev-libs/openssl-1.1.1:0= ) memcached? ( net-misc/memcached ) net-mail/mailbase !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/msmtp[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/sendmail !mail-mta/opensmtpd !mail-mta/ssmtp[mta] selinux? ( sec-policy/selinux-postfix )
+REQUIRED_USE=|| ( berkdb cdb lmdb ) ldap-bind? ( ldap sasl )
+SLOT=0
+SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-3.8.0-RC1.tar.gz
+_eclasses_=flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	pam	4efe951aa8ce2c16288d7c915196fe29	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=34f23aed7efd155c5d04582922afb8d2
diff --git a/metadata/md5-cache/mail-mta/postfix-3.8_pre20230409 b/metadata/md5-cache/mail-mta/postfix-3.9_pre20230412
index 1f1f6246ec70..9afd571dd2e2 100644
--- a/metadata/md5-cache/mail-mta/postfix-3.8_pre20230409
+++ b/metadata/md5-cache/mail-mta/postfix-3.9_pre20230412
@@ -5,12 +5,12 @@ DESCRIPTION=A fast and secure drop-in replacement for sendmail
 EAPI=8
 HOMEPAGE=http://www.postfix.org/
 INHERIT=pam systemd toolchain-funcs
-IUSE=berkdb cdb dovecot-sasl +eai ldap ldap-bind lmdb mbox memcached mysql nis pam postgres sasl selinux sqlite ssl
+IUSE=+berkdb cdb dovecot-sasl +eai ldap ldap-bind lmdb mbox memcached mysql nis pam postgres sasl selinux sqlite ssl
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=|| ( IBM EPL-2.0 )
 RDEPEND=acct-group/postfix acct-group/postdrop acct-user/postfix dev-libs/libpcre2:0 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) ) eai? ( dev-libs/icu:= ) ldap? ( net-nds/openldap:= ) ldap-bind? ( net-nds/openldap:=[sasl] ) lmdb? ( >=dev-db/lmdb-0.9.11:= ) mysql? ( dev-db/mysql-connector-c:0= ) nis? ( net-libs/libnsl:= ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:* ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( >=dev-libs/openssl-1.1.1:0= ) memcached? ( net-misc/memcached ) net-mail/mailbase !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/msmtp[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/sendmail !mail-mta/opensmtpd !mail-mta/ssmtp[mta] selinux? ( sec-policy/selinux-postfix )
 REQUIRED_USE=|| ( berkdb cdb lmdb ) ldap-bind? ( ldap sasl )
 SLOT=0
-SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/postfix-3.8-20230409.tar.gz
+SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/postfix-3.9-20230412.tar.gz
 _eclasses_=flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	pam	4efe951aa8ce2c16288d7c915196fe29	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=55bcbacad7a0d1dd12563674573127aa
+_md5_=309c87e1dbbfaca113e1b39855a03954
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index 85fc39a8e017..eb62afbaa6ee 100644
--- a/metadata/md5-cache/net-analyzer/Manifest.gz
+++ b/metadata/md5-cache/net-analyzer/Manifest.gz
diff --git a/metadata/md5-cache/net-analyzer/zabbix-5.0.32 b/metadata/md5-cache/net-analyzer/zabbix-5.0.32
index 7bbf9079cdf4..f45126a5bc84 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-5.0.32
+++ b/metadata/md5-cache/net-analyzer/zabbix-5.0.32
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.zabbix.com/
 INHERIT=webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info
 IUSE=+agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh static java
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=curl? ( net-misc/curl ) gnutls? ( net-libs/gnutls:0= ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls:= net-nds/openldap:= ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c:= ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) openssl? ( dev-libs/openssl:=[-bindist(-)] ) oracle? ( dev-db/oracle-instantclient[odbc,sdk] ) postgres? ( dev-db/postgresql:* ) proxy? ( dev-libs/libevent:= sys-libs/zlib ) server? ( dev-libs/libevent:= sys-libs/zlib ) snmp? ( net-analyzer/net-snmp:= ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) acct-group/zabbix acct-user/zabbix java? ( >=virtual/jre-1.8:* ) mysql? ( virtual/mysql ) proxy? ( dev-libs/libpcre net-analyzer/fping[suid] ) server? ( app-admin/webapp-config dev-libs/libpcre net-analyzer/fping[suid] ) frontend? ( app-admin/webapp-config dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] media-libs/gd[png] virtual/httpd-php:* mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
 REQUIRED_USE=|| ( agent agent2 frontend proxy server ) ?? ( gnutls openssl ) proxy? ( ^^ ( mysql oracle postgres sqlite ) ) server? ( ^^ ( mysql oracle postgres ) !sqlite ) static? ( !oracle !snmp )
@@ -14,4 +14,4 @@ RESTRICT=test strip
 SLOT=0/5.0
 SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/5.0/zabbix-5.0.32.tar.gz agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/zabbix-5.0.32-go-deps.tar.xz )
 _eclasses_=go-module	f9700c7efec1fd4955363169e9930c1c	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	user-info	83547b4df3e1ba5a6bf91a0837eaa664	webapp	1aad5c010cfdf11d0376c80467b0de4c
-_md5_=adf22fe05b267bf8c5f91f029d55a61c
+_md5_=7c51764fccf32eccb36a57b549d56c17
diff --git a/metadata/md5-cache/net-analyzer/zabbix-6.0.14 b/metadata/md5-cache/net-analyzer/zabbix-6.0.14
index c79e1264dd49..8cc9cab6dfd5 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-6.0.14
+++ b/metadata/md5-cache/net-analyzer/zabbix-6.0.14
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.zabbix.com/
 INHERIT=webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info
 IUSE=agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh static java
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=curl? ( net-misc/curl ) gnutls? ( net-libs/gnutls:0= ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls:= net-nds/openldap:= ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c:= ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) openssl? ( dev-libs/openssl:=[-bindist(-)] ) oracle? ( dev-db/oracle-instantclient[odbc,sdk] ) postgres? ( dev-db/postgresql:* ) proxy? ( dev-libs/libevent:= sys-libs/zlib ) server? ( dev-libs/libevent:= sys-libs/zlib ) snmp? ( net-analyzer/net-snmp:= ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) acct-group/zabbix acct-user/zabbix java? ( >=virtual/jre-1.8:* ) mysql? ( virtual/mysql ) proxy? ( dev-libs/libpcre2:= net-analyzer/fping[suid] ) server? ( app-admin/webapp-config dev-libs/libpcre2:= net-analyzer/fping[suid] ) frontend? ( app-admin/webapp-config dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] media-libs/gd[png] virtual/httpd-php:* mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
 REQUIRED_USE=|| ( agent agent2 frontend proxy server ) ?? ( gnutls openssl ) proxy? ( ^^ ( mysql oracle postgres sqlite ) ) server? ( ^^ ( mysql oracle postgres ) !sqlite ) static? ( !oracle !snmp )
@@ -14,4 +14,4 @@ RESTRICT=test strip
 SLOT=0/6.0
 SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/6.0/zabbix-6.0.14.tar.gz agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/zabbix-6.0.14-go-deps.tar.xz )
 _eclasses_=go-module	f9700c7efec1fd4955363169e9930c1c	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	user-info	83547b4df3e1ba5a6bf91a0837eaa664	webapp	1aad5c010cfdf11d0376c80467b0de4c
-_md5_=33a048596fcccf3bfd46f4fd45e87ec6
+_md5_=49a7c8cdcae29c595e5f5adbea587093
diff --git a/metadata/md5-cache/net-analyzer/zabbix-6.2.8 b/metadata/md5-cache/net-analyzer/zabbix-6.2.8
index 4d6eacd5213a..8b592cf98564 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-6.2.8
+++ b/metadata/md5-cache/net-analyzer/zabbix-6.2.8
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.zabbix.com/
 INHERIT=webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info
 IUSE=agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh static java
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=curl? ( net-misc/curl ) gnutls? ( net-libs/gnutls:0= ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls:= net-nds/openldap:= ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c:= ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) openssl? ( dev-libs/openssl:=[-bindist(-)] ) oracle? ( dev-db/oracle-instantclient[odbc,sdk] ) postgres? ( dev-db/postgresql:* ) proxy? ( dev-libs/libevent:= sys-libs/zlib ) server? ( dev-libs/libevent:= sys-libs/zlib ) snmp? ( net-analyzer/net-snmp:= ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) acct-group/zabbix acct-user/zabbix java? ( >=virtual/jre-1.8:* ) mysql? ( virtual/mysql ) proxy? ( dev-libs/libpcre2:= net-analyzer/fping[suid] ) server? ( app-admin/webapp-config dev-libs/libpcre2:= net-analyzer/fping[suid] ) frontend? ( app-admin/webapp-config dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] media-libs/gd[png] virtual/httpd-php:* mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
 REQUIRED_USE=|| ( agent agent2 frontend proxy server ) ?? ( gnutls openssl ) proxy? ( ^^ ( mysql oracle postgres sqlite ) ) server? ( ^^ ( mysql oracle postgres ) !sqlite ) static? ( !oracle !snmp )
@@ -14,4 +14,4 @@ RESTRICT=test strip
 SLOT=0/6.2
 SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/6.2/zabbix-6.2.8.tar.gz agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/zabbix-6.2.8-go-deps.tar.xz )
 _eclasses_=go-module	f9700c7efec1fd4955363169e9930c1c	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	user-info	83547b4df3e1ba5a6bf91a0837eaa664	webapp	1aad5c010cfdf11d0376c80467b0de4c
-_md5_=33a048596fcccf3bfd46f4fd45e87ec6
+_md5_=49a7c8cdcae29c595e5f5adbea587093
diff --git a/metadata/md5-cache/net-dialup/Manifest.gz b/metadata/md5-cache/net-dialup/Manifest.gz
index f6963cea86e5..78977f95e6a2 100644
--- a/metadata/md5-cache/net-dialup/Manifest.gz
+++ b/metadata/md5-cache/net-dialup/Manifest.gz
diff --git a/metadata/md5-cache/net-dialup/ppp-2.5.0 b/metadata/md5-cache/net-dialup/ppp-2.5.0
new file mode 100644
index 000000000000..25c684fb3e54
--- /dev/null
+++ b/metadata/md5-cache/net-dialup/ppp-2.5.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst setup
+DEPEND=dev-libs/openssl:0= virtual/libcrypt:= activefilter? ( net-libs/libpcap ) atm? ( net-dialup/linux-atm ) gtk? ( x11-libs/gtk+:2 ) pam? ( sys-libs/pam ) systemd? ( sys-apps/systemd )
+DESCRIPTION=Point-to-Point Protocol (PPP)
+EAPI=8
+HOMEPAGE=https://ppp.samba.org/
+INHERIT=linux-info pam
+IUSE=activefilter atm gtk pam systemd
+LICENSE=BSD GPL-2
+PDEPEND=net-dialup/ppp-scripts
+RDEPEND=dev-libs/openssl:0= virtual/libcrypt:= activefilter? ( net-libs/libpcap ) atm? ( net-dialup/linux-atm ) gtk? ( x11-libs/gtk+:2 ) pam? ( sys-libs/pam ) systemd? ( sys-apps/systemd ) !<net-misc/netifrc-0.7.1-r2
+SLOT=0/2.5.0
+SRC_URI=https://download.samba.org/pub/ppp/ppp-2.5.0.tar.gz https://github.com/ppp-project/ppp/blob/ppp-2.5.0/contrib/pppgetpass/pppgetpass.8
+_eclasses_=flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	d1408425c7c4a7669b9b17735404b693	pam	4efe951aa8ce2c16288d7c915196fe29	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=3a363b6234e3989765c93f9daf6745d8
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index fdd5333de2b1..fad6b0128363 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/gupnp-igd-1.6.0 b/metadata/md5-cache/net-libs/gupnp-igd-1.6.0
new file mode 100644
index 000000000000..a1d622e522e8
--- /dev/null
+++ b/metadata/md5-cache/net-libs/gupnp-igd-1.6.0
@@ -0,0 +1,17 @@
+BDEPEND=dev-util/glib-utils sys-devel/gettext virtual/pkgconfig gtk-doc? ( dev-util/gtk-doc app-text/docbook-xml-dtd:4.1.2 ) app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-libs/glib-2.70.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-libs/gssdp-1.6:1.6=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-libs/gupnp-1.6:1.6=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.10 )
+DESCRIPTION=Library to handle UPnP IGD port mapping for GUPnP
+EAPI=8
+HOMEPAGE=http://gupnp.org https://gitlab.gnome.org/GNOME/gupnp-igd
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=gnome.org meson-multilib xdg
+IUSE=gtk-doc +introspection abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-libs/glib-2.70.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-libs/gssdp-1.6:1.6=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-libs/gupnp-1.6:1.6=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.10 )
+RESTRICT=test
+SLOT=1.6/1.6-0
+SRC_URI=mirror://gnome/sources/gupnp-igd/1.6/gupnp-igd-1.6.0.tar.xz
+_eclasses_=gnome.org	6b39404f1491c60a2d32e3c693a683fe	meson	915ec7c25e08d7886558215e6809ca1e	meson-multilib	8989922d980e5e870cc3de949d1b2586	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=29944730bd4edf1337396d103140de69
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index 1c6ca6de80b6..c0070a3bd017 100644
--- a/metadata/md5-cache/sci-libs/Manifest.gz
+++ b/metadata/md5-cache/sci-libs/Manifest.gz
diff --git a/metadata/md5-cache/sci-libs/caffe2-2.0.0-r1 b/metadata/md5-cache/sci-libs/caffe2-2.0.0-r1
index dfcea8ecf6e0..2b1ee19d4eeb 100644
--- a/metadata/md5-cache/sci-libs/caffe2-2.0.0-r1
+++ b/metadata/md5-cache/sci-libs/caffe2-2.0.0-r1
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/pytorch/pytorch/archive/refs/tags/v2.0.0.tar.gz -> pytorch-2.0.0.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cuda	13d76baf0dc95e560610c6b7dfa79db4	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=d0983f2a5c85605f0418fb6569fe8e36
+_md5_=e05d224ad53081d458a2d9f903155eb4
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 762827907fba..d7c169c77965 100644
--- a/metadata/md5-cache/sys-apps/Manifest.gz
+++ b/metadata/md5-cache/sys-apps/Manifest.gz
diff --git a/metadata/md5-cache/sys-apps/openrc-0.45.2-r2 b/metadata/md5-cache/sys-apps/openrc-0.45.2-r2
deleted file mode 100644
index e733d694558c..000000000000
--- a/metadata/md5-cache/sys-apps/openrc-0.45.2-r2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst preinst test
-DEPEND=ncurses? ( sys-libs/ncurses:0= ) pam? ( sys-libs/pam ) audit? ( sys-process/audit ) sys-process/psmisc selinux? ( sys-apps/policycoreutils >=sys-libs/libselinux-2.6 ) virtual/os-headers ncurses? ( virtual/pkgconfig )
-DESCRIPTION=OpenRC manages the services, startup and shutdown of a host
-EAPI=8
-HOMEPAGE=https://github.com/openrc/openrc/
-INHERIT=meson pam
-IUSE=audit bash debug ncurses pam newnet +netifrc selinux sysv-utils unicode
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=BSD-2
-PDEPEND=netifrc? ( net-misc/netifrc )
-RDEPEND=ncurses? ( sys-libs/ncurses:0= ) pam? ( sys-libs/pam ) audit? ( sys-process/audit ) sys-process/psmisc selinux? ( sys-apps/policycoreutils >=sys-libs/libselinux-2.6 ) bash? ( app-shells/bash ) !prefix? ( sysv-utils? ( !sys-apps/systemd[sysv-utils(-)] !sys-apps/sysvinit ) !sysv-utils? ( || ( >=sys-apps/sysvinit-2.86-r6[selinux?] sys-apps/s6-linux-init[sysv-utils(-)] ) ) virtual/tmpfiles ) selinux? ( >=sec-policy/selinux-base-policy-2.20170204-r4 >=sec-policy/selinux-openrc-2.20170204-r4 )
-SLOT=0
-SRC_URI=https://github.com/OpenRC/openrc/archive/0.45.2.tar.gz -> openrc-0.45.2.tar.gz
-_eclasses_=flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	meson	915ec7c25e08d7886558215e6809ca1e	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	pam	4efe951aa8ce2c16288d7c915196fe29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=d9dd7a7abb1f919245beea143621bc55
diff --git a/metadata/md5-cache/www-misc/Manifest.gz b/metadata/md5-cache/www-misc/Manifest.gz
index 6ab6d86cfd69..5978089b3a08 100644
--- a/metadata/md5-cache/www-misc/Manifest.gz
+++ b/metadata/md5-cache/www-misc/Manifest.gz
diff --git a/metadata/md5-cache/www-misc/urlwatch-2.26 b/metadata/md5-cache/www-misc/urlwatch-2.26
index 166934e75903..c14f63c6c9de 100644
--- a/metadata/md5-cache/www-misc/urlwatch-2.26
+++ b/metadata/md5-cache/www-misc/urlwatch-2.26
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://thp.io/2008/urlwatch/ https://github.com/thp/urlwatch/ https://pypi.org/project/urlwatch/
 INHERIT=distutils-r1 pypi
 IUSE=doc test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=dev-python/appdirs[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/cssselect[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/keyring[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/lxml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/minidb-2.0.6[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/u/urlwatch/urlwatch-2.26.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=80ca3b8f48ff01d470650ba3c56f3b70
+_md5_=e835ba714edbe5e48ca4d0c8d8ba6b88
diff --git a/metadata/md5-cache/x11-drivers/Manifest.gz b/metadata/md5-cache/x11-drivers/Manifest.gz
index f8532477fcdf..d654b75add9c 100644
--- a/metadata/md5-cache/x11-drivers/Manifest.gz
+++ b/metadata/md5-cache/x11-drivers/Manifest.gz
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-intel-2.99.917_p20230201 b/metadata/md5-cache/x11-drivers/xf86-video-intel-2.99.917_p20230201
new file mode 100644
index 000000000000..0398c5279c69
--- /dev/null
+++ b/metadata/md5-cache/x11-drivers/xf86-video-intel-2.99.917_p20230201
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DEPEND=x11-libs/libXext x11-libs/libXfixes x11-libs/libXScrnSaver >=x11-libs/pixman-0.27.1 >=x11-libs/libdrm-2.4.52[video_cards_intel] >=x11-base/xorg-server-1.18 tools? ( x11-libs/libX11 x11-libs/libxcb x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender x11-libs/libxshmfence x11-libs/libXtst ) udev? ( virtual/libudev:= ) xvmc? ( >=x11-libs/libXvMC-1.0.12-r1 >=x11-libs/libxcb-1.5 x11-libs/xcb-util ) x11-base/xorg-proto x11-base/xorg-proto dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) >=x11-base/xorg-server-1.20[xorg] >=x11-libs/libpciaccess-0.14
+DESCRIPTION=X.Org driver for Intel cards
+EAPI=8
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/driver/xf86-video-intel
+INHERIT=linux-info xorg-3 flag-o-matic
+IUSE=debug +sna tools +udev uxa xvmc dri
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=x11-libs/libXext x11-libs/libXfixes x11-libs/libXScrnSaver >=x11-libs/pixman-0.27.1 >=x11-libs/libdrm-2.4.52[video_cards_intel] >=x11-base/xorg-server-1.18 tools? ( x11-libs/libX11 x11-libs/libxcb x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender x11-libs/libxshmfence x11-libs/libXtst ) udev? ( virtual/libudev:= ) xvmc? ( >=x11-libs/libXvMC-1.0.12-r1 >=x11-libs/libxcb-1.5 x11-libs/xcb-util ) x11-base/xorg-server:= dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) >=x11-base/xorg-server-1.20[xorg] >=x11-libs/libpciaccess-0.14
+REQUIRED_USE=|| ( sna uxa )
+SLOT=0
+SRC_URI=https://gitlab.freedesktop.org/xorg/driver/xf86-video-intel/-/archive/b74b67f0f321875492968f7097b9d6e82a66d7df/xf86-video-intel-2.99.917_p20230201.tar.bz2
+_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xorg-3	5a9d0eaf387b253edab4a38cd6cfdfe3
+_md5_=6e4795ddfa32d3f82e64a3885dc48f63
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-intel-9999 b/metadata/md5-cache/x11-drivers/xf86-video-intel-9999
index c07b6919b6b5..322196962abf 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-intel-9999
+++ b/metadata/md5-cache/x11-drivers/xf86-video-intel-9999
@@ -2,7 +2,7 @@ BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/
 DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DEPEND=x11-libs/libXext x11-libs/libXfixes x11-libs/libXScrnSaver >=x11-libs/pixman-0.27.1 >=x11-libs/libdrm-2.4.52[video_cards_intel] >=x11-base/xorg-server-1.18 tools? ( x11-libs/libX11 x11-libs/libxcb x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender x11-libs/libxshmfence x11-libs/libXtst ) udev? ( virtual/libudev:= ) xvmc? ( >=x11-libs/libXvMC-1.0.12-r1 >=x11-libs/libxcb-1.5 x11-libs/xcb-util ) x11-base/xorg-proto x11-base/xorg-proto dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) >=x11-base/xorg-server-1.20[xorg] >=x11-libs/libpciaccess-0.14
 DESCRIPTION=X.Org driver for Intel cards
-EAPI=7
+EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/driver/xf86-video-intel
 INHERIT=linux-info xorg-3 flag-o-matic
 IUSE=debug +sna tools +udev uxa xvmc dri
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=x11-libs/libXext x11-libs/libXfixes x11-libs/libXScrnSaver >=x11-libs/pixman-0.27.1 >=x11-libs/libdrm-2.4.52[video_cards_intel] >=x11-base/xorg-server-1.18 tools? ( x11-libs/libX11 x11-libs/libxcb x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender x11-libs/libxshmfence x11-libs/libXtst ) udev? ( virtual/libudev:= ) xvmc? ( >=x11-libs/libXvMC-1.0.12-r1 >=x11-libs/libxcb-1.5 x11-libs/xcb-util ) x11-base/xorg-server:= dri? ( x11-base/xorg-server[-minimal] x11-libs/libdrm ) >=x11-base/xorg-server-1.20[xorg] >=x11-libs/libpciaccess-0.14
 REQUIRED_USE=|| ( sna uxa )
 SLOT=0
-_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	git-r3	27e13c09a4c7e4c78ac812f74727e676	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	d1408425c7c4a7669b9b17735404b693	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	5a9d0eaf387b253edab4a38cd6cfdfe3
-_md5_=27c3a41bb2277dfdba67e8e3fb669569
+_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	git-r3	27e13c09a4c7e4c78ac812f74727e676	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xorg-3	5a9d0eaf387b253edab4a38cd6cfdfe3
+_md5_=470b64c755e71acf45611de483d68f33
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index c5b31251a9c5..1e029fc4ac63 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 15493 BLAKE2B ec5ea168778a79b147975de4177e6e700a7d37e6ee037cb43e8a2fb5109fe7703b6271a466b25edb7a1f6a61aa9467b69f02382396560dc259c3acdd5e880f30 SHA512 24314abdcaad22302e8e4885bab38f0250026f6284cc14fc2d6d81378bea47d1c1e985134c2fc0d63a8bc88f3563b53ea9e7b90d1e24f24b6733a9cc9fe4c83a
-TIMESTAMP 2023-04-12T16:09:38Z
+TIMESTAMP 2023-04-12T22:09:39Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmQ218JfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmQ3LCNfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAiQQ//a3es5EEyixR/GJiRIzqffLH8toEJUO30UpTmG2DWWGc5oOj7T1ywjICS
-lw4PpN4GjVjFjYpdwrTG6Rh0CjtxUz8L7B6phQtJyoQMM0nVt0OuBOYrLbfRLXxA
-VsYZ6EqBFwf5umnSO5BGjbVtWixEwaLE4pgKwtCTy2E1scuf0R8nbMTh2A2r+9jz
-zlECAIq7mpO1Np8iqKzEeYnplr3KDU/LPNqJQCiZh8z4RM6Se7q16wuz7ujPiopS
-tk7xzPHEo6S1xrMvOHSzUSBLp6zYyqhI7NhMWGOoZ+/03dmibmxQkxPcP1nRocoj
-2iByu3TWyEvEP/Bmz9+bOGMPh0R9xJYtehkOJ6JiRDnJh7emwTpx2m100dU4pOC7
-Jo9aoOt3bj4swoR6vvnvqUgCwGd8agK9G1OfFh+W3+bhmCkSJ1WxOnlksxQPyIZT
-0DSzT5PGW1DIMjbwe2DleN7UfykO7MDUe+dRNgCjmOmpmu4FWl9VY41L8IF8u/ei
-E+q8vnNxA5oYG/QK/+BUj+yzgBGUQZhFgKL67MhoP1MKoIAa/RlZETwuBLxXpRpA
-Z2fdT06J0ZRkeR0VyRoK6uc2Ws43zAyTUEzwGYjnqpZmSUhxhzgBL1uZIY2/4gnF
-zTpbO2Y5Yeh8YMj0N+nIQn9P3aIv2vipsCo7bT+IOYWuD22o4PE=
-=d3U0
+klDI7g//d+JTYLKwlWFKBff5fxnPI4aiSdZN9toddnXXNsj75oiHWQqRNA4mTaKa
+C4HO3wchckJaET8EyEy4l6yDhyJyeZY6ksZz1m9MHVIsvUVntV+Ugx9iUt1Ze3Jr
+OJiHMF6K+uHz4OtxLHJE/WFmGt8Ye7geCtCWQcnXVNhy053cjrEyj9YyyVBAdwG9
+T+mDvFANz4goB+Vxv+yY5KcmxhP5wfSV7t8fxhuQPd+pR7occGbTNlmnhsmC4RKl
+qyY9+on9kDswyoQxkAPAhu5G306vCQaRw4xsle53Mt5/3/EQnOq+nHLjbf8WohX5
+abeIMyCBIkWNGdjfa+4xV2suwrmU/UCutjkwfuBUSDAfVxmRwWs8XJobwE5mVGdw
+9RCRTWJj0+6LmsUCFwuMVmStld4oq90pI2q2QOyozMpAZF+l5r+hbsZ5Xj1h00+a
+FjegvZB+d3/0dG3kpy5vEGRBssC4ap0g0R6VnALuTvUrM5dlUss4r79LSkvvYp1Q
+nQBu0uNGvFc47Jx0CFMnSr31EBL6rduC6lxKv1L++f025qkl3y3bGqAJZTFffuKh
+P2rOWW+r9Ywju2RDBSH01xEQcprCnE6E96PLr4xIhkj9H5wvSzfdtSIzQbHN7K/M
+yDSsGgHOyeTXqB54ghCIweDEPabDP4gMsBwG6Frv+TwFLOTpMFE=
+=MzGY
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 4a623976edd4..f96a21ae7e8c 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Wed, 12 Apr 2023 16:09:36 +0000
+Wed, 12 Apr 2023 22:09:36 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 37908fd4110c..e7c756b3fad9 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Wed Apr 12 04:09:35 PM UTC 2023
+Wed Apr 12 10:09:36 PM UTC 2023
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index c2cb35f49b46..f8da95e8e30b 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Wed, 12 Apr 2023 16:15:01 +0000
+Wed, 12 Apr 2023 22:15:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index b50890bd157d..62170ac38b88 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-eb472103d1b4496f6c7b72a1f1997d06f4ce7b97 1681315233 2023-04-12T16:00:33+00:00
+3125aa2c0a194dd76bef5fe5e9f9584c2ed7b40b 1681334845 2023-04-12T21:27:25+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 77d5a5158f31..8fa5c2ae2b59 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1681315801 Wed 12 Apr 2023 04:10:01 PM UTC
+1681337401 Wed 12 Apr 2023 10:10:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index ad331724d479..f96a21ae7e8c 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Wed, 12 Apr 2023 16:09:35 +0000
+Wed, 12 Apr 2023 22:09:36 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 6bbf16d8bbf0..05e5398d5bbd 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index 67d8e5de8d5e..71aec1f37996 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -45,14 +45,14 @@ DIST zabbix-6.4.1.tar.gz 43014634 BLAKE2B 498358bf2a5de028b1bb0c8a5ebbe45451ec9b
 EBUILD zabbix-4.0.44.ebuild 9425 BLAKE2B 99915e322601540a008f2672090b0b9aaa56514afc03ea29c23495c84d493109da12faf142b9bbde2330995e2b2299b0ebd29af78c59330a6184df570072a148 SHA512 e72962f9d932ebd4114d3a6277a9a73523589deb2d68926193e9e1a85df89f4c7aa28367794300f609975133e68f756a31ab4388edbfe3ccc1e9138e3dfc0d56
 EBUILD zabbix-4.0.45.ebuild 9427 BLAKE2B 55a59585793b3217720c9a2c44b6371feb9e465fd8ad31adf040b0f8e21c883cee98b1fd26518a7c72e24ad8d42bf2523b575e94af6d80bc7ad739c8372811e6 SHA512 988468624b1f2825a14b9626ad4d53684144078fb97a225b52f8db5aba240a01d13de581a61943b3cb58f7316676c04211d51e4e043a9b487735934d9163accc
 EBUILD zabbix-5.0.31.ebuild 10142 BLAKE2B ffd5ab5a402b325ba940def36626cb3c8e6484ae8648010dde643921a793a07850b29c57c5f0b73f74d0fdd0c68c758327906696e4813f5c032cbbc761843bbc SHA512 50a9cfeb2756b2ec52f072566cc906a1bf15b0b9c96c0842dfd8d56e0e1ec26dcc0c170c0d304b8113e086545041aaa6e7acd83d2bba172e280d75f59933c619
-EBUILD zabbix-5.0.32.ebuild 10144 BLAKE2B 408ca81f3217efbed52c461cf7a17b228dde32b1f9d15625341202f01fbdb79c48d265f85cda2bbb366d5cf926c1a55b040f6a3670475bbda81b1e806d743ab7 SHA512 2d8d472f1e529384e0bd7ec5de6e774628f20e78a6db94ad449f5e22c2f55a1558777523bb20d00a30c31926b9ec3709000bbbe287522184bfab117587409d42
+EBUILD zabbix-5.0.32.ebuild 10143 BLAKE2B ea3456cef1b217cbe44c2aa58335f190d7d6e25393443aa95c865886824a78b79133adf0e399f18ac9526f6340aeb51078894ba58ad7da9f409fafaec05478d6 SHA512 c786fbd3aff043a871158e70449f9321ce5aacaaed485a17adb9d816d70378164e7f14c728b89bc6fd205f946c9d9b356421a436eb96c316028fe38168ad5218
 EBUILD zabbix-5.0.33.ebuild 10144 BLAKE2B 408ca81f3217efbed52c461cf7a17b228dde32b1f9d15625341202f01fbdb79c48d265f85cda2bbb366d5cf926c1a55b040f6a3670475bbda81b1e806d743ab7 SHA512 2d8d472f1e529384e0bd7ec5de6e774628f20e78a6db94ad449f5e22c2f55a1558777523bb20d00a30c31926b9ec3709000bbbe287522184bfab117587409d42
 EBUILD zabbix-6.0.13.ebuild 10207 BLAKE2B 083d2f1350ad83bd6011a28dba9229a1403f2fa5b2f92559a8bdeb32a7c6b7cc167ad8d64dfae717dee251cd9de696607dd5adc21626409e019e28c7d307dcc2 SHA512 76e6db0eb214a0fb87326f2b96093bab7f70de7b1f6b66c25d559da1db704f08653d31e2dfa3671bab180eb54d088edf8512992e4a9f20d75752d0562e6d21bc
-EBUILD zabbix-6.0.14.ebuild 10209 BLAKE2B a9bdb478ee3bcf0258ff08f869d73d050d8bbdbb56491b50707388729f90abfe01599a787def5b1ef89c0a7049b6780a247bbbe334105771a384cf5ae53f44a0 SHA512 1140da0734d117b1616d9dc951b7b083873b966dc2d0c1dba7d6ef61b9aa62713efd0382254646099c164cb13fb52f6f914913e9ec3d8c66a236b9c9d2a7ad6b
+EBUILD zabbix-6.0.14.ebuild 10208 BLAKE2B 108c3aba4abebf47bba93e558a556b39e8153bcf62f9ecb98a3a16a0c94508b7250b50b3ef9915d9380425c9e6d2eff287a66e7ed67ef5fdc1550ae57ab91828 SHA512 3c20c6725c2d8d899b6021ec9bfaf27f72328c1b3814525ddb4c5ee96d62368bd68b4e629a3957b40021ead15076115ac84093d40a3f9a2d88c45355b5b48bc7
 EBUILD zabbix-6.0.15.ebuild 10209 BLAKE2B a9bdb478ee3bcf0258ff08f869d73d050d8bbdbb56491b50707388729f90abfe01599a787def5b1ef89c0a7049b6780a247bbbe334105771a384cf5ae53f44a0 SHA512 1140da0734d117b1616d9dc951b7b083873b966dc2d0c1dba7d6ef61b9aa62713efd0382254646099c164cb13fb52f6f914913e9ec3d8c66a236b9c9d2a7ad6b
 EBUILD zabbix-6.0.16.ebuild 10209 BLAKE2B a9bdb478ee3bcf0258ff08f869d73d050d8bbdbb56491b50707388729f90abfe01599a787def5b1ef89c0a7049b6780a247bbbe334105771a384cf5ae53f44a0 SHA512 1140da0734d117b1616d9dc951b7b083873b966dc2d0c1dba7d6ef61b9aa62713efd0382254646099c164cb13fb52f6f914913e9ec3d8c66a236b9c9d2a7ad6b
 EBUILD zabbix-6.2.7.ebuild 10207 BLAKE2B 083d2f1350ad83bd6011a28dba9229a1403f2fa5b2f92559a8bdeb32a7c6b7cc167ad8d64dfae717dee251cd9de696607dd5adc21626409e019e28c7d307dcc2 SHA512 76e6db0eb214a0fb87326f2b96093bab7f70de7b1f6b66c25d559da1db704f08653d31e2dfa3671bab180eb54d088edf8512992e4a9f20d75752d0562e6d21bc
-EBUILD zabbix-6.2.8.ebuild 10209 BLAKE2B a9bdb478ee3bcf0258ff08f869d73d050d8bbdbb56491b50707388729f90abfe01599a787def5b1ef89c0a7049b6780a247bbbe334105771a384cf5ae53f44a0 SHA512 1140da0734d117b1616d9dc951b7b083873b966dc2d0c1dba7d6ef61b9aa62713efd0382254646099c164cb13fb52f6f914913e9ec3d8c66a236b9c9d2a7ad6b
+EBUILD zabbix-6.2.8.ebuild 10208 BLAKE2B 108c3aba4abebf47bba93e558a556b39e8153bcf62f9ecb98a3a16a0c94508b7250b50b3ef9915d9380425c9e6d2eff287a66e7ed67ef5fdc1550ae57ab91828 SHA512 3c20c6725c2d8d899b6021ec9bfaf27f72328c1b3814525ddb4c5ee96d62368bd68b4e629a3957b40021ead15076115ac84093d40a3f9a2d88c45355b5b48bc7
 EBUILD zabbix-6.2.9.ebuild 10209 BLAKE2B a9bdb478ee3bcf0258ff08f869d73d050d8bbdbb56491b50707388729f90abfe01599a787def5b1ef89c0a7049b6780a247bbbe334105771a384cf5ae53f44a0 SHA512 1140da0734d117b1616d9dc951b7b083873b966dc2d0c1dba7d6ef61b9aa62713efd0382254646099c164cb13fb52f6f914913e9ec3d8c66a236b9c9d2a7ad6b
 EBUILD zabbix-6.4.0.ebuild 10207 BLAKE2B 083d2f1350ad83bd6011a28dba9229a1403f2fa5b2f92559a8bdeb32a7c6b7cc167ad8d64dfae717dee251cd9de696607dd5adc21626409e019e28c7d307dcc2 SHA512 76e6db0eb214a0fb87326f2b96093bab7f70de7b1f6b66c25d559da1db704f08653d31e2dfa3671bab180eb54d088edf8512992e4a9f20d75752d0562e6d21bc
 EBUILD zabbix-6.4.1.ebuild 10209 BLAKE2B a9bdb478ee3bcf0258ff08f869d73d050d8bbdbb56491b50707388729f90abfe01599a787def5b1ef89c0a7049b6780a247bbbe334105771a384cf5ae53f44a0 SHA512 1140da0734d117b1616d9dc951b7b083873b966dc2d0c1dba7d6ef61b9aa62713efd0382254646099c164cb13fb52f6f914913e9ec3d8c66a236b9c9d2a7ad6b
diff --git a/net-analyzer/zabbix/zabbix-5.0.32.ebuild b/net-analyzer/zabbix/zabbix-5.0.32.ebuild
index 6e481bc98c71..b222b43af169 100644
--- a/net-analyzer/zabbix/zabbix-5.0.32.ebuild
+++ b/net-analyzer/zabbix/zabbix-5.0.32.ebuild
@@ -24,7 +24,7 @@ SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0/$(ver_cut 1-2)"
 WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="+agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh static"
 REQUIRED_USE="|| ( agent agent2 frontend proxy server )
 	?? ( gnutls openssl )
diff --git a/net-analyzer/zabbix/zabbix-6.0.14.ebuild b/net-analyzer/zabbix/zabbix-6.0.14.ebuild
index f3edadcff0ce..da72c61d9417 100644
--- a/net-analyzer/zabbix/zabbix-6.0.14.ebuild
+++ b/net-analyzer/zabbix/zabbix-6.0.14.ebuild
@@ -24,7 +24,7 @@ SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0/$(ver_cut 1-2)"
 WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh static"
 REQUIRED_USE="|| ( agent agent2 frontend proxy server )
 	?? ( gnutls openssl )
diff --git a/net-analyzer/zabbix/zabbix-6.2.8.ebuild b/net-analyzer/zabbix/zabbix-6.2.8.ebuild
index f3edadcff0ce..da72c61d9417 100644
--- a/net-analyzer/zabbix/zabbix-6.2.8.ebuild
+++ b/net-analyzer/zabbix/zabbix-6.2.8.ebuild
@@ -24,7 +24,7 @@ SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0/$(ver_cut 1-2)"
 WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh static"
 REQUIRED_USE="|| ( agent agent2 frontend proxy server )
 	?? ( gnutls openssl )
diff --git a/net-dialup/Manifest.gz b/net-dialup/Manifest.gz
index 1e38e602c9ba..0477bca17a45 100644
--- a/net-dialup/Manifest.gz
+++ b/net-dialup/Manifest.gz
diff --git a/net-dialup/ppp/Manifest b/net-dialup/ppp/Manifest
index d8be179ec67d..b7c21006f8b9 100644
--- a/net-dialup/ppp/Manifest
+++ b/net-dialup/ppp/Manifest
@@ -5,6 +5,9 @@ AUX ppp-2.4.9-fix-clang-nested-functions.patch 2439 BLAKE2B 834d675ebcb4a3af7350
 AUX ppp-2.4.9-fix-openssl-sysroot-clang.patch 377 BLAKE2B 9919669d6707394600c2b04f49dab212e220549395f34c52f641e6a87c2133eeaad00992fca5c3a9d84f60d7c17f1078aab78b8579906c93ee5cad4264a2569b SHA512 d816cbf65f1845851f8bd673fbe374987afbe6e3c0eb425455d0cc7269e96f5315caf1e38c320121650b088621c099c36f6b1c8d80ada0dbff07ab4e8151d42b
 DIST ppp-2.4.9-patches-03.tar.xz 18520 BLAKE2B b3da095672fa57727ba11a5dba761ea3f24ee330f27252f0379dab5761d5381809176faafed86d97a6b89cc8a4cb958baa07f4900e22fe6e76b6c852e0703f0c SHA512 9a035acf1915225340c12e6242f0c5db399b5f5970888d7f1799a5f125cf97b95d9fcb8c9aa2f6bd56c1544d2b10585f772d4fc1025002e3e8403011e3d2c029
 DIST ppp-2.4.9.tar.gz 719904 BLAKE2B 7ba3eb8c98fec5599635dbd302399617e1075f3a1df090f1a94ce2bb8a5c7631e6eea82246adc33711aba5fe95e7ba7c982e2cbf1fb0d71e45f877d9b092ffb7 SHA512 c309f8f69f534c05547cd2f66dade0e0f198ea4c2928a7e899e660280786b3e965437a67b8c5bb81c59d0fa1818b4eb7b701d2dce015a420d380422d2bca4e1a
+DIST ppp-2.5.0.tar.gz 1170057 BLAKE2B 6a0e9efcbff3cb499705071cc7d0e3411cf4871fd53b2bfedbb1f2cf3ad80728eb436050cf33b78e36d473be64f15907a21da17f283337455f0af379bc18272d SHA512 094368ea2aa6c6e8dfba4443509857a7c1c7ff839bb6d6657743802477208c01e87db31593cef0932d3725c640e9c103179da6b742825034cda82bd31ddcc2ed
 DIST ppp-dhcpc.tgz 33497 BLAKE2B ca59130012f007cf45af6bcfa468c112b0d521c8b11f42d42c566dd9de55bd6d6f1b1ceb83cbae18cfe79cb5cb36ba6c6858a4718915acc6987295008aca53da SHA512 aeaf791b14f5a09c0e2079072a157e65132cbff46e608bc0724e6a5827a01da934f5006e2774eb7105f83e607a52cb4987238f4385cf6f5cc86cbe305a556738
+DIST pppgetpass.8 154398 BLAKE2B 0e74b96df6171b7382874ce08375d0122df2b564ce8c3e8081022c38ef433e22d15ad13a51d553c6e18ee6277d9c67302b50afa59126bf74a6e3dcd1b03a2b2b SHA512 aca33e489d3e78a7accced4d3c33c03d933cf4c0b6607e8a6bbefef202c853248fa85caa36b53b9cbaf8b21ae60bb00fb3f95577418112630dfa6d67ad700359
 EBUILD ppp-2.4.9-r8.ebuild 7819 BLAKE2B 34256667e43c310b5a9abe2ad4e902ba68b6bab142d3b59d17d224c23d7487e113f0f0223b1afb86f48a0f2097f388cca9818db1793ba7c587724105359e1b24 SHA512 edb72438225c88ff9d9ca2b310f08c23e8c92b71e5fe1f0ea2e06a1897b8c924c15d6ebaddf3df85b091c6b67c9c2170d4333a1b76b824c8483bd0689a061b69
+EBUILD ppp-2.5.0.ebuild 3773 BLAKE2B 84fc40254bbb1edcfb11450767c5963a8a27d79737277225b67d9485a0bd6825cbee25cb5647a469bad8ce5f8a0d203460f1436670ceb8b83a9683899458d4c8 SHA512 6b73ad65756c5b67d71c2aa9852c63c47b2bfa09706a6ce8091727edc968b5f9f31ca31658c9a82a9ca4be8a6bc65986b51ca7266c627ed363094d3488762620
 MISC metadata.xml 1002 BLAKE2B 9ce1dcb685ed4f0d6dfe2e6c885b8feca8d81fd1fea5bde44a40900d65b2f9e9a45bd03f3708d4969c51880bb7ffb791bfbc972d4ec06a3124c4215e2b66424b SHA512 cdfa0b69fab5a530b36093bc84c352da1f8acbdf3d31e2b9a4d58bde7dc7bbbce9c54000d9f874eac2ddcc803bafc89ea2a74b03cac23dca295815ece6cb2157
diff --git a/net-dialup/ppp/ppp-2.5.0.ebuild b/net-dialup/ppp/ppp-2.5.0.ebuild
new file mode 100644
index 000000000000..7213230de0e6
--- /dev/null
+++ b/net-dialup/ppp/ppp-2.5.0.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-info pam
+
+PATCH_TARBALL_NAME="${PN}-2.4.9-patches-03"
+DESCRIPTION="Point-to-Point Protocol (PPP)"
+HOMEPAGE="https://ppp.samba.org/"
+SRC_URI="https://download.samba.org/pub/ppp/${P}.tar.gz
+	https://github.com/ppp-project/ppp/blob/${P}/contrib/pppgetpass/pppgetpass.8"
+#https://dev.gentoo.org/~polynomial-c/${PATCH_TARBALL_NAME}.tar.xz
+
+LICENSE="BSD GPL-2"
+SLOT="0/${PV}"
+#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="activefilter atm gtk pam systemd"
+
+DEPEND="
+	dev-libs/openssl:0=
+	virtual/libcrypt:=
+	activefilter? ( net-libs/libpcap )
+	atm? ( net-dialup/linux-atm )
+	gtk? ( x11-libs/gtk+:2 )
+	pam? ( sys-libs/pam )
+	systemd? ( sys-apps/systemd )
+"
+RDEPEND="${DEPEND}
+	!<net-misc/netifrc-0.7.1-r2"
+BDEPEND="virtual/pkgconfig"
+PDEPEND="net-dialup/ppp-scripts"
+
+src_configure() {
+	local args=(
+		--localstatedir="${EPREFIX}"/var
+		--runstatedir="${EPREFIX}"/run
+		$(use_enable systemd)
+		$(use_with atm)
+		$(use_with pam)
+		$(use_with activefilter pcap)
+		$(use_with gtk)
+		--enable-cbcp
+	)
+	econf "${args[@]}"
+}
+
+src_compile() {
+	default
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -type f -delete || die
+
+	if use pam; then
+		pamd_mimic_system ppp auth account session
+	fi
+
+	insinto /etc/modprobe.d
+	newins "${FILESDIR}/modules.ppp" ppp.conf
+
+	dobin scripts/p{on,off,log}
+	doman scripts/pon.1
+
+	# Adding misc. specialized scripts to doc dir
+	dodoc -r scripts
+
+	if use gtk ; then
+		dosbin contrib/pppgetpass/pppgetpass.{gtk,vt}
+		newsbin contrib/pppgetpass/pppgetpass.sh pppgetpass
+	else
+		newsbin contrib/pppgetpass/pppgetpass.vt pppgetpass
+	fi
+	# Missing from upstream tarball
+	# https://github.com/ppp-project/ppp/pull/412
+	#doman contrib/pppgetpass/pppgetpass.8
+	doman "${DISTDIR}/pppgetpass.8"
+}
+
+pkg_postinst() {
+	if linux-info_get_any_version && linux_config_src_exists ; then
+		echo
+		ewarn "If the following test report contains a missing kernel configuration option that you need,"
+		ewarn "you should reconfigure and rebuild your kernel before running pppd."
+		CONFIG_CHECK="~PPP ~PPP_ASYNC ~PPP_SYNC_TTY"
+		local ERROR_PPP="CONFIG_PPP:\t missing PPP support (REQUIRED)"
+		local ERROR_PPP_ASYNC="CONFIG_PPP_ASYNC:\t missing asynchronous serial line discipline (optional, but highly recommended)"
+		local WARNING_PPP_SYNC_TTY="CONFIG_PPP_SYNC_TTY:\t missing synchronous serial line discipline (optional; used by 'sync' pppd option)"
+		if use activefilter ; then
+			CONFIG_CHECK="${CONFIG_CHECK} ~PPP_FILTER"
+			local ERROR_PPP_FILTER="CONFIG_PPP_FILTER:\t missing PPP filtering support (REQUIRED)"
+		fi
+		CONFIG_CHECK="${CONFIG_CHECK} ~PPP_DEFLATE ~PPP_BSDCOMP ~PPP_MPPE"
+		local ERROR_PPP_DEFLATE="CONFIG_PPP_DEFLATE:\t missing Deflate compression (optional, but highly recommended)"
+		local ERROR_PPP_BSDCOMP="CONFIG_PPP_BSDCOMP:\t missing BSD-Compress compression (optional, but highly recommended)"
+		local WARNING_PPP_MPPE="CONFIG_PPP_MPPE:\t missing MPPE encryption (optional, mostly used by PPTP links)"
+		CONFIG_CHECK="${CONFIG_CHECK} ~PPPOE ~PACKET"
+		local WARNING_PPPOE="CONFIG_PPPOE:\t missing PPPoE support (optional, needed by pppoe plugin)"
+		local WARNING_PACKET="CONFIG_PACKET:\t missing AF_PACKET support (optional, used by pppoe plugin)"
+		if use atm ; then
+			CONFIG_CHECK="${CONFIG_CHECK} ~PPPOATM"
+			local WARNING_PPPOATM="CONFIG_PPPOATM:\t missing PPPoA support (optional, needed by pppoatm plugin)"
+		fi
+		check_extra_config
+	fi
+
+	echo
+	elog "pon, poff and plog scripts have been supplied for experienced users."
+	elog "Users needing particular scripts (ssh,rsh,etc.) should check out the"
+	elog "/usr/share/doc/${PF}/scripts directory."
+}
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index cd3a8bece72b..c9fc2550ffa6 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/gupnp-igd/Manifest b/net-libs/gupnp-igd/Manifest
index 06d4da26b9ff..cb4d7d7c6e89 100644
--- a/net-libs/gupnp-igd/Manifest
+++ b/net-libs/gupnp-igd/Manifest
@@ -1,3 +1,5 @@
 DIST gupnp-igd-1.2.0.tar.xz 26100 BLAKE2B a72117b1c3ac3cd95d797b5d7a21b333a46d161bf22bc9649c1649fee6301f16824b0068ee094cfeb31ea283ca0aae8c2369c331fe956f59586ae00fd48c5825 SHA512 0129e743b09cc773b997e0f09d7ab84481d114d52ab273b1e9957960e6a47d686d600492b916970f3b2d3d30c36b68e1e4d049eb7be5d44101a56b90dd5f0af9
+DIST gupnp-igd-1.6.0.tar.xz 29220 BLAKE2B ef90ea50c9bb7fb567d0654626f179012a95cbdbbd233637661f4952e1b0c3493a70b14940a2d7ef598b94c1895e40710d475f79b812f96cfdc1a4e570d5782d SHA512 ebec5f9d7fafc3614dc1c503aa86c7675aedfa05325554576160eaa83386b3da1fef72ef3c79a6fe7213fe64efcb24296ef99da87e90073813af3306df89a7bd
 EBUILD gupnp-igd-1.2.0.ebuild 1145 BLAKE2B b4260034b32f84dbb6a5fbf6c294f82d39692f275bbd38cbba348786afbef3e059d09c768774025e073e9e773d996571a614f39f3e5528db8e0e55bda29c7772 SHA512 398154a187fc0ae3a5ffd2116e8f7813f5eeb2a86cba27a9499d638f8fa2c657e2d3ff5a5ebeebf4d4dffa4b394aead9729348b84c15d30654c1de2c4e9f5e75
+EBUILD gupnp-igd-1.6.0.ebuild 1091 BLAKE2B 375260a70240129b0a0cfb706f1b42ac349efda000527e88131fa5f7f8d85c5cd3b4c2ef6940be13f9f19cfa3eeb40b6cb48e912bea31d5c80ba98a4156d7068 SHA512 d5895dfee53ab286dcbb53307ad114e849dec7778c9f826bdfc0868059862d4e5b01cd8939d42a0ce2a1651f19ee3563205c55a46e3f8dbbf759f880a3a02f41
 MISC metadata.xml 350 BLAKE2B 07c293e06e6937c814a1f3b8e77d88bbd317981476546b264a91b1c9b32d13154556d534467263452d759658d0bbcb481947eea3dcc85356af99e9877ca88946 SHA512 d267a60475c659ae37573b8157e3fbb4892408b0796d380cd1cef5a6576600c0dca3dc188908d120b4f179ce992265a713d513a01e9af89ab9542a9eaae5046b
diff --git a/net-libs/gupnp-igd/gupnp-igd-1.6.0.ebuild b/net-libs/gupnp-igd/gupnp-igd-1.6.0.ebuild
new file mode 100644
index 000000000000..5ec22570b0b7
--- /dev/null
+++ b/net-libs/gupnp-igd/gupnp-igd-1.6.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org meson-multilib xdg
+
+DESCRIPTION="Library to handle UPnP IGD port mapping for GUPnP"
+HOMEPAGE="http://gupnp.org https://gitlab.gnome.org/GNOME/gupnp-igd"
+
+LICENSE="LGPL-2.1+"
+SLOT="1.6/1.6-0" # <API version>-<soname>
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="gtk-doc +introspection"
+
+# The only existing test is broken
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-libs/glib-2.70.0:2[${MULTILIB_USEDEP}]
+	>=net-libs/gssdp-1.6:1.6=[${MULTILIB_USEDEP}]
+	>=net-libs/gupnp-1.6:1.6=[${MULTILIB_USEDEP}]
+	introspection? ( >=dev-libs/gobject-introspection-0.10 )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	sys-devel/gettext
+	virtual/pkgconfig
+	gtk-doc? ( dev-util/gtk-doc
+		app-text/docbook-xml-dtd:4.1.2 )
+"
+
+src_prepare() {
+	default
+	xdg_environment_reset
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		$(meson_native_use_bool introspection)
+		$(meson_native_use_bool gtk-doc gtk_doc)
+	)
+	meson_src_configure
+}
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 20a67ed1e370..38bc6eaeb309 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/package.mask b/profiles/package.mask
index bf37a14a23fc..40aac59e59d7 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,6 +33,10 @@
 
 #--- END OF EXAMPLES ---
 
+# Eray Aslan <eras@gentoo.org> (2023-04-12)
+# Mask experimental software
+=mail-mta/postfix-3.9*
+
 # Matt Turner <mattst88@gentoo.org> (2023-04-10)
 # DMX support was dropped from the Xserver in v21.1.0 and had been broken for
 # 14 years previous to its removal. See
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 34f826405ff5..cfb58cfd374c 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/caffe2/Manifest b/sci-libs/caffe2/Manifest
index 0ebedf64c2cd..d34439736bd4 100644
--- a/sci-libs/caffe2/Manifest
+++ b/sci-libs/caffe2/Manifest
@@ -3,9 +3,10 @@ AUX caffe2-1.12.0-glog-0.6.0.patch 959 BLAKE2B eb0c18a34a2c5a1b68a420b9001eac5c8
 AUX caffe2-1.13.0-gentoo.patch 8000 BLAKE2B a11a6bccac970ce8658041db20f90814183a8eef45571565512bafa9f172348f08ccdb67f5e543c8f9e236a6283f2d50a608cfc671e18886319a82dc84cd95e5 SHA512 20a43490cb80174fc688f7a773ac332362a5a013885a7cfdfdfe89996bc3e2483ad4b29149d71730213174d27d8534707813e825bdf4ea3e3bc7b664bad39953
 AUX caffe2-1.13.0-install-dirs.patch 5737 BLAKE2B 10b10e3a29976344c7596e1c4e7a604856c66d91cb7518308422f7ffac82ffe183dc81becab27866814c06e321e97458ab6a6908aa01379299c7fdf8fdccf153 SHA512 1e2e4f646cec24b5373872865522a909d1c154623e232c06e3da361e4d29b8d7520c446f53fbf42aab5f00bab05d1f278ce9425e506a9a5ac73cbb10570bd325
 AUX caffe2-1.13.1-tensorpipe.patch 374 BLAKE2B 46d45aae88f99c213f0da039bad5aa0c470a6c505ed1d28088ecb8dd445547e52a6d2c087c52c15b20da31808cd9213c1e672880e9bf4afe9c487358b4d4cd9d SHA512 d7315408b3ad4630715c18fff853b07e589ae78f5fcc8eef7f8791202fca459a3b23481856a50a5d432aec26482eb33adf37ba0a37d45f719ceb29081449345d
+AUX caffe2-2.0.0-gcc13.patch 1203 BLAKE2B df55608c6019802da32809cb210b60cf0debf38e8d7a20135e92465be28d3537f2d0b52c67a61b264e241539b64fa02aa99eefb856686a9f9e3c45291b8d6a70 SHA512 59e933c60abef3ac97a1e3b2cd7a9935f9fdde4bc3ed1c2c53c729af6d7ed735ffd38cbdac08d32c668cd2751f3f871cc833883efd19732c04a0f67fbb49c41d
 AUX caffe2-2.0.0-gentoo.patch 6682 BLAKE2B 67657b1ca48ded05a6b07ce18df89c4b8759004cbe8b9a74e53ff1c11c2b7edc55f4282d08bc1531cc2fd1a5c330db4bd1ab2ca4fb6b44b91e1a784fe8da7324 SHA512 c42b59b7f8d44245bfd986c5e228412fe92546300083483b21486465d29bac2735e5c35e12bfd63c9a95210e16a10c733e70512d573c7b05a2f0b8bf083a0a66
 DIST pytorch-1.13.1.tar.gz 108279745 BLAKE2B 75de03b74dfdaf8d8fb5ea743fcc0c1b0e408a714ad4160c487921220a7b1755e5fa6e587e6bbc8c9f34dd75e096d2e6dd69c80d24821835fff6c833314434d3 SHA512 f16f89d027efade11d057245cad5b69a390e88b458398310ae30de2dbff7c8fd7f1165be7b8da7ea989c81ac3f5a66c5cb9050610e441a97c83fb8aa28c0bd62
 DIST pytorch-2.0.0.tar.gz 111327292 BLAKE2B 6d593a975c0ade714f0b189f7e3c4ff704b9a9a2377b5e441a9cefc202fa22779966d08948e63671912c6ea5a0eee124042155f4f57a654db34e19e42f013cc9 SHA512 4dd76160711c0d87f3026c8b7fa3ed149dd86b8ac0ee9ecea0eaf80d2e6ce8c29368392e77b9466d90b60634087b462b782495997a5d33367cc8ca9fe14c8a14
 EBUILD caffe2-1.13.1-r4.ebuild 5009 BLAKE2B dd92c8d27be86d635a832e286ed2b1617e10520f02447d7aaf097cdabcd9c8ba634490ef4af59325d64048bf63f39d00a693373ab921c855e5716514c212d38c SHA512 5269a5c121b2bb9c5d4a1a07c6d1300577e4abec418625c2cae88c6d0385768fe73f380a997b5f46837eba29948c6397e4a4ac642c9d1c94f5ac0fba6e794732
-EBUILD caffe2-2.0.0-r1.ebuild 5022 BLAKE2B 4c316027543fa961e45cee3f3ed13185c5fb5e4ce230d9d514d3f6a5d665d5aa1de4fa1080ed934e74ade5b124ef381deb844474b233d1d99addd9a9247f4f87 SHA512 074fd06bb307935ffc131b300f74478f01cf98bf9cf39555c2a6b0606206f5ea5e9a3af9db4e3085f252cbd9525ee62a035562d60d10b6897851e263a805f50a
+EBUILD caffe2-2.0.0-r1.ebuild 5054 BLAKE2B ffc593b91584da704962cb82347d2c860140775588741c28482a9a15f4bb9f07d561c63e30382cd5fc116b58c58b05088f31da49b22c25c44c71d905c48abdaf SHA512 938d89fdd4595908b45c943efe660bcd4eb05f31a1b0b4eeeaf6694fc8882ff223570489a2bdf90ea1b43765785bcd69c2d2819294d8e227db42d15aac6706cf
 MISC metadata.xml 1116 BLAKE2B ac8f5d50c8727a42ab904c5705009247b89b695b8a4e918b2a9a184c7c3e11de19dde49dce207b1eafb0a73a03198efc2efe3890a3b697c18fe86b5740ce2b4b SHA512 6060fb034c36e65279e01ff3c858f944407fbf7a47359f795a13d7fbaa26f5f26945d28d26fbf4301ba359144fc53ba4d845c9dc89669496c0830146fea34724
diff --git a/sci-libs/caffe2/caffe2-2.0.0-r1.ebuild b/sci-libs/caffe2/caffe2-2.0.0-r1.ebuild
index ae14175b2471..48a01218a4e0 100644
--- a/sci-libs/caffe2/caffe2-2.0.0-r1.ebuild
+++ b/sci-libs/caffe2/caffe2-2.0.0-r1.ebuild
@@ -80,6 +80,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.13.0-install-dirs.patch
 	"${FILESDIR}"/${PN}-1.12.0-glog-0.6.0.patch
 	"${FILESDIR}"/${PN}-1.13.1-tensorpipe.patch
+	"${FILESDIR}"/${P}-gcc13.patch
 )
 
 src_prepare() {
diff --git a/sci-libs/caffe2/files/caffe2-2.0.0-gcc13.patch b/sci-libs/caffe2/files/caffe2-2.0.0-gcc13.patch
new file mode 100644
index 000000000000..acbcebad0a5d
--- /dev/null
+++ b/sci-libs/caffe2/files/caffe2-2.0.0-gcc13.patch
@@ -0,0 +1,41 @@
+--- a/c10/util/Registry.h   2023-03-09 17:42:00.000000000 -0500
++++ b/c10/util/Registry.h       2023-04-09 20:38:33.108135511 -0400
+@@ -16,6 +16,7 @@
+ #include <memory>
+ #include <mutex>
+ #include <string>
++#include <stdexcept>
+ #include <unordered_map>
+ #include <vector>
+ 
+--- a/torch/csrc/jit/passes/quantization/quantization_type.h    2023-03-09 17:42:00.000000000 -0500
++++ b/torch/csrc/jit/passes/quantization/quantization_type.h    2023-04-09 20:43:43.124806308 -0400
+@@ -1,5 +1,6 @@
+ #pragma once
+ #include <ostream>
++#include <cstdint>
+ 
+ namespace torch {
+ namespace jit {
+
+--- a/torch/csrc/jit/runtime/logging.cpp    2023-03-09 17:42:00.000000000 -0500
++++ b/torch/csrc/jit/runtime/logging.cpp    2023-04-09 20:47:49.758142941 -0400
+@@ -1,6 +1,7 @@
+ #include <torch/csrc/jit/runtime/logging.h>
+ 
+ #include <atomic>
++#include <stdexcept>
+ #include <mutex>
+ #include <unordered_map>
+ 
+
+--- a/torch/csrc/lazy/core/multi_wait.cpp   2023-03-09 17:42:00.000000000 -0500
++++ b/torch/csrc/lazy/core/multi_wait.cpp   2023-04-09 20:50:36.608145172 -0400
+@@ -1,6 +1,7 @@
+ #include <torch/csrc/lazy/core/multi_wait.h>
+ 
+ #include <chrono>
++#include <stdexcept>
+ #include <exception>
+ 
+ namespace torch {
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index c2c4ddcffece..62a981a9d77e 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index 4cc1fc98212e..b7bc16ba9d8a 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -1,9 +1,6 @@
-AUX openrc-0.45.2-grep-3.8.patch 1175 BLAKE2B ba19778859730be7f85558ba5577eec414f336cc61dc3120c34f95274d17c907b060cf4b532fc3a9c2921f0707f66137fd343ede3a2c8f94ba4d1918900c9935 SHA512 af0b83cf69a56f815ae363eede36c3bd477ece2de99892faf4fb4edda045f8716a13d7292c666345005d36f6aba117e73f44a39f8b13966433173673494b6720
 AUX openrc.logrotate 43 BLAKE2B 0587cd211767937fd6273e6b159271490443a94d80a54b5a20ef625a1959e77dbf38cd1756838337fb39a061c4ee19a39cccd2f5867fab9f04fb916a74029aaa SHA512 12bb6354e808fbf47bbab963de55ee7901738b4a912659982c57ef2777fff9a670e867fcb8ec316a76b151032c92dc89a950d7d1d835ef53f753a8f3b41d2cec
 AUX start-stop-daemon.pam 63 BLAKE2B df39a1a12fe09dbbc0746eac67035d9e6d4a63323f6c937ef3888c70787354128e415b3c1c8bccccec0c987b3e789711cd1ddaba55e9b53a7f67b332c4ca9d5b SHA512 85cf440611b8f87f51bf24bdd9fa03639a75b950f00096d81b8826c21ae85ff9784b8c56b8ddb482e70f08bce933d4561b30750346d51fb2cef3be34acc065cb
-DIST openrc-0.45.2.tar.gz 246515 BLAKE2B bb7d52b183612eb8924a2d0f9ec63eea88253d8d83964d6341a4715a6cdc372b3fd99ad0f972f4f539da9d741548777dabf4ced86fd20be741a89a69ffe2ff01 SHA512 ca2958772240f6e5037e39db1ee62a81091a2efa654da967f68e03a721868c6c0a41d32a2bddf55c8eadbc9bf5837b710cc2e4564844a7fbc0e585366da4fdf9
 DIST openrc-0.46.tar.gz 247679 BLAKE2B 55490afc179e1e56a58408e8a2b7ebd5376ffee25cb61f2838a47cc97ad1e4eadabcc7f74e5cc2a2d9217917eb42517cf01766de2e82b50a3500bdbe263b0d88 SHA512 7c837e4b553511f0621944222ca0d35bd553a9888bd482ca0f8f3d2923d5b51cbd1f1c2f33cccb26d9f13dfb488939b95064673bedb7fcbf78d68664df2678c7
-EBUILD openrc-0.45.2-r2.ebuild 4595 BLAKE2B da0df99c14b6984dc97aee9beaf5cb777bb3d15076d6f6be64459327c4848fecd0957a3e42c2135bbc3dd6e2e9ee17f4004a4750108a4b3e33c4dc22c2e68e2c SHA512 e2a3fd3dc7aab7bcdcc81aaa8f9ac4b889cfaf82229054f0c71e9caeb49a8fa9395fa39eb215b66d73b78b7c18a661a4289ca2844a907a5c92250898b7809e35
 EBUILD openrc-0.46.ebuild 4547 BLAKE2B e0fdbd7a9668d0b0cac96e67cae7c9ca05b995857a16784e9c71dc2504d9e9f546c08f5163ec9f18c93b641a1e3a8333d74df07659215bd8b11356a0d48640f7 SHA512 caca44a4aefe5fa61be9e023c14b80d65630db0fdea7e3ed76b31b33168dcfd38228c3c3599e8217cd76fdfb28f44536816efe9c2a90fb053960886c174fe044
 EBUILD openrc-9999.ebuild 4555 BLAKE2B 708488c77fc079d6481417f6d182b8f513bd85d5d905f3ac2454a2baa995f64cada2ad3febe1cf0c36901da34c31c25c4412958aa332868e1a0999cb7d634378 SHA512 ac43059aa5c472c7ac4ab4023ab67057c83518ee526894f2abe6bb325c154104f43150e33130eeb9b87d7ac09b6d20c1dc8c2d74496ed909db510693aa7e3333
 MISC metadata.xml 707 BLAKE2B 713b69a4e4d6a61051c9f6dfda46da3afa62c590c62b4f371f3949140eaecfa665a977091ac858bff99380dfc3758038ee6a96b0c8b88c142e2e751b20318fba SHA512 5260e1aec8973d42bf059b1f20b3a5f95b98608efeac614d46b20d774a3453c25348cea4a45d745abe829ad016dbc524080c482c1666032e969e08fefe1efc37
diff --git a/sys-apps/openrc/files/openrc-0.45.2-grep-3.8.patch b/sys-apps/openrc/files/openrc-0.45.2-grep-3.8.patch
deleted file mode 100644
index c6eddeec9048..000000000000
--- a/sys-apps/openrc/files/openrc-0.45.2-grep-3.8.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-https://bugs.gentoo.org/875557
-https://github.com/OpenRC/openrc/issues/548
-https://github.com/OpenRC/openrc/commit/9380347f042f7d294317f4420b648422817eb75a
-
-From 9380347f042f7d294317f4420b648422817eb75a Mon Sep 17 00:00:00 2001
-From: Stefan Linke <particleflux@gmail.com>
-Date: Wed, 7 Sep 2022 17:18:09 +0200
-Subject: [PATCH] Avoid warning on grep 3.8 in hwclock
-
-Starting with grep version 3.8, the hwclock init script logs warnings
-about stray backslashes:
-
-> hwclock | * Setting system clock using the hardware clock [UTC] ...
-> hwclock |grep: warning: stray \ before -
-> hwclock |grep: warning: stray \ before -
-
-This is caused by the check for existence of the `--noadjfile` argument
-in function `get_noadjfile()`.
-
-Replacing the affected logic with an explicit argument denoting the
-pattern as such resolves the issue.
-
-Fixes #548
---- a/init.d/hwclock.in
-+++ b/init.d/hwclock.in
-@@ -72,7 +72,7 @@ get_noadjfile()
- {
- 	if ! yesno $clock_adjfile; then
- 		# Some implementations don't handle adjustments
--		if LC_ALL=C hwclock --help 2>&1 | grep -q "\-\-noadjfile"; then
-+		if LC_ALL=C hwclock --help 2>&1 | grep -q -e "--noadjfile"; then
- 			echo --noadjfile
- 		fi
- 	fi
-
diff --git a/sys-apps/openrc/openrc-0.45.2-r2.ebuild b/sys-apps/openrc/openrc-0.45.2-r2.ebuild
deleted file mode 100644
index 1d0fad63f7ab..000000000000
--- a/sys-apps/openrc/openrc-0.45.2-r2.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson pam
-
-DESCRIPTION="OpenRC manages the services, startup and shutdown of a host"
-HOMEPAGE="https://github.com/openrc/openrc/"
-
-if [[ ${PV} =~ ^9{4,}$ ]]; then
-	EGIT_REPO_URI="https://github.com/OpenRC/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/OpenRC/openrc/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-fi
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="audit bash debug ncurses pam newnet +netifrc selinux sysv-utils unicode"
-
-COMMON_DEPEND="
-	ncurses? ( sys-libs/ncurses:0= )
-	pam? ( sys-libs/pam )
-	audit? ( sys-process/audit )
-	sys-process/psmisc
-	selinux? (
-		sys-apps/policycoreutils
-		>=sys-libs/libselinux-2.6
-	)"
-DEPEND="${COMMON_DEPEND}
-	virtual/os-headers
-	ncurses? ( virtual/pkgconfig )"
-RDEPEND="${COMMON_DEPEND}
-	bash? ( app-shells/bash )
-	!prefix? (
-		sysv-utils? (
-			!sys-apps/systemd[sysv-utils(-)]
-			!sys-apps/sysvinit
-		)
-		!sysv-utils? (
-			|| (
-				>=sys-apps/sysvinit-2.86-r6[selinux?]
-				sys-apps/s6-linux-init[sysv-utils(-)]
-			)
-		)
-		virtual/tmpfiles
-	)
-	selinux? (
-		>=sec-policy/selinux-base-policy-2.20170204-r4
-		>=sec-policy/selinux-openrc-2.20170204-r4
-	)
-"
-
-PDEPEND="netifrc? ( net-misc/netifrc )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-grep-3.8.patch
-)
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature audit)
-		"-Dbranding=\"Gentoo Linux\""
-		$(meson_use newnet)
-		-Dos=Linux
-		$(meson_use pam)
-		$(meson_feature selinux)
-		-Drootprefix="${EPREFIX}"
-		-Dshell=$(usex bash /bin/bash /bin/sh)
-		$(meson_use sysv-utils sysvinit)
-		-Dtermcap=$(usev ncurses)
-	)
-	# export DEBUG=$(usev debug)
-	meson_src_configure
-}
-
-# set_config <file> <option name> <yes value> <no value> test
-# a value of "#" will just comment out the option
-set_config() {
-	local file="${ED}/$1" var=$2 val com
-	eval "${@:5}" && val=$3 || val=$4
-	[[ ${val} == "#" ]] && com="#" && val='\2'
-	sed -i -r -e "/^#?${var}=/{s:=([\"'])?([^ ]*)\1?:=\1${val}\1:;s:^#?:${com}:}" "${file}"
-}
-
-set_config_yes_no() {
-	set_config "$1" "$2" YES NO "${@:3}"
-}
-
-src_install() {
-	meson_install
-
-	keepdir /lib/rc/tmp
-
-	# Setup unicode defaults for silly unicode users
-	set_config_yes_no /etc/rc.conf unicode use unicode
-
-	# Cater to the norm
-	set_config_yes_no /etc/conf.d/keymaps windowkeys '(' use x86 '||' use amd64 ')'
-
-	# On HPPA, do not run consolefont by default (bug #222889)
-	if use hppa; then
-		rm -f "${ED}"/etc/runlevels/boot/consolefont
-	fi
-
-	# Support for logfile rotation
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/openrc.logrotate openrc
-
-	if use pam; then
-		# install gentoo pam.d files
-		newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon
-		newpamd "${FILESDIR}"/start-stop-daemon.pam supervise-daemon
-	fi
-
-	# install documentation
-	dodoc *.md
-}
-
-pkg_preinst() {
-	# avoid default thrashing in conf.d files when possible #295406
-	if [[ -e "${EROOT}"/etc/conf.d/hostname ]] ; then
-		(
-		unset hostname HOSTNAME
-		source "${EROOT}"/etc/conf.d/hostname
-		: ${hostname:=${HOSTNAME}}
-		[[ -n ${hostname} ]] && set_config /etc/conf.d/hostname hostname "${hostname}"
-		)
-	fi
-
-	# set default interactive shell to sulogin if it exists
-	set_config /etc/rc.conf rc_shell /sbin/sulogin "#" test -e /sbin/sulogin
-	return 0
-}
-
-pkg_postinst() {
-	if use hppa; then
-		elog "Setting the console font does not work on all HPPA consoles."
-		elog "You can still enable it by running:"
-		elog "# rc-update add consolefont boot"
-	fi
-
-	if ! use newnet && ! use netifrc; then
-		ewarn "You have emerged OpenRc without network support. This"
-		ewarn "means you need to SET UP a network manager such as"
-		ewarn "	net-misc/netifrc, net-misc/dhcpcd, net-misc/connman,"
-		ewarn " net-misc/NetworkManager, or net-vpn/badvpn."
-		ewarn "Or, you have the option of emerging openrc with the newnet"
-		ewarn "use flag and configuring /etc/conf.d/network and"
-		ewarn "/etc/conf.d/staticroute if you only use static interfaces."
-		ewarn
-	fi
-
-	if use newnet && [ ! -e "${EROOT}"/etc/runlevels/boot/network ]; then
-		ewarn "Please add the network service to your boot runlevel"
-		ewarn "as soon as possible. Not doing so could leave you with a system"
-		ewarn "without networking."
-		ewarn
-	fi
-
-	# added for 0.45 to handle seedrng/urandom switching (2022-06-07)
-	for v in ${REPLACING_VERSIONS}; do
-		[[ -x $(type rc-update) ]] || continue
-		if ver_test $v -lt 0.45; then
-			if rc-update show boot | grep -q urandom; then
-				rc-update del urandom boot
-				rc-update add seedrng boot
-		fi
-		fi
-	done
-}
diff --git a/www-misc/Manifest.gz b/www-misc/Manifest.gz
index 9418a8d687ea..710af2b34b7e 100644
--- a/www-misc/Manifest.gz
+++ b/www-misc/Manifest.gz
diff --git a/www-misc/urlwatch/Manifest b/www-misc/urlwatch/Manifest
index 70632e8d583f..55c9522fe0be 100644
--- a/www-misc/urlwatch/Manifest
+++ b/www-misc/urlwatch/Manifest
@@ -3,5 +3,5 @@ DIST urlwatch-2.25.tar.gz 168241 BLAKE2B 85f76e849495f5457f43ccd37035aae84c6ae4c
 DIST urlwatch-2.26.tar.gz 174305 BLAKE2B c7990b0ecca8bb18632ba717dabfed3e3cdf147ff463e1221c4f7002fcb862d162421ac927bd6a570369a1833268cc08668e284e425e954a4eea8d41cb30eafd SHA512 df214e3576dcbc8f18338a17f890e53ce9142fb98ea5042567eb415e697ee1a19d40b00404a40c0cc4aaaaa35ff3d838d9e0273a6bfe5178059560723ef6e4ca
 EBUILD urlwatch-2.24.ebuild 2436 BLAKE2B 39a408c3db13371bb4b4839ac8cd3c31f38a6b0da6d4c5d9a0e1e021eb4bf1bf610495763a7afa1c623378f35387798f5603d0954431857be2b096724ff0fbc5 SHA512 6514fe12bb3929ae65350c35ca3efe00119f91129a274e333a4876ce3a3ca3ef818658321c7bb5b0e41a940e4a785b7d055e14c9e301e707069282a7917217ea
 EBUILD urlwatch-2.25.ebuild 2486 BLAKE2B cdb7233bd1a743a52d9a8e402be707eef53ffc44ac29e0c9b5885d2b7110638b09e3ed87aa9ce7b97e1c74c2c9b48a82109f94b1a8075826f7124aceca32de75 SHA512 9528fcd2c41ba47b1b27c7371fa8bea2ba99b6723d4966a60273515d0fb7bf47ee1eb215303b72306ceb656e4d1faa5456e5b1bbc5044d1a1a0257d27d2ef29a
-EBUILD urlwatch-2.26.ebuild 2169 BLAKE2B 85e309524c12a83d55c0533095edf57c790bb7464f1271702222d7d33375d0fbdd348be85f4dfef55f0553005790b6621e8c84e6cd8c02dada4b750a3c453685 SHA512 075551bd14cfa5de8cb951128928bac37c135d5cec707ba02e176a35befc1a24c46d5fb9100fad9b4765644582736d0990b4f353530db22ecd84063d8fc08b4e
+EBUILD urlwatch-2.26.ebuild 2174 BLAKE2B 753d34a8363518ad47ef0b8bd6e959185d05ebf937b7438d79528e398da8aad0b52f0bf61219bd28c54747e84d8d1540f365af98a491a1f3d49208fc291d9739 SHA512 fc5ea386a43ca7df4cac59f6347917926e06a60f0cbb97ddaf8eef231adebff06f9b425a8d1bf573e85e648149b94c11704fc06ad67a83fc2c9f5872d312ba71
 MISC metadata.xml 541 BLAKE2B f4518dac79cafa9a225d87e125b1fbb3e090c7d3ea1d90a307d8b881379b809112fdc0bd3da6a229daf228aa5660fd130a048fefc63c9a19743987a4c94e528d SHA512 86cf47f19a24fb11c4b1a02b1fe9490a5c171c77b4237a1d0557ce553b1b97ef05f1849f4d745aa0c86f27b2c74f646898f94484ecf75848379b3a02f4157170
diff --git a/www-misc/urlwatch/urlwatch-2.26.ebuild b/www-misc/urlwatch/urlwatch-2.26.ebuild
index 2724b6775fbd..02b7d52bcb99 100644
--- a/www-misc/urlwatch/urlwatch-2.26.ebuild
+++ b/www-misc/urlwatch/urlwatch-2.26.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
 	dev-python/appdirs[${PYTHON_USEDEP}]
diff --git a/x11-drivers/Manifest.gz b/x11-drivers/Manifest.gz
index d76caee85b7b..007a63663636 100644
--- a/x11-drivers/Manifest.gz
+++ b/x11-drivers/Manifest.gz
diff --git a/x11-drivers/xf86-video-intel/Manifest b/x11-drivers/xf86-video-intel/Manifest
index 8f73faf34994..da7ddcae8e45 100644
--- a/x11-drivers/xf86-video-intel/Manifest
+++ b/x11-drivers/xf86-video-intel/Manifest
@@ -1,4 +1,6 @@
 DIST xf86-video-intel-2.99.917_p20201215.tar.bz2 1250622 BLAKE2B ddcbd84ee125528fe82f0a369f8e768d218eb0d9c4fc00cbe4a921d6267a846eccc001e3dd765f8cdaf7a38c461357831cd9675acfdfd3cc6ac282ec4b6f4b67 SHA512 29526fe191a95c2df5a3e168150b8c7f759dfdc9a4912e28887ec51be05304a9f552d21c990a37a90d6299e64df4bb1fba051c1d0ad25606dc52f801cd30b60d
+DIST xf86-video-intel-2.99.917_p20230201.tar.bz2 1250201 BLAKE2B f41aa429079b60b06a4f78289c5d94de9203c55756bcc3f1ff016a9226e7fa01b3559305ea3328acbc88063c8a5a96289a0ba9954e011c4eaeb7ac5d8fc3e240 SHA512 5f37bfead71ca5a671640919c357912d15b809fe8f55f572119927b218e58bbd75f3ec4370a80d74d454debb09c678105b3120f8d7eced3f9ed858878ba9128c
 EBUILD xf86-video-intel-2.99.917_p20201215.ebuild 2028 BLAKE2B 85d72fc92f7f1ccf2769b1fda93a6de553f3b172b00e116bdfac20ac3afba823a4bc247d243a9f15111f8bf96245574a6aed074f0464857c517b515e77da4e17 SHA512 8ec6a8b5a588bf34a1c309811bd9c3e845739bf18136e0a292d16979186d7566baced46c3da7ebe712dd09bfc74fe5c8f207785abc21957e7d7c6ef45529f298
-EBUILD xf86-video-intel-9999.ebuild 1990 BLAKE2B 29f2738249bb4b10db97f81567ab4e7921014fa1000c8cc53d5bdde02b9905f05a7be12bcee32583c1277e47e3fb1e962399c95ccc71681d131c28c37f4ff5d5 SHA512 5c7c28933fc38ca76374972f3cd4285a48e6ea292c4367356458e67e43045228c252626369f124058c7210ed40bf15c77e656f6ac1ebd428bea60a09cd90f1f6
+EBUILD xf86-video-intel-2.99.917_p20230201.ebuild 2030 BLAKE2B bebd93e177281c3368a38bf3de6e56f2ae158e6e50ed93bcc1fd2310230d2c29e10a6ddca6d7658270995b54297a035636cb7b7648670be6193501abe55916d9 SHA512 cf298e6539f78fe533d0d4fc5ab0d8c36306a6d0553a0cc791cfdb2c5b143169d61c1c9bd2b10c944844f1a30836be4a14713e05c78943ea971ddd4e1b03bd71
+EBUILD xf86-video-intel-9999.ebuild 1990 BLAKE2B d546dfac9bdc90c8c9949628ecb436630acd7037d10368c00fb4db78cdda01b1e97fd7e7009638c2919369af8255961fe7dd94404d95021d81e98907f380462c SHA512 40674381b5d829e9a92c19e3d96a342a9e0d54a37bae3f2b8c960c20b5a085436ff5a754cc085e6b5b7cec719747e055f729072a77e30a8d913d77a47288f671
 MISC metadata.xml 684 BLAKE2B 38aa4bdc4d0cef985f16a1580083839a7866b6a423ca0046f12142f187ac32009ce4163bf86f0688e6c9566f5822c9e8dd801224ba06a1ea39f08ebfce97f077 SHA512 fa9a5cf8cfa205f89019c298a6064efc2800b265a60f55c461d7e34faa0129978404507e4ce96ac629a6ea20a9e9b6eb29103b565f9758ce7b0f9e7656794fba
diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20230201.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20230201.ebuild
new file mode 100644
index 000000000000..fef57ffc39e7
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20230201.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+XORG_DRI=dri
+XORG_EAUTORECONF=yes
+inherit linux-info xorg-3 flag-o-matic
+
+if [[ ${PV} == 9999* ]]; then
+	SRC_URI=""
+else
+	KEYWORDS="~amd64 ~x86"
+	COMMIT_ID="b74b67f0f321875492968f7097b9d6e82a66d7df"
+	SRC_URI="https://gitlab.freedesktop.org/xorg/driver/xf86-video-intel/-/archive/${COMMIT_ID}/${P}.tar.bz2"
+	S="${WORKDIR}/${PN}-${COMMIT_ID}"
+fi
+
+DESCRIPTION="X.Org driver for Intel cards"
+
+IUSE="debug +sna tools +udev uxa xvmc"
+
+REQUIRED_USE="
+	|| ( sna uxa )
+"
+RDEPEND="
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXScrnSaver
+	>=x11-libs/pixman-0.27.1
+	>=x11-libs/libdrm-2.4.52[video_cards_intel]
+	>=x11-base/xorg-server-1.18
+	tools? (
+		x11-libs/libX11
+		x11-libs/libxcb
+		x11-libs/libXcursor
+		x11-libs/libXdamage
+		x11-libs/libXinerama
+		x11-libs/libXrandr
+		x11-libs/libXrender
+		x11-libs/libxshmfence
+		x11-libs/libXtst
+	)
+	udev? (
+		virtual/libudev:=
+	)
+	xvmc? (
+		>=x11-libs/libXvMC-1.0.12-r1
+		>=x11-libs/libxcb-1.5
+		x11-libs/xcb-util
+	)
+"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+
+pkg_setup() {
+	linux-info_pkg_setup
+	xorg-3_pkg_setup
+}
+
+src_configure() {
+	# bug #582910
+	replace-flags -Os -O2
+
+	local XORG_CONFIGURE_OPTIONS=(
+		--disable-dri1
+		$(use_enable debug)
+		$(use_enable dri)
+		$(use_enable dri dri3)
+		$(usex dri "--with-default-dri=3")
+		$(use_enable sna)
+		$(use_enable tools)
+		$(use_enable udev)
+		$(use_enable uxa)
+		$(use_enable xvmc)
+	)
+	xorg-3_src_configure
+}
+
+pkg_postinst() {
+	if linux_config_exists && \
+		kernel_is -lt 4 3 && ! linux_chkconfig_present DRM_I915_KMS; then
+		echo
+		ewarn "This driver requires KMS support in your kernel"
+		ewarn "  Device Drivers --->"
+		ewarn "    Graphics support --->"
+		ewarn "      Direct Rendering Manager (XFree86 4.1.0 and higher DRI support)  --->"
+		ewarn "      <*>   Intel 830M, 845G, 852GM, 855GM, 865G (i915 driver)  --->"
+		ewarn "	      i915 driver"
+		ewarn "      [*]       Enable modesetting on intel by default"
+		echo
+	fi
+}
diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-9999.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-9999.ebuild
index 61979fe61d07..dd5f84ebed58 100644
--- a/x11-drivers/xf86-video-intel/xf86-video-intel-9999.ebuild
+++ b/x11-drivers/xf86-video-intel/xf86-video-intel-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 XORG_DRI=dri
 XORG_EAUTORECONF=yes