[gentoo-commits] proj/mozilla:master commit in: mail-client/thunderbird/

[Ian Stakenvicius]

commit:     c72b160f03e3103e9399de59c08265adef9c5093
Author:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 22 14:38:29 2016 +0000
Commit:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Thu Sep 22 14:38:29 2016 +0000
URL:        https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=c72b160f

mail-client/thunderbird: sync with tree

 mail-client/thunderbird/Manifest                   |  4 +--
 ...-45.3.0.ebuild => thunderbird-45.3.0-r2.ebuild} | 42 +++++++++++++++++-----
 2 files changed, 35 insertions(+), 11 deletions(-)

diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index 9355143..44812f3 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -1,7 +1,7 @@
 DIST enigmail-1.9.1.tar.gz 1736876 SHA256 0393119725fa5931d9888a2a1c9796d440ee7975ca3d005eb63142768b10f993 SHA512 5417d7744ff5b8299d9799059f62013e546fb74206782169e5ce6baa0950d96d1c8996c99ec902ca73b241fd1268966e0a7ad30c032a1706a0efbf06fefc311c WHIRLPOOL 80cff68461edc743851de5a83cd04105f6689eb1289f46b72334a96b091dc430399a91b2ab004a39bd7cb04433ab0471dd07b44d39fc2eb3869487b07841fc5a
-DIST firefox-45.0-patches-04.tar.xz 18600 SHA256 2ee0ab58e0a1db7b573dd7ac407dcb9a43a85dd295c5d6d263f72ce629c5290c SHA512 cf5d4ddfe14dff92950baae066350ace0a503c5bdd9d837e4724fd2fb905a2fb540dcf34971531e79547dd62dfbf217d472f39ccc4802f34a245e24f406fdb5e WHIRLPOOL 1461c61ba7e54b7a91c758fdf91fda22260eaff4148b3cccab8ccfd9d09a3d80c0314e999284d392d9e961c42cd9720d6d30ac190074f74d1e53ecb1afa1b1e3
+DIST firefox-45.0-patches-06.tar.xz 19792 SHA256 4cacdb0ca1e710a0e3f577d5a1253ed14fab9a2d1cdaf83b3fa7bac86cfddef2 SHA512 eec8ccb3d67144368cfad807cad847379bf9ee54c2394f8bf0bda121178b1036ec1d32bea67afad840dff38e1ef26c4c19569d4fa4b553b6e2719bf07a46e017 WHIRLPOOL 7bb6b8f59d86beb9178fbea8bdd372a016b62e00766daf9439e2e59d20635a21b3a218447b09ce7d6a4b601611013f9ad08e088ef8112a41bde9ce951d10bdad
 DIST gdata-provider-2.6-r1.tar.xz 83836 SHA256 e181d5fe69e66f34719295790301e0d265c855be5f30df516c52dd3708d82158 SHA512 e5fcf60c221590d1d904ce8c6a74da7208b118c2872a26267f4ee6d3e68eea466d44b979b7259a012a21e48eb5b470d52cc9e58584226fe04ce88ff698da495b WHIRLPOOL 0e85fbb321edec0397b42808fd6320e245de35ddd1cf772545c432dbf26d8c28b042ba2c61bbde2abdbf4d5cca076436e6d678d6d636d3bcc562470d485df6c1
-DIST lightning-4.7.3.tar.xz 1134460 SHA256 8834c59a58797af747805f9a67ebcc311607a98bea4d185689d7c35f024bce7b SHA512 ebca7d74413a15f404ce094e5a4d047d79f250a04c6c1e78a3ab5aa49946e1e1ac81a1f7703bf2e631d841b98df66a21982788ee15af14eefe1d51eca29e1d48 WHIRLPOOL 34a28dcf707fe564433a663c2ac3efc79dff409cf22383425f38d4ac06184ac980f35a6ee81ab8e9d7030189538188ffe2d5fa426e0aa1cb8a11ebe6191a5fd1
+DIST lightning-4.7.3.repack.tar.xz 1927348 SHA256 1602f5f7d0e51161ca2057ad3b7f77c976c5d6c9ef6a852afa607fc32fd9af61 SHA512 19b66daeba7686ba59942e582ba5ae5feb8215ea97f1580cf42347b3ebcc4947775e40975b728091d0515051e5fcee01d73b29f78dc243c17dd1f0077f0d1627 WHIRLPOOL 0da115a00ad2be42999d316663ac45369d3157c344127e7b14f66b42354363b890a5087d01d44de5b87bd9499d7e20060da1d3e7e9d64629fae17ae0698bb9d1
 DIST thunderbird-38.0-patches-0.1.tar.xz 684 SHA256 cd2a347b72a104e72d38e56bb92df3464e8820485119b4114dbd0bbda131a808 SHA512 52c83af301be959e861dfec55b3c4bc60035387c606976bd29232c4cba077230edcadef242491e699fba10027d0408dd4f33fa320bcf96727afe149166ca02de WHIRLPOOL a378a0fa1b152f17681a5e389662fedfacd45a137b224f038d3c98ab4a024bcf9e753fb2fe018cdb7126fb710ee8baabdf7882540450ead2985070d0d1f12eb0
 DIST thunderbird-45.3.0-ar.xpi 490775 SHA256 14e8349dd5c9d44870b31c12831878c41b3346065aef9dfa0b1e53afa01b86d3 SHA512 c4fb9cac062925a07e2790e66a1ec86fec217be2c518715c884e6cfaa1471c83738d50a183c34aab0a4829b3d4d19c7d7a55c738a23260a69f38dad7d1821a67 WHIRLPOOL 0415605844fc8de1faeef9a795dc4f3158374d0bc1d1ad12d385f7c3f21042a8e1f012e4c3c6e7fbdf95a9dab74e0becc8e85cb7eef44ad2d610f0f25f999474
 DIST thunderbird-45.3.0-ast.xpi 428059 SHA256 b029c48931513e7983c6f031b2d9f68e1d2a8b0265807af914c598ed35e69247 SHA512 fc3b549cf3bcc761bdc310459c794aedeb5ea1969ec44bbaf3c4868d9dd7052ccd42ad801d286f8699bcdfa013ff68295d202aabce37597355064a298d382f39 WHIRLPOOL d6ec61863348a054921d789558df329d003a95485a4a6ab88264cede1dd7421a0cc4d210aa653f33982120fdf617205c835956e48c20f735e0f2e8cee176eebe

diff --git a/mail-client/thunderbird/thunderbird-45.3.0.ebuild b/mail-client/thunderbird/thunderbird-45.3.0-r2.ebuild
similarity index 93%
rename from mail-client/thunderbird/thunderbird-45.3.0.ebuild
rename to mail-client/thunderbird/thunderbird-45.3.0-r2.ebuild
index f85141b..1b352bc 100644
--- a/mail-client/thunderbird/thunderbird-45.3.0.ebuild
+++ b/mail-client/thunderbird/thunderbird-45.3.0-r2.ebuild
@@ -22,7 +22,7 @@ EMVER="1.9.1"
 
 # Patches
 PATCH="thunderbird-38.0-patches-0.1"
-PATCHFF="firefox-45.0-patches-04"
+PATCHFF="firefox-45.0-patches-06"
 
 MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases"
 
@@ -38,10 +38,8 @@ if [[ ${MOZ_ESR} == 1 ]]; then
 fi
 MOZ_P="${PN}-${MOZ_PV}"
 
-
-MOZCONFIG_OPTIONAL_GTK3=1
 MOZCONFIG_OPTIONAL_JIT="enabled"
-inherit flag-o-matic toolchain-funcs mozconfig-v6.45 makeedit autotools pax-utils check-reqs nsplugins mozlinguas-v2
+inherit flag-o-matic toolchain-funcs mozconfig-v6.45 makeedit autotools pax-utils check-reqs nsplugins mozlinguas-v2 fdo-mime gnome2-utils
 
 DESCRIPTION="Thunderbird Mail Client"
 HOMEPAGE="http://www.mozilla.com/en-US/thunderbird/"
@@ -55,7 +53,7 @@ RESTRICT="!bindist? ( bindist )"
 PATCH_URIS=( https://dev.gentoo.org/~{anarchy,axs,polynomial-c}/mozilla/patchsets/{${PATCH},${PATCHFF}}.tar.xz )
 SRC_URI="${SRC_URI}
 	${MOZ_HTTP_URI}/${MOZ_PV}/source/${MOZ_P}.source.tar.xz
-	https://dev.gentoo.org/~axs/distfiles/lightning-${MOZ_LIGHTNING_VER}.tar.xz
+	https://dev.gentoo.org/~axs/distfiles/lightning-${MOZ_LIGHTNING_VER}.repack.tar.xz
 	lightning? ( https://dev.gentoo.org/~axs/distfiles/gdata-provider-${MOZ_LIGHTNING_GDATA_VER}-r1.tar.xz )
 	crypt? ( http://www.enigmail.net/download/source/enigmail-${EMVER}.tar.gz )
 	${PATCH_URIS[@]}"
@@ -69,8 +67,9 @@ CDEPEND="
 	crypt?  ( || (
 		( >=app-crypt/gnupg-2.0
 			|| (
-				app-crypt/pinentry[gtk]
-				app-crypt/pinentry[qt4]
+				app-crypt/pinentry[gtk(-)]
+				app-crypt/pinentry[qt4(-)]
+				app-crypt/pinentry[qt5(-)]
 			)
 		)
 		=app-crypt/gnupg-1.4*
@@ -295,11 +294,16 @@ src_install() {
 	# Install language packs
 	mozlinguas_src_install
 
+	local size sizes icon_path icon
 	if ! use bindist; then
-		newicon "${S}"/other-licenses/branding/thunderbird/content/icon48.png thunderbird-icon.png
+		icon_path="${S}/other-licenses/branding/thunderbird"
+		icon="${PN}-icon"
+
 		domenu "${FILESDIR}"/icon/${PN}.desktop
 	else
-		newicon "${S}"/mail/branding/aurora/content/icon48.png thunderbird-icon-unbranded.png
+		icon_path="${S}/mail/branding/aurora"
+		icon="${PN}-icon-unbranded"
+
 		newmenu "${FILESDIR}"/icon/${PN}-unbranded.desktop \
 			${PN}.desktop
 
@@ -307,6 +311,14 @@ src_install() {
 			"${ED}"/usr/share/applications/${PN}.desktop
 	fi
 
+	# Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
+	newicon "${icon_path}"/mailicon48.png "${icon}".png
+	# Install icons for menu entry
+	sizes="16 22 24 32 48 256"
+	for size in ${sizes}; do
+		newicon -s ${size} "${icon_path}/mailicon${size}.png" "${icon}.png"
+	done
+
 	local emid
 	# stage extra locales for lightning and install over existing
 	mozlinguas_xpistage_langpacks "${BUILD_OBJ_DIR}"/dist/xpi-stage/lightning \
@@ -356,7 +368,14 @@ src_install() {
 	fi
 }
 
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
 pkg_postinst() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+
 	if use crypt; then
 		local peimpl=$(eselect --brief --colour=no pinentry show)
 		case "${peimpl}" in
@@ -379,3 +398,8 @@ pkg_postinst() {
 		elog "please file a bug report."
 	fi
 }
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}