[gentoo-commits] proj/mozilla:crossdev commit in: mail-client/thunderbird/

[Ian Stakenvicius]

commit:     ba054b24077a01604ef3b070f1551eb092607c7f
Author:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 23 21:48:37 2015 +0000
Commit:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Wed Dec 23 21:48:37 2015 +0000
URL:        https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=ba054b24

added firefox-38.5.0 for crossdev testing

 mail-client/thunderbird/thunderbird-38.5.0.ebuild | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/mail-client/thunderbird/thunderbird-38.5.0.ebuild 
b/mail-client/thunderbird/thunderbird-38.5.0.ebuild
index a3fbfee..45f8567 100644
--- a/mail-client/thunderbird/thunderbird-38.5.0.ebuild
+++ b/mail-client/thunderbird/thunderbird-38.5.0.ebuild
@@ -140,6 +140,7 @@ src_prepare() {
        EPATCH_EXCLUDE="8010_bug114311-freetype26.patch
                        8011_bug1194520-freetype261_until_moz43.patch" \
        epatch "${WORKDIR}/firefox"
+       epatch "${FILESDIR}"/nss.m4.pkg-config.patch
        popd &>/dev/null || die
 
        # Ensure that are plugins dir is enabled as default
@@ -185,7 +186,6 @@ src_prepare() {
 }
 
 src_configure() {
-       declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
        MEXTENSIONS="default"
 
        ####################################
@@ -197,9 +197,6 @@ src_configure() {
        mozconfig_init
        mozconfig_config
 
-       # We want rpath support to prevent unneeded hacks on different libc 
variants
-       append-ldflags -Wl,-rpath="${MOZILLA_FIVE_HOME}"
-
        # It doesn't compile on alpha without this LDFLAGS
        use alpha && append-ldflags "-Wl,--no-relax"
 
@@ -211,7 +208,6 @@ src_configure() {
        mozconfig_annotate '' --enable-calendar
 
        # Other tb-specific settings
-       mozconfig_annotate '' 
--with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
        mozconfig_annotate '' --with-user-appdir=.thunderbird
 
        mozconfig_use_enable ldap
@@ -252,7 +248,6 @@ src_configure() {
 src_compile() {
        mkdir -p "${BUILD_OBJ_DIR}" && cd "${BUILD_OBJ_DIR}" || die
 
-       CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
        MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \
        emake -f "${S}"/client.mk
 
@@ -267,7 +262,6 @@ src_compile() {
 }
 
 src_install() {
-       declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
        DICTPATH="\"${EPREFIX}/usr/share/myspell\""
 
        declare emid