Check both possible URLs for mozilla-firefox-0.9 since mozilla.org seems to be

doing some rearranging

4 files changed, 24 insertions, 15 deletions

diff --git a/net-www/mozilla-firefox-bin/ChangeLog b/net-www/mozilla-firefox-bin/ChangeLog
index 57bc6b3c47d9..6f91add53d20 100644
--- a/net-www/mozilla-firefox-bin/ChangeLog
+++ b/net-www/mozilla-firefox-bin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-www/mozilla-firefox-bin
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla-firefox-bin/ChangeLog,v 1.11 2004/06/16 21:27:08 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla-firefox-bin/ChangeLog,v 1.12 2004/06/16 22:32:11 agriffis Exp $
+
+  16 Jun 2004; Aron Griffis <agriffis@gentoo.org>
+  mozilla-firefox-bin-0.9-r1.ebuild:
+  Check both possible URLs for mozilla-firefox-0.9 since mozilla.org seems to be
+  doing some rearranging
 
   16 Jun 2004; Aron Griffis <agriffis@gentoo.org>
   -mozilla-firefox-bin-0.9.ebuild:
diff --git a/net-www/mozilla-firefox-bin/mozilla-firefox-bin-0.9-r1.ebuild b/net-www/mozilla-firefox-bin/mozilla-firefox-bin-0.9-r1.ebuild
index dc0f7b389932..2fcfbe100ec9 100644
--- a/net-www/mozilla-firefox-bin/mozilla-firefox-bin-0.9-r1.ebuild
+++ b/net-www/mozilla-firefox-bin/mozilla-firefox-bin-0.9-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla-firefox-bin/mozilla-firefox-bin-0.9-r1.ebuild,v 1.1 2004/06/16 18:03:02 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla-firefox-bin/mozilla-firefox-bin-0.9-r1.ebuild,v 1.2 2004/06/16 22:32:11 agriffis Exp $
 
 inherit nsplugins eutils mozilla-launcher
 
@@ -9,7 +9,11 @@ IUSE="gnome"
 MY_PN=${PN/-bin/}
 S=${WORKDIR}/firefox
 DESCRIPTION="The Mozilla Firefox Web Browser"
-SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/firefox-${PV}-i686-linux-gtk2+xft.tar.gz"
+# Mirrors have it in one of the following places, depending on what
+# mirror you check and when you check it... :-(
+SRC_URI="
+	http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/firefox-${PV}-i686-linux-gtk2+xft.tar.gz
+	http://ftp.mozilla.org/pub/firefox/releases/${PV}/firefox-${PV}-i686-linux-gtk2+xft.tar.gz"
 HOMEPAGE="http://www.mozilla.org/projects/firefox"
 RESTRICT="nostrip"
 
diff --git a/net-www/mozilla-firefox/ChangeLog b/net-www/mozilla-firefox/ChangeLog
index 732405ab6a6c..4f30ff019283 100644
--- a/net-www/mozilla-firefox/ChangeLog
+++ b/net-www/mozilla-firefox/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-www/mozilla-firefox
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla-firefox/ChangeLog,v 1.41 2004/06/16 21:26:38 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla-firefox/ChangeLog,v 1.42 2004/06/16 22:30:39 agriffis Exp $
+
+  16 Jun 2004; Aron Griffis <agriffis@gentoo.org>
+  mozilla-firefox-0.9-r1.ebuild:
+  Check both possible URLs for mozilla-firefox-0.9 since mozilla.org seems to be
+  doing some rearranging
 
   16 Jun 2004; Aron Griffis <agriffis@gentoo.org> -mozilla-firefox-0.9.ebuild:
   Remove 0.9 version in favor of 0.9-r1 to reduce confusion
diff --git a/net-www/mozilla-firefox/mozilla-firefox-0.9-r1.ebuild b/net-www/mozilla-firefox/mozilla-firefox-0.9-r1.ebuild
index 75a93e32bfb8..69e648c47f4b 100644
--- a/net-www/mozilla-firefox/mozilla-firefox-0.9-r1.ebuild
+++ b/net-www/mozilla-firefox/mozilla-firefox-0.9-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla-firefox/mozilla-firefox-0.9-r1.ebuild,v 1.2 2004/06/16 19:15:18 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla-firefox/mozilla-firefox-0.9-r1.ebuild,v 1.3 2004/06/16 22:30:39 agriffis Exp $
 
 inherit makeedit flag-o-matic gcc nsplugins eutils mozilla-launcher
 
@@ -8,7 +8,11 @@ S=${WORKDIR}/mozilla
 
 DESCRIPTION="The Mozilla Firefox Web Browser"
 HOMEPAGE="http://www.mozilla.org/projects/firefox/"
-SRC_URI="http://ftp.mozilla.org/pub/firefox/releases/${PV}/firefox-${PV}-source.tar.bz2"
+# Mirrors have it in one of the following places, depending on what
+# mirror you check and when you check it... :-(
+SRC_URI="
+	http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/firefox-${PV}-source.tar.bz2
+	http://ftp.mozilla.org/pub/firefox/releases/${PV}/firefox-${PV}-source.tar.bz2"
 
 KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64 ~ia64"
 SLOT="0"
@@ -49,15 +53,6 @@ src_unpack() {
 	# <taviso@gentoo.org> (26 Jun 2003)
 	use alpha && epatch ${FILESDIR}/mozilla-1.3-alpha-stubs.patch
 	use amd64 && epatch ${FILESDIR}/mozilla-firebird-amd64.patch
-
-	# Backward/Forward mouse button support, from
-	# http://bugzilla.mozilla.org/show_bug.cgi?id=64485
-	# See bug 44646 (26 Apr 2004 agriffis)
-	#epatch ${FILESDIR}/mozilla-firefox-mousebuttons.patch
-
-	# Fix compilation with gcc-3.4, bug 47870
-	# (26 Apr 2004 agriffis)
-	#epatch ${FILESDIR}/firefox-0.8-gcc-3.4.patch
 }
 
 src_compile() {