5 files changed, 51 insertions, 12 deletions
diff --git a/net-voip/mumble/Manifest b/net-voip/mumble/Manifest
index 43eb422c1bf2..94cdfc4c443c 100644
--- a/net-voip/mumble/Manifest
+++ b/net-voip/mumble/Manifest
@@ -1,6 +1,6 @@
-DIST mumble-1.5.634.tar.gz 26001230 BLAKE2B ebd1e3569dd7311d704dbb83ff0ef15875dfaba7a7ba357e3be88800544d4d2217e19a15c0df778deec5a701ddc3692ca3f053651dec1eb1525b7963107ae76e SHA512 5fa9479dd836b87cb84fb6c067019f75aac335aa201baa34939f1c73dd7c67279aed6079aecdab74a14cb6c285b69cb82798de8801b2140ccf99c764b3a84b59
+AUX mumble-1.5.735-Fix-building-with-GCC-15.patch 1027 BLAKE2B 37ea7b6c61e1e673e040ecdb5790be8ad0728aed53a035fb20c339feabb3c153651a5902051a5bf74095e7f67b132ad7539a15df28011761cfe13bc494bcfba9 SHA512 169431a33e14ab7c19f36bf65db846bd57e38866a56b5f7970950e7a10bd4e406697490465bc55259f81e99b7890a21febcb79532cd2f31b5db0ec524ca92282
 DIST mumble-1.5.735.tar.gz 26010842 BLAKE2B 3eeb3e51f691f2179848341ba9e7d31a31cd1a66bd9c1edabeec90c99885a9630c74374d8c357d5fbfb9ee205d63aceeabcafd718350cc34c57c4fe1e7a5bf94 SHA512 1dba58e6f39dbef88c6e0d1501530bee62af5bd6c798dcfdbe6c9d94c1ec22ab91d157ba3ccb96d810daf31907ac2bbec876be20b8c9613664488e6bb03a5b5b
-EBUILD mumble-1.5.634-r1.ebuild 3845 BLAKE2B 2df5785e649afb16b3b482c11b64d46667f9d5bfd5c01c4607ad499d2dd254fb79a0a0227229dc0c0cd7961245e21f68bd0eb2dc8beeb51eb87a6163b77fda1e SHA512 548e21de593aa88f0d10cd518efbe155fe2ab17289f053e1dc32ee4331f4e96035dd217603aad32151bcb13c9da1868ace0b7b0762d2dae585e3b544061873f0
-EBUILD mumble-1.5.735.ebuild 3849 BLAKE2B 2546a7f93a30f910d76c2db575461d004cb250840a58287bc5dd791da1b66734bd40e7b7ee782c8b2533e6ba3499a8325157d4538528dd331e2f1cb7491fc45b SHA512 ff6e125c7164b4dac9c3916a0c50775cebec06ac1eec62b682b553acf29f9c9ec41de11550e6d5588c50ea1340d456caccf24c0f1a7f96c5d36e3616d4f71790
-EBUILD mumble-9999.ebuild 3778 BLAKE2B 3a33006f40fb33bb4076266fba80a7f6f5b1f1318b24395ccc298f7df34d522d1bee91141bbdee986b35db43726b524437753b3709a35d6d29215c1e90b9e8d3 SHA512 4cbb0af7987020902f9f5752f7f2486d262339411c4787c1e56a3126dfbbb92cc3503d75c3fe38736e5e6b9fd6376c2ffe56437989dcf3c2c512699f7c14f910
+EBUILD mumble-1.5.735-r1.ebuild 3922 BLAKE2B cf7a0d0355437e8de284610dfe8120a9cce152f0b050c73783c84744476bdf6963898bef60ea6a55d0a8291e01c6cf5b819948075b7b8103cb18505c7086d545 SHA512 58d882dae0709e1a7f8732f9487fe31fedd0c7da2988b43ae0193bb82bdb4a2118873dd707f6fecdbfabafe62e9eb21954bbd5c8c4aee245b621fa39317b6364
+EBUILD mumble-1.5.735.ebuild 3845 BLAKE2B abb5679db64e807efadd8147a3785df9914e560307e4ce598d7143a606597bc58f93e02c67faba03758d06813bedaf61212208f5e2ffa921a01c63f56c78ecb1 SHA512 41d7d5f8f058d4bfc3a2ba53415dcd9bd30c29f0dbc743ce674f041be701aba80e1967a5225054eafb6480d78af5f8080abc7ff5c882576c7b6ecaa19b17b159
+EBUILD mumble-9999.ebuild 3735 BLAKE2B 0727f7c23480eaa1cbe68192b1e6c9b7f2ecbd3388a5fe02c130b2013d5d9ac5647302921611ae5ac160a004e7c9c92f2c105c47ab3d4c4313fce7a0c73d8471 SHA512 08754128c5d61eb8ea12047a4e6e90dfbbdeac05a2046d5ed29284132810330b0d9ed3a62ee214e8f05d98955881ebffdc91133ea8ee9c683e239b4cf6a58b0c
 MISC metadata.xml 659 BLAKE2B 29aa7577035302a7cdcd6c433bcdfa6754b13b6b4c41add1779c176e9ab58a2b7a5b74a71269c0ab5e2a2cf6442218e1a9529c26175286431c121ea398e02276 SHA512 82d88c9d5d4fcbe79cbed7de582ad13dcdcbd81165cb808373b2917d59d56bd7b724ed5c1710c17552e8efde39d0f7cc058d3b30355379ea5f1ee3a4d1995227
diff --git a/net-voip/mumble/files/mumble-1.5.735-Fix-building-with-GCC-15.patch b/net-voip/mumble/files/mumble-1.5.735-Fix-building-with-GCC-15.patch
new file mode 100644
index 000000000000..4bd4623da82d
--- /dev/null
+++ b/net-voip/mumble/files/mumble-1.5.735-Fix-building-with-GCC-15.patch
@@ -0,0 +1,36 @@
+From f4259722553335d79e9d28948ab7bdb00293a5ec Mon Sep 17 00:00:00 2001
+From: Carl George <carlwgeorge@gmail.com>
+Date: Tue, 8 Apr 2025 23:25:52 -0500
+Subject: [PATCH] BUILD(overlay): Fix building with GCC 15
+
+C23 added the bool keyword, which results in an error if you try to
+define an identifier named bool and then build with GCC 15.  We can use
+stdbool.h to define bool instead.
+
+https://gcc.gnu.org/gcc-15/porting_to.html#c23-new-keywords
+---
+ overlay_gl/overlay.c | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/overlay_gl/overlay.c b/overlay_gl/overlay.c
+index 680241e1bbb..bf3051e540f 100644
+--- a/overlay_gl/overlay.c
++++ b/overlay_gl/overlay.c
+@@ -14,6 +14,7 @@
+ #include <pwd.h>
+ #include <semaphore.h>
+ #include <stdarg.h>
++#include <stdbool.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+@@ -37,9 +38,6 @@
+ 
+ #	include <link.h>
+ 
+-typedef unsigned char bool;
+-#	define true 1
+-#	define false 0
+ #elif defined(TARGET_MAC)
+ #	include <AGL/agl.h>
+ #	include <Carbon/Carbon.h>
diff --git a/net-voip/mumble/mumble-1.5.634-r1.ebuild b/net-voip/mumble/mumble-1.5.735-r1.ebuild
index 17c197c6fcec..2bdceb35c548 100644
--- a/net-voip/mumble/mumble-1.5.634-r1.ebuild
+++ b/net-voip/mumble/mumble-1.5.735-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -33,7 +33,7 @@ else
 		SRC_URI="https://github.com/mumble-voip/mumble/releases/download/v${MY_PV}/${MY_P}.tar.gz"
 		S="${WORKDIR}/${P/_*}"
 	fi
-	KEYWORDS="amd64 arm64 ppc64 x86"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 fi
 
 LICENSE="BSD MIT"
@@ -83,6 +83,10 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.5.735-Fix-building-with-GCC-15.patch
+)
+
 pkg_setup() {
 	python-any-r1_pkg_setup
 }
diff --git a/net-voip/mumble/mumble-1.5.735.ebuild b/net-voip/mumble/mumble-1.5.735.ebuild
index 4160042b4c49..02f580338996 100644
--- a/net-voip/mumble/mumble-1.5.735.ebuild
+++ b/net-voip/mumble/mumble-1.5.735.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -33,7 +33,7 @@ else
 		SRC_URI="https://github.com/mumble-voip/mumble/releases/download/v${MY_PV}/${MY_P}.tar.gz"
 		S="${WORKDIR}/${P/_*}"
 	fi
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 arm64 ppc64 x86"
 fi
 
 LICENSE="BSD MIT"
diff --git a/net-voip/mumble/mumble-9999.ebuild b/net-voip/mumble/mumble-9999.ebuild
index 38094ae801eb..8bb36169fce9 100644
--- a/net-voip/mumble/mumble-9999.ebuild
+++ b/net-voip/mumble/mumble-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -39,7 +39,7 @@ fi
 
 LICENSE="BSD MIT"
 SLOT="0"
-IUSE="+alsa debug g15 jack pipewire portaudio pulseaudio multilib nls +rnnoise speech test zeroconf"
+IUSE="+alsa debug jack pipewire portaudio pulseaudio multilib nls +rnnoise speech test zeroconf"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
@@ -57,7 +57,6 @@ RDEPEND="
 	x11-libs/libX11
 	x11-libs/libXi
 	alsa? ( media-libs/alsa-lib )
-	g15? ( app-misc/g15daemon:= )
 	jack? ( virtual/jack )
 	portaudio? ( media-libs/portaudio )
 	pulseaudio? ( media-libs/libpulse )
@@ -95,7 +94,7 @@ src_configure() {
 		-Dbundled-gsl="OFF"
 		-Dbundled-json="OFF"
 		-Dbundled-speex="OFF"
-		-Dg15="$(usex g15)"
+		-Dg15="OFF"
 		-Djackaudio="$(usex jack)"
 		-Doverlay="ON"
 		-Dportaudio="$(usex portaudio)"