From 0499928efb8454581be716e463f58315ac1942bd Mon Sep 17 00:00:00 2001 From: Artur Maciąg Date: Tue, 3 Aug 2010 14:47:07 +0200 Subject: [www-client/firefox-bin] version bump --- www-client/firefox-bin/Manifest | 6 +- .../firefox-bin/firefox-bin-4.0_beta2_pre.ebuild | 180 --------------------- .../firefox-bin/firefox-bin-4.0_beta3_pre.ebuild | 180 +++++++++++++++++++++ 3 files changed, 183 insertions(+), 183 deletions(-) delete mode 100644 www-client/firefox-bin/firefox-bin-4.0_beta2_pre.ebuild create mode 100644 www-client/firefox-bin/firefox-bin-4.0_beta3_pre.ebuild diff --git a/www-client/firefox-bin/Manifest b/www-client/firefox-bin/Manifest index 8b7c7a4..6a8c90c 100644 --- a/www-client/firefox-bin/Manifest +++ b/www-client/firefox-bin/Manifest @@ -1,5 +1,5 @@ AUX 10firefox-bin 32 RMD160 0820c9d33296942b9d49f381ffd19e5bea4e5564 SHA1 ec1c6c8583e7252222815c0d6c161310d25b2f3e SHA256 3163273068698dfc7da0a2edf8e558bb31d30eece410960672674a0eb019dc08 AUX firefox-bin.desktop 194 RMD160 485e5d7625a8fd992144ca1b082c2cebf6842bf6 SHA1 7916e9a390230dc404ce6fb0ace7b07a4de05349 SHA256 b5e20842268d3a6e6d38b4a98aa555f11942b2c52594374850737ac0fc897e07 -DIST firefox-4.0b2pre.en-US.langpack.xpi 116653 RMD160 7a63a5def8cd6dfa58336a6f84859ce6f960ec82 SHA1 53245013e060e2cff907b8d40994cc7698af59bf SHA256 baaf448753b7f74cc02cea39cdd6919165ea640c0e160fa088c723227e6dc440 -DIST firefox-4.0b2pre.en-US.linux-x86_64.tar.bz2 13085409 RMD160 542b9d92fc8ccebc713535a222240b6b6aee5bfd SHA1 85a3b2aa1314c789ea056df9fffc6ae59e636c4e SHA256 36c122fd955b9776248549a11950077067fdbbbac9b79bcaada9ece63afd01ba -EBUILD firefox-bin-4.0_beta2_pre.ebuild 4870 RMD160 f5e0ec14270b83b0fca97c9d0536f5a6a6739c98 SHA1 f8e9cb0c57a0ceb2c471aa3d16579baab42df9d6 SHA256 c3b8072bd4aa6e893528459eab898db619d6aea63b62bf128bf9d3e77ef9c207 +DIST firefox-4.0b3pre.en-US.langpack.xpi 117689 RMD160 5b7efe9f33ca3c5552d3c8a767bcaf4adea99d79 SHA1 7b730ec46f9dad7e75a589c0d5522bbf41a30bff SHA256 bad05b0054be95529beb5789c109dc7a1e8691ad503c7663c833a1860fa901b7 +DIST firefox-4.0b3pre.en-US.linux-x86_64.tar.bz2 13278311 RMD160 3f9eb56fd8bd7abdb70a11da4947b0f2b9f14e9c SHA1 aba2a7a99283b8d497330c64a83e463c8eac9d90 SHA256 3bfcab3172cb794b00edce5867a87ba9870536e285a1b0821efd55c729fd5e26 +EBUILD firefox-bin-4.0_beta3_pre.ebuild 4870 RMD160 f5e0ec14270b83b0fca97c9d0536f5a6a6739c98 SHA1 f8e9cb0c57a0ceb2c471aa3d16579baab42df9d6 SHA256 c3b8072bd4aa6e893528459eab898db619d6aea63b62bf128bf9d3e77ef9c207 diff --git a/www-client/firefox-bin/firefox-bin-4.0_beta2_pre.ebuild b/www-client/firefox-bin/firefox-bin-4.0_beta2_pre.ebuild deleted file mode 100644 index 34244dd..0000000 --- a/www-client/firefox-bin/firefox-bin-4.0_beta2_pre.ebuild +++ /dev/null @@ -1,180 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ -# Quick and dirty pre-release version -EAPI="2" - -inherit eutils mozilla-launcher multilib mozextension - -LANGS="en-US" - -MY_PV="${PV/_rc/rc}" -MY_PV="${MY_PV/_pre/pre}" -MY_PV="${MY_PV/_beta/b}" -MY_PN="${PN/-bin}" -MY_P="${MY_PN}-${MY_PV}" -if use amd64; then - MY_ARCH="linux-x86_64" -else - MY_ARCH="linux-i686" -fi - -DESCRIPTION="Firefox Web Browser" -REL_URI="http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/latest-trunk" -XPI_URI="${REL_URI}/${MY_P}.en-US.langpack.xpi" -SRC_URI="${REL_URI}/${MY_P}.en-US.${MY_ARCH}.tar.bz2" -SRC_URI="${SRC_URI} ${XPI_URI}" -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/-/_}? ( ${XPI_URI}/${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%%-*}? ( ${XPI_URI}/${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}.en-US.${MY_ARCH}.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 ! 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 - einfo - einfo "Set extensions.checkCompatibility.4.0b preference to false" - einfo "in about:config if you want to use incompatible extensions" - einfo - update_mozilla_launcher_symlinks -} - -pkg_postrm() { - update_mozilla_launcher_symlinks -} diff --git a/www-client/firefox-bin/firefox-bin-4.0_beta3_pre.ebuild b/www-client/firefox-bin/firefox-bin-4.0_beta3_pre.ebuild new file mode 100644 index 0000000..34244dd --- /dev/null +++ b/www-client/firefox-bin/firefox-bin-4.0_beta3_pre.ebuild @@ -0,0 +1,180 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ +# Quick and dirty pre-release version +EAPI="2" + +inherit eutils mozilla-launcher multilib mozextension + +LANGS="en-US" + +MY_PV="${PV/_rc/rc}" +MY_PV="${MY_PV/_pre/pre}" +MY_PV="${MY_PV/_beta/b}" +MY_PN="${PN/-bin}" +MY_P="${MY_PN}-${MY_PV}" +if use amd64; then + MY_ARCH="linux-x86_64" +else + MY_ARCH="linux-i686" +fi + +DESCRIPTION="Firefox Web Browser" +REL_URI="http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/latest-trunk" +XPI_URI="${REL_URI}/${MY_P}.en-US.langpack.xpi" +SRC_URI="${REL_URI}/${MY_P}.en-US.${MY_ARCH}.tar.bz2" +SRC_URI="${SRC_URI} ${XPI_URI}" +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/-/_}? ( ${XPI_URI}/${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%%-*}? ( ${XPI_URI}/${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}.en-US.${MY_ARCH}.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 ! 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 + einfo + einfo "Set extensions.checkCompatibility.4.0b preference to false" + einfo "in about:config if you want to use incompatible extensions" + einfo + update_mozilla_launcher_symlinks +} + +pkg_postrm() { + update_mozilla_launcher_symlinks +} -- cgit v1.2.3-65-gdbad