[gentoo-commits] repo/gentoo:master commit in: mail-client/thunderbird-bin/

[Thomas Deutschmann]

commit:     7169cf5d86b52b27e382a464d09fe41b0cd1cd03
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Oct  5 16:41:37 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Oct  5 16:47:18 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7169cf5d

mail-client/thunderbird-bin: fix USE=alsa

Fixes: ca8a6af ("mail-client/thunderbird-bin: drop BDEPEND on 
dev-util/patchelf")
Bug: https://bugs.gentoo.org/746500
Bug: https://bugs.gentoo.org/746626
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 ...n-78.3.1-r1.ebuild => thunderbird-bin-78.3.1-r2.ebuild} | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/mail-client/thunderbird-bin/thunderbird-bin-78.3.1-r1.ebuild 
b/mail-client/thunderbird-bin/thunderbird-bin-78.3.1-r2.ebuild
similarity index 97%
rename from mail-client/thunderbird-bin/thunderbird-bin-78.3.1-r1.ebuild
rename to mail-client/thunderbird-bin/thunderbird-bin-78.3.1-r2.ebuild
index 31892aaca85..315fc2ad9d8 100644
--- a/mail-client/thunderbird-bin/thunderbird-bin-78.3.1-r1.ebuild
+++ b/mail-client/thunderbird-bin/thunderbird-bin-78.3.1-r2.ebuild
@@ -35,7 +35,12 @@ IUSE="+alsa +ffmpeg +pulseaudio selinux startup-notification 
wayland"
 
 RESTRICT="strip"
 
-BDEPEND="app-arch/unzip"
+BDEPEND="app-arch/unzip
+       alsa? (
+               !pulseaudio? (
+                       dev-util/patchelf
+               )
+       )"
 
 CDEPEND="alsa? (
                !pulseaudio? (
@@ -176,6 +181,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