Don't depend on crypt USE flag for addition of email mime types to .desktop file

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

4 files changed, 39 insertions, 30 deletions

diff --git a/www-client/seamonkey/ChangeLog b/www-client/seamonkey/ChangeLog
index 0bc5a117ddaa..7dfe4aeb6c07 100644
--- a/www-client/seamonkey/ChangeLog
+++ b/www-client/seamonkey/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-client/seamonkey
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/ChangeLog,v 1.305 2011/04/29 01:05:30 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/ChangeLog,v 1.306 2011/04/29 10:20:51 polynomial-c Exp $
+
+  29 Apr 2011; Lars Wendler <polynomial-c@gentoo.org> seamonkey-2.0.13.ebuild,
+  seamonkey-2.0.14.ebuild:
+  Don't depend on crypt USE flag for addition of email mime types to .desktop
+  file. Minor ebuild improvements.
 
 *seamonkey-2.0.14 (29 Apr 2011)
 
diff --git a/www-client/seamonkey/Manifest b/www-client/seamonkey/Manifest
index 399a4f1070c4..1ee03f6ec6c6 100644
--- a/www-client/seamonkey/Manifest
+++ b/www-client/seamonkey/Manifest
@@ -57,24 +57,24 @@ DIST seamonkey-2.0.14-sv-SE.xpi 509030 RMD160 9777348cf784bfd42e1045b552f23f3947
 DIST seamonkey-2.0.14-tr.xpi 493838 RMD160 419d0fcc9f29e7f9f14087783e792533bedf5218 SHA1 978e78d2e829bce06767bb8ad4a7a401deec67ab SHA256 f5f5a7bb30ac54edb3d1521d67928ffecfac106546ddf122bfebdba7f9287006
 DIST seamonkey-2.0.14-zh-CN.xpi 503855 RMD160 2b319d897ee9bfbdcf2c05fa0ad580d4e38dc3d3 SHA1 dc388846fcbf28c514a9d62240b1c9d8c885daeb SHA256 5e1b6781a217713867d303378742b5b7269ce4a317040197c77628b1e95faf6b
 DIST seamonkey-2.0.14.source.tar.bz2 61744542 RMD160 7f40af9c3b838b687b80c3b307f170b06d9d3255 SHA1 363b63c16f8e23c84cf55f886b1ae4b9ea266d46 SHA256 171101c471d5d1ec7563825c2e96cadaccdb85ed370999ac9c13d39abdc84020
-EBUILD seamonkey-2.0.13.ebuild 10032 RMD160 ad27e7f460eca017a6bfbb58c3dfe3cbd8342efa SHA1 6cfc6261ed9d219805a3fe147da533b13f1c792b SHA256 948bdb388df347f3e89a7ddc6a78a129a84d23c8bc2a81675229a000edd2b588
-EBUILD seamonkey-2.0.14.ebuild 10016 RMD160 43d53e19e37b9428f639e7903886856223467a04 SHA1 fe2d115ad97a1d0f8907df6599606a94ab9afbe5 SHA256 b1f51c0b592da6cc0f3dc0dae02b8e9a7c5b617fdb5dc598aa07c89adac23135
-MISC ChangeLog 39495 RMD160 c1cfc936741b924d480e95dce86f6a56630cc60f SHA1 59f85f1966bb6869931bc72f8c286eedbc466ba7 SHA256 f38e72e674e020a295ed68c7b3e3da14b1aabdb7a9a5f241fcb120d65e0cbb60
+EBUILD seamonkey-2.0.13.ebuild 10008 RMD160 a02015a896682995c0b511c7aeefd2b3b204ab1a SHA1 d87efd0690491c73fa39d640607d5ee4a7c19be7 SHA256 2f28acff33e63ca5a005789247f5c4b5253f8767cec37478f54c871916932c3f
+EBUILD seamonkey-2.0.14.ebuild 10017 RMD160 f5255e09f69f66b03038f2feb57597e1cdf67e80 SHA1 75aa7e034f15956c84e4ddd208478863b01c52b9 SHA256 0c38623fe291608ae78349d8cd0457711ed929a33f5b38ed5130f587f82b2e17
+MISC ChangeLog 39715 RMD160 9b1145de81b268d1b08ee44e9a6ce4dd3bdf5999 SHA1 a938cfe838b015f5e5e809f05ba66f664d661995 SHA256 644655bf8014c8bf1a127b55b9987abce87d4bd040c4b31d7770e59502cbfe34
 MISC metadata.xml 845 RMD160 d313bde4cd255346a825ea0d99afb7585151cc0f SHA1 7941c776107161a6278ba5893345aeac2a5cbe7a SHA256 404caecf817491893c2ef118b48f025bc0d5c37d910979dd5602273127e479f9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJNug7hAAoJEPiazRVxLXTF+V8QANn0xq2oU2UOtY6lSkgnOpD1
-s2mYy80bzxy1txLK3gEadLFHSexLn1u6zngKbtF9bQ+erwui57UQ9vFY1WbjgLOS
-NnW5kIJditvnV8oG3LMkMuViRIVEo3wEszJt0r42Zgsc6l5U9M+stvT1Oc7Sxu72
-Xsg4DS1N1eHumy6C6uZd8ADzK2Sr4gWDs6aLCHB8SnSB8UnD014Htei2ajHAUemV
-4QFYUvWKBGkG7o4nYXWlfwNYZ3T4S2tq/qAClJDRa2DtjbA43RgIG07TouZl6Ugn
-3ayBg74UgyTXcD7S1VrqfYwOFASbzWUBs+I1GUJvb2QCuywtWbU+atYwlMf8z7Yr
-cDVqMIQ6bIjOyY+RnP+H2tFDiVQ/abD77hDnDqemKVZO+iFAYOf/pW3L7tc03qSI
-4cCfW1YMzjjsq6Nfws2t62fv5Ldvd48TIqTPhPRUCQv58G6KeYlICyyHyEc2wXDZ
-LTcX4/uZs1spZ6B+oWi2sDsasIboiFoSPkEOnfZUGTugkm95WhFRbrT5P/Qgl/ma
-53beBAcfFeH4yoPEtNRWAZD0vK92XDsJQfGwuNgOMhXzHwCtJoMQC+itlhp2LN9c
-zV5Tbl8QnxJVHfPbdV0T1OQ5U2wkU4cG63UW8fnBQ2dSGgCORlbOsDhGWq530sOv
-Pw07XJ1+jPxUKv+bV3XA
-=H1d4
+iQIcBAEBCgAGBQJNupEKAAoJEPiazRVxLXTF2bUP/2mVo2+s7EqK03bg+J/O9T1W
+zf+x7muPaPqITPUcCY705Gnov1JaSozp9QCfXgrX3Sem1ftaHuxVMdVjMBhYEGcz
+CpEwl8u5rR/FqeePJuCrcgbZBbny4TBdVPJSyVyovGj9aFh/pnqKNNxG/ringNxL
+LG2S14aUkLUuRfdsMzRtA5xIEaD0P3SZr7oa+4GMoJQukhwKDw5Pz0f9F2rr3nPh
+xb1owz86H9telKKE/CXhZTS8/+L1vORCzDArCu6eyNamr3zygrhYgiSAxVqtpYKW
+IUJ07zQZat1mMBYq/SeZKrxpGAl44Hwj/wHl0ywWYZBQCHkta9LSBlYIyuf2KRxB
+LFwfo9lYxm7uXGFmo4wDUktZsXiJYi56Me4lSNPhLIKr8p7Ynb3+q7VgaDM/Qtym
+lIp4LaqkqdV2fYgvLdQgce7hrc6/Frn+v6Le2OXNHN6YY1Fu5EczQRaqoAkRR9Yp
+3StEx38BPOHfT9t9v6sj8Ohh1FviE5M5dd3roorMN8Eo91oBrlmGPYNvwfK2Uc53
+B9IU82WfdQazTZ9mUgCV9NCDCT2dEmS8Z2LrC/xvL4Lw1tXPNTRESOPeQzccoPfa
+4Y+OhmoRwWcDiPQpFKHnnWsfyAOux4Vppu5b4KniNKbEOcWm4N3qKc7y7RTxVKrn
+9xPAQOrDmrYWlayWC2Q3
+=hmjp
 -----END PGP SIGNATURE-----
diff --git a/www-client/seamonkey/seamonkey-2.0.13.ebuild b/www-client/seamonkey/seamonkey-2.0.13.ebuild
index 68215fba9f21..da505adea074 100644
--- a/www-client/seamonkey/seamonkey-2.0.13.ebuild
+++ b/www-client/seamonkey/seamonkey-2.0.13.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/www-client/seamonkey/seamonkey-2.0.13.ebuild,v 1.8 2011/04/10 11:22:31 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/seamonkey-2.0.13.ebuild,v 1.9 2011/04/29 10:20:51 polynomial-c Exp $
 
 EAPI="2"
 WANT_AUTOCONF="2.1"
@@ -11,7 +11,7 @@ PATCH="${PN}-2.0.11-patches-01"
 EMVER="1.0.1"
 
 LANGS="be ca cs de en-GB en-US es-AR es-ES fi fr gl hu it ja ka lt nb-NO nl pl pt-PT ru sk sv-SE tr zh-CN"
-NOSHORTLANGS="en-GB es-AR es-ES nb-NO pt-PT sv-SE zh-CN"
+NOSHORTLANGS="en-GB es-AR"
 
 MY_PV="${PV/_pre*}"
 MY_PV="${MY_PV/_alpha/a}"
@@ -279,7 +279,9 @@ src_install() {
 		dodir ${MOZILLA_FIVE_HOME}/extensions/${emid} || die
 		cd "${D}"${MOZILLA_FIVE_HOME}/extensions/${emid} || die
 		unzip "${S}"/mozilla/dist/bin/enigmail*.xpi || die
+	fi
 
+	if use mailnews ; then
 		sed 's|^\(MimeType=.*\)$|\1MimeType=text/x-vcard;text/directory;application/mbox;message/rfc822;x-scheme-handler/mailto;|' \
 			-i "${T}"/${PN}.desktop || die
 		sed 's|^\(Categories=.*\)$|\1Email;|' -i "${T}"/${PN}.desktop \
@@ -293,15 +295,15 @@ src_install() {
 		done
 	fi
 
-	# Install icon and .desktop for menu entry
-	newicon "${S}"/suite/branding/content/icon64.png seamonkey.png || die
-	domenu "${T}"/${PN}.desktop || die
-
 	# Add StartupNotify=true bug 290401
 	if use startup-notification ; then
-		echo "StartupNotify=true" >> "${D}"/usr/share/applications/seamonkey.desktop
+		echo "StartupNotify=true" >> "${T}"/${PN}.desktop
 	fi
 
+	# Install icon and .desktop for menu entry
+	newicon "${S}"/suite/branding/content/icon64.png seamonkey.png || die
+	domenu "${T}"/${PN}.desktop || die
+
 	# Add our default prefs
 	sed "s|SEAMONKEY_PVR|${PVR}|" "${FILESDIR}"/all-gentoo.js \
 		> "${D}"${MOZILLA_FIVE_HOME}/defaults/pref/all-gentoo.js
diff --git a/www-client/seamonkey/seamonkey-2.0.14.ebuild b/www-client/seamonkey/seamonkey-2.0.14.ebuild
index 35b6a90806c2..8d0280f95ad4 100644
--- a/www-client/seamonkey/seamonkey-2.0.14.ebuild
+++ b/www-client/seamonkey/seamonkey-2.0.14.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/www-client/seamonkey/seamonkey-2.0.14.ebuild,v 1.1 2011/04/29 01:05:30 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/seamonkey-2.0.14.ebuild,v 1.2 2011/04/29 10:20:51 polynomial-c Exp $
 
 EAPI="2"
 WANT_AUTOCONF="2.1"
@@ -279,7 +279,9 @@ src_install() {
 		dodir ${MOZILLA_FIVE_HOME}/extensions/${emid} || die
 		cd "${D}"${MOZILLA_FIVE_HOME}/extensions/${emid} || die
 		unzip "${S}"/mozilla/dist/bin/enigmail*.xpi || die
+	fi
 
+	if use mailnews ; then
 		sed 's|^\(MimeType=.*\)$|\1MimeType=text/x-vcard;text/directory;application/mbox;message/rfc822;x-scheme-handler/mailto;|' \
 			-i "${T}"/${PN}.desktop || die
 		sed 's|^\(Categories=.*\)$|\1Email;|' -i "${T}"/${PN}.desktop \
@@ -293,15 +295,15 @@ src_install() {
 		done
 	fi
 
-	# Install icon and .desktop for menu entry
-	newicon "${S}"/suite/branding/content/icon64.png seamonkey.png || die
-	domenu "${T}"/${PN}.desktop || die
-
 	# Add StartupNotify=true bug 290401
 	if use startup-notification ; then
-		echo "StartupNotify=true" >> "${D}"/usr/share/applications/seamonkey.desktop
+		echo "StartupNotify=true" >> "${T}"/${PN}.desktop
 	fi
 
+	# Install icon and .desktop for menu entry
+	newicon "${S}"/suite/branding/content/icon64.png seamonkey.png || die
+	domenu "${T}"/${PN}.desktop || die
+
 	# Add our default prefs
 	sed "s|SEAMONKEY_PVR|${PVR}|" "${FILESDIR}"/all-gentoo.js \
 		> "${D}"${MOZILLA_FIVE_HOME}/defaults/pref/all-gentoo.js