multiple bug fixes, enable system libffi, multiple archs now supported.

Package-Manager: portage-2.1.10.20/cvs/Linux x86_64

diff --git a/mail-client/thunderbird/ChangeLog b/mail-client/thunderbird/ChangeLog
index 714f63b0a8a2ecfd357efd9ac8b67cb6b05b4b0f..906b93643e2baeb9541c96105bcd7aeb3716d216 100644 (file)
--- a/mail-client/thunderbird/ChangeLog
+++ b/mail-client/thunderbird/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for mail-client/thunderbird
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/ChangeLog,v 1.96 2011/10/01 01:45:31 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/ChangeLog,v 1.97 2011/10/03 00:02:43 anarchy Exp $
+
+*thunderbird-7.0.1-r1 (03 Oct 2011)
+
+  03 Oct 2011; Jory A. Pratt <anarchy@gentoo.org> -thunderbird-7.0.1.ebuild,
+  +thunderbird-7.0.1-r1.ebuild,
+  -files/Copy_xpcshell_only_if_tests_are_enabled.patch:
+  multiple bug fixes, enable system libffi, multiple archs now supported.
 
 *thunderbird-7.0.1 (01 Oct 2011)
 

diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index 3d7e0a28503126eb48d0e861f78fc5097326a351..837ed2f2856bdfa692005ae035f4c229a2fd2015 100644 (file)
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -4,7 +4,6 @@ Hash: SHA1
 AUX 1001-xulrunner_fix_jemalloc_vs_aslr.patch 1936 RMD160 4edd9e5ab5082f86cb66ad1fc158e4c105f861ce SHA1 20df285bac8e0704559c0479f7dfe02f030afa8a SHA256 0beb08f2b3fc504897b1024caabcf2887b55fae31c021341c66d3491dc63e32b
 AUX 1002_fix-system-hunspell-dict-detections.patch 3466 RMD160 f8fa846e5d7c80a15d0abf0c6aedb7302ead1f83 SHA1 091febd913c09c86c9242b1be8960fb012ee7c8d SHA256 7ce51cae6bbd6655c8bc543365370627e37d2fc5aa7f7e1270671f7482df344a
 AUX 2000-thunderbird_gentoo_install_dirs.patch 813 RMD160 802697aab947df43693d7330f5d83700a62a6b50 SHA1 d2621bc80130239d7d65562ce8de8488dcbf60e2 SHA256 f663f3e59ac1752d681ed5d09bd599693009a65f603c89fa6d2e851b3487a8c4
-AUX Copy_xpcshell_only_if_tests_are_enabled.patch 2828 RMD160 a69ed581831c0d4c674c650d6ce38e279d593d8e SHA1 0cd598d09424beaca1dc387c75575cd49fbd9f39 SHA256 38686ca5bcfb06501e1f82ee0f98a359a71c44a9789ce33413439e28495bfb0e
 AUX bug-606109.patch 1259 RMD160 6d3f5d354524268e34293e9ce2d8b173c47163af SHA1 e1488807cc61ec04b2caa50019c000ba5d077450 SHA256 f2e645dfaa03cabcf46703be5bdeff8ee021694896465d3d263b038682dc0395
 AUX cups-1.4.4-fixup.patch 5439 RMD160 e907f65012a88b0810979c0beda4244e817835e6 SHA1 4099626a22b61802c958faad8171d506a95f9fca SHA256 501f95e278c2fdf3dec2b5586a2dc5ae35d78557a0db9939a1501c4782e54be5
 AUX enigmail-1.1.2-20110124-locale-fixup.diff 125 RMD160 8704469817cd93c99665a35655fa626b74253920 SHA1 708e101ae0576f99d6f10ac778fbc2b76c3ff6ea SHA256 60627ed65b032e33935d14eea4c7224f940641c4a11ab8bdf2c5d6056a76bfda
@@ -22,6 +21,7 @@ AUX thunderbird-respect-ldflags.patch 1640 RMD160 889a63b2fb04878e99b2a14d47713e
 AUX thunderbird-xul-1.9.2-arm-fixes.patch 603 RMD160 952db59f2c3d526b04323fec830cf04c28dfb84d SHA1 b1e2f12c0b204bf2c6434303c0638750dcb1b73d SHA256 19d230805cb5d62a99fef32dfc373661dcc3361bf8d1f6077854120a5e9a9821
 AUX xulrunner-1.9.2-gtk+-2.21.patch 679 RMD160 060d514faa98768312d047985c81934342935745 SHA1 d672469ce9f8271a4788639a7fa36c7d606ef442 SHA256 25432a427c70fcaf929e45312ff9e4a617d709d59efa89932a77b42c3f7b0230
 DIST enigmail-1.3.2.tar.gz 1371388 RMD160 f9320279e67767a8023ac863b8d089e370018201 SHA1 8bf39664f22e383d026c07d4acd714a1ccfd9d6d SHA256 46ffa074829472ba6714e1ada37b8cc083d0dd4e16c21ad0c2893c5eef68893d
+DIST firefox-7.0-patches-0.5.tar.xz 14652 RMD160 94593a3e01247b4e5fe9c01a80e902937ed3b32b SHA1 c9cfd5e46a18e4e6adfa8334936f854c3e14a687 SHA256 e2f1de9cfbb87cd982ed205b3b5f33e3bcd952b2093a9969281a761cc0a9e293
 DIST thunderbird-3.1-patches-1.2.tar.bz2 3427 RMD160 354d9003e8132e0aaf7069aec84459ff28237f61 SHA1 36ad5f9af77eaacc02c7df744b5d2563fb54bed8 SHA256 6586cf569b035bd1b9179036678a0cbedbf3def88ca7d69852451542b52693a0
 DIST thunderbird-3.1.12-af.xpi 210617 RMD160 0d8a79d8066b6706090f6c0a55a0c89423542eab SHA1 abadfd892e896e87a8a394bdc5a1ee6c4aa7f65f SHA256 00d47a4b1443689a328d4903ccea06a058d2d847789442d4a044212bb6813b56
 DIST thunderbird-3.1.12-ar.xpi 230333 RMD160 a9ddde633984f2c431c960870e5d33eac78089ad SHA1 beeff8853f470b9c24f308ce0ad93a95686c7378 SHA256 706f67296c7058d694c712964239b44dcfc4a93ab1148b70fee22ed1056c6832
@@ -161,7 +161,7 @@ DIST thunderbird-3.1.14-uk.xpi 244869 RMD160 5f9f7163b41de33e4f07ad78cf500c94a05
 DIST thunderbird-3.1.14-zh-CN.xpi 219613 RMD160 b363cafe99297d9fb167b817b13ba38bece3bbca SHA1 91f4b40648588f1b7c9588ef2d17aef3eef03745 SHA256 0968408e21938a9b56feace2cfb067387486b61bb2d5dcd257d868d3baca58a2
 DIST thunderbird-3.1.14-zh-TW.xpi 220657 RMD160 9e7019bda257af283f94814117a223776874937b SHA1 9328a5681dc47636f314d402312eaa98b06c9ab0 SHA256 f409566081a40a5d1e81d363167d0e88bef0193d48e8345e54a8367b4a324278
 DIST thunderbird-3.1.14.source.tar.bz2 69060251 RMD160 caf136d77eaf31a6dfa42a7520db5d8d8132bce0 SHA1 62ea0edbd5265be6da98fcefad3baa36349bfdd0 SHA256 69916894c9e4177c470d08f5b82ddbb15f2fddb40e5dbd52ea7d9a8d69a9c51c
-DIST thunderbird-7.0-patches-0.1.tar.bz2 2521 RMD160 33198b67001d73910c292ad9e6b02473b0293670 SHA1 71036622e59e5ecfe0190b4213c82da959de0d3c SHA256 1419e4544d4b7d2558f10b012da7abc5ea262d7b1291a92e3b4f4527eb8a7672
+DIST thunderbird-7.0-patches-0.4.tar.xz 1600 RMD160 117ab25696595c601add3041142312ea0bc16685 SHA1 f343c165b7201ba34c5d794a508caa5ef42326e9 SHA256 ef5ee490574240dcc3d44dcd1f198a2a03405a396e557795c3bf65d22c1c060a
 DIST thunderbird-7.0.1-ar.xpi 427454 RMD160 b0749214d4b25657a491e621fb5ff7942f54f53c SHA1 070f6e98f56bdbcf92ad851e255befac8235278c SHA256 d8b7890d3036b0cf313c9f1c1bf5be13feeb75001d2732e3785667759cc16bc7
 DIST thunderbird-7.0.1-ca.xpi 408520 RMD160 a3afd32ee13596dcad3235df389da876b2a02532 SHA1 ef6e6849be09550465a0404f7d3a73542029eecc SHA256 4bdb7ca95347516f11ab6bcd31adbfd5f6ebbba6936020d3164d5b56ef57839f
 DIST thunderbird-7.0.1-cs.xpi 408949 RMD160 cfa526dc82b597673a521dc20ec7781c5dd04de9 SHA1 3e27bbb05a106b529964d988a61e9a7c86227899 SHA256 783dde52ce6153e555e2a0e3e712a4c7668abc5bf5e58c93ca72bc136c7f75db
@@ -202,17 +202,17 @@ DIST thunderbird-7.0.1.source.tar.bz2 87405591 RMD160 04d39464b5c7c3128a00b0eaff
 EBUILD thunderbird-3.1.12.ebuild 8098 RMD160 738570bba05f5b2c8e87aeb765acc1159075f6dd SHA1 4a338ecb561b992ab9eb07eccff8fef66190be62 SHA256 358d9dc0abdaf153609110c32236c255f8d1680499d5b21a88373946471da1ca
 EBUILD thunderbird-3.1.13.ebuild 8110 RMD160 e38bcc178fdb3a37e049f40eec24688fa67a6167 SHA1 41f4aa135e7f8e9830c9faf00879cfc0b04d17f9 SHA256 7422b283e991b58950fb84c0e09920e0b0236617df8f9eef2e07a4c8bde2f429
 EBUILD thunderbird-3.1.14.ebuild 8110 RMD160 f50c19f939b81b9ee4c0a68dbb0ebf50386ec0d3 SHA1 bbfe47a8ec85f9d7fbcbd193d8f2db8c49a23256 SHA256 aa0a28a177630cf332f3c4f242506db2dfceb9370b9d69e66c9c5ab74acc7ae1
-EBUILD thunderbird-7.0.1.ebuild 8533 RMD160 135b1f29df6bbebc5f1c92382240e31de51edaea SHA1 ecbf8c3369949d323a50eb0fcfd9a676c71a8d27 SHA256 5f97aa29b74e73fd62b185d07ebe3cf531eb0cd360a59ca0863b13541fd6abc6
-MISC ChangeLog 65611 RMD160 c88c3edceb9dda1b7352bde18854f991299216ec SHA1 6de8ffdb78370345b9d835c0b0342bc82e0e3a19 SHA256 bcf653853d32ac6eaaa766e3505e596fc97d237cdd9b1f2f2d81d059312f4f5c
+EBUILD thunderbird-7.0.1-r1.ebuild 8855 RMD160 ce7fcc62c587898e53123837e0ea67db69756ac6 SHA1 da5cd8d8ec3dc4a993f8fa731a764bebbaeed720 SHA256 1e6ff17d56c1dc034b00fce7a0b6fc9b12b6c0fa44876c62435f6d56cb6599c8
+MISC ChangeLog 65888 RMD160 f6d744c2c7fb719ec96280511a03c795d45f0abd SHA1 61f4aad5a8f896d7518eea6b96164a4fd4ef0818 SHA256 3586c472481c767af2536f79daf8250202a0adbd00ebe636b6b91f85c5350c33
 MISC metadata.xml 732 RMD160 87468b1b9c1c1ec539c026f04e05265a4dc32cdd SHA1 283661cc3d68f2f7c2a3b82455692f7239bed63b SHA256 3b0e7f6f49598b82aaeee92a5f96f99877713866fbbb73c797bfa65f2c0b4d75
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJOhnCpAAoJEIXV9xahDnCos/wIAKq9YVAe2cWl82hJNwj8R63q
-fnnaHurwLygj3eML8ffspvB4v12RxIRlvL7rHG3YSG+Z3SH/TTgEIjHaHIwhzh7m
-+auJHBALYZA33GsUka+cdMIFrtWXRObcCdo8/5PLMPcIQCOQ9mLmB+M2QsB2pzXx
-KkA1HtslRuAxOsY+lWFB1beXsyXC9g0v+Ih2EpIKMvF/+k7Vma8GTQqJ10DmRXpc
-LNYJ81IsLYZN718Eq1QjZDpDwiPGSngsYdzNXfHai+shGlix8v1Ql6bncuMURGiW
-NbxueOEkXHUCI5+4SojKog62iM2alrSTXPy/8g+X2HhYXEA0WljeDzp1iqHsf5A=
-=g8lI
+iQEcBAEBAgAGBQJOiPujAAoJEIXV9xahDnCoZwMIAIjEKKx5aOFzK/iqJYK2Yhzm
+TCElC4rB1JMsnqjQiuFWozuPgUGaPTyH3006z1lvfqAybpuoRkv24ngcpaJkzLqK
+/O6y0lOezSmhFPgTb4n0EXuzMS/3rM5dNg5QDkUyekMHJi85G1jzfcuNwHzYnEN1
+NyVlhLE2aik2bdzYT0b9TZryJpdO3nCNp97r4RD62Km3VSVgUnMDz6S13ZZEYqxQ
+9pFe3iwZGqDrBdoOyii3p72f5d4pwupFk+oyYFgHYPGNWroxXXCZj5XNjBh5GahG
+ZHMtrtPbOFJkZjrHkjkTMvWGvXKMo0pk83YKvCI6mrEky+ICj/4FPeffwwF/8dw=
+=rlB/
 -----END PGP SIGNATURE-----

diff --git a/mail-client/thunderbird/files/Copy_xpcshell_only_if_tests_are_enabled.patch b/mail-client/thunderbird/files/Copy_xpcshell_only_if_tests_are_enabled.patch
deleted file mode 100644 (file)
index 342f7de..0000000
--- a/mail-client/thunderbird/files/Copy_xpcshell_only_if_tests_are_enabled.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-# HG changeset patch
-# User Takanori MATSUURA <t.matsuu@gmail.com>
-# Date 1311059208 -32400
-# Node ID 6d8318b1709e2259c1077ba1f80374bfc45af9ba
-# Parent  6596041bb85c5106dc474767bc481c6522f926f3
-Bug 672286 - Copy xpcshell.ini only if ENABLE_TESTS is set; r=Standard8
-
-diff --git a/mail/app/Makefile.in b/mail/app/Makefile.in
---- a/mail/app/Makefile.in
-+++ b/mail/app/Makefile.in
-@@ -252,24 +252,27 @@ LIBS += -lphexlib
- endif
- 
- libs:: $(srcdir)/profile/prefs.js
-       $(INSTALL) $(IFLAGS1) $^ $(DIST)/bin/defaults/profile
- 
- libs:: blocklist.xml
-       $(INSTALL) $(IFLAGS1) $^ $(DIST)/bin
- 
-+ifdef ENABLE_TESTS
- # XXX This is a hack to ensure that we get the right xpcshell.ini for our tests
- # and that we can share the core mozilla-central xpcshell.ini.
- # mozilla-central does this in testing/xpcshell-tests which means that it is
- # very hard for anyone to specify anything else.
- libs::
-+      $(NSINSTALL) -D $(MOZDEPTH)/_tests/xpcshell
-       cp $(MOZILLA_SRCDIR)/testing/xpcshell/xpcshell.ini $(MOZDEPTH)/_tests/xpcshell/xpcshell-core.ini
-       $(INSTALL) $(topsrcdir)/mail/test/xpcshell.ini $(MOZDEPTH)/_tests/xpcshell
-       cp $(topsrcdir)/mail/test/xpcshell.ini $(MOZDEPTH)/_tests/xpcshell/all-test-dirs.list
-+endif
- 
- ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
- 
- AB := $(firstword $(subst -, ,$(AB_CD)))
- 
- APP_NAME = $(MOZ_APP_DISPLAYNAME)
- 
- LOWER_APP_NAME = $(shell echo $(APP_NAME) | tr '[A-Z]' '[a-z]')
-diff --git a/suite/app/Makefile.in b/suite/app/Makefile.in
---- a/suite/app/Makefile.in
-+++ b/suite/app/Makefile.in
-@@ -216,24 +216,27 @@ ifeq ($(OS_ARCH),WINNT)
-       $(PERL) -pe 's/(?<!\r)\n/\r\n/g;' < $(topsrcdir)/suite/installer/license.txt > $(DIST)/bin/license.txt
- else
-       $(INSTALL) $(topsrcdir)/suite/installer/license.txt $(DIST)/bin/
- endif
- 
- libs:: blocklist.xml
-       $(INSTALL) $(IFLAGS1) $^ $(DIST)/bin
- 
-+ifdef ENABLE_TESTS
- # XXX This is a hack to ensure that we get the right xpcshell.ini for our tests
- # and that we can share the core mozilla-central xpcshell.ini.
- # mozilla-central does this in testing/xpcshell-tests which means that it is
- # very hard for anyone to specify anything else.
- libs::
-+      $(NSINSTALL) -D $(MOZDEPTH)/_tests/xpcshell
-       cp $(MOZILLA_SRCDIR)/testing/xpcshell/xpcshell.ini $(MOZDEPTH)/_tests/xpcshell/xpcshell-core.ini
-       $(INSTALL) $(topsrcdir)/suite/test/xpcshell.ini $(MOZDEPTH)/_tests/xpcshell
-       cp $(topsrcdir)/suite/test/xpcshell.ini $(MOZDEPTH)/_tests/xpcshell/all-test-dirs.list
-+endif
- 
- ifdef MOZ_OMNIJAR
- # Make extensions end up as XPIs instead of flat chrome when doing omni.jar.
- # APP_EXTENSIONS exist only bundled with the application,
- # PROFILE_EXTENSIONS will be copied to the profile in installed builds.
- # NOTE: This is a hack to run this at the end of compilation, would be nicer
- # if this was done right away for built-in extensions in omnijar mode.
- # Listed extension GUIDs:
-
-

diff --git a/mail-client/thunderbird/thunderbird-7.0.1.ebuild b/mail-client/thunderbird/thunderbird-7.0.1-r1.ebuild
similarity index 93%
rename from mail-client/thunderbird/thunderbird-7.0.1.ebuild
rename to mail-client/thunderbird/thunderbird-7.0.1-r1.ebuild
index 88bf741b034f2fbf86b4a9f2a49340a4ebd3f251..15d33a44446e3fbccfb6f2828185f1989544e6a3 100644 (file)
--- a/mail-client/thunderbird/thunderbird-7.0.1.ebuild
+++ b/mail-client/thunderbird/thunderbird-7.0.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/thunderbird-7.0.1.ebuild,v 1.1 2011/10/01 01:45:31 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/thunderbird-7.0.1-r1.ebuild,v 1.1 2011/10/03 00:02:43 anarchy Exp $
 
 EAPI="3"
 WANT_AUTOCONF="2.1"
@@ -18,12 +18,14 @@ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linu
 SLOT="0"
 LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
 IUSE="bindist gconf +crashreporter +crypt +ipc +lightning mozdom"
-PATCH="${PN}-7.0-patches-0.1"
+PATCH="${PN}-7.0-patches-0.4"
+PATCHFF="firefox-7.0-patches-0.5"
 
 FTP_URI="ftp://ftp.mozilla.org/pub/${PN}/releases/"
 SRC_URI="${FTP_URI}/${TB_PV}/source/${TB_P}.source.tar.bz2
        crypt? ( http://www.mozilla-enigmail.org/download/source/enigmail-${EMVER}.tar.gz )
-       http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.bz2"
+       http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.xz
+       http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCHFF}.tar.xz"
 
 if ! [[ ${PV} =~ alpha|beta ]]; then
        # This list can be updated using get_langs.sh from the mozilla overlay
@@ -55,6 +57,7 @@ RDEPEND=">=sys-devel/binutils-2.16.1
        >=dev-libs/nspr-4.8.8
        gconf? ( >=gnome-base/gconf-1.2.1:2 )
        media-libs/libpng[apng]
+       virtual/libffi
        !x11-plugins/lightning
        !x11-plugins/enigmail
        system-sqlite? ( >=dev-db/sqlite-3.7.5[fts3,secure-delete,unlock-notify,debug=] )
@@ -107,6 +110,7 @@ pkg_setup() {
        # Ensure we have enough disk space to compile
        CHECKREQS_DISK_BUILD="4G"
        check-reqs_pkg_setup
+       
 }
 
 src_unpack() {
@@ -125,12 +129,17 @@ src_unpack() {
 }
 
 src_prepare() {
-       # Apply our patches
+       # Apply our Thunderbird patchset
        EPATCH_SUFFIX="patch" \
        EPATCH_FORCE="yes" \
-       epatch "${WORKDIR}"
+       epatch "${WORKDIR}/thunderbird"
 
-       epatch "${FILESDIR}/Copy_xpcshell_only_if_tests_are_enabled.patch"
+       # Apply our patchset from firefox to thunderbird as well
+       pushd "${S}"/mozilla &>/dev/null || die
+       EPATCH_SUFFIX="patch" \
+       EPATCH_FORCE="yes" \
+       epatch "${WORKDIR}/firefox"
+       popd &>/dev/null || die
 
        if use crypt ; then
                mv "${WORKDIR}"/enigmail "${S}"/mailnews/extensions/enigmail
@@ -182,6 +191,7 @@ src_configure() {
        mozconfig_annotate '' --with-default-mozilla-five-home="${EPREFIX}${MOZILLA_FIVE_HOME}"
        mozconfig_annotate '' --with-user-appdir=.thunderbird
        mozconfig_annotate '' --with-system-png
+       mozconfig_annotate '' --enable-system-ffi
 
        # Use enable features
        mozconfig_use_enable lightning calendar