diff options
author | Lars Wendler <polynomial-c@gentoo.org> | 2011-12-21 16:11:05 +0000 |
---|---|---|
committer | Lars Wendler <polynomial-c@gentoo.org> | 2011-12-21 16:11:05 +0000 |
commit | 532a02f8eb84d2cab712dd019381e7b658e06049 (patch) | |
tree | 945402a473ddea8433658521e190bf1dd6a26969 /www-client | |
parent | Marked ppc/ppc64 stable for bug #387429. (diff) | |
download | gentoo-2-532a02f8eb84d2cab712dd019381e7b658e06049.tar.gz gentoo-2-532a02f8eb84d2cab712dd019381e7b658e06049.tar.bz2 gentoo-2-532a02f8eb84d2cab712dd019381e7b658e06049.zip |
Version bump. Removed old
(Portage version: 2.2.0_alpha81/cvs/Linux x86_64)
Diffstat (limited to 'www-client')
-rw-r--r-- | www-client/firefox/ChangeLog | 9 | ||||
-rw-r--r-- | www-client/firefox/files/gentoo-default-prefs.js-1 | 17 | ||||
-rw-r--r-- | www-client/firefox/firefox-3.6.12.ebuild | 289 | ||||
-rw-r--r-- | www-client/firefox/firefox-3.6.21.ebuild | 287 | ||||
-rw-r--r-- | www-client/firefox/firefox-9.0.ebuild (renamed from www-client/firefox/firefox-7.0.1-r1.ebuild) | 31 |
5 files changed, 43 insertions, 590 deletions
diff --git a/www-client/firefox/ChangeLog b/www-client/firefox/ChangeLog index 5e98f16330f2..9bd327642c0b 100644 --- a/www-client/firefox/ChangeLog +++ b/www-client/firefox/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for www-client/firefox # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/ChangeLog,v 1.110 2011/12/11 14:33:51 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/ChangeLog,v 1.111 2011/12/21 16:11:05 polynomial-c Exp $ + +*firefox-9.0 (21 Dec 2011) + + 21 Dec 2011; Lars Wendler <polynomial-c@gentoo.org> + +files/gentoo-default-prefs.js-1, -firefox-3.6.12.ebuild, + -firefox-3.6.21.ebuild, -firefox-7.0.1-r1.ebuild, +firefox-9.0.ebuild: + Version bump. Removed old. 11 Dec 2011; Raúl Porcel <armin76@gentoo.org> firefox-3.6.22.ebuild: sparc stable diff --git a/www-client/firefox/files/gentoo-default-prefs.js-1 b/www-client/firefox/files/gentoo-default-prefs.js-1 new file mode 100644 index 000000000000..22a51ff7de41 --- /dev/null +++ b/www-client/firefox/files/gentoo-default-prefs.js-1 @@ -0,0 +1,17 @@ +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.shell.checkDefaultBrowser", false); +pref("browser.EULA.override", true); +pref("general.useragent.vendor", "Gentoo"); +pref("intl.locale.matchOS", true); +pref("general.useragent.locale", "chrome://global/locale/intl.properties"); +pref("extensions.autoDisableScopes", 0); +pref("layout.css.dpi", 0); diff --git a/www-client/firefox/firefox-3.6.12.ebuild b/www-client/firefox/firefox-3.6.12.ebuild deleted file mode 100644 index 9089a78c8ce5..000000000000 --- a/www-client/firefox/firefox-3.6.12.ebuild +++ /dev/null @@ -1,289 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/firefox-3.6.12.ebuild,v 1.11 2011/07/06 05:14:18 nirbheek Exp $ -EAPI="3" -WANT_AUTOCONF="2.1" - -inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib pax-utils fdo-mime autotools mozextension java-pkg-opt-2 python - -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 es-CL es-MX pt-BR zh-CN zh-TW" - -MAJ_XUL_PV="1.9.2" -MAJ_PV="${PV/_*/}" # Without the _rc and _beta stuff -DESKTOP_PV="3.6" -MY_PV="${PV/_rc/rc}" # Handle beta for SRC_URI -XUL_PV="${MAJ_XUL_PV}${MAJ_PV/${DESKTOP_PV}/}" # Major + Minor version no.s -PATCH="${PN}-3.6-patches-0.2" - -DESCRIPTION="Firefox Web Browser" -HOMEPAGE="http://www.mozilla.com/firefox" - -KEYWORDS="sparc" -SLOT="0" -LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )" -IUSE="+alsa bindist gnome +ipc java libnotify system-sqlite wifi" - -REL_URI="http://releases.mozilla.org/pub/mozilla.org/firefox/releases" -SRC_URI="${REL_URI}/${MY_PV}/source/firefox-${MY_PV}.source.tar.bz2 - http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.bz2" - -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}-${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}/${PV}/linux-i686/xpi/${X}.xpi -> ${P}-${X}.xpi )" - fi - IUSE="${IUSE} linguas_${X%%-*}" - fi -done - -RDEPEND=" - >=sys-devel/binutils-2.16.1 - >=dev-libs/nss-3.12.8 - >=dev-libs/nspr-4.8.6 - >=app-text/hunspell-1.2 - system-sqlite? ( >=dev-db/sqlite-3.7.1[fts3,secure-delete] ) - alsa? ( media-libs/alsa-lib ) - >=x11-libs/cairo-1.8.8[X] - gnome? ( >=gnome-base/gnome-vfs-2.16.3 - >=gnome-base/libgnomeui-2.16.1 - >=gnome-base/gconf-2.16.0 - >=gnome-base/libgnome-2.16.0 ) - wifi? ( net-wireless/wireless-tools ) - libnotify? ( >=x11-libs/libnotify-0.4 ) - ~net-libs/xulrunner-${XUL_PV}[ipc=,java=,wifi=,libnotify=,system-sqlite=]" - -DEPEND="${RDEPEND} - java? ( >=virtual/jdk-1.4 ) - =dev-lang/python-2*[threads] - dev-util/pkgconfig" - -RDEPEND="${RDEPEND} java? ( >=virtual/jre-1.4 )" - -S="${WORKDIR}/mozilla-1.9.2" - -# This is a copy of the launcher program installed as part of xulrunner, so has -# already been stripped. Bug #332071 for details. -QA_PRESTRIPPED="usr/$(get_libdir)/${PN}/firefox" - -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 -} - -# XXX FIXME XXX: All refs to mozilla-${PN} need to become ${PN} with the next bump -# Note that this WILL cause breakage for packages that use fx's libdir and includedir -pkg_setup() { - # Ensure we always build with C locale. - export LANG="C" - export LC_ALL="C" - export LC_MESSAGES="C" - export LC_CTYPE="C" - - if ! use bindist ; then - einfo - elog "You are enabling official branding. You may not redistribute this build" - elog "to any users on your network or the internet. Doing so puts yourself into" - elog "a legal problem with Mozilla Foundation" - elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag" - fi - - java-pkg-opt-2_pkg_setup - - python_set_active_version 2 -} - -src_unpack() { - unpack firefox-${MY_PV}.source.tar.bz2 ${PATCH}.tar.bz2 - - linguas - for X in ${linguas}; do - # FIXME: Add support for unpacking xpis to portage - [[ ${X} != "en" ]] && xpi_unpack "${P}-${X}.xpi" - done -} - -src_prepare() { - # Apply our patches - EPATCH_SUFFIX="patch" \ - EPATCH_FORCE="yes" \ - epatch "${WORKDIR}" - - epatch "${FILESDIR}/xulrunner-1.9.2-gtk+-2.21.patch" - - # Allow user to apply additional patches without modifing ebuild - epatch_user - - eautoreconf - - cd js/src - eautoreconf -} - -src_configure() { - MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}" - MEXTENSIONS="default" - - #################################### - # - # mozconfig, CFLAGS and CXXFLAGS setup - # - #################################### - - mozconfig_init - mozconfig_config - - # It doesn't compile on alpha without this LDFLAGS - use alpha && append-ldflags "-Wl,--no-relax" - - mozconfig_annotate '' --enable-crypto - mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}" - mozconfig_annotate '' --enable-application=browser - mozconfig_annotate '' --disable-mailnews - mozconfig_annotate 'broken' --disable-crashreporter - mozconfig_annotate '' --enable-image-encoder=all - mozconfig_annotate '' --enable-canvas - mozconfig_annotate 'gtk' --enable-default-toolkit=cairo-gtk2 - # Bug 60668: Galeon doesn't build without oji enabled, so enable it - # regardless of java setting. - mozconfig_annotate '' --enable-oji --enable-mathml - mozconfig_annotate 'places' --enable-storage --enable-places - mozconfig_annotate '' --enable-safe-browsing - - # Build mozdevelop permately - mozconfig_annotate '' --enable-jsd --enable-xpctools - - # System-wide install specs - mozconfig_annotate '' --disable-installer - mozconfig_annotate '' --disable-updater - mozconfig_annotate '' --disable-strip - mozconfig_annotate '' --disable-install-strip - - # Use system libraries - mozconfig_annotate '' --enable-system-cairo - mozconfig_annotate '' --enable-system-hunspell - mozconfig_annotate '' --with-system-nspr --with-nspr-prefix="${EPREFIX}"/usr - mozconfig_annotate '' --with-system-nss --with-nss-prefix="${EPREFIX}"/usr - mozconfig_annotate '' --x-includes="${EPREFIX}"/usr/include --x-libraries="${EPREFIX}"/usr/$(get_libdir) - mozconfig_annotate '' --with-system-bz2 - mozconfig_annotate '' --with-system-libxul - mozconfig_annotate '' --with-libxul-sdk="${EPREFIX}"/usr/$(get_libdir)/xulrunner-devel-${MAJ_XUL_PV} - - mozconfig_use_enable gnome gnomevfs - mozconfig_use_enable gnome gnomeui - mozconfig_use_enable ipc # +ipc, upstream default - mozconfig_use_enable libnotify - mozconfig_use_enable java javaxpcom - mozconfig_use_enable wifi necko-wifi - mozconfig_use_enable alsa ogg - mozconfig_use_enable alsa wave - mozconfig_use_enable system-sqlite - mozconfig_use_enable !bindist official-branding - - # Other ff-specific settings - mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME} - - # Finalize and report settings - mozconfig_final - - if [[ $(gcc-major-version) -lt 4 ]]; then - append-cxxflags -fno-stack-protector - fi - - #################################### - # - # Configure and build - # - #################################### - - CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" PYTHON="$(PYTHON)" econf -} - -src_compile() { - # Should the build use multiprocessing? Not enabled by default, as it tends to break - [ "${WANT_MP}" = "true" ] && jobs=${MAKEOPTS} || jobs="-j1" - emake ${jobs} || die -} - -src_install() { - MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}" - - emake DESTDIR="${D}" install || die "emake install failed" - - linguas - for X in ${linguas}; do - [[ ${X} != "en" ]] && xpi_install "${WORKDIR}"/"${P}-${X}" - done - - # Install icon and .desktop for menu entry - if ! use bindist ; then - newicon "${S}"/other-licenses/branding/firefox/content/icon48.png ${PN}-icon.png - newmenu "${FILESDIR}"/icon/${PN}-1.5.desktop \ - mozilla-${PN}-${DESKTOP_PV}.desktop - else - newicon "${S}"/browser/branding/unofficial/content/icon48.png ${PN}-icon-unbranded.png - newmenu "${FILESDIR}"/icon/${PN}-1.5-unbranded.desktop \ - mozilla-${PN}-${DESKTOP_PV}.desktop - sed -i -e "s:Bon\ Echo:Namoroka:" \ - "${ED}"/usr/share/applications/mozilla-${PN}-${DESKTOP_PV}.desktop || die "sed failed!" - fi - - # Add StartupNotify=true bug 237317 - if use startup-notification ; then - echo "StartupNotify=true" >> "${ED}"/usr/share/applications/mozilla-${PN}-${DESKTOP_PV}.desktop - fi - - pax-mark m "${ED}"/${MOZILLA_FIVE_HOME}/firefox - - # Enable very specific settings not inherited from xulrunner - cp "${FILESDIR}"/firefox-default-prefs.js \ - "${ED}/${MOZILLA_FIVE_HOME}/defaults/preferences/all-gentoo.js" || \ - die "failed to cp firefox-default-prefs.js" - - # Plugins dir - dosym ../nsbrowser/plugins "${MOZILLA_FIVE_HOME}"/plugins \ - || die "failed to symlink" - - # very ugly hack to make firefox not sigbus on sparc - use sparc && { sed -e 's/Firefox/FirefoxGentoo/g' \ - -i "${ED}/${MOZILLA_FIVE_HOME}/application.ini" || \ - die "sparc sed failed"; } -} - -pkg_postinst() { - ewarn "We have finished moving away from mozilla-${PN}" - ewarn "to plain jane ${PN}. If for some reason you have a bug" - ewarn "that results please open a report and assign to maintainer" - ewarn "with mozilla@gentoo.org being CC'd on the bug report." - elog - - # Update mimedb for the new .desktop file - fdo-mime_desktop_database_update -} diff --git a/www-client/firefox/firefox-3.6.21.ebuild b/www-client/firefox/firefox-3.6.21.ebuild deleted file mode 100644 index 0683b1fca6d4..000000000000 --- a/www-client/firefox/firefox-3.6.21.ebuild +++ /dev/null @@ -1,287 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/firefox-3.6.21.ebuild,v 1.2 2011/10/31 00:35:56 jer Exp $ -EAPI="3" -WANT_AUTOCONF="2.1" - -inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib pax-utils fdo-mime autotools mozextension java-pkg-opt-2 python - -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 es-CL es-MX pt-BR zh-CN zh-TW" - -MAJ_XUL_PV="1.9.2" -MAJ_PV="${PV/_*/}" # Without the _rc and _beta stuff -DESKTOP_PV="3.6" -MY_PV="${PV/_rc/rc}" # Handle beta for SRC_URI -XUL_PV="${MAJ_XUL_PV}${MAJ_PV/${DESKTOP_PV}/}" # Major + Minor version no.s -PATCH="${PN}-3.6-patches-0.4" - -DESCRIPTION="Firefox Web Browser" -HOMEPAGE="http://www.mozilla.com/firefox" - -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" -SLOT="0" -LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )" -IUSE="+alsa bindist gnome +ipc java libnotify system-sqlite wifi" - -REL_URI="http://releases.mozilla.org/pub/mozilla.org/firefox/releases" -SRC_URI="${REL_URI}/${MY_PV}/source/firefox-${MY_PV}.source.tar.bz2 - http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.bz2" - -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}-${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}/${PV}/linux-i686/xpi/${X}.xpi -> ${P}-${X}.xpi )" - fi - IUSE="${IUSE} linguas_${X%%-*}" - fi -done - -RDEPEND=" - >=sys-devel/binutils-2.16.1 - >=dev-libs/nss-3.12.8 - >=dev-libs/nspr-4.8.6 - >=app-text/hunspell-1.2 - system-sqlite? ( >=dev-db/sqlite-3.7.4[fts3,secure-delete] ) - alsa? ( media-libs/alsa-lib ) - >=x11-libs/cairo-1.8.8[X] - gnome? ( >=gnome-base/gnome-vfs-2.16.3 - >=gnome-base/libgnomeui-2.16.1 - >=gnome-base/gconf-2.16.0 - >=gnome-base/libgnome-2.16.0 ) - wifi? ( net-wireless/wireless-tools ) - libnotify? ( >=x11-libs/libnotify-0.4 ) - ~net-libs/xulrunner-${XUL_PV}[ipc=,java=,wifi=,libnotify=,system-sqlite=]" - -DEPEND="${RDEPEND} - java? ( >=virtual/jdk-1.4 ) - =dev-lang/python-2*[threads] - dev-util/pkgconfig" - -RDEPEND="${RDEPEND} java? ( >=virtual/jre-1.4 )" - -S="${WORKDIR}/mozilla-1.9.2" - -# This is a copy of the launcher program installed as part of xulrunner, so has -# already been stripped. Bug #332071 for details. -QA_PRESTRIPPED="usr/$(get_libdir)/${PN}/firefox" - -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 -} - -# XXX FIXME XXX: All refs to mozilla-${PN} need to become ${PN} with the next bump -# Note that this WILL cause breakage for packages that use fx's libdir and includedir -pkg_setup() { - # Ensure we always build with C locale. - export LANG="C" - export LC_ALL="C" - export LC_MESSAGES="C" - export LC_CTYPE="C" - - if ! use bindist ; then - einfo - elog "You are enabling official branding. You may not redistribute this build" - elog "to any users on your network or the internet. Doing so puts yourself into" - elog "a legal problem with Mozilla Foundation" - elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag" - fi - - java-pkg-opt-2_pkg_setup - - python_set_active_version 2 -} - -src_unpack() { - unpack firefox-${MY_PV}.source.tar.bz2 ${PATCH}.tar.bz2 - - linguas - for X in ${linguas}; do - # FIXME: Add support for unpacking xpis to portage - [[ ${X} != "en" ]] && xpi_unpack "${P}-${X}.xpi" - done -} - -src_prepare() { - # Apply our patches - EPATCH_SUFFIX="patch" \ - EPATCH_FORCE="yes" \ - epatch "${WORKDIR}" - - # Allow user to apply additional patches without modifing ebuild - epatch_user - - eautoreconf - - cd js/src - eautoreconf -} - -src_configure() { - MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}" - MEXTENSIONS="default" - - #################################### - # - # mozconfig, CFLAGS and CXXFLAGS setup - # - #################################### - - mozconfig_init - mozconfig_config - - # It doesn't compile on alpha without this LDFLAGS - use alpha && append-ldflags "-Wl,--no-relax" - - mozconfig_annotate '' --enable-crypto - mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}" - mozconfig_annotate '' --enable-application=browser - mozconfig_annotate '' --disable-mailnews - mozconfig_annotate 'broken' --disable-crashreporter - mozconfig_annotate '' --enable-image-encoder=all - mozconfig_annotate '' --enable-canvas - mozconfig_annotate 'gtk' --enable-default-toolkit=cairo-gtk2 - # Bug 60668: Galeon doesn't build without oji enabled, so enable it - # regardless of java setting. - mozconfig_annotate '' --enable-oji --enable-mathml - mozconfig_annotate 'places' --enable-storage --enable-places - mozconfig_annotate '' --enable-safe-browsing - - # Build mozdevelop permately - mozconfig_annotate '' --enable-jsd --enable-xpctools - - # System-wide install specs - mozconfig_annotate '' --disable-installer - mozconfig_annotate '' --disable-updater - mozconfig_annotate '' --disable-strip - mozconfig_annotate '' --disable-install-strip - - # Use system libraries - mozconfig_annotate '' --enable-system-cairo - mozconfig_annotate '' --enable-system-hunspell - mozconfig_annotate '' --with-system-nspr --with-nspr-prefix="${EPREFIX}"/usr - mozconfig_annotate '' --with-system-nss --with-nss-prefix="${EPREFIX}"/usr - mozconfig_annotate '' --x-includes="${EPREFIX}"/usr/include --x-libraries="${EPREFIX}"/usr/$(get_libdir) - mozconfig_annotate '' --with-system-bz2 - mozconfig_annotate '' --with-system-libxul - mozconfig_annotate '' --with-libxul-sdk="${EPREFIX}"/usr/$(get_libdir)/xulrunner-devel-${MAJ_XUL_PV} - - mozconfig_use_enable gnome gnomevfs - mozconfig_use_enable gnome gnomeui - mozconfig_use_enable ipc # +ipc, upstream default - mozconfig_use_enable libnotify - mozconfig_use_enable java javaxpcom - mozconfig_use_enable wifi necko-wifi - mozconfig_use_enable alsa ogg - mozconfig_use_enable alsa wave - mozconfig_use_enable system-sqlite - mozconfig_use_enable !bindist official-branding - - # Other ff-specific settings - mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME} - - # Finalize and report settings - mozconfig_final - - if [[ $(gcc-major-version) -lt 4 ]]; then - append-cxxflags -fno-stack-protector - fi - - #################################### - # - # Configure and build - # - #################################### - - CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" PYTHON="$(PYTHON)" econf -} - -src_compile() { - # Should the build use multiprocessing? Not enabled by default, as it tends to break - [ "${WANT_MP}" = "true" ] && jobs=${MAKEOPTS} || jobs="-j1" - emake ${jobs} || die -} - -src_install() { - MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}" - - emake DESTDIR="${D}" install || die "emake install failed" - - linguas - for X in ${linguas}; do - [[ ${X} != "en" ]] && xpi_install "${WORKDIR}"/"${P}-${X}" - done - - # Install icon and .desktop for menu entry - if ! use bindist ; then - newicon "${S}"/other-licenses/branding/firefox/content/icon48.png ${PN}-icon.png - newmenu "${FILESDIR}"/icon/${PN}-1.5.desktop \ - mozilla-${PN}-${DESKTOP_PV}.desktop - else - newicon "${S}"/browser/branding/unofficial/content/icon48.png ${PN}-icon-unbranded.png - newmenu "${FILESDIR}"/icon/${PN}-1.5-unbranded.desktop \ - mozilla-${PN}-${DESKTOP_PV}.desktop - sed -i -e "s:Bon\ Echo:Namoroka:" \ - "${ED}"/usr/share/applications/mozilla-${PN}-${DESKTOP_PV}.desktop || die "sed failed!" - fi - - # Add StartupNotify=true bug 237317 - if use startup-notification ; then - echo "StartupNotify=true" >> "${ED}"/usr/share/applications/mozilla-${PN}-${DESKTOP_PV}.desktop - fi - - pax-mark m "${ED}"/${MOZILLA_FIVE_HOME}/firefox - - # Enable very specific settings not inherited from xulrunner - cp "${FILESDIR}"/firefox-default-prefs.js \ - "${ED}/${MOZILLA_FIVE_HOME}/defaults/preferences/all-gentoo.js" || \ - die "failed to cp firefox-default-prefs.js" - - # Plugins dir - dosym ../nsbrowser/plugins "${MOZILLA_FIVE_HOME}"/plugins \ - || die "failed to symlink" - - # very ugly hack to make firefox not sigbus on sparc - use sparc && { sed -e 's/Firefox/FirefoxGentoo/g' \ - -i "${ED}/${MOZILLA_FIVE_HOME}/application.ini" || \ - die "sparc sed failed"; } -} - -pkg_postinst() { - ewarn "We have finished moving away from mozilla-${PN}" - ewarn "to plain jane ${PN}. If for some reason you have a bug" - ewarn "that results please open a report and assign to maintainer" - ewarn "with mozilla@gentoo.org being CC'd on the bug report." - elog - - # Update mimedb for the new .desktop file - fdo-mime_desktop_database_update -} diff --git a/www-client/firefox/firefox-7.0.1-r1.ebuild b/www-client/firefox/firefox-9.0.ebuild index 5372b13fe09b..e3b1417fe38a 100644 --- a/www-client/firefox/firefox-7.0.1-r1.ebuild +++ b/www-client/firefox/firefox-9.0.ebuild @@ -1,24 +1,24 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/firefox-7.0.1-r1.ebuild,v 1.4 2011/11/20 20:51:46 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/firefox-9.0.ebuild,v 1.1 2011/12/21 16:11:05 polynomial-c Exp $ EAPI="3" VIRTUALX_REQUIRED="pgo" WANT_AUTOCONF="2.1" -inherit flag-o-matic toolchain-funcs eutils gnome2-utils mozconfig-3 multilib pax-utils fdo-mime autotools mozextension versionator python virtualx +inherit flag-o-matic toolchain-funcs eutils gnome2-utils mozconfig-3 multilib pax-utils fdo-mime autotools mozextension versionator python virtualx nsplugins MAJ_FF_PV="$(get_version_component_range 1-2)" # 3.5, 3.6, 4.0, etc. FF_PV="${PV/_alpha/a}" # Handle alpha for SRC_URI FF_PV="${FF_PV/_beta/b}" # Handle beta for SRC_URI FF_PV="${FF_PV/_rc/rc}" # Handle rc for SRC_URI CHANGESET="e56ecd8b3a68" -PATCH="${PN}-7.0-patches-0.5" +PATCH="${PN}-9.0-patches-0.4" DESCRIPTION="Firefox Web Browser" HOMEPAGE="http://www.mozilla.com/firefox" -KEYWORDS="amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux" SLOT="0" LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )" IUSE="bindist +crashreporter +ipc pgo system-sqlite +webm" @@ -32,13 +32,13 @@ ASM_DEPEND=">=dev-lang/yasm-1.1" # Mesa 7.10 needed for WebGL + bugfixes RDEPEND=" >=sys-devel/binutils-2.16.1 - >=dev-libs/nss-3.12.10 + >=dev-libs/nss-3.13.1 >=dev-libs/nspr-4.8.8 >=dev-libs/glib-2.26:2 >=media-libs/mesa-7.10 media-libs/libpng[apng] virtual/libffi - system-sqlite? ( >=dev-db/sqlite-3.7.4[fts3,secure-delete,unlock-notify,debug=] ) + system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,unlock-notify,debug=] ) webm? ( media-libs/libvpx media-libs/alsa-lib ) crashreporter? ( net-misc/curl )" @@ -147,6 +147,15 @@ pkg_setup() { ewarn "You will do a double build for profile guided optimization." ewarn "This will result in your build taking at least twice as long as before." fi + + # Ensure we have enough disk space to compile + if use pgo ; then + CHECKREQS_DISK_BUILD="8G" + check-reqs_pkg_setup + else + CHECKREQS_DISK_BUILD="4G" + check-reqs_pkg_setup + fi } src_unpack() { @@ -198,9 +207,6 @@ src_prepare() { -i "${S}"/js/src/config/system-headers || die "Sed failed" eautoreconf - - cd js/src - eautoreconf } src_configure() { @@ -285,7 +291,7 @@ src_install() { pax-mark m "${S}/${obj_dir}"/dist/bin/xpcshell # Add our default prefs for firefox + xulrunner - cp "${FILESDIR}"/gentoo-default-prefs.js \ + cp "${FILESDIR}"/gentoo-default-prefs.js-1 \ "${S}/${obj_dir}/dist/bin/defaults/pref/all-gentoo.js" || die MOZ_MAKE_FLAGS="${MAKEOPTS}" \ @@ -331,11 +337,10 @@ src_install() { fi # Required in order to use plugins and even run firefox on hardened. - pax-mark m "${ED}"/${MOZILLA_FIVE_HOME}/{firefox,firefox-bin,plugin-container} + pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/{firefox,firefox-bin,plugin-container} # Plugins dir - dosym ../nsbrowser/plugins "${MOZILLA_FIVE_HOME}"/plugins \ - || die "failed to symlink" + share_plugins_dir # very ugly hack to make firefox not sigbus on sparc # FIXME: is this still needed?? |