summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Stakenvicius <axs@gentoo.org>2015-07-16 19:37:56 +0000
committerIan Stakenvicius <axs@gentoo.org>2015-07-16 19:37:56 +0000
commit611fe0bacb6727be482dd909355877c07ef58414 (patch)
tree72de29958688a487b6a57864d38fb4f833263119 /www-client
parentia64 stable wrt bug #500960 (diff)
downloadhistorical-611fe0bacb6727be482dd909355877c07ef58414.tar.gz
historical-611fe0bacb6727be482dd909355877c07ef58414.tar.bz2
historical-611fe0bacb6727be482dd909355877c07ef58414.zip
added http sources to SRC_URI, bug 531278
Package-Manager: portage-2.2.18/cvs/Linux x86_64 Manifest-Sign-Key: 0x009C547C2B6559ED!
Diffstat (limited to 'www-client')
-rw-r--r--www-client/firefox-bin/ChangeLog6
-rw-r--r--www-client/firefox-bin/Manifest10
-rw-r--r--www-client/firefox-bin/firefox-bin-39.0.ebuild14
3 files changed, 19 insertions, 11 deletions
diff --git a/www-client/firefox-bin/ChangeLog b/www-client/firefox-bin/ChangeLog
index 4729c8ded6ed..b17b60db2032 100644
--- a/www-client/firefox-bin/ChangeLog
+++ b/www-client/firefox-bin/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for www-client/firefox-bin
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/ChangeLog,v 1.237 2015/07/03 21:24:15 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/ChangeLog,v 1.238 2015/07/16 19:37:51 axs Exp $
+
+ 16 Jul 2015; Ian Stakenvicius (_AxS_) <axs@gentoo.org>
+ firefox-bin-39.0.ebuild:
+ added http sources to SRC_URI, bug 531278
*firefox-bin-38.1.0 (03 Jul 2015)
*firefox-bin-39.0 (03 Jul 2015)
diff --git a/www-client/firefox-bin/Manifest b/www-client/firefox-bin/Manifest
index 781b9d5da0e3..9fa7e17083a1 100644
--- a/www-client/firefox-bin/Manifest
+++ b/www-client/firefox-bin/Manifest
@@ -329,13 +329,13 @@ DIST firefox-bin_x86_64-39.0.tar.bz2 47681275 SHA256 ebb727c7642468bd463d0cbe91c
EBUILD firefox-bin-31.7.0.ebuild 5544 SHA256 480b490451975d0c5e5e66a503b2cbf31b55939e065bb4bfbaa0598997100ff9 SHA512 f9194bcf5f82605765b6b476621213564f1aaa09c0616f5b2ef6ee007ce90a478a0dc75841e75a8ba4c452f558a7fe57c243611591fc2b4063d80d8f5ce16913 WHIRLPOOL 0b62105eaa2857cd6dae73611f5e876c0313859c2e5077ce352fea4156a7244cff25b6d002736943842acfa162f688e44b47c572ade1fda5e146fc93125a4ef0
EBUILD firefox-bin-31.8.0.ebuild 5559 SHA256 38bd731781fde174c330793a9e65dd735fbe811fdec5a89c5fbfaf8044dfbd72 SHA512 d86654e2a59156fde2f2a88fb58dda8a126e7585801d2cda4f43bf66b246a671b383c4abf71716449b5ebec2b6ef7701accb4d4b16145e0658a022475ae23e3d WHIRLPOOL c0637ff3fa1ab0a25a6c3ec0a6cc1bf70a2adf47b5b23b61fe09acf8f2709834badce7d9b7769bc4dc4d1d2816e83932ec63d305e122b349f256db83ad69cab4
EBUILD firefox-bin-38.1.0.ebuild 5644 SHA256 3c8d69af45d1091023950128b89ac3a95d6ece8a5935ab780f6ebd4eaf9a309b SHA512 915a8de6c9008f273041dfc4910748a5f750d133891565921c3b2617ef47ca22b124738ce0b71b683feea1f55cba557f62774fffe12c06c55ad5fd8497a02c31 WHIRLPOOL 7bb5a6ea66f54affddc85ad59cc5a9a1af65abd742e44aa170a7542c0fa9e2536d46425956bb7bdafe8cac25989ad81710fc3e9103f2b801af06196af157e4b6
-EBUILD firefox-bin-39.0.ebuild 5529 SHA256 7b075f1f68e59b3bc70f024a849fd9e4553ea253dfe4bbb7fba1200b4bcc68ac SHA512 bb031e4a9b6501b64ee36249909aaafa70f7dd5a5904ae108e1fe7a7f9a47ca3f047c1eda1b2a84464946f5c0af4cb703e4d953bf471308b03de1178a5d7ee6e WHIRLPOOL 266f4fad12914765ce930714bca94edb94394d75dabf464cf885e8fb7fdc4cf69872bb8a441799c35863605d0d1c884e1c59c36deb90de7f99501f3ef9e5f43a
-MISC ChangeLog 77527 SHA256 0dbaed93fe95ba18505de2125e853888c1aceab41efba6aad9c0ae26097e1be8 SHA512 2ec1674dcb10609fa97c8f00efc03aa50edf388258a4f3d8a4a6a57e81d9fb79887f3cdf35d7cac858861680cbc25f60c3f024f0a74c4006db698f9b3eb59320 WHIRLPOOL 17f72e7e848528cdbe4b99347874d5e7ec360b2f7ef1052518f0dbd697d8330455d9124a181335acc117df097e75ae2a18da16baeac2c144e361c00cf3b1f97d
+EBUILD firefox-bin-39.0.ebuild 5734 SHA256 82c4f2cf7a884fe0e27c554f3f40360c627a02dc76c5ceff8ddf77a3e19a8187 SHA512 7f631d89abb6d2df64aacb40486c1c6494befcda385044aad468bd41fb45b8feab4818a556e227c11f0723e625c841a7f917b376dbb92a67c22baa0c954f95ab WHIRLPOOL b69e90fdcf5723d812d7e126937fabb488c18fe2833281a816ead7d283e500a7e11be379aaca48027ac8268e29c58b1101b20b42e2c03a82709b09c74756eccb
+MISC ChangeLog 77656 SHA256 1cc4b2576f893d97f15c452ed1010304c486f4908b2974b79e8f6ae9b1437edb SHA512 e8e7536f0000af0c323a696c799a557df61e6367a230d67754e26a304dfd73c32a3c0a7fb284b99e48dbb98615e2d0663e9c7bab145970723611521a58aec9e0 WHIRLPOOL 4b937cc6940da45604e260ede9222ecf759557938a4dd3f07e7f5af04d60a4c7bd9ac181edf92d404d87f99eb96038a2ed62a168e1b079ef1df4354de4a9a4ae
MISC metadata.xml 160 SHA256 0cc5126362a12cee42ec1197c528a804cf36859329dd2c6d9225726831d14b8b SHA512 ed6f709d55351c1b69f2b43ada124fcc2f8969f8c3867073bb0c68aa502f16247cbcd78734a891e4d1a509d334f6805e5267d2088cd03f3408a636ad9aedc2bb WHIRLPOOL e6bf1791838158287debcc3160dd075dcdf88bc1b33060aefe4687b4451108e55b6f8021fc36f07ab85c4e37a4225444cc2804cf40bd61ba49726bbf12fa4e38
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iF4EAREIAAYFAlWW/YUACgkQAJxUfCtlWe2PIAEApJorYacvbZ73ukMWboIOkZ0Y
-4wdbWAasrXHEhf9e0rIBAN8uxRLvydj8Lvk1/25plx43K1YXfMVCzSpSNIXN9JgW
-=uFiN
+iF4EAREIAAYFAlWoCBQACgkQAJxUfCtlWe00NAEAthB9zF8hhz5Yovr2NVTwiy3E
+/wVNWRZhAsiKop9s3ZQBAJpy9Ed7QjOk8JD0GCfpwpYqZ09gFw4DsLenAZSANZPY
+=TGYg
-----END PGP SIGNATURE-----
diff --git a/www-client/firefox-bin/firefox-bin-39.0.ebuild b/www-client/firefox-bin/firefox-bin-39.0.ebuild
index fe8801c07b19..9642a50dd5e8 100644
--- a/www-client/firefox-bin/firefox-bin-39.0.ebuild
+++ b/www-client/firefox-bin/firefox-bin-39.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/firefox-bin-39.0.ebuild,v 1.1 2015/07/03 21:24:15 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/firefox-bin-39.0.ebuild,v 1.2 2015/07/16 19:37:51 axs Exp $
EAPI="5"
@@ -20,16 +20,20 @@ MOZ_PN="${PN/-bin}"
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.
+# 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/"
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 )"
+ 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 )"
HOMEPAGE="http://www.mozilla.com/firefox"
RESTRICT="strip mirror"