gentoo auto-resync : 19:05:2023 - 16:15:42

216 files changed, 1380 insertions, 2151 deletions

diff --git a/Manifest b/Manifest
index e2f7fa7667d8..aca07f690cd0 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29433 BLAKE2B b9b17b8722dd4ba1fd6d6b11ce18eb1e9990eded5472592669665385f88141ef819f4cedade782c80c6886586598d80a05b78efc71570a8b909df385bd95e91c SHA512 f877cb574fa5b964a28e0c30a8b924e50466ede585629e70c3a9a9087807e536c8eec589afc6c751d9085b96df78f6951c65fd59c469e237555cc500fc77b5a1
-TIMESTAMP 2023-05-19T08:39:38Z
+MANIFEST Manifest.files.gz 29448 BLAKE2B 5a43a29d12ee5e71766235136fb40cb978342101788fc15af26c985cf26f65bad1745c24056f1feeb6155722679d703971bfac944017637714ca7e7e46fb52dd SHA512 be0288ac2632e57c2428da0c1820f580a73fd29dcf1d7affeb3db7783b25a69b8c29cb38a73d607cacc343bf04564f01006b24a554935add8170e475f2763f54
+TIMESTAMP 2023-05-19T14:39:35Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRnNcpfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRniidfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCl+w/+L5B0MLSeXRDWpd2yNMTYo3PdJqVIEwK1bXYyTx4kLJkg1L/4o4BpdcP2
-gT0qbH75yItc/4H56fBBRCCPssXie9NrZwI/ZrSmT+5FX0RwwlUI9+ICCgCXOIZb
-Z8IRl2FMIdIBGUnlg1JxCS3viztnFNXOL12SKBwmpwBlsbOs+FhXwgJJf2DXKq7k
-jk0xhzLZLr6FrISVXFIq+L9L2vn2k+kQPQ5O1DO1kuGfMeZORLitXF7BliNvBgWG
-fhW67SlF8aAK9O9xM933MHQEIQgKefmCuUfoCf1/dYK4Du0nqMnFkEajC3nu00fW
-1cHUsYRfe/yyJAomLyb1FAjZzB5+fK0yGoXbgOAXZAEgoWaGercVpxzb1PELq5bu
-J60b/PICafx6IGffd3UKGPvsz4jC+oItRcK9/YUUSlNJb3L3BUMIkBSeccrj7d3m
-98A4HyZFMfryPnM6FzpW+MhkjbBsyzKAPH+c96PXCyBl8tHCromAWg8l5l4R/t3H
-ZOgpEvZ+ETwZkOA2e62NmW+pbBl8yyXguGt5HUtQtNDO4CdKns39QizzZ/xMVSXh
-fxs3oGbf09WvQ/UxpdbvWqNiojHZMJV+IJFhC6lCdp+2w0vSolHVxP1Y91DygfEl
-wlyqfLlndlHVqDQKh5H6tttgdcGhMMTUp9enwX0i+5kjGhixdsY=
-=dj14
+klDUWQ/+MZHKPZ3+3xMUhQACCPG/IcLNgiw7nxr3bAde83FX/QfXYdByJ32+5/R0
+MDQolwrDayiURm5S3e84FKeD9mBwsGCYfDCMpTs/3wyKLAU7y9uGu3hTUuI57N+4
+tHS/KTU+3rA9m4OfxlnScM6aLSOmsfpXigRVYsC/bU5fjCadgJ+ewBUqzy2CqreD
+4efFho2VHa1d+8GFaCYvSPW6e9o8JCfGV3SNtRvVflVLdEunzZ+cGGfXZbVX67uK
+MHFT679DD6SGs/dkr27X+GUxRWwHVXEGxNq8DkyWgTlNsTDqsrgDYqny56vJ2CNA
+01TVFq6P9JBxawmRtaOwARZ1k2OQG4LpEkJJEj44YixMcycQfIYJDUi4EP8NG5N6
+3NSxaX/Ck/Eq/5WM6G++KIHV3xInZnMrR+UeRZVTZ4Rto8EpkmwYrJvrn64ePAiN
+v7kTg8uK6iD4lyRftYH6ybu0o9rxlRec8MIkg3EPGYUGU+FtWb6coyIennbchkMJ
+DXC9G5+A1MGn70SPyuDwLQ3qgMJTN61pnM/j0/cssbQnCZSb7eV+l8TEN8xNzvsI
+ctLenYFtCE3bJ7qm7j92xEncDegWSr3QOK023e4VyVM7NHbAcWvi/sBvZxPWi6J0
+k5obeagmLUn0jWzBh2sSkYowYNc+RS3e0GBMlhiq3zQwMHcRGXs=
+=v5J3
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index f2354536eda5..1428d954f3d0 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 27caef617000..651b0700d1e1 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/ansible-lint/Manifest b/app-admin/ansible-lint/Manifest
index ed39bed181cc..2565c16aff1c 100644
--- a/app-admin/ansible-lint/Manifest
+++ b/app-admin/ansible-lint/Manifest
@@ -1,5 +1,5 @@
 DIST ansible-lint-6.14.6.tar.gz 475624 BLAKE2B 99ac5214d7404c2cdaaf43678950b2031fd40396e45a27823feb708bc343b69181e624254b77bfe9f704a9037c60340f3a14d4a2651948b371ea91a28b1a1424 SHA512 dac9a089db2d2fe7b25f273b746571175d3ec974dbdf14d65cc10be83464f1ae88361d9e445d8687c011f817597fc4ca8d7501d192c6c529d9ec48997af8df7c
-DIST ansible-lint-6.16.0.tar.gz 481460 BLAKE2B 127b1c1b979bf0a187d8ad7eff8e4a00540582f5eccdc74f56fce88a38f1e9106ea3237ba6b2d00edb72f36bb967381d9144df204134fc2091e7d51e8795956d SHA512 bae9d8493aa4fe931878ce2f7dcba34955df50fc57e6cf95636a9f765a7310e05c563d93563134011673a94f1e2ca1b8db36cc394578858942560ba774dc1c21
+DIST ansible-lint-6.16.1.tar.gz 483996 BLAKE2B ec6832757fd6cbb5b35f1aa20fbb8161af07d3ac501eb4b04d2d673b1f0e1871a72977521d7df7b4a6a6cc8249c7f24297a5a7bc95b97313653b54433fc23009 SHA512 133ccfbc674c8b960d5ca21254e4456f2a7408e26e6c4c7390891a8cd4321da45520d7519ada6ac49a5b67cb6c43d7f8d4ccce912f95b533172c0c01ab42acf7
 EBUILD ansible-lint-6.14.6.ebuild 1603 BLAKE2B e49bd3990f0ab7ac3f154b12126c9eab496a5a04fba4ec3feb8dc64e650c7bb92ee58b452b47f5d4f033c0c79fecf2802c7f4f849e34894d3ddcc807ff17b3f3 SHA512 ff499074bbc1a1c39a5662abadd64bdd718e63d0527843ffbc2fdf33efad8ba999d07803e42325857c5b26d552f950fbc8737ceab40ed1522178456b9dfcd320
-EBUILD ansible-lint-6.16.0.ebuild 1604 BLAKE2B 175a5e6a395a728532798d9bbcfa3ac8b01a9eaadc03da1a14944ef011e647fe27297610d3826740f84b1447f987ca4a2cfc0cdc770d43e0719f704729f383a8 SHA512 dcf9c20a305f97e6fd27ef872f504d5c28e378cbbb6679d52ea75e14afccb6204a4cf4fd581ac02cd0744abc1a1cef9b86f059a9137c1cc4fd485d7e981a7569
+EBUILD ansible-lint-6.16.1.ebuild 1603 BLAKE2B 3a5ca64c5b48e3648db6329b152e6bbd20782481e94c13410dae262bb550f47a6b5eefc0b984b513011bf8db1f879b4b403674447be1635a6b1fdfd7d74967c8 SHA512 6454cc7df387777279c87d07335c4ea32c86af8ca9da211981b419d8f6f993f17751f3ce1ffb32143bdcfc25e5f47096ca03c08b99a17ca40b5bca0d873960b7
 MISC metadata.xml 561 BLAKE2B 0f55fc4da270c495c445e5afff0a8f7aaedd01abf3640f848cd9dc21e01fa7324c78846ee4bf917e4869b6c377fef61254a2288fa3d572c1bb77279571fb6631 SHA512 bd6bf6b916a0b736a0bfdd633f6569ce3124458169d77ef1cd86d6dda4099774088871560ce0106e11f139a2b48f13445e7a844e03a8669160c7e3fa44be5f36
diff --git a/app-admin/ansible-lint/ansible-lint-6.16.0.ebuild b/app-admin/ansible-lint/ansible-lint-6.16.1.ebuild
index c90ffecf323a..94df30ddcc84 100644
--- a/app-admin/ansible-lint/ansible-lint-6.16.0.ebuild
+++ b/app-admin/ansible-lint/ansible-lint-6.16.1.ebuild
@@ -29,7 +29,7 @@ RDEPEND="
 	>=dev-python/packaging-21.3[${PYTHON_USEDEP}]
 	>=dev-python/pyyaml-5.4.1[${PYTHON_USEDEP}]
 	>=dev-python/rich-12.0.0[${PYTHON_USEDEP}]
-	>=dev-python/ruamel-yaml-0.17.24[${PYTHON_USEDEP}]
+	>=dev-python/ruamel-yaml-0.17.0[${PYTHON_USEDEP}]
 	>=dev-python/wcmatch-8.3.2[${PYTHON_USEDEP}]
 	>=dev-util/yamllint-1.30.0[${PYTHON_USEDEP}]
 	dev-vcs/git"
diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest
index 9dfbc4c6a6b2..693007720e87 100644
--- a/app-admin/keepassxc/Manifest
+++ b/app-admin/keepassxc/Manifest
@@ -1,10 +1,8 @@
 AUX keepassxc-2.7.3-tests.patch 396 BLAKE2B 998b55785d7b43dfc00ed96548a31816440c49c4241ac702e479127c714d67a6d8980c90bd3775f3a650adcfe10ebbacb3373073f0da28a28464ef6246dee722 SHA512 8948d78c55b2ccad43e1155535b2c7cc980bc05bb01b9e4d732de63946d03f3b2d49bb7cd6ce77f76f8e1192e47d712f3e12bab352138f5ef3ecdc22a41f17bb
 AUX keepassxc-2.7.4-tests.patch 402 BLAKE2B d1d88059d70e8c43f51bdd94ba17222a919059efadc68712e4f6b8e72885f3088ed96793c8ad26f53000e76414b13b9ebcd52ea447b17e7822ce7d3245f30414 SHA512 e401e341c34a117395cb5852f561770a1f65904e6f649cdd2904a89f7b068c53f46e8509d2e4cafc3c213e2326a01838f719d360fde21d63f29962969f3d16ef
-DIST keepassxc-2.7.1.tar.gz 11168642 BLAKE2B 4708821c596e8fc736e086a700d5526be6d9c4cfcb270e3a0a8b73395e9ca3544cbb5973494b15d66e0b98264f4e79d9fa122961407211d346275a9aa1bd5cae SHA512 c2f780ba1f464b32f741d1c6e83734ff220de56dce382f3c38d940abf255d689559c13bff6ad565c38c18cfdb1d883aca52650dba0486e3e28bb4ef872253cc9
-DIST keepassxc-2.7.3-src.tar.xz 8963496 BLAKE2B 7f467960eb618d771e24980caa41ee15ecbb2bbfc6c0d37ddf1c8209e06b81a30b157c9ce00b3fd6c91c39ebaad60cec3513f7c1a64c8b7e0e2f0a116246f080 SHA512 29bf067308915d5ac7843eff3bcfb6c4c53a2108e9e2f5349ed03a0b8893f143dcc743cfc175c0831709bafef566d66baa31c5fe3e6fa5fc9c621bf87362e842
 DIST keepassxc-2.7.4-src.tar.xz 8957372 BLAKE2B 5b8ea105c35956f85779187df624f373f9e6937e1edc454b2a5cbc851ddd2ef0dd556ec74242e3a67c314c1e4b0750987a498d245c3463a5e92254ad0c394ab4 SHA512 76b6ba0891d9ba92a5794ba6f25dc8a28f7c1c0f010c31dd49d52ac4c5f186d9c4b51e6f054102b6dfe2d8e766607455829c1994c7ea238efc8f172bbe29b8eb
-EBUILD keepassxc-2.7.1-r1.ebuild 2368 BLAKE2B e1d3f23456beb2057c29f4040e9244ca2f2452a2dbd75ee8bb807b4921b2a0aa1519aecd31a21a6caa8c4c7b6295cd87bf66f9c01d50c4c98425728429287aeb SHA512 e90e777e8c8ea57551af72b11d82fa5e4fa6bcbe4bb424e0de39b99dddbd8d21b80e5cd1c49c12485da414e3670145144f31a6aa77b0ff163bcccbdb08e23207
-EBUILD keepassxc-2.7.3.ebuild 2527 BLAKE2B 719bdba36c5228cc45fc691a114a1b246d8ad6f9577ebfaba25e2b9f79c24892b948ee445a778eaf705b5cd2f1fdd7eca9d27c242196af36ace971cbbbfb5130 SHA512 119753498d14adc8e654dc53bc30aab27677b7587f6f776173a69cf14603f8781465798ae78405f9deff6762c99896c05ef69673caea22d4597efe635bc3a64e
+DIST keepassxc-2.7.5-src.tar.xz 8706996 BLAKE2B 6df7ec9e560b469b8e3ae9026464e6c2064ffd262b118842a3cd5fbf72758aa0e5614cb2581392b6ab35b3d202acbdad24e1679ca162468f78e88dd94af2422f SHA512 904fe319cb18a06e86162a0a4c4fbcac05b9e6936b69c5362b7fe2b89cd268061cadd6854f7dde80d3e8cfa2b9e22c27974277f3db1f6c32a2720e01a4c4aa1b
 EBUILD keepassxc-2.7.4.ebuild 2526 BLAKE2B b7d6f5bdf53e95c2b94b8f3f705c3524aaae6c03962df6203066988e6eea5c2c011c6943d2e494e6781cc2544a25e0a081eec09ee3f6a16eca730cbe5ccf94c0 SHA512 7cc34e7e6644053ed718ae658b66efe982a3984f3b776f98f41b35a9f1f301f7aab47f99acf7be278812e24d9dee82007e192dc795e15e2f95a0fad097822a94
-EBUILD keepassxc-9999.ebuild 2506 BLAKE2B 7b7c0c7e7afe14a683d08203e032156a8cff2c9712b670d5cfbf1dd1a31e5520d74bd13f7d1a678b9c908614473df9066a21134446a24340898ec864ec4bfa3b SHA512 68d89c9cf5487590df16ec8a028a89a60a0885ab621a81a0f270045583891d605120b108aefa3f55e42aae6082deff4345c10b6a9c4a7a543bb3a6f7dc880570
+EBUILD keepassxc-2.7.5-r1.ebuild 2456 BLAKE2B 510a6c6ac3324611d53be7915754da5f209fec31d6a28d62b8f0c752ea9fe1db1bfbfe96c8de09c51c09f3b15c3d9804511e87378d5b57002eb94f8ea1a2f098 SHA512 2120dcd9a4d51a9e45b98efbad51fd7f766da4ac6524171afff1a791ad9c1d5fc28ac01badbf911a8adb18c9e57535f6d2db77c09953e40eb08991a94fc2450d
+EBUILD keepassxc-9999.ebuild 2405 BLAKE2B f05e9a7c3fa3bb4607d2642e3fb088ba242ba06243e7477c7bd770fa339ab617b6f35da9856eb90f74d4f0ba80d51c51ca0d47bab3ad055bcfa917d4a3e30c6a SHA512 b3c7f93d0a1ffb03b777b33267898a71ff782aa7687d8756bff6fb737c8b46b382399f65a63126e776e64bd6e7d0d23659c8b7ec751bed1271766366267c98f0
 MISC metadata.xml 1077 BLAKE2B 410793b2f278ccbddceb10a72e4a010f4b2d6fc81bd8a472b867e1230d43a0e6f461ff6459095d334536d462e2297c4978dbb247e3a5ccb82c36fd70c6f44b51 SHA512 d338787a7ea319d752c19314ee53ee1306293ae2dddeedd22bd010e990a1680fdd1b96c5173c653b4dbbe336d713a07f9fc1a771951fca8636b3973361787f20
diff --git a/app-admin/keepassxc/keepassxc-2.7.1-r1.ebuild b/app-admin/keepassxc/keepassxc-2.7.1-r1.ebuild
deleted file mode 100644
index bf2430003375..000000000000
--- a/app-admin/keepassxc/keepassxc-2.7.1-r1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake flag-o-matic xdg
-
-DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition"
-HOMEPAGE="https://keepassxc.org"
-
-if [[ "${PV}" != *9999 ]] ; then
-	if [[ "${PV}" == *_beta* ]] ; then
-		SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
-		S="${WORKDIR}/${P/_/-}"
-	else
-		SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV}.tar.gz -> ${P}.tar.gz"
-		#SRC_URI="https://github.com/keepassxreboot/keepassxc/releases/download/${PV}/${P}-src.tar.xz"
-		KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
-	fi
-else
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/keepassxreboot/${PN}"
-	[[ "${PV}" != 9999 ]] && EGIT_BRANCH="master"
-fi
-
-LICENSE="LGPL-2.1 GPL-2 GPL-3"
-SLOT="0"
-IUSE="autotype browser doc keeshare +network test yubikey"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	app-crypt/argon2:=
-	dev-libs/botan:2=
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	media-gfx/qrencode:=
-	sys-libs/readline:0=
-	sys-libs/zlib:=
-	autotype? (
-		x11-libs/libX11
-		x11-libs/libXtst
-	)
-	keeshare? ( sys-libs/zlib:=[minizip] )
-	yubikey? (
-		dev-libs/libusb:1
-		sys-apps/pcsc-lite
-	)
-"
-DEPEND="${RDEPEND}
-	dev-qt/qttest:5
-"
-BDEPEND="
-	dev-qt/linguist-tools:5
-	doc? ( dev-ruby/asciidoctor )
-"
-
-src_prepare() {
-	if [[ "${PV}" != *_beta* ]] && [[ "${PV}" != *9999 ]] && [[ ! -f .version ]] ; then
-		printf '%s' "${PV}" > .version || die
-	fi
-
-	 cmake_src_prepare
-}
-
-src_configure() {
-	# https://github.com/keepassxreboot/keepassxc/issues/5801
-	filter-flags -flto*
-
-	local mycmakeargs=(
-		# Gentoo users enable ccache via e.g. FEATURES=ccache or
-		# other means. We don't want the build system to enable it for us.
-		-DWITH_CCACHE=OFF
-		-DWITH_GUI_TESTS=OFF
-		-DWITH_TESTS="$(usex test)"
-		-DWITH_XC_AUTOTYPE="$(usex autotype)"
-		-DWITH_XC_DOCS="$(usex doc)"
-		-DWITH_XC_BROWSER="$(usex browser)"
-		-DWITH_XC_FDOSECRETS=ON
-		-DWITH_XC_KEESHARE="$(usex keeshare)"
-		-DWITH_XC_NETWORKING="$(usex network)"
-		-DWITH_XC_SSHAGENT=ON
-		-DWITH_XC_UPDATECHECK=OFF
-		-DWITH_XC_YUBIKEY="$(usex yubikey)"
-	)
-	if [[ "${PV}" == *_beta* ]] ; then
-		mycmakeargs+=( -DOVERRIDE_VERSION="${PV/_/-}" )
-	fi
-	cmake_src_configure
-}
diff --git a/app-admin/keepassxc/keepassxc-2.7.3.ebuild b/app-admin/keepassxc/keepassxc-2.7.5-r1.ebuild
index fe3795ec295f..7b6665499602 100644
--- a/app-admin/keepassxc/keepassxc-2.7.3.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.7.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,12 +11,11 @@ HOMEPAGE="https://keepassxc.org/
 
 if [[ "${PV}" != *9999 ]] ; then
 	if [[ "${PV}" == *_beta* ]] ; then
-		SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
+		SRC_URI="https://github.com/keepassxreboot/${PN}/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
 		S="${WORKDIR}/${P/_/-}"
 	else
-		#SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV}.tar.gz -> ${P}.tar.gz"
-		SRC_URI="https://github.com/keepassxreboot/keepassxc/releases/download/${PV}/${P}-src.tar.xz"
-		KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+		SRC_URI="https://github.com/keepassxreboot/${PN}/releases/download/${PV}/${P}-src.tar.xz"
+		KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 	fi
 else
 	inherit git-r3
@@ -33,7 +32,7 @@ REQUIRED_USE="autotype? ( X )"
 
 RDEPEND="
 	app-crypt/argon2:=
-	dev-libs/botan:2=
+	dev-libs/botan:3=
 	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
 	dev-qt/qtdbus:5
@@ -63,7 +62,7 @@ BDEPEND="
 	doc? ( dev-ruby/asciidoctor )
 "
 
-PATCHES=( "${FILESDIR}"/${P}-tests.patch )
+PATCHES=( "${FILESDIR}"/${PN}-2.7.4-tests.patch )
 
 src_prepare() {
 	if [[ "${PV}" != *_beta* ]] && [[ "${PV}" != *9999 ]] && [[ ! -f .version ]] ; then
@@ -86,6 +85,7 @@ src_configure() {
 		-DWITH_XC_AUTOTYPE="$(usex autotype)"
 		-DWITH_XC_DOCS="$(usex doc)"
 		-DWITH_XC_BROWSER="$(usex browser)"
+		-DWITH_XC_BOTAN3=ON
 		-DWITH_XC_FDOSECRETS=ON
 		-DWITH_XC_KEESHARE="$(usex keeshare)"
 		-DWITH_XC_NETWORKING="$(usex network)"
diff --git a/app-admin/keepassxc/keepassxc-9999.ebuild b/app-admin/keepassxc/keepassxc-9999.ebuild
index 2254b764e96e..6a9c59967077 100644
--- a/app-admin/keepassxc/keepassxc-9999.ebuild
+++ b/app-admin/keepassxc/keepassxc-9999.ebuild
@@ -11,11 +11,10 @@ HOMEPAGE="https://keepassxc.org/
 
 if [[ "${PV}" != *9999 ]] ; then
 	if [[ "${PV}" == *_beta* ]] ; then
-		SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
+		SRC_URI="https://github.com/keepassxreboot/${PN}/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
 		S="${WORKDIR}/${P/_/-}"
 	else
-		#SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV}.tar.gz -> ${P}.tar.gz"
-		SRC_URI="https://github.com/keepassxreboot/keepassxc/releases/download/${PV}/${P}-src.tar.xz"
+		SRC_URI="https://github.com/keepassxreboot/${PN}/releases/download/${PV}/${P}-src.tar.xz"
 		KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 	fi
 else
diff --git a/app-admin/mcelog/Manifest b/app-admin/mcelog/Manifest
index a62e261162d1..338cf5bdb54c 100644
--- a/app-admin/mcelog/Manifest
+++ b/app-admin/mcelog/Manifest
@@ -1,10 +1,6 @@
 AUX mcelog-0.8_pre1-timestamp-mcelog.patch 425 BLAKE2B 5952e26c668fb71f712fc70b3419dbb7b3e418f8903f3104fcf8d525cb117ce278f4669551a6cbeadd7f03d3bd022781a88c335c6ac84600d3bdf02a3d8277d3 SHA512 77312f9346c7e16141a57a5e44964d0b2cab77a428403d19cfc9558af55b250be7c9fadaecf87c8d78075251a7fc3ab309e0cbbdbb30ddc4423717cb3979a1db
 AUX mcelog-129-debugflags.patch 416 BLAKE2B 97aa6da3146380b40013966bb109de41215890cb4b6431ad694c2684f498d13287e385119304a816270f470ff26529967701c92bfc845a8aac698a0aa0f67271 SHA512 cda86c3e74f56fcd9d8771b26ca91c32ccc33e6bcd6dd0fcf856c14096daa619257d237e1e187e7820d6a0a0553ae6fd9ec160ea59e237b4e05ebca4e6656e20
 AUX mcelog.init-r1 349 BLAKE2B 17f8a28dc1174fa62d50cb0d6dcae7bf4755ea99ff380d42a5beb16ab6ca07f1dbfcf7783ecb3b8f85f714357c39b0a333630c69e0bef5af32ba602686117cfd SHA512 a43f0efe7eb5007e9422ca2eba43b666d5110696c8b049b74990849e200b89b99e3d22707803e21e4452b0e75bbacdec0526ed933b234301ebbbb19d700df0d4
-DIST mcelog-192.tar.gz 317443 BLAKE2B 071c9e29aa049a2b559feb692d258df0685baaec614c4866d09cc8e9c8e8dad1e5064e661215c179649792cf3375e98aaa70fbe2629f5ba2b51b489ed9198b20 SHA512 dbdab35a4d3d2a3d395adb6384143d6ce53a2f598a9868e8777bd0588837621f7be74fdf6299b9949a4195ab6b242d9069686d07fe14fe23447d13e2dcfe7966
-DIST mcelog-193.tar.gz 317427 BLAKE2B cd83a671e79549ecf38908de6ae5f2561ef48d0d210d26786f6f0299c31ee5c712df8a37a9e0969f3a88e43c9ec092befb599dca3a72eb2f5368daa6d110d882 SHA512 d0854222ce651ef583d0ebc8ec5cdeb8a06354c514a9e1465dd96b9bc914a32b6e730e8cd2dff71b08cd20a7a5ef13c8e191b47955cdcbbe9eee3ae9906491ec
 DIST mcelog-194.tar.gz 317449 BLAKE2B 68124209247ab0545d2f33c703bc6c10a6225275b929fe035cdad49f30d0ed2e8e5b30968b29f95c537a406b6aaca322adeaa22f1dc33c5f6dc92526f707b003 SHA512 b253b96bac2b6abe6c112f26b0b2d7cfc7720235fa0eec85bd60b1670d36d4032c8c9b27b9e0e22d77b4247ac661bf9278cf0bd43f196fd446ca3e04a41b65ed
-EBUILD mcelog-192.ebuild 1129 BLAKE2B 5dcdcbf6d07baca3a81624ffa61d9bb083713c399abd04ffaa1c6c0c8bb21855e8cbfdf969c2f03bd78f3aa03196ca22059f2dc3ee5c5bc8ae7ec5a067d85b11 SHA512 1af01c906c6110b9fffbfe0e564a31b4b2bff60cd321b622ffdd04ea1d6eb4782e7b0a5ff25018c5d72af98f534b0a1c80e08619f11244472251a08fee872330
-EBUILD mcelog-193.ebuild 1131 BLAKE2B 10eccf37a64cee135911a7c33d10a27fbdebff2940f67b7bc52b662977168390cbbc8c5ce978286f207bb6a905f66a3c6f1c6809ee0396c59615588c2d0b2959 SHA512 66301d1517a74ee22f94b3627f49b1af176b2d26d39e35665fadc461e0cd6d6cfd15026e98386d5dc8939dcea5b70198f45609f4a01f888f48eee5f5a8271934
-EBUILD mcelog-194.ebuild 1131 BLAKE2B 10eccf37a64cee135911a7c33d10a27fbdebff2940f67b7bc52b662977168390cbbc8c5ce978286f207bb6a905f66a3c6f1c6809ee0396c59615588c2d0b2959 SHA512 66301d1517a74ee22f94b3627f49b1af176b2d26d39e35665fadc461e0cd6d6cfd15026e98386d5dc8939dcea5b70198f45609f4a01f888f48eee5f5a8271934
+EBUILD mcelog-194.ebuild 1129 BLAKE2B 5dcdcbf6d07baca3a81624ffa61d9bb083713c399abd04ffaa1c6c0c8bb21855e8cbfdf969c2f03bd78f3aa03196ca22059f2dc3ee5c5bc8ae7ec5a067d85b11 SHA512 1af01c906c6110b9fffbfe0e564a31b4b2bff60cd321b622ffdd04ea1d6eb4782e7b0a5ff25018c5d72af98f534b0a1c80e08619f11244472251a08fee872330
 MISC metadata.xml 538 BLAKE2B 02cb85b3717b287e5e6a02db8c5485d52d1a5f7c9f927fad728ea8c313a93ebdb1aac5ac070cb852f18aae2cfebf5096ddb2c298948bc60180e4093c532aa899 SHA512 865e9e806a9fcf1d21ae7cd15c0e65196b3ccf7f866dc69237594908f020e224eca35d2d49fe70bef1e4d38b084ec8558e849148e470d3e22959f85177545bdc
diff --git a/app-admin/mcelog/mcelog-192.ebuild b/app-admin/mcelog/mcelog-192.ebuild
deleted file mode 100644
index 0fa9f2df80c2..000000000000
--- a/app-admin/mcelog/mcelog-192.ebuild
+++ /dev/null
@@ -1,51 +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 linux-info python-any-r1 systemd toolchain-funcs
-
-DESCRIPTION="A tool to log and decode Machine Check Exceptions"
-HOMEPAGE="http://mcelog.org/"
-SRC_URI="https://github.com/andikleen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="selinux"
-
-RDEPEND="selinux? ( sec-policy/selinux-mcelog )"
-DEPEND="${PYTHON_DEPS}"
-
-# TODO: add mce-inject to the tree to support test phase
-RESTRICT="test"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != buildonly ]]; then
-		local CONFIG_CHECK="~X86_MCE"
-		kernel_is -ge 4 12 && CONFIG_CHECK+=" ~X86_MCELOG_LEGACY"
-		check_extra_config
-	fi
-}
-
-src_prepare() {
-	eapply "${FILESDIR}"/${PN}-0.8_pre1-timestamp-${PN}.patch \
-		"${FILESDIR}"/${PN}-129-debugflags.patch
-	eapply_user
-	tc-export CC
-	python_fix_shebang genconfig.py
-}
-
-src_install() {
-	default
-
-	insinto /etc/logrotate.d/
-	newins ${PN}.logrotate ${PN}
-
-	newinitd "${FILESDIR}"/${PN}.init-r1 ${PN}
-	systemd_dounit ${PN}.service
-
-	dodoc *.pdf
-}
diff --git a/app-admin/mcelog/mcelog-193.ebuild b/app-admin/mcelog/mcelog-193.ebuild
deleted file mode 100644
index 7d504ed20d59..000000000000
--- a/app-admin/mcelog/mcelog-193.ebuild
+++ /dev/null
@@ -1,51 +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 linux-info python-any-r1 systemd toolchain-funcs
-
-DESCRIPTION="A tool to log and decode Machine Check Exceptions"
-HOMEPAGE="http://mcelog.org/"
-SRC_URI="https://github.com/andikleen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="selinux"
-
-RDEPEND="selinux? ( sec-policy/selinux-mcelog )"
-DEPEND="${PYTHON_DEPS}"
-
-# TODO: add mce-inject to the tree to support test phase
-RESTRICT="test"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != buildonly ]]; then
-		local CONFIG_CHECK="~X86_MCE"
-		kernel_is -ge 4 12 && CONFIG_CHECK+=" ~X86_MCELOG_LEGACY"
-		check_extra_config
-	fi
-}
-
-src_prepare() {
-	eapply "${FILESDIR}"/${PN}-0.8_pre1-timestamp-${PN}.patch \
-		"${FILESDIR}"/${PN}-129-debugflags.patch
-	eapply_user
-	tc-export CC
-	python_fix_shebang genconfig.py
-}
-
-src_install() {
-	default
-
-	insinto /etc/logrotate.d/
-	newins ${PN}.logrotate ${PN}
-
-	newinitd "${FILESDIR}"/${PN}.init-r1 ${PN}
-	systemd_dounit ${PN}.service
-
-	dodoc *.pdf
-}
diff --git a/app-admin/mcelog/mcelog-194.ebuild b/app-admin/mcelog/mcelog-194.ebuild
index 7d504ed20d59..0fa9f2df80c2 100644
--- a/app-admin/mcelog/mcelog-194.ebuild
+++ b/app-admin/mcelog/mcelog-194.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/andikleen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="selinux"
 
 RDEPEND="selinux? ( sec-policy/selinux-mcelog )"
diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index 3400eb61eb6b..c49f41a70578 100644
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
diff --git a/app-backup/borgmatic/Manifest b/app-backup/borgmatic/Manifest
index 4ddd1c6ff847..b7087705724c 100644
--- a/app-backup/borgmatic/Manifest
+++ b/app-backup/borgmatic/Manifest
@@ -1,10 +1,10 @@
 AUX borgmatic-1.5.1-no_test_coverage.patch 284 BLAKE2B 91e041cb2d3d15b65c47075b0524e6e2a60631702eb10243da79b8051504e33476e6f8d61a3d9a172302b9859a01afb0d640a502cc95f69e45024a8fdb5ebc53 SHA512 1604d425f4c3267a41449f5d05675634f365d0be0630b49812e87d13ebc4ee78e01259f2371afbf2150b5b1203676e20c50c1613be24e0fa39df635d229f80bc
-AUX borgmatic-1.7.12-tests_flexmock.patch 744 BLAKE2B 91b09690867568f3158f7a9f01b157c483fc77a975348ce99ec71c2773941a247a5ce8b89bf9a965a37e39166e775d450e2b718156a0bbd81869f074e76816b0 SHA512 d90f633b914efd95d282630a07fea9ad93770588b439d4aee00e6866fa10ffd1b4797c200b5b0566e1d9b028fdc265ac0b701b049220a88a7397ba50d090ca0b
+AUX borgmatic-1.7.13-no_test_coverage.patch 248 BLAKE2B 624e21cc8971d9374b34dee002635d9090576ba785cf3b6da7c10a91f439fd8e11b335bb33dc9c3b7421b4a5a8982e2a5f67b723b06051969651d626f09bf972 SHA512 fc549c0a63a6182b1848d89a1c9aacd3057f07988d1e8ec3b6ae1defb0675e7b934b0c65c9b09edc431172bc550521058ab73cb64ae6e577072331d4d5269e78
 AUX borgmatic-1.7.3-systemd_service_bin_path.patch 604 BLAKE2B 9b1c613ce2667d2b8846e1bdf7e7bd838529fb9029af2ca572dcbafc5a8c9b64c79cab820be3b750c5fcb060da72cdf1c449cbe50efefe63ef1eb6a884e26e14 SHA512 6ca6c351697db1ae26de2b00ad543fc8f1cea1b0f4ef84f82f9578d9e56da58b4437ed48839c5aaf7d5ea66fcb79620d0cc12b8a2b30862b488fae07ad182638
 DIST borgmatic-1.7.11.tar.gz 365247 BLAKE2B a06737c48722fdf24efca76d40f6b413f39635b4137685d6279bf7a7dd002fadef28dab35a503fabf872c732a0f32fbff8c791fa9b4602299937aeae568d6137 SHA512 cedca889cd409e92484c15240fd8da91c655f81e38c6672d25e44feedc4adf6594281d92f7072fd11edc5c9f8589098226a3520e71e3441ee7a7acf97e1b2daa
-DIST borgmatic-1.7.12.tar.gz 371090 BLAKE2B eb06d88320f2c49721938c756d637b6ce463192260ac734303079095c693cadde68805356249fdad86738bed8ea0afa2e7a5c5de3c68bbedba2162e1cb445cdd SHA512 6688eb48d9ac82e9c43816aebab36b6dc011132e9f90591b7add423743a7305f55ca60f3f02f983c2d5d2e86e2429da62aec2508fac472b05334a025a308c325
+DIST borgmatic-1.7.13.tar.gz 378163 BLAKE2B c20b384853c0ddf52a095250a05d9ebe813a23ee6ef00bd5748dacf05adcff9e4d324eb2e785ebbf139d34cadab3e58d3b8305d50ec5ff20681630040433e5ae SHA512 5109c093ad3096269e27abe761e6e87ebc31b78a56bfe16e540c686ea1cd935249d063aa7c350b60a3c509990065f3a50f9e4516d40d4a1bde68c43617de18b4
 DIST borgmatic-1.7.8.tar.gz 350233 BLAKE2B 3fcd392983f73ec5e97f0dc6b96e211d7f1e1d1a4ce95c635c675cf043e796925df53c30c1e4f8eb1a095d9ec5ff81e90edee5ff2576f4683053d3108004afd9 SHA512 bcc65fdb7ea1171fb61deda9b1f69a00596e1e10a99508d336977b694bd8f93d74837aad9211bf1065b785220aaf1460a3ea403bf23fa4873d1bf4c6b4016525
 EBUILD borgmatic-1.7.11.ebuild 2046 BLAKE2B c7f49967f3783c437566bfc3819ee42c953ede06df4996efb565d1f39b133f8f0e388f95c91d9637a17f00344b10a151aaeeaeab7b3e31cb953c9542b23f20d4 SHA512 bc18e9feaa4aa68ac4cee4e99e576f79f5b7b2c520810ecd798ed416739fa254c59c7e4fd40adb44d04421088dfab9776acba9c653d8b42d0ce91b9e765465c0
-EBUILD borgmatic-1.7.12.ebuild 2095 BLAKE2B 5fc7dfef5212ad538e5a2649f1b4227452abf5c0b0583e843e74cb7481d887952ce29bd0a5b4cdb3b69cc0614bcb3e04ab2982edae21b189d7291b3270274fdd SHA512 0c8466dd7cd8a19a08714f5ec466b48d19c5cad74dc37f6be62eb643863d917e620e5fc24e4ee0c96fcae486cf1574e709e296e81d66a0acdd13b73fa0544b65
+EBUILD borgmatic-1.7.13.ebuild 2047 BLAKE2B ac75a7aa37070e15819b02da978ecb319a18277733880b355b397b3f9196501f3c4d9cd54f556422d334e45378908a6a1e32ec1153a6422764af66b84fde32c0 SHA512 9f05bb948ea55cd006bb67d6ebf9286adc027096e9fca4b6fd00e5b84b2c8bf7760d846d5fed5336adc2b85bb11dcb575790d12819ad977c4e36561e46c2942c
 EBUILD borgmatic-1.7.8.ebuild 1643 BLAKE2B 9e05c2bfc9894d3e3636d17254cbd6d386d44fdb3305d16278be5a42d6bd56f3d1e0b81c53245b264d91118b10c03fc9515573146ad47b15b5b8148f77c849e5 SHA512 0c3788e897ab3a838548f456a6b3ccbc644d877f7ce83bbbbea59f9f586c3e69af44222016cfb0fe803e639baeebe61d7e77b5160b4ed7ea223add48c3dbca6b
 MISC metadata.xml 380 BLAKE2B bd4f6eb451caa6b36d51dff099c7885ad2c30f2f9f5397e12049a28214601d67853f0dc604e6e42a566b8bf57acf0d9e39c685af8743cce72ec3b5b07adea72e SHA512 1d2c0a22d3b844b58ed35f3fae261a1d6906e5e1b0e69bbe364e0409f335b44f04089ea1d0e6144e2ddfcf066cc8ad85d14c0b22a28ddd22d235c48e1401569f
diff --git a/app-backup/borgmatic/borgmatic-1.7.12.ebuild b/app-backup/borgmatic/borgmatic-1.7.13.ebuild
index 128d6c2e7a7c..89d5cb17e987 100644
--- a/app-backup/borgmatic/borgmatic-1.7.12.ebuild
+++ b/app-backup/borgmatic/borgmatic-1.7.13.ebuild
@@ -33,9 +33,8 @@ BDEPEND="
 	)"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.5.1-no_test_coverage.patch
 	"${FILESDIR}"/${PN}-1.7.3-systemd_service_bin_path.patch
-	"${FILESDIR}"/${PN}-1.7.12-tests_flexmock.patch
+	"${FILESDIR}"/${PN}-1.7.13-no_test_coverage.patch
 )
 
 # A fragile test whose only purpose is to make sure the NEWS file
diff --git a/app-backup/borgmatic/files/borgmatic-1.7.12-tests_flexmock.patch b/app-backup/borgmatic/files/borgmatic-1.7.12-tests_flexmock.patch
deleted file mode 100644
index 5c41f9a7e701..000000000000
--- a/app-backup/borgmatic/files/borgmatic-1.7.12-tests_flexmock.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From ebe5c5e83903685742a39ae63b779d7a64527cff Mon Sep 17 00:00:00 2001
-From: polyzen <polyzen@noreply.torsion.org>
-Date: Fri, 14 Apr 2023 01:01:31 +0000
-Subject: [PATCH] Fix "TypeError: 'module' object is not callable" in
- test_commands.py
-
---- a/tests/integration/borg/test_commands.py
-+++ b/tests/integration/borg/test_commands.py
-@@ -1,6 +1,6 @@
- import copy
- 
--import flexmock
-+from flexmock import flexmock
- 
- import borgmatic.borg.info
- import borgmatic.borg.list
-@@ -105,4 +105,4 @@ def test_display_archives_info_command_does_not_duplicate_flags_or_raise():
- 
-         borgmatic.borg.info.display_archives_info(
-             'repo', {}, '2.3.4', fuzz_argument(arguments, argument_name)
--        )
-+        )
-\ No newline at end of file
diff --git a/app-backup/borgmatic/files/borgmatic-1.7.13-no_test_coverage.patch b/app-backup/borgmatic/files/borgmatic-1.7.13-no_test_coverage.patch
new file mode 100644
index 000000000000..a3c02598b724
--- /dev/null
+++ b/app-backup/borgmatic/files/borgmatic-1.7.13-no_test_coverage.patch
@@ -0,0 +1,11 @@
+--- a/setup.cfg
++++ b/setup.cfg
+@@ -3,7 +3,7 @@
+ 
+ [tool:pytest]
+ testpaths = tests
+-addopts = --cov-report term-missing:skip-covered --cov=borgmatic --ignore=tests/end-to-end
++addopts = --ignore=tests/end-to-end
+ 
+ [flake8]
+ max-line-length = 100
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index 78b5145718e8..b67810433cd4 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/editorconfig-emacs/Manifest b/app-emacs/editorconfig-emacs/Manifest
index 54edff40dfd5..d5b236c82291 100644
--- a/app-emacs/editorconfig-emacs/Manifest
+++ b/app-emacs/editorconfig-emacs/Manifest
@@ -1,8 +1,10 @@
 AUX 50editorconfig-emacs-gentoo.el 436 BLAKE2B 3472733b5554060e3067ac6b4efdfcfb2061c4d94b07379cf73006e81213ce0c2441018354cdc05a9fa6f2d9e9b8b86faf863ec499707c32a31dcfdb9c71ab1f SHA512 d118b13c8ccfcb8e50274db3edd69c2aa392f4012d426a37183adf0eb5efc1b041bd7379a03ff19691f85c41c3c822580d9affa62820ce7284c25dcd164e2d3f
 DIST editorconfig-emacs-0.10.0.tar.gz 41242 BLAKE2B 24d0daeb162b5f31ac31425fa2ac17bc0ef4d7a1f2fa330f523feb2de06efbc3a56f61bd92cf282ebb6155a38c18f687dd623fe8cf5c2e765f33b4ab76131410 SHA512 e13a08fde8bea7538c3aec34b9a4f5210a8f1e17bbec3500c302336c30a28d0fbe8b9ddaf7da186d4e74e94b2a85912204cb2bfa27923c15d7c71b3a2d4ce027
+DIST editorconfig-emacs-0.10.1.tar.gz 41259 BLAKE2B d03a86413122db05d87af4ea1a51087f22998d362e66965d0a6cd0f67ce57d7e6f15c403745ff018114715c1551f439b54a4c2e7e25325bd436c0959ea1a5595 SHA512 dc254ecf38b0f4b8850ff70f5a1a1ac72cd64e3795f5202d4bc8e13a0d1d9351e816e9a92f809cee6c6404348ba9bd1d908e17c2b0bce15dca112fe9cf1efc2b
 DIST editorconfig-emacs-0.8.2.tar.gz 39675 BLAKE2B a2a9641185a00c2908715b59a7e4429008f7587e00552ebc19f6cc38b6a10423c26a25557b887caaddc47d9c136fdec82476ef916e18c06b8228925b4554428b SHA512 6934418fd7890c49d8df7cdac1a0afe066e07ddf6274f674a4624dca47de278a78778f25beca793cdb537852beb7c8df5ea46743fb0bc753acccbb9974448e18
 DIST editorconfig-emacs-0.9.1.tar.gz 39950 BLAKE2B 3914fb730937e5ab44e4fcdb4278be463a6f067d4b4a30b15a66ebc0417ad986b3318f5b80bd8e56ab1d5800b2ddfd96fed26c5ff8d91290dad55dc843a52b6f SHA512 a0b3f162e3c46bc61edc013228205535a6186804e0f3726cfd9c38d523dcfce6bf89f4ea6e24a33861aa1abacc1ac95a3aaf5208ce0fd0d2b286d36b758e61c5
 EBUILD editorconfig-emacs-0.10.0.ebuild 659 BLAKE2B 231d9178558e1f5cdba6ad91a012a1edb670c1f7b05a772e0240bf37cea327d7c2801950555e2eea7c19b039f30535f7fa0900e2fdb4f5163abb064262ab35db SHA512 cd30d7587b50ef3a4d897862c469410740e17432469c39d36e8e15e4b2796f5cadeb3245a5de6dd5f4a5dfaf3c92c54826e8dda7ca0174cd1864a7ddcc67c6da
+EBUILD editorconfig-emacs-0.10.1.ebuild 659 BLAKE2B 231d9178558e1f5cdba6ad91a012a1edb670c1f7b05a772e0240bf37cea327d7c2801950555e2eea7c19b039f30535f7fa0900e2fdb4f5163abb064262ab35db SHA512 cd30d7587b50ef3a4d897862c469410740e17432469c39d36e8e15e4b2796f5cadeb3245a5de6dd5f4a5dfaf3c92c54826e8dda7ca0174cd1864a7ddcc67c6da
 EBUILD editorconfig-emacs-0.8.2-r2.ebuild 643 BLAKE2B cd8b1c3edf7fb93e11d195423f0e8a88ed62973d9233fa202f79737a41f2c8b57490d38d05b44f60abcc87f8b1d6a760356ff5be0921707e034e794f5b085b02 SHA512 9147e98b5153d9965a66b67107f1891c9de1994673607dae4b1bb430715ff6db927b2a29ad487223beef5873e59a5478dc990ebc3db17ebf6069821beb1de437
 EBUILD editorconfig-emacs-0.9.1.ebuild 657 BLAKE2B 13752a9c3478dd2b7771e8bd90cccda8cfd9fb7ee688d8251d563dd32d602e4e1b20ec638a0d0d994f16c37c2164d4dd715653941d70179f72992929aa8a61c5 SHA512 a4be58955b0fb4171cacfeff3a182ff809d543f39c28458d54a6d74938a0f5feaeaa6d935a40cd07f54b52b5ac4cfcf7db7444a34894192e6d5f15bcb58ca524
 MISC metadata.xml 461 BLAKE2B e8415c92944d44ef9186b4882d7a5b912ccc16f224da3faef90b43ee8077e94496234341b80eaaf20a17118ebe6f8e8b0cfb70910c948a3ef5a8f853a02cba22 SHA512 a679c75eda6a98c3810b3fc1982ed8c7ff9349a63541eaf3c2b5dfdfec4d1a97f7c540d6b6442511c2645aed46e4b6d346f01ed952a51eb12d076aab8d29351f
diff --git a/app-emacs/editorconfig-emacs/editorconfig-emacs-0.10.1.ebuild b/app-emacs/editorconfig-emacs/editorconfig-emacs-0.10.1.ebuild
new file mode 100644
index 000000000000..edf5a522f5e1
--- /dev/null
+++ b/app-emacs/editorconfig-emacs/editorconfig-emacs-0.10.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp readme.gentoo-r1
+
+DESCRIPTION="EditorConfig plugin for emacs"
+HOMEPAGE="https://github.com/editorconfig/editorconfig-emacs"
+SRC_URI="https://github.com/editorconfig/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="test"	# make test requires a git repo
+
+SITEFILE="50${PN}-gentoo.el"
+DOCS=( CHANGELOG.md README.md )
+DOC_CONTENTS="The EditorConfig feature is not enabled as a site default.
+	Add the following line to your ~/.emacs file to activate it:
+	\n\t(editorconfig-mode 1)"
diff --git a/app-emacs/eldev/Manifest b/app-emacs/eldev/Manifest
index 6dbe50abf872..a1e0d1d7f5c3 100644
--- a/app-emacs/eldev/Manifest
+++ b/app-emacs/eldev/Manifest
@@ -1,8 +1,6 @@
 AUX 50eldev-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
-DIST eldev-1.2.2.tar.gz 238729 BLAKE2B d1d896033a98ed12c64a90fba828f28794c4196e62007004e14648db3f5bf19a253d50977ba335457793c7e2176857160e684f395429ce4f71ac0a794e10b776 SHA512 b0cdad8b09d019adb9f6c6347e3a3194dc7486e14046ee8d100addbb0e46db23b996237d4008e823a6713c0f55dc7bcb3d6044e3723b95e754e0e121d42beef2
 DIST eldev-1.3.1.tar.gz 259101 BLAKE2B 838c000865c04079c0ca6d03fff0bf3b9a45d1494a9b1d471303769ff21f2bdd99914e188c9fbf450ded8434bab6a5cb40b7c3b8e445f379f32519dda05d94aa SHA512 255f9a8bc68fb625e5ba5cc8f26720f5736ee70f2e08bec1e088e37705576d8d07607f1c365eb4891aa9b8fa422ea034c88e580b7024e3d4548e0fd250c28fa7
-DIST eldev-1.3.tar.gz 258781 BLAKE2B cb5b48622d77a3f79dfad7b9acb08705edaf6b9bc9c5086bd8afad515d0cf0f25a504f2c39a0bfa7a7f55d2855d11d993c02a46fbdf57d4f47e7c0530412f057 SHA512 ed7edbc6c2601cd1db669545d9103c632c46d498eb3839fc87003c1bdc2bbf6eac76f996bb3290e5115b8f474afc0d028db740f2c6bcd1b67e0f6174d321fbcd
-EBUILD eldev-1.2.2.ebuild 1132 BLAKE2B 263bda2f3c385cc92465770b4921f826d767df9b75402f850c6143d2957744fe4d4630c27af77d632793b77db9481521e63249e866b8173576ead80c066e703e SHA512 8d3a0c5ba7eea1980335deaf5a68a7d2f9fb3e361ff5c6ef83574c4cd158c616cf57bd23a30dc35f6a854288a2e9164ba359cc39675b5a186a74e74540edd6df
+DIST eldev-1.4.tar.gz 267097 BLAKE2B bd84241834c69d071f8d5ef89434c52f6a063a20c0d5aee4f5e40e5c1259a1b21648416149286ae197a94274c4d219395ef900cc101afe919540eff88bcc29f7 SHA512 ac5639db96ba157902381024a1442f292e97f85c4c9f005702f897c3755d174663b76972e5d10247cb799dcf27357a4a4e1d870513954b7a9892fbeb8ff8e5ec
 EBUILD eldev-1.3.1.ebuild 1132 BLAKE2B 263bda2f3c385cc92465770b4921f826d767df9b75402f850c6143d2957744fe4d4630c27af77d632793b77db9481521e63249e866b8173576ead80c066e703e SHA512 8d3a0c5ba7eea1980335deaf5a68a7d2f9fb3e361ff5c6ef83574c4cd158c616cf57bd23a30dc35f6a854288a2e9164ba359cc39675b5a186a74e74540edd6df
-EBUILD eldev-1.3.ebuild 1132 BLAKE2B 263bda2f3c385cc92465770b4921f826d767df9b75402f850c6143d2957744fe4d4630c27af77d632793b77db9481521e63249e866b8173576ead80c066e703e SHA512 8d3a0c5ba7eea1980335deaf5a68a7d2f9fb3e361ff5c6ef83574c4cd158c616cf57bd23a30dc35f6a854288a2e9164ba359cc39675b5a186a74e74540edd6df
+EBUILD eldev-1.4.ebuild 1132 BLAKE2B 263bda2f3c385cc92465770b4921f826d767df9b75402f850c6143d2957744fe4d4630c27af77d632793b77db9481521e63249e866b8173576ead80c066e703e SHA512 8d3a0c5ba7eea1980335deaf5a68a7d2f9fb3e361ff5c6ef83574c4cd158c616cf57bd23a30dc35f6a854288a2e9164ba359cc39675b5a186a74e74540edd6df
 MISC metadata.xml 982 BLAKE2B db2324ced8f4bc4ba579130677175a9de7a8dc7b8d937cd902edd69a20bc897bf4ee034acb6a9400b88de82c58c2b144e62ec4ac7b75d8dc63cdf56670cacc9e SHA512 3e4d2d7ea4fbada45b4d933d7711266bcd9ffd217ee3c3e3351e9f66145785dc11449b4f09f5ffa4853d2b475db45e501848d259f80fb5aa26429acadcb6da7d
diff --git a/app-emacs/eldev/eldev-1.3.ebuild b/app-emacs/eldev/eldev-1.3.ebuild
deleted file mode 100644
index 057c43865443..000000000000
--- a/app-emacs/eldev/eldev-1.3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit elisp
-
-DESCRIPTION="Emacs Lisp Development Tool"
-HOMEPAGE="https://github.com/doublep/eldev/"
-SRC_URI="https://github.com/doublep/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-
-DOCS=( README.adoc )
-SITEFILE="50${PN}-gentoo.el"
-
-src_test() {
-	ELDEV_LOCAL="${S}" ./bin/${PN} test
-}
-
-src_install() {
-	elisp_src_install
-	dobin bin/${PN}
-
-	# NOTICE: If ELDEV_LOCAL is defined Eldev will use it
-	# to load up it's components,
-	# if it is not it will bootstrap itself from network
-	# always check if it uses installed Emacs Lisp files.
-	# Also, do not forget to run `env-update` & reopen your shell.
-	# https://github.com/doublep/eldev#influential-environment-variables
-	echo "ELDEV_LOCAL=${SITELISP}/${PN}" >> "${T}"/99${PN} || die
-	doenvd "${T}"/99${PN}
-}
-
-pkg_postinst() {
-	elisp_pkg_postinst
-
-	ewarn "Remember to run \`env-update && source /etc/profile\` if you plan"
-	ewarn "to use Eldev in a shell before logging out (or restarting"
-	ewarn "your login manager)."
-}
diff --git a/app-emacs/eldev/eldev-1.2.2.ebuild b/app-emacs/eldev/eldev-1.4.ebuild
index 057c43865443..057c43865443 100644
--- a/app-emacs/eldev/eldev-1.2.2.ebuild
+++ b/app-emacs/eldev/eldev-1.4.ebuild
diff --git a/app-emacs/macrostep/Manifest b/app-emacs/macrostep/Manifest
index 6783e2781c4d..97b7077fac35 100644
--- a/app-emacs/macrostep/Manifest
+++ b/app-emacs/macrostep/Manifest
@@ -1,7 +1,7 @@
 AUX 50macrostep-gentoo.el 309 BLAKE2B a3d555255e026726f2f8f8660eb53b5659e3a31aea4199c147b50e00dc6d77ce420b75a374bc4ad702610bede69bda9c586bcf60f63754f58d2a7a02da88031f SHA512 87ace5f9e54da6edf3c89f542b0243f270d62d7c2878d18234b800aa3d3af10583c77f1a010e963f07ccd94eea31e1036eb0b7cf53de18b725b440bff437e757
 AUX macrostep-test.patch 403 BLAKE2B b2db44beb31754d258539c79a3c2b49738a1677f2bc9eb2d3db19fad084339e9c5c2d031dbfebb7f2da5b934734adc27d0572023c4503071c729914e17dc06c7 SHA512 cb0f41834fc74679fd8cf89c64e7353ea3b8fa0ec6ec59cb13e1a88210e68b6b92c896e48b39fbcfb2e189933bac6b531c178a8fe1fd910113e77d5a1251b79b
 DIST macrostep-0.9.1.tar.gz 32980 BLAKE2B b2949041ab8e6e894046b1be84a223880544f5432606b229fca5a348cca605112d63837587a55654a64971d97e48b063d8cdf4bf1c3f01b23f1db168eb350dbb SHA512 8e6af8040694371958314ca94ec1fbc7a309f82eaa4fd05333e0d16c369d9342d90c86153ce3890b7dfb12567d69526cfb8a2aa5452f4f53dc9497d92ae08aac
-DIST macrostep-0.9.tar.gz 50226 BLAKE2B e4e4d1b3f8b3a2abb464d4a4c13f4cc2c26114842cf90f68d5ee2082ef521d48b6de30cb743506d6aa15790b630aa7d3eda90578ce308c4c4595bdfb6f58f15b SHA512 1a3b67ddbb29007db542028dc965807764ac3df4ff6b90f42c50b2623843a905e302b316757b8d7975b0f10a06501262b1d9fd6f94c9b09618b31e2a7d602828
+DIST macrostep-0.9.2.tar.gz 33067 BLAKE2B 0fd25c8ae8827032286890040dadc2f3f2ca20d2fb5366acfe0a6a319f4dc20e2ff17fb59355b2bab36a9cea418122f5c3ae1485bc2ea9989f9c7c5fe4e4b390 SHA512 55d4c0c09f184a3e2218dc484d3c0f57255d591db910082d466f835b084aaa5d795636d337fa1f642a9a97858eaef63b58771f5583c975488f07ed0f87bdbb32
 EBUILD macrostep-0.9.1.ebuild 663 BLAKE2B 6b6d33d576138e672fe6478cfc341955395c7f40cdbcd6d9cde36b764c93ae1b28387f1f0886eedb94e7b8603b354387d97d529f95f69b994b6782a8b4a61e64 SHA512 4cba5497782d5390b22538ffe00d0e171c7b64935fb74684cb6487a3f2a14852a06f26129a4cd102c359d84181b95b6a5673e6b0e093964e0d68eccef4a894fa
-EBUILD macrostep-0.9.ebuild 607 BLAKE2B 55f3a05c2f79159714c889389ad0d3fbc1c69430a6e07d0bb8f0a18d438bc42d2e80fa0a15fe1f342e8500561a75ead47fd25e599e3b44f9f83ebd3830602489 SHA512 8ec33bc61b790549c205987f1caed28f60670b87c79e1859afb07b32d5f4c089804a5f6074642b9ca05e7ae54f56f63d58e25ef7b59da2e498334d4f93aa4e53
+EBUILD macrostep-0.9.2.ebuild 663 BLAKE2B 6b6d33d576138e672fe6478cfc341955395c7f40cdbcd6d9cde36b764c93ae1b28387f1f0886eedb94e7b8603b354387d97d529f95f69b994b6782a8b4a61e64 SHA512 4cba5497782d5390b22538ffe00d0e171c7b64935fb74684cb6487a3f2a14852a06f26129a4cd102c359d84181b95b6a5673e6b0e093964e0d68eccef4a894fa
 MISC metadata.xml 1330 BLAKE2B 9433c1a89ad42d6c25669e92929e445fd502094cd09814f1b9a1b464d92da7ab8cd39055d45bee0194ed3b3b6154648587a41de2ed66924da14586fce4a4e18a SHA512 f751a0672edfdff536687b570cd51d2f7b38281e7da86636c52fe56a21f2c9f60a60fa4a1dae030ff44146c58fd70105690adfbddf8812491ca72d0bce185983
diff --git a/app-emacs/macrostep/macrostep-0.9.ebuild b/app-emacs/macrostep/macrostep-0.9.2.ebuild
index 6189cca0567b..c24309d913e4 100644
--- a/app-emacs/macrostep/macrostep-0.9.ebuild
+++ b/app-emacs/macrostep/macrostep-0.9.2.ebuild
@@ -6,15 +6,18 @@ EAPI=8
 inherit elisp
 
 DESCRIPTION="Interactive macro-expander for Emacs"
-HOMEPAGE="https://github.com/joddie/macrostep/"
-SRC_URI="https://github.com/joddie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/joddie/macrostep/
+	https://github.com/emacsorphanage/macrostep/"
+SRC_URI="https://github.com/emacsorphanage/${PN}/archive/${PV}.tar.gz
+	-> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-DOCS=( README.org )
 PATCHES=( "${FILESDIR}"/${PN}-test.patch )
+
+DOCS=( README.org )
 SITEFILE="50${PN}-gentoo.el"
 
 src_test() {
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index 271fb04424b2..1d81b6ee56c1 100644
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
diff --git a/app-shells/gentoo-bashcomp/Manifest b/app-shells/gentoo-bashcomp/Manifest
index 967ef21015da..166acbaaa4ac 100644
--- a/app-shells/gentoo-bashcomp/Manifest
+++ b/app-shells/gentoo-bashcomp/Manifest
@@ -1,5 +1,5 @@
 DIST gentoo-bashcomp-20190211.tar.bz2 21508 BLAKE2B 410994819f62b0bd105ca398c335d76993fd694b8e7f56c761b94fc1e2f6e90f2010f2f2a88febd71ac0c5643fc0e923c60151fbf9411e8a553b5917d6bcd8db SHA512 4b0a5e79f90ee8122fa8d0a7224fee6472b1762a0dda680ea1c0e8d4069760be9b6472e052b1b166a389c0e779816b98715386dbc62a3574e7ad851b2567a070
 DIST gentoo-bashcomp-20230313.tar.bz2 21536 BLAKE2B 5dc47aecf68fc19c177026582d98b441d09a15bf0f9e618533c62a37b7986ab6d619f2873b58697f484830bbe88e7697755bb7ee14fb8c55be12e7296e1acfec SHA512 482bf1444e76da544bfbab727f9016abcc82ed4283e31e7ad1e1d302cfe67edfc55cdc37871ae53c09e4e3ce5a5e20dd5f8994ec60e1698076bc81659a2fa3b0
 EBUILD gentoo-bashcomp-20190211-r1.ebuild 745 BLAKE2B 27670d155e17573b710018641de88818f340fa9a59e3e095cfc3f8eb6c89dabda89d91d32d0c910ae8a2cf86e37691c56b3afe6e3597f25b840da0dce807ef59 SHA512 f5d0e6a73ba692f6202185b1b893535aa7013393a803e638957dcfbc49ad5559f82694272999ff93d159611758b7b69a3d383d6d3bf0afd186b150cc351cb629
-EBUILD gentoo-bashcomp-20230313.ebuild 753 BLAKE2B c0ba5b7d9674830502ea4c80d6c2f639c6d27d75c26f15fecde0786a425b40e2adc91f782bb7a39a0a0c68dfa176ed6f842bde5ef509c3ed089fc94676eda55c SHA512 51aec1c8c70a056c122d28a65fea9ba55cd54f4183550963bd7a8f88d4b2f26c1b35e92e11544f773398d4904d73db788b1892a78e77c4c9d0fdbee4d4f009c1
+EBUILD gentoo-bashcomp-20230313.ebuild 751 BLAKE2B c7c6babb958c0fb21c94beb98b91e1d77dbe6d170e9054bc521b22821ee9a4e909b06c78597ce0416d6edae404e9ba677f63e9ce72ce6cfed471570e3d150096 SHA512 365dd0660ed9c8b5306855f8ac8e471c27a997fc477dfc0e3a77965cdc9314974e4cbb504ab8eb2ddde37337a51b8645dce8215d5f272f1edfc5e7ebe37dca12
 MISC metadata.xml 266 BLAKE2B 74ac06b4ea12603c8713e69cbff9ce6874266fc48ee5c846f0ac3d50bf577c3edb1e4b6690ec44fc4dd51e55e96dd5c2478831c9f754b04661fe7700d8baf66f SHA512 b996554131284e3556af42d2c5032c5b1635de67d48983096991935e7ee04c32aadc93e48cae5160861e86d64eb6fd4abafc40d9dd8b85ddc032b042a77677cb
diff --git a/app-shells/gentoo-bashcomp/gentoo-bashcomp-20230313.ebuild b/app-shells/gentoo-bashcomp/gentoo-bashcomp-20230313.ebuild
index eb5aaaeec783..94cde3f037e7 100644
--- a/app-shells/gentoo-bashcomp/gentoo-bashcomp-20230313.ebuild
+++ b/app-shells/gentoo-bashcomp/gentoo-bashcomp-20230313.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris"
 
 src_install() {
 	emake DESTDIR="${D}" install \
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index b309c95f3698..921a1aa1d715 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/xdvik/Manifest b/app-text/xdvik/Manifest
index bd11c8ff0a26..03ed316e6c5c 100644
--- a/app-text/xdvik/Manifest
+++ b/app-text/xdvik/Manifest
@@ -5,6 +5,6 @@ DIST xdvik-22.87.03.tar.gz 4760306 BLAKE2B d242696fadf2980cd307d4a172d2af06d98d0
 DIST xdvik-22.87.06.tar.gz 5922131 BLAKE2B 88821b7642d2d79158f5b49a7d23dad2209750a44d2b75f131d77a5ee326670d2a9cf09246ea9226a386bce429890459625d87df697599529de1bfc32438bf64 SHA512 93fb231f20ef76e170ae954d076ac5421669b3db71e3a96561626736d516f639227e3e502012ba4612fd238172b82f512985c571702d6c0ce078e60a67e5b19f
 DIST xdvik_192.png 77893 BLAKE2B 533910801cd981a39c42851be2779f98ecf7fcec8ef2a167005521e39d8ef66d8eb806b382451ebf88da62ba61afba82b8d15a60ef6ba347bd2ff848f10253ed SHA512 7fa6becc3601df01134cd163e461780b9ab4ee855788e38dc3d255d491294c033f040326016df7671ff301cc8f91462209e1fda5e50cb383f5407f0c1021d71d
 EBUILD xdvik-22.87.03-r4.ebuild 2857 BLAKE2B 8e6c0ed78bcd16c9ae0e96544e4b29d8cf136c4ee59853587eabdfe2f41a4a77382b7bfa80c00fe11bd9098e7a84f3e30f1a3bc51fc30744bd2a47f334d550d2 SHA512 b9264180fae4c2206cd84a3268fc7718b6a93633041be8b3cdf4490c22d9e2d60f2a14375b87093efccc4bfdaa463f82ee8c7d9d5dc553398b7b9bcb9c75156e
-EBUILD xdvik-22.87.06-r1.ebuild 3012 BLAKE2B a673ca0f628db7629fa6bed1a788515d4cdd3ea5dc9afed27d4e7d2dc0b29200a5f306e773c24477673719e19bec3a55021621b8c74227064ecb1cdff73a6cf6 SHA512 5b5b255f7d6fca80d9365c723f45fa30edf94945494b529726d29e746df14e2af62f7ff5d4fa94a232efe7254a0f73e66f21c05b2df8faad5d1470e1f372384f
+EBUILD xdvik-22.87.06-r1.ebuild 3011 BLAKE2B 389b204d23d75d7e60187fa70f7c5d9f139557098abc0b6d847e9d88d1798e7b2dab62ff12506b460608b8ee6c24daa8b96d35588d720b967f6d8bdfac2fa084 SHA512 8e524470b749727f34fbaa15d94ed89d590cb2c3412c7d013cff41da2cc28971f52c0cb99f8f620d3d64f42950a3c233abf356d7df3701e74c38e5bde541b772
 EBUILD xdvik-22.87.06.ebuild 2868 BLAKE2B 1df58483454a7116931eb0a4f62ada6bbde31aa73e6b6d39ae5ab23b35dc66c9a56e572f41fbd3a82e98181f17942ac3f2b583f62862b17a89e58e8256b0772b SHA512 82f5e22e0d93671321ebd4543b2be372c968f693a817bd4249e89a834718e84ae79f490c2967578c7599dc9b3105c69f189282afcf5513a6776a3d2b6d3c30dd
 MISC metadata.xml 595 BLAKE2B 200debd0214e5985f3f59cabdac72252b556edef5224c77f5dbd91de347f57ab492dd0f7ce846c335179344bc9215b02af61572ff859c9c44ca947235ce5062b SHA512 bf925b9c9738c62f26ebbb2f88782597d6cee471a19258b553e0dc7aa397443149adfceba6cfcdd045196eecc3319541b980850ba5e572f51266da1945b65e4a
diff --git a/app-text/xdvik/xdvik-22.87.06-r1.ebuild b/app-text/xdvik/xdvik-22.87.06-r1.ebuild
index 4e0b3e1fbc70..8db1bb80a71f 100644
--- a/app-text/xdvik/xdvik-22.87.06-r1.ebuild
+++ b/app-text/xdvik/xdvik-22.87.06-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/xdvi/${P}.tar.gz
 	https://dev.gentoo.org/~pacho/${PN}/${PN}_192.png"
 S="${WORKDIR}"/${P}/texk/xdvik
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 LICENSE="GPL-2"
 IUSE="motif neXt Xaw3d emacs"
diff --git a/app-text/xiphos/Manifest b/app-text/xiphos/Manifest
index 8364a13bc610..79f7e6aec9fa 100644
--- a/app-text/xiphos/Manifest
+++ b/app-text/xiphos/Manifest
@@ -3,6 +3,5 @@ AUX xiphos-4.2.1-glib_version_min_required.patch 223 BLAKE2B f31b00632ce8dcb1df5
 AUX xiphos-4.2.1-webkit41.patch 426 BLAKE2B 373d93182db65e5dccb8588658d713961461f49f64170abed279c7158ccf8292fafd44b041ff7cd9ea7bdcb52af34284cba5a7cb0ccd9c5dae6e5d30046d3ea8 SHA512 8a8e8bcb34d257b07eee48249fb46db928fd358765ed3fb35b5f2b5aba6280414fcf25bef3866dbca99bbef90464257409a091e7319f79833c461e23173a2f97
 DIST xiphos-4.2.1-disable_webkit_editor.patch.xz 7432 BLAKE2B b1dd9db675a34433f4979247d57936920e178cf83cbcfa0fc2a4b9491855d064ecccdb8805a5615b9c91490c3ff2c24f7d951dad009e83952e5d6aa28c8a0730 SHA512 ae0d9b526143445529fa467bdd1b90015812a5d81396619e64a701962a608413c5875c137970d2b70dbac28085e7f40dc6049d591efaf96df7ddfb2cc64854da
 DIST xiphos-4.2.1.tar.xz 21586484 BLAKE2B 7529f770766dfc5bae6cb04bfeb3d3cc0714c4ebbd2282aca549e50b8a9ca4c74cdb8cb69667f1036ee33ee1c5d90e562cff80d520ce72651736e1f5f4274ba1 SHA512 624bd2e931c15e1665724918e756706f048e824dc13c2f1d5a05c32a93697137e75012564a14b7d2d0aa90c6a109c52ead51901e657d35a457ccf5f42204a0fe
-EBUILD xiphos-4.2.1-r1.ebuild 1681 BLAKE2B 4b8661873c0959c5bd265608ad677c374310eaa651984e3a864088a4d8232f18d8c00ba295e72022be7676264ef8340d3d14ae4621fb19ade211831eef57ef1d SHA512 5956b27da6610fb8c17df3d51993847842360653e4eb78cdae14585f5a2e1f43de33b6278ea1de90335b9b856cef835182f52ca12280eb9dbb1a8d09e18b8cca
-EBUILD xiphos-4.2.1-r2.ebuild 1726 BLAKE2B b656c1c9fdb322d5d372c9cb24b480cce5cee7df3142185fc1c01b3f5c7b599c4b89b1bf9cfd8117a802bbe0e23d8a1ea8e72a24b157716b0bbb18db14475634 SHA512 ae8f4bf28e20f906da0f42204f172e0455fb494fc8c1d813f9d282be22b5d59d56514573b1e8b689aa2d9657631ca0d87b4f50a035e3ec3340106f0d8b755873
+EBUILD xiphos-4.2.1-r2.ebuild 1725 BLAKE2B 3bdd0c1126813b498d073753d0da227bc82085af03daf047698461c36e13863def7d1a0171c092452143a944049f6839aa96d179fb472d5667aef7453e375dde SHA512 8e8abf75f81312867eeff2ee54043924bd9a71f41675e3bd8cf6d6e5458678496edf618311c66e6f5570fce0a9c6b041b90eb3ec6b8d569ea73bd6b897aae711
 MISC metadata.xml 327 BLAKE2B 0925684efe71dfe03c6f3aaed9bc07b49594eed7edefaeb0b47c15fc67ddfaa5e5e4f8f1ec752e5c08c8770960e4ff5732f43e36c081c75e6c9265b77ef68e10 SHA512 a8c931bd1d0c7250c51d7b9bfb684a1433422604ea992d4c26fe3fd5b871f4dd92032b1907a9cceca4a7c7c87437cf3f26e0790e7f6adb27610f13b0b17b1cc2
diff --git a/app-text/xiphos/xiphos-4.2.1-r1.ebuild b/app-text/xiphos/xiphos-4.2.1-r1.ebuild
deleted file mode 100644
index dd9eb10be244..000000000000
--- a/app-text/xiphos/xiphos-4.2.1-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake xdg-utils
-
-DESCRIPTION="A Gtk+-based Bible-study frontend for SWORD"
-HOMEPAGE="https://xiphos.org/"
-SRC_URI="https://github.com/crosswire/${PN}/releases/download/${PV}/${P}.tar.xz
-	https://dev.gentoo.org/~marecki/dists/${CATEGORY}/${PN}/${PN}-4.2.1-disable_webkit_editor.patch.xz"
-
-LICENSE="GPL-2 FDL-1.1 LGPL-2 MIT MPL-1.1"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="dbus debug"
-
-COMMON="sys-apps/util-linux
-	dev-libs/libxml2
-	dev-libs/libxslt
-	dbus? ( dev-libs/dbus-glib )"
-RDEPEND="${COMMON}
-	>=app-text/sword-1.8.1
-	dev-libs/glib:2
-	dev-libs/icu
-	>=net-libs/biblesync-1.2.0
-	net-libs/webkit-gtk:4
-	sys-libs/zlib[minizip]
-	x11-libs/gtk+:3"
-DEPEND="${RDEPEND}"
-BDEPEND="${COMMON}
-	app-arch/zip
-	app-text/yelp-tools
-	dev-libs/appstream-glib
-	dev-util/desktop-file-utils
-	dev-util/glib-utils
-	dev-util/itstool
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${WORKDIR}"/${PN}-4.2.1-disable_webkit_editor.patch
-	"${FILESDIR}"/${PN}-4.2.1-appdata_metainfo.patch
-	"${FILESDIR}"/${PN}-4.2.1-glib_version_min_required.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DDBUS=$(usex dbus)
-		-DDEBUG=$(usex debug)
-		-DPOSTINST=off
-	)
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-
-	if [[ -n "${REPLACING_VERSIONS}" ]]; then
-		local rver
-		for rver in ${REPLACING_VERSIONS}; do
-			if ver_test "${rver}" -le "4.2.1"; then
-				ewarn "Please note that ${PN} no longer provides an editor due to its dependency on outdated libraries."
-				ewarn "Studypad and the personal commentary will no longer work."
-				break
-			fi
-		done
-	fi
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/app-text/xiphos/xiphos-4.2.1-r2.ebuild b/app-text/xiphos/xiphos-4.2.1-r2.ebuild
index 04e20aca65b1..b7ac40476986 100644
--- a/app-text/xiphos/xiphos-4.2.1-r2.ebuild
+++ b/app-text/xiphos/xiphos-4.2.1-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/crosswire/${PN}/releases/download/${PV}/${P}.tar.xz
 
 LICENSE="GPL-2 FDL-1.1 LGPL-2 MIT MPL-1.1"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="dbus debug"
 
 COMMON="sys-apps/util-linux
diff --git a/dev-games/Manifest.gz b/dev-games/Manifest.gz
index 2dba426be8b3..f95840a48963 100644
--- a/dev-games/Manifest.gz
+++ b/dev-games/Manifest.gz
diff --git a/dev-games/godot/Manifest b/dev-games/godot/Manifest
index 6cbe7a3ede7b..5aceffb4b9fb 100644
--- a/dev-games/godot/Manifest
+++ b/dev-games/godot/Manifest
@@ -5,6 +5,8 @@ AUX godot-4.0_rc2-musl.patch 878 BLAKE2B d10e22acc29e14df6b42b180ed480908c61e6a9
 AUX godot-4.0_rc3-scons.patch 506 BLAKE2B 2fd1421760f082ea65febce90459f8a2d63e06e5b02b5e86e59bbacd14db78f76448ee50d0fa7c935b1a867f528b46a9b82b5bb03765d0b237e9af73d7fd14da SHA512 9ac654edc66a5a330055d1af0b706a5fa143061712146ddc02657add45d4518d96391d9e980c0a6b33d9fa966b5914a3f90a7b333f20885f0a05a7b8985fc667
 DIST godot-3.5.2-stable.tar.xz 24047432 BLAKE2B a4d600cb174b2f79cc91c583b1052db2e7e2921003ffd5a307a2484af9cc050b600e763b6016ba2df043ba5e492f0bdd13c207fd3a3d794b6602f7c574093cb0 SHA512 e9f3c8b23cd69422639fe22948fb1f5f2071dff6e013fee3c08d6d3c1f39de4dfc252d32eb395c847021c9bbc1b2fa320500140ff3e684bf00530889ba48a181
 DIST godot-4.0.2-stable.tar.xz 29909648 BLAKE2B e8c99450a4b6871fa91b2bf6596ef82702e72dcc73b4f5b01f6338fc11a812a9bc47c60ddf36dbbff963461acb74406960a275d386bc217708a1c88df9050e3b SHA512 53aefef2f0ea63c82834f0e2da7b898c8504b6d7a3bef0af61d6c730c5ba2db21ea99a2cb10731bd39209d72a492059d93475019418658c4e181b514d6d09ed3
+DIST godot-4.0.3-stable.tar.xz 30203636 BLAKE2B bfdf2f3a349d541039639fbce9d9d10ba6bfc200ae9442900709b1cb3d3c40dcf68b3de10d9ebe7211a1dfc380a5cf8954c5ed1d9a510afaeec8cee2dc4e9123 SHA512 185c3caf99dbfeffc83fa8298c801121ee58c4c6d3854127aeb3cb2128ed08ea1925229b90f08a79e3ea5e674725fe62e219226a58a17789c0e72ae8f27ed576
 EBUILD godot-3.5.2.ebuild 6532 BLAKE2B 7c038530928461f198ce077a6e19e16b2ad3f4f3f144054dabd06e3ea40732099c9fff54cd89eade3470540fe97ed70ffe4f2bc8c187973f0d30b965401967d2 SHA512 2cb4c893c2c85e744f8a6232b4f39bed27123eed4bc3caea52d5daf34a02249ca364a7345d162c43cdaafda91d97c1e85d3c3a4134684dccc55c820da0f94549
 EBUILD godot-4.0.2.ebuild 6893 BLAKE2B ecac277ae967b558c4df500e8b7cb00c4435d70f321ca3f6a5720a00daba13f16c03767be9ee04afd3ff1773fadc06d949579d3ac9790d5cd49f14ec8e88808e SHA512 22e7d5fa229bc7b1637a954658ef7dab1b684ef6c89ceb5612ac941495c7425785d07f2d448bd770278b84b81bf3bb343fc56d51767e8133d0beabca77b69fc0
+EBUILD godot-4.0.3.ebuild 6893 BLAKE2B ecac277ae967b558c4df500e8b7cb00c4435d70f321ca3f6a5720a00daba13f16c03767be9ee04afd3ff1773fadc06d949579d3ac9790d5cd49f14ec8e88808e SHA512 22e7d5fa229bc7b1637a954658ef7dab1b684ef6c89ceb5612ac941495c7425785d07f2d448bd770278b84b81bf3bb343fc56d51767e8133d0beabca77b69fc0
 MISC metadata.xml 1606 BLAKE2B 5e4f1116549672d8cf6f88ef0b764e0710d5f5a1259110c323b67e911dc186c7b618ceb6e5d8b5ada540f531bf34b8e87c9de1652e13db9b08e865bacd7d0c29 SHA512 b4cdc297ad05067832bbd8ab849203201a3f65e00f0dd27ca4dd4c1f808ea2fd13a18615ac9fe6853ae30ae1e53168b73627d72df1f8f428d3979b06697defe5
diff --git a/dev-games/godot/godot-4.0.3.ebuild b/dev-games/godot/godot-4.0.3.ebuild
new file mode 100644
index 000000000000..c3e9af66635c
--- /dev/null
+++ b/dev-games/godot/godot-4.0.3.ebuild
@@ -0,0 +1,229 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit bash-completion-r1 desktop python-any-r1 scons-utils toolchain-funcs xdg
+
+DESCRIPTION="Multi-platform 2D and 3D game engine with a feature-rich editor"
+HOMEPAGE="https://godotengine.org/"
+SRC_URI="https://downloads.tuxfamily.org/godotengine/${PV}/${P}-stable.tar.xz"
+S="${WORKDIR}/${P}-stable"
+
+LICENSE="
+	MIT
+	Apache-2.0 BSD Boost-1.0 CC0-1.0 Unlicense ZLIB
+	gui? ( CC-BY-4.0 ) tools? ( OFL-1.1 )"
+SLOT="4"
+KEYWORDS="~amd64"
+# Enable roughly same as upstream by default so it works as expected,
+# except raycast (tools-only heavy dependency), and deprecated.
+IUSE="
+	alsa +dbus debug deprecated +fontconfig +gui pulseaudio raycast
+	+runner speech test +theora +tools +udev +upnp +vulkan +webp"
+# TODO: tests still need more figuring out
+RESTRICT="test"
+
+# dlopen: libglvnd
+RDEPEND="
+	app-arch/zstd:=
+	dev-games/recastnavigation:=
+	dev-libs/icu:=
+	dev-libs/libpcre2:=[pcre32]
+	media-libs/freetype[brotli,harfbuzz]
+	media-libs/harfbuzz:=[icu]
+	media-libs/libogg
+	media-libs/libpng:=
+	media-libs/libvorbis
+	<net-libs/mbedtls-3:=
+	net-libs/wslay
+	sys-libs/zlib:=
+	alsa? ( media-libs/alsa-lib )
+	dbus? ( sys-apps/dbus )
+	fontconfig? ( media-libs/fontconfig )
+	gui? (
+		media-libs/libglvnd
+		x11-libs/libX11
+		x11-libs/libXcursor
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libXinerama
+		x11-libs/libXrandr
+		x11-libs/libXrender
+		x11-libs/libxkbcommon
+		tools? ( raycast? ( media-libs/embree:3 ) )
+		vulkan? ( media-libs/vulkan-loader[X] )
+	)
+	pulseaudio? ( media-libs/libpulse )
+	speech? ( app-accessibility/speech-dispatcher )
+	theora? ( media-libs/libtheora )
+	tools? ( app-misc/ca-certificates )
+	udev? ( virtual/udev )
+	upnp? ( net-libs/miniupnpc:= )
+	webp? ( media-libs/libwebp:= )"
+DEPEND="
+	${RDEPEND}
+	gui? ( x11-base/xorg-proto )
+	tools? ( test? ( dev-cpp/doctest ) )"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.0_beta3-headless-header.patch
+	"${FILESDIR}"/${PN}-4.0_rc2-musl.patch
+	"${FILESDIR}"/${PN}-4.0_rc3-scons.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i "1,5s/ godot/&${SLOT}/i" misc/dist/linux/godot.6 || die
+	sed -i "/id/s/Godot/&${SLOT}/" misc/dist/linux/org.godotengine.Godot.appdata.xml || die
+	sed -e "s/=godot/&${SLOT}/" -e "/^Name=/s/$/ ${SLOT}/" \
+		-i misc/dist/linux/org.godotengine.Godot.desktop || die
+
+	sed -i "s|pkg-config |$(tc-getPKG_CONFIG) |" platform/linuxbsd/detect.py || die
+
+	# use of builtin_ switches can be messy (see below), delete to be sure
+	local unbundle=(
+		doctest embree freetype graphite harfbuzz icu4c libogg
+		libpng libtheora libvorbis libwebp linuxbsd_headers mbedtls
+		miniupnpc pcre2 recastnavigation volk wslay zlib zstd
+		# certs: unused by generated header, but scons panics if not found
+	)
+	rm -r "${unbundle[@]/#/thirdparty/}" || die
+
+	ln -s "${ESYSROOT}"/usr/include/doctest thirdparty/ || die
+}
+
+src_compile() {
+	local -x BUILD_NAME=gentoo # replaces "custom_build" in version string
+
+	local esconsargs=(
+		AR="$(tc-getAR)" CC="$(tc-getCC)" CXX="$(tc-getCXX)"
+
+		progress=no
+		verbose=yes
+
+		use_sowrap=no
+
+		alsa=$(usex alsa)
+		dbus=$(usex dbus)
+		deprecated=$(usex deprecated)
+		fontconfig=$(usex fontconfig)
+		opengl3=$(usex gui)
+		pulseaudio=$(usex pulseaudio)
+		speechd=$(usex speech)
+		udev=$(usex udev)
+		use_volk=no # unnecessary when linking directly to libvulkan
+		vulkan=$(usex gui $(usex vulkan))
+		x11=$(usex gui)
+
+		system_certs_path="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt
+
+		# platform/*/detect.py uses builtin_* switches to check if need
+		# to link with system libraries, but ignores whether the dep is
+		# actually used, so "enable" deleted builtins on disabled deps
+		builtin_certs=no
+		builtin_embree=$(usex !gui yes $(usex !tools yes $(usex !raycast)))
+		builtin_enet=yes # bundled copy is patched for IPv6+DTLS support
+		builtin_freetype=no
+		builtin_glslang=yes #879111 (for now, may revisit if more stable)
+		builtin_graphite=no
+		builtin_harfbuzz=no
+		builtin_icu4c=no
+		builtin_libogg=no
+		builtin_libpng=no
+		builtin_libtheora=$(usex !theora)
+		builtin_libvorbis=no
+		builtin_libwebp=$(usex !webp)
+		builtin_mbedtls=no
+		builtin_miniupnpc=$(usex !upnp)
+		builtin_msdfgen=yes # not wired for unbundling nor packaged
+		builtin_pcre2=no
+		builtin_recastnavigation=no
+		builtin_rvo2=yes # bundled copy has godot-specific changes
+		builtin_squish=yes # ^ likewise, may not be safe to unbundle
+		builtin_wslay=no
+		builtin_xatlas=yes # not wired for unbundling nor packaged
+		builtin_zlib=no
+		builtin_zstd=no
+		# (more is bundled in third_party/ but they lack builtin_* switches)
+
+		# modules with optional dependencies, "possible" to disable more but
+		# gets messy and breaks all sorts of features (expected enabled)
+		module_mono_enabled=no # unhandled
+		# note raycast is only enabled on amd64+arm64, see raycast/config.py
+		module_raycast_enabled=$(usex gui $(usex tools $(usex raycast)))
+		module_theora_enabled=$(usex theora)
+		module_upnp_enabled=$(usex upnp)
+		module_webp_enabled=$(usex webp)
+
+		# let *FLAGS handle these, e.g. can pass -flto as-is
+		debug_symbols=no
+		lto=none
+		optimize=custom
+		use_static_cpp=no
+	)
+
+	if use runner && use tools; then
+		# build alternate faster + ~60% smaller binary for running
+		# games or servers without game development debug paths
+		escons extra_suffix=runner target=template_release "${esconsargs[@]}"
+	fi
+
+	esconsargs+=(
+		target=$(usex tools editor template_$(usex debug{,} release))
+		dev_build=$(usex debug)
+
+		# harmless but note this bakes in --test in the final binary
+		tests=$(usex tools $(usex test))
+	)
+
+	escons extra_suffix=main "${esconsargs[@]}"
+}
+
+src_test() {
+	xdg_environment_reset
+	bin/godot*.main --headless --test || die
+}
+
+src_install() {
+	local s=godot${SLOT}
+
+	newbin bin/godot*.main ${s}
+	if use runner && use tools; then
+		newbin bin/godot*.runner ${s}-runner
+	else
+		# always available, revdeps shouldn't depend on [runner]
+		dosym ${s} /usr/bin/${s}-runner
+	fi
+
+	newman misc/dist/linux/godot.6 ${s}.6
+	dodoc AUTHORS.md CHANGELOG.md DONORS.md README.md
+
+	if use gui; then
+		newicon icon.svg ${s}.svg
+		newmenu misc/dist/linux/org.godotengine.Godot.desktop \
+			org.godotengine.${s^}.desktop
+
+		insinto /usr/share/metainfo
+		newins misc/dist/linux/org.godotengine.Godot.appdata.xml \
+			org.godotengine.${s^}.appdata.xml
+
+		insinto /usr/share/mime/application
+		newins misc/dist/linux/org.godotengine.Godot.xml \
+			org.godotengine.${s^}.xml
+	fi
+
+	newbashcomp misc/dist/shell/godot.bash-completion ${s}
+	bashcomp_alias ${s}{,-runner}
+
+	insinto /usr/share/fish/vendor_completions.d
+	newins misc/dist/shell/godot.fish ${s}.fish
+	dosym ${s}.fish /usr/share/fish/vendor_completions.d/${s}-runner.fish
+
+	insinto /usr/share/zsh/site-functions
+	newins misc/dist/shell/_godot.zsh-completion _${s}
+	dosym _${s} /usr/share/zsh/site-functions/_${s}-runner
+}
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 04b8a80d1971..c2b150ed1c36 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/erlang/Manifest b/dev-lang/erlang/Manifest
index 6ca5a9a1830a..b7d55e212fbb 100644
--- a/dev-lang/erlang/Manifest
+++ b/dev-lang/erlang/Manifest
@@ -29,6 +29,6 @@ EBUILD erlang-25.1.1-r1.ebuild 4979 BLAKE2B 499d8465709c320d2dadb8d353853d3d5c1c
 EBUILD erlang-25.1.2-r1.ebuild 5093 BLAKE2B ca60425b273475adddc2b06abf667342e38a0d64a847580e4c87a2e5414e87bcb27b62f31e6286ed64df9d089a6bcdcf268cf14f550b192bff546294d09dd3a5 SHA512 36b7f36c31eb5a62ebaffa0b1ed27b67a02f1ec659915a00e7c950c491e3a30c0267ade81689c8ab591de06e9a0dde92c2027e279e919f59f1dfc2a6d1a2dd62
 EBUILD erlang-25.2.2.ebuild 5098 BLAKE2B 4507ac29eadb7faabe8f02e62f4c85494a5d1c587c277c16c4324db9bbed3acbc81da26b7c16a22cd7d484c4e836eb93daf8bcc2f086670d913018b01ce54407 SHA512 e449030c6d67c04a54b21da7b5fd3d5f56217e42fe8693afc30447c3cba9639a283306fc2766adc99273f24574515a43e11be7c20b2282436bc406eb60c2a9a5
 EBUILD erlang-25.2.3.ebuild 5098 BLAKE2B 4507ac29eadb7faabe8f02e62f4c85494a5d1c587c277c16c4324db9bbed3acbc81da26b7c16a22cd7d484c4e836eb93daf8bcc2f086670d913018b01ce54407 SHA512 e449030c6d67c04a54b21da7b5fd3d5f56217e42fe8693afc30447c3cba9639a283306fc2766adc99273f24574515a43e11be7c20b2282436bc406eb60c2a9a5
-EBUILD erlang-25.3.ebuild 5096 BLAKE2B 324a465321b2c24feb65d4e7b54990e9b4c649f8fa6e3c4d616932192e6ce40f9672d6f3fecd36a991f51dbb85faeb6a15676498a24971ceb518245e0966c13b SHA512 a5e4bbf99d5802c6aafc81421095e9e98003ca5408833b7c525e0c2640755d4f3f1e938f8ee469098f1a38eab94cbd802c0a84d25c4e3c6bb2753064466b72cd
+EBUILD erlang-25.3.ebuild 5095 BLAKE2B 34f18b56e7f9a25f1e370ab8b6d25907b408ce5ff2ebecdcb1b5f0720153092762e07753889844da2e9d5dc1ea020e4b42a65cb69760d86fc1fd118275286fc3 SHA512 0e775196bb2c5850165c856eacc0281b0566aee9fe82b826524f31b4e5df7f16cc99d32a96357eb628ca958eb7b91bd3f49ecaab9327ad50d71071d622159bf9
 EBUILD erlang-26.0.ebuild 5098 BLAKE2B 4507ac29eadb7faabe8f02e62f4c85494a5d1c587c277c16c4324db9bbed3acbc81da26b7c16a22cd7d484c4e836eb93daf8bcc2f086670d913018b01ce54407 SHA512 e449030c6d67c04a54b21da7b5fd3d5f56217e42fe8693afc30447c3cba9639a283306fc2766adc99273f24574515a43e11be7c20b2282436bc406eb60c2a9a5
 MISC metadata.xml 749 BLAKE2B 32f06b2fa8579a65cdf259a76df093da6e8d5c27497f8167d8288947076a11960606ad23567bb4984d6b24270965dbd7563b8c9ae08f8f69a8968ac102f32a8e SHA512 4dc1b01adfab93b5ea99876cbd7a4a9a39e66f6417b7e84a9341dab91f3d63fa903b69e4d827a656a709d4308f32ee0bd4a9594b87b3d3d05543249c847ca3c0
diff --git a/dev-lang/erlang/erlang-25.3.ebuild b/dev-lang/erlang/erlang-25.3.ebuild
index 9145d0da878f..ac435f2a533a 100644
--- a/dev-lang/erlang/erlang-25.3.ebuild
+++ b/dev-lang/erlang/erlang-25.3.ebuild
@@ -22,7 +22,7 @@ LICENSE="Apache-2.0"
 # same build of ERTS that was used when compiling the code.  See
 # http://erlang.org/doc/system_principles/misc.html for more information.
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="doc emacs java +kpoll odbc sctp ssl systemd tk wxwidgets"
 
 RDEPEND="
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index a2ed2300cbe1..3f6e31e7444c 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 0868a8aeec9c..9cb4e02a14ad 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -19,6 +19,6 @@ EBUILD botocore-1.29.132.ebuild 1834 BLAKE2B 50305f707e533627ed4b906b3c5845a931f
 EBUILD botocore-1.29.133.ebuild 1834 BLAKE2B 50305f707e533627ed4b906b3c5845a931f825049d40d8e9d9eedf1323d130634b578f68adb046db30e3e9a4168361da69d99471a7b744407dc103130a114994 SHA512 45952178574e99269d9767374818d867bfcc47ebf0f4c37dbab6cf50089577badb69967bd06b0b2d10b15dcd1c3e8b82adac88404d7c3b7d7784292b4005e797
 EBUILD botocore-1.29.134.ebuild 1834 BLAKE2B 50305f707e533627ed4b906b3c5845a931f825049d40d8e9d9eedf1323d130634b578f68adb046db30e3e9a4168361da69d99471a7b744407dc103130a114994 SHA512 45952178574e99269d9767374818d867bfcc47ebf0f4c37dbab6cf50089577badb69967bd06b0b2d10b15dcd1c3e8b82adac88404d7c3b7d7784292b4005e797
 EBUILD botocore-1.29.135.ebuild 1834 BLAKE2B 50305f707e533627ed4b906b3c5845a931f825049d40d8e9d9eedf1323d130634b578f68adb046db30e3e9a4168361da69d99471a7b744407dc103130a114994 SHA512 45952178574e99269d9767374818d867bfcc47ebf0f4c37dbab6cf50089577badb69967bd06b0b2d10b15dcd1c3e8b82adac88404d7c3b7d7784292b4005e797
-EBUILD botocore-1.29.136.ebuild 1878 BLAKE2B 06c08bef2669a4d7a368940886cbbe9c9cc2dfbfa8b53fb57067957e904723f41b7c9339f776b5cb69a51caa999e5a962212c51e713e6d10b7e76c8e424d1438 SHA512 84ba51a40c75b10dea7795187157ca75d3a27a2d858a4f1a0bd19ab7fd3010eac8b764ff4279f70599eec9c846ad7955aa696338c44c055b04627ed07405e606
+EBUILD botocore-1.29.136-r1.ebuild 2485 BLAKE2B f7c931df1cf3c88ac69706626687c7c96d98c055d54969a36872f91a44028567f2a405a8cb6ce729b78a2f99655a6989db07c57a5e0333b897996e98c401e275 SHA512 9d6f15f5b7035cfc63eeb8e86710eaecb765c20c47b018f834d806212d3ec7506562f7b162886bdcc9cd4e15d8ffd776b1f51c890dbbfadacefec5e787d13b44
 EBUILD botocore-9999.ebuild 1736 BLAKE2B 6ca7ea14855f5f8db2d166ba1f29835d4c994a0a8fa38f3852406289a4465c091909562ac678f1c0bf7e640a594731b0d4319efc0f34f6bc640fbae06746c4bc SHA512 f891bf0eded88d9af3b87fc7c9ee4c6a129d263e672821f3b9654d43bb3bcac41305b834192088d15b50f3f9d36ea95374180cf13e1cb67149595ec63e4cc155
 MISC metadata.xml 499 BLAKE2B e5aaa7da26f200c09adfdf38b68f656bbccbec627cb5d966b280ac2165334e7eec659c89075bcace748f58e2ec3e7d2998e54a688d56ecea2d30653c67dfd35a SHA512 103c554d5dbd967bf9b6e418b3913d9235e7e910d012160909ce0715134ed2e37b06e6a345395f9d16ce08d1cf51f3ce458bce93c6a978fd3dca6610f2acdbd0
diff --git a/dev-python/botocore/botocore-1.29.136.ebuild b/dev-python/botocore/botocore-1.29.136-r1.ebuild
index b446172b3f31..3ced99abe4ff 100644
--- a/dev-python/botocore/botocore-1.29.136.ebuild
+++ b/dev-python/botocore/botocore-1.29.136-r1.ebuild
@@ -31,7 +31,6 @@ RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
 	<dev-python/jmespath-2[${PYTHON_USEDEP}]
 	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	<dev-python/urllib3-1.27[${PYTHON_USEDEP}]
 	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
 "
 BDEPEND="
@@ -67,6 +66,13 @@ python_test() {
 		tests/unit/test_client.py::TestClientErrors::test_BOTO_DISABLE_COMMONNAME
 		# TODO
 		tests/functional/test_credentials.py::SSOSessionTest::test_token_chosen_from_provider
+		# urllib3-2 compatibility, mock relies on implementation details
+		tests/unit/test_awsrequest.py::TestAWSHTTPConnection::test_expect_100_continue_no_response_from_server
+		tests/unit/test_awsrequest.py::TestAWSHTTPConnection::test_expect_100_continue_returned
+		tests/unit/test_awsrequest.py::TestAWSHTTPConnection::test_expect_100_continue_sends_307
+		tests/unit/test_awsrequest.py::TestAWSHTTPConnection::test_expect_100_sends_connection_header
+		tests/unit/test_awsrequest.py::TestAWSHTTPConnection::test_handles_expect_100_with_different_reason_phrase
+		tests/unit/test_awsrequest.py::TestAWSHTTPConnection::test_state_reset_on_connection_close
 	)
 
 	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
diff --git a/dev-python/flask-api/Manifest b/dev-python/flask-api/Manifest
index db2ded543fa1..487f2e85faa2 100644
--- a/dev-python/flask-api/Manifest
+++ b/dev-python/flask-api/Manifest
@@ -1,3 +1,3 @@
 DIST flask-api-3.0.gh.tar.gz 249620 BLAKE2B 63ce0ce6a2d4755caf40c020fc6b88f3b585b0c30f5800df62c8e442f629b8b489917ff0f0d1266d941478336f38aa0560c144620f6c11d60cbd9e31870bf984 SHA512 c86b919f8681a73be166ddc50022faecb376b1b6f99bd0d78b2f2fc8b64f82bf82779dbdcfbcaa1c5e321ea2d286b95f1a1aab32864e6c3923417d7828c7c79a
-EBUILD flask-api-3.0-r1.ebuild 775 BLAKE2B c45ef603ef3f6495b0e7693440f0d12944a44da14ce96dc72a288e63a65367ac08e3d57c3f5fae0f53ee6fb996ddcd183db2f61e35ada682b5825d3d6c7e930a SHA512 5d1748f8d22043bb533be00ad8d44dc5c49698ea48a5bc8f946bef9d76cd5f7a6727875bf698ba50d2cdbc1f62688e27b1419eea93cadcfe52be61169c0e601a
+EBUILD flask-api-3.0-r2.ebuild 892 BLAKE2B 1a413827c5344afa75809cb747cc1d933781cb0be98de8f4dd59517046c7b639b0285cf608e32ae7c06a27b9f558edacf2db1ca1c5bc8cb12ca34bdae52972da SHA512 a23a74ff4d5a31b4133747ebf8217f7eb959e4145097bad457d9087d53a46ee92a5a967c8c095b588b3590528f529e1079a3a8ad10881d6931487f78e0d98739
 MISC metadata.xml 728 BLAKE2B 54f369da75822026ef30c2f16efac1a478b1f42b8bde27710c73fb7b974cf70b5c266c182f6efc6096f4efc0c11645a74fd19ca30ab2dfd48af4e65a731983e6 SHA512 a009d75f162e2775ec5fb1eda9c12af46c76094d64952effe1dd9aa74ae3bfcd3dc40e4523cda464c8cc14eed150d8cef2175acd294574752d79f0ff8c97e8e7
diff --git a/dev-python/flask-api/flask-api-3.0-r1.ebuild b/dev-python/flask-api/flask-api-3.0-r2.ebuild
index 79ce434fb7a0..924851d79164 100644
--- a/dev-python/flask-api/flask-api-3.0-r1.ebuild
+++ b/dev-python/flask-api/flask-api-3.0-r2.ebuild
@@ -23,8 +23,10 @@ LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
+# tests are broken with 2.3, I don't know if the code works
+# https://github.com/flask-api/flask-api/issues/151
 RDEPEND="
-	dev-python/flask[${PYTHON_USEDEP}]
+	<dev-python/flask-2.3[${PYTHON_USEDEP}]
 	dev-python/markdown[${PYTHON_USEDEP}]
 "
 
diff --git a/dev-python/flask-login/Manifest b/dev-python/flask-login/Manifest
index 1f9672c3dc01..16cb81a9ab06 100644
--- a/dev-python/flask-login/Manifest
+++ b/dev-python/flask-login/Manifest
@@ -1,3 +1,5 @@
+DIST flask-login-0.6.2-werkzeug-2.3.patch 7954 BLAKE2B 4f732dbaa6bdbc8827f52eb9c1d046f2128908df316a1ca94b11ce8033fa8fa506ae41255b8f0e32bc91feae8874b995c2f46d2b7f4fbc5f9020748c5be1db23 SHA512 911fb67e96006073af1df6cf39b4be6eac4aaee63bdcab8d7191b097acb441fd984b3929200db6c0f1f329a65df33acaffc08e88409010fa40f0a787dc47c427
 DIST flask-login-0.6.2.gh.tar.gz 48195 BLAKE2B 74d980f9900d9c583e03caa704cf637c5c6dac6a26e74bc008f47c18213764bafef16e33d9d28eee588b3c2f7d2a5895eae88e5adf755fe0448f7e74d5c65e74 SHA512 b286272ad5f7de2cfc913bee4a3eac46e4c1ce274bb12467009e1abae422f1a855aa49fd898778b8a2e937eebe9fbb387af11815267a2bc120cde943939111ec
-EBUILD flask-login-0.6.2.ebuild 882 BLAKE2B 3a9ef2db30958088d786ed5d94d2de7a936921a9409165edd8b8f2f0a521523513ce51da0e332e7e6e8ba74a9ebe72a73a1ddfdade0584a26e433205191e8efb SHA512 6139a4ff4ab0b10ccb9cdfd1ff21790d95bb5700f10255fb33c698cdc09a912b5190544c5374fe555b590ae2929377912af9c7aa288e55bff8b5ec922f5d565e
+EBUILD flask-login-0.6.2-r1.ebuild 1027 BLAKE2B 07e22f790dd95d4ad26525f0669dafbc5bcb1e4158bd0af2e9dccefd24cfba5dde360246656893c926d026ff3539b9e95df8e574353ce40dd9c16564ea232e5a SHA512 a4395418149d6f549eb3e3dab754f3c2b948dbb1c0ed33e9ebb746ee946cac0ad812821cbc893bafb43b36479df1fb150ea5d8cf8c63a83ef1be321804bb9a40
+EBUILD flask-login-0.6.2.ebuild 927 BLAKE2B 19d8e1fcc0223a5e3fbf061585de1bcc1be613ef4ece043fc18ebfc2c54336cd5ed4fdd35a1b84910a52071413c56ddaa1aaa6e68dd16cb960d93a2c9b8ec21d SHA512 8a87139a24c06bad076593c735b1f9e61c1889b2af3ca99f61152adec68868eb6bad200881100d03456ecdac154f65d1ed9678451b2e30365273b5c801122d0c
 MISC metadata.xml 404 BLAKE2B 8f8070dd3be696102c88bf75e22511b75432dfd17d21f6f3ce084cbae8092bc91ce1cbb7e47d691c7ac502afd58882ccd0bd1ea732df9239a4ec1b70e8728f19 SHA512 0b32444d9f1508697be1a19a6eb57efa5cbff443baf35958c24161d0b716a55d96b0caf66936925970904642fde975d94f4360b8b96d018ebe0fad24216769a4
diff --git a/dev-python/flask-login/flask-login-0.6.2-r1.ebuild b/dev-python/flask-login/flask-login-0.6.2-r1.ebuild
new file mode 100644
index 000000000000..413c07e8cab5
--- /dev/null
+++ b/dev-python/flask-login/flask-login-0.6.2-r1.ebuild
@@ -0,0 +1,48 @@
+# 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_{9..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Login session support for Flask"
+HOMEPAGE="
+	https://github.com/maxcountryman/flask-login/
+	https://pypi.org/project/Flask-Login/
+"
+SRC_URI="
+	https://github.com/maxcountryman/flask-login/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+	https://github.com/maxcountryman/flask-login/pull/743.patch
+		-> ${P}-werkzeug-2.3.patch
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/flask-1.0.4[${PYTHON_USEDEP}]
+	>=dev-python/werkzeug-2.3.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	test? (
+		dev-python/asgiref[${PYTHON_USEDEP}]
+		dev-python/blinker[${PYTHON_USEDEP}]
+		dev-python/semantic_version[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs
+distutils_enable_tests pytest
+
+PATCHES=(
+	"${DISTDIR}/${P}-werkzeug-2.3.patch"
+)
+
+python_test() {
+	epytest -p no:httpbin
+}
diff --git a/dev-python/flask-login/flask-login-0.6.2.ebuild b/dev-python/flask-login/flask-login-0.6.2.ebuild
index aa79ee005e7e..763df13fd554 100644
--- a/dev-python/flask-login/flask-login-0.6.2.ebuild
+++ b/dev-python/flask-login/flask-login-0.6.2.ebuild
@@ -31,6 +31,7 @@ DEPEND="
 		dev-python/asgiref[${PYTHON_USEDEP}]
 		dev-python/blinker[${PYTHON_USEDEP}]
 		dev-python/semantic_version[${PYTHON_USEDEP}]
+		<dev-python/werkzeug-2.3[${PYTHON_USEDEP}]
 	)
 "
 
diff --git a/dev-python/hatch-jupyter-builder/Manifest b/dev-python/hatch-jupyter-builder/Manifest
new file mode 100644
index 000000000000..b800574126ce
--- /dev/null
+++ b/dev-python/hatch-jupyter-builder/Manifest
@@ -0,0 +1,3 @@
+DIST hatch_jupyter_builder-0.8.3.tar.gz 54754 BLAKE2B d64a90ba0e06dbbcfa3f2d27d88185f68bc6cadd885fd3691e01d129cb1d73d62efd2d230fe80dd2d8d1323b5efa4d3208f099663b2ed082a196a1b8fc39412e SHA512 c4dc0605338bafeeba21cc7260005815654d3e4646296d91af6fb3199be8645a06b2226608e6b0558ee01c7eed682162eefcf686a7e20636031b95c3a11ae265
+EBUILD hatch-jupyter-builder-0.8.3.ebuild 743 BLAKE2B bcd70f34c6ed4905e59881382122006abc55e62d32f29d46c37116313bfa32a5001d9e52a363ad95f2f8373ba8d328442d8a5fa5e027d79e4a0a8a1b640cebdb SHA512 256b56ada7bfca57f77018dc4fe64213b8a1efccef964c4062eb2ba381e4beac415c1ebd097f5341c22cf44fc4c0cc0d09d1957bd24ec79302f7f9e9273446d8
+MISC metadata.xml 434 BLAKE2B 4891ed3bf24cb6255d2edb5a9ea9203ea43c807cda50963e25cc6527caa20e1308271f1b5cbb246582491814db6e1743e083871ac044511eb5a5fd269288b623 SHA512 a9b103c28eac7767473c2499b9eeefb8796206b2d913bbd35ceb5ff30fbc16881b018d851381400bb0d544e9c9b710907ff52e17deb63a08440eec926c6633e0
diff --git a/dev-python/hatch-jupyter-builder/hatch-jupyter-builder-0.8.3.ebuild b/dev-python/hatch-jupyter-builder/hatch-jupyter-builder-0.8.3.ebuild
new file mode 100644
index 000000000000..2859ccbdd90e
--- /dev/null
+++ b/dev-python/hatch-jupyter-builder/hatch-jupyter-builder-0.8.3.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+DISTUTILS_USE_PEP517=hatchling
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="A hatch plugin to help build Jupyter packages"
+HOMEPAGE="
+	https://pypi.org/project/hatch-jupyter-builder/
+	https://github.com/jupyterlab/hatch-jupyter-builder
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/hatchling[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/tomli[${PYTHON_USEDEP}]
+		dev-python/twine[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_DESELECT=(
+	# Calls pip, requires internet
+	tests/test_plugin.py::test_hatch_build
+)
+
+distutils_enable_tests pytest
diff --git a/dev-python/hatch-jupyter-builder/metadata.xml b/dev-python/hatch-jupyter-builder/metadata.xml
new file mode 100644
index 000000000000..af696c7da7fe
--- /dev/null
+++ b/dev-python/hatch-jupyter-builder/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">hatch-jupyter-builder</remote-id>
+		<remote-id type="github">jupyterlab/hatch-jupyter-builder</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/jupyter-lsp/Manifest b/dev-python/jupyter-lsp/Manifest
index 4882a1b622b4..5c3f32057fba 100644
--- a/dev-python/jupyter-lsp/Manifest
+++ b/dev-python/jupyter-lsp/Manifest
@@ -1,3 +1,5 @@
 DIST jupyter-lsp-2.0.1.tar.gz 43962 BLAKE2B 0a030542297c6a311ca2b9a681acf4ae4d196ebaee342fa44a7a5b0c9a3788aecdb7b6a60a4653114ae6c5a69f4da9108a831eda72401643b8bb34cad6d3de43 SHA512 539851c567cf0dfa08c9658fe98941a8aaa90f625cba1d231d54fe3f4e19cbd9f14fc5b54c39798af1d1da40075dbaa7f43e95517934571391c488639f9c66b3
+DIST jupyter-lsp-2.1.0.tar.gz 44667 BLAKE2B 751dcc2d45641b3e4efe949a5e89e7f8bbd95d1d543db32fa5878fe3b30a6569056da7b7cb447f6ffecdb035c88e47ab1e734ba2ff6aa1d16ec248590ff6122b SHA512 296ef188bc353dabb65507f0a303e20aacc30a09cdd0952bc031397b7317b0f0cf314f7320c876ff74b58a9906d5ae4413988009faa4ecee090213aef9d4a620
 EBUILD jupyter-lsp-2.0.1.ebuild 2743 BLAKE2B bcad3f001aa2cb92fcbd9b7f9a8e1302e8fc3e2c6328a4fd7dde58098b15906c0f2eca5022b1b82119130ee1ddada766020d18eba831324bb1349e782f14f704 SHA512 8d33d169a193fbc8f3a2fd1b0cd9a1bec168c44550395c02d56a2952ab4e8677931720b27b6fc441faacadd1aa0bba3e39adf8cad83768643bc40e96f9df85da
+EBUILD jupyter-lsp-2.1.0.ebuild 2743 BLAKE2B bcad3f001aa2cb92fcbd9b7f9a8e1302e8fc3e2c6328a4fd7dde58098b15906c0f2eca5022b1b82119130ee1ddada766020d18eba831324bb1349e782f14f704 SHA512 8d33d169a193fbc8f3a2fd1b0cd9a1bec168c44550395c02d56a2952ab4e8677931720b27b6fc441faacadd1aa0bba3e39adf8cad83768643bc40e96f9df85da
 MISC metadata.xml 417 BLAKE2B 37e0faca144a5da718475df6e957d9664fa5a757735bf65985dba486180dce37621cf3c34cadef4dbefbdb5698192b601a8e0bb1c77f71ba5550e65e47cc5e9c SHA512 6b61ffc68a46993386baa1c1b95850edbfbdb8d4fa40c4111aaf4edbb7d8d4f8ed21960ee01e69e2a8b986f66c6ec4ff938392d7849e204936f05d62ce7e8531
diff --git a/dev-python/jupyter-lsp/jupyter-lsp-2.1.0.ebuild b/dev-python/jupyter-lsp/jupyter-lsp-2.1.0.ebuild
new file mode 100644
index 000000000000..6e4b32461a3c
--- /dev/null
+++ b/dev-python/jupyter-lsp/jupyter-lsp-2.1.0.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYPI_NO_NORMALIZE=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1 optfeature pypi
+
+DESCRIPTION="Multi-Language Server WebSocket proxy for Jupyter Notebook/Lab"
+HOMEPAGE="https://github.com/krassowski/jupyterlab-lsp"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/entrypoints[${PYTHON_USEDEP}]
+	>=dev-python/jupyter-server-1.1.2[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/importlib-metadata-4.8.3[${PYTHON_USEDEP}]
+	' 3.9)
+"
+
+EPYTEST_DESELECT=(
+	# Not packaged
+	"jupyter_lsp/tests/test_listener.py::test_listeners[bash-language-server]"
+	"jupyter_lsp/tests/test_listener.py::test_listeners[dockerfile-language-server-nodejs]"
+	"jupyter_lsp/tests/test_listener.py::test_listeners[pylsp]"
+	"jupyter_lsp/tests/test_listener.py::test_listeners[sql-language-server]"
+	"jupyter_lsp/tests/test_listener.py::test_listeners[typescript-language-server]"
+	"jupyter_lsp/tests/test_listener.py::test_listeners[unified-language-server]"
+	"jupyter_lsp/tests/test_listener.py::test_listeners[vscode-css-languageserver-bin]"
+	"jupyter_lsp/tests/test_listener.py::test_listeners[vscode-html-languageserver-bin]"
+	"jupyter_lsp/tests/test_listener.py::test_listeners[vscode-json-languageserver-bin]"
+	"jupyter_lsp/tests/test_listener.py::test_listeners[yaml-language-server]"
+	"jupyter_lsp/tests/test_session.py::test_start_known[bash-language-server]"
+	"jupyter_lsp/tests/test_session.py::test_start_known[dockerfile-language-server-nodejs]"
+	"jupyter_lsp/tests/test_session.py::test_start_known[pylsp]"
+	"jupyter_lsp/tests/test_session.py::test_start_known[sql-language-server]"
+	"jupyter_lsp/tests/test_session.py::test_start_known[typescript-language-server]"
+	"jupyter_lsp/tests/test_session.py::test_start_known[unified-language-server]"
+	"jupyter_lsp/tests/test_session.py::test_start_known[vscode-css-languageserver-bin]"
+	"jupyter_lsp/tests/test_session.py::test_start_known[vscode-html-languageserver-bin]"
+	"jupyter_lsp/tests/test_session.py::test_start_known[vscode-json-languageserver-bin]"
+	"jupyter_lsp/tests/test_session.py::test_start_known[yaml-language-server]"
+)
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# Do not depend on pytest-cov or flake8
+	sed -i -e '/--cov/d' -e '/--flake8/d' setup.cfg || die
+	# R lsp server not packaged
+	sed -i -e 's:test_r_package_detection:_&:' \
+		jupyter_lsp/tests/test_detect.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	mv "${ED}/usr/etc" "${ED}/etc" || die
+}
+
+pkg_postinst() {
+	optfeature "Language server for Python" dev-python/python-lsp-server
+}
diff --git a/dev-python/jupyterlab-lsp/Manifest b/dev-python/jupyterlab-lsp/Manifest
index b03eae32bf9c..c5b175646fc1 100644
--- a/dev-python/jupyterlab-lsp/Manifest
+++ b/dev-python/jupyterlab-lsp/Manifest
@@ -1,3 +1,5 @@
 DIST jupyterlab-lsp-4.0.1.tar.gz 869528 BLAKE2B 62df16ba8aef6c344324346501191776a0534ddf6b5acff4de477f8f7f8996f7ec78022bada4c16d582fdfb7f916fd70f6c9c176505d25c47e863aa65f681f77 SHA512 8f71a6f39bec08fab8401a7074d65fa9a4bdca66ed3c11f75777095f160e9eab25b75b21f1ea4e509f43ff0beebe777f690c13ad0325b5ee26bcd1ec301119e4
+DIST jupyterlab-lsp-4.1.0.tar.gz 870899 BLAKE2B df1df3fc4dfc6cf268d2a81dcc63683e9b31595d633929b7788da21cfbc20f3da4c202e0d8fdcca3cfe033ed953e661bbaad605b783db8d5a26adc5ae169f2e4 SHA512 1510db853b75aeccc8dfbb9f466214c447fbdc8f885027c99ee7527c7759afa9774cfa682f3f66c6cce37767339b6e54338a7a14f6dc1d30b9944e1d1de8ff3c
 EBUILD jupyterlab-lsp-4.0.1.ebuild 562 BLAKE2B 5515e2b9ce4a942aaf15515f82ecc03f2ef667fc9072ba13c49c4571308bfb06a6c15696bb9be6511df761c02a078819b621db663fc619013d8eb5293dc467a8 SHA512 3012407d81591318ff1d57379b4363e8c5600307f5f200ecc4ab465529cd91195fc43d5a6ff69ed10b22fc63d2653557316f1d94b7feefbaff872d343fc32b8b
+EBUILD jupyterlab-lsp-4.1.0.ebuild 562 BLAKE2B 5515e2b9ce4a942aaf15515f82ecc03f2ef667fc9072ba13c49c4571308bfb06a6c15696bb9be6511df761c02a078819b621db663fc619013d8eb5293dc467a8 SHA512 3012407d81591318ff1d57379b4363e8c5600307f5f200ecc4ab465529cd91195fc43d5a6ff69ed10b22fc63d2653557316f1d94b7feefbaff872d343fc32b8b
 MISC metadata.xml 421 BLAKE2B cbd9c4e3ce5848ed3d0e57832082dd730d2d16a286070639602b8fcd49c49714e7f17b220251b9f16d9c5105248933390b152c060c68522d2c82b1958b09b116 SHA512 97ac68ac4e6920f23120a5818b4404fa0b510b165a44a6455a7bf76edfa298ca137f50bd9c1a87044253f5b873f881362c2667261a4c7fdb182a7d37325520b3
diff --git a/dev-python/jupyterlab-lsp/jupyterlab-lsp-4.1.0.ebuild b/dev-python/jupyterlab-lsp/jupyterlab-lsp-4.1.0.ebuild
new file mode 100644
index 000000000000..f8fbb2f8f9b2
--- /dev/null
+++ b/dev-python/jupyterlab-lsp/jupyterlab-lsp-4.1.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+inherit distutils-r1 pypi
+
+DESCRIPTION="Coding assistance for JupyterLab with Language Server Protocol"
+HOMEPAGE="https://github.com/jupyter-lsp/jupyterlab-lsp"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/jupyterlab-3.6.0[${PYTHON_USEDEP}]
+	<dev-python/jupyterlab-4.0.0[${PYTHON_USEDEP}]
+	>=dev-python/jupyter-lsp-2.0.0[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/jupyterlab/Manifest b/dev-python/jupyterlab/Manifest
index 7a538e337a65..582f4f95e62c 100644
--- a/dev-python/jupyterlab/Manifest
+++ b/dev-python/jupyterlab/Manifest
@@ -1,5 +1,7 @@
 DIST jupyterlab-3.5.3.tar.gz 17114007 BLAKE2B 70d32721a2579331dd4e3481f7241f5e2c5aad6dac851f213de0ac1fc3b76667bea496bca5ea13ee562e9678d51ac45df91c5901d8d3b7dc839977d3d842e67d SHA512 fdacd34ab629da2b5c2eb23f11ba4d44d5b27872e1736850319bcabbe635d31cfa2891c1c5991b152a5c1d94221e3766a20fc91033f556d8e508374bc46d5fe2
 DIST jupyterlab-3.6.3.tar.gz 16847186 BLAKE2B 6916722469ab100a1a240b8a565c9800f35535b2a9b2c39a6bfd275b078d88df9faa1f12d4ce3819155af7b0ed22282836f9b233534bd3e63d8a330d1cd7cd21 SHA512 3d6b4781f9fab02504b2c0223a4d060d80c3442fa6ac53ae326296d69942d68f8545450f671f6ba65c7c4e218aad62ef4f4ceb658899c21aaff3640c3055d364
+DIST jupyterlab-4.0.0.tar.gz 18227222 BLAKE2B 98a6e1cfb4dd72a2cd183cb7210e45a70a9dc9f77200c42f58340889ac97dc2f7bcdb18822f7b9618e955dcf651bfc4b3d2087677cc112a4e2085fe6d70c3014 SHA512 7ed40068fe3f617870bc3fbad0401145baaf79e1688bd2e5a879ad92c8c1058a1a0c5fffafe7c1c0fbf1e77c2bef8e975f39d14e54b739bf8de653c264bffaa6
 EBUILD jupyterlab-3.5.3.ebuild 2574 BLAKE2B 9d56d8393c51ac23d5564e935b0621e7afeffbcc510abf0cab42f971531ec4fe8a0afdb5e3d46839cb579b2e956f905d672e430570a39cf8b3f93c856921f735 SHA512 e8da2a35344d04bc458d628dac61584812fd25cec8da4915511d8014fac086443783f62c685a020bc573e086ee255521f0de6cea6bac011ab15e7280516c9acf
 EBUILD jupyterlab-3.6.3.ebuild 2744 BLAKE2B 12af870b41a8c4e7021ccefddbb659c12e60baf85cb9af3ae640998a97c0edafaccc8fb957aa3875ce8df69bd36cc18370e7e30213588c884c5c5a9686550357 SHA512 bfd6127202e73a99c1f3e764e1674e04d5cd4fc91ab2d0d287d4c99b8521712bb56f868ffb3851d43dad3ac1befef9dbb09952ab6ff954af085ec77792dc3b30
+EBUILD jupyterlab-4.0.0.ebuild 2566 BLAKE2B fae16c460f77211214d52ec0d1aa6fc681f8aaf2fb75c5bcea1daeb8688047a0cafdc4831f441a1b3337e1d2e821ed96383378e6e39d29125a16b18582f9ebe5 SHA512 f32cc330a126317a963b4b1391881f9ba1d7ae4154291b931fc4cfd22ff9dc5acdf2063c28e80018b88fe534df53b8ed2f674cf6fcb258c351ef2fb0b4cd9d42
 MISC metadata.xml 412 BLAKE2B f0b40e19f8ba9dc116f0e4a882cabab6376f22d1eaeb3eac58ecff465ee2aff3564ddbf55e4ffb8971807a39945109a164037a954419671a274d3ac558b102ea SHA512 b6149a03585ca04bc3bf6f3ea6055e8e1fcb620a771359d150df7c22ee16bf09f57c8037df2161021fac0c194be0ac5ec79a31f0511d785e0c5b1ca96d817e42
diff --git a/dev-python/jupyterlab/jupyterlab-4.0.0.ebuild b/dev-python/jupyterlab/jupyterlab-4.0.0.ebuild
new file mode 100644
index 000000000000..a243089c3963
--- /dev/null
+++ b/dev-python/jupyterlab/jupyterlab-4.0.0.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+DISTUTILS_USE_PEP517=hatchling
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="JupyterLab computational environment"
+HOMEPAGE="
+	https://jupyter.org/
+	https://github.com/jupyterlab/jupyterlab/
+	https://pypi.org/project/jupyterlab/
+"
+
+LICENSE="BSD MIT GPL-3 Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/async-lru[${PYTHON_USEDEP}]
+	dev-python/ipykernel[${PYTHON_USEDEP}]
+	>=dev-python/jinja-3.0.3[${PYTHON_USEDEP}]
+	dev-python/jupyter-core[${PYTHON_USEDEP}]
+	>=dev-python/jupyter-lsp-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/jupyter-server-2.4.0[${PYTHON_USEDEP}]
+	<dev-python/jupyter-server-3[${PYTHON_USEDEP}]
+	>=dev-python/jupyterlab-server-2.19[${PYTHON_USEDEP}]
+	<dev-python/jupyterlab-server-3[${PYTHON_USEDEP}]
+	>=dev-python/notebook-shim-0.2[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/tomli[${PYTHON_USEDEP}]
+	>=dev-python/tornado-6.2[${PYTHON_USEDEP}]
+	dev-python/traitlets[${PYTHON_USEDEP}]
+	net-libs/nodejs
+"
+
+BDEPEND="
+	dev-python/hatch-jupyter-builder[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-console-scripts[${PYTHON_USEDEP}]
+		>=dev-python/pytest-jupyter-0.5.3[${PYTHON_USEDEP}]
+		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/requests-cache[${PYTHON_USEDEP}]
+		dev-python/virtualenv[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_DESELECT=(
+	# These tests call npm and want internet
+	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_uninstall_core_extension
+	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_install_and_uninstall_pinned_folder
+	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_install_and_uninstall_pinned
+	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_build_custom_minimal_core_config
+	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_build_custom
+	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_build_check
+	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_build
+	jupyterlab/tests/test_build_api.py::TestBuildAPI::test_clear
+	jupyterlab/tests/test_build_api.py::TestBuildAPI::test_build
+)
+
+EPYTEST_IGNORE=(
+	jupyterlab/tests/test_announcements.py
+)
+
+distutils_enable_tests pytest
+# TODO: package sphinx_copybutton
+#distutils_enable_sphinx docs/source dev-python/sphinx-rtd-theme dev-python/myst-parser
+
+python_install_all() {
+	distutils-r1_python_install_all
+	mv "${ED}/usr/etc" "${ED}/etc" || die
+}
diff --git a/dev-python/pymdown-extensions/Manifest b/dev-python/pymdown-extensions/Manifest
index 79568450221f..3fc6a45b8122 100644
--- a/dev-python/pymdown-extensions/Manifest
+++ b/dev-python/pymdown-extensions/Manifest
@@ -1,7 +1,3 @@
 DIST pymdown-extensions-10.0.1.gh.tar.gz 1063025 BLAKE2B 937273053918cbb8e0245ba38a78a93184a492e21846db60f675d015cc5f942bef5e7085136cc861aa4a6068096e23fdb5f212182d47f245ac6a45127b5ca2a2 SHA512 579aa70c21cffdc7d5ffd927bce071f40bc6ace040cbcb4d15d620a54b97eae2cee7afa049e9005dccc2081dac7db3ff7e2deb2c1c468cf27fe42a306b6e46ab
-DIST pymdown-extensions-10.0.gh.tar.gz 1062913 BLAKE2B a7f0da6ce416ece64ecf4340e9c0c0330858cc972924b7d646abfb2080b10814f81bf4f5ad42895e523edfb1bdb61e805cb66507780fdad04dad7ffa6e266c66 SHA512 660e903705fe379e6ed2c67ede21eea8a4d0e14731e036b556eaccc6a3ab76dce71e29d1581fbd822794d66382970fbc95ece9c2cd2f5854018a81a65e06239a
-DIST pymdown-extensions-9.11.gh.tar.gz 1062074 BLAKE2B d695fa946c264f7ce2da7731fd5ce5388152a2179830108a6b43f769144246c33118084b4b2fe1e45b4255e26dc91871be699043008f67d2f04c5e5396f9ad12 SHA512 7745f0da83e3ecab9ac16947662c7a4da31e9ed62c6c519457083e0e8075f386a10146f18edc59cb17dee383335bb303c109da2ab08501118a53ee7315b1095f
 EBUILD pymdown-extensions-10.0.1.ebuild 1352 BLAKE2B 1c1d5961f011bfab257badfbfba2492e7627e76b0386080a7167dc210e2e3f3625df15466157a1b3aefa0e77ae76b67883e2ed0382f5f9307665b246da491894 SHA512 e9c7dd37e30b109e25e766b0fc997d7422b49329d269a96d66dbb5352701cf7ff8684218d5f188811a71a5c7b032d8671ce3f53343c0c3f68a59aeb8fec36d3e
-EBUILD pymdown-extensions-10.0.ebuild 1354 BLAKE2B 314344afa98ad9ec8a8b06a47f4e8b14282412a7c8990dfc19068f8d58c437d925d5075846d67d7752ad22834ca6906a71a4d46ae697ee86f3912b9a39ef5704 SHA512 a44583fa5023490e02b1e521d891f5ed8285c4bb2f877d7f1a3ad92f90db1ff208e43b3cae777d1037cf7ff540a09720766d1019429f941258fdd4c2ce6d12b1
-EBUILD pymdown-extensions-9.11.ebuild 1351 BLAKE2B b1f0c784c925e6eaa28c5e0347df360d9e3ce5ebd4df116586eb430d00f5239cfea6bec965c4652324fdd10cb4636923b5304f861d5ce1c8d0975085bff2a78a SHA512 3575978522171454980d5421e8b9e772e41a2fa1821a10face999a71e93917050595fc29a4bbe6dce4ae2ac8d82e0abd1fa6a8478784cac68c82b09105c5b214
 MISC metadata.xml 536 BLAKE2B f417ab2132b06eadbf1785654080084c4ef694f983e223ade83d5c77213e4443203a498a168efd68e4a3b1cccbe019c5b88716ac851719b9197deba9d2fd5411 SHA512 51304b48f9e296abea376be300053e041ea331f93e1ec7a2a3cdf10eea0ed6e9b8f04cdcbbed7920b46c60d5f6ce9337e3e25635516871d7b080eb54bfa16f57
diff --git a/dev-python/pymdown-extensions/pymdown-extensions-10.0.ebuild b/dev-python/pymdown-extensions/pymdown-extensions-10.0.ebuild
deleted file mode 100644
index 31418053ff8b..000000000000
--- a/dev-python/pymdown-extensions/pymdown-extensions-10.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{10..11} )
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="
-	dev-python/mkdocs-git-revision-date-localized-plugin
-	dev-python/mkdocs-minify-plugin
-	dev-python/mkdocs-material
-	dev-python/pymdown-lexers
-	dev-python/pyspelling
-"
-DOCS_INITIALIZE_GIT=1
-
-inherit distutils-r1 docs
-
-DESCRIPTION="Extensions for Python Markdown"
-HOMEPAGE="
-	https://github.com/facelessuser/pymdown-extensions/
-	https://pypi.org/project/pymdown-extensions/
-"
-SRC_URI="
-	https://github.com/facelessuser/pymdown-extensions/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		>=dev-python/pygments-2.12.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_compile_all() {
-	default
-	# We need to do this manually instead of relying on docs_compile
-	# https://bytemeta.vip/repo/facelessuser/pymdown-extensions/issues/1446
-	# https://bugs.gentoo.org/859637
-	if use doc; then
-		python -m mkdocs build || die "Failed to make docs"
-		# Colliding files found by ecompress:
-		rm site/sitemap.xml.gz || die
-		HTML_DOCS=( "site/." )
-	fi
-}
diff --git a/dev-python/pymdown-extensions/pymdown-extensions-9.11.ebuild b/dev-python/pymdown-extensions/pymdown-extensions-9.11.ebuild
deleted file mode 100644
index 50b457fc8d45..000000000000
--- a/dev-python/pymdown-extensions/pymdown-extensions-9.11.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{9..11} )
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="
-	dev-python/mkdocs-git-revision-date-localized-plugin
-	dev-python/mkdocs-minify-plugin
-	dev-python/mkdocs-material
-	dev-python/pymdown-lexers
-	dev-python/pyspelling
-"
-DOCS_INITIALIZE_GIT=1
-
-inherit distutils-r1 docs
-
-DESCRIPTION="Extensions for Python Markdown"
-HOMEPAGE="
-	https://github.com/facelessuser/pymdown-extensions/
-	https://pypi.org/project/pymdown-extensions/
-"
-SRC_URI="
-	https://github.com/facelessuser/pymdown-extensions/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		>=dev-python/pygments-2.12.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_compile_all() {
-	default
-	# We need to do this manually instead of relying on docs_compile
-	# https://bytemeta.vip/repo/facelessuser/pymdown-extensions/issues/1446
-	# https://bugs.gentoo.org/859637
-	if use doc; then
-		python -m mkdocs build || die "Failed to make docs"
-		# Colliding files found by ecompress:
-		rm site/sitemap.xml.gz || die
-		HTML_DOCS=( "site/." )
-	fi
-}
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 6867193529da..d1b7d18f0bf7 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/git-machete/Manifest b/dev-vcs/git-machete/Manifest
index e69ffb8b6bc6..17e29b838604 100644
--- a/dev-vcs/git-machete/Manifest
+++ b/dev-vcs/git-machete/Manifest
@@ -1,5 +1,7 @@
 DIST git-machete-3.16.3.gh.tar.gz 1618456 BLAKE2B e8207b11bfea6dd50965aaa300ec7303684503b900912b031f08378c7d80b388b341d23769cea5fe4aef0d78bc8457b0118aa3e05a49b0c1c4a3f9a97019c46e SHA512 fcd856c0fefecd2cf97ba149f1d1df57eb6fab0345c00c3d3df763041cc86226e3f815dda7c0050f8669d7d082e329dd76304de2092c7b43219e0c50a2e3467a
 DIST git-machete-3.17.3.gh.tar.gz 1623473 BLAKE2B 57749f566f27086c6359a5ea08004bc2b84921c3bb42dfb7d9a2029b032cdf0626541ded8dc7af04ab821e187358e5a7ff6d789bf2e204a9f1ad4367939e3477 SHA512 bc138636e96f2fb415c28e6a429cc5a10de7b1edd22f752ce1f552fa33f16f668c5bc6917186f437ccf28fc2be15c8dc9cf21c3c9ec4ab49e5d63af5fee0f521
+DIST git-machete-3.17.4.gh.tar.gz 1624890 BLAKE2B f81fc2322aa40736130180ec1a269248280ce826d70b32ac7d435da906a7c480e385ff22def06b28d5f8b5af8d3e683aa222689249ec9555a58844151bb8117a SHA512 2af06171d642a1e4fbbfe7dc97961b348e656025e03120b8699a8d6a43c3f0571eddfdfb0dac6f1f96d8eda7e47ba0307f398993ae8f56a63d68b24665bc5288
 EBUILD git-machete-3.16.3.ebuild 1113 BLAKE2B 2a6a42b99966e5f3f1f48ee1154d72aef41bc274cd28dcf2ada2c92d09d6419a237ebbcce34318304e791a4786fd8dea6b07e7cdbb05734bba266f3cd38e4b92 SHA512 4b12e321b6f6960ded2d7a31eb0827fa66274270e0af1e42b659aa580b3ea6f2bd56ee342cd155ae96029b69c47a7a05da2c9cc6f2cae144294ea4442e31d70d
 EBUILD git-machete-3.17.3.ebuild 1115 BLAKE2B f8847098953db2ab68ac64283d09e34f377144e6d1c55f8b54676261c2c652539604e7d80f4ee4b0fe5617ddd8880c2eecc1729921f3eac40bf9cdbb921ea67e SHA512 e90e99eb6942a49f375f05ed7f02722d4abf5009d7fec4dcb4f33053fa80d7c89c6e9dc9394008413ecc38e417e4df3aa14498e80baaef0bb2ae346bc3cfc654
+EBUILD git-machete-3.17.4.ebuild 1115 BLAKE2B f8847098953db2ab68ac64283d09e34f377144e6d1c55f8b54676261c2c652539604e7d80f4ee4b0fe5617ddd8880c2eecc1729921f3eac40bf9cdbb921ea67e SHA512 e90e99eb6942a49f375f05ed7f02722d4abf5009d7fec4dcb4f33053fa80d7c89c6e9dc9394008413ecc38e417e4df3aa14498e80baaef0bb2ae346bc3cfc654
 MISC metadata.xml 835 BLAKE2B f59f4070f862a09fb74c57b5ef093e4c8d1394887f71b8f490e49e49f64722b48ab44f15907edb0eff322227f5a97aaf5d2d92512c818b8aa1020e6f735971c8 SHA512 d31266b47abfef805f0f0ae5f13c1f89ec13907fc7e33e126eefee5600087ffadf8f55e48c5c42c295dc7de8d901a3231db0756a79d666651569a150d7016cea
diff --git a/dev-vcs/git-machete/git-machete-3.17.4.ebuild b/dev-vcs/git-machete/git-machete-3.17.4.ebuild
new file mode 100644
index 000000000000..c04f32d1e272
--- /dev/null
+++ b/dev-vcs/git-machete/git-machete-3.17.4.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+DISTUTILS_USE_PEP517=setuptools
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="Probably the sharpest git repo organizer & rebase/merge workflow automation tool"
+HOMEPAGE="https://github.com/VirtusLab/git-machete https://pypi.org/project/git-machete/"
+# No tests in PyPI tarballs
+SRC_URI="https://github.com/VirtusLab/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
+
+RDEPEND="dev-vcs/git"
+BDEPEND="test? (
+	>=dev-python/pytest-mock-3.10.0[${PYTHON_USEDEP}]
+	>=dev-python/pytest-xdist-3.2.1[${PYTHON_USEDEP}]
+)"
+
+DOCS=( CONTRIBUTING.md README.md )
+
+distutils_enable_sphinx docs/source dev-python/sphinx-rtd-theme
+distutils_enable_tests pytest
+
+src_install() {
+	distutils-r1_src_install
+
+	newbashcomp completion/${PN}.completion.bash ${PN}
+
+	insinto /usr/share/fish/vendor_completions.d
+	doins completion/${PN}.fish
+
+	insinto /usr/share/zsh/site-functions
+	newins completion/${PN}.completion.zsh _${PN}
+}
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index ba724dc3d772..2b70668c3bc9 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/pavucontrol/Manifest b/media-sound/pavucontrol/Manifest
index 7febee506525..a0a22434acc7 100644
--- a/media-sound/pavucontrol/Manifest
+++ b/media-sound/pavucontrol/Manifest
@@ -1,4 +1,4 @@
 DIST pavucontrol-5.0.tar.xz 194248 BLAKE2B 9e6b9b7d94be51a4ad8b5310e031c4fed0f5299e67c770c9a573c0647edf27345014fb6504892fad29b9b5e79ce43ed312217dbed8e2b31b805f291531062903 SHA512 5673d783c2c819a68b49025c051bedd39f4caba446a479797b06569e24a96acc0924ba680d2416baff8c3211cfc7c94760d503900207fbe7c89c5cb2adaebec1
 EBUILD pavucontrol-5.0-r1.ebuild 839 BLAKE2B e3372efdbd8a8bf0475706f528b8b7e1a4c6cd1e43a4e7625d26a4baeac7922381226a7af91ff6df989aafee03409d76a64a89b562f54824b34a3358d20d20b9 SHA512 9ed02142e21eccecfe2505c6634afbf5c7989d39af1b351e23d36db592db1f2d179ebd44057c829788eca78419bfc7fd7fc54c30aead54e97c584e81e36cf893
-EBUILD pavucontrol-5.0-r2.ebuild 839 BLAKE2B fa25bf8ffef93614c5a45e3bccd05a072563dad246627e5d2f7f1fa63579d08514da041e5f27e2ce4f5794149c09022af4c4749062f9bdac370840ad9cca074a SHA512 c251dd81e76901e5d31104a5c22a901a49000d4bc526333240660c9e65017ca6eadf88f038f642db1e8ad62e5b8087a20bf45a89ac24b9ef10e5f476af0491e1
+EBUILD pavucontrol-5.0-r2.ebuild 838 BLAKE2B 9ad794fb68b3c31d1bdfacc8b9012a3d05a7fe79d0de6196706d98904e07d836e46157ba1cf40365985ad3f7bd4bbab945401472464e1c21e4a246f0d3c75583 SHA512 0610e2271e4a78726655b6dea28769451fdba4fd526b986bf929594dbf77caf4257fc16d5203ea294f7dacd76f9d588c82a9c6d1a4c24b3f355ecaf4fd9d6696
 MISC metadata.xml 250 BLAKE2B 3e6dae5d5f3b3ac412806dd8615a1975c7ea8a64bfd72ad54f2c93a9b24c19c620ac3e8b26e1f6cadec899443e138ee4fb7a82ecb83c784d0c03ee91854d8622 SHA512 2bfce2cf73aefce6dda06ea351cb93b2990b9543f48be1ae5406a5a5acf2c34faed1eb2ce715eb689eb50a9a1add5576b39232eb818c233f5a5589e16032aca8
diff --git a/media-sound/pavucontrol/pavucontrol-5.0-r2.ebuild b/media-sound/pavucontrol/pavucontrol-5.0-r2.ebuild
index 1163cfb2044a..f8cbdbd4b946 100644
--- a/media-sound/pavucontrol/pavucontrol-5.0-r2.ebuild
+++ b/media-sound/pavucontrol/pavucontrol-5.0-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://freedesktop.org/software/pulseaudio/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="nls"
 
 RDEPEND="
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 1fe38386cc4d..070f63d2d9e7 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 43a846fb68b7..19721c8868b8 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Fri, 19 May 2023 08:39:34 +0000
+Fri, 19 May 2023 14:39:32 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index fc6c6ff6f04b..f9f77f6187c8 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 543888 BLAKE2B da15fb010da91c403608af1847df77a89c9a8a24b2f5c1999256191c31d7755cd7667c19867e75c2bbdd07063f4ce4dd641cf53415eb08b83e35cbb3d2cd35e2 SHA512 ac5e51b2bf8075889870e4eedfe469274eaf28945ed1e974bc76ae0576dc1aa0db2a5fdacfc15e8cfb28486195fad65b487cf50896a207c5fcad4ffae850adbc
-TIMESTAMP 2023-05-19T08:39:37Z
+TIMESTAMP 2023-05-19T14:39:35Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRnNclfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRniidfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAudBAAmHgzVbEe/TpHr+GflsjVwT3ps2Oc1NiZ8rc5e5yfXmNPizkozE8W5IS1
-BN4pVry4gTp/aco95Lsx+sRnQnq1uMpozYNyqxZiEEJR7bC56N6OXMCKRifoKUa4
-HpLpirBBX03Ced8TmM1KOP5FWywsLtQtElmu8kdkhh6M5StblhdDAU3UEipBfPT2
-q1gFsO8DNCQ/IicgS4avYxCdW/odxpsnkrpvovIhxxsWTx7YaYf4NyiMBvayS+Ai
-4P1QIJT/+v2xVHgNIVNJmmsUnqjPO06d/DNwyqWvncA9F1NgaNxUa3/T8UFc6igf
-cz9psOdXgJ6jBN9SsLydo1ExqOkYyjCdrDmm/wDUlg72nRb6JDW/Xn/vTCrwhFkF
-RXRFTPJro7ymWQEQcECgndlqABR7uTeVvvCCD8yDOy6bKrQfcus1HQXxQqewEmLK
-NdapxYNuo2qIYHdnKxh00YXnySkGXnAcI/WpKLA8H8v3ZilzKXl5Lg4w9FpTau6G
-Gmvi070/gWWtDHdxHk2onD8Mu3oWFlrau5go4RbFxATEnBQybzvbL+M24e8etpX7
-6IcFR6DhIDpKwwOU/uzB9+x5JkXCISspn0HrQ5wEzk9hk5KPduhiE4B0+ln5Bh8k
-zJ9f1FqM2+7S5mp4YbnRLguG84WI7hLO5MsQXikUY+pYBCRa7Q8=
-=dW1a
+klDvYg/+Ppf5JVkW2u1597cGSeWUVU5JktMPjp0gt+Tsppyd0DUCsmM9w6WH+dFw
+Fpd7VI2K0wMBs17XObgE0yQmp7SskAu1UalFJhFNJ+Dq7c4czVhtb175g7EZHbau
+F6BaaX9vQlc+HF6Fut1n2w48XTSKexCSHey+9b/S6hILfNX7l2uestewXRBgO9C7
+0sjyG8GrbG7/ouFnL1FqPTiDSI5XrOueGAeIkuswJPRvHeidj55Cv6uuGTfZihly
+14AXVPBZkHNZNnV4Io66ygt4nApMCTSQbR2fVle7UFmWKYAHnd6eGuIzfBwzdJzn
+JQg5+473aOzmRF9o5euYzqj6W2X722320VO082zU90X2zIrhygnxEH1ma+U/ThfC
+lhRNfEbkn9Xn6Zj4XqIceu2QC8BT/PtisQaf+JxF5hlXFUG00hkZkf+MVR5Hd4bq
+Oce5fDM342GbT1JSjtC9E5DO6fNI7CrwahqNt//zYs/ntdpI+Ya6Vnp2ysgyiyoW
+zbaCOGXF3YmYt1sJji+K99nlqNEOh1QUvxyUG0bUNlPJLG5nZkS+wvirm1tC2Xbb
+4jbkHDEBx2mlGR5SLauq66E8+4mF37gE1r+eavn2pKTfF3J8+3N1m3VV1HVQniyq
+Hu7WKU8oOGanWUN8uSCWoQp6Sy/gI2EBcEGy/SmpwdPai8rRmCI=
+=fMgR
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 43a846fb68b7..19721c8868b8 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Fri, 19 May 2023 08:39:34 +0000
+Fri, 19 May 2023 14:39:32 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index ad8a1ea4d54a..4bce51242b9e 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index 3d777f2011f6..a8aeae45eb3c 100644
--- a/metadata/md5-cache/app-admin/Manifest.gz
+++ b/metadata/md5-cache/app-admin/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/ansible-lint-6.16.0 b/metadata/md5-cache/app-admin/ansible-lint-6.16.1
index 01cfd7b82ce7..87fa1c53c22f 100644
--- a/metadata/md5-cache/app-admin/ansible-lint-6.16.0
+++ b/metadata/md5-cache/app-admin/ansible-lint-6.16.1
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-python/setuptools-scm-7.0.5[python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/pytest-mock[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-plus-0.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-xdist-2.5.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=app-admin/ansible-core-2.12.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ansible-compat-2.2.7[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/black-22.8.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/filelock-3.8.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-4.17.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-21.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml-5.4.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/rich-12.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ruamel-yaml-0.17.24[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wcmatch-8.3.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-util/yamllint-1.30.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-vcs/git >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=>=dev-python/setuptools-scm-7.0.5[python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/pytest-mock[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-plus-0.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-xdist-2.5.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=app-admin/ansible-core-2.12.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ansible-compat-2.2.7[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/black-22.8.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/filelock-3.8.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-4.17.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-21.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml-5.4.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/rich-12.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ruamel-yaml-0.17.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wcmatch-8.3.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-util/yamllint-1.30.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-vcs/git >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Checks ansible playbooks for practices and behaviour that can be improved
 EAPI=8
@@ -8,10 +8,10 @@ IUSE=test python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64 ~riscv
 LICENSE=MIT
 PROPERTIES=test_network
-RDEPEND=>=app-admin/ansible-core-2.12.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ansible-compat-2.2.7[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/black-22.8.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/filelock-3.8.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-4.17.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-21.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml-5.4.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/rich-12.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ruamel-yaml-0.17.24[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wcmatch-8.3.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-util/yamllint-1.30.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-vcs/git python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+RDEPEND=>=app-admin/ansible-core-2.12.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ansible-compat-2.2.7[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/black-22.8.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/filelock-3.8.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-4.17.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-21.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml-5.4.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/rich-12.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ruamel-yaml-0.17.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wcmatch-8.3.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-util/yamllint-1.30.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-vcs/git python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=test !test? ( test )
 SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/a/ansible-lint/ansible-lint-6.16.0.tar.gz
+SRC_URI=https://files.pythonhosted.org/packages/source/a/ansible-lint/ansible-lint-6.16.1.tar.gz
 _eclasses_=distutils-r1	499c8c8ae8bcabd2304237fb740c23b3	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=42340ff903f8f5186815911b4d380461
+_md5_=a1122ca2d58fe72fea883a6eae0bca2c
diff --git a/metadata/md5-cache/app-admin/keepassxc-2.7.1-r1 b/metadata/md5-cache/app-admin/keepassxc-2.7.1-r1
deleted file mode 100644
index 761bb06db801..000000000000
--- a/metadata/md5-cache/app-admin/keepassxc-2.7.1-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-qt/linguist-tools:5 doc? ( dev-ruby/asciidoctor ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=app-crypt/argon2:= dev-libs/botan:2= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-gfx/qrencode:= sys-libs/readline:0= sys-libs/zlib:= autotype? ( x11-libs/libX11 x11-libs/libXtst ) keeshare? ( sys-libs/zlib:=[minizip] ) yubikey? ( dev-libs/libusb:1 sys-apps/pcsc-lite ) dev-qt/qttest:5
-DESCRIPTION=KeePassXC - KeePass Cross-platform Community Edition
-EAPI=8
-HOMEPAGE=https://keepassxc.org
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=cmake flag-o-matic xdg
-IUSE=autotype browser doc keeshare +network test yubikey
-KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv x86
-LICENSE=LGPL-2.1 GPL-2 GPL-3
-RDEPEND=app-crypt/argon2:= dev-libs/botan:2= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-gfx/qrencode:= sys-libs/readline:0= sys-libs/zlib:= autotype? ( x11-libs/libX11 x11-libs/libXtst ) keeshare? ( sys-libs/zlib:=[minizip] ) yubikey? ( dev-libs/libusb:1 sys-apps/pcsc-lite )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/keepassxreboot/keepassxc/archive/2.7.1.tar.gz -> keepassxc-2.7.1.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=b7b17a9ee4db316049a120fa9ca9a873
diff --git a/metadata/md5-cache/app-admin/keepassxc-2.7.3 b/metadata/md5-cache/app-admin/keepassxc-2.7.5-r1
index 55466e3bbc97..8e20fdc2ae8f 100644
--- a/metadata/md5-cache/app-admin/keepassxc-2.7.3
+++ b/metadata/md5-cache/app-admin/keepassxc-2.7.5-r1
@@ -1,18 +1,18 @@
 BDEPEND=dev-qt/linguist-tools:5 doc? ( dev-ruby/asciidoctor ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=app-crypt/argon2:= dev-libs/botan:2= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 media-gfx/qrencode:= sys-libs/readline:0= sys-libs/zlib:= X? ( dev-qt/qtx11extras:5 ) autotype? ( x11-libs/libX11 x11-libs/libXtst ) keeshare? ( sys-libs/zlib:=[minizip] ) yubikey? ( dev-libs/libusb:1 sys-apps/pcsc-lite ) dev-qt/qttest:5
+DEPEND=app-crypt/argon2:= dev-libs/botan:3= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 media-gfx/qrencode:= sys-libs/readline:0= sys-libs/zlib:= X? ( dev-qt/qtx11extras:5 ) autotype? ( x11-libs/libX11 x11-libs/libXtst ) keeshare? ( sys-libs/zlib:=[minizip] ) yubikey? ( dev-libs/libusb:1 sys-apps/pcsc-lite ) dev-qt/qttest:5
 DESCRIPTION=KeePassXC - KeePass Cross-platform Community Edition
 EAPI=8
 HOMEPAGE=https://keepassxc.org/ https://github.com/keepassxreboot/keepassxc/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=cmake flag-o-matic xdg
 IUSE=X autotype browser doc keeshare +network test yubikey
-KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=LGPL-2.1 GPL-2 GPL-3
-RDEPEND=app-crypt/argon2:= dev-libs/botan:2= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 media-gfx/qrencode:= sys-libs/readline:0= sys-libs/zlib:= X? ( dev-qt/qtx11extras:5 ) autotype? ( x11-libs/libX11 x11-libs/libXtst ) keeshare? ( sys-libs/zlib:=[minizip] ) yubikey? ( dev-libs/libusb:1 sys-apps/pcsc-lite )
+RDEPEND=app-crypt/argon2:= dev-libs/botan:3= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 media-gfx/qrencode:= sys-libs/readline:0= sys-libs/zlib:= X? ( dev-qt/qtx11extras:5 ) autotype? ( x11-libs/libX11 x11-libs/libXtst ) keeshare? ( sys-libs/zlib:=[minizip] ) yubikey? ( dev-libs/libusb:1 sys-apps/pcsc-lite )
 REQUIRED_USE=autotype? ( X )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/keepassxreboot/keepassxc/releases/download/2.7.3/keepassxc-2.7.3-src.tar.xz
+SRC_URI=https://github.com/keepassxreboot/keepassxc/releases/download/2.7.5/keepassxc-2.7.5-src.tar.xz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=2e3706e13f83ba5644428c4b9ba30a32
+_md5_=29e3a076a2b0445c51ac40d3f13d906e
diff --git a/metadata/md5-cache/app-admin/keepassxc-9999 b/metadata/md5-cache/app-admin/keepassxc-9999
index 9f00a6db219e..c67f371d01b3 100644
--- a/metadata/md5-cache/app-admin/keepassxc-9999
+++ b/metadata/md5-cache/app-admin/keepassxc-9999
@@ -14,4 +14,4 @@ REQUIRED_USE=autotype? ( X )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	git-r3	27e13c09a4c7e4c78ac812f74727e676	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=c84fbe3e2b900000cdd6dc613aab652f
+_md5_=33b3b8271afa4e6edf5758fcdd6831d8
diff --git a/metadata/md5-cache/app-admin/mcelog-192 b/metadata/md5-cache/app-admin/mcelog-192
deleted file mode 100644
index 48d0bfc0a535..000000000000
--- a/metadata/md5-cache/app-admin/mcelog-192
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=install prepare pretend setup
-DEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 )
-DESCRIPTION=A tool to log and decode Machine Check Exceptions
-EAPI=8
-HOMEPAGE=http://mcelog.org/
-INHERIT=linux-info python-any-r1 systemd toolchain-funcs
-IUSE=selinux
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=selinux? ( sec-policy/selinux-mcelog )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/andikleen/mcelog/archive/v192.tar.gz -> mcelog-192.tar.gz
-_eclasses_=linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=da97b659a33d636b1f9469382bb15a2c
diff --git a/metadata/md5-cache/app-admin/mcelog-193 b/metadata/md5-cache/app-admin/mcelog-193
deleted file mode 100644
index 412b5d8e3a41..000000000000
--- a/metadata/md5-cache/app-admin/mcelog-193
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=install prepare pretend setup
-DEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 )
-DESCRIPTION=A tool to log and decode Machine Check Exceptions
-EAPI=8
-HOMEPAGE=http://mcelog.org/
-INHERIT=linux-info python-any-r1 systemd toolchain-funcs
-IUSE=selinux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=selinux? ( sec-policy/selinux-mcelog )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/andikleen/mcelog/archive/v193.tar.gz -> mcelog-193.tar.gz
-_eclasses_=linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=d7dcf2bfece1d0c8506218e3ea2d179c
diff --git a/metadata/md5-cache/app-admin/mcelog-194 b/metadata/md5-cache/app-admin/mcelog-194
index 22650a6f5efa..e79a95132f5e 100644
--- a/metadata/md5-cache/app-admin/mcelog-194
+++ b/metadata/md5-cache/app-admin/mcelog-194
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=http://mcelog.org/
 INHERIT=linux-info python-any-r1 systemd toolchain-funcs
 IUSE=selinux
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=selinux? ( sec-policy/selinux-mcelog )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/andikleen/mcelog/archive/v194.tar.gz -> mcelog-194.tar.gz
 _eclasses_=linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=d7dcf2bfece1d0c8506218e3ea2d179c
+_md5_=da97b659a33d636b1f9469382bb15a2c
diff --git a/metadata/md5-cache/app-backup/Manifest.gz b/metadata/md5-cache/app-backup/Manifest.gz
index 2c24964daf09..eb33dff167c5 100644
--- a/metadata/md5-cache/app-backup/Manifest.gz
+++ b/metadata/md5-cache/app-backup/Manifest.gz
diff --git a/metadata/md5-cache/app-backup/borgmatic-1.7.12 b/metadata/md5-cache/app-backup/borgmatic-1.7.13
index 763eb34961f2..b7c0f2b19a9a 100644
--- a/metadata/md5-cache/app-backup/borgmatic-1.7.12
+++ b/metadata/md5-cache/app-backup/borgmatic-1.7.13
@@ -11,6 +11,6 @@ RDEPEND=app-backup/borgbackup python_single_target_python3_10? ( <dev-python/col
 REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/b/borgmatic/borgmatic-1.7.12.tar.gz
+SRC_URI=https://files.pythonhosted.org/packages/source/b/borgmatic/borgmatic-1.7.13.tar.gz
 _eclasses_=distutils-r1	499c8c8ae8bcabd2304237fb740c23b3	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=2de7fc1062d3ed5db1329555c031aa62
+_md5_=6c815b26869a67b818c6cdbbe0e12bfd
diff --git a/metadata/md5-cache/app-emacs/Manifest.gz b/metadata/md5-cache/app-emacs/Manifest.gz
index 461917aaf391..2dcf3fbc96b5 100644
--- a/metadata/md5-cache/app-emacs/Manifest.gz
+++ b/metadata/md5-cache/app-emacs/Manifest.gz
diff --git a/metadata/md5-cache/app-emacs/editorconfig-emacs-0.10.1 b/metadata/md5-cache/app-emacs/editorconfig-emacs-0.10.1
new file mode 100644
index 000000000000..0e54c587afeb
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/editorconfig-emacs-0.10.1
@@ -0,0 +1,14 @@
+BDEPEND=>=app-editors/emacs-25.3:*
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DESCRIPTION=EditorConfig plugin for emacs
+EAPI=8
+HOMEPAGE=https://github.com/editorconfig/editorconfig-emacs
+INHERIT=elisp readme.gentoo-r1
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=>=app-editors/emacs-25.3:*
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/editorconfig/editorconfig-emacs/archive/v0.10.1.tar.gz -> editorconfig-emacs-0.10.1.tar.gz
+_eclasses_=elisp	7190c722d9e06fabcae26ef1e1dc9183	elisp-common	01bc6dc778b74a9deebe4e419a3b790e	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3
+_md5_=c2c6d1f10e46edb2430d28e84744662e
diff --git a/metadata/md5-cache/app-emacs/eldev-1.2.2 b/metadata/md5-cache/app-emacs/eldev-1.2.2
deleted file mode 100644
index 2025c31651eb..000000000000
--- a/metadata/md5-cache/app-emacs/eldev-1.2.2
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=app-editors/emacs-25.3:*
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DESCRIPTION=Emacs Lisp Development Tool
-EAPI=8
-HOMEPAGE=https://github.com/doublep/eldev/
-INHERIT=elisp
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+
-RDEPEND=>=app-editors/emacs-25.3:*
-SLOT=0
-SRC_URI=https://github.com/doublep/eldev/archive/1.2.2.tar.gz -> eldev-1.2.2.tar.gz
-_eclasses_=elisp	7190c722d9e06fabcae26ef1e1dc9183	elisp-common	01bc6dc778b74a9deebe4e419a3b790e
-_md5_=be91ab36c497a2b33690858159bf310d
diff --git a/metadata/md5-cache/app-emacs/eldev-1.3 b/metadata/md5-cache/app-emacs/eldev-1.4
index ec863db51e09..26455e4f9653 100644
--- a/metadata/md5-cache/app-emacs/eldev-1.3
+++ b/metadata/md5-cache/app-emacs/eldev-1.4
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-25.3:*
 SLOT=0
-SRC_URI=https://github.com/doublep/eldev/archive/1.3.tar.gz -> eldev-1.3.tar.gz
+SRC_URI=https://github.com/doublep/eldev/archive/1.4.tar.gz -> eldev-1.4.tar.gz
 _eclasses_=elisp	7190c722d9e06fabcae26ef1e1dc9183	elisp-common	01bc6dc778b74a9deebe4e419a3b790e
 _md5_=be91ab36c497a2b33690858159bf310d
diff --git a/metadata/md5-cache/app-emacs/macrostep-0.9 b/metadata/md5-cache/app-emacs/macrostep-0.9.2
index 0391455e1c28..cee003a6a5d7 100644
--- a/metadata/md5-cache/app-emacs/macrostep-0.9
+++ b/metadata/md5-cache/app-emacs/macrostep-0.9.2
@@ -2,12 +2,12 @@ BDEPEND=>=app-editors/emacs-25.3:*
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
 DESCRIPTION=Interactive macro-expander for Emacs
 EAPI=8
-HOMEPAGE=https://github.com/joddie/macrostep/
+HOMEPAGE=https://github.com/joddie/macrostep/ https://github.com/emacsorphanage/macrostep/
 INHERIT=elisp
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-25.3:*
 SLOT=0
-SRC_URI=https://github.com/joddie/macrostep/archive/0.9.tar.gz -> macrostep-0.9.tar.gz
+SRC_URI=https://github.com/emacsorphanage/macrostep/archive/0.9.2.tar.gz -> macrostep-0.9.2.tar.gz
 _eclasses_=elisp	7190c722d9e06fabcae26ef1e1dc9183	elisp-common	01bc6dc778b74a9deebe4e419a3b790e
-_md5_=bb70dd929915114fb8efbda6aecaeab2
+_md5_=57331a664afa5fc932a82b431edca93c
diff --git a/metadata/md5-cache/app-shells/Manifest.gz b/metadata/md5-cache/app-shells/Manifest.gz
index 6c2bb151c500..a5d5c7c995e9 100644
--- a/metadata/md5-cache/app-shells/Manifest.gz
+++ b/metadata/md5-cache/app-shells/Manifest.gz
diff --git a/metadata/md5-cache/app-shells/gentoo-bashcomp-20230313 b/metadata/md5-cache/app-shells/gentoo-bashcomp-20230313
index 3ad67032a00a..959f4826c1c7 100644
--- a/metadata/md5-cache/app-shells/gentoo-bashcomp-20230313
+++ b/metadata/md5-cache/app-shells/gentoo-bashcomp-20230313
@@ -3,9 +3,9 @@ DESCRIPTION=Gentoo-specific bash command-line completions (emerge, ebuild, equer
 EAPI=8
 HOMEPAGE=https://gitweb.gentoo.org/proj/gentoo-bashcomp.git/
 INHERIT=bash-completion-r1
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/gentoo-bashcomp.git/snapshot/gentoo-bashcomp-20230313.tar.bz2
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	104e1332efb829e2f7cbf89307a474f1	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=52dd31571bbcbf7c2ff4bc07eef7d071
+_md5_=213784434a65c10abadb0507249f5f2f
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index c74749f48f2c..8066b5d518f2 100644
--- a/metadata/md5-cache/app-text/Manifest.gz
+++ b/metadata/md5-cache/app-text/Manifest.gz
diff --git a/metadata/md5-cache/app-text/xdvik-22.87.06-r1 b/metadata/md5-cache/app-text/xdvik-22.87.06-r1
index f3c183c6f83c..aa899ea716e4 100644
--- a/metadata/md5-cache/app-text/xdvik-22.87.06-r1
+++ b/metadata/md5-cache/app-text/xdvik-22.87.06-r1
@@ -7,10 +7,10 @@ HOMEPAGE=http://xdvi.sourceforge.net/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=autotools desktop elisp-common flag-o-matic toolchain-funcs xdg
 IUSE=motif neXt Xaw3d emacs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=media-libs/freetype-2.9.1-r2:2 x11-libs/libX11 x11-libs/libXi x11-libs/libXmu x11-libs/libXpm x11-libs/libXt emacs? ( >=app-editors/emacs-23.1:* ) motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( neXt? ( x11-libs/neXtaw ) !neXt? ( Xaw3d? ( x11-libs/libXaw3d ) !Xaw3d? ( x11-libs/libXaw ) ) ) dev-libs/kpathsea:= virtual/latex-base !<app-text/texlive-2007
 SLOT=0
 SRC_URI=mirror://sourceforge/xdvi/xdvik-22.87.06.tar.gz https://dev.gentoo.org/~pacho/xdvik/xdvik_192.png
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	desktop	021728fdc1b03b36357dbc89489e0f0d	elisp-common	01bc6dc778b74a9deebe4e419a3b790e	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	104e1332efb829e2f7cbf89307a474f1	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=b98f3e1f663789f92e0d83b7c190d7f3
+_md5_=d98e60e75254f4e8e7a1aa9a44361152
diff --git a/metadata/md5-cache/app-text/xiphos-4.2.1-r1 b/metadata/md5-cache/app-text/xiphos-4.2.1-r1
deleted file mode 100644
index 0aa953bec0ef..000000000000
--- a/metadata/md5-cache/app-text/xiphos-4.2.1-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-apps/util-linux dev-libs/libxml2 dev-libs/libxslt dbus? ( dev-libs/dbus-glib ) app-arch/zip app-text/yelp-tools dev-libs/appstream-glib dev-util/desktop-file-utils dev-util/glib-utils dev-util/itstool virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=sys-apps/util-linux dev-libs/libxml2 dev-libs/libxslt dbus? ( dev-libs/dbus-glib ) >=app-text/sword-1.8.1 dev-libs/glib:2 dev-libs/icu >=net-libs/biblesync-1.2.0 net-libs/webkit-gtk:4 sys-libs/zlib[minizip] x11-libs/gtk+:3
-DESCRIPTION=A Gtk+-based Bible-study frontend for SWORD
-EAPI=8
-HOMEPAGE=https://xiphos.org/
-INHERIT=cmake xdg-utils
-IUSE=dbus debug
-KEYWORDS=amd64
-LICENSE=GPL-2 FDL-1.1 LGPL-2 MIT MPL-1.1
-RDEPEND=sys-apps/util-linux dev-libs/libxml2 dev-libs/libxslt dbus? ( dev-libs/dbus-glib ) >=app-text/sword-1.8.1 dev-libs/glib:2 dev-libs/icu >=net-libs/biblesync-1.2.0 net-libs/webkit-gtk:4 sys-libs/zlib[minizip] x11-libs/gtk+:3
-SLOT=0
-SRC_URI=https://github.com/crosswire/xiphos/releases/download/4.2.1/xiphos-4.2.1.tar.xz https://dev.gentoo.org/~marecki/dists/app-text/xiphos/xiphos-4.2.1-disable_webkit_editor.patch.xz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=c8de92cde3daf463761afa434ce8d7d3
diff --git a/metadata/md5-cache/app-text/xiphos-4.2.1-r2 b/metadata/md5-cache/app-text/xiphos-4.2.1-r2
index dabf27d24de6..3a6eedba745c 100644
--- a/metadata/md5-cache/app-text/xiphos-4.2.1-r2
+++ b/metadata/md5-cache/app-text/xiphos-4.2.1-r2
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://xiphos.org/
 INHERIT=cmake xdg-utils
 IUSE=dbus debug
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-2 FDL-1.1 LGPL-2 MIT MPL-1.1
 RDEPEND=sys-apps/util-linux dev-libs/libxml2 dev-libs/libxslt dbus? ( dev-libs/dbus-glib ) >=app-text/sword-1.8.1 dev-libs/glib:2 dev-libs/icu >=net-libs/biblesync-1.2.0 net-libs/webkit-gtk:4.1 sys-libs/zlib[minizip] x11-libs/gtk+:3
 SLOT=0
 SRC_URI=https://github.com/crosswire/xiphos/releases/download/4.2.1/xiphos-4.2.1.tar.xz https://dev.gentoo.org/~marecki/dists/app-text/xiphos/xiphos-4.2.1-disable_webkit_editor.patch.xz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=143a53d753efb5fbe7b1f18769e2c7d6
+_md5_=d2b84fc70ea91f6d45b3f9a42082e33f
diff --git a/metadata/md5-cache/dev-games/Manifest.gz b/metadata/md5-cache/dev-games/Manifest.gz
index 58541c6ca662..24ddfffafae5 100644
--- a/metadata/md5-cache/dev-games/Manifest.gz
+++ b/metadata/md5-cache/dev-games/Manifest.gz
diff --git a/metadata/md5-cache/dev-games/godot-4.0.3 b/metadata/md5-cache/dev-games/godot-4.0.3
new file mode 100644
index 000000000000..cd33e863d586
--- /dev/null
+++ b/metadata/md5-cache/dev-games/godot-4.0.3
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-util/scons-4.4.0[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-util/scons-4.4.0[python_targets_python3_10(-)] ) )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test
+DEPEND=app-arch/zstd:= dev-games/recastnavigation:= dev-libs/icu:= dev-libs/libpcre2:=[pcre32] media-libs/freetype[brotli,harfbuzz] media-libs/harfbuzz:=[icu] media-libs/libogg media-libs/libpng:= media-libs/libvorbis <net-libs/mbedtls-3:= net-libs/wslay sys-libs/zlib:= alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig ) gui? ( media-libs/libglvnd x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender x11-libs/libxkbcommon tools? ( raycast? ( media-libs/embree:3 ) ) vulkan? ( media-libs/vulkan-loader[X] ) ) pulseaudio? ( media-libs/libpulse ) speech? ( app-accessibility/speech-dispatcher ) theora? ( media-libs/libtheora ) tools? ( app-misc/ca-certificates ) udev? ( virtual/udev ) upnp? ( net-libs/miniupnpc:= ) webp? ( media-libs/libwebp:= ) gui? ( x11-base/xorg-proto ) tools? ( test? ( dev-cpp/doctest ) )
+DESCRIPTION=Multi-platform 2D and 3D game engine with a feature-rich editor
+EAPI=8
+HOMEPAGE=https://godotengine.org/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=bash-completion-r1 desktop python-any-r1 scons-utils toolchain-funcs xdg
+IUSE=alsa +dbus debug deprecated +fontconfig +gui pulseaudio raycast +runner speech test +theora +tools +udev +upnp +vulkan +webp
+KEYWORDS=~amd64
+LICENSE=MIT Apache-2.0 BSD Boost-1.0 CC0-1.0 Unlicense ZLIB gui? ( CC-BY-4.0 ) tools? ( OFL-1.1 )
+RDEPEND=app-arch/zstd:= dev-games/recastnavigation:= dev-libs/icu:= dev-libs/libpcre2:=[pcre32] media-libs/freetype[brotli,harfbuzz] media-libs/harfbuzz:=[icu] media-libs/libogg media-libs/libpng:= media-libs/libvorbis <net-libs/mbedtls-3:= net-libs/wslay sys-libs/zlib:= alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig ) gui? ( media-libs/libglvnd x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender x11-libs/libxkbcommon tools? ( raycast? ( media-libs/embree:3 ) ) vulkan? ( media-libs/vulkan-loader[X] ) ) pulseaudio? ( media-libs/libpulse ) speech? ( app-accessibility/speech-dispatcher ) theora? ( media-libs/libtheora ) tools? ( app-misc/ca-certificates ) udev? ( virtual/udev ) upnp? ( net-libs/miniupnpc:= ) webp? ( media-libs/libwebp:= )
+RESTRICT=test
+SLOT=4
+SRC_URI=https://downloads.tuxfamily.org/godotengine/4.0.3/godot-4.0.3-stable.tar.xz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	desktop	021728fdc1b03b36357dbc89489e0f0d	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	scons-utils	03ca4edc3a0fdb533f0f358787059bdc	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=9ee5d9568eef698726dab9d2220c3df9
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 9f80444d0add..8063c79a6cfa 100644
--- a/metadata/md5-cache/dev-lang/Manifest.gz
+++ b/metadata/md5-cache/dev-lang/Manifest.gz
diff --git a/metadata/md5-cache/dev-lang/erlang-25.3 b/metadata/md5-cache/dev-lang/erlang-25.3
index 93ed4e2cdbd4..5649fa3dc6d1 100644
--- a/metadata/md5-cache/dev-lang/erlang-25.3
+++ b/metadata/md5-cache/dev-lang/erlang-25.3
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://www.erlang.org/
 INHERIT=elisp-common flag-o-matic java-pkg-opt-2 systemd toolchain-funcs wxwidgets
 IUSE=doc emacs java +kpoll odbc sctp ssl systemd tk wxwidgets java
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=Apache-2.0
 RDEPEND=acct-group/epmd acct-user/epmd sys-libs/ncurses:0 sys-libs/zlib emacs? ( >=app-editors/emacs-23.1:* ) java? ( >=virtual/jdk-1.8:* ) odbc? ( dev-db/unixODBC ) sctp? ( net-misc/lksctp-tools ) ssl? ( >=dev-libs/openssl-0.9.7d:0= ) systemd? ( sys-apps/systemd ) wxwidgets? ( x11-libs/wxGTK:3.0-gtk3[X,opengl] ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0/25.3
 SRC_URI=https://github.com/erlang/otp/archive/OTP-25.3.tar.gz -> erlang-25.3.tar.gz https://github.com/erlang/otp/releases/download/OTP-25.3/otp_doc_man_25.3.tar.gz -> erlang_doc_man_25.3.tar.gz doc? ( https://github.com/erlang/otp/releases/download/OTP-25.3/otp_doc_html_25.3.tar.gz -> erlang_doc_html_25.3.tar.gz )
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	01bc6dc778b74a9deebe4e419a3b790e	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	multilib	104e1332efb829e2f7cbf89307a474f1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	wxwidgets	9a707a3f9f1ea7aa703b1e46552291e5
-_md5_=cc7331391798a104a288d39f366d2d28
+_md5_=7897dc2f952b2fc6d28c67e96f40d563
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index fbb2e48a27ec..4a8815d542c8 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/botocore-1.29.136 b/metadata/md5-cache/dev-python/botocore-1.29.136-r1
index cf8b318f63c5..3ce7e9c8a9fc 100644
--- a/metadata/md5-cache/dev-python/botocore-1.29.136
+++ b/metadata/md5-cache/dev-python/botocore-1.29.136-r1
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/jsonschema[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/urllib3-1.27[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=test? ( dev-python/jsonschema[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Low-level, data-driven core of boto 3
 EAPI=8
@@ -7,10 +7,10 @@ INHERIT=distutils-r1 multiprocessing
 IUSE=test python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
-RDEPEND=dev-python/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/urllib3-1.27[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+RDEPEND=dev-python/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/boto/botocore/archive/1.29.136.tar.gz -> botocore-1.29.136.gh.tar.gz
 _eclasses_=distutils-r1	499c8c8ae8bcabd2304237fb740c23b3	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=0edb282497a7418a6582dfbb1dd358b0
+_md5_=0a0fb1a94ac28cee470da7b1644eba68
diff --git a/metadata/md5-cache/dev-python/flask-api-3.0-r1 b/metadata/md5-cache/dev-python/flask-api-3.0-r1
deleted file mode 100644
index c160dd503427..000000000000
--- a/metadata/md5-cache/dev-python/flask-api-3.0-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/flask[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/markdown[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Browsable web APIs for Flask
-EAPI=8
-HOMEPAGE=https://github.com/flask-api/flask-api/ https://pypi.org/project/Flask-API/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-RDEPEND=dev-python/flask[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/markdown[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/flask-api/flask-api/archive/v3.0.tar.gz -> flask-api-3.0.gh.tar.gz
-_eclasses_=distutils-r1	499c8c8ae8bcabd2304237fb740c23b3	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=ad774d43ce15df06d81cd57885f7c696
diff --git a/metadata/md5-cache/dev-python/flask-api-3.0-r2 b/metadata/md5-cache/dev-python/flask-api-3.0-r2
new file mode 100644
index 000000000000..51f890461a3c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/flask-api-3.0-r2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( <dev-python/flask-2.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/markdown[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Browsable web APIs for Flask
+EAPI=8
+HOMEPAGE=https://github.com/flask-api/flask-api/ https://pypi.org/project/Flask-API/
+INHERIT=distutils-r1
+IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2
+RDEPEND=<dev-python/flask-2.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/markdown[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/flask-api/flask-api/archive/v3.0.tar.gz -> flask-api-3.0.gh.tar.gz
+_eclasses_=distutils-r1	499c8c8ae8bcabd2304237fb740c23b3	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=2e5754d86d9de73962fd51d82935feec
diff --git a/metadata/md5-cache/dev-python/flask-login-0.6.2 b/metadata/md5-cache/dev-python/flask-login-0.6.2
index cc509dc8010d..43d33b07b541 100644
--- a/metadata/md5-cache/dev-python/flask-login-0.6.2
+++ b/metadata/md5-cache/dev-python/flask-login-0.6.2
@@ -1,6 +1,6 @@
 BDEPEND=doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] ) ) ) test? ( >=dev-python/flask-1.0.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/werkzeug-1.0.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-python/asgiref[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/blinker[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/semantic_version[python_targets_python3_10(-)?,python_targets_python3_11(-)?] )
+DEPEND=test? ( dev-python/asgiref[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/blinker[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/semantic_version[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/werkzeug-2.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] )
 DESCRIPTION=Login session support for Flask
 EAPI=8
 HOMEPAGE=https://github.com/maxcountryman/flask-login/ https://pypi.org/project/Flask-Login/
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/maxcountryman/flask-login/archive/0.6.2.tar.gz -> flask-login-0.6.2.gh.tar.gz
 _eclasses_=distutils-r1	499c8c8ae8bcabd2304237fb740c23b3	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=c91b30095b66990ae62176878f0fa6e9
+_md5_=2568f36afbd21010adb39216de9024e4
diff --git a/metadata/md5-cache/dev-python/flask-login-0.6.2-r1 b/metadata/md5-cache/dev-python/flask-login-0.6.2-r1
new file mode 100644
index 000000000000..42956dde256a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/flask-login-0.6.2-r1
@@ -0,0 +1,17 @@
+BDEPEND=doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] ) ) ) test? ( >=dev-python/flask-1.0.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/werkzeug-2.3.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( dev-python/asgiref[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/blinker[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/semantic_version[python_targets_python3_10(-)?,python_targets_python3_11(-)?] )
+DESCRIPTION=Login session support for Flask
+EAPI=8
+HOMEPAGE=https://github.com/maxcountryman/flask-login/ https://pypi.org/project/Flask-Login/
+INHERIT=distutils-r1
+IUSE=doc test python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=BSD
+RDEPEND=>=dev-python/flask-1.0.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/werkzeug-2.3.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/maxcountryman/flask-login/archive/0.6.2.tar.gz -> flask-login-0.6.2.gh.tar.gz https://github.com/maxcountryman/flask-login/pull/743.patch -> flask-login-0.6.2-werkzeug-2.3.patch
+_eclasses_=distutils-r1	499c8c8ae8bcabd2304237fb740c23b3	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=d9a8504ba46cfcc56144d6dadd9477d6
diff --git a/metadata/md5-cache/dev-python/hatch-jupyter-builder-0.8.3 b/metadata/md5-cache/dev-python/hatch-jupyter-builder-0.8.3
new file mode 100644
index 000000000000..522bff6e13d4
--- /dev/null
+++ b/metadata/md5-cache/dev-python/hatch-jupyter-builder-0.8.3
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pytest-mock[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tomli[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/twine[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/hatchling[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hatchling-1.12.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A hatch plugin to help build Jupyter packages
+EAPI=8
+HOMEPAGE=https://pypi.org/project/hatch-jupyter-builder/ https://github.com/jupyterlab/hatch-jupyter-builder
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-python/hatchling[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/h/hatch-jupyter-builder/hatch_jupyter_builder-0.8.3.tar.gz
+_eclasses_=distutils-r1	499c8c8ae8bcabd2304237fb740c23b3	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=2597997f06817cdf68e43b8e30432c0c
diff --git a/metadata/md5-cache/dev-python/jupyter-lsp-2.1.0 b/metadata/md5-cache/dev-python/jupyter-lsp-2.1.0
new file mode 100644
index 000000000000..002f3abd2a96
--- /dev/null
+++ b/metadata/md5-cache/dev-python/jupyter-lsp-2.1.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/entrypoints[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter-server-1.1.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=Multi-Language Server WebSocket proxy for Jupyter Notebook/Lab
+EAPI=8
+HOMEPAGE=https://github.com/krassowski/jupyterlab-lsp
+INHERIT=distutils-r1 optfeature pypi
+IUSE=test python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-python/entrypoints[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter-server-1.1.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/j/jupyter-lsp/jupyter-lsp-2.1.0.tar.gz
+_eclasses_=distutils-r1	499c8c8ae8bcabd2304237fb740c23b3	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=ef224839497f1d0ff6956311e3e4f372
diff --git a/metadata/md5-cache/dev-python/jupyterlab-4.0.0 b/metadata/md5-cache/dev-python/jupyterlab-4.0.0
new file mode 100644
index 000000000000..3581ebbc6c5f
--- /dev/null
+++ b/metadata/md5-cache/dev-python/jupyterlab-4.0.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/hatch-jupyter-builder[python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/pytest-console-scripts[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-jupyter-0.5.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-tornasync[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-timeout[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests-cache[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/virtualenv[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/async-lru[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ipykernel[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jinja-3.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jupyter-core[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter-lsp-2.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter-server-2.4.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jupyter-server-3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyterlab-server-2.19[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jupyterlab-server-3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/notebook-shim-0.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tomli[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tornado-6.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/traitlets[python_targets_python3_10(-)?,python_targets_python3_11(-)?] net-libs/nodejs >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hatchling-1.12.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=JupyterLab computational environment
+EAPI=8
+HOMEPAGE=https://jupyter.org/ https://github.com/jupyterlab/jupyterlab/ https://pypi.org/project/jupyterlab/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64
+LICENSE=BSD MIT GPL-3 Apache-2.0
+RDEPEND=dev-python/async-lru[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ipykernel[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jinja-3.0.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jupyter-core[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter-lsp-2.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter-server-2.4.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jupyter-server-3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyterlab-server-2.19[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jupyterlab-server-3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/notebook-shim-0.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tomli[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tornado-6.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/traitlets[python_targets_python3_10(-)?,python_targets_python3_11(-)?] net-libs/nodejs python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/j/jupyterlab/jupyterlab-4.0.0.tar.gz
+_eclasses_=distutils-r1	499c8c8ae8bcabd2304237fb740c23b3	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=2fa3c7f74a83aa3d355856273f854f93
diff --git a/metadata/md5-cache/dev-python/jupyterlab-lsp-4.1.0 b/metadata/md5-cache/dev-python/jupyterlab-lsp-4.1.0
new file mode 100644
index 000000000000..cd11de6d5309
--- /dev/null
+++ b/metadata/md5-cache/dev-python/jupyterlab-lsp-4.1.0
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Coding assistance for JupyterLab with Language Server Protocol
+EAPI=8
+HOMEPAGE=https://github.com/jupyter-lsp/jupyterlab-lsp
+INHERIT=distutils-r1 pypi
+IUSE=python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=>=dev-python/jupyterlab-3.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jupyterlab-4.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter-lsp-2.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/j/jupyterlab-lsp/jupyterlab-lsp-4.1.0.tar.gz
+_eclasses_=distutils-r1	499c8c8ae8bcabd2304237fb740c23b3	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=a0f98c71002be1ad90d98dfe5a8d2d1e
diff --git a/metadata/md5-cache/dev-python/pymdown-extensions-10.0 b/metadata/md5-cache/dev-python/pymdown-extensions-10.0
deleted file mode 100644
index c2f17b121520..000000000000
--- a/metadata/md5-cache/dev-python/pymdown-extensions-10.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/pygments-2.12.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/markdown-3.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hatchling-1.12.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 dev-python/mkdocs[python_targets_python3_11(-)] dev-python/mkdocs-git-revision-date-localized-plugin[python_targets_python3_11(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_11(-)] dev-python/mkdocs-material[python_targets_python3_11(-)] dev-python/pymdown-lexers[python_targets_python3_11(-)] dev-python/pyspelling[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/mkdocs[python_targets_python3_10(-)] dev-python/mkdocs-git-revision-date-localized-plugin[python_targets_python3_10(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_10(-)] dev-python/mkdocs-material[python_targets_python3_10(-)] dev-python/pymdown-lexers[python_targets_python3_10(-)] dev-python/pyspelling[python_targets_python3_10(-)] ) ) dev-vcs/git )
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Extensions for Python Markdown
-EAPI=8
-HOMEPAGE=https://github.com/facelessuser/pymdown-extensions/ https://pypi.org/project/pymdown-extensions/
-INHERIT=distutils-r1 docs
-IUSE=test python_targets_python3_10 python_targets_python3_11 doc
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/markdown-3.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/facelessuser/pymdown-extensions/archive/10.0.tar.gz -> pymdown-extensions-10.0.gh.tar.gz
-_eclasses_=distutils-r1	499c8c8ae8bcabd2304237fb740c23b3	docs	7b9e167549c44efa7994614f33ba6d7a	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=a4f273da8b2807541a03e63679a4a325
diff --git a/metadata/md5-cache/dev-python/pymdown-extensions-9.11 b/metadata/md5-cache/dev-python/pymdown-extensions-9.11
deleted file mode 100644
index cd58434cf3b3..000000000000
--- a/metadata/md5-cache/dev-python/pymdown-extensions-9.11
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/pygments-2.12.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/markdown-3.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hatchling-1.12.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 dev-python/mkdocs[python_targets_python3_11(-)] dev-python/mkdocs-git-revision-date-localized-plugin[python_targets_python3_11(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_11(-)] dev-python/mkdocs-material[python_targets_python3_11(-)] dev-python/pymdown-lexers[python_targets_python3_11(-)] dev-python/pyspelling[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/mkdocs[python_targets_python3_10(-)] dev-python/mkdocs-git-revision-date-localized-plugin[python_targets_python3_10(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_10(-)] dev-python/mkdocs-material[python_targets_python3_10(-)] dev-python/pymdown-lexers[python_targets_python3_10(-)] dev-python/pyspelling[python_targets_python3_10(-)] ) ) dev-vcs/git )
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Extensions for Python Markdown
-EAPI=8
-HOMEPAGE=https://github.com/facelessuser/pymdown-extensions/ https://pypi.org/project/pymdown-extensions/
-INHERIT=distutils-r1 docs
-IUSE=test python_targets_python3_10 python_targets_python3_11 doc
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86
-LICENSE=MIT
-RDEPEND=>=dev-python/markdown-3.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/facelessuser/pymdown-extensions/archive/9.11.tar.gz -> pymdown-extensions-9.11.gh.tar.gz
-_eclasses_=distutils-r1	499c8c8ae8bcabd2304237fb740c23b3	docs	7b9e167549c44efa7994614f33ba6d7a	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=6c03eeff41e0b7f58baf2c87e765f7a1
diff --git a/metadata/md5-cache/dev-vcs/Manifest.gz b/metadata/md5-cache/dev-vcs/Manifest.gz
index a253bb8f015e..e11c20481430 100644
--- a/metadata/md5-cache/dev-vcs/Manifest.gz
+++ b/metadata/md5-cache/dev-vcs/Manifest.gz
diff --git a/metadata/md5-cache/dev-vcs/git-machete-3.17.4 b/metadata/md5-cache/dev-vcs/git-machete-3.17.4
new file mode 100644
index 000000000000..b261169c6380
--- /dev/null
+++ b/metadata/md5-cache/dev-vcs/git-machete-3.17.4
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/pytest-mock-3.10.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-xdist-3.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/sphinx-rtd-theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/sphinx-rtd-theme[python_targets_python3_10(-)] ) ) ) test? ( dev-vcs/git >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Probably the sharpest git repo organizer & rebase/merge workflow automation tool
+EAPI=8
+HOMEPAGE=https://github.com/VirtusLab/git-machete https://pypi.org/project/git-machete/
+INHERIT=bash-completion-r1 distutils-r1
+IUSE=doc test python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~riscv
+LICENSE=MIT
+RDEPEND=dev-vcs/git python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/VirtusLab/git-machete/archive/refs/tags/v3.17.4.tar.gz -> git-machete-3.17.4.gh.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	499c8c8ae8bcabd2304237fb740c23b3	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=0a9bb7b441fb15b279e300adccfd974e
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index d390f228823a..e9fb757fd324 100644
--- a/metadata/md5-cache/media-sound/Manifest.gz
+++ b/metadata/md5-cache/media-sound/Manifest.gz
diff --git a/metadata/md5-cache/media-sound/pavucontrol-5.0-r2 b/metadata/md5-cache/media-sound/pavucontrol-5.0-r2
index 5cbefe146d0a..a0e409918584 100644
--- a/metadata/md5-cache/media-sound/pavucontrol-5.0-r2
+++ b/metadata/md5-cache/media-sound/pavucontrol-5.0-r2
@@ -5,9 +5,9 @@ DESCRIPTION=Pulseaudio Volume Control, GTK based mixer for Pulseaudio
 EAPI=7
 HOMEPAGE=https://freedesktop.org/software/pulseaudio/pavucontrol/
 IUSE=nls
-KEYWORDS=~amd64 arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/json-glib >=dev-cpp/gtkmm-3.22:3.0[X] >=dev-libs/libsigc++-2.2:2 >=media-libs/libcanberra-0.16[gtk3] >=media-libs/libpulse-15.0[glib] virtual/freedesktop-icon-theme
 SLOT=0
 SRC_URI=https://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-5.0.tar.xz
-_md5_=f22db82e3fa864bee201c04aae295b0d
+_md5_=49bb0f874dd3674844d91e9648d8a0cf
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index 402bbc7beeb2..c917d514e663 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/netdata-1.39.0 b/metadata/md5-cache/net-analyzer/netdata-1.39.1
index 473118674790..5b87738e019c 100644
--- a/metadata/md5-cache/net-analyzer/netdata-1.39.0
+++ b/metadata/md5-cache/net-analyzer/netdata-1.39.1
@@ -12,6 +12,6 @@ LICENSE=GPL-3+ MIT BSD
 RDEPEND=acct-group/netdata acct-user/netdata app-misc/jq >=app-shells/bash-4:0 || ( net-analyzer/openbsd-netcat net-analyzer/netcat ) net-libs/libwebsockets net-misc/curl net-misc/wget sys-apps/util-linux app-alternatives/awk caps? ( sys-libs/libcap ) cups? ( net-print/cups ) dbengine? ( app-arch/lz4:= dev-libs/judy dev-libs/openssl:= ) dev-libs/libuv:= cloud? ( dev-libs/protobuf:= ) compression? ( sys-libs/zlib ) ipmi? ( sys-libs/freeipmi ) jsonc? ( dev-libs/json-c:= ) mongodb? ( dev-libs/mongo-c-driver ) nfacct? ( net-firewall/nfacct net-libs/libmnl:= ) nodejs? ( net-libs/nodejs ) prometheus? ( app-arch/snappy:= dev-libs/protobuf:= ) python? ( python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) python_single_target_python3_10? ( dev-python/pyyaml[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pyyaml[python_targets_python3_11(-)] ) mysql? ( python_single_target_python3_10? ( dev-python/mysqlclient[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/mysqlclient[python_targets_python3_11(-)] ) ) postgres? ( python_single_target_python3_10? ( dev-python/psycopg:2[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/psycopg:2[python_targets_python3_11(-)] ) ) tor? ( python_single_target_python3_10? ( net-libs/stem[python_targets_python3_10(-)] ) python_single_target_python3_11? ( net-libs/stem[python_targets_python3_11(-)] ) ) ) xen? ( app-emulation/xen-tools dev-libs/yajl )
 REQUIRED_USE=mysql? ( python ) python? ( ^^ ( python_single_target_python3_10 python_single_target_python3_11 ) ) tor? ( python )
 SLOT=0
-SRC_URI=https://github.com/netdata/netdata/releases/download/v1.39.0/netdata-v1.39.0.tar.gz -> netdata-1.39.0.tar.gz
+SRC_URI=https://github.com/netdata/netdata/releases/download/v1.39.1/netdata-v1.39.1.tar.gz -> netdata-1.39.1.tar.gz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	fcaps	c0a086b957a1b183a8d136eabf02f191	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
 _md5_=d20bef54aa2dd72af724c18dc6f713f6
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index 1c73e9207a5f..0bc407f810bf 100644
--- a/metadata/md5-cache/net-im/Manifest.gz
+++ b/metadata/md5-cache/net-im/Manifest.gz
diff --git a/metadata/md5-cache/net-im/gajim-1.7.3-r1 b/metadata/md5-cache/net-im/gajim-1.7.3-r1
new file mode 100644
index 000000000000..64240b3a42f7
--- /dev/null
+++ b/metadata/md5-cache/net-im/gajim-1.7.3-r1
@@ -0,0 +1,17 @@
+BDEPEND=python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[sqlite,xml(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[sqlite,xml(+)] ) python_single_target_python3_10? ( >=dev-python/gpep517-13[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/gpep517-13[python_targets_python3_11(-)] )
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=dev-libs/gobject-introspection[cairo(+)] >=x11-libs/gtk+-3.22:3[introspection] x11-libs/gtksourceview:4[introspection] app-arch/unzip virtual/pkgconfig >=sys-devel/gettext-0.17-r1
+DESCRIPTION=Jabber client written in PyGTK
+EAPI=8
+HOMEPAGE=https://gajim.org/
+INHERIT=distutils-r1 xdg-utils
+IUSE=+crypt geolocation jingle omemo remote rst +spell upnp +webp python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~amd64 ~arm64 ~riscv ~x86
+LICENSE=GPL-3
+RDEPEND=dev-libs/gobject-introspection[cairo(+)] >=x11-libs/gtk+-3.22:3[introspection] x11-libs/gtksourceview:4[introspection] python_single_target_python3_10? ( dev-python/idna[python_targets_python3_10(-)] >=dev-python/nbxmpp-4.2.2[python_targets_python3_10(-)] <dev-python/nbxmpp-5.0.0[python_targets_python3_10(-)] dev-python/precis-i18n[python_targets_python3_10(-)] dev-python/pyasn1[python_targets_python3_10(-)] dev-python/pycairo[python_targets_python3_10(-)] dev-python/pycurl[python_targets_python3_10(-)] dev-python/pygobject:3[cairo,python_targets_python3_10(-)] x11-libs/libXScrnSaver app-crypt/libsecret[crypt,introspection] dev-python/keyring[python_targets_python3_10(-)] >=dev-python/secretstorage-3.1.1[python_targets_python3_10(-)] dev-python/css-parser[python_targets_python3_10(-)] dev-python/packaging[python_targets_python3_10(-)] net-libs/libsoup:3.0[introspection] media-libs/gsound[introspection] dev-python/pillow[python_targets_python3_10(-)] crypt? ( dev-python/pycryptodome[python_targets_python3_10(-)] >=dev-python/python-gnupg-0.4.0[python_targets_python3_10(-)] ) geolocation? ( app-misc/geoclue[introspection] ) jingle? ( net-libs/farstream:0.2[introspection] media-libs/gstreamer:1.0[introspection] media-libs/gst-plugins-base:1.0[introspection] media-libs/gst-plugins-ugly:1.0 media-plugins/gst-plugins-gtk ) omemo? ( dev-python/jaraco-classes[python_targets_python3_10(-)] dev-python/python-axolotl[python_targets_python3_10(-)] dev-python/qrcode[python_targets_python3_10(-)] dev-python/cryptography[python_targets_python3_10(-)] ) remote? ( >=dev-python/dbus-python-1.2.0[python_targets_python3_10(-)] sys-apps/dbus[X] ) rst? ( dev-python/docutils[python_targets_python3_10(-)] ) spell? ( app-text/gspell[introspection] app-text/hunspell ) upnp? ( net-libs/gupnp-igd:0[introspection] ) ) python_single_target_python3_11? ( dev-python/idna[python_targets_python3_11(-)] >=dev-python/nbxmpp-4.2.2[python_targets_python3_11(-)] <dev-python/nbxmpp-5.0.0[python_targets_python3_11(-)] dev-python/precis-i18n[python_targets_python3_11(-)] dev-python/pyasn1[python_targets_python3_11(-)] dev-python/pycairo[python_targets_python3_11(-)] dev-python/pycurl[python_targets_python3_11(-)] dev-python/pygobject:3[cairo,python_targets_python3_11(-)] x11-libs/libXScrnSaver app-crypt/libsecret[crypt,introspection] dev-python/keyring[python_targets_python3_11(-)] >=dev-python/secretstorage-3.1.1[python_targets_python3_11(-)] dev-python/css-parser[python_targets_python3_11(-)] dev-python/packaging[python_targets_python3_11(-)] net-libs/libsoup:3.0[introspection] media-libs/gsound[introspection] dev-python/pillow[python_targets_python3_11(-)] crypt? ( dev-python/pycryptodome[python_targets_python3_11(-)] >=dev-python/python-gnupg-0.4.0[python_targets_python3_11(-)] ) geolocation? ( app-misc/geoclue[introspection] ) jingle? ( net-libs/farstream:0.2[introspection] media-libs/gstreamer:1.0[introspection] media-libs/gst-plugins-base:1.0[introspection] media-libs/gst-plugins-ugly:1.0 media-plugins/gst-plugins-gtk ) omemo? ( dev-python/jaraco-classes[python_targets_python3_11(-)] dev-python/python-axolotl[python_targets_python3_11(-)] dev-python/qrcode[python_targets_python3_11(-)] dev-python/cryptography[python_targets_python3_11(-)] ) remote? ( >=dev-python/dbus-python-1.2.0[python_targets_python3_11(-)] sys-apps/dbus[X] ) rst? ( dev-python/docutils[python_targets_python3_11(-)] ) spell? ( app-text/gspell[introspection] app-text/hunspell ) upnp? ( net-libs/gupnp-igd:0[introspection] ) ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[sqlite,xml(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[sqlite,xml(+)] )
+REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://gajim.org/downloads/1.7/gajim-1.7.3.tar.gz
+_eclasses_=distutils-r1	499c8c8ae8bcabd2304237fb740c23b3	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=bca228a9565ef217ad6595da270909cb
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 9d7607e512f0..f033c75c5abf 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/oidc-agent-4.5.0-r1 b/metadata/md5-cache/net-misc/oidc-agent-4.5.0-r1
deleted file mode 100644
index 27bfb0d02a11..000000000000
--- a/metadata/md5-cache/net-misc/oidc-agent-4.5.0-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-libs/check )
-DEFINED_PHASES=compile install postinst postrm prepare
-DEPEND=app-crypt/libsecret dev-libs/cJSON:= dev-libs/libsodium:= media-gfx/qrencode net-libs/libmicrohttpd:= net-libs/webkit-gtk:4.1= net-misc/curl elibc_musl? ( sys-libs/argp-standalone )
-DESCRIPTION=Agent and tools for managing OpenID Connect tokens on the command line
-EAPI=8
-HOMEPAGE=https://github.com/indigo-dc/oidc-agent
-INHERIT=xdg-utils
-IUSE=test
-KEYWORDS=amd64 ~riscv
-LICENSE=MIT
-RDEPEND=app-crypt/libsecret dev-libs/cJSON:= dev-libs/libsodium:= media-gfx/qrencode net-libs/libmicrohttpd:= net-libs/webkit-gtk:4.1= net-misc/curl elibc_musl? ( sys-libs/argp-standalone )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/indigo-dc/oidc-agent/archive/v4.5.0.tar.gz -> oidc-agent-4.5.0.tar.gz
-_eclasses_=xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=6135df6d514b242e65917cf9a92e7ed2
diff --git a/metadata/md5-cache/net-misc/oidc-agent-4.5.1 b/metadata/md5-cache/net-misc/oidc-agent-4.5.1
index d1e4d0c30c8c..eb4d164d4280 100644
--- a/metadata/md5-cache/net-misc/oidc-agent-4.5.1
+++ b/metadata/md5-cache/net-misc/oidc-agent-4.5.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/indigo-dc/oidc-agent
 INHERIT=xdg-utils
 IUSE=test
-KEYWORDS=~amd64 ~riscv
+KEYWORDS=amd64 ~riscv
 LICENSE=MIT
 RDEPEND=app-crypt/libsecret dev-libs/cJSON:= dev-libs/libsodium:= media-gfx/qrencode net-libs/libmicrohttpd:= net-libs/webkit-gtk:4.1= net-misc/curl elibc_musl? ( sys-libs/argp-standalone )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/indigo-dc/oidc-agent/archive/v4.5.1.tar.gz -> oidc-agent-4.5.1.tar.gz
 _eclasses_=xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=b2269624b4453938fe12210c622d71c8
+_md5_=8e7ba5b6ac8b689bfa720eb945f91bed
diff --git a/metadata/md5-cache/net-p2p/Manifest.gz b/metadata/md5-cache/net-p2p/Manifest.gz
index 5085efde90ba..6f0524ca9077 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/deluge-2.1.1-r2 b/metadata/md5-cache/net-p2p/deluge-2.1.1-r2
deleted file mode 100644
index 88b9ad011f16..000000000000
--- a/metadata/md5-cache/net-p2p/deluge-2.1.1-r2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-util/intltool test? ( python_single_target_python3_10? ( >=dev-python/pytest-twisted-1.13.4-r1[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/pytest-twisted-1.13.4-r1[python_targets_python3_11(-)] ) ) test? ( acct-group/deluge acct-user/deluge net-libs/libtorrent-rasterbar:=[python,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] python_single_target_python3_10? ( gui? ( sound? ( dev-python/pygame[python_targets_python3_10(-)] ) dev-python/pygobject:3[python_targets_python3_10(-)] gnome-base/librsvg libnotify? ( x11-libs/libnotify ) ) dev-python/chardet[python_targets_python3_10(-)] dev-python/distro[python_targets_python3_10(-)] dev-python/pillow[python_targets_python3_10(-)] dev-python/pyopenssl[python_targets_python3_10(-)] dev-python/pyxdg[python_targets_python3_10(-)] dev-python/rencode[python_targets_python3_10(-)] dev-python/setproctitle[python_targets_python3_10(-)] || ( >=dev-python/twisted-17.1.0[ssl(-),python_targets_python3_10(-)] >=dev-python/twisted-17.1.0[crypt(-),python_targets_python3_10(-)] ) >=dev-python/zope-interface-4.4.2[python_targets_python3_10(-)] dev-python/mako[python_targets_python3_10(-)] ) python_single_target_python3_11? ( gui? ( sound? ( dev-python/pygame[python_targets_python3_11(-)] ) dev-python/pygobject:3[python_targets_python3_11(-)] gnome-base/librsvg libnotify? ( x11-libs/libnotify ) ) dev-python/chardet[python_targets_python3_11(-)] dev-python/distro[python_targets_python3_11(-)] dev-python/pillow[python_targets_python3_11(-)] dev-python/pyopenssl[python_targets_python3_11(-)] dev-python/pyxdg[python_targets_python3_11(-)] dev-python/rencode[python_targets_python3_11(-)] dev-python/setproctitle[python_targets_python3_11(-)] || ( >=dev-python/twisted-17.1.0[ssl(-),python_targets_python3_11(-)] >=dev-python/twisted-17.1.0[crypt(-),python_targets_python3_11(-)] ) >=dev-python/zope-interface-4.4.2[python_targets_python3_11(-)] dev-python/mako[python_targets_python3_11(-)] ) python_single_target_python3_10? ( >=dev-python/pytest-7.2.1[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/pytest-7.2.1[python_targets_python3_11(-)] ) ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) python_single_target_python3_10? ( >=dev-python/gpep517-13[python_targets_python3_10(-)] >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/gpep517-13[python_targets_python3_11(-)] >=dev-python/setuptools-67.2.0[python_targets_python3_11(-)] >=dev-python/wheel-0.38.4[python_targets_python3_11(-)] ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DESCRIPTION=BitTorrent client with a client/server model
-EAPI=8
-HOMEPAGE=https://deluge-torrent.org/
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=distutils-r1 systemd xdg
-IUSE=console gui libnotify sound webinterface test python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~riscv ~x86
-LICENSE=GPL-2
-RDEPEND=acct-group/deluge acct-user/deluge net-libs/libtorrent-rasterbar:=[python,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] python_single_target_python3_10? ( gui? ( sound? ( dev-python/pygame[python_targets_python3_10(-)] ) dev-python/pygobject:3[python_targets_python3_10(-)] gnome-base/librsvg libnotify? ( x11-libs/libnotify ) ) dev-python/chardet[python_targets_python3_10(-)] dev-python/distro[python_targets_python3_10(-)] dev-python/pillow[python_targets_python3_10(-)] dev-python/pyopenssl[python_targets_python3_10(-)] dev-python/pyxdg[python_targets_python3_10(-)] dev-python/rencode[python_targets_python3_10(-)] dev-python/setproctitle[python_targets_python3_10(-)] || ( >=dev-python/twisted-17.1.0[ssl(-),python_targets_python3_10(-)] >=dev-python/twisted-17.1.0[crypt(-),python_targets_python3_10(-)] ) >=dev-python/zope-interface-4.4.2[python_targets_python3_10(-)] dev-python/mako[python_targets_python3_10(-)] ) python_single_target_python3_11? ( gui? ( sound? ( dev-python/pygame[python_targets_python3_11(-)] ) dev-python/pygobject:3[python_targets_python3_11(-)] gnome-base/librsvg libnotify? ( x11-libs/libnotify ) ) dev-python/chardet[python_targets_python3_11(-)] dev-python/distro[python_targets_python3_11(-)] dev-python/pillow[python_targets_python3_11(-)] dev-python/pyopenssl[python_targets_python3_11(-)] dev-python/pyxdg[python_targets_python3_11(-)] dev-python/rencode[python_targets_python3_11(-)] dev-python/setproctitle[python_targets_python3_11(-)] || ( >=dev-python/twisted-17.1.0[ssl(-),python_targets_python3_11(-)] >=dev-python/twisted-17.1.0[crypt(-),python_targets_python3_11(-)] ) >=dev-python/zope-interface-4.4.2[python_targets_python3_11(-)] dev-python/mako[python_targets_python3_11(-)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 ) libnotify? ( gui ) sound? ( gui ) ^^ ( python_single_target_python3_10 python_single_target_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=http://download.deluge-torrent.org/source/2.1/deluge-2.1.1.tar.xz
-_eclasses_=distutils-r1	499c8c8ae8bcabd2304237fb740c23b3	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=761b5eba66a6e7dfe3361bc25ebfe140
diff --git a/metadata/md5-cache/net-p2p/deluge-2.1.1-r3 b/metadata/md5-cache/net-p2p/deluge-2.1.1-r4
index 52639438d08b..9069f0fa77fa 100644
--- a/metadata/md5-cache/net-p2p/deluge-2.1.1-r3
+++ b/metadata/md5-cache/net-p2p/deluge-2.1.1-r4
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.deluge-torrent.org/source/2.1/deluge-2.1.1.tar.xz
 _eclasses_=distutils-r1	499c8c8ae8bcabd2304237fb740c23b3	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=322e576bd2bf1c70d22cd03bb13c8b05
+_md5_=d94cfbbc436e102413078b375aaf407c
diff --git a/metadata/md5-cache/net-print/Manifest.gz b/metadata/md5-cache/net-print/Manifest.gz
index 4f65b78f4784..fbed8209b7f4 100644
--- a/metadata/md5-cache/net-print/Manifest.gz
+++ b/metadata/md5-cache/net-print/Manifest.gz
diff --git a/metadata/md5-cache/net-print/epson-inkjet-printer-escpr-1.7.26 b/metadata/md5-cache/net-print/epson-inkjet-printer-escpr-1.7.26
index e87b840c9ae4..cd0f1afe37b5 100644
--- a/metadata/md5-cache/net-print/epson-inkjet-printer-escpr-1.7.26
+++ b/metadata/md5-cache/net-print/epson-inkjet-printer-escpr-1.7.26
@@ -3,9 +3,9 @@ DEPEND=net-print/cups
 DESCRIPTION=Epson Inkjet Printer Driver (ESC/P-R)
 EAPI=8
 HOMEPAGE=https://download.ebz.epson.net/dsc/search/01/search/?OSC=LX
-KEYWORDS=~amd64 ~ppc64
+KEYWORDS=amd64 ~ppc64
 LICENSE=GPL-2
 RDEPEND=net-print/cups
 SLOT=0
 SRC_URI=https://download3.ebz.epson.net/dsc/f/03/00/14/48/15/c864d000b06bebeec8832ce6f68bb079c36d838a/epson-inkjet-printer-escpr-1.7.26-1lsb3.2.tar.gz
-_md5_=463fb9759d2d77a709228cce6278f2e6
+_md5_=382ee1655b3b84047c87e627e585d51d
diff --git a/metadata/md5-cache/sci-mathematics/Manifest.gz b/metadata/md5-cache/sci-mathematics/Manifest.gz
index df6ba3e0dd4f..9daab93139c7 100644
--- a/metadata/md5-cache/sci-mathematics/Manifest.gz
+++ b/metadata/md5-cache/sci-mathematics/Manifest.gz
diff --git a/metadata/md5-cache/sci-mathematics/wxmaxima-23.05.0 b/metadata/md5-cache/sci-mathematics/wxmaxima-23.05.0
new file mode 100644
index 000000000000..957d7fd65ecc
--- /dev/null
+++ b/metadata/md5-cache/sci-mathematics/wxmaxima-23.05.0
@@ -0,0 +1,17 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-libs/libxml2:2 x11-libs/wxGTK:3.2-gtk3[webkit]
+DESCRIPTION=Graphical frontend to Maxima, using the wxWidgets toolkit
+EAPI=8
+HOMEPAGE=https://wxmaxima-developers.github.io/wxmaxima/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=cmake plocale wxwidgets xdg
+IUSE=test
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/libxml2:2 x11-libs/wxGTK:3.2-gtk3[webkit] media-fonts/jsmath sci-visualization/gnuplot[wxwidgets] sci-mathematics/maxima
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/wxMaxima-developers/wxmaxima/archive/Version-23.05.0.tar.gz -> wxmaxima-23.05.0.tar.gz
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	plocale	950fbaec7deeba41b5bcc0572cca99b9	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wxwidgets	9a707a3f9f1ea7aa703b1e46552291e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=8e8a6fa6023cee980ce2b4c3f0b27c53
diff --git a/metadata/md5-cache/sci-misc/Manifest.gz b/metadata/md5-cache/sci-misc/Manifest.gz
index 18b77cee22c1..6a4866c43ce1 100644
--- a/metadata/md5-cache/sci-misc/Manifest.gz
+++ b/metadata/md5-cache/sci-misc/Manifest.gz
diff --git a/metadata/md5-cache/sci-misc/jupyterlab-desktop-bin-4.0.0.1 b/metadata/md5-cache/sci-misc/jupyterlab-desktop-bin-4.0.0.1
new file mode 100644
index 000000000000..cf1db862af66
--- /dev/null
+++ b/metadata/md5-cache/sci-misc/jupyterlab-desktop-bin-4.0.0.1
@@ -0,0 +1,16 @@
+BDEPEND=app-arch/rpm2targz
+DEFINED_PHASES=configure install postinst postrm preinst prepare pretend setup unpack
+DESCRIPTION=JupyterLab desktop application, based on Electron
+EAPI=8
+HOMEPAGE=https://jupyter.org/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=chromium-2 desktop rpm xdg
+IUSE=+l10n_af +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_en-US +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_ur +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=-* ~amd64
+LICENSE=MIT BSD BSD-2 BSD-4 AFL-2.1 Apache-2.0 Ms-PL GPL-2 LGPL-2.1 APSL-2 unRAR OFL CC-BY-SA-3.0 MPL-2.0 android public-domain all-rights-reserved
+RDEPEND=>=app-accessibility/at-spi2-core-2.46.0:2 dev-libs/expat dev-libs/glib dev-libs/nspr dev-libs/nss >=dev-python/jupyterlab-4.0.0 media-libs/alsa-lib media-libs/mesa net-print/cups sys-apps/dbus sys-libs/glibc x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libdrm x11-libs/libX11 x11-libs/libxcb x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libxkbcommon x11-libs/libXrandr x11-libs/libxshmfence x11-libs/pango
+RESTRICT=bindist mirror
+SLOT=0
+SRC_URI=https://github.com/jupyterlab/jupyterlab-desktop/releases/download/v4.0.0-1/JupyterLab-Setup-Fedora.rpm -> jupyterlab-desktop-bin-4.0.0.1.rpm
+_eclasses_=chromium-2	93690d770dc2e27deaa89794e2f9fe3f	desktop	021728fdc1b03b36357dbc89489e0f0d	estack	055c42df72f76a4f45ec92b35e83cd56	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	104e1332efb829e2f7cbf89307a474f1	rpm	f73e907469f65e52192f110dec72dce0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=6ffa9fcaaab1cf4aaa76a5672b5a8211
diff --git a/metadata/md5-cache/sci-visualization/Manifest.gz b/metadata/md5-cache/sci-visualization/Manifest.gz
index a6591d376e41..f4006b87b2ff 100644
--- a/metadata/md5-cache/sci-visualization/Manifest.gz
+++ b/metadata/md5-cache/sci-visualization/Manifest.gz
diff --git a/metadata/md5-cache/sci-visualization/gnuplot-5.4.6 b/metadata/md5-cache/sci-visualization/gnuplot-5.4.6
index 3d50f3742283..a919dc7cc0f4 100644
--- a/metadata/md5-cache/sci-visualization/gnuplot-5.4.6
+++ b/metadata/md5-cache/sci-visualization/gnuplot-5.4.6
@@ -7,11 +7,11 @@ HOMEPAGE=http://www.gnuplot.info/
 IDEPEND=latex? ( virtual/latex-base )
 INHERIT=autotools lua-single readme.gentoo-r1 toolchain-funcs wxwidgets
 IUSE=aqua bitmap cairo doc examples +gd ggi latex libcaca libcerf lua qt5 readline regis wxwidgets X lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=gnuplot
 RDEPEND=cairo? ( x11-libs/cairo x11-libs/pango ) gd? ( >=media-libs/gd-2.0.35-r3:2=[png] ) ggi? ( media-libs/libggi ) latex? ( virtual/latex-base lua? ( dev-tex/pgf >=dev-texlive/texlive-latexrecommended-2008-r2 ) ) libcaca? ( media-libs/libcaca ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) qt5? ( dev-qt/qtcore:5= dev-qt/qtgui:5= dev-qt/qtnetwork:5= dev-qt/qtprintsupport:5= dev-qt/qtsvg:5= dev-qt/qtwidgets:5= ) readline? ( sys-libs/readline:0= ) libcerf? ( sci-libs/libcerf ) wxwidgets? ( x11-libs/wxGTK:3.0-gtk3[X] x11-libs/cairo x11-libs/pango x11-libs/gtk+:3 ) X? ( x11-libs/libXaw )
 REQUIRED_USE=doc? ( gd ) lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/gnuplot/gnuplot-5.4.6.tar.gz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	lua-single	86d497a20c93c7ce83af442f627515c1	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	multilib	104e1332efb829e2f7cbf89307a474f1	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wxwidgets	9a707a3f9f1ea7aa703b1e46552291e5
-_md5_=4ba8404b386f263f59d53c6298f68c1d
+_md5_=fc3b885b33eb0e7ae52628bc6fd870c7
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 3a6ee0de6556..08c6b8de25b8 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/fwupd-1.8.11-r1 b/metadata/md5-cache/sys-apps/fwupd-1.8.15
index c05e37c680f1..1a9840a0bd8e 100644
--- a/metadata/md5-cache/sys-apps/fwupd-1.8.11-r1
+++ b/metadata/md5-cache/sys-apps/fwupd-1.8.15
@@ -13,6 +13,6 @@ RDEPEND=python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) py
 REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 ) ^^ ( elogind minimal systemd ) dell? ( uefi ) fastboot? ( gusb ) logitech? ( gusb ) minimal? ( !introspection ) modemmanager? ( gusb ) spi? ( lzma ) synaptics? ( gnutls ) test? ( archive gusb ) uefi? ( gnutls )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/fwupd/fwupd/releases/download/1.8.11/fwupd-1.8.11.tar.xz
+SRC_URI=https://github.com/fwupd/fwupd/releases/download/1.8.15/fwupd-1.8.15.tar.xz
 _eclasses_=meson	915ec7c25e08d7886558215e6809ca1e	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	udev	eec0bbab06977f1cfc5597269c1fa152	vala	1343f639cc74d2aa8b36fc08677da58d	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=8eabcbdeffb07a4978b1e092df4904e2
+_md5_=e1279532ef75efb3ea9906521f6ce676
diff --git a/metadata/md5-cache/sys-apps/memtest86+-5.31b-r3 b/metadata/md5-cache/sys-apps/memtest86+-5.31b-r3
deleted file mode 100644
index 41a112ba1f3a..000000000000
--- a/metadata/md5-cache/sys-apps/memtest86+-5.31b-r3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=iso? ( app-cdr/cdrtools )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend test
-DEPEND=floppy? ( sys-fs/mtools )
-DESCRIPTION=Memory tester based on memtest86
-EAPI=7
-HOMEPAGE=http://www.memtest.org/
-INHERIT=mount-boot toolchain-funcs
-IUSE=+boot floppy iso serial
-KEYWORDS=-* amd64 x86
-LICENSE=GPL-2
-RDEPEND=floppy? ( sys-fs/mtools )
-SLOT=0
-SRC_URI=http://www.memtest.org/download/5.31b/memtest86+-5.31b.tar.gz
-_eclasses_=mount-boot	3945d351ee3192381911f938f4ee527a	multilib	104e1332efb829e2f7cbf89307a474f1	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=d7923abf285103a6c25d5a64773420e4
diff --git a/metadata/md5-cache/sys-apps/memtest86+-6.20-r1 b/metadata/md5-cache/sys-apps/memtest86+-6.20-r1
new file mode 100644
index 000000000000..a18dc50daa53
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/memtest86+-6.20-r1
@@ -0,0 +1,13 @@
+BDEPEND=iso32? ( dev-libs/libisoburn sys-fs/dosfstools sys-fs/mtools ) iso64? ( dev-libs/libisoburn sys-fs/dosfstools sys-fs/mtools )
+DEFINED_PHASES=compile install postinst postrm preinst prepare prerm pretend
+DESCRIPTION=Memory tester based on PCMemTest
+EAPI=8
+HOMEPAGE=https://www.memtest.org/
+INHERIT=mount-boot toolchain-funcs
+IUSE=bios32 bios64 +boot efi32 efi64 iso32 iso64
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=https://github.com/memtest86plus/memtest86plus/archive/refs/tags/v6.20.tar.gz -> memtest86+-6.20.tar.gz
+_eclasses_=mount-boot	3945d351ee3192381911f938f4ee527a	multilib	104e1332efb829e2f7cbf89307a474f1	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=51e8b0a06d63441d3f1e0f3a6626e624
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index cb2360b7aedf..dc4565ef00a7 100644
--- a/metadata/md5-cache/sys-kernel/Manifest.gz
+++ b/metadata/md5-cache/sys-kernel/Manifest.gz
diff --git a/metadata/md5-cache/sys-kernel/linux-docs-5.15.105-r1 b/metadata/md5-cache/sys-kernel/linux-docs-6.1.29
index 41ee994d5015..2715c49e8404 100644
--- a/metadata/md5-cache/sys-kernel/linux-docs-5.15.105-r1
+++ b/metadata/md5-cache/sys-kernel/linux-docs-6.1.29
@@ -9,6 +9,6 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc ~x
 LICENSE=GPL-2
 RDEPEND=graphviz? ( >=media-gfx/graphviz-5.0.0 )
 SLOT=0
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.15.105.tar.xz
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.1.29.tar.xz
 _eclasses_=linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=99b8110a67f326aa9802733395a6ae0c
+_md5_=83a59f599bb80ad82c9674f95c5185f5
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index bff65325c4f4..dbd58f8aed2f 100644
--- a/metadata/md5-cache/sys-libs/Manifest.gz
+++ b/metadata/md5-cache/sys-libs/Manifest.gz
diff --git a/metadata/md5-cache/sys-libs/libblockdev-2.28-r1 b/metadata/md5-cache/sys-libs/libblockdev-2.28-r1
index 32aa6efd688b..cbd91bdfd6dd 100644
--- a/metadata/md5-cache/sys-libs/libblockdev-2.28-r1
+++ b/metadata/md5-cache/sys-libs/libblockdev-2.28-r1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/storaged-project/libblockdev
 INHERIT=autotools python-single-r1 xdg-utils
 IUSE=bcache +cryptsetup device-mapper dmraid escrow gtk-doc introspection lvm kbd test +tools vdo python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv sparc ~x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.42.2 dev-libs/libbytesize >=sys-apps/kmod-19 >=sys-apps/util-linux-2.27 >=sys-block/parted-3.1 cryptsetup? ( escrow? ( >=dev-libs/nss-3.18.0 dev-libs/volume_key ) >=sys-fs/cryptsetup-1.6.7:= ) device-mapper? ( sys-fs/lvm2 ) dmraid? ( sys-fs/dmraid sys-fs/lvm2 ) lvm? ( sys-fs/lvm2 virtual/udev ) vdo? ( dev-libs/libyaml ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 ) escrow? ( cryptsetup )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) test
 SLOT=0
 SRC_URI=https://github.com/storaged-project/libblockdev/releases/download/2.28-1/libblockdev-2.28.tar.gz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=36aa397ea52cb80421d488db99b893bb
+_md5_=6896073b97720c36d2857bcb1d912d42
diff --git a/metadata/md5-cache/www-apache/Manifest.gz b/metadata/md5-cache/www-apache/Manifest.gz
index ec60dd9b7a24..9db934aa4f35 100644
--- a/metadata/md5-cache/www-apache/Manifest.gz
+++ b/metadata/md5-cache/www-apache/Manifest.gz
diff --git a/metadata/md5-cache/www-apache/mod_qos-11.70 b/metadata/md5-cache/www-apache/mod_qos-11.70
deleted file mode 100644
index a8105ebf475a..000000000000
--- a/metadata/md5-cache/www-apache/mod_qos-11.70
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=dev-libs/libpcre:3 dev-libs/openssl:0= media-libs/libpng:0= sys-libs/zlib:0= =www-servers/apache-2*
-DESCRIPTION=A QOS module for the apache webserver
-EAPI=7
-HOMEPAGE=http://mod-qos.sourceforge.net/
-INHERIT=autotools apache-module
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/libpcre:3 dev-libs/openssl:0= media-libs/libpng:0= sys-libs/zlib:0= =www-servers/apache-2*
-SLOT=0
-SRC_URI=mirror://sourceforge/mod-qos/mod_qos-11.70.tar.gz
-_eclasses_=apache-module	c39c4721f3b26f641833bddb8ee0718e	autotools	f0d3196128225dee3220e65f3371bc7a	depend.apache	416d1c5005c5f4594e79812fb7323f0d	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	104e1332efb829e2f7cbf89307a474f1	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=776cbb587cc79c78c954da07d434f85f
diff --git a/metadata/md5-cache/www-apache/mod_qos-11.71 b/metadata/md5-cache/www-apache/mod_qos-11.71
deleted file mode 100644
index 619ea65521ed..000000000000
--- a/metadata/md5-cache/www-apache/mod_qos-11.71
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=dev-libs/libpcre:3 dev-libs/openssl:0= media-libs/libpng:0= sys-libs/zlib:0= =www-servers/apache-2*
-DESCRIPTION=A QOS module for the apache webserver
-EAPI=7
-HOMEPAGE=http://mod-qos.sourceforge.net/
-INHERIT=autotools apache-module
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/libpcre:3 dev-libs/openssl:0= media-libs/libpng:0= sys-libs/zlib:0= =www-servers/apache-2*
-SLOT=0
-SRC_URI=mirror://sourceforge/mod-qos/mod_qos-11.71.tar.gz
-_eclasses_=apache-module	c39c4721f3b26f641833bddb8ee0718e	autotools	f0d3196128225dee3220e65f3371bc7a	depend.apache	416d1c5005c5f4594e79812fb7323f0d	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	104e1332efb829e2f7cbf89307a474f1	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=8ea60baa78625a1a5864318f4561a935
diff --git a/metadata/md5-cache/www-apache/mod_qos-11.73 b/metadata/md5-cache/www-apache/mod_qos-11.74
index ca1cf894a643..de126a2de959 100644
--- a/metadata/md5-cache/www-apache/mod_qos-11.73
+++ b/metadata/md5-cache/www-apache/mod_qos-11.74
@@ -9,6 +9,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/libpcre2 dev-libs/openssl:0= media-libs/libpng:0= sys-libs/zlib:0= =www-servers/apache-2*
 SLOT=0
-SRC_URI=mirror://sourceforge/mod-qos/mod_qos-11.73.tar.gz
+SRC_URI=mirror://sourceforge/mod-qos/mod_qos-11.74.tar.gz
 _eclasses_=apache-module	c39c4721f3b26f641833bddb8ee0718e	autotools	f0d3196128225dee3220e65f3371bc7a	depend.apache	416d1c5005c5f4594e79812fb7323f0d	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	104e1332efb829e2f7cbf89307a474f1	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
 _md5_=9c40b0a719a40026c7d1c4e08b42a0fe
diff --git a/metadata/md5-cache/x11-terms/Manifest.gz b/metadata/md5-cache/x11-terms/Manifest.gz
index 5ab5af2a6877..5bff71de4197 100644
--- a/metadata/md5-cache/x11-terms/Manifest.gz
+++ b/metadata/md5-cache/x11-terms/Manifest.gz
diff --git a/metadata/md5-cache/x11-terms/rxvt-unicode-9.31-r1 b/metadata/md5-cache/x11-terms/rxvt-unicode-9.31-r1
index 71ad548b5383..04c9ea0ba14c 100644
--- a/metadata/md5-cache/x11-terms/rxvt-unicode-9.31-r1
+++ b/metadata/md5-cache/x11-terms/rxvt-unicode-9.31-r1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=http://software.schmorp.de/pkg/rxvt-unicode.html
 INHERIT=autotools desktop systemd prefix
 IUSE=24-bit-color 256-color blink fading-colors +font-styles gdk-pixbuf iso14755 +mousewheel perl startup-notification unicode3 wide-glyphs xft
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv sparc ~x86
 LICENSE=GPL-3
 RDEPEND=>=sys-libs/ncurses-5.7-r6:= dev-libs/libptytty media-libs/fontconfig x11-libs/libX11 x11-libs/libXrender x11-libs/libXt gdk-pixbuf? ( x11-libs/gdk-pixbuf ) perl? ( dev-lang/perl:= ) startup-notification? ( x11-libs/startup-notification ) xft? ( x11-libs/libXft )
 SLOT=0
 SRC_URI=http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-9.31.tar.bz2 https://dev.gentoo.org/~marecki/dists/x11-terms/rxvt-unicode/rxvt-unicode-9.31_24-bit-color_aur-9.31-20239117.patch.xz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	desktop	021728fdc1b03b36357dbc89489e0f0d	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	104e1332efb829e2f7cbf89307a474f1	prefix	eab3c99d77fe00506c109c8a736186f7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=cbbbcb5ddbb562613b9c16d3f0e5ea59
+_md5_=9ed564183c7ebd2f2d32bdfca6de21b1
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 10d110b2b636..6668dbeb8ac1 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 15668 BLAKE2B 449292f439e2a4f4fd7b4726028a046b309262c1c104b330b62b26428794c6a1ff66902103e9c2359f352f474b113cc9c85ddbbb187a374b6211d02e6ca79ff3 SHA512 e7b892ad549ad1d2a69c8cd56f9a18807e1e7a0c3b686e86ad5dca719913cab1270dea7dd5e376d522493285e5a8117f923772e2df0f2019b0c49a02107d6b03
-TIMESTAMP 2023-05-19T08:39:37Z
+TIMESTAMP 2023-05-19T14:39:35Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRnNclfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRniidfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAV/RAArclZKu/azZpjgeRfG7qI9ZOqd1dKQnhydp5CyMQGi/VbuVsskcq/DeET
-yc1i9g4AM/1iH7KeJDjiIVB+3LRkPdQstd+iKC5I6qSzod2HSaIYBNceAOvvtVbu
-qpkIF4gz4b7BgG3J3PuHykunp0eL/WrMpP2cRGYO+G+bqol42VJ63q6T8BGZVRPJ
-wb3KHSTha+mMF3Lo9YZ4Vs5i2h3bISy3di93hl/WXzyqqaeOBLndnOYq8iH24d2W
-ipYj1+eoz2/tb5Vdo7dauSxE/Tq7fgId8gHuYTtcNRdhB2Aw13/uA1Z8mZHq/ZSw
-b8MELizkCXXs50U26hZ1tQjUF1I9g5Ni21FouvXXbvP8JPnKV7G2WoH7tYhHB44h
-GJ3yK8kwflkmghwGXp0DMtnP5f6h5GhLeypctJZFx1FFpjbszA1OAZ7EkgUHRwHO
-0QnRMbDtwTIzb8CUnBY+Zr2b1yhBAzbhkPEWHYvD0HRsWP3itNuGtE+Pkx+IIhKM
-/5iTchh+N8o3Znom9yp3OuxgW0MMAMidGdWlfTeCNa01x5fxjtyQIP8R9CGE7yzZ
-3IaFQ/21tKPlN72Mj+JJ0CWxazxer9TbU+dGCnkU4AERdDpAjgtSZ2zsdbPKH2U+
-Bl3cE1E+eV0ZXY1/IV7ZNeRqQHOFXKjYHTu9lx3gN5f7pC0pGMA=
-=7ilH
+klCppQ//ZkaLpx6Rz2LwamOwsMsdu4ozz7ZtDGsBd6lnEgyE10W25rWsL28ads6o
+3QAEIxA/wv6D8OS+3ftCZxnueQV8HplJ2sv2PCzVtFJEwW6mY4tum2NwIQMHwL+c
+4UCH0Bo6EXBsVgkeMwT6zKZpUE4VtuZU2zN1ue+qBvlo4dG1CjFP6haSAoxYVyJp
+1FC53PbnIVY60Bpd8UmgZ7RmxAEGzMY25qNgqLZ3z1CDtB4rhi3hLKDbvHljErXp
+BViuPpRunM/EyhMWznLPgLKSzv0FcXTY+RLdpzV4p6Vwou88kEPvT9RsEEbFXRBE
+j2HY2OIELFAEgFH1IZLUbiMrfnsmBTv7/PrE2EH2EF9gQr/eO+NMcrjAc/7SqBIP
+mGlLwrbE0e74Qbj6bqCGCHPFX6o52ffw33MA2sBnhrAhdtO6tzdxOR95hcq0lAJy
+L6p9jsOEQeSm6qa/jEHOENFsuyt9BwTLnuR9ukyMA3CUGpjUYAIwmMAiAco5juI0
+m4rZq4Obv/5wYKRybhMac/+vJ3uiDX0tbGBvVYz7ZEeDXv1axKEjNTT7ufyXl8xq
+RNoHLVapUmtPwLvbz/BAutEVYbjVe0V+9bNA8ejZAFmQ1/mHMEbLOL+AIzAX+cnz
+HgnlhncEsgidOeQdYVt2KcYDQWGp9tQTehx4ita8G3Xo5GrHEkA=
+=S2LT
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 43a846fb68b7..19721c8868b8 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Fri, 19 May 2023 08:39:34 +0000
+Fri, 19 May 2023 14:39:32 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index f88636f5405e..556a0474c992 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Fri May 19 08:39:34 AM UTC 2023
+Fri May 19 02:39:32 PM UTC 2023
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index be7d7a34f42d..4af60b898091 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Fri, 19 May 2023 08:45:01 +0000
+Fri, 19 May 2023 14:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index da2b565347da..6032268a82ee 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-65a081df5445352354b4f5db00b1e6f165506120 1684485353 2023-05-19T08:35:53+00:00
+e5442cb4319f33330b6381a36a7ead8bd6fc337b 1684505882 2023-05-19T14:18:02+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 9fce839bfcef..cf563e9b50a7 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1684485601 Fri 19 May 2023 08:40:01 AM UTC
+1684507201 Fri 19 May 2023 02:40:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 43a846fb68b7..19721c8868b8 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Fri, 19 May 2023 08:39:34 +0000
+Fri, 19 May 2023 14:39:32 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index deedd9512ed4..2c0a90fa0d1c 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/netdata/Manifest b/net-analyzer/netdata/Manifest
index 1496a35bd2a8..d8099abe412e 100644
--- a/net-analyzer/netdata/Manifest
+++ b/net-analyzer/netdata/Manifest
@@ -1,4 +1,4 @@
-DIST netdata-1.39.0.tar.gz 25258814 BLAKE2B 6fb61bac3ff1c178b6a4c83e9bb4ad9d20c76129061cb31ae9f0c491b9e61ac39902c14d0006ed17b264874bdc6b78b948e96ab33e6c45075a9259a830f8ff49 SHA512 edb668d86b707c584094ad3f6e50fa646d847883fb326e38431d5036f9dfa4857514476f7e50a863ef8533035289c9725ca5ae5da08fbee32bda1a2e3ac48a36
-EBUILD netdata-1.39.0.ebuild 4044 BLAKE2B 1ba2892d86b571dbabc3f01df67a66dc8ba5e5b17b74726ec34a0cdbc6fe9037a9ac5ebbc20dc1ea054fde24105f9b8d3a957e925b87a30268ce636f48a496f1 SHA512 dfb31325e09e3d70189b73048e52a76da0922a198c5595c8836edcc1e2adc0f333569fe13416731ed30eafde2f5981881c013351a06ee49a20865ef96e3f98f2
+DIST netdata-1.39.1.tar.gz 25255522 BLAKE2B 9be459caed4ae68058634f1f0c2978610b883342807729921052cc6fd97050068fa50d8d6fb8d5c8445f87420b9fc895ff4e411099750980183cfb5848aacbbc SHA512 13077a70dcce9ca72ec9ef42250df545b41247518b41f3d2fc2afe940f2861ffa5293bea68659a924627eb1669e3f2457a0e2de5756b57a5298b51998caa1051
+EBUILD netdata-1.39.1.ebuild 4044 BLAKE2B 1ba2892d86b571dbabc3f01df67a66dc8ba5e5b17b74726ec34a0cdbc6fe9037a9ac5ebbc20dc1ea054fde24105f9b8d3a957e925b87a30268ce636f48a496f1 SHA512 dfb31325e09e3d70189b73048e52a76da0922a198c5595c8836edcc1e2adc0f333569fe13416731ed30eafde2f5981881c013351a06ee49a20865ef96e3f98f2
 EBUILD netdata-9999.ebuild 4044 BLAKE2B 1ba2892d86b571dbabc3f01df67a66dc8ba5e5b17b74726ec34a0cdbc6fe9037a9ac5ebbc20dc1ea054fde24105f9b8d3a957e925b87a30268ce636f48a496f1 SHA512 dfb31325e09e3d70189b73048e52a76da0922a198c5595c8836edcc1e2adc0f333569fe13416731ed30eafde2f5981881c013351a06ee49a20865ef96e3f98f2
 MISC metadata.xml 1210 BLAKE2B ac344469cba5d26dea18c43f9387c4e8de92d39dae04d70e80de49584bcfad11f01287ed6634fafb85d73acc08942a4bd250105fe0abe11ddb45da826f4f21db SHA512 ecb8c9976479a31a90789b2f6d336b533d7fe16b0995634fa3eb015e3bfbc57eeeafa91dc13c943a1cde41fd73679c55f16bd3ce749bf0f82d23899531544f3e
diff --git a/net-analyzer/netdata/netdata-1.39.0.ebuild b/net-analyzer/netdata/netdata-1.39.1.ebuild
index 4c98a34510ae..4c98a34510ae 100644
--- a/net-analyzer/netdata/netdata-1.39.0.ebuild
+++ b/net-analyzer/netdata/netdata-1.39.1.ebuild
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 2d7a3812ffe6..84c468d1b104 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/gajim/Manifest b/net-im/gajim/Manifest
index 49f880c2f6a8..8056f325a432 100644
--- a/net-im/gajim/Manifest
+++ b/net-im/gajim/Manifest
@@ -1,5 +1,6 @@
 DIST gajim-1.4.7.tar.gz 7184866 BLAKE2B 9be0ae485a372683623eff1f9ed1d209800c3088bf01c134bb5c6f1770e8ded1ebe6c2b301ad648c6cfb1793e2be43aade1410a701f7d0490f2ab1b0a4c3fdd5 SHA512 5988f6b7aa46166208b1693b9e1a5fe982cea2987f3f4170bcb14e4bb9be1154b1c6ceed020a949131a498db43d2dffee30bd3167cd56889c1cbb5641ed960f4
 DIST gajim-1.7.3.tar.gz 3753831 BLAKE2B c7b8b1dc47b1faf9f1c0803e7931cb00bfbf31075fe481d557ec0f308c79e7580d0054d224781a67eaeea24dba40e40de5faf55d633d71f759022a1ac113f6e4 SHA512 66135e88784350bab79b61debc1b65144a82f8eee2c1841d21e4f511b3792361e57b60304d2478654e563687e8302426d76063e748236f4e1c959511c7c28665
 EBUILD gajim-1.4.7-r2.ebuild 2686 BLAKE2B 6bfa971349e0e4c3331a975a378382cb5bd362c03b14265c8371a69875580cef0f7cfbcb417f4c0358a378974706fec188fb052a1cb540db5f63b6ce308bdad0 SHA512 b24310ca16ee32e186f42a5619390ff331f152ef8f2ed804bd9af95286d2d2c66832a4438ddbc87b20ba12ee4ff4a7cc4e488689e48def931e3580864cd4da94
+EBUILD gajim-1.7.3-r1.ebuild 2821 BLAKE2B ade28a8c7c12ad997bf1e19156596dc4ef59051f2ce5f5655825c0a4fd10b7a9a79c287d90dc91f2ec80e4cbf16a2ff4c4cf370e1e0e94d1ec3fd61d3ca648cb SHA512 fd98199c0a1290d8d909d74488f83c0f4bdff44299c7625c2f93aed2de82c3b08e29bf247a5535de8dae6c2ac574905ea601420e6ac149ad3979b4661004cdb6
 EBUILD gajim-1.7.3.ebuild 2609 BLAKE2B 3ca58a71c4b3e51fb605d031e55a6caa104d5e53e8d1e0e382a3b1bacc38859d0bb2598ce119b005f36b6ef0c67388ee2b7e4e03bfabfe257cd5c65c74e97d8a SHA512 49e1fcdd326c29f480d672bec91b941c3aa7a3d014a226ec8f87de7bf675a8909e5ab2af8afa788193f4c6bf378bc442951c6720e817887e810bd43d91d3d2c7
 MISC metadata.xml 867 BLAKE2B b7dcc46c99a2c04f9382cd7eeb34b416a422baae8e8123369bb9809c89204413cc9a93c51979fd50f542aed29caff5e6bb18e3ea3a077814f89826972d778837 SHA512 e56580db1a6734f1e219eeb61176ba60e5c85895e0cf7699643f82c928d7f083d519cf3d490b0750b0cbe875cf1428e67e35961ad006c38f62829f04090af134
diff --git a/net-im/gajim/gajim-1.7.3-r1.ebuild b/net-im/gajim/gajim-1.7.3-r1.ebuild
new file mode 100644
index 000000000000..9d3183fcf836
--- /dev/null
+++ b/net-im/gajim/gajim-1.7.3-r1.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_REQ_USE="sqlite,xml(+)"
+DISTUTILS_USE_PEP517=standalone
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1 xdg-utils
+
+DESCRIPTION="Jabber client written in PyGTK"
+HOMEPAGE="https://gajim.org/"
+SRC_URI="https://gajim.org/downloads/$(ver_cut 1-2)/${P/_p/-}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+IUSE="+crypt geolocation jingle omemo remote rst +spell upnp +webp"
+
+COMMON_DEPEND="
+	dev-libs/gobject-introspection[cairo(+)]
+	>=x11-libs/gtk+-3.22:3[introspection]
+	x11-libs/gtksourceview:4[introspection]"
+DEPEND="${COMMON_DEPEND}
+	app-arch/unzip
+	virtual/pkgconfig
+	>=sys-devel/gettext-0.17-r1"
+RDEPEND="${COMMON_DEPEND}
+	$(python_gen_cond_dep '
+		dev-python/idna[${PYTHON_USEDEP}]
+		>=dev-python/nbxmpp-4.2.2[${PYTHON_USEDEP}]
+		<dev-python/nbxmpp-5.0.0[${PYTHON_USEDEP}]
+		dev-python/precis-i18n[${PYTHON_USEDEP}]
+		dev-python/pyasn1[${PYTHON_USEDEP}]
+		dev-python/pycairo[${PYTHON_USEDEP}]
+		dev-python/pycurl[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
+		x11-libs/libXScrnSaver
+		app-crypt/libsecret[crypt,introspection]
+		dev-python/keyring[${PYTHON_USEDEP}]
+		>=dev-python/secretstorage-3.1.1[${PYTHON_USEDEP}]
+		dev-python/css-parser[${PYTHON_USEDEP}]
+		dev-python/packaging[${PYTHON_USEDEP}]
+		net-libs/libsoup:3.0[introspection]
+		media-libs/gsound[introspection]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		crypt? (
+			dev-python/pycryptodome[${PYTHON_USEDEP}]
+			>=dev-python/python-gnupg-0.4.0[${PYTHON_USEDEP}] )
+		geolocation? ( app-misc/geoclue[introspection] )
+		jingle? (
+			net-libs/farstream:0.2[introspection]
+			media-libs/gstreamer:1.0[introspection]
+			media-libs/gst-plugins-base:1.0[introspection]
+			media-libs/gst-plugins-ugly:1.0
+			media-plugins/gst-plugins-gtk
+		)
+		omemo? (
+			dev-python/jaraco-classes[${PYTHON_USEDEP}]
+			dev-python/python-axolotl[${PYTHON_USEDEP}]
+			dev-python/qrcode[${PYTHON_USEDEP}]
+			dev-python/cryptography[${PYTHON_USEDEP}]
+		)
+		remote? (
+			>=dev-python/dbus-python-1.2.0[${PYTHON_USEDEP}]
+			sys-apps/dbus[X]
+		)
+		rst? ( dev-python/docutils[${PYTHON_USEDEP}] )
+		spell? (
+			app-text/gspell[introspection]
+			app-text/hunspell
+		)
+		upnp? ( net-libs/gupnp-igd:0[introspection] )
+	')"
+
+python_compile() {
+	distutils-r1_python_compile
+	./pep517build/build_metadata.py -o dist/metadata
+}
+
+python_install() {
+	distutils-r1_python_install
+	./pep517build/install_metadata.py dist/metadata --prefix="${D}/usr"
+
+	rm "${D}"/usr/share/man/man1/*.gz
+	doman data/*.1
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+# Tests are unfortunately regularly broken
+RESTRICT="test"
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 5c836673ca84..d6f7a887542f 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/oidc-agent/Manifest b/net-misc/oidc-agent/Manifest
index 0027f1b30619..e1fd54fa6557 100644
--- a/net-misc/oidc-agent/Manifest
+++ b/net-misc/oidc-agent/Manifest
@@ -1,8 +1,5 @@
-AUX oidc-agent-4.4.0_deps-automagic.patch 471 BLAKE2B 83f909d57475a0895bb2305ec7ae1dbe4c54883331eb5e492084bb0816d074658f81ac9683cd375efb0ec51e419590374823e093c3eb5935061f8a2a36bf2184 SHA512 8a559f08bc0aacc4f8152429ca1dc186d88416061d4275780cd373cd92bd72a1ff1f6d667f497dd357eec5fce0caf32d0310644415a92368447c07dc59c6e5fa
 AUX oidc-agent-4.4.0_install-perms.patch 1848 BLAKE2B 787e803e7e62ec6f6f00563a82e571707d4b2febc3fa3967870497b6515ff90247be00408451f0fe0d6805ca07d13cf797330865b22cf05e4b339303d7af6234 SHA512 b5be70a9bdee0bd0e4f9fa3c04a1e3763a34a6785b66b1ab9f336939522593046dd6b3e833c6152a2f764adf0e035ac52857aeb4fd42188006c06d4f261c0c24
 AUX oidc-agent-4.5.0_webkit41.patch 294 BLAKE2B 45613429ee2eafcd61547f8d8de7bc0e7a3663e65adf196bb995ac754ccde7619fea5ba599d33429dd40c5f439c0ad73a3337802661f71cbe1de40aac3a6ab2b SHA512 e0fee550af136941832f304cd749c263f688105b7361e83555f49d635eed13cf35f587f7a21dcc76804b40438f3f455e9ceaa3cb0ed07119e17d0e117d58d391
-DIST oidc-agent-4.5.0.tar.gz 1823181 BLAKE2B d2023494689ec65837efcd67e325c690ec1b3a03f78dccce853d1c30e312a89d5d43476132830d10aa63ead7b5cfc91b99fcf78fdfa2d46c60e5a62030c77884 SHA512 23520dc5556ed54ad2dcf3a14a5183f04b1f8030aafd342cfb5f4e21683058da475335c7b29ae0727bd20405e42fad825614d1b7c86fca5a81e4bf3cae5f64c1
 DIST oidc-agent-4.5.1.tar.gz 1823853 BLAKE2B d73ce4405ead08ddc0433a5c3b660b08037eecbde5f1e0358cad8731d0787e63ffae4b1317ecfe824a951e07a82d600fa4180557d93d0ce5a382e8c8f39289d6 SHA512 9afffbfcb00c610b04f97c59d610799a4ce45b1c40a61e388c6ab8b550381725602e43d219ce475a9d0425c1bc07b49ca982379286e9f48ebae1e19ca4587779
-EBUILD oidc-agent-4.5.0-r1.ebuild 2319 BLAKE2B 1a78db5eb6bd7af28d21420575573c28f5582f549916f69f89c667fc97ddf18cebb65266763afe6daf037ad869f27626c75cb33ec10dbb692a26900db40117eb SHA512 741469095bf4d43338014dadc8411c48f9f59b1a82d2731466467d3cd64d07cc156568016c90d6bb3664b0be11edf71a42fc84777ad83ba23b67605456caa823
-EBUILD oidc-agent-4.5.1.ebuild 2381 BLAKE2B 66ec885583194e0ec29dd95bb7118119fdb0d3a65cb169e0960e64886ad23c3d1a90af2890a64d7eb1397e47b10fb9e06d366877195952282dc9ba4a54004f7c SHA512 d2ee14e3c81c16ec1f85483a7dacb4fee2bacf598b0d030ce9392514d66ab58594bb3b0775bb3fa1a58a96edf6be42387486a7473d0020452f8c21700bd4b945
+EBUILD oidc-agent-4.5.1.ebuild 2380 BLAKE2B a5394924aec91e45cdbcc038e3b8c1ebbb3c115ac88c54ac3e711a48489c85e131e7a22f2c0e521698c8fcfc8995f2ca25d447b61b41717a217be1ebbe17f4df SHA512 c09ded5d000c4c900d398767c0cd69e73eb3258160e46c51a8e08a47323780f7c3bf02eb77b36b7fc106923e7e6fdfd8e1f11c461fea5093e7db476558932c1b
 MISC metadata.xml 780 BLAKE2B 8a2538e5b233383449dc76e49a4d68f950ad3982874e657664ee027fd71a12f18a9a86f38efd6452732305783cd175b761a7702d1a21b97200b1991d20624fd7 SHA512 a4ba3692ce9304b119ea331f83f702bba0956f0013bbe239bca376dea7ccf72a5bb639f06006cf2d65f8ea4b2817173ef26f1c086ab5482095eff34fea026d3f
diff --git a/net-misc/oidc-agent/files/oidc-agent-4.4.0_deps-automagic.patch b/net-misc/oidc-agent/files/oidc-agent-4.4.0_deps-automagic.patch
deleted file mode 100644
index f8131d23bafa..000000000000
--- a/net-misc/oidc-agent/files/oidc-agent-4.4.0_deps-automagic.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -78,8 +78,8 @@
- TESTSRCDIR = test/src
- TESTBINDIR = test/bin
- 
--USE_CJSON_SO ?= $(shell /sbin/ldconfig -N -v $(sed 's/:/ /g' <<< $LD_LIBRARY_PATH) 2>/dev/null | grep -i libcjson >/dev/null && echo 1 || echo 0)
--USE_LIST_SO ?= $(shell /sbin/ldconfig -N -v $(sed 's/:/ /g' <<< $LD_LIBRARY_PATH) 2>/dev/null | grep -i liblist >/dev/null && echo 1 || echo 0)
-+USE_CJSON_SO ?= 0
-+USE_LIST_SO ?= 0
- USE_ARGP_SO ?= 0
- 
- ifeq ($(USE_CJSON_SO),1)
diff --git a/net-misc/oidc-agent/oidc-agent-4.5.0-r1.ebuild b/net-misc/oidc-agent/oidc-agent-4.5.0-r1.ebuild
deleted file mode 100644
index 3b4667ef6d70..000000000000
--- a/net-misc/oidc-agent/oidc-agent-4.5.0-r1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit xdg-utils
-
-DESCRIPTION="Agent and tools for managing OpenID Connect tokens on the command line"
-HOMEPAGE="https://github.com/indigo-dc/oidc-agent"
-SRC_URI="https://github.com/indigo-dc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~riscv"
-IUSE="test"
-
-DEPEND="app-crypt/libsecret
-	dev-libs/cJSON:=
-	dev-libs/libsodium:=
-	media-gfx/qrencode
-	net-libs/libmicrohttpd:=
-	net-libs/webkit-gtk:4.1=
-	net-misc/curl
-	elibc_musl? ( sys-libs/argp-standalone )"
-RDEPEND="${DEPEND}"
-BDEPEND="test? ( dev-libs/check )"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.4.0_deps-automagic.patch
-	"${FILESDIR}"/${PN}-4.4.0_install-perms.patch
-	"${FILESDIR}"/${PN}-4.5.0_webkit41.patch
-)
-
-src_prepare() {
-	xdg_environment_reset
-	default
-	sed -i -e 's|^\(\s\+\)@|\1|' Makefile || die "Failed to increase verbosity in Makefile"
-}
-
-src_compile() {
-	local -x USE_CJSON_SO=1
-	use elibc_musl && local -x USE_ARGP_SO=1
-	emake -j1 create_obj_dir_structure create_picobj_dir_structure # Bug #880157
-	emake
-}
-
-src_install() {
-	emake \
-		PREFIX="${ED}" \
-		BIN_AFTER_INST_PATH="/usr" \
-		INCLUDE_PATH="${ED}"/usr/include \
-		LIB_PATH="${ED}"/usr/$(get_libdir) \
-		install
-
-	# This file is not compatible with Gentoo and in any case, we generally
-	# let the users load such agents themselves.
-	rm -f "${ED}"/etc/X11/Xsession.d/91${PN}
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog
-		elog "You should use oidc-gen to initially generate your account configuration"
-		elog "before it can be loaded into oidc-agent using oidc-add. For details, please"
-		elog "consult the man page of oidc-gen, or full documentation at"
-		elog "    https://indigo-dc.gitbooks.io/oidc-agent/"
-		elog
-	else
-		local new_major_ver old_ver
-		new_major_ver=$(ver_cut 1)
-		for old_ver in ${REPLACING_VERSIONS}; do
-			if [[ $(ver_cut 1 ${old_ver}) != ${new_major_ver} ]]; then
-				ewarn
-				ewarn "You are upgrading from a different major version. Please restart any running instances of ${PN}"
-				ewarn "to make sure they are compatible with the updated clients."
-				ewarn
-				break
-			fi
-		done
-	fi
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/net-misc/oidc-agent/oidc-agent-4.5.1.ebuild b/net-misc/oidc-agent/oidc-agent-4.5.1.ebuild
index 34e8613dbf7d..a117b42a7ccd 100644
--- a/net-misc/oidc-agent/oidc-agent-4.5.1.ebuild
+++ b/net-misc/oidc-agent/oidc-agent-4.5.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/indigo-dc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv"
+KEYWORDS="amd64 ~riscv"
 IUSE="test"
 
 DEPEND="app-crypt/libsecret
diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index ae94b3c10f56..a97ce8fa7db4 100644
--- a/net-p2p/Manifest.gz
+++ b/net-p2p/Manifest.gz
diff --git a/net-p2p/deluge/Manifest b/net-p2p/deluge/Manifest
index 38075c13971d..95a48aa7fc10 100644
--- a/net-p2p/deluge/Manifest
+++ b/net-p2p/deluge/Manifest
@@ -1,4 +1,5 @@
 AUX deluge-2.1.1-ayatana.patch 777 BLAKE2B bf5efc4c20b6ceb21d954b6084f005e5f530e66432957b32c15419b51d37be3e53be71b0fc1f172e7df6765767cb135753311f61a516f28780d5bcdff2683873 SHA512 8e82825eeecd10b7f2ed673e9f24a817c1f458eff8afc902a8be8297ff685a91c0a691768bae988b2c8f20d599001161e3d49a32f3c97e0baaa998bcd57d734f
+AUX deluge-2.1.1-consoleui-deferred.patch 412 BLAKE2B 6a69db497983c67920de923452e0a31993084634b742cf514205f55e494bed630e78da4a1b6604acc9de9ecc8629560c61be253636faf5862c150dc4a898fd6e SHA512 ed6e196b7857d0d822792b629dd428001fd59a0c1c1d4f9318623c55d2ae07796a00425695c4ca1a0521ba1b469a8a8632f525bc17d8a6e142d59e277b72e255
 AUX deluge-2.1.1-twisted-22.10.patch 1166 BLAKE2B 000c3e3bb63edcadb17c373d899557c32b3ffecfb2725bc283c630854f9643749e739fb58816c4222cf5d296388fa249ff1b8229c9dd00eb4e0f9190cc601bf6 SHA512 fd5ebff902679c7c2dc74638afe650c19199ff58cda8cf73a0c91333a3be5fa07732080856ba092ad25a9472d4269de45161b3d1b93fd8536dc9dd766ed69b67
 AUX deluge-web.conf 210 BLAKE2B 169ddb5ad6259940cf0539e884874b42b739c2425011a86208a608bbaece9db386dca186246671d5dc10b61677b843c0a2b6f7dbd6f8a99da2061a1f83867fa3 SHA512 ecea3cd59dff0c2f0215d98c9e4adda49b6f1f95d43d844262fe73c335d93a6e9076ff5143ff7f3e9f4433087d16a1d0497f75e2b1e0a3d788f5ad60705c9999
 AUX deluge-web.init-2 1500 BLAKE2B 2e4d551f9fb106f03b4c28414cf8e03369226fe9e6a3e2b1f6619ed409c96084072ad97f9681407abb00df54133456bc57420781748cb16a3de175d1e1beb0f1 SHA512 9f8d8d7a0ecc8d320cd484006d28d0aee2f7053c8cb68d9b08aad5f77a0c817ca15663a13e4d6535920bf18d8dae5bca61cc9cf790c9d1d2103b54aebe01fd27
@@ -11,7 +12,6 @@ AUX deluged.service-2 243 BLAKE2B 461d160a901c804cc405fa1c95ea5eb41feac701577da7
 AUX deluged.service.conf 114 BLAKE2B 4b04389b8337e692966f20c9423c5e86a2852969f95684e01fccadc84987cefdc198364dc3827673d33696d109d2194d3aed4f9f90260c373dd4d45b1fe1a05f SHA512 b84ffe94048757359753157643e3d5d6a8110aebffbaf73b836f6f3f53a4e6fee6bcdf65563233ac04859707a5eda986638374b28d913281a98c9edaa6e4750a
 DIST deluge-2.1.1.tar.xz 2541968 BLAKE2B 3fe59ad8b402281dd0e19504d10a8d9e2967911e9967613a0d5a146d9ca261cb59d2208f8bd529e7f1da824e125ffb590d12b337dd9655e78b54252b021ae8da SHA512 e94208981aee45f42b88e1c544b07e7b0d0f2c4ade6b7f37257b69d4a3394c89aff217cde699e79ad59de6d2ee4eca7a558f2b85505d2140ba73f1f76f184455
 EBUILD deluge-2.1.1-r1.ebuild 5785 BLAKE2B 64b8a4aa157ee7afb8909bcb70402119053c32ac411899e1d774c2b444c0f422f015ecf905def1189e3d5b8bcb0e950394e1a4cc9cb1d80be01cad18ab8e5364 SHA512 d702f35a1c2b99ae3fbd46912bd2fe48397f96f3f0b4a238583d3c732e286983d89e3b1cbdf67441a59a142fa7ea981c5d310dc70e6bf58ce87bde9a59fb479b
-EBUILD deluge-2.1.1-r2.ebuild 5887 BLAKE2B cfabc9b31d58427fa534d770b3d688e8d55556add56f410a2e32f656ae975c2eaea6a83c2a77b3b46dfbd9716417a0013072f58085df8dab2a990748c457d343 SHA512 873bebbc3cebda402a83b7a9bd669a926143c4718ca52c63fb307ed8a578f86e6afc04c25e8ebac3fba45abc06693640aeacf6e597c6c647f8496f302448b604
-EBUILD deluge-2.1.1-r3.ebuild 5968 BLAKE2B 4dd3e343b571ab60af2153734e1084a9bbcfc3c433e55e8d9da504fb3427393037698ec46d53629675134b132f32f3a6a3976e46f3c123ab6d8b45b951175b82 SHA512 4d475c8f37e8ea3ebfb375b4f27b62a6a5b57a86559e643f78fea4bdd78c74a594076bd4d6f7d2ad12e347ec8a08eb4d2867015b64ce9542012c6a5a481f0e6a
+EBUILD deluge-2.1.1-r4.ebuild 6059 BLAKE2B 3a75fdbee99326fa0a5672d9a339eaaed6aeca760b69b4c27643a7d971fe69b95b28528590eb0cd265539aa697c481fa1a120ac18a07e368b0cbf48170118842 SHA512 2bf8c08b6ce8e259b68cc94d270dab1a2fad09242f04c300c741a3356fed65a3f1fb677c7b4e803473124d7f9b34e0bdabb37d6cc353cad492ad69657e1d0772
 EBUILD deluge-9999.ebuild 5730 BLAKE2B 92cca11b8ac32554e6ee2523e91962a4ce2839920c995904616f22ca0d013f112d28c30258eecc98271a0860038972775734e222bc8275a2444cad99333e9520 SHA512 ae90bff57e2a0df1ac08e312ff25d21e942e90ae9e16ac41a3e788eabf5b703ea0dafc52d863fcc9d96c9105c278889209b5c6428391260011d7bf1547047f96
 MISC metadata.xml 763 BLAKE2B 8d0ee2a486c2755cda79b56d622c96803c2b2538bd8f3c4598381bfe3a03572c0503510eb7952c37b5432fa1a9d6db73badbd02b939961fb81567149d9fb8a5f SHA512 f6bbd8504c4edfc5b9420a1d7c52e56f3ebe5f8f92b5db3b5a954b9324e1a6cf7938a9e1d8d98305d3fed42422d584f31f0d17fdb884e05ed01480075600fc06
diff --git a/net-p2p/deluge/deluge-2.1.1-r2.ebuild b/net-p2p/deluge/deluge-2.1.1-r2.ebuild
deleted file mode 100644
index 9239e7a1126d..000000000000
--- a/net-p2p/deluge/deluge-2.1.1-r2.ebuild
+++ /dev/null
@@ -1,173 +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} )
-DISTUTILS_USE_PEP517=setuptools
-DISTUTILS_SINGLE_IMPL=1
-inherit distutils-r1 systemd xdg
-
-DESCRIPTION="BitTorrent client with a client/server model"
-HOMEPAGE="https://deluge-torrent.org/"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.deluge-torrent.org/${PN}"
-else
-	SRC_URI="http://download.deluge-torrent.org/source/$(ver_cut 1-2)/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~riscv ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="console gui libnotify sound webinterface"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	libnotify? ( gui )
-	sound? ( gui )
-"
-
-BDEPEND="
-	dev-util/intltool
-	test? (
-		$(python_gen_cond_dep '
-			>=dev-python/pytest-twisted-1.13.4-r1[${PYTHON_USEDEP}]
-		')
-	)
-"
-
-RDEPEND="
-	acct-group/deluge
-	acct-user/deluge
-	net-libs/libtorrent-rasterbar:=[python,${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep '
-		gui? (
-			sound? ( dev-python/pygame[${PYTHON_USEDEP}] )
-			dev-python/pygobject:3[${PYTHON_USEDEP}]
-			gnome-base/librsvg
-			libnotify? ( x11-libs/libnotify )
-		)
-		dev-python/chardet[${PYTHON_USEDEP}]
-		dev-python/distro[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/pyxdg[${PYTHON_USEDEP}]
-		dev-python/rencode[${PYTHON_USEDEP}]
-		dev-python/setproctitle[${PYTHON_USEDEP}]
-		|| (
-			>=dev-python/twisted-17.1.0[ssl(-),${PYTHON_USEDEP}]
-			>=dev-python/twisted-17.1.0[crypt(-),${PYTHON_USEDEP}]
-		)
-		>=dev-python/zope-interface-4.4.2[${PYTHON_USEDEP}]
-		dev-python/mako[${PYTHON_USEDEP}]
-	')
-"
-
-PATCHES=( "${FILESDIR}/${P}-twisted-22.10.patch" )
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	local args=(
-		-e 's|"new_release_check": True|"new_release_check": False|'
-		-e 's|"check_new_releases": True|"check_new_releases": False|'
-		-e 's|"show_new_releases": True|"show_new_releases": False|'
-	)
-	sed -i "${args[@]}" -- 'deluge/core/preferencesmanager.py' || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# Upstream CI/CD skips these and they seem to intentionally segfault to collect core dumps...
-		deluge/plugins/Stats/deluge_stats/tests/test_stats.py
-		# Skipped upstream
-		deluge/tests/test_security.py
-	)
-	local EPYTEST_DESELECT=(
-		# Skipped upstream
-		'deluge/plugins/WebUi/deluge_webui/tests/test_plugin_webui.py::TestWebUIPlugin::test_enable_webui'
-		'deluge/tests/test_torrent.py::TestTorrent::test_torrent_error_resume_data_unaltered'
-		'deluge/tests/test_tracker_icons.py::TestTrackerIcons::test_get_seo_svg_with_sni'
-		# never returns
-		'deluge/tests/test_ui_entry.py::TestConsoleScriptEntryWithDaemon'
-		# failing network(?)-related tests, even with sandbox disabled
-		'deluge/tests/test_common.py::TestCommon::test_is_interface'
-		# fails
-		'deluge/tests/test_core.py::TestCore::test_pause_torrents'
-		# fails because of network sandbox
-		'deluge/tests/test_core.py::TestCore::test_test_listen_port'
-		'deluge/tests/test_tracker_icons.py::TestTrackerIcons::test_get_deluge_png'
-		'deluge/tests/test_tracker_icons.py::TestTrackerIcons::test_get_google_ico'
-		'deluge/tests/test_tracker_icons.py::TestTrackerIcons::test_get_google_ico_hebrew'
-		'deluge/tests/test_tracker_icons.py::TestTrackerIcons::test_get_google_ico_with_redirect'
-		# segfaults with FEATURES="network-sandbox"
-		'deluge/tests/test_core.py::TestCore::test_pause_torrent'
-	)
-
-	# dev-python/pytest-twisted has disabled autoloading
-	epytest -m "not (todo or gtkui)" -p pytest_twisted -v
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if ! use console ; then
-		rm -r "${D}/$(python_get_sitedir)/deluge/ui/console/" || die
-		rm "${ED}/usr/bin/deluge-console" || die
-		rm "${ED}/usr/share/man/man1/deluge-console.1" ||die
-	fi
-	if ! use gui ; then
-		rm -r "${D}/$(python_get_sitedir)/deluge/ui/gtk3/" || die
-		rm -r "${ED}/usr/share/icons/" || die
-		rm "${ED}/usr/bin/deluge-gtk" || die
-		rm "${ED}/usr/share/man/man1/deluge-gtk.1" || die
-	else
-		mkdir -p "${ED}/usr/share/applications/" || die
-		cp "${WORKDIR}/${P}/deluge/ui/data/share/applications/deluge.desktop" "${ED}/usr/share/applications/" || die
-		mkdir -p "${ED}/usr/share/metainfo" || die
-		cp "${WORKDIR}/${P}/deluge/ui/data/share/appdata/deluge.appdata.xml" "${ED}/usr/share/metainfo/" || die
-	fi
-
-	if use webinterface; then
-		newinitd "${FILESDIR}/deluge-web.init-2" deluge-web
-		newconfd "${FILESDIR}/deluge-web.conf" deluge-web
-		systemd_newunit "${FILESDIR}/deluge-web.service-4" deluge-web.service
-		systemd_install_serviced "${FILESDIR}/deluge-web.service.conf"
-	else
-		rm -r "${D}/$(python_get_sitedir)/deluge/ui/web/" || die
-		rm "${ED}/usr/bin/deluge-web" || die
-		rm "${ED}/usr/share/man/man1/deluge-web.1" || die
-	fi
-
-	newinitd "${FILESDIR}"/deluged.init-2 deluged
-	newconfd "${FILESDIR}"/deluged.conf-2 deluged
-	systemd_newunit "${FILESDIR}"/deluged.service-2 deluged.service
-	systemd_install_serviced "${FILESDIR}"/deluged.service.conf
-
-	python_optimize
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	elog
-	elog "If, after upgrading, deluge doesn't work please back up and then"
-	elog "remove your '~/.config/deluge' directory and try again"
-	elog
-	elog "To start the daemon either run 'deluged' as user"
-	elog "or modify /etc/conf.d/deluged and run"
-	elog "'/etc/init.d/deluged start' as root if you use OpenRC"
-	elog "or"
-	elog "'systemctl start deluged.service' as root if you use systemd"
-	elog "You can still use deluge the old way"
-	elog
-	elog "Systemd unit files for deluged and deluge-web no longer source"
-	elog "/etc/conf.d/deluge* files. Environment variable customization now"
-	elog "happens in /etc/systemd/system/deluged.service.d/00gentoo.conf"
-	elog "and /etc/systemd/system/deluge-web.service.d/00gentoo.conf"
-	elog
-	elog "For more information see https://dev.deluge-torrent.org/wiki/Faq"
-	elog
-}
diff --git a/net-p2p/deluge/deluge-2.1.1-r3.ebuild b/net-p2p/deluge/deluge-2.1.1-r4.ebuild
index 2d6ade36c4d5..578a7a9dcdc9 100644
--- a/net-p2p/deluge/deluge-2.1.1-r3.ebuild
+++ b/net-p2p/deluge/deluge-2.1.1-r4.ebuild
@@ -68,6 +68,8 @@ PATCHES=(
 	"${FILESDIR}/${P}-twisted-22.10.patch"
 	# https://dev.deluge-torrent.org/ticket/3598
 	"${FILESDIR}/${P}-ayatana.patch"
+	# https://dev.deluge-torrent.org/ticket/3582
+	"${FILESDIR}/${P}-consoleui-deferred.patch"
 )
 
 distutils_enable_tests pytest
diff --git a/net-p2p/deluge/files/deluge-2.1.1-consoleui-deferred.patch b/net-p2p/deluge/files/deluge-2.1.1-consoleui-deferred.patch
new file mode 100644
index 000000000000..55917cca6762
--- /dev/null
+++ b/net-p2p/deluge/files/deluge-2.1.1-consoleui-deferred.patch
@@ -0,0 +1,13 @@
+Bug: https://dev.deluge-torrent.org/ticket/3582
+git: https://github.com/deluge-torrent/deluge/pull/408
+
+diff -ru a/deluge/ui/console/__init__.py b/deluge/ui/console/__init__.py
+--- a/deluge/ui/console/__init__.py	2022-06-28 11:57:49.000000000 -0700
++++ b/deluge/ui/console/__init__.py	2023-05-01 18:32:19.261457877 -0700
+@@ -12,5 +12,4 @@
+ 
+ 
+ def start():
+-
+-    return Console().start()
++    Console().start()
diff --git a/net-print/Manifest.gz b/net-print/Manifest.gz
index acb433664095..fe8cd79fc29a 100644
--- a/net-print/Manifest.gz
+++ b/net-print/Manifest.gz
diff --git a/net-print/epson-inkjet-printer-escpr/Manifest b/net-print/epson-inkjet-printer-escpr/Manifest
index 707ebbc1004c..7bf6da1e60e2 100644
--- a/net-print/epson-inkjet-printer-escpr/Manifest
+++ b/net-print/epson-inkjet-printer-escpr/Manifest
@@ -5,5 +5,5 @@ DIST epson-inkjet-printer-escpr-1.7.25-1lsb3.2.tar.gz 5469974 BLAKE2B e33ef049ef
 DIST epson-inkjet-printer-escpr-1.7.26-1lsb3.2.tar.gz 5484887 BLAKE2B 66ac07e500f7914a42f509f52868087bf3ccf7c9d67fd5749a30395ad524223870a7f1ff6a4c6ad53faa65e8c12bfee939b1873ee0f002aad9d4a7a1e6f49f09 SHA512 ba018e43eae1881aa444a522e03f9dfcbae7e88ca40645bf14bdb8e88d88b2812f8b070305f422d03d4aca4011edf22691e74a4b95bc20a127e9eb04bb4b3eac
 EBUILD epson-inkjet-printer-escpr-1.7.22.ebuild 883 BLAKE2B 100ddf1c54751f5b921130aaeee49651038e0f90b01ae6521566b8482d1d5ddfb27012a9b4fa69c7a1a9d5c44a15acff152dc160210b3df1e816f4d6379d72ac SHA512 b48f39f7305509e34268c0769ab4e2989803fe2dc4e62b4884cad8ef2087c7c6efcd9db2886703cf344dda5f2d9eb616b1338fa26d4ddfd91370d98dfc1a0e41
 EBUILD epson-inkjet-printer-escpr-1.7.25.ebuild 885 BLAKE2B 1863db6b09b44fc788a7cdbc6caaf6bb9ef4e0cd862dd194b5e6a56b24a74c719c3d1042b631ba755dca0072dd86cf18c43af7c057462fec0b000006ebb6d8a2 SHA512 7bfee0589b6d04f47fda50468e51a63c391c3f63b324cbb0beb6d6df7c79eb4d41ed2be82864420536d3eb6a753a3db220e616fa670c7bdb99b24efc0634a608
-EBUILD epson-inkjet-printer-escpr-1.7.26.ebuild 885 BLAKE2B a7a415e64819af8c33986fcdb71973109cb8de0678e4c0225e3c144daa9eb7d1aa9b86ba06b58ccfd2e81ecbf61fed743051124cb6634a16855b5d69fb1b88fd SHA512 f9ddfeb62ec81cc92853f24b34c9c9b5993e2a28622b3c2637481802165f9ae7e0c02733334ed6ca7020fe70e1cfb9ef51028bcee049fe10932007f8e09543d6
+EBUILD epson-inkjet-printer-escpr-1.7.26.ebuild 884 BLAKE2B cac48134836bfdcc12f1e5bc719746e17f0b94e945d84f134b078f6d5fa05491fd568b431e46bf1943547b72613de665f49c6011af4b0e3669e2292faf34d052 SHA512 887efc281fa57f41661d245235b13dc79209f4b09ad7265853495d892114f6fd99321f5cb92947747ce0dfc43b52bb8709059f0137782aac1ffe87d669531728
 MISC metadata.xml 264 BLAKE2B 3b2c0ccd6bcc91f31c816e8e781976b3c65f16c7f3cfb73c96d3f5ab6df6d4d035ef385d821062afb81e917fc98adf7e77e96780c84f56da7f3a263824e0a6d0 SHA512 fb5a26534c5a78f4168ce051280353e57b0a48885f41c7ff992a12a6d8c28582d625f645f3ddc1f271a2a72475bd827c3e0385a319b4f3bdaf095fbf205a9ea7
diff --git a/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.7.26.ebuild b/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.7.26.ebuild
index af2720a69f6e..d1d7c768ce46 100644
--- a/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.7.26.ebuild
+++ b/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.7.26.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://download3.ebz.epson.net/dsc/f/03/00/14/48/15/c864d000b06bebeec8
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
+KEYWORDS="amd64 ~ppc64"
 
 DEPEND="net-print/cups"
 RDEPEND="${DEPEND}"
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index c4f57f5955b5..53361a8fd2bc 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 525eded09ced..0c794a808676 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -7813,14 +7813,11 @@ sys-apps/man-db:manpager - Enable manpager wrapper for colorizing output
 sys-apps/memtest86:serial - Compile with serial console support
 sys-apps/memtest86+:bios32 - Compile a BIOS-bootable 32bit memtest image
 sys-apps/memtest86+:bios64 - Compile a BIOS-bootable 64bit memtest image
-sys-apps/memtest86+:boot - Also install to /boot instead of just /usr/share/memtest86+/
+sys-apps/memtest86+:boot - Install to /boot in addition to /usr/share/memtest86+/
 sys-apps/memtest86+:efi32 - Compile a EFI32-bootable 32bit memtest image
 sys-apps/memtest86+:efi64 - Compile a UEFI-bootable 64bit memtest image
-sys-apps/memtest86+:floppy - Install a script to create floppy disks containing memtest86+ binaries.
-sys-apps/memtest86+:iso - Compile an ISO image
 sys-apps/memtest86+:iso32 - Compile a 32bit ISO image
 sys-apps/memtest86+:iso64 - Compile a 64bit ISO image
-sys-apps/memtest86+:serial - Compile with serial console support
 sys-apps/moreutils:perl - Install scripts written in Perl
 sys-apps/net-tools:arp - build the arp and rarp tools (for manipulating the ARP cache)
 sys-apps/net-tools:hostname - build the hostname and dnsdomainname tools
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index 8413a60f476a..35e6ef833661 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/wxmaxima/Manifest b/sci-mathematics/wxmaxima/Manifest
index 12a2765eec43..395be0a78989 100644
--- a/sci-mathematics/wxmaxima/Manifest
+++ b/sci-mathematics/wxmaxima/Manifest
@@ -1,6 +1,8 @@
 DIST wxmaxima-20.12.2.tar.gz 16262617 BLAKE2B 2f9f910f565158b2011f014d96747498c6286a95bdb69f9b6b2f82a37a569e8a02abbae5cbb9ae2ac1e78d0b976487666794b267c1c40c1245df08c752486403 SHA512 1c3e3f68a2fa2cd798dfb05c52e7ddf3193a15cb45282553c280914bd524d463ad27acc89898cb4a292ff236699d1ec2abb70d83fa52cb126123ab8e2fcd5ceb
 DIST wxmaxima-23.04.1.tar.gz 22060726 BLAKE2B 77583c2461f7c32ac53ad2890d1e7d07a9fc2dd0caa07a1fcdd7c62d39ec63c50173542c74ce2d21093ce724d1777b76e7789f8a5363ff20406d52177c86a016 SHA512 9846c11cbeec8411170e0d55916187cc77274e2758726784bcb5540d55f712b5a557562de0c37dac0c7ef119d43570bd33efc33252fc5359627e527d668580a4
+DIST wxmaxima-23.05.0.tar.gz 16216267 BLAKE2B 2f735a154d8f892799a18384bc1dc1bda22ce0d23cfd6f382971fce468e69f83926992bad111824c94a0c11a91107e8811567abec51035089613f057ab0ee8f8 SHA512 068e8ca93150b9b4649cbc57e375d526060095da4fff0a7217451febd478aff3be78c86d72d60fcee530a6c2d78c2b5e8c41cb3b5b85c9858813be79e18a83d5
 EBUILD wxmaxima-20.12.2.ebuild 1428 BLAKE2B 30e26a147fe84b328902bedb1ee7df68a6c27d203b9b6e900096d931091ce51cce41d22e45fe779bb4144949b1ebcf259fbd085cc4e2f992e495405c5176410d SHA512 823b28ad77dfa70536103b64735ec68cdefe38abeec760b15acb6904f7f8f97d6ace10eec836f0536ff576f7711b2d135a989072087ae67d133506a301920882
 EBUILD wxmaxima-23.04.1-r1.ebuild 1901 BLAKE2B 33ccd0d0c93571d76bfee6727b62a826388cbe39d1b757ba81f9ab77bb2d05994b675e22f6d73829837e2fedf3396ad4cc2ad28c0bdc85c6221f7825c0bb008c SHA512 c33a36b8cde439d4a760d3ba328c8a52c51fb7b29f79e67009e5bb25acc535983c6d3738ed1f09fc9d2398396522f9abacdee98598e2e510d3d1ffcf66c83838
 EBUILD wxmaxima-23.04.1.ebuild 1901 BLAKE2B 7c6834bf45bd13bc889fd06a0b115f79b3d71f913f3a982af15eee7130900d152058c817e4908112d52d0f6a9dcb1eabc2a99987ea9e5306b8205fa68cf780e2 SHA512 651f5d701a5d346c744fd15d2094545b61615a3837d53e1b124be0507b4f5c29ad80bf98a1c1691645ec0caea851093cf7250ad9d9a94fc54bd722f15df874ec
+EBUILD wxmaxima-23.05.0.ebuild 1901 BLAKE2B 33ccd0d0c93571d76bfee6727b62a826388cbe39d1b757ba81f9ab77bb2d05994b675e22f6d73829837e2fedf3396ad4cc2ad28c0bdc85c6221f7825c0bb008c SHA512 c33a36b8cde439d4a760d3ba328c8a52c51fb7b29f79e67009e5bb25acc535983c6d3738ed1f09fc9d2398396522f9abacdee98598e2e510d3d1ffcf66c83838
 MISC metadata.xml 736 BLAKE2B fb5db64266afc69d42ab7ca857e9022d20e5306d04403859c847caf8d36953820ad9920212f164a74c1e2a807b111c0cffbbdfd4b098049e3bf689a9958b0b6d SHA512 318a52fafba636ef7439d52b936a3aa144e810077e381d367a8d1cc12529e085a3b84f873591ee9f9b613a5f71285a1f1f5b3ceedbd619e79c717a375e3c5e95
diff --git a/sci-mathematics/wxmaxima/wxmaxima-23.05.0.ebuild b/sci-mathematics/wxmaxima/wxmaxima-23.05.0.ebuild
new file mode 100644
index 000000000000..eb18fbdaf093
--- /dev/null
+++ b/sci-mathematics/wxmaxima/wxmaxima-23.05.0.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WX_GTK_VER="3.2-gtk3"
+PLOCALES="ca cs da de el en es fi fr gl hu it ja kab nb pl pt_BR ru tr uk zh_CN zh_TW"
+inherit cmake plocale wxwidgets xdg
+
+DESCRIPTION="Graphical frontend to Maxima, using the wxWidgets toolkit"
+HOMEPAGE="https://wxmaxima-developers.github.io/wxmaxima/"
+SRC_URI="https://github.com/wxMaxima-developers/wxmaxima/archive/Version-${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-Version-${PV}
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	dev-libs/libxml2:2
+	x11-libs/wxGTK:${WX_GTK_VER}[webkit]"
+RDEPEND="${DEPEND}
+	media-fonts/jsmath
+	sci-visualization/gnuplot[wxwidgets]
+	sci-mathematics/maxima"
+
+src_prepare() {
+	setup-wxwidgets
+	cmake_src_prepare
+
+	sed -e "s|GPL.txt ||g" -e "s|share/doc/${PN}|share/doc/${PF}|g" -i CMakeLists.txt \
+		|| die "sed CMakeLists.txt failed"
+	sed -e "s|share/doc/${PN}|share/doc/${PF}|g" -i info/CMakeLists.txt \
+		|| die "sed info/CMakeLists.txt failed"
+
+	# locales
+	rm_po() {
+		rm locales/wxMaxima/${1}.po || die "rm ${1}.po failed"
+		rm -f locales/manual/${1}.po
+		rm -f info/${PN}.${1}.md
+		rm -f info/${PN}.${1}.html
+		sed -e "\\|/${1}/wxmaxima.1|d" -i data/CMakeLists.txt
+	}
+	plocale_find_changes locales/wxMaxima '' '.po'
+	plocale_for_each_disabled_locale rm_po
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWXM_UNIT_TESTS=$(usex test)
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	# Just run the unit tests manually for now as tests fail in a non-descriptive
+	# way even with virtualx
+	# bug #736695
+	cd "${BUILD_DIR}/test/unit_tests" || die
+
+	local tests=(
+		AFontSize
+		CellPtr
+		ImgCell
+	)
+
+	local test
+	for test in "${tests[@]}" ; do
+		./test_${test} || die "Unit test ${test} failed!"
+	done
+}
+
+src_install() {
+	docompress -x /usr/share/doc/${PF}
+	cmake_src_install
+}
diff --git a/sci-misc/Manifest.gz b/sci-misc/Manifest.gz
index 0ae64c295440..086a22986ac3 100644
--- a/sci-misc/Manifest.gz
+++ b/sci-misc/Manifest.gz
diff --git a/sci-misc/jupyterlab-desktop-bin/Manifest b/sci-misc/jupyterlab-desktop-bin/Manifest
index 4173f2d35e7a..5279eb4c93a3 100644
--- a/sci-misc/jupyterlab-desktop-bin/Manifest
+++ b/sci-misc/jupyterlab-desktop-bin/Manifest
@@ -1,5 +1,7 @@
 DIST jupyterlab-desktop-bin-3.6.2.1.rpm 320191697 BLAKE2B c4db82cb1a81d26bdb3923ee3726915a1613ae39bd3b7e413578835d883357b4f83abf700373e5452707eb2cb41e3f940ab04b968c3b42927826c2ccafaa46a8 SHA512 e2554202ac2772414b474cdd5a5addb56c3d7ceb1c451735b97facb5bda8f34e18d55611fc35ae0e0914357f783eb0fb697f6d9566f0f7da9fcba89f2cb8d8ad
 DIST jupyterlab-desktop-bin-3.6.3.1.rpm 273770065 BLAKE2B 69285092ad9e31d886a3e3e8d096d1c0e3c0c74f27a05d722025d9412751035447cb8989cb0fd4410618f78ca753d2071941424390565e6891fdcaec061e03f5 SHA512 e48cf23da01001639cbe774bc38a4d4b702906aac3432d0b210bb4481378f87456c6b0d9bc4bed51dbbc6a38bbc24383676be56deae9ed993daf49933b0ed4d6
+DIST jupyterlab-desktop-bin-4.0.0.1.rpm 262569685 BLAKE2B a39d488f4b90235ab6e18744fe35720d44157da794e33dd0eec62ee6b62d4924f055478cc9325e83b98b8fdf2f946251635613490deaf862db475e1bbb6f5f23 SHA512 b5534652283632d0e96e9a42f1a1bcbb7206af7d51dd0140c165c0fd739349d3d05ddf0aaa9f4df0c4cfb99fd4cbed43a2bc85678ed72d6a2bc2926dce91f290
 EBUILD jupyterlab-desktop-bin-3.6.2.1.ebuild 2854 BLAKE2B 215468c0a9ea9b5dabac685bc9c517a8ecb7fccd2858a05bb8e27c9a43d97b5bd26da4e38bc0f5bbb82cbff0958dd6587e32eb405fd526c8a1eb9ec1652ea580 SHA512 1116113a52da40171efa751ba0cdd1f431c47a0d541bf5db2cc0d57c4df79b511605bfeaa79b26ab485fe5ee8d309874581b3176614da51a790fa9455bc9d3fe
 EBUILD jupyterlab-desktop-bin-3.6.3.1.ebuild 2854 BLAKE2B 215468c0a9ea9b5dabac685bc9c517a8ecb7fccd2858a05bb8e27c9a43d97b5bd26da4e38bc0f5bbb82cbff0958dd6587e32eb405fd526c8a1eb9ec1652ea580 SHA512 1116113a52da40171efa751ba0cdd1f431c47a0d541bf5db2cc0d57c4df79b511605bfeaa79b26ab485fe5ee8d309874581b3176614da51a790fa9455bc9d3fe
+EBUILD jupyterlab-desktop-bin-4.0.0.1.ebuild 2854 BLAKE2B 215468c0a9ea9b5dabac685bc9c517a8ecb7fccd2858a05bb8e27c9a43d97b5bd26da4e38bc0f5bbb82cbff0958dd6587e32eb405fd526c8a1eb9ec1652ea580 SHA512 1116113a52da40171efa751ba0cdd1f431c47a0d541bf5db2cc0d57c4df79b511605bfeaa79b26ab485fe5ee8d309874581b3176614da51a790fa9455bc9d3fe
 MISC metadata.xml 430 BLAKE2B 1bd3f621bb4d25086cc80c5b44a7eef4a61f58c1f56c7cb91ca4e39b8a5e7d5fdd37e912e48d99ee6ba6a19de1c61252b4ebe3afd554d487c549d22597c376fc SHA512 b99b088cb0bdcfdaa9d584fb580b12a754f30a378fdede655f7723075e81948fc57f9aad11a59944b164eb8c9c24f6f0828e95c5a227766e985778900ea08079
diff --git a/sci-misc/jupyterlab-desktop-bin/jupyterlab-desktop-bin-4.0.0.1.ebuild b/sci-misc/jupyterlab-desktop-bin/jupyterlab-desktop-bin-4.0.0.1.ebuild
new file mode 100644
index 000000000000..4bb8e3351976
--- /dev/null
+++ b/sci-misc/jupyterlab-desktop-bin/jupyterlab-desktop-bin-4.0.0.1.ebuild
@@ -0,0 +1,111 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CHROMIUM_LANGS="
+	af am ar bg bn ca cs da de el en-GB en-US es es-419 et fa fi fil fr gu he hi
+	hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr sv
+	sw ta te th tr uk ur vi zh-CN zh-TW
+"
+
+inherit chromium-2 desktop rpm xdg
+
+DESCRIPTION="JupyterLab desktop application, based on Electron"
+HOMEPAGE="https://jupyter.org/"
+SRC_URI="https://github.com/jupyterlab/${PN%%-bin}/releases/download/v$(ver_rs 3 -)/JupyterLab-Setup-Fedora.rpm -> ${P}.rpm"
+S="${WORKDIR}"
+
+KEYWORDS="-* ~amd64"
+# Electron bundles a bunch of things
+LICENSE="
+	MIT BSD BSD-2 BSD-4 AFL-2.1 Apache-2.0 Ms-PL GPL-2 LGPL-2.1 APSL-2
+	unRAR OFL CC-BY-SA-3.0 MPL-2.0 android public-domain all-rights-reserved
+"
+SLOT="0"
+RESTRICT="bindist mirror"
+
+RDEPEND="
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	dev-libs/expat
+	dev-libs/glib
+	dev-libs/nspr
+	dev-libs/nss
+	>=dev-python/jupyterlab-$(ver_cut 1-3)
+	media-libs/alsa-lib
+	media-libs/mesa
+	net-print/cups
+	sys-apps/dbus
+	sys-libs/glibc
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3
+	x11-libs/libdrm
+	x11-libs/libX11
+	x11-libs/libxcb
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libxkbcommon
+	x11-libs/libXrandr
+	x11-libs/libxshmfence
+	x11-libs/pango
+"
+
+QA_PREBUILT="opt/JupyterLab/*"
+
+pkg_pretend() {
+	chromium_suid_sandbox_check_kernel_config
+}
+
+src_prepare() {
+	default
+	# cleanup languages
+	pushd "opt/JupyterLab/locales" || die
+	chromium_remove_language_paks
+	popd || die
+}
+
+src_configure() {
+	chromium_suid_sandbox_check_kernel_config
+	default
+}
+
+src_install() {
+	for size in {16,32,48,64,128,256,512}; do
+		doicon -s ${size} "usr/share/icons/hicolor/${size}x${size}/apps/jupyterlab-desktop.png"
+	done
+
+	domenu usr/share/applications/jupyterlab-desktop.desktop
+
+	local DESTDIR="/opt/JupyterLab"
+	pushd "opt/JupyterLab" || die
+
+	exeinto "${DESTDIR}"
+	doexe chrome-sandbox chrome_crashpad_handler jupyterlab-desktop *.so*
+
+	insinto "${DESTDIR}"
+	doins *.pak *.bin *.json *.dat
+	insopts -m0755
+	doins -r locales resources
+
+	# Chrome-sandbox requires the setuid bit to be specifically set.
+	# see https://github.com/electron/electron/issues/17972
+	fperms 4755 "${DESTDIR}"/chrome-sandbox
+
+	dosym "${DESTDIR}"/jupyterlab-desktop /opt/bin/jupyterlab-desktop
+	popd || die
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	elog ""
+	elog "On initial startup you will be prompted to select the python environment of"
+	elog "your choice. Either select a specific python version, e.g. /usr/bin/pythonX.Y,"
+	elog "or choose /usr/bin/python to follow the system wide setting in"
+	elog "/etc/python-exec/python-exec.conf."
+	elog "Please note that only python environments corresponding to the enabled"
+	elog "PYTHON_TARGETS on dev-python/jupyterlab will work."
+	elog ""
+}
diff --git a/sci-visualization/Manifest.gz b/sci-visualization/Manifest.gz
index 00743b26d34d..be47669cd664 100644
--- a/sci-visualization/Manifest.gz
+++ b/sci-visualization/Manifest.gz
diff --git a/sci-visualization/gnuplot/Manifest b/sci-visualization/gnuplot/Manifest
index 29c14487223d..bd1f5f3e7624 100644
--- a/sci-visualization/gnuplot/Manifest
+++ b/sci-visualization/gnuplot/Manifest
@@ -6,6 +6,6 @@ DIST gnuplot-5.4.6.tar.gz 5655661 BLAKE2B a4e42679c9942936bc4692ba71a17c748002e0
 EBUILD gnuplot-5.4.4.ebuild 5012 BLAKE2B de1d4d656411e2dad93681f94cd118b13879cb825f8823e93283ace035c033a78d019d5873e6575a0c868d63204a5b2f30dbb70f6ec10485ecef63099421f7ff SHA512 714ec0dc1a3431c4237db3f8af6accd8124e30ec7ce0c2ccd7dd730f2b88e40f3f7b423657b0790a40ae8c5bf17a981fb23be976545ce121db7c770a2c8e9649
 EBUILD gnuplot-5.4.5.ebuild 5019 BLAKE2B 9fcc4165466e2d5c1bf6f1cb92c87f75a73a132ab71fc513a619ea9e324938211ed9d4d98d5d10bb59b6ea5ceb0610be47d4d1dbd3889214fefa33aa596689e0 SHA512 9c647ded0ba038a07b6c88988629a311f472bfdfe912cdb4460121f81b8a6260e9b2319bd5c82a8e545909108cbe802aaa96b2c23f41a924fdff21b52dd2db98
 EBUILD gnuplot-5.4.6-r1.ebuild 5213 BLAKE2B e4103af296c58ae997bd94e448c1918358415beaa957ff74fc595194bea7ad0fd5c503f13375e02adbb16260b32db38679b5ba1157977b0b3490bd3e5a8786d5 SHA512 8343db6ce5eb5df65065eb5190330492f90110d19e91d95631a5acbfb83a09faa513f26bd5e3c29aeda1fae0249a73c0944889721d0f8c2f13fdd1e8bc8d2b5c
-EBUILD gnuplot-5.4.6.ebuild 5019 BLAKE2B 9fcc4165466e2d5c1bf6f1cb92c87f75a73a132ab71fc513a619ea9e324938211ed9d4d98d5d10bb59b6ea5ceb0610be47d4d1dbd3889214fefa33aa596689e0 SHA512 9c647ded0ba038a07b6c88988629a311f472bfdfe912cdb4460121f81b8a6260e9b2319bd5c82a8e545909108cbe802aaa96b2c23f41a924fdff21b52dd2db98
+EBUILD gnuplot-5.4.6.ebuild 5018 BLAKE2B 2fcda997ae9b06f4e99245ddd39e74dca0366c1fcdde9d295e6703391f1cb7c62a42c4a186c4ed9234332de1ea9490664294196fe9c033109ab34526bcd397b0 SHA512 5c3c955079a9baf810b57cd0690028a591459b8b7898bec4d39a05f3e2db11af0c14c1cd1ec3b6a1a332d857e990ff3eda41106ad48e6e65b88b70ec5738f752
 EBUILD gnuplot-5.5.9999-r1.ebuild 5004 BLAKE2B 50c97333406cb28a5a14405190815e8629dd69028da084ab3cef4720ba3be4b6e12e1382428c60a98e57d3013fabc2d74763239923c05860a59f88bcb5f70844 SHA512 df00dca2a95c77c21a75a68bd925401a6739b5666dd9b120ed133c73379be97fec81307f5e9f6584034520a4a64bc314155e8baefabcaa36024e66a45cff1749
 MISC metadata.xml 1070 BLAKE2B 92ac6f016dedc1ee0aced2792c735e692efac0b0c045b7119d6f2268ed9a7ee3c2437a4038ff45799670265e01f74d8470e3c0abf45b35980a4e761fcd802d19 SHA512 04100f29255dd4d3caf3c81a39f7d6f8ad341598e89555219ba054e980484da00835c2226f35a2b63ec5f27238a97003c7bdac28ca504aed68af0fad737beb8a
diff --git a/sci-visualization/gnuplot/gnuplot-5.4.6.ebuild b/sci-visualization/gnuplot/gnuplot-5.4.6.ebuild
index 1af9b5f9d215..3c30cf53a530 100644
--- a/sci-visualization/gnuplot/gnuplot-5.4.6.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-5.4.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -20,7 +20,7 @@ if [[ -z ${PV%%*9999} ]]; then
 else
 	MY_P="${P/_/.}"
 	SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 S="${WORKDIR}/${MY_P}"
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 2358829598b4..0cf4128d7b7d 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index 7339270cc2fe..90cb94622cff 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -1,12 +1,10 @@
 AUX fwupd-1.8.10-installed_tests.patch 10892 BLAKE2B 27f52fd33ddcf9d64aecf40105413047668e538ace3efe25a87abfc3100c264515b238252b303aed43dde6ca6ddd788ada826f52ec0a0e7bc7b1e2fe47142025 SHA512 f581dfac2e2a94659751958b8c05a54eb2cfc0c23fd89dc1cf3e2a460e3079e15ee60898b5bdb6d399bdc997a82b5bb8a581f5db21cbf6830a94b6f01c443a5a
-AUX fwupd-1.8.11-empty_kernel_cmdline.patch 812 BLAKE2B 5542b3df5de628a069ab26ab53576073a2d4ef30da970061c1129883181d7adfe2fd22f18f1179e7f179a52e55126b12235478c66f3a5e921339e74a7adc34ab SHA512 317f26e6317878c8886e4adeb3a7fca4c4ca823a5f35865f11fac7a810fb5d76dd726526b496069edb7f8a6f8ae86965f07530ec751b616f63dc3e8eef30707e
-AUX fwupd-1.8.11-installed_tests.patch 11562 BLAKE2B ae49094cf8b8312fa529424c5235cd12c68d368ab9a6b5f7520351683c31f71a824d50987869858454c27f6f6868df311042785618eb9bf18e424d5ea00ff987 SHA512 a4ddfd3c36dcb2ad47c4640180c301f0244f056d6812c2c722a84e33232694fd051305fb13600bea100e2ab5f692a039091238cf24d6aa29ca9044825b7dba35
 AUX fwupd-1.8.13-installed_tests.patch 11799 BLAKE2B 7d1b5e18f27a95aabda2421a9ba2ff98ae68f74fc82b103d199fe57905fbe40d21d88c60f2a0708bd575f6ce013abda848c9d0830f2489fb88ff1810926505db SHA512 3edd59a52310a454a86470feb9b17f627def0362947788c65743e0cbbc4670b94a227080caddc1e7808fc9b63f5e045d4a0638b63ae1ff850f70db9e3b748910
 AUX fwupd-r2 308 BLAKE2B 4494e69515347569965f0966ce2fe0779a6273df18412b4f6045c6186730dc8088f85eb029347b01c22897662d9205f98871752dee99690871a39cbb26db3899 SHA512 0f5070dc73cb6e0cfad7a66781afb85c695faffd05685e9df8c9798b94d55b31c0977134015d0d5418f5815d10529d79c898ae0efb2bdf0dc9ee44b696d5fdd7
 DIST fwupd-1.8.10.tar.xz 3366400 BLAKE2B 891cade6c4a3a58d61c19ba6001d0161de046465729ebd349d04b2e2170146d2a7dc099285f60f7b1f7438d70a7792b5ff3921a2892e726cc6674f0628f9fabc SHA512 8437cdc93d553e42d33a037d14fcb09bb65b4c4d7d60add6a90c84dce0845097fe96005a1f6a9da7daf89df5b7dcd1b43a9fbba666cd18129b67ebe1c3ce7c97
-DIST fwupd-1.8.11.tar.xz 3389224 BLAKE2B d86b8776f78405384fcced78ebe1478585a4ca5127a184d357f2b8fc78f6437a58030c81f5bae672564e2a0df85d9b8512869b7eb1b82f5099bd0c4269acebc5 SHA512 f1fe648e33dc407bbb2ab438a29dee6e29ccdfa8cb6ca421b92cdfd724a3347254e6ddf35634b1e41e985558ea95166914b3fde927f61f1c0aa29800bf6ca6de
 DIST fwupd-1.8.14.tar.xz 3733176 BLAKE2B 6d17ee9ce1fb46a9d0a8a97d54f1873888635805af00a05ad365b32d48d6e58b48b52d706400067ca8cf6f6b846f6b8799c44d66ec64ab2fca5812b199ac2ac5 SHA512 80669f1c8ca60ac646f9a7aa4028edd23d1fc6853d999f60d292fabbfc81733f06b1f76a2987f0af62a739aa2cf5cc75fc40c9283fd37f4d8157f1a08df6fcd2
+DIST fwupd-1.8.15.tar.xz 3734344 BLAKE2B 1b098b98b7700e4a9322c53d1c52408e581d124822d1cc7f4a9d25cf3a9169f3596c559f7b9997930e43a9da983fb0c232674726520c9565c250e6db3e4bc0fa SHA512 c7ad249118d84dab903644975761030bcc16d65d9cd4f8d4a58399f79b30a4889cc62d502d28037d61738da7287998328e6042d29c21c5113c29bfc1ba4c0b75
 EBUILD fwupd-1.8.10.ebuild 4877 BLAKE2B 374ad7b6b8f3332a00716dcd46d9904833ef7c52e95d9e269fde77fe810ef17cfb3a76c0bff112b2831b2d80b985b1257386c092363e9e542bcb53afaac8ffc4 SHA512 b1435e3079eae1f76433511b13473fc72665c09b095d21ddba889178ea636ffa53f30f5e8055db3f8c33149af7041e9741aa89d4a2c87aaf60a124253837afdd
-EBUILD fwupd-1.8.11-r1.ebuild 4865 BLAKE2B c654e52b393d0772c96977ce6ba8ca3da83be3738e00e7c7c3475d51bf8c1173e18b2c69da31570e13bbb4d754c55baf92fa43cfb52b217e8471d82da8cca82e SHA512 c0aa1a103ce2f59789bd32e1859daae68e7c42fb589f2f63e980c2f6db9420a3e12096eb9522c9fbc32b2853ec028c951c4882016d81170c6866f6634dd611e6
 EBUILD fwupd-1.8.14.ebuild 4810 BLAKE2B eda66e330abc30b2a7dab73a15b5778326e54cde68da66d1c9dbaa0458059223b34ef5f3a1e18f20c5eb32a73ad6958d9463c361c8ef3f02503b2e05d97ceb43 SHA512 dd8cb5e60205fe0fc8664b39d629f24766070bad9800cb8f4eaba0668a62a9b3cadba3b9a13e9fd54e21d2c78603f1a62453b9b41e5e19e938a9ec50dc63795c
+EBUILD fwupd-1.8.15.ebuild 4810 BLAKE2B eda66e330abc30b2a7dab73a15b5778326e54cde68da66d1c9dbaa0458059223b34ef5f3a1e18f20c5eb32a73ad6958d9463c361c8ef3f02503b2e05d97ceb43 SHA512 dd8cb5e60205fe0fc8664b39d629f24766070bad9800cb8f4eaba0668a62a9b3cadba3b9a13e9fd54e21d2c78603f1a62453b9b41e5e19e938a9ec50dc63795c
 MISC metadata.xml 1466 BLAKE2B ac548631c37c846437843bb6711add698a211637e273bace245f1f062eea1563e10c6918a9688a67ad3941e0e63bae22570599a29477aadf770430bd4abda126 SHA512 10b8bdaed532227e36a8a83ab0357e8964aeceadee3f045e0d4c90420acf68f370c08588a746e98efe386d2482bfabbf36db72371f4fe4e12fff187c734e79de
diff --git a/sys-apps/fwupd/files/fwupd-1.8.11-empty_kernel_cmdline.patch b/sys-apps/fwupd/files/fwupd-1.8.11-empty_kernel_cmdline.patch
deleted file mode 100644
index 42d5915397b8..000000000000
--- a/sys-apps/fwupd/files/fwupd-1.8.11-empty_kernel_cmdline.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-From 7e502cf7d3da00a978201455f3a3799ae4aded75 Mon Sep 17 00:00:00 2001
-From: Richard Hughes <richard@hughsie.com>
-Date: Mon, 6 Mar 2023 16:56:05 +0000
-Subject: [PATCH] Fix a critical warning when parsing an empty kernel cmdline
-
-Fix the bounds check so we never pass a bufsz of zero to fu_strsplit().
-
-Resolves: https://github.com/fwupd/fwupd/issues/5575
---- a/libfwupdplugin/fu-kernel.c
-+++ b/libfwupdplugin/fu-kernel.c
-@@ -253,7 +253,7 @@ fu_kernel_get_cmdline(GError **error)
- 	if (!g_file_get_contents("/proc/cmdline", &buf, &bufsz, error))
- 		return NULL;
- 	hash = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free);
--	if (bufsz > 0) {
-+	if (bufsz > 1) {
- 		g_auto(GStrv) tokens = fu_strsplit(buf, bufsz - 1, " ", -1);
- 		for (guint i = 0; tokens[i] != NULL; i++) {
- 			g_auto(GStrv) kv = NULL;
diff --git a/sys-apps/fwupd/files/fwupd-1.8.11-installed_tests.patch b/sys-apps/fwupd/files/fwupd-1.8.11-installed_tests.patch
deleted file mode 100644
index 819b6799ebdf..000000000000
--- a/sys-apps/fwupd/files/fwupd-1.8.11-installed_tests.patch
+++ /dev/null
@@ -1,406 +0,0 @@
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -10,20 +10,10 @@
-   subdir('fish-completion')
- endif
- 
--if get_option('tests')
--subdir('device-tests')
--endif
--
- if build_daemon
- subdir('motd')
- endif
- 
--if get_option('tests')
--  if build_daemon
--    subdir('installed-tests')
--  endif
--endif
--
- if build_standalone
-   install_data(['daemon.conf'],
-     install_dir: join_paths(sysconfdir, 'fwupd')
---- a/libfwupdplugin/meson.build
-+++ b/libfwupdplugin/meson.build
-@@ -370,6 +370,7 @@
-   )
-   test('fwupdplugin-self-test', e, is_parallel: false, timeout: 180, env: env)
- 
-+  if false
-   install_data([
-       'tests/chassis_type',
-       'tests/sys_vendor',
-@@ -388,6 +389,7 @@
-     ],
-     install_dir: join_paths(installed_test_datadir, 'tests/dmi/tables64'),
-   )
-+  endif
- endif
- 
- fwupdplugin_incdir = include_directories('.')
---- a/libfwupdplugin/tests/meson.build
-+++ b/libfwupdplugin/tests/meson.build
-@@ -10,6 +10,5 @@
-   command: [
-     python3, '-m', 'zipfile', '-c', '@OUTPUT@', '@INPUT@',
-   ],
--  install: true,
-   install_dir: installed_test_datadir,
- )
---- a/plugins/acpi-dmar/meson.build
-+++ b/plugins/acpi-dmar/meson.build
-@@ -28,7 +28,6 @@
-       plugin_libs,
-       plugin_builtin_acpi_dmar,
-     ],
--    install: true,
-     install_rpath: libdir_pkg,
-     install_dir: installed_test_bindir,
-   )
---- a/plugins/acpi-facp/meson.build
-+++ b/plugins/acpi-facp/meson.build
-@@ -28,7 +28,6 @@
-       plugin_libs,
-       plugin_builtin_acpi_facp,
-     ],
--    install: true,
-     install_rpath: libdir_pkg,
-     install_dir: installed_test_bindir,
-   )
---- a/plugins/acpi-ivrs/meson.build
-+++ b/plugins/acpi-ivrs/meson.build
-@@ -28,7 +28,6 @@
-       plugin_libs,
-       plugin_builtin_acpi_ivrs,
-     ],
--    install: true,
-     install_rpath: libdir_pkg,
-     install_dir: installed_test_bindir,
-   )
---- a/plugins/acpi-phat/meson.build
-+++ b/plugins/acpi-phat/meson.build
-@@ -31,7 +31,6 @@
-       plugin_libs,
-       plugin_builtin_acpi_phat,
-     ],
--    install: true,
-     install_rpath: libdir_pkg,
-     install_dir: installed_test_bindir,
-   )
---- a/plugins/ata/meson.build
-+++ b/plugins/ata/meson.build
-@@ -33,7 +33,6 @@
-       plugin_libs,
-       plugin_builtin_ata,
-     ],
--    install: true,
-     install_rpath: libdir_pkg,
-     install_dir: installed_test_bindir,
-   )
---- a/plugins/bcm57xx/meson.build
-+++ b/plugins/bcm57xx/meson.build
-@@ -25,8 +25,6 @@
- plugin_builtins += plugin_builtin_bcm57xx
- 
- if get_option('tests')
--  install_data(['tests/bcm57xx.builder.xml'],
--    install_dir: join_paths(installed_test_datadir, 'tests'))
-   env = environment()
-   env.set('G_TEST_SRCDIR', meson.current_source_dir())
-   env.set('G_TEST_BUILDDIR', meson.current_build_dir())
-@@ -41,7 +39,6 @@
-       plugin_libs,
-       plugin_builtin_bcm57xx,
-     ],
--    install: true,
-     install_rpath: libdir_pkg,
-     install_dir: installed_test_bindir,
-   )
---- a/plugins/ccgx/meson.build
-+++ b/plugins/ccgx/meson.build
-@@ -29,8 +29,6 @@
- plugin_builtins += plugin_builtin_ccgx
- 
- if get_option('tests')
--  install_data(['tests/ccgx.builder.xml', 'tests/ccgx-dmc.builder.xml'],
--    install_dir: join_paths(installed_test_datadir, 'tests'))
-   env = environment()
-   env.set('G_TEST_SRCDIR', meson.current_source_dir())
-   env.set('G_TEST_BUILDDIR', meson.current_build_dir())
-@@ -45,7 +43,6 @@
-       plugin_libs,
-       plugin_builtin_ccgx,
-     ],
--    install: true,
-     install_rpath: libdir_pkg,
-     install_dir: installed_test_bindir,
-   )
---- a/plugins/dfu/meson.build
-+++ b/plugins/dfu/meson.build
-@@ -70,7 +70,6 @@
-       plugin_libs,
-       plugin_builtin_dfu,
-     ],
--    install: true,
-     install_rpath: libdir_pkg,
-     install_dir: installed_test_bindir,
-   )
---- a/plugins/elantp/meson.build
-+++ b/plugins/elantp/meson.build
-@@ -22,8 +22,6 @@
- plugin_builtins += plugin_builtin_elantp
- 
- if get_option('tests')
--  install_data(['tests/elantp.builder.xml'],
--    install_dir: join_paths(installed_test_datadir, 'tests'))
-   env = environment()
-   env.set('G_TEST_SRCDIR', meson.current_source_dir())
-   env.set('G_TEST_BUILDDIR', meson.current_build_dir())
-@@ -38,7 +36,6 @@
-       plugin_libs,
-       plugin_builtin_elantp,
-     ],
--    install: true,
-     install_rpath: libdir_pkg,
-     install_dir: installed_test_bindir,
-   )
---- a/plugins/linux-swap/meson.build
-+++ b/plugins/linux-swap/meson.build
-@@ -28,7 +28,6 @@
-       plugin_libs,
-       plugin_builtin_linux_swap,
-     ],
--    install: true,
-     install_rpath: libdir_pkg,
-     install_dir: installed_test_bindir,
-   )
---- a/plugins/mtd/meson.build
-+++ b/plugins/mtd/meson.build
-@@ -30,7 +30,6 @@
-       plugin_libs,
-       plugin_builtin_mtd,
-     ],
--    install: true,
-     install_rpath: libdir_pkg,
-     install_dir: installed_test_bindir,
-   )
---- a/plugins/nitrokey/meson.build
-+++ b/plugins/nitrokey/meson.build
-@@ -33,7 +33,6 @@
-       plugin_libs,
-       plugin_builtin_nitrokey,
-     ],
--    install: true,
-     install_rpath: libdir_pkg,
-     install_dir: installed_test_bindir,
-   )
---- a/plugins/nvme/meson.build
-+++ b/plugins/nvme/meson.build
-@@ -38,7 +38,6 @@
-       plugin_libs,
-       plugin_builtin_nvme,
-     ],
--    install: true,
-     install_rpath: libdir_pkg,
-     install_dir: installed_test_bindir,
-   )
---- a/plugins/pixart-rf/meson.build
-+++ b/plugins/pixart-rf/meson.build
-@@ -19,8 +19,6 @@
- plugin_builtins += plugin_builtin_pxi
- 
- if get_option('tests')
--  install_data(['tests/pixart.builder.xml'],
--    install_dir: join_paths(installed_test_datadir, 'tests'))
-   env = environment()
-   env.set('G_TEST_SRCDIR', meson.current_source_dir())
-   env.set('G_TEST_BUILDDIR', meson.current_build_dir())
-@@ -35,7 +33,6 @@
-       plugin_libs,
-       plugin_builtin_pxi,
-     ],
--    install: true,
-     install_rpath: libdir_pkg,
-     install_dir: installed_test_bindir,
-   )
---- a/plugins/redfish/meson.build
-+++ b/plugins/redfish/meson.build
-@@ -40,16 +40,6 @@
- )
- 
- if get_option('tests')
--  install_data(['tests/redfish-smbios.bin'],
--    install_dir: join_paths(installed_test_datadir, 'tests'))
--  install_data(['tests/redfish.conf'],
--    install_dir: join_paths(installed_test_datadir, 'tests'),
--    install_mode: 'rw-r-----',
--  )
--  install_data(['tests/efi/efivars/RedfishIndications-16faa37e-4b6a-4891-9028-242de65a3b70'],
--    install_dir: join_paths(installed_test_datadir, 'tests', 'efi', 'efivars'))
--  install_data(['tests/efi/efivars/RedfishOSCredentials-16faa37e-4b6a-4891-9028-242de65a3b70'],
--    install_dir: join_paths(installed_test_datadir, 'tests', 'efi', 'efivars'))
-   env = environment()
-   env.set('G_TEST_SRCDIR', meson.current_source_dir())
-   env.set('G_TEST_BUILDDIR', meson.current_build_dir())
-@@ -70,7 +60,6 @@
-       fwupdplugin,
-       plugin_builtin_redfish,
-     ],
--    install: true,
-     install_rpath: libdir_pkg,
-     install_dir: installed_test_bindir,
-   )
---- a/plugins/synaptics-mst/meson.build
-+++ b/plugins/synaptics-mst/meson.build
-@@ -22,8 +22,6 @@
- plugin_builtins += plugin_builtin_synaptics_mst
- 
- if get_option('tests')
--  install_data(['tests/synaptics-mst.builder.xml'],
--    install_dir: join_paths(installed_test_datadir, 'tests'))
-   env = environment()
-   env.set('G_TEST_SRCDIR', meson.current_source_dir())
-   env.set('G_TEST_BUILDDIR', meson.current_build_dir())
-@@ -47,7 +45,6 @@
-     c_args: [
-       cargs,
-     ],
--    install: true,
-     install_rpath: libdir_pkg,
-     install_dir: installed_test_bindir,
-   )
---- a/plugins/synaptics-prometheus/meson.build
-+++ b/plugins/synaptics-prometheus/meson.build
-@@ -18,8 +18,6 @@
- plugin_builtins += plugin_builtin_synaprom
- 
- if get_option('tests')
--  install_data(['tests/synaptics-prometheus.builder.xml'],
--    install_dir: join_paths(installed_test_datadir, 'tests'))
-   env = environment()
-   env.set('G_TEST_SRCDIR', meson.current_source_dir())
-   env.set('G_TEST_BUILDDIR', meson.current_build_dir())
-@@ -35,7 +33,6 @@
-       plugin_builtin_synaprom,
-     ],
-     c_args: cargs,
--    install: true,
-     install_rpath: libdir_pkg,
-     install_dir: installed_test_bindir,
-   )
---- a/plugins/synaptics-rmi/meson.build
-+++ b/plugins/synaptics-rmi/meson.build
-@@ -25,8 +25,6 @@
- plugin_builtins += plugin_builtin_synaptics_rmi
- 
- if get_option('tests')
--  install_data(['tests/synaptics-rmi-0x.builder.xml','tests/synaptics-rmi-10.builder.xml'],
--    install_dir: join_paths(installed_test_datadir, 'tests'))
-   env = environment()
-   env.set('G_TEST_SRCDIR', meson.current_source_dir())
-   env.set('G_TEST_BUILDDIR', meson.current_build_dir())
-@@ -41,7 +39,6 @@
-       plugin_libs,
-       plugin_builtin_synaptics_rmi,
-     ],
--    install: true,
-     install_rpath: libdir_pkg,
-     install_dir: installed_test_bindir,
-   )
---- a/plugins/uefi-capsule/meson.build
-+++ b/plugins/uefi-capsule/meson.build
-@@ -146,25 +146,6 @@
-     c_args: cargs
-   )
-   test('uefi-self-test', e, env: env)
--
--# to use these do `sudo systemctl edit fwupd.service` and set
--# Environment="FWUPD_SYSFSFWDIR=/usr/share/installed-tests/fwupd"
--install_data([
--    'tests/efi/esrt/entries/entry0/capsule_flags',
--    'tests/efi/esrt/entries/entry0/fw_class',
--    'tests/efi/esrt/entries/entry0/fw_type',
--    'tests/efi/esrt/entries/entry0/fw_version',
--    'tests/efi/esrt/entries/entry0/last_attempt_status',
--    'tests/efi/esrt/entries/entry0/last_attempt_version',
--    'tests/efi/esrt/entries/entry0/lowest_supported_fw_version',
--  ],
--  install_dir: join_paths(installed_test_datadir, 'efi/esrt/entries/entry0'),
--)
--install_data([
--    'tests/efi/efivars/CapsuleMax-39b68c46-f7fb-441b-b6ec-16b0f69821f3',
--  ],
--  install_dir: join_paths(installed_test_datadir, 'efi/efivars'),
--)
- endif
- 
- endif
---- a/plugins/uefi-dbx/meson.build
-+++ b/plugins/uefi-dbx/meson.build
-@@ -32,7 +32,6 @@
-       plugin_builtin_uefi_dbx,
-     ],
-     c_args: cargs,
--    install: true,
-     install_rpath: libdir_pkg,
-     install_dir: installed_test_bindir,
-   )
---- a/plugins/uf2/meson.build
-+++ b/plugins/uf2/meson.build
-@@ -18,8 +18,6 @@
- plugin_builtins += plugin_builtin_uf2
- 
- if get_option('tests')
--  install_data(['tests/uf2.builder.xml'],
--    install_dir: join_paths(installed_test_datadir, 'tests'))
-   env = environment()
-   env.set('G_TEST_SRCDIR', meson.current_source_dir())
-   env.set('G_TEST_BUILDDIR', meson.current_build_dir())
-@@ -34,7 +32,6 @@
-       plugin_libs,
-       plugin_builtin_uf2,
-     ],
--    install: true,
-     install_rpath: libdir_pkg,
-     install_dir: installed_test_bindir,
-   )
---- a/plugins/vli/meson.build
-+++ b/plugins/vli/meson.build
-@@ -49,7 +49,6 @@
-       plugin_builtin_vli,
-     ],
-     c_args: cargs,
--    install: true,
-     install_rpath: libdir_pkg,
-     install_dir: installed_test_bindir,
-   )
---- a/plugins/wacom-usb/meson.build
-+++ b/plugins/wacom-usb/meson.build
-@@ -23,8 +23,6 @@
- plugin_builtins += plugin_builtin_wac
- 
- if get_option('tests')
--  install_data(['tests/wacom-usb.builder.xml'],
--    install_dir: join_paths(installed_test_datadir, 'tests'))
-   env = environment()
-   env.set('G_TEST_SRCDIR', meson.current_source_dir())
-   env.set('G_TEST_BUILDDIR', meson.current_build_dir())
-@@ -40,7 +38,6 @@
-       plugin_builtin_wac,
-     ],
-     c_args: cargs,
--    install: true,
-     install_rpath: libdir_pkg,
-     install_dir: installed_test_bindir,
-   )
---- a/src/tests/host-emulate/meson.build
-+++ b/src/tests/host-emulate/meson.build
-@@ -8,7 +8,6 @@
-       output: '@0@.gz'.format(input_file),
-       capture: true,
-       command: [gzip, '-k', '--stdout', '@INPUT@'],
--      install: true,
-       install_dir: join_paths(datadir, 'fwupd', 'host-emulate.d'),
-     )
-   endforeach
diff --git a/sys-apps/fwupd/fwupd-1.8.11-r1.ebuild b/sys-apps/fwupd/fwupd-1.8.15.ebuild
index fa2a0075952f..0689a45a9731 100644
--- a/sys-apps/fwupd/fwupd-1.8.11-r1.ebuild
+++ b/sys-apps/fwupd/fwupd-1.8.15.ebuild
@@ -92,8 +92,7 @@ DEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.8.11-installed_tests.patch
-	"${FILESDIR}"/${PN}-1.8.11-empty_kernel_cmdline.patch
+	"${FILESDIR}"/${PN}-1.8.13-installed_tests.patch
 )
 
 src_prepare() {
diff --git a/sys-apps/memtest86+/Manifest b/sys-apps/memtest86+/Manifest
index a8d813611b03..b41991e02ab0 100644
--- a/sys-apps/memtest86+/Manifest
+++ b/sys-apps/memtest86+/Manifest
@@ -1,18 +1,7 @@
-AUX 39_memtest86+-r1 1702 BLAKE2B ba73cef5d026a242ab3e5ac54a98cf289ceedfbe174a9d2109cab785e0b0fc9b9e59aa3c80d276255cc8c18bdc3567f02e644652512e194e3c555436d42be8e3 SHA512 ef2d86bd902f44905921880c630a85d3c9763bea3b79211f64346f1f55a5f31ed0b20a80f9f0c3914de1f33b7bd7d3471762f17065183ced185de52d34f2068f
-AUX 39_memtest86+-r2 3529 BLAKE2B 8af086ab34f99b8307571f1ca4820e8dbcdfe0393d0be1c9b4aa6e44690b03ea23d418aba4cb11f1d099c5b0932942d08857eefa998984bc07dd1985dccbf891 SHA512 0e9c485699a8fcd777b40ae6d366878826608d10b2668bbc6b0b28a91f43a44882bc10c95a2103c573a85a95c1bf6f41e2eb65a3bd2d146d621f987eede2c278
-AUX make-memtest86+-boot-floppy 2499 BLAKE2B 1076e5d3e3a139c46c684f7ed29658cd815525e56fae03eb4dd1e36fda0c751a1aa78c891d040aeee979f8b79a8b0db8453e4e26f2efd9963e7bfa10206b5c86 SHA512 28649d630c4624573a5cf4279f6207cf44707978d8a18f2c614997f641038f2da731bb5c3b26066812a5c02d926c40020e74820b1a4eb2b4732a76686c52c260
-AUX make-memtest86+-boot-floppy.1 1165 BLAKE2B 974a5c70009031517bbeaa06155a7da411ce1823ed2b7dc31a1843618058cbcd1c1a51f9c9012dddd843579b588c619c6448e65ae369ba2dc6441a991bf8d9b7 SHA512 8b5b6397e50cf4d48aeda31de4c1f72493e97db52ff45966716df8f9b0fbbd8d4ed71e289c0113ef53fa52a7ea6df4c107c63ca70f90c951dd085c05b64db147
-AUX memtest86+-5.31b-discard-note_gnu_property.patch 723 BLAKE2B 852a5daf852991cde8dec0bd777524744c5303b1966cacd0e15abad9dfea06ea3d6616ea57777bf694da2edb0e4c8b828288c69d655c0e46e27b6a6463ef787b SHA512 923c71e9d037cc0c26006a55045c9362dabf1ed3a6cf20a5b9f61661d6fe9e6dd17f17bcee47d515497a2720485f5d4d34c0f7815c483997aff123ab9d2f5239
-AUX memtest86+-5.31b-fix-gcc8-freeze-crash.patch 511 BLAKE2B 2a536d7c833f4758c9fd9c650dd98b0887610884aadab67b86c7f73cc682daca5a66052102a4db870550741a11c5da38dd0251a8f4afdd4943c452858d5dae56 SHA512 63b88c7e14c75e01291809fde47df88d323e68cc0e658921ccea600f94deafaf1a118de9b16e9303dd5b49bff205d48be5c23bc34782059d4ea112407103408b
-AUX memtest86+-5.31b-gcc-473.patch 426 BLAKE2B c7ce26466a1d0a083e9da5ce4f1d5430c43c7a1264f9edf533f82905b8dfb290fcf4a67c8cff79277bd26a59003277ef9ea8d321e8c81b0952b2d662369883de SHA512 dde40a97c6ac8aec9b19ace1ab3cedf30146b908d6f9978eb0c6d1b2589242be35e1e4710b2aaa6f2def670d00add92761e4ab763f33724aec334f5b922254c9
-AUX memtest86+-5.31b-hardcoded_cc.patch 316 BLAKE2B 9be278d20cfaeeb01a32628bb433283aa7321f57703c32b4e191e9f6ebfe0659b33f72bbe4d9bde66b64ab62fa6d590b6c57bffc7f0ce59269f4b3a5524ec81f SHA512 6b011df2926b988769da9a257b7558bbb1733d18bcd113d8b04567da23456a6c5c22f0fc72818e43888e96d188cf572673563b123fe2a12750f31633118aaafc
-AUX memtest86+-5.31b-no-clean.patch 570 BLAKE2B 99fcdc691c44b4c116878713e48ec5056f7da80355ce17ba35ca6c3eb4de2f51bb84212bdc48127b870b87bff722be8e21e08b10e1b4f691b9111c374f2a70e4 SHA512 19ef0c4af27a6382729faa6c2b9666006d053cadf3f457e62d4e21fae266e42b54eb5db87d97817a0b3e2d6bd1f41a054bf6e6a85f8acda77816c6bdaf69a59e
-AUX memtest86+-5.31b-objcopy.patch 610 BLAKE2B a7a68cefbca249a2db578fa2d1eac2095ebe35f4fba67b6b44b1a85360fdac86a154585b6776ac95ac2963c773ccfcf4e8d828b2c1736bab2741f483626b61a6 SHA512 ad55e5448e70db93a19801cb6dd7cddfd4bf52d9d11582ba00335e59906cb8ee9165b828e59a1ecd1b0ddb2a52aff7165803d69c2ad3984a18ff07f069d36ea1
-AUX memtest86+-5.31b-test-random-cflags.patch 636 BLAKE2B ab14809232dfdb0475fa8d54daca34ad53a6eee0f7ce2592acfc60a60bf0c8f08adacc82ed67ae8e7ae7faa995d9b6efa0d0ea3cf0df33f5cda1a606a7e0d987 SHA512 98965cfe1ec90f5dee115da406609cd85651e09b9914232b717a3b8755b4c10b05f58ed08c8a470b2bd772f1ef4d93faf63516f902a0b48b9c33974eba4733a1
-DIST memtest86+-5.31b.tar.gz 227779 BLAKE2B 14aced912bb84115278a3aff7650a3571918b823335aaf7d09880ef10374c320f64878765d93d2ee5a75e2b33ef6c9c4886a9a168955bd77c668f06f5c86a6ca SHA512 ad5891fd0c430ce7a5d0cde2d10dee20b66ad8060d47c3e70e038461d9cde3a78dfc13442b5b09da7c662741945a670353c72dbc08fd5ee8bae82256001a9541
+AUX 39_memtest86+-r2 3530 BLAKE2B 6c302744000a48fbda7563b48bbac5bb5e580159d74ad595f5fabd21150bd785c1792c0acbafc779a601ab7b820a0e37576c0c0967ba2de739089d2b9cfc3366 SHA512 2e28b671d77ef19958b88c73f9de5560775c3b8cfb647bd7cc480801a64bcaf2a80f750d3fdaf81b1c02364f4aa2fcb8b3ccb8eef4008c9d0619676f0490a084
 DIST memtest86+-6.10.tar.gz 230056 BLAKE2B 2462c31f1ca27aa166c447e51a9b388872faaf7f845100a122f5dd8eb11dc76e26c503dc14d0825bda397c7180a5259094a020d25dd9d43b1997bfbe424c7f65 SHA512 2fb8e6d375f7ced53b1c2d50ffeeafcee1282b2495ea4241958e210c0b4a3500701025041469459c0db1662c448a3b65a51a994d19bc8ac217e23fa935700e42
 DIST memtest86+-6.20.tar.gz 232436 BLAKE2B 6e3bea4b18049446f27da2cb1313300c578ef7fdb774b6a20df603271b66a6c0066be64a91b0a6d4ffcc63f1e139132942290a8111f6a991cccc0a5586cac966 SHA512 b12856bd6ba82dac6308bb9f611ddb16df68c3da4d00ad9abf23bcf5d3f2e5c424fc1bccedd8c0732b4c68013c421ed20c5db56c39b619bbe77c4c1f5e8504f0
-EBUILD memtest86+-5.31b-r3.ebuild 2858 BLAKE2B 47a6e5a68e77f6425b7761d5cc18378a13bc6f6b3febb2624277fa3bf24374e69265ab0c97a3854abbfa5acd96f984b2d1392acb29fb3cda37357370d57067c8 SHA512 8c8846addd0db5093b384c36a74eea8e853e66b174c7f9930d9a61abc71c41cdaf5e1967b01eaad77af68a4f81b7687517e0b23e26f26cd11ae104da0c49e881
 EBUILD memtest86+-6.10.ebuild 1733 BLAKE2B 0cc7eef2f79cb4923a9853c8d80e0f253dd34b8fc5850a246de754420a3053ab0b6c00e85c0b95563dc09aacaeb625f31c4bc918747171874d89e20633299ddf SHA512 1240ecf9052cc01b39003adafb2e97d84227c959b62556be0455b8cd4ad38584154f486a1d56c7799295091f1a67ba858134c73dbe28cf3a14c5acb4a87d60a7
+EBUILD memtest86+-6.20-r1.ebuild 1895 BLAKE2B 9023ad708a51ea30ba7d10ba0953608459ef91e4ed266902b3d1cb56a8bba53cb489d264f9f53fcc0daff53fd7dee3e815898c6f390f6a918d3d5585787fad97 SHA512 393ad0d265f301296f36bdc466787473acd8ef4cb4c71a8bbcf24229286e02a1e6035084ea9fc71cba9c76e5004daaf3d2eb798b7fdd83643ea90b0cf6b523cf
 EBUILD memtest86+-6.20.ebuild 1735 BLAKE2B c714b91e5e8b1aa7061cf55dd24ed5e1e0ce6fa888fdac3b717259705de15e2a2e4056fa9336c57194bbed5401a5b242da49f8b64ca60f1ba2c554ccd491ef01 SHA512 07bf4e1c1109258536f83683399fc4046a0bf105a760f408ab18c6c4c988606720e6fc92d256b73cb76b9ed24a5636ac0e9af7c86f4fc2a80481385f29906853
-MISC metadata.xml 1033 BLAKE2B 1de0b3113db89962f9566a73eb6aae90d5faf62502910020292a72baaf2a068f03866db231e9b927ea484b20606b726c417f8a8882ba0eae0e82352f8b76a1ed SHA512 6f45ad3578993ffb1e6ec76075b2d3047a9a69f8893e30dbe6a7fe6345d25b3a448495a3374c369c948e1d01d7fbde1e667507d8aeb5273513a0898d1715942e
+MISC metadata.xml 817 BLAKE2B 86125269ad6d6292102fb52af0ed6b4ac2a8f9a021d2a91d1efb8a37c7e9aaa386ff303140bff66ab02eb2c70b7d2266202667855fcf219ef279e2f10ed29b81 SHA512 e6bbf1204f7a150097aa1794da810076e8f84458a1648516a10a877dc529fe06bd58ab57ae7873b6c6b89d1932a43d193da42b41135e222d6758665fab2b28db
diff --git a/sys-apps/memtest86+/files/39_memtest86+-r1 b/sys-apps/memtest86+/files/39_memtest86+-r1
deleted file mode 100644
index 20422b74d65a..000000000000
--- a/sys-apps/memtest86+/files/39_memtest86+-r1
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/bin/sh
-
-. /usr/share/grub/grub-mkconfig_lib
-
-memtest=/boot/memtest86plus/memtest.bin
-
-memtestelf=/boot/memtest86plus/memtest
-
-if [ -f "${memtest}" ] && [ -f "${memtestelf}" ]; then
-	multiple_memtest=true
-fi
-
-submenu_indentation=""
-if [ "${multiple_memtest}" = "true" ] && [ "${GRUB_DISABLE_SUBMENU}" != "y" ]; then
-	submenu_indentation="${grub_tab}"
-	cat <<EOF
-submenu 'Memtest86+' {
-EOF
-fi
-
-if [ -f "${memtest}" ]; then
-	gettext_printf "Found memtest image: %s\n" "${memtest}" >&2
-
-	device="$("${grub_probe}" --target=device "${memtest}")"
-	path="$(make_system_path_relative_to_its_root "${memtest}")"
-	cat <<EOF
-${submenu_indentation}menuentry 'Memtest86+' {
-EOF
-
-	if [ -n "{submenu_indentation}" ]; then
-		prepare_grub_to_access_device "${device}" | grub_add_tab | grub_add_tab
-	else
-		prepare_grub_to_access_device "${device}" | grub_add_tab
-	fi
-
-	cat <<EOF
-	${submenu_indentation}linux16 "${path}"
-${submenu_indentation}}
-EOF
-fi
-
-if [ -f "${memtestelf}" ]; then
-	gettext_printf "Found memtest image: %s\n" "${memtestelf}" >&2
-
-	device="$("${grub_probe}" --target=device "${memtestelf}")"
-	path="$(make_system_path_relative_to_its_root "${memtestelf}")"
-	cat <<EOF
-${submenu_indentation}menuentry 'Memtest86+ (ELF)' {
-EOF
-
-	if [ -n "${submenu_indentation}" ]; then
-		prepare_grub_to_access_device "${device}" | grub_add_tab | grub_add_tab
-	else
-		prepare_grub_to_access_device "${device}" | grub_add_tab
-	fi
-
-	# We use knetbsd as a lazy way of booting an ELF.
-	# It's not actually related to NetBSD at all.
-	cat <<EOF
-	${submenu_indentation}knetbsd "${path}"
-${submenu_indentation}}
-EOF
-fi
-
-if [ "${multiple_memtest}" = "true" ] && [ "${GRUB_DISABLE_SUBMENU}" != "y" ]; then
-	cat <<EOF
-}
-EOF
-fi
diff --git a/sys-apps/memtest86+/files/39_memtest86+-r2 b/sys-apps/memtest86+/files/39_memtest86+-r2
index a213e0325609..d53f83cc311a 100644
--- a/sys-apps/memtest86+/files/39_memtest86+-r2
+++ b/sys-apps/memtest86+/files/39_memtest86+-r2
@@ -30,7 +30,7 @@ ${submenu_indentation}if [ "x\$grub_platform" = xpc ]; then
 ${submenu_indentation}menuentry 'Memtest86+ 32bit' {
 EOF
 
-	if [ -n "{submenu_indentation}" ]; then
+	if [ -n "${submenu_indentation}" ]; then
 		prepare_grub_to_access_device "${device}" | grub_add_tab | grub_add_tab
 	else
 		prepare_grub_to_access_device "${device}" | grub_add_tab
diff --git a/sys-apps/memtest86+/files/make-memtest86+-boot-floppy b/sys-apps/memtest86+/files/make-memtest86+-boot-floppy
deleted file mode 100644
index 9c225c740bf4..000000000000
--- a/sys-apps/memtest86+/files/make-memtest86+-boot-floppy
+++ /dev/null
@@ -1,111 +0,0 @@
-#!/bin/sh
-#
-# Script for making a memtest86 boot floppy using GRUB as bootloader
-#
-
-# (c) 2003 Peter Loje Hansen <pl@2m.dk>
-#  - original version
-# (c) 2004 Yann Dirson <dirson@debian.org>
-#  - added parameters
-#  - ability to work on a floppy image instead of a real floppy
-#  - adapted patches from Martin Koeppe <martin@koeppe-net.de>, to use
-#    mtools and install full grub
-
-# TODO:
-# - add a flag to generate a default boot entry for (hd0)
-
-set -e
-
-MEMTEST=/boot/memtest86plus/memtest.bin
-FLOPPYIMAGE=/dev/fd0
-GRUBBIN=/sbin/grub
-GRUBLIB=/lib/grub
-MFORMAT=/usr/bin/mformat
-
-arch=$(uname -m)
-
-case "$arch" in
-	i386|i486|i686)		GRUBARCH=i386-pc;;
-	x86_64)				GRUBARCH=x86_64-pc;;
-	*)					error "Unsupported architecture: $arch";;
-esac
-
-error()
-{
-    echo >&2 "$0: $*"
-    exit 1
-}
-
-needsarg()
-{
-    [ $1 -ge 2 ] || error "syntax error"
-}
-
-[ -d $GRUBLIB ] || error "Can't find $GRUBLIB - did you install a recent grub package (0.95+cvs20040624 or later) ?"
-[ -x $MFORMAT ] || error "Can't find mformat - did you install the mtools package ?"
-
-while [ $# -gt 0 ]
-do
-    case "$1" in
-    --help) echo "$0 [--memtest $MEMTEST] [--floppyimage $FLOPPYIMAGE]"; exit 0 ;;
-    --memtest) needsarg $#; MEMTEST="$2"; shift ;;
-    --floppyimage) needsarg $#; FLOPPYIMAGE="$2"; shift ;;
-    *) error "syntax error" ;;
-    esac
-    shift
-done
-
-MOUNTPOINT=$(mktemp -d)
-
-if [ -b "$FLOPPYIMAGE" ]
-then
-    FINALDEV="$FLOPPYIMAGE"
-    FLOPPYIMAGE="$(mktemp)"
-else
-    FINALDEV=""
-fi
-
-echo "* Creating msdos file system"
-echo
-if [ ! -s "$FLOPPYIMAGE" ]; then
-    # unless a non-empty image exists, create a blank one first
-    dd bs=1024 count=1440 if=/dev/zero of="$FLOPPYIMAGE"
-fi
-# FIXME: "-f 1440" should probably be dropped
-mformat -i $FLOPPYIMAGE -f 1440 :: 
-
-mmd -i $FLOPPYIMAGE ::/boot 
-mmd -i $FLOPPYIMAGE ::/boot/grub 
-
-echo
-echo "* Installing GRUB files"
-mcopy -v -i "$FLOPPYIMAGE" - ::/boot/grub/menu.lst <<EOF
-color green/black light-green/black
-default 0
-timeout 10
-title  memtest
-kernel (fd0)/boot/memtest.bin
-EOF
-mcopy -v -i "$FLOPPYIMAGE" $GRUBLIB/$GRUBARCH/* ::/boot/grub 
-
-echo
-echo "* Installing $MEMTEST"
-mcopy -v -i "$FLOPPYIMAGE" "$MEMTEST" ::/boot/memtest.bin 
-
-echo
-echo -n "* Installing GRUB"
-$GRUBBIN --batch --device-map=/dev/null <<EOF
-device (fd0) $FLOPPYIMAGE
-root (fd0)
-setup (fd0)
-quit
-EOF
-
-if [ -n "$FINALDEV" ]; then
-    echo
-    echo "Insert a writable floppy for $FINALDEV and press enter"
-    read FOO
-
-    dd bs=1024 if="$FLOPPYIMAGE" of="$FINALDEV"
-    rm "$FLOPPYIMAGE"
-fi
diff --git a/sys-apps/memtest86+/files/make-memtest86+-boot-floppy.1 b/sys-apps/memtest86+/files/make-memtest86+-boot-floppy.1
deleted file mode 100644
index e1283e5efc8f..000000000000
--- a/sys-apps/memtest86+/files/make-memtest86+-boot-floppy.1
+++ /dev/null
@@ -1,39 +0,0 @@
-.\" Man page for make-memtest86+-boot-floppy 
-
-.TH make-memtest86+-boot-floppy 1
-
-.SH NAME
-make-memtest86+-boot-floppy \- create a memtest86+ boot-floppy using GRUB.
-
-.SH SYNOPSIS
-
-.B make-memtest86+-boot-floppy [ \-\-memtest 
-.I <path to memtest86+-image>
-.B ] [ \-\-floppyimage 
-.I <path to floppyimage/device>
-.B ]
-
-.SH DESCRIPTION
-.B make-memtest86+-boot-floppy
-can create a memtest86+ boot floppy using GRUB as the bootloader.
-
-.SH OPTIONS
-
-.IP "\-\-memtest <path to the memtest-image>"
-Path to the memtest86+-image, default is /boot/memtest86+.bin.
-
-.IP "\-\-floppyimage <path to the floppyimage or device>"
-File or device where the boot-image should be written to, default is /dev/fd0.
-
-.IP "\-\-help" 
-Display a short message about the options of the tool.
-
-.SH AUTHOR
-This man-page has been written by Thomas Schmidt <thomas@thsnet.de>
-.PP
-Permission is granted to copy, distribute and/or modify this document under
-the terms of the GNU General Public License, Version 2 any
-later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public
-License can be found in /usr/share/common\-licenses/GPL.
diff --git a/sys-apps/memtest86+/files/memtest86+-5.31b-discard-note_gnu_property.patch b/sys-apps/memtest86+/files/memtest86+-5.31b-discard-note_gnu_property.patch
deleted file mode 100644
index e24ad4318f37..000000000000
--- a/sys-apps/memtest86+/files/memtest86+-5.31b-discard-note_gnu_property.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/Makefile	2021-12-04 15:15:45.845429722 +0100
-+++ b/Makefile	2021-12-04 15:22:51.924755794 +0100
-@@ -11,9 +11,9 @@
- OBJCOPY=objcopy
- 
- CFLAGS= -Wall -Werror -march=i486 -m32 -O0 -fomit-frame-pointer -fno-builtin \
-- -ffreestanding -fPIC $(SMP_FL) -fno-stack-protector
-+ -ffreestanding -fPIC $(SMP_FL) -fno-stack-protector -Wa,-mx86-used-note=no
- CPPFLAGS= -m32
--ASFLAGS= -32
-+ASFLAGS= -32 -mx86-used-note=no
- 
- SELF_TEST_CFLAGS = -Wall -Werror -march=i486 -m32 -O1 -g
- 
---- a/memtest.bin.lds	2020-04-12 17:14:51.000000000 +0200
-+++ b/memtest.bin.lds	2021-12-04 14:54:33.178625382 +0100
-@@ -11,5 +11,6 @@
- 		*(.data) 
- 		_end = . ;
- 	}
-+	/DISCARD/ : { *(.note.gnu.property) }
- 	_syssize = (_end - _start + 15) >> 4;
- }
diff --git a/sys-apps/memtest86+/files/memtest86+-5.31b-fix-gcc8-freeze-crash.patch b/sys-apps/memtest86+/files/memtest86+-5.31b-fix-gcc8-freeze-crash.patch
deleted file mode 100644
index 44d11b76b344..000000000000
--- a/sys-apps/memtest86+/files/memtest86+-5.31b-fix-gcc8-freeze-crash.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur memtest86+-5.31b/Makefile memtest86+-5.31b.new/Makefile
---- memtest86+-5.31b/Makefile	2021-09-16 09:27:24.401570971 -0500
-+++ memtest86+-5.31b.new/Makefile	2021-09-16 09:30:24.332704245 -0500
-@@ -64,6 +64,9 @@
- memsize.o: memsize.c
- 	$(CC) -Wall -Werror -march=i486 -m32 -O0 -fomit-frame-pointer -fno-builtin -ffreestanding -fPIC $(SMP_FL) -fno-stack-protector   -c -o memsize.o memsize.c
- 
-+test.o: test.c
-+test.o: CFLAGS += -fno-strict-overflow
-+
- random.o: random.c
- random.o: CFLAGS += -O3 -fno-PIC
\ No newline at end of file
diff --git a/sys-apps/memtest86+/files/memtest86+-5.31b-gcc-473.patch b/sys-apps/memtest86+/files/memtest86+-5.31b-gcc-473.patch
deleted file mode 100644
index 76c0761512b4..000000000000
--- a/sys-apps/memtest86+/files/memtest86+-5.31b-gcc-473.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-http://forum.canardpc.com/threads/110950-fix-controller-loop-error
-
---- a/Makefile
-+++ b/Makefile
-@@ -12,7 +12,7 @@ FDISK=/dev/fd0
- AS=as -32
- CC=gcc
- 
--CFLAGS= -Wall -Werror -march=i486 -m32 -O1 -fomit-frame-pointer -fno-builtin \
-+CFLAGS= -Wall -Werror -march=i486 -m32 -O0 -fomit-frame-pointer -fno-builtin \
-  -ffreestanding -fPIC $(SMP_FL) -fno-stack-protector
- 
- SELF_TEST_CFLAGS = -Wall -Werror -march=i486 -m32 -O1 -g
diff --git a/sys-apps/memtest86+/files/memtest86+-5.31b-hardcoded_cc.patch b/sys-apps/memtest86+/files/memtest86+-5.31b-hardcoded_cc.patch
deleted file mode 100644
index 4ee174478b7b..000000000000
--- a/sys-apps/memtest86+/files/memtest86+-5.31b-hardcoded_cc.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -9,11 +9,10 @@
- #
- FDISK=/dev/fd0
- 
--AS=as -32
--CC=gcc
--
- CFLAGS= -Wall -Werror -march=i486 -m32 -O0 -fomit-frame-pointer -fno-builtin \
-  -ffreestanding -fPIC $(SMP_FL) -fno-stack-protector
-+CPPFLAGS= -m32
-+ASFLAGS= -32
- 
- SELF_TEST_CFLAGS = -Wall -Werror -march=i486 -m32 -O1 -g
- 
diff --git a/sys-apps/memtest86+/files/memtest86+-5.31b-no-clean.patch b/sys-apps/memtest86+/files/memtest86+-5.31b-no-clean.patch
deleted file mode 100644
index dbb560e506b9..000000000000
--- a/sys-apps/memtest86+/files/memtest86+-5.31b-no-clean.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-http://forum.canardpc.com/threads/110954-PATCH-fix-parallel-build-issues
-
-
-don't run the clean target when building all as we run into parallel races:
- - memtest kicks off building of a bunch of .o files
- - clean runs in parallel which runs `rm` and deletes some of the new .o
- - memtest goes to link and fails because objects are missing
-
---- a/Makefile
-+++ b/Makefile
-@@ -22,7 +22,7 @@
- 
- SELF_TEST_OBJS = test.o self_test.o cpuid.o random.o
- 
--all: clean memtest.bin memtest
-+all: memtest.bin memtest
- 
- run_self_test : self_test
- 	./self_test && touch run_self_test
diff --git a/sys-apps/memtest86+/files/memtest86+-5.31b-objcopy.patch b/sys-apps/memtest86+/files/memtest86+-5.31b-objcopy.patch
deleted file mode 100644
index 9398c4163a4d..000000000000
--- a/sys-apps/memtest86+/files/memtest86+-5.31b-objcopy.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Allow 'objcopy' override with user's OBJCOPY.
-
---- a/Makefile
-+++ b/Makefile
-@@ -8,6 +8,7 @@
- # Path for the floppy disk device
- #
- FDISK=/dev/fd0
-+OBJCOPY=objcopy
- 
- CFLAGS= -Wall -Werror -march=i486 -m32 -O0 -fomit-frame-pointer -fno-builtin \
-  -ffreestanding -fPIC $(SMP_FL) -fno-stack-protector
-@@ -36,7 +37,7 @@
- 	$(LD) -shared -Bsymbolic -T memtest_shared.lds -o $@ $(OBJS)
- 
- memtest_shared.bin: memtest_shared
--	objcopy -O binary $< memtest_shared.bin
-+	$(OBJCOPY) -O binary $< memtest_shared.bin
- 
- memtest: memtest_shared.bin memtest.lds
- 	$(LD) -s -T memtest.lds -b binary memtest_shared.bin -o $@
diff --git a/sys-apps/memtest86+/files/memtest86+-5.31b-test-random-cflags.patch b/sys-apps/memtest86+/files/memtest86+-5.31b-test-random-cflags.patch
deleted file mode 100644
index f3faf1392b3a..000000000000
--- a/sys-apps/memtest86+/files/memtest86+-5.31b-test-random-cflags.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-make sure we re-use the existing CFLAGS settings so that we get all the right
-flags (like -fno-stack-protector).  just append the few changes we want (the
-optimization levels).
-
-https://bugs.gentoo.org/590974
-
---- a/Makefile
-+++ b/Makefile
-@@ -65,7 +65,7 @@
- 	$(CC) -Wall -Werror -march=i486 -m32 -O0 -fomit-frame-pointer -fno-builtin -ffreestanding -fPIC $(SMP_FL) -fno-stack-protector   -c -o memsize.o memsize.c
- 
- random.o: random.c
--	$(CC) -c -Wall -march=i486 -m32 -O3 -fomit-frame-pointer -fno-builtin -ffreestanding random.c
-+random.o: CFLAGS += -O3 -fno-PIC
- 
- clean:
- 	rm -f *.o *.s *.iso memtest.bin memtest memtest_shared \
diff --git a/sys-apps/memtest86+/memtest86+-5.31b-r3.ebuild b/sys-apps/memtest86+/memtest86+-5.31b-r3.ebuild
deleted file mode 100644
index 77e7831ed564..000000000000
--- a/sys-apps/memtest86+/memtest86+-5.31b-r3.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit mount-boot toolchain-funcs
-
-DESCRIPTION="Memory tester based on memtest86"
-HOMEPAGE="http://www.memtest.org/"
-SRC_URI="http://www.memtest.org/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE="+boot floppy iso serial"
-
-BOOTDIR="/boot/memtest86plus"
-QA_PRESTRIPPED="${BOOTDIR#/}/memtest usr/share/${PN}/memtest"
-QA_FLAGS_IGNORED="${BOOTDIR#/}/memtest usr/share/${PN}/memtest"
-
-RDEPEND="floppy? ( sys-fs/mtools )"
-DEPEND="${RDEPEND}"
-BDEPEND="iso? ( app-cdr/cdrtools )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-gcc-473.patch"
-	"${FILESDIR}/${P}-hardcoded_cc.patch"
-	"${FILESDIR}/${P}-no-clean.patch" #557890
-	"${FILESDIR}/${P}-objcopy.patch"
-	"${FILESDIR}/${P}-test-random-cflags.patch" #590974
-	"${FILESDIR}/${P}-fix-gcc8-freeze-crash.patch"
-	"${FILESDIR}/${P}-discard-note_gnu_property.patch"
-)
-
-pkg_pretend() {
-	use boot && mount-boot_pkg_pretend
-}
-
-src_prepare() {
-	sed -i -e 's,0x10000,0x100000,' memtest.lds || die
-	sed -i 's:genisoimage:mkisofs:' makeiso.sh || die
-
-	if use serial ; then
-		sed -i -e '/^#define SERIAL_CONSOLE_DEFAULT/s:0:1:' \
-			config.h || die "sed failed"
-	fi
-	#613196
-	use amd64 && sed -i -e's,$(LD) -s -T memtest.lds,$(LD) -s -T memtest.lds -z max-page-size=0x1000,' Makefile
-	default
-}
-
-src_configure() {
-	tc-ld-disable-gold #580212
-	tc-export AS CC LD
-}
-
-src_compile() {
-	emake OBJCOPY="$(tc-getOBJCOPY)"
-	if use iso ; then
-		./makeiso.sh || die
-	fi
-}
-
-src_test() { :; }
-
-src_install() {
-	if use boot ; then
-		insinto "${BOOTDIR}"
-		doins memtest memtest.bin
-	fi
-
-	insinto /usr/share/${PN}
-	use iso && newins mt*.iso memtest.iso
-	doins memtest memtest.bin
-
-	exeinto /etc/grub.d
-	newexe "${FILESDIR}"/39_${PN}-r1 39_${PN}
-
-	dodoc README README.build-process FAQ changelog
-
-	if use floppy ; then
-		dobin "${FILESDIR}"/make-memtest86+-boot-floppy
-		doman "${FILESDIR}"/make-memtest86+-boot-floppy.1
-	fi
-}
-
-pkg_preinst() {
-	use boot && mount-boot_pkg_preinst
-}
-
-pkg_postinst() {
-	if use boot; then
-		mount-boot_pkg_postinst
-
-		elog "memtest86+ has been installed in ${BOOTDIR}/"
-		elog "You may wish to update your bootloader configs:"
-		elog " - For grub2 just re-run grub-mkconfig -o /boot/grub/grub.cfg, since a"
-		elog "   config generator has been installed at /etc/grub.d/39_${PN}"
-		elog " - For lilo, add the following to /etc/lilo.conf and re-run lilo:"
-		elog "    > image  = ${BOOTDIR}/memtest.bin"
-		elog "    > label  = ${PN}"
-		elog ""
-		elog "Note: For older configs, you might have to change from 'memtest' to 'memtest.bin'."
-	fi
-
-	if use boot && [ -e /sys/firmware/efi ]; then
-		ewarn "WARNING: You appear to be booted in EFI mode but ${PN} is a BIOS-only tool."
-	fi
-}
-
-pkg_prerm() {
-	use boot && mount-boot_pkg_prerm
-}
-
-pkg_postrm() {
-	use boot && mount-boot_pkg_postrm
-}
diff --git a/sys-apps/memtest86+/memtest86+-6.20-r1.ebuild b/sys-apps/memtest86+/memtest86+-6.20-r1.ebuild
new file mode 100644
index 000000000000..3af084f4510a
--- /dev/null
+++ b/sys-apps/memtest86+/memtest86+-6.20-r1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit mount-boot toolchain-funcs
+
+MY_PV=${PV/_/-}
+
+DESCRIPTION="Memory tester based on PCMemTest"
+HOMEPAGE="https://www.memtest.org/"
+SRC_URI="https://github.com/memtest86plus/memtest86plus/archive/refs/tags/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="bios32 bios64 +boot efi32 efi64 iso32 iso64"
+
+ISODEPS="
+	dev-libs/libisoburn
+	sys-fs/dosfstools
+	sys-fs/mtools
+"
+BDEPEND="
+	iso32? ( ${ISODEPS} )
+	iso64? ( ${ISODEPS} )
+"
+
+S=${WORKDIR}/memtest86plus-${MY_PV}
+
+src_prepare() {
+	sed -i \
+		-e 's#/sbin/mkdosfs#mkfs.vfat#' \
+		-e 's/^AS = as/AS +=/' \
+		-e '/^CC/d' \
+		-e 's/objcopy/$(OBJCOPY)/' \
+		-e 's/shell size/shell $(SIZE)/' \
+		build{32,64}/Makefile || die
+	default
+}
+
+src_compile() {
+	tc-export OBJCOPY
+	export SIZE=$(tc-getPROG SIZE size)
+	pushd build32
+		use bios32 && emake memtest.bin
+		use efi32 && emake memtest.efi
+		use iso32 && emake iso
+	popd
+
+	pushd build64
+		use bios64 && emake memtest.bin
+		use efi64 && emake memtest.efi
+		use iso64 && emake iso
+	popd
+}
+
+install_memtest_images() {
+	use bios32 && newins build32/memtest.bin memtest32.bios
+	use bios64 && newins build64/memtest.bin memtest64.bios
+	use efi32 && newins build32/memtest.efi memtest.efi32
+	use efi64 && newins build64/memtest.efi memtest.efi64
+}
+
+src_install() {
+	default
+	if use boot; then
+		exeinto /etc/grub.d/
+		newexe "${FILESDIR}"/39_memtest86+-r2 39_memtest86+
+		insinto /boot/memtest86plus
+		install_memtest_images
+	fi
+
+	insinto /usr/share/${PN}
+	install_memtest_images
+	use iso32 && newins build32/memtest.iso memtest32.iso
+	use iso64 && newins build64/memtest.iso memtest64.iso
+}
+
+pkg_pretend() {
+	use boot && mount-boot_pkg_pretend
+}
+
+pkg_preinst() {
+	use boot && mount-boot_pkg_preinst
+}
+
+pkg_prerm() {
+	use boot && mount-boot_pk_prerm
+}
diff --git a/sys-apps/memtest86+/metadata.xml b/sys-apps/memtest86+/metadata.xml
index 814c43bc7044..43e3311c9323 100644
--- a/sys-apps/memtest86+/metadata.xml
+++ b/sys-apps/memtest86+/metadata.xml
@@ -8,14 +8,11 @@
 <use>
 	<flag name="bios32">Compile a BIOS-bootable 32bit memtest image</flag>
 	<flag name="bios64">Compile a BIOS-bootable 64bit memtest image</flag>
-	<flag name="boot">Also install to /boot instead of just /usr/share/memtest86+/</flag>
+	<flag name="boot">Install to /boot in addition to /usr/share/memtest86+/</flag>
 	<flag name="efi32">Compile a EFI32-bootable 32bit memtest image</flag>
 	<flag name="efi64">Compile a UEFI-bootable 64bit memtest image</flag>
-	<flag name="floppy">Install a script to create floppy disks containing memtest86+ binaries.</flag>
-	<flag name="iso">Compile an ISO image</flag>
 	<flag name="iso32">Compile a 32bit ISO image</flag>
 	<flag name="iso64">Compile a 64bit ISO image</flag>
-	<flag name="serial">Compile with serial console support</flag>
 </use>
 <upstream>
 	<remote-id type="github">memtest86plus/memtest86plus</remote-id>
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 20d9fa46cf4c..ab9bd58e2b70 100644
--- a/sys-kernel/Manifest.gz
+++ b/sys-kernel/Manifest.gz
diff --git a/sys-kernel/linux-docs/Manifest b/sys-kernel/linux-docs/Manifest
index c83d3279fdb3..eda66e4c79f0 100644
--- a/sys-kernel/linux-docs/Manifest
+++ b/sys-kernel/linux-docs/Manifest
@@ -1,3 +1,3 @@
-DIST linux-5.15.105.tar.xz 126525736 BLAKE2B f0175a21ada81910bf4dd176f1c6674244e8ed9294f4e19e89be73ae12e91c183479e0e0604c9c52c48f2e549ca1d4e01c5eb32a2333aefc82be8bf4160befed SHA512 f133d664431b82d995442878a155d77c624de0ccc02704198b5db27e170d55c3759f88091279cf9d91f717326b5304e0cfe0aa8253ac5d89bdeb7d6ab344b3e2
-EBUILD linux-docs-5.15.105-r1.ebuild 967 BLAKE2B 9d4447cb4ba89cea3af026e5f56197c74c7be1597c9a58113d6074c60caa4c6e53a05161740d24619872fe1875e5cd2ac4f5fc54e0436f651099c18695a67509 SHA512 a27e55f0c33988f0bd5dcc196ea4c475e62888bb9a8cf21bfcc5a6ebd0f72d80329535272fb289080577754dfb63dba8f7ec9fecdcbb279e24910803d08eb780
+DIST linux-6.1.29.tar.xz 134881816 BLAKE2B b6cf62bc9f1a9120f04857911e2a8fcf3fc5416f55b7d7bc61ded730941220f6f3202d1a86e14dc9f38f6dd40ef7614d52126d9089ccd0cc1eda144df6b102ba SHA512 be078b38ea343b8bade634aa3c75a0f8aaf70964c5ead73d658a0f1a07ca541de5e7b68fca2ede0638773d345a0c7d89c4d74709bb1101e844f3babc1c14b83f
+EBUILD linux-docs-6.1.29.ebuild 967 BLAKE2B c463fdcc38d5a301b6e3b84ad4bf6ac1e15ae7aef9ace326c4b78efade8f41d689d6667baa513db7c9637cce89ff3523e8635e96032ea7f93909f16d69e99ae1 SHA512 5b85da4b39dd6ceec46322717517ffa7b8d93eb484d2fe0d809ec8d7e7fdf6c2a5cebd355584dbbafbd3e300ab69a01230309afe3eb99d4394505ba87d50a5bb
 MISC metadata.xml 219 BLAKE2B 99596733d1861998d5b90023ad2e31e0d9f6ae4def18bcd7238d393007f97263aee3113b4e39d9e0f3c1d32675ea7c1a0b3aba61bd4b0105a23601a3544e2e2d SHA512 74ec2dcbd88d75c0785ac4cbfff8b0ce83f8d4e7f87e37c41e0e0e563103ff535093343bbf2589cc632b9bc66a4363c4fb9d0344d40409360d03df44ef889b6b
diff --git a/sys-kernel/linux-docs/linux-docs-5.15.105-r1.ebuild b/sys-kernel/linux-docs/linux-docs-6.1.29.ebuild
index 8eb50cdc46a0..4f8394c9b360 100644
--- a/sys-kernel/linux-docs/linux-docs-5.15.105-r1.ebuild
+++ b/sys-kernel/linux-docs/linux-docs-6.1.29.ebuild
@@ -11,7 +11,7 @@ S=${WORKDIR}/${MY_P}
 
 DESCRIPTION="Developer documentation generated from the Linux kernel"
 HOMEPAGE="https://www.kernel.org/"
-SRC_URI="https://www.kernel.org/pub/linux/kernel/v5.x/${MY_P}.tar.xz"
+SRC_URI="https://www.kernel.org/pub/linux/kernel/v6.x/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 6fa7cbc52567..a305feb5b03e 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/libblockdev/Manifest b/sys-libs/libblockdev/Manifest
index eec232ec0b16..5e8b54eab66e 100644
--- a/sys-libs/libblockdev/Manifest
+++ b/sys-libs/libblockdev/Manifest
@@ -1,6 +1,6 @@
 AUX libblockdev-2.28-sh_tests.patch 1552 BLAKE2B 3b26cf271a0cb2a0f51ecffe51c9caf9a0ac1c65aecb5adc845a2721f3ac7178df7c994b7647b4fa1bbfd27baf072325bffedf723555c39e164f7d7645163090 SHA512 11fc498db4ed1d3a9e5a9288e1137d64f7581cc7b2d265292f7a3899ef5cfc6d63138fef7f87695abd9d518fa1c74a8bd98ebb54038211eeb0afe7964d85c6c4
 DIST libblockdev-2.28.tar.gz 925698 BLAKE2B 63ac7ab5bd02c1ef1848d0b252e09fe721cfe86258f063b7bab616766cbc56311707dcb2dd3a1fadf0e0840187f121aa178fd5959500cd590b846238a9d3e36e SHA512 9e01c41db4f728c8e81e710c6bb4725bbe34b3a7de25ff7f57b7b88ca6b7b5debbe858947585d314770036b2c3c533f9f8ff3d038b7ca50eee3d18f9fbe0d392
-EBUILD libblockdev-2.28-r1.ebuild 3007 BLAKE2B 8bfc3156632d4a2d90e65d1367351fd0823a518547dd2fc8b8752ce40b95a585cd2344c0b4dbc5e4451a96f4e83dda08d67c40ae63ee4665fcad67ad30b2b27f SHA512 25362b3fd4e119f58280103ccb3c57eedc327d2738b3692e618c768214342b58c5a898b03390d41cab87575f332a66a96391f3df18c2d07c4738d32ba6995956
+EBUILD libblockdev-2.28-r1.ebuild 3004 BLAKE2B 7d3ec0d0641f856983ce69babb5442446c2c9b9eef78d1d55e9657cc0dc070c709dc3a959898319e9962af17a5ee060d19e0628f1ffe7a6e25d83bb08e9e3fd6 SHA512 c0663ee954d0d4efb30cabdaa39ee3a2a0c23fbb23e7d1ba1f7a8c6cdd12e4d9e2d4c6e49f2338b03530c04940b981ba24ac4e905f3fea7a666654769b97e0e7
 EBUILD libblockdev-2.28.ebuild 2946 BLAKE2B 32bdefce84fc6146b8f03c8889c56c9e25478949071de9e16658ff0535262a3dc8991bd453624676899de2c9e4e9ed49f7a0514fb702417621ddc6b552f59939 SHA512 820425866314934210469b6154c99a932330421d382246b23baea433a39f773b4ca51756564a74f496d5ca0f45b9409e51b42cd18efb94e94abbd0d434b14940
 EBUILD libblockdev-9999.ebuild 2733 BLAKE2B b7dd95006279e4717687664c9fa6cff563cb0ff1b8500c0b962742c9b8a440ba51f2e4550cf251a3608c77c17d5bc7f8343372a89052d034b1801e91988044fe SHA512 e0b750ff1819f6de9500855ee87ca55287b7fff6266eda78f9f3c5cc35bb2ea10d2b1d894a8fad90003669144ae10ef533207a3af175aa456849696285792f94
 MISC metadata.xml 1233 BLAKE2B 68512209e8f458b5b52a9d82eb86c1c831837681b2976d5050c578c3b3fdb032640c4cc99da9621aae7c061ae8332825ea5010a8f1138fbbbc34e92fccbeddeb SHA512 eb47faef934a8eafe1beeea6f901ddd6b0e7202823f57b3848f6ef131b2a5ffc968740d980a68163696d3de34a98ebef8561e63d26ffe213a42e1022577a9270
diff --git a/sys-libs/libblockdev/libblockdev-2.28-r1.ebuild b/sys-libs/libblockdev/libblockdev-2.28-r1.ebuild
index 0fa5e1d604f8..46b5abb3b2c9 100644
--- a/sys-libs/libblockdev/libblockdev-2.28-r1.ebuild
+++ b/sys-libs/libblockdev/libblockdev-2.28-r1.ebuild
@@ -17,7 +17,7 @@ if [[ "${PV}" == *9999 ]] ; then
 else
 	MY_PV="${PV}-1"
 	SRC_URI="https://github.com/storaged-project/${PN}/releases/download/${MY_PV}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv sparc ~x86"
 fi
 LICENSE="LGPL-2+"
 SLOT="0"
diff --git a/www-apache/Manifest.gz b/www-apache/Manifest.gz
index 311a8b16a873..0f36c9e3965e 100644
--- a/www-apache/Manifest.gz
+++ b/www-apache/Manifest.gz
diff --git a/www-apache/mod_qos/Manifest b/www-apache/mod_qos/Manifest
index 4463a482480d..459b0e6b4399 100644
--- a/www-apache/mod_qos/Manifest
+++ b/www-apache/mod_qos/Manifest
@@ -1,12 +1,8 @@
 AUX 10_mod_qos.conf 97 BLAKE2B d3dfe5296b89ef35b09e6b9a0d272c3fcfd66ceb54e2405c31d67a703a68f7362f5bd5340d3634d8f2c09cc8b825a8ef715c0b99430df5b9b98355c2ff4e516b SHA512 eafdbc3ae2f33a7e2bb55e59c311e79688c3ecabdd12247a5f68a9c00c46b84c709139f124cdccc5fd7b3d792b23a94ce37a8d27835d70c521ad6212d4e761c2
 DIST mod_qos-11.66.tar.gz 1247819 BLAKE2B a835722363a816637411b434eba60bc91f04fe48efd1dd5a3b63f046feb2fb60d776a64d0a4e889c8f827f6a3002fa731743d079b5f3ebd3bde3edf2023c983c SHA512 19541c72d72cd9c4f055f6c0908e1ddbfa0b27f33e13edbecf9abcf61c2fe334ef797e3ad44c7d8343d5d2df714744b4f1a3f0f96a6de02ff7d7999385393db6
-DIST mod_qos-11.70.tar.gz 1283241 BLAKE2B 516dc8ec0228956c374845e10ed2533291544c496a1eda693da28d551b81f83ab898384a627b87c940782925c5bc84f1140e4e241c964b451acb63fd947a274d SHA512 004898d7993cda82f261d28e4c91b1ff1665465d3ad1da005fae94471824a31f0d30ca4edf700ddb45bfde133218c55d49a396ba03b3ed0ac00b1743c4aaa5be
-DIST mod_qos-11.71.tar.gz 1282858 BLAKE2B 92061497a6f31c009c5dbd7d0bf9042272b679e7b2f1bf5fdf9a52dc3b9cf9ea13fae6a6bd422d652466a5d1ac4355b7cc33f2d183900a64eddce3de97e96e82 SHA512 2550d868a03b7add5a48a4cd43a5287317142c879777e6d38c15270a8bbef1e2a639f938d996645bb2cace40dc6806094fc4a80e2a9b5b4e5ccc60bd35244cc8
 DIST mod_qos-11.72.tar.gz 1283276 BLAKE2B 1769a7198f5569b2c205a0939928f6949e950d41f54765ee1a055606df139c7e7dad4ad7d6161dbf07003a93d54b966b15d20fc721a6ba05cba221e1cae126d8 SHA512 0e5af2c702bade096101f20fcf12b90a2a538665cfbec4183608acdfdc99552304ad4a42f63ad3111b570bfd42b17ce7acb16f6bc86a0380c79fae84a5124715
-DIST mod_qos-11.73.tar.gz 1288540 BLAKE2B 74953216f8dd1e5cacda09dfbeb8901a09f2c1d7929db2846f8576a4ae00123a7120385e6d77438c2d4fb33c5602e84a4737033281b7c647ba249629da0b26ce SHA512 67099a7efe2cb99191e4af1eb2f23ce9ba609425520c95360ae064dd9b88cd7ce6b3a3af21ee5805d3e26721637433a0436c1b1633d109e98613593544767ebd
+DIST mod_qos-11.74.tar.gz 1288870 BLAKE2B b61622c89c797b567744f557c9cbbf791db3f19d6fa736197d5ac95929aa7a93989c804edd6a8c8f5d567ca7ba43203003654a9d47e18cc228da95fbeafc60f4 SHA512 107eab22336741ab9415d9f6925ff2b38edf9cdfa81dd76f782a5388420c19f554e1280e0fe26788014bc0f24b2906c812fb2fcf04ce4b08d06c5770bf158d48
 EBUILD mod_qos-11.66.ebuild 1141 BLAKE2B 4c08f022489736efcf3833b70c6ae90663ccb34bbed965e14b55e4c028c039e1e438618ebd153eca1e22c2b0f1a541a68c2383d4b80d8cbb7bd549a766bb6f06 SHA512 54ab558430ec323df724e4f4d2a2c0019c94f97d656b1d75107b0e1ac0a905fe4cce2422f28d79342aae2b41f7466461fd6480518a0d6d89c3396f26dedfab4e
-EBUILD mod_qos-11.70.ebuild 1142 BLAKE2B 8b9f5e9626719ec8390b401df2b9f17a00231cad9135c5a107f9e965a24f6823c60d99faec0a6dcaecd18a957ac1930078f9937d3694fa66edede3fd960e34ca SHA512 aea1e1ffaddbb25679e7815e1ad48f76cc8ab59606c20beaf8dcfe54640c9a939f2dd864550911d0257554ad39f529fa9a09bead62e2ab04d029fefc8fbe9887
-EBUILD mod_qos-11.71.ebuild 1142 BLAKE2B 169c4a162118afb590a56a8ad230a273820c2129a9e207843a4565701ba37bf4e46d2f1e7b25db049fcef70a9c106a31cd21437f52954f3d829d185056028d9b SHA512 007b46552dc1f398600ece4d6b6105a4f7ccbd7db88aef19afcf05c64cfa28da4fa7467225d45d325adbec90f6cd3d4a30b7232578b819de97bbb9ca1fc26d1d
 EBUILD mod_qos-11.72.ebuild 1141 BLAKE2B db2e5f9e9eb28d23d1d14a9d248dbef49860cce6431fba53f4592104fd8830d369c9e42752fd4435e7955ed8d9771316f75e79cf79c2d1aeeedd6459a4662b09 SHA512 6dd74da124ae7de36b05f88499d05f8918812cf77c5e4bef3987f7e1937a81e2d523064d7a7a59afa4362b9ff2d77d448fede6bca70cd65d7c288784802eb06c
-EBUILD mod_qos-11.73.ebuild 1141 BLAKE2B b6345da2b34210f69ed60efaec3c12f94fdd76caa3394f3fa131d7c6db8ea80ddd0a49701b96d7af190189fcf2bc3ebfd224b7adea8965fe1f37f621141b434c SHA512 bf159285ccf8840bf94d3c695f39697b23f68db4680dfa779b9fb455bcf6ed5bd2197599d3502939b064d45b30763b1cf564437bd5e5d0f2c18fb9c7b33258eb
+EBUILD mod_qos-11.74.ebuild 1141 BLAKE2B b6345da2b34210f69ed60efaec3c12f94fdd76caa3394f3fa131d7c6db8ea80ddd0a49701b96d7af190189fcf2bc3ebfd224b7adea8965fe1f37f621141b434c SHA512 bf159285ccf8840bf94d3c695f39697b23f68db4680dfa779b9fb455bcf6ed5bd2197599d3502939b064d45b30763b1cf564437bd5e5d0f2c18fb9c7b33258eb
 MISC metadata.xml 326 BLAKE2B 469e74aa98baf0a4789743501b566d233d6072595c29c91ef4cffb4a9e4a986dde186cef2326e5b1e02d57a69f49b9dcf9fd045c857a5627f68f50787cd6d072 SHA512 bd08a8ffbee3d67a6b5a81e615ad0bf161204027e91ae69bd5a541a2d76f0ec52ca7405647d03d2ed3b51c756fb16d0386c97b1bab8be52a1b3803f0b2c301dc
diff --git a/www-apache/mod_qos/mod_qos-11.70.ebuild b/www-apache/mod_qos/mod_qos-11.70.ebuild
deleted file mode 100644
index 412c8e3c8eb5..000000000000
--- a/www-apache/mod_qos/mod_qos-11.70.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools apache-module
-
-DESCRIPTION="A QOS module for the apache webserver"
-HOMEPAGE="http://mod-qos.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mod-qos/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-libs/libpcre:3
-	dev-libs/openssl:0=
-	media-libs/libpng:0=
-	sys-libs/zlib:0=
-"
-DEPEND="${RDEPEND}"
-
-APXS2_S="${S}/apache2"
-APACHE2_MOD_CONF="10_${PN}"
-APACHE2_MOD_DEFINE="QOS"
-DOCFILES="${S}/doc/*.txt ${S}/README.TXT"
-
-need_apache2
-
-pkg_setup() {
-	_init_apache2
-	_init_apache2_late
-}
-src_prepare() {
-	default
-
-	pushd "${S}"/tools &>/dev/null || die
-	eautoreconf
-	popd &>/dev/null || die
-}
-
-src_configure() {
-	pushd "${S}"/tools &>/dev/null || die
-	econf
-	popd &>/dev/null || die
-}
-
-src_compile() {
-	apache-module_src_compile
-	emake -C "${S}"/tools
-}
-
-src_install() {
-	einfo "Installing Apache module ..."
-	pushd "${S}"/tools &>/dev/null || die
-	apache-module_src_install
-	popd &>/dev/null || die
-
-	einfo "Installing module utilities ..."
-	emake -C "${S}"/tools install DESTDIR="${D}"
-}
diff --git a/www-apache/mod_qos/mod_qos-11.71.ebuild b/www-apache/mod_qos/mod_qos-11.71.ebuild
deleted file mode 100644
index a6cc2a461250..000000000000
--- a/www-apache/mod_qos/mod_qos-11.71.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools apache-module
-
-DESCRIPTION="A QOS module for the apache webserver"
-HOMEPAGE="http://mod-qos.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mod-qos/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-libs/libpcre:3
-	dev-libs/openssl:0=
-	media-libs/libpng:0=
-	sys-libs/zlib:0=
-"
-DEPEND="${RDEPEND}"
-
-APXS2_S="${S}/apache2"
-APACHE2_MOD_CONF="10_${PN}"
-APACHE2_MOD_DEFINE="QOS"
-DOCFILES="${S}/doc/*.txt ${S}/README.TXT"
-
-need_apache2
-
-pkg_setup() {
-	_init_apache2
-	_init_apache2_late
-}
-src_prepare() {
-	default
-
-	pushd "${S}"/tools &>/dev/null || die
-	eautoreconf
-	popd &>/dev/null || die
-}
-
-src_configure() {
-	pushd "${S}"/tools &>/dev/null || die
-	econf
-	popd &>/dev/null || die
-}
-
-src_compile() {
-	apache-module_src_compile
-	emake -C "${S}"/tools
-}
-
-src_install() {
-	einfo "Installing Apache module ..."
-	pushd "${S}"/tools &>/dev/null || die
-	apache-module_src_install
-	popd &>/dev/null || die
-
-	einfo "Installing module utilities ..."
-	emake -C "${S}"/tools install DESTDIR="${D}"
-}
diff --git a/www-apache/mod_qos/mod_qos-11.73.ebuild b/www-apache/mod_qos/mod_qos-11.74.ebuild
index 1c3182af2600..1c3182af2600 100644
--- a/www-apache/mod_qos/mod_qos-11.73.ebuild
+++ b/www-apache/mod_qos/mod_qos-11.74.ebuild
diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index e7bb289b9bf0..0fc2a95fc214 100644
--- a/x11-terms/Manifest.gz
+++ b/x11-terms/Manifest.gz
diff --git a/x11-terms/rxvt-unicode/Manifest b/x11-terms/rxvt-unicode/Manifest
index 73e618794cd6..decc74eb4298 100644
--- a/x11-terms/rxvt-unicode/Manifest
+++ b/x11-terms/rxvt-unicode/Manifest
@@ -5,6 +5,6 @@ AUX urxvtd.service 145 BLAKE2B 9199c81f02ff161caf6f72bac95808d4ba584bf09fb68cf7f
 AUX urxvtd.socket 133 BLAKE2B d685c78de25a3f2d661f180a6a5cc227c500e873dab049587f0742330910c3867f60871a96a237787d85f66b8999b397281b36ed9b92bda2422e1e2295accfee SHA512 20c7d7a00bd41deefb738b6795ecbea8098ec81d3356cceab4de39408de3552d385fc48ef74a087f3724d436b77de54adb67d0858a0949b9595820ee3d9cf7e4
 DIST rxvt-unicode-9.31.tar.bz2 880148 BLAKE2B 439a8c33b7260e0f2fd68b8a4409773c06c3bb7623b5dfbbb0742cc198c9fd25e8a247907878639db5fac3dcd3b6be3d839347787bcf08ca602ae246607f750b SHA512 4d14ecbbb62de1b1c717277f5aae5cfb536e11392f2d4b82c884c1713f437fce8e9dd69a328fa353a55d068d8ee4121a31900f45191acec172d5dc76652b6255
 DIST rxvt-unicode-9.31_24-bit-color_aur-9.31-20239117.patch.xz 7776 BLAKE2B 88c12e2db38991fc6c7909950aade09a8c089d93980535af5a602d40cb4712aaa97f659c67e49b52abb71e6d0e2b8279f3d9a6d66654cdf68dde68bf64279873 SHA512 dfc0388138f35345c0c80df0a392c28a52a03d008ca336999369522031898813046c314c1e4ec9a81fea41b81d3230f5ca09d47b84ef04c0f6da98c559812a16
-EBUILD rxvt-unicode-9.31-r1.ebuild 3452 BLAKE2B b8fc2d636ebc47ca41c16f4a3979f86cf841ef8c5da5e9c650adfe8f50dcc85b258514643b4df10026b399cc8ba321928ccf29a7ff092df5e59d513594e4f759 SHA512 2a054d752f70723db97a0a766f94af8026f051c39ea61bfc4eb3619f9e14ba5ea8d951b4b0d8b55a6f4fefd1b714c8a3c45b7b6e48576886f75ad4c3dffb5b6c
+EBUILD rxvt-unicode-9.31-r1.ebuild 3450 BLAKE2B 5fd0e7d527a0b6f10b9fe37af9dbb1a73c214b3033d539332f0178d845a0e668b2b3f8d4ffbc2e87599fc437d583f500bff7cfd44944b8103ee35a2ee0d19966 SHA512 54b16d088c55b2d3153527f1c56df0f6737c484ab9c5bfe4bc1ca8c6c27f1aac91115fda3e505e9567800a11a302118002134507af636e39d2b42b1bb101abd5
 EBUILD rxvt-unicode-9.31.ebuild 3059 BLAKE2B 8f81abff67a2951cef639f94fc54f9cbcc0a83b8c6b1389478d1fd321c9091ed682925e0489beab3811f2cc370803d67bcfbe801a17a39d394f1c8e7d16315c9 SHA512 4f0a93a6b9536c814b64d2cc2443ad75638b3c27ed56931e4a5fb70b435a3758c24bf62c4bef93edeaf05442945757ee7a7f0af696c9553359efca8e79324c39
 MISC metadata.xml 1625 BLAKE2B 1599f8b70a1c67b5af39fc8d33aee918ca1c90523aee4873f258ffc37deeb453fe6cd9e3d33080d6135423b8e48e3f3ab40e8bf58256002deb1764d33fb3ba75 SHA512 fd630ed236bcf83bb0a3d4f535b8aa65e23945104287bf2e1e9240991b0d78af569dfc006848afc6db9824082e490ed713e52b125e2ed273ecbf39893a97e97a
diff --git a/x11-terms/rxvt-unicode/rxvt-unicode-9.31-r1.ebuild b/x11-terms/rxvt-unicode/rxvt-unicode-9.31-r1.ebuild
index 477151ddcb35..be999b3196e2 100644
--- a/x11-terms/rxvt-unicode/rxvt-unicode-9.31-r1.ebuild
+++ b/x11-terms/rxvt-unicode/rxvt-unicode-9.31-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://dist.schmorp.de/rxvt-unicode/Attic/${P}.tar.bz2
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv sparc ~x86"
 IUSE="24-bit-color 256-color blink fading-colors +font-styles gdk-pixbuf iso14755 +mousewheel
 	perl startup-notification unicode3 wide-glyphs xft"