gentoo auto-resync : 24:12:2022 - 08:01:36

author: V3n3RiX <venerix@koprulu.sector> 2022-12-24 08:01:36 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2022-12-24 08:01:36 +0000
commit: 1cf3f23200484257eaf7d863e323e7e9aee98d2b (patch)
tree: 90c6263d1ca4d504601d8df05db598f5737b07ce
parent: 4583148f2657a7a66fd68b25c9fab02be110c989 (diff)
247 files changed, 3317 insertions, 1174 deletions
diff --git a/Manifest b/Manifest
index 13ad7e7f0953..827c206976f2 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29794 BLAKE2B 2f3846681102b455db322762fd7437e7a735f6905318bf657b939c2307e1f211cb3bb35df365de170328fd5fdd9adc374d08b5b8fad49165376e063bc1b87dd6 SHA512 a7661d6d8e806c5a3f061df1ce156b7910967c3bb70548203c35941c2691453ecd5921c0cc10e6ed7300b644a44a891e6756027f6aba17472cec3c5ad2410423
-TIMESTAMP 2022-12-24T01:10:05Z
+MANIFEST Manifest.files.gz 29792 BLAKE2B 10eb78acc41f1acd6dec83c0bad230152fbd441847422ae1d2d1c58d6b3891d1d294014fb36504c742baad2f78a4a1117421b10470a3f93005066a62da9adf82 SHA512 f585cc010d7362bf74e5f46730b6477491695cff2ccae941997680b6c02a31efed40e80fef3286eb04d278ef6ef56f6141407428daaf61761448643b475dd32f
+TIMESTAMP 2022-12-24T07:09:36Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmOmUW1fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmOmpbBfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klA/TxAAhVCPyzEsBdI52ku016EtyWoXCQor+VJDqLyxGl8/oGK6disIS3oSTyCU
-QRijCDrVI1lX0gO13ENxQOYcnVmP/Zui9x3T8u+HCEZlvKwGt8j4/kRNwKSklSMi
-iNw0nzcuNWUWyGN/nyh/WnzYJe31dn8wpYMctcFiwvb2Etk+7V6R6NTz7HA/tLIh
-bADhDwEF7S0jqrC4dvWqHcILqhi24ezPZhJbMCgnztfuyZjGo119RaWauIZnNmXJ
-s4unhLZNDdQFlXWdFcmgeiJid1+pqEkr0Ew8QvU1OqsBYMsBtNs2EcAVJng9cfMF
-mVhn/JbouxPpOEBXScZ2hEn376PfA4K3bXAVW69cF9lXAQKSay9imw97oK43WdLm
-A8qYXya2mD9kGFBSkbtNIFJZ9qnTZNYsVyV7KlIER4WomfPINuvRCDEPBtO3rBSv
-aJW/NDqk2SnRgnp7ByzsDQGkVTEkVuMRNIAIGxHnye44YGmhLosytNmQiNu6gGLH
-Qd38hQzADDrd+/gMKgBig23iBbLY1JcmQkuXKwpebasCmmzEiUjqPSS3B3jsNq+7
-vjeBaFa4Ul52UkoDrPP+cL4puyAsgLmpGJYg3KJba2rgONCxIYgW6lOCh3E8arJw
-2+hdDr5PYqUW/RvddrdVq1vnWQsZTpekOXBMQia03im7IobHqSQ=
-=MeIi
+klAhcw//WJpFjb2DIHlY9flmjjub+uVL3fIlcM+fvTA/fm+7Pd0Bq3jGb2G8K5mc
+9qXsTcyj12NBcoGMpJd95ZjN8RTXXTkBULPF3GsBkCjXvZum/xQVpzXsFaY6cmwB
+VIvcXg9M2bDkRcTIbtsHakAnQMxJYeWSc3qvBvMYXnywaW+aovDjk+29bLQVv3XD
+pXmzvu5FLowT2kETOiAuKMXDuv6HFxIle4J0+FhPl9QkhN21uUztA77G6z7UC+dY
+X41J6EcfdxMMIBpSBRANTQa2JKNPsaMzj3whcchnOrTNVO7H1H9wUjG63OsS/2z2
+CrYIpxaxt4TX0V/4wP5OGBZ48p17JP8hrhXBz77Kp1OGjC2vcfxZXrOt3VkeUwto
+EhZFEfDUqbuopx3dN2rlPouzdS9mvzz37sxrCVvuFYffvFQ9cw81B8wZ5RBj2MnF
+8kgq+iHteZHLZYmPc2P0VzGsBC3pPyVRlMNJW33uBT530l1YWLDN7BeAiG6Bb2Dg
+mQH6cezVLMqLu0ym2D5syMNo97+iswJyMTSMvED9YZ0gKjfIeS524jnVltjT9zXR
+t6QTv57DNo474rF+bmhz7GOOQT08XpZAPTVs/sBgfJjgGYmbnNg4R3fXdUnxP/FL
+v7Lclok8Mw1UqXDQqUDWRZUldWp7HfVZuZjWLARsM5746QDNha0=
+=UUMK
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index bd6b1131fc94..d37c7c7dd784 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-accessibility/Manifest.gz b/app-accessibility/Manifest.gz
index db1ec89f6c1a..0a8aed6dd081 100644
--- a/app-accessibility/Manifest.gz
+++ b/app-accessibility/Manifest.gz
diff --git a/app-accessibility/freetts/Manifest b/app-accessibility/freetts/Manifest
index b225cb110615..01867bc6cab7 100644
--- a/app-accessibility/freetts/Manifest
+++ b/app-accessibility/freetts/Manifest
@@ -1,4 +1,4 @@
 AUX jsapi-gentoo.diff 10456 BLAKE2B c0de49a34fe6e5240f4a1c895b99593a169a3a14fe7c3b98cc62723d34b31935735e9632f599b90748a760a448860ae81d2a1e48de6f1074633d33e19c5158d3 SHA512 62acd90cb064db176ee7a0950857c173f2ace4de6a6319fce3273bcbb222f8fd309bc6939eaba00a00cd7217871dca60cfa33d5ee1396b86333b9dedbf8f3034
 DIST freetts-1.2.2-src.zip 14111416 BLAKE2B fd3ac79ffe3ca031d40a6523a4ae900200c1b1eea0369fd1eec3233f852af8edffd81ca6c0bba628132221346d283d2138794e1f9697074fc1044944ad852e5b SHA512 a2cce0b1fd2267cc8dbd3e2ad3ec1f99526de3988443c0937405cc7b2eab9ef517001ef0b4b387e8721d3c33610cd642c6b7cf83217996a83481830de9713de7
-EBUILD freetts-1.2.2-r2.ebuild 1893 BLAKE2B dee303a7fa26b1d02a4b73a31e6debb17d44fe4fcd262f4f9a74ec4e164871e04308cf09d28af812d3c12e9b80f5ad1130aca4a13150ea5d68cf3326d75de234 SHA512 e11223bf9c9ecd6078dfead0a22bcb74a324e81f71faabfdc899dafb278630d8ce918feca1ecef3488e0044483efa7f5d1341fbba5c79612101d6949a9bb45f0
+EBUILD freetts-1.2.2-r2.ebuild 1892 BLAKE2B 4c3eeb48f3d5913f35ed6ae59a117cc24f91a7f9f15ba62dad553dd736e4a8c130142d4637e9d5136a82c64555f0fa1c637772663561fa2c9291d58acd8bbc2c SHA512 8c563588b43f10cc3aabd3029b480ccba85b3c247515d2e1baa12e52ab46d12d1702ad4aecd59978b58dece9cb97b3d48057c77cd8794fadbf9f551dc4e3000b
 MISC metadata.xml 577 BLAKE2B f7cfecae90f4d576518ffdfeefadfe143bd292cdf0dbc7742fdc3ff02b829e3625de02c6e88eca1e93cbfd4266f0bd64a787a609c939cfc22e37627542374bdb SHA512 75d441047de45d4747911f2a2c09dd52599b84805e79ce540df206bda354aec9da3005328f379a49562ff107afd02ed72555522c556410dc92d69a3e9408689d
diff --git a/app-accessibility/freetts/freetts-1.2.2-r2.ebuild b/app-accessibility/freetts/freetts-1.2.2-r2.ebuild
index 4322b03c1b15..38b75456e0e4 100644
--- a/app-accessibility/freetts/freetts-1.2.2-r2.ebuild
+++ b/app-accessibility/freetts/freetts-1.2.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,7 +7,7 @@ JAVA_PKG_IUSE="doc examples source"
 inherit java-pkg-2 java-ant-2
 
 DESCRIPTION="A speech synthesis system written entirely in Java"
-HOMEPAGE="https://freetts.sourceforge.net/"
+HOMEPAGE="https://freetts.sourceforge.io/"
 SRC_URI="mirror://sourceforge/${PN}/${P}-src.zip"
 
 LICENSE="jsapi? ( sun-bcla-jsapi ) freetts"
diff --git a/app-accessibility/sound-icons/Manifest b/app-accessibility/sound-icons/Manifest
index 034651fdafe9..03ecbab41fc2 100644
--- a/app-accessibility/sound-icons/Manifest
+++ b/app-accessibility/sound-icons/Manifest
@@ -1,3 +1,3 @@
 DIST sound-icons-0.1.tar.gz 591196 BLAKE2B 3632d544dd186eb4358ca9cacaf6babc9ccae287cc4918462dff3b7b7a5b57fe33aea65e5c0a9399aa28a294c04ec686ddee47327cda9900173c064ef4631a5c SHA512 f0ba9e1e84ace325671c7f323f01d647aa0e1a318e9adc2a6d8af4e0d795e478b2ea66007670f9c7ced9ef7310fdbccb5168b0f404579f5dff8712fe12ad93a0
-EBUILD sound-icons-0.1.ebuild 703 BLAKE2B 3a1ccb7f30fcc496b4e23ff3e15bf00a3fa81e47790d38ec3cba35fc9482f900f482c1bd0c81010eef40b7d2c4587dee8943f960ca50d994b3712a8ccb0a7b1a SHA512 70ce722af0e04b18c0d61a395902bec3445f7f616141e896833551d8447dce443aef7ee561338052a8222d06d8b567592b59bd1ab3fba8906266be55fd9308aa
+EBUILD sound-icons-0.1.ebuild 703 BLAKE2B 7e4c35b6514595fa00e5fa54aeed30976da49c26f3f3e40fa517d23355ebe24a8c9c0b90dfcefc5fe954f1a8b7763520927d8eb643585c7fbe1c9d220a2bc42c SHA512 4a0d8026635b5927defb56560c9aecb3dd0cefcc39f13c4a0a2493a213e9df86e47751c1e8e2abad389ba260a00b38d3f931735f724c6aade50624196f0f4235
 MISC metadata.xml 346 BLAKE2B 7e1272166e3d172f7228c972568c726842ae777ba6a347e8142de8736bebc86d2312d68fcde332947b03c48a7d388371b9f8a231fbcb4b0f37077615ee6f2645 SHA512 b6a500e0266cc804bd2b3b15dd1555801dd2afa30dde160264c6745e55f67576dbc980112c23982d378824d6681ae28e993dcfe48f99b9c5b5eef0092faab4d5
diff --git a/app-accessibility/sound-icons/sound-icons-0.1.ebuild b/app-accessibility/sound-icons/sound-icons-0.1.ebuild
index 2582afeca261..294d6b7afb58 100644
--- a/app-accessibility/sound-icons/sound-icons-0.1.ebuild
+++ b/app-accessibility/sound-icons/sound-icons-0.1.ebuild
@@ -3,9 +3,9 @@
 
 EAPI=7
 
-DESCRIPTION="a collection of Sound Icons for speech-dispatcher"
-HOMEPAGE="http://www.freebsoft.org"
-SRC_URI="http://www.freebsoft.org/pub/projects/${PN}/${P}.tar.gz"
+DESCRIPTION="Collection of Sound Icons for speech-dispatcher"
+HOMEPAGE="https://www.freebsoft.org"
+SRC_URI="https://www.freebsoft.org/pub/projects/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/app-accessibility/speech-tools/Manifest b/app-accessibility/speech-tools/Manifest
index a069ec395dc0..a24dfd158d49 100644
--- a/app-accessibility/speech-tools/Manifest
+++ b/app-accessibility/speech-tools/Manifest
@@ -4,5 +4,5 @@ AUX speech-tools-2.5.0-fno-common.patch 1003 BLAKE2B 6b4dcdf205f2e986e659efda4d5
 AUX speech-tools-2.5.0-warnings.patch 1467 BLAKE2B ae91bce60190029ba2850c2649e3f7f116357b2c4f77f90a1ba3176ba43daf732d690e1e0e6ad2820db34417f4732d8c177e2fb25325d4994c29061739f2fc95 SHA512 16911fb73f43cdb9db7d426cc68549077bd53798dadd17965607853886284521f5bfa2632b6888e46eca3b3fe2e5bd27523304aa9305e2a410d5477f46e618d8
 DIST speech_tools-2.1-r3-patches.tar.gz 6876 BLAKE2B 84ddc30de90459f913cc32d4338097feb35dc08c48cbda7fc47a78ee0384668828d7166a5ebb1264272a6c326afd4ff2efdf1d793bb8f33937c09d2c7cd9a2b5 SHA512 db4d656a77e3fcfc43447c11b160cf9b45f0c4ec10f2697e4357f0ec86ea56e2841f1b887493a781406975003f5d8065ffbb75eeebb79fcd9873055b52c248e3
 DIST speech_tools-2.5.0-release.tar.gz 1328624 BLAKE2B 445dd5a5e39c02352a850fd92de5b3852ae382a4bd013dccb3fdd46b0b22ce0bd10d089f9e860ae3d3e73a489b20b7c8b78335e57a49e40ae01b0f4997d55315 SHA512 013540a5252efb57633f442143a51bc87aac719dfb46c8f47e750322d19dac9b504f55125462a2ee74a6b0bd2661a63a1fc73a8c3c6d2886e38b136a80447fd7
-EBUILD speech-tools-2.5.0-r1.ebuild 3875 BLAKE2B 278c5f95da89ad03121e07aa9b63ecd6c193967eb22d5aeca79a1f0a5131527273f454c8af8bd7fe9e1393ba93fb7f31f91db30e355b54447e6fa99b4367332a SHA512 11f6ef583aa98b0191ae20f19a051aaf62b237575da1c0c0c4ea643b6e5e5ce7ca1507b7c2f129bf986d889216f2e02a233494cc8593e6caa3069edb0def621d
+EBUILD speech-tools-2.5.0-r1.ebuild 3876 BLAKE2B 866edd8fac5587078db1b4e050373163be845aff5543a2fe358bae0e7abb4ee340c9762abeb5cab3d86eec6a9e8e1343d199632843bf03014c3db054ae9fde7b SHA512 ee8761ea1600514d9baefe62a323a4ee0460c2c54dacb0dda06989764a2dcd958f6be1f7e5793e9c12ef8d534d539eb26a184c6d470cfe86133a05f23317f1f9
 MISC metadata.xml 483 BLAKE2B b5318b0e97d1e7e19848eeae2b447037e940cda1ca1c7cc4204cbf9d95d52a5fce5430efe94f0d8e3066a974b78d1a8abdc72580b7678ae86e30577e9545f787 SHA512 e7d6f2ccbebfb2ae9bf41577a3b1d902c7d711d5887d9a4233f7c5d42a57915e1874f97676c61d79fb5ececa0e7244f58533c17f098c717712ac274d60c14ee7
diff --git a/app-accessibility/speech-tools/speech-tools-2.5.0-r1.ebuild b/app-accessibility/speech-tools/speech-tools-2.5.0-r1.ebuild
index 5e3d29432faa..c2d113a7a6c6 100644
--- a/app-accessibility/speech-tools/speech-tools-2.5.0-r1.ebuild
+++ b/app-accessibility/speech-tools/speech-tools-2.5.0-r1.ebuild
@@ -9,7 +9,7 @@ MY_P=${P/speech-/speech_}
 PATCHSET="r3"
 
 DESCRIPTION="Speech tools for Festival Text to Speech engine"
-HOMEPAGE="http://www.cstr.ed.ac.uk/projects/speech_tools/"
+HOMEPAGE="https://www.cstr.ed.ac.uk/projects/speech_tools/"
 SRC_URI="http://www.festvox.org/packed/festival/$(ver_cut 1-2)/${MY_P}-release.tar.gz
 	https://dev.gentoo.org/~neurogeek/${PN}/speech_tools-2.1-${PATCHSET}-patches.tar.gz"
 S="${WORKDIR}/speech_tools"
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 9e68eaeb29c5..f905c2c8f520 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/bastille/Manifest b/app-admin/bastille/Manifest
index a275858a981d..bb3c108108e3 100644
--- a/app-admin/bastille/Manifest
+++ b/app-admin/bastille/Manifest
@@ -3,5 +3,5 @@ AUX bastille-3.0.9-perl.patch 1049 BLAKE2B 2a82c1883bf795b83a86d34e29fc2b3495123
 AUX bastille-3.0.9-renamewidgets.patch 2015 BLAKE2B 12003ebd9d40296e5285b45b063050787fc71c8d0f1002e07407105eaa2678ed25e2dbee66bd9c057047b323076e19e258a5efd2156c043b3d1fba5a92f8ef70 SHA512 28cf0f8a5bf11c29127f128fee80bd0a169960996b4d97b3666d7cfb2485850ca040670deaaf9d0c728e08747adefeecf02c4647cbd4c0e3673cf327c9b46f92
 DIST Bastille-3.0.9.tar.bz2 319045 BLAKE2B 480288c6e9fc5462e8e6ca84665d5769aab4252813ff478ab0519d382e1f03994da008ac2818b1d4214a09607c7316711665bce154121b3029bace6f2822df09 SHA512 a97ab2c2bb64c655d43ddcfd4000cee8666787e5b5923390e3155b258c3a2cf7d131abd474f9b0dd415eb455b664ab26a875da6636268b2a715ea87dd4dae2f0
 DIST bastille-3.0.9-gentoo-0.2.patch.bz2 14117 BLAKE2B 9c4383eae9e27cc4e110553a21424cd2811172c32609b0d3bcc72ccc3f61ba7cd76bfdbee969de5a89c22d0c1dd91b9ba92ce27ea5ac2b7260e5c0e1ce424be5 SHA512 a4ecfc064d6cf8c12b6f53c81dea841931df270293b03c39266861121f3def28fcbc4127b3bc9374028983e584736fb85361443badaadec7441cfb1570bdea8f
-EBUILD bastille-3.0.9-r3.ebuild 1822 BLAKE2B 9ff295935e96b2f6a130cce5b0703189b3682128cc5cdc64198696fb12c551292c0a4febdaee33f748acb94a87340db6ced78dd4bbeb8390593a5942f1041324 SHA512 67f420117c904efb7d37d7fc5033b440f90a0aaf45526ffd4a8d90b78cdb2972374bcc33750335fd2ce4f3dd92f8eb5f97ac08f97073d21879b7c9bdd27cdf8b
+EBUILD bastille-3.0.9-r3.ebuild 1823 BLAKE2B dcaa67de675c582cffaf8a91c6d3cd66b8caa7aa71d342c4e5e46da344783ee0e7c8661074372ca10c268d0aff946b442d15e6d71941b846f9a23e2d11d5d84b SHA512 3f32d0018c7106d2d12ad1b96cac46dd385fd1d387c0478ea5b671cf0f9ebc561067c0463366e4538b6809d1ac8aed9074c0e125ce3a88cd7f6b8266d5095905
 MISC metadata.xml 336 BLAKE2B d1ca0961119d3468c05d2a6087507eb09a3996f6fbf3414ca7b1e120af8322f09e8694551a346c8a627d5c7f7c8c462bd5136cdbdab1c11931a05d7f318e2cf4 SHA512 92294b83690656c5f7bc78ce0ede62b757763614b6c6962d89b7ee5ff044858e55e6925befca3845d7948a37119617ad8e0e3d22d781cda888b2ca994f1677a1
diff --git a/app-admin/bastille/bastille-3.0.9-r3.ebuild b/app-admin/bastille/bastille-3.0.9-r3.ebuild
index 365b97b97bad..4a1ca299446d 100644
--- a/app-admin/bastille/bastille-3.0.9-r3.ebuild
+++ b/app-admin/bastille/bastille-3.0.9-r3.ebuild
@@ -9,7 +9,7 @@ PATCHVER=0.2
 MY_PN=${PN/b/B}
 MY_P=${MY_PN}-${PV}
 DESCRIPTION="Bastille-Linux is a security hardening tool"
-HOMEPAGE="http://bastille-linux.sourceforge.net/"
+HOMEPAGE="https://bastille-linux.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}-linux/${MY_P}.tar.bz2
 	mirror://gentoo/${P}-gentoo-${PATCHVER}.patch.bz2"
 S="${WORKDIR}"/${MY_PN}
diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index e3e47da3b9e9..9c447ec7d602 100644
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
diff --git a/app-backup/burp/Manifest b/app-backup/burp/Manifest
index 7d6514a67cac..b45b36bf4d67 100644
--- a/app-backup/burp/Manifest
+++ b/app-backup/burp/Manifest
@@ -6,6 +6,8 @@ AUX burp.initd 1083 BLAKE2B ae26457422dcb3b80400b78faf930e0df86b9873ffc8665281ef
 AUX burp.service 193 BLAKE2B fa9a00f32999834afaf84db9d28f2e8b65688e784e32f78bc019069649c50b4c17f1cc48db3b0a62e2e269db801182321e5daccc169eaa560677bd3ff52b5ffe SHA512 5ccb7fc0535d15afca1afe21b3bb937f53203b8a893730a2745e88a5effb1add73c0f109c3419e22244def1bf978378889d47953e68586a7da8909286ccf5dcd
 DIST burp-2.4.0.tar.gz 624032 BLAKE2B 4a1ff48236dc631dd6d545480a33af3cdf8020c3088f1ca09ab66ac5cec8128d262b9b991bf9e3229c80f75a4746d338073a0a43fdb67a2fe21a0fd4f243469d SHA512 ea81a12e54c6d88b702dd09dc4fa5a724d1e322bdfba2643c9312a9077c9edc63f6ca0f6cb3a6ebecb6ad9feb1cc26c114277b2308d9903f4abb0442a9be7c19
 DIST burp-3.1.2.tar.gz 549260 BLAKE2B a8767d9ac2188e7a44fa2e8e4ba08dd3a5edeac268afcf196db5cae06e8bcc1faae1a48ba1873ef43fdbb9764946384233a755779e09984217b4334781529024 SHA512 a832502f617b66b87feeff032002bc25827809a165e3fb6ef85a9f3d847e308e9fa69f138b7e80662366fa3de09b39f7ef209b529d82c3d487dca11fe3ebcddf
+DIST burp-3.1.4.tar.gz 549879 BLAKE2B bf70051a658700fab60182b97b7ce8540fbd85ad1264ee09c9fa5b5a99046f391b91cd8673097ef869c6b762aea6d8fecdedb38425dca9e6bcbb1f2c2afa96fb SHA512 3aa9fb1512f985fa99e7cb9a45502bbdbf513935e0c62fa4327f0e6cb68d3840f59bfe1b38a7c2419b3e69bc04aef36c223313897c2e45e94f3be3f9d41714db
 EBUILD burp-2.4.0-r2.ebuild 3024 BLAKE2B 3e055fd9b6baeff748ae0947153ddecab47630cee644d1a2bbb6177f250932c691d53e9612c0ff78b29f9aab7cbb0a1be69ee54e1dc2d577f7fbbc3b9cd7c024 SHA512 7231796aa70493cbd18561e11f851b443f4eb8de3a85bc43a0d5bf3fb0384171b2743a1f94bd4c65606a867600717e777a9c3657884c5a08dcc64707cc11f10e
 EBUILD burp-3.1.2.ebuild 2914 BLAKE2B 6208675f02c598ccbb07234b5487a1dd40a9a3c4e08c5cd8bf54e7148f8f957f75bfc3fe46ecfe740dad0a4684f05dbe5487474cf129ca9caa38cbdafa178d1c SHA512 4eb1bad4ce04987a8dd5f166ed54b764160013470092daae4cfaa7d014c320cd6d744eaece6960e81d3e2d88dae7264944890927e743baebfe41697b9f2c2d16
+EBUILD burp-3.1.4.ebuild 2910 BLAKE2B ac1f4b6507c5e9865639bc01559feff1857f6ac08151688442021808f44780f863a9ef640cc2f9828bd62f66db4827ace7c7d76a87fdb214ecea74782a339c9e SHA512 64cfd33781840d41d493fb6b03eefba8a56a1f145de1e23b8d84a74b52096cec61123b3e16440963691aa5443f70bd56636a7669f47e70f9eccbfe37b6433be3
 MISC metadata.xml 824 BLAKE2B 144475d686773901cee9f3926e843a2d9b3cab8a9db0c2b6d590b389dde0dda059bb06abb74e015d19a1f1ed60c4a2c7a11c06bf35e93bf1be8cb2a702447558 SHA512 1cc41b5f4c4d31355824a595f778702b79bec6a45b398e503834d55408bdbbf708bafc7c364f5fc038e31eef26baf4adcd8cd922ac18f6a41b5be446eb9ebf0c
diff --git a/app-backup/burp/burp-3.1.4.ebuild b/app-backup/burp/burp-3.1.4.ebuild
new file mode 100644
index 000000000000..1efa9828e50c
--- /dev/null
+++ b/app-backup/burp/burp-3.1.4.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools systemd
+
+DESCRIPTION="Network backup and restore client and server for Unix and Windows"
+HOMEPAGE="https://burp.grke.org/"
+SRC_URI="https://github.com/grke/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="acl test xattr"
+
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="acct-group/burp
+	acct-user/burp
+	dev-libs/uthash
+	dev-libs/openssl:0=
+	net-libs/librsync:=
+	sys-libs/ncurses:0=
+	sys-libs/libcap
+	sys-libs/zlib
+	virtual/libcrypt:=
+	acl? ( sys-apps/acl )
+	xattr? ( sys-apps/attr )"
+DEPEND="${COMMON_DEPEND}
+	elibc_musl? ( sys-libs/queue-standalone )
+	test? ( dev-libs/check )"
+BDEPEND=">=sys-devel/autoconf-2.71
+	virtual/pkgconfig"
+RDEPEND="${COMMON_DEPEND}
+	virtual/logger"
+
+PATCHES=(
+	"${FILESDIR}"/"${PN}"-2.1.20-no_mkdir_run.patch
+	"${FILESDIR}"/"${PN}"-2.0.54-server_user.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--localstatedir=/var
+		--sysconfdir=/etc/burp
+		--enable-largefile
+		--runstatedir=/run
+		"$(use_enable acl)"
+		"$(use_enable xattr)"
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	# See https://github.com/grke/burp/issues/869
+	local -x CK_DEFAULT_TIMEOUT=10
+	default
+}
+
+src_install() {
+	default
+	keepdir /var/spool/burp
+	fowners -R root:"${PN}" /var/spool/burp
+	fperms 0770 /var/spool/burp
+
+	emake DESTDIR="${D}" install-configs
+	fowners -R root:"${PN}" /etc/burp
+	fperms 0750 /etc/burp
+	fperms 0640 /etc/burp/burp-server.conf
+	fperms 0750 /etc/burp/clientconfdir
+
+	newinitd "${FILESDIR}"/"${PN}".initd "${PN}"
+	systemd_dounit "${FILESDIR}"/"${PN}".service
+}
+
+pkg_postinst() {
+	elog "Burp ebuilds now support the autoupgrade mechanism in both"
+	elog "client and server mode. In both cases it is disabled by"
+	elog "default. You almost certainly do NOT want to enable it in"
+	elog "client mode because upgrades obtained this way will not be"
+	elog "managed by Portage."
+
+	if [[ ! -e "${EROOT}"/etc/burp/CA/index.txt ]]; then
+		elog ""
+		elog "At first run burp server will generate DH parameters and SSL"
+		elog "certificates.  You should adjust configuration before."
+		elog "Server configuration is located at"
+		elog ""
+		elog "  ${EROOT}/etc/burp/burp-server.conf"
+		elog ""
+	fi
+
+	# According to PMS this can be a space-separated list of version
+	# numbers, even though in practice it is typically just one.
+	local oldver
+	for oldver in ${REPLACING_VERSIONS}; do
+		if [[ $(ver_cut 1 "${oldver}") -lt 2 ]]; then
+			ewarn "Starting with version 2.0.54 we no longer patch bedup to use"
+			ewarn "the server config file by default. If you use bedup, please"
+			ewarn "update your scripts to invoke it as"
+			ewarn ""
+			ewarn "  bedup -c ${EROOT}/etc/burp/burp-server.conf"
+			ewarn ""
+			ewarn "Otherwise deduplication will not work!"
+			break
+		fi
+	done
+}
diff --git a/app-containers/Manifest.gz b/app-containers/Manifest.gz
index dabd2e281c23..8ca315f96759 100644
--- a/app-containers/Manifest.gz
+++ b/app-containers/Manifest.gz
diff --git a/app-containers/skopeo/Manifest b/app-containers/skopeo/Manifest
index 377b5abfdce0..d8b3021d41c6 100644
--- a/app-containers/skopeo/Manifest
+++ b/app-containers/skopeo/Manifest
@@ -4,4 +4,4 @@ DIST skopeo-1.8.0.tar.gz 6577667 BLAKE2B 21565736a13d2fcce2576fcc1ff522e81b74aff
 EBUILD skopeo-1.5.1.ebuild 1403 BLAKE2B a4c236cb6248a1551c90683a45247d19d5634ca7e9ca801761953131f73a7bd0058ab5bcea1d7b2593229eb20c6482e2dae833443227467daccef020b23b5f88 SHA512 b163486639a8831eb20db3a5906378485f0aaf3299e815217b1c8a2f4e27ca35af0bda40e6265a7c58107588cab429c0044717666cd22c43e8e21c73a75277dd
 EBUILD skopeo-1.7.0.ebuild 1405 BLAKE2B dce3e36f77136de837bc5111de50f4db5ecf97b536b141e36c011258890efe1d8523557d917793c83b3a85cdbe8ce84e9c129087c1a1d09d2f5be21775dd354c SHA512 5618521e281c41e9e9770c830ace7686a757295c7b1c04fca7ce65ecf816ca2e5c49e8309d9dd89114f8539e334c1a1d2aeec83ea233e918247abd6422c62c91
 EBUILD skopeo-1.8.0.ebuild 1405 BLAKE2B 8ad2416a913af4c39d58101131826e3bf0783824378452c2a4c282f74ff89688a770c1afb169db1326ce3cf1683ca31d1d2943fa20e096fb2ee2c9b2135ea9f2 SHA512 6cc2d62ba405d74ab4a120994e12735257b5439c6cecd9c88bd324eab9e20a35a7c30bdc262d4b2940e5640c4f5c583ba1907b563e86773a42959993bcc3520a
-MISC metadata.xml 343 BLAKE2B 505fa7017cdd1977cb51f19af40301d260e35439a04773312da34b8a265e105fc82628ef8497437d766cf5337e1020f459bbe3fb12ab1a0f659dfe3aab927807 SHA512 14e010518d452a426fbd49bcc35ca8d980ac3f49da449f7af5ad097e4ebad908ec931e67c50dfccf0cb7b7dae2ba1fb1d2b33d41c85263efd22f263fbea7e221
+MISC metadata.xml 425 BLAKE2B 7f6ee6b669ae19cdf0e807a7a88a4e2573e94d36798418a037b78d5e3219a4d45297b841c5ca239e064de564a95ffed69758687adf44e0be0df5ac86c7516412 SHA512 f0954bc3db4e4a0e69149f89af269e70d074cbe7dde6c9161c5ced959f236eed7ce32d777970d5b103a6b880445842f38b680b4c69f12ca512a12f27dd0cd1eb
diff --git a/app-containers/skopeo/metadata.xml b/app-containers/skopeo/metadata.xml
index 18cbb63e9295..21cb782a75cf 100644
--- a/app-containers/skopeo/metadata.xml
+++ b/app-containers/skopeo/metadata.xml
@@ -8,4 +8,7 @@
 	<use>
 		<flag name="btrfs">Enables dependencies for the "btrfs" graph driver.</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">containers/skopeo</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-containers/syft/Manifest b/app-containers/syft/Manifest
index dd1df686f5d7..597a1e9c62d8 100644
--- a/app-containers/syft/Manifest
+++ b/app-containers/syft/Manifest
@@ -4,4 +4,4 @@ DIST syft-0.59.0-deps.tar.xz 619149756 BLAKE2B acc5118a7d64f5a785d68852984a7c6ab
 DIST syft-0.59.0.tar.gz 3784520 BLAKE2B fd6336d886cd9c7052b44df2f86f5ec007ffd16e8e33da9d5bd246a4c0b600a5ecd39edd5e99995aee2ee22c04f5c1fd977bd7a70f799e2638d5bd30d078cda2 SHA512 ecf0eb9b9470bceca918b37895688394d3aa6419561437908d6b9f069f12357f1713d872d139fd704817bb4ea454e5aaa0d8f6c7c8a62d046787aa57606c2cb4
 EBUILD syft-0.54.0.ebuild 1017 BLAKE2B bcfb43143217897263a72674186c4486c40dc1315afeb9e122484abdd6403667c450628561e9b7a0b0b178ec1397801ad9a87aaeb449b2e180dc94be1d6d0a35 SHA512 e4b433f74cca43a12c254c6c99754b2a499b119b9e376b11d04a7e33a32c2aea35b326f569eb57de161b39574d756affa9f2395a7e3dd70ab4dbbe4c2fb872c3
 EBUILD syft-0.59.0.ebuild 1017 BLAKE2B 10ac1ebcba8abe17dfe662726ddbdb8ad7f8de0fd0c053fcadcaa3f937336950915b62b837570dd3a8da2fe4a62fb408207db0e957d89dda587117d6c0c5bd79 SHA512 1203acfecaee66ac7b11bbc5d303f13ebbfff72766b7b88213d9da9d4c01c3664567d9e5a44a7a02cfe4d2cc8929fce9a1f80ec1309abf560e3a208c3cf47bf7
-MISC metadata.xml 243 BLAKE2B 63665ae2020bc799fa6ebd6e1fca6755be6498803fdbc17cc630f9f4ffa03fbd46a9ad396e70adc3bc1c32b0a746fe4bab1c6291f32e68e636251207bca9e95c SHA512 78eab20831018fcf4957171a83aaaca9ced53380e01f083c07450c30fa1adfc02dd50ff2fa9f491dd62802f6e779264add1c47a09ade0a35cda558c1d5529ad0
+MISC metadata.xml 316 BLAKE2B a08dfd464409c8e3b38452245262fb5981ac3b8cf1039db413397e02450f178d88e0ff8dc8bcfba5c3e6a9d52a3b65f8b54369090cbc07ad6869920ce4eba579 SHA512 2f8baf5a38e638c4de6581e4a03b70c98d232f4705d64a04d249e656d3458bcadb41f4509cd511c3b736481b5f7d040a48bc5e1461aef709946b05b1f30b2d4f
diff --git a/app-containers/syft/metadata.xml b/app-containers/syft/metadata.xml
index 3b2a9c591010..08a781acd85a 100644
--- a/app-containers/syft/metadata.xml
+++ b/app-containers/syft/metadata.xml
@@ -5,4 +5,7 @@
 <email>williamh@gentoo.org</email>
 <name>William Hubbs</name>
 </maintainer>
+<upstream>
+<remote-id type="github">anchore/syft</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/app-containers/umoci/Manifest b/app-containers/umoci/Manifest
index c3be40b63f89..2078142c384d 100644
--- a/app-containers/umoci/Manifest
+++ b/app-containers/umoci/Manifest
@@ -1,3 +1,3 @@
 DIST umoci-0.4.6.tar.gz 2273608 BLAKE2B d5a36c78918697b9c8f54a5c4b914a9124b5e989dff3efc81a9f64f1bd276189d15a565a6ec2e8d4021925017e9a7a17f7cc5359a552f7c57dda414c25d2fb02 SHA512 0614dd583e00b6e2e69256f1ae1d3316e5bb5989a177d18c5ceacf3af18ab82ccf8edef879b6c813855d878d5af53c541ac433d81e6c20796885a26c57564118
 EBUILD umoci-0.4.6.ebuild 797 BLAKE2B b79c2ac05f6ed5ae1db9e1d04781a6f46c4f2a17ec8c70db0a3a6e7e5ec96605b480b3a5a8f5386a822b9e68d46bbce34e968dc13930147515d2d0627a9c07b8 SHA512 e3217bb2e870b11ce3ac2e7cf5341193cee6b57dae1b85a33e1ae3ba6499d6f5deb8bf2852a5c9bc92fc2a3500390c5b2dac447cdcbf88310d5e55f27fb433f2
-MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
+MISC metadata.xml 334 BLAKE2B 0db8c3a6f9a4370b4b95fcf130b5cd23cfe6dd430b188e4ca3c371b7ab491d88eb0036105af583ab85abbc440548f3b908885d6e9930deeac62528ed7aa6b0cc SHA512 456f9befdc8ea77ee2ee1be940ee69394384db8ef163e6f270960606c3b8295499c0e95cf9d5585f4a41065a4a7b6fc8e0476e7c8c1d31a80aadea5b22abdc42
diff --git a/app-containers/umoci/metadata.xml b/app-containers/umoci/metadata.xml
index db463f3eeb66..7cc282ba772a 100644
--- a/app-containers/umoci/metadata.xml
+++ b/app-containers/umoci/metadata.xml
@@ -5,4 +5,7 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">opencontainers/umoci</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index eceb9d38d6d1..74d10d5284ae 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/adcli/Manifest b/app-crypt/adcli/Manifest
index fda1127f4042..c5247d709a26 100644
--- a/app-crypt/adcli/Manifest
+++ b/app-crypt/adcli/Manifest
@@ -4,4 +4,4 @@ DIST adcli-0.9.1.tar.bz2 89684 BLAKE2B deaf6d3a13ad29c77a35b9f9c195dd646f384ad7c
 DIST adcli-0.9.2.tar.bz2 93680 BLAKE2B b5958b276ee43a0ee54aa922f27ed266d4e9fbd1c86e0c007dac9fcf9cc022e1b3ba043b782fceb00066be2577390773dc99fb8d476a6b5e6523d44d008fb667 SHA512 ae8414a0af389b6845dd92d41446a80a9dc1734b874175323c0e491d99944eab442b95ae6d3a29fc69638d2e73bf8d2c369f6fa50e9ed3968527444b78606286
 EBUILD adcli-0.9.1-r2.ebuild 795 BLAKE2B f00333f24261cd5628e358c0dc597b02f8fdb25274c4770332628bf57c71f296f68fbb26381756f229bbe43f8fee040cdf41864e73be2679b807a2f9c2938d36 SHA512 fab4109877430cfb7233cde305d083ca013b4d128c69ac8dc6cb6ebbf484da4906acff3fcda1447718397386c4b8cf617ce8848897109d1cfe9dd05071b21e68
 EBUILD adcli-0.9.2.ebuild 675 BLAKE2B cd29a60aa1c0e251e29bd7cbd9dd50d547bb17713e09cba4cdee463adb93036b33a8924cde9e22f7167c4c3a091450daba00fbd59d656698e84227af5581d382 SHA512 7c91122c29b743fdd5046164219178e21f35aa04df8f515ed7dac860a366f5d6ac74b9e449b32981662ed420718d7ec4d126b57ac678f9ee11060f24aec13da2
-MISC metadata.xml 408 BLAKE2B ca526749c82fcd9214e0800e78fb5a15aac9a18fec9b62c92905b363bae37977242f147fab1763cf36f172314e072ac14a04f4e294e65972430451a74737561b SHA512 50b2b3a820ca02719e74d730220bdab838f0d00e2abaf1c64479cf6af493301d4fbbe71183c28fc717e604aa1c9fca36efc67e6045b35c3ff1473916538fe4a6
+MISC metadata.xml 501 BLAKE2B 426bc6a40ebda29bd46e41ef626075357d34952234f115d80963c2bc9498b04c23f4d017b86f34934a50a9a480ee794536c53a3b2b68c5f8c4861f630d659d66 SHA512 337f2c31ae03ba2b1e7d6bf357a3376c23caa00434b1cd11634b37a354c7c54dacaa6e72783a6280781f1e9dce2b2fe4d4a753bac5969093fe21b32cabd66a18
diff --git a/app-crypt/adcli/metadata.xml b/app-crypt/adcli/metadata.xml
index 9d60dd89cfd7..99303bacc412 100644
--- a/app-crypt/adcli/metadata.xml
+++ b/app-crypt/adcli/metadata.xml
@@ -9,4 +9,7 @@
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">realmd/adcli</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/app-crypt/hashcat-utils/Manifest b/app-crypt/hashcat-utils/Manifest
index 1c0ba0827e75..4bb3e289a431 100644
--- a/app-crypt/hashcat-utils/Manifest
+++ b/app-crypt/hashcat-utils/Manifest
@@ -1,3 +1,3 @@
 DIST hashcat-utils-1.9.tar.gz 41612 BLAKE2B 2999a3c2a01c195ddca334325167f2a468a3466b48886f3a54804224fd8369a9c953279170d5291c534a157acdc4fefc2947765187c8fb0e6f4cd5e5fd2597c9 SHA512 5f8cef312496e13d1152742950397933e9d5866740afe377321fb48386174b64d96f90d3072febfb97bf0f7eb438f41d6b5e14bfc3e157c9c3e664ffbc5b614b
 EBUILD hashcat-utils-1.9.ebuild 532 BLAKE2B a81ce774d600f77830e2b679174bd4c298e84f0cdd3d1fd83ac8bb0fd03a612f51605603f9972891ae4fb090c9c2476b349c18800704d0d74e82bb214ef82904 SHA512 a71595a8421dec72b170eb7e724c538adeb8402add257aad22082f55503d6cd89a4f9121d7354685696777e3be443540985962df274fb1d08dbb9940aed528cc
-MISC metadata.xml 248 BLAKE2B e14ba84466d0e6a08a4d4a4f38faebddd9b54661045156bdcf931efff9a185926ae6c957aea1ad1e581e987aa3e85b8bd350121b41b544d2be93e49e47215791 SHA512 25a828de167151800a2d2b5cd5faa885f0a2bb067cad1bcbdb934063c6880d43c657eb9f8d95209aafb3d2694a937215d7d0608b7795b83f44e7ee6132bf1ad3
+MISC metadata.xml 334 BLAKE2B 175fe6602554460df5cd90b642dbc739a80fbe29ded929e856653c17509089f94f6605007095b60537918e09cfb042fee3e3616738dcc741e86037bca9707322 SHA512 86450fef806a63c9c24df20eef68095968eb86c26895607194acc122ef8e78307fb9e75669d07384110b2a578dbde16f32722d0a932dc3aaacf147e77e16cccc
diff --git a/app-crypt/hashcat-utils/metadata.xml b/app-crypt/hashcat-utils/metadata.xml
index a0fddf470150..160cda032966 100644
--- a/app-crypt/hashcat-utils/metadata.xml
+++ b/app-crypt/hashcat-utils/metadata.xml
@@ -5,4 +5,7 @@
 		<name>Rick Farina</name>
 		<email>zerochaos@gentoo.org</email>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">hashcat/hashcat-utils</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-crypt/heimdal/Manifest b/app-crypt/heimdal/Manifest
index 5839d7eb550e..75518b705118 100644
--- a/app-crypt/heimdal/Manifest
+++ b/app-crypt/heimdal/Manifest
@@ -9,7 +9,6 @@ AUX heimdal-kpasswdd.initd-r2 448 BLAKE2B e9280b18c06ad50579eceec52fe7bb83630b86
 AUX heimdal_build-headers-before-use.patch 1128 BLAKE2B fa8f4a481304b619797a20dce8a8ac9f912d7f3f3402980da35259839fa9ecea0a84b1fb04dfee93af64699beefcdd9b0cedaa27c0323a568861307fa53ef3cf SHA512 df3257627300456afe4bd4a3a18bff5641cf1f0a9d1f0e74716b46a45ad0e58194ee284930cc1f856e7b74eecd6a590d1a6ef93d40a4b275d899856b46e14128
 AUX heimdal_disable-check-iprop.patch 577 BLAKE2B 1bb2be5bfd172988a00fc71c0429a0948437f20228aec0508788de30fe657765dfe3be3955680a8e006d4afdc1396c7810d26775bae936d72f927e14e8dbd46f SHA512 c3a337d7683dba271df13cad9d5ea716449a0a8ed2b178e15ee1e8caf53f28774f96cff92b652af952a9d1b45c0afc6607fa16c115b80c87e90db9b974bb9f9e
 AUX heimdal_fix-db60.patch 443 BLAKE2B d89892570100dcc4a9b5bacd672cd28ce284ae9ad753189addf11359a01236a03280eb605ff136b290dcc379d182741d924e2392fc05642520278af8ecc310f7 SHA512 b6e80678801eaeee8c1aa2ec317a80b58cad3ca181aad14136cf352c55246ae36a43344b48a01bc9fc19c9ecfa383d9ab10892534ea60d25e36255fa049523a7
-AUX heimdal_hcrypto.patch 1522 BLAKE2B 3a66fe288a7bede24a6aa124fde058d5ea891a4f829566b3bccfb1d0800d7f9f076c2958ec756821f2b5f2d4249a59d4c9bb320ffa07c3a0e14533a013dbebe6 SHA512 6427258ba47c28415cf2b02e483ab2b29670cc803a7581a4d0102be14f5a102fab478b7c2735436603e44fd6e2d34fa2bbcd0dfc7cf15eca575fe424356baf99
 AUX heimdal_tinfo.patch 711 BLAKE2B 730ef4b1ba79d80c7257d1bd04783584cf616b2e51d6028fe3160dfdc113b6243c7af8c116ff969de439ebb79bab9091f8e5d6e9037c2b48541e6cbc83ba1026 SHA512 b4c63c9e945b914009569e62fd53229032ffaecde11dc4d02a89d5ba65f2c28020d43af8f2c26d87e2b383ba6dd3c3f4c4b69529471bc1928b45a9b5c437958d
 AUX krb5.conf 424 BLAKE2B 49b8a0aab6e0dacb70b91e030bb5f2b8bdfe4253026f85e2c9d16bdf6f554c585572ed9d3835bed976c8953fc92d0f42270c6a0767e943ec5efa5b79f6f4cf89 SHA512 4dad6837344e30c6988355551b5b82bce748dad7aa7648204ba7852540ad3a546b5344926789d60e78d57ff20dff87b680b790dc8d86c8dec1008feb0d809e38
 DIST heimdal-7.7.1.tar.gz 10009851 BLAKE2B 2d2b6cef4aea1dfab97106cc6be5f3f68736c93f153b650ba349ee32be2a415de8a550c462c6d0978628ac18403838145198e07b4710ebe21570878e2b44f595 SHA512 c77def1d32301caa8675297152a534919459a65bd1c5353cdc8795c07aa7a94fd319b697b98e02233ef25eaeedb36420edd139c1e22d68d54bb991343a11a369
diff --git a/app-crypt/heimdal/files/heimdal_hcrypto.patch b/app-crypt/heimdal/files/heimdal_hcrypto.patch
deleted file mode 100644
index ff3228d4973a..000000000000
--- a/app-crypt/heimdal/files/heimdal_hcrypto.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 329918bd671c89de6e1c2874baba48d658a89a10 Mon Sep 17 00:00:00 2001
-From: Damir Franusic <df@release14.org>
-Date: Sun, 9 Dec 2018 19:53:58 +0100
-Subject: [PATCH] hcrypto: fix include path
-
----
- lib/hcrypto/Makefile.am | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/lib/hcrypto/Makefile.am b/lib/hcrypto/Makefile.am
-index 469176b6c6..195117d174 100644
---- a/lib/hcrypto/Makefile.am
-+++ b/lib/hcrypto/Makefile.am
-@@ -9,7 +9,8 @@ AM_CPPFLAGS += $(INCLUDE_openssl_crypto)
- endif
- 
- AM_CPPFLAGS += -I$(top_srcdir)/lib/hx509 \
--	       -I$(srcdir)/libtommath -DUSE_HCRYPTO_LTM=1
-+	       -I$(srcdir)/libtommath -DUSE_HCRYPTO_LTM=1 \
-+	       -I$(srcdir)/..
- 
- lib_LTLIBRARIES = libhcrypto.la
- check_LTLIBRARIES = libhctest.la
-From 572a6fd7ac41e9210ef3eb765fe7da4ec8a94bb2 Mon Sep 17 00:00:00 2001
-From: Luke Howard <lukeh@padl.com>
-Date: Mon, 24 Dec 2018 02:21:32 +0000
-Subject: [PATCH] hx509: fix dependency, hxtool requires ASN.1 headers
-
----
- lib/hx509/Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/hx509/Makefile.am b/lib/hx509/Makefile.am
-index b58deb3e37..09643c43a0 100644
---- a/lib/hx509/Makefile.am
-+++ b/lib/hx509/Makefile.am
-@@ -164,7 +164,7 @@ hxtool-commands.c hxtool-commands.h: hxtool-commands.in $(SLC)
- dist_hxtool_SOURCES = hxtool.c
- nodist_hxtool_SOURCES = hxtool-commands.c hxtool-commands.h
- 
--$(hxtool_OBJECTS): hxtool-commands.h hx509_err.h
-+$(hxtool_OBJECTS): hxtool-commands.h $(nodist_include_HEADERS)
- 
- hxtool_LDADD = \
- 	libhx509.la \
diff --git a/app-crypt/sequoia-sq/Manifest b/app-crypt/sequoia-sq/Manifest
index 229e4749147d..69f553f7ec69 100644
--- a/app-crypt/sequoia-sq/Manifest
+++ b/app-crypt/sequoia-sq/Manifest
@@ -386,4 +386,4 @@ DIST zbase32-0.1.2.crate 8721 BLAKE2B d7f5881c8d3f06f5fd78669ae6943ffa5ebe35b5e3
 DIST zeroize-1.3.0.crate 15913 BLAKE2B 571d96420e85e3d12100dcaff00d4721eae7296465cafce83db81293e801cd5a1f78b19986dc537fab208519a48e6a7df344d8e8a7053b094c1aa5bb90de083b SHA512 352a668a4c491cbd644368eb19f797709a41f3abf9a09028b6c1c4077710d48b74c3018e65112762a31403917f000340a0e57bc095a745e3f99300d6c25ca8bb
 DIST zeroize_derive-1.3.2.crate 10299 BLAKE2B 39cd21629ae91a3a80ec283c8a988be3559973b891c8ff9098dc78d2ccd8ac4352db3e52577fe6d560b2063f66d5e39cd77c9f24a01b7736fdb2d70f6dbc417d SHA512 3efcb9265a6bef7a752562ef9e3af1ccf28749afffdf1e21abf5baa51d5d761e10f77b9d655e69f26c587f2a0c412ddedf29776c2c66a9f69443a82d66c9da88
 EBUILD sequoia-sq-0.27.0.ebuild 8390 BLAKE2B 356c0d7d5eb35350bb2936ed0680f7aaf12f3ccad7ab6c997ead36503477d7b52ec58d6d0cc05bde82069cc314399b07b124ed66348036875a9aff5e2d930156 SHA512 967d360d541752ff1449e68cac11a44b46a9023a997e6be4206e8304104e5f82b60817694b360dcdeca6a9f399604a43e4c59d41472b818bdbe3ecca38591577
-MISC metadata.xml 247 BLAKE2B f18c471812d5b8c75f2e05c4fb556108fb93554b59ee61a8215803f2654854a7401fcd62964192c228bfebfb52ae4573cfd24b29a944630c8c733d154d2b0d9a SHA512 cea16f7db3110bd4629b9265d5acdec6d70877330664f8e83f726002eb69aec7f822e9cde9c7da900451cdef60f1ceba373dfe73c73f82173bbf1d2f9f7338b7
+MISC metadata.xml 331 BLAKE2B eab0be39ea4eda8a48c79dd955b34271c5a49a1240c77f8cd0af15c5b0cafa68927929faeb00bf752991a265812d28c0fdfd4e4beee7b8a31b77834b15d4de37 SHA512 ab798b9d12b097ecd1f596999bf83e411c1726b7e5baa8ef58ebf5fab3d63468b28038cf103c875039585622bdd514a04f15c1d93cb203d9cd6da6611ccb1570
diff --git a/app-crypt/sequoia-sq/metadata.xml b/app-crypt/sequoia-sq/metadata.xml
index a7fa285c7476..3c72ac7546b9 100644
--- a/app-crypt/sequoia-sq/metadata.xml
+++ b/app-crypt/sequoia-sq/metadata.xml
@@ -5,4 +5,7 @@
 		<name>Florian Schmaus</name>
 		<email>flow@gentoo.org</email>
 	</maintainer>
+	<upstream>
+		<remote-id type="gitlab">sequoia-pgp/sequoia</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-crypt/sequoia-sqv/Manifest b/app-crypt/sequoia-sqv/Manifest
index d2086a8f5b9d..a9499a74247f 100644
--- a/app-crypt/sequoia-sqv/Manifest
+++ b/app-crypt/sequoia-sqv/Manifest
@@ -149,4 +149,4 @@ DIST xxhash-rust-0.8.2.crate 16721 BLAKE2B 898102bd731013bc18557e5087aa03e8df362
 DIST zeroize-1.4.3.crate 15573 BLAKE2B 0ebab6e501bcf32c19ea88fdf038c97468b504c5035b2f2477372326e114231e5c959203b2bc897228a05b19ee510f1264d4fad5e33c5539b5c8bdaaff28889e SHA512 c4f3f10790176925fb90ee6325a50c710ff220bb9d37d424e28e8d8de5f801f2ef5fd687f0b720c471ac9e99e02e26011afcc4ecdd10a8229f70bc71a3815002
 DIST zeroize_derive-1.2.2.crate 9147 BLAKE2B b270762bba183790042155f4e0d5ba740cff3d8c5d5be60bce37eae3266e62b0530f23b529510d67434506cc87bc7eea1f37710160caa8735823cdb70f4e9f7e SHA512 b8e00d3a1b1fafa705c40de9b0a60059f6f3b921c022360f1248e50ac6b29cced779bd71b74eea0df5afb991712a13906c73f5892ccdf7ffe79b323e103b8712
 EBUILD sequoia-sqv-1.1.0.ebuild 3987 BLAKE2B 01599dc4c0a1e49c812a8efcba4dfd2379ad560295a6133b0f55d8fd79fac30d808f3fbaad1c234b77634b5984dd964fa4f39581e0d8389050faba07cdc3266b SHA512 aab7ee3bc72c557f1c150ff8f7b0a49b47205364948a96cd3489b15f2c9693b2c625afad00da44317081ed4ee134fc2b0a506cf9376e5e4f23e6e53fc1090679
-MISC metadata.xml 247 BLAKE2B f18c471812d5b8c75f2e05c4fb556108fb93554b59ee61a8215803f2654854a7401fcd62964192c228bfebfb52ae4573cfd24b29a944630c8c733d154d2b0d9a SHA512 cea16f7db3110bd4629b9265d5acdec6d70877330664f8e83f726002eb69aec7f822e9cde9c7da900451cdef60f1ceba373dfe73c73f82173bbf1d2f9f7338b7
+MISC metadata.xml 331 BLAKE2B eab0be39ea4eda8a48c79dd955b34271c5a49a1240c77f8cd0af15c5b0cafa68927929faeb00bf752991a265812d28c0fdfd4e4beee7b8a31b77834b15d4de37 SHA512 ab798b9d12b097ecd1f596999bf83e411c1726b7e5baa8ef58ebf5fab3d63468b28038cf103c875039585622bdd514a04f15c1d93cb203d9cd6da6611ccb1570
diff --git a/app-crypt/sequoia-sqv/metadata.xml b/app-crypt/sequoia-sqv/metadata.xml
index a7fa285c7476..3c72ac7546b9 100644
--- a/app-crypt/sequoia-sqv/metadata.xml
+++ b/app-crypt/sequoia-sqv/metadata.xml
@@ -5,4 +5,7 @@
 		<name>Florian Schmaus</name>
 		<email>flow@gentoo.org</email>
 	</maintainer>
+	<upstream>
+		<remote-id type="gitlab">sequoia-pgp/sequoia</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-crypt/swtpm/Manifest b/app-crypt/swtpm/Manifest
index 397115935df2..aeb3c35f0a11 100644
--- a/app-crypt/swtpm/Manifest
+++ b/app-crypt/swtpm/Manifest
@@ -5,4 +5,4 @@ DIST swtpm-0.7.3.tar.gz 354088 BLAKE2B 687e3161cbc08be68427648187ba2fb05749bcaaf
 DIST swtpm-0.8.0.tar.gz 363951 BLAKE2B 8ec91961c5ac145dc5d1c3c4a609d18bc425caef0efb4d2b18c08c76acacefa619617b6e7b6e8e4e707117a29e3ff3c0198b63d81d24fc747435c6e06e48e8e9 SHA512 7f70c19f732404061be6168c96c0dd3ec91ed8b50dddcafcb50d810062ce0e83ad85360191f97db5db9dc034e01d91cebe3912449d896d2cde68fe060a0adb09
 EBUILD swtpm-0.7.3.ebuild 1418 BLAKE2B 783b60d93e4cb092df4c5f1c84a92823cdfe7f2514a90c9a2df8343fbcaf905b509135066d4308cde146d09873fb6f29db3bc5c4fdccdddc6b49e6fd84c1d548 SHA512 9265e6c401c593273e7f7716e345e259bf41dc47cbc6f8e4e323c6bc18f3ebb88040a985cff200124d4355b2a21f2a85756b438bbbe8219d548b7c710835b274
 EBUILD swtpm-0.8.0.ebuild 1430 BLAKE2B ff2c092caedd1b06769fa1ed9f366006c55fbf14a0a11b1b94a67ee328dcc3908ee200f748b4e8a98fb58dfbc2ad295457c5cad110b1641fbd92fc6ec7f37a79 SHA512 34d4cb24cba4e40b8a57f44bd83b6667deb45e5405f4fb52688405d0d8fc9ec9468d5d6a34ee0cc4df7c9eeeca2c1c37eba40ba238392b2e60ac78d68d44a599
-MISC metadata.xml 634 BLAKE2B dd82ee76167fca29b65bb4f334c2b7c50c41073485fef6592702a13c35e0e4dde0d575f8d65ba159dabd23da73646fba08412572136db195877bfb4a719a1de7 SHA512 fb676807f792f073fc93ad8509dff08c3b5bb0eddb82fdc30285a9bf7994f17b4deb896e27c99459b1cd74a113ff966de4b93fe526901740263095b78a40ce7f
+MISC metadata.xml 717 BLAKE2B 70de08f9ed69084e7ed07c72ae96ab76cdb8bf489c3d3664edab24d2a904f44a6483bb9685f0e97f4520420dab1b6796e58cff00ba82190459af12398aa4b6d1 SHA512 a4f2977c84e03e215f6455def44ead6f767d6a4803061942b799b38bedaada373b51bbd47bd87c4339df32138a339b5f595a5ea19c5706b5e424329cc8aec0a5
diff --git a/app-crypt/swtpm/metadata.xml b/app-crypt/swtpm/metadata.xml
index 1ad716fc5197..3187cf4dce7f 100644
--- a/app-crypt/swtpm/metadata.xml
+++ b/app-crypt/swtpm/metadata.xml
@@ -16,4 +16,7 @@
 	<use>
 		<flag name="fuse">Support <pkg>sys-fs/fuse</pkg> based /dev/tpm interface</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">stefanberger/swtpm</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-crypt/tpm-emulator/Manifest b/app-crypt/tpm-emulator/Manifest
index e597edf111cd..1c78cb825fa0 100644
--- a/app-crypt/tpm-emulator/Manifest
+++ b/app-crypt/tpm-emulator/Manifest
@@ -5,4 +5,4 @@ AUX tpm-emulator.confd 20 BLAKE2B 13dd9f09a0a4efb9a039bfeababb5f00b8b2c3c1777e60
 AUX tpm-emulator.initd 776 BLAKE2B 0daa0247396d1b5f1c9542b28f825899a5cc45bd748b6b7e2328440fd466fd6b461e32487a955816a79827bf350cfb33bd71a6b197a8e67dbf5509750098cb59 SHA512 22d7b163dc6f567c1900a275ae545c4421b2d459ba535a24f48d7ad2609f5df36533849aa781d4dd704961db102eea08c99b79c01d0e3981fb46d2eb4e39d6fe
 DIST tpm-emulator-0.7.5.tar.gz 222341 BLAKE2B c6dc7494800f4c6d1f5e622c6a47fdd5487e0f2cbc34173d9039d6eb5fd7541dd2c1f514efbf220c605424059844e18650b31ee9934eda6626427b915fd6bc53 SHA512 24c16ec36ca92c484d6e8dfa53c8ca00dbc5b58d78d7166041db1e9ae277d763f0fc0a6b0cbd7e62fcf4671f6ad2d8df1213256be0a4200b79b6ee61ab73b2ef
 EBUILD tpm-emulator-0.7.5-r3.ebuild 1761 BLAKE2B df8e42d04abd6aeda040e3e64f6136a6ffc581fe6f7626a29a81aa0a9741631976f25353c51544d1c083787ef0d5211f75999319f27361ffe0d179d158b7ccca SHA512 f512acce103dcef68660b7dad896865013a30c32153dc8b47baf479cea01da520024076532f5ed794eba98136f834a05165ebd9b3c758c2526b1ba8b94df5860
-MISC metadata.xml 323 BLAKE2B d064d68887e8ab7269c0c1d2fd36fc25ad488be8a15d2d896529c0b9a5e3bad1ee6070470b20e6a48918904225f07e793cd7f4f30f79945cb9b195290f942baf SHA512 7c33a8f2547106334fcfefa2bbabb13056a78c2fd866af045d3ba297a99ec50d5aabe68d4cfec3d173dfe8f38d1b33f5ded2296d1954add39d9d16e1b98019f3
+MISC metadata.xml 386 BLAKE2B 752ee354199d1467f60120bb187d0008c9f601a4567d568065f72b0446dbfe7e079aaa801aacee1408abf961209a9854fb86f5ee63fdc9bbf7dd928d0fb27b6a SHA512 4e4237c1725ecf3d6ecd9a60c2702a00d3983c8184aa6d11e9f440181b7886c79e01df7f9870b886df11c47f6147a47b41958a86c87a9f4af93df91c5a42a259
diff --git a/app-crypt/tpm-emulator/metadata.xml b/app-crypt/tpm-emulator/metadata.xml
index 51fbbfdd110b..fdd2723e0b5e 100644
--- a/app-crypt/tpm-emulator/metadata.xml
+++ b/app-crypt/tpm-emulator/metadata.xml
@@ -2,10 +2,11 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="sourceforge">tpm-emulator</remote-id>
-	</upstream>
 	<use>
 		<flag name="mtm-emulator">Build the MTM emulator</flag>
 	</use>
+	<upstream>
+		<remote-id type="sourceforge">tpm-emulator</remote-id>
+		<remote-id type="github">PeterHuewe/tpm-emulator</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-crypt/tpm2-pkcs11/Manifest b/app-crypt/tpm2-pkcs11/Manifest
index 38f96d5ea483..5c70a066859e 100644
--- a/app-crypt/tpm2-pkcs11/Manifest
+++ b/app-crypt/tpm2-pkcs11/Manifest
@@ -1,3 +1,3 @@
 DIST tpm2-pkcs11-1.8.0.tar.gz 1393977 BLAKE2B c959e9e593dde903eac4b26ac85a39d1c73bfb9b6be558d7338dae1a710eb836385b08ddca27689f0573242d40ee072fa5d6685186a50e10ea42b8679389cf92 SHA512 599feb4d888c25a3359927b1d408f9ce85ba69d8a0e7af7ae9f3736e8940ec8d5f58b3094bef3b6515c0b1810249ea98cd73dbce592cb63de3b45ff976adda80
 EBUILD tpm2-pkcs11-1.8.0.ebuild 1397 BLAKE2B f27c924aa1036e2a8a164031ea45fb881e10faac6d90f55b59c6c51006d54f8bbe27f6276f13183bc69893718d3e4d3e652bb34746a9339327a3909e6d342bb4 SHA512 1371fefd248c4bc9b8282c992efbea51586b034256b5bdeb63386b0df6814336a04d1454774a45289207118062a718dfcb9b59ecd9077bc9ed3c414651b99b17
-MISC metadata.xml 473 BLAKE2B 66d9a37ccc8a1dc4e94798394a6e33090a42922d40ca87b55b687207da072ed50a12b985e9261863a4208bced5a76c856e1d05eeed78b27a766dc56234a40ff1 SHA512 e15ae6f4fa11fe7719ba7692b04f7b81563f6c1ea7caa1984c0e0957c18a53abb87ea70c27f0972fec6f6b8608f94142e7791cbd9c2025d7ad0d17889968a549
+MISC metadata.xml 563 BLAKE2B 2941f98612d53afaa52bb0d6b635ab83f51932a9446dfb4724326ce9a3da9b3c5a94cf1550f1a7d29b0d0bb2176c3d5b9ab38810f2d520617cc36eff029a607e SHA512 7f0b1d5349a60227c434bee6d150f1287182bda634b1197f9b9ebd91cac32cdb4a2e21796728526b1168e9f8d358fdc8d836e93ca65fb6419d26e418ccf87275
diff --git a/app-crypt/tpm2-pkcs11/metadata.xml b/app-crypt/tpm2-pkcs11/metadata.xml
index 12ab3f529d15..4b7a498cda7f 100644
--- a/app-crypt/tpm2-pkcs11/metadata.xml
+++ b/app-crypt/tpm2-pkcs11/metadata.xml
@@ -12,4 +12,7 @@
 	<use>
 		<flag name="fapi">Enable feature API backend</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">tpm2-software/tpm2-pkcs11</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-dicts/Manifest.gz b/app-dicts/Manifest.gz
index 6201c6fa4ff7..c40f38570cea 100644
--- a/app-dicts/Manifest.gz
+++ b/app-dicts/Manifest.gz
diff --git a/app-dicts/libydpdict/Manifest b/app-dicts/libydpdict/Manifest
index 122484c9c268..8d9c023255dc 100644
--- a/app-dicts/libydpdict/Manifest
+++ b/app-dicts/libydpdict/Manifest
@@ -1,3 +1,3 @@
 DIST libydpdict-1.0.4.tar.gz 20550 BLAKE2B a68573a74db3b7ef5aa4565b85f17830800c4551db9d2d6cd80f0517e8c5f1adb7e1d6caad3768e5e9e7665a68eb2ac0eb7b261a7f69a5280c4c65f5787c9359 SHA512 09178c620410c5f43f52a4ffc691fc656e7d1a92fd5724ca31c6f99397d4e702d440dc0bf191e56dd83439c3067ac7638ee7ce071bc26399e8306cadbe705fdd
 EBUILD libydpdict-1.0.4.ebuild 560 BLAKE2B de49276956dd5c513770759c8e9c1397ac96b3c40bcb04cc8a0ebeacba755ef1bf8e31073d6e7259a4b5791064eacf667fc6fb796064a2e8a38a153affd97d10 SHA512 88e06909b34dd9b2d7a031d5fc21a90ee63a939a4d16c05ca5495e54835a7476dcce3e9386e6b23e2c48e26591d4dff8c0f74765ef257c8e884d599b56eb5f07
-MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
+MISC metadata.xml 252 BLAKE2B 98be0f79095d1afbc941601295f2cb5e9629f0b25764007e62eb27f5abbcada741de7a048919538ec4c1e0bbfd49ad695e8edbab527ae0e8c21a991e2da110f5 SHA512 471ac64f1d2854213667efe95c64fc3ee822574c5addf4261ab389addb7b95b8b13533cfc1888aae1d5db76dbd240354d1b547a9f3e91ef118013a7c4affc7d7
diff --git a/app-dicts/libydpdict/metadata.xml b/app-dicts/libydpdict/metadata.xml
index 85e4ed814fa2..cc6d8743c599 100644
--- a/app-dicts/libydpdict/metadata.xml
+++ b/app-dicts/libydpdict/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="github">wojtekka/libydpdict</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-games/Manifest.gz b/dev-games/Manifest.gz
index 2737871fc3c4..e5dff219124d 100644
--- a/dev-games/Manifest.gz
+++ b/dev-games/Manifest.gz
diff --git a/dev-games/godot/Manifest b/dev-games/godot/Manifest
index a7b98c3e05c5..6a24e63de9ef 100644
--- a/dev-games/godot/Manifest
+++ b/dev-games/godot/Manifest
@@ -4,9 +4,9 @@ AUX godot-4.0-musl.patch 345 BLAKE2B 05057241c1e29ff886a38b815f68fcfe2b8c5e23fce
 AUX godot-4.0_beta3-headless-header.patch 498 BLAKE2B 401942c17829136aace28e34f7c9a4f843457d5a76c8b7035f40894f3d4d06936ddf3f1bcedf81584a65c0bff96e6e556d20ed8856107dd76deb173c98256964 SHA512 f83ec6b0667108b7c8f744b90944cd686de114db5694e09febf20a359a7d3fe11457b0c3279719a1281309a647e856b729354d3bed5f6d5048548b8dd259f63b
 AUX godot-4.0_beta8-scons.patch 1445 BLAKE2B 6fc5a18911681da54191af590afb9fa62181e485eb06a5eb89e9c1f5a52fd53abf712e0f58f48b9a3bf8c8adc47aa1e7833ea025ede7436873b0a8a7f46cf92a SHA512 cb579d8c8925ee20152aa48a89171433b9e663ee9a44c869987bd9f736cdf9213d77e63d1ddaf45cbecf8b55113e204c80a378dfd8637aa6d0ba64933d48b2cb
 DIST godot-3.5.1-stable.tar.xz 24153448 BLAKE2B 9d61276a2d82ef4f4487ec1046b7fa58f2b3626640b2db25c1f98c3f8e2ff40eddcf943fd9ffaaf6814fbafbbe7ef1d3f642d77af953b87731cff570ac3a5473 SHA512 59e5ca88534f542562971efb83b76561705f9ca8761311f01b4453857e7ae046c17cadd0d5ca6f6f56e262b5031294a8b9ad970fa6ffc95e1a6a1e1bae48d55f
-DIST godot-4.0-beta8.tar.xz 31575000 BLAKE2B 27c3f18f1106684e8a4381a5a54240a6513ca3319c1cfc533a6c0b9021474e7246eded4a00f8242df41412b98fd11d38974add72cee4f6936fcc01507b801125 SHA512 f18c22bb7a29062c6bd3106f87656f0eadab3befb2715942bcf114850bf818b9530eb14859480bb82cb5c77a5cecd6f98ed5006643b5cf3b016ee21b1f07f022
+DIST godot-4.0-beta10.tar.xz 31668884 BLAKE2B 25fead426d6f5d1e572363a2f4b895454d0e35434d570bb894cbb5b20db9c6db076942e126730f210661a2f8a75e1e780a02226ee732fdb1f5c8f0043e115a81 SHA512 8806471abc699beca9cef87b8e386c6a044083e9a9dc6ff3c0a65655222c874eeb1fb2cfbd6c479ead4b4106beed530f7205a4873a3da16b4b4fa5f95496168b
 DIST godot-4.0-beta9.tar.xz 31655148 BLAKE2B 296fb2e8d21bc4357d5262c3c8b11587cdb9d8f181b25b93600ca341c5d9bff1b47d500f676d7b8fdbf3ea4a53afa9ef2882d94380d7209813dbe281bef452bb SHA512 13eec9129644746bd7e81e1e0fe164d6d91a4d0618d40af335e2deb79fc15b794f1366c4b54cc27de5b088dc49f56417bd4e018a1bad29f76b71c19ed22c0603
 EBUILD godot-3.5.1.ebuild 6747 BLAKE2B b19789b1ea9890973b16c2c6e7bc015f033fc218587e529a715ff2813e21c3fa8c89476c8f16cca707b2b93d35e2bd53ac7e6521af5c0aa088edd4e4a93b4fad SHA512 f6858b117eadca56a3539bf19d6ce1e8e04ade2e3b82a7abd49a30f89184681982d889eb82a5f9832107d8d5ad62326729eb286aaef4602e257391c0924e0e68
-EBUILD godot-4.0_beta8-r1.ebuild 8215 BLAKE2B 68a432b3c7220b0441c43cb58df0ca02d52bfcd6a7be38bf5cee888b635b2f2d2636521723ff8a1111c4496f06c7e9395258aca90d4b79f83a809c3cf363cd79 SHA512 56071003d7a128cfd523238c30889d63587c278228cdd1eafe683fcfe7df84a2d8e74f73ca8666bd8e511cb4a7243794e4e3bd143f65659996104dac3063a8dc
+EBUILD godot-4.0_beta10.ebuild 8215 BLAKE2B 68a432b3c7220b0441c43cb58df0ca02d52bfcd6a7be38bf5cee888b635b2f2d2636521723ff8a1111c4496f06c7e9395258aca90d4b79f83a809c3cf363cd79 SHA512 56071003d7a128cfd523238c30889d63587c278228cdd1eafe683fcfe7df84a2d8e74f73ca8666bd8e511cb4a7243794e4e3bd143f65659996104dac3063a8dc
 EBUILD godot-4.0_beta9.ebuild 8215 BLAKE2B 68a432b3c7220b0441c43cb58df0ca02d52bfcd6a7be38bf5cee888b635b2f2d2636521723ff8a1111c4496f06c7e9395258aca90d4b79f83a809c3cf363cd79 SHA512 56071003d7a128cfd523238c30889d63587c278228cdd1eafe683fcfe7df84a2d8e74f73ca8666bd8e511cb4a7243794e4e3bd143f65659996104dac3063a8dc
 MISC metadata.xml 1551 BLAKE2B 718ca848e6b90fad730ea413ff8d25a9c23836da1ff890d7c93d458a0b46b503a4d1b949742a4a819eb0323eb0626a3541cd35d41f809b600891fa470f565ff6 SHA512 b935ee9256ae07a8f01bc458ee41c46e25be8a38b6921cf353a20332c59b6083bd6f73e2112858827b3b7bccdb256f9122e1d9691d2a3751aba85bbb8c4ab262
diff --git a/dev-games/godot/godot-4.0_beta8-r1.ebuild b/dev-games/godot/godot-4.0_beta10.ebuild
index ba144b6c7e6c..ba144b6c7e6c 100644
--- a/dev-games/godot/godot-4.0_beta8-r1.ebuild
+++ b/dev-games/godot/godot-4.0_beta10.ebuild
diff --git a/dev-libs/Ice/Ice-3.7.8-r1.ebuild b/dev-libs/Ice/Ice-3.7.8-r1.ebuild
new file mode 100644
index 000000000000..962e357aa908
--- /dev/null
+++ b/dev-libs/Ice/Ice-3.7.8-r1.ebuild
@@ -0,0 +1,258 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+
+RUBY_OPTIONAL="yes"
+USE_RUBY="ruby30"
+
+PHP_EXT_NAME="IcePHP"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+
+PHP_EXT_OPTIONAL_USE=php
+
+USE_PHP="php8-0 php8-1 php8-2"
+
+inherit php-ext-source-r3 python-r1 ruby-ng toolchain-funcs
+
+DESCRIPTION="ICE middleware C++ library and generator tools"
+HOMEPAGE="https://zeroc.com/products/ice"
+SRC_URI="https://github.com/zeroc-ice/ice/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	doc? ( https://download.zeroc.com/Ice/$(ver_cut 1-2)/${PN}-3.7.1.pdf )"
+LICENSE="GPL-2"
+SLOT="0/37"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="debug doc examples php python ruby test"
+RESTRICT="test"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND=">=app-arch/bzip2-1.0.5
+	>=dev-libs/expat-2.0.1
+	dev-libs/libedit
+	dev-cpp/libmcpp
+	dev-db/lmdb:=
+	dev-libs/openssl:0=
+	virtual/libcrypt:=
+	python? ( ${PYTHON_DEPS} )
+	ruby? ( $(ruby_implementation_depend ruby30) )"
+DEPEND="${RDEPEND}
+	test? (
+		${PYTHON_DEPS}
+		dev-python/passlib[${PYTHON_USEDEP}]
+	)"
+
+# Maintainer notes:
+# TODO: java bindings
+
+S="${WORKDIR}/${P,}"
+PHP_EXT_S="${S}/php"
+
+PATCHES=(
+	"${FILESDIR}/${P}-fix-musl-build.patch"
+	"${FILESDIR}/${P}-py3k11.patch"
+)
+
+pkg_setup() {
+	# prevent ruby-ng.eclass from messing with pkg_setup
+	return
+}
+
+src_unpack() {
+	# prevent ruby-ng.eclass from messing with src_unpack
+	default
+}
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e 's|-Werror ||g' \
+		config/Make.rules.Linux || die
+
+	# fix for x86 IceBox test
+	sed -i \
+		-e 's|"32"|""|' \
+		scripts/IceBoxUtil.py || die
+
+	if use !test; then
+		# Disable building tests
+		sed -i \
+			-e 's|include \$(top_srcdir)/config/Make.tests.rules||' \
+			config/Make.rules || die
+	fi
+}
+
+src_configure() {
+	MAKE_RULES=(
+		"embedded_runpath_prefix=\"${EPREFIX}/usr\""
+		"OPTIMIZE=$(usex !debug)"
+		"V=1"
+	)
+
+	if use python; then
+		local S="${S}/python"
+		python_copy_sources
+	fi
+
+	if use ruby; then
+		SITERUBY="$(ruby30 -r rbconfig -e 'print RbConfig::CONFIG["sitelibdir"]')"
+		SITERUBYARCH="$(ruby30 -r rbconfig -e 'print RbConfig::CONFIG["sitearchdir"]')"
+		MAKE_RULES_RUBY=(
+			"install_rubydir=\"${EPREFIX}/${SITERUBY}\""
+			"install_rubylibdir=\"${EPREFIX}/${SITERUBYARCH}\""
+		)
+
+		# make it use ruby30 only
+		sed -i \
+			-e 's|RUBY ?= ruby|\030|' \
+			ruby/config/Make.rules || die
+		sed -i \
+			-e 's|env ruby|\030|' \
+			ruby/config/s2rb.rb || die
+		sed -i \
+			-e 's|env ruby|\030|' \
+			ruby/scripts/slice2rb || die
+	fi
+
+	use test && python_setup
+}
+
+src_compile() {
+	# Do not remove this export or build will break!
+	tc-export CXX
+
+	emake -C cpp "${MAKE_RULES[@]}"
+
+	if use php; then
+		local i
+		for i in $(php_get_slots); do
+			mkdir -p "${WORKDIR}/${i}" || die
+			cp -r "${PHP_EXT_S}" "${WORKDIR}/${i}/" || die "Failed to copy source ${PHP_EXT_S} to PHP target directory"
+
+			pushd "${WORKDIR}/${i}" >/dev/null || die
+			ln -s "${S}/cpp" || die
+			ln -s "${S}/config" || die
+			ln -s "${S}/slice" || die
+			ln -s "${S}/Makefile" || die
+
+			emake -C php "${MAKE_RULES[@]}" "PHP_CONFIG=\"${EPREFIX}/usr/$(get_libdir)/${i}/bin/php-config\""
+			popd >/dev/null || die
+		done
+	fi
+
+	if use python; then
+		building() {
+			emake -C "${BUILD_DIR}" "${MAKE_RULES[@]}" PYTHON="${EPYTHON}"
+		}
+		local S="${S}/python"
+		python_foreach_impl building
+	fi
+
+	if use ruby; then
+		emake -C ruby "${MAKE_RULES[@]}" "${MAKE_RULES_RUBY[@]}"
+	fi
+}
+
+src_test() {
+	local -x LD_LIBRARY_PATH="${S}/cpp/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
+	emake -C cpp "${MAKE_RULES[@]}" test
+
+	# php tests require the extension loaded and are therefore skipped
+
+	if use python; then
+		testing() {
+			PYTHONPATH="${BUILD_DIR}"/python emake -C "${BUILD_DIR}" \
+				"${MAKE_RULES[@]}" \
+				PYTHON="${EPYTHON}" \
+				install_pythondir="\"$(python_get_sitedir)\"" \
+				install_libdir="\"$(python_get_sitedir)\"" test
+		}
+		local S="${S}/python"
+		python_foreach_impl testing
+	fi
+
+	if use ruby; then
+		emake -C ruby "${MAKE_RULES[@]}" "${MAKE_RULES_RUBY[@]}" test
+	fi
+}
+
+src_install() {
+	local DOCS=( CHANGELOG*.md README.md )
+	use doc && DOCS+=( "${DISTDIR}/${PN}-3.7.1.pdf" )
+	einstalldocs
+
+	MAKE_RULES_INSTALL=(
+		"prefix=\"${ED}/usr\""
+		"install_docdir=\"${ED}/usr/share/doc/${PF}\""
+		"install_configdir=\"${ED}/usr/share/${P}/config\""
+		"install_mandir=\"${ED}/usr/share/man/man1\""
+	)
+
+	insinto /usr/share/${P}
+	doins -r slice
+
+	emake -C cpp "${MAKE_RULES[@]}" "${MAKE_RULES_INSTALL[@]}" install
+
+	if use examples; then
+		docinto examples-cpp
+		dodoc cpp/config/*.cfg
+		docompress -x /usr/share/doc/${PF}/examples-cpp
+	fi
+
+	if use php; then
+		insinto "/usr/share/php/${PN}"
+
+		local i
+		while IFS="" read -d $'\0' -r i; do
+			doins "${i}"
+		done < <(find "${S}/php/lib/" -name '*.php' -print0)
+
+		pushd "${ED}/usr/share/${P}/slice" >/dev/null || die
+
+		local -x LD_LIBRARY_PATH="${ED}/usr/$(get_libdir):${LD_LIBRARY_PATH}"
+		for i in *; do
+			mkdir -p "${ED}/usr/share/php/${i}" || die
+			"${ED}"/usr/bin/slice2php \
+				-I"${ED}/usr/share/${P}/slice/" --all \
+				--output-dir "${ED}/usr/share/php/${i}" \
+				--ice "${ED}/usr/share/${P}/slice/${i}"/*
+		done
+
+		for i in $(php_get_slots); do
+			php_init_slot_env "${i}"
+			insinto "${EXT_DIR}"
+			newins "php/lib/ice.so" "${PHP_EXT_NAME}.so"
+		done
+		php-ext-source-r3_createinifiles
+
+		popd >/dev/null || die
+	fi
+
+	if use python; then
+		installation() {
+			mkdir -p "${D}/$(python_get_sitedir)" || die
+
+			emake -C "${BUILD_DIR}" \
+				"${MAKE_RULES[@]}" \
+				"${MAKE_RULES_INSTALL[@]}" \
+				install_pythondir="\"${D}/$(python_get_sitedir)\"" \
+				install_libdir="\"${D}/$(python_get_sitedir)\"" \
+				install
+			python_optimize
+		}
+		local S="${S}/python"
+		python_foreach_impl installation
+	fi
+
+	if use ruby; then
+		MAKE_RULES_RUBY=(
+			"install_rubydir=\"${ED}/${SITERUBY}\""
+			"install_rubylibdir=\"${ED}/${SITERUBYARCH}\""
+		)
+		dodir "${SITERUBY}"
+		emake -C ruby "${MAKE_RULES[@]}" "${MAKE_RULES_INSTALL[@]}" "${MAKE_RULES_RUBY[@]}" install
+	fi
+}
diff --git a/dev-libs/Ice/Ice-3.7.8-r2.ebuild b/dev-libs/Ice/Ice-3.7.8-r2.ebuild
new file mode 100644
index 000000000000..2c3a680d0bbf
--- /dev/null
+++ b/dev-libs/Ice/Ice-3.7.8-r2.ebuild
@@ -0,0 +1,258 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+
+RUBY_OPTIONAL="yes"
+USE_RUBY="ruby31"
+
+PHP_EXT_NAME="IcePHP"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+
+PHP_EXT_OPTIONAL_USE=php
+
+USE_PHP="php8-0 php8-1 php8-2"
+
+inherit php-ext-source-r3 python-r1 ruby-ng toolchain-funcs
+
+DESCRIPTION="ICE middleware C++ library and generator tools"
+HOMEPAGE="https://zeroc.com/products/ice"
+SRC_URI="https://github.com/zeroc-ice/ice/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	doc? ( https://download.zeroc.com/Ice/$(ver_cut 1-2)/${PN}-3.7.1.pdf )"
+LICENSE="GPL-2"
+SLOT="0/37"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="debug doc examples php python ruby test"
+RESTRICT="test"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND=">=app-arch/bzip2-1.0.5
+	>=dev-libs/expat-2.0.1
+	dev-libs/libedit
+	dev-cpp/libmcpp
+	dev-db/lmdb:=
+	dev-libs/openssl:0=
+	virtual/libcrypt:=
+	python? ( ${PYTHON_DEPS} )
+	ruby? ( $(ruby_implementation_depend ruby31) )"
+DEPEND="${RDEPEND}
+	test? (
+		${PYTHON_DEPS}
+		dev-python/passlib[${PYTHON_USEDEP}]
+	)"
+
+# Maintainer notes:
+# TODO: java bindings
+
+S="${WORKDIR}/${P,}"
+PHP_EXT_S="${S}/php"
+
+PATCHES=(
+	"${FILESDIR}/${P}-fix-musl-build.patch"
+	"${FILESDIR}/${P}-py3k11.patch"
+)
+
+pkg_setup() {
+	# prevent ruby-ng.eclass from messing with pkg_setup
+	return
+}
+
+src_unpack() {
+	# prevent ruby-ng.eclass from messing with src_unpack
+	default
+}
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e 's|-Werror ||g' \
+		config/Make.rules.Linux || die
+
+	# fix for x86 IceBox test
+	sed -i \
+		-e 's|"32"|""|' \
+		scripts/IceBoxUtil.py || die
+
+	if use !test; then
+		# Disable building tests
+		sed -i \
+			-e 's|include \$(top_srcdir)/config/Make.tests.rules||' \
+			config/Make.rules || die
+	fi
+}
+
+src_configure() {
+	MAKE_RULES=(
+		"embedded_runpath_prefix=\"${EPREFIX}/usr\""
+		"OPTIMIZE=$(usex !debug)"
+		"V=1"
+	)
+
+	if use python; then
+		local S="${S}/python"
+		python_copy_sources
+	fi
+
+	if use ruby; then
+		SITERUBY="$(ruby31 -r rbconfig -e 'print RbConfig::CONFIG["sitelibdir"]')"
+		SITERUBYARCH="$(ruby31 -r rbconfig -e 'print RbConfig::CONFIG["sitearchdir"]')"
+		MAKE_RULES_RUBY=(
+			"install_rubydir=\"${EPREFIX}/${SITERUBY}\""
+			"install_rubylibdir=\"${EPREFIX}/${SITERUBYARCH}\""
+		)
+
+		# make it use ruby31 only
+		sed -i \
+			-e 's|RUBY ?= ruby|\031|' \
+			ruby/config/Make.rules || die
+		sed -i \
+			-e 's|env ruby|\031|' \
+			ruby/config/s2rb.rb || die
+		sed -i \
+			-e 's|env ruby|\031|' \
+			ruby/scripts/slice2rb || die
+	fi
+
+	use test && python_setup
+}
+
+src_compile() {
+	# Do not remove this export or build will break!
+	tc-export CXX
+
+	emake -C cpp "${MAKE_RULES[@]}"
+
+	if use php; then
+		local i
+		for i in $(php_get_slots); do
+			mkdir -p "${WORKDIR}/${i}" || die
+			cp -r "${PHP_EXT_S}" "${WORKDIR}/${i}/" || die "Failed to copy source ${PHP_EXT_S} to PHP target directory"
+
+			pushd "${WORKDIR}/${i}" >/dev/null || die
+			ln -s "${S}/cpp" || die
+			ln -s "${S}/config" || die
+			ln -s "${S}/slice" || die
+			ln -s "${S}/Makefile" || die
+
+			emake -C php "${MAKE_RULES[@]}" "PHP_CONFIG=\"${EPREFIX}/usr/$(get_libdir)/${i}/bin/php-config\""
+			popd >/dev/null || die
+		done
+	fi
+
+	if use python; then
+		building() {
+			emake -C "${BUILD_DIR}" "${MAKE_RULES[@]}" PYTHON="${EPYTHON}"
+		}
+		local S="${S}/python"
+		python_foreach_impl building
+	fi
+
+	if use ruby; then
+		emake -C ruby "${MAKE_RULES[@]}" "${MAKE_RULES_RUBY[@]}"
+	fi
+}
+
+src_test() {
+	local -x LD_LIBRARY_PATH="${S}/cpp/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
+	emake -C cpp "${MAKE_RULES[@]}" test
+
+	# php tests require the extension loaded and are therefore skipped
+
+	if use python; then
+		testing() {
+			PYTHONPATH="${BUILD_DIR}"/python emake -C "${BUILD_DIR}" \
+				"${MAKE_RULES[@]}" \
+				PYTHON="${EPYTHON}" \
+				install_pythondir="\"$(python_get_sitedir)\"" \
+				install_libdir="\"$(python_get_sitedir)\"" test
+		}
+		local S="${S}/python"
+		python_foreach_impl testing
+	fi
+
+	if use ruby; then
+		emake -C ruby "${MAKE_RULES[@]}" "${MAKE_RULES_RUBY[@]}" test
+	fi
+}
+
+src_install() {
+	local DOCS=( CHANGELOG*.md README.md )
+	use doc && DOCS+=( "${DISTDIR}/${PN}-3.7.1.pdf" )
+	einstalldocs
+
+	MAKE_RULES_INSTALL=(
+		"prefix=\"${ED}/usr\""
+		"install_docdir=\"${ED}/usr/share/doc/${PF}\""
+		"install_configdir=\"${ED}/usr/share/${P}/config\""
+		"install_mandir=\"${ED}/usr/share/man/man1\""
+	)
+
+	insinto /usr/share/${P}
+	doins -r slice
+
+	emake -C cpp "${MAKE_RULES[@]}" "${MAKE_RULES_INSTALL[@]}" install
+
+	if use examples; then
+		docinto examples-cpp
+		dodoc cpp/config/*.cfg
+		docompress -x /usr/share/doc/${PF}/examples-cpp
+	fi
+
+	if use php; then
+		insinto "/usr/share/php/${PN}"
+
+		local i
+		while IFS="" read -d $'\0' -r i; do
+			doins "${i}"
+		done < <(find "${S}/php/lib/" -name '*.php' -print0)
+
+		pushd "${ED}/usr/share/${P}/slice" >/dev/null || die
+
+		local -x LD_LIBRARY_PATH="${ED}/usr/$(get_libdir):${LD_LIBRARY_PATH}"
+		for i in *; do
+			mkdir -p "${ED}/usr/share/php/${i}" || die
+			"${ED}"/usr/bin/slice2php \
+				-I"${ED}/usr/share/${P}/slice/" --all \
+				--output-dir "${ED}/usr/share/php/${i}" \
+				--ice "${ED}/usr/share/${P}/slice/${i}"/*
+		done
+
+		for i in $(php_get_slots); do
+			php_init_slot_env "${i}"
+			insinto "${EXT_DIR}"
+			newins "php/lib/ice.so" "${PHP_EXT_NAME}.so"
+		done
+		php-ext-source-r3_createinifiles
+
+		popd >/dev/null || die
+	fi
+
+	if use python; then
+		installation() {
+			mkdir -p "${D}/$(python_get_sitedir)" || die
+
+			emake -C "${BUILD_DIR}" \
+				"${MAKE_RULES[@]}" \
+				"${MAKE_RULES_INSTALL[@]}" \
+				install_pythondir="\"${D}/$(python_get_sitedir)\"" \
+				install_libdir="\"${D}/$(python_get_sitedir)\"" \
+				install
+			python_optimize
+		}
+		local S="${S}/python"
+		python_foreach_impl installation
+	fi
+
+	if use ruby; then
+		MAKE_RULES_RUBY=(
+			"install_rubydir=\"${ED}/${SITERUBY}\""
+			"install_rubylibdir=\"${ED}/${SITERUBYARCH}\""
+		)
+		dodir "${SITERUBY}"
+		emake -C ruby "${MAKE_RULES[@]}" "${MAKE_RULES_INSTALL[@]}" "${MAKE_RULES_RUBY[@]}" install
+	fi
+}
diff --git a/dev-libs/Ice/Ice-3.7.8.ebuild b/dev-libs/Ice/Ice-3.7.8.ebuild
new file mode 100644
index 000000000000..53f105a80a3b
--- /dev/null
+++ b/dev-libs/Ice/Ice-3.7.8.ebuild
@@ -0,0 +1,258 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+
+RUBY_OPTIONAL="yes"
+USE_RUBY="ruby27"
+
+PHP_EXT_NAME="IcePHP"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+
+PHP_EXT_OPTIONAL_USE=php
+
+USE_PHP="php8-0 php8-1 php8-2"
+
+inherit php-ext-source-r3 python-r1 ruby-ng toolchain-funcs
+
+DESCRIPTION="ICE middleware C++ library and generator tools"
+HOMEPAGE="https://zeroc.com/products/ice"
+SRC_URI="https://github.com/zeroc-ice/ice/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	doc? ( https://download.zeroc.com/Ice/$(ver_cut 1-2)/${PN}-3.7.1.pdf )"
+LICENSE="GPL-2"
+SLOT="0/37"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="debug doc examples php python ruby test"
+RESTRICT="test"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND=">=app-arch/bzip2-1.0.5
+	>=dev-libs/expat-2.0.1
+	dev-libs/libedit
+	dev-cpp/libmcpp
+	dev-db/lmdb:=
+	dev-libs/openssl:0=
+	virtual/libcrypt:=
+	python? ( ${PYTHON_DEPS} )
+	ruby? ( $(ruby_implementation_depend ruby27) )"
+DEPEND="${RDEPEND}
+	test? (
+		${PYTHON_DEPS}
+		dev-python/passlib[${PYTHON_USEDEP}]
+	)"
+
+# Maintainer notes:
+# TODO: java bindings
+
+S="${WORKDIR}/${P,}"
+PHP_EXT_S="${S}/php"
+
+PATCHES=(
+	"${FILESDIR}/${P}-fix-musl-build.patch"
+	"${FILESDIR}/${P}-py3k11.patch"
+)
+
+pkg_setup() {
+	# prevent ruby-ng.eclass from messing with pkg_setup
+	return
+}
+
+src_unpack() {
+	# prevent ruby-ng.eclass from messing with src_unpack
+	default
+}
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e 's|-Werror ||g' \
+		config/Make.rules.Linux || die
+
+	# fix for x86 IceBox test
+	sed -i \
+		-e 's|"32"|""|' \
+		scripts/IceBoxUtil.py || die
+
+	if use !test; then
+		# Disable building tests
+		sed -i \
+			-e 's|include \$(top_srcdir)/config/Make.tests.rules||' \
+			config/Make.rules || die
+	fi
+}
+
+src_configure() {
+	MAKE_RULES=(
+		"embedded_runpath_prefix=\"${EPREFIX}/usr\""
+		"OPTIMIZE=$(usex !debug)"
+		"V=1"
+	)
+
+	if use python; then
+		local S="${S}/python"
+		python_copy_sources
+	fi
+
+	if use ruby; then
+		SITERUBY="$(ruby27 -r rbconfig -e 'print RbConfig::CONFIG["sitelibdir"]')"
+		SITERUBYARCH="$(ruby27 -r rbconfig -e 'print RbConfig::CONFIG["sitearchdir"]')"
+		MAKE_RULES_RUBY=(
+			"install_rubydir=\"${EPREFIX}/${SITERUBY}\""
+			"install_rubylibdir=\"${EPREFIX}/${SITERUBYARCH}\""
+		)
+
+		# make it use ruby27 only
+		sed -i \
+			-e 's|RUBY ?= ruby|\027|' \
+			ruby/config/Make.rules || die
+		sed -i \
+			-e 's|env ruby|\027|' \
+			ruby/config/s2rb.rb || die
+		sed -i \
+			-e 's|env ruby|\027|' \
+			ruby/scripts/slice2rb || die
+	fi
+
+	use test && python_setup
+}
+
+src_compile() {
+	# Do not remove this export or build will break!
+	tc-export CXX
+
+	emake -C cpp "${MAKE_RULES[@]}"
+
+	if use php; then
+		local i
+		for i in $(php_get_slots); do
+			mkdir -p "${WORKDIR}/${i}" || die
+			cp -r "${PHP_EXT_S}" "${WORKDIR}/${i}/" || die "Failed to copy source ${PHP_EXT_S} to PHP target directory"
+
+			pushd "${WORKDIR}/${i}" >/dev/null || die
+			ln -s "${S}/cpp" || die
+			ln -s "${S}/config" || die
+			ln -s "${S}/slice" || die
+			ln -s "${S}/Makefile" || die
+
+			emake -C php "${MAKE_RULES[@]}" "PHP_CONFIG=\"${EPREFIX}/usr/$(get_libdir)/${i}/bin/php-config\""
+			popd >/dev/null || die
+		done
+	fi
+
+	if use python; then
+		building() {
+			emake -C "${BUILD_DIR}" "${MAKE_RULES[@]}" PYTHON="${EPYTHON}"
+		}
+		local S="${S}/python"
+		python_foreach_impl building
+	fi
+
+	if use ruby; then
+		emake -C ruby "${MAKE_RULES[@]}" "${MAKE_RULES_RUBY[@]}"
+	fi
+}
+
+src_test() {
+	local -x LD_LIBRARY_PATH="${S}/cpp/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
+	emake -C cpp "${MAKE_RULES[@]}" test
+
+	# php tests require the extension loaded and are therefore skipped
+
+	if use python; then
+		testing() {
+			PYTHONPATH="${BUILD_DIR}"/python emake -C "${BUILD_DIR}" \
+				"${MAKE_RULES[@]}" \
+				PYTHON="${EPYTHON}" \
+				install_pythondir="\"$(python_get_sitedir)\"" \
+				install_libdir="\"$(python_get_sitedir)\"" test
+		}
+		local S="${S}/python"
+		python_foreach_impl testing
+	fi
+
+	if use ruby; then
+		emake -C ruby "${MAKE_RULES[@]}" "${MAKE_RULES_RUBY[@]}" test
+	fi
+}
+
+src_install() {
+	local DOCS=( CHANGELOG*.md README.md )
+	use doc && DOCS+=( "${DISTDIR}/${PN}-3.7.1.pdf" )
+	einstalldocs
+
+	MAKE_RULES_INSTALL=(
+		"prefix=\"${ED}/usr\""
+		"install_docdir=\"${ED}/usr/share/doc/${PF}\""
+		"install_configdir=\"${ED}/usr/share/${P}/config\""
+		"install_mandir=\"${ED}/usr/share/man/man1\""
+	)
+
+	insinto /usr/share/${P}
+	doins -r slice
+
+	emake -C cpp "${MAKE_RULES[@]}" "${MAKE_RULES_INSTALL[@]}" install
+
+	if use examples; then
+		docinto examples-cpp
+		dodoc cpp/config/*.cfg
+		docompress -x /usr/share/doc/${PF}/examples-cpp
+	fi
+
+	if use php; then
+		insinto "/usr/share/php/${PN}"
+
+		local i
+		while IFS="" read -d $'\0' -r i; do
+			doins "${i}"
+		done < <(find "${S}/php/lib/" -name '*.php' -print0)
+
+		pushd "${ED}/usr/share/${P}/slice" >/dev/null || die
+
+		local -x LD_LIBRARY_PATH="${ED}/usr/$(get_libdir):${LD_LIBRARY_PATH}"
+		for i in *; do
+			mkdir -p "${ED}/usr/share/php/${i}" || die
+			"${ED}"/usr/bin/slice2php \
+				-I"${ED}/usr/share/${P}/slice/" --all \
+				--output-dir "${ED}/usr/share/php/${i}" \
+				--ice "${ED}/usr/share/${P}/slice/${i}"/*
+		done
+
+		for i in $(php_get_slots); do
+			php_init_slot_env "${i}"
+			insinto "${EXT_DIR}"
+			newins "php/lib/ice.so" "${PHP_EXT_NAME}.so"
+		done
+		php-ext-source-r3_createinifiles
+
+		popd >/dev/null || die
+	fi
+
+	if use python; then
+		installation() {
+			mkdir -p "${D}/$(python_get_sitedir)" || die
+
+			emake -C "${BUILD_DIR}" \
+				"${MAKE_RULES[@]}" \
+				"${MAKE_RULES_INSTALL[@]}" \
+				install_pythondir="\"${D}/$(python_get_sitedir)\"" \
+				install_libdir="\"${D}/$(python_get_sitedir)\"" \
+				install
+			python_optimize
+		}
+		local S="${S}/python"
+		python_foreach_impl installation
+	fi
+
+	if use ruby; then
+		MAKE_RULES_RUBY=(
+			"install_rubydir=\"${ED}/${SITERUBY}\""
+			"install_rubylibdir=\"${ED}/${SITERUBYARCH}\""
+		)
+		dodir "${SITERUBY}"
+		emake -C ruby "${MAKE_RULES[@]}" "${MAKE_RULES_INSTALL[@]}" "${MAKE_RULES_RUBY[@]}" install
+	fi
+}
diff --git a/dev-libs/Ice/Manifest b/dev-libs/Ice/Manifest
index 831a22ce2f7f..c8623dc02f77 100644
--- a/dev-libs/Ice/Manifest
+++ b/dev-libs/Ice/Manifest
@@ -1,7 +1,14 @@
 AUX Ice-3.6.3-no-arch-opts.patch 1462 BLAKE2B 0adbbb302a3fde0dab4dba0b5947ee5da3413a8c3dc02fb8612837f4a2b3ecb56b92628430d8f3c2315f1fb0fa057bf0942dd389941b61d70d12b4078ce45d84 SHA512 236abce89a7bcf64d6a12db5a82d62db1effa2b5a105ae7c83910f02ca1ccd610193097a2c959d2a487f0d641af70ba8013bcfe570e2af40976d9a1017272e6e
 AUX Ice-3.6.5-csharp.patch 1573 BLAKE2B 2e69e87179bd938bb34f1ae9826b09b935cb9a13e5f68fc81a6302afb66e4b4f45f1c22975cd3e2bc29e044dd7d47b120a93ea546d56cee93b6ee8f2a4af15f5 SHA512 7930b143b10da6521877c921b7b8dabb97b688ea8219dfb6cd2bbecf609cdcd07dcf4c2f80394a07337939d7ce42cb10bb1aed12885aa533e9ad9dec30ac6b87
 AUX Ice-3.6.5-db6.patch 1664 BLAKE2B 9ef67c83612875c68dd8fb7cea025ce3fca1e4384335108aa423ca63b53c6c723d9f7f9fd8fdc6895f8aedee0826efc225d89e487f5c95c395a8cdb1b893826a SHA512 ba94bddf3f43688ca74e5fd42fbafd7d0b6f02f616dfa4b6aff69ef1089f4404618cf07871d265b0b07037ca02a27fc397767d845a7e0edc60baa37704a064f0
+AUX Ice-3.7.8-fix-musl-build.patch 568 BLAKE2B e320641208d46b27acc68d932aed336bf74407e3db8351e59b43172be771fe80ba813e01812a40b2cd57bd8002a0fe707f9a32fdef3f7b323c8a764f7f1c5c97 SHA512 be19a21ff3d4ddafb9d1b9c866f392b3eb081e450b9a061884485b7713f06ad5a7c58a0275328de8bdf39d0bfb2fcc085583105f47cae51e6cae42651a04ed3e
+AUX Ice-3.7.8-py3k11.patch 1500 BLAKE2B c7580ff44b3d29071f48c72c00069e9689d8e6d354027469b70c14b249bc1b8c4b7453df02a4282066869b936a3f71e850d17a93444f1b192ccfb9998d8e632b SHA512 ebe4e8458785d4191f42fca81995f31c9e7d6e9290a91491ef311b2104c193161b5d3a8489a34630e0d42cb9dd3870e3f48fe8089b8f0739afbe822e1a9db4fb
 DIST Ice-3.6.4.pdf 8907736 BLAKE2B 5a631c1e2e147c8ed3b31a84192210c92bbe83e8644ec9d7d164d1b94a20069ce77f6baf54910ac00c7216cbc2979caac6fa78457e9292a84407e93000f9903a SHA512 9bd2d373eb83e08e563cab174a53063a490367dea3e4b910f93f0477c3817282c859f07e46e503006e9bd37678fb6da31a58b88bfabd217b5e371fff685321a0
 DIST Ice-3.6.5.tar.gz 5505499 BLAKE2B e16e8932f09270ac6bb86984ab47fa229ad873ee343ac4f56bb48b6f9547387ded0392a76302afac2c98b6d31da7c1faf294574cdba52654e7dea0af16b4169d SHA512 3431928e6168d716919aa9b3126d17a8ae14895bb78a369902a2bb350b2e82923f38ee17965ed3696512a016fcd34dc128e9aaca40fb2b032e7f7eb07bcb903b
+DIST Ice-3.7.1.pdf 9351739 BLAKE2B 527f2c37aea19aedbfc580efd93ce4fae2eb7264342bb485822593e2da6fb75a61eea2b1a46187898af07f138d10bf9a213d0b2a0685c18cd1d4c624709a935b SHA512 199b59f14b87b2896ba970bf5aa32f6fd858cbd3fed18eac93acafe4e296db1361ca2d2000ed49f3390ed66c1d4ff8c1fcd3f14ab8197d7804c87fce422c8486
+DIST Ice-3.7.8.tar.gz 11056950 BLAKE2B 66686d6e66a997badef53ee30782775047a2fa39d70fa8ed73c5e7a1bad3c3899efd8d68f557a416caacd65860a73834a6bdc3188730fa19a3f1e47f028c5e21 SHA512 eb5863cb5e83000199c27a5a505a19e5f1ec05e8575eb9cdc03f6db30447212e3b02e6adc70fb2ae6ddc63cfd93bc2b6b290f38919364ee9f08b238a0aa11e88
 EBUILD Ice-3.6.5-r2.ebuild 8488 BLAKE2B 75fc7e9830b32640a55e2b4228f2dc9858495896d8cb345230cf92007bdbc077d0443c94d1afc1e6a7716fb8b3be489316650df1648f4c5d473f530c05ee4dda SHA512 c6451f5c526dd4d41284e074fef331b8a4e483b69ce310cce4827b127f06fbd4d126808dc4889ac109dee737b18a5d28d7be9b651d8886d5e8b7488f146c5508
+EBUILD Ice-3.7.8-r1.ebuild 5997 BLAKE2B 363e6c3aaf3a349b63b61be7ec8bf50fd4f5e89fc89502f66aa054cdf00ee5df26a32e9626d79d18f54b691e40a860cb5b1a78a253047b9e38c8bd17177e4ffd SHA512 8559f82c5f31e4bf273c84825cfa2f5c89095c400abe310cbec6498c1b7dff9ec323671463a7a14f360d6721af68da5adfcc305528ebe5da328c1a9c82012c7d
+EBUILD Ice-3.7.8-r2.ebuild 5997 BLAKE2B d17852615902b63537b088a30a24a0cba398b5dbbee964945536856e778192cd17818d90edc5dfd7c71cccd42c5a90f1dcdb3468fe8992a45eb0a0e840070bb7 SHA512 1d962c594763bd56e28e4d2d4a24192577bcb666a8bb10a2a8ed122d17c25663bba742ff6e81ca6b233f5b0203eb02748fa3ac82b81176924ed3f3dc5f5e11b4
+EBUILD Ice-3.7.8.ebuild 5997 BLAKE2B 5769e51a362a7ab3fcc9aef76e82f60207b5835ef4e196fca45ad6186e247fbe928412bb1bc9b21f88061801904f9b34fbc6011803413c3da4b2c458cad41379 SHA512 a208cf3bd15bdc98c64288e02958f5112df99350f7be846e44bd966e5064249aed2b49cf3dd561b475c3bb10eefa8af552e61084b29e8fedb3373357133211e1
 MISC metadata.xml 471 BLAKE2B 50fef5d9314fcf793c140c97016a5af4ecb2b1aa5cc86e8cd1f961beb1e55aeb23d1228bf9dcccb10d54458b72766eba80c9b18d9add7928fdd4197577e58971 SHA512 65d2e51347c27ee6414f07a69ecd886d9eb6a18b3419a80e0e7022bdf127b03fca0cdb954c5a3d46dba29e40dc7973a7c5d6b8388af36702c3874e02589cad56
diff --git a/dev-libs/Ice/files/Ice-3.7.8-fix-musl-build.patch b/dev-libs/Ice/files/Ice-3.7.8-fix-musl-build.patch
new file mode 100644
index 000000000000..76fa6c5cb641
--- /dev/null
+++ b/dev-libs/Ice/files/Ice-3.7.8-fix-musl-build.patch
@@ -0,0 +1,13 @@
+https://github.com/void-linux/void-packages/blob/master/srcpkgs/Ice/patches/fix-musl.patch
+
+--- a/cpp/src/IceUtil/UtilException.cpp
++++ b/cpp/src/IceUtil/UtilException.cpp
+@@ -43,7 +43,7 @@
+ #       endif
+ #   endif
+ 
+-#   if !defined(_AIX) && !defined(__sun) && !defined(__FreeBSD__) && !defined(__MINGW32__) && !defined(ICE_STATIC_LIBS)
++#   if !defined(_AIX) && !defined(__sun) && !defined(__FreeBSD__) && !defined(__MINGW32__) && !defined(ICE_STATIC_LIBS) && defined(__GLIBC__)
+ #       include <execinfo.h>
+ #       include <cxxabi.h>
+ #       include <stdint.h>
diff --git a/dev-libs/Ice/files/Ice-3.7.8-py3k11.patch b/dev-libs/Ice/files/Ice-3.7.8-py3k11.patch
new file mode 100644
index 000000000000..7295aa6d9554
--- /dev/null
+++ b/dev-libs/Ice/files/Ice-3.7.8-py3k11.patch
@@ -0,0 +1,45 @@
+From a98f34df525dce54a96f443806599978b293d7c5 Mon Sep 17 00:00:00 2001
+From: Jose <pepone@users.noreply.github.com>
+Date: Thu, 3 Nov 2022 16:52:58 +0100
+Subject: [PATCH] Python 3.11 build fixes (#1394)
+
+---
+ python/modules/IcePy/Slice.cpp | 7 ++++++-
+ python/modules/IcePy/Util.cpp  | 5 +++++
+ 2 files changed, 11 insertions(+), 1 deletion(-)
+
+diff --git a/python/modules/IcePy/Slice.cpp b/python/modules/IcePy/Slice.cpp
+index e11365d8d40..7138e76dac0 100644
+--- a/python/modules/IcePy/Slice.cpp
++++ b/python/modules/IcePy/Slice.cpp
+@@ -14,7 +14,12 @@
+ // Python headers needed for PyEval_EvalCode.
+ //
+ #include <compile.h>
+-#include <eval.h>
++// Use ceval.h instead of eval.h with Pyhthon 3.11 and greater
++#if PY_VERSION_HEX >= 0x030B0000
++#   include <ceval.h>
++#else
++#   include <eval.h>
++#endif
+ 
+ using namespace std;
+ using namespace IcePy;
+diff --git a/python/modules/IcePy/Util.cpp b/python/modules/IcePy/Util.cpp
+index f15c7a5c690..73955c933a2 100644
+--- a/python/modules/IcePy/Util.cpp
++++ b/python/modules/IcePy/Util.cpp
+@@ -225,7 +225,12 @@ IcePy::getFunction()
+     //
+     // Get name of current function.
+     //
++    // Use PyEval_GetFrame with Pyhthon >= 3.11
++#if PY_VERSION_HEX >= 0x030B0000
++    PyFrameObject *f = PyEval_GetFrame();
++#else
+     PyFrameObject *f = PyThreadState_GET()->frame;
++#endif
+     PyObjectHandle code = getAttr(reinterpret_cast<PyObject*>(f), "f_code", false);
+     assert(code.get());
+     PyObjectHandle func = getAttr(code.get(), "co_name", false);
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 5078f88f48e5..bd67959fca67 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/ayatana-ido/Manifest b/dev-libs/ayatana-ido/Manifest
index 32f35dc76ecd..875c3b50fba3 100644
--- a/dev-libs/ayatana-ido/Manifest
+++ b/dev-libs/ayatana-ido/Manifest
@@ -1,3 +1,3 @@
 DIST ayatana-ido-0.9.2.tar.gz 122286 BLAKE2B f6498591d72fa6deb5d9c8d87ddad399e41b3701719e45fe82dc8d5bd6ede30bb754561fdeaa938713692a90b8c48657ea2cb472c762acab6c3f36c73907b92e SHA512 efc5825d32d707b02397692c347f99f3bca13da2cd653b6ce87882643c85c2698bdac6168e89a01ed98d5ee58c88a820d89dad7b88a5aee235b450c40969d0a7
-EBUILD ayatana-ido-0.9.2.ebuild 926 BLAKE2B 5856f8ec1d001135d02c72de6d38287f2c7140434d86f6334fe345e391444b23af984b5df475870d41150a6a18c58759194204546ecc663fe7e7b0d6d67204cc SHA512 622684d7cc88573654495cd7165c2edb9d5d92d46f0c0c6dcd92d161ba3a97bac4d5c61359451da63450d94cbf48a57413b4475139d33db059c1bd13713d010d
+EBUILD ayatana-ido-0.9.2.ebuild 933 BLAKE2B 70fabad4be5af8ffd8dded0b7fc41410c605eb793039455e09ab78040da9cdbfefb8bc69efeaee408f15d46571576716c81208118af273b207a73e4e928c24d3 SHA512 166390376eef5b728cb58baa31da274e0e6fe4deb62f144d92a37fdaa4d3aeb332ac680463d584fafe86fa72aeae1d1e80c7d90f60e79adc5e4a57793713924e
 MISC metadata.xml 311 BLAKE2B 28fa9db014e9362128d165b27c8f26056169acdc0fe2b438c9d3d47d473a4d05116cf65e061d5a881052b081df278678fa8c8d70d7b16765cd7b4881e6c8a2ea SHA512 504ed1007b71b9964cd9a0718270cf2147069eaa1eac3e13f2837d10486d893fddfad3458835d582c37c9987f8542702782db4f853d51cf3cddcdac96d5fb635
diff --git a/dev-libs/ayatana-ido/ayatana-ido-0.9.2.ebuild b/dev-libs/ayatana-ido/ayatana-ido-0.9.2.ebuild
index f9b18b5d84ec..429d24786a67 100644
--- a/dev-libs/ayatana-ido/ayatana-ido-0.9.2.ebuild
+++ b/dev-libs/ayatana-ido/ayatana-ido-0.9.2.ebuild
@@ -18,7 +18,7 @@ IUSE="test"
 RESTRICT="test"
 #RESTRICT="!test? ( test )"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.58:2
diff --git a/dev-libs/libayatana-appindicator/Manifest b/dev-libs/libayatana-appindicator/Manifest
index 4912559abdac..77787bdb0a16 100644
--- a/dev-libs/libayatana-appindicator/Manifest
+++ b/dev-libs/libayatana-appindicator/Manifest
@@ -1,3 +1,3 @@
 DIST libayatana-appindicator-0.5.91.tar.gz 158269 BLAKE2B e1df60ce2b3ff5712cabf627a54e0767dcbc94d4e11c96a18fd20079642e6d033bfdd9e57d12235c72075cef1d711f5b042fb0a6282a6120018c8cdcc3b4033c SHA512 cc8631814c881640bf2de91a43205c3405fd1fefcd7d58f259171d0926bf7ab08f9361076f4eea1dd8876e8931f9c9230babd3a328f34dc298bc9c4ff004f8ee
-EBUILD libayatana-appindicator-0.5.91.ebuild 1074 BLAKE2B 73390e75fab879417ba8a16c8643b7ccad6f2f8cb43923e9198d5fc3b1b8cfc1a4c73eaffd8e1067b4a35016bf2e397411ea7b9036e2c657ac5c1fcdc141392a SHA512 8bbf0b9101a8cbe57e265a09e49314c8e36b28f73660a308e3e783e6aeea74fccc0547efb394e0d479de960a74bf1e2fe214ad619f5888aa47b3d9f1e5827d66
+EBUILD libayatana-appindicator-0.5.91.ebuild 1081 BLAKE2B 6c5670647a8566a648ea3d66e761032271be02afc0aa9d24bb400bf399410e437205182b5b5c70ecff0a1b30ba40d8934f1dd5756990ebe7aaed7bfca1c7c1f5 SHA512 8347db1d3334462063498d8b0565e5b9479485b0123b3311e842a0b053bb9a821cd80809cfa765a6ff196a9772dfdb27c398855989cda05161f4064a052c879d
 MISC metadata.xml 323 BLAKE2B 62ad338f71f771275eebdf77e713cc18c563be61d5eaee28f05915db16eccb885a436fa5967561b12be5441db354be705d4f9d25c3cbf0d5585e4ec11cd557da SHA512 715eff628c3440dabe9e3d2417f30fb80faae799c599dd4ae7302099e28fe9c1c01b503e0fb7fdc2defd03794bae547ac31bf5ade187e711acea455624d8ec72
diff --git a/dev-libs/libayatana-appindicator/libayatana-appindicator-0.5.91.ebuild b/dev-libs/libayatana-appindicator/libayatana-appindicator-0.5.91.ebuild
index 1ab8bf8da1df..0e516e2d5df7 100644
--- a/dev-libs/libayatana-appindicator/libayatana-appindicator-0.5.91.ebuild
+++ b/dev-libs/libayatana-appindicator/libayatana-appindicator-0.5.91.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/AyatanaIndicators/${PN}/archive/${PV}.tar.gz -> ${P}
 
 LICENSE="GPL-3 LGPL-2 LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libayatana-indicator/Manifest b/dev-libs/libayatana-indicator/Manifest
index 8debf6350a56..3943bddae299 100644
--- a/dev-libs/libayatana-indicator/Manifest
+++ b/dev-libs/libayatana-indicator/Manifest
@@ -1,3 +1,3 @@
 DIST libayatana-indicator-0.9.3.tar.gz 149890 BLAKE2B c15ec72218814d9a33ab8cf654222ff7e05980de5cb175904041973d1ef9506c56a89e5fa8d41c1eaa2367f93a57e056010e23b87c2533cc7e731fbdfb23ef85 SHA512 cc2dd1e304e657cd8497d3107e7993122db6bbcf28c25dc1b41b250831cb76507226b5673abbd65bc954cbd5c3851df5528135df45d1cbb3de85c0c87c279452
-EBUILD libayatana-indicator-0.9.3.ebuild 974 BLAKE2B fe3f0bb71d0445e7a6e4212559a423ca7b194e708e72c2f22434077a6b638ade2477e271f3ddf035105f1870bb3519de35ce11609ea5d2e37fea2040bebfa573 SHA512 de33651f62a6981dc2d59661f0e6362eb87f83efc10004776b2b86a9163739c6c5f0485f7d8aec97fb2edb4c6feca9802bf85b577f2db2ab1517776f1effa0d9
+EBUILD libayatana-indicator-0.9.3.ebuild 981 BLAKE2B 81045cf4a146555ec7ba37a3b47de6ac5bcf5f74ea1ec21289423856541cbf71e180a2a78683834f5e03bcef955fd6b97ad7d08f81eea2434014814c9daa6348 SHA512 7c88bb02badde59e5b763337b2e65bbd1f920ad69bf2bf9a43d51b3168635bd21219733f77ed14a53da20219aeae4f818cec72d42717a6ab988b14cfb0b28045
 MISC metadata.xml 320 BLAKE2B 87ef34f60a6f66effac9de367e4dc493976b8fc08162ed86fd3b5cb15d7b0e51bc3b91d0675db4b3c48d17bcaab88f6fbdfd9ff2b63ec9079f71f56e13ab38fe SHA512 6ac6de8cd88988867e14f0b3a57b10762c171da8d75718c202c3f3a4a41707bd7d2eb4faee10b0b3d6a8130ef7b84036ae1a9575e97b25110ed185cda00e7e60
diff --git a/dev-libs/libayatana-indicator/libayatana-indicator-0.9.3.ebuild b/dev-libs/libayatana-indicator/libayatana-indicator-0.9.3.ebuild
index 2ee6e86ff85e..f2f17dbe0fd5 100644
--- a/dev-libs/libayatana-indicator/libayatana-indicator-0.9.3.ebuild
+++ b/dev-libs/libayatana-indicator/libayatana-indicator-0.9.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/AyatanaIndicators/${PN}/archive/${PV}.tar.gz -> ${P}
 
 LICENSE="GPL-3"
 SLOT="3"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~x86"
 
 IUSE="test"
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/libsigc++/Manifest b/dev-libs/libsigc++/Manifest
index d6dd614f5c22..cc7afbcefa5c 100644
--- a/dev-libs/libsigc++/Manifest
+++ b/dev-libs/libsigc++/Manifest
@@ -1,5 +1,9 @@
 DIST libsigc++-2.10.8.tar.xz 4998876 BLAKE2B f460652950af895fab6d4028d721e2a439b0a4dfb260515c9acc053a41435be7d7f7328fc42f64ef34b36be31c5281e5998ceee2c08970f1fcec82176fab09b0 SHA512 8b22fd8ae4eca3ebc1b65b68d4dc022e7bbde6d1d02a557e64d2fda2682e2e39b357af6d8b68e8741c287701be9fffd27125c6171790455a7657e0ea55cc08b3
+DIST libsigc++-2.12.0.tar.xz 5002560 BLAKE2B f4d42dfbac95be974a5e49a7bcfd4c97fb0423f5bcc9d0bda79e6cee6bab54ae77969a3e5c58094264068c38212a0ff66b3dae2a519c4101bdfa170e94767641 SHA512 88e382e274a574a4b6129e23916054642e1696c663a4bb84f05e14a401f0cb56d0a0bf8c3a6273aec36ce121ce18a338b6d491fb213bcdf5a627bd382719e021
 DIST libsigc++-3.2.0.tar.xz 785900 BLAKE2B 6c128a0c426814bde26b092c20f9eca1029712f5130a12088bf7cae10c56105334a12df0b26fe1234ed4c262cac576312d2e72abb926b6422e6fc111ccee8734 SHA512 91315cecc79a1ad6ea165b66a13a5afd4e5bc101842f9d4c58811ea78536c07fc8821c51aa5110a032ed71c09f85790b3a02f2ad7fe8cc3aed6e03b2bafcd70c
+DIST libsigc++-3.4.0.tar.xz 949316 BLAKE2B f12e8199333f5d23827a33718e884835af79ae90f3aa9d71944b5277783f171ed17b81453b46ee9c46e945f3fd6f5152707723dfdc471c992375f0efb6a253ef SHA512 1677d5151db5e74388d8ba4f5cf316f1e5c92aa380c0725ea62ee41f10f549296d528a8998dfa4767ca699782c93f756c072de9e0e07e52307f61ff72c952fe4
 EBUILD libsigc++-2.10.8.ebuild 1102 BLAKE2B a64739d480cd6af3fed44ec6a3feb529592191bef05870204f372ebd2ef7cb8be89a0bf45a3e8dd06be0a7bd0aaa2b2035718453d22fad544551d3c539ecaacc SHA512 ef3fd5e44432208e4aef1cf876f41297a56444840742433ac5e36fe9be246e1b1861470a949bda9b5fa29c16a4fd9c41ae59ce02e1d6dae9c6f7732479c1a228
+EBUILD libsigc++-2.12.0.ebuild 1141 BLAKE2B e8e283265286de3d9fc88b52c12b054fc2ca3bb453ad60622fe966ca0dca820f0219c6f153d222cc826f0463f753cd47349472d99947cd23fc5b634333dca589 SHA512 42a35fc14af63439c03acf0dc3fcf03aee38173d704c53c255836edd0ba65aed2cf48cd4d572447eb08e567d4d53e23133e1865dcaba6298530bd9bf21f81fc6
 EBUILD libsigc++-3.2.0-r1.ebuild 1149 BLAKE2B 71605522a6a49529b6665b48a90d57af7043da55e1fa9572ea5c3ff03bfa89abb1645c4f85b212ff8ae7fd0b3d25b1f3d9636f75e8fc56dc66de8c27be06c56c SHA512 7367f5984cc6dd8a4e75445db59dd2d93f0fd81d0d1b11aa48dfb0de12aae399190c83eeb1645cefe99b689835903c574b737c5aae7f23a47909fea166d95210
+EBUILD libsigc++-3.4.0.ebuild 1081 BLAKE2B db128339cbd71bd3cb82473f5ae676e6d6b11553d83dcb2ab38df667350eb2becb605a8fba2eb6e6f26b38d01887edd1068d9ae1755756747d7df6abf41a7e4f SHA512 a49acbcbe3be9515f43479abe6a90cee5389d21e807bd423ef3877d7b9b6572aa1c6452d8515d4aa0ab7addcd6e65f9e3c44e3ce1fdafcac767ea0dec95457c1
 MISC metadata.xml 360 BLAKE2B cd5d7f32949df66ccd10d45bccf8d6433a5c0d218356bfd453037e1b0c3ad7e39a1fa1b9354a4f2c68a9340c1bed0c940f77e28ac43fb904a547bae0f4ef5b7e SHA512 0cab4a9537dbf409b15c8bcaba9653d434776292eb65c1bf9708c0ce2cf9134c23ceae09c4384950733928095735f137f51e8ad6d0253b77c9b3fafbc2b75877
diff --git a/dev-libs/libsigc++/libsigc++-2.12.0.ebuild b/dev-libs/libsigc++/libsigc++-2.12.0.ebuild
new file mode 100644
index 000000000000..45d13b525a28
--- /dev/null
+++ b/dev-libs/libsigc++/libsigc++-2.12.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit flag-o-matic gnome.org meson-multilib
+
+DESCRIPTION="Typesafe callback system for standard C++"
+HOMEPAGE="https://libsigcplusplus.github.io/libsigcplusplus/
+	https://github.com/libsigcplusplus/libsigcplusplus"
+
+LICENSE="LGPL-2.1+"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="gtk-doc test"
+RESTRICT="!test? ( test )"
+
+DEPEND="test? ( dev-libs/boost[${MULTILIB_USEDEP}] )"
+BDEPEND="sys-devel/m4
+	gtk-doc? ( app-doc/doxygen[dot] )"
+
+multilib_src_configure() {
+	filter-flags -fno-exceptions #84263
+
+	local -a emesonargs=(
+		$(meson_use test benchmark)
+		$(meson_native_use_bool gtk-doc build-documentation)
+		-Dbuild-examples=false
+		$(meson_use test build-tests)
+	)
+	meson_src_configure
+}
+
+multilib_src_install_all() {
+	# Note: html docs are installed into /usr/share/doc/libsigc++-2.0
+	# We can't use /usr/share/doc/${PF} because of links from glibmm etc. docs
+	:;
+}
diff --git a/dev-libs/libsigc++/libsigc++-3.4.0.ebuild b/dev-libs/libsigc++/libsigc++-3.4.0.ebuild
new file mode 100644
index 000000000000..962a59792908
--- /dev/null
+++ b/dev-libs/libsigc++/libsigc++-3.4.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit gnome.org flag-o-matic meson-multilib
+
+DESCRIPTION="Typesafe callback system for standard C++"
+HOMEPAGE="https://libsigcplusplus.github.io/libsigcplusplus/
+	https://github.com/libsigcplusplus/libsigcplusplus"
+
+LICENSE="LGPL-2.1+"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="gtk-doc test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	gtk-doc? (
+		app-doc/doxygen[dot]
+		dev-lang/perl
+		dev-libs/libxslt
+	)
+"
+
+multilib_src_configure() {
+	filter-flags -fno-exceptions #84263
+
+	local emesonargs=(
+		-Dbuild-examples=false
+		$(meson_native_use_bool gtk-doc build-documentation)
+		$(meson_use test build-tests)
+	)
+	meson_src_configure
+}
+
+multilib_src_install_all() {
+	# Note: html docs are installed into /usr/share/doc/libsigc++-3.0
+	# We can't use /usr/share/doc/${PF} because of links from glibmm etc. docs
+	:;
+}
diff --git a/dev-perl/Email-Address-XS/Email-Address-XS-1.50.0.ebuild b/dev-perl/Email-Address-XS/Email-Address-XS-1.50.0.ebuild
index 59aa64291b61..7b958d1cc592 100644
--- a/dev-perl/Email-Address-XS/Email-Address-XS-1.50.0.ebuild
+++ b/dev-perl/Email-Address-XS/Email-Address-XS-1.50.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Parse and format RFC 2822 email addresses and groups"
 
 LICENSE="|| ( Artistic GPL-1+ ) MIT"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/Email-Address-XS/Manifest b/dev-perl/Email-Address-XS/Manifest
index d15ac53bf958..e0fbe490cec9 100644
--- a/dev-perl/Email-Address-XS/Manifest
+++ b/dev-perl/Email-Address-XS/Manifest
@@ -1,3 +1,3 @@
 DIST Email-Address-XS-1.05.tar.gz 30413 BLAKE2B bd27d8af150e1f7cb2f2e836aa54b8615a12cd7988f4ae647bda529e22a0f4f4384f74cc3d936aabb0c9f4e550c4f9fa55f0df92ec8faa9455588a8ba001b175 SHA512 129841de4e945f935529e4b67a325b78c1aa9ca2f7623078450ed4d3516dffa4791a1f5ea37c8647ee15677414761475593d17073171623ea322023c9cef44eb
-EBUILD Email-Address-XS-1.50.0.ebuild 597 BLAKE2B cb84ef94292b4361549d81b88046335576ab3cc6e2571a03b0b45ccc4980fa3ec8bb525e43908259cff32a00017a9c7615ab9c6096c27c5316e525eadc018af6 SHA512 88b83e2b6d262a4e5641c13d15c856ad9b643dd5df50e138a29a8c554bad46ed35387ef72d8bc0e3998bb0b4481160021d959d7bb7fdab2ef9284ab2548292da
+EBUILD Email-Address-XS-1.50.0.ebuild 602 BLAKE2B b5537bd2724547f8ea9c8c11a7502715e7c91b74c23224f4b70c29a628955a02477d5a5386c1cb67369254903b08d12e200bf0a818831306b8583e5c3eee1149 SHA512 2618741e686cf6540f2e018b9034d388923fc3664cfa042c6ec06adfa0cb5a2a7c30a6bfecdeb19fadb5520af58f5d8a34db1572c87d18ef8482b8fd2bcb4c33
 MISC metadata.xml 469 BLAKE2B fc8833a5bf62af8e1e9166fba2810cf2b3d4213e4758ebf8d7d71d57453dc0869eb62346fadf4e20dce5d7e17b95a53b4f7107a3ebd4a671e11999132746488e SHA512 a91b20a6836940629a9e527ccc6304b510dc299d6c1d5cada671167f2ea9563ef92825b8cd0d3cdbc9852561d2082e97e12bfb5ffdc4a966f4c3789f90c4efdb
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index e5865e0f408d..565fdb7efa3b 100644
--- a/dev-perl/Manifest.gz
+++ b/dev-perl/Manifest.gz
diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index 8772df9ee4dd..87cc8a0f3174 100644
--- a/dev-php/Manifest.gz
+++ b/dev-php/Manifest.gz
diff --git a/dev-php/libvirt-php/Manifest b/dev-php/libvirt-php/Manifest
index 9d7f12fe635e..2cb6080478f3 100644
--- a/dev-php/libvirt-php/Manifest
+++ b/dev-php/libvirt-php/Manifest
@@ -1,5 +1,7 @@
 AUX remove-imagick-check.patch 331 BLAKE2B 2d9c164055c3f54baf259326abe22d5aa478141df7f6ea05ba33f040701947038490c1898e89a7019cc1e41008fde5cb43c338730ef7ec3020f5005edd612d9c SHA512 1e949f8c704a2e6b541a276b8cb53e9cf09f009dadc01f4f50ad02e92258cfe30130b2d22b811e0b5b07e1bad4023fad05040c6031bd0063999212c2d6483bcf
 DIST libvirt-php-0.5.6.tar.xz 386372 BLAKE2B 30d6a1c8dd18a4bd9d46e9c20551978fa0c20f2d671a359fdbf86def5166df7f882e65c509087efe0acef7d0dc468b3eb520689f9e7ba552e966809c8f647390 SHA512 5d1b3a2afc697051a5a0d4750ce4d02b31f482b1c17ef2cf4a593b705de438d8ccb4b1543ce6b2520b450734b3634e64ccf9200227f5681cbd2daad5a9f5ee9c
+DIST libvirt-php-0.5.7.tar.xz 389380 BLAKE2B c8189ffdeb29a056ef959624cd46a18ce7e4e00df6a42bfb3d6349ee8aa3865a4d66b82aed9ee4f68aa7f9761adb8eb8b62bd15d7c6e8e17c187ae44eba71a86 SHA512 ecc640ce2c936f59824212eca36bbe3ae13c560854e0d86da9f1d4d02373751f974b374915ded57d74636c0443c09c895857e8701204fbf49c402c1f315ae0b7
 EBUILD libvirt-php-0.5.6.ebuild 1453 BLAKE2B 2d30fa5fe60d8015ad498cbd6368c059e0fc4f8345a0d56a17ce31de99d4f3ef5f4e659b085f51d5ebdb72854c5f7b72d7cc55c87a0f45c796857f882a1d7d96 SHA512 54aef6536f38ffdded99ee8fa4f5982adab87e88f68e8bbd57aa8ea3e7af68732d3431331433f3ac6bf3ab1d97b1e08aa6a794d1550413b49feb305aafa125f0
-EBUILD libvirt-php-9999.ebuild 1463 BLAKE2B d482021104136ac237690ed9ffec6ffde66d54fd8adec41d3c2e6caf68ff0bcde507f6792d27ea6727eb6279d0dc7fc972a3021157872d5cff02ddb391649395 SHA512 8d982f4c805b5a485c6a12cbb1604d5c6a9041c1b594dc74c3577ea217b567325ec034673362bb46381793e8fb918d116ecb2095aa78d293f62120d7328ec57f
+EBUILD libvirt-php-0.5.7.ebuild 1288 BLAKE2B 28207036727113dd72ab1bdd43d5dbc49c420a196a81cdcf5504a582c606966fd3f8dc072c276acd634fcc702946334e918ab51d41b18b4b6f30962ec0abf747 SHA512 f9b4ec150e0fec95306aa19daecf808ad918df085c5d9151fa5caa919d177a59b344bbe41dc22190179840b98d49374a86b5338b3d471de3b0c8a4195f75c07e
+EBUILD libvirt-php-9999.ebuild 1298 BLAKE2B dd47a71214d22c05944114168975a05ffcea4b4399141991ad3c14b4b0af2cfcd825d530bf3ca56414b86e824865943f59267deaac7dd9087ee103913b9ecd4e SHA512 8bc659879969f65acfb147ad3650cf41f4f85e328f211e038b7b1d3ef404cfd9ff2b305c9d3820b9f975907dc542d23790293ace942c7bd4bb634c58bd14b0e2
 MISC metadata.xml 456 BLAKE2B 845b0f2472da5b862a46a3ac26fdabe28229a0b6b190fdc293741732e36eaaa00efed4678b0ae06b3c0692ad4315240efb2050914a23c831a368e9c6e4589271 SHA512 b16080b8879f9db4e459214842b483c06aff8feedf9aa72785b1924225088e3ea58afb15afdd46334beb299c29db59a68308f5fec1ab26b5e62b8faff6b4f78a
diff --git a/dev-php/libvirt-php/libvirt-php-0.5.7.ebuild b/dev-php/libvirt-php/libvirt-php-0.5.7.ebuild
new file mode 100644
index 000000000000..96777d784f67
--- /dev/null
+++ b/dev-php/libvirt-php/libvirt-php-0.5.7.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+PHP_EXT_NAME="libvirt-php"
+PHP_EXT_SKIP_PHPIZE="yes"
+USE_PHP="php7-4 php8-0 php8-1"
+PHP_EXT_ECONF_ARGS=()
+
+inherit php-ext-source-r3 autotools
+
+DESCRIPTION="PHP bindings for libvirt"
+HOMEPAGE="http://libvirt.org/php/"
+SRC_URI="http://libvirt.org/sources/php/${P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc"
+
+RDEPEND="app-emulation/libvirt
+	dev-libs/libxml2"
+DEPEND="${RDEPEND}
+	dev-libs/libxslt
+	virtual/pkgconfig
+	doc? ( app-text/xhtml1 )"
+
+DOCS=( ChangeLog NEWS README )
+
+src_unpack() {
+	default
+
+	# create the default modules directory to be able
+	# to use the php-ext-source-r3 eclass to configure/build
+	ln -s src "${S}/modules" || die
+}
+
+src_prepare() {
+	php-ext-source-r3_src_prepare
+
+	local slot
+	for slot in $(php_get_slots); do
+		php_init_slot_env "${slot}"
+		eautoreconf
+	done
+}
+
+src_install() {
+	local slot
+	for slot in $(php_get_slots); do
+		php_init_slot_env ${slot}
+		insinto "${EXT_DIR}"
+		doins "src/.libs/${PHP_EXT_NAME}.so"
+	done
+
+	php-ext-source-r3_createinifiles
+	einstalldocs
+
+	if use doc ; then
+		docinto html
+		dodoc -r docs/*
+	fi
+}
+
+src_test() {
+	for slot in $(php_get_slots); do
+		php_init_slot_env ${slot}
+		default
+	done
+}
diff --git a/dev-php/libvirt-php/libvirt-php-9999.ebuild b/dev-php/libvirt-php/libvirt-php-9999.ebuild
index df851fcfe3a0..8dd8a850a9ca 100644
--- a/dev-php/libvirt-php/libvirt-php-9999.ebuild
+++ b/dev-php/libvirt-php/libvirt-php-9999.ebuild
@@ -27,9 +27,6 @@ DEPEND="${RDEPEND}
 	doc? ( app-text/xhtml1 )"
 
 DOCS=( ChangeLog NEWS README )
-# Remove the insane check for pecl-imagick which is only used in examples
-# and is not called upon in any build
-PATCHES=( "${FILESDIR}/remove-imagick-check.patch" )
 
 src_unpack() {
 	git-r3_src_unpack
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 5d65da215030..81cbb7d2fdd3 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/future/Manifest b/dev-python/future/Manifest
index 5dced2f17c48..da0426ba4f36 100644
--- a/dev-python/future/Manifest
+++ b/dev-python/future/Manifest
@@ -1,7 +1,8 @@
+AUX future-0.18.2-cve-2022-40899.patch 2057 BLAKE2B 3ceaac51709be84a594474a35b8cb688c7e4382c7e625f328aa891c7f788efffba093daeff6551567425e7b9b2d1a4a5ed70df99dd5a6d0666bbc9915f72972f SHA512 7bd6743680ed69326eefd61ae517ebacebe2b175879367a66a1fa9729f75f77e2c632c3c50f64be197e71d09446a4ad01b733b15dc3508466ebd0cf06d7b6734
 AUX future-0.18.2-py3.10.patch 850 BLAKE2B 79c51778686c03a0b2fa6ed084b38039d9e5c14312cbf534da51a9da66e8fb50f0b619912414439f9975db43d5686e80150e82642d64963d16384fce339a09d4 SHA512 438e7092c4e9ece575e1d4cb341e52e45d6506fed348511266b7a583731516ad5e5eac43bc8b81ff7a24e29a8495612f5bbcb0984f6e428dee2b7dcfbf241ae2
 AUX future-0.18.2-py39-fileurl.patch 1005 BLAKE2B 9446c90649e5c06c1d603041c07e81ca96ea982fcf6ac9d7aaf48141015574ca2f81bd4da02c994e41ce96ef2e37290ae45f4ec70e332632e7086d08ce2feca0 SHA512 7d469a212b36828d20f65964aa52db30ab2c82f92b4411d39de054ba6ea7b7860413609b426f3f30dcc715be517e25e99f2b8afc05cc629c9a8e149fee2421b4
 AUX future-0.18.2-py39.patch 2789 BLAKE2B db6c0cb0a030d166f01b95721e560d346f8a80ec63f81c58e5fca663f975b8f8f771d169742a421c34c08b0de01069bb5455b5fafdab440af6e73746df0bb24c SHA512 7bb140d526d2e728d5a988898977e8bf87934f68c42a38f97717b3e5fc040ddc736cdb2b366a8dbbb95c857bffee9f448ff1883dff9c61cb46582d3a01aad65f
 AUX future-0.18.2-tests.patch 11773 BLAKE2B e2b9321ab2a04e4567c312beaccd23886c87f8b78c1de5d480205181a68b77d8c8b1582a57f43e510d5cd3ecc54252bb85130fe6d7e82756c9f1db11263fdf7b SHA512 d884d6b4e320a6e2aeca2c0c46576d9b0fd0d31aaa6f8f9a79f2007ecbc949f1393aa0b9254f0c51616ca4e8d3fb3f11d828879e4e8c01549acd4ecf04e2cf68
 DIST future-0.18.2.tar.gz 829220 BLAKE2B 68574b589bf54aa8dacbd162a54885589faa32829ccf212f50de5bf036ebd8b9aba0c13e63e80d34e507cc0dae4d8d3d47fea33433b17d2c2e6dbf6c37f66d8f SHA512 91c025f7d94bcdf93df838fab67053165a414fc84e8496f92ecbb910dd55f6b6af5e360bbd051444066880c5a6877e75157bd95e150ead46e5c605930dfc50f2
-EBUILD future-0.18.2-r2.ebuild 1144 BLAKE2B 7d7adc1e620acaa1c194eb0aad0e647aa80a8a23e8611a6fc777e548d6a8fbcd9294e255564a11a6f1dc2b1e6d2045707494ee97d493d5f31f3b9a29764984ad SHA512 38bd9df88bc0545daac2649effa4db53dd33d1c6d1d83811644fad550ac199472496c5e98dd6040e2d6f0684ef5f9e1af571bc20f18ca15e62f87ff0fba4fffc
+EBUILD future-0.18.2-r3.ebuild 1274 BLAKE2B 57a0354a45b53c29d40d10d1a91104d15a175ab771c581273adc978f36ccbe02cff3ab89b2f2e6e374f820c25f7bcf3b63f1095f4cacab6e0ffc32e17f80e91a SHA512 8dc72d2e520ac0d322cb5a8d85506c804a64d9e51ef945e3cf4279e63600c23abbc5cb0204bf88fc8b229fa76088a627a355a0e932e232f830a20a03a84d6d94
 MISC metadata.xml 402 BLAKE2B 84957a57a39c658794b57e41e2e683d826a6e5b7e1006f0430034a29b82d12f2983b021c63e9d519fe6ea21a90f30822b5561001c7e9283ea770fedb1d40ad9c SHA512 e1a2dfb08304d2cd0751dbde1e1410be0805493bf7624db17b3631dc10051fb443758a0c750ced2846a2769a3d33da752002ad7e92f95d88b4060f7a8be995bd
diff --git a/dev-python/future/files/future-0.18.2-cve-2022-40899.patch b/dev-python/future/files/future-0.18.2-cve-2022-40899.patch
new file mode 100644
index 000000000000..c7341e0d6fdb
--- /dev/null
+++ b/dev-python/future/files/future-0.18.2-cve-2022-40899.patch
@@ -0,0 +1,52 @@
+From c91d70b34ef0402aef3e9d04364ba98509dca76f Mon Sep 17 00:00:00 2001
+From: Will Shanks <wshaos@posteo.net>
+Date: Fri, 23 Dec 2022 13:38:26 -0500
+Subject: [PATCH] Backport fix for bpo-38804
+
+The regex http.cookiejar.LOOSE_HTTP_DATE_RE was vulnerable to regular
+expression denial of service (REDoS). The regex contained multiple
+overlapping \s* capture groups. A long sequence of spaces can trigger
+bad performance.
+
+See https://github.com/python/cpython/pull/17157 and https://pyup.io/posts/pyup-discovers-redos-vulnerabilities-in-top-python-packages/
+---
+ src/future/backports/http/cookiejar.py | 18 ++++++++++++------
+ 1 file changed, 12 insertions(+), 6 deletions(-)
+
+diff --git a/src/future/backports/http/cookiejar.py b/src/future/backports/http/cookiejar.py
+index af3ef415..0ad80a02 100644
+--- a/src/future/backports/http/cookiejar.py
++++ b/src/future/backports/http/cookiejar.py
+@@ -225,10 +225,14 @@ def _str2time(day, mon, yr, hr, min, sec, tz):
+        (?::(\d\d))?    # optional seconds
+     )?                 # optional clock
+        \s*
+-    ([-+]?\d{2,4}|(?![APap][Mm]\b)[A-Za-z]+)? # timezone
++    (?:
++       ([-+]?\d{2,4}|(?![APap][Mm]\b)[A-Za-z]+) # timezone
++       \s*
++    )?
++    (?:
++       \(\w+\)         # ASCII representation of timezone in parens.
+        \s*
+-    (?:\(\w+\))?       # ASCII representation of timezone in parens.
+-       \s*$""", re.X | re.ASCII)
++    )?$""", re.X | re.ASCII)
+ def http2time(text):
+     """Returns time in seconds since epoch of time represented by a string.
+ 
+@@ -298,9 +302,11 @@ def http2time(text):
+       (?::?(\d\d(?:\.\d*)?))?  # optional seconds (and fractional)
+    )?                    # optional clock
+       \s*
+-   ([-+]?\d\d?:?(:?\d\d)?
+-    |Z|z)?               # timezone  (Z is "zero meridian", i.e. GMT)
+-      \s*$""", re.X | re. ASCII)
++   (?:
++      ([-+]?\d\d?:?(:?\d\d)?
++       |Z|z)             # timezone  (Z is "zero meridian", i.e. GMT)
++      \s*
++   )?$""", re.X | re. ASCII)
+ def iso2time(text):
+     """
+     As for http2time, but parses the ISO 8601 formats:
diff --git a/dev-python/future/future-0.18.2-r2.ebuild b/dev-python/future/future-0.18.2-r3.ebuild
index 1558c0ea92ce..a05bf7f207d5 100644
--- a/dev-python/future/future-0.18.2-r2.ebuild
+++ b/dev-python/future/future-0.18.2-r3.ebuild
@@ -5,10 +5,15 @@ EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
 inherit distutils-r1
 
 DESCRIPTION="Easy, clean, reliable Python 2/3 compatibility"
-HOMEPAGE="https://python-future.org/"
+HOMEPAGE="
+	https://python-future.org/
+	https://github.com/PythonCharmers/python-future/
+	https://pypi.org/project/future/
+"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
@@ -20,7 +25,8 @@ BDEPEND="
 		$(python_gen_cond_dep '
 			dev-python/numpy[${PYTHON_USEDEP}]
 		' 'python*')
-	)"
+	)
+"
 
 distutils_enable_tests pytest
 distutils_enable_sphinx docs dev-python/sphinx-bootstrap-theme
@@ -30,6 +36,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-py39.patch
 	"${FILESDIR}"/${P}-py39-fileurl.patch
 	"${FILESDIR}"/${P}-py3.10.patch
+	"${FILESDIR}"/${P}-cve-2022-40899.patch
 )
 
 EPYTEST_DESELECT=(
diff --git a/dev-python/pipenv/Manifest b/dev-python/pipenv/Manifest
index a6d14db2a3e3..af3ae87705ea 100644
--- a/dev-python/pipenv/Manifest
+++ b/dev-python/pipenv/Manifest
@@ -1,4 +1,6 @@
 AUX pipenv-2022.9.24-inject-site-packages.patch 1155 BLAKE2B 61f296dd1f8168b86f17a55359c75febfc02807dd97c750217b46bd017b7bf73cf6fde0fcd2afa95908bd3e1cd7b50f626459f1a19f47b1c34ecdbea39fcfb7c SHA512 3a26ce6217fbf86eda1bb8266928dffe5fc1a55e4f7b66d0ade5ea31deff9cb68427f424995e4c8d402737e90ca9358a3a00364a4167667fae9a4bd018100ebc
+DIST pipenv-2022.11.30.gh.tar.gz 11120234 BLAKE2B 3d33475932a59dfb862869becb792aea420b8c9fffd9179866dc01eb5e0b2ba77a23c5de8be5570f9ed2e46f098bc000173d74766d42953f93ab2439c20d7f2c SHA512 a44409d41196388b05f2b9620b9d0f45f4af7f244f8243143278b62560e54063574670356e141e07807b56b1181ad27f701f84b91bc045bf47b5701455b36c66
 DIST pipenv-2022.9.24.gh.tar.gz 11543711 BLAKE2B e875068383c8ca55864bfcb53288ae9a02adc578c09ad7392bf50a7ebe07e2eb5944bc225cfefad2ca8265d8dcbb17af96b34e8c0fd51a709921148207021f2b SHA512 d29a728d914d8c762469fd2d72de7be41050165b4587c3304ebc03235a1946967f78473651e1834e5a69a35395d0cf9087e1515fd746450057774fc22e61e092
+EBUILD pipenv-2022.11.30.ebuild 4298 BLAKE2B 48765d4f94f1e22aaaaf15abbe3bc0258a76b7b0dff137debe44a714c699462cff9e55ce7f4086650745519d1bb918aca5a56829860718c1c261eddf02859df5 SHA512 52606570f856b91dd5fd900f97ee842f143af4008cf79def3297fb2229f72eb99de5939a822fd13fd436d352b5d71506c3890ec913e955964468f02353fce0f6
 EBUILD pipenv-2022.9.24-r1.ebuild 3137 BLAKE2B 5beb68c4ca7aad9d8d8c5f17dc09b7e8078a26357618c5fd7044b0107b77c5adf1983592ddeac79b98224f0cdc5ad3a39123e155a354fe1d57c264681a8b36bb SHA512 500e4bd9b9c5ff6359fd46c99a3c635827bc1ff7e6d0e4de19aa3ca62b4b92d260b9c04a3bb187ac158c1c322b361974ed7a237ddae055a995d08b1debed967c
 MISC metadata.xml 643 BLAKE2B ff3557d9ae32b553c85455436683e2ca94bc16c6ec7c6d2ceb1113a69dc841b9ac2f0e4b96eec4c6c84ca899ad6a99b0747d7bf3f9289110a8bbdfb80f2cb2eb SHA512 7a611950572c2d700fb1680e0aa307069d80d992528144da781eca9f1fee729defa6f8b28382ddd8f66e58c5f68de9a17815989a4a39473bbf830a7be42ea282
diff --git a/dev-python/pipenv/pipenv-2022.11.30.ebuild b/dev-python/pipenv/pipenv-2022.11.30.ebuild
new file mode 100644
index 000000000000..a398ffb770a3
--- /dev/null
+++ b/dev-python/pipenv/pipenv-2022.11.30.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1 multiprocessing
+
+MY_PV=${PV/_beta/b}
+DESCRIPTION="Python Development Workflow for Humans"
+HOMEPAGE="https://github.com/pypa/pipenv https://pypi.org/project/pipenv/"
+SRC_URI="https://github.com/pypa/pipenv/archive/v${MY_PV}.tar.gz -> ${P}.gh.tar.gz"
+S="${WORKDIR}"/${PN}-${MY_PV}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+PATCHES=(
+	"${FILESDIR}/pipenv-2022.9.24-inject-site-packages.patch"
+)
+
+RDEPEND="
+	dev-python/attrs[${PYTHON_USEDEP}]
+	>=dev-python/cerberus-1.3.2[${PYTHON_USEDEP}]
+	dev-python/click[${PYTHON_USEDEP}]
+	>=dev-python/colorama-0.4.4[${PYTHON_USEDEP}]
+	>=dev-python/markupsafe-2.0.1[${PYTHON_USEDEP}]
+	>=dev-python/pexpect-4.8.0[${PYTHON_USEDEP}]
+	>=dev-python/ptyprocess-0.7.0[${PYTHON_USEDEP}]
+	dev-python/pyparsing[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.8.2[${PYTHON_USEDEP}]
+	>=dev-python/python-dotenv-0.21.0[${PYTHON_USEDEP}]
+	>=dev-python/virtualenv-20.0.35[${PYTHON_USEDEP}]
+	dev-python/virtualenv-clone[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.26.0[${PYTHON_USEDEP}]
+	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
+	dev-python/tomlkit[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	${RDEPEND}
+	test? (
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+# IMPORTANT: The following sed command patches the vendor direcotry
+# in the pipenv source. Attempts to simply bump the version of the
+# package without checking that it works is likely to fail
+# The vendored packages should eventually all be removed
+# see: https://bugs.gentoo.org/717666
+src_prepare() {
+	local pkgName
+	local jobs=$(makeopts_jobs)
+	local packages=( attr attrs cerberus click colorama dotenv markupsafe \
+					 pexpect ptyprocess pyparsing requests urllib3 tomlkit )
+	for pkgName in ${packages[@]}; do
+		find ./ -type f -print0 | \
+			xargs --max-procs="${jobs}" --null \
+			sed --in-place \
+				-e "s/from pipenv.vendor import ${pkgName}/import ${pkgName}/g" \
+				-e "s/from pipenv.vendor.${pkgName}\(.*\) import \(\w*\)/from ${pkgName}\1 import \2/g"\
+				-e "s/import pipenv.vendor.${pkgName} as ${pkgName}/import ${pkgName}/g" \
+				-e "s/from .vendor import ${pkgName}/import ${pkgName}/g" || die "Failed to sed for ${pkgName}"
+	done
+
+	distutils-r1_src_prepare
+
+	# remove vendored versions
+	for pkgName in ${packages[@]}; do
+		find  ./pipenv/vendor -regextype posix-extended -regex ".*${pkgName}$" -prune -exec rm -rvf {} + || die
+		# package names can be foo-bar, their module will be however foo_bar
+		find  ./pipenv/vendor -regextype posix-extended -regex ".*${pkgName/_/-}" -prune -exec rm -rvf {} + || die
+	done
+
+	find  ./pipenv/vendor -regextype posix-extended -regex '.*cached[_-]property.*' -prune -exec rm -rvf {} + || die
+
+	find ./ -type f -print0 | \
+		xargs --max-procs="${jobs}" --null \
+		sed --in-place \
+			-e "s/from pipenv\.vendor import plette, toml, tomlkit, vistir/from pipenv\.vendor import plette, toml, vistir\\nimport tomlkit/g"
+
+	# remove tomlkit from vendoring
+	for fname in pipenv/utils/toml.py tests/integration/conftest.py; do
+		sed --in-place -e "s/from pipenv\.vendor import toml, tomlkit/from pipenv\.vendor import toml\\nimport tomlkit/g" $fname || die "Failed sed in $fname"
+	done
+	#for fname in "tests/unit/test_vendor.py "; do
+	#	sed --in-place -e "s/from pipenv\.vendor import tomlkit/import tomlkit/g" $fname || die "Failed sed in tomlkit"
+	#done
+	# remove python ruaml yaml
+	sed --in-place -e "s/from pipenv\.vendor\.ruamel\.yaml import YAML/from ruaml\.yaml import YAML/g" pipenv/patched/safety/util.py || die "Failed sed in ruaml-yaml"
+	sed --in-place -e "s/from pipenv\.vendor\.ruamel\.yaml\.error import MarkedYAMLError/from ruaml\.yaml\.error import MarkedYAMLError/g" pipenv/patched/safety/util.py || die "Failed sed in ruamel-yaml"
+
+	rm -vR pipenv/vendor/ruamel || die "Failed removing ruamel-yaml from vendor"
+
+	for fname in Makefile README.md README.rst ruamel.*.LICENSE vendor.txt; do
+		rm -v pipenv/vendor/$fname || die "Failed removing pipenv/vendor/$fname"
+	done
+
+}
+
+python_test() {
+	epytest -m "not cli and not needs_internet" tests/unit/
+}
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 6c7ae604bfc4..cc7db1287018 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/faraday-net_http/Manifest b/dev-ruby/faraday-net_http/Manifest
index a45afb869690..c658e4f76c20 100644
--- a/dev-ruby/faraday-net_http/Manifest
+++ b/dev-ruby/faraday-net_http/Manifest
@@ -4,7 +4,7 @@ DIST faraday-net_http-2.1.0.tar.gz 9061 BLAKE2B 00e461718f4a92ff424e28074aa62d79
 DIST faraday-net_http-3.0.0.tar.gz 8882 BLAKE2B b23f2457e37f365b33d5eeb25967f38de323258f5bd8d1a0cb46f9264a51f1924aad1fe5d03798a66538ca6c1195097af4c1fa4ca1e188da85aa415c8644b007 SHA512 58308721819dc57813cf50cb4eee2d5dee5c83c1f5037a81d17ad7a9e225bc7449249c73dc419b4fc563a8d7754fbd287284df16e3d440a807ce8d24732f4715
 DIST faraday-net_http-3.0.1.tar.gz 8908 BLAKE2B e53e98f49c79aa5ac9bbe1499dd45653ad4c9026dc2ee3628676749d537b3b5f78be826f40deeeddb377b72fbb4c8e82f735d714c93090c63d9aca63d601eb6b SHA512 a1f954f27710e92640a71fb5e5a4ddc5967791fc42763248bdef59311377829a223bb61be7007e5faa32c2dd3e5f72e9cbca06c54dc5e23d99cc7fd01fee7a5c
 DIST faraday-net_http-3.0.2.tar.gz 8897 BLAKE2B bd69eb01e74ab00c3d14efe7cf3c74efaeb17c7a03c61916c040a79ea152c4adddb010b0767dc6eecaed072e905c5d4ec540c26abbb1d390123538c38555ea22 SHA512 e01d22c243f175f88f1a559d9c200047a28fa118225b3ad616ae0ed3e5207b6f6dd0337f8520e1b023deef18e3b1654ad84e43267971d634ba9d8e88b44627fa
-EBUILD faraday-net_http-1.0.1.ebuild 722 BLAKE2B b2909a8f5323ab6da0980f80b31c684dfd4f3c97909fc640aae69b94b9f228ead1aeb02ec7ad56e449bff89dfbd857fbc8b96d3380bdb4044104a7b653c1ea6b SHA512 71cc0cf4ab3237bb23dd623b8fb869ba2b89ab9815e12520e69d098994d4387cfce01c6d7ba10a584b3b95b402596d584b096c7b0f63112829f1004dcd41303f
+EBUILD faraday-net_http-1.0.1.ebuild 722 BLAKE2B 5dc9dd412a8fed71c8e835a3a56a5c200fdbed56877bea030b559bccc7330677fad322102156334b066dc40d92ae9b25a578d10e7c73befd08fbc9916b960edc SHA512 34120ef92bf27c0e39b0966dcc8c61b6131bc38bde5a912efea0130f8ed18516ecc0c98f5558ac970c63773080fec7f36234456bd215fad9a4ee0210949639a4
 EBUILD faraday-net_http-2.0.3.ebuild 756 BLAKE2B f91ec9313ca7fa4d2b949562f50485bff51a774b6fbb218a106fa93211beb6f8df121f900870f3d23231c786a8c915656025a1a08a6f0f7614690c1f167af031 SHA512 685c8b4fa0e3f4d97e2d429c32ba34dcf0315a424ef45815ac023d8b2b6b69895ea54a0970194a8d261e8924325b01072e181da2a2d814e91771ac6eb117abc1
 EBUILD faraday-net_http-2.1.0.ebuild 749 BLAKE2B 6175531734ce76b64a20d487b46c49c97b524aab57140c56297cc842359202abcefc58db82e228d765307b75c1abf23e982239247931e4706197f1517423d06e SHA512 31c388ac1440043cc80639181b8df5b25a4eb9fd0a9d4b4a1ca44c79bb9f7832343d954cdfb55482ed003c1a3199ccae83e36292574562d1fd203db02f28fba6
 EBUILD faraday-net_http-3.0.0.ebuild 719 BLAKE2B cf29a56b9fa072c4162f6ab88e3e17e6b8b80fe932f1617978f39c8e3472447004c1e3326c5529bb09fdba5b8b9f550d6f8c9c7b2fce1219d5e4758ebefa7eb6 SHA512 464eac718395fb54fa91489934f6c76d573586b1ed87a4a24324f0b239733b259155764fab91b74c7a83fc44f27c582f862091325e75a56ec34155b9b6bba5e4
diff --git a/dev-ruby/faraday-net_http/faraday-net_http-1.0.1.ebuild b/dev-ruby/faraday-net_http/faraday-net_http-1.0.1.ebuild
index e03f6c63dc4d..5de7a758edf8 100644
--- a/dev-ruby/faraday-net_http/faraday-net_http-1.0.1.ebuild
+++ b/dev-ruby/faraday-net_http/faraday-net_http-1.0.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_BINWRAP=""
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
diff --git a/dev-ruby/faraday/Manifest b/dev-ruby/faraday/Manifest
index a4509742d9e6..1f0e85d01b5b 100644
--- a/dev-ruby/faraday/Manifest
+++ b/dev-ruby/faraday/Manifest
@@ -6,7 +6,7 @@ DIST faraday-2.5.2.tar.gz 830523 BLAKE2B 2d420b7799e92a1e918d01df20b28633947b303
 DIST faraday-2.6.0.tar.gz 830744 BLAKE2B 4ed5fa0fa4412dafe0c6ed20ef03393f8242f39fc60f269701ce6755b9d6b9fa60cbe477a623146fae2b1b0685fc86619b857c1f5bd6ce5e73df4a88846f55aa SHA512 cc80d7dfc6778ea184abc85476aba65fd2046dada4a88c6764a82841b561e84e4f44367191f2ec892d67fd7552e4444b922541cadd38d0ccfc609e90222fac90
 DIST faraday-2.7.2.tar.gz 831914 BLAKE2B 424d275519cd24f03b0a678810671de2541e799512789e0a3d80d146aafbc74e2acdbb3c9d3d1cfe7224860e9b716720b234fb25c045226f04b29223c640567d SHA512 41402bdb4594988a88542289c5a5242db04ae07081ba21fbc18b756eeae108bc06298b5ad7b48842a86c586b9da4e4568fc48ec9d26697618bd858649ef86294
 EBUILD faraday-0.17.3.ebuild 1530 BLAKE2B ed407c60c9138dc038c019689cdf9c2e620082c58c65f6cf08fc8bd9e2aeb728aa804e6545ec9a8059aa117968a61e9b8a300144e17636173318b6889173508a SHA512 2ca22991606aebaf97e281035ad9b1e166017a1cd2e29b43f363badac28cd4be2551bf6a1be0f38e76245f8a76c7e9fd44f8d79cc5f42922fd20190d8eb8719c
-EBUILD faraday-1.3.1.ebuild 2321 BLAKE2B a1de018619d7cc30103cb0f3b5c56976d4236c6e449744c33ac830814e3873eeae07fdedc460f6ac12f8b1f7321bd81f47ac8e8bd43694c1ece6c78b1dc3d304 SHA512 9196e0586b9322bf1e7ace8b4d065d83c9a53ecc34e01af62854a506d12a784e6bae2b00231d3e07b218542344221fec03196d826028f43df1aa0a81d6baed62
+EBUILD faraday-1.3.1.ebuild 2439 BLAKE2B e41538c7de42c191107c94bca876198576c6fd1a7c43af9bdb23cb7e2cf7b71d799d92ad33f786736b65a4f5ba7c88bd66021c2f70254259998819aed1b3ba45 SHA512 8af16340781f5627079e7861ff4fa38d5cc55b42d3ef73e65f1e4698322632d4e55df60745d3cddea64b5659a0460816059bb834ae58f7b13ad48df715b73e8a
 EBUILD faraday-2.3.0.ebuild 1704 BLAKE2B b48ba1480ec3823e9083e5bb81fb9077e3c1715ec41675ec28a0c1c35def80b85ac755e46c2ac95bb1697df38a5079659760e3194c0d280e52e6ec1b8cb5f282 SHA512 7e30e7633b0a81f029d8b6d4773a16b078211f9603e496b27e0bc548d0846652656ae60628c5dd9eaed067049ee113f79327e046e1cdc27957a35b4dd8e2b417
 EBUILD faraday-2.4.0.ebuild 1697 BLAKE2B c5aa4b06d15b2e2d01135c5a418122b6a18c450804b820a7b18c92863c8ce6ba5fc4a826e931d2a6f0c00b522aaa671ff7eb80825f7d9fcc4fc2c6d84fad9dc0 SHA512 ead14304c73bee8e74201071e82d427df19da1a18d7e67ff4c96bc8cdd13969ea1ed639a4437c3a53986fb79a2364df5a3f5453d8d0ec3eac89880ccb77741f8
 EBUILD faraday-2.5.2.ebuild 1736 BLAKE2B 7f4eb4c6f3b93f1ed8c9a334bbe075e4099085097ea123468e00e6476b8c88ae99b4e822cdc5f988e1dd45bcc6165bf3e8d2862c1c5fc2aac4d4141c392dd4de SHA512 b0ce350645756f6023fe6e8333cbf6c669ca962051fe218989c791888d7c300f9645699223e20079860e2724a973b26a51e44b931cff2da8868b19c902a66b3d
diff --git a/dev-ruby/faraday/faraday-1.3.1.ebuild b/dev-ruby/faraday/faraday-1.3.1.ebuild
index 40acec1e6c73..b746494a194f 100644
--- a/dev-ruby/faraday/faraday-1.3.1.ebuild
+++ b/dev-ruby/faraday/faraday-1.3.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_RECIPE_DOC="none"
@@ -34,7 +34,11 @@ ruby_add_rdepend "
 ruby_add_bdepend "test? (
 		>=dev-ruby/test-unit-2.4
 		>=dev-ruby/connection_pool-2.2.2
+		>=dev-ruby/httpclient-2.2
+		>=dev-ruby/net-http-persistent-3.0
+		>=dev-ruby/patron-0.4.2
 		dev-ruby/rack
+		>=dev-ruby/rack-test-0.6
 		dev-ruby/webmock
 	)"
 
diff --git a/dev-ruby/httpclient/Manifest b/dev-ruby/httpclient/Manifest
index c1eb8736eca8..17d56f5f4e02 100644
--- a/dev-ruby/httpclient/Manifest
+++ b/dev-ruby/httpclient/Manifest
@@ -1,3 +1,3 @@
 DIST httpclient-2.8.3.tgz 464624 BLAKE2B ce8ed523a24acce219027a4f1985caf2b4dae29bdba038ca2397e5f4d4b36c90b35cedfb62faa7faf426c3ce8589906df7832968c81b64bc9100eff6f4fe9745 SHA512 b65b5adb97af069d7ff6b6f4cccd6a42c6d9c88b797e9495768fe1f36a6bd93defe50190edc201de5e39c4e306ba0bd17a8ff2f8eba4d636dacafa06c172967d
-EBUILD httpclient-2.8.3-r2.ebuild 2755 BLAKE2B 9c72f8b951f5943b721777da20b42cc728e721852d7eae5a482efd781070fad94f96407e0ef6f6cc749d0ac0de448a07fa5204945be9f43d76a3777f445c760e SHA512 c6452eab52c2fdb742376d673b7e0bef788de201ccf0a564bb06af89065d8be103ae76fcc2f2a0267392cb768a10f8671077ebe5115efc4a7cb70f6189976c1b
+EBUILD httpclient-2.8.3-r2.ebuild 2755 BLAKE2B a70e78ab3b898d37e409da1d247c98a6ec7f881375ee52cbc7e4b282d1bfff6e2f264a19d17118c26f54d9c396edc7c20748e0e6a8b4a44a5b758901f070c418 SHA512 6bc53f061a41e7e84828249597ad03b5a1d1a44865c305fc270cdb6c6bf237fda19fbacddfb2fcc2bdc1c2ec4fdb5b04d2ee7143345c8f4f69a250172970b687
 MISC metadata.xml 342 BLAKE2B 357371edae972dc4bf17bef8a0ddf752bd81a3936a4ba6cc83ec7a253346e3d236bb0930fc71f14c1c42a486f3202bcd08352260aef38676f57b31f852dcca27 SHA512 3c3e6861463a129c5679658a044b956f1d8a4ad086c5fc77029037ad88b391af06cfbe26127127ae0b909d602c9a3b02929c48d7a26059ebd29e06c394d7b4c4
diff --git a/dev-ruby/httpclient/httpclient-2.8.3-r2.ebuild b/dev-ruby/httpclient/httpclient-2.8.3-r2.ebuild
index 326a6f7bf631..cdaf7ad53a14 100644
--- a/dev-ruby/httpclient/httpclient-2.8.3-r2.ebuild
+++ b/dev-ruby/httpclient/httpclient-2.8.3-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_TASK_TEST="-Ilib test"
 RUBY_FAKEGEM_TASK_DOC="doc"
diff --git a/dev-ruby/patron/Manifest b/dev-ruby/patron/Manifest
index 1f153e719dce..05fa5f38f969 100644
--- a/dev-ruby/patron/Manifest
+++ b/dev-ruby/patron/Manifest
@@ -1,3 +1,3 @@
 DIST patron-0.13.3.gem 65024 BLAKE2B 87aa69aab49978d14a80ed9e09d74d7853da3512875cc3aecd3f387d1523b85c84625b57a5826e5f5f999cec4feaae58c1aaae96582144a5c9dc537c9d5a4224 SHA512 afbbbd9570e338a5d1b97b4ebeda76ac95a22c29d908629723d345a47400183c2ccee67ebcaf5b6f9ecb032eb3b847e70ec9eebff75b33045a3665c215abfbd0
-EBUILD patron-0.13.3-r1.ebuild 1085 BLAKE2B bc276e5e41c03c9869b28993c92af4ec0e73b00175facb8bd8b6321c3c5e26d018721eb457ccb6d25bdc0c24e32fec7a45d0b6001b60b91039d6978d75e2726e SHA512 030d7dea9c8211b05149f7442026be9e56509ac85256462d2da741b79f3f7dd95201cf1cd0baedcef18e994485c87db3704b433792a99b9a1999c1ff3bd52e75
+EBUILD patron-0.13.3-r1.ebuild 1085 BLAKE2B 0463190284dad6f1822d75e25c733305b2ff6a5d37ca60d79f33016918a998e50e7bbf3119196f2ec4e6ea1cc51e4b8b23d92b2ad5e695880e04fcbfcc6c31a2 SHA512 977ca1721102ab4481e30b17ee4034d423e54b95dd7a76b698741deae239933edb5e1a68d3d1b2247b35358449d961957de21188b3938a02e701668d9e9b8c03
 MISC metadata.xml 248 BLAKE2B 0c876bde3c72e61d28284a95a837103e6d594c9f6fccbd6d7d1039f9c5a604347c20c334c9a57d80b152888fed536196f2807b477e8d0336c80affb0e28c9dc9 SHA512 b2b64178cf6cbbaa5fb4671ffe1ab88b83c920de363ae099ef74fa3e5eb8c8f0285c749cabc0cebf344951503d1b7309ae294afe9e7cf5172700182d8843fa14
diff --git a/dev-ruby/patron/patron-0.13.3-r1.ebuild b/dev-ruby/patron/patron-0.13.3-r1.ebuild
index c9c2afa0dd53..6bebd371fe1c 100644
--- a/dev-ruby/patron/patron-0.13.3-r1.ebuild
+++ b/dev-ruby/patron/patron-0.13.3-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_EXTRADOC="README.md"
diff --git a/dev-ruby/tilt/Manifest b/dev-ruby/tilt/Manifest
index 79ec56f8462f..a91f6408ee7c 100644
--- a/dev-ruby/tilt/Manifest
+++ b/dev-ruby/tilt/Manifest
@@ -1,4 +1,3 @@
-AUX tilt-2.0.10-ruby30.patch 1482 BLAKE2B 00647a8d443e9800bc9aa7e28d91b9f0ed59ad5e0802ae14b3b545d695181774bcd909ff459832b5e99316f39b9d548ee002fb23de6fcbf394ea73521519b85d SHA512 0f261a9d02e562326902433f10f1ea58a652c2f122d8d90ab2b74259b1d6bd551854802b5f19c07fc2998a45d82133fe3cc029012103e614faf22bd6fc766047
 DIST tilt-2.0.10.tar.gz 51446 BLAKE2B de5c12dcf22994f182ae163a82c3060f1d0d8b4bc2a4495f28c9befc954b4949b9d2ae6aed42e3a9c35fb68825844881d9f15b2b68d949236e5396083ff199a3 SHA512 4a36c55347e307ea0c842aad3da72cebe98bcf8a0421040cfce7a43540d1746e736ce92b7ce7492a5cfc184372842c3ac7a006f3650b4c9420d5825ec005b4ef
 DIST tilt-2.0.11.tar.gz 53041 BLAKE2B 2509cc3efe5e6302c8943c00108eeda6ee4b23a18952ad23049e11ea28b397b80a21d34c4d241119f45cedf2a978a2673d857a6cc32d7e26a2016caa510458f9 SHA512 e28e31ab92aa42eada34e0f6c05dab6a54945d07b649588356b1635ba8a36700f6e537e8702613883693501442d21690d8b3690b06f7b9f331192134511b78b7
 EBUILD tilt-2.0.10.ebuild 1603 BLAKE2B c046401f51f7a87aeff75991d0ddbbb6c402a1cc8dee8d867ac44922ddb72791e673d296353e5eeb5f52860230d10c2eceab6e056d29f85f7df7e78c3b355a31 SHA512 9c4f2a2c43b29c76e9ed970f44be4b6b8c5b4c96ab5b34e17dfcedad416d4487efa9a6ebab332bde09b1aea5870e4bf3ac1752505838ceb506d1a464b0f16531
diff --git a/dev-ruby/tilt/files/tilt-2.0.10-ruby30.patch b/dev-ruby/tilt/files/tilt-2.0.10-ruby30.patch
deleted file mode 100644
index 27e4d821f64f..000000000000
--- a/dev-ruby/tilt/files/tilt-2.0.10-ruby30.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 91838d57aa35ba5341368ead0d442e1dc1eb8730 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>
-Date: Mon, 18 Jan 2021 12:49:31 +0100
-Subject: [PATCH] Fix Ruby 3.0 compatibility.
-
-This fixes issues such as:
-
-~~~
-  1) Error:
-CSVTemplateTest#test_compiles_and_evaluates_the_template_on_render:
-TypeError: no implicit conversion of Hash into String
-    /usr/share/ruby/csv.rb:1273:in `initialize'
-    /usr/share/ruby/csv.rb:1273:in `new'
-    /usr/share/ruby/csv.rb:1273:in `generate'
-    (__TEMPLATE__):in `__tilt_920'
-    /builddir/build/BUILD/tilt-2.0.10/usr/share/gems/gems/tilt-2.0.10/lib/tilt/template.rb:170:in `call'
-    /builddir/build/BUILD/tilt-2.0.10/usr/share/gems/gems/tilt-2.0.10/lib/tilt/template.rb:170:in `evaluate'
-    /builddir/build/BUILD/tilt-2.0.10/usr/share/gems/gems/tilt-2.0.10/lib/tilt/template.rb:109:in `render'
-    /builddir/build/BUILD/tilt-2.0.10/usr/share/gems/gems/tilt-2.0.10/test/tilt_csv_test.rb:15:in `block in <class:CSVTemplateTest>'
-~~~
----
- lib/tilt/csv.rb | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/tilt/csv.rb b/lib/tilt/csv.rb
-index fd0e602..7dfa220 100644
---- a/lib/tilt/csv.rb
-+++ b/lib/tilt/csv.rb
-@@ -50,7 +50,7 @@ def prepare
- 
-     def precompiled_template(locals)
-       <<-RUBY
--        #{@outvar} = #{self.class.engine}.generate(#{options}) do |csv|
-+        #{@outvar} = #{self.class.engine}.generate(**#{options}) do |csv|
-           #{data}
-         end
-       RUBY
diff --git a/dev-ruby/typhoeus/Manifest b/dev-ruby/typhoeus/Manifest
index 8abda0644c0b..24c4e3c40daa 100644
--- a/dev-ruby/typhoeus/Manifest
+++ b/dev-ruby/typhoeus/Manifest
@@ -1,4 +1,5 @@
 DIST typhoeus-1.4.0.gem 56832 BLAKE2B 1f188a2c174a9d0e2cc0afc10f96d98a8c78278c1fa53eeb88da6f4f3986c8e204171a9bb817c95a217360346bda319711e7c89095ad48e878cbc3efc21e9887 SHA512 f48a99fd554f4d06d37a0a804ee79dd8423d9bff765394537ab0edba615e132d25660a6eb455e8628f59bd56c7ea26f4a195827d5287a53e58e3aeb394477284
-EBUILD typhoeus-1.4.0-r1.ebuild 979 BLAKE2B 6765e8a956d27f75a0df6898192a5a2fefb1fdac08bb18055eb062afaf4586012e3242b77efdccb64474d81a48c4839eafdab957cfe72ab4550ac29ece4cd311 SHA512 7a0d81b86b9920648b0439f6d80bfd548bc71a9fd3138d7cf766ae461713644b755acaa74ab966f82cdd503aa9b3087b8d6c2ef6fce682e20bd42457f27cecd0
+EBUILD typhoeus-1.4.0-r1.ebuild 1069 BLAKE2B cd1d178dfd623c6a8c1d9099f1d67af4560bc838c993021b016bc48fef5dd1e5ad02c91e07a92215818c2a8eca4d3957d926bb6fe30e15fcb2cc2b676fcbd842 SHA512 69d5663fbf3240a675c125c182b003db3b829e45f7d5adf25f0bc9c51a1c7d20e61ac1ca9fd265ba2f16bebbbb486c39430804ac607c896bc85eb2678603a8b1
+EBUILD typhoeus-1.4.0-r2.ebuild 1069 BLAKE2B cd1d178dfd623c6a8c1d9099f1d67af4560bc838c993021b016bc48fef5dd1e5ad02c91e07a92215818c2a8eca4d3957d926bb6fe30e15fcb2cc2b676fcbd842 SHA512 69d5663fbf3240a675c125c182b003db3b829e45f7d5adf25f0bc9c51a1c7d20e61ac1ca9fd265ba2f16bebbbb486c39430804ac607c896bc85eb2678603a8b1
 EBUILD typhoeus-1.4.0.ebuild 785 BLAKE2B 06daf3edc28829c0632dc1c7d484f1b3e392d0fde48d3a710e436f05700ca4c044a5e2216bba38fe1d902cf82e7e2d6a0b1451c8830895ec57ddc6171acb94f8 SHA512 3db6ee3d082abb2a452a7f311786f9f237c92460f0322c859c51552d85bc8606c7bb37d2ff04c96f5fda7d2afe50f11267b3eb1edd2ab01223aa785483c7dc98
 MISC metadata.xml 384 BLAKE2B f9b2404ac92e77233601283e52811ee504d139320b17232b7ea47a43d34cfde7234f4168607c7410f87c19d738a1af7a1447a03b042c62334d0bad2908d806c6 SHA512 3a27d3081fb9b59170213edd8fe3af51fd204fca382c72b074fdbfe7b94ba3ca5d08bca123ed4acefe0f8b6763fdeeb89ef505350ca238f8a8f19b20eab0b71c
diff --git a/dev-ruby/typhoeus/typhoeus-1.4.0-r1.ebuild b/dev-ruby/typhoeus/typhoeus-1.4.0-r1.ebuild
index 6dc99f1ce694..ffaf7dcb9362 100644
--- a/dev-ruby/typhoeus/typhoeus-1.4.0-r1.ebuild
+++ b/dev-ruby/typhoeus/typhoeus-1.4.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-USE_RUBY="ruby27 ruby30"
+USE_RUBY="ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md UPGRADE.md"
 RUBY_FAKEGEM_TASK_DOC=""
@@ -21,9 +21,11 @@ SLOT="1"
 KEYWORDS="~amd64"
 IUSE=""
 
-ruby_add_rdepend ">=dev-ruby/ethon-0.9.0"
+# Tests fail with ethon-0.16.0
+# https://github.com/typhoeus/typhoeus/issues/710
+ruby_add_rdepend "<dev-ruby/ethon-0.16.0"
 
-ruby_add_bdepend "test? ( dev-ruby/json || ( dev-ruby/faraday:1 >=dev-ruby/faraday-0.9 ) >=dev-ruby/sinatra-1.3 >=dev-ruby/redis-3.0 >=dev-ruby/dalli-2.7.9 )"
+ruby_add_bdepend "test? ( dev-ruby/json || ( dev-ruby/faraday:1 >=dev-ruby/faraday-0.9:0 ) >=dev-ruby/sinatra-1.3 >=dev-ruby/redis-3.0 >=dev-ruby/dalli-2.7.9 )"
 
 all_ruby_prepare() {
 	sed -e '/bundler/I s:^:#:' -i Rakefile spec/spec_helper.rb || die
diff --git a/dev-ruby/typhoeus/typhoeus-1.4.0-r2.ebuild b/dev-ruby/typhoeus/typhoeus-1.4.0-r2.ebuild
new file mode 100644
index 000000000000..ffaf7dcb9362
--- /dev/null
+++ b/dev-ruby/typhoeus/typhoeus-1.4.0-r2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby27 ruby30 ruby31"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md UPGRADE.md"
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Runs HTTP requests in parallel while cleanly encapsulating handling logic"
+HOMEPAGE="https://rubygems.org/gems/typhoeus/
+	https://github.com/typhoeus/typhoeus"
+
+LICENSE="MIT"
+SLOT="1"
+KEYWORDS="~amd64"
+IUSE=""
+
+# Tests fail with ethon-0.16.0
+# https://github.com/typhoeus/typhoeus/issues/710
+ruby_add_rdepend "<dev-ruby/ethon-0.16.0"
+
+ruby_add_bdepend "test? ( dev-ruby/json || ( dev-ruby/faraday:1 >=dev-ruby/faraday-0.9:0 ) >=dev-ruby/sinatra-1.3 >=dev-ruby/redis-3.0 >=dev-ruby/dalli-2.7.9 )"
+
+all_ruby_prepare() {
+	sed -e '/bundler/I s:^:#:' -i Rakefile spec/spec_helper.rb || die
+	sed -i -e '3igem "faraday", "<2"; require "timeout"' spec/spec_helper.rb || die
+	sed -i -e '/Rack::Handler::WEBrick/ s/options/\*\*options/' spec/support/localhost_server.rb || die
+}
diff --git a/dev-ruby/virtus/Manifest b/dev-ruby/virtus/Manifest
index 8d06bb23fd99..036eac873e6b 100644
--- a/dev-ruby/virtus/Manifest
+++ b/dev-ruby/virtus/Manifest
@@ -1,4 +1,3 @@
-AUX virtus-1.0.5-equalizer.patch 8422 BLAKE2B 939c71ea56a77c1a654e7baf11e0f2ee40b044ad0dde0c1689a0e8c50789b6adf2f8586467f662c3d20e2a9643cda21ff9af865ee19c40ccc3e48069d43e1932 SHA512 70db78b928e1dc23df126bdd081db2664dcf75379e92d3480ad0dad951df9a91d0feaa40de570a6116a71708342d891c073b07395180d85cad50e9e3dd509020
 DIST virtus-2.0.0.gem 50176 BLAKE2B 16a8977b782691faa48e239354c8d25d63e350bcc0e8499691586021817d462e7575eb9d6c6911c371e00a711bc404f2be6dae2168d167fc683049fb14c798f6 SHA512 17f1a0b13ca0912d0a245886b7d8c1b0bcb9f08c1ac3c89d8e5de234e6afa3989c4f15b555342827ab3f8a5570e888bfee893aff851189b1769fb34fb3f1a64a
 EBUILD virtus-2.0.0.ebuild 975 BLAKE2B 3ca7f5e7b2652399352425cd177740f03e53a0325af9ea17e71c02356dff8173b023f424bc7b16ae83cb1ddb333896ff3712cea7ebbe48768df97d7eee085459 SHA512 7ad23b52a30c87470378e03640f8b860e70837883fed915d76ca93b54a6613fdb9e4c11905d6bd4c2ba87deb490163330db600e0de7b705f618aa118a4f74e23
 MISC metadata.xml 390 BLAKE2B 643e41d32d7266a1db20e8e955cb60dff232b41f720d810c0a0a2b7f9ea78f70519de33b38770b0ca8982da6ab19718dc5f8796ef68ee82c51195bffb2c5b3e4 SHA512 88175c18f159270520bf9fcad6a4295ad5bce8e567996af2fc91c1ed9b4dd0f0953bd61f36d3a331eef079346df51b9ed88208e90a9d8aef1086172c8cb909ec
diff --git a/dev-ruby/virtus/files/virtus-1.0.5-equalizer.patch b/dev-ruby/virtus/files/virtus-1.0.5-equalizer.patch
deleted file mode 100644
index 22fc19298505..000000000000
--- a/dev-ruby/virtus/files/virtus-1.0.5-equalizer.patch
+++ /dev/null
@@ -1,208 +0,0 @@
-From 5f33f8147fc9d84e69a33758b000486ebe42c8ae Mon Sep 17 00:00:00 2001
-From: Sergey Novik <konnigun@gmail.com>
-Date: Sun, 19 Jul 2015 18:11:07 +0300
-Subject: [PATCH 1/3] Add specs for attributes comparison (based on latest
- Equalizer gem working version)
-
----
- spec/unit/virtus/attribute/comparison_spec.rb | 23 +++++++++++++++++++++++
- 1 file changed, 23 insertions(+)
- create mode 100644 spec/unit/virtus/attribute/comparison_spec.rb
-
-diff --git a/spec/unit/virtus/attribute/comparison_spec.rb b/spec/unit/virtus/attribute/comparison_spec.rb
-new file mode 100644
-index 0000000..0b51a9c
---- /dev/null
-+++ b/spec/unit/virtus/attribute/comparison_spec.rb
-@@ -0,0 +1,23 @@
-+require 'spec_helper'
-+
-+describe Virtus::Attribute, '#== (defined by including Virtus::Equalizer)' do
-+  let(:attribute) { described_class.build(String, :name => :name) }
-+
-+  # Currently that's the way it works and it happens because default_value objects
-+  # don't have equalizer, resulting in  attributes object mismatch.
-+  # This behavior (and a spec) will need a change in future.
-+  it 'returns false when attributes have same type and options' do
-+    equal_attribute = described_class.build(String, :name => :name)
-+    expect(attribute == equal_attribute).to be_falsey
-+  end
-+
-+  it 'returns false when attributes have different type' do
-+    different_attribute = described_class.build(Integer, :name => :name)
-+    expect(attribute == different_attribute).to be_falsey
-+  end
-+
-+  it 'returns false when attributes have different options' do
-+    different_attribute = described_class.build(Integer, :name => :name_two)
-+    expect(attribute == different_attribute).to be_falsey
-+  end
-+end
-
-From 3748f6eb2cf368d6a78fb1ef50c2724648d96a9b Mon Sep 17 00:00:00 2001
-From: Sergey Novik <konnigun@gmail.com>
-Date: Sun, 19 Jul 2015 18:11:24 +0300
-Subject: [PATCH 2/3] Use Virtus::Equalizer instead of Equalizer gem in
- Virtus#Attribute (behavior preserved)
-
----
- lib/virtus/attribute.rb | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/virtus/attribute.rb b/lib/virtus/attribute.rb
-index 999a2ef..0654d4d 100644
---- a/lib/virtus/attribute.rb
-+++ b/lib/virtus/attribute.rb
-@@ -18,7 +18,7 @@ module Virtus
-   class Attribute
-     extend DescendantsTracker, Options, TypeLookup
- 
--    include ::Equalizer.new(:type, :options)
-+    include Equalizer.new(inspect) << :type << :options
- 
-     accept_options :primitive, :accessor, :default, :lazy, :strict, :required, :finalize, :nullify_blank
- 
-
-From ef57af319334a1d4f3e0860acbde7c6d6f0eb8ef Mon Sep 17 00:00:00 2001
-From: Sergey Novik <konnigun@gmail.com>
-Date: Sun, 19 Jul 2015 18:26:50 +0300
-Subject: [PATCH 3/3] Change behavior of Attribute#== method
-
-By changing Coercer#== and DefaultValue#== methods, we allow
-Attribute#== to actually compare objects now (before, every comparison
-would return `false` because of different instances of DefaultValue
-model in options[:default_value] key.
----
- lib/virtus/attribute/default_value.rb              |  2 ++
- lib/virtus/coercer.rb                              |  1 +
- spec/unit/virtus/attribute/comparison_spec.rb      |  7 ++-----
- spec/unit/virtus/attribute_set/append_spec.rb      |  8 ++++----
- spec/unit/virtus/attribute_set/element_set_spec.rb | 22 +++++++++++++++-------
- spec/unit/virtus/attribute_set/merge_spec.rb       |  8 +++++---
- 6 files changed, 29 insertions(+), 19 deletions(-)
-
-diff --git a/lib/virtus/attribute/default_value.rb b/lib/virtus/attribute/default_value.rb
-index a2fcd31..eca7350 100644
---- a/lib/virtus/attribute/default_value.rb
-+++ b/lib/virtus/attribute/default_value.rb
-@@ -7,6 +7,8 @@ class Attribute
-     class DefaultValue
-       extend DescendantsTracker
- 
-+      include Equalizer.new(inspect) << :value
-+
-       # Builds a default value instance
-       #
-       # @return [Virtus::Attribute::DefaultValue]
-diff --git a/lib/virtus/coercer.rb b/lib/virtus/coercer.rb
-index a06e273..676d553 100644
---- a/lib/virtus/coercer.rb
-+++ b/lib/virtus/coercer.rb
-@@ -3,6 +3,7 @@ module Virtus
-   # Abstract coercer class
-   #
-   class Coercer
-+    include Equalizer.new(inspect) << :primitive << :type
- 
-     # @api private
-     attr_reader :primitive, :type
-diff --git a/spec/unit/virtus/attribute/comparison_spec.rb b/spec/unit/virtus/attribute/comparison_spec.rb
-index 0b51a9c..796cd20 100644
---- a/spec/unit/virtus/attribute/comparison_spec.rb
-+++ b/spec/unit/virtus/attribute/comparison_spec.rb
-@@ -3,12 +3,9 @@
- describe Virtus::Attribute, '#== (defined by including Virtus::Equalizer)' do
-   let(:attribute) { described_class.build(String, :name => :name) }
- 
--  # Currently that's the way it works and it happens because default_value objects
--  # don't have equalizer, resulting in  attributes object mismatch.
--  # This behavior (and a spec) will need a change in future.
--  it 'returns false when attributes have same type and options' do
-+  it 'returns true when attributes have same type and options' do
-     equal_attribute = described_class.build(String, :name => :name)
--    expect(attribute == equal_attribute).to be_falsey
-+    expect(attribute == equal_attribute).to be_truthy
-   end
- 
-   it 'returns false when attributes have different type' do
-diff --git a/spec/unit/virtus/attribute_set/append_spec.rb b/spec/unit/virtus/attribute_set/append_spec.rb
-index 7fbb20a..577b07e 100644
---- a/spec/unit/virtus/attribute_set/append_spec.rb
-+++ b/spec/unit/virtus/attribute_set/append_spec.rb
-@@ -38,10 +38,10 @@
- 
-     it { is_expected.to equal(object) }
- 
--    it 'replaces the original attribute' do
--      expect { subject }.to change { object.to_a }.
--        from(attributes).
--        to([ attribute ])
-+    it "replaces the original attribute object" do
-+      expect { subject }.to change { object.to_a.map(&:__id__) }.
-+      from(attributes.map(&:__id__)).
-+      to([attribute.__id__])
-     end
-   end
- end
-diff --git a/spec/unit/virtus/attribute_set/element_set_spec.rb b/spec/unit/virtus/attribute_set/element_set_spec.rb
-index 5db7e41..8d9c638 100644
---- a/spec/unit/virtus/attribute_set/element_set_spec.rb
-+++ b/spec/unit/virtus/attribute_set/element_set_spec.rb
-@@ -37,20 +37,28 @@
- 
-     it { is_expected.to equal(attribute) }
- 
--    it 'replaces the original attribute' do
--      expect { subject }.to change { object.to_a }.from(attributes).to([ attribute ])
-+    it "replaces the original attribute object" do
-+      expect { subject }.to change { object.to_a.map(&:__id__) }.
-+      from(attributes.map(&:__id__)).
-+      to([attribute.__id__])
-     end
- 
--    it 'allows #[] to access the attribute with a symbol' do
--      expect { subject }.to change { object['name'] }.from(original).to(attribute)
-+    it 'allows #[] to access the attribute with a string' do
-+      expect { subject }.to change { object['name'].__id__ }.
-+      from(original.__id__).
-+      to(attribute.__id__)
-     end
- 
--    it 'allows #[] to access the attribute with a string' do
--      expect { subject }.to change { object[:name] }.from(original).to(attribute)
-+    it 'allows #[] to access the attribute with a symbol' do
-+      expect { subject }.to change { object[:name].__id__ }.
-+      from(original.__id__).
-+      to(attribute.__id__)
-     end
- 
-     it 'allows #reset to track overridden attributes' do
--      expect { subject }.to change { object.reset.to_a }.from(attributes).to([ attribute ])
-+      expect { subject }.to change { object.reset.to_a.map(&:__id__) }.
-+      from(attributes.map(&:__id__)).
-+      to([attribute.__id__])
-     end
-   end
- end
-diff --git a/spec/unit/virtus/attribute_set/merge_spec.rb b/spec/unit/virtus/attribute_set/merge_spec.rb
-index 72dc39c..9981ece 100644
---- a/spec/unit/virtus/attribute_set/merge_spec.rb
-+++ b/spec/unit/virtus/attribute_set/merge_spec.rb
-@@ -21,12 +21,14 @@
- 
-   context 'with a duplicate attribute' do
-     let(:attributes) { [Virtus::Attribute.build(String, :name => name)] }
--    let(:attribute)  { Virtus::Attribute.build(String, :name => name) }
-+    let(:attribute)  {  Virtus::Attribute.build(String, :name => name) }
- 
-     it { is_expected.to equal(object) }
- 
--    it 'replaces the original attribute' do
--      expect { subject }.to change { object.to_a }.from(attributes).to([attribute])
-+    it "replaces the original attribute object" do
-+      expect { subject }.to change { object.to_a.map(&:__id__) }.
-+      from(attributes.map(&:__id__)).
-+      to([attribute.__id__])
-     end
-   end
- end
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index c9e150aabf92..30a5344f0cf2 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/fq/Manifest b/dev-util/fq/Manifest
index d82ecb79e801..7f02dfb5bbdc 100644
--- a/dev-util/fq/Manifest
+++ b/dev-util/fq/Manifest
@@ -1,4 +1,7 @@
 DIST fq-0.1.0-deps.tar.xz 23497408 BLAKE2B 2ea9edad64f5d077026db99b6d981a443a7c5f5501b4525311512100fb68674bfd9f884908af845a007579d45b5e199bbaf8139a5ed0cee764167459bc62072f SHA512 0b028de7c909077253309d6f16d7bb036b67fb9db6716327d6fe403e7e491f1a56547f91159302e19a8bb578ffdcd74bcb1eab80f1ed65be9f11b4c35fbaf0d9
 DIST fq-0.1.0.tar.gz 8549022 BLAKE2B e4a7d8240f6f9adadab95d66b79747417290d24b53dc1b07c9f2cd526ef86f93f932ba15072cef050d9e3da2f1212ee76da5265345d665796c109bb4b104f0f7 SHA512 3cc81962c9a31343109743f9de7b73939df9165d4d5dd4beff3790e85e435c0344fa44f59a66153d9235ed156e9bee0f93e63b36c492d337547c6cf1712132ed
+DIST fq-0.2.0-deps.tar.xz 23494148 BLAKE2B 59400200a814d08fac88d9bcedc5db0ea2ae5192a5a67b389fa62cbb6e82d8f4210e9153a14aa2e259143c68f67863865359e7636966419f47b00f9fb44394ca SHA512 fa8d3464976569c5bca810dcbce6492bce85173907366aeda3a290a467d027891a8edc889283a9185c5d7139d51f77a2fb9f08b5a452ebc9cd96994f7db8127e
+DIST fq-0.2.0.tar.gz 12762736 BLAKE2B 7f1496b1da231b804b7e3af40f252381e83c62ca5e4779af65a502e9dc6a15a0a5267af68b83569c996f726870234c03952711e8262f360b2061bf34df5b2e4e SHA512 faf88faf0121a837c32dfbfe4c9e05261f28c2eec50d981f7840937ad121e45b0fa6809f428c45c0b41c99d1ae12a667a81911943e0601f2d81922ac670e03fe
 EBUILD fq-0.1.0.ebuild 777 BLAKE2B 3e3550bd3c7dff2c99d7de5648679ca4b670eeee7cdbbfcbcd1ffb9ac4f023e13f4ab3c889901379ce971674210be8d72fde6461c7e2ce42c43524c3e5e407c6 SHA512 37362498b2b39e3193ce71773d899a79caa7002fdfa4391c266428f358a0825048b40853ac94ba6e59d212e63bf14e14abee9eccec7a0f02a16bd9ee7568d496
+EBUILD fq-0.2.0.ebuild 777 BLAKE2B 3e3550bd3c7dff2c99d7de5648679ca4b670eeee7cdbbfcbcd1ffb9ac4f023e13f4ab3c889901379ce971674210be8d72fde6461c7e2ce42c43524c3e5e407c6 SHA512 37362498b2b39e3193ce71773d899a79caa7002fdfa4391c266428f358a0825048b40853ac94ba6e59d212e63bf14e14abee9eccec7a0f02a16bd9ee7568d496
 MISC metadata.xml 313 BLAKE2B 49888cd21e49fca7d7913fbd265cbffd73dcfaa5080e09ccd1f5b9c62804e5b9fb1de1e21df96609079c18c481b2847897b4fe1a9fc499d0e6dc2559e677a27f SHA512 1d125e77b24aeffe27b0d54b8b9f247e1e2b62037bdb127f232d3089d63e1b92c2062e37446067850defc382d7e49785152e9af86cd46f44827e2e037dd291a7
diff --git a/dev-util/fq/fq-0.2.0.ebuild b/dev-util/fq/fq-0.2.0.ebuild
new file mode 100644
index 000000000000..ae862b026637
--- /dev/null
+++ b/dev-util/fq/fq-0.2.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module
+
+DESCRIPTION="Tool for working with binary data (jq for binary formats)"
+HOMEPAGE="https://github.com/wader/fq"
+SRC_URI="https://github.com/wader/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz"
+
+LICENSE="MIT BSD-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="test? ( dev-tcltk/expect )"
+
+src_prepare() {
+	default
+
+	# https://github.com/wader/fq/issues/494
+	sed -i -e '/test_repl.exp/d' Makefile || die
+}
+
+src_compile() {
+	# Avoid -s being set in Makefile (stripping)
+	export GO_BUILD_LDFLAGS="-w"
+
+	default
+}
+
+src_install() {
+	dobin fq
+}
diff --git a/dev-util/gn/Manifest b/dev-util/gn/Manifest
index 79e18a7213ef..d1218c80d053 100644
--- a/dev-util/gn/Manifest
+++ b/dev-util/gn/Manifest
@@ -2,5 +2,5 @@ AUX gn-gen-r5.patch 1563 BLAKE2B ff909ef01743ca36d866257ad3bc2a1ca7a4e894b6a0c76
 DIST gn-0.1943.tar.xz 706792 BLAKE2B 51889ad85e86e702c2690c5c23010d666ef0467be92d982e6dea2eec2e20774c04425900cad64672c7782bf36e62984e612c04ff0f1c7e9598f2877270cf8504 SHA512 4e3270e13e35fa0ede3c81b563b72a9e9baee18b6412d32603d3c7a327315ceea86dc28c9c3b01c9e9f4d520e222dfeabe152f946eb0947d9285359568934864
 DIST gn-0.2049.tar.xz 727960 BLAKE2B fe93d09c1fa5b6267a4d26f37ec42e629b36645ef58bf6ebcc07dd8cd2ee9509c1e997182251a3e2c3ef3c5b7d636c9a8228c1e49d1d7245b3ebdac36e7c5a1a SHA512 f3e6dc87d647702c5d22793e2eed3e9950f8c9a6d7178eae67bb7d6518b6533c74fa3f43245fb9e422994a27f1a0f1986709f91e7ce2ed78eb5f17838f75e1db
 EBUILD gn-0.1943.ebuild 1294 BLAKE2B 702eebb55f4f625f6cf649a865e6801bb541249fe4d8abfbb2b4254dfb6557e8321304664ffe144794454014a6854ade8f90bca903568cb9a3aa41ff07947469 SHA512 28eac75e4ecd6d4e2323ce1ec9161ee5d80e10b1706edd6931ab9c5169b8c68d7e33af3aa9c061cd1f2c9397e312e82ec079d43846f83da1c0132d32393610bc
-EBUILD gn-0.2049.ebuild 1317 BLAKE2B 7e4adbf768375fd074c2f9726508c7a1f3a3a6224779fa62cac181177d8ac5ce74481f61e240054ca5be3afc27c58c4716532a6b7e369bd8634dd785877e4ecf SHA512 3a7b83b36d0565f784602693c7d928311a417e5e8eb7a81ba2355cf96d3bd7f3a5f208ed5ac90c3924e2f2144635ad5f162c7f35407f17b0bed77986a9f329a1
+EBUILD gn-0.2049.ebuild 1316 BLAKE2B ce09cca8149fe9491f722fc5310422c35803ae9c2cdb5f66dbf02e89f2a1bb15a5da94131ab7501aec855104bae695da42b49f1b68b8df847b77ddaae8455396 SHA512 07e22d92fbfe6630c0bf73f6b03d18861f1711b070902e6e391be0dd46078f8eb4361bb4ad6fc01b06532f520fb564606e4c642b18d91da475a95640e23d6fb8
 MISC metadata.xml 221 BLAKE2B ce7615d8eda5f58e7729bf86156010821052ae580769c3be3922f1270f1211bc5cf297afc5c68db67a46c1c01450c08751fc3cda0995d62bbe60da64d21802d6 SHA512 6ffee27f859f923795e8ded3a5544a82473f72568e96475374b937adbf0963f81d46fbcf4752a9d4eef3f071cadd3dedf141f43802b58c6a788243c7f05114cf
diff --git a/dev-util/gn/gn-0.2049.ebuild b/dev-util/gn/gn-0.2049.ebuild
index 82a67ce036a8..0e95bb118708 100644
--- a/dev-util/gn/gn-0.2049.ebuild
+++ b/dev-util/gn/gn-0.2049.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~xen0n/distfiles/dev-util/gn/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~loong ~ppc64 ~riscv x86"
+KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv x86"
 IUSE="vim-syntax"
 
 BDEPEND="
diff --git a/dev-util/patchelf/Manifest b/dev-util/patchelf/Manifest
index 02d66b78abc1..0c18c848355e 100644
--- a/dev-util/patchelf/Manifest
+++ b/dev-util/patchelf/Manifest
@@ -3,5 +3,5 @@ DIST patchelf-0.16.1.tar.gz 132450 BLAKE2B 047fe9900eff3a4fef19550b49ea3c53dc8fc
 DIST patchelf-0.17.0.tar.gz 143684 BLAKE2B ef32baae1d1e07c77442878977693849e2dd3d5c1c1b8d53eb54ee7b1b78eb77ebcf87cbd7caa683f0043e6d7b90ca2593968e9c95b0902e45c4634823be196b SHA512 0db2294cc16a919a84a1bb71194b3ed7a87bb669f684e4cc0943b33899d69690097c59d5c9f8e631bc1b4136db7f10f7cb0fbb1c96912aee567a0fd7dc9c9588
 EBUILD patchelf-0.15.0.ebuild 581 BLAKE2B bc0e41e8d43635652528d3fe3cab5af3d2c79458dc10a4337dc13985b41522c8bc386d0d571ceebc1aaf2cfaf446fb0907777754c5891d4c568aa334bcbde549 SHA512 cd5f2cac516581cdb58e298d6221de8bc09578843d9bf2795894a49571eed328fca4d394b7aeb2fe95746fac99584ab003c960b91ddd66435bdef7fb359dcbd3
 EBUILD patchelf-0.16.1.ebuild 587 BLAKE2B 6ae4b162ba692d9f0a9dda22ddbc7d0848088db62e36495f41591d8e90bd9734250414ec63e04cb77453e37ff32edcc59d5448b0961302718333f2d21b08d965 SHA512 6af22d1e95cc93eedcc54910472087963e860c0089d8a65a831ad4a621fca2ade1d193cdfafe68cc65aac5826e39fd740b69f7dbee694e062a7b645ccb00493f
-EBUILD patchelf-0.17.0.ebuild 600 BLAKE2B 4f472b56c8021bf9ab7a50d0b9ade888ef0d116096e885bb88362b5259350b77070015666b26892bbbffa966bb21c33b5271586ef14840873fe84237af1b1651 SHA512 2d51ffd0b08da7cf184ad35b8c37ef305cce289fee9d176f1f4b438e4ba8ec9e36e28adbd5c3e375c952100ca1ba732d0e0e09202d71ec2ea37c7205852f8907
-MISC metadata.xml 221 BLAKE2B 89c194836288a2092e342c7932283845027e33ed24c07238828996c457bbe637c44e0d39236fcf5f50db27dd3c66545a0239c4336f74e7f3b463bc2e7374a1a4 SHA512 3fb0d91be78f12317cfcafccc851b13b7e6a1fd588a5762e0dba27add0a9c6b5f8b22d3c27f2fcf6665cb8f8a5e36175d74eb4a97b42bd176afe6a8128254c10
+EBUILD patchelf-0.17.0.ebuild 594 BLAKE2B 029d3c714b64216953a3688c4c9d0d28066bf46c436949a6537251ef59d99dd64475b85154d3a63c89f91bde4613938240f69f2c2026177506f1f9f6d0dc42aa SHA512 d3802dd03f4da721e2b50fd1245d418418ecbb706c05e19831e869884faa02db3506847420c4162dc0b9c1973c1fbb5f0dd67537c3aa17af508cf833aba3adfc
+MISC metadata.xml 304 BLAKE2B f3c4f3a80192390cdeff546ea23f4a03454f17e4900799e10740420f2e158146a6fd8e02b8f77d07fe38646e23eff734d4a7a8571fa23d738e6c000fbe347ec3 SHA512 4a52dc190d6576ddf580830240cbe20c826b609228cc3ca8014f94ff1759a2b1382294b7d5a0c8e3160e7e7e26d055f82855e40076de3b7e410290e119333927
diff --git a/dev-util/patchelf/metadata.xml b/dev-util/patchelf/metadata.xml
index 435c7a87acdc..8a3287a04a43 100644
--- a/dev-util/patchelf/metadata.xml
+++ b/dev-util/patchelf/metadata.xml
@@ -4,4 +4,7 @@
   <maintainer type="person">
     <email>chewi@gentoo.org</email>
   </maintainer>
+  <upstream>
+    <remote-id type="github">NixOS/patchelf</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-util/patchelf/patchelf-0.17.0.ebuild b/dev-util/patchelf/patchelf-0.17.0.ebuild
index ef24854c8688..416bbff5fc7e 100644
--- a/dev-util/patchelf/patchelf-0.17.0.ebuild
+++ b/dev-util/patchelf/patchelf-0.17.0.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Small utility to modify the dynamic linker and RPATH of ELF executa
 HOMEPAGE="https://github.com/NixOS/patchelf"
 SRC_URI="https://github.com/NixOS/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~riscv-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~riscv-linux ~x86-linux"
 LICENSE="GPL-3"
 
 src_prepare() {
diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index 1fc50261832f..f768c8d04ec2 100644
--- a/mail-filter/Manifest.gz
+++ b/mail-filter/Manifest.gz
diff --git a/mail-filter/spamassassin/Manifest b/mail-filter/spamassassin/Manifest
index 7060a8b2101e..bce489a3f233 100644
--- a/mail-filter/spamassassin/Manifest
+++ b/mail-filter/spamassassin/Manifest
@@ -8,5 +8,7 @@ AUX spamassassin.service-r4 182 BLAKE2B c5813612e78602d6e67b527f07a8a38171422a63
 AUX spamassassin.service.conf-r2 120 BLAKE2B cdefa5d73234be5331f7ff7cc646f10365adf515b85bf0d9912d240105579747f3834b7f72402a31b5be9b8ed0faf2545ae0a4ed46ebd3c7a90962f764fb5e8a SHA512 55b93ce1636505beabba21cd208541750ef448e952658b65d6e1447f92cec3a35e3d489d014a0229765117168cc03b4675652709f7ed9973be8fba84c10786dd
 AUX update-spamassassin-rules-r1.cron 1555 BLAKE2B 3c83a1d3f951c5a7004c6ca838aba6ae76502de9e3dad0104537c819ea02652a920e5f549e4ef5c6fa4a36b9cf32e5ef9cd31d421dece002fc99d3e6227ea578 SHA512 5ea9aeff563589991fecde6e4530da36953c55d462d00882a5aa164936c71c947edf6bbb533fc4a2858a29cb3ac08388dac15d37aeb4d090889385c8b431676d
 DIST Mail-SpamAssassin-3.4.6.tar.bz2 6166807 BLAKE2B aa25c9e81f570d35e8594ba6d6da70c7b846737513bd4d6d2d410872c58ab7cbe7ade6a109a71bdbb6dbaf7aee8eb48520e7de929b27e83546401f3692aeb0c3 SHA512 bb53ba928917b02071b2e6690a11240e1af503334f292c870a8c49c24b0a58b44c78f827e2f43e71a3ce920481fa0e1e62b78a39452658c57d18f4e11daeb593
+DIST Mail-SpamAssassin-4.0.0.tar.bz2 6371055 BLAKE2B 86f2167f6250a10a6bf871cc291f63ee9ee2d853b4183a637b4267e6979209196155be1b26e5e5b1093cf63841f9819a249de65e7002414a7e790ee1b67e5206 SHA512 a0fe5f6953c9df355bfa011e8a617101687eb156831a057504656921fe76c2a4eb37b5383861aac579e66a20c4454068e81a39826a35eb0266148771567bad5f
 EBUILD spamassassin-3.4.6-r2.ebuild 9839 BLAKE2B 3cfc005672dcf0ef16ad03dfe7316555b8623fcd2ef3a7a89f4921bf99da3a90e73b090207936091d467dfcaf5b956f27c2844fbca0762e25eec40aeb2aeef45 SHA512 28d27a5e1a14f9f2559731508c0c6114a3c4741e32c86a617a065c686ce094fb3c04c3372c3d87e24c7bcfbdb1421474af3af2966593066735c44dfd32c67b40
+EBUILD spamassassin-4.0.0.ebuild 9740 BLAKE2B c383eba7947f0cceb4f7a854bac3165446c149ddc6ccc2b8bcfd1d4be6cb4d504ac576f57f754813a6f9ddf25e647af32267907ed9e9ea193534457c73aae0dd SHA512 0f9044a7a0c93837cbcc183fefa103cf65ace5f176a1383f153b27958120ea58d7112344e5cbb375772448152513d780c98470d2812c30bd62abb35d82f3367c
 MISC metadata.xml 698 BLAKE2B 09a986c93fde495aceb1370ed7440e2d141d83a3b631e050d09571441637029d5beda9fed264d6d65fe094c99fc27c91a6ba350f55d6aa6136c484b2acbd874b SHA512 1bd90e2b4339e685ebc4af7ddd6f371cebd566610fe8cc256c5bf3d120ae9bb527da633c38fff9a9e1dbd7b4949ccd78dab6cb1016311ee23e143426ed61e515
diff --git a/mail-filter/spamassassin/spamassassin-4.0.0.ebuild b/mail-filter/spamassassin/spamassassin-4.0.0.ebuild
new file mode 100644
index 000000000000..dd0b26e6a2a2
--- /dev/null
+++ b/mail-filter/spamassassin/spamassassin-4.0.0.ebuild
@@ -0,0 +1,321 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit perl-functions systemd toolchain-funcs
+
+MY_P="Mail-SpamAssassin-${PV//_/-}"
+DESCRIPTION="An extensible mail filter which can identify and tag spam"
+HOMEPAGE="https://spamassassin.apache.org/"
+SRC_URI="mirror://apache/spamassassin/source/${MY_P}.tar.bz2"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="Apache-2.0 GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="berkdb cron ipv6 ldap mysql postgres qmail sqlite ssl test"
+RESTRICT="!test? ( test )"
+
+# The Makefile.PL script checks for dependencies, but only fails if a
+# required (i.e. not optional) dependency is missing. We therefore
+# require most of the optional modules only at runtime.
+REQDEPEND="acct-user/spamd
+	acct-group/spamd
+	dev-lang/perl:=
+	dev-perl/HTML-Parser
+	dev-perl/Net-DNS
+	dev-perl/NetAddr-IP
+	virtual/perl-Digest-SHA
+	ssl? (
+		dev-libs/openssl:0=
+	)"
+
+# SpamAssassin doesn't use libwww-perl except as a fallback for when
+# curl/wget are missing, so we depend on one of those instead. Some
+# mirrors use https, so we need those utilities to support SSL.
+#
+# re2c is needed to compile the rules (sa-compile).
+#
+# We still need the old Digest-SHA1 because razor2 has not been ported
+# to Digest-SHA.
+OPTDEPEND="app-crypt/gnupg
+	dev-perl/Archive-Zip
+	dev-perl/BSD-Resource
+	dev-perl/Digest-SHA1
+	dev-perl/Email-Address-XS
+	dev-perl/Encode-Detect
+	|| ( dev-perl/GeoIP2 dev-perl/Geo-IP )
+	dev-perl/IO-String
+	dev-perl/Mail-DKIM
+	dev-perl/Mail-DMARC
+	dev-perl/Mail-SPF
+	dev-perl/Net-Patricia
+	dev-perl/Net-LibIDN2
+	dev-util/re2c
+	|| ( net-misc/wget[ssl] net-misc/curl[ssl] )
+	virtual/perl-MIME-Base64
+	dev-perl/Pod-Parser
+	berkdb? ( virtual/perl-DB_File )
+	ipv6? ( dev-perl/IO-Socket-INET6 )
+	ldap? ( dev-perl/perl-ldap )
+	mysql? (
+		dev-perl/DBI
+		dev-perl/DBD-mysql
+	)
+	postgres? (
+		dev-perl/DBI
+		dev-perl/DBD-Pg
+	)
+	sqlite? (
+		dev-perl/DBI
+		dev-perl/DBD-SQLite
+	)
+	ssl? ( dev-perl/IO-Socket-SSL )"
+
+DEPEND="${REQDEPEND}
+	test? (
+		${OPTDEPEND}
+		virtual/perl-Test-Harness
+	)"
+RDEPEND="${REQDEPEND} ${OPTDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/mention-geoip.cf-in-init.pre.patch"
+)
+
+# There are a few renames and use-dependent ones in src_istall as well.
+DOCS=(
+	NOTICE TRADEMARK CREDITS UPGRADE USAGE sql/README.bayes
+	sql/README.awl procmailrc.example sample-nonspam.txt
+	sample-spam.txt spamd/PROTOCOL spamd/README.vpopmail
+	spamd-apache2/README.apache
+)
+
+src_prepare() {
+	default
+
+	# The sa_compile test does some weird stuff like hopping around in
+	# the directory tree and calling "make" to create a dist tarball
+	# from ${S}. It fails, and is more trouble than it's worth...
+	perl_rm_files t/sa_compile.t
+
+	# The spamc tests (which need the networked spamd daemon) fail for
+	# irrelevant reasons. It's too hard to disable them (unlike the
+	# spamd tests themselves -- see src_test), so use a crude
+	# workaround.
+	perl_rm_files t/spamc_*.t
+
+	# Some tests need extra dependencies
+	# e.g. t/sql_based_whitelist.t needs DBD
+	# This is kinder than REQUIRED_USE for tests which hurts automation
+	if ! use mysql && ! use postgres && ! use sqlite ; then
+		perl_rm_files t/sql_based_whitelist.t
+	fi
+
+	# Disable plugin by default
+	sed -i -e 's/^loadplugin/\#loadplugin/g' \
+		"rules/init.pre" \
+		|| die "failed to disable plugins by default"
+}
+
+src_configure() {
+	# This is how and where the perl-module eclass disables the
+	# MakeMaker interactive prompt.
+	export PERL_MM_USE_DEFAULT=1
+
+	# Set SYSCONFDIR explicitly so we can't get bitten by bug 48205 again
+	# (just to be sure, nobody knows how it could happen in the first place).
+	#
+	# We also set the path to the perl executable explictly. This will be
+	# used to create the initial shebang line in the scripts (bug 62276).
+	perl Makefile.PL \
+		PREFIX="${EPREFIX}/usr" \
+		INSTALLDIRS=vendor \
+		SYSCONFDIR="${EPREFIX}/etc" \
+		DATADIR="${EPREFIX}/usr/share/spamassassin" \
+		PERL_BIN="${EPREFIX}/usr/bin/perl" \
+		ENABLE_SSL="$(usex ssl)" \
+		DESTDIR="${D}" \
+		|| die 'failed to create a Makefile using Makefile.PL'
+
+	# Now configure spamc.
+	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" spamc/Makefile
+}
+
+src_compile() {
+	emake
+	use qmail && emake spamc/qmail-spamc
+}
+
+src_install () {
+	default
+
+	# Create the stub dir used by sa-update and friends
+	keepdir /var/lib/spamassassin
+
+	# Move spamd to sbin where it belongs.
+	dodir /usr/sbin
+	mv "${ED}"/usr/bin/spamd "${ED}"/usr/sbin/spamd  || die "move spamd failed"
+
+	if use qmail; then
+		dobin spamc/qmail-spamc
+	fi
+
+	dosym mail/spamassassin /etc/spamassassin
+
+	# Add the init and config scripts.
+	newinitd "${FILESDIR}/3.4.1-spamd.init-r3" spamd
+	newconfd "${FILESDIR}/3.4.1-spamd.conf-r1" spamd
+
+	systemd_newunit "${FILESDIR}/${PN}.service-r4" "${PN}.service"
+	systemd_install_serviced "${FILESDIR}/${PN}.service.conf-r2" \
+		"${PN}.service"
+
+	use postgres && dodoc sql/*_pg.sql
+	use mysql && dodoc sql/*_mysql.sql
+	use qmail && dodoc spamc/README.qmail
+
+	# Rename some files so that they don't clash with others.
+	newdoc spamd/README README.spamd
+	newdoc sql/README README.sql
+	newdoc ldap/README README.ldap
+
+	insinto /etc/mail/spamassassin/
+	doins "${FILESDIR}"/geoip.cf
+	insopts -m0400
+	newins "${FILESDIR}"/secrets.cf secrets.cf.example
+
+	# Create the directory where sa-update stores its GPG key (if you
+	# choose to import one). If this directory does not exist, the
+	# import will fail. This is bug 396307. We expect that the import
+	# will be performed as root, and making the directory accessible
+	# only to root prevents a warning on the command-line.
+	diropts -m0700
+	dodir /etc/mail/spamassassin/sa-update-keys
+
+	if use cron; then
+		# Install the cron job if they want it.
+		exeinto /etc/cron.daily
+		newexe "${FILESDIR}/update-spamassassin-rules-r1.cron" \
+			   update-spamassassin-rules
+	fi
+
+	# Remove perllocal.pod to avoid file collisions (bug #603338).
+	perl_delete_localpod
+
+	# The perl-module eclass calls three other functions to clean
+	# up in src_install. The first fixes references to ${D} in the
+	# packlist, and is useful to us, too. The other two functions,
+	# perl_delete_emptybsdir and perl_remove_temppath, don't seem
+	# to be needed: there are no empty directories, *.bs files, or
+	# ${D} paths remaining in our installed image.
+	perl_fix_packlist
+}
+
+src_test() {
+	# Trick the test suite into skipping the spamd tests. Setting
+	# SPAMD_HOST to a non-localhost value causes SKIP_SPAMD_TESTS to be
+	# set in SATest.pm.
+	export SPAMD_HOST=disabled
+	default
+}
+
+pkg_preinst() {
+	if use mysql || use postgres ; then
+		local _awlwarn=0
+		local _v
+		for _v in ${REPLACING_VERSIONS}; do
+			if ver_test "${_v}" -lt "3.4.3"; then
+				_awlwarn=1
+				break
+			fi
+		done
+		if [[ ${_awlwarn} == 1 ]] ; then
+			ewarn 'If you used AWL before 3.4.3, the SQL schema has changed.'
+			ewarn 'You will need to manually ALTER your tables for them to'
+			ewarn 'continue working.  See the UPGRADE documentation for'
+			ewarn 'details.'
+			ewarn
+		fi
+	fi
+}
+
+pkg_postinst() {
+	elog
+	elog 'No rules are installed by default. You will need to run sa-update'
+	elog 'at least once, and most likely configure SpamAssassin before it'
+	elog 'will work.'
+
+	if ! use cron; then
+		elog
+		elog 'You should consider a cron job for sa-update. One is provided'
+		elog 'for daily updates if you enable the "cron" USE flag.'
+	fi
+	elog
+	elog 'Configuration and update help can be found on the wiki:'
+	elog
+	elog '  https://wiki.gentoo.org/wiki/SpamAssassin'
+	elog
+
+	if use mysql || use postgres ; then
+		local _v
+		for _v in ${REPLACING_VERSIONS}; do
+			if ver_test "${_v}" -lt "3.4.3"; then
+				ewarn
+				ewarn 'If you used AWL before 3.4.3, the SQL schema has changed.'
+				ewarn 'You will need to manually ALTER your tables for them to'
+				ewarn 'continue working.  See the UPGRADE documentation for'
+				ewarn 'details.'
+				ewarn
+
+				# show this only once
+				break
+			fi
+		done
+	fi
+
+	ewarn 'If this version of SpamAssassin causes permissions issues'
+	ewarn 'with your user configurations or bayes databases, then you'
+	ewarn 'may need to set SPAMD_RUN_AS_ROOT=true in your OpenRC service'
+	ewarn 'configuration file, or remove the --username and --groupname'
+	ewarn 'flags from the SPAMD_OPTS variable in your systemd service'
+	ewarn 'configuration file.'
+
+	if [[ ! ~spamd -ef "${ROOT}/var/lib/spamd" ]] ; then
+		ewarn "The spamd user's home folder has been moved to a new location."
+		elog
+		elog "The acct-user/spamd package should have relocated it for you,"
+		elog "but may have failed because your spamd daemon was running."
+		elog
+		elog "To fix this:"
+		elog " - Stop your spamd daemon"
+		elog " - emerge -1 acct-user/spamd"
+		elog " - Restart your spamd daemon"
+		elog " - Remove the old home folder if you want"
+		elog "     rm -rf \"${ROOT}/home/spamd\""
+	fi
+	if [[ -e "${ROOT}/home/spamd" ]] ; then
+		ewarn
+		ewarn "The spamd user's home folder has been moved to a new location."
+		elog
+		elog "  Old Home: ${ROOT}/home/spamd"
+		elog "  New Home: ${ROOT}/var/lib/spamd"
+		elog
+		elog "You may wish to migrate your data to the new location:"
+		elog " - Stop your spamd daemon"
+		elog " - Re-emerge acct-user/spamd to ensure the home folder has been"
+		elog "   updated to the new location, now that the daemon isn't running:"
+		elog "     # emerge -1 acct-user/spamd"
+		elog "     # echo ~spamd"
+		elog " - Migrate the contents from the old location to the new home"
+		elog "   For example:"
+		elog "     # cp -Rpi \"${ROOT}/home/spamd/\" \"${ROOT}/var/lib/\""
+		elog " - Remove the old home folder"
+		elog "     # rm -rf \"${ROOT}/home/spamd\""
+		elog " - Restart your spamd daemon"
+		elog
+		elog "If you do not wish to migrate data, you should remove the old"
+		elog "home folder from your system as it is not used."
+	fi
+}
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index b899172721e5..a38ffdf97a0f 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index d19bcf8e8d31..e12a3d69204d 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -1,9 +1,11 @@
+AUX gimp-2.10_fix_file-dicom-return-value.patch 581 BLAKE2B 57acc6c2ade824a29a5ec5778958b9f29a524b0a4a366fc25bc5b2ea535694d15a9dca445543d0a59b2e827d9b9e4c7a3de734acb86fe6ed75235e6cc7760578 SHA512 a5f6c0a6b263a61c83c505182e9ceb0d1a26dfdff26175e349e212621f3b9e1d231d9d96843ab0484378f7162c20be27d519fdf814fa946b614224122ea06908
 AUX gimp-2.10_fix_test-appdata.patch 902 BLAKE2B 2b1a131d874d65422d8bdd44732b9843d89a570a1ea3c058cdb2a424a7791c686aa0e2ae2a0b472f333f2465f6e1a26750a532e9003933c5dffa1af32343c1dc SHA512 2983e8572f5e8113c9e2f564d31c1a5fe7e11ef273c50d2be739089124c6ec1a457da28222020bbd6015b2cbbcbf403b88d8660b9b35241800deb4fb3ad79067
 AUX gimp-2.99.12_fix_libheif-1.13_build.patch 2309 BLAKE2B 32d4edf87f20f9fc0b7839352adbae6006dc021b3e3e6541fc48f1f44496780e39870da41642e0abe2551302d942a8a1382a539180437be4b37e78c1c0b55c48 SHA512 1f7b8a0479603376dd356bb156354d31b113513213f39e11e65fa75b99eac52375d6c32043a7bb56a21e7e1e6bdf9371099bfe3f1eb41f3528fdd1f81bec4b2a
 DIST gimp-2.10.32.tar.bz2 31397425 BLAKE2B 3887e2e29ebfd5dcfa671a9d1549180d11bd5e3656c6854ff4130c6c6e6ca9479df075981e09b9b6b97e47dd1fcd939fea726ca09c08c040ebd1998d80e61771 SHA512 aa999c1ec388154965f84d995a9b5517e9c38608d03a0d0bb6ec9fa55de946f9da106e7d6f7c02052b61d2b6806e7a378e786539f0de5b5ffaa2fcd1bbd9c7f1
 DIST gimp-2.99.12.tar.xz 24282140 BLAKE2B 2174e1d50941071ea6e96f0e3f315484867aa90ae06cbcdc7b30914f959c1a15a7e7ea34ba22ce09a973b29acf1277e3a4519d744140c3fcabc59f31dc3ebf43 SHA512 4b87dd40eccc39c560e69a90b4042b1b19506e9ae52e5079ace442325b54bf7c47477662197da8f7655c12aad16e08bae60d11cf269684b8aa291e978d246917
 DIST gimp-2.99.14.tar.xz 24346236 BLAKE2B 087e28621c736a6ad8241c0f36334c6c5af53cb945711b089d15b54292ffcb7713be229591b8ccf79d06f7c7ede0919ceecad4deb511b20822a4f68ccfa1df49 SHA512 6ea3ca27cb0c830042ad42789d3017989dda195ebbdff38793afbee720f2986d489bec39c077b84889c847c0afc1bc7a2fec2e916574ae08aec42019715cb204
 EBUILD gimp-2.10.32-r3.ebuild 5672 BLAKE2B c03c035114cd8f563270a83b9cbc7f9b43871f26d3042a48e2f948f7de43352c6bbc3a99bb1bea0778c38e08a9ea6f2e33714177fdbe5dc96b02d3f60d04c3d2 SHA512 6314ae28325c40e62e1f2bb3e2803cba90e7cfbaa20155b39fd435c6ab511c700cb6366a8a7558d299e1fb6c0f480a7d9bf05aefc22f07f23127c96180bc13a4
+EBUILD gimp-2.10.32-r4.ebuild 5796 BLAKE2B a1da5f64442f133bbe60ac57c7081d5a5ca6a7cc54eb0dc3608bd418c53fbd98c160149e1bd8d5479e2fd7eb7240e046d318010e43438a3a123bf18e045734fd SHA512 2645a43916596052f9f9929f61fbc4a8ee1b8ce4a04e1b331b2c9c14baf559bab8cc85e6732a580bfc5421d0c1d19acae5ce9ce2a307124872b6d6f8af6a964b
 EBUILD gimp-2.99.12-r3.ebuild 6875 BLAKE2B c6d56e314f18078b7b576a54f2df8fda7bd981f107402d94be5028fc7f3a2ba54af6e70c7370ad4d05ab4713268cca7a2666c0ed05e4562e9ce9e403cf20aec2 SHA512 10c45f73020c0903eaba348d329348e1014f7d9c65523747b52b8ac1941b25172d41b84c46bf3862a5151257d3cbe50a542f57bdab25294163e3c3bbf15f93d2
 EBUILD gimp-2.99.14-r1.ebuild 6893 BLAKE2B c745f7855c4c9bec239af02c2af6f6747d0dd9264c7265f81d00c0e2d53773fac576f4fb8217a76ab717a947b1d5598fca2af91428b18f0edac1e8b0a617af8e SHA512 fd496467d9b869592c79713d52d9136c7344709172fbcc294b5429d48ae36c83a3d6d6f44f2e90be3970c07d2a3da80456368071389bc1f0b201aaeccdcfed1c
 EBUILD gimp-9999.ebuild 6712 BLAKE2B 1730409d3417ed893ef36bef4341acc26517d0def2b075f5528caae3a6ac3d5cfbd383a0f619c7385be62944eb20adf317726a9690e27074a094cc7d80c0bca3 SHA512 a857d7e50bdacc42bcbbe307bd6ab1d7d9d6bccb3db54fd80fc7ff93466e2524d3464a047365ccc7ca259d0ac3df8b5cd69690a0d7d6b2a733b6eb41866aea4a
diff --git a/media-gfx/gimp/files/gimp-2.10_fix_file-dicom-return-value.patch b/media-gfx/gimp/files/gimp-2.10_fix_file-dicom-return-value.patch
new file mode 100644
index 000000000000..8bc50cbcf18e
--- /dev/null
+++ b/media-gfx/gimp/files/gimp-2.10_fix_file-dicom-return-value.patch
@@ -0,0 +1,15 @@
+Issue: https://bugs.gentoo.org/875413
+Upstream issue: https://gitlab.gnome.org/GNOME/gimp/-/issues/8807
+Upstream patch: https://gitlab.gnome.org/GNOME/gimp/-/commit/543f9e37e69b4e57b5e44092542c95bb2052f047
+
+--- a/plug-ins/common/file-dicom.c
++++ b/plug-ins/common/file-dicom.c
+@@ -602,7 +602,7 @@ load_image (const gchar  *filename,
+                                (gchar *) value, samples_per_pixel);
+                   g_free (dicominfo);
+                   fclose (DICOM);
+-                  return NULL;
++                  return -1;
+                 }
+ 
+               break;
diff --git a/media-gfx/gimp/gimp-2.10.32-r4.ebuild b/media-gfx/gimp/gimp-2.10.32-r4.ebuild
new file mode 100644
index 000000000000..ea46069df1b1
--- /dev/null
+++ b/media-gfx/gimp/gimp-2.10.32-r4.ebuild
@@ -0,0 +1,213 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GNOME2_EAUTORECONF=yes
+WANT_AUTOMAKE=
+
+inherit autotools gnome2 toolchain-funcs virtualx
+
+DESCRIPTION="GNU Image Manipulation Program"
+HOMEPAGE="https://www.gimp.org/"
+SRC_URI="mirror://gimp/v$(ver_cut 1-2)/${P}.tar.bz2"
+LICENSE="GPL-3+ LGPL-3+"
+SLOT="0/2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+
+IUSE="aalib alsa aqua debug doc gnome heif jpeg2k jpegxl mng openexr postscript udev unwind vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse"
+
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	>=app-accessibility/at-spi2-core-2.46.0
+	>=app-text/poppler-0.50[cairo]
+	>=app-text/poppler-data-0.4.7
+	>=dev-libs/glib-2.56.2:2
+	>=dev-libs/json-glib-1.2.6
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	>=gnome-base/librsvg-2.40.6:2
+	>=media-gfx/mypaint-brushes-2.0.2:=
+	>=media-libs/babl-0.1.90
+	>=media-libs/fontconfig-2.12.4
+	>=media-libs/freetype-2.1.7
+	>=media-libs/gegl-0.4.36:0.4[cairo]
+	>=media-libs/gexiv2-0.10.6
+	>=media-libs/harfbuzz-0.9.19:=
+	>=media-libs/lcms-2.8:2
+	media-libs/libjpeg-turbo:=
+	>=media-libs/libmypaint-1.6.1:=
+	>=media-libs/libpng-1.6.25:0=
+	>=media-libs/tiff-3.5.7:=
+	net-libs/glib-networking[ssl]
+	sys-libs/zlib
+	>=x11-libs/cairo-1.12.2
+	>=x11-libs/gdk-pixbuf-2.31:2
+	>=x11-libs/gtk+-2.24.32:2
+	x11-libs/libXcursor
+	>=x11-libs/pango-1.29.4
+	aalib? ( media-libs/aalib )
+	alsa? ( >=media-libs/alsa-lib-1.0.0 )
+	aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 )
+	heif? ( >=media-libs/libheif-1.9.1:= )
+	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= )
+	jpegxl? ( >=media-libs/libjxl-0.6.1:= )
+	mng? ( media-libs/libmng:= )
+	openexr? ( >=media-libs/openexr-1.6.1:= )
+	postscript? ( app-text/ghostscript-gpl:= )
+	udev? ( dev-libs/libgudev:= )
+	unwind? ( >=sys-libs/libunwind-1.1.0:= )
+	webp? ( >=media-libs/libwebp-0.6.0:= )
+	wmf? ( >=media-libs/libwmf-0.2.8 )
+	xpm? ( x11-libs/libXpm )
+"
+
+RDEPEND="
+	${COMMON_DEPEND}
+	x11-themes/hicolor-icon-theme
+	gnome? ( gnome-base/gvfs )
+"
+
+DEPEND="
+	${COMMON_DEPEND}
+	>=dev-lang/perl-5.10.0
+	dev-libs/appstream-glib
+	dev-util/gtk-update-icon-cache
+	>=dev-util/intltool-0.40.1
+	>=sys-devel/gettext-0.19
+	>=sys-devel/libtool-2.2
+	virtual/pkgconfig
+"
+
+DOCS=( "AUTHORS" "ChangeLog" "HACKING" "NEWS" "README" "README.i18n" )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.10_fix_test-appdata.patch" # Bugs 685210 (and duplicate 691070)
+	"${FILESDIR}/${PN}-2.10_fix_file-dicom-return-value.patch" # Bug 875413 (duplicates 886481, 887587)
+)
+
+src_prepare() {
+	sed -i -e 's/mypaint-brushes-1.0/mypaint-brushes-2.0/' configure.ac || die #737794
+
+	sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
+	sed 's:-DGIMP_DISABLE_DEPRECATED:-DGIMP_protect_DISABLE_DEPRECATED:g' -i configure.ac || die #615144
+
+	gnome2_src_prepare  # calls eautoreconf
+
+	sed 's:-DGIMP_protect_DISABLE_DEPRECATED:-DGIMP_DISABLE_DEPRECATED:g' -i configure || die #615144
+	grep -F -q GIMP_DISABLE_DEPRECATED configure || die #615144, self-test
+
+	export CC_FOR_BUILD="$(tc-getBUILD_CC)"
+}
+
+_adjust_sandbox() {
+	# Bugs #569738 and #591214
+	local nv
+	for nv in /dev/nvidia-uvm /dev/nvidiactl /dev/nvidia{0..9} ; do
+		# We do not check for existence as they may show up later
+		# https://bugs.gentoo.org/show_bug.cgi?id=569738#c21
+		addwrite "${nv}"
+	done
+
+	addwrite /dev/dri/  # bugs #574038 and #684886
+	addwrite /dev/ati/  # bug #589198
+	addwrite /proc/mtrr  # bug #589198
+}
+
+src_configure() {
+	_adjust_sandbox
+
+	local myconf=(
+		GEGL="${EPREFIX}"/usr/bin/gegl-0.4
+		GDBUS_CODEGEN="${EPREFIX}"/bin/false
+
+		--enable-default-binary
+
+		--disable-check-update
+		--disable-python
+		--enable-mp
+		--with-appdata-test
+		--with-bug-report-url=https://bugs.gentoo.org/
+		--with-xmc
+		--without-libbacktrace
+		--without-webkit
+		--without-xvfb-run
+		$(use_enable cpu_flags_ppc_altivec altivec)
+		$(use_enable cpu_flags_x86_mmx mmx)
+		$(use_enable cpu_flags_x86_sse sse)
+		$(use_enable debug)
+		$(use_enable vector-icons)
+		$(use_with aalib aa)
+		$(use_with alsa)
+		$(use_with !aqua x)
+		$(use_with heif libheif)
+		$(use_with jpeg2k jpeg2000)
+		$(use_with jpegxl)
+		$(use_with mng libmng)
+		$(use_with openexr)
+		$(use_with postscript gs)
+		$(use_with udev gudev)
+		$(use_with unwind libunwind)
+		$(use_with webp)
+		$(use_with wmf)
+		$(use_with xpm libxpm)
+	)
+
+	gnome2_src_configure "${myconf[@]}"
+}
+
+src_compile() {
+	export XDG_DATA_DIRS="${EPREFIX}"/usr/share  # bug 587004
+	gnome2_src_compile
+}
+
+# for https://bugs.gentoo.org/664938
+_rename_plugins() {
+	einfo 'Renaming plug-ins to not collide with pre-2.10.6 file layout (bug #664938)...'
+	local prename=gimp-org-
+	(
+		cd "${ED}"/usr/$(get_libdir)/gimp/2.0/plug-ins || die
+		for plugin_slash in $(ls -d1 */); do
+		    plugin=${plugin_slash%/}
+		    if [[ -f ${plugin}/${plugin} ]]; then
+			# NOTE: Folder and file name need to match for Gimp to load that plug-in
+			#       so "file-svg/file-svg" becomes "${prename}file-svg/${prename}file-svg"
+			mv ${plugin}/{,${prename}}${plugin} || die
+			mv {,${prename}}${plugin} || die
+		    fi
+		done
+	)
+}
+
+src_test() {
+	virtx emake check
+}
+
+src_install() {
+	gnome2_src_install
+
+	# Workaround for bug #321111 to give GIMP the least
+	# precedence on PDF documents by default
+	mv "${ED}"/usr/share/applications/{,zzz-}gimp.desktop || die
+
+	find "${D}" -name '*.la' -type f -delete || die
+
+	# Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527)
+	local gimp_app_version=$(ver_cut 1-2)
+	mv "${ED}"/usr/share/man/man1/gimp-console{-${gimp_app_version},}.1 || die
+
+	# Remove gimp devel-docs html files if user doesn't need it
+	if ! use doc; then
+		rm -r "${ED}"/usr/share/gtk-doc || die
+	fi
+
+	_rename_plugins || die
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+}
diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index 33deec9c44ba..e7bdd4e8cb81 100644
--- a/media-plugins/Manifest.gz
+++ b/media-plugins/Manifest.gz
diff --git a/media-plugins/gst-plugins-pulse/Manifest b/media-plugins/gst-plugins-pulse/Manifest
index a13f38300665..c1fb53ebe409 100644
--- a/media-plugins/gst-plugins-pulse/Manifest
+++ b/media-plugins/gst-plugins-pulse/Manifest
@@ -1,5 +1,6 @@
 DIST gst-plugins-good-1.20.3.tar.xz 3417252 BLAKE2B 5f288541598d2c308fbb1d5e36e54e8dd4c6e9d7dd71f41b778fbdfe883ed48e8d13fa53d05518cc671de029d804f7dc1d93396de9d199d45ec131230926d33c SHA512 98bb2dd428edaa1a5846fb47b1f42a1e99541faf05cdb0fb632d4a1a1e4fb2c1f9d1229bf0aa2ddcbce139533e9fd51f8f9a1175cd8a8729c5179750ca84afa1
 DIST gst-plugins-good-1.20.4.tar.xz 3424532 BLAKE2B 2b9fa0227c13c6a81a91b4d337c3d52d6e8bd63d04710ee6bc45ec7b70de3f35c57148786356e08a253b1bbc9473411d9b0f1346433396e2403680690823c06f SHA512 d1a1d3a161fc33ecfae2b1336391571210511926a5017ea512a0bef7ab3577fb98326a96b6c5a2ffb48c8e2c7c3bf8e957e489edd0cf44e8ed8518656768c7ce
 EBUILD gst-plugins-pulse-1.20.3.ebuild 467 BLAKE2B cf146646a40aab0b87bb488f517d0b76710a83b4999d31976f8ce5ef2af00890b76fc803bee8b5ac24a04079be66eac7708a80d1e0ed594234ae6dc6c0fc9b8b SHA512 cf66442cf289155e7ffec6245580a1059f1f461a20a73f886c7d90ead6d9852f293e661dce849d312ddc3f1bfe9befd9a9df1796b06e0f020c1ce53aea584ebb
+EBUILD gst-plugins-pulse-1.20.4-r1.ebuild 470 BLAKE2B e60bb7443fcaf567089c70384d8c49494ea5b6832cc5d830a59a1b9ec22e17fa605eec8f849a443033b175fba0c51e95c6fe280b0a2a51835020989f0b0ee212 SHA512 efd5ea00cef23bb962250bbb7d695c4437fdd6353725896234ab5532372cdcc2fcf699ab53d31feef3a89b00db929832a55d395d6dba3e65d915596a82897f54
 EBUILD gst-plugins-pulse-1.20.4.ebuild 467 BLAKE2B cf146646a40aab0b87bb488f517d0b76710a83b4999d31976f8ce5ef2af00890b76fc803bee8b5ac24a04079be66eac7708a80d1e0ed594234ae6dc6c0fc9b8b SHA512 cf66442cf289155e7ffec6245580a1059f1f461a20a73f886c7d90ead6d9852f293e661dce849d312ddc3f1bfe9befd9a9df1796b06e0f020c1ce53aea584ebb
 MISC metadata.xml 611 BLAKE2B 380f7e85db2d10717c6871abb99dfcdf040a119d4e8f0c43b6e1ad44f41b1694af07797e70cbf724169e86110f4b4c06dd9b51f4d27f781bb71d3301efe38243 SHA512 f9605aee69329c581d8d92a14acc2cfebfe5d6adc93c7d66298fad2c3fb91328869c9142cb39fb8f70bd2a8f7a76e20c6a2a3be88c01ffa4270f372fe7248378
diff --git a/media-plugins/gst-plugins-pulse/gst-plugins-pulse-1.20.4-r1.ebuild b/media-plugins/gst-plugins-pulse/gst-plugins-pulse-1.20.4-r1.ebuild
new file mode 100644
index 000000000000..11014d7ab71d
--- /dev/null
+++ b/media-plugins/gst-plugins-pulse/gst-plugins-pulse-1.20.4-r1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GST_ORG_MODULE=gst-plugins-good
+
+inherit gstreamer-meson
+
+DESCRIPTION="PulseAudio sound server plugin for GStreamer"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	>=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP}]
+	>=media-libs/libpulse-2.1-r1[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/hdx-realtime-media-engine/Manifest b/media-plugins/hdx-realtime-media-engine/Manifest
index 8f2a1b29417b..96ac6c7a364e 100644
--- a/media-plugins/hdx-realtime-media-engine/Manifest
+++ b/media-plugins/hdx-realtime-media-engine/Manifest
@@ -3,5 +3,6 @@ DIST HDX_RealTime_Media_Engine_2.9.400_for_Linux_x64.zip 30137698 BLAKE2B 87819d
 DIST HDX_RealTime_Media_Engine_2.9.500_for_Linux.zip 30099634 BLAKE2B aee56c8f2e909ebdeba751ec45a74f7e0a350c7d3ecca0f815f5da5693d3b0941e07cd7bcfdc4d86cbae97668b6252e308e30d57d08494b7ff47ad4e302a8494 SHA512 bfc1949dd8a2774fa0e3228c75523d26d6f28f39e2936b5152567f52a39dc853569a4a012c7e49fa72dd7e75262f0a615bad872191be155ca9c6920bf56ae888
 DIST HDX_RealTime_Media_Engine_2.9.500_for_Linux_x64.zip 30138987 BLAKE2B f59c7cac53c7fdf9560ef7f31ade2e3439c8fa54e46cfb8ad86e4b8bc8880073e73cce5f4cafd2d009ec8bae688d41c8bc8f7d26cf2b89665c2414b87aa0bd6c SHA512 8d9bd9ac2414472d80f04025f0966e32f4157ecd6757c9361c46a2a5d077a3913b93cf5f91f175a239dc4e85363f65a6c855c637a5bce2b3d71775ef66fa345d
 EBUILD hdx-realtime-media-engine-2.9.400.2702.ebuild 2127 BLAKE2B 5b5638cec242a068f332a33d3af376352e8dd81d431782817b2c190746f9fbf66f99db06b4a2766beffc2203038f38937c93d4dab8706fb90b995cb4504cf1d5 SHA512 da01e73a52770b535b72284e58bb08782824c33fa6c61fa1396fa495d86a01f0feec40178dcc985add693d4a1fdfaa5b5b35b2a0e24841607f590d58b4ef57ec
+EBUILD hdx-realtime-media-engine-2.9.500.2802-r1.ebuild 1861 BLAKE2B 4bc6dc88496ebfe967c0b10465c43b2e7273371725aaccf455d4c250ff73d0b5ffda3bf05152cc1ea82f63381b52e9cdd01b9e92739b637ed3756edc0820b229 SHA512 e4cf4aa7f53e35ad0e9d34fa27a18469ea19299a8b562357c20edc571928d38bf87db3537b7d7c46ebf8e180fb3cf5e826080c5f975475e23b848a9b8465d498
 EBUILD hdx-realtime-media-engine-2.9.500.2802.ebuild 2127 BLAKE2B d237a334bbe2b140b911ec7b5f4745ecb1c165e12a4b4a5fcd894ad231fc7c72d7eb5a64f775e28d4d496f5cae69397c693761a91bd738fd337764f7b5b1a767 SHA512 069cf2afac2e21ddd61c465e11ad071049766f0d26b2429d66f9d072ad45add6831a03142555eb320b4c753a61fdaad9f5a7f9d1bcb19a66c57756a3c1de3826
 MISC metadata.xml 396 BLAKE2B 87022ff667ea4915aaeb6bd69234d79f1030f0501ba2c6cbca8068905639f7797765b6b165a0cb5663f63f7d6089b73528745a3e3f413a02a023f66696f0ceb0 SHA512 8b03761bc34e251e177c940e1e61b0d7faba8651d7cc4f3971fe7928adbd9a3d7c4041474d404d966a5a0818066f0d64ce3c8b7f7fedebfed2132d338625b09d
diff --git a/media-plugins/hdx-realtime-media-engine/hdx-realtime-media-engine-2.9.500.2802-r1.ebuild b/media-plugins/hdx-realtime-media-engine/hdx-realtime-media-engine-2.9.500.2802-r1.ebuild
new file mode 100644
index 000000000000..d72d760272eb
--- /dev/null
+++ b/media-plugins/hdx-realtime-media-engine/hdx-realtime-media-engine-2.9.500.2802-r1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit unpacker
+
+MY_PV="$(ver_cut 1-3)"
+
+DESCRIPTION="HDX RealTime Media Engine plugin for Citrix Workspace App"
+HOMEPAGE="https://www.citrix.com/"
+SRC_URI="amd64? ( HDX_RealTime_Media_Engine_${MY_PV}_for_Linux_x64.zip )
+	x86? ( HDX_RealTime_Media_Engine_${MY_PV}_for_Linux.zip )"
+LICENSE="icaclient"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+RESTRICT="fetch mirror strip"
+
+BDEPEND="app-arch/unzip"
+RDEPEND="
+	sys-libs/llvm-libunwind
+	|| (
+		media-video/pipewire
+		media-sound/pulseaudio
+		media-sound/apulse
+	)
+	!<net-misc/icaclient-22.12.0.12
+"
+
+ICAROOT="/opt/Citrix/ICAClient"
+QA_PREBUILT="${ICAROOT#/}/*"
+
+S="${WORKDIR}/usr/local/bin"
+
+pkg_nofetch() {
+	elog "Download the client file ${A} from"
+	elog "https://www.citrix.com/de-de/downloads/citrix-receiver/additional-client-software/hdx-realtime-media-engine-ltsrcu-latest.html"
+	elog "and place it into your DISTDIR directory."
+}
+
+pkg_setup() {
+	case ${ARCH} in
+		amd64)
+			zip_dir="x86_64"
+			zip_arch="amd64"
+		;;
+		x86)
+			zip_dir="i386"
+			zip_arch="i386"
+		;;
+	esac
+}
+
+src_unpack() {
+	default
+
+	local MY_T="${WORKDIR}/HDX_RealTime_Media_Engine_${MY_PV}_for_Linux$(usex amd64 '_x64' '')"
+	local deb_base_name="citrix-hdx-realtime-media-engine"
+	unpack_deb ${MY_T}/${zip_dir}/${deb_base_name}_$(ver_rs 3 -)_${zip_arch}.deb
+}
+
+src_install() {
+	insinto "${ICAROOT}/rtme"
+
+	# No, we do NOT install such a generic udev rule into the system
+	local destfiles=(
+		DialTone_US.wav
+		EULA.rtf
+		InboundCallRing.wav
+	)
+
+	local el
+	for el in "${destfiles[@]}" ; do
+		doins "${el}"
+	done
+
+	exeinto "${ICAROOT}"/rtme
+	doexe RTMEconfig RTMediaEngineSRV
+
+	for el in /var/{lib,log}/RTMediaEngineSRV /var/lib/Citrix/HDXRMEP ; do
+		keepdir ${el}
+		fperms a+rw ${el}
+	done
+
+	insinto "${ICAROOT}"
+	doins HDXRTME.so
+}
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 7049d95bac77..7462860ec450 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/pavucontrol/Manifest b/media-sound/pavucontrol/Manifest
index c576cd28ba3e..4f9eae235578 100644
--- a/media-sound/pavucontrol/Manifest
+++ b/media-sound/pavucontrol/Manifest
@@ -1,3 +1,4 @@
 DIST pavucontrol-5.0.tar.xz 194248 BLAKE2B 9e6b9b7d94be51a4ad8b5310e031c4fed0f5299e67c770c9a573c0647edf27345014fb6504892fad29b9b5e79ce43ed312217dbed8e2b31b805f291531062903 SHA512 5673d783c2c819a68b49025c051bedd39f4caba446a479797b06569e24a96acc0924ba680d2416baff8c3211cfc7c94760d503900207fbe7c89c5cb2adaebec1
 EBUILD pavucontrol-5.0-r1.ebuild 839 BLAKE2B e3372efdbd8a8bf0475706f528b8b7e1a4c6cd1e43a4e7625d26a4baeac7922381226a7af91ff6df989aafee03409d76a64a89b562f54824b34a3358d20d20b9 SHA512 9ed02142e21eccecfe2505c6634afbf5c7989d39af1b351e23d36db592db1f2d179ebd44057c829788eca78419bfc7fd7fc54c30aead54e97c584e81e36cf893
+EBUILD pavucontrol-5.0-r2.ebuild 840 BLAKE2B b86105a7215053770bc27d0f6c6adc1d1d692a179fb5a119da8de9270ede2634062129d1e115d094691c3947e7252e577a23b462a6bb78da9bc1ef9a22720350 SHA512 540823dd580e1e5181d985e7d3a01fb060c6073e5c75149b88e3bb06e14dc02a43e33342e1fa25d562c597074e0c3501fdcac72f7c7eecc528421f7e5571f3a2
 MISC metadata.xml 250 BLAKE2B 3e6dae5d5f3b3ac412806dd8615a1975c7ea8a64bfd72ad54f2c93a9b24c19c620ac3e8b26e1f6cadec899443e138ee4fb7a82ecb83c784d0c03ee91854d8622 SHA512 2bfce2cf73aefce6dda06ea351cb93b2990b9543f48be1ae5406a5a5acf2c34faed1eb2ce715eb689eb50a9a1add5576b39232eb818c233f5a5589e16032aca8
diff --git a/media-sound/pavucontrol/pavucontrol-5.0-r2.ebuild b/media-sound/pavucontrol/pavucontrol-5.0-r2.ebuild
new file mode 100644
index 000000000000..1fd1195e589d
--- /dev/null
+++ b/media-sound/pavucontrol/pavucontrol-5.0-r2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Pulseaudio Volume Control, GTK based mixer for Pulseaudio"
+HOMEPAGE="https://freedesktop.org/software/pulseaudio/pavucontrol/"
+SRC_URI="https://freedesktop.org/software/pulseaudio/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="nls"
+
+RDEPEND="
+	dev-libs/json-glib
+	>=dev-cpp/gtkmm-3.22:3.0[X]
+	>=dev-libs/libsigc++-2.2:2
+	>=media-libs/libcanberra-0.16[gtk3]
+	>=media-libs/libpulse-15.0[glib]
+	virtual/freedesktop-icon-theme
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	nls? (
+		dev-util/intltool
+		sys-devel/gettext
+	)
+"
+
+src_configure() {
+	local myeconfargs=(
+		--disable-lynx
+		$(use_enable nls)
+	)
+	econf "${myeconfargs[@]}"
+}
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index ffe6f97d0b32..251f3f1bb856 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 9feea5514500..5da1a68df83f 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sat, 24 Dec 2022 01:10:02 +0000
+Sat, 24 Dec 2022 07:09:32 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 0fc6e4776f33..7d7f6cac5693 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 538471 BLAKE2B b7385901234c82cabfe7b6fe500f9a2de535ba832c5fe98f7b1adcf90342ab9ac009a4eefb2c71141609f93233148e5db41c6f760cbea8413d0a285b67c25f90 SHA512 8b561e583b67bc367b59eefc1d958442632b1001434a1d0874a9ae00334c80cc4a27278dac1813b0d7b255f214d060c5e60573b828bb87fc8e319dc9233f12aa
-TIMESTAMP 2022-12-24T01:10:05Z
+TIMESTAMP 2022-12-24T07:09:35Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmOmUW1fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmOmpa9fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCHuxAAkvliQAyqY+0RC+ihyKaC/fRSwqHkARyGkF+lnIkbhAR9NXTcZfsUTtQW
-E07W2f4Vk2dq2aZGcR4yMEnP7y8Dha6K59uuKDgrfZZXPNlcqjx1U81UFPpWOMe1
-OL8HZMAMKYgVD+eaIjB3TbOH8YaFVcBsudeJZ9FztwoxqRbf0+n0WcSctN9DzpfT
-XTCQxcQNZxz/mO6PY2GyqEq2zWQV4f3npxRYzHibAfRLJm6JXiI9hVnrxiC27ElG
-mL2Q2FskSPET/atxrovIPQsEMoRuyAvERH9JeG++A7NemdJqMOc3KzK4F6Q1+gZp
-l7qcExC7WVwUKDvh0slfncqGmiOiCNqZMh/cZXDEbUcIZOdBKEEKxpxP4M9HUxKF
-SkmqZ8I6Za3IaIh7RWRtZ6vzlXkWkZhCwO65vSuwM7DQ23r49VWUmA/QJORxB9uP
-ErlYG0KUANMdDf8jGdfzPDMCYQ1QrgvehZYRvar+qaYjg+sn993pJXHtg0ufmIx2
-Z4/lEnFeWHOq7RqXLBqoOFBthquMUP898A3ZaKCC5xZhmeGlqUbLLnIT1OwVcE3w
-0vvYYhU4ZjyLwbz7m3PytTX7vAZx8EGTMq0UbkrNEgfGCKeZ3S6LxrroHc8DMAwE
-KGP/UREBEn3pOnJuLBoydsViIf61HkJP2JrUNcMEmsmO7tcsjSQ=
-=G1Nf
+klAhPhAAlrCGmzXa4T3rZAGPm6wPtlUhAh2u/kEuq5z1vbFyYDrdWG1B+LXRmU31
+8m6ohgdd+wv+sAnOTaKNyWEr6H1SeYYKUaDAWZX0PISmKnwjnoQt7DQGvbm3Ljgb
+AGvlmc28a8Jj4XbfIoL1EXcB9SqSLtt+CaL9vSCh8xm5qORJamAaig/ZyJcdPC1O
+TsbsC5Or2CGRFDJFvUp9W+6B+yfmHsp+VotaBmaqDOatQo28FPwnvYMNrPcG6goQ
+mB3pFX0AAAndL+pM/QFq18E4aPdwdXz0cX5B63BQbYLSLhw/m0O1SRUDNUtNLt3f
+w2lk9wIcfd1hhaps75Va6Vphmjz+44O6m+qOqlM4TWyZWSlakuxhZL0BwFHwJlGh
+MLMbyJMpiuTeI9+cC26a+YRSIrn48eFod6qR3WCbGaEqw6s1GyT0ZDezHXMrEdP9
+gE/f2DwUDeDvM9Omjcsq+bRT93AiE1UyZu3I/cWthQnMmXC1ZeEtHRjFl5JIet6c
+w2k5Pge8GEbthvT6mvA6vq/vZGztzlItMMpo62axhUDv39Zt1KYISxkc2st76mU+
+PZvVgP3UnCrqkmp4RwGWvx+BtapUgbBKgVLFp3FqEG4EP8WukOsAZIWO8d0ccoR4
+Pz588z5Bmb5/rstFESSUYIe/W3+vjR9PkvAJB0w5EQHDAaxVHPM=
+=rc4s
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 9feea5514500..09eb87731a8d 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sat, 24 Dec 2022 01:10:02 +0000
+Sat, 24 Dec 2022 07:09:33 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index e5696a630efa..769ea14a3449 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-accessibility/Manifest.gz b/metadata/md5-cache/app-accessibility/Manifest.gz
index 09dfc2c1b7ce..4f5bd94ce793 100644
--- a/metadata/md5-cache/app-accessibility/Manifest.gz
+++ b/metadata/md5-cache/app-accessibility/Manifest.gz
diff --git a/metadata/md5-cache/app-accessibility/freetts-1.2.2-r2 b/metadata/md5-cache/app-accessibility/freetts-1.2.2-r2
index 4cc2ec0d2957..ae8a5b2bb096 100644
--- a/metadata/md5-cache/app-accessibility/freetts-1.2.2-r2
+++ b/metadata/md5-cache/app-accessibility/freetts-1.2.2-r2
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install preinst prepare setup
 DEPEND=>=virtual/jdk-1.8:* jsapi? ( app-arch/sharutils ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
 DESCRIPTION=A speech synthesis system written entirely in Java
 EAPI=7
-HOMEPAGE=https://freetts.sourceforge.net/
+HOMEPAGE=https://freetts.sourceforge.io/
 INHERIT=java-pkg-2 java-ant-2
 IUSE=jsapi mbrola doc examples source
 KEYWORDS=amd64 ppc64 x86
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/freetts/freetts-1.2.2-src.zip
 _eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=ab922cad4b9f3940dab9f1e877cdedf8
+_md5_=fab2c4ced3c94f9bdfdc5ee605e0dd89
diff --git a/metadata/md5-cache/app-accessibility/sound-icons-0.1 b/metadata/md5-cache/app-accessibility/sound-icons-0.1
index 599d9a224c42..a1a41e982b27 100644
--- a/metadata/md5-cache/app-accessibility/sound-icons-0.1
+++ b/metadata/md5-cache/app-accessibility/sound-icons-0.1
@@ -1,10 +1,10 @@
 DEFINED_PHASES=compile install
-DESCRIPTION=a collection of Sound Icons for speech-dispatcher
+DESCRIPTION=Collection of Sound Icons for speech-dispatcher
 EAPI=7
-HOMEPAGE=http://www.freebsoft.org
+HOMEPAGE=https://www.freebsoft.org
 KEYWORDS=~amd64 x86
 LICENSE=GPL-2
 RDEPEND=app-accessibility/speech-dispatcher
 SLOT=0
-SRC_URI=http://www.freebsoft.org/pub/projects/sound-icons/sound-icons-0.1.tar.gz
-_md5_=57b63e41510c9b9480bcdf06f6b75b47
+SRC_URI=https://www.freebsoft.org/pub/projects/sound-icons/sound-icons-0.1.tar.gz
+_md5_=4faff6be34e0be8f11f644c5c229ca50
diff --git a/metadata/md5-cache/app-accessibility/speech-tools-2.5.0-r1 b/metadata/md5-cache/app-accessibility/speech-tools-2.5.0-r1
index bef760c0fc33..125af9ec68df 100644
--- a/metadata/md5-cache/app-accessibility/speech-tools-2.5.0-r1
+++ b/metadata/md5-cache/app-accessibility/speech-tools-2.5.0-r1
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare pretend setup
 DEPEND=media-libs/alsa-lib sys-libs/ncurses:= nas? ( media-libs/nas ) X? ( x11-libs/libX11 x11-libs/libXt )
 DESCRIPTION=Speech tools for Festival Text to Speech engine
 EAPI=8
-HOMEPAGE=http://www.cstr.ed.ac.uk/projects/speech_tools/
+HOMEPAGE=https://www.cstr.ed.ac.uk/projects/speech_tools/
 INHERIT=autotools toolchain-funcs
 IUSE=nas openmp X
 KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86
@@ -12,4 +12,4 @@ RDEPEND=media-libs/alsa-lib sys-libs/ncurses:= nas? ( media-libs/nas ) X? ( x11-
 SLOT=0
 SRC_URI=http://www.festvox.org/packed/festival/2.5/speech_tools-2.5.0-release.tar.gz https://dev.gentoo.org/~neurogeek/speech-tools/speech_tools-2.1-r3-patches.tar.gz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=8354ad68414fb389c2ed9839afaf4832
+_md5_=048b55798655a2ca61428bed3ce47ff5
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index 1cc03b16f2cc..3f8fc362ab8a 100644
--- a/metadata/md5-cache/app-admin/Manifest.gz
+++ b/metadata/md5-cache/app-admin/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/bastille-3.0.9-r3 b/metadata/md5-cache/app-admin/bastille-3.0.9-r3
index bbb060f75fe4..460a3824ffd1 100644
--- a/metadata/md5-cache/app-admin/bastille-3.0.9-r3
+++ b/metadata/md5-cache/app-admin/bastille-3.0.9-r3
@@ -1,7 +1,7 @@
 DEFINED_PHASES=install postinst prepare
 DESCRIPTION=Bastille-Linux is a security hardening tool
 EAPI=8
-HOMEPAGE=http://bastille-linux.sourceforge.net/
+HOMEPAGE=https://bastille-linux.sourceforge.net/
 INHERIT=perl-functions
 IUSE=X
 KEYWORDS=~alpha ~amd64 ~ppc ~sparc ~x86
@@ -10,4 +10,4 @@ RDEPEND=app-admin/logrotate dev-lang/perl dev-perl/Curses net-firewall/iptables
 SLOT=0
 SRC_URI=mirror://sourceforge/bastille-linux/Bastille-3.0.9.tar.bz2 mirror://gentoo/bastille-3.0.9-gentoo-0.2.patch.bz2
 _eclasses_=perl-functions	c3fca037246e877693badea0df3b0ef8
-_md5_=3a2ca78d3460d8654da78ccd54fd9c92
+_md5_=ec23fbbd472e13256a12abf4caf5d966
diff --git a/metadata/md5-cache/app-backup/Manifest.gz b/metadata/md5-cache/app-backup/Manifest.gz
index da3ea4579464..37e3739d38d2 100644
--- a/metadata/md5-cache/app-backup/Manifest.gz
+++ b/metadata/md5-cache/app-backup/Manifest.gz
diff --git a/metadata/md5-cache/app-backup/burp-3.1.4 b/metadata/md5-cache/app-backup/burp-3.1.4
new file mode 100644
index 000000000000..12c5b8cdce0a
--- /dev/null
+++ b/metadata/md5-cache/app-backup/burp-3.1.4
@@ -0,0 +1,16 @@
+BDEPEND=>=sys-devel/autoconf-2.71 virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 virtual/pkgconfig
+DEFINED_PHASES=configure install postinst prepare test
+DEPEND=acct-group/burp acct-user/burp dev-libs/uthash dev-libs/openssl:0= net-libs/librsync:= sys-libs/ncurses:0= sys-libs/libcap sys-libs/zlib virtual/libcrypt:= acl? ( sys-apps/acl ) xattr? ( sys-apps/attr ) elibc_musl? ( sys-libs/queue-standalone ) test? ( dev-libs/check )
+DESCRIPTION=Network backup and restore client and server for Unix and Windows
+EAPI=8
+HOMEPAGE=https://burp.grke.org/
+INHERIT=autotools systemd
+IUSE=acl test xattr
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=AGPL-3
+RDEPEND=acct-group/burp acct-user/burp dev-libs/uthash dev-libs/openssl:0= net-libs/librsync:= sys-libs/ncurses:0= sys-libs/libcap sys-libs/zlib virtual/libcrypt:= acl? ( sys-apps/acl ) xattr? ( sys-apps/attr ) virtual/logger
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/grke/burp/archive/3.1.4.tar.gz -> burp-3.1.4.tar.gz
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
+_md5_=ebff3f0808745bc3fbdc8ca1d1154820
diff --git a/metadata/md5-cache/dev-games/Manifest.gz b/metadata/md5-cache/dev-games/Manifest.gz
index 8973f86cf377..bc432b7dcc7b 100644
--- a/metadata/md5-cache/dev-games/Manifest.gz
+++ b/metadata/md5-cache/dev-games/Manifest.gz
diff --git a/metadata/md5-cache/dev-games/godot-4.0_beta8-r1 b/metadata/md5-cache/dev-games/godot-4.0_beta10
index b763d2ad8cd1..5a58b2bcf0dd 100644
--- a/metadata/md5-cache/dev-games/godot-4.0_beta8-r1
+++ b/metadata/md5-cache/dev-games/godot-4.0_beta10
@@ -12,6 +12,6 @@ LICENSE=MIT Apache-2.0 BSD Boost-1.0 CC0-1.0 Unlicense ZLIB gui? ( CC-BY-4.0 ) t
 RDEPEND=app-arch/zstd:= dev-games/recastnavigation:= dev-libs/icu:= dev-libs/libpcre2:=[pcre32] media-libs/freetype[brotli,harfbuzz] media-libs/harfbuzz:=[icu] media-libs/libogg media-libs/libpng:= media-libs/libvorbis <net-libs/mbedtls-3:= net-libs/wslay sys-libs/zlib:= fontconfig? ( media-libs/fontconfig ) gui? ( media-libs/alsa-lib media-libs/libglvnd[X] media-libs/vulkan-loader[X] || ( >x11-libs/libX11-1.8.3 <x11-libs/libX11-1.8.2-r1 ) x11-libs/libXcursor x11-libs/libXext x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender dbus? ( sys-apps/dbus ) pulseaudio? ( media-libs/libpulse ) tools? ( raycast? ( media-libs/embree:3 ) ) udev? ( virtual/udev ) ) speech? ( app-accessibility/speech-dispatcher ) theora? ( media-libs/libtheora ) tools? ( app-misc/ca-certificates ) upnp? ( net-libs/miniupnpc:= ) webp? ( media-libs/libwebp:= )
 RESTRICT=test
 SLOT=4
-SRC_URI=https://downloads.tuxfamily.org/godotengine/4.0/beta8/godot-4.0-beta8.tar.xz
+SRC_URI=https://downloads.tuxfamily.org/godotengine/4.0/beta10/godot-4.0-beta10.tar.xz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	desktop	7eb20ad915a0a318176d51bc2508ff5c	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	1a218637f27d4c027b92e511707264fd	python-utils-r1	6a75203e8a499f0fb42971452ce15388	scons-utils	bec7e6195b3d988724ab87185cb13435	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=2f8ea71840bed7143a978ee1bdd6646e
diff --git a/metadata/md5-cache/dev-libs/Ice-3.7.8 b/metadata/md5-cache/dev-libs/Ice-3.7.8
new file mode 100644
index 000000000000..7487f28d6293
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/Ice-3.7.8
@@ -0,0 +1,17 @@
+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 sys-devel/m4 sys-devel/libtool php? ( php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) php_targets_php8-2? ( dev-lang/php:8.2 ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=>=app-arch/bzip2-1.0.5 >=dev-libs/expat-2.0.1 dev-libs/libedit dev-cpp/libmcpp dev-db/lmdb:= dev-libs/openssl:0= virtual/libcrypt:= python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) ) ruby? ( dev-lang/ruby:2.7 ) test? ( python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) dev-python/passlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) php? ( php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) php_targets_php8-2? ( dev-lang/php:8.2 ) )
+DESCRIPTION=ICE middleware C++ library and generator tools
+EAPI=8
+HOMEPAGE=https://zeroc.com/products/ice
+INHERIT=php-ext-source-r3 python-r1 ruby-ng toolchain-funcs
+IUSE=debug doc examples php python ruby test php_targets_php8-0 php_targets_php8-1 php_targets_php8-2 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ruby_targets_ruby27
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=app-arch/bzip2-1.0.5 >=dev-libs/expat-2.0.1 dev-libs/libedit dev-cpp/libmcpp dev-db/lmdb:= dev-libs/openssl:0= virtual/libcrypt:= python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) ) ruby? ( dev-lang/ruby:2.7 ) php? ( php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) php_targets_php8-2? ( dev-lang/php:8.2 ) )
+REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) ) php? ( || ( php_targets_php8-0 php_targets_php8-1 php_targets_php8-2 ) )
+RESTRICT=test
+SLOT=0/37
+SRC_URI=https://github.com/zeroc-ice/ice/archive/v3.7.8.tar.gz -> Ice-3.7.8.tar.gz doc? ( https://download.zeroc.com/Ice/3.7/Ice-3.7.1.pdf )
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	estack	055c42df72f76a4f45ec92b35e83cd56	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	php-ext-source-r3	3c26d87acac034aedf8bf126f7010c8a	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	6a75203e8a499f0fb42971452ce15388	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
+_md5_=34e01763c87b9f80d8c12514646c783a
diff --git a/metadata/md5-cache/dev-libs/Ice-3.7.8-r1 b/metadata/md5-cache/dev-libs/Ice-3.7.8-r1
new file mode 100644
index 000000000000..d54fe849012a
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/Ice-3.7.8-r1
@@ -0,0 +1,17 @@
+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 sys-devel/m4 sys-devel/libtool php? ( php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) php_targets_php8-2? ( dev-lang/php:8.2 ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=>=app-arch/bzip2-1.0.5 >=dev-libs/expat-2.0.1 dev-libs/libedit dev-cpp/libmcpp dev-db/lmdb:= dev-libs/openssl:0= virtual/libcrypt:= python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) ) ruby? ( dev-lang/ruby:3.0 ) test? ( python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) dev-python/passlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) php? ( php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) php_targets_php8-2? ( dev-lang/php:8.2 ) )
+DESCRIPTION=ICE middleware C++ library and generator tools
+EAPI=8
+HOMEPAGE=https://zeroc.com/products/ice
+INHERIT=php-ext-source-r3 python-r1 ruby-ng toolchain-funcs
+IUSE=debug doc examples php python ruby test php_targets_php8-0 php_targets_php8-1 php_targets_php8-2 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ruby_targets_ruby30
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=app-arch/bzip2-1.0.5 >=dev-libs/expat-2.0.1 dev-libs/libedit dev-cpp/libmcpp dev-db/lmdb:= dev-libs/openssl:0= virtual/libcrypt:= python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) ) ruby? ( dev-lang/ruby:3.0 ) php? ( php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) php_targets_php8-2? ( dev-lang/php:8.2 ) )
+REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) ) php? ( || ( php_targets_php8-0 php_targets_php8-1 php_targets_php8-2 ) )
+RESTRICT=test
+SLOT=0/37
+SRC_URI=https://github.com/zeroc-ice/ice/archive/v3.7.8.tar.gz -> Ice-3.7.8.tar.gz doc? ( https://download.zeroc.com/Ice/3.7/Ice-3.7.1.pdf )
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	estack	055c42df72f76a4f45ec92b35e83cd56	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	php-ext-source-r3	3c26d87acac034aedf8bf126f7010c8a	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	6a75203e8a499f0fb42971452ce15388	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
+_md5_=2380317c8354e33473d908f1ec0a46ff
diff --git a/metadata/md5-cache/dev-libs/Ice-3.7.8-r2 b/metadata/md5-cache/dev-libs/Ice-3.7.8-r2
new file mode 100644
index 000000000000..a5e448405910
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/Ice-3.7.8-r2
@@ -0,0 +1,17 @@
+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 sys-devel/m4 sys-devel/libtool php? ( php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) php_targets_php8-2? ( dev-lang/php:8.2 ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=>=app-arch/bzip2-1.0.5 >=dev-libs/expat-2.0.1 dev-libs/libedit dev-cpp/libmcpp dev-db/lmdb:= dev-libs/openssl:0= virtual/libcrypt:= python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) ) ruby? ( dev-lang/ruby:3.1 ) test? ( python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) dev-python/passlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) php? ( php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) php_targets_php8-2? ( dev-lang/php:8.2 ) )
+DESCRIPTION=ICE middleware C++ library and generator tools
+EAPI=8
+HOMEPAGE=https://zeroc.com/products/ice
+INHERIT=php-ext-source-r3 python-r1 ruby-ng toolchain-funcs
+IUSE=debug doc examples php python ruby test php_targets_php8-0 php_targets_php8-1 php_targets_php8-2 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ruby_targets_ruby31
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=app-arch/bzip2-1.0.5 >=dev-libs/expat-2.0.1 dev-libs/libedit dev-cpp/libmcpp dev-db/lmdb:= dev-libs/openssl:0= virtual/libcrypt:= python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) ) ruby? ( dev-lang/ruby:3.1 ) php? ( php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) php_targets_php8-2? ( dev-lang/php:8.2 ) )
+REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) ) php? ( || ( php_targets_php8-0 php_targets_php8-1 php_targets_php8-2 ) )
+RESTRICT=test
+SLOT=0/37
+SRC_URI=https://github.com/zeroc-ice/ice/archive/v3.7.8.tar.gz -> Ice-3.7.8.tar.gz doc? ( https://download.zeroc.com/Ice/3.7/Ice-3.7.1.pdf )
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	estack	055c42df72f76a4f45ec92b35e83cd56	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	php-ext-source-r3	3c26d87acac034aedf8bf126f7010c8a	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	6a75203e8a499f0fb42971452ce15388	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
+_md5_=f9c9c4fdf81f0a25a557fc57afad6369
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 522c42085c33..77afa1ca4684 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/ayatana-ido-0.9.2 b/metadata/md5-cache/dev-libs/ayatana-ido-0.9.2
index 858769ec3b5b..cc20469aebd4 100644
--- a/metadata/md5-cache/dev-libs/ayatana-ido-0.9.2
+++ b/metadata/md5-cache/dev-libs/ayatana-ido-0.9.2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/AyatanaIndicators/ayatana-ido
 INHERIT=cmake vala
 IUSE=test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~x86
 LICENSE=LGPL-2.1 LGPL-3 GPL-3
 RDEPEND=>=dev-libs/glib-2.58:2 >=x11-libs/gtk+-3.24:3[introspection]
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/AyatanaIndicators/ayatana-ido/archive/0.9.2.tar.gz -> ayatana-ido-0.9.2.tar.gz
 _eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	vala	160a8a30a6cb9aa601e5441c643a7c61	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=a0ae11cfc757e760f065abfc9bc2d1ce
+_md5_=ed798e2472d328a9dae0623c2b67c37e
diff --git a/metadata/md5-cache/dev-libs/libayatana-appindicator-0.5.91 b/metadata/md5-cache/dev-libs/libayatana-appindicator-0.5.91
index 71042a029457..c02ccc45ca0d 100644
--- a/metadata/md5-cache/dev-libs/libayatana-appindicator-0.5.91
+++ b/metadata/md5-cache/dev-libs/libayatana-appindicator-0.5.91
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/AyatanaIndicators/libayatana-appindicator
 INHERIT=cmake vala virtualx
 IUSE=test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~x86
 LICENSE=GPL-3 LGPL-2 LGPL-3
 RDEPEND=>=dev-libs/glib-2.37:2 >=x11-libs/gtk+-3.24:3[introspection] dev-libs/libdbusmenu[gtk3] >=dev-libs/libayatana-indicator-0.8.4
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/AyatanaIndicators/libayatana-appindicator/archive/0.5.91.tar.gz -> libayatana-appindicator-0.5.91.tar.gz
 _eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	vala	160a8a30a6cb9aa601e5441c643a7c61	virtualx	644887c82aefdf12001489391fca4f02	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=28612a8b63b7a0b6a2ca96814cf4e6eb
+_md5_=e233ac3e410a31301f87947d6607455d
diff --git a/metadata/md5-cache/dev-libs/libayatana-indicator-0.9.3 b/metadata/md5-cache/dev-libs/libayatana-indicator-0.9.3
index f00b1dbe6f9d..d5e0239b85a3 100644
--- a/metadata/md5-cache/dev-libs/libayatana-indicator-0.9.3
+++ b/metadata/md5-cache/dev-libs/libayatana-indicator-0.9.3
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/AyatanaIndicators/libayatana-indicator
 INHERIT=cmake vala virtualx
 IUSE=test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~x86
 LICENSE=GPL-3
 RDEPEND=dev-libs/dbus-glib >=dev-libs/glib-2.58:2 >=x11-libs/gtk+-3.24:3[introspection] >=dev-libs/ayatana-ido-0.8.2
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/AyatanaIndicators/libayatana-indicator/archive/0.9.3.tar.gz -> libayatana-indicator-0.9.3.tar.gz
 _eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	vala	160a8a30a6cb9aa601e5441c643a7c61	virtualx	644887c82aefdf12001489391fca4f02	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=09550da33c11d081e9202425e652c7e7
+_md5_=53b462b97a1f15e89796b472d09393c7
diff --git a/metadata/md5-cache/dev-libs/libsigc++-2.12.0 b/metadata/md5-cache/dev-libs/libsigc++-2.12.0
new file mode 100644
index 000000000000..e216f13b8908
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libsigc++-2.12.0
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/m4 gtk-doc? ( app-doc/doxygen[dot] ) 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 test
+DEPEND=test? ( dev-libs/boost[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DESCRIPTION=Typesafe callback system for standard C++
+EAPI=8
+HOMEPAGE=https://libsigcplusplus.github.io/libsigcplusplus/ https://github.com/libsigcplusplus/libsigcplusplus
+INHERIT=flag-o-matic gnome.org meson-multilib
+IUSE=gtk-doc test 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 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=LGPL-2.1+
+RESTRICT=!test? ( test )
+SLOT=2
+SRC_URI=mirror://gnome/sources/libsigc++/2.12/libsigc++-2.12.0.tar.xz
+_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-utils-r1	6a75203e8a499f0fb42971452ce15388	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
+_md5_=d583afaf6f4d7fc34c63b04dbffd9fda
diff --git a/metadata/md5-cache/dev-libs/libsigc++-3.4.0 b/metadata/md5-cache/dev-libs/libsigc++-3.4.0
new file mode 100644
index 000000000000..4a9223eaaadc
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libsigc++-3.4.0
@@ -0,0 +1,14 @@
+BDEPEND=gtk-doc? ( app-doc/doxygen[dot] dev-lang/perl dev-libs/libxslt ) 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 test
+DESCRIPTION=Typesafe callback system for standard C++
+EAPI=8
+HOMEPAGE=https://libsigcplusplus.github.io/libsigcplusplus/ https://github.com/libsigcplusplus/libsigcplusplus
+INHERIT=gnome.org flag-o-matic meson-multilib
+IUSE=gtk-doc test 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 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=LGPL-2.1+
+RESTRICT=!test? ( test )
+SLOT=3
+SRC_URI=mirror://gnome/sources/libsigc++/3.4/libsigc++-3.4.0.tar.xz
+_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-utils-r1	6a75203e8a499f0fb42971452ce15388	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
+_md5_=6c0a2bd742155631bc6d93f0cb4f0d60
diff --git a/metadata/md5-cache/dev-perl/Email-Address-XS-1.50.0 b/metadata/md5-cache/dev-perl/Email-Address-XS-1.50.0
index 6ec5299481ab..71e25d5f8c43 100644
--- a/metadata/md5-cache/dev-perl/Email-Address-XS-1.50.0
+++ b/metadata/md5-cache/dev-perl/Email-Address-XS-1.50.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://metacpan.org/release/Email-Address-XS
 INHERIT=perl-module
 IUSE=test
-KEYWORDS=amd64 ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ ) MIT
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter virtual/perl-XSLoader dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PA/PALI/Email-Address-XS-1.05.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
-_md5_=29eb5f921ed408b705069e44015a28fd
+_md5_=1655d4b6b39322b65cdba4698a1484a8
diff --git a/metadata/md5-cache/dev-perl/Manifest.gz b/metadata/md5-cache/dev-perl/Manifest.gz
index 459bfbdb9370..76f2368f2fe5 100644
--- a/metadata/md5-cache/dev-perl/Manifest.gz
+++ b/metadata/md5-cache/dev-perl/Manifest.gz
diff --git a/metadata/md5-cache/dev-php/Manifest.gz b/metadata/md5-cache/dev-php/Manifest.gz
index ca9ecaeffd73..3acb93842143 100644
--- a/metadata/md5-cache/dev-php/Manifest.gz
+++ b/metadata/md5-cache/dev-php/Manifest.gz
diff --git a/metadata/md5-cache/dev-php/libvirt-php-0.5.7 b/metadata/md5-cache/dev-php/libvirt-php-0.5.7
new file mode 100644
index 000000000000..3fe6afad6f4e
--- /dev/null
+++ b/metadata/md5-cache/dev-php/libvirt-php-0.5.7
@@ -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 sys-devel/m4 sys-devel/libtool php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=app-emulation/libvirt dev-libs/libxml2 dev-libs/libxslt virtual/pkgconfig doc? ( app-text/xhtml1 ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
+DESCRIPTION=PHP bindings for libvirt
+EAPI=8
+HOMEPAGE=http://libvirt.org/php/
+INHERIT=php-ext-source-r3 autotools
+IUSE=doc php_targets_php7-4 php_targets_php8-0 php_targets_php8-1
+KEYWORDS=~amd64
+LICENSE=LGPL-2.1
+RDEPEND=app-emulation/libvirt dev-libs/libxml2 php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
+REQUIRED_USE=|| ( php_targets_php7-4 php_targets_php8-0 php_targets_php8-1 )
+SLOT=0
+SRC_URI=http://libvirt.org/sources/php/libvirt-php-0.5.7.tar.xz
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	php-ext-source-r3	3c26d87acac034aedf8bf126f7010c8a	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
+_md5_=eea4c30a5adc219469390547007cb3d4
diff --git a/metadata/md5-cache/dev-php/libvirt-php-9999 b/metadata/md5-cache/dev-php/libvirt-php-9999
index 02cbcf9ee9bd..3cb3366120d1 100644
--- a/metadata/md5-cache/dev-php/libvirt-php-9999
+++ b/metadata/md5-cache/dev-php/libvirt-php-9999
@@ -12,4 +12,4 @@ RDEPEND=app-emulation/libvirt dev-libs/libxml2 php_targets_php7-4? ( dev-lang/ph
 REQUIRED_USE=|| ( php_targets_php7-4 php_targets_php8-0 php_targets_php8-1 )
 SLOT=0
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	git-r3	2347f8fe2d392b2a091191f94be37e6f	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	php-ext-source-r3	3c26d87acac034aedf8bf126f7010c8a	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=7494bde82e69ebcb16c1e259003da8b5
+_md5_=0d21ea3e1ebe3f07b4fe3ac9722fdc18
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 93246fbbbaab..9970a10c428f 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/future-0.18.2-r2 b/metadata/md5-cache/dev-python/future-0.18.2-r3
index 15fc9266907a..e3135b16599d 100644
--- a/metadata/md5-cache/dev-python/future-0.18.2-r2
+++ b/metadata/md5-cache/dev-python/future-0.18.2-r3
@@ -2,7 +2,7 @@ BDEPEND=test? ( python_targets_python3_8? ( dev-python/numpy[python_targets_pyth
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Easy, clean, reliable Python 2/3 compatibility
 EAPI=8
-HOMEPAGE=https://python-future.org/
+HOMEPAGE=https://python-future.org/ https://github.com/PythonCharmers/python-future/ https://pypi.org/project/future/
 INHERIT=distutils-r1
 IUSE=test doc python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/f/future/future-0.18.2.tar.gz
 _eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	6a75203e8a499f0fb42971452ce15388	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=78a07388987baa5957a84e80d978afcc
+_md5_=fc28a23ce138ee806c2722d196a69c67
diff --git a/metadata/md5-cache/dev-python/pipenv-2022.11.30 b/metadata/md5-cache/dev-python/pipenv-2022.11.30
new file mode 100644
index 000000000000..c24bae363908
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pipenv-2022.11.30
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/attrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cerberus-1.3.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/colorama-0.4.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/markupsafe-2.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pexpect-4.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ptyprocess-0.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyparsing[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-dateutil-2.8.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-dotenv-0.21.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/virtualenv-20.0.35[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/virtualenv-clone[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.26.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ruamel-yaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tomlkit[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/flaky[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/attrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cerberus-1.3.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/colorama-0.4.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/markupsafe-2.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pexpect-4.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ptyprocess-0.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyparsing[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-dateutil-2.8.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-dotenv-0.21.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/virtualenv-20.0.35[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/virtualenv-clone[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.26.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ruamel-yaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tomlkit[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python Development Workflow for Humans
+EAPI=8
+HOMEPAGE=https://github.com/pypa/pipenv https://pypi.org/project/pipenv/
+INHERIT=distutils-r1 multiprocessing
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~riscv ~x86
+LICENSE=MIT
+RDEPEND=dev-python/attrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cerberus-1.3.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/colorama-0.4.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/markupsafe-2.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pexpect-4.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ptyprocess-0.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyparsing[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-dateutil-2.8.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-dotenv-0.21.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/virtualenv-20.0.35[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/virtualenv-clone[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.26.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ruamel-yaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tomlkit[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/pypa/pipenv/archive/v2022.11.30.tar.gz -> pipenv-2022.11.30.gh.tar.gz
+_eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	6a75203e8a499f0fb42971452ce15388	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
+_md5_=1a32fd3cca21dcb1c5348ac3e709b92f
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index 334a3d45cb2b..75226e202da5 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/faraday-1.3.1 b/metadata/md5-cache/dev-ruby/faraday-1.3.1
index e4294f158b70..c7c0884244a6 100644
--- a/metadata/md5-cache/dev-ruby/faraday-1.3.1
+++ b/metadata/md5-cache/dev-ruby/faraday-1.3.1
@@ -1,17 +1,17 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( dev-ruby/faraday-net_http:1[ruby_targets_ruby27(-)] >=dev-ruby/multipart-post-1.2.0[ruby_targets_ruby27(-)] <dev-ruby/multipart-post-3[ruby_targets_ruby27(-)] dev-ruby/ruby2_keywords[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/faraday-net_http:1[ruby_targets_ruby30(-)] >=dev-ruby/multipart-post-1.2.0[ruby_targets_ruby30(-)] <dev-ruby/multipart-post-3[ruby_targets_ruby30(-)] dev-ruby/ruby2_keywords[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/test-unit-2.4[ruby_targets_ruby27(-)] >=dev-ruby/connection_pool-2.2.2[ruby_targets_ruby27(-)] dev-ruby/rack[ruby_targets_ruby27(-)] dev-ruby/webmock[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( >=dev-ruby/test-unit-2.4[ruby_targets_ruby30(-)] >=dev-ruby/connection_pool-2.2.2[ruby_targets_ruby30(-)] dev-ruby/rack[ruby_targets_ruby30(-)] dev-ruby/webmock[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+BDEPEND=test? ( ruby_targets_ruby27? ( dev-ruby/faraday-net_http:1[ruby_targets_ruby27(-)] >=dev-ruby/multipart-post-1.2.0[ruby_targets_ruby27(-)] <dev-ruby/multipart-post-3[ruby_targets_ruby27(-)] dev-ruby/ruby2_keywords[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/faraday-net_http:1[ruby_targets_ruby30(-)] >=dev-ruby/multipart-post-1.2.0[ruby_targets_ruby30(-)] <dev-ruby/multipart-post-3[ruby_targets_ruby30(-)] dev-ruby/ruby2_keywords[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/faraday-net_http:1[ruby_targets_ruby31(-)] >=dev-ruby/multipart-post-1.2.0[ruby_targets_ruby31(-)] <dev-ruby/multipart-post-3[ruby_targets_ruby31(-)] dev-ruby/ruby2_keywords[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/test-unit-2.4[ruby_targets_ruby27(-)] >=dev-ruby/connection_pool-2.2.2[ruby_targets_ruby27(-)] >=dev-ruby/httpclient-2.2[ruby_targets_ruby27(-)] >=dev-ruby/net-http-persistent-3.0[ruby_targets_ruby27(-)] >=dev-ruby/patron-0.4.2[ruby_targets_ruby27(-)] dev-ruby/rack[ruby_targets_ruby27(-)] >=dev-ruby/rack-test-0.6[ruby_targets_ruby27(-)] dev-ruby/webmock[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( >=dev-ruby/test-unit-2.4[ruby_targets_ruby30(-)] >=dev-ruby/connection_pool-2.2.2[ruby_targets_ruby30(-)] >=dev-ruby/httpclient-2.2[ruby_targets_ruby30(-)] >=dev-ruby/net-http-persistent-3.0[ruby_targets_ruby30(-)] >=dev-ruby/patron-0.4.2[ruby_targets_ruby30(-)] dev-ruby/rack[ruby_targets_ruby30(-)] >=dev-ruby/rack-test-0.6[ruby_targets_ruby30(-)] dev-ruby/webmock[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( >=dev-ruby/test-unit-2.4[ruby_targets_ruby31(-)] >=dev-ruby/connection_pool-2.2.2[ruby_targets_ruby31(-)] >=dev-ruby/httpclient-2.2[ruby_targets_ruby31(-)] >=dev-ruby/net-http-persistent-3.0[ruby_targets_ruby31(-)] >=dev-ruby/patron-0.4.2[ruby_targets_ruby31(-)] dev-ruby/rack[ruby_targets_ruby31(-)] >=dev-ruby/rack-test-0.6[ruby_targets_ruby31(-)] dev-ruby/webmock[ruby_targets_ruby31(-)] ) ) 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_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( sys-process/lsof ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DEPEND=test? ( sys-process/lsof ) 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_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
 DESCRIPTION=HTTP/REST API client library with pluggable components
 EAPI=8
 HOMEPAGE=https://github.com/lostisland/faraday
 INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 test test
+IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 test test
 KEYWORDS=amd64 ~arm ~ppc ~ppc64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( dev-ruby/faraday-net_http:1[ruby_targets_ruby27(-)] >=dev-ruby/multipart-post-1.2.0[ruby_targets_ruby27(-)] <dev-ruby/multipart-post-3[ruby_targets_ruby27(-)] dev-ruby/ruby2_keywords[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/faraday-net_http:1[ruby_targets_ruby30(-)] >=dev-ruby/multipart-post-1.2.0[ruby_targets_ruby30(-)] <dev-ruby/multipart-post-3[ruby_targets_ruby30(-)] dev-ruby/ruby2_keywords[ruby_targets_ruby30(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
+RDEPEND=ruby_targets_ruby27? ( dev-ruby/faraday-net_http:1[ruby_targets_ruby27(-)] >=dev-ruby/multipart-post-1.2.0[ruby_targets_ruby27(-)] <dev-ruby/multipart-post-3[ruby_targets_ruby27(-)] dev-ruby/ruby2_keywords[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/faraday-net_http:1[ruby_targets_ruby30(-)] >=dev-ruby/multipart-post-1.2.0[ruby_targets_ruby30(-)] <dev-ruby/multipart-post-3[ruby_targets_ruby30(-)] dev-ruby/ruby2_keywords[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/faraday-net_http:1[ruby_targets_ruby31(-)] >=dev-ruby/multipart-post-1.2.0[ruby_targets_ruby31(-)] <dev-ruby/multipart-post-3[ruby_targets_ruby31(-)] dev-ruby/ruby2_keywords[ruby_targets_ruby31(-)] ) 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_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/lostisland/faraday/archive/v1.3.1.tar.gz -> faraday-1.3.1.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=cd3180d2f1847528249f1ce3ee7dfe6f
+_md5_=9c644d1d8af8bd2cea00ee0f23d7868a
diff --git a/metadata/md5-cache/dev-ruby/faraday-net_http-1.0.1 b/metadata/md5-cache/dev-ruby/faraday-net_http-1.0.1
index 76517c3bec0b..855dea29dd17 100644
--- a/metadata/md5-cache/dev-ruby/faraday-net_http-1.0.1
+++ b/metadata/md5-cache/dev-ruby/faraday-net_http-1.0.1
@@ -1,17 +1,17 @@
-BDEPEND=ruby_targets_ruby27? ( test? ( >=dev-ruby/faraday-1.3.1:1[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( >=dev-ruby/faraday-1.3.1:1[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+BDEPEND=ruby_targets_ruby27? ( test? ( >=dev-ruby/faraday-1.3.1:1[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( >=dev-ruby/faraday-1.3.1:1[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( >=dev-ruby/faraday-1.3.1:1[ruby_targets_ruby31(-)] ) ) 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_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DEPEND=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_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
 DESCRIPTION=Faraday adapter for Net::HTTP
 EAPI=8
 HOMEPAGE=https://github.com/lostisland/faraday-net_http
 INHERIT=ruby-fakegem
-IUSE=ruby_targets_ruby27 ruby_targets_ruby30 doc test test
+IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
 KEYWORDS=amd64 ~arm ~ppc ~ppc64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
+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_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/lostisland/faraday-net_http/archive/v1.0.1.tar.gz -> faraday-net_http-1.0.1.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=1d583cbd5bd51b8224df49c27c71000e
+_md5_=a21053b0b87c2f170b85f920a20a88d4
diff --git a/metadata/md5-cache/dev-ruby/httpclient-2.8.3-r2 b/metadata/md5-cache/dev-ruby/httpclient-2.8.3-r2
index 2a88525c1ea1..99ba31f14777 100644
--- a/metadata/md5-cache/dev-ruby/httpclient-2.8.3-r2
+++ b/metadata/md5-cache/dev-ruby/httpclient-2.8.3-r2
@@ -1,17 +1,17 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( virtual/ruby-ssl[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/ruby-ssl[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/test-unit[ruby_targets_ruby27(-)] dev-ruby/http-cookie[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/test-unit[ruby_targets_ruby30(-)] dev-ruby/http-cookie[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+BDEPEND=test? ( ruby_targets_ruby27? ( virtual/ruby-ssl[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/ruby-ssl[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/ruby-ssl[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/test-unit[ruby_targets_ruby27(-)] dev-ruby/http-cookie[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/test-unit[ruby_targets_ruby30(-)] dev-ruby/http-cookie[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/test-unit[ruby_targets_ruby31(-)] dev-ruby/http-cookie[ruby_targets_ruby31(-)] ) ) 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_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DEPEND=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_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
 DESCRIPTION='httpclient' gives something like the functionality of libwww-perl (LWP) in Ruby
 EAPI=8
 HOMEPAGE=https://github.com/nahi/httpclient
 INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 doc test test
+IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
 KEYWORDS=amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
 LICENSE=|| ( Ruby Ruby-BSD BSD-2 )
-RDEPEND=ruby_targets_ruby27? ( virtual/ruby-ssl[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/ruby-ssl[ruby_targets_ruby30(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
+RDEPEND=ruby_targets_ruby27? ( virtual/ruby-ssl[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/ruby-ssl[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/ruby-ssl[ruby_targets_ruby31(-)] ) 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_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nahi/httpclient/archive/v2.8.3.tar.gz -> httpclient-2.8.3.tgz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=d817ad319d358a096eb190e6a1369edc
+_md5_=401a2807ac0bd50e1f6a921839a9bd77
diff --git a/metadata/md5-cache/dev-ruby/patron-0.13.3-r1 b/metadata/md5-cache/dev-ruby/patron-0.13.3-r1
index 635790aa4220..461e01b61f80 100644
--- a/metadata/md5-cache/dev-ruby/patron-0.13.3-r1
+++ b/metadata/md5-cache/dev-ruby/patron-0.13.3-r1
@@ -1,17 +1,17 @@
-BDEPEND=ruby_targets_ruby27? ( test? ( dev-ruby/rack[ruby_targets_ruby27(-)] www-servers/puma[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rack[ruby_targets_ruby30(-)] www-servers/puma[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ) virtual/pkgconfig
+BDEPEND=ruby_targets_ruby27? ( test? ( dev-ruby/rack[ruby_targets_ruby27(-)] www-servers/puma[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rack[ruby_targets_ruby30(-)] www-servers/puma[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rack[ruby_targets_ruby31(-)] www-servers/puma[ruby_targets_ruby31(-)] ) ) 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_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ) virtual/pkgconfig
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=net-misc/curl ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DEPEND=net-misc/curl 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_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
 DESCRIPTION=Patron is a Ruby HTTP client library based on libcurl
 EAPI=7
 HOMEPAGE=https://toland.github.com/patron/
 INHERIT=ruby-fakegem
-IUSE=ruby_targets_ruby27 ruby_targets_ruby30 doc test test
+IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
 KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=net-misc/curl ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
+RDEPEND=net-misc/curl 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_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/patron-0.13.3.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=635f123be43cf1914dab4cde1e75e2c9
+_md5_=6d34511ef5cc6c1e6ce549f8bc896319
diff --git a/metadata/md5-cache/dev-ruby/typhoeus-1.4.0-r1 b/metadata/md5-cache/dev-ruby/typhoeus-1.4.0-r1
index c800f68696aa..ed17240c235b 100644
--- a/metadata/md5-cache/dev-ruby/typhoeus-1.4.0-r1
+++ b/metadata/md5-cache/dev-ruby/typhoeus-1.4.0-r1
@@ -1,17 +1,17 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( >=dev-ruby/ethon-0.9.0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/ethon-0.9.0[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/json[ruby_targets_ruby27(-)] || ( dev-ruby/faraday:1[ruby_targets_ruby27(-)] >=dev-ruby/faraday-0.9[ruby_targets_ruby27(-)] ) >=dev-ruby/sinatra-1.3[ruby_targets_ruby27(-)] >=dev-ruby/redis-3.0[ruby_targets_ruby27(-)] >=dev-ruby/dalli-2.7.9[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/json[ruby_targets_ruby30(-)] || ( dev-ruby/faraday:1[ruby_targets_ruby30(-)] >=dev-ruby/faraday-0.9[ruby_targets_ruby30(-)] ) >=dev-ruby/sinatra-1.3[ruby_targets_ruby30(-)] >=dev-ruby/redis-3.0[ruby_targets_ruby30(-)] >=dev-ruby/dalli-2.7.9[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+BDEPEND=test? ( ruby_targets_ruby27? ( <dev-ruby/ethon-0.16.0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( <dev-ruby/ethon-0.16.0[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( <dev-ruby/ethon-0.16.0[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/json[ruby_targets_ruby27(-)] || ( dev-ruby/faraday:1[ruby_targets_ruby27(-)] >=dev-ruby/faraday-0.9:0[ruby_targets_ruby27(-)] ) >=dev-ruby/sinatra-1.3[ruby_targets_ruby27(-)] >=dev-ruby/redis-3.0[ruby_targets_ruby27(-)] >=dev-ruby/dalli-2.7.9[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/json[ruby_targets_ruby30(-)] || ( dev-ruby/faraday:1[ruby_targets_ruby30(-)] >=dev-ruby/faraday-0.9:0[ruby_targets_ruby30(-)] ) >=dev-ruby/sinatra-1.3[ruby_targets_ruby30(-)] >=dev-ruby/redis-3.0[ruby_targets_ruby30(-)] >=dev-ruby/dalli-2.7.9[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/json[ruby_targets_ruby31(-)] || ( dev-ruby/faraday:1[ruby_targets_ruby31(-)] >=dev-ruby/faraday-0.9:0[ruby_targets_ruby31(-)] ) >=dev-ruby/sinatra-1.3[ruby_targets_ruby31(-)] >=dev-ruby/redis-3.0[ruby_targets_ruby31(-)] >=dev-ruby/dalli-2.7.9[ruby_targets_ruby31(-)] ) ) 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_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DEPEND=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_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
 DESCRIPTION=Runs HTTP requests in parallel while cleanly encapsulating handling logic
 EAPI=8
 HOMEPAGE=https://rubygems.org/gems/typhoeus/ https://github.com/typhoeus/typhoeus
 INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 test test
+IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( >=dev-ruby/ethon-0.9.0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/ethon-0.9.0[ruby_targets_ruby30(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
+RDEPEND=ruby_targets_ruby27? ( <dev-ruby/ethon-0.16.0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( <dev-ruby/ethon-0.16.0[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( <dev-ruby/ethon-0.16.0[ruby_targets_ruby31(-)] ) 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_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/typhoeus-1.4.0.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=a9a5446c50aaa9e853050bd3eb262507
+_md5_=f2c20138a24e5f9d0743cd40224d1bf0
diff --git a/metadata/md5-cache/dev-ruby/typhoeus-1.4.0-r2 b/metadata/md5-cache/dev-ruby/typhoeus-1.4.0-r2
new file mode 100644
index 000000000000..ed17240c235b
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/typhoeus-1.4.0-r2
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby27? ( <dev-ruby/ethon-0.16.0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( <dev-ruby/ethon-0.16.0[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( <dev-ruby/ethon-0.16.0[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/json[ruby_targets_ruby27(-)] || ( dev-ruby/faraday:1[ruby_targets_ruby27(-)] >=dev-ruby/faraday-0.9:0[ruby_targets_ruby27(-)] ) >=dev-ruby/sinatra-1.3[ruby_targets_ruby27(-)] >=dev-ruby/redis-3.0[ruby_targets_ruby27(-)] >=dev-ruby/dalli-2.7.9[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/json[ruby_targets_ruby30(-)] || ( dev-ruby/faraday:1[ruby_targets_ruby30(-)] >=dev-ruby/faraday-0.9:0[ruby_targets_ruby30(-)] ) >=dev-ruby/sinatra-1.3[ruby_targets_ruby30(-)] >=dev-ruby/redis-3.0[ruby_targets_ruby30(-)] >=dev-ruby/dalli-2.7.9[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/json[ruby_targets_ruby31(-)] || ( dev-ruby/faraday:1[ruby_targets_ruby31(-)] >=dev-ruby/faraday-0.9:0[ruby_targets_ruby31(-)] ) >=dev-ruby/sinatra-1.3[ruby_targets_ruby31(-)] >=dev-ruby/redis-3.0[ruby_targets_ruby31(-)] >=dev-ruby/dalli-2.7.9[ruby_targets_ruby31(-)] ) ) 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_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=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_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+DESCRIPTION=Runs HTTP requests in parallel while cleanly encapsulating handling logic
+EAPI=8
+HOMEPAGE=https://rubygems.org/gems/typhoeus/ https://github.com/typhoeus/typhoeus
+INHERIT=ruby-fakegem
+IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby27? ( <dev-ruby/ethon-0.16.0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( <dev-ruby/ethon-0.16.0[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( <dev-ruby/ethon-0.16.0[ruby_targets_ruby31(-)] ) 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_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=1
+SRC_URI=https://rubygems.org/gems/typhoeus-1.4.0.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
+_md5_=f2c20138a24e5f9d0743cd40224d1bf0
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 72bcf0c41b48..4672ddc54814 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/fq-0.2.0 b/metadata/md5-cache/dev-util/fq-0.2.0
new file mode 100644
index 000000000000..a68c50fd728d
--- /dev/null
+++ b/metadata/md5-cache/dev-util/fq-0.2.0
@@ -0,0 +1,14 @@
+BDEPEND=test? ( dev-tcltk/expect ) >=dev-lang/go-1.18 app-arch/unzip
+DEFINED_PHASES=compile install prepare unpack
+DESCRIPTION=Tool for working with binary data (jq for binary formats)
+EAPI=8
+HOMEPAGE=https://github.com/wader/fq
+INHERIT=go-module
+IUSE=test
+KEYWORDS=~amd64
+LICENSE=MIT BSD-2
+RESTRICT=!test? ( test ) strip
+SLOT=0
+SRC_URI=https://github.com/wader/fq/archive/v0.2.0.tar.gz -> fq-0.2.0.tar.gz https://dev.gentoo.org/~sam/distfiles/dev-util/fq/fq-0.2.0-deps.tar.xz
+_eclasses_=go-module	4c4b34f361efda91762ffeda8f632c02
+_md5_=c72bdc1878e15e21b02fd3b842fde279
diff --git a/metadata/md5-cache/dev-util/gn-0.2049 b/metadata/md5-cache/dev-util/gn-0.2049
index d38b4b0c4a79..09a29554d402 100644
--- a/metadata/md5-cache/dev-util/gn-0.2049
+++ b/metadata/md5-cache/dev-util/gn-0.2049
@@ -5,9 +5,9 @@ EAPI=8
 HOMEPAGE=https://gn.googlesource.com/
 INHERIT=ninja-utils python-any-r1 toolchain-funcs
 IUSE=vim-syntax
-KEYWORDS=amd64 ~arm64 ~loong ~ppc64 ~riscv x86
+KEYWORDS=amd64 arm64 ~loong ~ppc64 ~riscv x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~xen0n/distfiles/dev-util/gn/gn-0.2049.tar.xz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-any-r1	1a218637f27d4c027b92e511707264fd	python-utils-r1	6a75203e8a499f0fb42971452ce15388	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=c8c8d2c8a110dd5016648055b3b32e18
+_md5_=6f4cf7fedd38a2796dac0dbcf0695db2
diff --git a/metadata/md5-cache/dev-util/patchelf-0.17.0 b/metadata/md5-cache/dev-util/patchelf-0.17.0
index a9d9d6253f2f..f3e121736ee7 100644
--- a/metadata/md5-cache/dev-util/patchelf-0.17.0
+++ b/metadata/md5-cache/dev-util/patchelf-0.17.0
@@ -4,9 +4,9 @@ DESCRIPTION=Small utility to modify the dynamic linker and RPATH of ELF executab
 EAPI=8
 HOMEPAGE=https://github.com/NixOS/patchelf
 INHERIT=autotools
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~riscv-linux ~x86-linux
+KEYWORDS=amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~riscv-linux ~x86-linux
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=https://github.com/NixOS/patchelf/archive/0.17.0.tar.gz -> patchelf-0.17.0.tar.gz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=35e04801e65bcf41ad573c7197c80976
+_md5_=16d599edeeeb7a2b4169fd0eb993fd6b
diff --git a/metadata/md5-cache/mail-filter/Manifest.gz b/metadata/md5-cache/mail-filter/Manifest.gz
index f5bc90cd027a..e57bbb2ecb13 100644
--- a/metadata/md5-cache/mail-filter/Manifest.gz
+++ b/metadata/md5-cache/mail-filter/Manifest.gz
diff --git a/metadata/md5-cache/mail-filter/spamassassin-4.0.0 b/metadata/md5-cache/mail-filter/spamassassin-4.0.0
new file mode 100644
index 000000000000..420327c98ed1
--- /dev/null
+++ b/metadata/md5-cache/mail-filter/spamassassin-4.0.0
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst preinst prepare test
+DEPEND=acct-user/spamd acct-group/spamd dev-lang/perl:= dev-perl/HTML-Parser dev-perl/Net-DNS dev-perl/NetAddr-IP virtual/perl-Digest-SHA ssl? ( dev-libs/openssl:0= ) test? ( app-crypt/gnupg dev-perl/Archive-Zip dev-perl/BSD-Resource dev-perl/Digest-SHA1 dev-perl/Email-Address-XS dev-perl/Encode-Detect || ( dev-perl/GeoIP2 dev-perl/Geo-IP ) dev-perl/IO-String dev-perl/Mail-DKIM dev-perl/Mail-DMARC dev-perl/Mail-SPF dev-perl/Net-Patricia dev-perl/Net-LibIDN2 dev-util/re2c || ( net-misc/wget[ssl] net-misc/curl[ssl] ) virtual/perl-MIME-Base64 dev-perl/Pod-Parser berkdb? ( virtual/perl-DB_File ) ipv6? ( dev-perl/IO-Socket-INET6 ) ldap? ( dev-perl/perl-ldap ) mysql? ( dev-perl/DBI dev-perl/DBD-mysql ) postgres? ( dev-perl/DBI dev-perl/DBD-Pg ) sqlite? ( dev-perl/DBI dev-perl/DBD-SQLite ) ssl? ( dev-perl/IO-Socket-SSL ) virtual/perl-Test-Harness )
+DESCRIPTION=An extensible mail filter which can identify and tag spam
+EAPI=8
+HOMEPAGE=https://spamassassin.apache.org/
+INHERIT=perl-functions systemd toolchain-funcs
+IUSE=berkdb cron ipv6 ldap mysql postgres qmail sqlite ssl test
+KEYWORDS=~alpha ~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0 GPL-2
+RDEPEND=acct-user/spamd acct-group/spamd dev-lang/perl:= dev-perl/HTML-Parser dev-perl/Net-DNS dev-perl/NetAddr-IP virtual/perl-Digest-SHA ssl? ( dev-libs/openssl:0= ) app-crypt/gnupg dev-perl/Archive-Zip dev-perl/BSD-Resource dev-perl/Digest-SHA1 dev-perl/Email-Address-XS dev-perl/Encode-Detect || ( dev-perl/GeoIP2 dev-perl/Geo-IP ) dev-perl/IO-String dev-perl/Mail-DKIM dev-perl/Mail-DMARC dev-perl/Mail-SPF dev-perl/Net-Patricia dev-perl/Net-LibIDN2 dev-util/re2c || ( net-misc/wget[ssl] net-misc/curl[ssl] ) virtual/perl-MIME-Base64 dev-perl/Pod-Parser berkdb? ( virtual/perl-DB_File ) ipv6? ( dev-perl/IO-Socket-INET6 ) ldap? ( dev-perl/perl-ldap ) mysql? ( dev-perl/DBI dev-perl/DBD-mysql ) postgres? ( dev-perl/DBI dev-perl/DBD-Pg ) sqlite? ( dev-perl/DBI dev-perl/DBD-SQLite ) ssl? ( dev-perl/IO-Socket-SSL )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://apache/spamassassin/source/Mail-SpamAssassin-4.0.0.tar.bz2
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	perl-functions	c3fca037246e877693badea0df3b0ef8	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
+_md5_=4ce03b8c88d85f84d648965b011a1c08
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index 11035cefb6a6..c8b390a819f9 100644
--- a/metadata/md5-cache/media-gfx/Manifest.gz
+++ b/metadata/md5-cache/media-gfx/Manifest.gz
diff --git a/metadata/md5-cache/media-gfx/gimp-2.10.32-r4 b/metadata/md5-cache/media-gfx/gimp-2.10.32-r4
new file mode 100644
index 000000000000..291b0fd59603
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/gimp-2.10.32-r4
@@ -0,0 +1,17 @@
+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 app-arch/xz-utils test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=app-accessibility/at-spi2-core-2.46.0 >=app-text/poppler-0.50[cairo] >=app-text/poppler-data-0.4.7 >=dev-libs/glib-2.56.2:2 >=dev-libs/json-glib-1.2.6 dev-libs/libxml2:2 dev-libs/libxslt >=gnome-base/librsvg-2.40.6:2 >=media-gfx/mypaint-brushes-2.0.2:= >=media-libs/babl-0.1.90 >=media-libs/fontconfig-2.12.4 >=media-libs/freetype-2.1.7 >=media-libs/gegl-0.4.36:0.4[cairo] >=media-libs/gexiv2-0.10.6 >=media-libs/harfbuzz-0.9.19:= >=media-libs/lcms-2.8:2 media-libs/libjpeg-turbo:= >=media-libs/libmypaint-1.6.1:= >=media-libs/libpng-1.6.25:0= >=media-libs/tiff-3.5.7:= net-libs/glib-networking[ssl] sys-libs/zlib >=x11-libs/cairo-1.12.2 >=x11-libs/gdk-pixbuf-2.31:2 >=x11-libs/gtk+-2.24.32:2 x11-libs/libXcursor >=x11-libs/pango-1.29.4 aalib? ( media-libs/aalib ) alsa? ( >=media-libs/alsa-lib-1.0.0 ) aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 ) heif? ( >=media-libs/libheif-1.9.1:= ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= ) jpegxl? ( >=media-libs/libjxl-0.6.1:= ) mng? ( media-libs/libmng:= ) openexr? ( >=media-libs/openexr-1.6.1:= ) postscript? ( app-text/ghostscript-gpl:= ) udev? ( dev-libs/libgudev:= ) unwind? ( >=sys-libs/libunwind-1.1.0:= ) webp? ( >=media-libs/libwebp-0.6.0:= ) wmf? ( >=media-libs/libwmf-0.2.8 ) xpm? ( x11-libs/libXpm ) >=dev-lang/perl-5.10.0 dev-libs/appstream-glib dev-util/gtk-update-icon-cache >=dev-util/intltool-0.40.1 >=sys-devel/gettext-0.19 >=sys-devel/libtool-2.2 virtual/pkgconfig
+DESCRIPTION=GNU Image Manipulation Program
+EAPI=8
+HOMEPAGE=https://www.gimp.org/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=autotools gnome2 toolchain-funcs virtualx
+IUSE=aalib alsa aqua debug doc gnome heif jpeg2k jpegxl mng openexr postscript udev unwind vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~x86
+LICENSE=GPL-3+ LGPL-3+
+RDEPEND=>=app-accessibility/at-spi2-core-2.46.0 >=app-text/poppler-0.50[cairo] >=app-text/poppler-data-0.4.7 >=dev-libs/glib-2.56.2:2 >=dev-libs/json-glib-1.2.6 dev-libs/libxml2:2 dev-libs/libxslt >=gnome-base/librsvg-2.40.6:2 >=media-gfx/mypaint-brushes-2.0.2:= >=media-libs/babl-0.1.90 >=media-libs/fontconfig-2.12.4 >=media-libs/freetype-2.1.7 >=media-libs/gegl-0.4.36:0.4[cairo] >=media-libs/gexiv2-0.10.6 >=media-libs/harfbuzz-0.9.19:= >=media-libs/lcms-2.8:2 media-libs/libjpeg-turbo:= >=media-libs/libmypaint-1.6.1:= >=media-libs/libpng-1.6.25:0= >=media-libs/tiff-3.5.7:= net-libs/glib-networking[ssl] sys-libs/zlib >=x11-libs/cairo-1.12.2 >=x11-libs/gdk-pixbuf-2.31:2 >=x11-libs/gtk+-2.24.32:2 x11-libs/libXcursor >=x11-libs/pango-1.29.4 aalib? ( media-libs/aalib ) alsa? ( >=media-libs/alsa-lib-1.0.0 ) aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 ) heif? ( >=media-libs/libheif-1.9.1:= ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= ) jpegxl? ( >=media-libs/libjxl-0.6.1:= ) mng? ( media-libs/libmng:= ) openexr? ( >=media-libs/openexr-1.6.1:= ) postscript? ( app-text/ghostscript-gpl:= ) udev? ( dev-libs/libgudev:= ) unwind? ( >=sys-libs/libunwind-1.1.0:= ) webp? ( >=media-libs/libwebp-0.6.0:= ) wmf? ( >=media-libs/libwmf-0.2.8 ) xpm? ( x11-libs/libXpm ) x11-themes/hicolor-icon-theme gnome? ( gnome-base/gvfs )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0/2
+SRC_URI=mirror://gimp/v2.10/gimp-2.10.32.tar.bz2
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=d78037e100055e2952add008d2229ab2
diff --git a/metadata/md5-cache/media-plugins/Manifest.gz b/metadata/md5-cache/media-plugins/Manifest.gz
index b744ae2dcce5..80d01d24679b 100644
--- a/metadata/md5-cache/media-plugins/Manifest.gz
+++ b/metadata/md5-cache/media-plugins/Manifest.gz
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-pulse-1.20.4-r1 b/metadata/md5-cache/media-plugins/gst-plugins-pulse-1.20.4-r1
new file mode 100644
index 000000000000..15388cd537f0
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-pulse-1.20.4-r1
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) virtual/pkgconfig virtual/perl-JSON-PP
+DEFINED_PHASES=compile configure install test
+DEPEND=>=media-libs/gst-plugins-base-1.20.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libpulse-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.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(-)?] >=media-libs/gstreamer-1.20:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.20.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=PulseAudio sound server plugin for GStreamer
+EAPI=7
+HOMEPAGE=https://gstreamer.freedesktop.org/
+INHERIT=gstreamer-meson
+IUSE=test 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 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=media-libs/gst-plugins-base-1.20.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libpulse-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.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(-)?] >=media-libs/gstreamer-1.20:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.20.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=test
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.20.4.tar.xz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	4970386c5986009071b910317fcba839	meson	1994a5aef5d4f5798b92f64d6f9a6003	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-utils-r1	6a75203e8a499f0fb42971452ce15388	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	virtualx	644887c82aefdf12001489391fca4f02	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=5345cc18990a080ea2abcd31ceda7a48
diff --git a/metadata/md5-cache/media-plugins/hdx-realtime-media-engine-2.9.500.2802-r1 b/metadata/md5-cache/media-plugins/hdx-realtime-media-engine-2.9.500.2802-r1
new file mode 100644
index 000000000000..7dd632e65277
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/hdx-realtime-media-engine-2.9.500.2802-r1
@@ -0,0 +1,14 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install nofetch setup unpack
+DESCRIPTION=HDX RealTime Media Engine plugin for Citrix Workspace App
+EAPI=8
+HOMEPAGE=https://www.citrix.com/
+INHERIT=unpacker
+KEYWORDS=~amd64 ~x86
+LICENSE=icaclient
+RDEPEND=sys-libs/llvm-libunwind || ( media-video/pipewire media-sound/pulseaudio media-sound/apulse ) !<net-misc/icaclient-22.12.0.12
+RESTRICT=fetch mirror strip
+SLOT=0
+SRC_URI=amd64? ( HDX_RealTime_Media_Engine_2.9.500_for_Linux_x64.zip ) x86? ( HDX_RealTime_Media_Engine_2.9.500_for_Linux.zip )
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	unpacker	f03f9c0c03643e8057ad762b297ce01e
+_md5_=5e8af1273be88b143eba8792804681a2
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index eaba4657ea1c..727362077054 100644
--- a/metadata/md5-cache/media-sound/Manifest.gz
+++ b/metadata/md5-cache/media-sound/Manifest.gz
diff --git a/metadata/md5-cache/media-sound/pavucontrol-5.0-r2 b/metadata/md5-cache/media-sound/pavucontrol-5.0-r2
new file mode 100644
index 000000000000..1a5d95f240ac
--- /dev/null
+++ b/metadata/md5-cache/media-sound/pavucontrol-5.0-r2
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig nls? ( dev-util/intltool sys-devel/gettext )
+DEFINED_PHASES=configure
+DEPEND=dev-libs/json-glib >=dev-cpp/gtkmm-3.22:3.0[X] >=dev-libs/libsigc++-2.2:2 >=media-libs/libcanberra-0.16[gtk3] >=media-libs/libpulse-15.0[glib] virtual/freedesktop-icon-theme
+DESCRIPTION=Pulseaudio Volume Control, GTK based mixer for Pulseaudio
+EAPI=7
+HOMEPAGE=https://freedesktop.org/software/pulseaudio/pavucontrol/
+IUSE=nls
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/json-glib >=dev-cpp/gtkmm-3.22:3.0[X] >=dev-libs/libsigc++-2.2:2 >=media-libs/libcanberra-0.16[gtk3] >=media-libs/libpulse-15.0[glib] virtual/freedesktop-icon-theme
+SLOT=0
+SRC_URI=https://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-5.0.tar.xz
+_md5_=507e21766eafb71e195b63ca2ca35681
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index 8df6080da986..682376eac0e4 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/wireshark-3.6.10 b/metadata/md5-cache/net-analyzer/wireshark-3.6.10
index 16b540eb3dcd..e4dad0ffd965 100644
--- a/metadata/md5-cache/net-analyzer/wireshark-3.6.10
+++ b/metadata/md5-cache/net-analyzer/wireshark-3.6.10
@@ -10,9 +10,9 @@ IUSE=androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon
 KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc64 ~riscv ~x86
 LICENSE=GPL-2
 RDEPEND=acct-group/pcap >=dev-libs/glib-2.38:2 >=net-dns/c-ares-1.5:= dev-libs/libgcrypt:= media-libs/speexdsp bcg729? ( media-libs/bcg729 ) brotli? ( app-arch/brotli:= ) ciscodump? ( >=net-libs/libssh-0.6 ) filecaps? ( sys-libs/libcap ) http2? ( net-libs/nghttp2:= ) ilbc? ( media-libs/libilbc ) kerberos? ( virtual/krb5 ) libxml2? ( dev-libs/libxml2 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) lz4? ( app-arch/lz4:= ) maxminddb? ( dev-libs/libmaxminddb:= ) minizip? ( sys-libs/zlib[minizip] ) netlink? ( dev-libs/libnl:3 ) opus? ( media-libs/opus ) pcap? ( net-libs/libpcap ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) sdjournal? ( sys-apps/systemd ) smi? ( net-libs/libsmi ) snappy? ( app-arch/snappy ) spandsp? ( media-libs/spandsp ) sshdump? ( >=net-libs/libssh-0.6 ) ssl? ( net-libs/gnutls:= ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd:= ) qt5? ( virtual/freedesktop-icon-theme ) selinux? ( sec-policy/selinux-wireshark )
-REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 ) ) plugin-ifdemo? ( plugins )
+REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 ) ) plugin-ifdemo? ( plugins qt5 )
 RESTRICT=!test? ( test )
 SLOT=0/3.6.10
 SRC_URI=https://www.wireshark.org/download/src/all-versions/wireshark-3.6.10.tar.xz
 _eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	fcaps	babe6282ea5c195981bd302af1adaf3a	flag-o-matic	69394e25812406faa1f90edaf4969395	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-any-r1	1a218637f27d4c027b92e511707264fd	python-utils-r1	6a75203e8a499f0fb42971452ce15388	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=8c70b492945f71c7c1b253085bbbaf3b
+_md5_=544af5b74bdfce466984b66961b73cee
diff --git a/metadata/md5-cache/net-analyzer/wireshark-3.6.9 b/metadata/md5-cache/net-analyzer/wireshark-3.6.9
index bc729e2bd3a8..af15906cd33e 100644
--- a/metadata/md5-cache/net-analyzer/wireshark-3.6.9
+++ b/metadata/md5-cache/net-analyzer/wireshark-3.6.9
@@ -10,9 +10,9 @@ IUSE=androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc64 ~riscv x86
 LICENSE=GPL-2
 RDEPEND=acct-group/pcap >=dev-libs/glib-2.38:2 >=net-dns/c-ares-1.5:= dev-libs/libgcrypt:= media-libs/speexdsp bcg729? ( media-libs/bcg729 ) brotli? ( app-arch/brotli:= ) ciscodump? ( >=net-libs/libssh-0.6 ) filecaps? ( sys-libs/libcap ) http2? ( net-libs/nghttp2:= ) ilbc? ( media-libs/libilbc ) kerberos? ( virtual/krb5 ) libxml2? ( dev-libs/libxml2 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) lz4? ( app-arch/lz4:= ) maxminddb? ( dev-libs/libmaxminddb:= ) minizip? ( sys-libs/zlib[minizip] ) netlink? ( dev-libs/libnl:3 ) opus? ( media-libs/opus ) pcap? ( net-libs/libpcap ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) sdjournal? ( sys-apps/systemd ) smi? ( net-libs/libsmi ) snappy? ( app-arch/snappy ) spandsp? ( media-libs/spandsp ) sshdump? ( >=net-libs/libssh-0.6 ) ssl? ( net-libs/gnutls:= ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd:= ) qt5? ( virtual/freedesktop-icon-theme ) selinux? ( sec-policy/selinux-wireshark )
-REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 ) ) plugin-ifdemo? ( plugins )
+REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 ) ) plugin-ifdemo? ( plugins qt5 )
 RESTRICT=!test? ( test )
 SLOT=0/3.6.9
 SRC_URI=https://www.wireshark.org/download/src/all-versions/wireshark-3.6.9.tar.xz
 _eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	fcaps	babe6282ea5c195981bd302af1adaf3a	flag-o-matic	69394e25812406faa1f90edaf4969395	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-any-r1	1a218637f27d4c027b92e511707264fd	python-utils-r1	6a75203e8a499f0fb42971452ce15388	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=af938c6c6ceca56360cd8f4a0e27cf1a
+_md5_=ef99127e438629006c72e6936e5e4628
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index 7b87d88a8c5b..0b98f2b9807a 100644
--- a/metadata/md5-cache/net-im/Manifest.gz
+++ b/metadata/md5-cache/net-im/Manifest.gz
diff --git a/metadata/md5-cache/net-im/telegram-desktop-bin-4.4.1 b/metadata/md5-cache/net-im/telegram-desktop-bin-4.4.1
new file mode 100644
index 000000000000..ca1dbd98b0b6
--- /dev/null
+++ b/metadata/md5-cache/net-im/telegram-desktop-bin-4.4.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm preinst prepare
+DESCRIPTION=Official desktop client for Telegram (binary package)
+EAPI=8
+HOMEPAGE=https://desktop.telegram.org
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=desktop optfeature xdg
+KEYWORDS=-* ~amd64
+LICENSE=GPL-3-with-openssl-exception
+RDEPEND=!net-im/telegram-desktop sys-libs/glibc dev-libs/glib:2 >=media-libs/fontconfig-2.13 media-libs/freetype:2 virtual/opengl x11-libs/libX11 >=x11-libs/libxcb-1.10
+SLOT=0
+SRC_URI=https://github.com/telegramdesktop/tdesktop/archive/v4.4.1.tar.gz -> tdesktop-4.4.1.tar.gz amd64? ( https://updates.tdesktop.com/tlinux/tsetup.4.4.1.tar.xz )
+_eclasses_=desktop	7eb20ad915a0a318176d51bc2508ff5c	optfeature	1a2157392a869265b2afcb63a26c12ac	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=442dd191ac6d66a181d1a79458598061
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 0dcf2d07f558..88d9d8f0c7b3 100644
--- a/metadata/md5-cache/net-misc/Manifest.gz
+++ b/metadata/md5-cache/net-misc/Manifest.gz
diff --git a/metadata/md5-cache/net-misc/hylafaxplus-7.0.3-r7 b/metadata/md5-cache/net-misc/hylafaxplus-7.0.3-r7
deleted file mode 100644
index 224b5c822e2b..000000000000
--- a/metadata/md5-cache/net-misc/hylafaxplus-7.0.3-r7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=app-text/ghostscript-gpl media-libs/tiff:=[jbig?] media-libs/libjpeg-turbo:= >=sys-libs/zlib-1.1.4 app-alternatives/awk virtual/libcrypt:= virtual/mta jbig? ( media-libs/jbigkit ) lcms? ( media-libs/lcms ) ldap? ( net-nds/openldap:= ) mgetty? ( net-dialup/mgetty[-fax] ) pam? ( sys-libs/pam )
-DESCRIPTION=Enterprise client-server fax package for class 1 and 2 fax modems
-EAPI=7
-HOMEPAGE=https://hylafax.sourceforge.io/
-INHERIT=edo pam toolchain-funcs
-IUSE=html jbig lcms ldap mgetty pam
-KEYWORDS=~amd64 ~x86
-LICENSE=hylafaxplus
-RDEPEND=app-text/ghostscript-gpl media-libs/tiff:=[jbig?] media-libs/libjpeg-turbo:= >=sys-libs/zlib-1.1.4 app-alternatives/awk virtual/libcrypt:= virtual/mta jbig? ( media-libs/jbigkit ) lcms? ( media-libs/lcms ) ldap? ( net-nds/openldap:= ) mgetty? ( net-dialup/mgetty[-fax] ) pam? ( sys-libs/pam ) !net-dialup/mgetty[fax] !net-dialup/sendpage
-SLOT=0
-SRC_URI=mirror://sourceforge/hylafax/hylafax-7.0.3.tar.gz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	pam	e44a1dd98f13e1ad76de01e919bde1f1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=6df9b179ed3bf5acb5810805abb4fb82
diff --git a/metadata/md5-cache/net-misc/hylafaxplus-7.0.3-r8 b/metadata/md5-cache/net-misc/hylafaxplus-7.0.3-r8
deleted file mode 100644
index 30f53fbf45bb..000000000000
--- a/metadata/md5-cache/net-misc/hylafaxplus-7.0.3-r8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=app-text/ghostscript-gpl media-libs/tiff:=[jbig?] media-libs/libjpeg-turbo:= !net-dialup/mgetty[fax] >=sys-libs/zlib-1.1.4 app-alternatives/awk virtual/mta jbig? ( media-libs/jbigkit ) lcms? ( media-libs/lcms ) ldap? ( net-nds/openldap:= ) mgetty? ( net-dialup/mgetty[-fax] ) pam? ( sys-libs/pam )
-DESCRIPTION=Enterprise client-server fax package for class 1 and 2 fax modems
-EAPI=7
-HOMEPAGE=https://hylafax.sourceforge.io/
-INHERIT=pam toolchain-funcs
-IUSE=html jbig lcms ldap mgetty pam
-KEYWORDS=amd64 x86
-LICENSE=hylafaxplus
-RDEPEND=app-text/ghostscript-gpl media-libs/tiff:=[jbig?] media-libs/libjpeg-turbo:= !net-dialup/mgetty[fax] >=sys-libs/zlib-1.1.4 app-alternatives/awk virtual/mta jbig? ( media-libs/jbigkit ) lcms? ( media-libs/lcms ) ldap? ( net-nds/openldap:= ) mgetty? ( net-dialup/mgetty[-fax] ) pam? ( sys-libs/pam ) !net-dialup/sendpage
-SLOT=0
-SRC_URI=mirror://sourceforge/hylafax/hylafax-7.0.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	pam	e44a1dd98f13e1ad76de01e919bde1f1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=48eb854ea73246847cf8c457093c6bd2
diff --git a/metadata/md5-cache/net-misc/hylafaxplus-7.0.6-r3 b/metadata/md5-cache/net-misc/hylafaxplus-7.0.6-r3
index 871bca7c5a2b..cf607594677f 100644
--- a/metadata/md5-cache/net-misc/hylafaxplus-7.0.6-r3
+++ b/metadata/md5-cache/net-misc/hylafaxplus-7.0.6-r3
@@ -11,4 +11,4 @@ RDEPEND=app-text/ghostscript-gpl media-libs/tiff:=[jbig?] media-libs/libjpeg-tur
 SLOT=0
 SRC_URI=mirror://sourceforge/hylafax/hylafax-7.0.6.tar.gz
 _eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	pam	e44a1dd98f13e1ad76de01e919bde1f1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=d65097dc6d7da689cbb15501a01c9b7b
+_md5_=bcfc3217a01e9b4aa0cbd0eec9b717cc
diff --git a/metadata/md5-cache/net-misc/icaclient-22.12.0.12 b/metadata/md5-cache/net-misc/icaclient-22.12.0.12
new file mode 100644
index 000000000000..bc66a4a9c118
--- /dev/null
+++ b/metadata/md5-cache/net-misc/icaclient-22.12.0.12
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install nofetch postinst postrm preinst prepare setup unpack
+DESCRIPTION=ICA Client for Citrix Presentation servers
+EAPI=8
+HOMEPAGE=https://www.citrix.com/
+INHERIT=desktop wrapper xdg-utils
+IUSE=l10n_de l10n_es l10n_fr l10n_ja l10n_zh-CN hdx
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=icaclient
+RDEPEND=>=app-accessibility/at-spi2-core-2.46.0:2 app-crypt/libsecret dev-libs/glib:2 dev-libs/libxml2 media-fonts/font-adobe-100dpi media-fonts/font-misc-misc media-fonts/font-cursor-misc media-fonts/font-xfree86-type1 media-fonts/font-misc-ethiopic media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/gst-plugins-base:1.0 media-libs/gstreamer:1.0 media-libs/libogg media-libs/libpulse media-libs/libvorbis media-libs/mesa media-libs/speex net-libs/libsoup:2.4 net-libs/webkit-gtk:4 sys-apps/util-linux sys-libs/libcxx sys-libs/libcxxabi sys-libs/zlib virtual/krb5 virtual/libudev x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXaw x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXmu x11-libs/libXrender x11-libs/libXt x11-libs/pango !hdx? ( !<media-plugins/hdx-realtime-media-engine-2.9.500.2802-r1 )
+RESTRICT=mirror strip fetch
+SLOT=0
+SRC_URI=amd64? ( linuxx64-22.12.0.12.tar.gz ) x86? ( linuxx86-22.12.0.12.tar.gz )
+_eclasses_=desktop	7eb20ad915a0a318176d51bc2508ff5c	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=0a0057ffa8cb86816d010e12e2a3537e
diff --git a/metadata/md5-cache/net-nntp/Manifest.gz b/metadata/md5-cache/net-nntp/Manifest.gz
index df3ac905a225..76e257206ba8 100644
--- a/metadata/md5-cache/net-nntp/Manifest.gz
+++ b/metadata/md5-cache/net-nntp/Manifest.gz
diff --git a/metadata/md5-cache/net-nntp/sabnzbd-3.7.1 b/metadata/md5-cache/net-nntp/sabnzbd-3.7.1
new file mode 100644
index 000000000000..59320e728961
--- /dev/null
+++ b/metadata/md5-cache/net-nntp/sabnzbd-3.7.1
@@ -0,0 +1,17 @@
+BDEPEND=test? ( python_single_target_python3_8? ( dev-python/flaky[python_targets_python3_8(-)] >=dev-python/lxml-4.5.0[python_targets_python3_8(-)] dev-python/pkginfo[python_targets_python3_8(-)] dev-python/pyfakefs[python_targets_python3_8(-)] dev-python/pytest-httpbin[python_targets_python3_8(-)] dev-python/pytest-httpserver[python_targets_python3_8(-)] dev-python/pytest[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] dev-python/selenium[python_targets_python3_8(-)] dev-python/tavalidate[python_targets_python3_8(-)] dev-python/tavern[python_targets_python3_8(-)] dev-python/werkzeug[python_targets_python3_8(-)] dev-python/xmltodict[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/flaky[python_targets_python3_9(-)] >=dev-python/lxml-4.5.0[python_targets_python3_9(-)] dev-python/pkginfo[python_targets_python3_9(-)] dev-python/pyfakefs[python_targets_python3_9(-)] dev-python/pytest-httpbin[python_targets_python3_9(-)] dev-python/pytest-httpserver[python_targets_python3_9(-)] dev-python/pytest[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] dev-python/selenium[python_targets_python3_9(-)] dev-python/tavalidate[python_targets_python3_9(-)] dev-python/tavern[python_targets_python3_9(-)] dev-python/werkzeug[python_targets_python3_9(-)] dev-python/xmltodict[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/flaky[python_targets_python3_10(-)] >=dev-python/lxml-4.5.0[python_targets_python3_10(-)] dev-python/pkginfo[python_targets_python3_10(-)] dev-python/pyfakefs[python_targets_python3_10(-)] dev-python/pytest-httpbin[python_targets_python3_10(-)] dev-python/pytest-httpserver[python_targets_python3_10(-)] dev-python/pytest[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] dev-python/selenium[python_targets_python3_10(-)] dev-python/tavalidate[python_targets_python3_10(-)] dev-python/tavern[python_targets_python3_10(-)] dev-python/werkzeug[python_targets_python3_10(-)] dev-python/xmltodict[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/flaky[python_targets_python3_11(-)] >=dev-python/lxml-4.5.0[python_targets_python3_11(-)] dev-python/pkginfo[python_targets_python3_11(-)] dev-python/pyfakefs[python_targets_python3_11(-)] dev-python/pytest-httpbin[python_targets_python3_11(-)] dev-python/pytest-httpserver[python_targets_python3_11(-)] dev-python/pytest[python_targets_python3_11(-)] dev-python/requests[python_targets_python3_11(-)] dev-python/selenium[python_targets_python3_11(-)] dev-python/tavalidate[python_targets_python3_11(-)] dev-python/tavern[python_targets_python3_11(-)] dev-python/werkzeug[python_targets_python3_11(-)] dev-python/xmltodict[python_targets_python3_11(-)] ) app-arch/p7zip app-arch/unrar app-arch/unzip www-apps/chromedriver-bin ) virtual/pkgconfig
+DEFINED_PHASES=install postinst setup test
+DEPEND=acct-user/sabnzbd acct-group/sabnzbd python_single_target_python3_8? ( >=dev-lang/python-3.8.16:3.8[sqlite] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[sqlite] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10[sqlite] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11[sqlite] ) python_single_target_python3_8? ( dev-python/chardet[python_targets_python3_8(-)] dev-python/cheetah3[python_targets_python3_8(-)] dev-python/cherrypy[python_targets_python3_8(-)] dev-python/configobj[python_targets_python3_8(-)] dev-python/cryptography[python_targets_python3_8(-)] >=dev-python/feedparser-6.0.10[python_targets_python3_8(-)] >=dev-python/guessit-3.1.0[python_targets_python3_8(-)] dev-python/notify2[python_targets_python3_8(-)] dev-python/portend[python_targets_python3_8(-)] dev-python/puremagic[python_targets_python3_8(-)] ~dev-python/sabyenc-5.4.4[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/chardet[python_targets_python3_9(-)] dev-python/cheetah3[python_targets_python3_9(-)] dev-python/cherrypy[python_targets_python3_9(-)] dev-python/configobj[python_targets_python3_9(-)] dev-python/cryptography[python_targets_python3_9(-)] >=dev-python/feedparser-6.0.10[python_targets_python3_9(-)] >=dev-python/guessit-3.1.0[python_targets_python3_9(-)] dev-python/notify2[python_targets_python3_9(-)] dev-python/portend[python_targets_python3_9(-)] dev-python/puremagic[python_targets_python3_9(-)] ~dev-python/sabyenc-5.4.4[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/chardet[python_targets_python3_10(-)] dev-python/cheetah3[python_targets_python3_10(-)] dev-python/cherrypy[python_targets_python3_10(-)] dev-python/configobj[python_targets_python3_10(-)] dev-python/cryptography[python_targets_python3_10(-)] >=dev-python/feedparser-6.0.10[python_targets_python3_10(-)] >=dev-python/guessit-3.1.0[python_targets_python3_10(-)] dev-python/notify2[python_targets_python3_10(-)] dev-python/portend[python_targets_python3_10(-)] dev-python/puremagic[python_targets_python3_10(-)] ~dev-python/sabyenc-5.4.4[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/chardet[python_targets_python3_11(-)] dev-python/cheetah3[python_targets_python3_11(-)] dev-python/cherrypy[python_targets_python3_11(-)] dev-python/configobj[python_targets_python3_11(-)] dev-python/cryptography[python_targets_python3_11(-)] >=dev-python/feedparser-6.0.10[python_targets_python3_11(-)] >=dev-python/guessit-3.1.0[python_targets_python3_11(-)] dev-python/notify2[python_targets_python3_11(-)] dev-python/portend[python_targets_python3_11(-)] dev-python/puremagic[python_targets_python3_11(-)] ~dev-python/sabyenc-5.4.4[python_targets_python3_11(-)] )
+DESCRIPTION=Binary newsgrabber with web-interface
+EAPI=8
+HOMEPAGE=https://sabnzbd.org/
+INHERIT=optfeature python-single-r1 systemd
+IUSE=test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~amd64
+LICENSE=GPL-2 BSD LGPL-2 MIT BSD-1
+RDEPEND=acct-user/sabnzbd acct-group/sabnzbd python_single_target_python3_8? ( >=dev-lang/python-3.8.16:3.8[sqlite] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[sqlite] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10[sqlite] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11[sqlite] ) python_single_target_python3_8? ( dev-python/chardet[python_targets_python3_8(-)] dev-python/cheetah3[python_targets_python3_8(-)] dev-python/cherrypy[python_targets_python3_8(-)] dev-python/configobj[python_targets_python3_8(-)] dev-python/cryptography[python_targets_python3_8(-)] >=dev-python/feedparser-6.0.10[python_targets_python3_8(-)] >=dev-python/guessit-3.1.0[python_targets_python3_8(-)] dev-python/notify2[python_targets_python3_8(-)] dev-python/portend[python_targets_python3_8(-)] dev-python/puremagic[python_targets_python3_8(-)] ~dev-python/sabyenc-5.4.4[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/chardet[python_targets_python3_9(-)] dev-python/cheetah3[python_targets_python3_9(-)] dev-python/cherrypy[python_targets_python3_9(-)] dev-python/configobj[python_targets_python3_9(-)] dev-python/cryptography[python_targets_python3_9(-)] >=dev-python/feedparser-6.0.10[python_targets_python3_9(-)] >=dev-python/guessit-3.1.0[python_targets_python3_9(-)] dev-python/notify2[python_targets_python3_9(-)] dev-python/portend[python_targets_python3_9(-)] dev-python/puremagic[python_targets_python3_9(-)] ~dev-python/sabyenc-5.4.4[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/chardet[python_targets_python3_10(-)] dev-python/cheetah3[python_targets_python3_10(-)] dev-python/cherrypy[python_targets_python3_10(-)] dev-python/configobj[python_targets_python3_10(-)] dev-python/cryptography[python_targets_python3_10(-)] >=dev-python/feedparser-6.0.10[python_targets_python3_10(-)] >=dev-python/guessit-3.1.0[python_targets_python3_10(-)] dev-python/notify2[python_targets_python3_10(-)] dev-python/portend[python_targets_python3_10(-)] dev-python/puremagic[python_targets_python3_10(-)] ~dev-python/sabyenc-5.4.4[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/chardet[python_targets_python3_11(-)] dev-python/cheetah3[python_targets_python3_11(-)] dev-python/cherrypy[python_targets_python3_11(-)] dev-python/configobj[python_targets_python3_11(-)] dev-python/cryptography[python_targets_python3_11(-)] >=dev-python/feedparser-6.0.10[python_targets_python3_11(-)] >=dev-python/guessit-3.1.0[python_targets_python3_11(-)] dev-python/notify2[python_targets_python3_11(-)] dev-python/portend[python_targets_python3_11(-)] dev-python/puremagic[python_targets_python3_11(-)] ~dev-python/sabyenc-5.4.4[python_targets_python3_11(-)] ) >=app-arch/par2cmdline-0.4 net-misc/wget
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/sabnzbd/sabnzbd/releases/download/3.7.1/SABnzbd-3.7.1-src.tar.gz
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	6a75203e8a499f0fb42971452ce15388	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
+_md5_=47e0c6f5424cba6c7f2b4cb40b992a64
diff --git a/metadata/md5-cache/sci-astronomy/Manifest.gz b/metadata/md5-cache/sci-astronomy/Manifest.gz
index 56fe09ce309d..38a10901a2a7 100644
--- a/metadata/md5-cache/sci-astronomy/Manifest.gz
+++ b/metadata/md5-cache/sci-astronomy/Manifest.gz
diff --git a/metadata/md5-cache/sci-astronomy/xephem-4.1.0 b/metadata/md5-cache/sci-astronomy/xephem-4.1.0-r1
index 3ffb8c9d75d1..2f4c13637d0d 100644
--- a/metadata/md5-cache/sci-astronomy/xephem-4.1.0
+++ b/metadata/md5-cache/sci-astronomy/xephem-4.1.0-r1
@@ -1,14 +1,14 @@
 BDEPEND=sys-apps/groff
 DEFINED_PHASES=compile install
-DEPEND=dev-libs/openssl:= >=x11-libs/motif-2.3:0 virtual/jpeg:0 media-libs/libpng:0= x11-libs/libXext x11-libs/libXmu x11-libs/libXt
+DEPEND=dev-libs/openssl:= media-libs/libjpeg-turbo:= media-libs/libpng:0= >=x11-libs/motif-2.3:0 x11-libs/libXext x11-libs/libXmu x11-libs/libXt
 DESCRIPTION=Interactive tool for astronomical ephemeris and sky simulation
 EAPI=8
 HOMEPAGE=https://xephem.github.io/XEphem/Site/xephem.html
 INHERIT=desktop toolchain-funcs
 KEYWORDS=amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
-RDEPEND=dev-libs/openssl:= >=x11-libs/motif-2.3:0 virtual/jpeg:0 media-libs/libpng:0= x11-libs/libXext x11-libs/libXmu x11-libs/libXt
+RDEPEND=dev-libs/openssl:= media-libs/libjpeg-turbo:= media-libs/libpng:0= >=x11-libs/motif-2.3:0 x11-libs/libXext x11-libs/libXmu x11-libs/libXt
 SLOT=0
 SRC_URI=https://github.com/XEphem/XEphem/archive/refs/tags/4.1.0.tar.gz -> xephem-4.1.0.tar.gz
 _eclasses_=desktop	7eb20ad915a0a318176d51bc2508ff5c	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=f24547c9b6ff8231bd485c14d7c45dcd
+_md5_=dc982a812da6e72270a70c8be97a6f6f
diff --git a/metadata/md5-cache/sci-mathematics/Manifest.gz b/metadata/md5-cache/sci-mathematics/Manifest.gz
index eacffa4e6e74..958b7a292a8b 100644
--- a/metadata/md5-cache/sci-mathematics/Manifest.gz
+++ b/metadata/md5-cache/sci-mathematics/Manifest.gz
diff --git a/metadata/md5-cache/sci-mathematics/lean-3.49.1 b/metadata/md5-cache/sci-mathematics/lean-3.50.2
index 5a5c8e50f1c9..92814a050969 100644
--- a/metadata/md5-cache/sci-mathematics/lean-3.49.1
+++ b/metadata/md5-cache/sci-mathematics/lean-3.50.2
@@ -10,6 +10,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=dev-libs/gmp:=
 SLOT=0/3
-SRC_URI=https://github.com/leanprover-community/lean/archive/refs/tags/v3.49.1.tar.gz -> lean-3.49.1.tar.gz
+SRC_URI=https://github.com/leanprover-community/lean/archive/refs/tags/v3.50.2.tar.gz -> lean-3.50.2.tar.gz
 _eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=9a0acb3193721cd936e6ac59b20e20bd
diff --git a/metadata/md5-cache/sci-visualization/Manifest.gz b/metadata/md5-cache/sci-visualization/Manifest.gz
index 799f46fbdf57..30406497a4ed 100644
--- a/metadata/md5-cache/sci-visualization/Manifest.gz
+++ b/metadata/md5-cache/sci-visualization/Manifest.gz
diff --git a/metadata/md5-cache/sci-visualization/gle-4.3.3-r2 b/metadata/md5-cache/sci-visualization/gle-4.3.3-r3
index 02fe51947054..c0d56bbc9def 100644
--- a/metadata/md5-cache/sci-visualization/gle-4.3.3-r2
+++ b/metadata/md5-cache/sci-visualization/gle-4.3.3-r3
@@ -10,6 +10,6 @@ KEYWORDS=~amd64
 LICENSE=BSD GPL-2+
 RDEPEND=app-text/ghostscript-gpl dev-libs/boost dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 media-libs/freeglut media-libs/glu media-libs/libpng media-libs/tiff sys-libs/zlib media-libs/libjpeg-turbo x11-libs/cairo x11-libs/pixman emacs? ( app-editors/emacs:* ) virtual/latex-base
 SLOT=0
-SRC_URI=https://github.com/vlabella/GLE/archive/refs/tags/4.3.3.tar.gz -> gle-4.3.3.tar.gz https://github.com/vlabella/gle-library/archive/d476418f006b001dc7f47dcafb413c0557fa44a7.tar.gz -> gle-library.tar.gz doc? ( https://dev.gentoo.org/~grozin/gle-manual.pdf.gz ) emacs? ( https://dev.gentoo.org/~grozin/gle-mode.el.gz )
+SRC_URI=https://github.com/vlabella/GLE/archive/refs/tags/4.3.3.tar.gz -> gle-4.3.3.tar.gz https://github.com/vlabella/gle-library/archive/d476418f006b001dc7f47dcafb413c0557fa44a7.tar.gz -> gle-library.tar.gz https://dev.gentoo.org/~grozin/gle-c++17.patch.gz doc? ( https://dev.gentoo.org/~grozin/gle-manual.pdf.gz ) emacs? ( https://dev.gentoo.org/~grozin/gle-mode.el.gz )
 _eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=99e4c7666d7f8dd76a318550d331e0d5
+_md5_=b7647ca0080039744d68c1aa0011267a
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index d23c778239f1..ed2fdc671322 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/nawk-20220122-r1 b/metadata/md5-cache/sys-apps/nawk-20220122-r1
index 842f68d4b014..6fb45a2a67b5 100644
--- a/metadata/md5-cache/sys-apps/nawk-20220122-r1
+++ b/metadata/md5-cache/sys-apps/nawk-20220122-r1
@@ -4,9 +4,9 @@ DESCRIPTION=Brian Kernighan's pattern scanning and processing language
 EAPI=8
 HOMEPAGE=https://www.cs.princeton.edu/~bwk/btl.mirror/
 INHERIT=toolchain-funcs
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/onetrueawk/awk/archive/20220122.tar.gz -> nawk-20220122.tar.gz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=30aadd573576bbe0e62b7e72b382de3f
+_md5_=0776e586214bdd53d2d42b09854c3328
diff --git a/metadata/md5-cache/sys-cluster/Manifest.gz b/metadata/md5-cache/sys-cluster/Manifest.gz
index be8a49028e39..829a73b30bc6 100644
--- a/metadata/md5-cache/sys-cluster/Manifest.gz
+++ b/metadata/md5-cache/sys-cluster/Manifest.gz
diff --git a/metadata/md5-cache/sys-cluster/glusterfs-10.2-r2 b/metadata/md5-cache/sys-cluster/glusterfs-10.2-r2
index f99c2133bae4..b8ebf74b44f5 100644
--- a/metadata/md5-cache/sys-cluster/glusterfs-10.2-r2
+++ b/metadata/md5-cache/sys-cluster/glusterfs-10.2-r2
@@ -1,6 +1,6 @@
-BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 virtual/pkgconfig
+BDEPEND=sys-devel/bison sys-devel/flex virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=acct-group/gluster acct-user/gluster dev-libs/libaio dev-libs/openssl:=[-bindist(-)] net-libs/rpcsvc-proto dev-libs/userspace-rcu:= sys-apps/util-linux sys-libs/readline:= !elibc_glibc? ( sys-libs/argp-standalone ) emacs? ( >=app-editors/emacs-23.1:* ) fuse? ( >=sys-fs/fuse-2.7.0:0 ) georeplication? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) ) libtirpc? ( net-libs/libtirpc:= ) !libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) ) selinux? ( sec-policy/selinux-glusterfs ) tcmalloc? ( dev-util/google-perftools ) uring? ( sys-libs/liburing:= ) xml? ( dev-libs/libxml2 ) sys-devel/bison sys-devel/flex virtual/acl test? ( >=dev-util/cmocka-1.0.1 app-benchmarks/dbench dev-vcs/git net-fs/nfs-utils virtual/perl-Test-Harness dev-libs/yajl sys-fs/xfsprogs sys-apps/attr )
+DEPEND=acct-group/gluster acct-user/gluster dev-libs/libaio dev-libs/openssl:=[-bindist(-)] net-libs/rpcsvc-proto dev-libs/userspace-rcu:= sys-apps/util-linux sys-libs/readline:= !elibc_glibc? ( sys-libs/argp-standalone ) emacs? ( >=app-editors/emacs-23.1:* ) fuse? ( >=sys-fs/fuse-2.7.0:0 ) georeplication? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) ) libtirpc? ( net-libs/libtirpc:= ) !libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) ) selinux? ( sec-policy/selinux-glusterfs ) tcmalloc? ( dev-util/google-perftools ) uring? ( sys-libs/liburing:= ) xml? ( dev-libs/libxml2 ) virtual/acl test? ( >=dev-util/cmocka-1.0.1 app-benchmarks/dbench dev-vcs/git net-fs/nfs-utils virtual/perl-Test-Harness dev-libs/yajl sys-fs/xfsprogs sys-apps/attr )
 DESCRIPTION=GlusterFS is a powerful network/cluster filesystem
 EAPI=7
 HOMEPAGE=https://www.gluster.org/ https://github.com/gluster/glusterfs/
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0/10
 SRC_URI=https://download.gluster.org/pub/gluster/glusterfs/10/10.2/glusterfs-10.2.tar.gz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	6a75203e8a499f0fb42971452ce15388	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=96f07cd29df6794936917072569f35cd
+_md5_=b4016547b675d470f5d5875d2ca6e45d
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index e0ec794b0df2..551daa6cf9e0 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-11.3.1_p20221223 b/metadata/md5-cache/sys-devel/gcc-11.3.1_p20221223
new file mode 100644
index 000000000000..566174ae633d
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/gcc-11.3.1_p20221223
@@ -0,0 +1,17 @@
+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 )
+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
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+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=11
+SRC_URI=https://gcc.gnu.org/pub/gcc/snapshots/11-20221223/gcc-11-20221223.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-11.4.0-patches-5.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-11.4.0-musl-patches-0.tar.xz
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	819832f115fcf93d626ced5444c725d0	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
+_md5_=8fc30f19d6ed444955f7e934e1ce9c5d
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 71f938f8b999..c7396416218b 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 14603 BLAKE2B e2577f15dd9e0d475df5b593952aec19dbd6bd1d98fe3cf3f0798f0d5c069ce285e42d594e3b05990923eecd40549b08f04abe17b02a4fc3856c0cce38640336 SHA512 af95e49316b05b0546f6bd6ea11a1d52c27280a7719f4e850d4b026ff56a8948fca0d992cbe3c778a8a17737da71c2aab3027a71ea2d1805575ee1cc97e3095b
-TIMESTAMP 2022-12-24T01:10:05Z
+TIMESTAMP 2022-12-24T07:09:35Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmOmUW1fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmOmpa9fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBpeA//Qxi6CkCmNqE32ofVNvTE8EmS3rMPiNYz+A530AyTQ0/jXQ4fGyqlfkoa
-L2qXYJXnRtrHJUMfsWv/nUMRNkEO3Ic0AdEKATswr19BN24jc0i+0T4R1XJ7j1N3
-blfNYnhrV4OfubpMmhi4SEF91IHFhIu+2zk1uRjmAmGfnA+XKlG6WL1FFkq6hDu3
-iMoNITkn/7WRj6SL+NsWufAeieEPF9EXxu/rZ2+smc7SYnQdSG6rm9jpCKM7E8CZ
-lkC9jOcUSeJCZaQoHiqquselHwzmwnXdSgaFfcXJsjKDJ0GbIZ+FMAGQHjgcCFF/
-CcxMc3hw78qEpmori5felpgTxHTuxA0JTgeZZc0aorOEC18waFuTYY6UMpqWUvcT
-vqSRbxy+sYxjv7AsAPSZ0RTRXOgDhhobd5sKIaK5hTwmQVSUrUJBMPDK+qHXr8pQ
-7/oRsfusl+b66jvtCPGJG1MwkMRK9kqEH5OOirOF+12n0N+mDMwuY2VYS2+ujJmc
-5k9x8Jvn1OFkjCRqr0FLuajznMov8ncZZrq4JaXzp92N6Q4c4MUPhzxX8luzqCq5
-Xsy5kw7EyauLfWBupIpSxc+07mckzkpDDXSgJvJvaAMAqB266INZ7TnI3/30yE9V
-bRd7skd8d1Y7FXACOV7WSIHKZB4TfvEJeg/yjkaQMUD81kQJTUY=
-=H8yZ
+klCb/Q//XSmB2cTlUBOo02lnc6ZTfJU5N0E4fIYo7bdrlBjnZrwXiFSJ8j/qQN1e
+GV1wLASL5cgqeMrlxa0aJmKmXrkPjEBl8gFhy+Hwar+3LIgVtKJJL871OHjNXgEB
+0eEoY3eG+yfhuNWuxYbh5qXDxAcxj5OhEacWKyW0TWcVgNxzhdcGhLtonW7yX+Y/
+9f72aQnVKg7DD5SMBvqzZSLtz6UTML1WhxkIpiYPC4AtMcb6eW7bwnnuxB8ZmlgV
+UWrMVG0r9wVqupc+EDp0cZt8J7Gftuc8K53gVCCCya/0NLps6T/JMd6wVRytVv8D
+Sa6AMRP5n9dKSOO/vFaVXCHsgvXltr/A1vcfafvFRM1vVz0cnUciWKbDW3T6uFUv
+f1kjjXLFjMn7OxwTTsPIlkAjf0QcowYd9AesAMqw/H4BwyxM//4F25BwvbZ8vtCJ
+FliCQ/vcGhLMuBa2p5ljZLwLXBiHGT4Ck9iIGWbBcRHw4OX3twG4CwPxv2K6e7u3
+uycgnhnIrueEXHeZ3MR+icsqYJ7gnWJZOfxDKrGLJZ0elsvyzvNcQq3a4sWBi3zD
+M5pQVp9I1ZZGJwejixUOuLKY+zTZ94inavb8soH/WUL2W0e53i/8O4f61ybsca40
+oNrjTiAW/9xxoyNDHmCIaAWWsI6HRe2qARCr/ROJcDu6u6HDDys=
+=P8lQ
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 9feea5514500..09eb87731a8d 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sat, 24 Dec 2022 01:10:02 +0000
+Sat, 24 Dec 2022 07:09:33 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index b725fc56b071..4f83d32b9784 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sat Dec 24 01:10:02 AM UTC 2022
+Sat Dec 24 07:09:32 AM UTC 2022
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 6a835d3c16bf..1d774b56928a 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sat, 24 Dec 2022 01:15:01 +0000
+Sat, 24 Dec 2022 07:15:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index da4a26837bed..60077c919cc0 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-1a1a264408150aec7678f6bdb379537f3c720f9a 1671841027 2022-12-24T00:17:07+00:00
+54018acedbe26b1cce4de7afe5b91638aeec64a9 1671865339 2022-12-24T07:02:19+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index f78934995ede..0826f45b0a3c 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1671844201 Sat 24 Dec 2022 01:10:01 AM UTC
+1671865801 Sat 24 Dec 2022 07:10:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 9feea5514500..09eb87731a8d 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Sat, 24 Dec 2022 01:10:02 +0000
+Sat, 24 Dec 2022 07:09:33 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index b1946ba2405f..0843471b0a09 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index ade57dff173f..ec1059d09441 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -3,8 +3,8 @@ AUX wireshark-3.4.2-cmake-lua-version.patch 304 BLAKE2B 438bd2ee1e0e0121cc673709
 DIST wireshark-3.6.10.tar.xz 39956960 BLAKE2B 5f283caeed4fc9b231331b90b68b25615f8c1df7639accd225590c88cebc86cca7ea95d979db6a60268a5b918f448a9b0878b9f4f8d5dccc847c6dd1fe4fddb7 SHA512 dbdba7a29e2b6e6c3bbc0f0d599a2b9b49efcb1540b36f2f8c55ac3850565b68dc1282b1ed1d3cd63709f12e2fe659f93de5f9473c2f23751373f3738b8e766a
 DIST wireshark-3.6.9.tar.xz 39949356 BLAKE2B 8660e57fc1c9667ecd17bbd35918da7d61f3acb84047d6fda9be0fea456c09e45f0a59c725b405364745cb2b570d8fddb2ffe393ee7b96110a53c404f9c02267 SHA512 abf7adfda1a7aef4944e846bd3edde08b64d841edbba2d86d1bfd121760e90560231f778eeaefa43175c7c6be9b1fe0e0ec58c8704b4c9bdff6bb3598970cddd
 DIST wireshark-4.0.2.tar.xz 41296132 BLAKE2B 3ca64c5d561fc3262af821a2fed559efc39f9c194d1c03211d27b8154d87fe78c26d390504fc33f80fefbec06aa07d5b4fe27b253a3fc32641ec52292bc0557b SHA512 0f401f639add6483799131dd853a4f4bcf8977fd987915074d0301f553fca9f6cd6e0b7cc47358699c1f4e65872760135dea9889fb34dbb70b917768b6f37ff5
-EBUILD wireshark-3.6.10.ebuild 7325 BLAKE2B 9a558a5fa92f4355c1cfe7f9aa79ee821c7a903d940b8c39040951ba028a0924bf94e43f07025dfa78adb03e26239497ad1ae743b23bd7a84907f2b0e7088f03 SHA512 bd4eb7fb17181ff9d4998defc94d42d3103814d51b4fb6af6c6cf43a9266161db25dbc5c98c8c456784caba67b0912157812be72c3f5bb0b390ec4abe075986f
-EBUILD wireshark-3.6.9.ebuild 7322 BLAKE2B a3ddb3e037d12eb01fb560eea2526f2679fbd024b96401cdd9c50a6bbd63e9fba3a2b3cb8fffcdaa8aa7a10a2b2bc3207e1ed2e7499f3a7e389e1c432545bdf5 SHA512 03c27e00ae90e6455db816ee65e64bd2b4ea526ed3f4fd21c905dee5dafbf07ebccca31b79acaec5e4353f767da132e268d877ea15d387d0b577369a70af3e63
+EBUILD wireshark-3.6.10.ebuild 7329 BLAKE2B aac93a9eda0b558bf27903e014666119d987918e52107f3a53f980b2bbd8abc275f68360151124062f4461ecd760001b5024b7105ba9b0008bdf795d00812edc SHA512 19e17db7fccdbe4f687ab298e70f4e529a7c98fdbe2c8497fae3254948b43d2825ce935df3e5a3f3ae7e613972b353b4b1cbe99ad17bd9ab16b6676c8d6a96b5
+EBUILD wireshark-3.6.9.ebuild 7326 BLAKE2B fe8504a2abea1fabea66cf926ac5b9a6a49ea53d542e5e807bffa7d8a1e73977461ce0463df2860b61d373dec81afd9d8838c21f8af50924e29a88aa7978c8d2 SHA512 b2162018cbdfc4d3a70ac69860741b300e5963772243d79acd4d9c1392f036c576d7e9bc439e9a90c91605daa34db5ac35312a07ad7e9a12e5cf6a4211b5c8ad
 EBUILD wireshark-4.0.2.ebuild 7993 BLAKE2B 90dca6c5d4e803657393a7191a135a9603259e8c17b77206a3b3cf8bb18347e284b58f4b2e2e95825ce94b32edfe7a6ab80c36fe2d646a3d08db7a595cf441c9 SHA512 971254ab9ea83fd051a4b738cde30e82645042291e74dd34054b4bec03814dda2841c17ed0669f84a9d8f4d051897d897dbd5a101ebe69c7b537f76364865c28
 EBUILD wireshark-9999.ebuild 7993 BLAKE2B 90dca6c5d4e803657393a7191a135a9603259e8c17b77206a3b3cf8bb18347e284b58f4b2e2e95825ce94b32edfe7a6ab80c36fe2d646a3d08db7a595cf441c9 SHA512 971254ab9ea83fd051a4b738cde30e82645042291e74dd34054b4bec03814dda2841c17ed0669f84a9d8f4d051897d897dbd5a101ebe69c7b537f76364865c28
 MISC metadata.xml 5596 BLAKE2B 53f6c7722da767bcf47e57b1a2e137d0e11129b993c44a37976e8fb782151d0223823155e5bc1658a60acd509f376e622f65078411394c0db5e8048aa1d1251f SHA512 ef3e445e1c47904f73d74b0f1cff508b26cfa5361c5dea11f6817c1f883508f5f164e3af664e825f3a3ce25cff24018c1a27110a56e96dc6f2b11e92870e44fe
diff --git a/net-analyzer/wireshark/wireshark-3.6.10.ebuild b/net-analyzer/wireshark/wireshark-3.6.10.ebuild
index 9dc957fabde9..7e3a61ee7902 100644
--- a/net-analyzer/wireshark/wireshark-3.6.10.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.6.10.ebuild
@@ -30,7 +30,7 @@ IUSE+=" +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump
 IUSE+=" sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd"
 
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
-	plugin-ifdemo? ( plugins )"
+	plugin-ifdemo? ( plugins qt5 )"
 
 RESTRICT="!test? ( test )"
 
diff --git a/net-analyzer/wireshark/wireshark-3.6.9.ebuild b/net-analyzer/wireshark/wireshark-3.6.9.ebuild
index d4345cd1e3bb..a6b3b00ce71e 100644
--- a/net-analyzer/wireshark/wireshark-3.6.9.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.6.9.ebuild
@@ -30,7 +30,7 @@ IUSE+=" +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump
 IUSE+=" sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd"
 
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
-	plugin-ifdemo? ( plugins )"
+	plugin-ifdemo? ( plugins qt5 )"
 
 RESTRICT="!test? ( test )"
 
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 5a795780c973..1d8c08b480da 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/telegram-desktop-bin/Manifest b/net-im/telegram-desktop-bin/Manifest
index 9102673346fd..68b314b44a37 100644
--- a/net-im/telegram-desktop-bin/Manifest
+++ b/net-im/telegram-desktop-bin/Manifest
@@ -1,10 +1,13 @@
 DIST tdesktop-4.2.4.tar.gz 17065673 BLAKE2B d2fd5db5d216b369902f697f8b2613fbb62ae7b788e08dc33f410a62547c335a8c20f2099989bb8eaaf92a81320e4fc24a3aaf266c6632b2264271e95c8b01ec SHA512 cc4cc3be490de750cb3a048a861d492bea1d2484160ee70b102979b8b446349333effe29f1b51fa014c7a65a4901779fa58f6b0d86ae12864f85d014e8f36d20
 DIST tdesktop-4.3.1.tar.gz 17160532 BLAKE2B a7bdfc0bc74772ed206ab20663837c6245723b1dc7e934bc722079f22adee5474380b2d1ca518154ad1ebda4da7c61e2f8013c024541c5ebc4b3549bc083e0c5 SHA512 7032d5ba176e740279304fa91e74ab780f2bb102f29041bde4a2a8fa53a698f85410a6822bf95747b870476a608dfab7aafb5512f21820727b86151346960662
 DIST tdesktop-4.3.4.tar.gz 17191105 BLAKE2B 4cf1fa520a38316b94939d495a87e0dffd61d2adad1ff56910855064a86e9e1b380ee1dfcaee43ab13ac2acfa82e283ac985b73d659344299586bb1653d95503 SHA512 707e1eeff49777bae1f386be4aefd8510b0d18e78f1b98fa3357e1d0be73c65558a1ab2d59fe0259ffdc7760f1f4debf598ef62555e9d13a42e843eb7c76a6bd
+DIST tdesktop-4.4.1.tar.gz 17238891 BLAKE2B da7620a5d5ee28dfbbcba098cd4493c346a0c4a558d64835337d2ca722a91e9385e5d42a3b99b24f8aaf5b97291e3432b73e2880162c539bc6424de6e3e00b9a SHA512 f45cc3b788fdd50f8caf9aff43dccfd250c0586cae5c54e27e943c24b472f059cea8017ecf9a7b0061fd02d49113ab33b5288daeaa6b40fb7282b8b09abd0459
 DIST tsetup.4.2.4.tar.xz 46792948 BLAKE2B 20ebef199dc526de1e786ebd76dfd40d557f4211ae4c37d080f010738a710efe4ed2e5100c81249d49efb4902f7333f4548bff00a50eb284269dbd2aaff1bd21 SHA512 3397e480334605ebe7a8a3f3c6211adea8be0b759749e4beb579a6c4a75cb13accc3be5fa62c1d784fd6f0b92c66be15e986ed83c4fde29a38766b48a013b104
 DIST tsetup.4.3.1.tar.xz 49562348 BLAKE2B 7e6d390e76f0ffe25896faf57d8c1e6a8b9f405e9af9f9493c586b2aefb0d244cb4aaf77b2a1da3f226b6954abb4e376d0c09500abc212767b29813f3303b58a SHA512 c9d2f8124dcb5e1709d79e29f0f13eb9491a81aa642c34e32dd1a9a57cc980fdd3f5f5d7095ccc843af2300b27abe1fa5bb874a7a43f97b8861a47ab369c4844
 DIST tsetup.4.3.4.tar.xz 50082244 BLAKE2B 71a69b0cb32d70b381ea210f01259874e69003d7fa19dfb435a4059410523ae97de2e0497c348e54f7799ee9221db4e41307653b750fff4c9e8658bfe3cdf589 SHA512 ef723331cb7e54c95b46aa05553d8e9c18e3782ad6abdb948a99b66a7806d99a06d07a6d9233a902d7becfda0070135e423a21468c71ce22a39f434f476a489d
+DIST tsetup.4.4.1.tar.xz 50194196 BLAKE2B 05ff4bc66b77e4b26a802c766f65b7f1690376371681f0ed474d5b8edd0bdc0eae04e78c7539b05f9e7ea3a37dc4250c3761bf0ef23386b5033ce0a52caea5ec SHA512 d13892b0923b4dc9c565002ff54f41382aaba75de532b25b940c1e0cbff49784e15ff9aba5dfdf7b86c996c7502c44c7cfe9df865095d513277a5b553d4e00ea
 EBUILD telegram-desktop-bin-4.2.4-r1.ebuild 1213 BLAKE2B 55bb9674a3bdd7eed5af16a9e8d98e215cec27fa33b2a58bd6e965782d55c596e1fb2a8607179242cb531a8d0dd7f594c5559e21ae30e7007f4492271b6b0ebc SHA512 534f559d1a9b284beca02b575c32f9b28660a250e2f9b7bd320900ba55e01e7a6b69400db87f3613ccc9d050f49a99c4edbe6058af7d48b977244fab95e1a7d7
 EBUILD telegram-desktop-bin-4.3.1.ebuild 1213 BLAKE2B 55bb9674a3bdd7eed5af16a9e8d98e215cec27fa33b2a58bd6e965782d55c596e1fb2a8607179242cb531a8d0dd7f594c5559e21ae30e7007f4492271b6b0ebc SHA512 534f559d1a9b284beca02b575c32f9b28660a250e2f9b7bd320900ba55e01e7a6b69400db87f3613ccc9d050f49a99c4edbe6058af7d48b977244fab95e1a7d7
 EBUILD telegram-desktop-bin-4.3.4.ebuild 1244 BLAKE2B 7c9f80d91b4c1bceae0e0377a20fda414a621e8335e9e0d72659c82340de09622f2d371628931c72e3ae03ba3ff6a69fe0bc02d72c84c75cf45af2b3a5558fdc SHA512 8ccc39f021ff4dca1d100810ff8674988cbff1119dde9827dcfa354539e2d0bb0b70da3715fe7cf7eb157c3489b487aca9ad925ee855c477354fd33a12b33bd9
+EBUILD telegram-desktop-bin-4.4.1.ebuild 1392 BLAKE2B 658ad26aa2f1e4bd809da9acd1e76c5b268df18e5b65e0a6f10e08191d58b2dca75eeb35ab988789432055e1e12751b6955d17b258714e3823488c2463dd3498 SHA512 b792ce955053d55c8c46fc8459c2f00794aa7725d274a4232b81fca9852026dc1790ebeea877b22dd494780b934c41183fe922f8ccfbbe5d552b2a044a02ea66
 MISC metadata.xml 501 BLAKE2B 94aa66404772e94f51d8c59e36d19e6454f37173aaac352fe3539bcc09e72c267e69001c41f8356f19ca2830107164144d907865ad7fb3ad1def8771f5ef6d9a SHA512 3cd8e818062cd40787f12c9530ed202ea23c3f60a70f1ab50c95a7b3310197590be5a75378c598dabe5a1fce310fa8acf409a36e7446b66c2046a109d59a5ff8
diff --git a/net-im/telegram-desktop-bin/telegram-desktop-bin-4.4.1.ebuild b/net-im/telegram-desktop-bin/telegram-desktop-bin-4.4.1.ebuild
new file mode 100644
index 000000000000..b960357fb781
--- /dev/null
+++ b/net-im/telegram-desktop-bin/telegram-desktop-bin-4.4.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop optfeature xdg
+
+DESCRIPTION="Official desktop client for Telegram (binary package)"
+HOMEPAGE="https://desktop.telegram.org"
+SRC_URI="
+	https://github.com/telegramdesktop/tdesktop/archive/v${PV}.tar.gz -> tdesktop-${PV}.tar.gz
+	amd64? ( https://updates.tdesktop.com/tlinux/tsetup.${PV}.tar.xz )
+"
+
+LICENSE="GPL-3-with-openssl-exception"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+
+QA_PREBUILT="usr/bin/telegram-desktop"
+
+RDEPEND="
+	!net-im/telegram-desktop
+	sys-libs/glibc
+	dev-libs/glib:2
+	>=media-libs/fontconfig-2.13
+	media-libs/freetype:2
+	virtual/opengl
+	x11-libs/libX11
+	>=x11-libs/libxcb-1.10
+"
+
+S="${WORKDIR}/Telegram"
+
+src_prepare() {
+	default
+	sed -i -e 's/@CMAKE_INSTALL_FULL_BINDIR@\///g' "${WORKDIR}/tdesktop-${PV}"/lib/xdg/org.telegram.desktop.desktop || die
+}
+
+src_install() {
+	newbin Telegram telegram-desktop
+
+	insinto /etc/tdesktop
+	newins - externalupdater <<<"${EPREFIX}/usr/bin/telegram-desktop"
+
+	local icon_size
+	for icon_size in 16 32 48 64 128 256 512; do
+		newicon -s "${icon_size}" \
+			"${WORKDIR}/tdesktop-${PV}/Telegram/Resources/art/icon${icon_size}.png" \
+			telegram.png
+	done
+
+	domenu "${WORKDIR}/tdesktop-${PV}"/lib/xdg/org.telegram.desktop.desktop
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	optfeature "spell checker support" app-text/enchant
+}
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 00224c00886f..f5abe8fcacec 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/hylafaxplus/Manifest b/net-misc/hylafaxplus/Manifest
index 7194bbeda14b..81ed8807fa5c 100644
--- a/net-misc/hylafaxplus/Manifest
+++ b/net-misc/hylafaxplus/Manifest
@@ -1,11 +1,6 @@
-AUX hylafaxplus-7.0.2-tiff-4.2.patch 461 BLAKE2B 8afd4e3b41ee67c6c9d7aab50311fbaa6a08dee1937fc46a976f04dc3279beea791004eec59fcff19d3ef82df1d5be479480a1a49505adad6b1f420d5543e32c SHA512 5ed2b4845800ffeaed2d5df26856e9e7c8e9b375d07f1488cbff7d4c6156900dcb6ef89917d010520e87aeebf79a95b6dc77515019aa72e2058817b7b18a4e75
 AUX hylafaxplus-conf 572 BLAKE2B cd2b237704e0607565c16cf81593654d266c212810d0dcb399f35d980d04ed54a5bb961f2fd29dbc8386ef6684fe684a8bcbd21c9cd782490546554ec90e4b2e SHA512 ee97c45e49ed03bf2d393b7861fb8d0a92ce927243b7f1843c52de452540e78633e1a6d7b6892e6f5e30b5518b4b3d998354a3cfebe7adfd84da3f9586585621
-AUX hylafaxplus-init 3150 BLAKE2B 67b27c9e773d141c462b62882fa1ec592bdd30397c21c0dc0ef55384ac0d448803a8984c35eb22185c0aa315019eea1588829717b170f0b6168b549a270f2570 SHA512 6bc4db4597ef55aaf01bff66dfe7e9b3ce23d51e8d165f635ad49d9971260f8f131d386869787b2cd0de612d8ee784fb8f4e44fa8b8deb4eabf1aeab441e68f5
 AUX hylafaxplus-init-r1 3220 BLAKE2B d1cbf8ec446bffdfed9f78d2766b95a0bf6d645c2f3a5a27261100216a4f7b9d1b8115ece18bdd096652acf56520532673d4059b5c4519a4fa299f6c35846d51 SHA512 f7ef464dfc3065b760e46eaa029b862aefa2fe3c77262aeaa6bbdb1c14de9df5256c9def26a3fed9d50dc5c586206c015c58fbef27cc64e4961086f10dd6d91a
 AUX ldconfig-patch 467 BLAKE2B d19f7a8ebc79bb40d9935e1f327f3abfa2d336ea4af2026c784178c8110efe4a1bb2c19a17c9127f039d64c2e9115b5899d1999ed1f5ac7c999cdce79875e5b0 SHA512 eb7c154eac56e20a81b3396770442d93b6833c7961927f8264e3ed1aa72850e018fbe14760d7bd5be739d069769e3db3fd5848aaa936dd7509f03a289a146d4c
-DIST hylafax-7.0.3.tar.gz 1405116 BLAKE2B dbf8f87380929eb79ca0f18042c3397460dd6774f16defde8e9427d1d14094e00f6be491552f3ff6cc4c3d1fad0ec67a0c1a5fa3b4cb1e07c2f0c956eaefe8ed SHA512 938a21e4573fdf12bbc03dfee85e00555e7790a83a26316ac9cd1983501860858175d599c35f3b383cb0748518644587c203fb429966b5de3b615689d856281a
 DIST hylafax-7.0.6.tar.gz 1418749 BLAKE2B 83fff43dbc5c51f542aa847f61ae1617514a4260695d5c79a036416578ac632a778d0b5263a80fa7ccea9e9923a783759295a39199bdd32a2cb0ecac47ac91b4 SHA512 d1f69e13017f5d013ff39cf050c3a7ac6cef19a9ee5910ebe774a7ae06d7d22fd21e31de9734847764caea995539f578c3c458ecec7b9523b5823a841337d9cb
-EBUILD hylafaxplus-7.0.3-r7.ebuild 4032 BLAKE2B 314b23fd8c0f6f69864fa6e0acf5f81aad359a82fd35c450a13254a40535b1d05189950cf64428ee20cda4b1318d9e7a14a32cf68ed2e212e3a63a631a5a5321 SHA512 3afd1832d6662cdbcc4ddafb5036e21ea70226701bdf27c84129890d6972285e7d2ef6f0f6bd4036cfde7e05b30cd5b37115a53034526f0ee45c9fe09784e6d8
-EBUILD hylafaxplus-7.0.3-r8.ebuild 4190 BLAKE2B a8fa3e5ea906700435908ceab3cb296641f55907dfc9de8a8b6dccd209fea3837f2bff4dc246ab190213a5dbda51e1176c417df7cbb79b009166610bfa35ed5f SHA512 b5be1e511bf0565382887a78b8d42a6bc6c7b06cd1ec30b06678c047c44db89b932a13f0535e2a2dc1e18208f292db9c463ce9fc3616c7b3eed986dd06313d50
-EBUILD hylafaxplus-7.0.6-r3.ebuild 4056 BLAKE2B eddacab5fd4b558cb8a06f554b0db9d812a24f939385e94531a95a387ad714dd30e6ad0ba6f51e47070647690d2aeadac35007afbb3defb59d5210297b6c8545 SHA512 8fc9263e317eb2da01833d0db09aee635e29d048a17ccc5e05c3b14e8d96912c528c6fd3aa41b56de68769c92a737f30dc793b74f38d89d310ec67085f38ac9a
+EBUILD hylafaxplus-7.0.6-r3.ebuild 4055 BLAKE2B de04e3d241726c9f7dc63dc28c27f55859fe1f2a11ca02f22b4e79913acb450fd835a7bfb667f4c867581a684c0474ba9a89852dafa73c6308b8c353507d59cf SHA512 3c74dba926fd6ec0d60bed08b05a13fe4b71ead0e3220e6f72541c6314f6b34709ee1132e4af784dd339241f5f480d55ec563687ccf6d1cd65075b6a44ee2607
 MISC metadata.xml 497 BLAKE2B b3f400cee9f701675dfc8b5bd0a23d497b5f4d2e7211ba421b442782e90a1b60017d33ba482f614d0017f5abf2fa72e886ab445353eec72a9217c45aa23565ae SHA512 4b0b543bf8816e2ffff95334bf0cb64e022cc507f5ccc6b766dd183d272303d31cb43b4b6c4352991b1ceba8aaefc76276e64c5adda3caae9bff5872189deef3
diff --git a/net-misc/hylafaxplus/files/hylafaxplus-7.0.2-tiff-4.2.patch b/net-misc/hylafaxplus/files/hylafaxplus-7.0.2-tiff-4.2.patch
deleted file mode 100644
index 8c4dbda35cc5..000000000000
--- a/net-misc/hylafaxplus/files/hylafaxplus-7.0.2-tiff-4.2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-https://bugs.gentoo.org/706154
-https://bugs.gentoo.org/810658
---- a/configure
-+++ b/configure
-@@ -2583,7 +2583,7 @@ EOF
- 				echo '#define TIFFSTRIPBYTECOUNTS uint32'
- 				echo '#define TIFFVERSION TIFF_VERSION'
- 				echo '#define TIFFHEADER TIFFHeader';;
--		4.[01])		tiff_runlen_t="uint32"
-+		4.[0123456789])	tiff_runlen_t="uint32"
- 				tiff_offset_t="uint64"
- 				echo '#define TIFFSTRIPBYTECOUNTS uint64'
- 				echo '#define TIFFVERSION TIFF_VERSION_CLASSIC'
diff --git a/net-misc/hylafaxplus/files/hylafaxplus-init b/net-misc/hylafaxplus/files/hylafaxplus-init
deleted file mode 100644
index c15f26774a86..000000000000
--- a/net-misc/hylafaxplus/files/hylafaxplus-init
+++ /dev/null
@@ -1,176 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Foundation
-# Author Geaaru
-# Distributed under the terms of the GNU General Public License v2
-
-extra_commands="zap"
-
-depend() {
-	use lo
-}
-
-checkconfig() {
-	ebegin "Check hylafax server configuration..."
-
-	if [ x$spooldir == x ] ; then
-		eerror "No spooldir directory defined"
-		return 1
-	else
-		SPOOL=$spooldir
-		einfo "Use spool directory $SPOOL"
-	fi
-
-	if [ x$mode == x ] ; then
-		eerror "No mode defined"
-		return 1
-	fi
-
-	if [ ! -f $SPOOL/etc/setup.cache ] ; then
-		eerror "No $SPOOL/etc/setup.cache file founded. Use faxsetup command"
-		return 1
-	fi
-
-	if [[ x$hfaxd == x || ! -f $hfaxd ]] ; then
-		eerror "No hfaxd daemon founded"
-		return 1
-	fi
-
-	if [[ x$faxq == x || ! -f $faxq ]] ; then
-		eerror "No faxq program founded"
-		return 1
-	fi
-
-	if [[ x$faxgetty == x || ! -f $faxgetty ]] ; then
-		eerror "No faxgetty program founded"
-		return 1
-	fi
-
-	if [ x$faxbind == x ] ; then
-		eerror "No binding address supply"
-		return 1
-	fi
-
-	if [ x$piddir == x ] ; then
-		PIDDIR=$SPOOL
-	else
-		PIDDIR=$piddir
-	fi
-
-
-	hfaxd_args="-l $faxbind -q $SPOOL"
-
-	case $mode in
-		newproto)
-			if [[ x$faxport == x ]] ; then
-				eerror "No faxport defined"
-				return 1
-			fi
-			hfaxd_args="$hfaxd_args -i $faxport"
-			;;
-		oldproto)
-			if [[ x$oldprotoport == x ]] ; then
-				eerror "No oldprotoport defined"
-				return 1
-			fi
-			hfaxd_args="$hfaxd_args -o $oldprotoport"
-			;;
-		snpp)
-			if [[ x$snppport == x ]] ; then
-				eerror "No snppport defined"
-				return 1
-			fi
-			hfaxd_args="$hfaxd_args -s $snppport"
-			;;
-		any)
-			if [[ x$faxport == x || x$snppport == x || x$oldprotoport == x ]] ; then
-				eerror "No port data founded for old services"
-				return 1
-			fi
-			hfaxd_args="$hfaxd_args -i $faxport -s $snppport -o $oldprotoport"
-			;;
-		*)
-			eerror "Invalid mode"
-			return 1
-			;;
-
-	esac
-
-	faxq_args="-q $SPOOL"
-
-	# workaround for manage save of pidfile with start-stop-daemon
-	hfaxd_args="$hfaxd_args -d"
-	faxq_args="$faxq_args -D"
-		
-	return 0
-}
-
-start() {
-	local result
-
-	checkconfig || return 1
-
-	ebegin "Starting HylaFAX server daemons"
-
-	start_faxq
-	result=$?
-
-	if [ $result -ne 0 ]  ; then
-		eerror "Error on start $faxq daemon"
-		return 1
-	fi
-
-	start_hfaxd
-	result=$?
-
-	eend $result
-}
-
-start_hfaxd() {
-	local arguments="--start \
-			 --make-pidfile --pidfile $PIDDIR/hfaxd.pid"
-	
-	einfo "Starting $hfaxd with args $hfaxd_args"
-
-	start-stop-daemon -b ${arguments} --exec $hfaxd -- $hfaxd_args > /dev/null 2>&1
-
-	return $?;
-}
-
-start_faxq() {
-	local arguments="--start \
-			 --make-pidfile --pidfile $PIDDIR/faxq.pid"
-	einfo "Starting $faxq ... "
-
-	start-stop-daemon -b ${arguments} --exec $faxq -- $faxq_args > /dev/null 2>&1
-	
-	return $?
-}
-
-stop() {
-	checkconfig || return 1
-
-	ebegin "Stopping HylaFAX server daemons"
-	
-	start-stop-daemon --stop --quiet --pidfile $PIDDIR/hfaxd.pid
-	start-stop-daemon --stop --quiet --pidfile $PIDDIR/faxq.pid
-	eend $?
-}
-
-zap() {
-	checkconfig || return 1
-
-	ebegin "Zap HylaFAX server daemon files"
-
-	if [ -f $PIDFILE/hfaxd.pid ] ; then
-		rm -f $PIDFILE/hfaxd.pid
-	fi
-
-	if [ -f $PIDFILE/faxq.pid ] ; then
-		rm -f $PIDFILE/faxq.pid
-	fi
-}
-
-restart() {
-	stop
-	start
-}
diff --git a/net-misc/hylafaxplus/hylafaxplus-7.0.3-r7.ebuild b/net-misc/hylafaxplus/hylafaxplus-7.0.3-r7.ebuild
deleted file mode 100644
index 9f1fb4d2a5bd..000000000000
--- a/net-misc/hylafaxplus/hylafaxplus-7.0.3-r7.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit edo pam toolchain-funcs
-
-MY_PN="${PN/plus/}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Enterprise client-server fax package for class 1 and 2 fax modems"
-HOMEPAGE="https://hylafax.sourceforge.io/"
-SRC_URI="mirror://sourceforge/hylafax/${MY_P}.tar.gz"
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="hylafaxplus"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="html jbig lcms ldap mgetty pam"
-
-DEPEND="
-	app-text/ghostscript-gpl
-	media-libs/tiff:=[jbig?]
-	media-libs/libjpeg-turbo:=
-	>=sys-libs/zlib-1.1.4
-	app-alternatives/awk
-	virtual/libcrypt:=
-	virtual/mta
-	jbig? ( media-libs/jbigkit )
-	lcms? ( media-libs/lcms )
-	ldap? ( net-nds/openldap:= )
-	mgetty? ( net-dialup/mgetty[-fax] )
-	pam? ( sys-libs/pam )
-"
-RDEPEND="
-	${DEPEND}
-	!net-dialup/mgetty[fax]
-	!net-dialup/sendpage
-"
-
-CONFIG_PROTECT="${CONFIG_PROTECT} /var/spool/fax/etc /usr/lib/fax"
-CONFIG_PROTECT_MASK="${CONFIG_PROTECT_MASK} /var/spool/fax/etc/xferfaxlog"
-
-PATCHES=(
-	"${FILESDIR}"/ldconfig-patch
-	"${FILESDIR}"/${PN}-7.0.2-tiff-4.2.patch
-)
-
-src_prepare() {
-	default
-
-	# Force it not to strip binaries
-	for dir in etc util faxalter faxcover faxd faxmail faxrm faxstat \
-		hfaxd sendfax sendpage ; do
-			sed -i -e "s:-idb:-idb \"nostrip\" -idb:g" \
-				"${dir}"/Makefile.in || die "sed on ${dir}/Makefile.in failed"
-	done
-
-	sed -i -e "s:hostname:hostname -f:g" util/{faxrcvd,pollrcvd}.sh.in || die "sed on hostname failed"
-
-	# Respect LDFLAGS (at least partially)
-	sed -i -e "/^LDFLAGS/s/LDOPTS}/LDOPTS} ${LDFLAGS}/" defs.in || die "sed on defs.in failed"
-
-	sed -i -e "s|-fpic|-fPIC|g" \
-		configure || die
-}
-
-src_configure() {
-	local my_conf=(
-		--with-DIR_BIN=/usr/bin
-		--with-DIR_SBIN=/usr/sbin
-		--with-DIR_LIB=/usr/$(get_libdir)
-		--with-DIR_LIBEXEC=/usr/sbin
-		--with-DIR_LIBDATA=/usr/$(get_libdir)/fax
-		--with-DIR_LOCALE=/usr/share/locale
-		--with-DIR_LOCKS=/var/lock
-		--with-DIR_MAN=/usr/share/man
-		--with-DIR_SPOOL=/var/spool/fax
-		--with-DIR_HTML=/usr/share/doc/${PF}/html
-		--with-DIR_CGI="${WORKDIR}"
-		--with-PATH_DPSRIP=/var/spool/fax/bin/ps2fax
-		--with-PATH_IMPRIP=""
-		--with-SYSVINIT=no
-		--with-REGEX=yes
-		--with-LIBTIFF="-ltiff -ljpeg -lz"
-		--with-OPTIMIZER="${CFLAGS}"
-		--with-DSO=auto
-		--with-HTML=$(usex html)
-	)
-
-	if use mgetty; then
-		my_conf+=(
-			--with-PATH_GETTY=/sbin/mgetty
-			--with-PATH_EGETTY=/sbin/mgetty
-			--with-PATH_VGETTY=/usr/sbin/vgetty
-		)
-	else
-		# GETTY defaults to /sbin/agetty
-		my_conf+=(
-			--with-PATH_EGETTY=/bin/false
-			--with-PATH_VGETTY=/bin/false
-		)
-	fi
-
-	# --enable-pam isn't valid
-	use pam || my_conf+=( $(use_enable pam) )
-	use lcms || my_conf+=( $(use_enable lcms) )
-	use ldap || my_conf+=( $(use_enable ldap) )
-	use jbig || my_conf+=( $(use_enable jbig) )
-
-	tc-export CC CXX AR RANLIB
-
-	edo ./configure --nointeractive "${my_conf[@]}"
-}
-
-src_compile() {
-	# Parallel building is borked, bug #????
-	emake -j1
-}
-
-src_install() {
-	dodir /usr/{bin,sbin} /usr/$(get_libdir)/fax /usr/share/man
-	dodir /var/spool /var/spool/fax
-	fowners uucp:uucp /var/spool/fax
-	fperms 0600 /var/spool/fax
-
-	dodir /usr/share/doc/${PF}/samples
-	emake DESTDIR="${D}" \
-		BIN="${D}/usr/bin" \
-		SBIN="${D}/usr/sbin" \
-		LIBDIR="${D}/usr/$(get_libdir)" \
-		LIB="${D}/usr/$(get_libdir)" \
-		LIBEXEC="${D}/usr/sbin" \
-		LIBDATA="${D}/usr/$(get_libdir)/fax" \
-		DIR_LOCALE="${D}/usr/share/locale" \
-		MAN="${D}/usr/share/man" \
-		SPOOL="${D}/var/spool/fax" \
-		HTMLDIR="${D}/usr/share/doc/${PF}/html" \
-		install
-
-	keepdir /var/spool/fax/{archive,client,etc,pollq,recvq,tmp}
-	keepdir /var/spool/fax/{status,sendq,log,info,doneq,docq,dev}
-
-	einfo "Adding env.d entry for ${PN}"
-	newenvd - 99hylafaxplus <<-EOF
-		PATH="/var/spool/fax/bin"
-		CONFIG_PROTECT="/var/spool/fax/etc /usr/$(get_libdir)/fax"
-		CONFIG_PROTECT_MASK="/var/spool/fax/etc/xferfaxlog"
-	EOF
-
-	newconfd "${FILESDIR}"/${PN}-conf ${PN}
-	newinitd "${FILESDIR}"/${PN}-init-r1 ${PN}
-
-	use pam && pamd_mimic_system ${MY_PN} auth account session
-
-	einstalldocs
-	docinto samples
-}
diff --git a/net-misc/hylafaxplus/hylafaxplus-7.0.3-r8.ebuild b/net-misc/hylafaxplus/hylafaxplus-7.0.3-r8.ebuild
deleted file mode 100644
index 3f86a507030c..000000000000
--- a/net-misc/hylafaxplus/hylafaxplus-7.0.3-r8.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit pam toolchain-funcs
-
-MY_PN="${PN/plus/}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Enterprise client-server fax package for class 1 and 2 fax modems"
-HOMEPAGE="https://hylafax.sourceforge.io/"
-SRC_URI="mirror://sourceforge/hylafax/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-SLOT="0"
-LICENSE="hylafaxplus"
-KEYWORDS="amd64 x86"
-IUSE="html jbig lcms ldap mgetty pam"
-
-DEPEND="
-	app-text/ghostscript-gpl
-	media-libs/tiff:=[jbig?]
-	media-libs/libjpeg-turbo:=
-	!net-dialup/mgetty[fax]
-	>=sys-libs/zlib-1.1.4
-	app-alternatives/awk
-	virtual/mta
-	jbig? ( media-libs/jbigkit )
-	lcms? ( media-libs/lcms )
-	ldap? (  net-nds/openldap:= )
-	mgetty? ( net-dialup/mgetty[-fax] )
-	pam? ( sys-libs/pam )
-"
-RDEPEND="${DEPEND}
-	!net-dialup/sendpage
-"
-
-CONFIG_PROTECT="${CONFIG_PROTECT} /var/spool/fax/etc /usr/lib/fax"
-CONFIG_PROTECT_MASK="${CONFIG_PROTECT_MASK} /var/spool/fax/etc/xferfaxlog"
-
-PATCHES=(
-	"${FILESDIR}/ldconfig-patch"
-	"${FILESDIR}"/${PN}-7.0.2-tiff-4.2.patch
-)
-
-src_prepare() {
-	default
-
-	# force it not to strip binaries
-	for dir in etc util faxalter faxcover faxd faxmail faxrm faxstat \
-		hfaxd sendfax sendpage ; do
-			sed -i -e "s:-idb:-idb \"nostrip\" -idb:g" \
-				"${dir}"/Makefile.in || die "sed on ${dir}/Makefile.in failed"
-	done
-
-	sed -i -e "s:hostname:hostname -f:g" util/{faxrcvd,pollrcvd}.sh.in || die "sed on hostname failed"
-
-	# Respect LDFLAGS(at least partially)
-	sed -i -e "/^LDFLAGS/s/LDOPTS}/LDOPTS} ${LDFLAGS}/" defs.in || die "sed on defs.in failed"
-
-	sed -i -e "s|-fpic|-fPIC|g" \
-		configure || die
-}
-
-src_configure() {
-	do_configure() {
-		echo ./configure --nointeractive ${1}
-		# eval required for quoting in ${my_conf} to work properly, better way?
-		eval ./configure --nointeractive ${1} || die "./configure failed"
-	}
-
-	local my_conf=(
-		--with-DIR_BIN=/usr/bin
-		--with-DIR_SBIN=/usr/sbin
-		--with-DIR_LIB=/usr/$(get_libdir)
-		--with-DIR_LIBEXEC=/usr/sbin
-		--with-DIR_LIBDATA=/usr/$(get_libdir)/fax
-		--with-DIR_LOCALE=/usr/share/locale
-		--with-DIR_LOCKS=/var/lock
-		--with-DIR_MAN=/usr/share/man
-		--with-DIR_SPOOL=/var/spool/fax
-		--with-DIR_HTML=/usr/share/doc/${PF}/html
-		--with-DIR_CGI="${WORKDIR}"
-		--with-PATH_DPSRIP=/var/spool/fax/bin/ps2fax
-		--with-PATH_IMPRIP=""
-		--with-SYSVINIT=no
-		--with-REGEX=yes
-		--with-LIBTIFF=\"-ltiff -ljpeg -lz\"
-		--with-OPTIMIZER=\"${CFLAGS}\"
-		--with-DSO=auto
-		--with-HTML=$(usex html)
-	)
-
-	if use mgetty; then
-		my_conf+=(
-			--with-PATH_GETTY=/sbin/mgetty
-			--with-PATH_EGETTY=/sbin/mgetty
-			--with-PATH_VGETTY=/usr/sbin/vgetty
-		)
-	else
-		# GETTY defaults to /sbin/agetty
-		my_conf+=(
-			--with-PATH_EGETTY=/bin/false
-			--with-PATH_VGETTY=/bin/false
-		)
-	fi
-
-	#--enable-pam isn't valid
-	use pam || my_conf+=( $(use_enable pam) )
-	use lcms || my_conf+=( $(use_enable lcms) )
-	use ldap || my_conf+=( $(use_enable ldap) )
-	use jbig || my_conf+=( $(use_enable jbig) )
-
-	tc-export CC CXX AR RANLIB
-
-	do_configure "${my_conf[*]}"
-}
-
-src_compile() {
-	# Parallel building is borked, bug #????
-	emake -j1
-}
-
-src_install() {
-	dodir /usr/{bin,sbin} /usr/$(get_libdir)/fax /usr/share/man
-	dodir /var/spool /var/spool/fax
-	fowners uucp:uucp /var/spool/fax
-	fperms 0600 /var/spool/fax
-	dodir "/usr/share/doc/${P}/samples"
-
-	emake DESTDIR="${D}" \
-		BIN="${D}/usr/bin" \
-		SBIN="${D}/usr/sbin" \
-		LIBDIR="${D}/usr/$(get_libdir)" \
-		LIB="${D}/usr/$(get_libdir)" \
-		LIBEXEC="${D}/usr/sbin" \
-		LIBDATA="${D}/usr/$(get_libdir)/fax" \
-		DIR_LOCALE="${D}/usr/share/locale" \
-		MAN="${D}/usr/share/man" \
-		SPOOL="${D}/var/spool/fax" \
-		HTMLDIR="${D}/usr/share/doc/${PF}/html" \
-		install
-
-	keepdir /var/spool/fax/{archive,client,etc,pollq,recvq,tmp}
-	keepdir /var/spool/fax/{status,sendq,log,info,doneq,docq,dev}
-
-	einfo "Adding env.d entry for ${PN}"
-	newenvd - 99hylafaxplus <<-EOF
-		PATH="/var/spool/fax/bin"
-		CONFIG_PROTECT="/var/spool/fax/etc /usr/$(get_libdir)/fax"
-		CONFIG_PROTECT_MASK="/var/spool/fax/etc/xferfaxlog"
-	EOF
-
-	newconfd "${FILESDIR}/${PN}-conf" ${PN}
-	newinitd "${FILESDIR}/${PN}-init" ${PN}
-
-	use pam && pamd_mimic_system ${MY_PN} auth account session
-
-	einstalldocs
-	docinto samples
-}
diff --git a/net-misc/hylafaxplus/hylafaxplus-7.0.6-r3.ebuild b/net-misc/hylafaxplus/hylafaxplus-7.0.6-r3.ebuild
index b7e589501c96..c2207fd1949d 100644
--- a/net-misc/hylafaxplus/hylafaxplus-7.0.6-r3.ebuild
+++ b/net-misc/hylafaxplus/hylafaxplus-7.0.6-r3.ebuild
@@ -42,7 +42,6 @@ CONFIG_PROTECT="${CONFIG_PROTECT} /var/spool/fax/etc /usr/lib/fax"
 CONFIG_PROTECT_MASK="${CONFIG_PROTECT_MASK} /var/spool/fax/etc/xferfaxlog"
 
 # See bug #706154, bug #810658 if need to patch for newer libtiff.
-
 PATCHES=(
 	"${FILESDIR}"/ldconfig-patch
 )
diff --git a/net-misc/icaclient/Manifest b/net-misc/icaclient/Manifest
index e077a657b088..766bbbf6335d 100644
--- a/net-misc/icaclient/Manifest
+++ b/net-misc/icaclient/Manifest
@@ -6,12 +6,15 @@ AUX new_store.desktop 235 BLAKE2B 43bbf97a6982485e8b21f30c15889d64063ef0ce294b06
 AUX selfservice.desktop 183 BLAKE2B 45d0830601ceac5159e239ec149cf3cdeabd43beb2ad6964935129fad6cd2c2e7c36cfc473e89b5db3b3b6cce2df909dd6013c3463631a7d868b470a49494285 SHA512 c4a2bdd83a29171c331b8adc98b33b8150fef5616d1fde8a0c9ccf1972b8ecc222dc1c0bc4e7779d93b851f44e79f5166138af7b7d36de964932ff3b63a4801b
 AUX wfica.desktop 242 BLAKE2B 6e90bb02824a6319035814050919c55907b2104c65e2abcc7379a4c694a585945c2e10ada114c4dfb906ee3b1fa90a0251dcb1ec3aac1fb6015a2d2ecbef4452 SHA512 a233bbdfadaee080d8dda67ed81a60ef74902c1f2100cb08bc402186be23f1bbb82f84abb93da88d610d187a267f7db28e6bfebe689839c921ae5a94a4bdf1d7
 DIST linuxx64-22.11.0.19.tar.gz 160489578 BLAKE2B ea6c5aab678746da64b0fa8329f5ffad871e5f42b4c6aa59f87daf6f8ca9a8901b690871376a79724fe835f9a9c026eb6bdf1ff55419ade62ebf472d25164dfa SHA512 5dab1616303f384d06ff6b2cc5c0ed0d9026745729ae503d03c7bddc6cebc536236c679d20886a94a2a241d1cfd96fd7fd766368ca779dacf0ff1785b36f5040
+DIST linuxx64-22.12.0.12.tar.gz 165269811 BLAKE2B 7735357f38d9438137792fc1d1febfdda6ca464fc43f573dffb4a33fffca052a78b8b61277cffd9287efcbc3823529e707140e7c9c1f9502c768528d2018b71d SHA512 bbe002d32e6d3819ab76ecef7fe7b62fff14da409d1b13c6edfc947cd46b0919d0f1972e7c1581d871bbe341ea50d3cf0da797f53f97b8e370610b37048f9a31
 DIST linuxx64-22.5.0.16.tar.gz 162733197 BLAKE2B 32b4fd64d6bccf8a3be92e8f8ee59059839f31f4f771a6344fea320d2b635174c31c9e8d572a700568bab6032352fe72657dce1ee752327ed856370fa86acf9a SHA512 796ecbccc60995baae2082b5b275d7bf1482b19aed198de6d9f4083b2a3a68ff2fe73dfd1d3d33f0f885a157a77f20de008635eade36d5f9adff6b662aaefc1b
 DIST linuxx64-22.9.0.21.tar.gz 160511942 BLAKE2B 43b671bc5c5eac968d2d6fd55615dce0d19206e9d64124b7e3dabf4311837c5cfe9ac25867b01795b9dc019f993a4507e852f84faba5116d58bdc4c85b784d85 SHA512 ebfd3fd51a61e0d419833fa0393a311b7c22331b6d950d985437ad992af96a96a9b1ea7d6c085e23593c6fcd46a8f946ca6c7b942d6919226bfc847a831fb95c
 DIST linuxx86-22.11.0.19.tar.gz 146472406 BLAKE2B b685de8438087a67011d78cb6b56cdeae18185477b179bd2419e240709cf8333410f774facddc17cf23042a99deca5c9f77c24034e2d0b0b4decc57c38f326fb SHA512 6a0160a6e88eda43dcdfccdfb29fbb6f73f335b6a0f41dc2715a741be8c1019d49b5f6de68e67b5af0a03fd27cca748d0b9db25ef7a1e66e54770bf9716af3fa
+DIST linuxx86-22.12.0.12.tar.gz 147837116 BLAKE2B d5f1c53d1f2d2ecb95e67df256a667df733251a99dd4a5e9584554521c4f1b1fbd065dfd8b1c4ba344a543c5cd7dde4a939e3d4d82f658e7dae42c07527b645e SHA512 8e9c4262dcd7731b88ae43a663d5901a21a9ede2feed163b538f5fb475f0eba8768a08715db5e9c8fa809442140d1ef03d4d4e509cb83142bea806855615a6b3
 DIST linuxx86-22.5.0.16.tar.gz 144032901 BLAKE2B 0f58adf7645eaba6ad75e126381ecfecf7434130b0e69bed75a0499386c5301475a48e414ce57aebdfeaea0cb6615ae93b48ecfdd0149851a56459d687d75bb7 SHA512 b94a3de41118d08f3ff549de33e80a85198a3db1349177cc5c921cdd45f1d5bb7e1ee338067602725a9bed16619216f552f98314d539915a251f020094ae3121
 DIST linuxx86-22.9.0.21.tar.gz 146501445 BLAKE2B 823a9f063448351ada3a0c552c0175b540f9403c8ee844232ae23cccfd9199acd46e0a2c21e9c051c4a84f2700261e0a4d9b6fcbfc133c6cdbeca29fa256ba68 SHA512 7f2d39ef279c704004a371a4b95b48f2be4ed32de7406dd877ce585e22fb523a39b90a7e1cd968205d55c708ebe80fa1a85d9677cc1feb819b1843f445908f2b
 EBUILD icaclient-22.11.0.19.ebuild 5779 BLAKE2B 20f8f808098a3efa8e16ffc24ba8bc9d0b669cc16751116ef4b9e535348e80cefa21d66e5d0a785f5c2f76540dd784b4e3933de98b97e801e4d845e7823c0e3a SHA512 16080d68c1ab83ae91b2cf80bc24f8713546802972d8b682d6e5697215e1741603d69a6b191900fb821e623db25a6c5828e746fbd59702ba1a0589c243608ccf
+EBUILD icaclient-22.12.0.12.ebuild 6216 BLAKE2B d55c476637608d0eab99f01593bb0d79e41fa51a5f3f124f466ea8c26fc2eee2690f36b1a33c70a1afc5cd32fb8680d981e70055cab4a56dfc321f1fd514a67f SHA512 18381e8435f322699d021d1a327c04346da55769666fceddc9ccc85763b23d27dd05ddc577fa45fa4dc49ffc0d265865361af74fdc17535093cdddd3f03c19ad
 EBUILD icaclient-22.5.0.16-r1.ebuild 5600 BLAKE2B 4b79fe220715ff4464987a286e20cf7f22c69738a3e53e70deb92d77311181737e0767dbe6f3afe1c01ca33c8cd9ef0c47cc94cc5863d6f2611a49232d53871a SHA512 7148dce99640ca9fb715b5d7663af594502f29e16fd509f778b0460ff2f4e53673524b19642858923f3e079b7fbc76b4d71c176e77f1f1a824f0b920306a05e8
 EBUILD icaclient-22.9.0.21-r2.ebuild 5779 BLAKE2B 20f8f808098a3efa8e16ffc24ba8bc9d0b669cc16751116ef4b9e535348e80cefa21d66e5d0a785f5c2f76540dd784b4e3933de98b97e801e4d845e7823c0e3a SHA512 16080d68c1ab83ae91b2cf80bc24f8713546802972d8b682d6e5697215e1741603d69a6b191900fb821e623db25a6c5828e746fbd59702ba1a0589c243608ccf
-MISC metadata.xml 396 BLAKE2B 87022ff667ea4915aaeb6bd69234d79f1030f0501ba2c6cbca8068905639f7797765b6b165a0cb5663f63f7d6089b73528745a3e3f413a02a023f66696f0ceb0 SHA512 8b03761bc34e251e177c940e1e61b0d7faba8651d7cc4f3971fe7928adbd9a3d7c4041474d404d966a5a0818066f0d64ce3c8b7f7fedebfed2132d338625b09d
+MISC metadata.xml 489 BLAKE2B 5277ab65457a889a26aa1c77279d68eef6fd4bd8d602e0ca1a06fac51b5576ce4b7d976bbbaeea555fc6ba2be42d686cfb425b03088bd5dff789edafbf11bb5c SHA512 4c69d7956c48402fa1fac2c5adede5079f8daf7c07a04f4d05af185dfa0d13417d54ce0ec063c77f966814e057f732c995e9e26e896e3c55a20d7c71db62f82f
diff --git a/net-misc/icaclient/icaclient-22.12.0.12.ebuild b/net-misc/icaclient/icaclient-22.12.0.12.ebuild
new file mode 100644
index 000000000000..399b2a4f22b1
--- /dev/null
+++ b/net-misc/icaclient/icaclient-22.12.0.12.ebuild
@@ -0,0 +1,276 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop wrapper xdg-utils
+
+DESCRIPTION="ICA Client for Citrix Presentation servers"
+HOMEPAGE="https://www.citrix.com/"
+SRC_URI="amd64? ( linuxx64-${PV}.tar.gz )
+	x86? ( linuxx86-${PV}.tar.gz )"
+
+LICENSE="icaclient"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="l10n_de l10n_es l10n_fr l10n_ja l10n_zh-CN hdx"
+RESTRICT="mirror strip fetch"
+
+ICAROOT="/opt/Citrix/ICAClient"
+
+QA_PREBUILT="${ICAROOT#/}/*"
+
+# we have binaries for two conflicting kerberos implementations
+# https://bugs.gentoo.org/792090
+# https://bugs.gentoo.org/775995
+REQUIRES_EXCLUDE="
+	libgssapi.so.3
+	libgssapi_krb5.so.2 libkrb5.so.3
+"
+# when using media-plugins/hdx-realtime-media-engine we better not ignore that
+REQUIRES_EXCLUDE="${REQUIRES_EXCLUDE}
+	!hdx? ( libunwind.so.1 )
+"
+# we have binaries which wouls still support gstreamer:0.10
+REQUIRES_EXCLUDE="${REQUIRES_EXCLUDE}
+	libgstapp-0.10.so.0
+	libgstbase-0.10.so.0
+	libgstinterfaces-0.10.so.0
+	libgstpbutils-0.10.so.0
+	libgstreamer-0.10.so.0
+"
+
+BEPEND="
+	hdx? ( >=media-plugins/hdx-realtime-media-engine-2.9.500.2802-r1 )
+"
+
+RDEPEND="
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	app-crypt/libsecret
+	dev-libs/glib:2
+	dev-libs/libxml2
+	media-fonts/font-adobe-100dpi
+	media-fonts/font-misc-misc
+	media-fonts/font-cursor-misc
+	media-fonts/font-xfree86-type1
+	media-fonts/font-misc-ethiopic
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/gst-plugins-base:1.0
+	media-libs/gstreamer:1.0
+	media-libs/libogg
+	media-libs/libpulse
+	media-libs/libvorbis
+	media-libs/mesa
+	media-libs/speex
+	net-libs/libsoup:2.4
+	net-libs/webkit-gtk:4
+	sys-apps/util-linux
+	sys-libs/libcxx
+	sys-libs/libcxxabi
+	sys-libs/zlib
+	virtual/krb5
+	virtual/libudev
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:2
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	x11-libs/libXaw
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXinerama
+	x11-libs/libXmu
+	x11-libs/libXrender
+	x11-libs/libXt
+	x11-libs/pango
+	${BDEPEND}
+	!hdx? ( !<media-plugins/hdx-realtime-media-engine-2.9.500.2802-r1 )
+"
+DEPENDS=""
+
+pkg_nofetch() {
+	elog "Download the client file ${A} from
+	https://www.citrix.com/downloads/workspace-app/"
+	elog "and place it into your DISTDIR directory."
+}
+
+pkg_setup() {
+	case ${ARCH} in
+		amd64)
+			ICAARCH=linuxx64
+		;;
+		x86)
+			ICAARCH=linuxx86
+		;;
+		*)
+			eerror "Given architecture is not supported by Citrix."
+		;;
+	esac
+}
+
+src_unpack() {
+	default
+	mv "${WORKDIR}/${ICAARCH}/${ICAARCH}.cor" "${S}" || die
+}
+
+src_prepare() {
+	default
+	rm lib/UIDialogLibWebKit.so || die
+
+	cp nls/en/module.ini .
+	if use hdx; then
+		"${BROOT}${ICAROOT}"/rtme/RTMEconfig -install -ignoremm
+		mv new_module.ini module.ini
+	fi
+	mv module.ini config/
+}
+
+src_install() {
+	local bin tmpl dest
+
+	dodir "${ICAROOT}"
+
+	exeinto "${ICAROOT}"
+	doexe *.DLL libproxy.so wfica AuthManagerDaemon PrimaryAuthManager selfservice ServiceRecord
+
+	exeinto "${ICAROOT}"/lib
+	doexe lib/*.so
+
+	for dest in "${ICAROOT}"{,/nls/en{,.UTF-8}} ; do
+		insinto "${dest}"
+		doins nls/en.UTF-8/eula.txt
+	done
+
+	insinto "${ICAROOT}"
+	doins -r usb
+
+	insinto "${ICAROOT}"/config
+	doins config/*
+	for tmpl in {appsrv,wfclient}.template ; do
+		newins nls/en/${tmpl} ${tmpl/template/ini}
+	done
+	touch "${ED}/${ICAROOT}"/config/.server || die
+
+	insinto "${ICAROOT}"/gtk
+	doins gtk/*
+
+	insinto "${ICAROOT}"/gtk/glade
+	doins gtk/glade/*
+
+	insinto "${ICAROOT}"/site
+	doins -r site/*
+
+	dodir "${ICAROOT}"/help
+
+	insinto "${ICAROOT}"/config/usertemplate
+	doins config/usertemplate/*
+
+	local lang LANGCODES=( en )
+	use l10n_de && LANGCODES+=( de )
+	use l10n_es && LANGCODES+=( es )
+	use l10n_fr && LANGCODES+=( fr )
+	use l10n_ja && LANGCODES+=( ja )
+	use l10n_zh-CN && LANGCODES+=( zh_CN )
+
+	for lang in ${LANGCODES[@]} ; do
+		insinto "${ICAROOT}"/nls/${lang}
+		doins nls/${lang}/*
+
+		insinto "${ICAROOT}"/nls/$lang/UTF-8
+		doins nls/${lang}.UTF-8/*
+
+		insinto "${ICAROOT}"/nls/${lang}/LC_MESSAGES
+		doins nls/${lang}/LC_MESSAGES/*
+
+		insinto "${ICAROOT}"/nls/${lang}
+		dosym UTF-8 "${ICAROOT}"/nls/${lang}/utf8
+
+		for tmpl in {appsrv,wfclient}.template ; do
+			cp "${ED}/${ICAROOT}"/nls/${lang}/${tmpl} \
+				"${ED}/${ICAROOT}"/nls/${lang}/${tmpl/template/ini} \
+				|| die
+		done
+	done
+
+	insinto "${ICAROOT}"/nls
+	dosym en /opt/Citrix/ICAClient/nls/C
+
+	insinto "${ICAROOT}"/icons
+	doins icons/*
+
+	insinto "${ICAROOT}"/keyboard
+	doins keyboard/*
+
+	cp -a util "${ED}/${ICAROOT}" || die
+	test -f util/HdxRtcEngine && fperms 0755 "${ICAROOT}"/util/HdxRtcEngine
+
+	rm -r "${S}"/keystore/cacerts || die
+	dosym ../../../../etc/ssl/certs "${ICAROOT}"/keystore/cacerts
+
+	local other_files=(
+		icasessionmgr
+		NativeMessagingHost
+		UtilDaemon
+	)
+
+	exeinto "${ICAROOT}"
+	for bin in ${other_files[@]} ; do
+		doexe ${bin}
+	done
+
+	# https://bugs.gentoo.org/655922
+	dosym gst_play1.0 "${ICAROOT}"/util/gst_play
+	dosym gst_read1.0 "${ICAROOT}"/util/gst_read
+	dosym libgstflatstm1.0.so "${ICAROOT}"/util/libgstflatstm.so
+
+	doenvd "${FILESDIR}"/10ICAClient
+
+	for bin in configmgr conncenter new_store ; do
+		make_wrapper ${bin} "${ICAROOT}"/util/${bin} . "${ICAROOT}"/util
+	done
+
+	for bin in selfservice wfica ; do
+		make_wrapper ${bin} "${ICAROOT}"/${bin} . "${ICAROOT}"
+	done
+
+	dodir /etc/revdep-rebuild/
+	echo "SEARCH_DIRS_MASK=\"${ICAROOT}\"" \
+		> "${ED}"/etc/revdep-rebuild/70icaclient
+
+	insinto "${ICAROOT}"/pkginf
+	newins "${WORKDIR}"/PkgId Ver.core."${ICAARCH}"
+
+	# 651926
+	domenu "${FILESDIR}"/*.desktop
+
+	insinto /usr/share/mime/packages
+	doins desktop/Citrix-mime_types.xml
+}
+
+pkg_preinst() {
+	# previous versions of the ebuild created that and left it around
+	# we own it now and avoid conflict warnings with this
+	rm -f "${ROOT}${ICAROOT}/config/module.ini"
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+
+	if ! use hdx; then
+		if [ -x "${ROOT}${ICAROOT}"/rtme/RTMEconfig ]; then
+			ewarn "Starting from 22.12.0.12 you have to set USE=hdx if you want"
+			ewarn "to use media-plugins/hdx-realtime-media-engine. Which does"
+			ewarn "not need to be explicitly installed anymore."
+		fi
+	fi
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/net-misc/icaclient/metadata.xml b/net-misc/icaclient/metadata.xml
index d86008401e21..83d0f6942931 100644
--- a/net-misc/icaclient/metadata.xml
+++ b/net-misc/icaclient/metadata.xml
@@ -9,4 +9,7 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<use>
+		<flag name="hdx">Install and enable hdx-realtime-media-engine plugin</flag>
+	</use>
 </pkgmetadata>
diff --git a/net-nntp/Manifest.gz b/net-nntp/Manifest.gz
index acd17da53f54..9b3ef2572c41 100644
--- a/net-nntp/Manifest.gz
+++ b/net-nntp/Manifest.gz
diff --git a/net-nntp/sabnzbd/Manifest b/net-nntp/sabnzbd/Manifest
index 6f93aa2f136e..2f7d3e9b343e 100644
--- a/net-nntp/sabnzbd/Manifest
+++ b/net-nntp/sabnzbd/Manifest
@@ -5,7 +5,9 @@ AUX sabnzbd_at.service 185 BLAKE2B bedc84a8dec50c230bd2d4041d3e56dd33fdd7814488e
 DIST SABnzbd-3.6.0-src.tar.gz 5052873 BLAKE2B 41b6fb818e9bcf40bedd16e9b2a0d5b2590cdbef8a29187f0e995d11d036c60364ed6f297eb6c2bb3f257040ef66b9bd26bc8464b9af2adfac3922f4817918a6 SHA512 277953a10211b72532ef4c490cc77516ad4691e15f55bbc08572edba8fc4154ddde5d6bd62ea79c2279dad571038cab25194d6764bf1377dda25d522a5838a92
 DIST SABnzbd-3.6.1-src.tar.gz 5051796 BLAKE2B a123b148290dd135f2eb375ce712b19b241907fd78935d9ec8cbb1b80b695c0aa0f92aff6b533e1966c84b9024f4c154a9708496331f85111906e6b068c22410 SHA512 7864f9252bbe8d66cd307e78911b03973554f1a2ccbba0e5ede536e4b7c679fe48cc1e334209688a9f9cd289b8bafc9a317dd02c6563e4151eba4fe2d81b9ddc
 DIST SABnzbd-3.7.0-src.tar.gz 5107150 BLAKE2B e582aaf09016ae34df8c49a1164d3f7e9a8ee85f734ae1066cc6d2c52f6a50a3de5d4abec30e0465d05629af73f4277920211557692e12f41d4b725476059796 SHA512 dbb18f06a0f5eec9ed4b946560073701bbb80ef20de9403ce92f408e96545fda5f7663dfd603723ea6c396c1a13dbb40e5868175d02e3218843138382c2a1335
+DIST SABnzbd-3.7.1-src.tar.gz 5108463 BLAKE2B 5858fc5ece3948696132c64c1f4a7459319bbc604074dc78339e54e7e77353dbd141b4aad0c0cd027ac6ea1499aee0100ed7f4a1b20d0786728503eb6ffad055 SHA512 c76f74e20943196467206b5c0427421d7fe4e614855c477a045d06854c5247c13056ce9055d82b5f0c6391a046dc3c65c577e50fc30646c8f2290df4bada4fb9
 EBUILD sabnzbd-3.6.0-r1.ebuild 3130 BLAKE2B ba677066233f646ae75c7496c17bbc690065c8fb189b194c1e04bdbc99ded585f4c9735ff5023087a0a7a9d99445f6593a6f1ae4a7ec06734aaa262d28b4382f SHA512 ea48dbe90c33ba7e88ee00af640507a9face238cd9097bba9ceb12dad3bf7e3087057a0bca8c96efed353f735dcb957f444cbcc7dd95efe9b808f127aed2a117
 EBUILD sabnzbd-3.6.1-r1.ebuild 4760 BLAKE2B 878f377b3a82eafebb5f2bd63a1fa99445ce84209ba633e49416cb665cf8da49153f9f6ecf51168320d233b8c3d1d2371f1e1fd78506b24ae25f1a117f1ca853 SHA512 80c9722e71e51908d3247ca91f1809966b586dfeb7152c9809e8f82a3724074670b4d488e90ac41f4333c8595a46a04e8beedd4ecf249606a10d9a955ea35158
 EBUILD sabnzbd-3.7.0.ebuild 4818 BLAKE2B 9974c35872705c335985cbf0ea8b2f99718f878a05ba5d905e0ddf05a58ff32c8a7502eea554e290000f3b4decc0ddc53df2f220d16c2bca1d0440f79f324171 SHA512 01dd1118396f8553a5a96756e889875bd3001b27c16178a1632b14e5f896670627cc54b986f8c34d93628727ef4c078f42fdda9f858853896e88ffe43eef2824
+EBUILD sabnzbd-3.7.1.ebuild 4818 BLAKE2B 9974c35872705c335985cbf0ea8b2f99718f878a05ba5d905e0ddf05a58ff32c8a7502eea554e290000f3b4decc0ddc53df2f220d16c2bca1d0440f79f324171 SHA512 01dd1118396f8553a5a96756e889875bd3001b27c16178a1632b14e5f896670627cc54b986f8c34d93628727ef4c078f42fdda9f858853896e88ffe43eef2824
 MISC metadata.xml 669 BLAKE2B 47998686b1b62f061cd33b5c719dab44f9a72e2b809587af75e17d130095099c03be0f585c6acaeebe8882c00b8d9870a9473cd85102317a4c55b3f3474f0fab SHA512 2c0ab624955c4ff2457d094e7c6bf11ceb098eab1e722fde02c2cb15a517504766e3bb4767961fab7b41bfcaa33d2527afbd159649359ca70428f6ba0849f9f3
diff --git a/net-nntp/sabnzbd/sabnzbd-3.7.1.ebuild b/net-nntp/sabnzbd/sabnzbd-3.7.1.ebuild
new file mode 100644
index 000000000000..b9a838d892ce
--- /dev/null
+++ b/net-nntp/sabnzbd/sabnzbd-3.7.1.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_REQ_USE="sqlite"
+
+inherit optfeature python-single-r1 systemd
+
+MY_PV="${PV/_rc/RC}"
+MY_PV="${MY_PV//_pre*}"
+
+MY_P="${PN/sab/SAB}-${MY_PV}"
+
+DESCRIPTION="Binary newsgrabber with web-interface"
+HOMEPAGE="https://sabnzbd.org/"
+SRC_URI="https://github.com/sabnzbd/sabnzbd/releases/download/${MY_PV}/${MY_P}-src.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+# Sabnzbd is GPL-2 but bundles software with the following licenses.
+LICENSE="GPL-2 BSD LGPL-2 MIT BSD-1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="
+	acct-user/sabnzbd
+	acct-group/sabnzbd
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/chardet[${PYTHON_USEDEP}]
+		dev-python/cheetah3[${PYTHON_USEDEP}]
+		dev-python/cherrypy[${PYTHON_USEDEP}]
+		dev-python/configobj[${PYTHON_USEDEP}]
+		dev-python/cryptography[${PYTHON_USEDEP}]
+		>=dev-python/feedparser-6.0.10[${PYTHON_USEDEP}]
+		>=dev-python/guessit-3.1.0[${PYTHON_USEDEP}]
+		dev-python/notify2[${PYTHON_USEDEP}]
+		dev-python/portend[${PYTHON_USEDEP}]
+		dev-python/puremagic[${PYTHON_USEDEP}]
+		~dev-python/sabyenc-5.4.4[${PYTHON_USEDEP}]
+	')
+"
+RDEPEND="
+	${DEPEND}
+	>=app-arch/par2cmdline-0.4
+	net-misc/wget
+"
+BDEPEND="
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/flaky[${PYTHON_USEDEP}]
+			>=dev-python/lxml-4.5.0[${PYTHON_USEDEP}]
+			dev-python/pkginfo[${PYTHON_USEDEP}]
+			dev-python/pyfakefs[${PYTHON_USEDEP}]
+			dev-python/pytest-httpbin[${PYTHON_USEDEP}]
+			dev-python/pytest-httpserver[${PYTHON_USEDEP}]
+			dev-python/pytest[${PYTHON_USEDEP}]
+			dev-python/requests[${PYTHON_USEDEP}]
+			dev-python/selenium[${PYTHON_USEDEP}]
+			dev-python/tavalidate[${PYTHON_USEDEP}]
+			dev-python/tavern[${PYTHON_USEDEP}]
+			dev-python/werkzeug[${PYTHON_USEDEP}]
+			dev-python/xmltodict[${PYTHON_USEDEP}]
+		')
+		app-arch/p7zip
+		app-arch/unrar
+		app-arch/unzip
+		www-apps/chromedriver-bin
+	)
+"
+
+src_test() {
+	local EPYTEST_IGNORE=(
+		# network sandbox
+		tests/test_getipaddress.py
+		tests/test_rss.py
+		tests/test_urlgrabber.py
+		tests/test_utils/test_happyeyeballs.py
+		tests/test_utils/test_internetspeed.py
+	)
+	local EPYTEST_DESELECT=(
+		# network sandbox
+		'tests/test_cfg.py::TestValidators::test_validate_host'
+		'tests/test_consistency.py::TestWiki'
+		# Just plain fails
+		'tests/test_newsunpack.py::TestPar2Repair::test_basic'
+		# Chromedriver tests don't want to behave in portage
+		'tests/test_functional_config.py::TestBasicPages::test_base_pages'
+		'tests/test_functional_config.py::TestBasicPages::test_base_submit_pages'
+		'tests/test_functional_config.py::TestConfigLogin::test_login'
+		'tests/test_functional_config.py::TestConfigCategories::test_page'
+		'tests/test_functional_config.py::TestConfigRSS::test_rss_basic_flow'
+		'tests/test_functional_config.py::TestConfigServers::test_add_and_remove_server'
+		'tests/test_functional_downloads.py::TestDownloadFlow::test_download_basic_rar5'
+		'tests/test_functional_downloads.py::TestDownloadFlow::test_download_zip'
+		'tests/test_functional_downloads.py::TestDownloadFlow::test_download_7zip'
+		'tests/test_functional_downloads.py::TestDownloadFlow::test_download_passworded'
+		'tests/test_functional_downloads.py::TestDownloadFlow::test_download_fully_obfuscated'
+		'tests/test_functional_downloads.py::TestDownloadFlow::test_download_unicode_rar'
+		'tests/test_functional_misc.py::TestShowLogging::test_showlog'
+		'tests/test_functional_misc.py::TestQueueRepair::test_queue_repair'
+		'tests/test_functional_misc.py::TestDaemonizing::test_daemonizing'
+	)
+
+	epytest -s
+}
+
+src_install() {
+	local d
+	for d in email icons interfaces locale po sabnzbd scripts tools; do
+		insinto /usr/share/${PN}/${d}
+		doins -r ${d}/*
+	done
+
+	exeinto /usr/share/${PN}
+	doexe SABnzbd.py
+
+	python_fix_shebang "${ED}"/usr/share/${PN}
+	python_optimize "${ED}"/usr/share/${PN}
+
+	newinitd "${FILESDIR}"/${PN}-r1.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+
+	diropts -o ${PN} -g ${PN}
+	dodir /etc/${PN}
+	keepdir /var/log/${PN}
+
+	insinto "/etc/${PN}"
+	insopts -m 0600 -o "${PN}" -g "${PN}"
+	newins "${FILESDIR}"/${PN}-r1.ini ${PN}.ini
+
+	dodoc ISSUES.txt README.mkd
+
+	systemd_newunit "${FILESDIR}"/sabnzbd_at.service 'sabnzbd@.service'
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+		einfo "Default directory: /var/lib/${PN}"
+		einfo
+		einfo "To add a user to the sabnzbd group so it can edit SABnzbd+ files, run:"
+		einfo
+		einfo "    usermod -a -G sabnzbd <user>"
+		einfo
+		einfo "By default, SABnzbd will listen on TCP port 8080."
+	fi
+
+	optfeature "7z archive support" app-arch/p7zip
+	optfeature "rar archive support" app-arch/unrar app-arch/rar
+	optfeature "zip archive support" app-arch/unzip
+}
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 44cb028e0cff..26e87ead8496 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/package.deprecated b/profiles/package.deprecated
index ca26d490fc2f..77560f32af14 100644
--- a/profiles/package.deprecated
+++ b/profiles/package.deprecated
@@ -17,6 +17,13 @@
 
 #--- END OF EXAMPLES ---
 
+# Michał Górny <mgorny@gentoo.org> (2022-12-24)
+# Unmaintained with last release in 2019.  We already patched it to work
+# with Python 3.9+.  The upstream code is also vulnerable
+# to CVE-2022-40899.  Above all, this library is completely redundant
+# to packages not supporting Python 2 anymore.
+dev-python/future
+
 # Michał Górny <mgorny@gentoo.org> (2022-10-17)
 # Nosetests are no longer maintained (since 2015!), are completely
 # broken with Python 3.11, and we were already patching it to make it
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index d97d231c78f9..68889fb030cd 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -6411,6 +6411,7 @@ net-misc/hylafaxplus:html - Convert faxes into html email
 net-misc/hylafaxplus:jbig - JBIG Fax Compression Support
 net-misc/hylafaxplus:mgetty - Receive faxes via serial port connections
 net-misc/hylafaxplus:pam - hfaxd authentication via PAM
+net-misc/icaclient:hdx - Install and enable hdx-realtime-media-engine plugin
 net-misc/icecast:kate - Add karaoke and text encapsulation support for Ogg files
 net-misc/icecast:yp - Build support for yp public directory listings
 net-misc/iputils:arping - Build and install arping -- tool for sending ARP requests to peers (see also net-analyzer/arping)
diff --git a/sci-astronomy/Manifest.gz b/sci-astronomy/Manifest.gz
index e9dcadf51c9f..d99fc18f7bc4 100644
--- a/sci-astronomy/Manifest.gz
+++ b/sci-astronomy/Manifest.gz
diff --git a/sci-astronomy/xephem/Manifest b/sci-astronomy/xephem/Manifest
index 31355042b882..68b97314659f 100644
--- a/sci-astronomy/xephem/Manifest
+++ b/sci-astronomy/xephem/Manifest
@@ -1,9 +1,10 @@
 AUX xephem-3.7.7-implicits.patch 305 BLAKE2B ad16733b6d44619528af60a33710f3b558a16ebd24bad15b2c1ccf728a113f5495c5f26ded2c1ac61a3fedb9f916571b8bf8076527c7c2ee1353e212e710b319 SHA512 220186bb7f72fe0de6ca75a67df7b1a4d4cc57cc4768d565dc8225e20df93738c7bdd62bde6297941d1ec6638800950ef56e355de8ca1e3e8192b903b021adba
 AUX xephem-3.7.7-no_xprint.patch 262 BLAKE2B 6676f7e94978d4433f3f26ff3ec4738fd3f5735462806b7f19e7aa4b7671e62e8f7e894071a04f5a90510782b8a57ab0de0a722d4c5520d5c1cf5bbc0c4c9f52 SHA512 d0277edb3c011bf606803a280461410263fe9986d164df28a6801d3bcd7a0a21405728f9d27fd3dfa1a620e4b364d1d8b65843382bd99a2cf2c3e05755a277c2
 AUX xephem-3.7.7-respect_env_vars.patch 3781 BLAKE2B e596c7216c0f70145a189696ff890e136ba282113dc5c9acee4808f7a6474f7e0d9295997ee4dbc595dd8a50d1cb67d22e138b465a82a13a2e294a093f0a7061 SHA512 84a9697c3b05ed28bcc59f4b30807aad76c3228e1aec3db898995d36cae3ef58557ff984a57f60b99e15dd04670a65061451dc00437498c14ed081c0cf06830d
+AUX xephem-4.1.0-allow-parallel-builds.patch 620 BLAKE2B dbcd36eb74e0a92ae36fe02a6eabf128b783e1a1fb4da46633703cf86a46180e17d70bcd73364d0f8a4128661dad9457d1b626696373599c872323e00b6ccb02 SHA512 b2732186c2cbb0b83e56b4cd968886c734271c66a24bca0cb7fb42310c98c51d2431f4d015bd9c1c7e92086076dde34a66a94ec2bbab2d689c930e7762244dbf
 AUX xephem-4.1.0-respect_env_vars.patch 3331 BLAKE2B 9e9cd514429485e7934b0d82355ebac66dce6870fd85a490f691fd4943bc23aa66531d7bce4d4e925a6d26bd7bffad0e0eb37506b593b032914a1d8d34edaeab SHA512 c88ce6569cf1e9fd27d3868344e1160d666fc0399a4dd2d4c3c10154fc947f25ebf5904123edd7ae3ca54832eeb89d67c6e2586fd4fa8e3bcb31304d44a1e8a9
 DIST xephem-3.7.7.tgz 18128521 BLAKE2B a7d0ee2cf1be64f79ed0c5cea6d37e48c69875de5b3c9592554ee8be25b369e964c7a6bb05690ef28893b7af8277daf39ba85538f56852f35538180f9ad0c2ba SHA512 0a21f783a0a543f19a527afb87647ff2e988c6a426a37e01b9a3d1d76a9ee74125ce802e2dbc5e13034f11ef897e6188cb5b0bb92bc0d35db0fb8839e0c53157
 DIST xephem-4.1.0.tar.gz 17213750 BLAKE2B 921aa4b305cb80df5746db962739d16ee23f1831b59934389ecd218b874ba1fc51aab07896d1283760db1a50be6279da50ed112320fc481f90b4f2d6e25c96dc SHA512 bcad3a6b375cabf1f44e39bc99386552d97a7e7d2ee4063dae4ccd3d5842604f0efc3407447f18a5c9e7f265bab6eebe98bdb64626dcf2135b56f346818ef1b6
 EBUILD xephem-3.7.7-r1.ebuild 1186 BLAKE2B f249535f9449eaa36fbbe3ca33407c9d42385f0143cd77849d6f5c746934bc967bf56880f9205409bffd13e058b2fa7951d8c1181823b476a0f4c06be6d192ff SHA512 f814d7754b9f3ba339d10ca0c4b0b9ba30408b7595dfbd2e91ffe1f9924703caf7a4099bbd4ebd1f670d9310c752f78b9daa584316b93d8bd65e83f9135e7c4e
-EBUILD xephem-4.1.0.ebuild 1277 BLAKE2B 55c5dc546b977f0b0e9132cfe3c1c10da386165ee87d1ac7c3b7cc771cde76066eba18645438e5107ea1a7494f15fa962a6aeb1c7a65acd4c4a37f31898e37f4 SHA512 b1ad50f4642442a75c624a0da3ee388ba66b1e24235520b6643dce1d42051cec998f8b17ae9e1b97b114de60941c32b79552976dd6a29352af92d1fb6f77f140
-MISC metadata.xml 731 BLAKE2B 980eecb953df6c70d788fd68a61cc584f6b1d6605c6970afc82a21ab0a6dacd69354e8156bc0b7dfc04cc205042d2d1d2170abd40bbb74a077a0462a72a78d95 SHA512 ac2f5d29c822dc4e89eedcfa0e2797d61a29531509267290e4426df1ca6179e9b07673f961b473cafacb2b35cf7e0b6f579053648bcee6ae61ae9dee319eaa55
+EBUILD xephem-4.1.0-r1.ebuild 1442 BLAKE2B bdb69563d4d5687669d3e253047be7be17df3d2c8dc8e096e18ac8874cfb2d0a05d3649ca4b782e973df5fd0bdc7f90ff94204dc0d664d6581c81a3b4317a58f SHA512 97b7408564f6d209007aa3b47a4d15fe36ffdb4ce0be0759b23bdb70f4bd785764c8960769de8efd1920d6e70ef3b1b656fb3544bd8affa317724b5e38ec502e
+MISC metadata.xml 809 BLAKE2B a7bb501c3896ab9cda8bfd76212ca6eba0efa46fb12d3d272b566bdd25402c9aa235feec36d78d49480f8e8ab6ca13ba7c02506aeb4ccf70a9ece678c4e4ead3 SHA512 bd4f46f28856dd588170fb9ee5cfb0c8be96deba1ca86c22bc6ed9b6bbf4667cf172ad8559186edc43a328af6a0c73571dedf051420eb571804e27c59ffbe280
diff --git a/sci-astronomy/xephem/files/xephem-4.1.0-allow-parallel-builds.patch b/sci-astronomy/xephem/files/xephem-4.1.0-allow-parallel-builds.patch
new file mode 100644
index 000000000000..87d4a32e8857
--- /dev/null
+++ b/sci-astronomy/xephem/files/xephem-4.1.0-allow-parallel-builds.patch
@@ -0,0 +1,26 @@
+From 89cc80f47cdf71d3a5eae0ea6a2bade329a3e1fb Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Fri, 9 Dec 2022 12:30:24 +0100
+Subject: [PATCH] allow parallel builds
+
+Ensure all libraries are ready before the final binary is
+going to get linked.
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+--- a/GUI/xephem/Makefile
++++ b/GUI/xephem/Makefile
+@@ -182,9 +182,9 @@ OBJS =			\
+ 	xephem.o	\
+ 	xmisc.o
+ 
+-all: libs xephem xephem.1
++all: xephem xephem.1
+ 
+-xephem: $(INCS) $(OBJS)
++xephem: libs $(INCS) $(OBJS)
+ 	$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
+ 
+ xephem.1: xephem.man
+-- 
+2.38.1
+
diff --git a/sci-astronomy/xephem/metadata.xml b/sci-astronomy/xephem/metadata.xml
index b68063e309e9..a6c852e0ab3d 100644
--- a/sci-astronomy/xephem/metadata.xml
+++ b/sci-astronomy/xephem/metadata.xml
@@ -13,4 +13,7 @@
 		the moons of Jupiter, Saturn and Earth; Mars' and Jupiter's central
 		meridian longitude; Saturn's rings; and Jupiter's Great Red Spot.
 	</longdescription>
+	<upstream>
+		<remote-id type="github">XEphem/XEphem</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sci-astronomy/xephem/xephem-4.1.0.ebuild b/sci-astronomy/xephem/xephem-4.1.0-r1.ebuild
index 8b8f87e5ba22..ef46be975575 100644
--- a/sci-astronomy/xephem/xephem-4.1.0.ebuild
+++ b/sci-astronomy/xephem/xephem-4.1.0-r1.ebuild
@@ -16,9 +16,9 @@ KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-libs/openssl:=
-	>=x11-libs/motif-2.3:0
-	virtual/jpeg:0
+	media-libs/libjpeg-turbo:=
 	media-libs/libpng:0=
+	>=x11-libs/motif-2.3:0
 	x11-libs/libXext
 	x11-libs/libXmu
 	x11-libs/libXt
@@ -28,9 +28,12 @@ BDEPEND="sys-apps/groff"
 
 HTML_DOCS=( GUI/xephem/help/. )
 
+# NOTE: order is relevant - parallel build patch requires respect env vars
+# patch to be already applied
 PATCHES=(
 	"${FILESDIR}/${PN}-3.7.7-implicits.patch"
 	"${FILESDIR}/${P}-respect_env_vars.patch"
+	"${FILESDIR}/${P}-allow-parallel-builds.patch"
 )
 
 src_compile() {
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index 8d04f350f0e7..2a24dab6742d 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/lean/Manifest b/sci-mathematics/lean/Manifest
index 34e1d157ae7f..f2e0197e3328 100644
--- a/sci-mathematics/lean/Manifest
+++ b/sci-mathematics/lean/Manifest
@@ -1,11 +1,11 @@
 AUX lean-CMakeLists-fix_flags.patch 1285 BLAKE2B 0507e553c1acf2a53c5267932127117d5ae5ba9015a08c88748b3d82c041f8d904d15cd033dd7934ac55c474fa75a5d4a46f680cc887fee37c05c3f5f3832839 SHA512 11a5918847e45aac7bf79e48d8f881ef5cd3e6b09dbb0979f3f0b88fd36458be21ebeb530158da801399a0cdc8fe382444ff338cd793cd9f1bfced90c5d5a71b
 DIST lean-3.49.0.tar.gz 1918154 BLAKE2B 9f9973d00d2d5d5b7d26d50117c27754feb5132e88decd55859432a384dac2897184dcf8d841ad0034854657ac25e462dc69cdbe1cf2040787d108bb7e1370f4 SHA512 b4672843c2e923da8d56b91c14966fc2ec66c573564d68db9c52f9b40f2c97d82497f2ef6424b023c4ae50f6f0c11674e2d79053844ea669d226d0fe24077ade
-DIST lean-3.49.1.tar.gz 1918165 BLAKE2B bebb29023f7d8979dae19d7c5ef6503be03012366c8a4f21a69244a1daadf90c73e8a8754656d7b1a6eccb1123f0905f3dcaa15885b0307399979024d2c5a051 SHA512 6648ab84840099495df5bec9432c75c40fc0920ac2a18297b42c35de593ec4eaee8bcf807cb6e273c2715090e5d1ab6c59652f482016af68d758e7e6e55dd87f
 DIST lean-3.50.0.tar.gz 1918549 BLAKE2B 79827ffb9f825dff040e41e9bcbd8306e2f3a116b74fc6e0831450765d5b896fad2a86ec5dd9e63bf0f8777b575d4ab7ae8d158c233364fad6d4437bc0767452 SHA512 2b8d730ef9d808a24a9708f2b33409510bd6b7350f515679ba0395a45fc2dea2125639cdeb867bec4ac9c8114e448fb9777a69f8859e172f6e694ecacbb07f56
 DIST lean-3.50.1.tar.gz 1918323 BLAKE2B 3a26a6481a8472941a928a7b33b24231239e553cd4a4af5671f6a05f1fa68a54657518c4775b641239aa55401100e44c2797d7ae572405225657f1f7da8e193c SHA512 df2e5915e8a7f7e278e2d3472afe6cc23fec5de808b0cc1b20365ad41cfd03b1efda80523059a96c6b3d9b8b0ccab311700ee6a5d6c9751454ebe3b2f168cf77
+DIST lean-3.50.2.tar.gz 1918353 BLAKE2B 2a8c41eef0cc3c2d3e1b45ccd2383279a1a91c0de772c5fe3f1ffafc808db4b6e7342f2f72bd4c4120ed4248d60359c6e331f4adc1d26c6328b284549861c4de SHA512 58d085deb0354db0067e86e6097dad7f1543f356d4e50607b8cc049a19d867aa7ea03553bab3799c6ad18d0ef4fa468b0f966512d8bf0076526f90e93195a407
 EBUILD lean-3.49.0.ebuild 1767 BLAKE2B 8b4c2d7aea54b4e93e2f284bf78129fd47ee1d4de6bd2e867151c2e8e3d52c1cf52d1323cd03107c0a30555b94284347a94aa859918e135db9e86fc6559f2352 SHA512 270450c4cb4f7ff4cf8e4f6e4432551d6ba92ba44c86a97797488f471f0c5882afc0f33985bed59a529a7f134e963a5bd10836cb7fff6ba0910f6f831821a75a
-EBUILD lean-3.49.1.ebuild 1768 BLAKE2B 79dc1a54bd55667913f1dba0204ea845e3ae707f4dfdcbd7c8274d3fe00db9292228975dddfadcac6f068d65b49f076ac47480a3a394f294c40b7174c81b2b40 SHA512 28c85c3af753322f828f05ae20e14a8545a4ef5913572c8c998a4699a7fb3d7092b7bc5f9d2b045f8550b20b6c0ba967c9e9944753ff775a827c15b11c8e2198
 EBUILD lean-3.50.0.ebuild 1768 BLAKE2B 79dc1a54bd55667913f1dba0204ea845e3ae707f4dfdcbd7c8274d3fe00db9292228975dddfadcac6f068d65b49f076ac47480a3a394f294c40b7174c81b2b40 SHA512 28c85c3af753322f828f05ae20e14a8545a4ef5913572c8c998a4699a7fb3d7092b7bc5f9d2b045f8550b20b6c0ba967c9e9944753ff775a827c15b11c8e2198
 EBUILD lean-3.50.1.ebuild 1768 BLAKE2B 79dc1a54bd55667913f1dba0204ea845e3ae707f4dfdcbd7c8274d3fe00db9292228975dddfadcac6f068d65b49f076ac47480a3a394f294c40b7174c81b2b40 SHA512 28c85c3af753322f828f05ae20e14a8545a4ef5913572c8c998a4699a7fb3d7092b7bc5f9d2b045f8550b20b6c0ba967c9e9944753ff775a827c15b11c8e2198
+EBUILD lean-3.50.2.ebuild 1768 BLAKE2B 79dc1a54bd55667913f1dba0204ea845e3ae707f4dfdcbd7c8274d3fe00db9292228975dddfadcac6f068d65b49f076ac47480a3a394f294c40b7174c81b2b40 SHA512 28c85c3af753322f828f05ae20e14a8545a4ef5913572c8c998a4699a7fb3d7092b7bc5f9d2b045f8550b20b6c0ba967c9e9944753ff775a827c15b11c8e2198
 EBUILD lean-3.9999.ebuild 1767 BLAKE2B 39700411a69b0ac91dbb14ef4c12979ca94c6529b7c085bb04b29b667d7852983fcc90519748a506b547141a53a88de196bc693e2c40cc12ea438a383b302728 SHA512 6075af9174d9487b82557cdf4641848fc98de380e77f47308649eb3fac0c32193a92c47223a7146f3ccdc6db1b4d4e1987dd560b44081dfdda3c00c69fd10026
 MISC metadata.xml 606 BLAKE2B 6478d84a762a59082fdea0a11a95b27c093782228c48dba58dc490ea9ac2cecef54cc3101dc98e385f3a29f85d84af21b7d2ae1a9f089ee0313158ecb44eb0e7 SHA512 02d2ac07b155c7a04c857d397d476a39864d02b10dd81c5830db5e21eb86c6dcff26da552a04717f5f587b326ddf8e2e8d27f1a138f88b391f0199d8004d8cb7
diff --git a/sci-mathematics/lean/lean-3.49.1.ebuild b/sci-mathematics/lean/lean-3.50.2.ebuild
index e008b81cf582..e008b81cf582 100644
--- a/sci-mathematics/lean/lean-3.49.1.ebuild
+++ b/sci-mathematics/lean/lean-3.50.2.ebuild
diff --git a/sci-visualization/Manifest.gz b/sci-visualization/Manifest.gz
index 5a67cac19f17..be137ef731f5 100644
--- a/sci-visualization/Manifest.gz
+++ b/sci-visualization/Manifest.gz
diff --git a/sci-visualization/gle/Manifest b/sci-visualization/gle/Manifest
index 83e146ae0d9f..95d5003da312 100644
--- a/sci-visualization/gle/Manifest
+++ b/sci-visualization/gle/Manifest
@@ -1,14 +1,21 @@
 AUX 64gle-gentoo.el 191 BLAKE2B 710428a55c0c17baded6cec2b0d4a20582fc3a91278f27ee0724d911c01178e3474339ac6615aefef0a76d7bcb586fe7f9957fd2bd718d636d899891a60d1613 SHA512 6b363700fde1022963b81a274d1798f3ddcdd6e8472d802cc192bdbfe0c63bc2e0889f6d92e58964ccbc463f51b1fb6fab504951f74f203546ce79d38bb14d7c
+AUX array.patch 581 BLAKE2B 9f7eba9c7ff8496059ad24cdda171f745db58a145d661338f5f3bf76c7863c2d1af8f879409f330ee6a163042fc0eb2f102e9857a2d15f9fcb06eb61a0394d61 SHA512 fa9760e4a07efb8c3fba372a9c11edeed06c563e9742001d388d2083f93b4b64f6e5e2ddef64372566630cfff9c59292455baf30bbbae5c0d7f426860ad1195b
+AUX cairo-pixman.patch 1178 BLAKE2B b38c5ed332bf13b366df23277d999e648d67e861a4f227e14be6e6e448fb86b57a26c10d9909a25f2a45105a01f57a99cf1cdf75ffea66dca0bf3cc6e9dc6124 SHA512 52c9b2e538111f84a1f127717d3c96d75bb4cf138547fe97dfbbf563d06e50e92963d045b2396c01f83e48190638b9007843e51d6afe345e9404402fba5e307e
+AUX ghostscript.patch 972 BLAKE2B 3750321b5093400595070290c9c9af948eae797e6365be982c82716000a5176df641888783d99b640014f9d5310c94c9c1ebbd3ac091ca4076b7b92b923a78b3 SHA512 063bb97c177e4c47d51649056cc30aa14a5f7df664e19a15b8bd5d337b14a5ad4f5d318301fcc33823aed9cf5b5af070949861c0ce8f857f59a6f7ba951a1d88
 AUX gle-4.2.5-c++14.patch 1113 BLAKE2B a75d450b3f067d3f1158618fbdbed69352e9660a60662de730a73b5c7917f1f64a6a2c10472a7f4ba8ae49f8860ba72e919385b863de74878933e3c8022e246b SHA512 aef210745cbf2deb265fde3839e5156eadd52d28029583b52bb53a9e2db26f6dfc6fd2243626be67ae6d00b1e0dbd1b03ed32f594541a569b1df289e78d8d367
 AUX gle-4.2.5-jpeg-9c.patch 685 BLAKE2B bfcb90439c6cdd2bd75b9e5d30232dd816f348dfdf9ee7067e848741c4050a441869e04513ae04f92569ad3854a77fe9c739be6ebd1ca5ff5988af6ba5020d99 SHA512 55c1f8fd59cbe71b14d1755bceb5fb02ebfbf0e71eafc39837b513ba48be7421c51352c60d127fc4744628eb6e403eadb703bf24a49dea5652c08ae749a67590
 AUX gle-4.2.5-parallel.patch 572 BLAKE2B 03617a63dac035582a90cd0d872c114cc8b4426e05483130ead443a6d136f7c54cafabd7312e0c8eae5c90b704bd4d0a475f49feea69de464deba2c47970c066 SHA512 95d2c9fb1023f6f468b7258c52c04635dfe297da579de0bf429d90bfc1849348191f0821f18b048057271260ad0a9511fd811bdb1494fe51aa1dcd84276b2259
-AUX gle-4.3.3.patch 5101 BLAKE2B 0723a4de8465efeac456e0f0adc850618ea115480ef3b8301ea0df9d4aa572fe308fa10177141c8fdbd4d3f2b3d8b7d9ff2394aac58ee95380b253a70923c1c2 SHA512 c633d0da43993f7e8de3127b29f8e8e37b9130610cfb0ee3b7c2aed2c12c4ee036275c550ec396b02c84886abf835e2d98c0e124ceec09d79c0501c50a23fc04
 AUX gle.sh 65 BLAKE2B 8e045866b0d20a77e3e2de050d90f0b0f8efa3a57481ecf2b01ad3c0f81d5ecd9e4d054b20ca488f282dbd111b6997113232fc984d628d9d9b60e3287511b912 SHA512 90ca83947538d2342702ea60974780a3f303c223989a43f5fe117b5d97b650827d074adcd011a15c0716b3a9cd54913a661ebe59a3afba06d51e0a889f14fda8
+AUX install.patch 821 BLAKE2B b8ca829a3e5f3fa96695ba28ff7e7170badc5a3f8f629a91cc6f2f16db5a5b3c0b18cb5c361e96f449304cc793d8e14f93c2c06b5ec7e27649662f1daad9f554 SHA512 1d22cdb507e3322c61bc69ef8ce12b32a9b58a2c6b634b7282d795e5ab66a10d19525e15351dee6a2ec136773ab28952de87cd10216c0acb782f2f441a3dcddd
+AUX lic.patch 329 BLAKE2B 75445082d509836f3ff7d5c88c182486d2fdeb22cba77a96ee879073b5e6865ae2522978ef73f715f11cda323d51bb763e4189eca8aab213e4dafeaf6b33a4f3 SHA512 858b7dc4a226a48d3ee5692ab58db5975f202ffe1a885eb0e5272c359d3f9020fd38b9ccf2f1d605f90b6d749dc1674650e020d7eac99b4a4bfd808c47ee0052
+AUX link.patch 635 BLAKE2B bf4f93fae6dd7d8a14b3f6bd180a1e275511087fc3b8acd7c8b2a14fb5c163f884696a5dcc98bd11825c2e03ad65b1c2f1a695dbeae7f50cb555000fb3803474 SHA512 5d4e3255a066cbf4d442a778064edddaae007176420734b516b52d924573d23041128a99139a58be1cb5c2e858e6bb9b3a6f1ae81f8b9b823ffd8417547fb0d0
+AUX wayland.patch 347 BLAKE2B e4bff5717aee0ea83a7fdb7047a0363c34a225809246f33b7da92b9f535d9e412047bdb9e22436629bbc7b11be55838e64f624e870c4f60f4634d28aac21e3d7 SHA512 a51b030de9ffc7fd83e04271a191ba352cfd670a149249c0bf6415d4583c8402a4cc6930aa849bbab2d8c11f4934f21ffdba36c8fc78ba235ced6e2b9ca0b03d
 DIST gle-4.3.3.tar.gz 1788614 BLAKE2B 3f608a8dad32d02b06808d5b2cfe4a2beb2c076c74e2972be2e94fe56bf24190b9cc7c69f45f1b02d399354f827c43722029871d6355bc0e4abe003f71b2bf82 SHA512 191dde025828f3376c7241e0580fcd459c743fe947f69cc3be1345b43c1d2587852a0d002dfdab7d8b7b45fd30e6bf4e8a4b5c73bcc2f3ce2fd08aa41d799b03
+DIST gle-c++17.patch.gz 18738 BLAKE2B e0d91aedf2121897336be72d8ad5878be95cf15982b38efb2fda86605d6e0f01b792013a9ab6407692254e5c074630daede05bcf97f349541dd979b21eb2ff15 SHA512 3bc4e335577f94eafd140cd64f2ada1926b1679c113de1f0bb0dd1afed67210470340470b19d89dae4ae1ef433f05120332a465711afb4e637e3cf0c6db68ace
 DIST gle-graphics-4.2.5f-src.tar.gz 2330270 BLAKE2B 46435a2366a278a88786a2dd0e0cbcc48d3ba2fc6d895fb07c81216089a10b2223b2ba692b951ee01a6ab014e84cce9aa3969d063ddf7d04501820aa33084c5c SHA512 d459b24577c9c3f8825c368f864532c97d0a37c94018276a60c941d17dce0e55fe738f7eda3227a47848f2fb32fea1dcec29d9751a5be92cde4d8d38a2eeb0f5
 DIST gle-library.tar.gz 1073620 BLAKE2B 051f9584dbf3195c7598ae54b12ab8d373e8054e8ff4c3d1dfed70319c29c5cb8bb1f0baff127768bcf9e36e4f52be3b3238e786e1598d1cdfbd6d1af6d6bdd3 SHA512 af6a46f2bd945714679eb9d8ca4c70ca9a741cf6652590eb3a8d9422059f49ce3d2c33418c37899bd54f9e0bc0085ae82ffd2f2b84b77879e2f2d09a0026d12a
 DIST gle-manual.pdf.gz 1878050 BLAKE2B 6ebd3c0214ab8aee3e5a32d1e1cdf1c001cd09325c80a506a1e41f4eb3ec8869b75083c741a5cf8b2f3faf1d2cb0c6cfeca835daa284263598f749109904cc11 SHA512 7cc796626fa19541558004250a4a5b206ead7ba704c76fd948693aca144e70926b8213ee8b062841bffedc631eb39a255d69387bbee4a5acc7edc6d093e3113f
 DIST gle-mode.el.gz 7359 BLAKE2B bcbc61651f87f3ee1d079fc0a0de38788523a5ee33f56087b89f4e15b9ef5ee4010cf47679c38da3dfae1954ddbfee4728d10c0af6530f645ff63ab2b219da09 SHA512 c8d291c23f53346d8a44b7d95d737da88c6ec0af597fb8298a564a5567a9e9a0db658d14c3cb43157d58614e65cf2293eaeb01528a7a49722a2da07e16f940e1
 EBUILD gle-4.2.5-r4.ebuild 2167 BLAKE2B 0a2d82e70c113d95e22620ccc4689a2cc361226fe044fc59a8635866ccaab62c475d9947aef9586c38e0173ba3ee86626f9db44ff83689c816000f9234991462 SHA512 5adcc01b7eae8c4e796ff32efeb74fc46b4ee2ff27f2145653012d2e1d1fac99c97216b8735409d73524da1f4850f5d4f3958e0b0d762103ad479626973d39a8
-EBUILD gle-4.3.3-r2.ebuild 2181 BLAKE2B 9fa56d4601c76f42459d629d72d97d5a69fe6d94170518b18772dc748696fcccad26a0ab3deddf81ee708930898b87469645dd04af822b33443e274a06cc17de SHA512 87771c3ad90220c25feaaef9839319e30618463ba1f68f90598543951920d6a1bcd19fe7fedba549f1ec7cdeac04fb21246fad22ee32ac9416079fa8cf5bf3f5
+EBUILD gle-4.3.3-r3.ebuild 2469 BLAKE2B 14d223de9a2bee0d41f9f48efc97d38458268bd6ca84c31806786ee3187c2b6ef836bb038eaaa6e49fb5b551fe7ca5e0fcd13bb31aca7ddea5dfdf11a1cbc697 SHA512 34e00d60b5bc676d76d7c91dd89e2e56378ff28273ef7926ece9a2538c4ac2b04908957041fc165a58bb6f1914bb7cae872a9e9a44172fe7a5542ba934a370ad
 MISC metadata.xml 758 BLAKE2B ea6e049fe37e4fc4cc9510774bb13ec9d2107ca1e4078a9bf22afadb59a375ced01aab6cffc674bcce01e4e51960db830e7a381600322f903f6b1407cd11ae13 SHA512 953fa5de474729f4196392b9ccb09d9a07799c26d5e5ef3422bc8e737bb666c8bd66e1931c225d049e30be31fc427909225d5457b95c78de2f2073d0108d2620
diff --git a/sci-visualization/gle/files/array.patch b/sci-visualization/gle/files/array.patch
new file mode 100644
index 000000000000..54b7676aea88
--- /dev/null
+++ b/sci-visualization/gle/files/array.patch
@@ -0,0 +1,15 @@
+diff -r -U2 src.orig/makefmt/makefmt.cpp src/makefmt/makefmt.cpp
+--- src.orig/makefmt/makefmt.cpp	2022-04-14 02:47:12.000000000 +0700
++++ src/makefmt/makefmt.cpp	2022-12-18 14:09:54.399896247 +0700
+@@ -115,6 +115,6 @@
+ 
+ int main(int argc, char *argv[]) {
+-	char filename[80];
+-	char fmtname[80];
++	char filename[200];
++	char fmtname[200];
+ 	init_accents();
+ 	/* encoding file given? */
+diff -r -U2 src.orig/TeX/CMakeLists.txt src/TeX/CMakeLists.txt
+--- src.orig/TeX/CMakeLists.txt	2022-04-14 02:47:12.000000000 +0700
++++ src/TeX/CMakeLists.txt	2022-12-20 13:34:00.953502995 +0700
diff --git a/sci-visualization/gle/files/cairo-pixman.patch b/sci-visualization/gle/files/cairo-pixman.patch
new file mode 100644
index 000000000000..e5b34eb287f9
--- /dev/null
+++ b/sci-visualization/gle/files/cairo-pixman.patch
@@ -0,0 +1,21 @@
+diff -r -U2 src.orig/CMakeLists.txt src/CMakeLists.txt
+--- src.orig/CMakeLists.txt	2022-04-14 02:47:12.000000000 +0700
++++ src/CMakeLists.txt	2022-12-20 13:03:11.386586253 +0700
+@@ -130,5 +133,5 @@
+ 	string(COMPARE NOTEQUAL "${CAIRO_LIBRARIES}" "CAIRO_LIBRARIES-NOTFOUND" CAIRO_FOUND)
+ endif()
+-find_path(CAIRO_INCLUDE_DIRS cairo.h PATHS ${CAIRO_ROOT} PATH_SUFFIXES include REQUIRED)
++find_path(CAIRO_INCLUDE_DIRS cairo.h PATHS ${CAIRO_ROOT} PATH_SUFFIXES include include/cairo REQUIRED)
+ if(CAIRO_FOUND)
+ 	message("-- Found CAIRO: " ${CAIRO_LIBRARIES} )
+@@ -154,8 +157,8 @@
+ 	endif()
+ else()
+-	find_library(PIXMAN_LIBRARIES NAMES pixman pixmand PATHS ${PIXMAN_ROOT} PATH_SUFFIXES lib REQUIRED)
++	find_library(PIXMAN_LIBRARIES NAMES pixman pixmand pixman-1 PATHS ${PIXMAN_ROOT} PATH_SUFFIXES lib REQUIRED)
+ 	string(COMPARE NOTEQUAL "${PIXMAN_LIBRARIES}" "PIXMAN_LIBRARIES-NOTFOUND" PIXMAN_FOUND)
+ endif()
+-find_path(PIXMAN_INCLUDE_DIRS pixman.h PATHS ${PIXMAN_ROOT} PATH_SUFFIXES include REQUIRED)
++find_path(PIXMAN_INCLUDE_DIRS pixman.h PATHS ${PIXMAN_ROOT} PATH_SUFFIXES include include/pixman-1 REQUIRED)
+ if(PIXMAN_FOUND)
+ 	message("-- Found PIXMAN: " ${PIXMAN_LIBRARIES} )
diff --git a/sci-visualization/gle/files/ghostscript.patch b/sci-visualization/gle/files/ghostscript.patch
new file mode 100644
index 000000000000..576477ca17c3
--- /dev/null
+++ b/sci-visualization/gle/files/ghostscript.patch
@@ -0,0 +1,16 @@
+diff -r -U2 src.orig/CMakeLists.txt src/CMakeLists.txt
+--- src.orig/CMakeLists.txt	2022-04-14 02:47:12.000000000 +0700
++++ src/CMakeLists.txt	2022-12-20 13:03:11.386586253 +0700
+@@ -164,9 +167,9 @@
+ # -- GHOSTscript or GHOSTPDL include directory only since gle links to installed version at runtime
+ #
+-find_path(GDIR1 iapi.h PATHS ${GHOSTPDL_ROOT} PATH_SUFFIXES psi base devices )
++find_path(GDIR1 iapi.h PATHS ${GHOSTPDL_ROOT} PATH_SUFFIXES psi base devices ghostscript )
+ list(APPEND GHOSTPDL_INCLUDE_DIRS ${GDIR1} )
+-find_path(GDIR2 gdevdsp.h PATHS ${GHOSTPDL_ROOT} PATH_SUFFIXES psi base devices )
++find_path(GDIR2 gdevdsp.h PATHS ${GHOSTPDL_ROOT} PATH_SUFFIXES psi base devices ghostscript )
+ list(APPEND GHOSTPDL_INCLUDE_DIRS ${GDIR2} )
+-find_path(GDIR3 gserrors.h PATHS ${GHOSTPDL_ROOT} PATH_SUFFIXES psi base devices )
++find_path(GDIR3 gserrors.h PATHS ${GHOSTPDL_ROOT} PATH_SUFFIXES psi base devices ghostscript )
+ list(APPEND GHOSTPDL_INCLUDE_DIRS ${GDIR3} )
+ 
diff --git a/sci-visualization/gle/files/gle-4.3.3.patch b/sci-visualization/gle/files/gle-4.3.3.patch
deleted file mode 100644
index 22dc0b160605..000000000000
--- a/sci-visualization/gle/files/gle-4.3.3.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-diff -r -U2 src.orig/CMakeLists.txt src/CMakeLists.txt
---- src.orig/CMakeLists.txt	2022-04-14 02:47:12.000000000 +0700
-+++ src/CMakeLists.txt	2022-12-20 13:03:11.386586253 +0700
-@@ -9,4 +9,7 @@
- project (gle VERSION 4.3.3)
- 
-+set(CMAKE_CXX_STANDARD 14)
-+set(CMAKE_CXX_STANDARD_REQUIRED ON)
-+
- add_compile_definitions(GLEVN="${PROJECT_VERSION}")
- set( CMAKE_DEBUG_POSTFIX  "d")
-@@ -130,5 +133,5 @@
- 	string(COMPARE NOTEQUAL "${CAIRO_LIBRARIES}" "CAIRO_LIBRARIES-NOTFOUND" CAIRO_FOUND)
- endif()
--find_path(CAIRO_INCLUDE_DIRS cairo.h PATHS ${CAIRO_ROOT} PATH_SUFFIXES include REQUIRED)
-+find_path(CAIRO_INCLUDE_DIRS cairo.h PATHS ${CAIRO_ROOT} PATH_SUFFIXES include include/cairo REQUIRED)
- if(CAIRO_FOUND)
- 	message("-- Found CAIRO: " ${CAIRO_LIBRARIES} )
-@@ -154,8 +157,8 @@
- 	endif()
- else()
--	find_library(PIXMAN_LIBRARIES NAMES pixman pixmand PATHS ${PIXMAN_ROOT} PATH_SUFFIXES lib REQUIRED)
-+	find_library(PIXMAN_LIBRARIES NAMES pixman pixmand pixman-1 PATHS ${PIXMAN_ROOT} PATH_SUFFIXES lib lib64 REQUIRED)
- 	string(COMPARE NOTEQUAL "${PIXMAN_LIBRARIES}" "PIXMAN_LIBRARIES-NOTFOUND" PIXMAN_FOUND)
- endif()
--find_path(PIXMAN_INCLUDE_DIRS pixman.h PATHS ${PIXMAN_ROOT} PATH_SUFFIXES include REQUIRED)
-+find_path(PIXMAN_INCLUDE_DIRS pixman.h PATHS ${PIXMAN_ROOT} PATH_SUFFIXES include include/pixman-1 REQUIRED)
- if(PIXMAN_FOUND)
- 	message("-- Found PIXMAN: " ${PIXMAN_LIBRARIES} )
-@@ -164,9 +167,9 @@
- # -- GHOSTscript or GHOSTPDL include directory only since gle links to installed version at runtime
- #
--find_path(GDIR1 iapi.h PATHS ${GHOSTPDL_ROOT} PATH_SUFFIXES psi base devices )
-+find_path(GDIR1 iapi.h PATHS ${GHOSTPDL_ROOT} PATH_SUFFIXES psi base devices ghostscript )
- list(APPEND GHOSTPDL_INCLUDE_DIRS ${GDIR1} )
--find_path(GDIR2 gdevdsp.h PATHS ${GHOSTPDL_ROOT} PATH_SUFFIXES psi base devices )
-+find_path(GDIR2 gdevdsp.h PATHS ${GHOSTPDL_ROOT} PATH_SUFFIXES psi base devices ghostscript )
- list(APPEND GHOSTPDL_INCLUDE_DIRS ${GDIR2} )
--find_path(GDIR3 gserrors.h PATHS ${GHOSTPDL_ROOT} PATH_SUFFIXES psi base devices )
-+find_path(GDIR3 gserrors.h PATHS ${GHOSTPDL_ROOT} PATH_SUFFIXES psi base devices ghostscript )
- list(APPEND GHOSTPDL_INCLUDE_DIRS ${GDIR3} )
- 
-@@ -398,5 +401,4 @@
- # documentation file installation in doc folder
- install(FILES 
--	../doc/LICENSE.txt 
- 	../doc/README.txt 
- 	../doc/ChangeLog.txt
-diff -r -U2 src.orig/gui/CMakeLists.txt src/gui/CMakeLists.txt
---- src.orig/gui/CMakeLists.txt	2022-04-14 02:47:12.000000000 +0700
-+++ src/gui/CMakeLists.txt	2022-12-19 10:21:59.026388957 +0700
-@@ -54,11 +54,14 @@
- 	$<$<PLATFORM_ID:Windows>:qgle.rc>
- )
--# no jpeg as its contianed in Qt
-+# no jpeg as its contained in Qt
-+# but need to add JPEG for Debian!
-+# order matters: first static files (and libgle), then dynamic libraries
- target_link_libraries ( qgle LINK_PUBLIC 
-+	libgle-graphics_s
- 	${ZLIB_LIBRARIES}
-+	${JPEG_LIBRARIES}
- 	${TIFF_LIBRARIES}
- 	${PNG_LIBRARIES}
- 	${PIXMAN_LIBRARIES}
--	libgle-graphics_s
- 	Qt::Core
- 	Qt::Gui
-@@ -70,5 +73,6 @@
- 
- if(UNIX AND NOT APPLE)
-- 	target_link_libraries ( qgle LINK_PUBLIC 
-+ 	target_link_libraries ( qgle LINK_PUBLIC
-+		dl
-  		glut
-  		GLU
-diff -r -U2 src.orig/gui/main.cpp src/gui/main.cpp
---- src.orig/gui/main.cpp	2022-04-14 02:47:12.000000000 +0700
-+++ src/gui/main.cpp	2022-12-19 10:21:59.046388957 +0700
-@@ -277,5 +277,5 @@
- 	#endif
- 	#ifdef Q_OS_LINUX
--	Q_IMPORT_PLUGIN(QWaylandIntegrationPlugin)
-+	// Q_IMPORT_PLUGIN(QWaylandIntegrationPlugin)
- 	#endif
- 	QLocale curLocale("C");
-diff -r -U2 src.orig/gui/qgs.h src/gui/qgs.h
---- src.orig/gui/qgs.h	2022-04-14 02:47:12.000000000 +0700
-+++ src/gui/qgs.h	2022-12-19 10:21:59.068388958 +0700
-@@ -40,7 +40,7 @@
- #include "gsinc/ierrors.h"
- #else
--#include <ierrors.h>
--#include <iapi.h>
--#include <gdevdsp.h>
-+#include <ghostscript/ierrors.h>
-+#include <ghostscript/iapi.h>
-+#include <ghostscript/gdevdsp.h>
- 
- #endif
-diff -r -U2 src.orig/makefmt/makefmt.cpp src/makefmt/makefmt.cpp
---- src.orig/makefmt/makefmt.cpp	2022-04-14 02:47:12.000000000 +0700
-+++ src/makefmt/makefmt.cpp	2022-12-18 14:09:54.399896247 +0700
-@@ -115,6 +115,6 @@
- 
- int main(int argc, char *argv[]) {
--	char filename[80];
--	char fmtname[80];
-+	char filename[200];
-+	char fmtname[200];
- 	init_accents();
- 	/* encoding file given? */
-diff -r -U2 src.orig/TeX/CMakeLists.txt src/TeX/CMakeLists.txt
---- src.orig/TeX/CMakeLists.txt	2022-04-14 02:47:12.000000000 +0700
-+++ src/TeX/CMakeLists.txt	2022-12-20 13:34:00.953502995 +0700
-@@ -52,11 +52,11 @@
- )
- # make the inittex.ini in the install folder
--install(CODE "execute_process(COMMAND ${CMAKE_INSTALL_PREFIX}/bin/gle$<$<CONFIG:Debug>:d> -mkinittex)")
-+# install(CODE "execute_process(COMMAND ${CMAKE_INSTALL_PREFIX}/bin/gle$<$<CONFIG:Debug>:d> -mkinittex)")
- # explicity install inittex.ini for cpack even though its created in this directory
- # from gle -mkinittex command above
--install(FILES 
--	${CMAKE_INSTALL_PREFIX}/inittex.ini
-- 	CONFIGURATIONS Release Debug
-- 	DESTINATION . 
--)
-+# install(FILES 
-+# 	${CMAKE_INSTALL_PREFIX}/inittex.ini
-+#  	CONFIGURATIONS Release Debug
-+#  	DESTINATION . 
-+# )
- 
-Только в src/TeX: CMakeLists.txt~
diff --git a/sci-visualization/gle/files/install.patch b/sci-visualization/gle/files/install.patch
new file mode 100644
index 000000000000..b4a82f5548f6
--- /dev/null
+++ b/sci-visualization/gle/files/install.patch
@@ -0,0 +1,20 @@
+diff -r -U2 src.orig/TeX/CMakeLists.txt src/TeX/CMakeLists.txt
+--- src.orig/TeX/CMakeLists.txt	2022-04-14 02:47:12.000000000 +0700
++++ src/TeX/CMakeLists.txt	2022-12-20 13:34:00.953502995 +0700
+@@ -52,11 +52,11 @@
+ )
+ # make the inittex.ini in the install folder
+-install(CODE "execute_process(COMMAND ${CMAKE_INSTALL_PREFIX}/bin/gle$<$<CONFIG:Debug>:d> -mkinittex)")
++# install(CODE "execute_process(COMMAND ${CMAKE_INSTALL_PREFIX}/bin/gle$<$<CONFIG:Debug>:d> -mkinittex)")
+ # explicity install inittex.ini for cpack even though its created in this directory
+ # from gle -mkinittex command above
+-install(FILES 
+-	${CMAKE_INSTALL_PREFIX}/inittex.ini
+- 	CONFIGURATIONS Release Debug
+- 	DESTINATION . 
+-)
++# install(FILES 
++# 	${CMAKE_INSTALL_PREFIX}/inittex.ini
++#  	CONFIGURATIONS Release Debug
++#  	DESTINATION . 
++# )
diff --git a/sci-visualization/gle/files/lic.patch b/sci-visualization/gle/files/lic.patch
new file mode 100644
index 000000000000..3bfa54a1de65
--- /dev/null
+++ b/sci-visualization/gle/files/lic.patch
@@ -0,0 +1,9 @@
+diff -r -U2 src.orig/CMakeLists.txt src/CMakeLists.txt
+--- src.orig/CMakeLists.txt	2022-04-14 02:47:12.000000000 +0700
++++ src/CMakeLists.txt	2022-12-20 13:03:11.386586253 +0700
+@@ -398,5 +401,4 @@
+ # documentation file installation in doc folder
+ install(FILES 
+-	../doc/LICENSE.txt 
+ 	../doc/README.txt 
+ 	../doc/ChangeLog.txt
diff --git a/sci-visualization/gle/files/link.patch b/sci-visualization/gle/files/link.patch
new file mode 100644
index 000000000000..b565670cbd09
--- /dev/null
+++ b/sci-visualization/gle/files/link.patch
@@ -0,0 +1,20 @@
+diff -r -U2 src.orig/gui/CMakeLists.txt src/gui/CMakeLists.txt
+--- src.orig/gui/CMakeLists.txt	2022-04-14 02:47:12.000000000 +0700
++++ src/gui/CMakeLists.txt	2022-12-19 10:21:59.026388957 +0700
+@@ -54,11 +54,14 @@
+ 	$<$<PLATFORM_ID:Windows>:qgle.rc>
+ )
+-# no jpeg as its contianed in Qt
++# no jpeg as its contained in Qt
++# but need to add JPEG for Linux!
++# order matters: first static files (and libgle), then dynamic libraries
+ target_link_libraries ( qgle LINK_PUBLIC 
++	libgle-graphics_s
+ 	${ZLIB_LIBRARIES}
++	${JPEG_LIBRARIES}
+ 	${TIFF_LIBRARIES}
+ 	${PNG_LIBRARIES}
+ 	${PIXMAN_LIBRARIES}
+-	libgle-graphics_s
+ 	Qt::Core
+ 	Qt::Gui
diff --git a/sci-visualization/gle/files/wayland.patch b/sci-visualization/gle/files/wayland.patch
new file mode 100644
index 000000000000..acdbc43a08bc
--- /dev/null
+++ b/sci-visualization/gle/files/wayland.patch
@@ -0,0 +1,10 @@
+diff -r -U2 src.orig/gui/main.cpp src/gui/main.cpp
+--- src.orig/gui/main.cpp	2022-04-14 02:47:12.000000000 +0700
++++ src/gui/main.cpp	2022-12-19 10:21:59.046388957 +0700
+@@ -277,5 +277,5 @@
+ 	#endif
+ 	#ifdef Q_OS_LINUX
+-	Q_IMPORT_PLUGIN(QWaylandIntegrationPlugin)
++	// Q_IMPORT_PLUGIN(QWaylandIntegrationPlugin)
+ 	#endif
+ 	QLocale curLocale("C");
diff --git a/sci-visualization/gle/gle-4.3.3-r2.ebuild b/sci-visualization/gle/gle-4.3.3-r3.ebuild
index 63f5cc0125d8..5c2be2635c7d 100644
--- a/sci-visualization/gle/gle-4.3.3-r2.ebuild
+++ b/sci-visualization/gle/gle-4.3.3-r3.ebuild
@@ -11,6 +11,7 @@ IUSE="doc emacs"
 LIB_VERSION="d476418f006b001dc7f47dcafb413c0557fa44a7"
 SRC_URI="https://github.com/vlabella/GLE/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
 	https://github.com/vlabella/gle-library/archive/${LIB_VERSION}.tar.gz -> ${PN}-library.tar.gz
+	https://dev.gentoo.org/~grozin/gle-c++17.patch.gz
 	doc? ( https://dev.gentoo.org/~grozin/gle-manual.pdf.gz )
 	emacs? ( https://dev.gentoo.org/~grozin/gle-mode.el.gz )"
 S="${WORKDIR}"/GLE-${PV}/src
@@ -39,7 +40,16 @@ DEPEND="app-text/ghostscript-gpl
 RDEPEND="${DEPEND}
 	virtual/latex-base"
 
-PATCHES=( "${FILESDIR}"/${P}.patch )
+PATCHES=( \
+		"${WORKDIR}"/${PN}-c++17.patch \
+		"${FILESDIR}"/cairo-pixman.patch \
+		"${FILESDIR}"/ghostscript.patch \
+		"${FILESDIR}"/link.patch \
+		"${FILESDIR}"/array.patch \
+		"${FILESDIR}"/wayland.patch \
+		"${FILESDIR}"/install.patch \
+		"${FILESDIR}"/lic.patch \
+	)
 SITEFILE="64${PN}-gentoo.el"
 
 src_configure() {
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index bcd7e3244348..829eb5bf8d53 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/nawk/Manifest b/sys-apps/nawk/Manifest
index 09fc427dec9c..5135314ee0ca 100644
--- a/sys-apps/nawk/Manifest
+++ b/sys-apps/nawk/Manifest
@@ -2,5 +2,5 @@ AUX nawk-20180827-parallel-build.patch 913 BLAKE2B bc0df39ad9d8b0b723c0f66520ddb
 DIST nawk-20180827.tar.gz 1824076 BLAKE2B 4cfd000842d75d9a713fe73a85eefab33c17f9ecaca4f7f663d1157da411fd9fcf2badbf5180b4a90910445332095fe457e7acf0643621ac8a68da1a246b5e5f SHA512 cd6561149be71e6311aaa69c86b90ee4b29a057e5c2595470ccc8a41c40c653ec31b4bd46d7f58896d012f5fb5952103a76aa463a69e5128cba43d80eedf0b9b
 DIST nawk-20220122.tar.gz 1832761 BLAKE2B f704ff9cf5012545ec3adc1887c0d43625d7e38e19589cba91fe31f664e72ccce20dee3f2484067a31af793be16439c1389603fbdb33c119efeafb18559a0d97 SHA512 46ab7936705288c9cd22867ad9f5b080ade67c4b05d674304e0e5cae8ea329420a9a46e3578bf3a014b7066a1185b7506b0f74445bb52aafb1090e7a82a5bf28
 EBUILD nawk-20180827-r1.ebuild 1163 BLAKE2B 919a28f7184accbceca3f3567a514d930372a34605d7b8c519621cc729c83415620ff3a80c8173208ce2795f33e3611afbbaf77faf5697b5922af7b2cf298aa6 SHA512 87aec5f39173f7950cdbfd7e723d26f28995919bbdc2334ffa62c43e9c6908632d817c0caff42620dfd32308efd3594c1d0afff935f80238ca78bcc1ee65d36d
-EBUILD nawk-20220122-r1.ebuild 1217 BLAKE2B dbee05ad9ba3b5a1cd9914627ac938f720b9d0b06a85b0b6b923367a194efc83abe65a73ada50fde89a8aa3d539f44affcc87ab92abc1561906d844bfe54924a SHA512 ea82ce1ae30914cea0e13203497058682dc45f98dc236033c82aa938c8804c6cd44f9c9b59ff7ec1d5436226161615aafb80d0321ad777a5eed061263abbb37d
+EBUILD nawk-20220122-r1.ebuild 1224 BLAKE2B f9d2558da1798597d8e574fdfee0c30eb5b54c633357aab4627ce3075d6e5cbcdb4b8d2a4c7bacffd4c49c7c57cc041beb108f2d2a5b5998a83421c5ca6c3f02 SHA512 82aa030a7abed5d2378a8a7babece998403ffd0e7ac5a76eb77e510042a7ba64849c780024bc6679c9d942f33951d6a5a4846bc963ecda11ab97568d212c11fb
 MISC metadata.xml 417 BLAKE2B 85317627ae503b37bb2355d4142e2af954870cce4b495daa56d7c6df2bb1d249b4ae824daa23ac8e6013926501827cb39891b184354a4757073e055e43d3601a SHA512 004179548b6f06aa73b658add57f0f2c9755b67ebd3d7e0956c5856090a662d58c8bca35a1de7cebcd3eceeb84e0f0efb0402db9fd743d5152bcf3c74b185b9c
diff --git a/sys-apps/nawk/nawk-20220122-r1.ebuild b/sys-apps/nawk/nawk-20220122-r1.ebuild
index 0bdc635e58a0..2670cc9e7963 100644
--- a/sys-apps/nawk/nawk-20220122-r1.ebuild
+++ b/sys-apps/nawk/nawk-20220122-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/onetrueawk/awk/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux"
 
 DEPEND="
 	app-alternatives/yacc
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index a86f83e44725..47a3c9383f59 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/glusterfs/Manifest b/sys-cluster/glusterfs/Manifest
index 3104a92606a0..0b05f85fc346 100644
--- a/sys-cluster/glusterfs/Manifest
+++ b/sys-cluster/glusterfs/Manifest
@@ -14,7 +14,7 @@ DIST glusterfs-9.4.tar.gz 8173625 BLAKE2B c35c63696717bf09f8fbf77dca16a6f45de278
 DIST glusterfs-9.5.tar.gz 8174643 BLAKE2B d7527b7749b753768bde086e88e146564b461f835bb9108ce24da9626d7d87e7e4da1b2a340c6497da2d8bafe0cd43e87c01d4ba6639635ff96d8788997a8042 SHA512 3483068ba6d72a9c63cc6fcb2dbcb38dd5001564d755cc3a30dbf6402eeab9a7c80759a535be1c5c06eae88b61156a336444c89b12bbecdabf56a87f00328a44
 EBUILD glusterfs-10.1-r1.ebuild 5706 BLAKE2B 3f166a7a1a12ed82056c59001ec9b6372b390a822fc7b15d06926ec3685fbbe60140743b15cbaa1421667d0f819b4c5212f9a3962c30cc447c13fc6d46d09cda SHA512 204f702407e8adf8588e8703aced3e69f88e4ccead63c7aabb9f3c8fcb1a1b8059b22881e3b056cf988ca76889f899282bc187768733d5fa31a3413ead098b50
 EBUILD glusterfs-10.2-r1.ebuild 5721 BLAKE2B 5de306fc24d7db893d2cd1a29553b8a89f30110d61cb7c4fd84a2e2d670b41bfdaaa328c9ae799882879dae83964f0f91532ffb4947d4662b9e186bc493a5ad4 SHA512 acecd149d41772cd7c0efbda73a76a932cc06045246489e3ff1ddce12f122c6828425584e4d39cd6018cd750270e1c942665bebd86533b2b2587269e91973703
-EBUILD glusterfs-10.2-r2.ebuild 5803 BLAKE2B 54d3abd018763a1c38063251961c02301ce38b13658d43ab45c7013f55de2a6c0f160b9a8a77e22a6afe33f21d901265a0b34490cc89a5846f44bcd5ec1ec69c SHA512 0a6a38a4f283ade2b3ab02580cfd1ab48ce81e0358f70554b6c6e868a507c19e6b5d314bc998d1d12f6329dd6f8ce9cd76a0d49d301004cbe40ed6ffb4f1187e
+EBUILD glusterfs-10.2-r2.ebuild 5803 BLAKE2B fa0c012d67bfbd816f424bf98a2e3f35c53c181e1bc914c223195a16fdebeb40eca63d45e4041bfd38e1b89308b9962cf32c9a4a364749123bb2cf9bc6024d33 SHA512 2f7640526c1b392c9f0acfcbae350d96f0fead164aec7f62111d85a7ff61b2edcd5b89669bece0b03f8041b656fad9174a168baa55286a4681c7f898f2e89828
 EBUILD glusterfs-8.6-r1.ebuild 5600 BLAKE2B 7ee761adb42179a529aa16e224bf743c551247c9aa8a1099199832a1cdb2e37e03ff8bf3e757525f2811f175c05839e080b05a7ead0a929da7d1d5d5321b4d31 SHA512 575cdb2017ce6513dd74e49dfdf3e2279eea736096532621f8210e5f26ea852476fdcbe41882a9f355d2dd4758f0ac60ee4eaf3dd85a1f5746066b6287de8f3c
 EBUILD glusterfs-9.4-r1.ebuild 5622 BLAKE2B 4eb06cd8902cf8a8ab5e03bc60e9003564828710f8123c0d964e3f19b5f1b1359a65f2fc5f59e0904476cd7f0302c57fb9e00bce49ecc449156adfc4059e5373 SHA512 ef824e040fa06cf40d203a6626b5e678fbfe90d5a9a9ae0d5ca48a8649b402d20d4b1b0bc682849eed458e1d372fdbb3f13431b46a5e4a6933caa2df2322683d
 EBUILD glusterfs-9.5-r1.ebuild 5625 BLAKE2B 2b2dc28a03e750f83d2ca2e3b9b69a7e2aa0e27e62d1ef5c944c2c7c405b6e2fd5ab5f0e2e32cc5907b7d3092efbad5f72683d045bae3ebc6dcc842da0b8d945 SHA512 7ee163011c3cb5fe9b8f8b1b7e5b25b8e5b9b42230fa8a50c3743190f8363212a862bcb58ef21a862866bae93f17a340b73393f4f1049fab8ba31f04613aec96
diff --git a/sys-cluster/glusterfs/glusterfs-10.2-r2.ebuild b/sys-cluster/glusterfs/glusterfs-10.2-r2.ebuild
index 1628e124f840..e124c2d7fc19 100644
--- a/sys-cluster/glusterfs/glusterfs-10.2-r2.ebuild
+++ b/sys-cluster/glusterfs/glusterfs-10.2-r2.ebuild
@@ -47,8 +47,6 @@ RDEPEND="
 "
 DEPEND="
 	${RDEPEND}
-	sys-devel/bison
-	sys-devel/flex
 	virtual/acl
 	test? ( >=dev-util/cmocka-1.0.1
 		app-benchmarks/dbench
@@ -60,6 +58,8 @@ DEPEND="
 		sys-apps/attr )
 "
 BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
 	virtual/pkgconfig
 "
 
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index fc26c62e0857..8a0b0e63e0db 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 23226c025b8f..7a904dc9e57a 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -11,6 +11,7 @@ DIST gcc-10.5.0-patches-1.tar.xz 17180 BLAKE2B d8ecc7cc15fa1ab420fa9eff11173a1d5
 DIST gcc-10.5.0-patches-3.tar.xz 17292 BLAKE2B 403b3955756c060fa00cdc55c29cdad58cf0ce449af7a75aabf4ddecc9043cffe5f1d6fe77bec00a59de2040e207fabb390f9c603748926821d189be53f4000d SHA512 f5a192f42222d02ab765e8b284dfbd999e69db8a7d6a2e5f1f378a16ba3f0b26f35bbad3b3a9e6e9e30c6734b76d8b69d80b802593cbe4d671f14cc16db30c8e
 DIST gcc-11-20221209.tar.xz 76240768 BLAKE2B 3be0f1ece4473bbbf10f7242102f330a6e246c8481da5bd32620dcb15d2acd008bad60d2576a301f03e444e3d93a3c72d5184740c6fb3de2bc05e1863b68a0bc SHA512 33d9581d434c012526eb4d49a4453cf77c57b459fd43f84e49bc764745e0772939eac007e119269f4f1989755df8678613732a84474c691b0c2452237c5b38a3
 DIST gcc-11-20221216.tar.xz 76229680 BLAKE2B 413c4c0ac26161fe0cf65920c073622f4ba1697c4808c602c15e15245c8384e0f041d5870c3072fafe019bb521793565b0a7ff0d5b3cb6f75e7aefd0f4e5a733 SHA512 91d692e37d12edc9f626b09472b3eaf34a3462da4f841bf83d81ec79c668d76c2ba3f2f0db7ab2b109f0cf2bf1aea9e4b0fc707452b4d816fdf3d68966882058
+DIST gcc-11-20221223.tar.xz 76237128 BLAKE2B 4d50d3a296bae501dd4287ca7c877304a60b1a6d444b96598ff2e018f4cf540896c675c11a99cc127acfbe7e3af38d603f6b80b7049d9e525420eaee7c0f81e4 SHA512 efbb26ce3b8a5ffcc36ad84f797b638c1d8d0a1fe61e3d9bd984c0dbce0a887d1384f8644d71f4b25b22ae2c67fedcbc4282780a2b834a47a318ed558fd9e0ed
 DIST gcc-11.3.0-musl-patches-1.tar.xz 3856 BLAKE2B f511f8b4c0696771d906beee9645b5d009ea4b673602baa1ca562d6f23c5b0caf2012aae93578671624617c4286e3937d79a7383d6a03bb438c5b774a06fe8e6 SHA512 cd375ff2affb213475acaabf02989b1f05d719d972970ea0304d20a816986807390893d1401826f3b497787642f35d90a244195f8e466db41e8d768366057334
 DIST gcc-11.3.0-patches-7.tar.xz 15184 BLAKE2B 426f00feaa982a35d2c459e7a2c2e9d29b4b467ac3625ebd72bb31077c75bbf0c028137df03921c52ddc97a14d92c49777bd3f27b47a7b47d8a05e2d106b6bdb SHA512 bec8bf26b3e50633a5a2e0bb75ffeaba86becb704c14365ff3342e8d651ab75bb3ceec7808d88a25989b8c7182398184b95b6d1267aaef9aa828f687e4895e9d
 DIST gcc-11.3.0.tar.xz 81141364 BLAKE2B 7e562d25446ca4ab9fe8cdb714866f66aba3744d78bf84f31bfb097c1a981e4c7f990cb1e6bcfec5ae6671836a4984e2b70eb8fed81dcef5e244f88da8623469 SHA512 f0be5ad705c73b84477128a69c047f57dd47002f375eb60e1e842e08cf2009a509e92152bca345823926d550b7395ae6d4de7db51d1ee371c2dc37313881fca7
@@ -42,6 +43,7 @@ EBUILD gcc-10.5.9999.ebuild 1108 BLAKE2B 2db612df53fbaec59c707acb56bac804a4ee797
 EBUILD gcc-11.3.0.ebuild 659 BLAKE2B 310352b879c732515ce63983db79b32bf7c8c200a650627a14b5284fceea9a7e7f3e545044a8c00ccc44cd760b18123542bd233242cb3ebc48ef422439c8e430 SHA512 44c89a7782e5e37c5ef61c50d5aa6d07c09f19bada293ed657d7062837a5a9be9483fda0b1845ee794f42031ea098a1b88d439f7be202f4276f77748ff45815e
 EBUILD gcc-11.3.1_p20221209.ebuild 1286 BLAKE2B 5bb5bb1dfa617deb42fd1194fd51172e7865f6890bf430d2269ce0a5c27854b494e2ef2a997371dafd6328b2c59656718201ad0dae946911d18ddfae01ad9904 SHA512 d8242777dd4aec49d56319b7da0423a3d39a906cc78650e733db27a3021603fe7043cfd5f2e5497847ca64f7439ebaca20b01a2fb7264d790748d300d87377ab
 EBUILD gcc-11.3.1_p20221216.ebuild 1297 BLAKE2B 2f9401f30ef88c7e8fcba08c8f4d4f1bd405c4d0a24185a158cbfd1e42e7a1d6323293c76553a5f136e1d06b5bf5f30c2222263a64396c1d187c3cc866ae7fa5 SHA512 9a8f8d1e2ed6732541eb97565e8f47b7fefc9de462a71b9e04d190f25e654f2eb6f378bf21b0839bad7be07b41398b9938e8e76123ccd37650780b52293a3b6e
+EBUILD gcc-11.3.1_p20221223.ebuild 1294 BLAKE2B c6aa11e60a7cd0d5906fb0ef055b53583472fb17a5715f8f3450ce13cad83ae9f04cb42f10b41b8905532e0538b78e36d6fca8d56bf1550ee2f20b03cef0f4d1 SHA512 62e61d7502d140012879dadee28dc8140215b43a5bb24b4e59fce1cf697b5bf4d1433b887f8958d77c92abd3c7f06a2d4a90ae93bfc9baf1640b0d048132b872
 EBUILD gcc-11.4.9999.ebuild 1267 BLAKE2B 09a26812068945e11164d0a4f8f5cc10dc261a20a647fd4102decc83eecbbe8fcc7f38093609314fa1f26c46164e8248aede741880f7cff64dd5a94836765fa2 SHA512 4ecf698cd6e96dc08683a0e9b69936cdd9085c300d330fb9830cee0e38783e0a1fc8409db39159f9b247f28fc5d7d7572ad3e975f3951f1cb8537f49886bdcde
 EBUILD gcc-12.2.0.ebuild 1434 BLAKE2B a02496eb0178f8f3e38487b233eea12467e9e799763eb447cd545ea5afd48460bc8fc64bd68c84fca38f2d4cdb7487a65b34f4ceedf335393964ec770c0a69de SHA512 62d1a2dfac584c8abe548ff03c960a9e545e34ee1bd61977413af1b31ce98e281b5b90a33be2c666f418a272658f5188e9355bacc51dd0cc7ff456bcc47f2edd
 EBUILD gcc-12.2.1_p20221203.ebuild 1434 BLAKE2B 0b885a6c62f68d25e33e18356293777d7819829fcdbe1c844284f2642adb7f624455082095bc8b9eaa58b3fd6f48678c89b43707214911400ebe2365865526c9 SHA512 459827805d1c23212becc64eb8fcd482ecf31cabd7366d6eb06a45f3e51887a19a5e61df6bb9525c7ac896d8297ebed8da5ec98ddfc06a768a4b6eb1830a8ed6
diff --git a/sys-devel/gcc/gcc-11.3.1_p20221223.ebuild b/sys-devel/gcc/gcc-11.3.1_p20221223.ebuild
new file mode 100644
index 000000000000..f353c58a4ec6
--- /dev/null
+++ b/sys-devel/gcc/gcc-11.3.1_p20221223.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+TOOLCHAIN_PATCH_SUFFIX="xz"
+TOOLCHAIN_PATCH_DEV="sam"
+PATCH_VER="5"
+PATCH_GCC_VER="11.4.0"
+MUSL_VER="0"
+MUSL_GCC_VER="11.4.0"
+
+if [[ $(ver_cut 3) == 9999 ]] ; then
+	MY_PV_2=$(ver_cut 2)
+	if [[ ${MY_PV_2} == 0 ]] ; then
+		MY_PV_2=0
+	else
+		MY_PV_2=$(($(ver_cut 2) - 1))
+	fi
+
+	# e.g. 12.2.9999 -> 12.1.1
+	TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.$(($(ver_cut 3) - 9998))
+fi
+
+inherit toolchain
+# Needs to be after inherit (for now?), bug #830908
+EGIT_BRANCH=releases/gcc-$(ver_cut 1)
+
+# Don't keyword live ebuilds
+if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+# 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(-)?]"
+
+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
+}
author	V3n3RiX <venerix@koprulu.sector>	2022-12-24 08:01:36 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2022-12-24 08:01:36 +0000
commit	1cf3f23200484257eaf7d863e323e7e9aee98d2b (patch)
tree	90c6263d1ca4d504601d8df05db598f5737b07ce
parent	4583148f2657a7a66fd68b25c9fab02be110c989 (diff)