gentoo auto-resync : 25:12:2023 - 07:32:48

46 files changed, 150 insertions, 134 deletions

diff --git a/Manifest b/Manifest
index 2ca7f5752c98..a5d9efd6283d 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29264 BLAKE2B 7cbc2f70beee0a6b569a7a784a2f8707393747a78ee8aa42e058deedfd6c8360bbfeae43021de3d10b0291413e4f4200c77a51a13a3120cf3d6d201c720948f6 SHA512 fb63cfa59de0d5cd160700a9065de32f942635b401f2e2e77b32d0d1e56de11210d10a85cd34efb02a74e68966ac7fdd594a94fae01b2f539b76538b432f78d7
-TIMESTAMP 2023-12-25T01:10:13Z
+MANIFEST Manifest.files.gz 29267 BLAKE2B 75f58ef15a395455c2f2089112c86762945534efab6e6a2dfbb403e1f09e7ca76a00454c0b04a5374641c21139d617ed079c7a9d96df812214234f094e3e6d59 SHA512 ebce5c77b392315d5fce63e1117953989aa687e32e195070176e98b9f6f94bce906d6fca455f02686bc78ddfef9828ce193072cd635485e1459e99a49059f055
+TIMESTAMP 2023-12-25T07:10:09Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmWI1nVfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmWJKtFfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klD9IRAAmL4o/cgJ1rQ/U6zWISanyRpNQa+Sq7R04uOSaztW+6ZoNLHQXjD7bPd4
-oLiQ1uq5opZxyDHYLGoIzjZ2ZlxYrH4LfBzvEHn+7A7KQb54hYC96otYvXZstpF7
-PvrjPiUYU84+Q3DcHuqIcmBYvO6pD4vSUukGjYDaRkgwMvZ56PLiNS9uBdbxmq3O
-owAp/fFy6zj7fE56RV8clbBr1pyW4Wyk1dwvTjLyBQcCbcrp8sMMqw2jBIqNGyR6
-g2qgzPLFm87U38v00yWUgJJEkyid9dkP0SLj1Ie1obvcS70JQxzJc7uXAOrrWBTn
-JBC8oq9Z/sS9+FSPDCdcTPZAJ/CmMYg9EdMuYkIZ/NUFwZir/71JDMz4N9nxPyGM
-3IDcRhRE30VHRxkYrgBoUXluBMvfPU4dbTWGTVXPQj819C7fhG1lyoGoqaHMalNt
-nfdwQ+o1ah9Z3Gfq/t0Ww3bcoux0qmrkLYi5LF6yyDryQrqPx+Cn1xB7PjJf5hz2
-iRd9LQ+Cxk8WKmO/gqbJ/nXAUXPl8sLH0vL+hA0dJoRAxuj4szCT4h/m08eH4t5s
-LvLXoNRBdcdRflflfxYFJh/w8rEagqEawl1wnS5vE5yjbLh/P/cRyY7vlDZCy9ku
-eerr61VuhxXYvn3U5yiVES/cn/XoNQdPAn89Wbum8qKEGR09UIc=
-=VbSw
+klCBjA/9HhElZHhr+SpTSHKwdy3CYMBMYJNsLA+VyI7khsqaiVR5NA2Iyw7d7eGn
+cVcJXvRMEDbaYnTQgB8GogZi1imezPt8kFg9KVGrx6XLQ04+sktdbipvY+TR0R1i
+UlQWNcUEUZBh4K3xRmXfviMO/Smye821aYC1sl20MeGWP6X53LoiUZ6Pab9/iXaU
+IuKTZeqXW0BnRM+ZNUrc/Q+BrQ4xCrK/UCNnU9GQQjgei7I0PfN8p3NMRGv4qe5B
+WBONwiKQg8yxqp7gE2d26fGKnE6B5jNrqp/JSjjErdlWP1MNXxpmJRY9AHCzSdfF
+Bc3zJK0nOdZ6xDl3+9p8QeyyODPYhrUZ+lMT9ZaiIxZJQ1wedalJuL2BwPID3sie
+Cx1kmInSzp753AejwVG5Mx5nw6CS/9cMJvWxQPO38fx6D5Bo8wvsq1ETOhUByRDH
+YaYHyVOA1PcBOdJtKbZCFWu0k5OM3HLU1O68Bk8MXv8iOzUKE/dnjD63irztMYTv
+aCE2eh3A7Ts+1pVos81hZkpuD/wac/57TPIayvC3tCHw06WoXbl1PFPvwnExmFuY
+PP6kJRmXI/V5KobL/so0M9LYHvpMx4xOfaziZsVPbxnt657P6qQ5imnt5dKKxOOT
+oVhWxYZ4SIp3s6kypOEkn4Rzx6Mu3KuZ2BCHeeo7308HBZqEuiM=
+=dYVf
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index f4049f01b4db..a0ab5e31db83 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 70fb7d4a6437..88a6bce77d4c 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/jtidy/Manifest b/dev-java/jtidy/Manifest
index b26af1867e19..f9f5b4c6c886 100644
--- a/dev-java/jtidy/Manifest
+++ b/dev-java/jtidy/Manifest
@@ -2,5 +2,5 @@ AUX jtidy-1.0-build.xml.patch 998 BLAKE2B 7bd86d87699a784a918e102195e097d3b88bed
 DIST jtidy-1.0.zip 240642 BLAKE2B 96e312f2b938f75124a966ad6ecbae39a6822a0d362e98265226409b6c407cfbd1cf1eac2adac522cb02174159392c25bab3abb18c6dce591a0d398cef367306 SHA512 be73dfd2f65ec53a3c1a9b9014a62011f58f5f337bbd2b3939c5f8f54c225fa7718717bf84348bc07a37411c20b1e82f300ba4fc865d7019ada6b1f8d081440a
 DIST jtidy-r938-sources.zip 240642 BLAKE2B 96e312f2b938f75124a966ad6ecbae39a6822a0d362e98265226409b6c407cfbd1cf1eac2adac522cb02174159392c25bab3abb18c6dce591a0d398cef367306 SHA512 be73dfd2f65ec53a3c1a9b9014a62011f58f5f337bbd2b3939c5f8f54c225fa7718717bf84348bc07a37411c20b1e82f300ba4fc865d7019ada6b1f8d081440a
 EBUILD jtidy-1.0-r1.ebuild 1051 BLAKE2B 7c2dc7e113d109733f3f05d4160edd50155726019c063e249b137b539a2e9a4c5213cdb365f3470384b60e850f1ec923128802ea8b4cbc41379c7b483bf9812f SHA512 ad278e2e648fddea28eaed937ca5d64ab7864b521261f9d267b685b1e2fd08f9ea478d515d89f1a188e884bed9576511f1ce62b4386f2a117fe54ac766853512
-EBUILD jtidy-938.ebuild 738 BLAKE2B b5255ba80db5d99689eba211df147e3c8784abefdce85eb016357704488bb8c5d31446d2fa705d1883e79fc698dc80c4c18348e86aa956856da584f0f0984a24 SHA512 6d87c57be5d0ccf88f3bfa504b571edf5791772852046ff3a60248cc39e1679a41c9f0f6566403bdcee08e3672f0fb5600e20cbd1dd81afcc2f18700fb989751
+EBUILD jtidy-938.ebuild 737 BLAKE2B a6a2f7fb13e7d0f6f29bc2a0c67f13adb3e422ed1481ae22ff75720d4abae0add850c831e8859183d3c0a8a50ba4818f21dc8e829534689153b0f9eeae6994b1 SHA512 a3a4d602e8247d43050dd49d9565950891ee894fa16736358fe309fc56fc71f59329a9f2d20ca39bb5d3a32b26270c9529914dbb0355740752c61994550d3b62
 MISC metadata.xml 312 BLAKE2B 0cefe0ab92f9a89c5728c2d7ceb5079e2942590955ebed76105c11ca6e25064fa5d74ad968bdb922be16ef01348ad9e015e68d501c7da3ee6a807cf3821e5380 SHA512 2f68badf7c7d98f60ca73b9fe7e5b5b12168aaec72605ca780e2478ba49f73f460dc3f8a7b4c6d28e334aac3e3e99d76573c4fb8eb40d92619ccbea845947bdd
diff --git a/dev-java/jtidy/jtidy-938.ebuild b/dev-java/jtidy/jtidy-938.ebuild
index a358bb13a064..63fdea8d2708 100644
--- a/dev-java/jtidy/jtidy-938.ebuild
+++ b/dev-java/jtidy/jtidy-938.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://master.dl.sourceforge.net/project/jtidy/JTidy/r${PV}/jtidy-r${P
 
 LICENSE="HTML-Tidy W3C"
 SLOT="9"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 BDEPEND="app-arch/unzip"
 CP_DEPEND="dev-java/ant-core:0"
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index dd74f93c02f8..539bd5e7e4ea 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/pypugjs/Manifest b/dev-python/pypugjs/Manifest
index 70c87a5870be..56d51c8dcd6d 100644
--- a/dev-python/pypugjs/Manifest
+++ b/dev-python/pypugjs/Manifest
@@ -1,5 +1,4 @@
 DIST pypugjs-5.9.12-nose.patch.xz 12616 BLAKE2B 0cb8e8cce8af20c301e5781bca466c26f0ef97365fb67c0c46b241c0c110010a6dbf0bcc63dc7e8e886a875d2827b4fd3abd080f69022d9247d8c71c8ee80e07 SHA512 c575600273069f0395ceb55abc7dac3bf0889c8b17c89b5bf5562aa919d8818464c27eee6d7518c796b37bdbd3d265ac8301e845f024122c3cab87b0ccfaf617
 DIST pypugjs-5.9.12.gh.tar.gz 51164 BLAKE2B 32b7bbc2bde966ea53c6f52a77482f4f6ca1e0cb09948c1c9850cdd66e4449ecc60e2f6b812f57a7ade5bc323c48be5d105d63ab6680d5e2197cd203fce40d85 SHA512 c6e4bd3bb27d321e3721504e7c01f97d869eb2e29e3ac8f086aa696ca29436978ceaa420ef8ac9b5addd859f7764817b1f159e0f41784a3fdb9cd3a0620eb7dd
 EBUILD pypugjs-5.9.12-r1.ebuild 1328 BLAKE2B b888d63e534577466a3bc58fc832db950b3c5cc0b6f992de39f8e7ae2fc8156f6a97908369fab3ca21cdc7354cdb3a508d06a62feb2292712f5a827fea6bc1b6 SHA512 361b6156b21fae49fdbb2bb806ba9c12c9a35227f786525b2c7a5b4d1ff3a0d231515183ff29f1f1f79ae3ab497be30d5593d460897699228e34f8f38a539252
-EBUILD pypugjs-5.9.12.ebuild 1200 BLAKE2B 44626742b4a979a56f8e07925766737d94c9c68ab8ede92a6b369bdd3cc7fd592849a9aa36a0fd22f5e6f9c35013397f6c4937bc8e93c3d0f887444f271a223a SHA512 955c5b2a77a5f95710f5a14ad1ecfc9785a33f646195effa459357510814b67d4c870fe925983ca129a01c0f51f85de5a535b017092f97d9cb83cd9ab697b5de
 MISC metadata.xml 856 BLAKE2B 7adffa922d42b0ed0296d0b7571ba5f34b24d1b95de546c73cf44444099f7277889a1675b7a6f7e992211a104a03dd6cca9cabc1a51c572714cf93dcbda5bf63 SHA512 75ae21defb98d0b25837623784a4884cb1ce2b4cb111badd41cf00184f23bd61985052c9e5f873fcca4b39a8270e9b685a52a3ba790270250c74d7670c4ac409
diff --git a/dev-python/pypugjs/pypugjs-5.9.12.ebuild b/dev-python/pypugjs/pypugjs-5.9.12.ebuild
deleted file mode 100644
index e10bf787887f..000000000000
--- a/dev-python/pypugjs/pypugjs-5.9.12.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Pug (Jade) syntax adapter for Django, Jinja2 and Mako templates"
-HOMEPAGE="https://github.com/kakulukia/pypugjs"
-SRC_URI="
-	https://github.com/kakulukia/pypugjs/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv"
-
-RDEPEND="
-	>=dev-python/six-1.15.0[${PYTHON_USEDEP}]
-	>=dev-python/chardet-4.0.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/django[${PYTHON_USEDEP}]
-		>=dev-python/jinja-3.1.1[${PYTHON_USEDEP}]
-		>=dev-python/mako-1.1.3[${PYTHON_USEDEP}]
-		>=dev-python/tornado-6.0.4[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests nose
-
-src_prepare() {
-	# Remove pyramid backend as pyramid isn't packaged
-	rm -r pypugjs/ext/pyramid || die
-	distutils-r1_src_prepare
-}
-
-pkg_postinst() {
-	optfeature "converting to Django output" dev-python/django
-	optfeature "converting to Jinja2 output" dev-python/jinja
-	optfeature "converting to Mako output" dev-python/mako
-	optfeature "converting to Tornado output" dev-python/tornado
-}
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 9298d8641ddc..65bfa7f61bfb 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/buildbot-worker/Manifest b/dev-util/buildbot-worker/Manifest
index 7c9e00470e69..08f79a81cc8a 100644
--- a/dev-util/buildbot-worker/Manifest
+++ b/dev-util/buildbot-worker/Manifest
@@ -9,5 +9,5 @@ DIST buildbot-worker-3.6.1.tar.gz 120224 BLAKE2B 010893b7b4e5710654299b2541c4cdc
 DIST buildbot-worker-3.9.0.tar.gz 125913 BLAKE2B e053cd150cf21cc0e5dfb2d49c186c49d340670429b760ce9f697aa97a245d0e6a12f0ea84eb1256a610891042096877c89244b1f2862bf74160502170f9124c SHA512 08b74d6f019ca85f65c598a34c81bc47fdf873abad17205072788d938fcd5450f80aa6ca9d324edc01893947f4ac8e2968889dd73be854a82b4ea54e4730613b
 EBUILD buildbot-worker-3.6.1-r2.ebuild 5191 BLAKE2B 67702aedccac19aaabed0aaf9857caa1b12746ee50fea70e33580f87f36466f508a7981cbf1f36933c9d3ca2dea399f8282953920cc72d154610ae405ad81004 SHA512 6b1cfc2c6905279ad45d8d1fd3111f716351bef2d887f9adc71eb65c36ec01333199c0d8e0ba6340498bac766d705fa92bead0fc5b4b0a488065822e4c71daf2
 EBUILD buildbot-worker-3.9.0.ebuild 5156 BLAKE2B 8d396dde5bbfa803002253b746dd0100318fccec29215600cf9c73e6a6f86dd133f6ee9ab15b5f4c1acdab7c8e46f6eba58c5677c83a7ba4059aeef6ce947974 SHA512 e726a6fcce2cc71d03353243e0c5e6fc261d1b1aa9a8cd2204414612efaa49ef6db897798ec6c8eb47b8096e80774cc52baecdd1ea6c5560fb2298b1c23e87c2
-EBUILD buildbot-worker-9999.ebuild 5141 BLAKE2B bb303734f6a0d674c1dada78e585b1e295f5cc1ee3dc07fe6bf98dfa4ddf9d9a4b3fd9473c4f7f5cedc1fbd69d68ddd84553294f324fbfb69f4ca165833be90f SHA512 82fbb828d8f7f9b7cb137eb066b4daceeda4b9340a96e8dfba48047377f0c2f25c9c3333cbd99bf98a3c5e955d534562557bf071194b28c26092664c4dd502fb
+EBUILD buildbot-worker-9999.ebuild 5104 BLAKE2B 58af73cb40b8d48ef60acf09e5dded6b9076cd62afe08bb599861d2c0a883e60db1e1dffdb0f0586a8b96b05ee437e67001617a7bc4da99f389fb1dc1d829c2f SHA512 141e36672adce0aecf77403daee423809690135c20da4bb0e7f550df7a6f1ca72235145554001c0bd7d3d9f447bc9a23ae28e1030f18110a66f7e7f4e07c04da
 MISC metadata.xml 589 BLAKE2B 97e4047671ab199256b50061698e8c9030e2d6618436b4338080adae1f5d53572215d7c6edfd3878c0d42ddc8f9a5b70acb4fbdc8fdfee37d96d6e70e931f752 SHA512 87a93213d11d2fadef014e9c71185539e850d49e31b79a45de75f78dc4238e62d22a04d4356ea5afee061223865acecd3e29846705b8a9e7e2fe2292f9f23ea6
diff --git a/dev-util/buildbot-worker/buildbot-worker-9999.ebuild b/dev-util/buildbot-worker/buildbot-worker-9999.ebuild
index 02c6afc55af5..fc44c944cbfb 100644
--- a/dev-util/buildbot-worker/buildbot-worker-9999.ebuild
+++ b/dev-util/buildbot-worker/buildbot-worker-9999.ebuild
@@ -23,7 +23,6 @@ RDEPEND="
 	acct-user/buildbot
 	!<dev-util/buildbot-1.0.0
 	>=dev-python/autobahn-0.16.0[${PYTHON_USEDEP}]
-	dev-python/future[${PYTHON_USEDEP}]
 	>=dev-python/msgpack-0.6.0[${PYTHON_USEDEP}]
 	>=dev-python/twisted-18.7.0[${PYTHON_USEDEP}]
 "
diff --git a/gui-apps/Manifest.gz b/gui-apps/Manifest.gz
index 9af2c5c49413..10885aa11116 100644
--- a/gui-apps/Manifest.gz
+++ b/gui-apps/Manifest.gz
diff --git a/gui-apps/swaylock/Manifest b/gui-apps/swaylock/Manifest
index 88e11a17729f..eafc7de348c8 100644
--- a/gui-apps/swaylock/Manifest
+++ b/gui-apps/swaylock/Manifest
@@ -1,6 +1,6 @@
 DIST swaylock-1.7.2.tar.gz 37368 BLAKE2B 146d73255a0d1439cf75ccb2fff528e47929718eaa75dc5a1567feeac59e65ebf674679e559dd634f375b5ca1bd44f6fe195f7362441b1979eaa222ba35812b8 SHA512 0593f7dfb258bd77796cb757e2e52d01829e0746306ce7991313a2982feead698c22753db53b00719ac1c82f6573563bcf5815f68c06680aa8ee6d419cac7549
 DIST swaylock-1.7.tar.gz 37149 BLAKE2B 7675b56a28ce932bd163cd41ce498295b61aff51d204c5323b187ddde9ea17f6ef1ac2777272fd92703e49f44b3f749645b4715a75ed54845590513e7dddd524 SHA512 44c5a4e482674caeb86da78e49d4593128a14adad2d6e46994f984b2b2b893416d6ceeb6b0b5746ad5594892e65c9dab9764bbe4bf617a90d92622a41b791ed0
-EBUILD swaylock-1.7.2.ebuild 1170 BLAKE2B 2c6d3d8d484ef4a79cbd9ddeb4fbfd1740b78bee65fdcbaf5d69d77337723ff09369ae942abe34c610abc264c467c2bd1e90141f393c969ec19d6cb4dd6e5712 SHA512 ee85b65f4fb05740cd137b42673b4b338fa9056557f31ff7000072e7905b586a26c3e48ea9ac1d02e814afb955565fe1dc3e114791e6f81c9115f3ed88b091be
+EBUILD swaylock-1.7.2.ebuild 1168 BLAKE2B 89ed4961d880a3be47725fe1b4dcd42adca53d59952c2508dcb15d9a36a050396ba821fadcf1ab8143922a88e027d1dc13cb41abd503b4d4e4f549384f053f9d SHA512 cbb34cf93322561ae3f83069a1ec96a58f6af34c85bfc913424706ffc83385f9fa68ce57bbd0fd817260e166618c11e6e45cb632980963618940f69b633bca0f
 EBUILD swaylock-1.7.ebuild 1166 BLAKE2B 92ea949101a89f704935eba363f0dcf52dfab46c06c4483d62354b4ec8804e45b3c824f924014c379dff6a8debbf6442d6a51a9755f926e31b70034b4000a050 SHA512 46036c39bf893afa679e66d1f1e9c25eef51513a760215c8cec0ddcbfd570fbc73d17a46fbd59575a11d58bc0c7a50e9afec190add89566c5ef7e02192399645
 EBUILD swaylock-9999.ebuild 1170 BLAKE2B 2c6d3d8d484ef4a79cbd9ddeb4fbfd1740b78bee65fdcbaf5d69d77337723ff09369ae942abe34c610abc264c467c2bd1e90141f393c969ec19d6cb4dd6e5712 SHA512 ee85b65f4fb05740cd137b42673b4b338fa9056557f31ff7000072e7905b586a26c3e48ea9ac1d02e814afb955565fe1dc3e114791e6f81c9115f3ed88b091be
 MISC metadata.xml 1182 BLAKE2B 26d1cd8d48c9d3cd61c9c00838f5ca27f5794e8ad23177c99f14b80e7b5fb0238b361feecb7f24c871e653532bcc7ac6ad797f554151002cad43faba4f3f3963 SHA512 e3a00a1c6f35bb616b8934e0b841930f8efdc282096cacf0a615478444090d49ac4062b3d5b0cdf40ea22cc0a9835d403ef7716aefaed8cae8cfe508a99ff879
diff --git a/gui-apps/swaylock/swaylock-1.7.2.ebuild b/gui-apps/swaylock/swaylock-1.7.2.ebuild
index 6351d0bbc4a6..a1be23a04a10 100644
--- a/gui-apps/swaylock/swaylock-1.7.2.ebuild
+++ b/gui-apps/swaylock/swaylock-1.7.2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/swaywm/${PN}.git"
 else
 	SRC_URI="https://github.com/swaywm/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
 fi
 
 LICENSE="MIT"
diff --git a/mail-mta/Manifest.gz b/mail-mta/Manifest.gz
index fcbd8dd556d6..3e270dc539f9 100644
--- a/mail-mta/Manifest.gz
+++ b/mail-mta/Manifest.gz
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index 251d4034d655..dc6ae795e167 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -8,6 +8,6 @@ DIST postfix-3.8.4.tar.gz 4864184 BLAKE2B 200ce3d72444da05e42fc8627002d53d68c1b3
 DIST postfix-3.9-20231224.tar.gz 4901720 BLAKE2B a49da1ef8c38efddf25b39828a30966d2be8b5db6d8dee436ba7059c01b71d4959b20f0d30366cf5adea039e3a82a0e191944822483d3852a166fbc90ca4892d SHA512 7c683f55e74f49805142fcd022d52aeec174611cd2da4d3662154f8c4d612f6ad61ee7bde2f31c806d906094b481b73a9be7a95be896e27b2583c76c40b678bd
 EBUILD postfix-3.8.2.ebuild 8190 BLAKE2B 6e288a094b3cd29fd88623352eca1511d35c85a0afdab6e3a0fce46200138fbd5baef569225a480514133e42c0ff3f84f3bfc1c1ad09362bcc52c93af21271e7 SHA512 dacb1a50669e5513e9de246a7c6b5ebad59e7b723420781655df68607d84771c18d06ef8baab004d1d36394246944683e9dae8a2308d09b0c7408bfca48c7830
 EBUILD postfix-3.8.3.ebuild 8191 BLAKE2B 81be823c18f649d1e12b7144ff2308d640d717ff9fb7e178cae6eb852f20ced7c7ed1b05e9c2d96369b0a383037650b0f03331f79af21db4ba980a383492f633 SHA512 24dbf9a8e1ae39b5cf6924c1c6aac6d69ab42f457a3be4e88f2bac8622665221bb89207cf03f14e559ebe5f189e7b6cf1a01efeb4ccc093a5106472b41cd4a8d
-EBUILD postfix-3.8.4.ebuild 8361 BLAKE2B acbfcf17c9875c3c8e2e29be73a0f1291a6aee474dd0aecf0c1ae25f8b9eb96b0c59329e62c194fa2f99b15d2df1f03c366ed40cad311560382dd023d4d971dd SHA512 b33a27f0c3fa8e37617e167968f9fb9d10424b94046272b03cfa2448239d2d19d82d7d008d6df61576e017f04a342919fe9da0993f9a1ae2cbda38cd66cdc302
+EBUILD postfix-3.8.4.ebuild 8358 BLAKE2B ac5e89c7fe84f9f49956948937922fd96c8a30a5479102de74aa78bf5e2e9a9306ac4028963c062020e9d9e73ca84ff9cc8105c19cd1e44eff4440e597ebdeee SHA512 2114f27e28f44c7b158dd312476727d6e0a92791c6a0441f2411a20ceea51c945dabd86fff831bf09403136404cfa67bcf578194c0e0576f07fc0d08386b6d6f
 EBUILD postfix-3.9_pre20231224.ebuild 8207 BLAKE2B a7d97777bc8527771e0caaaba00b9e9ce151d4fbf1ab49ef908c80a8af56a509e6af41abec5f150af169d230dd080844a809791f527a3586b9dd4b4e14a05fb6 SHA512 fab6fcbf0256013ff4932a60a6dd91be84c2ee5392b00010a4a7d9f267ef1a1b9a66d33e079a39aad161217a8abf3af8d6e60d99d48bd427124dbd6239115280
 MISC metadata.xml 853 BLAKE2B 96b2b5c531692f1eba1bc4c543ba4df77754d11802e9754ac102907d00dc1284fe449384d3c8c4e53c343e3424f79cf654b7a0c6a112d0ec973f8da585045ff7 SHA512 15c4521a70f25d8d5261c1c981d7ab41cdf542a1630c6857037e0b3e3ab0a51f6dbb4edee9ee9857d0b7a130c5da6f475e1be6a02728edecb23defa004be48eb
diff --git a/mail-mta/postfix/postfix-3.8.4.ebuild b/mail-mta/postfix/postfix-3.8.4.ebuild
index 00ea871c1a1d..df928682c150 100644
--- a/mail-mta/postfix/postfix-3.8.4.ebuild
+++ b/mail-mta/postfix/postfix-3.8.4.ebuild
@@ -15,7 +15,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"
+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="
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 3bcd7b4c4c99..6321155e0056 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index a074f7a019e9..e86c70e53b0b 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Mon, 25 Dec 2023 01:10:07 +0000
+Mon, 25 Dec 2023 07:10:03 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 6cbcc9c5df64..0b317b9902c7 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 557720 BLAKE2B 1bc79beb7b22c2ce6b80e7677302891c872d6ac116096c06d9dbba6d7683aec51bbbcefe97cf8126dd25818fe0c936a6b25df9e1c8c1be9da6a5c9580fff46e2 SHA512 273602eb349fcbbef4c2202ec5c33b66d702f53716aad3f0abfbf14db5c7ba667dd6fefa620e348109b82427555dd8d45ab0b261320d92f551c7162d8f78de5f
-TIMESTAMP 2023-12-25T01:10:12Z
+TIMESTAMP 2023-12-25T07:10:08Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmWI1nRfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmWJKtBfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAbCg/9EXSUiThzhKzG2wathHH/dbP0rnzy2wRKqU3GofCSnhh2CnxQ/0xdDg7R
-X61a+qjMVd9mk1tUA3YxvwN48kEvlFwqQbzNd1B3DQxpQDLfOev8ihFXuba4a+vI
-2jG2Rp2EEXU4GOpHrqlAqZwtdgybHwIiFRMKwcMlSn+g6m1ZfvbhOlkwrcRxfczp
-3Oy/RhINPC56yW403Yq3imfJ4eH9PlRNDakebBSPCZS4a8gIDPdxuwRqNyGhjPfJ
-Vbl3SdXXMy4xX1e0eEf0ODVeD0YOM3i90kvXw438AP1TkUnuO3bad7HdXHZSdzU8
-meyuKAHHnCgrUqG017jZAlBe9u9KUiGoy1k/koppX6xpJu1y1fR84vuGBjsS1OXW
-aDfgv3CJQdsOCcTJwPqFy8hXTT2yemuUVvrwVgFV58vs7VWveDcHu7ftx7n8OxTc
-YllaYChGX/OGkMsYgaeJFm/5d47/UXjGu0nBWk8lIrw7hzqQtr0ZGoHY15SomQAr
-bIRNKeoWguDyPgb2kUPIvxh17I0cA8Xy26M2RvuLOgAfVEwkSXQypnWc8y225Q38
-XWIWrklMeqtmdTQI/dhvHtfZq0SUUn4xSKNxR33L47u1/QzoRuiVyh4I72I0tGpc
-1KxzcNtLxD4LmbQseGY04jvC+rzK7bCijLTQRLVO+DwrAWSc7Tc=
-=Sa+e
+klDizA/+LKUaSTlmxRvk+00A7MZ7m+I8JvvNcsCSTdCCLmySJOWRpPuiPEhht6Wn
+jdiB57gSj141C4TqIFsLLjWNU4aN+X0slYTJ3tk+USO90arEEn15hB5oJGWomcHA
+pe3BXe+JusWTwM6S2w7SOFvLMaBPpT20BWdoFIsJZQQQC8fcqO+979XrL2fLkpDu
+B/1CNjIda5Qa7O60Qv3wka0kMsrK1duipkKedC1XjGxHcVE0tXX7iGBV2hz/NAB9
+DE6XI/UFuFKFBV22zvQPUCbN6+EHZLifxmZRe1YkjxdvFVK81nYMlaoej6DkIxIm
+n9/+fCnUNGQiy6nabH+oGUKsYdEMEUm/IE/Z2yik2ZNHe9KdxdljaJ1C2Il3Y6V+
+ImBwsiCM56n1kUViJQ2FBId+G9Hpuu4lldTWiEm3dmkNRPUKyK3OhKO333k10YFO
+nni/45d1q6OsfPqIpEfJAU+yQP7hXFpfiEA9g/1Ji2zAvjh0EYDdYU9ljK8FGyyW
+tnfaw4C1xZsuMlA/Si16cx1GfS3NQsXwCIp8EvPla18/HiYQexi8yxtm+Uuaxjy3
+luClvsjKL9Qg523CEIf2se0jFZRtW2Nvum6MqTXWe7OBh9QRMr4r+gg4eLOzL7rB
+PYeEzncI97PoSTcbSVBICYWIf9m/lQjmjcpPRDwYGOMzMf7PBVI=
+=aSto
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 609f99139150..fbb47d0f1cc2 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Mon, 25 Dec 2023 01:10:08 +0000
+Mon, 25 Dec 2023 07:10:04 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 7d38809c7aaf..9ed813e9e87b 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index 0b0aea86fd82..7a3439f1a9ec 100644
--- a/metadata/md5-cache/dev-java/Manifest.gz
+++ b/metadata/md5-cache/dev-java/Manifest.gz
diff --git a/metadata/md5-cache/dev-java/jtidy-938 b/metadata/md5-cache/dev-java/jtidy-938
index 81bfd670af57..400aed6211ce 100644
--- a/metadata/md5-cache/dev-java/jtidy-938
+++ b/metadata/md5-cache/dev-java/jtidy-938
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://sourceforge.net/projects/jtidy/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=HTML-Tidy W3C
 RDEPEND=dev-java/ant-core:0 >=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=9
 SRC_URI=https://master.dl.sourceforge.net/project/jtidy/JTidy/r938/jtidy-r938-sources.zip
 _eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	4ab397252045e0aeb290efb05ea956c7	java-utils-2	7c4c66a18e7b619373f3a3bcff542907
-_md5_=c9d619fb6ae4858239bd2ceb7d9d53ed
+_md5_=00bc48da3bf7a43cfef58c7852245824
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 332068373dfd..909fdb4dee30 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/pypugjs-5.9.12 b/metadata/md5-cache/dev-python/pypugjs-5.9.12
deleted file mode 100644
index 49de16134eb2..000000000000
--- a/metadata/md5-cache/dev-python/pypugjs-5.9.12
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/django[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jinja-3.1.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/mako-1.1.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tornado-6.0.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/six-1.15.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/chardet-4.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nose-1.3.7_p20221026[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/poetry-core-1.6.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=Pug (Jade) syntax adapter for Django, Jinja2 and Mako templates
-EAPI=8
-HOMEPAGE=https://github.com/kakulukia/pypugjs
-INHERIT=distutils-r1 optfeature
-IUSE=test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64 ~riscv
-LICENSE=MIT
-RDEPEND=>=dev-python/six-1.15.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/chardet-4.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/kakulukia/pypugjs/archive/v5.9.12.tar.gz -> pypugjs-5.9.12.gh.tar.gz
-_eclasses_=distutils-r1	8e0ad2c111b259a711c8eaef98a17690	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	c8951c1dfcc1d43e3f967f61fd0ec59c	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	474cb53a7d1b62721a91809a1d702661	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
-_md5_=a5e2fe417b66cdad6e6e91e504649877
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index dd09d46032ac..7763c77089d2 100644
--- a/metadata/md5-cache/dev-util/Manifest.gz
+++ b/metadata/md5-cache/dev-util/Manifest.gz
diff --git a/metadata/md5-cache/dev-util/buildbot-worker-9999 b/metadata/md5-cache/dev-util/buildbot-worker-9999
index 913f2b5930d1..df244c166a9b 100644
--- a/metadata/md5-cache/dev-util/buildbot-worker-9999
+++ b/metadata/md5-cache/dev-util/buildbot-worker-9999
@@ -1,4 +1,4 @@
-BDEPEND=test? ( acct-user/buildbot !<dev-util/buildbot-1.0.0 >=dev-python/autobahn-0.16.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/future[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/msgpack-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/twisted-18.7.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/parameterized[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) virtual/pkgconfig python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=test? ( acct-user/buildbot !<dev-util/buildbot-1.0.0 >=dev-python/autobahn-0.16.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/msgpack-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/twisted-18.7.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/parameterized[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) virtual/pkgconfig python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile config configure install postinst prepare test
 DESCRIPTION=BuildBot Worker (slave) Daemon
 EAPI=8
@@ -6,9 +6,9 @@ HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi
 INHERIT=readme.gentoo-r1 systemd distutils-r1
 IUSE=test python_targets_python3_10 python_targets_python3_11
 LICENSE=GPL-2
-RDEPEND=acct-user/buildbot !<dev-util/buildbot-1.0.0 >=dev-python/autobahn-0.16.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/future[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/msgpack-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/twisted-18.7.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 )
+RDEPEND=acct-user/buildbot !<dev-util/buildbot-1.0.0 >=dev-python/autobahn-0.16.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/msgpack-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/twisted-18.7.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	8e0ad2c111b259a711c8eaef98a17690	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	c8951c1dfcc1d43e3f967f61fd0ec59c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	474cb53a7d1b62721a91809a1d702661	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
-_md5_=e62eb3a9dd799da4b309e7d2ba62b4c0
+_md5_=796943c544272bbc76e1ae5fda7da23c
diff --git a/metadata/md5-cache/gui-apps/Manifest.gz b/metadata/md5-cache/gui-apps/Manifest.gz
index 24ddb20918a3..a84bcd386b57 100644
--- a/metadata/md5-cache/gui-apps/Manifest.gz
+++ b/metadata/md5-cache/gui-apps/Manifest.gz
diff --git a/metadata/md5-cache/gui-apps/swaylock-1.7.2 b/metadata/md5-cache/gui-apps/swaylock-1.7.2
index dfd80120f05d..9dfafdd2c5a1 100644
--- a/metadata/md5-cache/gui-apps/swaylock-1.7.2
+++ b/metadata/md5-cache/gui-apps/swaylock-1.7.2
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://github.com/swaywm/swaylock
 INHERIT=fcaps meson
 IUSE=+gdk-pixbuf +man +pam +filecaps
-KEYWORDS=~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm64 ~loong ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=dev-libs/wayland x11-libs/cairo x11-libs/libxkbcommon virtual/libcrypt:= gdk-pixbuf? ( x11-libs/gdk-pixbuf:2 ) pam? ( sys-libs/pam ) filecaps? ( sys-libs/libcap )
 SLOT=0
 SRC_URI=https://github.com/swaywm/swaylock/archive/v1.7.2.tar.gz -> swaylock-1.7.2.tar.gz
 _eclasses_=eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	fcaps	c0a086b957a1b183a8d136eabf02f191	meson	576e6bbef90e9753368f8b4ad0bd5383	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	c8951c1dfcc1d43e3f967f61fd0ec59c	python-utils-r1	474cb53a7d1b62721a91809a1d702661	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
-_md5_=d195d498b0e00b8041775200f99d2938
+_md5_=7ff08980b0c8b1e10966af66b876acd3
diff --git a/metadata/md5-cache/mail-mta/Manifest.gz b/metadata/md5-cache/mail-mta/Manifest.gz
index d6bc910b196d..29f3da09dd31 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/postfix-3.8.4 b/metadata/md5-cache/mail-mta/postfix-3.8.4
index 5b8285cd4865..b8bc2aa92b70 100644
--- a/metadata/md5-cache/mail-mta/postfix-3.8.4
+++ b/metadata/md5-cache/mail-mta/postfix-3.8.4
@@ -6,11 +6,11 @@ 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
+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.4.tar.gz
 _eclasses_=flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	pam	b56d0c9c20fc5b553f13c8ae165a10a5	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
-_md5_=e6f6c8f147700a18f9b2e445a8c1ab22
+_md5_=8e4c10bcbd9991d39e923b8f37e780bb
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index cc76169d9e55..bb77b65e6c78 100644
--- a/metadata/md5-cache/sys-devel/Manifest.gz
+++ b/metadata/md5-cache/sys-devel/Manifest.gz
diff --git a/metadata/md5-cache/sys-devel/gcc-14.0.0_pre20231224 b/metadata/md5-cache/sys-devel/gcc-14.0.0_pre20231224
new file mode 100644
index 000000000000..8b5c67f575ea
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/gcc-14.0.0_pre20231224
@@ -0,0 +1,16 @@
+BDEPEND=>=sys-devel/binutils-2.30[cet(-)?] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) sys-apps/texinfo valgrind? ( dev-util/valgrind ) d? ( || ( sys-devel/gcc[d(-)] <sys-devel/gcc-12[d(-)] ) )
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
+DEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) sanitize? ( virtual/libcrypt ) systemtap? ( dev-util/systemtap ) zstd? ( app-arch/zstd:= )
+DESCRIPTION=The GNU Compiler Collection
+EAPI=8
+HOMEPAGE=https://gcc.gnu.org/
+INHERIT=toolchain
+IUSE=test vanilla +nls debug +cxx +nptl +fortran doc hardened multilib objc pgo objc-gc libssp objc++ openmp fixed-point go +sanitize graphite ada vtv jit +pie +ssp +pch systemtap d lto cet zstd valgrind custom-cflags ieee-long-double default-znow default-stack-clash-protection modula2 rust
+LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
+PDEPEND=>=sys-devel/gcc-config-2.3
+RDEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) zstd? ( app-arch/zstd:= )
+RESTRICT=!test? ( test )
+SLOT=14
+SRC_URI=mirror://gcc/snapshots/14-20231224/gcc-14-20231224.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-14.0.0-patches-11.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-14.0.0-musl-patches-1.tar.xz
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	01d47726ca1df3e82aa88b780dda9828	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
+_md5_=58834150e74af523b20fc0e788a319a5
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index f6430b3f29d5..8f180a195069 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 16029 BLAKE2B 82fcb93c2025e8e21503f13a6044edd656efca4de0e5a3b59be46c0eb521fcef33fdb7cdfb9f70d48396991f51b2bfdb1daf2b7a558d95b45c8cf68d898a9b3a SHA512 0c0c66a9acb07fabf26f7cc0178a7bb41fec00525d831ca231e8652b16eced74bcaf8b5c886f774789b2313057e9ddb14c08e2397de4fa715ec27f8f9133cbeb
-TIMESTAMP 2023-12-25T01:10:12Z
+TIMESTAMP 2023-12-25T07:10:08Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmWI1nRfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmWJKtBfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCTug//X3fHN1xPNaibIJPP6pVSV+1wwa5pIWmovGNrXnF8WpC5G8njGo4DGs+K
-YQOfVouSyFlbmYpxjVbFjkt1TLiJJbtYaTJnBNgfKNTmFGVtBAdnuxUHp/6Xsi74
-3tS8b3MLRg0bRxNoWg/muJGggfXPtsLTLBmR7ntYGjqm1JWvjo7b4J8m/fKGgE5F
-nefMe01zKiXNzicT380/lGteBfQGOulvG/mN0AGR7fm8mX2PW7I506cwA0O5a8v/
-JxL5bhvXqVij7vbfxf6sy76IW1GqbKhEaS0TnLRJDTZ0nZC9X+REAz2KzbZ/6iHW
-vpwJqJfulGEwd2egG3UbRgNQODMPLDDUi9r3gP00Q4+/D3MMUg5WGzIwaUzXHx2E
-vpNhc/fs8eKo9Ws5PfpDCQhxgsCC2L1B/y1dhsBByIdqwzN+fZAwLHnQbrGniUas
-P+OL1kiO7v1Ip3lUitqfyfU2J0sSYGhVTDZS3YGG2Afa/3vOOZ3Tz6yKf5A/OhlT
-WSh2J6TK18hfL5tU/ombNH1j09T/lN6jAOScb2mLrH1O7bFjafFIDoO7/yS2E/v7
-ZClkkeuy182J4ymphQxWmOdZpp16GcU/zF7qWG/2PXjlpj9EZDx8g71KeNRAeNxg
-vi3Y6+aRAt0KE2KH6frN+u8vxeHBoglje0rpYUDVxgW7PnJnCpY=
-=y53d
+klCubA//dNSfDTQ/PGt3G0nzQ8+qgvFnLTeoJvvnJz2YUp3SD+srW3nyfIg6o11w
+HVI3J0D76QBMd509j44nyelBGDfaUdLHJ7ZioXWWKl5V/Z03qdJBi65id+6nvHfD
+n8FxBGhwtivBIGJpAlJ3wRpCkOE4Awa1Z0+wrBe4lW6ZnyzlC/wMOSCsPbUmZzZL
+JJ0JZtMVBSQhnb+N+UleT7oVeqpiA7zcODFEi9ELuL/VaybO5eIkY6F1YBWEfHp/
+RJuCBN/l3s6WNcm1TOJlP30qpcQI2ZTwXuqTVYCOh9d7swmek8BSBng7wVpErdXa
+78H44JoPWNei2/Hs9p4rHClWjMj5Sb8sTLB0suN+UO0zjr6vA4sxRjh3AxD3lQLs
+hiBmPyk1n43FbSl4EhI3jHslgHOm4k7Dq5Pl/1hMcFg3HfXd8HFEo+qTw+wbKy9s
+wwJoBFJvceEuvbig1KRo2uocHQfpbiY+xt66R7C9kTBe9GQm6T8dtM6xA66/3hCO
+4E0Cwra+D+QIeoXOby5XapluMhCFumuF41MVgJqcZD4/xfpvUbiWZaXjHTOpHVzT
+B2fG1Qs2LuDLxUSmvBV4XLnbBT0IvFciBKNRQQa7kW+MpD0XLOPbk/EereKJzxr0
+bb7ykjl8ZKJHzTbeqCKVhXwymUVA3kbjbWdkOXsDk8OWxu+Cq0E=
+=HjFz
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 609f99139150..fbb47d0f1cc2 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Mon, 25 Dec 2023 01:10:08 +0000
+Mon, 25 Dec 2023 07:10:04 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 28d546a8daa3..1f8d328f15e3 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Mon Dec 25 01:10:07 AM UTC 2023
+Mon Dec 25 07:10:03 AM UTC 2023
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index b0eeb354318a..94aca23400d9 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Mon, 25 Dec 2023 01:15:01 +0000
+Mon, 25 Dec 2023 07:15:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 7522feebd5c7..f237e9f9adb3 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-6cad605bfeb1596ecb0bfd5f60cc64a496a2c74e 1703465000 2023-12-25T00:43:20+00:00
+26e498f8640921ed2c5c167eb125333995ed3367 1703487056 2023-12-25T06:50:56+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index bc35f41ed131..23d9179237bd 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1703466601 Mon 25 Dec 2023 01:10:01 AM UTC
+1703488201 Mon 25 Dec 2023 07:10:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 609f99139150..e86c70e53b0b 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Mon, 25 Dec 2023 01:10:08 +0000
+Mon, 25 Dec 2023 07:10:03 +0000
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 52d003fd9dcb..76efd2d1bc47 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 99c83ad22cdc..856d124498e8 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -19,7 +19,7 @@ sys-devel/sparse llvm
 # Sam James <sam@gentoo.org> (2023-12-18)
 # libgrust build is broken for multilib
 # https://gcc.gnu.org/PR113056
-=sys-devel/gcc-14.0.0_pre20231217 rust
+>=sys-devel/gcc-14.0.0_pre20231217 rust
 
 # John Helmert III <ajak@gentoo.org> (2023-11-25)
 # app-text/gocr has been masked for removal, bug #824290
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index f1f3e66eadee..06e4065a6635 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index cc0c05248428..1c181dcf0dd7 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -42,6 +42,7 @@ DIST gcc-14-20231126.tar.xz 86425216 BLAKE2B bd5c18c520fa7de9b9a3c02ed3d49d67719
 DIST gcc-14-20231203.tar.xz 86462688 BLAKE2B 98855f7d07f9283ca4a681257ce36b69fb63f2de2ef0077e607211373fce8dee2d77b144bcbc6fb34c5dd25fe54680b36a8ff3248d0505860772ae4fa89a5d2e SHA512 be4bc1fc3a86130a2e0f785361e2f6d2ce56f727ba7050c969d91e736a5b2c93bffa6a977ade72e08c36262315f15f85b7bff2c89ff3653eb60bac98d4016616
 DIST gcc-14-20231210.tar.xz 86799716 BLAKE2B 289329e0fa25073a7f2e21c95ef6347c6f028f4eca4e1dd4db0224fa2eb4aa6434aeff9961f32f1d531d07228626c8911d2df3d3871e5454dda26d74ba3228b0 SHA512 cac5d739abd34318df5f3787e47a9657bbba8204bbcc2b4a968291043983264721a67420165d537b2ca0fb5c44f85cfabfb2bf138922f849cd69a6a2c2f10dd5
 DIST gcc-14-20231217.tar.xz 86943032 BLAKE2B 8d5ab21fedffad0d4d4e02201c74f3b90cfabe5c2c1abbc048b6c4d179cbf3977cffc6bfc1b7b679d0276b66f86d58ef5c0b8451a4fcb75b88b7240fd7baf41c SHA512 23d8e6dd76aff0a5d7687ce8753aba7bdc374d3330553314da378af84ad629e67dbb532ba416816ce81812857c4c54e31cc5460d3f86619d7a9fb368328ff11d
+DIST gcc-14-20231224.tar.xz 87027056 BLAKE2B 412a0e8c82063f3aac828620648e5a57942dc2028408904290f7051b5756fe1f78d81fea8d1fba607db57e1905104ed236f86fc7d07b0bb35f407ce6c91f6e4a SHA512 c05eaa660732cbe57e7390afa9218eb99253dd58a00f376287dfd4765ed43acc4672635031439226b2e068899796a20ef14e5ac610f32ca31e285a4cdfa2f65e
 DIST gcc-14.0.0-musl-patches-1.tar.xz 3576 BLAKE2B 692baee8a7709905d53aeb150d73a3721c4ba47ee5f397cfb1b5be905cf003ca02b60c94ee294d90ac39645cd5cdf186c7a3aa950c47d8cf680c128ed705b807 SHA512 0592ab98a7142e404623a6511c67dff61e9ade32c3fb2c0e75b456306e0af3799ad13252b50b3d2fdd31e5815d7f0b16b0ad63ab8386fe4d78729fc9c182d617
 DIST gcc-14.0.0-patches-10.tar.xz 11564 BLAKE2B 55d3fcb9f4de2d2fedd3cb0dcf7e03468ab6b0e29f31c70d3a5e80b91e237677d130641a1567d441882fa9525affd59ffb490324ee38857ecdd3f8a51d628a1c SHA512 b3ee6f6e26eb5a50dc1b26820b76bcdc7116784b275ddcfbf86486958d6b25dc74f00579aef04315c1f4c2648c120f594040f4846bd85faa431d2f1b6c5ba923
 DIST gcc-14.0.0-patches-11.tar.xz 11272 BLAKE2B 81c63b8aebcfd5b33b698ef4ef8f2d12b94ea2753ecec2b160cf9fab534dccd12875bcb16cfac2aa81211f8d9ff530cfc18f486567721beac487e08daa62363e SHA512 0f51352cbc6815cd1dbc8b73e9c83842a58242220ba712291cc76c08c19b3a612c88a3221b2da437a9c7ecb410a83c2e538aa1984b733f444843bdf79d314a71
@@ -83,6 +84,7 @@ EBUILD gcc-14.0.0_pre20231126.ebuild 1595 BLAKE2B 93754d4e2dcae64b6a47640e176af4
 EBUILD gcc-14.0.0_pre20231203.ebuild 1595 BLAKE2B 93754d4e2dcae64b6a47640e176af4eddfcb21ff0f18ec912a53a7631d6f60b850002a2e1b39eb1f090a589736a5ec133045793dfac68d16a6b9cabbee08ac37 SHA512 33f3a974d815655dafa35d83e537e2edc62efd402c2211cf621416fae763a52bc4503975e3448e25afc89490323690fc23b441d5e0c8d8fc0108b4cd11f00139
 EBUILD gcc-14.0.0_pre20231210.ebuild 1596 BLAKE2B afd72dbb17f35227b7a8fec8eb9ab41e267488068e36316a86a3ebd92d62cc8462dce97c6e365f163ef0bc04e4d495d804ac527fe18a4a9e8017c5342ae90837 SHA512 d6a308a7ca0edca12038b212048373b4f4b6b8abaa27b2e6a09e2a4082d8611dc23c8dae9a655a985ddd461ccb0f3f7f46a40a1725bbfd2c856e2a04efab8510
 EBUILD gcc-14.0.0_pre20231217.ebuild 1596 BLAKE2B b82b52e7652b6872edea7820cb8d25106b974aa5b28aa1ed68ecc721f6025e67d5f240be05e1456b644789f6404646d2ad98b64a80028183255bec0f70d5d1d4 SHA512 604729d35c656b6ab17df319e7bc78275d83fda8425e8d5835ea61a716a819108593b855c6835a3cc12ba2c664c6eaa7a114d5fd971e5cb85eeb592fb04af808
+EBUILD gcc-14.0.0_pre20231224.ebuild 1596 BLAKE2B b82b52e7652b6872edea7820cb8d25106b974aa5b28aa1ed68ecc721f6025e67d5f240be05e1456b644789f6404646d2ad98b64a80028183255bec0f70d5d1d4 SHA512 604729d35c656b6ab17df319e7bc78275d83fda8425e8d5835ea61a716a819108593b855c6835a3cc12ba2c664c6eaa7a114d5fd971e5cb85eeb592fb04af808
 EBUILD gcc-8.5.0-r1.ebuild 498 BLAKE2B e24f62fdb50bf2e9957cbb85c72adc96d369938a7f552735772de964f7023b8b34bd11e7e544d268cc308e25272084a728bd061f37c568d42ea65d55bb2a2e93 SHA512 f35b353e9f54eb3e1c6f8e0ea262458b41da9bddb993793aff79f765c4d93811744979d34e50c6470a9b2cfb63b7006bd284d819b7a98e56a8b3a34ae570ae76
 EBUILD gcc-9.5.0.ebuild 1206 BLAKE2B 262931215488db54cab2141549f997a48e22d0a917917eb670d41d5b155c7685e92eb1bc3843d2eca47dd15a450199aea5d99777d2870ff09b1a79ac8a63bcb0 SHA512 3737a70e70e53a581280ff1449d7d92bb9ffba0919b618ea43d4747e09b2803795a05c07c0e3a2ec8982f8d5594be58f9ac549d329b18dc236ad5159e4a47132
 MISC metadata.xml 5254 BLAKE2B b64569d62dd67c2f2dab441bb2c4a65bcd61b4c9d8ad7543e8f91c583501d72ed1474abf785e68c48de298d8391de3d94b9b4020086b2b0fa9cc477114a92e9e SHA512 f1307b7865dc4c2c843b5f498196bf5710e45e3292181b43687ebe85b5e9b26203c9c83ee7872efe2cd93595eca430de91e3a5fd6900f0f62c875308ccbb0303
diff --git a/sys-devel/gcc/gcc-14.0.0_pre20231224.ebuild b/sys-devel/gcc/gcc-14.0.0_pre20231224.ebuild
new file mode 100644
index 000000000000..3fd3235d9835
--- /dev/null
+++ b/sys-devel/gcc/gcc-14.0.0_pre20231224.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+TOOLCHAIN_PATCH_DEV="sam"
+PATCH_GCC_VER="14.0.0"
+PATCH_VER="11"
+MUSL_VER="1"
+MUSL_GCC_VER="14.0.0"
+
+if [[ ${PV} == *.9999 ]] ; then
+	MY_PV_2=$(ver_cut 2)
+	MY_PV_3=1
+	if [[ ${MY_PV_2} == 0 ]] ; then
+		MY_PV_2=0
+		MY_PV_3=0
+	else
+		MY_PV_2=$((${MY_PV_2} - 1))
+	fi
+
+	# e.g. 12.2.9999 -> 12.1.1
+	TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.${MY_PV_3}
+elif [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then
+	# Cheesy hack for RCs
+	MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 1)))-RC-$(ver_cut 5)
+	MY_P=${PN}-${MY_PV}
+	GCC_TARBALL_SRC_URI="mirror://gcc/snapshots/${MY_PV}/${MY_P}.tar.xz"
+	TOOLCHAIN_SET_S=no
+	S="${WORKDIR}"/${MY_P}
+fi
+
+inherit toolchain
+
+if tc_is_live ; then
+	# Needs to be after inherit (for now?), bug #830908
+	EGIT_BRANCH=master
+elif [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
+	# Don't keyword live ebuilds
+	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	:;
+fi
+
+if [[ ${CATEGORY} != cross-* ]] ; then
+	# Technically only if USE=hardened *too* right now, but no point in complicating it further.
+	# If GCC is enabling CET by default, we need glibc to be built with support for it.
+	# bug #830454
+	RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )"
+	DEPEND="${RDEPEND}"
+	BDEPEND=">=${CATEGORY}/binutils-2.30[cet(-)?]"
+fi
+
+src_prepare() {
+	local p upstreamed_patches=(
+		# add them here
+	)
+	for p in "${upstreamed_patches[@]}"; do
+		rm -v "${WORKDIR}/patch/${p}" || die
+	done
+
+	toolchain_src_prepare
+
+	eapply_user
+}