Add calendar to mimetype and categories, reuse emid in ebuild logic

Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64

3 files changed, 53 insertions, 26 deletions

diff --git a/mail-client/thunderbird/ChangeLog b/mail-client/thunderbird/ChangeLog
index 906b93643e2b..5048afd6e039 100644
--- a/mail-client/thunderbird/ChangeLog
+++ b/mail-client/thunderbird/ChangeLog
@@ -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)
 
diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index dcd0e7eee8c4..cb557a472724 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 1001-xulrunner_fix_jemalloc_vs_aslr.patch 1936 RMD160 4edd9e5ab5082f86cb66ad1fc158e4c105f861ce SHA1 20df285bac8e0704559c0479f7dfe02f030afa8a SHA256 0beb08f2b3fc504897b1024caabcf2887b55fae31c021341c66d3491dc63e32b
 AUX 1002_fix-system-hunspell-dict-detections.patch 3466 RMD160 f8fa846e5d7c80a15d0abf0c6aedb7302ead1f83 SHA1 091febd913c09c86c9242b1be8960fb012ee7c8d SHA256 7ce51cae6bbd6655c8bc543365370627e37d2fc5aa7f7e1270671f7482df344a
 AUX 2000-thunderbird_gentoo_install_dirs.patch 813 RMD160 802697aab947df43693d7330f5d83700a62a6b50 SHA1 d2621bc80130239d7d65562ce8de8488dcbf60e2 SHA256 f663f3e59ac1752d681ed5d09bd599693009a65f603c89fa6d2e851b3487a8c4
@@ -199,6 +202,23 @@ DIST thunderbird-7.0.1.source.tar.bz2 87405591 RMD160 04d39464b5c7c3128a00b0eaff
 EBUILD thunderbird-3.1.12.ebuild 8098 RMD160 738570bba05f5b2c8e87aeb765acc1159075f6dd SHA1 4a338ecb561b992ab9eb07eccff8fef66190be62 SHA256 358d9dc0abdaf153609110c32236c255f8d1680499d5b21a88373946471da1ca
 EBUILD thunderbird-3.1.13.ebuild 8110 RMD160 e38bcc178fdb3a37e049f40eec24688fa67a6167 SHA1 41f4aa135e7f8e9830c9faf00879cfc0b04d17f9 SHA256 7422b283e991b58950fb84c0e09920e0b0236617df8f9eef2e07a4c8bde2f429
 EBUILD thunderbird-3.1.14.ebuild 8110 RMD160 f50c19f939b81b9ee4c0a68dbb0ebf50386ec0d3 SHA1 bbfe47a8ec85f9d7fbcbd193d8f2db8c49a23256 SHA256 aa0a28a177630cf332f3c4f242506db2dfceb9370b9d69e66c9c5ab74acc7ae1
-EBUILD thunderbird-7.0.1-r1.ebuild 8856 RMD160 74c9b2ff56780f8598a515ff706f0246989a7f53 SHA1 4eb17b782886b6fbdfac653dfcc695668b7f4475 SHA256 ce22f11ef3c1d6efba92ff2fbf79b31ffb199aaa50c5ad0a7f3d416c70a2d8df
-MISC ChangeLog 65888 RMD160 f6d744c2c7fb719ec96280511a03c795d45f0abd SHA1 61f4aad5a8f896d7518eea6b96164a4fd4ef0818 SHA256 3586c472481c767af2536f79daf8250202a0adbd00ebe636b6b91f85c5350c33
+EBUILD thunderbird-7.0.1-r1.ebuild 9117 RMD160 bcb6a1799955bf1a249ae9f5488fde587eb2ae40 SHA1 6fab684b04f45d7713f0066f7a2efa6dec5a87eb SHA256 735bf3557ca8483628860898abd735fd53af10080b51798be5ed234f6d444453
+MISC ChangeLog 66045 RMD160 1633d840404d6b6d65bf5eaf1eb9fc590483114e SHA1 576dc5a5d00dbe1fb0df455b7c01c7c3e996da45 SHA256 51ffeb639b38b524e6a62afe7a6d4ce344fe0d337e55019a85c3e38bea425564
 MISC metadata.xml 732 RMD160 87468b1b9c1c1ec539c026f04e05265a4dc32cdd SHA1 283661cc3d68f2f7c2a3b82455692f7239bed63b SHA256 3b0e7f6f49598b82aaeee92a5f96f99877713866fbbb73c797bfa65f2c0b4d75
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBAgAGBQJOj1DtAAoJEO/kOhxWD91kjj8QAI8whXlg6H48cWpiltE+S5TC
+hNmKvABd579Yd44d0GRA0OtIjHB+ri3gadH8l+D2iQ2TslanrTI1D+Fq1LPdhlCm
+snw9w5lwQKOtYSr2nxeTaCLWVOPvo3S72OTUIuvQ1STg4d2r3MdYzo1oJ9gBK6/z
+iRECjO6uyfn8HvC0b98lOCGqWRm3XCkNRSYFKZv+qEr0UTqwudlQl/9VKFbhspr9
+LlfK/5yqgdYNdLUj/nvmclZFC3gXlI7FL0GMbQDhxRu1kBRIr2bu+AJ/5XLZPBiz
+Gv99rMES9kRsvuHqkShtwh9vTCPqHvr93HV1Hlr8u4FBV6accmncHJbSUh6MZiyf
+PejWqoR3O3AnPdwDAKbug55mJ6+Mg95GEL20tVUm4qsCXMINNRHlx9CcV34o7VMn
+LytSzhdKnCPzGK6KMdeRgTF6wa3rFtygqCvZRf+9vZML3CuRsGCXvFLbEzjVXe66
+JWdhZMI9pCEM2GgAua5pQMFshZWEIP2nPEDINvc+mw0sHv0nJ03EL9hgyZe9jyjS
+iUh1tX+tzeH7B9k6CXM39wyRQ0ce79y5LOnXKoQRKa4tPKZL/dGBY/O0JCOWb/0t
+9crH4fW149ghMbxeC6GnsyP0u2ibtY9awHgvEnMeiDG1ObImEjia6BdMk/mlmQzN
+BY3q8hRZKjnTdHmR/7/W
+=+yUy
+-----END PGP SIGNATURE-----
diff --git a/mail-client/thunderbird/thunderbird-7.0.1-r1.ebuild b/mail-client/thunderbird/thunderbird-7.0.1-r1.ebuild
index dbcf1986a8c3..a1c24a4ea566 100644
--- a/mail-client/thunderbird/thunderbird-7.0.1-r1.ebuild
+++ b/mail-client/thunderbird/thunderbird-7.0.1-r1.ebuild
@@ -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 @@ pkg_setup() {
 	# Ensure we have enough disk space to compile
 	CHECKREQS_DISK_BUILD="4G"
 	check-reqs_pkg_setup
-
 }
 
 src_unpack() {
@@ -239,9 +238,22 @@ src_compile() {
 
 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 @@ src_install() {
 	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 @@ src_install() {
 		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