7 files changed, 110 insertions, 5 deletions
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 06bc059fd374..4e25185e42b6 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/awesfx/Manifest b/media-sound/awesfx/Manifest
index 0fc9b296d490..c4edbb286810 100644
--- a/media-sound/awesfx/Manifest
+++ b/media-sound/awesfx/Manifest
@@ -1,5 +1,6 @@
+AUX awesfx-0.5.2-return-type.patch 340 BLAKE2B 3968d279de4febeaebe797a5f2c9836bc5b6e7d604d6d8579284216081c39975b5cf66c8f1fef9541b57eaeed2266a5984e432664a1305847c3d5b33ecacbf3f SHA512 cc0e8b0d072bf42734d27c3abe38fa9251ab80652cc151f4a25f0baf65a8eefa1c71a9aaf9aed2e2a993c7b44c64e84eb7ab5f6282cbf516993f38b79dc2e840
 AUX sfxload.confd 165 BLAKE2B b183f16572379c928417dbc6037bce0739462def9cde600d1298677b4e55bddcf5df0407124c966519946c960847dcdeb1c44fe62e25192d361400df7fc4e959 SHA512 9725e28b10f512e6e8e3cf121f8d442b3f0148795e676760b434a02c9a4e19945915fd93d6fa012448f041d17819d32b38445a0946819e398647bfd5ce31c38e
 AUX sfxload.initd 398 BLAKE2B 90c2c51638531b7d51092b70af966db961889f0991a60ee8ffccfa36f73fb7e7df722e7914eb39c1a3c08b32b8da6cd1d58abfa8d3b0ba427a9748aefac7b801 SHA512 dd3522d112a0efefa1786ce37b9f9be3ee07eb50b0a618d7adb386ff007d9e9e907dcd9e184ed5122118723d702caeadc190018f0af5ad393c931eb0a549f31c
 DIST awesfx-0.5.2.tar.gz 83611 BLAKE2B 7472f478bd1b228080a669d9df47b885d9953d363a06341cc2684af1723818a8938e31622aee9dd2ca6286c59db7715224c920e79cfa318cb3347b8833f67dc6 SHA512 f59f503c54de8bcccbd8a51c1f6a7afae98bd6b5ae4ad4ec467b4f29cece569b4f8e3185adf243816f786a0c2e92fe8d098d56f02d5704979ee8290ad61f46b6
-EBUILD awesfx-0.5.2.ebuild 945 BLAKE2B d755ea35d539ab08fee5fcb88718c0ff279f5446c5c522640fd002a37fe3a0b5913ebc39a09cb4c5ad12c9f53d4942033c7a2a7cd3cccd0e4e1c15b6cc57fa74 SHA512 b4daabf130d8556a2191918212303f9c9cb7aa06030703ff5fbb343c3ba9286241985203f98c24eed83f791c5928ced0095ba053778e6eca71e1be12e29cef47
+EBUILD awesfx-0.5.2-r1.ebuild 991 BLAKE2B b4ffe5537d2f49970d9f395946d783f80445eea3a5979193840db81daee832ed4b250433df14d4834947c5d7cc7629ec198b2dab85077c55d6dbe71cba3db7d1 SHA512 b04173a09d868dc5508737e25f51e568624e54eaa0797b2607857cd929314618c71391036f5e98d7fc90c9fb1d49fd2a1d6ef6bd6f888bbc48c3fb7a1e0d40fb
 MISC metadata.xml 324 BLAKE2B 83e67f320917ea5b66c1825f935fea9bf296ecffd92367a61058f06d109e68da0a38dab99c3d83ea135f3d746b32ec46393eb12b8eb10177d833a242606413ea SHA512 7e7a6216efce742db3e2de5dfa293b11bb82e71783c83aaa579fcea5281a0088fd131568774ecf3259a264d0bdc0d10dc0e5b66bba0b3ef1b9bc388f58464dbc
diff --git a/media-sound/awesfx/awesfx-0.5.2.ebuild b/media-sound/awesfx/awesfx-0.5.2-r1.ebuild
index 4dc34b5e106d..082914feb1dd 100644
--- a/media-sound/awesfx/awesfx-0.5.2.ebuild
+++ b/media-sound/awesfx/awesfx-0.5.2-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools
 
@@ -21,6 +21,8 @@ BANK_LOC="${EPREFIX}/usr/share/sounds/sf2"
 
 DOCS=( AUTHORS ChangeLog README SBKtoSF2.txt samples/README-bank )
 
+PATCHES="${FILESDIR}/${P}-return-type.patch"
+
 src_prepare() {
 	default
 	eautoreconf
diff --git a/media-sound/awesfx/files/awesfx-0.5.2-return-type.patch b/media-sound/awesfx/files/awesfx-0.5.2-return-type.patch
new file mode 100644
index 000000000000..2fbe38abaea9
--- /dev/null
+++ b/media-sound/awesfx/files/awesfx-0.5.2-return-type.patch
@@ -0,0 +1,12 @@
+diff -ru a/alsa.c b/alsa.c
+--- a/alsa.c	2024-06-05 19:43:42.987168221 -0000
++++ b/alsa.c	2024-06-05 19:44:48.530787408 -0000
+@@ -139,7 +139,7 @@
+ 	return snd_hwdep_ioctl(hwdep, SNDRV_EMUX_IOCTL_MISC_MODE, &mode);
+ }
+ 
+-void seq_set_gus_bank(int bank)
++int seq_set_gus_bank(int bank)
+ {
+ 	struct sndrv_emux_misc_mode mode;
+ 	mode.port = -1;
diff --git a/media-sound/gstreamripper/Manifest b/media-sound/gstreamripper/Manifest
index 19fd861fc381..3b43582f5ea2 100644
--- a/media-sound/gstreamripper/Manifest
+++ b/media-sound/gstreamripper/Manifest
@@ -1,3 +1,4 @@
+AUX gstreamripper-0.2-C99-fixes.patch 2541 BLAKE2B 91c0bae76715e3a39edb0126dccc35b8b24f149c4325d4ab93a9bbef35220b149d83cec81442bb9f048c4ecc4f3b7603beed9fe6e63bc395b1529d72015fed45 SHA512 73d5bbd1ee7dc68905ad638ddff6dad045940414373f1d568c3b9f46764c65854da8b50a4d8ec75e37fa3c3355586edc8ba18c54cb0d9bdfbf87237d971e8494
 DIST GStreamripperX-0.2.tar.gz 187186 BLAKE2B 66beccb382316331efcea25b5c97d31a3a7c8e59c3f50026909872f761704182bdca1ec919a4350d8324688634c3b9e654e86db1c750cf0992aa538db9c7939a SHA512 6b4253d7b9f02bcba3e5815390bfc284e3d04f5518055d650efc61e650c6c7a8a6bcf0d86cbe56fd8b59969d77e83aab6d09c0fe12d0e77c621e91ed5ce3253c
-EBUILD gstreamripper-0.2.ebuild 828 BLAKE2B 83dd1b9a6b494aef2b9f93951dae57e795f142380e442a893b6cd1ed0ebd579d5beae2b361de070cb7635133feb58b2e2e17a523c969c3777d161f700a174ec3 SHA512 4bd23b57e8a98f50aab8ae93b7be8f8a77f330bb50168ba553c94d9ff7d885367a05ff4778b3c9697d8ff379be98e626c0f76788f7b2aee618ab9d11d3112278
+EBUILD gstreamripper-0.2-r1.ebuild 875 BLAKE2B f9d0bb1f9cc832632f161dc22ca7b73004a83f93c997ef52a6e13822f138886159e410480bd439362160d394b75a0cd110aa97771a35f9b905815cc50cd358c5 SHA512 8dd2ea49ec52a7153f92c4ff209087d49b1781ddf8fd02fdc951de0b7b192dc6381b6ff4f8fbdfac69d7a1b0679997f87618ad079851f17dc8c76dec95f3b1c2
 MISC metadata.xml 337 BLAKE2B 5eb27b94b412037f04979c8e241c9b37a8dfde78ec88e2941d01eeba2c7b35b07f0eae16bf2d5d9c9cb2a94758e15a44fd3d8e9b6a28ba43308793b9fdf4253e SHA512 7ab6ae6f749d188077b9398638c55229234e0fe76e1af2baeb2c6041b3d02d42f1291e257d0b7935d9c85aa9106ffc95630aabf4b21dafb62509635d494cb76e
diff --git a/media-sound/gstreamripper/files/gstreamripper-0.2-C99-fixes.patch b/media-sound/gstreamripper/files/gstreamripper-0.2-C99-fixes.patch
new file mode 100644
index 000000000000..915e7a201451
--- /dev/null
+++ b/media-sound/gstreamripper/files/gstreamripper-0.2-C99-fixes.patch
@@ -0,0 +1,85 @@
+https://bugs.gentoo.org/885531
+--- a/src/callbacks.c	2024-04-03 16:35:36.682662231 +0000
++++ b/src/callbacks.c	2024-04-03 16:44:09.332605097 +0000
+@@ -410,7 +410,7 @@
+ 
+ 
+ gboolean
+-on_window1_delete_event(GtkWidget * widget,
++on_window1_delete_event(GtkButton * widget,
+ 			GdkEvent * event, gpointer user_data)
+ {
+ 	on_quit_button_clicked((widget), user_data);
+--- a/src/callbacks.h	2024-04-03 16:35:36.682662231 +0000
++++ b/src/callbacks.h	2024-04-03 16:46:35.340734393 +0000
+@@ -36,7 +36,7 @@
+ 
+ void on_locateButton_clicked();
+ 
+-gboolean on_window1_delete_event(GtkWidget * widget,GdkEvent * event,
++gboolean on_window1_delete_event(GtkButton * button,GdkEvent * event,
+                                                         gpointer user_data);
+ 
+ void loadPrefs();
+--- a/src/interface.c	2024-04-03 16:35:36.682662231 +0000
++++ b/src/interface.c	2024-04-03 16:53:11.479371945 +0000
+@@ -76,7 +76,7 @@
+ 	gtk_box_pack_start(GTK_BOX(hbox2), button1, FALSE, FALSE, 5);
+ 
+ 	notebook1 = gtk_notebook_new();
+-	gtk_notebook_set_scrollable(notebook1, TRUE);
++	gtk_notebook_set_scrollable(GTK_NOTEBOOK(notebook1), TRUE);
+ 	gtk_widget_show(notebook1);
+ 	gtk_box_pack_start(GTK_BOX(vbox1), notebook1, TRUE, TRUE, 0);
+ 
+https://bugs.gentoo.org/871012
+https://bugs.gentoo.org/919182
+--- a/src/main.c	2024-04-03 16:35:36.682662231 +0000
++++ b/src/main.c	2024-04-03 16:42:23.412236742 +0000
+@@ -11,7 +11,7 @@
+ 
+ #include "interface.h"
+ #include "support.h"
+-
++#include "callbacks.h"
+ int
+ main (int argc, char *argv[])
+ {
+--- a/src/callbacks.c	2024-04-03 17:00:00.604930862 +0000
++++ b/src/callbacks.c	2024-04-03 17:05:23.965001507 +0000
+@@ -23,7 +23,7 @@
+ #include "support.h"
+ #include "parse.h"
+ 
+-gint pids[256][2];		//pids[numberOFpidsAllowed][pid#,g_io_channel,ip]
++GIOChannel *pids[256][2];		//pids[numberOFpidsAllowed][pid#,g_io_channel,ip]
+ gchar *ips[256][1];
+ gint streams = 0;
+ gchar *binpath = "streamripper";
+@@ -165,7 +165,7 @@
+ 		return 0;
+ 	}
+ 
+-	pids[streams][0] = child_pid;
++	pids[streams][0] = g_io_channel_unix_new(child_pid);
+ 	ips[streams][0] = g_strdup(ip);
+ 
+ 
+@@ -365,7 +365,7 @@
+ 		gint i = 0;
+ 		for(; i < streams; i++)
+ 		{
+-			if(kill(pids[i][0], SIGKILL) == -1)
++			if(kill(g_io_channel_unix_get_fd(pids[i][0]), SIGKILL) == -1)
+ 			{
+ 				switch (errno)
+ 				{
+@@ -389,7 +389,7 @@
+ 	}
+ 	if(!all)		//just want to close one tab
+ 	{
+-		if((kill(pids[curtab][0], SIGKILL)) != -1)
++		if((kill(g_io_channel_unix_get_fd(pids[curtab][0]), SIGKILL)) != -1)
+ 		{
+ 			g_io_channel_shutdown((pids[curtab][1]), FALSE, NULL);
+ 		}
diff --git a/media-sound/gstreamripper/gstreamripper-0.2.ebuild b/media-sound/gstreamripper/gstreamripper-0.2-r1.ebuild
index 98a7de6e4bf2..0413f8eac1cb 100644
--- a/media-sound/gstreamripper/gstreamripper-0.2.ebuild
+++ b/media-sound/gstreamripper/gstreamripper-0.2-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit desktop
 
@@ -22,6 +22,10 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
+PATCHES="
+	${FILESDIR}/${P}-C99-fixes.patch
+"
+
 src_compile() {
 	emake CFLAGS="${CFLAGS}"
 }