Use ftp://ftp.mozilla.org instead of releases.mozilla.org so that old tarballs aren't removed from under our feet

Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64

3 files changed, 26 insertions, 22 deletions

diff --git a/www-client/firefox-bin/ChangeLog b/www-client/firefox-bin/ChangeLog
index 703e925e4c48..a0f27726f32f 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-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/ChangeLog,v 1.63 2011/08/21 17:45:28 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/ChangeLog,v 1.64 2011/08/21 18:30:34 nirbheek Exp $
+
+  21 Aug 2011; Nirbheek Chauhan <nirbheek@gentoo.org> firefox-bin-6.0.ebuild:
+  Use ftp://ftp.mozilla.org instead of releases.mozilla.org so that old
+  tarballs aren't removed from under our feet
 
 *firefox-bin-6.0 (21 Aug 2011)
 
diff --git a/www-client/firefox-bin/Manifest b/www-client/firefox-bin/Manifest
index 1ed4dba4fa40..7aaea3404af9 100644
--- a/www-client/firefox-bin/Manifest
+++ b/www-client/firefox-bin/Manifest
@@ -314,23 +314,23 @@ DIST libnotify.so.1.bz2 11228 RMD160 459dd9f8de3a4a421348c3ad0e793e868a09c228 SH
 EBUILD firefox-bin-3.6.17.ebuild 5691 RMD160 671dbcbd16842f3282428ad8931c01d66ad85470 SHA1 d82868521c9d78f17cea3585bdd9b0ab24f0994c SHA256 decf0112ed90e8a7db8c539b26e9339bb4f52b7668581b59e935edb7e2cddeb9
 EBUILD firefox-bin-3.6.18.ebuild 5695 RMD160 c7674a9c989ebf7ee7770cc57400ea42746af29e SHA1 edefc371294b168061578e2013c1556f71c8cfa2 SHA256 c2cfc4d98f0f30ed8d70bc7332948c359c385be25bd2d12a30a0cb83bf5a74bf
 EBUILD firefox-bin-3.6.20.ebuild 5695 RMD160 bb404e812b644c8baf860f00b02a4ba6468e8770 SHA1 bd360fdceea43e0f3d33007bdd47b769fc84ae46 SHA256 234b74a315578b6792822d501d99e9d3d886e7b7c1d8acc44368b2492e957173
-EBUILD firefox-bin-6.0.ebuild 5209 RMD160 784b7752954988ade24e32b4e6e708e1ff928bf6 SHA1 ad959107bddf92fe1a46ee8bf78b55ff9b5e5426 SHA256 bab80330a9c6b639559f9c2952b61058fd114e00ea019ef5847ae6474d9e3c6b
-MISC ChangeLog 49068 RMD160 d0ffb8136e5890db20a1fe775d701fcc4d856cc2 SHA1 aa7c90aa2b08d3ac8f2369d0128e9aed919f183c SHA256 7a6fd9ad4218a725b82c4fdf038552f95baa7cd36c3a756a2ba721079acaae5d
+EBUILD firefox-bin-6.0.ebuild 5208 RMD160 e06a9c572a7c0b27e0b687c2476bacef648c96ed SHA1 27b225c9b872e411d58f5173b8098bb28e4afed0 SHA256 53b9ca9c06409f74937ea54a499f771c111e72d92e798ba683bacb0d5bd5ba3a
+MISC ChangeLog 49265 RMD160 116fbe9a4306965cd4ca5ef0014b3312bd68e004 SHA1 37063f0364ddbadae38f8a39882eb423b499a14b SHA256 1f837aa8120ba1ccd8d64229ca25605a7e125da6f331eca583f76c9a53d1020d
 MISC metadata.xml 160 RMD160 d5a9f0bf8989621c2bde30facb53bcae00aba709 SHA1 5015c07af2083f20f9552d7fb11afb5ea69af345 SHA256 0cc5126362a12cee42ec1197c528a804cf36859329dd2c6d9225726831d14b8b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJOUUQ/AAoJEO/kOhxWD91k2qgQALY6mQAQNPjamBYruaJvxjNu
-tL/pEWHZt8lOZmfzhQ4LFibYDnetyCkjzBvZAtShTo1SoxhfwGpVr0YpsviHmmDS
-rSLcRq2rGWpRGNrW8mo6RTGDKeEfqUd9VRrfHN7tPatXoST43hrW+wo9UMneE8NR
-P+BZn6NscsdZYZRaeGKq5U9o5cX5xMaKXS+RsUU3q+hpL3A4U1JS5ks2SzclpCDE
-sPLpF6wSMsgNYce7U5sso+/tO3yC9jUE87DZblq9Gr/JQSQj58+Y6Va/PUdEqpiF
-f2xKn9sB5esVzcFjjxXMHumEuopoJ+ZP2ifj3yZe/W2dEihsbpXDZhNrb91rgXKn
-jhZmrTjQqDDAdmhuNVgo+x6XA/vqH7hShj1WVhMlnezMFqQ40rWXxjuuFt5ncxgN
-6jkG+K26O95diq/Zq8Pjzy4yOfOVF8auliZPfQhjig2TxuBuWtuBMqXWNJRbXG6m
-4ADB1oJ7Z10xL/UC+fGmiYImBhZmrSoD8wIHEXLPqvPzSXLOqzrssdLbU9q01imR
-k4ScmEW4wpvc8u263+Fz+kSH0FneXwlh5GYNq1QpoTcoswJ/mWVlecaDyX9NN+2w
-TQ9gSdrV7cUWAJzEzDPrFSoNvAOE/2S/eJCnfxpFWL7ErCSI5v2iXy4VJ0C1slHB
-CaSGg/feZzSx0nlmAUiL
-=tz79
+iQIcBAEBAgAGBQJOUU7RAAoJEO/kOhxWD91kukAP/A3QTLgiBSwEbMrXoikaSGTo
+1bYQvUUmaY8bGp0HdqiIc5iNjDQvYRnlEqhp4HyIBjE+gOWTF1SYUyVFZ9iwU5ch
++7S02xn86VsST5UaiCEztElkGa+VIYAYqXhxHnqJzagF6m6pjNhgkieNGViC9NZh
+23uZ9cQ+M6tdQGwNEzUhd/ilkH+Td/UncTRSFsNeOskd5LqP55LK0NEAocmMAWix
+s9frRBVoceBjKjAEFmEjunZDSwoRmu4Otny2gBNjBORsS42S50IP/8jK+eBt2OWx
+giaYYawgE15bA5plvYxO+gkh3m2Po5I2sxeQ7a/pQTahLJYs9d1GZfNM8jfpg33T
+YeosBk/t7pze+DLzOQQtUDleTUtdd7+IKJCbgwl8Y193A4/SFJDpp2DfSyYRit7O
+4wA/E6c0FdZgOtUn6wPlR103WFpnEtugNmGTCFwiHoWc82ZZfM5Rfs49zowSitWC
+X4Q5jCWDgYSlEU96Zl3OADsZ6jWlgzgn5fQrD/G3XfZKrpuPZnxv81N96WsHnvYA
+sIzmH0I2S5o7Z+jur1umLAZEDYNb9g/uOomMaEig8Ea1ZGLVvAaSgbqPkZa4XN0S
+jwhpfRZJ4qBlN8XnFcwNEnoXMn9L6vd+8ho2txKcXBAdFoJXzgLp0HeFAp7ndYH5
+fEnblfUWPCt9AcIZS05R
+=kZ4W
 -----END PGP SIGNATURE-----
diff --git a/www-client/firefox-bin/firefox-bin-6.0.ebuild b/www-client/firefox-bin/firefox-bin-6.0.ebuild
index cdbf7cc1d19b..a795dfe4c32b 100644
--- a/www-client/firefox-bin/firefox-bin-6.0.ebuild
+++ b/www-client/firefox-bin/firefox-bin-6.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/firefox-bin-6.0.ebuild,v 1.1 2011/08/21 17:45:28 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/firefox-bin-6.0.ebuild,v 1.2 2011/08/21 18:30:34 nirbheek Exp $
 
 EAPI="3"
 
@@ -18,10 +18,10 @@ MY_PN="${PN/-bin}"
 MY_P="${MY_PN}-${MY_PV}"
 
 DESCRIPTION="Firefox Web Browser"
-REL_URI="http://ftp.mozilla.org/pub/mozilla.org/${MY_PN}/releases/"
+FTP_URI="ftp://ftp.mozilla.org/pub/mozilla.org/${MY_PN}/releases/"
 SRC_URI="
-	amd64? ( ${REL_URI}/${MY_PV}/linux-x86_64/en-US/${MY_P}.tar.bz2 -> ${PN}_x86_64-${PV}.tar.bz2 )
-	x86? ( ${REL_URI}/${MY_PV}/linux-i686/en-US/${MY_P}.tar.bz2 -> ${PN}_i686-${PV}.tar.bz2 )"
+	amd64? ( ${FTP_URI}/${MY_PV}/linux-x86_64/en-US/${MY_P}.tar.bz2 -> ${PN}_x86_64-${PV}.tar.bz2 )
+	x86? ( ${FTP_URI}/${MY_PV}/linux-i686/en-US/${MY_P}.tar.bz2 -> ${PN}_i686-${PV}.tar.bz2 )"
 HOMEPAGE="http://www.mozilla.com/firefox"
 RESTRICT="strip mirror"
 
@@ -34,14 +34,14 @@ for X in "${LANGS[@]}" ; do
 	# en and en_US are handled internally
 	if [[ ${X} != en ]] && [[ ${X} != en-US ]]; then
 		SRC_URI="${SRC_URI}
-			linguas_${X/-/_}? ( ${REL_URI}/${MY_PV}/linux-i686/xpi/${X}.xpi -> ${P/-bin/}-${X}.xpi )"
+			linguas_${X/-/_}? ( ${FTP_URI}/${MY_PV}/linux-i686/xpi/${X}.xpi -> ${P/-bin/}-${X}.xpi )"
 	fi
 	IUSE="${IUSE} linguas_${X/-/_}"
 	# Install all the specific locale xpis if there's no generic locale xpi
 	# Example: there's no pt.xpi, so install all pt-*.xpi
 	if ! has ${X%%-*} "${LANGS[@]}"; then
 		SRC_URI="${SRC_URI}
-			linguas_${X%%-*}? ( ${REL_URI}/${MY_PV}/linux-i686/xpi/${X}.xpi -> ${P/-bin/}-${X}.xpi )"
+			linguas_${X%%-*}? ( ${FTP_URI}/${MY_PV}/linux-i686/xpi/${X}.xpi -> ${P/-bin/}-${X}.xpi )"
 		IUSE="${IUSE} linguas_${X%%-*}"
 	fi
 done