[gentoo-commits] repo/gentoo:master commit in: www-client/firefox-bin/

[Ian Stakenvicius]

commit:     e8ef2752f381254ae4059a6a294577f76634d81e
Author:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Sun Aug  9 06:23:28 2015 +0000
Commit:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Sun Aug  9 06:25:39 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8ef2752

Updated MOZ_FTP_URI to adjust for apparent upstream change, bug 531278#c11

Package-Manager: portage-2.2.20

 www-client/firefox-bin/firefox-bin-38.1.1.ebuild | 6 ++++--
 www-client/firefox-bin/firefox-bin-39.0.3.ebuild | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/www-client/firefox-bin/firefox-bin-38.1.1.ebuild 
b/www-client/firefox-bin/firefox-bin-38.1.1.ebuild
index 09973eb..f66cfeb 100644
--- a/www-client/firefox-bin/firefox-bin-38.1.1.ebuild
+++ b/www-client/firefox-bin/firefox-bin-38.1.1.ebuild
@@ -26,12 +26,14 @@ MOZ_P="${MOZ_PN}-${MOZ_PV}"
 
 # Upstream ftp release URI that's used by mozlinguas.eclass
 # We don't use the http mirror because it deletes old tarballs.
-MOZ_FTP_URI="ftp://ftp.mozilla.org/pub/mozilla.org/${MOZ_PN}/releases/";
+
+# Upstream seems to have changed location
+#MOZ_FTP_URI="ftp://ftp.mozilla.org/pub/mozilla.org/${MOZ_PN}/releases/";
+MOZ_FTP_URI="http://archive.mozilla.org/pub/mozilla.org/${MOZ_PN}/releases/";
 
 inherit eutils multilib pax-utils fdo-mime gnome2-utils mozlinguas nsplugins
 
 DESCRIPTION="Firefox Web Browser"
-MOZ_FTP_URI="ftp://ftp.mozilla.org/pub/mozilla.org/${MOZ_PN}/releases";
 SRC_URI="${SRC_URI}
        amd64? ( ${MOZ_FTP_URI}/${MOZ_PV}/linux-x86_64/en-US/${MOZ_P}.tar.bz2 
-> ${PN}_x86_64-${PV}.tar.bz2 )
        x86? ( ${MOZ_FTP_URI}/${MOZ_PV}/linux-i686/en-US/${MOZ_P}.tar.bz2 -> 
${PN}_i686-${PV}.tar.bz2 )"

diff --git a/www-client/firefox-bin/firefox-bin-39.0.3.ebuild 
b/www-client/firefox-bin/firefox-bin-39.0.3.ebuild
index e97a81b..394f048 100644
--- a/www-client/firefox-bin/firefox-bin-39.0.3.ebuild
+++ b/www-client/firefox-bin/firefox-bin-39.0.3.ebuild
@@ -21,9 +21,11 @@ MOZ_P="${MOZ_PN}-${MOZ_PV}"
 
 # Upstream ftp release URI that's used by mozlinguas.eclass
 # We used to not use the http mirror because it deletes old tarballs.
-MOZ_FTP_URI="ftp://ftp.mozilla.org/pub/mozilla.org/${MOZ_PN}/releases/";
 MOZ_HTTP_URI="http://ftp.mozilla.org/pub/mozilla.org/${MOZ_PN}/releases/";
 
+#MOZ_FTP_URI="ftp://ftp.mozilla.org/pub/mozilla.org/${MOZ_PN}/releases/";
+MOZ_FTP_URI="http://archive.mozilla.org/pub/mozilla.org/${MOZ_PN}/releases/";
+
 inherit eutils multilib pax-utils fdo-mime gnome2-utils mozlinguas nsplugins
 
 DESCRIPTION="Firefox Web Browser"