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 /mail-client | |
| 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 'mail-client')
| -rw-r--r-- | mail-client/thunderbird-bin/thunderbird-bin-38.1.0.ebuild | 16 | ||||
| -rw-r--r-- | mail-client/thunderbird/thunderbird-38.1.0.ebuild | 22 |
2 files changed, 11 insertions, 27 deletions
diff --git a/mail-client/thunderbird-bin/thunderbird-bin-38.1.0.ebuild b/mail-client/thunderbird-bin/thunderbird-bin-38.1.0.ebuild index a005e09337b6..f861b4fc8659 100644 --- a/mail-client/thunderbird-bin/thunderbird-bin-38.1.0.ebuild +++ b/mail-client/thunderbird-bin/thunderbird-bin-38.1.0.ebuild @@ -24,24 +24,14 @@ 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. -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_HTTP_URI="http://archive.mozilla.org/pub/mozilla.org/${MOZ_PN}/releases/" inherit eutils multilib pax-utils fdo-mime gnome2-utils mozlinguas nsplugins DESCRIPTION="Thunderbird Mail Client" 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 - ) - ${MOZ_FTP_URI/${MOZ_PN}/calendar/lightning}/${MOZ_LIGHTNING_VER}/linux/lightning.xpi -> lightning-${MOZ_LIGHTNING_VER}.xpi + 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 ) ${MOZ_HTTP_URI/${MOZ_PN}/calendar/lightning}/${MOZ_LIGHTNING_VER}/linux/lightning.xpi -> lightning-${MOZ_LIGHTNING_VER}.xpi " HOMEPAGE="http://www.mozilla.com/thunderbird" diff --git a/mail-client/thunderbird/thunderbird-38.1.0.ebuild b/mail-client/thunderbird/thunderbird-38.1.0.ebuild index f089330b7c40..5e828a74f003 100644 --- a/mail-client/thunderbird/thunderbird-38.1.0.ebuild +++ b/mail-client/thunderbird/thunderbird-38.1.0.ebuild @@ -29,10 +29,7 @@ EMVER="1.8.2" PATCH="thunderbird-38.0-patches-0.1" PATCHFF="firefox-38.0-patches-0.3" -# 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/${PN}/releases/" -MOZ_HTTP_URI="http://ftp.mozilla.org/pub/${PN}/releases/" +MOZ_HTTP_URI="http://ftp.mozilla.org/pub/${PN}/releases" MOZCONFIG_OPTIONAL_JIT="enabled" inherit flag-o-matic toolchain-funcs mozconfig-v6.38 makeedit multilib autotools pax-utils check-reqs nsplugins mozlinguas @@ -46,16 +43,13 @@ LICENSE="MPL-2.0 GPL-2 LGPL-2.1" IUSE="bindist crypt hardened ldap lightning +minimal mozdom selinux" RESTRICT="!bindist? ( bindist )" -SRC_URIS=( - ${SRC_URI} - {${MOZ_FTP_URI},${MOZ_HTTP_URI}}${MOZ_PV}/source/${MOZ_P}.source.tar.bz2 - ${MOZ_FTP_URI/${PN}/calendar/lightning}"${MOZ_LIGHTNING_VER}/linux/lightning.xpi -> lightning-${MOZ_LIGHTNING_VER}.xpi" - ${MOZ_HTTP_URI/${PN}/calendar/lightning}"${MOZ_LIGHTNING_VER}/linux/lightning.xpi -> lightning-${MOZ_LIGHTNING_VER}.xpi" - "lightning? ( http://dev.gentoo.org/~axs/distfiles/gdata-provider-${MOZ_LIGHTNING_GDATA_VER}.tar.xz )" - "crypt? ( http://www.enigmail.net/download/source/enigmail-${EMVER}.tar.gz )" - http://dev.gentoo.org/~{anarchy,axs,polynomial-c}/mozilla/patchsets/{${PATCH},${PATCHFF}}.tar.xz -) -SRC_URI="${SRC_URIS[@]}" +PATCH_URIS=( http://dev.gentoo.org/~{anarchy,axs,polynomial-c}/mozilla/patchsets/{${PATCH},${PATCHFF}}.tar.xz ) +SRC_URI="${SRC_URI} + ${MOZ_HTTP_URI}/${MOZ_PV}/source/${MOZ_P}.source.tar.bz2 + ${MOZ_HTTP_URI/${PN}/calendar/lightning}/${MOZ_LIGHTNING_VER}/linux/lightning.xpi -> lightning-${MOZ_LIGHTNING_VER}.xpi + lightning? ( http://dev.gentoo.org/~axs/distfiles/gdata-provider-${MOZ_LIGHTNING_GDATA_VER}.tar.xz ) + crypt? ( http://www.enigmail.net/download/source/enigmail-${EMVER}.tar.gz ) + ${PATCH_URIS[@]}" ASM_DEPEND=">=dev-lang/yasm-1.1" |