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

8 files changed, 713 insertions, 7 deletions

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 )"