commit: 0fde739188e1abd6c38541fc2018e5babe5d8b4c
Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 20 20:26:00 2016 +0000
Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Wed Apr 20 20:26:00 2016 +0000
URL: https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=0fde7391
sync thunderbird-45.0 with the gentoo repo (EAPI6, enigmail-1.9.1)
mail-client/thunderbird/Manifest | 2 +-
mail-client/thunderbird/thunderbird-45.0.ebuild | 32 +++++++++----------------
2 files changed, 12 insertions(+), 22 deletions(-)
diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index 7cf2bd8..cfe2d99 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -1,4 +1,4 @@
-DIST enigmail-1.8.2.tar.gz 1604159 SHA256
1d2700799bc52aaa8e8c9f7a0f5111281ff9fbdffc093cdff070657d574eb2a6 SHA512
51eece988f466aeb4a343719a86dc7d95ec41dfc3ec7e3d8d2f360528675c605f8f2154f10aeea6ef82ed87c784f1d13bfc978e052a9ede0072b5137f6294b11
WHIRLPOOL
e12a703899e0e4c98adc58b5f4bf1f74e24a2cf09c1a706a6edca6aca06140041b293f23e6e5b05c507177b4148533ebc3431fb75592aae07d791a899ba2c45c
+DIST enigmail-1.9.1.tar.gz 1736876 SHA256
0393119725fa5931d9888a2a1c9796d440ee7975ca3d005eb63142768b10f993 SHA512
5417d7744ff5b8299d9799059f62013e546fb74206782169e5ce6baa0950d96d1c8996c99ec902ca73b241fd1268966e0a7ad30c032a1706a0efbf06fefc311c
WHIRLPOOL
80cff68461edc743851de5a83cd04105f6689eb1289f46b72334a96b091dc430399a91b2ab004a39bd7cb04433ab0471dd07b44d39fc2eb3869487b07841fc5a
DIST firefox-45.0-patches-03.tar.xz 15980 SHA256
5bc13bb36d3e907dcffe4d57c7ace78478859bfdbe84a6b99fa76502592e0291 SHA512
6384773ea4944db15dc131a05cf61bb96505899fb5077d54c5e7227f07423656627c81321a3c207d7a3b4ad0830dd9a53d66aca832dc1ee177964516489aab30
WHIRLPOOL
c3626f501434c3dc9ec4a7ba3d02e50ff8b9d011005fb334d5dedf5177d6af778e541cb7cb4ebe7d281563434bace214008c54299809e823dd83c5a5de535247
DIST gdata-provider-2.6.tar.xz 83884 SHA256
b872dde3eafccec88c5548833530b88c85eb044e3a222f6f198d924829512f0d SHA512
b1b954babd775e183a36e913013b1d056778b12d50dd089c329aa322cc9820ad563e7e02e5eca7b1ae52c5ebed2cfdc52d11bdb973dc3ebe41cffd0c585d5c7b
WHIRLPOOL
eb6197ab474e8852eefabf608b0b66d12e6dea3bfe5c94f18225211d286293dc2e52ad85c7e94a8688946de33c174c72d001b5f591b47a616b07d6c475a8457a
DIST lightning-4.7.tar.xz 1929596 SHA256
6368d6438131c1b64a4089b073bd46aa45c1baa1dc9d1e65fb2146b2491ae75e SHA512
537f586da73bc0bac2851fe2930f84fe7406170711290a37cd4076197a3580cd95619e82be3428e7330dde5cb93c89fcd7ed03367b9921a4c6c678c8b6745113
WHIRLPOOL
68b39e241bcc820a3c5febf15f15ab2ac680004154b18df786a77f61611573b71b8726f3054f97ad95aff20969e1d59830c4c13966ed6d88aa6b1d8dc9de7a7b
diff --git a/mail-client/thunderbird/thunderbird-45.0.ebuild
b/mail-client/thunderbird/thunderbird-45.0.ebuild
index b683b86..dc5cdc1 100644
--- a/mail-client/thunderbird/thunderbird-45.0.ebuild
+++ b/mail-client/thunderbird/thunderbird-45.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
WANT_AUTOCONF="2.1"
MOZ_ESR=""
MOZ_LIGHTNING_VER="4.7"
@@ -23,18 +23,17 @@ fi
MOZ_P="${PN}-${MOZ_PV}"
# Enigmail version
-EMVER="1.8.2"
+EMVER="1.9.1"
# Patches
PATCH="thunderbird-38.0-patches-0.1"
PATCHFF="firefox-45.0-patches-03"
-MOZ_HTTP_URI="http://archive.mozilla.org/pub/${PN}/releases";
+MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases";
-MOZ_FORCE_UPSTREAM_L10N=1
MOZCONFIG_OPTIONAL_GTK3=1
MOZCONFIG_OPTIONAL_JIT="enabled"
-inherit flag-o-matic toolchain-funcs mozconfig-v6.44 makeedit multilib
autotools pax-utils check-reqs nsplugins mozlinguas
+inherit flag-o-matic toolchain-funcs mozconfig-v6.45 makeedit autotools
pax-utils check-reqs nsplugins mozlinguas
DESCRIPTION="Thunderbird Mail Client"
HOMEPAGE="http://www.mozilla.com/en-US/thunderbird/";
@@ -45,8 +44,6 @@ LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
IUSE="bindist crypt hardened ldap lightning +minimal mozdom selinux"
RESTRICT="!bindist? ( bindist )"
-# URI for upstream lightning package (when it is available)
-#${MOZ_HTTP_URI/${PN}/calendar/lightning}/${MOZ_LIGHTNING_VER}/linux/lightning.xpi
-> lightning-${MOZ_LIGHTNING_VER}.xpi
PATCH_URIS=(
https://dev.gentoo.org/~{anarchy,axs,polynomial-c}/mozilla/patchsets/{${PATCH},${PATCHFF}}.tar.xz
)
SRC_URI="${SRC_URI}
${MOZ_HTTP_URI}/${MOZ_PV}/source/${MOZ_P}.source.tar.xz
@@ -58,8 +55,8 @@ SRC_URI="${SRC_URI}
ASM_DEPEND=">=dev-lang/yasm-1.1"
CDEPEND="
- >=dev-libs/nss-3.21
- >=dev-libs/nspr-4.11
+ >=dev-libs/nss-3.21.1
+ >=dev-libs/nspr-4.12
!x11-plugins/enigmail
crypt? ( || (
( >=app-crypt/gnupg-2.0
@@ -127,21 +124,14 @@ src_unpack() {
src_prepare() {
# Apply our Thunderbird patchset
- EPATCH_SUFFIX="patch" \
- EPATCH_FORCE="yes" \
- EPATCH_EXCLUDE="2001_ldap_respect_cflags.patch" \
- epatch "${WORKDIR}/thunderbird"
+ rm -f "${WORKDIR}"/thunderbird/2001_ldap_respect_cflags.patch
+ eapply "${WORKDIR}/thunderbird"
# Apply our patchset from firefox to thunderbird as well
pushd "${S}"/mozilla &>/dev/null || die
- EPATCH_SUFFIX="patch" \
- EPATCH_FORCE="yes" \
- epatch "${WORKDIR}/firefox"
+ eapply "${WORKDIR}/firefox"
popd &>/dev/null || die
-# EPATCH_EXCLUDE="8010_bug114311-freetype26.patch
-# 8011_bug1194520-freetype261_until_moz43.patch" \
-
# Ensure that are plugins dir is enabled as default
sed -i -e "s:/usr/lib/mozilla/plugins:/usr/lib/nsbrowser/plugins:" \
"${S}"/mozilla/xpcom/io/nsAppFileLocationProvider.cpp || die
"sed failed to replace plugin path for 32bit!"
@@ -165,7 +155,7 @@ src_prepare() {
done
# Allow user to apply any additional patches without modifing ebuild
- epatch_user
+ eapply_user
# Confirm the version of lightning being grabbed for langpacks is the
same
# as that used in thunderbird
