From d168e8de2f6826c80cb2108ec1597423debc740f Mon Sep 17 00:00:00 2001 From: Jory Pratt Date: Sun, 26 Sep 2010 17:06:39 +0000 Subject: Update for crash fixes, remove stale ebuilds (Portage version: 2.1.9.10/cvs/Linux x86_64) --- www-client/firefox-bin/ChangeLog | 8 +- www-client/firefox-bin/firefox-bin-3.6.10.ebuild | 182 +++++++++++++++++++++++ www-client/firefox-bin/firefox-bin-3.6.8.ebuild | 180 ---------------------- 3 files changed, 189 insertions(+), 181 deletions(-) create mode 100644 www-client/firefox-bin/firefox-bin-3.6.10.ebuild delete mode 100644 www-client/firefox-bin/firefox-bin-3.6.8.ebuild (limited to 'www-client') diff --git a/www-client/firefox-bin/ChangeLog b/www-client/firefox-bin/ChangeLog index 15373cc0ca4e..43166841c17a 100644 --- a/www-client/firefox-bin/ChangeLog +++ b/www-client/firefox-bin/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for www-client/firefox-bin # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/ChangeLog,v 1.32 2010/09/11 10:28:09 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/ChangeLog,v 1.33 2010/09/26 17:06:39 anarchy Exp $ + +*firefox-bin-3.6.10 (26 Sep 2010) + + 26 Sep 2010; Jory A. Pratt -firefox-bin-3.6.8.ebuild, + +firefox-bin-3.6.10.ebuild: + Update for crash fixes, remove stale ebuilds 11 Sep 2010; Markos Chandras firefox-bin-3.6.9.ebuild: diff --git a/www-client/firefox-bin/firefox-bin-3.6.10.ebuild b/www-client/firefox-bin/firefox-bin-3.6.10.ebuild new file mode 100644 index 000000000000..24d0b0b798ef --- /dev/null +++ b/www-client/firefox-bin/firefox-bin-3.6.10.ebuild @@ -0,0 +1,182 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/firefox-bin-3.6.10.ebuild,v 1.1 2010/09/26 17:06:39 anarchy Exp $ +EAPI="2" + +inherit eutils mozilla-launcher multilib mozextension + +# Can be updated using scripts/get_langs.sh from mozilla overlay +# '\' at EOL is needed for ${LANG} matching in linguas() below +LANGS="af ar as be bg bn-BD bn-IN ca cs cy da de el en en-GB en-US eo es-AR \ +es-CL es-ES es-MX et eu fa fi fr fy-NL ga-IE gl gu-IN he hi-IN hr hu id is it \ +ja ka kk kn ko ku lt lv mk ml mr nb-NO nl nn-NO oc or pa-IN pl pt-BR pt-PT rm \ +ro ru si sk sl sq sr sv-SE ta ta-LK te th tr uk vi zh-CN zh-TW" +NOSHORTLANGS="en-GB es-AR pt-BR zh-CN" + +MY_PV="${PV/_rc/rc}" +MY_PN="${PN/-bin}" +MY_P="${MY_PN}-${MY_PV}" + +DESCRIPTION="Firefox Web Browser" +REL_URI="http://releases.mozilla.org/pub/mozilla.org/${MY_PN}/releases/" +SRC_URI="${REL_URI}/${MY_PV}/linux-i686/en-US/${MY_P}.tar.bz2" +HOMEPAGE="http://www.mozilla.com/firefox" +RESTRICT="strip mirror" + +KEYWORDS="-* ~amd64 ~x86" +SLOT="0" +LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )" +IUSE="startup-notification" + +for X in ${LANGS} ; do + if [ "${X}" != "en" ] && [ "${X}" != "en-US" ]; then + SRC_URI="${SRC_URI} + linguas_${X/-/_}? ( ${REL_URI}/${MY_PV}/linux-i686/xpi/${X}.xpi -> ${P/-bin/}-${X}.xpi )" + fi + IUSE="${IUSE} linguas_${X/-/_}" + # english is handled internally + if [ "${#X}" == 5 ] && ! has ${X} ${NOSHORTLANGS}; then + if [ "${X}" != "en-US" ]; then + SRC_URI="${SRC_URI} + linguas_${X%%-*}? ( ${REL_URI}/${MY_PV}/linux-i686/xpi/${X}.xpi -> ${P/-bin/}-${X}.xpi )" + fi + IUSE="${IUSE} linguas_${X%%-*}" + fi +done + +DEPEND="app-arch/unzip" +RDEPEND="dev-libs/dbus-glib + x11-libs/libXrender + x11-libs/libXt + x11-libs/libXmu + x86? ( + >=x11-libs/gtk+-2.2 + >=media-libs/alsa-lib-1.0.16 + ) + amd64? ( + >=app-emulation/emul-linux-x86-baselibs-20081109 + >=app-emulation/emul-linux-x86-gtklibs-20081109 + >=app-emulation/emul-linux-x86-soundlibs-20081109 + )" + +S="${WORKDIR}/${MY_PN}" + +pkg_setup() { + # This is a binary x86 package => ABI=x86 + # Please keep this in future versions + # Danny van Dyk 2005/03/26 + 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}-"* ]] && \ + [[ " ${NOSHORTLANGS} " != *" ${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_P}.tar.bz2 + + linguas + for X in ${linguas}; do + [[ ${X} != "en" ]] && xpi_unpack "${P/-bin/}-${X}.xpi" + done + if [[ ${linguas} != "" && ${linguas} != "en" ]]; then + einfo "Selected language packs (first will be default): ${linguas}" + fi +} + +src_install() { + declare MOZILLA_FIVE_HOME=/opt/${MY_PN} + + # Install icon and .desktop for menu entry + newicon "${S}"/chrome/icons/default/default48.png ${PN}-icon.png + domenu "${FILESDIR}"/${PN}.desktop + + # Add StartupNotify=true bug 237317 + if use startup-notification; then + echo "StartupNotify=true" >> "${D}"/usr/share/applications/${PN}.desktop + fi + + # Install firefox in /opt + dodir ${MOZILLA_FIVE_HOME%/*} + mv "${S}" "${D}"${MOZILLA_FIVE_HOME} + + linguas + for X in ${linguas}; do + [[ ${X} != "en" ]] && xpi_install "${WORKDIR}"/"${P/-bin/}-${X}" + done + + local LANG=${linguas%% *} + if [[ -n ${LANG} && ${LANG} != "en" ]]; then + elog "Setting default locale to ${LANG}" + sed -e "s:general.useragent.locale\", \"en-US\":general.useragent.locale\", \"${LANG}\":" \ + -i "${D}${MOZILLA_FIVE_HOME}"/defaults/pref/${MY_PN}.js \ + -i "${D}${MOZILLA_FIVE_HOME}"/defaults/pref/${MY_PN}-l10n.js || \ + die "sed failed to change locale" + fi + + # Create /usr/bin/firefox-bin + dodir /usr/bin/ + cat <"${D}"/usr/bin/${PN} +#!/bin/sh +unset LD_PRELOAD +LD_LIBRARY_PATH="/opt/firefox/" +if use amd64 ; then +GTK_PATH=/usr/lib32/gtk-2.0/ +fi +exec /opt/${MY_PN}/${MY_PN} "\$@" +EOF + fperms 0755 /usr/bin/${PN} + + # revdep-rebuild entry + insinto /etc/revdep-rebuild + doins "${FILESDIR}"/10${PN} || die + + rm -rf "${D}"${MOZILLA_FIVE_HOME}/plugins + dosym /usr/"$(get_libdir)"/nsbrowser/plugins ${MOZILLA_FIVE_HOME}/plugins || die +} + +pkg_postinst() { + if use x86; then + if ! has_version 'gnome-base/gconf' || ! has_version 'gnome-base/orbit' \ + || ! has_version 'net-misc/curl'; then + einfo + einfo "For using the crashreporter, you need gnome-base/gconf," + einfo "gnome-base/orbit and net-misc/curl emerged." + einfo + fi + if has_version 'net-misc/curl[nss]'; then + einfo + einfo "Crashreporter won't be able to send reports" + einfo "if you have curl emerged with the nss USE-flag" + einfo + fi + else + einfo + einfo "NB: You just installed a 32-bit ${MY_P}" + einfo + einfo "Crashreporter won't work on amd64" + einfo + fi +} + +pkg_postrm() { + update_mozilla_launcher_symlinks +} diff --git a/www-client/firefox-bin/firefox-bin-3.6.8.ebuild b/www-client/firefox-bin/firefox-bin-3.6.8.ebuild deleted file mode 100644 index ff8dee17bd6c..000000000000 --- a/www-client/firefox-bin/firefox-bin-3.6.8.ebuild +++ /dev/null @@ -1,180 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/firefox-bin-3.6.8.ebuild,v 1.3 2010/07/26 19:18:04 maekke Exp $ -EAPI="2" - -inherit eutils mozilla-launcher multilib mozextension - -# Can be updated using scripts/get_langs.sh from mozilla overlay -# '\' at EOL is needed for ${LANG} matching in linguas() below -LANGS="af ar as be bg bn-BD bn-IN ca cs cy da de el en en-GB en-US eo es-AR \ -es-CL es-ES es-MX et eu fa fi fr fy-NL ga-IE gl gu-IN he hi-IN hr hu id is it \ -ja ka kk kn ko ku lt lv mk ml mr nb-NO nl nn-NO oc or pa-IN pl pt-BR pt-PT rm \ -ro ru si sk sl sq sr sv-SE ta ta-LK te th tr uk vi zh-CN zh-TW" -NOSHORTLANGS="en-GB es-AR pt-BR zh-CN" - -MY_PV="${PV/_rc/rc}" -MY_PN="${PN/-bin}" -MY_P="${MY_PN}-${MY_PV}" - -DESCRIPTION="Firefox Web Browser" -REL_URI="http://releases.mozilla.org/pub/mozilla.org/${MY_PN}/releases/" -SRC_URI="${REL_URI}/${MY_PV}/linux-i686/en-US/${MY_P}.tar.bz2" -HOMEPAGE="http://www.mozilla.com/firefox" -RESTRICT="strip mirror" - -KEYWORDS="-* amd64 x86" -SLOT="0" -LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )" -IUSE="startup-notification" - -for X in ${LANGS} ; do - if [ "${X}" != "en" ] && [ "${X}" != "en-US" ]; then - SRC_URI="${SRC_URI} - linguas_${X/-/_}? ( ${REL_URI}/${MY_PV}/linux-i686/xpi/${X}.xpi -> mozilla-${MY_P}-${X}.xpi )" - fi - IUSE="${IUSE} linguas_${X/-/_}" - # english is handled internally - if [ "${#X}" == 5 ] && ! has ${X} ${NOSHORTLANGS}; then - if [ "${X}" != "en-US" ]; then - SRC_URI="${SRC_URI} - linguas_${X%%-*}? ( ${REL_URI}/${MY_PV}/linux-i686/xpi/${X}.xpi -> mozilla-${MY_P}-${X}.xpi )" - fi - IUSE="${IUSE} linguas_${X%%-*}" - fi -done - -DEPEND="app-arch/unzip" -RDEPEND="dev-libs/dbus-glib - x11-libs/libXrender - x11-libs/libXt - x11-libs/libXmu - x86? ( - >=x11-libs/gtk+-2.2 - >=media-libs/alsa-lib-1.0.16 - ) - amd64? ( - >=app-emulation/emul-linux-x86-baselibs-20081109 - >=app-emulation/emul-linux-x86-gtklibs-20081109 - >=app-emulation/emul-linux-x86-soundlibs-20081109 - )" - -S="${WORKDIR}/${MY_PN}" - -pkg_setup() { - # This is a binary x86 package => ABI=x86 - # Please keep this in future versions - # Danny van Dyk 2005/03/26 - 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}-"* ]] && \ - [[ " ${NOSHORTLANGS} " != *" ${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_P}.tar.bz2 - - linguas - for X in ${linguas}; do - [[ ${X} != "en" ]] && xpi_unpack "mozilla-${MY_P}-${X}.xpi" - done - if [[ ${linguas} != "" && ${linguas} != "en" ]]; then - einfo "Selected language packs (first will be default): ${linguas}" - fi -} - -src_install() { - declare MOZILLA_FIVE_HOME=/opt/${MY_PN} - - # Install icon and .desktop for menu entry - newicon "${S}"/chrome/icons/default/default48.png ${PN}-icon.png - domenu "${FILESDIR}"/${PN}.desktop - - # Add StartupNotify=true bug 237317 - if use startup-notification; then - echo "StartupNotify=true" >> "${D}"/usr/share/applications/${PN}.desktop - fi - - # Install firefox in /opt - dodir ${MOZILLA_FIVE_HOME%/*} - mv "${S}" "${D}"${MOZILLA_FIVE_HOME} - - linguas - for X in ${linguas}; do - [[ ${X} != "en" ]] && xpi_install "${WORKDIR}"/"mozilla-${MY_P}-${X}" - done - - local LANG=${linguas%% *} - if [[ -n ${LANG} && ${LANG} != "en" ]]; then - elog "Setting default locale to ${LANG}" - sed -e "s:general.useragent.locale\", \"en-US\":general.useragent.locale\", \"${LANG}\":" \ - -i "${D}${MOZILLA_FIVE_HOME}"/defaults/pref/${MY_PN}.js \ - -i "${D}${MOZILLA_FIVE_HOME}"/defaults/pref/${MY_PN}-l10n.js || \ - die "sed failed to change locale" - fi - - # Create /usr/bin/firefox-bin - dodir /usr/bin/ - cat <"${D}"/usr/bin/${PN} -#!/bin/sh -unset LD_PRELOAD -LD_LIBRARY_PATH="/opt/firefox/" -exec /opt/${MY_PN}/${MY_PN} "\$@" -EOF - fperms 0755 /usr/bin/${PN} - - # revdep-rebuild entry - insinto /etc/revdep-rebuild - doins "${FILESDIR}"/10${PN} || die - - rm -rf "${D}"${MOZILLA_FIVE_HOME}/plugins - dosym /usr/"$(get_libdir)"/nsbrowser/plugins ${MOZILLA_FIVE_HOME}/plugins || die -} - -pkg_postinst() { - if use x86; then - if ! has_version 'gnome-base/gconf' || ! has_version 'gnome-base/orbit' \ - || ! has_version 'net-misc/curl'; then - einfo - einfo "For using the crashreporter, you need gnome-base/gconf," - einfo "gnome-base/orbit and net-misc/curl emerged." - einfo - fi - if has_version 'net-misc/curl[nss]'; then - einfo - einfo "Crashreporter won't be able to send reports" - einfo "if you have curl emerged with the nss USE-flag" - einfo - fi - else - einfo - einfo "NB: You just installed a 32-bit ${MY_P}" - einfo - einfo "Crashreporter won't work on amd64" - einfo - fi - update_mozilla_launcher_symlinks -} - -pkg_postrm() { - update_mozilla_launcher_symlinks -} -- cgit v1.2.3-65-gdbad