Readd missing patch to disable buildid, bug #465466

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xB4D088B4

3 files changed, 16 insertions, 14 deletions

diff --git a/mail-client/thunderbird/ChangeLog b/mail-client/thunderbird/ChangeLog
index fe52b3c98d32..42bf1c5f4048 100644
--- a/mail-client/thunderbird/ChangeLog
+++ b/mail-client/thunderbird/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for mail-client/thunderbird
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/ChangeLog,v 1.260 2013/12/14 00:54:52 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/ChangeLog,v 1.261 2013/12/15 21:08:45 anarchy Exp $
+
+  15 Dec 2013; Jory A. Pratt <anarchy@gentoo.org> thunderbird-24.2.0.ebuild:
+  Readd missing patch to disable buildid, bug #465466
 
   14 Dec 2013; Jory A. Pratt <anarchy@gentoo.org>
   +files/enigmail-1.6.0-parallel-fix.patch, thunderbird-24.2.0.ebuild:
diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index e04ccd9048b0..ce2b8223b107 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -8,8 +8,8 @@ AUX thunderbird-gentoo-default-prefs-1.js-1 426 SHA256 b5aba51045c700ae4d465e079
 DIST enigmail-1.5.2.tar.gz 1211395 SHA256 f20d6d1be1ab12dc2f1208d8f01227fd7e5c4dcf5d6f4bd0833a932b58973a26 SHA512 21df4726b203c5840134eb925df79c8bcb06b201217000fc636cf43b6d7d7fc8850c90de8998838f3d07b02e027f7cab09b719d600d034c4110cce6befd690c5 WHIRLPOOL 496320d20af8b8254d55976a269cececd27efc8d948cd85c016b4a34bab5f600a9698f423a6dae4f003fa2020ad6e7e475d2c1a1819f529b14e7bd13d26aaa51
 DIST enigmail-1.6.tar.gz 1231111 SHA256 10d5eb7ba364b9b6e6275aae8bba1d0e4321ed7d55a715337d566ccf2a56ea4d SHA512 877ca75a0ed1538f156307dc181ce8808deb96f58250d26d4d2c1f474d637959347c2305cb3b8f92f12d3ebd95bfa9d4d35aaaa1f4670728f205be7ae76852b8 WHIRLPOOL 91a11a81cc7b4c05c4a0a320284bc362b13f6aecb4fb20b04f38080bffbc5b94ab1913cf7e2d4480a452a916fd0d4297830ce0ba36867c7418b11deb1e060b06
 DIST firefox-17.0-patches-0.6.tar.xz 52684 SHA256 780d7aa5990e39ad105b21fa2584379357749e0eb16e0eaf9be66464a02f3de1 SHA512 56fc3970233e144bea5f6d6be6fdc7c17b1095172dc600c02be4a0cd3764958480e934a0b2ce1ab2a3edc237ece9cf1b7a2f7914828e6c5a3f519860ea2a5b5d WHIRLPOOL 4e2bdb64dfb23f66bec5bf41e34d61aff22e4f7bc14c7c981077575364c8a5aae889d941b99fbf21d248854648b70f6e4c2e6a2e06ab70b1d4495d539e2962a4
-DIST firefox-24.0-patches-0.5.tar.xz 7532 SHA256 ffe813f88865aa91d7041b7069dd598eb576519284579766c43910cf53ce96fa SHA512 0090c8e9f7dc46ea60f5fb6edb08f76fe1607012ab277bab4c023c313bce32b8ee4776f70ff1d6b11fc16b4ec29d0c99c69c59b4095953165029d8ad2c54055b WHIRLPOOL 1f7fe475d953103081bbd13d64baf6cd8f8d6a7a8da30a1d4a42cce83201c55b5ef5cd8ef87eb0135f35efb6f466ac64ea595d2c4a1880043a7ccce42b839e0b
 DIST firefox-24.0-patches-0.6.tar.xz 9104 SHA256 1135f97625e23822309e5b2ce65ab0331cd8c7ebb1896d7b9daf2d77d1a11d4d SHA512 b8746373a7e9d2d5775dd2a73ca7d3675f2cbe32b81eacdf6a2208077f39fb842b454c49bb0a750e48c84c3d2ea73fa9c27f6135e7d1a08be2fc73afc520f172 WHIRLPOOL 5d8b89d1849709835611e0ef306dd4814e6ac10fcf9cfee10f6aa72b5e938546c505827441fe2d935eb63605434f77bc72ec201005693534b43dc19635caaf82
+DIST firefox-24.0-patches-0.9.tar.xz 6576 SHA256 615b47ed076ead8f6fe8a9cc8b51ae7615bb8fb404a3e7254190e73c6669479f SHA512 caf76c23e3ad4ae0fd9d240d4ee61c289bfc727ae8117a17c27396d32ab9e06512cfa53da86c99e6c2d941eca96e18c41775473f3c4a16cf8c91a2e8dbe144ad WHIRLPOOL c0104c84c20a28b945ce2fe5a22e00ccd412d00bc38e4d51583fb47765bd639808db1a1bb52be9b7515423437ae131e12dd5f837b35d8e2e50dfb86341446396
 DIST gdata-provider-2.6.2.xpi 115020 SHA256 008a302410b152e956cf56fc0abe4f6cc191ae51ab367abb7e0467ee65d44093 SHA512 38d2a581842de0937a96b7498db06aca120b8cd6b9de96a0285e90f57c28118193a24f32c9fdbee72233db0675a35c7bc51fd3ba6ec41bcf4521adf48107624e WHIRLPOOL 70d87e73d355559879daf4a00c9ff45c24a455af5fb2f93e8034811b0c444799bd754cb00ef63c321c3f7d85e98a62148fd0e9524fcc07edccb5c02772d7b515
 DIST lightning-2.6.2.xpi 3644848 SHA256 5d130a10d8ba29ea52b22f4c0de5b92b05cbae0e7681fb7009c9e24d9c2823bc SHA512 71918d4797faa08f908593d77563a87ae6e65938a92f3bbc896622ba020461cd9ef982aa7f10bd477fa3d1b5f7959ada041e714283def30a26d6e448e523c452 WHIRLPOOL 617543cbee7fa53ac3f75fce8a813c35ff10b64706bccd968e72eb155339494f76fa69927b4024e34431a1d65324c630793bd4932f3dd2ba2d9ab5b098405ab7
 DIST thunderbird-17.0-patches-01.tar.xz 820 SHA256 79bf322258e0efc7682ce71ea84398e4dbec55b912acb264e16ddae72917bd8e SHA512 94ad743f86d95cb437bbe3be52beb8ab7c97acd9f703841f9445f94672d764cf6b9a3dfc065a6c54f24eeb16113a62708290512a3f54389c538a52fa93be7e06 WHIRLPOOL eb234826caf0f648d3ea8043b49fc2650f3a011eb28db661122e50abab0a6098b467e580d3c120b97a29919934c072e931f956bfa6676a2759cf46a2db88f282
@@ -181,17 +181,17 @@ DIST thunderbird-24.2.0-zh-TW.xpi 450000 SHA256 5fb98868c7e332a03176141d2fe22d60
 DIST thunderbird-24.2.0.source.tar.bz2 140363284 SHA256 66474132bd6ebbb8a913c3f4acd4ecc9bec011e4c7ee49475f29558801a905cf SHA512 961cb4c5bed6fa01b1999fec729e541f63f393cf9aec734cb028725e33f6e80bfe52ee31a8d000dd944cf8725b77018e571d191621253ad6f92c58ce5b9b47ec WHIRLPOOL 73f5f78d812517f08425a9dbdc4433f619f2c45781ea536df910318e6553b7dd75ea85fde2d4e148c4bc6841d9f9e3032763537986f61bc9a9b6e814d6ca8aca
 EBUILD thunderbird-17.0.9.ebuild 11160 SHA256 1c0e4000a12ac729275cd22ae5873d892cbee9850699536267f564dc6d9fb653 SHA512 30fb8a5bb31d7b8335e716bb157b65ae1b0d68e01425af9b507fedbd44e0a071371e171d556c34e793a3fdd7ff077f3a74b08e131d356ad2c0c0525e7bf9c794 WHIRLPOOL 87cd21a3297a745fa6035ac08b8ecd66083d0f97fd37a59eb365d06687a5d0de97c41ab26a4d939aff4ddbddf65bb39952036fd1677bcdcb30f1e5c873320638
 EBUILD thunderbird-24.1.1.ebuild 13142 SHA256 9669be0d794493ab8f03712e7d41fc6f668e388335de324c5da09e04995c3757 SHA512 4376be2b7909de53af6b197ab812e0b3e649ef8a7b8ee716c9728611679c7e93b071542b1e878c65182851b4987f0c9975fcf4d142ad5f261d479671d07b37a1 WHIRLPOOL 14201a9d4313d97db621cd5513cb6686c22d6ab790981d6f4f4ea2ce5ecaeb0e6c0f35a3d03b9fc007c88dafeae50818ba691b1211a8e7afa6acf27f7093e0e9
-EBUILD thunderbird-24.2.0.ebuild 13290 SHA256 6669463b3094beee3d6321ec0f158867f824e57242bf9aed806885aabbc631f4 SHA512 4498766f1de50a15834d4527de5e8d47a3b36702ba33667077ffd27c060ae758e385d1f80f267dbcc5d259189794e6a38b05b8b891a337a5e9529d771e8730a3 WHIRLPOOL baf76fd90fba050aa8d1c835fc06c87e3df1b7244661d1b456c93a58f89c31bbcedf9175df8d3152fe705cb75bb2ba5339f5b887591968141c6718fcb4d9956e
-MISC ChangeLog 90166 SHA256 200d11bd91e6b54c0a05f9e5664a0333fe10a947b1c58aae4ccf19406902aafe SHA512 25b6bc33645bc97617eb87a6521405a5566c46ad17e69b9f452c04863dbebc97b6413e87e6fb406017482bd18e3ab0785dcf28d04bdb25438c7f7986427058e5 WHIRLPOOL 222171af36b237b6dd2b7252bde3f2869c773c7cb7bbea7c8d831e10408c16704f5d212861b48cec317c322955d0f7b752ec82f5d7948105561797a1283a6dae
+EBUILD thunderbird-24.2.0.ebuild 13235 SHA256 6508099e9576124a5a236295e28781a66c59f7e4da5e718e5cf1def8fcb7d97a SHA512 4a0177397c0398ae1d5b392a1f3552b8f6616e5322aacd20c15216a8fdb781f7ffa3908fbd3b59d167ef6bdb7b0f8e50951117644269a3d698525e2350e75e26 WHIRLPOOL d6d12dfdf0be319c473e4c557129b3d3130deebd4dd5d88d823e3908a913d4804dacc316b74ec7fd7d49c7e7c6b9df8eff00ca35d79673bab2a1be2ee87e2152
+MISC ChangeLog 90298 SHA256 a5d54f0e78bd2f0969d8465e7b7233a06df4deea1f48a7a2ad75ccdcbf96a620 SHA512 076e212e520cc72669434a6de0f67bdc39a0a812e79b0b893940e62d040e9f4777f3a8446dd36dd1c2c3946f56ced5fec3094f91fbf07f46de94deddffba372f WHIRLPOOL ecce86878eaa0857e76f69d7c622136f5a4a02d90819e132c7521faebec58b0a10384925b94652e56c2722e06b11dce92d4fdfef116e1ce608f82946ab60c6c9
 MISC metadata.xml 1357 SHA256 062f8099b1ea79e279403eced4df75fb1809f2d8dc3b95c8e5a7c4577bb7dcf7 SHA512 14c353b4290d8ca91131e111a1b6ed6c4974f9eb8e9e0e1c6e47ef73d51770635f4513a23a2eac296ad8dee20f3a269b26fb7a4a2115d016d1192f964daf80a9 WHIRLPOOL 5a588a850e69e3846bc14992fcc3dfb79800e1e76096fe2b560377d178ddadcd2bfac3334e5ab606a573fef5f0473556010fed029e28c46d2dfcdd7b9f05188a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSq6xbAAoJEKDMw7q00Ii0CG8H/iQSm4mxw/HY8MI2y6DiY8Sf
-X9zbsKZ9mytinjfeViTz+GHoLuo8Tn9XemQmdXrq/JA294D/gRHdMufpbTGnYXYq
-dMvu1IOgpbR6TSwTgC/KxEbtCFvhau/JWZCe+mqXusWBK9CiyuLkUFDrshYoMXTX
-KrUcxvSTjd+uDGWvqgPE5hrVUL0KFfwrDHN4Jj6/WUyy6NEa+KYtcJxMverXHdYC
-dHVXOAz3lxeV0joiH1zXnT5+7QFyDTceC3F+8ssan39rQFxlfJ8LJ9OV/Bn3NBYb
-cpfHLcgN84qHUjgemZqCnL3AozkWFdJhMdyMc8T9fpX3KgBPahbJHjKT5T6pDVw=
-=yKOV
+iQEcBAEBCAAGBQJSrhpgAAoJEKDMw7q00Ii02Z0IAJpVrIKq/QC9fqo7WEFgZLYG
+kK3SJWTvd/G/SRSYsMSfoie8DVsQx8Tbslgu4Yvj4Zcw64ZOx9wuRqFq+mYbsIgE
+5WDzngLRicymf6JCdwpJLoLjio4/Tth4o6gEziors0koam38li/K1JxcsU3IgNHS
+iPQDqpaUo+iF18l+G3njDnfVggMDP3K8fLbC72vceMV9tHfiXppL1VkAtsOBz4iO
+caRFhjPv7LVt5vFLvk8n5zpNhKY/ewj/PySfrT0TFQLXZi32sn1fXFmwOHw+iu+0
+FYzd8YbxJmeGu/i91UvVuGzq43SWoWcYk7a1Nc5Ym/lxNNsJFPCWNf3TB8R4EAI=
+=ZbFx
 -----END PGP SIGNATURE-----
diff --git a/mail-client/thunderbird/thunderbird-24.2.0.ebuild b/mail-client/thunderbird/thunderbird-24.2.0.ebuild
index ca382e0280eb..8234e90ac462 100644
--- a/mail-client/thunderbird/thunderbird-24.2.0.ebuild
+++ b/mail-client/thunderbird/thunderbird-24.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/thunderbird-24.2.0.ebuild,v 1.2 2013/12/14 00:54:52 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/thunderbird-24.2.0.ebuild,v 1.3 2013/12/15 21:08:45 anarchy Exp $
 
 EAPI="3"
 WANT_AUTOCONF="2.1"
@@ -39,7 +39,7 @@ LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
 IUSE="bindist crypt gstreamer +jit ldap +lightning +minimal mozdom pulseaudio selinux system-cairo system-icu system-jpeg system-sqlite"
 
 PATCH="thunderbird-24.0-patches-0.1"
-PATCHFF="firefox-24.0-patches-0.5"
+PATCHFF="firefox-24.0-patches-0.9"
 
 SRC_URI="${SRC_URI}
 	${MOZ_FTP_URI}${MOZ_PV}/source/${MOZ_P}.source.tar.bz2
@@ -135,7 +135,6 @@ src_prepare() {
 
 	# Apply our patchset from firefox to thunderbird as well
 	pushd "${S}"/mozilla &>/dev/null || die
-	EPATCH_EXCLUDE="8001_ia64_support_bug_910845.patch" \
 	EPATCH_SUFFIX="patch" \
 	EPATCH_FORCE="yes" \
 	epatch "${WORKDIR}/firefox"