From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1MWt32-0007E9-M9 for garchives@archives.gentoo.org; Fri, 31 Jul 2009 14:25:29 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0A5EDE069D; Fri, 31 Jul 2009 14:25:28 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id A3F5FE069D for ; Fri, 31 Jul 2009 14:25:27 +0000 (UTC) Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTP id 3045166D11 for ; Fri, 31 Jul 2009 14:25:27 +0000 (UTC) Received: from nirbheek by stork.gentoo.org with local (Exim 4.69) (envelope-from ) id 1MWt30-00082O-NH for gentoo-commits@lists.gentoo.org; Fri, 31 Jul 2009 14:25:26 +0000 From: "Nirbheek Chauhan (nirbheek)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, nirbheek@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in www-client/mozilla-firefox: ChangeLog mozilla-firefox-3.5.1-r1.ebuild X-VCS-Repository: gentoo-x86 X-VCS-Files: ChangeLog mozilla-firefox-3.5.1-r1.ebuild X-VCS-Directories: www-client/mozilla-firefox X-VCS-Committer: nirbheek X-VCS-Committer-Name: Nirbheek Chauhan Content-Type: text/plain; charset=utf8 Message-Id: Sender: Nirbheek Chauhan Date: Fri, 31 Jul 2009 14:25:26 +0000 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 61a264f5-b089-49ab-9fae-cd19ae01d485 X-Archives-Hash: 2ed27427eb73dc800da146307840a68b nirbheek 09/07/31 14:25:26 Modified: ChangeLog Added: mozilla-firefox-3.5.1-r1.ebuild Log: Bump from mozilla overlay (to match changes in xulrunner-1.9.1.1) (Portage version: 2.2_rc33/cvs/Linux i686) Revision Changes Path 1.523 www-client/mozilla-firefox/ChangeLog file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/mozilla= -firefox/ChangeLog?rev=3D1.523&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/mozilla= -firefox/ChangeLog?rev=3D1.523&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/mozilla= -firefox/ChangeLog?r1=3D1.522&r2=3D1.523 Index: ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,v retrieving revision 1.522 retrieving revision 1.523 diff -u -r1.522 -r1.523 --- ChangeLog 22 Jul 2009 17:48:15 -0000 1.522 +++ ChangeLog 31 Jul 2009 14:25:26 -0000 1.523 @@ -1,6 +1,12 @@ # ChangeLog for www-client/mozilla-firefox # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,= v 1.522 2009/07/22 17:48:15 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,= v 1.523 2009/07/31 14:25:26 nirbheek Exp $ + +*mozilla-firefox-3.5.1-r1 (31 Jul 2009) + + 31 Jul 2009; Nirbheek Chauhan + +mozilla-firefox-3.5.1-r1.ebuild: + Bump from mozilla overlay (to match changes in xulrunner-1.9.1.1) =20 *mozilla-firefox-3.0.12 (22 Jul 2009) =20 1.1 www-client/mozilla-firefox/mozilla-firefox-3.5.1-r1.= ebuild file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/mozilla= -firefox/mozilla-firefox-3.5.1-r1.ebuild?rev=3D1.1&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/mozilla= -firefox/mozilla-firefox-3.5.1-r1.ebuild?rev=3D1.1&content-type=3Dtext/pl= ain Index: mozilla-firefox-3.5.1-r1.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/mozilla-fir= efox-3.5.1-r1.ebuild,v 1.1 2009/07/31 14:25:26 nirbheek Exp $ EAPI=3D"2" WANT_AUTOCONF=3D"2.1" inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib= fdo-mime autotools mozextension LANGS=3D"af ar as be bg bn-BD bn-IN ca cs cy da de el en en-GB en-US eo e= s-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 i= s it ja ka kk kn ko ku lt lv mk ml mn mr nb-NO nl nn-NO oc or pa-IN pl pt-BR pt-P= T rm ro ru si sk sl sq sr sv-SE ta-LK ta te th tr uk vi zh-CN zh-TW" NOSHORTLANGS=3D"en-GB es-AR es-CL es-MX pt-BR zh-CN zh-TW" XUL_PV=3D"1.9.1.1" MAJ_PV=3D"${PV/_*/}" # Without the _rc and _beta stuff DESKTOP_PV=3D"3.5" MY_PV=3D"${PV/_beta/b}" # Handle betas for SRC_URI MY_PV=3D"${PV/_/}" # Handle rcs for SRC_URI PATCH=3D"${PN}-3.5-patches-0.1" DESCRIPTION=3D"Firefox Web Browser" HOMEPAGE=3D"http://www.mozilla.com/firefox" KEYWORDS=3D"~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" SLOT=3D"0" LICENSE=3D"|| ( MPL-1.1 GPL-2 LGPL-2.1 )" IUSE=3D"bindist iceweasel java mozdevelop restrict-javascript" # qt-exper= imental REL_URI=3D"http://releases.mozilla.org/pub/mozilla.org/firefox/releases" SRC_URI=3D"${REL_URI}/${MY_PV}/source/firefox-${MY_PV}-source.tar.bz2 iceweasel? ( mirror://gentoo/iceweasel-icons-3.0.tar.bz2 ) mirror://gentoo/${PATCH}.tar.bz2" for X in ${LANGS} ; do if [ "${X}" !=3D "en" ] && [ "${X}" !=3D "en-US" ]; then SRC_URI=3D"${SRC_URI} linguas_${X/-/_}? ( ${REL_URI}/${MY_PV}/linux-i686/xpi/${X}.xpi -> ${P= }-${X}.xpi )" fi IUSE=3D"${IUSE} linguas_${X/-/_}" # english is handled internally if [ "${#X}" =3D=3D 5 ] && ! has ${X} ${NOSHORTLANGS}; then if [ "${X}" !=3D "en-US" ]; then SRC_URI=3D"${SRC_URI} linguas_${X%%-*}? ( ${REL_URI}/${PV}/linux-i686/xpi/${X}.xpi -> ${P}-= ${X}.xpi )" fi IUSE=3D"${IUSE} linguas_${X%%-*}" fi done # Not working. # qt-experimental? ( # x11-libs/qt-gui # x11-libs/qt-core ) # =3Dnet-libs/xulrunner-${XUL_PV}*[java=3D,qt-experimental=3D] RDEPEND=3D" >=3Dsys-devel/binutils-2.16.1 >=3Ddev-libs/nss-3.12.2 >=3Ddev-libs/nspr-4.7.3 >=3Ddev-db/sqlite-3.6.7 >=3Dapp-text/hunspell-1.2 >=3Dnet-libs/xulrunner-${XUL_PV}[java=3D] >=3Dx11-libs/cairo-1.8.8[X] x11-libs/pango[X]" DEPEND=3D"${RDEPEND} dev-util/pkgconfig" PDEPEND=3D"restrict-javascript? ( >=3Dwww-plugins/noscript-1.8.7 )" S=3D"${WORKDIR}/mozilla-1.9.1" # Needed by src_compile() and src_install(). # Would do in pkg_setup but that loses the export attribute, they # become pure shell variables. export BUILD_OFFICIAL=3D1 export MOZILLA_OFFICIAL=3D1 linguas() { local LANG SLANG for LANG in ${LINGUAS}; do if has ${LANG} en en_US; then has en ${linguas} || linguas=3D"${linguas:+"${linguas} "}en" continue elif has ${LANG} ${LANGS//-/_}; then has ${LANG//_/-} ${linguas} || linguas=3D"${linguas:+"${linguas} "}${L= ANG//_/-}" continue elif [[ " ${LANGS} " =3D=3D *" ${LANG}-"* ]]; then for X in ${LANGS}; do if [[ "${X}" =3D=3D "${LANG}-"* ]] && \ [[ " ${NOSHORTLANGS} " !=3D *" ${X} "* ]]; then has ${X} ${linguas} || linguas=3D"${linguas:+"${linguas} "}${X}" continue 2 fi done fi ewarn "Sorry, but ${PN} does not support the ${LANG} LINGUA" done } pkg_setup(){ if ! use bindist && ! use iceweasel; then 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 yours= elf into" elog "a legal problem with Mozilla Foundation" elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag" fi } src_unpack() { unpack ${A} if use iceweasel; then unpack iceweasel-icons-3.0.tar.bz2 cp -r iceweaselicons/browser "${WORKDIR}" fi linguas for X in ${linguas}; do # FIXME: Add support for unpacking xpis to portage [[ ${X} !=3D "en" ]] && xpi_unpack "${P}-${X}.xpi" done if [[ ${linguas} !=3D "" && ${linguas} !=3D "en" ]]; then einfo "Selected language packs (first will be default): ${linguas}" fi } src_prepare() { # Apply our patches EPATCH_SUFFIX=3D"patch" \ EPATCH_FORCE=3D"yes" \ epatch "${WORKDIR}" if use iceweasel; then sed -i -e "s|Minefield|Iceweasel|" browser/locales/en-US/chrome/brandin= g/brand.* \ browser/branding/nightly/configure.sh fi eautoreconf cd js/src eautoreconf # We need to re-patch this because autoreconf overwrites it # epatch "${WORKDIR}"/patch/000_flex-configure-LANG.patch } src_configure() { MOZILLA_FIVE_HOME=3D"/usr/$(get_libdir)/${PN}" MEXTENSIONS=3D"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-extensions=3D"${MEXTENSIONS}" mozconfig_annotate '' --enable-application=3Dbrowser mozconfig_annotate '' --disable-mailnews mozconfig_annotate 'broken' --disable-crashreporter mozconfig_annotate '' --enable-image-encoder=3Dall mozconfig_annotate '' --enable-canvas # 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 # 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 '' --enable-system-sqlite mozconfig_annotate '' --with-system-nspr mozconfig_annotate '' --with-system-nss mozconfig_annotate '' --enable-system-lcms mozconfig_annotate '' --with-system-bz2 mozconfig_annotate '' --with-system-libxul mozconfig_annotate '' --with-libxul-sdk=3D/usr/$(get_libdir)/xulrunner-d= evel-${XUL_PV} # IUSE mozdevelop mozconfig_use_enable mozdevelop jsd mozconfig_use_enable mozdevelop xpctools #mozconfig_use_extension mozdevelop venkman # IUSE qt-experimental # if use qt-experimental; then # ewarn "You are enabling the EXPERIMENTAL qt toolkit" # ewarn "Usage is at your own risk" # ewarn "Known to be broken. DO NOT file bugs." # mozconfig_annotate '' --disable-system-cairo # mozconfig_annotate 'qt-experimental' --enable-default-toolkit=3Dcairo-= qt # else mozconfig_annotate 'gtk' --enable-default-toolkit=3Dcairo-gtk2 # fi # Other ff-specific settings mozconfig_annotate '' --with-default-mozilla-five-home=3D${MOZILLA_FIVE_= HOME} if ! use bindist && ! use iceweasel; then mozconfig_annotate '' --enable-official-branding fi # Finalize and report settings mozconfig_final if [[ $(gcc-major-version) -lt 4 ]]; then append-cxxflags -fno-stack-protector fi #################################### # # Configure and build # #################################### CC=3D"$(tc-getCC)" CXX=3D"$(tc-getCXX)" LD=3D"$(tc-getLD)" \ econf || die } src_compile() { # Should the build use multiprocessing? Not enabled by default, as it te= nds to break [ "${WANT_MP}" =3D "true" ] && jobs=3D${MAKEOPTS} || jobs=3D"-j1" emake ${jobs} || die } src_install() { emake DESTDIR=3D"${D}" install || die "emake install failed" rm "${D}"/usr/bin/firefox linguas for X in ${linguas}; do [[ ${X} !=3D "en" ]] && xpi_install "${WORKDIR}"/"${P}-${X}" done # Install icon and .desktop for menu entry if use iceweasel; then newicon "${S}"/browser/base/branding/icon48.png iceweasel-icon.png newmenu "${FILESDIR}"/icon/iceweasel.desktop \ ${PN}-${DESKTOP_PV}.desktop elif ! use bindist; then newicon "${S}"/other-licenses/branding/firefox/content/icon48.png firef= ox-icon.png newmenu "${FILESDIR}"/icon/mozilla-firefox-1.5.desktop \ ${PN}-${DESKTOP_PV}.desktop else newicon "${S}"/browser/base/branding/icon48.png firefox-icon-unbranded.= png newmenu "${FILESDIR}"/icon/mozilla-firefox-1.5-unbranded.desktop \ ${PN}-${DESKTOP_PV}.desktop sed -e "s/Bon Echo/Minefield/" \ -i "${D}"/usr/share/applications/${PN}-${DESKTOP_PV}.desktop fi # Add StartupNotify=3Dtrue bug 237317 if use startup-notification; then echo "StartupNotify=3Dtrue" >> "${D}"/usr/share/applications/${PN}-${DE= SKTOP_PV}.desktop fi # Create /usr/bin/firefox cat <"${D}"/usr/bin/firefox #!/bin/sh export LD_LIBRARY_PATH=3D"${MOZILLA_FIVE_HOME}\${LD_LIBRARY_PATH+":\${LD_= LIBRARY_PATH}"}" exec "${MOZILLA_FIVE_HOME}"/firefox "\$@" EOF fperms 0755 /usr/bin/firefox # Plugins dir ln -s "${D}"/usr/$(get_libdir)/{nsbrowser,mozilla-firefox}/plugins } pkg_postinst() { ewarn "All the packages built against ${PN} won't compile," ewarn "any package that fails to build warrants a bug report." elog # Update mimedb for the new .desktop file fdo-mime_desktop_database_update }