diff options
author | Raúl Porcel <armin76@gentoo.org> | 2007-07-21 18:06:03 +0000 |
---|---|---|
committer | Raúl Porcel <armin76@gentoo.org> | 2007-07-21 18:06:03 +0000 |
commit | ca154d18a256d37d1fbcdf298c2c15aabde097a9 (patch) | |
tree | c462d282bd768ef19bd7b7e63b1129f47ecb0e5f /www-client/mozilla-firefox | |
parent | Cleanup, Version bump (Bug #133187), add myself as maintainer (diff) | |
download | gentoo-2-ca154d18a256d37d1fbcdf298c2c15aabde097a9.tar.gz gentoo-2-ca154d18a256d37d1fbcdf298c2c15aabde097a9.tar.bz2 gentoo-2-ca154d18a256d37d1fbcdf298c2c15aabde097a9.zip |
Revert the langpack thing, bug 182175
(Portage version: 2.1.3_rc8)
Diffstat (limited to 'www-client/mozilla-firefox')
-rw-r--r-- | www-client/mozilla-firefox/ChangeLog | 6 | ||||
-rw-r--r-- | www-client/mozilla-firefox/files/gentoo-default-prefs-r1.js | 12 | ||||
-rw-r--r-- | www-client/mozilla-firefox/mozilla-firefox-2.0.0.5.ebuild | 55 |
3 files changed, 48 insertions, 25 deletions
diff --git a/www-client/mozilla-firefox/ChangeLog b/www-client/mozilla-firefox/ChangeLog index d4b65727ace6..cc7942362291 100644 --- a/www-client/mozilla-firefox/ChangeLog +++ b/www-client/mozilla-firefox/ChangeLog @@ -1,6 +1,10 @@ # 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.306 2007/07/19 20:38:28 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,v 1.307 2007/07/21 18:06:03 armin76 Exp $ + + 21 Jul 2007; Raúl Porcel <armin76@gentoo.org> + -files/gentoo-default-prefs-r1.js, mozilla-firefox-2.0.0.5.ebuild: + Revert the langpack thing, bug 182175 19 Jul 2007; Raúl Porcel <armin76@gentoo.org> files/icon/mozilla-firefox-1.5-unbranded.desktop, diff --git a/www-client/mozilla-firefox/files/gentoo-default-prefs-r1.js b/www-client/mozilla-firefox/files/gentoo-default-prefs-r1.js deleted file mode 100644 index 1804a5bebc79..000000000000 --- a/www-client/mozilla-firefox/files/gentoo-default-prefs-r1.js +++ /dev/null @@ -1,12 +0,0 @@ -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/mozilla-firefox-2.0.0.5.ebuild b/www-client/mozilla-firefox/mozilla-firefox-2.0.0.5.ebuild index e28f6425e308..04b388ea7a50 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.2 2007/07/19 20:38:28 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/mozilla-firefox-2.0.0.5.ebuild,v 1.3 2007/07/21 18:06:03 armin76 Exp $ WANT_AUTOCONF="2.1" @@ -59,6 +59,28 @@ 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." @@ -78,9 +100,13 @@ pkg_setup(){ src_unpack() { unpack firefox-${PV}-source.tar.bz2 ${PATCH}.tar.bz2 - for X in ${A}; do - [[ ${X} == *.xpi ]] && xpi_unpack ${X} + linguas + for X in ${linguas}; do + [[ ${X} != "en" ]] && xpi_unpack "${P}-${X}.xpi" done + if [[ ${linguas} != "" ]]; then + einfo "Selected language packs (first will be default): ${linguas}" + fi # Apply our patches cd "${S}" || die "cd failed" @@ -183,10 +209,20 @@ src_install() { dodir "${MOZILLA_FIVE_HOME}" cp -RL "${S}"/dist/bin/* "${D}"/"${MOZILLA_FIVE_HOME}"/ || die "cp failed" - for X in ${A}; do - [[ ${X} == *.xpi ]] && xpi_install "${WORKDIR}"/${X%.xpi} + linguas + for X in ${linguas}; do + [[ ${X} != "en" ]] && xpi_install "${WORKDIR}"/"${P}-${X}" 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}" @@ -220,9 +256,9 @@ src_install() { doins "${S}"/build/unix/*.pc insinto "${MOZILLA_FIVE_HOME}"/greprefs - newins "${FILESDIR}"/gentoo-default-prefs-r1.js all-gentoo.js + newins "${FILESDIR}"/gentoo-default-prefs.js all-gentoo.js insinto "${MOZILLA_FIVE_HOME}"/defaults/pref - newins "${FILESDIR}"/gentoo-default-prefs-r1.js all-gentoo.js + newins "${FILESDIR}"/gentoo-default-prefs.js all-gentoo.js } pkg_postinst() { @@ -241,11 +277,6 @@ 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() { |