From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 415011381F3 for ; Wed, 25 Sep 2013 00:07:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EE1C9E0C33; Wed, 25 Sep 2013 00:07:14 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 722AFE0C33 for ; Wed, 25 Sep 2013 00:07:14 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3F2E233DF72 for ; Wed, 25 Sep 2013 00:07:13 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id E70C6E5309 for ; Wed, 25 Sep 2013 00:07:11 +0000 (UTC) From: "Jory Pratt" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jory Pratt" Message-ID: <1380067576.20b849770e7e4daaa63170d7c61db00ed96a19af.anarchy@gentoo> Subject: [gentoo-commits] proj/mozilla:master commit in: mail-client/thunderbird/ X-VCS-Repository: proj/mozilla X-VCS-Files: mail-client/thunderbird/thunderbird-24.0.ebuild X-VCS-Directories: mail-client/thunderbird/ X-VCS-Committer: anarchy X-VCS-Committer-Name: Jory Pratt X-VCS-Revision: 20b849770e7e4daaa63170d7c61db00ed96a19af X-VCS-Branch: master Date: Wed, 25 Sep 2013 00:07:11 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 8a057a22-8228-4bc3-8391-9bbc8cc1b31f X-Archives-Hash: c158c9bf1afccff592506eaa74ac58cf commit: 20b849770e7e4daaa63170d7c61db00ed96a19af Author: Jory A. Pratt gentoo org> AuthorDate: Wed Sep 25 00:06:16 2013 +0000 Commit: Jory Pratt gentoo org> CommitDate: Wed Sep 25 00:06:16 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=20b84977 Fix bugs #485866,485858 --- mail-client/thunderbird/thunderbird-24.0.ebuild | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/mail-client/thunderbird/thunderbird-24.0.ebuild b/mail-client/thunderbird/thunderbird-24.0.ebuild index 35e15d7..4bdf8d3 100644 --- a/mail-client/thunderbird/thunderbird-24.0.ebuild +++ b/mail-client/thunderbird/thunderbird-24.0.ebuild @@ -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"