| 1 |
commit: 622a4b3334ffdf001040b665900f61b72023e57e |
| 2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Oct 3 16:28:06 2020 +0000 |
| 4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Oct 3 18:09:23 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=622a4b33 |
| 7 |
|
| 8 |
mail-client/thunderbird: synchronize with www-client/firefox |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.8, Repoman-3.0.1 |
| 11 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
| 12 |
|
| 13 |
mail-client/thunderbird/thunderbird-78.3.1.ebuild | 17 +++++++++++------ |
| 14 |
1 file changed, 11 insertions(+), 6 deletions(-) |
| 15 |
|
| 16 |
diff --git a/mail-client/thunderbird/thunderbird-78.3.1.ebuild b/mail-client/thunderbird/thunderbird-78.3.1.ebuild |
| 17 |
index 2414310d4ea..e94b6cb2500 100644 |
| 18 |
--- a/mail-client/thunderbird/thunderbird-78.3.1.ebuild |
| 19 |
+++ b/mail-client/thunderbird/thunderbird-78.3.1.ebuild |
| 20 |
@@ -26,21 +26,24 @@ if [[ -n ${MOZ_ESR} ]] ; then |
| 21 |
MOZ_PV="${MOZ_PV}esr" |
| 22 |
fi |
| 23 |
|
| 24 |
+MOZ_PN="${PN%-bin}" |
| 25 |
+MOZ_P="${MOZ_PN}-${MOZ_PV}" |
| 26 |
+ |
| 27 |
inherit autotools check-reqs desktop flag-o-matic gnome2-utils llvm \ |
| 28 |
multiprocessing pax-utils python-any-r1 toolchain-funcs \ |
| 29 |
virtualx xdg |
| 30 |
|
| 31 |
-MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${PN}/releases/${MOZ_PV}" |
| 32 |
+MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases/${MOZ_PV}" |
| 33 |
|
| 34 |
if [[ ${PV} == *_rc* ]] ; then |
| 35 |
- MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${PN}/candidates/${MOZ_PV}-candidates/build${PV##*_rc}" |
| 36 |
+ MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/candidates/${MOZ_PV}-candidates/build${PV##*_rc}" |
| 37 |
fi |
| 38 |
|
| 39 |
PATCH_URIS=( |
| 40 |
https://dev.gentoo.org/~{axs,polynomial-c,whissi}/mozilla/patchsets/${FIREFOX_PATCHSET} |
| 41 |
) |
| 42 |
|
| 43 |
-SRC_URI="${MOZ_SRC_BASE_URI}/source/${PN}-${MOZ_PV}.source.tar.xz |
| 44 |
+SRC_URI="${MOZ_SRC_BASE_URI}/source/${MOZ_P}.source.tar.xz |
| 45 |
${PATCH_URIS[@]}" |
| 46 |
|
| 47 |
DESCRIPTION="Thunderbird Mail Client" |
| 48 |
@@ -234,7 +237,7 @@ mozilla_set_globals() { |
| 49 |
fi |
| 50 |
|
| 51 |
SRC_URI+=" l10n_${xflag/[_@]/-}? (" |
| 52 |
- SRC_URI+=" ${MOZ_SRC_BASE_URI}/linux-x86_64/xpi/${lang}.xpi -> ${PN}-${MOZ_PV}-${lang}.xpi" |
| 53 |
+ SRC_URI+=" ${MOZ_SRC_BASE_URI}/linux-x86_64/xpi/${lang}.xpi -> ${MOZ_P}-${lang}.xpi" |
| 54 |
SRC_URI+=" )" |
| 55 |
IUSE+=" l10n_${xflag/[_@]/-}" |
| 56 |
done |
| 57 |
@@ -867,7 +870,7 @@ src_install() { |
| 58 |
local desktop_file="${FILESDIR}/icon/${PN}-r2.desktop" |
| 59 |
local display_protocols="auto X11" |
| 60 |
local icon="${PN}" |
| 61 |
- local name="Mozilla ${PN^}" |
| 62 |
+ local name="Mozilla ${MOZ_PN^}" |
| 63 |
local use_wayland="false" |
| 64 |
|
| 65 |
if use wayland ; then |
| 66 |
@@ -917,7 +920,7 @@ src_install() { |
| 67 |
done |
| 68 |
|
| 69 |
# Install generic wrapper script |
| 70 |
- rm "${ED}/usr/bin/${PN}" || die |
| 71 |
+ [[ -f "${ED}/usr/bin/${PN}" ]] && rm "${ED}/usr/bin/${PN}" |
| 72 |
newbin "${FILESDIR}/${PN}.sh" ${PN} |
| 73 |
|
| 74 |
# Update wrapper |
| 75 |
@@ -931,6 +934,8 @@ src_install() { |
| 76 |
|
| 77 |
sed -i \ |
| 78 |
-e "s:@PREFIX@:${EPREFIX}/usr:" \ |
| 79 |
+ -e "s:@MOZ_FIVE_HOME@:${MOZILLA_FIVE_HOME}:" \ |
| 80 |
+ -e "s:@APULSELIB_DIR@:${apulselib}:" \ |
| 81 |
-e "s:@DEFAULT_WAYLAND@:${use_wayland}:" \ |
| 82 |
"${wrapper}" \ |
| 83 |
|| die |
Archives