From 8b070ac74064e487120262add09dcfa2e347c617 Mon Sep 17 00:00:00 2001 From: Lars Wendler Date: Sun, 13 Nov 2011 17:13:47 +0000 Subject: [PATCH] Ensure omnijar build does not fail (bug #390227) Package-Manager: portage-2.2.0_alpha74/cvs/Linux x86_64 --- mail-client/thunderbird/ChangeLog | 5 +++- mail-client/thunderbird/Manifest | 24 +++++++++++++------ .../thunderbird/thunderbird-8.0.ebuild | 8 +++++-- 3 files changed, 27 insertions(+), 10 deletions(-) diff --git a/mail-client/thunderbird/ChangeLog b/mail-client/thunderbird/ChangeLog index 81057abde47b..4da17de1eba0 100644 --- a/mail-client/thunderbird/ChangeLog +++ b/mail-client/thunderbird/ChangeLog @@ -1,6 +1,9 @@ # 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.102 2011/11/13 14:46:32 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/ChangeLog,v 1.103 2011/11/13 17:13:47 polynomial-c Exp $ + + 13 Nov 2011; Lars Wendler thunderbird-8.0.ebuild: + Ensure omnijar build does not fail (bug #390227). Committed for Anarchy. 13 Nov 2011; Markus Meier thunderbird-7.0.1-r1.ebuild: x86 stable, bug #381245 diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest index 129683d89ad3..efd5609dfe60 100644 --- a/mail-client/thunderbird/Manifest +++ b/mail-client/thunderbird/Manifest @@ -1,5 +1,5 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 +Hash: SHA512 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 @@ -245,13 +245,23 @@ EBUILD thunderbird-3.1.12.ebuild 8098 RMD160 738570bba05f5b2c8e87aeb765acc115907 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-r1.ebuild 9113 RMD160 2eb75d2f2325d02e3b1d023d0539c05faa399448 SHA1 4c1a65540c1fd4ba9404842c4a89be0a465a47b8 SHA256 f4b1f2c3e17b6584c794588acf4b28e2e1b81584dcd2dd22a863065d15f8d99c -EBUILD thunderbird-8.0.ebuild 9268 RMD160 e5f1a9dba9ce79a4fb1b3fa831ef89107f7874fb SHA1 567d0b8a83c2d9f69d0590c4675ab79aa973754f SHA256 a464818e5d07deddaffdc3ea548d83c810f02e955acb09e5ec7c7a53eedc5e77 -MISC ChangeLog 66673 RMD160 a9c3c11da886841ce377507ea23ec116e2680064 SHA1 a548b2df0a80a7225988707dd90e9c80530d06d0 SHA256 59e89516dd4736a7af2822b5b822fd9db539f34d2b9a64cf49ae7a3cea0d38d8 +EBUILD thunderbird-8.0.ebuild 9338 RMD160 0095f646014944dd8c9ff51ff2f09e122ff10fac SHA1 3e51dc751e1ccafa6f50e9e192ca3a3ba01ce850 SHA256 5892f65865d4c366cfdb79bde6c47cff49d073d618e66035c971c02dc2974a49 +MISC ChangeLog 66833 RMD160 25a691d11039cb3f2c03b4b8c7140f0f42fef2f7 SHA1 8f4aaf7401d57bebbc4dc065bcf5930a404fd2c0 SHA256 1f43c3495cb3337b33c1b54d71c1521037bf8a58e60d230fc3a87a2fd0ba2dbc MISC metadata.xml 830 RMD160 3d39ed1f7c9159182b747acbdc1854a7fd6bbd46 SHA1 6e22a48ca98944a15d3a4ddcd10c9494884bbd8e SHA256 8b073e19b5cc6b8a6332e9873ac937bb129833195007f0bf06c4bbb872bf267f -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) +Version: GnuPG v2.0.18 (GNU/Linux) -iEUEARECAAYFAk6/2J4ACgkQkKaRLQcq0GInjwCfS7+aU4y63xbLuZDZwFR1kpWu -aygAl2bId8A/GwSygZyHaJ+gNyA5ci4= -=z/fR +iQIcBAEBCgAGBQJOv/rRAAoJEPiazRVxLXTFpBIP/2Z8Vf+gi+AMAEPKxDYTwAu+ +zRQBFo4uLmrXC5lbMu9ZIsVuQfZhDKjRo7Ej9gDbfWlnDdNPu/hXBeelhxqItk/Z +GZaHe5aDwpdV7802hvx0WExZ4xPL+CpXtpxyE3ENtXUJvE214whmOzFu26RIoGbC +OPnMfBsw4z1aArJgwhehf8qkD5NJlyZ4D3w6O5n+ExiNOc4g72Siwe0cHQPKVD/G +G8VlVZoaYyEg13sAzLVHMWR21CazpXnfZZAkf3sThXDauI9x2JYdTtqhQxgNCTcx +a+gUGpL2mUyDw/sv14r79gkal7fBC8d6oYMvS5bA4pWigrbjAJRC8zvGAJpbDjU5 +ATSmtpGnWS+qkhTaj/I5Tln8qPkkcwUTI7bndundjLX/UMYpOjUdMV2IwCkGtHJp +/wo5lN9D35dWk/8kEIhEf8l6EU8heESLDPvWnzogNHPwAcumtRWFGNIYpLw6Crem +SwaU8b3IYq9USvr7LwR82D/91GK+zrpU19ug+4qsGmxJYl2ODyvsu6PwpCvhIBHz +HLb29wF6+W3Cr4JM5DgDcM7FpFseCu5oJRRaLiNg7uA2Q0/xHnpKELnIWzOiR2Zj +Jc5SH7VtNvM6M6RzIM1ph0C6MbsUjcCCzbbABi3061nqnJDs3dz6r8t6ToUggzys +Ka9Yu+r2xxt+QU6qw9ze +=fFDN -----END PGP SIGNATURE----- diff --git a/mail-client/thunderbird/thunderbird-8.0.ebuild b/mail-client/thunderbird/thunderbird-8.0.ebuild index c3cb6d1b644e..65bdc2e4717f 100644 --- a/mail-client/thunderbird/thunderbird-8.0.ebuild +++ b/mail-client/thunderbird/thunderbird-8.0.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-8.0.ebuild,v 1.2 2011/11/11 23:40:14 anarchy Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/thunderbird-8.0.ebuild,v 1.3 2011/11/13 17:13:47 polynomial-c Exp $ EAPI="3" WANT_AUTOCONF="2.1" @@ -102,7 +102,11 @@ linguas() { pkg_setup() { moz_pkgsetup - if ! use bindist; then + if ! use crypt ; then + export MOZILLA_DIR="${S}/mozilla" + fi + + if ! use bindist ; then elog "You are enabling official branding. You may not redistribute this build" elog "to any users on your network or the internet. Doing so puts yourself into" elog "a legal problem with Mozilla Foundation" -- 2.26.2