Revert the langpack thing, bug 182175

Package-Manager: portage-2.1.3_rc8

3 files changed, 51 insertions, 26 deletions

diff --git a/app-office/mozilla-sunbird-bin/ChangeLog b/app-office/mozilla-sunbird-bin/ChangeLog
index 6f3808cab545..af1a5db615e4 100644
--- a/app-office/mozilla-sunbird-bin/ChangeLog
+++ b/app-office/mozilla-sunbird-bin/ChangeLog
@@ -1,6 +1,10 @@
 # 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.25 2007/07/20 11:56:28 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/mozilla-sunbird-bin/ChangeLog,v 1.26 2007/07/21 18:25:19 armin76 Exp $
+
+  21 Jul 2007; Raúl Porcel <armin76@gentoo.org>
+  mozilla-sunbird-bin-0.5.ebuild:
+  Revert the langpack thing, bug 182175
 
   20 Jul 2007; Raúl Porcel <armin76@gentoo.org>
   files/icon/mozilla-sunbird-bin.desktop, mozilla-sunbird-bin-0.5.ebuild:
diff --git a/app-office/mozilla-sunbird-bin/Manifest b/app-office/mozilla-sunbird-bin/Manifest
index a3d5ba9627a2..033b64964fea 100644
--- a/app-office/mozilla-sunbird-bin/Manifest
+++ b/app-office/mozilla-sunbird-bin/Manifest
@@ -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 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
+EBUILD mozilla-sunbird-bin-0.5.ebuild 4081 RMD160 046226bc5db30d149743841b38a55473992505c9 SHA1 3722f2c76ee1993ca7d0248f8ad4f28806874509 SHA256 6e234b552162fa87eae8e5b956857b9bc94a56e6db63b582afbd4b5d48527afc
+MD5 8caebe65c3e44ba724702d1ec91378d3 mozilla-sunbird-bin-0.5.ebuild 4081
+RMD160 046226bc5db30d149743841b38a55473992505c9 mozilla-sunbird-bin-0.5.ebuild 4081
+SHA256 6e234b552162fa87eae8e5b956857b9bc94a56e6db63b582afbd4b5d48527afc mozilla-sunbird-bin-0.5.ebuild 4081
+MISC ChangeLog 5265 RMD160 42104ba6881d25a9d06b9c49920da0f147fd7d64 SHA1 58a2e326a68550f41f62530eddf6e6a5be527b50 SHA256 7a8b03543758c53f18280433077e19c8f67c15aa4892f5991b9f72a7a5a61603
+MD5 a0e7bcb4206b34b868a23244845ac478 ChangeLog 5265
+RMD160 42104ba6881d25a9d06b9c49920da0f147fd7d64 ChangeLog 5265
+SHA256 7a8b03543758c53f18280433077e19c8f67c15aa4892f5991b9f72a7a5a61603 ChangeLog 5265
 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/mozilla-sunbird-bin-0.5.ebuild b/app-office/mozilla-sunbird-bin/mozilla-sunbird-bin-0.5.ebuild
index 4736b3829fc0..6d3b1c0ce28d 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.5 2007/07/20 11:56:28 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/mozilla-sunbird-bin/mozilla-sunbird-bin-0.5.ebuild,v 1.6 2007/07/21 18:25:19 armin76 Exp $
 
 inherit eutils mozilla-launcher multilib mozextension
 
@@ -23,12 +23,6 @@ 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 )"
@@ -66,12 +60,36 @@ 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
 
-	for X in ${A}; do
-		[[ ${X} == *.xpi ]] && xpi_unpack ${X}
+	for X in ${linguas}; do
+		[[ ${X} != "en" ]] && xpi_unpack "${P/-bin/}-${X}.xpi"
 	done
+	if [[ ${linguas} != "" ]]; then
+		einfo "Selected language packs (first will be default): ${linguas}"
+	fi
 }
 
 src_install() {
@@ -82,16 +100,19 @@ src_install() {
 	touch ${S}/extensions/talkback@mozilla.org/chrome.manifest
 	mv ${S} ${D}${MOZILLA_FIVE_HOME}
 
-	# Install langpacks
-	for X in ${A}; do
-		[[ ${X} == *.xpi ]] && xpi_install "${WORKDIR}"/${X%.xpi}
+	linguas
+	for X in ${linguas}; do
+		[[ ${X} != "en" ]] && xpi_install "${WORKDIR}"/"${P/-bin/}-${X}"
 	done
 
-	# 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
+	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
 
 	# Create /usr/bin/sunbird-bin
 	install_mozilla_launcher_stub sunbird-bin ${MOZILLA_FIVE_HOME}