gentoo resync : 03.03.2021

4 files changed, 27 insertions, 10 deletions

diff --git a/net-im/zoom/Manifest b/net-im/zoom/Manifest
index 6c550e096ea5..1b1e160633d0 100644
--- a/net-im/zoom/Manifest
+++ b/net-im/zoom/Manifest
@@ -1,9 +1,9 @@
 AUX README.gentoo 323 BLAKE2B d76300068625c3946641d76000f9ed59a5ad93bfefbbdd6e7dc284d98d234ff11007261a1e5676b5b40890f99c9929dcc179fb1cbaeb5eb3bf5a25cb08c5f233 SHA512 53b60206207913af6bcd31fe78b6ea68468cbc5cd01bde46b62e22f119dda19e66d990e3f75ab8a0f67faff50064ed895d67fc43d64df19186145c6a8220ac0e
 DIST zoom-5.4.53391.1108_i686.tar.xz 40384800 BLAKE2B 0d449103e16799e6e6bcaf6ef1c105d6a75ce8728bfedb5107a9c6deedd9e8ef1988e19ddc33da43de8eb925d386460a84b5efe13c0709de6901239a688b4fb0 SHA512 d77357ab669ade90d4b8ae99116372db8b8b9a251625ed0566e89a8cc4d3f7aced07fd08d4646a223fad58f588e1dc2484464bd70e203b875ac9866fb92fe2ea
 DIST zoom-5.4.53391.1108_x86_64.tar.xz 44660944 BLAKE2B 7152f4daccdbce56e2c83971f507bc70d5b77e8edd558f311e67f0e2ab127967cdd15c90b92ca95735b2fad3e11d692b206c32c5f7d65cd116050e8e6579fcdd SHA512 f52e2fda15a29c2232656e8f34a5d65c3c401eb50f249d5436a949c09efd5b821d1c5e1f59dc4c27b5f4aadc1c24f474854498664b5d333d340d03f4998c59ba
-DIST zoom-5.5.6981.0202_x86_64.tar.xz 50898976 BLAKE2B f6029dec4b082bdf9d74e31b04e0c1994b238c5e19482d5b0bdcbc6214c87e8e94ef527ae6a6dff4a96973d4cec3e40f369810b4b1b21abe20d64e0cccd0b15c SHA512 f408a292543028e2262ac1c528be0c38e0fbba61e641c4549bec1ef9e2283f5eb041e68cfd770d87e67e31dc51a27f3ca15c23cc2d82452568518cb0ee97f132
 DIST zoom-5.5.7011.0206_x86_64.tar.xz 50893408 BLAKE2B 1d03f7fd1f0b7477ba2ff023f1b1f5fd26b0a8a3ac2a54170d3ec3e034a707a824e0b52f6bc3c144be414a28b2587f451d3b6990df02f4ce5df10530c00d1b6a SHA512 c427ed744138b5ef2c741970138e1ad91b5384a020c12451d30b411c8b533e3ffdc4ca785e73a8707d47f53bdd7b9af4e5ffe695ef7de75e1959150730aca913
-EBUILD zoom-5.4.53391.1108-r1.ebuild 3058 BLAKE2B 6e007b223d2075ac20f99237b27a9d38c611890c8c53c614ba20ef3ea20ae1335a2cad714fbfa2e120bdd96b21dbc1d4169125cb66988b423c86410d3e4d6f67 SHA512 99f09c38ecb0c26c6daaad5983ca5bedf68a510f69a6c5d4dd7931ef847cb235220abe30de06a68dc3a9274ed78ea22f751864a78bf9ac7aaef43b7a92c3717a
-EBUILD zoom-5.5.6981.0202.ebuild 3997 BLAKE2B 9077fd3a8892144dcb3daeaaffcd792fa897a5f95b62261f51de5b8fe37799838dd32876b94cbf9d2639f548edc71e4d111cf486c731165578377bb6aadaae2a SHA512 d9378b92ac93eee7996f14c58a774e4ebf553c0875736585aa29cefffb553d3037f8f52c1394950de7bb9db7dd5d68691c03ce93eb096e67d61e8696c525b149
-EBUILD zoom-5.5.7011.0206-r1.ebuild 4093 BLAKE2B 351acd4a5ce85d9ddc129f10278c50787464190cd8f52fe3387cb82a1f20c840f3bc6d59ef5fa601a42d8a1482e54cb380d19c77fd793257d28d9c02ba755bf3 SHA512 0ddf2ddf2d21668e5112264e9e1fc60af068cf724138f78e0ab7969b5ef96111a307f58eb7af22bb34aab076f3259ef77893ccacb2eb129fef3b405a188c9f5b
+DIST zoom-5.5.7938.0228_x86_64.tar.xz 50938368 BLAKE2B e8a45c95db2080092674441f16d4bdeeadbe8999483f3ac7ba2da3afb1b340fb3f03cb879a97dd93512159f5a6ff57996782d7b4137547aa78c652c3c40b2641 SHA512 76d3d1dc3c8772636db59f8b641241c4910a54c0e71d33e3f51960d85fd5957536d0e5bbd20870fb7fc1af1457344a3567d7f46bcdfe99774bb87280b14e812c
+EBUILD zoom-5.4.53391.1108-r2.ebuild 3187 BLAKE2B 385ea0a7a8240baa252674309baad0aa136b2be42e84cca006f9e4fa28bb24efc264ecbab691337e0e14e8f64b2ce3bdd188670056ebb14b1026c9940f9cb7bd SHA512 2cd9bca7e4187d5578f858c4c7325888f4e6868b585b5561fa6dfd474a75ca32750ed64fbc79e61eda576f0a6522c6656866c17773d3b6d5490803e47222d475
+EBUILD zoom-5.5.7011.0206-r2.ebuild 4222 BLAKE2B 739b4585895a1d568255dda626c06f97cf01a1540700497eab31cc1740a52f0a4ff6db6efa300d163b7c0766098a6d53542b10773566bee1e60b97e3fbe0b1d8 SHA512 1c6cc6abb2e67a404c93734ecf6f0491303549c7fcd1238cb0f745473a780108014aced2473835e43a96ae54f406adab5c102f53929d7e578aba5fa513ba7d0b
+EBUILD zoom-5.5.7938.0228.ebuild 4222 BLAKE2B 739b4585895a1d568255dda626c06f97cf01a1540700497eab31cc1740a52f0a4ff6db6efa300d163b7c0766098a6d53542b10773566bee1e60b97e3fbe0b1d8 SHA512 1c6cc6abb2e67a404c93734ecf6f0491303549c7fcd1238cb0f745473a780108014aced2473835e43a96ae54f406adab5c102f53929d7e578aba5fa513ba7d0b
 MISC metadata.xml 615 BLAKE2B 4f6cae417f6fbf1f0670f5d0c750dfd4928eb09b3753e4dcd5b3ecf884ed39013ab88de2a0225f223a1655c7ece1fd41fce93e092b5fbaec3aee52fe69a7ffa3 SHA512 5aebbb40b7089db87e30b98500aad5116b70495f3563a1e362a81f3f5036b9ac73556631550966e48aaae39f05264c6d13eea9ff2734bd929e933b05c1c09425
diff --git a/net-im/zoom/zoom-5.4.53391.1108-r1.ebuild b/net-im/zoom/zoom-5.4.53391.1108-r2.ebuild
index 07911c9877c9..cc5c6c145238 100644
--- a/net-im/zoom/zoom-5.4.53391.1108-r1.ebuild
+++ b/net-im/zoom/zoom-5.4.53391.1108-r2.ebuild
@@ -20,7 +20,7 @@ RESTRICT="mirror bindist strip"
 RDEPEND="!games-engines/zoom
 	dev-libs/glib:2
 	dev-libs/icu
-	dev-libs/quazip
+	dev-libs/quazip:0=
 	dev-qt/qtcore:5
 	dev-qt/qtdbus:5
 	dev-qt/qtdeclarative:5[widgets]
@@ -82,7 +82,12 @@ src_install() {
 	doins *.pcm *.pem *.sh Embedded.properties version.txt
 	doexe zoom zoom.sh zopen ZoomLauncher
 	dosym8 -r {"/usr/$(get_libdir)",/opt/zoom}/libmpg123.so
-	dosym8 -r {"/usr/$(get_libdir)",/opt/zoom}/libquazip.so
+
+	local quazip_so="libquazip1-qt5.so"
+	if has_version "<dev-libs/quazip-1.0"; then
+		quazip_so="libquazip5.so"
+	fi
+	dosym8 -r "/usr/$(get_libdir)/${quazip_so}" /opt/zoom/libquazip.so
 
 	if use bundled-libjpeg-turbo; then
 		doexe libturbojpeg.so
diff --git a/net-im/zoom/zoom-5.5.7011.0206-r1.ebuild b/net-im/zoom/zoom-5.5.7011.0206-r2.ebuild
index bb88fb87f840..7ae87da3f7bd 100644
--- a/net-im/zoom/zoom-5.5.7011.0206-r1.ebuild
+++ b/net-im/zoom/zoom-5.5.7011.0206-r2.ebuild
@@ -18,7 +18,7 @@ RESTRICT="mirror bindist strip"
 
 RDEPEND="!games-engines/zoom
 	dev-libs/glib:2
-	dev-libs/quazip
+	dev-libs/quazip:0=
 	media-libs/fdk-aac:0/2
 	media-libs/fontconfig
 	media-libs/freetype
@@ -91,9 +91,14 @@ src_install() {
 	doins *.pcm *.sh Embedded.properties version.txt
 	doexe zoom zopen ZoomLauncher
 	dosym8 -r {"/usr/$(get_libdir)",/opt/zoom}/libmpg123.so
-	dosym8 -r {"/usr/$(get_libdir)",/opt/zoom}/libquazip.so
 	dosym8 -r "/usr/$(get_libdir)/libfdk-aac.so.2" /opt/zoom/libfdkaac2.so
 
+	local quazip_so="libquazip1-qt5.so"
+	if has_version "<dev-libs/quazip-1.0"; then
+		quazip_so="libquazip5.so"
+	fi
+	dosym8 -r "/usr/$(get_libdir)/${quazip_so}" /opt/zoom/libquazip.so
+
 	if use bundled-libjpeg-turbo; then
 		doexe libturbojpeg.so
 	else
diff --git a/net-im/zoom/zoom-5.5.6981.0202.ebuild b/net-im/zoom/zoom-5.5.7938.0228.ebuild
index 6e49d223e0fc..7ae87da3f7bd 100644
--- a/net-im/zoom/zoom-5.5.6981.0202.ebuild
+++ b/net-im/zoom/zoom-5.5.7938.0228.ebuild
@@ -18,7 +18,8 @@ RESTRICT="mirror bindist strip"
 
 RDEPEND="!games-engines/zoom
 	dev-libs/glib:2
-	dev-libs/quazip
+	dev-libs/quazip:0=
+	media-libs/fdk-aac:0/2
 	media-libs/fontconfig
 	media-libs/freetype
 	media-sound/mpg123
@@ -90,7 +91,13 @@ src_install() {
 	doins *.pcm *.sh Embedded.properties version.txt
 	doexe zoom zopen ZoomLauncher
 	dosym8 -r {"/usr/$(get_libdir)",/opt/zoom}/libmpg123.so
-	dosym8 -r {"/usr/$(get_libdir)",/opt/zoom}/libquazip.so
+	dosym8 -r "/usr/$(get_libdir)/libfdk-aac.so.2" /opt/zoom/libfdkaac2.so
+
+	local quazip_so="libquazip1-qt5.so"
+	if has_version "<dev-libs/quazip-1.0"; then
+		quazip_so="libquazip5.so"
+	fi
+	dosym8 -r "/usr/$(get_libdir)/${quazip_so}" /opt/zoom/libquazip.so
 
 	if use bundled-libjpeg-turbo; then
 		doexe libturbojpeg.so