gentoo (valentine's day) resync : 14.02.2021

3 files changed, 14 insertions, 14 deletions

diff --git a/net-im/zoom/Manifest b/net-im/zoom/Manifest
index 0245c50b7777..6c550e096ea5 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.4.57450.1220_x86_64.tar.xz 45788732 BLAKE2B 932187da18c52baeaba90114b7d7115bb973787fe690f94482d53527fbd4ded327eecee6d3097831a5e3c164c79b46dcb32ee3a28223f8b1543e166ea282d44f SHA512 cf8581f175518fdc83c6780bd6a1154d58db1c012bcaf14228e32d839532e741d8eaae4883f7905d181b7d2f0c1e2efe125377dd85eb5ebb742cc5252bbc4b54
-DIST zoom-5.4.57862.0110_x86_64.tar.xz 45850484 BLAKE2B 987efd8b0d75c3ff6dae43e7175b1c2967a554c5ac04baf1f634c5298d8e976129665a7b69943f6a2e5207f027f29612ddb2c3d8464995d2802fa457982e04d5 SHA512 69441864d7b413b76d6e1cd97808491aa4776988a1ffe30ac7ae1ab13f562fc43b27f810814155972f576b92a7d3ce13f90ed2a754bc374d20b6ee3ddcfbf40d
+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.4.57450.1220.ebuild 4216 BLAKE2B 5686d389e8001afb71e2ba8768d6b30be62663c7eb231dea7e782e40294d6e7205a93af23dc2427a5646c9312ffacd41a63063c44263e9aa6bf1f13ab001db75 SHA512 f48332855183836ff75dd0a14eb6b8468e1130131048c0f26392453d86615246e2cc313fc2ea4a3dea4d1692095e66351f90804ccd628f56bebdea06766d3127
-EBUILD zoom-5.4.57862.0110.ebuild 3997 BLAKE2B 9077fd3a8892144dcb3daeaaffcd792fa897a5f95b62261f51de5b8fe37799838dd32876b94cbf9d2639f548edc71e4d111cf486c731165578377bb6aadaae2a SHA512 d9378b92ac93eee7996f14c58a774e4ebf553c0875736585aa29cefffb553d3037f8f52c1394950de7bb9db7dd5d68691c03ce93eb096e67d61e8696c525b149
+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
 MISC metadata.xml 615 BLAKE2B 4f6cae417f6fbf1f0670f5d0c750dfd4928eb09b3753e4dcd5b3ecf884ed39013ab88de2a0225f223a1655c7ece1fd41fce93e092b5fbaec3aee52fe69a7ffa3 SHA512 5aebbb40b7089db87e30b98500aad5116b70495f3563a1e362a81f3f5036b9ac73556631550966e48aaae39f05264c6d13eea9ff2734bd929e933b05c1c09425
diff --git a/net-im/zoom/zoom-5.4.57862.0110.ebuild b/net-im/zoom/zoom-5.5.6981.0202.ebuild
index 6e49d223e0fc..6e49d223e0fc 100644
--- a/net-im/zoom/zoom-5.4.57862.0110.ebuild
+++ b/net-im/zoom/zoom-5.5.6981.0202.ebuild
diff --git a/net-im/zoom/zoom-5.4.57450.1220.ebuild b/net-im/zoom/zoom-5.5.7011.0206-r1.ebuild
index 985fec29e240..bb88fb87f840 100644
--- a/net-im/zoom/zoom-5.4.57450.1220.ebuild
+++ b/net-im/zoom/zoom-5.5.7011.0206-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,6 +19,7 @@ RESTRICT="mirror bindist strip"
 RDEPEND="!games-engines/zoom
 	dev-libs/glib:2
 	dev-libs/quazip
+	media-libs/fdk-aac:0/2
 	media-libs/fontconfig
 	media-libs/freetype
 	media-sound/mpg123
@@ -56,7 +57,8 @@ RDEPEND="!games-engines/zoom
 		wayland? ( dev-qt/qtwayland )
 	)"
 
-BDEPEND="dev-util/bbe"
+BDEPEND="dev-util/bbe
+	bundled-libjpeg-turbo? ( dev-util/patchelf )"
 
 QA_PREBUILT="opt/zoom/*"
 
@@ -75,6 +77,11 @@ src_prepare() {
 		bbe -e 's/libpulse.so/IgNoRePuLsE/' zoom >zoom.tmp || die
 		mv zoom.tmp zoom || die
 	fi
+
+	if use bundled-libjpeg-turbo; then
+		# Remove insecure RPATH from bundled lib
+		patchelf --remove-rpath libturbojpeg.so || die
+	fi
 }
 
 src_install() {
@@ -85,6 +92,7 @@ src_install() {
 	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
 
 	if use bundled-libjpeg-turbo; then
 		doexe libturbojpeg.so
@@ -130,14 +138,6 @@ pkg_postinst() {
 		ver_test ${v} -le 5.0.403652.0509 && FORCE_PRINT_ELOG=1
 	done
 	readme.gentoo_print_elog
-
-	if use bundled-libjpeg-turbo; then
-		ewarn "If the \"bundled-libjpeg-turbo\" flag is enabled, you may see a"
-		ewarn "QA notice about insecure RPATHs in the libturbojpeg.so library"
-		ewarn "bundled with the upstream package. Please report this problem"
-		ewarn "directly to Zoom upstream. Do *not* file a Gentoo bug for it."
-		ewarn "See https://bugs.gentoo.org/715106 for further details."
-	fi
 }
 
 pkg_postrm() {