[gentoo-commits] repo/gentoo:master commit in: net-im/zoom/

["Ulrich Müller" <ulm@gentoo.org>]

commit:     be4a30e09ac98d66661074a4d4a88b92c6268be8
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 11 15:56:07 2021 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon Jan 11 16:06:31 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be4a30e0

net-im/zoom: Backport ebuild changes to x86 version

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 net-im/zoom/zoom-5.4.53391.1108-r1.ebuild | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/net-im/zoom/zoom-5.4.53391.1108-r1.ebuild b/net-im/zoom/zoom-5.4.53391.1108-r1.ebuild
index 3d3b63c3854..07911c9877c 100644
--- a/net-im/zoom/zoom-5.4.53391.1108-r1.ebuild
+++ b/net-im/zoom/zoom-5.4.53391.1108-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
@@ -48,7 +48,8 @@ RDEPEND="!games-engines/zoom
 	pulseaudio? ( media-sound/pulseaudio )
 	!pulseaudio? ( media-libs/alsa-lib )"
 
-BDEPEND="dev-util/bbe"
+BDEPEND="dev-util/bbe
+	bundled-libjpeg-turbo? ( dev-util/patchelf )"
 
 QA_PREBUILT="opt/zoom/*"
 
@@ -67,6 +68,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() {
@@ -101,14 +107,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() {