diff options
| author |   Ian Stakenvicius <axs@gentoo.org> | 2015-08-11 00:24:23 -0400 |
|---|---|---|
| committer | Ian Stakenvicius <axs@gentoo.org> | 2015-08-11 01:22:33 -0400 |
| commit | 448a2ee70be41c0b9d2e7a8a824e42d83f4215dd (patch) | |
| tree | 8358ac8804870dc290e714ec3dfe4e0a9f7ce5f9 /www-client/firefox-bin | |
| parent | dev-ruby/httparty: avoid dependency on simplecov (diff) | |
| download | gentoo-448a2ee70be41c0b9d2e7a8a824e42d83f4215dd.tar.gz gentoo-448a2ee70be41c0b9d2e7a8a824e42d83f4215dd.tar.bz2 gentoo-448a2ee70be41c0b9d2e7a8a824e42d83f4215dd.zip | |
mozilla packages: Fix and normalize SRC_URI
As per gentoo bug 557040, upstream dropped their FTP archive. This
commit cleans up all MOZ_*_URI specifications in mozilla ebuilds
to match one-another. Ebuilds now use MOZ_HTTP_URI and
http://archive.mozilla.org/ ; adjusted ebuilds include:
www-client/firefox-38.1.1
www-client/firefox-39.0.3
www-client/firefox-bin-38.1.1
www-client/firefox-bin-39.0.3
mail-client/thunderbird-38.1.0
mail-client/thunderbird-bin-38.1.0
www-client/seamonkey-2.33.1-r1
www-client/seamonkey-bin-2.33.1
www-client/seamonkey-bin-2.33.1-r1
Package-Manager: portage-2.2.20
Diffstat (limited to 'www-client/firefox-bin')
| -rw-r--r-- | www-client/firefox-bin/firefox-bin-38.1.1.ebuild | 11 | ||||
| -rw-r--r-- | www-client/firefox-bin/firefox-bin-39.0.3.ebuild | 15 |
2 files changed, 6 insertions, 20 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 f66cfeb48ca7..218bcb6ef1c1 100644 --- a/www-client/firefox-bin/firefox-bin-38.1.1.ebuild +++ b/www-client/firefox-bin/firefox-bin-38.1.1.ebuild @@ -24,19 +24,14 @@ if [[ ${MOZ_ESR} == 1 ]]; then fi 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. - -# 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/" +MOZ_HTTP_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" 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 )" + amd64? ( ${MOZ_HTTP_URI}/${MOZ_PV}/linux-x86_64/en-US/${MOZ_P}.tar.bz2 -> ${PN}_x86_64-${PV}.tar.bz2 ) + x86? ( ${MOZ_HTTP_URI}/${MOZ_PV}/linux-i686/en-US/${MOZ_P}.tar.bz2 -> ${PN}_i686-${PV}.tar.bz2 )" HOMEPAGE="http://www.mozilla.com/firefox" RESTRICT="strip mirror" 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 394f04869ed0..0ea1f0daa80e 100644 --- a/www-client/firefox-bin/firefox-bin-39.0.3.ebuild +++ b/www-client/firefox-bin/firefox-bin-39.0.3.ebuild @@ -19,23 +19,14 @@ MOZ_PV="${MOZ_PV/_rc/rc}" # Handle rc for SRC_URI MOZ_PN="${PN/-bin}" 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_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/" +MOZ_HTTP_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" 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 - ${MOZ_HTTP_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 - ${MOZ_HTTP_URI%/}/${MOZ_PV}/linux-i686/en-US/${MOZ_P}.tar.bz2 -> ${PN}_i686-${PV}.tar.bz2 )" + amd64? ( ${MOZ_HTTP_URI%/}/${MOZ_PV}/linux-x86_64/en-US/${MOZ_P}.tar.bz2 -> ${PN}_x86_64-${PV}.tar.bz2 ) + x86? ( ${MOZ_HTTP_URI%/}/${MOZ_PV}/linux-i686/en-US/${MOZ_P}.tar.bz2 -> ${PN}_i686-${PV}.tar.bz2 )" HOMEPAGE="http://www.mozilla.com/firefox" RESTRICT="strip mirror" |