From mboxrd@z Thu Jan 1 00:00:00 1970
Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org)
by finch.gentoo.org with esmtp (Exim 4.60)
(envelope-from <gentoo-commits+bounces-426151-garchives=archives.gentoo.org@lists.gentoo.org>)
id 1RwgQ0-0002nv-EJ
for garchives@archives.gentoo.org; Sun, 12 Feb 2012 20:53:08 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 87D42E0823;
Sun, 12 Feb 2012 20:53:00 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
by pigeon.gentoo.org (Postfix) with ESMTP id 3FE27E0823
for <gentoo-commits@lists.gentoo.org>; Sun, 12 Feb 2012 20:53:00 +0000 (UTC)
Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163])
(using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 73E741B400A
for <gentoo-commits@lists.gentoo.org>; Sun, 12 Feb 2012 20:52:59 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by hornbill.gentoo.org (Postfix) with ESMTP id 42B2BE5400
for <gentoo-commits@lists.gentoo.org>; Sun, 12 Feb 2012 20:52:57 +0000 (UTC)
From: "Jory Pratt" <anarchy@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Jory Pratt" <anarchy@gentoo.org>
Message-ID: <f1f05c87983a150176a8f83205d4009d5d2aa4eb.anarchy@gentoo>
Subject: [gentoo-commits] proj/mozilla:master commit in: mail-client/thunderbird/
X-VCS-Repository: proj/mozilla
X-VCS-Files: mail-client/thunderbird/Manifest mail-client/thunderbird/thunderbird-10.0.ebuild
X-VCS-Directories: mail-client/thunderbird/
X-VCS-Committer: anarchy
X-VCS-Committer-Name: Jory Pratt
X-VCS-Revision: f1f05c87983a150176a8f83205d4009d5d2aa4eb
Date: Sun, 12 Feb 2012 20:52:57 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt: fd5bd327-ce30-460a-8600-4f939473cfdb
X-Archives-Hash: adcf81520bf042dfea8cdea81086e22a
commit: f1f05c87983a150176a8f83205d4009d5d2aa4eb
Author: Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 12 20:51:11 2012 +0000
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Sun Feb 12 20:51:11 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/mozilla.git;a=
=3Dcommit;h=3Df1f05c87
Make use of the obj_dir instead of outdated build system.
---
mail-client/thunderbird/Manifest | 4 +-
mail-client/thunderbird/thunderbird-10.0.ebuild | 51 ++++++++++++-----=
-----
2 files changed, 30 insertions(+), 25 deletions(-)
diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/M=
anifest
index 6461b72..cad50e0 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -37,6 +37,7 @@ DIST thunderbird-10.0-nb-NO.xpi 407725 RMD160 9f70537f3=
ef78127ae0d33a5fbc46c8f0a
DIST thunderbird-10.0-nl.xpi 407980 RMD160 eee248065d890e07a4df432aca6cd=
5dceeedd0c3 SHA1 a65bc7a3ee95db7297813a45224478aa8ea11e48 SHA256 174da7a5=
266136f760146bd174a3b80a77391ceaffd58bf535a5f889c2f64203
DIST thunderbird-10.0-nn-NO.xpi 409453 RMD160 0793d0251ccb9a03ec4334fe6a=
867372e4bb6c22 SHA1 aca7836e7803cf9223effe33f472bda13f5c2a77 SHA256 5f811=
75b9efb89d407f2e3bb2d38979ed27dd4a24204c94917fe42477cfc8396
DIST thunderbird-10.0-pa-IN.xpi 450325 RMD160 4543b2fc814a5e141452e9cf61=
bd34a84151ac56 SHA1 5e0a5e652f42407023a6ebf5d11fee6596179cac SHA256 17560=
aaebb46159bab621a7dcc7ce89badc2c165179b1108355cf0ab9b60ae23
+DIST thunderbird-10.0-patches-0.1.tar.xz 860 RMD160 88bec4475cf92181abb0=
a2cccacb3561b0d6d21c SHA1 9a0a69838eb9c7a65497d525b587456ee768c4df SHA256=
22dd2e4c1787fece81a8ab4d596b890027c2d390b4021ddc135349214f33932e
DIST thunderbird-10.0-pl.xpi 393573 RMD160 142a0ef77141bc45f6531479a6560=
08a78ca560e SHA1 0fcb52a2469d5c2eba2e76cf995e9bc69d8597b2 SHA256 3b48e8d7=
754432d62fbb78431f2942d4d1e6e7526408b85189ad2b4fd9a351b2
DIST thunderbird-10.0-pt-BR.xpi 417225 RMD160 83530dcd964749958ee1f8c3b6=
6dcbdb9c09eaf3 SHA1 7276d2a9ec975967d256398f2729fd68aa6de410 SHA256 b830c=
3d90e5ebe66f4406980694d92aba2d4baf55321288606db08fee04d5815
DIST thunderbird-10.0-pt-PT.xpi 414260 RMD160 3f6116db38a427a3c01c6dc085=
6e04e80baca034 SHA1 c69178969df51df557bcbcd74c83fb369b5aea9a SHA256 aa68c=
3740b948b7e7ac63e5906005e492db97e064725f5a35a9b4ebc35a61f19
@@ -56,5 +57,4 @@ DIST thunderbird-10.0-vi.xpi 435881 RMD160 275174e2180d=
c3baf190f4ee3830a39bb8fc7
DIST thunderbird-10.0-zh-CN.xpi 431229 RMD160 ff491c003702b77587c9c29403=
219ad47c826a1f SHA1 738aa01aa27cbca24393663d3f1d450ec53ccfbd SHA256 5df54=
bf526d8fea967bd6996386dca73309fc880fc5d049c60c5ae2911fe80a5
DIST thunderbird-10.0-zh-TW.xpi 431822 RMD160 bded27fe855ad1e4cf1d12486e=
1f7d51f8f1f7bd SHA1 df1171db0cd7265071eba70983ad95fdb18cd375 SHA256 fa901=
1c615d20cf8337e9fbd0dbfd5ee668cbf76d8f797d353b3c5cde8d9d032
DIST thunderbird-10.0.source.tar.bz2 97700962 RMD160 cd3acaf16e38fe4a1f0=
4badedb50db1cdb51c29e SHA1 4765446295a20cc3b4d73a7bc244d19011136581 SHA25=
6 ea5d3df1227f0c344224eeaf4b24c12391425b9746515e784875edd6863ebcfd
-DIST thunderbird-9.0-patches-0.1.tar.xz 696 RMD160 986ad69f21f6eddf46b73=
258b0a2aa8eb85fb9c4 SHA1 62dd6e724e2e3a1b76eaed3d165e2e9f47385f8a SHA256 =
64028e8ca37e1259ed196dfe6e8a87cd08153047f80639ca36cfd276eaa9aaea
-EBUILD thunderbird-10.0.ebuild 8544 RMD160 3d0f8553edf05dd44d5cd0c5c56dc=
8658da6e175 SHA1 3c2b548a7ca8cae21738c2ba8c4a50312a047231 SHA256 14278d0e=
8e9a741b4e2fdd44933783aaf0f87580b3ebeb00045aeaf21a8ea2b0
+EBUILD thunderbird-10.0.ebuild 8788 RMD160 1921964b91c3bbbf8d28e778b5d82=
dc37f3e0845 SHA1 e45dff88a18c59c7ba381033d44b56ca1d079aa9 SHA256 cf523a62=
9073e0e6c584d2942b86b755adeb232a8ea8af190ff99fb5f6f5c386
diff --git a/mail-client/thunderbird/thunderbird-10.0.ebuild b/mail-clien=
t/thunderbird/thunderbird-10.0.ebuild
index cbe1f48..1c342b4 100644
--- a/mail-client/thunderbird/thunderbird-10.0.ebuild
+++ b/mail-client/thunderbird/thunderbird-10.0.ebuild
@@ -34,8 +34,8 @@ SLOT=3D"0"
LICENSE=3D"|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
IUSE=3D"bindist gconf +crashreporter +crypt +ipc +lightning +minimal moz=
dom +webm"
=20
-PATCH=3D"thunderbird-9.0-patches-0.1"
-PATCHFF=3D"firefox-${PV}-patches-0.5"
+PATCH=3D"thunderbird-10.0-patches-0.1"
+PATCHFF=3D"firefox-10.0-patches-0.5"
=20
SRC_URI=3D"${SRC_URI}
${MOZ_FTP_URI}/${MY_TEN_PV}/source/${MOZ_P}.source.tar.bz2
@@ -117,9 +117,6 @@ src_prepare() {
=20
if use crypt ; then
mv "${WORKDIR}"/enigmail "${S}"/mailnews/extensions/enigmail
- cd "${S}"/mailnews/extensions/enigmail || die
- ./makemake -r 2&> /dev/null
- sed -i -e 's:@srcdir@:${S}/mailnews/extensions/enigmail:' Makefile.in
cd "${S}"
fi
=20
@@ -152,11 +149,14 @@ src_configure() {
# It doesn't compile on alpha without this LDFLAGS
use alpha && append-ldflags "-Wl,--no-relax"
=20
+ mozconfig_annotate '' --prefix=3D"${EPREFIX}"/usr
+ mozconfig_annotate '' --libdir=3D"${EPREFIX}"/usr/$(get_libdir)
mozconfig_annotate '' --enable-extensions=3D"${MEXTENSIONS}"
mozconfig_annotate '' --with-default-mozilla-five-home=3D"${EPREFIX}${M=
OZILLA_FIVE_HOME}"
mozconfig_annotate '' --with-user-appdir=3D.thunderbird
mozconfig_annotate '' --with-system-png
mozconfig_annotate '' --enable-system-ffi
+ mozconfig_annotate '' --target=3D"${CTARGET:-${CHOST}}"
=20
# Use enable features
mozconfig_use_enable lightning calendar
@@ -167,6 +167,9 @@ src_configure() {
MEXTENSIONS=3D"${MEXTENSIONS},inspector"
fi
=20
+ # Use an objdir to keep things organized.
+ echo "mk_add_options MOZ_OBJDIR=3D@TOPSRCDIR@/tbird" >> "${S}"/.mozconf=
ig
+
# Finalize and report settings
mozconfig_final
=20
@@ -186,28 +189,35 @@ src_configure() {
append-flags -mno-avx
fi
fi
-
- CPPFLAGS=3D"${CPPFLAGS}" \
- CC=3D"$(tc-getCC)" CXX=3D"$(tc-getCXX)" LD=3D"$(tc-getLD)" \
- econf || die
}
=20
src_compile() {
- emake || die
+ CC=3D"$(tc-getCC)" CXX=3D"$(tc-getCXX)" LD=3D"$(tc-getLD)" \
+ MOZ_MAKE_FLAGS=3D"${MAKEOPTS}" \
+ emake -f client.mk || die
=20
# Only build enigmail extension if crypt enabled.
if use crypt ; then
- emake -C "${S}"/mailnews/extensions/enigmail || die "make enigmail fai=
led"
- emake -C "${S}"/mailnews/extensions/enigmail xpi || die "make enigmail=
xpi failed"
+ cd "${S}"/mailnews/extensions/enigmail || die
+ ./makemake -r 2&> /dev/null
+ cd ${S}/tbird/mailnews/extensions/enigmail
+ emake || die "make enigmail failed"
+ emake xpi || die "make enigmail xpi failed"
fi
}
=20
src_install() {
declare MOZILLA_FIVE_HOME=3D"/usr/$(get_libdir)/${PN}"
declare emid
+ local obj_dir=3D"tbird"
+ cd "${S}/${obj_dir}"
+
+ # Copy our preference before omnijar is created.
+ cp "${FILESDIR}"/thunderbird-gentoo-default-prefs-1.js-1 \
+ "${S}/${obj_dir}/mozilla/dist/bin/defaults/pref/all-gentoo.js" || die
=20
# Pax mark xpcshell for hardened support, only used for startupcache cr=
eation.
- pax-mark m "${S}"/mozilla/dist/bin/xpcshell
+ pax-mark m "${S}"/${obj_dir}/mozilla/dist/bin/xpcshell
=20
emake DESTDIR=3D"${D}" install || die "emake install failed"
=20
@@ -228,29 +238,29 @@ src_install() {
=20
if use crypt ; then
cd "${T}" || die
- unzip "${S}"/mozilla/dist/bin/enigmail*.xpi install.rdf || die
+ unzip "${S}"/${obj_dir}/mozilla/dist/bin/enigmail*.xpi install.rdf || =
die
emid=3D$(sed -n '/<em:id>/!d; s/.*\({.*}\).*/\1/; p; q' install.rdf)
=20
dodir ${MOZILLA_FIVE_HOME}/extensions/${emid} || die
cd "${D}"${MOZILLA_FIVE_HOME}/extensions/${emid} || die
- unzip "${S}"/mozilla/dist/bin/enigmail*.xpi || die
+ unzip "${S}"/${obj_dir}/mozilla/dist/bin/enigmail*.xpi || die
fi
=20
if use lightning ; then
emid=3D"{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}"
dodir ${MOZILLA_FIVE_HOME}/extensions/${emid}
cd "${ED}"${MOZILLA_FIVE_HOME}/extensions/${emid}
- unzip "${S}"/mozilla/dist/xpi-stage/gdata-provider.xpi
+ unzip "${S}"/${obj_dir}/mozilla/dist/xpi-stage/gdata-provider.xpi
=20
emid=3D"calendar-timezones@mozilla.org"
dodir ${MOZILLA_FIVE_HOME}/extensions/${emid}
cd "${ED}"${MOZILLA_FIVE_HOME}/extensions/${emid}
- unzip "${S}"/mozilla/dist/xpi-stage/calendar-timezones.xpi
+ unzip "${S}"/${obj_dir}/mozilla/dist/xpi-stage/calendar-timezones.xpi
=20
emid=3D"{e2fda1a4-762b-4020-b5ad-a41df1933103}"
dodir ${MOZILLA_FIVE_HOME}/extensions/${emid}
cd "${ED}"${MOZILLA_FIVE_HOME}/extensions/${emid}
- unzip "${S}"/mozilla/dist/xpi-stage/lightning.xpi
+ unzip "${S}"/${obj_dir}/mozilla/dist/xpi-stage/lightning.xpi
=20
# Fix mimetype so it shows up as a calendar application in GNOME 3
# This requires that the .desktop file was already installed earlier
@@ -261,11 +271,6 @@ src_install() {
=20
pax-mark m "${ED}"/${MOZILLA_FIVE_HOME}/thunderbird-bin
=20
- # Enable very specific settings for thunderbird-3
- cp "${FILESDIR}"/thunderbird-gentoo-default-prefs-1.js-1 \
- "${ED}/${MOZILLA_FIVE_HOME}/defaults/pref/all-gentoo.js" || \
- die "failed to cp thunderbird-gentoo-default-prefs.js"
-
share_plugins_dir
=20
if use minimal; then