Fix bug #485866,485858

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

3 files changed, 22 insertions, 24 deletions

diff --git a/mail-client/thunderbird/ChangeLog b/mail-client/thunderbird/ChangeLog
index de22fa9991dd..8c007ba4832f 100644
--- a/mail-client/thunderbird/ChangeLog
+++ b/mail-client/thunderbird/ChangeLog
@@ -1,6 +1,12 @@
 # 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.244 2013/09/24 22:45:02 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/ChangeLog,v 1.245 2013/09/25 02:17:37 anarchy Exp $
+
+*thunderbird-24.0-r1 (25 Sep 2013)
+
+  25 Sep 2013; Jory A. Pratt <anarchy@gentoo.org> +thunderbird-24.0-r1.ebuild,
+  -thunderbird-24.0.ebuild:
+  Fix bug #485866,485858
 
   24 Sep 2013; Jory A. Pratt <anarchy@gentoo.org> thunderbird-24.0.ebuild:
   Remove methodjit/tracejit configure option, obsolete
diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index 7fb0172c32b3..b3f5134d0478 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -177,17 +177,17 @@ DIST thunderbird-24.0-zh-TW.xpi 450000 SHA256 a0c8877af5dfd9b7b3add1626e3fa01dda
 DIST thunderbird-24.0.source.tar.bz2 140334722 SHA256 60a1abde987a61c8096e431f13df2ba2cf188a22fdbf1712aaec795b302a5ff5 SHA512 5de3333b65be89cba1a2a0fa8ef24142bacc29e66ab2f83b705e0496aa298dd6c990049640471c51642f0fd9a857b6e5bba11282296bf548c89f8e667b05d7ee WHIRLPOOL 48398e670f9d04b50989bae69d976587ffafe8bf29ef72acba6c6794afaac788bb0899fe8630d95599827c963b34f8e30b1d92d988c73cdd8e85f57625ab1161
 EBUILD thunderbird-17.0.8.ebuild 10994 SHA256 ebf4bfe7e0c3b5eb1623a6b32539e5651aea8e6ff12b7692a26d88ef426fdf30 SHA512 604a1c63d308403880b6900c56c2eedf28c1c6e4f20bff5ca6eedb8c233fb8baa4864d16311ca96ac8b19e4d1f0b38eafd77fce142f4b7e4b1157fdce2a075ca WHIRLPOOL f7e2cd92c214ca10301cdf94ea088aabb8b0b40f79ed714d03420b2b1dbbcfedccf986c928240a39c7b5fd822ecf66d7d44a493d6d38e0123c9d736acebfd631
 EBUILD thunderbird-17.0.9.ebuild 11160 SHA256 1c0e4000a12ac729275cd22ae5873d892cbee9850699536267f564dc6d9fb653 SHA512 30fb8a5bb31d7b8335e716bb157b65ae1b0d68e01425af9b507fedbd44e0a071371e171d556c34e793a3fdd7ff077f3a74b08e131d356ad2c0c0525e7bf9c794 WHIRLPOOL 87cd21a3297a745fa6035ac08b8ecd66083d0f97fd37a59eb365d06687a5d0de97c41ab26a4d939aff4ddbddf65bb39952036fd1677bcdcb30f1e5c873320638
-EBUILD thunderbird-24.0.ebuild 11318 SHA256 ffdc5818d2fb7f2d44fccd838287353e249b7c51577e732da735b19c130d96da SHA512 630e5d7ab095db95dadc2f734d5a2154b46f3742173c5e4d79097ff04b6a36af42d77f443f09927b2c15c671d171b8ea44353cc13e13e37bc299c41adc584ab5 WHIRLPOOL 4299b81c32ee0e52c7a33d458816db3fcbd4e4f01297b609a96a912dc9d72a78ab7a6b7aa725c1d4d1f458314113c28ee2f6186f1c25c9bfab7eac6dac10830a
-MISC ChangeLog 87828 SHA256 f38ebcb81c09197558a6e10d1c8279e015255bec45e3409490478124d30ee559 SHA512 092e6da766de27a27ca2d88d94be72fbe91f8a48c839646deb2452e6c1e2d38ed1eb9d385af4dd3d01ffd98db45ea63d3aec06b5a10e7aa75b7cec82fec6b31f WHIRLPOOL 21eaad27d0a33588c5c2c696337e053d30f535d95d19f8c20f041bc547fb7bb9d1c195d8851576d2d498258e6751ae5ce11471ab95172bb04bd3d18e1df38493
+EBUILD thunderbird-24.0-r1.ebuild 11077 SHA256 e93388c150b456f7a114acd3d8bf4e93e7cbcf89c555d8d1a32c15829cb04c87 SHA512 f5dee43f86f4d98a98171599492a69ba697970f9c6f681533ce19dcef86c38a455a0c3cb9c07682a317974d07c5fe83ec8bd9039854b029331333ec98f574557 WHIRLPOOL dace79479d93ddb9669efbf0778df5c71d38e398307748fd33ea31db13c013f63e5238cbe08a8bcd452347a698d5d08c964fcf35c34b0b2f372314b531ed8d4a
+MISC ChangeLog 87997 SHA256 817f354a578501bdaa3f09eb4f448bf8d5c672747f4a24679a9abd697f5a773b SHA512 15177bf060b5c439205b11ac6038a982eafd3a0573fbb9854425d0f1d82770e0aa5b45e49b630eb13e7b75c5f2a38d44386e3bacdca1aac8b31606da3932ebe5 WHIRLPOOL 68d970ba97417f67b407a3cd4ed1e5b91cef97e78ee60fa60650da777d8ae918ae24df6cc1f68aa0c4c27fed4d686f5bbacb728a5fc0a9ce226248d05ac0e150
 MISC metadata.xml 1308 SHA256 cd7f5c6937738ef5858a409ea3186bdea6a6d27f8e338ff12ca9019a24dc6111 SHA512 0cffc220689a5ecb7a9021c782cdd1ff826b160d48f886878922f9df84241018a36f7091c21e503246a1689d1bac8f6da0ff64743263db348df52d08f00ba82a WHIRLPOOL 1802f00f70287a79a6b25ba0d40b92446db1be73a1788326863a7c8c13f4995ef9eb875431a459f2eb5bbc574276676fc50305c508f56c46417719037be5d670
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.21 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSQhXbAAoJEKDMw7q00Ii0vhcIAJ/Trdxuiujjnr87kOFt0NCR
-JnbSKYE3Ft2lNKTNfnC2MHELZSzcSXaAmLXGBB2gOH/UkQBGPQbY/HBBpSI7c3Ji
-6SGd6aQ9Bqx/PjZ3c3S3qfunMqCwOaJH1iVi3EB/lnk/lpv6MCillwgcBDObRpcY
-yTnZ/wn2WJZMo1M6zGCaSiLf4Ci9DvFiAhKGsIeNsaeniPETeHfykzAjBpopDA5F
-HmJgBG4xZf8IDfhhkg3Y0M4JuiNdj+u9Ydm6q5/RkcTpz24Harox/o4DS6mH4KMH
-xFbxUj29eXgO7gE/9ea5C2spt5eDzWvQy4KBxImopw0kjDot/kTIMl30zb8NoKc=
-=8Oya
+iQEcBAEBCAAGBQJSQkewAAoJEKDMw7q00Ii0fiIIAJ7GUt7zkctjFFhQbjK8iReg
+LkhBG9IZhaxjqCaLFZZmJ0YuqbicQAQaD7a4wsQUwTNoBlObXEmmiBHlGEBGxfyv
+bMSWT6o163pXEENIE9iBd0pfXi9QpKYg5QwCNKHZ0RwLxDIh9jthIyeVnLfGTP4Q
+ket7Q/lq/xDCdJS8mVXK7CBb+Jq6wYzhjkhMXStLN7RuMaSq04x2rOSP6ODRtz4v
+TTjOSWqQrDDf7B0hNnmkYa3XYeweT3BmmohPnQQuvL79b7KRnqJApBsqZGfN4vgz
+kzvG/HlCt7AanP9ewvQqlqe9VsnFaHeHsvnZv+Z4unnPeyFrZZ96JJX0+dvU/pI=
+=mweP
 -----END PGP SIGNATURE-----
diff --git a/mail-client/thunderbird/thunderbird-24.0.ebuild b/mail-client/thunderbird/thunderbird-24.0-r1.ebuild
index 7f8d4ebffcd1..6b9a57f519d6 100644
--- a/mail-client/thunderbird/thunderbird-24.0.ebuild
+++ b/mail-client/thunderbird/thunderbird-24.0-r1.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.0.ebuild,v 1.2 2013/09/24 22:45:02 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/thunderbird-24.0-r1.ebuild,v 1.1 2013/09/25 02:17:37 anarchy Exp $
 
 EAPI="3"
 WANT_AUTOCONF="2.1"
@@ -51,7 +51,7 @@ SRC_URI="${SRC_URI}
 
 ASM_DEPEND=">=dev-lang/yasm-1.1"
 
-RDEPEND="
+RDEPEND="	
 	>=sys-devel/binutils-2.16.1
 	>=dev-libs/nss-3.15.1
 	>=dev-libs/nspr-4.10
@@ -277,7 +277,7 @@ src_install() {
 		>> "${S}/${obj_dir}/mozilla/dist/bin/defaults/pref/all-gentoo.js" || die
 
 	# Pax mark xpcshell for hardened support, only used for startupcache creation.
-		pax-mark m "${S}"/${obj_dir}/mozilla/dist/bin/xpcshell
+	pax-mark m "${S}"/${obj_dir}/mozilla/dist/bin/xpcshell
 
 	MOZ_MAKE_FLAGS="${MAKEOPTS}" \
 	emake DESTDIR="${D}" install || die "emake install failed"
@@ -308,20 +308,15 @@ src_install() {
 	fi
 
 	if use lightning ; then
-		emid="{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}"
+		emid="{3550f703-e582-4d05-9a08-453d09bdfdc6}"
 		dodir ${MOZILLA_FIVE_HOME}/extensions/${emid}
 		cd "${ED}"${MOZILLA_FIVE_HOME}/extensions/${emid}
-		unzip "${S}"/${obj_dir}/mozilla/dist/xpi-stage/gdata-provider.xpi
-
-		emid="calendar-timezones@mozilla.org"
-		dodir ${MOZILLA_FIVE_HOME}/extensions/${emid}
-		cd "${ED}"${MOZILLA_FIVE_HOME}/extensions/${emid}
-		unzip "${S}"/${obj_dir}/mozilla/dist/xpi-stage/calendar-timezones.xpi
+		unzip "${S}"/${obj_dir}/mozilla/dist/xpi-stage/gdata-provider-*.xpi
 
 		emid="{e2fda1a4-762b-4020-b5ad-a41df1933103}"
 		dodir ${MOZILLA_FIVE_HOME}/extensions/${emid}
 		cd "${ED}"${MOZILLA_FIVE_HOME}/extensions/${emid}
-		unzip "${S}"/${obj_dir}/mozilla/dist/xpi-stage/lightning.xpi
+		unzip "${S}"/${obj_dir}/mozilla/dist/xpi-stage/lightning-*.xpi
 
 		# Fix mimetype so it shows up as a calendar application in GNOME 3
 		# This requires that the .desktop file was already installed earlier
@@ -336,9 +331,6 @@ src_install() {
 	# continue to work as expected.
 	pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/plugin-container
 
-	# Plugins dir
-	share_plugins_dir
-
 	if use minimal; then
 		rm -rf "${ED}"/usr/include "${ED}"${MOZILLA_FIVE_HOME}/{idl,include,lib,sdk} || \
 			die "Failed to remove sdk and headers"