| 1 |
commit: 01c3c1a42e3e7ff13a8fa239b8854443f2443770 |
| 2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Sep 27 22:34:30 2018 +0000 |
| 4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Sep 27 22:34:48 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01c3c1a4 |
| 7 |
|
| 8 |
mail-client/thunderbird: restore $S before calling eapply_user |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/663668 |
| 11 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
| 12 |
Package-Manager: Portage-2.3.50, Repoman-2.3.11 |
| 13 |
|
| 14 |
mail-client/thunderbird/thunderbird-60.0-r3.ebuild | 18 +++++++++--------- |
| 15 |
1 file changed, 9 insertions(+), 9 deletions(-) |
| 16 |
|
| 17 |
diff --git a/mail-client/thunderbird/thunderbird-60.0-r3.ebuild b/mail-client/thunderbird/thunderbird-60.0-r3.ebuild |
| 18 |
index 98e373db77a..f9ecfc86791 100644 |
| 19 |
--- a/mail-client/thunderbird/thunderbird-60.0-r3.ebuild |
| 20 |
+++ b/mail-client/thunderbird/thunderbird-60.0-r3.ebuild |
| 21 |
@@ -212,16 +212,9 @@ src_prepare() { |
| 22 |
-i "${S}"/comm/mail/installer/Makefile.in || die |
| 23 |
|
| 24 |
# Apply our Thunderbird patchset |
| 25 |
- pushd "${S}"/comm &>/dev/null || doe |
| 26 |
+ pushd "${S}"/comm &>/dev/null || die |
| 27 |
eapply "${WORKDIR}"/thunderbird |
| 28 |
|
| 29 |
- # simulate old directory structure just in case it helps eapply_user |
| 30 |
- ln -s .. mozilla || die |
| 31 |
- # Allow user to apply any additional patches without modifing ebuild |
| 32 |
- eapply_user |
| 33 |
- # remove the symlink |
| 34 |
- rm -f mozilla |
| 35 |
- |
| 36 |
# Confirm the version of lightning being grabbed for langpacks is the same |
| 37 |
# as that used in thunderbird |
| 38 |
local THIS_MOZ_LIGHTNING_VER=$(${PYTHON} calendar/lightning/build/makeversion.py ${PV}) |
| 39 |
@@ -233,8 +226,15 @@ src_prepare() { |
| 40 |
|
| 41 |
popd &>/dev/null || die |
| 42 |
|
| 43 |
+ # Allow user to apply any additional patches without modifing ebuild |
| 44 |
+ eapply_user |
| 45 |
+ |
| 46 |
+ # Autotools configure is now called old-configure.in |
| 47 |
+ # This works because there is still a configure.in that happens to be for the |
| 48 |
+ # shell wrapper configure script |
| 49 |
eautoreconf old-configure.in |
| 50 |
- # Ensure we run eautoreconf in spidermonkey to regenerate configure |
| 51 |
+ |
| 52 |
+ # Must run autoconf in js/src |
| 53 |
cd "${S}"/js/src || die |
| 54 |
eautoconf old-configure.in |
| 55 |
} |
Archives