gentoo auto-resync : 23:08:2023 - 21:49:58

242 files changed, 4273 insertions, 1561 deletions

diff --git a/Manifest b/Manifest
index 9ed232aba3da..6123caf5cd99 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29314 BLAKE2B f2e5f6104fd52286dd700d6d16b2afa7881b87e239addd0baeca18c075accd4e7c9449a37484f97e495928cc6e32e2f8c8a27e517d37aae52056e8ea302c32cf SHA512 0cc692e0b40392b55b938669b60d10bae1914d87cc2cf87f4862a1507412338f35699d0097cce471140a84961c9bd6c4530487ff471e8ebafaf301ea6c95440b
-TIMESTAMP 2023-08-23T14:09:50Z
+MANIFEST Manifest.files.gz 29336 BLAKE2B 721e9aaad4d37422b0427d19540e5c58c3cad8a441d24d0e5aba86b38a4f34242096e254385396c1a40dfa9e50e7fc2175fe021660f970a6f7e6d58937430fd2 SHA512 175bc3bfa778f6c050cbed42d90bb546ed332045de2966b1ef1c62642ce117b0ca960ee3772bbcc8c933249262716888de5137bc4d4f84dc5cee20cecc3b4ae6
+TIMESTAMP 2023-08-23T20:09:47Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmTmEy5fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmTmZ4tfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCzSxAAjpiLB64EEUm7/tT+CXdNPSgnDDpz4DBSu/T3CHruhNLq4TzdTaxzrsvW
-jehQBiHediwIQNyc1CGyQJW/4nS7IH3mJCtd7Xh3nc4Qp56ESpd7KkgQGzosWGVJ
-d7tevwEAl2az0icCKDr8sbxVJzsIdf3rbze0nWG527KDtx42G90qPYIdxqz8h4s+
-gS4cqp8h6JSJh6InRp9JWcX8XnR2Zy+KQ3Yl5pKQaAERBF0oUtaHNeNxsRvJL2HG
-+JIa9TQfvjY1rl2oUuXVa2FyJ7/CViMjRRTRkL5h2bPa2H01gaN5tcdPDApNeJYt
-pm2+BElmqmru6SKzJrEh3njOBct7sZbN+6VQvAqsnIX/zPMPPX1jUZc9K0UNK92V
-gFiyig2yhySvEqRYXEr+Qzfphne3r0wbzpR/fXCvXrbgima8hQPoS4euXF41e9AH
-3tV8CBw8sahVvQtdYZGgUov0iumf+71EgbNS7aQxSbMjypfhbJFQgu7it6suXDt2
-oWjoubABn6X9en0+yfuwHRR46PtxC7roI0frjfk4nN8xUamrGsve9ArpILu0yaaY
-vqQOjRdGuJKTy/ZPW9vlrrUuBCOArwemdV5DZ78qUq3Gy/dYxWhGWw0eUL7zhPWy
-jzdlNZ44UjQSSgzmPgerU0qYzjKfxbBtQQSKj4n4ldV/nY1bHoc=
-=FxrQ
+klAqOxAAoPZTiz7iOddMXDG7DvFnaF2ExET/cmRWLA4bjxHcB3c9ZIwFs+Lwa9BH
+YEb5cGAK+iSz4wH1/1tOQ4LMMtjmTSNJQVHpoMnliiu+QeamY6m/nkz5ELgzaXKv
+iBP1KNsgplBrLJttpo4yiv6otp+bLGyVbYN19hDH+/YF8DoVr0/78tRgt5N32F1z
+nbWrrpPDRg5+i9Ckfyu56pmUeUTyLWaKXueDi0CjMlcgx8oyCfiZfnlJJP9BMCaG
+O1nISLaSW1o6GN9jRooKcEdntdgrYYyHpWMbLjE7aMt8A12Vdr6v2Y/zKbJRS5jn
+sIQbcPo3LE8BMkKDe1wmirPKLQt5Y0N0O3NMOdfG4q/KQXlkcxGOzQednmKXhx9W
+8tubc9f28XUbvmcbabRYgmwACwe91NdztR9qUoV1R/57pXnUK0Kv8VNSKzK3m9c+
+eVvJU0xNehhuQHdP1/jmv0OyLbqDE1FUCIVAqo7DxaHqSRzTN/mHjAKmyvwyCgtk
+LhVebkG1arGtYE2cwuaVa0ISwfgdScOmPp0qYbv04qgEZrezMcFYNZSZ8wZlRBgb
+SlUpcHpoNHrfDsC8EzLVh7GFcy6Snx5V3CrnbNYzak5dHYUmVwsl0QCQKYbGssRP
+pBgZEd/Hbalw9CbSvxvsSSAhvnQzclm24+t1LuGYbtcbQ942hY0=
+=J5G0
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index bbdfc9c3a27b..8f04ebbae64c 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 438de2eb5c02..6d5e5d2f67b6 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/crossover-bin/Manifest b/app-emulation/crossover-bin/Manifest
index 30cfbe2ab2bc..cbfd91205975 100644
--- a/app-emulation/crossover-bin/Manifest
+++ b/app-emulation/crossover-bin/Manifest
@@ -1,7 +1,5 @@
-DIST install-crossover-22.0.1.bin 334913889 BLAKE2B e30c14b14adb0db4bb0b8e840aed89f82f59fc918ba697f8cdd86eea330b60d81020ec9ad498a511858de6fae10d74fcf572753295536cbbb98e067496029bb4 SHA512 825f1eeb10efcbf3bff0e4e6f91c709d3bbecdb5635839b580c79ff77e54333db4a84e9e6abfd08a0ea4e57729c4489e149366d5a5c7da6773a5a0d413905d48
-DIST install-crossover-22.1.0.bin 335571332 BLAKE2B 72ea09886a927eadaf6dead1d711723990e27cb845d514007d3433c9924e289ff3465a4dfdc02458e20cbcdba598ba65cea37453a0c16e3b13d790480bcaf9d3 SHA512 4de0eda5bbb68d8a5adde652c1254325a8a454eb1d2f7a84289b6d90373d7534b0821b706db08cef92c74b4286b6cceae0fc8033acccd276af5734579bad7fed
 DIST install-crossover-22.1.1.bin 335606941 BLAKE2B 3c5eada7190283f348348ef4d3b044db8e24e0dc3588d847854feb712d39bc9013e4f958a80c3f46e84b32f6b5c7d419ef6ab4fa1e946d308ba546140fb95504 SHA512 54bb40941baea184aa824c371a2eb73cdda26fa7c0765e242384e2c29a78f6b600c7455640b9888fd28ad482bf14f53a0308cbd55d9453f76d6eeb75cf0abfc7
-EBUILD crossover-bin-22.0.1-r1.ebuild 7225 BLAKE2B b59960542fc734a229ad86928d467e57a3dc1b434b6478f2c2bff9ce99bd5e7d34ef85eb77cfe72510a6ca0f3e7e986843ecb900e43047ef7416b01928482f82 SHA512 a06b29287d32142b42e6061176bff67f6b1220c8c3f8afb8eff3e91c9ac778f455b166ac83748506dbf07ce046d7e637f178ae35ad92c675f0af7aa78b7d37da
-EBUILD crossover-bin-22.1.0.ebuild 7185 BLAKE2B 627c6a19fd865d883de8803ec4a69c270455857861d1f19495fb871d01480fc4160c6a21ec50094f9f18e069518bc975382417e5eca307ac98de52e15ec862ad SHA512 fe114e9e40bec844991bf3e3b5679f3388c19fff361c892e1949f5c73e8b04e0d4725b915f31327def6fec525179560dd50c52f0271280c700bab85cd7491e6a
+DIST install-crossover-23.0.0.bin 340426479 BLAKE2B eb78fd03475e88a021d8ca3c46358e0092863a8d123fa00ebebef30774c16a5350d489b8b0fe158fbdeb2daf60c2dd5b9ca1b3db855d94901561cfcad09a1ac5 SHA512 29c4303e43a857451d7954fc86337cf007e5d32fbcbed4a65066b464e1caf5aad4dd58bc4e65b1c77bb70903f7b7e541b5c1b7df2b44f60d1235aeb558deda1e
 EBUILD crossover-bin-22.1.1.ebuild 6557 BLAKE2B 391fa6ba87db9a8a0593e26c6f1cd2333f84ac051a84be6d40595c5d2ae7586535bf8d49fd0977aa1aadce41e6bfbb983bc8839ac34a54b6cef42b710a9bef7c SHA512 bf995495c1ad7b3208deba0c0f5aa1a33451a3b257bc9aa705377da48b423370e76357474703aa774ff47e30d6f9fc8bc5b5b6857400c7a31da7407ec2162f6c
+EBUILD crossover-bin-23.0.0.ebuild 6474 BLAKE2B ee3003da8d69d174dacb005414a5ee20087579758569d97a2c9292bd843298b228b245dcd2e3c391ed95d3ca22d4bf7c5e0d47ccbe7d5d981742530cf48972e1 SHA512 231fc5135aa114e92393bcc8a9ba77e59f772328a3fda374b9915dea9ec247a34915a3b0a85da2a5c6905bc7144f6a191ec2efc8f5faf90c56604dd683d2830b
 MISC metadata.xml 521 BLAKE2B d905a83647a79bac613621810d653bfda34f1b61fabdd359a5c893f2736054cb1f0f5087675d31837fab25a7ddca85397804e596d5dfabbc4c531c0abbdb8378 SHA512 9cbabfcde35394ac6a144c5fbcb0ffb1e0d0035622748df2e8fd574022e1740dcbb9bf511036b58aaa12fb21bee8ee8ae2a9eb126e2cf85142538ac72694d20a
diff --git a/app-emulation/crossover-bin/crossover-bin-22.0.1-r1.ebuild b/app-emulation/crossover-bin/crossover-bin-22.0.1-r1.ebuild
deleted file mode 100644
index 0d0d09029eb3..000000000000
--- a/app-emulation/crossover-bin/crossover-bin-22.0.1-r1.ebuild
+++ /dev/null
@@ -1,222 +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 python-single-r1 unpacker
-
-DESCRIPTION="Commercial version of app-emulation/wine with paid support"
-HOMEPAGE="https://www.codeweavers.com/products/"
-SRC_URI="https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-${PV}.bin"
-
-LICENSE="CROSSOVER-3"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="+capi +cups doc +gphoto2 +gsm +gstreamer +jpeg +lcms ldap +mp3 +nls osmesa +openal +opencl +opengl +pcap +png +scanner +ssl +v4l +vulkan"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="bindist test"
-
-QA_FLAGS_IGNORED="opt/cxoffice/.*"
-QA_PRESTRIPPED="
-	opt/cxoffice/lib/.*
-	opt/cxoffice/lib64/.*
-	opt/cxoffice/bin/cabextract
-	opt/cxoffice/bin/cxburner
-	opt/cxoffice/bin/cxntlm_auth
-	opt/cxoffice/bin/wineserver
-	opt/cxoffice/bin/wineserver32
-	opt/cxoffice/bin/wineserver64
-	opt/cxoffice/bin/wine64-preloader
-	opt/cxoffice/bin/unrar
-	opt/cxoffice/bin/wine-preloader
-	opt/cxoffice/bin/cxdiag
-	opt/cxoffice/bin/cxdiag64
-	opt/cxoffice/bin/cxgettext
-	opt/cxoffice/bin/vkd3d-compiler
-	opt/cxoffice/bin/wineloader
-	opt/cxoffice/bin/wineloader64
-"
-QA_TEXTRELS="
-	opt/cxoffice/bin/wineserver32
-	opt/cxoffice/lib/wine/*
-	opt/cxoffice/lib/libwine.so*
-"
-
-S="${WORKDIR}"
-
-DEPEND=""
-BDEPEND="${PYTHON_DEPS}
-	app-arch/cpio
-	app-arch/unzip
-	dev-lang/perl
-	dev-util/bbe
-"
-
-RDEPEND="${DEPEND}
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-	')
-	!prefix? ( sys-libs/glibc )
-	capi? ( net-libs/libcapi[abi_x86_32(-)] )
-	cups? ( net-print/cups[abi_x86_32(-)] )
-	gsm? ( media-sound/gsm[abi_x86_32(-)] )
-	jpeg? ( media-libs/libjpeg-turbo:0[abi_x86_32(-)] )
-	lcms? ( media-libs/lcms:2 )
-	ldap? ( net-nds/openldap[abi_x86_32(-)] )
-	gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] )
-	gstreamer? (
-		media-libs/gstreamer:1.0[abi_x86_32(-)]
-		jpeg? ( media-plugins/gst-plugins-jpeg:1.0[abi_x86_32(-)] )
-		media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)]
-	)
-	mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] )
-	nls? ( sys-devel/gettext[abi_x86_32(-)] )
-	openal? ( media-libs/openal[abi_x86_32(-)] )
-	opencl? ( virtual/opencl[abi_x86_32(-)] )
-	opengl? (
-		virtual/glu[abi_x86_32(-)]
-		virtual/opengl[abi_x86_32(-)]
-	)
-	pcap? ( net-libs/libpcap[abi_x86_32(-)] )
-	png? ( media-libs/libpng:0[abi_x86_32(-)] )
-	scanner? ( media-gfx/sane-backends[abi_x86_32(-)] )
-	ssl? ( net-libs/gnutls:0/30.30[abi_x86_32(-)] )
-	v4l? ( media-libs/libv4l[abi_x86_32(-)] )
-	vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)] )
-	dev-libs/glib:2
-	dev-libs/gobject-introspection
-	|| (
-		dev-libs/openssl-compat:1.1.1
-		=dev-libs/openssl-1.1.1*
-	)
-	dev-util/desktop-file-utils
-	media-libs/alsa-lib[abi_x86_32(-)]
-	media-libs/freetype:2[abi_x86_32(-)]
-	media-libs/mesa[abi_x86_32(-),osmesa?]
-	|| ( media-libs/tiff-compat:4[abi_x86_32(-)] media-libs/tiff:0/0[abi_x86_32(-)] )
-	sys-auth/nss-mdns[abi_x86_32(-)]
-	sys-apps/util-linux[abi_x86_32(-)]
-	sys-libs/libunwind[abi_x86_32(-)]
-	sys-libs/ncurses-compat:5[abi_x86_32(-)]
-	sys-libs/zlib[abi_x86_32(-)]
-	x11-libs/libICE[abi_x86_32(-)]
-	x11-libs/libSM[abi_x86_32(-)]
-	x11-libs/libX11[abi_x86_32(-)]
-	x11-libs/libXau[abi_x86_32(-)]
-	x11-libs/libXcursor[abi_x86_32(-)]
-	x11-libs/libXdmcp[abi_x86_32(-)]
-	x11-libs/libXext[abi_x86_32(-)]
-	x11-libs/libXi[abi_x86_32(-)]
-	x11-libs/libXrandr[abi_x86_32(-)]
-	x11-libs/libXxf86vm[abi_x86_32(-)]
-	x11-libs/libxcb[abi_x86_32(-)]
-	x11-libs/gdk-pixbuf:2[introspection]
-	x11-libs/gtk+:3[introspection]
-	x11-libs/pango[introspection]
-	x11-libs/vte:2.91[introspection]
-	|| (
-		sys-libs/libxcrypt[compat]
-		sys-libs/glibc[crypt(+)]
-	)
-"
-
-src_unpack() {
-	# self unpacking zip archive; unzip warns about the exe stuff
-	unpack_zip ${A}
-}
-
-src_prepare() {
-	default
-
-	# Remove unnecessary files, license.txt file kept as it's used by
-	# multiple files (apart of the menu to show the license)
-	rm -r guis/ || die "Could not remove files"
-	use doc || rm -r doc/ || die "Could not remove files"
-}
-
-src_install() {
-	sed -i \
-		-e "s:xdg_install_icons(:&\"${ED}\".:" \
-		-e "s:\"\(.*\)/applications:\"${ED}\1/applications:" \
-		-e "s:\"\(.*\)/desktop-directories:\"${ED}\1/desktop-directories:" \
-		"${S}/lib/perl/CXMenuXDG.pm" || die
-
-	# Install crossover symlink, bug #476314
-	dosym ../cxoffice/bin/crossover /opt/bin/crossover
-
-	# Install documentation
-	dodoc README changelog.txt
-	rm README changelog.txt || die "Could not remove README and changelog.txt"
-
-	# Install files
-	dodir /opt/cxoffice
-	#cp -r ./* "${ED}/opt/cxoffice" \
-	find . | cpio -dumpl "${ED}/opt/cxoffice" 2>/dev/null \
-		|| die "Could not install into ${ED}/opt/cxoffice"
-
-	# Disable auto-update
-	sed -i -e 's/;;\"AutoUpdate\" = \"1\"/\"AutoUpdate\" = \"0\"/g' share/crossover/data/cxoffice.conf || die
-
-	# Install configuration file
-	insinto /opt/cxoffice/etc
-	doins share/crossover/data/cxoffice.conf
-	dodir /etc/env.d
-	echo "CONFIG_PROTECT=/opt/cxoffice/etc/cxoffice.conf" >> "${ED}"/etc/env.d/30crossover-bin || die
-
-	# Konqueror in its infinite wisdom decides to try opening things for
-	# writing, which are sandbox violations. This breaks the install process if
-	# it is installed, so we ninja edit it to false so it so doesn't run.
-	sed -i -e 's/cxwhich konqueror/false &/' "${ED}/opt/cxoffice/bin/locate_gui.sh" \
-		|| die "Could not apply workaround for konqueror"
-
-	# Install menus
-	# XXX: locate_gui.sh automatically detects *-application-merged directories
-	# This means what we install will vary depending on the contents of
-	# /etc/xdg, which is a QA violation. It is not clear how to resolve this.
-	XDG_DATA_HOME="/usr/share" XDG_CONFIG_HOME="/etc/xdg" \
-		"${ED}/opt/cxoffice/bin/cxmenu" --destdir="${ED}" --crossover --install \
-		|| die "Could not install menus"
-
-	# Revert ninja edit
-	sed -i -e 's/false \(cxwhich konqueror\)/\1/' "${ED}/opt/cxoffice/bin/locate_gui.sh" \
-		|| die "Could not apply workaround for konqueror"
-
-	# Drop Uninstall menus
-	rm "${ED}/usr/share/applications/"*"Uninstall"* \
-		|| die "Could not remove uninstall menus"
-
-	# Fix PATHs
-	sed -i \
-		-e "s:\"${ED}\".::" \
-		-e "s:${ED}::" \
-		"${ED}/opt/cxoffice/lib/perl/CXMenuXDG.pm" \
-		|| die "Could not fix paths in ${ED}/opt/cxoffice/lib/perl/CXMenuXDG.pm"
-	sed -i -e "s:${ED}::" \
-		"${ED}/usr/share/applications/"*"CrossOver.desktop" \
-		|| die "Could not fix paths of *.desktop files"
-
-	# Workaround missing libs
-	#
-	# It tries to load libpcap as packaged in Debian, https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=657900
-	# https://bugs.gentoo.org/721108
-	if use pcap; then
-		bbe -e 's/libpcap.so.0.8/libpcap.so.1.9.1/' "${ED}/opt/cxoffice/lib/wine/i386-unix/wpcap.so" >tmp || die
-		bbe -e 's/libpcap.so.0.8/libpcap.so.1.9.1/' "${ED}/opt/cxoffice/lib/wine/x86_64-unix/wpcap.so" >tmp64 || die
-		mv tmp "${ED}/opt/cxoffice/lib/wine/i386-unix/wpcap.so" || die
-		mv tmp64 "${ED}/opt/cxoffice/lib/wine/x86_64-unix/wpcap.so" || die
-	fi
-
-	# Remove libs that link to openldap
-	if ! use ldap; then
-		rm "${ED}"/opt/cxoffice/lib/wine/{i386,x86_64}-unix/wldap32.so
-	fi
-
-	# Remove libs that link to opencl
-	if ! use opencl; then
-		rm "${ED}"/opt/cxoffice/lib/wine/{i386,x86_64}-unix/opencl.so || die
-	fi
-}
diff --git a/app-emulation/crossover-bin/crossover-bin-22.1.0.ebuild b/app-emulation/crossover-bin/crossover-bin-23.0.0.ebuild
index 0ad42d954e15..d5bb861a2bbf 100644
--- a/app-emulation/crossover-bin/crossover-bin-22.1.0.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-23.0.0.ebuild
@@ -13,37 +13,11 @@ SRC_URI="https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crosso
 LICENSE="CROSSOVER-3"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
-IUSE="+capi +cups doc +gphoto2 +gsm +gstreamer +jpeg +lcms ldap +mp3 +nls osmesa +openal +opencl +opengl +pcap +png +scanner +ssl +v4l +vulkan"
+IUSE="+capi +cups doc +gphoto2 +gstreamer +jpeg +lcms ldap +mp3 +nls osmesa +openal +opencl +opengl +pcap +png +scanner +ssl +v4l +vulkan"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RESTRICT="bindist test"
-
-QA_FLAGS_IGNORED="opt/cxoffice/.*"
-QA_PRESTRIPPED="
-	opt/cxoffice/lib/.*
-	opt/cxoffice/lib64/.*
-	opt/cxoffice/bin/cabextract
-	opt/cxoffice/bin/cxburner
-	opt/cxoffice/bin/cxntlm_auth
-	opt/cxoffice/bin/wineserver
-	opt/cxoffice/bin/wineserver32
-	opt/cxoffice/bin/wineserver64
-	opt/cxoffice/bin/wine64-preloader
-	opt/cxoffice/bin/unrar
-	opt/cxoffice/bin/wine-preloader
-	opt/cxoffice/bin/cxdiag
-	opt/cxoffice/bin/cxdiag64
-	opt/cxoffice/bin/cxgettext
-	opt/cxoffice/bin/vkd3d-compiler
-	opt/cxoffice/bin/wineloader
-	opt/cxoffice/bin/wineloader64
-"
-QA_TEXTRELS="
-	opt/cxoffice/bin/wineserver32
-	opt/cxoffice/lib/wine/*
-	opt/cxoffice/lib/libwine.so*
-"
-
+QA_PREBUILT="*"
 S="${WORKDIR}"
 
 DEPEND=""
@@ -64,7 +38,6 @@ RDEPEND="${DEPEND}
 	!prefix? ( sys-libs/glibc )
 	capi? ( net-libs/libcapi[abi_x86_32(-)] )
 	cups? ( net-print/cups[abi_x86_32(-)] )
-	gsm? ( media-sound/gsm[abi_x86_32(-)] )
 	jpeg? ( media-libs/libjpeg-turbo:0[abi_x86_32(-)] )
 	lcms? ( media-libs/lcms:2 )
 	ldap? ( net-nds/openldap[abi_x86_32(-)] )
@@ -90,10 +63,7 @@ RDEPEND="${DEPEND}
 	vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)] )
 	dev-libs/glib:2
 	dev-libs/gobject-introspection
-	|| (
-		dev-libs/openssl-compat:1.1.1
-		=dev-libs/openssl-1.1.1*
-	)
+	dev-libs/openssl-compat:1.1.1
 	dev-util/desktop-file-utils
 	media-libs/alsa-lib[abi_x86_32(-)]
 	media-libs/freetype:2[abi_x86_32(-)]
diff --git a/app-eselect/Manifest.gz b/app-eselect/Manifest.gz
index 30217de22e0c..840f2e5e4842 100644
--- a/app-eselect/Manifest.gz
+++ b/app-eselect/Manifest.gz
diff --git a/app-eselect/eselect-wine/Manifest b/app-eselect/eselect-wine/Manifest
index 9a5334b5e39b..a8cfed31fd18 100644
--- a/app-eselect/eselect-wine/Manifest
+++ b/app-eselect/eselect-wine/Manifest
@@ -1,4 +1,3 @@
 DIST eselect-wine-2.0.2.tar.bz2 7449 BLAKE2B ce933920a7b6d1df0c0e5f5ae27b1ad1c7467489bd2d35c977b1d9894012b6bcb52d2830c3ebcef9228de40c6f31650e78d40051c82badf959c51339fe6bfa10 SHA512 c49c08e25d7e15c04205608118ea38e970db31f394534efd44070eec5c2148463c09d2b2787a9bb9c1b5f29010e99b4769d3f219b3ae826ceae56757aab596d1
-EBUILD eselect-wine-2.0.2-r1.ebuild 3294 BLAKE2B 460da69deda04a53ac81981797dad15f556fca16eaba1f02f108fe8052dc2a2ae8ae056f8fa33f71d9c638503ee92de0f1fae5521a9f1ded0f03b05cd7f3b381 SHA512 af1268abd077ced5646620a680b4a2a02386b2f8cfa50e43a28beddeed56f7bb65f87cc9008f9bea98e36fdd480e02f17de4492ac4503307fcfb966c1635195c
-EBUILD eselect-wine-2.0.2.ebuild 2604 BLAKE2B 8132089785f2e13accdd1666e1f6c45b4506d0311f6265f948049b66fddc02802d37cf9a2fa233fe1d0edf115cfe69517e0c9f3e57b16729411a1c2456f2f904 SHA512 a2d1afc85ba070bc4e26c8bbaa1c100f6840d6e7c4db2ea999be71699eccad4f075d4711ea5720fa77280bd7121b2c184fe0745c5a903ef7249addd7f3336b67
+EBUILD eselect-wine-2.0.2-r2.ebuild 3214 BLAKE2B a47050014cb1170bc20a9a2f9095bca167766b9d39697a601fd9364ce06c6157a62e70b47918cd857a3baf15bd9f54cd3ef3ea3ddf6a4b0a5aff6332089a12bc SHA512 28efa58a65218a0961785abd872b7c2e2045d34f82d7b986a0aef78f1c39b3dcd1dff80550476974a304d0637b0ba2da2dac6ae840c82d13bafc6c39ad7b7fac
 MISC metadata.xml 494 BLAKE2B 8b6b0225e0825473ffab8dd707a6ebfa1f491da865a8975eeeab8062537650e06d4703201af59bd775870f04f7422e6da1eab6e2a874faa24776a26c1bb48d19 SHA512 22a330313d9f4408b89dde624ce9e94601257d3650e25df6bc803ca10c52a7fb7c6723fc6b9527429eaea528431e89e985b16249252a0298b6f76c77ce3feb33
diff --git a/app-eselect/eselect-wine/eselect-wine-2.0.2-r1.ebuild b/app-eselect/eselect-wine/eselect-wine-2.0.2-r2.ebuild
index e2fbb4428e06..da39532a82a4 100644
--- a/app-eselect/eselect-wine/eselect-wine-2.0.2-r1.ebuild
+++ b/app-eselect/eselect-wine/eselect-wine-2.0.2-r2.ebuild
@@ -30,11 +30,10 @@ src_install() {
 		XDG_DATA_DIRS=\"${EPREFIX}/etc/eselect/wine/share\"")
 	EOF
 
-	# links for building, e.g. wineasio (bug #657748), albeit this
-	# should be rarely used directly nowadays and could be removable
-	# (removing would also solve the one-time QA issue described below)
+	# links to help building, e.g. wineasio (bug #657748),
+	# albeit in general these are not particularly important
 	dosym -r /etc/eselect/wine/wine /usr/lib/wine
-	dosym -r /etc/eselect/wine/include /usr/include/wine
+	dosym -r /etc/eselect/wine/include/wine /usr/include/wine
 
 	einstalldocs
 }
diff --git a/app-eselect/eselect-wine/eselect-wine-2.0.2.ebuild b/app-eselect/eselect-wine/eselect-wine-2.0.2.ebuild
deleted file mode 100644
index dc64574f7852..000000000000
--- a/app-eselect/eselect-wine/eselect-wine-2.0.2.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Manage active Wine slots and variants"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Wine"
-SRC_URI="https://gitweb.gentoo.org/proj/eselect-wine.git/snapshot/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+xdg"
-
-# xdg-utils needed for bug #884077
-RDEPEND="
-	app-admin/eselect
-	xdg? ( x11-misc/xdg-utils )"
-
-src_install() {
-	insinto /usr/share/eselect/modules
-	doins wine.eselect
-
-	keepdir /etc/eselect/wine
-
-	newenvd - 95${PN} <<-EOF
-		PATH="${EPREFIX}/etc/eselect/wine/bin"
-		MANPATH="${EPREFIX}/etc/eselect/wine/share/man"$(usev xdg "
-		XDG_DATA_DIRS=\"${EPREFIX}/etc/eselect/wine/share\"")
-	EOF
-
-	# links for building, e.g. wineasio (bug #657748)
-	dosym -r /etc/eselect/wine/wine /usr/lib/wine
-	dosym -r /etc/eselect/wine/include /usr/include/wine
-
-	# not required, but useful for e.g. binfmt that's not looking in PATH
-	# (not doing this for everything as it gets troublesome to track)
-	dosym -r /etc/eselect/wine/bin/wine /usr/bin/wine
-
-	einstalldocs
-}
-
-pkg_preinst() {
-	if has_version '<app-eselect/eselect-wine-2'; then
-		# keep copy of still-set 'active' to auto-select same slots
-		if [[ -e ${EROOT}/etc/eselect/wine/active &&
-			! -e ${EROOT}/etc/eselect/wine/eselect-wine-migration ]]; then
-			cp "${EROOT}"/etc/eselect/wine/{active,eselect-wine-migration} || die
-		fi
-
-		# managed differently, need cleanup
-		eselect wine unset --all || die
-		rm -f "${EROOT}"/etc/eselect/wine/{active,installed,links/{any,vanilla,staging,proton,wine}} || die
-		rmdir "${EROOT}"/etc/eselect/wine/links 2>/dev/null
-
-		# some rare man dirs were created by old eselect, cleanup if now empty
-		rmdir "${EROOT}"/usr/share/man/{de,fr,pl}.UTF-8{/man1,} 2>/dev/null
-	fi
-
-	# lacking QA_BROKEN_SYMLINK, and rather avoid live /usr changes wrt
-	# bug #632576, nor create "owned" placeholders that will be clobbered
-	[[ -e ${EROOT}/etc/eselect/wine/bin/wine ]] ||
-		eqawarn "QA Note: broken symlinks QA is normal on first merge, targets created after"
-}
-
-pkg_postinst() {
-	eselect wine update --if-unset || die
-
-	rm -f "${EROOT}"/etc/eselect/wine/eselect-wine-migration || die # see preinst
-
-	if [[ ! ${REPLACING_VERSIONS##* } ]] ||
-		ver_test ${REPLACING_VERSIONS##* } -lt 2; then
-		elog
-		[[ ${REPLACING_VERSIONS} ]] &&
-			elog "${PN} changed a bit, suggest reviewing 'eselect wine help' (and list)."
-		elog "Please run '. ${EROOT}/etc/profile' to update PATH in current shells."
-	fi
-}
-
-pkg_prerm() {
-	[[ ${REPLACED_BY_VERSION} ]] || eselect wine update --reset # no die
-}
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index bdc798448812..058169a33502 100644
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
diff --git a/app-i18n/unicode-cldr/Manifest b/app-i18n/unicode-cldr/Manifest
index 68009ce94f51..88f942134eaa 100644
--- a/app-i18n/unicode-cldr/Manifest
+++ b/app-i18n/unicode-cldr/Manifest
@@ -2,6 +2,6 @@ DIST unicode-cldr-common-42.0.zip 30178050 BLAKE2B 076e3eca12534feff8e0e54bdc1fa
 DIST unicode-cldr-common-43.0.zip 31934452 BLAKE2B 8390db2fb58ede0f55ebe369e5598c6a47b6ed01c95162d85365a699ceeb15d4d912a1ea26062c8f37a467c58fdaca27e99a9a133fec4afe15bf6ac6ba29b4f6 SHA512 930c64208d6f680d115bfa74a69445fb614910bb54233227b0b9ae85ddbce4db19e4ec863bf04ae9d4a11b2306aa7394e553384d7537487de8011f0e34877cef
 DIST unicode-cldr-common-43.1.zip 31936262 BLAKE2B 1a52c4ffbe1040e01571a69bb4e66d7065c38be97f0e44214d5c13d973f2f9e620357e3b6ab40bb94c3506f097062a58973ca3259b240da12ffeb84e9a1fd567 SHA512 f9915c285b6fe1d4186b19c6c6b5f53876ee976a0851d1eade6b79843ddc43951bcce42363dc1e0fa455223a9ae8b8d85c167c23f1b4c49cfe39034bd202a3c8
 EBUILD unicode-cldr-42.0.ebuild 539 BLAKE2B 7868559c4eeb360f1834ba0ef6db44dbd3b1d9b9bd3c860c604c030034a43ea0e5435dbdfdb5c30880bee00b05931b3ae526e82b3486e8960768bff0528a75d1 SHA512 785a5b736434147e320a329850efcfc9fd2abdb1ff68cc9bb4ea667e313da8ffd3ed23f88083f80777b1fbba543e1537f656495b6f3c40d8dcbc554eb46dbb7d
-EBUILD unicode-cldr-43.0.ebuild 546 BLAKE2B 81a8e0062d5df8c3743c12b66b67150ca92b48810ef28eab049d0d7826541b3ecaec9a3bdc3d1837cfe09ccf44f00053f3802a04137e266ad4150ff3ff5fc892 SHA512 08cc84cee6ecf5e3b03438fe52872bbbf960c545248f8ea5d21d48baa42c177e119537d08c1803233496d76579a7b3adb10c69775402bd8018b5a277d2e41b1d
+EBUILD unicode-cldr-43.0.ebuild 539 BLAKE2B 7868559c4eeb360f1834ba0ef6db44dbd3b1d9b9bd3c860c604c030034a43ea0e5435dbdfdb5c30880bee00b05931b3ae526e82b3486e8960768bff0528a75d1 SHA512 785a5b736434147e320a329850efcfc9fd2abdb1ff68cc9bb4ea667e313da8ffd3ed23f88083f80777b1fbba543e1537f656495b6f3c40d8dcbc554eb46dbb7d
 EBUILD unicode-cldr-43.1.ebuild 546 BLAKE2B 81a8e0062d5df8c3743c12b66b67150ca92b48810ef28eab049d0d7826541b3ecaec9a3bdc3d1837cfe09ccf44f00053f3802a04137e266ad4150ff3ff5fc892 SHA512 08cc84cee6ecf5e3b03438fe52872bbbf960c545248f8ea5d21d48baa42c177e119537d08c1803233496d76579a7b3adb10c69775402bd8018b5a277d2e41b1d
 MISC metadata.xml 259 BLAKE2B 473457dc1808c494d8a08c731bc36bc3f6fd42ac730b0e7372e9749275ad413c56abc214d6b8d43c3e3f3d878a81e61d3ac1088b0606e99b449018828f056c4c SHA512 42603797647a4e2bdd69fc8548c0f035143c2a94b836763b39fc0dda770621970fbb233327c142107bca40f48b2b380fe97c6517e5fce633ba2c11f7a34402fc
diff --git a/app-i18n/unicode-cldr/unicode-cldr-43.0.ebuild b/app-i18n/unicode-cldr/unicode-cldr-43.0.ebuild
index 390302e5beb5..8185c0164e54 100644
--- a/app-i18n/unicode-cldr/unicode-cldr-43.0.ebuild
+++ b/app-i18n/unicode-cldr/unicode-cldr-43.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://unicode.org/Public/${PN#*-}/${PV%.0}/${PN#*-}-common-${PV}.zip
 
 LICENSE="unicode"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv sparc x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 5da8b53e6ae6..64d5e449b265 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/bitstring/Manifest b/dev-python/bitstring/Manifest
index 575b489b50a5..4606f95ea87c 100644
--- a/dev-python/bitstring/Manifest
+++ b/dev-python/bitstring/Manifest
@@ -1,5 +1,7 @@
 DIST bitstring-4.0.2.tar.gz 211208 BLAKE2B 75ba6de71ac1a4ea384aad38405ccef21a101c641ee244096d67aad9b46315ee5dab9099b928e3300772c6f15637d4b54899c0a40f6a7ab4e48cfa1c66f310ab SHA512 11d7cddc7372ef9dac92d97df6e9972d7e75e4b02ad1e777357bea667e096beb405871b6cc9baa0522e2251278ad8c11a34724932efb2593fccf572857a608ce
 DIST bitstring-4.1.0.tar.gz 227045 BLAKE2B 0aa311f130a45099b46153f3452ab8e2b3f1c9ebc3d40390b0f3ddfdf552f9f610662904c286c1edba19e4033438e12a76f2533055da6095378e01152a318869 SHA512 e4c1f959268ee409e6482510eee728fe0f71392c920edfbdd641f4c4c967517e630abb5afa6d32b694e9f6dcc291128c54d27f8d5aed7eaa36599beb425f78e8
+DIST bitstring-4.1.1.tar.gz 228708 BLAKE2B f883fc0e40fd426a21449ca27ce58b7e40291f3758aee70cfe455ea3db7cd22c32ae74f581e5a2c99f21e8162c9499793891074750a5b81a8397c5333fd18210 SHA512 dd90382f57a9a8eda41616d61ba589f1504a6613ef36104b1187c345197cf088c4ef1c283af8a33ce629bfeea2d39065970d173051d67f3ec2e2240043869ff8
 EBUILD bitstring-4.0.2.ebuild 526 BLAKE2B 098b32c3bbffa7ec4c14d81585198039573f39d7c0410c0f02f2f6f981cfe91e9a24a73b70301f80a68a90c72292a11ac77c3502fe8acdd725300a32a89f6ea3 SHA512 bed54e5f721904c0a2dfe4cbc4b6c0d8828040b68404bb450555ff52cd6c3d7c18995bc43dac35b85fb7a6a6f1f43219abf1bafc340144479b670d64107919dd
 EBUILD bitstring-4.1.0.ebuild 778 BLAKE2B 0ee79478b3b1df66f284906414ba940140871e6a78294aa3527d922c5bc3cc7aa1c5aa3b9b0a18c4356df9d97c723013426f37b2324c19b269efd7bb955b11d6 SHA512 82a1070f9b0da36f9b0206d6e3f8528c365445f5ff6006780f348519de99335b0cd30737a277b4768768f510d95032698c123c011ae189349f2ed811d99763f8
+EBUILD bitstring-4.1.1.ebuild 573 BLAKE2B 971e539cdae6cd35ac6d576e43c3b13c4a0bf2cc99f63ba864effe7158a86c856a4177f154957823dc8b8b80543aaffa2cc7b3d4d6d7ee6466f0f8ac3713e8c2 SHA512 13f9d9febd85eb57685ebd0b3216611a9e92892cd8a5f6aa8dc0ee71c441584c4dd268dfe74d26ff391c3b567a97130d0c128ec6329a867b3ded607ada1a5931
 MISC metadata.xml 733 BLAKE2B 5d978fb3a90e33422df3c35986386d83e38b7760a2cac0708894c8c58c41002b8c7e1fe16bc1e9c707d8009afd0613d4afccf459770d40ec7c9223ede6a34e05 SHA512 ba4a8fb544c13bce8b31eb1dc3c4c5f5beff5f883f922479ccf809d81532719353ef322a26cdf16a0ef499dcdfb300b4a3fd0812edcb62651f8b617f0e391930
diff --git a/dev-python/bitstring/bitstring-4.1.1.ebuild b/dev-python/bitstring/bitstring-4.1.1.ebuild
new file mode 100644
index 000000000000..ed11001fdc22
--- /dev/null
+++ b/dev-python/bitstring/bitstring-4.1.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="A pure Python module for creation and analysis of binary data"
+HOMEPAGE="
+	https://github.com/scott-griffiths/bitstring/
+	https://pypi.org/project/bitstring/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	<dev-python/bitarray-3[${PYTHON_USEDEP}]
+	>=dev-python/bitarray-2.8.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/gpep517/Manifest b/dev-python/gpep517/Manifest
index 322172e1ec50..2629c631cf5e 100644
--- a/dev-python/gpep517/Manifest
+++ b/dev-python/gpep517/Manifest
@@ -1,3 +1,5 @@
 DIST gpep517-13.gh.tar.gz 17197 BLAKE2B eb2f1061c0d762ec5cedf042c41a04eb1ddfbb146b5d81727f7e09d55e76323ee4ffb00e8a8c17a8d423b863bd46dc79a03048da1998cf50fee45bc75c64f38e SHA512 23219a3f7369def01e41fe6bbf96400cc85bb6f5efae3924451a5f3dbed0c9a5e7bb69aa1810897597aa248aa64fc6445fb32ed5bf314d0265c5339893ea58e3
+DIST gpep517-14.gh.tar.gz 17896 BLAKE2B 53e903a8efd6dc2a861784093c078cc8196ac870cc837714e5afc69afaf6494484d7614039032db4f765d6a30b6e8f639a6f6870812b24effac208d668edd0b5 SHA512 9d2c55775c19fb8a071336749fa7b0c15a25c19af380999cffd4e23b6b4bbfca1d8b1b21ed4e57c89836d2fad527b18a7ba33ba4e06c78deeec68f071e4d2375
 EBUILD gpep517-13.ebuild 1063 BLAKE2B 0b3bfa1ae57ced5ee66ea32a9d51daadc73973883832d55d62080af0d1ad18c466f1d6599b92516e5a8013dd0d94f3073ced2416a226de9eb793fe7038d382ba SHA512 c50c872cc4eafce4685e292e4c065bd10d44a1dac397046291560edb1ac7741f7387d8f0a288b85d3786ae47dbd29259d90e9f9680f30bd7551e4049e304dcae
+EBUILD gpep517-14.ebuild 1071 BLAKE2B 6153525932bdbdfae11e35c9401619abf82d90300b20700ece1a05a6826470c9b7f659117f51e59703b8efa5948cfed75e0a951ce6bbf58766b97f7cf344bd1e SHA512 4d62738f87ff5ee6bfc23f21d824752d462acafa90c35b819f80453ca7a525a40ce312c1418a94b239f9c220332d06363a42f580db0b7b7762f825e7f9bcfe63
 MISC metadata.xml 396 BLAKE2B b67a7e2109f002e48023fc60f19fe2aa7f224010795434815a4c7c0d075dba6cb27e9d443ff86b84ba582a12b30dec5dc8ce9c91419dc2d04c1c61f45e901192 SHA512 402dc1c9cad90e122443599282d03d317a29d31189aa1532041104ae4b6292340b5744488075c9f52877f450561072ef4d8750db65412bcb81b2af5648078b37
diff --git a/dev-python/gpep517/gpep517-14.ebuild b/dev-python/gpep517/gpep517-14.ebuild
new file mode 100644
index 000000000000..75da542d1341
--- /dev/null
+++ b/dev-python/gpep517/gpep517-14.ebuild
@@ -0,0 +1,43 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
+EAPI=7
+
+DISTUTILS_USE_PEP517=no
+PYTHON_COMPAT=( pypy3 python3_{10..12} )
+
+inherit distutils-r1
+
+DESCRIPTION="A backend script to aid installing Python packages in Gentoo"
+HOMEPAGE="
+	https://pypi.org/project/gpep517/
+	https://github.com/projg2/gpep517/
+"
+SRC_URI="
+	https://github.com/projg2/gpep517/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+
+RDEPEND="
+	>=dev-python/installer-0.5.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/tomli-1.2.3[${PYTHON_USEDEP}]
+	' 3.{9..10})
+"
+
+distutils_enable_tests pytest
+
+python_install() {
+	python_domodule gpep517
+	python_newscript - gpep517 <<-EOF
+		#!${EPREFIX}/usr/bin/python
+		import sys
+		from gpep517.__main__ import main
+		sys.exit(main())
+	EOF
+}
diff --git a/dev-python/pydantic-core/Manifest b/dev-python/pydantic-core/Manifest
index eb2d89b25cda..0b39824e4ada 100644
--- a/dev-python/pydantic-core/Manifest
+++ b/dev-python/pydantic-core/Manifest
@@ -37,6 +37,7 @@ DIST pydantic_core-2.4.0.tar.gz 322367 BLAKE2B 199f023cb789f742c47f494c02a30a61f
 DIST pydantic_core-2.5.0.tar.gz 329533 BLAKE2B 54881511a5b84b22d7df5be6f7835361810daa7be4d5b73539b20ffc13825026ba5faef03e222fa12a584fa942141d833a3074c1676e1b9113c3aa0adf9aa66f SHA512 02eae124626d55b16b335a2364ae5b23dc9ee28e0dc84b201a01d9c8b7becdaf0d2fdb3f753e48deb11836c500e2a5a3b3a47df1e3f289d17df2b5613269029c
 DIST pydantic_core-2.6.0.tar.gz 334615 BLAKE2B 749ac2213f13c460460ebc45284e1356809907081ade1a3d8178769e4e83adb8ccf47a16f82b8df1fe169113a06154acbd5e604a9df0da9d9070e1c052f5b220 SHA512 9828dc8923c96e3c7716186106467483621e3bab8e5869401476e655edbf6beac4a5f43093b05b2d00054cd92827c2fffe905068d52bf9bcd4d1846fd8d9e626
 DIST pydantic_core-2.6.1.tar.gz 334288 BLAKE2B 663ccdc9adc52d12c1f060f62845a0b9a65b9c39c62e33cec0fc0f7d3b0a7342f80b4ce89f207962382fef3e30e2b0ace8e4ded4ff5e66b61280a182d5dd09fa SHA512 a6207e8e19540e5bdec5e555f7c93342af4810753c4e9a8846416f0badef9174e3907f02a1100b8a86f25d5c44e99142162d128a71037fdc45e2a6f6e4775a20
+DIST pydantic_core-2.6.3.tar.gz 337231 BLAKE2B 942a12228ad46d4b5365c781f8f7be28266c54e29bf5ab21e49ef31d25319d065c2f5f0bdc2ccca77888d38cfdea90fb2b415a0c203d8ae62825fb3ef618e1fb SHA512 5123fb55b002bc857ec03239163a5517709ea84430ac7b92d2027bdfbdba278d37caaa0d017d89af8e5306296667d7eb500bfc536a769d99c662b3fbb3835b63
 DIST pyo3-0.19.1.crate 418297 BLAKE2B 19ad6aa4fba175961b7fe97ae0bc45050f930859972b1b25cf0139bb3436c050ba76b63894f0df26174f141a52ac6abf10fd84c03c056af5a0665e723ae24195 SHA512 b27500cf49f1c6f217d21344d24ac96c07b82c157dd36fa4550b94059da5715ba7d0e085ec07dd5f8a8ac9de4d7e9239c1cceac4337294eb0dc9f6102049d5ff
 DIST pyo3-0.19.2.crate 418228 BLAKE2B ee018b33383fada78cd22643aea9231a8c8a2f19d1eb297f40eec9206c5220f322fff4c926d939a93a24ac6d231a207ebb25afcc0709191151c7ed9af7465efa SHA512 58698183e0f2f0507f8f765bf3e90185c933e78d62f0a9be65c4b1ce8eea19a98fe0341abe7c58cafdacb63a012ec417876dccb7be6facc1360fcb22796fcaf9
 DIST pyo3-build-config-0.19.1.crate 29205 BLAKE2B f88cbf9763fd68f7b30d109ae608efc29e0d4bf6672ee5f31b77342b5f37baa4f981916124af6897ccea3d93990ff889815fc3abbe9ce3fdbd860b6d5698b7da SHA512 311fef01ac2c3ce12485849cb99eba038a36260206308c5af4621fc5393f942e03aae4f6a5fe24ef3005eb781d2161453667ad552d6a371ddd96460b05a2e710
@@ -61,12 +62,15 @@ DIST scopeguard-1.1.0.crate 11470 BLAKE2B f774eb90b7d3ffb2efba47518e9d1dead4017a
 DIST serde-1.0.171.crate 77630 BLAKE2B 84b4377c78018a9d32a1a3841d26111f2db8b761f45376abaf0412ce456e0bbb39b287e460a8d99e217dcf0ce24a461488af85539ec127672767fee0b44aab7a SHA512 c8db09da8845e102e209276d5747a28d2e7b12ab5297d24156062c61c6ac8aaac8789d6e91a4f939d1f674375d8c3d3d1e372dd248baf63fece3740ea6f68bce
 DIST serde-1.0.175.crate 77599 BLAKE2B 0bd3b44f037c7a4beb59a7d73369f5255e83037dea37b3d1b3e0054666723ec04489937c5e820203b63f3c262c803b60769bbe780103fd4dce3128eface61597 SHA512 11d9812592d61105c86b943dc749104baf8723c1f1f4dbadb4cf5dbe2b053559d9453312ebb741ee7ef8555f0f187ed0cc4a235cb3ba0bd72fbc1ecf0ca861ea
 DIST serde-1.0.183.crate 77210 BLAKE2B 280e3d253a29b664b4e2d17f41397b17fe22af64417facca42d6ca0c839f1def745380a5402d7a87345bb16f4fdacf9a8c01966579b8c08fb06c05f097a87e68 SHA512 3a27efdff92cb1f6b50449a761efde781af91584b8410fbf5ce37b20005e7d46dc4c750fd1730e15468ea22aac7799421c4e60c74243c65ef7916d3cbadd0ef8
+DIST serde-1.0.185.crate 77337 BLAKE2B 602d8ce302f73327ce0dcfcdc5377408f4805be8a22ef93496fa31be512985188111c131b6dfaf110069ddbc45a9fdcdb8409d14689422fedcffa652e5a5000f SHA512 0c48d6ac7916104e108025c3ddf88a7e98b98ffaa98fcb7ff9eecbc4d3ed5930efbcb0de9e4072f795a3cbfa12aa5e17ee7eeeed948a7c99453c9a9d0c9985c3
 DIST serde_derive-1.0.171.crate 55183 BLAKE2B d60c2aefc4f7ef43bc5ba9b39c9d62d5a784aef205aae4c90c9fe402e872699ce7fb0d74f2c657cb6862459d1dcba39562a7f4a0915cbe3e2c45a9f649858983 SHA512 2561e5105c6fd6ab802ddc04dbb4392450c7eff6709f39ec8ae43ba73138944879330f9bb8de7a6cbef3507153a22007a69d6e27d0acc717889ac91ea195ef45
 DIST serde_derive-1.0.175.crate 379830 BLAKE2B 7366daddcd1200f888dcf5e5c80daa2ce57092235eb6bc55399b1d36d35aeea6b02d0328ccdc9c8e988ff6726a4a877125950adaabb305705eef90f5bbe62181 SHA512 c09b2125b3141ecb2e7376095b5cc83a3f6cae1c9c3a46e71c0326cdb722df2af24c221a2b9457ecab5bdb5393e9153066751882efc134852178a91a009c4858
 DIST serde_derive-1.0.183.crate 377265 BLAKE2B 041dff0dd5822b3be992cc65c8d789c86f8dda3a42ac77dc1a6c44cad4412c8c9fbb02f7572cc1ec4e4ca731d5f57a765d30f9357827ecf8210ae7f54c26d8f7 SHA512 c19cd2c9665b88b70a12b972c5b30d9ac6c604c77578bda5d7c6c5dbe01f097c1d6d165f1d73c204768427042b7521f43e40ee295c173e685c9ab1b4c23c8fcb
+DIST serde_derive-1.0.185.crate 55569 BLAKE2B 629304ece108ea3549d9ac2284c1432d10686481611e8aeaa1420c9bec32ecccfa3b2132b9192a9a5b49e927080bfc281a9223c94a4fdf068da6939bed4ed908 SHA512 11e61703dc71c9ebf2cbf371f70ff44911899ccf4b98379982250eefb6ad36516959f452939d67c894db5372dcf814f7cf508ae111b1fb56594235635e2fe4ff
 DIST serde_json-1.0.100.crate 145170 BLAKE2B 0a15476563643e2b9fa3a2416bf21ce0be62f05d7f483b566eff806c01e19ff82016ecbc970a636252798316f2fec40465ca85c74759cc83b23d147e05016f4e SHA512 182b0a2c77a7c06d0c88e629acd56b16e50bdecac2a066d2b6a3a2a41b50dd6bb147e943df7eb3e26c2b7a99f656f1af98e8c2a83d991c5356b46f3573b94b88
 DIST serde_json-1.0.103.crate 146095 BLAKE2B c10ccaef03dc4b0dfdc238e3d3b738faf43cd81cda1bcdc0296aae61a43260314ec03552ae14847bf88163d3c62d564ab563c55c8710f936b86f6f02dd7167ff SHA512 f63cd940426e6f40d999bb53d84122a2a8b87092b24262fd517f149983cde6715df818954baf7d2e7ebfb22d99b6f85042ea24e882b007888473d89c857a82cb
 DIST serde_json-1.0.104.crate 146130 BLAKE2B 62a613eba9c39bc3f007404995528ac101df3e74d90049e9aca699029f55ce4cee54a1bbfdd9e69cda9ab3e7ba9893fc66f3f9bbbc1eb358d570dd292ae77216 SHA512 06b2f3c818fa5819ff936d2f456fccded743ccc336359bfd1371aecebae9ca2d4f77879f61d1cda510b7a1aaa47b0010688b8e8c656388950e79fa5d007c7f6f
+DIST serde_json-1.0.105.crate 146316 BLAKE2B a40b99ac4b5e9aa31a61c4f49f9f4dd9fad94946267a47ac4ba7c1bf3af7122dc410c8984235281b19a917b1fea088615c8e95b4f1aead0957c9e31f2b222599 SHA512 d4203d93ee6e8ffa0d88c21d347196b8d1496d506841273e992c9996019175ed9a965e9401ba63d48589133b13ad9cac6246b7e0143545778b5a090a48a31452
 DIST smallvec-1.11.0.crate 34680 BLAKE2B e54d56f6bbffbfa7ce5fe5f04e325b2e5cf19d290e4be278bc00a136e26284625b9c18c7c2b10b7fb8fad0ea7e3770f3cdbcfbaa913f5ac08d0a2f8b4e0de188 SHA512 41bfbecbc2c244497568a41724d65791ec3fd6d8057813d521367cca316c09c2b28fb3973826236b01c1f5d2f905d8d22b0c3c47f957a9ff5d7685591f15ccd7
 DIST speedate-0.11.0.crate 30352 BLAKE2B c46e288116b98045206007a9f457fd9cbe93e8a51fc0a33a4cc0b47a05e25f0ab5ea7782c2c80f902a46fecc1d58dc4a642b1db8c6c2df7ac065c245fcd42039 SHA512 ce8654c3eda8565bd251aa6a2366a6c3a824ea07b3fc810d8df0bb3c66ec499ae9bb44fa240737ab09fde09ce92e1f81eafa006d41f4a7a324c60447b6faa813
 DIST speedate-0.12.0.crate 30792 BLAKE2B 2280dcc9396546b8c46a13451cbc290c38bed9d77ea8ef9e0b24b1cdc5d52c55dcbcc2ab7768b96854d47a9ceda6e1e119139c9b03df9018abfa16656ba481f3 SHA512 f9f75b9e8111a39922d8e2a525c559f1ae04620cce6c56e64e70f0458ada23d57ecc074ce6f510948cf88515e8bb34cc9b9ca8dcf941968fc1a666dfc9c384f7
@@ -102,4 +106,5 @@ EBUILD pydantic-core-2.4.0-r1.ebuild 3019 BLAKE2B 5c34a453aa26f3db7475422f1cfef8
 EBUILD pydantic-core-2.5.0-r1.ebuild 3060 BLAKE2B 8b80535ed4ec7dc08ca3db07b9c2d6e6f98a2ddf99c53ff37ba7c9d6cb6571257b775cf2964331c947afb1650cba709253e61a6fdcbca8a298ae96afca9dcabd SHA512 123242856633399ab26efa383fa1625cb9dbc0ed85d43f3e71ac5092062a37a7680f7a4fe5d12c754874836e41b2711277f66c9a8fb2d74ec53f6241f0b0e913
 EBUILD pydantic-core-2.6.0.ebuild 3073 BLAKE2B 6055e34b414ab03e02605bb1cb0ecfcde8737cecdcb0fb251dea25231061cabacf37ba5fcf3309198bd6f219a05d7073f593be453cad732cabd2ab8f3150c169 SHA512 f3d0bf0cd067bdf08aed21aed74dcf5ef6145e06c342be54ce6b9ee3bc29ea00a40b5aed8a7a0160adbaee0a0d90f1614d6b2833b9a04f9ea6ee39a7a478f571
 EBUILD pydantic-core-2.6.1.ebuild 2872 BLAKE2B 268cdf442fe5a7c953d7bc8e6977c5f4ede42540036e8f7e4858db08e1698e002d3e4eefd4ee8f43083e27906dd6b9b05d61422182d130ac056f08ea4bddc0a4 SHA512 fc1b8278af517ef55693425b779d9e5001bbef9de9a18d55cddcbea24d992dc5f9094c2c9874d0a0a7c56038edf20114680f3090ec2f9d66b8da948f0f6a70ea
+EBUILD pydantic-core-2.6.3.ebuild 2872 BLAKE2B cc25626fbc5de0e3dd975992e00d96272a628352d3a781aa2de514d959d24f5fa989f18ce8899dc9e5b2899d1f0fc4ab18e77f71effa35030f150ecba3e90a16 SHA512 4423f8fb5ce0222324c6d250fdcbcb1cb062b0fa93720f9f43c805e455e4e85be13770a6b49ebbb0127a08c25ac9ab2415e10d9cdf722fc05a02ccd851eb986e
 MISC metadata.xml 379 BLAKE2B ac0fa1abd0aac6436f234dfbfdb1517cdef2f7636c019a16257619d1a1a95a31b67061daa6606b47b68332d03bd213fa9bf67017b0e4af9733a26ab4828cf206 SHA512 7e3b5785628be025efc5360924e31a5a5becab941c9db255357b966dd5d3aca733e96485e92e78533bcde95379c59c36a601d4b407550c5ff1c649f09c3a21a6
diff --git a/dev-python/pydantic-core/pydantic-core-2.6.3.ebuild b/dev-python/pydantic-core/pydantic-core-2.6.3.ebuild
new file mode 100644
index 000000000000..d29b3cc03a08
--- /dev/null
+++ b/dev-python/pydantic-core/pydantic-core-2.6.3.ebuild
@@ -0,0 +1,137 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=maturin
+# pypy3 is waiting for new pyo3 release
+PYTHON_COMPAT=( python3_{10..12} )
+
+CRATES="
+	ahash@0.8.3
+	aho-corasick@1.0.2
+	autocfg@1.1.0
+	base64@0.21.2
+	bitflags@1.3.2
+	cc@1.0.79
+	cfg-if@1.0.0
+	enum_dispatch@0.3.12
+	equivalent@1.0.1
+	form_urlencoded@1.2.0
+	getrandom@0.2.10
+	hashbrown@0.14.0
+	heck@0.4.1
+	idna@0.4.0
+	indexmap@2.0.0
+	indoc@1.0.9
+	itoa@1.0.8
+	libc@0.2.147
+	lock_api@0.4.10
+	memchr@2.5.0
+	memoffset@0.9.0
+	num-bigint@0.4.3
+	num-integer@0.1.45
+	num-traits@0.2.15
+	once_cell@1.18.0
+	parking_lot@0.12.1
+	parking_lot_core@0.9.8
+	percent-encoding@2.3.0
+	proc-macro2@1.0.64
+	pyo3-build-config@0.19.2
+	pyo3-ffi@0.19.2
+	pyo3-macros-backend@0.19.2
+	pyo3-macros@0.19.2
+	pyo3@0.19.2
+	python3-dll-a@0.2.9
+	quote@1.0.29
+	redox_syscall@0.3.5
+	regex-automata@0.3.6
+	regex-syntax@0.7.4
+	regex@1.9.3
+	rustversion@1.0.13
+	ryu@1.0.14
+	scopeguard@1.1.0
+	serde@1.0.185
+	serde_derive@1.0.185
+	serde_json@1.0.105
+	smallvec@1.11.0
+	speedate@0.12.0
+	strum@0.25.0
+	strum_macros@0.25.2
+	syn@1.0.109
+	syn@2.0.28
+	target-lexicon@0.12.9
+	tinyvec@1.6.0
+	tinyvec_macros@0.1.1
+	unicode-bidi@0.3.13
+	unicode-ident@1.0.10
+	unicode-normalization@0.1.22
+	unindent@0.1.11
+	url@2.4.0
+	uuid@1.4.1
+	version_check@0.9.4
+	wasi@0.11.0+wasi-snapshot-preview1
+	windows-targets@0.48.1
+	windows_aarch64_gnullvm@0.48.0
+	windows_aarch64_msvc@0.48.0
+	windows_i686_gnu@0.48.0
+	windows_i686_msvc@0.48.0
+	windows_x86_64_gnu@0.48.0
+	windows_x86_64_gnullvm@0.48.0
+	windows_x86_64_msvc@0.48.0
+"
+
+inherit cargo distutils-r1 pypi
+
+DESCRIPTION="Core validation logic for pydantic written in Rust"
+HOMEPAGE="
+	https://github.com/pydantic/pydantic-core/
+	https://pypi.org/project/pydantic-core/
+"
+SRC_URI+="
+	${CARGO_CRATE_URIS}
+"
+
+LICENSE="MIT"
+# Dependent crate licenses
+LICENSE+="
+	Apache-2.0 Apache-2.0-with-LLVM-exceptions MIT Unicode-DFS-2016
+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/typing-extensions-4.7.1[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=virtual/rust-1.70.0
+	test? (
+		>=dev-python/dirty-equals-0.5.0[${PYTHON_USEDEP}]
+		>=dev-python/hypothesis-6.63.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-mock-3.10.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-timeout-2.1.0[${PYTHON_USEDEP}]
+		>=dev-python/pydantic-1.10.4[${PYTHON_USEDEP}]
+		>=dev-python/pytz-2022.7.1[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/pydantic_core/_pydantic_core.*.so"
+
+src_prepare() {
+	sed -i -e '/--benchmark/d' pyproject.toml || die
+	sed -i -e '/^strip/d' Cargo.toml || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_IGNORE=(
+		tests/benchmarks
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	rm -rf pydantic_core || die
+	epytest -p pytest_mock -p timeout
+}
diff --git a/dev-python/python-engineio/Manifest b/dev-python/python-engineio/Manifest
index a2cf87e9580e..2363c8ec82da 100644
--- a/dev-python/python-engineio/Manifest
+++ b/dev-python/python-engineio/Manifest
@@ -1,5 +1,7 @@
 DIST python-engineio-4.5.1.gh.tar.gz 309858 BLAKE2B 684bb4c32f050d52091c91312fa2cbe2ef1be133a797734de75f9c4b2c088e8f1b239260e62f189266cd72e4ff1203d63f1abca6887a34b498de43b6ceedefaf SHA512 c661e4691c8e14c547ed4de381b97470f0eead36783a299829e0a472022b508e45c6a131bb2c88bdf9542d59f8128a4640340514e20476ec8e7c7a4babbe3c68
 DIST python-engineio-4.6.0.gh.tar.gz 310597 BLAKE2B 7749e65f1f79bd21fb3f89dd541f3c306c780b2a98e8f0a8368b6fa7bf40738a5115f00f976f40914fcef9a94ef618e40b05993e6812630f46524d05c55b0eba SHA512 28efc25ff7eda98fa16e7c52effafc0789f18d947301479e5393e674e97826cd16bffe8554a8016c53587ac66b1f2cac90d2f64dfa9c1e2466f4324ee9880b1d
+DIST python-engineio-4.6.1.gh.tar.gz 310625 BLAKE2B 2247e926117ee659f7bd428df673b10c3655534b33d062eb33e7f400890062116f3edc82f66e6bd29817e61b314376b2227fbb513802c11a04c921a610f00063 SHA512 a423a048a09396d7a3c834056118bbd124a1313e8f63b16fa40ec51b6b8f247fbe7d540e1e5f4a8a103c14ff5b5e3f53686723f2cd70e26c3a59b6100bff336f
 EBUILD python-engineio-4.5.1.ebuild 1341 BLAKE2B 9eacb13b8f6737888970ba1f4f79a2cc6415ee6c77398fdf34bd1fae798bd0515a109ac4b80dae919b750a00ffb6113d3078fa7e5df7056b2ec0dd560b82e125 SHA512 44eb2027334d65d607556e6599e9f19685f0c797b5c73f399d3d9b456d44e3643b9d5af09e0a5f8e1bda8858e99618266784beb1f4985c10b3f98b27c2f0439e
 EBUILD python-engineio-4.6.0.ebuild 1341 BLAKE2B 59e136f2e751e8afe079f0faf724bcf09e2efd53fe5b62546417b1f7b47d1149ede503e947adb591417c38dfd303cf2a5c0c4d106864b8592289e1933420412a SHA512 59c9d2b0d33656850de400e91d70397f4302a471ff820317da8d4f53b5f403d14b92229c9d63539a9e4c6ce134b1f3db86ff0018b8bd0381241e38cf5bbc2d32
+EBUILD python-engineio-4.6.1.ebuild 1341 BLAKE2B 59e136f2e751e8afe079f0faf724bcf09e2efd53fe5b62546417b1f7b47d1149ede503e947adb591417c38dfd303cf2a5c0c4d106864b8592289e1933420412a SHA512 59c9d2b0d33656850de400e91d70397f4302a471ff820317da8d4f53b5f403d14b92229c9d63539a9e4c6ce134b1f3db86ff0018b8bd0381241e38cf5bbc2d32
 MISC metadata.xml 518 BLAKE2B 7325d24cc26b1a3b4e2dec04159cdd4ebcceaf0384fccbee11205f9c000b1e9f84f97c742a6181dbad419e2527c6f874bc3f89760daa6b6dd2feb9b1f874b515 SHA512 40fe9ac96224019d28206f75ae6249c75dbcb759918c03826af4f8a394586bd5df445ef475cd009e8af93ea5c7424abebbbfd65ac2e2eb7bdd9e8a29f2dcb34f
diff --git a/dev-python/python-engineio/python-engineio-4.6.1.ebuild b/dev-python/python-engineio/python-engineio-4.6.1.ebuild
new file mode 100644
index 000000000000..685f61efc6c4
--- /dev/null
+++ b/dev-python/python-engineio/python-engineio-4.6.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python implementation of the Engine.IO realtime server"
+HOMEPAGE="
+	https://python-engineio.readthedocs.io/
+	https://github.com/miguelgrinberg/python-engineio/
+	https://pypi.org/project/python-engineio/"
+SRC_URI="
+	https://github.com/miguelgrinberg/python-engineio/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/aiohttp[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/websocket-client[${PYTHON_USEDEP}]
+"
+# Can use eventlet, werkzeug, or gevent, but no tests for werkzeug
+BDEPEND="
+	test? (
+		dev-python/tornado[${PYTHON_USEDEP}]
+		dev-python/websockets[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs \
+	dev-python/alabaster
+
+EPYTEST_IGNORE=(
+	# eventlet is masked for removal
+	tests/common/test_async_eventlet.py
+)
+
+EPYTEST_DESELECT=(
+	# also eventlet
+	tests/common/test_server.py::TestServer::test_async_mode_eventlet
+	tests/common/test_server.py::TestServer::test_connect
+	tests/common/test_server.py::TestServer::test_service_task_started
+	tests/common/test_server.py::TestServer::test_upgrades
+)
diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz
index f7f8a8077c72..915cd6245eeb 100644
--- a/gnome-base/Manifest.gz
+++ b/gnome-base/Manifest.gz
diff --git a/gnome-base/gnome-control-center/Manifest b/gnome-base/gnome-control-center/Manifest
index 8f202d449a2b..06cc38d57e76 100644
--- a/gnome-base/gnome-control-center/Manifest
+++ b/gnome-base/gnome-control-center/Manifest
@@ -1,8 +1,11 @@
 DIST gnome-control-center-44.0-patchset.tar.xz 6004 BLAKE2B a647cd83fe5d2283edc341afaa6d55661b905fea740729cf21679c3593e5e339aec507b835fd57c11d1fdde8db338b57ff8e24f464bb1296ad7a5bd1fb7319c3 SHA512 85cdcf4d55028550cfd871285729d265f1f8b74ec46ad656ada122f511ec617a21c5927923e4000f3a2d7ca08f49aafc28cecbd4ab840db377fa2d4054997b6f
 DIST gnome-control-center-44.2.tar.xz 7634312 BLAKE2B 17eccb9cb59a2963dd29eea748aefc5ec0d1756ec61ba516600ee848c61d2e2d98a69b244b6caee614a43bb38ffed95c22cf0022f7ea695965f5acc57365e558 SHA512 cec7d7cf6d5bb91f6b6eedf5bc0f8f380ce6df706d631d880f89f84736cb1621f41696903eb05eb67a4c306d092f37aa45324d381b80e20f0f736c2486682da1
 DIST gnome-control-center-44.3.tar.xz 7634240 BLAKE2B edd9cdd0f2cccd628670020f58f4c56f90fe7264593f8546a4d98c46cd12a1d3618f92532b1afdbd405e1ac8921d69f4f02a91e68507e8c3cd6aa29637ec0f41 SHA512 4eb4b2bd0109acc4626d64eaf948dc2b0442602a8219a9be880472710c124d2b4dabbcc74aaab1192d6bef74ad2757e719efd81b5d09850f348bc925d6f60355
+DIST gnome-control-center-45.0-patchset.tar.xz 5888 BLAKE2B 7b7d818392e8758ca4d9247f55b84e4e8a37419859040e35d8fb3cef16f09423ad74a88a821a5f5947b3f36543ccc328f9a61cb71f92155b6a14669732569910 SHA512 e58adc6bb61d04f8c5ecf36335fedd190e063e42eed8e1023dcac95665a270d57c7cbd377fd0f5239f2c144040a9699b428536ffdbac798655b2c9aef25e71ae
+DIST gnome-control-center-45.beta.tar.xz 7696676 BLAKE2B 4f930ac42bab699485289561f16c315076fd3dbf4bdda15c6eb1551a4b040eba9cf7f0d6b9082424f53004bc902301368a4fe69fa4214052f12a84314134323f SHA512 cd669e6c0c6bfbbcda564be60cd6d3e8fb8924e1817dfb8c251e99e4041bb10f1a7ed47d173d3f52bf47635a9ed1a367cc74ddac16c9c5170785a05f03f377c8
 DIST gnome-control-center-gentoo-logo-dark.svg 14293 BLAKE2B 570e9326b8abe45849c31fd5cdb3fcfb1b2f18eac522f958928df5c3b747b0699f50a882f31cf7c0ae1f2138194f18596f738f42c942b57d340c53d46d82c551 SHA512 91227dafcf2091bb1568b0f9eec68b5e371ec64c9a6bc3605821f60d6bf2bd94dec0564f6a16a4a70d1db4d4df49fc25b6c910367bae3b85205cc609a9f2701b
 DIST gnome-control-center-gentoo-logo.svg 14288 BLAKE2B 371fc68b1015c8672db3e3858ae9077b1e3a9937e6add8690c39db36302ec031391c4d35e0c0b87094ca474a00c4187849e2d7111df34f43bc5bd7be52678527 SHA512 cf88933546de54ca15e2e830ac1086a78c4150f0ff59b8091e7e1cade5961c4e4cb83120a818a960b77841353ce3584ddc8f36b6edbde05543600283a143ad7b
 EBUILD gnome-control-center-44.2.ebuild 6852 BLAKE2B 0d02a0727af3b4f06fc8638128a8aa769e5db2b5cbf102dbdf57f9e18acaaeffa7fec9a02574d9ca7083e510569a4875471c5ebdc93116346b33c3245204c198 SHA512 2c8ff412b6e95b62b088b65a9d6f168ad511599cf22e8c91399f7a1cfff05967a6b35e0ccaab87875d8f9661097c90a71a45bb1c2343e57e98627caf508d4bef
 EBUILD gnome-control-center-44.3.ebuild 6862 BLAKE2B cde2922c72b1142c8e869a2b630300ed5cc7513e01e560cb6f8fb857ccacec20395cc9149dc48eefac4ded47ff2f2c7740bd84bcd1f70c53465baa1060e991df SHA512 fdaf3454187cb87ef40c93d6d5f4051909f6cf8cbbf0496716830c595fc6236cb931b4801f13071d6b16a4a72006dce32323b78e31869417dbd1ce13ad90e0a6
+EBUILD gnome-control-center-45_beta.ebuild 6802 BLAKE2B c893435c607140955d06ac5360f307a603ce40f3ab2bcd471b54878002d28d8a9967ca76686a333dd88557b0a806a2a91a8173e022c281b19954510d857d7a5d SHA512 4e069dbbb7673fdd0de19c790654ce660575d641a8f7b6309a7212a3e25c7a66fe9089487f124cbf51575c0795ce2197b97d63fcf5a5b63fc7ade334e362fa4f
 MISC metadata.xml 610 BLAKE2B 33cb646209b89a151b412f3a5be10b29cf85cde070e8a55b50f18417b02806763f940a1f56684ec8f494f9bd07258e9219b4dc2dc01ef6710aedc03bb609d42e SHA512 1d1fd521a3901c3601d3bd4ab78ac95c44d058fc0de2506df38c5ad8ba5156ff04c4b112b7a801a13f5ed9c37243c64629cf7038ca156196fa5f3229606a1f9c
diff --git a/gnome-base/gnome-control-center/gnome-control-center-45_beta.ebuild b/gnome-base/gnome-control-center/gnome-control-center-45_beta.ebuild
new file mode 100644
index 000000000000..2b2968ccfe47
--- /dev/null
+++ b/gnome-base/gnome-control-center/gnome-control-center-45_beta.ebuild
@@ -0,0 +1,203 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit gnome.org gnome2-utils meson python-any-r1 virtualx xdg
+
+DESCRIPTION="GNOME's main interface to configure various aspects of the desktop"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-control-center"
+SRC_URI+=" https://dev.gentoo.org/~mattst88/distfiles/${PN}-45.0-patchset.tar.xz"
+SRC_URI+=" https://dev.gentoo.org/~mattst88/distfiles/${PN}-gentoo-logo.svg"
+SRC_URI+=" https://dev.gentoo.org/~mattst88/distfiles/${PN}-gentoo-logo-dark.svg"
+# Logo is CC-BY-SA-2.5
+LICENSE="GPL-2+ CC-BY-SA-2.5"
+SLOT="2"
+IUSE="+bluetooth +cups debug elogind +gnome-online-accounts +ibus input_devices_wacom kerberos networkmanager systemd test wayland"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="
+	^^ ( elogind systemd )
+" # Theoretically "?? ( elogind systemd )" is fine too, lacking some functionality at runtime, but needs testing if handled gracefully enough
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+
+# meson.build depends on python unconditionally
+BDEPEND="${PYTHON_DEPS}"
+
+# kerberos unfortunately means mit-krb5; build fails with heimdal
+# display panel requires colord and gnome-settings-daemon[colord]
+# wacom panel requires gsd-enums.h from gsd at build time, probably also runtime support
+# printer panel requires cups and smbclient (the latter is not patched yet to be separately optional)
+# First block is toplevel meson.build deps in order of occurrence (plus deeper deps if in same conditional). Second block is dependency() from subdir meson.builds, sorted by directory name occurrence order
+DEPEND="
+	gnome-online-accounts? (
+		x11-libs/gtk+:3
+		>=net-libs/gnome-online-accounts-3.25.3:=
+	)
+	>=media-libs/libpulse-2.0[glib]
+	>=gui-libs/gtk-4.11.2:4[X,wayland=]
+	>=gui-libs/libadwaita-1.4_alpha:1
+	>=sys-apps/accountsservice-0.6.39
+	>=x11-misc/colord-0.1.34:0=
+	>=x11-libs/gdk-pixbuf-2.23.0:2
+	>=dev-libs/glib-2.75.0:2
+	gnome-base/gnome-desktop:4=
+	>=gnome-base/gnome-settings-daemon-41.0[colord,input_devices_wacom?]
+	>=gnome-base/gsettings-desktop-schemas-42_alpha
+	dev-libs/libxml2:2
+	>=sys-power/upower-0.99.8:=
+	>=dev-libs/libgudev-232
+	>=x11-libs/libX11-1.8
+	>=x11-libs/libXi-1.2
+	media-libs/libepoxy
+	app-crypt/gcr:0=
+	>=dev-libs/libpwquality-1.2.2
+	>=sys-auth/polkit-0.114
+	cups? (
+		>=net-print/cups-1.7[dbus]
+		>=net-fs/samba-4.0.0[client]
+	)
+	ibus? ( >=app-i18n/ibus-1.5.2 )
+	networkmanager? (
+		>=net-libs/libnma-1.10.2
+		>=net-misc/networkmanager-1.24.0[modemmanager]
+		>=net-misc/modemmanager-0.7.990:=
+	)
+	bluetooth? ( net-wireless/gnome-bluetooth:3= )
+	input_devices_wacom? ( >=dev-libs/libwacom-0.27:= )
+	kerberos? ( app-crypt/mit-krb5 )
+
+	x11-libs/cairo[glib]
+	>=x11-libs/colord-gtk-0.3.0:=
+	media-libs/fontconfig
+	gnome-base/libgtop:2=
+	>=sys-fs/udisks-2.1.8:2
+	app-crypt/libsecret
+	net-libs/gnutls:=
+	media-libs/gsound
+
+	x11-libs/pango
+"
+# media-libs/libcanberra[pulseaudio,sound] needed for Speaker tests in
+# Settings/Sound/Output/Output Device, bug #814110
+# systemd/elogind USE flagged because package manager will potentially try to satisfy a
+# "|| ( systemd ( elogind openrc-settingsd)" via systemd if openrc-settingsd isn't already installed.
+# gnome-color-manager needed for gcm-calibrate and gcm-viewer calls from color panel
+# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
+#
+# mouse panel needs a concrete set of X11 drivers at runtime, bug #580474
+# Also we need newer driver versions to allow wacom and libinput drivers to
+# not collide
+#
+# system-config-printer provides org.fedoraproject.Config.Printing service and interface
+# cups-pk-helper provides org.opensuse.cupspkhelper.mechanism.all-edit policykit helper policy
+RDEPEND="${DEPEND}
+	media-libs/libcanberra[pulseaudio,sound]
+	systemd? ( >=sys-apps/systemd-31 )
+	elogind? (
+		app-admin/openrc-settingsd
+		sys-auth/elogind
+	)
+	x11-themes/adwaita-icon-theme
+	>=gnome-extra/gnome-color-manager-3.1.2
+	cups? (
+		app-admin/system-config-printer
+		net-print/cups-pk-helper
+	)
+	gnome-extra/tecla
+	wayland? ( dev-libs/libinput )
+	!wayland? (
+		>=x11-drivers/xf86-input-libinput-0.19.0
+		input_devices_wacom? ( >=x11-drivers/xf86-input-wacom-0.33.0 )
+	)
+"
+# PDEPEND to avoid circular dependency; gnome-session-check-accelerated called by info panel
+# gnome-session-2.91.6-r1 also needed so that 10-user-dirs-update is run at login
+PDEPEND=">=gnome-base/gnome-session-2.91.6-r1
+	networkmanager? ( gnome-extra/nm-applet )" # networking panel can call into nm-connection-editor
+
+BDEPEND="
+	dev-libs/libxslt
+	app-text/docbook-xsl-stylesheets
+	app-text/docbook-xml-dtd:4.2
+	x11-base/xorg-proto
+	dev-libs/libxml2:2
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	test? (
+		$(python_gen_any_dep '
+			dev-python/python-dbusmock[${PYTHON_USEDEP}]
+		')
+		x11-apps/setxkbmap
+	)
+"
+
+PATCHES=(
+	# Patches from gnome-43 branch
+	# Makes some panels and dependencies optional
+	# https://bugzilla.gnome.org/686840, 697478, 700145
+	# Fix some absolute paths to be appropriate for Gentoo
+	"${WORKDIR}"/patches/
+)
+
+python_check_deps() {
+	use test || return 0
+	python_has_version "dev-python/python-dbusmock[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	xdg_environment_reset
+	# Mark python tests with shebang executable, so that meson will launch them directly, instead
+	# of via its own python-single-r1 version, which might not match what we get from python_check_deps
+	chmod a+x tests/network/test-network-panel.py tests/datetime/test-datetime.py || die
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use bluetooth)
+		-Dcups=$(usex cups enabled disabled)
+		-Ddocumentation=true # manpage
+		-Dgoa=$(usex gnome-online-accounts enabled disabled)
+		$(meson_use ibus)
+		-Dkerberos=$(usex kerberos enabled disabled)
+		$(meson_use networkmanager network_manager)
+		-Dprivileged_group=wheel
+		-Dsnap=false
+		$(meson_use test tests)
+		$(meson_use input_devices_wacom wacom)
+		#$(meson_use wayland) # doesn't do anything in 3.34 and 3.36 due to unified gudev handling code
+		# bashcompletions installed to $datadir/bash-completion/completions by v3.28.2, which is the same as $(get_bashcompdir)
+		-Dmalcontent=false # unpackaged
+		-Ddistributor_logo=/usr/share/pixmaps/gnome-control-center-gentoo-logo.svg
+		-Ddark_mode_distributor_logo=/usr/share/pixmaps/gnome-control-center-gentoo-logo-dark.svg
+	)
+	meson_src_configure
+}
+
+src_test() {
+	virtx meson_src_test
+}
+
+src_install() {
+	meson_src_install
+	insinto /usr/share/pixmaps
+	doins "${DISTDIR}"/gnome-control-center-gentoo-logo.svg
+	doins "${DISTDIR}"/gnome-control-center-gentoo-logo-dark.svg
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index 8d1b4708c811..7863f14779b7 100644
--- a/gnome-extra/Manifest.gz
+++ b/gnome-extra/Manifest.gz
diff --git a/gnome-extra/gnome-shell-extension-alphabetical-grid/Manifest b/gnome-extra/gnome-shell-extension-alphabetical-grid/Manifest
index 13a80c982dbb..a776bb984981 100644
--- a/gnome-extra/gnome-shell-extension-alphabetical-grid/Manifest
+++ b/gnome-extra/gnome-shell-extension-alphabetical-grid/Manifest
@@ -1,5 +1,5 @@
-DIST gnome-shell-extension-alphabetical-grid-29.0.tar.gz 213643 BLAKE2B f4e0244f41ec426f5c2189ccfb32144c419d10d22ea477b102d60defd203cc80cb5272aaeedcc5fd3e554341a51aa9ed0e829e38a2c6977daaf82f954fd6a073 SHA512 a4417637d719cc2d35fca80b3621e8bd6e965ed87890105f611d69ae4b901c25080c64599ceac3518dafedd0fb240989b447b643bb88fc2164463371eb0c98f2
 DIST gnome-shell-extension-alphabetical-grid-31.0.tar.gz 214302 BLAKE2B 16dcfdbd39e6e29f388af7a17e90069f9aa9aa22d03c22ab461053539686097d27238d6c4d5077e5cb7160bf15ed5717e132d34ba9407993af39e008b9b35efe SHA512 4639619ca43bacdc3c1658ac8fe4689ffed680c91b61f00ca2ba5ac929f246dd8726d88f628a0ebbe0fc85a616e7219d54c351e5f2773e765eb3ace6a3823944
-EBUILD gnome-shell-extension-alphabetical-grid-29.0.ebuild 1385 BLAKE2B 2a0ce88f49f8789e4a656b03ada3e9ad943f178f8c6472f9811f07f256dcfa312be4b1c647cda373b92ef804d8efa4b2c7d2ae006bdcab3ddc6b38d4f14f2b3a SHA512 c0092922a198c41d4535b5e74c43a7398ebd76bfc9db1a8492989cfae2e52ddd8640eb28b0387dde0ef2bc226d43de7d259f764eb46dcfe22445c3df13c62b57
+DIST gnome-shell-extension-alphabetical-grid-32.0.tar.gz 214580 BLAKE2B b3fd0be85c5f74240f25a96b041df6ca0e3cf02b2b025eb2ffa5f1e3ed9f9562dac3ee37b7a32a548b3a8054ad8728a9d93c9bd84d771eadb0c9d56b2366cd97 SHA512 8ac96bea822df28cd980179a19d3f7acb8a950b3f1e41e650ff2982cb3b657434a0eb49357ebd206b68de102bb3c89b823f16cbcd379e7807598b923e5a64c6c
 EBUILD gnome-shell-extension-alphabetical-grid-31.0.ebuild 1385 BLAKE2B 2a0ce88f49f8789e4a656b03ada3e9ad943f178f8c6472f9811f07f256dcfa312be4b1c647cda373b92ef804d8efa4b2c7d2ae006bdcab3ddc6b38d4f14f2b3a SHA512 c0092922a198c41d4535b5e74c43a7398ebd76bfc9db1a8492989cfae2e52ddd8640eb28b0387dde0ef2bc226d43de7d259f764eb46dcfe22445c3df13c62b57
+EBUILD gnome-shell-extension-alphabetical-grid-32.0.ebuild 1387 BLAKE2B f698189a2f768be728d300f25bf7f46507ed11341778c8e3896bbf41751bcf0fef86239dd7e72465113d24ba69ae29e3753bc63dec261df948ec014984e65052 SHA512 3f4ac8c83b354f82c92093bde8162cb9741c638336e7ab8b43d25d955b24a4dfaa59cbe0f22cb0de12c2e2d0f9ab13516936f15d5e32fa10964557376b37c40d
 MISC metadata.xml 348 BLAKE2B 303e8d4a9a60f5ba180599657f84e5461ea5ee6f568c5d9141f7b25380dca38571dda9d2c62d35224ffc355e550e619d51c000ed072f829de9450d8792aa5676 SHA512 41ff2daf09ad93d37977304a55984cf96ed18ea825e59a9ebf88377700b7e6b7f67d948c88c68e74fe034e46700ab6de7c487aa72d7a6652213981a733af5b7a
diff --git a/gnome-extra/gnome-shell-extension-alphabetical-grid/gnome-shell-extension-alphabetical-grid-29.0.ebuild b/gnome-extra/gnome-shell-extension-alphabetical-grid/gnome-shell-extension-alphabetical-grid-32.0.ebuild
index 76a35b86c273..60d548d52ade 100644
--- a/gnome-extra/gnome-shell-extension-alphabetical-grid/gnome-shell-extension-alphabetical-grid-29.0.ebuild
+++ b/gnome-extra/gnome-shell-extension-alphabetical-grid/gnome-shell-extension-alphabetical-grid-32.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/stuarthayhurst/alphabetical-grid-extension/archive/r
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/gnome-extra/gnome-shell-extension-desktop-icons-ng/Manifest b/gnome-extra/gnome-shell-extension-desktop-icons-ng/Manifest
index ad53aeac5297..b51d3e6b98a9 100644
--- a/gnome-extra/gnome-shell-extension-desktop-icons-ng/Manifest
+++ b/gnome-extra/gnome-shell-extension-desktop-icons-ng/Manifest
@@ -1,6 +1,5 @@
-AUX gnome-shell-extension-desktop-icons-ng-47.0.2-gnome44.patch 2620 BLAKE2B adb6c604df20f6730eefc5898f651c6d1f6b3c2b70014b83e6a067b79187525f36ce1d9ca1cd36721914e86fc710a212abc117750c725d6939610660f5572e4d SHA512 78a7c989788766ac3245496b1c66356747f0cb04a7db5b67738caa9afcda56c2daa6d388ff03238bd6392cfde120ec540f1aa370e1460eaf0517932dcb06b985
-DIST gnome-shell-extension-desktop-icons-ng-47.0.2.tar.bz2 149883 BLAKE2B 9097ea9489ea220297082e487bd846dfe0b7d2188fc878bb4927e92ddc8aabe21ee2b4acfad91b95694713b90c3c99c82eae2f184bd985228cbe2f7f5c61aaf7 SHA512 220a2c4337f47d196d81cb21df80e1d5cd34778f3f14cf33f51baeb6156309244977acb9d5981e588ed68060b7c47c2d567f6ba5f835c2af4a537bd70a87daa2
 DIST gnome-shell-extension-desktop-icons-ng-47.0.3.tar.bz2 151631 BLAKE2B 652e41eff5f8ada6bd2f6ebf49fd4db08bcab6d48af0e42e789a52050049708596fd534b9a32906cab2e4a8ccd283cc88ea318b4f7f58b1ef5bfd638399d92cf SHA512 0d48e442efc9ea2c461ec846a38c06ea906f6c3c710c221af693a9819efecc8859c86116f13172caba0083f4fcb9015c2957587e3a2a6f531d1e8f414c5dcb47
-EBUILD gnome-shell-extension-desktop-icons-ng-47.0.2-r1.ebuild 1037 BLAKE2B 64a39a8ce0e7c4db0d029b22338c7a75357223906a286cb12c0c39867fd9d89e786b81b58e03c94fa05e5cf038188b0bf0f3523b4a94368c098515d2fda2720e SHA512 822cdc94032b875214ad17bea45979eba1aa9ec6c83ca3055ec8ae44d099110ec0fbe6394e42035000c019e41f5092cc05706748f076afcbf187766a4b817d28
+DIST gnome-shell-extension-desktop-icons-ng-47.0.4.tar.bz2 152300 BLAKE2B ddc07a03316ea4483e90253009576a8a0398a682545325b4adfd48d1b0a271bebf481d7223acd28909c91797bb7d0153d02871b6265f1f4f64a49d60dc5a4766 SHA512 83b24b2c4a849b7778865c8dca8707334937377816b931932ac1b775ddbef6c613e4a73d38a3869ec782d968722405414dfdf3d768a23dcbbf11f502024b9f81
 EBUILD gnome-shell-extension-desktop-icons-ng-47.0.3.ebuild 990 BLAKE2B a64b55d8116cc6127a6168c39035411a1d8930d8207cdc3a2a3a4accbd4bc412b75ae4e6f0e6cae1029c90dfb7d03f63d2b0b9d73b3b7a35309c2ab5f50bf497 SHA512 be536e007c2fc0237bf2e68a814535b50ad5808fd1ca5efe35605cfbd744f33e6bdd65514908b98acf5c539e7ab79c9a8e8638eaae8b2f391080510c36a2fd52
+EBUILD gnome-shell-extension-desktop-icons-ng-47.0.4.ebuild 992 BLAKE2B d1c21075d6e7531f4d93077fb6cc5bd4410eb58f7504a678a46c98558816f07fa9bdb3f0c163111805b59e323cd0f68cd4530b28a6c9f8644eb9b3d094923c8a SHA512 7592ca64fb1b3e612b14249e52b335b85112466c148d3b1259339c1febec34abaaaf4361ee8529b4cdfb3b96af6686414ca27d85446f69becb86655195137374
 MISC metadata.xml 333 BLAKE2B 3bc225ba5cd8ccbe497b7f1494e7ee2ebb8d43a59756dfbc5a6152a1fdb0027f02e1057f6b1bfa6fe8d97b4a2583611b45e0d27bfb37a1a5563246d411eb057d SHA512 f835b8b301a79f5bc650c75cfc0c52eb0ddba2266c04c559f2651fa429d1747af98ea0b8e7775ff3df6d5d8b7ee545f22a89d092138fc91e19fcd0d5e325f315
diff --git a/gnome-extra/gnome-shell-extension-desktop-icons-ng/files/gnome-shell-extension-desktop-icons-ng-47.0.2-gnome44.patch b/gnome-extra/gnome-shell-extension-desktop-icons-ng/files/gnome-shell-extension-desktop-icons-ng-47.0.2-gnome44.patch
deleted file mode 100644
index 1dcce817e484..000000000000
--- a/gnome-extra/gnome-shell-extension-desktop-icons-ng/files/gnome-shell-extension-desktop-icons-ng-47.0.2-gnome44.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 6a2787f5500c50162933de88d09bc20e7b0718b9 Mon Sep 17 00:00:00 2001
-From: Daniel van Vugt <daniel.van.vugt@canonical.com>
-Date: Fri, 3 Feb 2023 15:20:52 +0800
-Subject: [PATCH 1/2] extension: Attempt Mutter 44 API if the old one fails
-
-There is no other way to detect this nicely. The API changed in
-Mutter 44 but the shell version is still advertised as 43.1 at time of
-writing, and there are no new exports we can look for in the offending
-mutter commit. So just try both APIs.
-
-Fixes: https://launchpad.net/bugs/2004623
----
- extension.js | 10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/extension.js b/extension.js
-index 138ba4ca..db3f13a6 100644
---- a/extension.js
-+++ b/extension.js
-@@ -19,6 +19,7 @@
- const GLib = imports.gi.GLib;
- const Gio = imports.gi.Gio;
- const Meta = imports.gi.Meta;
-+const Shell = imports.gi.Shell;
- const St = imports.gi.St;
- 
- const Main = imports.ui.main;
-@@ -489,7 +490,14 @@ var LaunchSubprocess = class {
-         this.cancellable = new Gio.Cancellable();
-         this._launcher = new Gio.SubprocessLauncher({flags: flags | Gio.SubprocessFlags.STDOUT_PIPE | Gio.SubprocessFlags.STDERR_MERGE});
-         if (Meta.is_wayland_compositor()) {
--            this._waylandClient = Meta.WaylandClient.new(this._launcher);
-+            try {
-+                this._waylandClient = Meta.WaylandClient.new(this._launcher);
-+            } catch (e) {
-+                let context = Shell.Global.get().context;
-+                this._waylandClient = Meta.WaylandClient.new(context,
-+                                                             this._launcher);
-+            }
-+
-             if (Config.PACKAGE_VERSION == '3.38.0') {
-                 // workaround for bug in 3.38.0
-                 this._launcher.ref();
--- 
-GitLab
-
-
-From 5671fea5ab89e2b79b22a11cc1ca936e6fb85505 Mon Sep 17 00:00:00 2001
-From: Daniel van Vugt <daniel.van.vugt@canonical.com>
-Date: Fri, 3 Feb 2023 15:24:00 +0800
-Subject: [PATCH 2/2] metadata: When GNOME 44 comes, we're ready.
-
----
- metadata.json | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/metadata.json b/metadata.json
-index ffd85e4e..32eac471 100644
---- a/metadata.json
-+++ b/metadata.json
-@@ -1,7 +1,7 @@
- {
-     "description": "Adds icons to the desktop. Fork of the original Desktop Icons extension, with several enhancements .",
-     "name": "Desktop Icons NG (DING)",
--    "shell-version": ["3.38", "40", "41", "42", "43"],
-+    "shell-version": ["3.38", "40", "41", "42", "43", "44"],
-     "uuid": "ding@rastersoft.com",
-     "url": "https://gitlab.com/rastersoft/desktop-icons-ng"
- }
--- 
-GitLab
-
diff --git a/gnome-extra/gnome-shell-extension-desktop-icons-ng/gnome-shell-extension-desktop-icons-ng-47.0.2-r1.ebuild b/gnome-extra/gnome-shell-extension-desktop-icons-ng/gnome-shell-extension-desktop-icons-ng-47.0.4.ebuild
index b95780088fc7..60a6ba4b998c 100644
--- a/gnome-extra/gnome-shell-extension-desktop-icons-ng/gnome-shell-extension-desktop-icons-ng-47.0.2-r1.ebuild
+++ b/gnome-extra/gnome-shell-extension-desktop-icons-ng/gnome-shell-extension-desktop-icons-ng-47.0.4.ebuild
@@ -6,7 +6,7 @@ inherit gnome2-utils meson
 
 MY_PN="desktop-icons-ng"
 MY_P="${MY_PN}-${PV}"
-COMMIT="9c2f2bc688e9c95335c64f1b3a6ad0cc2051d7b4"
+COMMIT="3fe71de83a0a6e11d3f14bf5f61aa4e757def461"
 
 DESCRIPTION="Fork from the desktop-icons project, with several enhancements like Drag'n'Drop"
 HOMEPAGE="https://gitlab.com/rastersoft/desktop-icons-ng"
@@ -14,7 +14,7 @@ SRC_URI="https://gitlab.com/rastersoft/desktop-icons-ng/-/archive/${PV}/${P}.tar
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 COMMON_DEPEND="dev-libs/glib:2"
@@ -28,10 +28,6 @@ BDEPEND=""
 
 S="${WORKDIR}/${MY_P}-${COMMIT}"
 
-PATCHES=(
-	"${FILESDIR}/${P}-gnome44.patch"
-)
-
 pkg_preinst() {
 	gnome2_schemas_savelist
 }
diff --git a/gnome-extra/tecla/Manifest b/gnome-extra/tecla/Manifest
new file mode 100644
index 000000000000..ffe9b80bf852
--- /dev/null
+++ b/gnome-extra/tecla/Manifest
@@ -0,0 +1,3 @@
+DIST tecla-45.beta.tar.xz 33464 BLAKE2B 1f33da97c39be682f5f03e991f3d83e41194b17761bbbb6a27ce026de4eb481c6b2f577a0b7b6c3858fef1544498b98bc50c6a4ea02e266c4edc15555571c738 SHA512 93acf3fe93001be51638743dc85686d07abc9e0a138efbcbd39a0d2ae360b9e1dafbbd7c4b101e3b0141d18710b5557cf60438e2220cc7420699d8151542e989
+EBUILD tecla-45_beta.ebuild 601 BLAKE2B 2bddfecb2552d68e483c07a503de916f0ffa5e5ea345e364ae525e518fde960a16dad9f772cc92a0ab6118fe312486d6b4efe5b61e3589754fc7048d40b79e5c SHA512 16b6bb59381b65a4f8919d1b883dc51e9eac8c190c9219a7ecfe38db16c8f553beb53633eda8f28f8ed25043cc5dba22b1bf055b8c025d9f351436912b0b4b3c
+MISC metadata.xml 346 BLAKE2B fa760e90b8a38d74a9d32816099e79021de8046e9c211d92b8c46b5e7bb9492766491aa0d3beac5d68ad2cb08ac8a5451ae0ba216ee70fe25d4d3cd499a7f949 SHA512 d47e807b25422f17241a517ad8bb372ca15a38cad6144a1ed7330ec847cc074780b40d7708d09e2d3741de7d6c3bc94e9cb5c7a342d6c9932465c1a615311137
diff --git a/gnome-extra/tecla/metadata.xml b/gnome-extra/tecla/metadata.xml
new file mode 100644
index 000000000000..52b3a9b7da61
--- /dev/null
+++ b/gnome-extra/tecla/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="gnome-gitlab">GNOME/tecla</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/gnome-extra/tecla/tecla-45_beta.ebuild b/gnome-extra/tecla/tecla-45_beta.ebuild
new file mode 100644
index 000000000000..5cfd87a92364
--- /dev/null
+++ b/gnome-extra/tecla/tecla-45_beta.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org gnome2-utils meson xdg
+
+DESCRIPTION="Tecla is a keyboard layout viewer"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/tecla"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	gui-libs/gtk:4[introspection]
+	>=gui-libs/libadwaita-1.4_alpha:1
+	x11-libs/libxkbcommon
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-libs/glib
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/gui-apps/Manifest.gz b/gui-apps/Manifest.gz
index 83954a49212c..21e3b29157be 100644
--- a/gui-apps/Manifest.gz
+++ b/gui-apps/Manifest.gz
diff --git a/gui-apps/grim/Manifest b/gui-apps/grim/Manifest
index d9eceabde50c..b73c60b3085d 100644
--- a/gui-apps/grim/Manifest
+++ b/gui-apps/grim/Manifest
@@ -1,6 +1,6 @@
 DIST grim-1.4.0.tar.gz 18287 BLAKE2B 72606de01624c98876fe1018877a3cf0b25b44ac4bd6a053f82c40ad1ea2c6c0e510cbb6a0bce988f14607ea162dda1d8350b9f30b0f2b9acd8f8e20ba50bc99 SHA512 d0b33528a00528b3ef7488a0984cde5034de4f5a211eb5c8d3299aea356d9348c5d02d08171802bc0315afb19d2446f5f132ea9dca0579ace803b7d5d90a89cc
 DIST grim-1.4.1.tar.gz 18372 BLAKE2B cfb432205c9ef47bc292e995c0095f2df492bf0eae63556baa3c1f8a845171f71c5b632c78394b7fad02ac6508d266ea43f912f9cbb75bb786df91c4d38df1e9 SHA512 e6f5e540a4e70467971b932c4a36bda88742de360925cf1bb1908823f76ac295c8ef5ec953fcdeb083c39b13a8cd24a01d4739ae4cc37e106b60956266eeef22
 EBUILD grim-1.4.0-r3.ebuild 1099 BLAKE2B 2dfe8d79bf4373a80627a375367ef78b13ce1cd0f43e953a7a2067cfd2cf38510cd188199cc7f0418ec687c96a4a8031da4bf875847e54fc2ac11f73b4b32c05 SHA512 ade407fd07feb9a45065d059a1b0f4cb0363762a643057cb4f6b06e1a03312d7eadce4466b8872d1e78b2f14e45252aa20d38de080fefb0cc90d9639a80993a9
-EBUILD grim-1.4.1.ebuild 1131 BLAKE2B 5fff9872b0028f03b22d907c0dca6c4ec80f00124432222519bb61c6c96e8bbd3d62ef429d475eb70286c68a9c4db908f25c949c74166687dddadb1263bb3198 SHA512 bd8c87545e2b8752f4b96c739dd18108f7ff0d7a53d1b18b7dcefb2a8eeca9dc5feea6067a1a2dca667c18c7ce03eb8c46f524bee1682f5dd0a289688a2795a3
+EBUILD grim-1.4.1.ebuild 1128 BLAKE2B 5c1b28d3bb46a6f529c470c7f29e88de07fc9a1f2102481864980dc5859cfe36ccc72e6361608dae2be5218f7126c2a4ef7f6b6bf8ea3418cf3659bdc258fa10 SHA512 cd8700d1a25c8ff63c4dd7d1f6e97b2924dadba918bf7088d625a7fe248c7b35cd0270a1bd107fae9f3668d6f7762b2a00e822c1ff5d7d885e99a3dff9001788
 EBUILD grim-9999.ebuild 1131 BLAKE2B 5fff9872b0028f03b22d907c0dca6c4ec80f00124432222519bb61c6c96e8bbd3d62ef429d475eb70286c68a9c4db908f25c949c74166687dddadb1263bb3198 SHA512 bd8c87545e2b8752f4b96c739dd18108f7ff0d7a53d1b18b7dcefb2a8eeca9dc5feea6067a1a2dca667c18c7ce03eb8c46f524bee1682f5dd0a289688a2795a3
 MISC metadata.xml 514 BLAKE2B 48be3679b17a0e46ac29453d7eba0886ce6f31cf47a25c7ea2d9a810792478401f9493fbac7e1c0fbf6e246d67ab80bed4c7c936c0eae7a1536614c58dee6294 SHA512 5064c4a13c8168a5691d19dfeb281847b33899822169b13523d48842fb9eedbea28341725769933ba15a830c1d2acd8f399de99a58ad4f6dacc9d5dad53fb05c
diff --git a/gui-apps/grim/grim-1.4.1.ebuild b/gui-apps/grim/grim-1.4.1.ebuild
index a2ae2ffd137c..1686c7fba58f 100644
--- a/gui-apps/grim/grim-1.4.1.ebuild
+++ b/gui-apps/grim/grim-1.4.1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	SRC_URI="https://git.sr.ht/~emersion/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${PN}-v${PV}"
-	KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv x86"
 fi
 
 LICENSE="MIT"
diff --git a/mail-mta/Manifest.gz b/mail-mta/Manifest.gz
index 7607adc13f28..b375a8142c34 100644
--- a/mail-mta/Manifest.gz
+++ b/mail-mta/Manifest.gz
diff --git a/mail-mta/courier/Manifest b/mail-mta/courier/Manifest
index 7edb277ecdb5..d9d7596b4846 100644
--- a/mail-mta/courier/Manifest
+++ b/mail-mta/courier/Manifest
@@ -1,5 +1,4 @@
 AUX apache-sqwebmail.inc 347 BLAKE2B e77a680065e064c300d01ec21db524f3a440623b685ecd870607b563ebbaaf1106091074e55346743877cfa44d425c29592ec3f60dedf8c7e2b6355cdc84e558 SHA512 e3f8f4f01563184ec4afc98d61ab739d5900f7d8757638fb06ff21ca3604f8c6f708730af514f6ca662559980503dee5955ba48c5a643e473054f3eec49b89a0
-AUX courier-1.2.2-fix-getgrnam-buffer.diff 2468 BLAKE2B ba01b7a98aad1df059ab8135a94fbbfdb10ae9196ddf3985ce41a365946e5a0ec25f4e4d932cf1b76ecd971e3e17837d02f7f86e957192888b44668dbf0ff948 SHA512 7ce3ef8c3db636370b60ac04c18390fef9b9d0702e99aaf82b7d899e07fe23c47cea2cde26e22270db7788de70508d0686b0df02311987388d0f59969f094331
 AUX courier-init-r4 4965 BLAKE2B 09f29543599abfb6dd5df058f832e979bde471be3f9d293d975fdfc28787e8622ddab797c9d51fa89207fbc1a1ee23fb82471617366bf1467d1e7f2d7d3f2bcc SHA512 ca5e12bfa4fe2166cd2c1ef8c68e3cda957fd33011971237f3f76ec9d4ec1503eb22d78ec08ed42671d8858790ea7761c272a4896c680a51691c094696fee5f9
 AUX norewrite.patch 488 BLAKE2B 663b52ff5936d5c8aa24ce2a226cd803f09a972a2f358b7f81d1711319b4fee2d7a9c4a8b498e8550b27d796939f6ba042790211592e55072bbff6b7f7172ea3 SHA512 5c2329f497951220bb1276058fe7fe2e0eba710fcad65c9ff1143827fec7c8d9745703fbebf624fecf740fb767401eeba9f0e91b09cd891622d01899578326db
 AUX password.dist 247 BLAKE2B 1803a6663c32ccc74c4dfb1d591a01d4416f9de9c4bf35c9a7ca277c2007b8c29a8899f4285c78eeb8592766457eef0caf377a344adee7a61be15bbf8b80c7de SHA512 f488b0ab1a909c9b878b9f3f3147641a9ed6d8d2ad44c67cd641934b800b18a62de2a7f5f51fdbecfbbcdd7c39c753734984cc0836c905a3b708858e1b91093d
diff --git a/mail-mta/courier/files/courier-1.2.2-fix-getgrnam-buffer.diff b/mail-mta/courier/files/courier-1.2.2-fix-getgrnam-buffer.diff
deleted file mode 100644
index 73384098189c..000000000000
--- a/mail-mta/courier/files/courier-1.2.2-fix-getgrnam-buffer.diff
+++ /dev/null
@@ -1,120 +0,0 @@
-diff -Naurp a/libs/numlib/changeuidgid.c b/libs/numlib/changeuidgid.c
---- a/libs/numlib/changeuidgid.c	2022-03-06 20:02:45.000000000 +0100
-+++ b/libs/numlib/changeuidgid.c	2023-02-24 17:26:02.452835861 +0100
-@@ -52,10 +52,11 @@ void libmail_changeuidgid(uid_t uid, gid
-  */
- uid_t libmail_getuid(const char *uname, gid_t *pw_gid)
- {
--	size_t bufsize;
-+	int bufsize;
- 	char *buf;
- 	struct passwd pwbuf;
- 	struct passwd *pw;
-+	int s;
- 
- 	/*
- 	** uname might be a pointer returned from a previous called to getpw(),
-@@ -70,35 +71,39 @@ uid_t libmail_getuid(const char *uname,
- 	}
- 	strcpy(p, uname);
- 
--#ifdef _SC_GETGR_R_SIZE_MAX
--	bufsize = sysconf(_SC_GETGR_R_SIZE_MAX);
-+#ifdef _SC_GETPW_R_SIZE_MAX
-+	bufsize = sysconf(_SC_GETPW_R_SIZE_MAX);
- 	if (bufsize == -1)          /* Value was indeterminate */
--	{
- #endif
--		bufsize = 16384;        /* Should be more than enough */
--	}
--
--	buf = malloc(bufsize);
--	if (buf == NULL)
- 	{
--		perror("malloc");
--		exit(1);
-+		bufsize = 16384;        /* Should be more than enough */
- 	}
- 
-+	do {
-+		buf = malloc(bufsize);
-+		if (buf == NULL)
-+		{
-+			perror("malloc");
-+			exit(1);
-+		}
- 
--	errno=ENOENT;
--
--	getpwnam_r(p, &pwbuf, buf, bufsize, &pw);
-+		s = getpwnam_r(p, &pwbuf, buf, bufsize, &pw);
-+		if (s == ERANGE) {
-+			free(buf);
-+			bufsize += 1024;
-+		}
-+	} while (s == ERANGE && bufsize <= 65536);
- 
--	free(buf);
-+	free(p);
- 
- 	if (pw == 0)
- 	{
--		free(p);
--		perror("getpwnam");
-+		errno = s;
-+		perror("getpwnam_r");
- 		exit(1);
- 	}
--	free(p);
-+
-+	free(buf);
- 
- 	if ( pw_gid ) *pw_gid = pw->pw_gid;
- 
-@@ -149,7 +154,7 @@ gid_t libmail_getgid(const char *gname)
- 	struct group grp;
- 	struct group *result;
- 	char *buf;
--	size_t bufsize;
-+	int bufsize;
- 	int s;
- 	char	*p=malloc(strlen(gname)+1);
- 
-@@ -168,14 +173,21 @@ gid_t libmail_getgid(const char *gname)
- 		bufsize = 16384;        /* Should be more than enough */
- 	}
- 
--	buf = malloc(bufsize);
--	if (buf == NULL)
--	{
--		perror("malloc");
--		exit(1);
--	}
-+	do {
-+		buf = malloc(bufsize);
-+		if (buf == NULL)
-+		{
-+			perror("malloc");
-+			exit(1);
-+		}
-+
-+		s = getgrnam_r(p, &grp, buf, bufsize, &result);
-+		if (s == ERANGE) {
-+			free(buf);
-+			bufsize += 1024;
-+		}
-+	} while (s == ERANGE && bufsize <= 65536);
- 
--	s = getgrnam_r(p, &grp, buf, bufsize, &result);
- 	free(p);
- 
- 	if (result == NULL)
-@@ -187,7 +199,7 @@ gid_t libmail_getgid(const char *gname)
- 		else
- 		{
- 			errno = s;
--			perror("getpwnam_r");
-+			perror("getgrnam_r");
- 		}
- 		exit(1);
- 	}
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 26f8d0d7f577..bef392372ebc 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 4e4d52af51ad..8b3bf36a3c98 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Wed, 23 Aug 2023 14:09:47 +0000
+Wed, 23 Aug 2023 20:09:43 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 15243ce15835..e85f73f3e2c9 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 546284 BLAKE2B ffce95d14dec8e0ecb1658575f411350a797650e5376e656bbe5d1c11b4e05372611ac4ca5de41270e2e69dfa9461b99f212aa044d6509bb082c7f94d92006b8 SHA512 c90fc6416d62b1b09cbafd89df9a8523e7e9eec12dd28fd39f81776bc9076c1e64fdb0203c709c330d323ea0c05daf6d59e5c469948b4d49cc6d59443f29557a
-TIMESTAMP 2023-08-23T14:09:50Z
+TIMESTAMP 2023-08-23T20:09:46Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmTmEy5fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmTmZ4tfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBQ+Q//QD93lxfv4XxvhFffjs3Vi3KReCtSrPl7e25JcfAH+m7RmCh02rG0PdGY
-VA9gCLbpe//eLtNOy+iuTuRRL/kGIzx3EFF0C0nDt6pbq86RplY7gNWW1SptqP2D
-vKTp4slTl4tdF7sYOGAL1BkyDbFqgcIed0SEJfS8JpHZ9IHpogUu1vw+tui+BsnZ
-dZ47ezQp1XDCljjmmQiZeS0txklvY1b4SzWIjsAQ84gmLPWzSdxcNoSV5pWgWlF/
-DhT5TPW9LwfyTjp+uFwugWD1dBEimoAoCU0z2ma4pvH8Xpyd695uDQHqlCSbha0i
-iwuYDhDxjhHH2aTUHq0paMM9+O/wN6XetrXHmLfW3IJGw8jYTZ+jG+PXDmRWIzSW
-BnqxLtfnDPHZWSybZEdTN0waY5gI/jlcg+F2wmQuKN5grQ6h4B9CHPVsFuyPsTT6
-nQbbXQzAQksCb60ulf9Plal2SgSs2AnHfv7Tw1t3wUZADD2hqhCN28+6VfzsvlMv
-Mm8vxZA1zN0rUTZ4OGEEWQ2AC3nM6yQip1UEz8GuA8n+f34IMQ2KOUAa5P9cfflz
-j+oAuxHlvf78uTV5+oPHORZ9cmCC6hrY6SqfMyRFI2+yG6XT1eztYJ04OS4CFjzI
-gz0kB+z84IPUbUZeTDVeWrPOgPqDME3GeN7M4bGAyd6cs1kyPg8=
-=DQnk
+klAFNQ//e6ul68D01lJU/67S0S8GEhR3WhhCqv5Ghnm+hxtgy6PzAsM2d232Ya5d
+Agf9GXgdjtfPuLmlvzX+r1JzedjAJSPxKTXpNGEZfuZLI+wvr4hvu3Cd8byyUT6+
+/rZ/HfxN/LspSJ2KlrpeY1stmPjD7WDC1nlPfxGUaE0lrOMMdmhuatkAuNMOvnm7
+Lmcc9lDBej6sW0gW2EmUqa1PIxs8zD4npJtF9R4WYvjaue2Sw6BimnEADcpi7pWP
+sA6Myn9hussCPkJaLLLe+HwRC61GUt7UUyajhmOdOytNTicRUG2Zb4hHuIxX4+zk
+rGOouVMFf26JEvsd/yCNOMQ6vdkxOxIXsZSxKUPo9YNU+qHf3qk6J30U0y7UNIHb
+0e0P8Q5M2mZRrfeNFNjAlCBNxKkLQyLJ7OWpZUbuZniKT7qd6arfMbvee99rT9KP
+vMXS9kLsw8z/A1h3Q8Za/eX3Q8hPj+x7E0JYmfsWgteFugxs9S+FvKwV/Oi8fHRW
+JE2wfdykq8ScHJmtRzLm6oNXr++M8iaoahTP87pCbbNbbyI/2SNLhUjqvVpbD97y
+UMyJAXZ4MuAwe7stNva33Ur4/+NpoMndaZsHAIULxHnpFhKgevb7WQt2hIGOF2Fh
+1PiViC1T18mzIIovfxNrcRL3ht/RAHgTtF/Cw8Wc/fEWtgRIxgM=
+=tO/+
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 4e4d52af51ad..ba152a2dbabc 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Wed, 23 Aug 2023 14:09:47 +0000
+Wed, 23 Aug 2023 20:09:44 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 43ba68515ba2..011a071fc942 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index a8ecece902f5..2274de556497 100644
--- a/metadata/md5-cache/app-emulation/Manifest.gz
+++ b/metadata/md5-cache/app-emulation/Manifest.gz
diff --git a/metadata/md5-cache/app-emulation/crossover-bin-22.0.1-r1 b/metadata/md5-cache/app-emulation/crossover-bin-22.0.1-r1
deleted file mode 100644
index 94460018d654..000000000000
--- a/metadata/md5-cache/app-emulation/crossover-bin-22.0.1-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) app-arch/cpio app-arch/unzip dev-lang/perl dev-util/bbe
-DEFINED_PHASES=install prepare setup unpack
-DESCRIPTION=Commercial version of app-emulation/wine with paid support
-EAPI=8
-HOMEPAGE=https://www.codeweavers.com/products/
-INHERIT=python-single-r1 unpacker
-IUSE=+capi +cups doc +gphoto2 +gsm +gstreamer +jpeg +lcms ldap +mp3 +nls osmesa +openal +opencl +opengl +pcap +png +scanner +ssl +v4l +vulkan python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=CROSSOVER-3
-RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_10? ( dev-python/dbus-python[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/dbus-python[python_targets_python3_11(-)] dev-python/pygobject:3[python_targets_python3_11(-)] ) !prefix? ( sys-libs/glibc ) capi? ( net-libs/libcapi[abi_x86_32(-)] ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( media-libs/libjpeg-turbo:0[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)] jpeg? ( media-plugins/gst-plugins-jpeg:1.0[abi_x86_32(-)] ) media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opencl? ( virtual/opencl[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) pcap? ( net-libs/libpcap[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( net-libs/gnutls:0/30.30[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)] ) dev-libs/glib:2 dev-libs/gobject-introspection || ( dev-libs/openssl-compat:1.1.1 =dev-libs/openssl-1.1.1* ) dev-util/desktop-file-utils media-libs/alsa-lib[abi_x86_32(-)] media-libs/freetype:2[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-),osmesa?] || ( media-libs/tiff-compat:4[abi_x86_32(-)] media-libs/tiff:0/0[abi_x86_32(-)] ) sys-auth/nss-mdns[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/libunwind[abi_x86_32(-)] sys-libs/ncurses-compat:5[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXcursor[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)] x11-libs/gdk-pixbuf:2[introspection] x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] x11-libs/vte:2.91[introspection] || ( sys-libs/libxcrypt[compat] sys-libs/glibc[crypt(+)] )
-REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 )
-RESTRICT=bindist test
-SLOT=0
-SRC_URI=https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-22.0.1.bin
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca	unpacker	aa6a4e924009232d8b78b31e932c30b5
-_md5_=22026ae1faffed76e315fc15eeb904d2
diff --git a/metadata/md5-cache/app-emulation/crossover-bin-22.1.0 b/metadata/md5-cache/app-emulation/crossover-bin-22.1.0
deleted file mode 100644
index d99176128320..000000000000
--- a/metadata/md5-cache/app-emulation/crossover-bin-22.1.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) app-arch/cpio app-arch/unzip dev-lang/perl dev-util/bbe
-DEFINED_PHASES=install prepare setup unpack
-DESCRIPTION=Commercial version of app-emulation/wine with paid support
-EAPI=8
-HOMEPAGE=https://www.codeweavers.com/products/
-INHERIT=python-single-r1 unpacker
-IUSE=+capi +cups doc +gphoto2 +gsm +gstreamer +jpeg +lcms ldap +mp3 +nls osmesa +openal +opencl +opengl +pcap +png +scanner +ssl +v4l +vulkan python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=CROSSOVER-3
-RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_10? ( dev-python/dbus-python[python_targets_python3_10(-)] dev-python/pycairo[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/dbus-python[python_targets_python3_11(-)] dev-python/pycairo[python_targets_python3_11(-)] dev-python/pygobject:3[python_targets_python3_11(-)] ) !prefix? ( sys-libs/glibc ) capi? ( net-libs/libcapi[abi_x86_32(-)] ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( media-libs/libjpeg-turbo:0[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)] jpeg? ( media-plugins/gst-plugins-jpeg:1.0[abi_x86_32(-)] ) media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opencl? ( virtual/opencl[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) pcap? ( net-libs/libpcap[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( net-libs/gnutls:0/30.30[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)] ) dev-libs/glib:2 dev-libs/gobject-introspection || ( dev-libs/openssl-compat:1.1.1 =dev-libs/openssl-1.1.1* ) dev-util/desktop-file-utils media-libs/alsa-lib[abi_x86_32(-)] media-libs/freetype:2[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-),osmesa?] media-libs/tiff-compat:4[abi_x86_32(-)] sys-auth/nss-mdns[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/libunwind[abi_x86_32(-)] sys-libs/ncurses-compat:5[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXcursor[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)] x11-libs/gdk-pixbuf:2[introspection] x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] x11-libs/vte:2.91[introspection] sys-libs/libxcrypt[compat]
-REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 )
-RESTRICT=bindist test
-SLOT=0
-SRC_URI=https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-22.1.0.bin
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca	unpacker	aa6a4e924009232d8b78b31e932c30b5
-_md5_=be744c0714be637112100a9b034505bb
diff --git a/metadata/md5-cache/app-emulation/crossover-bin-23.0.0 b/metadata/md5-cache/app-emulation/crossover-bin-23.0.0
new file mode 100644
index 000000000000..f678637698cb
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/crossover-bin-23.0.0
@@ -0,0 +1,16 @@
+BDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) app-arch/cpio app-arch/unzip dev-lang/perl dev-util/bbe
+DEFINED_PHASES=install prepare setup unpack
+DESCRIPTION=Commercial version of app-emulation/wine with paid support
+EAPI=8
+HOMEPAGE=https://www.codeweavers.com/products/
+INHERIT=python-single-r1 unpacker
+IUSE=+capi +cups doc +gphoto2 +gstreamer +jpeg +lcms ldap +mp3 +nls osmesa +openal +opencl +opengl +pcap +png +scanner +ssl +v4l +vulkan python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=CROSSOVER-3
+RDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_10? ( dev-python/dbus-python[python_targets_python3_10(-)] dev-python/pycairo[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/dbus-python[python_targets_python3_11(-)] dev-python/pycairo[python_targets_python3_11(-)] dev-python/pygobject:3[python_targets_python3_11(-)] ) !prefix? ( sys-libs/glibc ) capi? ( net-libs/libcapi[abi_x86_32(-)] ) cups? ( net-print/cups[abi_x86_32(-)] ) jpeg? ( media-libs/libjpeg-turbo:0[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)] jpeg? ( media-plugins/gst-plugins-jpeg:1.0[abi_x86_32(-)] ) media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opencl? ( virtual/opencl[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) pcap? ( net-libs/libpcap[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( net-libs/gnutls:0/30.30[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)] ) dev-libs/glib:2 dev-libs/gobject-introspection dev-libs/openssl-compat:1.1.1 dev-util/desktop-file-utils media-libs/alsa-lib[abi_x86_32(-)] media-libs/freetype:2[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-),osmesa?] media-libs/tiff-compat:4[abi_x86_32(-)] sys-auth/nss-mdns[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/libunwind[abi_x86_32(-)] sys-libs/ncurses-compat:5[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXcursor[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)] x11-libs/gdk-pixbuf:2[introspection] x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] x11-libs/vte:2.91[introspection] sys-libs/libxcrypt[compat]
+REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 )
+RESTRICT=bindist test
+SLOT=0
+SRC_URI=https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-23.0.0.bin
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca	unpacker	aa6a4e924009232d8b78b31e932c30b5
+_md5_=61b37fd3ae1a8d36cc354e471e3c731c
diff --git a/metadata/md5-cache/app-eselect/Manifest.gz b/metadata/md5-cache/app-eselect/Manifest.gz
index abba31c2c608..52434098894a 100644
--- a/metadata/md5-cache/app-eselect/Manifest.gz
+++ b/metadata/md5-cache/app-eselect/Manifest.gz
diff --git a/metadata/md5-cache/app-eselect/eselect-wine-2.0.2-r1 b/metadata/md5-cache/app-eselect/eselect-wine-2.0.2-r1
deleted file mode 100644
index 39cb2c2ced31..000000000000
--- a/metadata/md5-cache/app-eselect/eselect-wine-2.0.2-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm
-DESCRIPTION=Manage active Wine slots and variants
-EAPI=8
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Wine
-IUSE=+xdg
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-RDEPEND=app-admin/eselect xdg? ( x11-misc/xdg-utils )
-SLOT=0
-SRC_URI=https://gitweb.gentoo.org/proj/eselect-wine.git/snapshot/eselect-wine-2.0.2.tar.bz2
-_md5_=d6f823be24165d13f6b20c23084ee1e5
diff --git a/metadata/md5-cache/app-eselect/eselect-wine-2.0.2 b/metadata/md5-cache/app-eselect/eselect-wine-2.0.2-r2
index 6807290d1945..72697c7ead3a 100644
--- a/metadata/md5-cache/app-eselect/eselect-wine-2.0.2
+++ b/metadata/md5-cache/app-eselect/eselect-wine-2.0.2-r2
@@ -8,4 +8,4 @@ LICENSE=GPL-2+
 RDEPEND=app-admin/eselect xdg? ( x11-misc/xdg-utils )
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/eselect-wine.git/snapshot/eselect-wine-2.0.2.tar.bz2
-_md5_=bc6c36ccd52dafcf188d22fbb8095921
+_md5_=1b2f563a50de4fe2de2ac2bff8524ef8
diff --git a/metadata/md5-cache/app-i18n/Manifest.gz b/metadata/md5-cache/app-i18n/Manifest.gz
index befa2f4930de..aaa4518cee3d 100644
--- a/metadata/md5-cache/app-i18n/Manifest.gz
+++ b/metadata/md5-cache/app-i18n/Manifest.gz
diff --git a/metadata/md5-cache/app-i18n/unicode-cldr-43.0 b/metadata/md5-cache/app-i18n/unicode-cldr-43.0
index f7c02ad64e27..507b077e14ac 100644
--- a/metadata/md5-cache/app-i18n/unicode-cldr-43.0
+++ b/metadata/md5-cache/app-i18n/unicode-cldr-43.0
@@ -3,8 +3,8 @@ DEFINED_PHASES=install
 DESCRIPTION=Unicode Common Locale Data Repository
 EAPI=8
 HOMEPAGE=https://cldr.unicode.org/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv sparc x86
 LICENSE=unicode
 SLOT=0
 SRC_URI=https://unicode.org/Public/cldr/43/cldr-common-43.0.zip -> unicode-cldr-common-43.0.zip
-_md5_=9b7560ea049d5fd8e8c22e07660cb5fc
+_md5_=7f5fd2601d3932dab90444c8d67d9d46
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index f792172b8e86..af6e94fff752 100644
--- a/metadata/md5-cache/dev-python/Manifest.gz
+++ b/metadata/md5-cache/dev-python/Manifest.gz
diff --git a/metadata/md5-cache/dev-python/bitstring-4.1.1 b/metadata/md5-cache/dev-python/bitstring-4.1.1
new file mode 100644
index 000000000000..c8d048e8e205
--- /dev/null
+++ b/metadata/md5-cache/dev-python/bitstring-4.1.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( <dev-python/bitarray-3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/bitarray-2.8.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A pure Python module for creation and analysis of binary data
+EAPI=8
+HOMEPAGE=https://github.com/scott-griffiths/bitstring/ https://pypi.org/project/bitstring/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=MIT
+RDEPEND=<dev-python/bitarray-3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/bitarray-2.8.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/b/bitstring/bitstring-4.1.1.tar.gz
+_eclasses_=distutils-r1	a93df67775ff86e107e56c6a6e68cf4e	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca
+_md5_=99fd01033fd81ca79620486c5e2f7c72
diff --git a/metadata/md5-cache/dev-python/gpep517-14 b/metadata/md5-cache/dev-python/gpep517-14
new file mode 100644
index 000000000000..4e8816e8d920
--- /dev/null
+++ b/metadata/md5-cache/dev-python/gpep517-14
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/installer-0.5.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( >=dev-python/tomli-1.2.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/tomli-1.2.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) >=dev-python/pytest-7.3.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A backend script to aid installing Python packages in Gentoo
+EAPI=7
+HOMEPAGE=https://pypi.org/project/gpep517/ https://github.com/projg2/gpep517/
+INHERIT=distutils-r1
+IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+LICENSE=MIT
+RDEPEND=>=dev-python/installer-0.5.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( >=dev-python/tomli-1.2.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/tomli-1.2.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/projg2/gpep517/archive/v14.tar.gz -> gpep517-14.gh.tar.gz
+_eclasses_=distutils-r1	a93df67775ff86e107e56c6a6e68cf4e	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca
+_md5_=e52daa23726ce5c38c56f9f20cd66f99
diff --git a/metadata/md5-cache/dev-python/pydantic-core-2.6.3 b/metadata/md5-cache/dev-python/pydantic-core-2.6.3
new file mode 100644
index 000000000000..e213218d7455
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pydantic-core-2.6.3
@@ -0,0 +1,17 @@
+BDEPEND=>=virtual/rust-1.70.0 test? ( >=dev-python/dirty-equals-0.5.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/hypothesis-6.63.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-mock-3.10.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-timeout-2.1.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pydantic-1.10.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytz-2022.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( >=dev-python/typing-extensions-4.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) >=virtual/rust-1.53 python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-util/maturin-1.0.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+DESCRIPTION=Core validation logic for pydantic written in Rust
+EAPI=8
+HOMEPAGE=https://github.com/pydantic/pydantic-core/ https://pypi.org/project/pydantic-core/
+INHERIT=cargo distutils-r1 pypi
+IUSE=test debug python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT Apache-2.0 Apache-2.0-with-LLVM-exceptions MIT Unicode-DFS-2016
+RDEPEND=>=dev-python/typing-extensions-4.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/p/pydantic-core/pydantic_core-2.6.3.tar.gz https://crates.io/api/v1/crates/ahash/0.8.3/download -> ahash-0.8.3.crate https://crates.io/api/v1/crates/aho-corasick/1.0.2/download -> aho-corasick-1.0.2.crate https://crates.io/api/v1/crates/autocfg/1.1.0/download -> autocfg-1.1.0.crate https://crates.io/api/v1/crates/base64/0.21.2/download -> base64-0.21.2.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/cc/1.0.79/download -> cc-1.0.79.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/enum_dispatch/0.3.12/download -> enum_dispatch-0.3.12.crate https://crates.io/api/v1/crates/equivalent/1.0.1/download -> equivalent-1.0.1.crate https://crates.io/api/v1/crates/form_urlencoded/1.2.0/download -> form_urlencoded-1.2.0.crate https://crates.io/api/v1/crates/getrandom/0.2.10/download -> getrandom-0.2.10.crate https://crates.io/api/v1/crates/hashbrown/0.14.0/download -> hashbrown-0.14.0.crate https://crates.io/api/v1/crates/heck/0.4.1/download -> heck-0.4.1.crate https://crates.io/api/v1/crates/idna/0.4.0/download -> idna-0.4.0.crate https://crates.io/api/v1/crates/indexmap/2.0.0/download -> indexmap-2.0.0.crate https://crates.io/api/v1/crates/indoc/1.0.9/download -> indoc-1.0.9.crate https://crates.io/api/v1/crates/itoa/1.0.8/download -> itoa-1.0.8.crate https://crates.io/api/v1/crates/libc/0.2.147/download -> libc-0.2.147.crate https://crates.io/api/v1/crates/lock_api/0.4.10/download -> lock_api-0.4.10.crate https://crates.io/api/v1/crates/memchr/2.5.0/download -> memchr-2.5.0.crate https://crates.io/api/v1/crates/memoffset/0.9.0/download -> memoffset-0.9.0.crate https://crates.io/api/v1/crates/num-bigint/0.4.3/download -> num-bigint-0.4.3.crate https://crates.io/api/v1/crates/num-integer/0.1.45/download -> num-integer-0.1.45.crate https://crates.io/api/v1/crates/num-traits/0.2.15/download -> num-traits-0.2.15.crate https://crates.io/api/v1/crates/once_cell/1.18.0/download -> once_cell-1.18.0.crate https://crates.io/api/v1/crates/parking_lot/0.12.1/download -> parking_lot-0.12.1.crate https://crates.io/api/v1/crates/parking_lot_core/0.9.8/download -> parking_lot_core-0.9.8.crate https://crates.io/api/v1/crates/percent-encoding/2.3.0/download -> percent-encoding-2.3.0.crate https://crates.io/api/v1/crates/proc-macro2/1.0.64/download -> proc-macro2-1.0.64.crate https://crates.io/api/v1/crates/pyo3-build-config/0.19.2/download -> pyo3-build-config-0.19.2.crate https://crates.io/api/v1/crates/pyo3-ffi/0.19.2/download -> pyo3-ffi-0.19.2.crate https://crates.io/api/v1/crates/pyo3-macros-backend/0.19.2/download -> pyo3-macros-backend-0.19.2.crate https://crates.io/api/v1/crates/pyo3-macros/0.19.2/download -> pyo3-macros-0.19.2.crate https://crates.io/api/v1/crates/pyo3/0.19.2/download -> pyo3-0.19.2.crate https://crates.io/api/v1/crates/python3-dll-a/0.2.9/download -> python3-dll-a-0.2.9.crate https://crates.io/api/v1/crates/quote/1.0.29/download -> quote-1.0.29.crate https://crates.io/api/v1/crates/redox_syscall/0.3.5/download -> redox_syscall-0.3.5.crate https://crates.io/api/v1/crates/regex-automata/0.3.6/download -> regex-automata-0.3.6.crate https://crates.io/api/v1/crates/regex-syntax/0.7.4/download -> regex-syntax-0.7.4.crate https://crates.io/api/v1/crates/regex/1.9.3/download -> regex-1.9.3.crate https://crates.io/api/v1/crates/rustversion/1.0.13/download -> rustversion-1.0.13.crate https://crates.io/api/v1/crates/ryu/1.0.14/download -> ryu-1.0.14.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/serde/1.0.185/download -> serde-1.0.185.crate https://crates.io/api/v1/crates/serde_derive/1.0.185/download -> serde_derive-1.0.185.crate https://crates.io/api/v1/crates/serde_json/1.0.105/download -> serde_json-1.0.105.crate https://crates.io/api/v1/crates/smallvec/1.11.0/download -> smallvec-1.11.0.crate https://crates.io/api/v1/crates/speedate/0.12.0/download -> speedate-0.12.0.crate https://crates.io/api/v1/crates/strum/0.25.0/download -> strum-0.25.0.crate https://crates.io/api/v1/crates/strum_macros/0.25.2/download -> strum_macros-0.25.2.crate https://crates.io/api/v1/crates/syn/1.0.109/download -> syn-1.0.109.crate https://crates.io/api/v1/crates/syn/2.0.28/download -> syn-2.0.28.crate https://crates.io/api/v1/crates/target-lexicon/0.12.9/download -> target-lexicon-0.12.9.crate https://crates.io/api/v1/crates/tinyvec/1.6.0/download -> tinyvec-1.6.0.crate https://crates.io/api/v1/crates/tinyvec_macros/0.1.1/download -> tinyvec_macros-0.1.1.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.13/download -> unicode-bidi-0.3.13.crate https://crates.io/api/v1/crates/unicode-ident/1.0.10/download -> unicode-ident-1.0.10.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.22/download -> unicode-normalization-0.1.22.crate https://crates.io/api/v1/crates/unindent/0.1.11/download -> unindent-0.1.11.crate https://crates.io/api/v1/crates/url/2.4.0/download -> url-2.4.0.crate https://crates.io/api/v1/crates/uuid/1.4.1/download -> uuid-1.4.1.crate https://crates.io/api/v1/crates/version_check/0.9.4/download -> version_check-0.9.4.crate https://crates.io/api/v1/crates/wasi/0.11.0+wasi-snapshot-preview1/download -> wasi-0.11.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/windows-targets/0.48.1/download -> windows-targets-0.48.1.crate https://crates.io/api/v1/crates/windows_aarch64_gnullvm/0.48.0/download -> windows_aarch64_gnullvm-0.48.0.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.48.0/download -> windows_aarch64_msvc-0.48.0.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.48.0/download -> windows_i686_gnu-0.48.0.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.48.0/download -> windows_i686_msvc-0.48.0.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.48.0/download -> windows_x86_64_gnu-0.48.0.crate https://crates.io/api/v1/crates/windows_x86_64_gnullvm/0.48.0/download -> windows_x86_64_gnullvm-0.48.0.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.48.0/download -> windows_x86_64_msvc-0.48.0.crate
+_eclasses_=cargo	8520ae1bed0e6965d027399b471a3595	distutils-r1	a93df67775ff86e107e56c6a6e68cf4e	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca
+_md5_=98a845bbe29bb7214f3565e85a180752
diff --git a/metadata/md5-cache/dev-python/python-engineio-4.6.1 b/metadata/md5-cache/dev-python/python-engineio-4.6.1
new file mode 100644
index 000000000000..dc12dd5acc64
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-engineio-4.6.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/tornado[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/websockets[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( dev-python/aiohttp[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/requests[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/websocket-client[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) doc? ( || ( ( dev-lang/python:3.12 >=dev-python/sphinx-5.3.0[python_targets_python3_12(-)] dev-python/alabaster[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/alabaster[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/alabaster[python_targets_python3_10(-)] ) ) ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python implementation of the Engine.IO realtime server
+EAPI=8
+HOMEPAGE=https://python-engineio.readthedocs.io/ https://github.com/miguelgrinberg/python-engineio/ https://pypi.org/project/python-engineio/
+INHERIT=distutils-r1
+IUSE=test doc python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/aiohttp[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/requests[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/websocket-client[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/miguelgrinberg/python-engineio/archive/v4.6.1.tar.gz -> python-engineio-4.6.1.gh.tar.gz
+_eclasses_=distutils-r1	a93df67775ff86e107e56c6a6e68cf4e	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca
+_md5_=46941d7e7b6d20c9ddb7fe582bab639f
diff --git a/metadata/md5-cache/gnome-base/Manifest.gz b/metadata/md5-cache/gnome-base/Manifest.gz
index eb26b8b1e476..01c7a026b0f1 100644
--- a/metadata/md5-cache/gnome-base/Manifest.gz
+++ b/metadata/md5-cache/gnome-base/Manifest.gz
diff --git a/metadata/md5-cache/gnome-base/gnome-control-center-45_beta b/metadata/md5-cache/gnome-base/gnome-control-center-45_beta
new file mode 100644
index 000000000000..f8628f8b29ad
--- /dev/null
+++ b/metadata/md5-cache/gnome-base/gnome-control-center-45_beta
@@ -0,0 +1,19 @@
+BDEPEND=dev-libs/libxslt app-text/docbook-xsl-stylesheets app-text/docbook-xml-dtd:4.2 x11-base/xorg-proto dev-libs/libxml2:2 dev-util/gdbus-codegen dev-util/glib-utils >=sys-devel/gettext-0.19.8 virtual/pkgconfig test? ( || ( ( dev-lang/python:3.11 dev-python/python-dbusmock[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/python-dbusmock[python_targets_python3_10(-)] ) ) x11-apps/setxkbmap ) app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=gnome-online-accounts? ( x11-libs/gtk+:3 >=net-libs/gnome-online-accounts-3.25.3:= ) >=media-libs/libpulse-2.0[glib] >=gui-libs/gtk-4.11.2:4[X,wayland=] >=gui-libs/libadwaita-1.4_alpha:1 >=sys-apps/accountsservice-0.6.39 >=x11-misc/colord-0.1.34:0= >=x11-libs/gdk-pixbuf-2.23.0:2 >=dev-libs/glib-2.75.0:2 gnome-base/gnome-desktop:4= >=gnome-base/gnome-settings-daemon-41.0[colord,input_devices_wacom?] >=gnome-base/gsettings-desktop-schemas-42_alpha dev-libs/libxml2:2 >=sys-power/upower-0.99.8:= >=dev-libs/libgudev-232 >=x11-libs/libX11-1.8 >=x11-libs/libXi-1.2 media-libs/libepoxy app-crypt/gcr:0= >=dev-libs/libpwquality-1.2.2 >=sys-auth/polkit-0.114 cups? ( >=net-print/cups-1.7[dbus] >=net-fs/samba-4.0.0[client] ) ibus? ( >=app-i18n/ibus-1.5.2 ) networkmanager? ( >=net-libs/libnma-1.10.2 >=net-misc/networkmanager-1.24.0[modemmanager] >=net-misc/modemmanager-0.7.990:= ) bluetooth? ( net-wireless/gnome-bluetooth:3= ) input_devices_wacom? ( >=dev-libs/libwacom-0.27:= ) kerberos? ( app-crypt/mit-krb5 ) x11-libs/cairo[glib] >=x11-libs/colord-gtk-0.3.0:= media-libs/fontconfig gnome-base/libgtop:2= >=sys-fs/udisks-2.1.8:2 app-crypt/libsecret net-libs/gnutls:= media-libs/gsound x11-libs/pango
+DESCRIPTION=GNOME's main interface to configure various aspects of the desktop
+EAPI=8
+HOMEPAGE=https://gitlab.gnome.org/GNOME/gnome-control-center
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=gnome.org gnome2-utils meson python-any-r1 virtualx xdg
+IUSE=+bluetooth +cups debug elogind +gnome-online-accounts +ibus input_devices_wacom kerberos networkmanager systemd test wayland test
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86
+LICENSE=GPL-2+ CC-BY-SA-2.5
+PDEPEND=>=gnome-base/gnome-session-2.91.6-r1 networkmanager? ( gnome-extra/nm-applet )
+RDEPEND=gnome-online-accounts? ( x11-libs/gtk+:3 >=net-libs/gnome-online-accounts-3.25.3:= ) >=media-libs/libpulse-2.0[glib] >=gui-libs/gtk-4.11.2:4[X,wayland=] >=gui-libs/libadwaita-1.4_alpha:1 >=sys-apps/accountsservice-0.6.39 >=x11-misc/colord-0.1.34:0= >=x11-libs/gdk-pixbuf-2.23.0:2 >=dev-libs/glib-2.75.0:2 gnome-base/gnome-desktop:4= >=gnome-base/gnome-settings-daemon-41.0[colord,input_devices_wacom?] >=gnome-base/gsettings-desktop-schemas-42_alpha dev-libs/libxml2:2 >=sys-power/upower-0.99.8:= >=dev-libs/libgudev-232 >=x11-libs/libX11-1.8 >=x11-libs/libXi-1.2 media-libs/libepoxy app-crypt/gcr:0= >=dev-libs/libpwquality-1.2.2 >=sys-auth/polkit-0.114 cups? ( >=net-print/cups-1.7[dbus] >=net-fs/samba-4.0.0[client] ) ibus? ( >=app-i18n/ibus-1.5.2 ) networkmanager? ( >=net-libs/libnma-1.10.2 >=net-misc/networkmanager-1.24.0[modemmanager] >=net-misc/modemmanager-0.7.990:= ) bluetooth? ( net-wireless/gnome-bluetooth:3= ) input_devices_wacom? ( >=dev-libs/libwacom-0.27:= ) kerberos? ( app-crypt/mit-krb5 ) x11-libs/cairo[glib] >=x11-libs/colord-gtk-0.3.0:= media-libs/fontconfig gnome-base/libgtop:2= >=sys-fs/udisks-2.1.8:2 app-crypt/libsecret net-libs/gnutls:= media-libs/gsound x11-libs/pango media-libs/libcanberra[pulseaudio,sound] systemd? ( >=sys-apps/systemd-31 ) elogind? ( app-admin/openrc-settingsd sys-auth/elogind ) x11-themes/adwaita-icon-theme >=gnome-extra/gnome-color-manager-3.1.2 cups? ( app-admin/system-config-printer net-print/cups-pk-helper ) gnome-extra/tecla wayland? ( dev-libs/libinput ) !wayland? ( >=x11-drivers/xf86-input-libinput-0.19.0 input_devices_wacom? ( >=x11-drivers/xf86-input-wacom-0.33.0 ) )
+REQUIRED_USE=^^ ( elogind systemd )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=2
+SRC_URI=mirror://gnome/sources/gnome-control-center/45/gnome-control-center-45.beta.tar.xz https://dev.gentoo.org/~mattst88/distfiles/gnome-control-center-45.0-patchset.tar.xz https://dev.gentoo.org/~mattst88/distfiles/gnome-control-center-gentoo-logo.svg https://dev.gentoo.org/~mattst88/distfiles/gnome-control-center-gentoo-logo-dark.svg
+_eclasses_=gnome.org	6b39404f1491c60a2d32e3c693a683fe	gnome2-utils	b0183db3b2e07b18f3b77bffec72e116	meson	08b7183c3f4811568ee93eb0f79a89fe	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=29c53166677fa25db869fdcf0a18d0ea
diff --git a/metadata/md5-cache/gnome-extra/Manifest.gz b/metadata/md5-cache/gnome-extra/Manifest.gz
index 2c0a1c70e8cd..c7e5f3d4776d 100644
--- a/metadata/md5-cache/gnome-extra/Manifest.gz
+++ b/metadata/md5-cache/gnome-extra/Manifest.gz
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extension-alphabetical-grid-29.0 b/metadata/md5-cache/gnome-extra/gnome-shell-extension-alphabetical-grid-32.0
index 371d0ed3d528..b57423c0bf0d 100644
--- a/metadata/md5-cache/gnome-extra/gnome-shell-extension-alphabetical-grid-29.0
+++ b/metadata/md5-cache/gnome-extra/gnome-shell-extension-alphabetical-grid-32.0
@@ -3,11 +3,11 @@ DESCRIPTION=Restore the alphabetical ordering of the app grid
 EAPI=8
 HOMEPAGE=https://github.com/stuarthayhurst/alphabetical-grid-extension
 INHERIT=gnome2-utils
-KEYWORDS=amd64 x86
+KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=app-eselect/eselect-gnome-shell-extensions >=gnome-base/gnome-shell-3.38
 RESTRICT=test
 SLOT=0
-SRC_URI=https://github.com/stuarthayhurst/alphabetical-grid-extension/archive/refs/tags/v29.0.tar.gz -> gnome-shell-extension-alphabetical-grid-29.0.tar.gz
+SRC_URI=https://github.com/stuarthayhurst/alphabetical-grid-extension/archive/refs/tags/v32.0.tar.gz -> gnome-shell-extension-alphabetical-grid-32.0.tar.gz
 _eclasses_=gnome2-utils	b0183db3b2e07b18f3b77bffec72e116	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=9b7a7758a632ca587460274220ca6258
+_md5_=a284403349e2885f9bc266230f20d34a
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extension-desktop-icons-ng-47.0.2-r1 b/metadata/md5-cache/gnome-extra/gnome-shell-extension-desktop-icons-ng-47.0.4
index f780173806c9..839a7fbf394a 100644
--- a/metadata/md5-cache/gnome-extra/gnome-shell-extension-desktop-icons-ng-47.0.2-r1
+++ b/metadata/md5-cache/gnome-extra/gnome-shell-extension-desktop-icons-ng-47.0.4
@@ -5,10 +5,10 @@ DESCRIPTION=Fork from the desktop-icons project, with several enhancements like
 EAPI=8
 HOMEPAGE=https://gitlab.com/rastersoft/desktop-icons-ng
 INHERIT=gnome2-utils meson
-KEYWORDS=amd64 x86
+KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=dev-libs/glib:2 app-eselect/eselect-gnome-shell-extensions >=gnome-base/gnome-shell-3.38 >=gnome-base/nautilus-3.38
 SLOT=0
-SRC_URI=https://gitlab.com/rastersoft/desktop-icons-ng/-/archive/47.0.2/gnome-shell-extension-desktop-icons-ng-47.0.2.tar.bz2
+SRC_URI=https://gitlab.com/rastersoft/desktop-icons-ng/-/archive/47.0.4/gnome-shell-extension-desktop-icons-ng-47.0.4.tar.bz2
 _eclasses_=gnome2-utils	b0183db3b2e07b18f3b77bffec72e116	meson	08b7183c3f4811568ee93eb0f79a89fe	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=ab7559023ce36852eb810eccc70a046f
+_md5_=ca2170353193c9d1ff2d75d3bc7d1b23
diff --git a/metadata/md5-cache/gnome-extra/tecla-45_beta b/metadata/md5-cache/gnome-extra/tecla-45_beta
new file mode 100644
index 000000000000..87f31d004828
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/tecla-45_beta
@@ -0,0 +1,15 @@
+BDEPEND=dev-libs/glib sys-devel/gettext virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst test
+DEPEND=gui-libs/gtk:4[introspection] >=gui-libs/libadwaita-1.4_alpha:1 x11-libs/libxkbcommon
+DESCRIPTION=Tecla is a keyboard layout viewer
+EAPI=8
+HOMEPAGE=https://gitlab.gnome.org/GNOME/tecla
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=gnome.org gnome2-utils meson xdg
+KEYWORDS=~amd64
+LICENSE=GPL-2+
+RDEPEND=gui-libs/gtk:4[introspection] >=gui-libs/libadwaita-1.4_alpha:1 x11-libs/libxkbcommon
+SLOT=0
+SRC_URI=mirror://gnome/sources/tecla/45/tecla-45.beta.tar.xz
+_eclasses_=gnome.org	6b39404f1491c60a2d32e3c693a683fe	gnome2-utils	b0183db3b2e07b18f3b77bffec72e116	meson	08b7183c3f4811568ee93eb0f79a89fe	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=efacc6b1024115f585f3f1975a04df66
diff --git a/metadata/md5-cache/gui-apps/Manifest.gz b/metadata/md5-cache/gui-apps/Manifest.gz
index ffeb220c1879..bcca9b1a26b8 100644
--- a/metadata/md5-cache/gui-apps/Manifest.gz
+++ b/metadata/md5-cache/gui-apps/Manifest.gz
diff --git a/metadata/md5-cache/gui-apps/grim-1.4.1 b/metadata/md5-cache/gui-apps/grim-1.4.1
index f25f528eef90..e89798649795 100644
--- a/metadata/md5-cache/gui-apps/grim-1.4.1
+++ b/metadata/md5-cache/gui-apps/grim-1.4.1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://sr.ht/~emersion/grim
 INHERIT=bash-completion-r1 meson
 IUSE=+man jpeg
-KEYWORDS=~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm64 ~loong ~ppc64 ~riscv x86
 LICENSE=MIT
 RDEPEND=dev-libs/wayland media-libs/libpng x11-libs/pixman jpeg? ( media-libs/libjpeg-turbo )
 SLOT=0
 SRC_URI=https://git.sr.ht/~emersion/grim/archive/v1.4.1.tar.gz -> grim-1.4.1.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	meson	08b7183c3f4811568ee93eb0f79a89fe	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=5fd27262526fd5dbbd28c3628f97cf96
+_md5_=c5bb766f0b7c5566ac12f382b4bc81a7
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index d9266e821379..6f64b05500d9 100644
--- a/metadata/md5-cache/net-analyzer/Manifest.gz
+++ b/metadata/md5-cache/net-analyzer/Manifest.gz
diff --git a/metadata/md5-cache/net-analyzer/zabbix-4.0.48 b/metadata/md5-cache/net-analyzer/zabbix-4.0.48
new file mode 100644
index 000000000000..1def1680c776
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/zabbix-4.0.48
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup
+DEPEND=curl? ( net-misc/curl ) gnutls? ( net-libs/gnutls:0= ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls:= net-nds/openldap:= ) libxml2? ( dev-libs/libxml2 ) mbedtls? ( net-libs/mbedtls:0= ) mysql? ( dev-db/mysql-connector-c:= ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) openssl? ( dev-libs/openssl:=[-bindist(-)] ) oracle? ( dev-db/oracle-instantclient[odbc,sdk] ) postgres? ( dev-db/postgresql:* ) proxy? ( dev-libs/libevent:= sys-libs/zlib ) server? ( dev-libs/libevent:= sys-libs/zlib ) snmp? ( net-analyzer/net-snmp:= ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) xmpp? ( dev-libs/iksemel ) static? ( curl? ( net-misc/curl[static-libs] ) ldap? ( =dev-libs/cyrus-sasl-2*[static-libs] net-libs/gnutls[static-libs] net-nds/openldap[static-libs] ) libxml2? ( dev-libs/libxml2[static-libs] ) mysql? ( dev-db/mysql-connector-c[static-libs] ) odbc? ( dev-db/unixODBC[static-libs] ) postgres? ( dev-db/postgresql:*[static-libs] ) sqlite? ( dev-db/sqlite[static-libs] ) ssh? ( net-libs/libssh2 ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=ZABBIX is software for monitoring of your applications, network and servers
+EAPI=8
+HOMEPAGE=https://www.zabbix.com/
+INHERIT=webapp java-pkg-opt-2 systemd toolchain-funcs tmpfiles user-info
+IUSE=+agent curl frontend gnutls ipv6 java ldap libxml2 mbedtls mysql odbc openipmi +openssl oracle +postgres proxy selinux server snmp sqlite ssh static xmpp java
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=curl? ( net-misc/curl ) gnutls? ( net-libs/gnutls:0= ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls:= net-nds/openldap:= ) libxml2? ( dev-libs/libxml2 ) mbedtls? ( net-libs/mbedtls:0= ) mysql? ( dev-db/mysql-connector-c:= ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) openssl? ( dev-libs/openssl:=[-bindist(-)] ) oracle? ( dev-db/oracle-instantclient[odbc,sdk] ) postgres? ( dev-db/postgresql:* ) proxy? ( dev-libs/libevent:= sys-libs/zlib ) server? ( dev-libs/libevent:= sys-libs/zlib ) snmp? ( net-analyzer/net-snmp:= ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) xmpp? ( dev-libs/iksemel ) acct-group/zabbix acct-user/zabbix java? ( >=virtual/jre-1.8:* ) mysql? ( virtual/mysql ) proxy? ( dev-libs/libpcre net-analyzer/fping[suid] ) selinux? ( sec-policy/selinux-zabbix ) server? ( app-admin/webapp-config dev-libs/libpcre net-analyzer/fping[suid] ) frontend? ( app-admin/webapp-config dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] media-libs/gd[png] virtual/httpd-php:* mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
+REQUIRED_USE=|| ( agent frontend proxy server ) ?? ( gnutls mbedtls openssl ) proxy? ( ^^ ( mysql oracle postgres sqlite ) ) server? ( ^^ ( mysql oracle postgres ) !sqlite ) static? ( !oracle !snmp )
+SLOT=0/4.0
+SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/4.0/zabbix-4.0.48.tar.gz
+_eclasses_=java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	862d337d98edb576796827be2c6b11ca	user-info	9951b1a0e4f026d16c33a001fd2d5cdf	webapp	1aad5c010cfdf11d0376c80467b0de4c
+_md5_=dc18229cdca9d1312377797840ac7a1d
diff --git a/metadata/md5-cache/net-analyzer/zabbix-5.0.35 b/metadata/md5-cache/net-analyzer/zabbix-5.0.35
index 654ebdd03f95..29d22fc2e20b 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-5.0.35
+++ b/metadata/md5-cache/net-analyzer/zabbix-5.0.35
@@ -9,9 +9,9 @@ IUSE=+agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openi
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=curl? ( net-misc/curl ) gnutls? ( net-libs/gnutls:0= ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls:= net-nds/openldap:= ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c:= ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) openssl? ( dev-libs/openssl:=[-bindist(-)] ) oracle? ( dev-db/oracle-instantclient[odbc,sdk] ) postgres? ( dev-db/postgresql:* ) proxy? ( dev-libs/libevent:= sys-libs/zlib ) server? ( dev-libs/libevent:= sys-libs/zlib ) snmp? ( net-analyzer/net-snmp:= ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) acct-group/zabbix acct-user/zabbix java? ( >=virtual/jre-1.8:* ) mysql? ( virtual/mysql ) proxy? ( dev-libs/libpcre net-analyzer/fping[suid] ) selinux? ( sec-policy/selinux-zabbix ) server? ( app-admin/webapp-config dev-libs/libpcre net-analyzer/fping[suid] ) frontend? ( app-admin/webapp-config dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] media-libs/gd[png] virtual/httpd-php:* mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
-REQUIRED_USE=|| ( agent agent2 frontend proxy server ) ?? ( gnutls openssl ) proxy? ( ^^ ( mysql oracle postgres sqlite ) ) server? ( ^^ ( mysql oracle postgres ) !sqlite ) static? ( !oracle !snmp )
+REQUIRED_USE=|| ( agent agent2 frontend proxy server ) ?? ( gnutls openssl ) agent2 ( !gnutls ) proxy? ( ^^ ( mysql oracle postgres sqlite ) ) server? ( ^^ ( mysql oracle postgres ) !sqlite ) static? ( !oracle !snmp )
 RESTRICT=test strip
 SLOT=0/5.0
 SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/5.0/zabbix-5.0.35.tar.gz agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/zabbix-5.0.35-go-deps.tar.xz )
 _eclasses_=go-module	8624eede24936fd7666e5298e5332f22	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	862d337d98edb576796827be2c6b11ca	user-info	9951b1a0e4f026d16c33a001fd2d5cdf	webapp	1aad5c010cfdf11d0376c80467b0de4c
-_md5_=1f19451b1c1b2e02a61db62694a81574
+_md5_=31e77eaee7bc9b47f6ea00ff2f3b01e7
diff --git a/metadata/md5-cache/net-analyzer/zabbix-5.0.36 b/metadata/md5-cache/net-analyzer/zabbix-5.0.36
index 59daee19742a..a661ced023a1 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-5.0.36
+++ b/metadata/md5-cache/net-analyzer/zabbix-5.0.36
@@ -9,9 +9,9 @@ IUSE=+agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openi
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=curl? ( net-misc/curl ) gnutls? ( net-libs/gnutls:0= ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls:= net-nds/openldap:= ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c:= ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) openssl? ( dev-libs/openssl:=[-bindist(-)] ) oracle? ( dev-db/oracle-instantclient[odbc,sdk] ) postgres? ( dev-db/postgresql:* ) proxy? ( dev-libs/libevent:= sys-libs/zlib ) server? ( dev-libs/libevent:= sys-libs/zlib ) snmp? ( net-analyzer/net-snmp:= ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) acct-group/zabbix acct-user/zabbix java? ( >=virtual/jre-1.8:* ) mysql? ( virtual/mysql ) proxy? ( dev-libs/libpcre net-analyzer/fping[suid] ) selinux? ( sec-policy/selinux-zabbix ) server? ( app-admin/webapp-config dev-libs/libpcre net-analyzer/fping[suid] ) frontend? ( app-admin/webapp-config dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] media-libs/gd[png] virtual/httpd-php:* mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
-REQUIRED_USE=|| ( agent agent2 frontend proxy server ) ?? ( gnutls openssl ) proxy? ( ^^ ( mysql oracle postgres sqlite ) ) server? ( ^^ ( mysql oracle postgres ) !sqlite ) static? ( !oracle !snmp )
+REQUIRED_USE=|| ( agent agent2 frontend proxy server ) ?? ( gnutls openssl ) agent2 ( !gnutls ) proxy? ( ^^ ( mysql oracle postgres sqlite ) ) server? ( ^^ ( mysql oracle postgres ) !sqlite ) static? ( !oracle !snmp )
 RESTRICT=test strip
 SLOT=0/5.0
 SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/5.0/zabbix-5.0.36.tar.gz agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/zabbix-5.0.36-go-deps.tar.xz )
 _eclasses_=go-module	8624eede24936fd7666e5298e5332f22	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	862d337d98edb576796827be2c6b11ca	user-info	9951b1a0e4f026d16c33a001fd2d5cdf	webapp	1aad5c010cfdf11d0376c80467b0de4c
-_md5_=e89b6dd257277f892a8f8562343b792c
+_md5_=c09a60014d77795deed5ecffec5f3168
diff --git a/metadata/md5-cache/net-analyzer/zabbix-5.0.37 b/metadata/md5-cache/net-analyzer/zabbix-5.0.37
new file mode 100644
index 000000000000..d796fd5faa68
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/zabbix-5.0.37
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig agent2? ( >=dev-lang/go-1.12 app-arch/unzip ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup
+DEPEND=curl? ( net-misc/curl ) gnutls? ( net-libs/gnutls:0= ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls:= net-nds/openldap:= ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c:= ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) openssl? ( dev-libs/openssl:=[-bindist(-)] ) oracle? ( dev-db/oracle-instantclient[odbc,sdk] ) postgres? ( dev-db/postgresql:* ) proxy? ( dev-libs/libevent:= sys-libs/zlib ) server? ( dev-libs/libevent:= sys-libs/zlib ) snmp? ( net-analyzer/net-snmp:= ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) static? ( curl? ( net-misc/curl[static-libs] ) ldap? ( =dev-libs/cyrus-sasl-2*[static-libs] net-libs/gnutls[static-libs] net-nds/openldap[static-libs] ) libxml2? ( dev-libs/libxml2[static-libs] ) mysql? ( dev-db/mysql-connector-c[static-libs] ) odbc? ( dev-db/unixODBC[static-libs] ) postgres? ( dev-db/postgresql:*[static-libs] ) sqlite? ( dev-db/sqlite[static-libs] ) ssh? ( net-libs/libssh2 ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=ZABBIX is software for monitoring of your applications, network and servers
+EAPI=8
+HOMEPAGE=https://www.zabbix.com/
+INHERIT=webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info
+IUSE=+agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy selinux server snmp sqlite ssh static java
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=curl? ( net-misc/curl ) gnutls? ( net-libs/gnutls:0= ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls:= net-nds/openldap:= ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c:= ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) openssl? ( dev-libs/openssl:=[-bindist(-)] ) oracle? ( dev-db/oracle-instantclient[odbc,sdk] ) postgres? ( dev-db/postgresql:* ) proxy? ( dev-libs/libevent:= sys-libs/zlib ) server? ( dev-libs/libevent:= sys-libs/zlib ) snmp? ( net-analyzer/net-snmp:= ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) acct-group/zabbix acct-user/zabbix java? ( >=virtual/jre-1.8:* ) mysql? ( virtual/mysql ) proxy? ( dev-libs/libpcre net-analyzer/fping[suid] ) selinux? ( sec-policy/selinux-zabbix ) server? ( app-admin/webapp-config dev-libs/libpcre net-analyzer/fping[suid] ) frontend? ( app-admin/webapp-config dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] media-libs/gd[png] virtual/httpd-php:* mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
+REQUIRED_USE=|| ( agent agent2 frontend proxy server ) ?? ( gnutls openssl ) agent2 ( !gnutls ) proxy? ( ^^ ( mysql oracle postgres sqlite ) ) server? ( ^^ ( mysql oracle postgres ) !sqlite ) static? ( !oracle !snmp )
+RESTRICT=test strip
+SLOT=0/5.0
+SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/5.0/zabbix-5.0.37.tar.gz agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/zabbix-5.0.37-go-deps.tar.xz )
+_eclasses_=go-module	8624eede24936fd7666e5298e5332f22	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	862d337d98edb576796827be2c6b11ca	user-info	9951b1a0e4f026d16c33a001fd2d5cdf	webapp	1aad5c010cfdf11d0376c80467b0de4c
+_md5_=c09a60014d77795deed5ecffec5f3168
diff --git a/metadata/md5-cache/net-analyzer/zabbix-6.0.18 b/metadata/md5-cache/net-analyzer/zabbix-6.0.18
index 100bf81a7d97..68a1ace0593a 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-6.0.18
+++ b/metadata/md5-cache/net-analyzer/zabbix-6.0.18
@@ -9,9 +9,9 @@ IUSE=agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openip
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=curl? ( net-misc/curl ) gnutls? ( net-libs/gnutls:0= ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls:= net-nds/openldap:= ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c:= ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) openssl? ( dev-libs/openssl:=[-bindist(-)] ) oracle? ( dev-db/oracle-instantclient[odbc,sdk] ) postgres? ( dev-db/postgresql:* ) proxy? ( dev-libs/libevent:= sys-libs/zlib ) server? ( dev-libs/libevent:= sys-libs/zlib ) snmp? ( net-analyzer/net-snmp:= ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) acct-group/zabbix acct-user/zabbix java? ( >=virtual/jre-1.8:* ) mysql? ( virtual/mysql ) proxy? ( dev-libs/libpcre2:= net-analyzer/fping[suid] ) selinux? ( sec-policy/selinux-zabbix ) server? ( app-admin/webapp-config dev-libs/libpcre2:= net-analyzer/fping[suid] ) frontend? ( app-admin/webapp-config dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] media-libs/gd[png] virtual/httpd-php:* mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
-REQUIRED_USE=|| ( agent agent2 frontend proxy server ) ?? ( gnutls openssl ) proxy? ( ^^ ( mysql oracle postgres sqlite ) ) server? ( ^^ ( mysql oracle postgres ) !sqlite ) static? ( !oracle !snmp )
+REQUIRED_USE=|| ( agent agent2 frontend proxy server ) ?? ( gnutls openssl ) agent2 ( !gnutls ) proxy? ( ^^ ( mysql oracle postgres sqlite ) ) server? ( ^^ ( mysql oracle postgres ) !sqlite ) static? ( !oracle !snmp )
 RESTRICT=test strip
 SLOT=0/6.0
 SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/6.0/zabbix-6.0.18.tar.gz agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/zabbix-6.0.18-go-deps.tar.xz )
 _eclasses_=go-module	8624eede24936fd7666e5298e5332f22	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	862d337d98edb576796827be2c6b11ca	user-info	9951b1a0e4f026d16c33a001fd2d5cdf	webapp	1aad5c010cfdf11d0376c80467b0de4c
-_md5_=33afd9034ad574d7293e33e41438ddf3
+_md5_=6d10c413e5b7d844b0a62ef62ccdee5a
diff --git a/metadata/md5-cache/net-analyzer/zabbix-6.0.19 b/metadata/md5-cache/net-analyzer/zabbix-6.0.19
index 3e839ea76c0b..0c60a75085b7 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-6.0.19
+++ b/metadata/md5-cache/net-analyzer/zabbix-6.0.19
@@ -9,9 +9,9 @@ IUSE=agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openip
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=curl? ( net-misc/curl ) gnutls? ( net-libs/gnutls:0= ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls:= net-nds/openldap:= ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c:= ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) openssl? ( dev-libs/openssl:=[-bindist(-)] ) oracle? ( dev-db/oracle-instantclient[odbc,sdk] ) postgres? ( dev-db/postgresql:* ) proxy? ( dev-libs/libevent:= sys-libs/zlib ) server? ( dev-libs/libevent:= sys-libs/zlib ) snmp? ( net-analyzer/net-snmp:= ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) acct-group/zabbix acct-user/zabbix java? ( >=virtual/jre-1.8:* ) mysql? ( virtual/mysql ) proxy? ( dev-libs/libpcre2:= net-analyzer/fping[suid] ) selinux? ( sec-policy/selinux-zabbix ) server? ( app-admin/webapp-config dev-libs/libpcre2:= net-analyzer/fping[suid] ) frontend? ( app-admin/webapp-config dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] media-libs/gd[png] virtual/httpd-php:* mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
-REQUIRED_USE=|| ( agent agent2 frontend proxy server ) ?? ( gnutls openssl ) proxy? ( ^^ ( mysql oracle postgres sqlite ) ) server? ( ^^ ( mysql oracle postgres ) !sqlite ) static? ( !oracle !snmp )
+REQUIRED_USE=|| ( agent agent2 frontend proxy server ) ?? ( gnutls openssl ) agent2 ( !gnutls ) proxy? ( ^^ ( mysql oracle postgres sqlite ) ) server? ( ^^ ( mysql oracle postgres ) !sqlite ) static? ( !oracle !snmp )
 RESTRICT=test strip
 SLOT=0/6.0
 SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/6.0/zabbix-6.0.19.tar.gz agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/zabbix-6.0.19-go-deps.tar.xz )
 _eclasses_=go-module	8624eede24936fd7666e5298e5332f22	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	862d337d98edb576796827be2c6b11ca	user-info	9951b1a0e4f026d16c33a001fd2d5cdf	webapp	1aad5c010cfdf11d0376c80467b0de4c
-_md5_=807e53768757712518b7288e093f07d0
+_md5_=f09bc5acb58bc6847905868aef2e5c43
diff --git a/metadata/md5-cache/net-analyzer/zabbix-6.0.20 b/metadata/md5-cache/net-analyzer/zabbix-6.0.20
index 33ae9c8d79f0..4774e2ee7232 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-6.0.20
+++ b/metadata/md5-cache/net-analyzer/zabbix-6.0.20
@@ -9,9 +9,9 @@ IUSE=agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openip
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=curl? ( net-misc/curl ) gnutls? ( net-libs/gnutls:0= ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls:= net-nds/openldap:= ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c:= ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) openssl? ( dev-libs/openssl:=[-bindist(-)] ) oracle? ( dev-db/oracle-instantclient[odbc,sdk] ) postgres? ( dev-db/postgresql:* ) proxy? ( dev-libs/libevent:= sys-libs/zlib ) server? ( dev-libs/libevent:= sys-libs/zlib ) snmp? ( net-analyzer/net-snmp:= ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) acct-group/zabbix acct-user/zabbix java? ( >=virtual/jre-1.8:* ) mysql? ( virtual/mysql ) proxy? ( dev-libs/libpcre2:= net-analyzer/fping[suid] ) selinux? ( sec-policy/selinux-zabbix ) server? ( app-admin/webapp-config dev-libs/libpcre2:= net-analyzer/fping[suid] ) frontend? ( app-admin/webapp-config dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] media-libs/gd[png] virtual/httpd-php:* mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
-REQUIRED_USE=|| ( agent agent2 frontend proxy server ) ?? ( gnutls openssl ) proxy? ( ^^ ( mysql oracle postgres sqlite ) ) server? ( ^^ ( mysql oracle postgres ) !sqlite ) static? ( !oracle !snmp )
+REQUIRED_USE=|| ( agent agent2 frontend proxy server ) ?? ( gnutls openssl ) agent2 ( !gnutls ) proxy? ( ^^ ( mysql oracle postgres sqlite ) ) server? ( ^^ ( mysql oracle postgres ) !sqlite ) static? ( !oracle !snmp )
 RESTRICT=test strip
 SLOT=0/6.0
 SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/6.0/zabbix-6.0.20.tar.gz agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/zabbix-6.0.20-go-deps.tar.xz )
 _eclasses_=go-module	8624eede24936fd7666e5298e5332f22	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	862d337d98edb576796827be2c6b11ca	user-info	9951b1a0e4f026d16c33a001fd2d5cdf	webapp	1aad5c010cfdf11d0376c80467b0de4c
-_md5_=807e53768757712518b7288e093f07d0
+_md5_=f09bc5acb58bc6847905868aef2e5c43
diff --git a/metadata/md5-cache/net-analyzer/zabbix-6.0.21 b/metadata/md5-cache/net-analyzer/zabbix-6.0.21
new file mode 100644
index 000000000000..43fb780afe94
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/zabbix-6.0.21
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig agent2? ( >=dev-lang/go-1.12 app-arch/unzip ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup
+DEPEND=curl? ( net-misc/curl ) gnutls? ( net-libs/gnutls:0= ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls:= net-nds/openldap:= ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c:= ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) openssl? ( dev-libs/openssl:=[-bindist(-)] ) oracle? ( dev-db/oracle-instantclient[odbc,sdk] ) postgres? ( dev-db/postgresql:* ) proxy? ( dev-libs/libevent:= sys-libs/zlib ) server? ( dev-libs/libevent:= sys-libs/zlib ) snmp? ( net-analyzer/net-snmp:= ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) static? ( curl? ( net-misc/curl[static-libs] ) ldap? ( =dev-libs/cyrus-sasl-2*[static-libs] net-libs/gnutls[static-libs] net-nds/openldap[static-libs] ) libxml2? ( dev-libs/libxml2[static-libs] ) mysql? ( dev-db/mysql-connector-c[static-libs] ) odbc? ( dev-db/unixODBC[static-libs] ) postgres? ( dev-db/postgresql:*[static-libs] ) sqlite? ( dev-db/sqlite[static-libs] ) ssh? ( net-libs/libssh2 ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=ZABBIX is software for monitoring of your applications, network and servers
+EAPI=8
+HOMEPAGE=https://www.zabbix.com/
+INHERIT=webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info
+IUSE=agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy selinux server snmp sqlite ssh static java
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=curl? ( net-misc/curl ) gnutls? ( net-libs/gnutls:0= ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls:= net-nds/openldap:= ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c:= ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) openssl? ( dev-libs/openssl:=[-bindist(-)] ) oracle? ( dev-db/oracle-instantclient[odbc,sdk] ) postgres? ( dev-db/postgresql:* ) proxy? ( dev-libs/libevent:= sys-libs/zlib ) server? ( dev-libs/libevent:= sys-libs/zlib ) snmp? ( net-analyzer/net-snmp:= ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) acct-group/zabbix acct-user/zabbix java? ( >=virtual/jre-1.8:* ) mysql? ( virtual/mysql ) proxy? ( dev-libs/libpcre2:= net-analyzer/fping[suid] ) selinux? ( sec-policy/selinux-zabbix ) server? ( app-admin/webapp-config dev-libs/libpcre2:= net-analyzer/fping[suid] ) frontend? ( app-admin/webapp-config dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] media-libs/gd[png] virtual/httpd-php:* mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
+REQUIRED_USE=|| ( agent agent2 frontend proxy server ) ?? ( gnutls openssl ) agent2 ( !gnutls ) proxy? ( ^^ ( mysql oracle postgres sqlite ) ) server? ( ^^ ( mysql oracle postgres ) !sqlite ) static? ( !oracle !snmp )
+RESTRICT=test strip
+SLOT=0/6.0
+SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/6.0/zabbix-6.0.21.tar.gz agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/zabbix-6.0.21-go-deps.tar.xz )
+_eclasses_=go-module	8624eede24936fd7666e5298e5332f22	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	862d337d98edb576796827be2c6b11ca	user-info	9951b1a0e4f026d16c33a001fd2d5cdf	webapp	1aad5c010cfdf11d0376c80467b0de4c
+_md5_=f09bc5acb58bc6847905868aef2e5c43
diff --git a/metadata/md5-cache/net-analyzer/zabbix-6.4.3 b/metadata/md5-cache/net-analyzer/zabbix-6.4.3
index 5ac19a6eb2ed..7b1bc023ba76 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-6.4.3
+++ b/metadata/md5-cache/net-analyzer/zabbix-6.4.3
@@ -9,9 +9,9 @@ IUSE=agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openip
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=curl? ( net-misc/curl ) gnutls? ( net-libs/gnutls:0= ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls:= net-nds/openldap:= ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c:= ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) openssl? ( dev-libs/openssl:=[-bindist(-)] ) oracle? ( dev-db/oracle-instantclient[odbc,sdk] ) postgres? ( dev-db/postgresql:* ) proxy? ( dev-libs/libevent:= sys-libs/zlib ) server? ( dev-libs/libevent:= sys-libs/zlib ) snmp? ( net-analyzer/net-snmp:= ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) acct-group/zabbix acct-user/zabbix java? ( >=virtual/jre-1.8:* ) mysql? ( virtual/mysql ) proxy? ( dev-libs/libpcre2:= net-analyzer/fping[suid] ) selinux? ( sec-policy/selinux-zabbix ) server? ( app-admin/webapp-config dev-libs/libpcre2:= net-analyzer/fping[suid] ) frontend? ( app-admin/webapp-config dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] media-libs/gd[png] virtual/httpd-php:* mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
-REQUIRED_USE=|| ( agent agent2 frontend proxy server ) ?? ( gnutls openssl ) proxy? ( ^^ ( mysql oracle postgres sqlite ) ) server? ( ^^ ( mysql oracle postgres ) !sqlite ) static? ( !oracle !snmp )
+REQUIRED_USE=|| ( agent agent2 frontend proxy server ) ?? ( gnutls openssl ) agent2 ( !gnutls ) proxy? ( ^^ ( mysql oracle postgres sqlite ) ) server? ( ^^ ( mysql oracle postgres ) !sqlite ) static? ( !oracle !snmp )
 RESTRICT=test strip
 SLOT=0/6.4
 SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/6.4/zabbix-6.4.3.tar.gz agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/zabbix-6.4.3-go-deps.tar.xz )
 _eclasses_=go-module	8624eede24936fd7666e5298e5332f22	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	862d337d98edb576796827be2c6b11ca	user-info	9951b1a0e4f026d16c33a001fd2d5cdf	webapp	1aad5c010cfdf11d0376c80467b0de4c
-_md5_=758a3bef5913c23d415b42d7211207f0
+_md5_=0fe20a8dadc919647b90f857a91f9cff
diff --git a/metadata/md5-cache/net-analyzer/zabbix-6.4.4 b/metadata/md5-cache/net-analyzer/zabbix-6.4.4
index 7453664650af..a6fc83580ce0 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-6.4.4
+++ b/metadata/md5-cache/net-analyzer/zabbix-6.4.4
@@ -9,9 +9,9 @@ IUSE=agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openip
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=curl? ( net-misc/curl ) gnutls? ( net-libs/gnutls:0= ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls:= net-nds/openldap:= ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c:= ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) openssl? ( dev-libs/openssl:=[-bindist(-)] ) oracle? ( dev-db/oracle-instantclient[odbc,sdk] ) postgres? ( dev-db/postgresql:* ) proxy? ( dev-libs/libevent:= sys-libs/zlib ) server? ( dev-libs/libevent:= sys-libs/zlib ) snmp? ( net-analyzer/net-snmp:= ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) acct-group/zabbix acct-user/zabbix java? ( >=virtual/jre-1.8:* ) mysql? ( virtual/mysql ) proxy? ( dev-libs/libpcre2:= net-analyzer/fping[suid] ) selinux? ( sec-policy/selinux-zabbix ) server? ( app-admin/webapp-config dev-libs/libpcre2:= net-analyzer/fping[suid] ) frontend? ( app-admin/webapp-config dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] media-libs/gd[png] virtual/httpd-php:* mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
-REQUIRED_USE=|| ( agent agent2 frontend proxy server ) ?? ( gnutls openssl ) proxy? ( ^^ ( mysql oracle postgres sqlite ) ) server? ( ^^ ( mysql oracle postgres ) !sqlite ) static? ( !oracle !snmp )
+REQUIRED_USE=|| ( agent agent2 frontend proxy server ) ?? ( gnutls openssl ) agent2 ( !gnutls ) proxy? ( ^^ ( mysql oracle postgres sqlite ) ) server? ( ^^ ( mysql oracle postgres ) !sqlite ) static? ( !oracle !snmp )
 RESTRICT=test strip
 SLOT=0/6.4
 SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/6.4/zabbix-6.4.4.tar.gz agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/zabbix-6.4.4-go-deps.tar.xz )
 _eclasses_=go-module	8624eede24936fd7666e5298e5332f22	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	862d337d98edb576796827be2c6b11ca	user-info	9951b1a0e4f026d16c33a001fd2d5cdf	webapp	1aad5c010cfdf11d0376c80467b0de4c
-_md5_=1ee70fce2c8064b23262116cc7930737
+_md5_=9e3c1ddb83a9c968ca51ad001cbaca66
diff --git a/metadata/md5-cache/net-analyzer/zabbix-6.4.5 b/metadata/md5-cache/net-analyzer/zabbix-6.4.5
index 5ceb4eec0f46..18907489e55f 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-6.4.5
+++ b/metadata/md5-cache/net-analyzer/zabbix-6.4.5
@@ -9,9 +9,9 @@ IUSE=agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openip
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=curl? ( net-misc/curl ) gnutls? ( net-libs/gnutls:0= ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls:= net-nds/openldap:= ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c:= ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) openssl? ( dev-libs/openssl:=[-bindist(-)] ) oracle? ( dev-db/oracle-instantclient[odbc,sdk] ) postgres? ( dev-db/postgresql:* ) proxy? ( dev-libs/libevent:= sys-libs/zlib ) server? ( dev-libs/libevent:= sys-libs/zlib ) snmp? ( net-analyzer/net-snmp:= ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) acct-group/zabbix acct-user/zabbix java? ( >=virtual/jre-1.8:* ) mysql? ( virtual/mysql ) proxy? ( dev-libs/libpcre2:= net-analyzer/fping[suid] ) selinux? ( sec-policy/selinux-zabbix ) server? ( app-admin/webapp-config dev-libs/libpcre2:= net-analyzer/fping[suid] ) frontend? ( app-admin/webapp-config dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] media-libs/gd[png] virtual/httpd-php:* mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
-REQUIRED_USE=|| ( agent agent2 frontend proxy server ) ?? ( gnutls openssl ) proxy? ( ^^ ( mysql oracle postgres sqlite ) ) server? ( ^^ ( mysql oracle postgres ) !sqlite ) static? ( !oracle !snmp )
+REQUIRED_USE=|| ( agent agent2 frontend proxy server ) ?? ( gnutls openssl ) agent2 ( !gnutls ) proxy? ( ^^ ( mysql oracle postgres sqlite ) ) server? ( ^^ ( mysql oracle postgres ) !sqlite ) static? ( !oracle !snmp )
 RESTRICT=test strip
 SLOT=0/6.4
 SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/6.4/zabbix-6.4.5.tar.gz agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/zabbix-6.4.5-go-deps.tar.xz )
 _eclasses_=go-module	8624eede24936fd7666e5298e5332f22	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	862d337d98edb576796827be2c6b11ca	user-info	9951b1a0e4f026d16c33a001fd2d5cdf	webapp	1aad5c010cfdf11d0376c80467b0de4c
-_md5_=1ee70fce2c8064b23262116cc7930737
+_md5_=9e3c1ddb83a9c968ca51ad001cbaca66
diff --git a/metadata/md5-cache/net-analyzer/zabbix-6.4.6 b/metadata/md5-cache/net-analyzer/zabbix-6.4.6
new file mode 100644
index 000000000000..c101abfc71d1
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/zabbix-6.4.6
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig agent2? ( >=dev-lang/go-1.12 app-arch/unzip ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup
+DEPEND=curl? ( net-misc/curl ) gnutls? ( net-libs/gnutls:0= ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls:= net-nds/openldap:= ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c:= ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) openssl? ( dev-libs/openssl:=[-bindist(-)] ) oracle? ( dev-db/oracle-instantclient[odbc,sdk] ) postgres? ( dev-db/postgresql:* ) proxy? ( dev-libs/libevent:= sys-libs/zlib ) server? ( dev-libs/libevent:= sys-libs/zlib ) snmp? ( net-analyzer/net-snmp:= ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) static? ( curl? ( net-misc/curl[static-libs] ) ldap? ( =dev-libs/cyrus-sasl-2*[static-libs] net-libs/gnutls[static-libs] net-nds/openldap[static-libs] ) libxml2? ( dev-libs/libxml2[static-libs] ) mysql? ( dev-db/mysql-connector-c[static-libs] ) odbc? ( dev-db/unixODBC[static-libs] ) postgres? ( dev-db/postgresql:*[static-libs] ) sqlite? ( dev-db/sqlite[static-libs] ) ssh? ( net-libs/libssh2 ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=ZABBIX is software for monitoring of your applications, network and servers
+EAPI=8
+HOMEPAGE=https://www.zabbix.com/
+INHERIT=webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info
+IUSE=agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy selinux server snmp sqlite ssh static java
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=curl? ( net-misc/curl ) gnutls? ( net-libs/gnutls:0= ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls:= net-nds/openldap:= ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c:= ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) openssl? ( dev-libs/openssl:=[-bindist(-)] ) oracle? ( dev-db/oracle-instantclient[odbc,sdk] ) postgres? ( dev-db/postgresql:* ) proxy? ( dev-libs/libevent:= sys-libs/zlib ) server? ( dev-libs/libevent:= sys-libs/zlib ) snmp? ( net-analyzer/net-snmp:= ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) acct-group/zabbix acct-user/zabbix java? ( >=virtual/jre-1.8:* ) mysql? ( virtual/mysql ) proxy? ( dev-libs/libpcre2:= net-analyzer/fping[suid] ) selinux? ( sec-policy/selinux-zabbix ) server? ( app-admin/webapp-config dev-libs/libpcre2:= net-analyzer/fping[suid] ) frontend? ( app-admin/webapp-config dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] media-libs/gd[png] virtual/httpd-php:* mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
+REQUIRED_USE=|| ( agent agent2 frontend proxy server ) ?? ( gnutls openssl ) agent2 ( !gnutls ) proxy? ( ^^ ( mysql oracle postgres sqlite ) ) server? ( ^^ ( mysql oracle postgres ) !sqlite ) static? ( !oracle !snmp )
+RESTRICT=test strip
+SLOT=0/6.4
+SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/6.4/zabbix-6.4.6.tar.gz agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/zabbix-6.4.6-go-deps.tar.xz )
+_eclasses_=go-module	8624eede24936fd7666e5298e5332f22	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	862d337d98edb576796827be2c6b11ca	user-info	9951b1a0e4f026d16c33a001fd2d5cdf	webapp	1aad5c010cfdf11d0376c80467b0de4c
+_md5_=9e3c1ddb83a9c968ca51ad001cbaca66
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index e8dfd87cc263..805a96e732d7 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/libhackrf-2022.09.1 b/metadata/md5-cache/net-libs/libhackrf-2022.09.1
deleted file mode 100644
index 164de897cf6d..000000000000
--- a/metadata/md5-cache/net-libs/libhackrf-2022.09.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=virtual/libusb:1
-DESCRIPTION=library for communicating with HackRF SDR platform
-EAPI=8
-HOMEPAGE=http://greatscottgadgets.com/hackrf/
-INHERIT=cmake udev
-IUSE=+udev
-KEYWORDS=amd64 ~arm ~ppc ~riscv x86
-LICENSE=BSD
-RDEPEND=virtual/libusb:1
-SLOT=0/2022.09.1
-SRC_URI=https://github.com/greatscottgadgets/hackrf/releases/download/v2022.09.1/hackrf-2022.09.1.tar.xz
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	toolchain-funcs	862d337d98edb576796827be2c6b11ca	udev	eec0bbab06977f1cfc5597269c1fa152	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=bec3f761b57bda661d9370e521af1992
diff --git a/metadata/md5-cache/net-libs/libhackrf-2023.01.1 b/metadata/md5-cache/net-libs/libhackrf-2023.01.1
index 35bad862e25f..1b2ce7accc46 100644
--- a/metadata/md5-cache/net-libs/libhackrf-2023.01.1
+++ b/metadata/md5-cache/net-libs/libhackrf-2023.01.1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=http://greatscottgadgets.com/hackrf/
 INHERIT=cmake udev
 IUSE=+udev
-KEYWORDS=~amd64 ~arm ~ppc ~riscv ~x86
+KEYWORDS=amd64 arm ppc ~riscv x86
 LICENSE=BSD
 RDEPEND=virtual/libusb:1
 SLOT=0/2023.01.1
 SRC_URI=https://github.com/greatscottgadgets/hackrf/releases/download/v2023.01.1/hackrf-2023.01.1.tar.xz
 _eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	toolchain-funcs	862d337d98edb576796827be2c6b11ca	udev	eec0bbab06977f1cfc5597269c1fa152	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=b6147fa0e2755a106661665f7b3a3ab4
+_md5_=36e8de6a18ef816187203229bc65f8af
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index f1e4cde71ad4..e954fecefbeb 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/dhcpcd-10.0.2 b/metadata/md5-cache/net-misc/dhcpcd-10.0.2
index 8755420fd93a..171d962d4753 100644
--- a/metadata/md5-cache/net-misc/dhcpcd-10.0.2
+++ b/metadata/md5-cache/net-misc/dhcpcd-10.0.2
@@ -7,9 +7,9 @@ HOMEPAGE=https://github.com/NetworkConfiguration/dhcpcd/ https://roy.marples.nam
 INHERIT=systemd toolchain-funcs
 IUSE=debug +embedded ipv6 privsep +udev
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=BSD-2
+LICENSE=BSD-2 BSD ISC MIT
 RDEPEND=udev? ( virtual/udev ) privsep? ( acct-group/dhcpcd acct-user/dhcpcd )
 SLOT=0
 SRC_URI=https://github.com/NetworkConfiguration/dhcpcd/releases/download/v10.0.2/dhcpcd-10.0.2.tar.xz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=e580537da11d81b191c81f22e9cca5dd
+_md5_=a129ffb64a8a80a62828ebe9d04fb31d
diff --git a/metadata/md5-cache/net-misc/dropbox-178.4.4811 b/metadata/md5-cache/net-misc/dropbox-178.4.4811
deleted file mode 100644
index 0cf71590023a..000000000000
--- a/metadata/md5-cache/net-misc/dropbox-178.4.4811
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/patchelf virtual/pkgconfig
-DEFINED_PHASES=install postinst postrm preinst prepare unpack
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Dropbox daemon (pretends to be GUI-less)
-EAPI=7
-HOMEPAGE=https://www.dropbox.com/
-INHERIT=desktop pax-utils systemd xdg
-IUSE=selinux X
-KEYWORDS=~amd64 ~x86 ~x86-linux
-LICENSE=BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox
-RDEPEND=X? ( x11-themes/hicolor-icon-theme ) selinux? ( sec-policy/selinux-dropbox ) app-arch/bzip2 dev-libs/glib:2 dev-libs/libffi-compat:6 media-libs/fontconfig media-libs/freetype net-misc/wget sys-libs/zlib sys-libs/ncurses-compat:5 virtual/opengl x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXrender x11-libs/libxcb
-RESTRICT=mirror strip
-SLOT=0
-SRC_URI=amd64? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-178.4.4811.tar.gz ) x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-178.4.4811.tar.gz ) https://www.dropbox.com/sh/42f8d4kq6yt5lte/AAD69lhaw6gy46W8HfQAm0GSa/Glyph/Dropbox/SVG/DropboxGlyph_Blue.svg
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	multilib	c19072c3cd7ac5cb21de013f7e9832e0	pax-utils	91d47e5d20627c717aa878b9167c62a8	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=89d0b954ab3cc637e603f62e60b32bff
diff --git a/metadata/md5-cache/net-misc/dropbox-180.4.4912 b/metadata/md5-cache/net-misc/dropbox-180.4.4912
deleted file mode 100644
index 2bd45c25307a..000000000000
--- a/metadata/md5-cache/net-misc/dropbox-180.4.4912
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/patchelf virtual/pkgconfig
-DEFINED_PHASES=install postinst postrm preinst prepare unpack
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Dropbox daemon (pretends to be GUI-less)
-EAPI=7
-HOMEPAGE=https://www.dropbox.com/
-INHERIT=desktop pax-utils systemd xdg
-IUSE=selinux X
-KEYWORDS=~amd64 ~x86 ~x86-linux
-LICENSE=BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox
-RDEPEND=X? ( x11-themes/hicolor-icon-theme ) selinux? ( sec-policy/selinux-dropbox ) app-arch/bzip2 dev-libs/glib:2 dev-libs/libffi-compat:6 media-libs/fontconfig media-libs/freetype net-misc/wget sys-libs/zlib sys-libs/ncurses-compat:5 virtual/opengl x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXrender x11-libs/libxcb
-RESTRICT=mirror strip
-SLOT=0
-SRC_URI=amd64? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-180.4.4912.tar.gz ) x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-180.4.4912.tar.gz ) https://www.dropbox.com/sh/42f8d4kq6yt5lte/AAD69lhaw6gy46W8HfQAm0GSa/Glyph/Dropbox/SVG/DropboxGlyph_Blue.svg
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	multilib	c19072c3cd7ac5cb21de013f7e9832e0	pax-utils	91d47e5d20627c717aa878b9167c62a8	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=89d0b954ab3cc637e603f62e60b32bff
diff --git a/metadata/md5-cache/net-misc/dropbox-177.4.5399 b/metadata/md5-cache/net-misc/dropbox-181.4.5678
index da9cd5b9bfc9..d22aaa3abdd8 100644
--- a/metadata/md5-cache/net-misc/dropbox-177.4.5399
+++ b/metadata/md5-cache/net-misc/dropbox-181.4.5678
@@ -11,6 +11,6 @@ LICENSE=BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox
 RDEPEND=X? ( x11-themes/hicolor-icon-theme ) selinux? ( sec-policy/selinux-dropbox ) app-arch/bzip2 dev-libs/glib:2 dev-libs/libffi-compat:6 media-libs/fontconfig media-libs/freetype net-misc/wget sys-libs/zlib sys-libs/ncurses-compat:5 virtual/opengl x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXrender x11-libs/libxcb
 RESTRICT=mirror strip
 SLOT=0
-SRC_URI=amd64? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-177.4.5399.tar.gz ) x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-177.4.5399.tar.gz ) https://www.dropbox.com/sh/42f8d4kq6yt5lte/AAD69lhaw6gy46W8HfQAm0GSa/Glyph/Dropbox/SVG/DropboxGlyph_Blue.svg
+SRC_URI=amd64? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-181.4.5678.tar.gz ) x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-181.4.5678.tar.gz ) https://www.dropbox.com/sh/42f8d4kq6yt5lte/AAD69lhaw6gy46W8HfQAm0GSa/Glyph/Dropbox/SVG/DropboxGlyph_Blue.svg
 _eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	multilib	c19072c3cd7ac5cb21de013f7e9832e0	pax-utils	91d47e5d20627c717aa878b9167c62a8	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=5953c4837ec669603a5ae2dc04554571
diff --git a/metadata/md5-cache/net-p2p/Manifest.gz b/metadata/md5-cache/net-p2p/Manifest.gz
index f793be9b13b8..f004f012f1d1 100644
--- a/metadata/md5-cache/net-p2p/Manifest.gz
+++ b/metadata/md5-cache/net-p2p/Manifest.gz
diff --git a/metadata/md5-cache/net-p2p/transmission-9999 b/metadata/md5-cache/net-p2p/transmission-9999
index 177de8701f39..1eeb179b5440 100644
--- a/metadata/md5-cache/net-p2p/transmission-9999
+++ b/metadata/md5-cache/net-p2p/transmission-9999
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig nls? ( gtk? ( sys-devel/gettext ) ) qt5? ( dev-qt/linguist-tools:5 ) qt6? ( dev-qt/qttools:6[linguist] ) >=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 postinst postrm prepare test unpack
-DEPEND=>=dev-libs/libevent-2.1.0:=[threads(+)] !mbedtls? ( dev-libs/openssl:0= ) mbedtls? ( net-libs/mbedtls:0= ) net-libs/libnatpmp >=net-libs/libpsl-0.21.1 >=net-libs/miniupnpc-1.7:= >=net-misc/curl-7.28.0[ssl] sys-libs/zlib:= nls? ( virtual/libintl ) gtk? ( >=dev-cpp/gtkmm-3.24.0:4.0 >=dev-cpp/glibmm-2.60.0:2.68 appindicator? ( dev-libs/libayatana-appindicator ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 ) qt6? ( dev-qt/qtbase:6[dbus,gui,network,widgets] dev-qt/qtsvg:6 ) systemd? ( >=sys-apps/systemd-209:= ) nls? ( virtual/libintl )
+DEPEND=>=dev-libs/libevent-2.1.0:=[threads(+)] !mbedtls? ( dev-libs/openssl:0= ) mbedtls? ( net-libs/mbedtls:0= ) net-libs/libnatpmp >=net-libs/libpsl-0.21.1 >=net-libs/miniupnpc-1.7:= >=net-misc/curl-7.28.0[ssl] sys-libs/zlib:= nls? ( virtual/libintl ) gtk? ( >=dev-cpp/gtkmm-4.11.1:4.0 >=dev-cpp/glibmm-2.60.0:2.68 appindicator? ( dev-libs/libayatana-appindicator ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 ) qt6? ( dev-qt/qtbase:6[dbus,gui,network,widgets] dev-qt/qtsvg:6 ) systemd? ( >=sys-apps/systemd-209:= ) nls? ( virtual/libintl )
 DESCRIPTION=A fast, easy, and free BitTorrent client
 EAPI=8
 HOMEPAGE=https://transmissionbt.com/
@@ -8,9 +8,9 @@ INHERIT=cmake flag-o-matic tmpfiles systemd xdg-utils git-r3
 IUSE=appindicator cli debug gtk nls mbedtls qt5 qt6 systemd test
 LICENSE=|| ( GPL-2 GPL-3 Transmission-OpenSSL-exception ) GPL-2 MIT
 PROPERTIES=live
-RDEPEND=>=dev-libs/libevent-2.1.0:=[threads(+)] !mbedtls? ( dev-libs/openssl:0= ) mbedtls? ( net-libs/mbedtls:0= ) net-libs/libnatpmp >=net-libs/libpsl-0.21.1 >=net-libs/miniupnpc-1.7:= >=net-misc/curl-7.28.0[ssl] sys-libs/zlib:= nls? ( virtual/libintl ) gtk? ( >=dev-cpp/gtkmm-3.24.0:4.0 >=dev-cpp/glibmm-2.60.0:2.68 appindicator? ( dev-libs/libayatana-appindicator ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 ) qt6? ( dev-qt/qtbase:6[dbus,gui,network,widgets] dev-qt/qtsvg:6 ) systemd? ( >=sys-apps/systemd-209:= ) acct-group/transmission acct-user/transmission virtual/tmpfiles
+RDEPEND=>=dev-libs/libevent-2.1.0:=[threads(+)] !mbedtls? ( dev-libs/openssl:0= ) mbedtls? ( net-libs/mbedtls:0= ) net-libs/libnatpmp >=net-libs/libpsl-0.21.1 >=net-libs/miniupnpc-1.7:= >=net-misc/curl-7.28.0[ssl] sys-libs/zlib:= nls? ( virtual/libintl ) gtk? ( >=dev-cpp/gtkmm-4.11.1:4.0 >=dev-cpp/glibmm-2.60.0:2.68 appindicator? ( dev-libs/libayatana-appindicator ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 ) qt6? ( dev-qt/qtbase:6[dbus,gui,network,widgets] dev-qt/qtsvg:6 ) systemd? ( >=sys-apps/systemd-209:= ) acct-group/transmission acct-user/transmission virtual/tmpfiles
 REQUIRED_USE=?? ( qt5 qt6 )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=16df4f069a2cfb593dfafcaec7db7412
+_md5_=351e905bfa23d0420f0a7ef3daec347a
diff --git a/metadata/md5-cache/net-wireless/Manifest.gz b/metadata/md5-cache/net-wireless/Manifest.gz
index 3f23a0e762e2..028bcce0f042 100644
--- a/metadata/md5-cache/net-wireless/Manifest.gz
+++ b/metadata/md5-cache/net-wireless/Manifest.gz
diff --git a/metadata/md5-cache/net-wireless/bluez-5.66-r1 b/metadata/md5-cache/net-wireless/bluez-5.66-r1
deleted file mode 100644
index 871dbf499efc..000000000000
--- a/metadata/md5-cache/net-wireless/bluez-5.66-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-python/docutils virtual/pkgconfig test? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_10? ( >=dev-python/dbus-python-1[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/dbus-python-1[python_targets_python3_11(-)] dev-python/pygobject:3[python_targets_python3_11(-)] ) ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-libs/glib-2.28:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] btpclient? ( >=dev-libs/ell-0.39 ) cups? ( net-print/cups:= ) mesh? ( >=dev-libs/ell-0.39 >=dev-libs/json-c-0.13:= sys-libs/readline:0= ) midi? ( media-libs/alsa-lib ) obex? ( dev-libs/libical:= ) readline? ( sys-libs/readline:0= ) systemd? ( sys-apps/systemd ) >=sys-apps/dbus-1.6:= udev? ( >=virtual/udev-172 )
-DESCRIPTION=Bluetooth Tools and System Daemons for Linux
-EAPI=8
-HOMEPAGE=http://www.bluez.org
-INHERIT=autotools linux-info python-single-r1 systemd udev multilib-minimal
-IUSE=btpclient cups doc debug deprecated extra-tools experimental +mesh midi +obex +readline selinux systemd test test-programs +udev python_single_target_python3_10 python_single_target_python3_11 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=amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=dev-libs/glib-2.28:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] btpclient? ( >=dev-libs/ell-0.39 ) cups? ( net-print/cups:= ) mesh? ( >=dev-libs/ell-0.39 >=dev-libs/json-c-0.13:= sys-libs/readline:0= ) midi? ( media-libs/alsa-lib ) obex? ( dev-libs/libical:= ) readline? ( sys-libs/readline:0= ) systemd? ( sys-apps/systemd ) >=sys-apps/dbus-1.6:= udev? ( >=virtual/udev-172 ) deprecated? ( !net-wireless/bluez-hcidump ) selinux? ( sec-policy/selinux-bluetooth ) test-programs? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_10? ( >=dev-python/dbus-python-1[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/dbus-python-1[python_targets_python3_11(-)] dev-python/pygobject:3[python_targets_python3_11(-)] ) )
-REQUIRED_USE=btpclient? ( mesh ) extra-tools? ( deprecated readline ) test? ( ^^ ( python_single_target_python3_10 python_single_target_python3_11 ) ) test-programs? ( ^^ ( python_single_target_python3_10 python_single_target_python3_11 ) )
-RESTRICT=!test? ( test )
-SLOT=0/3
-SRC_URI=https://www.kernel.org/pub/linux/bluetooth/bluez-5.66.tar.xz
-_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	862d337d98edb576796827be2c6b11ca	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=5b8a95a933499be7dd1aef4861178b1d
diff --git a/metadata/md5-cache/net-wireless/bluez-5.68 b/metadata/md5-cache/net-wireless/bluez-5.68
index 69b8f50e7a37..9c6ad2a4c52b 100644
--- a/metadata/md5-cache/net-wireless/bluez-5.68
+++ b/metadata/md5-cache/net-wireless/bluez-5.68
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/3
 SRC_URI=https://www.kernel.org/pub/linux/bluetooth/bluez-5.68.tar.xz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	862d337d98edb576796827be2c6b11ca	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=facfce15b5cc0db59fb1a87e78974060
+_md5_=a550d0ea5c385170528b50d91d18e589
diff --git a/metadata/md5-cache/net-wireless/hackrf-tools-2022.09.1 b/metadata/md5-cache/net-wireless/hackrf-tools-2022.09.1
deleted file mode 100644
index afb2bc84510c..000000000000
--- a/metadata/md5-cache/net-wireless/hackrf-tools-2022.09.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=~net-libs/libhackrf-2022.09.1:= sci-libs/fftw:3.0=
-DESCRIPTION=tools for communicating with HackRF SDR platform
-EAPI=8
-HOMEPAGE=http://greatscottgadgets.com/hackrf/
-INHERIT=cmake
-KEYWORDS=~amd64 ~arm ~ppc ~x86
-LICENSE=BSD
-RDEPEND=~net-libs/libhackrf-2022.09.1:= sci-libs/fftw:3.0=
-SLOT=0
-SRC_URI=https://github.com/greatscottgadgets/hackrf/releases/download/v2022.09.1/hackrf-2022.09.1.tar.xz
-_eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=fc1bf1f472e913bbc15f691589159669
diff --git a/metadata/md5-cache/net-wireless/hackrf-tools-2023.01.1 b/metadata/md5-cache/net-wireless/hackrf-tools-2023.01.1
index ed54343a1b08..c9230da75069 100644
--- a/metadata/md5-cache/net-wireless/hackrf-tools-2023.01.1
+++ b/metadata/md5-cache/net-wireless/hackrf-tools-2023.01.1
@@ -5,10 +5,10 @@ DESCRIPTION=tools for communicating with HackRF SDR platform
 EAPI=8
 HOMEPAGE=http://greatscottgadgets.com/hackrf/
 INHERIT=cmake
-KEYWORDS=~amd64 ~arm ~ppc ~x86
+KEYWORDS=amd64 arm ppc x86
 LICENSE=BSD
 RDEPEND=~net-libs/libhackrf-2023.01.1:= sci-libs/fftw:3.0=
 SLOT=0
 SRC_URI=https://github.com/greatscottgadgets/hackrf/releases/download/v2023.01.1/hackrf-2023.01.1.tar.xz
 _eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=1971958fba35afda494af8e246319870
+_md5_=d6683089ac7639bc13a55f957db4c5c1
diff --git a/metadata/md5-cache/net-wireless/iw-5.19 b/metadata/md5-cache/net-wireless/iw-5.19
index 76654c71299e..25cec44f4f3a 100644
--- a/metadata/md5-cache/net-wireless/iw-5.19
+++ b/metadata/md5-cache/net-wireless/iw-5.19
@@ -5,10 +5,10 @@ DESCRIPTION=nl80211 configuration utility for wireless devices using the mac8021
 EAPI=8
 HOMEPAGE=https://wireless.wiki.kernel.org/en/users/Documentation/iw
 INHERIT=toolchain-funcs
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm ~arm64 ~loong ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux
 LICENSE=ISC
 RDEPEND=dev-libs/libnl:=
 SLOT=0
 SRC_URI=https://mirrors.edge.kernel.org/pub/software/network/iw/iw-5.19.tar.xz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=41b88f179381227650990fa02378dc15
+_md5_=5fef6fa73ae8ebc6c3b2f92c7b37fdf9
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index 659b2ca8d541..e6348a51ad63 100644
--- a/metadata/md5-cache/sci-libs/Manifest.gz
+++ b/metadata/md5-cache/sci-libs/Manifest.gz
diff --git a/metadata/md5-cache/sci-libs/libcifpp-5.1.0.1 b/metadata/md5-cache/sci-libs/libcifpp-5.1.2
index b4a61a816d11..7bfb0d60aafe 100644
--- a/metadata/md5-cache/sci-libs/libcifpp-5.1.0.1
+++ b/metadata/md5-cache/sci-libs/libcifpp-5.1.2
@@ -11,6 +11,6 @@ LICENSE=BSD-2
 RDEPEND=dev-cpp/eigen:3 dev-libs/boost:=
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/PDB-REDO/libcifpp/archive/refs/tags/v5.1.0.1.tar.gz -> libcifpp-5.1.0.1.tar.gz https://dev.gentoo.org/~pacho/libcifpp/libcifpp-5.1.0.1-components.cif.xz
+SRC_URI=https://github.com/PDB-REDO/libcifpp/archive/refs/tags/v5.1.2.tar.gz -> libcifpp-5.1.2.tar.gz https://dev.gentoo.org/~pacho/libcifpp/libcifpp-5.1.2-components.cif.xz
 _eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=b956e76c2cfa2b1802284d3b81029f36
+_md5_=0d3f894159a91f96936835eca9692cfc
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 583bd347d0ac..2ddca68544d8 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/earlyoom-1.3 b/metadata/md5-cache/sys-apps/earlyoom-1.3
deleted file mode 100644
index 795ee95e89a5..000000000000
--- a/metadata/md5-cache/sys-apps/earlyoom-1.3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=docs? ( virtual/pandoc ) test? ( dev-lang/go ) virtual/pkgconfig
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=Early OOM Daemon for Linux
-EAPI=7
-HOMEPAGE=https://github.com/rfjakob/earlyoom
-INHERIT=systemd
-IUSE=docs systemd test
-KEYWORDS=amd64 x86
-LICENSE=MIT-with-advertising
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/rfjakob/earlyoom/archive/v1.3.tar.gz -> earlyoom-1.3.tar.gz
-_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=92f9e0e2081a34c331ea86c16a9d7068
diff --git a/metadata/md5-cache/sys-apps/earlyoom-1.7 b/metadata/md5-cache/sys-apps/earlyoom-1.7-r1
index 10a785c0dbbd..216c77c25f90 100644
--- a/metadata/md5-cache/sys-apps/earlyoom-1.7
+++ b/metadata/md5-cache/sys-apps/earlyoom-1.7-r1
@@ -1,14 +1,14 @@
-BDEPEND=man? ( virtual/pandoc ) test? ( dev-lang/go ) virtual/pkgconfig
+BDEPEND=man? ( virtual/pandoc ) test? ( dev-lang/go dev-util/cppcheck ) virtual/pkgconfig
 DEFINED_PHASES=compile install unpack
 DESCRIPTION=Early OOM Daemon for Linux
 EAPI=8
 HOMEPAGE=https://github.com/rfjakob/earlyoom
 INHERIT=go-module systemd toolchain-funcs
 IUSE=man test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT-with-advertising
 RESTRICT=!test? ( test ) strip
 SLOT=0
 SRC_URI=https://github.com/rfjakob/earlyoom/archive/v1.7.tar.gz -> earlyoom-1.7.tar.gz test? ( https://dev.gentoo.org/~sam/distfiles/sys-apps/earlyoom/earlyoom-1.7-deps.tar.xz )
 _eclasses_=go-module	8624eede24936fd7666e5298e5332f22	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=5f8dcfcaffef40d4cc368783a4eff8da
+_md5_=54a3dd6f054c1ac9e6456e3d71beaafd
diff --git a/metadata/md5-cache/sys-auth/Manifest.gz b/metadata/md5-cache/sys-auth/Manifest.gz
index 20f90b2b3a9e..4a54c3de5485 100644
--- a/metadata/md5-cache/sys-auth/Manifest.gz
+++ b/metadata/md5-cache/sys-auth/Manifest.gz
diff --git a/metadata/md5-cache/sys-auth/seatd-0.8.0 b/metadata/md5-cache/sys-auth/seatd-0.8.0
index 70112834cc1e..e64025f5ff88 100644
--- a/metadata/md5-cache/sys-auth/seatd-0.8.0
+++ b/metadata/md5-cache/sys-auth/seatd-0.8.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://sr.ht/~kennylevinsen/seatd
 INHERIT=meson systemd
 IUSE=builtin elogind server systemd
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=MIT
 RDEPEND=elogind? ( sys-auth/elogind ) systemd? ( sys-apps/systemd:= ) server? ( acct-group/seat )
 REQUIRED_USE=?? ( elogind systemd )
 SLOT=0/1
 SRC_URI=https://git.sr.ht/~kennylevinsen/seatd/archive/0.8.0.tar.gz -> seatd-0.8.0.tar.gz
 _eclasses_=meson	08b7183c3f4811568ee93eb0f79a89fe	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=54352ec1f9b33f4843e349107e409814
+_md5_=34d115a41f16b51992b88974b8c2d8ae
diff --git a/metadata/md5-cache/sys-cluster/Manifest.gz b/metadata/md5-cache/sys-cluster/Manifest.gz
index 637bb56fffe1..8b34eb7946bd 100644
--- a/metadata/md5-cache/sys-cluster/Manifest.gz
+++ b/metadata/md5-cache/sys-cluster/Manifest.gz
diff --git a/metadata/md5-cache/sys-cluster/kube-apiserver-1.28.0 b/metadata/md5-cache/sys-cluster/kube-apiserver-1.28.0
index c569488ef2e6..c73e167e0408 100644
--- a/metadata/md5-cache/sys-cluster/kube-apiserver-1.28.0
+++ b/metadata/md5-cache/sys-cluster/kube-apiserver-1.28.0
@@ -13,4 +13,4 @@ RESTRICT=test strip
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.28.0.tar.gz -> kubernetes-1.28.0.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	8624eede24936fd7666e5298e5332f22	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=182bc0e78f5ab17081d5a3772a479e05
+_md5_=2aa6686c3303124aa4b6b1708f046646
diff --git a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.28.0 b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.28.0
index ec74e2c1314c..ac724284192a 100644
--- a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.28.0
+++ b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.28.0
@@ -13,4 +13,4 @@ RESTRICT=test strip
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.28.0.tar.gz -> kubernetes-1.28.0.tar.gz
 _eclasses_=go-module	8624eede24936fd7666e5298e5332f22	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=62a3c14e299807b47eb3b27a31eea7a1
+_md5_=00ce4ade79b5f270ba3ce4c82ef942d2
diff --git a/metadata/md5-cache/sys-cluster/kube-proxy-1.28.0 b/metadata/md5-cache/sys-cluster/kube-proxy-1.28.0
index eda1c1452c72..7a75d8f79212 100644
--- a/metadata/md5-cache/sys-cluster/kube-proxy-1.28.0
+++ b/metadata/md5-cache/sys-cluster/kube-proxy-1.28.0
@@ -12,4 +12,4 @@ RESTRICT=test strip
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.28.0.tar.gz -> kubernetes-1.28.0.tar.gz
 _eclasses_=go-module	8624eede24936fd7666e5298e5332f22	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=276ed390a7fc626ede6afd7e73e8e7f4
+_md5_=a080d389c6c80dd6cb60bb128a0ededb
diff --git a/metadata/md5-cache/sys-cluster/kube-scheduler-1.28.0 b/metadata/md5-cache/sys-cluster/kube-scheduler-1.28.0
index 82db8a195cb3..9739a728f0da 100644
--- a/metadata/md5-cache/sys-cluster/kube-scheduler-1.28.0
+++ b/metadata/md5-cache/sys-cluster/kube-scheduler-1.28.0
@@ -13,4 +13,4 @@ RESTRICT=test strip
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.28.0.tar.gz -> kubernetes-1.28.0.tar.gz
 _eclasses_=go-module	8624eede24936fd7666e5298e5332f22	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=404fed16e70d97c82f1ee543056b2d76
+_md5_=9929e15947e59f1db80b3829482c637d
diff --git a/metadata/md5-cache/sys-cluster/kubeadm-1.28.0 b/metadata/md5-cache/sys-cluster/kubeadm-1.28.0
index dff8d2aa3b40..7c6290af5aa6 100644
--- a/metadata/md5-cache/sys-cluster/kubeadm-1.28.0
+++ b/metadata/md5-cache/sys-cluster/kubeadm-1.28.0
@@ -12,4 +12,4 @@ RESTRICT=test strip
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.28.0.tar.gz -> kubernetes-1.28.0.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	8624eede24936fd7666e5298e5332f22	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=78baec609a4d6f93016d6479ad3ee3a1
+_md5_=dc013eec786da76bf4bd0392a6c32345
diff --git a/metadata/md5-cache/sys-cluster/kubectl-1.28.0 b/metadata/md5-cache/sys-cluster/kubectl-1.28.0
index 45a940c5ab39..8954a587be30 100644
--- a/metadata/md5-cache/sys-cluster/kubectl-1.28.0
+++ b/metadata/md5-cache/sys-cluster/kubectl-1.28.0
@@ -11,4 +11,4 @@ RESTRICT=test strip
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.28.0.tar.gz -> kubernetes-1.28.0.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	8624eede24936fd7666e5298e5332f22	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=886b95a692bdfcddb2520d2994f7caff
+_md5_=46c64dd41449f5b638e9db56752faf4c
diff --git a/metadata/md5-cache/sys-cluster/kubelet-1.28.0 b/metadata/md5-cache/sys-cluster/kubelet-1.28.0
index 191deb0c1219..e4803f375727 100644
--- a/metadata/md5-cache/sys-cluster/kubelet-1.28.0
+++ b/metadata/md5-cache/sys-cluster/kubelet-1.28.0
@@ -12,4 +12,4 @@ RESTRICT=test strip
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.28.0.tar.gz -> kubernetes-1.28.0.tar.gz
 _eclasses_=go-module	8624eede24936fd7666e5298e5332f22	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=ce51271df73a73f0a9ffe9bfb4e679e3
+_md5_=185e5e6e1af861354ebbc211a8149875
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index 6012e701e5b7..04a76ef798a1 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/mold-2.1.0 b/metadata/md5-cache/sys-devel/mold-2.1.0
index 2b4267ba0098..180cb2c98b8d 100644
--- a/metadata/md5-cache/sys-devel/mold-2.1.0
+++ b/metadata/md5-cache/sys-devel/mold-2.1.0
@@ -5,10 +5,10 @@ DESCRIPTION=A Modern Linker
 EAPI=8
 HOMEPAGE=https://github.com/rui314/mold
 INHERIT=cmake toolchain-funcs
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86
 LICENSE=MIT BSD-2
 RDEPEND=app-arch/zstd:= >=dev-cpp/tbb-2021.7.0-r1:= sys-libs/zlib !kernel_Darwin? ( >=dev-libs/mimalloc-2:= dev-libs/openssl:= )
 SLOT=0
 SRC_URI=https://github.com/rui314/mold/archive/refs/tags/v2.1.0.tar.gz -> mold-2.1.0.tar.gz
 _eclasses_=cmake	ea305d3be967deed8faa5c9e94f9aee4	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=6e112d0fa1223e39cb69009bdaa59a9e
+_md5_=1211e4c1068212698d8673b6d3fb0a70
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index 22f4e6e0bfd9..74734ea23643 100644
--- a/metadata/md5-cache/sys-kernel/Manifest.gz
+++ b/metadata/md5-cache/sys-kernel/Manifest.gz
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-6.1.47 b/metadata/md5-cache/sys-kernel/gentoo-kernel-6.1.47
new file mode 100644
index 000000000000..bcc183bab9b0
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-6.1.47
@@ -0,0 +1,18 @@
+BDEPEND=debug? ( dev-util/pahole ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) sparc? ( app-emulation/qemu[qemu_softmmu_targets_sparc,qemu_softmmu_targets_sparc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf app-alternatives/yacc arm? ( sys-apps/dtc ) arm64? ( sys-apps/dtc ) riscv? ( sys-apps/dtc )
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
+DESCRIPTION=Linux kernel built with Gentoo patches
+EAPI=8
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Distribution_Kernel https://www.kernel.org/
+IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+INHERIT=kernel-build toolchain-funcs
+IUSE=debug hardened savedconfig +initramfs test +strip
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-6.1.47
+RDEPEND=!sys-kernel/gentoo-kernel-bin:6.1.47 virtual/libelf
+REQUIRED_USE=arm? ( savedconfig ) hppa? ( savedconfig ) riscv? ( savedconfig ) sparc? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=6.1.47
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.1.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.1-53.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.1-53.extras.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g7.tar.gz -> gentoo-kernel-config-g7.tar.gz amd64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.1.7-gentoo/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.6.1.7-gentoo ) arm64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.1.7-gentoo/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.6.1.7-gentoo ) ppc64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.1.7-gentoo/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.6.1.7-gentoo ) x86? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.1.7-gentoo/kernel-i686-fedora.config -> kernel-i686-fedora.config.6.1.7-gentoo )
+_eclasses_=dist-kernel-utils	fd205e63d2f09e517140e6fd10ebcf78	kernel-build	cc744067c788ff3c8bdfbfd4d87b0baf	kernel-install	52229b24889f7b6722ed29332a1db67a	mount-boot	3945d351ee3192381911f938f4ee527a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	a74d533f258f1f435be71312558c12f9	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	savedconfig	8b5f9d995a970e49cd427c55d5840285	toolchain-funcs	862d337d98edb576796827be2c6b11ca
+_md5_=129e61715c0a8f4a792020a1c7ef36a2
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-6.4.12 b/metadata/md5-cache/sys-kernel/gentoo-kernel-6.4.12
new file mode 100644
index 000000000000..b3c444423ac9
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-6.4.12
@@ -0,0 +1,18 @@
+BDEPEND=debug? ( dev-util/pahole ) secureboot? ( app-crypt/sbsigntools ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) sparc? ( app-emulation/qemu[qemu_softmmu_targets_sparc,qemu_softmmu_targets_sparc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf app-alternatives/yacc arm? ( sys-apps/dtc ) arm64? ( sys-apps/dtc ) riscv? ( sys-apps/dtc ) modules-sign? ( dev-libs/openssl )
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
+DESCRIPTION=Linux kernel built with Gentoo patches
+EAPI=8
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Distribution_Kernel https://www.kernel.org/
+IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+INHERIT=kernel-build toolchain-funcs
+IUSE=debug hardened savedconfig secureboot +initramfs test +strip modules-sign
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-6.4.12
+RDEPEND=!sys-kernel/gentoo-kernel-bin:6.4.12 virtual/libelf
+REQUIRED_USE=arm? ( savedconfig ) hppa? ( savedconfig ) riscv? ( savedconfig ) sparc? ( savedconfig ) secureboot? ( modules-sign )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=6.4.12
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.4-14.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.4-14.extras.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g7.tar.gz -> gentoo-kernel-config-g7.tar.gz amd64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.4.3-gentoo/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.6.4.3-gentoo ) arm64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.4.3-gentoo/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.6.4.3-gentoo ) ppc64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.4.3-gentoo/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.6.4.3-gentoo ) x86? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.4.3-gentoo/kernel-i686-fedora.config -> kernel-i686-fedora.config.6.4.3-gentoo )
+_eclasses_=dist-kernel-utils	fd205e63d2f09e517140e6fd10ebcf78	kernel-build	cc744067c788ff3c8bdfbfd4d87b0baf	kernel-install	52229b24889f7b6722ed29332a1db67a	mount-boot	3945d351ee3192381911f938f4ee527a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	a74d533f258f1f435be71312558c12f9	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	savedconfig	8b5f9d995a970e49cd427c55d5840285	secureboot	4548d1753e1d9b2313836e4e517cef82	toolchain-funcs	862d337d98edb576796827be2c6b11ca
+_md5_=8c7fb1cff6df754ca4ba2f888bae21e0
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-6.1.47 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-6.1.47
new file mode 100644
index 000000000000..90234f493702
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-6.1.47
@@ -0,0 +1,17 @@
+BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf app-alternatives/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) sparc? ( app-emulation/qemu[qemu_softmmu_targets_sparc,qemu_softmmu_targets_sparc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with Gentoo patches
+EAPI=8
+HOMEPAGE=https://www.kernel.org/
+IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+INHERIT=kernel-install toolchain-funcs unpacker
+IUSE=+initramfs test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-6.1.47
+RDEPEND=!sys-kernel/gentoo-kernel:6.1.47 virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=6.1.47
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.1.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.1-53.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.1-53.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.47-1.gpkg.tar -> gentoo-kernel-6.1.47-1.amd64.gpkg.tar ) arm64? ( https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.47-1.gpkg.tar -> gentoo-kernel-6.1.47-1.arm64.gpkg.tar ) ppc64? ( https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.47-1.gpkg.tar -> gentoo-kernel-6.1.47-1.ppc64le.gpkg.tar ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.47-1.gpkg.tar -> gentoo-kernel-6.1.47-1.x86.gpkg.tar )
+_eclasses_=dist-kernel-utils	fd205e63d2f09e517140e6fd10ebcf78	kernel-install	52229b24889f7b6722ed29332a1db67a	mount-boot	3945d351ee3192381911f938f4ee527a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	862d337d98edb576796827be2c6b11ca	unpacker	aa6a4e924009232d8b78b31e932c30b5
+_md5_=3a8ae6be2f70d60acd9626d82f8147e7
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-6.4.12 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-6.4.12
new file mode 100644
index 000000000000..43bb458d6473
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-6.4.12
@@ -0,0 +1,17 @@
+BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf app-alternatives/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) sparc? ( app-emulation/qemu[qemu_softmmu_targets_sparc,qemu_softmmu_targets_sparc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with Gentoo patches
+EAPI=8
+HOMEPAGE=https://www.kernel.org/
+IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+INHERIT=kernel-install toolchain-funcs unpacker
+IUSE=+initramfs test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-6.4.12
+RDEPEND=!sys-kernel/gentoo-kernel:6.4.12 virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=6.4.12
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.4-14.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.4-14.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-6.4.12-1.gpkg.tar -> gentoo-kernel-6.4.12-1.amd64.gpkg.tar ) arm64? ( https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-6.4.12-1.gpkg.tar -> gentoo-kernel-6.4.12-1.arm64.gpkg.tar ) ppc64? ( https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-6.4.12-1.gpkg.tar -> gentoo-kernel-6.4.12-1.ppc64le.gpkg.tar ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-6.4.12-1.gpkg.tar -> gentoo-kernel-6.4.12-1.x86.gpkg.tar )
+_eclasses_=dist-kernel-utils	fd205e63d2f09e517140e6fd10ebcf78	kernel-install	52229b24889f7b6722ed29332a1db67a	mount-boot	3945d351ee3192381911f938f4ee527a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	862d337d98edb576796827be2c6b11ca	unpacker	aa6a4e924009232d8b78b31e932c30b5
+_md5_=b4c4ed392e8f4fb6a0140692e6b5cf18
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-6.1.47 b/metadata/md5-cache/sys-kernel/gentoo-sources-6.1.47
new file mode 100644
index 000000000000..5de5974fc843
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-6.1.47
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources including the Gentoo patchset for the 6.1 kernel tree
+EAPI=8
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+INHERIT=kernel-2
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=6.1.47
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.1.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-6.1-53.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.1-53.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-6.1-53.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.1-53.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-6.1-53.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.1-53.experimental.tar.xz )
+_eclasses_=crossdev	f04338ff78f213a4a55c5c37b3c6563e	estack	c61c368a76fdf3a82fdf8dbaebea3804	kernel-2	8b78a61bbb6b7ca94cd9908ac1edd2e8	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	862d337d98edb576796827be2c6b11ca
+_md5_=42302303e02bcb042cedd5dfd23a9241
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-6.4.12 b/metadata/md5-cache/sys-kernel/gentoo-sources-6.4.12
new file mode 100644
index 000000000000..e22e1c231861
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-6.4.12
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources including the Gentoo patchset for the 6.4 kernel tree
+EAPI=8
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+INHERIT=kernel-2
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=6.4.12
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.4.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-6.4-14.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.4-14.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-6.4-14.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.4-14.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-6.4-14.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.4-14.experimental.tar.xz )
+_eclasses_=crossdev	f04338ff78f213a4a55c5c37b3c6563e	estack	c61c368a76fdf3a82fdf8dbaebea3804	kernel-2	8b78a61bbb6b7ca94cd9908ac1edd2e8	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	862d337d98edb576796827be2c6b11ca
+_md5_=11275441aa77b9331f69d7f5b9c85635
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-6.1.47 b/metadata/md5-cache/sys-kernel/vanilla-kernel-6.1.47
new file mode 100644
index 000000000000..a8d14f795d55
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-6.1.47
@@ -0,0 +1,18 @@
+BDEPEND=debug? ( dev-util/pahole ) verify-sig? ( sec-keys/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) sparc? ( app-emulation/qemu[qemu_softmmu_targets_sparc,qemu_softmmu_targets_sparc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf app-alternatives/yacc arm? ( sys-apps/dtc ) arm64? ( sys-apps/dtc ) riscv? ( sys-apps/dtc ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
+DESCRIPTION=Linux kernel built from vanilla upstream sources
+EAPI=8
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Distribution_Kernel https://www.kernel.org/
+IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+INHERIT=kernel-build toolchain-funcs verify-sig
+IUSE=debug hardened savedconfig +initramfs test +strip verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-6.1.47
+RDEPEND=virtual/libelf
+REQUIRED_USE=arm? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=6.1.47
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.1.47.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g7.tar.gz -> gentoo-kernel-config-g7.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.1.47.tar.sign ) amd64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.1.7-gentoo/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.6.1.7-gentoo ) arm64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.1.7-gentoo/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.6.1.7-gentoo ) ppc64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.1.7-gentoo/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.6.1.7-gentoo ) x86? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.1.7-gentoo/kernel-i686-fedora.config -> kernel-i686-fedora.config.6.1.7-gentoo )
+_eclasses_=dist-kernel-utils	fd205e63d2f09e517140e6fd10ebcf78	kernel-build	cc744067c788ff3c8bdfbfd4d87b0baf	kernel-install	52229b24889f7b6722ed29332a1db67a	mount-boot	3945d351ee3192381911f938f4ee527a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	a74d533f258f1f435be71312558c12f9	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	savedconfig	8b5f9d995a970e49cd427c55d5840285	toolchain-funcs	862d337d98edb576796827be2c6b11ca	verify-sig	dd7ea2e5b0bdcb42523e4797bbf4dd6e
+_md5_=6af3201a419530fc1a9351b0f433c39c
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-6.4.12 b/metadata/md5-cache/sys-kernel/vanilla-kernel-6.4.12
new file mode 100644
index 000000000000..52b65bc38fba
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-6.4.12
@@ -0,0 +1,18 @@
+BDEPEND=debug? ( dev-util/pahole ) verify-sig? ( sec-keys/openpgp-keys-kernel ) secureboot? ( app-crypt/sbsigntools ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) sparc? ( app-emulation/qemu[qemu_softmmu_targets_sparc,qemu_softmmu_targets_sparc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf app-alternatives/yacc arm? ( sys-apps/dtc ) arm64? ( sys-apps/dtc ) riscv? ( sys-apps/dtc ) modules-sign? ( dev-libs/openssl ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
+DESCRIPTION=Linux kernel built from vanilla upstream sources
+EAPI=8
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Distribution_Kernel https://www.kernel.org/
+IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+INHERIT=kernel-build toolchain-funcs verify-sig
+IUSE=debug hardened savedconfig secureboot +initramfs test +strip modules-sign verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-6.4.12
+RDEPEND=virtual/libelf
+REQUIRED_USE=arm? ( savedconfig ) secureboot? ( modules-sign )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=6.4.12
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.4.12.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g7.tar.gz -> gentoo-kernel-config-g7.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.4.12.tar.sign ) amd64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.4.3-gentoo/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.6.4.3-gentoo ) arm64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.4.3-gentoo/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.6.4.3-gentoo ) ppc64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.4.3-gentoo/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.6.4.3-gentoo ) x86? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.4.3-gentoo/kernel-i686-fedora.config -> kernel-i686-fedora.config.6.4.3-gentoo )
+_eclasses_=dist-kernel-utils	fd205e63d2f09e517140e6fd10ebcf78	kernel-build	cc744067c788ff3c8bdfbfd4d87b0baf	kernel-install	52229b24889f7b6722ed29332a1db67a	mount-boot	3945d351ee3192381911f938f4ee527a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	a74d533f258f1f435be71312558c12f9	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	savedconfig	8b5f9d995a970e49cd427c55d5840285	secureboot	4548d1753e1d9b2313836e4e517cef82	toolchain-funcs	862d337d98edb576796827be2c6b11ca	verify-sig	dd7ea2e5b0bdcb42523e4797bbf4dd6e
+_md5_=96ca3dab7f05153b506c69909ab77629
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-6.1.46 b/metadata/md5-cache/sys-kernel/vanilla-sources-6.1.47
index c5273b500522..aa2a18dcb126 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-6.1.46
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-6.1.47
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~s
 LICENSE=GPL-2
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
-SLOT=6.1.46
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v6.x/patch-6.1.46.xz https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.1.tar.xz
+SLOT=6.1.47
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v6.x/patch-6.1.47.xz https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.1.tar.xz
 _eclasses_=crossdev	f04338ff78f213a4a55c5c37b3c6563e	estack	c61c368a76fdf3a82fdf8dbaebea3804	kernel-2	8b78a61bbb6b7ca94cd9908ac1edd2e8	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	862d337d98edb576796827be2c6b11ca
 _md5_=96b7bb013c09ed6364efda0f3bf7d67f
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-6.4.11 b/metadata/md5-cache/sys-kernel/vanilla-sources-6.4.12
index 6a135cf29922..c0393fb67d91 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-6.4.11
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-6.4.12
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~s
 LICENSE=GPL-2
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
-SLOT=6.4.11
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v6.x/patch-6.4.11.xz https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.4.tar.xz
+SLOT=6.4.12
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v6.x/patch-6.4.12.xz https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.4.tar.xz
 _eclasses_=crossdev	f04338ff78f213a4a55c5c37b3c6563e	estack	c61c368a76fdf3a82fdf8dbaebea3804	kernel-2	8b78a61bbb6b7ca94cd9908ac1edd2e8	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	862d337d98edb576796827be2c6b11ca
 _md5_=96b7bb013c09ed6364efda0f3bf7d67f
diff --git a/metadata/md5-cache/sys-power/Manifest.gz b/metadata/md5-cache/sys-power/Manifest.gz
index d8bef1f74f5b..eed812017297 100644
--- a/metadata/md5-cache/sys-power/Manifest.gz
+++ b/metadata/md5-cache/sys-power/Manifest.gz
diff --git a/metadata/md5-cache/sys-power/power-profiles-daemon-0.13 b/metadata/md5-cache/sys-power/power-profiles-daemon-0.13
index 997fbd6b6519..fdd3a2b15ffa 100644
--- a/metadata/md5-cache/sys-power/power-profiles-daemon-0.13
+++ b/metadata/md5-cache/sys-power/power-profiles-daemon-0.13
@@ -1,4 +1,4 @@
-BDEPEND=gtk-doc? ( dev-util/gi-docgen dev-util/gtk-doc ) test? ( dev-util/umockdev python_single_target_python3_10? ( dev-python/pygobject:3[python_targets_python3_10(-)] dev-python/python-dbusmock[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pygobject:3[python_targets_python3_11(-)] dev-python/python-dbusmock[python_targets_python3_11(-)] ) ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
+BDEPEND=dev-util/glib-utils gtk-doc? ( dev-util/gi-docgen dev-util/gtk-doc ) test? ( dev-util/umockdev python_single_target_python3_10? ( dev-python/pygobject:3[python_targets_python3_10(-)] dev-python/python-dbusmock[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pygobject:3[python_targets_python3_11(-)] dev-python/python-dbusmock[python_targets_python3_11(-)] ) ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst setup test
 DEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_10? ( dev-python/pygobject:3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pygobject:3[python_targets_python3_11(-)] ) dev-libs/glib:2 >=dev-libs/libgudev-234 >=sys-auth/polkit-0.114 sys-power/upower
 DESCRIPTION=Makes power profiles handling available over D-Bus
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://gitlab.freedesktop.org/hadess/power-profiles-daemon/-/archive/0.13/power-profiles-daemon-0.13.tar.bz2
 _eclasses_=meson	08b7183c3f4811568ee93eb0f79a89fe	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=49c37e564d6a845f13cb9a8533fc4005
+_md5_=2503611af71ea12497de5369ae6d9e96
diff --git a/metadata/md5-cache/virtual/Manifest.gz b/metadata/md5-cache/virtual/Manifest.gz
index af4c41fccaca..a5cbba623eeb 100644
--- a/metadata/md5-cache/virtual/Manifest.gz
+++ b/metadata/md5-cache/virtual/Manifest.gz
diff --git a/metadata/md5-cache/virtual/dist-kernel-6.1.47 b/metadata/md5-cache/virtual/dist-kernel-6.1.47
new file mode 100644
index 000000000000..ff936807da92
--- /dev/null
+++ b/metadata/md5-cache/virtual/dist-kernel-6.1.47
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual to depend on any Distribution Kernel
+EAPI=7
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
+RDEPEND=|| ( ~sys-kernel/gentoo-kernel-6.1.47 ~sys-kernel/gentoo-kernel-bin-6.1.47 ~sys-kernel/vanilla-kernel-6.1.47 )
+SLOT=0/6.1.47
+_md5_=1971dc5148e78da44e87c56fd4647d8b
diff --git a/metadata/md5-cache/virtual/dist-kernel-6.4.12 b/metadata/md5-cache/virtual/dist-kernel-6.4.12
new file mode 100644
index 000000000000..191e4e98ae42
--- /dev/null
+++ b/metadata/md5-cache/virtual/dist-kernel-6.4.12
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual to depend on any Distribution Kernel
+EAPI=7
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
+RDEPEND=|| ( ~sys-kernel/gentoo-kernel-6.4.12 ~sys-kernel/gentoo-kernel-bin-6.4.12 ~sys-kernel/vanilla-kernel-6.4.12 )
+SLOT=0/6.4.12
+_md5_=1971dc5148e78da44e87c56fd4647d8b
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 905bd8fe261f..3b018aa8c05f 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 15850 BLAKE2B f8a24ac4773896d3e2d3ac7daac96705bb587c68e5945981d4f8b934b213a0a634607e00cc3481f4c847f66ae537f4bfd1c12852438720d6cf5d711fe74f3237 SHA512 29367a48def7059bf0b6fab4e38cd0ba8266ac4b865394c346e798632efcf7c41364d99e462d98a52192ae8270db65e57b9f15ae208bef7ce4c3cfd98163dee1
-TIMESTAMP 2023-08-23T14:09:50Z
+TIMESTAMP 2023-08-23T20:09:46Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmTmEy5fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmTmZ4tfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDlDg/8D66yalEhipmDzyr9Z2OSYIbMJdhF2YkI8asPE7+cynQI9+5aCu09M8Zv
-U2wjlyXZNyW8dxr+RByfukWap0x7cuL/bIKxeObDN6aw53GXnmKJ1z/0hqaMSbBI
-l3XLkbxZq0zXzIvEkWNpgzuc6NLpGIL5ZKgj6MLXSodQiUNR3oxXmg+hV7QB0I/n
-y9Gm4vDUKROx/UuIi8vBMnBqGip3leDFaFHZ8z2VTfVuFJWTgGUmDAMVFlQLQMOL
-4U8c5aDWf9wpvHRVTXpVEDsdrPY632qu1kkSGZggEm7JmgaD7fT/s2aRUgtT3YZZ
-P4+XR/QpEo+Pk5NDtmjYzNU5ulDCifg+a9r0UKxYNFY9YUfzWA4Dx0ccYPOBzC4L
-OaHUngseXnuTA2h1kiLNWZC5CGCunmmMh5ilZq4KvlRlbt0kKXHhRQATNm6iL8kP
-MUDUAMhAPivW2GD+ORLp9hD6Td3RLTDAIQsQC7ZiQIBM/cI612XIz6MtZCQc50cz
-dK5oA4RYhxffPbm0Kqhsy2SLw49GM0/6GrrbFyleWM/zn3/RSR6iMC7++Smj1X1q
-hiMb2ZhsJ+CC+DE1JFIjpPya0bfzaNG4oQkir2AMAKoNROH2xQB5SMTs5A5CUKek
-9Hwfvfs9xfEejQQL7E7QQQ5kmu1238LHyz/0IsnKkUiBrYOn0e8=
-=FPDo
+klB0Qw//Wl3VZc9EZhFeYL1wkPQgUIps3QaKBnKrApy89vQnewrpOVXzR6VSmZ7I
+8pFubcqj6JHkues9DWUDM8PKVi31Zz6Nh/IuI6Y1K7A21sdbn3f3F5aNOKgvYHwm
+NO4uaY89j1h+vIiu5Pza9M+4HB90yzOGV6/WBvEO46tuuyLHriyrDc0EzJlQOAum
+9TYrk6YJAx90Bwy/h/mO/Oi89U0e2id05WcAmQ5q0aXPOhJ9Ie3mzA/RDl95D8Zs
+AWu2NC8EAYLTftq5Hz9rHPBYu92DZZa/pizmLSAzX4g2qbbvrQPZTmsxSHSZTXu/
+d/wAPSE6MDybPbUe80gQufCEZKHPqD51P49/BEbcKB8TVdF/WO+cJ7uYil1+Hic2
+VnFHRyy+2EbIdsMcV/tEoa3UGKz6ijA4E5B/GVl9A6ON88q9IR8fdadXVfjgM49p
+WLSzIDpXcLQYomtzoZMcZn3Ot5RL6Z23NIAh5k8pbuYo2gIrP4cMgnJx/yy+lI42
+veKpKCuhFwdcllpxpkWtJydG8BGRPB+ciVyikh6HW6Hfo/5VfK4pBPZ7PsrYuS/8
+wsIZDXdNc+q6OgBvul2CIv5n52yAGv+M466yy9LcnQjRYovq6tWf0VNtGWoGidzq
+uWPLt4tNVVW3qdHB9JhAx+Tp5rZVcROOddjWwUhYvb6Cq9fWqio=
+=IRnk
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 4e4d52af51ad..ba152a2dbabc 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Wed, 23 Aug 2023 14:09:47 +0000
+Wed, 23 Aug 2023 20:09:44 +0000
diff --git a/metadata/stabilization-groups/gnome/evolution b/metadata/stabilization-groups/gnome/evolution
new file mode 100644
index 000000000000..21bbcf804e94
--- /dev/null
+++ b/metadata/stabilization-groups/gnome/evolution
@@ -0,0 +1,3 @@
+gnome-extra/evolution-data-server
+gnome-extra/evolution-ews
+mail-client/evolution
diff --git a/metadata/stabilization-groups/gnome/glib b/metadata/stabilization-groups/gnome/glib
new file mode 100644
index 000000000000..51a5659dd725
--- /dev/null
+++ b/metadata/stabilization-groups/gnome/glib
@@ -0,0 +1,3 @@
+dev-libs/glib
+dev-util/gdbus-codegen
+dev-util/glib-utils
diff --git a/metadata/stabilization-groups/gnome/gnome-shell b/metadata/stabilization-groups/gnome/gnome-shell
new file mode 100644
index 000000000000..ddf76f8f88f4
--- /dev/null
+++ b/metadata/stabilization-groups/gnome/gnome-shell
@@ -0,0 +1,4 @@
+gnome-base/gnome-shell
+gnome-extra/gnome-shell-extensions
+gnome-extra/gnome-shell-frippery
+x11-wm/mutter
diff --git a/metadata/stabilization-groups/gnome/gobject-introspection b/metadata/stabilization-groups/gnome/gobject-introspection
new file mode 100644
index 000000000000..8baf4ae59124
--- /dev/null
+++ b/metadata/stabilization-groups/gnome/gobject-introspection
@@ -0,0 +1,2 @@
+dev-libs/gobject-introspection
+dev-libs/gobject-introspection-common
diff --git a/metadata/stabilization-groups/gnome/sysprof b/metadata/stabilization-groups/gnome/sysprof
new file mode 100644
index 000000000000..66a338916039
--- /dev/null
+++ b/metadata/stabilization-groups/gnome/sysprof
@@ -0,0 +1,3 @@
+dev-util/sysprof
+dev-util/sysprof-capture
+dev-util/sysprof-common
diff --git a/metadata/stabilization-groups/gnome/vala b/metadata/stabilization-groups/gnome/vala
new file mode 100644
index 000000000000..2e4d5a33748d
--- /dev/null
+++ b/metadata/stabilization-groups/gnome/vala
@@ -0,0 +1,2 @@
+dev-lang/vala
+dev-libs/vala-common
diff --git a/metadata/stabilization-groups/gnome/vte b/metadata/stabilization-groups/gnome/vte
new file mode 100644
index 000000000000..ce25ab265262
--- /dev/null
+++ b/metadata/stabilization-groups/gnome/vte
@@ -0,0 +1,3 @@
+gui-libs/vte
+gui-libs/vte-common
+x11-libs/vte
diff --git a/metadata/timestamp b/metadata/timestamp
index 3e1af9e327e1..af00dfdcc9a7 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Wed Aug 23 02:09:47 PM UTC 2023
+Wed Aug 23 08:09:43 PM UTC 2023
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 2812d30577aa..92e4a027c3f0 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Wed, 23 Aug 2023 14:15:01 +0000
+Wed, 23 Aug 2023 20:15:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index e8e5e004b432..194c9370e142 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-dce4d67404b601b57feb1bda4b67f2f11f1e4c15 1692798162 2023-08-23T13:42:42+00:00
+702bb7d6c6ddbec37437039d36e77b1063df4d25 1692821125 2023-08-23T20:05:25+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 78083d4d7fd6..a736fa1835f0 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1692799801 Wed 23 Aug 2023 02:10:01 PM UTC
+1692821401 Wed 23 Aug 2023 08:10:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 4e4d52af51ad..8b3bf36a3c98 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Wed, 23 Aug 2023 14:09:47 +0000
+Wed, 23 Aug 2023 20:09:43 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index edecc48a044f..bc7726266acb 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index 37ef3f01e789..7227585b8fc8 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -19,30 +19,41 @@ AUX zabbix-server.service 429 BLAKE2B 1727ad52441b8e1ef31ee0f7faaa9d9964ee4ca5e2
 AUX zabbix-server.tmpfiles 35 BLAKE2B 98e917ef03bd6dc5d73e5cbdb140c7e115c7593d5cebf2df9bf3d15713b16c6a44b165a3f68fd36a9119163144a2761457d16ce318bd094ed76ae6040c8b09df SHA512 3c63a2791e6ac77cb3144eb47a275cc8748f5c8943a076052300d6964994b95b18d60f504584fdcb683739dc514261402895e3f30ae2fbdb218acbc42c3d72df
 DIST zabbix-4.0.46.tar.gz 17902473 BLAKE2B c791af22719cfd83a9d1350abd3b7d29cd441537580c7a3f2bbfd7fcda690526a7a1c5725ae1848ab8f8a232d10c8e7bcc8c16dffe09409965f4d42e55ba394f SHA512 6d6df0a9ba1b0673d4a9474f3eb841cfa8b7c49d39413a39b7cb84713fb9986243ae83d1cb23b8cdd4e312de8c67a366ea020a989d2dc1da74eed93d094e4688
 DIST zabbix-4.0.47.tar.gz 17903257 BLAKE2B c245f1eb9b63cc0e03025958cddc31a790bbf8ed2c000ce787e2d3e9a108d0a177a61b22353d419fe21f0caf6750df273d236a1610c8907ad3527ad360915b76 SHA512 9f7f4fb03b1b9caa52bd5e3a7246e9f2ba844a5f292abc0a9ed3941c6493ee2a771f816ab83cdf571e10a3d32a48294e3755b9aa9d351116bdef32ab1b6d0632
+DIST zabbix-4.0.48.tar.gz 17895197 BLAKE2B 0a0b43084ab2babf305330d46f0841f741d1d7df3581602ee35e9be11c07210cd2d3e3779fb05c77ccaee0734f78217fbe8a5fc7c52246d3fbca00cf1c56487f SHA512 6dc403bcd9ec1747473f64f82e919aa196f35a2f2b8006ed9dcf114e10c4f542ae61cd86cd80c1c6a043b32281e1263c9a67acc2909265391777ab71358a7e5a
 DIST zabbix-5.0.35-go-deps.tar.xz 34454684 BLAKE2B 98489131a696f7606daa29bcb5de8f420eacf4f6bd89a9bb88e451f61b2ccf5cdf61a77a1de3e486763317e4a3c9dded9fddf400a5e545921ce823a17fc77a66 SHA512 2b6de506318c9656cb8dd8c2ec5f6443be64b9af2a94ed410acba7152d613b07222cbf042d2e490e0f94f82d03f8507d6a53fca36584739b6de8d23010b725bc
 DIST zabbix-5.0.35.tar.gz 21839368 BLAKE2B 8db4fa5ffbd7374e2bc060817a0854625ca99b4b20cbe5dd3f9d264e933c0ebef21efdef68b13d797edf60c388ba1d84a3fa9951ba138176513d120de09a3d28 SHA512 a76e94f2292a5990319e7a154b295aaf4c7421ca40ed9d1b3ea529979151407d3e65bf43b93b36234e84c800dd604cbe7a7154fbe44c1b5316b1d4b00b2e42d4
 DIST zabbix-5.0.36-go-deps.tar.xz 34549228 BLAKE2B 60852e6d66b2bc70fb2624aa06498cb6013637b08011cdf1d30c1e2490f3f50d9fed22f0aa17712e11a05b4b4f4cc198917724eee4ed9ab30cadf667b9f28b5d SHA512 18e0dbe6128e905b6323cb9f65b32a49489b5d5685c615e92efcc9ac3ddcca0d46d5e3392366f395d8f3ff15549d9e90e5087243ec920e4955f35facf06bfe25
 DIST zabbix-5.0.36.tar.gz 21817105 BLAKE2B bcea94ed7caf089a100b9e64274b0c34db5ae3fbcbc4bad5bd8abd814718cd08eb1215e56af9c027af37ea386cabf1b8c7c658261077061652eddad99ab18b0f SHA512 c439748b590c5d37a93d9fad6218435df52089e04873d6d4b9a37dd9151a49f29c887f3b669751207b242c8af9080868ffa0032c259044610e973622b916742e
+DIST zabbix-5.0.37-go-deps.tar.xz 27507708 BLAKE2B 3f682c8cd377c47e5c812a5d9cd0ed75c06dd29df4bd75b75d4fd67812de9bba11d17150fe3fdde3569f36519d204d0864e450cea9eebbc8d791148fd3d70deb SHA512 4794e5ff4a37ed3771788add433222b05e2477106a914909358af6ef8bbcb1b0b55c5fb1afdf0e572ca361edb3dbe7f041a11f8adf493b3ac22b5e9252f63fb8
+DIST zabbix-5.0.37.tar.gz 21815459 BLAKE2B c357ce0f3c3a90e80f9ddd939d8295356c4d2d7f27391a0a67c8e08f7d559a8fa40d9d4ccd81cb7fc7f6d0d9a250573ab53cb33c367e69d9813c39fe38a202e9 SHA512 5e9a8351a2e34864629ee47458275c0921da461a9c2a320574c763476f15c1399fb6dd21eb578d94a7ea9055dc8750f54cf1aa9ecf5e438bae997fc59ce1637f
 DIST zabbix-6.0.18-go-deps.tar.xz 18727444 BLAKE2B 2a8e9a929857574104c7af6b423bbfcd1b306aa485a657ec1e163498727684f364a7bc10011661bdc9a4edc862af748f3e80e3de83859c8660f378ec539b47a5 SHA512 dff99d9404ee8f8fe868db8498cc7f8c30783bb09e38913a25222be91045b77e8f4aa02fc8e9afcbc2af0c52c95ce717710151af30e3d662a93dad290c73909e
 DIST zabbix-6.0.18.tar.gz 41926243 BLAKE2B db7c5556896ad6cea107791f4bf5c5128862b941a3dedab74a44d5f3f0770f36122338c5e493c26c4ac07f43091291a9f4c1916b742e97bdf8f70cc9cb07d280 SHA512 775da1d47e095c233c6fdaab0c94dd4eee356825401ac885a8f000681caccda54f0ef508bcf8cb7d1f6def0178cb0aa17b37ec15ae9db032aaaa7faec7542e3d
 DIST zabbix-6.0.19-go-deps.tar.xz 18942932 BLAKE2B f53a00b89c024f0e52941f9a1dd1abfadbbf79c7b2da884379505edb762c9e1b93542b1e68b572c7d0e99a80b759f44015dddf49968ef42c4b7eb4e0017b7e67 SHA512 04073b6e30a8bb9284ce7780d3149f774dfcd94ea4d4e5c64bf06f6b7e0d41a8536aa461ad435cad6954c5cc9210382af60eb95791bc0100f1ff80d9abd7b7e3
 DIST zabbix-6.0.19.tar.gz 41953882 BLAKE2B b454a3622d3fdeda886ce4722e24116c44c74768bc5dcfe1cd6aa7c90a245121532d24842cfd47538349d08ca5b6577b6f0e75eec165f304a050512eafe608ba SHA512 9738d30a21bd237e68ad4cf037e3d997fcd8b8a6781f3f4f22c6ef0de4bf555d96c41322ea5dda7b0a2a546b9a2ecd42e1761ff8ec43ddd2eca672a174ce1e8e
 DIST zabbix-6.0.20-go-deps.tar.xz 18980960 BLAKE2B 447cdbf656d5b5fdad08be8ffec4bf0ba8bda351b48dcee4a67ce296e228e8d7e5c78b939c7211d2aa68b020ec0b41e4f5de638fe9abef98bb7b1936481e00fe SHA512 c806b052bf28cbe4802f31b1e717c61918a1b15d11a107eb0a758343e387d9761f93bd10bd65016f81a467002689cea74525a9812ec50ee29fc967b9a6e91e76
 DIST zabbix-6.0.20.tar.gz 42016423 BLAKE2B 5155ddb608432beddf72e35ad5b8f3723ca883f9c0c22adfd9bc668ba223335d67db76ad6211417d93a71ed20eb74f2c1b0370378755c5c0d988ab5ed4b46e30 SHA512 8f4fa955eb20ba4c4539bb3b6744c942e89db61dc50c998e61c4cf065cf07fddddfacce3992b8402851dc2f55e41fbff40e814d86b8c4ed9802931b8fe4a172b
+DIST zabbix-6.0.21-go-deps.tar.xz 17966972 BLAKE2B 829fa0054e17972c8b128f8f87a3136e8933be3bdd920992d72f09fd7e4c0282e036d81850c7fcfff2979e8ddb656b8d158601e3955204100be782ed6ed972f3 SHA512 27c7c2c06a02190bd04a3d541ec9c08cc7287bd7c090c6cec59e9faaa8f8dc81c4ed2d3375275195a987584079424903bbfb3b4304852174ac08fd03d06b7cdd
+DIST zabbix-6.0.21.tar.gz 42294969 BLAKE2B 0928695a5f2729765a5b1fa31df410d585b50ef40a9d8379d6243c256c88234ac916bfaf13f62a8e28bb8fb4be48e83c1aecfd01f66dc45d4e25a20761d8ef82 SHA512 3fe667a68ecf86de479facdd373557425bd3734debd58113fface810171583fc05adb24662e5fe3b0b447492b2b79654196313acb2950bbd0686a86e4c2d59b1
 DIST zabbix-6.4.3-go-deps.tar.xz 21580912 BLAKE2B a8d67ca707ebc0b7c873ebc9210643c8409975931e316556ceb47fd8e89eb998a13b7581643f4031de3d1d167e860752edb4589ea4d89037f18b2c14423d954c SHA512 277271b2a15e3fb04a1e30dcfe4b499f874d93e2509283b5acf2b6380f1ad4fb2627d8021c401076277d84f1a2031f6bfae285cbd4e6f2f45ec7daa42294bc59
 DIST zabbix-6.4.3.tar.gz 43369742 BLAKE2B a19cc8fa1fec26b152f84427394d1e1dd947aae62bce69eeb0f7cb3326d84a9eae9e79f17e7583cef36fbb7c6f39560ee0c495cfa61eaf9983238618bb33c406 SHA512 ddb90a0a7699a7cf007ee2efcbc807e573221b92bf4fb104b8dfb07355d79235b5bbd1aae8c70a7edcc42555b5f182230057162cf2bd899ba4b62ed433711f69
 DIST zabbix-6.4.4-go-deps.tar.xz 21588740 BLAKE2B 4f02c2c6fbfc44ec65bd697a1494dae26d528ce18bc060939e8a86bfcee1bf513dfe51440338c0ca0209ac260abff429da6ba0f9e6c381c96ac96cd8cc7f0d9f SHA512 ce0c2f4df1c42c45db7b3f42c75973f01b83996eb1f04b7d456ee6e5b7fab99a4ed224d7bab7ac4d9ed37fd35fbbee4f40ba826849a9c4007044384310c50b09
 DIST zabbix-6.4.4.tar.gz 43403307 BLAKE2B c6616045da913aa681543d038348f5273853621ee698e21fbf196935d4ef16f6c18052ca5f9b00526d0fb0710e833a24b7fac8987affb19f2e836a5c3426f366 SHA512 f01fb33707e16a2784fbc4102222418277eb4abf4d83d01f7981b0bf085c2db8510362366c4f2bbd69790a3da5a8e563415d6b3dd36a70c1cf94f8b57ee9e283
 DIST zabbix-6.4.5-go-deps.tar.xz 21631800 BLAKE2B 5f4e819f1fb3e4646ef26f1ce270de7a8ada9d69b0aabc1e9a2e1639620fa959f9071be57de188fe83fa150de4c09cffff0177373eff6688fea3acd33fc08946 SHA512 f2faa9a8a3450df7d8e2b4c0ab103d7a6863a7e7fdb851be460f4866839cc974e71144a17a9a5719d26c789a5d552a85e63c5015f520bb4c250eaa5cc95fd67b
 DIST zabbix-6.4.5.tar.gz 43464868 BLAKE2B 39a2bedc2b9fdfc046a984595377a5cf5375db5992ea01775c351ba906996b2f4bc71a8c38a542cb859c9e7fd7711bf21086995c1426ffc2a00fabe0427831f0 SHA512 cab201a68f5c580e102516f7de27a0009258e358abed161a3b3e4ae9d531e8d6a93b8aed1239a0244bff8bcafcbdb6f262e21fa500772dc8fccd20e3345089fd
+DIST zabbix-6.4.6-go-deps.tar.xz 20617588 BLAKE2B e58a3e119753b60710077179161bc2796a8d775042ff14a8b2b4f1dc9f6da06e9839e8680fdb0e380bde59807f17bc1110a5593b9c56d906a212278dbbcdb382 SHA512 289e1e268ba49ca5ab027b15a5fa1e0c3d43ae14238ed793224f3a7a51a8558501455490a18d2a05dea00ffc5e8946039a1da5ba64da8f36df7fbc88585f2389
+DIST zabbix-6.4.6.tar.gz 43744978 BLAKE2B e9c315425365380f6206e508aeb8f48070e830aed4f9d8506f8d8e696fdef673d3242d0e50763933cab604e9d82663f8efc94e54ba3fb237843578be998a7895 SHA512 f343441fb301d05165945ce355e752ce3638d4b12d99dc0eaaed8f70122cddb37a638e274ce999fcee0e1afc9e656ec771d0a208c08d1898999ea24338d8325d
 EBUILD zabbix-4.0.46.ebuild 9473 BLAKE2B 64dc377510b3c302c2dbff46e91fee4703f5160818b60d4b65c9210b9ded6a70b8e464385f6f57b431b3b2dcb3134faac6f922b847aca576c9ba5d7afa26cbbd SHA512 f8370f98efdf8132604747672756e9bdaf2dd9492d433528ee764e5dc345ef2a48a816867567981489f744ade8175d8d16498d7d814efc374b76143753d78181
 EBUILD zabbix-4.0.47.ebuild 9475 BLAKE2B bb4ae6c9f45ef2ed0aef21ae811f616f5291ffd50beb14c691fa113483123e391024e490b88fafa538adf93aa595e3e9126c92c666dabb4fd1ad4566e16ab556 SHA512 822bc6e3309999df1b68cae6e572563b621352ad4a70f683ab28876ec5384fd56721fad612ce411f6d25c270b7ca228857b7894efd1c49a48131f7bb68b0d3ed
-EBUILD zabbix-5.0.35.ebuild 10190 BLAKE2B ba6e6a4ea61665f700f51f5a150c8790d6a3ca8b9835081f321654deadb63de41ed3c26115903cba8381979b404ad4de30625de16510343f32628445dc09503a SHA512 40e20743f3d312803d2a6a691725f23ddf693c174ca2576a731cf43391aba6badab7df10bdcf3b4fbceef7e6b2c2048c0da1fe55facd9c0a8198ea1807e65675
-EBUILD zabbix-5.0.36.ebuild 10192 BLAKE2B 88498e065c1917b2ce79fb2f7b9283a0c28ada71024582c233edab52596135e567fecc64df6b53f5ddf5bfc68f71f23fed4cbd5a9426786a89e0a786c47bb202 SHA512 68843f8f63dd2c2ca78f5e9a8c46c7056f69f16cbdab34747ed79cfb748b199a9b7f2fa0653dd0ed58c18e73b582076921f190314586e28b418bc67e05cef939
-EBUILD zabbix-6.0.18.ebuild 10283 BLAKE2B f819d2d4519f002b256484eb237dab6fc9edd60d362559dcb0f5a48ecd364877ca80b8750c3bff6b900d55f3bfb5a129c4d019505c5f496388ccd6fd524b81a1 SHA512 e7c0a97439cf0ba026909433914a3c61f3198a2e12c06ba3f023cd831160b56db15b970e3b1c2d817f1f07231ce8f2beb96dd2bb7e46bba975ee90a72b6414f1
-EBUILD zabbix-6.0.19.ebuild 10285 BLAKE2B 3419dc4892b5110c0347a419c605f0e344c99831def1d1e72db6a0f6397a52e55faae6f00b189029be43abf8582c19ba35ae7170796e084dd2758cb7bc229a35 SHA512 2a3870ed7c291823118f9177cdfb3ed13fd68d0c04bca64b2b724244355c72460a4bfc756df2ed5f504a78643cdd95b2b0a6c51970c0376caaaf29402a590279
-EBUILD zabbix-6.0.20.ebuild 10285 BLAKE2B 3419dc4892b5110c0347a419c605f0e344c99831def1d1e72db6a0f6397a52e55faae6f00b189029be43abf8582c19ba35ae7170796e084dd2758cb7bc229a35 SHA512 2a3870ed7c291823118f9177cdfb3ed13fd68d0c04bca64b2b724244355c72460a4bfc756df2ed5f504a78643cdd95b2b0a6c51970c0376caaaf29402a590279
-EBUILD zabbix-6.4.3.ebuild 10281 BLAKE2B 1baad42a3ab68ddbfd1f96958bf1f335e64be66c37882058e44e44c8308dfc7262281d0168c47f83cf3cfae3a112f16b2a6ada9831e5e68a46587f1b6137ab43 SHA512 bb19f18d6667b3b41ca8994c5ec648281ab80048bf2ab29f4acd6b9ea01c502e635295bd7e6ec1d0b06462272d8ea993af9ae0200bad4c5908c1a8026fdafa03
-EBUILD zabbix-6.4.4.ebuild 10283 BLAKE2B 44d4f85febe37026dff5228c58463432ed70a00bb76323f149f0203693c519fe6822b40abd46f26604177a51f8d1591e0fb9a4c86e17416f7c2a486a71c7b5f4 SHA512 3aed0e998df26be546817e18c29d6deb0dfa01d2aad16d66ffeab6a738a39997e70f44ac70c5f82a25c381a6b187b16f2be2cbeae3212deb944025f3f4323f8f
-EBUILD zabbix-6.4.5.ebuild 10283 BLAKE2B 44d4f85febe37026dff5228c58463432ed70a00bb76323f149f0203693c519fe6822b40abd46f26604177a51f8d1591e0fb9a4c86e17416f7c2a486a71c7b5f4 SHA512 3aed0e998df26be546817e18c29d6deb0dfa01d2aad16d66ffeab6a738a39997e70f44ac70c5f82a25c381a6b187b16f2be2cbeae3212deb944025f3f4323f8f
+EBUILD zabbix-4.0.48.ebuild 9475 BLAKE2B bb4ae6c9f45ef2ed0aef21ae811f616f5291ffd50beb14c691fa113483123e391024e490b88fafa538adf93aa595e3e9126c92c666dabb4fd1ad4566e16ab556 SHA512 822bc6e3309999df1b68cae6e572563b621352ad4a70f683ab28876ec5384fd56721fad612ce411f6d25c270b7ca228857b7894efd1c49a48131f7bb68b0d3ed
+EBUILD zabbix-5.0.35.ebuild 10210 BLAKE2B 961fc6890b3b445d2d6c3e0fa18cef2bfe01c65236ab90503a5084e6fe6dcf203c675759e0cca26db52b20407810706e65b3ea6094e5a1e890897d4a401c584d SHA512 a32c12d4d3ac0e1a3db57e5500b27d54bae9184bb89ca79a0016e86f4a2d8b870b8757f05bba85a5ed8bf851dfe7efa889e79d304032d83128a2023f0ddcc089
+EBUILD zabbix-5.0.36.ebuild 10212 BLAKE2B cf3eeac856dd59ab71f381078a4c695425981985a6f988c12c18415187ae5fc70975772938e630c95ce0a664c9f85a8eb925bad0237bc000178e69f08d14455c SHA512 e987f20fcfad177146e58bc18b4dafd1e8225275c76c595c3906e479acc915ce0038856a0120e1ea429b9e95816e79ce584b8c13633e3b4af703c02dc5d78c0a
+EBUILD zabbix-5.0.37.ebuild 10212 BLAKE2B cf3eeac856dd59ab71f381078a4c695425981985a6f988c12c18415187ae5fc70975772938e630c95ce0a664c9f85a8eb925bad0237bc000178e69f08d14455c SHA512 e987f20fcfad177146e58bc18b4dafd1e8225275c76c595c3906e479acc915ce0038856a0120e1ea429b9e95816e79ce584b8c13633e3b4af703c02dc5d78c0a
+EBUILD zabbix-6.0.18.ebuild 10303 BLAKE2B 8b85dceb6f78d7dca22047e237c52a519e3a0608045c31922cc212a2aa9b0f7c2abc8cf6bd5e7d48b7503afb509f929004f3f662b9524eba41605fa3a7fd276b SHA512 4907e64fcecc541099ab3a1d1cde599494408174116290e74d88cbe8352e6dd9efbbcba79027b72aa5dddd22bd0ca9a9cd9d43babaea113e8d335dff8aff1a0b
+EBUILD zabbix-6.0.19.ebuild 10305 BLAKE2B 56d194dc9e8853c2eae5c5e1224798dedd3d2c28e524cf6a534f863785ee13a474c95a28bfdda8a009b562cae2137536f0e6a0ae6366822a1489a5ef724902eb SHA512 403cf301e52fe35bab54cb3bc344a10707987588ec2dc3db11d62a7333b8a11fe416e9978f44d9b47dece4b799d7a4f8773bac944167e149c113fd14b0e28163
+EBUILD zabbix-6.0.20.ebuild 10305 BLAKE2B 56d194dc9e8853c2eae5c5e1224798dedd3d2c28e524cf6a534f863785ee13a474c95a28bfdda8a009b562cae2137536f0e6a0ae6366822a1489a5ef724902eb SHA512 403cf301e52fe35bab54cb3bc344a10707987588ec2dc3db11d62a7333b8a11fe416e9978f44d9b47dece4b799d7a4f8773bac944167e149c113fd14b0e28163
+EBUILD zabbix-6.0.21.ebuild 10305 BLAKE2B 56d194dc9e8853c2eae5c5e1224798dedd3d2c28e524cf6a534f863785ee13a474c95a28bfdda8a009b562cae2137536f0e6a0ae6366822a1489a5ef724902eb SHA512 403cf301e52fe35bab54cb3bc344a10707987588ec2dc3db11d62a7333b8a11fe416e9978f44d9b47dece4b799d7a4f8773bac944167e149c113fd14b0e28163
+EBUILD zabbix-6.4.3.ebuild 10301 BLAKE2B 1e84972d2b9dbc025bc942f2013b9d9f63e2d69ede092dd0acfb4c3fd070606e961c7ebc1ad2974fcf1c279dc4b7ded146783bcda794ada611d8ce5f90f94f22 SHA512 422331dd0e87026b2bd2eeb1305657e777ae883c0413227937a0554b76e23567c6c086e47d3cc95ec95a724104bf20029bab423c39cf3fa8d6388ee3232e38a5
+EBUILD zabbix-6.4.4.ebuild 10303 BLAKE2B 2d3bbbc9adc2dd483e37d59b3a197976ce1bad76f9ac1510c08b301397fe74fcad20680c99d215f3a052e99caceff96d34373a5d27752a4168320a3acf60368d SHA512 ce85b8d1c8affd28693248f34ebcbf9b93f3677bc428461b7d37694ae9dacea7503da0872df64446cb91a7e7cc93fdc9b19960f5040698e468ada7c0f029751b
+EBUILD zabbix-6.4.5.ebuild 10303 BLAKE2B 2d3bbbc9adc2dd483e37d59b3a197976ce1bad76f9ac1510c08b301397fe74fcad20680c99d215f3a052e99caceff96d34373a5d27752a4168320a3acf60368d SHA512 ce85b8d1c8affd28693248f34ebcbf9b93f3677bc428461b7d37694ae9dacea7503da0872df64446cb91a7e7cc93fdc9b19960f5040698e468ada7c0f029751b
+EBUILD zabbix-6.4.6.ebuild 10303 BLAKE2B 2d3bbbc9adc2dd483e37d59b3a197976ce1bad76f9ac1510c08b301397fe74fcad20680c99d215f3a052e99caceff96d34373a5d27752a4168320a3acf60368d SHA512 ce85b8d1c8affd28693248f34ebcbf9b93f3677bc428461b7d37694ae9dacea7503da0872df64446cb91a7e7cc93fdc9b19960f5040698e468ada7c0f029751b
 MISC metadata.xml 1655 BLAKE2B 46ab1f5adaff6069890380b23a6edaf8f0f7380ffc4a320f17df52f2e59867bdcf09633d9c6e242434919d3512d557c2f623d2826b1453424c43dc0b0ee0a262 SHA512 62e5a8853c13dac034360bd1a7b61987b548641b76860f05a8f75181b8d8029e06bc9cbf136d42836e714cf0c193b04a589d214a7864d607bf93dd97066f1a70
diff --git a/net-analyzer/zabbix/zabbix-4.0.48.ebuild b/net-analyzer/zabbix/zabbix-4.0.48.ebuild
new file mode 100644
index 000000000000..249e6dc9f35f
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-4.0.48.ebuild
@@ -0,0 +1,368 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# needed to make webapp-config dep optional
+WEBAPP_OPTIONAL="yes"
+inherit webapp java-pkg-opt-2 systemd toolchain-funcs tmpfiles user-info
+
+DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
+HOMEPAGE="https://www.zabbix.com/"
+MY_P=${P/_/}
+MY_PV=${PV/_/}
+SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0/$(ver_cut 1-2)"
+WEBAPP_MANUAL_SLOT="yes"
+KEYWORDS="~amd64 ~x86"
+IUSE="+agent curl frontend gnutls ipv6 java ldap libxml2 mbedtls mysql odbc openipmi +openssl oracle +postgres proxy selinux server snmp sqlite ssh static xmpp"
+REQUIRED_USE="|| ( agent frontend proxy server )
+	?? ( gnutls mbedtls openssl )
+	proxy? ( ^^ ( mysql oracle postgres sqlite ) )
+	server? ( ^^ ( mysql oracle postgres ) !sqlite )
+	static? ( !oracle !snmp )"
+
+COMMON_DEPEND="
+	curl? ( net-misc/curl )
+	gnutls? ( net-libs/gnutls:0= )
+	java? ( >=virtual/jdk-1.8:* )
+	ldap? (
+		=dev-libs/cyrus-sasl-2*
+		net-libs/gnutls:=
+		net-nds/openldap:=
+	)
+	libxml2? ( dev-libs/libxml2 )
+	mbedtls? ( net-libs/mbedtls:0= )
+	mysql? ( dev-db/mysql-connector-c:= )
+	odbc? ( dev-db/unixODBC )
+	openipmi? ( sys-libs/openipmi )
+	openssl? ( dev-libs/openssl:=[-bindist(-)] )
+	oracle? ( dev-db/oracle-instantclient[odbc,sdk] )
+	postgres? ( dev-db/postgresql:* )
+	proxy?  (
+		dev-libs/libevent:=
+		sys-libs/zlib
+	)
+	server? (
+		dev-libs/libevent:=
+		sys-libs/zlib
+	)
+	snmp? ( net-analyzer/net-snmp:= )
+	sqlite? ( dev-db/sqlite )
+	ssh? ( net-libs/libssh2 )
+	xmpp? ( dev-libs/iksemel )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	acct-group/zabbix
+	acct-user/zabbix
+	java? ( >=virtual/jre-1.8:* )
+	mysql? ( virtual/mysql )
+	proxy? (
+		dev-libs/libpcre
+		net-analyzer/fping[suid]
+	)
+	selinux? ( sec-policy/selinux-zabbix )
+	server? (
+		app-admin/webapp-config
+		dev-libs/libpcre
+		net-analyzer/fping[suid]
+	)
+	frontend? (
+		app-admin/webapp-config
+		dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
+		media-libs/gd[png]
+		virtual/httpd-php:*
+		mysql? ( dev-lang/php[mysqli] )
+		odbc? ( dev-lang/php[odbc] )
+		oracle? ( dev-lang/php[oci8-instant-client] )
+		postgres? ( dev-lang/php[postgres] )
+		sqlite? ( dev-lang/php[sqlite] )
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	static? (
+		curl? ( net-misc/curl[static-libs] )
+		ldap? (
+			=dev-libs/cyrus-sasl-2*[static-libs]
+			net-libs/gnutls[static-libs]
+			net-nds/openldap[static-libs]
+		)
+		libxml2? ( dev-libs/libxml2[static-libs] )
+		mysql? ( dev-db/mysql-connector-c[static-libs] )
+		odbc? ( dev-db/unixODBC[static-libs] )
+		postgres? ( dev-db/postgresql:*[static-libs] )
+		sqlite? ( dev-db/sqlite[static-libs] )
+		ssh? ( net-libs/libssh2 )
+	)
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.0.18-modulepathfix.patch"
+	"${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch"
+)
+
+S=${WORKDIR}/${MY_P}
+
+ZABBIXJAVA_BASE="opt/zabbix_java"
+
+pkg_setup() {
+	if use oracle; then
+		if [ -z "${ORACLE_HOME}" ]; then
+			eerror
+			eerror "The environment variable ORACLE_HOME must be set"
+			eerror "and point to the correct location."
+			eerror "It looks like you don't have Oracle installed."
+			eerror
+			die "Environment variable ORACLE_HOME is not set"
+		fi
+	fi
+
+	if use frontend; then
+		webapp_pkg_setup
+	fi
+
+	java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+	default
+}
+
+src_configure() {
+	econf \
+		$(use_enable agent) \
+		$(use_enable ipv6) \
+		$(use_enable java) \
+		$(use_enable proxy) \
+		$(use_enable server) \
+		$(use_enable static) \
+		$(use_with curl libcurl) \
+		$(use_with gnutls) \
+		$(use_with ldap) \
+		$(use_with libxml2) \
+		$(use_with mbedtls) \
+		$(use_with mysql) \
+		$(use_with odbc unixodbc) \
+		$(use_with openipmi openipmi) \
+		$(use_with openssl) \
+		$(use_with oracle) \
+		$(use_with postgres postgresql) \
+		$(use_with snmp net-snmp) \
+		$(use_with sqlite sqlite3) \
+		$(use_with ssh ssh2) \
+		$(use_with xmpp jabber)
+}
+
+src_compile() {
+	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
+		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
+	fi
+}
+
+src_install() {
+	local dirs=(
+		/etc/zabbix
+		/var/lib/zabbix
+		/var/lib/zabbix/home
+		/var/lib/zabbix/scripts
+		/var/lib/zabbix/alertscripts
+		/var/lib/zabbix/externalscripts
+		/var/log/zabbix
+	)
+
+	for dir in "${dirs[@]}"; do
+		dodir "${dir}"
+		keepdir "${dir}"
+	done
+
+	if use server; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_server.conf
+		fperms 0640 /etc/zabbix/zabbix_server.conf
+		fowners root:zabbix /etc/zabbix/zabbix_server.conf
+
+		newinitd "${FILESDIR}"/zabbix-server-r1.init zabbix-server
+
+		dosbin src/zabbix_server/zabbix_server
+
+		insinto /usr/share/zabbix
+		doins -r "${S}"/database/
+
+		systemd_dounit "${FILESDIR}"/zabbix-server.service
+		newtmpfiles "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf
+	fi
+
+	if use proxy; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_proxy.conf
+		fperms 0640 /etc/zabbix/zabbix_proxy.conf
+		fowners root:zabbix /etc/zabbix/zabbix_proxy.conf
+
+		newinitd "${FILESDIR}"/zabbix-proxy.init zabbix-proxy
+
+		dosbin src/zabbix_proxy/zabbix_proxy
+
+		insinto /usr/share/zabbix
+		doins -r "${S}"/database/
+
+		systemd_dounit "${FILESDIR}"/zabbix-proxy.service
+		newtmpfiles "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_agentd.conf
+		fperms 0640 /etc/zabbix/zabbix_agentd.conf
+		fowners root:zabbix /etc/zabbix/zabbix_agentd.conf
+
+		newinitd "${FILESDIR}"/zabbix-agentd.init zabbix-agentd
+
+		dosbin src/zabbix_agent/zabbix_agentd
+		dobin \
+			src/zabbix_sender/zabbix_sender \
+			src/zabbix_get/zabbix_get
+
+		systemd_dounit "${FILESDIR}"/zabbix-agentd.service
+		newtmpfiles "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf
+	fi
+
+	fowners root:zabbix /etc/zabbix
+	fowners zabbix:zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+	fperms 0750 \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	dodoc README INSTALL NEWS ChangeLog \
+		conf/zabbix_agentd.conf \
+		conf/zabbix_proxy.conf \
+		conf/zabbix_agentd/userparameter_examples.conf \
+		conf/zabbix_agentd/userparameter_mysql.conf \
+		conf/zabbix_server.conf
+
+	if use frontend; then
+		webapp_src_preinst
+		cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
+		webapp_configfile \
+			"${MY_HTDOCSDIR}"/include/db.inc.php \
+			"${MY_HTDOCSDIR}"/include/config.inc.php
+		webapp_src_install
+	fi
+
+	if use java; then
+		dodir \
+			/${ZABBIXJAVA_BASE} \
+			/${ZABBIXJAVA_BASE}/bin \
+			/${ZABBIXJAVA_BASE}/lib
+		keepdir /${ZABBIXJAVA_BASE}
+		exeinto /${ZABBIXJAVA_BASE}/bin
+		doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
+		exeinto /${ZABBIXJAVA_BASE}/lib
+		doexe \
+			src/zabbix_java/lib/logback-classic-1.2.9.jar \
+			src/zabbix_java/lib/logback-console.xml \
+			src/zabbix_java/lib/logback-core-1.2.9.jar \
+			src/zabbix_java/lib/logback.xml \
+			src/zabbix_java/lib/android-json-4.3_r3.1.jar \
+			src/zabbix_java/lib/slf4j-api-1.7.32.jar
+		newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy
+		newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf zabbix-jmx-proxy
+	fi
+}
+
+pkg_postinst() {
+	if use server || use proxy ; then
+		elog
+		elog "You may need to configure your database for Zabbix"
+		elog "if you have not already done so."
+		elog
+
+		zabbix_homedir=$(egethome zabbix)
+		if [ -n "${zabbix_homedir}" ] && \
+		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
+			ewarn
+			ewarn "The user 'zabbix' should have his homedir changed"
+			ewarn "to /var/lib/zabbix/home if you want to use"
+			ewarn "custom alert scripts."
+			ewarn
+			ewarn "A real homedir might be needed for configfiles"
+			ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when"
+			ewarn "using sendxmpp for Jabber alerts)."
+			ewarn
+			ewarn "To change the homedir use:"
+			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
+			ewarn
+		fi
+	fi
+
+	if use server; then
+		tmpfiles_process zabbix-server.conf
+
+		elog
+		elog "For distributed monitoring you have to run:"
+		elog
+		elog "zabbix_server -n <nodeid>"
+		elog
+		elog "This will convert database data for use with Node ID"
+		elog "and also adds a local node."
+		elog
+	fi
+
+	if use proxy; then
+		tmpfiles_process zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		tmpfiles_process zabbix-agentd.conf
+	fi
+
+	elog "--"
+	elog
+	elog "You may need to add these lines to /etc/services:"
+	elog
+	elog "zabbix-agent     10050/tcp Zabbix Agent"
+	elog "zabbix-agent     10050/udp Zabbix Agent"
+	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
+	elog "zabbix-trapper   10051/udp Zabbix Trapper"
+	elog
+
+	if use server || use proxy ; then
+		# check for fping
+		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
+		case "${fping_perms}" in
+			4[157][157][157])
+				;;
+			*)
+				ewarn
+				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
+				ewarn "you have to make /usr/sbin/fping setuid root and executable"
+				ewarn "by everyone. Run the following command to fix it:"
+				ewarn
+				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
+				ewarn
+				ewarn "Please be aware that this might impose a security risk,"
+				ewarn "depending on the code quality of fping."
+				ewarn
+				;;
+		esac
+	fi
+}
+
+pkg_prerm() {
+	(use frontend || use server) && webapp_pkg_prerm
+}
diff --git a/net-analyzer/zabbix/zabbix-5.0.35.ebuild b/net-analyzer/zabbix/zabbix-5.0.35.ebuild
index 8917235a56d0..a71802cf2bf6 100644
--- a/net-analyzer/zabbix/zabbix-5.0.35.ebuild
+++ b/net-analyzer/zabbix/zabbix-5.0.35.ebuild
@@ -28,6 +28,7 @@ KEYWORDS="amd64 x86"
 IUSE="+agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy selinux server snmp sqlite ssh static"
 REQUIRED_USE="|| ( agent agent2 frontend proxy server )
 	?? ( gnutls openssl )
+	agent2 ( !gnutls )
 	proxy? ( ^^ ( mysql oracle postgres sqlite ) )
 	server? ( ^^ ( mysql oracle postgres ) !sqlite )
 	static? ( !oracle !snmp )"
diff --git a/net-analyzer/zabbix/zabbix-5.0.36.ebuild b/net-analyzer/zabbix/zabbix-5.0.36.ebuild
index ec1e25bbcd14..cc4546e6cb45 100644
--- a/net-analyzer/zabbix/zabbix-5.0.36.ebuild
+++ b/net-analyzer/zabbix/zabbix-5.0.36.ebuild
@@ -28,6 +28,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="+agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy selinux server snmp sqlite ssh static"
 REQUIRED_USE="|| ( agent agent2 frontend proxy server )
 	?? ( gnutls openssl )
+	agent2 ( !gnutls )
 	proxy? ( ^^ ( mysql oracle postgres sqlite ) )
 	server? ( ^^ ( mysql oracle postgres ) !sqlite )
 	static? ( !oracle !snmp )"
diff --git a/net-analyzer/zabbix/zabbix-5.0.37.ebuild b/net-analyzer/zabbix/zabbix-5.0.37.ebuild
new file mode 100644
index 000000000000..cc4546e6cb45
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-5.0.37.ebuild
@@ -0,0 +1,400 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# To create the go modules tarball:
+#   cd src/go
+#   GOMODCACHE="${PWD}"/go-mod go mod download -modcacherw
+#   tar -acf zabbix-${PV}-go-deps.tar.xz go-mod
+
+EAPI=8
+
+GO_OPTIONAL="yes"
+# needed to make webapp-config dep optional
+WEBAPP_OPTIONAL="yes"
+inherit webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info
+
+DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
+HOMEPAGE="https://www.zabbix.com/"
+MY_P=${P/_/}
+MY_PV=${PV/_/}
+SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz
+	agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/${P}-go-deps.tar.xz )
+"
+
+LICENSE="GPL-2"
+SLOT="0/$(ver_cut 1-2)"
+WEBAPP_MANUAL_SLOT="yes"
+KEYWORDS="~amd64 ~x86"
+IUSE="+agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy selinux server snmp sqlite ssh static"
+REQUIRED_USE="|| ( agent agent2 frontend proxy server )
+	?? ( gnutls openssl )
+	agent2 ( !gnutls )
+	proxy? ( ^^ ( mysql oracle postgres sqlite ) )
+	server? ( ^^ ( mysql oracle postgres ) !sqlite )
+	static? ( !oracle !snmp )"
+
+COMMON_DEPEND="
+	curl? ( net-misc/curl )
+	gnutls? ( net-libs/gnutls:0= )
+	java? ( >=virtual/jdk-1.8:* )
+	ldap? (
+		=dev-libs/cyrus-sasl-2*
+		net-libs/gnutls:=
+		net-nds/openldap:=
+	)
+	libxml2? ( dev-libs/libxml2 )
+	mysql? ( dev-db/mysql-connector-c:= )
+	odbc? ( dev-db/unixODBC )
+	openipmi? ( sys-libs/openipmi )
+	openssl? ( dev-libs/openssl:=[-bindist(-)] )
+	oracle? ( dev-db/oracle-instantclient[odbc,sdk] )
+	postgres? ( dev-db/postgresql:* )
+	proxy?  (
+		dev-libs/libevent:=
+		sys-libs/zlib
+	)
+	server? (
+		dev-libs/libevent:=
+		sys-libs/zlib
+	)
+	snmp? ( net-analyzer/net-snmp:= )
+	sqlite? ( dev-db/sqlite )
+	ssh? ( net-libs/libssh2 )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	acct-group/zabbix
+	acct-user/zabbix
+	java? ( >=virtual/jre-1.8:* )
+	mysql? ( virtual/mysql )
+	proxy? (
+		dev-libs/libpcre
+		net-analyzer/fping[suid]
+	)
+	selinux? ( sec-policy/selinux-zabbix )
+	server? (
+		app-admin/webapp-config
+		dev-libs/libpcre
+		net-analyzer/fping[suid]
+	)
+	frontend? (
+		app-admin/webapp-config
+		dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
+		media-libs/gd[png]
+		virtual/httpd-php:*
+		mysql? ( dev-lang/php[mysqli] )
+		odbc? ( dev-lang/php[odbc] )
+		oracle? ( dev-lang/php[oci8-instant-client] )
+		postgres? ( dev-lang/php[postgres] )
+		sqlite? ( dev-lang/php[sqlite] )
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	static? (
+		curl? ( net-misc/curl[static-libs] )
+		ldap? (
+			=dev-libs/cyrus-sasl-2*[static-libs]
+			net-libs/gnutls[static-libs]
+			net-nds/openldap[static-libs]
+		)
+		libxml2? ( dev-libs/libxml2[static-libs] )
+		mysql? ( dev-db/mysql-connector-c[static-libs] )
+		odbc? ( dev-db/unixODBC[static-libs] )
+		postgres? ( dev-db/postgresql:*[static-libs] )
+		sqlite? ( dev-db/sqlite[static-libs] )
+		ssh? ( net-libs/libssh2 )
+	)
+"
+BDEPEND="
+	virtual/pkgconfig
+	agent2? (
+		>=dev-lang/go-1.12
+		app-arch/unzip
+	)
+"
+
+# upstream tests fail for agent2
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.0.18-modulepathfix.patch"
+	"${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch"
+	"${FILESDIR}/${PN}-5.0.22-system.sw.packages.patch"
+)
+
+S=${WORKDIR}/${MY_P}
+
+ZABBIXJAVA_BASE="opt/zabbix_java"
+
+pkg_setup() {
+	if use oracle; then
+		if [ -z "${ORACLE_HOME}" ]; then
+			eerror
+			eerror "The environment variable ORACLE_HOME must be set"
+			eerror "and point to the correct location."
+			eerror "It looks like you don't have Oracle installed."
+			eerror
+			die "Environment variable ORACLE_HOME is not set"
+		fi
+	fi
+
+	if use frontend; then
+		webapp_pkg_setup
+	fi
+
+	java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+	default
+}
+
+src_configure() {
+	econf \
+		$(use_enable agent) \
+		$(use_enable agent2) \
+		$(use_enable ipv6) \
+		$(use_enable java) \
+		$(use_enable proxy) \
+		$(use_enable server) \
+		$(use_enable static) \
+		$(use_with curl libcurl) \
+		$(use_with gnutls) \
+		$(use_with ldap) \
+		$(use_with libxml2) \
+		$(use_with mysql) \
+		$(use_with odbc unixodbc) \
+		$(use_with openipmi openipmi) \
+		$(use_with openssl) \
+		$(use_with oracle) \
+		$(use_with postgres postgresql) \
+		$(use_with snmp net-snmp) \
+		$(use_with sqlite sqlite3) \
+		$(use_with ssh ssh2)
+}
+
+src_compile() {
+	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
+		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
+	fi
+}
+
+src_install() {
+	local dirs=(
+		/etc/zabbix
+		/var/lib/zabbix
+		/var/lib/zabbix/home
+		/var/lib/zabbix/scripts
+		/var/lib/zabbix/alertscripts
+		/var/lib/zabbix/externalscripts
+		/var/log/zabbix
+	)
+
+	for dir in "${dirs[@]}"; do
+		dodir "${dir}"
+		keepdir "${dir}"
+	done
+
+	if use server; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_server.conf
+		fperms 0640 /etc/zabbix/zabbix_server.conf
+		fowners root:zabbix /etc/zabbix/zabbix_server.conf
+
+		newinitd "${FILESDIR}"/zabbix-server-r1.init zabbix-server
+
+		dosbin src/zabbix_server/zabbix_server
+
+		insinto /usr/share/zabbix
+		doins -r "${S}"/database/
+
+		systemd_dounit "${FILESDIR}"/zabbix-server.service
+		newtmpfiles "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf
+	fi
+
+	if use proxy; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_proxy.conf
+		fperms 0640 /etc/zabbix/zabbix_proxy.conf
+		fowners root:zabbix /etc/zabbix/zabbix_proxy.conf
+
+		newinitd "${FILESDIR}"/zabbix-proxy.init zabbix-proxy
+
+		dosbin src/zabbix_proxy/zabbix_proxy
+
+		insinto /usr/share/zabbix
+		doins -r "${S}"/database/
+
+		systemd_dounit "${FILESDIR}"/zabbix-proxy.service
+		newtmpfiles "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_agentd.conf
+		fperms 0640 /etc/zabbix/zabbix_agentd.conf
+		fowners root:zabbix /etc/zabbix/zabbix_agentd.conf
+
+		newinitd "${FILESDIR}"/zabbix-agentd.init zabbix-agentd
+
+		dosbin src/zabbix_agent/zabbix_agentd
+		dobin \
+			src/zabbix_sender/zabbix_sender \
+			src/zabbix_get/zabbix_get
+
+		systemd_dounit "${FILESDIR}"/zabbix-agentd.service
+		newtmpfiles "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf
+	fi
+
+	if use agent2; then
+		insinto /etc/zabbix
+		doins "${S}"/src/go/conf/zabbix_agent2.conf
+		fperms 0640 /etc/zabbix/zabbix_agent2.conf
+		fowners root:zabbix /etc/zabbix/zabbix_agent2.conf
+
+		newinitd "${FILESDIR}"/zabbix-agent2.init zabbix-agent2
+
+		dosbin src/go/bin/zabbix_agent2
+
+		systemd_dounit "${FILESDIR}"/zabbix-agent2.service
+		newtmpfiles "${FILESDIR}"/zabbix-agent2.tmpfiles zabbix-agent2.conf
+	fi
+
+	fowners root:zabbix /etc/zabbix
+	fowners zabbix:zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+	fperms 0750 \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	dodoc README INSTALL NEWS ChangeLog \
+		conf/zabbix_agentd.conf \
+		conf/zabbix_proxy.conf \
+		conf/zabbix_agentd/userparameter_examples.conf \
+		conf/zabbix_agentd/userparameter_mysql.conf \
+		conf/zabbix_server.conf
+
+	if use frontend; then
+		webapp_src_preinst
+		cp -R ui/* "${D}/${MY_HTDOCSDIR}"
+		webapp_configfile \
+			"${MY_HTDOCSDIR}"/include/db.inc.php \
+			"${MY_HTDOCSDIR}"/include/config.inc.php
+		webapp_src_install
+	fi
+
+	if use java; then
+		dodir \
+			/${ZABBIXJAVA_BASE} \
+			/${ZABBIXJAVA_BASE}/bin \
+			/${ZABBIXJAVA_BASE}/lib
+		keepdir /${ZABBIXJAVA_BASE}
+		exeinto /${ZABBIXJAVA_BASE}/bin
+		doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
+		exeinto /${ZABBIXJAVA_BASE}/lib
+		doexe \
+			src/zabbix_java/lib/logback-classic-1.2.9.jar \
+			src/zabbix_java/lib/logback-console.xml \
+			src/zabbix_java/lib/logback-core-1.2.9.jar \
+			src/zabbix_java/lib/logback.xml \
+			src/zabbix_java/lib/android-json-4.3_r3.1.jar \
+			src/zabbix_java/lib/slf4j-api-1.7.32.jar
+		newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy
+		newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf zabbix-jmx-proxy
+	fi
+}
+
+pkg_postinst() {
+	if use server || use proxy ; then
+		elog
+		elog "You may need to configure your database for Zabbix"
+		elog "if you have not already done so."
+		elog
+
+		zabbix_homedir=$(egethome zabbix)
+		if [ -n "${zabbix_homedir}" ] && \
+		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
+			ewarn
+			ewarn "The user 'zabbix' should have his homedir changed"
+			ewarn "to /var/lib/zabbix/home if you want to use"
+			ewarn "custom alert scripts."
+			ewarn
+			ewarn "A real homedir might be needed for configfiles"
+			ewarn "for custom alert scripts."
+			ewarn
+			ewarn "To change the homedir use:"
+			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
+			ewarn
+		fi
+	fi
+
+	if use server; then
+		tmpfiles_process zabbix-server.conf
+
+		elog
+		elog "For distributed monitoring you have to run:"
+		elog
+		elog "zabbix_server -n <nodeid>"
+		elog
+		elog "This will convert database data for use with Node ID"
+		elog "and also adds a local node."
+		elog
+	fi
+
+	if use proxy; then
+		tmpfiles_process zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		tmpfiles_process zabbix-agentd.conf
+	fi
+
+	if use agent2; then
+		tmpfiles_process zabbix-agent2.conf
+	fi
+
+	elog "--"
+	elog
+	elog "You may need to add these lines to /etc/services:"
+	elog
+	elog "zabbix-agent     10050/tcp Zabbix Agent"
+	elog "zabbix-agent     10050/udp Zabbix Agent"
+	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
+	elog "zabbix-trapper   10051/udp Zabbix Trapper"
+	elog
+
+	if use server || use proxy ; then
+		# check for fping
+		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
+		case "${fping_perms}" in
+			4[157][157][157])
+				;;
+			*)
+				ewarn
+				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
+				ewarn "you have to make /usr/sbin/fping setuid root and executable"
+				ewarn "by everyone. Run the following command to fix it:"
+				ewarn
+				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
+				ewarn
+				ewarn "Please be aware that this might impose a security risk,"
+				ewarn "depending on the code quality of fping."
+				ewarn
+				;;
+		esac
+	fi
+}
+
+pkg_prerm() {
+	(use frontend || use server) && webapp_pkg_prerm
+}
diff --git a/net-analyzer/zabbix/zabbix-6.0.18.ebuild b/net-analyzer/zabbix/zabbix-6.0.18.ebuild
index b48c28cb2ee3..6d18d732cf90 100644
--- a/net-analyzer/zabbix/zabbix-6.0.18.ebuild
+++ b/net-analyzer/zabbix/zabbix-6.0.18.ebuild
@@ -28,6 +28,7 @@ KEYWORDS="amd64 x86"
 IUSE="agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy selinux server snmp sqlite ssh static"
 REQUIRED_USE="|| ( agent agent2 frontend proxy server )
 	?? ( gnutls openssl )
+	agent2 ( !gnutls )
 	proxy? ( ^^ ( mysql oracle postgres sqlite ) )
 	server? ( ^^ ( mysql oracle postgres ) !sqlite )
 	static? ( !oracle !snmp )"
diff --git a/net-analyzer/zabbix/zabbix-6.0.19.ebuild b/net-analyzer/zabbix/zabbix-6.0.19.ebuild
index e5e5f002a22e..4da32a57da4b 100644
--- a/net-analyzer/zabbix/zabbix-6.0.19.ebuild
+++ b/net-analyzer/zabbix/zabbix-6.0.19.ebuild
@@ -28,6 +28,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy selinux server snmp sqlite ssh static"
 REQUIRED_USE="|| ( agent agent2 frontend proxy server )
 	?? ( gnutls openssl )
+	agent2 ( !gnutls )
 	proxy? ( ^^ ( mysql oracle postgres sqlite ) )
 	server? ( ^^ ( mysql oracle postgres ) !sqlite )
 	static? ( !oracle !snmp )"
diff --git a/net-analyzer/zabbix/zabbix-6.0.20.ebuild b/net-analyzer/zabbix/zabbix-6.0.20.ebuild
index e5e5f002a22e..4da32a57da4b 100644
--- a/net-analyzer/zabbix/zabbix-6.0.20.ebuild
+++ b/net-analyzer/zabbix/zabbix-6.0.20.ebuild
@@ -28,6 +28,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy selinux server snmp sqlite ssh static"
 REQUIRED_USE="|| ( agent agent2 frontend proxy server )
 	?? ( gnutls openssl )
+	agent2 ( !gnutls )
 	proxy? ( ^^ ( mysql oracle postgres sqlite ) )
 	server? ( ^^ ( mysql oracle postgres ) !sqlite )
 	static? ( !oracle !snmp )"
diff --git a/net-analyzer/zabbix/zabbix-6.0.21.ebuild b/net-analyzer/zabbix/zabbix-6.0.21.ebuild
new file mode 100644
index 000000000000..4da32a57da4b
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-6.0.21.ebuild
@@ -0,0 +1,403 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# To create the go modules tarball:
+#   cd src/go
+#   GOMODCACHE="${PWD}"/go-mod go mod download -modcacherw
+#   tar -acf zabbix-${PV}-go-deps.tar.xz go-mod
+
+EAPI=8
+
+GO_OPTIONAL="yes"
+# needed to make webapp-config dep optional
+WEBAPP_OPTIONAL="yes"
+inherit webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info
+
+DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
+HOMEPAGE="https://www.zabbix.com/"
+MY_P=${P/_/}
+MY_PV=${PV/_/}
+SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz
+	agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/${P}-go-deps.tar.xz )
+"
+
+LICENSE="GPL-2"
+SLOT="0/$(ver_cut 1-2)"
+WEBAPP_MANUAL_SLOT="yes"
+KEYWORDS="~amd64 ~x86"
+IUSE="agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy selinux server snmp sqlite ssh static"
+REQUIRED_USE="|| ( agent agent2 frontend proxy server )
+	?? ( gnutls openssl )
+	agent2 ( !gnutls )
+	proxy? ( ^^ ( mysql oracle postgres sqlite ) )
+	server? ( ^^ ( mysql oracle postgres ) !sqlite )
+	static? ( !oracle !snmp )"
+
+COMMON_DEPEND="
+	curl? ( net-misc/curl )
+	gnutls? ( net-libs/gnutls:0= )
+	java? ( >=virtual/jdk-1.8:* )
+	ldap? (
+		=dev-libs/cyrus-sasl-2*
+		net-libs/gnutls:=
+		net-nds/openldap:=
+	)
+	libxml2? ( dev-libs/libxml2 )
+	mysql? ( dev-db/mysql-connector-c:= )
+	odbc? ( dev-db/unixODBC )
+	openipmi? ( sys-libs/openipmi )
+	openssl? ( dev-libs/openssl:=[-bindist(-)] )
+	oracle? ( dev-db/oracle-instantclient[odbc,sdk] )
+	postgres? ( dev-db/postgresql:* )
+	proxy?  (
+		dev-libs/libevent:=
+		sys-libs/zlib
+	)
+	server? (
+		dev-libs/libevent:=
+		sys-libs/zlib
+	)
+	snmp? ( net-analyzer/net-snmp:= )
+	sqlite? ( dev-db/sqlite )
+	ssh? ( net-libs/libssh2 )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	acct-group/zabbix
+	acct-user/zabbix
+	java? ( >=virtual/jre-1.8:* )
+	mysql? ( virtual/mysql )
+	proxy? (
+		dev-libs/libpcre2:=
+		net-analyzer/fping[suid]
+	)
+	selinux? ( sec-policy/selinux-zabbix )
+	server? (
+		app-admin/webapp-config
+		dev-libs/libpcre2:=
+		net-analyzer/fping[suid]
+	)
+	frontend? (
+		app-admin/webapp-config
+		dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
+		media-libs/gd[png]
+		virtual/httpd-php:*
+		mysql? ( dev-lang/php[mysqli] )
+		odbc? ( dev-lang/php[odbc] )
+		oracle? ( dev-lang/php[oci8-instant-client] )
+		postgres? ( dev-lang/php[postgres] )
+		sqlite? ( dev-lang/php[sqlite] )
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	static? (
+		curl? ( net-misc/curl[static-libs] )
+		ldap? (
+			=dev-libs/cyrus-sasl-2*[static-libs]
+			net-libs/gnutls[static-libs]
+			net-nds/openldap[static-libs]
+		)
+		libxml2? ( dev-libs/libxml2[static-libs] )
+		mysql? ( dev-db/mysql-connector-c[static-libs] )
+		odbc? ( dev-db/unixODBC[static-libs] )
+		postgres? ( dev-db/postgresql:*[static-libs] )
+		sqlite? ( dev-db/sqlite[static-libs] )
+		ssh? ( net-libs/libssh2 )
+	)
+"
+BDEPEND="
+	virtual/pkgconfig
+	agent2? (
+		>=dev-lang/go-1.12
+		app-arch/unzip
+	)
+"
+
+# upstream tests fail for agent2
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.0.18-modulepathfix.patch"
+	"${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch"
+	"${FILESDIR}/${PN}-6.0.3-system.sw.packages.patch"
+)
+
+S=${WORKDIR}/${MY_P}
+
+ZABBIXJAVA_BASE="opt/zabbix_java"
+
+pkg_setup() {
+	if use oracle; then
+		if [ -z "${ORACLE_HOME}" ]; then
+			eerror
+			eerror "The environment variable ORACLE_HOME must be set"
+			eerror "and point to the correct location."
+			eerror "It looks like you don't have Oracle installed."
+			eerror
+			die "Environment variable ORACLE_HOME is not set"
+		fi
+	fi
+
+	if use frontend; then
+		webapp_pkg_setup
+	fi
+
+	java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+	default
+}
+
+src_configure() {
+	local econf_args=(
+		--with-libpcre2
+		"$(use_enable agent)"
+		"$(use_enable agent2)"
+		"$(use_enable ipv6)"
+		"$(use_enable java)"
+		"$(use_enable proxy)"
+		"$(use_enable server)"
+		"$(use_enable static)"
+		"$(use_with curl libcurl)"
+		"$(use_with gnutls)"
+		"$(use_with ldap)"
+		"$(use_with libxml2)"
+		"$(use_with mysql)"
+		"$(use_with odbc unixodbc)"
+		"$(use_with openipmi openipmi)"
+		"$(use_with openssl)"
+		"$(use_with oracle)"
+		"$(use_with postgres postgresql)"
+		"$(use_with snmp net-snmp)"
+		"$(use_with sqlite sqlite3)"
+		"$(use_with ssh ssh2)"
+	)
+
+	econf ${econf_args[@]}
+}
+
+src_compile() {
+	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
+		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
+	fi
+}
+
+src_install() {
+	local dirs=(
+		/etc/zabbix
+		/var/lib/zabbix
+		/var/lib/zabbix/home
+		/var/lib/zabbix/scripts
+		/var/lib/zabbix/alertscripts
+		/var/lib/zabbix/externalscripts
+		/var/log/zabbix
+	)
+
+	for dir in "${dirs[@]}"; do
+		keepdir "${dir}"
+	done
+
+	if use server; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_server.conf
+		fperms 0640 /etc/zabbix/zabbix_server.conf
+		fowners root:zabbix /etc/zabbix/zabbix_server.conf
+
+		newinitd "${FILESDIR}"/zabbix-server-r1.init zabbix-server
+
+		dosbin src/zabbix_server/zabbix_server
+
+		insinto /usr/share/zabbix
+		doins -r "${S}"/database/
+
+		systemd_dounit "${FILESDIR}"/zabbix-server.service
+		newtmpfiles "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf
+	fi
+
+	if use proxy; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_proxy.conf
+		fperms 0640 /etc/zabbix/zabbix_proxy.conf
+		fowners root:zabbix /etc/zabbix/zabbix_proxy.conf
+
+		newinitd "${FILESDIR}"/zabbix-proxy.init zabbix-proxy
+
+		dosbin src/zabbix_proxy/zabbix_proxy
+
+		insinto /usr/share/zabbix
+		doins -r "${S}"/database/
+
+		systemd_dounit "${FILESDIR}"/zabbix-proxy.service
+		newtmpfiles "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_agentd.conf
+		fperms 0640 /etc/zabbix/zabbix_agentd.conf
+		fowners root:zabbix /etc/zabbix/zabbix_agentd.conf
+
+		newinitd "${FILESDIR}"/zabbix-agentd.init zabbix-agentd
+
+		dosbin src/zabbix_agent/zabbix_agentd
+		dobin \
+			src/zabbix_sender/zabbix_sender \
+			src/zabbix_get/zabbix_get
+
+		systemd_dounit "${FILESDIR}"/zabbix-agentd.service
+		newtmpfiles "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf
+	fi
+	if use agent2; then
+		insinto /etc/zabbix
+		doins "${S}"/src/go/conf/zabbix_agent2.conf
+		fperms 0640 /etc/zabbix/zabbix_agent2.conf
+		fowners root:zabbix /etc/zabbix/zabbix_agent2.conf
+		keepdir /etc/zabbix/zabbix_agent2.d/plugins.d
+
+		newinitd "${FILESDIR}"/zabbix-agent2.init zabbix-agent2
+
+		dosbin src/go/bin/zabbix_agent2
+
+		systemd_dounit "${FILESDIR}"/zabbix-agent2.service
+		newtmpfiles "${FILESDIR}"/zabbix-agent2.tmpfiles zabbix-agent2.conf
+	fi
+
+	fowners root:zabbix /etc/zabbix
+	fowners zabbix:zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+	fperms 0750 \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	dodoc README INSTALL NEWS ChangeLog \
+		conf/zabbix_agentd.conf \
+		conf/zabbix_proxy.conf \
+		conf/zabbix_agentd/userparameter_examples.conf \
+		conf/zabbix_agentd/userparameter_mysql.conf \
+		conf/zabbix_server.conf
+
+	if use frontend; then
+		webapp_src_preinst
+		cp -R ui/* "${D}/${MY_HTDOCSDIR}"
+		webapp_configfile \
+			"${MY_HTDOCSDIR}"/include/db.inc.php \
+			"${MY_HTDOCSDIR}"/include/config.inc.php
+		webapp_src_install
+	fi
+
+	if use java; then
+		dodir \
+			/${ZABBIXJAVA_BASE} \
+			/${ZABBIXJAVA_BASE}/bin \
+			/${ZABBIXJAVA_BASE}/lib
+		keepdir /${ZABBIXJAVA_BASE}
+		exeinto /${ZABBIXJAVA_BASE}/bin
+		doexe src/zabbix_java/bin/zabbix-java-gateway-"${MY_PV}".jar
+		exeinto /${ZABBIXJAVA_BASE}/lib
+		doexe \
+			src/zabbix_java/lib/logback-classic-1.2.9.jar \
+			src/zabbix_java/lib/logback-console.xml \
+			src/zabbix_java/lib/logback-core-1.2.9.jar \
+			src/zabbix_java/lib/logback.xml \
+			src/zabbix_java/lib/android-json-4.3_r3.1.jar \
+			src/zabbix_java/lib/slf4j-api-1.7.32.jar
+		newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy
+		newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf zabbix-jmx-proxy
+	fi
+}
+
+pkg_postinst() {
+	if use server || use proxy ; then
+		elog
+		elog "You may need to configure your database for Zabbix"
+		elog "if you have not already done so."
+		elog
+
+		zabbix_homedir=$(egethome zabbix)
+		if [ -n "${zabbix_homedir}" ] && \
+			[ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
+			ewarn
+			ewarn "The user 'zabbix' should have his homedir changed"
+			ewarn "to /var/lib/zabbix/home if you want to use"
+			ewarn "custom alert scripts."
+			ewarn
+			ewarn "A real homedir might be needed for configfiles"
+			ewarn "for custom alert scripts."
+			ewarn
+			ewarn "To change the homedir use:"
+			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
+			ewarn
+		fi
+	fi
+
+	if use server; then
+		tmpfiles_process zabbix-server.conf
+
+		elog
+		elog "For distributed monitoring you have to run:"
+		elog
+		elog "zabbix_server -n <nodeid>"
+		elog
+		elog "This will convert database data for use with Node ID"
+		elog "and also adds a local node."
+		elog
+	fi
+
+	if use proxy; then
+		tmpfiles_process zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		tmpfiles_process zabbix-agentd.conf
+	fi
+
+	if use agent2; then
+		tmpfiles_process zabbix-agent2.conf
+	fi
+
+	elog "--"
+	elog
+	elog "You may need to add these lines to /etc/services:"
+	elog
+	elog "zabbix-agent     10050/tcp Zabbix Agent"
+	elog "zabbix-agent     10050/udp Zabbix Agent"
+	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
+	elog "zabbix-trapper   10051/udp Zabbix Trapper"
+	elog
+
+	if use server || use proxy ; then
+		# check for fping
+		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
+		case "${fping_perms}" in
+			4[157][157][157])
+				;;
+			*)
+				ewarn
+				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
+				ewarn "you have to make /usr/sbin/fping setuid root and executable"
+				ewarn "by everyone. Run the following command to fix it:"
+				ewarn
+				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
+				ewarn
+				ewarn "Please be aware that this might impose a security risk,"
+				ewarn "depending on the code quality of fping."
+				ewarn
+				;;
+		esac
+	fi
+}
+
+pkg_prerm() {
+	(use frontend || use server) && webapp_pkg_prerm
+}
diff --git a/net-analyzer/zabbix/zabbix-6.4.3.ebuild b/net-analyzer/zabbix/zabbix-6.4.3.ebuild
index 239652c7407d..4c6a9f5a4fcc 100644
--- a/net-analyzer/zabbix/zabbix-6.4.3.ebuild
+++ b/net-analyzer/zabbix/zabbix-6.4.3.ebuild
@@ -28,6 +28,7 @@ KEYWORDS="amd64 x86"
 IUSE="agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy selinux server snmp sqlite ssh static"
 REQUIRED_USE="|| ( agent agent2 frontend proxy server )
 	?? ( gnutls openssl )
+	agent2 ( !gnutls )
 	proxy? ( ^^ ( mysql oracle postgres sqlite ) )
 	server? ( ^^ ( mysql oracle postgres ) !sqlite )
 	static? ( !oracle !snmp )"
diff --git a/net-analyzer/zabbix/zabbix-6.4.4.ebuild b/net-analyzer/zabbix/zabbix-6.4.4.ebuild
index 2423117090ed..38f6609f2faf 100644
--- a/net-analyzer/zabbix/zabbix-6.4.4.ebuild
+++ b/net-analyzer/zabbix/zabbix-6.4.4.ebuild
@@ -28,6 +28,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy selinux server snmp sqlite ssh static"
 REQUIRED_USE="|| ( agent agent2 frontend proxy server )
 	?? ( gnutls openssl )
+	agent2 ( !gnutls )
 	proxy? ( ^^ ( mysql oracle postgres sqlite ) )
 	server? ( ^^ ( mysql oracle postgres ) !sqlite )
 	static? ( !oracle !snmp )"
diff --git a/net-analyzer/zabbix/zabbix-6.4.5.ebuild b/net-analyzer/zabbix/zabbix-6.4.5.ebuild
index 2423117090ed..38f6609f2faf 100644
--- a/net-analyzer/zabbix/zabbix-6.4.5.ebuild
+++ b/net-analyzer/zabbix/zabbix-6.4.5.ebuild
@@ -28,6 +28,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy selinux server snmp sqlite ssh static"
 REQUIRED_USE="|| ( agent agent2 frontend proxy server )
 	?? ( gnutls openssl )
+	agent2 ( !gnutls )
 	proxy? ( ^^ ( mysql oracle postgres sqlite ) )
 	server? ( ^^ ( mysql oracle postgres ) !sqlite )
 	static? ( !oracle !snmp )"
diff --git a/net-analyzer/zabbix/zabbix-6.4.6.ebuild b/net-analyzer/zabbix/zabbix-6.4.6.ebuild
new file mode 100644
index 000000000000..38f6609f2faf
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-6.4.6.ebuild
@@ -0,0 +1,403 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# To create the go modules tarball:
+#   cd src/go
+#   GOMODCACHE="${PWD}"/go-mod go mod download -modcacherw
+#   tar -acf zabbix-${PV}-go-deps.tar.xz go-mod
+
+EAPI=8
+
+GO_OPTIONAL="yes"
+# needed to make webapp-config dep optional
+WEBAPP_OPTIONAL="yes"
+inherit webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info
+
+DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
+HOMEPAGE="https://www.zabbix.com/"
+MY_P=${P/_/}
+MY_PV=${PV/_/}
+SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz
+	agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/${P}-go-deps.tar.xz )
+"
+
+LICENSE="GPL-2"
+SLOT="0/$(ver_cut 1-2)"
+WEBAPP_MANUAL_SLOT="yes"
+KEYWORDS="~amd64 ~x86"
+IUSE="agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy selinux server snmp sqlite ssh static"
+REQUIRED_USE="|| ( agent agent2 frontend proxy server )
+	?? ( gnutls openssl )
+	agent2 ( !gnutls )
+	proxy? ( ^^ ( mysql oracle postgres sqlite ) )
+	server? ( ^^ ( mysql oracle postgres ) !sqlite )
+	static? ( !oracle !snmp )"
+
+COMMON_DEPEND="
+	curl? ( net-misc/curl )
+	gnutls? ( net-libs/gnutls:0= )
+	java? ( >=virtual/jdk-1.8:* )
+	ldap? (
+		=dev-libs/cyrus-sasl-2*
+		net-libs/gnutls:=
+		net-nds/openldap:=
+	)
+	libxml2? ( dev-libs/libxml2 )
+	mysql? ( dev-db/mysql-connector-c:= )
+	odbc? ( dev-db/unixODBC )
+	openipmi? ( sys-libs/openipmi )
+	openssl? ( dev-libs/openssl:=[-bindist(-)] )
+	oracle? ( dev-db/oracle-instantclient[odbc,sdk] )
+	postgres? ( dev-db/postgresql:* )
+	proxy?  (
+		dev-libs/libevent:=
+		sys-libs/zlib
+	)
+	server? (
+		dev-libs/libevent:=
+		sys-libs/zlib
+	)
+	snmp? ( net-analyzer/net-snmp:= )
+	sqlite? ( dev-db/sqlite )
+	ssh? ( net-libs/libssh2 )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	acct-group/zabbix
+	acct-user/zabbix
+	java? ( >=virtual/jre-1.8:* )
+	mysql? ( virtual/mysql )
+	proxy? (
+		dev-libs/libpcre2:=
+		net-analyzer/fping[suid]
+	)
+	selinux? ( sec-policy/selinux-zabbix )
+	server? (
+		app-admin/webapp-config
+		dev-libs/libpcre2:=
+		net-analyzer/fping[suid]
+	)
+	frontend? (
+		app-admin/webapp-config
+		dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
+		media-libs/gd[png]
+		virtual/httpd-php:*
+		mysql? ( dev-lang/php[mysqli] )
+		odbc? ( dev-lang/php[odbc] )
+		oracle? ( dev-lang/php[oci8-instant-client] )
+		postgres? ( dev-lang/php[postgres] )
+		sqlite? ( dev-lang/php[sqlite] )
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	static? (
+		curl? ( net-misc/curl[static-libs] )
+		ldap? (
+			=dev-libs/cyrus-sasl-2*[static-libs]
+			net-libs/gnutls[static-libs]
+			net-nds/openldap[static-libs]
+		)
+		libxml2? ( dev-libs/libxml2[static-libs] )
+		mysql? ( dev-db/mysql-connector-c[static-libs] )
+		odbc? ( dev-db/unixODBC[static-libs] )
+		postgres? ( dev-db/postgresql:*[static-libs] )
+		sqlite? ( dev-db/sqlite[static-libs] )
+		ssh? ( net-libs/libssh2 )
+	)
+"
+BDEPEND="
+	virtual/pkgconfig
+	agent2? (
+		>=dev-lang/go-1.12
+		app-arch/unzip
+	)
+"
+
+# upstream tests fail for agent2
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.0.18-modulepathfix.patch"
+	"${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch"
+	"${FILESDIR}/${PN}-6.4.0-configure-sscanf.patch"
+)
+
+S=${WORKDIR}/${MY_P}
+
+ZABBIXJAVA_BASE="opt/zabbix_java"
+
+pkg_setup() {
+	if use oracle; then
+		if [ -z "${ORACLE_HOME}" ]; then
+			eerror
+			eerror "The environment variable ORACLE_HOME must be set"
+			eerror "and point to the correct location."
+			eerror "It looks like you don't have Oracle installed."
+			eerror
+			die "Environment variable ORACLE_HOME is not set"
+		fi
+	fi
+
+	if use frontend; then
+		webapp_pkg_setup
+	fi
+
+	java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+	default
+}
+
+src_configure() {
+	local econf_args=(
+		--with-libpcre2
+		"$(use_enable agent)"
+		"$(use_enable agent2)"
+		"$(use_enable ipv6)"
+		"$(use_enable java)"
+		"$(use_enable proxy)"
+		"$(use_enable server)"
+		"$(use_enable static)"
+		"$(use_with curl libcurl)"
+		"$(use_with gnutls)"
+		"$(use_with ldap)"
+		"$(use_with libxml2)"
+		"$(use_with mysql)"
+		"$(use_with odbc unixodbc)"
+		"$(use_with openipmi openipmi)"
+		"$(use_with openssl)"
+		"$(use_with oracle)"
+		"$(use_with postgres postgresql)"
+		"$(use_with snmp net-snmp)"
+		"$(use_with sqlite sqlite3)"
+		"$(use_with ssh ssh2)"
+	)
+
+	econf ${econf_args[@]}
+}
+
+src_compile() {
+	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
+		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
+	fi
+}
+
+src_install() {
+	local dirs=(
+		/etc/zabbix
+		/var/lib/zabbix
+		/var/lib/zabbix/home
+		/var/lib/zabbix/scripts
+		/var/lib/zabbix/alertscripts
+		/var/lib/zabbix/externalscripts
+		/var/log/zabbix
+	)
+
+	for dir in "${dirs[@]}"; do
+		keepdir "${dir}"
+	done
+
+	if use server; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_server.conf
+		fperms 0640 /etc/zabbix/zabbix_server.conf
+		fowners root:zabbix /etc/zabbix/zabbix_server.conf
+
+		newinitd "${FILESDIR}"/zabbix-server-r1.init zabbix-server
+
+		dosbin src/zabbix_server/zabbix_server
+
+		insinto /usr/share/zabbix
+		doins -r "${S}"/database/
+
+		systemd_dounit "${FILESDIR}"/zabbix-server.service
+		newtmpfiles "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf
+	fi
+
+	if use proxy; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_proxy.conf
+		fperms 0640 /etc/zabbix/zabbix_proxy.conf
+		fowners root:zabbix /etc/zabbix/zabbix_proxy.conf
+
+		newinitd "${FILESDIR}"/zabbix-proxy.init zabbix-proxy
+
+		dosbin src/zabbix_proxy/zabbix_proxy
+
+		insinto /usr/share/zabbix
+		doins -r "${S}"/database/
+
+		systemd_dounit "${FILESDIR}"/zabbix-proxy.service
+		newtmpfiles "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_agentd.conf
+		fperms 0640 /etc/zabbix/zabbix_agentd.conf
+		fowners root:zabbix /etc/zabbix/zabbix_agentd.conf
+
+		newinitd "${FILESDIR}"/zabbix-agentd.init zabbix-agentd
+
+		dosbin src/zabbix_agent/zabbix_agentd
+		dobin \
+			src/zabbix_sender/zabbix_sender \
+			src/zabbix_get/zabbix_get
+
+		systemd_dounit "${FILESDIR}"/zabbix-agentd.service
+		newtmpfiles "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf
+	fi
+	if use agent2; then
+		insinto /etc/zabbix
+		doins "${S}"/src/go/conf/zabbix_agent2.conf
+		fperms 0640 /etc/zabbix/zabbix_agent2.conf
+		fowners root:zabbix /etc/zabbix/zabbix_agent2.conf
+		keepdir /etc/zabbix/zabbix_agent2.d/plugins.d
+
+		newinitd "${FILESDIR}"/zabbix-agent2.init zabbix-agent2
+
+		dosbin src/go/bin/zabbix_agent2
+
+		systemd_dounit "${FILESDIR}"/zabbix-agent2.service
+		newtmpfiles "${FILESDIR}"/zabbix-agent2.tmpfiles zabbix-agent2.conf
+	fi
+
+	fowners root:zabbix /etc/zabbix
+	fowners zabbix:zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+	fperms 0750 \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	dodoc README INSTALL NEWS ChangeLog \
+		conf/zabbix_agentd.conf \
+		conf/zabbix_proxy.conf \
+		conf/zabbix_agentd/userparameter_examples.conf \
+		conf/zabbix_agentd/userparameter_mysql.conf \
+		conf/zabbix_server.conf
+
+	if use frontend; then
+		webapp_src_preinst
+		cp -R ui/* "${D}/${MY_HTDOCSDIR}"
+		webapp_configfile \
+			"${MY_HTDOCSDIR}"/include/db.inc.php \
+			"${MY_HTDOCSDIR}"/include/config.inc.php
+		webapp_src_install
+	fi
+
+	if use java; then
+		dodir \
+			/${ZABBIXJAVA_BASE} \
+			/${ZABBIXJAVA_BASE}/bin \
+			/${ZABBIXJAVA_BASE}/lib
+		keepdir /${ZABBIXJAVA_BASE}
+		exeinto /${ZABBIXJAVA_BASE}/bin
+		doexe src/zabbix_java/bin/zabbix-java-gateway-"${MY_PV}".jar
+		exeinto /${ZABBIXJAVA_BASE}/lib
+		doexe \
+			src/zabbix_java/lib/logback-classic-1.2.9.jar \
+			src/zabbix_java/lib/logback-console.xml \
+			src/zabbix_java/lib/logback-core-1.2.9.jar \
+			src/zabbix_java/lib/logback.xml \
+			src/zabbix_java/lib/android-json-4.3_r3.1.jar \
+			src/zabbix_java/lib/slf4j-api-1.7.32.jar
+		newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy
+		newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf zabbix-jmx-proxy
+	fi
+}
+
+pkg_postinst() {
+	if use server || use proxy ; then
+		elog
+		elog "You may need to configure your database for Zabbix"
+		elog "if you have not already done so."
+		elog
+
+		zabbix_homedir=$(egethome zabbix)
+		if [ -n "${zabbix_homedir}" ] && \
+			[ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
+			ewarn
+			ewarn "The user 'zabbix' should have his homedir changed"
+			ewarn "to /var/lib/zabbix/home if you want to use"
+			ewarn "custom alert scripts."
+			ewarn
+			ewarn "A real homedir might be needed for configfiles"
+			ewarn "for custom alert scripts."
+			ewarn
+			ewarn "To change the homedir use:"
+			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
+			ewarn
+		fi
+	fi
+
+	if use server; then
+		tmpfiles_process zabbix-server.conf
+
+		elog
+		elog "For distributed monitoring you have to run:"
+		elog
+		elog "zabbix_server -n <nodeid>"
+		elog
+		elog "This will convert database data for use with Node ID"
+		elog "and also adds a local node."
+		elog
+	fi
+
+	if use proxy; then
+		tmpfiles_process zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		tmpfiles_process zabbix-agentd.conf
+	fi
+
+	if use agent2; then
+		tmpfiles_process zabbix-agent2.conf
+	fi
+
+	elog "--"
+	elog
+	elog "You may need to add these lines to /etc/services:"
+	elog
+	elog "zabbix-agent     10050/tcp Zabbix Agent"
+	elog "zabbix-agent     10050/udp Zabbix Agent"
+	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
+	elog "zabbix-trapper   10051/udp Zabbix Trapper"
+	elog
+
+	if use server || use proxy ; then
+		# check for fping
+		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
+		case "${fping_perms}" in
+			4[157][157][157])
+				;;
+			*)
+				ewarn
+				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
+				ewarn "you have to make /usr/sbin/fping setuid root and executable"
+				ewarn "by everyone. Run the following command to fix it:"
+				ewarn
+				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
+				ewarn
+				ewarn "Please be aware that this might impose a security risk,"
+				ewarn "depending on the code quality of fping."
+				ewarn
+				;;
+		esac
+	fi
+}
+
+pkg_prerm() {
+	(use frontend || use server) && webapp_pkg_prerm
+}
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 53db495ea6b6..0cfe2e3a4928 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/libhackrf/Manifest b/net-libs/libhackrf/Manifest
index bc33635094d1..7f7d4580a4f0 100644
--- a/net-libs/libhackrf/Manifest
+++ b/net-libs/libhackrf/Manifest
@@ -1,7 +1,5 @@
 AUX hackrf-disable-static-2022.09.1.patch 1165 BLAKE2B 4e0fb00e223a1904b8006091b7ee33e26d46d6c60a58cbfdff7e930f5cba7bbf80b20c61cdb4ddf7bb596573218a9dbe23905fd7f58207a25d931e4b7532d7a5 SHA512 5b705eb513e95b62a47fc57a0c824794d1222ac735475a8aa33d49f250fa96d39b63884076c9743066baafb86a995c26b37f294592d77c62972c26206d1d75d2
-DIST hackrf-2022.09.1.tar.xz 21534956 BLAKE2B fd1b3469372fdb0558465c84f3645859791af9bd1302f63c63185ce7c47d24779ed0baf47eccbfc8ddb771e9737edb2a37a073fb749377d87f4e67c11eb6ef76 SHA512 c3b8b6f18cb80e3506c09dc71f2c01c127ad6d88ed028be3b659953cf7bb1e36b9dba83b4bb04c916bd7c2b66faeae1e602c53368e1e56454d6fe831961e01ee
 DIST hackrf-2023.01.1.tar.xz 23030956 BLAKE2B f0ea4f92208d1db5b4e1c11231e4420db757c08e28e7a80d79e70b02d868689ddf516bc6f003fc208f60c221c9153412a12fe3cbdf8f58001c1f7cdd26383ac0 SHA512 7c2ef9c5c050e258a0d1695240f9163955cb3ea9ab9163aad6bdbdebfdb82cde9925818ced3323342fe9c4ddb80dcedbc5a7986caaa4e0b7036e8e07bec0296e
-EBUILD libhackrf-2022.09.1.ebuild 1233 BLAKE2B 09f2a095f3524efcc6e00dc26a009265419a5a3cbe5b3d5c268b714c9cc702c2bdc48ae8bb89fd273fee0c97d4afd5e1ea6bd98c038c631951a909fb2a072571 SHA512 4a8ef98ebda23ac19a3379cc5876e2c1641359bc7771db217c1a16457e16a09e0d6c55394a3e1f8a39c316cb8a17ccb0d0d124495d7a263e05e4bade14d43685
-EBUILD libhackrf-2023.01.1.ebuild 1239 BLAKE2B c7aa49d6cfe59c83e5575d01e8eb28262109ec596c6b3f58cae228c76114bbf9b5383dbdf902e34adc2e1117f91a73aa8db7cf4116d909cda33d4e24a4a7607f SHA512 1cd4c2f83799fa3bd8c0053b37b8f6cfe404308465b9b8df5d045847738b628e3f329902ea6e269e399811228edc771e580660710267339dc7ec6f26dc6ff166
+EBUILD libhackrf-2023.01.1.ebuild 1235 BLAKE2B 530244a491190d815a413850fdb0ba15be27c72817e652c542e9bf72c023d7147133ff53c9bc24c15d3ac983c008f37cca325eb302fadcbddeb63dee79e2ffef SHA512 d5bcced70f5ce4944f90b5899fc79fe6b7b2b1f6136d1439fc6164d38387df5893273b499d08ed3fffb3218a62cb8dccb94647d0297cbc7a31ac6dfca3f67c9e
 EBUILD libhackrf-9999.ebuild 1239 BLAKE2B 13ab9b050dba10a48b962438279352884b355004159ec70c3532795c4e2043f8260a0440f6e9eb8a795f4cf7be1b313938007379a143e645c26f50083688b4ca SHA512 0e29c88a8713c041e4df93852c60ece2b69d7df401657f96bc0b7cee1f31ecea1378e46cf6624909e6013bddbc8234a370f948b4ba31a1ad65a6910b45164c69
 MISC metadata.xml 478 BLAKE2B b9dc4d583a6d8d6f4f495b4c9cf911f127133087f00ebf696be9f603ce3be1e93f5f112dd57fa557602daf67709176ab082cf07f7945cc6abc396fb445da5bc0 SHA512 11196ffe3e3b7a746be9191dc28188b56fa5e1238c26bfb878ee891e3564f7360e7169c469797e199bc77a1b1c1d8ab951891e4830f266ff4d19d71c33b919b2
diff --git a/net-libs/libhackrf/libhackrf-2022.09.1.ebuild b/net-libs/libhackrf/libhackrf-2022.09.1.ebuild
deleted file mode 100644
index 9d311e16edbf..000000000000
--- a/net-libs/libhackrf/libhackrf-2022.09.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake udev
-
-DESCRIPTION="library for communicating with HackRF SDR platform"
-HOMEPAGE="http://greatscottgadgets.com/hackrf/"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/greatscottgadgets/hackrf.git"
-	inherit git-r3
-	EGIT_CHECKOUT_DIR="${WORKDIR}/hackrf"
-	S="${WORKDIR}/hackrf/host/libhackrf"
-else
-	S="${WORKDIR}/hackrf-${PV}/host/libhackrf"
-	SRC_URI="https://github.com/greatscottgadgets/hackrf/releases/download/v${PV}/hackrf-${PV}.tar.xz"
-	KEYWORDS="amd64 ~arm ~ppc ~riscv x86"
-fi
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-IUSE="+udev"
-
-DEPEND="virtual/libusb:1"
-RDEPEND="${DEPEND}"
-
-# https://github.com/greatscottgadgets/hackrf/issues/1193
-PATCHES=( "${FILESDIR}/hackrf-disable-static-${PV}.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		-DINSTALL_UDEV_RULES="$(usex udev)"
-	)
-	if use udev; then
-		mycmakeargs+=(
-			-DUDEV_RULES_GROUP=usb
-			-DUDEV_RULES_PATH="$(get_udevdir)/rules.d"
-		)
-	fi
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_build hackrf
-}
-
-pkg_postinst() {
-	if use udev; then
-		einfo "Users in the usb group can use hackrf."
-		udev_reload
-	fi
-}
-
-pkg_postrm() {
-	udev_reload
-}
diff --git a/net-libs/libhackrf/libhackrf-2023.01.1.ebuild b/net-libs/libhackrf/libhackrf-2023.01.1.ebuild
index 327c7d4d982d..3ddc3f0ba4d2 100644
--- a/net-libs/libhackrf/libhackrf-2023.01.1.ebuild
+++ b/net-libs/libhackrf/libhackrf-2023.01.1.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	S="${WORKDIR}/hackrf-${PV}/host/libhackrf"
 	SRC_URI="https://github.com/greatscottgadgets/hackrf/releases/download/v${PV}/hackrf-${PV}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~ppc ~riscv ~x86"
+	KEYWORDS="amd64 arm ppc ~riscv x86"
 fi
 
 LICENSE="BSD"
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index d4a7ce559f36..8ab9e8c55264 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest
index 2899775a80d3..d8ed9824f0b6 100644
--- a/net-misc/dhcpcd/Manifest
+++ b/net-misc/dhcpcd/Manifest
@@ -5,7 +5,7 @@ DIST dhcpcd-10.0.2.tar.xz 264324 BLAKE2B 999033b4c0bc46943332b0b7ed3f1869ad54e2c
 DIST dhcpcd-9.4.1.tar.xz 257092 BLAKE2B 847c7451918ac89fe384e180ec52ee4624c0f2dc73354ecb4c63b02d8d9cf0a6d164b33e5d083a05d4868079dcf6208a820b4263c80337a12be40a27517ecf87 SHA512 530e6a5bddab4f91bd66f8d47ccd8d6cac4bc2998ddd36da7e257c83270b558016e9e1fc2f815fb99c0d86ed4bbc2a3a1b78788e69fe151fddaf94428a47fa45
 DIST dhcpcd-9.5.1.tar.xz 258280 BLAKE2B 355a98d415253608e8f586809d41e7654c1973d956cb3951218e1ff8c928ee414aa1b9854180c78e975898d9eb0f4cb9cc0fe64eefd5690b371989093e1bcb5a SHA512 979c180743d3e01d1996033d42c5606792e3acaef4e600f0ea51c362643a5b2743c6dc2792314c3b66edfa99c3b98d17f46cf3421e2088b37804e6e2167037ee
 EBUILD dhcpcd-10.0.1.ebuild 4645 BLAKE2B d91647c2848635deb660d61d6d37058a35ec2f12fb9914a6f753207d31f3284d86ba9281363b618a5e3bea509f9ac899769591ae738bc94923169b8cdc11a334 SHA512 99a22505227de7210250e7265d3099c2bae62b667a78f8a7f14cd54faaf122f3971afc07cdf0be3977e72e4004a702d7bff59c144b5f962262b18f8d7b857304
-EBUILD dhcpcd-10.0.2.ebuild 4637 BLAKE2B 44e1a10cefbdd2e0a6024f71a0e8b4cde72629f884a87ea5bfc2da161f5994710921e6d70de005cf16f827fd9f36bf565a2922b942736ad1e60d2b36fd13f655 SHA512 a622716780ba6f8da87312bfbaea91a15d2913d0343f893c43f5954f66905b5220f1d94483908ff41261e9d1c295d73a360ab8ef982c6ed68142ab0d606a75d2
+EBUILD dhcpcd-10.0.2.ebuild 4649 BLAKE2B e00e857c44168096c3530004d32bb62250681d686b17954b46bd6993f32ca963d4369ae79ee9d15afc90c53b9e1d7c3f71b2a819278c44e12b59d1cb08a8affb SHA512 3596770f90d6b49b1c677538cbe1b34b482a886a322050f664d90ec6851b839b3294a57144d8e7c1f93530db3e4120b95d11ded5c568162c6ac0510ec9dcbfdf
 EBUILD dhcpcd-9.4.1.ebuild 4646 BLAKE2B 9f2447bc68012dfd41188f10d62729958b1abb3804e44abb5f65cfd2ee3086fb28cd9530b420e4a0597ec9ab4af4aab7784dcbe935adfc2b017e34b3dfb8025e SHA512 63f8ce073f061a76f8c9e41b3601d4ecd13ab3471443d6cfe73149333c3bc0452f02d6bd96cfbfac664bf6b5f315eb664ec45e673ec71086d23c9e7e4e26ca46
 EBUILD dhcpcd-9.5.1.ebuild 4610 BLAKE2B e74ed2bcac66ce60354b6a1d5fe606b91c87057db2e23dd31fd1035aa5ab05042053c62d04b406c5ff9c1b96a2e196a60a8df699c7755319ca50a58f627e684e SHA512 88976827203f49c28d45cb0dfd65b1f71e881e53c617e3cc131f6886197cfcc50dfaa6d0d1a2e6e678e12f9964aa50f70d102475bcbcc9431e6d5f4c98c5120b
 EBUILD dhcpcd-9999.ebuild 4645 BLAKE2B d91647c2848635deb660d61d6d37058a35ec2f12fb9914a6f753207d31f3284d86ba9281363b618a5e3bea509f9ac899769591ae738bc94923169b8cdc11a334 SHA512 99a22505227de7210250e7265d3099c2bae62b667a78f8a7f14cd54faaf122f3971afc07cdf0be3977e72e4004a702d7bff59c144b5f962262b18f8d7b857304
diff --git a/net-misc/dhcpcd/dhcpcd-10.0.2.ebuild b/net-misc/dhcpcd/dhcpcd-10.0.2.ebuild
index 83e7c5b06dcf..f311304756fa 100644
--- a/net-misc/dhcpcd/dhcpcd-10.0.2.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-10.0.2.ebuild
@@ -21,7 +21,7 @@ fi
 DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
 HOMEPAGE="https://github.com/NetworkConfiguration/dhcpcd/ https://roy.marples.name/projects/dhcpcd/"
 
-LICENSE="BSD-2"
+LICENSE="BSD-2 BSD ISC MIT"
 SLOT="0"
 IUSE="debug +embedded ipv6 privsep +udev"
 
diff --git a/net-misc/dropbox/Manifest b/net-misc/dropbox/Manifest
index a4eabc6afc0d..4459eadf5a25 100644
--- a/net-misc/dropbox/Manifest
+++ b/net-misc/dropbox/Manifest
@@ -2,13 +2,7 @@ AUX dropbox.conf 322 BLAKE2B db94efba3a73841cb56a0fcc75f4f6d7fb7424a35f48a7eb3ad
 AUX dropbox.initd 1581 BLAKE2B c23a753b7e4d1132d516d607e0eee35072130f6e66c59af008cedd9d9d8c104d9ae1c4644ad984a40ec48a498782b442f79058f499e61c3a3b7a700886353b4b SHA512 4275b7cca361978be6d4379f9d14edc75e51684708a61c1b9880f63e0a02e75c4eb165145bf5a2b4e0704daa5a506dc3506a953db6f5a95977f0101fbbda4912
 AUX dropbox_at.service-r2 1582 BLAKE2B 7a5d8eb1e99d6a9f6cc7d903d8d2cb6b124b4a5217e978d05f0afb08de90b3634bb802bd075a053b84b0ec4f5ef6643d2efb00beb964f9f14dd3dd234806358b SHA512 ce465614c848103ac19d3782bf55508ab9b3a3f1c0159cd0ccb7daa7374f014382b30a99bf2eb5488ab4474cad953ce0b4710c8222e5196ea49672db5d183b85
 DIST DropboxGlyph_Blue.svg 605 BLAKE2B 6c488bd261293b22da98035935ddfa9247bedbc6f4da2f9fc2470af802c1f4f597ac88b01b5bef9e77e1e717267f633d6a04af2ccfd3c5f9dbff22fbceaf9a91 SHA512 9202344b904dcd7955e5a355dadf537d1544140d74f8a33bdc40e18e36661e3a474d11cf17613eaebf4e76c170d8413d99abdedfb8635784bcd6892b4b259712
-DIST dropbox-lnx.x86-177.4.5399.tar.gz 111456140 BLAKE2B 0406f2d7b24134c95a21eee79e0912862edd767bb60394bac7cbf56a9ee3e4036e8615462772adfda90a7de802663ccdbb2b7f61628ab4a3ed7eed32fb2dd2f9 SHA512 80c0ac085f3662b05007a50b680259d96c7a0ef10efd29b31d50b7444dadf8a6403c2e5a78454bcdc6a418307b3ebc837c7e1da7348997fbc8f427fed39ce33e
-DIST dropbox-lnx.x86-178.4.4811.tar.gz 111867240 BLAKE2B 2470124fa11e782553ddd203a3f198e67a714f95b19b3657cd17547b68864caac287f5d1f197ab52be6cc0ff84cc6ba3ae1f7ca816374c489d8acc12d2875229 SHA512 c9ddacd1bce0fc24d56ab497df85969f0a7c793681a3f69ad737339e44bfbf4657b1288117d9c8554903b60b110298bbd47c0ed0142f8a5714bf95f57d9e4fb1
-DIST dropbox-lnx.x86-180.4.4912.tar.gz 112659998 BLAKE2B d55fc37acef65da3edc786930b42b993ba81a03215fd8cf2f4025c697af826d97214605955cebf4cf137660f9c48f2809c8dabad34ae52849f4f05d517ba6c3f SHA512 8b4160af9f6f24bd33dca57e604367f4131dc071044f91ce16d377e7cc7d72857500e212e5873d093477b832b0ce2205508d28e7116359b71f51ab30feffc92d
-DIST dropbox-lnx.x86_64-177.4.5399.tar.gz 113102362 BLAKE2B a478165bbf5725d38f75252ff4fe8b5dd79551a791cc80529dcc422b03e725bf44bcb8873d9ff96bf928683ea2713d343d8fa70d9137b0fe479a92a9d30f3e7d SHA512 a5be63ac35aaa5837951d4989e0ae643560faafda7a077b303d239b5454b557cfe4bbefa3e9a4c8d3c740710734fb47ef96c64c636ce359af680405acdc13520
-DIST dropbox-lnx.x86_64-178.4.4811.tar.gz 113484884 BLAKE2B d55e1d8ed52bdf8fb7d766a05f96bb1087684ca7e91f795bc667949440e2d2ffb61a4974561cdc7b4032492056a9672d89c718d28c772fd70f4e1490eb07f5d6 SHA512 946370139160787f5e7b7e96d5ed546d43501db392e7b43dd25bb6aff1b35f359d8e753da1b23b6e1c9d886043b24a78ccca965e8e8f8cf24805bf6cb3215155
-DIST dropbox-lnx.x86_64-180.4.4912.tar.gz 114173215 BLAKE2B d25e581ee1b134d956efbda366045823259e531db0482aa50fa139b866d1f1a21e9f17e91ea3cf1e1e1fe1e03fdaa4127131731e4654d86c593eafe6f6907b83 SHA512 011cf1c2eb38838cbcca809684334edf3921b3bde865b49fb9b301e09625428b922ec146070ca300a8d0ee5a08a080abfe7139b507bf6bef46bb14b6df347730
-EBUILD dropbox-177.4.5399.ebuild 2854 BLAKE2B 4dee65271164156807a438491e0c7f498a6dc7846e52779bffb4f1ae6412fa8d34200ee45d6d303fb1b2d1a5da374d5e4a72f3916335acc21541d70f72256f54 SHA512 61be728fabb64052400b6a39a8278c0a66ea749069dbdc0a39933a004d11113b576bbb7f3c5cc08a185f774a8f010aeeedf14eec22a3a2a84bf4d6ad039b290c
-EBUILD dropbox-178.4.4811.ebuild 2856 BLAKE2B 0ac0c639bd225d163c1316a34f3b56f28735904ddf3a0fd93f5fe0ea99d68c8ea3125b9e7e1d6cbebcfff79818ddcd71a3571dd9b7e1d60a52da95fc907d08fc SHA512 cdad53d6c9b2857a49e7f48769f6d70885348dfed624a03fd95ac72cae1c04cf8ad3afd4ead369027500d95a7f75aebe0811fc687a609b3b9b732797512a0133
-EBUILD dropbox-180.4.4912.ebuild 2856 BLAKE2B 0ac0c639bd225d163c1316a34f3b56f28735904ddf3a0fd93f5fe0ea99d68c8ea3125b9e7e1d6cbebcfff79818ddcd71a3571dd9b7e1d60a52da95fc907d08fc SHA512 cdad53d6c9b2857a49e7f48769f6d70885348dfed624a03fd95ac72cae1c04cf8ad3afd4ead369027500d95a7f75aebe0811fc687a609b3b9b732797512a0133
+DIST dropbox-lnx.x86-181.4.5678.tar.gz 112778488 BLAKE2B 58464f93af02a40d08c049de30d702a55cc23021a1460ee3f0116c3dc6ecd72dedc057a17e07047fd1588d96d548f6da87f104572a8fe3bfbc26761f8953c7f0 SHA512 7cfdd048012ed5202408f4d4bc81693fb178b06500469a4a57284b901deabacbaf7b6b59f5acfa5aa985eedecb1d0883134fc9f605d68f4204e44bec9e26473a
+DIST dropbox-lnx.x86_64-181.4.5678.tar.gz 114189162 BLAKE2B c339d40fe82d3a2bae3f7e2f0e510d5e7f77d0a04d0875bfa558aef07f7676279cec4a79afb57e22bc1616460cbf5279058448310faa33e6e048a216ca2c43a0 SHA512 067b620535a398a77c9d8bbf6e0a924feb5730135970f900e34c6aa71cae9c239fcb60b41ad742937ca96019b5d617df37379db9244300c149e3bdf0b196e028
+EBUILD dropbox-181.4.5678.ebuild 2854 BLAKE2B 4dee65271164156807a438491e0c7f498a6dc7846e52779bffb4f1ae6412fa8d34200ee45d6d303fb1b2d1a5da374d5e4a72f3916335acc21541d70f72256f54 SHA512 61be728fabb64052400b6a39a8278c0a66ea749069dbdc0a39933a004d11113b576bbb7f3c5cc08a185f774a8f010aeeedf14eec22a3a2a84bf4d6ad039b290c
 MISC metadata.xml 336 BLAKE2B 0932d5cb97ca50abfbfd49b3b209733da73c94ed41ef1087e6c43c4e65f3a09186f74c507cf0db5d64a1c5231d3560a7d6a8bb6130e95e1d5dbb7f3974801df3 SHA512 25bee9aa1ab64f01bb4544dec14b4b98bcb3877714ec33c6cbed4cdd3362d2a4cab58f425cad3723398e4ee0a2ba16a550ab38ff9f974cd0c5046df1b34b5eb0
diff --git a/net-misc/dropbox/dropbox-178.4.4811.ebuild b/net-misc/dropbox/dropbox-178.4.4811.ebuild
deleted file mode 100644
index e1949fb60f88..000000000000
--- a/net-misc/dropbox/dropbox-178.4.4811.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop pax-utils systemd xdg
-
-DESCRIPTION="Dropbox daemon (pretends to be GUI-less)"
-HOMEPAGE="https://www.dropbox.com/"
-SRC_URI="
-	amd64? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-${PV}.tar.gz )
-	x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-${PV}.tar.gz )
-	https://www.dropbox.com/sh/42f8d4kq6yt5lte/AAD69lhaw6gy46W8HfQAm0GSa/Glyph/Dropbox/SVG/DropboxGlyph_Blue.svg
-"
-
-LICENSE="BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-linux"
-IUSE="selinux X"
-
-RESTRICT="mirror strip"
-
-QA_PREBUILT="opt/.*"
-QA_EXECSTACK="opt/dropbox/dropbox"
-
-BDEPEND="dev-util/patchelf"
-
-# Be sure to have GLIBCXX_3.4.9, #393125
-RDEPEND="
-	X? (
-		x11-themes/hicolor-icon-theme
-	)
-	selinux? ( sec-policy/selinux-dropbox )
-	app-arch/bzip2
-	dev-libs/glib:2
-	dev-libs/libffi-compat:6
-	media-libs/fontconfig
-	media-libs/freetype
-	net-misc/wget
-	sys-libs/zlib
-	sys-libs/ncurses-compat:5
-	virtual/opengl
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrender
-	x11-libs/libxcb
-"
-
-src_unpack() {
-	unpack ${A}
-	mkdir -p "${S}" || die
-	mv "${WORKDIR}"/.dropbox-dist/* "${S}" || die
-	mv "${S}"/dropbox-lnx.*-${PV}/* "${S}" || die
-	rmdir "${S}"/dropbox-lnx.*-${PV}/ || die
-	rmdir .dropbox-dist || die
-}
-
-src_prepare() {
-	default
-	# we supply all of these in RDEPEND
-	rm -vf libGL.so.1 libX11* libffi.so.6 || die
-	# some of these do not appear to be used
-	rm -vf libQt5{OpenGL,PrintSupport,Qml,Quick,Sql,WebKit,WebKitWidgets}.so.5 \
-		PyQt5.QtPrintSupport.* PyQt5.QtQml.* PyQt5.QtQuick.*  \
-		wmctrl libdrm.so.2 libpopt.so.0 || die
-	if use X ; then
-		mv images/hicolor/16x16/status "${T}" || die
-	else
-		rm -vrf images || die
-	fi
-	patchelf --set-rpath '$ORIGIN' \
-		apex._apex.*.so \
-		nucleus_python.*.so \
-		tprt.*.so \
-		|| die
-	pax-mark cm dropbox
-	mv README ACKNOWLEDGEMENTS "${T}" || die
-}
-
-src_install() {
-	local targetdir="/opt/dropbox"
-
-	insinto "${targetdir}"
-	doins -r *
-	fperms a+x "${targetdir}"/{dropbox,dropboxd}
-	dosym "${targetdir}/dropboxd" "/opt/bin/dropbox"
-
-	if use X; then
-		doicon -s 16 -c status "${T}"/status
-		newicon -s scalable "${DISTDIR}/DropboxGlyph_Blue.svg" dropbox.svg
-	fi
-
-	make_desktop_entry "${PN}" "Dropbox" "dropbox"
-
-	newinitd "${FILESDIR}"/dropbox.initd dropbox
-	newconfd "${FILESDIR}"/dropbox.conf dropbox
-	systemd_newunit "${FILESDIR}"/dropbox_at.service-r2 "dropbox@.service"
-
-	dodoc "${T}"/{README,ACKNOWLEDGEMENTS}
-}
-
-pkg_postinst() {
-	einfo "Warning: while running, dropbox may attempt to autoupdate itself in"
-	einfo " your user's home directory.  To prevent this, run the following as"
-	einfo " each user who will run dropbox:"
-	einfo ""
-	einfo "install -dm0 ~/.dropbox-dist"
-}
diff --git a/net-misc/dropbox/dropbox-180.4.4912.ebuild b/net-misc/dropbox/dropbox-180.4.4912.ebuild
deleted file mode 100644
index e1949fb60f88..000000000000
--- a/net-misc/dropbox/dropbox-180.4.4912.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop pax-utils systemd xdg
-
-DESCRIPTION="Dropbox daemon (pretends to be GUI-less)"
-HOMEPAGE="https://www.dropbox.com/"
-SRC_URI="
-	amd64? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-${PV}.tar.gz )
-	x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-${PV}.tar.gz )
-	https://www.dropbox.com/sh/42f8d4kq6yt5lte/AAD69lhaw6gy46W8HfQAm0GSa/Glyph/Dropbox/SVG/DropboxGlyph_Blue.svg
-"
-
-LICENSE="BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-linux"
-IUSE="selinux X"
-
-RESTRICT="mirror strip"
-
-QA_PREBUILT="opt/.*"
-QA_EXECSTACK="opt/dropbox/dropbox"
-
-BDEPEND="dev-util/patchelf"
-
-# Be sure to have GLIBCXX_3.4.9, #393125
-RDEPEND="
-	X? (
-		x11-themes/hicolor-icon-theme
-	)
-	selinux? ( sec-policy/selinux-dropbox )
-	app-arch/bzip2
-	dev-libs/glib:2
-	dev-libs/libffi-compat:6
-	media-libs/fontconfig
-	media-libs/freetype
-	net-misc/wget
-	sys-libs/zlib
-	sys-libs/ncurses-compat:5
-	virtual/opengl
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrender
-	x11-libs/libxcb
-"
-
-src_unpack() {
-	unpack ${A}
-	mkdir -p "${S}" || die
-	mv "${WORKDIR}"/.dropbox-dist/* "${S}" || die
-	mv "${S}"/dropbox-lnx.*-${PV}/* "${S}" || die
-	rmdir "${S}"/dropbox-lnx.*-${PV}/ || die
-	rmdir .dropbox-dist || die
-}
-
-src_prepare() {
-	default
-	# we supply all of these in RDEPEND
-	rm -vf libGL.so.1 libX11* libffi.so.6 || die
-	# some of these do not appear to be used
-	rm -vf libQt5{OpenGL,PrintSupport,Qml,Quick,Sql,WebKit,WebKitWidgets}.so.5 \
-		PyQt5.QtPrintSupport.* PyQt5.QtQml.* PyQt5.QtQuick.*  \
-		wmctrl libdrm.so.2 libpopt.so.0 || die
-	if use X ; then
-		mv images/hicolor/16x16/status "${T}" || die
-	else
-		rm -vrf images || die
-	fi
-	patchelf --set-rpath '$ORIGIN' \
-		apex._apex.*.so \
-		nucleus_python.*.so \
-		tprt.*.so \
-		|| die
-	pax-mark cm dropbox
-	mv README ACKNOWLEDGEMENTS "${T}" || die
-}
-
-src_install() {
-	local targetdir="/opt/dropbox"
-
-	insinto "${targetdir}"
-	doins -r *
-	fperms a+x "${targetdir}"/{dropbox,dropboxd}
-	dosym "${targetdir}/dropboxd" "/opt/bin/dropbox"
-
-	if use X; then
-		doicon -s 16 -c status "${T}"/status
-		newicon -s scalable "${DISTDIR}/DropboxGlyph_Blue.svg" dropbox.svg
-	fi
-
-	make_desktop_entry "${PN}" "Dropbox" "dropbox"
-
-	newinitd "${FILESDIR}"/dropbox.initd dropbox
-	newconfd "${FILESDIR}"/dropbox.conf dropbox
-	systemd_newunit "${FILESDIR}"/dropbox_at.service-r2 "dropbox@.service"
-
-	dodoc "${T}"/{README,ACKNOWLEDGEMENTS}
-}
-
-pkg_postinst() {
-	einfo "Warning: while running, dropbox may attempt to autoupdate itself in"
-	einfo " your user's home directory.  To prevent this, run the following as"
-	einfo " each user who will run dropbox:"
-	einfo ""
-	einfo "install -dm0 ~/.dropbox-dist"
-}
diff --git a/net-misc/dropbox/dropbox-177.4.5399.ebuild b/net-misc/dropbox/dropbox-181.4.5678.ebuild
index b0b4cee9bbeb..b0b4cee9bbeb 100644
--- a/net-misc/dropbox/dropbox-177.4.5399.ebuild
+++ b/net-misc/dropbox/dropbox-181.4.5678.ebuild
diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index 5cc2da901149..bbc66e9ef6c2 100644
--- a/net-p2p/Manifest.gz
+++ b/net-p2p/Manifest.gz
diff --git a/net-p2p/transmission/Manifest b/net-p2p/transmission/Manifest
index 5f78a33f318c..723e370b6d75 100644
--- a/net-p2p/transmission/Manifest
+++ b/net-p2p/transmission/Manifest
@@ -11,5 +11,5 @@ DIST transmission-4.0.3.tar.xz 10062044 BLAKE2B 3d58f002d57458869e143e4a3617c899
 EBUILD transmission-3.00-r6.ebuild 3304 BLAKE2B c28525ca9dcb080356278a957f774042eb2697166aed7a042a1a68d2f103666172a2be54f1f707ea7bf7a777e058ddcda70bd43e9c64662e7204a01d4bb3a715 SHA512 0fc2b5e44abb35d85d5ea1f6d7f36545a6ee1e552449a5d646b340ca16e7e41acb9348fb9df18c1b62451fdf920633cc0ad908aa24a65054c0adec5f85a110e5
 EBUILD transmission-4.0.3-r1.ebuild 3710 BLAKE2B ba18e2fd920a7bae0af61ef0da6fd3dd2f72faffc32701c0fae58f70a494aa55879842e9a057c78ebbcfca3a99ec8908d14a274767b4ba9d3d820f0e826d1cbe SHA512 473ebb6b84577769f9fda7b4896130a6932c2df38ecc91f393089509a4f33cecd0f5e29faae64cab3407f059bd0fbf8a2b95d05514b00f040e6e9126ae0d0282
 EBUILD transmission-4.0.3.ebuild 3709 BLAKE2B fab17062d3d5a5259972388d2976ba77bfd7b27e2846268131d28c28eee1394bf311011b2ff728fc8df972a55b46eaabf081c24ff5ef3a8c47c849138c5033ff SHA512 18e5327170ceb5562ea2b5d7354aea900f5718ca5b505a58b2ac43257fa518b55e4021ccd590987b744c880eb1126e349b8c6bea6b0e10edd67919aa99776720
-EBUILD transmission-9999.ebuild 3712 BLAKE2B f821c6980d4b26e4a68cc2c7396bffcd4f6edfa663c229272c33bcc40c2228ff751baa4b91b97f6b13fc4a508a08795b809c41b788c086423e70e41ccebfa670 SHA512 fd807525049d8954f07beafd5bb26fc33667403422b91eb552f03d518ab1d0a7ca8fd4867ac3ed33a01038f198db2c7c364676e382de33d4ed7c6a5d883c0def
+EBUILD transmission-9999.ebuild 3712 BLAKE2B 56466570eb11cabc809d01d18d67c4933fd9d842181a1d3b69806c3e283fe0944d61aace7af158c2e839e3731680453069420d49b23e1a7b8056465d9920bc29 SHA512 fe88157e723464f431af4d71036b57ad23c504054f33df787dd4bb78b93ac2d968586174d287702b094ef9ea5ab52e36481d6995484b44716fd9cd7f6e73d734
 MISC metadata.xml 766 BLAKE2B 288f003183213d5546cf2a5c9ff58cc9df762c4f5ca5e34165322626757b5281c01891575b935a5a236e98a1461cb0d66b0d4886fcce2ae001bb707fcf20f5fc SHA512 58f65aaed1b17ae6b13958552c169b5b76f999eee2c19c51a64ee237b88dd59042f92358e993fa74312892066c4d3bb2b03355b35fb5103f032ee00a9afe9c91
diff --git a/net-p2p/transmission/transmission-9999.ebuild b/net-p2p/transmission/transmission-9999.ebuild
index e7bdf0c597cc..fa1c1b0109b5 100644
--- a/net-p2p/transmission/transmission-9999.ebuild
+++ b/net-p2p/transmission/transmission-9999.ebuild
@@ -51,7 +51,7 @@ COMMON_DEPEND="
 	sys-libs/zlib:=
 	nls? ( virtual/libintl )
 	gtk? (
-		>=dev-cpp/gtkmm-3.24.0:4.0
+		>=dev-cpp/gtkmm-4.11.1:4.0
 		>=dev-cpp/glibmm-2.60.0:2.68
 		appindicator? ( dev-libs/libayatana-appindicator )
 	)
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index c612d4bca80a..0f3f94ab791f 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/bluez/Manifest b/net-wireless/bluez/Manifest
index 3989517d2d70..d5996e83f0bf 100644
--- a/net-wireless/bluez/Manifest
+++ b/net-wireless/bluez/Manifest
@@ -9,11 +9,10 @@ AUX bluez-5.68-bap-dettach-io.patch 3472 BLAKE2B 424f55cc90e3b9f5045a3a3728929ec
 AUX bluez-5.68-bap-ebusy-fix.patch 5827 BLAKE2B cf8d111897ea7d51da88e6680342870a72226c1e67fea8a95686331dc29447e1ab777b50db839904a366f2e320b3e69bb6e43a9f8de91366a414901d0242dbb2 SHA512 1134848a726acda5bee8f7816d41c2284f29eb61425d474e5d5fcbf660a788c0cc5d73a679e27a72b4a4be147e8970b02fc35023fd28badf59e587debc695fe3
 AUX bluez-5.68-bap-nonzero.patch 764 BLAKE2B ba4e0853888649564baa5294c8687a7180175c0a8b83ec48c8c6b2e06f45b1c83386bf429081b73276495d5579f464adb7ccc5d1c55ef9864499c018230dd303 SHA512 129fe6a611dd6a42b32033b3975fd197a0925d50ff1259fdbaa74b1f39135c8cf538a5211ad66a0a4b6621a6e2bf5e9be8a40060fcd8d8718e5b9009c297b008
 AUX bluez-5.68-bap-resume.patch 6137 BLAKE2B a5eecd7b50048a8e63da3f98a4f83a96ae4c652c4fe10af4bac9f8173d27d7e863481c50cac382c21921f1c08476b106bcb1bc694183c84a24b0ed664abb41c2 SHA512 587c654f5ec667fa7540f20bb8ce25877722ddfb9aa520dc4f1c7f349f7b795889d1d5f5601b03d82154b630b6c98a4d10b7220b1d5e934e0ecb68a9259d001c
+AUX bluez-5.68-clang-midi.patch 2980 BLAKE2B f2e8ce17c97ca151c5d551592d72db5f44ed9fdda31a6adb0cfd7f8e5e6c3ba2c8e80589a32d6ac95db4ad0ad4829c25a1f03e4957dc79d7a88160f512425d2e SHA512 8c205a9acee243fff8609157689d3f985abcc37c04870ae588a8933e17d0507791578136dc40cbd78fe7a4dd8596792e92eb7caa8e0aa33fb507575db706f421
 AUX bluez-5.68-heap-use-after-free.patch 1515 BLAKE2B 73ee23986e652827672ab026582d8718d3f04a6faeb15d5802599910f5ee7c905813829486f5fdb2e6f190cfb6980b2eca5e9c008d9d427a6fc010943af5f318 SHA512 0f78c442faeae693489c25822dfe3065d6dbe2449d42b27c3f0f56b83caadbcf66942470bc00d28ec324cc49c400799a0e1d1d90f45e734b385ca54e4c9e6dc3
 AUX bluez-5.68-monitor-decoding.patch 1333 BLAKE2B 138359842a39abe7ba7c9db674b043110f6549f2499d8e42ff3abbce9bdfe9402babedc6228a8ff413bab97c12e1c8e9251db7918bc2b741f9bf5824dcf73912 SHA512 c1cba4b278aa559b31c09c721dff28a6024af4877a520b729fbec61e1cefd2bb338fe9d2629fb64796ab2caab32a9dce53ec55eaa1754bb712050ce01abc813e
 AUX bluez-udevadm-path-r1.patch 564 BLAKE2B 0b4dc12f55ab60d254aa3365baf35186a5913026dbfcbc3da41c113b3c423c81189b87016dabcb2c505b684cad376d10d10df9aa17558b8fd022928995931e0e SHA512 d9b0dd452258e425802cf5ad4980a77796be79e94bf6ce641927c5ab7ea1117ce6589063f3a0b96bf25e81303234279a09d58484fec49cfc6aa1db46f245f9c6
-DIST bluez-5.66.tar.xz 2257288 BLAKE2B af1911cf590461a874daa16bedb8a021a3b2c2af3254360c035d2180e0f355372651bd41da342c26e6d9631d726dd08e0d6a83a22069333b94b6fce6d546718c SHA512 ed0994932687eacf27207867366671b323671f5d5199daf36ea5eff8f254f2bc99ef989ef7df9883b35c06f2af60452be8bad0a06109428a4717cf2b247b4865
 DIST bluez-5.68.tar.xz 2319788 BLAKE2B 3beca78fadef4d66df6f237b7460f6ac4bf001d80c856b599faa2cc1232c4342c7945eace5a6667009b9d19f2368f9841e608f07bc826b30ce9112c43dd7e316 SHA512 1805fb68923a5e098777b69835d7593396f8f2bbf52e1cfe58e7447621497a700b23389c79e96b2d663c611335f6ea9df11efe8aa75a8842f6b73105f66e799c
-EBUILD bluez-5.66-r1.ebuild 9842 BLAKE2B 82d3759257cb3d944a9339efdb3936f3ce668e820d156820fef6562443c42df30637bbc04b4e72e81691ef407c33ee03a91cd78dd7f57b0b99101835ea7fcfb7 SHA512 b054da2c1c32f04bb2f44e75849d81fab09bffd9bb835322ba5906be3982702637a2858e761f4998e4e68148fd47cc2ce9d80a1214ba3991c1bc96af48c95d40
-EBUILD bluez-5.68.ebuild 9268 BLAKE2B bb5041232589144d348c4d7e8e7a1a7a0b8a344a97f7b7e5336560e4071a110c1804f85a5db923d038c41a3606bed4bedeeffab2cf5735b9f8def116c92d08be SHA512 13ec91dce5f1555e64a0c799b777ced7b851b32331c3c2007546a1424fbe421ce0b1d9c7c673015ae8832df2ccf2175a1be9896faa1127d140f3545e40a1b6c4
+EBUILD bluez-5.68.ebuild 9305 BLAKE2B ee42089549fad6bfb4f128e2a3a4e9c8f2711a4b60316c232172636fb9ca24dde9650f44c81b5f39c54d6fc9d4161e7cc5c52ca3de10058b46bc16f8a4c413f0 SHA512 a7a256acdfafbd8069ad18724e0bbd6e08415a1189998b4f40b4fde8252eaf3ddd0f90b38dd4eadb075462e7674a8429b7a51f0a2cbe2df3f49ae05c8b037f00
 MISC metadata.xml 1099 BLAKE2B 75b6db1d43b75f9b22ce5fb6ec640e2e06b2f2575ff75441318a2076b8486ed7d81a62714540c61ab3a35198113538546b9aa71d05ef4cd7106c8a7f09c13029 SHA512 6e4a7bba7102b4850a938ba0f6feec9cd12488d4b440b19982751c2a742b33a565933fae3967080c060e5b5eb51d90268abc87a2c0a2efb7f4c773020c29462a
diff --git a/net-wireless/bluez/bluez-5.66-r1.ebuild b/net-wireless/bluez/bluez-5.66-r1.ebuild
deleted file mode 100644
index 8cad64762e9a..000000000000
--- a/net-wireless/bluez/bluez-5.66-r1.ebuild
+++ /dev/null
@@ -1,306 +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 linux-info python-single-r1 systemd udev multilib-minimal #readme.gentoo-r1
-
-DESCRIPTION="Bluetooth Tools and System Daemons for Linux"
-HOMEPAGE="http://www.bluez.org"
-SRC_URI="https://www.kernel.org/pub/linux/bluetooth/${P}.tar.xz"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0/3"
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv x86"
-IUSE="btpclient cups doc debug deprecated extra-tools experimental +mesh midi +obex +readline selinux systemd test test-programs +udev"
-
-# Since this release all remaining extra-tools need readline support, but this could
-# change in the future, hence, this REQUIRED_USE constraint could be dropped
-# again in the future.
-# btpclient needs mesh, bug #790587
-REQUIRED_USE="
-	btpclient? ( mesh )
-	extra-tools? ( deprecated readline )
-	test? ( ${PYTHON_REQUIRED_USE} )
-	test-programs? ( ${PYTHON_REQUIRED_USE} )
-"
-
-TEST_DEPS="${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		>=dev-python/dbus-python-1[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-	')
-"
-BDEPEND="
-	dev-python/docutils
-	virtual/pkgconfig
-	test? ( ${TEST_DEPS} )
-"
-DEPEND="
-	>=dev-libs/glib-2.28:2[${MULTILIB_USEDEP}]
-	btpclient? ( >=dev-libs/ell-0.39 )
-	cups? ( net-print/cups:= )
-	mesh? (
-		>=dev-libs/ell-0.39
-		>=dev-libs/json-c-0.13:=
-		sys-libs/readline:0=
-	)
-	midi? ( media-libs/alsa-lib )
-	obex? ( dev-libs/libical:= )
-	readline? ( sys-libs/readline:0= )
-	systemd? ( sys-apps/systemd )
-	>=sys-apps/dbus-1.6:=
-	udev? ( >=virtual/udev-172 )
-"
-RDEPEND="${DEPEND}
-	deprecated? ( !net-wireless/bluez-hcidump )
-	selinux? ( sec-policy/selinux-bluetooth )
-	test-programs? ( ${TEST_DEPS} )
-"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	# Try both udevadm paths to cover udev/systemd vs. eudev locations (#539844)
-	# http://www.spinics.net/lists/linux-bluetooth/msg58739.html
-	# https://bugs.gentoo.org/539844
-	# https://github.com/bluez/bluez/issues/268
-	"${FILESDIR}"/${PN}-udevadm-path-r1.patch
-
-	# Fedora patches
-	# http://www.spinics.net/lists/linux-bluetooth/msg40136.html
-	"${FILESDIR}"/0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch
-
-	# https://lore.kernel.org/linux-bluetooth/20220901110719.176944-1-hadess@hadess.net/T/#m9c08d004cd5422783ee1d93154f42303bba9169f
-	"${FILESDIR}"/${PN}-5.66-power-state-adapter-property.patch
-
-	# Fixed in next release
-	"${FILESDIR}"/${P}-transient-hostname-fix.patch
-
-	# https://github.com/nilfs-dev/nilfs-utils/commit/115fe4b976858c487cf83065f513d8626089579a
-	# https://bugs.gentoo.org/888467
-	"${FILESDIR}"/${PN}-5.66-musl-max-input.patch
-)
-
-pkg_setup() {
-	# From http://www.linuxfromscratch.org/blfs/view/svn/general/bluez.html
-	# to prevent bugs like:
-	# https://bugzilla.kernel.org/show_bug.cgi?id=196621
-	CONFIG_CHECK="~NET ~BT ~BT_RFCOMM ~BT_RFCOMM_TTY ~BT_BNEP ~BT_BNEP_MC_FILTER
-		~BT_BNEP_PROTO_FILTER ~BT_HIDP ~CRYPTO_USER_API_HASH ~CRYPTO_USER_API_SKCIPHER
-		~UHID ~RFKILL"
-	# https://bugzilla.kernel.org/show_bug.cgi?id=196621
-	# https://bugzilla.kernel.org/show_bug.cgi?id=206815
-	if use mesh || use test; then
-		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_USER
-		~CRYPTO_USER_API ~CRYPTO_USER_API_AEAD ~CRYPTO_AES ~CRYPTO_CCM ~CRYPTO_AEAD ~CRYPTO_CMAC
-		~CRYPTO_MD5 ~CRYPTO_SHA1 ~KEY_DH_OPERATIONS"
-	fi
-	linux-info_pkg_setup
-
-	if use test || use test-programs; then
-		python-single-r1_pkg_setup
-	fi
-
-	if ! use udev; then
-		ewarn
-		ewarn "You are installing ${PN} with USE=-udev. This means various bluetooth"
-		ewarn "devices and adapters from Apple, Dell, Logitech etc. will not work,"
-		ewarn "and hid2hci will not be available."
-		ewarn
-	fi
-}
-
-src_prepare() {
-	default
-
-	# http://www.spinics.net/lists/linux-bluetooth/msg38490.html
-	if ! use systemd; then
-		eapply "${FILESDIR}"/0001-Allow-using-obexd-without-systemd-in-the-user-session-r2.patch
-	fi
-
-	eautoreconf
-
-	if use cups; then
-		# Only not .am to not need to run eautoreconf only because of this
-		sed -i \
-			-e "s:cupsdir = \$(libdir)/cups:cupsdir = $(cups-config --serverbin):" \
-			Makefile.{in,tools} || die
-	fi
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	local myconf=(
-		# readline is automagic when client is enabled
-		# --enable-client always needs readline, bug #504038
-		# --enable-mesh is handled in the same way
-		ac_cv_header_readline_readline_h=$(multilib_native_usex readline)
-		ac_cv_header_readline_readline_h=$(multilib_native_usex mesh)
-	)
-
-	if ! multilib_is_native_abi; then
-		myconf+=(
-			# deps not used for the library
-			{DBUS,GLIB}_{CFLAGS,LIBS}=' '
-		)
-	fi
-
-	econf \
-		--localstatedir=/var \
-		--disable-android \
-		--enable-datafiles \
-		--enable-optimization \
-		$(use_enable debug) \
-		--enable-pie \
-		--enable-threads \
-		--enable-library \
-		--enable-tools \
-		--enable-manpages \
-		--enable-monitor \
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
-		--with-systemduserunitdir="$(systemd_get_userunitdir)" \
-		$(multilib_native_use_enable btpclient) \
-		$(multilib_native_use_enable btpclient external-ell) \
-		$(multilib_native_use_enable cups) \
-		$(multilib_native_use_enable deprecated) \
-		$(multilib_native_use_enable experimental) \
-		$(multilib_native_use_enable mesh) \
-		$(multilib_native_use_enable mesh external-ell) \
-		$(multilib_native_use_enable midi) \
-		$(multilib_native_use_enable obex) \
-		$(multilib_native_use_enable readline client) \
-		$(multilib_native_use_enable systemd) \
-		$(multilib_native_use_enable test-programs test) \
-		$(multilib_native_use_enable udev) \
-		$(multilib_native_use_enable udev hid2hci) \
-		$(multilib_native_use_enable udev sixaxis)
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		default
-	else
-		emake -f Makefile -f - libs \
-			<<<'libs: $(lib_LTLIBRARIES)'
-	fi
-}
-
-multilib_src_test() {
-	multilib_is_native_abi && default
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		emake DESTDIR="${D}" install
-
-		# Only install extra-tools when relevant USE flag is enabled
-		if use extra-tools; then
-			ewarn "Upstream doesn't support using this tools and their bugs are"
-			ewarn "likely to be ignored forever, also they can break without"
-			ewarn "previous announcement."
-			ewarn "Upstream also states all this tools are not really needed,"
-			ewarn "then, if you still need to rely on them, you must ask them"
-			ewarn "to either install that tool by default or add the needed"
-			ewarn "functionality to the existing 'official' tools."
-			ewarn "Please report this issues to:"
-			ewarn "http://www.bluez.org/development/lists/"
-
-			# Upstream doesn't install this, bug #524640
-			# http://permalink.gmane.org/gmane.linux.bluez.kernel/53115
-			# http://comments.gmane.org/gmane.linux.bluez.kernel/54564
-			dobin tools/btmgmt
-			# gatttool is only built with readline, bug #530776
-			# https://bugzilla.redhat.com/show_bug.cgi?id=1141909
-			# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=720486
-			# https://bugs.archlinux.org/task/37686
-			dobin attrib/gatttool
-			# https://bugzilla.redhat.com/show_bug.cgi?id=1699680
-			dobin tools/avinfo
-		fi
-
-		# Not installed by default after being built, bug #666756
-		use btpclient && dobin tools/btpclient
-
-		# Unittests are not that useful once installed, so make them optional
-		if use test-programs; then
-			# Drop python2 only test tools
-			# https://bugzilla.kernel.org/show_bug.cgi?id=206819
-			rm "${ED}"/usr/$(get_libdir)/bluez/test/simple-player || die
-			# https://bugzilla.kernel.org/show_bug.cgi?id=206821
-			rm "${ED}"/usr/$(get_libdir)/bluez/test/test-hfp || die
-			# https://bugzilla.kernel.org/show_bug.cgi?id=206823
-			rm "${ED}"/usr/$(get_libdir)/bluez/test/test-sap-server	|| die
-
-			python_fix_shebang "${ED}"/usr/$(get_libdir)/bluez/test
-
-			for i in $(find "${ED}"/usr/$(get_libdir)/bluez/test -maxdepth 1 -type f ! -name "*.*"); do
-				dosym "${i}" /usr/bin/bluez-"${i##*/}"
-			done
-		fi
-	else
-		emake DESTDIR="${D}" \
-			install-pkgincludeHEADERS \
-			install-libLTLIBRARIES \
-			install-pkgconfigDATA
-	fi
-}
-
-multilib_src_install_all() {
-	# We need to ensure obexd can be spawned automatically by systemd
-	# when user-session is enabled:
-	# http://marc.info/?l=linux-bluetooth&m=148096094716386&w=2
-	# https://bugs.gentoo.org/show_bug.cgi?id=577842
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=804908
-	# https://bugs.archlinux.org/task/45816
-	# https://bugzilla.redhat.com/show_bug.cgi?id=1318441
-	# https://bugzilla.redhat.com/show_bug.cgi?id=1389347
-	if use systemd; then
-		dosym obex.service /usr/lib/systemd/user/dbus-org.bluez.obex.service
-	fi
-
-	find "${D}" -name '*.la' -type f -delete || die
-
-	keepdir /var/lib/bluetooth
-
-	# Upstream don't want people to play with them
-	# But we keep installing them due to 'historical' reasons
-	insinto /etc/bluetooth
-	local d
-	for d in input network; do
-		doins profiles/${d}/${d}.conf
-	done
-	# Setup auto enable as Fedora does for allowing to use
-	# keyboards/mouse as soon as possible
-	sed -i 's/#\[Policy\]$/\[Policy\]/; s/#AutoEnable=false/AutoEnable=true/' src/main.conf || die
-	doins src/main.conf
-
-	newinitd "${FILESDIR}"/bluetooth-init.d-r5 bluetooth
-	newconfd "${FILESDIR}"/bluetooth-conf.d bluetooth
-
-	einstalldocs
-	use doc && dodoc doc/*.txt
-	# Upstream dropped the example files
-	# Install .json files as examples to be used by meshctl
-	#if use mesh; then
-		#dodoc tools/mesh-gatt/*.json
-	#	local DOC_CONTENTS="Some example .json files were installed into
-	#	/usr/share/doc/${PF} to be used with meshctl. Feel free to
-	#	uncompress and copy them to ~/.config/meshctl to use them."
-	#	readme.gentoo_create_doc
-	#fi
-}
-
-pkg_postinst() {
-	use udev && udev_reload
-	systemd_reenable bluetooth.service
-
-	has_version net-dialup/ppp || elog "To use dial up networking you must install net-dialup/ppp"
-	#use mesh && readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	use udev && udev_reload
-}
diff --git a/net-wireless/bluez/bluez-5.68.ebuild b/net-wireless/bluez/bluez-5.68.ebuild
index ef9003114ac9..37f02d578577 100644
--- a/net-wireless/bluez/bluez-5.68.ebuild
+++ b/net-wireless/bluez/bluez-5.68.ebuild
@@ -78,6 +78,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-bap-ebusy-fix.patch
 	"${FILESDIR}"/${P}-monitor-decoding.patch
 	"${FILESDIR}"/${P}-heap-use-after-free.patch
+	"${FILESDIR}"/${P}-clang-midi.patch
 )
 
 pkg_setup() {
diff --git a/net-wireless/bluez/files/bluez-5.68-clang-midi.patch b/net-wireless/bluez/files/bluez-5.68-clang-midi.patch
new file mode 100644
index 000000000000..f62d9f395944
--- /dev/null
+++ b/net-wireless/bluez/files/bluez-5.68-clang-midi.patch
@@ -0,0 +1,83 @@
+From b9e93e01161cf5392f0cbea3400cfa2dae54643d Mon Sep 17 00:00:00 2001
+From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
+Date: Mon, 17 Jul 2023 12:36:15 -0700
+Subject: midi: Fix build errors
+
+This fixes the following build errors:
+
+unit/test-midi.c:541:82: error: function definition is not allowed here
+void compare_events_cb(const struct midi_write_parser *parser,
+					void *user_data) {
+							 ^
+unit/test-midi.c:587:17: error: use of undeclared identifier
+'compare_events_cb'; did you mean 'compare_events'?
+                                     compare_events_cb, &midi_data);
+                                     ^~~~~~~~~~~~~~~~~
+                                     compare_events
+
+profiles/midi/midi.c:61:75: error: function definition is not allowed
+here
+void foreach_cb(const struct midi_write_parser *parser, void *user_data) {
+                                                                         ^
+profiles/midi/midi.c:78:40: error: use of undeclared identifier 'foreach_cb'
+                midi_read_ev(&midi->midi_out, event, foreach_cb, midi);
+                                                     ^
+---
+ profiles/midi/midi.c | 27 ++++++++++++++-------------
+ 1 file changed, 14 insertions(+), 13 deletions(-)
+
+(limited to 'profiles/midi/midi.c')
+
+diff --git a/profiles/midi/midi.c b/profiles/midi/midi.c
+index 40064df3ae..bab309bca7 100644
+--- a/profiles/midi/midi.c
++++ b/profiles/midi/midi.c
+@@ -53,20 +53,21 @@ struct midi {
+ 	struct midi_write_parser midi_out;
+ };
+ 
++static void foreach_cb(const struct midi_write_parser *parser, void *user_data)
++{
++	struct midi *midi = user_data;
++
++	bt_gatt_client_write_without_response(midi->client,
++						midi->midi_io_handle, false,
++						midi_write_data(parser),
++						midi_write_data_size(parser));
++}
++
+ static bool midi_write_cb(struct io *io, void *user_data)
+ {
+ 	struct midi *midi = user_data;
+ 	int err;
+ 
+-	void foreach_cb(const struct midi_write_parser *parser, void *user_data) {
+-		struct midi *midi = user_data;
+-		bt_gatt_client_write_without_response(midi->client,
+-		                                      midi->midi_io_handle,
+-		                                      false,
+-		                                      midi_write_data(parser),
+-		                                      midi_write_data_size(parser));
+-	};
+-
+ 	do {
+ 		snd_seq_event_t *event = NULL;
+ 
+@@ -81,10 +82,10 @@ static bool midi_write_cb(struct io *io, void *user_data)
+ 
+ 	if (midi_write_has_data(&midi->midi_out))
+ 		bt_gatt_client_write_without_response(midi->client,
+-		                                      midi->midi_io_handle,
+-		                                      false,
+-		                                      midi_write_data(&midi->midi_out),
+-		                                      midi_write_data_size(&midi->midi_out));
++					midi->midi_io_handle,
++					false,
++					midi_write_data(&midi->midi_out),
++					midi_write_data_size(&midi->midi_out));
+ 
+ 	midi_write_reset(&midi->midi_out);
+ 
+-- 
+cgit 
+
diff --git a/net-wireless/hackrf-tools/Manifest b/net-wireless/hackrf-tools/Manifest
index a4d9c768dd0d..0d9d72a046bc 100644
--- a/net-wireless/hackrf-tools/Manifest
+++ b/net-wireless/hackrf-tools/Manifest
@@ -1,7 +1,5 @@
 AUX hackrf_easy_flash-r1 4265 BLAKE2B 19cf7bfc441acac27a9eb1cba149019196134decf44b01d915dc5e2f564b169f00933c8cf36b3ddbc5dac3612620095a7e7f37f2bc46c19b0d1d5a1ede2969fc SHA512 ee11fedf2a9991b09ffd7fe6189149bd6646711011d5eb40f3c7db090e79a5966d86f524378527fd3e6a14d87e3d94a493b88998dbc2276e26bf16bdb5a69210
-DIST hackrf-2022.09.1.tar.xz 21534956 BLAKE2B fd1b3469372fdb0558465c84f3645859791af9bd1302f63c63185ce7c47d24779ed0baf47eccbfc8ddb771e9737edb2a37a073fb749377d87f4e67c11eb6ef76 SHA512 c3b8b6f18cb80e3506c09dc71f2c01c127ad6d88ed028be3b659953cf7bb1e36b9dba83b4bb04c916bd7c2b66faeae1e602c53368e1e56454d6fe831961e01ee
 DIST hackrf-2023.01.1.tar.xz 23030956 BLAKE2B f0ea4f92208d1db5b4e1c11231e4420db757c08e28e7a80d79e70b02d868689ddf516bc6f003fc208f60c221c9153412a12fe3cbdf8f58001c1f7cdd26383ac0 SHA512 7c2ef9c5c050e258a0d1695240f9163955cb3ea9ab9163aad6bdbdebfdb82cde9925818ced3323342fe9c4ddb80dcedbc5a7986caaa4e0b7036e8e07bec0296e
-EBUILD hackrf-tools-2022.09.1.ebuild 1935 BLAKE2B 6ce668963a1f2ac159fa3c3dedb35c2ddbc438b9dbf943ca9e7f1cbc02f4ac3cda5ba4f18b8431386ff5df97d2fc1b17b80b7ac97a9a889e3346b67b262918c6 SHA512 79babd85537bb48498f1f370bc0b1bf064529f2b792a4c9e87aab0744e96b81f6c04d8641d87f2779cb5f6abada3a9c2c51e791bfb52225545a3f7fbf9c49b44
-EBUILD hackrf-tools-2023.01.1.ebuild 1935 BLAKE2B 260c0313183800ea21496912e8839439c115ebe883e5a7a5f3b4e84e7b11b5bcd96c1206153b260c55366ff6f079ef43f4cd283a4ba609c4681e0aec9bff349a SHA512 40cde1eece641c6b035ec26ce283888e9ddfcda47d0d24104a388133ab68258b3207e81b8560d3b184f73bebbad38e4c8946cf70c636bbf1387a2a6157bada31
+EBUILD hackrf-tools-2023.01.1.ebuild 1931 BLAKE2B ed3602e6298d3cb99cbeb9b36997e50597589c040099090973252fba5afede05dd5de5d7f1f670d2ace9718228d51bd501acba93d9fa971646e5507bd023cb67 SHA512 862d229aff21941c6bf2509351cbdbcbde60de4e24931af88e61790c333840749c28d9d89f8629348a8f853d57c72d56058c7dbea8b1369f685087597babbfef
 EBUILD hackrf-tools-9999.ebuild 1935 BLAKE2B 6ce668963a1f2ac159fa3c3dedb35c2ddbc438b9dbf943ca9e7f1cbc02f4ac3cda5ba4f18b8431386ff5df97d2fc1b17b80b7ac97a9a889e3346b67b262918c6 SHA512 79babd85537bb48498f1f370bc0b1bf064529f2b792a4c9e87aab0744e96b81f6c04d8641d87f2779cb5f6abada3a9c2c51e791bfb52225545a3f7fbf9c49b44
 MISC metadata.xml 478 BLAKE2B b9dc4d583a6d8d6f4f495b4c9cf911f127133087f00ebf696be9f603ce3be1e93f5f112dd57fa557602daf67709176ab082cf07f7945cc6abc396fb445da5bc0 SHA512 11196ffe3e3b7a746be9191dc28188b56fa5e1238c26bfb878ee891e3564f7360e7169c469797e199bc77a1b1c1d8ab951891e4830f266ff4d19d71c33b919b2
diff --git a/net-wireless/hackrf-tools/hackrf-tools-2022.09.1.ebuild b/net-wireless/hackrf-tools/hackrf-tools-2022.09.1.ebuild
deleted file mode 100644
index 0e79b121fd86..000000000000
--- a/net-wireless/hackrf-tools/hackrf-tools-2022.09.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="tools for communicating with HackRF SDR platform"
-HOMEPAGE="http://greatscottgadgets.com/hackrf/"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/greatscottgadgets/hackrf.git"
-	inherit git-r3
-	EGIT_CHECKOUT_DIR="${WORKDIR}/hackrf"
-	S="${WORKDIR}/hackrf/host/hackrf-tools"
-else
-	S="${WORKDIR}/hackrf-${PV}/host/hackrf-tools"
-	SRC_URI="https://github.com/greatscottgadgets/hackrf/releases/download/v${PV}/hackrf-${PV}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~ppc ~x86"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-DEPEND="~net-libs/libhackrf-${PV}:=
-		sci-libs/fftw:3.0="
-RDEPEND="${DEPEND}"
-
-src_install() {
-	cmake_src_install
-	newsbin "${FILESDIR}/hackrf_easy_flash-r1" hackrf_easy_flash
-	if [[ ${PV} != "9999" ]] ; then
-		insinto /usr/share/hackrf
-		newins "${WORKDIR}/hackrf-${PV}/firmware-bin/hackrf_jawbreaker_usb.bin" hackrf_jawbreaker_usb-${PV}.bin
-		newins "${WORKDIR}/hackrf-${PV}/firmware-bin/hackrf_jawbreaker_usb.dfu" hackrf_jawbreaker_usb-${PV}.dfu
-		newins "${WORKDIR}/hackrf-${PV}/firmware-bin/hackrf_one_usb.bin" hackrf_one_usb-${PV}.bin
-		newins "${WORKDIR}/hackrf-${PV}/firmware-bin/hackrf_one_usb.dfu" hackrf_one_usb-${PV}.dfu
-		newins "${WORKDIR}/hackrf-${PV}/firmware/cpld/sgpio_if/default.xsvf" hackrf_cpld_default-${PV}.xsvf
-		ln -s hackrf_one_usb-${PV}.bin "${ED}/usr/share/hackrf/hackrf_one_usb_rom_to_ram.bin"
-		ln -s hackrf_one_usb-${PV}.bin "${ED}/usr/share/hackrf/hackrf_one_usb.bin"
-		ln -s hackrf_one_usb-${PV}.dfu "${ED}/usr/share/hackrf/hackrf_one_usb_ram.dfu"
-		ln -s hackrf_one_usb-${PV}.dfu "${ED}/usr/share/hackrf/hackrf_one_usb.dfu"
-	else
-		ewarn "The compiled firmware files are only available in the versioned releases, you are on your own for this."
-		ewarn "A hackrf-firmware ebuild is available in the pentoo overlay, if you feel adventurous."
-	fi
-}
diff --git a/net-wireless/hackrf-tools/hackrf-tools-2023.01.1.ebuild b/net-wireless/hackrf-tools/hackrf-tools-2023.01.1.ebuild
index 6f16cb6a69ad..c5e13f482da1 100644
--- a/net-wireless/hackrf-tools/hackrf-tools-2023.01.1.ebuild
+++ b/net-wireless/hackrf-tools/hackrf-tools-2023.01.1.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	S="${WORKDIR}/hackrf-${PV}/host/hackrf-tools"
 	SRC_URI="https://github.com/greatscottgadgets/hackrf/releases/download/v${PV}/hackrf-${PV}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~ppc ~x86"
+	KEYWORDS="amd64 arm ppc x86"
 fi
 
 LICENSE="BSD"
diff --git a/net-wireless/iw/Manifest b/net-wireless/iw/Manifest
index 7dd5681a3971..a8064ebf3d0f 100644
--- a/net-wireless/iw/Manifest
+++ b/net-wireless/iw/Manifest
@@ -1,5 +1,5 @@
 DIST iw-5.19.tar.xz 152044 BLAKE2B 57c14b3be0b171b80abcbc71a45f392115f62cc0c3f8440185cb05b42f7a7c901653969a4d5200878b7ceb7aea356d9cf02e07a9fbb282b34372c23561f4fe0a SHA512 ff5c23543806c91eda27c91da923737c74cbccd6acc55f1f45114338f518cd959ca292c9255fd75b91dc127ed016eb235dd97af319e30631578eba6cb0823c6c
 DIST iw-5.9.tar.xz 145296 BLAKE2B d7abe6c65d408a7570227dbe69fe11e1d72a1f502de21d1fcb7dcff6bfe229804020d5c1ebdda42a3694e31cf87c631faf089746f8df4733b0b1a459c185e2af SHA512 08b0c8d92c7e695bb2a107b89c3cc406e8386393b65ecbf96ded6fd757043ccd12bedaa90c14138e03e53f107365d04e229633c1cfa024ecab5fe993578491be
-EBUILD iw-5.19.ebuild 883 BLAKE2B 3f9c85488274f81780ba5910d801d2c14dcf7835ffb0f1129c3891b707a5c46297551636040a3a744cd591ba1e9943345674179f7ea8df9e744bed20fa0fda38 SHA512 b359a4f0a78193c1574ce1f92396e08b47c3e9b2bcfc182df4e4b3e10d240219e0b7b87840c8dbf92c3defcf54b47569507ee82634e02c746cdf94b76f2eab37
+EBUILD iw-5.19.ebuild 879 BLAKE2B a495757ad76fb873be590d3ec30b66ff73b6adac0c58ba9bf470c3b89e9409773c720433555561b2842257e648a6e2103264b1040ad0a2718865b7b4203eb427 SHA512 e81f8a86c163525b289c450d886754e9becd6fb4c98f71d6bef9867e242bd0bef1cf123078248bf6cc998c61dde81ce0965964bcd5e6373407aaf3d1730dc980
 EBUILD iw-5.9.ebuild 862 BLAKE2B 22b2c65957b58261c1ae778d5b901bcd69eb96e58d2f381c6c538f5973c55f0383a530f2fb1a207e0fb72a6e99aa53c4e30fed547a61c42a32f40e69ab47800f SHA512 ca57a9d4623eb36b98bcfa82384b68ab811c1ae85c407b14ec2eadec8fc4e6833e4143e53d89a9469fc8a2b5ec0ebc991a22c905b2680920b6c1a8ec8aeb674b
 MISC metadata.xml 326 BLAKE2B b542a288462866aab338ad36546026aa12ce0c8b0e8abf2eff3cbff0bd591c6402379d68df77686b36524f1127ed0c061f57f223f4559f4456728009226a663c SHA512 32b6a69e2ad35466321ffa8ae5a9ffde83f99b64b91e65ffca3662fb7dc3c6c2d7d46acb0d8da40e46de3c1b9764abb836bdb0934d727837c4c7d5bacd501a0b
diff --git a/net-wireless/iw/iw-5.19.ebuild b/net-wireless/iw/iw-5.19.ebuild
index ed510f7f671a..9c76a8bc6fc3 100644
--- a/net-wireless/iw/iw-5.19.ebuild
+++ b/net-wireless/iw/iw-5.19.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://mirrors.edge.kernel.org/pub/software/network/${PN}/${P}.tar.xz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~arm64 ~loong ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="dev-libs/libnl:="
 DEPEND="${RDEPEND}"
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index f2204847f68f..fa760a5b1a4f 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask
index b500832a58bf..ee575e800bb9 100644
--- a/profiles/base/package.use.stable.mask
+++ b/profiles/base/package.use.stable.mask
@@ -115,6 +115,7 @@ x11-themes/arc-theme cinnamon
 # Pacho Ramos <pacho@gentoo.org> (2020-08-21)
 # app-text/pandoc is hard to stabilize #737612
 sys-apps/earlyoom docs
+sys-apps/earlyoom man
 
 # Sergei Trofimovich <slyfox@gentoo.org> (2020-04-13)
 # app-text/pandoc (dev-lang/ghc) has no stable keywords.
diff --git a/profiles/package.mask b/profiles/package.mask
index e3b97a70b5ef..538dc92d8f74 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -38,19 +38,6 @@
 # Removal sometime after 2023-09-23.
 sci-mathematics/polymake
 
-# William Hubbs <williamh@gentoo.org> (2023-08-23)
-# Upstream bug opened since this didn't compile.
-# My tests were done via "sudo ebuild" instead of emerge so my tests
-# passed, but emerge didn't work.
-# Bug #912781.
-=sys-cluster/kubeadm-1.28.0
-=sys-cluster/kube-apiserver-1.28.0
-=sys-cluster/kube-controller-manager-1.28.0
-=sys-cluster/kubectl-1.28.0
-=sys-cluster/kubelet-1.28.0
-=sys-cluster/kube-proxy-1.28.0
-=sys-cluster/kube-scheduler-1.28.0
-
 # Sam James <sam@gentoo.org> (2023-08-22)
 # Broken with new net-analyzer/net-snmp, no reverse dependencies in Gentoo,
 # no other distros package this, and upstream have discontinued development.
@@ -365,6 +352,7 @@ acct-group/spi
 >=dev-util/gdbus-codegen-2.77
 >=dev-util/glib-utils-2.77
 >=games-puzzle/gnome-sudoku-45_alpha
+>=gnome-base/gnome-control-center-45_alpha
 >=gnome-base/gnome-settings-daemon-45_alpha
 >=gnome-base/gnome-shell-45_alpha
 >=gnome-base/gsettings-desktop-schemas-45_alpha
@@ -378,6 +366,7 @@ acct-group/spi
 >=gnome-extra/gnome-system-monitor-45_alpha
 >=gnome-extra/gnome-weather-45_alpha
 >=gnome-extra/sushi-45_alpha
+gnome-extra/tecla
 >=gui-apps/gnome-console-45_alpha
 >=gui-libs/gtk-4.11
 >=gui-libs/libadwaita-1.4_alpha
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 3922d3de1743..fd977d55e2c7 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/libcifpp/Manifest b/sci-libs/libcifpp/Manifest
index 7adc95dee4c1..6f6f16b5f4d5 100644
--- a/sci-libs/libcifpp/Manifest
+++ b/sci-libs/libcifpp/Manifest
@@ -1,7 +1,7 @@
-DIST libcifpp-5.1.0.1-components.cif.xz 58001076 BLAKE2B 4d838e47c74540af54256f6124bd79c9c372c6768eeeabc620b54e1b2c49b2c2adc0b937f195f9544b9f2362fb60c209fb74f88c451ba6d50fe5da5f15ba768b SHA512 e7933a78a61e40c4b2e2aedfda0f36c79939fadc71c78cfde59fcec4de5c2b6c9cf1dbccc383a2f0bbf48744c776cdbb5e7c862e47a6fd2ec229c811caa9b5bc
-DIST libcifpp-5.1.0.1.tar.gz 2242975 BLAKE2B 7cada39ed6096ee12e662422d1676dadbf0ae71958c206ef4105daeeaaa9b14cbf17143c3baf4e2914e8289801667829af1361d643846827044d7c8e1eb15fa2 SHA512 9ca3d7db5889d1baf713475fbfeaf355f45ecb139c838da6348d4bb054c2241204499d3f46e4d45075f2d60f6c48e29866ccf2994c26098b303573d7ba39204d
 DIST libcifpp-5.1.1-components.cif.xz 58896016 BLAKE2B 2bf61944fe6b11325df3c6c32eaabeb27b0f117eed362dd2eba51f623f4054d142ee84aeb04908322b7aebd30a1bd17da969eeda953f7423cca922006fe767d2 SHA512 d4103ac0b0ae5698dd4c17e452ea35871c4854827d3a2ee93f00b73b6f57b87ee2278b44ec0501f818dfc34284b4c19d4617ba3a98df9552da5ebedaa59c9622
 DIST libcifpp-5.1.1.tar.gz 2244833 BLAKE2B 3a5feada63ee123dbed1ba776d0248569f46bbc2d39748db7d3cdfdfb66c89e08c54cdf5133182978e9ef4808c19adfc794ee895a95e882f0d5ff3d173e57311 SHA512 3e988d0e4f24174fb47274b0feaae5a8a793441efb9c8273b328f412fbd29ee082cd91e19f19008069ebfd3507c83f7945dc33fc015784727603f987091eaa5c
-EBUILD libcifpp-5.1.0.1.ebuild 890 BLAKE2B 62a828f715d25d5368f94ad7e226d19caf45b0c37d311e5f6dcd13a3ec5224f296b69dc074891462063ceb92ee1153a7a1552731bef2800c914b201f76bca916 SHA512 0714de6553e370fb4ddb3d50c4e8fdfb227b671a581ef6d1a21257aee932ba816b3f41600c398cef4cd8ffbf99c7ab7824e79af66ab0f8ce877d585614444aad
+DIST libcifpp-5.1.2-components.cif.xz 59092332 BLAKE2B 3672ca8e9553be80822ca7d7398fd3b73b14b1bf375e63f3a7aef33c2ee92d837c9ca08b3a756d838c512ac5918a0537d70e9a422331fafaf0ff77ecf2134515 SHA512 b2d3507d339d8467b10d0a638a5b86e75ed73fb64fee854aefeb2f0ce999e6a99755af30483749ce75e8a4ce63536111bd2a7a5f698dfc86d1a2be3d243304ce
+DIST libcifpp-5.1.2.tar.gz 2244795 BLAKE2B 7bec9f901c112fabf86c9ce691229f42dcf854be4c99bdf09dbe7dd0d0a3a7e92831cb2b72afa4debc1ce8b1a3a33e27cceda048adca6805802189e0ad50349c SHA512 3adb801ed52b250f6779228288a2c2926c1c7d8d0eff0bb6ed610b4258de8537253d2ce95208e8682b2eb8d0c09ecb53b6269c24bdce907360d9478c6c8c3c1b
 EBUILD libcifpp-5.1.1.ebuild 890 BLAKE2B 62a828f715d25d5368f94ad7e226d19caf45b0c37d311e5f6dcd13a3ec5224f296b69dc074891462063ceb92ee1153a7a1552731bef2800c914b201f76bca916 SHA512 0714de6553e370fb4ddb3d50c4e8fdfb227b671a581ef6d1a21257aee932ba816b3f41600c398cef4cd8ffbf99c7ab7824e79af66ab0f8ce877d585614444aad
+EBUILD libcifpp-5.1.2.ebuild 891 BLAKE2B fe97d75afc5635f9a791f4b814b9386ea075a9fea5c92058701f77cbf2da16c067fcf1bbd1ea505acc51985996fda3eef0608eebd51bdd6b2b4d8561853766b2 SHA512 8f934477871ea87cdee1e102a09d7e36786401da58f1b9453ba113701ad1a2cad51bed6f88f87b09b753358a475f52c82a3f24f1a9c2679405d7ab55a9f21f82
 MISC metadata.xml 299 BLAKE2B 88091a7fbc350db0c22800bcd0de80ec406f7b8a0187b29d8660978384179f8194f7aa794bf0bd3b3f4ab68ac662ca62479319e218d2622e2a3e470653848251 SHA512 e6bc610ae1cf40584ba3067ece0c0c85d08ad0bbb99f5ecd8281c41b04ff932db838926a6ff238794ff46eb8035eb57c750e088bd3f164180952a9e597544e14
diff --git a/sci-libs/libcifpp/libcifpp-5.1.0.1.ebuild b/sci-libs/libcifpp/libcifpp-5.1.2.ebuild
index 8d30793f975e..47d08fc49c68 100644
--- a/sci-libs/libcifpp/libcifpp-5.1.0.1.ebuild
+++ b/sci-libs/libcifpp/libcifpp-5.1.2.ebuild
@@ -7,7 +7,7 @@ inherit cmake
 DESCRIPTION="Code to work with mmCIF and PDB files"
 HOMEPAGE="https://github.com/PDB-REDO/libcifpp"
 # Update components file on every bump
-# ftp://ftp.wwpdb.org/pub/pdb/data/monomers/components.cif.gz
+# http://ftp.wwpdb.org/pub/pdb/data/monomers/components.cif.gz
 SRC_URI="
 	https://github.com/PDB-REDO/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
 	https://dev.gentoo.org/~pacho/${PN}/${P}-components.cif.xz
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index f7c3bc60cd70..a6479e3b7071 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/earlyoom/Manifest b/sys-apps/earlyoom/Manifest
index 59355f6403a6..02b69427cd87 100644
--- a/sys-apps/earlyoom/Manifest
+++ b/sys-apps/earlyoom/Manifest
@@ -1,12 +1,10 @@
 AUX earlyoom 122 BLAKE2B 1e3e121135740b4f56f6929d1389cce42374db03713e7c5c6281a422f0f6ba02db3f04f8d9a72f19c8853795b4debcdf2ccffcdd4f095f425b620e931d51a8c4 SHA512 7dfd1c8aff690d2ed7137b250deac4135c48ca5fd04390468b3ea1569df81316f009e5c70175734c9f8dd21e46a13015905d3daaffe76d67eef936cda670e305
 AUX earlyoom-1.3-test-fixed.patch 1425 BLAKE2B 47231739b8bbb5a4a290266b85900dc18e8ef72d3dba8c20c8d617b06cc30c95d4c913e07e0e9a9e6fc6f095591538b8b37d7c72e7ac90f9b49f6a4706051280 SHA512 e906c6c4f7d835fb43f09d3c701a1d78b8c2d1e9642d1b7512a2e90094fe41b8f9a811da94af38f5442a976351d6cfd35557ef40a685466ea6ba80dcef5293a1
 AUX earlyoom-r1 138 BLAKE2B a95a6db627133ed3d9e4fa02505a1fb8abfc17c345a16df9956d7842c5cb9b7cefd1c68b82d7cc42ad101dcf65c06ac526e0e1241989d4aed0fc87b62d8e7bc9 SHA512 f7223b7ad2780ae121ef91d19b177d6fda50eb8d4f3995ac47b34f843448917a5a5290b8e657a9d7ed7fb8a958b362172d8a6453c5d5e43ff8c78cc25456d6f8
-DIST earlyoom-1.3.tar.gz 31399 BLAKE2B 3867540afb23493fbb532bcb72a5cfacca4ed297a053ff5e2c7e394bfa3640887e3e7c6430789bc1eda4b7a68680d8a74ab56b641fe9e5d4caa4406e2edb0667 SHA512 c5de742289e82c2098bd88c61dcb3e20eb022905a015b4894c95a4de3978ce18d794a9e7c17c97851ca9f8888728908f7bf978c014b3b69799bffa8b546d258a
 DIST earlyoom-1.6.2.tar.gz 49006 BLAKE2B 85a02d4171ba1bb94d5ddf573b8f5ac58d28a0cf9766f4fb2c96be5b45eee7aab853008c36f9e3aac76685b70008051faa2fe339797ecf9137469f089935a6b3 SHA512 d622a5347591d2017f6e62255940482af431e647acf1b35ab035e0dbfd44da7fc52633e6dd6433e42a1348fd294d766550ba092260f3ec59bd51e545f08e466b
 DIST earlyoom-1.7-deps.tar.xz 1974036 BLAKE2B ff378ae64b6b293e3b9d9fa05607209a515edadd18edcb70e204de1e0808b06dfaca7e6dcddeffbda9dae8abbadf7ac6074df725997b96be8a8d8cc35ac4d8c8 SHA512 67072000f8695935f77494faca84c74c67de4b9a4b3b889b310ad674f28c7ed85a0d59e91f4d5caa06cc1d7c1e7ef31aa3a373851361b905dc29e6d4d04eeeb9
 DIST earlyoom-1.7.tar.gz 52210 BLAKE2B c8338434160e4ccaa5ee64299487ca47a3d94e894362c320cf8210caf895a34c7abb584654afcdcb6fc1e058d53c1fa7eb740477acb104ed295700faccbcbdc1 SHA512 5732632c38d9b511aaa81845b3d8f8afe737aa6498dca7e31accaf18bfcf271ba436946aa06a514a34c953f99343f9b197d8a2b8751e16d336aeb084944f3602
-EBUILD earlyoom-1.3.ebuild 1034 BLAKE2B 15f8900849da3b45875bc7433fe3c2d3e10e952ea9eb3a3708015dd9726fd2b15bb31b6740a434180f971dd9f4affd72165a1f6a9a98ebeca4761ca0acc13818 SHA512 7a609318f326ffe0cab35904c0356dc2ccc3b7d5e0896aa47eb00a357fc6940e9f0531a5e9f8cbafa1d0224e5c325ebda3d1f9125722e9e6a466a656c80e96b6
 EBUILD earlyoom-1.6.2.ebuild 1053 BLAKE2B bc87237f4fcc919006f6f8107b45c6686ff14544c348fb5d78e7336515577065abca80414dc8a4256e7596f65f9555c216235a5ec49213ad83d6457c52e2d142 SHA512 730046e388e955610ab1f4e30fd604607c515d08dce649be63bb604ecfce294ed50904c701952a9a8bfe78f67ce8177a3e197407c2670b4cb9c0e67c6072da2d
-EBUILD earlyoom-1.7.ebuild 1245 BLAKE2B 35b096159f6a944c20e6f586716f772d81660f575223dc51f4af6c28ccf90c5aefd02877251c3e1ca39120794a5d227d3dc08a63b7bd6980e16f512ac7029ab9 SHA512 f30be55754ae2f70334edd82291abaf4d412a32306e7257a3c47149f3a64e70e9236e465edfe3ad71bd7b6f071d5f601122609f9b5e51991db08538257f6d315
+EBUILD earlyoom-1.7-r1.ebuild 1266 BLAKE2B 6a71ea4fc0682017e2c906acf84f7d35fdd71369c806246e7067aab7338193b75767bd3dca6976a7e540fff5c0cea0fe16bfb1d674e93358a8fe26b6a0dcbb9e SHA512 edcf6b7fe1116ecc7ec053d19bdc3e7d4d9cc52712a01becb2ab2debd0d5352b54d04279fda489bc49dc2454a287b274054d907e25114b6efc42a26d29cacbff
 EBUILD earlyoom-9999.ebuild 1245 BLAKE2B 35b096159f6a944c20e6f586716f772d81660f575223dc51f4af6c28ccf90c5aefd02877251c3e1ca39120794a5d227d3dc08a63b7bd6980e16f512ac7029ab9 SHA512 f30be55754ae2f70334edd82291abaf4d412a32306e7257a3c47149f3a64e70e9236e465edfe3ad71bd7b6f071d5f601122609f9b5e51991db08538257f6d315
 MISC metadata.xml 389 BLAKE2B 2a9867dcee589d823ca6800813b22abdfae0122f49a307147be75c7890d05f859b29b0dfcda33837a7e7ab04c6b0d5d2ff9b4c0afe8c8a575c10fba26a866f11 SHA512 0eaf58d4de7afb7892646c0b0567cb25527e6608393046e037b5e3609decda79c4729d4687dec381df054c2a724bef261235adeeaa7c9159f16dc3a0098f3aa0
diff --git a/sys-apps/earlyoom/earlyoom-1.3.ebuild b/sys-apps/earlyoom/earlyoom-1.3.ebuild
deleted file mode 100644
index f8d435b12a4b..000000000000
--- a/sys-apps/earlyoom/earlyoom-1.3.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd
-
-DESCRIPTION="Early OOM Daemon for Linux"
-HOMEPAGE="https://github.com/rfjakob/earlyoom"
-
-LICENSE="MIT-with-advertising"
-SLOT="0"
-if [ "${PV}" = "9999" ]; then
-	EGIT_REPO_URI="https://github.com/rfjakob/earlyoom.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/rfjakob/earlyoom/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86"
-fi
-IUSE="docs systemd test"
-
-RDEPEND=""
-DEPEND=""
-BDEPEND="
-	docs? ( virtual/pandoc )
-	test? ( dev-lang/go )
-"
-
-RESTRICT="!test? ( test )"
-
-src_prepare() {
-	eapply "${FILESDIR}/${P}-test-fixed.patch"
-	default
-}
-
-src_compile() {
-	VERSION="v${PV}" emake earlyoom
-	use docs && VERSION="v${PV}" emake earlyoom.1
-	use systemd && emake PREFIX=/usr earlyoom.service
-}
-
-src_install() {
-	dobin earlyoom
-	use docs && doman earlyoom.1
-
-	insinto /etc/default
-	newins earlyoom.default earlyoom
-
-	doinitd "${FILESDIR}/${PN}"
-	use systemd && systemd_dounit earlyoom.service
-}
diff --git a/sys-apps/earlyoom/earlyoom-1.7.ebuild b/sys-apps/earlyoom/earlyoom-1.7-r1.ebuild
index 42e4a6373240..d3cab7d87fe4 100644
--- a/sys-apps/earlyoom/earlyoom-1.7.ebuild
+++ b/sys-apps/earlyoom/earlyoom-1.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2022 Gentoo Authors
+# Copyright 2020-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,7 +16,7 @@ else
 	SRC_URI="https://github.com/rfjakob/earlyoom/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	SRC_URI+=" test? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz )"
 
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="MIT-with-advertising"
@@ -26,7 +26,10 @@ RESTRICT="!test? ( test )"
 
 BDEPEND="
 	man? ( virtual/pandoc )
-	test? ( dev-lang/go )
+	test? (
+		dev-lang/go
+		dev-util/cppcheck
+	)
 "
 
 src_unpack() {
diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index 36684556b609..1e422e1f9d9a 100644
--- a/sys-auth/Manifest.gz
+++ b/sys-auth/Manifest.gz
diff --git a/sys-auth/seatd/Manifest b/sys-auth/seatd/Manifest
index d5bb12ea31e1..37973d96686d 100644
--- a/sys-auth/seatd/Manifest
+++ b/sys-auth/seatd/Manifest
@@ -3,6 +3,6 @@ AUX seatd.initd-r1 86 BLAKE2B b4915c90dd7d36578b00befbf4db9798c3f307dbfde2644975
 DIST seatd-0.7.0.tar.gz 39198 BLAKE2B eddae25b353a5ff4da8aa8b41ead6e6ebab6ffa321376887769cbaf22c3c1b8448d84758749714b82d6ca2d602f2140042634bbeb9312449d8ac207b3774851e SHA512 c81c43994b92672a388bf255edb1fe24d3dba7ece2eb35f9fedc05cc0b8e464e9167ffed037645c4072430fe7b3b8fc80cc99f21fb5100654b5dd23a94742e66
 DIST seatd-0.8.0.tar.gz 39349 BLAKE2B 920270808f28c85badb173af22edb03960f2b9cdce5af3124c64fe68c52a77f002272d2f19e97d107303c55ad6de498d279f6b05311793270c6ee84565fc435e SHA512 93b1e5c170564ce9654e4df9985af95cb505274b36e950998bb1f16803d2d46712140eded2bdd8d5e85aec62070afd9c224184276d79a0ff0813408dfc472db7
 EBUILD seatd-0.7.0-r2.ebuild 1555 BLAKE2B 4337a0102f3f2fac1a092e5a538642fc8d95cfcb42436cc777f936a57aefe925de0711bbdcb642d9923b623958931268e670e4479e75c426c5a73427f6fb8496 SHA512 65d0dba0b00503294178e294c59041d107dce6e6688223736ec35e81ce121aeccb151d36e439b1db914ea1738b6fe0489b424c3596cdd7abe4a806f5e11052c4
-EBUILD seatd-0.8.0.ebuild 1562 BLAKE2B 25e863be937539483c1581a885398c904210181187e36288927552df7e668dffbce8f920cee76fda75546a65b92be912502664fcac68566afb66b77c3e4294ea SHA512 13e9d3b5f6f4ff050fbe9ccc57596419e7621ed4296abee2d509afe08c8b5a83e464bf27b231d0f90fe56f2c5e2987691f83d28453a5c8ef5d9a3050a56f8b16
+EBUILD seatd-0.8.0.ebuild 1558 BLAKE2B 66899158051c478c6151c6c5e90702c1fc8d07877e308798da0ad537bb73ad03d4721dfc7c1f9567482332d7d90d6c26f6a79cb73333c6b19140b9c0241e57a9 SHA512 a16536542f43571cc9769284e387a6f376513024bf3b2ffb5f022fe65065cffe086939d385ebb0bb43c8c0e5ec18edbd3ea325d93cc28c0d5f50349eb383d280
 EBUILD seatd-9999.ebuild 1562 BLAKE2B 25e863be937539483c1581a885398c904210181187e36288927552df7e668dffbce8f920cee76fda75546a65b92be912502664fcac68566afb66b77c3e4294ea SHA512 13e9d3b5f6f4ff050fbe9ccc57596419e7621ed4296abee2d509afe08c8b5a83e464bf27b231d0f90fe56f2c5e2987691f83d28453a5c8ef5d9a3050a56f8b16
 MISC metadata.xml 774 BLAKE2B dd9f9ba6f8e99ee9b00b0053458e4c65cec817e554d6065f961212ef9ee3d611d69149fdab5d2219394676ccec4314acec86c786580bdd39e82d2dcd2ee3e43c SHA512 e5b65707a77793fa9068043cce805d7cf493b223fa4a12187098306a78c9fe201c1a607c72029aa7d732ba1179fa87017871182b1cb91e4b8f8d8574264662fc
diff --git a/sys-auth/seatd/seatd-0.8.0.ebuild b/sys-auth/seatd/seatd-0.8.0.ebuild
index a9bfcfa000ff..e423f0273ad1 100644
--- a/sys-auth/seatd/seatd-0.8.0.ebuild
+++ b/sys-auth/seatd/seatd-0.8.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://git.sr.ht/~kennylevinsen/seatd"
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
 	SRC_URI="https://git.sr.ht/~kennylevinsen/seatd/archive/${PV}.tar.gz -> ${P}.tar.gz"
 fi
 LICENSE="MIT"
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index c90b71cd0d8d..badbb7a9d0ac 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/kube-apiserver/Manifest b/sys-cluster/kube-apiserver/Manifest
index 2becbc29720d..447c77d4a09a 100644
--- a/sys-cluster/kube-apiserver/Manifest
+++ b/sys-cluster/kube-apiserver/Manifest
@@ -1,3 +1,4 @@
+AUX kube-apiserver-1.28.0-make-gomaxprocs-install-optional.patch 2835 BLAKE2B 964759a3af2afced4d5ff2ed59b1e94c2912a85ce560f3dac4e0ea59b1e308ee7b35f6d5435524e6e407d2032a1bd8783fb0b4787dbb22cfa9ace9ff723b1c40 SHA512 88b369bfda14eb03f9957f4b9105a565fa6f821e20b4743941f12f7e5b005cdef4184e0c09d54102b811e08a27f1725b0dc36e29e331f8802b7eaf52db1ce00f
 AUX kube-apiserver.confd 116 BLAKE2B 2cf2dff516674ba4dc0763985a070b75e23f9af51e7334eedcb2593855e7481d5969ed458d322ac29de0e9a9c7f9f041911ee7aeca750ff77ce04fd60bf3a3d3 SHA512 302b2a7ec715967c0aa7d1c177d4e55b26e37ebba8d04dd37ecf627d20042fe91cd7e6192ff9d71422129b0ea54a9eec6046f505af550548bd450998924f37ee
 AUX kube-apiserver.initd 541 BLAKE2B ddddc86735a9f90a0c232f2631ac21c028045783c737d041a808fb5012522844614a40059524c472b9b50fd077253b75e2bcf33d69518d71428fcb7e27143fba SHA512 2863ad6d1d238b5e9557874cd3f5413108ed9424604cf026e2fd8c2fd66ba867ca9a3d98f67fdac54f335bacddf0479547b28f71aaa1db6580beff49290de110
 AUX kube-apiserver.logrotated 88 BLAKE2B e58f3f108f5f7dbbadacfcc1b401567ce79d511a4623f85f01830c5e40d4ad4e44fe0b3f90d4143042d82bd83b0a2b11517e89037755ef2ad7afeeb23401bb60 SHA512 1a4bcd54dafaedc614e34bbadc2a1163f003b5925d47552fb2c47049c033c147e612171e263d9659d189fc2d95688a0b7153322d8dba97c083c079fdef6c400e
@@ -18,5 +19,5 @@ EBUILD kube-apiserver-1.26.6.ebuild 991 BLAKE2B 27a5563d75bb7c818335c8d019b63c23
 EBUILD kube-apiserver-1.26.7.ebuild 991 BLAKE2B 27a5563d75bb7c818335c8d019b63c2371a7c72d679bb237d79cc699ffd7e5f4f5f11a4197cdd086c4162d2af3fcb5c252a4effcd2fdc7ddf95fc0c1c2784946 SHA512 4dcce5a68b1f97d9f13191677fb21324317f38d5b4b2f15d4514b83ea96e097d5bbe86260c1f8ad462373d234cbe361ef9e2b3b615ee4cb86d984b83b5acddd8
 EBUILD kube-apiserver-1.27.3.ebuild 991 BLAKE2B a8f7a56d24d5d28dd947049982b22b2b409bd04a4257dff823833b63d48a842cdcc1a1dd48cab9aae8cc5cd91b2e760937898d75685e88c0ff3de5e87c755708 SHA512 03d62b412a1400c9a10c694a08a6e1dd8bcf431e4c1204e06bf10861d844a195a7e1dac51c61d34621129277bf898f83e5aeaced8798e06bcf3c80c339b235e5
 EBUILD kube-apiserver-1.27.4.ebuild 991 BLAKE2B a8f7a56d24d5d28dd947049982b22b2b409bd04a4257dff823833b63d48a842cdcc1a1dd48cab9aae8cc5cd91b2e760937898d75685e88c0ff3de5e87c755708 SHA512 03d62b412a1400c9a10c694a08a6e1dd8bcf431e4c1204e06bf10861d844a195a7e1dac51c61d34621129277bf898f83e5aeaced8798e06bcf3c80c339b235e5
-EBUILD kube-apiserver-1.28.0.ebuild 992 BLAKE2B 2220811e7ac652e6fe35de874d2b22d2c1bbed04d79b44625f044d07f081f2c11c34d6bc213b225f1face82fe5ac30b9c5e273ff718cbfb164c88cdca8fa03d5 SHA512 9c8fce637e8dae24fc85ecf79a2d8a21196d45e5dd70cabedfd34dc49be4ab369ff59e93f0c73db13347dc5ef8b6521903cc47a8c1cca46809ea9a10b0c52f01
+EBUILD kube-apiserver-1.28.0.ebuild 1085 BLAKE2B 143ea51902685ea5f88d50d7c828ff64f9021d647e6711fd42ea8d3e266951e3753f147a9b88793084472defe0a8e8de0d9f3d0291b61b6cf4a0d5ba2a7a2cbd SHA512 b65b1197372d4e77396d94070e68d5a7ef4114277c2a9202520b087b95bba769c89b5ad7cb41d4c1e1e3d53c51a2a1ac0c95d30c811ab0dbcd4418a90e95367b
 MISC metadata.xml 335 BLAKE2B d43f79bc4ff9bad895fc1c0617329cbc07e05d0e7eb8d251688c1f46c61e3360639e43d92f72e9eef0ba5b235f33f2b3ad1bf0f783854b5f9426af43d81c3502 SHA512 de4bf01133d4a117ea2bd21936d670598a30b89dca290a867c3ec4e8ed739aec4867c42504210291ed84add21e1aa100d7d2b565e4351c43bdf2fa906b72a4cb
diff --git a/sys-cluster/kube-apiserver/files/kube-apiserver-1.28.0-make-gomaxprocs-install-optional.patch b/sys-cluster/kube-apiserver/files/kube-apiserver-1.28.0-make-gomaxprocs-install-optional.patch
new file mode 100644
index 000000000000..1a8935b31c9c
--- /dev/null
+++ b/sys-cluster/kube-apiserver/files/kube-apiserver-1.28.0-make-gomaxprocs-install-optional.patch
@@ -0,0 +1,78 @@
+From cce3f6ffa796ea416021b0d62567a3f52b979567 Mon Sep 17 00:00:00 2001
+From: Jordan Liggitt <liggitt@google.com>
+Date: Wed, 16 Aug 2023 09:33:02 -0400
+Subject: [PATCH 2/2] Make gomaxprocs install optional, limit to tests
+
+---
+ hack/lib/golang.sh               | 25 +++++++++++++++----------
+ hack/make-rules/test-e2e-node.sh |  1 +
+ hack/make-rules/test.sh          |  1 +
+ 3 files changed, 17 insertions(+), 10 deletions(-)
+
+diff --git a/hack/lib/golang.sh b/hack/lib/golang.sh
+index 66772f08a81..983ff368e25 100755
+--- a/hack/lib/golang.sh
++++ b/hack/lib/golang.sh
+@@ -556,20 +556,25 @@ kube::golang::setup_env() {
+ 
+   # This seems to matter to some tools
+   export GO15VENDOREXPERIMENT=1
++}
+ 
++kube::golang::setup_gomaxprocs() {
+   # GOMAXPROCS by default does not reflect the number of cpu(s) available
+   # when running in a container, please see https://github.com/golang/go/issues/33803
+-  if ! command -v ncpu >/dev/null 2>&1; then
+-    # shellcheck disable=SC2164
+-    pushd "${KUBE_ROOT}/hack/tools" >/dev/null
+-    GO111MODULE=on go install ./ncpu
+-    # shellcheck disable=SC2164
+-    popd >/dev/null
++  if [[ -z "${GOMAXPROCS:-}" ]]; then
++    if ! command -v ncpu >/dev/null 2>&1; then
++      # shellcheck disable=SC2164
++      pushd "${KUBE_ROOT}/hack/tools" >/dev/null
++      GO111MODULE=on go install ./ncpu || echo "Will not automatically set GOMAXPROCS"
++      # shellcheck disable=SC2164
++      popd >/dev/null
++    fi
++    if command -v ncpu >/dev/null 2>&1; then
++      GOMAXPROCS=$(ncpu)
++      export GOMAXPROCS
++      kube::log::status "Set GOMAXPROCS automatically to ${GOMAXPROCS}"
++    fi
+   fi
+-
+-  GOMAXPROCS=${GOMAXPROCS:-$(ncpu)}
+-  export GOMAXPROCS
+-  kube::log::status "Setting GOMAXPROCS: ${GOMAXPROCS}"
+ }
+ 
+ # This will take binaries from $GOPATH/bin and copy them to the appropriate
+diff --git a/hack/make-rules/test-e2e-node.sh b/hack/make-rules/test-e2e-node.sh
+index 43dde0c740f..49e3e04ac71 100755
+--- a/hack/make-rules/test-e2e-node.sh
++++ b/hack/make-rules/test-e2e-node.sh
+@@ -18,6 +18,7 @@ KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/../..
+ source "${KUBE_ROOT}/hack/lib/init.sh"
+ 
+ kube::golang::setup_env
++kube::golang::setup_gomaxprocs
+ 
+ # start the cache mutation detector by default so that cache mutators will be found
+ KUBE_CACHE_MUTATION_DETECTOR="${KUBE_CACHE_MUTATION_DETECTOR:-true}"
+diff --git a/hack/make-rules/test.sh b/hack/make-rules/test.sh
+index e9074678a8f..4aa72730d83 100755
+--- a/hack/make-rules/test.sh
++++ b/hack/make-rules/test.sh
+@@ -22,6 +22,7 @@ KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/../..
+ source "${KUBE_ROOT}/hack/lib/init.sh"
+ 
+ kube::golang::setup_env
++kube::golang::setup_gomaxprocs
+ 
+ # start the cache mutation detector by default so that cache mutators will be found
+ KUBE_CACHE_MUTATION_DETECTOR="${KUBE_CACHE_MUTATION_DETECTOR:-true}"
+-- 
+2.41.0
+
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.28.0.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.28.0.ebuild
index 4385ac330a7d..4e599b798a47 100644
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.28.0.ebuild
+++ b/sys-cluster/kube-apiserver/kube-apiserver-1.28.0.ebuild
@@ -23,8 +23,12 @@ BDEPEND=">=dev-lang/go-1.20"
 RESTRICT+=" test"
 S="${WORKDIR}/kubernetes-${PV}"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-make-gomaxprocs-install-optional.patch
+	)
+
 src_compile() {
-	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+	CGO_LDFLAGS="$(usex hardened '-fNO-PIC ' '')" FORCE_HOST_GO="yes" \
 		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
 }
 
diff --git a/sys-cluster/kube-controller-manager/Manifest b/sys-cluster/kube-controller-manager/Manifest
index ec9a52773280..6eb4886d747f 100644
--- a/sys-cluster/kube-controller-manager/Manifest
+++ b/sys-cluster/kube-controller-manager/Manifest
@@ -1,3 +1,4 @@
+AUX kube-controller-manager-1.28.0-make-gomaxprocs-install-optional.patch 2835 BLAKE2B 964759a3af2afced4d5ff2ed59b1e94c2912a85ce560f3dac4e0ea59b1e308ee7b35f6d5435524e6e407d2032a1bd8783fb0b4787dbb22cfa9ace9ff723b1c40 SHA512 88b369bfda14eb03f9957f4b9105a565fa6f821e20b4743941f12f7e5b005cdef4184e0c09d54102b811e08a27f1725b0dc36e29e331f8802b7eaf52db1ce00f
 AUX kube-controller-manager.confd 142 BLAKE2B d8d35c62bf5c04cc3f440e8b5fb8acab2cf815b25ac4e91354e3fce756a1955e71ec762fab1091074ef4233fff22667aba50417c0d6a896055f8f52b6630bb4e SHA512 b0227a7431018a6742b3931fda0f14b4a040107ecd6821c84593180919ba8a5af9b99b7a507645a5488792f14accd686acc4cc6f70a5084bbdfcdd494021aafc
 AUX kube-controller-manager.initd 566 BLAKE2B c632b9bc357aead53a2c181af50201b544f214921672e60fffa2d6f77dbeb1912b3d1d138f867d8118cef5ae0843b75d3859ebfc71a4defc2b4cf66426a58101 SHA512 7e3baab9b034e7048ed3cda8d09444c76369874cecc0a747fb5484c482fef464adb5ccc25fcb4481fb4aff68415a60462f6cbee2138810316f0cf822637676c1
 AUX kube-controller-manager.logrotated 97 BLAKE2B 00827bf3c3c68c978dc30839318dcdd9ca73e64a38d377168cca75de4764dbd303cdae35fe2c5f6ddded23c7c72976d274e1def66f48a81548e0561411879984 SHA512 e00cd9297d8ac75fcd504a2bfb80d5c5e145e7d475dd15edf9361dc28721afdc069c5b6e79438b75a774e972028841a17e8f7842dcfb3d7835c436a3e503704c
@@ -18,5 +19,5 @@ EBUILD kube-controller-manager-1.26.6.ebuild 988 BLAKE2B c0ef8c338ce9b85ea7f8751
 EBUILD kube-controller-manager-1.26.7.ebuild 988 BLAKE2B c0ef8c338ce9b85ea7f875158058fb09f6946862f32983f478638842b4b30e5eb43c5f82f0799f3f47491f19fba4475e9ca29b5630ef5e0b91bc4da472951c5a SHA512 02b9a4c1b5d8d0c4eb4ce3de6a2fcf99ca6d08c3b6bd51574f717a123ffd2499d77905af5a501f32df9b06ebf12e9757d87a61942fd9bb1b8210083321311b97
 EBUILD kube-controller-manager-1.27.3.ebuild 988 BLAKE2B cb730bcc2d0badbe5bbec3a13ac97a7059296d2f5f90fa6ddf4526a5f66b8f9ee45f9ee3035dbfcd1ca082a95b7e6875d7084dd983729c9fe4bb798f5200e57e SHA512 b589f8d4f13f14608227ff5ce34a2bd509b84188863a733bdd0ab8f8dae1b39046d2eef1e217cf7a6c014dcf37511024fe775fb72ec0ee6a7a72535611b7b814
 EBUILD kube-controller-manager-1.27.4.ebuild 988 BLAKE2B cb730bcc2d0badbe5bbec3a13ac97a7059296d2f5f90fa6ddf4526a5f66b8f9ee45f9ee3035dbfcd1ca082a95b7e6875d7084dd983729c9fe4bb798f5200e57e SHA512 b589f8d4f13f14608227ff5ce34a2bd509b84188863a733bdd0ab8f8dae1b39046d2eef1e217cf7a6c014dcf37511024fe775fb72ec0ee6a7a72535611b7b814
-EBUILD kube-controller-manager-1.28.0.ebuild 989 BLAKE2B fb2b9997a42d14c19b8a5a7e4c2c174b113e24f2e2f124bc2a7e65c77f41d0134e458c08b3dc333c7bb775f1e2a6142202ff54d997a74e7cfdf9c129ddef45cb SHA512 2d9dd0addd090f60b695056f82649573e1c86b97f65bd1ae85cf90265124e96ae2334fd1a01056eb7f60655baf1ab18f145c7f4257b41f3a5b3df275751db3f9
+EBUILD kube-controller-manager-1.28.0.ebuild 1062 BLAKE2B b2ad8e8f73a2c65b8d6c1b7052fef66e7a8c9c573d5300cb5e732e951c744be9d09f77d2317c148ac39ff48347e457a239f3401b2af195ed2a17b5d967a9ba56 SHA512 f37a0fe92c9e6ae2505a2c36981b8f70702b159f551b47900e7110a4d7d4d09f2b6dbfd04ade7b852006abfaeb49cfa1d12adfb80e8236708e6777b08ea25222
 MISC metadata.xml 335 BLAKE2B d43f79bc4ff9bad895fc1c0617329cbc07e05d0e7eb8d251688c1f46c61e3360639e43d92f72e9eef0ba5b235f33f2b3ad1bf0f783854b5f9426af43d81c3502 SHA512 de4bf01133d4a117ea2bd21936d670598a30b89dca290a867c3ec4e8ed739aec4867c42504210291ed84add21e1aa100d7d2b565e4351c43bdf2fa906b72a4cb
diff --git a/sys-cluster/kube-controller-manager/files/kube-controller-manager-1.28.0-make-gomaxprocs-install-optional.patch b/sys-cluster/kube-controller-manager/files/kube-controller-manager-1.28.0-make-gomaxprocs-install-optional.patch
new file mode 100644
index 000000000000..1a8935b31c9c
--- /dev/null
+++ b/sys-cluster/kube-controller-manager/files/kube-controller-manager-1.28.0-make-gomaxprocs-install-optional.patch
@@ -0,0 +1,78 @@
+From cce3f6ffa796ea416021b0d62567a3f52b979567 Mon Sep 17 00:00:00 2001
+From: Jordan Liggitt <liggitt@google.com>
+Date: Wed, 16 Aug 2023 09:33:02 -0400
+Subject: [PATCH 2/2] Make gomaxprocs install optional, limit to tests
+
+---
+ hack/lib/golang.sh               | 25 +++++++++++++++----------
+ hack/make-rules/test-e2e-node.sh |  1 +
+ hack/make-rules/test.sh          |  1 +
+ 3 files changed, 17 insertions(+), 10 deletions(-)
+
+diff --git a/hack/lib/golang.sh b/hack/lib/golang.sh
+index 66772f08a81..983ff368e25 100755
+--- a/hack/lib/golang.sh
++++ b/hack/lib/golang.sh
+@@ -556,20 +556,25 @@ kube::golang::setup_env() {
+ 
+   # This seems to matter to some tools
+   export GO15VENDOREXPERIMENT=1
++}
+ 
++kube::golang::setup_gomaxprocs() {
+   # GOMAXPROCS by default does not reflect the number of cpu(s) available
+   # when running in a container, please see https://github.com/golang/go/issues/33803
+-  if ! command -v ncpu >/dev/null 2>&1; then
+-    # shellcheck disable=SC2164
+-    pushd "${KUBE_ROOT}/hack/tools" >/dev/null
+-    GO111MODULE=on go install ./ncpu
+-    # shellcheck disable=SC2164
+-    popd >/dev/null
++  if [[ -z "${GOMAXPROCS:-}" ]]; then
++    if ! command -v ncpu >/dev/null 2>&1; then
++      # shellcheck disable=SC2164
++      pushd "${KUBE_ROOT}/hack/tools" >/dev/null
++      GO111MODULE=on go install ./ncpu || echo "Will not automatically set GOMAXPROCS"
++      # shellcheck disable=SC2164
++      popd >/dev/null
++    fi
++    if command -v ncpu >/dev/null 2>&1; then
++      GOMAXPROCS=$(ncpu)
++      export GOMAXPROCS
++      kube::log::status "Set GOMAXPROCS automatically to ${GOMAXPROCS}"
++    fi
+   fi
+-
+-  GOMAXPROCS=${GOMAXPROCS:-$(ncpu)}
+-  export GOMAXPROCS
+-  kube::log::status "Setting GOMAXPROCS: ${GOMAXPROCS}"
+ }
+ 
+ # This will take binaries from $GOPATH/bin and copy them to the appropriate
+diff --git a/hack/make-rules/test-e2e-node.sh b/hack/make-rules/test-e2e-node.sh
+index 43dde0c740f..49e3e04ac71 100755
+--- a/hack/make-rules/test-e2e-node.sh
++++ b/hack/make-rules/test-e2e-node.sh
+@@ -18,6 +18,7 @@ KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/../..
+ source "${KUBE_ROOT}/hack/lib/init.sh"
+ 
+ kube::golang::setup_env
++kube::golang::setup_gomaxprocs
+ 
+ # start the cache mutation detector by default so that cache mutators will be found
+ KUBE_CACHE_MUTATION_DETECTOR="${KUBE_CACHE_MUTATION_DETECTOR:-true}"
+diff --git a/hack/make-rules/test.sh b/hack/make-rules/test.sh
+index e9074678a8f..4aa72730d83 100755
+--- a/hack/make-rules/test.sh
++++ b/hack/make-rules/test.sh
+@@ -22,6 +22,7 @@ KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/../..
+ source "${KUBE_ROOT}/hack/lib/init.sh"
+ 
+ kube::golang::setup_env
++kube::golang::setup_gomaxprocs
+ 
+ # start the cache mutation detector by default so that cache mutators will be found
+ KUBE_CACHE_MUTATION_DETECTOR="${KUBE_CACHE_MUTATION_DETECTOR:-true}"
+-- 
+2.41.0
+
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.28.0.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.28.0.ebuild
index dc4ca2df138b..683ee2008eeb 100644
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.28.0.ebuild
+++ b/sys-cluster/kube-controller-manager/kube-controller-manager-1.28.0.ebuild
@@ -22,6 +22,10 @@ BDEPEND=">=dev-lang/go-1.20"
 RESTRICT+=" test"
 S="${WORKDIR}/kubernetes-${PV}"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-make-gomaxprocs-install-optional.patch
+	)
+
 src_compile() {
 	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
 		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
diff --git a/sys-cluster/kube-proxy/Manifest b/sys-cluster/kube-proxy/Manifest
index 70613a578fcf..5704968637bf 100644
--- a/sys-cluster/kube-proxy/Manifest
+++ b/sys-cluster/kube-proxy/Manifest
@@ -1,3 +1,4 @@
+AUX kube-proxy-1.28.0-make-gomaxprocs-install-optional.patch 2835 BLAKE2B 964759a3af2afced4d5ff2ed59b1e94c2912a85ce560f3dac4e0ea59b1e308ee7b35f6d5435524e6e407d2032a1bd8783fb0b4787dbb22cfa9ace9ff723b1c40 SHA512 88b369bfda14eb03f9957f4b9105a565fa6f821e20b4743941f12f7e5b005cdef4184e0c09d54102b811e08a27f1725b0dc36e29e331f8802b7eaf52db1ce00f
 AUX kube-proxy.confd 53 BLAKE2B 0cd5fc844dc21f63786ef21d972210ac02ea55165b05cef8810268f894e3466cea4d82c7882e56d6a0bf425311adbf6a55e3e3fe351b9a1a7ce1d9e1e087018b SHA512 4c8c34ae8668bcfa5167c2d2af006fc46b461a5dafb3ec5b64cb8cdf2a830c22ddb5cf806c93b1404f60dabf91b4153724947fa2d2c494376f20e637eeed5018
 AUX kube-proxy.initd 507 BLAKE2B 96697ce13e03c0a541bd8e7a3dc28a1c5647067d3bffe464d672d00ecf5b5fffd349a6affcd8ae3ea0ba06160be72f31cfa2d918c01050e83640fb9956917dc0 SHA512 088d91cd77e614f7857d65496f5b6d486741a8e3358b3e13bcd4203d35a76fa3aa390f658065e2826145525b6e83fcd33f8365a873e99b522f3ab7e8615ed364
 AUX kube-proxy.logrotated 84 BLAKE2B d1a37cac3891f131b605edfe569ed545445d6993528059b11b4a8d20d0c958abbab8d7c6acfc7a9e0f17c64ac7f19ef2b4954ff475bededf406e718d04261d59 SHA512 7842a4585aaf9b7be0fac89dca58874354453fc6f17f00223c04aad2211217531ae6a942424a8a112808dcf9e52a499c4879730e435d2ad08931516c66d5441d
@@ -18,5 +19,5 @@ EBUILD kube-proxy-1.26.6.ebuild 903 BLAKE2B 1aa153095ce5f8bb28c12717c62936aac24b
 EBUILD kube-proxy-1.26.7.ebuild 903 BLAKE2B 1aa153095ce5f8bb28c12717c62936aac24b73b7e0780a4736c59a9c7c7a492c1c3bfc15343575bd4243c02a44ba2c73ec78fa064feed192c2410df575bae4af SHA512 cb2e2a9c28cce3b178ff30e08da842a75e8dee62c72d1243c503824ed180a31f5e27c76c885c248f2760e5ba1a7a009bf30d8706bbdbd07a609914a5b924f07d
 EBUILD kube-proxy-1.27.3.ebuild 903 BLAKE2B 1c939447d9c99d5723a207c0310c4a14cc45b39678af42304de57e93f127d398ca9e24369369c3db5848ee23e64ac77b900ddf61368bc821a571f143aa6663d2 SHA512 d59a856c6a5b9133188f7ad48ac975f4cb88eb4b95a78a6f4c30deb79a2a83e09ce4c9abb85fbb0111f121fc869b9e118f5a90c4f6e3113a0e2a88a15c29ae9f
 EBUILD kube-proxy-1.27.4.ebuild 903 BLAKE2B 1c939447d9c99d5723a207c0310c4a14cc45b39678af42304de57e93f127d398ca9e24369369c3db5848ee23e64ac77b900ddf61368bc821a571f143aa6663d2 SHA512 d59a856c6a5b9133188f7ad48ac975f4cb88eb4b95a78a6f4c30deb79a2a83e09ce4c9abb85fbb0111f121fc869b9e118f5a90c4f6e3113a0e2a88a15c29ae9f
-EBUILD kube-proxy-1.28.0.ebuild 904 BLAKE2B dd6a4ee3a1feff0f1250a81af3ed98a930e3814fc6ed496c3ebb5fb6f166e7649c6934e19f96a78a9f10c8bedff2dbfe6d8bf4d4b5406372f14e417f7aaf2112 SHA512 42fa664d157356844ade5f3ef4e477abc550cc9913d647643ce59618d5a2e4d4a3a0e3cd7b57cf6d0619aa7fef26e8c83963c02a8fe8106f0ee46cc06276375e
+EBUILD kube-proxy-1.28.0.ebuild 976 BLAKE2B df7e2d1ccb29e7aa44e4218ba6baf8f3120ac995f12fbdec1035451630809819f4df6a71c15b236731513d096e1d5c35d51b0200a25ba05b730c6d755cfba2c9 SHA512 1de585d08e31f43d13465e8307cac9a8609065c400934cd14bbdf99ee5e68a0b68e6e90603fcda17eb6342b3435e92afb4b90b5f896f2835fab71ccb5d76e685
 MISC metadata.xml 335 BLAKE2B d43f79bc4ff9bad895fc1c0617329cbc07e05d0e7eb8d251688c1f46c61e3360639e43d92f72e9eef0ba5b235f33f2b3ad1bf0f783854b5f9426af43d81c3502 SHA512 de4bf01133d4a117ea2bd21936d670598a30b89dca290a867c3ec4e8ed739aec4867c42504210291ed84add21e1aa100d7d2b565e4351c43bdf2fa906b72a4cb
diff --git a/sys-cluster/kube-proxy/files/kube-proxy-1.28.0-make-gomaxprocs-install-optional.patch b/sys-cluster/kube-proxy/files/kube-proxy-1.28.0-make-gomaxprocs-install-optional.patch
new file mode 100644
index 000000000000..1a8935b31c9c
--- /dev/null
+++ b/sys-cluster/kube-proxy/files/kube-proxy-1.28.0-make-gomaxprocs-install-optional.patch
@@ -0,0 +1,78 @@
+From cce3f6ffa796ea416021b0d62567a3f52b979567 Mon Sep 17 00:00:00 2001
+From: Jordan Liggitt <liggitt@google.com>
+Date: Wed, 16 Aug 2023 09:33:02 -0400
+Subject: [PATCH 2/2] Make gomaxprocs install optional, limit to tests
+
+---
+ hack/lib/golang.sh               | 25 +++++++++++++++----------
+ hack/make-rules/test-e2e-node.sh |  1 +
+ hack/make-rules/test.sh          |  1 +
+ 3 files changed, 17 insertions(+), 10 deletions(-)
+
+diff --git a/hack/lib/golang.sh b/hack/lib/golang.sh
+index 66772f08a81..983ff368e25 100755
+--- a/hack/lib/golang.sh
++++ b/hack/lib/golang.sh
+@@ -556,20 +556,25 @@ kube::golang::setup_env() {
+ 
+   # This seems to matter to some tools
+   export GO15VENDOREXPERIMENT=1
++}
+ 
++kube::golang::setup_gomaxprocs() {
+   # GOMAXPROCS by default does not reflect the number of cpu(s) available
+   # when running in a container, please see https://github.com/golang/go/issues/33803
+-  if ! command -v ncpu >/dev/null 2>&1; then
+-    # shellcheck disable=SC2164
+-    pushd "${KUBE_ROOT}/hack/tools" >/dev/null
+-    GO111MODULE=on go install ./ncpu
+-    # shellcheck disable=SC2164
+-    popd >/dev/null
++  if [[ -z "${GOMAXPROCS:-}" ]]; then
++    if ! command -v ncpu >/dev/null 2>&1; then
++      # shellcheck disable=SC2164
++      pushd "${KUBE_ROOT}/hack/tools" >/dev/null
++      GO111MODULE=on go install ./ncpu || echo "Will not automatically set GOMAXPROCS"
++      # shellcheck disable=SC2164
++      popd >/dev/null
++    fi
++    if command -v ncpu >/dev/null 2>&1; then
++      GOMAXPROCS=$(ncpu)
++      export GOMAXPROCS
++      kube::log::status "Set GOMAXPROCS automatically to ${GOMAXPROCS}"
++    fi
+   fi
+-
+-  GOMAXPROCS=${GOMAXPROCS:-$(ncpu)}
+-  export GOMAXPROCS
+-  kube::log::status "Setting GOMAXPROCS: ${GOMAXPROCS}"
+ }
+ 
+ # This will take binaries from $GOPATH/bin and copy them to the appropriate
+diff --git a/hack/make-rules/test-e2e-node.sh b/hack/make-rules/test-e2e-node.sh
+index 43dde0c740f..49e3e04ac71 100755
+--- a/hack/make-rules/test-e2e-node.sh
++++ b/hack/make-rules/test-e2e-node.sh
+@@ -18,6 +18,7 @@ KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/../..
+ source "${KUBE_ROOT}/hack/lib/init.sh"
+ 
+ kube::golang::setup_env
++kube::golang::setup_gomaxprocs
+ 
+ # start the cache mutation detector by default so that cache mutators will be found
+ KUBE_CACHE_MUTATION_DETECTOR="${KUBE_CACHE_MUTATION_DETECTOR:-true}"
+diff --git a/hack/make-rules/test.sh b/hack/make-rules/test.sh
+index e9074678a8f..4aa72730d83 100755
+--- a/hack/make-rules/test.sh
++++ b/hack/make-rules/test.sh
+@@ -22,6 +22,7 @@ KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/../..
+ source "${KUBE_ROOT}/hack/lib/init.sh"
+ 
+ kube::golang::setup_env
++kube::golang::setup_gomaxprocs
+ 
+ # start the cache mutation detector by default so that cache mutators will be found
+ KUBE_CACHE_MUTATION_DETECTOR="${KUBE_CACHE_MUTATION_DETECTOR:-true}"
+-- 
+2.41.0
+
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.28.0.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.28.0.ebuild
index ea991ff91e56..eb1ed50b5db5 100644
--- a/sys-cluster/kube-proxy/kube-proxy-1.28.0.ebuild
+++ b/sys-cluster/kube-proxy/kube-proxy-1.28.0.ebuild
@@ -19,6 +19,10 @@ BDEPEND=">=dev-lang/go-1.20"
 RESTRICT+=" test"
 S="${WORKDIR}/kubernetes-${PV}"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-make-gomaxprocs-install-optional.patch
+)
+
 src_compile() {
 	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
 		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
diff --git a/sys-cluster/kube-scheduler/Manifest b/sys-cluster/kube-scheduler/Manifest
index 25057732eabd..064bf441a35a 100644
--- a/sys-cluster/kube-scheduler/Manifest
+++ b/sys-cluster/kube-scheduler/Manifest
@@ -1,3 +1,4 @@
+AUX kube-scheduler-1.28.0-make-gomaxprocs-install-optional.patch 2835 BLAKE2B 964759a3af2afced4d5ff2ed59b1e94c2912a85ce560f3dac4e0ea59b1e308ee7b35f6d5435524e6e407d2032a1bd8783fb0b4787dbb22cfa9ace9ff723b1c40 SHA512 88b369bfda14eb03f9957f4b9105a565fa6f821e20b4743941f12f7e5b005cdef4184e0c09d54102b811e08a27f1725b0dc36e29e331f8802b7eaf52db1ce00f
 AUX kube-scheduler.confd 133 BLAKE2B 6b88dfc011173f183a88a16d078cbb5d96d46c269129b483d650fd7dd63376e366825f483178c26e931db226478ce9d0b85412fc264d4d600a8232d0bac149e7 SHA512 d7326f34b26aaebf4b5c25a03abcff3bc3d397382ad4fed0f4718ee425e71399febf6fec6dc817813490671692d3f1b454fd5d14d9c47c3d41b0d3405a01a6c2
 AUX kube-scheduler.initd 548 BLAKE2B dd9373f659b87fcf12dca20527aebdb304a60ec559fd9fb9efcd0db8b3c155fdba2ce8a59461cd15ed3b4294cc5b335093e12d2b8411e400927e1307b37bc6d8 SHA512 151ea6f5cc36de9b83f0e5365579e33eea8002f9a03f5f61d195a349236e6baf192f701d3fb591b769aa90e8e1e620d525b20c95a1e8cda58d062971d8f587a3
 AUX kube-scheduler.logrotated 88 BLAKE2B af29a5ba84cb29787b17368105c793868a2e61a28e9a5b02361cf4833982d4489364bd1291faa136df275988f02ce78c7b785c9209a54aec5eea6180b9041da0 SHA512 3692da349dd6ed0f5acc09d7b95ac562ffecb103e2270bebdfe4a7808d48dada9d2debff262d85b11c47f9ca3f0c20000712d03629ed813ff08a3e02d69267e6
@@ -18,5 +19,5 @@ EBUILD kube-scheduler-1.26.6.ebuild 961 BLAKE2B 1bf7855312c5044b5ea261baf2f35689
 EBUILD kube-scheduler-1.26.7.ebuild 961 BLAKE2B 1bf7855312c5044b5ea261baf2f35689b20e5009609e9a57b85aeaab0704502c152652128206c1e938f32f6b8171d1f639eb5e84956949142954963182540d97 SHA512 deab86ef065c7c468bacac9587f44fdefca43a44d7a5badea823d512ad74e90b960d607ea2deb943cf7335479b46ffe1ab5b3262b8f97f52935dcab6060d5976
 EBUILD kube-scheduler-1.27.3.ebuild 961 BLAKE2B 546de2cf745d915d594a6519ad3f561bd625995284f06358228dfffb767b6e41e3dc58476443e5ae5f99cfdcbf2e320df4eb230f0f4823bad60f962d91548e85 SHA512 89b5945c962e381251538fd96e3400d709c22e4c61b3acaac22892dd6054af3fe4b6a49af832fb1a7555ef3c2d98c3b44ce980ac95659965a561695465360d3c
 EBUILD kube-scheduler-1.27.4.ebuild 961 BLAKE2B 546de2cf745d915d594a6519ad3f561bd625995284f06358228dfffb767b6e41e3dc58476443e5ae5f99cfdcbf2e320df4eb230f0f4823bad60f962d91548e85 SHA512 89b5945c962e381251538fd96e3400d709c22e4c61b3acaac22892dd6054af3fe4b6a49af832fb1a7555ef3c2d98c3b44ce980ac95659965a561695465360d3c
-EBUILD kube-scheduler-1.28.0.ebuild 962 BLAKE2B 40d3f7dff63e91693048e534600ce3147608761d50e50a31c37929b2977fc5f8bef3b2e3561315c821ea51f3366bd4ffc2f16fe5f1bbf9e10892b2d9c4b9ca1c SHA512 85680650665c5ef1ac0092e6ec0071513d9017779ab7275d1b80d2aa78c6d905ad928f26d7f36b2ed4524f84b47ce68fcbe79a53096ff3159cb2304fdd266b5e
+EBUILD kube-scheduler-1.28.0.ebuild 1034 BLAKE2B 6cab8e572ead6b3e7403797ea59212a508cd3720844703fec92f37aabc668fc1cf0f1ce46f088aaa049934e53acc5c8e5ee2b060109c034a9ed081ecb1a57bc2 SHA512 42899061d37289a29dafe931fdb8020b50d700b8ce8b304aec829f5825286e0c76dcfb061e22e11c86434e6f861c3c49f11a6010ff395bcf6ccf3764b5ce14a9
 MISC metadata.xml 335 BLAKE2B d43f79bc4ff9bad895fc1c0617329cbc07e05d0e7eb8d251688c1f46c61e3360639e43d92f72e9eef0ba5b235f33f2b3ad1bf0f783854b5f9426af43d81c3502 SHA512 de4bf01133d4a117ea2bd21936d670598a30b89dca290a867c3ec4e8ed739aec4867c42504210291ed84add21e1aa100d7d2b565e4351c43bdf2fa906b72a4cb
diff --git a/sys-cluster/kube-scheduler/files/kube-scheduler-1.28.0-make-gomaxprocs-install-optional.patch b/sys-cluster/kube-scheduler/files/kube-scheduler-1.28.0-make-gomaxprocs-install-optional.patch
new file mode 100644
index 000000000000..1a8935b31c9c
--- /dev/null
+++ b/sys-cluster/kube-scheduler/files/kube-scheduler-1.28.0-make-gomaxprocs-install-optional.patch
@@ -0,0 +1,78 @@
+From cce3f6ffa796ea416021b0d62567a3f52b979567 Mon Sep 17 00:00:00 2001
+From: Jordan Liggitt <liggitt@google.com>
+Date: Wed, 16 Aug 2023 09:33:02 -0400
+Subject: [PATCH 2/2] Make gomaxprocs install optional, limit to tests
+
+---
+ hack/lib/golang.sh               | 25 +++++++++++++++----------
+ hack/make-rules/test-e2e-node.sh |  1 +
+ hack/make-rules/test.sh          |  1 +
+ 3 files changed, 17 insertions(+), 10 deletions(-)
+
+diff --git a/hack/lib/golang.sh b/hack/lib/golang.sh
+index 66772f08a81..983ff368e25 100755
+--- a/hack/lib/golang.sh
++++ b/hack/lib/golang.sh
+@@ -556,20 +556,25 @@ kube::golang::setup_env() {
+ 
+   # This seems to matter to some tools
+   export GO15VENDOREXPERIMENT=1
++}
+ 
++kube::golang::setup_gomaxprocs() {
+   # GOMAXPROCS by default does not reflect the number of cpu(s) available
+   # when running in a container, please see https://github.com/golang/go/issues/33803
+-  if ! command -v ncpu >/dev/null 2>&1; then
+-    # shellcheck disable=SC2164
+-    pushd "${KUBE_ROOT}/hack/tools" >/dev/null
+-    GO111MODULE=on go install ./ncpu
+-    # shellcheck disable=SC2164
+-    popd >/dev/null
++  if [[ -z "${GOMAXPROCS:-}" ]]; then
++    if ! command -v ncpu >/dev/null 2>&1; then
++      # shellcheck disable=SC2164
++      pushd "${KUBE_ROOT}/hack/tools" >/dev/null
++      GO111MODULE=on go install ./ncpu || echo "Will not automatically set GOMAXPROCS"
++      # shellcheck disable=SC2164
++      popd >/dev/null
++    fi
++    if command -v ncpu >/dev/null 2>&1; then
++      GOMAXPROCS=$(ncpu)
++      export GOMAXPROCS
++      kube::log::status "Set GOMAXPROCS automatically to ${GOMAXPROCS}"
++    fi
+   fi
+-
+-  GOMAXPROCS=${GOMAXPROCS:-$(ncpu)}
+-  export GOMAXPROCS
+-  kube::log::status "Setting GOMAXPROCS: ${GOMAXPROCS}"
+ }
+ 
+ # This will take binaries from $GOPATH/bin and copy them to the appropriate
+diff --git a/hack/make-rules/test-e2e-node.sh b/hack/make-rules/test-e2e-node.sh
+index 43dde0c740f..49e3e04ac71 100755
+--- a/hack/make-rules/test-e2e-node.sh
++++ b/hack/make-rules/test-e2e-node.sh
+@@ -18,6 +18,7 @@ KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/../..
+ source "${KUBE_ROOT}/hack/lib/init.sh"
+ 
+ kube::golang::setup_env
++kube::golang::setup_gomaxprocs
+ 
+ # start the cache mutation detector by default so that cache mutators will be found
+ KUBE_CACHE_MUTATION_DETECTOR="${KUBE_CACHE_MUTATION_DETECTOR:-true}"
+diff --git a/hack/make-rules/test.sh b/hack/make-rules/test.sh
+index e9074678a8f..4aa72730d83 100755
+--- a/hack/make-rules/test.sh
++++ b/hack/make-rules/test.sh
+@@ -22,6 +22,7 @@ KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/../..
+ source "${KUBE_ROOT}/hack/lib/init.sh"
+ 
+ kube::golang::setup_env
++kube::golang::setup_gomaxprocs
+ 
+ # start the cache mutation detector by default so that cache mutators will be found
+ KUBE_CACHE_MUTATION_DETECTOR="${KUBE_CACHE_MUTATION_DETECTOR:-true}"
+-- 
+2.41.0
+
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.28.0.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.28.0.ebuild
index 038445235f63..d2d2dc5e3ba5 100644
--- a/sys-cluster/kube-scheduler/kube-scheduler-1.28.0.ebuild
+++ b/sys-cluster/kube-scheduler/kube-scheduler-1.28.0.ebuild
@@ -22,6 +22,10 @@ BDEPEND=">=dev-lang/go-1.20"
 RESTRICT+=" test"
 S="${WORKDIR}/kubernetes-${PV}"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-make-gomaxprocs-install-optional.patch
+)
+
 src_compile() {
 	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
 		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
diff --git a/sys-cluster/kubeadm/Manifest b/sys-cluster/kubeadm/Manifest
index 81234c64f616..b3186b58d136 100644
--- a/sys-cluster/kubeadm/Manifest
+++ b/sys-cluster/kubeadm/Manifest
@@ -1,3 +1,4 @@
+AUX kubeadm-1.28.0-make-gomaxprocs-install-optional.patch 2835 BLAKE2B 964759a3af2afced4d5ff2ed59b1e94c2912a85ce560f3dac4e0ea59b1e308ee7b35f6d5435524e6e407d2032a1bd8783fb0b4787dbb22cfa9ace9ff723b1c40 SHA512 88b369bfda14eb03f9957f4b9105a565fa6f821e20b4743941f12f7e5b005cdef4184e0c09d54102b811e08a27f1725b0dc36e29e331f8802b7eaf52db1ce00f
 DIST kubernetes-1.24.14.tar.gz 37908337 BLAKE2B 08f52b611bea49f1c204a4fb956d87be6f571ef122b4cc10101862c61d11751d944d9140c4355be95759f83240cb8a3d4879c72e077bdc10f235d03b1a0f99f7 SHA512 74cee62fdc7e0dca1430688e832d3b308b6604dee6ca88d5f19fd6b6a9c83833d003ae87d8a09866e2e8fd01cbde0a6ae4bd126f9845f770c76942f1772f04bb
 DIST kubernetes-1.24.15.tar.gz 38151496 BLAKE2B 47064fefb135031ed220341d34519b4ee2e6fb5996e4bacdfd94e5dd01c1e70b0ca56c0eda45208039004ab9f0f2c3d1de3d77f450d7a59ab5ccd1c6e4dc8b0e SHA512 48e450c76fe3c9bd8460a18bbff204ba7b548c807f984ba86ff388206bfc8a178d96718df377a354c88a99c66b54013ee85ba18b7778bd68cee610955abf2498
 DIST kubernetes-1.25.11.tar.gz 38468419 BLAKE2B fa90ffc6fdcba31f4fb70f7ea9cecae5d8e42efb0596abb2aa638e9d235f770cf4772cfa926b3e1a59fa37ae84bc1524d803215d4eccc04cc1d38ec4b884a9fa SHA512 e3805cf6ad4e5b4ce5fb53a73873a3e447cc62b26f106afa1eec21071a7912cfd2e972f27f40c183af3e67a8ac107adc97d63a303b844dcae62e5efa0e1879a5
@@ -15,5 +16,5 @@ EBUILD kubeadm-1.26.6.ebuild 964 BLAKE2B 98417244686292bceab7268358757606d233d5b
 EBUILD kubeadm-1.26.7.ebuild 964 BLAKE2B 98417244686292bceab7268358757606d233d5b17f1cff311969993ee9f7a78c80449dd0bc3a22e08eabba9fa1a9e9865edfaaa158103dc7df9211a60a3b8ee3 SHA512 9f7348c3c1a7a1f16a523af7243b08570102e953c692aed930ecbfd2307577eb2f0cb61f3df6dfb5ab79fd162bad6c1f2b430ac6d1ba013d2b1f05c5c6e31e79
 EBUILD kubeadm-1.27.3.ebuild 964 BLAKE2B 2de314b49858492b10da2d4de81f4fb185ed98a7854d2cd905c616e77fa19a42358d8d6b8199b3a641ff39b03426b9e8e67d6057cdb479d29a72af31679267b2 SHA512 0a5fbd3122ad732b7d84598f1f4fe2fde522462007a06b7dfbdcf939b64b3eeb1c2e2a6f1ec00d37278790701f27e6ae7e5509e8683c972db7973ed53e241a1b
 EBUILD kubeadm-1.27.4.ebuild 964 BLAKE2B 2de314b49858492b10da2d4de81f4fb185ed98a7854d2cd905c616e77fa19a42358d8d6b8199b3a641ff39b03426b9e8e67d6057cdb479d29a72af31679267b2 SHA512 0a5fbd3122ad732b7d84598f1f4fe2fde522462007a06b7dfbdcf939b64b3eeb1c2e2a6f1ec00d37278790701f27e6ae7e5509e8683c972db7973ed53e241a1b
-EBUILD kubeadm-1.28.0.ebuild 983 BLAKE2B ee641f0271ce5abd3e90dcdf3888955725a573f89c42dd903d38d85c7b8d36e4384301678d3072b19bd477b0db3f960ab5b0d961673b13bfc6e63924bdd00076 SHA512 1f4f290a65db5bba37df7f3dc838e2bcdab84d23b3d84e8f1f3b312c70ab5cc3dfcd37be61ee0530de0656b1a6b282814276562f478887907c77b7eaef3fcbf1
+EBUILD kubeadm-1.28.0.ebuild 1056 BLAKE2B 235f9dcd4e3f751426ecb28f5f5ffe9effa9ddfd69cf3cb52f3555343a3e7b35578126b1fd1a27e6f724db77ffc4385e70689d52bd1b77ee2f87466a8e5351de SHA512 e3f7f455c0fa19eed967386c3bedbe2cab72e678c133db684b0debd78639694d2f38c732b483ccdaf9674ef3bf6ca78db7d85ce0e04e49e5308ebbebd60cb14b
 MISC metadata.xml 918 BLAKE2B 487a711e9aebe9d4d8f2c3a03664990aa544a4c0b969dbb60d10ebf42ca64cb9b21f822f92e774f3a813b409d5df905c8ecf02f186218f925a69f70b2960d53c SHA512 392d1cdf4179bc2aa14598e41e38e364518f0c71c34d61280729ae2cdab37c247112b48fcea58c792f6f7148e3979dfbff174bac3a3a00b7084168332112f5d3
diff --git a/sys-cluster/kubeadm/files/kubeadm-1.28.0-make-gomaxprocs-install-optional.patch b/sys-cluster/kubeadm/files/kubeadm-1.28.0-make-gomaxprocs-install-optional.patch
new file mode 100644
index 000000000000..1a8935b31c9c
--- /dev/null
+++ b/sys-cluster/kubeadm/files/kubeadm-1.28.0-make-gomaxprocs-install-optional.patch
@@ -0,0 +1,78 @@
+From cce3f6ffa796ea416021b0d62567a3f52b979567 Mon Sep 17 00:00:00 2001
+From: Jordan Liggitt <liggitt@google.com>
+Date: Wed, 16 Aug 2023 09:33:02 -0400
+Subject: [PATCH 2/2] Make gomaxprocs install optional, limit to tests
+
+---
+ hack/lib/golang.sh               | 25 +++++++++++++++----------
+ hack/make-rules/test-e2e-node.sh |  1 +
+ hack/make-rules/test.sh          |  1 +
+ 3 files changed, 17 insertions(+), 10 deletions(-)
+
+diff --git a/hack/lib/golang.sh b/hack/lib/golang.sh
+index 66772f08a81..983ff368e25 100755
+--- a/hack/lib/golang.sh
++++ b/hack/lib/golang.sh
+@@ -556,20 +556,25 @@ kube::golang::setup_env() {
+ 
+   # This seems to matter to some tools
+   export GO15VENDOREXPERIMENT=1
++}
+ 
++kube::golang::setup_gomaxprocs() {
+   # GOMAXPROCS by default does not reflect the number of cpu(s) available
+   # when running in a container, please see https://github.com/golang/go/issues/33803
+-  if ! command -v ncpu >/dev/null 2>&1; then
+-    # shellcheck disable=SC2164
+-    pushd "${KUBE_ROOT}/hack/tools" >/dev/null
+-    GO111MODULE=on go install ./ncpu
+-    # shellcheck disable=SC2164
+-    popd >/dev/null
++  if [[ -z "${GOMAXPROCS:-}" ]]; then
++    if ! command -v ncpu >/dev/null 2>&1; then
++      # shellcheck disable=SC2164
++      pushd "${KUBE_ROOT}/hack/tools" >/dev/null
++      GO111MODULE=on go install ./ncpu || echo "Will not automatically set GOMAXPROCS"
++      # shellcheck disable=SC2164
++      popd >/dev/null
++    fi
++    if command -v ncpu >/dev/null 2>&1; then
++      GOMAXPROCS=$(ncpu)
++      export GOMAXPROCS
++      kube::log::status "Set GOMAXPROCS automatically to ${GOMAXPROCS}"
++    fi
+   fi
+-
+-  GOMAXPROCS=${GOMAXPROCS:-$(ncpu)}
+-  export GOMAXPROCS
+-  kube::log::status "Setting GOMAXPROCS: ${GOMAXPROCS}"
+ }
+ 
+ # This will take binaries from $GOPATH/bin and copy them to the appropriate
+diff --git a/hack/make-rules/test-e2e-node.sh b/hack/make-rules/test-e2e-node.sh
+index 43dde0c740f..49e3e04ac71 100755
+--- a/hack/make-rules/test-e2e-node.sh
++++ b/hack/make-rules/test-e2e-node.sh
+@@ -18,6 +18,7 @@ KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/../..
+ source "${KUBE_ROOT}/hack/lib/init.sh"
+ 
+ kube::golang::setup_env
++kube::golang::setup_gomaxprocs
+ 
+ # start the cache mutation detector by default so that cache mutators will be found
+ KUBE_CACHE_MUTATION_DETECTOR="${KUBE_CACHE_MUTATION_DETECTOR:-true}"
+diff --git a/hack/make-rules/test.sh b/hack/make-rules/test.sh
+index e9074678a8f..4aa72730d83 100755
+--- a/hack/make-rules/test.sh
++++ b/hack/make-rules/test.sh
+@@ -22,6 +22,7 @@ KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/../..
+ source "${KUBE_ROOT}/hack/lib/init.sh"
+ 
+ kube::golang::setup_env
++kube::golang::setup_gomaxprocs
+ 
+ # start the cache mutation detector by default so that cache mutators will be found
+ KUBE_CACHE_MUTATION_DETECTOR="${KUBE_CACHE_MUTATION_DETECTOR:-true}"
+-- 
+2.41.0
+
diff --git a/sys-cluster/kubeadm/kubeadm-1.28.0.ebuild b/sys-cluster/kubeadm/kubeadm-1.28.0.ebuild
index a7a02677a302..a1c9807b07ae 100644
--- a/sys-cluster/kubeadm/kubeadm-1.28.0.ebuild
+++ b/sys-cluster/kubeadm/kubeadm-1.28.0.ebuild
@@ -20,6 +20,10 @@ RDEPEND="app-containers/cri-tools
 RESTRICT+=" test"
 S="${WORKDIR}/kubernetes-${PV}"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-make-gomaxprocs-install-optional.patch
+	)
+
 src_compile() {
 	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" FORCE_HOST_GO=yes \
 		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
diff --git a/sys-cluster/kubectl/Manifest b/sys-cluster/kubectl/Manifest
index 085c91bbea95..6495f49fddee 100644
--- a/sys-cluster/kubectl/Manifest
+++ b/sys-cluster/kubectl/Manifest
@@ -1,3 +1,4 @@
+AUX kubectl-1.28.0-make-gomaxprocs-install-optional.patch 2835 BLAKE2B 964759a3af2afced4d5ff2ed59b1e94c2912a85ce560f3dac4e0ea59b1e308ee7b35f6d5435524e6e407d2032a1bd8783fb0b4787dbb22cfa9ace9ff723b1c40 SHA512 88b369bfda14eb03f9957f4b9105a565fa6f821e20b4743941f12f7e5b005cdef4184e0c09d54102b811e08a27f1725b0dc36e29e331f8802b7eaf52db1ce00f
 DIST kubernetes-1.24.14.tar.gz 37908337 BLAKE2B 08f52b611bea49f1c204a4fb956d87be6f571ef122b4cc10101862c61d11751d944d9140c4355be95759f83240cb8a3d4879c72e077bdc10f235d03b1a0f99f7 SHA512 74cee62fdc7e0dca1430688e832d3b308b6604dee6ca88d5f19fd6b6a9c83833d003ae87d8a09866e2e8fd01cbde0a6ae4bd126f9845f770c76942f1772f04bb
 DIST kubernetes-1.24.15.tar.gz 38151496 BLAKE2B 47064fefb135031ed220341d34519b4ee2e6fb5996e4bacdfd94e5dd01c1e70b0ca56c0eda45208039004ab9f0f2c3d1de3d77f450d7a59ab5ccd1c6e4dc8b0e SHA512 48e450c76fe3c9bd8460a18bbff204ba7b548c807f984ba86ff388206bfc8a178d96718df377a354c88a99c66b54013ee85ba18b7778bd68cee610955abf2498
 DIST kubernetes-1.25.11.tar.gz 38468419 BLAKE2B fa90ffc6fdcba31f4fb70f7ea9cecae5d8e42efb0596abb2aa638e9d235f770cf4772cfa926b3e1a59fa37ae84bc1524d803215d4eccc04cc1d38ec4b884a9fa SHA512 e3805cf6ad4e5b4ce5fb53a73873a3e447cc62b26f106afa1eec21071a7912cfd2e972f27f40c183af3e67a8ac107adc97d63a303b844dcae62e5efa0e1879a5
@@ -15,5 +16,5 @@ EBUILD kubectl-1.26.6.ebuild 873 BLAKE2B b4e63afdf9235f8890d11764f0779540685f007
 EBUILD kubectl-1.26.7.ebuild 873 BLAKE2B b4e63afdf9235f8890d11764f0779540685f007f4a5a1db4c319a8a66d6308549fa764624d99170088c7f82fab9e82173f04f18303b33272bbbc08764be86738 SHA512 9931017dc27ff974a94bff3ee60b3741e24bac819a38ead32d68d96ff08a04a113b22752f9f4076f7b850f7f3c0ca1790c362b89c31963e07617241c1903f602
 EBUILD kubectl-1.27.3.ebuild 873 BLAKE2B 82074aa2427e6cab6cb1e551b9703c1abcefbf7af7784153b5a498490c90fd75a655355d54fd8af5f5751d3627ad100d75c85070c80b19042e9fbd6a2ed587a8 SHA512 320af5826b407a9f617c5c9b63d76d52541b2e7fc5d19d145a9c456578029576fd06e33403e2aae8f2c84a9c9a814e1efef8812e13f6611b9c5020a67089b844
 EBUILD kubectl-1.27.4.ebuild 873 BLAKE2B 82074aa2427e6cab6cb1e551b9703c1abcefbf7af7784153b5a498490c90fd75a655355d54fd8af5f5751d3627ad100d75c85070c80b19042e9fbd6a2ed587a8 SHA512 320af5826b407a9f617c5c9b63d76d52541b2e7fc5d19d145a9c456578029576fd06e33403e2aae8f2c84a9c9a814e1efef8812e13f6611b9c5020a67089b844
-EBUILD kubectl-1.28.0.ebuild 874 BLAKE2B b131bf977a6af040012cb71c43578ec1d0d2cb7183f1e03778c59aef3c0186bc5055f382cebddd19c5878035503a081277bf19abedaff5e7cbdf595810f232bc SHA512 c48ab0fdaed8d0b742879ac963dc40bfe92d0607d2a507b68edd25cc35bcbc0d6ebadd1f48112b31d3d263b8c9f21072d06f4b8c32b00a1941df5ca7ef8ec82b
+EBUILD kubectl-1.28.0.ebuild 947 BLAKE2B d4eefe1b72fe49bd88e955594e24979449ba5233ba89ff832fa7ca4cd6b23355d94417a749657a349ba95b89fc3f6fa89d6671940b6cdd4387bdaa2dc95ed4ed SHA512 81bfcc79f5fef3243c0e953fe8c6434cdac96bbc4a5b10de36077fdde09f624ce7db0fb986a2b54f88de3032f4cf5ddf1b53c1c8eeeebb34c4041513b56f17a2
 MISC metadata.xml 335 BLAKE2B d43f79bc4ff9bad895fc1c0617329cbc07e05d0e7eb8d251688c1f46c61e3360639e43d92f72e9eef0ba5b235f33f2b3ad1bf0f783854b5f9426af43d81c3502 SHA512 de4bf01133d4a117ea2bd21936d670598a30b89dca290a867c3ec4e8ed739aec4867c42504210291ed84add21e1aa100d7d2b565e4351c43bdf2fa906b72a4cb
diff --git a/sys-cluster/kubectl/files/kubectl-1.28.0-make-gomaxprocs-install-optional.patch b/sys-cluster/kubectl/files/kubectl-1.28.0-make-gomaxprocs-install-optional.patch
new file mode 100644
index 000000000000..1a8935b31c9c
--- /dev/null
+++ b/sys-cluster/kubectl/files/kubectl-1.28.0-make-gomaxprocs-install-optional.patch
@@ -0,0 +1,78 @@
+From cce3f6ffa796ea416021b0d62567a3f52b979567 Mon Sep 17 00:00:00 2001
+From: Jordan Liggitt <liggitt@google.com>
+Date: Wed, 16 Aug 2023 09:33:02 -0400
+Subject: [PATCH 2/2] Make gomaxprocs install optional, limit to tests
+
+---
+ hack/lib/golang.sh               | 25 +++++++++++++++----------
+ hack/make-rules/test-e2e-node.sh |  1 +
+ hack/make-rules/test.sh          |  1 +
+ 3 files changed, 17 insertions(+), 10 deletions(-)
+
+diff --git a/hack/lib/golang.sh b/hack/lib/golang.sh
+index 66772f08a81..983ff368e25 100755
+--- a/hack/lib/golang.sh
++++ b/hack/lib/golang.sh
+@@ -556,20 +556,25 @@ kube::golang::setup_env() {
+ 
+   # This seems to matter to some tools
+   export GO15VENDOREXPERIMENT=1
++}
+ 
++kube::golang::setup_gomaxprocs() {
+   # GOMAXPROCS by default does not reflect the number of cpu(s) available
+   # when running in a container, please see https://github.com/golang/go/issues/33803
+-  if ! command -v ncpu >/dev/null 2>&1; then
+-    # shellcheck disable=SC2164
+-    pushd "${KUBE_ROOT}/hack/tools" >/dev/null
+-    GO111MODULE=on go install ./ncpu
+-    # shellcheck disable=SC2164
+-    popd >/dev/null
++  if [[ -z "${GOMAXPROCS:-}" ]]; then
++    if ! command -v ncpu >/dev/null 2>&1; then
++      # shellcheck disable=SC2164
++      pushd "${KUBE_ROOT}/hack/tools" >/dev/null
++      GO111MODULE=on go install ./ncpu || echo "Will not automatically set GOMAXPROCS"
++      # shellcheck disable=SC2164
++      popd >/dev/null
++    fi
++    if command -v ncpu >/dev/null 2>&1; then
++      GOMAXPROCS=$(ncpu)
++      export GOMAXPROCS
++      kube::log::status "Set GOMAXPROCS automatically to ${GOMAXPROCS}"
++    fi
+   fi
+-
+-  GOMAXPROCS=${GOMAXPROCS:-$(ncpu)}
+-  export GOMAXPROCS
+-  kube::log::status "Setting GOMAXPROCS: ${GOMAXPROCS}"
+ }
+ 
+ # This will take binaries from $GOPATH/bin and copy them to the appropriate
+diff --git a/hack/make-rules/test-e2e-node.sh b/hack/make-rules/test-e2e-node.sh
+index 43dde0c740f..49e3e04ac71 100755
+--- a/hack/make-rules/test-e2e-node.sh
++++ b/hack/make-rules/test-e2e-node.sh
+@@ -18,6 +18,7 @@ KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/../..
+ source "${KUBE_ROOT}/hack/lib/init.sh"
+ 
+ kube::golang::setup_env
++kube::golang::setup_gomaxprocs
+ 
+ # start the cache mutation detector by default so that cache mutators will be found
+ KUBE_CACHE_MUTATION_DETECTOR="${KUBE_CACHE_MUTATION_DETECTOR:-true}"
+diff --git a/hack/make-rules/test.sh b/hack/make-rules/test.sh
+index e9074678a8f..4aa72730d83 100755
+--- a/hack/make-rules/test.sh
++++ b/hack/make-rules/test.sh
+@@ -22,6 +22,7 @@ KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/../..
+ source "${KUBE_ROOT}/hack/lib/init.sh"
+ 
+ kube::golang::setup_env
++kube::golang::setup_gomaxprocs
+ 
+ # start the cache mutation detector by default so that cache mutators will be found
+ KUBE_CACHE_MUTATION_DETECTOR="${KUBE_CACHE_MUTATION_DETECTOR:-true}"
+-- 
+2.41.0
+
diff --git a/sys-cluster/kubectl/kubectl-1.28.0.ebuild b/sys-cluster/kubectl/kubectl-1.28.0.ebuild
index ffa067f3b06c..e535262df193 100644
--- a/sys-cluster/kubectl/kubectl-1.28.0.ebuild
+++ b/sys-cluster/kubectl/kubectl-1.28.0.ebuild
@@ -18,6 +18,10 @@ BDEPEND=">=dev-lang/go-1.20"
 RESTRICT+=" test"
 S="${WORKDIR}/kubernetes-${PV}"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-make-gomaxprocs-install-optional.patch
+	)
+
 src_compile() {
 	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
 		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
diff --git a/sys-cluster/kubelet/Manifest b/sys-cluster/kubelet/Manifest
index eef2c49b275a..1d49cb12657f 100644
--- a/sys-cluster/kubelet/Manifest
+++ b/sys-cluster/kubelet/Manifest
@@ -1,3 +1,4 @@
+AUX kubelet-1.28.0-make-gomaxprocs-install-optional.patch 2835 BLAKE2B 964759a3af2afced4d5ff2ed59b1e94c2912a85ce560f3dac4e0ea59b1e308ee7b35f6d5435524e6e407d2032a1bd8783fb0b4787dbb22cfa9ace9ff723b1c40 SHA512 88b369bfda14eb03f9957f4b9105a565fa6f821e20b4743941f12f7e5b005cdef4184e0c09d54102b811e08a27f1725b0dc36e29e331f8802b7eaf52db1ce00f
 AUX kubelet.confd 58 BLAKE2B 5c01a2146beacf3a024f312d1bd3422055887ba48d5d869a32a2be99585f260f9d9b9946e57290345e0d57870f7d4509892c53fe4c7a63b0111b1fa8f464daf0 SHA512 2ae3bbc8a66da644b59d7f753294ad43d5675edbe2e4769b91d7c988d0eeffd5b4209a10650ad937f9698b1b6050279d448c75274815a6b348ad2023f2fef08e
 AUX kubelet.env 547 BLAKE2B db9144a0e155450f08a665700edbb05f3fa093d209f72320fdbcd54756afb857928a1d5828e79d3a54f958ddc41e8129a1489927115d1fc7712cd682699d3ac6 SHA512 3359ef337a27ea41b3db216808bb0baa571916bab37f913da79e0c9270199d75cfbb1a5730739b9207525e6027e38e8467e4c0b98567499d36130804f218e006
 AUX kubelet.initd 520 BLAKE2B 50edf888fed020a02f099189f8a5bdde54a4bfa2a00585489864c262d90ad8347763753f99eccec6fe6670c6fa016674dee4dea0fa838991abb503db97bd983a SHA512 c6b9bcdb6d063728ef2e9d67673ea29c0972e70e446be9c020cfd277a7bbcfc955a5ad7a72ab0ca1579a4d04b0fc4ac71ee20e6dba9d9a9a9099efcad3c139d0
@@ -20,5 +21,5 @@ EBUILD kubelet-1.26.6.ebuild 1030 BLAKE2B 2f979623733f7f34b8f562572e1ac9b39c67d0
 EBUILD kubelet-1.26.7.ebuild 1030 BLAKE2B 2f979623733f7f34b8f562572e1ac9b39c67d0ddb72ea366abd2e8eb7dc9fbbf655707374c479fdeb183739f06ed75bcf00732ab58eaed86db7c7c1db9ff10ef SHA512 0efd37f41d1e79af8e7febd651e532e17b3c04b1462d016131d4d5f75766928ed7b43bbef7a7728a3af4b0e6a948684ac63bc054794d2f6cfa32bbaddd46aa90
 EBUILD kubelet-1.27.3.ebuild 1030 BLAKE2B e268e8d6e17c449e1e1f3b634b01a1ba8909454f796c4a96f28657f8122e70c1980b32cf3287d3668b3efb8d6d7cd1c5b06d2761dcba368431e772c371d30430 SHA512 a4c62f700caaba247646ce4c5f5d23e832d1d0334b5ef406e97e684833482e66b93b3951949fb74d75533e7c8a932fc261adaf52dd7a39abc35eb14a26a7e777
 EBUILD kubelet-1.27.4.ebuild 1030 BLAKE2B e268e8d6e17c449e1e1f3b634b01a1ba8909454f796c4a96f28657f8122e70c1980b32cf3287d3668b3efb8d6d7cd1c5b06d2761dcba368431e772c371d30430 SHA512 a4c62f700caaba247646ce4c5f5d23e832d1d0334b5ef406e97e684833482e66b93b3951949fb74d75533e7c8a932fc261adaf52dd7a39abc35eb14a26a7e777
-EBUILD kubelet-1.28.0.ebuild 1031 BLAKE2B 73020b5c8a932f632fda1f65b566bf79adca8e448ccdb20bc73167c01cc524673b4dd81e7d07f0cf135803ec994d20e2e8f4d0138c7a890b38b7791e4c9e720b SHA512 6eec003a78eac972c8f01f1228a2282ba632e8d62317706f1bafc4f1213b548cf479a551b75835d01dbee9679bfb5d7c3f346db1b98ba4fcbabeb343876192a1
+EBUILD kubelet-1.28.0.ebuild 1103 BLAKE2B f32dd6ef29016fbebe25e9c061594f822fc83808d224d47b224dac2d2ecaed191b2884f0133d8a0d166a6201244e8d6cc2da69ba9303d8bb48eb1289521bd6fe SHA512 c64a03be394d7431de34653473bfec0c87e1e7d9610c8be51b4a13759dacf486fcabbd488db1b819975f5b2cb302e544b7338c2b3d7c7498a47d4b74897016d1
 MISC metadata.xml 335 BLAKE2B d43f79bc4ff9bad895fc1c0617329cbc07e05d0e7eb8d251688c1f46c61e3360639e43d92f72e9eef0ba5b235f33f2b3ad1bf0f783854b5f9426af43d81c3502 SHA512 de4bf01133d4a117ea2bd21936d670598a30b89dca290a867c3ec4e8ed739aec4867c42504210291ed84add21e1aa100d7d2b565e4351c43bdf2fa906b72a4cb
diff --git a/sys-cluster/kubelet/files/kubelet-1.28.0-make-gomaxprocs-install-optional.patch b/sys-cluster/kubelet/files/kubelet-1.28.0-make-gomaxprocs-install-optional.patch
new file mode 100644
index 000000000000..1a8935b31c9c
--- /dev/null
+++ b/sys-cluster/kubelet/files/kubelet-1.28.0-make-gomaxprocs-install-optional.patch
@@ -0,0 +1,78 @@
+From cce3f6ffa796ea416021b0d62567a3f52b979567 Mon Sep 17 00:00:00 2001
+From: Jordan Liggitt <liggitt@google.com>
+Date: Wed, 16 Aug 2023 09:33:02 -0400
+Subject: [PATCH 2/2] Make gomaxprocs install optional, limit to tests
+
+---
+ hack/lib/golang.sh               | 25 +++++++++++++++----------
+ hack/make-rules/test-e2e-node.sh |  1 +
+ hack/make-rules/test.sh          |  1 +
+ 3 files changed, 17 insertions(+), 10 deletions(-)
+
+diff --git a/hack/lib/golang.sh b/hack/lib/golang.sh
+index 66772f08a81..983ff368e25 100755
+--- a/hack/lib/golang.sh
++++ b/hack/lib/golang.sh
+@@ -556,20 +556,25 @@ kube::golang::setup_env() {
+ 
+   # This seems to matter to some tools
+   export GO15VENDOREXPERIMENT=1
++}
+ 
++kube::golang::setup_gomaxprocs() {
+   # GOMAXPROCS by default does not reflect the number of cpu(s) available
+   # when running in a container, please see https://github.com/golang/go/issues/33803
+-  if ! command -v ncpu >/dev/null 2>&1; then
+-    # shellcheck disable=SC2164
+-    pushd "${KUBE_ROOT}/hack/tools" >/dev/null
+-    GO111MODULE=on go install ./ncpu
+-    # shellcheck disable=SC2164
+-    popd >/dev/null
++  if [[ -z "${GOMAXPROCS:-}" ]]; then
++    if ! command -v ncpu >/dev/null 2>&1; then
++      # shellcheck disable=SC2164
++      pushd "${KUBE_ROOT}/hack/tools" >/dev/null
++      GO111MODULE=on go install ./ncpu || echo "Will not automatically set GOMAXPROCS"
++      # shellcheck disable=SC2164
++      popd >/dev/null
++    fi
++    if command -v ncpu >/dev/null 2>&1; then
++      GOMAXPROCS=$(ncpu)
++      export GOMAXPROCS
++      kube::log::status "Set GOMAXPROCS automatically to ${GOMAXPROCS}"
++    fi
+   fi
+-
+-  GOMAXPROCS=${GOMAXPROCS:-$(ncpu)}
+-  export GOMAXPROCS
+-  kube::log::status "Setting GOMAXPROCS: ${GOMAXPROCS}"
+ }
+ 
+ # This will take binaries from $GOPATH/bin and copy them to the appropriate
+diff --git a/hack/make-rules/test-e2e-node.sh b/hack/make-rules/test-e2e-node.sh
+index 43dde0c740f..49e3e04ac71 100755
+--- a/hack/make-rules/test-e2e-node.sh
++++ b/hack/make-rules/test-e2e-node.sh
+@@ -18,6 +18,7 @@ KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/../..
+ source "${KUBE_ROOT}/hack/lib/init.sh"
+ 
+ kube::golang::setup_env
++kube::golang::setup_gomaxprocs
+ 
+ # start the cache mutation detector by default so that cache mutators will be found
+ KUBE_CACHE_MUTATION_DETECTOR="${KUBE_CACHE_MUTATION_DETECTOR:-true}"
+diff --git a/hack/make-rules/test.sh b/hack/make-rules/test.sh
+index e9074678a8f..4aa72730d83 100755
+--- a/hack/make-rules/test.sh
++++ b/hack/make-rules/test.sh
+@@ -22,6 +22,7 @@ KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/../..
+ source "${KUBE_ROOT}/hack/lib/init.sh"
+ 
+ kube::golang::setup_env
++kube::golang::setup_gomaxprocs
+ 
+ # start the cache mutation detector by default so that cache mutators will be found
+ KUBE_CACHE_MUTATION_DETECTOR="${KUBE_CACHE_MUTATION_DETECTOR:-true}"
+-- 
+2.41.0
+
diff --git a/sys-cluster/kubelet/kubelet-1.28.0.ebuild b/sys-cluster/kubelet/kubelet-1.28.0.ebuild
index cd8a1735b583..54fbe2ed430d 100644
--- a/sys-cluster/kubelet/kubelet-1.28.0.ebuild
+++ b/sys-cluster/kubelet/kubelet-1.28.0.ebuild
@@ -19,6 +19,10 @@ RDEPEND="selinux? ( sec-policy/selinux-kubernetes )"
 RESTRICT+=" test "
 S="${WORKDIR}/kubernetes-${PV}"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-make-install-gomaxprocs-optional.patch
+)
+
 src_compile() {
 	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
 	emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index f2b65ee0a3d7..5e2a05118ba4 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/mold/Manifest b/sys-devel/mold/Manifest
index a71616d914ad..61204b5ae3e5 100644
--- a/sys-devel/mold/Manifest
+++ b/sys-devel/mold/Manifest
@@ -6,6 +6,6 @@ DIST mold-2.1.0.tar.gz 9278811 BLAKE2B b31e13f92177553adf5069cf35c8c75c7bc28f0af
 EBUILD mold-1.11.0.ebuild 2168 BLAKE2B e6da026cd317d9bce59fb0c802f11571107df36310b4c69c9a1e01386bd989c7c0c785b23eaddee62447ac1aa472096b63156e07640ec7f978c49f08b1c8f765 SHA512 ac3d33eaa80eee576bb4151664bad21647d6517f97a30ac3448a4294f1f92b86a48dd82af340d499510dbca9b84d1960874223ce0c3e229c34efdeacfc4659dd
 EBUILD mold-2.0.0-r1.ebuild 2217 BLAKE2B c98fe92a85afc075ff6cb2664b060c0b39ef0d69707e363760c62871376bf82f6effd4402716108e3c6cdae49f8734c821c675a244cbec96f092aeb681ef924a SHA512 0144da3fd4bed3cd338b18c6700db4c1787911546fbc8e999b456856770a118561a21fa9b882ce441246ec7705e06590c7f52a8ff263a5fe3cf1026b73d1cdc4
 EBUILD mold-2.0.0-r2.ebuild 2262 BLAKE2B 36664776ccff03553da6d71885104666f3b91be07ab8f4f62c96fc7b116d0499172c9cc43f3b05f5fb2bd6b24f80af93ce0e916ceb7ff6dcefb952c4496cfc16 SHA512 48284ddd900756dcf17cb6e8d7729f7fc45a5019d6760522afcfc6c9e6738df37cafd5e68566569f9465e3288de8f6b4854a9d85d2fc48a0b106a4e3a994e5b0
-EBUILD mold-2.1.0.ebuild 2163 BLAKE2B 7b745d3286acc49ab2a716ae1ed507d730e772003e4a6707d8d26eb926da1baecf79ef464a0129cf02c1b99df04efbfc68812541bda16acfff0a94dfa01788a8 SHA512 88f9147e3e84e9cf722b99e1f92959e0c7867e590211c27708346517de89aa179b25d166de084d6aec74228dd7e216fec86f3e6532b8887e3705c3896ec9f771
+EBUILD mold-2.1.0.ebuild 2170 BLAKE2B 0891815449af55730ec4e7ea9b024f00a37c527124c3c089e154750842d1db85e40efa9167a226413b6cd0dd190a4d44c8b43de41ce32a1d14932a672a238461 SHA512 4a1373a4a9c170fd20fdc5d69f59175688939ffe8ec6160b6d5d93e17f08007025f13222b2295548e44ffb6f9334ece69b028510e395829ebe85ff885b4a4fe5
 EBUILD mold-9999.ebuild 2163 BLAKE2B 7b745d3286acc49ab2a716ae1ed507d730e772003e4a6707d8d26eb926da1baecf79ef464a0129cf02c1b99df04efbfc68812541bda16acfff0a94dfa01788a8 SHA512 88f9147e3e84e9cf722b99e1f92959e0c7867e590211c27708346517de89aa179b25d166de084d6aec74228dd7e216fec86f3e6532b8887e3705c3896ec9f771
 MISC metadata.xml 424 BLAKE2B a1c0cbdcb86c323fa1e6143c9665ec548f7713e74002a25b2fc26c51b60dae00922d3448a5aaecd5027a8cb026a681386ca7dea90657a3e10b25fb194dafc0d3 SHA512 1adc934e78ca0210743a1aa7479ebc4b5ea0b66a348c4408423460f02b404b885d3a8eca6e89ea8ac53ac9c76e85116965f1eef79e3f3e1f0451c8cf5ce0dfd6
diff --git a/sys-devel/mold/mold-2.1.0.ebuild b/sys-devel/mold/mold-2.1.0.ebuild
index b355518cedf4..719308108edf 100644
--- a/sys-devel/mold/mold-2.1.0.ebuild
+++ b/sys-devel/mold/mold-2.1.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/rui314/mold/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
 fi
 
 # mold (MIT)
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index fb5d17552aaf..4ff3b41d85e7 100644
--- a/sys-kernel/Manifest.gz
+++ b/sys-kernel/Manifest.gz
diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 0b1dc1e26236..279d0a42a8bd 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -6,8 +6,12 @@ DIST genpatches-5.4-261.base.tar.xz 6100368 BLAKE2B 1333f1a5aae4faabe031192eee4e
 DIST genpatches-5.4-261.extras.tar.xz 1812 BLAKE2B fcc06d16147422b0ea123b116644539b3527e44bca78d46cf5795d44e42575c7017ec3b5c9dd566c5523e3b23f14b4d817846502d4ef353180c3a3c79caa4c2b SHA512 5cc879a4333aa3e162a5da4bf118a12ae5694c2fb98f11f9e1eee57f91b707974d735c290790942a14b2df5bdf092f58d1cf03f7058aea6f8e588700ec185dbf
 DIST genpatches-6.1-52.base.tar.xz 3173368 BLAKE2B 429b5bc3af457d91b9c178737e573d150e337859c0f07a25043c86b834829e749b92c57fa2d80b2acfe9864f916ebe77c830249be23391d6553f5469b1934708 SHA512 0f003893b6c24fa9bb79722d6d83edb25e77fff11a526f86052980ee175d6dd599784cfcc7ad82055de9663a178fb9de38a766cfe61fe17fbde696a5292f023f
 DIST genpatches-6.1-52.extras.tar.xz 3808 BLAKE2B 6a67986309840e14bd4759c0aabb1af5d6b3653660d1a12d8706567470a28b3a56d5a09cbdd3df9068bed7a845206b5a81fca3a1be0ffe7122579d9b3ff63401 SHA512 0476ec7af5906dfd4dd48c96799568f8ed7d24d7d43717979e03a16219b732461e0afc7af1c5a4f528a08c4b5c2c35d249e81be1c6d0f854f7993da2e0c7aad3
+DIST genpatches-6.1-53.base.tar.xz 3225656 BLAKE2B d701a2920347788f343b14babfdd113b62b78218e8b19a5ee4f36d76b8571e697d9f3a3a9aa8364344e4d0ccaa60eccaab27b24036504b3ea1d011c4492a1eb2 SHA512 10aed454a5d7d7a763ec3008ceb17e30d989abcd76e1ca54d47b8946cf20a9de5991e09158a4e0b182ba58b41760a8de3bbd1979ff23fa9a84aa094c5c31094d
+DIST genpatches-6.1-53.extras.tar.xz 3812 BLAKE2B ad3b65af5b05947d20e1ecaaabd7304261310162c9ef679cba698712af55e7bc5b18ab1b69613a4442e38f362e34a9a1699408decd9016cfb4543c33ac97468a SHA512 a813b49a8af0cf17e48a88475731b6349dfa49af90e16037528eebd55a80b3ecdb52805547a56003a463b00a4302a779c8fff23970d73f3393cde7f205e92d32
 DIST genpatches-6.4-13.base.tar.xz 708424 BLAKE2B 35ac10ca68775c9e9c5668e9d4a8764c6cc583f8ecbade54b6f1bb1e4ca41fee1d48f5e782a6ba271d0b2f710889aaefdb13c9e4bb437d4f91b05a3d7e464a2f SHA512 5c3fa0b3c09b5298b4bf6542960e07d9c63875cc84821bbd6ef70556868f33a6aece33b9882b97cb9e32536ebfa536a71b9113e95b1b72b80c4f1348434e43c6
 DIST genpatches-6.4-13.extras.tar.xz 3696 BLAKE2B e2e9014e497de63eae5dc5d644e1ef27fc2fda99379b881af096874bf25f269212bbd811781f3fc63fa896285e78cb9c41717392e59bfa62c039dce58ed11f86 SHA512 ffa3f9043767ae00e18b1d5313df6312d179b0d9e2b224d7b1097cbdc9c48f56615a36425ae1fd00680caed085420e438deb4fd331a37cd4397a814e542d6fa0
+DIST genpatches-6.4-14.base.tar.xz 765548 BLAKE2B e1d9bc63a0d8beeeeef9894b264ef4d8078bf57a3548548c08e75e699420731cdfdcf9df69ab6844a57563f24d806c96c27c9a158a7f6a1afa72bf8328ce60bc SHA512 5ee620824e0c17146add7f9bfd1d3444e5eb497444c040dc0f06a7ba247e81fc30eb8c92896ed359c7192690f24a1c45bb3b767bc408e9430ad9c7095ca2be40
+DIST genpatches-6.4-14.extras.tar.xz 3700 BLAKE2B e72b1378e2c05049a5cb981e7bb09e0d448fd5e1219393d7b552c1c6de2ed557c395a3f341946bd142d8df45b61d12a13ea2424325d5a98045063e0cabe7584f SHA512 62149b4cdce5bf1a0567557790cddc1248dd927f31774b65848f00075bf1a0179939c292c79181af0a39132321f056541919beb30c6a4d46f57286886c95c545
 DIST gentoo-kernel-5.10.191-1.amd64.gpkg.tar 66365440 BLAKE2B f7086ca26f08468b754b0cf9ce715ed763d2866ebc8ea322fb51fa2ab5146f1c7741f68b82d52a7d54442cc36cd5a114132f9ccb0809e8d0ab0da022742a48d2 SHA512 0f4918273c70f06756c19cd2c7738176695aba65eeaa7846aa6773d97e6d3ac4302be0328926f1a217135d21e2660e6e4124ced7f2304c0f1a408ad2561b24a5
 DIST gentoo-kernel-5.10.191-1.arm64.gpkg.tar 59392000 BLAKE2B feee11f6bc6148ca0a65077a33cb1736fe2d588037bfada383bff1ca9ca7ea71d6f3248a91cc9b152d87a3fb9580177a68b3748c53e2bb6e0309c7a4b9e39df3 SHA512 bfe38e92e445719daddc4fd87b717c652a0fbc5b3cf3fdaab40c1014229a2bf5b504642c21e5bb478d56742c56100271a7433f113c7c231382d2f226a609f837
 DIST gentoo-kernel-5.10.191-1.ppc64le.gpkg.tar 54947840 BLAKE2B eab70963c60d1d668ba562652b73bf47760d326ea2cd3fad8cbf91e75a9329283b9af38ee7391c4bc887c32464a6c8376844135231d155eb11916c926f8c263a SHA512 58a8701b46878dd470a4210f96f65bc85aabb4c8b29aed5d1d61eff2efb1f851c38b648c50afa7cc164406ccdf8ae3bc673f73857903a17c19229f77c8e885f7
@@ -24,10 +28,18 @@ DIST gentoo-kernel-6.1.46-1.amd64.gpkg.tar 76861440 BLAKE2B e9d5b7c9017adc512275
 DIST gentoo-kernel-6.1.46-1.arm64.gpkg.tar 69488640 BLAKE2B a72e190c5455f087b811ad68eb818a67efae7be3a2f7f2dca41c1ad4397c1b5f45db58f02360bf05516b61e871e0f4cdd1daa0c0ea3c3aaa0d40f88673e890af SHA512 ddcba28035f1b084097cfb3b58bb90a37e29d6abe3043d3c5464363da095750a9675e287641fd782da29ee02077bfbaa5ee784f579df09a90b01728b9c697230
 DIST gentoo-kernel-6.1.46-1.ppc64le.gpkg.tar 62832640 BLAKE2B a8e45f7ecde91ed96d440e4261ef00fd7e27d4dc50d5f92d9b530d2d1f6438e010c76caea95e6d5015c617fe71cae541c52cfa747ba7388b4ccafd592373cf75 SHA512 60295b457d4bda5dfdfceb1a28049522238c983ec951eb0b46c42192408574131d82eeff515e97862160050b4b2f77bdd1799458a238d75f724f8d652c1758d0
 DIST gentoo-kernel-6.1.46-1.x86.gpkg.tar 66232320 BLAKE2B 427a224134aba2008d3da27f31f86c060132715c9e1de3f9f77be626d1ebfa3aacf63e891428a755ca81e03a7237099211ba8b9e2959313197394bffb01462f8 SHA512 a5ec7c7148cb650370c73a50b453c99c61920ff06df1b30f67644f6b3b4297866981cef15b88016b8cdfcc97eeaaf91020009be1a8892e0fdcd9b696ac566acc
+DIST gentoo-kernel-6.1.47-1.amd64.gpkg.tar 76830720 BLAKE2B 913af5016feb6b2431b0f1b01877eb3e67f90e72a7c250ce725d2a5fc88c6b074aa8221214d3220cf138dc1ca83c26af3342d20dcfea645b7a4556310503573d SHA512 96dd6495e4f148bb9216f88178c033cfcdd7aa78a2849e09342bd9d161e7b388753fd36c05c2ed7569fa9ac89ac2c0715b1d8de3678a57687155c80e8795417a
+DIST gentoo-kernel-6.1.47-1.arm64.gpkg.tar 69498880 BLAKE2B b607aaffb540ab776e11448ae623dc433366a39de99d64fc568b7b0905b4f329e7aea6f4bfd4b6cbc4334c2712b2d86126976692677e814a0ab4e9e39d87923b SHA512 02b11a64e78acec9cc01fdc41339cad40564eda161285cf924c4c3b7576cd07979992a8b7588134583c58b4e6ae24cc60ce37946b80056653579be93fcbca6e3
+DIST gentoo-kernel-6.1.47-1.ppc64le.gpkg.tar 62853120 BLAKE2B 139cc49ab4a51f75d3f4fe525e1d6b7174059775f754028710ef5c1614cca38ba70583cbe6e60f5bad80f20c085164474791855d49328c3eab90c7a94875ad40 SHA512 573c314515651b127e8ab74795dbfdd6e812b88849eb454e4e600c5bc30beb2102a17e4b89e369afe05e52cf7e11e7e6f8d597da49e75f2bb5a1b9213a9d9fd5
+DIST gentoo-kernel-6.1.47-1.x86.gpkg.tar 66242560 BLAKE2B 8be8dc33b458c51ee6adbab3e6679ad9c0b4547ef096d8cd12e0a7c0619eb1773e7b8ef16d2c3dd5de38886012ea1bd74d001e2c3af0a2618d1cae95fbd1c25c SHA512 88d556326f2634cf136a32f9b977783b85b99dc440cf3875cfb60d7b070d4cca5f75e2c60496805979333df8db9d74e2ba01683007427375eff4464b5c942259
 DIST gentoo-kernel-6.4.11-1.amd64.gpkg.tar 84060160 BLAKE2B 53cb5140f149d9efe604a5ec1a631557b66a0d970fb4b44c20e602f0a430e1c57f29d3f532e56b249583e0cdedd05eefeb788f5773a7ec8a55761f5975b70625 SHA512 9eae8e36cd2eca63c6fe0133c34be5a2f13c006caae596e75a4e97ab7d0a31553f625b31e3a307402ad1971ab0d8407b6684908b4ea54d9ae096c59745e745c5
 DIST gentoo-kernel-6.4.11-1.arm64.gpkg.tar 72960000 BLAKE2B f023f2cf059ebe741840a79ff03f5c869f33b143bba229b1499e8edc02aa4e5b28707eb8f21979302da0a747f75db5c8dfb0d545f0fccc081dd64ee5d53924c0 SHA512 dc5e9d29e270be21adf2dd27f687d3a43fe0a9ed56e81c6fda2a4d05582935827e814f869b14581692fb46127e0e201f779eedd0757cba2b5fca31be51a1b64c
 DIST gentoo-kernel-6.4.11-1.ppc64le.gpkg.tar 64655360 BLAKE2B 16702f5aef82f29e76e7ff583903e63c96defdc30efca67f5c629904c7cb3febc39c1bdda16764c4a0c12a60eca97415cff9efe0845b95f6a2ee54f4170563b2 SHA512 9954161681fb69761e5c36db2d357cd73712f8af2f9dd31cc6437bece50e94567976f5d703d3e59c19fcdb82a85e65424a7fa4a67c10d7aa1f1ccd89ce002c97
 DIST gentoo-kernel-6.4.11-1.x86.gpkg.tar 67563520 BLAKE2B 6f95c97b631d2606509b77caa627a4b263a423eb6d9a5a7edaf858c79013030653b497e49c76c582c3420ee40e543b4f75bca57e9ba4f36284219043d0f76db6 SHA512 37eee9fed9eb00c28705233060004b854012edab9529c6ca7a91a825d56418db59234e4f2fd07c61c1791f653246183f5ecd9cc3c161c3b36589242eacaca712
+DIST gentoo-kernel-6.4.12-1.amd64.gpkg.tar 84060160 BLAKE2B bc6e98110cc467d47fa8e1152ba0c822f11b2f9f16de81138ab81a850648383a8d27dfca5772b59104a9272fccffdeed98f81b4d7a8657627b0d639d183445e8 SHA512 dc7334c9951b53cd8aac12e1e2cde718765f9964c784f0efcb62895c2d26a7f1b76bd8d664aea1239cf61f70c2207976df12d4ef00d5cbb9008049f465ebd68c
+DIST gentoo-kernel-6.4.12-1.arm64.gpkg.tar 72960000 BLAKE2B ac0962ce90e566c48364e9a00bb5108c209f77a606f2954e8be8069a688c163a978f496b9ec5e32e3cca0bc9b6b73f5d1645f2881234a67946ddcfae0ff904ed SHA512 16d9f518ada039d6bb16d3e2fb9c3ff557c64bfca3c9a8900125c9431e8d3f18e47a98156e317d5776fcc5aff873d3ee2cc9357a294f03d5b279206bfa7545e0
+DIST gentoo-kernel-6.4.12-1.ppc64le.gpkg.tar 64665600 BLAKE2B 6a74a7747dd0a693e5e9256243b25de82f4800f57aae59546126c275529043147fac165600aac5cf8fc2ada703d7362237068c96a639ffc3af358654a89f7409 SHA512 6cab43585f1c4b10850b9fa8dc09abe255f0c8c41690d21d9536d1a5e68cec0d8bb3896c6357855acb1ab7184cb8327a14ed3de725eee26edb23672a0424ddb8
+DIST gentoo-kernel-6.4.12-1.x86.gpkg.tar 67563520 BLAKE2B 9c0b734586f14da8e9693a990283c29773d04df19c008fcaecc2e481a6a27ac8976c28062bc3788d4cb66f716a68e85d979a45e8395fc2d01559c932510d98a3 SHA512 f2c3f775e5bf37483bf4cb71c292bf215fa8d28eff4aa91049f1397f742a23bbfe63d6a6e08be192ddb82ab0fac9b7c91ec7ab9fbf5b640318d115f8960543b4
 DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
 DIST linux-5.15.tar.xz 121913744 BLAKE2B 3921274b23f7938abdf3ed9334534b4581e13d7484303d3a5280eddb038999aaa8b836666a487472d9c4a219af0f06b9fecccaf348fb5510ab8762f4ef4b7e83 SHA512 d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a
 DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
@@ -37,5 +49,7 @@ EBUILD gentoo-kernel-bin-5.10.191.ebuild 3025 BLAKE2B 7fafb438db9b4e8c5d06545a3c
 EBUILD gentoo-kernel-bin-5.15.127.ebuild 3025 BLAKE2B 95e4eb0f4309e4141a863875ec46ea241e6e9e96260bdd3804400e11d32dd2b12bce79c1c66e0abbe6533cc9c9abf0f19eceabe46885b6feeac986287fec0070 SHA512 1f22d7d6843659d872c9ea6bd6eda48f99841e95c12aa723020633cdf30564f43e4aa63e3433f0598930230a03d2c27a1714d2b865a548edfc5725cf9f99176f
 EBUILD gentoo-kernel-bin-5.4.254.ebuild 3024 BLAKE2B 1a00a8ccac9f12f20c9f3d39572af89a077c3b3dd424133197f35123ee41804588b9763008011c3ee33f269c49eadefcb4d31c01371685845bcfd9fbd189ff78 SHA512 3fb6a4b6ec491d6bb4ad19c37dc18e40565d7d6ee248563c219a43323c263ff1fccb0863727258c56c7bb6f2397cfe968eb974a1282fa3a685a6ed0c3c5247dc
 EBUILD gentoo-kernel-bin-6.1.46.ebuild 3025 BLAKE2B 95e4eb0f4309e4141a863875ec46ea241e6e9e96260bdd3804400e11d32dd2b12bce79c1c66e0abbe6533cc9c9abf0f19eceabe46885b6feeac986287fec0070 SHA512 1f22d7d6843659d872c9ea6bd6eda48f99841e95c12aa723020633cdf30564f43e4aa63e3433f0598930230a03d2c27a1714d2b865a548edfc5725cf9f99176f
+EBUILD gentoo-kernel-bin-6.1.47.ebuild 3029 BLAKE2B 7e344f2c9619826058ab1e7437837bb2307480c9b5be1e52638b4d30cd458ed59f7053e896ab8fb7c02965a1df0f10f2d67fda031e2ee8764460134592585a2b SHA512 eb0c10f46c137cf2a98f606b0bd49fbd43920136bde57d445bc2feefd1d1ec57212b651510b9ad6a7ea37cef2d02e004217e136ed10ca23b39c3791162e5d8f6
 EBUILD gentoo-kernel-bin-6.4.11.ebuild 3029 BLAKE2B ca5881dd1f012cb7003cd391c8581c214724c328f20f50f4a8d248a80b831f459f67da6da7203a61ef67fb91db4c585da622b7a532153401856c0530322ccdd7 SHA512 494035de5e3040f27dafa7ceee4915486b49065c0cd451bacf14843bab220bfa214a73b3b857706cf45db997ae7c22d2e03d460efb2087193de94b879d8ba3c3
+EBUILD gentoo-kernel-bin-6.4.12.ebuild 3029 BLAKE2B ca5881dd1f012cb7003cd391c8581c214724c328f20f50f4a8d248a80b831f459f67da6da7203a61ef67fb91db4c585da622b7a532153401856c0530322ccdd7 SHA512 494035de5e3040f27dafa7ceee4915486b49065c0cd451bacf14843bab220bfa214a73b3b857706cf45db997ae7c22d2e03d460efb2087193de94b879d8ba3c3
 MISC metadata.xml 353 BLAKE2B cd022bd01b289ae703ae6ef6c2539fcfce833206c55e328ba02fc42b360d60f76b1920927b259dbb199724e6d3e7b0f68ba2044680d962d3cd03a973475582ff SHA512 10b10fd24801843108a71ca7d0c27514965b0a15a60da4d9b521fc41493448a1b1685ae3278dbd46cede0d069e51dede402d2c1448c8ae6a7fcfce8acf415bf3
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.47.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.47.ebuild
new file mode 100644
index 000000000000..83c6a5e4fa8f
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.47.ebuild
@@ -0,0 +1,127 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-install toolchain-funcs unpacker
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 6 ))
+BINPKG=${PF/-bin}-1
+
+DESCRIPTION="Pre-built Linux kernel with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.amd64.gpkg.tar
+	)
+	arm64? (
+		https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.arm64.gpkg.tar
+	)
+	ppc64? (
+		https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.ppc64le.gpkg.tar
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.x86.gpkg.tar
+	)
+"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+BDEPEND="
+	sys-devel/bc
+	sys-devel/flex
+	virtual/libelf
+	app-alternatives/yacc
+"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	cd "${MY_P}" || die
+	default
+}
+
+src_configure() {
+	# force ld.bfd if we can find it easily
+	local LD="$(tc-getLD)"
+	if type -P "${LD}.bfd" &>/dev/null; then
+		LD+=.bfd
+	fi
+
+	tc-export_build_env
+	local makeargs=(
+		V=1
+
+		HOSTCC="$(tc-getBUILD_CC)"
+		HOSTCXX="$(tc-getBUILD_CXX)"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+		CROSS_COMPILE=${CHOST}-
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		LD="${LD}"
+		AR="$(tc-getAR)"
+		NM="$(tc-getNM)"
+		STRIP=":"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+
+		# we need to pass it to override colliding Gentoo envvar
+		ARCH="$(tc-arch-kernel)"
+
+		O="${WORKDIR}"/modprep
+	)
+
+	mkdir modprep || die
+	cp "${BINPKG}/image/usr/src/linux-${KPV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/${BINPKG}/image/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"${BINPKG}/image/lib/modules/${KPV}"
+}
+
+src_install() {
+	mv "${BINPKG}"/image/{lib,usr} "${ED}"/ || die
+
+	# FIXME: requires proper mount-boot
+	if [[ -d ${BINPKG}/image/boot/dtbs ]]; then
+		mv "${BINPKG}"/image/boot "${ED}"/ || die
+	fi
+
+	# strip out-of-source build stuffs from modprep
+	# and then copy built files
+	find modprep -type f '(' \
+			-name Makefile -o \
+			-name '*.[ao]' -o \
+			'(' -name '.*' -a -not -name '.config' ')' \
+		')' -delete || die
+	rm modprep/source || die
+	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
+}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.4.12.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.4.12.ebuild
new file mode 100644
index 000000000000..3cd8c6516903
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.4.12.ebuild
@@ -0,0 +1,127 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-install toolchain-funcs unpacker
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 2 ))
+BINPKG=${PF/-bin}-1
+
+DESCRIPTION="Pre-built Linux kernel with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.amd64.gpkg.tar
+	)
+	arm64? (
+		https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.arm64.gpkg.tar
+	)
+	ppc64? (
+		https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.ppc64le.gpkg.tar
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.x86.gpkg.tar
+	)
+"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+BDEPEND="
+	sys-devel/bc
+	sys-devel/flex
+	virtual/libelf
+	app-alternatives/yacc
+"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	cd "${MY_P}" || die
+	default
+}
+
+src_configure() {
+	# force ld.bfd if we can find it easily
+	local LD="$(tc-getLD)"
+	if type -P "${LD}.bfd" &>/dev/null; then
+		LD+=.bfd
+	fi
+
+	tc-export_build_env
+	local makeargs=(
+		V=1
+
+		HOSTCC="$(tc-getBUILD_CC)"
+		HOSTCXX="$(tc-getBUILD_CXX)"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+		CROSS_COMPILE=${CHOST}-
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		LD="${LD}"
+		AR="$(tc-getAR)"
+		NM="$(tc-getNM)"
+		STRIP=":"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+
+		# we need to pass it to override colliding Gentoo envvar
+		ARCH="$(tc-arch-kernel)"
+
+		O="${WORKDIR}"/modprep
+	)
+
+	mkdir modprep || die
+	cp "${BINPKG}/image/usr/src/linux-${KPV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/${BINPKG}/image/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"${BINPKG}/image/lib/modules/${KPV}"
+}
+
+src_install() {
+	mv "${BINPKG}"/image/{lib,usr} "${ED}"/ || die
+
+	# FIXME: requires proper mount-boot
+	if [[ -d ${BINPKG}/image/boot/dtbs ]]; then
+		mv "${BINPKG}"/image/boot "${ED}"/ || die
+	fi
+
+	# strip out-of-source build stuffs from modprep
+	# and then copy built files
+	find modprep -type f '(' \
+			-name Makefile -o \
+			-name '*.[ao]' -o \
+			'(' -name '.*' -a -not -name '.config' ')' \
+		')' -delete || die
+	rm modprep/source || die
+	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
+}
diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
index c9c2ed6fe5af..5062a788c440 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -6,8 +6,12 @@ DIST genpatches-5.4-261.base.tar.xz 6100368 BLAKE2B 1333f1a5aae4faabe031192eee4e
 DIST genpatches-5.4-261.extras.tar.xz 1812 BLAKE2B fcc06d16147422b0ea123b116644539b3527e44bca78d46cf5795d44e42575c7017ec3b5c9dd566c5523e3b23f14b4d817846502d4ef353180c3a3c79caa4c2b SHA512 5cc879a4333aa3e162a5da4bf118a12ae5694c2fb98f11f9e1eee57f91b707974d735c290790942a14b2df5bdf092f58d1cf03f7058aea6f8e588700ec185dbf
 DIST genpatches-6.1-52.base.tar.xz 3173368 BLAKE2B 429b5bc3af457d91b9c178737e573d150e337859c0f07a25043c86b834829e749b92c57fa2d80b2acfe9864f916ebe77c830249be23391d6553f5469b1934708 SHA512 0f003893b6c24fa9bb79722d6d83edb25e77fff11a526f86052980ee175d6dd599784cfcc7ad82055de9663a178fb9de38a766cfe61fe17fbde696a5292f023f
 DIST genpatches-6.1-52.extras.tar.xz 3808 BLAKE2B 6a67986309840e14bd4759c0aabb1af5d6b3653660d1a12d8706567470a28b3a56d5a09cbdd3df9068bed7a845206b5a81fca3a1be0ffe7122579d9b3ff63401 SHA512 0476ec7af5906dfd4dd48c96799568f8ed7d24d7d43717979e03a16219b732461e0afc7af1c5a4f528a08c4b5c2c35d249e81be1c6d0f854f7993da2e0c7aad3
+DIST genpatches-6.1-53.base.tar.xz 3225656 BLAKE2B d701a2920347788f343b14babfdd113b62b78218e8b19a5ee4f36d76b8571e697d9f3a3a9aa8364344e4d0ccaa60eccaab27b24036504b3ea1d011c4492a1eb2 SHA512 10aed454a5d7d7a763ec3008ceb17e30d989abcd76e1ca54d47b8946cf20a9de5991e09158a4e0b182ba58b41760a8de3bbd1979ff23fa9a84aa094c5c31094d
+DIST genpatches-6.1-53.extras.tar.xz 3812 BLAKE2B ad3b65af5b05947d20e1ecaaabd7304261310162c9ef679cba698712af55e7bc5b18ab1b69613a4442e38f362e34a9a1699408decd9016cfb4543c33ac97468a SHA512 a813b49a8af0cf17e48a88475731b6349dfa49af90e16037528eebd55a80b3ecdb52805547a56003a463b00a4302a779c8fff23970d73f3393cde7f205e92d32
 DIST genpatches-6.4-13.base.tar.xz 708424 BLAKE2B 35ac10ca68775c9e9c5668e9d4a8764c6cc583f8ecbade54b6f1bb1e4ca41fee1d48f5e782a6ba271d0b2f710889aaefdb13c9e4bb437d4f91b05a3d7e464a2f SHA512 5c3fa0b3c09b5298b4bf6542960e07d9c63875cc84821bbd6ef70556868f33a6aece33b9882b97cb9e32536ebfa536a71b9113e95b1b72b80c4f1348434e43c6
 DIST genpatches-6.4-13.extras.tar.xz 3696 BLAKE2B e2e9014e497de63eae5dc5d644e1ef27fc2fda99379b881af096874bf25f269212bbd811781f3fc63fa896285e78cb9c41717392e59bfa62c039dce58ed11f86 SHA512 ffa3f9043767ae00e18b1d5313df6312d179b0d9e2b224d7b1097cbdc9c48f56615a36425ae1fd00680caed085420e438deb4fd331a37cd4397a814e542d6fa0
+DIST genpatches-6.4-14.base.tar.xz 765548 BLAKE2B e1d9bc63a0d8beeeeef9894b264ef4d8078bf57a3548548c08e75e699420731cdfdcf9df69ab6844a57563f24d806c96c27c9a158a7f6a1afa72bf8328ce60bc SHA512 5ee620824e0c17146add7f9bfd1d3444e5eb497444c040dc0f06a7ba247e81fc30eb8c92896ed359c7192690f24a1c45bb3b767bc408e9430ad9c7095ca2be40
+DIST genpatches-6.4-14.extras.tar.xz 3700 BLAKE2B e72b1378e2c05049a5cb981e7bb09e0d448fd5e1219393d7b552c1c6de2ed557c395a3f341946bd142d8df45b61d12a13ea2424325d5a98045063e0cabe7584f SHA512 62149b4cdce5bf1a0567557790cddc1248dd927f31774b65848f00075bf1a0179939c292c79181af0a39132321f056541919beb30c6a4d46f57286886c95c545
 DIST gentoo-kernel-config-g7.tar.gz 4625 BLAKE2B 72ba0d038ee34ca5eb26d43bd373735aef3a50d02b414993ea05485e49d83d46df98a6cb0f6f3170a8ec0c99b557432fd9a11cbb92ff7c2837625a7f4469831e SHA512 2d74a8ca9f5402b4290ed93cd3ddba04a7f2ff42c8d8d3f2cbbe22fc20daa0fca119368daa8af39b7a26b1b99e4e3187c3c5d95886a651675ad94ff98d686628
 DIST kernel-aarch64-fedora.config.5.10.12 223184 BLAKE2B a0246dac2f7a4ad6a55b611538d24382ac87a8960077811a859c9595ac67f961b4bccb7e139a89abc7c0e26e80832da5c94211fc658082f2e7dde984f14dd29d SHA512 7d803b347b136331db1ad6e22e0445fe0224c3e26cd7c034cbe9794915d457b492e05f77664865079874ec001351553652646e2e08d0fee31e30b841b0008f52
 DIST kernel-aarch64-fedora.config.5.15.19 242615 BLAKE2B 94e59440681535e38137b71814e1ae53f57a347f62cf31e0c1c8571ae43d9ae9be9957743c8cbc9ec74850c964eaabefe6799a28bc311ea7b99ee31391b47fb1 SHA512 fb77d3b73a215f97d70cd6d8c96ed20e497786b99ed7d7a7f2ed60cc1251289c1a4c7e058c41b5efac62e4a9b4b3d917dbdb11585955bba2b6584981430f4ddb
@@ -38,5 +42,7 @@ EBUILD gentoo-kernel-5.10.191.ebuild 3660 BLAKE2B a00d551fbfc33807e966bc55b6a8cb
 EBUILD gentoo-kernel-5.15.127.ebuild 3738 BLAKE2B 0723ac115381c39ddcde714b5dabc3e2d7b4a5a8577786c45a537db0c9d0fa8527df6d9fc5cb66c351b635b8d4a1c8ca214ee91c74b059227fb312bebc27da54 SHA512 039ef7c9d5d2cd0ae1b31488d99362584b052961141cc25e66ab88d8dd6cbb9af327eb6ba8900c32c9fec41293d70e4857e9204d54bbe73960c47da0bd966c60
 EBUILD gentoo-kernel-5.4.254.ebuild 2860 BLAKE2B bc1812c00d3f6c58b51d0e9389055a6ca000db0fea5dbdbed392790fefce8a9abb2766c1083c3215c09453d89d6fe9889ffd62b1bf873ff69dfedce41badbf7f SHA512 96e28a4dc569a8d6ae0ea10710db9187a26a448640e76507414031b5ea16ee494a889cbb4a44b9f13cefc9c00d4066a46e8a0887f9fd5dabba5072605d283023
 EBUILD gentoo-kernel-6.1.46.ebuild 3974 BLAKE2B b3986083411b11632a836ce55d8da252dca675d952464d9cc6cd5a50381694868d2e5b8c2c0ea172d0d7d4c780a3b44062400c6a45588c978e5e428cee9647ea SHA512 b9b9db8e559281f80e7bf3ae56f732ec3c80a0d4000b31f78d73e4c4f04d5cac024c5f84494c36fcdead334ef10915ad03696a5d8f347954987e54b9ca91474f
+EBUILD gentoo-kernel-6.1.47.ebuild 3978 BLAKE2B cec16601130c35865de86302ec6ff7b3647ded252ddf6389055ca4d9a3a7413b272a33b4aa7e10261f97a53bafaf842027b1d64611a072a11fd2d1d671250203 SHA512 163324b02ece2b1b37105edbda878304dc834ebb03b4395a5c8cec0e1130b13771e21e2f3402978943d6b0a92deea5f88fa085faaab5f9bb1202bd88a6deaf59
 EBUILD gentoo-kernel-6.4.11.ebuild 4005 BLAKE2B af555898cec22caea7893291a18b3ed0fb3860303f8d28a390a3e86ba32b16086d08ceb6699d20a9c86fe963f39f85726ea545dbffefffe8ee403ed8d42ad2b4 SHA512 46c8f7dca1c60adbf411e80986d4820a24be18db607056ea23d62952b46d8c5d5219c8ad06a9446f998164abd64466c48ff5e32458e62a5c59d98383bffcbdaa
+EBUILD gentoo-kernel-6.4.12.ebuild 4005 BLAKE2B af555898cec22caea7893291a18b3ed0fb3860303f8d28a390a3e86ba32b16086d08ceb6699d20a9c86fe963f39f85726ea545dbffefffe8ee403ed8d42ad2b4 SHA512 46c8f7dca1c60adbf411e80986d4820a24be18db607056ea23d62952b46d8c5d5219c8ad06a9446f998164abd64466c48ff5e32458e62a5c59d98383bffcbdaa
 MISC metadata.xml 465 BLAKE2B ea1260a1638588a48d9dd776e9eabd9730a181af8416ba778c936fa2e80a2360be146d3cc80599e50e0a72ac709eb9538184aac87cb96528e445ed450e34f4af SHA512 c7b7b1a45fb7082b8d8d66cf5a387cc4f7207cd9488d1d5e1d6900f1e4147aa9290b5522a94d941a885f1599b5df2482b529e40912d2b2cff400ecd4b1704c41
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.47.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.47.ebuild
new file mode 100644
index 000000000000..7e128b87c8f2
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.47.ebuild
@@ -0,0 +1,146 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-build toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 6 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo
+CONFIG_VER=6.1.7-gentoo
+GENTOO_CONFIG_VER=g7
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="
+	https://wiki.gentoo.org/wiki/Project:Distribution_Kernel
+	https://www.kernel.org/
+"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	amd64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="
+	arm? ( savedconfig )
+	hppa? ( savedconfig )
+	riscv? ( savedconfig )
+	sparc? ( savedconfig )
+"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel-bin:${SLOT}
+"
+BDEPEND="
+	debug? ( dev-util/pahole )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+QA_FLAGS_IGNORED="
+	usr/src/linux-.*/scripts/gcc-plugins/.*.so
+	usr/src/linux-.*/vmlinux
+	usr/src/linux-.*/arch/powerpc/kernel/vdso.*/vdso.*.so.dbg
+"
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	default
+
+	local biendian=false
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		hppa)
+			return
+			;;
+		ppc)
+			# assume powermac/powerbook defconfig
+			# we still package.use.force savedconfig
+			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		riscv)
+			return
+			;;
+		sparc)
+			return
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-gentoo-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+
+	# this covers ppc64 and aarch64_be only for now
+	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+		merge_configs+=( "${dist_conf_path}/big-endian.config" )
+	fi
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.4.12.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.4.12.ebuild
new file mode 100644
index 000000000000..38b5f48b2b81
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.4.12.ebuild
@@ -0,0 +1,147 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KERNEL_IUSE_MODULES_SIGN=1
+inherit kernel-build toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 2 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo
+CONFIG_VER=6.4.3-gentoo
+GENTOO_CONFIG_VER=g7
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="
+	https://wiki.gentoo.org/wiki/Project:Distribution_Kernel
+	https://www.kernel.org/
+"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	amd64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="
+	arm? ( savedconfig )
+	hppa? ( savedconfig )
+	riscv? ( savedconfig )
+	sparc? ( savedconfig )
+"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel-bin:${SLOT}
+"
+BDEPEND="
+	debug? ( dev-util/pahole )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+QA_FLAGS_IGNORED="
+	usr/src/linux-.*/scripts/gcc-plugins/.*.so
+	usr/src/linux-.*/vmlinux
+	usr/src/linux-.*/arch/powerpc/kernel/vdso.*/vdso.*.so.dbg
+"
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	default
+
+	local biendian=false
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		hppa)
+			return
+			;;
+		ppc)
+			# assume powermac/powerbook defconfig
+			# we still package.use.force savedconfig
+			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		riscv)
+			return
+			;;
+		sparc)
+			return
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-gentoo-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+
+	# this covers ppc64 and aarch64_be only for now
+	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+		merge_configs+=( "${dist_conf_path}/big-endian.config" )
+	fi
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index 9a935f97baed..f1e24ed7d430 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -55,6 +55,9 @@ DIST genpatches-6.1-51.extras.tar.xz 3808 BLAKE2B 2f188b3f2062d491118bf96735420e
 DIST genpatches-6.1-52.base.tar.xz 3173368 BLAKE2B 429b5bc3af457d91b9c178737e573d150e337859c0f07a25043c86b834829e749b92c57fa2d80b2acfe9864f916ebe77c830249be23391d6553f5469b1934708 SHA512 0f003893b6c24fa9bb79722d6d83edb25e77fff11a526f86052980ee175d6dd599784cfcc7ad82055de9663a178fb9de38a766cfe61fe17fbde696a5292f023f
 DIST genpatches-6.1-52.experimental.tar.xz 17456 BLAKE2B 86db05e349b9e06e88a3355a6d639adff6010be4e2fece5c31580555a5f518cc05eecaa3211ee55e75765f6abc00e1a7353f0559814cebb8b7a70336117efcf5 SHA512 bea133cb1836bb6d26b092dbda8fb3b9698579c8113df2336c061e9ee5103527204a50d160598bf7da5940392ff8d184689f39c2c133c85cf11312fdba73ecbb
 DIST genpatches-6.1-52.extras.tar.xz 3808 BLAKE2B 6a67986309840e14bd4759c0aabb1af5d6b3653660d1a12d8706567470a28b3a56d5a09cbdd3df9068bed7a845206b5a81fca3a1be0ffe7122579d9b3ff63401 SHA512 0476ec7af5906dfd4dd48c96799568f8ed7d24d7d43717979e03a16219b732461e0afc7af1c5a4f528a08c4b5c2c35d249e81be1c6d0f854f7993da2e0c7aad3
+DIST genpatches-6.1-53.base.tar.xz 3225656 BLAKE2B d701a2920347788f343b14babfdd113b62b78218e8b19a5ee4f36d76b8571e697d9f3a3a9aa8364344e4d0ccaa60eccaab27b24036504b3ea1d011c4492a1eb2 SHA512 10aed454a5d7d7a763ec3008ceb17e30d989abcd76e1ca54d47b8946cf20a9de5991e09158a4e0b182ba58b41760a8de3bbd1979ff23fa9a84aa094c5c31094d
+DIST genpatches-6.1-53.experimental.tar.xz 17452 BLAKE2B 8fcc62e0b74f89a4f126ec8b3deaff34037693a50868fe0d53c1332dee75a2c84052a3bb91b6db5d1b12392003cebf47a43f55d985b091d5f49d2a06cc1d9cdb SHA512 30cf156ddef1e07f552c466367fa564d934f5256af5921d961a4972d96f22a21f113d95acef6ca09d18b9cd80dce2ced448ae886f5abd504eb71ed54cb34bb6d
+DIST genpatches-6.1-53.extras.tar.xz 3812 BLAKE2B ad3b65af5b05947d20e1ecaaabd7304261310162c9ef679cba698712af55e7bc5b18ab1b69613a4442e38f362e34a9a1699408decd9016cfb4543c33ac97468a SHA512 a813b49a8af0cf17e48a88475731b6349dfa49af90e16037528eebd55a80b3ecdb52805547a56003a463b00a4302a779c8fff23970d73f3393cde7f205e92d32
 DIST genpatches-6.4-11.base.tar.xz 587148 BLAKE2B 19d9f8e9778046dd558bdf21550f300e9c3c74faba6a8778d76e56490f379d615aacf14a930eaa57348638440fcfa6da17d5dd1a1d3020b5544ecac252ee7f08 SHA512 81c854057b1a0119cbae5116090298be72a1c30a0d2eab2cf4f0cc1d4f8476eeebe183401aaffaac92e83d2297d0fb707315254a5f5a77bfb3d8c953d04d448d
 DIST genpatches-6.4-11.experimental.tar.xz 5760 BLAKE2B 51b54dce033c25bf5c1bd51873a23d57a64a2bdee21caba186999a97c23a4c9be259384491b38c372ee745b767384d4e3d8050a8b6bcf600cdda1be934797130 SHA512 57bdaf65b5d695863bd277415ec45f55be9455c950c3d09cfec70566b8b059b9c53f50a1d873a0dd66f6259a9abcb48994d6ddbc2ed5c35549cbcdd9a0330060
 DIST genpatches-6.4-11.extras.tar.xz 3700 BLAKE2B 69a7811e49827c3c521d9a7e022e4c3ad5a326b6f6de8ffad7ea790d04e8decef5fc7d3e46a696d3c9d48502e9773fab715217626e4497cbafa97364474e0d03 SHA512 921d956322db5bfd0ad4047ccf3c65db25047a3d39118e20622c060b512574aeb5612f2e762fbb3d301cbcd1847ffbc2690c22fa4ef7a1b96827b12f8831743c
@@ -64,6 +67,9 @@ DIST genpatches-6.4-12.extras.tar.xz 3696 BLAKE2B d5c97c078e4abe4df885f067dd2202
 DIST genpatches-6.4-13.base.tar.xz 708424 BLAKE2B 35ac10ca68775c9e9c5668e9d4a8764c6cc583f8ecbade54b6f1bb1e4ca41fee1d48f5e782a6ba271d0b2f710889aaefdb13c9e4bb437d4f91b05a3d7e464a2f SHA512 5c3fa0b3c09b5298b4bf6542960e07d9c63875cc84821bbd6ef70556868f33a6aece33b9882b97cb9e32536ebfa536a71b9113e95b1b72b80c4f1348434e43c6
 DIST genpatches-6.4-13.experimental.tar.xz 5752 BLAKE2B 3e46eea9c77c13f6b424120cc64bf212a9f05b323b841ada45e4912bb356dc447f4ce847265edc0e8d84d2cddd6b2213ac0cd8b7b81b8d8989af8d814a5a2221 SHA512 529171c4883b99878aac5b541bf9844258e7fe998cd1f2958e79385c812fd3528dc8cf8af73845b106c5bb83cbc285fdafe00d8719e283c3842fbd27a2083c2b
 DIST genpatches-6.4-13.extras.tar.xz 3696 BLAKE2B e2e9014e497de63eae5dc5d644e1ef27fc2fda99379b881af096874bf25f269212bbd811781f3fc63fa896285e78cb9c41717392e59bfa62c039dce58ed11f86 SHA512 ffa3f9043767ae00e18b1d5313df6312d179b0d9e2b224d7b1097cbdc9c48f56615a36425ae1fd00680caed085420e438deb4fd331a37cd4397a814e542d6fa0
+DIST genpatches-6.4-14.base.tar.xz 765548 BLAKE2B e1d9bc63a0d8beeeeef9894b264ef4d8078bf57a3548548c08e75e699420731cdfdcf9df69ab6844a57563f24d806c96c27c9a158a7f6a1afa72bf8328ce60bc SHA512 5ee620824e0c17146add7f9bfd1d3444e5eb497444c040dc0f06a7ba247e81fc30eb8c92896ed359c7192690f24a1c45bb3b767bc408e9430ad9c7095ca2be40
+DIST genpatches-6.4-14.experimental.tar.xz 77792 BLAKE2B a59ee3efb32f1e51905e3727f9d01fa0475784bab355dc3b5530145a67946832c817aab6db7dc60044c7264c0ed219c6581fc913c1d7326d68253ed942f9af29 SHA512 6e77d0d2bfa26fd5973e6bcb13ca205f4a2e0ad33a051d3ae4c548849985fb1f837c3d38664dd42eac176c9411bbdcda7ad4b01eb92baa503c38c93454d43fc8
+DIST genpatches-6.4-14.extras.tar.xz 3700 BLAKE2B e72b1378e2c05049a5cb981e7bb09e0d448fd5e1219393d7b552c1c6de2ed557c395a3f341946bd142d8df45b61d12a13ea2424325d5a98045063e0cabe7584f SHA512 62149b4cdce5bf1a0567557790cddc1248dd927f31774b65848f00075bf1a0179939c292c79181af0a39132321f056541919beb30c6a4d46f57286886c95c545
 DIST linux-4.14.tar.xz 100770500 BLAKE2B 85dc4aa953fe65e273a24473d8de98e4f204f97c43be9fc87cf5be01f796f94cfde5c8f9c84619751f1cac51f83ce0b4681fb19c5f2965a72d4a94fe5577846a SHA512 77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8
 DIST linux-4.19.tar.xz 103117552 BLAKE2B 1dbf16cf410867412d17568fe42bc1e90c034183b654d270b650621ff7664a321950943d0639205bc1ee7ef6210be170c1f2c785a042ed8a4ec5e3a486d890e0 SHA512 ab67cc746b375a8b135e8b23e35e1d6787930d19b3c26b2679787d62951cbdbc3bb66f8ededeb9b890e5008b2459397f9018f1a6772fdef67780b06a4cb9f6f4
 DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
@@ -90,7 +96,9 @@ EBUILD gentoo-sources-5.4.254.ebuild 747 BLAKE2B 1cbea5f2e72f7482d4426d6b0e062f9
 EBUILD gentoo-sources-6.1.41.ebuild 740 BLAKE2B 3acf6b8a5566d34de107e9277c6ec40c3c3abf9198a6c7cbd9d3c314aad4dccfa7ff6bcdb1b563315791199a022fe5b1ea9a552f7ce4c42fd56b42e810d0e7b9 SHA512 1abaf66397b102c5029f71697ea5f51b993b8f26c2565b302e4b64d62ff16dbe4ae9a3a531264ee0869a0517db0d2f1399b6bb57d3bb1497e2e06590bb1dd893
 EBUILD gentoo-sources-6.1.45.ebuild 748 BLAKE2B 9eac9f51318910aa8a2adff953fab9be48bda90457354f3bed8873e29799982045d43efa2c74a0eeb457c3b43278eab29f09e04da4d0aad71016837b32a703e9 SHA512 a2cd6fe9979ac54d7cda01ba502ae9cdb07caa74640423d9ca5a7488e6c97c5a1e1fba439e994d14ffb87d0202f3f544d72b7c7a801942834ff0f0f7780a5488
 EBUILD gentoo-sources-6.1.46.ebuild 746 BLAKE2B d647843ba2f6a08aa21d05712432da71a39430958ad18a034fabd5ea76acdeaa9595cc431d0fae6292422002cc2a926c4eee329c56a5916690e4147f0db7394b SHA512 1a7fcf4969dd8d9af0654375b13263d5db0acb69d12d59eaaf83a98c2e6351125ba3123856c0c94cf663465a0994cdc04a9b8b41c89b60ff6ae760f538384c8a
+EBUILD gentoo-sources-6.1.47.ebuild 748 BLAKE2B b68863b1d9de9a772c59e0440bd4d302eb064c16f203f425ab02daad4f57bb5296398f53dfebd610ef03549654a302f19f8e64f5b8a5f7ac3681e8eff01fd43e SHA512 f758dd743b66eff964383b52a25eab06525bb1d0ae5358f0b207fd0e0b06eb28015d539afbc7e16c0c7b17cd5ff190b55700c2b380d16e1c7a93cb303c679dda
 EBUILD gentoo-sources-6.4.10.ebuild 755 BLAKE2B b6d6325c48dc814a3617f1099032105c3341babde9426691ff3bf4f1525e764baabc1db4e5a53ac3f89c28ae230e6da9827e09b7008b67ede7d7245f5dab397c SHA512 3855a7370800cded2a49f4b7ebb446e84a9175ea706935531dd394afd72c1c004fb5f8f47780a594aae2f1856bbfa2f038f3658471718a4aed1fe5812300226d
 EBUILD gentoo-sources-6.4.11.ebuild 755 BLAKE2B 1fec7a6db765b9835eced45b7be166e5fe79b5d24871ae150bf4d3fa9f038dbd1bd7e4e4c5f180526b75fcc6094452bb36247cf905af17d342b004cc2e119f2b SHA512 86751130cc1042d906baeb7b187538ccc739e08c26f5a3847c8fbaf447caa6ac0e45c4e5717c4f8108c55d464916b686ab5c1153a4a2cbb596db667fe8aa414e
+EBUILD gentoo-sources-6.4.12.ebuild 755 BLAKE2B d8a02c110c18fb30c2192b8808d8b666d3fbd5c7547a1d20489cd11aca85ed78625153bc3f274d27958c80cc9297bdcc78e8345c2b2a908505a8a05230f5dd2e SHA512 80184bdfdc7cbd64050225a4d7d71b2e9fd0ceded7cc756168b868961e0db98f0be908621275ac4b214c9626a0974b34c3d3ae59a45875201f10e2fda7cc6a5c
 EBUILD gentoo-sources-6.4.9.ebuild 755 BLAKE2B dbd2a92da21e6c0975d37eb3eaf2ad2a212db7febb6366e8e18418de148dd0019a0a777e54a3707499c988fb037b9c434769adf3e70957f38055e0f3a3c7bd6a SHA512 a181b29e7fc6959d22b39618bca8a91873a4968d3eaedb7e2d74771b3c71ea9e0902b53caacd21f8e2e0913fcb43c2508b30d7f85f031477869c59cd31d27771
 MISC metadata.xml 501 BLAKE2B f5363c8a19540d5bb924b38bdebeb8dbc60c84e58d1d87a9148a3e7abb09b0a1b733c98b130b778b8ab3a88375598444aa9d537d8c5338864a3d4497600d7836 SHA512 bc1ba0d75dbf5b95b3f93e666389c6408f20aebeec99bc8ec00653758b67588e07214285ed106fd9e5aed2c8d57c625d666c797212fda51e1ab98ce1df816467
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-6.1.47.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-6.1.47.ebuild
new file mode 100644
index 000000000000..ddac6634786f
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-6.1.47.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="53"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-6.4.12.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-6.4.12.ebuild
new file mode 100644
index 000000000000..cf46920a26d9
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-6.4.12.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="14"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index 57c7a276beee..4bffb83bf097 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -32,8 +32,12 @@ DIST linux-5.4.254.tar.sign 991 BLAKE2B 4f5a5e4ea2c930a62e3743c4f10d8e9999530a10
 DIST linux-5.4.254.tar.xz 112963588 BLAKE2B e0e395636643c49063cc1fbb04e06476ecf17471818f909559dc8f77fa5de69b8774ab8d6b16b4a2a57f32a7bf90126d381360fdd52069fc435090cde07769f8 SHA512 ccd82451c72eef0a0f35eb8c0e296e3018573ab99b602cce0a107bf2514bccf93113ea86d16205cb1b6a9f7c0198d411a250b215aed3cb0b4be6fcd27b878039
 DIST linux-6.1.46.tar.sign 989 BLAKE2B 95f91ecbbad15ec67a2723799419e295485cf1fbfb7dca7dc12c8433835df4ce2efe92c7f24f58a890e2c2311eaa7e52d71c9df442944edc9893dff05c780571 SHA512 bc2b89126155d9bcbe0275a221bb88a1bb1d615b5ec036ee964d664af0cac8d15b3511265aebc8910f0174deb30547cc23e836efc0db061d0e2c841b87ff7464
 DIST linux-6.1.46.tar.xz 134962288 BLAKE2B 07a069c04919899ce2b0859d0a528ee13b154ec8c9e868a2a0e64f6bdcc0ce30ea4fd002f1b58e62eebfaf8216e528e26b79c7a99c67f208e4d36eca590836bf SHA512 677d524974f76aeaaddab158e13df7c820e92f6e3c74683f5cd3dc9923859982079cd1da3fb41d3e87f96d72fb0abbc92d662122898e0a79adc7c8eebf005bd5
+DIST linux-6.1.47.tar.sign 989 BLAKE2B 5783f29b3e5803559e818c17c22c8a3766e3e00dea494b2184c3199d6c068de4151f9a0684035d7c43ae9d7d21a762095cd726fc49f653f1c7b298874c72a31f SHA512 7f3a831b0274c54b719cc0ec94cd3e0499406fb6f5fe3caa07d9aa9e42feaf416f8bbaf908d1e7d308c7eee2a9a37e05742b41405ac6822726a08e23e3f4db7c
+DIST linux-6.1.47.tar.xz 134962984 BLAKE2B 318276ea54366300aa4893cc861c35fe267ff101de23e700a0a4566d3f0db0e332faacace4747453e546089e33bc9bc3103f8f320e54154b725dc3a401032047 SHA512 2c559ae816532815d5aaafdf3f9e7a6a36e03252ef87d0fd5f6c6391eea618338bcddde7bfe6839d741db0121b93c733baa1d3b7547cefbe8ffb7cb76f72f1a2
 DIST linux-6.4.11.tar.sign 989 BLAKE2B b8b55a05aa9d5249365a17faf7c0654d6172988ba2894d6bf21c33a8c175dd220cce190415f84235175eec729a05a85b25f2ce9f240e59f81172823ed3a60eb9 SHA512 c4d218992809cfd6ed6afc324cddae579bd2d1cec66f40d04c1d182ca4dbfa8487539cb63b2ec432528b28f30b9e156fc0ce243878ac8c6607cb1e83c01b5888
 DIST linux-6.4.11.tar.xz 137836952 BLAKE2B dfb97f2c9905a150c0890b9c3d464bc13986bec7bcd038c333f4dce443e0a1988a9075554219f9f419ef71af98827c05fad4a62aba1e58aa7f2ef8249f140175 SHA512 b3abf1d7c6b03644ddfc0a1994c88abd9b6db71089aeb4ff8749e9eed5d3772bc3468eabdeec99d998ec091898e5c81a84ef839345ba368580509500a3cc73dd
+DIST linux-6.4.12.tar.sign 989 BLAKE2B 598b2dd8b0beb25db5b0500547bfcf7ea669c06ff4afaf6252f996d0bb519f5d19da96a1b618ae7a03c4e27a56a5a1540d2c1b66bef9683d14aa964e0d768d39 SHA512 d1941097b97dee631cec1487ecdb9a3a4c145ec8cfdac325776e9e890bfff2f559140d178fe5ec27b0482f04df2713cb2d6da59e20a7bdbce8ed50c148f3b585
+DIST linux-6.4.12.tar.xz 137846568 BLAKE2B 0d8b6e447a7fe390b44967ab8dc2e116de29b6fac15a91fe8398d091f5803984495dea595d53938e75f0213b5268bbdb63a86284463552c8e59ffb02cb98ce17 SHA512 6758994ac1f8bdec1848d9c90e7f66847512567e5de71fdcdde42487043ff83ea4745f9a2e2631046faff3c5d74a69e9413fdd78126f881cefd05e9efc652cd6
 EBUILD vanilla-kernel-5.10.191.ebuild 3776 BLAKE2B 8123c455d8037eb8f221741523b7276ed013007d928fa7b76d4401b67a3d1d904a39519da67c466967ecd657aa2465175f4214d79a3e2ecd063df9bc19e72300 SHA512 46737c9425cad5c99bebb4f233a049e0f08d0539cc1a9eb3afdca285d081f778e6effbdaf012d0f0a58b92a64e14e33bb5b463ba4ec6e9ef45a8bd825b616e87
 EBUILD vanilla-kernel-5.10.9999.ebuild 3295 BLAKE2B d55f087638b0f40abb649765db84505032571215fa29a51da118dee67c6815b92544ac4f2baa35571bc90b7a3e83c8ffe76c24327c31ac82e018b94a9d773ab9 SHA512 c0acc21c6d0af4b59e8b687254501a77340261b6927a84e82f2ddfdc4373c580cc5e987610b844c3fca348c44b1276415443efcfbfd70c3350043ef6fb57d743
 EBUILD vanilla-kernel-5.15.127.ebuild 3776 BLAKE2B c24a30442a8b2fa704c58bf31061467f8f077ace3721ebae232fd81639e95def5bd06c950f73b5823f9d2667cef4f31f24ccf8d308d1b1b480ba4af7a794179c SHA512 aebfea3cc05d1af79fdb155328d54c5d9beaa86259c543b3b24f4b11115cf7c9b6e433aede426925eee67cd84524eafb223c3e75e32380b22cb630e750475054
@@ -42,6 +46,8 @@ EBUILD vanilla-kernel-5.19.9999.ebuild 3415 BLAKE2B fccd59b033a2c78ed80927aef1fb
 EBUILD vanilla-kernel-5.4.254.ebuild 3062 BLAKE2B 57f0ff3da486dcf8c18cd11607ac6835b7dadd1d792c2499ff6530f0a28a017695ef9ef6e7a0fc15d31b857bfa0359694572cea594cf1a473d639ebb55ff0e58 SHA512 a7c2010a4ac27038d55adc11bc2f5340015266b60f61d93d41fbc20346fdd5ac624673fd08da709d5a144b78ff6a46f28cfc94663f627e0a87ea97db24cb7f42
 EBUILD vanilla-kernel-5.4.9999.ebuild 2635 BLAKE2B a24d5ab83210f70c0f0b32b326b786743c07920dedbb5576994c32f5be09aafdddb5d30c660cc131d26ffb1a86255491ff6c8a7bbacac81f53af5fe92b976095 SHA512 52efbf88e5634ff7a6545aaf0edb975e3e23b68c6799d293ce90c260486bc16c8d1ecba96c301c99e2dbcfc7de85eef071d8e9ee0ca3cd7279b2545e41e11396
 EBUILD vanilla-kernel-6.1.46.ebuild 3894 BLAKE2B ceb59b4d1f283b856477226d074a57d4f46201306ccbe33e6036445ad008a095bc72ef572fd31f1a26c63008e10f80ed10eae149526cf2eb7e16b1fa045022a1 SHA512 55818f504b9f43b0b866cebfc38a33951bbbc602dcf5cc938204a94b7e5854ef7c78217d644105c36bfc56a845a0bb5235bf55edbf80d9a467865847011c6132
+EBUILD vanilla-kernel-6.1.47.ebuild 3894 BLAKE2B ceb59b4d1f283b856477226d074a57d4f46201306ccbe33e6036445ad008a095bc72ef572fd31f1a26c63008e10f80ed10eae149526cf2eb7e16b1fa045022a1 SHA512 55818f504b9f43b0b866cebfc38a33951bbbc602dcf5cc938204a94b7e5854ef7c78217d644105c36bfc56a845a0bb5235bf55edbf80d9a467865847011c6132
 EBUILD vanilla-kernel-6.1.9999.ebuild 3413 BLAKE2B 3e286878f8ad61cd41dfab86e7f5a143f3e165af8fbffa7277d1c5b0a712fbdde55440d069383e273b029967c108ee02caeddf5b6782d966ff3d47bc13763a01 SHA512 4adf01bafd3116668c406ab443e3b45bb37c182ad01931d32ce08eadea26d66df7657eba9f4f199009fb80adca108cb2401fb0a6e3c1c94b2dd77399303dc818
 EBUILD vanilla-kernel-6.4.11.ebuild 3921 BLAKE2B 383346969ebe5e0c76da683072328fd578964ab349353fe078b475a8f2322560184d58ceae63bccb31b47faf2abc6ed6d6a60673208bc226cf3eb58401a8b0bc SHA512 889e37788a7b07aac030487533925a99620e97407c50cb1045d88da6484c7dd79abe613258ffba6b93d2a47e36252ee459ac6948bb144b7ef45b7f7003f0ee72
+EBUILD vanilla-kernel-6.4.12.ebuild 3921 BLAKE2B 383346969ebe5e0c76da683072328fd578964ab349353fe078b475a8f2322560184d58ceae63bccb31b47faf2abc6ed6d6a60673208bc226cf3eb58401a8b0bc SHA512 889e37788a7b07aac030487533925a99620e97407c50cb1045d88da6484c7dd79abe613258ffba6b93d2a47e36252ee459ac6948bb144b7ef45b7f7003f0ee72
 MISC metadata.xml 353 BLAKE2B cd022bd01b289ae703ae6ef6c2539fcfce833206c55e328ba02fc42b360d60f76b1920927b259dbb199724e6d3e7b0f68ba2044680d962d3cd03a973475582ff SHA512 10b10fd24801843108a71ca7d0c27514965b0a15a60da4d9b521fc41493448a1b1685ae3278dbd46cede0d069e51dede402d2c1448c8ae6a7fcfce8acf415bf3
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.47.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.47.ebuild
new file mode 100644
index 000000000000..e3a0c5f7f691
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.47.ebuild
@@ -0,0 +1,137 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-build toolchain-funcs verify-sig
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo
+CONFIG_VER=6.1.7-gentoo
+GENTOO_CONFIG_VER=g7
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="
+	https://wiki.gentoo.org/wiki/Project:Distribution_Kernel
+	https://www.kernel.org/
+"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	verify-sig? (
+		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
+	)
+	amd64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+BDEPEND="
+	debug? ( dev-util/pahole )
+	verify-sig? ( sec-keys/openpgp-keys-kernel )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
+
+src_unpack() {
+	if use verify-sig; then
+		einfo "Unpacking linux-${PV}.tar.xz ..."
+		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
+			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
+		assert "Unpack failed"
+		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+
+	local biendian=false
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		hppa)
+			return
+			;;
+		ppc)
+			# assume powermac/powerbook defconfig
+			# we still package.use.force savedconfig
+			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+
+	# this covers ppc64 and aarch64_be only for now
+	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+		merge_configs+=( "${dist_conf_path}/big-endian.config" )
+	fi
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.4.12.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.4.12.ebuild
new file mode 100644
index 000000000000..1a6b7eb2482b
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.4.12.ebuild
@@ -0,0 +1,138 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KERNEL_IUSE_MODULES_SIGN=1
+inherit kernel-build toolchain-funcs verify-sig
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo
+CONFIG_VER=6.4.3-gentoo
+GENTOO_CONFIG_VER=g7
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="
+	https://wiki.gentoo.org/wiki/Project:Distribution_Kernel
+	https://www.kernel.org/
+"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	verify-sig? (
+		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
+	)
+	amd64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+BDEPEND="
+	debug? ( dev-util/pahole )
+	verify-sig? ( sec-keys/openpgp-keys-kernel )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
+
+src_unpack() {
+	if use verify-sig; then
+		einfo "Unpacking linux-${PV}.tar.xz ..."
+		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
+			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
+		assert "Unpack failed"
+		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+
+	local biendian=false
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		hppa)
+			return
+			;;
+		ppc)
+			# assume powermac/powerbook defconfig
+			# we still package.use.force savedconfig
+			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+
+	# this covers ppc64 and aarch64_be only for now
+	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+		merge_configs+=( "${dist_conf_path}/big-endian.config" )
+	fi
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/vanilla-sources/Manifest b/sys-kernel/vanilla-sources/Manifest
index 1bb955a7b786..b0ad519a367e 100644
--- a/sys-kernel/vanilla-sources/Manifest
+++ b/sys-kernel/vanilla-sources/Manifest
@@ -10,13 +10,13 @@ DIST patch-4.19.292.xz 5584620 BLAKE2B 5dfb2358d99ad9e5affd85ad7673157257269d733
 DIST patch-5.10.191.xz 5029448 BLAKE2B 70b8876f6750bb31ad226210c7fd592c1b7ced07033dd6f73f06b01f82dd90de9938fa34a091721780fe0c8959e0aba53ad3f36ddb6d6aa05d45e41e25c34b85 SHA512 247d20289fdfe17657b15626c798018aca56bd7f7930f9c4ce0c007cd886bb64b55c46008330125781aee1d2b8f54a0bf3db18c83e35649b3037e92206f795a7
 DIST patch-5.15.127.xz 4596548 BLAKE2B 2095589c926bdbd52f98fd9530cee032b62a4a12ad0dd8952ffac6d6266d69f84c9d2c0a4d15b40af583920e3ba7873166be71f8782ad106f395d6619d1cf875 SHA512 0df783b2c03482aaecb55973d081d0a9f9688deec6f17e724fb50572fe59a9be0493abcf4caf3368e005436b1d8549bac3967cb4f637d16456ce7d4a80008df3
 DIST patch-5.4.254.xz 5044632 BLAKE2B 9fe09a94f612a94476acfa8562fa072a87ed63357a743fdb9fcdb1e786774b47f034864417357bb4b8f0e543c0d92691837c7272f99a03086c079077f7f86362 SHA512 33b33310c54aae233e025a0945214886a6a22102832eaa99a7b799a6d52365974c4e3cb71f8f7e404686dd96c6a0a1f6564ca7124b326ec8f8802431a33f1707
-DIST patch-6.1.46.xz 2932204 BLAKE2B ffa33dd9d606303ec2ddec4c808341597ff7efbe8be6d68766ff06a87b24e728369b4e59bb7f53f5d59f66650a2eacbd9c598ea003a6061f731f2de543dfe3d7 SHA512 e51c9d1ca76e8605b736addcd61e15230d8c63f93c7fbf8033ed4f0e55c69fdae2f2122141c100b021d5e105423154a0650faad763822c49765b9666a63fcdd6
-DIST patch-6.4.11.xz 690684 BLAKE2B 830a8c6e62fe17036ecac8cfa39784a0523ffb1571aa76c454b13b38f29da0bcb31f43b92c2d9df2c72eb1ff1a48540995f9d550010f3ab5fea8e4c30acde425 SHA512 48ac75eb548d6fb7bdb514de12210500b92ae7314a4df42002be8576cd14e9e09c774977bebb31e197cffa4789e37aa1dca407c3ed49f2420dcc076996b83758
+DIST patch-6.1.47.xz 2968268 BLAKE2B 29b5da5d4baa07a20bc45f5bd6fc3b68d607b4e853975e0e199a27d397878a72b66919338e1b4e14be6fd4dee8229d276bd90f17f10fbf18ac389688a809932a SHA512 0cc1cfdd7d0507e75e1adcf837c38171106738e6ff366a45c3ce3ed78292ccf911b42130bfba5e260d8f07331b1db4a8d3fc07e51ab198206dfc0bf0f9c9cb9e
+DIST patch-6.4.12.xz 742836 BLAKE2B af688ab8fe14dea747623bab973f0f085845c17d2ee3599482774540862674bdcb6984ef4428a5436b847f54f2e92fde94e36856ac1f88b8307bf22eced1017b SHA512 d81e2d437f0dda9bc394b2e1144c49067720238c56e00108b69651200247c2727e6c41d98e056030e0269b3269f662671ec58405211a865ca37fbcc4fde4bda5
 EBUILD vanilla-sources-4.14.323.ebuild 432 BLAKE2B 231885066aa053aebef45736afd51c83480460ad089ca2ccbf40e9d610f10bf1e70d75cff9c0da9529c220f0715470fb28243753782740012f139f0d37ada94b SHA512 4c41937ff77fb3ea6887eb08406d381150ed3b8b5bb008ae5def527fce7288d89a9f7b803a5bb34ca147cefbfae5e71d3bc5f15b92f9ed4f49d875300fba60a9
 EBUILD vanilla-sources-4.19.292.ebuild 432 BLAKE2B 231885066aa053aebef45736afd51c83480460ad089ca2ccbf40e9d610f10bf1e70d75cff9c0da9529c220f0715470fb28243753782740012f139f0d37ada94b SHA512 4c41937ff77fb3ea6887eb08406d381150ed3b8b5bb008ae5def527fce7288d89a9f7b803a5bb34ca147cefbfae5e71d3bc5f15b92f9ed4f49d875300fba60a9
 EBUILD vanilla-sources-5.10.191.ebuild 432 BLAKE2B 231885066aa053aebef45736afd51c83480460ad089ca2ccbf40e9d610f10bf1e70d75cff9c0da9529c220f0715470fb28243753782740012f139f0d37ada94b SHA512 4c41937ff77fb3ea6887eb08406d381150ed3b8b5bb008ae5def527fce7288d89a9f7b803a5bb34ca147cefbfae5e71d3bc5f15b92f9ed4f49d875300fba60a9
 EBUILD vanilla-sources-5.15.127.ebuild 432 BLAKE2B 231885066aa053aebef45736afd51c83480460ad089ca2ccbf40e9d610f10bf1e70d75cff9c0da9529c220f0715470fb28243753782740012f139f0d37ada94b SHA512 4c41937ff77fb3ea6887eb08406d381150ed3b8b5bb008ae5def527fce7288d89a9f7b803a5bb34ca147cefbfae5e71d3bc5f15b92f9ed4f49d875300fba60a9
 EBUILD vanilla-sources-5.4.254.ebuild 432 BLAKE2B 231885066aa053aebef45736afd51c83480460ad089ca2ccbf40e9d610f10bf1e70d75cff9c0da9529c220f0715470fb28243753782740012f139f0d37ada94b SHA512 4c41937ff77fb3ea6887eb08406d381150ed3b8b5bb008ae5def527fce7288d89a9f7b803a5bb34ca147cefbfae5e71d3bc5f15b92f9ed4f49d875300fba60a9
-EBUILD vanilla-sources-6.1.46.ebuild 439 BLAKE2B cbc87f55813e90aed1096e41ce4845597dc379a363cdba59dd4bf455176814aea6d7bc66699ee16d6ffaf7bbf4de7351d4592df4f03049407ef4009fc06a8d2b SHA512 c8187b4946370840fbf77ce77844bc1c05f19ad8505e1e6604209a17798b3865f2c0bbe52e818da051d77256a72e01ea350652046f83fdda45e1bdb11816cca3
-EBUILD vanilla-sources-6.4.11.ebuild 439 BLAKE2B cbc87f55813e90aed1096e41ce4845597dc379a363cdba59dd4bf455176814aea6d7bc66699ee16d6ffaf7bbf4de7351d4592df4f03049407ef4009fc06a8d2b SHA512 c8187b4946370840fbf77ce77844bc1c05f19ad8505e1e6604209a17798b3865f2c0bbe52e818da051d77256a72e01ea350652046f83fdda45e1bdb11816cca3
+EBUILD vanilla-sources-6.1.47.ebuild 439 BLAKE2B cbc87f55813e90aed1096e41ce4845597dc379a363cdba59dd4bf455176814aea6d7bc66699ee16d6ffaf7bbf4de7351d4592df4f03049407ef4009fc06a8d2b SHA512 c8187b4946370840fbf77ce77844bc1c05f19ad8505e1e6604209a17798b3865f2c0bbe52e818da051d77256a72e01ea350652046f83fdda45e1bdb11816cca3
+EBUILD vanilla-sources-6.4.12.ebuild 439 BLAKE2B cbc87f55813e90aed1096e41ce4845597dc379a363cdba59dd4bf455176814aea6d7bc66699ee16d6ffaf7bbf4de7351d4592df4f03049407ef4009fc06a8d2b SHA512 c8187b4946370840fbf77ce77844bc1c05f19ad8505e1e6604209a17798b3865f2c0bbe52e818da051d77256a72e01ea350652046f83fdda45e1bdb11816cca3
 MISC metadata.xml 340 BLAKE2B e283ab9d2ebb7212e3ba37850c93761f165b4697a2ee6dbf07a67ce907df8ec71b3290a411cb81af8d8d8869b7e45c572487d4d2667dc0a0971986f0f6d1aa8e SHA512 bd0f7f570230dd5bd9f6e270345a3ebc556eb2dbcd19b04e33b5c6df8d9e6735a6e23fe934b39d9ef130ab5e78c6fdd29d7a167cb8ee4ac8ce919c75cec7425c
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-6.1.46.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-6.1.47.ebuild
index 424a2f9b0f9d..424a2f9b0f9d 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-6.1.46.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-6.1.47.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-6.4.11.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-6.4.12.ebuild
index 424a2f9b0f9d..424a2f9b0f9d 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-6.4.11.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-6.4.12.ebuild
diff --git a/sys-power/Manifest.gz b/sys-power/Manifest.gz
index 24e834aae475..c5ab068a7178 100644
--- a/sys-power/Manifest.gz
+++ b/sys-power/Manifest.gz
diff --git a/sys-power/power-profiles-daemon/Manifest b/sys-power/power-profiles-daemon/Manifest
index 8442398099e3..d46422841c60 100644
--- a/sys-power/power-profiles-daemon/Manifest
+++ b/sys-power/power-profiles-daemon/Manifest
@@ -1,4 +1,4 @@
 AUX power-profiles-daemon.initd 391 BLAKE2B dd75825711a868de7b6c996c67c332b80a361b84dab19b86f93c77ae781c007ed8a665fbf776dfb18671ad7b297a85cc8bd021ffb4d7ff33451e9e074c53eb23 SHA512 5652346153ad999525bf2973336ebe7806af279fce9dd62091918d00ce0ebbdf315a03472bf8de61a1df51c9087feb0b2771ce85870274ae5770a0f1aea08bfc
 DIST power-profiles-daemon-0.13.tar.bz2 49079 BLAKE2B 2a7c81b0ac8b4ac4a9805f5dcd722959ff0abe736782eba7678f49eb3c5790d59b2bcc35577733aaae9fc8baa76a65ca9a973ac9f0d9154061c3af86abe0e65d SHA512 dab0c44968480a2f5ae2074f07a48d901970c9b3b3ec104d14108615f85b1eb0f9f3e1b5f0ff766659e4d76b243da2cd4c025cd81b992b7149fb671e103a7d6b
-EBUILD power-profiles-daemon-0.13.ebuild 1808 BLAKE2B ac9994313c3eba77d292402a30428d58a796e34abea988fed3033fac91d6bdca38ae791c004d28ba50a3b420a7b4ece35fa9894166148081a46cb7819e7ecc87 SHA512 f379cdd173706873f8ac082ecfc0e3f7a646a5cc07a3a23d91604a6baf090f5bcf1706794f8bd9b229306acbeca3e029d6a044b61ae9462a09a6f86a85d8bdc3
+EBUILD power-profiles-daemon-0.13.ebuild 1829 BLAKE2B 3735a89506f5e7d6423a7552666865ec2e93e9e8cd10fdd40eb3b59f0f3e58b6ae7a1a526b455d398429131af6aca48fc2649c4abe8e2f61a97ab748af954e01 SHA512 17b3aab5231472b11454cb17fb239efb41b64e4da365f4bb5a69dc5e6bf4a0cc5ad5e2d833b445c45c68d13966b3bf3f9909da35d574f7574cd4fb8bff67b5b6
 MISC metadata.xml 349 BLAKE2B 3d5b11de51426f4ba58d91ba184112dc8c2ca996eb68b55a1fee0ebd1c5f9a04369304ca1dc06adf67c936e429a5f4982352696a436768f86cdb59689d0c6f0a SHA512 a857194a96f8d2e3d639b93256e5c0518578aa2ff3e85e3a4c5f1293750e0d40a5637b3660199153bd25185b2cf548d0bd54c52a4f4a7673f44eb027653fcaec
diff --git a/sys-power/power-profiles-daemon/power-profiles-daemon-0.13.ebuild b/sys-power/power-profiles-daemon/power-profiles-daemon-0.13.ebuild
index be8393ee1568..c229be38f329 100644
--- a/sys-power/power-profiles-daemon/power-profiles-daemon-0.13.ebuild
+++ b/sys-power/power-profiles-daemon/power-profiles-daemon-0.13.ebuild
@@ -28,6 +28,7 @@ RDEPEND="${PYTHON_DEPS}
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
+	dev-util/glib-utils
 	gtk-doc? (
 		dev-util/gi-docgen
 		dev-util/gtk-doc
diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index 4335e80448bb..4979c3c78625 100644
--- a/virtual/Manifest.gz
+++ b/virtual/Manifest.gz
diff --git a/virtual/dist-kernel/Manifest b/virtual/dist-kernel/Manifest
index 1bba651c882f..56d25f4060bc 100644
--- a/virtual/dist-kernel/Manifest
+++ b/virtual/dist-kernel/Manifest
@@ -2,5 +2,7 @@ EBUILD dist-kernel-5.10.191.ebuild 399 BLAKE2B a864eaf52c6d073cabeb88a64ec5b20bc
 EBUILD dist-kernel-5.15.127.ebuild 406 BLAKE2B 92168b2f128b138ad404b5c9c8ce08d15499d01ef1c3ab090cab8c0e20b494c43bcaf98e11f56df093a673ee3d32bc56dc59d6b19059a338f7fa9637b34e45dc SHA512 f7397a9d4d8b14c69cef0d7b4cc9d743cdfaf40412848641b21cc32cadc6ac0c2344bb528167303485943af02d2b88bf2eae45b84251ee59671013b7c072686a
 EBUILD dist-kernel-5.4.254.ebuild 388 BLAKE2B 74ec9dad235bab972e849e0e63809fd44ebf07f15209f9528694016b0e456aed1d5406810e882b1632cd99bea780e92c040e3cd61a16b79a4aeeeed1226fc3d5 SHA512 5caae3c3baa9607bb90971cebd958b9792e4596201433cb9727da362fd4c521dfdba8d559ad7d23021e4e221da8ac27b4d04a33dc01cc7e3397321d739f2f572
 EBUILD dist-kernel-6.1.46.ebuild 413 BLAKE2B bb9837eeabca8a0d3d1758b91dce219b43e8d6e04cb0e04dd953a08633cbeaaf94ee327aafe6db16fa81f731557b7ba22418840aed7dea31acfee5ea19fd14b9 SHA512 caba6d426d7affa6922e936e165907fd373140003e1057cfffd16ef73dcd399927568af230554ce0188533cce5078c3d8d44150ee7e29810ecf944cbcccbb229
+EBUILD dist-kernel-6.1.47.ebuild 417 BLAKE2B a0583073a6c219bc130ee9f97b902666ab402514e84eba617536f223409b95352696205ce531623a2ea7a5f2ffdeb676df98a3b09639893cd1bb0b34b9b9c1d3 SHA512 1474af1ea99ceb79f9a724579d78fca6972fdabee00fd5437d758faf454e8b85cfc31b21ec154e698ae755e49bd84186a03ea36fd175d5d49cc14c6317459e9d
 EBUILD dist-kernel-6.4.11.ebuild 417 BLAKE2B a0583073a6c219bc130ee9f97b902666ab402514e84eba617536f223409b95352696205ce531623a2ea7a5f2ffdeb676df98a3b09639893cd1bb0b34b9b9c1d3 SHA512 1474af1ea99ceb79f9a724579d78fca6972fdabee00fd5437d758faf454e8b85cfc31b21ec154e698ae755e49bd84186a03ea36fd175d5d49cc14c6317459e9d
+EBUILD dist-kernel-6.4.12.ebuild 417 BLAKE2B a0583073a6c219bc130ee9f97b902666ab402514e84eba617536f223409b95352696205ce531623a2ea7a5f2ffdeb676df98a3b09639893cd1bb0b34b9b9c1d3 SHA512 1474af1ea99ceb79f9a724579d78fca6972fdabee00fd5437d758faf454e8b85cfc31b21ec154e698ae755e49bd84186a03ea36fd175d5d49cc14c6317459e9d
 MISC metadata.xml 291 BLAKE2B f8eaa7c5aaced8dad269f9939139bcdd32c64dcc4ebff2b0b41dea61de5aed39723d73721bc44c2bee64717de093b97dc326037a335616caada3ea857c98fb07 SHA512 4fb007791c48eddbb1ee30cde6c1618ef67fbe62a29f3b805a7224818c34ce986b6e3d9378ab500875e012e9ea48663809204d69a410b23d12925f11ada333ca
diff --git a/virtual/dist-kernel/dist-kernel-6.1.47.ebuild b/virtual/dist-kernel/dist-kernel-6.1.47.ebuild
new file mode 100644
index 000000000000..8012e544096f
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-6.1.47.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual to depend on any Distribution Kernel"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	|| (
+		~sys-kernel/gentoo-kernel-${PV}
+		~sys-kernel/gentoo-kernel-bin-${PV}
+		~sys-kernel/vanilla-kernel-${PV}
+	)"
diff --git a/virtual/dist-kernel/dist-kernel-6.4.12.ebuild b/virtual/dist-kernel/dist-kernel-6.4.12.ebuild
new file mode 100644
index 000000000000..8012e544096f
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-6.4.12.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual to depend on any Distribution Kernel"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	|| (
+		~sys-kernel/gentoo-kernel-${PV}
+		~sys-kernel/gentoo-kernel-bin-${PV}
+		~sys-kernel/vanilla-kernel-${PV}
+	)"