From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1218274-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by finch.gentoo.org (Postfix) with ESMTPS id EE6E3138359
	for <garchives@archives.gentoo.org>; Thu, 29 Oct 2020 07:39:31 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id E577BE0978;
	Thu, 29 Oct 2020 07:39:29 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id C9F80E0978
	for <gentoo-commits@lists.gentoo.org>; Thu, 29 Oct 2020 07:39:29 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 4E04E33BEE0
	for <gentoo-commits@lists.gentoo.org>; Thu, 29 Oct 2020 07:39:28 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 87C05296
	for <gentoo-commits@lists.gentoo.org>; Thu, 29 Oct 2020 07:39:26 +0000 (UTC)
From: "Ulrich Müller" <ulm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" <ulm@gentoo.org>
Message-ID: <1603957121.051281dc93732bac602ed34ce5742798840ec639.ulm@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: net-im/zoom/
X-VCS-Repository: repo/gentoo
X-VCS-Files: net-im/zoom/zoom-5.4.53350.1027-r1.ebuild net-im/zoom/zoom-5.4.53350.1027.ebuild
X-VCS-Directories: net-im/zoom/
X-VCS-Committer: ulm
X-VCS-Committer-Name: Ulrich Müller
X-VCS-Revision: 051281dc93732bac602ed34ce5742798840ec639
X-VCS-Branch: master
Date: Thu, 29 Oct 2020 07:39:26 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: ad61b60c-f2df-47b0-8b24-d57ae8ed267a
X-Archives-Hash: 1ef18b3bf802a7763ffb1bd393531bd2

commit:     051281dc93732bac602ed34ce5742798840ec639
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 29 07:38:41 2020 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu Oct 29 07:38:41 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=051281dc

net-im/zoom: Re-add bundled-libjpeg-turbo flag.

Bug: https://bugs.gentoo.org/715106#c49
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 ...om-5.4.53350.1027.ebuild => zoom-5.4.53350.1027-r1.ebuild} | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/net-im/zoom/zoom-5.4.53350.1027.ebuild b/net-im/zoom/zoom-5.4.53350.1027-r1.ebuild
similarity index 91%
rename from net-im/zoom/zoom-5.4.53350.1027.ebuild
rename to net-im/zoom/zoom-5.4.53350.1027-r1.ebuild
index 3081591a3d7..b6642189422 100644
--- a/net-im/zoom/zoom-5.4.53350.1027.ebuild
+++ b/net-im/zoom/zoom-5.4.53350.1027-r1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}"
 LICENSE="all-rights-reserved Apache-2.0" # Apache-2.0 for icon
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
-IUSE="pulseaudio"
+IUSE="bundled-libjpeg-turbo pulseaudio"
 RESTRICT="mirror bindist strip"
 
 RDEPEND="!games-engines/zoom
@@ -33,7 +33,6 @@ RDEPEND="!games-engines/zoom
 	dev-qt/qtscript:5
 	dev-qt/qtsvg:5
 	dev-qt/qtwidgets:5
-	media-libs/libjpeg-turbo
 	media-sound/mpg123
 	sys-apps/dbus
 	sys-apps/util-linux
@@ -45,6 +44,7 @@ RDEPEND="!games-engines/zoom
 	x11-libs/libXtst
 	x11-libs/xcb-util-image
 	x11-libs/xcb-util-keysyms
+	!bundled-libjpeg-turbo? ( media-libs/libjpeg-turbo )
 	pulseaudio? ( media-sound/pulseaudio )
 	!pulseaudio? ( media-libs/alsa-lib )"
 
@@ -71,7 +71,12 @@ src_install() {
 	doexe zoom zoom.sh zopen ZoomLauncher
 	dosym {"../../usr/$(get_libdir)",/opt/zoom}/libmpg123.so
 	dosym {"../../usr/$(get_libdir)",/opt/zoom}/libquazip.so
-	dosym {"../../usr/$(get_libdir)",/opt/zoom}/libturbojpeg.so #715106
+
+	if use bundled-libjpeg-turbo; then
+		doexe libturbojpeg.so
+	else
+		dosym {"../../usr/$(get_libdir)",/opt/zoom}/libturbojpeg.so #715106
+	fi
 
 	make_wrapper zoom ./zoom /opt/zoom
 	make_desktop_entry "zoom %U" Zoom zoom-videocam "" \