gentoo auto-resync : 03:02:2023 - 15:10:30

453 files changed, 5304 insertions, 2149 deletions

diff --git a/Manifest b/Manifest
index cae23e00654f..0428b0b6c80c 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29484 BLAKE2B 5088c089a1d842f0a5e290a09b27f3dc1eabab8d9bc225e0a38cae143231f06d8c9ee129738c7facf4326e4d6ebf2bdf742c1cba73596627a676510772f4c861 SHA512 0e9eed9def3e668b9701d38d5cd65eb53fe7b016fc3f9e7f04754b65f5dce2092c551a9d3f57ba8983363a5a7a73d6937c50eb287303e46e13cee34cfdd9e8f2
-TIMESTAMP 2023-02-03T08:39:42Z
+MANIFEST Manifest.files.gz 29460 BLAKE2B 699ef73a080e6383d04f2123c9eaaf9e469b5f8a9589d387466d046acc29aa5064138dad301f57a346e045f1bdbf04d0b2eb0d238c9e0fb04324ae4522514b54 SHA512 f5fe434b28c0ed098ce26be5ba67ada3c591f51b0aa82a4320f84f5954b1d2c0bac419edfc9a72aebc43813ac824a6a303a5529d7d180ec3127a8cadc55078bb
+TIMESTAMP 2023-02-03T14:39:41Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmPcyE5fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmPdHK1fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDl6w/+LVKGebb+IY7zBoBykNrEdIqjNlmRj0AVD4+RGEudQdPD/PmfJ941Jtkz
-uiNe7xS6YLyL9HAsFCVwfiXlnDKvO8OKnsxUMx+89gx+gZtOFdCD8/U4IMk5Yfa7
-WE2MXtQknNlQZF7PxSrk5/F1IMj17z8ZthnKCTkh2nUBURGYDPSCSfzpfFEcsbDU
-b5cWJx4KLOr5tuKKwoAufB4PuvlURzwBE5o9NKU72H5uViBPhW4eRUD82XVQI73s
-rfBLFgwiqFkP89yGa/L7lVqZ3TTfJZCPSv4oxj4Q0z0T0Y0UpIgiDxjhNQtW0RHE
-IhhgiKQ/eWE9BPx1qQjqdvYiVW5b8v5Ggw6b//IbhqFmEtQ7q28GUpYO4ybS1g9P
-gW8+vpPGMEgBN10l581ynhKn+d08z/rpptGK5InflBHo4pZ2grqIJio9uzyN2/oA
-QWZY16XdpGhPs9K++8DlMttgfLIRkfnLS/trYyTY1WstECi40Qu2hdHpBwdcrw17
-hz7mL/CaVVabi8imPN0NcExLB0w1iSrBhlEsVGb45GNbysubhnMKOjKX6dEGQi1r
-XJHPtMC1dww94y4YeipOo5Y8eYUaZMam490gNads9l5D7KkiSFHqCdJ/40Or78gD
-dhg3htkVmmwbUN3l0LUzwngpI0QcHXpqBr339s5Kk24gJ0DMXzA=
-=HlFf
+klDYWRAAoaY2Ax/K1dItoY1PqgBGopAFSrVlgyZvzFr4jSG5IKOfAsJQee7a/Bst
+jkjIOMjqpZqPG1s+Gt/t9jbZ5k7k9DxomJDHXB8JUTz0G8iuIoHtFKWQhz9tThEY
+TeGa62AVmClSzII1rsjkbWdYfQBJxtRO8J6yxh4nhoQm27bTvBqiY1LL1ywiMySu
+ObwYEhw8KnMGo2sr1lTCy5lZewPbWnrnETawjgtLbi7czXECo8yH7Tk1PoCZ5nOs
+JmYJsyWSw0WizoaV0kajeCtxu7GxGSadZrVH0K0YXoCrh455N2K0OG9SyIRoUEjP
+shnpLjhB0gIjEdUq6t3AFaEfqQuQDQOWFyth0HXe18vCsmwTB/uJJTr95a6O48q+
+6Wzrhw8xhF/1smlI2dID8+lPdzjXBVvcnM0ct5OZlSdNDKJ2a5/0F1+TaMVDOGGH
+jg5AREfMurdgzJpMwGK8Zy56T5DypBtU5gE8c2mk/Ktdi1v0m4d0XuWqGwDsmaMI
+MgLW4562ON6TBj5EFX0thSOc/mogZLHVpfyQsagZEiGzh99Asd0rtND9Sw9d7OmU
+WvA7MtwlUgMZEaF9NmL2EMKSxKuyq2jdKA1tMIi/9JTAcf7wCJaX3hX1nDPlUR4B
+HbBE5fWZFR8616r2tcI75zj+3Za+5hGPjz4TUrKr5DZvSDbl/JQ=
+=jC+a
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 86e848709a0a..6fae54fdb783 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/acct-group/Manifest.gz b/acct-group/Manifest.gz
index 0f879b5a58ee..da8959a8829b 100644
--- a/acct-group/Manifest.gz
+++ b/acct-group/Manifest.gz
diff --git a/acct-group/gkrellmd/Manifest b/acct-group/gkrellmd/Manifest
index daad93c22e70..b38f17af03ab 100644
--- a/acct-group/gkrellmd/Manifest
+++ b/acct-group/gkrellmd/Manifest
@@ -1,2 +1,2 @@
 EBUILD gkrellmd-0-r1.ebuild 151 BLAKE2B c077d551b13cd099b591cf05f5cc879c89bfff6a883f87a85ee642ef5237e0fc23a6f3d7e208220a06f6a7efa9ad8be1dae1d29187f8020485b9084461686d63 SHA512 b2277a80783de6683384877bb0d434f3dc4607e342ddff1591ebb247aeff4dbc8dc70f8082b0378ad208161e85c4e84719bce7543a75860807dd089ec003ad79
-MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
+MISC metadata.xml 240 BLAKE2B 20c22d2d446cfcd6f2f430f2c444cd6d854d840e5161f595e4f738096d38db01c8cd305870b26623e98d8bbba239260975a53802caf4b678d1fe61a146aa660f SHA512 1af3286c63a60e89c2f87bd060eebb279858f4b21f9daedf4edcacd5906f35ddd6271397806771d6de1853cae1f3ecdd00ee6e05718fd7083ebc039e5cfa4832
diff --git a/acct-group/gkrellmd/metadata.xml b/acct-group/gkrellmd/metadata.xml
index 115e9d64a669..641cbd3703e7 100644
--- a/acct-group/gkrellmd/metadata.xml
+++ b/acct-group/gkrellmd/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>sam@gentoo.org</email>
+		<name>Sam James</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/acct-user/Manifest.gz b/acct-user/Manifest.gz
index a938739057e1..0b935b7fa76d 100644
--- a/acct-user/Manifest.gz
+++ b/acct-user/Manifest.gz
diff --git a/acct-user/gkrellmd/Manifest b/acct-user/gkrellmd/Manifest
index d7353d176bb5..14deb120dfa1 100644
--- a/acct-user/gkrellmd/Manifest
+++ b/acct-user/gkrellmd/Manifest
@@ -1,2 +1,2 @@
 EBUILD gkrellmd-0-r1.ebuild 237 BLAKE2B 9d500334891a892f1938560f638900fab2ad167ed8f8153dc980a8ff5867ea683758c5e059c94521325bfdba44001dcbe6a77ef9ceb6cb563492a1510a5215fc SHA512 ef6e61d74dd7694935900f622d1a8f24ef3371e5c919c1e38d4a88495ff06671f2e55eef558c0bf633044ef20db02b0e61974df85564e3e1c95425d0d0db3b9c
-MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
+MISC metadata.xml 240 BLAKE2B 20c22d2d446cfcd6f2f430f2c444cd6d854d840e5161f595e4f738096d38db01c8cd305870b26623e98d8bbba239260975a53802caf4b678d1fe61a146aa660f SHA512 1af3286c63a60e89c2f87bd060eebb279858f4b21f9daedf4edcacd5906f35ddd6271397806771d6de1853cae1f3ecdd00ee6e05718fd7083ebc039e5cfa4832
diff --git a/acct-user/gkrellmd/metadata.xml b/acct-user/gkrellmd/metadata.xml
index 115e9d64a669..641cbd3703e7 100644
--- a/acct-user/gkrellmd/metadata.xml
+++ b/acct-user/gkrellmd/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>sam@gentoo.org</email>
+		<name>Sam James</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 2417d34d4dcd..828b135844c5 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/gkrellm/Manifest b/app-admin/gkrellm/Manifest
index b34b8fda05c1..6929ab0f59b7 100644
--- a/app-admin/gkrellm/Manifest
+++ b/app-admin/gkrellm/Manifest
@@ -1,3 +1,4 @@
+AUX gkrellm-2.3.11-clang16.patch 16029 BLAKE2B 6d8057188f35ee376057ca8ecbfaecbeb521e5d1addb169c472b2f2b3d139a3f782eb078973fbb6b999ae9b2d6345f244a7773904fa3994a2e9201d0a647a4a7 SHA512 1e3f133b80bfe1108a8ddca0c7a39f13007ef1eb2daeea6ee188e1160c2e6e1d2820009ae588f5e9257dfe8bcf490c5d9a86679fe3fd774c5702b37c21489c6c
 AUX gkrellm-2.3.5-config.patch 1530 BLAKE2B 4e672d58a680c7c0d3f660a2ff26fd5340d14e39d1fb9f824464a5a89b593a9f1b915cc8735c215d27c198147a2a4a438b506e27e5c5469ccbc80534867dc380 SHA512 c8259770dd088a119c349d2f19728f4874a24c407273edbf7129a531589e908ef37fbdf7bdbaaaf51ae6fa527d88601749a9e358746bff514082535b355d2ad0
 AUX gkrellm-2.3.5-sansfont.patch 688 BLAKE2B 679912990141a5758b14f67712ec154e46b0fd8d1fd3fe5a1eb14c9d95ce8113cdf887b72290f9045bb9d37bb6ba132240b74dc3262a6d99fb54b0f204e81100 SHA512 7f404c8f57091f00e66435b0cd311611b40fc6e3f3e953476a40e9a4521e91f7bbd3b19094d88a74b9d8cef20b00c1b5289197df5219455a84ab68e5271ce11f
 AUX gkrellm-2.3.5-width.patch 350 BLAKE2B 94b3690a464b6bfcfe6b88cf7b73880680b33b389ea3ec9f299518aadfc1e9161f7ae8046b3ba484a1a0ff5f4b4d8b3d81a604b4ccc63c546156e8dfa81d687a SHA512 4324fad0b59b482b8a2bea489373a280bc6a5a647f0863f9b1c5929454f7786b94f8293731c3de94ddbef0e8cfbe6018b721fc223dade3d23feb598e4569f3ed
@@ -7,5 +8,6 @@ AUX gkrellmd.service 173 BLAKE2B c89a772fd0273b54766f5cea36aab9156d7a1d59f5759bd
 DIST gkrellm-2.3.11.tar.bz2 783123 BLAKE2B b68c60477e4994e9508a8e5ea39fd09ab5cf0f019fc6b4567b9482b3b1fd315dd2548daed262095b42dda43ac068295d5c3c375c5cb80c91fda76ef8b9834df2 SHA512 e4147aa90e09925b9672728f287880bde26632d77d83d3f0b9458a201593a57158d9eb8cbb31e569e0d71d91a08c9bceba29814f59e542315775663ef9fd27a9
 EBUILD gkrellm-2.3.11-r1.ebuild 3168 BLAKE2B b136622ad1eb71b40f8fd045ffed6b3c4b375477c4d74fe8481e4b650aeabf47646addbe2f59c1ea32a3aaf199c65e92c528614ed0e39b1b54746794253e3c8f SHA512 462609bbe615c6c4d42a6a0cc99ce17a9694aea1a0b18316fa19d9eeeeb6686b7f7c2cdfb7493865683303c72511ab41231ce5bb8ad0bdc8be9b911f8e5d2abd
 EBUILD gkrellm-2.3.11-r2.ebuild 3203 BLAKE2B 6f196c1e8d9ddc4fa2b8660fdee4dac93cc9866f2e26ac18088e050b2ac1f9444a254a6adceb0a0e08137911d50ab84bd62f3a0696605cc6e9ca380388e6c625 SHA512 907b863fe15751a8697e2a014d0e6edc996e8b784eea10ce15132caae0e83bedc458e273d65186b7300eb96968a1eef011ff0ab6cb35632f792d14db60853079
-EBUILD gkrellm-9999.ebuild 3208 BLAKE2B 964d068d69e338190ec5bba5cc2831c13002fe90d0e79e81a380f7292bd3c928e30af59436efab0fd7166ef973565c9bec7e21d898c0b9976b3a25ca6d73a4b4 SHA512 d85ba163ce55ba782169d52e41415f91d7694e7bae7c039a0913b3e76a2b70047c668fdf247f91a14f64396a1b4a2e0c40339e8a05f2127ee80bf3a1ca008e41
-MISC metadata.xml 730 BLAKE2B cb17bd6be9a48e86f6571ee08a038ff939c52c1e0b37935679c3ce365da49bfcbb6f08d484c623f11d3c07af9727276454754aa342e9c6aaea216a2c54574563 SHA512 7a6b85156d81df30316bc301034f7be2ece3756e2a44efc31145b6052924921d751fedadd44353ac24af9d5ea5bd69ce7ecac6d738347e694cbb04609486e05d
+EBUILD gkrellm-2.3.11-r4.ebuild 3472 BLAKE2B 10ce029cfeadd1168434a2e85dfab1100471065af3f5bb9f984ae3e5482fdd2f34585df75d94d4edb05f8392b4b336fa40aa1cf3b6ad4060f76d738ca48e455c SHA512 d982d055dd85914c8880025ef090f54aa65bc813fe23dd9bf821e2a6067f9ca90ef5081bf0c45e75c32a299b7308926a2112049a3569e51a43b20008069229a2
+EBUILD gkrellm-9999.ebuild 3472 BLAKE2B 10ce029cfeadd1168434a2e85dfab1100471065af3f5bb9f984ae3e5482fdd2f34585df75d94d4edb05f8392b4b336fa40aa1cf3b6ad4060f76d738ca48e455c SHA512 d982d055dd85914c8880025ef090f54aa65bc813fe23dd9bf821e2a6067f9ca90ef5081bf0c45e75c32a299b7308926a2112049a3569e51a43b20008069229a2
+MISC metadata.xml 802 BLAKE2B 0d527f21d935bc50eaf60972bb00776b02542178a29034d60be642ba28a3d22d3bc7c8307aba6e803011f0f39a6b04334a14d8e5eade5c9839d232e8dcc03b1f SHA512 d8f5aa5e767d3da83182dbbedc79af11a7381d25009431c89339149ee8205bc9b3dc9a82c690c824b7175df6861c3925b27d44ccf33695159c0a1bcade7a7544
diff --git a/app-admin/gkrellm/files/gkrellm-2.3.11-clang16.patch b/app-admin/gkrellm/files/gkrellm-2.3.11-clang16.patch
new file mode 100644
index 000000000000..ac71405e8f20
--- /dev/null
+++ b/app-admin/gkrellm/files/gkrellm-2.3.11-clang16.patch
@@ -0,0 +1,540 @@
+From 7df25a85ccbd28e22dee437272202fe966f861d1 Mon Sep 17 00:00:00 2001
+From: A Schenck <galiven@users.sourceforge.net>
+Date: Fri, 27 Jan 2023 15:09:58 -0800
+Subject: [PATCH] Declare arguments on function pointers
+
+Solves the errors with -Werror=implicit-function-declaration -Werror=implicit-int -Werror=incompatible-function-pointer-types -Werror=deprecated-non-prototype
+--- a/server/mail.c
++++ b/server/mail.c
+@@ -42,12 +42,13 @@
+ #define MBOX_MH_DIR		2
+ 
+ 
+-typedef struct
++typedef struct Mailbox Mailbox;
++struct Mailbox
+ 	{
+ 	gchar		*path;
+ 	gchar		*homedir_path;
+ 	gint		mboxtype;
+-	gboolean	(*check_func)();
++	gboolean	(*check_func)(Mailbox *mbox);
+ 	gint		mail_count;
+ 	gint		new_mail_count;
+ 	gint		old_mail_count;
+@@ -57,8 +58,7 @@ typedef struct
+ 	off_t		last_size;
+ 	gboolean	is_internal;	/* Internal mail message (ie: localmachine) */
+ 	gboolean	changed;
+-	}
+-	Mailbox;
++	};
+ 
+ static GList	*mailbox_list;
+ 
+--- a/src/alerts.c
++++ b/src/alerts.c
+@@ -765,7 +765,7 @@ gkrellm_alert_plugin_add(GkrellmMonitor *mon, gchar *name)
+ void
+ gkrellm_alert_plugin_alert_connect(GkrellmAlertPlugin *gap,
+ 			void (*alarm_func)(), void (*warn_func)(),
+-			void (*update_func)(), void (*check_func)(),
++			void (*update_func)(), void (*check_func)(GkrellmAlert* alert, gpointer data, gfloat value),
+ 			void (*destroy_func)())
+ 	{
+ 	gap->alarm_func = alarm_func;
+--- a/src/chart.c
++++ b/src/chart.c
+@@ -2107,7 +2107,7 @@ gkrellm_get_chartconfig_grid_resolution(GkrellmChartconfig *cf)
+ 
+ void
+ gkrellm_chartconfig_grid_resolution_connect(GkrellmChartconfig *cf,
+-			void (*func)(gpointer), gpointer data)
++			void (*func)(GkrellmChartconfig *, gpointer), gpointer data)
+ 	{
+ 	if (!cf)
+ 		return;
+@@ -2206,7 +2206,7 @@ gkrellm_get_chartconfig_fixed_grids(GkrellmChartconfig *cf)
+ 
+ void
+ gkrellm_chartconfig_fixed_grids_connect(GkrellmChartconfig *cf,
+-			void (*func)(gpointer), gpointer data)
++			void (*func)(GkrellmChartconfig*, gpointer), gpointer data)
+ 	{
+ 	if (!cf)
+ 		return;
+@@ -2224,7 +2224,7 @@ gkrellm_get_chartconfig_height(GkrellmChartconfig *cf)
+ 
+ void
+ gkrellm_chartconfig_height_connect(GkrellmChartconfig *cf,
+-			void (*func)(gpointer), gpointer data)
++			void (*func)(GkrellmChartconfig*, gpointer), gpointer data)
+ 	{
+ 	if (!cf)
+ 		return;
+--- a/src/cpu.c
++++ b/src/cpu.c
+@@ -50,7 +50,8 @@ static void	cb_alert_config_create(GkrellmAlert *ap, GtkWidget *vbox,
+ #endif
+ 
+ 
+-typedef struct
++typedef struct CpuMon CpuMon;
++struct CpuMon
+ 	{
+ 	gchar			*name;
+ 	gchar			*panel_label;
+@@ -87,8 +88,7 @@ typedef struct
+ 					nice,
+ 					sys,
+ 					idle;
+-	}
+-	CpuMon;
++	};
+ 
+ 
+ static GkrellmMonitor
+@@ -575,7 +575,7 @@ cb_cpu_extra(GtkWidget *widget, GdkEventButton *ev)
+ 	}
+ 
+ static void
+-setup_cpu_scaling(GkrellmChartconfig *cf)
++setup_cpu_scaling(GkrellmChartconfig *cf, gpointer data)
+ 	{
+ 	gint	grids;
+ 
+@@ -741,7 +741,7 @@ static gchar			*nice_color_string,
+ 						*nice_grid_color_string;
+ 
+ static void
+-cb_height(GkrellmChartconfig *cf, CpuMon *cpu)
++cb_height(GkrellmChartconfig *cf, gpointer data)
+ 	{
+ 	GList			*list;
+ 	GkrellmChart	*cp;
+@@ -879,7 +879,7 @@ create_cpu(GtkWidget *vbox, gint first_create)
+ 		gkrellm_chartconfig_fixed_grids_connect(cp->config,
+ 					setup_cpu_scaling, NULL);
+ 		gkrellm_chartconfig_height_connect(cp->config, cb_height, cpu);
+-		setup_cpu_scaling(cp->config);
++		setup_cpu_scaling(cp->config, NULL);
+ 
+ 		cpu->sensor_decal = cpu->fan_decal = NULL;
+ 		if (show_panel_labels)
+--- a/src/disk.c
++++ b/src/disk.c
+@@ -104,8 +104,8 @@ static gboolean	sys_handles_composite_reset;
+ static gboolean	units_are_blocks;
+ 
+ static void		(*read_disk_data)();
+-static gchar	*(*name_from_device)();
+-static gint		(*order_from_name)();
++static gchar	*(*name_from_device)(gint device_number, gint uint_number, gint *order);
++static gint		(*order_from_name)(const gchar *name);
+ 
+ 
+ 
+@@ -703,9 +703,10 @@ cb_disk_extra(GtkWidget *widget, GdkEventButton *ev)
+ 	}
+ 
+ static void
+-setup_disk_scaling(GkrellmChartconfig *cf, GkrellmChart *cp)
++setup_disk_scaling(GkrellmChartconfig *cf, gpointer data)
+ 	{
+ 	gint	grids, res;
++	GkrellmChart *cp = (GkrellmChart*)data;
+ 
+ 	grids = gkrellm_get_chartconfig_fixed_grids(cf);
+ 	if (!grids)
+--- a/src/fs.c
++++ b/src/fs.c
+@@ -115,7 +115,7 @@ static GList	*fstab_list;
+ static gint		uid;
+ 
+ void			(*get_mounts_list)(),
+-				(*get_fsusage)(),
++				(*get_fsusage)(gpointer mon, gchar *dir),
+ 				(*get_fstab_list)();
+ gboolean		(*get_fstab_modified)();
+ 
+@@ -123,8 +123,8 @@ gboolean		(*get_fstab_modified)();
+ /* If ejecting is available via an ioctl() or if there is an eject command,
+ |  set these up in gkrellm_sys_fs_init() by calling gkrellm_fs_setup_eject().
+ */
+-void			(*eject_cdrom_func)(),
+-				(*close_cdrom_func)();
++void			(*eject_cdrom_func)(gchar *dev),
++				(*close_cdrom_func)(gchar *dev);
+ static gchar	*eject_cdrom_command,
+ 				*close_cdrom_command;
+ static gboolean	cdrom_thread_busy;		/* for the cdrom_funcs */
+@@ -1536,7 +1536,7 @@ static GtkWidget	*alert_button;
+ 
+ static GtkWidget	*data_format_combo_box;
+ 
+-static gboolean	(*original_row_drop_possible)();
++static gboolean	(*original_row_drop_possible)(GtkTreeDragDest *dest, GtkTreePath *path, GtkSelectionData *selection_data);
+ 
+ 
+ static void
+--- a/src/gkrellm-public-proto.h
++++ b/src/gkrellm-public-proto.h
+@@ -116,8 +116,8 @@ void		gkrellm_chartconfig_grid_resolution_adjustment(
+ void		gkrellm_set_chartconfig_grid_resolution(GkrellmChartconfig *,
+ 						gint);
+ gint		gkrellm_get_chartconfig_grid_resolution(GkrellmChartconfig *);
+-void		gkrellm_chartconfig_grid_resolution_connect(
+-						GkrellmChartconfig *, void (*fn)(), gpointer);
++void		gkrellm_chartconfig_grid_resolution_connect(GkrellmChartconfig* cf,
++						void (*fn)(GkrellmChartconfig*, gpointer), gpointer);
+ void		gkrellm_set_chartconfig_flags(GkrellmChartconfig *, gint);
+ 
+ void		gkrellm_chartconfig_grid_resolution_label(
+@@ -131,10 +131,10 @@ void		gkrellm_set_chartconfig_sequence_125(GkrellmChartconfig *,
+ void		gkrellm_set_chartconfig_fixed_grids(GkrellmChartconfig *, gint);
+ gint		gkrellm_get_chartconfig_fixed_grids(GkrellmChartconfig *);
+ void		gkrellm_chartconfig_fixed_grids_connect(GkrellmChartconfig *,
+-						void (*fn)(), gpointer);
++						void (*fn)(GkrellmChartconfig*, gpointer), gpointer);
+ gint		gkrellm_get_chartconfig_height(GkrellmChartconfig *);
+-void		gkrellm_chartconfig_height_connect(GkrellmChartconfig *,
+-						void (*fn)(), gpointer);
++void		gkrellm_chartconfig_height_connect(GkrellmChartconfig* cf,
++						void (*fn)(GkrellmChartconfig*, gpointer), gpointer);
+ void		gkrellm_chartconfig_callback_block(GkrellmChartconfig *, gboolean);
+ void		gkrellm_save_chartconfig(FILE *, GkrellmChartconfig *,
+ 						gchar *, gchar *);
+@@ -274,7 +274,7 @@ GkrellmDecalbutton *gkrellm_make_scaled_button(GkrellmPanel *p,
+ GkrellmDecalbutton *gkrellm_decal_is_button(GkrellmDecal *);
+ void		gkrellm_set_in_button_callback(GkrellmDecalbutton *,
+ 						gint (*func)(), gpointer data);
+-gboolean	gkrellm_in_button(GkrellmDecalbutton *button, GdkEventButton *);
++gboolean	gkrellm_in_button(GkrellmDecalbutton *button, GdkEventButton *, gpointer data);
+ gboolean	gkrellm_in_decal(GkrellmDecal *, GdkEventButton *);
+ void		gkrellm_decal_button_connect(GkrellmDecalbutton *, void (*func)(),
+ 						void *);
+@@ -415,7 +415,7 @@ GkrellmAlertPlugin	*gkrellm_alert_plugin_add(GkrellmMonitor *mon,
+ 						gchar *name);
+ void		gkrellm_alert_plugin_alert_connect(GkrellmAlertPlugin *gap,
+             			void (*alarm_func)(), void (*warn_func)(),
+-						void (*update_func)(), void (*check_func)(),
++						void (*update_func)(), void (*check_func)(GkrellmAlert* alert, gpointer data, gfloat value),
+ 						void (*destroy_func)());
+ void		gkrellm_alert_plugin_config_connect(GkrellmAlertPlugin *gap,
+ 						gchar *tab_name,
+--- a/src/gkrellm.h
++++ b/src/gkrellm.h
+@@ -546,14 +546,15 @@ typedef struct
+ #define	NO_CONFIG_AUTO_GRID_RESOLUTION	1
+ #define	NO_CONFIG_FIXED_GRIDS			2
+ 
+-typedef struct
++typedef struct GkrellmChartconfig GkrellmChartconfig;
++struct GkrellmChartconfig
+ 	{
+ 	gint		flags;
+ 	gboolean	config_loaded;
+ 	gboolean	log;
+ 
+ 	gint		h;
+-	void		(*cb_height)();
++	void		(*cb_height)(GkrellmChartconfig *config, gpointer data);
+ 	gpointer	cb_height_data;
+ 	GtkWidget	*height_spin_button;
+ 
+@@ -566,7 +567,7 @@ typedef struct
+ 	gboolean	auto_grid_resolution;
+ 	gboolean	auto_resolution_stick;
+ 	gboolean	sequence_125;
+-	void		(*cb_grid_resolution)();
++	void		(*cb_grid_resolution)(GkrellmChartconfig *config, gpointer data);
+ 	gpointer	cb_grid_resolution_data;
+ 	GtkWidget	*grid_resolution_spin_button;
+ 	GtkWidget	*auto_resolution_control_menubar;
+@@ -583,7 +584,7 @@ typedef struct
+ 				width;
+ 
+ 	gboolean	fixed_grids;
+-	void		(*cb_fixed_grids)();
++	void		(*cb_fixed_grids)(GkrellmChartconfig *config, gpointer data);
+ 	gpointer	cb_fixed_grids_data;
+ 	GtkWidget	*fixed_grids_spin_button;
+ 
+@@ -591,8 +592,7 @@ typedef struct
+ 	GList		**chart_cd_list;
+ 
+ 	gboolean	cb_block;
+-	}
+-	GkrellmChartconfig;
++	};
+ 
+   /* GkrellmCharts are drawn in layers and each data value drawn has its own
+   |  layer (the GkrellmChartdata struct -> image/color of the drawn data and
+@@ -750,13 +750,14 @@ typedef struct
+ 	GkrellmChartdata;
+ 
+ 
+-typedef struct
++typedef struct GkrellmDecalbutton GkrellmDecalbutton;
++struct GkrellmDecalbutton
+ 	{
+ 	GkrellmPanel *panel;
+ 	GkrellmDecal *decal;
+-	void		(*cb_button_click)();
++	void		(*cb_button_click)(GkrellmDecalbutton *b, gpointer data);
+ 	gpointer	data;
+-	gint		(*cb_in_button)();
++	gint		(*cb_in_button)(GkrellmDecalbutton *b, GdkEventButton *ev, gpointer data);
+ 	gpointer	in_button_data;
+ 	gpointer	privat;
+ 	gint		cur_index;
+@@ -764,10 +765,9 @@ typedef struct
+ 	gint		saved_index;
+ 	gint		sensitive;
+ 	gint		type;
+-	void		(*cb_button_right_click)();
++	void		(*cb_button_right_click)(GkrellmDecalbutton *b, gpointer data);
+ 	gpointer	right_data;
+-	}
+-	GkrellmDecalbutton;
++	};
+ 
+ 
+ 
+@@ -791,20 +791,21 @@ typedef struct
+ /* ------- Alerts ------- */
+ #define	GKRELLM_ALERTCONFIG_KEYWORD			"alert_config"
+ 
++typedef struct GkrellmAlert GkrellmAlert;
+ typedef struct
+ 	{
+ 	struct _GkrellmMonitor	*mon;
+ 	gchar		*name,
+ 				*tab_name;
+-	void		(*warn_func)(),
+-				(*alarm_func)(),
+-				(*update_func)(),
+-				(*check_func)(),
+-				(*destroy_func)();
+-	void		(*config_create_func)(),
+-				(*config_apply_func)(),
+-				(*config_save_func)(),
+-				(*config_load_func)();
++	void		(*warn_func)(GkrellmAlert *alert, gpointer data, gboolean state),
++				(*alarm_func)(GkrellmAlert *alert, gpointer data, gboolean state),
++				(*update_func)(GkrellmAlert *alert, gpointer data),
++				(*check_func)(GkrellmAlert *alert, gpointer data, gfloat value),
++				(*destroy_func)(GkrellmAlert *alert, gpointer data);
++	void		(*config_create_func)(GtkWidget *vbox, GkrellmAlert *alert, gpointer data),
++				(*config_apply_func)(GkrellmAlert *alert, gpointer data, gboolean closing),
++				(*config_save_func)(GkrellmAlert *alert, gpointer data, FILE *f, gchar *p, gchar *id),
++				(*config_load_func)(GkrellmAlert *alert, gchar *config_id, gchar *alert_id);
+ 	}
+ 	GkrellmAlertPlugin;
+ 
+@@ -847,7 +848,7 @@ typedef struct
+ 	}
+ 	GkrellmAlertkrell;
+ 
+-typedef struct
++struct GkrellmAlert
+ 	{
+ 	GkrellmPanel *panel;
+ 	gchar		*name,
+@@ -870,15 +871,15 @@ typedef struct
+ 				alarm_repeat;
+ 	gint		delay;
+ 
+-	void		(*cb_trigger)();
++	void		(*cb_trigger)(GkrellmAlert *alert, gpointer data);
+ 	gpointer	cb_trigger_data;
+ 	void		(*cb_stop)();
+ 	gpointer	cb_stop_data;
+-	void		(*cb_config)();
++	void		(*cb_config)(GkrellmAlert *alert, gpointer data);
+ 	gpointer	cb_config_data;
+-	void		(*cb_config_create)();
++	void		(*cb_config_create)(GkrellmAlert *alert, GtkWidget *vbox1, gpointer data);
+ 	gpointer	cb_config_create_data;
+-	void		(*cb_command_process)();
++	void		(*cb_command_process)(GkrellmAlert *alert, gchar *src, gchar *buf, gint size, void* target);
+ 	gpointer	cb_command_process_data;
+ 
+ 	GtkWidget	*config_window,
+@@ -910,8 +911,7 @@ typedef struct
+ 
+ 	gchar		*id_string;		/* For unique alert names for alert plugins */
+ 	GList		*plugin_list;
+-	}
+-	GkrellmAlert;
++	};
+ 
+ /* ------------------------ */
+ 
+--- a/src/inet.c
++++ b/src/inet.c
+@@ -36,7 +36,8 @@
+ #include "gkrellm-sysdeps.h"
+ #include "inet.h"
+ 
+-typedef struct
++typedef struct InetMon InetMon;
++struct InetMon
+ 	{
+ 	GtkWidget	*vbox;
+ 	gchar		*name;
+@@ -87,8 +88,7 @@ typedef struct
+ 						port1_1;
+ 
+ 	gulong				krell_hits;
+-	}
+-	InetMon;
++	};
+ 
+ static GkrellmMonitor *mon_inet;
+ 
+@@ -824,9 +824,10 @@ cb_panel_press(GtkWidget *widget, GdkEventButton *ev)
+   /* Lock the hour and minute heights together.
+   */
+ static void
+-cb_inet_height(GkrellmChartconfig *cf, InetMon *in)
++cb_inet_height(GkrellmChartconfig *cf, gpointer data)
+ 	{
+ 	gint	h;
++	InetMon	*in = (InetMon*) data;
+ 
+ 	h = gkrellm_get_chartconfig_height(cf);
+ 	if (in->chart_minute->h != h)
+--- a/src/krell.c
++++ b/src/krell.c
+@@ -1483,7 +1483,7 @@ gkrellm_show_button(GkrellmDecalbutton *b)
+ 	}
+ 
+ gboolean
+-gkrellm_in_button(GkrellmDecalbutton *b, GdkEventButton *ev)
++gkrellm_in_button(GkrellmDecalbutton *b, GdkEventButton *ev, gpointer data)
+ 	{
+ 	return gkrellm_in_decal(b->decal, ev);
+ 	}
+--- a/src/mail.c
++++ b/src/mail.c
+@@ -255,12 +255,13 @@ typedef struct
+ 	}
+ 	MailAccount;
+ 
+-typedef struct
++typedef struct Mailbox Mailbox;
++struct Mailbox
+ 	{
+ 	MailAccount	*account;
+ 	gboolean	busy;
+ 	GString		*tcp_in;
+-	gboolean	(*check_func)();
++	gboolean	(*check_func)(Mailbox *mbox);
+ 	gpointer	data;			/* For external mailboxes (in plugins) */
+ 	GThread*	thread;
+ 	gint		mail_count;
+@@ -277,8 +278,7 @@ typedef struct
+ 	gchar		*uidl;
+ 	gboolean	warned;
+ 	void		*private;
+-	}
+-	Mailbox;
++	};
+ 
+ static GList	*mailbox_list;
+ 
+@@ -2309,9 +2309,8 @@ reset_mail_fetch(void)
+ 	}
+ 
+ static gboolean
+-run_fetch_program(void)
++run_fetch_program(Mailbox *mbox)
+ 	{
+-	Mailbox		*mbox;
+ 	Mailproc	*mp	= (Mailproc *) mail_fetch->private;
+ 	GList		*list;
+ 
+--- a/src/mem.c
++++ b/src/mem.c
+@@ -662,8 +662,9 @@ cb_panel_motion(GtkWidget *widget, GdkEventButton *ev)
+ 	}
+ 
+ static void
+-setup_scaling(GkrellmChartconfig *cf, MeminfoChart *mc)
++setup_scaling(GkrellmChartconfig *cf, gpointer data)
+ 	{
++	MeminfoChart* mc = (MeminfoChart*)data;
+ 	GkrellmChart	*cp	  = mc->chart;
+ 	gint	res   = DEFAULT_GRID_RES,
+ 			grids = FULL_SCALE_GRIDS;
+--- a/src/net.c
++++ b/src/net.c
+@@ -1165,8 +1165,9 @@ grid_resolution_default(NetMon *net)
+ 	}
+ 
+ static void
+-setup_net_scaling(GkrellmChartconfig *cf, NetMon *net)
++setup_net_scaling(GkrellmChartconfig *cf, gpointer data)
+ 	{
++	NetMon *net = (NetMon*)data;
+ 	GkrellmChart	*cp  = net->chart;
+ 	gint	grids, res;
+ 
+--- a/src/proc.c
++++ b/src/proc.c
+@@ -333,7 +333,7 @@ cb_proc_extra(GtkWidget *widget, GdkEventButton *ev)
+ 	}
+ 
+ static void
+-setup_proc_scaling(void)
++setup_proc_scaling(GkrellmChartconfig *config, gpointer data)
+ 	{
+ 	GkrellmChart	*cp		= proc.chart;
+ 	gint			grids, res, new_fork_scaling;
+@@ -567,7 +567,7 @@ create_proc_monitor(GtkWidget *vbox, gint first_create)
+ 					_("Average process load per minute"));
+ 
+ 	gkrellm_alloc_chartdata(cp);
+-	setup_proc_scaling();
++	setup_proc_scaling(NULL, NULL);
+ 
+ 	/* I put motherboard temp on Proc panel (if temperature sensors found)
+ 	*/
+--- a/src/sensors.c
++++ b/src/sensors.c
+@@ -1985,7 +1985,7 @@ static Sensor		*dragged_sensor;
+ 
+ static gint			sensor_last_group;
+ 
+-static gboolean		(*original_row_drop_possible)();
++static gboolean		(*original_row_drop_possible)(GtkTreeDragDest *drag_dest, GtkTreePath *path, GtkSelectionData *selection_data);
+ 
+ 
+ 
+--- a/src/sysdeps-unix.c
++++ b/src/sysdeps-unix.c
+@@ -89,7 +89,7 @@
+ #endif
+ 
+ #if !defined(SENSORS_COMMON) && !defined(WIN32)
+-static gboolean (*mbmon_check_func)();
++static gboolean (*mbmon_check_func)(gboolean);
+ #endif
+ 
+ gchar *
+--- a/src/sysdeps/sensors-common.c
++++ b/src/sysdeps/sensors-common.c
+@@ -54,7 +54,7 @@ static gchar	gkrellm_decimal_point,
+ 				mbmon_decimal_point;
+ static gboolean	mbmon_need_decimal_point_fix;
+ 
+-static gboolean (*mbmon_check_func)();
++static gboolean (*mbmon_check_func)(gboolean);
+ 
+ static gboolean
+ mbmon_decimal_point_fix(gchar *buf)
+-- 
+2.39.1
+
+
diff --git a/app-admin/gkrellm/gkrellm-2.3.11-r4.ebuild b/app-admin/gkrellm/gkrellm-2.3.11-r4.ebuild
new file mode 100644
index 000000000000..a978bc39106d
--- /dev/null
+++ b/app-admin/gkrellm/gkrellm-2.3.11-r4.ebuild
@@ -0,0 +1,151 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PLOCALES="bg cs da de es fr it ja nl pl po pt pt_BR ru sl sv uk"
+PLOCALE_BACKUP="en"
+inherit desktop plocale systemd toolchain-funcs
+
+DESCRIPTION="Single process stack of various system monitors"
+HOMEPAGE="http://gkrellm.srcbox.net/"
+if [[ "${PV}" == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.srcbox.net/gkrellm/gkrellm.git"
+else
+	SRC_URI="http://gkrellm.srcbox.net/releases/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+LICENSE="GPL-3+"
+SLOT="2"
+IUSE="gnutls hddtemp lm-sensors nls ntlm ssl X"
+
+RDEPEND="
+	acct-group/gkrellmd
+	acct-user/gkrellmd
+	dev-libs/glib:2
+	hddtemp? ( app-admin/hddtemp )
+	ssl? (
+		gnutls? ( net-libs/gnutls )
+		!gnutls? (
+			dev-libs/openssl:0=
+		)
+	)
+	lm-sensors? ( sys-apps/lm-sensors:= )
+	nls? ( virtual/libintl )
+	ntlm? ( net-libs/libntlm )
+	X? (
+		x11-libs/gdk-pixbuf
+		x11-libs/gtk+:2
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/pango
+		)
+"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto
+	nls? ( sys-devel/gettext )
+"
+
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.3.5-config.patch"
+	"${FILESDIR}/${PN}-2.3.5-width.patch"
+	"${FILESDIR}/${PN}-2.3.5-sansfont.patch"
+	"${FILESDIR}/${PN}-2.3.11-clang16.patch"
+)
+
+DOCS=( Changelog CREDITS README )
+
+pkg_pretend() {
+	if use gnutls && ! use ssl ; then
+		ewarn "You have enabled the \"gnutls\" USE flag but not the \"ssl\" USE flag."
+		ewarn "No ssl backend will be built!"
+	fi
+}
+
+src_prepare() {
+	sed -e 's:-O2 ::' \
+		-e 's:override CC:CFLAGS:' \
+		-e 's:-L/usr/X11R6/lib::' \
+		-i */Makefile || die "sed Makefile(s) failed"
+
+	sed -e "s:/usr/lib:${EPREFIX}/usr/$(get_libdir):" \
+		-e "s:/usr/local/lib:${EPREFIX}/usr/local/$(get_libdir):" \
+		-i src/${PN}.h || die "sed ${PN}.h failed"
+
+	delete_locale() {
+		local locale=${1}
+		rm -f po/${locale}{.po,.mo} || die
+	}
+
+	plocale_for_each_disabled_locale delete_locale
+
+	default
+}
+
+src_compile() {
+	TARGET=
+
+	if use X ; then
+		emake \
+			${TARGET} \
+			CC="$(tc-getCC)" \
+			STRIP="" \
+			INSTALLROOT="${EPREFIX}/usr" \
+			INCLUDEDIR="${EPREFIX}/usr/include/gkrellm2" \
+			LOCALEDIR="${EPREFIX}/usr/share/locale" \
+			$(usex nls "" "enable_nls=0") \
+			$(usex lm-sensors "" "without-libsensors=yes") \
+			$(usex ntlm "" "without-ntlm=yes") \
+			$(usex ssl $(usex gnutls 'without-ssl=yes' 'without-gnutls=yes') 'without-ssl=yes without-gnutls=yes')
+	else
+		cd server || die
+		emake \
+			${TARGET} \
+			CC="$(tc-getCC)" \
+			LINK_FLAGS="$LDFLAGS -Wl,-E" \
+			STRIP="" \
+			$(usex nls "" "enable_nls=0") \
+			$(usex lm-sensors "" "without-libsensors=yes")
+	fi
+}
+
+src_install() {
+	if use X ; then
+		emake \
+			install${TARGET:+_}${TARGET} \
+			$(usex nls "" "enable_nls=0") \
+			STRIP="" \
+			INSTALLDIR="${ED}/usr/bin" \
+			INCLUDEDIR="${ED}/usr/include" \
+			LOCALEDIR="${ED}/usr/share/locale" \
+			PKGCONFIGDIR="${ED}/usr/$(get_libdir)/pkgconfig" \
+			MANDIR="${ED}/usr/share/man/man1"
+
+		docinto html
+		dodoc *.html
+
+		newicon src/icon.xpm ${PN}.xpm
+		make_desktop_entry ${PN} GKrellM ${PN}
+	else
+		dobin server/gkrellmd
+
+		insinto /usr/include/gkrellm2
+		doins server/gkrellmd.h
+		doins shared/log.h
+	fi
+
+	newinitd "${FILESDIR}"/gkrellmd.initd gkrellmd
+	newconfd "${FILESDIR}"/gkrellmd.conf gkrellmd
+
+	systemd_dounit "${FILESDIR}"/gkrellmd.service
+
+	insinto /etc
+	doins server/gkrellmd.conf
+
+	einstalldocs
+}
diff --git a/app-admin/gkrellm/gkrellm-9999.ebuild b/app-admin/gkrellm/gkrellm-9999.ebuild
index 99b3fd485f45..a978bc39106d 100644
--- a/app-admin/gkrellm/gkrellm-9999.ebuild
+++ b/app-admin/gkrellm/gkrellm-9999.ebuild
@@ -3,7 +3,9 @@
 
 EAPI=8
 
-inherit desktop systemd toolchain-funcs
+PLOCALES="bg cs da de es fr it ja nl pl po pt pt_BR ru sl sv uk"
+PLOCALE_BACKUP="en"
+inherit desktop plocale systemd toolchain-funcs
 
 DESCRIPTION="Single process stack of various system monitors"
 HOMEPAGE="http://gkrellm.srcbox.net/"
@@ -53,6 +55,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-2.3.5-config.patch"
 	"${FILESDIR}/${PN}-2.3.5-width.patch"
 	"${FILESDIR}/${PN}-2.3.5-sansfont.patch"
+	"${FILESDIR}/${PN}-2.3.11-clang16.patch"
 )
 
 DOCS=( Changelog CREDITS README )
@@ -74,6 +77,13 @@ src_prepare() {
 		-e "s:/usr/local/lib:${EPREFIX}/usr/local/$(get_libdir):" \
 		-i src/${PN}.h || die "sed ${PN}.h failed"
 
+	delete_locale() {
+		local locale=${1}
+		rm -f po/${locale}{.po,.mo} || die
+	}
+
+	plocale_for_each_disabled_locale delete_locale
+
 	default
 }
 
diff --git a/app-admin/gkrellm/metadata.xml b/app-admin/gkrellm/metadata.xml
index 5176167a404f..08e0e2b332c5 100644
--- a/app-admin/gkrellm/metadata.xml
+++ b/app-admin/gkrellm/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>sam@gentoo.org</email>
+		<name>Sam James</name>
+	</maintainer>
 	<use>
 		<flag name="gnutls">Enable SSL support for mail checking with <pkg>net-libs/gnutls</pkg> (overrides 'ssl' USE flag)</flag>
 		<flag name="ssl">Enable SSL support for mail checking with <pkg>dev-libs/openssl</pkg></flag>
diff --git a/app-admin/testdisk/Manifest b/app-admin/testdisk/Manifest
index ea36ae33f916..117d7f723915 100644
--- a/app-admin/testdisk/Manifest
+++ b/app-admin/testdisk/Manifest
@@ -1,5 +1,5 @@
 AUX testdisk-7.1-backport-ntfs-3g-ioctl-prototype.patch 1268 BLAKE2B 9c57329b3576cef7f23177fe07d45cd49a449b4353a9abd3a3196a9ec2896a05e900b1d7785d087f4587642d786efb36ea655d8b2c35833c8736014fbdad9cfb SHA512 7325ff2d83350512acf2e0b3f2269cdc4a92f775eafeae62c0b337fa4f31dac0c4f56d9ed7397fbd8a29d7679eb259401ca934d48c51438bfc4e3d0e0bcf7e00
 DIST testdisk-7.1.tar.bz2 742006 BLAKE2B ad67cbef73e502df39cd04537bae9226d043a0f5ed824ed24d5a5ac7c3262060d0c78bfcf38159890ee0c270e1cd7690cbf276eb919e1b4721357fffc8679c61 SHA512 ad6531eec45c1ed8d4a0ce6132692bb609c4c269fbca57f788ce808214e0b00b5fb1187745a859c5da8a3cb8de18b29904792d3246b15cedfa24bf24cbfe3df5
 EBUILD testdisk-7.1-r1.ebuild 2354 BLAKE2B afc950294c018dbff1423bbfa67e07a9ba6de3166629d8c09bbaafd878071658c9e462d8cf9cdbc5fd85bfdf994050527d164dceee9c7c9f395f1d6d1d2162d6 SHA512 9f878e51186866e6b8d5621e629f020218f24544b611733fb581925fb8fa916cde3ffbf42a29dd5a77e4224e88a0be1029eaaaaf84ec716ebcbc7eb5ed5e4a64
-EBUILD testdisk-7.1-r2.ebuild 2488 BLAKE2B fce98752a6cea2713ff003d9b6140ed071142c6ad7896f8ca7813714fad5cee6f8e2059c7bc5a2523478d30560baf3da43f085c5f8b847c325f70cf3efee556e SHA512 f0d18b3f24b00075380a561a6aed75dbe43dcc28e567c6c3d65422a38a066274b878b631443716b9a5425548d4ced0a45f8cd439814575c74d0456b9e9b4b7c5
+EBUILD testdisk-7.1-r2.ebuild 2487 BLAKE2B ee5dcbaced5760bec08a8956a90537c724fbe252111fc2a415652fec7790e29ee2926cd8b47ec2ed5ee3fa81d85f76ce90725b50a71d5e70996773f072708c0f SHA512 d37a02399c2001fbef952e4b3c4ec3fb56a26b48cd5e88bb8e6f95f81345f73c4cde29b84553807801f0cd1fd8f7adf9cbce602d1e9280a3f026c14fb9aaa08b
 MISC metadata.xml 640 BLAKE2B 2c906cdb19a874657ac6f51ea5ec0035b27b0644e73faac95b9234a888a991bc8d9026252a0bf1bd32841295519fe2a966f77101396ca8071dd96c3f742bfd24 SHA512 8996a1f5afaaf7cf18f088d342b717d43316737e92c7b891c63613f9698e4b60bcdc6c65d3d87e4ce4da129b40993e3a60c75544dd5503e9d104d2652460b58c
diff --git a/app-admin/testdisk/testdisk-7.1-r2.ebuild b/app-admin/testdisk/testdisk-7.1-r2.ebuild
index a891080e0dcc..746af9681ff3 100644
--- a/app-admin/testdisk/testdisk-7.1-r2.ebuild
+++ b/app-admin/testdisk/testdisk-7.1-r2.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=7
@@ -11,7 +11,7 @@ SRC_URI="https://www.cgsecurity.org/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~riscv ~x86"
 IUSE="ewf jpeg ntfs gui reiserfs static zlib"
 
 REQUIRED_USE="static? ( !gui )"
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index 99214c59797e..c266957ce6a4 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/mu-cite/Manifest b/app-emacs/mu-cite/Manifest
index f45a538b8fda..61d481e854cd 100644
--- a/app-emacs/mu-cite/Manifest
+++ b/app-emacs/mu-cite/Manifest
@@ -1,4 +1,4 @@
 AUX 50mu-cite-gentoo.el 142 BLAKE2B f6631cf5bb32bf66af28c56cf21e0dd51ffc545a47ac82edb0db125b78bbf6a183553b6d0afedcde766df0ae349085253f3edb91718b949341a899f01e6f1733 SHA512 737b4c0c5ae0790e7cc8dbf0d253aadf7cd2680c54940967d93f95dbf6fe80fdbf5290560ef4eacfa16c1a26ab9567726228af7b3b649f859c01b021c10563ef
-DIST mu-cite-201808232348.tar.gz 20443 BLAKE2B 814ebbd3ab45af4af65fee54884a1960a0cecccd07e1e0e084e860fcab4884ca0d97f4042f14f530b8ead4ee4347d13dbde9ecc96f5e82121bad44e0b93855ac SHA512 5a30124041ea5a807f5d8ea8a1ef18afcc7020d3f2d2bee4dd163fa1098d37d27b43db81c1b538bf1d1b06720840fb5c3f95d999fddd624437dd251fa061f699
-EBUILD mu-cite-8.1_p201808232348.ebuild 616 BLAKE2B 79e1b6002f78a7cff3efe8eae072563b91fb37c625e378280a9a513913db86bda87e8e50fdc93a00115a166b218f1da5a52da657a7d37667b0ba1392788d68cc SHA512 a04ea2f2776bbd7bd3bbbe05df93baec2f19bbe4476eea309f65991dffd945be6996f82cb8eea513000a977ec7ee5481cb27f6d9beaeb9e5afbc8f16dd350ed2
+DIST mu-cite-202011031127.tar.gz 21170 BLAKE2B 222aa03b42161d435d2aa09059d5b923fc4e336fce7a61e0a98535decdedb7c1a7c75129f3485118392acb569713b5ad8e0fd3b9be088a67ab15312ad4e94ba8 SHA512 d9fc6f7ad449506b6cd0f72f2e67e9f3c726b90fba39a3ff267aad25cc12a2b34a19c39371e7e58cb66bc9f9ed1b215e6b92f74e20aada4292441b6733ec73eb
+EBUILD mu-cite-8.1_p202011031127.ebuild 617 BLAKE2B 4dd947a13a23081c3fbe9cd5bae8a11cd98d015183e7c3874ee37eb8d400b53057d89381735d8c7d26db03732bfc3eab149e789a38509f7c2783cfe0ef0a0d89 SHA512 7d7dae0182cca9fdc1e465fe1476c32ca1e255a4cfa8ace9270af3141884327ab5a86ab8c2faa66d09f97b4bdfe70e341989f0d40ce1976dfba00b42ffc9ebfe
 MISC metadata.xml 462 BLAKE2B 5169fdf55a196037484ea95fbc8d856878f57bbd6c048cd69d38f24ba3d2f77d673c379993ada6b477615dad99406cc8b397ab43e9a012d2cbcaba51ceff71bf SHA512 bf673b7d2ff05bbfbb18d228a8d29150c92d7e4a784d557c2e37353f8c78acd8c5cefed81904c3829aef575fcdf9e9a71f2693d2b0184666b80edf993e5b955a
diff --git a/app-emacs/mu-cite/mu-cite-8.1_p201808232348.ebuild b/app-emacs/mu-cite/mu-cite-8.1_p202011031127.ebuild
index b27d88c3a9c4..6849c76749ec 100644
--- a/app-emacs/mu-cite/mu-cite-8.1_p201808232348.ebuild
+++ b/app-emacs/mu-cite/mu-cite-8.1_p202011031127.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit elisp
 
@@ -9,6 +9,7 @@ MY_P="${PN}-${PV#*_p}"
 DESCRIPTION="Message citation utilities for emacsen"
 HOMEPAGE="https://www.jpl.org/elips/mu/"
 SRC_URI="https://www.jpl.org/elips/mu/snapshots/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2+"
 SLOT="0"
@@ -18,9 +19,8 @@ IUSE="bbdb"
 RDEPEND="app-emacs/apel
 	app-emacs/flim
 	bbdb? ( app-emacs/bbdb )"
-DEPEND="${RDEPEND}"
+BDEPEND="${RDEPEND}"
 
-S="${WORKDIR}/${MY_P}"
 SITEFILE="50${PN}-gentoo.el"
 DOCS="ChangeLog NEWS README.en"
 
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index e341e8b03fa5..59d0096392ad 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest
index 4c1494845431..971b746d5f1c 100644
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@@ -13,15 +13,18 @@ AUX virtualbox-6.1.42-python3_11.patch 2737 BLAKE2B a0dcd9afcdf2e07a55e3fba54e0e
 AUX virtualbox-7.0.0-fix-compilation-clang.patch 1638 BLAKE2B 2c1c021a5b95ffdbd46982249c3a60e97d79db17994491c3c1774d7fc889d5b5a0da974d05859e21772b6f265bf1009ad3f13d19a5d264c7f8b4b2bacd6a9bdb SHA512 9c83dfb1550463fc9ddce68dd0648b12721ad1f9fa92fac2e7234ac8149fc5a1a5698a759d1352fc8003d737ce987fbc476ed9a9b350490cf52e42e1a08444dd
 AUX virtualbox-7.0.0-python3_11.patch 3258 BLAKE2B 366b799159039caf3d7c41b06780aa80e131fe01b6b0985375a1bcf8de3cf98b611f5c19fdc1762d0de8e052fbe3cf117085c50b4f3e468e9eaf5a5545cf0f92 SHA512 ccc3ba08ec0ebebda9c17fd2a2bb53f2555da9e1c2dee5cf942b300d8c6e745ad46f3d12a5811a9e5c4c582ca796152b9a4fd92e66ab10b421bac0796106f4f9
 AUX virtualbox-7.0.4-fix-compilation.patch 919 BLAKE2B 656a41064773f0d96a3a31287e82537cf93e24d0794c3d4a24ba3378607028b8dc9a9b77a20ee001e2dbff5603043f8e306195610742461d4b1030ecdd3e9918 SHA512 7eb266aee12a489c5e89e1d2f682a421865aa459eb9ac5a9be9c59afa4e0cc8f9f2eb46650d73ef11cdc8c27a021ea37ef9c1150bddf818130d16c29d334651a
+AUX virtualbox-7.0.6-gcc-13.patch 579 BLAKE2B 50d629cafe1aff45ed08d712ab730555f2093336f28be38246c54a60ccbefab880b4b5a548b45e151c583749d347a26dc43fc5fef4e8c400c7bad424c9fa366a SHA512 34b5543c62044d530ee5927b367301f39d465d6177cfa2023578ff572d8e62eef2c5a06e1ec8d274fc582c017232b3603f668a1c09ec7774620e83245cdf90ba
 AUX virtualbox-ose-6-wrapper 3578 BLAKE2B c150e578212435268de3c5fb0eea701bc843ec2241dc3839d3d1e33604fc01f6bdff6ed0425ba6917072f652b8c29d0df9a550a92900ca13306fcd36521afbee SHA512 315d981f3e92f2e0134946f6bbb8ad4ea4228afb8f73aaed7feead59b3f55cef01cec4285a7fdaf30ce0931d8b69bda4698baebd63d11f2cd9dfe9d0591a0f40
 AUX virtualbox-vboxusb_tmpfilesd 35 BLAKE2B 56937e236a0e4d1a2aa085271e8ae0af9553fdf7c3b804af4d3fda3aa8dbc32d63762fee90bc949390cb9cd67f2f0111894c8af084731dab6920ae1675c69a64 SHA512 72e4602f5f214f8833486f5c787c263a10390e8bdf65b5615d67c35ec44048f02add12fe43b19f9c57a9d2f12d768c52e54fcfb9052c0611d06cc988a698c171
 DIST VirtualBox-6.1.40.tar.bz2 165769795 BLAKE2B 5c216f23422be3fc4f7760881c666c57a516d12726ed8ef040bbdf918f1af53c69d204b22949e25f751cbe788b00c810c49c27b7c51c1837fd1c503a3eff202c SHA512 0dace071fe58500d0912fe4da4751de6840752375039554a56c8c753a0880a419c4a1ed7f1b0ebc51230f7099ca3f5d987dc7b91ad4d98dbd75bf63e3c27e096
 DIST VirtualBox-6.1.42.tar.bz2 165554573 BLAKE2B 8419793d9e4c4d0804baba926443a27259b012ab90d1bb27c8f9d90b018ddbef83d1cc47e9f5b88e6e247f22c186603584a5ddee4b0c04fe842eba56f3fd103a SHA512 a4861b44ee85d6d1d72ba1d19b5598873503feeb6d562cf7d8c770cc9b466741bdfa5abe74dc4e7952ff189d14c6caf60f584731492c38f688a360baba019ab2
 DIST VirtualBox-7.0.4.tar.bz2 199658172 BLAKE2B 51bde109805e8f3e25f179a05fac532de7a428010955c7cc2a7c9e8c072246d69c5f51f8a51e39b6a1b9f246bd945edc38e0f0cc0630c357a5e9641c38dcac21 SHA512 70f2031c4897249177131795281bf6bd5a75166067d1921db70fd1e21f5638285b5a0c3298a7070e272ac2f093a60c35eb3cab4e5f7d16a68d17b211f637b0bc
 DIST VirtualBox-7.0.6.tar.bz2 199512172 BLAKE2B cfe4d7abd57dfdb0294177759e80aa9fda797b9b5433f214771a57764cb23404450169e8c7c30cda13de85b8e02a37024584c7b1f0b5a44b10b100aa66b8d5c5 SHA512 f9db7a154e392f550f50abe774fc6263eb0b6f86dccc069f2c5012fedbe2debbf5b8ba62cca44ea0d5d5475652188176bfb888266f69197677b22854f02b64a0
+DIST virtualbox-help-7.0.6.tar.xz 3939412 BLAKE2B ea1326bccb3c2edc33ab37e122a7bedf79475d335e632ee62f99e0dce4b80de7634cbfe121c8c7ccd6588ff3b81effe7b20efe123cc44bc7b1ff4f6a851302a6 SHA512 ffb59f0c99c91b165a0b83d29317e04eee9097b0d0ac92a0d3e71558e70ec8b2807491a4633562a5e820e5f5a8e1339883031fd03de93d09a188f19b8b4d3a93
 DIST virtualbox-patches-6.1.36.tar.bz2 2733 BLAKE2B dcfebfeca4873d382441515d48b4dfee9343bc7c83ea3cbb5002dbf7975143a79fae9a701b67dc35505e9ca03ff1b6293cb7c3279c4fdfda8ad21ba5fb9b7e87 SHA512 1bed5cdefbf8e7c4b0d9092ba4961ecf2262f27f35c71a91ef6f2e8fe8a1d92ed74f06bafbf58d70ba7165d933997f58073f4d4f4051e3ba5c0339b729066f57
 EBUILD virtualbox-6.1.40.ebuild 18343 BLAKE2B 02cda507a7265373635fab733457683571de408cb419f676300c50c4474ef0e048b4a57b01e894518eed858d84f39467e7a63c588bbbefd83d79a93cfe1115e5 SHA512 135bd0aa1fad4c666c283b4e60c97374aabeb0d4315f91798cb8ab2185eb708ffb83d1e2b84b2e48390d61109a13528ba896780eea38e654f66efeab69268a20
 EBUILD virtualbox-6.1.42.ebuild 18585 BLAKE2B 7a1733ac669a766b937062af4e8dee621641d88f212e17d47cae10a2361ad9d20dd7a5cdaa00bc6f1f7819ba70a500f86f1fe2ce2b31571b0691325d33d3c9b7 SHA512 6673ae8818f6abbcb53807e6d18e5a6344855616fc7d35f4064caa87980c1d73895d5daa0f237c0a8aab61b2b6f1fda87589cf8e3e453ed80bf3cecce1217197
 EBUILD virtualbox-7.0.4-r1.ebuild 19650 BLAKE2B 454f2cf8299e6a8613fc70153e5bdcc542776d852e3da4a2cbaa50e29159ddc97a0c145015efec5cbf0db988a21b0e911d2cd755fafb6d7ccaaa39f09b18e07b SHA512 2057e377f27bf928926e7cb0a2df9b03591aab1a20e8c7903853528c61d4b1d0fc2ec29de6efa39381fc2d626fc6001244680a07632df65b2032dea1a96a5d01
 EBUILD virtualbox-7.0.6-r1.ebuild 20262 BLAKE2B c806d069b661256f31389c262891126888a30801eb53874b687f91ec3771f87e2b588471358c6f133f9473a362401dd7ffef608d5aebb916aa392ef35f89c7a4 SHA512 3c8775c1494bd037b397b70208d6f873316c56abec02f717242db373677892d4bccd171f92c4356fbba1315e4b23abd193dcb25b953e8f6e05b6becd9fdcdec2
+EBUILD virtualbox-7.0.6-r2.ebuild 20386 BLAKE2B 7f17744cff504ec1e5a97f6d1d25956b714829f9f551c780fa3c711422d3f63311a155edf740684ee5cd9fff5397996889c504dd823ae76aa271423570682b10 SHA512 93a050cb9636828e08bb3dfd690421341ecf3c5e1af8cd6990f39f3d6651aebb023f2a8945bc2a5addd3476cd8f859ea5271a78f179d71342b9390390950c9ba
 MISC metadata.xml 852 BLAKE2B 28c7b361100939ca374829ca6a28b9ff8d4fd5ad22d2750f005514ed25e43b9a3c9c00984ae4f94a89109d49b47826676576d25c001fbcdb4ea6d6d8a5e8b9ee SHA512 a67b3217cabe9dfa15d26617ab30218cd3b63a9eca9902213efc420b9efe0174de71b59091b663f8783a88ece857912aaaee8868a3aed3b309e6cd5993c5a7d4
diff --git a/app-emulation/virtualbox/files/virtualbox-7.0.6-gcc-13.patch b/app-emulation/virtualbox/files/virtualbox-7.0.6-gcc-13.patch
new file mode 100644
index 000000000000..ed3a2d02fbc0
--- /dev/null
+++ b/app-emulation/virtualbox/files/virtualbox-7.0.6-gcc-13.patch
@@ -0,0 +1,28 @@
+Add a few missing includes.
+
+Bug: https://bugs.gentoo.org/892852
+
+--- a/src/libs/dxvk-native-1.9.2a/src/util/util_matrix.cpp
++++ b/src/libs/dxvk-native-1.9.2a/src/util/util_matrix.cpp
+@@ -1,3 +1,4 @@
++#include <cstdint>
+ #include "util_matrix.h"
+ 
+ namespace dxvk {
+@@ -229,4 +230,4 @@
+     return os;
+   }
+ 
+-}
+\ No newline at end of file
++}
+--- a/src/libs/dxvk-native-1.9.2a/src/util/util_vector.h
++++ b/src/libs/dxvk-native-1.9.2a/src/util/util_vector.h
+@@ -1,6 +1,7 @@
+ #pragma once
+ 
+ #include <iostream>
++#include <cstdint>
+ 
+ #include "util_bit.h"
+ #include "util_math.h"
diff --git a/app-emulation/virtualbox/virtualbox-7.0.6-r2.ebuild b/app-emulation/virtualbox/virtualbox-7.0.6-r2.ebuild
new file mode 100644
index 000000000000..e5a64541f0f7
--- /dev/null
+++ b/app-emulation/virtualbox/virtualbox-7.0.6-r2.ebuild
@@ -0,0 +1,729 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# To add a new Python here:
+# 1. Patch src/libs/xpcom18a4/python/Makefile.kmk (copy the previous impl's logic)
+#    Do NOT skip this part. It'll end up silently not-building the Python extension
+#    or otherwise misbehaving if you do.
+#
+# 2. Then update PYTHON_COMPAT & set PYTHON_SINGLE_TARGET for testing w/ USE=python.
+#
+#  May need to look at other distros (e.g. Arch Linux) to find patches for newer
+#  Python versions as upstream tends to lag. Upstream may have patches on their
+#  trunk branch but not release branch.
+#
+#  See bug #785835, bug #856121.
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit desktop edo flag-o-matic java-pkg-opt-2 linux-info multilib optfeature pax-utils \
+	python-single-r1 tmpfiles toolchain-funcs udev xdg
+
+MY_PN="VirtualBox"
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Family of powerful x86 virtualization products for enterprise and home use"
+HOMEPAGE="https://www.virtualbox.org/"
+SRC_URI="
+	https://download.virtualbox.org/virtualbox/${PV}/${MY_P}.tar.bz2
+	https://gitweb.gentoo.org/proj/virtualbox-patches.git/snapshot/virtualbox-patches-6.1.36.tar.bz2
+	gui? ( !doc? ( https://dev.gentoo.org/~ceamac/${CATEGORY}/${PN}/${PN}-help-${PV}.tar.xz ) )
+"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="GPL-2+ GPL-3 LGPL-2.1 MIT dtrace? ( CDDL )"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+IUSE="alsa dbus debug doc dtrace +gui java lvm nls pam pch pulseaudio +opengl python +sdk +sdl +udev vboxwebsrv vde vnc"
+
+unset WATCOM #856769
+
+COMMON_DEPEND="
+	${PYTHON_DEPS}
+	acct-group/vboxusers
+	~app-emulation/virtualbox-modules-${PV}
+	dev-libs/libtpms
+	dev-libs/libxml2
+	dev-libs/openssl:0=
+	media-libs/libpng:0=
+	media-libs/libvpx:0=
+	net-misc/curl
+	sys-libs/zlib
+	dbus? ( sys-apps/dbus )
+	gui? (
+		dev-qt/qtcore:5
+		dev-qt/qtdbus:5
+		dev-qt/qtgui:5
+		dev-qt/qthelp:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtx11extras:5
+		dev-qt/qtxml:5
+		x11-libs/libX11
+		x11-libs/libXt
+		opengl? ( dev-qt/qtopengl:5 )
+	)
+	lvm? ( sys-fs/lvm2 )
+	opengl? (
+		media-libs/libglvnd[X]
+		media-libs/vulkan-loader
+		x11-libs/libX11
+		x11-libs/libXt
+	)
+	pam? ( sys-libs/pam )
+	sdl? (
+		media-libs/libsdl:0[X,video]
+		x11-libs/libX11
+		x11-libs/libXcursor
+		x11-libs/libXt
+	)
+	vboxwebsrv? ( net-libs/gsoap[-gnutls(-),debug?] )
+	vde? ( net-misc/vde )
+	vnc? ( >=net-libs/libvncserver-0.9.9 )
+"
+# We're stuck on JDK (and JRE, I guess?) 1.8 because of need for wsimport
+# with USE="vboxwebsrv java". Note that we have to put things in DEPEND,
+# not (only, anyway) BDEPEND, as the eclass magic to set the environment variables
+# based on *DEPEND doesn't work for BDEPEND at least right now.
+#
+# There's a comment in Config.kmk about it
+# ("With Java 11 wsimport was removed, usually part of a separate install now.")
+# but it needs more investigation.
+#
+# See bug #878299 to track this issue.
+DEPEND="
+	${COMMON_DEPEND}
+	>=dev-libs/libxslt-1.1.19
+	virtual/libcrypt:=
+	alsa? ( >=media-libs/alsa-lib-1.0.13 )
+	gui? (
+		x11-base/xorg-proto
+		x11-libs/libxcb:=
+		x11-libs/libXcursor
+		x11-libs/libXext
+		x11-libs/libXinerama
+		x11-libs/libXmu
+		x11-libs/libXrandr
+	)
+	java? ( virtual/jdk:1.8 )
+	opengl? (
+		x11-base/xorg-proto
+		x11-libs/libXcursor
+		x11-libs/libXinerama
+		x11-libs/libXmu
+		x11-libs/libXrandr
+		virtual/glu
+	)
+	sdl? ( x11-libs/libXinerama )
+	pulseaudio? ( media-sound/pulseaudio )
+	udev? ( >=virtual/udev-171 )
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	gui? ( x11-libs/libxcb:= )
+	java? ( virtual/jre:1.8 )
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	app-arch/tar
+	>=dev-lang/yasm-0.6.2
+	dev-libs/libIDL
+	dev-util/glslang
+	>=dev-util/kbuild-0.1.9998.3127
+	sys-apps/which
+	sys-devel/bin86
+	sys-libs/libcap
+	sys-power/iasl
+	virtual/pkgconfig
+	doc? (
+		app-text/docbook-sgml-dtd:4.4
+		app-text/docbook-xsl-ns-stylesheets
+		dev-texlive/texlive-basic
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexrecommended
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-fontsextra
+		dev-qt/qthelp:5
+	)
+	gui? ( dev-qt/linguist-tools:5 )
+	nls? ( dev-qt/linguist-tools:5 )
+	java? ( virtual/jdk:1.8 )
+"
+
+QA_FLAGS_IGNORED="
+	usr/lib64/virtualbox/VBoxDDR0.r0
+	usr/lib64/virtualbox/VMMR0.r0
+	usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.r0
+	usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.debug
+"
+
+QA_TEXTRELS="
+	usr/lib64/virtualbox/VMMR0.r0
+	usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.r0
+"
+
+QA_EXECSTACK="
+	usr/lib64/virtualbox/iPxeBaseBin
+	usr/lib64/virtualbox/VMMR0.r0
+	usr/lib64/virtualbox/VBoxDDR0.r0
+	usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.r0
+	usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.debug
+"
+
+QA_WX_LOAD="
+	usr/lib64/virtualbox/iPxeBaseBin
+"
+
+QA_PRESTRIPPED="
+	usr/lib64/virtualbox/VMMR0.r0
+	usr/lib64/virtualbox/VBoxDDR0.r0
+	usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.r0
+"
+
+REQUIRED_USE="
+	java? ( sdk )
+	python? ( sdk )
+	vboxwebsrv? ( java )
+	${PYTHON_REQUIRED_USE}
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.1.26-configure-include-qt5-path.patch # bug #805365
+
+	# This patch is needed to avoid automagic detection based on a hardcoded
+	# list of Pythons in configure. It's necessary but not sufficient
+	# (see the rest of the ebuild's logic for the remainder) to handle
+	# proper Python selection.
+	"${FILESDIR}"/${PN}-6.1.34-r3-python.patch
+
+	# 865361
+	"${FILESDIR}"/${PN}-6.1.36-fcf-protection.patch
+
+	"${FILESDIR}"/${PN}-7.0.4-fix-compilation.patch
+	"${FILESDIR}"/${PN}-7.0.0-fix-compilation-clang.patch
+	"${FILESDIR}"/${PN}-7.0.0-python3_11.patch
+	"${FILESDIR}"/${PN}-7.0.6-gcc-13.patch
+
+	# Downloaded patchset
+	"${WORKDIR}"/virtualbox-patches-6.1.36/patches
+)
+
+pkg_pretend() {
+	if ! use gui; then
+		einfo "No USE=\"gui\" selected, this build will not include any Qt frontend."
+	fi
+
+	if ! use opengl; then
+		einfo "No USE=\"opengl\" selected, this build will lack"
+		einfo "the OpenGL feature."
+	fi
+	if ! use python; then
+		einfo "You have disabled the \"python\" USE flag. This will only"
+		einfo "disable the python bindings being installed."
+	fi
+	if ! use nls && use gui; then
+		einfo "USE=\"gui\" also selects USE=\"nls\".  This build"
+		einfo "will have NLS support."
+	fi
+
+	# 749273
+	local d=${ROOT}
+	for i in usr "$(get_libdir)"; do
+		d="${d}/$i"
+		if [[ "$(stat -L -c "%g %u" "${d}")" != "0 0" ]]; then
+			die "${d} should be owned by root, VirtualBox will not start otherwise"
+		fi
+	done
+}
+
+pkg_setup() {
+	java-pkg-opt-2_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# Only add nopie patch when we're on hardened
+	if gcc-specs-pie; then
+		eapply "${FILESDIR}"/050_virtualbox-5.2.8-nopie.patch
+	fi
+
+	# Remove shipped binaries (kBuild, yasm) and tools, see bug #232775
+	rm -r kBuild/bin || die
+	# Remove everything in tools except kBuildUnits
+	find tools -mindepth 1 -maxdepth 1 -name kBuildUnits -prune -o -exec rm -r {} \+ || die
+
+	# Disable things unused or split into separate ebuilds
+	sed -e "s@MY_LIBDIR@$(get_libdir)@" \
+		"${FILESDIR}"/${PN}-5-localconfig > LocalConfig.kmk || die
+
+	if ! use pch; then
+		# bug #753323
+		printf '\n%s\n' "VBOX_WITHOUT_PRECOMPILED_HEADERS=1" \
+			>> LocalConfig.kmk || die
+	fi
+
+	# Respect LDFLAGS
+	sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \
+		-i Config.kmk src/libs/xpcom18a4/Config.kmk || die
+
+	# Do not use hard-coded ld (related to bug #488176)
+	sed -e '/QUIET)ld /s@ld @$(LD) @' \
+		-i src/VBox/Devices/PC/ipxe/Makefile.kmk || die
+
+	# Use PAM only when pam USE flag is enbaled (bug #376531)
+	if ! use pam; then
+		einfo "Disabling PAM removes the possibility to use the VRDP features."
+		sed -i 's@^.*VBOX_WITH_PAM@#VBOX_WITH_PAM@' Config.kmk || die
+		sed -i 's@\(.*/auth/Makefile.kmk.*\)@#\1@' \
+			src/VBox/HostServices/Makefile.kmk || die
+	fi
+
+	# add correct java path
+	if use java; then
+		sed "s@/usr/lib/jvm/java-6-sun@$(java-config -O)@" \
+			-i "${S}"/Config.kmk || die
+		java-pkg-opt-2_src_prepare
+	fi
+
+	#856811 #864274
+	# cannot filter out only one flag, some combinations of these flags produce buggy executables
+	for i in abm avx avx2 bmi bmi2 fma fma4 popcnt; do
+		append-cflags $(test-flags-CC -mno-$i)
+		append-cxxflags $(test-flags-CXX -mno-$i)
+	done
+
+	# bug #843437
+	cat >> LocalConfig.kmk <<-EOF || die
+		CXXFLAGS=${CXXFLAGS}
+		CFLAGS=${CFLAGS}
+	EOF
+
+	if use sdl; then
+		echo -e "\nVBOX_WITH_VBOXSDL=1" >> LocalConfig.kmk || die
+	fi
+
+	#443830
+	echo -e "\nVBOX_WITH_VBOX_IMG=1" >> LocalConfig.kmk || die
+
+	# clang assembler chokes on comments starting with /
+	if tc-is-clang; then
+		sed -i -e '/^\//d' src/libs/xpcom18a4/nsprpub/pr/src/md/unix/os_Linux_x86_64.s || die
+	fi
+
+	# fix doc generation
+	echo -e "\nVBOX_PATH_DOCBOOK=/usr/share/sgml/docbook/xsl-ns-stylesheets" >> LocalConfig.kmk || die
+	# replace xhtml names with numeric equivalents
+	find doc/manual -name \*.xml -exec sed -i \
+		-e 's/&nbsp;/\&#160;/g' \
+		-e 's/&ndash;/\&#8211;/g' \
+		-e 's/&larr;/\&#8592;/g' \
+		-e 's/&rarr;/\&#8594;/g' \
+		-e 's/&harr;/\&#8596;/g' {} \+ || die
+
+	# fix help path #891879
+	echo -e "\nVBOX_PATH_PACKAGE_DOCS=/usr/share/doc/${PF}" >> LocalConfig.kmk || die
+
+	# 489208
+	# Cannot patch the whole text, many translations.  Use sed instead to replace the command
+	find src/VBox/Frontends/VirtualBox/nls -name \*.ts -exec sed -i \
+		's/&apos;[^&]*\(vboxdrv setup\|vboxconfig\)&apos;/\&apos;emerge -1 virtualbox-modules\&apos;/' {} \+ || die
+	sed -i "s:'/sbin/vboxconfig':'emerge -1 virtualbox-modules':" \
+		src/VBox/Frontends/VirtualBox/src/main.cpp \
+		src/VBox/VMM/VMMR3/VM.cpp || die
+
+	# 890561
+	echo -e "\nVBOX_GTAR=gtar" >> LocalConfig.kmk || die
+
+	if ! use nls && ! use gui; then
+		cat >> LocalConfig.kmk <<-EOF || die
+			VBOX_WITH_NLS :=
+			VBOX_WITH_MAIN_NLS :=
+			VBOX_WITH_PUEL_NLS :=
+			VBOX_WITH_VBOXMANAGE_NLS :=
+		EOF
+	fi
+}
+
+src_configure() {
+	tc-ld-disable-gold # bug #488176
+
+	tc-export AR CC CXX LD RANLIB
+	export HOST_CC="$(tc-getBUILD_CC)"
+
+	local myconf=(
+		--with-gcc="$(tc-getCC)"
+		--with-g++="$(tc-getCXX)"
+
+		--disable-kmods
+
+		$(usev !alsa --disable-alsa)
+		$(usev !dbus --disable-dbus)
+		$(usev debug --build-debug)
+		$(usev !doc --disable-docs)
+		$(usev !java --disable-java)
+		$(usev !lvm --disable-devmapper)
+		$(usev !pulseaudio --disable-pulse)
+		$(usev !python --disable-python)
+		$(usev vboxwebsrv --enable-webservice)
+		$(usev vde --enable-vde)
+		$(usev vnc --enable-vnc)
+	)
+
+	if use gui || use sdl || use opengl; then
+		myconf+=(
+			$(usev !opengl --disable-opengl)
+			$(usev !gui --disable-qt)
+			$(usev !sdl --disable-sdl)
+		)
+	else
+		myconf+=(
+			--build-headless
+		)
+	fi
+
+	if use amd64 && ! has_multilib_profile; then
+		myconf+=( --disable-vmmraw )
+	fi
+
+	# not an autoconf script
+	edo ./configure "${myconf[@]}"
+
+	# Force usage of chosen Python implementation
+	# bug #856121, bug #785835
+	sed -i \
+		-e '/VBOX_WITH_PYTHON.*=/d' \
+		-e '/VBOX_PATH_PYTHON_INC.*=/d' \
+		-e '/VBOX_LIB_PYTHON.*=/d' \
+		AutoConfig.kmk || die
+
+	cat >> AutoConfig.kmk <<-EOF || die
+		VBOX_WITH_PYTHON=$(usev python 1)
+		VBOX_PATH_PYTHON_INC=$(python_get_includedir)
+		VBOX_LIB_PYTHON=$(python_get_library_path)
+	EOF
+
+	if use python; then
+		local mangled_python="${EPYTHON#python}"
+		mangled_python="${mangled_python/.}"
+
+		# Stub out the script which defines what the Makefile ends up
+		# building for. gen_python_deps.py gets called by the Makefile
+		# with some args and it spits out a bunch of paths for a hardcoded
+		# list of Pythons. We just override it with what we're actually using.
+		# This minimises the amount of patching we have to do for new Pythons.
+		cat > src/libs/xpcom18a4/python/gen_python_deps.py <<-EOF || die
+			print("VBOX_PYTHON${mangled_python}_INC=$(python_get_includedir)")
+			print("VBOX_PYTHON${mangled_python}_LIB=$(python_get_library_path)")
+			print("VBOX_PYTHONDEF_INC=$(python_get_includedir)")
+			print("VBOX_PYTHONDEF_LIB=$(python_get_library_path)")
+		EOF
+
+		chmod +x src/libs/xpcom18a4/python/gen_python_deps.py || die
+	fi
+}
+
+src_compile() {
+	source ./env.sh || die
+
+	# Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)
+	MAKEJOBS=$(grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS})
+	MAKELOAD=$(grep -Eo '(\-l|\-\-load-average)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS})
+	MAKEOPTS="${MAKEJOBS} ${MAKELOAD}"
+
+	local myemakeargs=(
+		VBOX_BUILD_PUBLISHER=_Gentoo
+		VBOX_WITH_VBOXIMGMOUNT=1
+
+		KBUILD_VERBOSE=2
+
+		AS="$(tc-getCC)"
+		CC="$(tc-getCC)"
+		CXX="$(tc-getCXX)"
+
+		TOOL_GCC3_CC="$(tc-getCC)"
+		TOOL_GCC3_LD="$(tc-getCC)"
+		TOOL_GCC3_AS="$(tc-getCC)"
+		TOOL_GCC3_AR="$(tc-getAR)"
+		TOOL_GCC3_OBJCOPY="$(tc-getOBJCOPY)"
+
+		TOOL_GXX3_CC="$(tc-getCC)"
+		TOOL_GXX3_CXX="$(tc-getCXX)"
+		TOOL_GXX3_LD="$(tc-getCXX)"
+		TOOL_GXX3_AS="$(tc-getCXX)"
+		TOOL_GXX3_AR="$(tc-getAR)"
+		TOOL_GXX3_OBJCOPY="$(tc-getOBJCOPY)"
+
+		TOOL_GCC3_CFLAGS="${CFLAGS}"
+		TOOL_GCC3_CXXFLAGS="${CXXFLAGS}"
+		VBOX_GCC_OPT="${CXXFLAGS}"
+		VBOX_NM="$(tc-getNM)"
+
+		TOOL_YASM_AS=yasm
+	)
+
+	if use amd64 && has_multilib_profile; then
+		myemakeargs+=(
+			CC32="$(tc-getCC) -m32"
+			CXX32="$(tc-getCXX) -m32"
+
+			TOOL_GCC32_CC="$(tc-getCC) -m32"
+			TOOL_GCC32_CXX="$(tc-getCXX) -m32"
+			TOOL_GCC32_LD="$(tc-getCC) -m32"
+			TOOL_GCC32_AS="$(tc-getCC) -m32"
+			TOOL_GCC32_AR="$(tc-getAR)"
+			TOOL_GCC32_OBJCOPY="$(tc-getOBJCOPY)"
+
+			TOOL_GXX32_CC="$(tc-getCC) -m32"
+			TOOL_GXX32_CXX="$(tc-getCXX) -m32"
+			TOOL_GXX32_LD="$(tc-getCXX) -m32"
+			TOOL_GXX32_AS="$(tc-getCXX) -m32"
+			TOOL_GXX32_AR="$(tc-getAR)"
+			TOOL_GXX32_OBJCOPY="$(tc-getOBJCOPY)"
+		)
+	fi
+
+	MAKE="kmk" emake "${myemakeargs[@]}" all
+}
+
+src_install() {
+	cd "${S}"/out/linux.${ARCH}/$(usex debug debug release)/bin || die
+
+	local vbox_inst_path="/usr/$(get_libdir)/${PN}" each size ico icofile
+
+	vbox_inst() {
+		local binary="${1}"
+		local perms="${2:-0750}"
+		local path="${3:-${vbox_inst_path}}"
+
+		[[ -n "${binary}" ]] || die "vbox_inst: No binary given!"
+		[[ ${perms} =~ ^[[:digit:]]+{4}$ ]] || die "vbox_inst: perms must consist of four digits."
+
+		insinto ${path}
+		doins ${binary}
+		fowners root:vboxusers ${path}/${binary}
+		fperms ${perms} ${path}/${binary}
+	}
+
+	# Create configuration files
+	insinto /etc/vbox
+	newins "${FILESDIR}/${PN}-4-config" vbox.cfg
+
+	# Set the correct libdir
+	sed \
+		-e "s@MY_LIBDIR@$(get_libdir)@" \
+		-i "${ED}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed"
+
+	# Install the wrapper script
+	exeinto ${vbox_inst_path}
+	newexe "${FILESDIR}/${PN}-ose-6-wrapper" "VBox"
+	fowners root:vboxusers ${vbox_inst_path}/VBox
+	fperms 0750 ${vbox_inst_path}/VBox
+
+	# Install binaries and libraries
+	insinto ${vbox_inst_path}
+	doins -r components
+
+	for each in VBox{Autostart,BalloonCtrl,BugReport,CpuReport,ExtPackHelperApp,Manage,SVC,VMMPreload,XPCOMIPCD} \
+		vboximg-mount vbox-img *so *r0; do
+		vbox_inst ${each}
+	done
+
+	# These binaries need to be suid root.
+	for each in VBox{Headless,Net{AdpCtl,DHCP,NAT}} ; do
+		vbox_inst ${each} 4750
+	done
+
+	# Install EFI Firmware files (bug #320757)
+	for each in VBoxEFI{32,64}.fd ; do
+		vbox_inst ${each} 0644
+	done
+
+	# VBoxSVC and VBoxManage need to be pax-marked (bug #403453)
+	# VBoxXPCOMIPCD (bug #524202)
+	for each in VBox{Headless,Manage,SVC,XPCOMIPCD} ; do
+		pax-mark -m "${ED}"${vbox_inst_path}/${each}
+	done
+
+	# Symlink binaries to the shipped wrapper
+	for each in vbox{autostart,balloonctrl,bugreport,headless,manage} \
+		VBox{Autostart,BalloonCtrl,BugReport,Headless,Manage,VRDP} ; do
+			dosym ${vbox_inst_path}/VBox /usr/bin/${each}
+	done
+	dosym ${vbox_inst_path}/vboximg-mount /usr/bin/vboximg-mount
+	dosym ${vbox_inst_path}/vbox-img /usr/bin/vbox-img
+
+	if use pam; then
+		# VRDPAuth only works with this (bug #351949)
+		dosym VBoxAuth.so ${vbox_inst_path}/VRDPAuth.so
+	fi
+
+	# set an env-variable for 3rd party tools
+	echo -n "VBOX_APP_HOME=${vbox_inst_path}" > "${T}/90virtualbox"
+	doenvd "${T}/90virtualbox"
+
+	if use sdl; then
+		vbox_inst VBoxSDL 4750
+		pax-mark -m "${ED}"${vbox_inst_path}/VBoxSDL
+
+		for each in vboxsdl VBoxSDL ; do
+			dosym ${vbox_inst_path}/VBox /usr/bin/${each}
+		done
+	fi
+
+	if use gui; then
+		vbox_inst VirtualBox
+		vbox_inst VirtualBoxVM 4750
+		for each in VirtualBox{,VM} ; do
+			pax-mark -m "${ED}"${vbox_inst_path}/${each}
+		done
+
+		if use opengl; then
+			vbox_inst VBoxTestOGL
+			pax-mark -m "${ED}"${vbox_inst_path}/VBoxTestOGL
+		fi
+
+		for each in virtualbox{,vm} VirtualBox{,VM} ; do
+			dosym ${vbox_inst_path}/VBox /usr/bin/${each}
+		done
+
+		insinto /usr/share/${PN}
+		doins -r nls
+		doins -r UnattendedTemplates
+
+		domenu ${PN}.desktop
+
+		pushd "${S}"/src/VBox/Artwork/OSE &>/dev/null || die
+		for size in 16 32 48 64 128 ; do
+			newicon -s ${size} ${PN}-${size}px.png ${PN}.png
+		done
+		newicon ${PN}-48px.png ${PN}.png
+		doicon -s scalable ${PN}.svg
+		popd &>/dev/null || die
+		pushd "${S}"/src/VBox/Artwork/other &>/dev/null || die
+		for size in 16 24 32 48 64 72 96 128 256 512 ; do
+			for ico in hdd ova ovf vbox{,-extpack} vdi vdh vmdk ; do
+				icofile="${PN}-${ico}-${size}px.png"
+				if [[ -f "${icofile}" ]]; then
+					newicon -s ${size} ${icofile} ${PN}-${ico}.png
+				fi
+			done
+		done
+		popd &>/dev/null || die
+	fi
+
+	if use lvm; then
+		vbox_inst VBoxVolInfo 4750
+		dosym ${vbox_inst_path}/VBoxVolInfo /usr/bin/VBoxVolInfo
+	fi
+
+	if use sdk; then
+		insinto ${vbox_inst_path}
+		doins -r sdk
+
+		if use java; then
+			java-pkg_regjar "${ED}/${vbox_inst_path}/sdk/bindings/xpcom/java/vboxjxpcom.jar"
+			java-pkg_regso "${ED}/${vbox_inst_path}/libvboxjxpcom.so"
+		fi
+	fi
+
+	if use udev; then
+		local udevdir="$(get_udevdir)"
+		local udev_file="VBoxCreateUSBNode.sh"
+		local rules_file="10-virtualbox.rules"
+
+		insinto ${udevdir}
+		doins ${udev_file}
+		fowners root:vboxusers ${udevdir}/${udev_file}
+		fperms 0750 ${udevdir}/${udev_file}
+
+		insinto ${udevdir}/rules.d
+		sed "s@%UDEVDIR%@${udevdir}@" "${FILESDIR}"/${rules_file} \
+			> "${T}"/${rules_file} || die
+		doins "${T}"/${rules_file}
+	fi
+
+	if use vboxwebsrv; then
+		vbox_inst vboxwebsrv
+		dosym ${vbox_inst_path}/VBox /usr/bin/vboxwebsrv
+		newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
+		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
+	fi
+
+	# Remove dead symlinks (bug #715338)
+	find "${ED}"/usr/$(get_libdir)/${PN} -xtype l -delete || die
+
+	# Fix version string in extensions or else they don't get accepted
+	# by the virtualbox host process (see bug #438930)
+	find ExtensionPacks -type f -name "ExtPack.xml" -exec sed -i '/Version/s@_Gentoo@@' {} \+ || die
+
+	local extensions_dir="${vbox_inst_path}/ExtensionPacks"
+
+	if use vnc; then
+		insinto ${extensions_dir}
+		doins -r ExtensionPacks/VNC
+	fi
+
+	if use dtrace; then
+		insinto ${extensions_dir}
+		doins -r ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack
+	fi
+
+	if use doc; then
+		dodoc UserManual.pdf UserManual.q{ch,hc}
+		docompress -x /usr/share/doc/${PF}
+	elif use gui; then
+		dodoc "${WORKDIR}"/${PN}-help-${PV}/UserManual.q{ch,hc}
+		docompress -x /usr/share/doc/${PF}
+	fi
+
+	if use python; then
+		local python_path_ext="${ED}/usr/$(get_libdir)/virtualbox/VBoxPython3.so"
+		if [[ ! -x "${python_path_ext}" ]]; then
+			eerror "Couldn't find ${python_path_ext}! Bindings were requested with USE=python"
+			eerror "but none were installed. This may happen if support for a Python target"
+			eerror "(listed in PYTHON_COMPAT in the ebuild) is incomplete within the Makefiles."
+			die "Incomplete installation of Python bindings! File a bug with Gentoo!"
+		fi
+	fi
+
+	newtmpfiles "${FILESDIR}"/${PN}-vboxusb_tmpfilesd ${PN}-vboxusb.conf
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if use udev; then
+		udev_reload
+		udevadm trigger --subsystem-match=usb
+	fi
+
+	tmpfiles_process virtualbox-vboxusb.conf
+
+	if use gui; then
+		elog "To launch VirtualBox just type: \"virtualbox\"."
+	fi
+
+	elog "You must be in the vboxusers group to use VirtualBox."
+	elog ""
+	elog "The latest user manual is available for download at:"
+	elog "https://download.virtualbox.org/virtualbox/${PV}/UserManual.pdf"
+	elog ""
+
+	optfeature "Advanced networking setups" net-misc/bridge-utils sys-apps/usermode-utilities
+	optfeature "USB2, USB3, PXE boot, and VRDP support" app-emulation/virtualbox-extpack-oracle
+	optfeature "Guest additions ISO" app-emulation/virtualbox-additions
+
+	if ! use udev; then
+		ewarn "Without USE=udev, USB devices will likely not work in ${PN}."
+	fi
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+
+	use udev && udev_reload
+}
diff --git a/app-laptop/Manifest.gz b/app-laptop/Manifest.gz
index 4dc747259dba..782eb2cfc2c6 100644
--- a/app-laptop/Manifest.gz
+++ b/app-laptop/Manifest.gz
diff --git a/app-laptop/ibam/Manifest b/app-laptop/ibam/Manifest
index 78b65a46a492..d0d0b81a8573 100644
--- a/app-laptop/ibam/Manifest
+++ b/app-laptop/ibam/Manifest
@@ -2,4 +2,4 @@ AUX ibam-0.5.2-build.patch 1316 BLAKE2B 200652e267f32eafdaf0d702f64fba10cec8f4e4
 DIST ibam-0.5.2.tar.gz 22149 BLAKE2B a3d9398dc34004203643d3198a3994ef3b432b909bdf9713a91a1d938a19ab9d0345105a60f3357288c2f3d2a325498a0787138e50fb445f1ea11851f1d7de1c SHA512 c70d728a2f1250ed291e663bd9f4e9ba01308fce14edf1ffd1902057de7e5527548bd06e2e3caaaeabc064d0ee123f536a626fd50b84092f6fc9201fc6bdba58
 DIST ibam_0.5.2-2.1.diff.gz 6115 BLAKE2B 8a1ada53ed39a379f11158583b337166d74d17de808a44e3d3fb225eecef5e3f3b782088072f94dbad387b258254ccbe3fdce7d5655ff201c41d66dbeb7c6d61 SHA512 f6707e42626891aa87697bc28f124345f9f1d0dfb35620f6386dc1dca6b9c5e3a73571bf04e933091c1995d1156925029c0199c5caace497ff891c93f9011ac3
 EBUILD ibam-0.5.2-r5.ebuild 1183 BLAKE2B 1e9b033127fd3f37b9815771db41660085af517c1f984019bce697082d1a6a4d5669de6fe186fe62da7944f73af4c7bbf937186a484258fda428c1c6a591df15 SHA512 f035101bb386cf8017d453fb689f68d38242562261b7cf1a7a6dabd6901869a447417fa0454532d597ac4c04d0f9692e2c62921830eb6e89fdfec035c221e91d
-MISC metadata.xml 342 BLAKE2B 21668d66676e605cd1a8d2bb7aac70c241b3e9dc47a14abfffe1f40da5c8d3625044280b751ee1b667b2f00ade349224ba738e8ab3329101eac298081b14d98a SHA512 a61143e3ab09efc8c0c07e7a359dc116ba24c25ea63576bc0a50f2ffff35bb78991ec111cbf0c9a0d20a5143ebd8bb51e3024a1a24f1845f024554ca86bb0cb3
+MISC metadata.xml 414 BLAKE2B 6b18219524dcdb523c30373c20e427bd8d63da5ebe94b9f10a42035a8147f5fe5f611400f9dd5b9d08602d1dd9679d4365359b1803db8733383b5cf52b6c6bfa SHA512 a365931c747686695f2d9d16c5014ffedae4e1bcc08dab679daf587ab486105c3088cc8168bbc75e5ab2a33ebe22b29fc80a7fb3b202c857bec808aa94c2e795
diff --git a/app-laptop/ibam/metadata.xml b/app-laptop/ibam/metadata.xml
index 487aeceba4b2..137350835dc7 100644
--- a/app-laptop/ibam/metadata.xml
+++ b/app-laptop/ibam/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>sam@gentoo.org</email>
+		<name>Sam James</name>
+	</maintainer>
 	<use>
 		<flag name="gkrellm">Enable building of <pkg>app-admin/gkrellm</pkg> module</flag>
 	</use>
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index 13d87e3bcbee..209a87116633 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/nattka/Manifest b/app-portage/nattka/Manifest
index 19691ed21c28..3c9582ac15a2 100644
--- a/app-portage/nattka/Manifest
+++ b/app-portage/nattka/Manifest
@@ -1,5 +1,3 @@
 DIST nattka-0.4.1.gh.tar.gz 95941 BLAKE2B 4037c2b364c091e10f4684e8c1e59c26c7af943c6cf230058b115d4518f9b7589ca845a5174f6f99280b2cb1655544afe3ba727ef6276570a00fcd3e6117c382 SHA512 d490999b6a4b4938f85081750c9b67f3876b666c99f6b36eada32a66c0111fc2f1be231b49b08754b1213b616b854d5bb4865ea8e3540e2d48b504fdb7047d2f
-DIST nattka-0.4.gh.tar.gz 95937 BLAKE2B 31b629e43abfa445bc466b7541914709b07423b059fdf887a0a5713124f7813dc6f39c6f10d65c020dab4dedf9aefb49dd7384d6fba08da8b4e14d11c1326c33 SHA512 70819a623a79feb570141c5e0452273f514b28e1746540393b3dc4aa671c27dd08e50160e722b9e8c4af6ccd500c4a4dd0e70e5146c9b062a43945cd5fe758d5
-EBUILD nattka-0.4.1.ebuild 1012 BLAKE2B 7a323105b689b807e2d7dbffb23649f3951dcbdeda8942537c8d2ec32d4e4e2337e01a89cfd55d8078adad2ca1247f3f2972a33f839c4aa40dd3bd0a661595a9 SHA512 aba36db4defab1d48841fa942a886c4e77ef7b0b1832b595ed87e25d7f3d2105a2a01967d7571e9ab8a6c5c31c210322d9d6486f8226a912fc8d85c31cf83f21
-EBUILD nattka-0.4.ebuild 967 BLAKE2B 288660e8988664652825f6054be4ca651d69dd37592751519af7fd2157571dd9d8c9229c786d1b52e0bd9a699e3776b9c9d41f8a957dc648f2e2301a4bdadc6d SHA512 29151d8b8d0652e1bfa78cdcee4fe510d513046532045b7b203da79312d0c932fb6d5e86ad11aff4f7f4e8c10913254e77c13701dfd893721bddbdc646bf1086
+EBUILD nattka-0.4.1.ebuild 1004 BLAKE2B 7b289c05b97eaf687d128376554fa8466a69de268517c25a2c51db4ec8c97607e2d7e5dae95f13cd7561d9dfb61c44ed67f267c01d7fa19956ff4f39d66c1640 SHA512 f65d1efeb9c66b67584c3edf88e613146dedd6569a99747ecfc56359691aea9417f7e6e820822d74d25d16b215d6b82c1ac01429ec21a194860fe151785a5af4
 MISC metadata.xml 507 BLAKE2B 8a1c2cdea4e8af36c498cdcab09ce144df070f082ed18a7fae9b6efdc51a62ed47d6afe77de4a416811e1d29bdb8989f4a470a012c6e08db757a34ecd60871c7 SHA512 82acdc10588aaae42fe818de37bc2ba23464e46847d8e9ee83240a6555e1b7d94a3495fa8df964b142977f9b42a404d5cf01ca2e345a4a2a36594a1039a76e70
diff --git a/app-portage/nattka/nattka-0.4.1.ebuild b/app-portage/nattka/nattka-0.4.1.ebuild
index e0b583125d4c..b66983935af1 100644
--- a/app-portage/nattka/nattka-0.4.1.ebuild
+++ b/app-portage/nattka/nattka-0.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2022 Gentoo Authors
+# Copyright 2020-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="depgraph-order"
 
 RDEPEND="
diff --git a/app-portage/nattka/nattka-0.4.ebuild b/app-portage/nattka/nattka-0.4.ebuild
deleted file mode 100644
index f7bb6a108958..000000000000
--- a/app-portage/nattka/nattka-0.4.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="A New Arch Tester Toolkit -- open-source stable-bot replacement"
-HOMEPAGE="https://github.com/projg2/nattka/"
-SRC_URI="
-	https://github.com/projg2/nattka/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-IUSE="depgraph-order"
-
-RDEPEND="
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-util/pkgcheck[${PYTHON_USEDEP}]
-	dev-vcs/git
-	sys-apps/pkgcore[${PYTHON_USEDEP}]
-	depgraph-order? (
-		dev-python/networkx[${PYTHON_USEDEP}]
-	)
-"
-BDEPEND="
-	>=dev-python/flit_core-3.7.1[${PYTHON_USEDEP}]
-	test? (
-		dev-python/vcrpy[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx doc --no-autodoc
-distutils_enable_tests pytest
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 1144b8f3b6af..3ac66266d158 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/msgpack-cxx/Manifest b/dev-cpp/msgpack-cxx/Manifest
new file mode 100644
index 000000000000..e210b49bf280
--- /dev/null
+++ b/dev-cpp/msgpack-cxx/Manifest
@@ -0,0 +1,3 @@
+DIST msgpack-cxx-5.0.0.tar.gz 476103 BLAKE2B e631a47e8d39b6ad9c2dd5e782fbbd5044c177e18c619fb52d1293e2c5f2ea7e766e7b26ce6cac36a2ff98217143e12456e0541992afb4f78597ffd3852f2acf SHA512 5ee0237eb1bf05bd4becad32ab145a8f0654f8f0e2e3452331ed3df088cda03ee4cdf1557ba867447e3e18baed924c105c76934f7009dac98b6dc69282c39d0c
+EBUILD msgpack-cxx-5.0.0.ebuild 1196 BLAKE2B 0a9f11c8135a62b94febcd6028e94742a64eb6a3afbe8ce41cb8e4385e5f4e5b26b154442ae0c0d70610ebba011cd35467c018b989fdea3d8765ee0eb27b70f2 SHA512 f04bd145f1862731a59ad47d9fddcef6bf8fad33839cf5f3312ceef6e49982b663f24dca5e0f4930904046ee139b802e06601e3a495a9ddced4a8285b1ba89ad
+MISC metadata.xml 410 BLAKE2B 2d8ac30a8aa745f32a388a0d66860d2af8de8bdc0e558b713738def49ec87e96b5ee201c4b2cd01f43f213ffd9f107cfcf9679725637f43ec7eed707ada87c69 SHA512 2009980f9bd56a3932a9f0ce56745439c0d29241bc11f3b8c0b2e26fc5a3f74ef9c7784165ed25e6280de4d1ee27e57ff225a5986522e51f50cc03e793625b4a
diff --git a/dev-cpp/msgpack-cxx/metadata.xml b/dev-cpp/msgpack-cxx/metadata.xml
new file mode 100644
index 000000000000..7d2a4745c20f
--- /dev/null
+++ b/dev-cpp/msgpack-cxx/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>vim@gentoo.org</email>
+    <name>Gentoo Vim Project</name>
+  </maintainer>
+  <use>
+    <flag name="boost">Enable boost support</flag>
+  </use>
+  <upstream>
+    <remote-id type="github">msgpack/msgpack-c</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-cpp/msgpack-cxx/msgpack-cxx-5.0.0.ebuild b/dev-cpp/msgpack-cxx/msgpack-cxx-5.0.0.ebuild
new file mode 100644
index 000000000000..0cc922cfef81
--- /dev/null
+++ b/dev-cpp/msgpack-cxx/msgpack-cxx-5.0.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="MessagePack for C++"
+HOMEPAGE="https://msgpack.org/ https://github.com/msgpack/msgpack-c/"
+SRC_URI="https://github.com/msgpack/msgpack-c/releases/download/cpp-${PV}/${P}.tar.gz"
+
+LICENSE="Boost-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="+boost doc examples test"
+
+REQUIRED_USE="test? ( boost )"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="boost? ( dev-libs/boost[context] )"
+DEPEND="${RDEPEND}"
+BDEPEND="doc? ( app-doc/doxygen[dot] )
+	test? ( sys-libs/zlib )"
+
+src_configure() {
+	local mycmakeargs=(
+		-DMSGPACK_BUILD_EXAMPLES=OFF
+		-DMSGPACK_CXX17=ON
+		-DMSGPACK_BUILD_TESTS="$(usex test)"
+		-DMSGPACK_USE_BOOST="$(usex boost)"
+		-DMSGPACK_USE_X3_PARSE="$(usex boost)"
+	)
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+
+	if use doc; then
+		cmake_build doxygen
+	fi
+}
+
+src_install() {
+	if use doc; then
+		local HTML_DOCS=( "${BUILD_DIR}"/doc_cpp/html/. )
+	fi
+
+	if use examples; then
+		docinto examples
+		dodoc -r example/.
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	cmake_src_install
+}
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 6cc58bb158a3..927786880565 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/flatbuffers/Manifest b/dev-libs/flatbuffers/Manifest
index 15121e5d658c..17ccfa6b6733 100644
--- a/dev-libs/flatbuffers/Manifest
+++ b/dev-libs/flatbuffers/Manifest
@@ -5,6 +5,6 @@ DIST flatbuffers-23.1.21.gh.tar.gz 2181861 BLAKE2B 6368358c21e677feb466245a746b8
 DIST flatbuffers-23.1.4.gh.tar.gz 2178791 BLAKE2B 8c354c539378f7d8e05307f7ba0f5393265a6183fc8868d48b8da5ab7d39a3e7a7f85631db00f0dc57bf396d20652049303a79fbf31f07639d80596d300a7701 SHA512 8b3e1b9596a76548faca529fe5070e775be50bfdea079ba4f66014f5a1bfb93f8edd7e56f97363c897d2db8391277a9099a61d14e4298c3669ab7068bbf07865
 EBUILD flatbuffers-2.0.6-r1.ebuild 920 BLAKE2B e8c13808ce448b216769c24434f84a9d4a0ff22e0c2399b7e42ae5b8a76ce96225c937b15e733821ff2d93a56759ce7a33b8ec24409e5df73ce4c21ddded859c SHA512 6bd3bbbe3f2cf3ac988193ce8aef16627dd78fcc19e1faf0aff1aeea5c2fd0cb17d4cdd97043f5ab1aacac401829fd44337be33b71f2ded846a089cd604c3af2
 EBUILD flatbuffers-22.12.06.ebuild 742 BLAKE2B b0de01e3b69a08eb7cc1c55e1a3186bd9164608526a944a1afc3240ac12270bebf641590cdb340b35793dbb44915723516e68c0fdf78b5eb7a2471674e8bfb0b SHA512 62514b164c3c685d465cab33c3a5fa88179b32bc7e4ba9a9fa88e7ee2e9c99a139e5974e7ffefcf29d2f2d24ffe4fe0e9fbbf0a421ab6d556fddad70f5b04f6f
-EBUILD flatbuffers-23.1.21.ebuild 746 BLAKE2B 3ff1f76891e9cba8b14446b3834e3ffeb57dfbac6829cdf9b90ba2c3eba249539e27f361c85538802c45a1eec37b225e3f3a19f5b13d066095268219b58bdddc SHA512 a9320e916fbb8b26ce17c02de5353bf022c5bf1b1b2b5cde336ed27cac8fa2bd09a770f87283ca75340a39b1d4f725522bc5d8e5d9781f64c23a21f621584b8c
+EBUILD flatbuffers-23.1.21.ebuild 743 BLAKE2B cf71240aa2e2064ba0d0e52acb85b0ee0c8ae8428c3ddd1cc7e69e001e21534d7e55b50c9edc60fb198e621d12dd0dcb9988d97c6e6bace76a4ed71f5f531012 SHA512 d73d3599e4d74c0edf837efeca83ff186173acb3696a77ff2cf34175a75ef5eb85917d766e07b59cf6d4a36c3a427fa1a84a031cdbb330e3518b76dae62f61b5
 EBUILD flatbuffers-23.1.4.ebuild 750 BLAKE2B 013f70a5bea33c9f21ada909bf0f1c4d3b5d0f2672fff38326113c7185a974f4f91d2aebb15708c55c1e90e885a4ae5acd080a7b30063758743ffdc980125e71 SHA512 fb9a0d0b1e1a6785da0ad92ec123f0d7c1757523e4f570dec814cca818144ffd8f1573555215d011dd513ddafd0bb23a054e04072cfef362b98f1698a7733a8b
 MISC metadata.xml 331 BLAKE2B 6808287f0f9c9f882f52d65ed13a634ddb184341a565d561c120ec451e5414e9ff48c3d7aebe0c240671e514af83cb5e8ee7bdb8b47f57fb323dc5bc5fe37b5c SHA512 bc40060a61a79ffc86bf6d1bc6a058bd05f35c765a530e5153ffe6213ef486235aa6caf4eb43c36a66b995ea35e43f4c3bbf6a3b4591b73bd7f8b6511b962d23
diff --git a/dev-libs/flatbuffers/flatbuffers-23.1.21.ebuild b/dev-libs/flatbuffers/flatbuffers-23.1.21.ebuild
index 7b43c4bca4fb..b8bd61f6bb19 100644
--- a/dev-libs/flatbuffers/flatbuffers-23.1.21.ebuild
+++ b/dev-libs/flatbuffers/flatbuffers-23.1.21.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 IUSE="static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libretls/Manifest b/dev-libs/libretls/Manifest
index 1452560afaec..c82a6422d4d5 100644
--- a/dev-libs/libretls/Manifest
+++ b/dev-libs/libretls/Manifest
@@ -1,5 +1,5 @@
 DIST libretls-3.5.2.tar.gz 425404 BLAKE2B b975326c0bd9c2f4adb511f3a6ad4fc8cd9afccd24a3def0c82bf68473b73b93cd83b8b6b3ffb29fc5ba378a9d4fd902dda933f552a02fec374cd56e1690956e SHA512 62eed971cbacb4a50e5ebdad1ea1d57dd3b4f7520634393faf1fc141ef63b6e7d50acbe49747c956fca6b9f2dec8a79ab724df6e08a77858a1624b5a6e3cbe57
 DIST libretls-3.7.0.tar.gz 427980 BLAKE2B 291e4da4038b1baf88694c9e38e31b8d656d8ecb2ab397e7ce6efe4cfd55d69ccf03cfbe84fd7858d7d64c2ebb00dd43102dfd2ff9e6a3f3df95924930d2e099 SHA512 18987d09ee804883e2c3cfae1209494b7020d976cc7137ba39540c18e0dc23d25034a46c6c64955201b425ca981e03cbe629f9ff979fd4a72d3dcfbd51efdf84
 EBUILD libretls-3.5.2-r1.ebuild 601 BLAKE2B 4adbdb7e4ee3fb2a2302a9d7c9ca97a4aa1181c0a3c1f1f019ad16988ff093b8634b9ee749495a6e864d2de1743863ef1254ef9a70122af6b72724d519759de8 SHA512 a490e3f7e0c92dbea530c9be6fc92cfe80f88e7267918962228ab4e55ccddd4656ad703d41fd885f684e1aabca3854fbd42dbb7f269d67f265a35ce221815210
-EBUILD libretls-3.7.0.ebuild 607 BLAKE2B 0e973ee37c56d1acd7e2e8accc6a5bffd208672b8f8b8b594f35845304676f9b27030759a824e7e65038d9d90c785b1fd7feece63ba79b9f45c7f678c7793d66 SHA512 a89a47f64a55154eef761b78a55e6905ec4ad72d914dadb4f9c33cb115ae65f44edb9f3419d04af12edebf4b1049784a2f4526f0ed203236f32568ffc2203b67
+EBUILD libretls-3.7.0.ebuild 601 BLAKE2B 9405a5364607f2b79e6d28f3036fcf601d021143ad640463c34ba03fea75b091f86e9380d9137602d4688cea8078ef49f344a68d49aaaeceec3c21fb38641d2b SHA512 74fe06121d12c71c6011b950f2cc44952a5c11e438e8c4e86e07970ef83371fb260deea2527741ced649ccaacef831286089596f74511f350795caac9fe9c863
 MISC metadata.xml 248 BLAKE2B f308d2aa052d11e427850af58bbebf95e7773f5562ed221f39043474b4c3827d724d49667edf1874272a5586a13201159f40e8f5eafb7e400e79c6566e1a6ac2 SHA512 b875c838394523483ae7d93585207eb3c642a345bbb08e1dcef3ceb737c813fa779e2f5479d48cdcc30732b8a0a9e6ecc648df940def6731e4dff43b23786e6d
diff --git a/dev-libs/libretls/libretls-3.7.0.ebuild b/dev-libs/libretls/libretls-3.7.0.ebuild
index 6b78472c8b5b..d8d201ba1eed 100644
--- a/dev-libs/libretls/libretls-3.7.0.ebuild
+++ b/dev-libs/libretls/libretls-3.7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2022 Gentoo Authors
+# Copyright 2020-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -9,7 +9,7 @@ SRC_URI="https://causal.agency/libretls/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0/26"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
 DEPEND="
 	dev-libs/openssl:=
diff --git a/dev-libs/msgpack/Manifest b/dev-libs/msgpack/Manifest
index f4a18bafd7d0..ff188a8e564e 100644
--- a/dev-libs/msgpack/Manifest
+++ b/dev-libs/msgpack/Manifest
@@ -1,3 +1,5 @@
 DIST msgpack-3.3.0.tar.gz 508001 BLAKE2B 3017c44689f8afbf078b9c498449e21b4e3b87591c50a37bf9ae73869dab550819f24d6e5179a3600df297aa2c024e5a7fe1defcbab7c0f1aff826870de2ab32 SHA512 ad3e32edc8c6afd70282b3d4b493c2ffe74a697c41bd1f39030c5b4752cccefaa965bc049d4c2e63103a210bf714dc3bddd474691bc067d1475ae017593f55e6
+DIST msgpack-c-5.0.0.tar.gz 69275 BLAKE2B 9c4ebc60387028cba04d5a8f4d97ca3cf6caa3db93fa7da1a90089d63cd58b36a7fb387b4fd5410d0c422719c1aed6d479418d3cbc011b609afb49cf89c4d0e3 SHA512 f61f19c7dcb5ef2a94cd3fb84e9b090e236caa922f590496e6455bd49a3d001021b55d0f28cea3ce3c35558bedb64f2f932c0e107fb15e6efc6855b99cbe4de6
 EBUILD msgpack-3.3.0.ebuild 1748 BLAKE2B 9c0d613055cbfd53e08501d6c4095a22fdd13de17f44ec7b5965635f8e592ea8c5e045f3475f26f37b5e7ce07b870b92ca74f30140a9777c3b3e5ff4f0e83a27 SHA512 446649ee99948fc644a3e117f3994e457790cca9fce337e1e4b7edbe8a4c885eb2d5ae15f866d70829577287f1bc0bc93b16ab92ae2a168402f5d5e48981f5c7
+EBUILD msgpack-5.0.0.ebuild 1269 BLAKE2B 5460c9cdaf759bca13d09e93beabae4baff2b9cf0a5f1d2aefa710afc88ea2a17832b834db4768991cc5974563ecc52526413beba2cf5a0aaa94f3c229e09825 SHA512 808f8a9d7609fbb1b829e8a6d49dcce1c5022f492cdf1a815d6bf8252084833355570d848e1f5155716cfacac4b55d4d8975d91df6bd79e6af8bad43287d9558
 MISC metadata.xml 410 BLAKE2B 2d8ac30a8aa745f32a388a0d66860d2af8de8bdc0e558b713738def49ec87e96b5ee201c4b2cd01f43f213ffd9f107cfcf9679725637f43ec7eed707ada87c69 SHA512 2009980f9bd56a3932a9f0ce56745439c0d29241bc11f3b8c0b2e26fc5a3f74ef9c7784165ed25e6280de4d1ee27e57ff225a5986522e51f50cc03e793625b4a
diff --git a/dev-libs/msgpack/msgpack-5.0.0.ebuild b/dev-libs/msgpack/msgpack-5.0.0.ebuild
new file mode 100644
index 000000000000..cc6f586a055f
--- /dev/null
+++ b/dev-libs/msgpack/msgpack-5.0.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib
+
+MY_PN="${PN}-c"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="MessagePack is a binary-based efficient data interchange format"
+HOMEPAGE="https://msgpack.org/ https://github.com/msgpack/msgpack-c/"
+SRC_URI="https://github.com/${PN}/${PN}-c/releases/download/c-${PV}/${MY_P}.tar.gz"
+
+LICENSE="Boost-1.0"
+SLOT="0/2"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="doc examples test"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="doc? ( app-doc/doxygen[dot] )
+	test? (
+		dev-cpp/gtest[${MULTILIB_USEDEP}]
+		sys-libs/zlib[${MULTILIB_USEDEP}]
+	)"
+
+S="${WORKDIR}"/${MY_P}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DMSGPACK_BUILD_EXAMPLES=OFF
+		-DMSGPACK_BUILD_TESTS="$(usex test)"
+	)
+
+	cmake_src_configure
+}
+
+multilib_src_compile() {
+	cmake_src_compile
+
+	if multilib_is_native_abi && use doc; then
+		cmake_build doxygen
+	fi
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		if use doc; then
+			local HTML_DOCS=( "${BUILD_DIR}"/doc_c/html/. )
+		fi
+
+		if use examples; then
+			docinto examples
+			dodoc -r "${S}"/example/.
+			docompress -x /usr/share/doc/${PF}/examples
+		fi
+	fi
+
+	cmake_src_install
+}
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 52d2598a9475..6fa889a7cc18 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/bitarray/Manifest b/dev-python/bitarray/Manifest
index f8c69bdc4cd5..c217465f3bfa 100644
--- a/dev-python/bitarray/Manifest
+++ b/dev-python/bitarray/Manifest
@@ -3,5 +3,5 @@ DIST bitarray-2.6.1.tar.gz 103605 BLAKE2B 3946f66330378010251465fc839dcf73f345f0
 DIST bitarray-2.6.2.tar.gz 103565 BLAKE2B 07aef624bc7d36e0631082688f9803f7fb3d4c2fcb9d8ac7af0d207e56f8229c1e6a7e6ac7c0639d88b55f6d27f697cd6e4ece5cd0768d2624ac94eedabb0c60 SHA512 21a10fcc174b3e705551a6cfcf6e1b4ccb899c9d9a69e273e3c49528bcc5d889eac0dc3dbffc1f55fa561a091f8d11f3246035499cb9168192a03c6af034bd82
 EBUILD bitarray-2.6.0.ebuild 571 BLAKE2B 1635fd40baf1614ecba870ad759f2c4f418f3b2eb59ca6930c80dcd7998c8bbae73e569a39733de33aa4ff2975d8b197332cfd8bc48714f086f42c91a15185ae SHA512 2cc349c48fe5bf351395d3186eef36ac3372ad708c8ebfe968a10df830c1ecbc9c2c6fb11c2a07c73e7a9f4ece424e5da77c237a08c8bd8d2fda6b6eeb290c71
 EBUILD bitarray-2.6.1.ebuild 573 BLAKE2B 1286c5f4ec4fa2c2f47c5a6d5ba5154d2095b22739304ef585fea8c4f3ae76771d8221e4c07397c774e2bc617dbcb8b1a861a041b9d0d1fc52b709f230d38334 SHA512 a607d9a25b936692845d6be2adf4367e76d209c902b10394837d83ea39daa0b98b68adfd375bbab62e2d6916650f9fa2d163c571f0c4b1486c41c09cc91d43ca
-EBUILD bitarray-2.6.2.ebuild 573 BLAKE2B 1286c5f4ec4fa2c2f47c5a6d5ba5154d2095b22739304ef585fea8c4f3ae76771d8221e4c07397c774e2bc617dbcb8b1a861a041b9d0d1fc52b709f230d38334 SHA512 a607d9a25b936692845d6be2adf4367e76d209c902b10394837d83ea39daa0b98b68adfd375bbab62e2d6916650f9fa2d163c571f0c4b1486c41c09cc91d43ca
+EBUILD bitarray-2.6.2.ebuild 571 BLAKE2B 1635fd40baf1614ecba870ad759f2c4f418f3b2eb59ca6930c80dcd7998c8bbae73e569a39733de33aa4ff2975d8b197332cfd8bc48714f086f42c91a15185ae SHA512 2cc349c48fe5bf351395d3186eef36ac3372ad708c8ebfe968a10df830c1ecbc9c2c6fb11c2a07c73e7a9f4ece424e5da77c237a08c8bd8d2fda6b6eeb290c71
 MISC metadata.xml 1207 BLAKE2B 67a57c61a71655fcd94e7025fe4d30792b6921a40f151d827f4c936dbc96c2b81afd2f2a302cfbf15356a591be941268561545d7ac7bc0cdb19e3f87a03e4b4b SHA512 5069c6622d7840c402007c420169e679da08db020952f798fd4299d6f1b324ce8cead3ca2a9072b96d8d852d5630827833eb27d39a190153e8da46ac9f386b90
diff --git a/dev-python/bitarray/bitarray-2.6.2.ebuild b/dev-python/bitarray/bitarray-2.6.2.ebuild
index 3f58f0209420..1c38b679c12e 100644
--- a/dev-python/bitarray/bitarray-2.6.2.ebuild
+++ b/dev-python/bitarray/bitarray-2.6.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="PSF-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 
 python_test() {
 	"${EPYTHON}" bitarray/test_bitarray.py -v || die "Tests fail with ${EPYTHON}"
diff --git a/dev-python/cchardet/Manifest b/dev-python/cchardet/Manifest
index dde200f789da..d494c58c8055 100644
--- a/dev-python/cchardet/Manifest
+++ b/dev-python/cchardet/Manifest
@@ -1,5 +1,5 @@
 AUX cchardet-2.1.7-pytest.patch 3529 BLAKE2B 2ce0bb1a7ee281477f471dad08b1e7819b9d47b96db2c4321b67185dd860de5f4e94150846e76ab8364bee079f823884af366256c8ad98ef0797987d2cab9a0c SHA512 0e7d126a49c3c1d2c810085aa1dd6fa1b1b38807876d168d3d459ea837bb8e146e0585c93a10599713a5511a76c328696ee0889d4c9a63ef8aee4d97b5df686a
 DIST cchardet-2.1.7.tar.gz 653617 BLAKE2B 0ca9becac01c67da191290c7de0dc52d5c8e6c2715f660811c8e67d9a06e74ac155a081de81af96ade74ccc4065093fc226f232a26f66236fafe9fc1b48a9c9e SHA512 43e663e30ec079b2a954862de5e8136a2e40f69e300d65eb4ce9d7ffa5d8c496dc7c0937b3306b4096cfad12a1d0617628f8f0115534ab6faf9eb39d2b3935a2
-EBUILD cchardet-2.1.7-r1.ebuild 632 BLAKE2B 98ae4b44047bdac68f534307644b4af98c5c4588343998f2ee3f13ae826eee3a4920c5576d93a0c9dee2e012b8eab7e458365f658c3f77a0abe6b8ad8d34bdce SHA512 9635a7f68eb9618704c054a4ba155bdec08c2b7b8bc8d9cba8ea2e40ee03f05bb5a6a247b1376753e9b71125be234ac96f5acf1c11e6bca78420e92fe24d4881
+EBUILD cchardet-2.1.7-r1.ebuild 631 BLAKE2B ecb1226f15ab1995f403da6bda98d2df3c7bf64ea5f97f0493a7cf12a51cdc850d9e1a6c4d98b880190792f407727d3c221e2a9fb19272221bf5d2127b9e7561 SHA512 a9b48ba9cf3d1c8e985b895f3dd8594281174ca86a161f4c2157651e7992755de49de67f0c27d3171e49ee790a39aa3d1951570c2b27f86ef29c8eba83a48c42
 EBUILD cchardet-2.1.7.ebuild 646 BLAKE2B 1fa97282856d334ad2d22a362d8f9fe8c72f179ce546b00a1d9f26d7c5773ff86897e52c78795eebbe2b12c366f2854aa11b8f74765b72d6292b32f51cf74b5d SHA512 d4fbd0adfd3cd4fdbe4a5a03b37e1e2ac94b6ec3dc57c84435d4b88fe01ef3157d1bbf9ea3cb0718039719093afa3a4f178eb8b8e196294067e51f5bd12f2b81
 MISC metadata.xml 346 BLAKE2B 86fd035032c4a4223ca8b8b7db0b3593b60676376b17ebc0c2a02ccce6d4dd22f7bcc80350634378bfd9afb44640a4f8798dad5f479024510c90b0a2f9425eb9 SHA512 f33d9efa195ef267c11565d657fdbfdc6b11af571b812e7ce9885b41ab7e48c4e58422618ebf6809d7e1adab00977996d86ac7fe4f47b0db4267a34d16607805
diff --git a/dev-python/cchardet/cchardet-2.1.7-r1.ebuild b/dev-python/cchardet/cchardet-2.1.7-r1.ebuild
index a7ee4ba0a349..7baccb91ed33 100644
--- a/dev-python/cchardet/cchardet-2.1.7-r1.ebuild
+++ b/dev-python/cchardet/cchardet-2.1.7-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MPL-1.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 
 BDEPEND="
 	dev-python/cython[${PYTHON_USEDEP}]
diff --git a/dev-python/cryptography/Manifest b/dev-python/cryptography/Manifest
index 9afd479948e6..bf6321436940 100644
--- a/dev-python/cryptography/Manifest
+++ b/dev-python/cryptography/Manifest
@@ -92,5 +92,5 @@ DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f955297217
 DIST winapi-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766099872d856ebee51c883d9acf1122278db9607d50ca53eac351502b700fd2463900932d342240f97f683d517963 SHA512 7baeb661f397c4693dfa001fdc774b323c51a7c55caad40f2de5112a1cefd1d6151e3df41fa4ee193460a5905917c83d2b1de5fa10b4bd014ad96690af95c0fd
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 EBUILD cryptography-38.0.4.ebuild 3217 BLAKE2B 5f4a61f98ec7f687620d52af85df469ce1f2391db3432f15efb6e814384a2b2e0b3eeb21fd2aeef75af7bf4a7a47e6f299d6201db15a7123b52abc783d1fd347 SHA512 3ec93390adab6ac6d2c433761d334001a6ab37ff3d86769a35b3864c57fb990b90766984e8ff76bc3b5cb49ec59cdd718e4fab086db26d21506c7a7f85727065
-EBUILD cryptography-39.0.0.ebuild 3482 BLAKE2B 5e6a9b454fefa32a3f74a4c68fe95d35137b717ff71486439b13a65adc89aa4e7fbe08808a06d9fe6ba177e55cf0d8a6a50c2c4c756526b8aee5be971d28eea0 SHA512 49274ba0166eaadea946454174e7875848e50c1aa1b43de5db71b8c5b511b2a3b3dbbde57ab300cf7af43080683dc6bd6ea33f0d6fb18c1b09dccf7151032df2
+EBUILD cryptography-39.0.0.ebuild 3475 BLAKE2B 631008b9ee6510ee30d809683718af2ccf3e765fd066ec1e7aaa2d32e173a2b334ee323010c3437f9e767fb512c943d73aa7bc7f565b04b993a899d0ed29b3f7 SHA512 72d5233e7defc97b264d20cd22ef7633d1e4d1a8143eeae1fe437bc59e4c98a7722a4919ee720000955ce3272820bf4f142985a24156f886fe0b81cb03e94036
 MISC metadata.xml 464 BLAKE2B 96c0bd97b83c9718910d129260402fdc37e88a96ac6002c8f6dd19fb21d6daf31211b83ff7423036811e27954811ebdc810c8328f18c620682bd9428f42ba1f9 SHA512 2f36a186bb195a8cbafe1d8dd6630fadf0ea56b22906ebaf3c90954adb8b66e1017f599169e2b1ca386e1113c1a6b834fff90f2bec527bed53f62985120732d6
diff --git a/dev-python/cryptography/cryptography-39.0.0.ebuild b/dev-python/cryptography/cryptography-39.0.0.ebuild
index e0625c84a9c7..c1ec3cc64b51 100644
--- a/dev-python/cryptography/cryptography-39.0.0.ebuild
+++ b/dev-python/cryptography/cryptography-39.0.0.ebuild
@@ -97,7 +97,7 @@ LICENSE="|| ( Apache-2.0 BSD ) PSF-2"
 # Dependent crate licenses
 LICENSE+=" Apache-2.0 BSD-2 BSD MIT Unicode-DFS-2016"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-libs/openssl-1.0.2o-r6:0=
diff --git a/dev-python/flatbuffers/Manifest b/dev-python/flatbuffers/Manifest
index 62640b8f8012..b236e6016edb 100644
--- a/dev-python/flatbuffers/Manifest
+++ b/dev-python/flatbuffers/Manifest
@@ -2,6 +2,6 @@ DIST flatbuffers-22.12.06.gh.tar.gz 2172096 BLAKE2B 92bf0c56c10fa369e7a8a53a7f90
 DIST flatbuffers-23.1.21.gh.tar.gz 2181861 BLAKE2B 6368358c21e677feb466245a746b86cebb6d6a4058bb6d593de81bf3c32ddfb9fd475e4bb225d4529ea106253456a5ed1ee6d024b1e2521e02efef171750f428 SHA512 fa62188f773ad044644a58caf1e25bef417dfdea47c9da8a2ea7f997154b4f3976019e32e73cc533696a3d4e45ec4a8402b6df140878dfa2ff078740d61b4b0f
 DIST flatbuffers-23.1.4.gh.tar.gz 2178791 BLAKE2B 8c354c539378f7d8e05307f7ba0f5393265a6183fc8868d48b8da5ab7d39a3e7a7f85631db00f0dc57bf396d20652049303a79fbf31f07639d80596d300a7701 SHA512 8b3e1b9596a76548faca529fe5070e775be50bfdea079ba4f66014f5a1bfb93f8edd7e56f97363c897d2db8391277a9099a61d14e4298c3669ab7068bbf07865
 EBUILD flatbuffers-22.12.06.ebuild 818 BLAKE2B da0dc359bf5f8be7b12a47bd6453d13ce1ea7027745fc2410a0c50c416a67402ab31332c3abe9b0eed861dc85c6e451ce1c775d618df4f6c3c96793a9275e3dc SHA512 c3967b36faadb4d8575b363dd03aefebb9e4e8ecb04a011ff4aa3ad9def1ed0584fcd1446d955d40bb86162088aa987479656565754ea543b947255063cacf0e
-EBUILD flatbuffers-23.1.21.ebuild 822 BLAKE2B fc19a7109008ca97d0e868da5ff79435dcf861f7fc0f4619aab5062ee019ecf4cc72b97efa90745e628e58b036798a98c591197e75ed29a1ef119d944e394654 SHA512 2df91ddabc6a44d1668cd1611e7ecfa28c75cc9b97958b669f78bc75afa46dca714a3e92af66faff59d31c44d7605797487ecb8b8a2610d19d35bd3fa5b40272
+EBUILD flatbuffers-23.1.21.ebuild 818 BLAKE2B da0dc359bf5f8be7b12a47bd6453d13ce1ea7027745fc2410a0c50c416a67402ab31332c3abe9b0eed861dc85c6e451ce1c775d618df4f6c3c96793a9275e3dc SHA512 c3967b36faadb4d8575b363dd03aefebb9e4e8ecb04a011ff4aa3ad9def1ed0584fcd1446d955d40bb86162088aa987479656565754ea543b947255063cacf0e
 EBUILD flatbuffers-23.1.4.ebuild 822 BLAKE2B fc19a7109008ca97d0e868da5ff79435dcf861f7fc0f4619aab5062ee019ecf4cc72b97efa90745e628e58b036798a98c591197e75ed29a1ef119d944e394654 SHA512 2df91ddabc6a44d1668cd1611e7ecfa28c75cc9b97958b669f78bc75afa46dca714a3e92af66faff59d31c44d7605797487ecb8b8a2610d19d35bd3fa5b40272
 MISC metadata.xml 503 BLAKE2B 632c797040e856e87b7875cb7820b97670f994bac90a3554bca2bfad492420972309fe48b190065b203d7b5be8030bf63fc9658d39c7e24f20fc5f3d8868a7b9 SHA512 76bca368c33e84e49c2ee8e742bb5012bec27fb033915c8c3bdb2957e9d8394e8f2c7fdcabf98770297f6e3489e6909f92755f681aab00218bf3705661b42c81
diff --git a/dev-python/flatbuffers/flatbuffers-23.1.21.ebuild b/dev-python/flatbuffers/flatbuffers-23.1.21.ebuild
index a7b6485ad67b..ca1ff83b869e 100644
--- a/dev-python/flatbuffers/flatbuffers-23.1.21.ebuild
+++ b/dev-python/flatbuffers/flatbuffers-23.1.21.ebuild
@@ -21,7 +21,7 @@ S=${WORKDIR}/${P}/python
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~riscv x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/importlib_metadata/Manifest b/dev-python/importlib_metadata/Manifest
index 609bccb73169..8eb313f38a00 100644
--- a/dev-python/importlib_metadata/Manifest
+++ b/dev-python/importlib_metadata/Manifest
@@ -1,9 +1,5 @@
 DIST importlib_metadata-4.13.0.tar.gz 50445 BLAKE2B 0f52430bdcf63275d16d330fd2ec6a85926ab75cc2c14d0e996dc29a1258ba71e12253dd36f776f280c68cfc0d68058ce52d246fef5eccd9c3b7e5ea9bab5441 SHA512 68deb9b017d89df05b613c564bfaafd9024f9a6b1b14973bb75c0756f29911c6a2516a87b4fad60cb15b66bca79a275163fb8db2cfbd088ab952633de056d1e1
-DIST importlib_metadata-5.1.0.tar.gz 49216 BLAKE2B 6f44926a1c98e21d4ddabe1885d37385f4b8888c35733bf87a00286bb001f403d8c733b3d355da0361bafc65d3176c7d20e46104067e66373c3777156289638b SHA512 9e3d42771f4fcbe334c1b4044415e91abd677f99adbe704fb7cd006659376052642c16b3890458ec9a700b34f75541318060e9563353659d33b4f16ed790ecc1
-DIST importlib_metadata-5.2.0.tar.gz 49561 BLAKE2B 8841818eea459abd9ec8b7741418482b25e8c0d9bf94f34a60f3decd79a9753be2b8be24f58aad6d03bff75e22474642730c4a58911ec4b2c962d3098a9150d2 SHA512 9168af203b60751e5a28c14bdb327c9471f0f4d712f3ac9f8e69cbf3d3c6d999aa15ae7b16c036e47ec6802ca155d75c204e90caf8776a197562b514a36bbb0f
 DIST importlib_metadata-6.0.0.tar.gz 49776 BLAKE2B 9c4e6b20b725e263dad4acc4553b0067777c7332b33c0e56344aa2ceb09e93d71db14aebc522ae81e068a1a82ad48947f6f72eaec932933ae61d4daa2e043e63 SHA512 7d5cea465bf02722b28542f374e36ed55ab09455e1e548e838acf0cb38dcd84a79f5ef7cd673400852ff3a33271078ec8476f02aa7bf7748d3b85f4cefe3f678
 EBUILD importlib_metadata-4.13.0.ebuild 1488 BLAKE2B a80c00bf0fb3d874c157bf81afa32c5ef5d8f6ac7f8a85c67098b8a47edd8427047c04d1ef706fc954d2937aa9b1b31ad17a3bb32686c3cf1f935e04bc646483 SHA512 e43acb00573f92ffbf8843b9acdbce58ca04ff42ac6ef09ada0fdb20fd5d36c597054b518ae2d6b9d5c06a3d17654c295727dfb6a15efed6ca9a4e368f62d4fa
-EBUILD importlib_metadata-5.1.0.ebuild 1538 BLAKE2B a4362ad8c4b2adb17f3f643c503b3cdabddc9a9765a8e83911e66ab24983c4147947092bc6f9176955c60377215636718ae2015200dc67962d70bd95355c7ff3 SHA512 a38f34c7c763207cc6cde3b4dc1467553f5d3bae04317a1bb05e4ebe3ca35b48beddf1d370080f370fad8af9c0dd960eff658b9342902619b9693c34cd073791
-EBUILD importlib_metadata-5.2.0.ebuild 1546 BLAKE2B 1e78a8e831693b721c77d64795a7c9fedf0b5ca4b851c68abd91b18d1038eb78ecf299dc47da2fcb75302ac493b31b0cc98b1222d7ae14ee21faf24fc6bb5ddb SHA512 925e80d9734e83669cbd8d613e71fa675f3a28edf28636c7d1ad4bb7f9910d0b4bd86e5aca428d8927a23c00232925beb1468fd04d0416a254f36cf8832f01db
-EBUILD importlib_metadata-6.0.0.ebuild 1546 BLAKE2B 1e78a8e831693b721c77d64795a7c9fedf0b5ca4b851c68abd91b18d1038eb78ecf299dc47da2fcb75302ac493b31b0cc98b1222d7ae14ee21faf24fc6bb5ddb SHA512 925e80d9734e83669cbd8d613e71fa675f3a28edf28636c7d1ad4bb7f9910d0b4bd86e5aca428d8927a23c00232925beb1468fd04d0416a254f36cf8832f01db
+EBUILD importlib_metadata-6.0.0.ebuild 1538 BLAKE2B a4362ad8c4b2adb17f3f643c503b3cdabddc9a9765a8e83911e66ab24983c4147947092bc6f9176955c60377215636718ae2015200dc67962d70bd95355c7ff3 SHA512 a38f34c7c763207cc6cde3b4dc1467553f5d3bae04317a1bb05e4ebe3ca35b48beddf1d370080f370fad8af9c0dd960eff658b9342902619b9693c34cd073791
 MISC metadata.xml 646 BLAKE2B c3f9ff98b5090d22a37a5a5b36b6c8523b4d1ee804c05c880bffe6a45ee482023d4c037b49332bfa93cb60cc5892d1178b486cf1d2e0d4c44d7da8d292e406d5 SHA512 e558c5ae62e98685a43bfafbff6fc5d5339965a9bf8c6bf0bd8cd5b542c94ae6ecaf0a04e5210b211a32abb65b37c5db6af64dc7d74ae79ec31075fcc659c9f4
diff --git a/dev-python/importlib_metadata/importlib_metadata-5.1.0.ebuild b/dev-python/importlib_metadata/importlib_metadata-5.1.0.ebuild
deleted file mode 100644
index c8e0f3296a1c..000000000000
--- a/dev-python/importlib_metadata/importlib_metadata-5.1.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
-EAPI=7
-
-DISTUTILS_USE_PEP517=flit
-# NB: this package extends beyond built-in importlib stuff in py3.8+
-# new entry_point API not yet included in cpython release
-PYTHON_COMPAT=( pypy3 python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Read metadata from Python packages"
-HOMEPAGE="
-	https://github.com/python/importlib_metadata/
-	https://pypi.org/project/importlib-metadata/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-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 ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	dev-python/zipp[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/packaging[${PYTHON_USEDEP}]
-		dev-python/pyfakefs[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/importlib_resources[${PYTHON_USEDEP}]
-		' 3.8)
-	)
-"
-
-distutils_enable_tests unittest
-
-src_configure() {
-	grep -q 'build-backend = "setuptools' pyproject.toml ||
-		die "Upstream changed build-backend, recheck"
-	# write a custom pyproject.toml to ease setuptools bootstrap
-	cat > pyproject.toml <<-EOF || die
-		[build-system]
-		requires = ["flit_core >=3.2,<4"]
-		build-backend = "flit_core.buildapi"
-
-		[project]
-		name = "importlib_metadata"
-		version = "${PV}"
-		description = "Read metadata from Python packages"
-	EOF
-}
diff --git a/dev-python/importlib_metadata/importlib_metadata-5.2.0.ebuild b/dev-python/importlib_metadata/importlib_metadata-5.2.0.ebuild
deleted file mode 100644
index f9680502aeec..000000000000
--- a/dev-python/importlib_metadata/importlib_metadata-5.2.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
-EAPI=7
-
-DISTUTILS_USE_PEP517=flit
-# NB: this package extends beyond built-in importlib stuff in py3.8+
-# new entry_point API not yet included in cpython release
-PYTHON_COMPAT=( pypy3 python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Read metadata from Python packages"
-HOMEPAGE="
-	https://github.com/python/importlib_metadata/
-	https://pypi.org/project/importlib-metadata/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-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 ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	dev-python/zipp[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/packaging[${PYTHON_USEDEP}]
-		dev-python/pyfakefs[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/importlib_resources[${PYTHON_USEDEP}]
-		' 3.8)
-	)
-"
-
-distutils_enable_tests unittest
-
-src_configure() {
-	grep -q 'build-backend = "setuptools' pyproject.toml ||
-		die "Upstream changed build-backend, recheck"
-	# write a custom pyproject.toml to ease setuptools bootstrap
-	cat > pyproject.toml <<-EOF || die
-		[build-system]
-		requires = ["flit_core >=3.2,<4"]
-		build-backend = "flit_core.buildapi"
-
-		[project]
-		name = "importlib_metadata"
-		version = "${PV}"
-		description = "Read metadata from Python packages"
-	EOF
-}
diff --git a/dev-python/importlib_metadata/importlib_metadata-6.0.0.ebuild b/dev-python/importlib_metadata/importlib_metadata-6.0.0.ebuild
index f9680502aeec..c8e0f3296a1c 100644
--- a/dev-python/importlib_metadata/importlib_metadata-6.0.0.ebuild
+++ b/dev-python/importlib_metadata/importlib_metadata-6.0.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 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 ~x64-solaris ~x86-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 ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	dev-python/zipp[${PYTHON_USEDEP}]
diff --git a/dev-python/packaging/Manifest b/dev-python/packaging/Manifest
index 7d517df8e103..db60e256f201 100644
--- a/dev-python/packaging/Manifest
+++ b/dev-python/packaging/Manifest
@@ -1,7 +1,5 @@
 DIST packaging-21.3.gh.tar.gz 80471 BLAKE2B a16ba1e74f0c868816131a7cb07b7aa0c14760cf3ad4c3d6737ac30ef99276c33b1f018d29e710f28e8d0cfb0e3e6b91e375d1d17e2b7ec6302164377cd503d0 SHA512 8960deacda26877b73d98a3b632e760e902a16ec7a04707f84044980e4d4fb33e4f584db115c9008066aa876079f28633bafe37fbd5ce9a23830b6b89eb4ae7a
-DIST packaging-22.0.gh.tar.gz 83340 BLAKE2B 6f8e36c1bed71d4d5902fb833a7c011f3eac5e5e00f9e73a7258bbb6c79cfd30c6c175ad5778c5a5dd88bc275a66f69448ec59937159553d229f93510e189d41 SHA512 2189dec11dd9fd78a6d816bda08f881e5aa54fde09d51450ceb460a37ba87231fcfdb5ad4f58d262face44dfb0f1c4b420f759491008f8c26cef7e8317c414a8
 DIST packaging-23.0.gh.tar.gz 84318 BLAKE2B b600fc124e368ce583e16c3f4ee478e5774a830818884ff29c797410675c206b37e3cbac8e9ddd724b40ce53c00b1f0b6a58a9dacc1988e3bf59165b656b134b SHA512 5dd2f4a596e5a1ed01b461a37e063573f5ae08e181df40377a167fe2483205b3d965e10dc403cd173d0f87e0bdcae3cde05bd39024783fbe44541d0f777d94de
 EBUILD packaging-21.3-r2.ebuild 1287 BLAKE2B 2870f831684796f8e4c223304d0cb4a58332daa2cf9873c34ad65556974ebfb537fab34efedc4a75322a90d6060a380aec719fdf359542128ada7bddaac12197 SHA512 077ad101bfc78ab66a78e97979f93665aa4bdc47ba183dc257ad3cd93897673a32f9a1df10e492f705fc746a64aa65b110644908bd1f6890ed328f5a9cef35cb
-EBUILD packaging-22.0.ebuild 944 BLAKE2B 2e430bf0faae67d82e926b4fa106a77e0b8c8a2060e7c51320209d716dc7d87a9c0a6dc5f90ea70be91af9995e91e188bb8f9eb74697632fa4d8ffa3034b8387 SHA512 1041b7b9dba4dbba17c1e0d14794172d5139442daca01fa1d88602b51cafd49521dcc4b75d473e36b4acf43eeffa70356aab923da55fe55f70c76afec5b068cc
 EBUILD packaging-23.0.ebuild 944 BLAKE2B 2e430bf0faae67d82e926b4fa106a77e0b8c8a2060e7c51320209d716dc7d87a9c0a6dc5f90ea70be91af9995e91e188bb8f9eb74697632fa4d8ffa3034b8387 SHA512 1041b7b9dba4dbba17c1e0d14794172d5139442daca01fa1d88602b51cafd49521dcc4b75d473e36b4acf43eeffa70356aab923da55fe55f70c76afec5b068cc
 MISC metadata.xml 391 BLAKE2B 0d73ed3809b26e3069048116ab247ceeb9e2932e0d8d6063b97cc1f0ed8359e73a54b22035fedb169524e502b6a07b8203e6c35d801f738bbed685d90e12bf96 SHA512 eb4d1ca476a45232547fdd961a4e6715dda24c7ab82e1f1995ac977b9825793d5d10a2ac408b1ee0b7c8b8444f2c42be33d6fb1012461f96db9a71477cca67ae
diff --git a/dev-python/packaging/packaging-22.0.ebuild b/dev-python/packaging/packaging-22.0.ebuild
deleted file mode 100644
index e572f1e8533b..000000000000
--- a/dev-python/packaging/packaging-22.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
-EAPI=7
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Core utilities for Python packages"
-HOMEPAGE="
-	https://github.com/pypa/packaging/
-	https://pypi.org/project/packaging/"
-SRC_URI="
-	https://github.com/pypa/packaging/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-SLOT="0"
-LICENSE="|| ( Apache-2.0 BSD-2 )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	>=dev-python/pyparsing-3.0.7-r1[${PYTHON_USEDEP}]
-"
-DEPEND="
-	test? (
-		dev-python/pretend[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	epytest --capture=no
-}
diff --git a/dev-python/phply/Manifest b/dev-python/phply/Manifest
index abae41418cb6..3c5b7ce10a56 100644
--- a/dev-python/phply/Manifest
+++ b/dev-python/phply/Manifest
@@ -1,5 +1,3 @@
-DIST phply-1.2.5.gh.tar.gz 35624 BLAKE2B 99fe9704cef570ad3055fa6c5aaaaed866d3c41c1479efbd29bb3224ae666d2ba13ccca61e6d67a8a0da4542dec79b5fdd201254e1ad638de81fa762049f4d13 SHA512 f0e4d0a6d2dfad5163fb68660602482b6de58c0dbd60d8db2f1df0622a9da3cc24e5fd309299a4a9ccf7abde081644a9a91fac8a2800520859199060f4080dc4
 DIST phply-1.2.6.gh.tar.gz 36068 BLAKE2B 766783e047b99330e5af829be875b9ee06fa70222a9c42a8792506ef0c6decc525ca90560f54d9833cdf4516fcd447f19a05d94d595a7e5056ca5d3d89bd1753 SHA512 3d7065971c6839dbe908efbfede1865183aebb0ffea1bb3b1a27c20239736894e52dc9b0a89ad6da152f1d9411dce288cf67a907d86c9838f0516236f0c19dd6
-EBUILD phply-1.2.5.ebuild 772 BLAKE2B 3666518f0d19f8e9236bea99b0caf15ff745166d4ea2fe8b3881a3c227d8e3593d06b6095b1638aebcef88cabe6a32f0d2d2d29eacd42443ced4480372de80f8 SHA512 02f60a8e765395c85218177deaf56dcc69fedef7a20e7a459677bca76d043afa4df559684eb03d2953dad51e4c1c9c6c74a47da40d8fcc78be73bb339ff5be28
-EBUILD phply-1.2.6.ebuild 809 BLAKE2B 786e302aab6002b7b3ca33f1b3cc0eaa7a72d4eae55b27498c56027a0fe6c76a077b50322cff5ab960f9386d80cbe268a5d53a98117d635f86d4234fcfed798f SHA512 08fa1e6a78a98fe5ca9676f4f310adb64aae708080caada25b4a0159200cf3ea63b9a9a2db4b057b59cf0d7453e0a26f04db1525785f78c047cfc6b5a7322d0f
+EBUILD phply-1.2.6.ebuild 806 BLAKE2B 15a104cec47330bf6572c5604e312dffe47d031eccce385b5f5ecd39328253f34d40dd17d6a3396ffcc6b7c7c3c6556276899a91d0afcf35f272915d954d4321 SHA512 2d0b00439cf52833498bac37b74847450b2f5881e1b31967ffb5974459a39e48478393c84eefbda8b4b51723e06b05a065357e3089f5f1f22568eac8ebf9623a
 MISC metadata.xml 365 BLAKE2B a35e6c179f994a06ff5343ebadd5500de5046861709629b7ab400e5e2633662c1d7579803b932c465eef58d5b0103509185206481dfad401adc4e6abe5d2faee SHA512 b77b46b63ba053fb7d50cc52e0385fb1a975520cbe549b024a62e7c452036f73b18f5785173902a99b82d56a50a2937b24d3d06e5c2d4f5689a8f7b8663766e7
diff --git a/dev-python/phply/phply-1.2.5.ebuild b/dev-python/phply/phply-1.2.5.ebuild
deleted file mode 100644
index 84fbb21be9ce..000000000000
--- a/dev-python/phply/phply-1.2.5.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-inherit distutils-r1
-
-DESCRIPTION="Lexer and parser for PHP source implemented using PLY"
-HOMEPAGE="
-	https://github.com/viraptor/phply/
-	https://pypi.org/project/phply/"
-SRC_URI="
-	https://github.com/viraptor/phply/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-
-RDEPEND="dev-python/ply[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}"
-
-distutils_enable_tests nose
-
-src_prepare() {
-	# namespace? seriously?
-	sed -i -e '/namespace_packages/d' setup.py || die
-	# prevent installing tests, turn phply back into normal package
-	mv tests/__init__.py phply/ || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/phply/phply-1.2.6.ebuild b/dev-python/phply/phply-1.2.6.ebuild
index 659247559564..67cde47b11fa 100644
--- a/dev-python/phply/phply-1.2.6.ebuild
+++ b/dev-python/phply/phply-1.2.6.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 
 RDEPEND="dev-python/ply[${PYTHON_USEDEP}]"
 BDEPEND="${RDEPEND}"
diff --git a/dev-python/pybind11/Manifest b/dev-python/pybind11/Manifest
index af0aab13469a..7bb61cd1ec05 100644
--- a/dev-python/pybind11/Manifest
+++ b/dev-python/pybind11/Manifest
@@ -6,6 +6,6 @@ DIST pybind11-2.9.2.tar.gz 709521 BLAKE2B 76ae9c72faad805885eabbe4dadf1092fe814f
 EBUILD pybind11-2.10.0.ebuild 1226 BLAKE2B 0c0a8105fcf4837b1126fdbaba818fcc96876becd8d4bd01e9b39d4e8b8809d3fea752e253c6c9fa4ce2ba48f785c5502ccb954ca25a9118166c086dc7e7aabb SHA512 776ee99c0a11085557d23739405c50f85bf22653d4a1277c27163ffafb1a5e663e627d7d5d8a29f5e2487b129c95ec8636fd25592bca657030ca6461c88a0052
 EBUILD pybind11-2.10.1.ebuild 1235 BLAKE2B 34a0a01fd99fbe60ae9624f7239dacc187d9b26112e289dbb9a81dafa9b19670d62640bef0c79303f961a098c41518ec2d43a93469ca82f84c5d72b6065b58a2 SHA512 7eb56942e1c770942f3607d587077756fe9bbf3c6ade2bd1a4e0d504ba6766f6998baf76076d0b672412a6df361021841f7bbdf73fc5ebcace99167c70dec43d
 EBUILD pybind11-2.10.2.ebuild 1239 BLAKE2B d11d8b36d4029c35e444f7a63748bd024415e87f065474c8720a0c7be3457d92d9314d928103043bb727f97dda14fcaa069ecf0ee00ebd0627a225b4b4fd1a42 SHA512 768df0fe431a8ea1cb21239d1bc91c6d0013ac033f1d7b2f99184b2cc3a1a70f7079c73ed50e65698aefb0b22f64b7e33f374d5b72303729fe9869cbdc8b0940
-EBUILD pybind11-2.10.3.ebuild 1239 BLAKE2B d11d8b36d4029c35e444f7a63748bd024415e87f065474c8720a0c7be3457d92d9314d928103043bb727f97dda14fcaa069ecf0ee00ebd0627a225b4b4fd1a42 SHA512 768df0fe431a8ea1cb21239d1bc91c6d0013ac033f1d7b2f99184b2cc3a1a70f7079c73ed50e65698aefb0b22f64b7e33f374d5b72303729fe9869cbdc8b0940
+EBUILD pybind11-2.10.3.ebuild 1234 BLAKE2B d77a29245962c43a024879ebf2f24c4f476c85bb856fb1ac57fdacda0c56673f1ef978b58007630b98a534ad4e1fdeec9826a9488fa18213a6c2e8d6c2699cbf SHA512 b584873e892e2ebc9fe2b81e1a14acd49449f68a2667235ff0f137dc2e27d3463dcaeca8e7171050d2a59476f9d369831e3bd87812e00e3cfe222e7b5a7e1bd6
 EBUILD pybind11-2.9.2-r1.ebuild 1223 BLAKE2B 66168ede9825239baec4f9ed44ab7b4bed7ca76c01c35e990f32639f6215f7cbaad0e55d0cb9e34d8f605a4aba08062b1abecfcaabe98f347746cefd8896d580 SHA512 eadfb7d5fdec41a4021423e4cffbfa22ac12d7c4b08b03fd12165b55167235312dcf5b330aff1089602eab8a0b47fd16e70c0ae8da534872896df9448527f821
 MISC metadata.xml 475 BLAKE2B faf317a1197850acb0d16546a303bd50ee1bfe6fc3aaf592e6c147c6612fd20b809f1c911d79ca9a356cfa0c4166d2b155fcbd593f8b55e0d7dd75ff6444073b SHA512 5779adcc9f25c15fd999aa6c91d3144fc14535270e57925bfb8ac67f45448c144a142af2ea9a321ec6ffbf568713f663cef85a0be3d4a056e58b1782a5fc9a41
diff --git a/dev-python/pybind11/pybind11-2.10.3.ebuild b/dev-python/pybind11/pybind11-2.10.3.ebuild
index 110671f3510a..e3a1ad1fc6c6 100644
--- a/dev-python/pybind11/pybind11-2.10.3.ebuild
+++ b/dev-python/pybind11/pybind11-2.10.3.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-cpp/eigen:3
diff --git a/dev-python/pydantic/Manifest b/dev-python/pydantic/Manifest
index 542aa5b659d6..3df5ec4ae4d0 100644
--- a/dev-python/pydantic/Manifest
+++ b/dev-python/pydantic/Manifest
@@ -3,5 +3,5 @@ DIST pydantic-1.10.3.gh.tar.gz 898768 BLAKE2B e8cec71f0d3f66e2c71e421505f624f7e9
 DIST pydantic-1.10.4.gh.tar.gz 898916 BLAKE2B 506a53de6a59f858a7c8fd56cf18f8079d48eb4f6d3ba36d149141a7e2d471819a466bfc1c34c879f5ec90c0de385b2b89d58beb75660da7de282278092e901f SHA512 0566f89518c6f0171c9b49b5fb57e568286ed421d64655dde90a1565d0672bfef6237ed99e4120564ca2562c7e29e08d86db4fcec47e605aaa98d60845688e72
 EBUILD pydantic-1.10.2.ebuild 2051 BLAKE2B 8ea3a809732bd01777e5dadc10b2be94f92b5c6c0be4edb2d1b1607dfa7fd2e9e9939f6a8778edf845eb857b90fdd746fea9aa518662e0f1b4d0d040a403c224 SHA512 358a9d90bf6fc3ade2a3fef4540d401b394df8802ce3938bddfba459f0b6f56b460237416e407b661cbf6d9aa7f006493576c55727d83f8d98973391f69c0839
 EBUILD pydantic-1.10.3.ebuild 2131 BLAKE2B 08bcf030d350581b75cd6453723201d9e3f38819ae232445466ecd8aa5d22f037a1ec05295c26050c3992d2136d5f77a689937ca7ee65c216babc5755e200789 SHA512 30e4c15dd5f1dd3ca2e03a0869a4ddebfd4c3cc529f3bf2bb8c47d5baf8f3ccd6c01c17f44e6e6fca4920ab68fec0e439413e72020f8a69c2e74da2504a62d06
-EBUILD pydantic-1.10.4.ebuild 2131 BLAKE2B 08bcf030d350581b75cd6453723201d9e3f38819ae232445466ecd8aa5d22f037a1ec05295c26050c3992d2136d5f77a689937ca7ee65c216babc5755e200789 SHA512 30e4c15dd5f1dd3ca2e03a0869a4ddebfd4c3cc529f3bf2bb8c47d5baf8f3ccd6c01c17f44e6e6fca4920ab68fec0e439413e72020f8a69c2e74da2504a62d06
+EBUILD pydantic-1.10.4.ebuild 2123 BLAKE2B 7f8649bb7db04feaa3f97f112bc11e53dca826470a8da1a73d04dfc151d241ba050f205263512eb485e046600c27fba6cec679e1dcbadff63209d9f3b27d7320 SHA512 86d04628a2bccac06dcf7458ce3ff5a5f8250c5a68b09654f340de4b06650955ae35af5d1947437d2356e1eca084c24774b5f812302b7932d6dd5bf978a2e4e5
 MISC metadata.xml 571 BLAKE2B 11d9b5831b90a37433b357349ad2fd9b0e908e054f849fee2cc16071c57b8d2d465c70275247f81d605a689ab16edaa160be3d802eaa00f3ecea4b884a5d18a1 SHA512 3f34f3708ad8fa0014f5f8ca4988225e03bb707a5ab91e295946fc480dc56eff04cff1746605e3ce1b33f9c5f94f390a74aeeb49f0d8fc5e8801bb85714117e6
diff --git a/dev-python/pydantic/pydantic-1.10.4.ebuild b/dev-python/pydantic/pydantic-1.10.4.ebuild
index 7f061956a374..3c41a8e86030 100644
--- a/dev-python/pydantic/pydantic-1.10.4.ebuild
+++ b/dev-python/pydantic/pydantic-1.10.4.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="+native-extensions"
 
 RDEPEND="
diff --git a/dev-python/pypy-exe-bin/Manifest b/dev-python/pypy-exe-bin/Manifest
index 19cec68a64f9..b5cedeb64a28 100644
--- a/dev-python/pypy-exe-bin/Manifest
+++ b/dev-python/pypy-exe-bin/Manifest
@@ -15,5 +15,5 @@ DIST pypy-exe-7.3.11-1.ppc64le.gpkg.tar 11110400 BLAKE2B 5c37eec6ee5f38821c9f2a5
 DIST pypy-exe-7.3.11-1.x86-musl.gpkg.tar 9758720 BLAKE2B 19fa123ca6d25f90a8b330efe1bf8147a29f7a2038f4c23897442ef9f7fd6a5ea7a56c51e1539ec43e5726d333e7037e4f60999d15b87bd4de0fe336b48bcefa SHA512 e761b37c9fa8801b51015329707e1b92cadd3901937ecc5ccc5ce51a564933553e4b4058092f87930a6da080ab2a608bffb1e76376ef711091cce8d3f773cbdd
 DIST pypy-exe-7.3.11-1.x86.gpkg.tar 9748480 BLAKE2B 737b88b88c756b084183a30149709d10d868c9a8feb723c6d1ae10fb1cc4b9f5a363e3aba3d2dd2718b5df727e0a6cf4a55efc449b8d2a00ea12bc1a67b9762f SHA512 56518c8142909296e01d716062acc4187d204af958ff197fc3116bfaac47b94abc67f6ba1d8ac0ac74c9a287231af8d35c7511b0f65c9fdf1f93b75294094ccc
 EBUILD pypy-exe-bin-7.3.10.ebuild 1947 BLAKE2B 59a640910afb08fa48c719783dc436375119399b0ecc1f631e9083c41c7e045259b351b266b75f2dc414a597020800ba041f746ee37a7860f319c96dc3d4c2f1 SHA512 b62b37579075642688c4e3a5f8c2f803c9c8b175f815d22bbaecf788656f5fdcbbb8725caeebb78208bb67c8aa22616ead150461c89122a762706218dbf2f534
-EBUILD pypy-exe-bin-7.3.11.ebuild 1949 BLAKE2B 94aab13ef57d61e9f12cd918a7595f48b605c2efb8e7e6a2c9ad54df0a016c77ead00a9cb9069c0da0c0c7d58882a2559416323a1f69590b5d33d85747596289 SHA512 c385b837715846a9aa28535989638b695dfe2077329c21c876cc07704cf307680c64b7b29626483b84e564cce72db963f0a257304064b4bb59b37293b7389ed6
+EBUILD pypy-exe-bin-7.3.11.ebuild 1947 BLAKE2B ced9c32c68bc0d6991a3c023c5ac6f3952cae5be14c39bbaf498c2efa249715235747526090d59f6a39da4645c83551ebfebabb2a2c7a25343c5acb64d9a1d6e SHA512 3ca0ae4098385dbd208bb3d069b17f9654b2b61b8d85fc822776a91e69341a60492c101310c24fc10a7d0e68b080ce28976d1bc9d5c120dbb40d4af04a7215ae
 MISC metadata.xml 241 BLAKE2B 4f18c355c71824c25df283b2d463a5abbf2295446e74b960e868dd78d4910ac066725450478087567a6e66b7a8948d99e053f13a7e58dbf2b89fdaf5c2f3436c SHA512 c46e70ffd66754ad84c64806f2bbff25ba9a688f035176a4565afc95351ce10fffba64bbde89965501460b05978c7e59b3d84db6a8cb6efff4055d4b7a5ab5d8
diff --git a/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.11.ebuild b/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.11.ebuild
index 26726bf419c3..74ddb5070753 100644
--- a/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.11.ebuild
+++ b/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.11.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
@@ -50,7 +50,7 @@ S="${WORKDIR}"
 
 LICENSE="MIT"
 SLOT="${PV%_p*}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 
 # sys-devel/gcc for libgcc_s.so
 RDEPEND="
diff --git a/dev-python/pypy-exe/Manifest b/dev-python/pypy-exe/Manifest
index 9781a9c0c5a6..7764be6fd609 100644
--- a/dev-python/pypy-exe/Manifest
+++ b/dev-python/pypy-exe/Manifest
@@ -3,5 +3,5 @@ DIST pypy2.7-gentoo-patches-7.3.11.tar.xz 5312 BLAKE2B 3692453a184a88d61fe1dd7aa
 DIST pypy2.7-v7.3.10-src.tar.bz2 19865458 BLAKE2B 0ba83b873daf99b20bd38ee63734c7ceb47b6a7e9cb4bdab1ebbd5672767411f0bf926a19a7074cbfc154a8d83e3679c98fe38c5b6e00c1a4a3fab5424b5ba5d SHA512 750427ce03fdc39f8b6df528f5a2b17f33429433f583a7c46a6b9564f7e398616ae61efb635a4bc0a1f8916ca1881bf1f6347a7ea1748c09ae02e4d88315986d
 DIST pypy2.7-v7.3.11-src.tar.bz2 19850421 BLAKE2B ed8bd61e3857c37689f24a23d38d5043bd190ee0e6de5d7906284ea2eab5e7aeff5c994c22f97195f5a1ded2867725f74dc562b375c0165b6231eae69213c06e SHA512 31fd93fe3e761fd096ff52c2a0afa40f78e4df700deb911e221d1682b35e8374c9deac7ba19b474f7ca7a366d3ae9b36ebaf78e81c4ec8306431fd0873daea55
 EBUILD pypy-exe-7.3.10.ebuild 4060 BLAKE2B 35622522d66a0274062153e59b7f967dfd205fb2b077d5b00a3dfdfe6faa041d03568d1abf5cac7fe2c420ed8ea83b4a0e52b9c74b1735b306f3fc58ea895009 SHA512 85be0f5307418c8fdd50fd214c59761cec0a288a8cc22f73bace863d04da7f05a15e99615fdf8758121a1c4b9b3edeb2b27b78ecd57fd22f2ce37989d1c7a003
-EBUILD pypy-exe-7.3.11.ebuild 4062 BLAKE2B 0ab485e4deac6ffccc91c221e30c639a2ad1e3ad873af0c36a7102c07cbed14cce9215902475e51898f791d5da52648c26f19559d4c238e159c1c8b25b2ae9f1 SHA512 7dbb28927cfb82952a30536d8acffe1d4352dee4126b286fec5b6aa9969f6942cd572ac060e984d2ea844e05025837ca42e5c7adcfa01fdf97a0e53fb56d25eb
+EBUILD pypy-exe-7.3.11.ebuild 4060 BLAKE2B 5c6883e608eba8f972af83966b23dfd3e13edfeeb511d1a47f303b60746d5cb08ab9bdb9914b5b7dd2ff6ef630e15a0fca3a3c3f253e4f76aca7145ff72cf35c SHA512 d5dc8433dd88b0ae58b3283ad233dd7524acf31763e917e46ab8f837623d340f4d487a06fce679a7e91fa96cf89acf98171a423acf4b0251776f1e2abdf41c0c
 MISC metadata.xml 498 BLAKE2B 8dbcdb7c3a4a2fa5d1a922fd5197fb5e3337adcaec1e7d382f25f8696c80726e5b79843477bf8e5ce131aecde6e2c4c283548c5b337e54cb58aaa066013c445a SHA512 8a9bb514bbf3bf328aa63734e1fdc106f6aaf5ccb88c29ad8a686ab2724f3d1f4727163500013dd16e7b34232b881cf47d2f174212b5428ee076af27cf43628d
diff --git a/dev-python/pypy-exe/pypy-exe-7.3.11.ebuild b/dev-python/pypy-exe/pypy-exe-7.3.11.ebuild
index 16adc0e787e0..b898c0920192 100644
--- a/dev-python/pypy-exe/pypy-exe-7.3.11.ebuild
+++ b/dev-python/pypy-exe/pypy-exe-7.3.11.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
@@ -19,7 +19,7 @@ S="${WORKDIR}/${MY_P}-src"
 
 LICENSE="MIT"
 SLOT="${PYPY_PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="bzip2 +jit low-memory ncurses cpu_flags_x86_sse2"
 
 DEPEND="
diff --git a/dev-python/pypy/Manifest b/dev-python/pypy/Manifest
index a6ace3908152..129caafe7a3e 100644
--- a/dev-python/pypy/Manifest
+++ b/dev-python/pypy/Manifest
@@ -3,5 +3,5 @@ DIST pypy2.7-gentoo-patches-7.3.11.tar.xz 5312 BLAKE2B 3692453a184a88d61fe1dd7aa
 DIST pypy2.7-v7.3.10-src.tar.bz2 19865458 BLAKE2B 0ba83b873daf99b20bd38ee63734c7ceb47b6a7e9cb4bdab1ebbd5672767411f0bf926a19a7074cbfc154a8d83e3679c98fe38c5b6e00c1a4a3fab5424b5ba5d SHA512 750427ce03fdc39f8b6df528f5a2b17f33429433f583a7c46a6b9564f7e398616ae61efb635a4bc0a1f8916ca1881bf1f6347a7ea1748c09ae02e4d88315986d
 DIST pypy2.7-v7.3.11-src.tar.bz2 19850421 BLAKE2B ed8bd61e3857c37689f24a23d38d5043bd190ee0e6de5d7906284ea2eab5e7aeff5c994c22f97195f5a1ded2867725f74dc562b375c0165b6231eae69213c06e SHA512 31fd93fe3e761fd096ff52c2a0afa40f78e4df700deb911e221d1682b35e8374c9deac7ba19b474f7ca7a366d3ae9b36ebaf78e81c4ec8306431fd0873daea55
 EBUILD pypy-7.3.10-r1.ebuild 7010 BLAKE2B e04e62419077ac42ea4a98823a417c93178e449848028d444639c702e974cbe4b91dc8cf845f007e73dd0f09059337f6d572ef95ea1d064a29951f17009db799 SHA512 f0ace1f6f9c2538dde403216add2d6d739a8d2d05bdf5a913be3cf08fa423cd9beb021637c1431c94f244a889ffd0189912029fc8b79f9e60d22542a1262c7fd
-EBUILD pypy-7.3.11.ebuild 7012 BLAKE2B facc79e92d840fe0a789d6042fe0ad303328e7967c478d47653e448c74bcf34b6b4393fbde4b5f9280da5715cfeda01a1d48da1adc630d1797c53bfefaac1331 SHA512 0526b22b201f7418a555b73a7e5ae94fc3a54c5a6de49bea6989678428a820c218b72823179c5a5d32cba274057a0f8fdf9b63b302764a6e83a18493518fdf69
+EBUILD pypy-7.3.11.ebuild 7010 BLAKE2B 29eee9f19e86d4f69010d30f96b37e04e4eb7719f6ddf04a25c6d94a1c81ce41290b94745acdc2e0033d423f3021c996adbae62edf12b0e920c90dabbce44ff1 SHA512 814f448596809f50908e0bef9e77834cf3e5551ea49bbaccdef243cf321e841d2063a8ca0efd9db253f38c69ddb1ec85deda6132ac73f8eb58ba8c6976087bb0
 MISC metadata.xml 565 BLAKE2B 956a62e9d3632a7ab9ade67527bae54fe0b58d79a6c2f26dc7017a6b8d337f7e5a155b747f24b98f345eb9e1d15c3f38d8530212ad16cfa5292d6cb1ecbf3e91 SHA512 6dd5bc7712533a926b7efdba10c3bea32c813d703916f6bf152ff14f7561cdc466354c8fdbb9640afe415daa3cf2d9365351261e89b8aadfae7b74afd48ae061
diff --git a/dev-python/pypy/pypy-7.3.11.ebuild b/dev-python/pypy/pypy-7.3.11.ebuild
index 18468b85d8c6..0539950e6f62 100644
--- a/dev-python/pypy/pypy-7.3.11.ebuild
+++ b/dev-python/pypy/pypy-7.3.11.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 @@ S="${WORKDIR}/${MY_P}-src"
 LICENSE="MIT"
 # pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
 SLOT="0/73"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="bzip2 full-stdlib gdbm +jit ncurses sqlite tk"
 RESTRICT="!full-stdlib? ( test )"
 
diff --git a/dev-python/pyspnego/Manifest b/dev-python/pyspnego/Manifest
index 6fa749a78bce..2382b8128fc1 100644
--- a/dev-python/pyspnego/Manifest
+++ b/dev-python/pyspnego/Manifest
@@ -1,5 +1,3 @@
-DIST pyspnego-0.6.3.tar.gz 200723 BLAKE2B d8a56681ab76d2d131f078af4cbb686636802bb3d4ffa87d2656d7ee5f3f685936bca3cd03d6801a144d9950c877f0f5717f3f9bb430c5223c89bbcc81eadf38 SHA512 a9a3bf898a77748b5caf2010fef0969397d3b9c9e2e12c7ec6cc8649b476dcaed310259c009a09c33517488ddc15b2daf63b6cf074071e0a6b922a2dbe2e6f60
 DIST pyspnego-0.7.0.tar.gz 219295 BLAKE2B 43a31b468ac52750858c74c676c29611f5294d64efe3b0b4ac31acbd0d3c8fb346fea0c396de98908ea7d03040e0d4b5e3e2adacc911413bfafad8e295fd3bb3 SHA512 0c3eeab267bc43fbc3836d2a804e25304ed245ae3f0bf7926cdfd1edd4815c6f25580c655218857ea117e63b13e0ea3e343614580096151d4d720ff6c79ab844
-EBUILD pyspnego-0.6.3.ebuild 959 BLAKE2B 0be1696ebd6c9d81829308fc8e24d8b1235c0b4b803af5adbdc160259b94f3a802790262aa5618bd42fd8344d51178324d3f88593c39796a57eec5a2a2ebd8b4 SHA512 88aad58536afa63a24632ba3a6da2ef6b480a9407fa0f5282ffd2c72b7aa69e83f9d194332d4826e5bff5068bacc0cdfaa1005fdd9604e53b52ed4965a1f3977
-EBUILD pyspnego-0.7.0.ebuild 962 BLAKE2B 9c4f0fdd1f4a5f07b9cf77410de1a752005f5da0a533ffd40e2ec8af6290010c7989b6168999aa4bbe1fdce8b2e7db503319be9059747429d5275e75b3c27735 SHA512 c36a9b85157f2a195af251aa95ef9a84faf377842caad18aa38074b8072d1f7bf98233e52d8f1f136eaf393a657590c182551ed38188cb5bc0e0ac89b2043e48
+EBUILD pyspnego-0.7.0.ebuild 959 BLAKE2B 0be1696ebd6c9d81829308fc8e24d8b1235c0b4b803af5adbdc160259b94f3a802790262aa5618bd42fd8344d51178324d3f88593c39796a57eec5a2a2ebd8b4 SHA512 88aad58536afa63a24632ba3a6da2ef6b480a9407fa0f5282ffd2c72b7aa69e83f9d194332d4826e5bff5068bacc0cdfaa1005fdd9604e53b52ed4965a1f3977
 MISC metadata.xml 445 BLAKE2B 2d30af32987aa7118331cb4c199b44069f6a6efc62d73eab62a31b29308848b7f7e56e026327af6c2197ee31c05fbe1885524bba7b6a84cdc0d97cc58c5fb43b SHA512 c7bbe6f161ce61409f6865f998fb4c8bd77c39011f5bbd148379912e31805773a41451163517cb7ebef99a57d6abe8f13dcdc568408ce182c0def6adf35afc9c
diff --git a/dev-python/pyspnego/pyspnego-0.6.3.ebuild b/dev-python/pyspnego/pyspnego-0.6.3.ebuild
deleted file mode 100644
index 7391046a331a..000000000000
--- a/dev-python/pyspnego/pyspnego-0.6.3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 2021-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 optfeature
-
-DESCRIPTION="Library to handle SPNEGO and CredSSP authentication"
-HOMEPAGE="
-	https://github.com/jborean93/pyspnego/
-	https://pypi.org/project/pyspnego/
-"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86"
-
-RDEPEND="
-	dev-python/cryptography[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	test? (
-		dev-python/gssapi[${PYTHON_USEDEP}]
-		>=dev-python/krb5-0.3.0[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/ruamel-yaml[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-pkg_postinst() {
-	optfeature "Kerberos authentication" "dev-python/gssapi >=dev-python/krb5-0.3.0"
-	optfeature "YAML output support" "dev-python/ruamel-yaml"
-}
diff --git a/dev-python/pyspnego/pyspnego-0.7.0.ebuild b/dev-python/pyspnego/pyspnego-0.7.0.ebuild
index 7f2accb1db00..7391046a331a 100644
--- a/dev-python/pyspnego/pyspnego-0.7.0.ebuild
+++ b/dev-python/pyspnego/pyspnego-0.7.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 RDEPEND="
 	dev-python/cryptography[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-plus/Manifest b/dev-python/pytest-plus/Manifest
index 05dc9a136a94..262dd6e0dd7a 100644
--- a/dev-python/pytest-plus/Manifest
+++ b/dev-python/pytest-plus/Manifest
@@ -1,5 +1,5 @@
 DIST pytest-plus-0.2.tar.gz 8210 BLAKE2B b8a28e72cfb4e10daa021528de9b5df2e9eb0bc4e911557c7c14a0825284787e94992132c0b74881867a41b55a67785c60b9b87a1594ad33fb57ebac8de391a6 SHA512 e16a03433cb6eb30b6881bec99482bc65cb7d1fa3d0db855befe666c0645d4b5ec02debde9dec4322ed0a0b77d3ac3f1cabda0cf98f375ffd68dc29fb55f5139
 DIST pytest-plus-0.4.0.tar.gz 9987 BLAKE2B 11b8f17630601f52ebae11b7a660c8d97b4c9f1699096a376c162952a03b9f1b580ead6ac0b040b15c267eec1123bffe07d128eb00aec7414e996275ebc4c4e3 SHA512 4f4258853280cac8e03c0477763fd588d2b3cf11e7746d2b8e7d3cf5774b845412bc8779d74d232e4b3473470c39753dc788ac09faf8e8b7c9fee22d7164bab7
 EBUILD pytest-plus-0.2-r1.ebuild 659 BLAKE2B a0bb40f17fb0b01b7fbc5cf89fc86605d3f7df3ef2adb853af3ba200c594b82516cf299e3ac6435c7c99e496a3073a4f77c75734cce86292d73837935b310e68 SHA512 2af3e07957276834fb2cf84448004b3135e3bc58454cbf3d74ecdc0759edfc01f5df6c2280430ea72ac4a3728338de2571c3ee6d831c0a59081947b24e8b3827
-EBUILD pytest-plus-0.4.0.ebuild 617 BLAKE2B 47694d6ab31b0a3db68bb09e20c32099c126987fd8840707ec951e1781733d70ad4a8a2b8e840fa53df137def09626cd74c189cefc309e6d8483884d286dc5fc SHA512 527f7695d91f2625cafbe5ed86df0c288eaf98d4a860f14cce286307352bf239cbc86f9fc5787b4235bd4af39c7f89f3bf7833402f39bd7aedcddf4da33136cb
+EBUILD pytest-plus-0.4.0.ebuild 616 BLAKE2B 48c5e78be088a297fe3ad24c944f32c1b8f60e44e9698560d3ce1193756d275e4ce09e5cbdb1099df544809be8245bf5e610743322b65a721cae688ae3fbabe1 SHA512 4db88205af10291dffc69b6f679e2cfe940741528d43ac589d43f4a1967618b9580eb1bf79a5834f67ebb05af20c2ce11064e4fee96319cdb63eb7deef1c7c1d
 MISC metadata.xml 406 BLAKE2B ae1b1a2c28f45b4dd7f752125161396de88cf2ed3881f37f72dc7938cd2ea6485c995d0409c6fbaebeb7b1d4cf59736496549702d7a9d825a2ee5eb1e6a65fdf SHA512 33668115e05810055fa79f5d74c5d3b6eca5bb53e0108a257cb57bb496ebd0292c1dd3f5b33feee58c20c2c381a926c870f9576355171a91106c21fea41d6ab3
diff --git a/dev-python/pytest-plus/pytest-plus-0.4.0.ebuild b/dev-python/pytest-plus/pytest-plus-0.4.0.ebuild
index 6d46f574754a..12859926f5ec 100644
--- a/dev-python/pytest-plus/pytest-plus-0.4.0.ebuild
+++ b/dev-python/pytest-plus/pytest-plus-0.4.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv"
+KEYWORDS="amd64 ~riscv"
 
 RDEPEND="
 	>=dev-python/pytest-6.0.1[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-skip-markers/Manifest b/dev-python/pytest-skip-markers/Manifest
index e75a362589cf..f063b4783bbb 100644
--- a/dev-python/pytest-skip-markers/Manifest
+++ b/dev-python/pytest-skip-markers/Manifest
@@ -1,5 +1,5 @@
 DIST pytest-skip-markers-1.3.0.tar.gz 79882 BLAKE2B 2c44711e6194aebf0a0299f8a50e6162a088023c2fff6bdb7c142060695a6977b1d4a5cc574199d8f11a5a94e413d7444f81d9e954327e8317ed1bcf3725a60f SHA512 bea602032a7796be7c2dad62ba750e987b77f04349c96f6f8e1f15f5d2b58c3ba1e549a775ce7e541f6041091a578def59900a726872c8aa8b31c585e3f0c3e0
 DIST pytest-skip-markers-1.4.0.gh.tar.gz 70932 BLAKE2B d1bd597de0004ca37d8582896166be8f70833b386adbb53e5f812b28ac15bca613fea5e85b21bfb3549892f45ea8bbff13e66bafb97fc5db93e2fc6226a73c85 SHA512 6cb88833fd328f8e7cc6a2d0c8a0c9106b07186b8a20164c8272d685e93c21b111d4e7885ac1739ce777a9279a59705229ea41c3c31c71ac71d1bc26c13318f2
 EBUILD pytest-skip-markers-1.3.0-r2.ebuild 948 BLAKE2B 6645e517a40fbcda1c815c7c05479965f1c5b2dcd2d3698db216255402dca99be49bae257f601b035d38c5277c1bfdfa845fa7418676b88d56362b34d3791790 SHA512 5abe27e1ce477663bc0ffa4df90475cfa7af18b01da1d2e299a891f2b7473b5ab4a0266bcdd1a425c7d20dd3e56acb453fe75dafe24d401b3b1986922da46e53
-EBUILD pytest-skip-markers-1.4.0.ebuild 1111 BLAKE2B ed0e909d3acb166ee72886e051e47b15f11c3646fcfe22a2a19b9f6469ce40e1e0d9eb111ad9d22ff54246d61689e7a3c1bfe1ce282eb913e9f6afd81e8b2634 SHA512 dfca1d7037226414e34c9ebfae9ce08f578c1342f7fafdca089ad2ebb3abac2e55a931f0ed47b25e8910822efa1f1786cf526ad689ccca60af44d663eef3f7b2
-MISC metadata.xml 433 BLAKE2B 07de1af137dd4f1644c069f92e73f7558023095fb0e965ae3e1fe04ecf80f65fe267aa66cb54bddfe4df70c65f1bbbd87ddcb018e4e6bc52e8a83347d0720220 SHA512 842b3fedb252ab2493f2bd349fe6d1dd475bfd4b2ac6422c5dc4eea0ee422dcaebc09bf57a87b3f52260408e56b1036961af3accfcf43cc8a10c2d957ea18573
+EBUILD pytest-skip-markers-1.4.0.ebuild 1109 BLAKE2B f4811c70520ec9ebdea7b683a6f48a6c23d6bc92c55c0a54475c6c2de154b2758c7cb260050f652ed049e8b927017e75dbece6d7a6040d90fdf7550c3f536d08 SHA512 9f496420470514b1aeb903f5c7b77ef5c86cb83a38bb0f13cbf5ce4399b9866dd8be14f81483ee09d81a959835ef3a06b67e1093e056be445a5fd53cad77e15e
+MISC metadata.xml 502 BLAKE2B 7bdc44ea13e9ebfa8d021af8a1dc4d83d391d4e5432ca0c953fef593861cea852b76817214ccf80a8bef9fd481641b1eaecccabe839c6378d84d198d172754da SHA512 439a3664c428abd1796d33f15c7791ceb33ba65428b7bde27a42c181bbfda099d7a8c28e723fceb9bc5caa094072c77d6b84831b152d50653f4ef3d4dd54e412
diff --git a/dev-python/pytest-skip-markers/metadata.xml b/dev-python/pytest-skip-markers/metadata.xml
index 2d065697b436..ff23c8505554 100644
--- a/dev-python/pytest-skip-markers/metadata.xml
+++ b/dev-python/pytest-skip-markers/metadata.xml
@@ -10,6 +10,7 @@
 		<name>Python</name>
 	</maintainer>
 	<upstream>
+		<remote-id type="github">saltstack/pytest-skip-markers</remote-id>
 		<remote-id type="pypi">pytest-skip-markers</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pytest-skip-markers/pytest-skip-markers-1.4.0.ebuild b/dev-python/pytest-skip-markers/pytest-skip-markers-1.4.0.ebuild
index 46cdc7971c07..c941c25f9fdb 100644
--- a/dev-python/pytest-skip-markers/pytest-skip-markers-1.4.0.ebuild
+++ b/dev-python/pytest-skip-markers/pytest-skip-markers-1.4.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/pytest-7.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/python-xlib/Manifest b/dev-python/python-xlib/Manifest
index e910ade1a9ec..e5ce5cfabae9 100644
--- a/dev-python/python-xlib/Manifest
+++ b/dev-python/python-xlib/Manifest
@@ -1,6 +1,3 @@
-AUX python-xlib-0.32-drop-unused-tkinter-import.patch 251 BLAKE2B b5f8e9bf719b85d84463b2018bb92a1bc2de4a698998b8c76a1597f19e7da52d207eff2a97f71c916303b6ef2e37eb80cd55ab77723d7aecbb3ca3c8211220f3 SHA512 792ab97007bca4c9ed9e1d0d866926c4bd25edc238ae03e17c6489949dc1336b3374a6edeaaaaa23da17495bcbabe08e3da3d78063996a8866528c07e866f835
-DIST python-xlib-0.32.tar.bz2 213554 BLAKE2B cf24645529c6ca67a4825419837f312fa4ae0902bd2fb8f2eade7cc1645a3f79201b43c7ddca0cdcf8b21f623583acee1252cbe83d3700ab08979b8f0723b0a4 SHA512 9fecb77fa5d7ffba4c8031c0738147b7581dee9aed1a812254d22d78b6021cfc08743edb76829a3e5ba31f9a42648ea501b50ddcf5652ec3114a367c5e83d465
 DIST python-xlib-0.33.tar.bz2 213763 BLAKE2B 53486ec938bc00306658f3151556f1353fe5881ab942d06493f6f78d33b4cff8aab6e6aa5ad7e9124824d61549545719375c84f7b9376518e2328fa2e65df553 SHA512 3b7b4fea5cd69544d2227806853bdfdd04447089e182ca0f199e18e8bd43375d9bf03c819fd6a055ad4ad274594651e05db82585ab40d0fcf225ce36b553c991
-EBUILD python-xlib-0.32-r1.ebuild 1053 BLAKE2B 99270956f08dcaf9b18beed6abba11131f0fd6221b98c8e1dc97790012c30c2106d2347d96592cfaabc6affdd052bfdcbd5fb73a9e31046292a5beba6302beb4 SHA512 414a956ea9748f543e0104e5a636153698d61a3136a7533e45a4a2ede9f0b22c8ebdc85370072e598ab0437cc15dbfaf6a68c3a9a0fba24879439227419589e8
-EBUILD python-xlib-0.33.ebuild 990 BLAKE2B 2707f4d8475e55a4d47c0a504e284d21b1f4b0057d62ff4ef5158ebf8083b1c68ed8d4f0f778800e2b399750b5a71935408e572431e0638bfc7dac81993ec162 SHA512 053fba74e73b50f22ee82ea3df9e63c9f782402de47bd1c0eaf5255a917440eae16b8d4a5f7237041743bf6115a8c6fb68df6a902feff100d107fe9ab3627c4d
+EBUILD python-xlib-0.33.ebuild 987 BLAKE2B 65c19027b0bb28902e16c12173edde0de45b50a85a733e530fb092e8d5702437ca21834dd1f471ff6a87d1aa37ec3e289e922268f783e370904679cf96b2efbd SHA512 7cca1d11200645255c213624b3e13490986e4f3dde15ead32ec4f146a8f77b13dbbd925c5b3f16f6e25ff92833c62b433a26ee025d64d87386744abde87d4976
 MISC metadata.xml 434 BLAKE2B 3fa5d4e6b3b0347d1872805cf074795e486fe64a6b5b3edf326e9a8f81c1f5b86472ec6d906e85ef11493e9aeff9ef8ecfbece69103df037c8237fee3bbbaac9 SHA512 38738c99171d5351a797b12384a0f29b38250bb62cb17ff6250e3215a580500eec3210e22ee9605356c71477b8574b9fde34c5dee944b8437b901adc9b417218
diff --git a/dev-python/python-xlib/files/python-xlib-0.32-drop-unused-tkinter-import.patch b/dev-python/python-xlib/files/python-xlib-0.32-drop-unused-tkinter-import.patch
deleted file mode 100644
index 5a0272a867b9..000000000000
--- a/dev-python/python-xlib/files/python-xlib-0.32-drop-unused-tkinter-import.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-https://bugs.gentoo.org/881851
-https://github.com/python-xlib/python-xlib/issues/240
-https://github.com/python-xlib/python-xlib/pull/238
---- a/Xlib/ext/randr.py
-+++ b/Xlib/ext/randr.py
-@@ -36,3 +36,2 @@
- 

--from tkinter import W

- from Xlib import X

diff --git a/dev-python/python-xlib/python-xlib-0.32-r1.ebuild b/dev-python/python-xlib/python-xlib-0.32-r1.ebuild
deleted file mode 100644
index c7dd75f90ded..000000000000
--- a/dev-python/python-xlib/python-xlib-0.32-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# 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 virtualx
-
-DESCRIPTION="A fully functional X client library for Python, written in Python"
-HOMEPAGE="
-	https://github.com/python-xlib/python-xlib/
-	https://pypi.org/project/python-xlib/
-"
-SRC_URI="
-	https://github.com/python-xlib/python-xlib/releases/download/${PV}/${P}.tar.bz2
-"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~riscv x86"
-IUSE="doc"
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${RDEPEND}
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	doc? ( sys-apps/texinfo )
-	test? ( dev-python/mock[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests unittest
-
-PATCHES=(
-	"${FILESDIR}"/${P}-drop-unused-tkinter-import.patch
-)
-
-python_compile_all() {
-	use doc && emake -C doc/info
-}
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_install_all() {
-	use doc && doinfo doc/info/*.info
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/python-xlib/python-xlib-0.33.ebuild b/dev-python/python-xlib/python-xlib-0.33.ebuild
index d1dcbc57eedf..c0b37ac0d301 100644
--- a/dev-python/python-xlib/python-xlib-0.33.ebuild
+++ b/dev-python/python-xlib/python-xlib-0.33.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~riscv x86"
 IUSE="doc"
 
 RDEPEND="
diff --git a/dev-python/python3-xapp/Manifest b/dev-python/python3-xapp/Manifest
index 4c93ddda8181..c8cb0b9da705 100644
--- a/dev-python/python3-xapp/Manifest
+++ b/dev-python/python3-xapp/Manifest
@@ -1,5 +1,5 @@
 DIST python3-xapp-2.2.2.tar.gz 20872 BLAKE2B 72bfd020477382480a5cf007107a197a86bd96c886b54440bee5eb0cf124294feac01c04dee24525d892cc5e701abf4e64753f2bff09d417e9e18ee314eb57a4 SHA512 d4aac6949bfe4adfe5fdb08edb80e622ccf04c2d571760aec280b43ff26b246c0d8f09eda6d7281381bf3a367002a7cce780664eb1f9933db6e9f63084d99def
 DIST python3-xapp-2.4.0.tar.gz 20787 BLAKE2B e225ad100119f90813b0f7657832bb186675542b3476beec639ff4e0771f4c00629c5d297a2ca0392fbd630066ba0a95a6f8553bd01a9f2df18752536a513127 SHA512 7c9afabbc810ffe878e831f7e1ff585ce49abc6d1db3d4ea70deb6630e2bb18f61ded31ae0e075cccae2283cac50b3440204a586f844ba9ee9cfbcb572bf7573
 EBUILD python3-xapp-2.2.2.ebuild 546 BLAKE2B 944b23d4756f6a8e4f69510b7aeada91acb0921ea78c007741823187f3636202cbf068db8819c388918c251302a967e3c0a5d6519904be03183c4ec3bc533fbe SHA512 a5d7607ed77720f45d1dcce65028e2903f431b6e86019bbb643fff2b780aa245eef61bde4c3bb6a2279cba9da8cbdaafedb5ffd92c35448b60d22e1439a10bfa
-EBUILD python3-xapp-2.4.0-r1.ebuild 1163 BLAKE2B 77e26b26fe1a33d8a224b4bb6cacc547c1db58f040661a81edc55122fa9cf5c7bc9288fe46e8536599ba1169e1b21c78547e7bf20da723414f5dd54454f45453 SHA512 c2a1a418de704d0ed53beae2e34dc87b4a83f70351fad5bab00f39f9a0b96c7985da5622a2f1a94ac5569f8fcab10a6096e8f57a9d947d627e20187ffcf53b7e
+EBUILD python3-xapp-2.4.0-r1.ebuild 1161 BLAKE2B b281cab1718a499338faeca5aaafdc51d1d9f8b2f56977066650f2bb5e4926f9d3378763c6ece0dae1b3ca757c80429445183c0a891e7d555cea1571768c34c5 SHA512 a4e0c0166fb0b2158d72863d54e50a5fcc2b4f9c798c174bf15e7b47eafcfd16a285d96a72dc7254129dc8897d34c0610fe8ec156d5febdcb280804f8ab6955a
 MISC metadata.xml 516 BLAKE2B e9429fe1f541d1763f644fb18fbef2bef3e105e943a7099792951a63a38c0083ae35e64160233ab48a8556d5bba96ad9031dc09fcdcf24033494d222e25a9cfa SHA512 b23a2d82ecbdb03abce2b3c40579c6aec5caad09b556c513600ded65d21ab56949ffe1eae0b04238f79c9e3c5c95a66a263e23281fcc2d16978c6a787e53c813
diff --git a/dev-python/python3-xapp/python3-xapp-2.4.0-r1.ebuild b/dev-python/python3-xapp/python3-xapp-2.4.0-r1.ebuild
index 6fd591cd4289..da9d4da44d27 100644
--- a/dev-python/python3-xapp/python3-xapp-2.4.0-r1.ebuild
+++ b/dev-python/python3-xapp/python3-xapp-2.4.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/linuxmint/python3-xapp/archive/${PV}.tar.gz -> ${P}.
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-python/pytoolconfig/Manifest b/dev-python/pytoolconfig/Manifest
index 1807b4df9f95..359aa67ebcf2 100644
--- a/dev-python/pytoolconfig/Manifest
+++ b/dev-python/pytoolconfig/Manifest
@@ -1,8 +1,5 @@
-AUX pytoolconfig-1.2.2-fix-licence.patch 577 BLAKE2B d79330fa814c1f2039ac6b0b1b46a3d1f119ff4459f0491d316aadcf280f9d1c23cbd7026e83d8ab10d5fbf688f6d4d81bf9f5d707fa965c13d74f66a5db2564 SHA512 81dc0ff4b7dd620b5905cb3b31f802c352d401c47ad4a95075c34f192e3bb010a29766808359c3be49603fe8b6360ac50884908160b1115173ec8b0badff787d
-DIST pytoolconfig-1.2.2.tar.gz 16195 BLAKE2B 02434bf9bc815fe1beeb13496427d6735fd0eebca66371eaa1a8df5d318879584b9e27d7b2272535e41af91b46544264d570b2727e524e6ba52c4e4be475ad84 SHA512 5bcbf7f2fc7941e128b3e717ff213e1e43be417ca3b906fa75a40f822815a4ea79b55cbb3e297caa3abf9032fedda1a791165491f52d4bbce5f4d29eea3c3599
 DIST pytoolconfig-1.2.4.tar.gz 15910 BLAKE2B 53ab143179dc59d3d1bcf6debb16280d60b3d877514dff78389c413e9d73cb56fb6feaa76abffa53afba44a57eccb387b19b5ab4d621fff3dd49836d42e5ba43 SHA512 bcf78054419ea4f783f79716724032f3f34072b10543dd7939418086095f37cf1a7c1df2c89dfca20096e99768ce8d5f74ef3bb7dd4919735bd85e332342e106
 DIST pytoolconfig-1.2.5.tar.gz 16322 BLAKE2B cdaab50765452ad93942c9a9ba546dc7ec5f61db8276992987a4539ad975578ee327464d93a1a64f09d67c4c872d99f42282183459e6987c1e4086218d15b032 SHA512 37753530a166d324ddef0c2e9f0c3d6b2f61252a18ff8037d530b339c8b817cde4087d14b6756690fe10002cbd3442776604ff064d7d16d34289ba859492c920
-EBUILD pytoolconfig-1.2.2-r1.ebuild 832 BLAKE2B b84ca98e045936a985a1338fba7ba85ad07fc97e93ddbb48f116faaa442ef7b0903f65d2c5bb8459a1b84b898840834d6dd5ddf25a6778862f6a223696a6bdbb SHA512 8f7fd6ac7bf561570d925416dc0cffd90ac72e9cc0475bfba925653a4ea208c6b07f6ba720f3fce460ab674d9b3d52a41818e9868ba4d2d5453f4c49908a4d05
-EBUILD pytoolconfig-1.2.4-r2.ebuild 945 BLAKE2B 4620a66a866fcd8deca8ccd86f59ded6e71720d90d0e50d3f89d31740551b924d113a0011dffcdcbffc4ac782c400c0675e4ff38aee24d8693034e8328039fd5 SHA512 57c7f80a360232330d5948a8501f16509abac2db6564ecd0ecb04e896fbcb7017ddcee9e30564a8081b6087eef80193c5b7b19bd838b3ce06cf68082de66a42e
+EBUILD pytoolconfig-1.2.4-r2.ebuild 943 BLAKE2B bc2a3ab55245d2e200c0b56e7ae117815dc3f8bc3c099e9e156a1194cd158fd06f5736668abbb1804a2874e3a745d085171aceb1a4506fafa5b3e47855752d31 SHA512 8376d83ac0815bcc1636b8e1bd1271eeb32e9aa3a9df18ad527dfd340291e5eda0e9e70b459110d432fe86daa6bcbdfabaa22e4ec4aad92cc4d7fb609a174b51
 EBUILD pytoolconfig-1.2.5.ebuild 792 BLAKE2B 349795765d4684b412c8c985fbe3c8057989c04e5f4208b5c44968b3a026f29ed778be4cf08c1ad50c0b52af0580ef78cbc5c8618381c6340c0fb2de3931be4a SHA512 d32eb1cba3cae8b6e568f0fc6b435271620e3111c84ce69b82ab50d1208a0859309cf214421b31e2e04c5d4542042566e013f0bee0b60cbc5e754371b8b6da45
 MISC metadata.xml 414 BLAKE2B 68dd43630128ec7d39fb0cd3c6b5edafb9d31cca98004324a27808dd30e2aa8259dd987412fd2cdef3a3198a76f74cd7752a70c24401dfebea070bfefef3f76f SHA512 5ea2653689a321411a093b0c6c2ca91b3afe43e11373d4a69a6a10641abbf4f11e960cafdb389983d143e3a3093dd919c11e07c5560661ef8b8a8b1b86e62591
diff --git a/dev-python/pytoolconfig/files/pytoolconfig-1.2.2-fix-licence.patch b/dev-python/pytoolconfig/files/pytoolconfig-1.2.2-fix-licence.patch
deleted file mode 100644
index 47c222fba143..000000000000
--- a/dev-python/pytoolconfig/files/pytoolconfig-1.2.2-fix-licence.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-https://github.com/bagel897/pytoolconfig/commit/7fbd830f1c302ed8151ecc2bd52c40cf70b1a580
-https://bugs.gentoo.org/878189
---- a/pyproject.toml
-+++ b/pyproject.toml
-@@ -2,7 +2,7 @@
- name = "pytoolconfig"
- version = "1.2.2"
- description = "Python tool configuration"
--license-expression = "LGPL-3.0-or-later"
-+license = "LGPL-3.0-or-later"
- dependencies = [
-     "tomli>=2.0; python_version < \"3.11\"",
-     "packaging>=21.3",
-@@ -70,6 +70,6 @@ strict = true
- 
- [build-system]
- requires = [
--    "pdm-pep517>=1.0.0",
-+    "pdm-pep517>=1.0.5",
- ]
- build-backend = "pdm.pep517.api"
diff --git a/dev-python/pytoolconfig/pytoolconfig-1.2.2-r1.ebuild b/dev-python/pytoolconfig/pytoolconfig-1.2.2-r1.ebuild
deleted file mode 100644
index 418b7a031114..000000000000
--- a/dev-python/pytoolconfig/pytoolconfig-1.2.2-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=pdm
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python tool configuration"
-HOMEPAGE="
-	https://pypi.org/project/pytoolconfig/
-	https://github.com/bageljrkhanofemus/pytoolconfig/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-RDEPEND="
-	dev-python/packaging[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/tomli[${PYTHON_USEDEP}]
-	' 3.{8..10} )
-"
-BDEPEND="
-	>=dev-python/pdm-pep517-1.0.5[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/sphinx-4.5.0[${PYTHON_USEDEP}]
-		>=dev-python/tabulate-0.8.9[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-fix-licence.patch
-)
-
-distutils_enable_tests pytest
diff --git a/dev-python/pytoolconfig/pytoolconfig-1.2.4-r2.ebuild b/dev-python/pytoolconfig/pytoolconfig-1.2.4-r2.ebuild
index 3adcb1e54a9b..56b59a478577 100644
--- a/dev-python/pytoolconfig/pytoolconfig-1.2.4-r2.ebuild
+++ b/dev-python/pytoolconfig/pytoolconfig-1.2.4-r2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 RDEPEND="
 	dev-python/packaging[${PYTHON_USEDEP}]
diff --git a/dev-python/qtconsole/Manifest b/dev-python/qtconsole/Manifest
index 7b3441568621..ba4b3e03e89e 100644
--- a/dev-python/qtconsole/Manifest
+++ b/dev-python/qtconsole/Manifest
@@ -1,5 +1,5 @@
 DIST qtconsole-5.3.2.tar.gz 430792 BLAKE2B 246dadaab92851f8da65dfa4c7e80390defeb0855fdb3ea5ef6aab96bf56b28597dc65d7cb4fc95f0f795a19f4b826d0ec1e1e0b025f4fa49d4d5a78473a2b29 SHA512 715e7e4b185a656f395a30c575e8996271cea4672871d9471c74a13364be1ef0fe0e63951e8f52f10b9c887592dc899c399ae82e09f9934492d13119b1154796
 DIST qtconsole-5.4.0.tar.gz 431119 BLAKE2B 48348b400a9b594bd028d3905719f2d67f6c9281df99863f3d0d87cf83162c91ede3e65529a8efd3bff62ad3ea343cc4ee7ea028913cd5bf7e48d0c493930445 SHA512 c25a381d8494c64d63e379c1dd5a44c1945e773b87b9a27f8494905e7eca24c6381ec5b9792d9a57ac41b14137ce238795a5ff8d83d1b6ddaa62603e7d9ab165
 EBUILD qtconsole-5.3.2.ebuild 1593 BLAKE2B 04237e5a526a635c935186d90575d828283c5d999c10f2fce8dc874cf8173b0bff64bbc6c0a47e467776f56d6cc67b06fbc66741f5a5266d7a9c4f7bfe9045ba SHA512 12c61160b4ff73ec085b5aa6168f25f72dd343db7dfe29d53dd93c83f96da4b57a58c9878886d90c6902e594368624bb47e4e8b5ebff615528fe9472b220835d
-EBUILD qtconsole-5.4.0.ebuild 1603 BLAKE2B ba7aca24de82b4ebdee69192bebf5d4684637ee9798de775065f741ebd6412c22bceaa59fc0bb41440bfab3c47e8028c07664e73fc54cee9245fc01b86c1d9e8 SHA512 49170723a2800ee5daec9a8dbd31ac4d433ac60d86ac3056c56456cde39111568d574188a8ba14be295e77fb84afd9faf30cfb092298da1b240f55c34ec281d3
+EBUILD qtconsole-5.4.0.ebuild 1600 BLAKE2B b00fe04cc4e2242e34e7ce3c2da464b230ef3f95fb5139cd08eba9fa21d64275ec6b4ba87263e5d8626375eff1f2d4ebc834c66f89e48695a9bc8bdae7a58b08 SHA512 167627ba96503e5c64c59894d5659f8bd78e9c6e213b95f987ae7fa1e2f3ae6eb936730a30039bf09e3590828ca3ef5b10aeb2a1f25a0e165eacb11982083678
 MISC metadata.xml 690 BLAKE2B f2ddc6515f66ac4549e99bd6f152c16431875508bf12b6319e0e6a2b1596d86abc50b87ee424d3876eb55e92d1a506ade6567cbad535b4b2b54fad924a1891a7 SHA512 28bb7360ac7775d9c72c4d0f34d4c9a35c63905c4e870722236cc6c66e98f6c0eb165c8d7a9ce28948b25808a053dd1bb667d1f4783ca95319bb216310dc9f60
diff --git a/dev-python/qtconsole/qtconsole-5.4.0.ebuild b/dev-python/qtconsole/qtconsole-5.4.0.ebuild
index c0a5a9924fb7..1f5a13068414 100644
--- a/dev-python/qtconsole/qtconsole-5.4.0.ebuild
+++ b/dev-python/qtconsole/qtconsole-5.4.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~x86"
+KEYWORDS="amd64 ~arm arm64 ~loong x86"
 
 RDEPEND="
 	>=dev-python/ipykernel-4.1[${PYTHON_USEDEP}]
diff --git a/dev-python/snakeoil/Manifest b/dev-python/snakeoil/Manifest
index b2c1d6043499..c1f4a2f0e0f3 100644
--- a/dev-python/snakeoil/Manifest
+++ b/dev-python/snakeoil/Manifest
@@ -1,4 +1,4 @@
 DIST snakeoil-0.10.5.tar.gz 183358 BLAKE2B 6154eb0b5ce55aefc67484dc33c8a6e36ee903bce4293045252a8c9a3b4ecfc27690c720bb46842c1bca8c14ef59fbae4d3c1f02ebd46a7c91c1c9fbd1aa1532 SHA512 fafc04aa65423ebb3db66daa9c239bdf0968722b8ac14c1206dd3f26e3960d832fd15001e320463f98ca142ec7e1d6bff73ebc0ab10c3c5d3cde241b8160fdc3
-EBUILD snakeoil-0.10.5.ebuild 800 BLAKE2B 5cbcd7c1815d2e520dc36cbc11db030ffe315915c07a23c933102f76c76d7ad76af34323f93327084f8b1f0ec4b1672df0cbb05da71df30da718f7c9ff84c837 SHA512 49ebb849b9b878237e47eacf8bc591d455f6997079a3e7acc32f8c2e16c8ec10097bc815b2200c127391a672b039a2982936166512cfcbbdc6c60fe4c74c6126
-EBUILD snakeoil-9999.ebuild 808 BLAKE2B df7d8f73632d9da3320f2339a10fbe7f13c34264c3a14ac2bd53eaf2e92bfb1774738c79ffcaba2ec22030542a7476a0d6afdaded4b0410f5f7692c026be2a65 SHA512 185dbef5c07c609f0f666e89bf5886917551f1ba860ab253277573aa539664cabbd333402e44a83bd03135893586aa2e464111dabba75ac1dfe85e28e5d3e4cc
+EBUILD snakeoil-0.10.5.ebuild 859 BLAKE2B dda9cdca7afc7608f8bf5532f56bb4c9ee5cf30e8c9a679a6121e3b0d718f015ec06b8f385747e22355c97ae33f365283f520dd850037f20b108e997f1762f5a SHA512 ff2cbda3aee95c990cc4902931bfcacb0dfc5aa15dc84eec3a203d0d37fa2b10955d2545af99cb7ba99b4007e9c18e8ae8a4a63b99f5a0ed3421f5073d4bc318
+EBUILD snakeoil-9999.ebuild 867 BLAKE2B c3713982593346716e50adb6ae741cfbe62313a09b8cd955354216255d835ef45a6476e1de865ec56985af70fef2eb94341fde28e519853e494389c136d2529b SHA512 8d02299108c63b603c9bfa2613a2f864c2934c84b5a811c07c9f546e764ad6939a34169f0c02c1cd3f7ac5afd2f31635bb023ea5ab4f06e07e93e572ca64f8ae
 MISC metadata.xml 394 BLAKE2B 1f11a6a69a1ed5736bdddaf949b97760d2986eaf848bbceafa706dae01dd8e84f2977d130179324856e35353702e8f84e2cf7b2e30587b5f21a7113237825c3e SHA512 71abd7d9037eb4412a992bcf6933999f0dfec0c39465fe5bcb63e6a8437ff901764c03ad65e363f4ce5d8789f364b7f732542c7f298f1d04a2a68343acbc2129
diff --git a/dev-python/snakeoil/snakeoil-0.10.5.ebuild b/dev-python/snakeoil/snakeoil-0.10.5.ebuild
index 9927318bb579..a92092e2e300 100644
--- a/dev-python/snakeoil/snakeoil-0.10.5.ebuild
+++ b/dev-python/snakeoil/snakeoil-0.10.5.ebuild
@@ -9,7 +9,8 @@ PYTHON_REQ_USE="threads(+)"
 inherit distutils-r1
 
 if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/pkgcore/snakeoil.git"
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/pkgcore/snakeoil.git
+		https://github.com/pkgcore/snakeoil.git"
 	inherit git-r3
 else
 	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
diff --git a/dev-python/snakeoil/snakeoil-9999.ebuild b/dev-python/snakeoil/snakeoil-9999.ebuild
index 50e5f7ee3893..88ca572e1ae9 100644
--- a/dev-python/snakeoil/snakeoil-9999.ebuild
+++ b/dev-python/snakeoil/snakeoil-9999.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
@@ -9,7 +9,8 @@ PYTHON_REQ_USE="threads(+)"
 inherit distutils-r1
 
 if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/pkgcore/snakeoil.git"
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/pkgcore/snakeoil.git
+		https://github.com/pkgcore/snakeoil.git"
 	inherit git-r3
 else
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
diff --git a/dev-python/translate-toolkit/Manifest b/dev-python/translate-toolkit/Manifest
index e80d38974c6f..34994527ed29 100644
--- a/dev-python/translate-toolkit/Manifest
+++ b/dev-python/translate-toolkit/Manifest
@@ -7,5 +7,5 @@ EBUILD translate-toolkit-3.7.4.ebuild 2436 BLAKE2B 8fd08eb23c92d158095c64aa14708
 EBUILD translate-toolkit-3.8.0.ebuild 2439 BLAKE2B 76a7b69c12540271aaa50ee950a971c40dd6db7f9dd48b286d8ed17a133adffca050a77e16a2021bd0f5bf4de1fbc43576b12d54d19d4e1f6e6b8eed89387abb SHA512 48a037441d0f33e5f019dd406a13bf5da32dbc3ea25ce2e10bacbe2a422bd6b35feea56c684cfe9d747e6f711a94b8b00298763dbd8ba37b452c43ef5d529ab3
 EBUILD translate-toolkit-3.8.1.ebuild 2439 BLAKE2B 76a7b69c12540271aaa50ee950a971c40dd6db7f9dd48b286d8ed17a133adffca050a77e16a2021bd0f5bf4de1fbc43576b12d54d19d4e1f6e6b8eed89387abb SHA512 48a037441d0f33e5f019dd406a13bf5da32dbc3ea25ce2e10bacbe2a422bd6b35feea56c684cfe9d747e6f711a94b8b00298763dbd8ba37b452c43ef5d529ab3
 EBUILD translate-toolkit-3.8.2.ebuild 2439 BLAKE2B 76a7b69c12540271aaa50ee950a971c40dd6db7f9dd48b286d8ed17a133adffca050a77e16a2021bd0f5bf4de1fbc43576b12d54d19d4e1f6e6b8eed89387abb SHA512 48a037441d0f33e5f019dd406a13bf5da32dbc3ea25ce2e10bacbe2a422bd6b35feea56c684cfe9d747e6f711a94b8b00298763dbd8ba37b452c43ef5d529ab3
-EBUILD translate-toolkit-3.8.3.ebuild 2439 BLAKE2B 76a7b69c12540271aaa50ee950a971c40dd6db7f9dd48b286d8ed17a133adffca050a77e16a2021bd0f5bf4de1fbc43576b12d54d19d4e1f6e6b8eed89387abb SHA512 48a037441d0f33e5f019dd406a13bf5da32dbc3ea25ce2e10bacbe2a422bd6b35feea56c684cfe9d747e6f711a94b8b00298763dbd8ba37b452c43ef5d529ab3
+EBUILD translate-toolkit-3.8.3.ebuild 2436 BLAKE2B c84859e2882719d6557918f1580a4a027ea586ae062f877baef0559cac641b59281abadfe9a1f888899778fa76babdb301e73796dff6fe03cea09161848bea2c SHA512 9f50a862bf8ff4129ff974c3ab1d4e4c3863585393aaf35fc1056c63fb6fda24485458e240abda227f5d995427e4796913b30e63b6bae5459f903c50f40384cf
 MISC metadata.xml 756 BLAKE2B 06f64f258d362954f99f7e9eee241eb3dddc6b00b9069df2ad977d28b5cf06f9c8ee2246ee5958600b5ac86297968d7aaced6b6420dca4ed507c441c58c61ca9 SHA512 80374c40513ca450f97e3930929c1450e7438ea15830e60937952a6fccfd999675f2ca2056c5aa4e287ba256c6ec08a09d8f7adb8b2c5af8ca0cd595f34acd85
diff --git a/dev-python/translate-toolkit/translate-toolkit-3.8.3.ebuild b/dev-python/translate-toolkit/translate-toolkit-3.8.3.ebuild
index 5628bcd1f693..389f504d2a3a 100644
--- a/dev-python/translate-toolkit/translate-toolkit-3.8.3.ebuild
+++ b/dev-python/translate-toolkit/translate-toolkit-3.8.3.ebuild
@@ -22,7 +22,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="+html +ical +ini +subtitles +yaml"
 
 RDEPEND="
diff --git a/dev-python/xlsxwriter/Manifest b/dev-python/xlsxwriter/Manifest
index 6189deb0c343..7201cd84a9dd 100644
--- a/dev-python/xlsxwriter/Manifest
+++ b/dev-python/xlsxwriter/Manifest
@@ -1,11 +1,3 @@
-DIST XlsxWriter-RELEASE_3.0.3.tar.gz 35519702 BLAKE2B f4dfa6b286dda94a1a44d8168b8e17f7a37f2f59a23aa3a5ed0efa46b5d8bdcdb831e99a61924e22755c6a921c23f5c540c048152cd07363841ff09a49549c79 SHA512 92a53226aa9ee9f8493fe7171ce752f3a13ef8f3107aecbef896f17022e93bd7dbccb5e619fcbbb3598102030b190d75508d4dacce20b9643eead59a4441f6aa
-DIST XlsxWriter-RELEASE_3.0.4.gh.tar.gz 35033608 BLAKE2B 49a54380f1753077f0d9e56024a09ffd9d26540daeb03c270e892ae986c8e36fb0ce74ab96e62b1cb15adebbb51ba2093b6b1e356077433537af62ededd79d5c SHA512 e10bbbcc975ee3c2395c642c7a04e53d792b8c739c9f5acbb3858b47963a0f9b68ac565d96d4a9f9c87b104fc02b8930b0629e753d53735892e10bd17e5c1fcc
-DIST XlsxWriter-RELEASE_3.0.5.gh.tar.gz 35038123 BLAKE2B 8ab88d1cf8decb24a1adcd2d2720ab2c90a87088441dbf1fb6a039977ddeb1824b2c29e38aedfb2a1d5cc9adb99154ee36a4eef18876826082d34c87ff7dafdd SHA512 74c3708cd81bec44865cfdcbd3ae41c5794d26d176a3c5c22133a32e6000eda7a2d28292d81406d277c351c27a8c4ce30b0d9b2152fc9119e903fe264f7be406
-DIST XlsxWriter-RELEASE_3.0.6.gh.tar.gz 35205053 BLAKE2B cd70cfdba9def71806ad055a40fba03620e50223fd6be8dbab548ea8890accf1e65d8e82a87ce458bb73f5b1a08cd80cd4a67817f0696a5928f1f371ce7f7957 SHA512 c993a640e01f3da67069b93283bc0df7e84bebc76c483465e8a3aabb36282588fa6c7c63f711c55982a5679359a2ef475064e27c1dbb063f8770624797928bef
 DIST XlsxWriter-RELEASE_3.0.7.gh.tar.gz 35214702 BLAKE2B 8af7a7da9f2e6fd3a8f794f906935ed9dc1389a710d8b60fbf74e419829e6d233ad122d8ce75de93a6d3229e394277fadd76239aac73e8949f7c4737430a0859 SHA512 e80b9cfa741984db5b0aebd083c0a3c12f987b1a851088bc16e52b56cadb69feb1b795c1061ebde56c7ab1bf17d7899e90b42facd45bcacf5ce6c7070208e6e9
-EBUILD xlsxwriter-3.0.3.ebuild 682 BLAKE2B e8d5a6d68fdd235eaaed997dbb6515781bc40d966e12cc87eebfa39b8390ebb22f4dbcf6445aeae699b255f6e501811144300702f5521b62757da3d5402be0d3 SHA512 1edbe820917c92322310f576b4afb3104e1dac7665df51bcf3d2c98c9c9ac9e5f13ac783044e7ddd75cc49c347041d65b463480faf1fed176df8b26b7d832859
-EBUILD xlsxwriter-3.0.4.ebuild 691 BLAKE2B ca659bcd2b8c9c9cee9f8a291a8799148cab32adb6a5111c63120702c19fa8c772d8f24e8ec59fa53055a86df9e63436d0b7248a5de281b70ea6bb5e0e58f1b5 SHA512 ee093d0a7619f9962fac416565425b9246f92559934d10f3aa1fb024292b1f3ba753ae3a8d9a468b03bca4419d6a27d31deabf1a55ad48b7038984cfcb358df5
-EBUILD xlsxwriter-3.0.5.ebuild 691 BLAKE2B ca659bcd2b8c9c9cee9f8a291a8799148cab32adb6a5111c63120702c19fa8c772d8f24e8ec59fa53055a86df9e63436d0b7248a5de281b70ea6bb5e0e58f1b5 SHA512 ee093d0a7619f9962fac416565425b9246f92559934d10f3aa1fb024292b1f3ba753ae3a8d9a468b03bca4419d6a27d31deabf1a55ad48b7038984cfcb358df5
-EBUILD xlsxwriter-3.0.6.ebuild 691 BLAKE2B ca659bcd2b8c9c9cee9f8a291a8799148cab32adb6a5111c63120702c19fa8c772d8f24e8ec59fa53055a86df9e63436d0b7248a5de281b70ea6bb5e0e58f1b5 SHA512 ee093d0a7619f9962fac416565425b9246f92559934d10f3aa1fb024292b1f3ba753ae3a8d9a468b03bca4419d6a27d31deabf1a55ad48b7038984cfcb358df5
-EBUILD xlsxwriter-3.0.7.ebuild 691 BLAKE2B ca659bcd2b8c9c9cee9f8a291a8799148cab32adb6a5111c63120702c19fa8c772d8f24e8ec59fa53055a86df9e63436d0b7248a5de281b70ea6bb5e0e58f1b5 SHA512 ee093d0a7619f9962fac416565425b9246f92559934d10f3aa1fb024292b1f3ba753ae3a8d9a468b03bca4419d6a27d31deabf1a55ad48b7038984cfcb358df5
+EBUILD xlsxwriter-3.0.7.ebuild 685 BLAKE2B 5ddcc459a9806a68cbff7d23a326f7ee65a3489bee5adb169ece7c57055b02be7eb67e94b43922f9c26941a2eff97678533bff22d7626e77c752c07454dd0b74 SHA512 26e7957e0d66363b3c374e0e068c64bd6dce7ba01d599f33218d7e0d5733ade25b4a1caf96dc81ad1e0c3a9ebbeb0d38a92f0b216b0a2cd6ab25fa42c0dadca0
 MISC metadata.xml 411 BLAKE2B e41e1e6dddecef73fff1c0bd74d51b023694ea6eb162022679a2939819f5c3339b1e76d00e25f761c46f66d323a5ad7085ed86fb13fbe3f53526c75004a68e93 SHA512 63242ff274e1dde596e50f9360e1247084b7bae05cd42d60605700c49e33b53849529578cf532415b899bd2ccd04066f99e97c6e80d53c13f71522a041579976
diff --git a/dev-python/xlsxwriter/xlsxwriter-3.0.3.ebuild b/dev-python/xlsxwriter/xlsxwriter-3.0.3.ebuild
deleted file mode 100644
index a544adf3c0d6..000000000000
--- a/dev-python/xlsxwriter/xlsxwriter-3.0.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# 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} pypy3 )
-
-inherit distutils-r1
-
-TAG=RELEASE_${PV}
-MY_P=XlsxWriter-${TAG}
-DESCRIPTION="Python module for creating Excel XLSX files"
-HOMEPAGE="
-	https://github.com/jmcnamara/XlsxWriter/
-	https://pypi.org/project/XlsxWriter/
-"
-SRC_URI="
-	https://github.com/jmcnamara/XlsxWriter/archive/${TAG}.tar.gz
-		-> ${MY_P}.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
-
-distutils_enable_tests pytest
diff --git a/dev-python/xlsxwriter/xlsxwriter-3.0.4.ebuild b/dev-python/xlsxwriter/xlsxwriter-3.0.4.ebuild
deleted file mode 100644
index b9643a5b3c75..000000000000
--- a/dev-python/xlsxwriter/xlsxwriter-3.0.4.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# 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} pypy3 )
-
-inherit distutils-r1
-
-TAG=RELEASE_${PV}
-MY_P=XlsxWriter-${TAG}
-DESCRIPTION="Python module for creating Excel XLSX files"
-HOMEPAGE="
-	https://github.com/jmcnamara/XlsxWriter/
-	https://pypi.org/project/XlsxWriter/
-"
-SRC_URI="
-	https://github.com/jmcnamara/XlsxWriter/archive/${TAG}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-distutils_enable_tests pytest
diff --git a/dev-python/xlsxwriter/xlsxwriter-3.0.5.ebuild b/dev-python/xlsxwriter/xlsxwriter-3.0.5.ebuild
deleted file mode 100644
index b9643a5b3c75..000000000000
--- a/dev-python/xlsxwriter/xlsxwriter-3.0.5.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# 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} pypy3 )
-
-inherit distutils-r1
-
-TAG=RELEASE_${PV}
-MY_P=XlsxWriter-${TAG}
-DESCRIPTION="Python module for creating Excel XLSX files"
-HOMEPAGE="
-	https://github.com/jmcnamara/XlsxWriter/
-	https://pypi.org/project/XlsxWriter/
-"
-SRC_URI="
-	https://github.com/jmcnamara/XlsxWriter/archive/${TAG}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-distutils_enable_tests pytest
diff --git a/dev-python/xlsxwriter/xlsxwriter-3.0.6.ebuild b/dev-python/xlsxwriter/xlsxwriter-3.0.6.ebuild
deleted file mode 100644
index b9643a5b3c75..000000000000
--- a/dev-python/xlsxwriter/xlsxwriter-3.0.6.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# 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} pypy3 )
-
-inherit distutils-r1
-
-TAG=RELEASE_${PV}
-MY_P=XlsxWriter-${TAG}
-DESCRIPTION="Python module for creating Excel XLSX files"
-HOMEPAGE="
-	https://github.com/jmcnamara/XlsxWriter/
-	https://pypi.org/project/XlsxWriter/
-"
-SRC_URI="
-	https://github.com/jmcnamara/XlsxWriter/archive/${TAG}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-distutils_enable_tests pytest
diff --git a/dev-python/xlsxwriter/xlsxwriter-3.0.7.ebuild b/dev-python/xlsxwriter/xlsxwriter-3.0.7.ebuild
index b9643a5b3c75..5536e4aa6608 100644
--- a/dev-python/xlsxwriter/xlsxwriter-3.0.7.ebuild
+++ b/dev-python/xlsxwriter/xlsxwriter-3.0.7.ebuild
@@ -23,6 +23,6 @@ S=${WORKDIR}/${MY_P}
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 
 distutils_enable_tests pytest
diff --git a/dev-python/zope-schema/Manifest b/dev-python/zope-schema/Manifest
index a649cb5ed931..f2d120ccdd93 100644
--- a/dev-python/zope-schema/Manifest
+++ b/dev-python/zope-schema/Manifest
@@ -1,7 +1,3 @@
-DIST zope.schema-6.2.1.tar.gz 124649 BLAKE2B 71ac712d3dbd6c9063ddc213263ce3a356f0ec757466cacdbc216af95cdb9de3ca7f891c203880f9f22612e01259491d83c49fcbe9985ecaabf1629ea14e12ea SHA512 e3fabd3deabb4ac2087792be94b919b7c9a0f0c741316d6f67a42e24fe617091754183b32d8433664b6fa95569009def8e7e1e08f34013282b042eb32da323a6
-DIST zope.schema-7.0.0.tar.gz 108220 BLAKE2B 01fd94d6d9b33af7ffc12ced2724fc795f0fa2dd8a76c76e06ed8af837778335cdc8a6d87e41e6e934b0df8e59b30e94f5e6c1b4752dcfaefcbbae53cbcef238 SHA512 27e796d2ed5f7b053c5ab4a23f455b72ddc4f0ce10c38c58f9974ec20abb97bf9d7f4b0c11c6ab73e9fefdc726c614155abb69b987bf3fa37d37b1224bcbc106
 DIST zope.schema-7.0.1.tar.gz 108737 BLAKE2B ca0d280186ebdaf53abc28bdb1684e31f97e4f4f9d235604702c2652bd4fa0a027d947f375ecee7aba598f072ce140908aaab3b107d6c743d6ee929db5de2fb5 SHA512 a8da9ac2e7239d15ed6cef83b4f500bca989c9ef2b7f1cd06ce532c260a8b8488b6fa42a6b2cfaeee505db87d3235f81815dc7eb80401c9e482141f8bf717e62
-EBUILD zope-schema-6.2.1.ebuild 1165 BLAKE2B cb24754f95cb3cda540bc696913ea4afe447b316b1f96ca219c65abdd52b56b872572bd6bbba66090e30234c57a1f989e1cc11f238bac7bdab65b5188caa6b27 SHA512 5eb804afa48bf0ee42040950342e98087acc03d9beda5531636db25c6a1334253666f20dc61075ff82544c304746ab50b7404ffd31c55a5b3536a4a006c7ec83
-EBUILD zope-schema-7.0.0.ebuild 1168 BLAKE2B acdd6ad87cbfa4ee72348cf4f583c57a7cf7aaa440d7647137365953848fcbd5bf92cbcc13ad73383b8e13fe209de12c4c78ca2edf2734812ce71ca138415dcd SHA512 ec70a9e8939679c25191b97ff72511d1c53f82aa27a899be23d25a625a6427d1535969a91a138d51abd13e37396d5bdd5853e9e12028669aa11ff7e958264a83
-EBUILD zope-schema-7.0.1.ebuild 1168 BLAKE2B acdd6ad87cbfa4ee72348cf4f583c57a7cf7aaa440d7647137365953848fcbd5bf92cbcc13ad73383b8e13fe209de12c4c78ca2edf2734812ce71ca138415dcd SHA512 ec70a9e8939679c25191b97ff72511d1c53f82aa27a899be23d25a625a6427d1535969a91a138d51abd13e37396d5bdd5853e9e12028669aa11ff7e958264a83
+EBUILD zope-schema-7.0.1.ebuild 1165 BLAKE2B cb24754f95cb3cda540bc696913ea4afe447b316b1f96ca219c65abdd52b56b872572bd6bbba66090e30234c57a1f989e1cc11f238bac7bdab65b5188caa6b27 SHA512 5eb804afa48bf0ee42040950342e98087acc03d9beda5531636db25c6a1334253666f20dc61075ff82544c304746ab50b7404ffd31c55a5b3536a4a006c7ec83
 MISC metadata.xml 498 BLAKE2B d5386b7a400de71c5c02d2b9788682d35dd34eaa6a132aea45432aa2d53ec47e54fee9f880cf6cc5abd8184e28cef0795fe2f58dfd47f619b4120ce914bd7c45 SHA512 5a8021ec0348af5929d3284f172f5b5fb26007df9064f5571a0cdb07c1259c24b9b352eb048811f5e4f68ab75b9fabeba49c93a0cdd6e8655b509a248447b794
diff --git a/dev-python/zope-schema/zope-schema-6.2.1.ebuild b/dev-python/zope-schema/zope-schema-6.2.1.ebuild
deleted file mode 100644
index 4bd04351720d..000000000000
--- a/dev-python/zope-schema/zope-schema-6.2.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# 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} pypy3 )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/.}
-MY_P=${MY_PN}-${PV}
-DESCRIPTION="Zope schema Architecture"
-HOMEPAGE="
-	https://pypi.org/project/zope.schema/
-	https://github.com/zopefoundation/zope.schema/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="ZPL"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-
-RDEPEND="
-	dev-python/zope-event[${PYTHON_USEDEP}]
-	>=dev-python/zope-interface-5.0.0[${PYTHON_USEDEP}]
-	!dev-python/namespace-zope
-"
-BDEPEND="
-	test? (
-		dev-python/zope-i18nmessageid[${PYTHON_USEDEP}]
-		dev-python/zope-testing[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# strip rdep specific to namespaces
-	sed -i -e "/'setuptools'/d" setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_compile() {
-	distutils-r1_python_compile
-	find "${BUILD_DIR}" -name '*.pth' -delete || die
-}
-
-python_test() {
-	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
-	distutils_write_namespace zope
-	eunittest
-}
diff --git a/dev-python/zope-schema/zope-schema-7.0.0.ebuild b/dev-python/zope-schema/zope-schema-7.0.0.ebuild
deleted file mode 100644
index 79170aa4eac0..000000000000
--- a/dev-python/zope-schema/zope-schema-7.0.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# 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} pypy3 )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/.}
-MY_P=${MY_PN}-${PV}
-DESCRIPTION="Zope schema Architecture"
-HOMEPAGE="
-	https://pypi.org/project/zope.schema/
-	https://github.com/zopefoundation/zope.schema/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="ZPL"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-
-RDEPEND="
-	dev-python/zope-event[${PYTHON_USEDEP}]
-	>=dev-python/zope-interface-5.0.0[${PYTHON_USEDEP}]
-	!dev-python/namespace-zope
-"
-BDEPEND="
-	test? (
-		dev-python/zope-i18nmessageid[${PYTHON_USEDEP}]
-		dev-python/zope-testing[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# strip rdep specific to namespaces
-	sed -i -e "/'setuptools'/d" setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_compile() {
-	distutils-r1_python_compile
-	find "${BUILD_DIR}" -name '*.pth' -delete || die
-}
-
-python_test() {
-	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
-	distutils_write_namespace zope
-	eunittest
-}
diff --git a/dev-python/zope-schema/zope-schema-7.0.1.ebuild b/dev-python/zope-schema/zope-schema-7.0.1.ebuild
index 79170aa4eac0..4bd04351720d 100644
--- a/dev-python/zope-schema/zope-schema-7.0.1.ebuild
+++ b/dev-python/zope-schema/zope-schema-7.0.1.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="ZPL"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 
 RDEPEND="
 	dev-python/zope-event[${PYTHON_USEDEP}]
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index a623365ab294..39c914123748 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/cvise/Manifest b/dev-util/cvise/Manifest
index fbce78b552eb..ce811a83322c 100644
--- a/dev-util/cvise/Manifest
+++ b/dev-util/cvise/Manifest
@@ -1,8 +1,6 @@
 AUX cvise-2.5.0-no-werror-cflags.patch 1830 BLAKE2B 864cde94daabb54e691e59a3634e7cc7ff72dea86a41f757f6d3d764629a803de92950e6abc32f33738c361e5e6bdacffb09c214039c2ee0475fbf1c41366cd6 SHA512 e68e51ecda7005b6542589f3ce958ad5ffef17c72e19a38f9d2be2d1443dc77adb11d4984dfc690cc25cbcb3e1da1c2fc848b9d8869178a7d4eca479ea2d7007
-DIST cvise-2.5.0.tar.gz 255587 BLAKE2B ec33bcb0ac45bf89a66bd30b22386f5c0b994e774c1d30f7869e15bcd5bada2e511ad4028628af6c545a23fddde7bc43978fc63cc3b5168db8d038aec9310073 SHA512 8433d4daf0e0691b99ff78f4b5331da0d230d5872c214ffd4a7dee470d955c2a3d7541c19277555a6e97108f8cd3de589b3f724e2874c44e479e351777c671c4
 DIST cvise-2.6.0.tar.gz 264295 BLAKE2B fcdd27905598c8db6f088c4bdadde966bcd0836560ede642269fa6dc32d1907d32081e56e7a33487bffca64ea53a49b05b05620debc5af352371203e37241b70 SHA512 1707cc46c342197c6b0e11b26a453548fd7bc7bc25baf20215230a7a4743053700189f96c1e0ba4ad6c9de4dd38920700a957ca333b0f123949b7a5a00854291
 DIST cvise-2.7.0.tar.gz 269155 BLAKE2B c0fe9bcf8207acc53f71c5d7cd9c0cb41ba3f771a276e86401c1de4789b9ebad2d91b2881a05e0263827d0ae70805ba4f9b05fdae64f27d83e16d08f89f518e0 SHA512 4da775e177c135d5282f8e3d9a33ae040f403eabcca8baf9f4f78adc05e3069626340005f9f41ab2f530c9269f4c5829bdd35b55433e2d539d42de002e42aa5e
-EBUILD cvise-2.5.0-r1.ebuild 1351 BLAKE2B 65bfbbda1e717af3d360af69b7fc567968cdb10148f2672cd91dbe32b2bd590a7fa105f0144aaed15933d8a910470281c11c785def77d995078e1f11551fc5ad SHA512 7e5e55b5b8f6f9b16ccd94fa5f6656293f804398581f9ff0c96494da48016f3e233f7d34028989239c1c4abc52d5a514d9fc02fd6c32d10d16e71bc537c7d83b
-EBUILD cvise-2.6.0.ebuild 1358 BLAKE2B cb46788ee8d9fd6d550d176cff41463873f939782d3c44107ba324d4e7efe4210ee5cd89837004180e761fe0fb04f2c853af108f96ba041701a80688a00e5b0f SHA512 2920cbb4d779f342439928fc41f60a762133de47ed5a42d93b5a63d9db02b6e364717494fb19b619b6ffc2a42b7f3a68b8d3f96ea842ebc6903f21cb53292319
+EBUILD cvise-2.6.0.ebuild 1356 BLAKE2B 4d5df4ee3efb1f7a65e3ed11e67b1a9b2dd8d1016247a2d27c7d0c25ee601da9d32f2f4cc22c5520978b8be22570ce4788c994b227b63972f415f2e4508c5dfc SHA512 ebb9f94de3cadfd3fe8c186f2c671a8913d055d1d2f9e0ecb391ae236dd480d6d15bce72c838d4bb270bdd63edb6d6d291d1f707050a10c9bc936f5cf8958b41
 EBUILD cvise-2.7.0.ebuild 1408 BLAKE2B fe6b28fca69ea25e9e6dc22ba05801a21a47e66c1ab3f323ce74d2257e3054d984e499352ddb626ed25db0d36d79fef0779b3f72ac08e174db251e2845356ebf SHA512 d6658948f4e3d9f83ebdaf9a62677251de735b765690213fe70eda7abb0f017b515e8aee8bd3a5e4b090c70f34e43e06ed5722bab0ab9af402e83f32c0341bf9
 MISC metadata.xml 325 BLAKE2B 52e58fd0c3babe2c595399ff2878b758960d089b0cefc0f8589365704f3628a93688d5b6ee06e88e54a4435ac0280d8cf542c37c079d149e44a2a64cd4db12c2 SHA512 9e509c76ab4cf07804997751996b5c73efc04839a1d6e2bd4b98c5ad2ffde0fb1008332f1b52bbf0985d65ceed73ccdf101c62a9b7d0bb1f5694083d1e33afb9
diff --git a/dev-util/cvise/cvise-2.5.0-r1.ebuild b/dev-util/cvise/cvise-2.5.0-r1.ebuild
deleted file mode 100644
index acf8f2f9ce41..000000000000
--- a/dev-util/cvise/cvise-2.5.0-r1.ebuild
+++ /dev/null
@@ -1,76 +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 cmake llvm python-single-r1
-
-DESCRIPTION="Super-parallel Python port of the C-Reduce"
-HOMEPAGE="https://github.com/marxin/cvise/"
-SRC_URI="
-	https://github.com/marxin/cvise/archive/v${PV}.tar.gz -> ${P}.tar.gz
-"
-
-LICENSE="UoI-NCSA"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-LLVM_MAX_SLOT=15
-DEPEND="
-	|| (
-		sys-devel/clang:15
-		sys-devel/clang:14
-		sys-devel/clang:13
-	)
-	<sys-devel/clang-$(( LLVM_MAX_SLOT + 1 )):=
-"
-RDEPEND="
-	${DEPEND}
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/chardet[${PYTHON_USEDEP}]
-		dev-python/pebble[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-	')
-	dev-util/unifdef
-	sys-devel/flex
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	sys-devel/flex
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/pebble[${PYTHON_USEDEP}]
-			dev-python/pytest[${PYTHON_USEDEP}]
-		')
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.5.0-no-werror-cflags.patch
-)
-
-llvm_check_deps() {
-	has_version "sys-devel/clang:${LLVM_SLOT}"
-}
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	llvm_pkg_setup
-}
-
-src_test() {
-	cd "${BUILD_DIR}" || die
-	epytest
-}
-
-src_install() {
-	cmake_src_install
-
-	python_fix_shebang "${ED}"/usr/bin/cvise
-}
diff --git a/dev-util/cvise/cvise-2.6.0.ebuild b/dev-util/cvise/cvise-2.6.0.ebuild
index 26277e5890dd..927c3dd47f18 100644
--- a/dev-util/cvise/cvise-2.6.0.ebuild
+++ b/dev-util/cvise/cvise-2.6.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="UoI-NCSA"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
diff --git a/dev-util/diffoscope/Manifest b/dev-util/diffoscope/Manifest
index ef2275544bcc..5de3affa6843 100644
--- a/dev-util/diffoscope/Manifest
+++ b/dev-util/diffoscope/Manifest
@@ -1,7 +1,7 @@
 DIST diffoscope-229.tar.gz 3164192 BLAKE2B bee9fa1561ddcfde98cfa44cd6d66a28c636dbc7f3ec1f4895e91dfd3b66c039b68d53be0528b94c112552069886c3c81de4d9b9bc9038d183afdc9fdde6ddb9 SHA512 825c9c33f3088ba082ea3b998594445987558ee62b8b1fbfcded9b72a739faaa73908f8753b8772b3b1a8a43dbcfd52978265a18bdd92605defcd174884ccb23
-DIST diffoscope-232.tar.gz 3164825 BLAKE2B a65ff66881cf67cdfd32eb1e14bf654c152447799415f686d774f30f7d3ec61b5de8f1caf4b3551312be7f2ab93187ea145b6bf96c7790cc3792221d621cdeb3 SHA512 7b8ae407e4e1b3c5085fa26f9477b75e3918a99b2d60498a7d939f06a3018bc5f6ca417d041a39dc769ef897a189c0dfdf6d35851b945c3e28b16f290bddb630
 DIST diffoscope-233.tar.gz 3164944 BLAKE2B 87421d3c0c0a0e970c06d3f75a067be73aa753f550bacacd603e050a0155dd7c416cab755644cb6cdf668976267e01ad13473ee52f0b06637b2d545359dc102b SHA512 ae750c3aeb3e4fb40f6bd2becdb5d148af0b369cb5dea8083a0c16d2f11b7995b7ef32a42bd1c248f14782cc792daa68e3e7838789ff4bd4c2dbb532940ef480
+DIST diffoscope-234.tar.gz 3164950 BLAKE2B f235caec97f13f569a844fce56c7958ff0b0469574425122f37aa7d6302312148462fee4d68187f96757b0470cdd70892f27a30b529d4e7bdd9b58717da6ee91 SHA512 da55f3aa615a07f99b23dc8e3bf99033854d3ce945bcf27df87e0f284693e868749e31455c35fdd225995bcb22b4a7cd306c703337da1a322ed48df0d8453173
 EBUILD diffoscope-229.ebuild 3567 BLAKE2B f072f377fa06316742810be8de7ef0d24f94448e2a0626aba507b5af54ab8915833aa4ebde7668c3cac05437a9db198e4849ae7558f0413a2a72856bca8ede89 SHA512 963c4d3a4ca14b360a8f062eacbdf82f1c30d59f4a0bd47eba11761007fe1e5227a15635a66d9e75150c72aa14da0d7782bcc64987feecc01f32d614998f150f
-EBUILD diffoscope-232.ebuild 3568 BLAKE2B 992460e5ac2d0f8d781d3fc45ee55e915c7223d75297a3dc6f70577d0ab5d3165492da4ef2ff03ed8ed20af712eab4b3bac122acfa143c34c10d738bd6e4b831 SHA512 c209475acf363cecc9be96f5fe437e2f0250d186279969c0e4ea7a0eeaded8683a53ca4a2b5c615762e2699392ba557f48ae567cf0205de85a92c41e74e10063
 EBUILD diffoscope-233.ebuild 3568 BLAKE2B 992460e5ac2d0f8d781d3fc45ee55e915c7223d75297a3dc6f70577d0ab5d3165492da4ef2ff03ed8ed20af712eab4b3bac122acfa143c34c10d738bd6e4b831 SHA512 c209475acf363cecc9be96f5fe437e2f0250d186279969c0e4ea7a0eeaded8683a53ca4a2b5c615762e2699392ba557f48ae567cf0205de85a92c41e74e10063
+EBUILD diffoscope-234.ebuild 3568 BLAKE2B 992460e5ac2d0f8d781d3fc45ee55e915c7223d75297a3dc6f70577d0ab5d3165492da4ef2ff03ed8ed20af712eab4b3bac122acfa143c34c10d738bd6e4b831 SHA512 c209475acf363cecc9be96f5fe437e2f0250d186279969c0e4ea7a0eeaded8683a53ca4a2b5c615762e2699392ba557f48ae567cf0205de85a92c41e74e10063
 MISC metadata.xml 2078 BLAKE2B 3bb126836e45e8d4e5b6170a12219ec9cceb1a12dca4658211b1971cb16fa5593622642ade363904cf24df16de0749b957d0fc03838d2a9a004484d0b551c886 SHA512 382cefe0478282000b74e404cdd9d636a0323fceb55b97fd8545190628c319e0c5e213c7d082198e4b8b1fc693a52ce85c52b3ad831778e6fadbe6ba401782f5
diff --git a/dev-util/diffoscope/diffoscope-232.ebuild b/dev-util/diffoscope/diffoscope-234.ebuild
index a69e36d1c939..a69e36d1c939 100644
--- a/dev-util/diffoscope/diffoscope-232.ebuild
+++ b/dev-util/diffoscope/diffoscope-234.ebuild
diff --git a/dev-util/pkgcheck/Manifest b/dev-util/pkgcheck/Manifest
index 91ca18c58610..53fcf853bbae 100644
--- a/dev-util/pkgcheck/Manifest
+++ b/dev-util/pkgcheck/Manifest
@@ -1,10 +1,11 @@
 AUX 50pkgcheck-gentoo.el 125 BLAKE2B db546b7f4e1517fb4f3bc46eff6a3294c8d677be031ecb33987daa84c355c3628ab7f24bbab90afb24b0bcec6c0ebebb56339374fa35a345481aa9808bd538be SHA512 31bad085867ebecedf0c9c3ed1223e7512238892d69b5224e850d744c5965bf7a2d7cb90978d9cce6da8dc554dba36803d604b8c6ac2b7cc9f2718ef7d6fc644
 AUX pkgcheck-0.10.19-fix-pkgcore-0.12.18.patch 2435 BLAKE2B 3e41b3ca1666aa8f88473bb3586312d77dfe2dee6748355346ef774dd8ddea4680abc329c653679eb97e634d86e63ef7c0b1593c9aa7ff4160ebf1e5d072519e SHA512 33607bcf237a542d043255f7a9f7f421f87d1a9e782a3f9a23cefaa91ea0fdfe815f50ff44125cd4e7c54aae36a6503998b9eb3c8c49e3626b46a1845ea39120
+AUX pkgcheck-0.10.19-fix-setup.patch 733 BLAKE2B 39033cf4509d7a46f0a638109cf1b7b8cb8b978f6b50ab4a331ee0b73745d3706b22f8e331990a2daf7138a9d0a37f42dcccb03285ea705ef96e2ae4d3a79f6d SHA512 6f1e2644989d2843fa9358e3bb440306fa4b6f52bece07dd2bec36b2597b41c03d54784d3ea505539ab5463030703d4b76d62ea476fb31d0f5719a6af662affa
 AUX pkgcheck-0.10.20-fix-replay-bin.patch 4506 BLAKE2B 68262310538abb220ef3f3109f65656e11716160895491f00f438bd686fe6a904238b1dd29cd92db7bbbb83f2a0282e455e843b7cc8f17c9f4c47a42f8dc4a82 SHA512 42a45d64f4bcd31b510124e8091bb3aae93c906bdb90ea2332405a5b17baee43edffc45563774fbdb2a7efae795065b67f81aeef1c5b9bde7df0bdcdeab3aa48
 DIST pkgcheck-0.10.19.tar.gz 548636 BLAKE2B cc1626c1d5ad9ba6b43f99bcdb668092805eaf9797c9839812d8716ea9f454f631d2e6da4579bbf702da5aadc61adc8064a6b7d32f001aaed9a2e42f8392f24c SHA512 c3af623b5c38325f9afabaa217e29d23dce4355a0aebbed77a5efa469ac135238d0aa04b4973d84c52e68ada0cb3b391a82d58317e75a279f083470c7e69cdf6
 DIST pkgcheck-0.10.20.tar.gz 549746 BLAKE2B 72ed97d93674ffd311978d03ad3738494a752bf1b02bea5eaaaf1b066c48e8c9ec5f82b79baeeabf3e56e618c76614ee6179b7115d1d875364ac6e3fbc3c6028 SHA512 6a8c135ca44ccbfe15548bd396aba9448c29f60147920b18b8be5aa5fcd1200e0b75bc5de50fc7892ad5460ddad1e7d28a7e44025bdc581a518d136eda8b0df2
-EBUILD pkgcheck-0.10.19-r1.ebuild 2304 BLAKE2B 78ddd76b86dc0a9d3b065340829fc1011b8536aa1fe520ceed432cb04ca6ead5c9ba56c26ce0a14c2445a51f15fea9686a102e0150a279b616e042a637bbe29f SHA512 c2e2a88b3cada968782bc1f070d3e6572fe87a3763da08c14de8ae6bfddd3b4e88dccaed733b568395f65d415620b5b4a25cacc261187c4e3d37857005dfcda9
-EBUILD pkgcheck-0.10.19-r2.ebuild 2372 BLAKE2B f655d02fa3cb3a1171d3f8eb81085f9b807c5f72c7f2e8f4fca0206565f123a93bc85e6624580c4a52708f5e74eacbe8de27a952dfdaaaf648ae2cbe019173dc SHA512 d9f1f4e477abd4593d553446c97fc918d20183182f318d2a381cc673851856c463f16ff0f3a7b414caaf3ef2bc62af9acb3a9bfa1dbedcd32b3ab83dd00d6080
-EBUILD pkgcheck-0.10.20.ebuild 2254 BLAKE2B a78e64a63932339c482ff439bb090ef2659d2ea3eecb6bfdcdbe6380947c283132fe7fce4c624800ac26e63a176df0f26e8858ae7c7e02eee8561ff6726879ac SHA512 184249aedc453e00059455951c62591086faa49e4bbb7e22e8a1498ce4c80832506859162805ea89e8fd21f43afe29a95593b9d57464bfe4a18f82019fc67cd8
+EBUILD pkgcheck-0.10.19-r1.ebuild 2362 BLAKE2B d653ee448a74bbf5debee553a67e1e387fc0ac0f3083540b32b014991eeb27dd0b02f33697b95669ebe26fd0c84d528324b2cb5b7b51750e4e6d45309233cc6a SHA512 2da2dcd658b828c907380fb4af4d2fcd2fc7aa007615a8fa1fd36dee9cfe71b6d21ea80fcc25eddce69b54b64046a5ff5c86acd64d8dfb8f0f97d3f72a2da5dc
+EBUILD pkgcheck-0.10.19-r2.ebuild 2417 BLAKE2B 8846153b57eb01b03fdcd0d9b70f303aafc9ebe40dc2a139be4b480153d734da67ff94a42b5a7d3accf2a9cfbb73664668717c56b635d9d88bcb001b5d93b787 SHA512 5529cca4233e5c350209baae3838949954a076fe074b3dc93bab8e34c5716f0d701cb43fc443ccfb1e225ed06f3d61e21b34f566b64e0cf08167d91066016bec
+EBUILD pkgcheck-0.10.20.ebuild 2299 BLAKE2B da8d2f3c4003dece22395a782538718fb5511048dd8a0f193504875b42fbe1c330583e4491b12cc4ef0c4d85caedb7777d3b00bb562a6e5974ebfd35f93fdeb1 SHA512 d97b28760c66445cf6a466a928dd1458ebdec5bec82742609545899e6a451bd46b5ec02913ec56228da44ddba728e0fb9bf76f8e96043d91042015587ed6c419
 EBUILD pkgcheck-9999.ebuild 2208 BLAKE2B 9df86718b0572e354aecf6b68f251be51538dca36e4a42e79fdb0ab7a48911b5b79ebe033cbf7814f1c5a1105a4065d5790e3ba388c1d8f77c42e735a4d179ac SHA512 d63bf1d5c01fbd1e8d6a93e7176c0b6aceba20dfda43eff12ad12a91eca4f6f52aeb1d1d0a65c521205bb05244789b1fef563fbc5cff6a7c639d7b0221dec52c
 MISC metadata.xml 455 BLAKE2B b544db3532ef1da966833d5edbc79988cc1fd85b6d6276476684b49d4485814d6e2d969e742d3633c8176e7f37cae6614dae1654fd1424d71475f022166f6e6a SHA512 5abd1584f486e88992bab8c51c191b4915a5854752130f8a591147ff4b2af2102fdc8ab182e7358c3e4bbb3fdc8400563a250e2dba1793d365f0edc7c5f7c33a
diff --git a/dev-util/pkgcheck/files/pkgcheck-0.10.19-fix-setup.patch b/dev-util/pkgcheck/files/pkgcheck-0.10.19-fix-setup.patch
new file mode 100644
index 000000000000..8366e435a1e9
--- /dev/null
+++ b/dev-util/pkgcheck/files/pkgcheck-0.10.19-fix-setup.patch
@@ -0,0 +1,22 @@
+https://github.com/pkgcore/pkgcheck/commit/b4c34a95f4c66db9c658f6dd75d9193c6e55dab4
+
+--- a/setup.py
++++ b/setup.py
+@@ -36,12 +36,12 @@ class build_treesitter(Command, SubCommand):
+         pass
+
+     def get_source_files(self):
+-        cwd = Path(__file__).parent / "tree-sitter-bash/src"
++        src = "tree-sitter-bash/src/"
+         return [
+-            str(cwd / "GNUmakefile"),
+-            str(cwd / "tree_sitter/parser.h"),
+-            str(cwd / "parser.c"),
+-            str(cwd / "scanner.cc"),
++            src + "GNUmakefile",
++            src + "tree_sitter/parser.h",
++            src + "parser.c",
++            src + "scanner.cc",
+         ]
+
+     library_path = Path(__file__).parent / "src/pkgcheck/bash/lang.so"
diff --git a/dev-util/pkgcheck/pkgcheck-0.10.19-r1.ebuild b/dev-util/pkgcheck/pkgcheck-0.10.19-r1.ebuild
index fdc0630f0197..0ead2a88c1b6 100644
--- a/dev-util/pkgcheck/pkgcheck-0.10.19-r1.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-0.10.19-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
@@ -55,6 +55,10 @@ BDEPEND="${RDEPEND}
 	)
 "
 
+PATCHES=(
+	"${FILESDIR}/${PN}-0.10.19-fix-setup.patch"
+)
+
 SITEFILE="50${PN}-gentoo.el"
 
 distutils_enable_tests pytest
diff --git a/dev-util/pkgcheck/pkgcheck-0.10.19-r2.ebuild b/dev-util/pkgcheck/pkgcheck-0.10.19-r2.ebuild
index e8ce5bc43086..7bdb06bfcbfd 100644
--- a/dev-util/pkgcheck/pkgcheck-0.10.19-r2.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-0.10.19-r2.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
@@ -57,6 +57,7 @@ BDEPEND="${RDEPEND}
 
 PATCHES=(
 	"${FILESDIR}/${P}-fix-pkgcore-0.12.18.patch"
+	"${FILESDIR}/${PN}-0.10.19-fix-setup.patch"
 )
 
 SITEFILE="50${PN}-gentoo.el"
diff --git a/dev-util/pkgcheck/pkgcheck-0.10.20.ebuild b/dev-util/pkgcheck/pkgcheck-0.10.20.ebuild
index ee894bade2d1..ca8e001c8437 100644
--- a/dev-util/pkgcheck/pkgcheck-0.10.20.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-0.10.20.ebuild
@@ -57,6 +57,7 @@ BDEPEND="${RDEPEND}
 
 PATCHES=(
 	"${FILESDIR}/${P}-fix-replay-bin.patch"
+	"${FILESDIR}/${PN}-0.10.19-fix-setup.patch"
 )
 
 SITEFILE="50${PN}-gentoo.el"
diff --git a/dev-util/xfce4-dev-tools/Manifest b/dev-util/xfce4-dev-tools/Manifest
index 73f8efa67779..a07e555ab635 100644
--- a/dev-util/xfce4-dev-tools/Manifest
+++ b/dev-util/xfce4-dev-tools/Manifest
@@ -3,5 +3,5 @@ DIST xfce4-dev-tools-4.17.2.tar.bz2 353571 BLAKE2B af3ec3e603b2224ee47feefd63eb3
 DIST xfce4-dev-tools-4.18.0.tar.bz2 349125 BLAKE2B c82496de1a279a3ce57f895a52ee4eab98d2d174cf7109ac70790d9f1c8a6812196f4ff5bd951352b2345496f0ebf4113472a7e1f9e3826a1d02b163e4108f6e SHA512 59f858b633d95585a74c9b9515a0994744f4355ab3813e582e10c776454ac41c86296a9fbd935d5dae88929ec09ec9c30f48629c7addb5729e6bea108d304f7c
 EBUILD xfce4-dev-tools-4.16.0.ebuild 598 BLAKE2B 13b4bfa02960605265c996d8d2e1976c4e5dd645026ce5fe4c7812f12b5f63891d481b22b0e06cbbbc9290fb1178a85afd3e124d31a033c92827e63e4b3e1d56 SHA512 9a17075362771d9af7d4aafba81d9e5a2f61c8be4c595c46feedb96fe8b5f7bf185d310352bcd24fd6024b66e2f76f921c3d58c20e30041bfaf89089d2e91d0f
 EBUILD xfce4-dev-tools-4.17.2.ebuild 629 BLAKE2B 67dc7710e79735b17caf0f59b60731da8079b3b5e28ab25562d2bc662dc9f6e0183cbe2c330361997ebd256146f5a6fbf7d9220b7251dedf6ed85c68f8292c52 SHA512 deee8675a7e3e9694f9fe303a6de33b925e84fc2e5194f7b4cdef464d03f71ee68afa71764296fefe0cdde68d212c5922cbfcb87b09888e5bcc2cd8a684c8aa1
-EBUILD xfce4-dev-tools-4.18.0.ebuild 631 BLAKE2B 82bb4d970cbb05e28b088191d291233bc553e503d182bc352dc1726a17fa73fc693497bf84064724a381b88ea572296f12d28cd546cf5705887d3c4a3ed62bbd SHA512 b1e2298e07af8a8e4e9d472d0785e9023349e81e66ef26451c9a62c6cdbca71cf320308138c26a1c97878331fa8cbd0ebaaf815e846e93b85cb73eb659982f45
+EBUILD xfce4-dev-tools-4.18.0.ebuild 628 BLAKE2B 60e7547653ac9b145b0390b9571766f8da3c0ec804e40b75aee4faf42bfb704cf97d3867d4b8d1e8ddf76d02a6de0477c16689bfab3656227e38f32729870972 SHA512 2ab92fe9b49ae6239f80dc8385d5a50b2aceac7af996ee2cdfa80602fc57431da84c20f8fd9ddba2f8d283e4eae8639c5c25681ebff2fc13ce6bb77b68b71957
 MISC metadata.xml 248 BLAKE2B 83bf47dc3dbedea8a88932e922075f0ba8fd841433c4ab750e2ab61c22e8cbfaa1acb04a903d89ef5140a75dfc4c4899354623e0160df5b7c178c190f8494515 SHA512 b5200cfe30adef8e869fada87f1b4171210b2427cd3ac12edef70948f305d5e612ca5f24d377f9823a6022c8867db635db50ddd3d6cb362d6b0137c299fe07e5
diff --git a/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.18.0.ebuild b/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.18.0.ebuild
index a468f430bafb..e0bc4a0e8919 100644
--- a/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.18.0.ebuild
+++ b/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.18.0.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
@@ -12,7 +12,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
 
 DEPEND="
 	>=dev-libs/glib-2.66.0
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index e86d6a7bf57f..e016773d6dd3 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/ristretto/Manifest b/media-gfx/ristretto/Manifest
index df609cce4a9a..ae63dfd137e1 100644
--- a/media-gfx/ristretto/Manifest
+++ b/media-gfx/ristretto/Manifest
@@ -1,5 +1,5 @@
 DIST ristretto-0.12.3.tar.bz2 616251 BLAKE2B 0f64918bae8511259acc90ce8851be0067ce635416fa908fde5a1e1fe9ae895b18cda06505c82cfae0aaf89fce41a56f80d5c2bcd4ad6cd3e93a95ef5cfb9037 SHA512 c78ec55196fbf3bcb843b240faea1f7eb532bfdc519c125337ebb61d20ab8e01c818920c9ec1bdd97035f8b5ce9bcd2ffb338a91b8919ca48ab1010828a8d49d
 DIST ristretto-0.12.4.tar.bz2 619084 BLAKE2B c04d09b8475a46e89a2151cc46121ec9960f52ba8e861c474a46a8bda470c6620dfe2c38a35a80c075d830b7d4d3b80c435ebe1baf10bb913e20d26945d1701c SHA512 666e127646b9f30bed54d8605c4892d302b15dff39e8b532ebb3da22dc5700414e6d7bcb29d8d66f6a8a7d487cff50b0a0cc610d8b4616479397ebf987ff409b
 EBUILD ristretto-0.12.3.ebuild 899 BLAKE2B 22909ebbf5a641d6b26ccc1e3595a388086bb0dfd981d565cf042868a96c2e816dee6f5420b2549ed06401e6e5822b5070ea6e30f595e66c61e97c0ec4c81fb4 SHA512 e171f72e986df77de173def2b98fad78bd7c8f504a82ff956eea1da6dd849ea2add21d073e12ffdbc460570c0939c4b594d249bbfe98da9ba306c81786c1e8c0
-EBUILD ristretto-0.12.4.ebuild 901 BLAKE2B f548c4907d62833114a2e44748215638314af5e639315143993a52514407aaa78c3423c0166bb84db1c6decb0d1f953a585691ab736e07a2bba2ee8a4a98302a SHA512 ed069e6213458941ca0f7f042bd49eed7600bb398678fdbc6b82e3b1db76d2e973be935062e5aaed1f181cda1d3b1362ac9481286e4f8731966c30f31622ed4d
+EBUILD ristretto-0.12.4.ebuild 899 BLAKE2B aac782b2f470476e31569056c436160caabb9c41166f8dfe02182fad70b209bdf925105e7229f6c4925092d62059798dd807beabb95633add6dac5cdb90d0b36 SHA512 e73bf19c0f18e55dba40807be7731c5d35669e8c89709f78c142beb18f96bb6a6dd8efa0bf95dc44b66678ae9820c8e4d9ff6199316d5a986323c186ca3ef637
 MISC metadata.xml 248 BLAKE2B 83bf47dc3dbedea8a88932e922075f0ba8fd841433c4ab750e2ab61c22e8cbfaa1acb04a903d89ef5140a75dfc4c4899354623e0160df5b7c178c190f8494515 SHA512 b5200cfe30adef8e869fada87f1b4171210b2427cd3ac12edef70948f305d5e612ca5f24d377f9823a6022c8867db635db50ddd3d6cb362d6b0137c299fe07e5
diff --git a/media-gfx/ristretto/ristretto-0.12.4.ebuild b/media-gfx/ristretto/ristretto-0.12.4.ebuild
index 869d4e7f337b..5f3de2bbb668 100644
--- a/media-gfx/ristretto/ristretto-0.12.4.ebuild
+++ b/media-gfx/ristretto/ristretto-0.12.4.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,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 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=""
 
 RDEPEND="
diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index 1563f2f5d09a..7858878f111c 100644
--- a/media-plugins/Manifest.gz
+++ b/media-plugins/Manifest.gz
diff --git a/media-plugins/gkrellmpc/Manifest b/media-plugins/gkrellmpc/Manifest
index 9ac942ddb224..3e62609e72be 100644
--- a/media-plugins/gkrellmpc/Manifest
+++ b/media-plugins/gkrellmpc/Manifest
@@ -2,4 +2,4 @@ AUX gkrellmpc-0.1_beta10-mt.patch 4209 BLAKE2B 33d2dc1d1601b44d930fca7915848f370
 AUX gkrellmpc-0.1_beta10-r1-make-test.patch 285 BLAKE2B 44ea0867743d219907fde694b05cc7567f86105546b0fbf47186a00467e5d07c294ea22a3c620b702efdbd479d5620f84c92e4c049947493967c6bd80ca27486 SHA512 ca89fa4f53b3c31ca0902be258980510d71355156606ae84fa187fefb1574c11f0f71cf20b41a56c4f86835a170b801df0e0918873d3d28c01a7d7bbf3579c09
 DIST gkrellmpc-0.1_beta10.tar.gz 25388 BLAKE2B 2e3c97e7d5887e1c3ea6a693cde19470e476943658de607266aac9a3ecbc2a5215fcc266638909d2ad024f303adb19475504ea4f7b79b3e97f566d90899721d3 SHA512 f5d687264f08146bf1eb54aee6d42a200fb97008a355d26a68be91b04e4bd622fc222725bf498c0837eacb8b94d6aede5aa1a05ed504fe5f9b790a9cd08d3973
 EBUILD gkrellmpc-0.1_beta10-r1.ebuild 863 BLAKE2B 17e0baf5595dfde3755ab9785ff1b57ed1cd5c64081f8e07a15051dfca67489468a3fef0b9a21e40b9fa0cb93de9f87b34b43a5a41bda99d79b70f728b4dc904 SHA512 db86e8a62eb423de4e205e747d5ddc04db6a9e9065135216870924fc8868fe8f04c3ea25b936143eac55b09cb2b41a41c2eeec62e9bbdd9252f63a7f075124e3
-MISC metadata.xml 347 BLAKE2B d62b664aa75bf7dd141b70486d142f2db34c1580eaaa872d73457dbbdcc7b7967abc9096eee7a14ef22f5e6eb01e2df04fa7f87afdaa6a23d0a0470e2795fb68 SHA512 07bc016c43af13a53dd6ff3024c9412625e8e88472dfb45349b6cbcfc2b5a7e5451f7ac4cfeb5d1d88a8ea778e9b3e2c73d03f854d002d78a99e00bf35559b2f
+MISC metadata.xml 447 BLAKE2B 6bd3dc595750da5b2f86ff9bec54727a58b50d4178c0188eb42d53a96263fde3804844b74f2801b99556a63c88425db6406b9249d107105da3f475e5fe659a67 SHA512 79a7312d58dc0f3b7ac5d24a265946338a4a80c743ef5047591598423b11da81f90564bedb90778e15972df058076753a67d233592f80032ffae4a16be538119
diff --git a/media-plugins/gkrellmpc/metadata.xml b/media-plugins/gkrellmpc/metadata.xml
index 6bb21ff8973c..47d4f0f853f6 100644
--- a/media-plugins/gkrellmpc/metadata.xml
+++ b/media-plugins/gkrellmpc/metadata.xml
@@ -5,6 +5,10 @@
 		<email>sound@gentoo.org</email>
 		<name>Gentoo Sound project</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>sam@gentoo.org</email>
+		<name>Sam James</name>
+	</maintainer>
 	<use>
 		<flag name="threads">Use separate thread to init connection (unsafe)</flag>
 	</use>
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index dd7cc77b3a60..713937641420 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/strawberry/Manifest b/media-sound/strawberry/Manifest
index b026adf6bbcd..fd56ed3159de 100644
--- a/media-sound/strawberry/Manifest
+++ b/media-sound/strawberry/Manifest
@@ -3,7 +3,7 @@ DIST strawberry-1.0.12.tar.xz 11231600 BLAKE2B 7c65d3f0a7418bd4e4ec2d50324064570
 DIST strawberry-1.0.13.tar.xz 11232884 BLAKE2B f2762a280ca00d080836f2d9a201161588119f26c59bdc6d5a9fd2bfc98d8dc64110e675fb8860cecd44a1406e0b869b14793644a8cfd01316b7ec823489efd6 SHA512 b870252a3abcc6accfc7b9b52563573f42fb65d8322880bcd6558a083d8e12da043e5967165dcdc4714800ce283e837c68cbf3a61a5c018a4978c7b7b5b39bff
 DIST strawberry-1.0.14.tar.xz 11234760 BLAKE2B 2dc0d1cee93ffa130da403c986c147f5d3eb59689079a0450183edc53947f7472ea5ff69c57c8ce971f03e89896d06c51bf22bcf57f97adb97067c8a35cf0e15 SHA512 bf667cb93b8f0ffdb8dc625df821bc4355e3845629ff25ed57d7999e19072edffab05f27dbea90adf0bb9a9cbe478856a292a1a6f7ed2c5f37442548699a4c02
 EBUILD strawberry-1.0.10.ebuild 3019 BLAKE2B f90ce6144be7f24a66d09d114f4ec9b4f28bd6c12e37a423b785973b8391f06dff2c35eca6e344c6b1ce82dd64e65f0d894e8de1e8eb1bf7cb5c08bce72a604b SHA512 6b803a3b98994f7628d2cb8f729ca189c7d72d865a76087f0fda8f00d8922844d3e16516e27bca8c3b547a3608f0074c999707472ecb3c2c2aab37344d04f2e9
-EBUILD strawberry-1.0.12.ebuild 3021 BLAKE2B 49d972f0be2dfca036c8d61ec1272ac7098d2ada74f5de1058429af2e14708a978c157f82914db222cd99eda6b1230c6d06ab43d3a5ad658678618accbb8d339 SHA512 9037db1106c60e5e280a374ed1ab29881b09a450b2d5399b9fecb295b120b3282197948dbefef3fdf51cdf3d22e3e1bacedd02e2ce02ae0c7b9bd2d894218c0c
+EBUILD strawberry-1.0.12.ebuild 3019 BLAKE2B b35558cf019062a6ba15ba7f837db388299ea48a3a881c6dabd59e798caf2830df4f765d7dfe462439d886869ba576ca0cd7579d998b42daf0b1e7e6eef7f689 SHA512 5c58c3ed1ec917dbd6e620a227a4e9efffa08a5e160a9875ffcfa713fc3c7552f66f2d227262c91fc6aeec76d0f3b055c3e5720c53520b6e9b89a0142b65f18d
 EBUILD strawberry-1.0.13.ebuild 3021 BLAKE2B 49d972f0be2dfca036c8d61ec1272ac7098d2ada74f5de1058429af2e14708a978c157f82914db222cd99eda6b1230c6d06ab43d3a5ad658678618accbb8d339 SHA512 9037db1106c60e5e280a374ed1ab29881b09a450b2d5399b9fecb295b120b3282197948dbefef3fdf51cdf3d22e3e1bacedd02e2ce02ae0c7b9bd2d894218c0c
 EBUILD strawberry-1.0.14.ebuild 3021 BLAKE2B 49d972f0be2dfca036c8d61ec1272ac7098d2ada74f5de1058429af2e14708a978c157f82914db222cd99eda6b1230c6d06ab43d3a5ad658678618accbb8d339 SHA512 9037db1106c60e5e280a374ed1ab29881b09a450b2d5399b9fecb295b120b3282197948dbefef3fdf51cdf3d22e3e1bacedd02e2ce02ae0c7b9bd2d894218c0c
 EBUILD strawberry-9999.ebuild 3021 BLAKE2B 626e0dce302219386fc8cddc66d0f11127718685392fbd0324610ea2099c581376871db28d214cbf00c906d697a067713f02e24034ccc2aa93d799ed184a1c44 SHA512 5c5c18f84ebcc125638f590631f92c20103dc4ea344358f2f8b9eb3f3f2932589936a45a25ad13ea2aa664bdedb96b960a74decbba91973d8175407ee421a7a4
diff --git a/media-sound/strawberry/strawberry-1.0.12.ebuild b/media-sound/strawberry/strawberry-1.0.12.ebuild
index 884e0da1aa38..13770970ff46 100644
--- a/media-sound/strawberry/strawberry-1.0.12.ebuild
+++ b/media-sound/strawberry/strawberry-1.0.12.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/strawberrymusicplayer/strawberry/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~ppc64 x86"
 fi
 
 LICENSE="GPL-3"
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index d816059a94aa..2f1772ef8c91 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index c7b972bf3b4d..5fc27631661a 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Fri, 03 Feb 2023 08:39:38 +0000
+Fri, 03 Feb 2023 14:39:38 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index bbfe877d2708..7fc02664fd6e 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 540216 BLAKE2B d30aef090eaffb1f3ce91f96dfcc44f7a5d1a954885fba68126dee1aa21a3de740e45dd7106f5d3ba2b51e48eda29870b954e2a90cc8bfa9dc1ac93912daadef SHA512 f9ff42d8d58ea6e6bae5d32f95af7bcddc333ce0478d31cfefb14e85c8d99eaf4d3d9a0802c961e3f7e7d8f3696894cb1d1d0e81db3807d1796858a550f0351f
-TIMESTAMP 2023-02-03T08:39:42Z
+TIMESTAMP 2023-02-03T14:39:41Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmPcyE5fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmPdHK1fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCCRw/+LqLUYog+AbiqT2gXCu0PZSKB0hwg7fgxb3wDO94wOEqZhkWHM/8jnX1g
-XX9C1fafWEJ/whNDTwiVbwje/0TC+ggMvcJEIXVX1RDlk5WXqaS6gKt2CAa9nltD
-XP78CHkwds23F3QFIopDmYY3RgbZhbkal3iJx3HGCw05aafK2BvgG1jj38ocwO4S
-1HsKn/2bTUduCh0eyVI7RUuzxlffFmEA9wUn/1RGWtNt5UQD7j9orMjfwPnqppBi
-fV7NlF49rO49OrkwipI6frrcaFg6MCmD9rhubufwVTbc3VFeoTfSr+G/XEyKVVjC
-pZvwM18/DPoXpKYPt+jJ2OFAdRQC3zvlNFBJO2jGOrtENF3cpYhaAdePYOj/Pmke
-K9igkJxyldk2ol5VeRmVECRqdmKjtAKlXQfXpO7dtO8NzUy7Y1Jrh6ekn37LgDpT
-3bzLrX6zH8r8aa+x2ExCD5TXglfzGxMngqr+IHCdrvIX3lU5hEr3FdjUyNNTXuNr
-5XyJlRO7PCwRY2yj/eZnHDgRxOHvff/82t6dA29k54ZhtL84hi8zXnelugf3z631
-oAw3iqm+fSgNLjhPPFmX1eDU4fPBfDExanVSMJPefp1xrV1Z0pnpe4yMScHS7sLQ
-vJdUyapdxn9JevmTTYr2yswskvWVj4XMTTC9T4ITU9Qh9AAjGOQ=
-=FEa9
+klBVkw//cjurSdAPHa2J8/lc1MGkZjGsAZb6wikWgFmw6kCYnteAXUL0kgMZm7UC
+NYmt3Bp+nhROcsmHKNpxcqvn7v2mVGrWrnQQsf+BbnxxJtytGSuPYN1eEVd7dvxr
+4BZVpm3X9Tha/Z2jXJ+BnRYSFqGKUgJ5ewT+s+erJJKxKidfJuTIFGMKbzqTaNcs
+68XvUNePZo12Y8D6UXp//Am7cA+kwkZHLsNgvz+YKb6lcGgmgYJqvpmb4vSJC4VF
+berSRcy1DdFGdoBhLvZpBU6tkkkYsdPPdSKuwF19d5CTMgpW9ken8ZsIDJKScj/A
+ps8FFbXN5OVkwQAR2HAsIPQiGkfXZUBq6Hz2CygkFySyQaBR5+mRNmtXDku6kAC/
+Q5U29wy6ak4FXmlZb+srsAal1SMRQXdv7TiyDPe/AK7aYvxQNnA+D2MI+SzdzRZv
+0SkVlW34Ujjg+uPbfDnuQ9z3V3oXOwC6u04xJFTFNxuDQG9ZDEzdXlEPQ8Roxohl
+1NA2j0ZWTXxlqMjLYXWjaDDYd5XQCYwk2qDReWN4hrc/YvwCKorXUYouO8URE9ld
+X6G2SzQHgtloypSCqUS2dzxkiAApKZgWzMKWrdDg++QyrB80R2qRBxvpIa3pgyK1
+SPDmjSI8KWwRQyxddpV9Wzf4FYrqny7l9Qy+NmGnmosHG2ZBBoo=
+=aiA8
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index c7b972bf3b4d..5fc27631661a 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Fri, 03 Feb 2023 08:39:38 +0000
+Fri, 03 Feb 2023 14:39:38 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index af91735c22a0..d11ae4f06b52 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 adeb512e3bda..5eb21c4909a2 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/gkrellm-2.3.11-r4 b/metadata/md5-cache/app-admin/gkrellm-2.3.11-r4
new file mode 100644
index 000000000000..94856daa6d0b
--- /dev/null
+++ b/metadata/md5-cache/app-admin/gkrellm-2.3.11-r4
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile install prepare pretend
+DEPEND=acct-group/gkrellmd acct-user/gkrellmd dev-libs/glib:2 hddtemp? ( app-admin/hddtemp ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( dev-libs/openssl:0= ) ) lm-sensors? ( sys-apps/lm-sensors:= ) nls? ( virtual/libintl ) ntlm? ( net-libs/libntlm ) X? ( x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/pango ) x11-base/xorg-proto nls? ( sys-devel/gettext )
+DESCRIPTION=Single process stack of various system monitors
+EAPI=8
+HOMEPAGE=http://gkrellm.srcbox.net/
+INHERIT=desktop plocale systemd toolchain-funcs
+IUSE=gnutls hddtemp lm-sensors nls ntlm ssl X
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-3+
+RDEPEND=acct-group/gkrellmd acct-user/gkrellmd dev-libs/glib:2 hddtemp? ( app-admin/hddtemp ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( dev-libs/openssl:0= ) ) lm-sensors? ( sys-apps/lm-sensors:= ) nls? ( virtual/libintl ) ntlm? ( net-libs/libntlm ) X? ( x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/pango )
+SLOT=2
+SRC_URI=http://gkrellm.srcbox.net/releases/gkrellm-2.3.11.tar.bz2
+_eclasses_=desktop	7eb20ad915a0a318176d51bc2508ff5c	multilib	5ca4e49abed8e3a2f7b56920eadee157	plocale	950fbaec7deeba41b5bcc0572cca99b9	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_md5_=31b33ce0d2ca8e7512161a997b2b99c3
diff --git a/metadata/md5-cache/app-admin/gkrellm-9999 b/metadata/md5-cache/app-admin/gkrellm-9999
index 3c1a56fe21b3..8e3f7bcca4c1 100644
--- a/metadata/md5-cache/app-admin/gkrellm-9999
+++ b/metadata/md5-cache/app-admin/gkrellm-9999
@@ -4,11 +4,11 @@ DEPEND=acct-group/gkrellmd acct-user/gkrellmd dev-libs/glib:2 hddtemp? ( app-adm
 DESCRIPTION=Single process stack of various system monitors
 EAPI=8
 HOMEPAGE=http://gkrellm.srcbox.net/
-INHERIT=desktop systemd toolchain-funcs git-r3
+INHERIT=desktop plocale systemd toolchain-funcs git-r3
 IUSE=gnutls hddtemp lm-sensors nls ntlm ssl X
 LICENSE=GPL-3+
 PROPERTIES=live
 RDEPEND=acct-group/gkrellmd acct-user/gkrellmd dev-libs/glib:2 hddtemp? ( app-admin/hddtemp ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( dev-libs/openssl:0= ) ) lm-sensors? ( sys-apps/lm-sensors:= ) nls? ( virtual/libintl ) ntlm? ( net-libs/libntlm ) X? ( x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/pango )
 SLOT=2
-_eclasses_=desktop	7eb20ad915a0a318176d51bc2508ff5c	git-r3	2347f8fe2d392b2a091191f94be37e6f	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=ad4cbbb4c38be1f78ab2199642401e85
+_eclasses_=desktop	7eb20ad915a0a318176d51bc2508ff5c	git-r3	2347f8fe2d392b2a091191f94be37e6f	multilib	5ca4e49abed8e3a2f7b56920eadee157	plocale	950fbaec7deeba41b5bcc0572cca99b9	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_md5_=31b33ce0d2ca8e7512161a997b2b99c3
diff --git a/metadata/md5-cache/app-admin/testdisk-7.1-r2 b/metadata/md5-cache/app-admin/testdisk-7.1-r2
index b8efe8f0834f..9d625530d614 100644
--- a/metadata/md5-cache/app-admin/testdisk-7.1-r2
+++ b/metadata/md5-cache/app-admin/testdisk-7.1-r2
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://www.cgsecurity.org/wiki/TestDisk
 INHERIT=flag-o-matic qmake-utils xdg-utils
 IUSE=ewf jpeg ntfs gui reiserfs static zlib
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~hppa ~ppc ~ppc64 ~riscv ~x86
 LICENSE=GPL-2+
 RDEPEND=!static? ( static? ( sys-apps/util-linux[static-libs] sys-fs/e2fsprogs[static-libs] sys-libs/ncurses:0[static-libs] jpeg? ( media-libs/libjpeg-turbo:=[static-libs] ) ntfs? ( sys-fs/ntfs3g[static-libs] ) reiserfs? ( >=sys-fs/progsreiserfs-0.3.1_rc8[static-libs] ) zlib? ( sys-libs/zlib[static-libs] ) !arm? ( ewf? ( app-forensics/libewf[static-libs] ) ) ) !static? ( sys-apps/util-linux sys-fs/e2fsprogs sys-libs/ncurses:0= jpeg? ( media-libs/libjpeg-turbo:= ) ntfs? ( sys-fs/ntfs3g:= ) gui? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) reiserfs? ( >=sys-fs/progsreiserfs-0.3.1_rc8 ) zlib? ( sys-libs/zlib ) !arm? ( ewf? ( app-forensics/libewf:= ) ) ) )
 REQUIRED_USE=static? ( !gui )
 SLOT=0
 SRC_URI=https://www.cgsecurity.org/testdisk-7.1.tar.bz2
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	qmake-utils	59420c906278d16deaaa629f9d115707	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=d06504f8afb20837b2ef353eaa51a504
+_md5_=f8797e3360ab86564e95aed7a8e7d7a3
diff --git a/metadata/md5-cache/app-emacs/Manifest.gz b/metadata/md5-cache/app-emacs/Manifest.gz
index 4d1a12fda3d8..7b4592184f35 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/mu-cite-8.1_p201808232348 b/metadata/md5-cache/app-emacs/mu-cite-8.1_p202011031127
index 42819fbee232..37b1f9bfad86 100644
--- a/metadata/md5-cache/app-emacs/mu-cite-8.1_p201808232348
+++ b/metadata/md5-cache/app-emacs/mu-cite-8.1_p202011031127
@@ -1,8 +1,7 @@
-BDEPEND=>=app-editors/emacs-23.1:*
+BDEPEND=app-emacs/apel app-emacs/flim bbdb? ( app-emacs/bbdb ) >=app-editors/emacs-23.1:*
 DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=app-emacs/apel app-emacs/flim bbdb? ( app-emacs/bbdb )
 DESCRIPTION=Message citation utilities for emacsen
-EAPI=7
+EAPI=8
 HOMEPAGE=https://www.jpl.org/elips/mu/
 INHERIT=elisp
 IUSE=bbdb
@@ -10,6 +9,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
 RDEPEND=app-emacs/apel app-emacs/flim bbdb? ( app-emacs/bbdb ) >=app-editors/emacs-23.1:*
 SLOT=0
-SRC_URI=https://www.jpl.org/elips/mu/snapshots/mu-cite-201808232348.tar.gz
+SRC_URI=https://www.jpl.org/elips/mu/snapshots/mu-cite-202011031127.tar.gz
 _eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
-_md5_=50589a3d4fa464af68770f11e71966df
+_md5_=b745309ad62ed6d3693dab1fef19f4e0
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index f1e7c64936a8..3c3e8545a25f 100644
--- a/metadata/md5-cache/app-emulation/Manifest.gz
+++ b/metadata/md5-cache/app-emulation/Manifest.gz
diff --git a/metadata/md5-cache/app-emulation/virtualbox-7.0.6-r2 b/metadata/md5-cache/app-emulation/virtualbox-7.0.6-r2
new file mode 100644
index 000000000000..a83ca1966b6c
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/virtualbox-7.0.6-r2
@@ -0,0 +1,17 @@
+BDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) app-arch/tar >=dev-lang/yasm-0.6.2 dev-libs/libIDL dev-util/glslang >=dev-util/kbuild-0.1.9998.3127 sys-apps/which sys-devel/bin86 sys-libs/libcap sys-power/iasl virtual/pkgconfig doc? ( app-text/docbook-sgml-dtd:4.4 app-text/docbook-xsl-ns-stylesheets dev-texlive/texlive-basic dev-texlive/texlive-latex dev-texlive/texlive-latexrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-fontsrecommended dev-texlive/texlive-fontsextra dev-qt/qthelp:5 ) gui? ( dev-qt/linguist-tools:5 ) nls? ( dev-qt/linguist-tools:5 ) java? ( virtual/jdk:1.8 ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup
+DEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) acct-group/vboxusers ~app-emulation/virtualbox-modules-7.0.6 dev-libs/libtpms dev-libs/libxml2 dev-libs/openssl:0= media-libs/libpng:0= media-libs/libvpx:0= net-misc/curl sys-libs/zlib dbus? ( sys-apps/dbus ) gui? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 x11-libs/libX11 x11-libs/libXt opengl? ( dev-qt/qtopengl:5 ) ) lvm? ( sys-fs/lvm2 ) opengl? ( media-libs/libglvnd[X] media-libs/vulkan-loader x11-libs/libX11 x11-libs/libXt ) pam? ( sys-libs/pam ) sdl? ( media-libs/libsdl:0[X,video] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXt ) vboxwebsrv? ( net-libs/gsoap[-gnutls(-),debug?] ) vde? ( net-misc/vde ) vnc? ( >=net-libs/libvncserver-0.9.9 ) >=dev-libs/libxslt-1.1.19 virtual/libcrypt:= alsa? ( >=media-libs/alsa-lib-1.0.13 ) gui? ( x11-base/xorg-proto x11-libs/libxcb:= x11-libs/libXcursor x11-libs/libXext x11-libs/libXinerama x11-libs/libXmu x11-libs/libXrandr ) java? ( virtual/jdk:1.8 ) opengl? ( x11-base/xorg-proto x11-libs/libXcursor x11-libs/libXinerama x11-libs/libXmu x11-libs/libXrandr virtual/glu ) sdl? ( x11-libs/libXinerama ) pulseaudio? ( media-sound/pulseaudio ) udev? ( >=virtual/udev-171 ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=Family of powerful x86 virtualization products for enterprise and home use
+EAPI=8
+HOMEPAGE=https://www.virtualbox.org/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=desktop edo flag-o-matic java-pkg-opt-2 linux-info multilib optfeature pax-utils python-single-r1 tmpfiles toolchain-funcs udev xdg
+IUSE=alsa dbus debug doc dtrace +gui java lvm nls pam pch pulseaudio +opengl python +sdk +sdl +udev vboxwebsrv vde vnc java python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~amd64
+LICENSE=GPL-2+ GPL-3 LGPL-2.1 MIT dtrace? ( CDDL )
+RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) acct-group/vboxusers ~app-emulation/virtualbox-modules-7.0.6 dev-libs/libtpms dev-libs/libxml2 dev-libs/openssl:0= media-libs/libpng:0= media-libs/libvpx:0= net-misc/curl sys-libs/zlib dbus? ( sys-apps/dbus ) gui? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 x11-libs/libX11 x11-libs/libXt opengl? ( dev-qt/qtopengl:5 ) ) lvm? ( sys-fs/lvm2 ) opengl? ( media-libs/libglvnd[X] media-libs/vulkan-loader x11-libs/libX11 x11-libs/libXt ) pam? ( sys-libs/pam ) sdl? ( media-libs/libsdl:0[X,video] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXt ) vboxwebsrv? ( net-libs/gsoap[-gnutls(-),debug?] ) vde? ( net-misc/vde ) vnc? ( >=net-libs/libvncserver-0.9.9 ) gui? ( x11-libs/libxcb:= ) java? ( virtual/jre:1.8 ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
+REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java ) ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
+SLOT=0/7.0
+SRC_URI=https://download.virtualbox.org/virtualbox/7.0.6/VirtualBox-7.0.6.tar.bz2 https://gitweb.gentoo.org/proj/virtualbox-patches.git/snapshot/virtualbox-patches-6.1.36.tar.bz2 gui? ( !doc? ( https://dev.gentoo.org/~ceamac/app-emulation/virtualbox/virtualbox-help-7.0.6.tar.xz ) )
+_eclasses_=desktop	7eb20ad915a0a318176d51bc2508ff5c	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	69394e25812406faa1f90edaf4969395	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	linux-info	4b552625ebd741dfd2ac08637fd2436e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	udev	eec0bbab06977f1cfc5597269c1fa152	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=1d8d38d61b2f24558fde73c18bbc7030
diff --git a/metadata/md5-cache/app-portage/Manifest.gz b/metadata/md5-cache/app-portage/Manifest.gz
index ac8b029dd9da..ad3d32a7a582 100644
--- a/metadata/md5-cache/app-portage/Manifest.gz
+++ b/metadata/md5-cache/app-portage/Manifest.gz
diff --git a/metadata/md5-cache/app-portage/nattka-0.4 b/metadata/md5-cache/app-portage/nattka-0.4
deleted file mode 100644
index 2892b0535498..000000000000
--- a/metadata/md5-cache/app-portage/nattka-0.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-python/flit_core-3.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/vcrpy[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( >=dev-python/sphinx-5.3.0 ) test? ( dev-python/lxml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-util/pkgcheck[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-vcs/git sys-apps/pkgcore[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] depgraph-order? ( dev-python/networkx[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/pytest-7.1.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/flit_core-3.8.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A New Arch Tester Toolkit -- open-source stable-bot replacement
-EAPI=8
-HOMEPAGE=https://github.com/projg2/nattka/
-INHERIT=distutils-r1
-IUSE=depgraph-order doc test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
-LICENSE=BSD-2
-RDEPEND=dev-python/lxml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-util/pkgcheck[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-vcs/git sys-apps/pkgcore[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] depgraph-order? ( dev-python/networkx[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/projg2/nattka/archive/v0.4.tar.gz -> nattka-0.4.gh.tar.gz
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=e3f85b7da1d8530bb39a7fcafd4f3400
diff --git a/metadata/md5-cache/app-portage/nattka-0.4.1 b/metadata/md5-cache/app-portage/nattka-0.4.1
index 904a4f5f12e3..2f76a57653a3 100644
--- a/metadata/md5-cache/app-portage/nattka-0.4.1
+++ b/metadata/md5-cache/app-portage/nattka-0.4.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/projg2/nattka/ https://pypi.org/project/nattka/
 INHERIT=distutils-r1
 IUSE=depgraph-order doc test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=BSD-2
 RDEPEND=dev-python/lxml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-util/pkgcheck[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-vcs/git sys-apps/pkgcore[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] depgraph-order? ( dev-python/networkx[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/projg2/nattka/archive/v0.4.1.tar.gz -> nattka-0.4.1.gh.tar.gz
 _eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=abecabc23b7d0b8b302eacfa9886e29b
+_md5_=e555841972d966695027390d95e936d7
diff --git a/metadata/md5-cache/dev-cpp/Manifest.gz b/metadata/md5-cache/dev-cpp/Manifest.gz
index b0139e2e1f11..e02bca0052cf 100644
--- a/metadata/md5-cache/dev-cpp/Manifest.gz
+++ b/metadata/md5-cache/dev-cpp/Manifest.gz
diff --git a/metadata/md5-cache/dev-cpp/msgpack-cxx-5.0.0 b/metadata/md5-cache/dev-cpp/msgpack-cxx-5.0.0
new file mode 100644
index 000000000000..9814cb190380
--- /dev/null
+++ b/metadata/md5-cache/dev-cpp/msgpack-cxx-5.0.0
@@ -0,0 +1,17 @@
+BDEPEND=doc? ( app-doc/doxygen[dot] ) test? ( sys-libs/zlib ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=boost? ( dev-libs/boost[context] )
+DESCRIPTION=MessagePack for C++
+EAPI=8
+HOMEPAGE=https://msgpack.org/ https://github.com/msgpack/msgpack-c/
+INHERIT=cmake
+IUSE=+boost doc examples test
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux ~x64-macos
+LICENSE=Boost-1.0
+RDEPEND=boost? ( dev-libs/boost[context] )
+REQUIRED_USE=test? ( boost )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/msgpack/msgpack-c/releases/download/cpp-5.0.0/msgpack-cxx-5.0.0.tar.gz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=b868a6d57bdf138e60bc88d39324ad4d
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index b70f67060582..94a4952ee353 100644
--- a/metadata/md5-cache/dev-libs/Manifest.gz
+++ b/metadata/md5-cache/dev-libs/Manifest.gz
diff --git a/metadata/md5-cache/dev-libs/flatbuffers-23.1.21 b/metadata/md5-cache/dev-libs/flatbuffers-23.1.21
index 136df93438ad..315f6794f36f 100644
--- a/metadata/md5-cache/dev-libs/flatbuffers-23.1.21
+++ b/metadata/md5-cache/dev-libs/flatbuffers-23.1.21
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://google.github.io/flatbuffers/ https://github.com/google/flatbuffers/
 INHERIT=cmake
 IUSE=static-libs test
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~riscv x86
 LICENSE=Apache-2.0
 RESTRICT=!test? ( test )
 SLOT=0/23.1.21
 SRC_URI=https://github.com/google/flatbuffers/archive/v23.1.21.tar.gz -> flatbuffers-23.1.21.gh.tar.gz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=86a5b5e16d8bb554758c07cfd0df3f5f
+_md5_=1f25aa57a3e5467e225d73741267293e
diff --git a/metadata/md5-cache/dev-libs/libretls-3.7.0 b/metadata/md5-cache/dev-libs/libretls-3.7.0
index 151c4b77a82d..645c2998570b 100644
--- a/metadata/md5-cache/dev-libs/libretls-3.7.0
+++ b/metadata/md5-cache/dev-libs/libretls-3.7.0
@@ -4,9 +4,9 @@ DEPEND=dev-libs/openssl:=
 DESCRIPTION=Port of libtls from LibreSSL to OpenSSL
 EAPI=8
 HOMEPAGE=https://git.causal.agency/libretls/about/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=ISC
 RDEPEND=dev-libs/openssl:=
 SLOT=0/26
 SRC_URI=https://causal.agency/libretls/libretls-3.7.0.tar.gz
-_md5_=8e66becda009fee3732e427eea66748d
+_md5_=e256f862f7bafba09deecbbd71880aab
diff --git a/metadata/md5-cache/dev-libs/msgpack-5.0.0 b/metadata/md5-cache/dev-libs/msgpack-5.0.0
new file mode 100644
index 000000000000..8540dc988cde
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/msgpack-5.0.0
@@ -0,0 +1,14 @@
+BDEPEND=doc? ( app-doc/doxygen[dot] ) test? ( dev-cpp/gtest[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=MessagePack is a binary-based efficient data interchange format
+EAPI=8
+HOMEPAGE=https://msgpack.org/ https://github.com/msgpack/msgpack-c/
+INHERIT=cmake-multilib
+IUSE=doc examples test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux ~x64-macos
+LICENSE=Boost-1.0
+RESTRICT=!test? ( test )
+SLOT=0/2
+SRC_URI=https://github.com/msgpack/msgpack-c/releases/download/c-5.0.0/msgpack-c-5.0.0.tar.gz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=3bcfdb2e72f74397dcec95bcca7a834a
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 2d64add97a7a..5c36ec8141b4 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/bitarray-2.6.2 b/metadata/md5-cache/dev-python/bitarray-2.6.2
index be81f61cf275..362c3b42f7d7 100644
--- a/metadata/md5-cache/dev-python/bitarray-2.6.2
+++ b/metadata/md5-cache/dev-python/bitarray-2.6.2
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/ilanschnell/bitarray/ https://pypi.org/project/bitarray/
 INHERIT=distutils-r1
 IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=PSF-2
 RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=mirror://pypi/b/bitarray/bitarray-2.6.2.tar.gz
 _eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=98d7de83844bb13d455c3ac8a5ce5195
+_md5_=29c463cbe9a4d6e9347aeb5fb21dcd1e
diff --git a/metadata/md5-cache/dev-python/cchardet-2.1.7-r1 b/metadata/md5-cache/dev-python/cchardet-2.1.7-r1
index 99d9449c3dbd..d8ef54361aeb 100644
--- a/metadata/md5-cache/dev-python/cchardet-2.1.7-r1
+++ b/metadata/md5-cache/dev-python/cchardet-2.1.7-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/PyYoshi/cChardet https://pypi.org/project/cchardet/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm ~x86
 LICENSE=MPL-1.1
 RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/cchardet/cchardet-2.1.7.tar.gz
 _eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=29e66bae792af4d28fd16fd904d3f96e
+_md5_=20c308a6fab5c639d360f12947163588
diff --git a/metadata/md5-cache/dev-python/cryptography-39.0.0 b/metadata/md5-cache/dev-python/cryptography-39.0.0
index 02ff9d599c22..5b70d25e68c4 100644
--- a/metadata/md5-cache/dev-python/cryptography-39.0.0
+++ b/metadata/md5-cache/dev-python/cryptography-39.0.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/pyca/cryptography/ https://pypi.org/project/cryptography/
 INHERIT=cargo distutils-r1 multiprocessing
 IUSE=test debug python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=|| ( Apache-2.0 BSD ) PSF-2 Apache-2.0 BSD-2 BSD MIT Unicode-DFS-2016
 RDEPEND=>=dev-libs/openssl-1.0.2o-r6:0= python_targets_python3_9? ( >=dev-python/cffi-1.8:=[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-python/cffi-1.8:=[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( >=dev-python/cffi-1.8:=[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0=[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11[threads(+)] )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/cryptography/cryptography-39.0.0.tar.gz https://crates.io/api/v1/crates/Inflector/0.11.4/download -> Inflector-0.11.4.crate https://crates.io/api/v1/crates/aliasable/0.1.3/download -> aliasable-0.1.3.crate https://crates.io/api/v1/crates/android_system_properties/0.1.5/download -> android_system_properties-0.1.5.crate https://crates.io/api/v1/crates/asn1/0.13.0/download -> asn1-0.13.0.crate https://crates.io/api/v1/crates/asn1_derive/0.13.0/download -> asn1_derive-0.13.0.crate https://crates.io/api/v1/crates/autocfg/1.1.0/download -> autocfg-1.1.0.crate https://crates.io/api/v1/crates/base64/0.13.1/download -> base64-0.13.1.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/bumpalo/3.10.0/download -> bumpalo-3.10.0.crate https://crates.io/api/v1/crates/cc/1.0.78/download -> cc-1.0.78.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/chrono/0.4.23/download -> chrono-0.4.23.crate https://crates.io/api/v1/crates/codespan-reporting/0.11.1/download -> codespan-reporting-0.11.1.crate https://crates.io/api/v1/crates/core-foundation-sys/0.8.3/download -> core-foundation-sys-0.8.3.crate https://crates.io/api/v1/crates/cxx/1.0.85/download -> cxx-1.0.85.crate https://crates.io/api/v1/crates/cxx-build/1.0.85/download -> cxx-build-1.0.85.crate https://crates.io/api/v1/crates/cxxbridge-flags/1.0.85/download -> cxxbridge-flags-1.0.85.crate https://crates.io/api/v1/crates/cxxbridge-macro/1.0.85/download -> cxxbridge-macro-1.0.85.crate https://crates.io/api/v1/crates/iana-time-zone/0.1.53/download -> iana-time-zone-0.1.53.crate https://crates.io/api/v1/crates/iana-time-zone-haiku/0.1.1/download -> iana-time-zone-haiku-0.1.1.crate https://crates.io/api/v1/crates/indoc/0.3.6/download -> indoc-0.3.6.crate https://crates.io/api/v1/crates/indoc-impl/0.3.6/download -> indoc-impl-0.3.6.crate https://crates.io/api/v1/crates/instant/0.1.12/download -> instant-0.1.12.crate https://crates.io/api/v1/crates/js-sys/0.3.60/download -> js-sys-0.3.60.crate https://crates.io/api/v1/crates/libc/0.2.139/download -> libc-0.2.139.crate https://crates.io/api/v1/crates/link-cplusplus/1.0.8/download -> link-cplusplus-1.0.8.crate https://crates.io/api/v1/crates/lock_api/0.4.9/download -> lock_api-0.4.9.crate https://crates.io/api/v1/crates/log/0.4.17/download -> log-0.4.17.crate https://crates.io/api/v1/crates/num-integer/0.1.45/download -> num-integer-0.1.45.crate https://crates.io/api/v1/crates/num-traits/0.2.15/download -> num-traits-0.2.15.crate https://crates.io/api/v1/crates/once_cell/1.14.0/download -> once_cell-1.14.0.crate https://crates.io/api/v1/crates/ouroboros/0.15.5/download -> ouroboros-0.15.5.crate https://crates.io/api/v1/crates/ouroboros_macro/0.15.5/download -> ouroboros_macro-0.15.5.crate https://crates.io/api/v1/crates/parking_lot/0.11.2/download -> parking_lot-0.11.2.crate https://crates.io/api/v1/crates/parking_lot_core/0.8.6/download -> parking_lot_core-0.8.6.crate https://crates.io/api/v1/crates/paste/0.1.18/download -> paste-0.1.18.crate https://crates.io/api/v1/crates/paste-impl/0.1.18/download -> paste-impl-0.1.18.crate https://crates.io/api/v1/crates/pem/1.1.0/download -> pem-1.1.0.crate https://crates.io/api/v1/crates/proc-macro-error/1.0.4/download -> proc-macro-error-1.0.4.crate https://crates.io/api/v1/crates/proc-macro-error-attr/1.0.4/download -> proc-macro-error-attr-1.0.4.crate https://crates.io/api/v1/crates/proc-macro-hack/0.5.20+deprecated/download -> proc-macro-hack-0.5.20+deprecated.crate https://crates.io/api/v1/crates/proc-macro2/1.0.49/download -> proc-macro2-1.0.49.crate https://crates.io/api/v1/crates/pyo3/0.15.2/download -> pyo3-0.15.2.crate https://crates.io/api/v1/crates/pyo3-build-config/0.15.2/download -> pyo3-build-config-0.15.2.crate https://crates.io/api/v1/crates/pyo3-macros/0.15.2/download -> pyo3-macros-0.15.2.crate https://crates.io/api/v1/crates/pyo3-macros-backend/0.15.2/download -> pyo3-macros-backend-0.15.2.crate https://crates.io/api/v1/crates/quote/1.0.23/download -> quote-1.0.23.crate https://crates.io/api/v1/crates/redox_syscall/0.2.16/download -> redox_syscall-0.2.16.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/scratch/1.0.3/download -> scratch-1.0.3.crate https://crates.io/api/v1/crates/smallvec/1.10.0/download -> smallvec-1.10.0.crate https://crates.io/api/v1/crates/syn/1.0.107/download -> syn-1.0.107.crate https://crates.io/api/v1/crates/termcolor/1.1.3/download -> termcolor-1.1.3.crate https://crates.io/api/v1/crates/unicode-ident/1.0.6/download -> unicode-ident-1.0.6.crate https://crates.io/api/v1/crates/unicode-width/0.1.10/download -> unicode-width-0.1.10.crate https://crates.io/api/v1/crates/unindent/0.1.11/download -> unindent-0.1.11.crate https://crates.io/api/v1/crates/version_check/0.9.4/download -> version_check-0.9.4.crate https://crates.io/api/v1/crates/wasm-bindgen/0.2.83/download -> wasm-bindgen-0.2.83.crate https://crates.io/api/v1/crates/wasm-bindgen-backend/0.2.83/download -> wasm-bindgen-backend-0.2.83.crate https://crates.io/api/v1/crates/wasm-bindgen-macro/0.2.83/download -> wasm-bindgen-macro-0.2.83.crate https://crates.io/api/v1/crates/wasm-bindgen-macro-support/0.2.83/download -> wasm-bindgen-macro-support-0.2.83.crate https://crates.io/api/v1/crates/wasm-bindgen-shared/0.2.83/download -> wasm-bindgen-shared-0.2.83.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate test? ( mirror://pypi/c/cryptography_vectors/cryptography_vectors-39.0.0.tar.gz )
 _eclasses_=cargo	73ed573e1525a108d236a0dffb3a68fb	distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=e9c5b5360ba2957fb439bc1b797b9de3
+_md5_=88d9fec0454c7174b772bcf64ceb0450
diff --git a/metadata/md5-cache/dev-python/flatbuffers-23.1.21 b/metadata/md5-cache/dev-python/flatbuffers-23.1.21
index 723f3593196c..1633b5d781b9 100644
--- a/metadata/md5-cache/dev-python/flatbuffers-23.1.21
+++ b/metadata/md5-cache/dev-python/flatbuffers-23.1.21
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/google/flatbuffers/ https://pypi.org/project/flatbuffers/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+KEYWORDS=amd64 arm arm64 ~riscv x86
 LICENSE=Apache-2.0
 RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/flatbuffers/archive/v23.1.21.tar.gz -> flatbuffers-23.1.21.gh.tar.gz
 _eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=afff51af859cf7cdd622bbbb653ed30a
+_md5_=ceb8f7c94860c7a0ca85234a4e2a47c5
diff --git a/metadata/md5-cache/dev-python/importlib_metadata-5.1.0 b/metadata/md5-cache/dev-python/importlib_metadata-5.1.0
deleted file mode 100644
index a41363d107a1..000000000000
--- a/metadata/md5-cache/dev-python/importlib_metadata-5.1.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyfakefs[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/zipp[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/flit_core-3.8.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Read metadata from Python packages
-EAPI=7
-HOMEPAGE=https://github.com/python/importlib_metadata/ https://pypi.org/project/importlib-metadata/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-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 ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=dev-python/zipp[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/i/importlib_metadata/importlib_metadata-5.1.0.tar.gz
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=53157e4770212c66abeef8397b7ecdfe
diff --git a/metadata/md5-cache/dev-python/importlib_metadata-5.2.0 b/metadata/md5-cache/dev-python/importlib_metadata-5.2.0
deleted file mode 100644
index 523bebf666f2..000000000000
--- a/metadata/md5-cache/dev-python/importlib_metadata-5.2.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyfakefs[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/zipp[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/flit_core-3.8.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Read metadata from Python packages
-EAPI=7
-HOMEPAGE=https://github.com/python/importlib_metadata/ https://pypi.org/project/importlib-metadata/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-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 ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=dev-python/zipp[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/i/importlib_metadata/importlib_metadata-5.2.0.tar.gz
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=f0e5d5bcf9bb4b6ce018b190df080668
diff --git a/metadata/md5-cache/dev-python/importlib_metadata-6.0.0 b/metadata/md5-cache/dev-python/importlib_metadata-6.0.0
index 41f38cc52924..9ee538732499 100644
--- a/metadata/md5-cache/dev-python/importlib_metadata-6.0.0
+++ b/metadata/md5-cache/dev-python/importlib_metadata-6.0.0
@@ -5,7 +5,7 @@ EAPI=7
 HOMEPAGE=https://github.com/python/importlib_metadata/ https://pypi.org/project/importlib-metadata/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-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 ~x64-solaris ~x86-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 ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=dev-python/zipp[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/importlib_metadata/importlib_metadata-6.0.0.tar.gz
 _eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=f0e5d5bcf9bb4b6ce018b190df080668
+_md5_=53157e4770212c66abeef8397b7ecdfe
diff --git a/metadata/md5-cache/dev-python/packaging-22.0 b/metadata/md5-cache/dev-python/packaging-22.0
deleted file mode 100644
index bf1bd1e4173b..000000000000
--- a/metadata/md5-cache/dev-python/packaging-22.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( >=dev-python/pyparsing-3.0.7-r1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/flit_core-3.8.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-python/pretend[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] )
-DESCRIPTION=Core utilities for Python packages
-EAPI=7
-HOMEPAGE=https://github.com/pypa/packaging/ https://pypi.org/project/packaging/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=|| ( Apache-2.0 BSD-2 )
-RDEPEND=>=dev-python/pyparsing-3.0.7-r1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/pypa/packaging/archive/22.0.tar.gz -> packaging-22.0.gh.tar.gz
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=f76ddeeeeee307e074f18667ab92c126
diff --git a/metadata/md5-cache/dev-python/phply-1.2.5 b/metadata/md5-cache/dev-python/phply-1.2.5
deleted file mode 100644
index bdd4af6f7c16..000000000000
--- a/metadata/md5-cache/dev-python/phply-1.2.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/ply[python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/ply[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nose-1.3.7_p20221026[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) >=dev-python/setuptools-65.5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Lexer and parser for PHP source implemented using PLY
-EAPI=7
-HOMEPAGE=https://github.com/viraptor/phply/ https://pypi.org/project/phply/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 arm64 x86
-LICENSE=BSD
-RDEPEND=dev-python/ply[python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/viraptor/phply/archive/1.2.5.tar.gz -> phply-1.2.5.gh.tar.gz
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=99ca112626cd6211aed1585e668ef38f
diff --git a/metadata/md5-cache/dev-python/phply-1.2.6 b/metadata/md5-cache/dev-python/phply-1.2.6
index 57ce3835de27..c8c8df6e3067 100644
--- a/metadata/md5-cache/dev-python/phply-1.2.6
+++ b/metadata/md5-cache/dev-python/phply-1.2.6
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/viraptor/phply/ https://pypi.org/project/phply/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 arm64 x86
 LICENSE=BSD
 RDEPEND=dev-python/ply[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/viraptor/phply/archive/1.2.6.tar.gz -> phply-1.2.6.gh.tar.gz
 _eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=15f05f44477a078aff8155025a4660a6
+_md5_=f5304c7d5ff81500ef11b562c71378b0
diff --git a/metadata/md5-cache/dev-python/pybind11-2.10.3 b/metadata/md5-cache/dev-python/pybind11-2.10.3
index 9883ea1625b7..cce3f71e0ea7 100644
--- a/metadata/md5-cache/dev-python/pybind11-2.10.3
+++ b/metadata/md5-cache/dev-python/pybind11-2.10.3
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pybind11.readthedocs.io/en/stable/ https://github.com/pybind/pybind11/ https://pypi.org/project/pybind11/
 INHERIT=cmake distutils-r1
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 sparc x86
 LICENSE=BSD
 RDEPEND=dev-cpp/eigen:3 python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pybind/pybind11/archive/v2.10.3.tar.gz -> pybind11-2.10.3.gh.tar.gz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	distutils-r1	dcd5f48510105eb95e550ab968147365	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=a674ec4b2bc8bf8c55980d7a36870e4c
+_md5_=84740ff370abbb7618f577ec593a0ce8
diff --git a/metadata/md5-cache/dev-python/pydantic-1.10.4 b/metadata/md5-cache/dev-python/pydantic-1.10.4
index 9e02c41bc743..246341ee1bec 100644
--- a/metadata/md5-cache/dev-python/pydantic-1.10.4
+++ b/metadata/md5-cache/dev-python/pydantic-1.10.4
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/pydantic/pydantic/ https://pypi.org/project/pydantic/
 INHERIT=distutils-r1
 IUSE=+native-extensions test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=>=dev-python/typing-extensions-4.1.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pydantic/pydantic/archive/v1.10.4.tar.gz -> pydantic-1.10.4.gh.tar.gz
 _eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=fdda6a4aeef704089f243bfc0565c6f0
+_md5_=846aed501c0e9f5fa48a15b30d9e275a
diff --git a/metadata/md5-cache/dev-python/pypy-7.3.11 b/metadata/md5-cache/dev-python/pypy-7.3.11
index f2b966cfdbad..af461e7b862e 100644
--- a/metadata/md5-cache/dev-python/pypy-7.3.11
+++ b/metadata/md5-cache/dev-python/pypy-7.3.11
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://www.pypy.org/
 INHERIT=pax-utils python-utils-r1
 IUSE=bzip2 full-stdlib gdbm +jit ncurses sqlite tk
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=|| ( >=dev-python/pypy-exe-bin-7.3.11:7.3.11 >=dev-python/pypy-exe-7.3.11:7.3.11[bzip2?,ncurses?] ) dev-libs/openssl:0= gdbm? ( sys-libs/gdbm:0= ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !<dev-python/pypy-bin-7.3.0:0
 RESTRICT=!full-stdlib? ( test )
 SLOT=0/73
 SRC_URI=https://buildbot.pypy.org/pypy/pypy2.7-v7.3.11-src.tar.bz2 https://dev.gentoo.org/~mgorny/dist/python/pypy2.7-gentoo-patches-7.3.11.tar.xz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=523bb7ef335f6667450872c238c4507c
+_md5_=24e796e7162368f8c9360574b6799449
diff --git a/metadata/md5-cache/dev-python/pypy-exe-7.3.11 b/metadata/md5-cache/dev-python/pypy-exe-7.3.11
index 620f3776a5d1..d5145bb6bf59 100644
--- a/metadata/md5-cache/dev-python/pypy-exe-7.3.11
+++ b/metadata/md5-cache/dev-python/pypy-exe-7.3.11
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.pypy.org/
 INHERIT=check-reqs pax-utils toolchain-funcs
 IUSE=bzip2 +jit low-memory ncurses cpu_flags_x86_sse2
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=>=sys-libs/zlib-1.1.3:0= dev-libs/libffi:0= virtual/libintl:0= dev-libs/expat:0= bzip2? ( app-arch/bzip2:0= ) ncurses? ( sys-libs/ncurses:0= ) !dev-python/pypy-exe-bin:7.3.11
 SLOT=7.3.11
 SRC_URI=https://buildbot.pypy.org/pypy/pypy2.7-v7.3.11-src.tar.bz2 https://dev.gentoo.org/~mgorny/dist/python/pypy2.7-gentoo-patches-7.3.11.tar.xz
 _eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=db4dff6beea178615c495689d50a1a54
+_md5_=ccdfef48452735bfba5e3432143945f5
diff --git a/metadata/md5-cache/dev-python/pypy-exe-bin-7.3.11 b/metadata/md5-cache/dev-python/pypy-exe-bin-7.3.11
index 6e0b554f035c..d221fd9b6a56 100644
--- a/metadata/md5-cache/dev-python/pypy-exe-bin-7.3.11
+++ b/metadata/md5-cache/dev-python/pypy-exe-bin-7.3.11
@@ -3,10 +3,10 @@ DESCRIPTION=PyPy executable (pre-built version)
 EAPI=8
 HOMEPAGE=https://www.pypy.org/
 INHERIT=pax-utils unpacker
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=MIT
 RDEPEND=app-arch/bzip2:0/1 dev-libs/expat:0/0 dev-libs/libffi:0/8 sys-libs/ncurses:0/6 >=sys-libs/zlib-1.1.3:0/1 virtual/libintl:0/0 elibc_glibc? ( sys-devel/gcc >=sys-libs/glibc-2.35 ) !dev-python/pypy-exe:7.3.11
 SLOT=7.3.11
 SRC_URI=elibc_glibc? ( amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/pypy/dev-python/pypy-exe/pypy-exe-7.3.11-1.gpkg.tar -> pypy-exe-7.3.11-1.amd64.gpkg.tar ) arm64? ( https://dev.gentoo.org/~mgorny/binpkg/arm64/pypy/dev-python/pypy-exe/pypy-exe-7.3.11-1.gpkg.tar -> pypy-exe-7.3.11-1.arm64.gpkg.tar ) ppc64? ( https://dev.gentoo.org/~mgorny/binpkg/ppc64le/pypy/dev-python/pypy-exe/pypy-exe-7.3.11-1.gpkg.tar -> pypy-exe-7.3.11-1.ppc64le.gpkg.tar ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/pypy/dev-python/pypy-exe/pypy-exe-7.3.11-1.gpkg.tar -> pypy-exe-7.3.11-1.x86.gpkg.tar ) ) elibc_musl? ( amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64-musl/pypy/dev-python/pypy-exe/pypy-exe-7.3.11-1.gpkg.tar -> pypy-exe-7.3.11-1.amd64-musl.gpkg.tar ) arm64? ( https://dev.gentoo.org/~mgorny/binpkg/arm64-musl/pypy/dev-python/pypy-exe/pypy-exe-7.3.11-1.gpkg.tar -> pypy-exe-7.3.11-1.arm64-musl.gpkg.tar ) ppc64? ( https://dev.gentoo.org/~mgorny/binpkg/ppc64le-musl/pypy/dev-python/pypy-exe/pypy-exe-7.3.11-1.gpkg.tar -> pypy-exe-7.3.11-1.ppc64le-musl.gpkg.tar ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86-musl/pypy/dev-python/pypy-exe/pypy-exe-7.3.11-1.gpkg.tar -> pypy-exe-7.3.11-1.x86-musl.gpkg.tar ) )
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	unpacker	fdd15d854bf5e84f82d35524ab8ca6ba
-_md5_=aa771dd3eff80549d3779e7010639a41
+_md5_=5722f197f89e25a48cc63d6bd236e9c7
diff --git a/metadata/md5-cache/dev-python/pyspnego-0.6.3 b/metadata/md5-cache/dev-python/pyspnego-0.6.3
deleted file mode 100644
index c6c50a83123a..000000000000
--- a/metadata/md5-cache/dev-python/pyspnego-0.6.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/cython[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/gssapi[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/krb5-0.3.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-mock[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ruamel-yaml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/cryptography[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=Library to handle SPNEGO and CredSSP authentication
-EAPI=8
-HOMEPAGE=https://github.com/jborean93/pyspnego/ https://pypi.org/project/pyspnego/
-INHERIT=distutils-r1 optfeature
-IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm arm64 ~riscv x86
-LICENSE=MIT
-RDEPEND=dev-python/cryptography[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/pyspnego/pyspnego-0.6.3.tar.gz
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=5a7a8a73391ac39194c552029737a86c
diff --git a/metadata/md5-cache/dev-python/pyspnego-0.7.0 b/metadata/md5-cache/dev-python/pyspnego-0.7.0
index b24be0ea32f2..2ba487a1853c 100644
--- a/metadata/md5-cache/dev-python/pyspnego-0.7.0
+++ b/metadata/md5-cache/dev-python/pyspnego-0.7.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/jborean93/pyspnego/ https://pypi.org/project/pyspnego/
 INHERIT=distutils-r1 optfeature
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~riscv x86
 LICENSE=MIT
 RDEPEND=dev-python/cryptography[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyspnego/pyspnego-0.7.0.tar.gz
 _eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=e522c0d3487048d1677f680628bf4dfa
+_md5_=5a7a8a73391ac39194c552029737a86c
diff --git a/metadata/md5-cache/dev-python/pytest-plus-0.4.0 b/metadata/md5-cache/dev-python/pytest-plus-0.4.0
index 76c50fc4e7a8..f3373b1716cc 100644
--- a/metadata/md5-cache/dev-python/pytest-plus-0.4.0
+++ b/metadata/md5-cache/dev-python/pytest-plus-0.4.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/pytest-dev/pytest-plus/ https://pypi.org/project/pytest-plus/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~riscv
+KEYWORDS=amd64 ~riscv
 LICENSE=MIT
 RDEPEND=>=dev-python/pytest-6.0.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-plus/pytest-plus-0.4.0.tar.gz
 _eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=2b4e25494b67e54277a4ec226c601fb2
+_md5_=0748bb4b4156263807c8903748cc97c8
diff --git a/metadata/md5-cache/dev-python/pytest-skip-markers-1.4.0 b/metadata/md5-cache/dev-python/pytest-skip-markers-1.4.0
index 95079b01f988..2c69221b3405 100644
--- a/metadata/md5-cache/dev-python/pytest-skip-markers-1.4.0
+++ b/metadata/md5-cache/dev-python/pytest-skip-markers-1.4.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pytest-skip-markers.readthedocs.io/en/latest/ https://github.com/saltstack/pytest-skip-markers
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~riscv x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pytest-7.1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/attrs[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/distro[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/saltstack/pytest-skip-markers/archive/1.4.0.tar.gz -> pytest-skip-markers-1.4.0.gh.tar.gz
 _eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=87d8d240ac96fb38a5cf1e2c136e2153
+_md5_=da38f25cc421e668d76b9c439ac6dcf8
diff --git a/metadata/md5-cache/dev-python/python-xlib-0.32-r1 b/metadata/md5-cache/dev-python/python-xlib-0.32-r1
deleted file mode 100644
index 1deaf3005b43..000000000000
--- a/metadata/md5-cache/dev-python/python-xlib-0.32-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/six[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools_scm[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] doc? ( sys-apps/texinfo ) test? ( dev-python/mock[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/six[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/unittest-or-fail[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A fully functional X client library for Python, written in Python
-EAPI=8
-HOMEPAGE=https://github.com/python-xlib/python-xlib/ https://pypi.org/project/python-xlib/
-INHERIT=distutils-r1 virtualx
-IUSE=doc test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 test
-KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 ~riscv x86
-LICENSE=LGPL-2+
-RDEPEND=dev-python/six[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/python-xlib/python-xlib/releases/download/0.32/python-xlib-0.32.tar.bz2
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=8a8f67af521c3fcd07aa453b60ed6b62
diff --git a/metadata/md5-cache/dev-python/python-xlib-0.33 b/metadata/md5-cache/dev-python/python-xlib-0.33
index 2f50e85b6491..63920229cfe3 100644
--- a/metadata/md5-cache/dev-python/python-xlib-0.33
+++ b/metadata/md5-cache/dev-python/python-xlib-0.33
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/python-xlib/python-xlib/ https://pypi.org/project/python-xlib/
 INHERIT=distutils-r1 virtualx
 IUSE=doc test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 ~riscv x86
 LICENSE=LGPL-2+
 RDEPEND=dev-python/six[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/python-xlib/python-xlib/releases/download/0.33/python-xlib-0.33.tar.bz2
 _eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=ed75355c0a1f80df600a51201c4144fa
+_md5_=eb25ad56d5eef629c1262425db180830
diff --git a/metadata/md5-cache/dev-python/python3-xapp-2.4.0-r1 b/metadata/md5-cache/dev-python/python3-xapp-2.4.0-r1
index d4abc4690f2a..329624bfa5dd 100644
--- a/metadata/md5-cache/dev-python/python3-xapp-2.4.0-r1
+++ b/metadata/md5-cache/dev-python/python3-xapp-2.4.0-r1
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/linuxmint/python3-xapp
 INHERIT=meson python-r1
 IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv x86
 LICENSE=LGPL-2+
 RDEPEND=>=x11-libs/xapp-2.4.1[introspection] python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) dev-python/psutil[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=https://github.com/linuxmint/python3-xapp/archive/2.4.0.tar.gz -> python3-xapp-2.4.0.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	1994a5aef5d4f5798b92f64d6f9a6003	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=7f3b279067f743576b3d48044e64e040
+_md5_=47c907ceda819c2993e03a3e5eb9e51d
diff --git a/metadata/md5-cache/dev-python/pytoolconfig-1.2.2-r1 b/metadata/md5-cache/dev-python/pytoolconfig-1.2.2-r1
deleted file mode 100644
index e39b973224c5..000000000000
--- a/metadata/md5-cache/dev-python/pytoolconfig-1.2.2-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-python/pdm-pep517-1.0.5[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( >=dev-python/sphinx-4.5.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tabulate-0.8.9[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/pytest-7.1.3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pdm-pep517-1.0.5[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python tool configuration
-EAPI=8
-HOMEPAGE=https://pypi.org/project/pytoolconfig/ https://github.com/bageljrkhanofemus/pytoolconfig/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=LGPL-3
-RDEPEND=dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/pytoolconfig/pytoolconfig-1.2.2.tar.gz
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=d09e2977de80b6ee58c4b7996310a49a
diff --git a/metadata/md5-cache/dev-python/pytoolconfig-1.2.4-r2 b/metadata/md5-cache/dev-python/pytoolconfig-1.2.4-r2
index 545207d55164..7585083b2b47 100644
--- a/metadata/md5-cache/dev-python/pytoolconfig-1.2.4-r2
+++ b/metadata/md5-cache/dev-python/pytoolconfig-1.2.4-r2
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/pytoolconfig/ https://github.com/bagel897/pytoolconfig/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=LGPL-3+
 RDEPEND=dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/platformdirs[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytoolconfig/pytoolconfig-1.2.4.tar.gz
 _eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=0a752c22518e5d009eaa2ff76dd95080
+_md5_=31f098656557a1142d4448a26241d420
diff --git a/metadata/md5-cache/dev-python/qtconsole-5.4.0 b/metadata/md5-cache/dev-python/qtconsole-5.4.0
index f3f3a054b771..95a5aa5a1f92 100644
--- a/metadata/md5-cache/dev-python/qtconsole-5.4.0
+++ b/metadata/md5-cache/dev-python/qtconsole-5.4.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://jupyter.org/ https://github.com/jupyter/qtconsole/ https://pypi.org/project/qtconsole/
 INHERIT=distutils-r1
 IUSE=doc test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~x86
+KEYWORDS=amd64 ~arm arm64 ~loong x86
 LICENSE=BSD
 PDEPEND=dev-python/ipython[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 RDEPEND=>=dev-python/ipykernel-4.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ipython_genutils[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jupyter_core[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter_client-4.1.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pygments[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyzmq-17.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/traitlets-5.2.2_p1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/QtPy-2.0.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,gui,printsupport,svg] python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11[threads(+)] )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/q/qtconsole/qtconsole-5.4.0.tar.gz
 _eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=ff0dc79f4bb88c29b810be1b8e14a190
+_md5_=bb7edbd8ffa51d5f72b5acfc18554f86
diff --git a/metadata/md5-cache/dev-python/snakeoil-0.10.5 b/metadata/md5-cache/dev-python/snakeoil-0.10.5
index 10b30563d4c6..b46e2831eda9 100644
--- a/metadata/md5-cache/dev-python/snakeoil-0.10.5
+++ b/metadata/md5-cache/dev-python/snakeoil-0.10.5
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/snakeoil/snakeoil-0.10.5.tar.gz
 _eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=205ba59fa552030c027d761e2e6ae28a
+_md5_=657f57709deb54aadadce40dc2296768
diff --git a/metadata/md5-cache/dev-python/snakeoil-9999 b/metadata/md5-cache/dev-python/snakeoil-9999
index b3a6b948aed7..91d782c63591 100644
--- a/metadata/md5-cache/dev-python/snakeoil-9999
+++ b/metadata/md5-cache/dev-python/snakeoil-9999
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	git-r3	2347f8fe2d392b2a091191f94be37e6f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=3d830f302e2d8325db1929458e05df4f
+_md5_=3ff6e40746c69b26afbd0695b2019692
diff --git a/metadata/md5-cache/dev-python/translate-toolkit-3.8.3 b/metadata/md5-cache/dev-python/translate-toolkit-3.8.3
index 7699991f6814..f8af4da902c1 100644
--- a/metadata/md5-cache/dev-python/translate-toolkit-3.8.3
+++ b/metadata/md5-cache/dev-python/translate-toolkit-3.8.3
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/translate/translate/ https://pypi.org/project/translate-toolkit/
 INHERIT=distutils-r1
 IUSE=+html +ical +ini +subtitles +yaml test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 arm64 x86
 LICENSE=GPL-2
 RDEPEND=app-text/iso-codes >=dev-python/chardet-3.0.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/cheroot[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/Levenshtein-0.12.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/lxml-4.3.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pycountry-19.8.18[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyparsing-3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ruamel-yaml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] sys-devel/gettext html? ( dev-python/utidylib[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ical? ( dev-python/vobject[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ini? ( >=dev-python/iniparse-0.5[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) subtitles? ( media-video/gaupol[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) yaml? ( dev-python/pyyaml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11[sqlite] )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/translate/translate/archive/3.8.3.tar.gz -> translate-3.8.3.gh.tar.gz
 _eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=41251925de77727bd484a653e8511b84
+_md5_=a80c3046afd6a0793d97a7c1101c43f4
diff --git a/metadata/md5-cache/dev-python/xlsxwriter-3.0.3 b/metadata/md5-cache/dev-python/xlsxwriter-3.0.3
deleted file mode 100644
index f559597be692..000000000000
--- a/metadata/md5-cache/dev-python/xlsxwriter-3.0.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/pytest-7.1.3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python module for creating Excel XLSX files
-EAPI=8
-HOMEPAGE=https://github.com/jmcnamara/XlsxWriter/ https://pypi.org/project/XlsxWriter/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/jmcnamara/XlsxWriter/archive/RELEASE_3.0.3.tar.gz -> XlsxWriter-RELEASE_3.0.3.tar.gz
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=b7c2e5230c11820151972ad26ca12d47
diff --git a/metadata/md5-cache/dev-python/xlsxwriter-3.0.4 b/metadata/md5-cache/dev-python/xlsxwriter-3.0.4
deleted file mode 100644
index 728de4df6d9d..000000000000
--- a/metadata/md5-cache/dev-python/xlsxwriter-3.0.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/pytest-7.1.3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python module for creating Excel XLSX files
-EAPI=8
-HOMEPAGE=https://github.com/jmcnamara/XlsxWriter/ https://pypi.org/project/XlsxWriter/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/jmcnamara/XlsxWriter/archive/RELEASE_3.0.4.tar.gz -> XlsxWriter-RELEASE_3.0.4.gh.tar.gz
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=2686906824758430e7f988dc989d757c
diff --git a/metadata/md5-cache/dev-python/xlsxwriter-3.0.5 b/metadata/md5-cache/dev-python/xlsxwriter-3.0.5
deleted file mode 100644
index 94c2db69226e..000000000000
--- a/metadata/md5-cache/dev-python/xlsxwriter-3.0.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/pytest-7.1.3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python module for creating Excel XLSX files
-EAPI=8
-HOMEPAGE=https://github.com/jmcnamara/XlsxWriter/ https://pypi.org/project/XlsxWriter/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/jmcnamara/XlsxWriter/archive/RELEASE_3.0.5.tar.gz -> XlsxWriter-RELEASE_3.0.5.gh.tar.gz
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=2686906824758430e7f988dc989d757c
diff --git a/metadata/md5-cache/dev-python/xlsxwriter-3.0.6 b/metadata/md5-cache/dev-python/xlsxwriter-3.0.6
deleted file mode 100644
index 698e69e2aefb..000000000000
--- a/metadata/md5-cache/dev-python/xlsxwriter-3.0.6
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/pytest-7.1.3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python module for creating Excel XLSX files
-EAPI=8
-HOMEPAGE=https://github.com/jmcnamara/XlsxWriter/ https://pypi.org/project/XlsxWriter/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/jmcnamara/XlsxWriter/archive/RELEASE_3.0.6.tar.gz -> XlsxWriter-RELEASE_3.0.6.gh.tar.gz
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=2686906824758430e7f988dc989d757c
diff --git a/metadata/md5-cache/dev-python/xlsxwriter-3.0.7 b/metadata/md5-cache/dev-python/xlsxwriter-3.0.7
index d994155d9be9..11e5fec00247 100644
--- a/metadata/md5-cache/dev-python/xlsxwriter-3.0.7
+++ b/metadata/md5-cache/dev-python/xlsxwriter-3.0.7
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/jmcnamara/XlsxWriter/ https://pypi.org/project/XlsxWriter/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jmcnamara/XlsxWriter/archive/RELEASE_3.0.7.tar.gz -> XlsxWriter-RELEASE_3.0.7.gh.tar.gz
 _eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=2686906824758430e7f988dc989d757c
+_md5_=73d05a1a0b799728b3f698104cd6aecd
diff --git a/metadata/md5-cache/dev-python/zope-schema-6.2.1 b/metadata/md5-cache/dev-python/zope-schema-6.2.1
deleted file mode 100644
index 7d3daf2446e2..000000000000
--- a/metadata/md5-cache/dev-python/zope-schema-6.2.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/zope-i18nmessageid[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/zope-testing[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/zope-event[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/zope-interface-5.0.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !dev-python/namespace-zope dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Zope schema Architecture
-EAPI=8
-HOMEPAGE=https://pypi.org/project/zope.schema/ https://github.com/zopefoundation/zope.schema/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
-LICENSE=ZPL
-RDEPEND=dev-python/zope-event[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/zope-interface-5.0.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !dev-python/namespace-zope python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/z/zope.schema/zope.schema-6.2.1.tar.gz
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=69d3e1bf05f149026fb0b4c150accde4
diff --git a/metadata/md5-cache/dev-python/zope-schema-7.0.0 b/metadata/md5-cache/dev-python/zope-schema-7.0.0
deleted file mode 100644
index e72fcb921b9a..000000000000
--- a/metadata/md5-cache/dev-python/zope-schema-7.0.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/zope-i18nmessageid[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/zope-testing[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/zope-event[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/zope-interface-5.0.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !dev-python/namespace-zope dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Zope schema Architecture
-EAPI=8
-HOMEPAGE=https://pypi.org/project/zope.schema/ https://github.com/zopefoundation/zope.schema/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=ZPL
-RDEPEND=dev-python/zope-event[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/zope-interface-5.0.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !dev-python/namespace-zope python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/z/zope.schema/zope.schema-7.0.0.tar.gz
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=bf3a7b2a19e7ee3e9c7f9e8960fc13c9
diff --git a/metadata/md5-cache/dev-python/zope-schema-7.0.1 b/metadata/md5-cache/dev-python/zope-schema-7.0.1
index d51b9d382234..2fc2972260dd 100644
--- a/metadata/md5-cache/dev-python/zope-schema-7.0.1
+++ b/metadata/md5-cache/dev-python/zope-schema-7.0.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/zope.schema/ https://github.com/zopefoundation/zope.schema/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
 LICENSE=ZPL
 RDEPEND=dev-python/zope-event[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/zope-interface-5.0.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !dev-python/namespace-zope python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/z/zope.schema/zope.schema-7.0.1.tar.gz
 _eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=bf3a7b2a19e7ee3e9c7f9e8960fc13c9
+_md5_=69d3e1bf05f149026fb0b4c150accde4
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 757cf6fe7358..4011e43852e0 100644
--- a/metadata/md5-cache/dev-util/Manifest.gz
+++ b/metadata/md5-cache/dev-util/Manifest.gz
diff --git a/metadata/md5-cache/dev-util/cvise-2.5.0-r1 b/metadata/md5-cache/dev-util/cvise-2.5.0-r1
deleted file mode 100644
index 46e4f6166fb1..000000000000
--- a/metadata/md5-cache/dev-util/cvise-2.5.0-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) sys-devel/flex test? ( python_single_target_python3_9? ( dev-python/pebble[python_targets_python3_9(-)] dev-python/pytest[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pebble[python_targets_python3_10(-)] dev-python/pytest[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pebble[python_targets_python3_11(-)] dev-python/pytest[python_targets_python3_11(-)] ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=|| ( sys-devel/clang:15 sys-devel/clang:14 sys-devel/clang:13 ) <sys-devel/clang-16:= !!sys-devel/llvm:0
-DESCRIPTION=Super-parallel Python port of the C-Reduce
-EAPI=8
-HOMEPAGE=https://github.com/marxin/cvise/
-INHERIT=cmake llvm python-single-r1
-IUSE=test python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=UoI-NCSA
-RDEPEND=|| ( sys-devel/clang:15 sys-devel/clang:14 sys-devel/clang:13 ) <sys-devel/clang-16:= python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) python_single_target_python3_9? ( dev-python/chardet[python_targets_python3_9(-)] dev-python/pebble[python_targets_python3_9(-)] dev-python/psutil[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/chardet[python_targets_python3_10(-)] dev-python/pebble[python_targets_python3_10(-)] dev-python/psutil[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/chardet[python_targets_python3_11(-)] dev-python/pebble[python_targets_python3_11(-)] dev-python/psutil[python_targets_python3_11(-)] ) dev-util/unifdef sys-devel/flex
-REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/marxin/cvise/archive/v2.5.0.tar.gz -> cvise-2.5.0.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=722c8e3fc0bef9c4c2aaa235e174d716
diff --git a/metadata/md5-cache/dev-util/cvise-2.6.0 b/metadata/md5-cache/dev-util/cvise-2.6.0
index 98013737de43..16792b3d35c9 100644
--- a/metadata/md5-cache/dev-util/cvise-2.6.0
+++ b/metadata/md5-cache/dev-util/cvise-2.6.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/marxin/cvise/
 INHERIT=cmake llvm python-single-r1
 IUSE=test python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~amd64 ~arm64 ~ppc ~x86
+KEYWORDS=amd64 ~arm64 ~ppc x86
 LICENSE=UoI-NCSA
 RDEPEND=|| ( sys-devel/clang:15 sys-devel/clang:14 sys-devel/clang:13 ) <sys-devel/clang-16:= python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) python_single_target_python3_9? ( dev-python/chardet[python_targets_python3_9(-)] dev-python/pebble[python_targets_python3_9(-)] dev-python/psutil[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/chardet[python_targets_python3_10(-)] dev-python/pebble[python_targets_python3_10(-)] dev-python/psutil[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/chardet[python_targets_python3_11(-)] dev-python/pebble[python_targets_python3_11(-)] dev-python/psutil[python_targets_python3_11(-)] ) dev-util/unifdef sys-devel/flex
 REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/marxin/cvise/archive/v2.6.0.tar.gz -> cvise-2.6.0.tar.gz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=9286fef0dc660fde5e5170f77ffc04e9
+_md5_=60afe8aea8bd98243e069b3505c817c6
diff --git a/metadata/md5-cache/dev-util/diffoscope-232 b/metadata/md5-cache/dev-util/diffoscope-234
index c7379efd552e..af8198846484 100644
--- a/metadata/md5-cache/dev-util/diffoscope-232
+++ b/metadata/md5-cache/dev-util/diffoscope-234
@@ -11,6 +11,6 @@ RDEPEND=dev-python/python-magic[python_targets_python3_9(-)?,python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/d/diffoscope/diffoscope-232.tar.gz
+SRC_URI=mirror://pypi/d/diffoscope/diffoscope-234.tar.gz
 _eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
 _md5_=9a76201a88b231727d763d6a9fe1f48d
diff --git a/metadata/md5-cache/dev-util/pkgcheck-0.10.19-r1 b/metadata/md5-cache/dev-util/pkgcheck-0.10.19-r1
index 34ac323525bc..ee06104a6e77 100644
--- a/metadata/md5-cache/dev-util/pkgcheck-0.10.19-r1
+++ b/metadata/md5-cache/dev-util/pkgcheck-0.10.19-r1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pkgcheck/pkgcheck-0.10.19.tar.gz
 _eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=028ff01c557abf22ed3f3be5bbb72629
+_md5_=67b8ebda5877e9a2482d31887050a01b
diff --git a/metadata/md5-cache/dev-util/pkgcheck-0.10.19-r2 b/metadata/md5-cache/dev-util/pkgcheck-0.10.19-r2
index 6e186db4b058..16e8122fe555 100644
--- a/metadata/md5-cache/dev-util/pkgcheck-0.10.19-r2
+++ b/metadata/md5-cache/dev-util/pkgcheck-0.10.19-r2
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pkgcheck/pkgcheck-0.10.19.tar.gz
 _eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=e9072b3b04342f4fefcea9b4b0d6320b
+_md5_=aba26b4c6070177210f20b87099d3ea5
diff --git a/metadata/md5-cache/dev-util/pkgcheck-0.10.20 b/metadata/md5-cache/dev-util/pkgcheck-0.10.20
index 27614c712ff3..37182fd5dcb9 100644
--- a/metadata/md5-cache/dev-util/pkgcheck-0.10.20
+++ b/metadata/md5-cache/dev-util/pkgcheck-0.10.20
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pkgcheck/pkgcheck-0.10.20.tar.gz
 _eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=835b8025e1f6cb0087287af4774cd7de
+_md5_=27d77f06452de4e315c08fb69ec561c8
diff --git a/metadata/md5-cache/dev-util/xfce4-dev-tools-4.18.0 b/metadata/md5-cache/dev-util/xfce4-dev-tools-4.18.0
index 872670763efe..e74e77be18b7 100644
--- a/metadata/md5-cache/dev-util/xfce4-dev-tools-4.18.0
+++ b/metadata/md5-cache/dev-util/xfce4-dev-tools-4.18.0
@@ -4,9 +4,9 @@ DEPEND=>=dev-libs/glib-2.66.0
 DESCRIPTION=A set of scripts and m4/autoconf macros that ease build system maintenance
 EAPI=8
 HOMEPAGE=https://docs.xfce.org/xfce/xfce4-dev-tools/start https://gitlab.xfce.org/xfce/xfce4-dev-tools/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris
+KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.66.0
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/xfce/xfce4-dev-tools/4.18/xfce4-dev-tools-4.18.0.tar.bz2
-_md5_=32287a561fc9b27932c58518adf448ee
+_md5_=bf0df449c9baa8b8394439927684307f
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index 89321e316960..fb1e4c411b3b 100644
--- a/metadata/md5-cache/media-gfx/Manifest.gz
+++ b/metadata/md5-cache/media-gfx/Manifest.gz
diff --git a/metadata/md5-cache/media-gfx/ristretto-0.12.4 b/metadata/md5-cache/media-gfx/ristretto-0.12.4
index 59e950d95fc6..6508a616adc9 100644
--- a/metadata/md5-cache/media-gfx/ristretto-0.12.4
+++ b/metadata/md5-cache/media-gfx/ristretto-0.12.4
@@ -5,10 +5,10 @@ DESCRIPTION=A fast and lightweight picture viewer for Xfce
 EAPI=8
 HOMEPAGE=https://docs.xfce.org/apps/ristretto/start
 INHERIT=xdg-utils
-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-2+
 RDEPEND=>=dev-libs/glib-2.56:2 media-libs/libexif:0= sys-apps/file x11-libs/cairo:0 >=x11-libs/gtk+-3.22:3 x11-libs/libX11:0= >=xfce-base/libxfce4ui-4.16:0= >=xfce-base/libxfce4util-4.16:0= >=xfce-base/xfconf-4.12.1:0=
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/apps/ristretto/0.12/ristretto-0.12.4.tar.bz2
 _eclasses_=xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=16d3661e619128866295025da9887ab8
+_md5_=2d56288feaf4415a4cb42772388ad0dc
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index 105c4ac4a8a2..1f2551fc3d82 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/strawberry-1.0.12 b/metadata/md5-cache/media-sound/strawberry-1.0.12
index 41491909970b..92eb85aac738 100644
--- a/metadata/md5-cache/media-sound/strawberry-1.0.12
+++ b/metadata/md5-cache/media-sound/strawberry-1.0.12
@@ -7,11 +7,11 @@ HOMEPAGE=https://www.strawberrymusicplayer.org/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=cmake flag-o-matic plocale xdg
 IUSE=cdda debug +gstreamer ipod moodbar mtp pulseaudio +udisks vlc
-KEYWORDS=~amd64 ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc64 x86
 LICENSE=GPL-3
 RDEPEND=dev-db/sqlite:= dev-libs/glib:2 dev-libs/protobuf:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5[sqlite] dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/alsa-lib media-libs/taglib x11-libs/libX11 cdda? ( dev-libs/libcdio:= ) gstreamer? ( media-libs/chromaprint:= media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) ipod? ( media-libs/libgpod ) moodbar? ( sci-libs/fftw:3.0 ) mtp? ( media-libs/libmtp ) pulseaudio? ( media-sound/pulseaudio ) vlc? ( media-video/vlc ) gstreamer? ( media-plugins/gst-plugins-meta:1.0 media-plugins/gst-plugins-soup:1.0 media-plugins/gst-plugins-taglib:1.0 ) mtp? ( gnome-base/gvfs[mtp] ) udisks? ( sys-fs/udisks:2 )
 REQUIRED_USE=cdda? ( gstreamer ) || ( gstreamer vlc )
 SLOT=0
 SRC_URI=https://github.com/strawberrymusicplayer/strawberry/releases/download/1.0.12/strawberry-1.0.12.tar.xz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	plocale	950fbaec7deeba41b5bcc0572cca99b9	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=e45a3cdfc5381b4cd1f9333250941c8f
+_md5_=67d44455aeb0eba15a25ff2629384905
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index 3df70439666e..a8eccb720f4b 100644
--- a/metadata/md5-cache/net-analyzer/Manifest.gz
+++ b/metadata/md5-cache/net-analyzer/Manifest.gz
diff --git a/metadata/md5-cache/net-analyzer/zabbix-5.0.31 b/metadata/md5-cache/net-analyzer/zabbix-5.0.31
new file mode 100644
index 000000000000..f14519fe0aad
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/zabbix-5.0.31
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig agent2? ( >=dev-lang/go-1.12 app-arch/unzip ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup
+DEPEND=curl? ( net-misc/curl ) gnutls? ( net-libs/gnutls:0= ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls:= net-nds/openldap:= ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c:= ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) openssl? ( dev-libs/openssl:=[-bindist(-)] ) oracle? ( dev-db/oracle-instantclient[odbc,sdk] ) postgres? ( dev-db/postgresql:* ) proxy? ( dev-libs/libevent:= sys-libs/zlib ) server? ( dev-libs/libevent:= sys-libs/zlib ) snmp? ( net-analyzer/net-snmp:= ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) static? ( curl? ( net-misc/curl[static-libs] ) ldap? ( =dev-libs/cyrus-sasl-2*[static-libs] net-libs/gnutls[static-libs] net-nds/openldap[static-libs] ) libxml2? ( dev-libs/libxml2[static-libs] ) mysql? ( dev-db/mysql-connector-c[static-libs] ) odbc? ( dev-db/unixODBC[static-libs] ) postgres? ( dev-db/postgresql:*[static-libs] ) sqlite? ( dev-db/sqlite[static-libs] ) ssh? ( net-libs/libssh2 ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=ZABBIX is software for monitoring of your applications, network and servers
+EAPI=8
+HOMEPAGE=https://www.zabbix.com/
+INHERIT=webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info
+IUSE=+agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh static java
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=curl? ( net-misc/curl ) gnutls? ( net-libs/gnutls:0= ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls:= net-nds/openldap:= ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c:= ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) openssl? ( dev-libs/openssl:=[-bindist(-)] ) oracle? ( dev-db/oracle-instantclient[odbc,sdk] ) postgres? ( dev-db/postgresql:* ) proxy? ( dev-libs/libevent:= sys-libs/zlib ) server? ( dev-libs/libevent:= sys-libs/zlib ) snmp? ( net-analyzer/net-snmp:= ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) acct-group/zabbix acct-user/zabbix java? ( >=virtual/jre-1.8:* ) mysql? ( virtual/mysql ) proxy? ( dev-libs/libpcre net-analyzer/fping[suid] ) server? ( app-admin/webapp-config dev-libs/libpcre net-analyzer/fping[suid] ) frontend? ( app-admin/webapp-config dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] media-libs/gd[png] virtual/httpd-php:* mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
+REQUIRED_USE=|| ( agent agent2 frontend proxy server ) ?? ( gnutls openssl ) proxy? ( ^^ ( mysql oracle postgres sqlite ) ) server? ( ^^ ( mysql oracle postgres ) !sqlite ) static? ( !oracle !snmp )
+RESTRICT=test strip
+SLOT=0/5.0
+SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/5.0/zabbix-5.0.31.tar.gz agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/zabbix-5.0.31-go-deps.tar.xz )
+_eclasses_=go-module	75029f071ebc843223233ab1b0a2d4a5	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	user-info	83547b4df3e1ba5a6bf91a0837eaa664	webapp	67df5bab481d0b9428f9ab7b3de690e4
+_md5_=adf22fe05b267bf8c5f91f029d55a61c
diff --git a/metadata/md5-cache/net-analyzer/zabbix-6.0.13 b/metadata/md5-cache/net-analyzer/zabbix-6.0.13
new file mode 100644
index 000000000000..044b2fc2e623
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/zabbix-6.0.13
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig agent2? ( >=dev-lang/go-1.12 app-arch/unzip ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup
+DEPEND=curl? ( net-misc/curl ) gnutls? ( net-libs/gnutls:0= ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls:= net-nds/openldap:= ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c:= ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) openssl? ( dev-libs/openssl:=[-bindist(-)] ) oracle? ( dev-db/oracle-instantclient[odbc,sdk] ) postgres? ( dev-db/postgresql:* ) proxy? ( dev-libs/libevent:= sys-libs/zlib ) server? ( dev-libs/libevent:= sys-libs/zlib ) snmp? ( net-analyzer/net-snmp:= ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) static? ( curl? ( net-misc/curl[static-libs] ) ldap? ( =dev-libs/cyrus-sasl-2*[static-libs] net-libs/gnutls[static-libs] net-nds/openldap[static-libs] ) libxml2? ( dev-libs/libxml2[static-libs] ) mysql? ( dev-db/mysql-connector-c[static-libs] ) odbc? ( dev-db/unixODBC[static-libs] ) postgres? ( dev-db/postgresql:*[static-libs] ) sqlite? ( dev-db/sqlite[static-libs] ) ssh? ( net-libs/libssh2 ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=ZABBIX is software for monitoring of your applications, network and servers
+EAPI=8
+HOMEPAGE=https://www.zabbix.com/
+INHERIT=webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info
+IUSE=agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh static java
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=curl? ( net-misc/curl ) gnutls? ( net-libs/gnutls:0= ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls:= net-nds/openldap:= ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c:= ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) openssl? ( dev-libs/openssl:=[-bindist(-)] ) oracle? ( dev-db/oracle-instantclient[odbc,sdk] ) postgres? ( dev-db/postgresql:* ) proxy? ( dev-libs/libevent:= sys-libs/zlib ) server? ( dev-libs/libevent:= sys-libs/zlib ) snmp? ( net-analyzer/net-snmp:= ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) acct-group/zabbix acct-user/zabbix java? ( >=virtual/jre-1.8:* ) mysql? ( virtual/mysql ) proxy? ( dev-libs/libpcre2:= net-analyzer/fping[suid] ) server? ( app-admin/webapp-config dev-libs/libpcre2:= net-analyzer/fping[suid] ) frontend? ( app-admin/webapp-config dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] media-libs/gd[png] virtual/httpd-php:* mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
+REQUIRED_USE=|| ( agent agent2 frontend proxy server ) ?? ( gnutls openssl ) proxy? ( ^^ ( mysql oracle postgres sqlite ) ) server? ( ^^ ( mysql oracle postgres ) !sqlite ) static? ( !oracle !snmp )
+RESTRICT=test strip
+SLOT=0/6.0
+SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/6.0/zabbix-6.0.13.tar.gz agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/zabbix-6.0.13-go-deps.tar.xz )
+_eclasses_=go-module	75029f071ebc843223233ab1b0a2d4a5	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	user-info	83547b4df3e1ba5a6bf91a0837eaa664	webapp	67df5bab481d0b9428f9ab7b3de690e4
+_md5_=33a048596fcccf3bfd46f4fd45e87ec6
diff --git a/metadata/md5-cache/net-analyzer/zabbix-6.2.7 b/metadata/md5-cache/net-analyzer/zabbix-6.2.7
new file mode 100644
index 000000000000..5ffb44b22489
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/zabbix-6.2.7
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig agent2? ( >=dev-lang/go-1.12 app-arch/unzip ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup
+DEPEND=curl? ( net-misc/curl ) gnutls? ( net-libs/gnutls:0= ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls:= net-nds/openldap:= ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c:= ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) openssl? ( dev-libs/openssl:=[-bindist(-)] ) oracle? ( dev-db/oracle-instantclient[odbc,sdk] ) postgres? ( dev-db/postgresql:* ) proxy? ( dev-libs/libevent:= sys-libs/zlib ) server? ( dev-libs/libevent:= sys-libs/zlib ) snmp? ( net-analyzer/net-snmp:= ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) static? ( curl? ( net-misc/curl[static-libs] ) ldap? ( =dev-libs/cyrus-sasl-2*[static-libs] net-libs/gnutls[static-libs] net-nds/openldap[static-libs] ) libxml2? ( dev-libs/libxml2[static-libs] ) mysql? ( dev-db/mysql-connector-c[static-libs] ) odbc? ( dev-db/unixODBC[static-libs] ) postgres? ( dev-db/postgresql:*[static-libs] ) sqlite? ( dev-db/sqlite[static-libs] ) ssh? ( net-libs/libssh2 ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=ZABBIX is software for monitoring of your applications, network and servers
+EAPI=8
+HOMEPAGE=https://www.zabbix.com/
+INHERIT=webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info
+IUSE=agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh static java
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=curl? ( net-misc/curl ) gnutls? ( net-libs/gnutls:0= ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls:= net-nds/openldap:= ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c:= ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) openssl? ( dev-libs/openssl:=[-bindist(-)] ) oracle? ( dev-db/oracle-instantclient[odbc,sdk] ) postgres? ( dev-db/postgresql:* ) proxy? ( dev-libs/libevent:= sys-libs/zlib ) server? ( dev-libs/libevent:= sys-libs/zlib ) snmp? ( net-analyzer/net-snmp:= ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) acct-group/zabbix acct-user/zabbix java? ( >=virtual/jre-1.8:* ) mysql? ( virtual/mysql ) proxy? ( dev-libs/libpcre2:= net-analyzer/fping[suid] ) server? ( app-admin/webapp-config dev-libs/libpcre2:= net-analyzer/fping[suid] ) frontend? ( app-admin/webapp-config dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] media-libs/gd[png] virtual/httpd-php:* mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
+REQUIRED_USE=|| ( agent agent2 frontend proxy server ) ?? ( gnutls openssl ) proxy? ( ^^ ( mysql oracle postgres sqlite ) ) server? ( ^^ ( mysql oracle postgres ) !sqlite ) static? ( !oracle !snmp )
+RESTRICT=test strip
+SLOT=0/6.2
+SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/6.2/zabbix-6.2.7.tar.gz agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/zabbix-6.2.7-go-deps.tar.xz )
+_eclasses_=go-module	75029f071ebc843223233ab1b0a2d4a5	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	user-info	83547b4df3e1ba5a6bf91a0837eaa664	webapp	67df5bab481d0b9428f9ab7b3de690e4
+_md5_=33a048596fcccf3bfd46f4fd45e87ec6
diff --git a/metadata/md5-cache/net-fs/Manifest.gz b/metadata/md5-cache/net-fs/Manifest.gz
index 289a468fd82e..fc81dcfe1c38 100644
--- a/metadata/md5-cache/net-fs/Manifest.gz
+++ b/metadata/md5-cache/net-fs/Manifest.gz
diff --git a/metadata/md5-cache/net-fs/samba-4.15.12-r4 b/metadata/md5-cache/net-fs/samba-4.15.12-r4
index ccd56199d089..fd567a8d2e13 100644
--- a/metadata/md5-cache/net-fs/samba-4.15.12-r4
+++ b/metadata/md5-cache/net-fs/samba-4.15.12-r4
@@ -1,17 +1,17 @@
-BDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[threads(+),xml(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10[threads(+),xml(+)] ) app-text/docbook-xsl-stylesheets dev-libs/libxslt virtual/pkgconfig virtual/pkgconfig
+BDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[threads(+),xml(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10[threads(+),xml(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11[threads(+),xml(+)] ) app-text/docbook-xsl-stylesheets dev-libs/libxslt virtual/pkgconfig virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/icu:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libtasn1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-perl/Parse-Yapp >=net-libs/gnutls-3.4.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-fs/e2fsprogs-1.46.4-r51[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-2.4.4[ldap(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-2.5.0[ldap(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/liburing:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses:0= sys-libs/readline:0= >=sys-libs/talloc-2.3.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.4.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.11.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv python_single_target_python3_9? ( addc? ( dev-python/dnspython:=[python_targets_python3_9(-)] dev-python/markdown[python_targets_python3_9(-)] ) ads? ( dev-python/dnspython:=[python_targets_python3_9(-)] net-dns/bind-tools[gssapi] ) ) python_single_target_python3_10? ( addc? ( dev-python/dnspython:=[python_targets_python3_10(-)] dev-python/markdown[python_targets_python3_10(-)] ) ads? ( dev-python/dnspython:=[python_targets_python3_10(-)] net-dns/bind-tools[gssapi] ) ) acl? ( virtual/acl ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) fam? ( virtual/fam ) gpg? ( app-crypt/gpgme:= ) json? ( dev-libs/jansson:= ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) python? ( sys-libs/ldb[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] sys-libs/talloc[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] sys-libs/tdb[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] sys-libs/tevent[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) snapper? ( sys-apps/dbus ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.19[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) unwind? ( llvm-libunwind? ( sys-libs/llvm-libunwind:= ) !llvm-libunwind? ( sys-libs/libunwind:= ) ) zeroconf? ( net-dns/avahi[dbus] ) >=dev-util/cmocka-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libtirpc[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( net-libs/rpcsvc-proto <sys-libs/glibc-2.26[rpc(+)] ) spotlight? ( dev-libs/glib ) test? ( python_single_target_python3_9? ( dev-python/subunit[python_targets_python3_9(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python_single_target_python3_10? ( dev-python/subunit[python_targets_python3_10(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !system-mitkrb5? ( >=net-dns/resolv_wrapper-1.1.4 >=net-libs/socket_wrapper-1.1.9 >=sys-libs/nss_wrapper-1.1.3 >=sys-libs/uid_wrapper-1.2.1 ) )
+DEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/icu:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libtasn1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-perl/Parse-Yapp >=net-libs/gnutls-3.4.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-fs/e2fsprogs-1.46.4-r51[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-2.4.4[ldap(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-2.5.0[ldap(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/liburing:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses:0= sys-libs/readline:0= >=sys-libs/talloc-2.3.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.4.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.11.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv python_single_target_python3_9? ( addc? ( dev-python/dnspython:=[python_targets_python3_9(-)] dev-python/markdown[python_targets_python3_9(-)] ) ads? ( dev-python/dnspython:=[python_targets_python3_9(-)] net-dns/bind-tools[gssapi] ) ) python_single_target_python3_10? ( addc? ( dev-python/dnspython:=[python_targets_python3_10(-)] dev-python/markdown[python_targets_python3_10(-)] ) ads? ( dev-python/dnspython:=[python_targets_python3_10(-)] net-dns/bind-tools[gssapi] ) ) python_single_target_python3_11? ( addc? ( dev-python/dnspython:=[python_targets_python3_11(-)] dev-python/markdown[python_targets_python3_11(-)] ) ads? ( dev-python/dnspython:=[python_targets_python3_11(-)] net-dns/bind-tools[gssapi] ) ) acl? ( virtual/acl ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) fam? ( virtual/fam ) gpg? ( app-crypt/gpgme:= ) json? ( dev-libs/jansson:= ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) python? ( sys-libs/ldb[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] sys-libs/talloc[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] sys-libs/tdb[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] sys-libs/tevent[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] ) snapper? ( sys-apps/dbus ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.19[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) unwind? ( llvm-libunwind? ( sys-libs/llvm-libunwind:= ) !llvm-libunwind? ( sys-libs/libunwind:= ) ) zeroconf? ( net-dns/avahi[dbus] ) >=dev-util/cmocka-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libtirpc[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( net-libs/rpcsvc-proto <sys-libs/glibc-2.26[rpc(+)] ) spotlight? ( dev-libs/glib ) test? ( python_single_target_python3_9? ( dev-python/subunit[python_targets_python3_9(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python_single_target_python3_10? ( dev-python/subunit[python_targets_python3_10(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python_single_target_python3_11? ( dev-python/subunit[python_targets_python3_11(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !system-mitkrb5? ( >=net-dns/resolv_wrapper-1.1.4 >=net-libs/socket_wrapper-1.1.9 >=sys-libs/nss_wrapper-1.1.3 >=sys-libs/uid_wrapper-1.2.1 ) )
 DESCRIPTION=Samba Suite Version 4
 EAPI=7
 HOMEPAGE=https://samba.org/
 INHERIT=python-single-r1 waf-utils multilib-minimal linux-info systemd pam tmpfiles
-IUSE=acl addc ads ceph client cluster cpu_flags_x86_aes cups debug fam glusterfs gpg iprint json ldap llvm-libunwind pam profiling-data python quota +regedit selinux snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test unwind winbind zeroconf python_single_target_python3_9 python_single_target_python3_10 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+IUSE=acl addc ads ceph client cluster cpu_flags_x86_aes cups debug fam glusterfs gpg iprint json ldap llvm-libunwind pam profiling-data python quota +regedit selinux snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test unwind winbind zeroconf python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86
 LICENSE=GPL-3
-RDEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/icu:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libtasn1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-perl/Parse-Yapp >=net-libs/gnutls-3.4.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-fs/e2fsprogs-1.46.4-r51[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-2.4.4[ldap(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-2.5.0[ldap(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/liburing:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses:0= sys-libs/readline:0= >=sys-libs/talloc-2.3.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.4.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.11.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv python_single_target_python3_9? ( addc? ( dev-python/dnspython:=[python_targets_python3_9(-)] dev-python/markdown[python_targets_python3_9(-)] ) ads? ( dev-python/dnspython:=[python_targets_python3_9(-)] net-dns/bind-tools[gssapi] ) ) python_single_target_python3_10? ( addc? ( dev-python/dnspython:=[python_targets_python3_10(-)] dev-python/markdown[python_targets_python3_10(-)] ) ads? ( dev-python/dnspython:=[python_targets_python3_10(-)] net-dns/bind-tools[gssapi] ) ) acl? ( virtual/acl ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) fam? ( virtual/fam ) gpg? ( app-crypt/gpgme:= ) json? ( dev-libs/jansson:= ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) python? ( sys-libs/ldb[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] sys-libs/talloc[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] sys-libs/tdb[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] sys-libs/tevent[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) snapper? ( sys-apps/dbus ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.19[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) unwind? ( llvm-libunwind? ( sys-libs/llvm-libunwind:= ) !llvm-libunwind? ( sys-libs/libunwind:= ) ) zeroconf? ( net-dns/avahi[dbus] ) client? ( net-fs/cifs-utils[ads?] ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[threads(+),xml(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10[threads(+),xml(+)] ) ) selinux? ( sec-policy/selinux-samba ) virtual/tmpfiles
-REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 ) addc? ( python json !system-mitkrb5 winbind ) ads? ( acl ldap python winbind ) cluster? ( ads ) gpg? ( addc ) spotlight? ( json ) test? ( python ) !ads? ( !addc ) ?? ( system-heimdal system-mitkrb5 )
+RDEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/icu:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libtasn1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-perl/Parse-Yapp >=net-libs/gnutls-3.4.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-fs/e2fsprogs-1.46.4-r51[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-2.4.4[ldap(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-2.5.0[ldap(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/liburing:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses:0= sys-libs/readline:0= >=sys-libs/talloc-2.3.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.4.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.11.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv python_single_target_python3_9? ( addc? ( dev-python/dnspython:=[python_targets_python3_9(-)] dev-python/markdown[python_targets_python3_9(-)] ) ads? ( dev-python/dnspython:=[python_targets_python3_9(-)] net-dns/bind-tools[gssapi] ) ) python_single_target_python3_10? ( addc? ( dev-python/dnspython:=[python_targets_python3_10(-)] dev-python/markdown[python_targets_python3_10(-)] ) ads? ( dev-python/dnspython:=[python_targets_python3_10(-)] net-dns/bind-tools[gssapi] ) ) python_single_target_python3_11? ( addc? ( dev-python/dnspython:=[python_targets_python3_11(-)] dev-python/markdown[python_targets_python3_11(-)] ) ads? ( dev-python/dnspython:=[python_targets_python3_11(-)] net-dns/bind-tools[gssapi] ) ) acl? ( virtual/acl ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) fam? ( virtual/fam ) gpg? ( app-crypt/gpgme:= ) json? ( dev-libs/jansson:= ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) python? ( sys-libs/ldb[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] sys-libs/talloc[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] sys-libs/tdb[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] sys-libs/tevent[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] ) snapper? ( sys-apps/dbus ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.19[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) unwind? ( llvm-libunwind? ( sys-libs/llvm-libunwind:= ) !llvm-libunwind? ( sys-libs/libunwind:= ) ) zeroconf? ( net-dns/avahi[dbus] ) client? ( net-fs/cifs-utils[ads?] ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[threads(+),xml(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10[threads(+),xml(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11[threads(+),xml(+)] ) ) selinux? ( sec-policy/selinux-samba ) virtual/tmpfiles
+REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) addc? ( python json !system-mitkrb5 winbind ) ads? ( acl ldap python winbind ) cluster? ( ads ) gpg? ( addc ) spotlight? ( json ) test? ( python ) !ads? ( !addc ) ?? ( system-heimdal system-mitkrb5 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://samba/stable/samba-4.15.12.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pam	01b77091d5b6560b0aeafa7fbb1bd818	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	waf-utils	44f2c60168a3ec2c5fb661d45c1cf397	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=56d26de691b8690aee0dec2ab42db7fe
+_md5_=13e5af977642bbf17e7ed5d9207f953e
diff --git a/metadata/md5-cache/net-fs/samba-4.15.13 b/metadata/md5-cache/net-fs/samba-4.15.13
new file mode 100644
index 000000000000..7e63830c57a0
--- /dev/null
+++ b/metadata/md5-cache/net-fs/samba-4.15.13
@@ -0,0 +1,17 @@
+BDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[threads(+),xml(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10[threads(+),xml(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11[threads(+),xml(+)] ) app-text/docbook-xsl-stylesheets dev-libs/libxslt virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=>=app-arch/libarchive-3.1.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/icu:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libtasn1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-perl/Parse-Yapp >=net-libs/gnutls-3.4.7:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-fs/e2fsprogs-1.46.4-r51[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-2.4.4:=[ldap(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-2.5.0:=[ldap(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/liburing:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses:= sys-libs/readline:= >=sys-libs/talloc-2.3.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.4.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.11.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv python_single_target_python3_9? ( addc? ( dev-python/dnspython:=[python_targets_python3_9(-)] dev-python/markdown[python_targets_python3_9(-)] ) ads? ( dev-python/dnspython:=[python_targets_python3_9(-)] net-dns/bind-tools[gssapi] ) ) python_single_target_python3_10? ( addc? ( dev-python/dnspython:=[python_targets_python3_10(-)] dev-python/markdown[python_targets_python3_10(-)] ) ads? ( dev-python/dnspython:=[python_targets_python3_10(-)] net-dns/bind-tools[gssapi] ) ) python_single_target_python3_11? ( addc? ( dev-python/dnspython:=[python_targets_python3_11(-)] dev-python/markdown[python_targets_python3_11(-)] ) ads? ( dev-python/dnspython:=[python_targets_python3_11(-)] net-dns/bind-tools[gssapi] ) ) acl? ( virtual/acl ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) fam? ( virtual/fam ) gpg? ( app-crypt/gpgme:= ) json? ( dev-libs/jansson:= ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) python? ( sys-libs/ldb[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] sys-libs/talloc[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] sys-libs/tdb[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] sys-libs/tevent[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] ) snapper? ( sys-apps/dbus ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.19[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) unwind? ( llvm-libunwind? ( sys-libs/llvm-libunwind:= ) !llvm-libunwind? ( sys-libs/libunwind:= ) ) zeroconf? ( net-dns/avahi[dbus] ) >=dev-util/cmocka-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libtirpc[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( net-libs/rpcsvc-proto <sys-libs/glibc-2.26[rpc(+)] ) spotlight? ( dev-libs/glib ) test? ( python_single_target_python3_9? ( dev-python/subunit[python_targets_python3_9(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python_single_target_python3_10? ( dev-python/subunit[python_targets_python3_10(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python_single_target_python3_11? ( dev-python/subunit[python_targets_python3_11(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !system-mitkrb5? ( >=net-dns/resolv_wrapper-1.1.4 >=net-libs/socket_wrapper-1.1.9 >=sys-libs/nss_wrapper-1.1.3 >=sys-libs/uid_wrapper-1.2.1 ) )
+DESCRIPTION=Samba Suite Version 4
+EAPI=7
+HOMEPAGE=https://samba.org/
+INHERIT=python-single-r1 waf-utils multilib-minimal linux-info systemd pam tmpfiles
+IUSE=acl addc ads ceph client cluster cpu_flags_x86_aes cups debug fam glusterfs gpg iprint json ldap llvm-libunwind pam profiling-data python quota +regedit selinux snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test unwind winbind zeroconf python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=GPL-3
+RDEPEND=>=app-arch/libarchive-3.1.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/icu:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libtasn1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-perl/Parse-Yapp >=net-libs/gnutls-3.4.7:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-fs/e2fsprogs-1.46.4-r51[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-2.4.4:=[ldap(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-2.5.0:=[ldap(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/liburing:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses:= sys-libs/readline:= >=sys-libs/talloc-2.3.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.4.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.11.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv python_single_target_python3_9? ( addc? ( dev-python/dnspython:=[python_targets_python3_9(-)] dev-python/markdown[python_targets_python3_9(-)] ) ads? ( dev-python/dnspython:=[python_targets_python3_9(-)] net-dns/bind-tools[gssapi] ) ) python_single_target_python3_10? ( addc? ( dev-python/dnspython:=[python_targets_python3_10(-)] dev-python/markdown[python_targets_python3_10(-)] ) ads? ( dev-python/dnspython:=[python_targets_python3_10(-)] net-dns/bind-tools[gssapi] ) ) python_single_target_python3_11? ( addc? ( dev-python/dnspython:=[python_targets_python3_11(-)] dev-python/markdown[python_targets_python3_11(-)] ) ads? ( dev-python/dnspython:=[python_targets_python3_11(-)] net-dns/bind-tools[gssapi] ) ) acl? ( virtual/acl ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) fam? ( virtual/fam ) gpg? ( app-crypt/gpgme:= ) json? ( dev-libs/jansson:= ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) python? ( sys-libs/ldb[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] sys-libs/talloc[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] sys-libs/tdb[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] sys-libs/tevent[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] ) snapper? ( sys-apps/dbus ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.19[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) unwind? ( llvm-libunwind? ( sys-libs/llvm-libunwind:= ) !llvm-libunwind? ( sys-libs/libunwind:= ) ) zeroconf? ( net-dns/avahi[dbus] ) client? ( net-fs/cifs-utils[ads?] ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[threads(+),xml(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10[threads(+),xml(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11[threads(+),xml(+)] ) ) selinux? ( sec-policy/selinux-samba ) virtual/tmpfiles
+REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) addc? ( python json !system-mitkrb5 winbind ) ads? ( acl ldap python winbind ) cluster? ( ads ) gpg? ( addc ) spotlight? ( json ) test? ( python ) !ads? ( !addc ) ?? ( system-heimdal system-mitkrb5 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://samba/stable/samba-4.15.13.tar.gz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pam	01b77091d5b6560b0aeafa7fbb1bd818	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	waf-utils	44f2c60168a3ec2c5fb661d45c1cf397	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=ddedbc922dac817b06ac8ce77cd26ad1
diff --git a/metadata/md5-cache/net-fs/samba-4.16.7-r4 b/metadata/md5-cache/net-fs/samba-4.16.7-r4
index ae337818aea4..27b0418a0b0c 100644
--- a/metadata/md5-cache/net-fs/samba-4.16.7-r4
+++ b/metadata/md5-cache/net-fs/samba-4.16.7-r4
@@ -1,17 +1,17 @@
-BDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[threads(+),xml(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10[threads(+),xml(+)] ) app-text/docbook-xsl-stylesheets dev-libs/libxslt virtual/pkgconfig virtual/pkgconfig
+BDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[threads(+),xml(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10[threads(+),xml(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11[threads(+),xml(+)] ) app-text/docbook-xsl-stylesheets dev-libs/libxslt virtual/pkgconfig virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/icu:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libtasn1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-perl/Parse-Yapp >=net-libs/gnutls-3.4.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-fs/e2fsprogs-1.46.4-r51[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-2.5.2[ldap(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-2.6.0[ldap(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/liburing:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses:= sys-libs/readline:= >=sys-libs/talloc-2.3.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.4.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.11.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv python_single_target_python3_9? ( addc? ( dev-python/dnspython:=[python_targets_python3_9(-)] dev-python/markdown[python_targets_python3_9(-)] ) ads? ( dev-python/dnspython:=[python_targets_python3_9(-)] net-dns/bind-tools[gssapi] ) ) python_single_target_python3_10? ( addc? ( dev-python/dnspython:=[python_targets_python3_10(-)] dev-python/markdown[python_targets_python3_10(-)] ) ads? ( dev-python/dnspython:=[python_targets_python3_10(-)] net-dns/bind-tools[gssapi] ) ) acl? ( virtual/acl ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) fam? ( virtual/fam ) gpg? ( app-crypt/gpgme:= ) json? ( dev-libs/jansson:= ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) python? ( sys-libs/ldb[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] sys-libs/talloc[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] sys-libs/tdb[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] sys-libs/tevent[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) snapper? ( sys-apps/dbus ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.19[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:= ) unwind? ( llvm-libunwind? ( sys-libs/llvm-libunwind:= ) !llvm-libunwind? ( sys-libs/libunwind:= ) ) zeroconf? ( net-dns/avahi[dbus] ) dev-perl/JSON net-libs/libtirpc[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/rpcsvc-proto spotlight? ( dev-libs/glib ) test? ( >=dev-util/cmocka-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] python_single_target_python3_9? ( dev-python/subunit[python_targets_python3_9(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python_single_target_python3_10? ( dev-python/subunit[python_targets_python3_10(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !system-mitkrb5? ( >=net-dns/resolv_wrapper-1.1.4 >=net-libs/socket_wrapper-1.1.9 >=sys-libs/nss_wrapper-1.1.3 >=sys-libs/uid_wrapper-1.2.1 ) )
+DEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/icu:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libtasn1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-perl/Parse-Yapp >=net-libs/gnutls-3.4.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-fs/e2fsprogs-1.46.4-r51[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-2.5.2[ldap(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-2.6.0[ldap(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/liburing:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses:= sys-libs/readline:= >=sys-libs/talloc-2.3.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.4.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.11.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv python_single_target_python3_9? ( addc? ( dev-python/dnspython:=[python_targets_python3_9(-)] dev-python/markdown[python_targets_python3_9(-)] ) ads? ( dev-python/dnspython:=[python_targets_python3_9(-)] net-dns/bind-tools[gssapi] ) ) python_single_target_python3_10? ( addc? ( dev-python/dnspython:=[python_targets_python3_10(-)] dev-python/markdown[python_targets_python3_10(-)] ) ads? ( dev-python/dnspython:=[python_targets_python3_10(-)] net-dns/bind-tools[gssapi] ) ) python_single_target_python3_11? ( addc? ( dev-python/dnspython:=[python_targets_python3_11(-)] dev-python/markdown[python_targets_python3_11(-)] ) ads? ( dev-python/dnspython:=[python_targets_python3_11(-)] net-dns/bind-tools[gssapi] ) ) acl? ( virtual/acl ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) fam? ( virtual/fam ) gpg? ( app-crypt/gpgme:= ) json? ( dev-libs/jansson:= ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) python? ( sys-libs/ldb[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] sys-libs/talloc[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] sys-libs/tdb[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] sys-libs/tevent[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] ) snapper? ( sys-apps/dbus ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.19[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:= ) unwind? ( llvm-libunwind? ( sys-libs/llvm-libunwind:= ) !llvm-libunwind? ( sys-libs/libunwind:= ) ) zeroconf? ( net-dns/avahi[dbus] ) dev-perl/JSON net-libs/libtirpc[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/rpcsvc-proto spotlight? ( dev-libs/glib ) test? ( >=dev-util/cmocka-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] python_single_target_python3_9? ( dev-python/subunit[python_targets_python3_9(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python_single_target_python3_10? ( dev-python/subunit[python_targets_python3_10(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python_single_target_python3_11? ( dev-python/subunit[python_targets_python3_11(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !system-mitkrb5? ( >=net-dns/resolv_wrapper-1.1.4 >=net-libs/socket_wrapper-1.1.9 >=sys-libs/nss_wrapper-1.1.3 >=sys-libs/uid_wrapper-1.2.1 ) )
 DESCRIPTION=Samba Suite Version 4
 EAPI=8
 HOMEPAGE=https://samba.org/
 INHERIT=python-single-r1 flag-o-matic waf-utils multilib-minimal linux-info systemd pam tmpfiles
-IUSE=acl addc ads ceph client cluster cpu_flags_x86_aes cups debug fam glusterfs gpg iprint json ldap llvm-libunwind pam profiling-data python quota +regedit selinux snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test unwind winbind zeroconf python_single_target_python3_9 python_single_target_python3_10 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+IUSE=acl addc ads ceph client cluster cpu_flags_x86_aes cups debug fam glusterfs gpg iprint json ldap llvm-libunwind pam profiling-data python quota +regedit selinux snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test unwind winbind zeroconf python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=GPL-3
-RDEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/icu:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libtasn1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-perl/Parse-Yapp >=net-libs/gnutls-3.4.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-fs/e2fsprogs-1.46.4-r51[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-2.5.2[ldap(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-2.6.0[ldap(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/liburing:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses:= sys-libs/readline:= >=sys-libs/talloc-2.3.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.4.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.11.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv python_single_target_python3_9? ( addc? ( dev-python/dnspython:=[python_targets_python3_9(-)] dev-python/markdown[python_targets_python3_9(-)] ) ads? ( dev-python/dnspython:=[python_targets_python3_9(-)] net-dns/bind-tools[gssapi] ) ) python_single_target_python3_10? ( addc? ( dev-python/dnspython:=[python_targets_python3_10(-)] dev-python/markdown[python_targets_python3_10(-)] ) ads? ( dev-python/dnspython:=[python_targets_python3_10(-)] net-dns/bind-tools[gssapi] ) ) acl? ( virtual/acl ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) fam? ( virtual/fam ) gpg? ( app-crypt/gpgme:= ) json? ( dev-libs/jansson:= ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) python? ( sys-libs/ldb[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] sys-libs/talloc[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] sys-libs/tdb[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] sys-libs/tevent[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) snapper? ( sys-apps/dbus ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.19[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:= ) unwind? ( llvm-libunwind? ( sys-libs/llvm-libunwind:= ) !llvm-libunwind? ( sys-libs/libunwind:= ) ) zeroconf? ( net-dns/avahi[dbus] ) client? ( net-fs/cifs-utils[ads?] ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[threads(+),xml(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10[threads(+),xml(+)] ) ) selinux? ( sec-policy/selinux-samba ) virtual/tmpfiles
-REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 ) addc? ( json python !system-mitkrb5 winbind ) ads? ( acl ldap python winbind ) cluster? ( ads ) gpg? ( addc ) spotlight? ( json ) test? ( python ) !ads? ( !addc ) ?? ( system-heimdal system-mitkrb5 )
+RDEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/icu:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libtasn1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-perl/Parse-Yapp >=net-libs/gnutls-3.4.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-fs/e2fsprogs-1.46.4-r51[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-2.5.2[ldap(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-2.6.0[ldap(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/liburing:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses:= sys-libs/readline:= >=sys-libs/talloc-2.3.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.4.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.11.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv python_single_target_python3_9? ( addc? ( dev-python/dnspython:=[python_targets_python3_9(-)] dev-python/markdown[python_targets_python3_9(-)] ) ads? ( dev-python/dnspython:=[python_targets_python3_9(-)] net-dns/bind-tools[gssapi] ) ) python_single_target_python3_10? ( addc? ( dev-python/dnspython:=[python_targets_python3_10(-)] dev-python/markdown[python_targets_python3_10(-)] ) ads? ( dev-python/dnspython:=[python_targets_python3_10(-)] net-dns/bind-tools[gssapi] ) ) python_single_target_python3_11? ( addc? ( dev-python/dnspython:=[python_targets_python3_11(-)] dev-python/markdown[python_targets_python3_11(-)] ) ads? ( dev-python/dnspython:=[python_targets_python3_11(-)] net-dns/bind-tools[gssapi] ) ) acl? ( virtual/acl ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) fam? ( virtual/fam ) gpg? ( app-crypt/gpgme:= ) json? ( dev-libs/jansson:= ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) python? ( sys-libs/ldb[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] sys-libs/talloc[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] sys-libs/tdb[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] sys-libs/tevent[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] ) snapper? ( sys-apps/dbus ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.19[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:= ) unwind? ( llvm-libunwind? ( sys-libs/llvm-libunwind:= ) !llvm-libunwind? ( sys-libs/libunwind:= ) ) zeroconf? ( net-dns/avahi[dbus] ) client? ( net-fs/cifs-utils[ads?] ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[threads(+),xml(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10[threads(+),xml(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11[threads(+),xml(+)] ) ) selinux? ( sec-policy/selinux-samba ) virtual/tmpfiles
+REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) addc? ( json python !system-mitkrb5 winbind ) ads? ( acl ldap python winbind ) cluster? ( ads ) gpg? ( addc ) spotlight? ( json ) test? ( python ) !ads? ( !addc ) ?? ( system-heimdal system-mitkrb5 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://samba/stable/samba-4.16.7.tar.gz
 _eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pam	01b77091d5b6560b0aeafa7fbb1bd818	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	waf-utils	44f2c60168a3ec2c5fb661d45c1cf397
-_md5_=91c5d776bc5014176a0ad4a09e167a78
+_md5_=1f354715e99950300cf22841630cebb7
diff --git a/metadata/md5-cache/net-fs/samba-4.16.8 b/metadata/md5-cache/net-fs/samba-4.16.8
new file mode 100644
index 000000000000..a39de0aec939
--- /dev/null
+++ b/metadata/md5-cache/net-fs/samba-4.16.8
@@ -0,0 +1,17 @@
+BDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[threads(+),xml(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10[threads(+),xml(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11[threads(+),xml(+)] ) app-text/docbook-xsl-stylesheets dev-libs/libxslt virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=>=app-arch/libarchive-3.1.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/icu:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libtasn1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-perl/Parse-Yapp >=net-libs/gnutls-3.4.7:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-fs/e2fsprogs-1.46.4-r51[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-2.5.2:=[ldap(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-2.6.0:=[ldap(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/liburing:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses:= sys-libs/readline:= >=sys-libs/talloc-2.3.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.4.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.11.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv python_single_target_python3_9? ( addc? ( dev-python/dnspython:=[python_targets_python3_9(-)] dev-python/markdown[python_targets_python3_9(-)] ) ads? ( dev-python/dnspython:=[python_targets_python3_9(-)] net-dns/bind-tools[gssapi] ) ) python_single_target_python3_10? ( addc? ( dev-python/dnspython:=[python_targets_python3_10(-)] dev-python/markdown[python_targets_python3_10(-)] ) ads? ( dev-python/dnspython:=[python_targets_python3_10(-)] net-dns/bind-tools[gssapi] ) ) python_single_target_python3_11? ( addc? ( dev-python/dnspython:=[python_targets_python3_11(-)] dev-python/markdown[python_targets_python3_11(-)] ) ads? ( dev-python/dnspython:=[python_targets_python3_11(-)] net-dns/bind-tools[gssapi] ) ) acl? ( virtual/acl ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) fam? ( virtual/fam ) gpg? ( app-crypt/gpgme:= ) json? ( dev-libs/jansson:= ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) python? ( sys-libs/ldb[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] sys-libs/talloc[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] sys-libs/tdb[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] sys-libs/tevent[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] ) snapper? ( sys-apps/dbus ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.19[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:= ) unwind? ( llvm-libunwind? ( sys-libs/llvm-libunwind:= ) !llvm-libunwind? ( sys-libs/libunwind:= ) ) zeroconf? ( net-dns/avahi[dbus] ) dev-perl/JSON net-libs/libtirpc[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/rpcsvc-proto spotlight? ( dev-libs/glib ) test? ( >=dev-util/cmocka-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] python_single_target_python3_9? ( dev-python/subunit[python_targets_python3_9(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python_single_target_python3_10? ( dev-python/subunit[python_targets_python3_10(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python_single_target_python3_11? ( dev-python/subunit[python_targets_python3_11(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !system-mitkrb5? ( >=net-dns/resolv_wrapper-1.1.4 >=net-libs/socket_wrapper-1.1.9 >=sys-libs/nss_wrapper-1.1.3 >=sys-libs/uid_wrapper-1.2.1 ) )
+DESCRIPTION=Samba Suite Version 4
+EAPI=8
+HOMEPAGE=https://samba.org/
+INHERIT=python-single-r1 flag-o-matic waf-utils multilib-minimal linux-info systemd pam tmpfiles
+IUSE=acl addc ads ceph client cluster cpu_flags_x86_aes cups debug fam glusterfs gpg iprint json ldap llvm-libunwind pam profiling-data python quota +regedit selinux snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test unwind winbind zeroconf python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=GPL-3
+RDEPEND=>=app-arch/libarchive-3.1.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/icu:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libtasn1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-perl/Parse-Yapp >=net-libs/gnutls-3.4.7:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-fs/e2fsprogs-1.46.4-r51[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-2.5.2:=[ldap(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-2.6.0:=[ldap(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/liburing:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses:= sys-libs/readline:= >=sys-libs/talloc-2.3.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.4.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.11.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv python_single_target_python3_9? ( addc? ( dev-python/dnspython:=[python_targets_python3_9(-)] dev-python/markdown[python_targets_python3_9(-)] ) ads? ( dev-python/dnspython:=[python_targets_python3_9(-)] net-dns/bind-tools[gssapi] ) ) python_single_target_python3_10? ( addc? ( dev-python/dnspython:=[python_targets_python3_10(-)] dev-python/markdown[python_targets_python3_10(-)] ) ads? ( dev-python/dnspython:=[python_targets_python3_10(-)] net-dns/bind-tools[gssapi] ) ) python_single_target_python3_11? ( addc? ( dev-python/dnspython:=[python_targets_python3_11(-)] dev-python/markdown[python_targets_python3_11(-)] ) ads? ( dev-python/dnspython:=[python_targets_python3_11(-)] net-dns/bind-tools[gssapi] ) ) acl? ( virtual/acl ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) fam? ( virtual/fam ) gpg? ( app-crypt/gpgme:= ) json? ( dev-libs/jansson:= ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) python? ( sys-libs/ldb[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] sys-libs/talloc[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] sys-libs/tdb[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] sys-libs/tevent[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] ) snapper? ( sys-apps/dbus ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.19[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:= ) unwind? ( llvm-libunwind? ( sys-libs/llvm-libunwind:= ) !llvm-libunwind? ( sys-libs/libunwind:= ) ) zeroconf? ( net-dns/avahi[dbus] ) client? ( net-fs/cifs-utils[ads?] ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[threads(+),xml(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10[threads(+),xml(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11[threads(+),xml(+)] ) ) selinux? ( sec-policy/selinux-samba ) virtual/tmpfiles
+REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) addc? ( json python !system-mitkrb5 winbind ) ads? ( acl ldap python winbind ) cluster? ( ads ) gpg? ( addc ) spotlight? ( json ) test? ( python ) !ads? ( !addc ) ?? ( system-heimdal system-mitkrb5 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://samba/stable/samba-4.16.8.tar.gz
+_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pam	01b77091d5b6560b0aeafa7fbb1bd818	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	waf-utils	44f2c60168a3ec2c5fb661d45c1cf397
+_md5_=497e37b020973c61fa448c421e3f4ebe
diff --git a/metadata/md5-cache/net-irc/Manifest.gz b/metadata/md5-cache/net-irc/Manifest.gz
index 9e7855af34b9..e56620e1ef64 100644
--- a/metadata/md5-cache/net-irc/Manifest.gz
+++ b/metadata/md5-cache/net-irc/Manifest.gz
diff --git a/metadata/md5-cache/net-irc/ergo-2.10.0-r1 b/metadata/md5-cache/net-irc/ergo-2.10.0-r1
deleted file mode 100644
index 1dfb5ff2975f..000000000000
--- a/metadata/md5-cache/net-irc/ergo-2.10.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-lang/go-1.18 app-arch/unzip virtual/pkgconfig
-DEFINED_PHASES=compile install postinst prepare unpack
-DESCRIPTION=A modern IRC server written in Go
-EAPI=8
-HOMEPAGE=https://ergo.chat/ https://github.com/ergochat/ergo
-INHERIT=go-module systemd
-KEYWORDS=amd64 ~arm ~arm64
-LICENSE=Apache-2.0 BSD-2 BSD ISC MIT MPL-2.0
-RDEPEND=acct-user/oragono acct-group/oragono
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://github.com/ergochat/ergo/archive/v2.10.0.tar.gz -> ergo-2.10.0.tar.gz
-_eclasses_=go-module	75029f071ebc843223233ab1b0a2d4a5	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=5f42a9f22e6ffbba391988a385aae56d
diff --git a/metadata/md5-cache/net-irc/ergo-2.11.0 b/metadata/md5-cache/net-irc/ergo-2.11.0
deleted file mode 100644
index 43b2c19ba353..000000000000
--- a/metadata/md5-cache/net-irc/ergo-2.11.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-lang/go-1.18 app-arch/unzip virtual/pkgconfig
-DEFINED_PHASES=compile install postinst prepare unpack
-DESCRIPTION=A modern IRC server written in Go
-EAPI=8
-HOMEPAGE=https://ergo.chat/ https://github.com/ergochat/ergo
-INHERIT=go-module systemd
-KEYWORDS=~amd64 ~arm ~arm64
-LICENSE=Apache-2.0 BSD-2 BSD ISC MIT MPL-2.0
-RDEPEND=acct-user/oragono acct-group/oragono
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://github.com/ergochat/ergo/archive/v2.11.0.tar.gz -> ergo-2.11.0.tar.gz
-_eclasses_=go-module	75029f071ebc843223233ab1b0a2d4a5	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=27c0fd19b58268699f7e21b591c748f9
diff --git a/metadata/md5-cache/net-irc/irker-2.23 b/metadata/md5-cache/net-irc/irker-2.23
new file mode 100644
index 000000000000..f72f139a4b9d
--- /dev/null
+++ b/metadata/md5-cache/net-irc/irker-2.23
@@ -0,0 +1,15 @@
+BDEPEND=app-text/docbook-xml-dtd:4.1.2 app-text/xmlto python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[ssl] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10[ssl] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11[ssl] ) virtual/pkgconfig
+DEFINED_PHASES=install postinst prepare setup
+DESCRIPTION=Submission tools for IRC notifications
+EAPI=8
+HOMEPAGE=http://www.catb.org/esr/irker/ https://gitlab.com/esr/irker
+INHERIT=optfeature python-single-r1 systemd
+IUSE=python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=BSD-2
+RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[ssl] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10[ssl] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11[ssl] )
+REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
+SLOT=0
+SRC_URI=http://www.catb.org/esr/irker/irker-2.23.tar.gz
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_md5_=d98a742e5d5103c0d9f144d5c58ec222
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 5b53893ff6da..daea3a3b7136 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/ntpsec-1.2.2 b/metadata/md5-cache/net-misc/ntpsec-1.2.2
index 62f6bbcd0468..2b0317d18b8f 100644
--- a/metadata/md5-cache/net-misc/ntpsec-1.2.2
+++ b/metadata/md5-cache/net-misc/ntpsec-1.2.2
@@ -1,16 +1,16 @@
-BDEPEND=>=app-text/asciidoc-8.6.8 dev-libs/libxslt app-text/docbook-xsl-stylesheets sys-devel/bison python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[threads(+)] ) virtual/pkgconfig
+BDEPEND=>=app-text/asciidoc-8.6.8 dev-libs/libxslt app-text/docbook-xsl-stylesheets sys-devel/bison python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11[threads(+)] ) virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[threads(+)] ) dev-libs/openssl:= dev-python/psutil[python_targets_python3_9(-)?,python_targets_python3_10(-)?] sys-libs/libcap libbsd? ( dev-libs/libbsd:0= ) seccomp? ( sys-libs/libseccomp ) rclock_oncore? ( net-misc/pps-tools ) rclock_pps? ( net-misc/pps-tools )
+DEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11[threads(+)] ) dev-libs/openssl:= dev-python/psutil[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] sys-libs/libcap libbsd? ( dev-libs/libbsd:0= ) seccomp? ( sys-libs/libseccomp ) rclock_oncore? ( net-misc/pps-tools ) rclock_pps? ( net-misc/pps-tools )
 DESCRIPTION=The NTP reference implementation, refactored
 EAPI=8
 HOMEPAGE=https://www.ntpsec.org/
 INHERIT=distutils-r1 flag-o-matic waf-utils systemd
-IUSE=rclock_oncore rclock_trimble rclock_truetime rclock_gpsd rclock_jjy rclock_generic rclock_spectracom rclock_shm rclock_pps rclock_hpgps rclock_zyfer rclock_arbiter rclock_nmea rclock_modem rclock_local debug doc early gdb heat libbsd nist ntpviz samba seccomp smear python_targets_python3_9 python_targets_python3_10
+IUSE=rclock_oncore rclock_trimble rclock_truetime rclock_gpsd rclock_jjy rclock_generic rclock_spectracom rclock_shm rclock_pps rclock_hpgps rclock_zyfer rclock_arbiter rclock_nmea rclock_modem rclock_local debug doc early gdb heat libbsd nist ntpviz samba seccomp smear python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
 LICENSE=HPND MIT BSD-2 BSD CC-BY-SA-4.0
-RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[threads(+)] ) dev-libs/openssl:= dev-python/psutil[python_targets_python3_9(-)?,python_targets_python3_10(-)?] sys-libs/libcap libbsd? ( dev-libs/libbsd:0= ) seccomp? ( sys-libs/libseccomp ) rclock_oncore? ( net-misc/pps-tools ) rclock_pps? ( net-misc/pps-tools ) !net-misc/ntp !net-misc/openntpd acct-group/ntp acct-user/ntp ntpviz? ( sci-visualization/gnuplot media-fonts/liberation-fonts ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[threads(+)] )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 ) nist? ( rclock_local ) || ( python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11[threads(+)] ) dev-libs/openssl:= dev-python/psutil[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] sys-libs/libcap libbsd? ( dev-libs/libbsd:0= ) seccomp? ( sys-libs/libseccomp ) rclock_oncore? ( net-misc/pps-tools ) rclock_pps? ( net-misc/pps-tools ) !net-misc/ntp !net-misc/openntpd acct-group/ntp acct-user/ntp ntpviz? ( sci-visualization/gnuplot media-fonts/liberation-fonts ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11[threads(+)] )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) nist? ( rclock_local ) || ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=ftp://ftp.ntpsec.org/pub/releases/ntpsec-1.2.2.tar.gz
 _eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	waf-utils	44f2c60168a3ec2c5fb661d45c1cf397
-_md5_=e467f22e1ad85aef8db40792c384e6bf
+_md5_=da4928f3e6f5d9d2dc126129cbb14c90
diff --git a/metadata/md5-cache/net-misc/ntpsec-9999 b/metadata/md5-cache/net-misc/ntpsec-9999
index 7d01683d7b69..2adb2824d7cd 100644
--- a/metadata/md5-cache/net-misc/ntpsec-9999
+++ b/metadata/md5-cache/net-misc/ntpsec-9999
@@ -1,15 +1,15 @@
-BDEPEND=>=app-text/asciidoc-8.6.8 dev-libs/libxslt app-text/docbook-xsl-stylesheets sys-devel/bison python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[threads(+)] ) virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=>=app-text/asciidoc-8.6.8 dev-libs/libxslt app-text/docbook-xsl-stylesheets sys-devel/bison python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11[threads(+)] ) virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst prepare test unpack
-DEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[threads(+)] ) dev-libs/openssl:= dev-python/psutil[python_targets_python3_9(-)?,python_targets_python3_10(-)?] sys-libs/libcap libbsd? ( dev-libs/libbsd:0= ) seccomp? ( sys-libs/libseccomp ) rclock_oncore? ( net-misc/pps-tools ) rclock_pps? ( net-misc/pps-tools )
+DEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11[threads(+)] ) dev-libs/openssl:= dev-python/psutil[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] sys-libs/libcap libbsd? ( dev-libs/libbsd:0= ) seccomp? ( sys-libs/libseccomp ) rclock_oncore? ( net-misc/pps-tools ) rclock_pps? ( net-misc/pps-tools )
 DESCRIPTION=The NTP reference implementation, refactored
 EAPI=8
 HOMEPAGE=https://www.ntpsec.org/
 INHERIT=distutils-r1 flag-o-matic waf-utils systemd git-r3
-IUSE=rclock_oncore rclock_trimble rclock_truetime rclock_gpsd rclock_jjy rclock_generic rclock_spectracom rclock_shm rclock_pps rclock_hpgps rclock_zyfer rclock_arbiter rclock_nmea rclock_modem rclock_local debug doc early gdb heat libbsd nist ntpviz samba seccomp smear python_targets_python3_9 python_targets_python3_10
+IUSE=rclock_oncore rclock_trimble rclock_truetime rclock_gpsd rclock_jjy rclock_generic rclock_spectracom rclock_shm rclock_pps rclock_hpgps rclock_zyfer rclock_arbiter rclock_nmea rclock_modem rclock_local debug doc early gdb heat libbsd nist ntpviz samba seccomp smear python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 LICENSE=HPND MIT BSD-2 BSD CC-BY-SA-4.0
 PROPERTIES=live
-RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[threads(+)] ) dev-libs/openssl:= dev-python/psutil[python_targets_python3_9(-)?,python_targets_python3_10(-)?] sys-libs/libcap libbsd? ( dev-libs/libbsd:0= ) seccomp? ( sys-libs/libseccomp ) rclock_oncore? ( net-misc/pps-tools ) rclock_pps? ( net-misc/pps-tools ) !net-misc/ntp !net-misc/openntpd acct-group/ntp acct-user/ntp ntpviz? ( sci-visualization/gnuplot media-fonts/liberation-fonts ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[threads(+)] )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 ) nist? ( rclock_local ) || ( python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11[threads(+)] ) dev-libs/openssl:= dev-python/psutil[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] sys-libs/libcap libbsd? ( dev-libs/libbsd:0= ) seccomp? ( sys-libs/libseccomp ) rclock_oncore? ( net-misc/pps-tools ) rclock_pps? ( net-misc/pps-tools ) !net-misc/ntp !net-misc/openntpd acct-group/ntp acct-user/ntp ntpviz? ( sci-visualization/gnuplot media-fonts/liberation-fonts ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11[threads(+)] )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) nist? ( rclock_local ) || ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 _eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	waf-utils	44f2c60168a3ec2c5fb661d45c1cf397
-_md5_=e467f22e1ad85aef8db40792c384e6bf
+_md5_=da4928f3e6f5d9d2dc126129cbb14c90
diff --git a/metadata/md5-cache/net-misc/tigervnc-1.12.90 b/metadata/md5-cache/net-misc/tigervnc-1.13.0
index 44db4d476544..844dd75d4aef 100644
--- a/metadata/md5-cache/net-misc/tigervnc-1.12.90
+++ b/metadata/md5-cache/net-misc/tigervnc-1.13.0
@@ -12,6 +12,6 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/gmp:= dev-libs/nettle:= media-libs/libjpeg-turbo:= sys-libs/zlib:= x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/pixman gnutls? ( net-libs/gnutls:= ) nls? ( virtual/libiconv ) server? ( dev-libs/libbsd dev-libs/openssl:0= sys-libs/pam x11-libs/libXau x11-libs/libXdamage x11-libs/libXdmcp x11-libs/libXfixes x11-libs/libXfont2 x11-libs/libXtst x11-libs/pixman x11-libs/xtrans x11-apps/xauth x11-apps/xinit x11-apps/xkbcomp x11-apps/xsetroot x11-misc/xkeyboard-config opengl? ( media-libs/libglvnd[X] ) !net-misc/turbovnc[server] ) viewer? ( media-video/ffmpeg:= x11-libs/fltk:1 x11-libs/libXi x11-libs/libXrender !net-misc/turbovnc[viewer] ) java? ( virtual/jre:1.8 ) server? ( dev-lang/perl sys-process/psmisc ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=dri3? ( drm ) java? ( viewer ) opengl? ( server ) || ( server viewer )
 SLOT=0
-SRC_URI=server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-21.1.1.tar.xz ) https://github.com/TigerVNC/tigervnc/archive/v1.12.90.tar.gz -> tigervnc-1.12.90.tar.gz
+SRC_URI=server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-21.1.1.tar.xz ) https://github.com/TigerVNC/tigervnc/archive/v1.13.0.tar.gz -> tigervnc-1.13.0.tar.gz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=53fcff2bd21a383444d9ae1bd7bef3f7
diff --git a/metadata/md5-cache/net-misc/tigervnc-xorg-module-1.12.90 b/metadata/md5-cache/net-misc/tigervnc-xorg-module-1.13.0
index 87cdebce9d27..4cc5ed97fdd7 100644
--- a/metadata/md5-cache/net-misc/tigervnc-xorg-module-1.12.90
+++ b/metadata/md5-cache/net-misc/tigervnc-xorg-module-1.13.0
@@ -4,6 +4,6 @@ EAPI=8
 HOMEPAGE=https://tigervnc.org/
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=metapackage
-RDEPEND=~net-misc/tigervnc-1.12.90[server] =x11-base/xorg-server-21.1*
+RDEPEND=~net-misc/tigervnc-1.13.0[server] =x11-base/xorg-server-21.1*
 SLOT=0
 _md5_=2d31a197d54685c902e6206fefc4d37c
diff --git a/metadata/md5-cache/net-vpn/Manifest.gz b/metadata/md5-cache/net-vpn/Manifest.gz
index 1901854d79d2..47ed127cd446 100644
--- a/metadata/md5-cache/net-vpn/Manifest.gz
+++ b/metadata/md5-cache/net-vpn/Manifest.gz
diff --git a/metadata/md5-cache/net-vpn/networkmanager-l2tp-1.8.8 b/metadata/md5-cache/net-vpn/networkmanager-l2tp-1.8.8
deleted file mode 100644
index 2fbd6d7a367a..000000000000
--- a/metadata/md5-cache/net-vpn/networkmanager-l2tp-1.8.8
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gettext dev-util/intltool virtual/pkgconfig app-arch/xz-utils sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=configure prepare
-DEPEND=>=net-misc/networkmanager-1.8[ppp] dev-libs/dbus-glib net-dialup/ppp:=[eap-tls] net-dialup/xl2tpd >=dev-libs/glib-2.32 || ( net-vpn/strongswan net-vpn/libreswan ) gnome? ( x11-libs/gtk+:3 app-crypt/libsecret gnome-extra/nm-applet )
-DESCRIPTION=NetworkManager L2TP plugin
-EAPI=8
-HOMEPAGE=https://github.com/nm-l2tp/network-manager-l2tp
-INHERIT=gnome.org autotools
-IUSE=gnome static-libs
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=net-misc/networkmanager-1.8[ppp] dev-libs/dbus-glib net-dialup/ppp:=[eap-tls] net-dialup/xl2tpd >=dev-libs/glib-2.32 || ( net-vpn/strongswan net-vpn/libreswan ) gnome? ( x11-libs/gtk+:3 app-crypt/libsecret gnome-extra/nm-applet )
-SLOT=0
-SRC_URI=https://github.com/nm-l2tp/NetworkManager-l2tp/releases/download/1.8.8/NetworkManager-l2tp-1.8.8.tar.xz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=cf3b0bcd60e167068d3c50a8e01e9af9
diff --git a/metadata/md5-cache/net-vpn/tor-0.4.7.13 b/metadata/md5-cache/net-vpn/tor-0.4.7.13
index 48b121de23d3..a8f70a8aef58 100644
--- a/metadata/md5-cache/net-vpn/tor-0.4.7.13
+++ b/metadata/md5-cache/net-vpn/tor-0.4.7.13
@@ -1,16 +1,16 @@
 BDEPEND=verify-sig? ( >=sec-keys/openpgp-keys-tor-20221213 ) virtual/pkgconfig verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=configure install setup unpack
-DEPEND=dev-libs/libevent:=[ssl] sys-libs/zlib caps? ( sys-libs/libcap ) man? ( app-text/asciidoc ) dev-libs/openssl:0=[-bindist(-)] lzma? ( app-arch/xz-utils ) scrypt? ( app-crypt/libscrypt ) seccomp? ( >=sys-libs/libseccomp-2.4.1 ) systemd? ( sys-apps/systemd ) zstd? ( app-arch/zstd ) test? ( dev-libs/libevent:=[ssl] sys-libs/zlib caps? ( sys-libs/libcap ) man? ( app-text/asciidoc ) dev-libs/openssl:0=[-bindist(-)] lzma? ( app-arch/xz-utils ) scrypt? ( app-crypt/libscrypt ) seccomp? ( >=sys-libs/libseccomp-2.4.1 ) systemd? ( sys-apps/systemd ) zstd? ( app-arch/zstd ) || ( >=dev-lang/python-3.10.9:3.10 >=dev-lang/python-3.9.16:3.9 ) )
+DEFINED_PHASES=configure install prepare setup unpack
+DEPEND=dev-libs/libevent:=[ssl] sys-libs/zlib caps? ( sys-libs/libcap ) man? ( app-text/asciidoc ) dev-libs/openssl:=[-bindist(-)] lzma? ( app-arch/xz-utils ) scrypt? ( app-crypt/libscrypt ) seccomp? ( >=sys-libs/libseccomp-2.4.1 ) systemd? ( sys-apps/systemd ) zstd? ( app-arch/zstd ) test? ( dev-libs/libevent:=[ssl] sys-libs/zlib caps? ( sys-libs/libcap ) man? ( app-text/asciidoc ) dev-libs/openssl:=[-bindist(-)] lzma? ( app-arch/xz-utils ) scrypt? ( app-crypt/libscrypt ) seccomp? ( >=sys-libs/libseccomp-2.4.1 ) systemd? ( sys-apps/systemd ) zstd? ( app-arch/zstd ) || ( >=dev-lang/python-3.11.1:3.11 >=dev-lang/python-3.10.9:3.10 >=dev-lang/python-3.9.16:3.9 ) )
 DESCRIPTION=Anonymizing overlay network for TCP
 EAPI=8
-HOMEPAGE=https://www.torproject.org/
+HOMEPAGE=https://www.torproject.org/ https://gitlab.torproject.org/tpo/core/tor/
 INHERIT=python-any-r1 readme.gentoo-r1 systemd verify-sig
 IUSE=caps doc lzma +man scrypt seccomp selinux +server systemd tor-hardening test zstd verify-sig
 KEYWORDS=amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86 ~ppc-macos
 LICENSE=BSD GPL-2
-RDEPEND=acct-user/tor acct-group/tor dev-libs/libevent:=[ssl] sys-libs/zlib caps? ( sys-libs/libcap ) man? ( app-text/asciidoc ) dev-libs/openssl:0=[-bindist(-)] lzma? ( app-arch/xz-utils ) scrypt? ( app-crypt/libscrypt ) seccomp? ( >=sys-libs/libseccomp-2.4.1 ) systemd? ( sys-apps/systemd ) zstd? ( app-arch/zstd ) selinux? ( sec-policy/selinux-tor )
+RDEPEND=acct-user/tor acct-group/tor dev-libs/libevent:=[ssl] sys-libs/zlib caps? ( sys-libs/libcap ) man? ( app-text/asciidoc ) dev-libs/openssl:=[-bindist(-)] lzma? ( app-arch/xz-utils ) scrypt? ( app-crypt/libscrypt ) seccomp? ( >=sys-libs/libseccomp-2.4.1 ) systemd? ( sys-apps/systemd ) zstd? ( app-arch/zstd ) selinux? ( sec-policy/selinux-tor )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.torproject.org/dist/tor-0.4.7.13.tar.gz https://archive.torproject.org/tor-package-archive/tor-0.4.7.13.tar.gz verify-sig? ( https://dist.torproject.org/tor-0.4.7.13.tar.gz.sha256sum https://dist.torproject.org/tor-0.4.7.13.tar.gz.sha256sum.asc )
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	verify-sig	afb98fe4696292e4234ce36713fd4e9e
-_md5_=a52915d75e730c085a0b75355404dba4
+_md5_=8aa34b9108cc53dd126200bb9b818fe5
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 6ef492470194..8a83e95b36fe 100644
--- a/metadata/md5-cache/sys-apps/Manifest.gz
+++ b/metadata/md5-cache/sys-apps/Manifest.gz
diff --git a/metadata/md5-cache/sys-apps/coreutils-9.1-r1 b/metadata/md5-cache/sys-apps/coreutils-9.1-r1
deleted file mode 100644
index 1b7e6b6dedfa..000000000000
--- a/metadata/md5-cache/sys-apps/coreutils-9.1-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-arch/xz-utils dev-lang/perl test? ( dev-lang/perl dev-perl/Expect dev-util/strace || ( >=dev-lang/python-3.10.9:3.10 >=dev-lang/python-3.9.16:3.9 ) ) verify-sig? ( sec-keys/openpgp-keys-coreutils ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=configure install postinst prepare setup test unpack
-DEPEND=!static? ( acl? ( sys-apps/acl ) caps? ( sys-libs/libcap ) gmp? ( dev-libs/gmp:= ) xattr? ( sys-apps/attr ) ) selinux? ( sys-libs/libselinux ) nls? ( virtual/libintl ) static? ( acl? ( sys-apps/acl[static-libs] ) caps? ( sys-libs/libcap ) gmp? ( dev-libs/gmp:=[static-libs] ) xattr? ( sys-apps/attr[static-libs] ) )
-DESCRIPTION=Standard GNU utilities (chmod, cp, dd, ls, sort, tr, head, wc, who,...)
-EAPI=7
-HOMEPAGE=https://www.gnu.org/software/coreutils/
-INHERIT=flag-o-matic python-any-r1 toolchain-funcs verify-sig
-IUSE=acl caps gmp hostname kill multicall nls selinux +split-usr static test vanilla xattr verify-sig
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux
-LICENSE=GPL-3+
-RDEPEND=!static? ( acl? ( sys-apps/acl ) caps? ( sys-libs/libcap ) gmp? ( dev-libs/gmp:= ) xattr? ( sys-apps/attr ) ) selinux? ( sys-libs/libselinux ) nls? ( virtual/libintl ) hostname? ( !sys-apps/net-tools[hostname] ) kill? ( !sys-apps/util-linux[kill] !sys-process/procps[kill] ) !app-misc/realpath !<sys-apps/util-linux-2.13 !<sys-apps/sandbox-2.10-r4 !sys-apps/stat !net-mail/base64 !sys-apps/mktemp !<app-forensics/tct-1.18-r1 !<net-fs/netatalk-2.0.3-r4
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://gnu/coreutils/coreutils-9.1.tar.xz verify-sig? ( mirror://gnu/coreutils/coreutils-9.1.tar.xz.sig ) !vanilla? ( https://dev.gentoo.org/~sam/distfiles/sys-apps/coreutils/coreutils-9.0_p20220409-patches-01.tar.xz )
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	verify-sig	afb98fe4696292e4234ce36713fd4e9e	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=c4566b92cb0e99043971155aec3ad38f
diff --git a/metadata/md5-cache/sys-apps/coreutils-9.1-r2 b/metadata/md5-cache/sys-apps/coreutils-9.1-r2
index 878dfcdb50ff..39bb9875aa4c 100644
--- a/metadata/md5-cache/sys-apps/coreutils-9.1-r2
+++ b/metadata/md5-cache/sys-apps/coreutils-9.1-r2
@@ -1,4 +1,4 @@
-BDEPEND=app-arch/xz-utils dev-lang/perl test? ( dev-lang/perl dev-perl/Expect dev-util/strace || ( >=dev-lang/python-3.10.9:3.10 >=dev-lang/python-3.9.16:3.9 ) ) verify-sig? ( sec-keys/openpgp-keys-coreutils ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+BDEPEND=app-arch/xz-utils dev-lang/perl test? ( dev-lang/perl dev-perl/Expect dev-util/strace || ( >=dev-lang/python-3.11.1:3.11 >=dev-lang/python-3.10.9:3.10 >=dev-lang/python-3.9.16:3.9 ) ) verify-sig? ( sec-keys/openpgp-keys-coreutils ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
 DEFINED_PHASES=configure install postinst prepare setup test unpack
 DEPEND=!static? ( acl? ( sys-apps/acl ) caps? ( sys-libs/libcap ) gmp? ( dev-libs/gmp:= ) openssl? ( dev-libs/openssl:= ) xattr? ( sys-apps/attr ) ) selinux? ( sys-libs/libselinux ) nls? ( virtual/libintl ) static? ( acl? ( sys-apps/acl[static-libs] ) caps? ( sys-libs/libcap ) gmp? ( dev-libs/gmp:=[static-libs] ) openssl? ( dev-libs/openssl:=[static-libs] ) xattr? ( sys-apps/attr[static-libs] ) )
 DESCRIPTION=Standard GNU utilities (chmod, cp, dd, ls, sort, tr, head, wc, who,...)
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnu/coreutils/coreutils-9.1.tar.xz verify-sig? ( mirror://gnu/coreutils/coreutils-9.1.tar.xz.sig ) !vanilla? ( https://dev.gentoo.org/~sam/distfiles/sys-apps/coreutils/coreutils-9.0_p20220409-patches-01.tar.xz )
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	verify-sig	afb98fe4696292e4234ce36713fd4e9e	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=5589804a8d70e74c7db5f6e1dcb2b2f5
+_md5_=7f8b29fcd4757a897c9afcc3ed7a4e2b
diff --git a/metadata/md5-cache/sys-apps/memtest86+-6.01 b/metadata/md5-cache/sys-apps/memtest86+-6.01
index dcd3eafdced3..97549f521fb4 100644
--- a/metadata/md5-cache/sys-apps/memtest86+-6.01
+++ b/metadata/md5-cache/sys-apps/memtest86+-6.01
@@ -5,9 +5,9 @@ EAPI=8
 HOMEPAGE=https://www.memtest.org/
 INHERIT=mount-boot toolchain-funcs
 IUSE=bios32 bios64 +boot efi32 efi64 iso32 iso64
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/memtest86plus/memtest86plus/archive/refs/tags/v6.01.tar.gz -> memtest86+-6.01.tar.gz
 _eclasses_=mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=2bc62953cbfd1dbe27de95f79a28281e
+_md5_=51ec788bc9a24f823b89b41810180dcf
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index 3b5fedac4db9..544c23224f3c 100644
--- a/metadata/md5-cache/sys-devel/Manifest.gz
+++ b/metadata/md5-cache/sys-devel/Manifest.gz
diff --git a/metadata/md5-cache/sys-devel/crossdev-20220909 b/metadata/md5-cache/sys-devel/crossdev-20220909
index 3a1a5e9a207f..97e14ef173e8 100644
--- a/metadata/md5-cache/sys-devel/crossdev-20220909
+++ b/metadata/md5-cache/sys-devel/crossdev-20220909
@@ -8,4 +8,4 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/portage-2.1 >=app-portage/portage-utils-0.55 app-shells/bash sys-apps/gentoo-functions
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~sam/distfiles/sys-devel/crossdev/crossdev-20220909.tar.xz https://dev.gentoo.org/~vapier/dist/crossdev-20220909.tar.xz
-_md5_=8d8b13bfa7209da6c6a1d792cdfbe55c
+_md5_=b4d9acdd52b299d3bd915a3bb14c0ac0
diff --git a/metadata/md5-cache/sys-devel/crossdev-20221228 b/metadata/md5-cache/sys-devel/crossdev-20221228
index bdf27ec8390d..17e4b2b00599 100644
--- a/metadata/md5-cache/sys-devel/crossdev-20221228
+++ b/metadata/md5-cache/sys-devel/crossdev-20221228
@@ -8,4 +8,4 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/portage-2.1 app-shells/bash sys-apps/gentoo-functions
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~sam/distfiles/sys-devel/crossdev/crossdev-20221228.tar.xz https://dev.gentoo.org/~vapier/dist/crossdev-20221228.tar.xz
-_md5_=1f3826bf8ed18477fb39c1fbacb50e99
+_md5_=e924ed45cc4a4ba662f8fa7da5018f27
diff --git a/metadata/md5-cache/sys-devel/crossdev-99999999 b/metadata/md5-cache/sys-devel/crossdev-99999999
index 8e3cbf88e54c..99f07314971a 100644
--- a/metadata/md5-cache/sys-devel/crossdev-99999999
+++ b/metadata/md5-cache/sys-devel/crossdev-99999999
@@ -9,4 +9,4 @@ PROPERTIES=live
 RDEPEND=>=sys-apps/portage-2.1 app-shells/bash sys-apps/gentoo-functions
 SLOT=0
 _eclasses_=git-r3	2347f8fe2d392b2a091191f94be37e6f
-_md5_=1f3826bf8ed18477fb39c1fbacb50e99
+_md5_=e924ed45cc4a4ba662f8fa7da5018f27
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index a70d237ee222..a24f72c2945b 100644
--- a/metadata/md5-cache/sys-fs/Manifest.gz
+++ b/metadata/md5-cache/sys-fs/Manifest.gz
diff --git a/metadata/md5-cache/sys-fs/e2fsprogs-1.46.5-r4 b/metadata/md5-cache/sys-fs/e2fsprogs-1.46.5-r4
index a0ef9f1a2dd6..6e25eac021f2 100644
--- a/metadata/md5-cache/sys-fs/e2fsprogs-1.46.5-r4
+++ b/metadata/md5-cache/sys-fs/e2fsprogs-1.46.5-r4
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=http://e2fsprogs.sourceforge.net/
 INHERIT=flag-o-matic systemd toolchain-funcs udev usr-ldscript multilib-minimal
 IUSE=cron fuse nls static-libs test +tools split-usr abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2 BSD
 RDEPEND=!sys-libs/e2fsprogs-libs cron? ( sys-fs/lvm2[lvm] ) fuse? ( sys-fs/fuse:0 ) nls? ( virtual/libintl ) tools? ( sys-apps/util-linux )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.46.5/e2fsprogs-1.46.5.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	udev	eec0bbab06977f1cfc5597269c1fa152	usr-ldscript	cd36f6d91e8173d95e25b0e0cf036960	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=c9e2d979e0693567bba6aba4bdc40a84
+_md5_=5fcad0c42166f0abd5b7d29167426ffc
diff --git a/metadata/md5-cache/sys-fs/e2fsprogs-1.46.6 b/metadata/md5-cache/sys-fs/e2fsprogs-1.46.6
new file mode 100644
index 000000000000..cf0a6530897d
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/e2fsprogs-1.46.6
@@ -0,0 +1,16 @@
+BDEPEND=sys-apps/texinfo virtual/pkgconfig nls? ( sys-devel/gettext ) virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=!sys-libs/e2fsprogs-libs cron? ( sys-fs/lvm2[lvm] ) fuse? ( sys-fs/fuse:0 ) nls? ( virtual/libintl ) tools? ( sys-apps/util-linux ) test? ( sys-apps/util-linux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DESCRIPTION=Standard EXT2/EXT3/EXT4 filesystem utilities
+EAPI=8
+HOMEPAGE=http://e2fsprogs.sourceforge.net/
+INHERIT=flag-o-matic multilib-minimal systemd toolchain-funcs udev usr-ldscript
+IUSE=cron fuse nls static-libs test +tools abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2 BSD
+RDEPEND=!sys-libs/e2fsprogs-libs cron? ( sys-fs/lvm2[lvm] ) fuse? ( sys-fs/fuse:0 ) nls? ( virtual/libintl ) tools? ( sys-apps/util-linux )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.46.6/e2fsprogs-1.46.6.tar.xz
+_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	udev	eec0bbab06977f1cfc5597269c1fa152	usr-ldscript	cd36f6d91e8173d95e25b0e0cf036960
+_md5_=7c5c969089118173ae6238bbd32504e8
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index 3ba586acecdc..b6ddaedfe38b 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/ldb-2.4.4 b/metadata/md5-cache/sys-libs/ldb-2.4.4
index 9de0d12daa59..3fa82e611eeb 100644
--- a/metadata/md5-cache/sys-libs/ldb-2.4.4
+++ b/metadata/md5-cache/sys-libs/ldb-2.4.4
@@ -1,17 +1,17 @@
-BDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10[threads(+)] ) dev-libs/libxslt virtual/pkgconfig doc? ( app-doc/doxygen )
+BDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11[threads(+)] ) dev-libs/libxslt virtual/pkgconfig doc? ( app-doc/doxygen )
 DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/cmocka-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/talloc-2.3.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.4.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.11.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ldap? ( net-nds/openldap:= ) lmdb? ( >=dev-db/lmdb-0.9.16:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10[threads(+)] ) sys-libs/talloc[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] sys-libs/tdb[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] sys-libs/tevent[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) virtual/libcrypt
+DEPEND=dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/cmocka-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/talloc-2.3.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.4.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.11.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ldap? ( net-nds/openldap:= ) lmdb? ( >=dev-db/lmdb-0.9.16:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11[threads(+)] ) sys-libs/talloc[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] sys-libs/tdb[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] sys-libs/tevent[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] ) virtual/libcrypt
 DESCRIPTION=LDAP-like embedded database
 EAPI=7
 HOMEPAGE=https://ldb.samba.org
 INHERIT=python-single-r1 waf-utils multilib-minimal
-IUSE=doc ldap +lmdb python test python_single_target_python3_9 python_single_target_python3_10 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+IUSE=doc ldap +lmdb python test python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=LGPL-3
-RDEPEND=dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/cmocka-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/talloc-2.3.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.4.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.11.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ldap? ( net-nds/openldap:= ) lmdb? ( >=dev-db/lmdb-0.9.16:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10[threads(+)] ) sys-libs/talloc[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] sys-libs/tdb[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] sys-libs/tevent[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 ) test? ( lmdb python )
+RDEPEND=dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/cmocka-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/talloc-2.3.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.4.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.11.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ldap? ( net-nds/openldap:= ) lmdb? ( >=dev-db/lmdb-0.9.16:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11[threads(+)] ) sys-libs/talloc[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] sys-libs/tdb[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] sys-libs/tevent[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) test? ( lmdb python )
 RESTRICT=!test? ( test )
 SLOT=0/2.4.4
 SRC_URI=https://samba.org/ftp/pub/ldb/ldb-2.4.4.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	waf-utils	44f2c60168a3ec2c5fb661d45c1cf397
-_md5_=3339e813c99c8d0eefd05b6114b5eadb
+_md5_=df5f684fb5e4ce669e38d913d1f7679c
diff --git a/metadata/md5-cache/sys-libs/ldb-2.5.2 b/metadata/md5-cache/sys-libs/ldb-2.5.2
index 82b66b11c1df..63726913f251 100644
--- a/metadata/md5-cache/sys-libs/ldb-2.5.2
+++ b/metadata/md5-cache/sys-libs/ldb-2.5.2
@@ -1,17 +1,17 @@
-BDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10[threads(+)] ) dev-libs/libxslt virtual/pkgconfig doc? ( app-doc/doxygen )
+BDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11[threads(+)] ) dev-libs/libxslt virtual/pkgconfig doc? ( app-doc/doxygen )
 DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/cmocka-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/talloc-2.3.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.4.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.11.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ldap? ( net-nds/openldap:= ) lmdb? ( >=dev-db/lmdb-0.9.16:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10[threads(+)] ) sys-libs/talloc[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] sys-libs/tdb[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] sys-libs/tevent[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) virtual/libcrypt
+DEPEND=dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/cmocka-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/talloc-2.3.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.4.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.11.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ldap? ( net-nds/openldap:= ) lmdb? ( >=dev-db/lmdb-0.9.16:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11[threads(+)] ) sys-libs/talloc[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] sys-libs/tdb[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] sys-libs/tevent[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] ) virtual/libcrypt
 DESCRIPTION=LDAP-like embedded database
 EAPI=7
 HOMEPAGE=https://ldb.samba.org
 INHERIT=python-single-r1 waf-utils multilib-minimal
-IUSE=doc ldap +lmdb python test python_single_target_python3_9 python_single_target_python3_10 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+IUSE=doc ldap +lmdb python test python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=LGPL-3
-RDEPEND=dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/cmocka-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/talloc-2.3.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.4.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.11.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ldap? ( net-nds/openldap:= ) lmdb? ( >=dev-db/lmdb-0.9.16:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10[threads(+)] ) sys-libs/talloc[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] sys-libs/tdb[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] sys-libs/tevent[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 ) test? ( lmdb python )
+RDEPEND=dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/cmocka-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/talloc-2.3.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.4.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.11.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ldap? ( net-nds/openldap:= ) lmdb? ( >=dev-db/lmdb-0.9.16:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11[threads(+)] ) sys-libs/talloc[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] sys-libs/tdb[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] sys-libs/tevent[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) test? ( lmdb python )
 RESTRICT=!test? ( test )
 SLOT=0/2.5.2
 SRC_URI=https://samba.org/ftp/pub/ldb/ldb-2.5.2.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	waf-utils	44f2c60168a3ec2c5fb661d45c1cf397
-_md5_=d7829b84ac6dda02fb575dc57d9ba09e
+_md5_=bfa1b63d6015f5fa5542ba2babfbf453
diff --git a/metadata/md5-cache/sys-libs/ldb-2.6.1 b/metadata/md5-cache/sys-libs/ldb-2.6.1
index 4bb0ea3c8b21..247343adf93f 100644
--- a/metadata/md5-cache/sys-libs/ldb-2.6.1
+++ b/metadata/md5-cache/sys-libs/ldb-2.6.1
@@ -1,17 +1,17 @@
-BDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10[threads(+)] ) dev-libs/libxslt virtual/pkgconfig doc? ( app-doc/doxygen )
+BDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11[threads(+)] ) dev-libs/libxslt virtual/pkgconfig doc? ( app-doc/doxygen )
 DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/talloc-2.3.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.4.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.13.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ldap? ( net-nds/openldap:= ) lmdb? ( >=dev-db/lmdb-0.9.16:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10[threads(+)] ) sys-libs/talloc[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] sys-libs/tdb[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] sys-libs/tevent[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) virtual/libcrypt test? ( >=dev-util/cmocka-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DEPEND=dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/talloc-2.3.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.4.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.13.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ldap? ( net-nds/openldap:= ) lmdb? ( >=dev-db/lmdb-0.9.16:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11[threads(+)] ) sys-libs/talloc[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] sys-libs/tdb[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] sys-libs/tevent[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] ) virtual/libcrypt test? ( >=dev-util/cmocka-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 DESCRIPTION=LDAP-like embedded database
 EAPI=8
 HOMEPAGE=https://ldb.samba.org
 INHERIT=python-single-r1 waf-utils multilib-minimal
-IUSE=doc ldap +lmdb python test python_single_target_python3_9 python_single_target_python3_10 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+IUSE=doc ldap +lmdb python test python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=LGPL-3
-RDEPEND=dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/talloc-2.3.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.4.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.13.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ldap? ( net-nds/openldap:= ) lmdb? ( >=dev-db/lmdb-0.9.16:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10[threads(+)] ) sys-libs/talloc[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] sys-libs/tdb[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] sys-libs/tevent[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 ) test? ( lmdb python )
+RDEPEND=dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/talloc-2.3.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.4.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.13.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ldap? ( net-nds/openldap:= ) lmdb? ( >=dev-db/lmdb-0.9.16:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11[threads(+)] ) sys-libs/talloc[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] sys-libs/tdb[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] sys-libs/tevent[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) test? ( lmdb python )
 RESTRICT=!test? ( test )
 SLOT=0/2.6.1
 SRC_URI=https://samba.org/ftp/pub/ldb/ldb-2.6.1.tar.gz
 _eclasses_=multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	waf-utils	44f2c60168a3ec2c5fb661d45c1cf397
-_md5_=bb8d2aa124d2caacc136bfb2cdb05516
+_md5_=bd2c4d630c26422c18e2215da35eb4db
diff --git a/metadata/md5-cache/sys-libs/ldb-2.7.0 b/metadata/md5-cache/sys-libs/ldb-2.7.0
new file mode 100644
index 000000000000..63e3e8ada3f5
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/ldb-2.7.0
@@ -0,0 +1,17 @@
+BDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11[threads(+)] ) dev-libs/libxslt virtual/pkgconfig doc? ( app-doc/doxygen )
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/talloc-2.4.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.4.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.14.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ldap? ( net-nds/openldap:= ) lmdb? ( >=dev-db/lmdb-0.9.16:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11[threads(+)] ) sys-libs/talloc[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] sys-libs/tdb[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] sys-libs/tevent[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] ) virtual/libcrypt test? ( >=dev-util/cmocka-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DESCRIPTION=LDAP-like embedded database
+EAPI=8
+HOMEPAGE=https://ldb.samba.org
+INHERIT=python-single-r1 waf-utils multilib-minimal
+IUSE=doc ldap +lmdb python test python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=LGPL-3
+RDEPEND=dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/talloc-2.4.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.4.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.14.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ldap? ( net-nds/openldap:= ) lmdb? ( >=dev-db/lmdb-0.9.16:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11[threads(+)] ) sys-libs/talloc[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] sys-libs/tdb[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] sys-libs/tevent[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) test? ( lmdb python )
+RESTRICT=!test? ( test )
+SLOT=0/2.7.0
+SRC_URI=https://samba.org/ftp/pub/ldb/ldb-2.7.0.tar.gz
+_eclasses_=multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	waf-utils	44f2c60168a3ec2c5fb661d45c1cf397
+_md5_=c4cde0bc889c48a53623d077e765382b
diff --git a/metadata/md5-cache/sys-libs/libcap-2.67 b/metadata/md5-cache/sys-libs/libcap-2.67
new file mode 100644
index 000000000000..f5af1060914c
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/libcap-2.67
@@ -0,0 +1,15 @@
+BDEPEND=sys-apps/diffutils tools? ( dev-lang/go )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=pam? ( sys-libs/pam[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-kernel/linux-headers
+DESCRIPTION=POSIX 1003.1e capabilities
+EAPI=7
+HOMEPAGE=https://sites.google.com/site/fullycapable/
+INHERIT=multilib-minimal toolchain-funcs pam usr-ldscript
+IUSE=pam static-libs tools abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=|| ( GPL-2 BSD )
+PDEPEND=pam? ( sys-libs/pam[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+SLOT=0
+SRC_URI=https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/libcap-2.67.tar.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pam	01b77091d5b6560b0aeafa7fbb1bd818	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	usr-ldscript	cd36f6d91e8173d95e25b0e0cf036960	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=d6196efe0d02df0b06246e8206bed209
diff --git a/metadata/md5-cache/sys-libs/libcap-9999 b/metadata/md5-cache/sys-libs/libcap-9999
index d0271c3231d5..769c15f19171 100644
--- a/metadata/md5-cache/sys-libs/libcap-9999
+++ b/metadata/md5-cache/sys-libs/libcap-9999
@@ -11,4 +11,4 @@ PDEPEND=pam? ( sys-libs/pam[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mi
 PROPERTIES=live
 SLOT=0
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pam	01b77091d5b6560b0aeafa7fbb1bd818	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	usr-ldscript	cd36f6d91e8173d95e25b0e0cf036960	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=829c523dbc9eff61ee83bc32dd6a1373
+_md5_=d6196efe0d02df0b06246e8206bed209
diff --git a/metadata/md5-cache/sys-libs/tevent-0.12.1 b/metadata/md5-cache/sys-libs/tevent-0.12.1
index 77c407b30cdf..8ae0941c370c 100644
--- a/metadata/md5-cache/sys-libs/tevent-0.12.1
+++ b/metadata/md5-cache/sys-libs/tevent-0.12.1
@@ -1,17 +1,17 @@
-BDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10[threads(+)] ) virtual/pkgconfig
+BDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11[threads(+)] ) virtual/pkgconfig
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/talloc-2.3.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10[threads(+)] ) sys-libs/talloc[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) >=dev-util/cmocka-1.1.3 elibc_glibc? ( net-libs/libtirpc[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( net-libs/rpcsvc-proto <sys-libs/glibc-2.26[rpc(+)] ) )
+DEPEND=dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/talloc-2.3.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11[threads(+)] ) sys-libs/talloc[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] ) >=dev-util/cmocka-1.1.3 elibc_glibc? ( net-libs/libtirpc[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( net-libs/rpcsvc-proto <sys-libs/glibc-2.26[rpc(+)] ) )
 DESCRIPTION=Samba tevent library
 EAPI=7
 HOMEPAGE=https://tevent.samba.org/
 INHERIT=waf-utils multilib-minimal python-single-r1
-IUSE=python abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 python_single_target_python3_9 python_single_target_python3_10
+IUSE=python abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux
 LICENSE=GPL-3
-RDEPEND=dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/talloc-2.3.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10[threads(+)] ) sys-libs/talloc[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 )
+RDEPEND=dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/talloc-2.3.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11[threads(+)] ) sys-libs/talloc[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://samba.org/ftp/tevent/tevent-0.12.1.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	waf-utils	44f2c60168a3ec2c5fb661d45c1cf397
-_md5_=ac4fc4d6a6d81954a03875143040683f
+_md5_=8f392adec574c352e7218d279766cc99
diff --git a/metadata/md5-cache/sys-libs/tevent-0.13.0 b/metadata/md5-cache/sys-libs/tevent-0.13.0
index f10c40100550..81a993d33472 100644
--- a/metadata/md5-cache/sys-libs/tevent-0.13.0
+++ b/metadata/md5-cache/sys-libs/tevent-0.13.0
@@ -1,17 +1,17 @@
-BDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10[threads(+)] ) virtual/pkgconfig
+BDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11[threads(+)] ) virtual/pkgconfig
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/talloc-2.3.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10[threads(+)] ) >=sys-libs/talloc-2.3.4[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) elibc_glibc? ( net-libs/libtirpc[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/rpcsvc-proto ) test? ( >=dev-util/cmocka-1.1.3 )
+DEPEND=dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/talloc-2.3.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11[threads(+)] ) >=sys-libs/talloc-2.3.4[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] ) elibc_glibc? ( net-libs/libtirpc[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/rpcsvc-proto ) test? ( >=dev-util/cmocka-1.1.3 )
 DESCRIPTION=Samba tevent library
 EAPI=8
 HOMEPAGE=https://tevent.samba.org/
 INHERIT=waf-utils multilib-minimal python-single-r1
-IUSE=python test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 python_single_target_python3_9 python_single_target_python3_10
+IUSE=python test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux
 LICENSE=GPL-3
-RDEPEND=dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/talloc-2.3.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10[threads(+)] ) >=sys-libs/talloc-2.3.4[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 )
+RDEPEND=dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/talloc-2.3.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11[threads(+)] ) >=sys-libs/talloc-2.3.4[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://samba.org/ftp/tevent/tevent-0.13.0.tar.gz
 _eclasses_=multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	waf-utils	44f2c60168a3ec2c5fb661d45c1cf397
-_md5_=59a05c418f01f8ac23f7ca4fadfebeca
+_md5_=ecd4aa745b0f0b7a810be35ca46dd3e2
diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz
index ec5b917e022a..9a5ebce7b90b 100644
--- a/metadata/md5-cache/x11-libs/Manifest.gz
+++ b/metadata/md5-cache/x11-libs/Manifest.gz
diff --git a/metadata/md5-cache/x11-libs/xapp-2.2.8 b/metadata/md5-cache/x11-libs/xapp-2.2.8
deleted file mode 100644
index a7ee27d06af8..000000000000
--- a/metadata/md5-cache/x11-libs/xapp-2.2.8
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) || ( dev-lang/vala:0.56[vapigen(+)] ) dev-python/pygobject:3[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-util/gdbus-codegen dev-util/glib-utils sys-devel/gettext gtk-doc? ( dev-util/gtk-doc ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) >=dev-libs/glib-2.44.0:2 dev-libs/gobject-introspection:0= dev-libs/libdbusmenu[gtk3] gnome-base/libgnomekbd x11-libs/cairo >=x11-libs/gdk-pixbuf-2.22.0:2[introspection?] >=x11-libs/gtk+-3.16.0:3[introspection?] x11-libs/libxkbfile
-DESCRIPTION=Cross-desktop libraries and common resources
-EAPI=7
-HOMEPAGE=https://github.com/linuxmint/xapp/
-INHERIT=gnome2-utils vala meson python-r1 xdg-utils
-IUSE=gtk-doc introspection static-libs python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm64 ~riscv x86
-LICENSE=LGPL-3+
-RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) >=dev-libs/glib-2.44.0:2 dev-libs/gobject-introspection:0= dev-libs/libdbusmenu[gtk3] gnome-base/libgnomekbd x11-libs/cairo >=x11-libs/gdk-pixbuf-2.22.0:2[introspection?] >=x11-libs/gtk+-3.16.0:3[introspection?] x11-libs/libxkbfile
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
-SLOT=0
-SRC_URI=https://github.com/linuxmint/xapp/archive/2.2.8.tar.gz -> xapp-2.2.8.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	vala	2633382950a3a9ce912c9258150d5db8	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=c5c4ab91ae45f1ed56256a81f0a46bb1
diff --git a/metadata/md5-cache/x11-libs/xapp-2.4.2 b/metadata/md5-cache/x11-libs/xapp-2.4.2
index 9cadad8c89b5..956a99efa5b1 100644
--- a/metadata/md5-cache/x11-libs/xapp-2.4.2
+++ b/metadata/md5-cache/x11-libs/xapp-2.4.2
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/linuxmint/xapp/
 INHERIT=gnome2-utils vala meson python-r1 xdg-utils
 IUSE=gtk-doc introspection static-libs python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv x86
 LICENSE=LGPL-3+
 RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-libs/glib-2.44.0:2 dev-libs/gobject-introspection:0= dev-libs/libdbusmenu[gtk3] gnome-base/libgnomekbd x11-libs/cairo >=x11-libs/gdk-pixbuf-2.22.0:2[introspection?] >=x11-libs/gtk+-3.16.0:3[introspection?] x11-libs/libxkbfile
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=https://github.com/linuxmint/xapp/archive/2.4.2.tar.gz -> xapp-2.4.2.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	vala	2633382950a3a9ce912c9258150d5db8	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=c4d5bc51d4d17fad70d14a4f2fc440e2
+_md5_=898ad4d2da27a4505c26770d03998eed
diff --git a/metadata/md5-cache/x11-plugins/Manifest.gz b/metadata/md5-cache/x11-plugins/Manifest.gz
index 2573439e5508..77fb219ce0b9 100644
--- a/metadata/md5-cache/x11-plugins/Manifest.gz
+++ b/metadata/md5-cache/x11-plugins/Manifest.gz
diff --git a/metadata/md5-cache/x11-plugins/gkrellm-radio-2.0.4-r2 b/metadata/md5-cache/x11-plugins/gkrellm-radio-2.0.4-r2
new file mode 100644
index 000000000000..fd25666419b1
--- /dev/null
+++ b/metadata/md5-cache/x11-plugins/gkrellm-radio-2.0.4-r2
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile configure install
+DEPEND=app-admin/gkrellm:2[X] lirc? ( app-misc/lirc )
+DESCRIPTION=A minimalistic GKrellM2 plugin to control radio tuners
+EAPI=8
+HOMEPAGE=http://gkrellm.luon.net/gkrellm-radio.php
+INHERIT=gkrellm-plugin toolchain-funcs
+IUSE=lirc
+KEYWORDS=~amd64 ~ppc ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=app-admin/gkrellm:2[X] lirc? ( app-misc/lirc )
+SLOT=2
+SRC_URI=http://gkrellm.luon.net/files/gkrellm-radio-2.0.4.tar.gz
+_eclasses_=gkrellm-plugin	430906fd3b1074aa206a3c5f3baee057	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_md5_=2d65d407020cbba519629acedf62a592
diff --git a/metadata/md5-cache/x11-plugins/gkrellm-vaiobright-2.5-r4 b/metadata/md5-cache/x11-plugins/gkrellm-vaiobright-2.5-r4
new file mode 100644
index 000000000000..5bfe863ad86b
--- /dev/null
+++ b/metadata/md5-cache/x11-plugins/gkrellm-vaiobright-2.5-r4
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=configure install
+DEPEND=app-admin/gkrellm:2[X]
+DESCRIPTION=Superslim VAIO LCD Brightness Control Plugin for Gkrellm
+EAPI=8
+HOMEPAGE=http://nerv-un.net/~dragorn/
+INHERIT=gkrellm-plugin toolchain-funcs
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=app-admin/gkrellm:2[X]
+SLOT=2
+SRC_URI=http://nerv-un.net/~dragorn/code/vaiobright-2.5.tar.gz
+_eclasses_=gkrellm-plugin	430906fd3b1074aa206a3c5f3baee057	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_md5_=b2170367665c919a56e30f8fcbe4295a
diff --git a/metadata/md5-cache/x11-plugins/gkwebmon-0.2.1 b/metadata/md5-cache/x11-plugins/gkwebmon-0.2.1
new file mode 100644
index 000000000000..374e37ef880d
--- /dev/null
+++ b/metadata/md5-cache/x11-plugins/gkwebmon-0.2.1
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile install
+DEPEND=app-admin/gkrellm:2[X] dev-libs/glib:2 dev-libs/openssl:= x11-libs/gtk+:2
+DESCRIPTION=A web monitor plugin for GKrellM2
+EAPI=8
+HOMEPAGE=http://gkwebmon.sourceforge.net/
+INHERIT=gkrellm-plugin toolchain-funcs
+KEYWORDS=~alpha ~amd64 ~ppc ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=app-admin/gkrellm:2[X] dev-libs/glib:2 dev-libs/openssl:= x11-libs/gtk+:2
+SLOT=0
+SRC_URI=mirror://sourceforge/gkwebmon/gkwebmon-0.2.1.tgz
+_eclasses_=gkrellm-plugin	430906fd3b1074aa206a3c5f3baee057	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_md5_=63a7ffc18ebdaeb382b12d8ff79d143d
diff --git a/metadata/md5-cache/xfce-base/Manifest.gz b/metadata/md5-cache/xfce-base/Manifest.gz
index 10839e48101f..a43d04d55cbc 100644
--- a/metadata/md5-cache/xfce-base/Manifest.gz
+++ b/metadata/md5-cache/xfce-base/Manifest.gz
diff --git a/metadata/md5-cache/xfce-base/exo-4.18.0 b/metadata/md5-cache/xfce-base/exo-4.18.0
index 89d8cd6401e6..58cfa67690db 100644
--- a/metadata/md5-cache/xfce-base/exo-4.18.0
+++ b/metadata/md5-cache/xfce-base/exo-4.18.0
@@ -5,10 +5,10 @@ DESCRIPTION=Extensions, widgets and framework library with session support for X
 EAPI=8
 HOMEPAGE=https://docs.xfce.org/xfce/exo/start https://gitlab.xfce.org/xfce/exo/
 INHERIT=xdg-utils
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.66.0 >=x11-libs/gtk+-3.24.0:3 >=xfce-base/libxfce4ui-4.15.1:=[gtk3(+)] >=xfce-base/libxfce4util-4.17.2:=
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/xfce/exo/4.18/exo-4.18.0.tar.bz2
 _eclasses_=xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=1bf7e85f5a80e2abbaab633826552420
+_md5_=7a9400729c6b42206fafd14937d9433f
diff --git a/metadata/md5-cache/xfce-base/garcon-4.18.0 b/metadata/md5-cache/xfce-base/garcon-4.18.0
index 973841eb280b..0d1474548a6d 100644
--- a/metadata/md5-cache/xfce-base/garcon-4.18.0
+++ b/metadata/md5-cache/xfce-base/garcon-4.18.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://docs.xfce.org/xfce/garcon/start https://gitlab.xfce.org/xfce/garcon/
 INHERIT=xdg-utils
 IUSE=introspection
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=LGPL-2+ FDL-1.1+
 RDEPEND=>=dev-libs/glib-2.66.0 >=x11-libs/gtk+-3.24.0:3 >=xfce-base/libxfce4util-4.15.6:=[introspection?] >=xfce-base/libxfce4ui-4.15.7:=[introspection?] introspection? ( >=dev-libs/gobject-introspection-1.66:= )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/xfce/garcon/4.18/garcon-4.18.0.tar.bz2
 _eclasses_=xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=262dc71b98031728cce0a3f3b30f677d
+_md5_=577584424e08bcc4719bd4f805add477
diff --git a/metadata/md5-cache/xfce-base/libxfce4ui-4.18.1 b/metadata/md5-cache/xfce-base/libxfce4ui-4.18.1
index a1ee5d363e92..715ba34c50c5 100644
--- a/metadata/md5-cache/xfce-base/libxfce4ui-4.18.1
+++ b/metadata/md5-cache/xfce-base/libxfce4ui-4.18.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://docs.xfce.org/xfce/libxfce4ui/start https://gitlab.xfce.org/xfce/libxfce4ui/
 INHERIT=xdg-utils vala
 IUSE=glade +introspection startup-notification system-info vala
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=LGPL-2+ GPL-2+
 RDEPEND=>=dev-libs/glib-2.66.0 >=x11-libs/gtk+-3.24.0:3[introspection?,X] x11-libs/libX11 x11-libs/libICE x11-libs/libSM >=xfce-base/libxfce4util-4.17.2:=[introspection?] >=xfce-base/xfconf-4.12:= glade? ( dev-util/glade:3.10 ) introspection? ( >=dev-libs/gobject-introspection-1.66:= ) startup-notification? ( x11-libs/startup-notification ) system-info? ( dev-libs/libgudev gnome-base/libgtop >=media-libs/libepoxy-1.2 )
 REQUIRED_USE=vala? ( introspection )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/xfce/libxfce4ui/4.18/libxfce4ui-4.18.1.tar.bz2
 _eclasses_=vala	2633382950a3a9ce912c9258150d5db8	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=2941b9535e91093c9292e2b1d791ba25
+_md5_=16077aa8a200fac04d5149b98fb09a43
diff --git a/metadata/md5-cache/xfce-base/libxfce4util-4.18.1 b/metadata/md5-cache/xfce-base/libxfce4util-4.18.1
index 0f91bd9b3aea..e2dcaf1a9a80 100644
--- a/metadata/md5-cache/xfce-base/libxfce4util-4.18.1
+++ b/metadata/md5-cache/xfce-base/libxfce4util-4.18.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://docs.xfce.org/xfce/libxfce4util/start https://gitlab.xfce.org/xfce/libxfce4util/
 INHERIT=vala
 IUSE=+introspection vala
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2+ GPL-2+
 RDEPEND=>=dev-libs/glib-2.66.0 introspection? ( >=dev-libs/gobject-introspection-1.66:= )
 REQUIRED_USE=vala? ( introspection )
 SLOT=0/7
 SRC_URI=https://archive.xfce.org/src/xfce/libxfce4util/4.18/libxfce4util-4.18.1.tar.bz2
 _eclasses_=vala	2633382950a3a9ce912c9258150d5db8
-_md5_=3fbbbb40aeeb0e8ae0ed3bb151448008
+_md5_=d84620aca3ba772c73b3d412d4e7ac9e
diff --git a/metadata/md5-cache/xfce-base/thunar-4.18.3 b/metadata/md5-cache/xfce-base/thunar-4.18.3
index 1a398ee5c04a..f77b3e804d62 100644
--- a/metadata/md5-cache/xfce-base/thunar-4.18.3
+++ b/metadata/md5-cache/xfce-base/thunar-4.18.3
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://docs.xfce.org/xfce/thunar/start https://gitlab.xfce.org/xfce/thunar/
 INHERIT=xdg-utils
 IUSE=exif introspection libnotify pcre +trash-panel-plugin udisks
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha ~amd64 arm arm64 ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2+ LGPL-2+
 RDEPEND=>=dev-libs/glib-2.66.0 >=x11-libs/gdk-pixbuf-2.40.0 >=x11-libs/gtk+-3.24.0:3 >=xfce-base/exo-4.17.0:= >=xfce-base/libxfce4ui-4.17.6:= >=xfce-base/libxfce4util-4.17.2:= >=xfce-base/xfconf-4.12:= exif? ( >=media-libs/libexif-0.6.19:= ) introspection? ( dev-libs/gobject-introspection:= ) libnotify? ( >=x11-libs/libnotify-0.7 ) pcre? ( >=dev-libs/libpcre2-10.0:= ) trash-panel-plugin? ( >=xfce-base/xfce4-panel-4.10:= ) udisks? ( dev-libs/libgudev:= ) >=dev-util/desktop-file-utils-0.20-r1 x11-misc/shared-mime-info trash-panel-plugin? ( >=gnome-base/gvfs-1.18.3 ) udisks? ( >=gnome-base/gvfs-1.18.3[udisks,udev] virtual/udev )
 SLOT=0/3
 SRC_URI=https://archive.xfce.org/src/xfce/thunar/4.18/thunar-4.18.3.tar.bz2
 _eclasses_=xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=a8966f42d9cb85988baa926264d7529f
+_md5_=54e1bbcacb1d0306a3d5ce704e5c0408
diff --git a/metadata/md5-cache/xfce-base/thunar-volman-4.18.0 b/metadata/md5-cache/xfce-base/thunar-volman-4.18.0
index 82d1ad600c53..62254865969a 100644
--- a/metadata/md5-cache/xfce-base/thunar-volman-4.18.0
+++ b/metadata/md5-cache/xfce-base/thunar-volman-4.18.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://docs.xfce.org/xfce/thunar/thunar-volman https://gitlab.xfce.org/xfce/thunar-volman/
 INHERIT=xdg-utils
 IUSE=libnotify
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha ~amd64 arm arm64 ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86
 LICENSE=GPL-2+ CC-BY-SA-3.0
 RDEPEND=>=dev-libs/glib-2.66.0 dev-libs/libgudev:= >=x11-libs/gtk+-3.24.0:3 >=xfce-base/exo-0.10:= >=xfce-base/libxfce4ui-4.12:= >=xfce-base/libxfce4util-4.12:= >=xfce-base/xfconf-4.12:= libnotify? ( >=x11-libs/libnotify-0.7 ) virtual/udev >=xfce-base/thunar-1.6[udisks]
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/xfce/thunar-volman/4.18/thunar-volman-4.18.0.tar.bz2
 _eclasses_=xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=006bfe94d15926ceca972b0746609f80
+_md5_=340d8d5b3fbf0b9466b3a00b1c009cde
diff --git a/metadata/md5-cache/xfce-base/tumbler-4.18.0 b/metadata/md5-cache/xfce-base/tumbler-4.18.0
index 6db7621ba283..7fc0771042c9 100644
--- a/metadata/md5-cache/xfce-base/tumbler-4.18.0
+++ b/metadata/md5-cache/xfce-base/tumbler-4.18.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://docs.xfce.org/xfce/tumbler/start https://gitlab.xfce.org/xfce/tumbler/
 INHERIT=xdg-utils
 IUSE=curl epub ffmpeg gstreamer jpeg odf pdf raw
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 arm arm64 ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.66.0 media-libs/freetype:2= media-libs/libpng:0= >=sys-apps/dbus-1.6 >=xfce-base/libxfce4util-4.17.1:= >=x11-libs/gdk-pixbuf-2.40.0 curl? ( >=net-misc/curl-7.25:= ) epub? ( app-text/libgepub ) ffmpeg? ( >=media-video/ffmpegthumbnailer-2.0.8:= ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) jpeg? ( media-libs/libjpeg-turbo:0= ) odf? ( >=gnome-extra/libgsf-1.14.20:= ) pdf? ( >=app-text/poppler-0.12.4[cairo] ) raw? ( >=media-libs/libopenraw-0.0.8:=[gtk] ) gstreamer? ( media-plugins/gst-plugins-meta:1.0 )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/xfce/tumbler/4.18/tumbler-4.18.0.tar.bz2
 _eclasses_=xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=46feb3f51596e91ac762fc75766cfd15
+_md5_=869f69f8b2c17b3c44d11f27024a68e6
diff --git a/metadata/md5-cache/xfce-base/xfce4-appfinder-4.18.0 b/metadata/md5-cache/xfce-base/xfce4-appfinder-4.18.0
index 1964fd8de422..4bfdb06906ad 100644
--- a/metadata/md5-cache/xfce-base/xfce4-appfinder-4.18.0
+++ b/metadata/md5-cache/xfce-base/xfce4-appfinder-4.18.0
@@ -5,10 +5,10 @@ DESCRIPTION=A tool to find and launch installed applications for the Xfce deskto
 EAPI=8
 HOMEPAGE=https://docs.xfce.org/xfce/xfce4-appfinder/start https://gitlab.xfce.org/xfce/xfce4-appfinder/
 INHERIT=xdg-utils
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.66.0 >=x11-libs/gtk+-3.24.0:3 >=xfce-base/garcon-0.3:= >=xfce-base/libxfce4util-4.15.2:= >=xfce-base/libxfce4ui-4.14:=[gtk3(+)] >=xfce-base/xfconf-4.14:=
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/xfce/xfce4-appfinder/4.18/xfce4-appfinder-4.18.0.tar.bz2
 _eclasses_=xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=e0b470788676b0c0b8844ff7403cbccf
+_md5_=bc81e7d74282e6e5b4d9727b1efe196c
diff --git a/metadata/md5-cache/xfce-base/xfce4-meta-4.18 b/metadata/md5-cache/xfce-base/xfce4-meta-4.18
index 71cd42d3ce42..34a107be83c0 100644
--- a/metadata/md5-cache/xfce-base/xfce4-meta-4.18
+++ b/metadata/md5-cache/xfce-base/xfce4-meta-4.18
@@ -3,8 +3,8 @@ DESCRIPTION=The Xfce Desktop Environment (meta package)
 EAPI=8
 HOMEPAGE=https://www.xfce.org/
 IUSE=minimal pulseaudio +svg upower
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=~alpha ~amd64 arm arm64 ~ia64 ~loong ~ppc ppc64 ~riscv ~x86
 LICENSE=metapackage
 RDEPEND=x11-themes/hicolor-icon-theme >=xfce-base/exo-4.18.0 >=xfce-base/garcon-4.18.0 >=xfce-base/libxfce4ui-4.18.0 >=xfce-base/libxfce4util-4.18.0 >=xfce-base/thunar-4.18.0 >=xfce-base/thunar-volman-4.18.0 >=xfce-base/tumbler-4.18.0 >=xfce-base/xfce4-appfinder-4.18.0 >=xfce-base/xfce4-panel-4.18.0 >=xfce-base/xfce4-session-4.18.0 >=xfce-base/xfce4-settings-4.18.0 x11-terms/xfce4-terminal >=xfce-base/xfconf-4.18.0 >=xfce-base/xfdesktop-4.18.0 >=xfce-base/xfwm4-4.18.0 !minimal? ( media-fonts/dejavu virtual/freedesktop-icon-theme ) pulseaudio? ( xfce-extra/xfce4-pulseaudio-plugin ) svg? ( gnome-base/librsvg ) upower? ( >=xfce-base/xfce4-power-manager-4.18.0 )
 SLOT=0
-_md5_=b87ebc3d9d215ca0ef27fa6c2e62ddbf
+_md5_=b2fa43bc378dcfaa71523809e3a33064
diff --git a/metadata/md5-cache/xfce-base/xfce4-panel-4.18.1 b/metadata/md5-cache/xfce-base/xfce4-panel-4.18.1
index d3347ee63ed0..7032c5931804 100644
--- a/metadata/md5-cache/xfce-base/xfce4-panel-4.18.1
+++ b/metadata/md5-cache/xfce-base/xfce4-panel-4.18.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://docs.xfce.org/xfce/xfce4-panel/start https://gitlab.xfce.org/xfce/xfce4-panel/
 INHERIT=vala xdg-utils
 IUSE=+dbusmenu introspection vala
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.66.0 >=x11-libs/cairo-1.16.0 >=x11-libs/gtk+-3.24.0:3[introspection?] x11-libs/libX11 x11-libs/libwnck:3 >=xfce-base/exo-0.11.2:= >=xfce-base/garcon-4.17.0:= >=xfce-base/libxfce4ui-4.17.1:= >=xfce-base/libxfce4util-4.17.2:=[introspection?,vala?] >=xfce-base/xfconf-4.13:= dbusmenu? ( >=dev-libs/libdbusmenu-16.04.0[gtk3] ) introspection? ( >=dev-libs/gobject-introspection-1.66:= )
 REQUIRED_USE=vala? ( introspection )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/xfce/xfce4-panel/4.18/xfce4-panel-4.18.1.tar.bz2
 _eclasses_=vala	2633382950a3a9ce912c9258150d5db8	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=4efe05a01c6bfba07e855a5ad0bf81b8
+_md5_=4e14bc7ffe4ab0f3775c5a99a1e95f0a
diff --git a/metadata/md5-cache/xfce-base/xfce4-power-manager-4.18.0 b/metadata/md5-cache/xfce-base/xfce4-power-manager-4.18.0
index 1b621317e027..ea74e57f2782 100644
--- a/metadata/md5-cache/xfce-base/xfce4-power-manager-4.18.0
+++ b/metadata/md5-cache/xfce-base/xfce4-power-manager-4.18.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://docs.xfce.org/xfce/xfce4-power-manager/start https://gitlab.xfce.org/xfce/xfce4-power-manager/
 INHERIT=xdg-utils
 IUSE=networkmanager +panel-plugin policykit
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=~alpha ~amd64 arm arm64 ~ia64 ~loong ~ppc ppc64 ~riscv ~x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.66.0 >=sys-power/upower-0.99.0 >=x11-libs/gtk+-3.24.0:3 >=x11-libs/libnotify-0.7 x11-libs/libX11 >=x11-libs/libXrandr-1.2 x11-libs/libXext x11-libs/libXtst >=xfce-base/xfconf-4.12:= >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/libxfce4util-4.12:= panel-plugin? ( >=xfce-base/xfce4-panel-4.12:= ) policykit? ( >=sys-auth/polkit-0.112 ) networkmanager? ( net-misc/networkmanager )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/xfce/xfce4-power-manager/4.18/xfce4-power-manager-4.18.0.tar.bz2
 _eclasses_=xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=fb517aa3c9394f8514341dea0f6613bc
+_md5_=e8737596784960515a748652561524c7
diff --git a/metadata/md5-cache/xfce-base/xfce4-session-4.18.0 b/metadata/md5-cache/xfce-base/xfce4-session-4.18.0
index 535adfaf27c5..0f888b50a117 100644
--- a/metadata/md5-cache/xfce-base/xfce4-session-4.18.0
+++ b/metadata/md5-cache/xfce-base/xfce4-session-4.18.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://docs.xfce.org/xfce/xfce4-session/start https://gitlab.xfce.org/xfce/xfce4-session
 INHERIT=xdg-utils
 IUSE=nls policykit +xscreensaver
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.66.0 >=x11-libs/gtk+-3.24.0:3 x11-libs/libSM x11-libs/libwnck:3 x11-libs/libX11 >=xfce-base/libxfce4util-4.15.2:= >=xfce-base/libxfce4ui-4.15.1:= >=xfce-base/xfconf-4.12:= policykit? ( >=sys-auth/polkit-0.102 ) x11-apps/iceauth x11-apps/xrdb nls? ( x11-misc/xdg-user-dirs ) xscreensaver? ( || ( xfce-extra/xfce4-screensaver >=x11-misc/xscreensaver-5.26 x11-misc/light-locker ) )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/xfce/xfce4-session/4.18/xfce4-session-4.18.0.tar.bz2
 _eclasses_=xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=cfd83695beec469b6e39baa00bc6ac68
+_md5_=9ad6e35e42dd170c6ba5b2c6a863236b
diff --git a/metadata/md5-cache/xfce-base/xfce4-settings-4.18.1 b/metadata/md5-cache/xfce-base/xfce4-settings-4.18.1
index be70f32109a8..650916e05477 100644
--- a/metadata/md5-cache/xfce-base/xfce4-settings-4.18.1
+++ b/metadata/md5-cache/xfce-base/xfce4-settings-4.18.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://docs.xfce.org/xfce/xfce4-settings/start https://gitlab.xfce.org/xfce/xfce4-settings/
 INHERIT=python-single-r1 xdg-utils
 IUSE=colord input_devices_libinput libcanberra libnotify upower +xklavier python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2+
 RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-libs/glib-2.66.0 media-libs/fontconfig >=x11-libs/gtk+-3.24.0:3 x11-libs/libX11 >=x11-libs/libXcursor-1.1 >=x11-libs/libXi-1.3 >=x11-libs/libXrandr-1.2 >=xfce-base/garcon-0.2:= >=xfce-base/exo-4.15.1:= >=xfce-base/libxfce4ui-4.17.0:= >=xfce-base/libxfce4util-4.17.2:= >=xfce-base/xfconf-4.13:= colord? ( x11-misc/colord:= ) libcanberra? ( >=media-libs/libcanberra-0.25[sound] ) input_devices_libinput? ( x11-drivers/xf86-input-libinput ) libnotify? ( >=x11-libs/libnotify-0.7 ) upower? ( >=sys-power/upower-0.9.23 ) xklavier? ( >=x11-libs/libxklavier-5 ) !<xfce-base/exo-4.15.1
 REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/xfce/xfce4-settings/4.18/xfce4-settings-4.18.1.tar.bz2
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=411148c4d7a16e38c1392f2004d6b8a6
+_md5_=e20c5f8ff586da602150d68226538bf7
diff --git a/metadata/md5-cache/xfce-base/xfconf-4.18.0 b/metadata/md5-cache/xfce-base/xfconf-4.18.0
index dae998035585..ba217136b391 100644
--- a/metadata/md5-cache/xfce-base/xfconf-4.18.0
+++ b/metadata/md5-cache/xfce-base/xfconf-4.18.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://docs.xfce.org/xfce/xfconf/start https://gitlab.xfce.org/xfce/xfconf/
 INHERIT=bash-completion-r1 vala
 IUSE=debug +introspection vala
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris
+KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.66.0 sys-apps/dbus >=xfce-base/libxfce4util-4.17.3:= introspection? ( >=dev-libs/gobject-introspection-1.66:= )
 REQUIRED_USE=vala? ( introspection )
 SLOT=0/3
 SRC_URI=https://archive.xfce.org/src/xfce/xfconf/4.18/xfconf-4.18.0.tar.bz2
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	vala	2633382950a3a9ce912c9258150d5db8
-_md5_=0c4cd0644da479ffa04e2bf784efef69
+_md5_=99fcfe68d5cdca240f3144aea0f31bd0
diff --git a/metadata/md5-cache/xfce-base/xfdesktop-4.18.1 b/metadata/md5-cache/xfce-base/xfdesktop-4.18.1
index a54889897297..4e8ad5589e3c 100644
--- a/metadata/md5-cache/xfce-base/xfdesktop-4.18.1
+++ b/metadata/md5-cache/xfce-base/xfdesktop-4.18.1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://docs.xfce.org/xfce/xfdesktop/start https://gitlab.xfce.org/xfce/xfdesktop/
 INHERIT=xdg-utils
 IUSE=libnotify +thunar
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2+
 RDEPEND=>=x11-libs/cairo-1.16 >=dev-libs/glib-2.66.0 >=x11-libs/gtk+-3.24.0:3 >=x11-libs/libwnck-3.14:3 x11-libs/libX11 >=xfce-base/exo-0.11:= >=xfce-base/garcon-0.6:= >=xfce-base/libxfce4ui-4.13:= >=xfce-base/libxfce4util-4.13:= >=xfce-base/xfconf-4.12.1:= libnotify? ( >=x11-libs/libnotify-0.7:= ) thunar? ( >=xfce-base/thunar-4.17.10:= )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/xfce/xfdesktop/4.18/xfdesktop-4.18.1.tar.bz2
 _eclasses_=xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=b5f13cfa677ae043c12b607325f74d78
+_md5_=f0f9c0d05558475c7a882deddfc085e5
diff --git a/metadata/md5-cache/xfce-base/xfwm4-4.18.0 b/metadata/md5-cache/xfce-base/xfwm4-4.18.0
index 069db1253915..48a2361a6017 100644
--- a/metadata/md5-cache/xfce-base/xfwm4-4.18.0
+++ b/metadata/md5-cache/xfce-base/xfwm4-4.18.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://docs.xfce.org/xfce/xfwm4/start https://gitlab.xfce.org/xfce/xfwm4
 INHERIT=xdg-utils
 IUSE=opengl startup-notification +xcomposite +xpresent
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2+
 RDEPEND=>=x11-libs/gtk+-3.24.0:3 x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender x11-libs/libXres x11-libs/pango >=x11-libs/libwnck-3.14:3 >=xfce-base/libxfce4util-4.10:= >=xfce-base/libxfce4ui-4.12:= >=xfce-base/xfconf-4.13:= opengl? ( media-libs/libepoxy:=[X(+)] ) startup-notification? ( x11-libs/startup-notification ) xcomposite? ( x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXfixes ) xpresent? ( x11-libs/libXpresent )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/xfce/xfwm4/4.18/xfwm4-4.18.0.tar.bz2
 _eclasses_=xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=5579aec7362304ede6fe4a4f50ac53c6
+_md5_=6690a8a1be6cf4e503d45e60ad62b267
diff --git a/metadata/md5-cache/xfce-extra/Manifest.gz b/metadata/md5-cache/xfce-extra/Manifest.gz
index 17b361c71198..e56a0c0521c6 100644
--- a/metadata/md5-cache/xfce-extra/Manifest.gz
+++ b/metadata/md5-cache/xfce-extra/Manifest.gz
diff --git a/metadata/md5-cache/xfce-extra/thunar-shares-plugin-0.3.1 b/metadata/md5-cache/xfce-extra/thunar-shares-plugin-0.3.1
deleted file mode 100644
index 56e62dac21f5..000000000000
--- a/metadata/md5-cache/xfce-extra/thunar-shares-plugin-0.3.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=>=dev-libs/glib-2.18 >=x11-libs/gtk+-3.22:3 >=xfce-base/thunar-1.7:= dev-util/intltool virtual/pkgconfig
-DESCRIPTION=Thunar plugin to share files using Samba
-EAPI=6
-HOMEPAGE=https://goodies.xfce.org/projects/thunar-plugins/thunar-shares-plugin
-KEYWORDS=amd64 ~arm ~arm64 ~riscv x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.18 >=x11-libs/gtk+-3.22:3 >=xfce-base/thunar-1.7:=
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/thunar-plugins/thunar-shares-plugin/0.3/thunar-shares-plugin-0.3.1.tar.bz2
-_md5_=dcf935c4295f1bcaa13a4b4c0467d36b
diff --git a/metadata/md5-cache/xfce-extra/thunar-shares-plugin-0.3.2 b/metadata/md5-cache/xfce-extra/thunar-shares-plugin-0.3.2
index ed306055315b..8d4e3c657fc8 100644
--- a/metadata/md5-cache/xfce-extra/thunar-shares-plugin-0.3.2
+++ b/metadata/md5-cache/xfce-extra/thunar-shares-plugin-0.3.2
@@ -4,9 +4,9 @@ DEPEND=>=dev-libs/glib-2.26.0 >=x11-libs/gtk+-3.22.0:3 >=xfce-base/thunar-1.7:=
 DESCRIPTION=Thunar plugin to share files using Samba
 EAPI=8
 HOMEPAGE=https://goodies.xfce.org/projects/thunar-plugins/thunar-shares-plugin https://gitlab.xfce.org/thunar-plugins/thunar-shares-plugin/
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~riscv x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.26.0 >=x11-libs/gtk+-3.22.0:3 >=xfce-base/thunar-1.7:=
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/thunar-plugins/thunar-shares-plugin/0.3/thunar-shares-plugin-0.3.2.tar.bz2
-_md5_=f1146b4f844502f7027f116629ec9434
+_md5_=682bea9ac37fa4c681faa815ae4025e0
diff --git a/metadata/md5-cache/xfce-extra/xfce4-cpufreq-plugin-1.2.8 b/metadata/md5-cache/xfce-extra/xfce4-cpufreq-plugin-1.2.8
index 203bc80b9ff1..e4f889cc1ffe 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-cpufreq-plugin-1.2.8
+++ b/metadata/md5-cache/xfce-extra/xfce4-cpufreq-plugin-1.2.8
@@ -5,10 +5,10 @@ DESCRIPTION=A panel plugin for showing information about cpufreq settings
 EAPI=8
 HOMEPAGE=https://docs.xfce.org/panel-plugins/xfce4-cpufreq-plugin/start https://gitlab.xfce.org/panel-plugins/xfce4-cpufreq-plugin/
 INHERIT=xdg-utils
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ppc64 ~riscv ~x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.20 >=x11-libs/gtk+-3.20:3 >=xfce-base/libxfce4ui-4.16:= >=xfce-base/libxfce4util-4.17.2:= >=xfce-base/xfce4-panel-4.16:=
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-cpufreq-plugin/1.2/xfce4-cpufreq-plugin-1.2.8.tar.bz2
 _eclasses_=xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=96a3b934c443841a3d91a91aada4d6c6
+_md5_=b7fa3deb800b5b8e3380c4db66d0250c
diff --git a/metadata/md5-cache/xfce-extra/xfce4-cpugraph-plugin-1.2.7 b/metadata/md5-cache/xfce-extra/xfce4-cpugraph-plugin-1.2.7
index 893cc5f9a352..b559a910e7ac 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-cpugraph-plugin-1.2.7
+++ b/metadata/md5-cache/xfce-extra/xfce4-cpugraph-plugin-1.2.7
@@ -5,10 +5,10 @@ DESCRIPTION=A system load plug-in for the Xfce panel
 EAPI=8
 HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-cpugraph-plugin https://gitlab.xfce.org/panel-plugins/xfce4-cpugraph-plugin
 INHERIT=xdg-utils
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD-2 GPL-2+
 RDEPEND=>=x11-libs/gtk+-3.22:3 >=xfce-base/libxfce4ui-4.16.0:= >=xfce-base/libxfce4util-4.17.2:= >=xfce-base/xfce4-panel-4.16.0:=
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-cpugraph-plugin/1.2/xfce4-cpugraph-plugin-1.2.7.tar.bz2
 _eclasses_=xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=98dd7141be304910f535c96622d905e7
+_md5_=4ce192f322fe8b4cf221b6d50ca1111f
diff --git a/metadata/md5-cache/xfce-extra/xfce4-screenshooter-1.10.3 b/metadata/md5-cache/xfce-extra/xfce4-screenshooter-1.10.3
index f4850ffef0a0..606e74f91d90 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-screenshooter-1.10.3
+++ b/metadata/md5-cache/xfce-extra/xfce4-screenshooter-1.10.3
@@ -5,10 +5,10 @@ DESCRIPTION=Xfce4 screenshooter application and panel plugin
 EAPI=8
 HOMEPAGE=https://docs.xfce.org/apps/xfce4-screenshooter/start https://gitlab.xfce.org/apps/xfce4-screenshooter/
 INHERIT=xdg-utils
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm ~arm64 ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.66.0 >=x11-libs/gdk-pixbuf-2.16 >=x11-libs/gtk+-3.24.0:3 >=x11-libs/pango-1.44.0 dev-libs/libxml2 >=net-libs/libsoup-3.0.0:3.0 x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes >=x11-libs/libXi-1.7.8 >=xfce-base/exo-0.11:= >=xfce-base/xfce4-panel-4.16.0:= >=xfce-base/libxfce4util-4.16.0:= >=xfce-base/libxfce4ui-4.16.0:= >=xfce-base/xfconf-4.16.0:=
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/apps/xfce4-screenshooter/1.10/xfce4-screenshooter-1.10.3.tar.bz2
 _eclasses_=xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=7e4cf2663b56c88e1c81f8849942f094
+_md5_=a3d27509720a95ad209240dfabb59b35
diff --git a/metadata/md5-cache/xfce-extra/xfce4-systemload-plugin-1.3.2 b/metadata/md5-cache/xfce-extra/xfce4-systemload-plugin-1.3.2
index a8384757ecab..e4182408ed61 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-systemload-plugin-1.3.2
+++ b/metadata/md5-cache/xfce-extra/xfce4-systemload-plugin-1.3.2
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://docs.xfce.org/panel-plugins/xfce4-systemload-plugin/start https://gitlab.xfce.org/panel-plugins/xfce4-systemload-plugin/
 INHERIT=xdg-utils
 IUSE=upower
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD-2
 RDEPEND=>=xfce-base/libxfce4ui-4.16:=[gtk3(+)] >=xfce-base/libxfce4util-4.17.2:= >=xfce-base/xfce4-panel-4.16:= >=xfce-base/xfconf-4.14:= upower? ( >=sys-power/upower-0.9.23 )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-systemload-plugin/1.3/xfce4-systemload-plugin-1.3.2.tar.bz2
 _eclasses_=xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=d5661e56417e8bd1ecff7d6cc5f5bea7
+_md5_=ece7511ac281a91c07c1a1118f6de795
diff --git a/metadata/md5-cache/xfce-extra/xfce4-taskmanager-1.5.5 b/metadata/md5-cache/xfce-extra/xfce4-taskmanager-1.5.5
index e1bbc293f74e..8d3361d21217 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-taskmanager-1.5.5
+++ b/metadata/md5-cache/xfce-extra/xfce4-taskmanager-1.5.5
@@ -5,10 +5,10 @@ DESCRIPTION=Easy to use task manager
 EAPI=8
 HOMEPAGE=https://goodies.xfce.org/projects/applications/xfce4-taskmanager
 INHERIT=xdg-utils
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2+
 RDEPEND=x11-libs/cairo x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXmu x11-libs/libwnck:3 >=xfce-base/libxfce4ui-4.14:= >=xfce-base/xfconf-4.14:=
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/apps/xfce4-taskmanager/1.5/xfce4-taskmanager-1.5.5.tar.bz2
 _eclasses_=xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=27f81e7f27dccc6a4b65b0a09242a8cd
+_md5_=0095d427c7a1ed932cf2a5fbe6381a77
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index db9a25896d87..130d94dc16a2 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 15152 BLAKE2B c1d08f39453125718bfb044cbe0dd8c2d1d6ee790e3d7e8488ae11fc536eb3f4232a0679f80662b1e041f8edd39b6ec4d2d39c7e6ac1b418151d9c3853698313 SHA512 b37bf15aece1c30972723d2b64d1d1613bce0e6747a01563fb993e46731ebc5b99ca0625ecd9086c739877084416aa12e6c2a5650a2bfe625796875f89cc89dc
-TIMESTAMP 2023-02-03T08:39:42Z
+TIMESTAMP 2023-02-03T14:39:41Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmPcyE5fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmPdHK1fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDJbA//bxlqQkfTXgL02mKYQRgFG5x5D9CItItMExGXTgFalCPn5tj5QVkblAs0
-dzViezujGtcW1/mKHmm1hy8PvfyOfdODnOO0lYSl/pkk6FkfSkPITIgu3qVahjmg
-zdG4fAH4DcwXofFdcRClx1+1srmBJ51F5Zw+J19bYZAfiXWVQ9QW+bV0ArkUZjwY
-mHjaNfDc3T/R2Rso8CoEhI8pHWQyfowoSOmTRDC5UeJdX0NbYhp7z4O5kVTeMUqx
-/qlHCxpNhtZKTykPbs1JaRn+O1uf2Ic/MilJ45687Ww1/zji3LiM/vILrebWqi+D
-VY4BWnHGRzismUsKdMgdErtj2Iji5MVcc1c37eX+SiCSqyTHTte+yR3/ae5LdXzb
-JcfKREx8kGT0BBOCQFE2ZkcpuS3AatCU7HGDdOgkHFt7DJm7pRyJtwJqvLM3/O8M
-XwXhBi/Sjwrjw9+lcaON+vIi2v2LhLlBG6fXOas+sBJk1ZRENuRioE7+IeF3XlNq
-5p/qzbk3U75h6SRol9TLERZ5fr8T5Xmel580I/8GihLAJVg5+dNGc4dhlrwl5H9f
-pRZDBHjLIA5Uh0JLuJd2/5PACdafD20zF55a+mW4iluh8rXpSGhbz302xPujTs0r
-4D0Ru1njIZX1HeRY18u6pnsHMrSOWYP5C4nb5Xu0XAXwkSKzvXo=
-=QMpX
+klAAnA//S7vDhoK0SKCwD3E80XLhxxgqnFcg64aoqY6fYAiYOBwzyHmsbn+jR3HE
+mJ0ap6ofbxnXtdgbm2zTDMrIsMJZdSiVeOuhQkT8bRyoGTrjgc5bhg1ubnUWvQXr
+4eKbg1T/lQEXSGMgCvZpYYC2qtQqu8kwEulVP+bXdS+07+5iVl3ks+Uo8cGdM9tb
+P0f6vbT10qlR/OoOfjgmR2Ddsj2HKe4sjti6yweZy4LNtPvqTb06V3ifEp//WI0V
+iZiwpF41xJLdTT3+elxWC06DJUoOGgxLjxaWbuqzXEAV+VjdQczW5faKLn2WZqK+
+fsR9QGJuUHglySZQehuwOKt7oMPw6ilz2SkhFoYIkpKn19kD5LYJv0trT/lYrh9O
+zEPJxamzwS9QAkE7qykFNAFNodaLHZeTMpivqIlMT+LiH6+suWk9p0zzojWkw1kB
+C2vaVKx9tkd1B54gznVeI7+jhA/oPZzI4rcvJ1bcKd7hBIhI11L/sMfRKjDL+OGE
+6LrctQxxrkDPo7gUzqTrleR/0Vz+4vSqFUCuIZ1NGCxvURn97594xlheVrZVjydt
+sdmBd/vySHUqXDOwtMm0a0kgOEDWLLCJRMC3sg8aNGP09rj6DKTnCt2hBHlw4r68
+wyMucbyv3dx06NwN4X7G/pXwy5ojsSST3gUTICSN76LDmcVQ4J4=
+=Uo7a
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index c7b972bf3b4d..5fc27631661a 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Fri, 03 Feb 2023 08:39:38 +0000
+Fri, 03 Feb 2023 14:39:38 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index d57ae887fbf1..f058b7542899 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Fri Feb  3 08:39:38 AM UTC 2023
+Fri Feb  3 02:39:38 PM UTC 2023
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 4de2068a7099..a05d9d2b6bec 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Fri, 03 Feb 2023 08:45:01 +0000
+Fri, 03 Feb 2023 14:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index e3be542c7951..0be8e84ce897 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-8bc302debc2259bc2229851d3d90e7eb8335cec8 1675410027 2023-02-03T07:40:27+00:00
+429536804c65445a2c663c149dd6ee21502b2115 1675434843 2023-02-03T14:34:03+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 038e5f1403b2..9bece0858738 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1675413601 Fri 03 Feb 2023 08:40:01 AM UTC
+1675435202 Fri 03 Feb 2023 02:40:02 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index c7b972bf3b4d..5fc27631661a 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Fri, 03 Feb 2023 08:39:38 +0000
+Fri, 03 Feb 2023 14:39:38 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index c19d79fd7077..7562e89659fe 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index 5537714716d6..e86c8060c8fd 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -21,25 +21,34 @@ DIST zabbix-5.0.29-go-deps.tar.xz 34421032 BLAKE2B 35809df9e2d9186813ec079d31206
 DIST zabbix-5.0.29.tar.gz 21471836 BLAKE2B e38f3b7c38900d80ca0497326f9979e793d04fd34d716673e76ea65723e0019caa7e1e92e581ac6423f77a2fff7554250c728721c125596b1c9a17b0c860346b SHA512 60e707d79ee9f92b69aecabc97e92ad04d0d66839ceed250788f111db4128a66197b9c528bde8cb4f4f92e6a5502ff31c6d838e3c1d3b81ce6b7910879915b61
 DIST zabbix-5.0.30-go-deps.tar.xz 34398308 BLAKE2B f987ec0518a070d9480be7a57a8101f6c65f89ff0cdf513cb19b5d79e88c410782df87e732c7d838e6db6dd933cc855c027fc8351855121a57e0a2912ed0bda2 SHA512 eb1ad8c3983e475229887a2561f6e55ed3a4c1be270221fc12c0d0fcba7f2ad661f984f16f5f5d9684496c35c6daebd93dd13f5e898244af90d9ad9bffb911c6
 DIST zabbix-5.0.30.tar.gz 21505195 BLAKE2B e6876b896e61feccdcfa05a9bc2ae57345957e8e4dc2e2c3d635e917cc525c9cf4dad5e45821e6677f766654bd702b8baac8b65a4fc286af816fbf2b2e076a0c SHA512 2f744fc1ba42ea0602cc90c91342f531c55cb1f76eda47c6e928e74dc595f7bd885f69abb52c6eb1b20e65bd6c3c46c299d6cfee2c3442db137561060386a31e
+DIST zabbix-5.0.31-go-deps.tar.xz 34443128 BLAKE2B 38bf33002e6dbae95b39579383f8bb6998b0408434f140b1bb31e7cadf07a0363ac6234a820ec306cc12f764fc43d250a45ffd159a315dc494d0871ae6167660 SHA512 4d54ff09ccb356b3080240065598cc93d11a11c8faef0c6a22ec923face789cf2bee95ddaf62d0ecd74bd0807060fb4fcbcfa71b1ffcb8723096b1164d7c25ae
+DIST zabbix-5.0.31.tar.gz 21567566 BLAKE2B 076090e07856df0dc2603d75fb7cc9862e40b9e6bda89094cf687aa00719a0df7cf7fd93bc973cb38cbbb31b6b723efd3dc5aa6dde00b4f4a5b118331795bfeb SHA512 7409e23313a6c5f6f4f1e1c0ba0ccfec88aa2687caa25673709bf05b9e287a535ea417551dee0f9d2fbd571adfe843a700ee45ee3dc72752cdeab12ec4c54644
 DIST zabbix-6.0.10-go-deps.tar.xz 27482516 BLAKE2B 64b9f2d093aaa8b7b1b39d4736f9b087fdcc518b1a5eced7a46bfe5a1ea2c1bc2d3641ab8e61d4fca8f036a8a96d8c8b56fe9dab17b356b8c5e507f77f10b864 SHA512 15b4799d8934155112469f4a571b8f015a0779b7c946a49cebb4b513ff7553989cd71704e403ae3fdf18646235fc40daf14bb9481d493ad8e6b53146fd7f3f27
 DIST zabbix-6.0.10.tar.gz 39516402 BLAKE2B 00e81dcea63433cb93ef9bd77094bef89f7d604d8c07b9da5959c79d54f026b1256f486395229e0232aa96271b72fd9f3c67e08dfb96321be398b8b4fa832f6f SHA512 4fc70d89f61f50e5a6b9bbd1a25d9cac6d734872d3558df83b01abe04832773cdbab6e0f214045c117b6e2fcd7ae3fba08701be942cf18344e6b5a78151665d6
 DIST zabbix-6.0.11-go-deps.tar.xz 27480580 BLAKE2B 443ecbd9fd0d66cacc75f53d5f56ae996bce52e04827de97948ffc6a3e02888b4b5122eba2425465624e34bc628992f7a520bc8e0281444baed0aa1631f3bec1 SHA512 0936626b658f1811e8aebdd59ca506b33f1a95696018b088cfe04479386ecbcfe4c6c7fac6d26487e28d36cb6283028312c3bc2d27bde8cf54698236d3bc6ba4
 DIST zabbix-6.0.11.tar.gz 40388383 BLAKE2B e6ded007285aac58bb4c29075ac8d34f6ab0db1a74702269b63dc8772ebdf8b2986737fa91d39c9e8bacee5e1e12d7d7bb9580221f9b4917cbc829784639201d SHA512 decb9fcf5de8f0d81cd0b16b6a5e341742c97baed0faf2d5f22bba98fd9fad4e154360724b5aedc378d5b5e2c64eda36f308e3eb6e6f8e80a5cf082ea95ebef6
 DIST zabbix-6.0.12-go-deps.tar.xz 27481268 BLAKE2B cfeca38b63a6271b4ff6819143e0214d3b468e3f7b681cc0bde443192e84ec4b66eb9b8ce38be01fa74a186f8904dfe73af04ad98007880e9ad6aab5c4b978b3 SHA512 c021efe15b61eeebad855ee9d8081f06796d126f3215bac4cb8a36384185aa2a67c0af580b5fcd830e6da832eb1057c02621c71569e30735fb0bef172f26d3b4
 DIST zabbix-6.0.12.tar.gz 40419443 BLAKE2B 18e328a3361947292b3c78fc75dbcfc464f3419fb35bd0895049c90d26d362edbe0a727d1ab955f428ec812d6f38f68717f3c635216aff0468f188321b476495 SHA512 7cd254282523002d2e4d86295258ea0f56921b54c88d604300104f32ea5807c0b39b5550a9dd98e03ad41adf4dd8e93a7b1deb200d513283dca51d49d46bda4d
+DIST zabbix-6.0.13-go-deps.tar.xz 17974536 BLAKE2B 296ae034ccf0f6cd1d83379c46ad87d80faf3d897d807d948312989e044dc4d159aabab27999730ed255be3c7d5aa6b70927bcfb888f9969b36994c68246c14b SHA512 279aeed128e00dab8f1824ed7186ddc914615f7756a96c049bff0321997c9e412007c56701a036a1a25029aa7c4f878ad4566e95abbf766ee353666a6a588370
+DIST zabbix-6.0.13.tar.gz 41075557 BLAKE2B 41db999c52d3ca596861d8850d594e639159b8c7090b47dd824be5b2695a6f1ebc0399643de8fb25af4081ab294c6fefe7ec9c0025ba4e4d17d44aa16d8b233a SHA512 188622c0c04029eac376ebf60c96ed9d67923bc1f40eff75666a241bb534cb744aca8c51ff4b79d508dfadb9e758f80d9dc46016217bcb5a67e8ede7e645788e
 DIST zabbix-6.2.4-go-deps.tar.xz 27489292 BLAKE2B 174c822aa1488fd2dfb726ed2cd5d2e86147404793ae97c6d45554de7cdf36073aa28a988e967798afb6681d1c054252433fcbae68816ccca79401383d4cc4e5 SHA512 6c1fa17663aaf91e234c34f7019b6f5b3720ab6c4300ece1ac5404f9f8499b74b6a2f5ab54e2eb0ac221d0df5e5e271762ff2f2f776e782bff0a3c85fe8f6407
 DIST zabbix-6.2.4.tar.gz 40299367 BLAKE2B ee74829acbac90a37bc3bcf3c95a92a7df1f83099cda7c9ba9ed225d3bdfa0e49667c5aa1522dbdac1ca2da8b621f94d384c857af8c66db87353f044f6ec0420 SHA512 16249f78f09e6c07a993972a7e72ef85083e08adfdcd6383b51a60ad172a48bdb4510a09dc82e8a36c5d748d3db155d3e4ca14909e2f2b4104bde200f151a596
 DIST zabbix-6.2.5-go-deps.tar.xz 27499244 BLAKE2B c8c7e59e0c2d61224bbfd11690a54b411a981e4ab3a39e217a03be83bdae04914898ab7b38c00d3a48900b769eabf51901410247a204915e0e901182c69266f3 SHA512 0c13f15b2ed62a6eb418244560cd40e277d333f17e65ceb9125335408fd632870d260f986b5c76328bc91e6b0b619816836c543f5d87ef5d957904aad722f613
 DIST zabbix-6.2.5.tar.gz 41020695 BLAKE2B 5e21867358cc6c4374695b7da6d74b8c3642bf4e1f41ebcdb2a158c01e5a4b6ffd679728a35badeb3cbefe0968d97577e9141340b32287cb01d89e0f227b964a SHA512 3cf5745942f69eee348c37ddb1bb68937c628ee97d050b0bfed37be66e4a30a6448829cbfa000f9388761e6611af9ae7046fdc63b608f3bcce1575bfa476dd5b
 DIST zabbix-6.2.6-go-deps.tar.xz 27486336 BLAKE2B e17aa599bc6be82e211f48642c03a73594965dd51a83b7e7e9ccbe949865034348a33cb413824d3d1aabd6aba56751132ef95dc333f75657bce3cc3fa4f1ef01 SHA512 eb18c6a78b0523543b7273c489d2dda94adb983df802b03020374b4bda51a44bf01e92bafe556242710f942474a9547a8366f724187f9a429e28bb94c0fa9c57
 DIST zabbix-6.2.6.tar.gz 41038757 BLAKE2B bc2dd394085d2bb32a052f682d7271b14967ca4100ada34a1145e0b137c32036202346a7ee7bed06f62ddf6a6c9b1033b9b1534aef50850a6d49446b40e6aa21 SHA512 03f2396fea0794f0a66a00880e7a46d0295a562fab2cfdd0890b2f9369bb1bfe6ee19398ab062bcdcdd9ef1415a6fa599a1f5e8135fb54ef6855e9f435619097
+DIST zabbix-6.2.7-go-deps.tar.xz 17973952 BLAKE2B f7e155040a60ac48236084b404d469bc5c34ab0dd986d3d647960bb6313f8080298f359680d6be23d2cb4c5f7d30bbab773c7fe81e4bde3873215f5e4072bed7 SHA512 e83dcd5cd6a07febf9c6380d311c84a319e3c45314266217837f6b35e540a6c9d4c980ceb7bb995ca8366247ea67d7d3c1b10beab677e4c24c69d83ba9977862
+DIST zabbix-6.2.7.tar.gz 41462274 BLAKE2B 52d82c1eb00f003f53758840af4621b15dcc0c4dbb09f051fa323a53fada303dc5123d3fc99238688e73eb9506a54ec88890d48bd7f21ecfccd5f8b0dd02e102 SHA512 5cafae600d7a83729ac2d28c1cace2a6fb0ac1bdca06ac89e7fd272f1227d2d19e3aa3ccfaefb00229a61f55c608c4d97a5595724c600d8a46950a92c6e20fd0
 EBUILD zabbix-4.0.44.ebuild 9425 BLAKE2B 99915e322601540a008f2672090b0b9aaa56514afc03ea29c23495c84d493109da12faf142b9bbde2330995e2b2299b0ebd29af78c59330a6184df570072a148 SHA512 e72962f9d932ebd4114d3a6277a9a73523589deb2d68926193e9e1a85df89f4c7aa28367794300f609975133e68f756a31ab4388edbfe3ccc1e9138e3dfc0d56
 EBUILD zabbix-5.0.29.ebuild 10142 BLAKE2B a71d8c7d65a4fdf930662b476416c416f519aaedd1489ede7da5b442d5aa2788625385bc8f0af28202f1261d10ebaa0b6dab3d449a7391df036b09a8646791cd SHA512 8053a8a2445a8aee9f029fb5ef61478b4e6beb4dbd0181c3054f34a59d8c6ef7f07c094588ede931371e02faf672c8d89f6e2f2baa1e5fee0e9866f34ed426a4
 EBUILD zabbix-5.0.30.ebuild 10143 BLAKE2B 1433c673da12c17346047fbad4aa120855171c758aa227c924fad313da8eb4e6cac2f05a19ff24eb1d00d618c3dd242e2b0c5af4e9dc724703b8c9a82b3231b3 SHA512 090492b3bd5240ee41f3bc31f97281833b2b37ef78965a15cc84aa4eacf04a61683e9de29d1945c31c3d0baa09a7a06a7d7ee1286a5b102d6f669639ef6e3f57
+EBUILD zabbix-5.0.31.ebuild 10144 BLAKE2B 408ca81f3217efbed52c461cf7a17b228dde32b1f9d15625341202f01fbdb79c48d265f85cda2bbb366d5cf926c1a55b040f6a3670475bbda81b1e806d743ab7 SHA512 2d8d472f1e529384e0bd7ec5de6e774628f20e78a6db94ad449f5e22c2f55a1558777523bb20d00a30c31926b9ec3709000bbbe287522184bfab117587409d42
 EBUILD zabbix-6.0.10.ebuild 10737 BLAKE2B e249cd00548e05fa986df84d4d53c5277195b60a6aa433c8f6cc0d6824e950efc00b644b7f6b7af638431d57f26149b0848139fdaaa295d282497b8aa56cdfe0 SHA512 a94a896619edb99e9ab841c63516a4a6fd673ea21a1b6276d65a9dff5e55f93825b88396defdb164c59f550e3537c18e5a59698aa98e6c50919dc9f1bc3f75fc
 EBUILD zabbix-6.0.11.ebuild 10209 BLAKE2B d90d115f137fd778b5051728e6cb5def545b506c7887e634be9f7d503043d53cd24f5b99c0e4905f2ed17fb2a62739a8c79d3cdd8a754396d9fef0e28e88b4f6 SHA512 05e026492443e19c068fb786cc6976afb192b2104035f1c9a38d7c72251541f596b03973aaad16c85e11bfb31dcbd2acdb4e920413c1a1b633f2382edffb5a2d
 EBUILD zabbix-6.0.12.ebuild 10208 BLAKE2B d70477439d64051a0398205cce5ec3f5b47fbb198d04b065597d303ec14ff2b9bdbabbfc570fc62dacd94c4971c3d4142673b117f81dcfa9f3137a853b02fe51 SHA512 0a5210f2ddd059fe0894ac644158fa7cdbe13c67dceb925573d724084104d56414fa50fa5db48e0c12a1ebe8556c7699f3f3cca3028d02c88f227e950d2eb6d6
+EBUILD zabbix-6.0.13.ebuild 10209 BLAKE2B a9bdb478ee3bcf0258ff08f869d73d050d8bbdbb56491b50707388729f90abfe01599a787def5b1ef89c0a7049b6780a247bbbe334105771a384cf5ae53f44a0 SHA512 1140da0734d117b1616d9dc951b7b083873b966dc2d0c1dba7d6ef61b9aa62713efd0382254646099c164cb13fb52f6f914913e9ec3d8c66a236b9c9d2a7ad6b
 EBUILD zabbix-6.2.4.ebuild 10737 BLAKE2B e249cd00548e05fa986df84d4d53c5277195b60a6aa433c8f6cc0d6824e950efc00b644b7f6b7af638431d57f26149b0848139fdaaa295d282497b8aa56cdfe0 SHA512 a94a896619edb99e9ab841c63516a4a6fd673ea21a1b6276d65a9dff5e55f93825b88396defdb164c59f550e3537c18e5a59698aa98e6c50919dc9f1bc3f75fc
 EBUILD zabbix-6.2.5.ebuild 10209 BLAKE2B d90d115f137fd778b5051728e6cb5def545b506c7887e634be9f7d503043d53cd24f5b99c0e4905f2ed17fb2a62739a8c79d3cdd8a754396d9fef0e28e88b4f6 SHA512 05e026492443e19c068fb786cc6976afb192b2104035f1c9a38d7c72251541f596b03973aaad16c85e11bfb31dcbd2acdb4e920413c1a1b633f2382edffb5a2d
 EBUILD zabbix-6.2.6.ebuild 10208 BLAKE2B d70477439d64051a0398205cce5ec3f5b47fbb198d04b065597d303ec14ff2b9bdbabbfc570fc62dacd94c4971c3d4142673b117f81dcfa9f3137a853b02fe51 SHA512 0a5210f2ddd059fe0894ac644158fa7cdbe13c67dceb925573d724084104d56414fa50fa5db48e0c12a1ebe8556c7699f3f3cca3028d02c88f227e950d2eb6d6
+EBUILD zabbix-6.2.7.ebuild 10209 BLAKE2B a9bdb478ee3bcf0258ff08f869d73d050d8bbdbb56491b50707388729f90abfe01599a787def5b1ef89c0a7049b6780a247bbbe334105771a384cf5ae53f44a0 SHA512 1140da0734d117b1616d9dc951b7b083873b966dc2d0c1dba7d6ef61b9aa62713efd0382254646099c164cb13fb52f6f914913e9ec3d8c66a236b9c9d2a7ad6b
 MISC metadata.xml 1757 BLAKE2B 4c44773ec6767f5d7edf927347cfae3f45ba1afb0ac1399c5fd31a9ce8c493647b16d22b891d803a820cac76ab2b3a3966ac33704e6e1d728cb23c18f30e02d4 SHA512 e953034478edb317a3657e44725e5e18d0033d70f53a10a3e8d317f0cc2a014a3c5485135999435cf222fa63748d093888054d6556b8ca78b00e39a699d98968
diff --git a/net-analyzer/zabbix/zabbix-5.0.31.ebuild b/net-analyzer/zabbix/zabbix-5.0.31.ebuild
new file mode 100644
index 000000000000..6e481bc98c71
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-5.0.31.ebuild
@@ -0,0 +1,398 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# To create the go modules tarball:
+#   cd src/go
+#   GOMODCACHE="${PWD}"/go-mod go mod download -modcacherw
+#   tar -acf zabbix-${PV}-go-deps.tar.xz go-mod
+
+EAPI=8
+
+GO_OPTIONAL="yes"
+# needed to make webapp-config dep optional
+WEBAPP_OPTIONAL="yes"
+inherit webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info
+
+DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
+HOMEPAGE="https://www.zabbix.com/"
+MY_P=${P/_/}
+MY_PV=${PV/_/}
+SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz
+	agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/${P}-go-deps.tar.xz )
+"
+
+LICENSE="GPL-2"
+SLOT="0/$(ver_cut 1-2)"
+WEBAPP_MANUAL_SLOT="yes"
+KEYWORDS="~amd64 ~x86"
+IUSE="+agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh static"
+REQUIRED_USE="|| ( agent agent2 frontend proxy server )
+	?? ( gnutls openssl )
+	proxy? ( ^^ ( mysql oracle postgres sqlite ) )
+	server? ( ^^ ( mysql oracle postgres ) !sqlite )
+	static? ( !oracle !snmp )"
+
+COMMON_DEPEND="
+	curl? ( net-misc/curl )
+	gnutls? ( net-libs/gnutls:0= )
+	java? ( >=virtual/jdk-1.8:* )
+	ldap? (
+		=dev-libs/cyrus-sasl-2*
+		net-libs/gnutls:=
+		net-nds/openldap:=
+	)
+	libxml2? ( dev-libs/libxml2 )
+	mysql? ( dev-db/mysql-connector-c:= )
+	odbc? ( dev-db/unixODBC )
+	openipmi? ( sys-libs/openipmi )
+	openssl? ( dev-libs/openssl:=[-bindist(-)] )
+	oracle? ( dev-db/oracle-instantclient[odbc,sdk] )
+	postgres? ( dev-db/postgresql:* )
+	proxy?  (
+		dev-libs/libevent:=
+		sys-libs/zlib
+	)
+	server? (
+		dev-libs/libevent:=
+		sys-libs/zlib
+	)
+	snmp? ( net-analyzer/net-snmp:= )
+	sqlite? ( dev-db/sqlite )
+	ssh? ( net-libs/libssh2 )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	acct-group/zabbix
+	acct-user/zabbix
+	java? ( >=virtual/jre-1.8:* )
+	mysql? ( virtual/mysql )
+	proxy? (
+		dev-libs/libpcre
+		net-analyzer/fping[suid]
+	)
+	server? (
+		app-admin/webapp-config
+		dev-libs/libpcre
+		net-analyzer/fping[suid]
+	)
+	frontend? (
+		app-admin/webapp-config
+		dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
+		media-libs/gd[png]
+		virtual/httpd-php:*
+		mysql? ( dev-lang/php[mysqli] )
+		odbc? ( dev-lang/php[odbc] )
+		oracle? ( dev-lang/php[oci8-instant-client] )
+		postgres? ( dev-lang/php[postgres] )
+		sqlite? ( dev-lang/php[sqlite] )
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	static? (
+		curl? ( net-misc/curl[static-libs] )
+		ldap? (
+			=dev-libs/cyrus-sasl-2*[static-libs]
+			net-libs/gnutls[static-libs]
+			net-nds/openldap[static-libs]
+		)
+		libxml2? ( dev-libs/libxml2[static-libs] )
+		mysql? ( dev-db/mysql-connector-c[static-libs] )
+		odbc? ( dev-db/unixODBC[static-libs] )
+		postgres? ( dev-db/postgresql:*[static-libs] )
+		sqlite? ( dev-db/sqlite[static-libs] )
+		ssh? ( net-libs/libssh2 )
+	)
+"
+BDEPEND="
+	virtual/pkgconfig
+	agent2? (
+		>=dev-lang/go-1.12
+		app-arch/unzip
+	)
+"
+
+# upstream tests fail for agent2
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.0.18-modulepathfix.patch"
+	"${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch"
+	"${FILESDIR}/${PN}-5.0.22-system.sw.packages.patch"
+)
+
+S=${WORKDIR}/${MY_P}
+
+ZABBIXJAVA_BASE="opt/zabbix_java"
+
+pkg_setup() {
+	if use oracle; then
+		if [ -z "${ORACLE_HOME}" ]; then
+			eerror
+			eerror "The environment variable ORACLE_HOME must be set"
+			eerror "and point to the correct location."
+			eerror "It looks like you don't have Oracle installed."
+			eerror
+			die "Environment variable ORACLE_HOME is not set"
+		fi
+	fi
+
+	if use frontend; then
+		webapp_pkg_setup
+	fi
+
+	java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+	default
+}
+
+src_configure() {
+	econf \
+		$(use_enable agent) \
+		$(use_enable agent2) \
+		$(use_enable ipv6) \
+		$(use_enable java) \
+		$(use_enable proxy) \
+		$(use_enable server) \
+		$(use_enable static) \
+		$(use_with curl libcurl) \
+		$(use_with gnutls) \
+		$(use_with ldap) \
+		$(use_with libxml2) \
+		$(use_with mysql) \
+		$(use_with odbc unixodbc) \
+		$(use_with openipmi openipmi) \
+		$(use_with openssl) \
+		$(use_with oracle) \
+		$(use_with postgres postgresql) \
+		$(use_with snmp net-snmp) \
+		$(use_with sqlite sqlite3) \
+		$(use_with ssh ssh2)
+}
+
+src_compile() {
+	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
+		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
+	fi
+}
+
+src_install() {
+	local dirs=(
+		/etc/zabbix
+		/var/lib/zabbix
+		/var/lib/zabbix/home
+		/var/lib/zabbix/scripts
+		/var/lib/zabbix/alertscripts
+		/var/lib/zabbix/externalscripts
+		/var/log/zabbix
+	)
+
+	for dir in "${dirs[@]}"; do
+		dodir "${dir}"
+		keepdir "${dir}"
+	done
+
+	if use server; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_server.conf
+		fperms 0640 /etc/zabbix/zabbix_server.conf
+		fowners root:zabbix /etc/zabbix/zabbix_server.conf
+
+		newinitd "${FILESDIR}"/zabbix-server-r1.init zabbix-server
+
+		dosbin src/zabbix_server/zabbix_server
+
+		insinto /usr/share/zabbix
+		doins -r "${S}"/database/
+
+		systemd_dounit "${FILESDIR}"/zabbix-server.service
+		newtmpfiles "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf
+	fi
+
+	if use proxy; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_proxy.conf
+		fperms 0640 /etc/zabbix/zabbix_proxy.conf
+		fowners root:zabbix /etc/zabbix/zabbix_proxy.conf
+
+		newinitd "${FILESDIR}"/zabbix-proxy.init zabbix-proxy
+
+		dosbin src/zabbix_proxy/zabbix_proxy
+
+		insinto /usr/share/zabbix
+		doins -r "${S}"/database/
+
+		systemd_dounit "${FILESDIR}"/zabbix-proxy.service
+		newtmpfiles "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_agentd.conf
+		fperms 0640 /etc/zabbix/zabbix_agentd.conf
+		fowners root:zabbix /etc/zabbix/zabbix_agentd.conf
+
+		newinitd "${FILESDIR}"/zabbix-agentd.init zabbix-agentd
+
+		dosbin src/zabbix_agent/zabbix_agentd
+		dobin \
+			src/zabbix_sender/zabbix_sender \
+			src/zabbix_get/zabbix_get
+
+		systemd_dounit "${FILESDIR}"/zabbix-agentd.service
+		newtmpfiles "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf
+	fi
+
+	if use agent2; then
+		insinto /etc/zabbix
+		doins "${S}"/src/go/conf/zabbix_agent2.conf
+		fperms 0640 /etc/zabbix/zabbix_agent2.conf
+		fowners root:zabbix /etc/zabbix/zabbix_agent2.conf
+
+		newinitd "${FILESDIR}"/zabbix-agent2.init zabbix-agent2
+
+		dosbin src/go/bin/zabbix_agent2
+
+		systemd_dounit "${FILESDIR}"/zabbix-agent2.service
+		newtmpfiles "${FILESDIR}"/zabbix-agent2.tmpfiles zabbix-agent2.conf
+	fi
+
+	fowners root:zabbix /etc/zabbix
+	fowners zabbix:zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+	fperms 0750 \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	dodoc README INSTALL NEWS ChangeLog \
+		conf/zabbix_agentd.conf \
+		conf/zabbix_proxy.conf \
+		conf/zabbix_agentd/userparameter_examples.conf \
+		conf/zabbix_agentd/userparameter_mysql.conf \
+		conf/zabbix_server.conf
+
+	if use frontend; then
+		webapp_src_preinst
+		cp -R ui/* "${D}/${MY_HTDOCSDIR}"
+		webapp_configfile \
+			"${MY_HTDOCSDIR}"/include/db.inc.php \
+			"${MY_HTDOCSDIR}"/include/config.inc.php
+		webapp_src_install
+	fi
+
+	if use java; then
+		dodir \
+			/${ZABBIXJAVA_BASE} \
+			/${ZABBIXJAVA_BASE}/bin \
+			/${ZABBIXJAVA_BASE}/lib
+		keepdir /${ZABBIXJAVA_BASE}
+		exeinto /${ZABBIXJAVA_BASE}/bin
+		doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
+		exeinto /${ZABBIXJAVA_BASE}/lib
+		doexe \
+			src/zabbix_java/lib/logback-classic-1.2.9.jar \
+			src/zabbix_java/lib/logback-console.xml \
+			src/zabbix_java/lib/logback-core-1.2.9.jar \
+			src/zabbix_java/lib/logback.xml \
+			src/zabbix_java/lib/android-json-4.3_r3.1.jar \
+			src/zabbix_java/lib/slf4j-api-1.7.32.jar
+		newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy
+		newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf zabbix-jmx-proxy
+	fi
+}
+
+pkg_postinst() {
+	if use server || use proxy ; then
+		elog
+		elog "You may need to configure your database for Zabbix"
+		elog "if you have not already done so."
+		elog
+
+		zabbix_homedir=$(egethome zabbix)
+		if [ -n "${zabbix_homedir}" ] && \
+		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
+			ewarn
+			ewarn "The user 'zabbix' should have his homedir changed"
+			ewarn "to /var/lib/zabbix/home if you want to use"
+			ewarn "custom alert scripts."
+			ewarn
+			ewarn "A real homedir might be needed for configfiles"
+			ewarn "for custom alert scripts."
+			ewarn
+			ewarn "To change the homedir use:"
+			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
+			ewarn
+		fi
+	fi
+
+	if use server; then
+		tmpfiles_process zabbix-server.conf
+
+		elog
+		elog "For distributed monitoring you have to run:"
+		elog
+		elog "zabbix_server -n <nodeid>"
+		elog
+		elog "This will convert database data for use with Node ID"
+		elog "and also adds a local node."
+		elog
+	fi
+
+	if use proxy; then
+		tmpfiles_process zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		tmpfiles_process zabbix-agentd.conf
+	fi
+
+	if use agent2; then
+		tmpfiles_process zabbix-agent2.conf
+	fi
+
+	elog "--"
+	elog
+	elog "You may need to add these lines to /etc/services:"
+	elog
+	elog "zabbix-agent     10050/tcp Zabbix Agent"
+	elog "zabbix-agent     10050/udp Zabbix Agent"
+	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
+	elog "zabbix-trapper   10051/udp Zabbix Trapper"
+	elog
+
+	if use server || use proxy ; then
+		# check for fping
+		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
+		case "${fping_perms}" in
+			4[157][157][157])
+				;;
+			*)
+				ewarn
+				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
+				ewarn "you have to make /usr/sbin/fping setuid root and executable"
+				ewarn "by everyone. Run the following command to fix it:"
+				ewarn
+				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
+				ewarn
+				ewarn "Please be aware that this might impose a security risk,"
+				ewarn "depending on the code quality of fping."
+				ewarn
+				;;
+		esac
+	fi
+}
+
+pkg_prerm() {
+	(use frontend || use server) && webapp_pkg_prerm
+}
diff --git a/net-analyzer/zabbix/zabbix-6.0.13.ebuild b/net-analyzer/zabbix/zabbix-6.0.13.ebuild
new file mode 100644
index 000000000000..f3edadcff0ce
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-6.0.13.ebuild
@@ -0,0 +1,397 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# To create the go modules tarball:
+#   cd src/go
+#   GOMODCACHE="${PWD}"/go-mod go mod download -modcacherw
+#   tar -acf zabbix-${PV}-go-deps.tar.xz go-mod
+
+EAPI=8
+
+GO_OPTIONAL="yes"
+# needed to make webapp-config dep optional
+WEBAPP_OPTIONAL="yes"
+inherit webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info
+
+DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
+HOMEPAGE="https://www.zabbix.com/"
+MY_P=${P/_/}
+MY_PV=${PV/_/}
+SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz
+	agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/${P}-go-deps.tar.xz )
+"
+
+LICENSE="GPL-2"
+SLOT="0/$(ver_cut 1-2)"
+WEBAPP_MANUAL_SLOT="yes"
+KEYWORDS="~amd64 ~x86"
+IUSE="agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh static"
+REQUIRED_USE="|| ( agent agent2 frontend proxy server )
+	?? ( gnutls openssl )
+	proxy? ( ^^ ( mysql oracle postgres sqlite ) )
+	server? ( ^^ ( mysql oracle postgres ) !sqlite )
+	static? ( !oracle !snmp )"
+
+COMMON_DEPEND="
+	curl? ( net-misc/curl )
+	gnutls? ( net-libs/gnutls:0= )
+	java? ( >=virtual/jdk-1.8:* )
+	ldap? (
+		=dev-libs/cyrus-sasl-2*
+		net-libs/gnutls:=
+		net-nds/openldap:=
+	)
+	libxml2? ( dev-libs/libxml2 )
+	mysql? ( dev-db/mysql-connector-c:= )
+	odbc? ( dev-db/unixODBC )
+	openipmi? ( sys-libs/openipmi )
+	openssl? ( dev-libs/openssl:=[-bindist(-)] )
+	oracle? ( dev-db/oracle-instantclient[odbc,sdk] )
+	postgres? ( dev-db/postgresql:* )
+	proxy?  (
+		dev-libs/libevent:=
+		sys-libs/zlib
+	)
+	server? (
+		dev-libs/libevent:=
+		sys-libs/zlib
+	)
+	snmp? ( net-analyzer/net-snmp:= )
+	sqlite? ( dev-db/sqlite )
+	ssh? ( net-libs/libssh2 )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	acct-group/zabbix
+	acct-user/zabbix
+	java? ( >=virtual/jre-1.8:* )
+	mysql? ( virtual/mysql )
+	proxy? (
+		dev-libs/libpcre2:=
+		net-analyzer/fping[suid]
+	)
+	server? (
+		app-admin/webapp-config
+		dev-libs/libpcre2:=
+		net-analyzer/fping[suid]
+	)
+	frontend? (
+		app-admin/webapp-config
+		dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
+		media-libs/gd[png]
+		virtual/httpd-php:*
+		mysql? ( dev-lang/php[mysqli] )
+		odbc? ( dev-lang/php[odbc] )
+		oracle? ( dev-lang/php[oci8-instant-client] )
+		postgres? ( dev-lang/php[postgres] )
+		sqlite? ( dev-lang/php[sqlite] )
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	static? (
+		curl? ( net-misc/curl[static-libs] )
+		ldap? (
+			=dev-libs/cyrus-sasl-2*[static-libs]
+			net-libs/gnutls[static-libs]
+			net-nds/openldap[static-libs]
+		)
+		libxml2? ( dev-libs/libxml2[static-libs] )
+		mysql? ( dev-db/mysql-connector-c[static-libs] )
+		odbc? ( dev-db/unixODBC[static-libs] )
+		postgres? ( dev-db/postgresql:*[static-libs] )
+		sqlite? ( dev-db/sqlite[static-libs] )
+		ssh? ( net-libs/libssh2 )
+	)
+"
+BDEPEND="
+	virtual/pkgconfig
+	agent2? (
+		>=dev-lang/go-1.12
+		app-arch/unzip
+	)
+"
+
+# upstream tests fail for agent2
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.0.18-modulepathfix.patch"
+	"${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch"
+	"${FILESDIR}/${PN}-6.0.3-system.sw.packages.patch"
+)
+
+S=${WORKDIR}/${MY_P}
+
+ZABBIXJAVA_BASE="opt/zabbix_java"
+
+pkg_setup() {
+	if use oracle; then
+		if [ -z "${ORACLE_HOME}" ]; then
+			eerror
+			eerror "The environment variable ORACLE_HOME must be set"
+			eerror "and point to the correct location."
+			eerror "It looks like you don't have Oracle installed."
+			eerror
+			die "Environment variable ORACLE_HOME is not set"
+		fi
+	fi
+
+	if use frontend; then
+		webapp_pkg_setup
+	fi
+
+	java-pkg-opt-2_pkg_setup
+}
+
+src_configure() {
+	local econf_args=(
+		--with-libpcre2
+		"$(use_enable agent)"
+		"$(use_enable agent2)"
+		"$(use_enable ipv6)"
+		"$(use_enable java)"
+		"$(use_enable proxy)"
+		"$(use_enable server)"
+		"$(use_enable static)"
+		"$(use_with curl libcurl)"
+		"$(use_with gnutls)"
+		"$(use_with ldap)"
+		"$(use_with libxml2)"
+		"$(use_with mysql)"
+		"$(use_with odbc unixodbc)"
+		"$(use_with openipmi openipmi)"
+		"$(use_with openssl)"
+		"$(use_with oracle)"
+		"$(use_with postgres postgresql)"
+		"$(use_with snmp net-snmp)"
+		"$(use_with sqlite sqlite3)"
+		"$(use_with ssh ssh2)"
+	)
+
+	econf ${econf_args[@]}
+}
+
+src_compile() {
+	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
+		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
+	fi
+}
+
+src_install() {
+	local dirs=(
+		/etc/zabbix
+		/var/lib/zabbix
+		/var/lib/zabbix/home
+		/var/lib/zabbix/scripts
+		/var/lib/zabbix/alertscripts
+		/var/lib/zabbix/externalscripts
+		/var/log/zabbix
+	)
+
+	for dir in "${dirs[@]}"; do
+		keepdir "${dir}"
+	done
+
+	if use server; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_server.conf
+		fperms 0640 /etc/zabbix/zabbix_server.conf
+		fowners root:zabbix /etc/zabbix/zabbix_server.conf
+
+		newinitd "${FILESDIR}"/zabbix-server-r1.init zabbix-server
+
+		dosbin src/zabbix_server/zabbix_server
+
+		insinto /usr/share/zabbix
+		doins -r "${S}"/database/
+
+		systemd_dounit "${FILESDIR}"/zabbix-server.service
+		newtmpfiles "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf
+	fi
+
+	if use proxy; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_proxy.conf
+		fperms 0640 /etc/zabbix/zabbix_proxy.conf
+		fowners root:zabbix /etc/zabbix/zabbix_proxy.conf
+
+		newinitd "${FILESDIR}"/zabbix-proxy.init zabbix-proxy
+
+		dosbin src/zabbix_proxy/zabbix_proxy
+
+		insinto /usr/share/zabbix
+		doins -r "${S}"/database/
+
+		systemd_dounit "${FILESDIR}"/zabbix-proxy.service
+		newtmpfiles "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_agentd.conf
+		fperms 0640 /etc/zabbix/zabbix_agentd.conf
+		fowners root:zabbix /etc/zabbix/zabbix_agentd.conf
+
+		newinitd "${FILESDIR}"/zabbix-agentd.init zabbix-agentd
+
+		dosbin src/zabbix_agent/zabbix_agentd
+		dobin \
+			src/zabbix_sender/zabbix_sender \
+			src/zabbix_get/zabbix_get
+
+		systemd_dounit "${FILESDIR}"/zabbix-agentd.service
+		newtmpfiles "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf
+	fi
+	if use agent2; then
+		insinto /etc/zabbix
+		doins "${S}"/src/go/conf/zabbix_agent2.conf
+		fperms 0640 /etc/zabbix/zabbix_agent2.conf
+		fowners root:zabbix /etc/zabbix/zabbix_agent2.conf
+		keepdir /etc/zabbix/zabbix_agent2.d/plugins.d
+
+		newinitd "${FILESDIR}"/zabbix-agent2.init zabbix-agent2
+
+		dosbin src/go/bin/zabbix_agent2
+
+		systemd_dounit "${FILESDIR}"/zabbix-agent2.service
+		newtmpfiles "${FILESDIR}"/zabbix-agent2.tmpfiles zabbix-agent2.conf
+	fi
+
+	fowners root:zabbix /etc/zabbix
+	fowners zabbix:zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+	fperms 0750 \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	dodoc README INSTALL NEWS ChangeLog \
+		conf/zabbix_agentd.conf \
+		conf/zabbix_proxy.conf \
+		conf/zabbix_agentd/userparameter_examples.conf \
+		conf/zabbix_agentd/userparameter_mysql.conf \
+		conf/zabbix_server.conf
+
+	if use frontend; then
+		webapp_src_preinst
+		cp -R ui/* "${D}/${MY_HTDOCSDIR}"
+		webapp_configfile \
+			"${MY_HTDOCSDIR}"/include/db.inc.php \
+			"${MY_HTDOCSDIR}"/include/config.inc.php
+		webapp_src_install
+	fi
+
+	if use java; then
+		dodir \
+			/${ZABBIXJAVA_BASE} \
+			/${ZABBIXJAVA_BASE}/bin \
+			/${ZABBIXJAVA_BASE}/lib
+		keepdir /${ZABBIXJAVA_BASE}
+		exeinto /${ZABBIXJAVA_BASE}/bin
+		doexe src/zabbix_java/bin/zabbix-java-gateway-"${MY_PV}".jar
+		exeinto /${ZABBIXJAVA_BASE}/lib
+		doexe \
+			src/zabbix_java/lib/logback-classic-1.2.9.jar \
+			src/zabbix_java/lib/logback-console.xml \
+			src/zabbix_java/lib/logback-core-1.2.9.jar \
+			src/zabbix_java/lib/logback.xml \
+			src/zabbix_java/lib/android-json-4.3_r3.1.jar \
+			src/zabbix_java/lib/slf4j-api-1.7.32.jar
+		newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy
+		newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf zabbix-jmx-proxy
+	fi
+}
+
+pkg_postinst() {
+	if use server || use proxy ; then
+		elog
+		elog "You may need to configure your database for Zabbix"
+		elog "if you have not already done so."
+		elog
+
+		zabbix_homedir=$(egethome zabbix)
+		if [ -n "${zabbix_homedir}" ] && \
+			[ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
+			ewarn
+			ewarn "The user 'zabbix' should have his homedir changed"
+			ewarn "to /var/lib/zabbix/home if you want to use"
+			ewarn "custom alert scripts."
+			ewarn
+			ewarn "A real homedir might be needed for configfiles"
+			ewarn "for custom alert scripts."
+			ewarn
+			ewarn "To change the homedir use:"
+			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
+			ewarn
+		fi
+	fi
+
+	if use server; then
+		tmpfiles_process zabbix-server.conf
+
+		elog
+		elog "For distributed monitoring you have to run:"
+		elog
+		elog "zabbix_server -n <nodeid>"
+		elog
+		elog "This will convert database data for use with Node ID"
+		elog "and also adds a local node."
+		elog
+	fi
+
+	if use proxy; then
+		tmpfiles_process zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		tmpfiles_process zabbix-agentd.conf
+	fi
+
+	if use agent2; then
+		tmpfiles_process zabbix-agent2.conf
+	fi
+
+	elog "--"
+	elog
+	elog "You may need to add these lines to /etc/services:"
+	elog
+	elog "zabbix-agent     10050/tcp Zabbix Agent"
+	elog "zabbix-agent     10050/udp Zabbix Agent"
+	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
+	elog "zabbix-trapper   10051/udp Zabbix Trapper"
+	elog
+
+	if use server || use proxy ; then
+		# check for fping
+		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
+		case "${fping_perms}" in
+			4[157][157][157])
+				;;
+			*)
+				ewarn
+				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
+				ewarn "you have to make /usr/sbin/fping setuid root and executable"
+				ewarn "by everyone. Run the following command to fix it:"
+				ewarn
+				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
+				ewarn
+				ewarn "Please be aware that this might impose a security risk,"
+				ewarn "depending on the code quality of fping."
+				ewarn
+				;;
+		esac
+	fi
+}
+
+pkg_prerm() {
+	(use frontend || use server) && webapp_pkg_prerm
+}
diff --git a/net-analyzer/zabbix/zabbix-6.2.7.ebuild b/net-analyzer/zabbix/zabbix-6.2.7.ebuild
new file mode 100644
index 000000000000..f3edadcff0ce
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-6.2.7.ebuild
@@ -0,0 +1,397 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# To create the go modules tarball:
+#   cd src/go
+#   GOMODCACHE="${PWD}"/go-mod go mod download -modcacherw
+#   tar -acf zabbix-${PV}-go-deps.tar.xz go-mod
+
+EAPI=8
+
+GO_OPTIONAL="yes"
+# needed to make webapp-config dep optional
+WEBAPP_OPTIONAL="yes"
+inherit webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info
+
+DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
+HOMEPAGE="https://www.zabbix.com/"
+MY_P=${P/_/}
+MY_PV=${PV/_/}
+SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz
+	agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/${P}-go-deps.tar.xz )
+"
+
+LICENSE="GPL-2"
+SLOT="0/$(ver_cut 1-2)"
+WEBAPP_MANUAL_SLOT="yes"
+KEYWORDS="~amd64 ~x86"
+IUSE="agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh static"
+REQUIRED_USE="|| ( agent agent2 frontend proxy server )
+	?? ( gnutls openssl )
+	proxy? ( ^^ ( mysql oracle postgres sqlite ) )
+	server? ( ^^ ( mysql oracle postgres ) !sqlite )
+	static? ( !oracle !snmp )"
+
+COMMON_DEPEND="
+	curl? ( net-misc/curl )
+	gnutls? ( net-libs/gnutls:0= )
+	java? ( >=virtual/jdk-1.8:* )
+	ldap? (
+		=dev-libs/cyrus-sasl-2*
+		net-libs/gnutls:=
+		net-nds/openldap:=
+	)
+	libxml2? ( dev-libs/libxml2 )
+	mysql? ( dev-db/mysql-connector-c:= )
+	odbc? ( dev-db/unixODBC )
+	openipmi? ( sys-libs/openipmi )
+	openssl? ( dev-libs/openssl:=[-bindist(-)] )
+	oracle? ( dev-db/oracle-instantclient[odbc,sdk] )
+	postgres? ( dev-db/postgresql:* )
+	proxy?  (
+		dev-libs/libevent:=
+		sys-libs/zlib
+	)
+	server? (
+		dev-libs/libevent:=
+		sys-libs/zlib
+	)
+	snmp? ( net-analyzer/net-snmp:= )
+	sqlite? ( dev-db/sqlite )
+	ssh? ( net-libs/libssh2 )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	acct-group/zabbix
+	acct-user/zabbix
+	java? ( >=virtual/jre-1.8:* )
+	mysql? ( virtual/mysql )
+	proxy? (
+		dev-libs/libpcre2:=
+		net-analyzer/fping[suid]
+	)
+	server? (
+		app-admin/webapp-config
+		dev-libs/libpcre2:=
+		net-analyzer/fping[suid]
+	)
+	frontend? (
+		app-admin/webapp-config
+		dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
+		media-libs/gd[png]
+		virtual/httpd-php:*
+		mysql? ( dev-lang/php[mysqli] )
+		odbc? ( dev-lang/php[odbc] )
+		oracle? ( dev-lang/php[oci8-instant-client] )
+		postgres? ( dev-lang/php[postgres] )
+		sqlite? ( dev-lang/php[sqlite] )
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	static? (
+		curl? ( net-misc/curl[static-libs] )
+		ldap? (
+			=dev-libs/cyrus-sasl-2*[static-libs]
+			net-libs/gnutls[static-libs]
+			net-nds/openldap[static-libs]
+		)
+		libxml2? ( dev-libs/libxml2[static-libs] )
+		mysql? ( dev-db/mysql-connector-c[static-libs] )
+		odbc? ( dev-db/unixODBC[static-libs] )
+		postgres? ( dev-db/postgresql:*[static-libs] )
+		sqlite? ( dev-db/sqlite[static-libs] )
+		ssh? ( net-libs/libssh2 )
+	)
+"
+BDEPEND="
+	virtual/pkgconfig
+	agent2? (
+		>=dev-lang/go-1.12
+		app-arch/unzip
+	)
+"
+
+# upstream tests fail for agent2
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.0.18-modulepathfix.patch"
+	"${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch"
+	"${FILESDIR}/${PN}-6.0.3-system.sw.packages.patch"
+)
+
+S=${WORKDIR}/${MY_P}
+
+ZABBIXJAVA_BASE="opt/zabbix_java"
+
+pkg_setup() {
+	if use oracle; then
+		if [ -z "${ORACLE_HOME}" ]; then
+			eerror
+			eerror "The environment variable ORACLE_HOME must be set"
+			eerror "and point to the correct location."
+			eerror "It looks like you don't have Oracle installed."
+			eerror
+			die "Environment variable ORACLE_HOME is not set"
+		fi
+	fi
+
+	if use frontend; then
+		webapp_pkg_setup
+	fi
+
+	java-pkg-opt-2_pkg_setup
+}
+
+src_configure() {
+	local econf_args=(
+		--with-libpcre2
+		"$(use_enable agent)"
+		"$(use_enable agent2)"
+		"$(use_enable ipv6)"
+		"$(use_enable java)"
+		"$(use_enable proxy)"
+		"$(use_enable server)"
+		"$(use_enable static)"
+		"$(use_with curl libcurl)"
+		"$(use_with gnutls)"
+		"$(use_with ldap)"
+		"$(use_with libxml2)"
+		"$(use_with mysql)"
+		"$(use_with odbc unixodbc)"
+		"$(use_with openipmi openipmi)"
+		"$(use_with openssl)"
+		"$(use_with oracle)"
+		"$(use_with postgres postgresql)"
+		"$(use_with snmp net-snmp)"
+		"$(use_with sqlite sqlite3)"
+		"$(use_with ssh ssh2)"
+	)
+
+	econf ${econf_args[@]}
+}
+
+src_compile() {
+	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
+		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
+	fi
+}
+
+src_install() {
+	local dirs=(
+		/etc/zabbix
+		/var/lib/zabbix
+		/var/lib/zabbix/home
+		/var/lib/zabbix/scripts
+		/var/lib/zabbix/alertscripts
+		/var/lib/zabbix/externalscripts
+		/var/log/zabbix
+	)
+
+	for dir in "${dirs[@]}"; do
+		keepdir "${dir}"
+	done
+
+	if use server; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_server.conf
+		fperms 0640 /etc/zabbix/zabbix_server.conf
+		fowners root:zabbix /etc/zabbix/zabbix_server.conf
+
+		newinitd "${FILESDIR}"/zabbix-server-r1.init zabbix-server
+
+		dosbin src/zabbix_server/zabbix_server
+
+		insinto /usr/share/zabbix
+		doins -r "${S}"/database/
+
+		systemd_dounit "${FILESDIR}"/zabbix-server.service
+		newtmpfiles "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf
+	fi
+
+	if use proxy; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_proxy.conf
+		fperms 0640 /etc/zabbix/zabbix_proxy.conf
+		fowners root:zabbix /etc/zabbix/zabbix_proxy.conf
+
+		newinitd "${FILESDIR}"/zabbix-proxy.init zabbix-proxy
+
+		dosbin src/zabbix_proxy/zabbix_proxy
+
+		insinto /usr/share/zabbix
+		doins -r "${S}"/database/
+
+		systemd_dounit "${FILESDIR}"/zabbix-proxy.service
+		newtmpfiles "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_agentd.conf
+		fperms 0640 /etc/zabbix/zabbix_agentd.conf
+		fowners root:zabbix /etc/zabbix/zabbix_agentd.conf
+
+		newinitd "${FILESDIR}"/zabbix-agentd.init zabbix-agentd
+
+		dosbin src/zabbix_agent/zabbix_agentd
+		dobin \
+			src/zabbix_sender/zabbix_sender \
+			src/zabbix_get/zabbix_get
+
+		systemd_dounit "${FILESDIR}"/zabbix-agentd.service
+		newtmpfiles "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf
+	fi
+	if use agent2; then
+		insinto /etc/zabbix
+		doins "${S}"/src/go/conf/zabbix_agent2.conf
+		fperms 0640 /etc/zabbix/zabbix_agent2.conf
+		fowners root:zabbix /etc/zabbix/zabbix_agent2.conf
+		keepdir /etc/zabbix/zabbix_agent2.d/plugins.d
+
+		newinitd "${FILESDIR}"/zabbix-agent2.init zabbix-agent2
+
+		dosbin src/go/bin/zabbix_agent2
+
+		systemd_dounit "${FILESDIR}"/zabbix-agent2.service
+		newtmpfiles "${FILESDIR}"/zabbix-agent2.tmpfiles zabbix-agent2.conf
+	fi
+
+	fowners root:zabbix /etc/zabbix
+	fowners zabbix:zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+	fperms 0750 \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	dodoc README INSTALL NEWS ChangeLog \
+		conf/zabbix_agentd.conf \
+		conf/zabbix_proxy.conf \
+		conf/zabbix_agentd/userparameter_examples.conf \
+		conf/zabbix_agentd/userparameter_mysql.conf \
+		conf/zabbix_server.conf
+
+	if use frontend; then
+		webapp_src_preinst
+		cp -R ui/* "${D}/${MY_HTDOCSDIR}"
+		webapp_configfile \
+			"${MY_HTDOCSDIR}"/include/db.inc.php \
+			"${MY_HTDOCSDIR}"/include/config.inc.php
+		webapp_src_install
+	fi
+
+	if use java; then
+		dodir \
+			/${ZABBIXJAVA_BASE} \
+			/${ZABBIXJAVA_BASE}/bin \
+			/${ZABBIXJAVA_BASE}/lib
+		keepdir /${ZABBIXJAVA_BASE}
+		exeinto /${ZABBIXJAVA_BASE}/bin
+		doexe src/zabbix_java/bin/zabbix-java-gateway-"${MY_PV}".jar
+		exeinto /${ZABBIXJAVA_BASE}/lib
+		doexe \
+			src/zabbix_java/lib/logback-classic-1.2.9.jar \
+			src/zabbix_java/lib/logback-console.xml \
+			src/zabbix_java/lib/logback-core-1.2.9.jar \
+			src/zabbix_java/lib/logback.xml \
+			src/zabbix_java/lib/android-json-4.3_r3.1.jar \
+			src/zabbix_java/lib/slf4j-api-1.7.32.jar
+		newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy
+		newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf zabbix-jmx-proxy
+	fi
+}
+
+pkg_postinst() {
+	if use server || use proxy ; then
+		elog
+		elog "You may need to configure your database for Zabbix"
+		elog "if you have not already done so."
+		elog
+
+		zabbix_homedir=$(egethome zabbix)
+		if [ -n "${zabbix_homedir}" ] && \
+			[ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
+			ewarn
+			ewarn "The user 'zabbix' should have his homedir changed"
+			ewarn "to /var/lib/zabbix/home if you want to use"
+			ewarn "custom alert scripts."
+			ewarn
+			ewarn "A real homedir might be needed for configfiles"
+			ewarn "for custom alert scripts."
+			ewarn
+			ewarn "To change the homedir use:"
+			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
+			ewarn
+		fi
+	fi
+
+	if use server; then
+		tmpfiles_process zabbix-server.conf
+
+		elog
+		elog "For distributed monitoring you have to run:"
+		elog
+		elog "zabbix_server -n <nodeid>"
+		elog
+		elog "This will convert database data for use with Node ID"
+		elog "and also adds a local node."
+		elog
+	fi
+
+	if use proxy; then
+		tmpfiles_process zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		tmpfiles_process zabbix-agentd.conf
+	fi
+
+	if use agent2; then
+		tmpfiles_process zabbix-agent2.conf
+	fi
+
+	elog "--"
+	elog
+	elog "You may need to add these lines to /etc/services:"
+	elog
+	elog "zabbix-agent     10050/tcp Zabbix Agent"
+	elog "zabbix-agent     10050/udp Zabbix Agent"
+	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
+	elog "zabbix-trapper   10051/udp Zabbix Trapper"
+	elog
+
+	if use server || use proxy ; then
+		# check for fping
+		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
+		case "${fping_perms}" in
+			4[157][157][157])
+				;;
+			*)
+				ewarn
+				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
+				ewarn "you have to make /usr/sbin/fping setuid root and executable"
+				ewarn "by everyone. Run the following command to fix it:"
+				ewarn
+				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
+				ewarn
+				ewarn "Please be aware that this might impose a security risk,"
+				ewarn "depending on the code quality of fping."
+				ewarn
+				;;
+		esac
+	fi
+}
+
+pkg_prerm() {
+	(use frontend || use server) && webapp_pkg_prerm
+}
diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz
index 32346bf16141..189115cde67b 100644
--- a/net-fs/Manifest.gz
+++ b/net-fs/Manifest.gz
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 9ef500fc43fe..5ca1d79a458b 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -9,7 +9,11 @@ AUX samba-4.16.2-fix-musl-without-innetgr.patch 866 BLAKE2B 01ed3e083c6765019b0f
 AUX samba-4.4.0-pam.patch 895 BLAKE2B bdc0601527a932424d55946b2eeaa288420ce90a8fd9be2271709da5c113625e80ae3783975b725c515004382bea65336ef725241079081cec213e81cc6e3056 SHA512 5a00c6131c372fc1cc9e23e4a37314442bf9af8e420a040a7b20ec3d76a357959d456437ed13e2e17f938eb6dcb4e7c5d899ff3d670526b0a444f63e35d5262c
 AUX samba.conf 146 BLAKE2B d86e630dba5fcb3a0bb22ac6daf8b0f63d30903c31911353116bc7a63e3ba434f69fd2cbe7a854ab3dc994b95e630932dcbe556fdd6372d27cea5a15618aa816 SHA512 da9ae57a6740135745453e776040b1e54bb492b351a1aa700b8868ef2d1716c0d54b55400cd9b1b1877e065d896ca1569b5a617863c698676250d8ea29939a52
 DIST samba-4.15.12.tar.gz 19339629 BLAKE2B b394767944e57dc907641c3635ccf290f48bd8a5880e5514066cf410c81eca6f1432a69b67b666ef7c052e2d90541579927456820e58e872a28b7946951f585d SHA512 6cb46bdd7eaebbcd76fb520d959cca22da924049c632338d954f9c8b16015288eebc982e20dcf9f1ed6deabd77e002dfaa920e3b2457f16a6768a1b1bea9dc3e
+DIST samba-4.15.13.tar.gz 19370777 BLAKE2B 8e681aac4a9f40992b212f8d4d5534405eeecae72def2ad8402ad0558912d0f3da6f3ac9302047b5e6813fdb72dfc829f84fe0d56be05903590d3a8c3d1a1407 SHA512 58477c50705f72846a591896bf4ef048e93b5a7488d5731da9d29b0064728baadc94115f22141e2ca4f6ab3114c83f3bfff5a0d589f10f8239f2b0b77e0f7dd3
 DIST samba-4.16.7.tar.gz 30622700 BLAKE2B be35253fd8ced22533716c7190ca02e57d4b9c73ac0d54b1e987c87da9e2fcc686335b9d470902cde47b841f3b57c09f9aab16f17c760b5eb7e45e328b3b2d1c SHA512 3966ef870b24e4282ce971bdc5906fb6f64a5bb99d448d9aade3ad013551b21b3cf42f792853be7e118483ba5b6f9d4b835ada642661a90051b6c04886e10c1e
-EBUILD samba-4.15.12-r4.ebuild 9965 BLAKE2B 100255d9b1ddf95112246389d10c9dc7348c50455c54f6f79810e3ac1d7e379abe2fc277508ecf15bd70e7283a15f74ea4e5649a8dbc060ce51d7ca1d65c2c1c SHA512 fa389d1e5083626840f4fe879e1fa003e0e0a300a947a63ea3d7661b4181e0933ffbd2de931d75ac8ab7401f774f63a861a9842b80c9c4ff3840198585e5366d
-EBUILD samba-4.16.7-r4.ebuild 11222 BLAKE2B ccefafab6dc52582ff700453dcfc7be46d825203a75b4a7ab3db5cdeedba20aeb2cd2efdf98331d1629a7c412c6aa7ed4a5c3075b1fd1416b05f13daf88711f1 SHA512 cb081f3c14eef7b02f3cc5d9a205790a924d4a77105c47d4ec393a6cecbd8d163d589bb82fdd689dc53b825a8b23eba70758dc73aeda2bca261c7cf60c81a655
+DIST samba-4.16.8.tar.gz 30682100 BLAKE2B bbb9a89a39cc0bae88ba350df38aae35df0bd18c27dd37b093eb023cf71274c12f14c44037e9704404ee3ba27ab930e866b3b951bcc7a5f4499cbc544f231e6b SHA512 55fa977e046de4470a9f1cb4c7956ca1368a21fc88e6bb6ae93d3cadb5400caaebd5b7d51a5ff1aaea884ec58d8abe6c90f448168aaa175d0f6c018f1a913c70
+EBUILD samba-4.15.12-r4.ebuild 9965 BLAKE2B 0ac9dba30b84527feb4ef21d2c6eaa959ffaf9136c998e69e830195c0efbe0244375f7e97d2208b50947b341270941e942b40b4f292863e1b8d08a913bf7af94 SHA512 00e510b19cbb28f1fcc07c6ef5251b693bb079eb68783652e5787d489ec8b769968bb03b04bfe832775405a0b0fb9a17aa80b8329cbc475ff575e629c536feb5
+EBUILD samba-4.15.13.ebuild 9980 BLAKE2B 6ed6629396f92997bdb3f905071e9790462bb8cc673928d12ee54e692c9e740d4adf38c737b5f44960786e81e56b3051b783a328a35b56af228304d106cfa7d0 SHA512 3e353562418564e3f9508dc51fb1497a928e7663ac9025fb6695376db28c5eae8814b3cdfd9d9840b3cafb1ecea55ac9d43bf59bfb95f9598bfada194b8e4a74
+EBUILD samba-4.16.7-r4.ebuild 11222 BLAKE2B 4882e577c746ed8dd9c52ffc7a1b2cf9459b2e2a326276d8244445c90cb2508601fb84d8945ce4bbdcc1c4cdffa4ed88e8a7b5aa81259eba975adeef28391eb5 SHA512 ca5dbc056f4c12553f2ddd3bada4eaeb44830c912153ba52bf3a4e697bdaa010e18d65fa54d2970d2b4b3dc8804b9ebcee02689759672e29c008d59f5b484c17
+EBUILD samba-4.16.8.ebuild 11232 BLAKE2B 8808fd148edad35b402f7579999139795ae504633c66007cb7185e369561960c057bfe9dec3f0826ba27de2568592120cf0f883135ad1c57e2ae3c9a1c04b8ea SHA512 48af207123c366125ab142a9c2a53b3f4e73412487e4a3d617868edb452822d8c000c224fb5ab6eac0cf960e2d51db864f5c0857043ca442c227db28a0211ce3
 MISC metadata.xml 2066 BLAKE2B 1d3a5757c3226cede70b5fabb63b27bf0a5b86bf27643a30ebfe743d0758e57ce1e69b14ba6795de4c656b3d5da5b3f9d90d11074520c24d6459220f62723b04 SHA512 0a7963f9abddd4cc3b303c93dcd4b7dc30ca5660e64750d77bcd3bce0a95291c46208d9a1143303c168febb2d65cdad0018c475130dc04c16d79df2019d8e9aa
diff --git a/net-fs/samba/samba-4.15.12-r4.ebuild b/net-fs/samba/samba-4.15.12-r4.ebuild
index 685dbfdbc549..aced3716fcad 100644
--- a/net-fs/samba/samba-4.15.12-r4.ebuild
+++ b/net-fs/samba/samba-4.15.12-r4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 PYTHON_REQ_USE="threads(+),xml(+)"
 inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam tmpfiles
 
diff --git a/net-fs/samba/samba-4.15.13.ebuild b/net-fs/samba/samba-4.15.13.ebuild
new file mode 100644
index 000000000000..d77cdbf1fc2f
--- /dev/null
+++ b/net-fs/samba/samba-4.15.13.ebuild
@@ -0,0 +1,334 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_REQ_USE="threads(+),xml(+)"
+inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam tmpfiles
+
+DESCRIPTION="Samba Suite Version 4"
+HOMEPAGE="https://samba.org/"
+
+MY_PV="${PV/_rc/rc}"
+MY_P="${PN}-${MY_PV}"
+if [[ ${PV} = *_rc* ]]; then
+	SRC_URI="mirror://samba/rc/${MY_P}.tar.gz"
+else
+	SRC_URI="mirror://samba/stable/${MY_P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="acl addc ads ceph client cluster cpu_flags_x86_aes cups debug fam
+glusterfs gpg iprint json ldap llvm-libunwind pam profiling-data python quota +regedit selinux
+snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test unwind winbind
+zeroconf"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	addc? ( python json !system-mitkrb5 winbind )
+	ads? ( acl ldap python winbind )
+	cluster? ( ads )
+	gpg? ( addc )
+	spotlight? ( json )
+	test? ( python )
+	!ads? ( !addc )
+	?? ( system-heimdal system-mitkrb5 )
+"
+
+# the test suite is messed, it uses system-installed samba
+# bits instead of what was built, tests things disabled via use
+# flags, and generally just fails to work in a way ebuilds could
+# rely on in its current state
+RESTRICT="test"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/samba-4.0/policy.h
+	/usr/include/samba-4.0/dcerpc_server.h
+	/usr/include/samba-4.0/ctdb.h
+	/usr/include/samba-4.0/ctdb_client.h
+	/usr/include/samba-4.0/ctdb_protocol.h
+	/usr/include/samba-4.0/ctdb_private.h
+	/usr/include/samba-4.0/ctdb_typesafe_cb.h
+	/usr/include/samba-4.0/ctdb_version.h
+)
+
+COMMON_DEPEND="
+	>=app-arch/libarchive-3.1.2:=[${MULTILIB_USEDEP}]
+	dev-lang/perl:=
+	dev-libs/icu:=[${MULTILIB_USEDEP}]
+	dev-libs/libbsd[${MULTILIB_USEDEP}]
+	dev-libs/libtasn1:=[${MULTILIB_USEDEP}]
+	dev-libs/popt[${MULTILIB_USEDEP}]
+	dev-perl/Parse-Yapp
+	>=net-libs/gnutls-3.4.7:=[${MULTILIB_USEDEP}]
+	>=sys-fs/e2fsprogs-1.46.4-r51[${MULTILIB_USEDEP}]
+	>=sys-libs/ldb-2.4.4:=[ldap(+)?,${MULTILIB_USEDEP}]
+	<sys-libs/ldb-2.5.0:=[ldap(+)?,${MULTILIB_USEDEP}]
+	sys-libs/libcap[${MULTILIB_USEDEP}]
+	sys-libs/liburing:=[${MULTILIB_USEDEP}]
+	sys-libs/ncurses:=
+	sys-libs/readline:=
+	>=sys-libs/talloc-2.3.3[${MULTILIB_USEDEP}]
+	>=sys-libs/tdb-1.4.4[${MULTILIB_USEDEP}]
+	>=sys-libs/tevent-0.11.0[${MULTILIB_USEDEP}]
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	virtual/libcrypt:=[${MULTILIB_USEDEP}]
+	virtual/libiconv
+	$(python_gen_cond_dep "
+		addc? (
+			dev-python/dnspython:=[\${PYTHON_USEDEP}]
+			dev-python/markdown[\${PYTHON_USEDEP}]
+		)
+		ads? (
+			dev-python/dnspython:=[\${PYTHON_USEDEP}]
+			net-dns/bind-tools[gssapi]
+		)
+	")
+	acl? ( virtual/acl )
+	ceph? ( sys-cluster/ceph )
+	cluster? ( net-libs/rpcsvc-proto )
+	cups? ( net-print/cups )
+	debug? ( dev-util/lttng-ust )
+	fam? ( virtual/fam )
+	gpg? ( app-crypt/gpgme:= )
+	json? ( dev-libs/jansson:= )
+	ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
+	pam? ( sys-libs/pam )
+	python? (
+		sys-libs/ldb[python,${PYTHON_SINGLE_USEDEP}]
+		sys-libs/talloc[python,${PYTHON_SINGLE_USEDEP}]
+		sys-libs/tdb[python,${PYTHON_SINGLE_USEDEP}]
+		sys-libs/tevent[python,${PYTHON_SINGLE_USEDEP}]
+	)
+	snapper? ( sys-apps/dbus )
+	system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
+	system-mitkrb5? ( >=app-crypt/mit-krb5-1.19[${MULTILIB_USEDEP}] )
+	systemd? ( sys-apps/systemd:0= )
+	unwind? (
+		llvm-libunwind? ( sys-libs/llvm-libunwind:= )
+		!llvm-libunwind? ( sys-libs/libunwind:= )
+	)
+	zeroconf? ( net-dns/avahi[dbus] )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}]
+	net-libs/libtirpc[${MULTILIB_USEDEP}]
+	|| (
+		net-libs/rpcsvc-proto
+		<sys-libs/glibc-2.26[rpc(+)]
+	)
+	spotlight? ( dev-libs/glib )
+	test? (
+		$(python_gen_cond_dep "dev-python/subunit[\${PYTHON_USEDEP},${MULTILIB_USEDEP}]" )
+		!system-mitkrb5? (
+			>=net-dns/resolv_wrapper-1.1.4
+			>=net-libs/socket_wrapper-1.1.9
+			>=sys-libs/nss_wrapper-1.1.3
+			>=sys-libs/uid_wrapper-1.2.1
+		)
+	)"
+RDEPEND="${COMMON_DEPEND}
+	client? ( net-fs/cifs-utils[ads?] )
+	python? ( ${PYTHON_DEPS} )
+	selinux? ( sec-policy/selinux-samba )
+"
+BDEPEND="${PYTHON_DEPS}
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.4.0-pam.patch"
+	"${FILESDIR}/ldb-2.5.2-skip-wav-tevent-check.patch"
+	"${FILESDIR}/${PN}-4.15.9-libunwind-automagic.patch"
+	"${FILESDIR}/${PN}-4.16.2-fix-musl-without-innetgr.patch"
+	"${FILESDIR}/${PN}-4.15.12-configure-clang16.patch"
+)
+
+#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
+CONFDIR="${FILESDIR}/4.4"
+
+WAF_BINARY="${S}/buildtools/bin/waf"
+
+SHAREDMODS=""
+
+pkg_setup() {
+	# Package fails to build with distcc
+	export DISTCC_DISABLE=1
+
+	python-single-r1_pkg_setup
+
+	SHAREDMODS="$(usex snapper '' '!')vfs_snapper"
+	if use cluster ; then
+		SHAREDMODS+=",idmap_rid,idmap_tdb2,idmap_ad"
+	elif use ads ; then
+		SHAREDMODS+=",idmap_ad"
+	fi
+}
+
+src_prepare() {
+	default
+
+	# un-bundle dnspython
+	sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die
+
+	# unbundle iso8601 unless tests are enabled
+	if ! use test ; then
+		sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
+	fi
+
+	## ugly hackaround for bug #592502
+	#cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
+
+	sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \
+		-i source4/dsdb/samdb/ldb_modules/password_hash.c \
+		|| die
+
+	# Friggin' WAF shit
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	# when specifying libs for samba build you must append NONE to the end to
+	# stop it automatically including things
+	local bundled_libs="NONE"
+	if ! use system-heimdal && ! use system-mitkrb5 ; then
+		bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
+	fi
+
+	local myconf=(
+		--enable-fhs
+		--sysconfdir="${EPREFIX}/etc"
+		--localstatedir="${EPREFIX}/var"
+		--with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
+		--with-piddir="${EPREFIX}/run/${PN}"
+		--bundled-libraries="${bundled_libs}"
+		--builtin-libraries=NONE
+		--disable-rpath
+		--disable-rpath-install
+		--nopyc
+		--nopyo
+		--without-winexe
+		--accel-aes=$(usex cpu_flags_x86_aes intelaesni none)
+		$(multilib_native_use_with acl acl-support)
+		$(multilib_native_usex addc '' '--without-ad-dc')
+		$(multilib_native_use_with ads)
+		$(multilib_native_use_enable ceph cephfs)
+		$(multilib_native_use_with cluster cluster-support)
+		$(multilib_native_use_enable cups)
+		--without-dmapi
+		$(multilib_native_use_with fam)
+		$(multilib_native_use_enable glusterfs)
+		$(multilib_native_use_with gpg gpgme)
+		$(multilib_native_use_with json)
+		$(multilib_native_use_enable iprint)
+		$(multilib_native_use_with pam)
+		$(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
+		$(multilib_native_use_with quota quotas)
+		$(multilib_native_use_with regedit)
+		$(multilib_native_use_enable spotlight)
+		$(multilib_native_use_with syslog)
+		$(multilib_native_use_with systemd)
+		--systemd-install-services
+		--with-systemddir="$(systemd_get_systemunitdir)"
+		$(multilib_native_use_with unwind libunwind)
+		$(multilib_native_use_with winbind)
+		$(multilib_native_usex python '' '--disable-python')
+		$(multilib_native_use_enable zeroconf avahi)
+		$(multilib_native_usex test '--enable-selftest' '')
+		$(usex system-mitkrb5 "--with-system-mitkrb5 $(multilib_native_usex addc --with-experimental-mit-ad-dc '')" '')
+		$(use_with debug lttng)
+		$(use_with ldap)
+		$(use_with profiling-data)
+		# bug #683148
+		--jobs 1
+	)
+
+	if multilib_is_native_abi ; then
+		myconf+=( --with-shared-modules=${SHAREDMODS} )
+	else
+		myconf+=( --with-shared-modules=DEFAULT,!vfs_snapper )
+	fi
+
+	PYTHONHASHSEED=1 CPPFLAGS="-I${ESYSROOT}/usr/include/et ${CPPFLAGS}" \
+		waf-utils_src_configure ${myconf[@]}
+}
+
+multilib_src_compile() {
+	PYTHONHASHSEED=1 waf-utils_src_compile
+}
+
+multilib_src_install() {
+	PYTHONHASHSEED=1 waf-utils_src_install
+
+	# Make all .so files executable
+	find "${ED}" -type f -name "*.so" -exec chmod +x {} + || die
+	# smbspool_krb5_wrapper must only be accessible to root, bug #880739
+	find "${ED}" -type f -name "smbspool_krb5_wrapper" -exec chmod go-rwx {} + || die
+
+	# Remove empty runtime dirs created by build system (bug #892341)
+	find "${ED}"/{run,var} -type d -empty -delete || die
+
+	if multilib_is_native_abi ; then
+		# install ldap schema for server (bug #491002)
+		if use ldap ; then
+			insinto /etc/openldap/schema
+			doins examples/LDAP/samba.schema
+		fi
+
+		# create symlink for cups (bug #552310)
+		if use cups ; then
+			dosym ../../../bin/smbspool \
+				/usr/libexec/cups/backend/smb
+		fi
+
+		# install example config file
+		insinto /etc/samba
+		doins examples/smb.conf.default
+
+		# Fix paths in example file (#603964)
+		sed \
+			-e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \
+			-e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \
+			-e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \
+			-e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \
+			-e '/path =/s@/usr/spool/samba@/var/spool/samba@' \
+			-i "${ED}"/etc/samba/smb.conf.default || die
+
+		# Install init script and conf.d file
+		newinitd "${CONFDIR}/samba4.initd-r1" samba
+		newconfd "${CONFDIR}/samba4.confd" samba
+
+		dotmpfiles "${FILESDIR}"/samba.conf
+		if ! use addc ; then
+			rm "${D}/$(systemd_get_systemunitdir)/samba.service" \
+				|| die
+		fi
+
+		# Preserve functionality for old gentoo-specific unit names
+		dosym nmb.service "$(systemd_get_systemunitdir)/nmbd.service"
+		dosym smb.service "$(systemd_get_systemunitdir)/smbd.service"
+		dosym winbind.service "$(systemd_get_systemunitdir)/winbindd.service"
+	fi
+
+	if use pam && use winbind ; then
+		newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
+		# bugs #376853 and #590374
+		insinto /etc/security
+		doins examples/pam_winbind/pam_winbind.conf
+	fi
+}
+
+multilib_src_test() {
+	if multilib_is_native_abi ; then
+		"${WAF_BINARY}" test || die "test failed"
+	fi
+}
+
+pkg_postinst() {
+	tmpfiles_process samba.conf
+}
diff --git a/net-fs/samba/samba-4.16.7-r4.ebuild b/net-fs/samba/samba-4.16.7-r4.ebuild
index 3186d2557a34..eb2ded02c98b 100644
--- a/net-fs/samba/samba-4.16.7-r4.ebuild
+++ b/net-fs/samba/samba-4.16.7-r4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 PYTHON_REQ_USE="threads(+),xml(+)"
 inherit python-single-r1 flag-o-matic waf-utils multilib-minimal linux-info systemd pam tmpfiles
 
diff --git a/net-fs/samba/samba-4.16.8.ebuild b/net-fs/samba/samba-4.16.8.ebuild
new file mode 100644
index 000000000000..ab1c9713e392
--- /dev/null
+++ b/net-fs/samba/samba-4.16.8.ebuild
@@ -0,0 +1,368 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_REQ_USE="threads(+),xml(+)"
+inherit python-single-r1 flag-o-matic waf-utils multilib-minimal linux-info systemd pam tmpfiles
+
+DESCRIPTION="Samba Suite Version 4"
+HOMEPAGE="https://samba.org/"
+
+MY_PV="${PV/_rc/rc}"
+MY_P="${PN}-${MY_PV}"
+if [[ ${PV} == *_rc* ]]; then
+	SRC_URI="mirror://samba/rc/${MY_P}.tar.gz"
+else
+	SRC_URI="mirror://samba/stable/${MY_P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="acl addc ads ceph client cluster cpu_flags_x86_aes cups debug fam glusterfs gpg"
+IUSE+=" iprint json ldap llvm-libunwind pam profiling-data python quota +regedit selinux"
+IUSE+=" snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test unwind winbind"
+IUSE+=" zeroconf"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	addc? ( json python !system-mitkrb5 winbind )
+	ads? ( acl ldap python winbind )
+	cluster? ( ads )
+	gpg? ( addc )
+	spotlight? ( json )
+	test? ( python )
+	!ads? ( !addc )
+	?? ( system-heimdal system-mitkrb5 )
+"
+
+# the test suite is messed, it uses system-installed samba
+# bits instead of what was built, tests things disabled via use
+# flags, and generally just fails to work in a way ebuilds could
+# rely on in its current state
+RESTRICT="test"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/samba-4.0/policy.h
+	/usr/include/samba-4.0/dcerpc_server.h
+	/usr/include/samba-4.0/ctdb.h
+	/usr/include/samba-4.0/ctdb_client.h
+	/usr/include/samba-4.0/ctdb_protocol.h
+	/usr/include/samba-4.0/ctdb_private.h
+	/usr/include/samba-4.0/ctdb_typesafe_cb.h
+	/usr/include/samba-4.0/ctdb_version.h
+)
+
+TALLOC_VERSION="2.3.3"
+TDB_VERSION="1.4.6"
+TEVENT_VERSION="0.11.0"
+
+COMMON_DEPEND="
+	>=app-arch/libarchive-3.1.2:=[${MULTILIB_USEDEP}]
+	dev-lang/perl:=
+	dev-libs/icu:=[${MULTILIB_USEDEP}]
+	dev-libs/libbsd[${MULTILIB_USEDEP}]
+	dev-libs/libtasn1:=[${MULTILIB_USEDEP}]
+	dev-libs/popt[${MULTILIB_USEDEP}]
+	dev-perl/Parse-Yapp
+	>=net-libs/gnutls-3.4.7:=[${MULTILIB_USEDEP}]
+	>=sys-fs/e2fsprogs-1.46.4-r51[${MULTILIB_USEDEP}]
+	>=sys-libs/ldb-2.5.2:=[ldap(+)?,${MULTILIB_USEDEP}]
+	<sys-libs/ldb-2.6.0:=[ldap(+)?,${MULTILIB_USEDEP}]
+	sys-libs/libcap[${MULTILIB_USEDEP}]
+	sys-libs/liburing:=[${MULTILIB_USEDEP}]
+	sys-libs/ncurses:=
+	sys-libs/readline:=
+	>=sys-libs/talloc-${TALLOC_VERSION}[${MULTILIB_USEDEP}]
+	>=sys-libs/tdb-${TDB_VERSION}[${MULTILIB_USEDEP}]
+	>=sys-libs/tevent-${TEVENT_VERSION}[${MULTILIB_USEDEP}]
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	virtual/libcrypt:=[${MULTILIB_USEDEP}]
+	virtual/libiconv
+	$(python_gen_cond_dep '
+		addc? (
+			dev-python/dnspython:=[${PYTHON_USEDEP}]
+			dev-python/markdown[${PYTHON_USEDEP}]
+		)
+		ads? (
+			dev-python/dnspython:=[${PYTHON_USEDEP}]
+			net-dns/bind-tools[gssapi]
+		)
+	')
+	acl? ( virtual/acl )
+	ceph? ( sys-cluster/ceph )
+	cluster? ( net-libs/rpcsvc-proto )
+	cups? ( net-print/cups )
+	debug? ( dev-util/lttng-ust )
+	fam? ( virtual/fam )
+	gpg? ( app-crypt/gpgme:= )
+	json? ( dev-libs/jansson:= )
+	ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
+	pam? ( sys-libs/pam )
+	python? (
+		sys-libs/ldb[python,${PYTHON_SINGLE_USEDEP}]
+		sys-libs/talloc[python,${PYTHON_SINGLE_USEDEP}]
+		sys-libs/tdb[python,${PYTHON_SINGLE_USEDEP}]
+		sys-libs/tevent[python,${PYTHON_SINGLE_USEDEP}]
+	)
+	snapper? ( sys-apps/dbus )
+	system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
+	system-mitkrb5? ( >=app-crypt/mit-krb5-1.19[${MULTILIB_USEDEP}] )
+	systemd? ( sys-apps/systemd:= )
+	unwind? (
+		llvm-libunwind? ( sys-libs/llvm-libunwind:= )
+		!llvm-libunwind? ( sys-libs/libunwind:= )
+	)
+	zeroconf? ( net-dns/avahi[dbus] )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-perl/JSON
+	net-libs/libtirpc[${MULTILIB_USEDEP}]
+	net-libs/rpcsvc-proto
+	spotlight? ( dev-libs/glib )
+	test? (
+		>=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}]
+		$(python_gen_cond_dep "dev-python/subunit[\${PYTHON_USEDEP},${MULTILIB_USEDEP}]" )
+		!system-mitkrb5? (
+			>=net-dns/resolv_wrapper-1.1.4
+			>=net-libs/socket_wrapper-1.1.9
+			>=sys-libs/nss_wrapper-1.1.3
+			>=sys-libs/uid_wrapper-1.2.1
+		)
+	)"
+RDEPEND="${COMMON_DEPEND}
+	client? ( net-fs/cifs-utils[ads?] )
+	python? ( ${PYTHON_DEPS} )
+	selinux? ( sec-policy/selinux-samba )
+"
+BDEPEND="${PYTHON_DEPS}
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.4.0-pam.patch"
+	"${FILESDIR}/${PN}-4.16.1-netdb-defines.patch"
+	"${FILESDIR}/${PN}-4.16.2-fix-musl-without-innetgr.patch"
+	"${FILESDIR}/ldb-2.5.2-skip-wav-tevent-check.patch"
+	"${FILESDIR}/${PN}-4.15.9-libunwind-automagic.patch"
+	"${FILESDIR}/${PN}-4.15.12-configure-clang16.patch"
+)
+
+CONFDIR="${FILESDIR}/4.4"
+WAF_BINARY="${S}/buildtools/bin/waf"
+SHAREDMODS=""
+
+pkg_setup() {
+	# Package fails to build with distcc
+	export DISTCC_DISABLE=1
+	export PYTHONHASHSEED=1
+
+	python-single-r1_pkg_setup
+
+	SHAREDMODS="$(usev !snapper '!')vfs_snapper"
+	if use cluster ; then
+		SHAREDMODS+=",idmap_rid,idmap_tdb2,idmap_ad"
+	elif use ads ; then
+		SHAREDMODS+=",idmap_ad"
+	fi
+}
+
+check_samba_dep_versions() {
+	actual_talloc_version=$(sed -En '/^VERSION =/{s/[^0-9.]//gp}' lib/talloc/wscript || die)
+	if [[ ${actual_talloc_version} != ${TALLOC_VERSION} ]] ; then
+		eerror "Source talloc version: ${TALLOC_VERSION}"
+		eerror "Ebuild talloc version: ${actual_talloc_version}"
+		die "Ebuild needs to fix TALLOC_VERSION!"
+	fi
+
+	actual_tdb_version=$(sed -En '/^VERSION =/{s/[^0-9.]//gp}' lib/tdb/wscript || die)
+	if [[ ${actual_tdb_version} != ${TDB_VERSION} ]] ; then
+		eerror "Source tdb version: ${TDB_VERSION}"
+		eerror "Ebuild tdb version: ${actual_tdb_version}"
+		die "Ebuild needs to fix TDB_VERSION!"
+	fi
+
+	actual_tevent_version=$(sed -En '/^VERSION =/{s/[^0-9.]//gp}' lib/tevent/wscript || die)
+	if [[ ${actual_tevent_version} != ${TEVENT_VERSION} ]] ; then
+		eerror "Source tevent version: ${TEVENT_VERSION}"
+		eerror "Ebuild tevent version: ${actual_tevent_version}"
+		die "Ebuild needs to fix TEVENT_VERSION!"
+	fi
+}
+
+src_prepare() {
+	default
+
+	check_samba_dep_versions
+
+	# Unbundle dnspython
+	sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die
+
+	# Unbundle iso8601 unless tests are enabled
+	if ! use test ; then
+		sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
+	fi
+
+	# Ugly hackaround for bug #592502
+	#cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
+
+	sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \
+		-i source4/dsdb/samdb/ldb_modules/password_hash.c \
+		|| die
+
+	# WAF
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	# When specifying libs for samba build you must append NONE to the end to
+	# stop it automatically including things
+	local bundled_libs="NONE"
+	if ! use system-heimdal && ! use system-mitkrb5 ; then
+		bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
+	fi
+
+	# We "use" bundled cmocka when we're not running tests as we're
+	# not using it anyway. Means we avoid making users install it for
+	# no reason. bug #802531
+	if ! use test ; then
+		bundled_libs="cmocka,${bundled_libs}"
+	fi
+
+	local myconf=(
+		--enable-fhs
+		--sysconfdir="${EPREFIX}/etc"
+		--localstatedir="${EPREFIX}/var"
+		--with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
+		--with-piddir="${EPREFIX}/run/${PN}"
+		--bundled-libraries="${bundled_libs}"
+		--builtin-libraries=NONE
+		--disable-rpath
+		--disable-rpath-install
+		--nopyc
+		--nopyo
+		--without-winexe
+		--accel-aes=$(usex cpu_flags_x86_aes intelaesni none)
+		$(multilib_native_use_with acl acl-support)
+		$(multilib_native_usex addc '' '--without-ad-dc')
+		$(multilib_native_use_with ads)
+		$(multilib_native_use_enable ceph cephfs)
+		$(multilib_native_use_with cluster cluster-support)
+		$(multilib_native_use_enable cups)
+		--without-dmapi
+		$(multilib_native_use_with fam)
+		$(multilib_native_use_enable glusterfs)
+		$(multilib_native_use_with gpg gpgme)
+		$(multilib_native_use_with json)
+		$(multilib_native_use_enable iprint)
+		$(multilib_native_use_with pam)
+		$(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
+		$(multilib_native_use_with quota quotas)
+		$(multilib_native_use_with regedit)
+		$(multilib_native_use_enable spotlight)
+		$(multilib_native_use_with syslog)
+		$(multilib_native_use_with systemd)
+		--systemd-install-services
+		--with-systemddir="$(systemd_get_systemunitdir)"
+		$(multilib_native_use_with unwind libunwind)
+		$(multilib_native_use_with winbind)
+		$(multilib_native_usex python '' '--disable-python')
+		$(multilib_native_use_enable zeroconf avahi)
+		$(multilib_native_usex test '--enable-selftest' '')
+		$(usev system-mitkrb5 "--with-system-mitkrb5 $(multilib_native_usex addc --with-experimental-mit-ad-dc '')")
+		$(use_with debug lttng)
+		$(use_with ldap)
+		$(use_with profiling-data)
+		# bug #683148
+		--jobs 1
+	)
+
+	if multilib_is_native_abi ; then
+		myconf+=( --with-shared-modules=${SHAREDMODS} )
+	else
+		myconf+=( --with-shared-modules=DEFAULT,!vfs_snapper )
+	fi
+
+	append-cppflags "-I${ESYSROOT}/usr/include/et"
+
+	waf-utils_src_configure ${myconf[@]}
+}
+
+multilib_src_compile() {
+	waf-utils_src_compile
+}
+
+multilib_src_test() {
+	if multilib_is_native_abi ; then
+		"${WAF_BINARY}" test || die "Test failed"
+	fi
+}
+
+multilib_src_install() {
+	waf-utils_src_install
+
+	# Make all .so files executable
+	find "${ED}" -type f -name "*.so" -exec chmod +x {} + || die
+	# smbspool_krb5_wrapper must only be accessible to root, bug #880739
+	find "${ED}" -type f -name "smbspool_krb5_wrapper" -exec chmod go-rwx {} + || die
+
+	# Remove empty runtime dirs created by build system (bug #892341)
+	find "${ED}"/{run,var} -type d -empty -delete || die
+
+	if multilib_is_native_abi ; then
+		# Install ldap schema for server (bug #491002)
+		if use ldap ; then
+			insinto /etc/openldap/schema
+			doins examples/LDAP/samba.schema
+		fi
+
+		# Create symlink for cups (bug #552310)
+		if use cups ; then
+			dosym ../../../bin/smbspool \
+				/usr/libexec/cups/backend/smb
+		fi
+
+		# Install example config file
+		insinto /etc/samba
+		doins examples/smb.conf.default
+
+		# Fix paths in example file (bug #603964)
+		sed \
+			-e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \
+			-e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \
+			-e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \
+			-e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \
+			-e '/path =/s@/usr/spool/samba@/var/spool/samba@' \
+			-i "${ED}"/etc/samba/smb.conf.default || die
+
+		# Install init script and conf.d file
+		newinitd "${CONFDIR}/samba4.initd-r1" samba
+		newconfd "${CONFDIR}/samba4.confd" samba
+
+		dotmpfiles "${FILESDIR}"/samba.conf
+		if ! use addc ; then
+			rm "${D}/$(systemd_get_systemunitdir)/samba.service" \
+				|| die
+		fi
+
+		# Preserve functionality for old gentoo-specific unit names
+		dosym nmb.service "$(systemd_get_systemunitdir)/nmbd.service"
+		dosym smb.service "$(systemd_get_systemunitdir)/smbd.service"
+		dosym winbind.service "$(systemd_get_systemunitdir)/winbindd.service"
+	fi
+
+	if use pam && use winbind ; then
+		newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
+		# bugs #376853 and #590374
+		insinto /etc/security
+		doins examples/pam_winbind/pam_winbind.conf
+	fi
+}
+
+pkg_postinst() {
+	tmpfiles_process samba.conf
+}
diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index 7f59602a2174..ce4db0512ffc 100644
--- a/net-irc/Manifest.gz
+++ b/net-irc/Manifest.gz
diff --git a/net-irc/ergo/Manifest b/net-irc/ergo/Manifest
index d5949e55c9bb..7a7f2253e23a 100644
--- a/net-irc/ergo/Manifest
+++ b/net-irc/ergo/Manifest
@@ -1,7 +1,3 @@
-DIST ergo-2.10.0.tar.gz 3256716 BLAKE2B 72f1d6464ee434508b9944a9923435cda01e97c8b542c7c77c74562309a6b9ed727b5ae7c444f6e95517482fd87f34623d477e14c1dfbe323a7d81ace5c3e111 SHA512 952ef22b28d8de0814f04ece55b8ff88f405f184d8ecfce45c4af63e8c53153786d0b685f9bfff7cdb53ad369914f07069436f43b5ab65816bb7410b02f34bf8
-DIST ergo-2.11.0.tar.gz 3264162 BLAKE2B af5020469b7a7d7194cdf4e3f82ded906b811d754fac08bdfc0f8379b907069b92260701dd2e919a196b2ab655a32f9b9e3a21bfc8d363790d49cf32473a6c60 SHA512 ccdbc391e280ab25efd45752b84223213aceb3f3045307209da7a02b3b09df571242ad92d11786693fc208427a2d1ca0a3d6d470404cfb83b0acf40ca343441d
 DIST ergo-2.11.1.tar.gz 3264192 BLAKE2B 9a207fc808277275c43c4c70aec748efe0a5d3a21f4be195885b7058798df8b0d47b52a6b52708f3e04c5aa79faec2fd3f41a0da625fd55fff45a3b12cdb90ba SHA512 9808ecc28dc25e60b942bc74f8fbe4f07b7fda0641c3dd6fc681214e7e2b5fed7fa61f85e2ac0de3c08dc91a54f571e2741ab1b2f6597a2b53405211f327ad81
-EBUILD ergo-2.10.0-r1.ebuild 1501 BLAKE2B 28049bdd16691767da3476ab136e98d98652a1cc5658b70853a2815ead9157e122a14ee1834a206f27b076d4d760ac62a6417202848de06bb6913dadb084287d SHA512 d482a6994db06fa9375dbe2dc5ccdd426624073a3925632329abb498464c4c7d3b48948d9e4848dd91e819d24e4712edb662a27435754e053ec7e28c98af4f4b
-EBUILD ergo-2.11.0.ebuild 1565 BLAKE2B a82affb7986894a7429e06881dfcf2331b7d938d968272d331e082b79460d3f7762ebe30f686225fc891c687fc552f3d7982b80be41a2efaccbf60e999976b7d SHA512 af8844c6990271dde6f9c050fe790f67bbcdb4ed0727437352ce246826c2bf91bfbf84514de72b33f44546524cd7b2cf99af2f260ab71eb8d09e3a35c9399522
 EBUILD ergo-2.11.1.ebuild 1564 BLAKE2B 61870557a004f25d957d9aed7d284d1103c7d1097e89c9564d7961c7d2c9d5f2ddf098868878adb6859819d34c57d381ac4750c098d9b8489bf3f97d1edf9d05 SHA512 88eff6bcdb7b830fc5214b7c4f1717791fe1b441335d689c9b73601abef3075ac22b2c1afc77742f9bd821571c7b0affab8c78695b93ff7a4e4121fdd65a3a61
 MISC metadata.xml 320 BLAKE2B 3bff5defc5150caa0cae2776e69f9070d1896c9cab8e5e0fc1afb94606a1c0e0d3ab951b4ea1076929221bcfd0576540f1b1768c1f9d3ad68161d9540c6785e3 SHA512 b634cbc9628c66cfc5b2983a6da5b2322bfb5c755893e1c15aab203f6e94b15ea5be2494b0370e8b7fd4950d0d1059e60939bd945620aa0548ef665263a5672a
diff --git a/net-irc/ergo/ergo-2.10.0-r1.ebuild b/net-irc/ergo/ergo-2.10.0-r1.ebuild
deleted file mode 100644
index f166270d10d2..000000000000
--- a/net-irc/ergo/ergo-2.10.0-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module systemd
-
-DESCRIPTION="A modern IRC server written in Go"
-HOMEPAGE="https://ergo.chat/ https://github.com/ergochat/ergo"
-SRC_URI="https://github.com/ergochat/ergo/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD-2 BSD ISC MIT MPL-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64"
-
-# We may even want to package irctest in future?
-
-RDEPEND="acct-user/oragono
-	acct-group/oragono"
-
-DOCS=( README.md docs/MANUAL.md docs/USERGUIDE.md )
-
-src_prepare() {
-	default
-
-	sed -i -e 's:ERGO_USERNAME="ergo":ERGO_USERNAME="oragono":' distrib/openrc/ergo.confd || die
-
-	# Minor fiddling with paths
-	sed -i \
-		-e 's:/home/ergo/ergo:/usr/bin/ergo:' \
-		-e 's:/home/ergo:/var/lib/ergo:' \
-		-e 's:/var/lib/ergo/ircd.yaml:/etc/ergo/ircd.yaml:' \
-		-e 's:User=ergo:User=oragono:' \
-		distrib/systemd/ergo.service || die
-}
-
-src_compile() {
-	ego build .
-}
-
-src_install() {
-	einstalldocs
-
-	dobin ergo
-
-	insinto /etc/ergo
-	doins default.yaml
-
-	newinitd distrib/openrc/ergo.initd ergo
-	newconfd distrib/openrc/ergo.confd ergo
-
-	keepdir /var/lib/ergo
-	fowners oragono:oragono /var/lib/ergo
-
-	insinto /var/lib/ergo
-	doins -r languages/
-
-	systemd_dounit distrib/systemd/ergo.service
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
-		elog "Please copy the example config in ${EROOT}/etc/ergo:"
-		elog "e.g. cp ${EROOT}/etc/ergo/default.yaml ${EROOT}/etc/ergo/ircd.yaml"
-	fi
-}
diff --git a/net-irc/ergo/ergo-2.11.0.ebuild b/net-irc/ergo/ergo-2.11.0.ebuild
deleted file mode 100644
index 975e100d40f3..000000000000
--- a/net-irc/ergo/ergo-2.11.0.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module systemd
-
-DESCRIPTION="A modern IRC server written in Go"
-HOMEPAGE="https://ergo.chat/ https://github.com/ergochat/ergo"
-SRC_URI="https://github.com/ergochat/ergo/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/${P/_/-}
-
-LICENSE="Apache-2.0 BSD-2 BSD ISC MIT MPL-2.0"
-SLOT="0"
-if [[ ${PV} != *_rc* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64"
-fi
-
-# We may even want to package irctest in future?
-
-RDEPEND="acct-user/oragono
-	acct-group/oragono"
-
-DOCS=( README.md docs/MANUAL.md docs/USERGUIDE.md )
-
-src_prepare() {
-	default
-
-	sed -i -e 's:ERGO_USERNAME="ergo":ERGO_USERNAME="oragono":' distrib/openrc/ergo.confd || die
-
-	# Minor fiddling with paths
-	sed -i \
-		-e 's:/home/ergo/ergo:/usr/bin/ergo:' \
-		-e 's:/home/ergo:/var/lib/ergo:' \
-		-e 's:/var/lib/ergo/ircd.yaml:/etc/ergo/ircd.yaml:' \
-		-e 's:User=ergo:User=oragono:' \
-		distrib/systemd/ergo.service || die
-}
-
-src_compile() {
-	ego build .
-}
-
-src_install() {
-	einstalldocs
-
-	dobin ergo
-
-	insinto /etc/ergo
-	doins default.yaml
-
-	newinitd distrib/openrc/ergo.initd ergo
-	newconfd distrib/openrc/ergo.confd ergo
-
-	keepdir /var/lib/ergo
-	fowners oragono:oragono /var/lib/ergo
-
-	insinto /var/lib/ergo
-	doins -r languages/
-
-	systemd_dounit distrib/systemd/ergo.service
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
-		elog "Please copy the example config in ${EROOT}/etc/ergo:"
-		elog "e.g. cp ${EROOT}/etc/ergo/default.yaml ${EROOT}/etc/ergo/ircd.yaml"
-	fi
-}
diff --git a/net-irc/irker/Manifest b/net-irc/irker/Manifest
index d9bb5253d29c..7e45e783c50e 100644
--- a/net-irc/irker/Manifest
+++ b/net-irc/irker/Manifest
@@ -3,5 +3,7 @@ AUX irkerd.confd 535 BLAKE2B fe8484cee8e5d443c3019c9915553e503164a2e5e965b44e892
 AUX irkerd.initd 963 BLAKE2B 33e4b654eb908d5d2b5c086d821f81d959bcb71ec93b80c7aa38ffaf75f011d41f43b9369115d0ac463ecdc3781ee7360d06fa8afe9c7e66a79fc55e8340d338 SHA512 fa9247c207f4a21611e51477c31556114d83899ea7adcc8bf8f3bb3edafaa8db84b4764ac5704dfe7abff2e5f9727610b71609a620432dc939a81d2ab7fcf818
 AUX irkerd.service 517 BLAKE2B de89f8ff4d98928b8d4035e545a2c0628b849246ce5eae393341cf894a89ec1b33087da6c756d8b3b17784175541bd366dbf0b17c38e1e36cacd2b0da48a2391 SHA512 d31699cef084bfeb2272e49c7eeb050148e942286cd9cb2cd6491a97210628f08f05c04ddd052a8ee9cccba33ecd3e460f99aeb52dd1c1ae1ef65ef8754ddf49
 DIST irker-2.22.tar.gz 46037 BLAKE2B fbd9deaaa5cc509989b15d16d733bec351b7b2ab9d3bedd8b20713ba110755a43ccb91b1482a6deb0f71497b3b1d6f8ed5faae395c06c33ac4c9ea7da30d2726 SHA512 a3f2ebe113e4fcb4589c31a44c157bc0f91e8792fd7819e9f350fd25847669d2cb3fcd51cc0e09ef352952c5175f8b4eb56ac9969f0bff1544e28268728f0595
+DIST irker-2.23.tar.gz 45889 BLAKE2B 5e0039f83783f994083321da8a5f65aace8769a7aaa45d4d9111c604b563f997b17bfe80e30e123559beaab9147de2e2ff3f98588632151af4d1ab0f1cdfa71e SHA512 f812ed81906c13d8b1b2e3cd86b36fdd8a8d6961eb2bc163b2c309908b8469409e087b4fa36637eb9588773f494ff309e2540b1f8ddfc3eec37aa2e3443357a3
 EBUILD irker-2.22-r2.ebuild 1619 BLAKE2B 04f1f6a9b9af8e96b75949af399f969744b33f627804ac5fef33599858134611c5b32caf3b74f14681364defc9608b7c9cfa1f6320d3d6e043895ec3085ad6ff SHA512 21013a8f32da541cae1aaa421d6371b11155734b0a108dd9a0781f3799cd52235b222c1173a12a98dc3610feaa77c8326fd2b1d00738aac68542b8af29ddd150
+EBUILD irker-2.23.ebuild 1567 BLAKE2B 04ca816a742352ffac80261012bf26c228298988e5d852425e80a28f9db9c689a7827d5ed237eb703e933cbaa49ddaff37066d4cb1f60d4b7e9539002fab5973 SHA512 0626559c1f0dc08b706d57de6d0d32f22ebbfded78a944d9215812bde193b2ae5613f16df87c3a854ce6029bf738769971cca47b7618091a1ed78c1d3051c0d3
 MISC metadata.xml 338 BLAKE2B 75e1de187c8161e49dcc6ab3c7ee3020455f09f842d798404398d195495e9e5b58cc6252c092a3f411ff848acbb258a10cd6120470bd907f5daa9459b6d719a1 SHA512 f804005b7aa3039b1400eb323d254b40ddace228a638fc37901e60b95c7b10f428df40b5afbf5f4b2facf05a2f91020f001c8d58d258efee0732dbc7935ac066
diff --git a/net-irc/irker/irker-2.23.ebuild b/net-irc/irker/irker-2.23.ebuild
new file mode 100644
index 000000000000..cdf11156b821
--- /dev/null
+++ b/net-irc/irker/irker-2.23.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_REQ_USE="ssl"
+
+inherit optfeature python-single-r1 systemd
+
+DESCRIPTION="Submission tools for IRC notifications"
+HOMEPAGE="http://www.catb.org/esr/irker/ https://gitlab.com/esr/irker"
+SRC_URI="http://www.catb.org/esr/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# Dependency notes:
+# NOTE: No pkgconfig dep here because of the systemd sed below
+# NOTE: No need for asciidoc here as it's only used for the
+# 'release' makefile target.
+RDEPEND="${PYTHON_DEPS}"
+BDEPEND="
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/xmlto
+	${PYTHON_DEPS}
+"
+
+DOCS=( NEWS README hacking.adoc security.adoc )
+HTML_DOCS=( irkerd.html irkerhook.html )
+
+src_prepare() {
+	default
+
+	# Rely on systemd eclass for systemd service install
+	sed -e "/^SYSTEMDSYSTEMUNITDIR/d" -i Makefile || die "sed failed"
+
+	# Prefix support
+	sed -e "s|@EPREFIX@|${EPREFIX}|" "${FILESDIR}"/irkerd.service > "${WORKDIR}"/irkerd.service || die "sed failed"
+}
+
+src_install() {
+	default
+
+	python_doscript "${ED}"/usr/bin/irkerd
+	# Not installed with the default Makefile
+	python_doscript irk irkerhook.py
+
+	newinitd "${FILESDIR}"/irkerd.initd irkerd
+	newconfd "${FILESDIR}"/irkerd.confd irkerd
+
+	systemd_dounit "${WORKDIR}"/irkerd.service
+
+	docinto examples
+	dodoc filter-example.py filter-test.py
+}
+
+pkg_postinst() {
+	optfeature "SOCKS5 proxy support" dev-python/PySocks
+}
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index fbc4e7393a41..3697433124a8 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/ntpsec/Manifest b/net-misc/ntpsec/Manifest
index b1dc88e26639..8796c1b51da4 100644
--- a/net-misc/ntpsec/Manifest
+++ b/net-misc/ntpsec/Manifest
@@ -12,6 +12,6 @@ AUX ntpsec-py3-test-clarify.patch 993 BLAKE2B 85df81d6301e3f057601bbb2e01590a11c
 DIST ntpsec-1.2.1.tar.gz 2681237 BLAKE2B bfb2674131718dcf9f393e93d1148cfb6631591dbcce1ade91746586f261123b80b238393ac2a763fab119cd627f8eae4b006b023ad2b319e752db9eb4b04cc0 SHA512 0b8b0bda52d3025f6e9a06c00b1e0c25c595ada72b87ed0e5d3d6f77a034f557745156bc6d9a263c9876c041efffa38d42fa93ba8bfda31f67efbd842a726277
 DIST ntpsec-1.2.2.tar.gz 2710329 BLAKE2B 031412d0fc7ecb5aba73501e63f8d0c416b23fe69114dd32422b03b4827e1ac9c92a4dfeb2e7d074cf6fd410d00cf86632f241dffd22987e4c03b21d21d8693a SHA512 864afb72c4bd8bc439ee06d343893cf92b3893c26c972a7bd1ff2713f0ad1f50704b6d0c6f155e6373c9747efff3ea36097a590be0d53e1a7ea7f429ba409cd1
 EBUILD ntpsec-1.2.1-r6.ebuild 4409 BLAKE2B 3214e5e2ffc5b06ec8b086bc87e6e623c6a929107388a03e1bef2a28f651657dd23267483e94e5acecdf0664a9c349d4b075b833599c971da1062b0877b6de93 SHA512 d28107a05e9e208af20a70473f8cc918a82a04c71fe3e076332c29980ad6364b0cbf77678367816278c5a4cac94754f05d2e3686784f73324bd7a2b1f7ac9dc4
-EBUILD ntpsec-1.2.2.ebuild 4152 BLAKE2B ad818ccee4b668f29d493b1d6ac76783a367012cd33580dd8493cce1265fc93a6bd9b47b7deec0a69dea01c0f5b1a1f141222947b13101db06308600e3d4fa76 SHA512 e1ab65bfe7c7bf373f325d4f5ffc7a14b51a7c08205b6f5ab427231561fcd88b12bc34db367d93ff207e3437cfecc0cc11db97393f355cc00a8790599c505064
-EBUILD ntpsec-9999.ebuild 4152 BLAKE2B ad818ccee4b668f29d493b1d6ac76783a367012cd33580dd8493cce1265fc93a6bd9b47b7deec0a69dea01c0f5b1a1f141222947b13101db06308600e3d4fa76 SHA512 e1ab65bfe7c7bf373f325d4f5ffc7a14b51a7c08205b6f5ab427231561fcd88b12bc34db367d93ff207e3437cfecc0cc11db97393f355cc00a8790599c505064
+EBUILD ntpsec-1.2.2.ebuild 4152 BLAKE2B f7f63083a7e86fd4048377d62ba37e9c598743856986191766a0c636b1737cdb7a273c99abbf37e1e174bb6c16d6613882fee55fa157712dd0fb6f6ac378d756 SHA512 42466608a924fa01bba11d7a17f30b4515a70d01b2001aa0c631757825a817a516f606cd5240fb95093af87b860a7e67318277fda1046173aa4b5a6350b5d63d
+EBUILD ntpsec-9999.ebuild 4152 BLAKE2B f7f63083a7e86fd4048377d62ba37e9c598743856986191766a0c636b1737cdb7a273c99abbf37e1e174bb6c16d6613882fee55fa157712dd0fb6f6ac378d756 SHA512 42466608a924fa01bba11d7a17f30b4515a70d01b2001aa0c631757825a817a516f606cd5240fb95093af87b860a7e67318277fda1046173aa4b5a6350b5d63d
 MISC metadata.xml 1777 BLAKE2B e324b32f904e5f076331594aefa32e5174e917a78fb0e1ca0361a2a0cae8f7813637e044d6c351e3f1d07d01733062def59666b89f73d134a507332585f29ae9 SHA512 db03c0268e00fea3701979e30b3bb3b1677de9f2c6692c99eb78cf5a929ca39cb8f379add7ba6786f1ddbb80e1b9263ec46bf459706996c12f3fd38bbc9452ea
diff --git a/net-misc/ntpsec/ntpsec-1.2.2.ebuild b/net-misc/ntpsec/ntpsec-1.2.2.ebuild
index d3231330d972..2fec1857639a 100644
--- a/net-misc/ntpsec/ntpsec-1.2.2.ebuild
+++ b/net-misc/ntpsec/ntpsec-1.2.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 PYTHON_REQ_USE='threads(+)'
 DISTUTILS_USE_SETUPTOOLS=no
 
diff --git a/net-misc/ntpsec/ntpsec-9999.ebuild b/net-misc/ntpsec/ntpsec-9999.ebuild
index d3231330d972..2fec1857639a 100644
--- a/net-misc/ntpsec/ntpsec-9999.ebuild
+++ b/net-misc/ntpsec/ntpsec-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 PYTHON_REQ_USE='threads(+)'
 DISTUTILS_USE_SETUPTOOLS=no
 
diff --git a/net-misc/tigervnc-xorg-module/Manifest b/net-misc/tigervnc-xorg-module/Manifest
index 8a7e75d8b8d3..ee6ffd47a929 100644
--- a/net-misc/tigervnc-xorg-module/Manifest
+++ b/net-misc/tigervnc-xorg-module/Manifest
@@ -1,3 +1,3 @@
 EBUILD tigervnc-xorg-module-1.12.0.ebuild 452 BLAKE2B 97f1a04d5c7610ca254d4aed5270a4996267ff538f2f8205da49a407eefab3ac44c970b34e970918709c10dcd06b1b1abb1459d6dd00a02450470bef51228922 SHA512 1ce2c3fcadba4316bfab72882eed619576ea38a404499c4506e61a0952b2dc786cf9dcdfa4739e283724bc3f9595cd1ecc318de9d52d0824348f645d904892c2
-EBUILD tigervnc-xorg-module-1.12.90.ebuild 457 BLAKE2B d140db31d7fc14436d0577b9d6c5dc76f944cc085e546f6ab241d30292bf90e43715c5c8c0a9257ecb642957d60076384b93495d9a3042e693351364ff29c398 SHA512 89d7c67336ba9aef161d18a5a5210ad67dead62257b2de1f295455120fd15de472e62593fa005954cad38123ab3c91ac1337f77d96379cdbf9c7eb94a4721ddc
+EBUILD tigervnc-xorg-module-1.13.0.ebuild 457 BLAKE2B d140db31d7fc14436d0577b9d6c5dc76f944cc085e546f6ab241d30292bf90e43715c5c8c0a9257ecb642957d60076384b93495d9a3042e693351364ff29c398 SHA512 89d7c67336ba9aef161d18a5a5210ad67dead62257b2de1f295455120fd15de472e62593fa005954cad38123ab3c91ac1337f77d96379cdbf9c7eb94a4721ddc
 MISC metadata.xml 331 BLAKE2B a429af641beadf65a9af48b70d47442530df38a6653daa75a67bae2f86dafe206ee745086336ef10af5e1d11ed6df08c017a99e2f434c0d8015549e78c8825f2 SHA512 dca884d6e2edf72771b5062195aa3d379ded3d0b9c74f9f7bd4c6f5ae432128e93d53c8b24bcfe76963b9705be325668edab703cd2f8724123b1c70fda59c786
diff --git a/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.12.90.ebuild b/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.13.0.ebuild
index aa3265514938..aa3265514938 100644
--- a/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.12.90.ebuild
+++ b/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.13.0.ebuild
diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest
index d2fbee4c1841..7fddcf933564 100644
--- a/net-misc/tigervnc/Manifest
+++ b/net-misc/tigervnc/Manifest
@@ -8,9 +8,9 @@ AUX tigervnc-1.12.80-disable-server-and-pam.patch 1394 BLAKE2B fcda4d2199dce67a1
 AUX tigervnc-1.13.80-depend-po-files.patch 1590 BLAKE2B d1dea3c951cd636124927a1735482b94cfbc41ffc570c7a1dd82ec953fb02f7e593c542a761177d4714903e3b55d69877475b76548cd7e7b61065485e874dc19 SHA512 35d54da0c95f6c42c6a241f49988439dee2b754ac7d1d79c7616032a854d6197acc04c7857d4559c6947f14b2f0703735294146b002a36f49c4acb171511cb75
 DIST tigervnc-1.12.0-xserver-21.patch 3642 BLAKE2B 690860c51d9d2e4606b16318237f86e5a042410dd5778e3d99a01df3fedd7f1993b4fc1eaeb9d193ef9e54d5b25b1d99bfb0bedc8cfb6673983625d9b45c2f92 SHA512 8e9a667557d22e908b1f4e58017f822e98bc608d1e27a09e6b8cfb3b01fe0c5cf9bf484fa634e4109eb7a32234df67fcfdeaca92d4ff982de0e83778c359034d
 DIST tigervnc-1.12.0.tar.gz 1561898 BLAKE2B 891934e48e3c4f2c36c280ad1562874d3c22ca3118e8eda2f68f9ad7cca978c76b8825100f540774b7a6553e981bd9264e0f717c8313585553741d31706cafad SHA512 a16b15e9cda552a49a3934e4174e49d186d06494d90d11582599ab82559014332662aed7760619a6dfb32a8c95f7d63c68ac7d632c29dd662a6b713f036672bb
-DIST tigervnc-1.12.90.tar.gz 1963656 BLAKE2B cef93c05dc0e22f67db02d62de276329102b86119263f7224cde7648d8d705ae8f82ec10c7d895a9ae99477cf437038acc3345903b61a1ac30f5649948f9adde SHA512 c9f650e9985ab073042c15f8f3fafd57d5a56b3109c15ffbcfa6ea2fe6c6e56626aa8677415b9826700374d7fbd376e05004921194408604b8550758bd402025
+DIST tigervnc-1.13.0.tar.gz 1986759 BLAKE2B 675284b854e9ce4c328ed5dcc0d22a57f380a3abe1837451bae09d6c03e91fa9e4b0d06f49ade1ba6924bffdc3cc85c5c9b28c594dbc0d0ffeb0aa23e5299f6d SHA512 55936f075ec64880f4b3e9a803f17761abd4c111392ff0fd5289161cd981acae0b57adf26f768db50162e8d7bfd9666686b8d4ac5fc3389c6f9319df16b90be8
 DIST xorg-server-21.1.1.tar.xz 4958508 BLAKE2B fadac208773700b91003ef18d46e6f2c6b501e59b7491c943f406641e9ff3837a8126034c023e9b6d2d4131ee438c1ef94fa458af1828d4be325519b47069a79 SHA512 8608ed9c1537c95e8a3adea5e3e372a3c5eb841f8e27c84283093f22fb1909e16a800006510da684b13f8f237f33b8a4be3e2537f5f9ab9af4c5ad12770eef0d
 EBUILD tigervnc-1.12.0-r7.ebuild 4722 BLAKE2B a311bc7e557bf9576c34ec1f5da32f414bfd270105f086e5917bcb126fbbd77f29681a42010713628a2b611155f40ddcb48db377130c7c989144fb48598f9b51 SHA512 1182eed80fcd13c01ffc7a267f0dc91858a730ac9f57e3edd94d78db15638ace8ddc98af239292d8384c86e29849681251341f07d5fc90d7ecb1308ae1d7f1dc
-EBUILD tigervnc-1.12.90.ebuild 5288 BLAKE2B 4ce90fc20c2e9f93f30e369f315b65fb5b750c3818bf9cd9cea32276f869d0a303a00087f55dcba5d340bbdb6e99bac4ef563a3958f156970e6638190ae17a9f SHA512 c72a5f56201d1f60f47652e5557bd6317529f41702bcf02b201687905f7e5331240c3b434450031ce338f345d9e8c109c26ca677c02aebbd51e8c5cd8c2f25ac
+EBUILD tigervnc-1.13.0.ebuild 5288 BLAKE2B 4ce90fc20c2e9f93f30e369f315b65fb5b750c3818bf9cd9cea32276f869d0a303a00087f55dcba5d340bbdb6e99bac4ef563a3958f156970e6638190ae17a9f SHA512 c72a5f56201d1f60f47652e5557bd6317529f41702bcf02b201687905f7e5331240c3b434450031ce338f345d9e8c109c26ca677c02aebbd51e8c5cd8c2f25ac
 EBUILD tigervnc-9999.ebuild 5288 BLAKE2B 4ce90fc20c2e9f93f30e369f315b65fb5b750c3818bf9cd9cea32276f869d0a303a00087f55dcba5d340bbdb6e99bac4ef563a3958f156970e6638190ae17a9f SHA512 c72a5f56201d1f60f47652e5557bd6317529f41702bcf02b201687905f7e5331240c3b434450031ce338f345d9e8c109c26ca677c02aebbd51e8c5cd8c2f25ac
 MISC metadata.xml 602 BLAKE2B cd3ae9a2fa5758627621230b5bc005b46c65d028764c5578d7684ae7aaa6403d301a59476e2aae6fa4a7a1f38cd0d8c23a7db3a784666aa2f375267444c48658 SHA512 16c1ccff038df995cbe4bace496636e41f1de9c28ad25c45d49f63485d3b7b71d9682866ff1b005acc7b401d66112c1709048298a77fb1c0baadc879fa236743
diff --git a/net-misc/tigervnc/tigervnc-1.12.90.ebuild b/net-misc/tigervnc/tigervnc-1.13.0.ebuild
index fc6cb7d77a07..fc6cb7d77a07 100644
--- a/net-misc/tigervnc/tigervnc-1.12.90.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.13.0.ebuild
diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index c4ef126c5ff5..c08084ac4fb5 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
diff --git a/net-vpn/networkmanager-l2tp/Manifest b/net-vpn/networkmanager-l2tp/Manifest
index 2c819bb54b8a..8d88bdb1cc8f 100644
--- a/net-vpn/networkmanager-l2tp/Manifest
+++ b/net-vpn/networkmanager-l2tp/Manifest
@@ -1,5 +1,3 @@
 DIST NetworkManager-l2tp-1.20.8.tar.xz 487316 BLAKE2B 97a0b13a56babee47c2fd57b4bb655b79b96206eb3a51dacef642812fdf9059483fb7176f2be6ba86fc286cb6d1efdbada2c3dc8564e89598670781786e76011 SHA512 6ed2ab401821878bf775a27d43e540acce0ea6504a1a4bac436164776ef9e0eacef7963f0362691ef4ad7304e30e2c3199ba4fb41e24918b83aab88b34f7bb6a
-DIST NetworkManager-l2tp-1.8.8.tar.xz 445072 BLAKE2B 9490b756f3f244a5b53a27c3f047efdb6f3e06b01eaf515dacf08dac5c49eba9627c5ef5e368e7240883d3532efeac40e81c0fdd71af251250b05898c547ea23 SHA512 4b906b8fccb7955730a61f03c2bc6dee5a1e0da49897c2b7defeb65aa85cbf5e3353e2182e764544d22b72d5a4d448193b3b150a2c0546c159e8dd5152303a89
 EBUILD networkmanager-l2tp-1.20.8.ebuild 1454 BLAKE2B b77f093d35350492102d28af1c19bf62eabb4784b1eb5d0847c26d00fbb7de48cbe79873b81e93c37f0b0f1c493ff48bf85977c4a6e70b1330da7a6f940a2fc1 SHA512 055fc646525863ed33ce9d0c7a500430cf8a581966ff3b091d406172d35a7df98b0ad8104d0e2fe51a38a4495893164df1e16729c8481716bdaf68ed4abb7a7f
-EBUILD networkmanager-l2tp-1.8.8.ebuild 1262 BLAKE2B 2d1e952b1bacb1eae4917f57b98bc879fb11ae36a6f88a16f6d15065375fd9144ce687c5b5bee037dabb09998aaf7a80491355b4e1b27882b0041a90282689b4 SHA512 c8e572233469ce6a3a6aac13968872df1ba7e0e853af390b350e583636d40ce055ae752fb1b3a29c034ce14acca2a252e173d932a08199f59614d528da0cfd51
 MISC metadata.xml 265 BLAKE2B 39644ede9957536ee9d058b398c84eb25da50a448547726479d94943e32a2d688421bf9eb591864ff027f2f47b28f6bc0443f63c9f6c5ccdd0e76d6caa433015 SHA512 a8820c1f5c2c61b51328871182b50294c52f508140cb306556c11cce5301c5b3ae98cd5ddb4355393fa821db2564c5889a74d41553ae5ace27a6242a9906c3da
diff --git a/net-vpn/networkmanager-l2tp/networkmanager-l2tp-1.8.8.ebuild b/net-vpn/networkmanager-l2tp/networkmanager-l2tp-1.8.8.ebuild
deleted file mode 100644
index 33ab33fba85f..000000000000
--- a/net-vpn/networkmanager-l2tp/networkmanager-l2tp-1.8.8.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PN="NetworkManager-l2tp"
-MY_P="${MY_PN}-${PV}"
-
-inherit gnome.org autotools
-
-DESCRIPTION="NetworkManager L2TP plugin"
-HOMEPAGE="https://github.com/nm-l2tp/network-manager-l2tp"
-SRC_URI="https://github.com/nm-l2tp/${MY_PN}/releases/download/${PV}/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gnome static-libs"
-
-RDEPEND="
-	>=net-misc/networkmanager-1.8[ppp]
-	dev-libs/dbus-glib
-	net-dialup/ppp:=[eap-tls]
-	net-dialup/xl2tpd
-	>=dev-libs/glib-2.32
-	|| (
-		net-vpn/strongswan
-		net-vpn/libreswan
-	)
-	gnome? (
-		x11-libs/gtk+:3
-		app-crypt/libsecret
-		gnome-extra/nm-applet
-	)"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	sys-devel/gettext
-	dev-util/intltool
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	eautoreconf
-	eapply_user
-}
-
-src_configure() {
-	local PPPD_VER=$(best_version net-dialup/ppp)
-	PPPD_VER=${PPPD_VER#*/*-} # reduce it to ${PV}-${PR}
-	PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision
-
-	local myeconfargs=(
-		--localstatedir=/var
-		--with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER}
-		$(use_with gnome)
-		$(use_enable static-libs static)
-	)
-
-	econf "${myeconfargs[@]}"
-}
diff --git a/net-vpn/tor/Manifest b/net-vpn/tor/Manifest
index e387a12660ac..4638639b7a53 100644
--- a/net-vpn/tor/Manifest
+++ b/net-vpn/tor/Manifest
@@ -7,5 +7,5 @@ AUX torrc-r2 136 BLAKE2B 022636974f24bc630657a67fe95805b1d647a5d18cce3dbc6fd42e9
 DIST tor-0.4.7.13.tar.gz 8031948 BLAKE2B 338a0a541423f27f594a091307b5edeafc9826bb651c2bd050f3282c9355d9d43d1ef4791f3c98a37dc4c0f64bc40925ea1c1e32cbdff78b1a7308df501f279a SHA512 0900416887afbb24f7b72e6ef181b7b01308d1bb35c37736f3b13e06810a07febf9f47fadd9ff6c0e73204d93b49545e4e2516906eb3ba74398ad2b299f530be
 DIST tor-0.4.7.13.tar.gz.sha256sum 86 BLAKE2B 339db9869bfe485cbd328fe942cc23e60c08ad67fc2d9e7927ed3c9f3b606192e5efac34013c5bf0b0e8b26e957dcf8b586e1cc0a0c27756b8b3d823af37fdee SHA512 ec1d19fa662255df5dd575ba943f4ccb30d9dfa49ff656cdfa73df2d24248b52a3bfd715f4d3efe11d8129968b0e06e3c75e8d82416e1807020ebf65f65401a0
 DIST tor-0.4.7.13.tar.gz.sha256sum.asc 716 BLAKE2B 968a3852293ab9bcadac626862c9dc360b17de5afd00af7c46358fa2adfc03b55c02dfe029e9427efba999f553489a04388b395e8fb8fe16325e0895663c2deb SHA512 eb78e8369941d8de833e3616a9a1c1e59b0d3dde918353e2f4fa5eb5da09f038238c46f5e180844bd3cba1211a9daa6d60e9ddb5690998e27a6b7d1616aa20cc
-EBUILD tor-0.4.7.13.ebuild 3182 BLAKE2B 8eb79b7b7e93f2de8abf11dc9183af08d4ec3c3e4adb62822164cc3e60cd3c6cf9b3e3aa631af56dd28f213d5e9d13235961260e460d20174cbc839baf46c242 SHA512 7c3a35a5cc34c03c1221272088e82d1004f4917a19de4fcbf1169a07c53dd58f21f0b2eadd44fdf6b1757d3f8f11fd5de6635780e7af085e8fa2fd6821a7cfd0
+EBUILD tor-0.4.7.13.ebuild 3285 BLAKE2B 314c03e9e04f1bed521a1a3e845f06608881e3ef59d9c99bab6c9a3ed4d061749e9f26232b74b83d0d2ed1779b83589fb2890eba675802bc8bb816bacc29eb11 SHA512 aac4ef8a388f2531c48c2f8b6bd43600c1c70c4b965ffad98aca96f98d6c62732afae18d31f4c03af770451fb64c7a38ff1cc00efaf98b90fd729f314b5a56d7
 MISC metadata.xml 645 BLAKE2B a7f450c6cfb9a605f7021cbe533ec64ff0926c9877bef7aace8ce1770a8ec552255b5c54ac80035646c3515d7d0b778100573897068d0905a56f7b860c8de21b SHA512 e5724033912b73ab8abe1b47e74578c8fe4bf6e341b8e7d7434d69071508cd1f35d97f4c7ade9787ae0ded6660cf0a5477d3c7462ed13832693bfd6205f0f0f1
diff --git a/net-vpn/tor/tor-0.4.7.13.ebuild b/net-vpn/tor/tor-0.4.7.13.ebuild
index 5f40c3f7c6e0..7ac5744f3d9f 100644
--- a/net-vpn/tor/tor-0.4.7.13.ebuild
+++ b/net-vpn/tor/tor-0.4.7.13.ebuild
@@ -1,21 +1,24 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="8"
+EAPI=8
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/torproject.org.asc
 inherit python-any-r1 readme.gentoo-r1 systemd verify-sig
 
 MY_PV="$(ver_rs 4 -)"
 MY_PF="${PN}-${MY_PV}"
 DESCRIPTION="Anonymizing overlay network for TCP"
-HOMEPAGE="https://www.torproject.org/"
-SRC_URI="https://www.torproject.org/dist/${MY_PF}.tar.gz
+HOMEPAGE="https://www.torproject.org/ https://gitlab.torproject.org/tpo/core/tor/"
+SRC_URI="
+	https://www.torproject.org/dist/${MY_PF}.tar.gz
 	https://archive.torproject.org/tor-package-archive/${MY_PF}.tar.gz
 	verify-sig? (
 		https://dist.torproject.org/${MY_PF}.tar.gz.sha256sum
 		https://dist.torproject.org/${MY_PF}.tar.gz.sha256sum.asc
-	)"
+	)
+"
 S="${WORKDIR}/${MY_PF}"
 
 LICENSE="BSD GPL-2"
@@ -26,32 +29,31 @@ fi
 IUSE="caps doc lzma +man scrypt seccomp selinux +server systemd tor-hardening test zstd"
 RESTRICT="!test? ( test )"
 
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/torproject.org.asc
-
-BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-tor-20221213 )"
 DEPEND="
 	dev-libs/libevent:=[ssl]
 	sys-libs/zlib
 	caps? ( sys-libs/libcap )
 	man? ( app-text/asciidoc )
-	dev-libs/openssl:0=[-bindist(-)]
+	dev-libs/openssl:=[-bindist(-)]
 	lzma? ( app-arch/xz-utils )
 	scrypt? ( app-crypt/libscrypt )
 	seccomp? ( >=sys-libs/libseccomp-2.4.1 )
 	systemd? ( sys-apps/systemd )
-	zstd? ( app-arch/zstd )"
+	zstd? ( app-arch/zstd )
+"
 RDEPEND="
 	acct-user/tor
 	acct-group/tor
 	${DEPEND}
-	selinux? ( sec-policy/selinux-tor )"
-
-# bug #764260
+	selinux? ( sec-policy/selinux-tor )
+"
 DEPEND+="
 	test? (
 		${DEPEND}
 		${PYTHON_DEPS}
-	)"
+	)
+"
+BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-tor-20221213 )"
 
 DOCS=()
 
@@ -59,10 +61,6 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-0.2.7.4-torrc.sample.patch
 )
 
-# EAPI 8 tries to append it but it doesn't exist here
-# bug #831311 etc
-QA_CONFIGURE_OPTIONS="--disable-static"
-
 pkg_setup() {
 	use test && python-any-r1_pkg_setup
 }
@@ -79,33 +77,46 @@ src_unpack() {
 	default
 }
 
+src_prepare() {
+	default
+
+	# Running shellcheck automagically isn't useful for ebuild testing.
+	echo "exit 0" > scripts/maint/checkShellScripts.sh || die
+}
+
 src_configure() {
 	use doc && DOCS+=( README.md ChangeLog ReleaseNotes doc/HACKING )
+
 	export ac_cv_lib_cap_cap_init=$(usex caps)
-	econf \
-		--localstatedir="${EPREFIX}/var" \
-		--disable-all-bugs-are-fatal \
-		--enable-system-torrc \
-		--disable-android \
-		--disable-html-manual \
-		--disable-libfuzzer \
-		--enable-missing-doc-warnings \
-		--disable-module-dirauth \
-		--enable-pic \
-		--disable-restart-debugging \
-		--disable-zstd-advanced-apis  \
-		$(use_enable man asciidoc) \
-		$(use_enable man manpage) \
-		$(use_enable lzma) \
-		$(use_enable scrypt libscrypt) \
-		$(use_enable seccomp) \
-		$(use_enable server module-relay) \
-		$(use_enable systemd) \
-		$(use_enable tor-hardening gcc-hardening) \
-		$(use_enable tor-hardening linker-hardening) \
-		$(use_enable test unittests) \
-		$(use_enable test coverage) \
+	export tor_cv_PYTHON="${EPYTHON}"
+
+	local myeconfargs=(
+		--localstatedir="${EPREFIX}/var"
+		--disable-all-bugs-are-fatal
+		--enable-system-torrc
+		--disable-android
+		--disable-coverage
+		--disable-html-manual
+		--disable-libfuzzer
+		--enable-missing-doc-warnings
+		--disable-module-dirauth
+		--enable-pic
+		--disable-restart-debugging
+		--disable-zstd-advanced-apis
+		$(use_enable man asciidoc)
+		$(use_enable man manpage)
+		$(use_enable lzma)
+		$(use_enable scrypt libscrypt)
+		$(use_enable seccomp)
+		$(use_enable server module-relay)
+		$(use_enable systemd)
+		$(use_enable tor-hardening gcc-hardening)
+		$(use_enable tor-hardening linker-hardening)
+		$(use_enable test unittests)
 		$(use_enable zstd)
+	)
+
+	econf "${myeconfargs[@]}"
 }
 
 src_install() {
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index f6f1a611d25f..e7a3972784b9 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/package.mask b/profiles/package.mask
index 089fd18a76be..533a419c5daf 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,6 +33,12 @@
 
 #--- END OF EXAMPLES ---
 
+# Marek Szuba <marecki@gentoo.org> (2023-02-03)
+# New major version with breaking changes, mask until 2023-03-03
+# for revdep testing and porting. Bug #893006.
+>=dev-cpp/msgpack-cxx-5.0.0
+>=dev-libs/msgpack-5.0.0
+
 # Michał Górny <mgorny@gentoo.org> (2023-02-02)
 # dev-python/citeproc-py requires dev-python/nose and is not maintained
 # upstream.  Its only revdep, dev-python/duecredit has no reverse
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index f646415396a9..e1f2af4a1598 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -1299,6 +1299,7 @@ dev-cpp/libjson-rpc-cpp:http-server - Build support for HTTP server using net-li
 dev-cpp/libjson-rpc-cpp:redis-client - Build support for Redis client using dev-libs/hiredis
 dev-cpp/libjson-rpc-cpp:redis-server - Build support for Redis server using dev-libs/hiredis
 dev-cpp/libjson-rpc-cpp:stubgen - Build header stub code generator (needed for development and when pregenerated headers are not bundled)
+dev-cpp/msgpack-cxx:boost - Enable boost support
 dev-cpp/opentelemetry-cpp:jaeger - Include the jaeger exporter
 dev-cpp/opentelemetry-cpp:prometheus - include the Prometheus Client in the SDK
 dev-cpp/sdbus-c++:systemd - Use external libsystemd instead of statically-linked build
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 9fd160349e59..cc6cad85386a 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/coreutils/Manifest b/sys-apps/coreutils/Manifest
index 51c524c88ed1..6e075c5ebba9 100644
--- a/sys-apps/coreutils/Manifest
+++ b/sys-apps/coreutils/Manifest
@@ -7,6 +7,5 @@ DIST coreutils-9.0_p20220409-patches-01.tar.xz 6244 BLAKE2B 8ca98556807196607829
 DIST coreutils-9.1.tar.xz 5712104 BLAKE2B f5654e4935535275615d44a56c071d1c0746af36cf4615fcc0a5a0d387af9c9023adac31f31a52e16b3d1105b9d4c0fb7ebff9b2862498849f867a866049dd6e SHA512 a6ee2c549140b189e8c1b35e119d4289ec27244ec0ed9da0ac55202f365a7e33778b1dc7c4e64d1669599ff81a8297fe4f5adbcc8a3a2f75c919a43cd4b9bdfa
 DIST coreutils-9.1.tar.xz.sig 833 BLAKE2B e9627a066f3c67596feaa8d43d5785076230f440bacea84d8b5736e51a22787c2d5df1f3e2cd8523d01fb7b468933d3c17fce3cb1fbefef322a0e0d820b81842 SHA512 9f0766531afd4faa3e2c337730f61db55605cf06729e9c61f644594883732c2e0b1ddb0005b492be309c53e6f45b8ff875398163a48699d52517ea49e9bdbc91
 EBUILD coreutils-8.32-r1.ebuild 5968 BLAKE2B ae5871d55509dbcd48c3f8b33938edfffca3a48bc2b422546b1bd818e7830b877af08f51605ba0d68299ea63d1f6d8246301223cfa5a29620619cd209cbaa1f5 SHA512 363adf232d9b3d158ec7535e84263286961e3e870ecdee3215162e398125999ccf2d1b76d065a7223d58d04ccd75fd65ab33cf409e155fb2788ca0defdc5094a
-EBUILD coreutils-9.1-r1.ebuild 7037 BLAKE2B bd5c120fbe45fe0188f360b921edb90325e82256ed9d8aa3a1a78413463b28b33aedc9c7884340f7aedb5913a2fe0df0047907b5d3e51e3dbcc4d0a89cda14ee SHA512 814db3ec07a8e2ad2223b9ae1f5b348c1fe594560a8d9fcae619d23f4618a9eb75084637ed6c468f608d0fa52b57f5f25aa4cc841b9a5012a82abcaec0cada94
-EBUILD coreutils-9.1-r2.ebuild 7114 BLAKE2B a5e490dad5cfd12f48a7771b79c29324d08c69870014842e24fb9051739caf2a38baeb077143eb88cc9b7bbad2202cf9a25bc5fa3da614d6a3d6b331228162b9 SHA512 73492aff75aae2778d2802ec7f9990e1cf5a18f06dfe69ac08385fcce73a353bcd5f93a75803f7fe6316d1861101e0a98fd73fe2f8fedc18c23937137f9d47ca
+EBUILD coreutils-9.1-r2.ebuild 7114 BLAKE2B 3a80919e840546badf681b0672fcad68e2ac0d9a29586e7a8fd712a11484057364ae015c21b92bfef404f6a9c094d828852d915754bae61ace060c0c6853290e SHA512 77c948b54e48907df14a9ac67b5ed1a36cb11acf709fdf009674b90e878c1efc6b4c449d7f4efcc39110f04692c8c274acc3fa32e242f196b0d8bddb27b963a7
 MISC metadata.xml 1043 BLAKE2B db071746d60a62e435bfd6e297641411320b61a5716dc631150e5a3a19bcd49cc6121d2a404b8875d6927ad0114f28d33e2b21edb3bab49559d50fdc26b056f6 SHA512 65149d4bf9b16f7e1800fe8d9e23fa466307ff3f009e06f3736b4f55bce27ba74bc6d1547e0b2f06dcebfcba0f2d21ef3efdd4073ed4e525a2ebdc6e62190119
diff --git a/sys-apps/coreutils/coreutils-9.1-r1.ebuild b/sys-apps/coreutils/coreutils-9.1-r1.ebuild
deleted file mode 100644
index ca8f614de9a4..000000000000
--- a/sys-apps/coreutils/coreutils-9.1-r1.ebuild
+++ /dev/null
@@ -1,249 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Try to keep an eye on Fedora's packaging: https://src.fedoraproject.org/rpms/coreutils
-# The upstream coreutils maintianers also maintain the package in Fedora and may
-# backport fixes which we want to pick up.
-
-PYTHON_COMPAT=( python3_{9..10} )
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/coreutils.asc
-inherit flag-o-matic python-any-r1 toolchain-funcs verify-sig
-
-MY_PATCH="${PN}-9.0_p20220409-patches-01"
-DESCRIPTION="Standard GNU utilities (chmod, cp, dd, ls, sort, tr, head, wc, who,...)"
-HOMEPAGE="https://www.gnu.org/software/coreutils/"
-
-if [[ ${PV} == *_p* ]] ; then
-	# Note: could put this in devspace, but if it's gone, we don't want
-	# it in tree anyway. It's just for testing.
-	MY_SNAPSHOT="$(ver_cut 1-2).193-54bec"
-	SRC_URI="https://www.pixelbeat.org/cu/coreutils-${MY_SNAPSHOT}.tar.xz -> ${P}.tar.xz"
-	SRC_URI+=" verify-sig? ( https://www.pixelbeat.org/cu/coreutils-${MY_SNAPSHOT}.tar.xz.sig -> ${P}.tar.xz.sig )"
-	S="${WORKDIR}"/${PN}-${MY_SNAPSHOT}
-else
-	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
-		verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )"
-
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux"
-fi
-
-SRC_URI+=" !vanilla? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${MY_PATCH}.tar.xz )"
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="acl caps gmp hostname kill multicall nls selinux +split-usr static test vanilla xattr"
-RESTRICT="!test? ( test )"
-
-LIB_DEPEND="acl? ( sys-apps/acl[static-libs] )
-	caps? ( sys-libs/libcap )
-	gmp? ( dev-libs/gmp:=[static-libs] )
-	xattr? ( sys-apps/attr[static-libs] )"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs]} )
-	selinux? ( sys-libs/libselinux )
-	nls? ( virtual/libintl )"
-DEPEND="
-	${RDEPEND}
-	static? ( ${LIB_DEPEND} )
-"
-BDEPEND="
-	app-arch/xz-utils
-	dev-lang/perl
-	test? (
-		dev-lang/perl
-		dev-perl/Expect
-		dev-util/strace
-		${PYTHON_DEPS}
-	)
-	verify-sig? ( sec-keys/openpgp-keys-coreutils )
-"
-RDEPEND+="
-	hostname? ( !sys-apps/net-tools[hostname] )
-	kill? (
-		!sys-apps/util-linux[kill]
-		!sys-process/procps[kill]
-	)
-	!app-misc/realpath
-	!<sys-apps/util-linux-2.13
-	!<sys-apps/sandbox-2.10-r4
-	!sys-apps/stat
-	!net-mail/base64
-	!sys-apps/mktemp
-	!<app-forensics/tct-1.18-r1
-	!<net-fs/netatalk-2.0.3-r4"
-
-pkg_setup() {
-	if use test ; then
-		python-any-r1_pkg_setup
-	fi
-}
-
-src_unpack() {
-	if use verify-sig ; then
-		# Needed for downloaded patch (which is unsigned, which is fine)
-		verify-sig_verify_detached "${DISTDIR}"/${P}.tar.xz{,.sig}
-	fi
-
-	default
-}
-
-src_prepare() {
-	local PATCHES=(
-		# Upstream patches
-		"${FILESDIR}"/${P}-fix-rename-simple-backups.patch
-	)
-
-	if ! use vanilla ; then
-		PATCHES+=( "${WORKDIR}"/patch )
-	fi
-
-	default
-
-	# Since we've patched many .c files, the make process will try to
-	# re-build the manpages by running `./bin --help`.  When doing a
-	# cross-compile, we can't do that since 'bin' isn't a native bin.
-	#
-	# Also, it's not like we changed the usage on any of these things,
-	# so let's just update the timestamps and skip the help2man step.
-	set -- man/*.x
-	touch ${@/%x/1} || die
-
-	# Avoid perl dep for compiled in dircolors default (bug #348642)
-	if ! has_version dev-lang/perl ; then
-		touch src/dircolors.h || die
-		touch ${@/%x/1} || die
-	fi
-}
-
-src_configure() {
-	local myconf=(
-		--with-packager="Gentoo"
-		--with-packager-version="${PVR} (p${PATCH_VER:-0})"
-		--with-packager-bug-reports="https://bugs.gentoo.org/"
-		# kill/uptime - procps
-		# groups/su   - shadow
-		# hostname    - net-tools
-		--enable-install-program="arch,$(usev hostname),$(usev kill)"
-		--enable-no-install-program="groups,$(usev !hostname),$(usev !kill),su,uptime"
-		--enable-largefile
-		$(usex caps '' --disable-libcap)
-		$(use_enable nls)
-		$(use_enable acl)
-		$(use_enable multicall single-binary)
-		$(use_enable xattr)
-		$(use_with gmp libgmp)
-	)
-
-	if use gmp ; then
-		myconf+=( --with-libgmp-prefix="${ESYSROOT}"/usr )
-	fi
-
-	if tc-is-cross-compiler && [[ ${CHOST} == *linux* ]] ; then
-		# bug #311569
-		export fu_cv_sys_stat_statfs2_bsize=yes
-		# bug #416629
-		export gl_cv_func_realpath_works=yes
-	fi
-
-	# bug #409919
-	export gl_cv_func_mknod_works=yes
-
-	if use static ; then
-		append-ldflags -static
-		# bug #321821
-		sed -i '/elf_sys=yes/s:yes:no:' configure || die
-	fi
-
-	if ! use selinux ; then
-		# bug #301782
-		export ac_cv_{header_selinux_{context,flash,selinux}_h,search_setfilecon}=no
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_test() {
-	# Known to fail with FEATURES=usersandbox (bug #439574):
-	#   -  tests/du/long-from-unreadable.sh} (bug #413621)
-	#   -  tests/rm/deep-2.sh (bug #413621)
-	#   -  tests/dd/no-allocate.sh (bug #629660)
-	if has usersandbox ${FEATURES} ; then
-		ewarn "You are emerging ${P} with 'usersandbox' enabled." \
-			"Expect some test failures or emerge with 'FEATURES=-usersandbox'!"
-	fi
-
-	# Non-root tests will fail if the full path isn't
-	# accessible to non-root users
-	chmod -R go-w "${WORKDIR}" || die
-	chmod a+rx "${WORKDIR}" || die
-
-	# coreutils tests like to do `mount` and such with temp dirs,
-	# so make sure:
-	# - /etc/mtab is writable (bug #265725)
-	# - /dev/loop* can be mounted (bug #269758)
-	mkdir -p "${T}"/mount-wrappers || die
-	mkwrap() {
-		local w ww
-		for w in "${@}" ; do
-			ww="${T}/mount-wrappers/${w}"
-			cat <<-EOF > "${ww}"
-				#!${EPREFIX}/bin/sh
-				exec env SANDBOX_WRITE="\${SANDBOX_WRITE}:/etc/mtab:/dev/loop" $(type -P ${w}) "\$@"
-			EOF
-			chmod a+rx "${ww}" || die
-		done
-	}
-	mkwrap mount umount
-
-	addwrite /dev/full
-	#export RUN_EXPENSIVE_TESTS="yes"
-	#export FETISH_GROUPS="portage wheel"
-	env PATH="${T}/mount-wrappers:${PATH}" emake -k check VERBOSE=yes
-}
-
-src_install() {
-	default
-
-	insinto /etc
-	newins src/dircolors.hin DIR_COLORS
-
-	if use split-usr ; then
-		cd "${ED}"/usr/bin || die
-		dodir /bin
-
-		# Move critical binaries into /bin (required by FHS)
-		local fhs="cat chgrp chmod chown cp date dd df echo false ln ls
-		           mkdir mknod mv pwd rm rmdir stty sync true uname"
-		mv ${fhs} ../../bin/ || die "Could not move FHS bins!"
-
-		if use hostname ; then
-			mv hostname ../../bin/ || die
-		fi
-
-		if use kill ; then
-			mv kill ../../bin/ || die
-		fi
-
-		# Move critical binaries into /bin (common scripts)
-		# (Why are these required for booting?)
-		local com="basename chroot cut dir dirname du env expr head mkfifo
-		           mktemp readlink seq sleep sort tail touch tr tty vdir wc yes"
-		mv ${com} ../../bin/ || die "Could not move common bins!"
-
-		# Create a symlink for uname in /usr/bin/ since autotools require it.
-		# (Other than uname, we need to figure out why we are
-		# creating symlinks for these in /usr/bin instead of leaving
-		# the files there in the first place...)
-		local x
-		for x in ${com} uname ; do
-			dosym ../../bin/${x} /usr/bin/${x}
-		done
-	fi
-}
-
-pkg_postinst() {
-	ewarn "Make sure you run 'hash -r' in your active shells."
-	ewarn "You should also re-source your shell settings for LS_COLORS"
-	ewarn "  changes, such as: source /etc/profile"
-}
diff --git a/sys-apps/coreutils/coreutils-9.1-r2.ebuild b/sys-apps/coreutils/coreutils-9.1-r2.ebuild
index d5eb937ea948..08dc284676e9 100644
--- a/sys-apps/coreutils/coreutils-9.1-r2.ebuild
+++ b/sys-apps/coreutils/coreutils-9.1-r2.ebuild
@@ -7,7 +7,7 @@ EAPI=7
 # The upstream coreutils maintianers also maintain the package in Fedora and may
 # backport fixes which we want to pick up.
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/coreutils.asc
 inherit flag-o-matic python-any-r1 toolchain-funcs verify-sig
 
diff --git a/sys-apps/memtest86+/Manifest b/sys-apps/memtest86+/Manifest
index d6abd38e3214..880dd52f31e0 100644
--- a/sys-apps/memtest86+/Manifest
+++ b/sys-apps/memtest86+/Manifest
@@ -14,5 +14,5 @@ DIST memtest86+-6.00.tar.gz 224187 BLAKE2B bba26dab7165239fe95dc7f174e5f876f4742
 DIST memtest86+-6.01.tar.gz 224548 BLAKE2B 429df2d71cb0d84bec9aa3a25023f2a9db2e8c01b32b0af1f42b689a4a7da192d5ddb77a5cb126a162aba0c1e704a2da8f5dee88caae0d9f78545e9e9c14eee9 SHA512 a80256e2cfdad927d55a2f67d65255f90e911e8bfb59d9da841482ddeca7f3cf767b029c299aca8076c9bd2b9ee71671bb768b551a7ea041009bb89ebec927dc
 EBUILD memtest86+-5.31b-r3.ebuild 2858 BLAKE2B 47a6e5a68e77f6425b7761d5cc18378a13bc6f6b3febb2624277fa3bf24374e69265ab0c97a3854abbfa5acd96f984b2d1392acb29fb3cda37357370d57067c8 SHA512 8c8846addd0db5093b384c36a74eea8e853e66b174c7f9930d9a61abc71c41cdaf5e1967b01eaad77af68a4f81b7687517e0b23e26f26cd11ae104da0c49e881
 EBUILD memtest86+-6.00.ebuild 1728 BLAKE2B c3e4c03d7edef1be8df82ff06e228209eae03b4cc91360099ec6738118842c0cc682088e889f1f585acbe4d30a24141d5f968bc30f9ed86daebafabdcd9d07da SHA512 2feb77c3bc8d2013d9599deb38ba1e950a1b9e6b45610c1e659a60fd228ca1f17fde4b38dd5c6f04739118731d65662d2fb0bc5aeb21468e5553cf3da380f411
-EBUILD memtest86+-6.01.ebuild 1730 BLAKE2B f3f7efb95a02123ce0af742f0a8f6a214e2e8d80d2338cdf4d59e16923fe5982ca41e13b3108d35d8bc559862655d8bf58501582813802d35c8899b715119a70 SHA512 f34ff95cba1c9ecc773511d7fb8480a1d9e4f368b49b22c5904fb90f5c095a6bd9369ea766fc72e851cb4d57761680f943d991f5793e9170278b23d0660c04d2
+EBUILD memtest86+-6.01.ebuild 1733 BLAKE2B 0cc7eef2f79cb4923a9853c8d80e0f253dd34b8fc5850a246de754420a3053ab0b6c00e85c0b95563dc09aacaeb625f31c4bc918747171874d89e20633299ddf SHA512 1240ecf9052cc01b39003adafb2e97d84227c959b62556be0455b8cd4ad38584154f486a1d56c7799295091f1a67ba858134c73dbe28cf3a14c5acb4a87d60a7
 MISC metadata.xml 1033 BLAKE2B 1de0b3113db89962f9566a73eb6aae90d5faf62502910020292a72baaf2a068f03866db231e9b927ea484b20606b726c417f8a8882ba0eae0e82352f8b76a1ed SHA512 6f45ad3578993ffb1e6ec76075b2d3047a9a69f8893e30dbe6a7fe6345d25b3a448495a3374c369c948e1d01d7fbde1e667507d8aeb5273513a0898d1715942e
diff --git a/sys-apps/memtest86+/memtest86+-6.01.ebuild b/sys-apps/memtest86+/memtest86+-6.01.ebuild
index eb5778e25fdf..9eeab59f5362 100644
--- a/sys-apps/memtest86+/memtest86+-6.01.ebuild
+++ b/sys-apps/memtest86+/memtest86+-6.01.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/memtest86plus/memtest86plus/archive/refs/tags/v${MY_
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="bios32 bios64 +boot efi32 efi64 iso32 iso64"
 
 ISODEPS="
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index e144494e4406..379caafee443 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/crossdev/Manifest b/sys-devel/crossdev/Manifest
index 3158586a1fa2..7f6dd41feb10 100644
--- a/sys-devel/crossdev/Manifest
+++ b/sys-devel/crossdev/Manifest
@@ -1,6 +1,6 @@
 DIST crossdev-20220909.tar.xz 29480 BLAKE2B 9c3ef9d9b8f13c81f9d2e21f8914158c04035a105ee1ac90ba30cb23a69744c9c6959bbcfd2e50d29144fc79937e5e585054d2eedfb2ced65a88467e509243be SHA512 86e8900a13095b7b12b00d739d28e2921f98818cd62daccfe6d750ce02113d0ef2d5e470b500bbfb80a9cf8f05b2a13882ac9963c3f1a4e1b7454bc1201df183
 DIST crossdev-20221228.tar.xz 29568 BLAKE2B 0458a338a872a27058240c816abfcf9116703d18b687da0050213f834d5aba5df87552e16999fca7d0340aab5b8738ee0edb6ccfb656579b99f20357c077e326 SHA512 16d9d72f74c3b0d6c587c16eb8bea405c7c8eb3effc59fac55027d02348db2e10aacd9098b6f42479574a014783022737325acfaf63031e430fdf90391fa574b
-EBUILD crossdev-20220909.ebuild 883 BLAKE2B eac24bd668c81ef156ed0f51ed782249785a44c5fc4ab7f8960e13b7b4fba68c2d511be86a3c6ba661fbc8f067bc2d0ed684c4e5ba1531706d15c5fb1dc56492 SHA512 9e673283dfa83e0b8a988d2ed71c95bdd6102de15a27c3d3d1d6247a2ddb867f03ad64ad559c1056983b9fdd004853048ddc3453f899e7c3cd93b4b92e176937
-EBUILD crossdev-20221228.ebuild 857 BLAKE2B 2be1472a076f1731cf4ba22c0730795c740892b17360f68ac53970c15d5f4ae0eb129f80f8a263f4a73c61546ad8edc4de9d316eb3fa2e397d37420511371cf1 SHA512 8974a9315193fe03ab3cea7aa7689eadb44ef02c2f694fe54463164dd69f88f6ea4127e1e03714783601af9e9e722102873bd15c4e57f7b8dbd5ae34f9754bab
-EBUILD crossdev-99999999.ebuild 857 BLAKE2B 2be1472a076f1731cf4ba22c0730795c740892b17360f68ac53970c15d5f4ae0eb129f80f8a263f4a73c61546ad8edc4de9d316eb3fa2e397d37420511371cf1 SHA512 8974a9315193fe03ab3cea7aa7689eadb44ef02c2f694fe54463164dd69f88f6ea4127e1e03714783601af9e9e722102873bd15c4e57f7b8dbd5ae34f9754bab
+EBUILD crossdev-20220909.ebuild 925 BLAKE2B 9fd556e40bc031bd0e4672a81ed29002cfddbba6888f75b75bc27ffe8672e356f74541c738b74e315f256e9b8edc9edd802595d59c51cea08767965f28cc2b6e SHA512 4974dc54b27b6105d4ecb4a3139fcaba4d711ffd7cdfc9c0116edcecf4c3031866200a1ab99e91604577be9330f637e0381a5df31e88777f2696a577427ef57e
+EBUILD crossdev-20221228.ebuild 899 BLAKE2B 754071ae103f26015c2c48fa7c3d9d6e82cb11a523501ca0d9b19922a0ebb79a1e5df468f246d574b46d391ab2c1008dd74b25b15319b0ce3cb0e619e74e86ad SHA512 1d1f6fc4366c5aa324d8ace481cea7d915de483f427688aa91d4bd0a2e3ec63601124a6b691ee97589f04fd1fb1f337677d9df523d9824cb615827b676f2a825
+EBUILD crossdev-99999999.ebuild 899 BLAKE2B 754071ae103f26015c2c48fa7c3d9d6e82cb11a523501ca0d9b19922a0ebb79a1e5df468f246d574b46d391ab2c1008dd74b25b15319b0ce3cb0e619e74e86ad SHA512 1d1f6fc4366c5aa324d8ace481cea7d915de483f427688aa91d4bd0a2e3ec63601124a6b691ee97589f04fd1fb1f337677d9df523d9824cb615827b676f2a825
 MISC metadata.xml 624 BLAKE2B 3f6609db4ad549927d9e7c0f259926de694435707aba7fabd2d08333294bc38bad42b59b7ab9f6372bec292708ebfdb88d88ee0e8dca1ed29389e33427a1d46e SHA512 4605364fe155bb8facae233aa29fadae23fe3d1f012451f8611933252f81aa3d3337ac9d68feabe059c959e2a94a67a85e6d88f7fa08d6d31e2418034b60010a
diff --git a/sys-devel/crossdev/crossdev-20220909.ebuild b/sys-devel/crossdev/crossdev-20220909.ebuild
index 62e271684dde..dcd2b7989768 100644
--- a/sys-devel/crossdev/crossdev-20220909.ebuild
+++ b/sys-devel/crossdev/crossdev-20220909.ebuild
@@ -1,11 +1,14 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
 
 if [[ ${PV} == "99999999" ]] ; then
 	inherit git-r3
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/crossdev.git"
+	EGIT_REPO_URI="
+		https://anongit.gentoo.org/git/proj/crossdev.git
+		https://github.com/gentoo/crossdev
+	"
 else
 	SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz
 		https://dev.gentoo.org/~vapier/dist/${P}.tar.xz"
diff --git a/sys-devel/crossdev/crossdev-20221228.ebuild b/sys-devel/crossdev/crossdev-20221228.ebuild
index a3a84da996ad..4cb66350d4ce 100644
--- a/sys-devel/crossdev/crossdev-20221228.ebuild
+++ b/sys-devel/crossdev/crossdev-20221228.ebuild
@@ -1,11 +1,14 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
 
 if [[ ${PV} == "99999999" ]] ; then
 	inherit git-r3
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/crossdev.git"
+	EGIT_REPO_URI="
+		https://anongit.gentoo.org/git/proj/crossdev.git
+		https://github.com/gentoo/crossdev
+	"
 else
 	SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz
 		https://dev.gentoo.org/~vapier/dist/${P}.tar.xz"
diff --git a/sys-devel/crossdev/crossdev-99999999.ebuild b/sys-devel/crossdev/crossdev-99999999.ebuild
index a3a84da996ad..4cb66350d4ce 100644
--- a/sys-devel/crossdev/crossdev-99999999.ebuild
+++ b/sys-devel/crossdev/crossdev-99999999.ebuild
@@ -1,11 +1,14 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
 
 if [[ ${PV} == "99999999" ]] ; then
 	inherit git-r3
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/crossdev.git"
+	EGIT_REPO_URI="
+		https://anongit.gentoo.org/git/proj/crossdev.git
+		https://github.com/gentoo/crossdev
+	"
 else
 	SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz
 		https://dev.gentoo.org/~vapier/dist/${P}.tar.xz"
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 46bc0181029e..7515e365de31 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
index 8750951a0bed..39382c14e6f7 100644
--- a/sys-fs/e2fsprogs/Manifest
+++ b/sys-fs/e2fsprogs/Manifest
@@ -2,6 +2,8 @@ AUX e2fsck.conf 138 BLAKE2B b97a754b6aebf1f7fcd4001b720eead61d183eaf5a2c9eb86e83
 AUX e2fsprogs-1.42.13-fix-build-cflags.patch 290 BLAKE2B b37f9fd204bd35631776d68dda5cc9defb5e2bc54e0061778e5bea4886820829605cb092bb40a7f65cd0626d8ffe689bd1c8aad7d29f7c67e5166dd578925ddb SHA512 fed2a8502fafb56a21c88d680a42848bdc8921b228f74842ce3f702279917b6e6c0d1204ee060ea0d2d5ebb02465fc1f3d1a4304068a59b45bf1ddfbdfd46507
 AUX e2fsprogs-1.46.5-parallel-make.patch 1646 BLAKE2B f3e0158afa723e436a5b4004a6e331c4ad2405f9d4e25ab4a11baaa7ac88d120362d004a69067850ae1ebdc437eef586e381101f9e96736a4e707cf2d18fe6f6 SHA512 c5cb7d01293465621e90e0807b6dad32b2f0105686d91bb886935967eb184463036d34dfc716da1a92c75bfe99300d07a84a7770499b6f38ecee15fbc0f9905b
 DIST e2fsprogs-1.46.5.tar.xz 7040672 BLAKE2B 8d8c02e891c464782a7cff518c41d793fc73366b57e17d80ffc5afd96e6144e354290e667e9710509a9dde4e5dab7e7185c5bf084c5bfd26219f05e5e92e0830 SHA512 53282e1c524f62a95012b1aceef296d494f5238c82c9b08b29fbe6a803dbf7ccfdcd9124eb2f11fe2ff9de26387c78751a92c3217ca414f6db6242098a72d3fa
+DIST e2fsprogs-1.46.6.tar.xz 7051160 BLAKE2B 683274bf9468a3aaf41e542f22266482e75522b1fd2a255c6d852a28b08f027918d4f09239259d443a243c41eae49b3c27454f7d140da2c361c36a71ff77dcf6 SHA512 aca5ef77e36885ce9ce2995d9fae5d278c33e276e74f2a73977380f3e1cf1b3bd115fe6199e44a2f79a2827ba985b5554b8d898e88b7d04387fbba659a08e771
 EBUILD e2fsprogs-1.46.5-r3.ebuild 4401 BLAKE2B 925f540d8b21482abea0b9db6e4c9c0697df29a33b7cabe85159b8cd4354d7453be25b8056957e65ab9bda1f576cd786ff969843f4e23a3611f0101591507f08 SHA512 9f34a974b65c59722afac7328307b32e6bb8aea0cf605c4b0b8c1a78993e7e158211ed0f35d1cfa0b9f71937315243d935e6a930b12a5798e3876cd96023e0bf
-EBUILD e2fsprogs-1.46.5-r4.ebuild 4379 BLAKE2B 6df626c5ed351a7c3c470b51191ce95479511bc99111f2752434d0d894b6d38eda6370bff0bf84adf62b520e72c466eff22bcfaf0803fd2aa83570755541f4bd SHA512 20a525e39ccf04dc1523520391fa3cc567f1d333b8498e754c550a95486549d09cd35f562e0618c4236a6b5c12ede91244585475dfa308279b47cab4864caf2a
+EBUILD e2fsprogs-1.46.5-r4.ebuild 4374 BLAKE2B 35907585133e794a949816ec76e61550fffe00a1164e21cfa38e18fb8d0d27001a57be79e141da8fa816778a583ed9f41b66d39e613d175b1e2e2ba8ba5cee28 SHA512 64563d5c92cae52ab0fd7860c000f779d9423866045166d8ed3262e9b71ea165aee64ef0fdd9119f702a178c3de4c1a83cf177e4898f5944e63a66c8ad169752
+EBUILD e2fsprogs-1.46.6.ebuild 4391 BLAKE2B a18bc8d4d3cc877f0569a79b9045594e5fb7ccc6d8b88f3f633bd40d3a5cc65ceeb232fac18e7b12ccf396398996f62a279418211aad3486c278d0dfd91a290d SHA512 0c138876d0cc574c411b2ed59f173c5a42aefa24b4fe9a6a12b6baffc39fdda7e9a422700a389436aa20b4f1b7157ce4454121fdf59d80085f688bea32d745c5
 MISC metadata.xml 781 BLAKE2B 966522db6501509fbe12c1f896e6f59ffcb2a9dc0980b6086213383894df169dfdadce5cc6c37de5016bb5e96db6565f937183c5e78fad1bb6c15d6c964aec92 SHA512 5d2a09fb1027344f3ed7c24afa49af06a26c5c813f49e8b5614ce629360d1b0252ad93a360d9bd189fa3aa6027b7afceea8ce9fb0fe67f57546d54c348fed74f
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.46.5-r4.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.46.5-r4.ebuild
index a2475153eb26..60bf01d30421 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.46.5-r4.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.46.5-r4.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=7
@@ -11,7 +11,7 @@ SRC_URI="https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${PV}/$
 
 LICENSE="GPL-2 BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="cron fuse nls static-libs test +tools"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.46.6.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.46.6.ebuild
new file mode 100644
index 000000000000..5022d082118b
--- /dev/null
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.46.6.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic multilib-minimal systemd toolchain-funcs udev usr-ldscript
+
+DESCRIPTION="Standard EXT2/EXT3/EXT4 filesystem utilities"
+HOMEPAGE="http://e2fsprogs.sourceforge.net/"
+SRC_URI="https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2 BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="cron fuse nls static-libs test +tools"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	!sys-libs/${PN}-libs
+	cron? ( sys-fs/lvm2[lvm] )
+	fuse? ( sys-fs/fuse:0 )
+	nls? ( virtual/libintl )
+	tools? ( sys-apps/util-linux )
+"
+# For testing lib/ext2fs, lib/support/libsupport.a is required, which
+# unconditionally includes '<blkid/blkid.h>' from sys-apps/util-linux.
+DEPEND="
+	${RDEPEND}
+	test? ( sys-apps/util-linux[${MULTILIB_USEDEP}] )
+"
+BDEPEND="
+	sys-apps/texinfo
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch # bug #516854
+
+	# Upstream patches (can usually removed with next version bump)
+)
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/ext2fs/ext2_types.h
+)
+
+src_prepare() {
+	default
+
+	cp doc/RelNotes/v${PV}.txt ChangeLog || die "Failed to copy Release Notes"
+
+	# Get rid of doc -- we don't use them. This also prevents a sandbox
+	# violation due to mktexfmt invocation
+	rm -r doc || die "Failed to remove doc dir"
+
+	# Prevent included intl cruft from building, bug #81096
+	sed -i -r \
+		-e 's:@LIBINTL@:@LTLIBINTL@:' \
+		MCONFIG.in || die 'intl cruft'
+}
+
+multilib_src_configure() {
+	# Keep the package from doing silly things, bug #261411
+	export VARTEXFONTS="${T}/fonts"
+
+	# Needs open64() prototypes and friends
+	append-cppflags -D_GNU_SOURCE
+
+	local myeconfargs=(
+		--with-root-prefix="${EPREFIX}"
+		$(use_with cron crond-dir "${EPREFIX}/etc/cron.d")
+		--with-systemd-unit-dir="$(systemd_get_systemunitdir)"
+		--with-udev-rules-dir="${EPREFIX}$(get_udevdir)/rules.d"
+		--enable-symlink-install
+		--enable-elf-shlibs
+		$(tc-has-tls || echo --disable-tls)
+		$(multilib_native_use_enable fuse fuse2fs)
+		$(use_enable nls)
+		$(multilib_native_use_enable tools e2initrd-helper)
+		--disable-fsck
+		--disable-uuidd
+		--disable-lto
+		--disable-largefile # need to check effect on ABI
+		--with-pthread
+	)
+
+	# We use blkid/uuid from util-linux now
+	if use kernel_linux ; then
+		export ac_cv_lib_{uuid_uuid_generate,blkid_blkid_get_cache}=yes
+		myeconfargs+=( --disable-lib{blkid,uuid} )
+	fi
+
+	ac_cv_path_LDCONFIG=: \
+		ECONF_SOURCE="${S}" \
+		CC="$(tc-getCC)" \
+		BUILD_CC="$(tc-getBUILD_CC)" \
+		BUILD_LD="$(tc-getBUILD_LD)" \
+		econf "${myeconfargs[@]}"
+
+	if grep -qs 'USE_INCLUDED_LIBINTL.*yes' config.{log,status} ; then
+		eerror "INTL sanity check failed, aborting build."
+		eerror "Please post your ${S}/config.log file as an"
+		eerror "attachment to https://bugs.gentoo.org/81096"
+		die "Preventing included intl cruft from building"
+	fi
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi && use tools ; then
+		emake V=1
+	else
+		emake -C lib/et V=1
+		emake -C lib/ss V=1
+		emake -C lib/ext2fs V=1
+		emake -C lib/e2p V=1
+	fi
+}
+
+multilib_src_test() {
+	if multilib_is_native_abi && use tools ; then
+		emake V=1 check
+	else
+		# Required by lib/ext2fs's check target
+		emake -C lib/support V=1
+
+		# For non-native, there's no binaries to test. Just libraries.
+		emake -C lib/et V=1 check
+		emake -C lib/ss V=1 check
+		emake -C lib/ext2fs V=1 check
+		emake -C lib/e2p V=1 check
+	fi
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi && use tools ; then
+		emake STRIP=':' V=1 DESTDIR="${D}" install
+	else
+		emake -C lib/et V=1 DESTDIR="${D}" install
+		emake -C lib/ss V=1 DESTDIR="${D}" install
+		emake -C lib/ext2fs V=1 DESTDIR="${D}" install
+		emake -C lib/e2p V=1 DESTDIR="${D}" install
+	fi
+
+	# Move shared libraries to /lib/, install static libraries to
+	# /usr/lib/, and install linker scripts to /usr/lib/.
+	gen_usr_ldscript -a com_err ss ext2fs e2p
+
+	# configure doesn't have an option to disable static libs
+	if ! use static-libs ; then
+		find "${ED}" -name '*.a' -delete || die
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	if use tools ; then
+		insinto /etc
+		doins "${FILESDIR}"/e2fsck.conf
+	fi
+}
+
+pkg_postinst() {
+	udev_reload
+}
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 8604bde2079a..c2f293108df1 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/ldb/Manifest b/sys-libs/ldb/Manifest
index 90c61d74a77f..02a8be1c1fda 100644
--- a/sys-libs/ldb/Manifest
+++ b/sys-libs/ldb/Manifest
@@ -5,7 +5,9 @@ AUX ldb-2.5.2-skip-waf-tevent-check.patch 606 BLAKE2B 9cfe1afd1adfca20e1fcdead2f
 DIST ldb-2.4.4.tar.gz 1726595 BLAKE2B c01440e7032dbd3f7b735cb8d2078d7e1dbb56370bd1defe5f170eff006d3979daa654698e6e046c0583288dacd2cda9a5cde249fd6382db52c4aadb83f55e34 SHA512 2e4c762525eee9db40083b21e2a23f9cdfad5d2969cc628b3ea5414f9ec1be2c12d0aa65137cd8d8a5395c0414166ba14fc3dd57d53c533596762d80b9c561f4
 DIST ldb-2.5.2.tar.gz 1730347 BLAKE2B a0d3a9ae02f79c27b396314b804195ecd37b8bcd843fb94f9813a69fb15773db94ed2210f4102e395333562c2dccebabde1c2dcc0c2fceac97dfa31b2ad97e3d SHA512 02ae1246f99d9b6d6b33c5030488aa46c6abb535b4da4b13799a62b49d32c490b7c088ef41c0bc5a1b2f7263c680faceb8033827834cb6f66916adcdb5be421c
 DIST ldb-2.6.1.tar.gz 1740497 BLAKE2B 3e831e4689297f3415928507c4c498cba937df104f1e94792a66691a2c0fefa641989badc1d89b0030d164eff5fdb0b3c75646f12961808e37c54d741f745a76 SHA512 7b920c5ec1252446584caeedf9ec18aeb5c1b689c2ecc8ae65c0d5b64bf0bca0cbaa887c07fca90b36b16904e3a08534fc513fec6bac288e80f94d2980c36211
-EBUILD ldb-2.4.4.ebuild 3060 BLAKE2B 657e00307bbb27330b30917f7f95686661fe46c7ea4ada40fe6fa7d8a41c3fe065111af53b43ca65d14ae3cc12cd0eace142aca17e82327dee36cc2b92449900 SHA512 57686f40bb8503b33252f8c861d4d0e2ec4a1023fe30ceeb5bbd84f5b36e6ec6091d003bf82e2dc2385e8ad8d8d8019f7aebe4f53e68ef848a0d090d790e3f12
-EBUILD ldb-2.5.2.ebuild 3074 BLAKE2B 9b2c7f966fa8ff7d5400129ccb5f9b587782c577e0535e83bd1c89be84e4e2af8c8b728211e0f490d3e818d33b87aada2cad39f1f46ce858ba69426e7ff68051 SHA512 66199f97bae68b2867ae6b8f3e62f8fabf461ee070eb1826ad8fed7e15e8ecfb314ca82eacaf1e3185dadc966a6a71f863ade6d48567ffcfc6af5ee091a1ced4
-EBUILD ldb-2.6.1.ebuild 4544 BLAKE2B e1ed9561e1d8b33c7766c4d91b25b1fd34bd71b4ac292902895264e41a80d6bb3d922baec802aec64a88422d4fadf1a4657c0b55f096de6e359586a1983bbc18 SHA512 46583dbf9c1efa8081ffa5af6217fcb028af83ca312c907523cf02e2e9397a85acdb43c9348a6f53c3e750d89a9fe0f179cc75e159e0b8c4d56119ddd8c9e5d3
+DIST ldb-2.7.0.tar.gz 1736995 BLAKE2B e06b8934a8b8703e861ed8d89f4ee5151d0529b76d08e4d7b24f08860a95669e1749edb3bd90649dbe9104101d03625604d613d25968d9d1d253b3921f5ca575 SHA512 5b730595e8a5830889eb0c0374a695ff228a14bcfffbed494b01d9642b626a7b82a5d73f182435d95cd9d52b3744cb3a5c190d6242eda8843a1c24203c56d57e
+EBUILD ldb-2.4.4.ebuild 3060 BLAKE2B 2b550dd8180377100888dc6268f9391b111ab81ff674fb683b78ee862b1ff4db222e034436d3e8f4d66a6bb602911ddb9369e9e9d26add4e666dc0878cfcc598 SHA512 8e32a04d8b3b9af962ce5e599cb3e642392a689cd49f615cf307f3047224fdbb64e70ab5831e9b0b5e5df6aebb303154e07fcf771749608695c9edd7985fe4a6
+EBUILD ldb-2.5.2.ebuild 3074 BLAKE2B 873594862038fdcc1adeb4a1c4639617be53a4867a4e2eecc97abd44e9c6cec5f483201061846e7598655dcc15e623cb2359a6272a84b2342ba5da8dbdae9872 SHA512 c6ff75bffe65695f653f2d443cc042cad6e23a2786d222fb75b60228c82e4452824f16d3dae62ea257f841c8189117b1a1c279286a51c2d3d5ed1b8402b4cc29
+EBUILD ldb-2.6.1.ebuild 4544 BLAKE2B bea9509288cc2fb92531767eca821020bf357d50602fe4f09d2d5ef7d19483fbc045c65870cd0b2805b8b4a846b4ddd03fc34017b866076e97b015917fa631a1 SHA512 beb843b79d14a544ead57efc728ee99c52189dbdc1d0daac85aa6bfb4b36625ac1fe27d111054ede947e9407d052dced26b3f07fd8dc58725b105e390aa93b44
+EBUILD ldb-2.7.0.ebuild 4544 BLAKE2B 9540b6beb14502300689bb6286820f1cdbfe8e14003b6c5f43868eaf2ed2f92825c127eb3eb5459508bece28c5b8fa15b83703665fa3dc25531a7046f2aff6a7 SHA512 41e4dcfa7cdaf65660b9e9755f72e27194736cdd470b56885f926d457677d07d038b7edd958758de2f04bc467b21fe5821021d2602f45a7825c82085dbc0f860
 MISC metadata.xml 526 BLAKE2B 004dbbf0286ced4bcd404eb3caf091f973e67e00b9230d2399f07dcb31d93a423045b353c1813958da151cded2f52996608de1b4294e3cb90cb8da0ac8877f9f SHA512 9f8008b5b57e5f73e79df68d828f1644edb0a154fa97504c3088301aa60e6ba3ac83a2e06d55d14c06cded89196dd635598f1d767ca93398cbf9610af3b49038
diff --git a/sys-libs/ldb/ldb-2.4.4.ebuild b/sys-libs/ldb/ldb-2.4.4.ebuild
index 7d945da07f99..e05995195978 100644
--- a/sys-libs/ldb/ldb-2.4.4.ebuild
+++ b/sys-libs/ldb/ldb-2.4.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 PYTHON_REQ_USE="threads(+)"
 inherit python-single-r1 waf-utils multilib-minimal
 
diff --git a/sys-libs/ldb/ldb-2.5.2.ebuild b/sys-libs/ldb/ldb-2.5.2.ebuild
index ae9f1d7d82cd..01d3f31d7c2d 100644
--- a/sys-libs/ldb/ldb-2.5.2.ebuild
+++ b/sys-libs/ldb/ldb-2.5.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 PYTHON_REQ_USE="threads(+)"
 inherit python-single-r1 waf-utils multilib-minimal
 
diff --git a/sys-libs/ldb/ldb-2.6.1.ebuild b/sys-libs/ldb/ldb-2.6.1.ebuild
index a56119ab7796..318abf8bb390 100644
--- a/sys-libs/ldb/ldb-2.6.1.ebuild
+++ b/sys-libs/ldb/ldb-2.6.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 PYTHON_REQ_USE="threads(+)"
 inherit python-single-r1 waf-utils multilib-minimal
 
diff --git a/sys-libs/ldb/ldb-2.7.0.ebuild b/sys-libs/ldb/ldb-2.7.0.ebuild
new file mode 100644
index 000000000000..63a61531e296
--- /dev/null
+++ b/sys-libs/ldb/ldb-2.7.0.ebuild
@@ -0,0 +1,167 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_REQ_USE="threads(+)"
+inherit python-single-r1 waf-utils multilib-minimal
+
+DESCRIPTION="LDAP-like embedded database"
+HOMEPAGE="https://ldb.samba.org"
+SRC_URI="https://samba.org/ftp/pub/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="doc ldap +lmdb python test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	test? ( lmdb python )"
+
+RESTRICT="!test? ( test )"
+
+TALLOC_VERSION="2.4.0"
+TDB_VERSION="1.4.8"
+TEVENT_VERSION="0.14.0"
+
+RDEPEND="
+	dev-libs/libbsd[${MULTILIB_USEDEP}]
+	dev-libs/popt[${MULTILIB_USEDEP}]
+	>=sys-libs/talloc-${TALLOC_VERSION}[${MULTILIB_USEDEP}]
+	>=sys-libs/tdb-${TDB_VERSION}[${MULTILIB_USEDEP}]
+	>=sys-libs/tevent-${TEVENT_VERSION}[${MULTILIB_USEDEP}]
+	ldap? ( net-nds/openldap:= )
+	lmdb? ( >=dev-db/lmdb-0.9.16:=[${MULTILIB_USEDEP}] )
+	python? (
+		${PYTHON_DEPS}
+		sys-libs/talloc[python,${PYTHON_SINGLE_USEDEP}]
+		sys-libs/tdb[python,${PYTHON_SINGLE_USEDEP}]
+		sys-libs/tevent[python,${PYTHON_SINGLE_USEDEP}]
+	)
+"
+DEPEND="
+	${RDEPEND}
+	virtual/libcrypt
+	test? ( >=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}] )
+"
+BDEPEND="${PYTHON_DEPS}
+	dev-libs/libxslt
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+
+WAF_BINARY="${S}/buildtools/bin/waf"
+
+MULTILIB_WRAPPED_HEADERS=( /usr/include/pyldb.h )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.5.2-optional_packages.patch
+	"${FILESDIR}"/${PN}-1.1.31-fix_PKGCONFIGDIR-when-python-disabled.patch
+	"${FILESDIR}"/${PN}-2.4.2-skip-32bit-time_t-tests.patch
+	"${FILESDIR}"/${PN}-2.5.2-skip-waf-tevent-check.patch
+)
+
+pkg_setup() {
+	# Package fails to build with distcc
+	export DISTCC_DISABLE=1
+	export PYTHONHASHSEED=1
+
+	# waf requires a python interpreter
+	python-single-r1_pkg_setup
+}
+
+check_samba_dep_versions() {
+	actual_talloc_version=$(sed -En '/^VERSION =/{s/[^0-9.]//gp}' lib/talloc/wscript || die)
+	if [[ ${actual_talloc_version} != ${TALLOC_VERSION} ]] ; then
+		eerror "Source talloc version: ${TALLOC_VERSION}"
+		eerror "Ebuild talloc version: ${actual_talloc_version}"
+		die "Ebuild needs to fix TALLOC_VERSION!"
+	fi
+
+	actual_tdb_version=$(sed -En '/^VERSION =/{s/[^0-9.]//gp}' lib/tdb/wscript || die)
+	if [[ ${actual_tdb_version} != ${TDB_VERSION} ]] ; then
+		eerror "Source tdb version: ${TDB_VERSION}"
+		eerror "Ebuild tdb version: ${actual_tdb_version}"
+		die "Ebuild needs to fix TDB_VERSION!"
+	fi
+
+	actual_tevent_version=$(sed -En '/^VERSION =/{s/[^0-9.]//gp}' lib/tevent/wscript || die)
+	if [[ ${actual_tevent_version} != ${TEVENT_VERSION} ]] ; then
+		eerror "Source tevent version: ${TEVENT_VERSION}"
+		eerror "Ebuild tevent version: ${actual_tevent_version}"
+		die "Ebuild needs to fix TEVENT_VERSION!"
+	fi
+}
+
+src_prepare() {
+	default
+
+	check_samba_dep_versions
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	# When specifying libs for samba build you must append NONE to the end to
+	# stop it automatically including things
+	local bundled_libs="NONE"
+
+	# We "use" bundled cmocka when we're not running tests as we're
+	# not using it anyway. Means we avoid making users install it for
+	# no reason. bug #802531
+	if ! use test; then
+		bundled_libs="cmocka,${bundled_libs}"
+	fi
+
+	local myconf=(
+		$(usex ldap '' --disable-ldap)
+		$(usex lmdb '' --without-ldb-lmdb)
+		--disable-rpath
+		--disable-rpath-install
+		--with-modulesdir="${EPREFIX}"/usr/$(get_libdir)/samba
+		--bundled-libraries="${bundled_libs}"
+		--builtin-libraries=NONE
+	)
+
+	if ! use python || ! multilib_is_native_abi; then
+		myconf+=( --disable-python )
+	fi
+
+	waf-utils_src_configure "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	waf-utils_src_compile
+	multilib_is_native_abi && use doc && doxygen Doxyfile
+}
+
+multilib_src_test() {
+	if multilib_is_native_abi; then
+		WAF_MAKE=1 \
+		PATH=buildtools/bin:../../../buildtools/bin:${PATH}:"${BUILD_DIR}"/bin/shared/private/ \
+		LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:"${BUILD_DIR}"/bin/shared/private/:"${BUILD_DIR}"/bin/shared \
+		waf test || die
+	fi
+}
+
+multilib_src_install() {
+	waf-utils_src_install
+
+	if multilib_is_native_abi && use doc; then
+		doman  apidocs/man/man3/*.3
+		docinto html
+		dodoc -r apidocs/html/.
+	fi
+
+	# bug #726454
+	use python && python_optimize
+}
+
+pkg_postinst() {
+	if has_version sys-auth/sssd; then
+		ewarn "You have sssd installed. It is known to break after ldb upgrades,"
+		ewarn "so please try to rebuild it before reporting bugs."
+		ewarn "See https://bugs.gentoo.org/404281"
+	fi
+}
diff --git a/sys-libs/libcap/Manifest b/sys-libs/libcap/Manifest
index 1fd181ee9cd0..799faf855725 100644
--- a/sys-libs/libcap/Manifest
+++ b/sys-libs/libcap/Manifest
@@ -1,5 +1,7 @@
 AUX libcap-2.62-ignore-RAISE_SETFCAP-install-failures.patch 901 BLAKE2B 8b4795bfff00f3c42d22bfb748c60109c9fb210082bd0553d5d12c098008900d478a07455251228041be3448cf547ee4ec61217b1fa302feb86175592972bb08 SHA512 c6338a21bd66a4248ea3d35c0c39f864a9cd9c0cb0dd26860739fe3828282ff7e068888b3e39b1439f75f8f57db64cfd3a88542dfbb27ed04f65677e7f8ce632
 DIST libcap-2.66.tar.xz 181592 BLAKE2B e79bf10c6a3dbffe96dc97aad0bed67caa0b3805d9dcaff1e4a8a833396ee5c6da4f7f0d321b254e99a00073bc39021b9f3a4b350d93094d0df4d74889b3ca56 SHA512 ac005b622f6e065f30ce282a5c87240e7b9da75366ee537aa4835bc501b44bc242c10a4ba4dc070e2415fc7f635d1c3c4e45fbeeaf962cf7973dda82bf6377f0
+DIST libcap-2.67.tar.xz 186864 BLAKE2B bd9be22e439397a3c1726093cfee2410df93773b3139d50a1cdc10daecb666ddb9b64daded6e0ec9f2fd6defd16ea156dbd66bd55360ea266131f31ea0f0e989 SHA512 2e52c5a571cc1565e6829b0889f63216af10dfd9a86485f8ae7d0fcf4cc0db96aa21eb2ddea29e8dadf41a1194e91fb5961fe84ba07beb2ce950b6131be099d4
 EBUILD libcap-2.66.ebuild 2246 BLAKE2B eeb0a09fd4938cada5697f5531e88178366a0f9bed2a77eb2d6571ec6478d548f47020cd61f1e780b23ddcc657673c4c38d1c24b98dbba41ecaad9b12177e98e SHA512 b958d94030b0023f655810c9db41cc05ce239d07d86da1ea1b37a5cf38ed1e48c1ba1f8ddcb59dd278db2c40d99e57a3c917fa09aa331ba944c86b08cb828fca
-EBUILD libcap-9999.ebuild 2171 BLAKE2B 8f0156d46c0da997b1204aacd200d2c7b249248af2bf96488f2fd5cb41c2bfe0a5c66fd21e6fb9a42c9a2fd3655721f782f1a944d912a74dcc1475bbfbd92df2 SHA512 163e96072426881e6db427d31e89d6c2c4d2d3b9488e4f10bae1910fd898a6c263e40c6ddca8404391ae0944508779845d06170632db9dace7b42068b9cd603c
+EBUILD libcap-2.67.ebuild 2254 BLAKE2B c074ccdd240f8b7a55671c95c99ef04c241b80ddb34a01c43f41f7ee84a3611d7e2279a148965ee587f4e6410ab5b004dfa65b7c3103fc440e2814d11033bac2 SHA512 d5c6e1584119b3b94ab8412e682ab1cb0dc95c62ddcd181b57cc2d128fa43d72e61f21fac563d0bb08728bd69df5a573cfeadf7eca00dfd8761a355e918abcf7
+EBUILD libcap-9999.ebuild 2254 BLAKE2B c074ccdd240f8b7a55671c95c99ef04c241b80ddb34a01c43f41f7ee84a3611d7e2279a148965ee587f4e6410ab5b004dfa65b7c3103fc440e2814d11033bac2 SHA512 d5c6e1584119b3b94ab8412e682ab1cb0dc95c62ddcd181b57cc2d128fa43d72e61f21fac563d0bb08728bd69df5a573cfeadf7eca00dfd8761a355e918abcf7
 MISC metadata.xml 438 BLAKE2B b5260cc84a3fe6b992bb6218846c738af296522d7a467337c05a6240fd07fc9d6cece779bd9fcf24a11486a70874e17acae8182647d307a31cf43e1c19c3a2d3 SHA512 fa3713dcf6b7bb2ea6d4c2fdefc05e92ae345c76a6187ebcb40dab8c4ce0148650a8301f236efcb8cf53fff25730977a385578dbaa160b800159c6d6abbf37a9
diff --git a/sys-libs/libcap/libcap-2.67.ebuild b/sys-libs/libcap/libcap-2.67.ebuild
new file mode 100644
index 000000000000..2072f83214d8
--- /dev/null
+++ b/sys-libs/libcap/libcap-2.67.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal toolchain-funcs pam usr-ldscript
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/libcap/libcap.git"
+else
+	SRC_URI="https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/${P}.tar.xz"
+
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+DESCRIPTION="POSIX 1003.1e capabilities"
+HOMEPAGE="https://sites.google.com/site/fullycapable/"
+
+# it's available under either of the licenses
+LICENSE="|| ( GPL-2 BSD )"
+SLOT="0"
+IUSE="pam static-libs tools"
+
+# While the build system optionally uses gperf, we don't DEPEND on it because
+# the build automatically falls back when it's unavailable.  #604802
+PDEPEND="pam? ( sys-libs/pam[${MULTILIB_USEDEP}] )"
+DEPEND="${PDEPEND}
+	sys-kernel/linux-headers"
+BDEPEND="
+	sys-apps/diffutils
+	tools? ( dev-lang/go )"
+
+QA_FLAGS_IGNORED="sbin/captree" # go binaries don't use LDFLAGS
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.62-ignore-RAISE_SETFCAP-install-failures.patch
+)
+
+src_prepare() {
+	default
+	multilib_copy_sources
+}
+
+run_emake() {
+	local args=(
+		AR="$(tc-getAR)"
+		CC="$(tc-getCC)"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		RANLIB="$(tc-getRANLIB)"
+		exec_prefix="${EPREFIX}"
+		lib_prefix="${EPREFIX}/usr"
+		lib="$(get_libdir)"
+		prefix="${EPREFIX}/usr"
+		PAM_CAP="$(usex pam yes no)"
+		DYNAMIC=yes
+		GOLANG="$(multilib_native_usex tools yes no)"
+	)
+	emake "${args[@]}" "$@"
+}
+
+src_configure() {
+	tc-export_build_env BUILD_CC
+	multilib-minimal_src_configure
+}
+
+multilib_src_compile() {
+	run_emake
+}
+
+multilib_src_test() {
+	run_emake test
+}
+
+multilib_src_install() {
+	# no configure, needs explicit install line #444724#c3
+	run_emake DESTDIR="${D}" install
+
+	gen_usr_ldscript -a cap
+	gen_usr_ldscript -a psx
+	if ! use static-libs ; then
+		rm "${ED}"/usr/$(get_libdir)/lib{cap,psx}.a || die
+	fi
+
+	# install pam plugins ourselves
+	rm -rf "${ED}"/usr/$(get_libdir)/security || die
+
+	if use pam ; then
+		dopammod pam_cap/pam_cap.so
+		dopamsecurity '' pam_cap/capability.conf
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc CHANGELOG README doc/capability.notes
+}
diff --git a/sys-libs/libcap/libcap-9999.ebuild b/sys-libs/libcap/libcap-9999.ebuild
index b155f3846415..2072f83214d8 100644
--- a/sys-libs/libcap/libcap-9999.ebuild
+++ b/sys-libs/libcap/libcap-9999.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=7
@@ -33,6 +33,10 @@ BDEPEND="
 
 QA_FLAGS_IGNORED="sbin/captree" # go binaries don't use LDFLAGS
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.62-ignore-RAISE_SETFCAP-install-failures.patch
+)
+
 src_prepare() {
 	default
 	multilib_copy_sources
diff --git a/sys-libs/tevent/Manifest b/sys-libs/tevent/Manifest
index a08431f596a4..c1933e3bf6bc 100644
--- a/sys-libs/tevent/Manifest
+++ b/sys-libs/tevent/Manifest
@@ -1,7 +1,7 @@
 DIST tevent-0.12.1.tar.gz 879683 BLAKE2B 51521aa26dc3ac38dcf69cdb77a7ad33fede88947e3a91cc5917fae9746951643a70615db24449437e133b575ca41d961ed63c23a0b4f1a01edf090952672032 SHA512 ab70262702d70ce00e8b3aef41930c674b04c147fdbf0006e57cfa057d82f6049ba6da4b2c2b7b53aa191dd4f0f3d55e72b0666ae8f5b6948eeb9fde1988c938
 DIST tevent-0.13.0.tar.gz 880601 BLAKE2B 4e2a2c055bac28cecae1a95b7ddab349ed780f44427e74709eca497d6242bc4f46a91878d3d253c1af4819887ce7df522fe41f88f6059ec5f6c706c7e071ee35 SHA512 7aa05c09e3c708769e31cda88b319cee3629c88c51bda559193a85d4ab32204a8b4ba11f142861dbca06b578bf54953f2aca1ad847e99995a4fc40bf08618a93
 DIST tevent-0.14.0.tar.gz 878142 BLAKE2B 8c1c2b4cb683a3ca2630181904566c3cf9d0151c7e280f86e0ce24febfc5d0a1e85757e3ad9d635205bbcbe3e0d0a060dedb3207fb4e91ea76f36246f0a2704a SHA512 5e9525b2f8f8014d1147244dcccd6cf5ac49e383c49b19480ac1256dc7ccf60705960e87b8f63348fca3f4f496861f3d307ee5e0fde8189d93a596c5e689f2b1
-EBUILD tevent-0.12.1.ebuild 1649 BLAKE2B d9b36d619ee5ef4f02f596af5ba073056024fe0af0340b36aee0416fba6d223fa52beb2dd7122600a19ff540791d59c0757424715a7923ddfc00255fc0f58004 SHA512 2fa8321377d377bf3c81ab45410ec676643f833dd8a61c399e3af097c3878995602717b33dea9861712dbd28839a4d9983a8438a3032562874ea402ef88e4537
-EBUILD tevent-0.13.0.ebuild 2460 BLAKE2B 4ba27a51e44d83743bf48a109882a8b24a18d6c3e3d45f054754be7225c9a432064a641fe5e43454a08d3976523aa083484c5b3ed64185c615d4558953e3e2af SHA512 9afe14e9596a1591368beb6ade85fb515f5b60c239593fb507e65873edc02997f6559f72727c1bc78e485f60f5fec02316c0853f4dbe0e23a9f5e4423ea1da46
+EBUILD tevent-0.12.1.ebuild 1649 BLAKE2B d2304e9a7b79936bfb107cc8425b655d309091ebee54564dc2353695bed7427eb1be44afd368bed36ab3ca3a63715f87113f3a35cd1637c37fe9eb09103098a1 SHA512 39eb19659060d6ffeebdbfa5feb9994c9f52d23d6d238910bc4b12cb7971d2e08faaf6676a2d289b903018966c97267cd442c843357452d7b9493621c6667359
+EBUILD tevent-0.13.0.ebuild 2460 BLAKE2B 7836a61116d0721c0c50e31f691ecea1a55124d52b9bb9d48db71c33e52c0440d95a8cb6163751da73567e0024aa3caf91d868dc7d86782ff87d4825ee520503 SHA512 a61ca9ca0e91eb649e1b429c985078155668a5e60fac5b9aee9e6c44a0f25fce91653056a1d25775a8fb70c078a189bd8471c8ba1704b2b91911db830b82ec17
 EBUILD tevent-0.14.0.ebuild 2394 BLAKE2B 406ffbb4cc1fe6e0fddb01fee0d22ae2c887a8bdef7f9bd70349729c08a1ed57adc782e4206e6205981cf5b67f1f970ce0230b63a825ec515883e68b161999d3 SHA512 76ad5b726a22bf44be9c5a0baa7ef42f8e51d28908215391075b46346dbbc9f9f45404bd8eb75a621e43d04a78ecd7f8aba03ae1f886e934c40459abe63f1b59
 MISC metadata.xml 239 BLAKE2B 7127a2a67e79dc98a78fcaca706fd348389c7f08465112215855afe5978d2932ecbee93944efb1df528fbb6d09e884b277cb1d55a8b3926487b6ca07f9330b8a SHA512 4ea42efe4d083d013b85796ca25a132678bcefe6e3687fd6dd371814fd307118fbc8da8c15ce7f4d956e5f824cd0202f49d3469406c88008e84ff9f4d360f424
diff --git a/sys-libs/tevent/tevent-0.12.1.ebuild b/sys-libs/tevent/tevent-0.12.1.ebuild
index b8b049cfba19..c10e170eb42d 100644
--- a/sys-libs/tevent/tevent-0.12.1.ebuild
+++ b/sys-libs/tevent/tevent-0.12.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 PYTHON_REQ_USE="threads(+)"
 inherit waf-utils multilib-minimal python-single-r1
 
diff --git a/sys-libs/tevent/tevent-0.13.0.ebuild b/sys-libs/tevent/tevent-0.13.0.ebuild
index 73d0a0df4a1e..d13c4c06ea0b 100644
--- a/sys-libs/tevent/tevent-0.13.0.ebuild
+++ b/sys-libs/tevent/tevent-0.13.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 PYTHON_REQ_USE="threads(+)"
 inherit waf-utils multilib-minimal python-single-r1
 
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index b362401d19e0..681045ea1f68 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/xapp/Manifest b/x11-libs/xapp/Manifest
index 674d8cf032aa..a06bfb641298 100644
--- a/x11-libs/xapp/Manifest
+++ b/x11-libs/xapp/Manifest
@@ -1,5 +1,3 @@
-DIST xapp-2.2.8.tar.gz 245519 BLAKE2B cea0999a544143b8bfdd77cfb19ac794806cf7f20ce85a16d682227c164633fdcd4aacddf0235ade19732007cccc62e789f420081b0094f890b41e703ec96ff1 SHA512 eb8da7bd0b5bcdef46ebc5caf7f688eaa3e4a11f4e54dd0f37f006c2f52356bd38d361b35ae7d670cb3e34bb6e9fed8b132d998750e9cd64c110d230437d5636
 DIST xapp-2.4.2.tar.gz 252031 BLAKE2B 184f8459c5fa8165054a6cc3f2aea6b01ab0c73ecb0f5a79a7ba78908e9a149b3b08c691fa1b0a0077d238dc144dd9068b0b49228d530e9684670974bbbe2a69 SHA512 4c8c0ee0c2c273e3b08b4746324ec55e6af0baaada2465b4a628dad21207bc0dc9fb609b2dd8d46284098a4bac6598893a984ff6e5891f2ddd5be6157774ae81
-EBUILD xapp-2.2.8.ebuild 2091 BLAKE2B 0bd3098ae776b744456c22ad0ce2dfb943af2e44d04870bc0fbe4bcb2bb9b73858aff62d853eeebadf60b91396a92b4804e0040cac918b79a5e8550954323508 SHA512 940c3fb718bbfab99b6f5c8ee71cc67ba89bb8ed2544b7f2dcdd1da90a3c36e2a4d7c2f58c09bf925c66a1be2507d20d8c7f2db52bd1f928c53929466861f0f8
-EBUILD xapp-2.4.2.ebuild 2101 BLAKE2B 7f53a718a6e1cbe0717b8b4981f0a955c2555879bddddfc28dc4a5967edaf849ba6dcec51f523309c299ff00cb1daf78631158c7cf58c43eba16f790bd6839c4 SHA512 0c46217f335e12ee341ba54a96bf4d651c58a0b57b6bf0ad29ed505449f1aba4eba54b7c0894e9eb297108bc72ddaedbc6f451d5f36f083523629b8fda911ee5
-MISC metadata.xml 485 BLAKE2B b5373ca9cd55c24bd3ea5b65bd11c5fd43519b6237ff1e73d08ee35303f2f1dd9805fe8a94343bddf2c044749a3914b4d76d1d1b71f02f52e6415c5ef6e1a91a SHA512 45a4105d5797c3ba05757cb93ae6a7e80c9283a9e31cf45cc8b6dcf0d8606e3b2c855bd85c9733750e927758982095047895cda09cc5f32a02cfdd840c101344
+EBUILD xapp-2.4.2.ebuild 2099 BLAKE2B 8e1f0a52eeef0d6d1d105cc5172db6737dd137e0fb08bf184cd7d5ff1dfd4edc74b0430aac4a65261913a53870da7d3c743701f5d7a65c0af5c8647b13e27996 SHA512 729ce1a5654bf1b453ec6d00a7110a421f00188f4081f2ba24c68675f765aef76e6b65ebc0be9cb2d3c60be2a86af52c4af0913a899fccfb673b75d76baa7402
+MISC metadata.xml 484 BLAKE2B 10b58e5f709ed52dad4d0c7d54de20a3e0ebd01d9295715c41dc7ebfd565fa59429cd11dc2efc61a774d2e882ffff75bd7d309ef13f8d5f00024a2235ad7c1c6 SHA512 b5182d0e92d96842d0902c6786aba0f51628e4449c2948234bf33ad9770c681bce07d9f913746dffbb26e4884a0906159c2e36e4cc1fe5be2ff5d496ba02b9fb
diff --git a/x11-libs/xapp/metadata.xml b/x11-libs/xapp/metadata.xml
index 9ffd2e013265..dad211d2b78d 100644
--- a/x11-libs/xapp/metadata.xml
+++ b/x11-libs/xapp/metadata.xml
@@ -10,6 +10,6 @@
 		<name>Proxy Maintainers</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">linuxmint/xapps</remote-id>
+		<remote-id type="github">linuxmint/xapp</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/x11-libs/xapp/xapp-2.2.8.ebuild b/x11-libs/xapp/xapp-2.2.8.ebuild
deleted file mode 100644
index 2056ead43c48..000000000000
--- a/x11-libs/xapp/xapp-2.2.8.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9,10} )
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome2-utils vala meson python-r1 xdg-utils
-
-DESCRIPTION="Cross-desktop libraries and common resources"
-HOMEPAGE="https://github.com/linuxmint/xapp/"
-LICENSE="LGPL-3+"
-
-SRC_URI="https://github.com/linuxmint/xapp/archive/${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="amd64 ~arm64 ~riscv x86"
-
-SLOT="0"
-IUSE="gtk-doc introspection static-libs"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	>=dev-libs/glib-2.44.0:2
-	dev-libs/gobject-introspection:0=
-	dev-libs/libdbusmenu[gtk3]
-	gnome-base/libgnomekbd
-	x11-libs/cairo
-	>=x11-libs/gdk-pixbuf-2.22.0:2[introspection?]
-	>=x11-libs/gtk+-3.16.0:3[introspection?]
-	x11-libs/libxkbfile
-"
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	$(vala_depend)
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	sys-devel/gettext
-
-	gtk-doc? ( dev-util/gtk-doc )
-"
-
-src_prepare() {
-	vala_src_prepare
-	default
-
-	# don't install distro specific tools
-	sed -i "/subdir('scripts')/d" meson.build || die
-
-	# Fix meson helpers
-	python_setup
-	python_fix_shebang meson-scripts
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use gtk-doc docs)
-		-Dpy-overrides-dir="/pygobject"
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	# copy pygobject files to each active python target
-	# work-around for "py-overrides-dir" only supporting a single target
-	install_pygobject_override() {
-		PYTHON_GI_OVERRIDESDIR=$("${EPYTHON}" -c 'import gi;print(gi._overridesdir)' || die)
-		einfo "gobject overrides directory: ${PYTHON_GI_OVERRIDESDIR}"
-		mkdir -p "${D}/${PYTHON_GI_OVERRIDESDIR}/" || die
-		cp -r "${D}"/pygobject/* "${D}/${PYTHON_GI_OVERRIDESDIR}/" || die
-		python_optimize "${D}/${PYTHON_GI_OVERRIDESDIR}/"
-	}
-	python_foreach_impl install_pygobject_override
-	rm -r "${D}/pygobject" || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	gnome2_schemas_update
-}
diff --git a/x11-libs/xapp/xapp-2.4.2.ebuild b/x11-libs/xapp/xapp-2.4.2.ebuild
index e83eade622b6..00c0838e7237 100644
--- a/x11-libs/xapp/xapp-2.4.2.ebuild
+++ b/x11-libs/xapp/xapp-2.4.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/linuxmint/xapp/"
 LICENSE="LGPL-3+"
 
 SRC_URI="https://github.com/linuxmint/xapp/archive/${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
 
 SLOT="0"
 IUSE="gtk-doc introspection static-libs"
diff --git a/x11-plugins/Manifest.gz b/x11-plugins/Manifest.gz
index 6ba9da47a86b..a1b47277219a 100644
--- a/x11-plugins/Manifest.gz
+++ b/x11-plugins/Manifest.gz
diff --git a/x11-plugins/gkrellaclock/Manifest b/x11-plugins/gkrellaclock/Manifest
index 01694572139a..75dcc6fb12a2 100644
--- a/x11-plugins/gkrellaclock/Manifest
+++ b/x11-plugins/gkrellaclock/Manifest
@@ -1,4 +1,4 @@
 AUX gkrellaclock-makefile.patch 1403 BLAKE2B 12d84d0a6bc4ddf26b90978ac4ed88d152e0ca46abd2462c89528bff25f70fcc901dcb3d4c554c4fe4a7fb9c5e7e78a10bf97a1df554cc6c39f4348af1380d40 SHA512 484a405ebc9174617b0c17bc0cceb8533bf581ea3cf7a9b3d36ab2f297f6ae51ce2bbf5e5e022f6813f269caadec46e5d17845e5951f3bbb92ddd137c5ad5227
 DIST gkrellaclock-0.3.4.tar.gz 18853 BLAKE2B b91b4cb9ae42f68d3a3d430f7713170c788515280330a1f785f11d4335e859dbd6f840fb7e47fe8f77676bb55e97dda628fa79d442d4be8a37c69bcea836aa52 SHA512 2e6002bc4d535899cc8b86377d596bcee5e64d05fe4239eaab2de8e387a40b8dee600d9fcd5f30feb68bb3e54bf6b4745d4c7b79ea9fee57b856eeb3dac12524
 EBUILD gkrellaclock-0.3.4-r2.ebuild 733 BLAKE2B c3dd9814d55ae59a696d03997c27773eea413b21a98aaff190ba98e5990f58ddc81a6918948afc7d1294fc8594dab01dbb28d5e756a7da1dc31911a68f9eba02 SHA512 5bc30beea7475a6cdb4d508b15027adccc9c5bed255ec79c89ca5cbd2b976990869d53723399d64588ccd4f9f2499c1632b2819980050437ada69fd7290cbdae
-MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
+MISC metadata.xml 240 BLAKE2B 20c22d2d446cfcd6f2f430f2c444cd6d854d840e5161f595e4f738096d38db01c8cd305870b26623e98d8bbba239260975a53802caf4b678d1fe61a146aa660f SHA512 1af3286c63a60e89c2f87bd060eebb279858f4b21f9daedf4edcacd5906f35ddd6271397806771d6de1853cae1f3ecdd00ee6e05718fd7083ebc039e5cfa4832
diff --git a/x11-plugins/gkrellaclock/metadata.xml b/x11-plugins/gkrellaclock/metadata.xml
index 85e4ed814fa2..641cbd3703e7 100644
--- a/x11-plugins/gkrellaclock/metadata.xml
+++ b/x11-plugins/gkrellaclock/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>sam@gentoo.org</email>
+		<name>Sam James</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/x11-plugins/gkrellfire/Manifest b/x11-plugins/gkrellfire/Manifest
index 6836e9484e61..a2ff92cb6175 100644
--- a/x11-plugins/gkrellfire/Manifest
+++ b/x11-plugins/gkrellfire/Manifest
@@ -1,4 +1,4 @@
 AUX fix-CC-CFLAGS-LDFLAGS-handling.patch 1788 BLAKE2B 3cd9c4f40fe30fed10d7a3c14c8b9887e76220caab5073a27df66a84088fbed45910fb874f6b0d2976fb418ada32b564ab815a7439a99d900e46e31b0b4c62c4 SHA512 bf28ded021d3325df8fa725c0b264939e1d4e86bcd87e60e2bc010f1223a0371996516749d162a07d3661d6589c7b8f5a102a0ebe87f60aba36b913fd83cf3d2
 DIST gkrellfire-0.4.2.tgz 12474 BLAKE2B e4c488061e18200fd75cca991032d1d64d0bd36da74aab33b3075cc6e5fae9b890ff3d906713ceb4ce15ffc409fb0916e77e1edcd9b686410bc2c8e637941b9f SHA512 1b7f6229567819092cd2eb2e33e3b7fd8340b0e913f6bcd1d11e9dd604730e3ca4fc1adaa8ae36895d80000f61931da14a586be6929c141c64b8519f8dc328bf
 EBUILD gkrellfire-0.4.2-r2.ebuild 526 BLAKE2B f1eebba005cc4d391583a9449a467b515382c1ea5b3f933bb304bfb9c6466b2d82d2b0ec1fea10710b611c1bf9d4928984983927e88b9405c533b7d61f7b7d8a SHA512 aee86f936561480928fbbf6e0449c4619a4190890940b0e8764b2cfa752cea1a5c3702a19d03243566ac4afdd49453fbbdd93d9594b9ae479bc49ef23def989b
-MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
+MISC metadata.xml 240 BLAKE2B 20c22d2d446cfcd6f2f430f2c444cd6d854d840e5161f595e4f738096d38db01c8cd305870b26623e98d8bbba239260975a53802caf4b678d1fe61a146aa660f SHA512 1af3286c63a60e89c2f87bd060eebb279858f4b21f9daedf4edcacd5906f35ddd6271397806771d6de1853cae1f3ecdd00ee6e05718fd7083ebc039e5cfa4832
diff --git a/x11-plugins/gkrellfire/metadata.xml b/x11-plugins/gkrellfire/metadata.xml
index 85e4ed814fa2..641cbd3703e7 100644
--- a/x11-plugins/gkrellfire/metadata.xml
+++ b/x11-plugins/gkrellfire/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>sam@gentoo.org</email>
+		<name>Sam James</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/x11-plugins/gkrellkam/Manifest b/x11-plugins/gkrellkam/Manifest
index c8140ff57e44..ac0b465bc2f2 100644
--- a/x11-plugins/gkrellkam/Manifest
+++ b/x11-plugins/gkrellkam/Manifest
@@ -2,4 +2,4 @@ AUX gkrellkam-2.0.0-makefile.patch 664 BLAKE2B 314b6971723bd4342aa4640d685eecf3e
 AUX gkrellkam-2.0.0-r1-pkgconfig.patch 400 BLAKE2B 9c65c7d9e0eee676151a7d00559fddbb847e88926d6f09f87f646f3d326be3dd677dde1a86e502a0e5ba6dcd9afeb0fe89078b8d1b2d48f2dafc18c49d53ef48 SHA512 9abc516f95037de9d6591d1a4b774d04b50953ece4a384a1f03193261c4cf9b7e46741aab0ce4e180a4f98b929ebf61c63b491514341d9f0e4f0a44f62ef70a8
 DIST gkrellkam_2.0.0.tar.gz 27028 BLAKE2B 4bdfb89e2aa0f9001fbaedacb095e868497564612982cd3743547e1070bfbf173be5a441339d32e1be5146a511b840f6fd9a5450edad641895630d33eb5eb554 SHA512 a5a5d0a41de37b006c42150f0388ba573c968679f3f15c6b1d4837361d136cb529c2152723382e99bb46a76be5f1bde641137cea22e07a502402560dcd18699f
 EBUILD gkrellkam-2.0.0-r1.ebuild 806 BLAKE2B 9eeb7357c06782115921c7f8bd1aa0915411b88f51c71d3cb255563b381faf8f842e130c44ad9e838a898f3e37df567b672ae66127e68d60c2576b8c62328149 SHA512 432d44a4c14e0c2dc3f461e148624958081a9bc62e8742de11068c34490c9cb9599ce91672ae2f1d9843eae6ee7a078bd41f7eb5852e649616f90d321ed975b3
-MISC metadata.xml 247 BLAKE2B bc8a671dda571420b2fe59f271b65f7467459e7dc02f13c2c3d4ddbc2c9385473f6ebb735b90dffd21a4e2eb3d2035d34e23b0c01c621b724d5183eb4e34165f SHA512 5abf93f2dc4d80fecfce931af945e3c45fd7fc7e4e84ccf238a6aa8b2ff0d60e6ccd7b943d32613bdfdf3a9fdaef9aad7a4dbfe9f8040b6045134b003bd7e407
+MISC metadata.xml 319 BLAKE2B d216c92cdb6ce59e6c8c1f5f77ba97255884d1f519798fdd4dc61a64a299a0950b9dcacd14902fedda7f1997701cceea22c9044409b595871a3ea85a1d012565 SHA512 d17709b8f91a2f19425750ac7672ac4bb3df55ba05cc316a26af152d686b2104f985eb9ffcbf56b1414b65be07739ed6ac3ebefaacdc46b9f46b5bbf9dca7b01
diff --git a/x11-plugins/gkrellkam/metadata.xml b/x11-plugins/gkrellkam/metadata.xml
index 9ce0c03b69e8..41fcc1c138a1 100644
--- a/x11-plugins/gkrellkam/metadata.xml
+++ b/x11-plugins/gkrellkam/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>sam@gentoo.org</email>
+		<name>Sam James</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">gkrellkam</remote-id>
 	</upstream>
diff --git a/x11-plugins/gkrellm-bgchanger/Manifest b/x11-plugins/gkrellm-bgchanger/Manifest
index ad9396f58fc8..6ebf26113bfe 100644
--- a/x11-plugins/gkrellm-bgchanger/Manifest
+++ b/x11-plugins/gkrellm-bgchanger/Manifest
@@ -1,4 +1,4 @@
 AUX gkrellm-bgchanger-0.1.11-fix-build-system.patch 245 BLAKE2B 742212aae7f59649481aac6868fc1648290ea623aa07d29cee4be2ca3992a359896da180161ade8ba8132621f48ed20ecb5fa8df386503eea70905cb58302e5b SHA512 b7d65deba2c6064c526dc0809e15773a3b4afc2c4be01ef44afa760037ea2fec80934f6d9ffa51455f1593e107e372fa88b31f48e8f1dababd825a5b3287f773
 DIST gkrellmbgchg2-0.1.11.tar.gz 24164 BLAKE2B 07b502ee8e86a26cc46b0d136241369cf26daa2c4ece3e2544ae14a6d69e11602e8d549769a342ead71e1838f9cdabf1f47c4ea79b69d65a26aa95411e0e5240 SHA512 648f56260e756d23ce616efb863e5746a7400a3fd7df135fc3b7548ac07ebb058e9c4f7c76af92cc2c4942ba6c1108b6e294b72afe831de6285e2329ca7c4803
 EBUILD gkrellm-bgchanger-0.1.11-r3.ebuild 784 BLAKE2B f16530e2191e95424ce577faaaf6ac2b4fb44b8ab984305a0e027b0d61da420df4bff804b3cc80efb9fd11034a00c45d8768769b9be120c81d0f9067738eb1be SHA512 2c7f67ec68065a4516f2862f4a28dfdba3b07d7cb1275e2212d15a2e123e6ddbd0a7de9337e2b3b4ae9f270ffbd639a82e8d5aa1125c39f6ecc9d440be688124
-MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
+MISC metadata.xml 240 BLAKE2B 20c22d2d446cfcd6f2f430f2c444cd6d854d840e5161f595e4f738096d38db01c8cd305870b26623e98d8bbba239260975a53802caf4b678d1fe61a146aa660f SHA512 1af3286c63a60e89c2f87bd060eebb279858f4b21f9daedf4edcacd5906f35ddd6271397806771d6de1853cae1f3ecdd00ee6e05718fd7083ebc039e5cfa4832
diff --git a/x11-plugins/gkrellm-bgchanger/metadata.xml b/x11-plugins/gkrellm-bgchanger/metadata.xml
index 85e4ed814fa2..641cbd3703e7 100644
--- a/x11-plugins/gkrellm-bgchanger/metadata.xml
+++ b/x11-plugins/gkrellm-bgchanger/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>sam@gentoo.org</email>
+		<name>Sam James</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/x11-plugins/gkrellm-bluez/Manifest b/x11-plugins/gkrellm-bluez/Manifest
index 8afc05400457..3d58e5dfe52f 100644
--- a/x11-plugins/gkrellm-bluez/Manifest
+++ b/x11-plugins/gkrellm-bluez/Manifest
@@ -1,4 +1,4 @@
 AUX gkrellm-bluez-0.2-notheme.patch 1679 BLAKE2B f5b7fca3f36757733405f42e78bc7ae5f7e7c704f0d58a63c258f632ee4d61415ba201c619a9c425398195b44bf1cdaa82743e12ab1d710e6677f5754e3d0b3d SHA512 a754b0ea03a123c661574719e2e6e1afe75471aa1bc6be1cdf79066c0471396e68ed47ade6c340c446dec5e288f928b44172ea983744290831c5088dc35cf73d
 DIST gkrellm-bluez-0.2.tar.gz 330247 BLAKE2B 8fa585fdd10892018e749428afded5cfb6c94258befedfe2652bcc027210ea9bb0db7379e052b19d6dbeb6c3abdf51be9504078e8e135bb74fce52bcc4febf71 SHA512 56a288874bf7de9f09aaa49a3bbc1ccf71da95dded5baa4af20941866f5acf777234a7726c49d491f252e175fc34266abd068cac0ca204ca6d1785a1d7e230f9
 EBUILD gkrellm-bluez-0.2-r3.ebuild 736 BLAKE2B 23603c2e385fcc9c3079d44fd583b2cc8b3818a1409d7732459d194a2cc96f9c6dbc0a5d5b9f7d1e1ef045ca5d345caa2a9274114a5729d4a163629f2d52b48f SHA512 0563940115e8a620c32bcd08713f6783d8c56eaefeeba82ee673bdf8e9da6b6d72baac2737ae0af48e6626031dfe904100c592c02cc877b4f88920def21a26b4
-MISC metadata.xml 251 BLAKE2B 5dfb0bfe530fa3e325876191cd8cca6631b32832f7621a01461f914c3be1f12d663f2be59464e6069cfecfea817386baa6c71d8f924d5b59b04995940b55e955 SHA512 a7e4ca85f584cba8800f9a32f6179bd2c6a365f25d1f2d87c9d583e068ea25babdf8d47776495d2d4e498b9fc3e1b784593a8242c1d5c33c0a4cc37dd0c59470
+MISC metadata.xml 323 BLAKE2B 24b54e4ed47588b7f487b5eba43548908ed3fefb99f6028fb18b466080879b5fe6f27204daad05316c2ea33f18848670a8144230ed9cb0348ba71f7f70287e36 SHA512 f3dfb04103bc8d152db5d803ff51305d442b98038b662129e70ffac8e27e0180903357dda127077509aeff0444418c13a08994b65e44874ff1b09e0aa7ce2ed2
diff --git a/x11-plugins/gkrellm-bluez/metadata.xml b/x11-plugins/gkrellm-bluez/metadata.xml
index 18edf05f70f7..57c612088af5 100644
--- a/x11-plugins/gkrellm-bluez/metadata.xml
+++ b/x11-plugins/gkrellm-bluez/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>sam@gentoo.org</email>
+		<name>Sam James</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">gkrellm-bluez</remote-id>
 	</upstream>
diff --git a/x11-plugins/gkrellm-countdown/Manifest b/x11-plugins/gkrellm-countdown/Manifest
index 0467f0693785..e853fdfd9733 100644
--- a/x11-plugins/gkrellm-countdown/Manifest
+++ b/x11-plugins/gkrellm-countdown/Manifest
@@ -2,4 +2,4 @@ AUX gkrellm-countdown-0.1.2-r2-pkgconfig.patch 476 BLAKE2B 7c55e464e84285c9a60c7
 AUX gkrellm-countdown-makefile.patch 957 BLAKE2B beab6d1162df796b52057fea2c9bdc2de6783e13b76ef3af049a9a8dda6900ba996151280cf3d5ce554431ad6920186eaf4d59a85f2483b2860b1a16cab38579 SHA512 8bb2a852144590e648dc0309f1a15b3b84f9ee5fbb31150fb8765568d935ed2750f04bbc81aac3c3d70942c27582d4cafda5facd6e5522df8a4e1c75ef3c792f
 DIST gkrellm-countdown-0.1.2.tar.gz 12482 BLAKE2B eb619cc1da6ef90f843ab2a30e24da63d90988e85b4d48e2425f9c69a77ee64e7eaa674a7bed79da202633037aa56d5dd1f3b1c3ac9895172eed11af4b507dc0 SHA512 974a885ed56ffa95d2b5972fd309721e0043e8798fc1289fbb34bfd0320ec78db7a0572f8e43eee922b2823a2aa80789b8d24fdf106074e683b218e731b6de71
 EBUILD gkrellm-countdown-0.1.2-r2.ebuild 659 BLAKE2B 8117cbf44682decd1212bc438f8c9e9edf254b7c9c5cccb5e5cdf4badecefe0a464a3831731e6ad9f439618ec48b096d1403a889a45f859fe6f56f6aa20f5eb5 SHA512 54d3e2f33077000ab23ef9e423e68742d225443898ab506f1ee5521b2e2aa2b8d1e7ba92dc50e4764797978e60e6498dc8acc6f1f2af013c95d462e0ce964e86
-MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
+MISC metadata.xml 240 BLAKE2B 20c22d2d446cfcd6f2f430f2c444cd6d854d840e5161f595e4f738096d38db01c8cd305870b26623e98d8bbba239260975a53802caf4b678d1fe61a146aa660f SHA512 1af3286c63a60e89c2f87bd060eebb279858f4b21f9daedf4edcacd5906f35ddd6271397806771d6de1853cae1f3ecdd00ee6e05718fd7083ebc039e5cfa4832
diff --git a/x11-plugins/gkrellm-countdown/metadata.xml b/x11-plugins/gkrellm-countdown/metadata.xml
index 115e9d64a669..641cbd3703e7 100644
--- a/x11-plugins/gkrellm-countdown/metadata.xml
+++ b/x11-plugins/gkrellm-countdown/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>sam@gentoo.org</email>
+		<name>Sam James</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/x11-plugins/gkrellm-cpupower/Manifest b/x11-plugins/gkrellm-cpupower/Manifest
index f62ac651c815..d1b1e90eb25c 100644
--- a/x11-plugins/gkrellm-cpupower/Manifest
+++ b/x11-plugins/gkrellm-cpupower/Manifest
@@ -1,4 +1,4 @@
 AUX gkrellm-cpupower-0.2-makefile.patch 1061 BLAKE2B c83d00ce78314139b1f972cfd3167b8d5174e44ade0b97b9592e05fc289b64c793d711827cd615d37deed72ded62e81699e58ffd5aca32e3cb58d888b83f5a74 SHA512 a4143262f07e0bc15c4d8d71b03df7a0ae67ba3817ac227545a1932ab91d981ea76a053ebb0e67871c59b7083740aede2a3a920db9feb807a66d7d2417e9081f
 DIST gkrellm2-cpupower-0.2.tar.gz 14274 BLAKE2B 6ad0c0825743b3c37670e5b3f7390f601ee3ffc012cc658b0fbd72c4a195ec680eaef8a5dc8f9b72a17199a293865007fc60877addf7c811d9735116d600f934 SHA512 80cf86548c8329af41462cb5cdd0de67cfab05d8d9a7c3315fcc662e0b5e511ffc1f46d2eb3ccf13b9f1607c35860921658eb74970c241a4c56b74e32e4f779e
 EBUILD gkrellm-cpupower-0.2-r2.ebuild 1112 BLAKE2B 3a77e9f90581c169aba2f19b415083e73d8d4b847f00d9db19a1b9645afc285b218bffef2d1a92ac64c2615ce6e1f55e2a0328c3d7d8ad99b211fdd3c7609e2a SHA512 fdd6a91f989f4c33c83781a3646d889b103dbeeb13c685ec479c7f1b7a54a195a3b78b73933ecdfd449c95d7b58ee4f4b7b2119210730ee8aa11d2ff76354828
-MISC metadata.xml 264 BLAKE2B 06a1053b520abbb6b64ea5c6f29e4b5dd9777de179ad2fc2c511eeb9cd522d428d66280b61485f47dc8f2e7a57d4c657c15ff7434280cd890613c4ebe1b801e8 SHA512 59509f805dfc0c4c51cb28c097ecd8b8c24d103821661db7cbabec69d707a1e2911c9b8c7efd54e3059198ee294354055e2b87247ccde7a2cf5a5eded8da3df3
+MISC metadata.xml 331 BLAKE2B 5912976ed80b9fcc473a33f8015a0e287ac0f3e811aaa0410c78c0aa76f9723fb5817719341b79adcf91f8650b00c1f5874277de724ec7dd5d23f5ed13b5644b SHA512 f00c48208133caf44db1b41bf03b3517e81e3c9cb41b7251aeff3aa03ff0ad32ddd996a8e394237ad03dbfdd5cf5e910a6b5df1845e0a948120bbe0d1594508b
diff --git a/x11-plugins/gkrellm-cpupower/metadata.xml b/x11-plugins/gkrellm-cpupower/metadata.xml
index 8e381cab9236..db7314d8bbfd 100644
--- a/x11-plugins/gkrellm-cpupower/metadata.xml
+++ b/x11-plugins/gkrellm-cpupower/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="github">sainsaar/gkrellm2-cpupower</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>sam@gentoo.org</email>
+		<name>Sam James</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">sainsaar/gkrellm2-cpupower</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-plugins/gkrellm-imonc/Manifest b/x11-plugins/gkrellm-imonc/Manifest
index b3db2ad9c445..0acda7e09252 100644
--- a/x11-plugins/gkrellm-imonc/Manifest
+++ b/x11-plugins/gkrellm-imonc/Manifest
@@ -2,4 +2,4 @@ AUX gkrellm-imonc-0.2-r2-pkgconfig.patch 401 BLAKE2B e9d194209da9648d17ce606ed09
 AUX gkrellm-imonc-makefile.patch 672 BLAKE2B f29982a0461ae9ffd8b6c1cec43a220ea06d2d39397746cc4cee4140ca5a678dbf95ec3079465cbb26a16d91f64e789fc483ab0c64981fa1380090d7a21559d2 SHA512 76919a21b7dc38b56d31f94e718a5e66125712ebf70551c1ae522da23689bb9d6a5086010fbd3b072ae8612a878d8f32f0c621ef09ece2f3d44ad1d026656f59
 DIST gkrellm-imonc-src-0.2.tar.bz2 19189 BLAKE2B a0a2e48eca12dcdccedbc347e15f3cf72ae7be050e8f4b1ff71a48a2f53b6991119b413333620e9544f25337f966dd16742b280990364a69f9ef45a1a141cbaa SHA512 b6f5d8cfa90c708ed6e43d676c965ef0d850d12497adae35122fe07ac4ea235dd024b8415fbc40cf153e1bbcbeed1e632984b6f1e5ec9079a1fcfce915ace36e
 EBUILD gkrellm-imonc-0.2-r2.ebuild 732 BLAKE2B 616dd75acd8e6de04826796331b613c06cebe31ee9407ec0c438eab3b56211dba048c9a09f54d2996407290459754055649aa970742227e4b1786fbb7d6619cb SHA512 c2e2be84533fd88ac9a20b0b5552c6c694202ebc0639dce598916769a211d1807ad805a0df623eced540a6a60b3802280c13f311fb04f4766e194870defd15e8
-MISC metadata.xml 251 BLAKE2B c569e245a84951e1da3acf2bc7bd4fddff868eb57c521be45f4437bb6aa834c7ff2a265d2fbaf841346a0c24f9addd1d196d8108fc877bd0eb9f3914f0f21f99 SHA512 912f4e9536eb42b728644472bdb0ac3ab585d97d67d256c1a305a92b69bd582bc4682df888aa393930a3a35e85db663a0cc5618a9163729434c7275fa71184cc
+MISC metadata.xml 323 BLAKE2B 079bd96500a4ec4fa7cb38056b59cf5d7549e4c380f92f3a8bb743c33f03557de39544d2e2da50a8dd58f3e4584b6c65c4a38ce4278f9aa5663a84cfb3ab5590 SHA512 1af246e80b74d5ccba36ec2a9b4b4e9bf8a914e9ccd6abc0b3c79a1e0a50e29827bfadee82331cac9086dc10f1daaf9aaddfce2d159ba49b426c16aed500a13a
diff --git a/x11-plugins/gkrellm-imonc/metadata.xml b/x11-plugins/gkrellm-imonc/metadata.xml
index acb644f24e24..356ccc1dd14b 100644
--- a/x11-plugins/gkrellm-imonc/metadata.xml
+++ b/x11-plugins/gkrellm-imonc/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>sam@gentoo.org</email>
+		<name>Sam James</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">gkrellm-imonc</remote-id>
 	</upstream>
diff --git a/x11-plugins/gkrellm-leds/Manifest b/x11-plugins/gkrellm-leds/Manifest
index 534fd8605beb..14a50d1866c1 100644
--- a/x11-plugins/gkrellm-leds/Manifest
+++ b/x11-plugins/gkrellm-leds/Manifest
@@ -1,4 +1,4 @@
 AUX gkrellm-leds-0.8.2-r2-ldflags-typo.patch 533 BLAKE2B 78ed173b9c322cc90c625ed4d303240e94cc63eeda44e22aba10b4df49265f431b4386b3e3ac361c63d68fb19104413ce963ffba27854c7ef913882285c9328f SHA512 f53f26d6e35bcfab83a54709fd30a14aa6093ee73235701c62f5ba4f61c1bd93f04a72a498d1b6f9601f1bb302adb911764994ba41816e90bf2ebe88b93961af
 DIST gkleds-0.8.2.tar.gz 322409 BLAKE2B f5b3303069e923d69ca4c61261428c0d938aa1ed881ea7095ccacac2e01501cd6ec8b71724dc3587c64d79fd7d385532fa296d7127163037415778311f22c0c9 SHA512 0db2f7c62b799c262f1ef3af4bf3eb147717c567862d30c07033b77bc890a33afc40389afd1d4f0a5e05c344d4bc3b12a0b7d2c42044eb4c5be00c5ca5aa7191
 EBUILD gkrellm-leds-0.8.2-r2.ebuild 756 BLAKE2B ec967d3c1115ebd6510cbd25a0460644393c5d47ff96e97434cf130b7da6ac22c43755a62e58f2050569544db0ff9263d9151f25486d66eb9d9db77bbbd4cf68 SHA512 af06e2cb5934f1f2d92149477f570fa5805e473ff4125ae8ba998ffc691b7876093c057281cd3392197d6b8e7ad49b8ec018536af3801d625697ec3856b04026
-MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
+MISC metadata.xml 240 BLAKE2B 20c22d2d446cfcd6f2f430f2c444cd6d854d840e5161f595e4f738096d38db01c8cd305870b26623e98d8bbba239260975a53802caf4b678d1fe61a146aa660f SHA512 1af3286c63a60e89c2f87bd060eebb279858f4b21f9daedf4edcacd5906f35ddd6271397806771d6de1853cae1f3ecdd00ee6e05718fd7083ebc039e5cfa4832
diff --git a/x11-plugins/gkrellm-leds/metadata.xml b/x11-plugins/gkrellm-leds/metadata.xml
index 85e4ed814fa2..641cbd3703e7 100644
--- a/x11-plugins/gkrellm-leds/metadata.xml
+++ b/x11-plugins/gkrellm-leds/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>sam@gentoo.org</email>
+		<name>Sam James</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/x11-plugins/gkrellm-mailwatch/Manifest b/x11-plugins/gkrellm-mailwatch/Manifest
index b9329bb3740e..e44785311e96 100644
--- a/x11-plugins/gkrellm-mailwatch/Manifest
+++ b/x11-plugins/gkrellm-mailwatch/Manifest
@@ -5,4 +5,4 @@ AUX 2.4.3-0004-Do-not-force-O2-in-CFLAGS.patch 622 BLAKE2B c14f0fcef8fdbb5d76f81
 AUX gkrellm-mailwatch-2.4.3-pkgconfig.patch 473 BLAKE2B a60fef834ed6de590c86b26060f821a53ac28e30a45ca608dbc58c3ff9ae72681879ec5b05f662a9674cc6552ef063fa36cdeb4ac8c900c67da2e47791d6c6bd SHA512 ecd46a50da1595ce70f416f2874d9a4f8e85c7117f2fbb8e2e62154856623ed52c4dd05c405ae4df219f60c9287422aae5862fcb27888661680cd8ddfccf82d9
 DIST gkrellm-mailwatch-2.4.3.tar.gz 27407 BLAKE2B 38c9559d2a36872e9c4203c7e6cef8cfaed7f41b944afa0e74091d09f3e812dcd8a59d58a426baa7d51f53bf6763b574aa383e1882b9e48755c880f4665b4dc4 SHA512 31ada9fa55a97a1c76e93f1130b5d84ce3c3db52608aaaeedcd8d482917c53e0c868ca2b61c58da966bdce7de74a88a6bdc5869c40b41e017014f34626df4bb9
 EBUILD gkrellm-mailwatch-2.4.3-r3.ebuild 879 BLAKE2B 70d7c860448389bc195a2caac76243c7c1d330050eefb8668aa399288e676edc3ab293f94d9443f57819ffa5d27df4dcb0508b3c50290c5fc72e406a600d40ba SHA512 45c8f35375b5e4955452213527810a3f7fffa8828981ad950df00680ae9c5954be574d3c0af52d50ae737d85adad978bfcf8815acd6a2f51e17e5a02aae5171f
-MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
+MISC metadata.xml 240 BLAKE2B 20c22d2d446cfcd6f2f430f2c444cd6d854d840e5161f595e4f738096d38db01c8cd305870b26623e98d8bbba239260975a53802caf4b678d1fe61a146aa660f SHA512 1af3286c63a60e89c2f87bd060eebb279858f4b21f9daedf4edcacd5906f35ddd6271397806771d6de1853cae1f3ecdd00ee6e05718fd7083ebc039e5cfa4832
diff --git a/x11-plugins/gkrellm-mailwatch/metadata.xml b/x11-plugins/gkrellm-mailwatch/metadata.xml
index 85e4ed814fa2..641cbd3703e7 100644
--- a/x11-plugins/gkrellm-mailwatch/metadata.xml
+++ b/x11-plugins/gkrellm-mailwatch/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>sam@gentoo.org</email>
+		<name>Sam James</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/x11-plugins/gkrellm-plugins/Manifest b/x11-plugins/gkrellm-plugins/Manifest
index 4e3279b1a74c..cd4e0b532a31 100644
--- a/x11-plugins/gkrellm-plugins/Manifest
+++ b/x11-plugins/gkrellm-plugins/Manifest
@@ -1,2 +1,2 @@
 EBUILD gkrellm-plugins-2.0-r1.ebuild 771 BLAKE2B 940750723e67f8cb3ca84d492c794e611fa2562787a33ab728ba06235ff6509401adde586ddc4df2090abf88cfe09df17d7db846998995c3f84983bd37d48f8e SHA512 a6743829d4ed03032af55e2967d787c3bdc675dda849b8874868cd536551a32d199ee7e499556962c7520a8d9ceaf7d81177436cec82eddd8df3ded405c61897
-MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
+MISC metadata.xml 240 BLAKE2B 20c22d2d446cfcd6f2f430f2c444cd6d854d840e5161f595e4f738096d38db01c8cd305870b26623e98d8bbba239260975a53802caf4b678d1fe61a146aa660f SHA512 1af3286c63a60e89c2f87bd060eebb279858f4b21f9daedf4edcacd5906f35ddd6271397806771d6de1853cae1f3ecdd00ee6e05718fd7083ebc039e5cfa4832
diff --git a/x11-plugins/gkrellm-plugins/metadata.xml b/x11-plugins/gkrellm-plugins/metadata.xml
index 85e4ed814fa2..641cbd3703e7 100644
--- a/x11-plugins/gkrellm-plugins/metadata.xml
+++ b/x11-plugins/gkrellm-plugins/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>sam@gentoo.org</email>
+		<name>Sam James</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/x11-plugins/gkrellm-radio/Manifest b/x11-plugins/gkrellm-radio/Manifest
index cc5402d8b2fa..cc4f72585809 100644
--- a/x11-plugins/gkrellm-radio/Manifest
+++ b/x11-plugins/gkrellm-radio/Manifest
@@ -1,5 +1,7 @@
+AUX gkrellm-radio-2.0.4-Use-standard-int-types.patch 4176 BLAKE2B f502c5fb0eb2a2bcc413109d5145868cc335b4cfab6a9b6c478c03498f11862a4d358a881409c2ac669f2f31188ebcecdf3437d113ce81413533d2899402279a SHA512 7ca04b3b4c5bdea6ad2865b96a75584a0629e96f324a2caee57b9b9a86d66ddb8a78c3437c0068e30c0664461a221fdd0a234fccf99d24bff26c05cd81057035
 AUX gkrellm-radio-2.0.4-makefile.patch 482 BLAKE2B bc4ec0fb4ac7403ae2200808a956ce01015d713f5064eb8d25e0357606bb6ae4f01d7e12eb390e6a15423f5953547ec447b3e8592f5f8b25e42fe9d115cd1e25 SHA512 12552a5b551a5f335105d9bad9e946571250d6b0dcf868d9b39d68739112ad8ade75471c9f4bb3c18381913bd5658d7dd654aa0c721d6ae5c77e124bb277d6c5
 AUX gkrellm-radio-2.0.4-r1-pkgconfig.patch 578 BLAKE2B 413c85c649fb5e6bc2de13930fdf73a122cc6edce40681d0fdaa8abb6df0038dde448a7f149936070c17ffd39ce2f4946417739b686836d15d6914e1b745b8bc SHA512 c5b31868595d8adcc8992afe439a7805557dd9e0322d653a9c2dac7b4e9134efc96e17bc802cd8c4bd0cea2f803d6d899491db0b24dffb06474b7beabbf1fad7
 DIST gkrellm-radio-2.0.4.tar.gz 15685 BLAKE2B c23d9627e503f0853bfd403cbb17c5550cc572540f1e7544179a57501e5793fe19aa654d2b622d34aa68765d89cbc45810b0fececbe9e9a0cfe810795b918406 SHA512 0e5de0cc114c915dcc78f3588766a0a6d9c7bd75da5626fbf7959e539c1f505babc94a0054cceb5a67c8145174d49adb331eefae69ba1637c9121ebd630998de
 EBUILD gkrellm-radio-2.0.4-r1.ebuild 770 BLAKE2B 9bc5ef68102a630488977ec8daba00922641c152a39b3c35da3adc0cebdc31d0b8885555ebd64366858fb8dadd9cd231db91dada7b079128e7ec9b74dca33097 SHA512 ccf439c6e37d029c135ec6914cb7f715d9d6ce443b71806341e1cc7eddb7b6299ed75d20a37a184c3e48d609ba36e22d31c77b47974d8c3ec535bad744e33062
-MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
+EBUILD gkrellm-radio-2.0.4-r2.ebuild 821 BLAKE2B b7cbbc6ee0b94e0a83b98da9f1c2d114b8fafd63142289a0df8400e81a7e26dc57e976b4fdc5747b1ba365ef26ddac54cd0e805620cc79e026dce03681ea7d3b SHA512 252d190d153e5f2401d97d75469993f55761464ebda5964bba2ef132f02a5894f0935ac3e4edb6c83d11c0a1449e4d8632b44427b93a2e704103034d1e2c9558
+MISC metadata.xml 240 BLAKE2B 20c22d2d446cfcd6f2f430f2c444cd6d854d840e5161f595e4f738096d38db01c8cd305870b26623e98d8bbba239260975a53802caf4b678d1fe61a146aa660f SHA512 1af3286c63a60e89c2f87bd060eebb279858f4b21f9daedf4edcacd5906f35ddd6271397806771d6de1853cae1f3ecdd00ee6e05718fd7083ebc039e5cfa4832
diff --git a/x11-plugins/gkrellm-radio/files/gkrellm-radio-2.0.4-Use-standard-int-types.patch b/x11-plugins/gkrellm-radio/files/gkrellm-radio-2.0.4-Use-standard-int-types.patch
new file mode 100644
index 000000000000..ed29ace772fa
--- /dev/null
+++ b/x11-plugins/gkrellm-radio/files/gkrellm-radio-2.0.4-Use-standard-int-types.patch
@@ -0,0 +1,152 @@
+From 6cbfd2d76c5c48913c29bf1b27e0fdadba508a7a Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Fri, 3 Feb 2023 09:53:57 +0000
+Subject: [PATCH] Use standard int types
+
+Bug: https://bugs.gentoo.org/833164
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/videodev.h
++++ b/videodev.h
+@@ -1,6 +1,7 @@
+ #ifndef __LINUX_VIDEODEV_H
+ #define __LINUX_VIDEODEV_H
+ 
++#include <stdint.h>
+ #include <linux/types.h>
+ 
+ #ifdef __KERNEL__
+@@ -73,44 +74,44 @@ struct video_channel
+ 	int channel;
+ 	char name[32];
+ 	int tuners;
+-	__u32  flags;
++	uint32_t  flags;
+ #define VIDEO_VC_TUNER		1	/* Channel has a tuner */
+ #define VIDEO_VC_AUDIO		2	/* Channel has audio */
+-	__u16  type;
++	uint16_t  type;
+ #define VIDEO_TYPE_TV		1
+ #define VIDEO_TYPE_CAMERA	2	
+-	__u16 norm;			/* Norm set by channel */
++	uint16_t norm;			/* Norm set by channel */
+ };
+ 
+ struct video_tuner
+ {
+ 	int tuner;
+ 	char name[32];
+-	ulong rangelow, rangehigh;	/* Tuner range */
+-	__u32 flags;
++	unsigned long rangelow, rangehigh;	/* Tuner range */
++	uint32_t flags;
+ #define VIDEO_TUNER_PAL		1
+ #define VIDEO_TUNER_NTSC	2
+ #define VIDEO_TUNER_SECAM	4
+ #define VIDEO_TUNER_LOW		8	/* Uses KHz not MHz */
+ #define VIDEO_TUNER_NORM	16	/* Tuner can set norm */
+ #define VIDEO_TUNER_STEREO_ON	128	/* Tuner is seeing stereo */
+-	__u16 mode;			/* PAL/NTSC/SECAM/OTHER */
++	uint16_t mode;			/* PAL/NTSC/SECAM/OTHER */
+ #define VIDEO_MODE_PAL		0
+ #define VIDEO_MODE_NTSC		1
+ #define VIDEO_MODE_SECAM	2
+ #define VIDEO_MODE_AUTO		3
+-	__u16 signal;			/* Signal strength 16bit scale */
++	uint16_t signal;			/* Signal strength 16bit scale */
+ };
+ 
+ struct video_picture
+ {
+-	__u16	brightness;
+-	__u16	hue;
+-	__u16	colour;
+-	__u16	contrast;
+-	__u16	whiteness;	/* Black and white only */
+-	__u16	depth;		/* Capture depth */
+-	__u16   palette;	/* Palette in use */
++	uint16_t	brightness;
++	uint16_t	hue;
++	uint16_t	colour;
++	uint16_t	contrast;
++	uint16_t	whiteness;	/* Black and white only */
++	uint16_t	depth;		/* Capture depth */
++	uint16_t   palette;	/* Palette in use */
+ #define VIDEO_PALETTE_GREY	1	/* Linear greyscale */
+ #define VIDEO_PALETTE_HI240	2	/* High 240 cube (BT848) */
+ #define VIDEO_PALETTE_RGB565	3	/* 565 16 bit RGB */
+@@ -134,9 +135,9 @@ struct video_picture
+ struct video_audio
+ {
+ 	int	audio;		/* Audio channel */
+-	__u16	volume;		/* If settable */
+-	__u16	bass, treble;
+-	__u32	flags;
++	uint16_t	volume;		/* If settable */
++	uint16_t	bass, treble;
++	uint32_t	flags;
+ #define VIDEO_AUDIO_MUTE	1
+ #define VIDEO_AUDIO_MUTABLE	2
+ #define VIDEO_AUDIO_VOLUME	4
+@@ -147,24 +148,24 @@ struct video_audio
+ #define VIDEO_SOUND_STEREO	2
+ #define VIDEO_SOUND_LANG1	4
+ #define VIDEO_SOUND_LANG2	8
+-        __u16   mode;		/* detected audio carriers or one to set */
+-        __u16	balance;	/* Stereo balance */
+-        __u16	step;		/* Step actual volume uses */
++        uint16_t   mode;		/* detected audio carriers or one to set */
++        uint16_t	balance;	/* Stereo balance */
++        uint16_t	step;		/* Step actual volume uses */
+ };
+ 
+ struct video_clip
+ {
+-	__s32	x,y;
+-	__s32	width, height;
++	int32_t	x,y;
++	int32_t	width, height;
+ 	struct	video_clip *next;	/* For user use/driver use only */
+ };
+ 
+ struct video_window
+ {
+-	__u32	x,y;			/* Position of window */
+-	__u32	width,height;		/* Its size */
+-	__u32	chromakey;
+-	__u32	flags;
++	uint32_t	x,y;			/* Position of window */
++	uint32_t	width,height;		/* Its size */
++	uint32_t	chromakey;
++	uint32_t	flags;
+ 	struct	video_clip *clips;	/* Set only */
+ 	int	clipcount;
+ #define VIDEO_WINDOW_INTERLACE	1
+@@ -175,10 +176,10 @@ struct video_window
+ 
+ struct video_capture
+ {
+-	__u32 	x,y;			/* Offsets into image */
+-	__u32	width, height;		/* Area to capture */
+-	__u16	decimation;		/* Decimation divder */
+-	__u16	flags;			/* Flags for capture */
++	uint32_t 	x,y;			/* Offsets into image */
++	uint32_t	width, height;		/* Area to capture */
++	uint16_t	decimation;		/* Decimation divder */
++	uint16_t	flags;			/* Flags for capture */
+ #define VIDEO_CAPTURE_ODD		0	/* Temporal */
+ #define VIDEO_CAPTURE_EVEN		1
+ };
+@@ -200,8 +201,8 @@ struct video_mmap
+ 
+ struct video_key
+ {
+-	__u8	key[8];
+-	__u32	flags;
++	uint8_t	key[8];
++	uint32_t flags;
+ };
+ 
+ 
+-- 
+2.39.1
+
diff --git a/x11-plugins/gkrellm-radio/gkrellm-radio-2.0.4-r2.ebuild b/x11-plugins/gkrellm-radio/gkrellm-radio-2.0.4-r2.ebuild
new file mode 100644
index 000000000000..b2f7d13cf996
--- /dev/null
+++ b/x11-plugins/gkrellm-radio/gkrellm-radio-2.0.4-r2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gkrellm-plugin toolchain-funcs
+
+DESCRIPTION="A minimalistic GKrellM2 plugin to control radio tuners"
+HOMEPAGE="http://gkrellm.luon.net/gkrellm-radio.php"
+SRC_URI="http://gkrellm.luon.net/files/${P}.tar.gz"
+S="${WORKDIR}/${PN}"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="lirc"
+
+RDEPEND="
+	app-admin/gkrellm:2[X]
+	lirc? ( app-misc/lirc )"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-makefile.patch
+	"${FILESDIR}"/${P}-r1-pkgconfig.patch
+	"${FILESDIR}"/${P}-Use-standard-int-types.patch
+)
+
+src_configure() {
+	PLUGIN_SO=( radio$(get_modname) )
+	default
+}
+
+src_compile() {
+	use lirc && myconf="${myconf} WITH_LIRC=1"
+	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" ${myconf}
+}
diff --git a/x11-plugins/gkrellm-radio/metadata.xml b/x11-plugins/gkrellm-radio/metadata.xml
index 85e4ed814fa2..641cbd3703e7 100644
--- a/x11-plugins/gkrellm-radio/metadata.xml
+++ b/x11-plugins/gkrellm-radio/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>sam@gentoo.org</email>
+		<name>Sam James</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/x11-plugins/gkrellm-trayicons/Manifest b/x11-plugins/gkrellm-trayicons/Manifest
index a8badf68976b..780e0a98d5be 100644
--- a/x11-plugins/gkrellm-trayicons/Manifest
+++ b/x11-plugins/gkrellm-trayicons/Manifest
@@ -2,4 +2,4 @@ AUX gkrellm-trayicons-1.03-ldflags.patch 671 BLAKE2B da9dbdb827a300f6e01c4e5b112
 AUX gkrellm-trayicons-1.03-pkgconfig.patch 574 BLAKE2B 40208feccf98cba8682bfad297117a71d33ecfa613ba00c3a52233a6845dd5065c109c93ea5ff31e0c3dff51ace4eadef9e80fbe2d8f7b433771db84b3fc199e SHA512 87f246a1e8265ba8c8a33d9675fd91f8b1b18b5f299bc17e9dc6c7e9a062a8e7e542aac089faec7d6a671880cf0df054e102b5f49ca19bbde17ba837bfe17ca4
 DIST gkrellm-trayicons-1.03.tar.gz 185474 BLAKE2B b291c13785e7c42e3e14ef987b4c29f47d91f993653653215afb254415827c437be32aec55b2c1465a8c6de9f08bd575c4b394b1d72fa46f5573ff29b57fe31f SHA512 2f80c7b18453b3cd9694dbd9854ab88fa94f4b4de52e779bc2fb7c13633deec096d0ed0146da3d52567569df9466aa64512f870b6e142a784779444a3e6a4a4b
 EBUILD gkrellm-trayicons-1.03-r2.ebuild 669 BLAKE2B cb20ad846e87e95ccc2f4005c091f7ebf8374bb11eeaaa3233531a24c8288379d96d162befc34ce4dd338814a68b1a685e59111c0f8228ff16aa0bb1e5c60f97 SHA512 06de2d29311126000dea31bacf8d557213c2c2ce44e60a54f4629bbf841f0e36204c231bdf7b49c7872fd0ab8e1ca5a0d01faf55ab06083ddb497d53c16f27d9
-MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
+MISC metadata.xml 240 BLAKE2B 20c22d2d446cfcd6f2f430f2c444cd6d854d840e5161f595e4f738096d38db01c8cd305870b26623e98d8bbba239260975a53802caf4b678d1fe61a146aa660f SHA512 1af3286c63a60e89c2f87bd060eebb279858f4b21f9daedf4edcacd5906f35ddd6271397806771d6de1853cae1f3ecdd00ee6e05718fd7083ebc039e5cfa4832
diff --git a/x11-plugins/gkrellm-trayicons/metadata.xml b/x11-plugins/gkrellm-trayicons/metadata.xml
index 85e4ed814fa2..641cbd3703e7 100644
--- a/x11-plugins/gkrellm-trayicons/metadata.xml
+++ b/x11-plugins/gkrellm-trayicons/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>sam@gentoo.org</email>
+		<name>Sam James</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/x11-plugins/gkrellm-vaiobright/Manifest b/x11-plugins/gkrellm-vaiobright/Manifest
index bef809b5866b..d74d2dc5f690 100644
--- a/x11-plugins/gkrellm-vaiobright/Manifest
+++ b/x11-plugins/gkrellm-vaiobright/Manifest
@@ -1,5 +1,8 @@
+AUX gkrellm-vaiobright-2.5-Fix-Wreturn-type.patch 630 BLAKE2B fdd1562d952d8b75640021788d31d293c7476a84f9518774584e476813966f379504bfb5da544b287455076cda0157bf5fc075232c47f65878a1a017147b2729 SHA512 d999bbf54b94a086a94ff602eb857e9d6a43daacd3ff09c8d45cf73b6f669dab97f704fb88ad2b750df72269674194588df58b2bd98f945acda8ab33eca4d52b
+AUX gkrellm-vaiobright-2.5-Use-standard-int-types.patch 1427 BLAKE2B d05312a2f8a279d548682ad173dc2179f4649ca438f163b4674e0a373febc35a4452b7f38804d9d558e92acba558b7f04f610dd39e63146ad7831f6f71cd3fd6 SHA512 7f05684670055d0aac074fe491d65754b99724d5c788ddc4569b197bba5d3db9951006b4ff7642237f924ec0f1dedf065ff006b187fbe53f9b778b6d4837714f
 AUX gkrellm-vaiobright-2.5-fixinfo.patch 1428 BLAKE2B 268b0f1f335941be1d9b943f9f3412d1884cd4f82ce27b3ba899e6c2cd925c7a81b60c23df1f45a0ee34ae275151260f3d0640cf3220be22e635105114d8f3d3 SHA512 240b8876afbd843d47b6327fc8cffff639939182a9e1e18ce251ec3c905b1a14d063ebe6a02fef72887daeb24cd8c9d128e63cf2aecbad586182d3ccd54bad8b
 AUX gkrellm-vaiobright-2.5-textrel.patch 956 BLAKE2B 9016fef53211827fd6e2ba4aed4572bd6ad070e3c27035ee4e03e33795aaddee4893ab32d6e0cf3f1a1412a9fbd77c46352ab325c09fb3888e501bd4d8251466 SHA512 957bf1ef6fb8658c91886d495cae9f8ca9c40d7a61e0c54b9c93d0bc3bc8b62b4e37130ad548b59b4d89442442eb880dd0a915ae73f449c0c7d0f0c148d09f02
 DIST vaiobright-2.5.tar.gz 6178 BLAKE2B ed7add9147db7676e66cd51eee89e60a071896aeb33d1246b45918c2d63bf1b3cb074cb85b404a411e1cf93ffc244b8847b888a4b2f89957e282d4d41757fc0e SHA512 e58b74fe5dedd8ccc69cbcadf4b273aeb0e52fb2619e148121f79c53e41dcbff36e6ddf748b0c24a33e26c6d84ec84cf5e2cfa4d655443b9fe03d6e0150b5c3d
 EBUILD gkrellm-vaiobright-2.5-r3.ebuild 673 BLAKE2B 2dd117add6422035ccce79845f6797125b178ea97bd20856b3c8c3d44fdac9096636381830ce10eb44a95f66dab9dd9dc3fc853abb272e288067ae73c9c14643 SHA512 6939d3ad7c37f6963023fdb22d98c80882ddcf68eb060c1e5fcf2c452f3df7a44f63f2c4d20e038a32658b1dbd1fa049b0c3923f45be0add93099f88f899a70f
-MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
+EBUILD gkrellm-vaiobright-2.5-r4.ebuild 766 BLAKE2B 5b683b558ad1757650ea61e1f8a99471e50442bee7d354c10cd3b2d5d5d4876e41a65a7ee51b46e07cd997b58ab02459239ced24d323030c4ad00f06b80e277d SHA512 361e136c3eeb1d71e0cc7bcebb09514594973a5f0e895aed679289d39736885972b3d66e93de07d753a7c6ec6ca80b87ca47c46b6aa17f4d7d0dfebc6671e085
+MISC metadata.xml 240 BLAKE2B 20c22d2d446cfcd6f2f430f2c444cd6d854d840e5161f595e4f738096d38db01c8cd305870b26623e98d8bbba239260975a53802caf4b678d1fe61a146aa660f SHA512 1af3286c63a60e89c2f87bd060eebb279858f4b21f9daedf4edcacd5906f35ddd6271397806771d6de1853cae1f3ecdd00ee6e05718fd7083ebc039e5cfa4832
diff --git a/x11-plugins/gkrellm-vaiobright/files/gkrellm-vaiobright-2.5-Fix-Wreturn-type.patch b/x11-plugins/gkrellm-vaiobright/files/gkrellm-vaiobright-2.5-Fix-Wreturn-type.patch
new file mode 100644
index 000000000000..992f3b66b1b8
--- /dev/null
+++ b/x11-plugins/gkrellm-vaiobright/files/gkrellm-vaiobright-2.5-Fix-Wreturn-type.patch
@@ -0,0 +1,22 @@
+https://bugs.gentoo.org/742902
+
+From 5312ab56edcc721529af6520c9ecccaa20af4cdc Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Fri, 3 Feb 2023 09:46:55 +0000
+Subject: [PATCH 1/2] Fix -Wreturn-type
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/vaiobright.c
++++ b/vaiobright.c
+@@ -110,7 +110,7 @@ static int vaiobright_get_brightness() {
+     // If we're broken, try again to open it
+     if (vaiobright_bslider->broken == 1) {
+         if (vaiobright_open_device() == -1)
+-            return;
++            return -1;
+     }
+ 
+     if (ioctl(vaiobright_bslider->sony_fd, SONYPI_IOCGBRT, &value) < 0) {
+-- 
+2.39.1
+
diff --git a/x11-plugins/gkrellm-vaiobright/files/gkrellm-vaiobright-2.5-Use-standard-int-types.patch b/x11-plugins/gkrellm-vaiobright/files/gkrellm-vaiobright-2.5-Use-standard-int-types.patch
new file mode 100644
index 000000000000..cec38819ff3f
--- /dev/null
+++ b/x11-plugins/gkrellm-vaiobright/files/gkrellm-vaiobright-2.5-Use-standard-int-types.patch
@@ -0,0 +1,48 @@
+From ab824d40f56e3c8037df77a15114de6bd0a332e0 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Fri, 3 Feb 2023 09:48:01 +0000
+Subject: [PATCH 2/2] Use standard int types
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/vaiobright.c
++++ b/vaiobright.c
+@@ -15,6 +15,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <stdint.h>
+ #include <fcntl.h>
+ #include <unistd.h>
+ #include <sys/ioctl.h>
+@@ -24,8 +25,8 @@
+ #include <linux/types.h>
+ 
+ // Define our ioctl's (stolen from spicctrl)
+-#define SONYPI_IOCGBRT _IOR('v', 0, __u8)
+-#define SONYPI_IOCSBRT _IOW('v', 0, __u8)
++#define SONYPI_IOCGBRT _IOR('v', 0, uint8_t)
++#define SONYPI_IOCSBRT _IOW('v', 0, uint8_t)
+ 
+ static void create_vaiobright_plug_config(GtkWidget *tab);
+ static void load_vaiobright_plug_config(gchar *arg);
+@@ -88,7 +89,7 @@ static void vaiobright_close_device(void) {
+ 
+ // Write a new brightness level out to the control application
+ static void vaiobright_set_brightness(int level) {
+-    __u8 value = (__u8) level;
++    uint8_t value = (uint8_t) level;
+ 
+     // If we're broken, try again to open it
+     if (vaiobright_bslider->broken == 1) {
+@@ -105,7 +106,7 @@ static void vaiobright_set_brightness(int level) {
+ }
+ 
+ static int vaiobright_get_brightness() {
+-    __u8 value = 0;
++    uint8_t value = 0;
+ 
+     // If we're broken, try again to open it
+     if (vaiobright_bslider->broken == 1) {
+-- 
+2.39.1
+
diff --git a/x11-plugins/gkrellm-vaiobright/gkrellm-vaiobright-2.5-r4.ebuild b/x11-plugins/gkrellm-vaiobright/gkrellm-vaiobright-2.5-r4.ebuild
new file mode 100644
index 000000000000..d6693add74ee
--- /dev/null
+++ b/x11-plugins/gkrellm-vaiobright/gkrellm-vaiobright-2.5-r4.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gkrellm-plugin toolchain-funcs
+
+MY_P=${P/gkrellm-/}
+
+DESCRIPTION="Superslim VAIO LCD Brightness Control Plugin for Gkrellm"
+SRC_URI="http://nerv-un.net/~dragorn/code/${MY_P}.tar.gz"
+HOMEPAGE="http://nerv-un.net/~dragorn/"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="app-admin/gkrellm:2[X]"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-textrel.patch
+	"${FILESDIR}"/${P}-fixinfo.patch
+	"${FILESDIR}"/${P}-Fix-Wreturn-type.patch
+	"${FILESDIR}"/${P}-Use-standard-int-types.patch
+)
+
+src_configure() {
+	tc-export CC PKG_CONFIG
+
+	PLUGIN_SO=( vaiobright$(get_modname) )
+	default
+}
diff --git a/x11-plugins/gkrellm-vaiobright/metadata.xml b/x11-plugins/gkrellm-vaiobright/metadata.xml
index 85e4ed814fa2..641cbd3703e7 100644
--- a/x11-plugins/gkrellm-vaiobright/metadata.xml
+++ b/x11-plugins/gkrellm-vaiobright/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>sam@gentoo.org</email>
+		<name>Sam James</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/x11-plugins/gkrellm-volume/Manifest b/x11-plugins/gkrellm-volume/Manifest
index 40d6fabb89a8..5de7bb3cf9b8 100644
--- a/x11-plugins/gkrellm-volume/Manifest
+++ b/x11-plugins/gkrellm-volume/Manifest
@@ -3,4 +3,4 @@ AUX gkrellm-volume-2.1.13-r3-pkgconfig.patch 744 BLAKE2B 3ef577e7a47fdcee80a54f8
 AUX gkrellm-volume-2.1.13-reenable.patch 400 BLAKE2B bdbc390634eee460484f2c87624d375ee9f1d6cee94781982ab5360a3e2917e611be6e923cbefa935d999445706020e74e190aa260b2371f65a73ee5d17d4c80 SHA512 4a78e7124bf2ed8ea192c71a74b29939a99337766a71f3517f4c245ab0c970781c7bc2e7e3016f2d5d72cafc8913f1efdcb1fd33b86178967c504186a7f2e66a
 DIST gkrellm-volume-2.1.13.tar.gz 42087 BLAKE2B fa4641a9a618ad341c81069231e7edb69390b82f2959f416d1f2c9cb757fd554a942c8e002330af06cca9a53b01525b17a2e913a86bd7a53d3875e43a95c8c5d SHA512 4f244978ea8b68994540b050244350c7c2389b227541822fde009408378ce0511c32956daea205465a4c4890c68e47f64dcd8b3eca8901963d38fd1852526eb5
 EBUILD gkrellm-volume-2.1.13-r3.ebuild 839 BLAKE2B f9cea61f732a903c6bad939d421601971a510a07d327d4ae9ddffe9900be9ccc8a05b7d1e17625f9367bad897854ac3bdf51e780eb315ae993f72475b4a830c8 SHA512 82a3c5208a0a0ca43a47d377ca615d79d93b5a8b65344bd849b6c7c4790e2bbbb9a3d4c887e9dfab1bbd843ed1181274e82a83f7e69539c857a3c90a63ac7942
-MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
+MISC metadata.xml 240 BLAKE2B 20c22d2d446cfcd6f2f430f2c444cd6d854d840e5161f595e4f738096d38db01c8cd305870b26623e98d8bbba239260975a53802caf4b678d1fe61a146aa660f SHA512 1af3286c63a60e89c2f87bd060eebb279858f4b21f9daedf4edcacd5906f35ddd6271397806771d6de1853cae1f3ecdd00ee6e05718fd7083ebc039e5cfa4832
diff --git a/x11-plugins/gkrellm-volume/metadata.xml b/x11-plugins/gkrellm-volume/metadata.xml
index 85e4ed814fa2..641cbd3703e7 100644
--- a/x11-plugins/gkrellm-volume/metadata.xml
+++ b/x11-plugins/gkrellm-volume/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>sam@gentoo.org</email>
+		<name>Sam James</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/x11-plugins/gkrellm-xkb/Manifest b/x11-plugins/gkrellm-xkb/Manifest
index b5e3c22e99d7..a0e0deac537a 100644
--- a/x11-plugins/gkrellm-xkb/Manifest
+++ b/x11-plugins/gkrellm-xkb/Manifest
@@ -2,4 +2,4 @@ AUX gkrellm-xkb-1.05-r2-pkgconfig.patch 684 BLAKE2B d1be352c6293e1055a1d108cc10b
 AUX gkrellm-xkb-makefile.patch 958 BLAKE2B 9469ebdef0db9ec9f9cb0172b437bd53505ee44f46fba05108e5d91c4ee6ebf760cd4358be74e12e58b3ce9399537d5a3d45bf7d77f7db5582d9148f6ea8d279 SHA512 ea72f29b709bddf68e84347d4d65af99b5de71d548a0ef2c96c18ec4e04fb4bea57090edcdda3613cf77886b1e5c8fbc382c4ed004fd511b2f90c2b4ae9372d7
 DIST gkrellm-xkb-1.05.tar.gz 37775 BLAKE2B 5b074d2777c250d1f7aeca4402401f36f7aed29ca2c7bf286348e73687b85f53b152b4cdb862c38ff7325a718dc694c0a921e8ec3ecefb52ad6646e1345a2101 SHA512 451c66c875af8dcb6998ba1b6242332002328b81112315cd6eee453612cbd8e23f78d7b829224d623cee90b08445b721dfd60e2483a710f4f97860c82654ba2e
 EBUILD gkrellm-xkb-1.05-r2.ebuild 675 BLAKE2B 4f123b3f914026e6f530ab0dc92232b9e89996d14ec2cc4418410fd231cc95cd34cc6abf915fed402c3d411a12f65ce71c4892bf06b71a56c8ef2689d5432e03 SHA512 4f2516e75db70d7fb2b62b2a46404e8b192887688d38cd149ddfd4443f57fb83cf30e9fe582e3f6fe4ec7bc1312466b44009356888949cce5c9d4aa8a0d770bc
-MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
+MISC metadata.xml 240 BLAKE2B 20c22d2d446cfcd6f2f430f2c444cd6d854d840e5161f595e4f738096d38db01c8cd305870b26623e98d8bbba239260975a53802caf4b678d1fe61a146aa660f SHA512 1af3286c63a60e89c2f87bd060eebb279858f4b21f9daedf4edcacd5906f35ddd6271397806771d6de1853cae1f3ecdd00ee6e05718fd7083ebc039e5cfa4832
diff --git a/x11-plugins/gkrellm-xkb/metadata.xml b/x11-plugins/gkrellm-xkb/metadata.xml
index 85e4ed814fa2..641cbd3703e7 100644
--- a/x11-plugins/gkrellm-xkb/metadata.xml
+++ b/x11-plugins/gkrellm-xkb/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>sam@gentoo.org</email>
+		<name>Sam James</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/x11-plugins/gkrellmlaunch/Manifest b/x11-plugins/gkrellmlaunch/Manifest
index 5d9ff8857ce8..9b381c389df7 100644
--- a/x11-plugins/gkrellmlaunch/Manifest
+++ b/x11-plugins/gkrellmlaunch/Manifest
@@ -2,4 +2,4 @@ AUX gkrellmlaunch-0.5-makefile.patch 736 BLAKE2B fef75b45fe35864a6d39c7c521c270d
 AUX gkrellmlaunch-0.5-r1-pkgconfig.patch 522 BLAKE2B 58131e54d657a6d96cad835b78a6e788e1f74e7cae974f94b4eb5f257a11989228facacd992e8c8a8f9ca528635e9a42ba41a9fe890bb570892812a830f79866 SHA512 a4daf4967d6124b542e1d9be435791dedc8f7c8263b85882d3a0971e0852c238d4d492df08dd4fd7824a4a163cd9c2b52ae248176ab6c049cc9aeb6927f2eda3
 DIST gkrellmlaunch-0.5.tar.gz 22035 BLAKE2B 444dbd76c4bba420d7bd9977f2ce25b9d0260168ea6a730d1fd009eaa0ea064804028c2103efee3afe58b928d858475886fd90c6d77e5a03b3c97ab8bd8c79d2 SHA512 be3a6df6a1648a61103d389dcea24454a142d64b1192156787b42546c485ed592dca916394e46bc0413110a90fa1f4e952fef077e9014274e74610efe8573693
 EBUILD gkrellmlaunch-0.5-r1.ebuild 632 BLAKE2B c772ee402398cc4c75781b74a0b796211c07e2d8ca1fd22a62aa477171a83311b236da3c8f1c8b36c0ff8924cd40b698ac5870f714da161008f4aaa188c9104a SHA512 ad92d830989cf0ab8e12ec09ad5c5612a91388e279267cbcbe8d888c421e75916cd4146e16aad6d9097e8c7925f9a22e162c1aaf27f1f5df29d49aae5270211b
-MISC metadata.xml 251 BLAKE2B 09c88cd076345aaa3b80d5c3ddbccfce98bb684204d4aea0ee36216077a36ffb2027dd0ec5f9e9cb5a54578aec14245bd882d971e3742f3e95b3af747984811a SHA512 24ce090eda7993b4d5b28108664752950ee5db54e2628f43b8f73df213b593f8fdd6989fee948d104ff21d3cb332da5a770c793cbe40eb4ec48a56f238489d77
+MISC metadata.xml 323 BLAKE2B a9ee4f2fa6a746902a87992d83b580e30061fd1873a3fcf26ef528e2b0bc6d43bb4a828659bad05086a8d3c8e6538473fba8b49ef2cb860250717ce5913be096 SHA512 67937f0bb1bc851061fb0027cdd3282b4fbd83efa58a3742a3da6f4cb878549aa17d21ccfdfeb38c8223b92d6b71792a401109b09cb91edcd0e7002546d60325
diff --git a/x11-plugins/gkrellmlaunch/metadata.xml b/x11-plugins/gkrellmlaunch/metadata.xml
index 0ee768f19d61..93ae15130bfa 100644
--- a/x11-plugins/gkrellmlaunch/metadata.xml
+++ b/x11-plugins/gkrellmlaunch/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>sam@gentoo.org</email>
+		<name>Sam James</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">gkrellmlaunch</remote-id>
 	</upstream>
diff --git a/x11-plugins/gkrellmoon/Manifest b/x11-plugins/gkrellmoon/Manifest
index ce0b2f57d278..fd550585ef1a 100644
--- a/x11-plugins/gkrellmoon/Manifest
+++ b/x11-plugins/gkrellmoon/Manifest
@@ -3,4 +3,4 @@ AUX gkrellmoon-0.6-r3-include-stringh.patch 215 BLAKE2B cf7aa48b23f2196828b4e0d2
 AUX gkrellmoon-0.6-r3-pkgconfig.patch 343 BLAKE2B 9dd91d5211957afa35070754e395ffd1efcfda5bb3631eeecb03f0bb6ced9de4f41d6938bedd8a1036502cb9fec38228e1a466e94f35997b39bae13f97cc49d4 SHA512 158a50c8569fbc012e7395b3858905563c258b0009666b4a7abb78d36cc5e4949ce6d97a10a01c4bc74fdaba4c095a819a750a0833350511a033a5b2fd285ea4
 DIST gkrellmoon-0.6.tar.gz 55035 BLAKE2B 1b72ffbb3f08bc7264d86cb1ff76ec65d79a5552c4857758ea5caffa8023fc1be4ff9fdfcc812ac48284af66c97fd4e4c6e3c19c0725cb422664621e3bd3a40b SHA512 d0f1008b4501c412817168f751c1d948dc4fdda97572a85c950c7595dfdb0466be964a04ccd8eb31b1bfd83709607fe6cb422ec15d144ef8615dd9700adf127d
 EBUILD gkrellmoon-0.6-r3.ebuild 705 BLAKE2B 040e5062b6cf5abfae39aa80ea1edfa9d83359554bb1b31b4c8fe52074f06267e86e158e493d68dbd107b124cfe43d8664fac895541a3bcfdfc6e8bc65104952 SHA512 cfbc1b981cd8a07ddad6f0bfec65eef42dc7fa7732f0232a082ee42929aeaa0878f06792806f9d46547fa9b55086aa7723af946cc364f1a8063acd74fb91de3c
-MISC metadata.xml 248 BLAKE2B 8dab82a6d0236055e054f2bc7f36caea9e7b113b0aab998e374681ebd8ad271bdc8588c4ad5bf11eb413e0984cb7cff7633c821bbfd2a6fbf25822f2ed9e5ac7 SHA512 a473fc9e669adb26f81e0223e6849d9afd5fcb0561ed81b6576d7b330184b6d2a1a92e32208155d8c405ae7f8eedf887e007b2fdb010ffe9011665cad26489c2
+MISC metadata.xml 320 BLAKE2B 6155c807ff93b632226a489579f7a68d8b862e095c3f6f90a5a2bd18b7b94213e49006069f3c28e34fc5be0503916b791b96d188658c003e3b3d953ab1c3cc36 SHA512 44ea781ad665761b0712ea08b13abefcbaa96179fa9ef001cf115e7bd890448bbb15f133238fe823ec0306455b663045ce181d728967ee9e28df54cd9b6a30c5
diff --git a/x11-plugins/gkrellmoon/metadata.xml b/x11-plugins/gkrellmoon/metadata.xml
index 7157545c0755..1eae391cc8de 100644
--- a/x11-plugins/gkrellmoon/metadata.xml
+++ b/x11-plugins/gkrellmoon/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>sam@gentoo.org</email>
+		<name>Sam James</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">gkrellmoon</remote-id>
 	</upstream>
diff --git a/x11-plugins/gkrellmss/Manifest b/x11-plugins/gkrellmss/Manifest
index ba0a8e3af1c6..6f611dac5e26 100644
--- a/x11-plugins/gkrellmss/Manifest
+++ b/x11-plugins/gkrellmss/Manifest
@@ -3,4 +3,4 @@ AUX gkrellmss-2.6-fno-common.patch 195 BLAKE2B eaf45029a236aa63ac216d3a2d6e7f848
 AUX gkrellmss-2.6-r5-configure-makefile-fixes.patch 1656 BLAKE2B 37e96fc95069e98b8cb50ee7724b1ce733051d7ca9a6e500f3de00277ce7af8739ace3b9f3364fbe0e2f578894e684c2029fc4d66ef3f9e1baf184bfaad07894 SHA512 8a25784b09b35055c1c46f6310b8d71d009c9b95998119d562db93c43e57bce76a7dbfc8fe810243cea632e6ea6f197825932b59fbde718f4001f1d20ebeb464
 DIST gkrellmss-2.6.tar.gz 32082 BLAKE2B 73164229fbbf08fc781bf697653be19a41b63df46ea7fc2aac230c74ad042809f2f33d199a08ccbe20cdb5610ab2350ee32ec2a09803bb71e367d21f18e752bb SHA512 d9773cfed6e4de006df32102419773f9af5047e3fb5e7aa4c7a686b4775c3af30c14321fe404aa65ec27eb13bcd849dbd25ef4eaa2daa723177040da05c74f76
 EBUILD gkrellmss-2.6-r5.ebuild 923 BLAKE2B ee16daea5ef569acbbde2225933229569d5293b629e15adcd7b737881b82083dac649057cd5423ebb6c2462ae413ead8ef3580a340aa9b538aec3fd3a94b5534 SHA512 9d10eff9c13ffc5514e44645819906f6eaea7b1081797ef8889bb0bc28ed27afc44e401a57fff91932cdbd06713475528ff63ece07160b4550b6d648d43b82e9
-MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
+MISC metadata.xml 240 BLAKE2B 20c22d2d446cfcd6f2f430f2c444cd6d854d840e5161f595e4f738096d38db01c8cd305870b26623e98d8bbba239260975a53802caf4b678d1fe61a146aa660f SHA512 1af3286c63a60e89c2f87bd060eebb279858f4b21f9daedf4edcacd5906f35ddd6271397806771d6de1853cae1f3ecdd00ee6e05718fd7083ebc039e5cfa4832
diff --git a/x11-plugins/gkrellmss/metadata.xml b/x11-plugins/gkrellmss/metadata.xml
index 85e4ed814fa2..641cbd3703e7 100644
--- a/x11-plugins/gkrellmss/metadata.xml
+++ b/x11-plugins/gkrellmss/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>sam@gentoo.org</email>
+		<name>Sam James</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/x11-plugins/gkrellmwireless/Manifest b/x11-plugins/gkrellmwireless/Manifest
index 6e22f5318bd4..123d27a790b4 100644
--- a/x11-plugins/gkrellmwireless/Manifest
+++ b/x11-plugins/gkrellmwireless/Manifest
@@ -2,4 +2,4 @@ AUX gkrellmwireless-2.0.3-fix-build-system.patch 581 BLAKE2B faba9c577d0bb7f7245
 AUX gkrellmwireless-2.0.3-r3-pkgconfig.patch 620 BLAKE2B e11fc16f5ebf8c27665f9a433bee03a1f68d6354e6aa7d547146c5a8e72ba054d79848ba5fdd776fdffdf9647c6652a5cc445f0aa8b29cdc9094d1515ef1fcfa SHA512 4bba4e34e18d4e6bef622c5718127b99e0ec336256b1720e12ec2bb4b35add76518dbbde829d1373d84faf262a38fe1a827be6afdd30ee8fef857b5bef0234ea
 DIST gkrellmwireless-2.0.3.tar.gz 9557 BLAKE2B 74ad963540597bddadc8a8e110ad441a2341a36b10f8620c392179909fe4582d973f51a4f0ffc2fc552ae1917e1c70373992a3801c9e1fec1f162194749e788c SHA512 7d005502bd65ea16f589f94fba38e67dffec69974177d4e7b83bf50d805e431d64a8cd0795f21547100487a9cb4ed7c01883514cb2d66165f0a7b8aa91162ab1
 EBUILD gkrellmwireless-2.0.3-r3.ebuild 701 BLAKE2B 98bb771b709359789ba3272d04831375bbc3d406e14102afd9d712e1bbd3ae69ba1d1ec2958ca2aff345a716638adf9904e8fa3241544786339cb653f219ddd2 SHA512 9a74d6d5b0ab64665b073d86aad85dc22fe8ca08b9288a742cac155931bc25a4915c00fa0410e80b0876d3ab0b8f574a85ea72fdda23ba51dfb08dc833887866
-MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
+MISC metadata.xml 240 BLAKE2B 20c22d2d446cfcd6f2f430f2c444cd6d854d840e5161f595e4f738096d38db01c8cd305870b26623e98d8bbba239260975a53802caf4b678d1fe61a146aa660f SHA512 1af3286c63a60e89c2f87bd060eebb279858f4b21f9daedf4edcacd5906f35ddd6271397806771d6de1853cae1f3ecdd00ee6e05718fd7083ebc039e5cfa4832
diff --git a/x11-plugins/gkrellmwireless/metadata.xml b/x11-plugins/gkrellmwireless/metadata.xml
index 85e4ed814fa2..641cbd3703e7 100644
--- a/x11-plugins/gkrellmwireless/metadata.xml
+++ b/x11-plugins/gkrellmwireless/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>sam@gentoo.org</email>
+		<name>Sam James</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/x11-plugins/gkrellshoot/Manifest b/x11-plugins/gkrellshoot/Manifest
index 628b098e58d1..670f18b715f6 100644
--- a/x11-plugins/gkrellshoot/Manifest
+++ b/x11-plugins/gkrellshoot/Manifest
@@ -3,4 +3,4 @@ AUX gkrellshoot-0.4.4-r5-fix-implicit-int.patch 435 BLAKE2B add22b30afd5d8c6859a
 AUX makefile-respect-flags.patch 591 BLAKE2B 1292c511830ce2d3cef2fa3946e079d6ddac51e01176f5df80577190153bb77d9a1780bfd0371b1deae5060194b4ecc3a8eb4ca49220f97e3f26428d8a3ff4f9 SHA512 b35f49b231aabd80905db10350aabea42b19e8691fc8dff10bf85f89833b6f562b6dad53f61113fae024d40ce12c652fd7c55979696fb8b87af230884d76f322
 DIST gkrellshoot-0.4.4.tar.gz 16556 BLAKE2B 417217ffa500d8b0cc4ddd80849b2da83e3e55bc489db83fd7c8992f42af9ebb385c1ece17cae65cb7393bffadaaffd70e11a4dea16aa4d2b2f19e0b828a6833 SHA512 9363c045a99c23f8fedf95ac82c7bab4ce21acb675fdabdd831f174d9816a14a22ed6d7048d475b4c4199b9e6a88f3f663702ac2f9304f08860339beb323322a
 EBUILD gkrellshoot-0.4.4-r5.ebuild 713 BLAKE2B 7d5f3a720b95a7becb5aabe1b8293170533fad741307b13d5ce71408b569cc2d09464d120a0371bc3b202f91dff11509a19ae83380c92aab5948d66eaa9434f0 SHA512 039444a6234681551ca983994303ab6bf676c37d33e1c93e9ce5312b4e64dad8d3759c73b5bfe329b880c92841109425e87e0507b821618c658edbcbde4243a7
-MISC metadata.xml 249 BLAKE2B 3035b160871880c8efce1239c00a3560c8c7b2b8eda5ebe8dab078c77496de9815444cdb9e7440687681828490e7684c2794406444eedf71fa380f5cd3c35b05 SHA512 01584093d9f32130ab091c0101ca41fba98d46fc3670c9598f052ef4393659bc8fc964d4b6232c7724eb7d0e03e32901b231799a595fa7f6626b3367dd116a68
+MISC metadata.xml 321 BLAKE2B 08f5cf5d1a256603c66eab2d0dba16b5d7f3ff773880676ca5d35cf26d332df8e870e5a0165f27cabee82df3f5f19832c2861bc9fa50cf63e647e42bbf60124f SHA512 e7a79a9cbcccece505e12817dfce2558dcfc543c4a23b0c51785ac51033428794fb0ef34481a3db982d58867891c83c73136843664e3bb989af46a9f0703878e
diff --git a/x11-plugins/gkrellshoot/metadata.xml b/x11-plugins/gkrellshoot/metadata.xml
index 3d7faef781c6..48af24755ee1 100644
--- a/x11-plugins/gkrellshoot/metadata.xml
+++ b/x11-plugins/gkrellshoot/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>sam@gentoo.org</email>
+		<name>Sam James</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">gkrellshoot</remote-id>
 	</upstream>
diff --git a/x11-plugins/gkrellstock/Manifest b/x11-plugins/gkrellstock/Manifest
index 37b501116922..f22eaaee8235 100644
--- a/x11-plugins/gkrellstock/Manifest
+++ b/x11-plugins/gkrellstock/Manifest
@@ -2,4 +2,4 @@ AUX gkrellstock-0.5-ldflags.patch 349 BLAKE2B c9e0f3f2a4a585816a8ac9ed216e6e27ae
 AUX gkrellstock-0.5.1-r2-makefile-fixes.patch 738 BLAKE2B 27138c0c06fb68afac1c9969cf622fea840306ae43d560473c8582c72ffa1ef6b8cde669c44f987632902019323b3b5f4cfc02f2b194ebbceb7e0d1f58e726cc SHA512 82296fe20ea73cf946ffab587045a8aa8f5786cdd95eec231ecc7dc4f677b9b9f15cfc19c76cbaa756658aa77335795cb731e2538c83529e7f4ea7a14afd862c
 DIST gkrellstock-0.5.1.tar.gz 22385 BLAKE2B c948651631aba700a23fd3ef6c74b564662383ee2bb69cf9ee8a3dad2f35d9e45ae6839f0c576aab0f0aa9eb296ba624bf3077ba2312a6b853bf7174fda6a25e SHA512 040e6271a0b0ca3f7be52cc64076a8d1b538fc7607a9ae54acf1c9dc176b094c1483b10c1813a929dcf47dff4fee8c18b7ca58472343c83edfa58a32edc7776c
 EBUILD gkrellstock-0.5.1-r2.ebuild 890 BLAKE2B 9a4d67636500d4e95ff945b6133f423ec39c2571715fa7b3e62952f08a32ad34f24c3ca95f6f5c09d6a107eae3c13548b56ac87ce9f37b837ea490531938cb11 SHA512 dd97679e7e38ed96d9b4daae4e576552f525553e01efd2da5af0db54d67fef5ba3faa949b36f76a64a2714cf8e263e554ed773b9c926bce2ec2f7a08e18da37c
-MISC metadata.xml 254 BLAKE2B 49d91c777a85789ee0f89df10065775aa549cb6ae181946d5afa17289f935e07588f77a5a3ab8d4b3c4dc561284f8261935d904b9311745e9dae2e1f7c5390ed SHA512 105c93e1064549cd25550fc7f33e6f21394ab5e9a3117835a5d0ec4ef502fb662f1fae81cda787aea39b5da43d9c3dd65138ab3c2e14ac398e41344e87b4c8e7
+MISC metadata.xml 321 BLAKE2B 344d86f2b61bf167a81d8a506864dc92bf071098f0e4d993c6120709d0c20f01097e47cab029ff886abafb658c36851d34d28eb0bd344928c7330b9b2aa6413b SHA512 95e86891cba2a60c4ae634b7d4202a11d69a4416578a70bc70eeb9b20000d8cbabc7b82b663ac18a9ad24d96a2da9ae7113ae32acc95d2f6c99a359fbf318a5c
diff --git a/x11-plugins/gkrellstock/metadata.xml b/x11-plugins/gkrellstock/metadata.xml
index 5ff88a6803d2..30a270e4cfe0 100644
--- a/x11-plugins/gkrellstock/metadata.xml
+++ b/x11-plugins/gkrellstock/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="sourceforge">gkrellstock</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>sam@gentoo.org</email>
+		<name>Sam James</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">gkrellstock</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-plugins/gkrellsun/Manifest b/x11-plugins/gkrellsun/Manifest
index 2970ed94770b..b5ecf59eab9b 100644
--- a/x11-plugins/gkrellsun/Manifest
+++ b/x11-plugins/gkrellsun/Manifest
@@ -3,4 +3,4 @@ AUX gkrellsun-1.0.0-r5-makefile-fixes.patch 1508 BLAKE2B 558c23011152de5e63dd223
 AUX gkrellsun-1.0.0-reenable.patch 439 BLAKE2B 39e7a365ceed5d355ac296910774495f0b725151011cbc8ac603f5d6773288b67de72307d314ba26d112d24f5654aa95a25c7b9f8e02e3bfad77eae6e8515a5e SHA512 a963b8aae820dc63eaac45f4fac4999ed2cd221392b89858f7a5418dfc435022e2d8116fe6d15e2a4f8e0f454ab8d9b92b013cf8a7420ce031049b58472c06c2
 DIST gkrellsun-1.0.0.tar.gz 96970 BLAKE2B aef5bed2a077c7dccb8573bafa9a14df53c52522872d77d08b6a8d29c824d3ef09c54ea5d0b6268dd502508fed264ebc250bd558a602e41dabddab9556158668 SHA512 1a34812e94f16d19311c23d44a0353dade50b802dd3ab115738959b9322c3bc6a28daa2bcea889700e6cc2ff8eb9400b989bf02c6f138bb878b94118ffd6e27a
 EBUILD gkrellsun-1.0.0-r5.ebuild 840 BLAKE2B 57000d9e534b6b040b84a414ac44a376fa48f98771339cf48c43a7c9e38be420da7a55cae62c9f8e6c16da007a98b86c56f8e458a31d9eea55ccb9c10de5ad08 SHA512 fe0fad9ca89f929337728196a1d6e7e108e0909d62404436ef9fd8be7fc386e7c08cf9710ac5e4a6ba6c7e431499dbf023558336d7942dca563ef9803f3b061e
-MISC metadata.xml 247 BLAKE2B 2a5e52fe46bb870c82fb6f16e032fca8d7ee30da5d39bc7deae966d57cbb8d79d2efa4b36da3c415e74cfd49a9e7553254fc9c575838c86f433a53283fe74254 SHA512 fe10588aacdd43055f05ef7a9fd5147056c5de9d813740995e152972185872b30a1781a5b7096085fac3eea6bd80a45cc1679904052dfc701a0885344a5ca599
+MISC metadata.xml 319 BLAKE2B f7f9ab91890d1f42c0afa8aa3bb536c0be1d7534ff46acb28daf4d95a28ee9a28fa0583a4e2377ca42aff1b634a920080adcb1f5e3903e4e8a54ceba7f8d754b SHA512 38c45bf665448760f5d0d28adaba75217d4dce2658c93a5b3b704e395c17eacb6d5c51034cb0a61b7ad6740b1e3f524911b0f5319391bf7211ea0c3d88ccbf6d
diff --git a/x11-plugins/gkrellsun/metadata.xml b/x11-plugins/gkrellsun/metadata.xml
index 58242da549d6..12ea6bc09219 100644
--- a/x11-plugins/gkrellsun/metadata.xml
+++ b/x11-plugins/gkrellsun/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>sam@gentoo.org</email>
+		<name>Sam James</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">gkrellsun</remote-id>
 	</upstream>
diff --git a/x11-plugins/gkrelltop/Manifest b/x11-plugins/gkrelltop/Manifest
index c77855813718..fdce5a00cea1 100644
--- a/x11-plugins/gkrelltop/Manifest
+++ b/x11-plugins/gkrelltop/Manifest
@@ -2,4 +2,4 @@ AUX gkrelltop-2.2.13-fix-build-system.patch 1088 BLAKE2B 8b8b00fde60ace4fc98848e
 AUX gkrelltop-2.2.13-r3-pkgconfig.patch 1928 BLAKE2B 6effe337609a99c41424127175f84b72b2190d1d464d8a08e0933a33dfcf13ad2132cd7e1b771eebdb75f2cecf597783c675134ae8b4c44812facfa68ee462d3 SHA512 4c113a990dcbac1be4e17cf76016d847bfad58e5308ae579849c0645d140bf350524b4d5722b2158ee9eaa6dd4b872601dd19d3c23541b9fc8a7d6f3431db2c8
 DIST gkrelltop_2.2.13.orig.tar.gz 49023 BLAKE2B d2857b6d73fca2a2933f4bcaa207dbf34f9bbc2bb9de922d564a865d2238b91d9bbcfbdf5753d7976d941d9ba98c9e7b81812018a2d9d1ac07984e26c3317382 SHA512 9479c5b860833671451b6fb8583e741b1ac755ed76b7e73dffd65d13d30d0b5da1916436901642f738e0d72f8c8696f4dea9c041a203e76d309f2782acf7024e
 EBUILD gkrelltop-2.2.13-r3.ebuild 1033 BLAKE2B 1badd5a8b37f4323ee7b9d33f49fc927301c25468876a0df20a3a10ca3caff38a8ad97b8554687644e141220c9549d155750c94856bc0b38c68c46103000affe SHA512 57fb73b4a65c452f91e99e3db6bd7ab84f9ff17853d6d03c8b22ecd38ccd5f1de05bf4666ebeb9e38bf2721da5034f342fc8cdd0c9305cdc69170129ae100314
-MISC metadata.xml 247 BLAKE2B 4c2928903af2aef15b40f59ae2cd005af84ac0552409301181fcededae0eedd5f7a7986106c9b25b25f6a170e18c9e5115ea14711a0639b351dac2cd6205bfbb SHA512 14c94ed4ec200fdcc265fbd2a1012c9cb143d98a6a28bfdad509c834a742803b1a62398034a36e4160b216f250f01292e642dc05621162008633e3ae4484faf1
+MISC metadata.xml 319 BLAKE2B 49600f406c7f1a8b22fcac19924da6e2a3f325880c3b9d00e309b00e281d8848d0932b3e4f334400a03402c6749f3a888dc0d2a3447adffe663e4c12a7c1472b SHA512 9cd4df48444e74054083566787c213b83dbdfacb00192b07e84506a69617613a4f2cb684f745d1b5441b9d443b21fabaad0f3568172fd3368b96cc75db330d68
diff --git a/x11-plugins/gkrelltop/metadata.xml b/x11-plugins/gkrelltop/metadata.xml
index 333a771b6259..c13add22299a 100644
--- a/x11-plugins/gkrelltop/metadata.xml
+++ b/x11-plugins/gkrelltop/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>sam@gentoo.org</email>
+		<name>Sam James</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">gkrelltop</remote-id>
 	</upstream>
diff --git a/x11-plugins/gkrellweather/Manifest b/x11-plugins/gkrellweather/Manifest
index bf7b04020b06..0614970a14bf 100644
--- a/x11-plugins/gkrellweather/Manifest
+++ b/x11-plugins/gkrellweather/Manifest
@@ -4,4 +4,4 @@ AUX gkrellweather-2.0.8-r2-makefile-fixes.patch 597 BLAKE2B 7f2f3a6718dce714203d
 AUX gkrellweather-2.0.8-update-locations.patch 456 BLAKE2B 191cfedaa84748e3f5bd33807d1845cb157c876ab00bb394d13919cbaf201b8c7a28f8fe5b41e141650f2d29faa40be5288bb7eb9be17b657f46415d25a8fe3a SHA512 64d1f1f939fc46537106fd8189d8d44ec427123bee20c10b9385d39389ad64e37b339ff484cf6c042ea932b529e0729479d9216f7e84acf59bdfe9e8bd8d5340
 DIST gkrellweather-2.0.8.tgz 20227 BLAKE2B 7c3fd369e323229359bc397e07b422b625a14038aff573cf7c3fd6218c733a1d69f5754dcb86ab2172a8a5ae08fbab022a87100a6422c5e8b3b3068e108fd9a7 SHA512 da9408ebc9518fe805d3f0dd9496b4aeb805a2ab6566b619b61fc25c91122c0ee45e2a7b804206b2ee08300309dd9b1e1c3b6605a41c594cf75fd39b58767264
 EBUILD gkrellweather-2.0.8-r2.ebuild 1074 BLAKE2B 338e37db6fbdc644b4144936ae17e63c7b53a9c235efb88de9088c8ffda62845515248ca7e78efeb902aa5c29e05ff4479d4ce4e1f651d6bec0e5a1401958626 SHA512 8a77fdebe5e9172a9e3e07fd202776551b77d0b6481ef698dc69753c30f46b70bf86c59725c705611a136f6105fea5798dc0aec7b3092e3f5c074b323681f6eb
-MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
+MISC metadata.xml 240 BLAKE2B 20c22d2d446cfcd6f2f430f2c444cd6d854d840e5161f595e4f738096d38db01c8cd305870b26623e98d8bbba239260975a53802caf4b678d1fe61a146aa660f SHA512 1af3286c63a60e89c2f87bd060eebb279858f4b21f9daedf4edcacd5906f35ddd6271397806771d6de1853cae1f3ecdd00ee6e05718fd7083ebc039e5cfa4832
diff --git a/x11-plugins/gkrellweather/metadata.xml b/x11-plugins/gkrellweather/metadata.xml
index 85e4ed814fa2..641cbd3703e7 100644
--- a/x11-plugins/gkrellweather/metadata.xml
+++ b/x11-plugins/gkrellweather/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>sam@gentoo.org</email>
+		<name>Sam James</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/x11-plugins/gkwebmon/Manifest b/x11-plugins/gkwebmon/Manifest
index 11b544ba598f..10e5fe664c33 100644
--- a/x11-plugins/gkwebmon/Manifest
+++ b/x11-plugins/gkwebmon/Manifest
@@ -1,5 +1,7 @@
 AUX gkwebmon-0.2-cc-cflags-ldflags.patch 1086 BLAKE2B a2e2387cc8d263e11c480851bb77438166d5b6a8dad1f7bb564ba6fb53d873a2fe5ff99b9439f4e5411a09bf8c29f9b19ffda11935f3a6611c042d4c59fdcfa3 SHA512 566213a5e86857135f31f0528e84f4869440fe74ee7d8a2197ef74ef3e1a62931f06c99781fd10fbe091901aa7223466ff2980deb07424140fcb335a5b43c983
 AUX gkwebmon-0.2-fno-common.patch 1058 BLAKE2B 68205c69c36e48678886c3bea5b0b14d4755d05a389daa6c2ee450f4fb543eb3fbf30618ec99d315b34d0de379af4c7ad13174de364ca4b46ce09c3be49a7176 SHA512 225b7767284aebfbc1437810930442c342f977abfe8cd3af8ac1b8122cb17964bf63388a56265febe20914bf4893a258d4fddb9d895abe0048239d8ab78e208f
+DIST gkwebmon-0.2.1.tgz 14576 BLAKE2B 12014eef1f73c4b398aeb7e5f5e7821561dd01c2de7d1705f567d60252ce7ce376266612602b58f90bc16dc587d8c5449d791dfd01a9c810fe9c6fb6d05970ce SHA512 f71a106372018c55ca1e31140aedd669df66cb6c3e9613fe5341831fad55e8bdd23c46281c38c553c09d350436bc1e44cee07602a24fc637c7f21f4e0d50cc39
 DIST gkwebmon-0.2.tgz 14163 BLAKE2B c6c0c9352e2f68eca56f981abb8188a7a300604c8c0fc05c1b0b95f0cdc117c12e55aeace66f9c3dcc16a13acb2b44683a77de36a83d9e9b7c273ec619173235 SHA512 0af4eaa8636b43232e209e6381a3852eb92b9505da4b19e31137766f4bee7977bf4e4bed40518df0fcc3aef2dc62767c85169e70f1fbfc738bb428ae8affac63
 EBUILD gkwebmon-0.2-r3.ebuild 685 BLAKE2B 704f0acffb3d66b9bce11aa6a4264bfdd59d5ab228af204a61a725ddbce3cd90f6e4a79214365e16f7ba873fb5f660d01baad5d44c4732fd582dabb4d9cf7c89 SHA512 22dd74fa240b4349d60075e9db212f39795972ceefb3a0bb13752365b5b1fbbf340fd9d3ee8b218de042c1923984f8acc271ab7cbd97a751dc760198ebc358e5
-MISC metadata.xml 246 BLAKE2B 6e3f7cdeb1f95de89856a15ffdc5dbfecfdc2dec3a2df23741cee8039e308606e83ad6dd8a6cef5ebea03a6190ca8187862a25cc5190e6d87fad9b61f5a4a64f SHA512 5f0130c08de0233452c1eaa9d1686604a809fde5603e4cf40d5b1bb8fc6168a1915e3d01c305987dfa630cd85c3c8999100ffd0f69d75c22849dedfd89b5b44c
+EBUILD gkwebmon-0.2.1.ebuild 701 BLAKE2B a11c5f0ce75eae64c476ab1d2022dd3b2f6e51dcb72858eb29f06ee399b9cfbe91cded61ebad2cd2e158351c1eec774ca18ccfc3b76b0857759f6df48b9679ca SHA512 9425c91154d3c362cd84706b010be462b5bc67db07a5b26b317c0c4bf314f5cc348bc8a432326fc10d14130fe52b9d3c8d0f0bac8b1d7ca8d10fa23d87d1d493
+MISC metadata.xml 318 BLAKE2B cbc545f0565894dc68dc1d4509b666dfaa80b1432e18ca4a4f8c97714cdad64cd093466d0ac815ee482964ed066ff91bcc8c951e0a929f760910a7f6a4d2df94 SHA512 74edbaa7f122679ea143698e3391d66b6fe6fb799cee4fa9a4eadc5f3ae272a830daaf35494c5ba405fd79eca6db77c230b296efc348148183f29e1597668ccd
diff --git a/x11-plugins/gkwebmon/gkwebmon-0.2.1.ebuild b/x11-plugins/gkwebmon/gkwebmon-0.2.1.ebuild
new file mode 100644
index 000000000000..506413a96789
--- /dev/null
+++ b/x11-plugins/gkwebmon/gkwebmon-0.2.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gkrellm-plugin toolchain-funcs
+
+DESCRIPTION="A web monitor plugin for GKrellM2"
+HOMEPAGE="http://gkwebmon.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+
+# The Makefile links with -lssl.
+RDEPEND="
+	app-admin/gkrellm:2[X]
+	dev-libs/glib:2
+	dev-libs/openssl:=
+	x11-libs/gtk+:2
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.2-cc-cflags-ldflags.patch
+	"${FILESDIR}"/${PN}-0.2-fno-common.patch
+)
+
+src_compile() {
+	tc-export PKG_CONFIG
+
+	emake CC="$(tc-getCC)"
+}
diff --git a/x11-plugins/gkwebmon/metadata.xml b/x11-plugins/gkwebmon/metadata.xml
index 4c545e85f783..87b87bf394bb 100644
--- a/x11-plugins/gkwebmon/metadata.xml
+++ b/x11-plugins/gkwebmon/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>sam@gentoo.org</email>
+		<name>Sam James</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">gkwebmon</remote-id>
 	</upstream>
diff --git a/x11-plugins/i8krellm/Manifest b/x11-plugins/i8krellm/Manifest
index 50e620494edf..99491a837fe8 100644
--- a/x11-plugins/i8krellm/Manifest
+++ b/x11-plugins/i8krellm/Manifest
@@ -3,4 +3,4 @@ AUX i8krellm-2.5-r3-makefile-fixes.patch 1459 BLAKE2B 3cc267b4ff16d339430d1d19dc
 AUX i8krellm-2.5-r3-rm-gkrellm1-support.patch 1319 BLAKE2B 825df0a3e71a48c84d79552090c4f3fb0fdca803f2420381c9caaf401f5f089a482cf7f54ecde086d5820f797ed204a9525d07d9e57c1c7a2fd0c52acf9f6daa SHA512 d5c6f417cf7486e05e621054c84dba13b174e33684e32a0d3554cb5c64477661691f9388904329ba71c928e5c580193ecb82a7fd2be9824ad1d675cdf08d582b
 DIST i8krellm-2.5.tar.gz 15378 BLAKE2B be6af7ce0ee2986fd5463fba2b747721407fe3d06bcd1ae7e30dc273a883fd2f9a092ab73b97b6f7d20dd87454eec28db9e12d701dcaec4dda9267af889e662b SHA512 d1cd452fc83c24369b4773d959e0182bd5c7fe317bed6a1df716c1576f5ba078a4e82d202ff641f0784532b77a51d466e57ffc675895a1875a868d92caf79576
 EBUILD i8krellm-2.5-r3.ebuild 701 BLAKE2B 431a406a6c759c1596e02877ee7ff8914256aa0bb2e6ffa0f91385a5316c40d347c92644b054e5ee6a160c689995c47f5d4e458680a6e76785276a6fa1bee710 SHA512 e951526eb93486ae9dba18a63cbbc694f49def754eab0be50bc5c1d91ed02986727edcbda2247033ef98d1f889504e296b229cc27b7b0c379a5cd128b74839bf
-MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
+MISC metadata.xml 240 BLAKE2B 20c22d2d446cfcd6f2f430f2c444cd6d854d840e5161f595e4f738096d38db01c8cd305870b26623e98d8bbba239260975a53802caf4b678d1fe61a146aa660f SHA512 1af3286c63a60e89c2f87bd060eebb279858f4b21f9daedf4edcacd5906f35ddd6271397806771d6de1853cae1f3ecdd00ee6e05718fd7083ebc039e5cfa4832
diff --git a/x11-plugins/i8krellm/metadata.xml b/x11-plugins/i8krellm/metadata.xml
index 85e4ed814fa2..641cbd3703e7 100644
--- a/x11-plugins/i8krellm/metadata.xml
+++ b/x11-plugins/i8krellm/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>sam@gentoo.org</email>
+		<name>Sam James</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/x11-themes/Manifest.gz b/x11-themes/Manifest.gz
index 8a4f22f4cb5f..29db5d8e21a8 100644
--- a/x11-themes/Manifest.gz
+++ b/x11-themes/Manifest.gz
diff --git a/x11-themes/gkrellm-themes/Manifest b/x11-themes/gkrellm-themes/Manifest
index 49c758df224e..c12a3110416b 100644
--- a/x11-themes/gkrellm-themes/Manifest
+++ b/x11-themes/gkrellm-themes/Manifest
@@ -1,3 +1,3 @@
 DIST GKrellM-Skins.tar.gz 3553450 BLAKE2B 2cb7bcd503b2722478665381ef2a7b1bcddec7283eb2988f66006100bd59ed1953f65a265d12cecebeff5d418cca3449302e7c7d6360f8b3a7b087f6aa719343 SHA512 5b8c143cbeee53eaeeea829cd2fef1a71bed3ae506513e642aa4b59063052987b48c5f5310146660ab981fc09690b1016ff7cc355b039dbff98102c32d8a0619
 EBUILD gkrellm-themes-0.1-r2.ebuild 697 BLAKE2B 314d4a81a5f785dff685001f39eea0afc223f163131900e281ff3473a5decfc96943f12e55eb8143143f7faff3209ce8de89c33d7177cc1afd711e63f230ffaf SHA512 b45398e57f2172a1228d447c1733b53eda6011e26ab6bedfa7c3c1f9f9c4dd5d3900b532f0aa4caf142d5062a8096da269161e9b6e0a662c9756f9132f534752
-MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
+MISC metadata.xml 240 BLAKE2B 20c22d2d446cfcd6f2f430f2c444cd6d854d840e5161f595e4f738096d38db01c8cd305870b26623e98d8bbba239260975a53802caf4b678d1fe61a146aa660f SHA512 1af3286c63a60e89c2f87bd060eebb279858f4b21f9daedf4edcacd5906f35ddd6271397806771d6de1853cae1f3ecdd00ee6e05718fd7083ebc039e5cfa4832
diff --git a/x11-themes/gkrellm-themes/metadata.xml b/x11-themes/gkrellm-themes/metadata.xml
index 85e4ed814fa2..641cbd3703e7 100644
--- a/x11-themes/gkrellm-themes/metadata.xml
+++ b/x11-themes/gkrellm-themes/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>sam@gentoo.org</email>
+		<name>Sam James</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/xfce-base/Manifest.gz b/xfce-base/Manifest.gz
index 46879dd08469..0c2bb46f39ba 100644
--- a/xfce-base/Manifest.gz
+++ b/xfce-base/Manifest.gz
diff --git a/xfce-base/exo/Manifest b/xfce-base/exo/Manifest
index 0c7c8c1188fa..f4b5d6c4fdc6 100644
--- a/xfce-base/exo/Manifest
+++ b/xfce-base/exo/Manifest
@@ -4,5 +4,5 @@ DIST exo-4.17.4.tar.bz2 895388 BLAKE2B a48f2c7f1509a41d74b924c428fd57b4801b9e45d
 DIST exo-4.18.0.tar.bz2 896849 BLAKE2B 99cd22b9f2c806907449afdd640abd85be2ec37269d0436a20300ac88ee4fbe39807e39ba51ae8fe82d621c478d65d1f452209779e7d48caee899305b40f3a27 SHA512 32f3a319ff31a37cdaf8e2e7bdbdbaa9b797d6731a27854838b47d6078f45af83ed1a664aef4663f616fd9abcae9233c6f68ab2cc18599f1b2ced487602c51ce
 EBUILD exo-4.16.4.ebuild 1169 BLAKE2B f10c409f2ecb2e12bcc5988fb75cfe4d9249a3db144af8a87e0458faf05e5e6ae273b36ffa042b0a2411b80bb83888b667282e830a63266418bfc8f5e85c388e SHA512 fa48fdf48cad6eb613d6047f4911b4eb4a347b0dfe2c8afd8738061438eeee61af99d5a2dc96b2f63446da785141ed91cc8fe998e40994f3f4c04e204921e43f
 EBUILD exo-4.17.4.ebuild 993 BLAKE2B 99f04c30d161263723a3785970bf1bb3043e854c3449fd44d899429469e9272c9b4c1bf0ece34c9a3ba3935ba9528077f724039dc033c2b11f9be7174b4317dc SHA512 c1034ad4bf41180a353d002d0c13ad9f97783b54d06f98d91808e99c428eb2f5b3b69a76ed4e1aeeaf29fa53d3aa75a3b2ea725c83fce9b3f92cdaf777d3c49f
-EBUILD exo-4.18.0.ebuild 996 BLAKE2B 44a1889b2c0b42b0fa2ef212f7f07067fdc8dd5ae7c694ff997291c3bf390f7427bd94ee8695e79ad3efced5edc96b5e2d8e9135170fb594f44115f09781eb3e SHA512 5b69350d6bfa7664a28d7b850b4863cb85790326c7574b86b79d8fd86a136c496aec432a08ace8cb08541ac656fdb942772b28220fda1cdc89f6884f271a791b
+EBUILD exo-4.18.0.ebuild 993 BLAKE2B a366e84d9cdde22dedc23d2fdc5d5155e5e44755820d04458c98e6ec260a745eeb815f2282fd59e2510c5eb389c586d7afc3b39c6e045a3b3e6d7cda4bf68893 SHA512 ad0212f73423de60d7f0753590dfde799885a979b103997528e4fc5191d652f591414a876154dcee41520732cdebeffaf85f2563dc74452d605cd2b2883aee09
 MISC metadata.xml 242 BLAKE2B e489d8bd8fc709502185e0439171cde4402146bc1ec7340bbe41550c06410a49faec8777cb7e79c3ba482feee774350beec5741ed8fe93a85ebed7b746f9200e SHA512 1bcfaf0482a1e7b5a7182d853dafaa2d47687bbc1c9d38b69ba35ce97cdeeff9bd2137a086c5af2a27b730a295e7cbd73d0b43fbe5af331bb7a3113d2117dff3
diff --git a/xfce-base/exo/exo-4.18.0.ebuild b/xfce-base/exo/exo-4.18.0.ebuild
index c32a1a6877c5..8aeecdf83d25 100644
--- a/xfce-base/exo/exo-4.18.0.ebuild
+++ b/xfce-base/exo/exo-4.18.0.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
@@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 
 DEPEND="
 	>=dev-libs/glib-2.66.0
diff --git a/xfce-base/garcon/Manifest b/xfce-base/garcon/Manifest
index ddff856205f2..ecd8ca88a6c8 100644
--- a/xfce-base/garcon/Manifest
+++ b/xfce-base/garcon/Manifest
@@ -3,5 +3,5 @@ DIST garcon-4.17.3.tar.bz2 550490 BLAKE2B 78b7f0770cdb6a6dd1e08b7732e8c31f13a9b4
 DIST garcon-4.18.0.tar.bz2 550674 BLAKE2B 93bc218c4455c61109ee7086a8cb822aaa154aaebd082c10ae9fd551019bce0fe68a117552c05fbe3a97c671036b5306703ba3c320d9b886715a83fb038c95b0 SHA512 c4b49ba47ac33823199a68ef9bdcba3acfcedde62a96a8a8b3af2bb1f28b3a5fe3e960ee93bdb964fbc01b039047d77f58fbe5b1f9fbd2ccd3d3f968e416a55c
 EBUILD garcon-0.8.0.ebuild 1154 BLAKE2B ee97767e67f83e9f34b56ee6e7d0190a9dc3a25741f46c2c05089a00ee69d45960dca30a3aaf639c1c93b397b943d16d307c97a785f8720f2298fdebff885d6f SHA512 faafa8105c8e31b8c8e11689f87b894262c39b4c825c990b49ea0f136634bcb75b2954512d4cb92e463f3e9ec14617ce0f9bfb14642f6d28fba1edfc57978eb7
 EBUILD garcon-4.17.3.ebuild 1232 BLAKE2B 872d11883a83dbfb004a498eca4700ecbb9536f3dfc61dfbb093a8dc4807cd33181ac85a996aa38fce1ba66c623563447e5bf0b5e424abcf6cf5aed6712502b4 SHA512 f95c14b59034a88f1a6b21ad98ef71ce30f405cdc12240a3ee9b962cd0c50babd272f0ba654a8ef0529a9dc00d77df8ae565a88954d176573f03c9fa20438cb1
-EBUILD garcon-4.18.0.ebuild 1234 BLAKE2B 7701623778dbfc0106cb09d2801ab28d7fa760bbbce16f90d01b9dbb2c60194514e2d028b74422b0d79f42f2f37e35c9f9c5eb9fd8edfdf4848977e50ebc648d SHA512 d48bd6281152c1de6f1e531ff2ad05f783bd02dc35f88f5583cf1be7672cfa9c2f508211cd1d86f426fa1b5708d090831749d87e2484f13105a7ada76d10d932
+EBUILD garcon-4.18.0.ebuild 1231 BLAKE2B 369429a08d677da7c7a96fec062b1045a9f38875d8b6d3c78d51abea15d37de480f9bb25770214d1592e4ad51ec3e2b9303bcb41169158cb0aa19b4dd574f078 SHA512 007f2e41f5f7bdab0a8a4a3e9de2d99f756a14284a2462e41aefc4d880560597e22d701f8a27ea8dad85928855bb05df2485a0ad7ac372abe4e630f83b63fb65
 MISC metadata.xml 242 BLAKE2B e489d8bd8fc709502185e0439171cde4402146bc1ec7340bbe41550c06410a49faec8777cb7e79c3ba482feee774350beec5741ed8fe93a85ebed7b746f9200e SHA512 1bcfaf0482a1e7b5a7182d853dafaa2d47687bbc1c9d38b69ba35ce97cdeeff9bd2137a086c5af2a27b730a295e7cbd73d0b43fbe5af331bb7a3113d2117dff3
diff --git a/xfce-base/garcon/garcon-4.18.0.ebuild b/xfce-base/garcon/garcon-4.18.0.ebuild
index 5bf287cfc158..b4bff5e860c7 100644
--- a/xfce-base/garcon/garcon-4.18.0.ebuild
+++ b/xfce-base/garcon/garcon-4.18.0.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
@@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="LGPL-2+ FDL-1.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="introspection"
 
 DEPEND="
diff --git a/xfce-base/libxfce4ui/Manifest b/xfce-base/libxfce4ui/Manifest
index 7edcf1af5d36..df4201393541 100644
--- a/xfce-base/libxfce4ui/Manifest
+++ b/xfce-base/libxfce4ui/Manifest
@@ -5,5 +5,5 @@ DIST libxfce4ui-4.18.1.tar.bz2 910047 BLAKE2B 196ded69668b27fd10d99042789e1b2b38
 EBUILD libxfce4ui-4.16.1.ebuild 1727 BLAKE2B 0e00b59daa3ff407dad5ec02f09c7806160a4a80f08b5d1c1d9ca89588b77a295aee83dfd3e697bc87e1e4bbd8a2dbd7b0852494f783a2439515dd171bbd4d2d SHA512 1c3910d58274816dd82ecc058218a33f64eb5f99509912e127fab2b3369f3e64bd6b0a70afd6b1fdd1af84939c197b18d48bf24ee15e530233117bcd978450c3
 EBUILD libxfce4ui-4.17.9.ebuild 1743 BLAKE2B 846c003a7e3f0c607d3e3e131428eef3ffb3daf7e2cc77b60c452fc8bc70b277d472f067700bd058f7726d134f84c17fc92beca08a8799c91d069fb8e74f451f SHA512 534f94650b3b8e308928432f379611cd8088fcc247ceaa1dbaf8f91517d46b00f2c3a774d0c664e42517651464234930becae8f0e3ad0d2eaded39c8b923580b
 EBUILD libxfce4ui-4.18.0.ebuild 1739 BLAKE2B 0da39cc9521bddbe924e82d216e2f2834daf2f0762b0c0c7e2ee6eaf0bf7f30c3a458f161f29a7a68d8b710dcbf02dcd45b7ba29e91c85ff34acccd78f658042 SHA512 c496066821e64e30df458642b5e316e569693b2589257c326f96ebef7077dca8d77e03ebd837a85406c06fab6c3b76ef7ec3fc0e1c8937cdf05d0af9f4e81c61
-EBUILD libxfce4ui-4.18.1.ebuild 1739 BLAKE2B 0da39cc9521bddbe924e82d216e2f2834daf2f0762b0c0c7e2ee6eaf0bf7f30c3a458f161f29a7a68d8b710dcbf02dcd45b7ba29e91c85ff34acccd78f658042 SHA512 c496066821e64e30df458642b5e316e569693b2589257c326f96ebef7077dca8d77e03ebd837a85406c06fab6c3b76ef7ec3fc0e1c8937cdf05d0af9f4e81c61
+EBUILD libxfce4ui-4.18.1.ebuild 1736 BLAKE2B 69909f9ed94d8e30ca0949dc19b6906e85854b44d97a346089592deeb1091d4e313c072525fd1c5e47a64dd0feda29e6fb0a5281a09e0c0ecbc519aed78b81ff SHA512 3dc435e5096bd43ce7c4491db72c107d903f22e0f9416b5c2b9df92fdd9aaf88aae2ab92bfcb51804ae6e8eb0fbf50f4ebefa405b5c14189f34483cabdddb10e
 MISC metadata.xml 415 BLAKE2B 96ab20930d257e21f8cb46d95f24e7d0fe7568aba5cc097ffb9ec46a5341d58dcf366522de79d8c04b575cd0cf6b96724ed969b8d6338cb842bd50787620ea9b SHA512 9712241bf2f9bb14ac6969f02768e7c4a159f7349eff4a7c9bc8fb779955a555b4cb5770ed32203933e603acb2fa9456cd989a62e274c94320e81e820555644e
diff --git a/xfce-base/libxfce4ui/libxfce4ui-4.18.1.ebuild b/xfce-base/libxfce4ui/libxfce4ui-4.18.1.ebuild
index 31a8ab010145..00eeb8e20873 100644
--- a/xfce-base/libxfce4ui/libxfce4ui-4.18.1.ebuild
+++ b/xfce-base/libxfce4ui/libxfce4ui-4.18.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="LGPL-2+ GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="glade +introspection startup-notification system-info vala"
 REQUIRED_USE="vala? ( introspection )"
 
diff --git a/xfce-base/libxfce4util/Manifest b/xfce-base/libxfce4util/Manifest
index 74e78358870c..211d55688553 100644
--- a/xfce-base/libxfce4util/Manifest
+++ b/xfce-base/libxfce4util/Manifest
@@ -5,5 +5,5 @@ DIST libxfce4util-4.18.1.tar.bz2 527167 BLAKE2B b5d16b4e6ce541a7de559eb2801cf800
 EBUILD libxfce4util-4.16.0.ebuild 1094 BLAKE2B 5c6da62a80dd1d3d2aaa77b771eea7b3c372d1b60ac1585cd6b40c6c0b36a176ea697522cc9bbbc179d566985b23156497a765871962f3a8dfe14f2e0eabc1d6 SHA512 8ddb4aff9b6c055e2defcb8375a7434db9ca0129ffc9590d937f2d2213f808e8e7ac21a9542888058108c0e237b6e23998de8426b5229549be8eeeffdb80f646
 EBUILD libxfce4util-4.17.4.ebuild 1056 BLAKE2B 034def2d188f4c372f961153a1f85892a7e7949181fed62ccf657bf1faa89dab92d2ad0757ded89a594b6f1f25c0e45ef0b9c50a4c5579f357aeffd3e409ccb7 SHA512 ed0f8c9475e597b60a2a2f2913ab6de100c1c9c6035529a2c0e48f512b76626ec3a2fb648a07eaa607fe556a2faccbd08addd93d72c2255619c52241a7a58129
 EBUILD libxfce4util-4.18.0.ebuild 1061 BLAKE2B 4950dd5229e5e12040e017e93316765a9126aad23bbaf12e0efd57adcd49f20cf31aa8fadd060ed38e00606724d2d3bb8f57e121d47cb8cd71c6ea61c289c084 SHA512 3d347a7b5190cad217225edd6d815f9cf3c72948e7046a1c83018565121b3a973812b623f3ccfebf4faec03144d7c89a95e92bb9f41a15c2606cbf7714e9d966
-EBUILD libxfce4util-4.18.1.ebuild 1061 BLAKE2B 39ac82b27dc8167e4cd343d7461288f163e1cffe4b66c88840a870855b2d98c94ffabd473732145f8e4f8edb38cf16e6cc6fcd280bb4d1c4bdb119ea2f21f7db SHA512 540073b22dc8a6bddc3e53e3acca1cb060217aa8c78200bf25e5c9276b179d4ebb4420e179192526b728beb8959b681aa4a2010db5356fefc5a29daf0436364f
+EBUILD libxfce4util-4.18.1.ebuild 1058 BLAKE2B 8628c9a8995d0e549907d3a772a88b0cdf76f450941d367806965ca953eee03b2adc6d6493bd5faca341a32aae6c00d145390ec9fdbdae46646ac71f2dfbfb2c SHA512 6e658da2302b409a019b0fc374fbdea45b92c6f21b3862386dd11ba13f2a01a86d42f95e58ed459b59a938212dd1c24ea2dff3d65cfe916a6d7b82a8998b5e40
 MISC metadata.xml 242 BLAKE2B e489d8bd8fc709502185e0439171cde4402146bc1ec7340bbe41550c06410a49faec8777cb7e79c3ba482feee774350beec5741ed8fe93a85ebed7b746f9200e SHA512 1bcfaf0482a1e7b5a7182d853dafaa2d47687bbc1c9d38b69ba35ce97cdeeff9bd2137a086c5af2a27b730a295e7cbd73d0b43fbe5af331bb7a3113d2117dff3
diff --git a/xfce-base/libxfce4util/libxfce4util-4.18.1.ebuild b/xfce-base/libxfce4util/libxfce4util-4.18.1.ebuild
index e69e52005cf5..d8775d671028 100644
--- a/xfce-base/libxfce4util/libxfce4util-4.18.1.ebuild
+++ b/xfce-base/libxfce4util/libxfce4util-4.18.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="LGPL-2+ GPL-2+"
 SLOT="0/7"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE="+introspection vala"
 REQUIRED_USE="vala? ( introspection )"
 
diff --git a/xfce-base/thunar-volman/Manifest b/xfce-base/thunar-volman/Manifest
index 7a620c4767d7..a333709d09fe 100644
--- a/xfce-base/thunar-volman/Manifest
+++ b/xfce-base/thunar-volman/Manifest
@@ -3,5 +3,5 @@ DIST thunar-volman-4.17.1.tar.bz2 510275 BLAKE2B 16501dddec85811263d22b0757fe9f1
 DIST thunar-volman-4.18.0.tar.bz2 510289 BLAKE2B 6da7042d85fbdb57b811d1a08c1bdc0b0449b0c37013a37a8a19f15901135cea544f469c68de7880ca10110c9418426ecd0747fd00725077b6e171ec4a0cccf9 SHA512 29681ede6274e999377e2aae2b157ed355d9e471416db2d4beb4432f84c60008f8c5008c87392c20da51d58fc3bd8f097d6f21764903baf1a301fb00e6166420
 EBUILD thunar-volman-4.16.0.ebuild 1046 BLAKE2B 8976f7e52bc6766e18748e5058cfdc5b8a65e7371aa0e78e0ad78c426e78c5ac4b7978ac50e759527c7706e71cc09a6611edb7190f168d7b51ed8dec9d71f450 SHA512 a803c7ce7ef1b5c7c17b9e3577afcd6c66321faff3927ec3eb48c8cc6eb7305a02957ce230495cab2471cd311bbf0c4188ad0164ac4b3c027c16bfa25645764a
 EBUILD thunar-volman-4.17.1.ebuild 1092 BLAKE2B 1359509a4b3a23460b18a5c209fdcef56892e34f53030b3c55bc1d9c8088b14eb9cfd06dabba8987d11df0f5fdf2160abaf6c0b7d297935a2348a6311d8d5c20 SHA512 5cce78acda3980c49e223feb0ad9b7f7063a81ab0789b843fb29d523f690e86c4b05a7421846fdfd91cb3a0f8805586a2f879d7a7a6d7a425574c6159ab93f86
-EBUILD thunar-volman-4.18.0.ebuild 1096 BLAKE2B 57dd4de3f33a90e539942f13c7864330dbf6291337ee94ceb1014eec49a4a0e2859dee2cf4dcaf1cb2cd4028bfd21e79594c6d6bc8a9e45d0e1826e92f1d1e9d SHA512 3b8f214bf0870314337984bc4770b8cb2e98a03e266a9976db69f59b65d4354d6b6d6e112df5c166956c6671df99f97a7237ada7e8bdb5c188462c76a653b9a7
+EBUILD thunar-volman-4.18.0.ebuild 1093 BLAKE2B bd647c09ea58cec3665f35a33820cce3effdd525675ef94ae66928c4075d7ec89b5a1e05e3a0a999a288415fb2914166261d71c5af45430d98e03a17b3a5a803 SHA512 5192bf47087f15800ed35d55601663a61bcae257c7306b6bf64d636dacd412a4fe7e729ec561ef22732d9376799a77d92ff5b432e5c53f3d717077eaaa407eb5
 MISC metadata.xml 248 BLAKE2B 83bf47dc3dbedea8a88932e922075f0ba8fd841433c4ab750e2ab61c22e8cbfaa1acb04a903d89ef5140a75dfc4c4899354623e0160df5b7c178c190f8494515 SHA512 b5200cfe30adef8e869fada87f1b4171210b2427cd3ac12edef70948f305d5e612ca5f24d377f9823a6022c8867db635db50ddd3d6cb362d6b0137c299fe07e5
diff --git a/xfce-base/thunar-volman/thunar-volman-4.18.0.ebuild b/xfce-base/thunar-volman/thunar-volman-4.18.0.ebuild
index 1674cc06d834..3a0cfa103936 100644
--- a/xfce-base/thunar-volman/thunar-volman-4.18.0.ebuild
+++ b/xfce-base/thunar-volman/thunar-volman-4.18.0.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
@@ -15,7 +15,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 # CC for tvm-burn-cd.svg
 LICENSE="GPL-2+ CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
 IUSE="libnotify"
 
 DEPEND="
diff --git a/xfce-base/thunar/Manifest b/xfce-base/thunar/Manifest
index 98029b84b7b9..a5a347b574fe 100644
--- a/xfce-base/thunar/Manifest
+++ b/xfce-base/thunar/Manifest
@@ -9,5 +9,5 @@ EBUILD thunar-4.17.12.ebuild 2102 BLAKE2B ca9be20d00776fecd52e0e8845e5502fb9c653
 EBUILD thunar-4.18.0.ebuild 2108 BLAKE2B f75fbf9ca53a3c06655557851f8e16517a2707620dad3dc4d2e98210f7b2cdcfd961ad51b0c77aa4cb4fed917740111b8d7b79dc30025d2f960e9d29d677ad9f SHA512 9b44c57fcd98b854c0ffe0ea737147b9cd64c32b009237b78c74463d9450c81a1ee05288e8df4c1b8841d2bafe558583822b5b866bdf49887c83bc9427bfc9a8
 EBUILD thunar-4.18.1.ebuild 2108 BLAKE2B f75fbf9ca53a3c06655557851f8e16517a2707620dad3dc4d2e98210f7b2cdcfd961ad51b0c77aa4cb4fed917740111b8d7b79dc30025d2f960e9d29d677ad9f SHA512 9b44c57fcd98b854c0ffe0ea737147b9cd64c32b009237b78c74463d9450c81a1ee05288e8df4c1b8841d2bafe558583822b5b866bdf49887c83bc9427bfc9a8
 EBUILD thunar-4.18.2.ebuild 2108 BLAKE2B f5520d18862ff4c7ffc6b37237f955da368a4e37210dbea5621197354b6b10e9d621db9009c901716d094b3277f2fcb4f77b20f95d8e01ed637b5a1222fdf3e5 SHA512 aed4c181021d97d380d7ba0dc6d911487fcc76e22c737cf8db050543a7eef2f0a2e408c453011457b017723d0741de65cfdf30309772a2d6a06d61b79e81c3f5
-EBUILD thunar-4.18.3.ebuild 2108 BLAKE2B f5520d18862ff4c7ffc6b37237f955da368a4e37210dbea5621197354b6b10e9d621db9009c901716d094b3277f2fcb4f77b20f95d8e01ed637b5a1222fdf3e5 SHA512 aed4c181021d97d380d7ba0dc6d911487fcc76e22c737cf8db050543a7eef2f0a2e408c453011457b017723d0741de65cfdf30309772a2d6a06d61b79e81c3f5
+EBUILD thunar-4.18.3.ebuild 2105 BLAKE2B 4fee31d81ab8251627f83c18c3f64a6699a63744f5372357390446a1e68af6f795e2f2e91d748af0189d29b343e7bbb43abc8a83b04122ff8549d50e81d35cf6 SHA512 719c516da7835c4d1d3e8599c4398b085841dac828b1bf7bb9be67543dcddc972cfeba3cface478280d053f8e111e462fcfc0f04d0848e7c01a21dfc5344234d
 MISC metadata.xml 373 BLAKE2B 8565ee8f50389c9ecd482437d0081ce6c9ed0ade1fffd724c2485c03c708565c91bf89a974a37a3deb541e2e0cf35a19881c8b3ee39182f26d1c522088466ff1 SHA512 b73f53699dc6b936d1baa9bffde644a86481083b4ca333b2d5148bcd03c43e9ff9577c6b35a2e40d89071158c4b4deea4d6317e40959f4344b7f974ac3d22c71
diff --git a/xfce-base/thunar/thunar-4.18.3.ebuild b/xfce-base/thunar/thunar-4.18.3.ebuild
index c3bb395fb212..e5714204a8e1 100644
--- a/xfce-base/thunar/thunar-4.18.3.ebuild
+++ b/xfce-base/thunar/thunar-4.18.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0/3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="exif introspection libnotify pcre +trash-panel-plugin udisks"
 
 DEPEND="
diff --git a/xfce-base/tumbler/Manifest b/xfce-base/tumbler/Manifest
index 1985ca88e685..eb85090c12c8 100644
--- a/xfce-base/tumbler/Manifest
+++ b/xfce-base/tumbler/Manifest
@@ -3,5 +3,5 @@ DIST tumbler-4.17.3.tar.bz2 609521 BLAKE2B 294adfb4e7179362d5d72aac2021c2eabf762
 DIST tumbler-4.18.0.tar.bz2 609664 BLAKE2B f18c8786b0dee452526b1fda34c6a1d442655d8c252cb68cb1593c121fb2daaee520cc7958936e6ba0492b2eddacb7722fde937092bdde91ca34d4ca3ab42667 SHA512 60f0621ab1a7a00909ea04181c7dfb733dfbb33219991b2f81f991c289428e026993639ee1ffa5b46dd6f35866e0a3ad76fadbd11eec5fa926fba0da2278b99f
 EBUILD tumbler-4.16.1.ebuild 1710 BLAKE2B 2ab8236976693463dd76429a5e95d460ee12251465fb464863003ca363586bef8c73be29e5efe309678edf9b536192f9180d7cc398eedeb45c6d56e078b5b3d3 SHA512 b2a116a3fb5a770ada139c6934034bd56a914655877209a270b66e580953252345775f45b169fe8ba1cd8eecc51796c8bee922d00211b900e04d8e7e905afb85
 EBUILD tumbler-4.17.3.ebuild 1803 BLAKE2B bd508e3e71eb61ea0e2a2abfca0930c061315107887f1a495441cd881b61dec35fb75416c2f522220eae03b98c75b56731b3360b757aa9ae5f008775a5da6f68 SHA512 bba90c42f2f405bb9767f25383e1fdcdc0e49bafd8f09b5497c42af666763a15298f3222d522f45f0df0c3e4aafb6bef37705f1465a7790f7e5464447280675c
-EBUILD tumbler-4.18.0.ebuild 1801 BLAKE2B 21328826f1da1a88912832f89d836892da2a1ec7bcf2aa4b9790d6f4cc95359d231ad83d3e18660e5382946ea003ef497d779936c2a0765e8bd8e81f7ba2c202 SHA512 08b8b382cf39a7575ba25a398a08c0d595af0ef3df8d9bfdcfdc93cd83196d13c1ba8a511dce046d736efcb208eb12329b31044abfba481f8ecf388bc2b6fffd
+EBUILD tumbler-4.18.0.ebuild 1798 BLAKE2B a23ad087dd27f64ad7baa5d9469aee2c170efedc7439aa2a2c49d4148a52272481e61052077dbf8945ea406de9048b4c108fd30ad7464473314ac8dc0d77895f SHA512 28fde406f36841d16586967e37939e6eeefca620e38882c9a3f73d1414d2bf825b9ebcd4ec1f9551d9b6381baecb3dc10459196a6ff6ba270908aa6e755d764a
 MISC metadata.xml 470 BLAKE2B 0fe0650488303d2daadac810327d41b97e1b3b1a42d928865b854f5e74451d428f4b5e56abada30be41024916c8469fe7cd3da31da638343388082e38388f654 SHA512 3728ab31403249dc4c5e92b93ab0cd9afd82de2acacba5076d08c7c11cbdc426e5ff114ad2bc156731c24395fec80b0154274f18c4c0cea0d276941dc998b27d
diff --git a/xfce-base/tumbler/tumbler-4.18.0.ebuild b/xfce-base/tumbler/tumbler-4.18.0.ebuild
index 3d460ace3b01..9286afa9b212 100644
--- a/xfce-base/tumbler/tumbler-4.18.0.ebuild
+++ b/xfce-base/tumbler/tumbler-4.18.0.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
@@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 arm arm64 ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="curl epub ffmpeg gstreamer jpeg odf pdf raw"
 
 DEPEND="
diff --git a/xfce-base/xfce4-appfinder/Manifest b/xfce-base/xfce4-appfinder/Manifest
index 49ffe8dcf573..c027293771fa 100644
--- a/xfce-base/xfce4-appfinder/Manifest
+++ b/xfce-base/xfce4-appfinder/Manifest
@@ -3,5 +3,5 @@ DIST xfce4-appfinder-4.17.2.tar.bz2 561844 BLAKE2B ae0f78d18cad4df6b21b05dcbc75a
 DIST xfce4-appfinder-4.18.0.tar.bz2 562219 BLAKE2B 05aeedcfe6b00509f7c87affbd9ee12d72ad2298168497fa957a0ec189f18348606ff29c177f4c3c5b3e9b7c937d67727828b97b786038ebfd03259f473fae0d SHA512 e33144910bb4391beb6ca88e312c592593ce50a40e10487c5b72eca492dd2f7c3ab7324ce62413ad6f3df0025de29ece96b5d0a566eecbc87bd1d0e62c9156ad
 EBUILD xfce4-appfinder-4.16.1.ebuild 871 BLAKE2B b54ed024531179a16ecfdf9b77be75a7b6fca66bb67ab00f0315dbcf0ca5b8831c5edbd6ab54f5eb24a2b07d49840644244dd5af28618c9dd1f2231a17fe3eb1 SHA512 8f8b6da5ef3a027bb42ef9a67f10111be66a5c9aa162b2336dc23d97eb9c7c7310b8c5919be2721f34ccca6d0cf5e82563fa7c6ac82dc332eeb42bce3e76fa55
 EBUILD xfce4-appfinder-4.17.2.ebuild 917 BLAKE2B c06d2b9bad384edc8328dfd0a36b9ba71d40956fe7e6672d60179f05a11edffd86e3925cde36544de2bf4fcd1dbf85ebd20d70d266b3cbd07cc0c76ed2e421b0 SHA512 0e21df5b096c3450644f40461fc43d55ac99c2650c48b892d27472aa01a2055078193723af87863abde3f432b746a7d6bda2cdb13efac60a4242b98f00d5aa13
-EBUILD xfce4-appfinder-4.18.0.ebuild 921 BLAKE2B 225d849acda2d94abc372c6648904308e9c8a54ec91457a65ac00bb77afca78f033ed45c19d8ff6074911108664fe4e5963cef8d1b7c3baa2440ead79a3a9173 SHA512 45ab6be49028866004741719f3b0e31d0606d107db9f8ecf97d017f7e1022f51e176fc100f56bb91d1bb8957919f00c69be5ed7bb5b085fd8128201396d13973
+EBUILD xfce4-appfinder-4.18.0.ebuild 918 BLAKE2B 010eb61a7bd375cc7932210a7bc3d44f1d4d3a13fe372b17d916983b696492ea55068add3db4f379708489bed5f008c4eac40c64d2dab23f6160c78646025438 SHA512 e7ec3be16d67268b746435735c25d9410646d69fb7e72464fdab3ccb5aa9c1d9951a16b9b3906802b924a2787a264529fe797a44390daf6bb69b7c965a965270
 MISC metadata.xml 248 BLAKE2B 83bf47dc3dbedea8a88932e922075f0ba8fd841433c4ab750e2ab61c22e8cbfaa1acb04a903d89ef5140a75dfc4c4899354623e0160df5b7c178c190f8494515 SHA512 b5200cfe30adef8e869fada87f1b4171210b2427cd3ac12edef70948f305d5e612ca5f24d377f9823a6022c8867db635db50ddd3d6cb362d6b0137c299fe07e5
diff --git a/xfce-base/xfce4-appfinder/xfce4-appfinder-4.18.0.ebuild b/xfce-base/xfce4-appfinder/xfce4-appfinder-4.18.0.ebuild
index c51b03e094b9..686f107c8c82 100644
--- a/xfce-base/xfce4-appfinder/xfce4-appfinder-4.18.0.ebuild
+++ b/xfce-base/xfce4-appfinder/xfce4-appfinder-4.18.0.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
@@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
 
 DEPEND="
 	>=dev-libs/glib-2.66.0
diff --git a/xfce-base/xfce4-meta/Manifest b/xfce-base/xfce4-meta/Manifest
index b3d194131c1a..7f412d2bee36 100644
--- a/xfce-base/xfce4-meta/Manifest
+++ b/xfce-base/xfce4-meta/Manifest
@@ -1,4 +1,4 @@
 EBUILD xfce4-meta-4.16-r2.ebuild 1020 BLAKE2B 3d3b13ab5a44455c3487e56a6a201373f86af0d9b0527287474dceb487f5d4be56a4a89112e809ee56056c3cda752d0e3c68845954548634a063516c4d0af556 SHA512 7682b09d986b9d9c34c46c367915aae397af1cc795f5c1ef68081b2f784460997335a2d58a0d13b1c3589baa5d53ad5d46bce721f5c2bd2024f1c8b4db502b4c
-EBUILD xfce4-meta-4.18.ebuild 1045 BLAKE2B 1ac52857618c3f506abb80400708f2790748a975c7b03c620b4839f650b1ddf9646d545606093f3d3bd3c97706998bc82eefd680bde78c313c39ebc3130479e9 SHA512 45f8eac409df60ac21e52dd120707e835ba91d992e4d8e333dd04a9f87802c16d411a85c46c470c3b4a0b5b41dec34f69cf6341f06b486ab0d40d9b2c42eac5c
+EBUILD xfce4-meta-4.18.ebuild 1042 BLAKE2B a3a9eca694da23660b8456dc377fd26685ca1b7dfee26d22b5bd1970d6a4cd1156552bda108d6284aa26b90247c4e2f88d6aa25fd45da48090c938996d6c9463 SHA512 8cea035bd9d0f6c3835530ade239658eeda18e7961f54dd0784d87171bd7a32467e19997f2366c2eaf4fb1883d7845bf26f9f61a07186874da7303e6936f4766
 EBUILD xfce4-meta-4.18_pre2.ebuild 1046 BLAKE2B 791b8dcd5ed51648e9adc16f2aaa77249be01c85e1279afd434cec51c857625b7dfc17c63fff524d42480a42a60b0892dd9808f94e78c2e68525361a1f90c029 SHA512 63b7561f7b76d3a9f796f5c9fca5990e3e9adc50d3c1a714d60b6c124a559d20ab12c887419d6bd0f71094edca66ba4a34ba388d3416bb2eb3508de6070faac0
 MISC metadata.xml 248 BLAKE2B 83bf47dc3dbedea8a88932e922075f0ba8fd841433c4ab750e2ab61c22e8cbfaa1acb04a903d89ef5140a75dfc4c4899354623e0160df5b7c178c190f8494515 SHA512 b5200cfe30adef8e869fada87f1b4171210b2427cd3ac12edef70948f305d5e612ca5f24d377f9823a6022c8867db635db50ddd3d6cb362d6b0137c299fe07e5
diff --git a/xfce-base/xfce4-meta/xfce4-meta-4.18.ebuild b/xfce-base/xfce4-meta/xfce4-meta-4.18.ebuild
index d0a4c0bb5be1..d8e7c80c8216 100644
--- a/xfce-base/xfce4-meta/xfce4-meta-4.18.ebuild
+++ b/xfce-base/xfce4-meta/xfce4-meta-4.18.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
@@ -8,7 +8,7 @@ HOMEPAGE="https://www.xfce.org/"
 
 LICENSE="metapackage"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~ia64 ~loong ~ppc ppc64 ~riscv ~x86"
 IUSE="minimal pulseaudio +svg upower"
 
 RDEPEND="
diff --git a/xfce-base/xfce4-panel/Manifest b/xfce-base/xfce4-panel/Manifest
index 9c9c9b4bb179..fec1c5557a6c 100644
--- a/xfce-base/xfce4-panel/Manifest
+++ b/xfce-base/xfce4-panel/Manifest
@@ -6,6 +6,6 @@ DIST xfce4-panel-4.19.0.tar.bz2 1485117 BLAKE2B a70654a1d8633f04310a1a9fb8554254
 EBUILD xfce4-panel-4.16.5.ebuild 1505 BLAKE2B 53dccf21ec9f185be56fac924ef8c2746728f154eb93535d4a91bf70a07929ffc6998e0f3765c472a2e2d36d5f8fd981a565ed9837909776ad1e30cb923eefba SHA512 cc50480cd4b67dc69e8b7a84f7a4710c53b2dac803b38130317fa732e0cfc06db7d0a50802ded311768a99c7d67271baa0a33dc09446a9d513be820b3368d764
 EBUILD xfce4-panel-4.16.6.ebuild 1511 BLAKE2B f3e24b8299e0e84c1553445c8b825058cb44923286befac2b5520df5c81b3acfabc418f116820caff0df2301ce64c79cc67eb77113e070157da1bfa7a81fd39b SHA512 106664e1351aefcc902717c0b60fcd090bfb65b791dbd9e8e12fc3326002a0444ee4baed03a141187567741ab859901e8adad7f676a1fee3aaffd1d2f6926210
 EBUILD xfce4-panel-4.18.0.ebuild 1596 BLAKE2B 6c2a566c4e4725f05d56fd15e6fdf13899b56f465f6d2430a2fd5efd7d904240027b8385dfbe93445e68a4a541adf987f23c95ee731fa773b4c56955b3691f7c SHA512 a6f20cd9f93f89265d41f512e22868390009e0cd636dd0c6736177b2382c9ad9d0b931dce571d742a72aefdea9437119b3dc139a113bc437044c29a449d13164
-EBUILD xfce4-panel-4.18.1.ebuild 1596 BLAKE2B c3a1b270c82b55831e96da1a09ca5b7a4d0bc3f94968ec59619ba085bbc802bed69e1a7135d0f4dfefdb601390e90550cf67d9a56032eaf46ef18209140e4422 SHA512 66035ad611a7c795d5f362f30539bc8868b703775c9431297b37c89710f72f99fd918b15088092137e01dddafaed31599334b779f01208358f49d65b25f5a7fb
+EBUILD xfce4-panel-4.18.1.ebuild 1593 BLAKE2B 604fc20ce63c83ad16560c03d3fcf8653eec8e39fd4fd64040d2c6966561ff8412644eae8ae03bfd269989747d7e8ebd246bbb9845769158bcda7ec232228a04 SHA512 15ed62bd61525022518910b4b26d9c4778d8e8ff88ffe1f90e0570f50ceb38dd48958314e63499a6dd2b2e6b03bb7a26793edc646b76afa14f984be0ada98ff8
 EBUILD xfce4-panel-4.19.0.ebuild 1821 BLAKE2B eb4a2619a747ad7fb4570700dfaf2a15c44f8d2309d65ec11daea44ccbe7dba5598a1b47bcc5b98f11330d532b2a8fc7a4d2cb273a00019dfedb657d957f879b SHA512 9972686996e17cd907e7cc03c56b6ba4ac3c4908893cf4ecc845bbcb7bc33bd77db97928022c6d5995bf9a92b67265a09fc33f254953be23182825057084a4dd
 MISC metadata.xml 377 BLAKE2B a9ab246bf0acb1731905d6f7aaa6d558204ca06138e0f531b76570f1477353a636b504ccab11ed861044faa5d02fefa43c5cc08f8d6c742851f1e8976e08f3d6 SHA512 9269670fb22fc1179cbc6f4a3f7f160bd1164ab470f6bbfa4875d85d7c0fb29ac7ae05d46daaaba097a418890961e568ce249e60329ed0325ba3f5dc976946f8
diff --git a/xfce-base/xfce4-panel/xfce4-panel-4.18.1.ebuild b/xfce-base/xfce4-panel/xfce4-panel-4.18.1.ebuild
index 7d772282a7b2..ab7cd82e3c01 100644
--- a/xfce-base/xfce4-panel/xfce4-panel-4.18.1.ebuild
+++ b/xfce-base/xfce4-panel/xfce4-panel-4.18.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="+dbusmenu introspection vala"
 REQUIRED_USE="vala? ( introspection )"
 
diff --git a/xfce-base/xfce4-power-manager/Manifest b/xfce-base/xfce4-power-manager/Manifest
index 99bd01ee6370..339f1a3cd4d3 100644
--- a/xfce-base/xfce4-power-manager/Manifest
+++ b/xfce-base/xfce4-power-manager/Manifest
@@ -3,5 +3,5 @@ DIST xfce4-power-manager-4.17.1.tar.bz2 1239323 BLAKE2B 204068b3762859147d68b5cd
 DIST xfce4-power-manager-4.18.0.tar.bz2 1239515 BLAKE2B 1fc2ffcde64e873693322694ef638cc1e3e0773cc3dec663a03bfb7c4833e410e96ab2726fd5b7600149257e8add17ce51da6db5f31895c66007a83ed1837e18 SHA512 5cfa5285b479a0341b4afbf3141f773ff217cd1003cee55087a33f27e392dacf4930bc08b4faa7296dfe9e738d114a56efcecca32145a4cf68856d5d6feb9d24
 EBUILD xfce4-power-manager-4.16.0.ebuild 1561 BLAKE2B 767541c3ec06bfa8e4f74774e5c14fb1aaf666577253744ce7bd843c97d57e64c8aa4999cd25ffe1c43df043c3968e7ab35623ae34716800de763b3c8dc95a8f SHA512 11d6f3460d3385fe853800e27f43ff565f98e48ec2941ad63c6e6468c92c136fd5fa915c2c9d9a1607d8b55eb471936d4437ea8b2130f1c3b72de70764c6ee3d
 EBUILD xfce4-power-manager-4.17.1.ebuild 1616 BLAKE2B 1350e058fb119325a6825c8e92f7dab6934f9689cb827a171981e1afa9debc7442211f35a314525406c8ff212bd5d6bc0c0692a4b3c340c6ccca8594992d9d9a SHA512 a990377807b36ff69119b3d32d2e41699543bc3c577d6f80b7707195a80c0eed1f0c331e5115a25bd47cb098f4ef8133ef7221e7547e98f9a6ff7b489f6899ee
-EBUILD xfce4-power-manager-4.18.0.ebuild 1620 BLAKE2B d8ee1d03ecde01fc85470bd8dd604206c478e323e49298632416d3698563c4e23156c4b0e3852df5a6ccedc20560922352068aef991284aee17c9e3e4adf965c SHA512 e6bddc822e6a6653d560911d176bc3b586d43fd1a513573bf16c21a70dc752957af1c8217e5937a4d2d8c65f4823eb17504c581a4ad6b6884b426fad08f074d7
+EBUILD xfce4-power-manager-4.18.0.ebuild 1617 BLAKE2B 9a4f52142a8d0df80c5483d92c37e405c2c2ebe2726d7a639c9ea254911b1adc2bc2c1c96dec95ffac0c4d3acbd4722e43cf4dc2fc2b1187a2e22fdda7be383c SHA512 c839266ce31d5dbbaa464dd7c770f3bdd37792626babdb350508490a0a55d034220fe0576b0bfa4deb81265a9e2a5fee6a5135931b488002b10842cad69132db
 MISC metadata.xml 361 BLAKE2B 0cd2ec9e6643d7379a8c37fc9ae3b3902396c94732182f4a3c7d50bef85e555c9d69b6c8ed13d127167c44e687d356b171f46d071acfa4c26b623835df9d94f6 SHA512 ca556c6a8e5df8b0e897fe64e04fdf23b23518b86db0e29568131d2d17329122f2aa012b2b2a7fb5811bd17a230c1d5a6065ce747532b4eb868cab4eb9d9dcd7
diff --git a/xfce-base/xfce4-power-manager/xfce4-power-manager-4.18.0.ebuild b/xfce-base/xfce4-power-manager/xfce4-power-manager-4.18.0.ebuild
index 7ce61d918b30..d91f2406f9d5 100644
--- a/xfce-base/xfce4-power-manager/xfce4-power-manager-4.18.0.ebuild
+++ b/xfce-base/xfce4-power-manager/xfce4-power-manager-4.18.0.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
@@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~ia64 ~loong ~ppc ppc64 ~riscv ~x86"
 IUSE="networkmanager +panel-plugin policykit"
 
 DEPEND="
diff --git a/xfce-base/xfce4-session/Manifest b/xfce-base/xfce4-session/Manifest
index b8643a3ce855..03099e82c989 100644
--- a/xfce-base/xfce4-session/Manifest
+++ b/xfce-base/xfce4-session/Manifest
@@ -4,5 +4,5 @@ DIST xfce4-session-4.17.2.tar.bz2 852648 BLAKE2B be74ee215d687b2f01c39e73ece4645
 DIST xfce4-session-4.18.0.tar.bz2 853627 BLAKE2B e2a4d2dfcdab677b738d2fc3857bb7db07a0918af5bd4977e0f04210d52d4fc94551187b0ff2e3b5289823aeba0e12dc00344043da0fed2b3b2207afda423731 SHA512 00fcae02004675a26e6d73998403cf0e3a36dfd3596315ee98567d302a10c344cc1b64dac782e02416f11f6db3c730792e8de7d2d0ea1a6e0f2b2b7dbee74f4c
 EBUILD xfce4-session-4.16.0.ebuild 1757 BLAKE2B 56eb10e1e704543a9469aba7bb7f294855a7d844433723736fa7d3fb99e8d4eefd893d45ea29a731cc0315fdefb03f08144dffa1af931c6cab155d7c72a836b3 SHA512 3f8346a8b9cad7f20f19e13ec25ad3621abdfe540a76c6c2b347bd9524acb59fb6a6d7b8503af24ab75d76901c868b60ff25dfaa595fee378100cb320efe71ae
 EBUILD xfce4-session-4.17.2.ebuild 1513 BLAKE2B ab88ee446fd99e8dd2e67da5a65e23dd4640fce3a35e3156ec2c6470be2e06c7d24a54cbbb588380957e9e9f1761c8fd626236365ca37bd203d4767840ca8101 SHA512 ac94ef2d3299d48bb7fce89edfaa8f88bf96120ef4ec1f3b990d805fa893017771d12ce4438d1ae5148487c91f12a7fe31b5a56591a5c1fd0a445981079f6152
-EBUILD xfce4-session-4.18.0.ebuild 1517 BLAKE2B 99fb734b98b7bb7d18e6af7f3f3d8afc350c9621a9c91ae58c0bf6857d19d31e31badf358480ffbfb9e401235c606ec84031f21c02d1cb4a7d655c59830d7f74 SHA512 240001fe89b420402e43febfc1a9369eab6b96bbd0f9a7a67e869e33a1e52a4b1eb96072d126c9a8047f0c645e40cd500b5422d9316e686c9748f45443f536a5
+EBUILD xfce4-session-4.18.0.ebuild 1514 BLAKE2B 75c73f7e01cc407042681efd1e2954448f6a266ae422c45eaf0014a98344e46216d6fd4ff8af968739ad0c5e7cddf069c0276eb7fc4ff6819a68d3234c92e896 SHA512 31ee859f0c2d5275c69fa1ec507924d16f180035d8ad457fc9d2db1106ca6c86366398d2e6e0c03b2da3002b14af9f1547cb572143d107e8f7cac074d7b24c15
 MISC metadata.xml 248 BLAKE2B 83bf47dc3dbedea8a88932e922075f0ba8fd841433c4ab750e2ab61c22e8cbfaa1acb04a903d89ef5140a75dfc4c4899354623e0160df5b7c178c190f8494515 SHA512 b5200cfe30adef8e869fada87f1b4171210b2427cd3ac12edef70948f305d5e612ca5f24d377f9823a6022c8867db635db50ddd3d6cb362d6b0137c299fe07e5
diff --git a/xfce-base/xfce4-session/xfce4-session-4.18.0.ebuild b/xfce-base/xfce4-session/xfce4-session-4.18.0.ebuild
index 343ee4c5d060..885639b0585f 100644
--- a/xfce-base/xfce4-session/xfce4-session-4.18.0.ebuild
+++ b/xfce-base/xfce4-session/xfce4-session-4.18.0.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
@@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="nls policykit +xscreensaver"
 
 DEPEND="
diff --git a/xfce-base/xfce4-settings/Manifest b/xfce-base/xfce4-settings/Manifest
index 0f93644a537a..df8a18f7511a 100644
--- a/xfce-base/xfce4-settings/Manifest
+++ b/xfce-base/xfce4-settings/Manifest
@@ -5,5 +5,5 @@ DIST xfce4-settings-4.18.1.tar.bz2 1513041 BLAKE2B 83b47dbe138bd809391833a4525d0
 EBUILD xfce4-settings-4.16.5.ebuild 1761 BLAKE2B 70022b27ddf95652b89e0fac59547ce8e1c77fb53b2a470645938ffaf3d55de57aa0b3fd8371553558faffc93b3ed485be7e20aeea74fcd599c3822f57f0fe37 SHA512 d1a8117fe70dd793cf9780e767a7633a8f18923a9df622848814650a9559a87b2bbd317f0acc54b17f6db70d4096b6d0cfa7d34db861e1434c86e2be74ed51c4
 EBUILD xfce4-settings-4.17.3.ebuild 1816 BLAKE2B b9749632f84e4184516f8530c6e41e0cc239b704ffec9fd23cc849f3528607d82c179460a01a408f428cb84bc90aab232d0462b790c455f70434b99d70c5effc SHA512 53def1ec0d3d9ffae0ec7f7308be93be7a8df4096594b780ff5d8f33eda8bd860de7aa44acd70186bcae8452c6bf0c81e00eef5755ce0f697458fe3c05389bf7
 EBUILD xfce4-settings-4.18.0.ebuild 1820 BLAKE2B 761df5405092625aba448eb7bb45d90c73ed61b174559c55efdfd4a561f9db2429fc963e52f9613bb1671f5d446655b66d70949a82932d065c58dc43c48a9bdd SHA512 dfd3ae579e17be8490fc1ac6c8d6fcbf110e012525b87bf30ab31ea1e69ea5ad9b38b3312523a7bd213dd6a5864ee90a136b9522d27e10f6c9b81d5894c479fe
-EBUILD xfce4-settings-4.18.1.ebuild 1820 BLAKE2B 761df5405092625aba448eb7bb45d90c73ed61b174559c55efdfd4a561f9db2429fc963e52f9613bb1671f5d446655b66d70949a82932d065c58dc43c48a9bdd SHA512 dfd3ae579e17be8490fc1ac6c8d6fcbf110e012525b87bf30ab31ea1e69ea5ad9b38b3312523a7bd213dd6a5864ee90a136b9522d27e10f6c9b81d5894c479fe
+EBUILD xfce4-settings-4.18.1.ebuild 1817 BLAKE2B b79ae2dbb1f1e9a17e8f80408580b8f4410e872406f0b1a045fd42fefdeb69dedf9083063f61bfee9e314b665150713b392059b83714874aba57738ce9510673 SHA512 75d8a127c7b8bd6bfaf059946077f35eb57a13b1bec2555c628ec1b0742c1a373056094c9e5ec49a93735a273cfab277631dd03532973d3a8a1a8df6d63a5657
 MISC metadata.xml 480 BLAKE2B 4aabe2bbd7da19f62794843c890648503139a81904d84f6b97f9af9634a43ad583eede1adec9704969663455d033838db3a9a825c90d6f341cea411ed89514f2 SHA512 7e1e28f50387533611b4cee185e5e91b1dcc180ebb5bf7bcbd5fa58bc8ef666ce1bba57961de19016ceaa75a6b60b70ec55cff9a2d22bdf0d4f2b9e04abf2bb7
diff --git a/xfce-base/xfce4-settings/xfce4-settings-4.18.1.ebuild b/xfce-base/xfce4-settings/xfce4-settings-4.18.1.ebuild
index 5ac63306b8df..4439ae74586e 100644
--- a/xfce-base/xfce4-settings/xfce4-settings-4.18.1.ebuild
+++ b/xfce-base/xfce4-settings/xfce4-settings-4.18.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="colord input_devices_libinput libcanberra libnotify upower +xklavier"
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
diff --git a/xfce-base/xfconf/Manifest b/xfce-base/xfconf/Manifest
index 0f08743743cc..bd08b917785f 100644
--- a/xfce-base/xfconf/Manifest
+++ b/xfce-base/xfconf/Manifest
@@ -3,5 +3,5 @@ DIST xfconf-4.17.2.tar.bz2 625124 BLAKE2B 173f50ab3b0ded6b62bb421006588be6624289
 DIST xfconf-4.18.0.tar.bz2 625755 BLAKE2B dac7ccd7052818436f45e6c257cc6076221d9f5d7c2d836d909be0d9479abd88f6c17748cf0aa65be79a0642c7bb7ebb01b6cd5a22bb22d514fc3ed57be5d4af SHA512 49ac3070e44e0c699c157e6c029bf14d932bc1e60b01bc3b4f7451acf403d451ac52e2dfb14fc97298cc774c7a0895616788cdbfc189976805669fcdb7aa47b6
 EBUILD xfconf-4.16.0.ebuild 1777 BLAKE2B 8e67eafffe8f5d85accd4973385a8ed234e7d363f89cbaed42bc3df5df233f422f2226396f2cb6d80d93f52775ba616362eb79d7484735aea60971ba9b803bb5 SHA512 9d11ecdca867cc4b9c1f16bd382eedec0ca1c5209040a7e3771ef77f56f407fcf2fb363b5f3e171cee856020fd47fb8df476c1aea74b8d482a0536e27befe38b
 EBUILD xfconf-4.17.2.ebuild 1722 BLAKE2B 0e519d0736a5f1e0993b341260cfca7c98c8c12d3b912e7d5f76d3acf03aa3d7b983a1a2a0de221adb37bc63aa1717686b8786f7df6caed5cb9b67f064ad9a7a SHA512 620b12741a74915f4921e6824066f1bd5dde191691c60a5e75ff7053564c8d16910e47b1e7baa23ada45731cf0262c9f115ef9ca3343f3ea95b97511c8c26ef6
-EBUILD xfconf-4.18.0.ebuild 1724 BLAKE2B 7900c541e809242b05c37d8f3c08ac060705def856275e29b81d47ce6c90ff9cfddc061d55b2be83f5683b6662afb2a6efc8d1f0ffc485a7f569c131b1b67c39 SHA512 c690b24419b5776e028826303a529c73923a18b45fe3e448f9f1df0270ef0b256eaa9910ab3981074478ec994d5d835683bf1240a9d4b78f0c7aaa9471a66253
+EBUILD xfconf-4.18.0.ebuild 1721 BLAKE2B ffa34f1d5d19a201c80f1260199297fd9b700ae4c809543e80a14ed52780aeb73d97fa33c29c81f1592af2b4cc94ee64658e09fa1dd783080288b8a4439c81ed SHA512 8b007f0ba7ed39f3eea3003ce7bbd835819033d6b5697a4a95fb5770933459e8b72f275a027ed39d100891104c3f4fed58ad4e4ee3b933c21561e3c192d65025
 MISC metadata.xml 248 BLAKE2B 83bf47dc3dbedea8a88932e922075f0ba8fd841433c4ab750e2ab61c22e8cbfaa1acb04a903d89ef5140a75dfc4c4899354623e0160df5b7c178c190f8494515 SHA512 b5200cfe30adef8e869fada87f1b4171210b2427cd3ac12edef70948f305d5e612ca5f24d377f9823a6022c8867db635db50ddd3d6cb362d6b0137c299fe07e5
diff --git a/xfce-base/xfconf/xfconf-4.18.0.ebuild b/xfce-base/xfconf/xfconf-4.18.0.ebuild
index cbc4b3f557d9..0c8983358a81 100644
--- a/xfce-base/xfconf/xfconf-4.18.0.ebuild
+++ b/xfce-base/xfconf/xfconf-4.18.0.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
@@ -14,7 +14,7 @@ HOMEPAGE="
 
 LICENSE="GPL-2+"
 SLOT="0/3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
 IUSE="debug +introspection vala"
 REQUIRED_USE="vala? ( introspection )"
 
diff --git a/xfce-base/xfdesktop/Manifest b/xfce-base/xfdesktop/Manifest
index 9d33e4f0fbfb..c37fad57fbb3 100644
--- a/xfce-base/xfdesktop/Manifest
+++ b/xfce-base/xfdesktop/Manifest
@@ -4,6 +4,6 @@ DIST xfdesktop-4.18.1.tar.bz2 2133258 BLAKE2B 3d4f54b64a6adc5f52bf6b48862b1fbf9b
 DIST xfdesktop-4.19.0.tar.bz2 2145725 BLAKE2B 18ed97b8bb9ee769de29490383fd089eb884081c95e662350c9e0c05aa9812a4f44e8911c5bb74e026aa1fea22840245a68e1514dd6e439af8dd553c82da562c SHA512 dd8d479b7a43733dc49f692bd88ad5a290d5fa4cdbddf42be293921c750d3017e9c6671cc56ba8888a0df8d3951b0993dffa88418032ad7c68f85d8756081e40
 EBUILD xfdesktop-4.16.1.ebuild 1177 BLAKE2B d4d5846b53a75b05f07e762e2e8f1f05517c873443de32f529f95dd5c7768748019fb26f19bec1c32510b45e00af1966df660925eca6ad4e2af21808466bb75f SHA512 c5e7d0e6c532aaa980f3477a2e6a7e7e2f2e69c0c76d088905a37b9303c251cc44597a7339f472321edcef54f8b001e6eb377b2b333defde76f65d8a7d614ae8
 EBUILD xfdesktop-4.18.0.ebuild 1248 BLAKE2B 81a722121173ba40b2da39129eaa9dafb48d0e3674dbdd1d7f90f2f41ab55e5189a586098373ae26242c10f2337dca42bd3385a681582b9f836bcff36266aebb SHA512 1a059a651021f931b9c4ba423113efa7cea3951e85f7453f9f71dc58260fb909076af812b72abbd34bcd3b28cac2c8592a4c3854dd761841b9289bbc01bb5222
-EBUILD xfdesktop-4.18.1.ebuild 1248 BLAKE2B 81a722121173ba40b2da39129eaa9dafb48d0e3674dbdd1d7f90f2f41ab55e5189a586098373ae26242c10f2337dca42bd3385a681582b9f836bcff36266aebb SHA512 1a059a651021f931b9c4ba423113efa7cea3951e85f7453f9f71dc58260fb909076af812b72abbd34bcd3b28cac2c8592a4c3854dd761841b9289bbc01bb5222
+EBUILD xfdesktop-4.18.1.ebuild 1245 BLAKE2B bbc0a27f76f26e8ff90660f6fadbb883da4a3ba8e701f5aae9f43065f8855248bff1e5b86cfa24f2446ee46f69f37f7c40fa12df38b532655729d685af386b5b SHA512 7eb8e433daf1c1a87190ff317a23a3b38fedb2f3d769ff09acd9a61755e55337e72650e165b134f69440443036fa8ef05ad3a93aaa613a1bf2a5ab7fa90e0152
 EBUILD xfdesktop-4.19.0.ebuild 1373 BLAKE2B cdc7637b6904754889ca3f560f53f19d4d7bc49d773933fe6a12fd0d22383ec4fa8d6a5f2aee8bf2c0dbe889e113d7bdeef679858baf50f00567fbb245f1fb1a SHA512 82ce457d4be3828a17f1b959d0ebb1c1a9582e7cf36f3a7e16abde90adbcd492500e144eae5c5f39488cfc3d0e20b4217057788c76b13c6185aa4f57e1bdcfc7
 MISC metadata.xml 365 BLAKE2B 3cd0b2d7af4ed8e4fd437c2943ca6324fe0b3ba74f92ef24adf0d2891cd650ca7007827b55d4a0d2ce9684219c417933055db293aa79c8834ca1cefe2a9bcccb SHA512 90ca4f491f2281bdee066d39066cc99e738a7fba87fc4d7ea435462ca7f7dd7bf451f4f6658b0f5d46690058de94ad98c2c6074baa94398d6d26d2950decd574
diff --git a/xfce-base/xfdesktop/xfdesktop-4.18.1.ebuild b/xfce-base/xfdesktop/xfdesktop-4.18.1.ebuild
index f022f029c5f6..1100c1d3e7da 100644
--- a/xfce-base/xfdesktop/xfdesktop-4.18.1.ebuild
+++ b/xfce-base/xfdesktop/xfdesktop-4.18.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="libnotify +thunar"
 
 DEPEND="
diff --git a/xfce-base/xfwm4/Manifest b/xfce-base/xfwm4/Manifest
index 377a73ceebbe..b04add28fdaa 100644
--- a/xfce-base/xfwm4/Manifest
+++ b/xfce-base/xfwm4/Manifest
@@ -4,5 +4,5 @@ DIST xfwm4-4.17.2.tar.bz2 1220699 BLAKE2B 4bc011f17ee7fb662e4bb0c656056c45bfb2a0
 DIST xfwm4-4.18.0.tar.bz2 1220901 BLAKE2B 3a3db6368063b94fa46407fbf2173021a91efff04ed3d11c757d3e785de5e70289ae03e138e95979b3801a781c05d5f84b86b29727171796e1b80f874865bb36 SHA512 1003bb1ca5254221a5d56ffcb51c12cdef1b17b9d252622c6b18f3d3fbcf9d6e0e66b5f61e0f6eae6601ea3e50a70be98320e60d6738b04e44879e6f4e6da34d
 EBUILD xfwm4-4.16.1-r1.ebuild 1710 BLAKE2B ab3b17a6e1e5b4ce63b4f88de63be547b6846d98fddfe42e699becf94da853d062f1c0f6e98e19aacd651c1315a26f8fc62740f736dc613a9ba4397cf0b0be30 SHA512 49c7772e05611ce483653a1708c6a2420806e0c6c47ad7f9e71d96ded4f9534db62791c7c7861d9d0dae97e0cdf9f55454f0121b42d21630351c9df59765e9fc
 EBUILD xfwm4-4.17.2.ebuild 1548 BLAKE2B 06931b5759a4d5823874144871f6af978f7adb350ac7069badffd2c591b9eb63fa17bdaf6e8f7830f60c77b2c37f32c18600f25cdc23bfc6f4d4ddd4dc90df9d SHA512 1cc9db2172711cc333812a180f22b4a8415b04bb42d0df60b33c7694a91571bff1a75f89712c8d8f8dcf0c3f860bcb7207237c1d73528312d611414dc1a4e8ad
-EBUILD xfwm4-4.18.0.ebuild 1543 BLAKE2B 605f3596f2c518d3a3945d25682a565402bf06ba3b946d6d73b99ef54b812122cb19a0025113c66e8d4e7225f50134813af2f5b2703b99a047e2fd03019fdba5 SHA512 ad1ec762076e6979e9b04fb5abf9dcd96cb474b4f61a721b12ff9d40a17945b900bade07e5cfb648ec5cf180683efcc7a61bb452147bd006e0ad834fccf8b3de
+EBUILD xfwm4-4.18.0.ebuild 1540 BLAKE2B 50f146003b68516612da2054ae30c749286b38b472bbbdc7621c219f91f6c764cf1dbe81418f5c38183d5800e963b284ec8b170e5561eb9c8cf1665ce878baa5 SHA512 9131dfbdfef6d2f6b4c1c1a7716dcf7b602934c5714b59183fe6704d3b216d12ace02ff0480f2a21c7150c8b92caccb7dcd162e7ac2b87933401310a7e37606b
 MISC metadata.xml 337 BLAKE2B e51dd05bbb1b2959c65a70a2d16fb8cf627045ab1abcae5838b013d7edb4d5bd5f79a70f3ae31ebd5c326c13ac2e48909621676af8b38e05df8e6f2e0e80e4fc SHA512 cd7a8c5cf84729ca130cee2f33b5358f8f7edd99ca321b7331f43a5e4e5016b2f664ba88230b7dbbddd2298b2ac846c144df87baa43b88426849d55a8f9a7dca
diff --git a/xfce-base/xfwm4/xfwm4-4.18.0.ebuild b/xfce-base/xfwm4/xfwm4-4.18.0.ebuild
index 350c367a5f0b..92707fe53e77 100644
--- a/xfce-base/xfwm4/xfwm4-4.18.0.ebuild
+++ b/xfce-base/xfwm4/xfwm4-4.18.0.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
@@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="opengl startup-notification +xcomposite +xpresent"
 
 DEPEND="
diff --git a/xfce-extra/Manifest.gz b/xfce-extra/Manifest.gz
index 6bdc1fa3a247..50472c982bad 100644
--- a/xfce-extra/Manifest.gz
+++ b/xfce-extra/Manifest.gz
diff --git a/xfce-extra/thunar-shares-plugin/Manifest b/xfce-extra/thunar-shares-plugin/Manifest
index effa91998848..5f058ca395d5 100644
--- a/xfce-extra/thunar-shares-plugin/Manifest
+++ b/xfce-extra/thunar-shares-plugin/Manifest
@@ -1,5 +1,3 @@
-DIST thunar-shares-plugin-0.3.1.tar.bz2 373071 BLAKE2B 25562e8583503a170d15b611aa07c2e1426bee292b8cda4ae9c4eaa6861fa4c1a2fec531b3bdeca6bf06097e4bb2be924fddc07d73633c5f9d714837e8fe80f5 SHA512 08fca3fbf88448808ca84753d867c71114d1700fa63d792771c3c99a6da8c69ee7c53f05f883b2180cb06d2c187ee2a4d1fc889c7f392b1ec0d5981532284a3c
 DIST thunar-shares-plugin-0.3.2.tar.bz2 365609 BLAKE2B 25f959d81b689dabe930910402dddb047208caf9400db9830b1e5a1f8fad6b676706ce79b9c7e0036292c995451998ff40cadd60ae2eaa47bcaf7994772081ba SHA512 26c3085b3ede065a0c9cdaf5a97d1617d581148e14d35e690f592316beb4e261f31cf864b5f47449030a77cdab33a22cfd4f9f36ccc47d4736e754de459b89e3
-EBUILD thunar-shares-plugin-0.3.1.ebuild 629 BLAKE2B 5e80ad27ddcc9079ad9768a6ec21c99553d457a2f0868ac1429def73e3be68ccd539fcaa95c4f536d08505073c6d6d4d9b591d5dc653f003358ebef109328233 SHA512 8f71cf08ae73e3c6cb06b564b0653e8d208435dc87b94d7397bf81f315604fa1fc0a95cc4877620694985f3f481ff8ebe273b303722768456581fa1596c950e3
-EBUILD thunar-shares-plugin-0.3.2.ebuild 713 BLAKE2B 20eae93867547dbe6d5ae88d3c0db98f8572fde488f0f11b7e0c83e36d6353a19a66cf8c40086651564218b75379036aaed6c95d5261ffada176602bb1db6e54 SHA512 5c283fd5ed95aae4bce9e78346f8153d6d855b7039adee981d0da23bf24f00abab826d46e1da0495f280b75457f2702c01864399ea9571d1c7fc0a74b16e4e52
+EBUILD thunar-shares-plugin-0.3.2.ebuild 711 BLAKE2B 0a6b67da4c28685f7527f86f2ee263131a224c1b170927f96ceb27de9bbc69b1ddf90f132db1ad1885ecf10c458052cd1e7d1ee23f430a3d965f1ba1dedfe71e SHA512 c4d410a4bcdb05a8d2ea501813eff5b630c34e9a962e90c8355f5d03335635810a097f3e8027822651741cf07563d8524f6c3f4dc325a39677a68e9e1e917d73
 MISC metadata.xml 248 BLAKE2B 83bf47dc3dbedea8a88932e922075f0ba8fd841433c4ab750e2ab61c22e8cbfaa1acb04a903d89ef5140a75dfc4c4899354623e0160df5b7c178c190f8494515 SHA512 b5200cfe30adef8e869fada87f1b4171210b2427cd3ac12edef70948f305d5e612ca5f24d377f9823a6022c8867db635db50ddd3d6cb362d6b0137c299fe07e5
diff --git a/xfce-extra/thunar-shares-plugin/thunar-shares-plugin-0.3.1.ebuild b/xfce-extra/thunar-shares-plugin/thunar-shares-plugin-0.3.1.ebuild
deleted file mode 100644
index c1b06c8d314f..000000000000
--- a/xfce-extra/thunar-shares-plugin/thunar-shares-plugin-0.3.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Thunar plugin to share files using Samba"
-HOMEPAGE="https://goodies.xfce.org/projects/thunar-plugins/thunar-shares-plugin"
-SRC_URI="https://archive.xfce.org/src/thunar-plugins/thunar-shares-plugin/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.18
-	>=x11-libs/gtk+-3.22:3
-	>=xfce-base/thunar-1.7:="
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig"
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/xfce-extra/thunar-shares-plugin/thunar-shares-plugin-0.3.2.ebuild b/xfce-extra/thunar-shares-plugin/thunar-shares-plugin-0.3.2.ebuild
index 265a76a338ca..b9dddd46ecd2 100644
--- a/xfce-extra/thunar-shares-plugin/thunar-shares-plugin-0.3.2.ebuild
+++ b/xfce-extra/thunar-shares-plugin/thunar-shares-plugin-0.3.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 
 DEPEND="
 	>=dev-libs/glib-2.26.0
diff --git a/xfce-extra/xfce4-cpufreq-plugin/Manifest b/xfce-extra/xfce4-cpufreq-plugin/Manifest
index 0a99a2d73880..13b570e8e9c7 100644
--- a/xfce-extra/xfce4-cpufreq-plugin/Manifest
+++ b/xfce-extra/xfce4-cpufreq-plugin/Manifest
@@ -1,5 +1,5 @@
 DIST xfce4-cpufreq-plugin-1.2.7.tar.bz2 446055 BLAKE2B bedcf4ece6f1696a13144b0dd9d28a9dfdda255ed72f3b7aa7d572fd33b718a01850aaac90887b79ca57e4a7a9e4a6b234ac880e3a180a459e54c8377da3a9b9 SHA512 6bb7f5790d3ba9756afcb47cde40420453afe191fa111e390f2ad9780f3ab51ac2c6a69586303e9a5d1fb7d1af3eda3dad93f10df072f9ae59e47fc2216db434
 DIST xfce4-cpufreq-plugin-1.2.8.tar.bz2 431599 BLAKE2B f08d27b2461e3ac387dc139231a8febb6239fe8e5132ef89a6d4a8f9009fb7a3dd011ead97f27872fbb4857fc563e65fc2dd6e0f652d8d7299d3c9966d6f8b57 SHA512 482912920703b61ccba59b1a95a4153d06a7c897a59d7c2e5f84f6ea1cac17be2bade72d9187fc62279112f41cd2dd3f3157df31fae165eb2a104b74fec310da
 EBUILD xfce4-cpufreq-plugin-1.2.7.ebuild 842 BLAKE2B bbd2ed78612ae4532c362e240e859bb9e5c31f4673d259f6e48a23b372c2390333028245deb0b42cd539715342b4da9e620767a0e32a8c70ebf9c35f739e5143 SHA512 41341b7c379eb47511dfffbda052ab0786f391b4ea71b2dc6a81c7295ea43cac4b22e57758bcf95305d2cf1af1b18ec2f08d1c486f88bf551266d2d419a2a40c
-EBUILD xfce4-cpufreq-plugin-1.2.8.ebuild 909 BLAKE2B 981a17911cbe40be28e9d2631834e515fe0ffc459837e439e34aa86c19a2c8a38c089e447ba0eae6ce098c611b0fd699a79cf3f5260ba4abe7788730802d212c SHA512 7efda00af940322d5972cf1231eb30e542f99823df21e639a7f681abca10827181e6ae2b71b04e7f4b8d359c1258dae9884eabb2daa9f81768af81e6761b7e63
+EBUILD xfce4-cpufreq-plugin-1.2.8.ebuild 908 BLAKE2B df33efd092240bdacb72337328e9584eddf31fb00d326eefb2e04004402ba2f5a8e97b98896d5a524da65f4e9bf0b06baa28adc17e800c344a64cf5ba596f857 SHA512 1afc87c190be38dfb9f1c7fc613b69b323d27b313fd3a7188581f8e6081965836f3c7d128847abbed04bb32db2887c0962156b1b78e75d42b76d1bf7ab6f5b00
 MISC metadata.xml 248 BLAKE2B 83bf47dc3dbedea8a88932e922075f0ba8fd841433c4ab750e2ab61c22e8cbfaa1acb04a903d89ef5140a75dfc4c4899354623e0160df5b7c178c190f8494515 SHA512 b5200cfe30adef8e869fada87f1b4171210b2427cd3ac12edef70948f305d5e612ca5f24d377f9823a6022c8867db635db50ddd3d6cb362d6b0137c299fe07e5
diff --git a/xfce-extra/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin-1.2.8.ebuild b/xfce-extra/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin-1.2.8.ebuild
index 9c4b3d67d7a6..f86f6341d112 100644
--- a/xfce-extra/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin-1.2.8.ebuild
+++ b/xfce-extra/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin-1.2.8.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
@@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ppc64 ~riscv ~x86"
 
 DEPEND="
 	>=dev-libs/glib-2.20
diff --git a/xfce-extra/xfce4-cpugraph-plugin/Manifest b/xfce-extra/xfce4-cpugraph-plugin/Manifest
index 5755b06546ec..4f9df4d56fc9 100644
--- a/xfce-extra/xfce4-cpugraph-plugin/Manifest
+++ b/xfce-extra/xfce4-cpugraph-plugin/Manifest
@@ -1,5 +1,5 @@
 DIST xfce4-cpugraph-plugin-1.2.6.tar.bz2 458058 BLAKE2B 4cd7c9734a52b39d0606f25d5ae559230819e5672b6fe8fb4f19ed5afcf9a446790fe38753ef294ae99767bf06ae9ae08ebd85d66a83dcfb675d945ae2771d00 SHA512 6205a0a7616b0dc5de3cdeb79a5148ee775b426a16b52c491129f74104ab224ec3b29b042a3c8ee05b77cc8775c83d75a8312b96a71504cde50dc257e8354857
 DIST xfce4-cpugraph-plugin-1.2.7.tar.bz2 438674 BLAKE2B d4ca7c850410aeaad7d5eb0156c4feea4a01a0be0d77a62c0165ead9158d2c7e41220ca8ca38e82db69600991f5578f85c1793d1bc94954e9f9cb85cb147316a SHA512 a89f5d9f986717a78a2cbd31db378c1b220cabfc83bf1c85f2533ecccd17b4ed70a3de9321f2e06fcbca2b77d3b02e5a8541e2adf936567a426e1d7221faaa3b
 EBUILD xfce4-cpugraph-plugin-1.2.6.ebuild 855 BLAKE2B 90b3e7f676a101b3708f65e9f83a044360fb222cf8685875cc5a6555557b67c1132a5fe2c19a0568ba0ed208e0a341f7654ec88cefa22e5e81b04aa8f830d97b SHA512 84b5529933e2fb5a2c6a4dd5cdf13a404f09e7dc098e55e504f3d3db61c3056de782ee30079e5b377d4befedfaf7cb1c4d7c8282e46c9f4b9e2b7df3fc422923
-EBUILD xfce4-cpugraph-plugin-1.2.7.ebuild 934 BLAKE2B 84fa1355491cee6eb9993652314eb037f42ef202f29ecd6037ba5695059d24c5552cbef371e884801ac168e1c5e750fa1c68bc15ac29be82855f86b363dc9446 SHA512 75fced5edede672831f306cb1e351711acd827ab0a5aefd4fa9a60e721c2b57584113b1d11b73d81202ba40906dab93f66c60a78b8ffd8b28555a26a20249674
+EBUILD xfce4-cpugraph-plugin-1.2.7.ebuild 933 BLAKE2B 205f073b43b63fd398304b77df778379b1ef29c7a802b8e7b884f735f4693cf131b76ed0d48ddb628938d6bf317a449e50eed02434abb201b82ff58fb3813028 SHA512 b3ef361ffa11709e68ae246a9163a53a8ed561cf236a8d02df9ddf943ed722efd5b75a755af8cf463e136554c78521734344dfbeb43a13829c3f42781dd1cc4a
 MISC metadata.xml 248 BLAKE2B 83bf47dc3dbedea8a88932e922075f0ba8fd841433c4ab750e2ab61c22e8cbfaa1acb04a903d89ef5140a75dfc4c4899354623e0160df5b7c178c190f8494515 SHA512 b5200cfe30adef8e869fada87f1b4171210b2427cd3ac12edef70948f305d5e612ca5f24d377f9823a6022c8867db635db50ddd3d6cb362d6b0137c299fe07e5
diff --git a/xfce-extra/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin-1.2.7.ebuild b/xfce-extra/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin-1.2.7.ebuild
index 84165a821e17..0d87304ff867 100644
--- a/xfce-extra/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin-1.2.7.ebuild
+++ b/xfce-extra/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin-1.2.7.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
@@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="BSD-2 GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 DEPEND="
 	>=x11-libs/gtk+-3.22:3
diff --git a/xfce-extra/xfce4-screenshooter/Manifest b/xfce-extra/xfce4-screenshooter/Manifest
index 65716c07cbb1..b7238413f85c 100644
--- a/xfce-extra/xfce4-screenshooter/Manifest
+++ b/xfce-extra/xfce4-screenshooter/Manifest
@@ -3,5 +3,5 @@ DIST xfce4-screenshooter-1.10.2.tar.bz2 601856 BLAKE2B bccb37c44137faad63bd4f7ba
 DIST xfce4-screenshooter-1.10.3.tar.bz2 601717 BLAKE2B 825e939e56e8c11b42454fd14240209dd157b183525349c51979890ad544d69c9dd95264ffddb4956a0829598ebabd119ff01c0b9cd95115491b79cdd6168212 SHA512 c5bb43c7cbd15cdf276ff5dd16e0e102862b974cf32b725bbc0d33fa60c713e1891706f3a6e38150e76e9c876e5d0b1be277d3031a3ae47696056182ccac78f8
 EBUILD xfce4-screenshooter-1.10.1.ebuild 1249 BLAKE2B c29a42a35a16b2aca35eeb533fb80bf297b32388b86c8d8a7540d5d7bad6fa6a55e5fa4ec7891f1e139b3e4583afaa51bdea2b571797fa5be7a7a9172fef51bc SHA512 568073860d719d85cfb546119b0a84b3562d9e187705033141d82c1fee01ac935a766204007a17d70712f760ebd626c121f993c225862e12cc4b8d06e8fdb270
 EBUILD xfce4-screenshooter-1.10.2.ebuild 1254 BLAKE2B f3d7346290d0d7d79e5248d9e8a4293e19023a2efe79ad02d02dcf1805c48d93cb901f6f36bd9249b221597942c827e37c3cfebe7544653bfb5cc380c56f30fe SHA512 2ccb42a81046b2425def238726160c4ec62f9a0627fefbc77bf46aa244e720fa099e2e6db40dfef82dbbcf2c1ea0cf43844aa3afd1c2fc183ac79e2018da2cac
-EBUILD xfce4-screenshooter-1.10.3.ebuild 1254 BLAKE2B f78dfc959637a1dde6a3953e4186d71799a89888c45650db9fce729155fe679f61724e1d37bfea01e7c34eed8853aac51a8c089c2fbad848ce4de3721efd60f4 SHA512 607dc380e2429a2322d0f640f69703833532f2e238fcd704a09923d87467b5a1960553dba5a07901351d5e1aab8879161a3d739e976da90a899e97dfa93f0eea
+EBUILD xfce4-screenshooter-1.10.3.ebuild 1249 BLAKE2B d221ded378807c008fc3a1f287859068ab3b57b120d291a867431cdf0e584f149627a8fe2344d7f8cac5301da43d5b9685727ed8125419906051754d29874028 SHA512 cd6f86df686e6ad3702a97259962384f08002cabedb85452dcf1671eaaa918a867cc56e7cd3ff8f4fb6166ed9aa23df2d22420aaed4fe60c132b86910e17caf2
 MISC metadata.xml 248 BLAKE2B 83bf47dc3dbedea8a88932e922075f0ba8fd841433c4ab750e2ab61c22e8cbfaa1acb04a903d89ef5140a75dfc4c4899354623e0160df5b7c178c190f8494515 SHA512 b5200cfe30adef8e869fada87f1b4171210b2427cd3ac12edef70948f305d5e612ca5f24d377f9823a6022c8867db635db50ddd3d6cb362d6b0137c299fe07e5
diff --git a/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.10.3.ebuild b/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.10.3.ebuild
index 9eecfb4603a8..6cee4f629361 100644
--- a/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.10.3.ebuild
+++ b/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.10.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~arm64 ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 
 DEPEND="
 	>=dev-libs/glib-2.66.0
diff --git a/xfce-extra/xfce4-systemload-plugin/Manifest b/xfce-extra/xfce4-systemload-plugin/Manifest
index 8c7d947dd1e6..d71907db982b 100644
--- a/xfce-extra/xfce4-systemload-plugin/Manifest
+++ b/xfce-extra/xfce4-systemload-plugin/Manifest
@@ -1,5 +1,5 @@
 DIST xfce4-systemload-plugin-1.3.1.tar.bz2 417959 BLAKE2B c9255349cb4f20a8d8165fbf5a124dbffcb4ca3633c32ca7b2cbbebc4770a50a24909158cd3fcaad9f8bab4b756b98b5329b60a1fbbd0ac0be13251bb950d542 SHA512 2b2285c5960a5728dd7818f90605848e462fe5fef8643ff5be64b7087225399395ace5ec8013f6795d410b0acf79ec77c14e2ed0e56007cfe6f13133ba708876
 DIST xfce4-systemload-plugin-1.3.2.tar.bz2 409767 BLAKE2B 1213c007431318628f4f81026ccdbca2e5b9d34462d66354a1c37999aadc0ef9ed84246bc7f185fd633898364dc0440297dde18288f8beea1d5c7bf6663a6a04 SHA512 f432988f439e5fd7ada16b3e6eaa42b3351531ba3e2b63e2570387bf4d7e605ff9d5a97fde3f5f5eb323ff08aaf3c050f161a5768392b80aa99fabaabda82431
 EBUILD xfce4-systemload-plugin-1.3.1.ebuild 1024 BLAKE2B 083b795561b3a767a621129df90d2eb3faae1198ea46cb320469352acdb56ea2589d8a98992f1785b150d02c6ef752b1ea154697f6d00871d21a4d792da17266 SHA512 1c2ab2f8aa8f4783b4f42cdf845995b35ae6fd8c6d4cbb54941b04d1c359d351df29dc64e7f7b4accfabf6a9784487fbd208cbac6849e77cf06633f04b4bb6b9
-EBUILD xfce4-systemload-plugin-1.3.2.ebuild 1131 BLAKE2B 8bb221c625ac9d5228844ef517402f92d84e31607b28b74ca96cfbc4048be3a7a22972be57b497f5ad23cf9afc669732923a3a7d0f0e74c8db7445516830738c SHA512 c58f890bd4508f2540cee94b5bfb20620e535701cd7cb7544a36c90f05e1918ea1b59238926251dbc65b99e1f6568c8c891294835837daa1dc21729c94259460
+EBUILD xfce4-systemload-plugin-1.3.2.ebuild 1130 BLAKE2B 4627c8a072e32813489ec7497493a5a08eaecdf5cf4dd2c0b4a5a073cf572ce1345f7d71f9b020a19a008761f60844b551bac748cddd50980c6263cd286fe562 SHA512 f8eddd2dab1b6f0f1202d898c6b248194a10b9f5cfd3842f65a6102957e1019f007bf2d72b77eadca492c08035807f0843b5ea94a3abd75d01afde56cc9132e6
 MISC metadata.xml 248 BLAKE2B 83bf47dc3dbedea8a88932e922075f0ba8fd841433c4ab750e2ab61c22e8cbfaa1acb04a903d89ef5140a75dfc4c4899354623e0160df5b7c178c190f8494515 SHA512 b5200cfe30adef8e869fada87f1b4171210b2427cd3ac12edef70948f305d5e612ca5f24d377f9823a6022c8867db635db50ddd3d6cb362d6b0137c299fe07e5
diff --git a/xfce-extra/xfce4-systemload-plugin/xfce4-systemload-plugin-1.3.2.ebuild b/xfce-extra/xfce4-systemload-plugin/xfce4-systemload-plugin-1.3.2.ebuild
index 986094ce17a5..1ad60f4d5d33 100644
--- a/xfce-extra/xfce4-systemload-plugin/xfce4-systemload-plugin-1.3.2.ebuild
+++ b/xfce-extra/xfce4-systemload-plugin/xfce4-systemload-plugin-1.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="upower"
 
 DEPEND="
diff --git a/xfce-extra/xfce4-taskmanager/Manifest b/xfce-extra/xfce4-taskmanager/Manifest
index a799d289c397..799b8dcd9d69 100644
--- a/xfce-extra/xfce4-taskmanager/Manifest
+++ b/xfce-extra/xfce4-taskmanager/Manifest
@@ -1,5 +1,5 @@
 DIST xfce4-taskmanager-1.5.4.tar.bz2 413196 BLAKE2B 76d44eb904ce78781268d47faffe504d50d84cbd3be5505a7a815d05cb38aa5e3547594477632bb057f291cfa7faeea7a04d41c79c80f3df16331a0f974eab58 SHA512 a1b4c0b8bd51cdf35cd7a03bab60e703b364646b77eb978dcc1ad9f2e56692bc24aea2e368c99b362037854ae1b326c6d51a92fefb8c511a332adce51fa6e73b
 DIST xfce4-taskmanager-1.5.5.tar.bz2 435581 BLAKE2B 914bd0b717950f4e41dffef87d18f171ac66e24dabdb5435f3b4b44ed7fae01a0fe76344ee93310399cac89c826120098720ced0cb15b08a5fe634079d53a30b SHA512 492d3cc466fdda5a51aae5d3ccaab13feed5ae9a4796a9588c5bdb44a794945c3b8d6d8c475065948d4391c26ac12b556673d57faf27a2ca320022f06599bafa
 EBUILD xfce4-taskmanager-1.5.4.ebuild 778 BLAKE2B 407ef57bc78207e9dd7ab7d8612695f41da5fcbb62e93debc03f61c2fc5a94deb6b51109e1657a4616c4cde9bb2e6cbb1f08d583431f234b206a20ec9c40c4da SHA512 662a1914206e9622ce4d22892ab38dd6454cba16197c4c4552e774ac65aa1a949f2baddb3ae02a59f4c600b79f206e5e21f8b521405d0e3512131f4dd7f619bc
-EBUILD xfce4-taskmanager-1.5.5.ebuild 783 BLAKE2B 735281dfaa77e5e0b15576256bfa27c70372036a3da141c352d82944f421e8e76364f8ad7a67241733a312902c820524c657f163caa256ddf96ec23c5d83bc1a SHA512 9c8d0754cdb05f35b0db6089dc050de06682e1f6bbda38954907206b63f66204bbfe0835479034819d140b3ae37d3f7ef7058de7b693e3242fbe52dd96e8501c
+EBUILD xfce4-taskmanager-1.5.5.ebuild 778 BLAKE2B 20d523f1090275c9e022274bd1538c709b97e163428dae74fb52a636063eb6b5656f0104b0a62558937ec1f3d25980218fa3b1e28c0ce45eeb87360f78622dcd SHA512 eddd78ed13218674b31ca1d99b69be9a0742f48b9722a6a03dda145d84dd177e2c46d7f0707147e2c3a92c5a272514cfb0e44f2eb7f4d3daf5ca8a6a3f7983cf
 MISC metadata.xml 242 BLAKE2B e489d8bd8fc709502185e0439171cde4402146bc1ec7340bbe41550c06410a49faec8777cb7e79c3ba482feee774350beec5741ed8fe93a85ebed7b746f9200e SHA512 1bcfaf0482a1e7b5a7182d853dafaa2d47687bbc1c9d38b69ba35ce97cdeeff9bd2137a086c5af2a27b730a295e7cbd73d0b43fbe5af331bb7a3113d2117dff3
diff --git a/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-1.5.5.ebuild b/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-1.5.5.ebuild
index a7cd49fbb3ef..a7282b5f1705 100644
--- a/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-1.5.5.ebuild
+++ b/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-1.5.5.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,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 
 DEPEND="
 	x11-libs/cairo