Gentoo Archives: gentoo-commits

From: Ian Stakenvicius <axs@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/mozilla:crossdev commit in: mail-client/thunderbird/
Date: Wed, 23 Dec 2015 21:49:10
Message-Id: 1450907330.aa5d78a22b185c12fe445b7994c3e9fc182ae7f8.axs@gentoo
1 commit: aa5d78a22b185c12fe445b7994c3e9fc182ae7f8
2 Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
3 AuthorDate: Wed Dec 23 21:48:37 2015 +0000
4 Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
5 CommitDate: Wed Dec 23 21:48:50 2015 +0000
6 URL: https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=aa5d78a2
7
8 added thunderbird-38.5.0 for crossdev testing
9
10 mail-client/thunderbird/thunderbird-38.5.0.ebuild | 8 +-------
11 1 file changed, 1 insertion(+), 7 deletions(-)
12
13 diff --git a/mail-client/thunderbird/thunderbird-38.5.0.ebuild b/mail-client/thunderbird/thunderbird-38.5.0.ebuild
14 index a3fbfee..45f8567 100644
15 --- a/mail-client/thunderbird/thunderbird-38.5.0.ebuild
16 +++ b/mail-client/thunderbird/thunderbird-38.5.0.ebuild
17 @@ -140,6 +140,7 @@ src_prepare() {
18 EPATCH_EXCLUDE="8010_bug114311-freetype26.patch
19 8011_bug1194520-freetype261_until_moz43.patch" \
20 epatch "${WORKDIR}/firefox"
21 + epatch "${FILESDIR}"/nss.m4.pkg-config.patch
22 popd &>/dev/null || die
23
24 # Ensure that are plugins dir is enabled as default
25 @@ -185,7 +186,6 @@ src_prepare() {
26 }
27
28 src_configure() {
29 - declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
30 MEXTENSIONS="default"
31
32 ####################################
33 @@ -197,9 +197,6 @@ src_configure() {
34 mozconfig_init
35 mozconfig_config
36
37 - # We want rpath support to prevent unneeded hacks on different libc variants
38 - append-ldflags -Wl,-rpath="${MOZILLA_FIVE_HOME}"
39 -
40 # It doesn't compile on alpha without this LDFLAGS
41 use alpha && append-ldflags "-Wl,--no-relax"
42
43 @@ -211,7 +208,6 @@ src_configure() {
44 mozconfig_annotate '' --enable-calendar
45
46 # Other tb-specific settings
47 - mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
48 mozconfig_annotate '' --with-user-appdir=.thunderbird
49
50 mozconfig_use_enable ldap
51 @@ -252,7 +248,6 @@ src_configure() {
52 src_compile() {
53 mkdir -p "${BUILD_OBJ_DIR}" && cd "${BUILD_OBJ_DIR}" || die
54
55 - CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
56 MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \
57 emake -f "${S}"/client.mk
58
59 @@ -267,7 +262,6 @@ src_compile() {
60 }
61
62 src_install() {
63 - declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
64 DICTPATH="\"${EPREFIX}/usr/share/myspell\""
65
66 declare emid