From mboxrd@z Thu Jan 1 00:00:00 1970
Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org)
by finch.gentoo.org with esmtp (Exim 4.60)
(envelope-from <gentoo-commits+bounces-390344-garchives=archives.gentoo.org@lists.gentoo.org>)
id 1RCFte-0006wu-3y
for garchives@archives.gentoo.org; Fri, 07 Oct 2011 19:15:50 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id BCF5D21C164;
Fri, 7 Oct 2011 19:15:42 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
by pigeon.gentoo.org (Postfix) with ESMTP id 782CE21C164
for <gentoo-commits@lists.gentoo.org>; Fri, 7 Oct 2011 19:15:42 +0000 (UTC)
Received: from pelican.gentoo.org (unknown [66.219.59.40])
(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id B01461B400A
for <gentoo-commits@lists.gentoo.org>; Fri, 7 Oct 2011 19:15:41 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by pelican.gentoo.org (Postfix) with ESMTP id 126EE80042
for <gentoo-commits@lists.gentoo.org>; Fri, 7 Oct 2011 19:15:41 +0000 (UTC)
From: "Nirbheek Chauhan" <nirbheek@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Nirbheek Chauhan" <nirbheek@gentoo.org>
Message-ID: <e6e89b4988eada7d26e7cb32f60bb79ebab43b15.nirbheek@gentoo>
Subject: [gentoo-commits] proj/mozilla:master commit in: mail-client/thunderbird/
X-VCS-Repository: proj/mozilla
X-VCS-Files: mail-client/thunderbird/Manifest mail-client/thunderbird/thunderbird-7.0.1-r1.ebuild
X-VCS-Directories: mail-client/thunderbird/
X-VCS-Committer: nirbheek
X-VCS-Committer-Name: Nirbheek Chauhan
X-VCS-Revision: e6e89b4988eada7d26e7cb32f60bb79ebab43b15
Date: Fri, 7 Oct 2011 19:15:41 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt:
X-Archives-Hash: 94edc97a0f3ed9d8690462ed857cbef1
commit: e6e89b4988eada7d26e7cb32f60bb79ebab43b15
Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 7 19:12:35 2011 +0000
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Fri Oct 7 19:14:56 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/mozilla.git;a=
=3Dcommit;h=3De6e89b49
thunderbird: add calendar to mimetype and categories, reuse emid
---
mail-client/thunderbird/Manifest | 2 +-
.../thunderbird/thunderbird-7.0.1-r1.ebuild | 46 +++++++++++---=
------
2 files changed, 26 insertions(+), 22 deletions(-)
diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/M=
anifest
index 219252f..39b0dee 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -41,4 +41,4 @@ DIST thunderbird-7.0.1-tr.xpi 403127 RMD160 50dbfd65e13=
f604d0d88dc8c675fec9b36ba
DIST thunderbird-7.0.1-uk.xpi 454368 RMD160 a3f00a485bd9236a02b466f34f1d=
0634df8a4499 SHA1 09163cc5347c1baf0c0b475a2c0b7b4a779f60a2 SHA256 b2d7ab6=
7be708e4f3ed02d0701748c027250491f9aa41a0f60d150cd8fb41466
DIST thunderbird-7.0.1-zh-TW.xpi 420847 RMD160 95095a3f45c4dd38983d9e5d9=
b6087e57600564e SHA1 defbc32b529699297e8f58642d0530ab2ee0d609 SHA256 7362=
f1cc5541006c06f1373d1cd90a4c04d496b5b79443524af7d1654a73d668
DIST thunderbird-7.0.1.source.tar.bz2 87405591 RMD160 04d39464b5c7c3128a=
00b0eaff806b3307e0a22e SHA1 ccfc6fe3fe4ad07b214e20bc440d20e14d3ffbe5 SHA2=
56 83f578bbfa0cb5d0f7faba6214993806050fab3e2039996344a11c9457525242
-EBUILD thunderbird-7.0.1-r1.ebuild 8850 RMD160 28d8b4b1bfb9335ecaf4e60a5=
d3c24774871a9ea SHA1 a08b50cad22859c3a5603506a2f53351c600d282 SHA256 c843=
c0bb86cd469df6956496ee4d4651bcd033b171f652a75da36a862174af18
+EBUILD thunderbird-7.0.1-r1.ebuild 9113 RMD160 947f0aaa4531a2a46462d5ff4=
0274dd17134ca40 SHA1 435a9f6ae879ee673e249b1840ef24b702e567bc SHA256 de81=
2de615d7514f89d154709440f8b531d7eae15311e11a41135b7b7c2a0821
diff --git a/mail-client/thunderbird/thunderbird-7.0.1-r1.ebuild b/mail-c=
lient/thunderbird/thunderbird-7.0.1-r1.ebuild
index 9d68c29..0aa2b3e 100644
--- a/mail-client/thunderbird/thunderbird-7.0.1-r1.ebuild
+++ b/mail-client/thunderbird/thunderbird-7.0.1-r1.ebuild
@@ -239,9 +239,22 @@ src_compile() {
=20
src_install() {
declare MOZILLA_FIVE_HOME=3D"/usr/$(get_libdir)/${PN}"
+ declare emid
=20
emake DESTDIR=3D"${D}" install || die "emake install failed"
=20
+ if ! use bindist; then
+ newicon "${S}"/other-licenses/branding/thunderbird/content/icon48.png =
thunderbird-icon.png
+ domenu "${FILESDIR}"/icon/${PN}.desktop
+ else
+ newicon "${S}"/mail/branding/unofficial/content/icon48.png thunderbird=
-icon-unbranded.png
+ newmenu "${FILESDIR}"/icon/${PN}-unbranded.desktop \
+ ${PN}.desktop
+
+ sed -i -e "s:Mozilla\ Thunderbird:Lanikai:g" \
+ "${ED}"/usr/share/applications/${PN}.desktop
+ fi
+
if use crypt ; then
cd "${T}" || die
unzip "${S}"/mozilla/dist/bin/enigmail*.xpi install.rdf || die
@@ -253,22 +266,26 @@ src_install() {
fi
=20
if use lightning ; then
- declare emid emd1 emid2
-
emid=3D"{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}"
dodir ${MOZILLA_FIVE_HOME}/extensions/${emid}
cd "${ED}"${MOZILLA_FIVE_HOME}/extensions/${emid}
unzip "${S}"/mozilla/dist/xpi-stage/gdata-provider.xpi
=20
- emid1=3D"calendar-timezones@mozilla.org"
- dodir ${MOZILLA_FIVE_HOME}/extensions/${emid1}
- cd "${ED}"${MOZILLA_FIVE_HOME}/extensions/${emid1}
+ emid=3D"calendar-timezones@mozilla.org"
+ dodir ${MOZILLA_FIVE_HOME}/extensions/${emid}
+ cd "${ED}"${MOZILLA_FIVE_HOME}/extensions/${emid}
unzip "${S}"/mozilla/dist/xpi-stage/calendar-timezones.xpi
=20
- emid2=3D"{e2fda1a4-762b-4020-b5ad-a41df1933103}"
- dodir ${MOZILLA_FIVE_HOME}/extensions/${emid2}
- cd "${ED}"${MOZILLA_FIVE_HOME}/extensions/${emid2}
+ emid=3D"{e2fda1a4-762b-4020-b5ad-a41df1933103}"
+ dodir ${MOZILLA_FIVE_HOME}/extensions/${emid}
+ cd "${ED}"${MOZILLA_FIVE_HOME}/extensions/${emid}
unzip "${S}"/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
+ sed -e "s:^\(MimeType=3D\):\1text/calendar;:" \
+ -e "s:^\(Categories=3D\):\1Calendar;:" \
+ -i "${ED}"/usr/share/applications/${PN}.desktop
fi
=20
if ! [[ ${PV} =3D~ alpha|beta ]]; then
@@ -278,19 +295,6 @@ src_install() {
done
fi
=20
- if ! use bindist; then
- newicon "${S}"/other-licenses/branding/thunderbird/content/icon48.png =
thunderbird-icon.png
- domenu "${FILESDIR}"/icon/${PN}.desktop
- else
- newicon "${S}"/mail/branding/unofficial/content/icon48.png thunderbird=
-icon-unbranded.png
- newmenu "${FILESDIR}"/icon/${PN}-unbranded.desktop \
- ${PN}.desktop
-
- sed -i -e "s:Mozilla\ Thunderbird:Lanikai:g" \
- "${D}"/usr/share/applications/${PN}.desktop
-
- fi
-
pax-mark m "${ED}"/${MOZILLA_FIVE_HOME}/thunderbird-bin
=20
# Enable very specific settings for thunderbird-3