Fix desktop files, bug 185869 and now it uses the langpack according to the locale, bug 182175

Package-Manager: portage-2.1.3_rc8

4 files changed, 50 insertions, 61 deletions

diff --git a/app-office/mozilla-sunbird-bin/ChangeLog b/app-office/mozilla-sunbird-bin/ChangeLog
index 4fa67f57aeb7..6f3808cab545 100644
--- a/app-office/mozilla-sunbird-bin/ChangeLog
+++ b/app-office/mozilla-sunbird-bin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/mozilla-sunbird-bin
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/mozilla-sunbird-bin/ChangeLog,v 1.24 2007/07/09 13:36:48 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/mozilla-sunbird-bin/ChangeLog,v 1.25 2007/07/20 11:56:28 armin76 Exp $
+
+  20 Jul 2007; Raúl Porcel <armin76@gentoo.org>
+  files/icon/mozilla-sunbird-bin.desktop, mozilla-sunbird-bin-0.5.ebuild:
+  Fix desktop files, bug 185869 and now it uses the langpack according to the
+  locale, bug 182175
 
   09 Jul 2007; Raúl Porcel <armin76@gentoo.org>
   -mozilla-sunbird-bin-0.3.1.ebuild, mozilla-sunbird-bin-0.5.ebuild:
diff --git a/app-office/mozilla-sunbird-bin/Manifest b/app-office/mozilla-sunbird-bin/Manifest
index e534b3137629..a3d5ba9627a2 100644
--- a/app-office/mozilla-sunbird-bin/Manifest
+++ b/app-office/mozilla-sunbird-bin/Manifest
@@ -2,10 +2,10 @@ AUX icon/mozilla-sunbird-bin-icon.png 6418 RMD160 92df6105a3ba07f961d5a54000e772
 MD5 fa424078d248f495300ecc507858beb2 files/icon/mozilla-sunbird-bin-icon.png 6418
 RMD160 92df6105a3ba07f961d5a54000e772791f1d89ac files/icon/mozilla-sunbird-bin-icon.png 6418
 SHA256 792fa9c96e825a0ba5d9f837910386dcb819e215fcc18c00936718823dee076e files/icon/mozilla-sunbird-bin-icon.png 6418
-AUX icon/mozilla-sunbird-bin.desktop 200 RMD160 3ce4489f7d76554546308e6e90d55b73229c921b SHA1 58884bae49c415ea72d0c7e54388aa4f7a2322b3 SHA256 135baf7eceb579f686c1d2d52792bc67cf27ad1d89c4c3a956b9f5ffdee2996d
-MD5 739d5604ee1b7e921ad9f21c5c92b854 files/icon/mozilla-sunbird-bin.desktop 200
-RMD160 3ce4489f7d76554546308e6e90d55b73229c921b files/icon/mozilla-sunbird-bin.desktop 200
-SHA256 135baf7eceb579f686c1d2d52792bc67cf27ad1d89c4c3a956b9f5ffdee2996d files/icon/mozilla-sunbird-bin.desktop 200
+AUX icon/mozilla-sunbird-bin.desktop 196 RMD160 f3d8824bdcf9acf0c894f19864902a03393e84d0 SHA1 f91328ef4e43dff79eb331b99ae5a4cd15522f06 SHA256 cf7c3eaf5e3cb407541cc7acbe15e4df6337637598ca75ba8060228a86fe522d
+MD5 c6cd53f351cd3d7eb93bea25c2f1f452 files/icon/mozilla-sunbird-bin.desktop 196
+RMD160 f3d8824bdcf9acf0c894f19864902a03393e84d0 files/icon/mozilla-sunbird-bin.desktop 196
+SHA256 cf7c3eaf5e3cb407541cc7acbe15e4df6337637598ca75ba8060228a86fe522d files/icon/mozilla-sunbird-bin.desktop 196
 DIST mozilla-sunbird-0.5-ca.xpi 98426 RMD160 cc0f6b17bb1e62eac35c5a6943bed12e7753edbc SHA1 52a5c042730189c93e498277c39dcbce244ab4ea SHA256 ea577a50a79fe1fb833e7bdd6e07fcfed194d651328f1af9152ff65f39847053
 DIST mozilla-sunbird-0.5-cs.xpi 99044 RMD160 7ce259ade4433e4de4c843fea3b144caacef8083 SHA1 41548c196deb7e4a5f02aeffbd20fcd880703d9c SHA256 df4534c9889fdb5b8f231de65c99b28c444f3cb7ae0853494c8ecd983d551d4c
 DIST mozilla-sunbird-0.5-da.xpi 96478 RMD160 1e50e93d17511855d97731de6e5d5e971d2876a5 SHA1 c4507e0b1dfc12ae6a7fb3c2c9b45f189b9fd5c5 SHA256 f6ee510de2991ae7193e31f71b1e592fcbcca4db9c98757a27440fbb3af771fc
@@ -28,14 +28,14 @@ DIST mozilla-sunbird-0.5-sk.xpi 102021 RMD160 a07b3fc6d0569f61b637a9eb4453e6929b
 DIST mozilla-sunbird-0.5-sl.xpi 98555 RMD160 2a4aeec93efcb8ba09ef554da9f6f9e852f69198 SHA1 b4ffd0b2431f8ecf3bd2b2cb735db53ca313f16b SHA256 9974bcbcec9b8fcae591cd267f23605910dbf3ed39f54e2984f363bd6786052a
 DIST mozilla-sunbird-0.5-sv-SE.xpi 100429 RMD160 9d82271a82ed36ea8042e8212fb7711337d5dfe7 SHA1 0c95c024a506b64ceaef95658f0f348c571ab837 SHA256 5908afe31b2f9e26bf50c291815418d91df77ced52597f5eff29c1b0c2427f8c
 DIST sunbird-0.5.en-US.linux-i686.tar.gz 8323561 RMD160 e3346a9f64df7a38c4a47385c506c4ed7afa6c64 SHA1 5b4f3dffe7490684b5c536589a292cf519354bb6 SHA256 868dbe7524397a4841f1d03275965f5b839421d05ab75d8b8a01df023a097e05
-EBUILD mozilla-sunbird-bin-0.5.ebuild 3837 RMD160 f101e895c4ed37b8b8b4c307e6e9461bf4945f97 SHA1 150704d759939b4662d6f016b03d0827eb5e7119 SHA256 493fb2b78b4deeae8120f06991d8044cc286d136a24da00d44bdfea35f7f65bc
-MD5 bf98f9e9f2ec5a6eded598ee978a058f mozilla-sunbird-bin-0.5.ebuild 3837
-RMD160 f101e895c4ed37b8b8b4c307e6e9461bf4945f97 mozilla-sunbird-bin-0.5.ebuild 3837
-SHA256 493fb2b78b4deeae8120f06991d8044cc286d136a24da00d44bdfea35f7f65bc mozilla-sunbird-bin-0.5.ebuild 3837
-MISC ChangeLog 4918 RMD160 087330b0fd457ef13c0360268192e15c679fabbc SHA1 f4f85c0623fccb435c6cee0dede959ee339764ac SHA256 b7e32aa3c19df6ce92c062f19edb4a06f465f19386a95810663c1693a5ffa3a5
-MD5 efb7896909acb74c9f9da64180506c5b ChangeLog 4918
-RMD160 087330b0fd457ef13c0360268192e15c679fabbc ChangeLog 4918
-SHA256 b7e32aa3c19df6ce92c062f19edb4a06f465f19386a95810663c1693a5ffa3a5 ChangeLog 4918
+EBUILD mozilla-sunbird-bin-0.5.ebuild 3446 RMD160 7314bcded9dcc8638ec6371f82026be41dac9b3d SHA1 d414dde91bd734c709f11804789dd263444fe2a8 SHA256 98e0505a69ff8397be361778b87e06541318a425617cf30c789150663f037a77
+MD5 c98d2fba79fd8d45a4d83a522c15ed70 mozilla-sunbird-bin-0.5.ebuild 3446
+RMD160 7314bcded9dcc8638ec6371f82026be41dac9b3d mozilla-sunbird-bin-0.5.ebuild 3446
+SHA256 98e0505a69ff8397be361778b87e06541318a425617cf30c789150663f037a77 mozilla-sunbird-bin-0.5.ebuild 3446
+MISC ChangeLog 5141 RMD160 76a7cd6a95c541d31661af93f41a98b81943ac66 SHA1 dde6a976dbc6ffca625f02087f03dfe4c33f13c5 SHA256 0d8e3deb5d82e6445e422d97f01d3fb6c28276e0e9740a1bf31f9f0328ea803d
+MD5 607fd06f21a8d7c0e65019673eab6921 ChangeLog 5141
+RMD160 76a7cd6a95c541d31661af93f41a98b81943ac66 ChangeLog 5141
+SHA256 0d8e3deb5d82e6445e422d97f01d3fb6c28276e0e9740a1bf31f9f0328ea803d ChangeLog 5141
 MISC metadata.xml 160 RMD160 d5a9f0bf8989621c2bde30facb53bcae00aba709 SHA1 5015c07af2083f20f9552d7fb11afb5ea69af345 SHA256 0cc5126362a12cee42ec1197c528a804cf36859329dd2c6d9225726831d14b8b
 MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
 RMD160 d5a9f0bf8989621c2bde30facb53bcae00aba709 metadata.xml 160
diff --git a/app-office/mozilla-sunbird-bin/files/icon/mozilla-sunbird-bin.desktop b/app-office/mozilla-sunbird-bin/files/icon/mozilla-sunbird-bin.desktop
index 4aeb2cd7232a..0847be8092f7 100644
--- a/app-office/mozilla-sunbird-bin/files/icon/mozilla-sunbird-bin.desktop
+++ b/app-office/mozilla-sunbird-bin/files/icon/mozilla-sunbird-bin.desktop
@@ -5,4 +5,4 @@ Exec=/usr/bin/sunbird-bin
 Icon=mozilla-sunbird-bin-icon.png
 Terminal=false
 Type=Application
-Categories=Application;Network;
+Categories=Office;Calendar;
diff --git a/app-office/mozilla-sunbird-bin/mozilla-sunbird-bin-0.5.ebuild b/app-office/mozilla-sunbird-bin/mozilla-sunbird-bin-0.5.ebuild
index dcc95b9dad38..4736b3829fc0 100644
--- a/app-office/mozilla-sunbird-bin/mozilla-sunbird-bin-0.5.ebuild
+++ b/app-office/mozilla-sunbird-bin/mozilla-sunbird-bin-0.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/mozilla-sunbird-bin/mozilla-sunbird-bin-0.5.ebuild,v 1.4 2007/07/13 07:04:12 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/mozilla-sunbird-bin/mozilla-sunbird-bin-0.5.ebuild,v 1.5 2007/07/20 11:56:28 armin76 Exp $
 
 inherit eutils mozilla-launcher multilib mozextension
 
@@ -8,7 +8,7 @@ LANGS="ca cs da de es-ES eu fr ga-IE hu it mk mn nb-NO nl pa-IN pl pt-BR ru sk s
 
 MY_PN="${PN/mozilla-}"
 MY_P="${MY_PN}-${PV}"
-DESCRIPTION="The Mozilla Sunbird Calendar"
+DESCRIPTION="Mozilla Sunbird Calendar"
 SRC_URI="http://releases.mozilla.org/pub/mozilla.org/calendar/sunbird/releases/${PV}/linux-i686/en-US/sunbird-${PV}.en-US.linux-i686.tar.gz"
 HOMEPAGE="http://www.mozilla.org/projects/calendar/sunbird.html"
 RESTRICT="strip"
@@ -23,13 +23,25 @@ IUSE=""
 #  http://releases.mozilla.org/pub/mozilla.org/calendar/sunbird/releases/${PV}/langpacks/
 #
 # for i in $LANGS $SHORTLANGS; do wget $i.xpi -O ${P}-$i.xpi; done
+#for X in ${LANGS} ; do
+#	SRC_URI="${SRC_URI}
+#		linguas_${X/-/_}? ( http://dev.gentooexperimental.org/~armin76/dist/${P/-bin/}-xpi/${P/-bin/}-${X}.xpi )"
+#	IUSE="${IUSE} linguas_${X/-/_}"
+	# english is handled internally
+#done
 for X in ${LANGS} ; do
 	SRC_URI="${SRC_URI}
-		linguas_${X/-/_}? ( http://dev.gentooexperimental.org/~armin76/dist/${P/-bin/}-xpi/${P/-bin/}-${X}.xpi )"
+		linguas_${X/-/_}? ( http://dev.gentooexperimental.org/~armin76/dist/${P/-bin}-xpi/${P/-bin/}-${X}.xpi )"
 	IUSE="${IUSE} linguas_${X/-/_}"
 	# english is handled internally
+	if [ "${#X}" == 5 ] && ! has ${X} ${NOSHORTLANGS}; then
+		SRC_URI="${SRC_URI}
+			linguas_${X%%-*}? ( http://dev.gentooexperimental.org/~armin76/dist/${P/-bin}-xpi/${P/-bin/}-${X}.xpi )"
+		IUSE="${IUSE} linguas_${X%%-*}"
+	fi
 done
 
+
 DEPEND="app-arch/unzip"
 RDEPEND="x11-libs/libXrender
 	x11-libs/libXt
@@ -43,9 +55,9 @@ RDEPEND="x11-libs/libXrender
 		>=app-emulation/emul-linux-x86-gtklibs-1.0
 		app-emulation/emul-linux-x86-compat
 	)
-	>=www-client/mozilla-launcher-1.41"
+	>=www-client/mozilla-launcher-1.56"
 
-S=${WORKDIR}/sunbird
+S="${WORKDIR}/sunbird"
 
 pkg_config() {
 	# This is a binary x86 package => ABI=x86
@@ -54,37 +66,12 @@ pkg_config() {
 	has_multilib_profile && ABI="x86"
 }
 
-linguas() {
-	local LANG SLANG
-	for LANG in ${LINGUAS}; do
-		if has ${LANG} en en_US; then
-			has en ${linguas} || linguas="${linguas:+"${linguas} "}en"
-			continue
-		elif has ${LANG} ${LANGS//-/_}; then
-			has ${LANG//_/-} ${linguas} || linguas="${linguas:+"${linguas} "}${LANG//_/-}"
-			continue
-		elif [[ " ${LANGS} " == *" ${LANG}-"* ]]; then
-			for X in ${LANGS}; do
-				if [[ "${X}" == "${LANG}-"* ]] &&  != *" ${X} "* ]]; then
-					has ${X} ${linguas} || linguas="${linguas:+"${linguas} "}${X}"
-					continue 2
-				fi
-			done
-		fi
-		ewarn "Sorry, but ${PN} does not support the ${LANG} LINGUA"
-	done
-}
-
 src_unpack() {
 	unpack ${MY_PN/-bin}-${PV}.en-US.linux-i686.tar.gz
 
-	linguas
-	for X in ${linguas}; do
-		[[ ${X} != "en" ]] && xpi_unpack "${P/-bin/}-${X}.xpi"
+	for X in ${A}; do
+		[[ ${X} == *.xpi ]] && xpi_unpack ${X}
 	done
-	if [[ ${linguas} != "" ]]; then
-		einfo "Selected language packs (first will be default): ${linguas}"
-	fi
 }
 
 src_install() {
@@ -92,30 +79,26 @@ src_install() {
 
 	# Install sunbird in /opt
 	dodir ${MOZILLA_FIVE_HOME%/*}
+	touch ${S}/extensions/talkback@mozilla.org/chrome.manifest
 	mv ${S} ${D}${MOZILLA_FIVE_HOME}
 
-	linguas
-	for X in ${linguas}; do
-		[[ ${X} != "en" ]] && xpi_install "${WORKDIR}"/"${P/-bin/}-${X}"
+	# Install langpacks
+	for X in ${A}; do
+		[[ ${X} == *.xpi ]] && xpi_install "${WORKDIR}"/${X%.xpi}
 	done
 
-	local LANG=${linguas%% *}
-	if [[ -n ${LANG} && ${LANG} != "en" ]]; then
-		einfo "Setting default locale to ${LANG}"
-		dosed -e "s:general.useragent.locale\", \"en-US\":general.useragent.locale\", \"${LANG}\":" \
-			"${MOZILLA_FIVE_HOME}"/defaults/pref/sunbird.js \
-			"${MOZILLA_FIVE_HOME}"/defaults/pref/sunbird-l10n.js || \
-			die "sed failed to change locale"
-	fi
-
-	keepdir ${MOZILLA_FIVE_HOME}/extensions		# required to run!
+	# Use a langpack depending on the system locale
+	for i in ${D}/"${MOZILLA_FIVE_HOME}"/greprefs/all-gentoo.js \
+		${D}"${MOZILLA_FIVE_HOME}"/defaults/pref/all-gentoo.js;	do
+		echo 'pref("intl.locale.matchOS",                true);' >> $i
+	done
 
 	# Create /usr/bin/sunbird-bin
 	install_mozilla_launcher_stub sunbird-bin ${MOZILLA_FIVE_HOME}
 
 	# Install icon and .desktop for menu entry
-	doicon ${FILESDIR}/icon/mozilla-sunbird-bin-icon.png
-	domenu ${FILESDIR}/icon/mozilla-sunbird-bin.desktop
+	doicon ${FILESDIR}/icon/${PN}-icon.png
+	domenu ${FILESDIR}/icon/${PN}.desktop
 }
 
 pkg_preinst() {
@@ -127,6 +110,7 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
+	use amd64 && einfo "NB: You just installed a 32-bit sunbird"
 	update_mozilla_launcher_symlinks
 }