public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in mail-client/thunderbird: ChangeLog thunderbird-7.0.1-r1.ebuild
@ 2011-11-13 14:46 Markus Meier (maekke)
  0 siblings, 0 replies; 3+ messages in thread
From: Markus Meier (maekke) @ 2011-11-13 14:46 UTC (permalink / raw
  To: gentoo-commits

maekke      11/11/13 14:46:32

  Modified:             ChangeLog thunderbird-7.0.1-r1.ebuild
  Log:
  x86 stable, bug #381245
  
  (Portage version: 2.1.10.34/cvs/Linux x86_64)

Revision  Changes    Path
1.102                mail-client/thunderbird/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/thunderbird/ChangeLog?rev=1.102&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/thunderbird/ChangeLog?rev=1.102&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/thunderbird/ChangeLog?r1=1.101&r2=1.102

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/mail-client/thunderbird/ChangeLog,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- ChangeLog	11 Nov 2011 23:40:14 -0000	1.101
+++ ChangeLog	13 Nov 2011 14:46:32 -0000	1.102
@@ -1,6 +1,9 @@
 # ChangeLog for mail-client/thunderbird
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/ChangeLog,v 1.101 2011/11/11 23:40:14 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/ChangeLog,v 1.102 2011/11/13 14:46:32 maekke Exp $
+
+  13 Nov 2011; Markus Meier <maekke@gentoo.org> thunderbird-7.0.1-r1.ebuild:
+  x86 stable, bug #381245
 
   11 Nov 2011; Jory A. Pratt <anarchy@gentoo.org>
   +files/enigmail-1.3.3-bug373733.patch, thunderbird-8.0.ebuild:



1.5                  mail-client/thunderbird/thunderbird-7.0.1-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/thunderbird/thunderbird-7.0.1-r1.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/thunderbird/thunderbird-7.0.1-r1.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/thunderbird/thunderbird-7.0.1-r1.ebuild?r1=1.4&r2=1.5

Index: thunderbird-7.0.1-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/mail-client/thunderbird/thunderbird-7.0.1-r1.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- thunderbird-7.0.1-r1.ebuild	28 Oct 2011 08:44:36 -0000	1.4
+++ thunderbird-7.0.1-r1.ebuild	13 Nov 2011 14:46:32 -0000	1.5
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/thunderbird-7.0.1-r1.ebuild,v 1.4 2011/10/28 08:44:36 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/thunderbird-7.0.1-r1.ebuild,v 1.5 2011/11/13 14:46:32 maekke Exp $
 
 EAPI="3"
 WANT_AUTOCONF="2.1"
@@ -14,7 +14,7 @@
 DESCRIPTION="Thunderbird Mail Client"
 HOMEPAGE="http://www.mozilla.com/en-US/thunderbird/"
 
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 SLOT="0"
 LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
 IUSE="bindist gconf +crashreporter +crypt +ipc +lightning mozdom"






^ permalink raw reply	[flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in mail-client/thunderbird: ChangeLog thunderbird-7.0.1-r1.ebuild
@ 2011-10-28  8:44 Tony Vroon (chainsaw)
  0 siblings, 0 replies; 3+ messages in thread
From: Tony Vroon (chainsaw) @ 2011-10-28  8:44 UTC (permalink / raw
  To: gentoo-commits

chainsaw    11/10/28 08:44:36

  Modified:             ChangeLog thunderbird-7.0.1-r1.ebuild
  Log:
  Marked stable on AMD64 based on arch testing by Elijah "Armageddon" El Lazkani & Agostino "ago" Sarubbo in security bug #381245.
  
  (Portage version: 2.1.10.31/cvs/Linux x86_64)

Revision  Changes    Path
1.99                 mail-client/thunderbird/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/thunderbird/ChangeLog?rev=1.99&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/thunderbird/ChangeLog?rev=1.99&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/thunderbird/ChangeLog?r1=1.98&r2=1.99

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/mail-client/thunderbird/ChangeLog,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- ChangeLog	7 Oct 2011 19:20:11 -0000	1.98
+++ ChangeLog	28 Oct 2011 08:44:36 -0000	1.99
@@ -1,6 +1,10 @@
 # ChangeLog for mail-client/thunderbird
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/ChangeLog,v 1.98 2011/10/07 19:20:11 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/ChangeLog,v 1.99 2011/10/28 08:44:36 chainsaw Exp $
+
+  28 Oct 2011; Tony Vroon <chainsaw@gentoo.org> thunderbird-7.0.1-r1.ebuild:
+  Marked stable on AMD64 based on arch testing by Elijah "Armageddon" El
+  Lazkani & Agostino "ago" Sarubbo in security bug #381245.
 
   07 Oct 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
   thunderbird-7.0.1-r1.ebuild:



1.4                  mail-client/thunderbird/thunderbird-7.0.1-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/thunderbird/thunderbird-7.0.1-r1.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/thunderbird/thunderbird-7.0.1-r1.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/thunderbird/thunderbird-7.0.1-r1.ebuild?r1=1.3&r2=1.4

Index: thunderbird-7.0.1-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/mail-client/thunderbird/thunderbird-7.0.1-r1.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- thunderbird-7.0.1-r1.ebuild	7 Oct 2011 19:20:11 -0000	1.3
+++ thunderbird-7.0.1-r1.ebuild	28 Oct 2011 08:44:36 -0000	1.4
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/thunderbird-7.0.1-r1.ebuild,v 1.3 2011/10/07 19:20:11 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/thunderbird-7.0.1-r1.ebuild,v 1.4 2011/10/28 08:44:36 chainsaw Exp $
 
 EAPI="3"
 WANT_AUTOCONF="2.1"
@@ -14,7 +14,7 @@
 DESCRIPTION="Thunderbird Mail Client"
 HOMEPAGE="http://www.mozilla.com/en-US/thunderbird/"
 
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 SLOT="0"
 LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
 IUSE="bindist gconf +crashreporter +crypt +ipc +lightning mozdom"






^ permalink raw reply	[flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in mail-client/thunderbird: ChangeLog thunderbird-7.0.1-r1.ebuild
@ 2011-10-07 19:20 Nirbheek Chauhan (nirbheek)
  0 siblings, 0 replies; 3+ messages in thread
From: Nirbheek Chauhan (nirbheek) @ 2011-10-07 19:20 UTC (permalink / raw
  To: gentoo-commits

nirbheek    11/10/07 19:20:11

  Modified:             ChangeLog thunderbird-7.0.1-r1.ebuild
  Log:
  Add calendar to mimetype and categories, reuse emid in ebuild logic
  
  (Portage version: 2.2.0_alpha51/cvs/Linux x86_64)

Revision  Changes    Path
1.98                 mail-client/thunderbird/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/thunderbird/ChangeLog?rev=1.98&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/thunderbird/ChangeLog?rev=1.98&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/thunderbird/ChangeLog?r1=1.97&r2=1.98

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/mail-client/thunderbird/ChangeLog,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- ChangeLog	3 Oct 2011 00:02:43 -0000	1.97
+++ ChangeLog	7 Oct 2011 19:20:11 -0000	1.98
@@ -1,6 +1,10 @@
 # ChangeLog for mail-client/thunderbird
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/ChangeLog,v 1.97 2011/10/03 00:02:43 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/ChangeLog,v 1.98 2011/10/07 19:20:11 nirbheek Exp $
+
+  07 Oct 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
+  thunderbird-7.0.1-r1.ebuild:
+  Add calendar to mimetype and categories, reuse emid in ebuild logic
 
 *thunderbird-7.0.1-r1 (03 Oct 2011)
 



1.3                  mail-client/thunderbird/thunderbird-7.0.1-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/thunderbird/thunderbird-7.0.1-r1.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/thunderbird/thunderbird-7.0.1-r1.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/thunderbird/thunderbird-7.0.1-r1.ebuild?r1=1.2&r2=1.3

Index: thunderbird-7.0.1-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/mail-client/thunderbird/thunderbird-7.0.1-r1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- thunderbird-7.0.1-r1.ebuild	3 Oct 2011 07:30:11 -0000	1.2
+++ thunderbird-7.0.1-r1.ebuild	7 Oct 2011 19:20:11 -0000	1.3
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/thunderbird-7.0.1-r1.ebuild,v 1.2 2011/10/03 07:30:11 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/thunderbird-7.0.1-r1.ebuild,v 1.3 2011/10/07 19:20:11 nirbheek Exp $
 
 EAPI="3"
 WANT_AUTOCONF="2.1"
@@ -110,7 +110,6 @@
 	# Ensure we have enough disk space to compile
 	CHECKREQS_DISK_BUILD="4G"
 	check-reqs_pkg_setup
-
 }
 
 src_unpack() {
@@ -239,9 +238,22 @@
 
 src_install() {
 	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+	declare emid
 
 	emake DESTDIR="${D}" install || die "emake install failed"
 
+	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 +265,26 @@
 	fi
 
 	if use lightning ; then
-		declare emid emd1 emid2
-
 		emid="{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
 
-		emid1="calendar-timezones@mozilla.org"
-		dodir ${MOZILLA_FIVE_HOME}/extensions/${emid1}
-		cd "${ED}"${MOZILLA_FIVE_HOME}/extensions/${emid1}
+		emid="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
 
-		emid2="{e2fda1a4-762b-4020-b5ad-a41df1933103}"
-		dodir ${MOZILLA_FIVE_HOME}/extensions/${emid2}
-		cd "${ED}"${MOZILLA_FIVE_HOME}/extensions/${emid2}
+		emid="{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=\):\1text/calendar;:" \
+			-e "s:^\(Categories=\):\1Calendar;:" \
+			-i "${ED}"/usr/share/applications/${PN}.desktop
 	fi
 
 	if ! [[ ${PV} =~ alpha|beta ]]; then
@@ -278,19 +294,6 @@
 		done
 	fi
 
-	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
 
 	# Enable very specific settings for thunderbird-3






^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2011-11-13 14:46 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-11-13 14:46 [gentoo-commits] gentoo-x86 commit in mail-client/thunderbird: ChangeLog thunderbird-7.0.1-r1.ebuild Markus Meier (maekke)
  -- strict thread matches above, loose matches on Subject: below --
2011-10-28  8:44 Tony Vroon (chainsaw)
2011-10-07 19:20 Nirbheek Chauhan (nirbheek)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox