gentoo auto-resync : 05:05:2023 - 05:29:57

author: V3n3RiX <venerix@koprulu.sector> 2023-05-05 05:29:57 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2023-05-05 05:29:57 +0100
commit: 4e777c0133d093c9c8b992c92e0f244e2055bf71 (patch)
tree: d6fbeed2e9eb1b486babf5d6f4886da4bdba4dbc
parent: 6f57e716c7968def6387f9db258e883125bab84f (diff)
175 files changed, 3220 insertions, 864 deletions
diff --git a/Manifest b/Manifest
index 9301b146c687..e4f1dee6ecf8 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29460 BLAKE2B b0c3fd1874ac329f47b177dd4176609376ca474df1e23130f6aa55951ee4ebfd20b5f56584a9abe2477fdccb1b691d8dadb7cdcb16f9af64220cf913b70ae418 SHA512 8c594f9fe1c5714ea0f10d65b0415518ccd49855015612002e683a7bacc808254caf525b95403211f3e3010c09e8a161701de0edaa68e022ac6bbff6319438a3
-TIMESTAMP 2023-05-04T21:39:39Z
+MANIFEST Manifest.files.gz 29494 BLAKE2B ef68cc0c6b826af8ab9c9278e48d24de7815fa7fe5e79f462333245272820fea7fdf3bc5f7cc452cc2fed57c563e0ff282e2955d37f00e6753eb535d9e53463b SHA512 58d549095efe83513a6c09368d736f45b7ecd09ba964931ef0baaf3ad275947574629ecf531b15ce078d87e175d2e1e57ef48553e59facf2ffa18dc205f68e13
+TIMESTAMP 2023-05-05T04:09:40Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRUJhtfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRUgYRfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAWzhAArTob1KWYuLWQw7mF/PNKYX+iwmUnmpUeBBil7S7WuCP9Vg/ARGI+iAJs
-BI9447rHOiuwOoo3J7fVWcoNgNt804CCanqIO+E757J79wOSrDJwi0JHBxyTDOcS
-832de6mM4ufov6L0DmXEHc06rc4GMc+tP2RgrYk86qzNDRkxWdJNP3dEpqXK7Fxo
-8kb1SFaSvgrzYAqtZDlwHn+JNX4IrIBvWPEq0rWU49fDKHztD2/dkRuLxEPnudJG
-opjBQcWjrid5C3PQbCEBS/SVR2wynW4c/wHujHMs1QOU0MAe5pdNGpWc6XqwH9bt
-yiPjAwDOF8NUnHJPGdsGSZ3QB3Ty7zAIGoX46iPsoQhsKHz8HJDxcnYo2et95Npg
-FIQlavMCiPBfjprF/AdG7EAnN0SZYVFXDG1Q4DiHbxW7VS/HnJ76JlybQkMIYvBC
-XqAQbtwl2NwHx/MQc3L8qqe/a544ePLkEgSWzmlgV7C1aonnKLaGJoc0FbxTaCHi
-WTiUfJ3SgF0WKfZ1i+ijaynBPLr8WuAnalSDTwONWU6PY/kKQrx4RE/srqZROQYU
-LOMOiaJLlOjmY9+92IvpeeXxyZ/dxDRR4en6fs7HnS7TK2OUridNErcXRXzVAYeE
-9TIpdkTN46WeX9BTgk50Qx8xjXMXvkMaJmzE7XpeA3yDgo+/Ecw=
-=Y7pW
+klD8AA/8CYqvPKid46zW0OPy7b1c5q1k7LhEGkpE4oomBLbCHyDLXVwiTRuVpFqk
+htHAay2uJbjae7mJjn/Rers6r55WpLjH9tcYY03/EfrIveg5EsKr4MdNacHNPUAS
+MsufqX28TvD5sD2vA5RqtRG7Mvc/jSC0aTFxglPYFeqe+eUVkkKJ2VRpzLYpjMHa
+o4GWI8dIG4VXABXTlmWt2ELgM44XEHYxrgOfAVpeoA+0Vb1ZcnxaRJXAMUOcbUGV
+ur9Vuhu2hkOwA6aX6vE98MFgowl90O44kOenSEUw1Fr8m4+n7ZlD3Cf329PNlGZ+
+qmWpljT/aSv074EEPag0Orde88DwmS++up8MLrP7iWMH+d/HA7kdSOz5vu4BC12O
+poc0Y/Q2P0ioy4PKirbnywjpem0KVSMw6sMZl3ve1cyf26SkvK8vnw2VMbsg1KVI
+fYDTp52H//25yTW1xKKDAKHEqLIXS1qROYmLTuIwuDAdXbhDv7rrG8XIaG8m1Mql
+LmJAzn5EndUz/QWQoMabFYUrf1NAPTHbB1LXJXOG7RgFomjW/OVxckW7lpqTb9LZ
+Yf7YOS6KNUYqRt8PAFlqnz7jUAzILT1Ah9iEfHm60ritfa36HB9AvXgcl+uPIjis
+XQqlZNzf6R6W1x7rLCJK+lDkmctO4XOe5seRqZU0kj075NJV8tE=
+=bT9O
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 13d1064198a6..8d443499c4ae 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 5e5cdda8c7a1..7929fb19b991 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/brotli/Manifest b/app-arch/brotli/Manifest
index 302dec4e49e0..c705af0ea698 100644
--- a/app-arch/brotli/Manifest
+++ b/app-arch/brotli/Manifest
@@ -2,6 +2,6 @@ AUX 1.0.9-linker.patch 1799 BLAKE2B b082af9af7eb8df80bf86717e9b9511952e77afd649d
 DIST brotli-1.0.9.tar.gz 486984 BLAKE2B 8b9939d5224396ef33b43e019250ba4bc8949903583615e8dc02c85340fc0a1e2d1632161e00b0ee7355d77f05529ac772f482e05d2089afd71a0bf71e803904 SHA512 b8e2df955e8796ac1f022eb4ebad29532cb7e3aa6a4b6aee91dbd2c7d637eee84d9a144d3e878895bb5e62800875c2c01c8f737a1261020c54feacf9f676b5f5
 DIST brotli-1.0.9.testdata.tar.xz 3771536 BLAKE2B e22a7e926a68b64cf3ddcf90d2381201d0bac6486f28c3a675c83a2a685108491011195faf48df9abd478a011e874df560ae81988348f7605197805cc3be20dd SHA512 d98c48dbc7772959a9cf276b638cf773a05a896c9daf4f6235f7d7fd625490b3f538e0690afcd6968ff81ad3745c7d78419850c2518048c44d73b470bcd08c97
 EBUILD brotli-1.0.9-r3.ebuild 1780 BLAKE2B e66fa84dbe7cd5baa3d4438484ca2c09bbd2cbdbd0a5b1f64ef30f2ed3e899f41f97d7651655057d4c0c7a152b045b16cee31197a26827173c447700657feffb SHA512 4dcd91910425916f594e0e3b99e7edfd401823dc43d836857ffe4c1dfd5f689b777d4faffc8ee1d491a5eb6f2c078f51d8cf53099baab2190745fc13f7f9718d
-EBUILD brotli-1.0.9-r5.ebuild 2029 BLAKE2B 87d355ca45618400ce11f8b34f97375d2a3740b9557cde03715f2d2ce8e0a9c347f7d0b7fca7d2481b0c78a0059b31baed8736d3ae0b21b86f3eef6e58e92e49 SHA512 9f611eea09e46fc60778b9603078ef20b2c0fa0f2898536de41d6f5a5e3190539f7aeb123b04f55f796e3e2374256b10da26c5b19a791dac540adeee2a513068
+EBUILD brotli-1.0.9-r5.ebuild 2013 BLAKE2B 8ba6ec824eb053d94db4deca7be659d5d1448db1dd45d720d3e28e0bb52934a671905a95e92d61355a2cdbd642bcd9dcad51fe9348f828e37b91cbc2db8a2faf SHA512 16696302ab26b0dd5db7ccf624196e4154d2dfc94fd588f66e5403f993e69ab7771a7c1a43e341e039a3da4f2cc58614fc7f628972ae141a06b6ac98df3624e4
 EBUILD brotli-9999.ebuild 2021 BLAKE2B 8a689c9fae7889d63a59c8120b5c0306417d5a51d70a1fee97c70aefdad49c753a95989c8f4b421c650d97cde7be2fc7c4b14687d530259d6275af3b357ae8ed SHA512 690f209bcb831c1803f3296821b3dba069d5917ce7658a83dccb640120baf230d38f3d27cf93598ff73d686f7796b654fc9605ab638bb3c513952cbd593ad679
 MISC metadata.xml 829 BLAKE2B 31c7c9adc087001ef6feb8937752317fe46ab500de9c686cf450a9184574b6e4483214e12791b8a81f9dd591a6a5d1ab9fc6f3997831f1e7805d475ff54ac5ed SHA512 c49f2027ce150e20d76f50268940d0ed231419ad57904d1cfcfa76cd4dd281c89e1c16be907c3140026781ae74266b8f37b9a6455893f8e8d824e8e57281573d
diff --git a/app-arch/brotli/brotli-1.0.9-r5.ebuild b/app-arch/brotli/brotli-1.0.9-r5.ebuild
index bba511397ac0..5681d0303a51 100644
--- a/app-arch/brotli/brotli-1.0.9-r5.ebuild
+++ b/app-arch/brotli/brotli-1.0.9-r5.ebuild
@@ -3,7 +3,6 @@
 
 EAPI=8
 
-DISTUTILS_EXT=1
 DISTUTILS_OPTIONAL="1"
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{9..11} pypy3 )
diff --git a/app-arch/cpio/Manifest b/app-arch/cpio/Manifest
index d90af724ffce..e0cb9d391242 100644
--- a/app-arch/cpio/Manifest
+++ b/app-arch/cpio/Manifest
@@ -2,7 +2,10 @@ AUX cpio-2.12-non-gnu-compilers.patch 223 BLAKE2B e5ba3da0c1dc23199e52c3782d3a11
 AUX cpio-2.13-fix-no-absolute-filenames-revert-CVE-2015-1197-handling.patch 1505 BLAKE2B 77be2bbd0df1b7b44e7517aedd4393d5b4cdb5e90508fa45aa961efe32b4061beaf43b23798908c714aa23a252e914402b22a494d0d6def0a4dc8294b8f84418 SHA512 a60cbfb3cc418d9d45e226e6da4c857176ce0517e829e288ffa7dd85b8fcca1c0a7c0ae0e0eab14fdb438be742f2625aa1c3169a41d1fa05c5e3cd426f270687
 AUX cpio-2.13-sysmacros-glibc-2.26.patch 1449 BLAKE2B 7f57aa4c5f5c23bd78a35bd6aa9511d04fbfe37e76101c46eb76a0ed3d4fbd8d072e922d7a6131b6cd6173570dabb6cfcc412f91eaf4806dde296f6365c3f229 SHA512 219804608cd7d9cc7f3535cb071639845ea8dd6ab1f17c0fa11601030835a5445c93120b09efa55fd84c0d57635b01feded8430ca1eeeac154ddc1d960a9a5b0
 AUX cpio-2.13-wincompatible-function-pointer-types.patch 747 BLAKE2B 9145485db928d5fa1451d110dbf4a05253ac1e59b93e9089041e81276987fbe28f272ebae8964a29b0038f832340d44e184c6db9b9b1b8349ca8aefa512268d3 SHA512 24eac288b2c3a9afb07163d8aca14c80652b5fe7da66c6390c9ec16afe931c7398817ecb3d12cb8ff9152b3d181a1e031a3aba2b13f3ba4340846ea77be7d3f4
+AUX cpio-2.14-sysmacros-glibc-2.26.patch 1429 BLAKE2B fa2d83eee1c281eb391577e4837e15b6c58628c7eedb5429e61e26f601735c6bcebc2336824d54e60b534f9a904f9a1431912931a5c7872957effd941daccbe7 SHA512 3e0df053cd5f893e6495c6f46bf84381336491633a78a4b8d26893a3c73778fbc7d12a2cc2daeeed28f25053ab6833a9463a2fc110f7b4c24034b5bb5ba9d3e6
 DIST cpio-2.13-CVE-2021-38185.patch.xz 7844 BLAKE2B e338950e03c3eed3b4288435c9c75af8f0c3497b43680be4ee347e628db7cfac616b437a848094bf82cfc2c7f29d59b388bf0f6368b3b99770022e3f9533be11 SHA512 4d2cafefcd1ae9d86cb5171de2896799713490dfd9ed27d3dce0886fa4588c8df2b16ad8508a5dbb9155c9de6e40b6d1083bdb4774d967193a270a1dcbe37a33
 DIST cpio-2.13.tar.bz2 1354559 BLAKE2B 45d77723acb55f15c8574ab5a2fdff6fb1767629d177dd3416b0268e9f82ee6bdd11b4fa591ef020efccbdc3f4918cf77263169da1a0f6422dfe1a9712295778 SHA512 459398e69f7f48201c04d1080218c50f75edcf114ffcbb236644ff6fcade5fcc566929bdab2ebe9be5314828d6902e43b348a8adf28351df978c8989590e93a3
+DIST cpio-2.14.tar.bz2 1521004 BLAKE2B f2fa9f5bc39cd91f4755fdf27f43cff4d1c1f098639502689a01314762ad686bf357a1eda7f92e4c802e6e8335548ca31fc789cea056ef685c558892ddcbebd1 SHA512 2dc93a81e31b6fb7ff9976243d22ca7a84bb396c7ad09e0abfb5d5efae1164ebb319fb89be45045797f8c604b3e3d2ea0746e3cfe559aa86282ea4ec9a17da28
 EBUILD cpio-2.13-r5.ebuild 1527 BLAKE2B f82a77afd696bb32f1f8835450f638e9203c7edafceaeb4a893eb55fa394b1d8f23b7c32c359a726bdead2ca1aac045241f4166467aff77f25796dbbd5f550d1 SHA512 a2585c58aba0919afc098e92bba148a6edc3259ab1757b355d8bc6dd28ed6cf4817e9e4b150dce132063429423b624cf8a28a360c7fe8a2814fd3b0ca75f5210
+EBUILD cpio-2.14.ebuild 1196 BLAKE2B fd3f4021aef5b434fa4d1f7453c55286a0635d98c21e4d2117eb5f53ba7b12b53b414c53f78e1f5241a660ab31a0e29032c90635a8a9e09d79f01d3f7366d2dd SHA512 35ea5c58de1c69a2738ec9550d565c2d7a4900fbf6e1a13499cd096909f1d8dd8a9460692b81df392882cb5958810db9e9ceaf22ed588b2dc43f8e6c65128a21
 MISC metadata.xml 328 BLAKE2B f8b8bff5b160351a92837553de20eda1da31a6c0594c1118e1f71b3cd19d9ea8d3420bdce943d83644f5ffc234950f95fb9229a213660767dc5281120085b26f SHA512 08e1c6a03b894946bf6332bf46c8a7534ed0998777b30cb9eecb9c746bb333b65fb41dfeeb6938cbc08d0ad0a303d752ea70a6a6a6ae2c5c2935b2b4e4d9928f
diff --git a/app-arch/cpio/cpio-2.14.ebuild b/app-arch/cpio/cpio-2.14.ebuild
new file mode 100644
index 000000000000..1d3937b4bbab
--- /dev/null
+++ b/app-arch/cpio/cpio-2.14.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="A file archival tool which can also read and write tar files"
+HOMEPAGE="https://www.gnu.org/software/cpio/cpio.html"
+SRC_URI="mirror://gnu/cpio/${P}.tar.bz2"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="nls"
+
+PDEPEND="
+	app-alternatives/cpio
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.12-non-gnu-compilers.patch #275295
+	"${FILESDIR}"/${PN}-2.14-sysmacros-glibc-2.26.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable nls)
+		--bindir="${EPREFIX}"/bin
+		--with-rmt="${EPREFIX}"/usr/sbin/rmt
+		# install as gcpio for better compatibility with non-GNU userland
+		--program-prefix=g
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+pkg_postinst() {
+	# ensure to preserve the symlink before app-alternatives/cpio
+	# is installed
+	if [[ ! -h ${EROOT}/bin/cpio ]]; then
+		ln -s gcpio "${EROOT}/bin/cpio" || die
+	fi
+}
diff --git a/app-arch/cpio/files/cpio-2.14-sysmacros-glibc-2.26.patch b/app-arch/cpio/files/cpio-2.14-sysmacros-glibc-2.26.patch
new file mode 100644
index 000000000000..e6b187c8f5c6
--- /dev/null
+++ b/app-arch/cpio/files/cpio-2.14-sysmacros-glibc-2.26.patch
@@ -0,0 +1,42 @@
+--- a/am/ax_compile_check_rettype.m4
++++ b/am/ax_compile_check_rettype.m4
+@@ -70,6 +70,9 @@ AC_CACHE_VAL(AC_CV_NAME,
+ [for ac_type in char short int long "long long" $4
+  do 
+   AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
++#ifdef HAVE_SYS_SYSMACROS_H
++#include <sys/sysmacros.h>
++#endif
+ #include <sys/types.h>
+ $3
+ ]], [[switch (0) case 0: case (sizeof ($1($2)) == sizeof ($ac_type)):;]])], [AC_CV_NAME=$ac_type])
+--- a/configure.ac
++++ b/configure.ac
+@@ -37,14 +37,11 @@ gl_EARLY
+ AC_C_PROTOTYPES
+ 
+ AC_SYS_LARGEFILE
+-AC_HEADER_MAJOR
+ AC_C_CONST
+ AC_TYPE_UID_T
+ AC_CHECK_TYPE(gid_t, int)
+ 
+ AC_HEADER_DIRENT
+-AX_COMPILE_CHECK_RETTYPE([major], [0])
+-AX_COMPILE_CHECK_RETTYPE([minor], [0])
+ 
+ AC_CHECK_FUNCS([fchmod fchown])
+ # This is needed for mingw build
+@@ -65,7 +62,11 @@ AC_ARG_ENABLE(mt,
+ 
+ AM_CONDITIONAL([CPIO_MT_COND], [test "$enable_mt" = yes])
+ 
+-AC_CHECK_HEADERS([unistd.h stdlib.h string.h fcntl.h pwd.h grp.h sys/io/trioctl.h utmp.h getopt.h locale.h libintl.h sys/wait.h utime.h locale.h process.h sys/ioctl.h])
++AC_CHECK_HEADERS([unistd.h stdlib.h string.h fcntl.h pwd.h grp.h sys/io/trioctl.h utmp.h getopt.h locale.h libintl.h sys/wait.h utime.h locale.h process.h sys/ioctl.h sys/sysmacros.h])
++
++AC_HEADER_MAJOR
++AC_COMPILE_CHECK_RETTYPE([major], [0])
++AC_COMPILE_CHECK_RETTYPE([minor], [0])
+ 
+ AC_CHECK_DECLS([errno, getpwnam, getgrnam, getgrgid, strdup, strerror, getenv, atoi, exit], , , [
+ #include <stdio.h>
diff --git a/app-arch/xz-utils/Manifest b/app-arch/xz-utils/Manifest
index 86c3f762f9e1..202cbe266b5b 100644
--- a/app-arch/xz-utils/Manifest
+++ b/app-arch/xz-utils/Manifest
@@ -1,15 +1,15 @@
 AUX xz-utils-5.4.2-Wsign-conversion.patch 927 BLAKE2B fb26227694e87ef5ea98f039f983e4fcf3a7785ca4957d8c0c62f30b0dd8d43e36c1f251144a03301de220eb2d1ea25380afda39232a455ff7deb827ae8209fa SHA512 a2b3a9fc5ea5633069b79337cd2450618c5a1edc07ebe35837bf74e61c164f18f4fe3651ec61f94af6a6767c44b046bd780c635dfc94d4888b10494e95513081
-DIST xz-5.2.10.tar.gz 2123206 BLAKE2B fdd9e77e21ee65482401e0e43e0b291093a227d452991a9182562989b7a4388ceed30d5d54cd7f86320dcc073eb792032a49741880338a29043a8380507c4215 SHA512 c3814680fcad421efa71cf977217a62c34e3223900302a6fd7d505f310a7b338815feee2c8225b1232bd22b9e29c7dda3664e54dae2d80f816daec6adf560ca1
-DIST xz-5.2.10.tar.gz.sig 566 BLAKE2B ce72730816d03084dc0d1559d6f2890b3ebe25a5e6b0720d4775ba2364762b5d1934a3a53f2255f6e68a1cdf42778d85d8b02ab30396b2addab619e95855f733 SHA512 48a0864abee6639116678afab6e8319eb2de903b381362c611fb77f9b6fc21df5f7d9783a250810f7ecc08380fb371a3a791ab55f5a343b68b9d4f9e414da403
 DIST xz-5.2.11.tar.gz 2130684 BLAKE2B e513f99b2e28fa79f32747e21138cc13ab9340e95a302ac742bc6bda088465488173ea212704c4612f4059bbbc6c6a5b041332d84b999dc7df5b3fab1b1ac4e9 SHA512 8f75450380563229465420f4518fa7a60bbe6f0c9a3b580c2a9a7bf9bf380ad69209f792764115c346d89c49711478e8db42325ef9a46ccd3a6ec72292890ac8
 DIST xz-5.2.11.tar.gz.sig 566 BLAKE2B 34186ea22960f508dd796736107b99e1e3884ffae683f26671f455e46e4debf87400f2d7bb64b446fb142370a8bcebc6c05dce34dcc2678a761b9401b1e23860 SHA512 036ed0f663e179057a805a41052d3e437fbfb9dbbe173c5180fbb255f5a01ac4fa2561424228f4e568e63b22802b3a4ffd88dec2ba7c41a454998ebea30bea7c
-DIST xz-5.4.1.tar.gz 2528617 BLAKE2B f4dc8698fb97002aa0548107b448ab0dd8659cce506a83775930f95fd775601f7de1df44866310ac617853410a1915cd4e90ad4088b2fd56418e67b6f0fc4e98 SHA512 5cff8383a68fb88ecbb3770ec48af0ad5582e08de9dccd339e0b685aaa53447e59d6425caa3f63b54a674e5d78c20520876db547d156e6658ad4841660cba85b
-DIST xz-5.4.1.tar.gz.sig 566 BLAKE2B f384bcf7ea6bd7d3af65b6b17b379b48826257f403bca0bed1b42697f88edbc38f38eaac03c5564fc466df670f40e2e7ee49974232da4eb849718e89234c224b SHA512 2e6c3bf04ceb29c1bac8fdde7aa09c4d0f96442515d797e06ea860f365fd94777630b0034b98006cf844083efea8642a0bf87b1ff56de6a58446a644b1fd3c1c
+DIST xz-5.2.12.tar.gz 2190541 BLAKE2B 9ca5ecf753ae264f542ec53b4c9a1c85466bc2a932651aafb0ae2a3ebb7d3979a9384e9a81f16173c2d6d14ca8b86e4a820191817675a5e9fd214a64cf364c98 SHA512 1a67112eb1cfd70352c41a1cbb5e34eacd6da2ae816f5020385772a7698b835d059843c2c30461beb15b7514e95906b2033dac6abf09248b5837270420dfe732
+DIST xz-5.2.12.tar.gz.sig 566 BLAKE2B 93d0fb89186ccf018d17278823c2c6cc724798acfe425fd01ecf54338e53451d94b1ad951f2f1ec58171a3eb827fcd6b5d9dcb97da72c5d8545d57d9fba0597b SHA512 0734e1838dd9ab7ba06675af0f4ff5866c0e5c268f0c3e2ca6f12fa8f27b41830d11063244b0039f8d8ba184efc1c1b7b9a7311c378a02abc1290d7727357cb6
 DIST xz-5.4.2.tar.gz 2799022 BLAKE2B 3c622b0823f0cbb5fbc5eaa0372fc2f0fefe0950d131417f831bce47b6d9747d145429f0649de106819331f9ae6a289c497182c7b6d1e211513308dd083a9b72 SHA512 149f980338bea3d66de1ff5994b2b236ae1773135eda68b62b009df0c9dcdf5467f8cb2c06da95a71b6556d60bd3d21f475feced34d5dfdb80ee95416a2f9737
 DIST xz-5.4.2.tar.gz.sig 566 BLAKE2B 95c9c70fdd25b92095dd9691e4d9d4306a3f982becfe7bd42ca6132a76f29be2c2bc66f4fc2bda547058c18e227292f4185799eb905084fc3ab415ae867b4b1b SHA512 30e965c228ed3a8ecb804db8eb11703a765b7ee934030ea69bb3940b630811eb71bf74fd20371ef7759761904ece4f0144a0b00be4d843cf98299fd016f161aa
-EBUILD xz-utils-5.2.10.ebuild 2918 BLAKE2B 5772efb5b671c373b4d6cbb82d50bea4815b63fa2a8fc54e0e5823c7115837bb7a16c63cbc1045de139248d0b337109232b269272d2fe29129444f65a2d0aa7a SHA512 b200fe4c27ad62ed1de5d52fd2224711fd27d40c5724451b35e67b8658120fbf55ce7ae280917629e95c9e856a5951a85e5186ef993d2617318c13850874a473
+DIST xz-5.4.3.tar.gz 2869347 BLAKE2B c4192a59ca751567ebab17e08e72aa1bf0f5ca14af0b59fded1c4dff02c1b76ab30119a4138932f78f69bd4b7827071c81d6ca1c56be65491466ea061786ed78 SHA512 aff0fe166af6df4491a6f5df2372cab100b081452461a0e8c6fd65b72af3f250f16c64d9fb8fd309141e9b9ae4e41649f48687cc29e63dd82f27f2eab19b4023
+DIST xz-5.4.3.tar.gz.sig 566 BLAKE2B 1e3f86a2de532e77cae4c31928d57edeac81ca207e03c71523210605dc6bab76a50793697a242b232f74911c6e1872a0339ed977e2dd0d201504bd859fd3b4f4 SHA512 b7c7eedf4d9604ee50ec97275e5ab57e22a567402815281440ca765210c75707bd2de20e7ebfb0842725690ae19557916fc41a9fbdace5fec8190632b038292e
 EBUILD xz-utils-5.2.11.ebuild 2918 BLAKE2B 5772efb5b671c373b4d6cbb82d50bea4815b63fa2a8fc54e0e5823c7115837bb7a16c63cbc1045de139248d0b337109232b269272d2fe29129444f65a2d0aa7a SHA512 b200fe4c27ad62ed1de5d52fd2224711fd27d40c5724451b35e67b8658120fbf55ce7ae280917629e95c9e856a5951a85e5186ef993d2617318c13850874a473
-EBUILD xz-utils-5.4.1.ebuild 3114 BLAKE2B a25077bf6a903524fabce7bc7959acd7ea820741a8de98b04094f02920947d49fe9f4d0019046ac5b10c1f6907422549274b9e34db1736ddd17b0a972443aed7 SHA512 b44f2777f700852dc3d619a2b5c9e132005c158e04aaad80a0d8046c55386b50eae5a52a15d02d36bbcf0ab9caac417408bffaafea3918e0c6c54133c835ee05
+EBUILD xz-utils-5.2.12.ebuild 2905 BLAKE2B 6604228899ade7e198eb7c023fe78dc6c662dddc70bcefe1a44af197d9a49952f213391235917d34b13e724c7295982986c96ff479c580067616d83f7f34be01 SHA512 3ec3e1f99e3a7c69cf41f89486e1dc0f68add2606968368293b21f2903c4197310d9143ec23b655d180342e534cb15f27d033bb05268ff8c2a83c7efa5d7637b
 EBUILD xz-utils-5.4.2.ebuild 3235 BLAKE2B 1751736d700b4f42f6d18c5b8b9a835dcaa0014430f7cde0868cdb57763ebf66ea090c64a607548a2c56e650c5564503249c6046581a53b8e0b869506f60d631 SHA512 55e47ef3b71b162a58e0350320455655290db066d33f5dae85c4b1e3f0d988373e3df42c18b46cdd607ab2c76fae828695b3bd50c71ba1cf7510596008f6568b
-EBUILD xz-utils-9999.ebuild 3187 BLAKE2B 6d4af22029b01d33fb1a9bb5b981622f4510b10aab70948e2b546381d5e8b3471d26a0ba78cb61478e00985cc3dfc200b41dfbbc0a920cb16e28b93367138dfa SHA512 8334ac61832be9baaacb690465fb933b50d79777757a3f07802bca8eff1150b973339a3f9805e3f96451e84fe69ce2558d6487ba71918ab067ea44ef5dfcfc9a
+EBUILD xz-utils-5.4.3.ebuild 3166 BLAKE2B d0cb1ab19c4da12013c8a107edd081739329b841f7d0024cea267da49f74731824067f781e8b2fe5f641d01fc8d59bf3e4b1f048a7c69cf8419434908a8e032b SHA512 913a46942699178ea048151bddc85a5ba80e656ced5559cbf1c7ffac40384ea6c9763bde90adfac41270a498b1efa9f7dd3f3d568efd6ee4eaefa5395280dd22
+EBUILD xz-utils-9999.ebuild 3166 BLAKE2B d0cb1ab19c4da12013c8a107edd081739329b841f7d0024cea267da49f74731824067f781e8b2fe5f641d01fc8d59bf3e4b1f048a7c69cf8419434908a8e032b SHA512 913a46942699178ea048151bddc85a5ba80e656ced5559cbf1c7ffac40384ea6c9763bde90adfac41270a498b1efa9f7dd3f3d568efd6ee4eaefa5395280dd22
 MISC metadata.xml 663 BLAKE2B 7a6625813cb3bdbab8a37845c9c64ac53ff377db394f776357d4fff60fbfe7c7b0e954fdc15abcc8874dd6c0f9ee90bc6e179a00bc5d12cd2e7cedc6f998c019 SHA512 696e573853d5d401f22079492d8e2b5f3c27e9ec4b6095f5ff46f109366b1c65c11976123abed06f302b8f03aaa1b0c54884f0156fdfdce23f4bf28feaafd39c
diff --git a/app-arch/xz-utils/xz-utils-5.2.10.ebuild b/app-arch/xz-utils/xz-utils-5.2.12.ebuild
index ee655f3ae8a2..52e2b5940ba6 100644
--- a/app-arch/xz-utils/xz-utils-5.2.10.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.2.12.ebuild
@@ -4,7 +4,7 @@
 # Remember: we cannot leverage autotools in this ebuild in order
 #           to avoid circular deps with autotools
 
-EAPI=7
+EAPI=8
 
 inherit libtool multilib multilib-minimal preserve-libs usr-ldscript
 
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]] ; then
 	# bug #272880 and bug #286068
 	BDEPEND="sys-devel/gettext >=sys-devel/libtool-2"
 else
-	VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/lassecollin.asc
+	VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/jiatan.asc
 	inherit verify-sig
 
 	MY_P="${PN/-utils}-${PV/_}"
@@ -28,7 +28,7 @@ else
 	"
 
 	if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
-		KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	fi
 
 	S="${WORKDIR}/${MY_P}"
@@ -43,7 +43,7 @@ SLOT="0"
 IUSE="+extra-filters nls static-libs"
 
 if [[ ${PV} != 9999 ]] ; then
-	BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-lassecollin-20230213 )"
+	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-jiatan )"
 fi
 
 # Tests currently do not account for smaller feature set
diff --git a/app-arch/xz-utils/xz-utils-5.4.1.ebuild b/app-arch/xz-utils/xz-utils-5.4.3.ebuild
index 7dd91d3d6952..e30876d4e174 100644
--- a/app-arch/xz-utils/xz-utils-5.4.1.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.4.3.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == 9999 ]] ; then
 	# bug #272880 and bug #286068
 	BDEPEND="sys-devel/gettext >=sys-devel/libtool-2"
 else
-	VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/lassecollin.asc
+	VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/jiatan.asc
 	inherit verify-sig
 
 	MY_P="${PN/-utils}-${PV/_}"
@@ -35,7 +35,7 @@ else
 	"
 
 	if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
-		KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	fi
 
 	S="${WORKDIR}/${MY_P}"
@@ -47,10 +47,10 @@ HOMEPAGE="https://tukaani.org/xz/"
 # See top-level COPYING file as it outlines the various pieces and their licenses.
 LICENSE="public-domain LGPL-2.1+ GPL-2+"
 SLOT="0"
-IUSE="+extra-filters nls static-libs"
+IUSE="doc +extra-filters nls static-libs"
 
 if [[ ${PV} != 9999 ]] ; then
-	BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-lassecollin-20230213 )"
+	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-jiatan )"
 fi
 
 src_prepare() {
@@ -68,6 +68,7 @@ src_prepare() {
 multilib_src_configure() {
 	local myconf=(
 		--enable-threads
+		$(multilib_native_use_enable doc)
 		$(use_enable nls)
 		$(use_enable static-libs static)
 	)
@@ -110,7 +111,10 @@ multilib_src_install() {
 
 multilib_src_install_all() {
 	find "${ED}" -type f -name '*.la' -delete || die
-	rm "${ED}"/usr/share/doc/${PF}/COPYING* || die
+
+	if use doc ; then
+		rm "${ED}"/usr/share/doc/${PF}/COPYING* || die
+	fi
 }
 
 pkg_preinst() {
diff --git a/app-arch/xz-utils/xz-utils-9999.ebuild b/app-arch/xz-utils/xz-utils-9999.ebuild
index a6b8dfa60f8f..e30876d4e174 100644
--- a/app-arch/xz-utils/xz-utils-9999.ebuild
+++ b/app-arch/xz-utils/xz-utils-9999.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == 9999 ]] ; then
 	# bug #272880 and bug #286068
 	BDEPEND="sys-devel/gettext >=sys-devel/libtool-2"
 else
-	VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/lassecollin.asc
+	VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/jiatan.asc
 	inherit verify-sig
 
 	MY_P="${PN/-utils}-${PV/_}"
@@ -50,7 +50,7 @@ SLOT="0"
 IUSE="doc +extra-filters nls static-libs"
 
 if [[ ${PV} != 9999 ]] ; then
-	BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-lassecollin-20230213 )"
+	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-jiatan )"
 fi
 
 src_prepare() {
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index d25faa72fbd7..c579b8260649 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/gpgme/Manifest b/app-crypt/gpgme/Manifest
index b27ae98c7239..77babe34a28b 100644
--- a/app-crypt/gpgme/Manifest
+++ b/app-crypt/gpgme/Manifest
@@ -10,5 +10,5 @@ DIST gpgme-1.20.0.tar.bz2.sig 119 BLAKE2B 2f623dae9bbfa68eab7433854b4357dbcb1412
 EBUILD gpgme-1.17.1-r2.ebuild 3833 BLAKE2B d60d5a2af39b1d7ed33957b585d833e827f7d54a33d534d16fe5b83a66e54dba5bbe7777c6a941d70941c2d15bfe69a9018e799ba751d525e7541e237160a64c SHA512 2883f805a6d8faabcd403b4b4181e52341d7f88ee43bb636effdf8b0c621d84a63f93620d1b565b664586a739dae430859d6723f90862be9239f302cd3c3df65
 EBUILD gpgme-1.18.0-r2.ebuild 3989 BLAKE2B 900bbc00f2b861cd7f273a377f918355a4a146302c442bec93c7a6f7992eb3acedef21414434a2659241efcbd528ec250fbb79cf2569b001966889fe9afb776e SHA512 9096d760d9e7e461f710731bb7e193dc294fd0ebd5101c84b16ba648c06cee2eea4671b108cc70172e768b9193582b36878a089a07adcaf0ecdb0451391cc217
 EBUILD gpgme-1.19.0.ebuild 4254 BLAKE2B 5572b062d36e5a0acc2a8d9cf4cf4c169fc227a42848e6916bd61750f6199a061398db71a3568193dacff1f98379b2193caa9f567df890db2d73bd2623bc277a SHA512 259213db98e61b14ceba6d8a07deb2484aa9050259b4c37e59977b98a58f10b07dbbb67a3539a9c8fdba00fa5b29de28e252c3ecccae0bb719f018d497282d4c
-EBUILD gpgme-1.20.0.ebuild 4270 BLAKE2B 4904790efde5f8b7ec21296e2e114cbb24960b2a9f9f2afcffe39a851c49867c34fa3ff455b52ba3439a0b5b20c4c47a498b6014d93044ad418915fe12f4f97f SHA512 4a500519ac34107bf714e6c966a885a5462fcd06837b0b002a5130c7b53580a65660afbf5ae630fe80cbf82d3e7dcbe69a9a5b75ff86bec245c9aad50747b4c5
+EBUILD gpgme-1.20.0.ebuild 4254 BLAKE2B 5572b062d36e5a0acc2a8d9cf4cf4c169fc227a42848e6916bd61750f6199a061398db71a3568193dacff1f98379b2193caa9f567df890db2d73bd2623bc277a SHA512 259213db98e61b14ceba6d8a07deb2484aa9050259b4c37e59977b98a58f10b07dbbb67a3539a9c8fdba00fa5b29de28e252c3ecccae0bb719f018d497282d4c
 MISC metadata.xml 333 BLAKE2B 6dd18b63ec1f7656ab8bd705242bec45d7820db8be31f326172cad400711e6d7268c156d6b81facfdfa79118c04728ac910a8f8de36a11454227a1399235a582 SHA512 21b8d7bf3f14b5ab7e2ea587027395cdd881ecddd5a4f70237cafc70dc904b396a33f70dd7ef37519df5a204f4e3a89d9ea6ffc221df41bd9cbf23e69863f12f
diff --git a/app-crypt/gpgme/gpgme-1.20.0.ebuild b/app-crypt/gpgme/gpgme-1.20.0.ebuild
index dc3a4d3574a2..9d2e1b4f6143 100644
--- a/app-crypt/gpgme/gpgme-1.20.0.ebuild
+++ b/app-crypt/gpgme/gpgme-1.20.0.ebuild
@@ -9,7 +9,6 @@ EAPI=8
 # (find the one for the current release then subscribe to it +
 # any subsequent ones linked within so you're covered for a while.)
 
-DISTUTILS_EXT=1
 DISTUTILS_OPTIONAL=1
 PYTHON_COMPAT=( python3_{9..11} )
 VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/gnupg.asc
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 6643205f3ecf..12a9c13a475c 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/logiops/Manifest b/app-misc/logiops/Manifest
index 434b2cade74b..e326cd76e5df 100644
--- a/app-misc/logiops/Manifest
+++ b/app-misc/logiops/Manifest
@@ -1,5 +1,9 @@
+AUX ipcgull-0.1-gcc13.patch 881 BLAKE2B b9b1205b9e993a7798481ea4173413c587c37dc037904b5ae100d55c6dc26a473f0802ab0a72d6708b8da9e73462863546c8bf26adadf2095564b6de184aa402 SHA512 172abde61ada8cc148caea12e2501c9387fe48570c387de5fd51f8b046c7997d3a15c05225a362befe47ac728f56d698deb80920488f7d53eae1bad829998bd4
 AUX logid.initd 509 BLAKE2B 950294904989544d1dea65f516493a986cbe8556a17e66f7be0cd33f19d514b38e820c61241d32785d6f3607d6f2c6a2af4270ab60dc72dfcc5a5ffa7b91779f SHA512 bf98e11c87d9486dd3f59494eae7fda9536bc6a90166bf8fa5c4226d189a86bc83aa9192d0b8f6e962cdc7d0f76e295d50c7c345f9ae445926670ecfe3b6830b
 AUX logiops-0.2.3-musl-fixes.patch 1379 BLAKE2B 22e87ed2ee80d117557cf8693b100537cd092f866814f88e6eaac5a89f36350dcfd8b4f644262d2b45c353470728fee9bcae4ffe873e65c52cbd57639b21c5d4 SHA512 8fcb63b28fdce84a7248d515fb4669f082a540e19bdab88d87120fbc919e5c058d1f2b16395350cc5629ebc83d12ff42a26a6f71e2712f3daaa844556a8e0602
+DIST ipcgull-0.1.tar.gz 31909 BLAKE2B dc86ce909682e6683ed127eb0824c1dd031a2082879f02832005f4ee7157e89a584829d96d9656a984047fea27094f59591361b0a491cd07a9331a6fa9c2560b SHA512 04dc7305d0fc825fc701ff13bee44ed0606eaed29428d82e93c600efc8fba3cc47895ecd32d4ab9d045ca561161cce9f5bd30e87192e83916a433f4919454d76
 DIST logiops-0.2.3.tar.gz 69321 BLAKE2B f188c39bcf4a9d386a34a97612fed45db1bf93858717d4c6fc4ba08a78acd1ae020cef875421d4131cdc3f0219c848c67b7793888ac13e064539ebea293b4afd SHA512 5a7b7e76a89759a30e25da6117992e96d0a1a0db25af3d524d725e753fb5ce5fc67c8a5bdeb8b707a81f99eadfc8f24035a3a5e4544b1153bdedd2373a65173d
+DIST logiops-0.3.1.tar.gz 85535 BLAKE2B edef0ab57ee09d47cd6f0c214189c7b7afaa113ab882d7e3449a0818d4753250627671ad135748824de77680b63d113a64d8581571fdcaf2adbb5ed7c9a3885a SHA512 9b98b415fc3231066a51d3da780fd230f43a823316405eb4faba454b6fc5e3eb3b3b30cdeaf83126b848bfb267d4ff97ae8a19a9a76f48510f3af8fe3969bdab
 EBUILD logiops-0.2.3-r1.ebuild 1076 BLAKE2B 2792fd5656d339955057321c81cd5e65dd532ae864c5fbfe8982701ae9c64d3803bd5eb0d05de7b4a445f2dc29e5c6a00213d02c35c50bd3a522c0efff3cd3cb SHA512 2dfe06cb99ba3b54363979c58a08fcffc16c9e57756cfbf699787ec26172512209e17d2001a6efa7bcbe368e53a97b01c1f8e8839a67fa1723b835f03cae00ce
+EBUILD logiops-0.3.1.ebuild 1712 BLAKE2B 16507245c7c03e8c8aad5f016a197b0005c4f98425900f31e45826e0ba86bad88d0d6f30f92ef014026a4f5888fbfb4d8d5126e83554d18c3bb2378ba5684427 SHA512 ea006cd91a1fa18d4f5f183326723fc2cdfd2d3e151baf409a53eb6fded45c92a0f6b08036ab96ac7e7f2ff151a362bff986a84cb3e1c2e1d3cc99addfc566c3
 MISC metadata.xml 394 BLAKE2B 6ff8b462c12d3e99a5362e39bc7f9915d7ded195ade7e3006b49313722c69935dbf266154375d7438f7099f46b4773eee8093b8324304ab75fc26fd45090049c SHA512 31dd662e8c6b51205160dc491de0ce6f4b8665a435de337e2265ed7e846d2b3115eef0fc47473179127caa3aae8e663885f7aedf27ab1c905b432d293c6d9e71
diff --git a/app-misc/logiops/files/ipcgull-0.1-gcc13.patch b/app-misc/logiops/files/ipcgull-0.1-gcc13.patch
new file mode 100644
index 000000000000..38ec2e123ea8
--- /dev/null
+++ b/app-misc/logiops/files/ipcgull-0.1-gcc13.patch
@@ -0,0 +1,31 @@
+From 745329ed9d41051ddb6e4010229d4b54d868e1a4 Mon Sep 17 00:00:00 2001
+From: pixl <pixlone@pm.me>
+Date: Wed, 3 May 2023 17:48:28 -0400
+Subject: [PATCH] Require stdexcept in node.h
+
+Fixes compile errors on some systems
+---
+ src/ipcgull/src/include/ipcgull/node.h | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/ipcgull/src/include/ipcgull/node.h b/src/ipcgull/src/include/ipcgull/node.h
+index dbc8b33..8c5442a 100644
+--- a/src/ipcgull/src/include/ipcgull/node.h
++++ b/src/ipcgull/src/include/ipcgull/node.h
+@@ -19,13 +19,14 @@
+ #ifndef IPCGULL_NODE_H
+ #define IPCGULL_NODE_H
+ 
++#include <ipcgull/variant.h>
++#include <ipcgull/server.h>
+ #include <map>
+ #include <list>
+ #include <memory>
+ #include <string>
+-#include <ipcgull/variant.h>
++#include <stdexcept>
+ #include <cassert>
+-#include <ipcgull/server.h>
+ 
+ namespace ipcgull {
+     class interface;
diff --git a/app-misc/logiops/logiops-0.3.1.ebuild b/app-misc/logiops/logiops-0.3.1.ebuild
new file mode 100644
index 000000000000..147c5fb8398d
--- /dev/null
+++ b/app-misc/logiops/logiops-0.3.1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN_IPCGULL="ipcgull"
+MY_PV_IPCGULL="0.1"
+
+inherit cmake linux-info
+
+DESCRIPTION="An unofficial userspace driver for HID++ Logitech devices"
+HOMEPAGE="https://github.com/PixlOne/logiops"
+SRC_URI="
+	https://github.com/PixlOne/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/PixlOne/${MY_PN_IPCGULL}/archive/refs/tags/v${MY_PV_IPCGULL}.tar.gz -> ${MY_PN_IPCGULL}-${MY_PV_IPCGULL}.tar.gz
+"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="systemd"
+
+DEPEND="
+	dev-libs/glib
+	dev-libs/libconfig:=[cxx]
+	dev-libs/libevdev
+	sys-apps/dbus
+	virtual/libudev
+	systemd? ( sys-apps/systemd )
+"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( "README.md" "TESTED.md" )
+
+PATCHES=( "${FILESDIR}/${MY_PN_IPCGULL}-0.1-gcc13.patch" )
+
+pkg_pretend() {
+	local CHECK_CONFIG="~HID_LOGITECH ~HID_LOGITECH_HIDPP"
+
+	check_extra_config
+}
+
+src_unpack() {
+	default
+
+	# Submodule, which needs to be present for compilation
+	mv "${WORKDIR}/${MY_PN_IPCGULL}-${MY_PV_IPCGULL}" "${WORKDIR}/${MY_PN_IPCGULL}" || die
+	mv "${WORKDIR}/${MY_PN_IPCGULL}" "${S}/src" || die
+}
+
+src_configure() {
+	local mycmakeargs=( -DLOGIOPS_VERSION="${PV}" )
+
+	cmake_src_configure
+}
+
+src_install() {
+	default
+
+	cmake_src_install
+
+	# Install lib of submodule, as no install routine exist
+	dolib.so "${BUILD_DIR}/src/ipcgull/libipcgull.so"
+
+	insinto /etc
+	newins logid.example.cfg logid.cfg
+
+	newinitd "${FILESDIR}"/logid.initd logid
+}
+
+pkg_postinst() {
+	einfo "An example config file has been installed as /etc/logid.cfg."
+	einfo "See https://github.com/PixlOne/logiops/wiki/Configuration for more information."
+}
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index cc0baf181685..5575780975a0 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/tree/Manifest b/app-text/tree/Manifest
index 0d646980c4dd..d78cc64f6e4b 100644
--- a/app-text/tree/Manifest
+++ b/app-text/tree/Manifest
@@ -2,5 +2,5 @@ AUX tree.bashcomp 847 BLAKE2B de05dacd7b54426e89e4afbbb6fba74376212a8f02995ff9ba
 DIST unix-tree-2.0.4.tar.gz 59497 BLAKE2B c55f8f64f2dfc6364ce3ab5ec26e59860f958eacbf681d1d53848172d474605f71864c1eb7db27be15f3df2fc2979787685e80de76ff817c5cdfafb9c52af203 SHA512 59f391de5792ce9990153c2de06bc545813f9e7aea635c574ef21f1603203146cdad4dbed821266715d716241d7153276aa220626ce8354446dd85df47e75fa6
 DIST unix-tree-2.1.0.tar.bz2 51401 BLAKE2B 89b15df0268c03ba66827c7e6d234d1f5c4f6a5d9788e30bf6859d477b340393acbeec9ad7afc1909fdc7beb81ef7934917206066e0875d9f1662fca170f4127 SHA512 0f3a6ecb450bb3d683804667d4f15aecf9c9765578d47a62e39a8ff69cbe1c2a0a4a922fef3728359060338f4f9cd2de7ab8eb0f992a4c32949278bb47d17edc
 EBUILD tree-2.0.4.ebuild 917 BLAKE2B fc02cb6fbcaaca6481e2d761423df38318dda65bf11ac6576f246c64d0ebc9ea53e51166add1c89be9aaedaf99a7489d6758aec3f7606cda4cdeecb1c5d4b7e9 SHA512 500075a1d58a9ce4634893d7610fb92a8192c7967aa4a022778773cdbfa157eec0806e4a68b3b6c44c7bd99d0c9b78604bd4dfc1688bebbc60383cb137413ac8
-EBUILD tree-2.1.0.ebuild 884 BLAKE2B 6af8617edd8418a557aea5e5250303645c2d4ad74d18ea09a03d2830b7916792f5e64686908ffb2e59189feb1a57c076595ddf038dcda988a0d7a2789c4c79f0 SHA512 5d47608df95f75be6f9a3ff8dd1424fa0099e26827ee899da6666a98ec2f23fe63b23ef5a966ac37f4ed98eef2a69dbb5cd2e0021904ddb90c7864402a2f18b2
+EBUILD tree-2.1.0.ebuild 882 BLAKE2B 465f2dae75632bc364e3eac573a918297bf97cc60db3aafffcde9ae7fe54d0824c512537222f5c66f48bd8dfc8537ecc8dab40db12ed66d69fec7b789c18beca SHA512 17a8c0fe8fc58e7f118696219f866e592969fdadc8667bf8bae32054e708bff4b915800e8d40cce51f7d067b5c5677fb0503cbddd272cc112b55316fed8f076d
 MISC metadata.xml 726 BLAKE2B d4e2e3176f82eb4577dbac312756eaee7e50da883c80b0e22a2cf86e75493eb4791ffdef9387a48d5a486cf968526aa483e05b213dc172839f04c528701be69f SHA512 ff609ba8c9839744088c1d77159d039ff46aae920f570842d4dbda9b4b4b4a6956f49815571d5e2d837deac2128bf71fb42316d5520c5a0dfe74f9bec798b56c
diff --git a/app-text/tree/tree-2.1.0.ebuild b/app-text/tree/tree-2.1.0.ebuild
index 8774b8f16df5..86f0525dd5f2 100644
--- a/app-text/tree/tree-2.1.0.ebuild
+++ b/app-text/tree/tree-2.1.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gitlab.com/OldManProgrammer/unix-${PN}/-/archive/${PV}/unix-${P
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
 
 S=${WORKDIR}/unix-${P}
 
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 5932c5fb5568..708bb66dd3c3 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index c96759fd0b2f..586d11410259 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -15,7 +15,9 @@ DIST php-8.0.28.tar.xz 10801568 BLAKE2B de03f5ad262e830c70d24b9e2dd997897e5613d8
 DIST php-8.1.12.tar.xz 11747176 BLAKE2B 0505794826fb0fc92b04be5f7162af8aa92d782bb228243348d85b46866cd47089fcb7febd6886a8179babf64cb227bcdbf5d5f60d44dfefe1c947a3a708e3c1 SHA512 437b6a8146b58479f4d1acb7b35d68954f1f7bc13a8f3dddc66e1677d7e9b6a11154861f9e894cbd59b9c28d4df3fd5422f9b5553004e9fc8d0320ab59b9f907
 DIST php-8.1.14.tar.xz 11752004 BLAKE2B 5ba60621c641b25c2d8ab0c82e97d59131587718c75cc013dc4ba1ad68e668e7f86b67f01f02c434e65c8a9075581a7f2decb2b8c3706e325e25e9f717cdfd82 SHA512 75a5dc3b0490cd8105d4f6c5446522b38953d78fe7b568798db749740f365c818b251d86aba72f5e555c5fe4e4a28e352a9510803bf3cdfe37d125824ae84d61
 DIST php-8.1.16.tar.xz 11760948 BLAKE2B ac0d352dae05115197852092b9b3c0b5091528326806c70eb34e0aba6007f718e927e67045d65976cb2104e4737a475b2224d4f05ff89ddf8c3066e0240c38e1 SHA512 4515da38803272abfafb069d1684c66dbb5086987b148c48dd7d8acf8f5316d255cf321ec57d6fbffe914a35551a533446ac13c34bb7c984e0d109247e8e64da
+DIST php-8.1.18.tar.xz 11782240 BLAKE2B fc3355e34427198d87c51aaa5d5f02cb590859892d3d04fe067af555c7ad4e1e6908836faf534c29c720d2b9cfee1f3ed9de559d49902edef45520955d6c7f81 SHA512 e30dba23ab8711a04c21ad040d69807f479760a20f363fe3f91a297e9e6463d9558299b15231e00e2b1c95d03309e03bde8cbbe4043fce3e1b965236ece1d0f3
 DIST php-8.2.4.tar.xz 11991796 BLAKE2B 4e1aa90472e2dbacb23f95736c399ac2b0f6e9577f58b502c26b5a2731b7c1eabb34bbdb75a13a5903870937a063ef8f321bf22bb23a74404592542186065ff6 SHA512 997435f3f921f305147a520497c68031aad6d1212365ddf04674d919fd2787d169d2898536a59709b5530857c5746a25cf43e726a2c3a30bcf3372107b2cd388
+DIST php-8.2.5.tar.xz 12001192 BLAKE2B 9c404801a9c3fefcc5bf166de257617e5fb34e76a01147e7778ebf09a97e2499f79fec1f4e7ee1945aa8083f8e7a33acbd4d9cdecdf215cb9dcb240c927d6c22 SHA512 ae8aac35a58b342fbfb725044eecdb1065690c461b26e4225445bda3a1719e43eacc4ad5536ccce326cf56a18c20d424b85b1a53277100c7186fc4d54b2d77f0
 EBUILD php-7.4.33-r1.ebuild 21423 BLAKE2B 8dd66cd6b064ac0fd5b4157a37e819cccde4a2e40e3185624e73b1d5e1c0acc9efbb62c3da887942fd7e5813953a75b5e64baee72844fbb5e7b82c44148227d7 SHA512 5ade5f1bded3433579af049bc70a8bacecfda257efbb1165133033ed8f2b68a6ed6adc0479a6d9ec6abf6ec291d81f41fc4cf6bd29d894c94d86c20b2d53f908
 EBUILD php-7.4.33-r2.ebuild 21559 BLAKE2B 67c3ed1964c4d84ba6ddd1a8f5d65d4037c150c951700ac62583bfa7330bf096f7dea9f2ab35fa59826c16353b1d37fca2dc9a8db939c6b7031f05688f65d50d SHA512 b659397022e4c23bb9b41c86737496d159ba77b3dd5145ee30de33eacd5c34d1782c60e6ae1fff86d9f2974d7ca3f0be530e31dad65a8c65e6bbabc1da1e01e0
 EBUILD php-7.4.33.ebuild 21371 BLAKE2B 1a1f130cec31dac7fea7b6aa38473eb7ac19b1194c2c2a76023b09043261f73e516a3ba5d21d1da5e3354d6abf3ac606dfb2f27bc0fe1ab1aa162f7c05f95522 SHA512 4ffaae2b5e4724860c40d789f920a3e06455a0efe5ed5d628d74a7012aa57b352188bd577a8e4707ce01be9f3e26534ba1524dfbc4218a93927c6417277cc2e4
@@ -25,5 +27,7 @@ EBUILD php-8.0.28.ebuild 21883 BLAKE2B b0c23c162b11e652a57ec6218a26b6792baf81190
 EBUILD php-8.1.12.ebuild 21815 BLAKE2B c1610ff5a4e439954b228744cd0223a4205dd1b53e6cff7a48535db414b6d20d307ba1b31c96ea6ab60b2ed1f811eb612c80e245b49acdf9659a6f8b2bb94b08 SHA512 73b766c5dec9b7231f1149b279b47e8621e527bbce2e1606bafdf1e6cd3f647ca30b2fcd16e1d9c3160c4a50c464fdeefbd05e1102f9debe7b79abd68fbceb4d
 EBUILD php-8.1.14.ebuild 21820 BLAKE2B cda25e68ea7ea22d38db686ebb940f52d616ec7f72320ef66ad12a7768f6f484a72045577ce2d5e3e250d5065a278aa96496bb84ae7686a5b1edc8f057f52785 SHA512 315620f4d75fe120620c149a45b84917cac7b0ca3138797a0894f9ad3907d8cfc73fb18e0233ab2b3f3891771c2aac585a2d2b6d04995129923936e132f7dd45
 EBUILD php-8.1.16.ebuild 21818 BLAKE2B 1782dc5c71cef2ac3ca067f4d53fcf64e61850044384dfe9bc0e64a025ab1dcf328a455b2aadbd17dd8c92cc65029337598763e3644f488122cde39a913d3343 SHA512 2215fb5851cfd28ffff620ffe86b0d924f61e9a24ff724fa019be7c788fb7de3c53f23489d21553fd81670887cd463b959f9f9857a53cc872e72f70478e330d9
+EBUILD php-8.1.18.ebuild 21822 BLAKE2B 51b237d02bb3f8ede91b498fec4925cfd0ce7c8b437644d894572fdd9dc97bc3c985efdfba9a238c67a8e27278ad1515d197ac8d9abb4469e12f6a712e336665 SHA512 509fb7e69b1f5b6ba8cdd0b70f69d601343807c49741817d054875fe2c5aab3257510a4dcae10afba0c6821c6c1555f915eb78661e2de7bd6a73fd098aa4edb2
 EBUILD php-8.2.4.ebuild 21938 BLAKE2B 961781609a864080f2a53f834ab59522bd8b61af484188fb770a24b482890aed9c3c04dbe7fd9b5717c2f6072653b2439572c0451eb64ba51e96149961308fe8 SHA512 0c1a248916133b760585f6622708c5abd0a5defe8a5c3018ff418b65c7399e9c96acb936d0fee85c0cfb15b9624f25b841dac64d3d163faabc9edc15dab8c649
+EBUILD php-8.2.5.ebuild 21938 BLAKE2B 961781609a864080f2a53f834ab59522bd8b61af484188fb770a24b482890aed9c3c04dbe7fd9b5717c2f6072653b2439572c0451eb64ba51e96149961308fe8 SHA512 0c1a248916133b760585f6622708c5abd0a5defe8a5c3018ff418b65c7399e9c96acb936d0fee85c0cfb15b9624f25b841dac64d3d163faabc9edc15dab8c649
 MISC metadata.xml 3940 BLAKE2B 30345df2362f848bcb46aae1822d7c70716bb45348b25a75a3d19acf450d777c247445bb24eb8a17f5bf72758894a2d2ebfe05e9256dbe4aad7459b0fe3c1db1 SHA512 e5d9f6281cab122b3239fb694344b8ff5ae0c30da4bb9ed92594d1cf70bf82ddfe6816db3ee0326adfa471f5aec508ab0a7284fc3efab98dfc73fcc6770551ef
diff --git a/dev-lang/php/php-8.1.18.ebuild b/dev-lang/php/php-8.1.18.ebuild
new file mode 100644
index 000000000000..20d68c6387fd
--- /dev/null
+++ b/dev-lang/php/php-8.1.18.ebuild
@@ -0,0 +1,757 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+WANT_AUTOMAKE="none"
+
+inherit flag-o-matic systemd autotools
+
+MY_PV=${PV/_rc/RC}
+DESCRIPTION="The PHP language runtime engine"
+HOMEPAGE="https://www.php.net/"
+SRC_URI="https://www.php.net/distributions/${P}.tar.xz"
+
+LICENSE="PHP-3.01
+	BSD
+	Zend-2.0
+	bcmath? ( LGPL-2.1+ )
+	fpm? ( BSD-2 )
+	gd? ( gd )
+	unicode? ( BSD-2 LGPL-2.1 )"
+
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+# We can build the following SAPIs in the given order
+SAPIS="embed cli cgi fpm apache2 phpdbg"
+
+# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
+IUSE="${IUSE}
+	${SAPIS/cli/+cli}
+	threads"
+
+IUSE="${IUSE} acl apparmor argon2 bcmath berkdb bzip2 calendar cdb cjk
+	coverage +ctype curl debug
+	enchant exif ffi +fileinfo +filter firebird
+	+flatfile ftp gd gdbm gmp +iconv imap inifile
+	intl iodbc ipv6 +jit kerberos ldap ldap-sasl libedit lmdb
+	mhash mssql mysql mysqli nls
+	oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
+	readline selinux +session session-mm sharedmem
+	+simplexml snmp soap sockets sodium spell sqlite ssl
+	sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode webp
+	+xml xmlreader xmlwriter xpm xslt zip zlib"
+
+# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
+# The Oracle instant client provides its own incompatible ldap library.
+REQUIRED_USE="
+	|| ( cli cgi fpm apache2 embed phpdbg )
+	cli? ( ^^ ( readline libedit ) )
+	!cli? ( ?? ( readline libedit ) )
+	truetype? ( gd zlib )
+	webp? ( gd zlib )
+	cjk? ( gd zlib )
+	exif? ( gd zlib )
+	xpm? ( gd zlib )
+	gd? ( zlib )
+	simplexml? ( xml )
+	soap? ( xml )
+	xmlreader? ( xml )
+	xmlwriter? ( xml )
+	xslt? ( xml )
+	ldap-sasl? ( ldap )
+	oci8-instant-client? ( !ldap )
+	qdbm? ( !gdbm )
+	session-mm? ( session !threads )
+	mysql? ( || ( mysqli pdo ) )
+	firebird? ( pdo )
+	mssql? ( pdo )
+"
+
+RESTRICT="!test? ( test )"
+
+# The supported (that is, autodetected) versions of BDB are listed in
+# the ./configure script. Other versions *work*, but we need to stick to
+# the ones that can be detected to avoid a repeat of bug #564824.
+COMMON_DEPEND="
+	>=app-eselect/eselect-php-0.9.7[apache2?,fpm?]
+	>=dev-libs/libpcre2-10.30[jit?,unicode]
+	fpm? ( acl? ( sys-apps/acl ) apparmor? ( sys-libs/libapparmor ) )
+	apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] )
+	argon2? ( app-crypt/argon2:= )
+	berkdb? ( || (	sys-libs/db:5.3 sys-libs/db:4.8 ) )
+	bzip2? ( app-arch/bzip2:0= )
+	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
+	coverage? ( dev-util/lcov )
+	curl? ( >=net-misc/curl-7.29.0 )
+	enchant? ( app-text/enchant:2 )
+	ffi? ( >=dev-libs/libffi-3.0.11:= )
+	firebird? ( dev-db/firebird )
+	gd? ( media-libs/libjpeg-turbo:0= media-libs/libpng:0= )
+	gdbm? ( >=sys-libs/gdbm-1.8.0:0= )
+	gmp? ( dev-libs/gmp:0= )
+	iconv? ( virtual/libiconv )
+	imap? ( net-libs/c-client[kerberos=,ssl=] )
+	intl? ( dev-libs/icu:= )
+	kerberos? ( virtual/krb5 )
+	ldap? ( >=net-nds/openldap-1.2.11:= )
+	ldap-sasl? ( dev-libs/cyrus-sasl )
+	libedit? ( dev-libs/libedit )
+	lmdb? ( dev-db/lmdb:= )
+	mssql? ( dev-db/freetds[mssql] )
+	nls? ( sys-devel/gettext )
+	oci8-instant-client? ( dev-db/oracle-instantclient[sdk] )
+	odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) )
+	postgres? ( >=dev-db/postgresql-9.1:* )
+	qdbm? ( dev-db/qdbm )
+	readline? ( sys-libs/readline:0= )
+	session-mm? ( dev-libs/mm )
+	snmp? ( >=net-analyzer/net-snmp-5.2 )
+	sodium? ( dev-libs/libsodium:=[-minimal] )
+	spell? ( >=app-text/aspell-0.50 )
+	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
+	ssl? ( >=dev-libs/openssl-1.0.2:0= )
+	tidy? ( app-text/htmltidy )
+	tokyocabinet? ( dev-db/tokyocabinet )
+	truetype? ( =media-libs/freetype-2* )
+	unicode? ( dev-libs/oniguruma:= )
+	webp? ( media-libs/libwebp:0= )
+	xml? ( >=dev-libs/libxml2-2.9.0 )
+	xpm? ( x11-libs/libXpm )
+	xslt? ( dev-libs/libxslt )
+	zip? ( >=dev-libs/libzip-1.2.0:= )
+	zlib? ( >=sys-libs/zlib-1.2.0.4:0= )
+"
+
+IDEPEND=">=app-eselect/eselect-php-0.9.7[apache2?,fpm?]"
+
+RDEPEND="${COMMON_DEPEND}
+	virtual/mta
+	fpm? (
+		selinux? ( sec-policy/selinux-phpfpm )
+		systemd? ( sys-apps/systemd ) )"
+
+# Bison isn't actually needed when building from a release tarball
+# However, the configure script will warn if it's absent or if you
+# have an incompatible version installed. See bug 593278.
+DEPEND="${COMMON_DEPEND}
+	app-arch/xz-utils
+	>=sys-devel/bison-3.0.1"
+
+BDEPEND="virtual/pkgconfig"
+
+PHP_MV="$(ver_cut 1)"
+
+PATCHES=(
+	"${FILESDIR}/php-iodbc-header-location.patch"
+)
+
+php_install_ini() {
+	local phpsapi="${1}"
+
+	# work out where we are installing the ini file
+	php_set_ini_dir "${phpsapi}"
+
+	# Always install the production INI file, bug 611214.
+	local phpinisrc="php.ini-production-${phpsapi}"
+	cp php.ini-production "${phpinisrc}" || die
+
+	# default to /tmp for save_path, bug #282768
+	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
+
+	# Set the extension dir
+	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \
+		-i "${phpinisrc}" || die
+
+	# Set the include path to point to where we want to find PEAR packages
+	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die
+
+	insinto "${PHP_INI_DIR#${EPREFIX}}"
+	newins "${phpinisrc}" php.ini
+
+	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
+	elog
+
+	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
+	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
+
+	if use opcache; then
+		elog "Adding opcache to $PHP_EXT_INI_DIR"
+		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
+			 "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
+		dosym "../ext/opcache.ini" \
+			  "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
+	fi
+
+	# SAPI-specific handling
+	if [[ "${sapi}" == "fpm" ]] ; then
+		einfo "Installing FPM config files php-fpm.conf and www.conf"
+		insinto "${PHP_INI_DIR#${EPREFIX}}"
+		doins sapi/fpm/php-fpm.conf
+		insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d"
+		doins sapi/fpm/www.conf
+	fi
+
+	dodoc php.ini-{development,production}
+}
+
+php_set_ini_dir() {
+	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
+	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
+	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
+}
+
+src_prepare() {
+	default
+
+	# In php-7.x, the FPM pool configuration files have been split off
+	# of the main config. By default the pool config files go in
+	# e.g. /etc/php-fpm.d, which isn't slotted. So here we move the
+	# include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later
+	# we'll install the pool configuration file "www.conf" there.
+	php_set_ini_dir fpm
+	sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \
+		sapi/fpm/php-fpm.conf.in \
+		|| die 'failed to move the include directory in php-fpm.conf'
+
+	# Emulate buildconf to support cross-compilation
+	rm -fr aclocal.m4 autom4te.cache config.cache \
+		configure main/php_config.h.in || die
+	eautoconf --force
+	eautoheader
+
+	# Remove false positive test failures
+	# stream_isatty fails due to portage redirects
+	# curl tests here fail for network sandbox issues
+	# session tests here fail because we set the session directory to $T
+	rm tests/output/stream_isatty_err.phpt \
+	   tests/output/stream_isatty_out-err.phpt \
+	   tests/output/stream_isatty_out.phpt \
+	   ext/curl/tests/bug76675.phpt \
+	   ext/curl/tests/bug77535.phpt \
+	   ext/curl/tests/curl_error_basic.phpt \
+	   ext/session/tests/bug74514.phpt \
+	   ext/session/tests/bug74936.phpt || die
+
+}
+
+src_configure() {
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+	addpredict /var/lib/net-snmp/mib_indexes #nowarn
+
+	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
+
+	# The php-fpm config file wants localstatedir to be ${EPREFIX}/var
+	# and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
+	local our_conf=(
+		--prefix="${PHP_DESTDIR}"
+		--mandir="${PHP_DESTDIR}/man"
+		--infodir="${PHP_DESTDIR}/info"
+		--libdir="${PHP_DESTDIR}/lib"
+		--with-libdir="$(get_libdir)"
+		--localstatedir="${EPREFIX}/var"
+		--without-pear
+		--without-valgrind
+		$(use_enable threads zts)
+	)
+
+	our_conf+=(
+		$(use_with apparmor fpm-apparmor)
+		$(use_with argon2 password-argon2 "${EPREFIX}/usr")
+		$(use_enable bcmath)
+		$(use_with bzip2 bz2 "${EPREFIX}/usr")
+		$(use_enable calendar)
+		$(use_enable coverage gcov)
+		$(use_enable ctype)
+		$(use_with curl)
+		$(use_enable xml dom)
+		$(use_with enchant)
+		$(use_enable exif)
+		$(use_with ffi)
+		$(use_enable fileinfo)
+		$(use_enable filter)
+		$(use_enable ftp)
+		$(use_with nls gettext "${EPREFIX}/usr")
+		$(use_with gmp gmp "${EPREFIX}/usr")
+		$(use_with mhash mhash "${EPREFIX}/usr")
+		$(use_with iconv iconv \
+			$(use elibc_glibc || use elibc_musl || echo "${EPREFIX}/usr"))
+		$(use_enable intl)
+		$(use_enable ipv6)
+		$(use_with kerberos)
+		$(use_with xml libxml)
+		$(use_enable unicode mbstring)
+		$(use_with ssl openssl)
+		$(use_enable pcntl)
+		$(use_enable phar)
+		$(use_enable pdo)
+		$(use_enable opcache)
+		$(use_with postgres pgsql "${EPREFIX}/usr")
+		$(use_enable posix)
+		$(use_with spell pspell "${EPREFIX}/usr")
+		$(use_enable simplexml)
+		$(use_enable sharedmem shmop)
+		$(use_with snmp snmp "${EPREFIX}/usr")
+		$(use_enable soap)
+		$(use_enable sockets)
+		$(use_with sodium)
+		$(use_with sqlite sqlite3)
+		$(use_enable sysvipc sysvmsg)
+		$(use_enable sysvipc sysvsem)
+		$(use_enable sysvipc sysvshm)
+		$(use_with tidy tidy "${EPREFIX}/usr")
+		$(use_enable tokenizer)
+		$(use_enable xml)
+		$(use_enable xmlreader)
+		$(use_enable xmlwriter)
+		$(use_with xslt xsl)
+		$(use_with zip)
+		$(use_with zlib zlib "${EPREFIX}/usr")
+		$(use_enable debug)
+	)
+
+	# DBA support
+	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
+		|| use qdbm || use lmdb || use tokyocabinet ; then
+		our_conf+=( "--enable-dba" )
+	fi
+
+	# DBA drivers support
+	our_conf+=(
+		$(use_with cdb)
+		$(use_with berkdb db4 "${EPREFIX}/usr")
+		$(use_enable flatfile)
+		$(use_with gdbm gdbm "${EPREFIX}/usr")
+		$(use_enable inifile)
+		$(use_with qdbm qdbm "${EPREFIX}/usr")
+		$(use_with tokyocabinet tcadb "${EPREFIX}/usr")
+		$(use_with lmdb lmdb "${EPREFIX}/usr")
+	)
+
+	# Support for the GD graphics library
+	our_conf+=(
+		$(use_with truetype freetype)
+		$(use_enable cjk gd-jis-conv)
+		$(use_with gd jpeg)
+		$(use_with xpm)
+		$(use_with webp)
+	)
+	# enable gd last, so configure can pick up the previous settings
+	our_conf+=( $(use_enable gd) )
+
+	# IMAP support
+	if use imap ; then
+		our_conf+=(
+			$(use_with imap imap "${EPREFIX}/usr")
+			$(use_with ssl imap-ssl "${EPREFIX}/usr")
+		)
+	fi
+
+	# LDAP support
+	if use ldap ; then
+		our_conf+=(
+			$(use_with ldap ldap "${EPREFIX}/usr")
+			$(use_with ldap-sasl)
+		)
+	fi
+
+	# MySQL support
+	our_conf+=( $(use_with mysqli mysqli "mysqlnd") )
+
+	local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
+	if use mysql || use mysqli ; then
+		our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
+	fi
+
+	# ODBC support
+	if use odbc && use iodbc ; then
+		our_conf+=(
+			--without-unixODBC
+			--with-iodbc
+			$(use_with pdo pdo-odbc "iODBC,${EPREFIX}/usr")
+		)
+	elif use odbc ; then
+		our_conf+=(
+			--with-unixODBC="${EPREFIX}/usr"
+			--without-iodbc
+			$(use_with pdo pdo-odbc "unixODBC,${EPREFIX}/usr")
+		)
+	else
+		our_conf+=(
+			--without-unixODBC
+			--without-iodbc
+			--without-pdo-odbc
+		)
+	fi
+
+	# Oracle support
+	our_conf+=( $(use_with oci8-instant-client oci8) )
+
+	# PDO support
+	if use pdo ; then
+		our_conf+=(
+			$(use_with mssql pdo-dblib "${EPREFIX}/usr")
+			$(use_with mysql pdo-mysql "mysqlnd")
+			$(use_with postgres pdo-pgsql)
+			$(use_with sqlite pdo-sqlite)
+			$(use_with firebird pdo-firebird "${EPREFIX}/usr")
+			$(use_with oci8-instant-client pdo-oci)
+		)
+	fi
+
+	# readline/libedit support
+	our_conf+=(
+		$(use_with readline readline "${EPREFIX}/usr")
+		$(use_with libedit)
+	)
+
+	# Session support
+	if use session ; then
+		our_conf+=( $(use_with session-mm mm "${EPREFIX}/usr") )
+	else
+		our_conf+=( $(use_enable session) )
+	fi
+
+	# Use pic for shared modules such as apache2's mod_php
+	our_conf+=( --with-pic )
+
+	# we use the system copy of pcre
+	# --with-external-pcre affects ext/pcre
+	our_conf+=(
+		--with-external-pcre
+		$(use_with jit pcre-jit)
+	)
+
+	# Catch CFLAGS problems
+	# Fixes bug #14067.
+	# Changed order to run it in reverse for bug #32022 and #12021.
+	replace-cpu-flags "k6*" "i586"
+
+	# Cache the ./configure test results between SAPIs.
+	our_conf+=( --cache-file="${T}/config.cache" )
+
+	# Support user-passed configuration parameters
+	our_conf+=( ${EXTRA_ECONF:-} )
+
+	# Support the Apache2 extras, they must be set globally for all
+	# SAPIs to work correctly, especially for external PHP extensions
+
+	local one_sapi
+	local sapi
+	mkdir -p "${WORKDIR}/sapis-build" || die
+	for one_sapi in $SAPIS ; do
+		use "${one_sapi}" || continue
+		php_set_ini_dir "${one_sapi}"
+
+		# The BUILD_DIR variable is used to determine where to output
+		# the files that autotools creates. This was all originally
+		# based on the autotools-utils eclass.
+		BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
+		cp -a "${S}" "${BUILD_DIR}" || die
+		cd "${BUILD_DIR}" || die
+
+		local sapi_conf=(
+			--with-config-file-path="${PHP_INI_DIR}"
+			--with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
+		)
+
+		for sapi in $SAPIS ; do
+			case "$sapi" in
+				cli|cgi|embed|fpm|phpdbg)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf+=( "--enable-${sapi}" )
+						if [[ "fpm" == "${sapi}" ]] ; then
+							sapi_conf+=(
+								$(use_with acl fpm-acl)
+								$(use_with systemd fpm-systemd)
+							)
+						fi
+					else
+						sapi_conf+=( "--disable-${sapi}" )
+					fi
+					;;
+
+				apache2)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
+					else
+						sapi_conf+=( --without-apxs2 )
+					fi
+					;;
+			esac
+		done
+
+		# Construct the $myeconfargs array by concatenating $our_conf
+		# (the common args) and $sapi_conf (the SAPI-specific args).
+		local myeconfargs=( "${our_conf[@]}" )
+		myeconfargs+=( "${sapi_conf[@]}" )
+
+		pushd "${BUILD_DIR}" > /dev/null || die
+		econf "${myeconfargs[@]}"
+		popd > /dev/null || die
+	done
+}
+
+src_compile() {
+	# snmp seems to run during src_compile, too (bug #324739)
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+	addpredict /var/lib/net-snmp/mib_indexes #nowarn
+
+	local sapi
+	for sapi in ${SAPIS} ; do
+		if use "${sapi}"; then
+			cd "${WORKDIR}/sapis-build/$sapi" || \
+				die "Failed to change dir to ${WORKDIR}/sapis-build/$1"
+			emake
+		fi
+	done
+}
+
+src_install() {
+	# see bug #324739 for what happens when we don't have that
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+
+	# grab the first SAPI that got built and install common files from there
+	local first_sapi="", sapi=""
+	for sapi in $SAPIS ; do
+		if use $sapi ; then
+			first_sapi=$sapi
+			break
+		fi
+	done
+
+	# Makefile forgets to create this before trying to write to it...
+	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
+
+	# Install php environment (without any sapis)
+	cd "${WORKDIR}/sapis-build/$first_sapi" || die
+	emake INSTALL_ROOT="${D}" \
+		install-build install-headers install-programs
+
+	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
+
+	# Create the directory where we'll put version-specific php scripts
+	keepdir "/usr/share/php${PHP_MV}"
+
+	local file=""
+	local sapi_list=""
+
+	for sapi in ${SAPIS}; do
+		if use "${sapi}" ; then
+			einfo "Installing SAPI: ${sapi}"
+			cd "${WORKDIR}/sapis-build/${sapi}" || die
+
+			if [[ "${sapi}" == "apache2" ]] ; then
+				# We're specifically not using emake install-sapi as libtool
+				# may cause unnecessary relink failures (see bug #351266)
+				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
+				newins ".libs/libphp$(get_libname)" \
+					   "libphp${PHP_MV}$(get_libname)"
+				keepdir "/usr/$(get_libdir)/apache2/modules"
+			else
+				# needed each time, php_install_ini would reset it
+				local dest="${PHP_DESTDIR#${EPREFIX}}"
+				into "${dest}"
+				case "$sapi" in
+					cli)
+						source="sapi/cli/php"
+						# Install the "phar" archive utility.
+						if use phar ; then
+							emake INSTALL_ROOT="${D}" install-pharcmd
+							dosym "..${dest#/usr}/bin/phar" "/usr/bin/phar${SLOT}"
+						fi
+						;;
+					cgi)
+						source="sapi/cgi/php-cgi"
+						;;
+					fpm)
+						source="sapi/fpm/php-fpm"
+						;;
+					embed)
+						source="libs/libphp$(get_libname)"
+						;;
+					phpdbg)
+						source="sapi/phpdbg/phpdbg"
+						;;
+					*)
+						die "unhandled sapi in src_install"
+						;;
+				esac
+
+				if [[ "${source}" == *"$(get_libname)" ]]; then
+					dolib.so "${source}"
+				else
+					dobin "${source}"
+					local name="$(basename ${source})"
+					dosym "..${dest#/usr}/bin/${name}" "/usr/bin/${name}${SLOT}"
+				fi
+			fi
+
+			php_install_ini "${sapi}"
+
+			# construct correct SAPI string for php-config
+			# thanks to ferringb for the bash voodoo
+			if [[ "${sapi}" == "apache2" ]]; then
+				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
+			else
+				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
+			fi
+		fi
+	done
+
+	# Installing opcache module
+	if use opcache ; then
+		into "${PHP_DESTDIR#${EPREFIX}}"
+		dolib.so "modules/opcache$(get_libname)"
+	fi
+
+	# Install env.d files
+	newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
+	sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+	sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+
+	# set php-config variable correctly (bug #278439)
+	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
+		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
+
+	if use fpm ; then
+		if use systemd; then
+			systemd_newunit "${FILESDIR}/php-fpm_at.service" \
+							"php-fpm@${SLOT}.service"
+		else
+			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
+							"php-fpm@${SLOT}.service"
+		fi
+	fi
+}
+
+src_test() {
+	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
+	if [[ ! -x "${PHP_BIN}" ]] ; then
+		ewarn "Test phase requires USE=cli, skipping"
+		return
+	else
+		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
+	fi
+
+	if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then
+		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi"
+	fi
+
+	if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then
+		export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg"
+	fi
+
+	SKIP_ONLINE_TESTS=1 REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d \
+					  "session.save_path=${T}" \
+					  "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \
+					  "session.save_path=${T}"
+
+	for name in ${EXPECTED_TEST_FAILURES}; do
+		mv "${name}.out" "${name}.out.orig" 2>/dev/null || die
+	done
+
+	local failed="$(find -name '*.out')"
+	if [[ ${failed} != "" ]] ; then
+		ewarn "The following test cases failed unexpectedly:"
+		for name in ${failed}; do
+			ewarn "  ${name/.out/}"
+		done
+	else
+		einfo "No unexpected test failures, all fine"
+	fi
+
+	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
+		local passed=""
+		for name in ${EXPECTED_TEST_FAILURES}; do
+			[[ -f "${name}.diff" ]] && continue
+			passed="${passed} ${name}"
+		done
+		if [[ ${passed} != "" ]] ; then
+			einfo "The following test cases passed unexpectedly:"
+			for name in ${passed}; do
+				ewarn "  ${passed}"
+			done
+		else
+			einfo "None of the known-to-fail tests passed, all fine"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	# Output some general info to the user
+	if use apache2 ; then
+		elog
+		elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
+		elog "your apache2 command. OpenRC users can append that string to"
+		elog "APACHE2_OPTS in /etc/conf.d/apache2."
+		elog
+		elog "The apache module configuration file 70_mod_php.conf is"
+		elog "provided (and maintained) by eselect-php."
+		elog
+	fi
+
+	# Create the symlinks for php
+	local m
+	for m in ${SAPIS}; do
+		[[ ${m} == 'embed' ]] && continue;
+		if use $m ; then
+			local ci=$(eselect php show $m)
+			if [[ -z $ci ]]; then
+				eselect php set $m php${SLOT} || die
+				einfo "Switched ${m} to use php:${SLOT}"
+				einfo
+			elif [[ $ci != "php${SLOT}" ]] ; then
+				elog "To switch $m to use php:${SLOT}, run"
+				elog "    eselect php set $m php${SLOT}"
+				elog
+			fi
+		fi
+	done
+
+	# Remove dead symlinks for SAPIs that were just disabled. For
+	# example, if the user has the cgi SAPI enabled, then he has an
+	# eselect-php symlink for it. If he later reinstalls PHP with
+	# USE="-cgi", that symlink will break. This call to eselect is
+	# supposed to remove that dead link per bug 572436.
+	eselect php cleanup || die
+
+	if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
+	   elog "To build extensions for this version of PHP, you will need to"
+	   elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
+	   elog
+	fi
+
+	# Warn about the removal of PHP_INI_VERSION if the user has it set.
+	if [[ -n "${PHP_INI_VERSION}" ]]; then
+		ewarn 'The PHP_INI_VERSION variable has been phased out. You may'
+		ewarn 'remove it from your configuration at your convenience. See'
+		ewarn
+		ewarn '  https://bugs.gentoo.org/611214'
+		ewarn
+		ewarn 'for more information.'
+	fi
+
+	elog "For details on how version slotting works, please see"
+	elog "the wiki:"
+	elog
+	elog "  https://wiki.gentoo.org/wiki/PHP"
+	elog
+}
+
+pkg_postrm() {
+	# This serves two purposes. First, if we have just removed the last
+	# installed version of PHP, then this will remove any dead symlinks
+	# belonging to eselect-php. Second, if a user upgrades slots from
+	# (say) 5.6 to 7.0 and depcleans the old slot, then this will update
+	# his existing symlinks to point to the new 7.0 installation. The
+	# latter is bug 432962.
+	#
+	# Note: the eselect-php package may not be installed at this point,
+	# so we can't die() if this command fails.
+	eselect php cleanup
+}
diff --git a/dev-lang/php/php-8.2.5.ebuild b/dev-lang/php/php-8.2.5.ebuild
new file mode 100644
index 000000000000..bb2d5ee06588
--- /dev/null
+++ b/dev-lang/php/php-8.2.5.ebuild
@@ -0,0 +1,759 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+WANT_AUTOMAKE="none"
+
+inherit flag-o-matic multilib systemd autotools
+
+MY_PV=${PV/_rc/RC}
+DESCRIPTION="The PHP language runtime engine"
+HOMEPAGE="https://www.php.net/"
+SRC_URI="https://www.php.net/distributions/${P}.tar.xz"
+#SRC_URI="https://downloads.php.net/~pierrick/php-${MY_PV}.tar.xz"
+
+LICENSE="PHP-3.01
+	BSD
+	Zend-2.0
+	bcmath? ( LGPL-2.1+ )
+	fpm? ( BSD-2 )
+	gd? ( gd )
+	unicode? ( BSD-2 LGPL-2.1 )"
+
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+# We can build the following SAPIs in the given order
+SAPIS="embed cli cgi fpm apache2 phpdbg"
+
+# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
+IUSE="${IUSE}
+	${SAPIS/cli/+cli}
+	threads"
+
+IUSE="${IUSE} acl apparmor argon2 bcmath berkdb bzip2 calendar cdb cjk
+	coverage +ctype curl debug
+	enchant exif ffi +fileinfo +filter firebird
+	+flatfile ftp gd gdbm gmp +iconv imap inifile
+	intl iodbc +jit kerberos ldap ldap-sasl libedit lmdb
+	mhash mssql mysql mysqli nls
+	oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
+	readline selinux +session session-mm sharedmem
+	+simplexml snmp soap sockets sodium spell sqlite ssl
+	sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode webp
+	+xml xmlreader xmlwriter xpm xslt zip zlib"
+
+# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
+# The Oracle instant client provides its own incompatible ldap library.
+REQUIRED_USE="
+	|| ( cli cgi fpm apache2 embed phpdbg )
+	cli? ( ^^ ( readline libedit ) )
+	!cli? ( ?? ( readline libedit ) )
+	truetype? ( gd zlib )
+	webp? ( gd zlib )
+	cjk? ( gd zlib )
+	exif? ( gd zlib )
+	xpm? ( gd zlib )
+	gd? ( zlib )
+	simplexml? ( xml )
+	soap? ( xml )
+	xmlreader? ( xml )
+	xmlwriter? ( xml )
+	xslt? ( xml )
+	ldap-sasl? ( ldap )
+	oci8-instant-client? ( !ldap )
+	qdbm? ( !gdbm )
+	session-mm? ( session !threads )
+	mysql? ( || ( mysqli pdo ) )
+	firebird? ( pdo )
+	mssql? ( pdo )
+"
+
+RESTRICT="!test? ( test )"
+
+# The supported (that is, autodetected) versions of BDB are listed in
+# the ./configure script. Other versions *work*, but we need to stick to
+# the ones that can be detected to avoid a repeat of bug #564824.
+COMMON_DEPEND="
+	>=app-eselect/eselect-php-0.9.7[apache2?,fpm?]
+	>=dev-libs/libpcre2-10.30[jit?,unicode]
+	fpm? ( acl? ( sys-apps/acl ) apparmor? ( sys-libs/libapparmor ) selinux? ( sys-libs/libselinux ) )
+	apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] )
+	argon2? ( app-crypt/argon2:= )
+	berkdb? ( || (	sys-libs/db:5.3 sys-libs/db:4.8 ) )
+	bzip2? ( app-arch/bzip2:0= )
+	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
+	coverage? ( dev-util/lcov )
+	curl? ( >=net-misc/curl-7.29.0 )
+	enchant? ( app-text/enchant:2 )
+	ffi? ( >=dev-libs/libffi-3.0.11:= )
+	firebird? ( dev-db/firebird )
+	gd? ( media-libs/libjpeg-turbo:0= media-libs/libpng:0= )
+	gdbm? ( >=sys-libs/gdbm-1.8.0:0= )
+	gmp? ( dev-libs/gmp:0= )
+	iconv? ( virtual/libiconv )
+	imap? ( net-libs/c-client[kerberos=,ssl=] )
+	intl? ( dev-libs/icu:= )
+	kerberos? ( virtual/krb5 )
+	ldap? ( >=net-nds/openldap-1.2.11:= )
+	ldap-sasl? ( dev-libs/cyrus-sasl )
+	libedit? ( dev-libs/libedit )
+	lmdb? ( dev-db/lmdb:= )
+	mssql? ( dev-db/freetds[mssql] )
+	nls? ( sys-devel/gettext )
+	oci8-instant-client? ( dev-db/oracle-instantclient[sdk] )
+	odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) )
+	postgres? ( >=dev-db/postgresql-9.1:* )
+	qdbm? ( dev-db/qdbm )
+	readline? ( sys-libs/readline:0= )
+	session-mm? ( dev-libs/mm )
+	snmp? ( >=net-analyzer/net-snmp-5.2 )
+	sodium? ( dev-libs/libsodium:=[-minimal] )
+	spell? ( >=app-text/aspell-0.50 )
+	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
+	ssl? ( >=dev-libs/openssl-1.0.2:0= )
+	tidy? ( app-text/htmltidy )
+	tokyocabinet? ( dev-db/tokyocabinet )
+	truetype? ( =media-libs/freetype-2* )
+	unicode? ( dev-libs/oniguruma:= )
+	webp? ( media-libs/libwebp:0= )
+	xml? ( >=dev-libs/libxml2-2.9.0 )
+	xpm? ( x11-libs/libXpm )
+	xslt? ( dev-libs/libxslt )
+	zip? ( >=dev-libs/libzip-1.2.0:= )
+	zlib? ( >=sys-libs/zlib-1.2.0.4:0= )
+"
+
+IDEPEND=">=app-eselect/eselect-php-0.9.7[apache2?,fpm?]"
+
+RDEPEND="${COMMON_DEPEND}
+	virtual/mta
+	fpm? (
+		selinux? ( sec-policy/selinux-phpfpm )
+		systemd? ( sys-apps/systemd ) )"
+
+# Bison isn't actually needed when building from a release tarball
+# However, the configure script will warn if it's absent or if you
+# have an incompatible version installed. See bug 593278.
+DEPEND="${COMMON_DEPEND}
+	app-arch/xz-utils
+	>=sys-devel/bison-3.0.1"
+
+BDEPEND="virtual/pkgconfig"
+
+PHP_MV="$(ver_cut 1)"
+
+PATCHES=(
+	"${FILESDIR}/php-iodbc-header-location.patch"
+)
+
+php_install_ini() {
+	local phpsapi="${1}"
+
+	# work out where we are installing the ini file
+	php_set_ini_dir "${phpsapi}"
+
+	# Always install the production INI file, bug 611214.
+	local phpinisrc="php.ini-production-${phpsapi}"
+	cp php.ini-production "${phpinisrc}" || die
+
+	# default to /tmp for save_path, bug #282768
+	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
+
+	# Set the extension dir
+	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \
+		-i "${phpinisrc}" || die
+
+	# Set the include path to point to where we want to find PEAR packages
+	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die
+
+	insinto "${PHP_INI_DIR#${EPREFIX}}"
+	newins "${phpinisrc}" php.ini
+
+	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
+	elog
+
+	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
+	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
+
+	if use opcache; then
+		elog "Adding opcache to $PHP_EXT_INI_DIR"
+		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
+			 "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
+		dosym "../ext/opcache.ini" \
+			  "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
+	fi
+
+	# SAPI-specific handling
+	if [[ "${sapi}" == "fpm" ]] ; then
+		einfo "Installing FPM config files php-fpm.conf and www.conf"
+		insinto "${PHP_INI_DIR#${EPREFIX}}"
+		doins sapi/fpm/php-fpm.conf
+		insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d"
+		doins sapi/fpm/www.conf
+	fi
+
+	dodoc php.ini-{development,production}
+}
+
+php_set_ini_dir() {
+	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
+	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
+	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
+}
+
+src_prepare() {
+	default
+
+	# In php-7.x, the FPM pool configuration files have been split off
+	# of the main config. By default the pool config files go in
+	# e.g. /etc/php-fpm.d, which isn't slotted. So here we move the
+	# include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later
+	# we'll install the pool configuration file "www.conf" there.
+	php_set_ini_dir fpm
+	sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \
+		sapi/fpm/php-fpm.conf.in \
+		|| die 'failed to move the include directory in php-fpm.conf'
+
+	# Emulate buildconf to support cross-compilation
+	rm -fr aclocal.m4 autom4te.cache config.cache \
+		configure main/php_config.h.in || die
+	eautoconf --force
+	eautoheader
+
+	# Remove false positive test failures
+	# stream_isatty fails due to portage redirects
+	# curl tests here fail for network sandbox issues
+	# session tests here fail because we set the session directory to $T
+	rm tests/output/stream_isatty_err.phpt \
+	   tests/output/stream_isatty_out-err.phpt \
+	   tests/output/stream_isatty_out.phpt \
+	   ext/curl/tests/bug76675.phpt \
+	   ext/curl/tests/bug77535.phpt \
+	   ext/curl/tests/curl_error_basic.phpt \
+	   ext/session/tests/bug74514.phpt \
+	   ext/session/tests/bug74936.phpt || die
+
+}
+
+src_configure() {
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+	addpredict /var/lib/net-snmp/mib_indexes #nowarn
+
+	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
+
+	# The php-fpm config file wants localstatedir to be ${EPREFIX}/var
+	# and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
+	local our_conf=(
+		--prefix="${PHP_DESTDIR}"
+		--mandir="${PHP_DESTDIR}/man"
+		--infodir="${PHP_DESTDIR}/info"
+		--libdir="${PHP_DESTDIR}/lib"
+		--with-libdir="$(get_libdir)"
+		--localstatedir="${EPREFIX}/var"
+		--without-pear
+		--without-valgrind
+		--enable-ipv6
+		$(use_enable threads zts)
+	)
+
+	our_conf+=(
+		$(use_with apparmor fpm-apparmor)
+		$(use_with argon2 password-argon2 "${EPREFIX}/usr")
+		$(use_enable bcmath)
+		$(use_with bzip2 bz2 "${EPREFIX}/usr")
+		$(use_enable calendar)
+		$(use_enable coverage gcov)
+		$(use_enable ctype)
+		$(use_with curl)
+		$(use_enable xml dom)
+		$(use_with enchant)
+		$(use_enable exif)
+		$(use_with ffi)
+		$(use_enable fileinfo)
+		$(use_enable filter)
+		$(use_enable ftp)
+		$(use_with nls gettext "${EPREFIX}/usr")
+		$(use_with gmp gmp "${EPREFIX}/usr")
+		$(use_with mhash mhash "${EPREFIX}/usr")
+		$(use_with iconv iconv \
+			$(use elibc_glibc || use elibc_musl || echo "${EPREFIX}/usr"))
+		$(use_enable intl)
+		$(use_with kerberos)
+		$(use_with xml libxml)
+		$(use_enable unicode mbstring)
+		$(use_with ssl openssl)
+		$(use_enable pcntl)
+		$(use_enable phar)
+		$(use_enable pdo)
+		$(use_enable opcache)
+		$(use_with postgres pgsql "${EPREFIX}/usr")
+		$(use_enable posix)
+		$(use_with selinux fpm-selinux)
+		$(use_with spell pspell "${EPREFIX}/usr")
+		$(use_enable simplexml)
+		$(use_enable sharedmem shmop)
+		$(use_with snmp snmp "${EPREFIX}/usr")
+		$(use_enable soap)
+		$(use_enable sockets)
+		$(use_with sodium)
+		$(use_with sqlite sqlite3)
+		$(use_enable sysvipc sysvmsg)
+		$(use_enable sysvipc sysvsem)
+		$(use_enable sysvipc sysvshm)
+		$(use_with tidy tidy "${EPREFIX}/usr")
+		$(use_enable tokenizer)
+		$(use_enable xml)
+		$(use_enable xmlreader)
+		$(use_enable xmlwriter)
+		$(use_with xslt xsl)
+		$(use_with zip)
+		$(use_with zlib zlib "${EPREFIX}/usr")
+		$(use_enable debug)
+	)
+
+	# DBA support
+	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
+		|| use qdbm || use lmdb || use tokyocabinet ; then
+		our_conf+=( "--enable-dba" )
+	fi
+
+	# DBA drivers support
+	our_conf+=(
+		$(use_with cdb)
+		$(use_with berkdb db4 "${EPREFIX}/usr")
+		$(use_enable flatfile)
+		$(use_with gdbm gdbm "${EPREFIX}/usr")
+		$(use_enable inifile)
+		$(use_with qdbm qdbm "${EPREFIX}/usr")
+		$(use_with tokyocabinet tcadb "${EPREFIX}/usr")
+		$(use_with lmdb lmdb "${EPREFIX}/usr")
+	)
+
+	# Support for the GD graphics library
+	our_conf+=(
+		$(use_with truetype freetype)
+		$(use_enable cjk gd-jis-conv)
+		$(use_with gd jpeg)
+		$(use_with xpm)
+		$(use_with webp)
+	)
+	# enable gd last, so configure can pick up the previous settings
+	our_conf+=( $(use_enable gd) )
+
+	# IMAP support
+	if use imap ; then
+		our_conf+=(
+			$(use_with imap imap "${EPREFIX}/usr")
+			$(use_with ssl imap-ssl "${EPREFIX}/usr")
+		)
+	fi
+
+	# LDAP support
+	if use ldap ; then
+		our_conf+=(
+			$(use_with ldap ldap "${EPREFIX}/usr")
+			$(use_with ldap-sasl)
+		)
+	fi
+
+	# MySQL support
+	our_conf+=( $(use_with mysqli) )
+
+	local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
+	if use mysql || use mysqli ; then
+		our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
+	fi
+
+	# ODBC support
+	if use odbc && use iodbc ; then
+		our_conf+=(
+			--without-unixODBC
+			--with-iodbc
+			$(use_with pdo pdo-odbc "iODBC,${EPREFIX}/usr")
+		)
+	elif use odbc ; then
+		our_conf+=(
+			--with-unixODBC="${EPREFIX}/usr"
+			--without-iodbc
+			$(use_with pdo pdo-odbc "unixODBC,${EPREFIX}/usr")
+		)
+	else
+		our_conf+=(
+			--without-unixODBC
+			--without-iodbc
+			--without-pdo-odbc
+		)
+	fi
+
+	# Oracle support
+	our_conf+=( $(use_with oci8-instant-client oci8) )
+
+	# PDO support
+	if use pdo ; then
+		our_conf+=(
+			$(use_with mssql pdo-dblib "${EPREFIX}/usr")
+			$(use_with mysql pdo-mysql "mysqlnd")
+			$(use_with postgres pdo-pgsql)
+			$(use_with sqlite pdo-sqlite)
+			$(use_with firebird pdo-firebird "${EPREFIX}/usr")
+			$(use_with oci8-instant-client pdo-oci)
+		)
+	fi
+
+	# readline/libedit support
+	our_conf+=(
+		$(use_with readline readline "${EPREFIX}/usr")
+		$(use_with libedit)
+	)
+
+	# Session support
+	if use session ; then
+		our_conf+=( $(use_with session-mm mm "${EPREFIX}/usr") )
+	else
+		our_conf+=( $(use_enable session) )
+	fi
+
+	# Use pic for shared modules such as apache2's mod_php
+	our_conf+=( --with-pic )
+
+	# we use the system copy of pcre
+	# --with-external-pcre affects ext/pcre
+	our_conf+=(
+		--with-external-pcre
+		$(use_with jit pcre-jit)
+	)
+
+	# Catch CFLAGS problems
+	# Fixes bug #14067.
+	# Changed order to run it in reverse for bug #32022 and #12021.
+	replace-cpu-flags "k6*" "i586"
+
+	# Cache the ./configure test results between SAPIs.
+	our_conf+=( --cache-file="${T}/config.cache" )
+
+	# Support user-passed configuration parameters
+	our_conf+=( ${EXTRA_ECONF:-} )
+
+	# Support the Apache2 extras, they must be set globally for all
+	# SAPIs to work correctly, especially for external PHP extensions
+
+	local one_sapi
+	local sapi
+	mkdir -p "${WORKDIR}/sapis-build" || die
+	for one_sapi in $SAPIS ; do
+		use "${one_sapi}" || continue
+		php_set_ini_dir "${one_sapi}"
+
+		# The BUILD_DIR variable is used to determine where to output
+		# the files that autotools creates. This was all originally
+		# based on the autotools-utils eclass.
+		BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
+		cp -a "${S}" "${BUILD_DIR}" || die
+		cd "${BUILD_DIR}" || die
+
+		local sapi_conf=(
+			--with-config-file-path="${PHP_INI_DIR}"
+			--with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
+		)
+
+		for sapi in $SAPIS ; do
+			case "$sapi" in
+				cli|cgi|embed|fpm|phpdbg)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf+=( "--enable-${sapi}" )
+						if [[ "fpm" == "${sapi}" ]] ; then
+							sapi_conf+=(
+								$(use_with acl fpm-acl)
+								$(use_with systemd fpm-systemd)
+							)
+						fi
+					else
+						sapi_conf+=( "--disable-${sapi}" )
+					fi
+					;;
+
+				apache2)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
+					else
+						sapi_conf+=( --without-apxs2 )
+					fi
+					;;
+			esac
+		done
+
+		# Construct the $myeconfargs array by concatenating $our_conf
+		# (the common args) and $sapi_conf (the SAPI-specific args).
+		local myeconfargs=( "${our_conf[@]}" )
+		myeconfargs+=( "${sapi_conf[@]}" )
+
+		pushd "${BUILD_DIR}" > /dev/null || die
+		econf "${myeconfargs[@]}"
+		popd > /dev/null || die
+	done
+}
+
+src_compile() {
+	# snmp seems to run during src_compile, too (bug #324739)
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+	addpredict /var/lib/net-snmp/mib_indexes #nowarn
+
+	local sapi
+	for sapi in ${SAPIS} ; do
+		if use "${sapi}"; then
+			cd "${WORKDIR}/sapis-build/$sapi" || \
+				die "Failed to change dir to ${WORKDIR}/sapis-build/$1"
+			emake
+		fi
+	done
+}
+
+src_install() {
+	# see bug #324739 for what happens when we don't have that
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+
+	# grab the first SAPI that got built and install common files from there
+	local first_sapi="", sapi=""
+	for sapi in $SAPIS ; do
+		if use $sapi ; then
+			first_sapi=$sapi
+			break
+		fi
+	done
+
+	# Makefile forgets to create this before trying to write to it...
+	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
+
+	# Install php environment (without any sapis)
+	cd "${WORKDIR}/sapis-build/$first_sapi" || die
+	emake INSTALL_ROOT="${D}" \
+		install-build install-headers install-programs
+
+	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
+
+	# Create the directory where we'll put version-specific php scripts
+	keepdir "/usr/share/php${PHP_MV}"
+
+	local file=""
+	local sapi_list=""
+
+	for sapi in ${SAPIS}; do
+		if use "${sapi}" ; then
+			einfo "Installing SAPI: ${sapi}"
+			cd "${WORKDIR}/sapis-build/${sapi}" || die
+
+			if [[ "${sapi}" == "apache2" ]] ; then
+				# We're specifically not using emake install-sapi as libtool
+				# may cause unnecessary relink failures (see bug #351266)
+				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
+				newins ".libs/libphp$(get_libname)" \
+					   "libphp${PHP_MV}$(get_libname)"
+				keepdir "/usr/$(get_libdir)/apache2/modules"
+			else
+				# needed each time, php_install_ini would reset it
+				local dest="${PHP_DESTDIR#${EPREFIX}}"
+				into "${dest}"
+				case "$sapi" in
+					cli)
+						source="sapi/cli/php"
+						# Install the "phar" archive utility.
+						if use phar ; then
+							emake INSTALL_ROOT="${D}" install-pharcmd
+							dosym "..${dest#/usr}/bin/phar" "/usr/bin/phar${SLOT}"
+						fi
+						;;
+					cgi)
+						source="sapi/cgi/php-cgi"
+						;;
+					fpm)
+						source="sapi/fpm/php-fpm"
+						;;
+					embed)
+						source="libs/libphp$(get_libname)"
+						;;
+					phpdbg)
+						source="sapi/phpdbg/phpdbg"
+						;;
+					*)
+						die "unhandled sapi in src_install"
+						;;
+				esac
+
+				if [[ "${source}" == *"$(get_libname)" ]]; then
+					dolib.so "${source}"
+				else
+					dobin "${source}"
+					local name="$(basename ${source})"
+					dosym "..${dest#/usr}/bin/${name}" "/usr/bin/${name}${SLOT}"
+				fi
+			fi
+
+			php_install_ini "${sapi}"
+
+			# construct correct SAPI string for php-config
+			# thanks to ferringb for the bash voodoo
+			if [[ "${sapi}" == "apache2" ]]; then
+				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
+			else
+				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
+			fi
+		fi
+	done
+
+	# Installing opcache module
+	if use opcache ; then
+		into "${PHP_DESTDIR#${EPREFIX}}"
+		dolib.so "modules/opcache$(get_libname)"
+	fi
+
+	# Install env.d files
+	newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
+	sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+	sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+
+	# set php-config variable correctly (bug #278439)
+	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
+		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
+
+	if use fpm ; then
+		if use systemd; then
+			systemd_newunit "${FILESDIR}/php-fpm_at.service" \
+							"php-fpm@${SLOT}.service"
+		else
+			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
+							"php-fpm@${SLOT}.service"
+		fi
+	fi
+}
+
+src_test() {
+	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
+	if [[ ! -x "${PHP_BIN}" ]] ; then
+		ewarn "Test phase requires USE=cli, skipping"
+		return
+	else
+		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
+	fi
+
+	if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then
+		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi"
+	fi
+
+	if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then
+		export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg"
+	fi
+
+	SKIP_ONLINE_TESTS=1 REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d \
+					  "session.save_path=${T}" \
+					  "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \
+					  "session.save_path=${T}"
+
+	for name in ${EXPECTED_TEST_FAILURES}; do
+		mv "${name}.out" "${name}.out.orig" 2>/dev/null || die
+	done
+
+	local failed="$(find -name '*.out')"
+	if [[ ${failed} != "" ]] ; then
+		ewarn "The following test cases failed unexpectedly:"
+		for name in ${failed}; do
+			ewarn "  ${name/.out/}"
+		done
+	else
+		einfo "No unexpected test failures, all fine"
+	fi
+
+	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
+		local passed=""
+		for name in ${EXPECTED_TEST_FAILURES}; do
+			[[ -f "${name}.diff" ]] && continue
+			passed="${passed} ${name}"
+		done
+		if [[ ${passed} != "" ]] ; then
+			einfo "The following test cases passed unexpectedly:"
+			for name in ${passed}; do
+				ewarn "  ${passed}"
+			done
+		else
+			einfo "None of the known-to-fail tests passed, all fine"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	# Output some general info to the user
+	if use apache2 ; then
+		elog
+		elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
+		elog "your apache2 command. OpenRC users can append that string to"
+		elog "APACHE2_OPTS in /etc/conf.d/apache2."
+		elog
+		elog "The apache module configuration file 70_mod_php.conf is"
+		elog "provided (and maintained) by eselect-php."
+		elog
+	fi
+
+	# Create the symlinks for php
+	local m
+	for m in ${SAPIS}; do
+		[[ ${m} == 'embed' ]] && continue;
+		if use $m ; then
+			local ci=$(eselect php show $m)
+			if [[ -z $ci ]]; then
+				eselect php set $m php${SLOT} || die
+				einfo "Switched ${m} to use php:${SLOT}"
+				einfo
+			elif [[ $ci != "php${SLOT}" ]] ; then
+				elog "To switch $m to use php:${SLOT}, run"
+				elog "    eselect php set $m php${SLOT}"
+				elog
+			fi
+		fi
+	done
+
+	# Remove dead symlinks for SAPIs that were just disabled. For
+	# example, if the user has the cgi SAPI enabled, then he has an
+	# eselect-php symlink for it. If he later reinstalls PHP with
+	# USE="-cgi", that symlink will break. This call to eselect is
+	# supposed to remove that dead link per bug 572436.
+	eselect php cleanup || die
+
+	if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
+	   elog "To build extensions for this version of PHP, you will need to"
+	   elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
+	   elog
+	fi
+
+	# Warn about the removal of PHP_INI_VERSION if the user has it set.
+	if [[ -n "${PHP_INI_VERSION}" ]]; then
+		ewarn 'The PHP_INI_VERSION variable has been phased out. You may'
+		ewarn 'remove it from your configuration at your convenience. See'
+		ewarn
+		ewarn '  https://bugs.gentoo.org/611214'
+		ewarn
+		ewarn 'for more information.'
+	fi
+
+	elog "For details on how version slotting works, please see"
+	elog "the wiki:"
+	elog
+	elog "  https://wiki.gentoo.org/wiki/PHP"
+	elog
+}
+
+pkg_postrm() {
+	# This serves two purposes. First, if we have just removed the last
+	# installed version of PHP, then this will remove any dead symlinks
+	# belonging to eselect-php. Second, if a user upgrades slots from
+	# (say) 5.6 to 7.0 and depcleans the old slot, then this will update
+	# his existing symlinks to point to the new 7.0 installation. The
+	# latter is bug 432962.
+	#
+	# Note: the eselect-php package may not be installed at this point,
+	# so we can't die() if this command fails.
+	eselect php cleanup
+}
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index f8ff5cebd415..c1a5190b51c4 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/opencl-clang/Manifest b/dev-libs/opencl-clang/Manifest
index 9e1daa49d76d..46a7c3fa7bba 100644
--- a/dev-libs/opencl-clang/Manifest
+++ b/dev-libs/opencl-clang/Manifest
@@ -1,7 +1,13 @@
 AUX opencl-clang-10.0.0.1_find-llvm-tblgen.patch 379 BLAKE2B 23587b8500ad6215603326572a10aef71ce66fcec322834b7e6a7648bfee5a92ce698fa706ebd9cfc0fe3048005919b1d9ec1ebb1d4123412f2fd06593b64841 SHA512 b2e9ae0ceec231b33e2b70664c3cb7c56f5d30f62e2444c6a505c7ab300a463d32ad1a650e8afe1b1bd4b568b3a31c02c280ead3caa8a66548d96df16dc8f131
+AUX opencl-clang-16.0.0-clang_library_dir.patch 1671 BLAKE2B 182983a930084518ebb6d792cea82bfe5794a5e3621b5b003e9fe7d60c5c14bba85bb5de5fb2ee9f13aa4e9b0fea1f17fdb7a7f78942299a7205891dc600f7a0 SHA512 ad8da56c9dc18c82a72aede3f46d2047ac7b49b5ce8a297a65a61fbb5dd692e1f93d77ef4808f34db99a59b3f70c1d957b658dd849b510458e0fddb101f0039f
+AUX opencl-clang-16.0.0-cxx17.patch 727 BLAKE2B e5cfa0aa72e0322e1d5f4a062d88d92f163796ceab58c1d831b3a06d994d86bf565cc4cf79b53d90294c57b8c358e94c4f7b48294e759ed5fa2e65eee91906fa SHA512 4047bfa9a6e895ac5e9be5d19a625cd17ae01417f2c05b2ac34a91a1b671180c92855f909bd8f6e52037044f061567529c72cd87d5296e78ce30a3351fea5dd2
+AUX opencl-clang-16.0.0-llvm.patch 1419 BLAKE2B bfa1bc4a2252fe47f3c36294184b5ce151d840dc88e03b2eb6c228b7ca046363c899f9a497ac75d293ffaed08cda94f57921fefd17cfc7fedb2a9172eb0ebff1 SHA512 4f407a8272308e3f730b3b10ea082e956dade462700b2145b5b8c36b4653b5e46a834722b2314163abc4b4aa4f23b3783856588000853218b017bd27188573d3
+AUX opencl-clang-16.0.0-standalone-build.patch 967 BLAKE2B 35b0a40a6a2fe094711276b62ae53167560bd11ee6581a499568eaf8b2cf5e1a52aee30b5911604297c64e7262e55a07afc12a9dcc00862ecd0c2e1f9a982046 SHA512 9cba49fc8ccb12d38a5aaa9ee69c2425bdc069b2d2cd6d0157875157d67a3e1b5cedf3d7b3b081ca6012cedf7e60abb4ca205577f10dcff4f3a153758ddf520b
 AUX opencl-clang-8.0.0-clang_library_dir.patch 468 BLAKE2B 09315ce9250920caf8c84853a5cf08506b01d91f7c993273be910b38f9c97f1f31e1042d75a111734eaa86fad771bed5b09c6c9001e253c71f26bd7c1e668dcd SHA512 c5a715c05c7bc7b904a46cac8d6a10f161da6d978401c5c60853a19dfb63c65690994bdc57fe327ee36bb5b6151a0018d6931c38553917f2dc82e9cef44e0b0d
 DIST opencl-clang-14.0.0.tar.gz 26109 BLAKE2B 2ae5e6d69e2f13b867712d03b52fce893aeb70566f7f97d54858639786276f49b0b6b5768aebfedeb7fe50d95511178d7dd9df7e80d3fd27df1fb3fe1d2ab955 SHA512 ab9a3fd40542283bdd2646d9ef8d3217420c82a41b183d705e48f48949505ecadc1fa435e23a7ceadf5a335200f5f3752b42715e2ac7f63173fc09637c5c609a
 DIST opencl-clang-15.0.0.tar.gz 26212 BLAKE2B 02d3a8eb3964b6882bd94b676b4459412c753ac38e1e3012662021e98a8219225eaf6af4f62f4e0e97de428f55b0b698374dc39babff09a0fcc73213d5daacfe SHA512 a2ffce43493793524e9512be2e7bd46c0183b86b35a6f79018d355d07a83303a944e6dacebfb768e88ce75a7020a44939be872a2d4e754544198a9829f4febd4
+DIST opencl-clang-16.0.0.tar.gz 28413 BLAKE2B c99f043171186f5d9e44618d5d637d6a5c7997f22577491f544e78d93edd5afe74ba88eaaea92a931dd87af71fb630fdf03d27f1a9f55d7c3b8bdf53dee54b07 SHA512 bf723edab7dc7a028eb79d01fd2306690a2169472760bf2783d593ffec4eb788f28f184c66b204cc074cb95a4149fcc63a1dcbee5563c620a9dc2c76bb5a2d5a
 EBUILD opencl-clang-14.0.0.ebuild 879 BLAKE2B c8e67dc6c53a91e153bec1b9c22849ae0a56aa009ee3b317b8332858fc19cc2d28afbf4fe312dfed35bd0b0614e2e64498dc68c8cadcad83aa417b0948b7a34a SHA512 41e32bdafaf1a956120b0bce9ba5f792335a68145e7665d22d153398cee8923bb62b8c3777005bb34d9df9fde331e416b360ae9231e2e7dd53392e38e0e8c991
 EBUILD opencl-clang-15.0.0.ebuild 842 BLAKE2B c516ee1dc3f7e4bb1c1be637b44f151b33a0d36921d907568f561f3be5bd3762d56b88468bb2d146ff57bbc708b6e006e4c10a83825ae536b93ce80edc105d9d SHA512 a12ff19192edfbb5f90adea21510454fc77b387ac44a35e9d70c0c25ded54dc4c9ed327394097a1eeb0f912507bf3354d2b2fe196bac21034e4a4dd05e9eb497
+EBUILD opencl-clang-16.0.0.ebuild 962 BLAKE2B d6e2726cf7e84a52788e4d37c745608332812809b011cd32c062ccbd1fcb4ea9f2a54a5ac77155413e43f4732bba16938d5a3944dd1d241e237adc7be317bb9f SHA512 95a602e66469f09687d99b0511e8e014508cddd5830e00d2b191257cfbb00400b84c43be433c72f76e7b3ac7a3b5d4efa9976aa157a6fbd434ebe4dcd372c786
 MISC metadata.xml 583 BLAKE2B a16519cc07cd2add030b90218d3cdcf9473c684e0a1a0149e7dd352881213c8579c3ed7ceee69db479264fca10561ac023c01be7451ce689fa6408b81cf8b032 SHA512 d3c3f41c5c5fdb4b6b85c737071540ef8d53e148d5f7e69367eeaa6cbe7cb84563d2381de851cc4da41b5300856dd7e6b1e67454a4fc9a9d890590e3a17526b5
diff --git a/dev-libs/opencl-clang/files/opencl-clang-16.0.0-clang_library_dir.patch b/dev-libs/opencl-clang/files/opencl-clang-16.0.0-clang_library_dir.patch
new file mode 100644
index 000000000000..227a7be30b50
--- /dev/null
+++ b/dev-libs/opencl-clang/files/opencl-clang-16.0.0-clang_library_dir.patch
@@ -0,0 +1,36 @@
+From 9f50367661bb6345bf7b18102f1e415378afda06 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= <Zatloukal.Frantisek@gmail.com>
+Date: Fri, 21 Apr 2023 04:08:11 +0200
+Subject: [PATCH] Support llvm headers in
+ ${CLANG_LIBRARY_DIRS}/clang/${LLVM_VERSION_MAJOR}/ (#419)
+
+Fedora places llvm include files into that directory instead of assumed
+${CLANG_LIBRARY_DIRS}/clang/${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}.${LLVM_VERSION_PATCH}/include/
+
+Try both, fail horribly when none of them exist
+---
+ cl_headers/CMakeLists.txt | 11 +++++++++--
+ 1 file changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/cl_headers/CMakeLists.txt b/cl_headers/CMakeLists.txt
+index 86df76f..0223d52 100644
+--- a/cl_headers/CMakeLists.txt
++++ b/cl_headers/CMakeLists.txt
+@@ -19,8 +19,15 @@ add_custom_command(
+ endfunction(copy_file)
+ 
+ if(USE_PREBUILT_LLVM)
+-    set(OPENCL_HEADERS_DIR
+-      "${LLVM_LIBRARY_DIRS}/clang/${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}.${LLVM_VERSION_PATCH}/include/")
++    if(EXISTS "${CLANG_LIBRARY_DIRS}/clang/${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}.${LLVM_VERSION_PATCH}/")
++        set(OPENCL_HEADERS_DIR
++        "${CLANG_LIBRARY_DIRS}/clang/${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}.${LLVM_VERSION_PATCH}/include/")
++    elseif(EXISTS "${CLANG_LIBRARY_DIRS}/clang/${LLVM_VERSION_MAJOR}/")
++        set(OPENCL_HEADERS_DIR
++            "${CLANG_LIBRARY_DIRS}/clang/${LLVM_VERSION_MAJOR}/include/")
++    else()
++        message(FATAL_ERROR "[OPENCL-CLANG] Couldn't find prebuilt LLVM include directory.")
++    endif()
+ else(USE_PREBUILT_LLVM)
+     set(OPENCL_HEADERS_DIR "${CLANG_SOURCE_DIR}/lib/Headers")
+ endif(USE_PREBUILT_LLVM)
diff --git a/dev-libs/opencl-clang/files/opencl-clang-16.0.0-cxx17.patch b/dev-libs/opencl-clang/files/opencl-clang-16.0.0-cxx17.patch
new file mode 100644
index 000000000000..aa6c308630e8
--- /dev/null
+++ b/dev-libs/opencl-clang/files/opencl-clang-16.0.0-cxx17.patch
@@ -0,0 +1,23 @@
+From 5491ffa3fde5729074fe804023bd279c56684f77 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= <Zatloukal.Frantisek@gmail.com>
+Date: Mon, 24 Apr 2023 10:29:36 +0200
+Subject: [PATCH] Bump CMAKE_CXX_STANDARD to 17 (#416)
+
+Fixes build issues
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index dc471d8..a7d1927 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -58,7 +58,7 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
+       ${CMAKE_MODULE_PATH}
+       ${LLVM_CMAKE_DIR})
+ 
+-    set(CMAKE_CXX_STANDARD 14)
++    set(CMAKE_CXX_STANDARD 17)
+     set(CMAKE_CXX_STANDARD_REQUIRED ON)
+ 
+     option(LLVMSPIRV_INCLUDED_IN_LLVM
diff --git a/dev-libs/opencl-clang/files/opencl-clang-16.0.0-llvm.patch b/dev-libs/opencl-clang/files/opencl-clang-16.0.0-llvm.patch
new file mode 100644
index 000000000000..67759595b353
--- /dev/null
+++ b/dev-libs/opencl-clang/files/opencl-clang-16.0.0-llvm.patch
@@ -0,0 +1,40 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -335,36 +335,7 @@
+ target_link_libraries( ${TARGET_NAME}
+                        LINK_PRIVATE
+                        ${OPENCL_CLANG_LINK_LIBS}
+-                       LLVMX86CodeGen
+-                       LLVMX86AsmParser
+-                       LLVMX86Desc
+-                       LLVMX86Info
+-                       LLVMX86Disassembler
+-                       LLVMAnalysis
+-                       LLVMCodeGen
+-                       LLVMCore
+-                       LLVMipo
+-                       LLVMInstCombine
+-                       LLVMInstrumentation
+-                       LLVMMC
+-                       LLVMMCParser
+-                       LLVMObjCARCOpts
+-                       LLVMOption
+-                       LLVMScalarOpts
+-                       LLVMSupport
+-                       LLVMTransformUtils
+-                       LLVMVectorize
+-                       LLVMAsmPrinter
+-                       LLVMSelectionDAG
+-                       LLVMMCDisassembler
+-                       LLVMProfileData
+-                       LLVMObject
+-                       LLVMBitWriter
+-                       LLVMIRReader
+-                       LLVMAsmParser
+-                       LLVMTarget
+-                       LLVMBitReader
+-                       ${OTHER_LIBRARIES}
++                       LLVM
+                       )
+ 
+ install(FILES opencl_clang.h
diff --git a/dev-libs/opencl-clang/files/opencl-clang-16.0.0-standalone-build.patch b/dev-libs/opencl-clang/files/opencl-clang-16.0.0-standalone-build.patch
new file mode 100644
index 000000000000..a85ec58df401
--- /dev/null
+++ b/dev-libs/opencl-clang/files/opencl-clang-16.0.0-standalone-build.patch
@@ -0,0 +1,26 @@
+From 529a9188114bcbd8ed753d2276942384fa50d7a1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= <Zatloukal.Frantisek@gmail.com>
+Date: Fri, 21 Apr 2023 04:07:21 +0200
+Subject: [PATCH] Fix standalone build (#415)
+
+Fixes https://github.com/intel/opencl-clang/issues/406
+Fixes https://github.com/intel/opencl-clang/issues/374
+---
+ cl_headers/CMakeLists.txt | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/cl_headers/CMakeLists.txt b/cl_headers/CMakeLists.txt
+index 788adff..86df76f 100644
+--- a/cl_headers/CMakeLists.txt
++++ b/cl_headers/CMakeLists.txt
+@@ -1,5 +1,9 @@
+ set(CL_HEADERS_LIB cl_headers)
+-set(CLANG_COMMAND $<TARGET_FILE:clang> )
++if(USE_PREBUILT_LLVM)
++    find_program(CLANG_COMMAND clang PATHS ${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH)
++else()
++    set(CLANG_COMMAND $<TARGET_FILE:clang>)
++endif()
+ if(LLVM_USE_HOST_TOOLS AND NOT OPENCL_CLANG_BUILD_EXTERNAL)
+   build_native_tool(clang CLANG_COMMAND)
+ endif()
diff --git a/dev-libs/opencl-clang/opencl-clang-16.0.0.ebuild b/dev-libs/opencl-clang/opencl-clang-16.0.0.ebuild
new file mode 100644
index 000000000000..b902e1ab200f
--- /dev/null
+++ b/dev-libs/opencl-clang/opencl-clang-16.0.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_MAX_SLOT="16"
+
+inherit cmake llvm
+
+DESCRIPTION="OpenCL-oriented thin wrapper library around clang"
+HOMEPAGE="https://github.com/intel/opencl-clang"
+SRC_URI="https://github.com/intel/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${PV}"
+
+LICENSE="UoI-NCSA"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-util/spirv-llvm-translator:${SLOT}=
+	sys-devel/clang:${SLOT}=[static-analyzer]
+	sys-devel/llvm:${SLOT}=
+"
+
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-16.0.0-clang_library_dir.patch
+	"${FILESDIR}"/${PN}-16.0.0-cxx17.patch
+	"${FILESDIR}"/${PN}-16.0.0-llvm.patch
+	"${FILESDIR}"/${PN}-16.0.0-standalone-build.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DCLANG_LIBRARY_DIRS="${EPREFIX}"/usr/lib
+		-DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix ${LLVM_MAX_SLOT})"
+		-Wno-dev
+	)
+
+	cmake_src_configure
+}
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 2171f386abfa..718a1ea151f2 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/alsa-lib/Manifest b/media-libs/alsa-lib/Manifest
index 4af8c7a8824a..ac9e961ce4cd 100644
--- a/media-libs/alsa-lib/Manifest
+++ b/media-libs/alsa-lib/Manifest
@@ -1,8 +1,5 @@
 AUX alsa-lib-1.1.6-missing_files.patch 5349 BLAKE2B 9ce6d529b78aa90dd5c507173f6a4b55f7b45a1e5e005760c07b3b000aef62c17ccd4f5815135c511006565e182619d2535c4eebe07d7825e4d871b6d9365d1d SHA512 879d11cf369a1aab2cc86c72ba90ad3dfeced2395c4cafda064a89a8f7790f032d4bc1c9065a86be28a3f7656bf91b4148df4e59d962ba4470221dc13a4fec90
 AUX alsa-lib-1.2.8-clang16-macro.patch 1171 BLAKE2B d9c48d70ece2365ce8d4783b4e5f932f472a2d6cc53c9d10373a76def7a7e7e21f33b6cf804630a7b6b4c37c8422fe4580cfa9e8e490abb2faf89cbf98d05f03 SHA512 5be97f4a609a285a976197b6f7320f82c2c1a3425e00b7c7c2f58cc4e8c61ce4270ec49c068882268924fe7dec32557f36c206870df5abf3b715e8ad2494655e
-DIST alsa-lib-1.2.7.2.tar.bz2 1085117 BLAKE2B 9ae3d4358d802970249e1b904faa7c4d646dec1d8c93e0de9c4b70065e912b910303d77e8f9f68c97b883ec270cf0dd8b97146b4a85f3aede4f290683c462fce SHA512 79e5920384e570a1acd8ecd1eb8812879333c3cedb1d15780080afc40125b97df893c33f4163d9dd863871b628bc6026265f8ace2c8634fc1af5b52b62ac9cfe
 DIST alsa-lib-1.2.8.tar.bz2 1091475 BLAKE2B e6171ac557db6265e3f02df7bd269eca62d09afaf2c04dc913d3bb217df23a8e66e808ad453fea5ed90d4d9226feb05065ad5d9b3575241b76675ccd27b9b4d4 SHA512 865ff05a8f589996f8d63d43a91c961f1b64144f3e1d17c7074b7ac16f25b3fd1c371d46ed63a8cc20fa01e63c76b75f1a9802b56889ae1073854dd050d27688
-EBUILD alsa-lib-1.2.7.2-r1.ebuild 2538 BLAKE2B 6a8af298898c8bd961cadb570ec4e726e400a3395c128800bf0a67565f4b344db488b5cf7103257050ae6f00f9793a3f122df1542dff3e57461c3153eb681326 SHA512 ff3c657b3a089750dfb785fc0575974a89a8d88ac2db3729fe5a890db2301cb3c0d06c804cf5e465943b9cde52b99f680f94869559de371a442c557480f3e494
-EBUILD alsa-lib-1.2.7.2.ebuild 2550 BLAKE2B 4e1a6b75342bad5aa78742b1ce08e151fcea3116a60cebad6d8dacfecd6f594d58b162c763936a146cbd4b72fa3ee044509fe727997a569a503ae80b914abe4b SHA512 bd4f641cf08c996c19fe91278031616714fc2a125f91d354e17cf5bed3a4514b8e9c1c44daf07c31101d75111741e23d08197ee05b21dae8ce35fe49f4ce19f6
 EBUILD alsa-lib-1.2.8-r1.ebuild 2540 BLAKE2B f4aff12b1da6ed6a5b3be7955d918a1dfbf3995ca17fbd7f7e947addb17b8570bd1f18e59d0d47c091ff493163f2fc61363558d52eb22ea19369904f7d162cc1 SHA512 114feb897ac54c94c8527af2953a3fc02c94fe6a32c3638e1056c3184e005a8e1f3f289447274a5a0155c8dbe0ef64ac55aa52b4edcfb07a3f186c16c56b9389
 MISC metadata.xml 624 BLAKE2B b2f57320a348a39867c5ee362a9bea5df1518b4fa41cd99468fe87fea487da85e188889a7c77f0380b3beadd1807c86b444886d953263c218ca3746bc1aa2a5e SHA512 79f2bbc1d17edff04dc940355646e84583164407598c2a26d8decbfda3ad5de62e2926ec12c929c3b06a5fc7e9c1bce4a40e631d2bc4038979f9e240b7a33c09
diff --git a/media-libs/alsa-lib/alsa-lib-1.2.7.2-r1.ebuild b/media-libs/alsa-lib/alsa-lib-1.2.7.2-r1.ebuild
deleted file mode 100644
index fee1d148d903..000000000000
--- a/media-libs/alsa-lib/alsa-lib-1.2.7.2-r1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit autotools multilib-minimal flag-o-matic python-single-r1
-
-DESCRIPTION="Advanced Linux Sound Architecture Library"
-HOMEPAGE="https://alsa-project.org/wiki/Main_Page"
-if [[ ${PV} == *_p* ]] ; then
-	# Please set correct commit ID for a snapshot release!!!
-	COMMIT="abe805ed6c7f38e48002e575535afd1f673b9bcd"
-	SRC_URI="https://git.alsa-project.org/?p=${PN}.git;a=snapshot;h=${COMMIT};sf=tgz -> ${P}.tar.gz"
-	S="${WORKDIR}"/${PN}-${COMMIT:0:7}
-else
-	# TODO: Upstream does publish .sig files, so someone could implement verify-sig ;)
-	SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="alisp debug doc python"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="media-libs/alsa-topology-conf
-	media-libs/alsa-ucm-conf
-	python? ( ${PYTHON_DEPS} )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="doc? ( >=app-doc/doxygen-1.2.6 )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.1.6-missing_files.patch" # bug #652422
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	find . -name Makefile.am -exec sed -i -e '/CFLAGS/s:-g -O2::' {} + || die
-	# bug #545950
-	sed -i -e '5s:^$:\nAM_CPPFLAGS = -I$(top_srcdir)/include:' test/lsb/Makefile.am || die
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	# Broken upstream. Could in theory work with -flto-partitions=none
-	# but it's a hack to workaround the real problem and not strictly safe.
-	# bug #616108, bug #669086, and https://github.com/alsa-project/alsa-lib/issues/6.
-	filter-lto
-
-	local myeconfargs=(
-		--disable-maintainer-mode
-		--disable-resmgr
-		--enable-aload
-		--enable-rawmidi
-		--enable-seq
-		--enable-shared
-		--enable-thread-safety
-
-		# enable Python only on final ABI
-		$(multilib_native_use_enable python)
-		$(use_enable alisp)
-		$(use_with debug)
-	)
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
-	emake
-
-	if multilib_is_native_abi && use doc; then
-		emake doc
-		grep -FZrl "${S}" doc/doxygen/html | \
-			xargs -0 sed -i -e "s:${S}::" || die
-	fi
-}
-
-multilib_src_install() {
-	multilib_is_native_abi && use doc && local HTML_DOCS=( doc/doxygen/html/. )
-
-	default
-}
-
-multilib_src_install_all() {
-	find "${ED}" -type f \( -name '*.a' -o -name '*.la' \) -delete || die
-
-	dodoc ChangeLog doc/asoundrc.txt NOTES TODO
-}
diff --git a/media-libs/alsa-lib/alsa-lib-1.2.7.2.ebuild b/media-libs/alsa-lib/alsa-lib-1.2.7.2.ebuild
deleted file mode 100644
index 87e46cf31a80..000000000000
--- a/media-libs/alsa-lib/alsa-lib-1.2.7.2.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit autotools multilib-minimal flag-o-matic python-single-r1
-
-DESCRIPTION="Advanced Linux Sound Architecture Library"
-HOMEPAGE="https://alsa-project.org/wiki/Main_Page"
-if [[ ${PV} == *_p* ]] ; then
-	# Please set correct commit ID for a snapshot release!!!
-	COMMIT="abe805ed6c7f38e48002e575535afd1f673b9bcd"
-	SRC_URI="https://git.alsa-project.org/?p=${PN}.git;a=snapshot;h=${COMMIT};sf=tgz -> ${P}.tar.gz"
-	S="${WORKDIR}"/${PN}-${COMMIT:0:7}
-else
-	# TODO: Upstream does publish .sig files, so someone could implement verify-sig ;)
-	SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-IUSE="alisp debug doc python +thread-safety"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="media-libs/alsa-topology-conf
-	media-libs/alsa-ucm-conf
-	python? ( ${PYTHON_DEPS} )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="doc? ( >=app-doc/doxygen-1.2.6 )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.1.6-missing_files.patch" # bug #652422
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	find . -name Makefile.am -exec sed -i -e '/CFLAGS/s:-g -O2::' {} + || die
-	# bug #545950
-	sed -i -e '5s:^$:\nAM_CPPFLAGS = -I$(top_srcdir)/include:' test/lsb/Makefile.am || die
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	# Broken upstream. Could in theory work with -flto-partitions=none
-	# but it's a hack to workaround the real problem and not strictly safe.
-	# bug #616108, bug #669086, and https://github.com/alsa-project/alsa-lib/issues/6.
-	filter-lto
-
-	local myeconfargs=(
-		--disable-maintainer-mode
-		--disable-resmgr
-		--enable-aload
-		--enable-rawmidi
-		--enable-seq
-		--enable-shared
-
-		# enable Python only on final ABI
-		$(multilib_native_use_enable python)
-		$(use_enable alisp)
-		$(use_enable thread-safety)
-		$(use_with debug)
-	)
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
-	emake
-
-	if multilib_is_native_abi && use doc; then
-		emake doc
-		grep -FZrl "${S}" doc/doxygen/html | \
-			xargs -0 sed -i -e "s:${S}::" || die
-	fi
-}
-
-multilib_src_install() {
-	multilib_is_native_abi && use doc && local HTML_DOCS=( doc/doxygen/html/. )
-
-	default
-}
-
-multilib_src_install_all() {
-	find "${ED}" -type f \( -name '*.a' -o -name '*.la' \) -delete || die
-
-	dodoc ChangeLog doc/asoundrc.txt NOTES TODO
-}
diff --git a/media-libs/alsa-ucm-conf/Manifest b/media-libs/alsa-ucm-conf/Manifest
index 3fba1ba43b67..26e1bfb398ac 100644
--- a/media-libs/alsa-ucm-conf/Manifest
+++ b/media-libs/alsa-ucm-conf/Manifest
@@ -1,5 +1,3 @@
-DIST alsa-ucm-conf-1.2.7.2.tar.bz2 33011 BLAKE2B af8ce94b5eebb84e2420e96f9052e9ed1055f3c37aca088add6f98d562bba67b856ac5ec16adb3f1893fd612eeadd9d342b83ea615b213ce7d9ac010a0f5d4cb SHA512 b6866f1ca6a3f4d69d7923bc1107a64b49944a3a8756f129f39034e5390e08db1c295669e54dfe1437ca934cc11abf407f60fc8319f5cba3f021966e8654c2db
 DIST alsa-ucm-conf-1.2.8.tar.bz2 37843 BLAKE2B f2281a3a5d8b4fcbc4c75ce99a911a4ce3230abfa6f6d0aff8e175fe1b870750f43c087339490ed9f4d5ab314fda391e06e41cbed79239a16326a8f2d02ac262 SHA512 a15a9ca52c108ee95a421b91f3fad4329f1e9fb1c004a40d5ff1a57d6701bad19a31d5a296426d26439be9b87d2d543ce51588a98402d24c17f0f92aaf1096ca
-EBUILD alsa-ucm-conf-1.2.7.2.ebuild 517 BLAKE2B 41ab7ee7c44597bdc2ccf4d3d213deb759cc17d5d5fc0802c582dacd5c26a1ed44b3005e805b74fb5473144e82a28726e982d47268a159b42d07cdcd6ad55cd1 SHA512 82a04a52b13ded3d16f122a24c57526626139f40793704b7dadd6187029b3884f3b517e9d50c333752d18d25192a5a196d0013dad1b22aa426103c0a2671c0fe
 EBUILD alsa-ucm-conf-1.2.8.ebuild 517 BLAKE2B 86309cde65282c8d01ea47e2bf1d7e12e0e141bc7289b9af6deee856267175e907db7b40d111b891982f0457ad60d7e1f24b5528c9b003da46b677627939d4b4 SHA512 6b8e3406d1eaeb6a5dc3361ed1a4ec8e22ec039eb3236d6c10370e2323441db025dd4993b897051c021d6eecc4643b68d152c58558202d32214a8336ea03feb3
 MISC metadata.xml 457 BLAKE2B 68d8f949d705562928ce4f6a25faf692611f14d63e659723ca5095be6befb5c03bf7dca73a158973d58ac242626a8a4b6f7d8835377e21d5bc8d2307906fee7b SHA512 8b65e913e4d6fbdcd2c760c383d9d026cf053dd10a63689b782f19f88b199443542488bacb08fa02ffffff09165813323dcde06529c9ff744182b728aead0c6d
diff --git a/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.7.2.ebuild b/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.7.2.ebuild
deleted file mode 100644
index 93fd2550be06..000000000000
--- a/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.7.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="ALSA ucm configuration files"
-HOMEPAGE="https://alsa-project.org/wiki/Main_Page"
-SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2"
-LICENSE="BSD"
-SLOT="0"
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv sparc x86"
-IUSE=""
-
-RDEPEND="!<media-libs/alsa-lib-1.2.1"
-DEPEND="${RDEPEND}"
-
-src_install() {
-	insinto /usr/share/alsa
-	doins -r ucm{,2}
-}
diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index 437a196e0d48..e86649e43986 100644
--- a/media-plugins/Manifest.gz
+++ b/media-plugins/Manifest.gz
diff --git a/media-plugins/alsa-plugins/Manifest b/media-plugins/alsa-plugins/Manifest
index 2e7abf1c42b1..7fe391b358a3 100644
--- a/media-plugins/alsa-plugins/Manifest
+++ b/media-plugins/alsa-plugins/Manifest
@@ -3,5 +3,4 @@ AUX alsa-plugins-1.2.7.1-missing-include.patch 549 BLAKE2B b94148ab5ae790568cc44
 AUX pulse-default.conf 196 BLAKE2B 4293e2ba9b4c87c35e3bdfe45781f86af733341c8bada5a78b38d08c59c5774e5679487e877d11fb7866b2ed7d9f9441552f864e9c2b9e42119eda62e1459ae8 SHA512 c64f73a46c9f50704d4b2bef09d95ce3bc2352da1437750f49974ab8e6f60d5467d5d94ab0e1490deea5f2b1f67b20aa60a10c502e7d6e049649bca4208f7c1e
 DIST alsa-plugins-1.2.7.1.tar.bz2 408801 BLAKE2B 6f7aa503eda879cd273f36a16eec702b4da9267a60835cb5acbbfe355a83b7ffa3e93eb6483c9946c1d0bcd845a8f574470e7b84c66f793d0d0c6c9883ad52ee SHA512 437c05a7e0175594768fd6a9a6d1a158bb4a01a7de6a42c2bd468d9381e01b64d385ddfac7d87baf84fe13cb4e65dc24da643940f416d4b191c528728822d964
 EBUILD alsa-plugins-1.2.7.1-r1.ebuild 3048 BLAKE2B fb7b016c274199648f2a369023597d6aa63284a52265f16912eec55309c0f237e292f59b2a7ae5086673464e21e8929065e7f83c4315e97c26f018f09c8e83e2 SHA512 c0e56f681972c3b721adb675e4d43edc6cfcb98e96d126c2f513dfd076588540878cebed5f8fdb50a4b0d489890f159ba28f16dc0541b3471d01784b45058715
-EBUILD alsa-plugins-1.2.7.1.ebuild 2984 BLAKE2B d7005ee86648a92a4997db4b3ed5d5101596afcc68c5517e822502d078589285048e28da5f0d33150de5eabfa9ede5679b4158c1619cbb6b46432cea4036e4e5 SHA512 b768e15c10f21a42b03bc756e6ec88691bfb60c3de44e0bd9d9402a3fde11e08185b5364c3358d77b00362ade7269df668ea95d70827d3ce2148ac5531fd5c79
 MISC metadata.xml 578 BLAKE2B e09655e6f22012672c7834274397dfd88f383f7e49684ab9730bfafa950143ca5a1a4c12288b3dbfe4f268dcc7d59202824e1c1d92c69e7e8d24d422c6b49a35 SHA512 183adee440441fd256fd6d549b7c8b0db6e4ee9519c151c2c16bbeacf2cf490167c838068fc756a12db77110c8b5386239dc8787121871bdd5fb7afb78a4e925
diff --git a/media-plugins/alsa-plugins/alsa-plugins-1.2.7.1.ebuild b/media-plugins/alsa-plugins/alsa-plugins-1.2.7.1.ebuild
deleted file mode 100644
index e518cd39af5d..000000000000
--- a/media-plugins/alsa-plugins/alsa-plugins-1.2.7.1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools flag-o-matic multilib-minimal
-
-DESCRIPTION="ALSA extra plugins"
-HOMEPAGE="https://alsa-project.org/wiki/Main_Page"
-SRC_URI="https://www.alsa-project.org/files/pub/plugins/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux"
-IUSE="arcam_av debug ffmpeg jack libsamplerate +mix oss pulseaudio speex +usb_stream"
-
-RDEPEND="
-	>=media-libs/alsa-lib-${PV}:=[${MULTILIB_USEDEP}]
-	ffmpeg? ( media-video/ffmpeg:0=[${MULTILIB_USEDEP}] )
-	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
-	libsamplerate? ( >=media-libs/libsamplerate-0.1.8-r1:=[${MULTILIB_USEDEP}] )
-	pulseaudio? ( media-libs/libpulse[${MULTILIB_USEDEP}] )
-	speex? (
-		>=media-libs/speex-1.2.0:=[${MULTILIB_USEDEP}]
-		media-libs/speexdsp[${MULTILIB_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	default
-
-	# For some reasons the polyp/pulse plugin does fail with alsaplayer with a
-	# failed assert. As the code works just fine with asserts disabled, for now
-	# disable them waiting for a better solution.
-	sed \
-		-e '/AM_CFLAGS/s:-Wall:-DNDEBUG -Wall:' \
-		-i pulse/Makefile.am || die
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	use debug || append-cppflags -DNDEBUG
-
-	local myeconfargs=(
-		# default does not contain $prefix: bug #673464
-		--with-alsalconfdir="${EPREFIX}"/etc/alsa/conf.d
-
-		--with-speex="$(usex speex lib no)"
-		$(use_enable arcam_av arcamav)
-		$(use_enable ffmpeg libav)
-		$(use_enable jack)
-		$(use_enable libsamplerate samplerate)
-		$(use_enable mix)
-		$(use_enable oss)
-		$(use_enable pulseaudio)
-		$(use_enable speex speexdsp)
-		$(use_enable usb_stream usbstream)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install() {
-	# Needed to workaround parallel build failure
-	# bug #835920
-	dodir /usr/$(get_libdir)/alsa-lib
-
-	default
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	cd doc || die
-	dodoc upmix.txt vdownmix.txt README-pcm-oss
-	use jack && dodoc README-jack
-	use libsamplerate && dodoc samplerate.txt
-	use ffmpeg && dodoc lavrate.txt a52.txt
-
-	if use pulseaudio; then
-		dodoc README-pulse
-		# install ALSA configuration files
-		# making PA to be used by alsa clients
-		insinto /usr/share/alsa
-		doins "${FILESDIR}"/pulse-default.conf
-
-		insinto /usr/share/alsa/alsa.conf.d
-		doins "${FILESDIR}"/51-pulseaudio-probe.conf
-		# bug #670960
-		dosym ../../../usr/share/alsa/alsa.conf.d/51-pulseaudio-probe.conf \
-			/etc/alsa/conf.d/51-pulseaudio-probe.conf
-	fi
-
-	find "${ED}" -type f \( -name '*.a' -o -name '*.la' \) -delete || die
-}
-
-pkg_postinst() {
-	if use pulseaudio; then
-		einfo "The PulseAudio device is now set as the default device if the"
-		einfo "PulseAudio server is found to be running. Any custom"
-		einfo "configuration in /etc/asound.conf or ~/.asoundrc for this"
-		einfo "purpose should now be unnecessary."
-	fi
-}
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 1b26c49cbe0a..ce117ee74567 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/alsa-utils/Manifest b/media-sound/alsa-utils/Manifest
index 3cb608073fc9..48fb2f2885b1 100644
--- a/media-sound/alsa-utils/Manifest
+++ b/media-sound/alsa-utils/Manifest
@@ -2,9 +2,6 @@ AUX alsa-modules.conf-rc 1028 BLAKE2B 91a27d4806bbd88bfb255cb28477cf4976cdbe2c3b
 AUX alsa-utils-1.1.8-missing_header.patch 1580 BLAKE2B 59ac66fa5fbc303978bac8e16c2b026e7c9416ee4c06b220ad7bac926c3136e2053ab24438048dcebf96091e2ea934f743ff3c694d9dbd7fee49439ec900b514 SHA512 10f0924522178d3258eb2086da5ab94681ec580cf89aee98ebbc6d7f759db9484a82e8c10f484139516fe4c4f31ee33f021cc9dc7d472debe8c1353b881c40db
 AUX alsasound.confd-r4 340 BLAKE2B bcd03d51441528871316f1de640c4e7d382756bfea893adad8ea5b65ac166199dfa23acb07a0ae92d933d1b9c74d39cf96a778993b3d72074c27e4a7b4c28f4c SHA512 90c1e974276945f7632dc370a005b58d669b93edbf27116098d4831e69c11c26d9b21e7eacfaf12c50019f8c88dc1f370101e2d905fdde40887fe36bac00d83e
 AUX alsasound.initd-r8 2183 BLAKE2B 3c3e59847817e06e7847399fad02885fc493e2b51b769a16d3cff57a2270a7769de2072855e5d09883e6c339d207185b4cb75639cbb2c5d3d16c07d9b07a75a3 SHA512 983172bbec6792028d0757d2385bfe1a7226b1db72a4490acf2a4927e6a20d8cca0746a2b1747f0f3390353196051b041397e3eae1d04a6fa02985c87a5e178f
-DIST alsa-utils-1.2.7.tar.bz2 1562595 BLAKE2B dd8821c510a98d76e2986d59c01516013f01c632fb6311e6ffd2b10eabbdd68312537d977b1bf2ab48e0f181751ecf58ec1c1da3f8d4f7ee84d8f2623893a091 SHA512 1be8f617315193e6033653ac96a14bd1c3272cd9d8f3776cdb1357f35f5353652acd5975cfc5bd16278cd496f5bf409bb60432818a526282edad9a4c718a97c9
 DIST alsa-utils-1.2.8.tar.bz2 1560162 BLAKE2B 4b9676957e775be51076b4798dfd384db4eea440c682899024034d3dd593ba24f1d42b8d742c312e041a37f0dbbc12b16635d79f6e6633a3459cc21f80739b5e SHA512 882e6f67467596ed273bf554fcce87d8ef287806bbdabd6c103de4980981f9e2102fb3800c6e8628ee8e86ffb165c1c92f9370c8145f28a6cb7cca563942330b
-EBUILD alsa-utils-1.2.7-r1.ebuild 2513 BLAKE2B 1b6bcd11aa55710907940a1f28713bfe8ee2a871ead905858d1fae1069bbca4893a9bdcfaceddb1915fb8d80cf127eb45f02d9a55b25a9c7dfcb9b7b63105f36 SHA512 1fe83211234f6bbab673150b19775b9aa9d0fd2303b32240c698bdfbb9b8a6a0db8637093e2e29f302985326f147601b4b20406613cd4ffd3c4e655b8bbdc208
 EBUILD alsa-utils-1.2.8-r2.ebuild 2496 BLAKE2B f897dbb5d0363e643efde8b228e205a7b57ef14498937e4f58bcd584f816b76ef974eac6bf8fc12ffa6af1e1c0446f1516b86a9074f9bd6c54ef49c04f06abb3 SHA512 06f9bca8bf127107fdebf1d044e88579d0bca24047fea0b1c1888e60981960ff0e0ed0bdb30ec08e4805c527bb696e53cf89f800fbe8daec1a34ef670cedd00d
-EBUILD alsa-utils-1.2.8.ebuild 2508 BLAKE2B 8133bcdb855be091b167125d55c350996fe2d07a3d3cf503da6005abe5ecc20de7b1d94017b4db8d97f7c24c6e0be671731f5c583328894b655d7e67e0cd8c41 SHA512 8c28e46fb314798294235817746d213f7c4323ceb4f3619d8b5c459819c81782c00001e439f56b5d2d395aa2c935415c576ea5323b56abb8aa52ad28a3a358c4
 MISC metadata.xml 630 BLAKE2B 297896d48e1b947e3d8fdb0e8508846ac5f11740101a80d1d492e8fdd6bb042d629c654583d3262c00a0e33d31ecf3b6f4b3c07c73ede339b4ed168d4c5deae0 SHA512 1e26d146329b58c509ee8a9e6683bd0bc15651d942a7d400383106d3e61df0d3148322bedf0d10e445db74109ee1ee759310eb72c5e3fb1ae4ec258892d378b2
diff --git a/media-sound/alsa-utils/alsa-utils-1.2.7-r1.ebuild b/media-sound/alsa-utils/alsa-utils-1.2.7-r1.ebuild
deleted file mode 100644
index db469bc435f5..000000000000
--- a/media-sound/alsa-utils/alsa-utils-1.2.7-r1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit systemd udev
-
-DESCRIPTION="Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)"
-HOMEPAGE="https://alsa-project.org/wiki/Main_Page"
-SRC_URI="https://www.alsa-project.org/files/pub/utils/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0.9"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
-IUSE="bat doc +libsamplerate ieee1394 +ncurses nls selinux"
-
-CDEPEND=">=media-libs/alsa-lib-${PV}
-	libsamplerate? ( media-libs/libsamplerate )
-	ieee1394? ( media-libs/libffado )
-	ncurses? ( >=sys-libs/ncurses-5.7-r7:0= )
-	bat? ( sci-libs/fftw:= )"
-DEPEND="${CDEPEND}
-	doc? ( app-text/xmlto )"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-alsa )"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.1.8-missing_header.patch
-)
-
-src_configure() {
-	export ac_cv_lib_ffado_ffado_streaming_init=$(usex ieee1394)
-
-	local myeconfargs=(
-		# --disable-alsaconf because it doesn't work with sys-apps/kmod wrt #456214
-		--disable-alsaconf
-		--disable-maintainer-mode
-		--with-asound-state-dir="${EPREFIX}"/var/lib/alsa
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-		--with-udev-rules-dir="${EPREFIX}/$(get_udevdir)"/rules.d
-		$(use_enable bat)
-		$(use_enable libsamplerate alsaloop)
-		$(use_enable ncurses alsamixer)
-		$(use_enable nls)
-		$(usex doc '' --disable-xmlto)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	dodoc seq/*/README.*
-
-	newinitd "${FILESDIR}"/alsasound.initd-r8 alsasound
-	newconfd "${FILESDIR}"/alsasound.confd-r4 alsasound
-
-	insinto /etc/modprobe.d
-	newins "${FILESDIR}"/alsa-modules.conf-rc alsa.conf
-
-	keepdir /var/lib/alsa
-
-	# ALSA lib parser.c:1266:(uc_mgr_scan_master_configs) error: could not
-	# scan directory /usr/share/alsa/ucm: No such file or directory
-	# alsaucm: unable to obtain card list: No such file or directory
-	keepdir /usr/share/alsa/ucm
-}
-
-pkg_postinst() {
-	udev_reload
-
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog
-		elog "To take advantage of the init script, and automate the process of"
-		elog "saving and restoring sound-card mixer levels you should"
-		elog "add alsasound to the boot runlevel. You can do this as"
-		elog "root like so:"
-		elog "# rc-update add alsasound boot"
-		ewarn
-		ewarn "The ALSA core should be built into the kernel or loaded through other"
-		ewarn "means. There is no longer any modular auto(un)loading in alsa-utils."
-	fi
-}
-
-pkg_postrm() {
-	udev_reload
-}
diff --git a/media-sound/alsa-utils/alsa-utils-1.2.8.ebuild b/media-sound/alsa-utils/alsa-utils-1.2.8.ebuild
deleted file mode 100644
index 99651ae43b13..000000000000
--- a/media-sound/alsa-utils/alsa-utils-1.2.8.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit systemd udev
-
-DESCRIPTION="Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)"
-HOMEPAGE="https://alsa-project.org/wiki/Main_Page"
-SRC_URI="https://www.alsa-project.org/files/pub/utils/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0.9"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="bat doc +libsamplerate ieee1394 +ncurses nls selinux"
-
-DEPEND="
-	>=media-libs/alsa-lib-${PV}
-	libsamplerate? ( media-libs/libsamplerate )
-	ieee1394? ( media-libs/libffado )
-	ncurses? ( >=sys-libs/ncurses-5.7-r7:= )
-	bat? ( sci-libs/fftw:= )
-"
-RDEPEND="
-	${DEPEND}
-	selinux? ( sec-policy/selinux-alsa )
-"
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( app-text/xmlto )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.1.8-missing_header.patch
-)
-
-src_configure() {
-	export ac_cv_lib_ffado_ffado_streaming_init=$(usex ieee1394)
-
-	local myeconfargs=(
-		# --disable-alsaconf because it doesn't work with sys-apps/kmod wrt #456214
-		--disable-alsaconf
-		--disable-maintainer-mode
-		--with-asound-state-dir="${EPREFIX}"/var/lib/alsa
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-		--with-udev-rules-dir="${EPREFIX}/$(get_udevdir)"/rules.d
-		$(use_enable bat)
-		$(use_enable libsamplerate alsaloop)
-		$(use_enable ncurses alsamixer)
-		$(use_enable nls)
-		$(usex doc '' --disable-xmlto)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	dodoc seq/*/README.*
-
-	newinitd "${FILESDIR}"/alsasound.initd-r8 alsasound
-	newconfd "${FILESDIR}"/alsasound.confd-r4 alsasound
-
-	insinto /etc/modprobe.d
-	newins "${FILESDIR}"/alsa-modules.conf-rc alsa.conf
-
-	keepdir /var/lib/alsa
-
-	# ALSA lib parser.c:1266:(uc_mgr_scan_master_configs) error: could not
-	# scan directory /usr/share/alsa/ucm: No such file or directory
-	# alsaucm: unable to obtain card list: No such file or directory
-	keepdir /usr/share/alsa/ucm
-}
-
-pkg_postinst() {
-	udev_reload
-
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog
-		elog "To take advantage of the init script, and automate the process of"
-		elog "saving and restoring sound-card mixer levels you should"
-		elog "add alsasound to the boot runlevel. You can do this as"
-		elog "root like so:"
-		elog "# rc-update add alsasound boot"
-		ewarn
-		ewarn "The ALSA core should be built into the kernel or loaded through other"
-		ewarn "means. There is no longer any modular auto(un)loading in alsa-utils."
-	fi
-}
-
-pkg_postrm() {
-	udev_reload
-}
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index b5f37ff6021e..08ce8db7dff7 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index abb2d21cc16d..4a7384e92c70 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Thu, 04 May 2023 21:39:36 +0000
+Fri, 05 May 2023 04:09:35 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index c82cf2287136..f60bdd90dd27 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 543888 BLAKE2B da15fb010da91c403608af1847df77a89c9a8a24b2f5c1999256191c31d7755cd7667c19867e75c2bbdd07063f4ce4dd641cf53415eb08b83e35cbb3d2cd35e2 SHA512 ac5e51b2bf8075889870e4eedfe469274eaf28945ed1e974bc76ae0576dc1aa0db2a5fdacfc15e8cfb28486195fad65b487cf50896a207c5fcad4ffae850adbc
-TIMESTAMP 2023-05-04T21:39:39Z
+TIMESTAMP 2023-05-05T04:09:39Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRUJhtfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRUgYNfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDe0g/9GlRuIpez/1lGE/wWRg1Ug4JTDL4dwnIKw93kEteBI5KHzc1nZaaMPI8E
-Cnx5P1CQaQ5Fplmprz4y7iLg6Fg09Ped3i5qOuCcvDzBzJdx5QYAdv9DTscnSoOJ
-WE9UG2XoMEjJRpkJK9nPZmDkQ/X6uWcxvDta/3JCAuJjVv/jYROXVVNXFT2TYhTe
-IYHo1QGC1C+e4dmRBTKXW20mkw0ZCf09nFwTUdjC+1a+2Z12S6Pv9CNAXjExgMYV
-VwKHtnoOSlrF4M42GhOdkJmFTStJc1554Mn7nid26Ou+LzWcW18ECMU6OIo7G7ZH
-LL+cIgATOPmuYutLMbQKeTO75wIw16s/hVNBycx2iLPbxaJ9vX5vWGW5pgYcfH5r
-2bVqDudmdeAe8yFo3QSVD/xOf2qWzTKrB6tiWCI0or5tR+d8F+Ywn+56ceaaBMTY
-/hkgmElZXGprA/4+h9e1bMwDibp3PgqHCpHC1AUD1bSHI6QyCxhdys5LzKKinkzG
-+c0FSYKM3ze85tNMASDKcoiDjaBTjPY4uVf1Socbyft2eHO+MZBuior7uDJxsv9K
-LvxuxDyGz6E8Mtkz9zyNl0kQ6vpuPrNyu+Q1eDPoJw7cvXJpHuGquc9zpkVzfd16
-mpGFW22+L38JY/T9F3zEBB2LxfqDxx7XRBrbO/QPIHjJcHq+WC8=
-=E4gC
+klAcVQ//eEiEhfM8XNLN6gHceSNHOniJbTYvTlD84xMmlmYKqeeW3t7j/rBiboJH
+dfN0cmdwHDURejtUW0cknKJXQ/AEFbcMybW1wYMUu8XYXzOSWl3lSo3EWnVo0YsX
+U+6DxX/Hk6VtQ8Glv1bbTG76lRMSR7md9thJusKvsl1V5ox30t0N2qxK9WfsymXK
+Uk7fKcammCvdccIYxgsC1tEx32WCDDp8/laTIXNmSHRrOj0321b1c7oxgGS2hZmn
+llyoSVwWx/RTWk0OkOUT6x0Jk+YQlgee3l0f6MnA8fZ9OTFUyRBJNZKz4xPgameb
+J0YQRecCqFQYWYZ4CFDFWgAplhoMQo1p4P7iHfuupyoGRwBSn//jM4ZEomgjGCpR
+u5rDa33eir3NnwZTkLaZhV/Mjb0HYrBw19HTijdpiCHJbfWfkd3ee1gtGlK2vYbA
+0UBjwQ2xrbY0GJA+2FIXMDJkCYJY7dVjAA3A//iYFZuAp/BeGWRVj+Z+bNTBoair
+57V5r0AxJB3tgqJnMvsiLlewEa9kqXIOHRylUydxyj0HP0MbkdyUjdnrCpUb/hpL
+ULiwn/xFO2spVl3ukQYliRcRv70CMVAZ0u+3iNT/Dh0AF6vFuH/OoTRsZBM8xkfL
+817pQlYvkDvzo7/4y13sshZ8AtX18njgiFCwZqZR7fH1v5keeOQ=
+=amoM
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index abb2d21cc16d..4a7384e92c70 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Thu, 04 May 2023 21:39:36 +0000
+Fri, 05 May 2023 04:09:35 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 1d04aa26a9ae..122ac4ca5029 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index 80b599755e5e..a3b2978afdf7 100644
--- a/metadata/md5-cache/app-arch/Manifest.gz
+++ b/metadata/md5-cache/app-arch/Manifest.gz
diff --git a/metadata/md5-cache/app-arch/brotli-1.0.9-r5 b/metadata/md5-cache/app-arch/brotli-1.0.9-r5
index 082e4860f810..6dc2dc65f77b 100644
--- a/metadata/md5-cache/app-arch/brotli-1.0.9-r5
+++ b/metadata/md5-cache/app-arch/brotli-1.0.9-r5
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://github.com/google/brotli/archive/v1.0.9.tar.gz -> brotli-1.0.9.tar.gz test? ( https://dev.gentoo.org/~mgorny/dist/brotli-1.0.9.testdata.tar.xz )
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	distutils-r1	c377e6aa4e8a33d679b05d0441586b86	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=547c27e494a649c771e80e9460c073af
+_md5_=a86a9c66f02cba974f73b92a3b1fb1aa
diff --git a/metadata/md5-cache/app-arch/cpio-2.14 b/metadata/md5-cache/app-arch/cpio-2.14
new file mode 100644
index 000000000000..11fd280dfc32
--- /dev/null
+++ b/metadata/md5-cache/app-arch/cpio-2.14
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=configure postinst prepare
+DESCRIPTION=A file archival tool which can also read and write tar files
+EAPI=8
+HOMEPAGE=https://www.gnu.org/software/cpio/cpio.html
+INHERIT=autotools
+IUSE=nls
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-3+
+PDEPEND=app-alternatives/cpio
+SLOT=0
+SRC_URI=mirror://gnu/cpio/cpio-2.14.tar.bz2
+_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=7ee2d5c493a1e2f77277ce186dfcbe91
diff --git a/metadata/md5-cache/app-arch/xz-utils-5.2.10 b/metadata/md5-cache/app-arch/xz-utils-5.2.12
index 5258a478fd50..025c3987106f 100644
--- a/metadata/md5-cache/app-arch/xz-utils-5.2.10
+++ b/metadata/md5-cache/app-arch/xz-utils-5.2.12
@@ -1,14 +1,14 @@
-BDEPEND=verify-sig? ( >=sec-keys/openpgp-keys-lassecollin-20230213 ) >=app-portage/elt-patches-20170815 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+BDEPEND=verify-sig? ( sec-keys/openpgp-keys-jiatan ) >=app-portage/elt-patches-20170815 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
 DEFINED_PHASES=compile configure install postinst preinst prepare test unpack
 DESCRIPTION=Utils for managing LZMA compressed files
-EAPI=7
+EAPI=8
 HOMEPAGE=https://tukaani.org/xz/
 INHERIT=libtool multilib multilib-minimal preserve-libs usr-ldscript verify-sig
 IUSE=+extra-filters nls static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr verify-sig
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=public-domain LGPL-2.1+ GPL-2+
 RESTRICT=!extra-filters? ( test )
 SLOT=0
-SRC_URI=mirror://sourceforge/lzmautils/xz-5.2.10.tar.gz https://tukaani.org/xz/xz-5.2.10.tar.gz verify-sig? ( https://tukaani.org/xz/xz-5.2.10.tar.gz.sig )
+SRC_URI=mirror://sourceforge/lzmautils/xz-5.2.12.tar.gz https://tukaani.org/xz/xz-5.2.12.tar.gz verify-sig? ( https://tukaani.org/xz/xz-5.2.12.tar.gz.sig )
 _eclasses_=libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	preserve-libs	21162ec96c87041004a75348d97342dd	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	usr-ldscript	cd36f6d91e8173d95e25b0e0cf036960	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
-_md5_=b3b15c5ae4cc8bf9503d8dd36804b52f
+_md5_=f017c4b103637bb91da0d2c23e553ff5
diff --git a/metadata/md5-cache/app-arch/xz-utils-5.4.1 b/metadata/md5-cache/app-arch/xz-utils-5.4.3
index 6ca9d5f4d767..5ef5003d83b3 100644
--- a/metadata/md5-cache/app-arch/xz-utils-5.4.1
+++ b/metadata/md5-cache/app-arch/xz-utils-5.4.3
@@ -1,13 +1,13 @@
-BDEPEND=verify-sig? ( >=sec-keys/openpgp-keys-lassecollin-20230213 ) >=app-portage/elt-patches-20170815 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+BDEPEND=verify-sig? ( sec-keys/openpgp-keys-jiatan ) >=app-portage/elt-patches-20170815 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
 DEFINED_PHASES=compile configure install postinst preinst prepare test unpack
 DESCRIPTION=Utils for managing LZMA compressed files
 EAPI=7
 HOMEPAGE=https://tukaani.org/xz/
 INHERIT=libtool multilib multilib-minimal preserve-libs usr-ldscript verify-sig
-IUSE=+extra-filters nls static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr verify-sig
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+IUSE=doc +extra-filters nls static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr verify-sig
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=public-domain LGPL-2.1+ GPL-2+
 SLOT=0
-SRC_URI=https://github.com/tukaani-project/xz/releases/download/v5.4.1/xz-5.4.1.tar.gz mirror://sourceforge/lzmautils/xz-5.4.1.tar.gz https://tukaani.org/xz/xz-5.4.1.tar.gz verify-sig? ( https://github.com/tukaani-project/xz/releases/download/v5.4.1/xz-5.4.1.tar.gz.sig https://tukaani.org/xz/xz-5.4.1.tar.gz.sig )
+SRC_URI=https://github.com/tukaani-project/xz/releases/download/v5.4.3/xz-5.4.3.tar.gz mirror://sourceforge/lzmautils/xz-5.4.3.tar.gz https://tukaani.org/xz/xz-5.4.3.tar.gz verify-sig? ( https://github.com/tukaani-project/xz/releases/download/v5.4.3/xz-5.4.3.tar.gz.sig https://tukaani.org/xz/xz-5.4.3.tar.gz.sig )
 _eclasses_=libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	preserve-libs	21162ec96c87041004a75348d97342dd	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	usr-ldscript	cd36f6d91e8173d95e25b0e0cf036960	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
-_md5_=ffdc935f2413e48620437270d84e8515
+_md5_=626e8d5b693b56fd2152f69a875acdd0
diff --git a/metadata/md5-cache/app-arch/xz-utils-9999 b/metadata/md5-cache/app-arch/xz-utils-9999
index 6668142d1bf7..a03c94490147 100644
--- a/metadata/md5-cache/app-arch/xz-utils-9999
+++ b/metadata/md5-cache/app-arch/xz-utils-9999
@@ -9,4 +9,4 @@ LICENSE=public-domain LGPL-2.1+ GPL-2+
 PROPERTIES=live
 SLOT=0
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	git-r3	27e13c09a4c7e4c78ac812f74727e676	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	preserve-libs	21162ec96c87041004a75348d97342dd	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	usr-ldscript	cd36f6d91e8173d95e25b0e0cf036960
-_md5_=46acd1d69c5f4897e7c60dc369204411
+_md5_=626e8d5b693b56fd2152f69a875acdd0
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index 46a7647f0c25..dc359300a604 100644
--- a/metadata/md5-cache/app-crypt/Manifest.gz
+++ b/metadata/md5-cache/app-crypt/Manifest.gz
diff --git a/metadata/md5-cache/app-crypt/gpgme-1.20.0 b/metadata/md5-cache/app-crypt/gpgme-1.20.0
index e9d0c67a2359..10686921738d 100644
--- a/metadata/md5-cache/app-crypt/gpgme-1.20.0
+++ b/metadata/md5-cache/app-crypt/gpgme-1.20.0
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=1/11.6.15.2
 SRC_URI=mirror://gnupg/gpgme/gpgme-1.20.0.tar.bz2 verify-sig? ( mirror://gnupg/gpgme/gpgme-1.20.0.tar.bz2.sig )
 _eclasses_=distutils-r1	c377e6aa4e8a33d679b05d0441586b86	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
-_md5_=d4ce3f5868614a03eba8dffdf3df14aa
+_md5_=f7a246b6a77de8ddb2f8de81c5f57448
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index 3caeb25db9ff..fe4cbc576e50 100644
--- a/metadata/md5-cache/app-misc/Manifest.gz
+++ b/metadata/md5-cache/app-misc/Manifest.gz
diff --git a/metadata/md5-cache/app-misc/logiops-0.3.1 b/metadata/md5-cache/app-misc/logiops-0.3.1
new file mode 100644
index 000000000000..1e01a313f0af
--- /dev/null
+++ b/metadata/md5-cache/app-misc/logiops-0.3.1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test unpack
+DEPEND=dev-libs/glib dev-libs/libconfig:=[cxx] dev-libs/libevdev sys-apps/dbus virtual/libudev systemd? ( sys-apps/systemd )
+DESCRIPTION=An unofficial userspace driver for HID++ Logitech devices
+EAPI=8
+HOMEPAGE=https://github.com/PixlOne/logiops
+INHERIT=cmake linux-info
+IUSE=systemd
+KEYWORDS=amd64 x86
+LICENSE=GPL-3+
+RDEPEND=dev-libs/glib dev-libs/libconfig:=[cxx] dev-libs/libevdev sys-apps/dbus virtual/libudev systemd? ( sys-apps/systemd )
+SLOT=0
+SRC_URI=https://github.com/PixlOne/logiops/archive/refs/tags/v0.3.1.tar.gz -> logiops-0.3.1.tar.gz https://github.com/PixlOne/ipcgull/archive/refs/tags/v0.1.tar.gz -> ipcgull-0.1.tar.gz
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=6cd1c263e47cd0dfa0e1edff72a32fdc
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 780e61ac53ec..4a36d40e056b 100644
--- a/metadata/md5-cache/app-text/Manifest.gz
+++ b/metadata/md5-cache/app-text/Manifest.gz
diff --git a/metadata/md5-cache/app-text/tree-2.1.0 b/metadata/md5-cache/app-text/tree-2.1.0
index 0c5f5e3e0b84..f7d1712f8824 100644
--- a/metadata/md5-cache/app-text/tree-2.1.0
+++ b/metadata/md5-cache/app-text/tree-2.1.0
@@ -3,9 +3,9 @@ DESCRIPTION=Lists directories recursively, and produces an indented listing of f
 EAPI=8
 HOMEPAGE=https://mama.indstate.edu/users/ice/tree/ https://gitlab.com/OldManProgrammer/unix-tree
 INHERIT=toolchain-funcs flag-o-matic bash-completion-r1
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://gitlab.com/OldManProgrammer/unix-tree/-/archive/2.1.0/unix-tree-2.1.0.tar.bz2
 _eclasses_=bash-completion-r1	59cf54afadd3b37d31d9d85c7d7d8067	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=97d8994bbcf27b907f53b2a8b013404d
+_md5_=5c00b7f88c5f16adf6233ed1b04357f6
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index c8a34468b2ed..9fca8fc2d59c 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/php-8.1.18 b/metadata/md5-cache/dev-lang/php-8.1.18
new file mode 100644
index 000000000000..63f51c562aaf
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/php-8.1.18
@@ -0,0 +1,18 @@
+BDEPEND=virtual/pkgconfig virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 sys-devel/automake >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=>=app-eselect/eselect-php-0.9.7[apache2?,fpm?] >=dev-libs/libpcre2-10.30[jit?,unicode] fpm? ( acl? ( sys-apps/acl ) apparmor? ( sys-libs/libapparmor ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:4.8 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.29.0 ) enchant? ( app-text/enchant:2 ) ffi? ( >=dev-libs/libffi-3.0.11:= ) firebird? ( dev-db/firebird ) gd? ( media-libs/libjpeg-turbo:0= media-libs/libpng:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( net-libs/c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11:= ) ldap-sasl? ( dev-libs/cyrus-sasl ) libedit? ( dev-libs/libedit ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient[sdk] ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) ) postgres? ( >=dev-db/postgresql-9.1:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) session-mm? ( dev-libs/mm ) snmp? ( >=net-analyzer/net-snmp-5.2 ) sodium? ( dev-libs/libsodium:=[-minimal] ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-1.0.2:0= ) tidy? ( app-text/htmltidy ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.9.0 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt ) zip? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) app-arch/xz-utils >=sys-devel/bison-3.0.1
+DESCRIPTION=The PHP language runtime engine
+EAPI=8
+HOMEPAGE=https://www.php.net/
+IDEPEND=>=app-eselect/eselect-php-0.9.7[apache2?,fpm?]
+INHERIT=flag-o-matic systemd autotools
+IUSE=embed +cli cgi fpm apache2 phpdbg threads acl apparmor argon2 bcmath berkdb bzip2 calendar cdb cjk coverage +ctype curl debug enchant exif ffi +fileinfo +filter firebird +flatfile ftp gd gdbm gmp +iconv imap inifile intl iodbc ipv6 +jit kerberos ldap ldap-sasl libedit lmdb mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline selinux +session session-mm sharedmem +simplexml snmp soap sockets sodium spell sqlite ssl sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode webp +xml xmlreader xmlwriter xpm xslt zip zlib
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
+RDEPEND=>=app-eselect/eselect-php-0.9.7[apache2?,fpm?] >=dev-libs/libpcre2-10.30[jit?,unicode] fpm? ( acl? ( sys-apps/acl ) apparmor? ( sys-libs/libapparmor ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:4.8 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.29.0 ) enchant? ( app-text/enchant:2 ) ffi? ( >=dev-libs/libffi-3.0.11:= ) firebird? ( dev-db/firebird ) gd? ( media-libs/libjpeg-turbo:0= media-libs/libpng:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( net-libs/c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11:= ) ldap-sasl? ( dev-libs/cyrus-sasl ) libedit? ( dev-libs/libedit ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient[sdk] ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) ) postgres? ( >=dev-db/postgresql-9.1:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) session-mm? ( dev-libs/mm ) snmp? ( >=net-analyzer/net-snmp-5.2 ) sodium? ( dev-libs/libsodium:=[-minimal] ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-1.0.2:0= ) tidy? ( app-text/htmltidy ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.9.0 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt ) zip? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
+REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) !cli? ( ?? ( readline libedit ) ) truetype? ( gd zlib ) webp? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) xmlreader? ( xml ) xmlwriter? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) oci8-instant-client? ( !ldap ) qdbm? ( !gdbm ) session-mm? ( session !threads ) mysql? ( || ( mysqli pdo ) ) firebird? ( pdo ) mssql? ( pdo )
+RESTRICT=!test? ( test )
+SLOT=8.1
+SRC_URI=https://www.php.net/distributions/php-8.1.18.tar.xz
+_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=645a24f8a82882f5cb7b953986566844
diff --git a/metadata/md5-cache/dev-lang/php-8.2.5 b/metadata/md5-cache/dev-lang/php-8.2.5
new file mode 100644
index 000000000000..810872e68503
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/php-8.2.5
@@ -0,0 +1,18 @@
+BDEPEND=virtual/pkgconfig virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 sys-devel/automake >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=>=app-eselect/eselect-php-0.9.7[apache2?,fpm?] >=dev-libs/libpcre2-10.30[jit?,unicode] fpm? ( acl? ( sys-apps/acl ) apparmor? ( sys-libs/libapparmor ) selinux? ( sys-libs/libselinux ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:4.8 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.29.0 ) enchant? ( app-text/enchant:2 ) ffi? ( >=dev-libs/libffi-3.0.11:= ) firebird? ( dev-db/firebird ) gd? ( media-libs/libjpeg-turbo:0= media-libs/libpng:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( net-libs/c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11:= ) ldap-sasl? ( dev-libs/cyrus-sasl ) libedit? ( dev-libs/libedit ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient[sdk] ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) ) postgres? ( >=dev-db/postgresql-9.1:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) session-mm? ( dev-libs/mm ) snmp? ( >=net-analyzer/net-snmp-5.2 ) sodium? ( dev-libs/libsodium:=[-minimal] ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-1.0.2:0= ) tidy? ( app-text/htmltidy ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.9.0 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt ) zip? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) app-arch/xz-utils >=sys-devel/bison-3.0.1
+DESCRIPTION=The PHP language runtime engine
+EAPI=8
+HOMEPAGE=https://www.php.net/
+IDEPEND=>=app-eselect/eselect-php-0.9.7[apache2?,fpm?]
+INHERIT=flag-o-matic multilib systemd autotools
+IUSE=embed +cli cgi fpm apache2 phpdbg threads acl apparmor argon2 bcmath berkdb bzip2 calendar cdb cjk coverage +ctype curl debug enchant exif ffi +fileinfo +filter firebird +flatfile ftp gd gdbm gmp +iconv imap inifile intl iodbc +jit kerberos ldap ldap-sasl libedit lmdb mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline selinux +session session-mm sharedmem +simplexml snmp soap sockets sodium spell sqlite ssl sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode webp +xml xmlreader xmlwriter xpm xslt zip zlib
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
+RDEPEND=>=app-eselect/eselect-php-0.9.7[apache2?,fpm?] >=dev-libs/libpcre2-10.30[jit?,unicode] fpm? ( acl? ( sys-apps/acl ) apparmor? ( sys-libs/libapparmor ) selinux? ( sys-libs/libselinux ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:4.8 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.29.0 ) enchant? ( app-text/enchant:2 ) ffi? ( >=dev-libs/libffi-3.0.11:= ) firebird? ( dev-db/firebird ) gd? ( media-libs/libjpeg-turbo:0= media-libs/libpng:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( net-libs/c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11:= ) ldap-sasl? ( dev-libs/cyrus-sasl ) libedit? ( dev-libs/libedit ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient[sdk] ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) ) postgres? ( >=dev-db/postgresql-9.1:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) session-mm? ( dev-libs/mm ) snmp? ( >=net-analyzer/net-snmp-5.2 ) sodium? ( dev-libs/libsodium:=[-minimal] ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-1.0.2:0= ) tidy? ( app-text/htmltidy ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.9.0 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt ) zip? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
+REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) !cli? ( ?? ( readline libedit ) ) truetype? ( gd zlib ) webp? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) xmlreader? ( xml ) xmlwriter? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) oci8-instant-client? ( !ldap ) qdbm? ( !gdbm ) session-mm? ( session !threads ) mysql? ( || ( mysqli pdo ) ) firebird? ( pdo ) mssql? ( pdo )
+RESTRICT=!test? ( test )
+SLOT=8.2
+SRC_URI=https://www.php.net/distributions/php-8.2.5.tar.xz
+_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=b60b55f8fea53c70d7c8f013acf9c8a6
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 17ac53e29a54..7f7bbab4296c 100644
--- a/metadata/md5-cache/dev-libs/Manifest.gz
+++ b/metadata/md5-cache/dev-libs/Manifest.gz
diff --git a/metadata/md5-cache/dev-libs/opencl-clang-16.0.0 b/metadata/md5-cache/dev-libs/opencl-clang-16.0.0
new file mode 100644
index 000000000000..160237cf0b06
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/opencl-clang-16.0.0
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-util/spirv-llvm-translator:16= sys-devel/clang:16=[static-analyzer] sys-devel/llvm:16= !!sys-devel/llvm:0
+DESCRIPTION=OpenCL-oriented thin wrapper library around clang
+EAPI=8
+HOMEPAGE=https://github.com/intel/opencl-clang
+INHERIT=cmake llvm
+KEYWORDS=~amd64
+LICENSE=UoI-NCSA
+RDEPEND=dev-util/spirv-llvm-translator:16= sys-devel/clang:16=[static-analyzer] sys-devel/llvm:16=
+SLOT=16
+SRC_URI=https://github.com/intel/opencl-clang/archive/refs/tags/v16.0.0.tar.gz -> opencl-clang-16.0.0.tar.gz
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm	4cc6f8e29d24a8011266413e74c728bb	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=22c17927713296cc7dd4160661630713
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 5a81569e7f7f..1f856c073123 100644
--- a/metadata/md5-cache/media-libs/Manifest.gz
+++ b/metadata/md5-cache/media-libs/Manifest.gz
diff --git a/metadata/md5-cache/media-libs/alsa-lib-1.2.7.2 b/metadata/md5-cache/media-libs/alsa-lib-1.2.7.2
deleted file mode 100644
index 7de8bbfe4578..000000000000
--- a/metadata/md5-cache/media-libs/alsa-lib-1.2.7.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=doc? ( >=app-doc/doxygen-1.2.6 ) 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 prepare setup test
-DEPEND=media-libs/alsa-topology-conf media-libs/alsa-ucm-conf python? ( 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 ) )
-DESCRIPTION=Advanced Linux Sound Architecture Library
-EAPI=8
-HOMEPAGE=https://alsa-project.org/wiki/Main_Page
-INHERIT=autotools multilib-minimal flag-o-matic python-single-r1
-IUSE=alisp debug doc python +thread-safety abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
-LICENSE=LGPL-2.1
-RDEPEND=media-libs/alsa-topology-conf media-libs/alsa-ucm-conf python? ( 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 ) )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_10 python_single_target_python3_11 ) )
-SLOT=0
-SRC_URI=https://www.alsa-project.org/files/pub/lib/alsa-lib-1.2.7.2.tar.bz2
-_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=5a8dfaa02f38dc28fcbf501b42239034
diff --git a/metadata/md5-cache/media-libs/alsa-lib-1.2.7.2-r1 b/metadata/md5-cache/media-libs/alsa-lib-1.2.7.2-r1
deleted file mode 100644
index 03d345ccf737..000000000000
--- a/metadata/md5-cache/media-libs/alsa-lib-1.2.7.2-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=doc? ( >=app-doc/doxygen-1.2.6 ) 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 prepare setup test
-DEPEND=media-libs/alsa-topology-conf media-libs/alsa-ucm-conf python? ( 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 ) )
-DESCRIPTION=Advanced Linux Sound Architecture Library
-EAPI=8
-HOMEPAGE=https://alsa-project.org/wiki/Main_Page
-INHERIT=autotools multilib-minimal flag-o-matic python-single-r1
-IUSE=alisp debug doc python abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=LGPL-2.1
-RDEPEND=media-libs/alsa-topology-conf media-libs/alsa-ucm-conf python? ( 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 ) )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_10 python_single_target_python3_11 ) )
-SLOT=0
-SRC_URI=https://www.alsa-project.org/files/pub/lib/alsa-lib-1.2.7.2.tar.bz2
-_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=ea8e092ed85a8de5fa1edb19da886a4b
diff --git a/metadata/md5-cache/media-libs/alsa-ucm-conf-1.2.7.2 b/metadata/md5-cache/media-libs/alsa-ucm-conf-1.2.7.2
deleted file mode 100644
index efadb260bb01..000000000000
--- a/metadata/md5-cache/media-libs/alsa-ucm-conf-1.2.7.2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=!<media-libs/alsa-lib-1.2.1
-DESCRIPTION=ALSA ucm configuration files
-EAPI=8
-HOMEPAGE=https://alsa-project.org/wiki/Main_Page
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv sparc x86
-LICENSE=BSD
-RDEPEND=!<media-libs/alsa-lib-1.2.1
-SLOT=0
-SRC_URI=https://www.alsa-project.org/files/pub/lib/alsa-ucm-conf-1.2.7.2.tar.bz2
-_md5_=545b803b3a2421da284b3689e4169de6
diff --git a/metadata/md5-cache/media-plugins/Manifest.gz b/metadata/md5-cache/media-plugins/Manifest.gz
index 391d634a7bd6..afbe76f1635e 100644
--- a/metadata/md5-cache/media-plugins/Manifest.gz
+++ b/metadata/md5-cache/media-plugins/Manifest.gz
diff --git a/metadata/md5-cache/media-plugins/alsa-plugins-1.2.7.1 b/metadata/md5-cache/media-plugins/alsa-plugins-1.2.7.1
deleted file mode 100644
index 52aed8d76d8f..000000000000
--- a/metadata/md5-cache/media-plugins/alsa-plugins-1.2.7.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=media-libs/alsa-lib-1.2.7.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ffmpeg? ( media-video/ffmpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libsamplerate? ( >=media-libs/libsamplerate-0.1.8-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-libs/libpulse[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) speex? ( >=media-libs/speex-1.2.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/speexdsp[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-DESCRIPTION=ALSA extra plugins
-EAPI=8
-HOMEPAGE=https://alsa-project.org/wiki/Main_Page
-INHERIT=autotools flag-o-matic multilib-minimal
-IUSE=arcam_av debug ffmpeg jack libsamplerate +mix oss pulseaudio speex +usb_stream abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=>=media-libs/alsa-lib-1.2.7.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ffmpeg? ( media-video/ffmpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libsamplerate? ( >=media-libs/libsamplerate-0.1.8-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-libs/libpulse[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) speex? ( >=media-libs/speex-1.2.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/speexdsp[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-SLOT=0
-SRC_URI=https://www.alsa-project.org/files/pub/plugins/alsa-plugins-1.2.7.1.tar.bz2
-_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=076517e363b08914b130ee1be8118431
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index 23479b4ea84b..e0e7ac238c5b 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/alsa-utils-1.2.7-r1 b/metadata/md5-cache/media-sound/alsa-utils-1.2.7-r1
deleted file mode 100644
index 99c32c280a04..000000000000
--- a/metadata/md5-cache/media-sound/alsa-utils-1.2.7-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=configure install postinst postrm
-DEPEND=>=media-libs/alsa-lib-1.2.7 libsamplerate? ( media-libs/libsamplerate ) ieee1394? ( media-libs/libffado ) ncurses? ( >=sys-libs/ncurses-5.7-r7:0= ) bat? ( sci-libs/fftw:= ) doc? ( app-text/xmlto )
-DESCRIPTION=Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)
-EAPI=8
-HOMEPAGE=https://alsa-project.org/wiki/Main_Page
-INHERIT=systemd udev
-IUSE=bat doc +libsamplerate ieee1394 +ncurses nls selinux
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86
-LICENSE=GPL-2
-RDEPEND=>=media-libs/alsa-lib-1.2.7 libsamplerate? ( media-libs/libsamplerate ) ieee1394? ( media-libs/libffado ) ncurses? ( >=sys-libs/ncurses-5.7-r7:0= ) bat? ( sci-libs/fftw:= ) selinux? ( sec-policy/selinux-alsa )
-SLOT=0.9
-SRC_URI=https://www.alsa-project.org/files/pub/utils/alsa-utils-1.2.7.tar.bz2
-_eclasses_=multilib	d1408425c7c4a7669b9b17735404b693	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=1b11df31da25c84d6746b6d4a8c6b9eb
diff --git a/metadata/md5-cache/media-sound/alsa-utils-1.2.8 b/metadata/md5-cache/media-sound/alsa-utils-1.2.8
deleted file mode 100644
index 615648286c34..000000000000
--- a/metadata/md5-cache/media-sound/alsa-utils-1.2.8
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig doc? ( app-text/xmlto ) virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=configure install postinst postrm
-DEPEND=>=media-libs/alsa-lib-1.2.8 libsamplerate? ( media-libs/libsamplerate ) ieee1394? ( media-libs/libffado ) ncurses? ( >=sys-libs/ncurses-5.7-r7:= ) bat? ( sci-libs/fftw:= )
-DESCRIPTION=Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)
-EAPI=8
-HOMEPAGE=https://alsa-project.org/wiki/Main_Page
-INHERIT=systemd udev
-IUSE=bat doc +libsamplerate ieee1394 +ncurses nls selinux
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=>=media-libs/alsa-lib-1.2.8 libsamplerate? ( media-libs/libsamplerate ) ieee1394? ( media-libs/libffado ) ncurses? ( >=sys-libs/ncurses-5.7-r7:= ) bat? ( sci-libs/fftw:= ) selinux? ( sec-policy/selinux-alsa )
-SLOT=0.9
-SRC_URI=https://www.alsa-project.org/files/pub/utils/alsa-utils-1.2.8.tar.bz2
-_eclasses_=multilib	d1408425c7c4a7669b9b17735404b693	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=5b262b1b40d64c0c5d325c39589c7e44
diff --git a/metadata/md5-cache/net-ftp/Manifest.gz b/metadata/md5-cache/net-ftp/Manifest.gz
index fc03c1033453..7208d436ac0e 100644
--- a/metadata/md5-cache/net-ftp/Manifest.gz
+++ b/metadata/md5-cache/net-ftp/Manifest.gz
diff --git a/metadata/md5-cache/net-ftp/lftp-4.9.2-r1 b/metadata/md5-cache/net-ftp/lftp-4.9.2-r1
index 20e36e851b7e..bc5b5a599dc1 100644
--- a/metadata/md5-cache/net-ftp/lftp-4.9.2-r1
+++ b/metadata/md5-cache/net-ftp/lftp-4.9.2-r1
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://lftp.yar.ru/ftp/lftp-4.9.2.tar.xz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=fd7274ea6c372b6c24bff3695f10b193
+_md5_=0445a87a72d5f83feab2ad7bf5af9b84
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index c38b5e815378..cf082d95fa6b 100644
--- a/metadata/md5-cache/net-libs/Manifest.gz
+++ b/metadata/md5-cache/net-libs/Manifest.gz
diff --git a/metadata/md5-cache/net-libs/libnetconf2-2.1.31 b/metadata/md5-cache/net-libs/libnetconf2-2.1.31
index 6d6b16a17832..124447aadec8 100644
--- a/metadata/md5-cache/net-libs/libnetconf2-2.1.31
+++ b/metadata/md5-cache/net-libs/libnetconf2-2.1.31
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/CESNET/libnetconf2
 INHERIT=cmake
 IUSE=doc test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=BSD
 RDEPEND=dev-libs/openssl:0= >=net-libs/libyang-2.0.194 net-libs/libssh:0=[server] virtual/libcrypt:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/CESNET/libnetconf2/archive/v2.1.31.tar.gz -> libnetconf2-2.1.31.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=5edfbf37c62b0ea4092a34024086d1bc
+_md5_=12b57c7102360bf22d2dc69139d78746
diff --git a/metadata/md5-cache/net-libs/libyang-2.1.55 b/metadata/md5-cache/net-libs/libyang-2.1.55
index 566194fbe8d2..3e427d2c4000 100644
--- a/metadata/md5-cache/net-libs/libyang-2.1.55
+++ b/metadata/md5-cache/net-libs/libyang-2.1.55
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/CESNET/libyang
 INHERIT=cmake
 IUSE=doc test
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 ~x86
 LICENSE=BSD
 RDEPEND=dev-libs/libpcre2
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/CESNET/libyang/archive/v2.1.55.tar.gz -> libyang-2.1.55.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=f2bcfc123dfeaccf2b02467e9662f579
+_md5_=5202b4dc489445237901b7a774acc20c
diff --git a/metadata/md5-cache/net-libs/nodejs-20.1.0 b/metadata/md5-cache/net-libs/nodejs-20.1.0
new file mode 100644
index 000000000000..4e95de756873
--- /dev/null
+++ b/metadata/md5-cache/net-libs/nodejs-20.1.0
@@ -0,0 +1,17 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) >=dev-util/ninja-1.8.2 sys-apps/coreutils virtual/pkgconfig test? ( net-misc/curl ) pax-kernel? ( sys-apps/elfix )
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test
+DEPEND=>=app-arch/brotli-1.0.9:= >=dev-libs/libuv-1.44.0:= >=net-dns/c-ares-1.17.2:= >=net-libs/nghttp2-1.41.0:= sys-libs/zlib system-icu? ( >=dev-libs/icu-67:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= ) sys-devel/gcc:*
+DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
+EAPI=8
+HOMEPAGE=https://nodejs.org/
+INHERIT=bash-completion-r1 check-reqs flag-o-matic linux-info ninja-utils pax-utils python-any-r1 toolchain-funcs xdg-utils
+IUSE=cpu_flags_x86_sse2 debug doc +icu inspector lto +npm pax-kernel +snapshot +ssl +system-icu +system-ssl test
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos
+LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
+RDEPEND=>=app-arch/brotli-1.0.9:= >=dev-libs/libuv-1.44.0:= >=net-dns/c-ares-1.17.2:= >=net-libs/nghttp2-1.41.0:= sys-libs/zlib system-icu? ( >=dev-libs/icu-67:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= ) sys-devel/gcc:*
+REQUIRED_USE=inspector? ( icu ssl ) npm? ( ssl ) system-icu? ( icu ) system-ssl? ( ssl )
+RESTRICT=!test? ( test )
+SLOT=0/20
+SRC_URI=https://nodejs.org/dist/v20.1.0/node-v20.1.0.tar.xz
+_eclasses_=bash-completion-r1	59cf54afadd3b37d31d9d85c7d7d8067	check-reqs	a5f1e025c53d62f98bc24bd63d7d95e1	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=1f7728eeff761b17264a7b64a39e0646
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index ef1f45dba7e3..06996e199083 100644
--- a/metadata/md5-cache/net-misc/Manifest.gz
+++ b/metadata/md5-cache/net-misc/Manifest.gz
diff --git a/metadata/md5-cache/net-misc/netopeer2-2.1.59-r1 b/metadata/md5-cache/net-misc/netopeer2-2.1.59-r1
index 71a291cf225a..2ebc2ea371da 100644
--- a/metadata/md5-cache/net-misc/netopeer2-2.1.59-r1
+++ b/metadata/md5-cache/net-misc/netopeer2-2.1.59-r1
@@ -5,10 +5,10 @@ DESCRIPTION=Server for implementing NETCONF configuration management
 EAPI=8
 HOMEPAGE=https://github.com/CESNET/netopeer2
 INHERIT=cmake
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=BSD
 RDEPEND=app-misc/c_rehash dev-libs/openssl:= net-misc/curl:= >=net-misc/sysrepo-2.2.60 >=net-libs/libnetconf2-2.1.31 net-libs/libssh:= >=net-libs/libyang-2.1.55
 SLOT=0
 SRC_URI=https://github.com/CESNET/netopeer2/archive/v2.1.59.tar.gz -> netopeer2-2.1.59.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=97fdf77b51c2abb4a204c513d6478227
+_md5_=fa21c56001f298443af85c022f1183f0
diff --git a/metadata/md5-cache/net-misc/sysrepo-2.2.60 b/metadata/md5-cache/net-misc/sysrepo-2.2.60
index 8f35e763a35a..631d33b7d87f 100644
--- a/metadata/md5-cache/net-misc/sysrepo-2.2.60
+++ b/metadata/md5-cache/net-misc/sysrepo-2.2.60
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.sysrepo.org
 INHERIT=cmake
 IUSE=doc test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=net-libs/libyang-2.1.55
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sysrepo/sysrepo/archive/v2.2.60.tar.gz -> sysrepo-2.2.60.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=027f3e6597852da31e0e3c72a96fada9
+_md5_=0a08eda9f9be898a8ceb07d0dfdd7456
diff --git a/metadata/md5-cache/sec-keys/Manifest.gz b/metadata/md5-cache/sec-keys/Manifest.gz
index 2d0ac0980402..48e448d3ff1e 100644
--- a/metadata/md5-cache/sec-keys/Manifest.gz
+++ b/metadata/md5-cache/sec-keys/Manifest.gz
diff --git a/metadata/md5-cache/sec-keys/openpgp-keys-jiatan-20230505 b/metadata/md5-cache/sec-keys/openpgp-keys-jiatan-20230505
new file mode 100644
index 000000000000..cc8ed22d011d
--- /dev/null
+++ b/metadata/md5-cache/sec-keys/openpgp-keys-jiatan-20230505
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install
+DESCRIPTION=OpenPGP keys used by Jia Tan
+EAPI=8
+HOMEPAGE=https://tukaani.org/xz/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=public-domain
+SLOT=0
+SRC_URI=https://tukaani.org/misc/jia_tan_pubkey.txt
+_md5_=73c20b62091e0a7e898933a304e67cca
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index ff43c64e117e..7789f44211f5 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/coreutils-9.1-r2 b/metadata/md5-cache/sys-apps/coreutils-9.1-r2
index 30da1230e743..7e9db3b6327d 100644
--- a/metadata/md5-cache/sys-apps/coreutils-9.1-r2
+++ b/metadata/md5-cache/sys-apps/coreutils-9.1-r2
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnu/coreutils/coreutils-9.1.tar.xz verify-sig? ( mirror://gnu/coreutils/coreutils-9.1.tar.xz.sig ) !vanilla? ( https://dev.gentoo.org/~sam/distfiles/sys-apps/coreutils/coreutils-9.0_p20220409-patches-01.tar.xz )
 _eclasses_=eapi8-dosym	741bfa77afb2a9321261501aca58c208	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=7f8b29fcd4757a897c9afcc3ed7a4e2b
+_md5_=40542078ce286c31783baadeb76015da
diff --git a/metadata/md5-cache/sys-apps/coreutils-9.2-r2 b/metadata/md5-cache/sys-apps/coreutils-9.2-r2
index 687087c004df..597829f7acc0 100644
--- a/metadata/md5-cache/sys-apps/coreutils-9.2-r2
+++ b/metadata/md5-cache/sys-apps/coreutils-9.2-r2
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnu/coreutils/coreutils-9.2.tar.xz verify-sig? ( mirror://gnu/coreutils/coreutils-9.2.tar.xz.sig ) !vanilla? ( https://dev.gentoo.org/~sam/distfiles/sys-apps/coreutils/coreutils-9.0_p20220409-patches-01.tar.xz )
 _eclasses_=flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
-_md5_=ea6f10b9908fd5e4f444f3ab91083d00
+_md5_=1de3d644cd5d186420f40589760ca11e
diff --git a/metadata/md5-cache/sys-apps/coreutils-9.3 b/metadata/md5-cache/sys-apps/coreutils-9.3
index 83346006440e..012d418e88bf 100644
--- a/metadata/md5-cache/sys-apps/coreutils-9.3
+++ b/metadata/md5-cache/sys-apps/coreutils-9.3
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnu/coreutils/coreutils-9.3.tar.xz verify-sig? ( mirror://gnu/coreutils/coreutils-9.3.tar.xz.sig ) !vanilla? ( https://dev.gentoo.org/~sam/distfiles/sys-apps/coreutils/coreutils-9.0_p20220409-patches-01.tar.xz )
 _eclasses_=flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
-_md5_=e62cf33f1a3df0de07b04d05d4e4777a
+_md5_=76187a06f0681095fe1be11591bff14a
diff --git a/metadata/md5-cache/sys-apps/coreutils-9.3-r1 b/metadata/md5-cache/sys-apps/coreutils-9.3-r1
new file mode 100644
index 000000000000..6ad54d250952
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/coreutils-9.3-r1
@@ -0,0 +1,16 @@
+BDEPEND=app-arch/xz-utils dev-lang/perl test? ( dev-lang/perl dev-perl/Expect dev-util/strace || ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 ) ) verify-sig? ( sec-keys/openpgp-keys-coreutils ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=configure install postinst prepare setup test unpack
+DEPEND=!static? ( acl? ( sys-apps/acl ) caps? ( sys-libs/libcap ) gmp? ( dev-libs/gmp:= ) openssl? ( dev-libs/openssl:= ) xattr? ( sys-apps/attr ) ) selinux? ( sys-libs/libselinux ) nls? ( virtual/libintl ) static? ( acl? ( sys-apps/acl[static-libs] ) caps? ( sys-libs/libcap ) gmp? ( dev-libs/gmp:=[static-libs] ) openssl? ( dev-libs/openssl:=[static-libs] ) xattr? ( sys-apps/attr[static-libs] ) )
+DESCRIPTION=Standard GNU utilities (chmod, cp, dd, ls, sort, tr, head, wc, who,...)
+EAPI=8
+HOMEPAGE=https://www.gnu.org/software/coreutils/
+INHERIT=flag-o-matic python-any-r1 toolchain-funcs verify-sig
+IUSE=acl caps gmp hostname kill multicall nls +openssl selinux +split-usr static test vanilla xattr verify-sig
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux
+LICENSE=GPL-3+
+RDEPEND=!static? ( acl? ( sys-apps/acl ) caps? ( sys-libs/libcap ) gmp? ( dev-libs/gmp:= ) openssl? ( dev-libs/openssl:= ) xattr? ( sys-apps/attr ) ) selinux? ( sys-libs/libselinux ) nls? ( virtual/libintl ) hostname? ( !sys-apps/net-tools[hostname] ) kill? ( !sys-apps/util-linux[kill] !sys-process/procps[kill] ) !app-misc/realpath !<sys-apps/util-linux-2.13 !<sys-apps/sandbox-2.10-r4 !sys-apps/stat !net-mail/base64 !sys-apps/mktemp !<app-forensics/tct-1.18-r1 !<net-fs/netatalk-2.0.3-r4
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://gnu/coreutils/coreutils-9.3.tar.xz verify-sig? ( mirror://gnu/coreutils/coreutils-9.3.tar.xz.sig ) !vanilla? ( https://dev.gentoo.org/~sam/distfiles/sys-apps/coreutils/coreutils-9.0_p20220409-patches-01.tar.xz )
+_eclasses_=flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
+_md5_=b80871f681f3868f0cbd315d2f3e0828
diff --git a/metadata/md5-cache/sys-apps/coreutils-9999 b/metadata/md5-cache/sys-apps/coreutils-9999
index 2e6d8f6149c9..a46c3ff71340 100644
--- a/metadata/md5-cache/sys-apps/coreutils-9999
+++ b/metadata/md5-cache/sys-apps/coreutils-9999
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=!vanilla? ( https://dev.gentoo.org/~sam/distfiles/sys-apps/coreutils/coreutils-9.0_p20220409-patches-01.tar.xz )
 _eclasses_=flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	git-r3	27e13c09a4c7e4c78ac812f74727e676	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
-_md5_=eb0225ab3ecada1a3a047add0d95fb1b
+_md5_=380427363a3a853b437195f9906c2be7
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index 27846ff930ba..04e9cd15ea46 100644
--- a/metadata/md5-cache/sys-devel/Manifest.gz
+++ b/metadata/md5-cache/sys-devel/Manifest.gz
diff --git a/metadata/md5-cache/sys-devel/gcc-11.3.1_p20230504 b/metadata/md5-cache/sys-devel/gcc-11.3.1_p20230504
new file mode 100644
index 000000000000..8eb590978a27
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/gcc-11.3.1_p20230504
@@ -0,0 +1,16 @@
+BDEPEND=>=sys-devel/binutils-2.30[cet(-)?] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) sys-apps/texinfo valgrind? ( dev-util/valgrind )
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
+DEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) sanitize? ( virtual/libcrypt ) systemtap? ( dev-util/systemtap ) zstd? ( app-arch/zstd:= )
+DESCRIPTION=The GNU Compiler Collection
+EAPI=8
+HOMEPAGE=https://gcc.gnu.org/
+INHERIT=toolchain
+IUSE=test vanilla +nls debug +cxx +nptl +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go +sanitize graphite ada vtv jit +pie +ssp +pch systemtap d lto cet zstd valgrind custom-cflags
+LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
+PDEPEND=>=sys-devel/gcc-config-2.3
+RDEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) zstd? ( app-arch/zstd:= )
+RESTRICT=!test? ( test )
+SLOT=11
+SRC_URI=mirror://gcc/snapshots/11-20230504/gcc-11-20230504.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-11.4.0-patches-10.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-11.4.0-musl-patches-2.tar.xz
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	f6b97dfda9e866a6bf0cfb2fbe126d89	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=f856e54ef4f95a39731defdb29ea1578
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index c15580bc5f34..4fe43c900b51 100644
--- a/metadata/md5-cache/sys-fs/Manifest.gz
+++ b/metadata/md5-cache/sys-fs/Manifest.gz
diff --git a/metadata/md5-cache/sys-fs/davl-1.2.4-r2 b/metadata/md5-cache/sys-fs/davl-1.2.4-r2
index d92d8ce01b3e..02f5eccf9851 100644
--- a/metadata/md5-cache/sys-fs/davl-1.2.4-r2
+++ b/metadata/md5-cache/sys-fs/davl-1.2.4-r2
@@ -1,13 +1,14 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile install
-DEPEND=>=x11-libs/gtk+-2.6:2 >=sys-fs/e2fsprogs-1.41.7-r1 virtual/pkgconfig
+DEPEND=>=x11-libs/gtk+-2.6:2 >=sys-fs/e2fsprogs-1.41.7-r1
 DESCRIPTION=Visualizes the fragmentation status of ext2/3 filesystems
-EAPI=6
-HOMEPAGE=http://davl.sourceforge.net/
+EAPI=8
+HOMEPAGE=https://davl.sourceforge.net/
 INHERIT=toolchain-funcs
 KEYWORDS=~x86
-LICENSE=GPL-2
+LICENSE=GPL-2+
 RDEPEND=>=x11-libs/gtk+-2.6:2
 SLOT=0
 SRC_URI=mirror://sourceforge/davl/davl-1.2.4.tar.bz2
 _eclasses_=multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=eed3bc2f410b4981c2b747b726a738ec
+_md5_=04d2120889f47b02ef90247d5f5eee03
diff --git a/metadata/md5-cache/sys-fs/ldapfuse-1.0-r4 b/metadata/md5-cache/sys-fs/ldapfuse-1.0-r4
index 5d35f919cf8c..a0d6e15d707d 100644
--- a/metadata/md5-cache/sys-fs/ldapfuse-1.0-r4
+++ b/metadata/md5-cache/sys-fs/ldapfuse-1.0-r4
@@ -1,11 +1,12 @@
+BDEPEND=app-arch/xz-utils virtual/pkgconfig
 DEFINED_PHASES=-
-DEPEND=net-nds/openldap:= sys-fs/fuse:0 >=sys-libs/libhx-3.12:= app-arch/xz-utils virtual/pkgconfig
-DESCRIPTION=A virtual filesystem for FUSE which allows navigation of an LDAP tree
-EAPI=6
+DEPEND=net-nds/openldap:= sys-fs/fuse:0 >=sys-libs/libhx-3.12:=
+DESCRIPTION=Virtual filesystem for FUSE which allows navigation of an LDAP tree
+EAPI=8
 HOMEPAGE=https://sourceforge.net/projects/ldapfuse/
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=net-nds/openldap:= sys-fs/fuse:0 >=sys-libs/libhx-3.12:=
 SLOT=0
 SRC_URI=mirror://sourceforge/ldapfuse/ldapfuse-1.0.tar.xz
-_md5_=a90b703fd808bcd1a703d905a2fdd85c
+_md5_=d291719863394aaf2bbf1d38ff6b1464
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index 292aeebe1adf..3cc9233bdbd7 100644
--- a/metadata/md5-cache/www-apps/Manifest.gz
+++ b/metadata/md5-cache/www-apps/Manifest.gz
diff --git a/metadata/md5-cache/www-apps/ttyd-1.7.3 b/metadata/md5-cache/www-apps/ttyd-1.7.3
new file mode 100644
index 000000000000..89e95472f7d7
--- /dev/null
+++ b/metadata/md5-cache/www-apps/ttyd-1.7.3
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/cmake >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/json-c:= dev-libs/libuv:= net-libs/libwebsockets:=[libuv,ssl] sys-libs/zlib:=
+DESCRIPTION=ttyd, a simple command-line tool for sharing terminal over the web
+EAPI=8
+HOMEPAGE=https://github.com/tsl0922/ttyd
+INHERIT=cmake systemd
+KEYWORDS=~amd64
+LICENSE=MIT
+SLOT=0
+SRC_URI=https://github.com/tsl0922/ttyd/archive/1.7.3.tar.gz -> ttyd-1.7.3.tar.gz
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=9983b2d6a7bce78e1c1b527f4b389625
diff --git a/metadata/md5-cache/www-apps/ttyd-9999 b/metadata/md5-cache/www-apps/ttyd-9999
new file mode 100644
index 000000000000..0d778099930a
--- /dev/null
+++ b/metadata/md5-cache/www-apps/ttyd-9999
@@ -0,0 +1,12 @@
+BDEPEND=dev-util/cmake >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-vcs/git:= dev-libs/json-c:= dev-libs/libuv:= net-libs/libwebsockets:=[libuv,ssl] sys-libs/zlib:=
+DESCRIPTION=ttyd, a simple command-line tool for sharing terminal over the web
+EAPI=8
+HOMEPAGE=https://github.com/tsl0922/ttyd
+INHERIT=cmake systemd git-r3
+LICENSE=MIT
+PROPERTIES=live
+SLOT=0
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	git-r3	27e13c09a4c7e4c78ac812f74727e676	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=8970d64910b29f6d3903e1d2b0ae59f2
diff --git a/metadata/md5-cache/x11-apps/Manifest.gz b/metadata/md5-cache/x11-apps/Manifest.gz
index 640e8c5e4e8f..9d03361468b5 100644
--- a/metadata/md5-cache/x11-apps/Manifest.gz
+++ b/metadata/md5-cache/x11-apps/Manifest.gz
diff --git a/metadata/md5-cache/x11-apps/xcalc-1.1.2 b/metadata/md5-cache/x11-apps/xcalc-1.1.2
new file mode 100644
index 000000000000..479cb561e514
--- /dev/null
+++ b/metadata/md5-cache/x11-apps/xcalc-1.1.2
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare unpack
+DEPEND=x11-libs/libXaw x11-libs/libXt x11-libs/libX11 x11-base/xorg-proto
+DESCRIPTION=scientific calculator for X
+EAPI=8
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xcalc
+INHERIT=xorg-3
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=x11-libs/libXaw x11-libs/libXt x11-libs/libX11
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/app/xcalc-1.1.2.tar.xz
+_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xorg-3	5a9d0eaf387b253edab4a38cd6cfdfe3
+_md5_=4d2b33f8e06ca706f3ede100bc196c87
diff --git a/metadata/md5-cache/x11-drivers/Manifest.gz b/metadata/md5-cache/x11-drivers/Manifest.gz
index 48bac6fdef80..e1c5087696fd 100644
--- a/metadata/md5-cache/x11-drivers/Manifest.gz
+++ b/metadata/md5-cache/x11-drivers/Manifest.gz
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-geode-2.11.21 b/metadata/md5-cache/x11-drivers/xf86-video-geode-2.11.21
new file mode 100644
index 000000000000..15d6b43835ef
--- /dev/null
+++ b/metadata/md5-cache/x11-drivers/xf86-video-geode-2.11.21
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare unpack
+DEPEND=ztv? ( sys-kernel/linux-headers ) x11-base/xorg-proto >=x11-base/xorg-server-1.20[xorg] >=x11-libs/libpciaccess-0.14
+DESCRIPTION=AMD Geode GX2 and LX video driver
+EAPI=8
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/driver/xf86-video-geode
+INHERIT=xorg-3
+IUSE=ztv
+KEYWORDS=~x86
+LICENSE=MIT
+RDEPEND=x11-base/xorg-server:= >=x11-base/xorg-server-1.20[xorg] >=x11-libs/libpciaccess-0.14
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/driver/xf86-video-geode-2.11.21.tar.xz
+_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xorg-3	5a9d0eaf387b253edab4a38cd6cfdfe3
+_md5_=92672aa0e0ac0e7182b1e699b5096757
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index 8e0cb5fd30d6..9c952c375de1 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/peksystray-0.4.0-r1 b/metadata/md5-cache/x11-misc/peksystray-0.4.0-r1
new file mode 100644
index 000000000000..68f5f83a6c8f
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/peksystray-0.4.0-r1
@@ -0,0 +1,13 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=install prepare
+DEPEND=x11-libs/libX11 x11-libs/libXt
+DESCRIPTION=System tray dockapp for window managers supporting docking
+EAPI=8
+HOMEPAGE=https://peksystray.sourceforge.net/
+INHERIT=autotools
+KEYWORDS=~alpha ~amd64 ~ppc ~x86
+LICENSE=GPL-2+
+SLOT=0
+SRC_URI=mirror://sourceforge/peksystray/peksystray-0.4.0.tar.bz2
+_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=eea57b84728226ad3e35d1cd64639416
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index e4955a6011cb..6167fda8e849 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 15493 BLAKE2B ec5ea168778a79b147975de4177e6e700a7d37e6ee037cb43e8a2fb5109fe7703b6271a466b25edb7a1f6a61aa9467b69f02382396560dc259c3acdd5e880f30 SHA512 24314abdcaad22302e8e4885bab38f0250026f6284cc14fc2d6d81378bea47d1c1e985134c2fc0d63a8bc88f3563b53ea9e7b90d1e24f24b6733a9cc9fe4c83a
-TIMESTAMP 2023-05-04T21:39:39Z
+TIMESTAMP 2023-05-05T04:09:39Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRUJhtfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRUgYRfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDbaxAAg1pF9TTYTDd8IZuEt8NSLEdUnsLtpDZyqHeHPmCIg+Kv3Ba736yPS5/s
-cM16Z1bZOO9nKSoSs+cOlUk2/sdXOO+Pkt7wHbSNOVY9RianSTUQyoUxSVf5mnzQ
-pKMFBpkpb3HpFsq1Na1VIaLfOF9EwUSYJppnQoHPsMvZH+hwkc9xjZA69kXmD06G
-ikpH2yNQMprwNtOO+JCF+Qo33z1fBKOBLBQa5vW3DXH3PKMVYwlSQtkCE9zx8CWI
-QMXF2CixCk23odWaixm4jfQGwl+gq5Iu56pRGMuVLdBLCuchrDsrICS48AmfiveI
-2Tf7guhVgZMAFHf67cN/7cSaRRKPyq0ymOyjoek4HxqhIokAzm4VlFnJsZ1OKHWq
-Wevm6PGftc+FLRGE07gU+OnNpqEQRBGSjoBfLD2FyjLcMzEXbXiWY6f3ur0eJ7Z9
-ZXNgVhKIBWMO5CtvFCdns7sM8QJUB0E+4pI8g/WEAyonkfBty9DVwrmoRZt3OpFB
-HWX2Td8/YWH3ZCK8dyDX4J0DJ3JY6MqJVCNUvv3x1oq49aKgclF4Y/V6HfcMbkcd
-XLI8/3QjnYmdhiqOCofXzHLL3IKJYvixo/V4qE/Y0sQ7N+4heCdCMtBw7w7vIqY6
-e6oa5AWAC9Q8UzuMykNlsFDHSkwXgV218zpNbWigWzs766/3xec=
-=C/RL
+klDIUQ/+MmF6Mw/HtM4aa1JIDkQx2y4y0pw466tEF21EUPXM7mNsnuY05NhHNU7u
+lzXosuwHIhu9mSbOKaR2MwqztjeNcw0I32pviBhNqMec7rx463XdreuOaUqoLNkj
+qSs3L/5I+OM7WUO4phU0eKN3uiuoscLGLKsC2XOEjia7YckULc3qaFKoWu8NZPds
+qh0wuS5Sf4JWSQXH0ZATMt6j2rbNAYHx3h72oWdT7WtIrvWRHodXNZ/ja7jHWlom
+p9Qx9QjD06jmk9D8Yf+YqfP0dIEkgBUd/2Qwf3LQusqX9iLV79OVbrLJjrm9aqgB
+JHjbWIenqUne0vEOnhHjkZk5JEXWHgNxAdKdlM+kAnYTRasQUWaBTvUDEXK9QIJM
+ge2+p/Qn31AO48YJ+Cm56UXNbiZ/OTYDTb5HI5JeqD0RXlcrNRKt56T8inSXPZvc
+iqKS+TPC39Eg60ZRWYO4SntSWNtCTtLtrUyVvf3gBFhyvE/sRlYlYVq3Mw0ABjeD
+YnDlDL0DIlZX27MG0T5kMPifF9o1fjaEwnLxHI3Ax9+Wakun2nsXaj32/Rzn/J/f
+tcwlyUvcfx9s754SnRLOiNQiJwWXlZLFw0C30DbKN/DJfsYYhHeD/fxGmepXwAJR
+MubDiaT9cf7NVgxNdQEyTB+8VQ8ideU2Sir/izSwplB6Ga7aea0=
+=wmb1
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index abb2d21cc16d..4a7384e92c70 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Thu, 04 May 2023 21:39:36 +0000
+Fri, 05 May 2023 04:09:35 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 06b9d04f3cf2..9d08409437b6 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Thu May  4 09:39:36 PM UTC 2023
+Fri May  5 04:09:35 AM UTC 2023
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 2f536b611462..16c95f655965 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Thu, 04 May 2023 21:45:01 +0000
+Fri, 05 May 2023 04:15:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 2287c5f249c8..d61a98c6af4b 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-a120eaf75b215f7f2a8256c0b483bf573f05f2ab 1683234706 2023-05-04T21:11:46+00:00
+eb354521d92f416920ccdde617232c9c3f1a272b 1683258631 2023-05-05T03:50:31+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 4be5996be7b0..355c76236173 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1683236401 Thu 04 May 2023 09:40:01 PM UTC
+1683259801 Fri 05 May 2023 04:10:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index abb2d21cc16d..4a7384e92c70 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Thu, 04 May 2023 21:39:36 +0000
+Fri, 05 May 2023 04:09:35 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index dfbad7ee7be4..b402deabda95 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/net-snmp/Manifest b/net-analyzer/net-snmp/Manifest
index 0c0959e1832f..a3cd7afa9695 100644
--- a/net-analyzer/net-snmp/Manifest
+++ b/net-analyzer/net-snmp/Manifest
@@ -1,17 +1,12 @@
 AUX net-snmp-5.1.2-snmpconf-selinux.patch 189 BLAKE2B ca3ac3cc5786226ca5ed73997df2b9ec5c75405f098ed8eb29a52f5187399a1a6fd357613ca10c8dad3a4a5c8f03e25771e785ec9673ae0d3da3970827b90afc SHA512 5859742fa90c297af17b1b1a4718af8d03edbb3a78f723c2cbde54576c68a5f562ed573cc0f8cfdd0bdee9d5accb769e6183dbd16d5e5aa66f0d43f174658f75
-AUX net-snmp-5.8-do-not-conflate-LDFLAGS-and-LIBS.patch 1257 BLAKE2B 2cdb98653d617e7c00a0ec2810d529e1b3e80668fdbbe771dd14a2dee3cf39dac069981bb2b8f8b9ae9fdaaef943a75662fc42cc8dd15000cdbf56ad6be6dc6c SHA512 3b5b48c1c1cad6953fe4687cca9a54161b6686bd887aa068f1ce61219d4772c839459eeecde8fde0863a75e65a9cfc0a8ec1a607e7e7aa47e2cfa19ef0dbcfab
 AUX net-snmp-5.8-pcap.patch 1030 BLAKE2B e082b3a9e889ee2f9abd3229ba09a7ac35ca61b5ef65b5fd3460b89ace7753d6bef55560b5c066705bbb1965625e9739f6ebfb78c3e5b5edee2607e3df0728ac SHA512 af60ee67f1407f846f2590008a7ee1d24777f1004547d6281d7bf21d79020e5ceb4b2d0502f08c7d9e25f0fd10b8c5a8e6309963f30f2e43167d1590194ce32e
 AUX net-snmp-5.8.1-mysqlclient.patch 785 BLAKE2B 932b635c9a86f5637be849713f18636c0fa01730141bcb6ec71c540053e0d5a50e7e3fd410b730e78b0bb3f8b1a856dcb7dc24eaece972fe00afa5f43ff3711f SHA512 40a61a4bebfd289f3474da483177c0031096aced23bbf69e1bf7b5d7b383710b1df05b074baf1ccb87035b4cdde3b8b70773455e457ad53f347781d7c5368a8a
-AUX net-snmp-5.8.1-net-snmp-config-libdir.patch 1395 BLAKE2B d22fa136b32cab28ffff0f9ba47f7f16823313309504bdc3d36979648d2cb697dd061c8c048e03241d897f39652b35d27db6080eab1f003dbdd9e72499bd2b83 SHA512 082b0befa290c917271acca3bfa5a6258a0712c9f1fb42990db3e4858af6be500317bc12efbd51ca3da76d53d0924e034f8d77d1be79dc1cf90f7196a7830bb8
-AUX net-snmp-5.8.1-pkg-config.patch 744 BLAKE2B bdcd74073b174fdf208f44bbe17546ab5e61420927e34cb1c9ecad5a208d00b52d3577cf686baf2ffb515c28ae6caa1d88696a3ddd6fde8eeabed17170d057c0 SHA512 10a1fcc115fdf19e03ba04651cd90063b9c05a6d075a5c79bcea5074145b22c65ab5a6974aade3072349b1f3b2543fff5000467d30526d02e22762ea9af5ff86
 AUX net-snmp-5.9-MakeMaker.patch 215 BLAKE2B 72b8b903d89bb7eff1dd69f9a212f6b1dcd13fcdc2a38650b3ffaadaae0ffe042bbb4ee3b2a8badb10c43f8179d405de45ff7dae42d83dc29f0929388bd0046d SHA512 2ade984435766624c2dcf3755644760d123745feaf9283f9f94230647df6fdc92cd27af7a8e144377ff17a6812b50c80d660d9a050e0a346b5260ec7963e0300
-AUX net-snmp-5.9.2-fix-LDFLAGS.patch 744 BLAKE2B 1d53469057630097c9c2a527ab276f8c30346c9b45b5ff4780cf9e51fb0f81193b9113e121a282d92268f73831fc3d4bf60ae2ea035f0eda9196351faa65f889 SHA512 7ebcc0128180c3690cd594dc3ec9c6428bff81ef31cf3b6f35be74a3d32c3753d0cb8e8b41b2dd6363a97811daa4786827a6a7a93b49804dfbb14545f157d360
 AUX net-snmp-5.9.3-0001-Fix-LDFLAGS-vs-LIBS-ordering.patch 9942 BLAKE2B 92214c4908da35c4cfa4c7fc0af2b93c0a577430ebdde489c89bcfc4b7d45d292f588af515f68dc13d84f285cebe63d008dccf538a027fce2a7e1a0a3f55220f SHA512 b095cb590f32410638d7d9e582eea53c19c37edb17a1e26f8bb1effc27037774ec0aede57dd54b8cebcab9fbff264911d8a6e3b0f64824fdd47c58c4724bfaab
 AUX net-snmp-5.9.3-0002-Tidy-up-net-snmp-config-output.patch 1786 BLAKE2B 3f672a9e54f2242af10cc31a91e9522f330f13d761b79e8ef6913ce7ef5916d9859cdf05037c8c3954e94dd983551fcbd81861f07b103d41e0c2012b76d3007b SHA512 a00aa1877b9ee9ad3af87bde9749a43cae993e91cfa4ff9b806c5725ac0409f389e2d866d5375f66ddd15084f73cc3dfa6af2f928448ebd1f6bfa4dcb220c93e
 AUX net-snmp-5.9.3-0003-Prune-Libs.private-entries-in-netsnmp-.pc.in.patch 1045 BLAKE2B 1cb4eb17363b9de90cecec0670ce220b04bdcb7e91af6931889139ba82ea69c24f399c5e4e1fd7ef3ae192372d7cd5bc5737b49a662cfeb685aab982ae321ede SHA512 0a1c51555359cec3f4294c0fe931c40e1cf1139a9a0e15fa7c75d6934b69cbedecc70b1bf44747f296274649bd39bf55ca55c0f9c4096a106e042b90698c95a1
 AUX net-snmp-5.9.3-0004-Search-for-ltinfo-in-configure-if-needed.patch 722 BLAKE2B 00c301bbf6482f201ef2b4b82fb9899458a27e26bd0564bd98c69895f905b3abbbf5b1b8dc1ea7069059d9f1ad84a1335b84a6c151e7e75b81fc7fa3a135c578 SHA512 23e5e8920e41911dc4183a1c14b33f284a7d026a12c800dca6ddf0fa685e5a31041787599cab2671949163f539c85879e1e962128bab31ec478ebd47195ae3e0
 AUX net-snmp-5.9.3-configure-clang16.patch 4779 BLAKE2B fbe551a16272c6a374ed1abdcb024e7babd15bf8854cbfec568c3c58546b3f78302ea27cbb289faa5eb84b5e8b2086505fe74bba62e76e9d1a84a09949700f26 SHA512 3b85e813b645a3a3220d1ef1b5aceee4b2ea4150159f723249171f6283c1d45a034069b3d79e5ed0faa32556a0cb662c3a8b4ad93bd69ff12d517622df21291e
-AUX net-snmp-99999999-tinfo.patch 280 BLAKE2B 4a762bb037beb054d6afa1d3047e9bfa9df7746bdbcbf3ee4050377deee5d4107433e983f1e443a801adcabcd7f13c71f27e14ab49b729850beeb06a096d4c2b SHA512 19c65a7f80eea80fbe88bb5653dadb46f36b4921123aa7c7874c71ab82c6b14b5331b2d697a3d273d3bf93a961b80bf0a9252d833c21f81aa6f73d7e2a4a39d7
 AUX snmpd.conf 552 BLAKE2B 9d2801b0ddc2148a62e332a1d355a9ddc050ec95aea2dde31f25413096c4b91dbab794c1e71b75f5baba1234d89729a6e8c50287098c04991a3eec4d9f512b3c SHA512 e64f93631e5cb2160d3fb26abb84fc74f5632d8875227d5c8dfa24809b25e8202dcf23251ea8f296aedf16298c31ce49b8e64fb6325c18775d8899a50b853bbc
 AUX snmpd.init.2 680 BLAKE2B ce21b60980c2a0d74c810bb473c6b4c70eb11a2fc0636ec4af8a262ce412324ba80bc6c72b2544d359b4e2f536cf329df99e0be7d96035fa20c25f9ab7dc4a16 SHA512 10394f04dee23537a195f5aed63a3e758ca90227e269076ae9d13f883c7bd666c1c43823d1b869c43f232e97dc4138e52648cae995327f7a7f676ba416ee6fff
 AUX snmpd.service 181 BLAKE2B e68aa957e78178c624faa41c93eee84dcadec817fd0b0fcba19eeded1b52d265923cfe69070d3fb71a03ba071fe10bc6b5ce0c99e3c9720521d2b37d04ce8ace SHA512 e8fe55538bf8c14ddb84c464bceddc33fdd0a03d303413783fb23d49c5d2417ead17fbcbbe460bf89738a5cff543f3ea0c7a4fd28e6f598dc9458da1d30d74ac
diff --git a/net-analyzer/net-snmp/files/net-snmp-5.8-do-not-conflate-LDFLAGS-and-LIBS.patch b/net-analyzer/net-snmp/files/net-snmp-5.8-do-not-conflate-LDFLAGS-and-LIBS.patch
deleted file mode 100644
index 4e3001e1e473..000000000000
--- a/net-analyzer/net-snmp/files/net-snmp-5.8-do-not-conflate-LDFLAGS-and-LIBS.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- a/net-snmp-config.in
-+++ b/net-snmp-config.in
-@@ -190,13 +190,13 @@
-     #################################################### client lib
-     --libs)
-       # use this one == --netsnmp-libs + --external-libs
--      echo $NSC_LDFLAGS $NSC_LIBDIR $NSC_SNMPLIBS $NSC_LIBS
-+      echo $NSC_LIBDIR $NSC_SNMPLIBS $NSC_LIBS
-       ;;
-     --netsnmp-libs)
-       echo $NSC_LIBDIR $NSC_BASE_SNMP_LIBS
-       ;;
-     --external-libs)
--      echo $NSC_LDFLAGS $NSC_LNETSNMPLIBS $NSC_LIBS @PERLLDOPTS_FOR_APPS@
-+      echo $NSC_LNETSNMPLIBS $NSC_LIBS @PERLLDOPTS_FOR_APPS@
-       ;;
-     #################################################### agent lib
-     --base-agent-libs)
-@@ -207,13 +207,13 @@
-       ;;
-     --agent-libs)
-       # use this one == --netsnmp-agent-libs + --external-libs
--      echo $NSC_LDFLAGS $NSC_LIBDIR $NSC_AGENTLIBS $NSC_LIBS
-+      echo $NSC_LIBDIR $NSC_AGENTLIBS $NSC_LIBS
-       ;;
-     --netsnmp-agent-libs)
-       echo $NSC_LIBDIR $NSC_BASE_AGENT_LIBS
-       ;;
-     --external-agent-libs)
--      echo $NSC_LDFLAGS $NSC_LMIBLIBS $NSC_LAGENTLIBS $NSC_LNETSNMPLIBS $NSC_LIBS
-+      echo $NSC_LMIBLIBS $NSC_LAGENTLIBS $NSC_LNETSNMPLIBS $NSC_LIBS
-       ;;
-     ####################################################
-     --version|--ver*)
diff --git a/net-analyzer/net-snmp/files/net-snmp-5.8.1-net-snmp-config-libdir.patch b/net-analyzer/net-snmp/files/net-snmp-5.8.1-net-snmp-config-libdir.patch
deleted file mode 100644
index 73d420531bb3..000000000000
--- a/net-analyzer/net-snmp/files/net-snmp-5.8.1-net-snmp-config-libdir.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- a/net-snmp-config.in
-+++ b/net-snmp-config.in
-@@ -193,10 +193,10 @@
-     #################################################### client lib
-     --libs)
-       # use this one == --netsnmp-libs + --external-libs
--      echo $NSC_LIBDIR $NSC_SNMPLIBS $NSC_LIBS
-+      echo $NSC_SNMPLIBS $NSC_LIBS
-       ;;
-     --netsnmp-libs)
--      echo $NSC_LIBDIR $NSC_BASE_SNMP_LIBS
-+      echo $NSC_BASE_SNMP_LIBS
-       ;;
-     --external-libs)
-       echo $NSC_LNETSNMPLIBS $NSC_LIBS @PERLLDOPTS_FOR_APPS@
-@@ -210,10 +210,10 @@
-       ;;
-     --agent-libs)
-       # use this one == --netsnmp-agent-libs + --external-libs
--      echo $NSC_LIBDIR $NSC_AGENTLIBS $NSC_LIBS
-+      echo $NSC_AGENTLIBS $NSC_LIBS
-       ;;
-     --netsnmp-agent-libs)
--      echo $NSC_LIBDIR $NSC_BASE_AGENT_LIBS
-+      echo $NSC_BASE_AGENT_LIBS
-       ;;
-     --external-agent-libs)
-       echo $NSC_LMIBLIBS $NSC_LAGENTLIBS $NSC_LNETSNMPLIBS $NSC_LIBS
-@@ -660,7 +660,7 @@
-         echo "Ack.  Can't create $tmpfile."
- 	exit 1
-       fi
--      cmd="@CC@ $cflags @CFLAGS@ @DEVFLAGS@ -I. -I${NSC_INCLUDEDIR} -o $outname $tmpfile $cfiles $NSC_LDFLAGS $NSC_LIBDIR $NSC_BASE_AGENT_LIBS $NSC_AGENTLIBS $ldflags"
-+      cmd="@CC@ $cflags @CFLAGS@ @DEVFLAGS@ -I. -I${NSC_INCLUDEDIR} -o $outname $tmpfile $cfiles $ldflags $NSC_LDFLAGS $NSC_BASE_AGENT_LIBS $NSC_AGENTLIBS"
-       echo "running: $cmd"
-       echo `$cmd`
-       result=$?
diff --git a/net-analyzer/net-snmp/files/net-snmp-5.8.1-pkg-config.patch b/net-analyzer/net-snmp/files/net-snmp-5.8.1-pkg-config.patch
deleted file mode 100644
index acda136a22cd..000000000000
--- a/net-analyzer/net-snmp/files/net-snmp-5.8.1-pkg-config.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/netsnmp-agent.pc.in
-+++ b/netsnmp-agent.pc.in
-@@ -8,5 +8,5 @@
- URL: http://www.net-snmp.org
- Version: @PACKAGE_VERSION@
- Cflags: -I${includedir}
--Libs: -L${libdir} -lnetsnmpmibs -lnetsnmpagent -lnetsnmp
--Libs.private: @LDFLAGS@ @LMIBLIBS@ @LAGENTLIBS@ @PERLLDOPTS_FOR_APPS@ @LNETSNMPLIBS@ @LIBS@
-+Libs: -lnetsnmpmibs -lnetsnmpagent -lnetsnmp
-+Libs.private: @LMIBLIBS@ @LAGENTLIBS@ @PERLLDOPTS_FOR_APPS@ @LNETSNMPLIBS@ @LIBS@
---- a/netsnmp.pc.in
-+++ b/netsnmp.pc.in
-@@ -8,5 +8,5 @@
- URL: http://www.net-snmp.org
- Version: @PACKAGE_VERSION@
- Cflags: -I${includedir}
--Libs: -L${libdir} -lnetsnmp
--Libs.private: @LDFLAGS@ @LNETSNMPLIBS@ @LIBS@ @PERLLDOPTS_FOR_APPS@
-+Libs: -lnetsnmp
-+Libs.private: @LNETSNMPLIBS@ @LIBS@ @PERLLDOPTS_FOR_APPS@
diff --git a/net-analyzer/net-snmp/files/net-snmp-5.9.2-fix-LDFLAGS.patch b/net-analyzer/net-snmp/files/net-snmp-5.9.2-fix-LDFLAGS.patch
deleted file mode 100644
index 158d8f1b5bee..000000000000
--- a/net-analyzer/net-snmp/files/net-snmp-5.9.2-fix-LDFLAGS.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/Makefile.top b/Makefile.top
-index d6394ca..f5119b5 100644
---- a/Makefile.top
-+++ b/Makefile.top
-@@ -86,11 +86,11 @@ LIBCURRENT  = 41
- LIBAGE      = 2
- LIBREVISION = 0
- 
--LIB_LD_CMD      = $(LIBTOOL) --mode=link $(LINKCC) $(CFLAGS) -rpath $(libdir) -version-info $(LIBCURRENT):$(LIBREVISION):$(LIBAGE) @LD_NO_UNDEFINED@ -o
-+LIB_LD_CMD      = $(LIBTOOL) --mode=link $(LINKCC) $(CFLAGS) $(LDFLAGS) -rpath $(libdir) -version-info $(LIBCURRENT):$(LIBREVISION):$(LIBAGE) @LD_NO_UNDEFINED@ -o
- LIB_EXTENSION   = la
- LIB_VERSION     =
- LIB_LDCONFIG_CMD = $(LIBTOOL) --mode=finish $(INSTALL_PREFIX)$(libdir)
--LINK		= $(LIBTOOL) --mode=link $(LINKCC)
-+LINK		= $(LIBTOOL) --mode=link $(LINKCC) $(LDFLAGS)
- # RANLIB 	= @RANLIB@
- RANLIB		= :
- 
diff --git a/net-analyzer/net-snmp/files/net-snmp-99999999-tinfo.patch b/net-analyzer/net-snmp/files/net-snmp-99999999-tinfo.patch
deleted file mode 100644
index 2eb4ccca6313..000000000000
--- a/net-analyzer/net-snmp/files/net-snmp-99999999-tinfo.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/configure.d/config_os_libs2
-+++ b/configure.d/config_os_libs2
-@@ -601,6 +601,7 @@
-   [HAVE_LIBCURSES=FALSE],,
-   [LIBCURSES])
- AC_SUBST([HAVE_LIBCURSES])
-+NETSNMP_SEARCH_LIBS([cbreak], [tinfo],[LIBCURSES="$LIBCURSES -ltinfo"],,,)
- AC_SUBST([LIBCURSES])
- 
- #   libm for ceil
diff --git a/net-ftp/Manifest.gz b/net-ftp/Manifest.gz
index a61d3ed34133..c902ca44da64 100644
--- a/net-ftp/Manifest.gz
+++ b/net-ftp/Manifest.gz
diff --git a/net-ftp/lftp/Manifest b/net-ftp/lftp/Manifest
index d0a158e57e84..d33f092c1411 100644
--- a/net-ftp/lftp/Manifest
+++ b/net-ftp/lftp/Manifest
@@ -10,7 +10,8 @@ AUX lftp-4.8.2-libdir-zlib.patch 714 BLAKE2B a770bc7a3f974ece766883e644403691de8
 AUX lftp-4.9.1-libdir-readline.patch 404 BLAKE2B 88746dbfd082202950e54270519fa25c8a2042d3479342443394918722a8f0b7b2cde1580c7ac07c0c3408f86c12a83fa1973391ef25a9b3f348b7ad1afa68ac SHA512 e6ab456b237613f31c3e7e450a5127b5fac74a9d24d4bd5ca95f9b28d6c810ad0253d71d710e1daf15c43d0b2d5d2ecdb2b1fb7bbdaa4c3bc0b610d6cc6caf3b
 AUX lftp-4.9.2-ac-270.patch 1298 BLAKE2B 3431c649aa1f772a94640c1d1508b584eff0892098400eea5390c754ece5f23a877aa2eccb814bf1ece93e329980a29190aa784f4cc2b41efccc58c2921409d8 SHA512 efabe7cd6b3467b9212d47669842bf3b1b981ad6c8615bdfda4122d1a217e10fc0fda167903172502a13c63341ddab8e5bba91e5f39721c6fd304e29e6647a08
 AUX lftp-4.9.2-configure-clang16.patch 617 BLAKE2B c8e2f3476011b6fa154de4021644bfed1c9fb420940c26cdc57a4ac9939c84bf5c123745cb8d5749a776a29a0afee65dd11c4faa97c3d2ef53f5545b86bf4d54 SHA512 078c309e20a49e28a65ec5d6c732ea0a57c0cdbc8b9e54f4fc5ddc917bc3fe439c1e4592243b57117f0d32ba7ae17067124e8a17e57513326a4fda7abdf5b6ac
+AUX lftp-4.9.2-libressl.patch 1964 BLAKE2B 045b1436b970530741b4109b8408151b5d0714310667b8a4eec9817e14e96395e47141112b22acf0a5e28dac0eb157029e2bef8a5cd677eba8b1d8471e02d814 SHA512 081dc57c78645bb528d745406789e9edf7d6b54f16c4df825b69829df2e0d8f383d11f8fe15530c406f15debb0cad17e5fa0b1415529068228c380503c974d55
 DIST lftp-4.9.2.tar.xz 1654960 BLAKE2B 04f168576ae6e001e0ffffb2e93e36d5bffa5ed1e2e671edb6210a54aa0ecedc280885450dcee890d05b64464eb641e7e63c8d4dd170100317dec3fe734ec483 SHA512 cda8698e7e34d748715a6fe5dc06c758240302621c7957402f0cc67577acf1a96b436fda4282408dee8171dc84a31e0be432df99a30f0a10057a8e7ea9ec64ad
-EBUILD lftp-4.9.2-r1.ebuild 2708 BLAKE2B b0613d9932f8010911d0877f8a6b74423324191b8747f5e381dccacb2b917bef31fc2606ecc5c28339c2b4768f25f6df3129b73019ac304c4994191543979f99 SHA512 279248619815058833a5d7f538267cb8a637edc91a6696c708c15141636ae6be3dfd0f5673faddfecb41c942401125f88595459a2cbd92bfe5b549d657e12205
+EBUILD lftp-4.9.2-r1.ebuild 2758 BLAKE2B 5cb484a6d8fd7fa9e85d297d589df8559856873e9a3c843a80ef6ac11720696befce046832ea950705b7275baec79b7442aeb22284dad434a519337ee9a76737 SHA512 e00c1f6507809d4c52b09b81d6edc20184633b35e39866b246275f692b072b0ea62f43794071f11e562bbf98bff3808193cafbf43d1285525e6a988c81ba4332
 EBUILD lftp-9999.ebuild 2445 BLAKE2B 3a39352024188a959e6d2d6cadab400acdb7f0e2977e58d4e97be6e52cc9d9dc7733baace2fe77b754f317b59ecddd58dda6da2d03c4ab0923861f1091c6d857 SHA512 0bb8e954d106b9e14899bd1375cc0e22fa2511f83e361903a0b21969e3b3f2158368ff61efed4306fb7dd43f23cc63675e4914ff5fa2734ebcd18693d6b5b96c
 MISC metadata.xml 556 BLAKE2B d7469c2b0a5fd85a1a102b587d9cb992bee74a41df956bb91c6b944d6ab5f3bdbf003c8e2a4e89f8326e1c0290dde88efdc2689d212e284b7394383f2e4ded99 SHA512 84c61561f72df1c9daaa60b493877be495e35f306d65aeff607c356484492cecd40e1e4a1f6a5143e3cf5b2fed665489a50af8f5ed5afe38c614674692de0ca8
diff --git a/net-ftp/lftp/files/lftp-4.9.2-libressl.patch b/net-ftp/lftp/files/lftp-4.9.2-libressl.patch
new file mode 100644
index 000000000000..a0b52df4a9e5
--- /dev/null
+++ b/net-ftp/lftp/files/lftp-4.9.2-libressl.patch
@@ -0,0 +1,38 @@
+https://bugs.gentoo.org/903001
+https://github.com/lavv17/lftp/pull/663
+https://github.com/lavv17/lftp/commit/3ffa0132987bdde986c82c924bc51b13b37f8b54
+
+From 3ffa0132987bdde986c82c924bc51b13b37f8b54 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+Date: Wed, 6 Apr 2022 22:56:21 +0200
+Subject: [PATCH] src/lftp_ssl.c: fix build with libressl >= 2.7.0
+
+X509_OBJECT_get0_X509_CRL is provided by libressl since version 2.7.0
+and
+https://github.com/libressl-portable/openbsd/commit/9866ae34c0af718973475296bd9ef036d3aaa94e
+resulting in the following build failure:
+
+/nvmedata/autobuild/instance-21/output-1/host/opt/ext-toolchain/bin/../lib/gcc/microblaze-buildroot-linux-musl/11.2.0/../../../../microblaze-buildroot-linux-musl/bin/ld: /nvmedata/autobuild/instance-21/output-1/host/microblaze-buildroot-linux-musl/sysroot/usr/lib/libcrypto.a(x509_lu.c.o): in function `X509_OBJECT_get0_X509_CRL':
+(.text+0xc3c): multiple definition of `X509_OBJECT_get0_X509_CRL'; /nvmedata/autobuild/instance-21/output-1/build/lftp-4.9.2/src/.libs/liblftp-network.a(liblftp_network_la-lftp_ssl.o):(.text+0x894): first defined here
+
+Fixes:
+ - http://autobuild.buildroot.org/results/7fd1dfd5bc750ae5a3278ca950c838ae90704b23
+
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+---
+ src/lftp_ssl.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/lftp_ssl.cc b/src/lftp_ssl.cc
+index 26e91e4b..a814543d 100644
+--- a/src/lftp_ssl.cc
++++ b/src/lftp_ssl.cc
+@@ -664,7 +664,7 @@ int gnutls_x509_crt_list_import(gnutls_x509_crt_t *certs, unsigned int* cert_max
+ #elif USE_OPENSSL
+ //static int lftp_ssl_passwd_callback(char *buf,int size,int rwflag,void *userdata);
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined (LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000L)
+ // for compatibility with older versions
+ X509_OBJECT *X509_OBJECT_new()
+ {
diff --git a/net-ftp/lftp/lftp-4.9.2-r1.ebuild b/net-ftp/lftp/lftp-4.9.2-r1.ebuild
index 9047ab306f17..f7b4b9adf626 100644
--- a/net-ftp/lftp/lftp-4.9.2-r1.ebuild
+++ b/net-ftp/lftp/lftp-4.9.2-r1.ebuild
@@ -58,6 +58,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-4.9.1-libdir-readline.patch
 	"${FILESDIR}"/${PN}-4.9.2-ac-270.patch
 	"${FILESDIR}"/${PN}-4.9.2-configure-clang16.patch
+	"${FILESDIR}"/${PN}-4.9.2-libressl.patch #903001
 )
 
 src_prepare() {
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 1466e4fee79d..607e94a2daba 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/libnetconf2/Manifest b/net-libs/libnetconf2/Manifest
index 72ee3e6d4dad..d9e0afc2d25f 100644
--- a/net-libs/libnetconf2/Manifest
+++ b/net-libs/libnetconf2/Manifest
@@ -2,6 +2,6 @@ DIST libnetconf2-2.1.11.tar.gz 302413 BLAKE2B c5a1316b61c1d36a57d65bb556f9f3c72d
 DIST libnetconf2-2.1.31.tar.gz 323423 BLAKE2B 8a6a3e4e7eaf94ce2afba688555956159fb48ad83e802f187acc222dc3e3c62ab718758dfaa39abc81417895098c75cb0ee490ac64412634e88cef7389556ecb SHA512 f174aee332aa775308d8fbd7aff450af9531c94dfe76279a87acd3554f07957c468a1ef2d2c2c6a63748f87920790616426839cb9c3e0c50ec2c88c98273d8aa
 DIST libnetconf2-2.1.7.tar.gz 302011 BLAKE2B b83faebb8d04d9ecaa0bc3aa1fed1bc3b94388d1a6dbc8d3e8c2ff2bb73dc57a460eaf9cc7bf2d07a8e09ef612826417990d8c70bab9c58f9cb71b53766b035b SHA512 fd46a3c31a062324e6c9f2d66006ba8cd852ccb389bf8749d1d0d085b880409e1e373d1d1f2d79c1d88f5eaa72d56195889c07863d0eab1607da89484e21b86f
 EBUILD libnetconf2-2.1.11.ebuild 899 BLAKE2B 71e421249cde80f2e0e7894380b79657d17e392e65375c6b0e405c001ebedd91caf06ede41b7ba2a651ee1222042b5d560b0d05b843f1e6fb2ead8fc48bb78b6 SHA512 0dffcd5a2134c7955b90b3d6f1447fa9502d33d3b20615ab15210b2dc286e53eecb36a4e553990df02095b1030cf686e04027ff4bf1e8ee4be175b88389e295f
-EBUILD libnetconf2-2.1.31.ebuild 900 BLAKE2B 32fd5a419ab10c7ae5d1f9fe4e420349eadda0d96f0eb5bb2ecbeb9e42446433102c40f5a1be01fc50a4dd5edff7cb623db5b48e9a74733e4f6594928df17e0a SHA512 05666c48fb53de3c48cf30b5342cd0a92d20f518d86ff7b5c688286f2ac7bbd91127bfb5c3284a979cb12a4d577702ef25e5bbe39f949fc6018b5cfa7922bec9
+EBUILD libnetconf2-2.1.31.ebuild 899 BLAKE2B cffde936ee509d861968eead570b5fc975231cdc2ca891fc5eef8cf66dabfe7b09ae468fe90c3061c2e333416fdd771e19ca7b2632d9487c30a72bc8679bbdbe SHA512 2d8e85433d0bdf7c5d32699301d26eb877da87e9de6b25e4c0b31dab16e0ffd66c0a6ddfd549835c17ec08c6eaa9026a49add12e150a9fb1cf42e3a6cc554392
 EBUILD libnetconf2-2.1.7.ebuild 899 BLAKE2B cf01499bf3d24a41dc06bda655a31ec2a31b1c0197006284eac60778e4fd380100ef0688d6cfa050ca0cbac85429b7a4f52e36259350e168ef85a83fe92202d2 SHA512 13952d8764b3ed0b316ca5e7f5b0358eddd829132d33f4a0bf6cfed804e29551345afe280b24f902e26702105126fc7e0c441176f14d2681fce937abb5fb9b48
 MISC metadata.xml 331 BLAKE2B cdf31d4cc5f23689277be613336e351a92be7cc1ac1aeafb1e52fa88985f1fcb9d6b71de3ee149b0b0269f9660ec357d83d7ae4b18355a1121bf3d38b957f7e9 SHA512 33da7a046f20febb4e756f73dad37dd66ba07b7da865f07ee72b08026be7f81a026960ec7d4abe558a33ffd162806456454da89733944d974cc7132555176b16
diff --git a/net-libs/libnetconf2/libnetconf2-2.1.31.ebuild b/net-libs/libnetconf2/libnetconf2-2.1.31.ebuild
index c4fd71dd523d..9d6b457d97b9 100644
--- a/net-libs/libnetconf2/libnetconf2-2.1.31.ebuild
+++ b/net-libs/libnetconf2/libnetconf2-2.1.31.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/CESNET/libnetconf2/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-libs/libyang/Manifest b/net-libs/libyang/Manifest
index 6b8e126972d4..a7998bc5b98c 100644
--- a/net-libs/libyang/Manifest
+++ b/net-libs/libyang/Manifest
@@ -1,5 +1,5 @@
 DIST libyang-2.0.194.tar.gz 1150705 BLAKE2B aa323b39752ac426f35e1ef17ca4a61d726c48916b740511ed03b06b8132747207dd4620842f9730ff1d05f216086310bc1634f393163067c119f5eec0aa91b1 SHA512 33d043ff696fc59c1cf5265a463b85a17459086162a03c56b1894cc524b7325ded2e14a71fce55ee70d02ea1119eef523190708c5f7b22438ab8ffd014fccefb
 DIST libyang-2.1.55.tar.gz 1201664 BLAKE2B b23d886163b1082c8895d1450113f364288eb6f77c4c73f7da1576877c35312b5558dbaf90e43268e18dd9348b024547c8cc4ee3a7ddabfb3762ffe67c47dc17 SHA512 dd0b58aec7e2d84f62636c62c9e7f67f0b4819e8d5ce9236874a3531607aa6fb58ccdcf537534eae8bfa700c37b8e3524be659929f4e7e03f8f67968bc352cb4
 EBUILD libyang-2.0.194-r1.ebuild 803 BLAKE2B de09c48bf684fb9f7af8c46a84e7ac896e4dc91d386f69051209026ea02d745b9c8a44202eccce6f44f16d5dec7b9831ac73d067cc615a8ec0ac90cbb4623205 SHA512 ccbfa21e011b26c04b12f80765a2b6bc561c04d89c9f7987086a0aaad0ca242c2eabcbcf5a1aab889db1fb281e93b4ae34be610e58284ef48c6674e1ffd20f8b
-EBUILD libyang-2.1.55.ebuild 805 BLAKE2B cd15f8c1d942beca2d24cd95e2d7408185cf18db7837ffe3c57cd75ec5c063fcf2fba852d539acb2b66b643e85ca2e48e9f5c8773e7b92e20a724234ad2cff37 SHA512 5a7ba4b3979c81f9a17fd96e392e673d2fea5e43b0b78b4ff94943a36fdb5174369fa7657a131afdd64daec4d4abbdcc3a2d16c3804910d3a45c8c9f77502b72
+EBUILD libyang-2.1.55.ebuild 804 BLAKE2B 07b3e55536898b232b880033d71e764db6fa2f33b4c40fa8fa853c35a7ab25e6f12171e70523f6b0e47b63c57a53129e4768e93b15e7759098364f6d6e1941d7 SHA512 88f6e74fe4c7c279ffdb427fd5c4d6d39e351787b589baf5c306476ea22f6bb85f3fb4b07f23df1bf1901ee3905439b35644a2b6d27763fe47cabe28b9200f4e
 MISC metadata.xml 327 BLAKE2B ea8b33be859f8dd94b8aeff9bec39e90b9b0c2984c7df56de4ff7b0c39006723b721119b6fde6fe120f9d423559e8450ecbee3dbe1a65705f9c3e55c34eba1e3 SHA512 14c3ef2d8d242a8bcf7786419afe8b723455603bf187dad10f619b67c9c30bc0e0ab681974b294a4c73f0a32ca68366a1b7b2a730f6d3362af348765c0da1e31
diff --git a/net-libs/libyang/libyang-2.1.55.ebuild b/net-libs/libyang/libyang-2.1.55.ebuild
index 76927273f0fa..e49292e8b77c 100644
--- a/net-libs/libyang/libyang-2.1.55.ebuild
+++ b/net-libs/libyang/libyang-2.1.55.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/CESNET/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index 16102a6e79bb..db2946bfc0f1 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -9,9 +9,11 @@ DIST node-v14.21.3.tar.xz 34508116 BLAKE2B 6fa001be10499ff2dfc920690dda9df25423f
 DIST node-v16.20.0.tar.xz 35546884 BLAKE2B 5bdb1fb7365e07f13d0a58a8d052d11efaadcf1b0792af0517b78b1ecf01e50eabe26e31588ae410ee63b7494a4eb9d23f70d4dd157a452d0bbf8bd548865255 SHA512 b155acdff0244307afcc334844f113b5c321f7764ebb69326d60a6a79d0e0d38d55257a38b815f5933aa4071e6a788e01c466476ef012cec648c84d74adda406
 DIST node-v18.16.0.tar.xz 40467860 BLAKE2B b16749c0212f3aa196ec9fc0f999a023adeb9031b3332939330ba5a3edb5bc2ed6dc21bf861509696e19ed0cc5d5c54bb882018f0e54eb1ad8e9b0ba3bb64bff SHA512 608ce5db97ce2d851f381c7991f635c5e0927ae79037649b482c7e197479341b7c6560644e25f4d65ece8aa80c5763a0e044349a5be210fa33fbbf97a96462bd
 DIST node-v20.0.0.tar.xz 41279796 BLAKE2B 1df8785ca22dea15c6c1f19ec2d3b3d704f9cda6cf13d6e8e8fbbf853515871f18a11a4bbe5ed765434f6f5606975c5254e1826f2e506165ff937ef16d326262 SHA512 cda981227398c1a9023a2212c0d5351eadfedd19d58776dcc470e3ba0213a178b626c37d48fa52548ddd5a70d26a18b66c266856321a0af9ada2b1eac7ee9fd8
+DIST node-v20.1.0.tar.xz 41501496 BLAKE2B 03731915e734f0fd5cfb94fd05f4bd88ca015c5d5a91666d091499daa1a1b3193a3b4667ccec99ce1442ef6b402838705c42e785275dd327bf72adaae9487f50 SHA512 06b88a3ab3f1c089f0d38fb504083bed9a2d27b1b07633dbd40b02bcb3c0a22f6d04ab70abc394fdfb14ac978e974d97656bffeb27e0e47b0c95e672b925067c
 EBUILD nodejs-14.21.3.ebuild 7089 BLAKE2B 5a039629b268d5b88ecb324d1a39415c9ebd810264aaae3c699a8a28333d2330fa904d7ba6295f53db6beb8941f7568415d5af576c7c289a2837f7f53596a4c2 SHA512 c51e35fd2936f3397e14dfab0aea7ac0db20734f4358d2cf804bfaa3173683ed58e47feb71f1c647467e1f69a1be5cf88893899263af0192c9613038c3ae55e1
 EBUILD nodejs-16.20.0.ebuild 6528 BLAKE2B b82dcfd7a92a82a581fafb9e02e3690523aaf939032727d5f96b0e1f16c450e1eda2d5f9397c4d7a8d2c0d7cf4a31333f3bbd0a4831a5e631b7e89b85290605d SHA512 a2352ef380bb83582e8852e7245e599971fab5e3cd13a66c1e9f43018d43e31a128b6e6ac1a2b7db3aa03c6c27a65caa5c80b62605602c308c9dd1b572c6d6d1
 EBUILD nodejs-18.16.0.ebuild 7339 BLAKE2B 3e302299fd5da5dac7adca2ec0ee315cf9eb19dfd1c1385b54e00ce15fefdd345f6240d933abb14852ac7dd5f2c319137db368b44f9419685b8ee9c49f0f1619 SHA512 405eda8e1e52d0ed09f415eba79da91b46b66e6de882267dc8cbf8eb4a65fd94d5e838a9fd47fe9a14a5c74db078b94c46bc698bd924f507f020f6a7536594ba
 EBUILD nodejs-20.0.0.ebuild 7275 BLAKE2B cf845e10bda6b1b0e51cee80d31bd88b96b4288acd04ec29e0b8c4ddbad0627ae6bd4dc2146eff3be6c7c0f6f016c9b7240fb4ad992bb069281ad31564ff2d8a SHA512 9726f7a3c93f9a9db42e0478d9fb30532b236296f2818b55aa449e15abf7f0276922deee46da95f7e86fd489d2de7ab7de23e5a17c5acb06781b775ef8bf9592
+EBUILD nodejs-20.1.0.ebuild 7266 BLAKE2B 67f8cc61e1bd863a12cd8f54e2342390d17a6a538dd55268483968cc4c80ac02af892c6816162026dd42d626817a3318615b038229fa6ef286ac1c79ccb87967 SHA512 f374449c601f3df6b6821c3b64a42e305b982fd95bdee4abb13bf9597c58a058822b170c505f3df763cb4df3e7200959f08c3deb548acaeaefb105680a7a67c4
 EBUILD nodejs-99999999.ebuild 7215 BLAKE2B 979eb0315c6acd1c93842d09752ac793d5386197c67991158f52918620ac0b7ac3e98a3e8cd087918a43bdd94251f5851bcc8cb7757dda08193e912748c9bd34 SHA512 9f804d7707910731176e2f04850af52092158a9d732cc5e82df278d5323536ca86bc401dd3527886f08c19821ddc2c76e446ccb05b7352b07460b8003529d08e
 MISC metadata.xml 898 BLAKE2B a67e85ea95c272b8d18746254894b058433267a74b5bad66bac7d78c7db4cec297e06bc87fad3ee836fc91749aaee2c11c88b48b6ba033c36fa79132552faa81 SHA512 d498b288058e7282c5e9a28d4ba192a2ac5ef796eb1edf644aea41cab2d0eb6036426b188dd9af7eeb2eaf04b84011460cb3c3695ca8dde5667add21d9963c97
diff --git a/net-libs/nodejs/nodejs-20.1.0.ebuild b/net-libs/nodejs/nodejs-20.1.0.ebuild
new file mode 100644
index 000000000000..a0749b8aad06
--- /dev/null
+++ b/net-libs/nodejs/nodejs-20.1.0.ebuild
@@ -0,0 +1,252 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CONFIG_CHECK="~ADVISE_SYSCALLS"
+PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit bash-completion-r1 check-reqs flag-o-matic linux-info ninja-utils pax-utils python-any-r1 toolchain-funcs xdg-utils
+
+DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
+HOMEPAGE="https://nodejs.org/"
+LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/nodejs/node"
+	SLOT="0"
+else
+	SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
+	SLOT="0/$(ver_cut 1)"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos"
+	S="${WORKDIR}/node-v${PV}"
+fi
+
+IUSE="cpu_flags_x86_sse2 debug doc +icu inspector lto +npm pax-kernel +snapshot +ssl +system-icu +system-ssl test"
+REQUIRED_USE="inspector? ( icu ssl )
+	npm? ( ssl )
+	system-icu? ( icu )
+	system-ssl? ( ssl )"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND=">=app-arch/brotli-1.0.9:=
+	>=dev-libs/libuv-1.44.0:=
+	>=net-dns/c-ares-1.17.2:=
+	>=net-libs/nghttp2-1.41.0:=
+	sys-libs/zlib
+	system-icu? ( >=dev-libs/icu-67:= )
+	system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
+	sys-devel/gcc:*"
+BDEPEND="${PYTHON_DEPS}
+${NINJA_DEPEND}
+	sys-apps/coreutils
+	virtual/pkgconfig
+	test? ( net-misc/curl )
+	pax-kernel? ( sys-apps/elfix )"
+DEPEND="${RDEPEND}"
+
+# These are measured on a loong machine with -ggdb on, and only checked
+# if debugging flags are present in CFLAGS.
+#
+# The final link consumed a little more than 7GiB alone, so 8GiB is the lower
+# limit for memory usage. Disk usage was 19.1GiB for the build directory and
+# 1.2GiB for the installed image, so we leave some room for architectures with
+# fatter binaries and set the disk requirement to 22GiB.
+CHECKREQS_MEMORY="8G"
+CHECKREQS_DISK_BUILD="22G"
+
+pkg_pretend() {
+	(use x86 && ! use cpu_flags_x86_sse2) && \
+		die "Your CPU doesn't support the required SSE2 instruction."
+
+	if [[ ${MERGE_TYPE} != "binary" ]]; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space and memory to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+	fi
+}
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	tc-export AR CC CXX PKG_CONFIG
+	export V=1
+	export BUILDTYPE=Release
+
+	# fix compilation on Darwin
+	# https://code.google.com/p/gyp/issues/detail?id=260
+	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
+
+	# less verbose install output (stating the same as portage, basically)
+	sed -i -e "/print/d" tools/install.py || die
+
+	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
+	local LIBDIR=$(get_libdir)
+	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
+	sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die
+
+	# Avoid writing a depfile, not useful
+	sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
+
+	sed -i -e "/'-O3'/d" common.gypi node.gypi || die
+
+	# debug builds. change install path, remove optimisations and override buildtype
+	if use debug; then
+		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
+		BUILDTYPE=Debug
+	fi
+
+	# We need to disable mprotect on two files when it builds Bug 694100.
+	use pax-kernel && PATCHES+=( "${FILESDIR}"/${PN}-18.16.0-paxmarking.patch )
+
+	default
+}
+
+src_configure() {
+	xdg_environment_reset
+
+	# LTO compiler flags are handled by configure.py itself
+	filter-flags '-flto*'
+	# nodejs unconditionally links to libatomic #869992
+	# specifically it requires __atomic_is_lock_free which
+	# is not yet implemented by sys-libs/compiler-rt (see
+	# https://reviews.llvm.org/D85044?id=287068), therefore
+	# we depend on gcc and force using libgcc as the support lib
+	tc-is-clang && append-ldflags "--rtlib=libgcc --unwindlib=libgcc"
+
+	local myconf=(
+	--ninja
+		--shared-brotli
+		--shared-cares
+		--shared-libuv
+		--shared-nghttp2
+		--shared-zlib
+	)
+	use debug && myconf+=( --debug )
+	use lto && myconf+=( --enable-lto )
+	if use system-icu; then
+		myconf+=( --with-intl=system-icu )
+	elif use icu; then
+		myconf+=( --with-intl=full-icu )
+	else
+		myconf+=( --with-intl=none )
+	fi
+	use inspector || myconf+=( --without-inspector )
+	use npm || myconf+=( --without-npm )
+	use snapshot || myconf+=( --without-node-snapshot )
+	if use ssl; then
+		use system-ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store )
+	else
+		myconf+=( --without-ssl )
+	fi
+
+	local myarch=""
+	case "${ARCH}:${ABI}" in
+		*:amd64) myarch="x64";;
+		*:arm) myarch="arm";;
+		*:arm64) myarch="arm64";;
+		loong:lp64*) myarch="loong64";;
+		riscv:lp64*) myarch="riscv64";;
+		*:ppc64) myarch="ppc64";;
+		*:x32) myarch="x32";;
+		*:x86) myarch="ia32";;
+		*) myarch="${ABI}";;
+	esac
+
+	GYP_DEFINES="linux_use_gold_flags=0
+		linux_use_bundled_binutils=0
+		linux_use_bundled_gold=0" \
+	"${EPYTHON}" configure.py \
+		--prefix="${EPREFIX}"/usr \
+		--dest-cpu=${myarch} \
+		"${myconf[@]}" || die
+}
+
+src_compile() {
+	eninja -C out/${BUILDTYPE}
+}
+
+src_install() {
+	local LIBDIR="${ED}/usr/$(get_libdir)"
+	default
+
+	pax-mark -m "${ED}"/usr/bin/node
+
+	# set up a symlink structure that node-gyp expects..
+	dodir /usr/include/node/deps/{v8,uv}
+	dosym . /usr/include/node/src
+	for var in deps/{uv,v8}/include; do
+		dosym ../.. /usr/include/node/${var}
+	done
+
+	if use doc; then
+		docinto html
+		dodoc -r "${S}"/doc/*
+	fi
+
+	if use npm; then
+		keepdir /etc/npm
+		echo "NPM_CONFIG_GLOBALCONFIG=${EPREFIX}/etc/npm/npmrc" > "${T}"/50npm
+		doenvd "${T}"/50npm
+
+		# Install bash completion for `npm`
+		local tmp_npm_completion_file="$(TMPDIR="${T}" mktemp -t npm.XXXXXXXXXX)"
+		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
+		newbashcomp "${tmp_npm_completion_file}" npm
+
+		# Move man pages
+		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
+
+		# Clean up
+		rm -f "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile}
+		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man}
+
+		local find_exp="-or -name"
+		local find_name=()
+		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
+			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
+			"*.md" "*.markdown" "*.bat" "*.cmd"; do
+			find_name+=( ${find_exp} "${match}" )
+		done
+
+		# Remove various development and/or inappropriate files and
+		# useless docs of dependend packages.
+		find "${LIBDIR}"/node_modules \
+			\( -type d -name examples \) -or \( -type f \( \
+				-iname "LICEN?E*" \
+				"${find_name[@]}" \
+			\) \) -exec rm -rf "{}" \;
+	fi
+
+	mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die
+}
+
+src_test() {
+	local drop_tests=(
+		test/parallel/test-dns-setserver-when-querying.js
+		test/parallel/test-fs-mkdir.js
+		test/parallel/test-fs-utimes-y2K38.js
+		test/parallel/test-release-npm.js
+		test/parallel/test-socket-write-after-fin-error.js
+		test/parallel/test-strace-openat-openssl.js
+		test/sequential/test-util-debug.js
+	)
+	rm "${drop_tests[@]}" || die "disabling tests failed"
+
+	out/${BUILDTYPE}/cctest || die
+	"${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} --flaky-tests=dontcare -J message parallel sequential || die
+}
+
+pkg_postinst() {
+	if use npm; then
+		ewarn "remember to run: source /etc/profile if you plan to use nodejs"
+		ewarn "	in your current shell"
+	fi
+}
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 06b67883ed58..285b2fa95b69 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/netopeer2/Manifest b/net-misc/netopeer2/Manifest
index e92f07b3c95d..d9f9dbc904fb 100644
--- a/net-misc/netopeer2/Manifest
+++ b/net-misc/netopeer2/Manifest
@@ -3,5 +3,5 @@ DIST netopeer2-2.1.23.tar.gz 375193 BLAKE2B 14407c1d4b6a382fd0f9cf1c5d2d5f5d0aea
 DIST netopeer2-2.1.59.tar.gz 390371 BLAKE2B 777ff3a5db93bbeabb0f19dfb9a23b67f1945a834cfff716b3144fe24c62f848f048e35fac8ae6d10a7040bdbb29e1ff8ff3559f68a46ccf23fe958152adc3da SHA512 4eb889cb018f22308578712edcaf2f2e20dc4fddf45dded66f644c5288e3ef16cdcf00e61f3d03a2b8e97c4f31441d46651fea12bc3af229aae9b720de59789f
 EBUILD netopeer2-2.1.16.ebuild 977 BLAKE2B eb43aec29553758503be90b21b00ea2492f88ae588947fe2e8c79495687b10f5d2a511ad001022fa0b1eb43655f7b56f7d311a8c060dce182d7ab130477c7059 SHA512 5823d2d5c2e3a2d93e62bd5481e9193d7eb417cb673306328a1736a4aade595a511dde32f2d20c9e3f4189b538cdc617a94151ec4f2a18dd1c09ce7fc0fc7c83
 EBUILD netopeer2-2.1.23.ebuild 978 BLAKE2B 8705bc45bfac2149cbf885480493a157435416e5b16a636ed4158058c9dbfb52af6654d6d247bec2d956c2c9d6b8f8ee143b6227ecaf6f74d0f8f05d01fbbc1a SHA512 f8a1f8c1e50979ddf8fd9e6a092857dde693f8c34e6c4234153db0c7cbc522d8229983d618559b6138490e7427878c797771fc674cdff48bffc437374879fac4
-EBUILD netopeer2-2.1.59-r1.ebuild 997 BLAKE2B feaa3888c49f15f407285bdad1d1d3c6d1265e4ac6cab06352520d1ae46fe7fef60123ec70e3c79c958a6349ed4eff294edf5ff71abb109a3cb6ec224966b69b SHA512 bc3b365e09bbe6a71ddad8b3216666773ba91a81f29023d5dc6ff6ee6ddf26005357332f0b588cf58b3a0a78a2dc75d5066294f4ebcf7380e484ab476f8ad8a0
+EBUILD netopeer2-2.1.59-r1.ebuild 996 BLAKE2B b1aed94cdf8e0f9533afb74d008c042f4c5be8ee16ef0160af7266827a9266bac81d8dda7da40f901775468b33986acbfe4936649738559bf1307451dfb8d03d SHA512 98d54a73f38a699605421ee5233c98964ca9f6d3ae89c321f0c944fdfd1ca3e51d56a127082eb023cb26bfb3c8ab46cf7d9a5f04c20fd596041f17efad560f54
 MISC metadata.xml 329 BLAKE2B 65eb219ac645e711725eef7985454f1d818421b3c152fbc28d1ec9efe1154233b16749cd4f2aeb87c41fe305979c62605409da6f2df68d589ec2d6e4bd657c5a SHA512 a3fc10fa1cc2754842547ecfd1b80ed16e32e7b406a1fb4fb1f8959423e85cdd9e5145b48649d19c95abac1702440abb6ac4a1b7f7715e15ff2264e8796da4dd
diff --git a/net-misc/netopeer2/netopeer2-2.1.59-r1.ebuild b/net-misc/netopeer2/netopeer2-2.1.59-r1.ebuild
index 242e6140a31b..7ccaa1384f4a 100644
--- a/net-misc/netopeer2/netopeer2-2.1.59-r1.ebuild
+++ b/net-misc/netopeer2/netopeer2-2.1.59-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/CESNET/netopeer2/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="
 	app-misc/c_rehash
diff --git a/net-misc/sysrepo/Manifest b/net-misc/sysrepo/Manifest
index 9591aa48f2af..6ef1c9157257 100644
--- a/net-misc/sysrepo/Manifest
+++ b/net-misc/sysrepo/Manifest
@@ -1,5 +1,5 @@
 DIST sysrepo-2.1.64.tar.gz 722294 BLAKE2B 55f71bd2bfa987775d324763d989f57ef79c74d45c261e2f880740201ca5585107459f849d915e3bf4084c9f5ff538a7867787ce53145ad1a64e418384e3558c SHA512 363d6a0dd057326125aa11c51bb1e80a2a521708a95b95eecf2b416a2ebd938b5ac6b8ae49311376bfbae5599679e23f62503da946920bffb48379c665183b40
 DIST sysrepo-2.2.60.tar.gz 782781 BLAKE2B afaef4e0a3d21a636f84d76ee0de55b1365e0e66cb9335ca748752747af99eb58c368eafd7c087a1df050ff4d1c2800601d125915f2debaad8ccc77278d30b84 SHA512 720299b57a0615ba99e01e7d42bc85d5ba5482d82680c47961f6876400009850e8fdf5c0753c39600ef0947a318394eb6108772ac1a575584f26bdc6e2305a57
 EBUILD sysrepo-2.1.64.ebuild 776 BLAKE2B 3e6dd00c074d731486e9018b8f18330fecbf0e9ad53bd1c188b8e244addbdd048269b0599c5b7e4b6be05a3aaef55c134e7b531036b0cce1314228bbab19fe71 SHA512 ecc9a8ebde90c90e3548c71bb75450862917c2266cbe8ce536e436604f0d155ed01ff5e7ac2ce8568503bcaff4d6e182624e484c02e7f8c1d92cd80d07201cc1
-EBUILD sysrepo-2.2.60.ebuild 776 BLAKE2B 7ba6f051c14fbb69e0bc1942a0d276c2839d7560a416e332ed2fadbc268621f170f312371b24adda40bbd3f4fd2104cfcc54e327eca52380b24422a7d084d722 SHA512 43d869a5ac452c4c0d648af5dc811c25ec53e409fc0849552db8ca269d529ca09c024171b02b85f7ea58abaea828ad5f977dde9d2e47a854679ff02a31306387
+EBUILD sysrepo-2.2.60.ebuild 775 BLAKE2B 83fd47db7c9ce2d286bf77066721d725982f0ca9e3bde36114b7213c14318761e2c1851e41c6e3aaec213337468dcbf9b87790723b0a350666423b3dcea847fd SHA512 5be81f943714a32df01f70ffdb8f814a83157e56582aa9148feb7314bb84fc6cfd6529dbfae21d61c60628e734eb9bd08e68f0a87f25fe0c02484a54131f8e2f
 MISC metadata.xml 328 BLAKE2B e91ac8ab81f342a9cdbf7b924f37c12f2adade3b0dee1972a3b2f2035997d6e8f5de414a052f2e154f6cecba1ab310103db2fd60e16d085875200bf08fcea522 SHA512 acdb3728e90337d98aea6f5174aba7a81d84259226ec6dda4607524184137b75431e621ebe29b99d371f6b3ff54aed15732a1d89229bf8cb100b52b4e0ae1a99
diff --git a/net-misc/sysrepo/sysrepo-2.2.60.ebuild b/net-misc/sysrepo/sysrepo-2.2.60.ebuild
index 7bec12ea56df..e88add6bc61d 100644
--- a/net-misc/sysrepo/sysrepo-2.2.60.ebuild
+++ b/net-misc/sysrepo/sysrepo-2.2.60.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sysrepo/sysrepo/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/sec-keys/Manifest.gz b/sec-keys/Manifest.gz
index 3184ab58d369..19cf325bac15 100644
--- a/sec-keys/Manifest.gz
+++ b/sec-keys/Manifest.gz
diff --git a/sec-keys/openpgp-keys-jiatan/Manifest b/sec-keys/openpgp-keys-jiatan/Manifest
new file mode 100644
index 000000000000..2195f0266a40
--- /dev/null
+++ b/sec-keys/openpgp-keys-jiatan/Manifest
@@ -0,0 +1,3 @@
+DIST jia_tan_pubkey.txt 3143 BLAKE2B 1e0cc16ffabc11e341c733c09b7bc9571e3d2209f2387f27905adc153eff763d8ab9929cee5bfda86d30f05d1fd1e5ae3d2087679f17fc8f8288b094572cc596 SHA512 556bda914f966fe7b72105b475b59231254256f860ec28f5606ffb3df34884621f365c95eb881c74a2ff5434a8e45efa3e6bbc8cb9d8147dccc608566ddefeb7
+EBUILD openpgp-keys-jiatan-20230505.ebuild 539 BLAKE2B ec88d8af9d6c3c92f4028be1ab72a75b4ab1f978a31682e340bb5d1b1249f80d8c33807f3e1b3fc68c568aadd454985ccb9d64761a45a577bbf7410fedc8de24 SHA512 65912156e95f0b46638e57602ca39e4f12a84095c1a6240f3eb39890e4b01929cce1067ff72312d1aab21abb5c0b76aeb009493f20fb6daaf616db94b92afbb0
+MISC metadata.xml 282 BLAKE2B 85c3312405ada57a85e03b06a59523c8d4069551f91e6b70f182d5af92ffc26b946c2987554001649eb41d605864a5cb3c172ebbb02f3c1a11ca1ed805889550 SHA512 5eac09aed8093684086d644c321b236d5da019a650ad322d33236b543bd5641edfc43cbdeee4654e093f9f6393eae034110ca51eb560b87a178fba74244d7fdb
diff --git a/sec-keys/openpgp-keys-jiatan/metadata.xml b/sec-keys/openpgp-keys-jiatan/metadata.xml
new file mode 100644
index 000000000000..de9d78424186
--- /dev/null
+++ b/sec-keys/openpgp-keys-jiatan/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
+	<stabilize-allarches/>
+</pkgmetadata>
diff --git a/sec-keys/openpgp-keys-jiatan/openpgp-keys-jiatan-20230505.ebuild b/sec-keys/openpgp-keys-jiatan/openpgp-keys-jiatan-20230505.ebuild
new file mode 100644
index 000000000000..4c7ed6e765b2
--- /dev/null
+++ b/sec-keys/openpgp-keys-jiatan/openpgp-keys-jiatan-20230505.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="OpenPGP keys used by Jia Tan"
+HOMEPAGE="https://tukaani.org/xz/"
+SRC_URI="https://tukaani.org/misc/jia_tan_pubkey.txt"
+S="${WORKDIR}"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+src_install() {
+	local files=( ${A} )
+
+	insinto /usr/share/openpgp-keys
+	newins - jiatan.asc < <(cat "${files[@]/#/${DISTDIR}/}" || die)
+}
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 31bb1ee797cd..c85ceb39fd76 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/coreutils/Manifest b/sys-apps/coreutils/Manifest
index a67a2f3b9fee..e0c6e15ad0ba 100644
--- a/sys-apps/coreutils/Manifest
+++ b/sys-apps/coreutils/Manifest
@@ -3,6 +3,7 @@ AUX coreutils-8.32-sandbox-env-test.patch 1958 BLAKE2B 570f62115f0853abb35290174
 AUX coreutils-9.1-fix-rename-simple-backups.patch 1343 BLAKE2B b284b2b7d33fe7650a4ac8723ca5566e819cd4f4740394cc549562a03fe7ed95d29cfb688a9e5513edcea1f9d5f7b72f1a530f9bf5093ad4dc6534a494e9f91c SHA512 900128c08b096c39302193855fdbb980c54597acf3349b9014ced500e344b7f47438722342e3a7d68f8c4588632769a11165c5c06796993d3b9aca019de8468a
 AUX coreutils-9.2-cksum-result-reporting.patch 2601 BLAKE2B 934e21d41fa93074aca8395bcb860c8bce6ac6de18120bcac728d67c0731242aa8163c411468caf7e64f71c731095e3e8070e5889d2fd93945a53ef50e31b831 SHA512 f1cb22d77d4b4c50f85e94153418cc6b774eeefc8955df725a4370844c8ceeb17ae0b3844269455ae36d23328a2faae1c5c762891384ea6f7eae46e89c291218
 AUX coreutils-9.2-cp-reflink-auto-fallback.patch 5690 BLAKE2B d0fe6e930a83675c7490c46edf16236d1c58edf734ec292df9148f13923e7467ae84dc3eb8c61789b4c4365dae537a32071b9db14e118f1171fe34b59c089d93 SHA512 d30aee98d9fe60e28534ffd388cb6a6911ffa751f2b03cd5d2339ccdd41cf512099afd9e67137da1690d489948faf1ed265ae1f6875379b558a25e9eee5a214f
+AUX coreutils-9.3-cp-parents-preserve-permissions.patch 3436 BLAKE2B de9fa1038b34ec2134c39758840e5a619ed5b3e60ebd9ad280e3e1a117f76143ccec852f74ac8da3f29604e8bdc92dcc134a19da756b759fb15d5bc632dda74c SHA512 e19afd35150c188a4ad14844463181f391ab6fbc9b4b812677df693f6181045f3dc63c42f2755e19f03bc2a608d041f3e0943537bc9d783b03819ce9928a962b
 DIST coreutils-8.30-patches-01.tar.xz 5788 BLAKE2B a41511ce39ac570cb14b7f12d125eebef92217469a9490808719fa0665f5e5c0adb96fbd02c4bac4d280d1502295669575790a81dbc01afe2ca3a9d384cbefb0 SHA512 b1e1933637de4581d5f8c6ede4e80a012435d13f0cf5550a76ab5bbe9441e3c15ce19ef3f78a7ea3b8368d5e9a3bb17c1207c471d26171b59786f38adeba0454
 DIST coreutils-8.32.tar.xz 5547836 BLAKE2B 0ad99c176c19ec214fcfd0845523e5362f0151827707c759bd46c0fe8d2501c6ad1c29c5b71266f6525857bc0d56c472db0d7fe29953b6c65e2e6c76bdf3c515 SHA512 1c8f3584efd61b4b02e7ac5db8e103b63cfb2063432caaf1e64cb2dcc56d8c657d1133bbf10bd41468d6a1f31142e6caa81d16ae68fa3e6e84075c253613a145
 DIST coreutils-9.0_p20220409-patches-01.tar.xz 6244 BLAKE2B 8ca9855680719660782931467ec70095c826e66b9850890b8cf456963f8114f63940707386b97c766172d01e55e17b7db2aa1c329208a873a76e2293b29f565f SHA512 4b43c25832122d241f33e6b4eff24bc1fa045b9ca5af45a49d22ecb1fa282986c4e4a045ef24c34b3d94fd9a2247247c42c344261e3f464d881969e6f3351d3f
@@ -13,8 +14,9 @@ DIST coreutils-9.2.tar.xz.sig 833 BLAKE2B 225f6ea9d6c2a2b0e47093b6c10d648b8d847d
 DIST coreutils-9.3.tar.xz 5808696 BLAKE2B 11502cd2dbeef150d0d4cece2546bf6b835941b94456c258f6058338f0477f22e68e88934d075b08fe51ee4d1c0c50cb23d8084ac06a457d6e8975f01643b1cd SHA512 242271f212a6860bdc6c8d7e5c4f85ce66c1b48ef781aca9daa56e0fe7c2b7809ef72b4392120219fe5b687637c83ce89ceef8bb35f6274f43f8f968a6901694
 DIST coreutils-9.3.tar.xz.sig 833 BLAKE2B c45ae10ff706907ae65d31228e432f7d6f34acbdb733bf521437d9e2fc75828a59da9d432d894a1ed8b7341f7e15d0e8d4e816e209c799b75c14d0ec055bfdf2 SHA512 522a2072f8ef940228ccdd856a4041c3c16b98e309168ccf2066fe7c1013685ba6cdea8a7317dfa1f4507b37ca016ecedaf54438d4a5007927b0e1a8fd223eb5
 EBUILD coreutils-8.32-r1.ebuild 5968 BLAKE2B ae5871d55509dbcd48c3f8b33938edfffca3a48bc2b422546b1bd818e7830b877af08f51605ba0d68299ea63d1f6d8246301223cfa5a29620619cd209cbaa1f5 SHA512 363adf232d9b3d158ec7535e84263286961e3e870ecdee3215162e398125999ccf2d1b76d065a7223d58d04ccd75fd65ab33cf409e155fb2788ca0defdc5094a
-EBUILD coreutils-9.1-r2.ebuild 7114 BLAKE2B 3a80919e840546badf681b0672fcad68e2ac0d9a29586e7a8fd712a11484057364ae015c21b92bfef404f6a9c094d828852d915754bae61ace060c0c6853290e SHA512 77c948b54e48907df14a9ac67b5ed1a36cb11acf709fdf009674b90e878c1efc6b4c449d7f4efcc39110f04692c8c274acc3fa32e242f196b0d8bddb27b963a7
-EBUILD coreutils-9.2-r2.ebuild 7602 BLAKE2B fab330146b115909182404d078e5929ba954eef08177bc0280f2440d892db89327806ac6a41c376928454a02423f718af22024134b852482017f066a4ea3e318 SHA512 23bdc7fd9c60a404cab98cda770b0889a6b749b829b74e83e8c7de32e454290a0d9cccf235cfd36f7a76fff03283185402f854c90db9ce1a98147f4fc71776a1
-EBUILD coreutils-9.3.ebuild 7478 BLAKE2B 49acdcbf00c12c0cb0fb26b76c4b78dd164deeb40c5accd7c120124c020513b85ccd7dd3c1290f0d4b5c22afeae4af86798acdb1d8867aed2c2436b753eaf974 SHA512 af9619b2f3ff02404eb1fe26814183b92ee75742b7bff3f4c9c27053b2b8bb9a88e568e32007bb6649336a1bbca2638541e9cb1243bc50ebb82f118923e6c463
-EBUILD coreutils-9999.ebuild 7479 BLAKE2B bc1fe0715e31676f62ebbfc8863ded02f72f361e15025f2216777265491b19e8baf29588b89b96e43f8ba4c1669f23f95085333124ee35eabafa32b359333d58 SHA512 25b3a52a7529dacaa5db5babb17d77dd92dcaaea8d9d6831e403a0bcf1157d7935521e1994530c71035cc98fd9439c6a12000c564d0305f055eff8112513ec50
+EBUILD coreutils-9.1-r2.ebuild 7114 BLAKE2B 6f52424f7e9f065d56dacc6fbbee0ac279289b2604a0b964267c5cfa05dbe881b14811ad6a3194bbd072701f1213df2f59320c0999a2d32c21722d521f297f4a SHA512 172d981fb9297862b6b2a8b69f549973fd04ea5e25a7375255ccf40b619054f599b6fe971161e687a5d868449b40f421511e83c7551b24262b200a1c2f790236
+EBUILD coreutils-9.2-r2.ebuild 7602 BLAKE2B 858fd03a8ff42630b11bdd4a3c26d195d40ec93073fed28ee309475731c2ff054e54f3580ca17a536b88751293e26cd95cb82130431b963cd2d0abf5e6167faf SHA512 2934bf8602114f68e10f5f72c24b4e0cb07e95ab1d24f738b208754d3d58df21f0d72b1d01ba29897827bf9f961bd6536e1f3190a5a79d91839909e955812a53
+EBUILD coreutils-9.3-r1.ebuild 7608 BLAKE2B 19b7f1d073dacb96aaeaff25cc8db449d63e42bfdcbecefd287cd9cbf8334fc222f61bd68ca43d5c49774d1384048e20719abc9821689a9a5e5b86f0b5e74b3c SHA512 c6e3253cc53fc55d35ce2ccb6cfd4d54dd0850f28491e84c4efc95a0a97bece54c8b90e66811058c5efe4e348bb5818d566a86bd313698409de90f4fca97add2
+EBUILD coreutils-9.3.ebuild 7478 BLAKE2B 8e857aeeb4a557ade9a6a85eb88814a414ba9f1a5c99efafd859c87cf644d21eac3592c033b505564ac54c0b827184faa295a2a7632fa2270a9c6225b790ce1f SHA512 7ec70783e2c978f6591ac16d1b137677e2927b961053a3e3e66a40dc5f9e576d9fbfae27f07f79110d3a2c4d93017ce92e3b32358e94cf5fe0509258ca2e4112
+EBUILD coreutils-9999.ebuild 7550 BLAKE2B a169a42a5e795e8cfb568d05c9744a46e687627bcc905178f5d0f5ee977f4a5c661a6cfe6f46c7dbaa04ab941f49de950af4546d22daf8ccd66e83a0df667c88 SHA512 cfb15372aa67eff7c67fee803b9d53500205e9d2e093cc9495e09fc48b453894ff183536d984b3ffc0fef25244f5285ebbf598ebeb3c74fe8bf35de0a99c0a7e
 MISC metadata.xml 1043 BLAKE2B db071746d60a62e435bfd6e297641411320b61a5716dc631150e5a3a19bcd49cc6121d2a404b8875d6927ad0114f28d33e2b21edb3bab49559d50fdc26b056f6 SHA512 65149d4bf9b16f7e1800fe8d9e23fa466307ff3f009e06f3736b4f55bce27ba74bc6d1547e0b2f06dcebfcba0f2d21ef3efdd4073ed4e525a2ebdc6e62190119
diff --git a/sys-apps/coreutils/coreutils-9.1-r2.ebuild b/sys-apps/coreutils/coreutils-9.1-r2.ebuild
index 08dc284676e9..4cdfdc3f3bed 100644
--- a/sys-apps/coreutils/coreutils-9.1-r2.ebuild
+++ b/sys-apps/coreutils/coreutils-9.1-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 # Try to keep an eye on Fedora's packaging: https://src.fedoraproject.org/rpms/coreutils
-# The upstream coreutils maintianers also maintain the package in Fedora and may
+# The upstream coreutils maintainers also maintain the package in Fedora and may
 # backport fixes which we want to pick up.
 
 PYTHON_COMPAT=( python3_{9..11} )
diff --git a/sys-apps/coreutils/coreutils-9.2-r2.ebuild b/sys-apps/coreutils/coreutils-9.2-r2.ebuild
index 44a34c3cc7b3..1ca5c4dd88c7 100644
--- a/sys-apps/coreutils/coreutils-9.2-r2.ebuild
+++ b/sys-apps/coreutils/coreutils-9.2-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 # Try to keep an eye on Fedora's packaging: https://src.fedoraproject.org/rpms/coreutils
-# The upstream coreutils maintianers also maintain the package in Fedora and may
+# The upstream coreutils maintainers also maintain the package in Fedora and may
 # backport fixes which we want to pick up.
 
 PYTHON_COMPAT=( python3_{9..11} )
diff --git a/sys-apps/coreutils/coreutils-9.3-r1.ebuild b/sys-apps/coreutils/coreutils-9.3-r1.ebuild
new file mode 100644
index 000000000000..aa87f2f22ff2
--- /dev/null
+++ b/sys-apps/coreutils/coreutils-9.3-r1.ebuild
@@ -0,0 +1,269 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Try to keep an eye on Fedora's packaging: https://src.fedoraproject.org/rpms/coreutils
+# The upstream coreutils maintainers also maintain the package in Fedora and may
+# backport fixes which we want to pick up.
+#
+# Also recommend subscribing to the coreutils and bug-coreutils MLs.
+
+PYTHON_COMPAT=( python3_{9..11} )
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/coreutils.asc
+inherit flag-o-matic python-any-r1 toolchain-funcs verify-sig
+
+MY_PATCH="${PN}-9.0_p20220409-patches-01"
+DESCRIPTION="Standard GNU utilities (chmod, cp, dd, ls, sort, tr, head, wc, who,...)"
+HOMEPAGE="https://www.gnu.org/software/coreutils/"
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/coreutils.git"
+	inherit git-r3
+elif [[ ${PV} == *_p* ]] ; then
+	# Note: could put this in devspace, but if it's gone, we don't want
+	# it in tree anyway. It's just for testing.
+	MY_SNAPSHOT="$(ver_cut 1-2).18-ffd62"
+	SRC_URI="https://www.pixelbeat.org/cu/coreutils-${MY_SNAPSHOT}.tar.xz -> ${P}.tar.xz"
+	SRC_URI+=" verify-sig? ( https://www.pixelbeat.org/cu/coreutils-${MY_SNAPSHOT}.tar.xz.sig -> ${P}.tar.xz.sig )"
+	S="${WORKDIR}"/${PN}-${MY_SNAPSHOT}
+else
+	SRC_URI="
+		mirror://gnu/${PN}/${P}.tar.xz
+		verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )
+	"
+
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
+fi
+
+SRC_URI+=" !vanilla? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${MY_PATCH}.tar.xz )"
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="acl caps gmp hostname kill multicall nls +openssl selinux +split-usr static test vanilla xattr"
+RESTRICT="!test? ( test )"
+
+LIB_DEPEND="
+	acl? ( sys-apps/acl[static-libs] )
+	caps? ( sys-libs/libcap )
+	gmp? ( dev-libs/gmp:=[static-libs] )
+	openssl? ( dev-libs/openssl:=[static-libs] )
+	xattr? ( sys-apps/attr[static-libs] )
+"
+RDEPEND="
+	!static? ( ${LIB_DEPEND//\[static-libs]} )
+	selinux? ( sys-libs/libselinux )
+	nls? ( virtual/libintl )
+"
+DEPEND="
+	${RDEPEND}
+	static? ( ${LIB_DEPEND} )
+"
+BDEPEND="
+	app-arch/xz-utils
+	dev-lang/perl
+	test? (
+		dev-lang/perl
+		dev-perl/Expect
+		dev-util/strace
+		${PYTHON_DEPS}
+	)
+	verify-sig? ( sec-keys/openpgp-keys-coreutils )
+"
+RDEPEND+="
+	hostname? ( !sys-apps/net-tools[hostname] )
+	kill? (
+		!sys-apps/util-linux[kill]
+		!sys-process/procps[kill]
+	)
+	!app-misc/realpath
+	!<sys-apps/util-linux-2.13
+	!<sys-apps/sandbox-2.10-r4
+	!sys-apps/stat
+	!net-mail/base64
+	!sys-apps/mktemp
+	!<app-forensics/tct-1.18-r1
+	!<net-fs/netatalk-2.0.3-r4"
+
+pkg_setup() {
+	if use test ; then
+		python-any-r1_pkg_setup
+	fi
+}
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+
+		cd "${S}" || die
+		./bootstrap || die
+
+		sed -i -e "s:submodule-checks ?= no-submodule-changes public-submodule-commit:submodule-checks ?= no-submodule-changes:" gnulib/top/maint.mk || die
+	elif use verify-sig ; then
+		# Needed for downloaded patch (which is unsigned, which is fine)
+		verify-sig_verify_detached "${DISTDIR}"/${P}.tar.xz{,.sig}
+	fi
+
+	default
+}
+
+src_prepare() {
+	local PATCHES=(
+		# Upstream patches
+		"${FILESDIR}"/${P}-cp-parents-preserve-permissions.patch
+	)
+
+	if ! use vanilla && [[ -d "${WORKDIR}"/patch ]] ; then
+		PATCHES+=( "${WORKDIR}"/patch )
+	fi
+
+	default
+
+	# Since we've patched many .c files, the make process will try to
+	# re-build the manpages by running `./bin --help`.  When doing a
+	# cross-compile, we can't do that since 'bin' isn't a native bin.
+	#
+	# Also, it's not like we changed the usage on any of these things,
+	# so let's just update the timestamps and skip the help2man step.
+	set -- man/*.x
+	touch ${@/%x/1} || die
+
+	# Avoid perl dep for compiled in dircolors default (bug #348642)
+	if ! has_version dev-lang/perl ; then
+		touch src/dircolors.h || die
+		touch ${@/%x/1} || die
+	fi
+}
+
+src_configure() {
+	local myconf=(
+		--with-packager="Gentoo"
+		--with-packager-version="${PVR} (p${PATCH_VER:-0})"
+		--with-packager-bug-reports="https://bugs.gentoo.org/"
+		# kill/uptime - procps
+		# groups/su   - shadow
+		# hostname    - net-tools
+		--enable-install-program="arch,$(usev hostname),$(usev kill)"
+		--enable-no-install-program="groups,$(usev !hostname),$(usev !kill),su,uptime"
+		$(usex caps '' --disable-libcap)
+		$(use_enable nls)
+		$(use_enable acl)
+		$(use_enable multicall single-binary)
+		$(use_enable xattr)
+		$(use_with gmp libgmp)
+		$(use_with openssl)
+	)
+
+	if use gmp ; then
+		myconf+=( --with-libgmp-prefix="${ESYSROOT}"/usr )
+	fi
+
+	if tc-is-cross-compiler && [[ ${CHOST} == *linux* ]] ; then
+		# bug #311569
+		export fu_cv_sys_stat_statfs2_bsize=yes
+		# bug #416629
+		export gl_cv_func_realpath_works=yes
+	fi
+
+	# bug #409919
+	export gl_cv_func_mknod_works=yes
+
+	if use static ; then
+		append-ldflags -static
+		# bug #321821
+		sed -i '/elf_sys=yes/s:yes:no:' configure || die
+	fi
+
+	if ! use selinux ; then
+		# bug #301782
+		export ac_cv_{header_selinux_{context,flash,selinux}_h,search_setfilecon}=no
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_test() {
+	# Known to fail with FEATURES=usersandbox (bug #439574):
+	#   -  tests/du/long-from-unreadable.sh} (bug #413621)
+	#   -  tests/rm/deep-2.sh (bug #413621)
+	#   -  tests/dd/no-allocate.sh (bug #629660)
+	if has usersandbox ${FEATURES} ; then
+		ewarn "You are emerging ${P} with 'usersandbox' enabled." \
+			"Expect some test failures or emerge with 'FEATURES=-usersandbox'!"
+	fi
+
+	# Non-root tests will fail if the full path isn't
+	# accessible to non-root users
+	chmod -R go-w "${WORKDIR}" || die
+	chmod a+rx "${WORKDIR}" || die
+
+	# coreutils tests like to do `mount` and such with temp dirs,
+	# so make sure:
+	# - /etc/mtab is writable (bug #265725)
+	# - /dev/loop* can be mounted (bug #269758)
+	mkdir -p "${T}"/mount-wrappers || die
+	mkwrap() {
+		local w ww
+		for w in "${@}" ; do
+			ww="${T}/mount-wrappers/${w}"
+			cat <<-EOF > "${ww}"
+				#!${EPREFIX}/bin/sh
+				exec env SANDBOX_WRITE="\${SANDBOX_WRITE}:/etc/mtab:/dev/loop" $(type -P ${w}) "\$@"
+			EOF
+			chmod a+rx "${ww}" || die
+		done
+	}
+	mkwrap mount umount
+
+	addwrite /dev/full
+	#export RUN_EXPENSIVE_TESTS="yes"
+	#export FETISH_GROUPS="portage wheel"
+	env PATH="${T}/mount-wrappers:${PATH}" gl_public_submodule_commit= \
+		emake -k check VERBOSE=yes
+}
+
+src_install() {
+	default
+
+	insinto /etc
+	newins src/dircolors.hin DIR_COLORS
+
+	if use split-usr ; then
+		cd "${ED}"/usr/bin || die
+		dodir /bin
+
+		# Move critical binaries into /bin (required by FHS)
+		local fhs="cat chgrp chmod chown cp date dd df echo false ln ls
+		           mkdir mknod mv pwd rm rmdir stty sync true uname"
+		mv ${fhs} ../../bin/ || die "Could not move FHS bins!"
+
+		if use hostname ; then
+			mv hostname ../../bin/ || die
+		fi
+
+		if use kill ; then
+			mv kill ../../bin/ || die
+		fi
+
+		# Move critical binaries into /bin (common scripts)
+		# (Why are these required for booting?)
+		local com="basename chroot cut dir dirname du env expr head mkfifo
+		           mktemp readlink seq sleep sort tail touch tr tty vdir wc yes"
+		mv ${com} ../../bin/ || die "Could not move common bins!"
+
+		# Create a symlink for uname in /usr/bin/ since autotools require it.
+		# (Other than uname, we need to figure out why we are
+		# creating symlinks for these in /usr/bin instead of leaving
+		# the files there in the first place...)
+		local x
+		for x in ${com} uname ; do
+			dosym ../../bin/${x} /usr/bin/${x}
+		done
+	fi
+}
+
+pkg_postinst() {
+	ewarn "Make sure you run 'hash -r' in your active shells."
+	ewarn "You should also re-source your shell settings for LS_COLORS"
+	ewarn "  changes, such as: source /etc/profile"
+}
diff --git a/sys-apps/coreutils/coreutils-9.3.ebuild b/sys-apps/coreutils/coreutils-9.3.ebuild
index b12ae88e4781..3f6b8940caed 100644
--- a/sys-apps/coreutils/coreutils-9.3.ebuild
+++ b/sys-apps/coreutils/coreutils-9.3.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 # Try to keep an eye on Fedora's packaging: https://src.fedoraproject.org/rpms/coreutils
-# The upstream coreutils maintianers also maintain the package in Fedora and may
+# The upstream coreutils maintainers also maintain the package in Fedora and may
 # backport fixes which we want to pick up.
 
 PYTHON_COMPAT=( python3_{9..11} )
diff --git a/sys-apps/coreutils/coreutils-9999.ebuild b/sys-apps/coreutils/coreutils-9999.ebuild
index d19fa5ca04cb..6e3d435cba1d 100644
--- a/sys-apps/coreutils/coreutils-9999.ebuild
+++ b/sys-apps/coreutils/coreutils-9999.ebuild
@@ -4,8 +4,10 @@
 EAPI=8
 
 # Try to keep an eye on Fedora's packaging: https://src.fedoraproject.org/rpms/coreutils
-# The upstream coreutils maintianers also maintain the package in Fedora and may
+# The upstream coreutils maintainers also maintain the package in Fedora and may
 # backport fixes which we want to pick up.
+#
+# Also recommend subscribing to the coreutils and bug-coreutils MLs.
 
 PYTHON_COMPAT=( python3_{9..11} )
 VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/coreutils.asc
diff --git a/sys-apps/coreutils/files/coreutils-9.3-cp-parents-preserve-permissions.patch b/sys-apps/coreutils/files/coreutils-9.3-cp-parents-preserve-permissions.patch
new file mode 100644
index 000000000000..c8f2a9bb4956
--- /dev/null
+++ b/sys-apps/coreutils/files/coreutils-9.3-cp-parents-preserve-permissions.patch
@@ -0,0 +1,86 @@
+https://git.savannah.gnu.org/cgit/coreutils.git/commit/?id=c6b1fe43474b48a6bf5793e11cc1d0d6e895fdf4
+
+From c6b1fe43474b48a6bf5793e11cc1d0d6e895fdf4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P@draigBrady.com>
+Date: Wed, 3 May 2023 17:01:37 +0100
+Subject: cp: -p --parents: fix failure to preserve permissions for absolute
+ paths
+
+* src/cp.c (re_protect): Ensure copy_acl() is passed an absolute path.
+* tests/cp/cp-parents.sh: Add a test case.
+* NEWS: Mention the bug.
+Fixes https://bugs.gnu.org/63245
+--- a/src/cp.c
++++ b/src/cp.c
+@@ -296,15 +296,19 @@ regular file.\n\
+    when done.  */
+ 
+ static bool
+-re_protect (char const *const_dst_name, int dst_dirfd, char const *dst_relname,
++re_protect (char const *const_dst_name, int dst_dirfd, char const *dst_fullname,
+             struct dir_attr *attr_list, const struct cp_options *x)
+ {
+   struct dir_attr *p;
+   char *dst_name;		/* A copy of CONST_DST_NAME we can change. */
+-  char *src_name;		/* The source name in 'dst_name'. */
++  char *src_name;		/* The relative source name in 'dst_name'. */
++  char *full_src_name;		/* The full source name in 'dst_name'. */
+ 
+   ASSIGN_STRDUPA (dst_name, const_dst_name);
+-  src_name = dst_name + (dst_relname - const_dst_name);
++  full_src_name = dst_name + (dst_fullname - const_dst_name);
++  src_name = full_src_name;
++  while (*src_name == '/')
++    src_name++;
+ 
+   for (p = attr_list; p; p = p->next)
+     {
+@@ -347,7 +351,7 @@ re_protect (char const *const_dst_name, int dst_dirfd, char const *dst_relname,
+ 
+       if (x->preserve_mode)
+         {
+-          if (copy_acl (src_name, -1, dst_name, -1, p->st.st_mode) != 0)
++          if (copy_acl (full_src_name, -1, dst_name, -1, p->st.st_mode) != 0)
+             return false;
+         }
+       else if (p->restore_mode)
+@@ -687,6 +691,7 @@ do_copy (int n_files, char **file, char const *target_directory,
+           bool parent_exists = true;  /* True if dir_name (dst_name) exists. */
+           struct dir_attr *attr_list;
+           char *arg_in_concat = NULL;
++          char *full_arg_in_concat = NULL;
+           char *arg = file[i];
+ 
+           /* Trailing slashes are meaningful (i.e., maybe worth preserving)
+@@ -719,6 +724,7 @@ do_copy (int n_files, char **file, char const *target_directory,
+                   (x->verbose ? "%s -> %s\n" : NULL),
+                   &attr_list, &new_dst, x));
+ 
++              full_arg_in_concat = arg_in_concat;
+               while (*arg_in_concat == '/')
+                 arg_in_concat++;
+             }
+@@ -747,7 +753,7 @@ do_copy (int n_files, char **file, char const *target_directory,
+                           new_dst, x, &copy_into_self, NULL);
+ 
+               if (parents_option)
+-                ok &= re_protect (dst_name, target_dirfd, arg_in_concat,
++                ok &= re_protect (dst_name, target_dirfd, full_arg_in_concat,
+                                   attr_list, x);
+             }
+ 
+--- a/tests/cp/cp-parents.sh
++++ b/tests/cp/cp-parents.sh
+@@ -66,4 +66,10 @@ p=$(ls -ld g/sym/b/c|cut -b-10); case $p in drwxr-xr-x);; *) fail=1;; esac
+ cp --parents --no-preserve=mode np/b/file np_dest/ || fail=1
+ p=$(ls -ld np_dest/np|cut -b-10); case $p in drwxr-xr-x);; *) fail=1;; esac
+ 
++# coreutils 9.1-9.3 inclusive would fail to copy acls for absolute dirs
++mkdir dest || framework_failure_
++if test -f /bin/ls; then
++  cp -t dest --parents -p /bin/ls || fail=1
++fi
++
+ Exit $fail
+-- 
+cgit v1.1
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index f21820f11643..00a8976ce3a0 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 4f34c7827420..b2abd39b20f1 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -7,7 +7,9 @@ DIST gcc-10-20230503.tar.xz 72130916 BLAKE2B f0dd2c3afd7c59061672f2d0a6291a8c4ba
 DIST gcc-10.5.0-musl-patches-2.tar.xz 3452 BLAKE2B 5387e516d07d81477b3f39b8b3bd986bf861d32cd25dc5481c97bd3620d00c918c5661e86857f66dbf28a655401a53e43417f638c443e44cbfdbf5e950caac4d SHA512 86f2ce31cc4fc4fb5a6043fb527bf822d895e1a6220652024f78a1cbd5a962edb6be8dc5f43c32053e075f39bb2350ea8f14e7d57e0473dd2933a7b44676bde5
 DIST gcc-10.5.0-patches-6.tar.xz 18208 BLAKE2B 4cac3340108fb378c76ad62b728429f3c97f348d178744e7536575f3576ca8aa682b878b7df3b1c162dccae64a3cb56c66d8d60eae323e1ece2de4278084fdbd SHA512 9d6c84325fbc118cee01347468ce729c278e5b026b16da945fe54050726e26f86a46ee7b71a01a47cf927b70bfcce459c49a6bc4fb93dcfaa047c76d4c5bc5bc
 DIST gcc-11-20230427.tar.xz 76165128 BLAKE2B dd896b418c1fce35a61005d5b5c90cfd1246d37d23c2a8fc08bacd7d7ca84c353f3ccf5de2370ae5e5ca95c7ae3deab3565b3f65eb78b611dbe5ad4a256516f0 SHA512 fada917a832be5d2e15ee32f24e19fc87b851dc8e6fc75d1be6d25d3510dba408ae3ef3b245ff239c51aa3d243c95f12269695611e5c8965ba55f5aa4730778d
+DIST gcc-11-20230504.tar.xz 76185732 BLAKE2B d8bc17e7a38078e2ffe918ba70ba7ec53aada1c604b6cefc54c577f965d46634de1a94b985cb3fd8417f12217b29a67e1ff2c10c342eca85a3185ad2a4e0373c SHA512 e5c423a6049b11b8f1de776b861bd2eb86d1ce939a14c7bbe6244ee74ace2b3cf079135a846f71706f5996172d0e1e0695420938e18d990140d19bcc28dd10b5
 DIST gcc-11.4.0-musl-patches-2.tar.xz 4308 BLAKE2B a2335e155fc57816fed822a648e0eaefafcba9d04e1ad0fd7baeea5a694ab6f5e3c1678cb406f2a1bd17bab25cb01699d032713a1ccf337948dfda2093844607 SHA512 17b84f907cb1bd763873655e6f35fd3ed55a40b602b70a626f04f83b4cc89c6261db1661de78d4d969187a8c56e9f6305b742515a3836b962248a21df0df5d0c
+DIST gcc-11.4.0-patches-10.tar.xz 13852 BLAKE2B 54937d13e30e2a5303c7e197fae09eeed35ca0b9783625e02578fcee829b5503fb22d664366322b304df7d01ae807d00af7c93db3e3ceebe4851e15647724f87 SHA512 31b4d7a2e7cc589e92e12c3583d13d41c523cafbd309bc0532df9b68ea2473c89daef4c0edd3ce2917b5823d81a7792f145b9449f16277d0d64c22ceff50bbb9
 DIST gcc-11.4.0-patches-9.tar.xz 14704 BLAKE2B 9aa2ecbac493d3040694e9930738e57d59a764b90ab92b91709c319b883f28ad108767e5d11e8b62af40bf1e583d5ff83a03e8c895f904bc6f41315ce9ab4f0a SHA512 ac8b7c6c382ffacc4e9d08299440fc237fa366ec36fb8eb7a8d426b64a4186384a262e6380dc83ed7f7240125ce26a8435c8a4e0e13976ef2652067a7129bd17
 DIST gcc-12-20230428.tar.xz 79744932 BLAKE2B f9d0000cdd2f1b0af79f281851b3b0fe0ac50f14468844e1ee596f8ed1ccf33f55c7617464d88df7e4b3435d58fedecf640592e0661fd1be9ba163acd26dae68 SHA512 992f9cd71f9910efea401048540ba2b43360170f76ce992cf356b1ab383240f481e29c5b0ad32fa4efb2bdbb397477506cb83a825268cfbdd2cde7044d43c758
 DIST gcc-12.3-RC-20230502.tar.xz 83929612 BLAKE2B 30d62ed55631d7d1e954833c17dc14308e46fba1201f1d40a73fa77137ec3f75c743c248dd70fac52e61fd7c92238f21b23680299f89dbb389ace72f2e202604 SHA512 246ca479b7f91041a5c77c1cea61db197e493be86c95e81410892ea4dbd6e666b8c7d3cf10e953ed901945842ef6e336a2195a223e675b9dd3ab965189a14578
@@ -30,6 +32,7 @@ EBUILD gcc-10.4.1_p20230426-r1.ebuild 1445 BLAKE2B a6a759d0f07a343e09ec0f276aada
 EBUILD gcc-10.4.1_p20230503.ebuild 1448 BLAKE2B 73751ab8b6db6be027072afa1584239b49d6ad8c94e5d05a870110252a5500228f804b357eee1f468aad53d1acc58b7263980a0054d996466f143caf7b1bc3b8 SHA512 19fc398deb55058957516be1a534ce4861baae60bbeed4aea4f73a4476721892df5bcbc1b69d8f23c6e6412fbaa39aa4f67044bb9cb332b58901e8a276c73f08
 EBUILD gcc-10.5.9999.ebuild 1108 BLAKE2B 2db612df53fbaec59c707acb56bac804a4ee797d156ea3dfca6396d27268385f1d5177c44bd58a926c981ab1c0c7b7adf5e4ea060a65a9e84e7f8ed1713701b0 SHA512 5193d1f4359ef8963645d25150731ab1929801eae16e94ddef3fb0169ed365d2ac43765a2d4848966508144e121b8b24feccbe66f59ee9363764d5a3db79f946
 EBUILD gcc-11.3.1_p20230427.ebuild 1334 BLAKE2B cb480f1ae20bc31900948f61f48a050ed177d6303a76d555a596636767871bca8ff6446466970fbc43e2fe02f047c22a27416eb3b580812ee481b8ce4d630850 SHA512 fa62bf94450bae1fab07cc2e4030a13e2c58e06518ba44f86710049343ceeb8e535ce108225234e8b7fe50523d62414dcaf1d0148e80607bc1f6a8d0e13941b7
+EBUILD gcc-11.3.1_p20230504.ebuild 1346 BLAKE2B 278dd8483ef6034566c4ae12f9dfde8aac418129742a5c54564ff44655272c463f1cd0c2effb80aeb478b9cb8e01ef3b9e5095a4aa8a58367b5471cb778c29df SHA512 bd6b229f3aceb94ab1b944b89af9db2f4ae76f3c5387cbb333d0b52b11cd39fb0d179efb932089512d9a845197d97d17dca8a77117943a1bbf70056dc0bdcc5b
 EBUILD gcc-11.4.9999.ebuild 1315 BLAKE2B 45a8f481e0c08e5274d1797e421431e898753fce22426a1b2a1f4fd23c4dd44bed5f15da4c67f1c108b25d8393683fef631f998b8b524aa0d356be04625c0562 SHA512 fc4d8913f2aeed856b123a4545655813fe20544d841feca5121f85291a2aec99c770d845b14ce936c2fb14b5b9b1cd85166190ec657528bcb1710c7b48385c16
 EBUILD gcc-12.2.1_p20230428-r1.ebuild 1475 BLAKE2B 69112653719b589bd72fe454b963d050194a8dc3a665fc7317989368cf0ff4281ac2f8519d7fc46311a3f91528d2e0457485357e67ff72765d6cfe743f0b4a2c SHA512 2e771e67e1668bf90695cc42517f46518e445a4af6e7cb9c8532efea047a4174d40f18b256cc99beec2b5fe5abde4f1ea7cb3ad84f4491032036d6b53f941e91
 EBUILD gcc-12.2.1_p20230502.ebuild 1596 BLAKE2B b9e543580375513a19b2dfdc1a320cd1e367584f6d8c27cd082130b7918acba0e85f3d5c1eaf8a56504d864570f5e61f3d175d65ee788677cfc542ddf0cdcec5 SHA512 295a9c2c8744c7fe4261ff5151b746c1fc4b642b0e4d81e4284e2966c4f78a8ee523f26d26b4a4c7740fc58f82c858c2ebff27cfa3a5c37933836838ecb9792c
diff --git a/sys-devel/gcc/gcc-11.3.1_p20230504.ebuild b/sys-devel/gcc/gcc-11.3.1_p20230504.ebuild
new file mode 100644
index 000000000000..9b57b16f07be
--- /dev/null
+++ b/sys-devel/gcc/gcc-11.3.1_p20230504.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+TOOLCHAIN_PATCH_SUFFIX="xz"
+TOOLCHAIN_PATCH_DEV="sam"
+PATCH_VER="10"
+PATCH_GCC_VER="11.4.0"
+MUSL_VER="2"
+MUSL_GCC_VER="11.4.0"
+
+if [[ $(ver_cut 3) == 9999 ]] ; then
+	MY_PV_2=$(ver_cut 2)
+	if [[ ${MY_PV_2} == 0 ]] ; then
+		MY_PV_2=0
+	else
+		MY_PV_2=$(($(ver_cut 2) - 1))
+	fi
+
+	# e.g. 12.2.9999 -> 12.1.1
+	TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.$(($(ver_cut 3) - 9998))
+fi
+
+inherit toolchain
+# Needs to be after inherit (for now?), bug #830908
+EGIT_BRANCH=releases/gcc-$(ver_cut 1)
+
+# Don't keyword live ebuilds
+#if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
+#	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+#fi
+
+if [[ ${CATEGORY} != cross-* ]] ; then
+	# Technically only if USE=hardened *too* right now, but no point in complicating it further.
+	# If GCC is enabling CET by default, we need glibc to be built with support for it.
+	# bug #830454
+	RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )"
+	DEPEND="${RDEPEND}"
+	BDEPEND=">=${CATEGORY}/binutils-2.30[cet(-)?]"
+fi
+
+src_prepare() {
+	local p upstreamed_patches=(
+		# add them here
+	)
+	for p in "${upstreamed_patches[@]}"; do
+		rm -v "${WORKDIR}/patch/${p}" || die
+	done
+
+	toolchain_src_prepare
+
+	eapply_user
+}
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 1d8ed99fbeb3..6cfa25f57167 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/davl/Manifest b/sys-fs/davl/Manifest
index eb5e3ec89f92..6b9fc6dc9af7 100644
--- a/sys-fs/davl/Manifest
+++ b/sys-fs/davl/Manifest
@@ -1,5 +1,5 @@
 AUX davl-1.2.1-asneeded.patch 927 BLAKE2B 77b946fcb6638546d44d2201dd8597efc3cab1edb8272a0e75c4533597100f6104af5946b279c3094a8000002966a10a161113842ae3bdc1091d20c2805737af SHA512 25584fa46ba9f7a6cc0547844eef5d74eee4663c2d3b2742b2357a5ac6c5ddf3eca465213f2f9199a3a3c8930d01b897148b1f5c265f05e2e45315835ac8660d
 AUX davl-1.2.4-fragment.patch 1051 BLAKE2B 283920bd6ff70fde735269962e211b5c40ed356a67536619867b5a7409a8a57c534ea15c8206250950eafed14f4ce59b888794d50ec2c15d01463064e37577e3 SHA512 28ae8da5d2f2a910cbbd5b7f5a97de3fb5a0700d070f9f1e7b4b4462dec6f334ad486b298b3bcc7a8314c56b3215245b55880884bbaaf2e03ca9961b0595c133
 DIST davl-1.2.4.tar.bz2 47539 BLAKE2B bf07c23dd8d81289e91b5eec68f2d8995ae7851aa9cbc9b551f76a2d0fd90144ac7047b8c2ce71a2ef99fec2233bc491a3760b4da0fa01cf5f0211b94c869795 SHA512 71c33c0bfaca7c7557541517ec9e7b084e4d50e7504e02d412442566c6046c8a68fe4020e05a3e2da5c9309bd75ba06abba8f16fad96b476b5c961814d24d602
-EBUILD davl-1.2.4-r2.ebuild 692 BLAKE2B e8e4a81af44c6fe07658ca571a8f18157e06664fb1bf6dbb5f59af3818a7bb15c1c2ef82dee2393ce71b7daebf648fa248afc135136aabfe39eeb2d07e6fd262 SHA512 dd9b108aad2ab7dfbf943c0b589cdc6c85b654992873fbf6b061399a4c5ce048333015c7c776c483d44524b725b56d55d7e9d044c742d0d41ff2748602ed12b8
+EBUILD davl-1.2.4-r2.ebuild 696 BLAKE2B 15cd38f3cb98cea73b5909755d41eac3a3679b690918fa4f85e96a9a98afe8e2007b0c6554c299a3b41056927c72199b8e6f2304859cb6e22fae13bbee45df15 SHA512 fa99eb036b7ed7b3def0931ae09c99605e9ffb7c6061c5efffdace230e6054b2972945232c0ac522a845f4be72b47038352ceaf99e145ecb3d5ba1fe25a49733
 MISC metadata.xml 247 BLAKE2B 083a85d771d59b90c9c7fdd28a15f646e11c6947e8c67247baa09420a8deeb090292f958461a0aa9d7da4dfe61e5fa4e81479f25d4d2fa4a990b9325e5c2e5f4 SHA512 4ed5808085587e84b8091074013aae9599c20dc5d477789039ccb093ff9d128bd9ae6d8f44198a6d361ddd251d1e6f5d6ac27cb6b173685a50735fb70fae3198
diff --git a/sys-fs/davl/davl-1.2.4-r2.ebuild b/sys-fs/davl/davl-1.2.4-r2.ebuild
index d91a538ee69d..6b0ae67ee19d 100644
--- a/sys-fs/davl/davl-1.2.4-r2.ebuild
+++ b/sys-fs/davl/davl-1.2.4-r2.ebuild
@@ -1,22 +1,22 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
+
 inherit toolchain-funcs
 
 DESCRIPTION="Visualizes the fragmentation status of ext2/3 filesystems"
-HOMEPAGE="http://davl.sourceforge.net/"
+HOMEPAGE="https://davl.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~x86"
-IUSE=""
 
 RDEPEND=">=x11-libs/gtk+-2.6:2"
 DEPEND="${RDEPEND}
-	>=sys-fs/e2fsprogs-1.41.7-r1
-	virtual/pkgconfig"
+	>=sys-fs/e2fsprogs-1.41.7-r1"
+BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.2.1-asneeded.patch
diff --git a/sys-fs/ldapfuse/Manifest b/sys-fs/ldapfuse/Manifest
index f35713ceab50..0de2cd871f64 100644
--- a/sys-fs/ldapfuse/Manifest
+++ b/sys-fs/ldapfuse/Manifest
@@ -1,3 +1,3 @@
 DIST ldapfuse-1.0.tar.xz 76024 BLAKE2B fa7bb67637e069e013c5a0d849f196803466cdec82b538ccaa7852e589c8c1ec5e68d73e88c3d3c69237dce89fd62e10d949ddc8b84e3c72d4e0c9b43ec90c66 SHA512 ea9af757d69fe9931ac745039d75a52d3e590c16737a71e6d9a6a8654b5514a1c86e26925f5cbe117c5bedcef8888ce69bec3bec2c02fe4dd233fee7f3118e7f
-EBUILD ldapfuse-1.0-r4.ebuild 523 BLAKE2B fd767709bf1bf7fd6e2f8905db139d64667f0fa5bbc6728de84d2668cf8e5fdd78bdda49e0bcfb43d7693a5f421aa5e3f2bb33ddbe57e82d47d4a42dc7374b06 SHA512 169773705b3fa523340f8156f8dd65b5b73b4dfb64c9c1aef5f22d07aa6b762a6156b7a2131d7dfc6fd36372a1a4954e70ae63c3fefe450a7c9914a61d0903ea
+EBUILD ldapfuse-1.0-r4.ebuild 529 BLAKE2B f150c4cf68d0a8f760e5362bfde1e87d988e6862a1f5567ae6e4cc037be473b75e79cfad04cb0825074f8787f5bcd0523ce4e208c4483a7aaa9f28e42e399fb7 SHA512 03a0215ccd767d570ef9309b1bb9fd2e6bad9a3530ae3957fab1b721ba521781fa6ec8c864efc9f1b962df0e2f19a3f039debe583509d636daee60a780b3dab0
 MISC metadata.xml 246 BLAKE2B 5eb4234a49b184f3aa80113a0ae283de60f9e428a6227cda85db00a78d855900d85d2f05d7fca05a2ed077acb498098d159ff51474bb755e28d6f65646647564 SHA512 2cab401339b3091d2ae15e1a1d2405e105f5f31d5ff23d4041ed8735cd98848eb5d87afe5560d8631ad00be3faf86025a5d482d8c21a4f49469e3dbd3daac023
diff --git a/sys-fs/ldapfuse/ldapfuse-1.0-r4.ebuild b/sys-fs/ldapfuse/ldapfuse-1.0-r4.ebuild
index 0e01a694da64..2e4ec1113932 100644
--- a/sys-fs/ldapfuse/ldapfuse-1.0-r4.ebuild
+++ b/sys-fs/ldapfuse/ldapfuse-1.0-r4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
-DESCRIPTION="A virtual filesystem for FUSE which allows navigation of an LDAP tree"
+DESCRIPTION="Virtual filesystem for FUSE which allows navigation of an LDAP tree"
 HOMEPAGE="https://sourceforge.net/projects/ldapfuse/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 
@@ -15,9 +15,8 @@ RDEPEND="
 	net-nds/openldap:=
 	sys-fs/fuse:0
 	>=sys-libs/libhx-3.12:="
-
-DEPEND="
-	${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	app-arch/xz-utils
 	virtual/pkgconfig"
 
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 11423d37262d..0eefbbdf05b5 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/ttyd/Manifest b/www-apps/ttyd/Manifest
new file mode 100644
index 000000000000..43cc1b577977
--- /dev/null
+++ b/www-apps/ttyd/Manifest
@@ -0,0 +1,7 @@
+AUX ttyd.confd 1715 BLAKE2B 935298b712e2b52d98e7f811cd386497c34643933b86a4920f7744cd5fb6f2aadf3ac3b1ddb4567db526a9d7b079a7660f482609e955fb23f24b686e52cb7c9f SHA512 3eb0c9c71cb18e65c2a42c07581b7593441a4781bd1a94010e891ef1970babac5d78b3966b4e8bab95f6d67c3d1f03e4a75839b933d0dc0bf98e2fd2d52844ad
+AUX ttyd.initd 308 BLAKE2B 9d78f775a0e529d55cddfd92488829d2aa79f2321b5f70c54649a8a6faeffb0ceaa899cf19187c6b51919092348659cb1d930bf144921dab65e1f007c6ef0054 SHA512 a955068ab20f06165c10af89ae7e02c38f24247f7b7a5aa86da38cf4361555c6bb009a76e34d1ff6fb41df2555d91d42bc1494a2324c30a89098fdf312015e35
+AUX ttyd.service 152 BLAKE2B 2f57682dec6a2d7df5d36955abcb71ad37df4878ad89be286777e91a35a1761680a41725b22fdfa2df863bb1fbd7d712e836ede92da0c4ed41a78dd3c38a8196 SHA512 4141f3d12fba354ec1e84f7200f006dc3bc65ccd798b95d991b7b0d45f619605599b9ef635aa532477acf2dc82604df85b959b7f22de1057b20e9b1025fd4a2c
+DIST ttyd-1.7.3.tar.gz 579492 BLAKE2B 14b66dbe83c0ccb601a6e3bf35a804f69f679387c9aca2f55a055dda85b2e3a396ddb4f9a3fb56575d0554837faf1d5c090cf66f4e7571201323659db3feb0b7 SHA512 e0900e2b4620095717d0f32206d08177ce74bc2f24cd9c20793cc2e370a8ee961272b73698b0dda857360703df20378c080293dfdfd287ae863801d338c8b2a4
+EBUILD ttyd-1.7.3.ebuild 871 BLAKE2B f3f20633191809ee5a78162d8673719763eda0bffee47ee492833535e2bce61996a119dc79a3b0165f56c5348d018f55c1a99a64ba6498052cdda46b054de113 SHA512 5a120f7945c5c6ef85f76de5195d6c479adc2628e05af4befcaad0af0e284805fd77cc1e86ec9f6f74ff75ab4eca5dd7bcfefaebcf8b5e27881a2262e2bb00ab
+EBUILD ttyd-9999.ebuild 886 BLAKE2B 0348cfa5c120ff52241d1cd77844c109d2bacbc5291bdfe6ba2769b4080f7db94221643751cc770ac7b00c0a93852456e5a5edb37bb5ea2fc9df79b032f19ca3 SHA512 d1141653a5fcf41a8d9f1c03f24b687d415dadf1bbdc5f07c5b0f540a02e513efcf31fa317b740113fe36107bef04d92ba0370b8ff8f74ec2faa029e68be164f
+MISC metadata.xml 295 BLAKE2B 013599ca9cf89c3ca42d5adeea70d32f852bf090085eba9525ccfd3e1af91df4235eaebc252ac2d4c1474cd27a15a5fc5a735196979acb73d3ca3a9f2ed090d0 SHA512 8b4defd8be6208c50bba2dc4902d1b4c10bfa4bb4ef255e5736ca9f20f9f7a476c53f6f4cdfa47d839791fe7fda79128ce975592ca400b94e250ad2f9663295c
diff --git a/www-apps/ttyd/files/ttyd.confd b/www-apps/ttyd/files/ttyd.confd
new file mode 100644
index 000000000000..57d24e3fb394
--- /dev/null
+++ b/www-apps/ttyd/files/ttyd.confd
@@ -0,0 +1,29 @@
+# conf.d file for ttyd 
+
+# Please check man 1 ttyd for more information about the options
+#
+# Some of the meaningful options are:
+#    -p, --port              Port to listen (default: 7681, use `0` for random port)
+#    -i, --interface         Network interface to bind (eg: eth0), or UNIX domain socket path (eg: /var/run/ttyd.sock)
+#    -c, --credential        Credential for Basic Authentication (format: username:password)
+#    -u, --uid               User id to run with
+#    -g, --gid               Group id to run with
+#    -s, --signal            Signal to send to the command when exit it (default: 1, SIGHUP)
+#    -r, --reconnect         Time to reconnect for the client in seconds (default: 10)
+#    -R, --readonly          Do not allow clients to write to the TTY
+#    -t, --client-option     Send option to client (format: key=value), repeat to add more options
+#    -T, --terminal-type     Terminal type to report, default: xterm-256color
+#    -O, --check-origin      Do not allow websocket connection from different origin
+#    -m, --max-clients       Maximum clients to support (default: 0, no limit)
+#    -o, --once              Accept only one client and exit on disconnection
+#    -B, --browser           Open terminal with the default system browser
+#    -I, --index             Custom index.html path
+#    -6, --ipv6              Enable IPv6 support
+#    -S, --ssl               Enable SSL
+#    -C, --ssl-cert          SSL certificate file path
+#    -K, --ssl-key           SSL key file path
+#    -A, --ssl-ca            SSL CA file path for client certificate verification
+#    -d, --debug             Set log level (default: 7)
+#   login 	  --- Login with system accounts 
+
+TTYD_OPTS="login"
diff --git a/www-apps/ttyd/files/ttyd.initd b/www-apps/ttyd/files/ttyd.initd
new file mode 100644
index 000000000000..9d1afdec19da
--- /dev/null
+++ b/www-apps/ttyd/files/ttyd.initd
@@ -0,0 +1,14 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+name="ttyd daemon"
+pidfile="/var/run/ttyd.pid"
+command="/usr/bin/ttyd"
+command_args="${TTYD_OPTS}"
+command_background="true"
+start_stop_daemon_args="-b"
+
+depend() {
+   use logger
+}
diff --git a/www-apps/ttyd/files/ttyd.service b/www-apps/ttyd/files/ttyd.service
new file mode 100644
index 000000000000..caa95ab1a910
--- /dev/null
+++ b/www-apps/ttyd/files/ttyd.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Terminal over HTTP
+
+[Service]
+User=root
+ExecStart=/usr/bin/ttyd -p 9000 login
+Restart=on-abort
+
+[Install]
+WantedBy=multi-user.target
diff --git a/www-apps/ttyd/metadata.xml b/www-apps/ttyd/metadata.xml
new file mode 100644
index 000000000000..cbc3ff79c423
--- /dev/null
+++ b/www-apps/ttyd/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>mpagano@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">tsl0922/ttyd</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/www-apps/ttyd/ttyd-1.7.3.ebuild b/www-apps/ttyd/ttyd-1.7.3.ebuild
new file mode 100644
index 000000000000..80b189a914d4
--- /dev/null
+++ b/www-apps/ttyd/ttyd-1.7.3.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake systemd
+
+MY_PV="$(ver_rs 3 '-')"
+
+DESCRIPTION="ttyd, a simple command-line tool for sharing terminal over the web"
+HOMEPAGE="https://github.com/tsl0922/ttyd"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/tsl0922/ttyd.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/tsl0922/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+BDEPEND="dev-util/cmake"
+
+DEPEND="
+	dev-libs/json-c:=
+	dev-libs/libuv:=
+	net-libs/libwebsockets:=[libuv,ssl]
+	sys-libs/zlib:=
+	"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+src_install() {
+	dobin ../${P}_build/${PN}
+	doman man/*.1
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+	systemd_dounit "${FILESDIR}"/${PN}.service
+}
diff --git a/www-apps/ttyd/ttyd-9999.ebuild b/www-apps/ttyd/ttyd-9999.ebuild
new file mode 100644
index 000000000000..14c795388490
--- /dev/null
+++ b/www-apps/ttyd/ttyd-9999.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake systemd
+
+MY_PV="$(ver_rs 3 '-')"
+
+DESCRIPTION="ttyd, a simple command-line tool for sharing terminal over the web"
+HOMEPAGE="https://github.com/tsl0922/ttyd"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/tsl0922/ttyd.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/tsl0922/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+BDEPEND="dev-util/cmake"
+
+DEPEND="
+	dev-vcs/git:=
+	dev-libs/json-c:=
+	dev-libs/libuv:=
+	net-libs/libwebsockets:=[libuv,ssl]
+	sys-libs/zlib:=
+	"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+src_install() {
+	dobin ../${P}_build/${PN}
+	doman man/*.1
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+	systemd_dounit "${FILESDIR}"/${PN}.service
+}
diff --git a/x11-apps/Manifest.gz b/x11-apps/Manifest.gz
index 4f0f2d2d545a..c8e6bb94dfd9 100644
--- a/x11-apps/Manifest.gz
+++ b/x11-apps/Manifest.gz
diff --git a/x11-apps/xcalc/Manifest b/x11-apps/xcalc/Manifest
index 44ec685c4c60..66e7b3bbcc63 100644
--- a/x11-apps/xcalc/Manifest
+++ b/x11-apps/xcalc/Manifest
@@ -1,3 +1,5 @@
 DIST xcalc-1.1.1.tar.xz 140204 BLAKE2B b747a658b03ded2a071f0b54047f8dd4a1aecf6093af14059f2311019e6f9d3790f1190159c278fd3f9d5bf5740bbb1bfb0996540a0985728ed2966239bb4902 SHA512 a261e9798d62727f40b9aff07e68e63ba40aa7f4f9b1811d8efd8c3e73cd5912d6178c55ca3c059968191051bd20b889b06b5e92b3df70c7b5d09bd013b9ebdb
+DIST xcalc-1.1.2.tar.xz 140692 BLAKE2B 26dbc9ab9bc9d6441e4422da267686ff05f7725274458a8633688ede6941dd116f7308a58db28a56d5390b6cbf1e16dbd482da6f9d8a7b23744b0c6b10625d6e SHA512 51da677dc88bcd7299ed8d678cb26b048fdb82a1983e1496a06253ee2dceefca4ac87d1a74432b4a76dcc11921a61339bb3d292607be46228164140b430bbad2
 EBUILD xcalc-1.1.1.ebuild 423 BLAKE2B 850d2d18b404bbe64bc6b637fc0449f8ad9db47ba95d763502fb77f68cb1a21eb540e395e08146d8f71e4dc442568f548b5a159fd0e464f3aaf7ed4b595aef22 SHA512 558dbe40c146202bf107dad50f26d86880f4278def727da4b8bf2c14e91df32b1439c73c5d3550061ab5ec4aea91e005def3dbeb57be01509cc3963635253622
+EBUILD xcalc-1.1.2.ebuild 428 BLAKE2B 3428671ee461d83cd2acc216929921a7401bae749d53a68705ba63c50904ac2188e7168b47abd50f8d40382eeabdbdc476c27986a505a4168932e06c00ce7253 SHA512 d42512b01601a177825d0d714ab05d83997a0f8facaf85b8de7f96782469849ddc09c1cca3d6f704547aace19bd12119ee9563011a4243ef39519b8c19de7a09
 MISC metadata.xml 336 BLAKE2B 93d8fdc0c4e87e9d1b0bdd8ace117c9380f54985920fcd3c70ba0dc6031c7375e6376b9fe414efcc7b8a53f1e7b9975e4bb72a30a0c1583d635305b4bc0f0fd2 SHA512 e08ecb5fa61930cb91678476ac70df0471b6677c503045fe2011cca9f5424f0f71b5da701a92a1db7de7d55c4fbeea93c8b926efe6b1a48ac5ae6f6b321cf568
diff --git a/x11-apps/xcalc/xcalc-1.1.2.ebuild b/x11-apps/xcalc/xcalc-1.1.2.ebuild
new file mode 100644
index 000000000000..6fefee2533c7
--- /dev/null
+++ b/x11-apps/xcalc/xcalc-1.1.2.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+XORG_TARBALL_SUFFIX="xz"
+inherit xorg-3
+
+DESCRIPTION="scientific calculator for X"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+
+RDEPEND="x11-libs/libXaw
+	x11-libs/libXt
+	x11-libs/libX11"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
diff --git a/x11-drivers/Manifest.gz b/x11-drivers/Manifest.gz
index d050c5e941c5..741d983e8a1e 100644
--- a/x11-drivers/Manifest.gz
+++ b/x11-drivers/Manifest.gz
diff --git a/x11-drivers/xf86-video-geode/Manifest b/x11-drivers/xf86-video-geode/Manifest
index 4bc349fea813..2a35774c4bc8 100644
--- a/x11-drivers/xf86-video-geode/Manifest
+++ b/x11-drivers/xf86-video-geode/Manifest
@@ -1,4 +1,6 @@
 AUX xf86-video-geode-2.11.20-fix-multiple-definition-of-linker-error.patch 2211 BLAKE2B ad3228a6c1d88f985949cd04940da5b3f45f2c284443c0bb538a44f75f8d479be1d64e8ed19a8953942c2ccb7996a55d6a490c1a1ab0f7f96bade79562dd16a5 SHA512 69d25f08a11c7897c7d870ae7f16977a55b7b678b0b3240d1626fe98638c7f76cfbb3f4d091436d4a984aeb3098e1635131c97be2025345bd18a90b82e3fb934
 DIST xf86-video-geode-2.11.20.tar.bz2 699973 BLAKE2B ed5c96a4ac41bb908239d89a49ef833a56fdeab62e441ddf36e32be1704a0850a2466a5538aafad87c83d3850339b0bdf0610851a17e3f4ace5eefab20c82296 SHA512 a67376ec174c544256aef693590d515742199c2acf1a54117207f599e1d9f70a3fb70c9c811ebc3f907dfa795e0e662a1c1f18673774660f0d5f3c757e848f0d
+DIST xf86-video-geode-2.11.21.tar.xz 582492 BLAKE2B a6a970284033497dbf359b1d9735d143476e96eca68560b68a49477af704ee9c9ef952b8ee144fc545cc88baf95cc4b34b8eb8a76efb3b9282bec1799d986f19 SHA512 e12f74268ab7d16b57644a9465b4be1ca28d250625a31b8810e19a1f94a17e47e0a258455155fd8f336fa59fd78160cdf3763aa94b85c6ccc2c42edf3b65bc61
 EBUILD xf86-video-geode-2.11.20.ebuild 451 BLAKE2B 0674b9fb9d56a57b003e54d23e3e27e341b5ec2dab7456da826c9dcedb1c06e4e9045ba400d5012f38634270991bb189666f03bc7f2a10a5f735c47181f5126d SHA512 28573ca325743a0552c19fc6ab3aa7d7b81a20bc70febf6f518e0b9d9aa0aeb150fa4e86356f7913274785c9334d9facb563f6f41ca5bf4a2206b300b9c68866
+EBUILD xf86-video-geode-2.11.21.ebuild 397 BLAKE2B d3ce3a82070ab657087795b89b1db88d8d824be3b8cd795e227c47a8812be87462d94af03a7fdb49f96696de07c3461d5a8016cae638b4e43f4c083b02f3801c SHA512 b2fa913dfe89beb6115382001b131865ef88eb0a09ba1be545e0eab1458606fc3a2f48f0ed8bb2729c5d93c3a2da0f5d3a7bf5e7fc0896ec9a71e2e128e4a4df
 MISC metadata.xml 511 BLAKE2B 194193137efc8f608a9fd5be7d991b34c46c46f54e9c01fc1e2cb19e607f3784442095724cdd3aaa1914da2c8ceae55ad8e78b8549f32fbd9ff1588b75bedc3e SHA512 a7c3f53f29d7a8f89b79c748d84a6d69bc3f4ea58827d6b708d8dec29e02055792eb096d10bb236c5072e16e4f961a88a998845123486ffee96f0817af2bfb63
diff --git a/x11-drivers/xf86-video-geode/xf86-video-geode-2.11.21.ebuild b/x11-drivers/xf86-video-geode/xf86-video-geode-2.11.21.ebuild
new file mode 100644
index 000000000000..408c7f8a8271
--- /dev/null
+++ b/x11-drivers/xf86-video-geode/xf86-video-geode-2.11.21.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+XORG_TARBALL_SUFFIX="xz"
+inherit xorg-3
+
+DESCRIPTION="AMD Geode GX2 and LX video driver"
+KEYWORDS="~x86"
+IUSE="ztv"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	ztv? (
+		sys-kernel/linux-headers
+	)"
+
+src_configure() {
+	local XORG_CONFIGURE_OPTIONS=(
+		$(use_enable ztv)
+	)
+	xorg-3_src_configure
+}
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 00f3555c8f32..dcd8c07ca6d0 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/peksystray/Manifest b/x11-misc/peksystray/Manifest
index 35010070209e..dedd0cc1022e 100644
--- a/x11-misc/peksystray/Manifest
+++ b/x11-misc/peksystray/Manifest
@@ -1,4 +1,5 @@
 AUX peksystray-0.4.0-asneeded.patch 798 BLAKE2B fa17b9f091ccb94dc11c6086bc1bf648b08b4da3e192fa1998f09375e747cab854f25b72614998ec5289e2992ae1dcbd06dc47ffce5acb299bb4106dab35863e SHA512 d3f4c392d38b2e0f143d7e7dfa7a12ecb82e8d93f6651e254ee17d078487f6d95316f88d66a125ffc25abd2574a053f9a2b0e946bbba7f8a7d5b12903dbc8f21
 DIST peksystray-0.4.0.tar.bz2 73810 BLAKE2B 4ac452f14acff5afb8e14fc07a18d5efe6b68696c7063d8cd337c14b9bc0cdcb573ff830f9cc7e3b7057154a3e2a179da26977696101fbb56750320a3913b3d3 SHA512 9dc5d1df630b7447575011e971a9657a5987bdd6098c81444b7579c46bfd7747f4df18fa00376e70b046c52ae7ca95d6cb66ce8a57070795f2f8d497fa025341
+EBUILD peksystray-0.4.0-r1.ebuild 544 BLAKE2B bfd2f1b2d325c3b68e028ca6ab4a882e4c03d0b25a53f13c6c9e7c59b9047c2a52a33c51a6d27fda26c40a5bfba1516b26995983e52630f9f82c48e0e8680b9a SHA512 1a6d6a14dcc183c8c2da2fa78225ff091d114e6b3fb087736676e78b259c19cbdde4801941ac692717fae1252e7bf564251bdeeb1463774eab5675fdd3f37f18
 EBUILD peksystray-0.4.0.ebuild 548 BLAKE2B a8201e131aa174c0e96396d4cf7c5b34548ff97452d1d4cb3face3e6b53e709c6cdda2f87ad5892649bc9d1abc67becc40ad776d4c64c1d925d680064ac74bb1 SHA512 a9b852334d16abc9e563a24333bf61908714fad0bf303af6809145fe2a8f665fe1e2302c781b89bfb61bcdd9c9df56727997cb5684196ee628d32bc19fcade14
 MISC metadata.xml 248 BLAKE2B 31a7f14c543cda37426827bf2a5f0a05686a290ed39b16298143613e4d9683aa9f271ca1d8292cf9a428b515f082eb5005635776caed179cc92c15130ddfe6ae SHA512 fa6ca4ad39fb5a5fe147af685d9a457b5a2cee0debe0d8426ffdbd2a4e4b32776479008e06bff5888ddfcaa466c339284b9665bcaee9d8385f39da2a8149b39b
diff --git a/x11-misc/peksystray/peksystray-0.4.0-r1.ebuild b/x11-misc/peksystray/peksystray-0.4.0-r1.ebuild
new file mode 100644
index 000000000000..ed1c981c805d
--- /dev/null
+++ b/x11-misc/peksystray/peksystray-0.4.0-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="System tray dockapp for window managers supporting docking"
+HOMEPAGE="https://peksystray.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~x86"
+
+DEPEND="x11-libs/libX11
+	x11-libs/libXt"
+
+PATCHES=( "${FILESDIR}/${P}-asneeded.patch" )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_install() {
+	dobin src/peksystray
+	default
+}
author	V3n3RiX <venerix@koprulu.sector>	2023-05-05 05:29:57 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2023-05-05 05:29:57 +0100
commit	4e777c0133d093c9c8b992c92e0f244e2055bf71 (patch)
tree	d6fbeed2e9eb1b486babf5d6f4886da4bdba4dbc
parent	6f57e716c7968def6387f9db258e883125bab84f (diff)