gentoo auto-resync : 21:02:2023 - 08:23:43

86 files changed, 1641 insertions, 142 deletions

diff --git a/Manifest b/Manifest
index ec3779960418..4e615830e970 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29421 BLAKE2B fb7599514c77ab96ea450ea8b8ecc1d6a86a32ec136a007e8172cb22df85988be39b52e43f26a9e69d8a04b5d98dcd958fa8d72fa96b3457ba5eebb5dc956eab SHA512 347d9c8c69cea0731a710d16af0225971a0493ebc5b503079fb0762374ba74160eed2a3838a017e0ebdf2b1abeb1293cfa57bf4fd631a8b70821b9fb3e9b30b3
-TIMESTAMP 2023-02-21T01:39:44Z
+MANIFEST Manifest.files.gz 29446 BLAKE2B 038da683f57ef685f2334d77816bd5a72214fd59f0e9a393b3b9875e85ac55f225136963e215115cd70d70d740fba217b19a4c378bb01069c9f54f77116e8b78 SHA512 747833ab6b81088dffa5f1f09dfacd866509d2ab29e5cd5c6cef70370a8bc8ffd5314538cad589ba334879800e9c5bd24b199fe855d6faeda01388733b89871f
+TIMESTAMP 2023-02-21T07:39:42Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmP0IOBfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmP0dT5fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAOXg/+O4CMXYNkyjadbZ7AplFT/ud7bnJib1pqO9EFSSvJGtpSlWbwOWbu60N3
-TVT0AVTi1KgeOA2nz6ciRGMH0lNEgKDfcGgc5US+ht7+luq4Zx0SGTw0FAUFoIFf
-zthnbgWIKXjqGDoMH2zw8BD3UfETXg8ZsTAopa1WFkCzCoG5w2kGlrqgC7JVM/Yb
-a8Hba3mTLqKPgAHxfOn8PhXe7B2q620+idUot8NKswOhCbhyNnw5oQ7IM3ILaGJM
-3/5HNRJ0bckE7KbOE+p7pNjGSRZ/7KWf7H/4WV+P4pQH2ZvR6f7yPHpE8BuQLb9L
-yxILKsWvEy/b5dEAyuO6kQxsiq+q+JAS59elXbY1ydENmQYTALZwYr9hVJZtk/ly
-H5konTzHNV/iBpte67lV/S/uHVmyackAQVzOTL8OSgZfA5RFbraYC7gcvinzstuW
-wyVpETQMe+dwUFOws9BrWUjRSdmpq6pN+K8zQgZhZ8tKqvDn8Ruxfuxw1f6ZeMtw
-vfFv96NRMawpl9jwR/yUsj3vvHpqBWYfhVIgLSDKmyqkULQH2hzSrvx7xMk3jQQB
-T3ckv2AuIZVzTwrsYUnnfL+6rVczu9dvdwjqFHWrUIoDTACWDEOqGsRmhHo3fsEe
-wpVq2EwejuLx32LO/iI0EedR4Dsebh4rA5H24vb6jaHBhL5h3RQ=
-=ist0
+klDTpg/+MSFR+PL6uH96hy8LUHhdTDOFa7rtuLaVBF3iao9/lCV1XbNvywJVudYr
+QZmGSLxNhuLH5L1hzwDYzAssFVLuce4wdCH9QwUqXGji6a3A4si8a/dduMZydfBi
+wnp5wNf/uquJgVcmV/5IFdCS8JN4otH5nghd/yB8M5NQHcWhyqzuoJ9WJB0Etwdo
+JjyapsrYXypnnEzklmbaJlnkpaQrs0hOCP2Ol8vOiw/0ZaTXTo802l3gwZJBtmNJ
+anDAWO1p/4mcxXwD0+E33DFYAWkJanc1r8szHOf984mLJoDDXFZInAuccJAfYd7S
+C3BRizJ10gkJXT/HujgbUWWWwvAAdZfUJWU0tBLop38hcfqVsl3WAKAGRlaqntsw
+2KPxrG3MH03iPxqC7dQyKEqpNZJR7aYZTm4DtvQAaoA41p5KxqnRD3enZIxnloja
+OTf1zB7EHzE7aAqn18c63lIi6WrK07wwzbk9cvIpCRo+guTTV2uwwgRz8HjGBGGb
+VvRIBlrjCyTAWse9YU4831fM1iC6s/XMAy3Yw/wlwqVGDA+QcLYCh+Sfxr//88bT
+lWj588/Gpu8KWyvZq66uBKgEIip/TfP+3L+g09QtBxzvE843XoX79I4wH7X2PeSG
+u1Kjevx1k0b8wxoooN7p4ChvO1aft8Bs5llDYxYnUaQzZeHUJrk=
+=hhg1
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index a8dae111c910..0655cce79057 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index 602069573c5a..d926e340135d 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/groovy-emacs-modes/Manifest b/app-emacs/groovy-emacs-modes/Manifest
new file mode 100644
index 000000000000..8354a57ece16
--- /dev/null
+++ b/app-emacs/groovy-emacs-modes/Manifest
@@ -0,0 +1,4 @@
+AUX 50groovy-emacs-modes-gentoo.el 82 BLAKE2B 270fd798ffe0890ffa6d132df7ae7bb732f6573b31aa7e13e73cc55455934350078d5f843c50df5d6b9a159fa757da9bcdebc283e1506b76aba8cbde6ef91e23 SHA512 89424e3a520b538bd9aa3d287980185b60111e4c5f1c8d60885173bd989e8d97880de8f6ddbb40529a73e486036786cec3b11b24e35d7b7a62f675532c04ecca
+DIST groovy-emacs-modes-2.1.tar.gz 116174 BLAKE2B be913268b9ae4c1ca74f3391d9dad11b4804a651098a160d8c4e0ac449ea2d0a381e73c3b7412311f73df8569b5e2933b0c3e169bb57483b9bc87089c9623369 SHA512 c7367248640a4891db144afb16bc8a00545eb0155a87404c653ceed5706f684b34d135c2327659032769fa437c7e5dfd5942b287dc16b9636a9c7645762c670a
+EBUILD groovy-emacs-modes-2.1.ebuild 846 BLAKE2B 61e4fde40d70b2fd71a01b0880c63249c79dbbc47cab3395c5197735134b564419ba6121188a156aaf8f281600012f7cbc073af81e1cac5aa9b5ae06c490b0a7 SHA512 c4e2306f82ed7fa1e3b19c004466c086fdfb815f947c62331e25a12a43382b85944af8cd148d331b2f3b12cb0a72ae475d610fc6746c584a008c93d697ebbd59
+MISC metadata.xml 697 BLAKE2B 83261a9c66b6383c32404929be77643d6b6be611c707039bf0953ede688a7864c7e7ca14fcb0fa68df554abefbb03c08b0d6f228a72eaa72586ead55361a4776 SHA512 322c7258406737175b23871a84ba4aa4231e8c5bc8ab060c3a09bd0c5b232b540b45aa71489ab954612343021c28c64a4f958a04bbc5516e499eb658ddebd758
diff --git a/app-emacs/groovy-emacs-modes/files/50groovy-emacs-modes-gentoo.el b/app-emacs/groovy-emacs-modes/files/50groovy-emacs-modes-gentoo.el
new file mode 100644
index 000000000000..653c0ed582ca
--- /dev/null
+++ b/app-emacs/groovy-emacs-modes/files/50groovy-emacs-modes-gentoo.el
@@ -0,0 +1,2 @@
+(add-to-list 'load-path "@SITELISP@")
+(load "groovy-emacs-modes-autoloads" nil t)
diff --git a/app-emacs/groovy-emacs-modes/groovy-emacs-modes-2.1.ebuild b/app-emacs/groovy-emacs-modes/groovy-emacs-modes-2.1.ebuild
new file mode 100644
index 000000000000..7b4a823f9cb5
--- /dev/null
+++ b/app-emacs/groovy-emacs-modes/groovy-emacs-modes-2.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=24.3
+
+inherit elisp
+
+DESCRIPTION="Groovy major mode, grails minor mode, and a groovy inferior mode"
+HOMEPAGE="https://github.com/Groovy-Emacs-Modes/groovy-emacs-modes/"
+SRC_URI="https://github.com/Groovy-Emacs-Modes/${PN}/archive/${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DOCS=( README.md groovy-mode.png )
+SITEFILE="50${PN}-gentoo.el"
+
+RDEPEND="
+	app-emacs/s
+	app-emacs/dash
+"
+BDEPEND="
+	${RDEPEND}
+	test? (
+		app-emacs/ert-runner
+		app-emacs/f
+		app-emacs/shut-up
+		app-emacs/undercover
+	)
+"
+
+src_compile() {
+	elisp_src_compile
+	elisp-make-autoload-file
+}
+
+src_test() {
+	ert-runner -L . -L test --reporter ert+duration --script test || die
+}
diff --git a/app-emacs/groovy-emacs-modes/metadata.xml b/app-emacs/groovy-emacs-modes/metadata.xml
new file mode 100644
index 000000000000..6d47d76cce35
--- /dev/null
+++ b/app-emacs/groovy-emacs-modes/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="project">
+    <email>gnu-emacs@gentoo.org</email>
+    <name>Gentoo GNU Emacs project</name>
+  </maintainer>
+  <longdescription>
+    GNU Emacs modes for Groovy and Grails. The major features are syntax
+    highlighting with groovy-mode, REPL integration with run-groovy and Grails
+    project navigation with grails-mode.
+  </longdescription>
+  <upstream>
+    <bugs-to>https://github.com/Groovy-Emacs-Modes/groovy-emacs-modes/issues/</bugs-to>
+    <remote-id type="github">Groovy-Emacs-Modes/groovy-emacs-modes</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 2724b4e074c6..1ed99c597a0a 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index 404d2761ad2b..1dd0f8b5e133 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -5,11 +5,12 @@ AUX qemu-6.0.0-make.patch 306 BLAKE2B 701c6d929dc7544a2e155243a2545dc488765cf8b7
 AUX qemu-7.1.0-also-build-virtfs-proxy-helper.patch 1167 BLAKE2B dee6c98a547a510827f422a5d2b03edd6d467e4713f357a5841e01d632578891a0e2e715c57153c7842b51f5199cea70d8e76ff31f0372308e26202e1587af62 SHA512 d2fb9db139588961434663910dc7151c91b82c1820f62ed5ae690e4f868f1957d8ad2dc1b812813a2081ce6bbdd0f8e59cddd9459de6ef493df02b5a4478de63
 AUX qemu-7.1.0-capstone-include-path.patch 1076 BLAKE2B cb595acb50ff2a64d0b879d5d8439d89b0d6295434ae09d1c45c01d3b18f547dcac201e79140eb9dc376d2d8c1d1b72a5adfe7ac477da61c86da148ed486ff2b SHA512 857504916325984150f8e0869aa44b158ed829b53d2bcb7f7012390d2d404ae1553af50184be6e2d8f91ffedfc5c061b7f64b9f28feb38bf18379dee56704732
 AUX qemu-7.2.0-disable-gmp.patch 1554 BLAKE2B ac21e5985676123e8b61de8d590d8489de1d7401e5005899e5a95d7e86b77741572087a294d4b63533c26fe53f81c76e23ee482fd3a371f2e3700859644b6c8a SHA512 d4a600cfe42f1c49d45cffae64ba1e1225ae8e75a92454cbb534be5f95e1b8dbdbf441d092764cc9f9e97ed6bf6367175d7b56cdf97694dec57da2c8fabd1969
+AUX qemu-7.2.0-linux-headers-6.2-glibc-2.36.patch 2320 BLAKE2B 64022da1b085dd945ac03fdf7af98648aa16879a5f08999175e30bd2547b39ea0d5357b057e11a9b533d6d64e136ceb7bec24ffad98af541a5ab85217f9ad1d0 SHA512 f7ad30bf240faf7f5346ffa05fadc37345d7d35dc8c738e450be0531ada81f276cb87a12e630ee47fd75f130e46f897544f623987c645e7123ebf48b13e7636e
 AUX qemu-binfmt.initd.head 1442 BLAKE2B 23aa5338914aa7c47f9b1cc1d28291abd0ea037a33cca81f990decfafac2907c86c042350c9dd45591d16330846d4e11d2c8a2a409a68ad81656d9c2c51964c0 SHA512 3fec8946a37bfbd2089f5d95089ed5987a198fc0139ee7482d4bb38c2ffa0e165667a7853afcf2b458bc3e2a6540f172c929ca5a334a00db47e2d0f881382c0e
 AUX qemu-binfmt.initd.tail 245 BLAKE2B dd59f2944c6e3f0c4d282b94b687a9b5c51dd77c5103fb9889bd9ce56874495397676ae6c8375d9e9e23094828477240778d9e0f361e68cdd63fdad574851561 SHA512 bcca16805f8380d52cc591ea3d65a8f6e5de456730618f6aee301510edb75d235a22d4d7aeed224882210392840adb403eb53234b6cb76a4cb24533852a8b737
 DIST qemu-7.2.0-docs.tar.xz 1984184 BLAKE2B 103900fb7903ed8d75f7f012bf61fa2d6fce345b657c851d0437c3384f5735bd1cfd3129320683ea7846ea0b0940e5af5b2663c9320f12fee74b058523a8ea06 SHA512 a7edd448982865e07533c300d3e44a8b50cefbdde1982b73c24d0b2aa74315439252c59b634c75de312860874c7b06c75aa72629da681b5105f28ee936794585
 DIST qemu-7.2.0.tar.xz 122408576 BLAKE2B 415ff621356c59f88b29cfe3ef5db1e282b26bbafbee3d535477c6125ccb060ec9762d9e3ab9f70ce5478804dca0a46a59bcf12c112a2462029a93e578e61530 SHA512 f3cfa00da739ba819a218d7e6e95c77fb79a8e0f487b024ddd281602e785249b81144595e3f8c746c32a4f5c4d1a88c6aebae3c162603edfbb50ae3722d7ed13
-EBUILD qemu-7.2.0-r2.ebuild 27449 BLAKE2B d4e4281fd6524488fa4688057fc0e24b5681a94e83ddb2fc2a4960d37a1b22ab497cd9c9684b2e13ff741824359ae76eff7416ed1d4617b012ea0e1db9c55532 SHA512 5a7a8091b006b34744384ca578f23cca4978ce24961e725f96e9a76ffe4ab6b40f2435c458df69d57e6b416908426e7e88b740a17fe3c65bc6e877603cda470d
+EBUILD qemu-7.2.0-r2.ebuild 27511 BLAKE2B 42b6f37ac0884baec367ee08783d8605bab17c9d396a29d71a2f4d29171f27f41ade4c22918d9818460d1554ea354b844a0cbd3f967898ce0f8f5fc0d61339e3 SHA512 d92da3cbe562f29b1cdeaab456dd68eec0a57e54230deecce53537ff54ecab7a4abb839ae491eb3958f7635dcdc4327ba9ff4d879d7e2db3fecb62f44b693131
 EBUILD qemu-7.2.0.ebuild 27190 BLAKE2B e8043e113cef4b06501c0141126925ee21906c187868202b8c4b885120dc6552305558b55ba88f4cdc5c004771d8e888d86a6f8140f17200279e3b2ee85da9f8 SHA512 c413dfa2382e993022d079128afd5e49ce41eebd276323836058ce5fe2d620baad35868bf213cae3c0d212eb9bf7ba53c0eb58380435cb5808d96a11a8980822
 EBUILD qemu-9999.ebuild 27365 BLAKE2B d8fda510a06bd1164b36c215978254710b0c924a0667dd0ab2c89d907d51df8b366b7b8f69b55bf4a20621dd3df5de36cc6166c5e12c194c08b341ef658568a7 SHA512 a3a4333404505538f96ffac67741fe04f6a047cdd0f9a5a19e2e784f752dfd2b07950b28ee0ea5d715deed4d118a3b29cb3c17502a434d214575e152c7fb6ea1
 MISC metadata.xml 4249 BLAKE2B 56e23de79e691a3634c21f2c7d3d2d02461cc5d2569c4ff15856f8ea99f8d53837cfa7c4dede988c304fdbe3c831f9cd776b9d62191e87f593d9643594abc133 SHA512 c4fd2aea291de484c24e3ef8d1b88a95fe3ac0b73d44bbae99f0de076b2335222f32e1b49a3fe7bd7168dc5cc290274a13bd7c615aeb54d06a04c8819e1f1b96
diff --git a/app-emulation/qemu/files/qemu-7.2.0-linux-headers-6.2-glibc-2.36.patch b/app-emulation/qemu/files/qemu-7.2.0-linux-headers-6.2-glibc-2.36.patch
new file mode 100644
index 000000000000..856997886cc9
--- /dev/null
+++ b/app-emulation/qemu/files/qemu-7.2.0-linux-headers-6.2-glibc-2.36.patch
@@ -0,0 +1,66 @@
+https://bugs.gentoo.org/895662
+https://gitlab.com/qemu-project/qemu/-/commit/9f0246539ae84a5e21efd1cc4516fc343f08115a
+
+From 9f0246539ae84a5e21efd1cc4516fc343f08115a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
+Date: Tue, 10 Jan 2023 12:49:00 -0500
+Subject: [PATCH] Revert "linux-user: add more compat ioctl definitions"
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This reverts commit c5495f4ecb0cdaaf2e9dddeb48f1689cdb520ca0.
+
+glibc has fixed (in 2.36.9000-40-g774058d729) the problem
+that caused a clash when both sys/mount.h annd linux/mount.h
+are included, and backported this to the 2.36 stable release
+too:
+
+  https://sourceware.org/glibc/wiki/Release/2.36#Usage_of_.3Clinux.2Fmount.h.3E_and_.3Csys.2Fmount.h.3E
+
+It is saner for QEMU to remove the workaround it applied for
+glibc 2.36 and expect distros to ship the 2.36 maint release
+with the fix. This avoids needing to add a further workaround
+to QEMU to deal with the fact that linux/brtfs.h now also pulls
+in linux/mount.h via linux/fs.h since Linux 6.1
+
+Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
+Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
+Message-Id: <20230110174901.2580297-2-berrange@redhat.com>
+Signed-off-by: Laurent Vivier <laurent@vivier.eu>
+--- a/linux-user/syscall.c
++++ b/linux-user/syscall.c
+@@ -111,31 +111,6 @@
+ #define FS_IOC32_SETFLAGS              _IOW('f', 2, int)
+ #define FS_IOC32_GETVERSION            _IOR('v', 1, int)
+ #define FS_IOC32_SETVERSION            _IOW('v', 2, int)
+-
+-#define BLKGETSIZE64 _IOR(0x12,114,size_t)
+-#define BLKDISCARD _IO(0x12,119)
+-#define BLKIOMIN _IO(0x12,120)
+-#define BLKIOOPT _IO(0x12,121)
+-#define BLKALIGNOFF _IO(0x12,122)
+-#define BLKPBSZGET _IO(0x12,123)
+-#define BLKDISCARDZEROES _IO(0x12,124)
+-#define BLKSECDISCARD _IO(0x12,125)
+-#define BLKROTATIONAL _IO(0x12,126)
+-#define BLKZEROOUT _IO(0x12,127)
+-
+-#define FIBMAP     _IO(0x00,1)
+-#define FIGETBSZ   _IO(0x00,2)
+-
+-struct file_clone_range {
+-        __s64 src_fd;
+-        __u64 src_offset;
+-        __u64 src_length;
+-        __u64 dest_offset;
+-};
+-
+-#define FICLONE         _IOW(0x94, 9, int)
+-#define FICLONERANGE    _IOW(0x94, 13, struct file_clone_range)
+-
+ #else
+ #include <linux/fs.h>
+ #endif
+-- 
+GitLab
diff --git a/app-emulation/qemu/qemu-7.2.0-r2.ebuild b/app-emulation/qemu/qemu-7.2.0-r2.ebuild
index 7632e13429ee..c13da1572122 100644
--- a/app-emulation/qemu/qemu-7.2.0-r2.ebuild
+++ b/app-emulation/qemu/qemu-7.2.0-r2.ebuild
@@ -315,6 +315,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-7.1.0-also-build-virtfs-proxy-helper.patch
 	"${FILESDIR}"/${PN}-7.1.0-capstone-include-path.patch
 	"${FILESDIR}"/${PN}-7.2.0-disable-gmp.patch
+	"${FILESDIR}"/${PN}-7.2.0-linux-headers-6.2-glibc-2.36.patch
 )
 
 QA_PREBUILT="
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 9882362954e2..08c1a7dc7a37 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/rapidyaml/Manifest b/dev-cpp/rapidyaml/Manifest
index 861302c30e69..74c4ae70d8e3 100644
--- a/dev-cpp/rapidyaml/Manifest
+++ b/dev-cpp/rapidyaml/Manifest
@@ -6,5 +6,5 @@ DIST rapidyaml-0.5.0-src.tgz 7273101 BLAKE2B b15033ae028c4704178dc4a017b5c1e8582
 DIST rapidyaml-c4fs-0130061b804ae2af0d6cd5919275d552eb1f2414.tar.gz 22615 BLAKE2B b774723d35658ffb56b187428089bdf2b5bebd470d0be3122bd1f99248d2537d4b31649c5e8b133b2cb28e8ec97a428a325701830708238878da07426fe7853b SHA512 d18be64060779af1b19ccafbbf26bc6c437ff5ed074bef5919ebef55bb9ad36a7abb183a99a86bada0447b15b8386c991ac9ab975d63aab77c3a57801358bf96
 DIST rapidyaml-c4log-00066ad7f624556f066f3d60766a2c33aeb3c6f0.tar.gz 11978 BLAKE2B 554240c63114f1c0bd22295a39b683a59981f3e80352dce7aebe3af39dd6d1211c2c8df9f84f3f8c30775622e242a95c3a50572b30b557c269d3d9eb2ecca3de SHA512 9399e55e116b87b4ee4583e32c7a72bc3f7fd579fda69c515a5d0df5fc065246aaa1587ed937e7c6eb6df417810284496bb2eafa0879800cecbe17ecdbef5ae9
 DIST rapidyaml-yaml-test-suite-6e6c296ae9c9d2d5c4134b4b64d01b29ac19ff6f.tar.gz 99765 BLAKE2B d55a605623c988a4c58daa6dd155980129ffefe86570d55b1ce2514dfa77c352e0467b12e95d6e2bd38cc0454f0b30c3109c088841ddbe423b8bbb7d9e41bc9b SHA512 4ab0e52369d085e696196ef1aab8ecb4f0218e48e8ce33c4ecc863942639141601cb1c83b41027eceddc20a6a4cebfc51abcb83779007e890b87d79c76394946
-EBUILD rapidyaml-0.5.0.ebuild 2236 BLAKE2B de36965bcac64e728d9d0ea6233b0e87faf181776fe5feda58106919e196fd8138b231e8f776617db2d521a2e335b0070f0a456e5219c1c6d4e97b599a51f879 SHA512 846dd5244a040708a4ac5b24710f6444d4ea8ef00cc8e16e68a8ef9aaf8b105ecbc3509b77668981dd5684e01cb26ce39254a26faaae83a25ca84dce23732b1f
+EBUILD rapidyaml-0.5.0.ebuild 2243 BLAKE2B d63cbce26fdab56e1941b1d27c86a790eb393d011de0aba2fd0ab4efeea2c66915fa98356867c26a7e01d526d80ef42901baff516904cd482f5dddcee8456dd8 SHA512 efabb0d91af90981ad2c0caf5fea4c47f1668c59f680c1f5ba0ec6b1490a424a87e705c269055880d604291a5a28d563cccd6abd0157dd89c05dfe4a423fc7c2
 MISC metadata.xml 375 BLAKE2B ae9fc516e43fb6561964a17a58c9c2eefffeaa918a62c325c0b72847c60dad692c107f5ea27a2b6abbf93f73bc27f8a24a00f57dfcbf72bb0f6bd9a5344b6ea2 SHA512 263bb4123527bc4e48c2d9ccc4d797e943be1a5924dd8504c09f028728297c46d3e17e0716ea50a6a35fbfd3561043711ac554776a6c538543ae51ba11ab72a1
diff --git a/dev-cpp/rapidyaml/rapidyaml-0.5.0.ebuild b/dev-cpp/rapidyaml/rapidyaml-0.5.0.ebuild
index 84cf212c458f..bfb67241cda1 100644
--- a/dev-cpp/rapidyaml/rapidyaml-0.5.0.ebuild
+++ b/dev-cpp/rapidyaml/rapidyaml-0.5.0.ebuild
@@ -26,7 +26,7 @@ S="${WORKDIR}/${P}-src"
 
 LICENSE="MIT Boost-1.0 BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64 ~riscv x86"
 IUSE="debug test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 9a86089580bb..39cb2bc16d3a 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/ghc/Manifest b/dev-lang/ghc/Manifest
index b01d0e97d671..be46615acc84 100644
--- a/dev-lang/ghc/Manifest
+++ b/dev-lang/ghc/Manifest
@@ -26,11 +26,15 @@ DIST ghc-9.0.2-testsuite.tar.xz 2403564 BLAKE2B 0e7f6fefb9c972f94073aca8b1514791
 DIST ghc-bin-8.10.6-i686-pc-linux-gnu.tbz2 124324289 BLAKE2B afb34984872b35fdedbdedeb8756cc7c33e5b943dba57dd86910b076d483bb643265d0ab0027784dec5dc489eabd65b5ab17474f25fb2ce657925aa0efaa9033 SHA512 4be13e6dba298d12a4d49ae4633eec83cfaaaf22b5f8cfca5f5952aa294ae52fb3601490beed3bda5a7f7b6a5bd81e0ecc9fc39e8df836cc8fd377a0d0b783a0
 DIST ghc-bin-8.10.6-x86_64-pc-linux-gnu.tbz2 122871118 BLAKE2B 527b36abf60390c91f91bc650ee25484d39d377739da87b5b6fd1a752705c1f3bc0ce0c68644657c9a7c1fc9a3b858b9dd7d84b25eab1a89125fccb6eb1f6250 SHA512 42b7fae339e82a6078fae8920efea8d0992e4774ea66b100e22dd9df168be57d8bce52558b8501c3c567c40776389d94bde3f17d26d63535140ce26ac16c27e1
 DIST ghc-bin-9.0.2-aarch64-unknown-linux-gnu.tar.gz 304621314 BLAKE2B d38b8571d41b5703da6b29f43664293761865166a7e3ab6b9c4b039f1af15faa4aa2013a32eb00059d6e595984895762eadff7b62141157d2dea6eb9b035138d SHA512 94e0e00329a18b494b509b3f8190cf6fed2399a2ac2d2d96fdfd90bf5dbeb8db68b6759f719ad85f8873961b0e983ff0006ce0bf109e96462169cbd9fa7b6784
+DIST ghc-bin-9.0.2-i686-pc-linux-gnu-r4.tbz2 118374393 BLAKE2B 5fdb0125bc76570923b8c7238d6fd0e4e8a3fb50b4bf7e1921fe43cbb64c23a259627d6d1ce86141462bbf716d0b41a4afda9defd235dc3bc92d389a7e9414ca SHA512 d4b0530d81a01adfd4878e663700b9e444e1194a7a020b42fd8f620c141fafef9bef0f24cd2c90f36680818797e883f61933d8da1adb041aa945a7c4d10c09d7
 DIST ghc-bin-9.0.2-i686-pc-linux-gnu.tbz2 123509908 BLAKE2B 45614984803a7bfa266f99d4adb4b5f2ab7b9e5e89c6ecd501296fc99a1d96e798ccb9c832f8dcb15fff9725beb918a7b63e62ff13f59b6506a2ef17930c45d2 SHA512 e0b7f4474c16f0763a2f787027fbdfeb3125b48c987fa1196bc189fefad9f0bfa2806da62af46d61ca911f5275b578076e2b326acf39e0894a8daa9deda0843a
 DIST ghc-bin-9.0.2-powerpc64-unknown-linux-gnu.tar.gz 235636284 BLAKE2B 878ac300cca5d2cbc5cb21dbb347da755b4027cbf63ec77464740854fa8010569de5e03acef67cd877da13665c906b2fd04e24e226e9eb39b57ba979093c732b SHA512 28f096e965abdac9cc370c882639f10285b9073ba5332f7af215eccff948e41c01c3d6bb3bc8e3b4e809e12867a95b49f82dd76e0090b974088f75ab9d1bc199
 DIST ghc-bin-9.0.2-powerpc64le-unknown-linux-gnu.tar.gz 275226316 BLAKE2B 10ade2359432b0ede7431ee543f0ff47f4b203465d81719da579ad63ca467359eb9fcf7336a12feb6ff75a480f349576ff8ea1b4ebe1094fff228ae4fd00d6e0 SHA512 64b4c84d149358b8d3a6cb29a6d3a75af11e7b14e6d910c9789c9949262e4ed2a17f8a0d1e5dd297121957061fe2395d6f43acae6b4ab28851e3cd414cd9c89c
 DIST ghc-bin-9.0.2-riscv64-unknown-linux-gnu.tar.gz 313475807 BLAKE2B a5e1bbd4630eaff63dd01d79fdcb26a663771c0241d3211aa3a0033cb58addbe8e696177500ac06ae727fc645bfc6f16a3df763a6a0ae039b8823bcbfb9918bb SHA512 5e462f6f9d3f3507b3e09230729faa2a3e1fa92a8024fac602d75b804fff25f27e335871658f4b7b2c671f9e066373ca0285720da315a6c22f6f2c9c3cfea927
 DIST ghc-bin-9.0.2-x86_64-pc-linux-gnu-r1.tbz2 121347519 BLAKE2B 6bd41cdb8ba1661735e46df4709888e6461cff969678716c82681a0a0b0e8d0a32532a070f52efb0ab99ca126207998e8883d01902071e797a7a0f19881d5925 SHA512 c7de43577fd97e6fbde7bbffba4e1d2b83cdda405cff46f95c9eff23260542b426091d8dba75605d81ed41740a793a409e7448538e5adc7a391a901f20e8f2e4
-EBUILD ghc-8.10.6-r2.ebuild 26359 BLAKE2B c81305dbb761361d63dff6ff8d040632f5f0be5c2f9d0bf8406211321332888f232a377a081625bd19163d228d388aa42ccefe286e61cd8e82ea1255be6546ef SHA512 1e22cfa9a22ee3f28f825ef342ac69574dab3c2cda262a39ad369da08735000556ac5d5510f7b6d15d7fecbb0a261bc386e88d217162853e460c0e0053b1f1ff
-EBUILD ghc-9.0.2-r3.ebuild 27828 BLAKE2B 7d9450c5650e9d00f20852c7dc27924853d46332284758eb564a7544cdc28af9b4109093fd55203df0d68a712c934219d52f1ab7a429ad68284e13b2b24c3991 SHA512 dc5e4e2eb784d02f32fc6e092c959dade652a17bbd238e122451a38312c74e53f79bea6cbea6f41032d80aa6e455d1a7f15c52544761d37ff3eec0e3e976e60d
+DIST ghc-bin-9.0.2-x86_64-pc-linux-gnu-r4.tbz2 117160553 BLAKE2B 6314d6ae30f83325cbe5d620399f2517b90b32e6b54d5570acafe0266307013c729afc1de93be092bdb86e1f276f55e7bd19392c74f1a123110a76800982a446 SHA512 f12e0861276f92e23e5fb42ee702cac04f9726895b8dde29e29d549fe41cad417d8f60aa6cb537e64c8de1a3550a31f62f9ce391bf3fc866f05f511b5b2463f1
+DIST process-1.6.16.0.tar.gz 87354 BLAKE2B 8c2977d6801faef8825ed35f058a6207a518f72eb87ac3144f630bc028f4753cefb9ed4d3fc29185438bcb4f38d33f5a45aebec6a8101e4cdc1b3570ada2e5dc SHA512 1663f2746a05a5a4c29d249db54eaa49edbbadfe8d189eab02276c3f6f3d6b84c81cc4333318c42c7a7265638402cb13276f08aeea134a7f5dd98da050a34341
+EBUILD ghc-8.10.6-r3.ebuild 28178 BLAKE2B e7f30d9cbd0e48d4702cf2b9f6b4b791d7e81d1c53d3507111db5b3231afeac6b4a9418d7c333af45f07517c55c538c669a0ab230dff2df931013edfa76909e4 SHA512 e8d8cc4ac8059b7d4080981e7ef45779a1a09abcc24f147d1a7d48bc30ac321e5886d197a0eabc10b7565c337b6ad1ba08e852b869562d55b7aee266c139bc9b
+EBUILD ghc-9.0.2-r3.ebuild 30060 BLAKE2B cbe6a05f55122b14daac0f7366eb86d113119072081eb6768e86948c9739c0c0b7fd360cc37b8df952f87da76cfb226b06e0891ba59a0a3fdec6f604a09fca5a SHA512 32ca84eb92f5a25f5f69b630618292d8e5f200d5e131f5b110a638be3ae4146c4ee48d847b3db0599953a8bbc42b5fc684196f9904b3a3237feff43c572af21f
+EBUILD ghc-9.0.2-r4.ebuild 30079 BLAKE2B bdcd9be10973024ca308d6cd2e6d3a8c7dc172a29cd69106cd760a4c3713a308f9497c9f33721163c154ce74236d0b225dc12a4af6676b1ff2e362fc91ef6da7 SHA512 5b9dba963e1db1cb980a77ef00e68c648a4e1c4e1ce641f3c8a03895e2b078ef1570238040f4fc08d834d64fc4d8c1ea233c7a6775311c937ab4914a9fec67f1
 MISC metadata.xml 1172 BLAKE2B 88b5e4af0e8c0e3335185f2c5469837a43ee87e6fc598242f29aced9bb8a3c330139978c564eb4ca503101934917e8406e9400dffd2eeaf7cd9983e8dc96105e SHA512 b03bb932efa54be0d55be591850064fcc967c8d77afdded255be91794544d47bdbbbd2959103cb739f6ec57b8571a955352e965ee1540a9854235a963b218bd3
diff --git a/dev-lang/ghc/ghc-8.10.6-r2.ebuild b/dev-lang/ghc/ghc-8.10.6-r3.ebuild
index a6c5e39b7c68..2478db3c35bd 100644
--- a/dev-lang/ghc/ghc-8.10.6-r2.ebuild
+++ b/dev-lang/ghc/ghc-8.10.6-r3.ebuild
@@ -25,36 +25,72 @@ HOMEPAGE="https://www.haskell.org/ghc/"
 arch_binaries=""
 
 BIN_PV=${PV}
-# sorted!
-#arch_binaries="$arch_binaries alpha? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-alpha.tbz2 )"
-#arch_binaries="$arch_binaries arm? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-armv7a-hardfloat-linux-gnueabi.tbz2 )"
-#arch_binaries="$arch_binaries arm64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-aarch64-unknown-linux-gnu.tbz2 )"
-arch_binaries="$arch_binaries amd64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-x86_64-pc-linux-gnu.tbz2 )"
-#arch_binaries="$arch_binaries ia64?  ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-ia64-fixed-fiw.tbz2 )"
-#arch_binaries="$arch_binaries ppc? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-ppc.tbz2 )"
-#arch_binaries="$arch_binaries ppc64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-ppc64.tbz2 )"
-#arch_binaries="$arch_binaries ppc64? ( !big-endian? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-powerpc64le-unknown-linux-gnu.tbz2 ) )"
-#arch_binaries="$arch_binaries sparc? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-sparc.tbz2 )"
-arch_binaries="$arch_binaries x86? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-i686-pc-linux-gnu.tbz2 )"
+
+# Differentiate glibc/musl
+
+#glibc_binaries="$glibc_binaries alpha? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-alpha.tbz2 )"
+glibc_binaries="$glibc_binaries amd64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-x86_64-pc-linux-gnu.tbz2 )"
+#glibc_binaries="$glibc_binaries arm? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-armv7a-hardfloat-linux-gnueabi.tbz2 )"
+#glibc_binaries="$glibc_binaries arm64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-aarch64-unknown-linux-gnu.tbz2 )"
+#glibc_binaries="$glibc_binaries ia64?  ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-ia64-fixed-fiw.tbz2 )"
+#glibc_binaries="$glibc_binaries ppc? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-ppc.tbz2 )"
+#glibc_binaries="$glibc_binaries ppc64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-ppc64.tbz2 )"
+#glibc_binaries="$glibc_binaries ppc64? ( !big-endian? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-powerpc64le-unknown-linux-gnu.tbz2 ) )"
+#glibc_binaries="$glibc_binaries sparc? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-sparc.tbz2 )"
+glibc_binaries="$glibc_binaries x86? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-i686-pc-linux-gnu.tbz2 )"
+
+#musl_binaries="$musl_binaries alpha? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-alpha.tbz2 )"
+#musl_binaries="$musl_binaries amd64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-x86_64-pc-linux-musl.tbz2 )"
+#musl_binaries="$musl_binaries arm? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-armv7a-hardfloat-linux-musl.tbz2 )"
+#musl_binaries="$musl_binaries arm64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-aarch64-unknown-linux-musl.tbz2 )"
+#musl_binaries="$musl_binaries ia64?  ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-ia64-fixed-fiw.tbz2 )"
+#musl_binaries="$musl_binaries ppc? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-ppc.tbz2 )"
+#musl_binaries="$musl_binaries ppc64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-ppc64.tbz2 )"
+#musl_binaries="$musl_binaries ppc64? ( !big-endian? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-powerpc64le-unknown-linux-musl.tbz2 ) )"
+#musl_binaries="$musl_binaries sparc? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-sparc.tbz2 )"
+#musl_binaries="$musl_binaries x86? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-i686-pc-linux-musl.tbz2 )"
+
+[[ -n $glibc_binaries ]] && arch_binaries="$arch_binaries elibc_glibc? ( $glibc_binaries )"
+[[ -n $musl_binaries ]] && arch_binaries="$arch_binaries elibc_musl? ( $musl_binaries )"
 
 # various ports:
 #arch_binaries="$arch_binaries x86-fbsd? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-x86-fbsd.tbz2 )"
 
 # 0 - yet
 yet_binary() {
-	case "${ARCH}" in
-		#alpha) return 0 ;;
-		#arm64) return 0 ;;
-		#arm) return 0 ;;
-		amd64) return 0 ;;
-		#ia64) return 0 ;;
-		#ppc) return 0 ;;
-		#ppc64)
-		#	use big-endian && return 0
-		#	return 0
-		#	;;
-		#sparc) return 0 ;;
-		x86) return 0 ;;
+	case "${ELIBC}" in
+		glibc)
+			case "${ARCH}" in
+				#alpha) return 0 ;;
+				#arm64) return 0 ;;
+				#arm) return 0 ;;
+				amd64) return 0 ;;
+				#ia64) return 0 ;;
+				#ppc) return 0 ;;
+				#ppc64)
+				#	use big-endian || return 0
+				#	;;
+				#sparc) return 0 ;;
+				x86) return 0 ;;
+				*) return 1 ;;
+			esac
+			;;
+		musl)
+			case "${ARCH}" in
+				#alpha) return 0 ;;
+				#arm64) return 0 ;;
+				#arm) return 0 ;;
+				#amd64) return 0 ;;
+				#ia64) return 0 ;;
+				#ppc) return 0 ;;
+				#ppc64)
+				#	use big-endian || return 0
+				#	;;
+				#sparc) return 0 ;;
+				#x86) return 0 ;;
+				*) return 1 ;;
+			esac
+			;;
 		*) return 1 ;;
 	esac
 }
@@ -73,6 +109,7 @@ S="${WORKDIR}"/${GHC_P}
 
 BUMP_LIBRARIES=(
 	# "hackage-name          hackage-version"
+	"process          1.6.16.0"
 )
 
 LICENSE="BSD"
diff --git a/dev-lang/ghc/ghc-9.0.2-r3.ebuild b/dev-lang/ghc/ghc-9.0.2-r3.ebuild
index 21f2dedfd9de..fc779d53836d 100644
--- a/dev-lang/ghc/ghc-9.0.2-r3.ebuild
+++ b/dev-lang/ghc/ghc-9.0.2-r3.ebuild
@@ -25,38 +25,77 @@ HOMEPAGE="https://www.haskell.org/ghc/"
 arch_binaries=""
 
 BIN_PV=${PV}
-# sorted!
-#arch_binaries="$arch_binaries alpha? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-alpha.tbz2 )"
-#arch_binaries="$arch_binaries arm? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-armv7a-hardfloat-linux-gnueabi.tbz2 )"
-arch_binaries="$arch_binaries arm64? ( https://github.com/matoro/ghc/releases/download/${PV}/ghc-bin-${PV}-aarch64-unknown-linux-gnu.tar.gz )"
-arch_binaries="$arch_binaries amd64? ( https://eidetic.codes/ghc-bin-${PV}-x86_64-pc-linux-gnu-r1.tbz2 )"
-#arch_binaries="$arch_binaries ia64?  ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-ia64-fixed-fiw.tbz2 )"
-#arch_binaries="$arch_binaries ppc? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-ppc.tbz2 )"
-arch_binaries="$arch_binaries ppc64? (
+
+# Differentiate glibc/musl
+
+#glibc_binaries="$glibc_binaries alpha? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-alpha.tbz2 )"
+glibc_binaries="$glibc_binaries amd64? ( https://eidetic.codes/ghc-bin-${PV}-x86_64-pc-linux-gnu-r1.tbz2 )"
+#glibc_binaries="$glibc_binaries arm? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-armv7a-hardfloat-linux-gnueabi.tbz2 )"
+glibc_binaries="$glibc_binaries arm64? ( https://github.com/matoro/ghc/releases/download/${PV}/ghc-bin-${PV}-aarch64-unknown-linux-gnu.tar.gz )"
+#glibc_binaries="$glibc_binaries ia64?  ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-ia64-fixed-fiw.tbz2 )"
+#glibc_binaries="$glibc_binaries ppc? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-ppc.tbz2 )"
+#glibc_binaries="$glibc_binaries ppc64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-ppc64.tbz2 )"
+glibc_binaries="$glibc_binaries ppc64? (
 	big-endian? ( https://github.com/matoro/ghc/releases/download/${PV}/ghc-bin-${PV}-powerpc64-unknown-linux-gnu.tar.gz )
 	!big-endian? ( https://github.com/matoro/ghc/releases/download/${PV}/ghc-bin-${PV}-powerpc64le-unknown-linux-gnu.tar.gz )
 )"
-arch_binaries="$arch_binaries riscv? ( https://github.com/matoro/ghc/releases/download/${PV}/ghc-bin-${PV}-riscv64-unknown-linux-gnu.tar.gz )"
-#arch_binaries="$arch_binaries sparc? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-sparc.tbz2 )"
-arch_binaries="$arch_binaries x86? ( https://eidetic.codes/ghc-bin-${PV}-i686-pc-linux-gnu.tbz2 )"
+glibc_binaries="$glibc_binaries riscv? ( https://github.com/matoro/ghc/releases/download/${PV}/ghc-bin-${PV}-riscv64-unknown-linux-gnu.tar.gz )"
+#glibc_binaries="$glibc_binaries sparc? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-sparc.tbz2 )"
+glibc_binaries="$glibc_binaries x86? ( https://eidetic.codes/ghc-bin-${PV}-i686-pc-linux-gnu.tbz2 )"
+
+#musl_binaries="$musl_binaries alpha? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-alpha.tbz2 )"
+#musl_binaries="$musl_binaries amd64? ( https://eidetic.codes/ghc-bin-${PV}-x86_64-pc-linux-musl.tbz2 )"
+#musl_binaries="$musl_binaries arm? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-armv7a-hardfloat-linux-musl.tbz2 )"
+#musl_binaries="$musl_binaries arm64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-aarch64-unknown-linux-musl.tbz2 )"
+#musl_binaries="$musl_binaries ia64?  ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-ia64-fixed-fiw.tbz2 )"
+#musl_binaries="$musl_binaries ppc? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-ppc.tbz2 )"
+#musl_binaries="$musl_binaries ppc64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-ppc64.tbz2 )"
+#musl_binaries="$musl_binaries ppc64? ( !big-endian? ( https://github.com/matoro/ghc/releases/download/${PV}/ghc-bin-${PV}-powerpc64le-unknown-linux-musl.tar.gz ) )"
+#musl_binaries="$musl_binaries riscv? ( https://github.com/matoro/ghc/releases/download/${PV}/ghc-bin-${PV}-riscv64-unknown-linux-musl.tar.gz )"
+#musl_binaries="$musl_binaries sparc? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-sparc.tbz2 )"
+#musl_binaries="$musl_binaries x86? ( https://eidetic.codes/ghc-bin-${PV}-i686-pc-linux-musl.tbz2 )"
+
+[[ -n $glibc_binaries ]] && arch_binaries="$arch_binaries elibc_glibc? ( $glibc_binaries )"
+[[ -n $musl_binaries ]] && arch_binaries="$arch_binaries elibc_musl? ( $musl_binaries )"
 
 # various ports:
 #arch_binaries="$arch_binaries x86-fbsd? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-x86-fbsd.tbz2 )"
 
 # 0 - yet
 yet_binary() {
-	case "${ARCH}" in
-		#alpha) return 0 ;;
-		arm64) return 0 ;;
-		#arm) return 0 ;;
-		amd64) return 0 ;;
-		#ia64) return 0 ;;
-		#ppc) return 0 ;;
-		ppc64) return 0 ;;
-		riscv) return 0 ;;
-		#sparc) return 0 ;;
-		x86) return 0 ;;
-		*) return 1 ;;
+	case "${ELIBC}" in
+		glibc)
+			case "${ARCH}" in
+				#alpha) return 0 ;;
+				arm64) return 0 ;;
+				#arm) return 0 ;;
+				amd64) return 0 ;;
+				#ia64) return 0 ;;
+				#ppc) return 0 ;;
+				ppc64) return 0 ;;
+				riscv) return 0 ;;
+				#sparc) return 0 ;;
+				x86) return 0 ;;
+				*) return 1 ;;
+			esac
+			;;
+		musl)
+			case "${ARCH}" in
+				#alpha) return 0 ;;
+				#arm64) return 0 ;;
+				#arm) return 0 ;;
+				#amd64) return 0 ;;
+				#ia64) return 0 ;;
+				#ppc) return 0 ;;
+				#ppc64)
+				#	use big-endian || return 0
+				#	;;
+				#riscv) return 0 ;;
+				#sparc) return 0 ;;
+				#x86) return 0 ;;
+				*) return 1 ;;
+			esac
+			;;
 	esac
 }
 
@@ -424,6 +463,11 @@ src_unpack() {
 }
 
 src_prepare() {
+	# Force the use of C.utf8 locale
+	# <https://github.com/gentoo-haskell/gentoo-haskell/issues/1287>
+	# <https://github.com/gentoo-haskell/gentoo-haskell/issues/1289>
+	export LC_ALL=C.utf8
+
 	ghc_setup_cflags
 
 	# ghc-9.0.2 release anomaly
diff --git a/dev-lang/ghc/ghc-9.0.2-r4.ebuild b/dev-lang/ghc/ghc-9.0.2-r4.ebuild
new file mode 100644
index 000000000000..4ad8fb52d320
--- /dev/null
+++ b/dev-lang/ghc/ghc-9.0.2-r4.ebuild
@@ -0,0 +1,901 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# to make make a crosscompiler use crossdev and symlink ghc tree into
+# cross overlay. result would look like 'cross-sparc-unknown-linux-gnu/ghc'
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} = ${CHOST} ]] ; then
+	if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
+		export CTARGET=${CATEGORY/cross-}
+	fi
+fi
+
+PYTHON_COMPAT=( python3_{9..10} )
+inherit python-any-r1
+inherit autotools bash-completion-r1 flag-o-matic ghc-package
+inherit multiprocessing pax-utils toolchain-funcs prefix
+inherit check-reqs llvm
+DESCRIPTION="The Glasgow Haskell Compiler"
+HOMEPAGE="https://www.haskell.org/ghc/"
+
+# we don't have any binaries yet
+arch_binaries=""
+
+BIN_PV=${PV}
+
+# Differentiate glibc/musl
+
+#glibc_binaries="$glibc_binaries alpha? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-alpha.tbz2 )"
+glibc_binaries="$glibc_binaries amd64? ( https://eidetic.codes/ghc-bin-${PV}-x86_64-pc-linux-gnu-r4.tbz2 )"
+#glibc_binaries="$glibc_binaries arm? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-armv7a-hardfloat-linux-gnueabi.tbz2 )"
+#glibc_binaries="$glibc_binaries arm64? ( https://github.com/matoro/ghc/releases/download/${PV}/ghc-bin-${PV}-aarch64-unknown-linux-gnu.tar.gz )"
+#glibc_binaries="$glibc_binaries ia64?  ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-ia64-fixed-fiw.tbz2 )"
+#glibc_binaries="$glibc_binaries ppc? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-ppc.tbz2 )"
+#glibc_binaries="$glibc_binaries ppc64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-ppc64.tbz2 )"
+#glibc_binaries="$glibc_binaries ppc64? (
+#	big-endian? ( https://github.com/matoro/ghc/releases/download/${PV}/ghc-bin-${PV}-powerpc64-unknown-linux-gnu.tar.gz )
+#	!big-endian? ( https://github.com/matoro/ghc/releases/download/${PV}/ghc-bin-${PV}-powerpc64le-unknown-linux-gnu.tar.gz )
+#)"
+#glibc_binaries="$glibc_binaries riscv? ( https://github.com/matoro/ghc/releases/download/${PV}/ghc-bin-${PV}-riscv64-unknown-linux-gnu.tar.gz )"
+#glibc_binaries="$glibc_binaries sparc? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-sparc.tbz2 )"
+glibc_binaries="$glibc_binaries x86? ( https://eidetic.codes/ghc-bin-${PV}-i686-pc-linux-gnu-r4.tbz2 )"
+
+#musl_binaries="$musl_binaries alpha? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-alpha.tbz2 )"
+#musl_binaries="$musl_binaries amd64? ( https://eidetic.codes/ghc-bin-${PV}-x86_64-pc-linux-musl.tbz2 )"
+#musl_binaries="$musl_binaries arm? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-armv7a-hardfloat-linux-musl.tbz2 )"
+#musl_binaries="$musl_binaries arm64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-aarch64-unknown-linux-musl.tbz2 )"
+#musl_binaries="$musl_binaries ia64?  ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-ia64-fixed-fiw.tbz2 )"
+#musl_binaries="$musl_binaries ppc? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-ppc.tbz2 )"
+#musl_binaries="$musl_binaries ppc64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-ppc64.tbz2 )"
+#musl_binaries="$musl_binaries ppc64? ( !big-endian? ( https://github.com/matoro/ghc/releases/download/${PV}/ghc-bin-${PV}-powerpc64le-unknown-linux-musl.tar.gz ) )"
+#musl_binaries="$musl_binaries riscv? ( https://github.com/matoro/ghc/releases/download/${PV}/ghc-bin-${PV}-riscv64-unknown-linux-musl.tar.gz )"
+#musl_binaries="$musl_binaries sparc? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-sparc.tbz2 )"
+#musl_binaries="$musl_binaries x86? ( https://eidetic.codes/ghc-bin-${PV}-i686-pc-linux-musl.tbz2 )"
+
+[[ -n $glibc_binaries ]] && arch_binaries="$arch_binaries elibc_glibc? ( $glibc_binaries )"
+[[ -n $musl_binaries ]] && arch_binaries="$arch_binaries elibc_musl? ( $musl_binaries )"
+
+# various ports:
+#arch_binaries="$arch_binaries x86-fbsd? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-x86-fbsd.tbz2 )"
+
+# 0 - yet
+yet_binary() {
+	case "${ELIBC}" in
+		glibc)
+			case "${ARCH}" in
+				#alpha) return 0 ;;
+				#arm64) return 0 ;;
+				#arm) return 0 ;;
+				amd64) return 0 ;;
+				#ia64) return 0 ;;
+				#ppc) return 0 ;;
+				#ppc64) return 0 ;;
+				#riscv) return 0 ;;
+				#sparc) return 0 ;;
+				x86) return 0 ;;
+				*) return 1 ;;
+			esac
+			;;
+		musl)
+			case "${ARCH}" in
+				#alpha) return 0 ;;
+				#arm64) return 0 ;;
+				#arm) return 0 ;;
+				#amd64) return 0 ;;
+				#ia64) return 0 ;;
+				#ppc) return 0 ;;
+				#ppc64)
+				#	use big-endian || return 0
+				#	;;
+				#riscv) return 0 ;;
+				#sparc) return 0 ;;
+				#x86) return 0 ;;
+				*) return 1 ;;
+			esac
+			;;
+	esac
+}
+
+GHC_PV=${PV}
+#GHC_PV=8.10.0.20200123 # uncomment only for -alpha, -beta, -rc ebuilds
+GHC_P=${PN}-${GHC_PV} # using ${P} is almost never correct
+
+SRC_URI="!binary? (
+	https://downloads.haskell.org/ghc/${PV/_/-}/${GHC_P}-src.tar.xz
+	test? ( https://downloads.haskell.org/ghc/${PV/_/-}/${GHC_P}-testsuite.tar.xz )
+)"
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-riscv64-llvm.patch.xz"
+
+S="${WORKDIR}"/${GHC_P}
+
+[[ -n $arch_binaries ]] && SRC_URI+=" !ghcbootstrap? ( $arch_binaries )"
+
+BUMP_LIBRARIES=(
+	# "hackage-name          hackage-version"
+	"process          1.6.16.0"
+)
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="big-endian +doc elfutils ghcbootstrap ghcmakebinary +gmp llvm numa profile test unregisterised"
+IUSE+=" binary"
+RESTRICT="!test? ( test )"
+
+LLVM_MAX_SLOT="14"
+RDEPEND="
+	>=dev-lang/perl-5.6.1
+	dev-libs/gmp:0=
+	sys-libs/ncurses:=[unicode(+)]
+	elfutils? ( dev-libs/elfutils )
+	!ghcmakebinary? ( dev-libs/libffi:= )
+	numa? ( sys-process/numactl )
+	llvm? (
+		<sys-devel/llvm-$((${LLVM_MAX_SLOT} + 1)):=
+		|| (
+			sys-devel/llvm:14
+		)
+	)
+"
+
+# This set of dependencies is needed to run
+# prebuilt ghc. We specifically avoid ncurses
+# dependency with:
+#    utils/ghc-pkg_HC_OPTS += -DBOOTSTRAPPING
+PREBUILT_BINARY_DEPENDS="
+	!prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) )
+"
+# This set of dependencies is needed to install
+# ghc[binary] in system. terminfo package is linked
+# against ncurses.
+PREBUILT_BINARY_RDEPENDS="${PREBUILT_BINARY_DEPENDS}
+	sys-libs/ncurses:0/6
+"
+
+RDEPEND+="binary? ( ${PREBUILT_BINARY_RDEPENDS} )"
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-text/docbook-xml-dtd:4.2
+		app-text/docbook-xml-dtd:4.5
+		app-text/docbook-xsl-stylesheets
+		dev-python/sphinx
+		>=dev-libs/libxslt-1.1.2 )
+	!ghcbootstrap? ( ${PREBUILT_BINARY_DEPENDS} )
+	test? ( ${PYTHON_DEPS} )
+"
+
+needs_python() {
+	# test driver is written in python
+	use test && return 0
+	return 1
+}
+
+# we build binaries without profiling support
+REQUIRED_USE="
+	?? ( ghcbootstrap binary )
+	?? ( profile binary )
+	?? ( llvm unregisterised )
+"
+
+# haskell libraries built with cabal in configure mode, #515354
+QA_CONFIGURE_OPTIONS+=" --with-compiler --with-gcc"
+
+is_crosscompile() {
+	[[ ${CHOST} != ${CTARGET} ]]
+}
+
+is_native() {
+	[[ ${CHOST} == ${CBUILD} ]] && [[ ${CHOST} == ${CTARGET} ]]
+}
+
+if ! is_crosscompile; then
+	PDEPEND="!ghcbootstrap? ( >=app-admin/haskell-updater-1.2 )"
+fi
+
+# returns tool prefix for crosscompiler.
+# Example:
+#  CTARGET=armv7a-unknown-linux-gnueabi
+#  CHOST=x86_64-pc-linux-gnu
+#    "armv7a-unknown-linux-gnueabi-"
+#  CTARGET=${CHOST}
+#    ""
+# Used in tools and library prefix:
+#    "${ED}"/usr/bin/$(cross)haddock
+#    "${ED}/usr/$(get_libdir)/$(cross)${GHC_P}/package.conf.d"
+
+cross() {
+	if is_crosscompile; then
+		echo "${CTARGET}-"
+	else
+		echo ""
+	fi
+}
+
+append-ghc-cflags() {
+	local persistent compile assemble link
+	local flag ghcflag
+
+	for flag in $*; do
+		case ${flag} in
+			persistent)	persistent="yes";;
+			compile)	compile="yes";;
+			assemble)	assemble="yes";;
+			link)		link="yes";;
+			*)
+				[[ ${compile}  ]] && ghcflag="-optc${flag}"  CFLAGS+=" ${flag}" && GHC_FLAGS+=" ${ghcflag}" &&
+					[[ ${persistent} ]] && GHC_PERSISTENT_FLAGS+=" ${ghcflag}"
+				[[ ${assemble} ]] && ghcflag="-opta${flag}"  CFLAGS+=" ${flag}" && GHC_FLAGS+=" ${ghcflag}" &&
+					[[ ${persistent} ]] && GHC_PERSISTENT_FLAGS+=" ${ghcflag}"
+				[[ ${link}     ]] && ghcflag="-optl${flag}" LDFLAGS+=" ${flag}" && GHC_FLAGS+=" ${ghcflag}" &&
+					[[ ${persistent} ]] && GHC_PERSISTENT_FLAGS+=" ${ghcflag}"
+				;;
+		esac
+	done
+}
+
+# $1 - lib name (under libraries/)
+# $2 - lib version
+# example: bump_lib "transformers" "0.4.2.0"
+bump_lib() {
+	local pn=$1 pv=$2
+	local p=${pn}-${pv}
+	local f
+
+	einfo "Bumping ${pn} up to ${pv}"
+
+	for f in ghc.mk GNUmakefile; do
+		mv libraries/"${pn}"/$f "${WORKDIR}"/"${p}"/$f || die
+	done
+	mv libraries/"${pn}" "${WORKDIR}"/"${pn}".old || die
+	mv "${WORKDIR}"/"${p}" libraries/"${pn}" || die
+}
+
+update_SRC_URI() {
+	local p pn pv
+	for p in "${BUMP_LIBRARIES[@]}"; do
+		set -- $p
+		pn=$1 pv=$2
+
+		SRC_URI+=" https://hackage.haskell.org/package/${pn}-${pv}/${pn}-${pv}.tar.gz"
+	done
+}
+
+update_SRC_URI
+
+bump_libs() {
+	local p pn pv
+	for p in "${BUMP_LIBRARIES[@]}"; do
+		set -- $p
+		pn=$1 pv=$2
+
+		bump_lib "${pn}" "${pv}"
+	done
+}
+
+ghc_setup_cflags() {
+	# TODO: plumb CFLAGS and BUILD_CFLAGS to respective CONF_CC_OPTS_STAGE<N>
+	if ! is_native; then
+		export CFLAGS=${GHC_CFLAGS-"-O2 -pipe"}
+		export LDFLAGS=${GHC_LDFLAGS-"-Wl,-O1"}
+		einfo "Crosscompiling mode:"
+		einfo "   CHOST:   ${CHOST}"
+		einfo "   CTARGET: ${CTARGET}"
+		einfo "   CFLAGS:  ${CFLAGS}"
+		einfo "   LDFLAGS: ${LDFLAGS}"
+		einfo "   prefix: $(cross)"
+		return
+	fi
+	# We need to be very careful with the CFLAGS we ask ghc to pass through to
+	# gcc. There are plenty of flags which will make gcc produce output that
+	# breaks ghc in various ways. The main ones we want to pass through are
+	# -mcpu / -march flags. These are important for arches like alpha & sparc.
+	# We also use these CFLAGS for building the C parts of ghc, ie the rts.
+	strip-flags
+	strip-unsupported-flags
+
+	# Cmm can't parse line numbers #482086
+	replace-flags -ggdb[3-9] -ggdb2
+
+	GHC_FLAGS=""
+	GHC_PERSISTENT_FLAGS=""
+	for flag in ${CFLAGS}; do
+		case ${flag} in
+
+			# Ignore extra optimisation (ghc passes -O to gcc anyway)
+			# -O2 and above break on too many systems
+			-O*) ;;
+
+			# Arch and ABI flags are what we're really after
+			-m*) append-ghc-cflags compile assemble ${flag};;
+
+			# Sometimes it's handy to see backtrace of RTS
+			# to get an idea what happens there
+			-g*) append-ghc-cflags compile ${flag};;
+
+			# Ignore all other flags, including all -f* flags
+		esac
+	done
+
+	for flag in ${LDFLAGS}; do
+		append-ghc-cflags link ${flag}
+	done
+}
+
+# substitutes string $1 to $2 in files $3 $4 ...
+relocate_path() {
+	local from=$1
+	local   to=$2
+	shift 2
+	local file=
+	for file in "$@"
+	do
+		sed -i -e "s|$from|$to|g" \
+			"$file" || die "path relocation failed for '$file'"
+	done
+}
+
+# changes hardcoded ghc paths and updates package index
+# $1 - new absolute root path
+relocate_ghc() {
+	local to=$1 ghc_v=${BIN_PV}
+
+	# libdir for prebuilt binary and for current system may mismatch
+	# It does for prefix installation for example: bug #476998
+	local bin_ghc_prefix=${WORKDIR}/usr
+	local bin_libpath=$(echo "${bin_ghc_prefix}"/lib*)
+	local bin_libdir=${bin_libpath#${bin_ghc_prefix}/}
+
+	# backup original script to use it later after relocation
+	local gp_back="${T}/ghc-pkg-${ghc_v}-orig"
+	cp "${WORKDIR}/usr/bin/ghc-pkg-${ghc_v}" "$gp_back" || die "unable to backup ghc-pkg wrapper"
+
+	if [[ ${bin_libdir} != $(get_libdir) ]]; then
+		einfo "Relocating '${bin_libdir}' to '$(get_libdir)' (bug #476998)"
+		# moving the dir itself is not strictly needed
+		# but then USE=binary would result in installing
+		# in '${bin_libdir}'
+		mv "${bin_ghc_prefix}/${bin_libdir}" "${bin_ghc_prefix}/$(get_libdir)" || die
+
+		relocate_path "/usr/${bin_libdir}" "/usr/$(get_libdir)" \
+			"${WORKDIR}/usr/bin/ghc-${ghc_v}" \
+			"${WORKDIR}/usr/bin/ghci-${ghc_v}" \
+			"${WORKDIR}/usr/bin/ghc-pkg-${ghc_v}" \
+			"${WORKDIR}/usr/bin/hsc2hs" \
+			"${WORKDIR}/usr/bin/runghc-${ghc_v}" \
+			"$gp_back" \
+			"${WORKDIR}/usr/$(get_libdir)/${PN}-${ghc_v}/package.conf.d/"*
+	fi
+
+	# Relocate from /usr to ${EPREFIX}/usr
+	relocate_path "/usr" "${to}/usr" \
+		"${WORKDIR}/usr/bin/ghc-${ghc_v}" \
+		"${WORKDIR}/usr/bin/ghci-${ghc_v}" \
+		"${WORKDIR}/usr/bin/ghc-pkg-${ghc_v}" \
+		"${WORKDIR}/usr/bin/haddock-ghc-${ghc_v}" \
+		"${WORKDIR}/usr/bin/hp2ps" \
+		"${WORKDIR}/usr/bin/hpc" \
+		"${WORKDIR}/usr/bin/hsc2hs" \
+		"${WORKDIR}/usr/bin/runghc-${ghc_v}" \
+		"${WORKDIR}/usr/$(get_libdir)/${PN}-${ghc_v}/package.conf.d/"*
+
+	# this one we will use to regenerate cache
+	# so it should point to current tree location
+	relocate_path "/usr" "${WORKDIR}/usr" "$gp_back"
+
+	if use prefix; then
+		hprefixify "${bin_libpath}"/${PN}*/settings
+	fi
+
+	# regenerate the binary package cache
+	"$gp_back" recache || die "failed to update cache after relocation"
+	rm "$gp_back"
+}
+
+ghc-check-reqs() {
+	# These are pessimistic values (slightly bigger than worst-case)
+	# Worst case is UNREG USE=profile ia64. See bug #611866 for some
+	# numbers on various arches.
+	CHECKREQS_DISK_BUILD=8G
+	CHECKREQS_DISK_USR=2G
+	# USE=binary roughly takes
+	use binary && CHECKREQS_DISK_BUILD=4G
+
+	"$@"
+}
+
+llvmize() {
+	[[ -z "${1}" ]] && return
+	( find "${1}" -type f \
+		| file -if- \
+		| grep "text/x-shellscript" \
+		| awk -F: '{print $1}' \
+		| xargs sed -i "s#^exec #PATH=\"$(get_llvm_prefix "${LLVM_MAX_SLOT}")/bin:\${PATH}\" exec #") || die
+}
+
+pkg_pretend() {
+	ghc-check-reqs check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	ghc-check-reqs check-reqs_pkg_setup
+
+	# quiet portage about prebuilt binaries
+	use binary && QA_PREBUILT="*"
+
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	if use ghcbootstrap; then
+		ewarn "You requested ghc bootstrapping, this is usually only used"
+		ewarn "by Gentoo developers to make binary .tbz2 packages."
+
+		[[ -z $(type -P ghc) ]] && \
+			die "Could not find a ghc to bootstrap with."
+	else
+		if ! yet_binary; then
+			eerror "Please try emerging with USE=ghcbootstrap and report build"
+			eerror "sucess or failure to the haskell team (haskell@gentoo.org)"
+			die "No binary available for '${ARCH}' arch yet, USE=ghcbootstrap"
+		fi
+	fi
+
+	if needs_python; then
+		python-any-r1_pkg_setup
+	fi
+
+	use llvm && llvm_pkg_setup
+}
+
+src_unpack() {
+	# Create the ${S} dir if we're using the binary version
+	use binary && mkdir "${S}"
+
+	# the Solaris and Darwin binaries from ghc (maeder) need to be
+	# unpacked separately, so prevent them from being unpacked
+	local ONLYA=${A}
+	case ${CHOST} in
+		*-darwin* | *-solaris*)  ONLYA=${GHC_P}-src.tar.xz  ;;
+	esac
+	unpack ${ONLYA}
+}
+
+src_prepare() {
+	# Force the use of C.utf8 locale
+	# <https://github.com/gentoo-haskell/gentoo-haskell/issues/1287>
+	# <https://github.com/gentoo-haskell/gentoo-haskell/issues/1289>
+	export LC_ALL=C.utf8
+
+	ghc_setup_cflags
+
+	# ghc-9.0.2 release anomaly
+	# https://www.mail-archive.com/search?l=ghc-devs@haskell.org&q=subject:%22Re%5C%3A+%5C%5BHaskell%5C%5D+%5C%5BANNOUNCE%5C%5D+GHC+9.0.2+released%22&o=newest&f=1
+	# https://src.fedoraproject.org/rpms/ghc9.0/blob/rawhide/f/ghc9.0.spec#_327
+	rm -rf "libraries/containers/containers/dist-install" || die
+
+	if ! use ghcbootstrap && [[ ${CHOST} != *-darwin* && ${CHOST} != *-solaris* ]]; then
+		# Modify the wrapper script from the binary tarball to use GHC_PERSISTENT_FLAGS.
+		# See bug #313635.
+		sed -i -e "s|\"\$topdir\"|\"\$topdir\" ${GHC_PERSISTENT_FLAGS}|" \
+			"${WORKDIR}/usr/bin/ghc-${BIN_PV}"
+
+		# allow hardened users use vanilla binary to bootstrap ghc
+		# ghci uses mmap with rwx protection at it implements dynamic
+		# linking on it's own (bug #299709)
+		pax-mark -m "${WORKDIR}/usr/$(get_libdir)/${PN}-${BIN_PV}/bin/ghc"
+	fi
+
+	use llvm && ! use ghcbootstrap && llvmize "${WORKDIR}/usr/bin"
+
+	# binpkg may have been built with FEATURES=splitdebug
+	if [[ -d "${WORKDIR}/usr/lib/debug" ]] ; then
+		rm -rf "${WORKDIR}/usr/lib/debug" || die
+	fi
+	find "${WORKDIR}/usr/lib" -type d -empty -delete 2>/dev/null # do not die on failure here
+
+	# ffi headers don't get included in the binpkg for some reason
+	for f in "${WORKDIR}/usr/$(get_libdir)/${PN}-${BIN_PV}/include/"{ffi.h,ffitarget.h}
+	do
+		mkdir -p "$(dirname "${f}")"
+		[[ -e "${f}" ]] || ln -sf "$($(tc-getPKG_CONFIG) --cflags-only-I libffi | sed "s/-I//g" | tr -d " ")/$(basename "${f}")" "${f}" || die
+	done
+
+	if use binary; then
+		if use prefix; then
+			relocate_ghc "${EPREFIX}"
+		fi
+
+		# Move unpacked files to the expected place
+		mv "${WORKDIR}/usr" "${S}"
+		eapply_user
+	else
+		if ! use ghcbootstrap; then
+			case ${CHOST} in
+				*-darwin* | *-solaris*)
+				# UPDATE ME for ghc-7
+				mkdir "${WORKDIR}"/ghc-bin-installer || die
+				pushd "${WORKDIR}"/ghc-bin-installer > /dev/null || die
+				use sparc-solaris && unpack ghc-6.10.4-sparc-sun-solaris2.tar.bz2
+				use x86-solaris && unpack ghc-7.0.3-i386-unknown-solaris2.tar.bz2
+				use x86-macos && unpack ghc-7.4.1-i386-apple-darwin.tar.bz2
+				use x64-macos && unpack ghc-7.4.1-x86_64-apple-darwin.tar.bz2
+				popd > /dev/null
+
+				pushd "${WORKDIR}"/ghc-bin-installer/ghc-[67].?*.? > /dev/null || die
+				# fix the binaries so they run, on Solaris we need an
+				# LD_LIBRARY_PATH which has our prefix libdirs, on
+				# Darwin we need to replace the frameworks with our libs
+				# from the prefix fix before installation, because some
+				# of the tools are actually used during configure/make
+				if [[ ${CHOST} == *-solaris* ]] ; then
+					export LD_LIBRARY_PATH="${EPREFIX}/$(get_libdir):${EPREFIX}/usr/$(get_libdir):${LD_LIBRARY_PATH}"
+				elif [[ ${CHOST} == *-darwin* ]] ; then
+					local readline_framework=GNUreadline.framework/GNUreadline
+					local gmp_framework=/opt/local/lib/libgmp.10.dylib
+					local ncurses_file=/opt/local/lib/libncurses.5.dylib
+					for binary in $(scanmacho -BRE MH_EXECUTE -F '%F' .) ; do
+						install_name_tool -change \
+							${readline_framework} \
+							"${EPREFIX}"/lib/libreadline.dylib \
+							${binary} || die
+						install_name_tool -change \
+							${gmp_framework} \
+							"${EPREFIX}"/usr/lib/libgmp.dylib \
+							${binary} || die
+						install_name_tool -change \
+							${ncurses_file} \
+							"${EPREFIX}"/usr/lib/libncurses.dylib \
+							${binary} || die
+					done
+					# we don't do frameworks!
+					sed -i \
+						-e 's/\(frameworks = \)\["GMP"\]/\1[]/g' \
+						-e 's/\(extraLibraries = \)\["m"\]/\1["m","gmp"]/g' \
+						rts/package.conf.in || die
+				fi
+
+				# it is autoconf, but we really don't want to give it too
+				# many arguments, in fact we do the make in-place anyway
+				./configure --prefix="${WORKDIR}"/usr || die
+				make install || die
+				popd > /dev/null
+				;;
+				*)
+				relocate_ghc "${WORKDIR}"
+				;;
+			esac
+		fi
+
+		sed -i -e "s|\"\$topdir\"|\"\$topdir\" ${GHC_PERSISTENT_FLAGS}|" \
+			"${S}/ghc/ghc.wrapper"
+
+		cd "${S}" # otherwise eapply will break
+
+		eapply "${FILESDIR}"/${PN}-9.0.2-CHOST-prefix.patch
+		eapply "${FILESDIR}"/${PN}-9.0.2-darwin.patch
+		# Fixes panic when compiling some packages
+		# https://github.com/gentoo-haskell/gentoo-haskell/issues/1250#issuecomment-1044257595
+		# https://gitlab.haskell.org/ghc/ghc/-/issues/21097
+		eapply "${FILESDIR}/${PN}-9.0.2-modorigin-semigroup.patch"
+		# Needed for testing with python-3.10
+		use test && eapply "${FILESDIR}/${PN}-9.0.2-fix-tests-python310.patch"
+		eapply "${FILESDIR}"/${PN}-8.10.1-allow-cross-bootstrap.patch
+		eapply "${FILESDIR}"/${PN}-9.0.2-disable-unboxed-arrays.patch
+		eapply "${FILESDIR}"/${PN}-9.0.2-llvm-13.patch
+		eapply "${FILESDIR}"/${PN}-9.0.2-llvm-14.patch
+		eapply "${FILESDIR}"/latomic-subword
+		eapply "${WORKDIR}"/${P}-riscv64-llvm.patch
+		eapply "${FILESDIR}"/${PN}-9.0.2-fptools.patch # clang-16 workaround
+		eapply "${FILESDIR}"/${PN}-9.0.2-sphinx-6.patch
+
+		# mingw32 target
+		pushd "${S}/libraries/Win32"
+			eapply "${FILESDIR}"/${PN}-8.2.1_rc1-win32-cross-2-hack.patch # bad workaround
+		popd
+
+		bump_libs
+
+		eapply_user
+		# as we have changed the build system
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	if ! use binary; then
+		# initialize build.mk
+		echo '# Gentoo changes' > mk/build.mk
+
+		# Put docs into the right place, ie /usr/share/doc/ghc-${GHC_PV}
+		echo "docdir = ${EPREFIX}/usr/share/doc/$(cross)${PF}" >> mk/build.mk
+		echo "htmldir = ${EPREFIX}/usr/share/doc/$(cross)${PF}" >> mk/build.mk
+
+		# We also need to use the GHC_FLAGS flags when building ghc itself
+		echo "SRC_HC_OPTS+=${HCFLAGS} ${GHC_FLAGS}" >> mk/build.mk
+		echo "SRC_CC_OPTS+=${CFLAGS}" >> mk/build.mk
+		echo "SRC_LD_OPTS+=${LDFLAGS}" >> mk/build.mk
+		# Speed up initial Cabal bootstrap
+		echo "utils/ghc-cabal_dist_EXTRA_HC_OPTS+=$(ghc-make-args)" >> mk/build.mk
+
+		# We can't depend on haddock except when bootstrapping when we
+		# must build docs and include them into the binary .tbz2 package
+		# app-text/dblatex is not in portage, can not build PDF or PS
+		echo "BUILD_SPHINX_PDF  = NO"  >> mk/build.mk
+		echo "BUILD_SPHINX_HTML = $(usex doc YES NO)" >> mk/build.mk
+		echo "BUILD_MAN = $(usex doc YES NO)" >> mk/build.mk
+
+		# this controls presence on 'xhtml' and 'haddock' in final install
+		echo "HADDOCK_DOCS       = YES" >> mk/build.mk
+
+		# not used outside of ghc's test
+		if [[ -n ${GHC_BUILD_DPH} ]]; then
+				echo "BUILD_DPH = YES" >> mk/build.mk
+			else
+				echo "BUILD_DPH = NO" >> mk/build.mk
+		fi
+
+		# Any non-native build has to skip as it needs
+		# target haddock binary to be runnabine.
+		if ! is_native; then
+			# disable docs generation as it requires running stage2
+			echo "HADDOCK_DOCS=NO" >> mk/build.mk
+			echo "BUILD_SPHINX_HTML=NO" >> mk/build.mk
+			echo "BUILD_SPHINX_PDF=NO" >> mk/build.mk
+		fi
+
+		if is_crosscompile; then
+			# Install ghc-stage1 crosscompiler instead of
+			# ghc-stage2 cross-built compiler.
+			echo "Stage1Only=YES" >> mk/build.mk
+		fi
+
+		# allows overriding build flavours for libraries:
+		# v   - vanilla (static libs)
+		# p   - profiled
+		# dyn - shared libraries
+		# example: GHC_LIBRARY_WAYS="v dyn"
+		if [[ -n ${GHC_LIBRARY_WAYS} ]]; then
+			echo "GhcLibWays=${GHC_LIBRARY_WAYS}" >> mk/build.mk
+		fi
+		echo "BUILD_PROF_LIBS = $(usex profile YES NO)" >> mk/build.mk
+
+		# Get ghc from the unpacked binary .tbz2
+		# except when bootstrapping we just pick ghc up off the path
+		if ! use ghcbootstrap; then
+			export PATH="${WORKDIR}/usr/bin:${PATH}"
+		fi
+
+		echo "BIGNUM_BACKEND = $(usex gmp gmp native)" >> mk/build.mk
+
+		# don't strip anything. Very useful when stage2 SIGSEGVs on you
+		echo "STRIP_CMD = :" >> mk/build.mk
+
+		local econf_args=()
+
+		# GHC embeds toolchain it was built by and uses it later.
+		# Don't allow things like ccache or versioned binary slip.
+		# We use stable thing across gcc upgrades.
+		# User can use EXTRA_ECONF=CC=... to override this default.
+		econf_args+=(
+			AR=${CTARGET}-ar
+			CC=${CTARGET}-gcc
+			# these should be inferred by GHC but ghc defaults
+			# to using bundled tools on windows.
+			Windres=${CTARGET}-windres
+			DllWrap=${CTARGET}-dllwrap
+			# we set the linker explicitly below
+			--disable-ld-override
+		)
+		case ${CTARGET} in
+			arm*)
+				# ld.bfd-2.28 does not work for ghc. Force ld.gold
+				# instead. This should be removed once gentoo gets
+				# a fix for R_ARM_COPY bug: https://sourceware.org/PR16177
+				econf_args+=(LD=${CTARGET}-ld.gold)
+			;;
+			sparc*)
+				# ld.gold-2.28 does not work for ghc. Force ld.bfd
+				# instead. This should be removed once gentoo gets
+				# a fix for missing --no-relax support bug:
+				# https://sourceware.org/ml/binutils/2017-07/msg00183.html
+				econf_args+=(LD=${CTARGET}-ld.bfd)
+			;;
+			*)
+				econf_args+=(LD=${CTARGET}-ld)
+		esac
+
+		if [[ ${CBUILD} != ${CHOST} ]]; then
+			# GHC bug: ghc claims not to support cross-building.
+			# It does, but does not distinct --host= value
+			# for stage1 and stage2 compiler.
+			econf_args+=(--host=${CBUILD})
+		fi
+
+		if use ghcmakebinary; then
+			# When building booting libary we are trying to
+			# bundle or restrict most of external depends
+			# with unstable ABI:
+			#  - embed libffi (default GHC behaviour)
+			#  - disable ncurses support for ghci (via haskeline)
+			#    https://bugs.gentoo.org/557478
+			#  - disable ncurses support for ghc-pkg
+			echo "libraries/haskeline_CONFIGURE_OPTS += --flag=-terminfo" >> mk/build.mk
+			echo "utils/ghc-pkg_HC_OPTS += -DBOOTSTRAPPING" >> mk/build.mk
+		elif is_native; then
+			# using ${GTARGET}'s libffi is not supported yet:
+			# GHC embeds full path for ffi includes without /usr/${CTARGET} account.
+			econf_args+=(--with-system-libffi)
+			econf_args+=(--with-ffi-includes=$($(tc-getPKG_CONFIG) libffi --cflags-only-I | sed -e 's@^-I@@'))
+		fi
+
+		einfo "Final mk/build.mk:"
+		cat mk/build.mk || die
+
+		econf ${econf_args[@]} \
+			--enable-bootstrap-with-devel-snapshot \
+			$(use_enable elfutils dwarf-unwind) \
+			$(use_enable numa) \
+			$(use_enable unregisterised)
+
+		if [[ ${PV} == *9999* ]]; then
+			GHC_PV="$(grep 'S\[\"PACKAGE_VERSION\"\]' config.status | sed -e 's@^.*=\"\(.*\)\"@\1@')"
+			GHC_P=${PN}-${GHC_PV}
+		fi
+	fi # ! use binary
+}
+
+src_compile() {
+	if ! use binary; then
+		# Stage1Only crosscompiler does not build stage2
+		if ! is_crosscompile; then
+			# 1. build/pax-mark compiler binary first
+			emake ghc/stage2/build/tmp/ghc-stage2
+			# 2. pax-mark (bug #516430)
+			pax-mark -m ghc/stage2/build/tmp/ghc-stage2
+			# 2. build/pax-mark haddock using ghc-stage2
+			if is_native; then
+				# non-native build does not build haddock
+				# due to HADDOCK_DOCS=NO, but it could.
+				emake utils/haddock/dist/build/tmp/haddock
+				pax-mark -m utils/haddock/dist/build/tmp/haddock
+			fi
+		fi
+		# 3. and then all the rest
+		emake all
+	fi # ! use binary
+}
+
+src_test() {
+	# TODO: deal with:
+	#    - sandbox (pollutes environment)
+	#    - extra packages (to extend testsuite coverage)
+	# bits are taken from 'validate'
+	local make_test_target='test' # can be fulltest
+	# not 'emake' as testsuite uses '$MAKE' without jobserver available
+	make $make_test_target stage=2 THREADS=$(makeopts_jobs)
+}
+
+src_install() {
+	if use binary; then
+		use prefix && mkdir -p "${ED}"
+		mv "${S}/usr" "${ED}"
+	else
+		[[ -f VERSION ]] || emake VERSION
+
+		# -j1 due to a rare race in install script:
+		#    make --no-print-directory -f ghc.mk phase=final install
+		#    /usr/lib/portage/python3.4/ebuild-helpers/xattr/install -c -m 755 \
+		#        -d "/tmp/portage-tmpdir/portage/cross-armv7a-unknown-linux-gnueabi/ghc-9999/image/usr/lib64/armv7a-unknown-linux-gnueabi-ghc-8.3.20170404/include"
+		#    /usr/lib/portage/python3.4/ebuild-helpers/xattr/install -c -m 644  utils/hsc2hs/template-hsc.h \
+		#           "/tmp/portage-tmpdir/portage/cross-armv7a-unknown-linux-gnueabi/ghc-9999/image/usr/lib64/armv7a-unknown-linux-gnueabi-ghc-8.3.20170404"
+		#    /usr/bin/install: cannot create regular file \
+		#           '/tmp/portage-tmpdir/portage/cross-armv7a-unknown-linux-gnueabi/ghc-9999/image/usr/lib64/armv7a-unknown-linux-gnueabi-ghc-8.3.20170404': No such file or directory
+		emake -j1 install DESTDIR="${D}"
+
+		use llvm && llvmize "${ED}/usr/bin"
+
+		# Skip for cross-targets as they all share target location:
+		# /usr/share/doc/ghc-9999/
+		if ! is_crosscompile; then
+			dodoc "distrib/README" "LICENSE" "VERSION"
+		fi
+
+		# rename ghc-shipped files to avoid collision
+		# of external packages. Motivating example:
+		#  user had installed:
+		#      dev-lang/ghc-7.8.4-r0 (with transformers-0.3.0.0)
+		#      dev-haskell/transformers-0.4.2.0
+		#  then user tried to update to
+		#      dev-lang/ghc-7.8.4-r1 (with transformers-0.4.2.0)
+		#  this will lead to single .conf file collision.
+		local shipped_conf renamed_conf
+		local package_confdir="${ED}/usr/$(get_libdir)/$(cross)${GHC_P}/package.conf.d"
+		for shipped_conf in "${package_confdir}"/*.conf; do
+			# rename 'pkg-ver-id.conf' to 'pkg-ver-id-gentoo-${PF}.conf'
+			renamed_conf=${shipped_conf%.conf}-gentoo-${PF}.conf
+			mv "${shipped_conf}" "${renamed_conf}" || die
+		done
+
+		# remove link, but leave 'haddock-${GHC_P}'
+		rm -f "${ED}"/usr/bin/$(cross)haddock
+
+		if ! is_crosscompile; then
+			newbashcomp "${FILESDIR}"/ghc-bash-completion ghc-pkg
+			newbashcomp utils/completion/ghc.bash         ghc
+		fi
+	fi
+
+	# path to the package.cache
+	local package_confdir="${ED}/usr/$(get_libdir)/$(cross)${GHC_P}/package.conf.d"
+	PKGCACHE="${package_confdir}"/package.cache
+	# copy the package.conf.d, including timestamp, save it so we can help
+	# users that have a broken package.conf.d
+	cp -pR "${package_confdir}"{,.initial} || die "failed to backup intial package.conf.d"
+
+	# copy the package.conf, including timestamp, save it so we later can put it
+	# back before uninstalling, or when upgrading.
+	cp -p "${PKGCACHE}"{,.shipped} \
+		|| die "failed to copy package.conf.d/package.cache"
+
+	if is_crosscompile; then
+		# When we build a cross-compiler the layout is the following:
+		#     usr/lib/${CTARGET}-ghc-${VER}/ contains target libraries
+		# but
+		#     usr/lib/${CTARGET}-ghc-${VER}/bin/ directory
+		# containst host binaries (modulo bugs).
+
+		# Portage's stripping mechanism does not skip stripping
+		# foreign binaries. This frequently causes binaries to be
+		# broken.
+		#
+		# Thus below we disable stripping of target libraries and allow
+		# stripping hosts executables.
+		dostrip -x "/usr/$(get_libdir)/$(cross)${GHC_P}"
+		dostrip    "/usr/$(get_libdir)/$(cross)${GHC_P}/bin"
+	fi
+}
+
+pkg_preinst() {
+	# have we got an earlier version of ghc installed?
+	if has_version "<${CATEGORY}/${PF}"; then
+		haskell_updater_warn="1"
+	fi
+}
+
+pkg_postinst() {
+	ghc-reregister
+
+	# path to the package.cache
+	PKGCACHE="${EROOT}/usr/$(get_libdir)/$(cross)${GHC_P}/package.conf.d/package.cache"
+
+	# give the cache a new timestamp, it must be as recent as
+	# the package.conf.d directory.
+	touch "${PKGCACHE}"
+
+	if [[ "${haskell_updater_warn}" == "1" ]]; then
+		ewarn
+		ewarn "\e[1;31m************************************************************************\e[0m"
+		ewarn
+		ewarn "You have just upgraded from an older version of GHC."
+		ewarn "You may have to run"
+		ewarn "      'haskell-updater'"
+		ewarn "to rebuild all ghc-based Haskell libraries."
+		ewarn
+		ewarn "\e[1;31m************************************************************************\e[0m"
+		ewarn
+	fi
+}
+
+pkg_prerm() {
+	PKGCACHE="${EROOT}/usr/$(get_libdir)/$(cross)${GHC_P}/package.conf.d/package.cache"
+	rm -rf "${PKGCACHE}"
+
+	cp -p "${PKGCACHE}"{.shipped,}
+}
+
+pkg_postrm() {
+	ghc-package_pkg_postrm
+}
diff --git a/dev-lang/jsonnet/Manifest b/dev-lang/jsonnet/Manifest
index fcb6649430fd..96b3b36ea47d 100644
--- a/dev-lang/jsonnet/Manifest
+++ b/dev-lang/jsonnet/Manifest
@@ -5,5 +5,5 @@ AUX jsonnet-0.18.0-unbundle.patch 2564 BLAKE2B 8945b6b17af162a99b7d561a68a48c218
 DIST jsonnet-0.19.0.tar.gz 22478380 BLAKE2B 0a1612ca0525342763099e70921181578fcf7ab25c2a3811ffede944953e4ce114f1949642038d6147c96d52193cf701473fab8581d50c3e74036139fbd5c19a SHA512 f4e30d977df7840a4f13c7ba75614badd964a5c4484fb264d7b05d6de04aa2a2d3c4c5161523d6fa6559460ea94b94562b07ea6590a34876545c529474c4b9fa
 DIST jsonnet-0.19.1.tar.gz 22480685 BLAKE2B 7d86bc963f5ced622e91adf015c250b8cae2e817b6af5d60820d8731e04caecc1b2b8142d320414d253ef1fa3558d61aeb1b59480eab0823915d2b15c5d87aab SHA512 21312de71f63f4a74005f563290d67fcc2d220f043291a123af2fc834f4118f8bbc311ea8acc5dd52b13eff8c32f026a5ce6bfe3d88b4c6c770e585dd1f0b688
 EBUILD jsonnet-0.19.0-r1.ebuild 2128 BLAKE2B df21dbc4afbca5992a0a8841c155aa63ddb83eeb716c7257c185097688fa87a8a2fb706299bcc19e0235acd650249034a7e2e39b1d8ebec7987d97dee10e4ebf SHA512 b9c20cd3cb195500537c9df8c47c59c1de77e2fcad365447297651de0c787085b5d2abb132aac2407ecf8f82b63e4a7e58f3de275aaf929ff5b9fecf4bf4f678
-EBUILD jsonnet-0.19.1.ebuild 2132 BLAKE2B c63db218e41f4a4d433720792dfcc6c2e702af93e040a04c04ec52ab91f8b5bfd1da56fdc4c15bf174a1104c8a9b0c3a8959ff4a47afaeb85000b52c841b44e7 SHA512 b7ee0b2a2899edaa30e2343e9d97b03b25d5fe6a4b8a17ff48fc2fc064ffd9b93b6a495daae410c358843ee2b28e907db3076644f1821887e71242eed8aac2a9
+EBUILD jsonnet-0.19.1.ebuild 2139 BLAKE2B e7190af8fbe34753a46876881b1bac40d2f1b5f221cfd039abe3438b23cad4649b8ad91581f14626b36d7b108675654e6ecdf20cb327038bcd6d8da8fbee114d SHA512 d5da70267a27785c57b7be29ff92c87d7469029e7125d08ca9eb379a8891e3886b404789b1ddfe656a5753da620b1a0122041ab047bf90511364727cf8484ffa
 MISC metadata.xml 636 BLAKE2B b4f30bead9e90492366ba9d8fd393cfa6610efcb1dbe7cf11307445f2b7aa596585b576e550aa0df3bcfd14c7a8b068d09040ea94dc815db76d6d15e0f09fccb SHA512 a106617bce041fc24e1fab61d08add74f450742e7c1be14633cd49b5137c86cf52bd5baf9ea8f5f2f51a90619c7dfad7e6bf749894d8e4df8063857f29a0492a
diff --git a/dev-lang/jsonnet/jsonnet-0.19.1.ebuild b/dev-lang/jsonnet/jsonnet-0.19.1.ebuild
index c2eeb2521f6c..8e5c294e6207 100644
--- a/dev-lang/jsonnet/jsonnet-0.19.1.ebuild
+++ b/dev-lang/jsonnet/jsonnet-0.19.1.ebuild
@@ -16,7 +16,7 @@ IUSE="custom-optimization doc examples python test"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 RDEPEND="
 	dev-cpp/rapidyaml:=
 	dev-cpp/nlohmann_json:=
diff --git a/dev-lua/Manifest.gz b/dev-lua/Manifest.gz
index 682a4c01f2e2..e26b1e92d380 100644
--- a/dev-lua/Manifest.gz
+++ b/dev-lua/Manifest.gz
diff --git a/dev-lua/luarocks/Manifest b/dev-lua/luarocks/Manifest
index f146e0dc7795..8cd81ed41a4f 100644
--- a/dev-lua/luarocks/Manifest
+++ b/dev-lua/luarocks/Manifest
@@ -1,5 +1,5 @@
 DIST luarocks-3.9.1.tar.gz 253375 BLAKE2B 6d622e87dc385d0851ef6366e0b6832f1a453d2590c090b06ec6ab81b8a15930c1496bf2ac00ed6b15a44dfbc43b1f235092947389714b72f3442f802236fab3 SHA512 2dfc1326118c2868b05a17acc5fe8d2c07503ef2bb3f2560a3d7ce385b85893d593bacfab7086c57923f042d7e7cfd09a0a9795afc473a73edbba0a44d23ed60
 DIST luarocks-3.9.2.tar.gz 256117 BLAKE2B eebbad38dd71b0318852a177d394df5fd20e807d566893a2338526e76e17daf2436309e512dd50b325914b2d84b90ef857396bfd6d41f22893131ed78931b8ad SHA512 7e93164bdcf35338e993822931a8e59957ab69c6e23236a7a075649c2f7cd173305c4ca6e9d115fc5e282cb76c21754d7adac92b21885006e5ee3bc06a9d0059
 EBUILD luarocks-3.9.1.ebuild 2032 BLAKE2B e45bdc7e716298f0834e042a2693a012483fadc1136feb43a7b6cd1dd1aafffcf9c66fd89bd4b9a5862bae63ce33f3dc92700a65f503b9b4e0fadcae4d8ec5d0 SHA512 66cc22c41de85c3c49defe5b0b031a375c1e9eebcee8779a91fb89784e237d4ce0648a7198daa64b2812f74fba7daedb2fcab84413a7005a891176f80c48b4fd
-EBUILD luarocks-3.9.2.ebuild 2036 BLAKE2B 96cd67a94991f1cd72f87fbd3081b2b6045c479c4a13f8f70b648b2dbb6a21d9e11442603f7ab7bd255dfc1a477c70cef0bb057d6ab871e1be8bb049eb648304 SHA512 75069c2eaf57815d9528d851afe4c29b14e64c5f0887d9103c12a6b57b7e8ae63d48f036471bcdb22837712410357d007d389a3339dcdeba1b841573514f7388
+EBUILD luarocks-3.9.2.ebuild 2032 BLAKE2B 734eb895b3d1005336cb528b212e2eb2283b5092fee5566c7479b512f5ff3513860163564b13d233c852bef812c5b6410f95ba7739af57ec6f6dcb270e8cea0f SHA512 3ab41e559dbd2fbab1505981eb98eb159de506f16ba6b239b80db9c23caf95fc2d3f59ee283816573335407df99f10a3d9f93cd91ea559c53e179405f16f846f
 MISC metadata.xml 501 BLAKE2B 0a2a3e7358a2ef2a4cbb79853408dfdf6015d49348bbb879a59253a88c73cf3d96c2ce708076844344468136d70962be74e639d24331a007fbd02ce6ccc18cee SHA512 43f147be67209e542e02733b6a57ce7ee05b61a7eb0d15662c0fb137db4f57c9f519cc98cf5dceb0e6f626f0dc6f04dd5b67da96a155b1e3884dca55896722f3
diff --git a/dev-lua/luarocks/luarocks-3.9.2.ebuild b/dev-lua/luarocks/luarocks-3.9.2.ebuild
index 7928ca87e717..8756903989dc 100644
--- a/dev-lua/luarocks/luarocks-3.9.2.ebuild
+++ b/dev-lua/luarocks/luarocks-3.9.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ SRC_URI="https://luarocks.org/releases/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="test"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 RESTRICT="test"
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 2a8607fa8043..e99340a6c1bd 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/capistrano/Manifest b/dev-ruby/capistrano/Manifest
index dc0396978272..2f60e388d36a 100644
--- a/dev-ruby/capistrano/Manifest
+++ b/dev-ruby/capistrano/Manifest
@@ -3,8 +3,10 @@ DIST capistrano-2.15.5.gem 132096 BLAKE2B bbaa6bd482cf9bbe7aa01540aa5dab3f32401f
 DIST capistrano-3.16.0.gem 69120 BLAKE2B 3e1c4f639c2d5cd36ae305746f53e68350d5eee39fbd5c5ec828ea5b69f47a3a5f8b4e6f4b65de2e24717f71cf4a9443879fc3d076474ab020e2023372085180 SHA512 ec5aa465065cd115f0a1b7db06b7c68f2034e81feb3b814b730a6aca464756e545fd5c065ea941a3076bb637448e2a0f04aeb56de2578cdf22a6f208d27a2219
 DIST capistrano-3.17.0.gem 69632 BLAKE2B 57430e8e73bddb11d170c579cae8b2fa6bd1390b5aaeb5e41a81a17ffb84d02623a4ca27c518b0d2ba16c78a639d34e05e68d1fad0d94afadecb846e7d515ea1 SHA512 d4298c1d71d51a3cb5216a23fb1181ba11f544a9572939b95f1f7fef80f64e6ebb2eb5cda4b22a77092ec0bb7d7aaa2d72eff88d715290cb989b78033d6053e5
 DIST capistrano-3.17.1.gem 69632 BLAKE2B 7457f3e3dfc102f2612dda6c976ab05e14a86cdbd39df67a15e190a9998103b9dcc06db1f8d5bcab9bdd6c274f459f40de084a229c183362986dfc58ec07c44b SHA512 68882795d735870b1e5821c3583e2c9366ad5ecb2a413e9488e31010a321368bca3298af020010a0fe90b0c930fbff54bb6e85effdde106dbf92b09e3285721d
+DIST capistrano-3.17.2.gem 69632 BLAKE2B e2d1c16d7b4118593e5e8741dff0fdebd69af61db9c2796faeeadfdaabf04577775b2092917c60eba6d213680dba6d241b4b4ac1295e74da11c607fb54392ae3 SHA512 2c8943eda6dab2c4016c5eb86773040a4a0640e58405115f56c9c8c02dfd06bf2c7a98a0a0bee5d5c77dde16b262ab7131210bbba8ae1b5a8f5172cae76492a3
 EBUILD capistrano-2.15.5-r3.ebuild 1242 BLAKE2B 897aade0a14bb37ae8e4af5709c5e32f37d87104359dc871445572618d70ddb14125c523b2aa3a3f0d915d30a48fc256d0b2ca7ef93cb1492b84e65e72eadcd7 SHA512 68afb2c8060adf5c0c774725e852603c624cd3699a296aaddd5ceedad7b87faf1d9f2574b0bdb811eeaff0e9110ec4f94bd472e0262894ac6653faa773c17861
 EBUILD capistrano-3.16.0.ebuild 925 BLAKE2B bc050c047edfae2e35d848149c247626aab342d588798355d85ec1cb17b60aaa0fc015468a0ad0c1d8264db412e6c963592aabbdef393ff5e0e218efd9e614a2 SHA512 3ec663167b9bab9dfef3cf44ffe55b3ee210d1e8f4bbbfef339211016993183167af5c13b5af13ef3fb987c7b735a629c358d8249f4ae4d4ba6a9070d0fb6215
 EBUILD capistrano-3.17.0.ebuild 926 BLAKE2B dbd96f5f51179cc81d891327b4892e42a514a968c7d6d5a7d6d6de438aece07d645f57bc4d2e5874b9a10f93d9e2b94bde9f6987d4d4b182d162f5d90f9fdd61 SHA512 0505cd440669002ef853f492d00eaed7f79de8644c66e55b9ead5f51b9e4f1c7eff73fc1f8236578083a953678ebb02b0e87c3c2c7a256ee78d76a934096ea4d
 EBUILD capistrano-3.17.1.ebuild 968 BLAKE2B 831e6afdad208fa03c43414a69963d20e6325d36a1722527304930a709ba5bb169567f94e864be9b4c69d192e08a509258b2a1f4a1eec3f50100669f52762453 SHA512 6f037d14d3dd6e15d0a2e55bec71006e9e7b9a744e4a2430436c07296bdd7529632cd05a220f3c173170d513e6d0a799fa9df4f314b301ca0108c27ce5e4682b
+EBUILD capistrano-3.17.2.ebuild 969 BLAKE2B 5c55d95329289b5a3039f12c6a9753ff80e735c64428d8f06b163335e60666301bf6ed88eefc95f41e56ffa76d78c602acf4201fc8b93367df4411d43ccae207 SHA512 6b8b7a0a74fb4171f7380b6794f98baf1c87ed24d5557775612296be7066687df9f520e7182a88ae4db86d0294e063c09584e18ce16564d9626d43f5668158d8
 MISC metadata.xml 396 BLAKE2B d27f0009de40add27cbe4a8a668ac4a82fa98eef30d794c61add8ad293db7e6b76c948499646c1dc23046cd4d88cfb36b41c1c14ebf78316ba6a4547493edb87 SHA512 98a3ccc2e6734e249cfb13754015cbd79485d20bc018312f7ff8500fa3c011db88c3955990a97da714dc6af7a6c94196057839eb76fd1612f30dba9e623ee0a6
diff --git a/dev-ruby/capistrano/capistrano-3.17.2.ebuild b/dev-ruby/capistrano/capistrano-3.17.2.ebuild
new file mode 100644
index 000000000000..9fda8211bc2e
--- /dev/null
+++ b/dev-ruby/capistrano/capistrano-3.17.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby27 ruby30"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A distributed application deployment system"
+HOMEPAGE="https://capistranorb.com/"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "
+	>=dev-ruby/airbrussh-1.0.0
+	>=dev-ruby/sshkit-1.9:0
+	>=dev-ruby/rake-10.0.0
+	dev-ruby/i18n:*"
+ruby_add_bdepend "
+	test? (	dev-ruby/mocha )"
+
+all_ruby_prepare() {
+	# Avoid specs that depend on capistrano already being installed
+	rm -f spec/lib/capistrano/doctor/gems_doctor_spec.rb || die
+
+	# Avoid specs that require a TTY
+	sed -i -e '/asking for a variable/,/^  end/ s:^:#:' spec/integration/dsl_spec.rb || die
+	rm -f spec/lib/capistrano/configuration/question_spec.rb spec/lib/capistrano/doctor/output_helpers_spec.rb || die
+}
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index c2fe9f4558a7..2c29ad07203a 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/curtail/Manifest b/media-gfx/curtail/Manifest
new file mode 100644
index 000000000000..56229faaf11b
--- /dev/null
+++ b/media-gfx/curtail/Manifest
@@ -0,0 +1,3 @@
+DIST curtail-1.3.1.tar.gz 176042 BLAKE2B 0757c3c3eed24fea8f1493021d30df40fd8c78dad3bfd7f63cfaa83f36d36f69c47ba4e41a53a7a4299d436fb978ae3fc31afa07b5a1c9d82a6400a17c104966 SHA512 47d1b3939eaeaa3d27c497318bc80d0b7cb1c2674d66ed17c8cc5e6206b3efce7867ff01542b40ee6a4b4127160f2baed084b5b99cf518f2438dcf53af425f89
+EBUILD curtail-1.3.1.ebuild 1173 BLAKE2B 1bc7a4b07a3b48c864d1b6f92805089a291d52c2005fab104195a436f98c033ad7236c94ef96011756d9fc86ac0b3e8d460ce7fee317401d769d7d5507eb70d7 SHA512 689cc982d7ebd0bbfae301d568d9e186e9de45c56702e2bd5f686c984052334692366c04cd5ee9accbe8d7c2e5668165f0c6ae1da6f873c930d6be89c1e854ce
+MISC metadata.xml 817 BLAKE2B ea01ae4c58024699aae770d6e7f21a03adfc8da5f5f658a0b1708824bfda730a2fce4557de4fbccbc079c66a11ab08d6faef020bf897d47870f6581b5e0d68e6 SHA512 3d573feda8c750a08903203c1d2f2e1385e17242356c6f319e29944e530b2199a27e4e432a806dfe1f2c8c783dd67c4fe347d5160d4df99911f67623a3168eee
diff --git a/media-gfx/curtail/curtail-1.3.1.ebuild b/media-gfx/curtail/curtail-1.3.1.ebuild
new file mode 100644
index 000000000000..0077c4c0406c
--- /dev/null
+++ b/media-gfx/curtail/curtail-1.3.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit gnome2-utils meson python-single-r1 xdg
+
+DESCRIPTION="Image compressor, supporting PNG, JPEG and WebP"
+HOMEPAGE="https://github.com/Huluti/Curtail/"
+SRC_URI="https://github.com/Huluti/${PN^}/archive/${PV}.tar.gz
+	-> ${P}.tar.gz"
+S="${WORKDIR}"/${P^}
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="test"  # Just desktop / schema / appstream file validation (fails).
+
+RDEPEND="
+	${PYTHON_DEPS}
+	>=x11-libs/gtk+-3.20:3[introspection]
+	$(python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
+"
+BDEPEND="
+	${RDEPEND}
+	dev-libs/appstream-glib
+	dev-util/desktop-file-utils
+"
+RDEPEND+="
+	media-gfx/jpegoptim
+	media-gfx/optipng
+	media-gfx/pngquant
+	media-libs/libwebp
+"
+
+DOCS=( CHANGELOG.md README.md )
+
+src_prepare() {
+	sed -i "s|@PYTHON@|${PYTHON}|" "${S}"/src/${PN}.in || die
+
+	default
+}
+
+src_install() {
+	meson_src_install
+	python_optimize
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/media-gfx/curtail/metadata.xml b/media-gfx/curtail/metadata.xml
new file mode 100644
index 000000000000..f46007665087
--- /dev/null
+++ b/media-gfx/curtail/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="person">
+    <email>xgqt@gentoo.org</email>
+    <name>Maciej Barć</name>
+  </maintainer>
+  <longdescription>
+    Curtail (previously ImCompressor) is an useful image compressor, supporting
+    PNG, JPEG and WebP file types. It support both lossless and lossy
+    compression modes with an option to whether keep or not metadata of images.
+    It is inspired by Trimage and Image-Optimizer.
+  </longdescription>
+  <upstream>
+    <changelog>https://raw.githubusercontent.com/Huluti/Curtail/master/CHANGELOG.md</changelog>
+    <bugs-to>https://github.com/Huluti/Curtail/issues/</bugs-to>
+    <remote-id type="github">Huluti/Curtail</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/media-gfx/freecad/Manifest b/media-gfx/freecad/Manifest
index 7e9703f2dfde..13843ca43b96 100644
--- a/media-gfx/freecad/Manifest
+++ b/media-gfx/freecad/Manifest
@@ -3,6 +3,6 @@ AUX freecad-0.19.4-Gentoo-specific-don-t-check-vcs.patch 701 BLAKE2B 963afb463ac
 DIST freecad-0.20.1.tar.gz 75545072 BLAKE2B be2d2970b80523b34f7400a2762f997b815a5ae90dcb6cee6e560316712ebe3ab8a64053bd73e9f50548ff076920af0304a6780c94c4f3708d30b82bbee3b5d9 SHA512 ab4cfab4008300b8273769b9395602261c88c19f0893dabe6498a2eac020f1fe3fbf7284928144f1d4147d8627a47d83a40a1777a298673da2e24d956006d827
 DIST freecad-0.20.2.tar.gz 75555561 BLAKE2B 278b05a3fe3bdccb46da62926aee46f066cb073f034b273dc4d8b27975724b754a6822b7eb0b673500db4592237690decb830cc7a30e8da689c6b067c256d4f8 SHA512 c3acd77dd2bb9a2a23ac354da3b6102effb89c95d675e91421d65486414dfe8cc0188a7212245e0deb63f17b9c5df76133017be09e4cd14b833be8cbec52a08d
 EBUILD freecad-0.20.1.ebuild 9813 BLAKE2B 39713988546185e5a44b59f6726c0cb6aff8ae7cb949c0b88483fcd229b35d3a347151db10d80ea08378d2c400a0e6219f135a75e76af87d39306bbee68095b4 SHA512 5f0e9c1b9ddc1a0da8898aa93496856a58d0486c307219c6382190c2f8b309817527c06a89fd894726dbe9133343ea474eb9094bbf3911c8f8856638810d3984
-EBUILD freecad-0.20.2.ebuild 9859 BLAKE2B 49c62b3e7793a3df3f1d7e0aae6795f3d67ab1b4645356701920522104c1d59565fab0996b367de338ab704a6685691d321e0494729292155b7e033a95bab14b SHA512 1a6a730bf1a914b1a16d2c5d6b337240bdc8a63969bdb78d325513778ddb02667c39f5d876ac5186d227d84d0fb2210662923727871fa8e93b59be39a83653a8
+EBUILD freecad-0.20.2.ebuild 9858 BLAKE2B 254dcc53a8eecf329854e10af1d13bd6995f4d2720268cd0e0e59ca3e5c10385d6edfe18ff1c5a36fe03d4ae0a4bccf4eafa6f778424b9ef281b15e0e368c6e4 SHA512 5e6f6bffadf57ab79b578790e9bf62934f5b598e09cdb8a6f08c07a06ff8a4d8daf297114c88f4abb5400991526abd28bb00cd7be79333b27a8f0f92179b49cb
 EBUILD freecad-9999.ebuild 9822 BLAKE2B 0765e55171d7aea441dae4ca6589779c69a9be7f6ae2ecfc349f031b315af29c5527fa8b45a2c8ea52865b198011dc72d8d61cd88bed743e4ca27333c2561293 SHA512 9f47a5269abe293862d767ba7bb2495134739ec29ecf0664c16381d32edb0961ad28c85d6149f8b822d105ee4346ea3df5a04e8948290d82e0d1c3164eed0ff5
 MISC metadata.xml 3256 BLAKE2B 1dc274ea8c4d8198f53dc6155a2b70cf8952391902a510c11be93bcad4731314f8a4dea0eec465e3b6307c39596a169127d979f17011d0b27280d3860e05a226 SHA512 e201c191df4d8f352660d075bfc729da3b2ac9d87fc8617907c36b142ada3e844257ed19aabc3a017d4bb4a31ff51f1dfa6c430125f3d870106f73d70bc7d53d
diff --git a/media-gfx/freecad/freecad-0.20.2.ebuild b/media-gfx/freecad/freecad-0.20.2.ebuild
index 5459901b4121..c34c4c9425e3 100644
--- a/media-gfx/freecad/freecad-0.20.2.ebuild
+++ b/media-gfx/freecad/freecad-0.20.2.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} = *9999 ]]; then
 	S="${WORKDIR}/freecad-${PV}"
 else
 	SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 	S="${WORKDIR}/FreeCAD-${PV}"
 fi
 
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index bf15216603a6..05b5a8226c95 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/guayadeque/Manifest b/media-sound/guayadeque/Manifest
index 16b8eb10834b..0dcb99f98a33 100644
--- a/media-sound/guayadeque/Manifest
+++ b/media-sound/guayadeque/Manifest
@@ -2,6 +2,8 @@ AUX guayadeque-0.4.5_p20170110-missing-aui-component.patch 404 BLAKE2B 9c1704879
 AUX guayadeque-0.4.6-gcc10.patch 2981 BLAKE2B a925446bca10a9f96a0babe889d151cc49792810c95295a0c0dc17796744b7486307c354fb47c07518e0f33b41cb8428feb1cc355678c78fb731cecf378c0068 SHA512 a998f055ef831bbd30c624b157de31ad847d3a8f838586e40ba7f978e184eb22914e036fb927794e61b432352d888cf808a90dde2e29458e203297e11079d144
 AUX guayadeque-0.4.6-metadata.patch 716 BLAKE2B 2dfd57e859eebfb174b6e66c3b9f11cad4af49a3ad615f1f6e53d7cd86c4e9851c8d7d78ba47ed1785cd2eab4017bc43720e9b3dbf4990d06165355c505fba32 SHA512 5d3d861eebaa629031de6186846353798b7178801d6b7c07344bf75d952891d17f90237986949bc4b12984b8635ae4d1f9fc8a319d2199bd6f22cc7669dcc564
 DIST guayadeque-0.4.6.tar.gz 2074965 BLAKE2B a6076a60f6560f51f1fa1ac7aca0529823d6579726049cfda212ae42e62c6f86ca18e8c06aa60d8e23c8accf51d4363ebe4b69b50ce5224f7db3215c32acf12f SHA512 d353aa492b393a5043cdab2d151d715381c3d9d50cad393ca5687b5c556257641fc2b5eda53772098c8c0621fba88ae693179d07a1085d5b69aab1e5d06459a7
+DIST guayadeque-0.4.7.tar.gz 2192075 BLAKE2B b8f78a0667723d8ae27cc13c435f0309a521b10efc440d6cafca08692ef3a79299824d60bcafba3134255d652371f08adec98b1ac63589627c44d2ee8697d443 SHA512 8b620a2a44cc36866c2a2df14fec086796fab9a955429dc58f5689a90634dcc1a96434ab5dff4bbe8c81d785b9e1d8c91011ec076d4e0f5c75f269e9d92bf021
 EBUILD guayadeque-0.4.6.ebuild 2356 BLAKE2B b7b8c58c38fad216bd73f236cf7797b49e8ff19b1aedf7291a5ff9a6b8db31dbb5c36153b3c5b86ab1f42ac3a8e83968d95b572325d5e9395c16986c3b62c9d7 SHA512 c0b9aef324c9e370e5262c1ba8e0c3efa08c103eeec067bda9dbb69e4cf33794c6fbb6ff931423c5b9e6f30875a8e3cb17ca3df800cbb0b618eaab14de1ec266
-EBUILD guayadeque-9999.ebuild 2269 BLAKE2B 91638edf51c355d60f39c3548efe82cdba79e1a0dbc8d98d09f2e341a8069982adcc761fc6b60f44dbba00884de831c85b971efaae12f9835cd832810187f053 SHA512 2c4ae18463836d9671797971f671f32895d28bbcd95f8e6b88d4a2932ab6435a6a0c1bd4992d9b702343b1285421414b00a5c58981598031c6e384321f88ef58
+EBUILD guayadeque-0.4.7.ebuild 2268 BLAKE2B 89f0f88f01a37f48eef9c9d0a5078f5fe7583e8cf4e2a844eb310f7b67b1214b16a7645faec1b31237cd4e6ab8c450f83bd4d4e2eec62f61be815035941ee99b SHA512 31ab57af134af8eaab048c9b264efd84dde12f24fed61c95bcfa1107f721e24b9e54a1a0ac1e7b5b3e400354d0d72b2226b70db96ab0a19dbb6a93960d1d9148
+EBUILD guayadeque-9999.ebuild 2268 BLAKE2B 89f0f88f01a37f48eef9c9d0a5078f5fe7583e8cf4e2a844eb310f7b67b1214b16a7645faec1b31237cd4e6ab8c450f83bd4d4e2eec62f61be815035941ee99b SHA512 31ab57af134af8eaab048c9b264efd84dde12f24fed61c95bcfa1107f721e24b9e54a1a0ac1e7b5b3e400354d0d72b2226b70db96ab0a19dbb6a93960d1d9148
 MISC metadata.xml 411 BLAKE2B 0a0ae74c6c50b622dbfd6d66a2bbe343c94471454d1be0ac6130f32deb17e944a8f322bf018af67ebbd8e5ef5a51b9b9a1062d5bd0e11ede1f5c4f3470c5e8da SHA512 3de001e7dd97fcdb2627f3305e55d1f5737670a3aabd5f0269c541d9d8f4c1c3e0e4dba60ddb689240f9e40cc2d08530ed56c9e18eb7499b3b003c33538c49d5
diff --git a/media-sound/guayadeque/guayadeque-0.4.7.ebuild b/media-sound/guayadeque/guayadeque-0.4.7.ebuild
new file mode 100644
index 000000000000..a82bebdc7c56
--- /dev/null
+++ b/media-sound/guayadeque/guayadeque-0.4.7.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WX_GTK_VER=3.0-gtk3
+
+inherit cmake wxwidgets xdg
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI=${EGIT_REPO_URI:-https://github.com/anonbeat/guayadeque}
+	EGIT_BRANCH=${EGIT_BRANCH:-master}
+else
+	SRC_URI="https://github.com/anonbeat/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Music management program designed for all music enthusiasts"
+HOMEPAGE="https://guayadeque.org/"
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="appindicator ipod +minimal"
+
+# No test available, Making src_test fail
+RESTRICT="test"
+
+GST_DEPS="
+	media-plugins/gst-plugins-libav:1.0
+	media-plugins/gst-plugins-libnice:1.0
+	media-plugins/gst-plugins-pulse:1.0
+	media-plugins/gst-plugins-soup:1.0
+	media-libs/gst-plugins-bad:1.0
+	media-libs/gst-plugins-ugly:1.0
+"
+BDEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+RDEPEND="
+	dev-db/sqlite:3
+	dev-db/wxsqlite3
+	dev-libs/glib:2
+	media-libs/flac
+	media-libs/gst-plugins-base:1.0
+	media-libs/gst-plugins-good:1.0
+	media-libs/gstreamer:1.0
+	media-libs/taglib
+	net-misc/curl
+	sys-apps/dbus
+	x11-libs/wxGTK:${WX_GTK_VER}[X]
+	appindicator? ( dev-libs/libindicate )
+	ipod? ( media-libs/libgpod )
+	!minimal? ( ${GST_DEPS} )"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.4.6-metadata.patch"
+)
+
+# echo $(cat po/CMakeLists.txt | grep ADD_SUBDIRECTORY | sed 's#ADD_SUBDIRECTORY( \(\w\+\) )#\1#')
+LANGS=( bg ca_ES cs de el es fr hr hu is it ja nb nl pl pt pt_BR ru sk sr sr@latin sv th tr uk )
+
+pkg_setup() {
+	setup-wxwidgets
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	# remove bundled libs
+	rm -rf src/wx/wxsql* src/wxsqlite3 || die
+
+	# comment out unused languages
+	cd po || die
+	local l
+	for l in "${LANGS[@]}"; do
+		! has ${l} ${LINGUAS-${l}} && cmake_comment_add_subdirectory ${l}
+	done
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_IPOD=$(usex ipod)
+		-DENABLE_LIBINDICATE=$(usex appindicator)
+	)
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	if use minimal; then
+		elog "If you are missing functionalities consider setting USE=-minimal"
+		elog "or install any of the following packages:"
+
+		local pkg
+		for pkg in ${GST_DEPS}; do
+			elog "\t ${pkg}"
+		done
+	fi
+
+	xdg_desktop_database_update
+}
diff --git a/media-sound/guayadeque/guayadeque-9999.ebuild b/media-sound/guayadeque/guayadeque-9999.ebuild
index 5da351601454..a82bebdc7c56 100644
--- a/media-sound/guayadeque/guayadeque-9999.ebuild
+++ b/media-sound/guayadeque/guayadeque-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-WX_GTK_VER=3.0
+WX_GTK_VER=3.0-gtk3
 
 inherit cmake wxwidgets xdg
 
@@ -50,7 +50,7 @@ RDEPEND="
 	net-misc/curl
 	sys-apps/dbus
 	x11-libs/wxGTK:${WX_GTK_VER}[X]
-	appindicator? ( >=dev-libs/libindicate-0.7 )
+	appindicator? ( dev-libs/libindicate )
 	ipod? ( media-libs/libgpod )
 	!minimal? ( ${GST_DEPS} )"
 DEPEND="${RDEPEND}"
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 8fd554741091..b26e293b0a4d 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 8a66be28b902..5db4369a2486 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Tue, 21 Feb 2023 01:39:40 +0000
+Tue, 21 Feb 2023 07:39:38 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 45df8d25802e..0d74b791ec15 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 540216 BLAKE2B d30aef090eaffb1f3ce91f96dfcc44f7a5d1a954885fba68126dee1aa21a3de740e45dd7106f5d3ba2b51e48eda29870b954e2a90cc8bfa9dc1ac93912daadef SHA512 f9ff42d8d58ea6e6bae5d32f95af7bcddc333ce0478d31cfefb14e85c8d99eaf4d3d9a0802c961e3f7e7d8f3696894cb1d1d0e81db3807d1796858a550f0351f
-TIMESTAMP 2023-02-21T01:39:43Z
+TIMESTAMP 2023-02-21T07:39:41Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmP0IN9fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmP0dT1fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAUuxAAlQCrkrtjQNx2QyAzWw2TUDt8ExNYMgzvV3xljtzyhEeADiHCIrV81OG0
-5QPS3o2krtj5VLJrKqbPULqkLGNrnMUYfcV4QuwT3kQS0eOpCKA7BEzeI2sSHDr2
-nuAsElQgfzhNL8iMdjPUDPniLCp6af1cbJV/NmiZdgfBecNTj44cmpxIgOuY2KmP
-CToezZFUqzh3H5lFPD9LWfehEtTvUvnuPWbsFWELg+aPrg9fRrA2VJDQg6EDEY8V
-sjymFoaG+5DcTgglSvtoIT0Psh9TPVPQEyfvCCBym5+MeQ0RlWRCzGK+PU9dmmtF
-yPNLofCFYHV3a4pMj/lg3K+QP5/ib3McVEF/yHKz4Z3nSie10ACqN5IXaXc3N5HL
-Nj1ti8b6DKWOOKBQ4X0zMupLxHhVGyulm4w5usME5gWgjQeWPXX03zzJ2qpMMscp
-7/bjWt8exneta3woTtI8eeviLLOciU/6s11JuS236zZMDDHWGhiYCv3sussOlRoW
-lLUvv3ZOWD0ZcDh6/W9X46dRR6SStYlQW28275rcvDkJkl1Vj5t5ITW5b7mxE3qM
-fBKSCPioJKxcibDtRHjhdi/st1pcK4RNUYjV0V/dXlPZfRZSbtpU3loq/Qus3qXl
-yPjdoYHUvdfHrncC8pjRJYehySLHxea6lK72UvToRCO/0EU5zaY=
-=54KW
+klB5mQ//dLH50fsyHeosdMZhRFfqY4oiGsnaQSy2Zoy8Pm17XNOwztF48WVF11jz
+zLnEeuK2+pK6s+4nGPjgNJfk4qGkrT91XEEIFraydgWiZ2fhFCCCNnDSqhFziaIl
+9/JJZ68rG+L/Kpd+m/0EKfKESkRkHCwkU8ah16e3ouI4qlV3FRPsDwR7GbIWi1V8
+13HZC/LdiCX4SfFFwwZ57QMWzxpSxtlJhmSJQSmtt3XP9w4iQqPMDSeMuBu7i2xm
+y8IgrcWxB11ucN4CvbadrC8H/QFOFOT5gga/DOkrxm2CMnP9+z9cqtiRbEI70ilx
+ChY4/D0UE2DanyIAKsKgO4BD17VstLnGcWJ3k5TKo5ASz0EdXC51aUnthNcKNjBz
+OKHQ71mHeR4b0D9qJPBiIEr/K5IGwAlOZ5651zdts71xExTzjYtaqFnu53M966Mf
+sNaPqX7COkvSkv2V8B3j3tlj0ukeRm3OomwNjfmVWQEFalG2fFTuvHVe+Pz1XClr
+2EwuXgyqrkt0fvzS/dFYSqHftpBR7kJ7TjfoL346N6WgilPrXTpg3whO4Fiujpky
+us2Fz56V9U74f0swCkSOOaq3Bk3G/jux7zjyyYAbiDh50Efs8045OrV5U574j8Xa
+k3EC4mWCYvWIa7PwE0f37Em8dR6N5zbsqa8JottpNt8JLAK/uz8=
+=ZOzs
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 8a66be28b902..5db4369a2486 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Tue, 21 Feb 2023 01:39:40 +0000
+Tue, 21 Feb 2023 07:39:38 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 3b73dcc82b15..cabdc5666381 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-emacs/Manifest.gz b/metadata/md5-cache/app-emacs/Manifest.gz
index bb2c03ec83ae..14de0940b2aa 100644
--- a/metadata/md5-cache/app-emacs/Manifest.gz
+++ b/metadata/md5-cache/app-emacs/Manifest.gz
diff --git a/metadata/md5-cache/app-emacs/groovy-emacs-modes-2.1 b/metadata/md5-cache/app-emacs/groovy-emacs-modes-2.1
new file mode 100644
index 000000000000..fae447dc703e
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/groovy-emacs-modes-2.1
@@ -0,0 +1,15 @@
+BDEPEND=app-emacs/s app-emacs/dash test? ( app-emacs/ert-runner app-emacs/f app-emacs/shut-up app-emacs/undercover ) >=app-editors/emacs-24.3:*
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DESCRIPTION=Groovy major mode, grails minor mode, and a groovy inferior mode
+EAPI=8
+HOMEPAGE=https://github.com/Groovy-Emacs-Modes/groovy-emacs-modes/
+INHERIT=elisp
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=app-emacs/s app-emacs/dash >=app-editors/emacs-24.3:*
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/Groovy-Emacs-Modes/groovy-emacs-modes/archive/2.1.tar.gz -> groovy-emacs-modes-2.1.tar.gz
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_md5_=caebd731e8fbd4504cd73e0c735f9d66
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index 5ed22ba0f171..12c4908362ba 100644
--- a/metadata/md5-cache/app-emulation/Manifest.gz
+++ b/metadata/md5-cache/app-emulation/Manifest.gz
diff --git a/metadata/md5-cache/app-emulation/qemu-7.2.0-r2 b/metadata/md5-cache/app-emulation/qemu-7.2.0-r2
index 8b2f2fc5d825..1e2a1a2fd776 100644
--- a/metadata/md5-cache/app-emulation/qemu-7.2.0-r2
+++ b/metadata/md5-cache/app-emulation/qemu-7.2.0-r2
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://download.qemu.org/qemu-7.2.0.tar.xz !doc? ( https://dev.gentoo.org/~ajak/distfiles/app-emulation/qemu/qemu-7.2.0-docs.tar.xz )
 _eclasses_=fcaps	da0130200e07aaecee121b85f4b9ea17	linux-info	4b552625ebd741dfd2ac08637fd2436e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	udev	eec0bbab06977f1cfc5597269c1fa152	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=f27283f84ade885d883d72f52e069bb0
+_md5_=abfadeabab60b5f4cebe9add678a60bd
diff --git a/metadata/md5-cache/dev-cpp/Manifest.gz b/metadata/md5-cache/dev-cpp/Manifest.gz
index bc7738d17488..bfe655446eeb 100644
--- a/metadata/md5-cache/dev-cpp/Manifest.gz
+++ b/metadata/md5-cache/dev-cpp/Manifest.gz
diff --git a/metadata/md5-cache/dev-cpp/rapidyaml-0.5.0 b/metadata/md5-cache/dev-cpp/rapidyaml-0.5.0
index 2a3a47b970d7..829cdd8536d6 100644
--- a/metadata/md5-cache/dev-cpp/rapidyaml-0.5.0
+++ b/metadata/md5-cache/dev-cpp/rapidyaml-0.5.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/biojppm/rapidyaml/
 INHERIT=cmake
 IUSE=debug test
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64 ~riscv x86
 LICENSE=MIT Boost-1.0 BSD
 RESTRICT=!test? ( test )
 SLOT=0/0.5.0
 SRC_URI=https://github.com/biojppm/rapidyaml/releases/download/v0.5.0/rapidyaml-0.5.0-src.tgz test? ( https://github.com/biojppm/c4fs/archive/0130061b804ae2af0d6cd5919275d552eb1f2414.tar.gz -> rapidyaml-c4fs-0130061b804ae2af0d6cd5919275d552eb1f2414.tar.gz https://github.com/biojppm/c4log/archive/00066ad7f624556f066f3d60766a2c33aeb3c6f0.tar.gz -> rapidyaml-c4log-00066ad7f624556f066f3d60766a2c33aeb3c6f0.tar.gz https://github.com/yaml/yaml-test-suite/archive/6e6c296ae9c9d2d5c4134b4b64d01b29ac19ff6f.tar.gz -> rapidyaml-yaml-test-suite-6e6c296ae9c9d2d5c4134b4b64d01b29ac19ff6f.tar.gz )
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=168e5ed6f16a7045a196c086a2c86fa5
+_md5_=43043dc78038435c9234811e786c3bc9
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 6f0584dfd7f6..2e3ac352af67 100644
--- a/metadata/md5-cache/dev-lang/Manifest.gz
+++ b/metadata/md5-cache/dev-lang/Manifest.gz
diff --git a/metadata/md5-cache/dev-lang/ghc-8.10.6-r2 b/metadata/md5-cache/dev-lang/ghc-8.10.6-r3
index 69944468ea3e..6fff65036c6a 100644
--- a/metadata/md5-cache/dev-lang/ghc-8.10.6-r2
+++ b/metadata/md5-cache/dev-lang/ghc-8.10.6-r3
@@ -13,6 +13,6 @@ RDEPEND=>=dev-lang/perl-5.6.1 dev-libs/gmp:0= sys-libs/ncurses:=[unicode(+)] elf
 REQUIRED_USE=?? ( ghcbootstrap binary ) ?? ( profile binary )
 RESTRICT=!test? ( test )
 SLOT=0/8.10.6
-SRC_URI=!binary? ( https://downloads.haskell.org/ghc/8.10.6/ghc-8.10.6-src.tar.xz test? ( https://downloads.haskell.org/ghc/8.10.6/ghc-8.10.6-testsuite.tar.xz ) ) !ghcbootstrap? ( amd64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.10.6-x86_64-pc-linux-gnu.tbz2 ) x86? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.10.6-i686-pc-linux-gnu.tbz2 ) )
+SRC_URI=!binary? ( https://downloads.haskell.org/ghc/8.10.6/ghc-8.10.6-src.tar.xz test? ( https://downloads.haskell.org/ghc/8.10.6/ghc-8.10.6-testsuite.tar.xz ) ) !ghcbootstrap? ( elibc_glibc? ( amd64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.10.6-x86_64-pc-linux-gnu.tbz2 ) x86? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.10.6-i686-pc-linux-gnu.tbz2 ) ) ) https://hackage.haskell.org/package/process-1.6.16.0/process-1.6.16.0.tar.gz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=ff0ce65d02cbf9bd3e5fdf0d812d0fa4
+_md5_=870eeff55144e71798438bfbe8548c94
diff --git a/metadata/md5-cache/dev-lang/ghc-9.0.2-r3 b/metadata/md5-cache/dev-lang/ghc-9.0.2-r3
index 301905230334..9a7643dbccd1 100644
--- a/metadata/md5-cache/dev-lang/ghc-9.0.2-r3
+++ b/metadata/md5-cache/dev-lang/ghc-9.0.2-r3
@@ -13,6 +13,6 @@ RDEPEND=>=dev-lang/perl-5.6.1 dev-libs/gmp:0= sys-libs/ncurses:=[unicode(+)] elf
 REQUIRED_USE=?? ( ghcbootstrap binary ) ?? ( profile binary ) ?? ( llvm unregisterised )
 RESTRICT=!test? ( test )
 SLOT=0/9.0.2
-SRC_URI=!binary? ( https://downloads.haskell.org/ghc/9.0.2/ghc-9.0.2-src.tar.xz test? ( https://downloads.haskell.org/ghc/9.0.2/ghc-9.0.2-testsuite.tar.xz ) ) https://dev.gentoo.org/~sam/distfiles/dev-lang/ghc/ghc-9.0.2-riscv64-llvm.patch.xz !ghcbootstrap? ( arm64? ( https://github.com/matoro/ghc/releases/download/9.0.2/ghc-bin-9.0.2-aarch64-unknown-linux-gnu.tar.gz ) amd64? ( https://eidetic.codes/ghc-bin-9.0.2-x86_64-pc-linux-gnu-r1.tbz2 ) ppc64? ( big-endian? ( https://github.com/matoro/ghc/releases/download/9.0.2/ghc-bin-9.0.2-powerpc64-unknown-linux-gnu.tar.gz ) !big-endian? ( https://github.com/matoro/ghc/releases/download/9.0.2/ghc-bin-9.0.2-powerpc64le-unknown-linux-gnu.tar.gz ) ) riscv? ( https://github.com/matoro/ghc/releases/download/9.0.2/ghc-bin-9.0.2-riscv64-unknown-linux-gnu.tar.gz ) x86? ( https://eidetic.codes/ghc-bin-9.0.2-i686-pc-linux-gnu.tbz2 ) )
+SRC_URI=!binary? ( https://downloads.haskell.org/ghc/9.0.2/ghc-9.0.2-src.tar.xz test? ( https://downloads.haskell.org/ghc/9.0.2/ghc-9.0.2-testsuite.tar.xz ) ) https://dev.gentoo.org/~sam/distfiles/dev-lang/ghc/ghc-9.0.2-riscv64-llvm.patch.xz !ghcbootstrap? ( elibc_glibc? ( amd64? ( https://eidetic.codes/ghc-bin-9.0.2-x86_64-pc-linux-gnu-r1.tbz2 ) arm64? ( https://github.com/matoro/ghc/releases/download/9.0.2/ghc-bin-9.0.2-aarch64-unknown-linux-gnu.tar.gz ) ppc64? ( big-endian? ( https://github.com/matoro/ghc/releases/download/9.0.2/ghc-bin-9.0.2-powerpc64-unknown-linux-gnu.tar.gz ) !big-endian? ( https://github.com/matoro/ghc/releases/download/9.0.2/ghc-bin-9.0.2-powerpc64le-unknown-linux-gnu.tar.gz ) ) riscv? ( https://github.com/matoro/ghc/releases/download/9.0.2/ghc-bin-9.0.2-riscv64-unknown-linux-gnu.tar.gz ) x86? ( https://eidetic.codes/ghc-bin-9.0.2-i686-pc-linux-gnu.tbz2 ) ) )
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	llvm	4cc6f8e29d24a8011266413e74c728bb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=97105eea95bf1ef09a2c15b571395a7d
+_md5_=a75bdd63693e13161089a72aaab384df
diff --git a/metadata/md5-cache/dev-lang/ghc-9.0.2-r4 b/metadata/md5-cache/dev-lang/ghc-9.0.2-r4
new file mode 100644
index 000000000000..bfc2b2e1af99
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/ghc-9.0.2-r4
@@ -0,0 +1,18 @@
+BDEPEND=virtual/pkgconfig doc? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-python/sphinx >=dev-libs/libxslt-1.1.2 ) !ghcbootstrap? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) ) test? ( || ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup test unpack
+DEPEND=>=dev-lang/perl-5.6.1 dev-libs/gmp:0= sys-libs/ncurses:=[unicode(+)] elfutils? ( dev-libs/elfutils ) !ghcmakebinary? ( dev-libs/libffi:= ) numa? ( sys-process/numactl ) llvm? ( <sys-devel/llvm-15:= || ( sys-devel/llvm:14 ) ) binary? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) sys-libs/ncurses:0/6 ) !!sys-devel/llvm:0
+DESCRIPTION=The Glasgow Haskell Compiler
+EAPI=7
+HOMEPAGE=https://www.haskell.org/ghc/
+INHERIT=python-any-r1 autotools bash-completion-r1 flag-o-matic ghc-package multiprocessing pax-utils toolchain-funcs prefix check-reqs llvm
+IUSE=big-endian +doc elfutils ghcbootstrap ghcmakebinary +gmp llvm numa profile test unregisterised binary
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+PDEPEND=!ghcbootstrap? ( >=app-admin/haskell-updater-1.2 )
+RDEPEND=>=dev-lang/perl-5.6.1 dev-libs/gmp:0= sys-libs/ncurses:=[unicode(+)] elfutils? ( dev-libs/elfutils ) !ghcmakebinary? ( dev-libs/libffi:= ) numa? ( sys-process/numactl ) llvm? ( <sys-devel/llvm-15:= || ( sys-devel/llvm:14 ) ) binary? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) sys-libs/ncurses:0/6 )
+REQUIRED_USE=?? ( ghcbootstrap binary ) ?? ( profile binary ) ?? ( llvm unregisterised )
+RESTRICT=!test? ( test )
+SLOT=0/9.0.2
+SRC_URI=!binary? ( https://downloads.haskell.org/ghc/9.0.2/ghc-9.0.2-src.tar.xz test? ( https://downloads.haskell.org/ghc/9.0.2/ghc-9.0.2-testsuite.tar.xz ) ) https://dev.gentoo.org/~sam/distfiles/dev-lang/ghc/ghc-9.0.2-riscv64-llvm.patch.xz !ghcbootstrap? ( elibc_glibc? ( amd64? ( https://eidetic.codes/ghc-bin-9.0.2-x86_64-pc-linux-gnu-r4.tbz2 ) x86? ( https://eidetic.codes/ghc-bin-9.0.2-i686-pc-linux-gnu-r4.tbz2 ) ) ) https://hackage.haskell.org/package/process-1.6.16.0/process-1.6.16.0.tar.gz
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	ghc-package	dbe1a8d17cacb390a3df7bbba6617679	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	llvm	4cc6f8e29d24a8011266413e74c728bb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=346637fbbdb2fe5713ced815a86e88b0
diff --git a/metadata/md5-cache/dev-lang/jsonnet-0.19.1 b/metadata/md5-cache/dev-lang/jsonnet-0.19.1
index 1c322d55604a..a99fe7dc2951 100644
--- a/metadata/md5-cache/dev-lang/jsonnet-0.19.1
+++ b/metadata/md5-cache/dev-lang/jsonnet-0.19.1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://jsonnet.org/
 INHERIT=cmake toolchain-funcs flag-o-matic distutils-r1
 IUSE=custom-optimization doc examples python test test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=Apache-2.0
 RDEPEND=dev-cpp/rapidyaml:= dev-cpp/nlohmann_json:= python? ( python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) )
 REQUIRED_USE=python? ( || ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/jsonnet/archive/v0.19.1.tar.gz -> jsonnet-0.19.1.tar.gz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	distutils-r1	a9f2e2ae24bd496873c092a94cae1539	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=445a73ecc43fe7875408554a92402022
+_md5_=4aa4a883dd07d26c670ace8003df9706
diff --git a/metadata/md5-cache/dev-lua/Manifest.gz b/metadata/md5-cache/dev-lua/Manifest.gz
index dd980ed32d7b..2151aba955d6 100644
--- a/metadata/md5-cache/dev-lua/Manifest.gz
+++ b/metadata/md5-cache/dev-lua/Manifest.gz
diff --git a/metadata/md5-cache/dev-lua/luarocks-3.9.2 b/metadata/md5-cache/dev-lua/luarocks-3.9.2
index 7f9ada8cb7b2..c8e7ea444bd3 100644
--- a/metadata/md5-cache/dev-lua/luarocks-3.9.2
+++ b/metadata/md5-cache/dev-lua/luarocks-3.9.2
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://luarocks.org
 INHERIT=lua-single
 IUSE=test lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=MIT
 RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 )
 REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 )
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://luarocks.org/releases/luarocks-3.9.2.tar.gz
 _eclasses_=lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=dce3a3f475396d406c6a279422330af1
+_md5_=fcb6e7d52df4b6dd23ede8554d20c366
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index a44abf2126d0..2ebe54ee4238 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/capistrano-3.17.2 b/metadata/md5-cache/dev-ruby/capistrano-3.17.2
new file mode 100644
index 000000000000..3a2fdd47f552
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/capistrano-3.17.2
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby27? ( >=dev-ruby/airbrussh-1.0.0[ruby_targets_ruby27(-)] >=dev-ruby/sshkit-1.9:0[ruby_targets_ruby27(-)] >=dev-ruby/rake-10.0.0[ruby_targets_ruby27(-)] dev-ruby/i18n:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/airbrussh-1.0.0[ruby_targets_ruby30(-)] >=dev-ruby/sshkit-1.9:0[ruby_targets_ruby30(-)] >=dev-ruby/rake-10.0.0[ruby_targets_ruby30(-)] dev-ruby/i18n:*[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/mocha[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/mocha[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(-)] ) )
+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(-)] )
+DESCRIPTION=A distributed application deployment system
+EAPI=8
+HOMEPAGE=https://capistranorb.com/
+INHERIT=ruby-fakegem
+IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby27? ( >=dev-ruby/airbrussh-1.0.0[ruby_targets_ruby27(-)] >=dev-ruby/sshkit-1.9:0[ruby_targets_ruby27(-)] >=dev-ruby/rake-10.0.0[ruby_targets_ruby27(-)] dev-ruby/i18n:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/airbrussh-1.0.0[ruby_targets_ruby30(-)] >=dev-ruby/sshkit-1.9:0[ruby_targets_ruby30(-)] >=dev-ruby/rake-10.0.0[ruby_targets_ruby30(-)] dev-ruby/i18n:*[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 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=3
+SRC_URI=https://rubygems.org/gems/capistrano-3.17.2.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=132d0e5bce1f15355f3ad54232dfd4c6
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index de4aee796a99..28d7b71c74ba 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/curtail-1.3.1 b/metadata/md5-cache/media-gfx/curtail-1.3.1
new file mode 100644
index 000000000000..80c21af261dc
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/curtail-1.3.1
@@ -0,0 +1,17 @@
+BDEPEND=python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=x11-libs/gtk+-3.20:3[introspection] python_single_target_python3_10? ( dev-python/pygobject:3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pygobject:3[python_targets_python3_11(-)] ) dev-libs/appstream-glib dev-util/desktop-file-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DESCRIPTION=Image compressor, supporting PNG, JPEG and WebP
+EAPI=8
+HOMEPAGE=https://github.com/Huluti/Curtail/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=gnome2-utils meson python-single-r1 xdg
+IUSE=python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=x11-libs/gtk+-3.20:3[introspection] python_single_target_python3_10? ( dev-python/pygobject:3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pygobject:3[python_targets_python3_11(-)] ) media-gfx/jpegoptim media-gfx/optipng media-gfx/pngquant media-libs/libwebp
+REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/Huluti/Curtail/archive/1.3.1.tar.gz -> curtail-1.3.1.tar.gz
+_eclasses_=gnome2-utils	3eaa1386ddbbbbb3951256d4b170fba3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=310a2f593b5d8705640c758add7ce584
diff --git a/metadata/md5-cache/media-gfx/freecad-0.20.2 b/metadata/md5-cache/media-gfx/freecad-0.20.2
index c9e915b2098b..b9eec657e269 100644
--- a/metadata/md5-cache/media-gfx/freecad-0.20.2
+++ b/metadata/md5-cache/media-gfx/freecad-0.20.2
@@ -7,7 +7,7 @@ HOMEPAGE=https://www.freecad.org/ https://github.com/FreeCAD/FreeCAD
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=check-reqs cmake optfeature python-single-r1 xdg
 IUSE=debug designer +gui test +addonmgr +fem +idf +image +inspection +material +openscad +part-design +path +points +raytracing +robot +show +surface +techdraw +tux cloud pcl python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=LGPL-2 CC-BY-SA-4.0
 RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) dev-libs/OpenNI2[opengl(+)] dev-libs/boost:= dev-libs/libspnav[X] dev-libs/xerces-c[icu] dev-qt/designer:5 dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 >=media-libs/coin-4.0.0 media-libs/freetype media-libs/qhull:= sci-libs/flann[openmp] sci-libs/hdf5:=[fortran,zlib] >=sci-libs/med-4.0.0-r1 <sci-libs/opencascade-7.7.0:=[json,vtk] sci-libs/orocos_kdl:= sys-libs/zlib virtual/glu virtual/libusb:1 virtual/opengl cloud? ( dev-libs/openssl:= net-misc/curl ) fem? ( sci-libs/vtk:=[qt5,rendering] ) openscad? ( media-gfx/openscad ) pcl? ( sci-libs/pcl:=[opengl,openni2,qt5,vtk] ) python_single_target_python3_9? ( dev-python/matplotlib[python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] >=dev-python/pivy-0.6.5[python_targets_python3_9(-)] dev-python/pybind11[python_targets_python3_9(-)] dev-python/pyside2[gui,svg,webchannel,webengine,python_targets_python3_9(-)] dev-python/shiboken2[python_targets_python3_9(-)] addonmgr? ( dev-python/GitPython[python_targets_python3_9(-)] ) fem? ( dev-python/ply[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( dev-python/matplotlib[python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] >=dev-python/pivy-0.6.5[python_targets_python3_10(-)] dev-python/pybind11[python_targets_python3_10(-)] dev-python/pyside2[gui,svg,webchannel,webengine,python_targets_python3_10(-)] dev-python/shiboken2[python_targets_python3_10(-)] addonmgr? ( dev-python/GitPython[python_targets_python3_10(-)] ) fem? ( dev-python/ply[python_targets_python3_10(-)] ) )
 REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 ) inspection? ( points ) path? ( robot )
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/FreeCAD/FreeCAD/archive/refs/tags/0.20.2.tar.gz -> freecad-0.20.2.tar.gz
 _eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=5e5071d5fbd73cbdd3618168730e799b
+_md5_=743afd6c5dce03fa29ec9191dec0e963
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index e3e18244d35d..dd52fe1b3a74 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/guayadeque-0.4.7 b/metadata/md5-cache/media-sound/guayadeque-0.4.7
new file mode 100644
index 000000000000..e0e55a9e3a49
--- /dev/null
+++ b/metadata/md5-cache/media-sound/guayadeque-0.4.7
@@ -0,0 +1,17 @@
+BDEPEND=sys-devel/gettext virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=dev-db/sqlite:3 dev-db/wxsqlite3 dev-libs/glib:2 media-libs/flac media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 media-libs/gstreamer:1.0 media-libs/taglib net-misc/curl sys-apps/dbus x11-libs/wxGTK:3.0-gtk3[X] appindicator? ( dev-libs/libindicate ) ipod? ( media-libs/libgpod ) !minimal? ( media-plugins/gst-plugins-libav:1.0 media-plugins/gst-plugins-libnice:1.0 media-plugins/gst-plugins-pulse:1.0 media-plugins/gst-plugins-soup:1.0 media-libs/gst-plugins-bad:1.0 media-libs/gst-plugins-ugly:1.0 )
+DESCRIPTION=Music management program designed for all music enthusiasts
+EAPI=8
+HOMEPAGE=https://guayadeque.org/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=cmake wxwidgets xdg
+IUSE=appindicator ipod +minimal
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=dev-db/sqlite:3 dev-db/wxsqlite3 dev-libs/glib:2 media-libs/flac media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 media-libs/gstreamer:1.0 media-libs/taglib net-misc/curl sys-apps/dbus x11-libs/wxGTK:3.0-gtk3[X] appindicator? ( dev-libs/libindicate ) ipod? ( media-libs/libgpod ) !minimal? ( media-plugins/gst-plugins-libav:1.0 media-plugins/gst-plugins-libnice:1.0 media-plugins/gst-plugins-pulse:1.0 media-plugins/gst-plugins-soup:1.0 media-libs/gst-plugins-bad:1.0 media-libs/gst-plugins-ugly:1.0 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/anonbeat/guayadeque/archive/v0.4.7.tar.gz -> guayadeque-0.4.7.tar.gz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	wxwidgets	9a707a3f9f1ea7aa703b1e46552291e5	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=ec3c6fd3d45550cace67ca2826d14880
diff --git a/metadata/md5-cache/media-sound/guayadeque-9999 b/metadata/md5-cache/media-sound/guayadeque-9999
index 46001e7532e6..befc369b4dca 100644
--- a/metadata/md5-cache/media-sound/guayadeque-9999
+++ b/metadata/md5-cache/media-sound/guayadeque-9999
@@ -1,15 +1,16 @@
 BDEPEND=sys-devel/gettext virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=dev-db/sqlite:3 dev-db/wxsqlite3 dev-libs/glib:2 media-libs/flac media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 media-libs/gstreamer:1.0 media-libs/taglib net-misc/curl sys-apps/dbus x11-libs/wxGTK:3.0[X] appindicator? ( >=dev-libs/libindicate-0.7 ) ipod? ( media-libs/libgpod ) !minimal? ( media-plugins/gst-plugins-libav:1.0 media-plugins/gst-plugins-libnice:1.0 media-plugins/gst-plugins-pulse:1.0 media-plugins/gst-plugins-soup:1.0 media-libs/gst-plugins-bad:1.0 media-libs/gst-plugins-ugly:1.0 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=dev-db/sqlite:3 dev-db/wxsqlite3 dev-libs/glib:2 media-libs/flac media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 media-libs/gstreamer:1.0 media-libs/taglib net-misc/curl sys-apps/dbus x11-libs/wxGTK:3.0-gtk3[X] appindicator? ( dev-libs/libindicate ) ipod? ( media-libs/libgpod ) !minimal? ( media-plugins/gst-plugins-libav:1.0 media-plugins/gst-plugins-libnice:1.0 media-plugins/gst-plugins-pulse:1.0 media-plugins/gst-plugins-soup:1.0 media-libs/gst-plugins-bad:1.0 media-libs/gst-plugins-ugly:1.0 )
 DESCRIPTION=Music management program designed for all music enthusiasts
-EAPI=7
+EAPI=8
 HOMEPAGE=https://guayadeque.org/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=cmake wxwidgets xdg git-r3
 IUSE=appindicator ipod +minimal
 LICENSE=GPL-3+
 PROPERTIES=live
-RDEPEND=dev-db/sqlite:3 dev-db/wxsqlite3 dev-libs/glib:2 media-libs/flac media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 media-libs/gstreamer:1.0 media-libs/taglib net-misc/curl sys-apps/dbus x11-libs/wxGTK:3.0[X] appindicator? ( >=dev-libs/libindicate-0.7 ) ipod? ( media-libs/libgpod ) !minimal? ( media-plugins/gst-plugins-libav:1.0 media-plugins/gst-plugins-libnice:1.0 media-plugins/gst-plugins-pulse:1.0 media-plugins/gst-plugins-soup:1.0 media-libs/gst-plugins-bad:1.0 media-libs/gst-plugins-ugly:1.0 )
+RDEPEND=dev-db/sqlite:3 dev-db/wxsqlite3 dev-libs/glib:2 media-libs/flac media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 media-libs/gstreamer:1.0 media-libs/taglib net-misc/curl sys-apps/dbus x11-libs/wxGTK:3.0-gtk3[X] appindicator? ( dev-libs/libindicate ) ipod? ( media-libs/libgpod ) !minimal? ( media-plugins/gst-plugins-libav:1.0 media-plugins/gst-plugins-libnice:1.0 media-plugins/gst-plugins-pulse:1.0 media-plugins/gst-plugins-soup:1.0 media-libs/gst-plugins-bad:1.0 media-libs/gst-plugins-ugly:1.0 )
 RESTRICT=test
 SLOT=0
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	wrapper	4a1902f969e5718126434fc35f3a0d9c	wxwidgets	9a707a3f9f1ea7aa703b1e46552291e5	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=19117aa2f8da9718e8c58cb6b8920093
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	wxwidgets	9a707a3f9f1ea7aa703b1e46552291e5	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=ec3c6fd3d45550cace67ca2826d14880
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 3b3546e35abd..c93452dbf1b7 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/most-5.2.0 b/metadata/md5-cache/sys-apps/most-5.2.0
index d8170dc4dfdb..6b16adbd172a 100644
--- a/metadata/md5-cache/sys-apps/most-5.2.0
+++ b/metadata/md5-cache/sys-apps/most-5.2.0
@@ -3,9 +3,9 @@ DEPEND=>=sys-libs/slang-2.1.3
 DESCRIPTION=Paging program that displays, one windowful at a time, the contents of a file
 EAPI=8
 HOMEPAGE=https://www.jedsoft.org/most/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 arm ~arm64 ~mips ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=GPL-2
 RDEPEND=>=sys-libs/slang-2.1.3
 SLOT=0
 SRC_URI=https://www.jedsoft.org/releases/most/most-5.2.0.tar.gz https://www.jedsoft.org/releases/most/old/most-5.2.0.tar.gz
-_md5_=b2cd93543bea10681a99f853d9ff7b66
+_md5_=c055eb08e9956f1ad941d0ff9d6a5935
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index cb201f26996b..f5597132bae7 100644
--- a/metadata/md5-cache/sys-kernel/Manifest.gz
+++ b/metadata/md5-cache/sys-kernel/Manifest.gz
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-6.2 b/metadata/md5-cache/sys-kernel/linux-headers-6.2
new file mode 100644
index 000000000000..2ff69fb3ba3b
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/linux-headers-6.2
@@ -0,0 +1,14 @@
+BDEPEND=app-arch/xz-utils dev-lang/perl
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Linux system headers
+EAPI=8
+HOMEPAGE=https://www.kernel.org/ https://wiki.gentoo.org/wiki/Kernel
+INHERIT=kernel-2
+IUSE=headers-only
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RESTRICT=binchecks strip
+SLOT=0
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.2.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-kernel/linux-headers/gentoo-headers-6.2-1.tar.xz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	1e55bee3f3081b16ebc1ca0cf1264f6c	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=3165141cf7f934f2ea1b5961ceae626e
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index 3f6c5e0eb771..9b7265e7fd7a 100644
--- a/metadata/md5-cache/x11-misc/Manifest.gz
+++ b/metadata/md5-cache/x11-misc/Manifest.gz
diff --git a/metadata/md5-cache/x11-misc/arandr-0.1.11 b/metadata/md5-cache/x11-misc/arandr-0.1.11
index 4cea60199f8b..741438061888 100644
--- a/metadata/md5-cache/x11-misc/arandr-0.1.11
+++ b/metadata/md5-cache/x11-misc/arandr-0.1.11
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://christian.amsuess.com/tools/arandr/
 INHERIT=distutils-r1
 IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 arm arm64 ~ppc64 x86
 LICENSE=GPL-3+
 RDEPEND=dev-python/pygobject:3=[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,cairo] x11-libs/gtk+:3[introspection] x11-apps/xrandr python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=https://christian.amsuess.com/tools/arandr/files/arandr-0.1.11.tar.gz
 _eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=7162a76505230e8d2fe87eb9f91d9d1d
+_md5_=f3bc3416c39f2f3e8578e473b3d16250
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 6f07456bc860..04e3243a7e87 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 15153 BLAKE2B d9489813ffb032a3f6f6eacb6df9ad7819bf186e8ead6915d583a0259dd4ccdda908f27867444b45375911e6c60c83e1069b4a71a2a06470f795f6a9fac5b8e9 SHA512 14e11af3bb1e448bd105f6b59bfdeff65b818fc1e4fad2e98891985fef279f09bf5e599162f137b666332a787df599358edcef202bf7d6ad3e111d3c5ab90cd5
-TIMESTAMP 2023-02-21T01:39:43Z
+TIMESTAMP 2023-02-21T07:39:41Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmP0IN9fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmP0dT1fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBvLBAAqKmbMEBpDp1AOHf/2r5jQ1C0Ic1+54UHST1KmIXh7VwPE4KXRIfcJk59
-yN0410h/keVq+RzZMD+rXIfnBv6I3mHANluYD1S4WVx4BcQO2ms9UD1YEzQUSvY0
-GSWHIIYi4SbKdYiApwsXWB1bluo3neLNBNBOheCMqZ4VGvkSiOG2h/FE5B6vVBGt
-w/Ru6aWzaArrvKkl+IyFW1lLGD62Xa+zhDWiDNXcNAWj9ohtaoTYbWPdWpXnD99J
-fas38nywwOl20VIw0AL6UAehQLtrFVwiIKWOedPyFCzUSiy/3PSIPn03GuxbOz2b
-b2o+qxqK6M3I0FL/D5Q6/hu92jSeGbsoD24FRJP/Hul0patEiVaIYSXfXpF6Zk13
-RyjrbOX/jI3hl3t7QuGUL3iMgMV/axHWAwgj8stwl9xS6Cdra+hZEQnCZfigcjxO
-eN3tvO8TGrty6cxJ4yw6PPHdo9yYXo2NVWemM/RQsPlUnqcxxeSWzCtJh631uzC3
-8GkSNkg8Ygsm3x3maUdQVXNu0MXvo/6po9p7P4vbgpREjrmlTg4ggs+yn6q76mRt
-fH7pf/0fAtSeAgjslIDWTmn5Nkfs2A7JkwHAbZSeOH8yjnYUJyVA8dnZFw/2txFI
-CxqMVrFfHPNyV9ibb5fo1sz8cOtAOhp+T42bUi6f9nzfBjPKG0w=
-=n9I0
+klD2kg//X3BSU1ZkCCRg1eLl+MeHgUU3RuIZlPynpQ5OD2A9NSApVuEmdY2ChdbO
+pV4quFjOo2O8cgyEiH9h4yqTBdPPRMWJD+hfJ/mQBmSJ7uZZZ09Ms61kgEcuJpQ/
+1MHe+fe7Ureb2LeeAI9ikItisMhne0jtGIUobk1GFoB81Ja++k5ylCxzt8E0v0Ae
+ttGi+uOmWgEWEUs6HqZev4OIdwL5bfIZUH668YAsqwC4XNbv5WQ30lQiUQB6c8W+
+7Kq5EpA/PYCLMxyuA0FYmDTo+nMQJvAH1mZAqt2hMFy+E1/WYOojjtbZOxHBjpQ4
++MInkjIoFVTvHUFAaQtnJWmHpOMnRLuUd/Ie7orPQgdvTqaCiiUXmzT7WxvONPoi
+vEc3OTOlbVVg25ouDQR+1Hkf+lufoAsKhffZEW5fpLYcrrI1G7xbgj2DR7rl/iYE
+jwPnf/JFxO/HwT/OkBueZ46SzE5Yl3FwoQLBHkwnf2J4l7MTa/6dNQPvS++t+Dd6
+5HAPgqRt9uQimz/8Tq5lhkomCl2lZDXwOyzemhmYfJw3ETD84oRs8VSr4INjeIKt
+SO6e7gPTYI1B9/UTDJJIZviOf8uh98baka9NbTAmiX339sfaFmxwCLGZdYhrzUgX
+bEcnS8QD71NGXd2bob60edx3OGXecinYhTuIS0NP1QOzsT03cX4=
+=vaZI
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 8a66be28b902..5db4369a2486 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Tue, 21 Feb 2023 01:39:40 +0000
+Tue, 21 Feb 2023 07:39:38 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 132acbc78f98..00f881285f93 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Tue Feb 21 01:39:40 AM UTC 2023
+Tue Feb 21 07:39:38 AM UTC 2023
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index db857f94a988..b67c93ebbaa8 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Tue, 21 Feb 2023 01:45:01 +0000
+Tue, 21 Feb 2023 07:45:02 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 3d69f23f65a7..9b32d143cf98 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-8671fdf7d053740bbcc902c692052bab110962eb 1676940067 2023-02-21T00:41:07+00:00
+d82ac47020ebca54402c93497fa71b06cb20bfe4 1676964060 2023-02-21T07:21:00+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 4723925e855c..7a7ac24554c4 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1676943601 Tue 21 Feb 2023 01:40:01 AM UTC
+1676965201 Tue 21 Feb 2023 07:40:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 8a66be28b902..5db4369a2486 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Tue, 21 Feb 2023 01:39:40 +0000
+Tue, 21 Feb 2023 07:39:38 +0000
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index da39b76aa03a..61d93e4d373c 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/most/Manifest b/sys-apps/most/Manifest
index f673d2a5de2f..dcad9c2950b3 100644
--- a/sys-apps/most/Manifest
+++ b/sys-apps/most/Manifest
@@ -3,5 +3,5 @@ AUX most-5.1.0-fix-parallel-build.patch 761 BLAKE2B b2aeb5019305138ee0ac816c0759
 DIST most-5.1.0.tar.gz 162172 BLAKE2B a3c0f3d85e7c4f4a014c174efb0d3d22b0fc2758e403ddccc74308399eeec616800e16db33554f0ca53fba674efba9dd93d51ed0c3f887b2c24fd3dd2335387c SHA512 cbc090283bbaafb8ffee9d6d1abc7b49cd58d54b742cf8dc86274351dee6398d1f24841bd1631ac40f861ad9e23569646133d3297317d9d514a7a38dd74533d2
 DIST most-5.2.0.tar.gz 256075 BLAKE2B ae73680cedb0306dd6980c637fd8c0d016537663ab707e925931972822f718dd31fc80d83598af9832c7869b5abf4ec3333bc076ce56c4a6d42f71d30be1a50d SHA512 3aa3cb46ddd456532a009fb9cfcd746971396be33e03e52a15b754a6d7683f4efd020edb0ec4eb36d22ba20f050aaac4ba6cdd3b69bb5701ea58ddb9a903c59d
 EBUILD most-5.1.0.ebuild 917 BLAKE2B 14508a5b03c06d1fa4f94eb5b25710dfd6ebab34de570b360fc9cc3150fd1309d1d5ba39913ae1fce96af420fa416db6cda271ebcf2c29863a27555d7bd57c50 SHA512 87941a9e5a52f001519074a5e22146e453a253736bf0cf22939d4f6e6876df77e898951e8ed0ea22535bf98ad8e8c1dde4265027f99b22568831208a168cea6e
-EBUILD most-5.2.0.ebuild 877 BLAKE2B 166f782883e6a576e8160b45f2702ec06bf4a088440c9ed4e419828d41f1c949458d9b7f679c626941205a478b72a2aa88277a1bd9644d7426f8ac80152b7543 SHA512 8ec470897022752c45aca24adea4927ccc34add4200c3207879aa4936d4893a641068b9b9004f6803ca6603b0831683d584a50bc9ed1b5521ae77fe56a3c707a
+EBUILD most-5.2.0.ebuild 872 BLAKE2B fe273409837e30783d331c0f4a36cbb88d3cf89398895282e5a7f93116b9f90f8c5de8d3898696525cc61ebaac8f583d33d1cf7f4f4f93ceb574f483e5034d49 SHA512 8f12ab396db4d4e345d09f4c1f28315fc33aae8680d863d12dffc19b1908e6b82449ac7745a435651dbdc08f361b6fb1be261ba0321d9f365cc7bedc420f60df
 MISC metadata.xml 353 BLAKE2B 20b4dc12fbe79c13693505e5b0861b89c10f7e89fe0e616550f5e74fb19049b3a7037fc05695ad6c0f29638251d53a9adab2a50c0216da6d77a1b45b1eace811 SHA512 a91058c3bbe915315fe012250d3c9f7be38d7f9a19980cc2df2ccfb102c82ab2eeb8931b47d7350363149a6302dd3d75128d9cf48237f55fbc866155440614e9
diff --git a/sys-apps/most/most-5.2.0.ebuild b/sys-apps/most/most-5.2.0.ebuild
index 20f8f9098a74..d324a0b7bde0 100644
--- a/sys-apps/most/most-5.2.0.ebuild
+++ b/sys-apps/most/most-5.2.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.jedsoft.org/releases/${PN}/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~mips ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE=""
 
 RDEPEND=">=sys-libs/slang-2.1.3"
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 968c1770a091..9bd011e9cb89 100644
--- a/sys-kernel/Manifest.gz
+++ b/sys-kernel/Manifest.gz
diff --git a/sys-kernel/linux-headers/Manifest b/sys-kernel/linux-headers/Manifest
index bd612d88bb47..c043eaf45174 100644
--- a/sys-kernel/linux-headers/Manifest
+++ b/sys-kernel/linux-headers/Manifest
@@ -1,4 +1,4 @@
-AUX linux-headers-5.10-Use-stddefs.h-instead-of-compiler.h.patch 2053 BLAKE2B 63026eafd7e624385e18341f1f96e2fa8c7bff865b4bfb5f0c643c9ed4398727f8b36ee7f6fe471d1154d9d5300bdcbe18eb5a3b493c1ba71c25f71d01f73c25 SHA512 39de4ca1704c8eed0a1a856a88ca25f12b2c58f6c1b903d6e9601a287db31c718fe088b211fb6151abfe922b624418fb220d357c27b758f2b58fe2987ccdef79
+AUX linux-headers-5.10-Use-stddefs.h-instead-of-compiler.h.patch 2197 BLAKE2B 31ef872fd2658c141dda8653a4110003e7809d78dcd485abd15a9467e3090380e7314c7588ac5f8ec466eea7e6bcaf53dd25d4a1c548e199b1b57b06a911fd38 SHA512 1c0d5a46907617c5b6008ba06e726d268d18e2d80b1cc71325847dd9baa3571c237bcab640d4ed4fdf286ba89a9b56a8e415341da37f83f90ab94f2b6abbead3
 AUX linux-headers-5.15-remove-inclusion-sysinfo.h.patch 778 BLAKE2B baf48088843ab6dd42bd4e69cacb39bbf9633e5ff58868606cb553794c42e6ad4b360166b567b4b39bea4c9cc68c299e32156c687db3aeac284bfb4ce3da1b55 SHA512 d5d6c6e6edb3d50b4f3005838625a8a0064ea6f30c0ed98913ef584e973cd7e47b9f0670f932a434d66df16e850b0efb4fb01052d962ca82464af13810054156
 DIST gentoo-headers-3.18-1.tar.xz 3628 BLAKE2B 9e677389139e8e3e42508171593797b78f24368ceaba4f76c242b5827bf657444a65a0d3b334034cc54f7f14b00b9da7446356e1a5ffd9aacb05d5a336d4437f SHA512 89fb9b336fa3455752f6fe8626500d30245c04806890d4448a2895bbef2a5eae409940618fd4e0be57aa12784a198a695c32479f12d76450e16f2af1536e7a1f
 DIST gentoo-headers-4.14-1.tar.xz 4080 BLAKE2B 5d8bb4453d3b0b739922a86e0e45120fe5ad57c3310ff6a94830a3a7561fb3b5eef7805ff171bdf0d5582fc91848fad948162e63ec4922280c8ed68ba58d50e1 SHA512 e0f806db641c99f3f71e27fde29705685745c9c03b901c943cab5af84e2e9c3af96f5d2d10d8f5328ec7e4dba28b378f534317bf1bee597d429557b981f0a865
@@ -11,6 +11,7 @@ DIST gentoo-headers-5.19-0.tar.xz 1168 BLAKE2B b4b90f23ddcbf0820f930bd605fb4a326
 DIST gentoo-headers-5.4-2.tar.xz 11352 BLAKE2B 0ff989dbfff9070c291efe1a8b925462770e71d0c3faeb2e53581dcce02abe45969ec293a7293b6d843f483927b15f4accc1f24ee4966483164e8f72727cfad8 SHA512 b460e4d00bdd9ec2ecf229f3b2dde7c6468f775399ba6a49fa0533c0688628c7b27d83835c21eab07407fd98c220043cd1b20e37cc4decbd08a3f2fd9cf6c2be
 DIST gentoo-headers-6.0-0.tar.xz 1164 BLAKE2B c288c6581224235367e8bfbd726d3e5ffa19b88b4950bbf4d5df0985835b25794986bbd0018a116455acc001c87f7e3b9290f6ba5ce16278ba4bfe02b9f402e1 SHA512 6bb5d7342e30a7e7bc0ecef5c2f95f3d78e8877b77c427728a3ca4614a13738c6d24f725c7047b896a868ee8a0ba1aea92355aebdf6723f08e6d4fd8c0c1c7d6
 DIST gentoo-headers-6.1-0.tar.xz 1172 BLAKE2B 6929760733cd4a89228554b57b1027ccf887b6c7e56b45f71db9926e9328e2f0cf28b2f386eaaaef461cb2e05e4b1c088ffafea308f25254409f56c381bea2ca SHA512 14c3629a3c3aded37655ed277d718ed8398a08e231682f88037f1feb0c0727ef298f5e17626372fe890606930c027a3a59d8266bac746960651a90443beab5c5
+DIST gentoo-headers-6.2-1.tar.xz 1172 BLAKE2B e357616353d4e756477c87b9e3a31c07758f9cc883076796e960d79083c3bbe22f4df215f068b4950cc8c35685a49355c7d1059b283bbd03784bd4152bd4f506 SHA512 9e08c87404821fbea00972484a24e73b53ed9c4471e9a7785b2433f2b96bc884eeba2b82788ea01eb8147450e53d9eb8e8bb21968de45d036f83bf2bbeb13b77
 DIST gentoo-headers-base-3.18.tar.xz 3776668 BLAKE2B 837a675ecf05ec270549d0ba6b9dcb98fb0e40f22007ebfa3e430152b7149dcfa29c8bbe38c737add07f75642234f1633c1d5ae0170788e8d4f765faf00bbdbe SHA512 6615c604e5e618d26fff5a61691f7827bb05be9790db6c9f8e16e3842bce8f056f9928f85ae5714710b75743b0d0804faba4ba9c76e934e1de22dc03ef6d5535
 DIST gentoo-headers-base-4.14.tar.xz 8017944 BLAKE2B e967a3f26fa002f62af72c165cf960e855f5d84dd105b3f136e5ae24f4cdfc9e5f8b217a83955b325ca4bd6bda0a9d4c4de02d8d79fd4aa72191bc63db96183a SHA512 2a4e83a9ee36ffa85b59ebac1e12f4f1c572825b767928a42c4748d924d04f0536bab4d9375ca68c11ad867c226f386c40c7c4d0158d1ab00c838eb5b2f9f21a
 DIST gentoo-headers-base-4.19.tar.xz 7956220 BLAKE2B 5b6868188b6cb505556b8f307972be6b27c0201e8287f6a2c4d0ac8bf16cfe048cb05afacf879731ba81de5e2a8c5afc4adad007e00b12efb8b2a158a666f4dd SHA512 ef0f159cb31651bf8e00c31d8ac807e64413c7bf88807e1ab4779524db10eec4726b65af0fad034a0cb2e000cd61a6008bcc174828061ffaf633c170dd09645c
@@ -22,6 +23,7 @@ DIST linux-5.19.tar.xz 131581464 BLAKE2B 4db03a6830a3b3bbf0837e1912182a443d9a4aa
 DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
 DIST linux-6.0.tar.xz 133886176 BLAKE2B c09a9c877ac0fac83dc31d2d04d96f0a3331d4ed78e3ad4edfd4dc077e1c11d0c49f419fdac4008b5c93d1b09c2b724e12ef0b38371ad0962908abf85dfa95fa SHA512 bac41a7aeb6e809616cee2f13dcd1c45e829dfd1ccf60aee1dc4c46b1e28532f4485c7d819a32940de84fdfbf89db80a4e919bce8a74b2948c5a01551771b714
 DIST linux-6.1.tar.xz 134728520 BLAKE2B ae60257860b2bd1bd708d183f0443afc60ebbd2b3d535c45e44c2e541bd0928530a3b62de6385dd4e4726ebbedcc0a871d4f3ffb4105b9f1f6d8ed7467f5688e SHA512 6ed2a73c2699d0810e54753715635736fc370288ad5ce95c594f2379959b0e418665cd71bc512a0273fe226fe90074d8b10d14c209080a6466498417a4fdda68
+DIST linux-6.2.tar.xz 136430892 BLAKE2B 05b63254734ea685db437cb1c00a6da63eee74d7e99f4ed2d074aaa01ac4487813ab297d337a6855cdbcbb33346b631c4256ee3b06191adfb1be3615a56bdd6d SHA512 a01bee0b968b95183934fe3504516be7ef5811944a061f5aed05ecebaa27b5eb64e33232fd0a8dd622b3c8743bfe462ef7e464d381734d111a0ad6a6d9f66ddd
 EBUILD linux-headers-3.18-r1.ebuild 1363 BLAKE2B 4a0c5ff3c52a22cb7f4c23945887de8acc3e5ed6176e6a899d86cf795a09403152241df75834cf7a3085782052e7f0f785b6831751bbef51aaf3105ca82bbb5c SHA512 5ad47c9ad8776ccabefab9011176a7b6a2d12264a44159d653baa57b57d19f1a02cceb6e537ba055519d1578965229e5a680176b69530003e2cac18fa417581e
 EBUILD linux-headers-4.14-r2.ebuild 1283 BLAKE2B 2f0282f1078199c2e451ec8f2b4fb08e4e00e4b19cabd72d8abc6d8cbeb905cab9d84cac2436fda97f7a5bf476038ea1c85204bf4cc88634e98c18669611288b SHA512 c3b91a9c96f6af0ecb53e31da5224f61a5350dc8887679f632d9eb28788ab1f0221391950b92142734b0234a5a9d7070ff3cad78cf12fbeb5b08583144bda07e
 EBUILD linux-headers-4.19-r1.ebuild 1440 BLAKE2B 2fd246a850a1d1ccad8d1599bb10f6fb40492332eee2f8dacf172d834c94f7ff992d7b29d3f2510d19856249346bda102b9ae01ca3e0786d177943129ef5ca62 SHA512 7b4b276f4653d6c60b6aa1d55efc07fa7d9625b29dc4449cbaa7bcd7a583b0b26a8f84906977c870a76d4b00765a5870572f4e0be2804dbcec62d8949f026a72
@@ -33,4 +35,5 @@ EBUILD linux-headers-5.19.ebuild 1445 BLAKE2B 20c9b0ca999d36c7833a96de2fc50fe6b0
 EBUILD linux-headers-5.4-r2.ebuild 1254 BLAKE2B 4b8545aff89fbce63ac91030a81aa416664969e1475ab33e40e2612adaaac4918231b12178176dff833e9b8292575d1a9b17d32041d8362a3fd99671e5bedf8b SHA512 ba73a588dfde65af652ad9f8fe39ad4a59cdd285f0afaa7a6c038d1bb351770028864de5c304441fca9db3ebf1f1b2f0b2d57e4c8f2aba1c2ab9466c8e099176
 EBUILD linux-headers-6.0.ebuild 1351 BLAKE2B bef3a8960d813a06432c5162bdbab3ca95cb07085aeeef7b817911ec6ffe7e367b4b0bfad190106d37cf01efaf04d77727e6f7d5a9643be3b62935c9c96a563d SHA512 06b3e4eb717999fa30ff57a846c217b018c81d49367adedd1824783415caa74640fabd3720f82ca12358b150f844a6ef0a0d64abb9725e9730c5981c79bccb47
 EBUILD linux-headers-6.1.ebuild 1351 BLAKE2B cda501d696269eb3c5903a6ea90afd2694714679dd9ef939952a40a2eaf3cd24a210d915620efb21b2506f95646c494b384170673bf5ed239cec9b338eb5fcd0 SHA512 fa95b07c1b47d11258141a1d10dbf4e4f82f216b6ee7a2b00806b1a77ffd694b2f1e287aad50d17be14360d4b4406266767862a400bb3db06d41d538ad40a71d
+EBUILD linux-headers-6.2.ebuild 1282 BLAKE2B bf9259941d7871592b797a50ebf5b95d56ee5181b64b7718a898aea99d2860cee2fb0902f7261eae4853893665a5b8e354b2b4efd72bd773e141ca00ed0859fb SHA512 79b2b5f5eb44df8a5d10b54351569d72107a0c7f9fccbbbb7d4f48404766fe646a2a49078eda5eca9f430ff9304245a5a49cb176ee01bae637f0e253391b3e3b
 MISC metadata.xml 345 BLAKE2B a7d97a94b8b2b72cbd9c7cc730bd66c6e174a2c0bb8bfcff7c279a87000a4435afbb048ca2d9424b391a0b0f992d0afd5efb20c0504062de3dfd49968fec0e74 SHA512 e7a62638f5ba1072ae773781c890f708d90001c4d517e2ecce8fbb791914f2e6769e5a0db63ade82f7d644c1ec3e9b19aae773c496d9059879a4192b7f26ccae
diff --git a/sys-kernel/linux-headers/files/linux-headers-5.10-Use-stddefs.h-instead-of-compiler.h.patch b/sys-kernel/linux-headers/files/linux-headers-5.10-Use-stddefs.h-instead-of-compiler.h.patch
index 07c780fef26d..f1ff9b92dd0d 100644
--- a/sys-kernel/linux-headers/files/linux-headers-5.10-Use-stddefs.h-instead-of-compiler.h.patch
+++ b/sys-kernel/linux-headers/files/linux-headers-5.10-Use-stddefs.h-instead-of-compiler.h.patch
@@ -1,5 +1,6 @@
 Needed for musl.
 
+https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/include/uapi/linux/swab.h?id=defbab270d45e32b068e7e73c3567232d745c60f
 https://git.alpinelinux.org/aports/tree/main/linux-headers/include-uapi-linux-swab-Fix-potentially-missing-__always_inline.patch
 
 From: Matt Redfearn <matt.redfearn@mips.com>
diff --git a/sys-kernel/linux-headers/linux-headers-6.2.ebuild b/sys-kernel/linux-headers/linux-headers-6.2.ebuild
new file mode 100644
index 000000000000..6380dcc8a8a8
--- /dev/null
+++ b/sys-kernel/linux-headers/linux-headers-6.2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ETYPE="headers"
+H_SUPPORTEDARCH="alpha amd64 arc arm arm64 csky hexagon hppa ia64 loong m68k microblaze mips nios2 openrisc ppc ppc64 riscv s390 sh sparc x86 xtensa"
+inherit kernel-2
+detect_version
+
+PATCH_PV=${PV} # to ease testing new versions against not existing patches
+PATCH_VER="1"
+PATCH_DEV="sam"
+SRC_URI="${KERNEL_URI}
+	${PATCH_VER:+https://dev.gentoo.org/~${PATCH_DEV}/distfiles/sys-kernel/linux-headers/gentoo-headers-${PATCH_PV}-${PATCH_VER}.tar.xz}"
+S="${WORKDIR}/linux-${PV}"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+BDEPEND="app-arch/xz-utils
+	dev-lang/perl"
+
+[[ -n ${PATCH_VER} ]] && PATCHES=( "${WORKDIR}"/${PATCH_PV} )
+
+src_unpack() {
+	# Avoid kernel-2_src_unpack
+	default
+}
+
+src_prepare() {
+	# TODO: May need forward porting to newer versions
+	use elibc_musl && PATCHES+=(
+		"${FILESDIR}"/${PN}-5.15-remove-inclusion-sysinfo.h.patch
+	)
+
+	# Avoid kernel-2_src_prepare
+	default
+}
+
+src_install() {
+	kernel-2_src_install
+
+	find "${ED}" \( -name '.install' -o -name '*.cmd' \) -delete || die
+	# Delete empty directories
+	find "${ED}" -empty -type d -delete || die
+}
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 4cc2178de559..7e5c62bf7ed9 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/arandr/Manifest b/x11-misc/arandr/Manifest
index 9420c1b810f5..c9bf82388adb 100644
--- a/x11-misc/arandr/Manifest
+++ b/x11-misc/arandr/Manifest
@@ -2,5 +2,5 @@ AUX arandr-0.1.10-manpages.patch 1193 BLAKE2B 59816489bc196d73f32e810db5f6b661e3
 DIST arandr-0.1.10.tar.gz 100203 BLAKE2B b5754dda4c4f9c5e957a9fc75b7236480417b899c2705bc5aee514899c664d39b5902921c69ac425aff99f3a6ea512bfc0c2c0259519c1a6e0fc553f6e367cc2 SHA512 12c2fe5b36f8d8e688d990e352c1cfa3e8512c0b647b78a8af93f9472704e4867fac4c56c207465fb7b420c9022dc545dea8ad8a29af3037758ab4587dcd38ba
 DIST arandr-0.1.11.tar.gz 100603 BLAKE2B cbceaec815cb0b43731d10004a6fa3829e7ecbb1358b206a1dc2d8a1285884199e677a0e8a155ceaeca10d33515a1942754440569f3e338b79faa1b8351d4807 SHA512 5f3ccabbffac0ea9e05b9d8c229f4f3b05f06ef285fb05a1ce2d7f88fd1723fd680636f5b97764b0aeb3cedac16863c4ccb154d65bf6fe987a1b3cc8a0026584
 EBUILD arandr-0.1.10-r3.ebuild 670 BLAKE2B 051a3d28868b3cbb8d33fbef1ac65fecaf99b880aa287ec29a66af960fde3ced8e8de797708762ff9761a99d7a256942c80d432275212e119ac5ce1a9c55ad32 SHA512 a6fccf2c90337a9dcfeef2fe7a753c4d0d2a20e5646951ab71cc332e500d2a18716a9d9bfc3e8c6e47b9434feb829e5c834d95e89be09c5aeeb264ce5ced6095
-EBUILD arandr-0.1.11.ebuild 643 BLAKE2B a0b7ce6160ed45e3979019da0637856f8f1a1d97b6be05ee84d2d3c15d2f1c807061eadb5ad6fa4ec21affdf155a0bd5802828571d7878bd0b0240e003b79dca SHA512 1a4a4b51736e848db4d17894a020cbaea6e22f22107625b5462e1aea279abdc5f6370a1c106421e3482ca46405250837d5115602bf3f34af4e7a63cca816fc1c
+EBUILD arandr-0.1.11.ebuild 639 BLAKE2B 9b6593962e15bbddfb760da60b59adcc9ffbcfdc77180eca24886f09903765e8864a1747a0f90338909ce0b5a9d19d749daa93e5b80bcf727c6355f14b759286 SHA512 4cfb8054c43481cf652b7d78a7f4c31149ac8fde6b0f59cb0f9c8973d7983dd510ab7c3105b8c0ba3c6089c6a4199663714acf85422252050c0a7cbadd2147b0
 MISC metadata.xml 532 BLAKE2B c9c58abd579ff5e6ea71091dc54421fe90d75f14b0c4b31f712188f19fbc9b9216e4d581436f30b06066a7090a85cf2bceb0cbbaff2f1c5d43959833695973a7 SHA512 ee39d9e3a39864becd4e72bd72fc7691735d098d769e0715ae0a097aaaf0812fb06e1589f37166e34d6badb67c9041282270374426f0805f3c88c86bc265a26a
diff --git a/x11-misc/arandr/arandr-0.1.11.ebuild b/x11-misc/arandr/arandr-0.1.11.ebuild
index 1070e68f54ef..ab43a0525449 100644
--- a/x11-misc/arandr/arandr-0.1.11.ebuild
+++ b/x11-misc/arandr/arandr-0.1.11.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://christian.amsuess.com/tools/arandr/files/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc64 x86"
 
 RDEPEND="
 	dev-python/pygobject:3=[${PYTHON_USEDEP},cairo]