gentoo resync : 02.02.2022

4 files changed, 150 insertions, 13 deletions

diff --git a/media-sound/mumble/Manifest b/media-sound/mumble/Manifest
index 31042c507c80..00ba28620f86 100644
--- a/media-sound/mumble/Manifest
+++ b/media-sound/mumble/Manifest
@@ -1,4 +1,6 @@
 DIST mumble-1.3.4.tar.gz 8592741 BLAKE2B bcde3fd859ec4faea06f996cd4c583af7c0b8409cca79cb05ef8ba7fcdeac9e49ed1d07a4131225dd582da7610190d4006abc731fd4276b2288e02e8c18effb6 SHA512 e2dde5aad30d1a931e7acd8d7db0b8c785d3a268d0b8cf5626fa03953a51bcadb719c6682c440d02524e83beee13d73d8f5bb3fdf98ab1c82d3ecf824cc25f68
+DIST mumble-1.4.230.tar.gz 9441667 BLAKE2B da433f3c15d7e45dfac0c8a78c9dbe86ba8d5cd078d2d87fd4d90718968fc9e5928c3c5c5ba2e40a8a54d02a646c5fc6a7ee2fff4b71dfa411d74f395b097c26 SHA512 6cffc7a95d88b33876f4093b99266468210f5c14f190fbd2fbe4991bef91a567e55296e7c8c6cc99e19c054853211085cc3cc08109e367e6776afb70766b3a53
 EBUILD mumble-1.3.4.ebuild 3775 BLAKE2B dcf342af9e2a3ad6e19ac795931fd6df8bf8b1f9932dd12c78d58db453604da80e1c59cde9b87055777ab463ccec0b1e18da2fd8b025125d13ae88bc6b687f12 SHA512 157d75a84cdc693f34533aced498f57c28e19d00ca1b49d5f1a13736cc5d8fddb6e06bfafa5e48e154d3ae3e11ab8a10dd40a86501264ca148a5776438bb127e
-EBUILD mumble-9999.ebuild 3032 BLAKE2B f5dbfab60d82ea467f4b387fab941555ecd05a82ac80d67cc6dff962d049f3dd91ad9e59ed3a15dfdbe5c0c1981f6116decdf503526cad3aa2a37a5da6fe1f28 SHA512 6ff0537b360e770b73dd081aab902603f6583a268702d4aedc8d75619f9aa4dd9bb058d5cf70e4f0769fd037fd8564a041dcf7746831061d1c65db175d3fb5a0
-MISC metadata.xml 597 BLAKE2B c99a93344cfd24880faa9a9253a7a9f2e629067a043f6f9c0d086971be27e70b54b7f32ddbf403d92513c91762f5a90c71f341debc856a223ca02575a2ac7db0 SHA512 696dbbe72020708d862cb944ad3ab4c8e3bce6e5a2565f4318086a3d3c1fe86ca1205eb58316a2e79f724ffb45d435acd51665dcee7b5efe68f61b27a979b5c2
+EBUILD mumble-1.4.230.ebuild 3227 BLAKE2B 81096ad43811ab6319e8a351e976433562993be83f893f96c9476a7e73d12becd245a8ee4c15bcb9f115d8ff7ef9685e287da0921bf47f46d6078473b31cfe8c SHA512 d7eab2d63ded30a7e0fbe44b57c07e7fb960dc64b0ecfc8c1bb75ef8ebc02a1def8e4df4b2397f7689eebf82881eb40330d052c4e2310a2cbc136185557e7760
+EBUILD mumble-9999.ebuild 3234 BLAKE2B 9395a98a310ea3fed8c05806d6a8d1bbbd3de10ae4f8682a45a1ad51c23f496767e2b1eaf175d86d67f021c75f4c7a98903a36581da95b44e26a77e674e94dfd SHA512 360d075e9d057b3377cdf807665903475f0443337e9d184f2e9ecffd5cfaf22ada64ad15cf96d5eaa3c23c7ebd9ca7b79a33bc0790217d5a1ec774398a5a3642
+MISC metadata.xml 670 BLAKE2B fe98e9c1906942bac7fb7c5f66dd14ca201b7be96580c627a21f768507d2700e7c3bb6d63ac29a3402daf2ccbfc64096c61b73414b70489f43fd99ad78abbf6a SHA512 4902e6f6900e479f4c55fce2833b87149cd0175cb261fa08d2835431995472db794c1b47e7b6ade3812b007afe0e0ec8fa252bab7ae3c7bb02378f26a9287fc4
diff --git a/media-sound/mumble/metadata.xml b/media-sound/mumble/metadata.xml
index 45d6f53a49e9..8c16fbd1e7e9 100644
--- a/media-sound/mumble/metadata.xml
+++ b/media-sound/mumble/metadata.xml
@@ -7,6 +7,7 @@
 	</maintainer>
 	<use>
 		<flag name="g15">Enable support for the Logitech G15 LCD (and compatible devices).</flag>
+		<flag name="pipewire">Enable pipewire support for audio output.</flag>
 		<flag name="rnnoise">Enable alternative noise suppression option based on RNNoise.</flag>
 		<flag name="speech">Enable text-to-speech support in Mumble.</flag>
 	</use>
diff --git a/media-sound/mumble/mumble-1.4.230.ebuild b/media-sound/mumble/mumble-1.4.230.ebuild
new file mode 100644
index 000000000000..8326c431832d
--- /dev/null
+++ b/media-sound/mumble/mumble-1.4.230.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg
+
+DESCRIPTION="Mumble is an open source, low-latency, high quality voice chat software"
+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 )
+else
+	if [[ "${PV}" == *_pre* ]] ; then
+		SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${P}.tar.xz"
+	else
+		MY_PV="${PV/_/-}"
+		MY_P="${PN}-${MY_PV}"
+		SRC_URI="https://github.com/mumble-voip/mumble/releases/download/v${MY_PV}/${MY_P}.tar.gz"
+		S="${WORKDIR}/${P/_*}.src"
+	fi
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="BSD MIT"
+SLOT="0"
+IUSE="+alsa +dbus debug g15 jack pipewire portaudio pulseaudio multilib nls +rnnoise speech test zeroconf"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/openssl-1.0.0b:0=
+	dev-libs/poco
+	>=dev-libs/protobuf-2.2.0:=
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtsql:5[sqlite]
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	>=media-libs/libsndfile-1.0.20[-minimal]
+	>=media-libs/opus-1.3.1
+	>=media-libs/speex-1.2.0
+	media-libs/speexdsp
+	sys-apps/lsb-release
+	x11-libs/libX11
+	x11-libs/libXi
+	alsa? ( media-libs/alsa-lib )
+	dbus? ( dev-qt/qtdbus:5 )
+	g15? ( app-misc/g15daemon )
+	jack? ( virtual/jack )
+	portaudio? ( media-libs/portaudio )
+	pulseaudio? ( media-sound/pulseaudio )
+	pipewire? ( media-video/pipewire )
+	speech? ( >=app-accessibility/speech-dispatcher-0.8.0 )
+	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
+"
+DEPEND="${RDEPEND}
+	dev-qt/qtconcurrent:5
+	dev-qt/qttest:5
+	>=dev-libs/boost-1.41.0
+	x11-base/xorg-proto
+"
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	# required because of xdg.eclass also providing src_prepare
+	cmake_src_prepare
+}
+
+src_configure() {
+
+	local mycmakeargs=(
+		-Dalsa="$(usex alsa)"
+		-Dtests="$(usex test)"
+		-Dbundled-celt="ON"
+		-Dbundled-opus="OFF"
+		-Dbundled-speex="OFF"
+		-Ddbus="$(usex dbus)"
+		-Dg15="$(usex g15)"
+		-Djackaudio="$(usex jack)"
+		-Doverlay="ON"
+		-Dportaudio="$(usex portaudio)"
+		-Doverlay-xcompile="$(usex multilib)"
+		-Dpipewire="$(usex pipewire)"
+		-Dpulseaudio="$(usex pulseaudio)"
+		-Drnnoise="$(usex rnnoise)"
+		-Dserver="OFF"
+		-Dspeechd="$(usex speech)"
+		-Dtranslations="$(usex nls)"
+		-Dupdate="OFF"
+		-Dzeroconf="$(usex zeroconf)"
+	)
+
+	if [[ "${PV}" != 9999 ]] ; then
+		mycmakeargs+=( -DBUILD_NUMBER="$(ver_cut 3)" )
+	fi
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	if use amd64 && use multilib ; then
+		# The 32bit overlay library gets built when multilib is enabled.
+		# Install it into the correct 32bit lib dir.
+		local libdir_64="/usr/$(get_libdir)/mumble"
+		local libdir_32="/usr/$(get_abi_var LIBDIR x86)/mumble"
+		dodir ${libdir_32}
+		mv "${ED}"/${libdir_64}/libmumbleoverlay.x86.so* \
+			"${ED}"/${libdir_32}/ || die
+	fi
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	echo
+	elog "Visit https://wiki.mumble.info/ for futher configuration instructions."
+	elog "Run 'mumble-overlay <program>' to start the OpenGL overlay (after starting mumble)."
+	echo
+}
diff --git a/media-sound/mumble/mumble-9999.ebuild b/media-sound/mumble/mumble-9999.ebuild
index 260bec92b200..632f8eab78d9 100644
--- a/media-sound/mumble/mumble-9999.ebuild
+++ b/media-sound/mumble/mumble-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,19 +17,21 @@ else
 	else
 		MY_PV="${PV/_/-}"
 		MY_P="${PN}-${MY_PV}"
-		SRC_URI="https://github.com/mumble-voip/mumble/releases/download/${MY_PV}/${MY_P}.tar.gz
-			https://dl.mumble.info/${MY_P}.tar.gz"
-		S="${WORKDIR}/${P/_*}"
+		SRC_URI="https://github.com/mumble-voip/mumble/releases/download/v${MY_PV}/${MY_P}.tar.gz"
+		S="${WORKDIR}/${P/_*}.src"
 	fi
 	KEYWORDS="~amd64 ~arm64 ~x86"
 fi
 
 LICENSE="BSD MIT"
 SLOT="0"
-IUSE="+alsa +dbus debug g15 jack portaudio pulseaudio nls +rnnoise speech test zeroconf"
+IUSE="+alsa +dbus debug g15 jack pipewire portaudio pulseaudio multilib nls +rnnoise speech test zeroconf"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
+	>=dev-libs/openssl-1.0.0b:0=
+	dev-libs/poco
+	>=dev-libs/protobuf-2.2.0:=
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtnetwork:5[ssl]
@@ -37,8 +39,6 @@ RDEPEND="
 	dev-qt/qtsvg:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtxml:5
-	dev-libs/poco
-	>=dev-libs/protobuf-2.2.0:=
 	>=media-libs/libsndfile-1.0.20[-minimal]
 	>=media-libs/opus-1.3.1
 	>=media-libs/speex-1.2.0
@@ -50,13 +50,15 @@ RDEPEND="
 	dbus? ( dev-qt/qtdbus:5 )
 	g15? ( app-misc/g15daemon )
 	jack? ( virtual/jack )
-	>=dev-libs/openssl-1.0.0b:0=
 	portaudio? ( media-libs/portaudio )
 	pulseaudio? ( media-sound/pulseaudio )
+	pipewire? ( media-video/pipewire )
 	speech? ( >=app-accessibility/speech-dispatcher-0.8.0 )
 	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
 "
 DEPEND="${RDEPEND}
+	dev-qt/qtconcurrent:5
+	dev-qt/qttest:5
 	>=dev-libs/boost-1.41.0
 	x11-base/xorg-proto
 "
@@ -74,7 +76,7 @@ src_configure() {
 
 	local mycmakeargs=(
 		-Dalsa="$(usex alsa)"
-		-DBUILD_TESTING="$(usex test)"
+		-Dtests="$(usex test)"
 		-Dbundled-celt="ON"
 		-Dbundled-opus="OFF"
 		-Dbundled-speex="OFF"
@@ -83,6 +85,8 @@ src_configure() {
 		-Djackaudio="$(usex jack)"
 		-Doverlay="ON"
 		-Dportaudio="$(usex portaudio)"
+		-Doverlay-xcompile="$(usex multilib)"
+		-Dpipewire="$(usex pipewire)"
 		-Dpulseaudio="$(usex pulseaudio)"
 		-Drnnoise="$(usex rnnoise)"
 		-Dserver="OFF"
@@ -92,14 +96,18 @@ src_configure() {
 		-Dzeroconf="$(usex zeroconf)"
 	)
 
+	if [[ "${PV}" != 9999 ]] ; then
+		mycmakeargs+=( -DBUILD_NUMBER="$(ver_cut 3)" )
+	fi
+
 	cmake_src_configure
 }
 
 src_install() {
 	cmake_src_install
 
-	if use amd64 ; then
-		# The 32bit overlay library gets automatically built and installed on x86_64 platforms.
+	if use amd64 && use multilib ; then
+		# The 32bit overlay library gets built when multilib is enabled.
 		# Install it into the correct 32bit lib dir.
 		local libdir_64="/usr/$(get_libdir)/mumble"
 		local libdir_32="/usr/$(get_abi_var LIBDIR x86)/mumble"