gentoo resync : 03.03.2021

3 files changed, 16 insertions, 17 deletions

diff --git a/media-sound/teamspeak-client/Manifest b/media-sound/teamspeak-client/Manifest
index 0caa3a0962c3..45c1f013b9f8 100644
--- a/media-sound/teamspeak-client/Manifest
+++ b/media-sound/teamspeak-client/Manifest
@@ -1,7 +1,7 @@
 AUX ts3client-bin-r2 323 BLAKE2B bfeb748c59492387139b70bd3d688bf0c21969566d7cbfafec9abc3974daad67f34ad00cef53a35f229e8434ad2a15454c29c1470214f47332cd606053cb515d SHA512 42c5ee014db58b99d4680e31a59ac8b53c3a005332478ed166128fd08867c0cdc167c5b74a97a0f3a630c8faff9e5edd9c96da28bdbebae1d56a896e7a50e95d
 DIST TeamSpeak3-Client-linux_amd64-3.5.6.run 100152301 BLAKE2B 9fbaa32ac000c9e29e09dcb1c932acea45265d5cf464308d6f27063fb3095690f3cb96abb061ce947438a4b919dcbaf8f3f0189048b470b09bb2b8285e426e39 SHA512 fe1b41773d2b2de8198fdaf189c6665994eeaf6a0255485f7d342a3e77702f5515d5c5c685410a0b5844b4ad5c395d57b68e57c7b1f46bd1211ef813ce1e0030
 DIST TeamSpeak3-Client-linux_x86-3.5.6.run 98637555 BLAKE2B 6f891e6846f8f899edb8ef107b7ea6518f413488525b7696863292d99d73614cae40631f5ed2341cce75ea62ffd94c60968ff6b5d587446d7469271835c01202 SHA512 dfc5ed3e2a92ed9f1cea2fdde5e40cf73e4a999ea782c434b26072ac0e7ac37d6305c06ae2d39c104eeee10639f325c7b96f538082e60224a68c0553fab0d12c
-DIST teamspeak-client-5.0.0_beta40.tar.gz 116647752 BLAKE2B f0e5cf0aa2fe4c69bd7c621454918c13175d0708c3ad54b5dd0b18dfbbd0dc18af520d0f65e391f36d7d5cb3a8c2eaffec0619101f4b59262b8885cebf86629b SHA512 abeacf9d200f68ae4ac9a9adee146a52d81a7f34c7593cfa0ca363300f18ca1d85e582181d1c874accb5a84eb17bb1ed6bc79fb460708fbb2ebd937c40f28607
-EBUILD teamspeak-client-3.5.6-r2.ebuild 3045 BLAKE2B 33a81fe060e563a7357078ebf301b7400727a656a035987d8391c8c2dac1d5d5d4169a1c13fed0d5ed5e2a3f396705071bcea8a81b18cf76464b68a59026bcb1 SHA512 167a5140716b9a3f5b2c6925f1773e2c1be592668cb07d5d672f2de611486a11b05964061a860ab802dc784e6552f70d01a774e3468771590a8da34ba682cbd5
-EBUILD teamspeak-client-5.0.0_beta40.ebuild 2076 BLAKE2B ed04658208474490cec01da9f5ac810aa0e152e256bbb28c82ea6527ceac78a8adaffbc084f284adf9a9bee04fcaaded432efc01fd2e0e734b0661d8a80091c6 SHA512 b5acf657f599dd16f19053127e3838458c9fff513a4ca2eb059434eeaac918cefa3d72cf7b32b94177e1ff00d3fe51e07fc991fb53dc261ce7e43b3a1adf2dc2
+DIST teamspeak-client-5.0.0_beta43.tar.gz 116647752 BLAKE2B f0e5cf0aa2fe4c69bd7c621454918c13175d0708c3ad54b5dd0b18dfbbd0dc18af520d0f65e391f36d7d5cb3a8c2eaffec0619101f4b59262b8885cebf86629b SHA512 abeacf9d200f68ae4ac9a9adee146a52d81a7f34c7593cfa0ca363300f18ca1d85e582181d1c874accb5a84eb17bb1ed6bc79fb460708fbb2ebd937c40f28607
+EBUILD teamspeak-client-3.5.6-r4.ebuild 3105 BLAKE2B 5be9bb40652e30ebf3975216fad766fc303200edad749fa087113d1aa16cf8b36812b7bb256b509c34528f8b1984d7ed2e4de99f4c25cae290bde5265cdc9e76 SHA512 8597838502d4792e2e2b6fa8281586aec7c763af9374f5ce928c8728d53a99dad3888229dc540e1df43678f81d6b78124c37176586b76e9f64202297210125da
+EBUILD teamspeak-client-5.0.0_beta43.ebuild 2076 BLAKE2B ed04658208474490cec01da9f5ac810aa0e152e256bbb28c82ea6527ceac78a8adaffbc084f284adf9a9bee04fcaaded432efc01fd2e0e734b0661d8a80091c6 SHA512 b5acf657f599dd16f19053127e3838458c9fff513a4ca2eb059434eeaac918cefa3d72cf7b32b94177e1ff00d3fe51e07fc991fb53dc261ce7e43b3a1adf2dc2
 MISC metadata.xml 744 BLAKE2B e5a883b78a951de65c5a0ac3ef23674fc120339531a8e10225f5049a67d42f206fce5296f41bbb329105386b2138c83385c0b3293199409ac76b92c10dd17696 SHA512 6e8688c9c36c34625b8bf8b0e2870b88a8f7df4986f2a2579c089260058022cc5177e5108e8f4616cebfcfc1c132277eff74b9d45054b6d61f87c8966dff9156
diff --git a/media-sound/teamspeak-client/teamspeak-client-3.5.6-r2.ebuild b/media-sound/teamspeak-client/teamspeak-client-3.5.6-r4.ebuild
index 99cf08b2b88b..151c902c854a 100644
--- a/media-sound/teamspeak-client/teamspeak-client-3.5.6-r2.ebuild
+++ b/media-sound/teamspeak-client/teamspeak-client-3.5.6-r4.ebuild
@@ -3,9 +3,8 @@
 
 EAPI=7
 
-inherit desktop toolchain-funcs unpacker xdg-utils
-
 MY_PV="${PV/_/-}"
+inherit desktop toolchain-funcs unpacker xdg-utils
 
 DESCRIPTION="A client software for quality voice communication via the internet"
 HOMEPAGE="https://www.teamspeak.com/"
@@ -14,23 +13,21 @@ SRC_URI="
 	x86? ( https://files.teamspeak-services.com/releases/client/${PV}/TeamSpeak3-Client-linux_x86-${MY_PV}.run )
 "
 
-KEYWORDS="-* amd64 x86"
 LICENSE="teamspeak3 || ( GPL-2 GPL-3 LGPL-3 )"
 SLOT="3"
+KEYWORDS="-* amd64 x86"
 IUSE="+alsa pulseaudio system-libcxx"
+
 REQUIRED_USE="|| ( alsa pulseaudio )"
+RESTRICT="bindist mirror"
 
 BDEPEND=">=dev-util/patchelf-0.10"
-
 RDEPEND="
 	app-arch/snappy:0/1
 	dev-libs/openssl:0
-	dev-libs/quazip:0
+	dev-libs/quazip:0=
 	dev-qt/qtcore:5
-	|| (
-		dev-qt/qtgui:5[accessibility,dbus,X(-)]
-		dev-qt/qtgui:5[accessibility,dbus,xcb(-)]
-	)
+	dev-qt/qtgui:5[accessibility,dbus,X(-)]
 	dev-qt/qtnetwork:5
 	dev-qt/qtsql:5[sqlite]
 	dev-qt/qtsvg:5
@@ -46,8 +43,6 @@ RDEPEND="
 	system-libcxx? ( sys-libs/libcxx[libcxxabi] )
 "
 
-RESTRICT="bindist mirror"
-
 S="${WORKDIR}"
 
 QA_PREBUILT="
@@ -65,20 +60,24 @@ src_prepare() {
 	default
 
 	if ! use alsa; then
-		rm -f soundbackends/libalsa_linux_*.so || die
+		rm soundbackends/libalsa_linux_*.so || die
 	fi
 
 	if ! use pulseaudio ; then
-		rm -f soundbackends/libpulseaudio_linux_*.so || die
+		rm soundbackends/libpulseaudio_linux_*.so || die
 	fi
 
 	mv ts3client_linux_* ts3client || die
 
 	# Fixes QA Notice: Unresolved soname dependencies.
 	# Since this is a binary only package, it must be patched.
+	local quazip_so="libquazip1-qt5.so.1.0.0"
+	if has_version "<dev-libs/quazip-1.0"; then
+		quazip_so="libquazip5.so.1"
+	fi
 	local soname_files=( "error_report" "ts3client" )
 	for soname_file in ${soname_files[@]}; do
-		patchelf --replace-needed libquazip.so libquazip5.so.1 "${soname_file}" || die
+		patchelf --replace-needed libquazip.so "${quazip_so}" "${soname_file}" || die
 	done
 
 	tc-export CXX
diff --git a/media-sound/teamspeak-client/teamspeak-client-5.0.0_beta40.ebuild b/media-sound/teamspeak-client/teamspeak-client-5.0.0_beta43.ebuild
index c10184fe8264..c10184fe8264 100644
--- a/media-sound/teamspeak-client/teamspeak-client-5.0.0_beta40.ebuild
+++ b/media-sound/teamspeak-client/teamspeak-client-5.0.0_beta43.ebuild