Version bump, security update

4 files changed, 98 insertions, 2 deletions

diff --git a/net-www/mozilla-firefox-bin/ChangeLog b/net-www/mozilla-firefox-bin/ChangeLog
index 62874908e6d0..bbc054099c69 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.23 2004/09/17 08:12:40 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla-firefox-bin/ChangeLog,v 1.24 2004/10/02 05:22:37 brad Exp $
+
+*mozilla-firefox-bin-1.0_pre-r1 (02 Oct 2004)
+
+  02 Oct 2004; Brad Laue <brad@gentoo.org>
+  +mozilla-firefox-bin-1.0_pre-r1.ebuild:
+  Version bump. Forcing into stable on x86, as this is a security update.
 
   17 Sep 2004; Travis Tilley <lv@gentoo.org>
   mozilla-firefox-bin-1.0_pre.ebuild:
diff --git a/net-www/mozilla-firefox-bin/Manifest b/net-www/mozilla-firefox-bin/Manifest
index ea83d882ebac..c217f2ebe8f5 100644
--- a/net-www/mozilla-firefox-bin/Manifest
+++ b/net-www/mozilla-firefox-bin/Manifest
@@ -1,15 +1,17 @@
 MD5 ed0c5f499e98bd8cda96fc20ca4b869c mozilla-firefox-bin-1.0_pre.ebuild 2547
 MD5 1a2518acd130f0668ae70d6c9f7177ae mozilla-firefox-bin-0.8-r1.ebuild 1849
+MD5 ac391485ba71e447bbd1982b6fc2d40a mozilla-firefox-bin-1.0_pre-r1.ebuild 2414
 MD5 5b6290a445c1c4eb4a51e3b09ee7ee0d mozilla-firefox-bin-0.8.ebuild 1762
 MD5 acda7c5615bf85ec7b673ef954003c4e mozilla-firefox-bin-0.9.1.ebuild 2525
 MD5 5bf449b3d908b1da4a4f513549bfec5f mozilla-firefox-bin-0.9.3.ebuild 2525
-MD5 86dbe2742f63bb920fd164396d9bb40b ChangeLog 4271
+MD5 7c7eb21acd2514053a110be1b9ed91d3 ChangeLog 4480
 MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
 MD5 5008fba39a07c9d867ecf0edd5f4deed mozilla-firefox-bin-0.9-r1.ebuild 2534
 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 48924e6ea5eeccdde41276f2231a8630 files/firebird-0.7-antialiasing-patch 1253
+MD5 67de8188ceecf23eaf471c3adeb770bb files/digest-mozilla-firefox-bin-1.0_pre-r1 88
 MD5 88b802a6af934b23e5a4511ecac88d68 files/digest-mozilla-firefox-bin-0.9.1 86
 MD5 4682d7ab300858b026579a39eb1c4b4e files/digest-mozilla-firefox-bin-0.9.3 86
 MD5 cfa48a263b4274cfb989f3140d843ede files/digest-mozilla-firefox-bin-0.8-r1 84
diff --git a/net-www/mozilla-firefox-bin/files/digest-mozilla-firefox-bin-1.0_pre-r1 b/net-www/mozilla-firefox-bin/files/digest-mozilla-firefox-bin-1.0_pre-r1
new file mode 100644
index 000000000000..9486bd7ab3a1
--- /dev/null
+++ b/net-www/mozilla-firefox-bin/files/digest-mozilla-firefox-bin-1.0_pre-r1
@@ -0,0 +1 @@
+MD5 54f0df67b9fd0cfb7c93a860b8f561c3 firefox-1.0PR.1-i686-linux-gtk2+xft.tar.gz 8145364
diff --git a/net-www/mozilla-firefox-bin/mozilla-firefox-bin-1.0_pre-r1.ebuild b/net-www/mozilla-firefox-bin/mozilla-firefox-bin-1.0_pre-r1.ebuild
new file mode 100644
index 000000000000..a16b040978f5
--- /dev/null
+++ b/net-www/mozilla-firefox-bin/mozilla-firefox-bin-1.0_pre-r1.ebuild
@@ -0,0 +1,87 @@
+# 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-r1.ebuild,v 1.1 2004/10/02 05:22:37 brad Exp $
+
+inherit nsplugins eutils mozilla-launcher
+
+IUSE="gnome"
+
+MY_PN=${PN/-bin/}
+MY_PV=${PV/_pre/PR.1}
+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="mirror://gentoo/firefox-${MY_PV}-i686-linux-gtk2+xft.tar.gz"
+HOMEPAGE="http://www.mozilla.org/projects/firefox"
+RESTRICT="nostrip"
+
+KEYWORDS="-* x86 ~amd64"
+SLOT="0"
+LICENSE="MPL-1.1 NPL-1.1"
+
+DEPEND="virtual/libc"
+RDEPEND="virtual/x11
+	x86? (
+		>=sys-libs/lib-compat-1.0-r2
+		>=x11-libs/gtk+-2.2
+	)
+	amd64? (
+		>=app-emulation/emul-linux-x86-baselibs-1.0
+		>=app-emulation/emul-linux-x86-gtklibs-1.0
+	)
+	virtual/x11
+	>=net-www/mozilla-launcher-1.13"
+
+src_install() {
+	# Install firefox in /opt
+	dodir /opt
+	mv ${S} ${D}/opt/firefox
+
+	# Plugin path setup (rescuing the existing plugins)
+	src_mv_plugins /opt/firefox/plugins
+
+	# Fixing permissions
+	chown -R root:root ${D}/opt/firefox
+
+	# mozilla-launcher-1.8 supports -bin versions
+	dodir /usr/bin
+	dosym /usr/libexec/mozilla-launcher /usr/bin/firefox-bin
+
+	# Install icon and .desktop for menu entry
+	if use gnome; then
+		insinto /usr/share/pixmaps
+		doins ${FILESDIR}/icon/mozillafirefox-bin-icon.png
+		# Fix bug 54179: Install .desktop file into /usr/share/applications
+		# instead of /usr/share/gnome/apps/Internet (18 Jun 2004 agriffis)
+		insinto /usr/share/applications
+		doins ${FILESDIR}/icon/mozillafirefox-bin.desktop
+	fi
+
+	# Normally firefox-bin-0.9 must be run as root once before it can
+	# be run as a normal user.  Drop in some initialized files to
+	# avoid this.
+	einfo "Extracting firefox-bin-${PV} initialization files"
+	tar xjpf ${FILESDIR}/firefox-bin-0.9-init.tar.bz2 -C ${D}/opt/firefox
+}
+
+pkg_preinst() {
+	export MOZILLA_FIVE_HOME=${ROOT}/opt/firefox
+
+	# Remove the old plugins dir
+	pkg_mv_plugins /opt/firefox/plugins
+
+	# Remove entire installed instance to prevent all kinds of
+	# problems... see bug 44772 for example
+	rm -rf "${MOZILLA_FIVE_HOME}"
+}
+
+pkg_postinst() {
+	export MOZILLA_FIVE_HOME=${ROOT}/opt/firefox
+
+	update_mozilla_launcher_symlinks
+}
+
+pkg_postrm() {
+	update_mozilla_launcher_symlinks
+}