Gentoo Archives: gentoo-commits

From: Thomas Deutschmann <whissi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: mail-client/thunderbird-bin/
Date: Mon, 05 Oct 2020 16:47:36
Message-Id: 1601916438.7169cf5d86b52b27e382a464d09fe41b0cd1cd03.whissi@gentoo
1 commit: 7169cf5d86b52b27e382a464d09fe41b0cd1cd03
2 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
3 AuthorDate: Mon Oct 5 16:41:37 2020 +0000
4 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
5 CommitDate: Mon Oct 5 16:47:18 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7169cf5d
7
8 mail-client/thunderbird-bin: fix USE=alsa
9
10 Fixes: ca8a6af ("mail-client/thunderbird-bin: drop BDEPEND on dev-util/patchelf")
11 Bug: https://bugs.gentoo.org/746500
12 Bug: https://bugs.gentoo.org/746626
13 Package-Manager: Portage-3.0.8, Repoman-3.0.1
14 Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
15
16 ...n-78.3.1-r1.ebuild => thunderbird-bin-78.3.1-r2.ebuild} | 14 +++++++++++++-
17 1 file changed, 13 insertions(+), 1 deletion(-)
18
19 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
20 similarity index 97%
21 rename from mail-client/thunderbird-bin/thunderbird-bin-78.3.1-r1.ebuild
22 rename to mail-client/thunderbird-bin/thunderbird-bin-78.3.1-r2.ebuild
23 index 31892aaca85..315fc2ad9d8 100644
24 --- a/mail-client/thunderbird-bin/thunderbird-bin-78.3.1-r1.ebuild
25 +++ b/mail-client/thunderbird-bin/thunderbird-bin-78.3.1-r2.ebuild
26 @@ -35,7 +35,12 @@ IUSE="+alsa +ffmpeg +pulseaudio selinux startup-notification wayland"
27
28 RESTRICT="strip"
29
30 -BDEPEND="app-arch/unzip"
31 +BDEPEND="app-arch/unzip
32 + alsa? (
33 + !pulseaudio? (
34 + dev-util/patchelf
35 + )
36 + )"
37
38 CDEPEND="alsa? (
39 !pulseaudio? (
40 @@ -176,6 +181,13 @@ src_install() {
41 "${MOZILLA_FIVE_HOME}"/firefox-bin \
42 "${MOZILLA_FIVE_HOME}"/plugin-container
43
44 + # Patch alsa support
45 + local apulselib=
46 + if use alsa && ! use pulseaudio ; then
47 + apulselib="${EPREFIX}/usr/$(get_libdir)/apulse"
48 + patchelf --set-rpath "${apulselib}" "${ED}${MOZILLA_FIVE_HOME}/libxul.so" || die
49 + fi
50 +
51 # Install policy (currently only used to disable application updates)
52 insinto "${MOZILLA_FIVE_HOME}/distribution"
53 newins "${FILESDIR}"/disable-auto-update.policy.json policies.json