commit: 448a2ee70be41c0b9d2e7a8a824e42d83f4215dd Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org> AuthorDate: Tue Aug 11 04:24:23 2015 +0000 Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org> CommitDate: Tue Aug 11 05:22:33 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=448a2ee7
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 .../thunderbird-bin/thunderbird-bin-38.1.0.ebuild | 16 +++------------- mail-client/thunderbird/thunderbird-38.1.0.ebuild | 22 ++++++++-------------- www-client/firefox-bin/firefox-bin-38.1.1.ebuild | 11 +++-------- www-client/firefox-bin/firefox-bin-39.0.3.ebuild | 15 +++------------ www-client/firefox/firefox-38.1.1.ebuild | 10 ++-------- www-client/firefox/firefox-39.0.3.ebuild | 11 +++-------- .../seamonkey-bin/seamonkey-bin-2.33.1-r1.ebuild | 6 +++--- .../seamonkey-bin/seamonkey-bin-2.33.1.ebuild | 6 +++--- www-client/seamonkey/seamonkey-2.33.1-r1.ebuild | 6 +++--- 9 files changed, 31 insertions(+), 72 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 a005e09..f861b4f 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 f089330..5e828a7 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" 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 f66cfeb..218bcb6 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 394f048..0ea1f0d 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" diff --git a/www-client/firefox/firefox-38.1.1.ebuild b/www-client/firefox/firefox-38.1.1.ebuild index 41ae3b7..9311b08 100644 --- a/www-client/firefox/firefox-38.1.1.ebuild +++ b/www-client/firefox/firefox-38.1.1.ebuild @@ -28,11 +28,7 @@ fi # Patch version PATCH="${PN}-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_FTP_URI="http://archive.mozilla.org/pub/${PN}/releases"; -MOZ_HTTP_URI="http://ftp.mozilla.org/pub/${PN}/releases"; +MOZ_HTTP_URI="http://archive.mozilla.org/pub/${PN}/releases"; MOZCONFIG_OPTIONAL_WIFI=1 MOZCONFIG_OPTIONAL_JIT="enabled" @@ -52,7 +48,7 @@ RESTRICT="!bindist? ( bindist )" # More URIs appended below... SRC_URI="${SRC_URI} http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.xz - http://dev.gentoo.org/~axs/distfiles/${PATCH}.tar.xz + http://dev.gentoo.org/~axs/mozilla/patchsets/${PATCH}.tar.xz http://dev.gentoo.org/~polynomial-c/mozilla/patchsets/${PATCH}.tar.xz"; ASM_DEPEND=">=dev-lang/yasm-1.1" @@ -80,11 +76,9 @@ if [[ ${PV} =~ alpha ]]; then elif [[ ${PV} =~ beta ]]; then S="${WORKDIR}/mozilla-release" SRC_URI="${SRC_URI} - ${MOZ_FTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.bz2 ${MOZ_HTTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.bz2" else SRC_URI="${SRC_URI} - ${MOZ_FTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.bz2 ${MOZ_HTTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.bz2" if [[ ${MOZ_ESR} == 1 ]]; then S="${WORKDIR}/mozilla-esr${PV%%.*}" diff --git a/www-client/firefox/firefox-39.0.3.ebuild b/www-client/firefox/firefox-39.0.3.ebuild index 8608b83..ae004e2 100644 --- a/www-client/firefox/firefox-39.0.3.ebuild +++ b/www-client/firefox/firefox-39.0.3.ebuild @@ -28,11 +28,8 @@ fi # Patch version PATCH="${PN}-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_FTP_URI="http://archive.mozilla.org/pub/${PN}/releases"; -MOZ_HTTP_URI="http://ftp.mozilla.org/pub/${PN}/releases"; + +MOZ_HTTP_URI="http://archive.mozilla.org/pub/${PN}/releases"; MOZCONFIG_OPTIONAL_WIFI=1 MOZCONFIG_OPTIONAL_JIT="enabled" @@ -52,7 +49,7 @@ RESTRICT="!bindist? ( bindist )" # More URIs appended below... SRC_URI="${SRC_URI} http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.xz - http://dev.gentoo.org/~axs/distfiles/${PATCH}.tar.xz + http://dev.gentoo.org/~axs/mozilla/patchsets/${PATCH}.tar.xz http://dev.gentoo.org/~polynomial-c/mozilla/patchsets/${PATCH}.tar.xz"; ASM_DEPEND=">=dev-lang/yasm-1.1" @@ -80,11 +77,9 @@ if [[ ${PV} =~ alpha ]]; then elif [[ ${PV} =~ beta ]]; then S="${WORKDIR}/mozilla-release" SRC_URI="${SRC_URI} - ${MOZ_FTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.bz2 ${MOZ_HTTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.bz2" else SRC_URI="${SRC_URI} - ${MOZ_FTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.bz2 ${MOZ_HTTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.bz2" if [[ ${MOZ_ESR} == 1 ]]; then S="${WORKDIR}/mozilla-esr${PV%%.*}" diff --git a/www-client/seamonkey-bin/seamonkey-bin-2.33.1-r1.ebuild b/www-client/seamonkey-bin/seamonkey-bin-2.33.1-r1.ebuild index 86cf1cf..382ecf7 100644 --- a/www-client/seamonkey-bin/seamonkey-bin-2.33.1-r1.ebuild +++ b/www-client/seamonkey-bin/seamonkey-bin-2.33.1-r1.ebuild @@ -17,14 +17,14 @@ MOZ_P="${MOZ_PN}-${MOZ_PV}" MOZ_LANGPACK_PREFIX="${MOZ_PV}/langpack/${MOZ_P}." MOZ_LANGPACK_SUFFIX=".langpack.xpi" -MOZ_FTP_URI="ftp://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 mozextension pax-utils nsplugins fdo-mime gnome2-utils mozlinguas DESCRIPTION="Mozilla Application Suite - web browser, email, HTML editor, IRC" SRC_URI="${SRC_URI} - amd64? ( ${MOZ_FTP_URI}/${MOZ_PV}/contrib/${MOZ_P}.en-US.linux-x86_64.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}/contrib/${MOZ_P}.en-US.linux-x86_64.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.seamonkey-project.org/"; RESTRICT="strip mirror" diff --git a/www-client/seamonkey-bin/seamonkey-bin-2.33.1.ebuild b/www-client/seamonkey-bin/seamonkey-bin-2.33.1.ebuild index 8460a4f..b2edf42 100644 --- a/www-client/seamonkey-bin/seamonkey-bin-2.33.1.ebuild +++ b/www-client/seamonkey-bin/seamonkey-bin-2.33.1.ebuild @@ -17,14 +17,14 @@ MOZ_P="${MOZ_PN}-${MOZ_PV}" MOZ_LANGPACK_PREFIX="${MOZ_PV}/langpack/${MOZ_P}." MOZ_LANGPACK_SUFFIX=".langpack.xpi" -MOZ_FTP_URI="ftp://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 mozextension pax-utils nsplugins fdo-mime gnome2-utils mozlinguas DESCRIPTION="Mozilla Application Suite - web browser, email, HTML editor, IRC" SRC_URI="${SRC_URI} - amd64? ( ${MOZ_FTP_URI}/${MOZ_PV}/contrib/${MOZ_P}.en-US.linux-x86_64.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}/contrib/${MOZ_P}.en-US.linux-x86_64.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.seamonkey-project.org/"; RESTRICT="strip mirror" diff --git a/www-client/seamonkey/seamonkey-2.33.1-r1.ebuild b/www-client/seamonkey/seamonkey-2.33.1-r1.ebuild index 1872588..7faaa6c 100644 --- a/www-client/seamonkey/seamonkey-2.33.1-r1.ebuild +++ b/www-client/seamonkey/seamonkey-2.33.1-r1.ebuild @@ -17,11 +17,11 @@ MOZ_P="${P}" MY_MOZ_P="${PN}-${MOZ_PV}" if [[ ${PV} == *_pre* ]] ; then - MOZ_FTP_URI="ftp://ftp.mozilla.org/pub/${PN}/candidates/${MOZ_PV}-candidates/build${PV##*_pre}"; + MOZ_HTTP_URI="http://archive.mozilla.org/pub/${PN}/candidates/${MOZ_PV}-candidates/build${PV##*_pre}"; MOZ_LANGPACK_PREFIX="linux-i686/xpi/" # And the langpack stuff stays at eclass defaults else - MOZ_FTP_URI="ftp://ftp.mozilla.org/pub/${PN}/releases/${MOZ_PV}"; + MOZ_HTTP_URI="http://archive.mozilla.org/pub/${PN}/releases/${MOZ_PV}"; MOZ_LANGPACK_PREFIX="langpack/${MY_MOZ_P}." MOZ_LANGPACK_SUFFIX=".langpack.xpi" fi @@ -52,7 +52,7 @@ LICENSE="MPL-2.0 GPL-2 LGPL-2.1" IUSE="+chatzilla +crypt +gmp-autoupdate +ipc minimal pulseaudio +roaming selinux test" SRC_URI="${SRC_URI} - ${MOZ_FTP_URI}/source/${MY_MOZ_P}.source.tar.bz2 -> ${P}.source.tar.bz2 + ${MOZ_HTTP_URI}/source/${MY_MOZ_P}.source.tar.bz2 -> ${P}.source.tar.bz2 http://dev.gentoo.org/~axs/mozilla/patchsets/${PATCHFF}.tar.xz http://dev.gentoo.org/~polynomial-c/mozilla/patchsets/${PATCH}.tar.xz http://dev.gentoo.org/~polynomial-c/mozilla/patchsets/${PATCHFF}.tar.xz
