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 B29A2138359 for ; Mon, 5 Oct 2020 16:47:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0D9E2E091C; Mon, 5 Oct 2020 16:47:36 +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 EB85AE091C for ; Mon, 5 Oct 2020 16:47:35 +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 EF96D340AB2 for ; Mon, 5 Oct 2020 16:47:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5294A38E for ; Mon, 5 Oct 2020 16:47:32 +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: <1601916439.cc0c2ad02c35cda18d8cb38f9a05926e134f49ee.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-78.3.1-r1.ebuild www-client/firefox-bin/firefox-bin-78.3.1.ebuild www-client/firefox-bin/firefox-bin-81.0.1-r1.ebuild www-client/firefox-bin/firefox-bin-81.0.1.ebuild X-VCS-Directories: www-client/firefox-bin/ X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: cc0c2ad02c35cda18d8cb38f9a05926e134f49ee X-VCS-Branch: master Date: Mon, 5 Oct 2020 16:47:32 +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: afdd22ba-a6fe-4f0f-977f-2a5ba2f6c9dd X-Archives-Hash: e8f1fbb4574a2f220d3bd78183df73f7 commit: cc0c2ad02c35cda18d8cb38f9a05926e134f49ee Author: Thomas Deutschmann gentoo org> AuthorDate: Mon Oct 5 16:47:04 2020 +0000 Commit: Thomas Deutschmann gentoo org> CommitDate: Mon Oct 5 16:47:19 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc0c2ad0 www-client/firefox-bin: fix USE=alsa Fixes: 1fcbfb9 ("www-client/firefox-bin: drop BDEPEND on dev-util/patchelf") Bug: https://bugs.gentoo.org/746500 Closes: https://bugs.gentoo.org/746626 Package-Manager: Portage-3.0.8, Repoman-3.0.1 Signed-off-by: Thomas Deutschmann gentoo.org> ...efox-bin-78.3.1.ebuild => firefox-bin-78.3.1-r1.ebuild} | 14 +++++++++++++- ...efox-bin-81.0.1.ebuild => firefox-bin-81.0.1-r1.ebuild} | 14 +++++++++++++- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/www-client/firefox-bin/firefox-bin-78.3.1.ebuild b/www-client/firefox-bin/firefox-bin-78.3.1-r1.ebuild similarity index 97% rename from www-client/firefox-bin/firefox-bin-78.3.1.ebuild rename to www-client/firefox-bin/firefox-bin-78.3.1-r1.ebuild index 7c46bdb0310..d95da6f4e1a 100644 --- a/www-client/firefox-bin/firefox-bin-78.3.1.ebuild +++ b/www-client/firefox-bin/firefox-bin-78.3.1-r1.ebuild @@ -35,7 +35,12 @@ IUSE="+alsa +ffmpeg +gmp-autoupdate +pulseaudio selinux wayland" RESTRICT="strip" -BDEPEND="app-arch/unzip" +BDEPEND="app-arch/unzip + alsa? ( + !pulseaudio? ( + dev-util/patchelf + ) + )" CDEPEND="alsa? ( !pulseaudio? ( @@ -185,6 +190,13 @@ src_install() { "${MOZILLA_FIVE_HOME}"/firefox-bin \ "${MOZILLA_FIVE_HOME}"/plugin-container + # Patch alsa support + local apulselib= + if use alsa && ! use pulseaudio ; then + apulselib="${EPREFIX}/usr/$(get_libdir)/apulse" + patchelf --set-rpath "${apulselib}" "${ED}${MOZILLA_FIVE_HOME}/libxul.so" || die + fi + # Install policy (currently only used to disable application updates) insinto "${MOZILLA_FIVE_HOME}/distribution" newins "${FILESDIR}"/disable-auto-update.policy.json policies.json diff --git a/www-client/firefox-bin/firefox-bin-81.0.1.ebuild b/www-client/firefox-bin/firefox-bin-81.0.1-r1.ebuild similarity index 97% rename from www-client/firefox-bin/firefox-bin-81.0.1.ebuild rename to www-client/firefox-bin/firefox-bin-81.0.1-r1.ebuild index 78c15285fb3..6f6355a74f0 100644 --- a/www-client/firefox-bin/firefox-bin-81.0.1.ebuild +++ b/www-client/firefox-bin/firefox-bin-81.0.1-r1.ebuild @@ -35,7 +35,12 @@ IUSE="+alsa +ffmpeg +gmp-autoupdate +pulseaudio selinux wayland" RESTRICT="strip" -BDEPEND="app-arch/unzip" +BDEPEND="app-arch/unzip + alsa? ( + !pulseaudio? ( + dev-util/patchelf + ) + )" CDEPEND="alsa? ( !pulseaudio? ( @@ -185,6 +190,13 @@ src_install() { "${MOZILLA_FIVE_HOME}"/firefox-bin \ "${MOZILLA_FIVE_HOME}"/plugin-container + # Patch alsa support + local apulselib= + if use alsa && ! use pulseaudio ; then + apulselib="${EPREFIX}/usr/$(get_libdir)/apulse" + patchelf --set-rpath "${apulselib}" "${ED}${MOZILLA_FIVE_HOME}/libxul.so" || die + fi + # Install policy (currently only used to disable application updates) insinto "${MOZILLA_FIVE_HOME}/distribution" newins "${FILESDIR}"/disable-auto-update.policy.json policies.json