gentoo resync : 25.11.2020

3 files changed, 204 insertions, 83 deletions

diff --git a/media-sound/mumble/Manifest b/media-sound/mumble/Manifest
index bff6664e2cd2..3a169a8685f0 100644
--- a/media-sound/mumble/Manifest
+++ b/media-sound/mumble/Manifest
@@ -1,6 +1,8 @@
 DIST mumble-1.3.1.tar.gz 8587417 BLAKE2B e0ff9911727ce74035cef658ff8ce21bfab6dcfd94306abe4a206853a1b2e2e4ddc7215e757f89559c30be64df4329dffc81618a0509df2b281f5b5b59d7de2f SHA512 f622ae5e4f7cd00ef60d225ee6db3cc13fcae5fdc1b03252d17ad6a18156526517e7d019f796b5600219e90e8662d095102fc6d61033fb20fd109afdf427a6d7
 DIST mumble-1.3.2.tar.gz 8586828 BLAKE2B 38af4a0a2ab934388607745a2e31ea7310b7bc040bbe6ac32cc7128f2ac2949f5754090b6eaed3b0baaca6f76c42f004fdd093d88b8486d84187d063d01976e9 SHA512 22e23a682bc9c11420c6ae1d8ff01a80906ebbfb4f073ee25c6d2923d345d12031ddfeca3dabaaf5cf183b82b22eb3c788c88fa0f5313bc399e15795a945b874
+DIST mumble-1.3.3.tar.gz 8591354 BLAKE2B e5bf4d0a21f3c9af761b0892c4a5a7d86244d3283070976fe7a779a10567ffd857e0c19dad750cdbae40d851ce1dcf17b66c63a2cb5142a13358af6f272445dd SHA512 be4c6d4de82a1059bf30d4c7e3c44e41e4bb50dc4a811b7d0def808c52059ff7bcccf65140db940f18cc1bb66d58ea4dab23ba5dcfae3b8b904866751f32edb3
 EBUILD mumble-1.3.1-r1.ebuild 3812 BLAKE2B d17d1a107e33192f312fc6553ae1e1424e6956c2fd5b207250754877762dfd88522c2f1d8a5ce0d8766be8b3df485b619cc0916c31e47154cd1c209b816e746e SHA512 569d09b0cd7a4493f7a0b7b2e98abb39c67deaa3f24ef103d0fc1221d5a743e86c0ae9b3403ca8435e2ccce02ef5e225ff9887eaf48c4b3b669aacb0aefb91ba
 EBUILD mumble-1.3.2.ebuild 3816 BLAKE2B 873ba96b0f251c96a83aba14941a4b4b0964c367e87fee705b22b5f869398e4d3beec184f24a9365133cfd17f3131872bd514ec6d71b55c8a839bbe5cc128192 SHA512 a0b98e253c6a39b92b8acbf94842012b6e172cd778285d2e9fa70a6929357beac77539f3caa0552a4bd548c15187f61f9dbce6fbb6107fb291f09f5d2c14ec79
-EBUILD mumble-9999.ebuild 3791 BLAKE2B 8c2fa233598fbddf33686117cedea1d146cac6752320c07ab07ded9098ab99a0c4691f8cc2564ef8b8b1349ef7ce0af4840d87d15f37301aff1e2366b68f99e4 SHA512 c5edbd19160921df5671c305200b153fef8d629086b2f3d3df4b3d3e207a0f2f557d7d6e976e7f39be4f01224c75055e6a3899a2752671a2153b7c51fb8bf75e
+EBUILD mumble-1.3.3.ebuild 3816 BLAKE2B 873ba96b0f251c96a83aba14941a4b4b0964c367e87fee705b22b5f869398e4d3beec184f24a9365133cfd17f3131872bd514ec6d71b55c8a839bbe5cc128192 SHA512 a0b98e253c6a39b92b8acbf94842012b6e172cd778285d2e9fa70a6929357beac77539f3caa0552a4bd548c15187f61f9dbce6fbb6107fb291f09f5d2c14ec79
+EBUILD mumble-9999.ebuild 3057 BLAKE2B 8e2614ae3c594f82c09860adaf34a9186874d44e78faec04a3c209d50f13985c4930e6cba0c700a1d65265bb96e67b2b5767ea7d6e4ea819995fbc09e5a232a5 SHA512 6cdb85d603f3b1303e1caef0369dda4e7b7ed8e09a70a72ddd5eb1e33bd21f9ce11c87899dee90ca99b3b832252215ec182676ca4fe2ec9a2ac08e6f0b797254
 MISC metadata.xml 596 BLAKE2B cfea5947f1ae0ed91141892278fb374619e4dcf17664e63f76fd61b60f75341534a7a6ad1602959b700696996ff46b6cf12eb2a652b1079f331f66e3dc4ad4e1 SHA512 aeeb4a05ebda91abcbc0ae8a52840d815d251d9c329a1cb06c7baf150eda8a4d0e10697569bef0adfb3a17eb2c59bd6b5d3db7e2c9c50c69f0e52e341fff454f
diff --git a/media-sound/mumble/mumble-1.3.3.ebuild b/media-sound/mumble/mumble-1.3.3.ebuild
new file mode 100644
index 000000000000..df7176498fdf
--- /dev/null
+++ b/media-sound/mumble/mumble-1.3.3.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop multilib-build qmake-utils 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 )
+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/${MY_PV}/${MY_P}.tar.gz
+			https://dl.mumble.info/${MY_P}.tar.gz"
+		S="${WORKDIR}/${P/_*}"
+	fi
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+fi
+
+LICENSE="BSD MIT"
+SLOT="0"
+IUSE="+alsa +dbus debug g15 jack libressl +opus oss pch portaudio pulseaudio +rnnoise speech zeroconf"
+
+RDEPEND="
+	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
+	>=dev-libs/protobuf-2.2.0:=
+	>=media-libs/libsndfile-1.0.20[-minimal]
+	>=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 )
+	!libressl? ( >=dev-libs/openssl-1.0.0b:0= )
+	libressl? ( dev-libs/libressl )
+	opus? ( >=media-libs/opus-1.0.1 )
+	portaudio? ( media-libs/portaudio )
+	pulseaudio? ( media-sound/pulseaudio )
+	speech? ( >=app-accessibility/speech-dispatcher-0.8.0 )
+	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
+"
+DEPEND="${RDEPEND}
+	>=dev-libs/boost-1.41.0
+	x11-base/xorg-proto
+"
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+
+# NB: qmake does not support multilib but it's fine to configure
+# for the native ABI here
+src_configure() {
+	myuse() {
+		[[ -n "${1}" ]] || die "myuse: No use option given"
+		use ${1} || echo no-${1}
+	}
+
+	local conf_add=(
+		bundled-celt
+		no-bundled-opus
+		no-bundled-speex
+		no-embed-qt-translations
+		no-server
+		no-update
+		$(myuse alsa)
+		$(myuse dbus)
+		$(usex debug 'symbols debug' release)
+		$(myuse g15)
+		$(usex jack '' no-jackaudio)
+		$(myuse opus)
+		$(myuse oss)
+		$(myuse portaudio)
+		$(myuse pulseaudio)
+		$(myuse rnnoise)
+		$(usex speech '' no-speechd)
+		$(usex zeroconf '' no-bonjour)
+	)
+
+	use pch || conf_add+=( no-pch )
+
+	eqmake5 "${S}/main.pro" -recursive \
+		CONFIG+="${conf_add[*]}" \
+		DEFINES+="PLUGIN_PATH=/usr/$(get_libdir)/mumble"
+}
+
+multilib_src_compile() {
+	local emake_args=(
+		# place libmumble* in a subdirectory
+		DESTDIR_ADD="/${MULTILIB_ABI_FLAG}"
+		{C,L}FLAGS_ADD="$(get_abi_CFLAGS)"
+	)
+	# build only overlay library for other ABIs
+	multilib_is_native_abi || emake_args+=( -C overlay_gl )
+	emake "${emake_args[@]}"
+	emake clean
+}
+
+src_compile() {
+	multilib_foreach_abi multilib_src_compile
+}
+
+multilib_src_install() {
+	local dir=$(usex debug debug release)
+	insinto /usr/$(get_libdir)/${PN}
+	doins "${dir}/${MULTILIB_ABI_FLAG}"/libmumble.so*
+	if multilib_is_native_abi; then
+		dobin "${dir}"/mumble
+		doins "${dir}"/libcelt0.so* "${dir}"/plugins/lib*.so*
+	fi
+}
+
+src_install() {
+	multilib_foreach_abi multilib_src_install
+
+	newdoc README.Linux README
+	dodoc CHANGES
+	dobin scripts/mumble-overlay
+
+	insinto /usr/share/services
+	doins scripts/mumble.protocol
+
+	domenu scripts/mumble.desktop
+
+	doicon -s scalable icons/mumble.svg
+
+	doman man/mumble-overlay.1
+	doman man/mumble.1
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	echo
+	elog "Visit https://wiki.mumble.info/ for futher configuration instructions."
+	elog "Run mumble-overlay to start the OpenGL overlay (after starting mumble)."
+	echo
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+}
diff --git a/media-sound/mumble/mumble-9999.ebuild b/media-sound/mumble/mumble-9999.ebuild
index d821055f5f3c..1109a96055d6 100644
--- a/media-sound/mumble/mumble-9999.ebuild
+++ b/media-sound/mumble/mumble-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit desktop multilib-build qmake-utils xdg
+inherit cmake xdg
 
 DESCRIPTION="Mumble is an open source, low-latency, high quality voice chat software"
 HOMEPAGE="https://wiki.mumble.info"
@@ -26,7 +26,8 @@ fi
 
 LICENSE="BSD MIT"
 SLOT="0"
-IUSE="+alsa +dbus debug g15 jack libressl +opus oss pch portaudio pulseaudio +rnnoise speech zeroconf"
+IUSE="+alsa +dbus debug g15 jack libressl portaudio pulseaudio nls +rnnoise speech test zeroconf"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-qt/qtcore:5
@@ -38,6 +39,7 @@ RDEPEND="
 	dev-qt/qtxml:5
 	>=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
 	media-libs/speexdsp
 	sys-apps/lsb-release
@@ -49,7 +51,6 @@ RDEPEND="
 	jack? ( virtual/jack )
 	!libressl? ( >=dev-libs/openssl-1.0.0b:0= )
 	libressl? ( dev-libs/libressl )
-	opus? ( >=media-libs/opus-1.0.1 )
 	portaudio? ( media-libs/portaudio )
 	pulseaudio? ( media-sound/pulseaudio )
 	speech? ( >=app-accessibility/speech-dispatcher-0.8.0 )
@@ -64,97 +65,54 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-# NB: qmake does not support multilib but it's fine to configure
-# for the native ABI here
-src_configure() {
-	myuse() {
-		[[ -n "${1}" ]] || die "myuse: No use option given"
-		use ${1} || echo no-${1}
-	}
-
-	local conf_add=(
-		bundled-celt
-		no-bundled-opus
-		no-bundled-speex
-		no-embed-qt-translations
-		no-server
-		no-update
-		$(myuse alsa)
-		$(myuse dbus)
-		$(usex debug 'symbols debug' release)
-		$(myuse g15)
-		$(usex jack '' no-jackaudio)
-		$(myuse opus)
-		$(myuse oss)
-		$(myuse portaudio)
-		$(myuse pulseaudio)
-		$(myuse rnnoise)
-		$(usex speech '' no-speechd)
-		$(usex zeroconf '' no-bonjour)
-	)
-
-	use pch || conf_add+=( no-pch )
-
-	eqmake5 "${S}/main.pro" -recursive \
-		CONFIG+="${conf_add[*]}" \
-		DEFINES+="PLUGIN_PATH=/usr/$(get_libdir)/mumble"
+src_prepare() {
+        # required because of xdg.eclass also providing src_prepare
+        cmake_src_prepare
 }
 
-multilib_src_compile() {
-	local emake_args=(
-		# place libmumble* in a subdirectory
-		DESTDIR_ADD="/${MULTILIB_ABI_FLAG}"
-		{C,L}FLAGS_ADD="$(get_abi_CFLAGS)"
-	)
-	# build only overlay library for other ABIs
-	multilib_is_native_abi || emake_args+=( -C overlay_gl )
-	emake "${emake_args[@]}"
-	emake clean
-}
+src_configure() {
 
-src_compile() {
-	multilib_foreach_abi multilib_src_compile
-}
+	local mycmakeargs=(
+		-Dalsa="$(usex alsa)"
+		-DBUILD_TESTING="$(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)"
+		-Dpulseaudio="$(usex pulseaudio)"
+		-Drnnoise="$(usex rnnoise)"
+		-Dserver="OFF"
+		-Dspeechd="$(usex speech)"
+		-Dtranslations="$(usex nls)"
+		-Dupdate="OFF"
+		-Dzeroconf="$(usex zeroconf)"
+	)
 
-multilib_src_install() {
-	local dir=$(usex debug debug release)
-	insinto /usr/$(get_libdir)/${PN}
-	doins "${dir}/${MULTILIB_ABI_FLAG}"/libmumble.so*
-	if multilib_is_native_abi; then
-		dobin "${dir}"/mumble
-		doins "${dir}"/libcelt0.so* "${dir}"/plugins/lib*.so*
-	fi
+	cmake_src_configure
 }
 
 src_install() {
-	multilib_foreach_abi multilib_src_install
-
-	dodoc CHANGES README.md
-	dobin scripts/mumble-overlay
-
-	insinto /usr/share/services
-	doins scripts/mumble.protocol
-
-	domenu scripts/mumble.desktop
-
-	doicon -s scalable icons/mumble.svg
-
-	doman man/mumble-overlay.1
-	doman man/mumble.1
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
+	cmake_src_install
+
+	if use amd64 ; then
+		# The 32bit overlay library gets automatically built and installed on x86_64 platforms.
+		# 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 to start the OpenGL overlay (after starting mumble)."
+	elog "Run 'mumble-overlay <program>' to start the OpenGL overlay (after starting mumble)."
 	echo
 }
-
-pkg_postrm() {
-	xdg_pkg_postrm
-}