From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1211958-garchives=archives.gentoo.org@lists.gentoo.org>
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 E516913835A
	for <garchives@archives.gentoo.org>; 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 37AB0E0940;
	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 2081FE0940
	for <gentoo-commits@lists.gentoo.org>; Mon,  5 Oct 2020 16:47:36 +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 39398340B35
	for <gentoo-commits@lists.gentoo.org>; Mon,  5 Oct 2020 16:47:34 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 37E3C334
	for <gentoo-commits@lists.gentoo.org>; Mon,  5 Oct 2020 16:47:32 +0000 (UTC)
From: "Thomas Deutschmann" <whissi@gentoo.org>
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" <whissi@gentoo.org>
Message-ID: <1601916438.7169cf5d86b52b27e382a464d09fe41b0cd1cd03.whissi@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: mail-client/thunderbird-bin/
X-VCS-Repository: repo/gentoo
X-VCS-Files: mail-client/thunderbird-bin/thunderbird-bin-78.3.1-r1.ebuild mail-client/thunderbird-bin/thunderbird-bin-78.3.1-r2.ebuild
X-VCS-Directories: mail-client/thunderbird-bin/
X-VCS-Committer: whissi
X-VCS-Committer-Name: Thomas Deutschmann
X-VCS-Revision: 7169cf5d86b52b27e382a464d09fe41b0cd1cd03
X-VCS-Branch: master
Date: Mon,  5 Oct 2020 16:47:32 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: d2523484-ff26-4b64-bb03-4d41fce39a62
X-Archives-Hash: 0171c5957109b0349b799c9d78902308

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