Use a stub script instead of symlink to mozilla-launcher. This in

combination with mozilla-launcher-1.28 should fix #78890
Package-Manager: portage-2.0.51.19

4 files changed, 112 insertions, 12 deletions

diff --git a/www-client/mozilla-firefox-bin/ChangeLog b/www-client/mozilla-firefox-bin/ChangeLog
index d40ce3111c44..74c4e77dfa1b 100644
--- a/www-client/mozilla-firefox-bin/ChangeLog
+++ b/www-client/mozilla-firefox-bin/ChangeLog
@@ -1,9 +1,13 @@
 # ChangeLog for www-client/mozilla-firefox-bin
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox-bin/ChangeLog,v 1.2 2005/03/18 16:44:55 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox-bin/ChangeLog,v 1.3 2005/03/23 17:31:47 agriffis Exp $
 
-*mozilla-firefox-bin-1.0.1 (18 Mar 2005)
-*mozilla-firefox-bin-1.0 (18 Mar 2005)
+*mozilla-firefox-bin-1.0.1-r1 (23 Mar 2005)
+
+  23 Mar 2005; Aron Griffis <agriffis@gentoo.org>
+  +mozilla-firefox-bin-1.0.1-r1.ebuild:
+  Use a stub script instead of symlink to mozilla-launcher. This in
+  combination with mozilla-launcher-1.28 should fix #78890
 
   18 Mar 2005; Seemant Kulleen <seemant@gentoo.org>
   +files/firebird-0.7-antialiasing-patch,
diff --git a/www-client/mozilla-firefox-bin/Manifest b/www-client/mozilla-firefox-bin/Manifest
index f40135533929..5d57d13a22e2 100644
--- a/www-client/mozilla-firefox-bin/Manifest
+++ b/www-client/mozilla-firefox-bin/Manifest
@@ -1,13 +1,15 @@
-MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
 MD5 a8f1cac5cec60189a3a548710b5232c1 mozilla-firefox-bin-1.0.1.ebuild 2286
+MD5 b3b4e5e7dc25aea0008430f4302999f5 mozilla-firefox-bin-1.0.1-r1.ebuild 2583
 MD5 1d4fe4036d17c8f53e35e790dbedad1c mozilla-firefox-bin-1.0.ebuild 2282
-MD5 3763e4e51c3dedb6301c380a9e1f0cd1 ChangeLog 6124
-MD5 41a88799cdfbdd1af85c3eb69080789a files/digest-mozilla-firefox-bin-1.0 64
-MD5 ee1f4beb2413078320bf1059f8f03ea8 files/digest-mozilla-firefox-bin-1.0.1 66
-MD5 48924e6ea5eeccdde41276f2231a8630 files/firebird-0.7-antialiasing-patch 1253
-MD5 90a279dd78a82b9bc5c3359f883a6ed3 files/firefox 575
+MD5 a4a822e0fd0f0b819afe6f7aca83095d ChangeLog 6307
+MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
 MD5 7b6378c14fc0f9bd858c2ac9abbca109 files/firefox-bin-0.9-init.tar.bz2 3327
-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 90a279dd78a82b9bc5c3359f883a6ed3 files/firefox 575
+MD5 48924e6ea5eeccdde41276f2231a8630 files/firebird-0.7-antialiasing-patch 1253
+MD5 ee1f4beb2413078320bf1059f8f03ea8 files/digest-mozilla-firefox-bin-1.0.1-r1 66
+MD5 ee1f4beb2413078320bf1059f8f03ea8 files/digest-mozilla-firefox-bin-1.0.1 66
+MD5 41a88799cdfbdd1af85c3eb69080789a files/digest-mozilla-firefox-bin-1.0 64
 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 bff260036c5dcca45da3218517fb33d8 files/icon/firefox-icon.png 3979
diff --git a/www-client/mozilla-firefox-bin/files/digest-mozilla-firefox-bin-1.0.1-r1 b/www-client/mozilla-firefox-bin/files/digest-mozilla-firefox-bin-1.0.1-r1
new file mode 100644
index 000000000000..59720900dc4d
--- /dev/null
+++ b/www-client/mozilla-firefox-bin/files/digest-mozilla-firefox-bin-1.0.1-r1
@@ -0,0 +1 @@
+MD5 f1781acbba45db0f4074478c4800289e firefox-1.0.1.tar.gz 8232400
diff --git a/www-client/mozilla-firefox-bin/mozilla-firefox-bin-1.0.1-r1.ebuild b/www-client/mozilla-firefox-bin/mozilla-firefox-bin-1.0.1-r1.ebuild
new file mode 100644
index 000000000000..5654e32c2151
--- /dev/null
+++ b/www-client/mozilla-firefox-bin/mozilla-firefox-bin-1.0.1-r1.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox-bin/mozilla-firefox-bin-1.0.1-r1.ebuild,v 1.1 2005/03/23 17:31:47 agriffis Exp $
+
+inherit nsplugins eutils mozilla-launcher
+
+IUSE="gnome"
+
+DESCRIPTION="The Mozilla Firefox Web Browser"
+SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/linux-i686/en-US/firefox-${PV}.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
+	)
+	>=net-www/mozilla-launcher-1.28"
+
+S=${WORKDIR}/firefox
+
+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
+	cat <<EOF >${D}/usr/bin/firefox-bin
+#!/bin/sh
+# 
+# Stub script to run mozilla-launcher.  We used to use a symlink here but
+# OOo brokenness makes it necessary to use a stub instead:
+# http://bugs.gentoo.org/show_bug.cgi?id=78890
+
+export MOZILLA_LAUNCHER=firefox-bin
+exec /usr/libexec/mozilla-launcher "\$@"
+EOF
+	chmod 0755 ${D}/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
+}