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

combination with mozilla-launcher-1.28 should fix #78890
(Portage version: 2.0.51.19)

4 files changed, 103 insertions, 6 deletions

diff --git a/www-client/mozilla-bin/ChangeLog b/www-client/mozilla-bin/ChangeLog
index e653f59e855d..db2408df641b 100644
--- a/www-client/mozilla-bin/ChangeLog
+++ b/www-client/mozilla-bin/ChangeLog
@@ -1,16 +1,19 @@
 # ChangeLog for www-client/mozilla-bin
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-bin/ChangeLog,v 1.3 2005/03/23 14:29:40 brad Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-bin/ChangeLog,v 1.4 2005/03/23 17:19:45 agriffis Exp $
+
+*mozilla-bin-1.7.6-r1 (23 Mar 2005)
+
+  23 Mar 2005; Aron Griffis <agriffis@gentoo.org>
+  +mozilla-bin-1.7.6-r1.ebuild:
+  Use a stub script instead of symlink to mozilla-launcher. This in
+  combination with mozilla-launcher-1.28 should fix #78890
 
 *mozilla-bin-1.7.6 (23 Mar 2005)
 
   23 Mar 2005; Brad Laue <brad@gentoo.org> +mozilla-bin-1.7.6.ebuild:
   Bump to 1.7.6. See bug #84074 for details.
 
-*mozilla-bin-1.7.5 (18 Mar 2005)
-*mozilla-bin-1.7.3 (18 Mar 2005)
-*mozilla-bin-1.7.2 (18 Mar 2005)
-
   18 Mar 2005; Seemant Kulleen <seemant@gentoo.org>
   +files/mozilla-bin.desktop, +files/mozilla-bin-icon.png, +metadata.xml,
   +mozilla-bin-1.7.2.ebuild, +mozilla-bin-1.7.3.ebuild,
diff --git a/www-client/mozilla-bin/Manifest b/www-client/mozilla-bin/Manifest
index 451513cad4dd..645d2082ab6a 100644
--- a/www-client/mozilla-bin/Manifest
+++ b/www-client/mozilla-bin/Manifest
@@ -1,7 +1,8 @@
 MD5 753356fd804924501d60f4b04bcd6516 mozilla-bin-1.7.6.ebuild 2102
+MD5 b8e5d97c3643b5000959d1d46e824e55 mozilla-bin-1.7.6-r1.ebuild 2393
 MD5 8ed5d96cf00eb77e8c68d5d9f8f1cc73 mozilla-bin-1.7.3.ebuild 2105
 MD5 3a6afde5abc87a109d7fdd286a402d32 mozilla-bin-1.7.5.ebuild 2105
-MD5 60b1bc016f3199dcde70b2a97f38fd14 ChangeLog 1743
+MD5 4c3e692495c0c0382d28b24581e5c48f ChangeLog 1643
 MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
 MD5 96a49681b78237f9ad644f68532305ae mozilla-bin-1.7.2.ebuild 2109
 MD5 20d752803fe0a78a4167a6100d4209cb files/digest-mozilla-bin-1.7.2 85
@@ -10,3 +11,4 @@ MD5 018ecd12fcb5cd65246173770adb9638 files/digest-mozilla-bin-1.7.5 85
 MD5 ae88c11f0026aa7f8462f1f5da667795 files/digest-mozilla-bin-1.7.6 85
 MD5 6d52ff4ce4567db1cad08ea40157a65d files/mozilla-bin-icon.png 2350
 MD5 4eac4e98b875ba3b652d6626756f5517 files/mozilla-bin.desktop 184
+MD5 ae88c11f0026aa7f8462f1f5da667795 files/digest-mozilla-bin-1.7.6-r1 85
diff --git a/www-client/mozilla-bin/files/digest-mozilla-bin-1.7.6-r1 b/www-client/mozilla-bin/files/digest-mozilla-bin-1.7.6-r1
new file mode 100644
index 000000000000..06e4f32f76b6
--- /dev/null
+++ b/www-client/mozilla-bin/files/digest-mozilla-bin-1.7.6-r1
@@ -0,0 +1 @@
+MD5 99adbd71ece39242f4563bd6297e4372 mozilla-i686-pc-linux-gnu-1.7.6.tar.gz 13889017
diff --git a/www-client/mozilla-bin/mozilla-bin-1.7.6-r1.ebuild b/www-client/mozilla-bin/mozilla-bin-1.7.6-r1.ebuild
new file mode 100644
index 000000000000..eb59bc88e689
--- /dev/null
+++ b/www-client/mozilla-bin/mozilla-bin-1.7.6-r1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-bin/mozilla-bin-1.7.6-r1.ebuild,v 1.1 2005/03/23 17:19:45 agriffis Exp $
+
+inherit nsplugins eutils mozilla-launcher
+
+IUSE=""
+
+# handle _rc versions
+MY_PV=${PV/_alpha/a} 	# handle alpha
+MY_PV=${MY_PV/_beta/b}	# handle beta
+MY_PV=${MY_PV/_rc/rc}	# handle rc
+
+MY_PN=${PN/-bin/}
+S=${WORKDIR}/mozilla
+DESCRIPTION="Mozilla Application Suite - web browser, email, HTML editor, IRC"
+HOMEPAGE="http://www.mozilla.org"
+# 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/mozilla/releases/mozilla${PV}/mozilla-i686-pc-linux-gnu-${PV}.tar.gz"
+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+-1.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.28"
+
+src_install() {
+	# Install mozilla in /opt
+	dodir /opt
+	mv ${S} ${D}/opt/mozilla
+
+	# Plugin path setup (rescuing the existing plugins)
+	src_mv_plugins /opt/mozilla/plugins
+
+	# Fixing permissions
+	chown -R root:root ${D}/opt/mozilla
+
+	# mozilla-launcher-1.8 supports -bin versions
+	dodir /usr/bin
+	cat <<EOF >${D}/usr/bin/mozilla-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=mozilla-bin
+exec /usr/libexec/mozilla-launcher "\$@"
+EOF
+	chmod 0755 ${D}/usr/bin/mozilla-bin
+
+	# Install icon and .desktop for menu entry
+	insinto /usr/share/pixmaps
+	doins ${FILESDIR}/mozilla-bin-icon.png
+	insinto /usr/share/applications
+	doins ${FILESDIR}/mozilla-bin.desktop
+}
+
+pkg_preinst() {
+	export MOZILLA_FIVE_HOME=${ROOT}/opt/mozilla
+
+	# Remove the old plugins dir
+	pkg_mv_plugins ${MOZILLA_FIVE_HOME}/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/mozilla
+
+	update_mozilla_launcher_symlinks
+}
+
+pkg_postrm() {
+	update_mozilla_launcher_symlinks
+}