Bump to 1.0, update mozilla-launcher dep to >=1.22. Trim older ebuild

5 files changed, 26 insertions, 25 deletions

diff --git a/net-www/mozilla-firefox-bin/ChangeLog b/net-www/mozilla-firefox-bin/ChangeLog
index 7e79d4e606a9..21ce6bc3c0d8 100644
--- a/net-www/mozilla-firefox-bin/ChangeLog
+++ b/net-www/mozilla-firefox-bin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-www/mozilla-firefox-bin
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla-firefox-bin/ChangeLog,v 1.25 2004/10/07 13:13:40 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla-firefox-bin/ChangeLog,v 1.26 2004/11/15 01:16:48 agriffis Exp $
+
+*mozilla-firefox-bin-1.0 (14 Nov 2004)
+
+  14 Nov 2004; Aron Griffis <agriffis@gentoo.org>
+  +mozilla-firefox-bin-1.0.ebuild, -mozilla-firefox-bin-1.0_pre.ebuild:
+  Bump to 1.0, update mozilla-launcher dep to >=1.22.  Trim older ebuild
 
   07 Oct 2004; Simon Stelling <blubb@gentoo.org>
   mozilla-firefox-bin-1.0_pre-r1.ebuild:
diff --git a/net-www/mozilla-firefox-bin/Manifest b/net-www/mozilla-firefox-bin/Manifest
index 72a5371ceb74..42c0df0066c3 100644
--- a/net-www/mozilla-firefox-bin/Manifest
+++ b/net-www/mozilla-firefox-bin/Manifest
@@ -1,17 +1,17 @@
-MD5 ed0c5f499e98bd8cda96fc20ca4b869c mozilla-firefox-bin-1.0_pre.ebuild 2547
-MD5 2690e2b0a5d548875fdf123a81511fae mozilla-firefox-bin-1.0_pre-r1.ebuild 2414
-MD5 5bf449b3d908b1da4a4f513549bfec5f mozilla-firefox-bin-0.9.3.ebuild 2525
-MD5 3fdc3cb3aedac2456b003364410105eb mozilla-firefox-bin-1.0_rc1.ebuild 2433
-MD5 e0f21a45cebdefdbf9bd885d2a453c0e ChangeLog 4590
+MD5 a50541a2da376bca94d4b73f80e0dd58 ChangeLog 4829
 MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
-MD5 7b6378c14fc0f9bd858c2ac9abbca109 files/firefox-bin-0.9-init.tar.bz2 3327
-MD5 5327e9cd9d6e7d2fc1de431c1a969636 files/firefox 573
-MD5 daaa9b3ade69ebafff522b92b7dbad05 files/digest-mozilla-firefox-bin-1.0_pre 86
+MD5 3fdc3cb3aedac2456b003364410105eb mozilla-firefox-bin-1.0_rc1.ebuild 2433
+MD5 b85865532317ec858b5259572b594b48 mozilla-firefox-bin-1.0.ebuild 2295
+MD5 5bf449b3d908b1da4a4f513549bfec5f mozilla-firefox-bin-0.9.3.ebuild 2525
+MD5 2690e2b0a5d548875fdf123a81511fae mozilla-firefox-bin-1.0_pre-r1.ebuild 2414
 MD5 ffc946278accac924ff84ec65deb7ef7 files/digest-mozilla-firefox-bin-1.0_rc1 84
 MD5 48924e6ea5eeccdde41276f2231a8630 files/firebird-0.7-antialiasing-patch 1253
-MD5 67de8188ceecf23eaf471c3adeb770bb files/digest-mozilla-firefox-bin-1.0_pre-r1 88
+MD5 5327e9cd9d6e7d2fc1de431c1a969636 files/firefox 573
+MD5 41a88799cdfbdd1af85c3eb69080789a files/digest-mozilla-firefox-bin-1.0 64
+MD5 7b6378c14fc0f9bd858c2ac9abbca109 files/firefox-bin-0.9-init.tar.bz2 3327
 MD5 4682d7ab300858b026579a39eb1c4b4e files/digest-mozilla-firefox-bin-0.9.3 86
-MD5 1336c4a7b24e96ae255fdf2330fac6fc files/icon/mozillafirefox.desktop 129
-MD5 dc62e3f15845b0343d1513abada402d7 files/icon/mozillafirefox-bin.desktop 203
-MD5 bff260036c5dcca45da3218517fb33d8 files/icon/mozillafirefox-bin-icon.png 3979
+MD5 67de8188ceecf23eaf471c3adeb770bb files/digest-mozilla-firefox-bin-1.0_pre-r1 88
 MD5 bff260036c5dcca45da3218517fb33d8 files/icon/firefox-icon.png 3979
+MD5 bff260036c5dcca45da3218517fb33d8 files/icon/mozillafirefox-bin-icon.png 3979
+MD5 dc62e3f15845b0343d1513abada402d7 files/icon/mozillafirefox-bin.desktop 203
+MD5 1336c4a7b24e96ae255fdf2330fac6fc files/icon/mozillafirefox.desktop 129
diff --git a/net-www/mozilla-firefox-bin/files/digest-mozilla-firefox-bin-1.0 b/net-www/mozilla-firefox-bin/files/digest-mozilla-firefox-bin-1.0
new file mode 100644
index 000000000000..f177956cb67f
--- /dev/null
+++ b/net-www/mozilla-firefox-bin/files/digest-mozilla-firefox-bin-1.0
@@ -0,0 +1 @@
+MD5 961fc684c55cb95d23bc465d5346de32 firefox-1.0.tar.gz 8223869
diff --git a/net-www/mozilla-firefox-bin/files/digest-mozilla-firefox-bin-1.0_pre b/net-www/mozilla-firefox-bin/files/digest-mozilla-firefox-bin-1.0_pre
deleted file mode 100644
index 129e64f27123..000000000000
--- a/net-www/mozilla-firefox-bin/files/digest-mozilla-firefox-bin-1.0_pre
+++ /dev/null
@@ -1 +0,0 @@
-MD5 dd0ccca00eea3f372a07ac844705ba48 firefox-1.0PR-i686-linux-gtk2+xft.tar.gz 8144842
diff --git a/net-www/mozilla-firefox-bin/mozilla-firefox-bin-1.0_pre.ebuild b/net-www/mozilla-firefox-bin/mozilla-firefox-bin-1.0.ebuild
index 261c47a3022e..8059b60ba4ac 100644
--- a/net-www/mozilla-firefox-bin/mozilla-firefox-bin-1.0_pre.ebuild
+++ b/net-www/mozilla-firefox-bin/mozilla-firefox-bin-1.0.ebuild
@@ -1,24 +1,17 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla-firefox-bin/mozilla-firefox-bin-1.0_pre.ebuild,v 1.3 2004/09/17 08:12:40 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla-firefox-bin/mozilla-firefox-bin-1.0.ebuild,v 1.1 2004/11/15 01:16:48 agriffis Exp $
 
 inherit nsplugins eutils mozilla-launcher
 
 IUSE="gnome"
 
-MY_PN=${PN/-bin/}
-MY_PV=${PV/_pre/PR}
-S=${WORKDIR}/firefox
 DESCRIPTION="The Mozilla Firefox Web Browser"
-# 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/0.10/firefox-${MY_PV}-i686-linux-gtk2+xft.tar.gz
-	http://ftp.mozilla.org/pub/firefox/releases/0.10/firefox-${MY_PV}-i686-linux-gtk2+xft.tar.gz"
+SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/1.0/linux-i686/en-US/firefox-${PV}.tar.gz"
 HOMEPAGE="http://www.mozilla.org/projects/firefox"
 RESTRICT="nostrip"
 
-KEYWORDS="-* x86 amd64"
+KEYWORDS="-* ~x86 ~amd64"
 SLOT="0"
 LICENSE="MPL-1.1 NPL-1.1"
 
@@ -33,7 +26,9 @@ RDEPEND="virtual/x11
 		>=app-emulation/emul-linux-x86-gtklibs-1.0
 	)
 	virtual/x11
-	>=net-www/mozilla-launcher-1.13"
+	>=net-www/mozilla-launcher-1.22"
+
+S=${WORKDIR}/firefox
 
 src_install() {
 	# Install firefox in /opt