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

Package-Manager: portage-2.1.3_rc8

6 files changed, 54 insertions, 62 deletions

diff --git a/www-client/mozilla-firefox/ChangeLog b/www-client/mozilla-firefox/ChangeLog
index 7c377cc74158..d4b65727ace6 100644
--- a/www-client/mozilla-firefox/ChangeLog
+++ b/www-client/mozilla-firefox/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-client/mozilla-firefox
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,v 1.305 2007/07/18 17:56:31 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,v 1.306 2007/07/19 20:38:28 armin76 Exp $
+
+  19 Jul 2007; Raúl Porcel <armin76@gentoo.org>
+  files/icon/mozilla-firefox-1.5-unbranded.desktop,
+  files/icon/mozilla-firefox-1.5.desktop, +files/gentoo-default-prefs-r1.js,
+  mozilla-firefox-2.0.0.5.ebuild:
+  Fix desktop files, bug 185869 and now it uses the langpack according to the
+  locale, bug 182175
 
 *mozilla-firefox-2.0.0.5 (18 Jul 2007)
 
diff --git a/www-client/mozilla-firefox/Manifest b/www-client/mozilla-firefox/Manifest
index 8178a76989a8..fce810df1e37 100644
--- a/www-client/mozilla-firefox/Manifest
+++ b/www-client/mozilla-firefox/Manifest
@@ -2,6 +2,10 @@ AUX firefox.1 2538 RMD160 4564007d7d5345e9ab09c941015e3cdb78913835 SHA1 8be19874
 MD5 6a7a2240dc5864e7f8ee444e34e84461 files/firefox.1 2538
 RMD160 4564007d7d5345e9ab09c941015e3cdb78913835 files/firefox.1 2538
 SHA256 3483439a73c74b818bdde98c15223b6d3fcfe78e3ad974fb35f197cf3ad614e7 files/firefox.1 2538
+AUX gentoo-default-prefs-r1.js 614 RMD160 cf5e4c1369f810401e26e8bdc197f3b167f940f3 SHA1 f9d3406eda00df05b1e6932d4ae18be425449143 SHA256 aec1460b6ce5fbc554f858a63bbf1c2779fa5e32df0dd98a0e065df2fe5a294a
+MD5 c94f1646d9948fecc17c2ce8c1817f74 files/gentoo-default-prefs-r1.js 614
+RMD160 cf5e4c1369f810401e26e8bdc197f3b167f940f3 files/gentoo-default-prefs-r1.js 614
+SHA256 aec1460b6ce5fbc554f858a63bbf1c2779fa5e32df0dd98a0e065df2fe5a294a files/gentoo-default-prefs-r1.js 614
 AUX gentoo-default-prefs.js 565 RMD160 2cc248e9375e75d86d90cf4f5b4634b384df9aa6 SHA1 3adfdb6763fa340b87a0b0ddeb23c6aeca025d4c SHA256 12deb91fe8d41eaa27b45eec7b9a431025b262ea0a29f08f66253fb85dec6916
 MD5 811c73a15bc9ec9b44c052d036b51a5a files/gentoo-default-prefs.js 565
 RMD160 2cc248e9375e75d86d90cf4f5b4634b384df9aa6 files/gentoo-default-prefs.js 565
@@ -14,14 +18,14 @@ AUX icon/firefox-icon.png 3979 RMD160 7d8f39974e9853dcdd4af05142c9b57ae187ab45 S
 MD5 bff260036c5dcca45da3218517fb33d8 files/icon/firefox-icon.png 3979
 RMD160 7d8f39974e9853dcdd4af05142c9b57ae187ab45 files/icon/firefox-icon.png 3979
 SHA256 064ddf97649424540df1d4a4727ee4c08d6b2b7389621855601aec58241ac67e files/icon/firefox-icon.png 3979
-AUX icon/mozilla-firefox-1.5-unbranded.desktop 262 RMD160 3b86a4131d08534f8d5172efe327cc4002ebddf0 SHA1 9a53e878f0aeff1e11549095331d3e7ee07c546b SHA256 4f59dc18a8f6f9e252311b17691e366ed53b387698fa017b52fd7697a6bc791b
-MD5 937225b0fb23378e1a08e8761ce034a7 files/icon/mozilla-firefox-1.5-unbranded.desktop 262
-RMD160 3b86a4131d08534f8d5172efe327cc4002ebddf0 files/icon/mozilla-firefox-1.5-unbranded.desktop 262
-SHA256 4f59dc18a8f6f9e252311b17691e366ed53b387698fa017b52fd7697a6bc791b files/icon/mozilla-firefox-1.5-unbranded.desktop 262
-AUX icon/mozilla-firefox-1.5.desktop 259 RMD160 7b2c3de5bb2e1d136bd6ecfc968dd9f00db04747 SHA1 8d5864b3a4476f9f345422c9f336927d2c145f26 SHA256 3c77e8c9261cfb863b9fdd290122f4f14de5302854bd21a450f85f2da68ca15c
-MD5 22c0657f6cced2344a1848a5d0566928 files/icon/mozilla-firefox-1.5.desktop 259
-RMD160 7b2c3de5bb2e1d136bd6ecfc968dd9f00db04747 files/icon/mozilla-firefox-1.5.desktop 259
-SHA256 3c77e8c9261cfb863b9fdd290122f4f14de5302854bd21a450f85f2da68ca15c files/icon/mozilla-firefox-1.5.desktop 259
+AUX icon/mozilla-firefox-1.5-unbranded.desktop 261 RMD160 177357e4c7aaaf778f95276237423f59beb2adb9 SHA1 bf74a1e4fa56d3fb0cac1c2ac042effc268ab19b SHA256 b90f1988853def3677122b20df92a3c50af2f2da7e7dc288ae90b3016d58c94e
+MD5 33e6d1463e79b82abba8577b0f733c01 files/icon/mozilla-firefox-1.5-unbranded.desktop 261
+RMD160 177357e4c7aaaf778f95276237423f59beb2adb9 files/icon/mozilla-firefox-1.5-unbranded.desktop 261
+SHA256 b90f1988853def3677122b20df92a3c50af2f2da7e7dc288ae90b3016d58c94e files/icon/mozilla-firefox-1.5-unbranded.desktop 261
+AUX icon/mozilla-firefox-1.5.desktop 258 RMD160 e51fa7ee3e6b8498e73ecd8aafa0bf761c2b6774 SHA1 0560e600fd94fda8e67c914c68a4b46a06215363 SHA256 1672c710088ec5b6e39e49c6cf547978a8f44ebd9de8aacfa28d91b62f0cfc80
+MD5 2ee92d5ef44b17bf0baf9157961a159b files/icon/mozilla-firefox-1.5.desktop 258
+RMD160 e51fa7ee3e6b8498e73ecd8aafa0bf761c2b6774 files/icon/mozilla-firefox-1.5.desktop 258
+SHA256 1672c710088ec5b6e39e49c6cf547978a8f44ebd9de8aacfa28d91b62f0cfc80 files/icon/mozilla-firefox-1.5.desktop 258
 AUX mozilla-filepicker.patch 722 RMD160 5d47c8d1c7f6288071295dadc0779b1eed13a2f2 SHA1 987535d45fbefd2ae0a3de4cc19e7fc86dc17c3e SHA256 f716c34efe691c8fe8924682b663670926614962bf782bac13e52fb77aeee13c
 MD5 7488714d50d781a9417f565d2663f5e5 files/mozilla-filepicker.patch 722
 RMD160 5d47c8d1c7f6288071295dadc0779b1eed13a2f2 files/mozilla-filepicker.patch 722
@@ -339,14 +343,14 @@ EBUILD mozilla-firefox-2.0.0.4.ebuild 9114 RMD160 6cd208d6541bb8649e015c69946e6c
 MD5 51d2e40a39bef8e6303ceba9f0cdc449 mozilla-firefox-2.0.0.4.ebuild 9114
 RMD160 6cd208d6541bb8649e015c69946e6cc550de73d5 mozilla-firefox-2.0.0.4.ebuild 9114
 SHA256 132c421ac144ab2d5661c98a3a210ba326843bd59e73ea0d1552a6133f2beedc mozilla-firefox-2.0.0.4.ebuild 9114
-EBUILD mozilla-firefox-2.0.0.5.ebuild 9131 RMD160 88554377ddbe9dca347aac4899253cb866766f3e SHA1 20b868379b4d253f85004784c5efa10da48f72c5 SHA256 3fe14ce6b05d9df8d44df9143841fb63cb865da034776cf852ddf8a6904235f4
-MD5 68848a56374b703788e0cd30108110bd mozilla-firefox-2.0.0.5.ebuild 9131
-RMD160 88554377ddbe9dca347aac4899253cb866766f3e mozilla-firefox-2.0.0.5.ebuild 9131
-SHA256 3fe14ce6b05d9df8d44df9143841fb63cb865da034776cf852ddf8a6904235f4 mozilla-firefox-2.0.0.5.ebuild 9131
-MISC ChangeLog 68517 RMD160 323a11caf68f8abcdb0f9184202dcbddf97bd688 SHA1 4bbe549e0b7c3ef57aed712ae6bcd9fe358137d8 SHA256 a2a45de02adb654c21b6a9b5ceb9682dd8cedc06cfafe1fb7a5b5ecf75c508d9
-MD5 6121eed81855bffd517fa49cbe7a34b5 ChangeLog 68517
-RMD160 323a11caf68f8abcdb0f9184202dcbddf97bd688 ChangeLog 68517
-SHA256 a2a45de02adb654c21b6a9b5ceb9682dd8cedc06cfafe1fb7a5b5ecf75c508d9 ChangeLog 68517
+EBUILD mozilla-firefox-2.0.0.5.ebuild 8089 RMD160 93c65d46c497fa55b7fe479a8773296b8800e548 SHA1 68533e2611319b3f309652ff27ecf352317c8c00 SHA256 1ddd03565a82e2497dfc2d395665858e7e6afc02316180ee4499dec13ad5ac21
+MD5 cfd78955b96a55aec756ea93aaf35535 mozilla-firefox-2.0.0.5.ebuild 8089
+RMD160 93c65d46c497fa55b7fe479a8773296b8800e548 mozilla-firefox-2.0.0.5.ebuild 8089
+SHA256 1ddd03565a82e2497dfc2d395665858e7e6afc02316180ee4499dec13ad5ac21 mozilla-firefox-2.0.0.5.ebuild 8089
+MISC ChangeLog 68829 RMD160 4c0704ea785419deeae3634d9e2cd58cfd18d615 SHA1 15223bf1c523f8f2ab92697dc6e0dab804ca6999 SHA256 bb0da12878f8b1aee43d27f21126264e9953c52a81b37a2d9d56859581b95564
+MD5 19c65462d83c5a915f9fd1bfbc808d8d ChangeLog 68829
+RMD160 4c0704ea785419deeae3634d9e2cd58cfd18d615 ChangeLog 68829
+SHA256 bb0da12878f8b1aee43d27f21126264e9953c52a81b37a2d9d56859581b95564 ChangeLog 68829
 MISC metadata.xml 160 RMD160 d5a9f0bf8989621c2bde30facb53bcae00aba709 SHA1 5015c07af2083f20f9552d7fb11afb5ea69af345 SHA256 0cc5126362a12cee42ec1197c528a804cf36859329dd2c6d9225726831d14b8b
 MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
 RMD160 d5a9f0bf8989621c2bde30facb53bcae00aba709 metadata.xml 160
diff --git a/www-client/mozilla-firefox/files/gentoo-default-prefs-r1.js b/www-client/mozilla-firefox/files/gentoo-default-prefs-r1.js
new file mode 100644
index 000000000000..1804a5bebc79
--- /dev/null
+++ b/www-client/mozilla-firefox/files/gentoo-default-prefs-r1.js
@@ -0,0 +1,12 @@
+pref("app.update.enabled",                 false);
+pref("app.update.autoInstallEnabled",      false);
+pref("browser.display.use_system_colors",  true);
+pref("browser.link.open_external",         3);
+pref("general.smoothScroll",               true);
+pref("general.autoScroll",                 false);
+pref("browser.tabs.tabMinWidth",           15);
+pref("browser.backspace_action",           0);
+pref("browser.urlbar.hideGoButton",        true);
+pref("accessibility.typeaheadfind",        true);
+pref("browser.startup.homepage",           "http://www.gentoo.org/");
+pref("intl.locale.matchOS",                true);
\ No newline at end of file
diff --git a/www-client/mozilla-firefox/files/icon/mozilla-firefox-1.5-unbranded.desktop b/www-client/mozilla-firefox/files/icon/mozilla-firefox-1.5-unbranded.desktop
index c6d351b5cc6c..8ba0823af8c5 100644
--- a/www-client/mozilla-firefox/files/icon/mozilla-firefox-1.5-unbranded.desktop
+++ b/www-client/mozilla-firefox/files/icon/mozilla-firefox-1.5-unbranded.desktop
@@ -6,4 +6,4 @@ Icon=firefox-icon-unbranded.png
 Terminal=false
 Type=Application
 MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml
-Categories=Application;Network;
+Categories=Network;WebBrowser;
diff --git a/www-client/mozilla-firefox/files/icon/mozilla-firefox-1.5.desktop b/www-client/mozilla-firefox/files/icon/mozilla-firefox-1.5.desktop
index c47769afb72c..71eaa2915963 100644
--- a/www-client/mozilla-firefox/files/icon/mozilla-firefox-1.5.desktop
+++ b/www-client/mozilla-firefox/files/icon/mozilla-firefox-1.5.desktop
@@ -6,4 +6,4 @@ Icon=firefox-icon.png
 Terminal=false
 Type=Application
 MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml
-Categories=Application;Network;
+Categories=Network;WebBrowser;
diff --git a/www-client/mozilla-firefox/mozilla-firefox-2.0.0.5.ebuild b/www-client/mozilla-firefox/mozilla-firefox-2.0.0.5.ebuild
index 3321a9cc183e..e28f6425e308 100644
--- a/www-client/mozilla-firefox/mozilla-firefox-2.0.0.5.ebuild
+++ b/www-client/mozilla-firefox/mozilla-firefox-2.0.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/www-client/mozilla-firefox/mozilla-firefox-2.0.0.5.ebuild,v 1.1 2007/07/18 17:56:31 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/mozilla-firefox-2.0.0.5.ebuild,v 1.2 2007/07/19 20:38:28 armin76 Exp $
 
 WANT_AUTOCONF="2.1"
 
@@ -59,28 +59,6 @@ export MOZ_CO_PROJECT=browser
 export BUILD_OFFICIAL=1
 export MOZILLA_OFFICIAL=1
 
-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}-"* ]] && \
-					[[ " ${NOSHORTLANGS} " != *" ${X} "* ]]; then
-					has ${X} ${linguas} || linguas="${linguas:+"${linguas} "}${X}"
-					continue 2
-				fi
-			done
-		fi
-		ewarn "Sorry, but mozilla-firefox does not support the ${LANG} LINGUA"
-	done
-}
-
 pkg_setup(){
 	if ! built_with_use x11-libs/cairo X; then
 		eerror "Cairo is not built with X useflag."
@@ -100,13 +78,9 @@ pkg_setup(){
 src_unpack() {
 	unpack firefox-${PV}-source.tar.bz2  ${PATCH}.tar.bz2
 
-	linguas
-	for X in ${linguas}; do
-		[[ ${X} != "en" ]] && xpi_unpack "${P}-${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
 
 	# Apply our patches
 	cd "${S}" || die "cd failed"
@@ -209,20 +183,10 @@ src_install() {
 	dodir "${MOZILLA_FIVE_HOME}"
 	cp -RL "${S}"/dist/bin/* "${D}"/"${MOZILLA_FIVE_HOME}"/ || die "cp failed"
 
-	linguas
-	for X in ${linguas}; do
-		[[ ${X} != "en" ]] && xpi_install "${WORKDIR}"/"${P}-${X}"
+	for X in ${A}; do
+		[[ ${X} == *.xpi ]] && xpi_install "${WORKDIR}"/${X%.xpi}
 	done
 
-	local LANG=${linguas%% *}
-	if [[ -n ${LANG} && ${LANG} != "en" ]]; then
-		elog "Setting default locale to ${LANG}"
-		dosed -e "s:general.useragent.locale\", \"en-US\":general.useragent.locale\", \"${LANG}\":" \
-			"${MOZILLA_FIVE_HOME}"/defaults/pref/firefox.js \
-			"${MOZILLA_FIVE_HOME}"/defaults/pref/firefox-l10n.js || \
-			die "sed failed to change locale"
-	fi
-
 	# Create /usr/bin/firefox
 	install_mozilla_launcher_stub firefox "${MOZILLA_FIVE_HOME}"
 
@@ -256,9 +220,9 @@ src_install() {
 	doins "${S}"/build/unix/*.pc
 
 	insinto "${MOZILLA_FIVE_HOME}"/greprefs
-	newins "${FILESDIR}"/gentoo-default-prefs.js all-gentoo.js
+	newins "${FILESDIR}"/gentoo-default-prefs-r1.js all-gentoo.js
 	insinto "${MOZILLA_FIVE_HOME}"/defaults/pref
-	newins "${FILESDIR}"/gentoo-default-prefs.js all-gentoo.js
+	newins "${FILESDIR}"/gentoo-default-prefs-r1.js all-gentoo.js
 }
 
 pkg_postinst() {
@@ -277,6 +241,11 @@ pkg_postinst() {
 	elog "is the case, please search at http://bugs.gentoo.org and open a new bug"
 	elog "if one does not exist. Before filing any bugs, please move or remove ~/.mozilla"
 	elog "and test with a clean profile directory."
+
+	elog
+	elog "The behaviour of the langpacks has changed, now ${PN}"
+	elog "will be displayed in your locale"
+	elog
 }
 
 pkg_postrm() {