fix minor whitespace damage, fix bug #431382

Package-Manager: portage-2.1.11.55/cvs/Linux x86_64
Manifest-Sign-Key: 0xDD11F94A

3 files changed, 41 insertions, 28 deletions

diff --git a/mail-client/thunderbird-bin/ChangeLog b/mail-client/thunderbird-bin/ChangeLog
index 173adbbbc5b8..c531dd19602e 100644
--- a/mail-client/thunderbird-bin/ChangeLog
+++ b/mail-client/thunderbird-bin/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for mail-client/thunderbird-bin
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird-bin/ChangeLog,v 1.114 2013/04/11 13:49:07 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird-bin/ChangeLog,v 1.115 2013/04/11 13:58:09 zerochaos Exp $
+
+  11 Apr 2013; Rick Farina <zerochaos@gentoo.org> thunderbird-bin-17.0.5.ebuild:
+  fix minor whitespace damage, fix bug #431382
 
   11 Apr 2013; Rick Farina <zerochaos@gentoo.org> thunderbird-bin-17.0.5.ebuild:
   slightly better style for fix, and minor rename
diff --git a/mail-client/thunderbird-bin/Manifest b/mail-client/thunderbird-bin/Manifest
index afdb12ccd294..d7338e41aa80 100644
--- a/mail-client/thunderbird-bin/Manifest
+++ b/mail-client/thunderbird-bin/Manifest
@@ -58,23 +58,23 @@ DIST thunderbird-17.0.5esr-zh-CN.xpi 436082 SHA256 0c775bc64658bfd657a1125e776b5
 DIST thunderbird-17.0.5esr-zh-TW.xpi 437591 SHA256 194b9a773cdf8a078b11928e56807b58a111d849af272116c8323d5c147ceb69 SHA512 acba4f4e5fe86c17c10c333b5a70fce7220d6161141f307d9ecc410185c8de8fc23db2445955e615d6eecfd2af75ca5b43ea0bc8d737bf2a8d8f33938823cb5a WHIRLPOOL e43115377eb2345d6b27789e382f368e76fa733352e4a5d1c8ffc12b460d13775da2a97af8df79f754a9f2ad57631ec85d8775a1e366210dab96f599b6c53b9e
 DIST thunderbird-bin_i686-17.0.5.tar.bz2 21480241 SHA256 e1a0282baff12d00c5fe58e7e7f4058eecacd99911d79c5d473b2814042d8f3e SHA512 6b2e51f52745456b60f5517dfb26f5404e0248f414531147a9822feb45a0aa6df791fe1d63f2949ead4268ba3f37945bc2bd3a1fc7c51e8bb9e517bbe95d9da5 WHIRLPOOL 9649cb0bd5c17947fc7ad11a956ff63eb32045f006aa56880c18349e6a49b05244647a55ad5aa59728ab5990f9ca1465c6abc2685ad7dba4b8f5b660f5eec5ea
 DIST thunderbird-bin_x86_64-17.0.5.tar.bz2 25986322 SHA256 a715ed8d694c5df39cec0387dd8a64e07de484f995c5213882bb9e336b3a917b SHA512 fefb1bfd2689811cf3abae70217171ca74a370e0681c10bb67035dfade60e73ee993fafe4cab98c9b6b5a7ab05c6ea80486299e96d8426c206bd02d4691b1cf0 WHIRLPOOL 4d365c9de3aa52bff976d4ad135d9d4e4528eb3a49d63da8810b9523af8a9f491dc02b89cdc13e70c24192892ca69f78627546a831f2921692a74b461b22966d
-EBUILD thunderbird-bin-17.0.5.ebuild 3470 SHA256 fdf9d597729f1fe8627aa5dffb72f9b5f366ba1d2618ae68d8db0438235470c0 SHA512 3fa424d89589fe12d60ad1ceb2b2f9544a49252601242f65bc2b13e6dbadb6e2aa412c406a62024918e4ed50287e980a50fd22451fcdc73bbe421545ea666924 WHIRLPOOL 95e93929f80752ead27b47cebef1ad4dabfaf43b7c84902c6b0325fe9c9e8abe71b97587e047f95079b644a02cc2c7f6cda4439180466094fa2f22ee7cd8d598
-MISC ChangeLog 43521 SHA256 a6384960924237d785b2c56dcac0319f47783a657ac50c93a3d557cfe1d1fbf6 SHA512 1d20985b3df3e0a16742d2f607f681003b3de5c6db70c3d9a227df50a1ef4ebee2a8144f950dca35780f0758862e975eda85bfb7fb38d21165ed1ef1538a8023 WHIRLPOOL 31f6fd8230557db0cd9bccbc58288daad82ca57866abbe8ec07a2f93d62030691bfc09e57f937cba6a84dddd42bc3a23cc1413db1021a98765d9adb8148eaae5
+EBUILD thunderbird-bin-17.0.5.ebuild 3595 SHA256 4925c82d3232da5b2731ec247fda0bdd4ad5c5db8f7edc250697d4f8ebf87d88 SHA512 27c45b826dc1d40ea36c91691233deca632c69d591523ec87c473ddf11c900f5fa805a76a447db45ba1834e5a7c4fe268141f4f00767ee0075e858719d38ac6e WHIRLPOOL b6120e5c4e2763244e73f3294dce9d205de348ec26b0314ade4963ddbfec0645adf1790f1574914179893de76229f54a2e6fe8d0dcffe0ddecfd9d89f419c7fd
+MISC ChangeLog 43650 SHA256 f1abcd8611fc9f35c45b9a8dc9da311603efad7bb02a2e6fdcc19f59433b553c SHA512 c7f6b3dfc52c557f837fcc367b4a730464e6689f9335cfe7a4651d85698b22f19c353bfd0416f8120496dc93c4c15b8da7079d131d4610b7cd1cfe1ebe63836a WHIRLPOOL de2bf472ab55008c5d113935c2e0017a3da9fe8cc35822acde8b5df708d7e46887e6b8bb44640602aca89bdacc4dc744b601bb85794e5260104d6266f4c31be2
 MISC metadata.xml 239 SHA256 7dc1b4cbb0d49bbe877f0978fc8cd278614f95982a4375336dfb5b72e866efd0 SHA512 488c9dceab7a11cda355fbaafc63ead0e3496638d57a85d4207fc71f0389b8243a05132c21228b348fd90ff2c43a34bcde86b32b585860d0d80713e77c5242d2 WHIRLPOOL 059a17d7dc6e94d489369ceb520911a6cb751a0fd10a2793a1e548210c5c85d9a5817f0634e46c5799b789233a259a0a77ff9d38537869aabadc82499afba0c4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRZr/iAAoJEKXdFCfdEflKN48P/inm1kKg5fqI7bwvAkpRfkIv
-vY6RVUVczIgz4Wcf6Cq0LqW/CTePtk42TAfh6g40Ug56D3cxsS6y6E8H6+/yNHCD
-Ab9lq/EgaCttwL/IqCXyDJ2YXl94GIZ+/4624y5fm+u7wOwZNFJDN9uYYTq4Apws
-6UKLgKRjHYcwzlXYetHgLLUFcaIMPP7xmigH2VG2EN/m0U/DsVc/ZIB4ior4elEk
-fAx91QDaVArkanz1ylJ//88ZsgviVFPYwrbKp/EsnsGKu/XrC8woubv5Wxs2C6Cp
-RWtyDUfYRo1tMiQfrQC2+0V+N4NBb6Qjg0g3m9+ObUnUMNSDNVgCQXLMRsODeGe0
-nGYu2gflz6j8LmnfOU/taAv+qk0LOJ5OOZJlP/rFuSYAEuQtXw3/2L+CXWYuVs5a
-uVhUm5mrdvr3XCt3pPK1LgNC5v7MJD2vYAeNu7vN/voFRB6rM8QYHtppC12eebOW
-YfFBRR9F9zhCtuMBFnSB4QH93uOnQ/jqsUXJqDkW+n/4FspG7v1/Xg2Cs8XckDRI
-YP3FgFID+xAoRZdr8Aa8DhN30szGumPQukrQnwHOjEt5J4M25OMOkVfxL+e3XBly
-x5BvwzUr6VuEE4+bb9+5ML6oq+jTLs4fQkvj3F8XyBXA/IsS2hWPysRKO2ns5hMZ
-HCzKxmWQU5flWjZN/QxI
-=Q8Tq
+iQIcBAEBCgAGBQJRZsH7AAoJEKXdFCfdEflKmgMQALJEKVqVwplpU+LY7J94Iar/
+zZKf0Rbc8hqofi7vzCyt5BQtnrqQvw0A8Gq7uz+e3SDJZUPQzkiHzkh88Yv8Q9+B
+0bb6faDJDb0/br7FZYW9TkGYVhBZA9sa1x6TQWb3u0oZ8prVZ6wdBHe45G3IVGWe
++eCRrWcDJpctZ+H9Y0hhCveVW4oc8Y50YmJrwzB2d1/E+2aadrplpWmvtD7mO2b0
+P8yra0aqPw1nte+d1R3pjbifs/l51T5LL9t9E1xFx9IKKEpImAgYpwM18hfEYt2W
+wAlChl4RtK00ss1NGN22jVSk9qzPZvfaZAXcWYDUgei5x9EZlLmKGvgVNq1hRvwf
+qM+PY9lj3zqN07Yc4Xke1LMTTqNpkPFIRt80CyXh9Wco33g3luiS8XxcB2TnPPyJ
+Zu5ICjCWlh53Nnh8R+T4VJWzcBOOXvn7A2MEGrv8e6xEwHT0nzel4exat4/iqrFj
+FbtT/8rCG2NMPjtsi3dopoNJRsrSFnAY17B9mvLVWVTCRKgsASW5W9/1oSosjNV5
+LL12bLIeFhcPNqhDWy0/Cc0zmDOyHiVqiqEw3xQANrdxS2J2EQji24BJXQK6gy16
+8xi08DB3HCBDK4jUdDdC/2yJSvNC+EqXycxgoO3PF1dA2w82y8gfsoaFPApzW3SD
+Dp/LRV/d5sHnBVhJFSw/
+=7jp6
 -----END PGP SIGNATURE-----
diff --git a/mail-client/thunderbird-bin/thunderbird-bin-17.0.5.ebuild b/mail-client/thunderbird-bin/thunderbird-bin-17.0.5.ebuild
index 013a5d700c3c..111b5b6ed12c 100644
--- a/mail-client/thunderbird-bin/thunderbird-bin-17.0.5.ebuild
+++ b/mail-client/thunderbird-bin/thunderbird-bin-17.0.5.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-bin/thunderbird-bin-17.0.5.ebuild,v 1.7 2013/04/11 13:49:07 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird-bin/thunderbird-bin-17.0.5.ebuild,v 1.8 2013/04/11 13:58:09 zerochaos Exp $
 
 EAPI="5"
 MOZ_ESR="1"
@@ -33,7 +33,7 @@ SRC_URI="${SRC_URI}
 	amd64? ( ${MOZ_FTP_URI}/${MOZ_PV}/linux-x86_64/en-US/${MOZ_P}.tar.bz2 -> ${PN}_x86_64-${PV}.tar.bz2 )
 	x86? ( ${MOZ_FTP_URI}/${MOZ_PV}/linux-i686/en-US/${MOZ_P}.tar.bz2 -> ${PN}_i686-${PV}.tar.bz2 )"
 HOMEPAGE="http://www.mozilla.com/thunderbird"
-RESTRICT="strip mirror binchecks"
+RESTRICT="strip mirror"
 
 KEYWORDS="-* amd64 x86"
 SLOT="0"
@@ -54,6 +54,16 @@ RDEPEND="virtual/freedesktop-icon-theme
 	!net-libs/libproxy[spidermonkey]
 "
 
+QA_PREBUILT="
+	opt/${MOZ_PN}/*.so
+	opt/${MOZ_PN}/${MOZ_PN}
+	opt/${MOZ_PN}/${PN}
+	opt/${MOZ_PN}/crashreporter
+	opt/${MOZ_PN}/plugin-container
+	opt/${MOZ_PN}/mozilla-xremote-client
+	opt/${MOZ_PN}/updater
+"
+
 S="${WORKDIR}/${MOZ_PN}"
 
 src_unpack() {
@@ -66,18 +76,18 @@ src_unpack() {
 src_install() {
 	declare MOZILLA_FIVE_HOME="/opt/${MOZ_PN}"
 
-        local size sizes icon_path name
-        sizes="16 22 24 32 48 256"
-        icon_path="${S}/chrome/icons/default"
-        name="Thunderbird"
+	local size sizes icon_path name
+	sizes="16 22 24 32 48 256"
+	icon_path="${S}/chrome/icons/default"
+	name="Thunderbird"
 
-        # Install icons and .desktop for menu entry
-        for size in ${sizes}; do
+	# Install icons and .desktop for menu entry
+	for size in ${sizes}; do
 		newicon -s ${size} "${icon_path}/default${size}.png" "${PN}-icon.png"
-        done
-        # Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
-        newicon "${S}"/chrome/icons/default/default48.png ${PN}-icon.png
-        domenu "${FILESDIR}"/icon/${PN}.desktop
+	done
+	# Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
+	newicon "${S}"/chrome/icons/default/default48.png ${PN}-icon.png
+	domenu "${FILESDIR}"/icon/${PN}.desktop
 
 	# Install thunderbird in /opt
 	dodir ${MOZILLA_FIVE_HOME%/*}