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 1Oc4YO-00070r-Ck for garchives@archives.gentoo.org; Thu, 22 Jul 2010 22:47:48 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4CDD4E0B4A; Thu, 22 Jul 2010 22:47:47 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 16C71E0B4A for ; Thu, 22 Jul 2010 22:47:47 +0000 (UTC) Received: from corvid.gentoo.org (corvid.gentoo.org [208.92.234.79]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A21FF1B4025 for ; Thu, 22 Jul 2010 22:47:46 +0000 (UTC) Received: by corvid.gentoo.org (Postfix, from userid 2214) id 8C3C42CF2B; Thu, 22 Jul 2010 22:47:44 +0000 (UTC) From: "Jeremy Olexa (darkside)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, darkside@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in www-client/mozilla-firefox: ChangeLog mozilla-firefox-3.6.7.ebuild X-VCS-Repository: gentoo-x86 X-VCS-Files: ChangeLog mozilla-firefox-3.6.7.ebuild X-VCS-Directories: www-client/mozilla-firefox X-VCS-Committer: darkside X-VCS-Committer-Name: Jeremy Olexa Content-Type: text/plain; charset=utf8 Message-Id: <20100722224744.8C3C42CF2B@corvid.gentoo.org> Date: Thu, 22 Jul 2010 22:47:44 +0000 (UTC) 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: 6f7223cf-0dc8-4924-9041-4ffd3902e64b X-Archives-Hash: 5f187c1cd6b2cb101f4e10b55322c5c8 darkside 10/07/22 22:47:44 Modified: ChangeLog mozilla-firefox-3.6.7.ebuild Log: Migrate changes from Gentoo Prefix overlay. Convert to EAPI3, add patch= , modify paths, etc. Approved by mozilla team in IRC. (Portage version: 2.1.8.3/cvs/Linux x86_64) Revision Changes Path 1.630 www-client/mozilla-firefox/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/mozilla= -firefox/ChangeLog?rev=3D1.630&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/mozilla= -firefox/ChangeLog?rev=3D1.630&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/mozilla= -firefox/ChangeLog?r1=3D1.629&r2=3D1.630 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.629 retrieving revision 1.630 diff -u -r1.629 -r1.630 --- ChangeLog 22 Jul 2010 16:58:20 -0000 1.629 +++ ChangeLog 22 Jul 2010 22:47:43 -0000 1.630 @@ -1,6 +1,16 @@ # ChangeLog for www-client/mozilla-firefox # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,= v 1.629 2010/07/22 16:58:20 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,= v 1.630 2010/07/22 22:47:43 darkside Exp $ + + 22 Jul 2010; Jeremy Olexa + +files/mozilla-firefox-3.0-solaris64.patch, mozilla-firefox-3.6.7.ebui= ld: + Migrate changes from Gentoo Prefix overlay. Convert to EAPI3, add patc= h, + modify paths, etc. Approved by mozilla team in IRC. + + 22 Jul 2010; Jeremy Olexa + +files/mozilla-firefox-3.0-solaris64.patch, mozilla-firefox-3.6.7.ebui= ld: + Migrate changes from Gentoo Prefix overlay. Convert to EAPI3, add patc= h, + modify paths, etc. Approved by mozilla team in IRC. =20 22 Jul 2010; Jeroen Roovers mozilla-firefox-3.6.7.ebu= ild: Stable for PPC (bug #329279). 1.6 www-client/mozilla-firefox/mozilla-firefox-3.6.7.ebu= ild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/mozilla= -firefox/mozilla-firefox-3.6.7.ebuild?rev=3D1.6&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/mozilla= -firefox/mozilla-firefox-3.6.7.ebuild?rev=3D1.6&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/mozilla= -firefox/mozilla-firefox-3.6.7.ebuild?r1=3D1.5&r2=3D1.6 Index: mozilla-firefox-3.6.7.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 RCS file: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/mozilla-fire= fox-3.6.7.ebuild,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- mozilla-firefox-3.6.7.ebuild 22 Jul 2010 16:58:20 -0000 1.5 +++ mozilla-firefox-3.6.7.ebuild 22 Jul 2010 22:47:44 -0000 1.6 @@ -1,7 +1,7 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/mozilla-fi= refox-3.6.7.ebuild,v 1.5 2010/07/22 16:58:20 jer Exp $ -EAPI=3D"2" +# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/mozilla-fi= refox-3.6.7.ebuild,v 1.6 2010/07/22 22:47:44 darkside Exp $ +EAPI=3D"3" WANT_AUTOCONF=3D"2.1" =20 inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multili= b pax-utils fdo-mime autotools mozextension java-pkg-opt-2 python @@ -22,7 +22,7 @@ DESCRIPTION=3D"Firefox Web Browser" HOMEPAGE=3D"http://www.mozilla.com/firefox" =20 -KEYWORDS=3D"~alpha ~amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~sparc x86" +KEYWORDS=3D"~alpha ~amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~sparc x86 ~amd64-= linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" SLOT=3D"0" LICENSE=3D"|| ( MPL-1.1 GPL-2 LGPL-2.1 )" IUSE=3D"+alsa bindist +ipc java libnotify system-sqlite wifi" @@ -130,6 +130,8 @@ EPATCH_EXCLUDE=3D"137-bz460917_att350845_reload_new_plugins-gentoo-upda= te.patch" \ epatch "${WORKDIR}" =20 + epatch "${FILESDIR}"/${PN}-3.0-solaris64.patch + # The patch excluded above failed, ported patch is applied below epatch "${FILESDIR}/137-bz460917_reload_new_plugins-gentoo-update-3.6.4= .patch" =20 @@ -139,7 +141,7 @@ # Enable tracemonkey for amd64 (bug #315997) epatch "${FILESDIR}/801-enable-x86_64-tracemonkey.patch" =20 - # Allow user to apply additional patches without modifing ebuild + # Allow user to apply additional patches without modifing ebuild epatch_user =20 eautoreconf @@ -189,11 +191,12 @@ # Use system libraries mozconfig_annotate '' --enable-system-cairo mozconfig_annotate '' --enable-system-hunspell - mozconfig_annotate '' --with-system-nspr - mozconfig_annotate '' --with-system-nss + mozconfig_annotate '' --with-system-nspr --with-nspr-prefix=3D"${EPREFI= X}"/usr + mozconfig_annotate '' --with-system-nss --with-nss-prefix=3D"${EPREFIX}= "/usr + mozconfig_annotate '' --x-includes=3D"${EPREFIX}"/usr/include --x-libra= ries=3D"${EPREFIX}"/usr/$(get_libdir) mozconfig_annotate '' --with-system-bz2 mozconfig_annotate '' --with-system-libxul - mozconfig_annotate '' --with-libxul-sdk=3D/usr/$(get_libdir)/xulrunner-= devel-${MAJ_XUL_PV} + mozconfig_annotate '' --with-libxul-sdk=3D"${EPREFIX}"/usr/$(get_libdir= )/xulrunner-devel-${MAJ_XUL_PV} =20 mozconfig_use_enable ipc # +ipc, upstream default mozconfig_use_enable libnotify @@ -249,19 +252,19 @@ newmenu "${FILESDIR}"/icon/mozilla-firefox-1.5-unbranded.desktop \ ${PN}-${DESKTOP_PV}.desktop sed -i -e "s:Bon Echo:Namoroka:" \ - "${D}"/usr/share/applications/${PN}-${DESKTOP_PV}.desktop || die "sed= failed!" + "${ED}"/usr/share/applications/${PN}-${DESKTOP_PV}.desktop || die "se= d failed!" fi =20 # Add StartupNotify=3Dtrue bug 237317 if use startup-notification ; then - echo "StartupNotify=3Dtrue" >> "${D}"/usr/share/applications/${PN}-${D= ESKTOP_PV}.desktop + echo "StartupNotify=3Dtrue" >> "${ED}"/usr/share/applications/${PN}-${= DESKTOP_PV}.desktop fi =20 - pax-mark m "${D}"/${MOZILLA_FIVE_HOME}/firefox + pax-mark m "${ED}"/${MOZILLA_FIVE_HOME}/firefox =20 # Enable very specific settings not inherited from xulrunner cp "${FILESDIR}"/firefox-default-prefs.js \ - "${D}/${MOZILLA_FIVE_HOME}/defaults/preferences/all-gentoo.js" || \ + "${ED}/${MOZILLA_FIVE_HOME}/defaults/preferences/all-gentoo.js" || \ die "failed to cp firefox-default-prefs.js" =20 # Plugins dir @@ -270,7 +273,7 @@ =20 # very ugly hack to make firefox not sigbus on sparc use sparc && { sed -e 's/Firefox/FirefoxGentoo/g' \ - -i "${D}/${MOZILLA_FIVE_HOME}/application.ini" || \ + -i "${ED}/${MOZILLA_FIVE_HOME}/application.ini" || \ die "sparc sed failed"; } } =20