Update to use mozilla-launcher. Allow both firefox and firefox-bin to be installed simultaneously for testing purposes.

6 files changed, 99 insertions, 6 deletions

diff --git a/net-www/mozilla-firefox-bin/ChangeLog b/net-www/mozilla-firefox-bin/ChangeLog
index 35849384c880..034e710e4893 100644
--- a/net-www/mozilla-firefox-bin/ChangeLog
+++ b/net-www/mozilla-firefox-bin/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-www/mozilla-firefox-bin
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla-firefox-bin/ChangeLog,v 1.5 2004/04/26 12:25:04 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla-firefox-bin/ChangeLog,v 1.6 2004/05/28 02:37:38 agriffis Exp $
+
+*mozilla-firefox-bin-0.8-r1 (27 May 2004)
+
+  27 May 2004; Aron Griffis <agriffis@gentoo.org>
+  +files/icon/mozillafirefox-bin-icon.png,
+  +files/icon/mozillafirefox-bin.desktop, +mozilla-firefox-bin-0.8-r1.ebuild:
+  Update to use mozilla-launcher.  Allow both firefox and firefox-bin
+  to be installed simultaneously for testing purposes.
 
   26 Apr 2004; Aron Griffis <agriffis@gentoo.org>
   mozilla-firefox-bin-0.8.ebuild:
diff --git a/net-www/mozilla-firefox-bin/Manifest b/net-www/mozilla-firefox-bin/Manifest
index ae92c8884733..47c8fc353409 100644
--- a/net-www/mozilla-firefox-bin/Manifest
+++ b/net-www/mozilla-firefox-bin/Manifest
@@ -1,8 +1,12 @@
-MD5 51bd6178b16a053f99b48356597bee38 ChangeLog 1159
-MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
+MD5 5387c18e8695bd98ea6fdcfcdaabbe43 mozilla-firefox-bin-0.8-r1.ebuild 1858
 MD5 d43882e0207c0612c02ea2a63f29a58c mozilla-firefox-bin-0.8.ebuild 1771
-MD5 cfa48a263b4274cfb989f3140d843ede files/digest-mozilla-firefox-bin-0.8 84
-MD5 48924e6ea5eeccdde41276f2231a8630 files/firebird-0.7-antialiasing-patch 1253
+MD5 07eb24652834994f99f8c61f30949706 ChangeLog 1499
+MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
 MD5 f44a87c587e1fef5c80da4f7ad796bb6 files/firefox 580
-MD5 bff260036c5dcca45da3218517fb33d8 files/icon/firefox-icon.png 3979
+MD5 48924e6ea5eeccdde41276f2231a8630 files/firebird-0.7-antialiasing-patch 1253
+MD5 cfa48a263b4274cfb989f3140d843ede files/digest-mozilla-firefox-bin-0.8-r1 84
+MD5 cfa48a263b4274cfb989f3140d843ede files/digest-mozilla-firefox-bin-0.8 84
 MD5 1336c4a7b24e96ae255fdf2330fac6fc files/icon/mozillafirefox.desktop 129
+MD5 27cc47b838edda1eea220f75a0c23359 files/icon/mozillafirefox-bin.desktop 150
+MD5 bff260036c5dcca45da3218517fb33d8 files/icon/mozillafirefox-bin-icon.png 3979
+MD5 bff260036c5dcca45da3218517fb33d8 files/icon/firefox-icon.png 3979
diff --git a/net-www/mozilla-firefox-bin/files/digest-mozilla-firefox-bin-0.8-r1 b/net-www/mozilla-firefox-bin/files/digest-mozilla-firefox-bin-0.8-r1
new file mode 100644
index 000000000000..c39b570db3ac
--- /dev/null
+++ b/net-www/mozilla-firefox-bin/files/digest-mozilla-firefox-bin-0.8-r1
@@ -0,0 +1 @@
+MD5 0492ff379e12f406430557b3564ff443 firefox-0.8-i686-linux-gtk2+xft.tar.gz 7673647
diff --git a/net-www/mozilla-firefox-bin/files/icon/mozillafirefox-bin-icon.png b/net-www/mozilla-firefox-bin/files/icon/mozillafirefox-bin-icon.png
new file mode 100644
index 000000000000..b7ff7197cad1
--- /dev/null
+++ b/net-www/mozilla-firefox-bin/files/icon/mozillafirefox-bin-icon.png
diff --git a/net-www/mozilla-firefox-bin/files/icon/mozillafirefox-bin.desktop b/net-www/mozilla-firefox-bin/files/icon/mozillafirefox-bin.desktop
new file mode 100644
index 000000000000..ccbd12f58fbf
--- /dev/null
+++ b/net-www/mozilla-firefox-bin/files/icon/mozillafirefox-bin.desktop
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Name=Mozilla Firefox (bin)
+Comment=Web Browser
+Exec=/usr/bin/firefox-bin
+Icon=mozillafirefox-bin-icon.png
+Terminal=0
+Type=Application
diff --git a/net-www/mozilla-firefox-bin/mozilla-firefox-bin-0.8-r1.ebuild b/net-www/mozilla-firefox-bin/mozilla-firefox-bin-0.8-r1.ebuild
new file mode 100644
index 000000000000..915f0f499f77
--- /dev/null
+++ b/net-www/mozilla-firefox-bin/mozilla-firefox-bin-0.8-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla-firefox-bin/mozilla-firefox-bin-0.8-r1.ebuild,v 1.1 2004/05/28 02:37:38 agriffis Exp $
+
+inherit nsplugins eutils mozilla-launcher
+
+IUSE="gnome"
+
+MY_PN=${PN/-bin/}
+S=${WORKDIR}/firefox
+DESCRIPTION="The Mozilla Firefox Web Browser"
+SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/firefox-${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/glibc"
+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.9"
+
+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
+
+	# Truetype fonts
+	cd ${D}/opt/firefox/defaults/pref
+	einfo "Enabling truetype fonts. Filesdir is ${FILESDIR}"
+	epatch ${FILESDIR}/firebird-0.7-antialiasing-patch
+
+	# 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
+		insinto /usr/share/gnome/apps/Internet
+		doins ${FILESDIR}/icon/mozillafirefox-bin.desktop
+	fi
+}
+
+pkg_preinst() {
+	# Remove the old plugins dir
+	pkg_mv_plugins /opt/firefox/plugins
+}
+
+pkg_postinst() {
+	update_mozilla_launcher_symlinks
+}
+
+pkg_postun() {
+	update_mozilla_launcher_symlinks
+}