Install /usr/bin/firefox-bin stub using install_mozilla_launcher_stub from

mozilla-launcher.eclass #99084
(Portage version: 2.0.51.20-r5)

6 files changed, 14 insertions, 114 deletions

diff --git a/www-client/mozilla-firefox-bin/ChangeLog b/www-client/mozilla-firefox-bin/ChangeLog
index d77dc4b7ec6b..0bb158949bb9 100644
--- a/www-client/mozilla-firefox-bin/ChangeLog
+++ b/www-client/mozilla-firefox-bin/ChangeLog
@@ -1,6 +1,14 @@
 # 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.16 2005/07/15 00:58:33 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox-bin/ChangeLog,v 1.17 2005/07/18 14:59:13 agriffis Exp $
+
+*mozilla-firefox-bin-1.0.5-r1 (18 Jul 2005)
+
+  18 Jul 2005; Aron Griffis <agriffis@gentoo.org>
+  -mozilla-firefox-bin-1.0.4.ebuild, -mozilla-firefox-bin-1.0.5.ebuild,
+  +mozilla-firefox-bin-1.0.5-r1.ebuild:
+  Install /usr/bin/firefox-bin stub using install_mozilla_launcher_stub from
+  mozilla-launcher.eclass #99084
 
   14 Jul 2005; Aron Griffis <agriffis@gentoo.org>
   mozilla-firefox-bin-1.0.5.ebuild:
diff --git a/www-client/mozilla-firefox-bin/Manifest b/www-client/mozilla-firefox-bin/Manifest
index 19c6737bbd4b..250ed2338c6d 100644
--- a/www-client/mozilla-firefox-bin/Manifest
+++ b/www-client/mozilla-firefox-bin/Manifest
@@ -1,8 +1,10 @@
 MD5 3324456de38fb09efa41080297ef342c mozilla-firefox-bin-1.0.4.ebuild 2744
+MD5 e514d3cf1e8f270a58be66b38ec12e7d mozilla-firefox-bin-1.0.5-r1.ebuild 2417
 MD5 70dc7b4efee7c5e4ac49e36f16eac000 mozilla-firefox-bin-1.0.5.ebuild 2746
 MD5 0417718fdaea67b32d252c09c73c2b50 ChangeLog 8234
 MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
 MD5 7b6378c14fc0f9bd858c2ac9abbca109 files/firefox-bin-0.9-init.tar.bz2 3327
+MD5 4b866b7683105489860f6352e8651be0 files/digest-mozilla-firefox-bin-1.0.5-r1 66
 MD5 0f6ec7910d51929d526e7e7c49b31922 files/digest-mozilla-firefox-bin-1.0.4 66
 MD5 4b866b7683105489860f6352e8651be0 files/digest-mozilla-firefox-bin-1.0.5 66
 MD5 dc62e3f15845b0343d1513abada402d7 files/icon/mozillafirefox-bin.desktop 203
diff --git a/www-client/mozilla-firefox-bin/files/digest-mozilla-firefox-bin-1.0.4 b/www-client/mozilla-firefox-bin/files/digest-mozilla-firefox-bin-1.0.4
deleted file mode 100644
index e2748cdb62f1..000000000000
--- a/www-client/mozilla-firefox-bin/files/digest-mozilla-firefox-bin-1.0.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 bef8cb1f36f594b5ac86e304dd8f9e3e firefox-1.0.4.tar.gz 8220553
diff --git a/www-client/mozilla-firefox-bin/files/digest-mozilla-firefox-bin-1.0.5 b/www-client/mozilla-firefox-bin/files/digest-mozilla-firefox-bin-1.0.5-r1
index 26dab2981508..26dab2981508 100644
--- a/www-client/mozilla-firefox-bin/files/digest-mozilla-firefox-bin-1.0.5
+++ b/www-client/mozilla-firefox-bin/files/digest-mozilla-firefox-bin-1.0.5-r1
diff --git a/www-client/mozilla-firefox-bin/mozilla-firefox-bin-1.0.4.ebuild b/www-client/mozilla-firefox-bin/mozilla-firefox-bin-1.0.4.ebuild
deleted file mode 100644
index 32427f317c6f..000000000000
--- a/www-client/mozilla-firefox-bin/mozilla-firefox-bin-1.0.4.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# 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.4.ebuild,v 1.3 2005/05/14 17:41:33 tester 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
-	)
-	>=www-client/mozilla-launcher-1.28"
-
-S=${WORKDIR}/firefox
-
-# This is a binary x86 package => ABI=x86
-# Please keep this in future versions
-# Danny van Dyk <kugelfang@gentoo.org> 2005/03/26
-has_multilib_profile && ABI="x86"
-
-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
-}
diff --git a/www-client/mozilla-firefox-bin/mozilla-firefox-bin-1.0.5.ebuild b/www-client/mozilla-firefox-bin/mozilla-firefox-bin-1.0.5-r1.ebuild
index 7702971b2452..07af0f453ef9 100644
--- a/www-client/mozilla-firefox-bin/mozilla-firefox-bin-1.0.5.ebuild
+++ b/www-client/mozilla-firefox-bin/mozilla-firefox-bin-1.0.5-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.5.ebuild,v 1.3 2005/07/14 21:58:25 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox-bin/mozilla-firefox-bin-1.0.5-r1.ebuild,v 1.1 2005/07/18 14:59:13 agriffis Exp $
 
 inherit nsplugins eutils mozilla-launcher
 
@@ -45,19 +45,8 @@ src_install() {
 	# 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
+	# Create /usr/bin/firefox
+	install_mozilla_launcher_stub firefox-bin /opt/firefox
 
 	# Install icon and .desktop for menu entry
 	if use gnome; then