From: Thomas Deutschmann <whissi@gentoo.org>
Date: Thu, 27 Sep 2018 22:34:30 +0000 (+0200)
Subject: mail-client/thunderbird: restore $S before calling eapply_user
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=01c3c1a42e3e7ff13a8fa239b8854443f2443770;p=gentoo.git

mail-client/thunderbird: restore $S before calling eapply_user

Closes: https://bugs.gentoo.org/663668
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
Package-Manager: Portage-2.3.50, Repoman-2.3.11
---

diff --git a/mail-client/thunderbird/thunderbird-60.0-r3.ebuild b/mail-client/thunderbird/thunderbird-60.0-r3.ebuild
index 98e373db77ad..f9ecfc867915 100644
--- a/mail-client/thunderbird/thunderbird-60.0-r3.ebuild
+++ b/mail-client/thunderbird/thunderbird-60.0-r3.ebuild
@@ -212,16 +212,9 @@ src_prepare() {
 		-i "${S}"/comm/mail/installer/Makefile.in || die
 
 	# Apply our Thunderbird patchset
-	pushd "${S}"/comm &>/dev/null || doe
+	pushd "${S}"/comm &>/dev/null || die
 	eapply "${WORKDIR}"/thunderbird
 
-	# simulate old directory structure just in case it helps eapply_user
-	ln -s .. mozilla || die
-	# Allow user to apply any additional patches without modifing ebuild
-	eapply_user
-	# remove the symlink
-	rm -f mozilla
-
 	# Confirm the version of lightning being grabbed for langpacks is the same
 	# as that used in thunderbird
 	local THIS_MOZ_LIGHTNING_VER=$(${PYTHON} calendar/lightning/build/makeversion.py ${PV})
@@ -233,8 +226,15 @@ src_prepare() {
 
 	popd &>/dev/null || die
 
+	# Allow user to apply any additional patches without modifing ebuild
+	eapply_user
+
+	# Autotools configure is now called old-configure.in
+	# This works because there is still a configure.in that happens to be for the
+	# shell wrapper configure script
 	eautoreconf old-configure.in
-	# Ensure we run eautoreconf in spidermonkey to regenerate configure
+
+	# Must run autoconf in js/src
 	cd "${S}"/js/src || die
 	eautoconf old-configure.in
 }