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 1QvAzY-0000HP-5A for garchives@archives.gentoo.org; Sun, 21 Aug 2011 16:35:20 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4AC0C21C04F; Sun, 21 Aug 2011 16:35:13 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 043E021C04F for ; Sun, 21 Aug 2011 16:35:12 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 59C301B4012 for ; Sun, 21 Aug 2011 16:35:12 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 687FE80040 for ; Sun, 21 Aug 2011 16:35:11 +0000 (UTC) From: "Jory Pratt" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jory Pratt" Message-ID: <83f53aefc1bdf64fa872dcc08b2902ec26e4b08c.anarchy@gentoo> Subject: [gentoo-commits] proj/mozilla:master commit in: mail-client/thunderbird/, www-client/firefox/ X-VCS-Repository: proj/mozilla X-VCS-Files: mail-client/thunderbird/Manifest mail-client/thunderbird/thunderbird-6.0.ebuild www-client/firefox/Manifest www-client/firefox/firefox-6.0.ebuild X-VCS-Directories: mail-client/thunderbird/ www-client/firefox/ X-VCS-Committer: anarchy X-VCS-Committer-Name: Jory Pratt X-VCS-Revision: 83f53aefc1bdf64fa872dcc08b2902ec26e4b08c Date: Sun, 21 Aug 2011 16:35:11 +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: X-Archives-Hash: ba3aa0b13434d4546e2e77f677d59819 commit: 83f53aefc1bdf64fa872dcc08b2902ec26e4b08c Author: Jory A. Pratt gentoo org> AuthorDate: Sun Aug 21 16:31:36 2011 +0000 Commit: Jory Pratt gentoo org> CommitDate: Sun Aug 21 16:31:36 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/mozilla.git;a= =3Dcommit;h=3D83f53aef update nspr/nss dep, move to using ftp servers instead of release mirror --- mail-client/thunderbird/Manifest | 2 +- mail-client/thunderbird/thunderbird-6.0.ebuild | 12 ++++++------ www-client/firefox/Manifest | 2 +- www-client/firefox/firefox-6.0.ebuild | 11 +++++------ 4 files changed, 13 insertions(+), 14 deletions(-) diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/M= anifest index ee043cd..c8aaff1 100644 --- a/mail-client/thunderbird/Manifest +++ b/mail-client/thunderbird/Manifest @@ -41,4 +41,4 @@ DIST thunderbird-6.0-tr.xpi 403273 RMD160 0a1bbbae82a03= 78016d0dd6185d604b5b608da DIST thunderbird-6.0-uk.xpi 452775 RMD160 f1915e4ae3fa8f667540dde3d31c3e= 36749c0b57 SHA1 54e21c3baff6bf833d18df047cc849d2b9258c65 SHA256 a7030f7f6= aa9d52b4a39c344ef1d5aeae9114dca9590e2eabf24b3c2849601ec DIST thunderbird-6.0-zh-TW.xpi 420983 RMD160 739aaf7ce018f0bcf938436d324= ab75f4559869e SHA1 462357caafdcd7dcea824d3d2958e545a9101422 SHA256 5c07cc= 4f35a827e9b533888cdfb482b44f8cebd2a079b5b370ce656e8ecc8de0 DIST thunderbird-6.0.source.tar.bz2 86286245 RMD160 758a274ec2b12aba5257= 4922cd9526fd3596a505 SHA1 7a9ea62aa11522230327574b245a2f793015b5f4 SHA256= 3c56af448ebd4805c7997d8e0e41f4333d110ad2c4ad4873204bd4d68bbd8189 -EBUILD thunderbird-6.0.ebuild 8437 RMD160 a036fd5dd3de677b7ddbde4e74c63c= 072ce2283a SHA1 eb9386c9245ef33ece0123f38b76247a4a4482fe SHA256 7d48d5523= 20fa16ebfe520aacf0b3f130c1a3bc7e302748086c9c0e761421562 +EBUILD thunderbird-6.0.ebuild 8421 RMD160 925a999cdf1bba77b26bdae93459dd= aa4e5f8eff SHA1 7aaaec4eab9b5a583c1bdab18b798baa547da1c5 SHA256 eb22e98c2= f588744f5ada330be4a80283d2cdfc369905a67f30c633332483302 diff --git a/mail-client/thunderbird/thunderbird-6.0.ebuild b/mail-client= /thunderbird/thunderbird-6.0.ebuild index 23e9f97..5704e45 100644 --- a/mail-client/thunderbird/thunderbird-6.0.ebuild +++ b/mail-client/thunderbird/thunderbird-6.0.ebuild @@ -20,8 +20,8 @@ LICENSE=3D"|| ( MPL-1.1 GPL-2 LGPL-2.1 )" IUSE=3D"bindist gconf +crashreporter +crypt +ipc +lightning mozdom" PATCH=3D"${PN}-5.0-patches-0.1" =20 -REL_URI=3D"http://releases.mozilla.org/pub/mozilla.org/${PN}/releases" -SRC_URI=3D"${REL_URI}/${TB_PV}/source/${TB_P}.source.tar.bz2 +FTP_URI=3D"ftp://ftp.mozilla.org/pub/${PN}/releases/" +SRC_URI=3D"${FTP_URI}/${TB_PV}/source/${TB_P}.source.tar.bz2 crypt? ( http://www.mozilla-enigmail.org/download/source/enigmail-${EMV= ER}.tar.gz ) http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.bz2" =20 @@ -36,14 +36,14 @@ if ! [[ ${PV} =3D~ alpha|beta ]]; then for X in ${LANGS} ; do if [ "${X}" !=3D "en" ] && [ "${X}" !=3D "en-US" ]; then SRC_URI=3D"${SRC_URI} - linguas_${X/-/_}? ( ${REL_URI}/${TB_PV}/linux-i686/xpi/${X}.xpi -> $= {P}-${X}.xpi )" + linguas_${X/-/_}? ( ${FTP_URI}/${TB_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}/${TB_PV}/linux-i686/xpi/${X}.xpi -> = ${P}-${X}.xpi )" + linguas_${X%%-*}? ( ${FTP_URI}/${TB_PV}/linux-i686/xpi/${X}.xpi -> = ${P}-${X}.xpi )" fi IUSE=3D"${IUSE} linguas_${X%%-*}" fi @@ -51,8 +51,8 @@ if ! [[ ${PV} =3D~ alpha|beta ]]; then fi =20 RDEPEND=3D">=3Dsys-devel/binutils-2.16.1 - >=3Ddev-libs/nss-3.12.9 - >=3Ddev-libs/nspr-4.8.7 + >=3Ddev-libs/nss-3.12.10 + >=3Ddev-libs/nspr-4.8.8 gconf? ( >=3Dgnome-base/gconf-1.2.1:2 ) media-libs/libpng[apng] !x11-plugins/lightning diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest index 3b87df3..24fb3ca 100644 --- a/www-client/firefox/Manifest +++ b/www-client/firefox/Manifest @@ -84,4 +84,4 @@ DIST firefox-6.0-zh-CN.xpi 241868 RMD160 1e9d0b6594cbdc= 151b92456030a5cb40f0916f3 DIST firefox-6.0-zh-TW.xpi 242787 RMD160 13e3b2decf59ff0cb2e69b2f10e446e= 37c63f5f5 SHA1 33d8a06b0775780beadfa836883db3149afa60de SHA256 5b5d3cd6ee= 368007415b82e338204d3fe658291f4f4d454fcc1efc7e93d0563c DIST firefox-6.0-zu.xpi 233159 RMD160 64e3f5fdb78c9f343d3de05f8604e531b6= 7f8f8c SHA1 0cfc262f1f6172f6fa5b8e82f7856d53a1f110c4 SHA256 7e6aa854e7e60= 6f00c8e238c11c634b5fd5d068156840736b5997ecb6f6ad6d9 DIST firefox-6.0.source.tar.bz2 67919174 RMD160 b1f586d4e9889f3b5449c00e= 4bf3340d3dcca0da SHA1 abcb3cc3907d5217726f457085d00b3995fb469b SHA256 cc3= fb554ca02358e000502a1023d5ba01e6d18ae30c719f5a3b1ce1ad8334973 -EBUILD firefox-6.0.ebuild 11048 RMD160 7110ffa308e73a4899044312a9745c54c= fd19179 SHA1 7bee129014dc3bd41c3379a15f14991d732c518e SHA256 f5f6a6eafe48= 781427cd20d836df4c85d521e4ba7d8ad5914e4ca9a5ca0b0801 +EBUILD firefox-6.0.ebuild 10978 RMD160 30de134f6520db77afb850d1861517f46= 99dfb0c SHA1 8f7b7ccd81503b204660b9de09b9d742b3a5216e SHA256 a4dfb6d7f197= ec52c2b41bca70b5e3548a6234eaaef802ae604ab7b15cd9205a diff --git a/www-client/firefox/firefox-6.0.ebuild b/www-client/firefox/f= irefox-6.0.ebuild index 2b03be6..2c0b209 100644 --- a/www-client/firefox/firefox-6.0.ebuild +++ b/www-client/firefox/firefox-6.0.ebuild @@ -23,7 +23,6 @@ SLOT=3D"0" LICENSE=3D"|| ( MPL-1.1 GPL-2 LGPL-2.1 )" IUSE=3D"bindist +crashreporter +methodjit +ipc pgo system-sqlite +webm" =20 -REL_URI=3D"http://releases.mozilla.org/pub/mozilla.org/firefox/releases" FTP_URI=3D"ftp://ftp.mozilla.org/pub/firefox/releases/" # More URIs appended below... SRC_URI=3D"http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar= .bz2" @@ -33,8 +32,8 @@ ASM_DEPEND=3D">=3Ddev-lang/yasm-1.1" # Mesa 7.10 needed for WebGL + bugfixes RDEPEND=3D" >=3Dsys-devel/binutils-2.16.1 - >=3Ddev-libs/nss-3.12.9 - >=3Ddev-libs/nspr-4.8.7 + >=3Ddev-libs/nss-3.12.10 + >=3Ddev-libs/nspr-4.8.8 >=3Ddev-libs/glib-2.26 >=3Dmedia-libs/mesa-7.10 media-libs/libpng[apng] @@ -63,7 +62,7 @@ elif [[ ${PV} =3D~ beta ]]; then S=3D"${WORKDIR}/mozilla-beta" else SRC_URI=3D"${SRC_URI} - ${REL_URI}/${FF_PV}/source/firefox-${FF_PV}.source.tar.bz2" + ${FTP_URI}/${FF_PV}/source/firefox-${FF_PV}.source.tar.bz2" S=3D"${WORKDIR}/mozilla-release" fi =20 @@ -80,14 +79,14 @@ if ! [[ ${PV} =3D~ alpha|beta ]]; then # en and en_US are handled internally if [[ ${X} !=3D en ]] && [[ ${X} !=3D en-US ]]; then SRC_URI=3D"${SRC_URI} - linguas_${X/-/_}? ( ${REL_URI}/${FF_PV}/linux-i686/xpi/${X}.xpi -> $= {P}-${X}.xpi )" + linguas_${X/-/_}? ( ${FTP_URI}/${FF_PV}/linux-i686/xpi/${X}.xpi -> $= {P}-${X}.xpi )" fi IUSE=3D"${IUSE} linguas_${X/-/_}" # Install all the specific locale xpis if there's no generic locale xp= i # Example: there's no pt.xpi, so install all pt-*.xpi if ! has ${X%%-*} "${LANGS[@]}"; then SRC_URI=3D"${SRC_URI} - linguas_${X%%-*}? ( ${REL_URI}/${FF_PV}/linux-i686/xpi/${X}.xpi -> $= {P}-${X}.xpi )" + linguas_${X%%-*}? ( ${FTP_URI}/${FF_PV}/linux-i686/xpi/${X}.xpi -> $= {P}-${X}.xpi )" IUSE=3D"${IUSE} linguas_${X%%-*}" fi done