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 64892138350 for ; Fri, 14 Feb 2020 00:45:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 46B89E0831; Fri, 14 Feb 2020 00:45:21 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 196C4E0831 for ; Fri, 14 Feb 2020 00:45:21 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 7723334ED97 for ; Fri, 14 Feb 2020 00:45:19 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A3862111 for ; Fri, 14 Feb 2020 00:45:17 +0000 (UTC) From: "Thomas Deutschmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Deutschmann" Message-ID: <1581641111.542ac4493fb6ec1442a58cf4f29efa8433e096af.whissi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/firefox-bin/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-client/firefox-bin/firefox-bin-68.5.0-r1.ebuild www-client/firefox-bin/firefox-bin-68.5.0.ebuild www-client/firefox-bin/firefox-bin-73.0-r1.ebuild www-client/firefox-bin/firefox-bin-73.0.ebuild X-VCS-Directories: www-client/firefox-bin/ X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: 542ac4493fb6ec1442a58cf4f29efa8433e096af X-VCS-Branch: master Date: Fri, 14 Feb 2020 00:45:17 +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: 8186770f-08ca-4711-bcca-6395358b158d X-Archives-Hash: de0d15e11453c86e9007638be265e6a6 commit: 542ac4493fb6ec1442a58cf4f29efa8433e096af Author: Joonas Niilola gentoo org> AuthorDate: Thu Feb 13 17:42:02 2020 +0000 Commit: Thomas Deutschmann gentoo org> CommitDate: Fri Feb 14 00:45:11 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=542ac449 www-client/firefox-bin: revbump for new apulse logic Signed-off-by: Joonas Niilola gentoo.org> Closes: https://github.com/gentoo/gentoo/pull/14649 Signed-off-by: Thomas Deutschmann gentoo.org> ...-68.5.0.ebuild => firefox-bin-68.5.0-r1.ebuild} | 24 ++++++++++++-------- ...-bin-73.0.ebuild => firefox-bin-73.0-r1.ebuild} | 26 +++++++++++++--------- 2 files changed, 31 insertions(+), 19 deletions(-) diff --git a/www-client/firefox-bin/firefox-bin-68.5.0.ebuild b/www-client/firefox-bin/firefox-bin-68.5.0-r1.ebuild similarity index 94% rename from www-client/firefox-bin/firefox-bin-68.5.0.ebuild rename to www-client/firefox-bin/firefox-bin-68.5.0-r1.ebuild index 030cfc8b6b1..d95d92d0739 100644 --- a/www-client/firefox-bin/firefox-bin-68.5.0.ebuild +++ b/www-client/firefox-bin/firefox-bin-68.5.0-r1.ebuild @@ -35,13 +35,14 @@ RESTRICT="strip mirror" KEYWORDS="-* amd64 x86" SLOT="0" LICENSE="MPL-2.0 GPL-2 LGPL-2.1" -IUSE="alsa +ffmpeg +pulseaudio selinux startup-notification" -REQUIRED_USE="alsa? ( !pulseaudio )" +IUSE="+alsa +ffmpeg +pulseaudio selinux startup-notification" DEPEND="app-arch/unzip alsa? ( - dev-util/patchelf - media-sound/apulse + !pulseaudio? ( + dev-util/patchelf + media-sound/apulse + ) )" RDEPEND="dev-libs/atk >=sys-apps/dbus-0.60 @@ -62,8 +63,12 @@ RDEPEND="dev-libs/atk x11-libs/libXt >=x11-libs/pango-1.22.0 virtual/freedesktop-icon-theme - pulseaudio? ( !=x11-libs/pango-1.22.0 virtual/freedesktop-icon-theme - pulseaudio? ( !"${ED}"usr/bin/${PN} #!/bin/sh unset LD_PRELOAD @@ -179,8 +184,9 @@ pkg_postinst() { use ffmpeg || ewarn "USE=-ffmpeg : HTML5 video will not render without media-video/ffmpeg installed" local HAS_AUDIO=0 - use pulseaudio && HAS_AUDIO=1 - use alsa && HAS_AUDIO=1 + if use alsa || use pulseaudio; then + HAS_AUDIO=1 + fi if [[ ${HAS_AUDIO} -eq 0 ]] ; then ewarn "USE=-pulseaudio & USE=-alsa : For audio please either set USE=pulseaudio or USE=alsa!"