From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 94F27138351 for ; Fri, 10 Apr 2020 10:53:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 99523E09CC; Fri, 10 Apr 2020 10:53:09 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 80590E09CC for ; Fri, 10 Apr 2020 10:53:09 +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 4E66034EF38 for ; Fri, 10 Apr 2020 10:53:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3BC6E9D for ; Fri, 10 Apr 2020 10:53:06 +0000 (UTC) From: "Ulrich Müller" 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" Message-ID: <1586515928.b36c3f0ad1840eb843ce7077db79dfdf23fc0d63.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-3.5.374815.0324-r4.ebuild net-im/zoom/zoom-3.5.382995.0407-r1.ebuild X-VCS-Directories: net-im/zoom/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: b36c3f0ad1840eb843ce7077db79dfdf23fc0d63 X-VCS-Branch: master Date: Fri, 10 Apr 2020 10:53:06 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: cc63147c-4ffa-4ba6-bc9d-8c1d01f8f3ee X-Archives-Hash: 1f8dea03a00ff7d71f175033623ef836 commit: b36c3f0ad1840eb843ce7077db79dfdf23fc0d63 Author: Ulrich Müller gentoo org> AuthorDate: Fri Apr 10 10:52:08 2020 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Fri Apr 10 10:52:08 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b36c3f0a net-im/zoom: Block against games-engines/zoom. Due to file collision for /usr/bin/zoom. Closes: https://bugs.gentoo.org/716884 Package-Manager: Portage-2.3.98, Repoman-2.3.22 Signed-off-by: Ulrich Müller gentoo.org> net-im/zoom/zoom-3.5.374815.0324-r4.ebuild | 3 ++- net-im/zoom/zoom-3.5.382995.0407-r1.ebuild | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/net-im/zoom/zoom-3.5.374815.0324-r4.ebuild b/net-im/zoom/zoom-3.5.374815.0324-r4.ebuild index 151ed2f0797..a93bbf73b3b 100644 --- a/net-im/zoom/zoom-3.5.374815.0324-r4.ebuild +++ b/net-im/zoom/zoom-3.5.374815.0324-r4.ebuild @@ -17,7 +17,8 @@ KEYWORDS="-* ~amd64 ~x86" IUSE="pulseaudio" RESTRICT="mirror bindist strip" -RDEPEND="dev-libs/glib:2 +RDEPEND="!games-engines/zoom + dev-libs/glib:2 dev-libs/icu dev-qt/qtcore:5 dev-qt/qtdbus:5 diff --git a/net-im/zoom/zoom-3.5.382995.0407-r1.ebuild b/net-im/zoom/zoom-3.5.382995.0407-r1.ebuild index 4180a520f38..080fffff6e1 100644 --- a/net-im/zoom/zoom-3.5.382995.0407-r1.ebuild +++ b/net-im/zoom/zoom-3.5.382995.0407-r1.ebuild @@ -17,7 +17,8 @@ KEYWORDS="-* ~amd64 ~x86" IUSE="bundled-libjpeg-turbo pulseaudio" RESTRICT="mirror bindist strip" -RDEPEND="dev-libs/glib:2 +RDEPEND="!games-engines/zoom + dev-libs/glib:2 dev-libs/icu dev-qt/qtcore:5 dev-qt/qtdbus:5