From 57e62db33bb33adb6593a2be7b3a5990aaf01f56 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Tue, 15 Nov 2022 18:53:15 +0000
Subject: gentoo auto-resync : 15:11:2022 - 18:53:15

---
 net-voip/Manifest.gz               | Bin 1722 -> 1723 bytes
 net-voip/mumble/Manifest           |   2 +-
 net-voip/mumble/mumble-9999.ebuild |  21 +++++++++++++++++++--
 3 files changed, 20 insertions(+), 3 deletions(-)

(limited to 'net-voip')

diff --git a/net-voip/Manifest.gz b/net-voip/Manifest.gz
index 3bb6cf2916b3..030078575732 100644
Binary files a/net-voip/Manifest.gz and b/net-voip/Manifest.gz differ
diff --git a/net-voip/mumble/Manifest b/net-voip/mumble/Manifest
index 133fa06a498a..dbde3afd3320 100644
--- a/net-voip/mumble/Manifest
+++ b/net-voip/mumble/Manifest
@@ -7,5 +7,5 @@ DIST mumble-1.4.287.tar.gz 9457292 BLAKE2B 5fc89c184aa54ab8269870fd87b6c9ce271d7
 EBUILD mumble-1.3.4-r1.ebuild 3918 BLAKE2B 72a351f43bb49953dfb6c734de77dcd63be900fc806db30d411faae1077ca116b69a38364ca5d9f241bc070f12add5e40d6f4fbf4b9b80a265c7543fc21db44d SHA512 ee1c02a0dc5180112cc17efc826b56a635f7c5dbd476d417d2db155456ee6ebca283a55b168f46f2fd8f28d91e1e62e2e51bf0e040bc84d257c7384bcbeb896b
 EBUILD mumble-1.4.274-r1.ebuild 3958 BLAKE2B d47edfb82534b71c5db12071094730d5cd556540f32e11094b8b269e701fe8bd9b120d68cfffd05a67865543724bc0f94c65e53e554ee26d1299f82a974104fe SHA512 0250ff63bf995dc2a9783676092233a911d950be01d2e18c784bed8bda6a7284f4e2f55a9a7393d56f3f4bc686f81f6416c901e2458dae2954dbbbdec2ae245b
 EBUILD mumble-1.4.287.ebuild 3956 BLAKE2B 0ec9f3e8408b4b49ed3763bfb054a54dce33bb776ba304a80ac84ffbd2acaa9b20d889be4082891e1f99e0e64541367e04d8a8bf02711f536a7723c8f617a82e SHA512 351084c486853ad6e50b9775ea7ec6f0d33b1944869b286e90d3bcfb6cef92e84e75de8a7a6913dcd34981f70b87552b5b4aa41ec81e9ddeaabbe87d1fd07291
-EBUILD mumble-9999.ebuild 3739 BLAKE2B 43563be7a8e6b6cda4eb9fb8377ba9fa4b9b85a3c2c9e3d8e2008f414bce4f5f2883fc1f1c290e87d68a2cabc3dbf6221e049ed9cca6e72bbfb31f8396de794e SHA512 8e173e688d5d79d693390d3a770a57dd8ca2c4065c16189781d57712bc985da88f5d29999f035673a2d1b01b5df93b8c18e948f797461e778bbea9165114d201
+EBUILD mumble-9999.ebuild 4167 BLAKE2B 0c4233420ebcf7e29c2bcc8ef113d1aa62be990886089e8661bb657aa0f6315f51c529f7a2959e122267b40d33c7aeda5cd6cb822b8956b6864621080bb513e2 SHA512 9d23fdd7464a93ce088e00f46685469f90cb8ea87241dde7b754e4fc996fb283284dc97e957ac06e58581595dd22bb69a39b2297c586d4143ca59d75d9381f53
 MISC metadata.xml 729 BLAKE2B ebf94a9bcca010e62e9ad649805b25057cf9f18ce6d2e99f643b8d76ba97048d6dc68bc52358158c8eb208dcb0acc5c42c8267036d45a8c28bff2223afb3d9a5 SHA512 390ec775dfa1cf3106640fcac4f8fe57387586c98c1616dca6cc1d33a01ae4631e4263791f438116b4d2c0bbd605182da2d16d81dbc452ea4eb28645c0f35513
diff --git a/net-voip/mumble/mumble-9999.ebuild b/net-voip/mumble/mumble-9999.ebuild
index 4d6f06e23171..c6f9fc3576ea 100644
--- a/net-voip/mumble/mumble-9999.ebuild
+++ b/net-voip/mumble/mumble-9999.ebuild
@@ -11,7 +11,20 @@ HOMEPAGE="https://wiki.mumble.info"
 if [[ "${PV}" == 9999 ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/mumble-voip/mumble.git"
-	EGIT_SUBMODULES=( '-*' celt-0.7.0-src celt-0.11.0-src themes/Mumble 3rdparty/rnnoise-src 3rdparty/FindPythonInterpreter 3rdparty/tracy 3rdparty/gsl )
+
+	# needed for the included 3rdparty license script,
+	# even if these components may not be compiled in
+	EGIT_SUBMODULES=(
+		'-*'
+		themes/Mumble
+		3rdparty/FindPythonInterpreter
+		3rdparty/gsl
+		3rdparty/minhook
+		3rdparty/rnnoise-src
+		3rdparty/speexdsp
+		3rdparty/tracy
+		opus
+	)
 else
 	if [[ "${PV}" == *_pre* ]] ; then
 		SRC_URI="https://dev.gentoo.org/~concord/distfiles/${P}.tar.xz"
@@ -85,7 +98,6 @@ src_configure() {
 
 	local mycmakeargs=(
 		-Dalsa="$(usex alsa)"
-		-Dbundled-celt="ON"
 		-Dbundled-json="OFF"
 		-Dbundled-opus="OFF"
 		-Dbundled-speex="OFF"
@@ -112,6 +124,11 @@ src_configure() {
 		mycmakeargs+=( -DBUILD_NUMBER="$(ver_cut 3)" )
 	fi
 
+	# https://bugs.gentoo.org/879569
+	# convert absolute install paths to relative paths to satisfy path assertions
+	mycmakeargs+=( -DCMAKE_INSTALL_MANDIR="$(realpath --relative-to="${S}" "${ED}"/usr/share/man)" )
+	mycmakeargs+=( -DCMAKE_INSTALL_DOCDIR="$(realpath --relative-to="${S}" "${ED}"/usr/share/doc/"${PF}")" )
+
 	# https://bugs.gentoo.org/832978
 	# fix tests (and possibly runtime issues) on arches with unsigned chars
 	append-cxxflags -fsigned-char
-- 
cgit v1.2.3