fixed manifest wrt bug#114448, modular X compatible

Package-Manager: portage-2.0.53

4 files changed, 91 insertions, 2 deletions

diff --git a/www-client/mozilla-firefox-bin/ChangeLog b/www-client/mozilla-firefox-bin/ChangeLog
index f112b4e7e2ac..a3b877e9d679 100644
--- a/www-client/mozilla-firefox-bin/ChangeLog
+++ b/www-client/mozilla-firefox-bin/ChangeLog
@@ -1,6 +1,12 @@
 # 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.28 2005/11/29 20:05:52 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox-bin/ChangeLog,v 1.29 2005/12/18 20:14:21 anarchy Exp $
+
+*mozilla-firefox-bin-1.5-r1 (18 Dec 2005)
+
+  18 Dec 2005; Jory A. Pratt <anarchy@gentoo.org>
+  +mozilla-firefox-bin-1.5-r1.ebuild:
+  fixed manifest wrt bug#114448, modular X compatible
 
 *mozilla-firefox-bin-1.5 (29 Nov 2005)
 
diff --git a/www-client/mozilla-firefox-bin/Manifest b/www-client/mozilla-firefox-bin/Manifest
index cd40c4a79cc9..d2f00c9b71e3 100644
--- a/www-client/mozilla-firefox-bin/Manifest
+++ b/www-client/mozilla-firefox-bin/Manifest
@@ -1,10 +1,12 @@
-MD5 c308a998ce592735376ad19bce6e9a12 ChangeLog 10926
+MD5 30ed3d4323300a377b4ab243371422d0 ChangeLog 11112
 MD5 a55b185b30df1647429525139fe29ec5 files/digest-mozilla-firefox-bin-1.0.6-r2 66
 MD5 82be77a0991a01a626a24995353b9c7d files/digest-mozilla-firefox-bin-1.0.7 66
 MD5 868b46dc9449e24d7522e403b339beae files/digest-mozilla-firefox-bin-1.5 64
+MD5 868b46dc9449e24d7522e403b339beae files/digest-mozilla-firefox-bin-1.5-r1 64
 MD5 bff260036c5dcca45da3218517fb33d8 files/icon/mozillafirefox-bin-icon.png 3979
 MD5 dc62e3f15845b0343d1513abada402d7 files/icon/mozillafirefox-bin.desktop 203
 MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
 MD5 396d47202cf4e60f89cb995d46294824 mozilla-firefox-bin-1.0.6-r2.ebuild 1874
 MD5 d7aac7b9a5c3e396fd39cea71058116c mozilla-firefox-bin-1.0.7.ebuild 1869
+MD5 4d03c1a163b39e07f353a2fe93a91294 mozilla-firefox-bin-1.5-r1.ebuild 2003
 MD5 4cb01c1fd7e83cdc8c2fa1f543f109ac mozilla-firefox-bin-1.5.ebuild 1869
diff --git a/www-client/mozilla-firefox-bin/files/digest-mozilla-firefox-bin-1.5-r1 b/www-client/mozilla-firefox-bin/files/digest-mozilla-firefox-bin-1.5-r1
new file mode 100644
index 000000000000..61944be7beb8
--- /dev/null
+++ b/www-client/mozilla-firefox-bin/files/digest-mozilla-firefox-bin-1.5-r1
@@ -0,0 +1 @@
+MD5 b63fcdf4863e59c93d2a29df853b6046 firefox-1.5.tar.gz 8444956
diff --git a/www-client/mozilla-firefox-bin/mozilla-firefox-bin-1.5-r1.ebuild b/www-client/mozilla-firefox-bin/mozilla-firefox-bin-1.5-r1.ebuild
new file mode 100644
index 000000000000..345e26db1f55
--- /dev/null
+++ b/www-client/mozilla-firefox-bin/mozilla-firefox-bin-1.5-r1.ebuild
@@ -0,0 +1,80 @@
+# 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.5-r1.ebuild,v 1.1 2005/12/18 20:14:21 anarchy Exp $
+
+inherit eutils mozilla-launcher multilib
+
+DESCRIPTION="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="-* ~amd64 ~x86"
+SLOT="0"
+LICENSE="MPL-1.1 NPL-1.1"
+IUSE=""
+
+DEPEND="virtual/libc"
+RDEPEND="|| ( (	x11-libs/libXrender
+		x11-libs/libXt
+		x11-libs/libXmu
+		)
+		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.41"
+
+S=${WORKDIR}/firefox
+
+pkg_setup() {
+	# 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() {
+	declare MOZILLA_FIVE_HOME=/opt/firefox
+
+	# Install firefox in /opt
+	dodir ${MOZILLA_FIVE_HOME%/*}
+	touch ${S}/extensions/talkback@mozilla.org/chrome.manifest
+	mv ${S} ${D}${MOZILLA_FIVE_HOME}
+
+	# Create /usr/bin/firefox-bin
+	install_mozilla_launcher_stub firefox-bin ${MOZILLA_FIVE_HOME}
+
+	# Install icon and .desktop for menu entry
+	insinto /usr/share/pixmaps
+	doins ${FILESDIR}/icon/mozillafirefox-bin-icon.png
+	insinto /usr/share/applications
+	doins ${FILESDIR}/icon/mozillafirefox-bin.desktop
+}
+
+pkg_preinst() {
+	declare MOZILLA_FIVE_HOME=/opt/firefox
+
+	# Remove entire installed instance to prevent all kinds of
+	# problems... see bug 44772 for example
+	rm -rf ${ROOT}${MOZILLA_FIVE_HOME}
+}
+
+pkg_postinst() {
+	if use amd64; then
+		echo
+		einfo "NB: You just installed a 32-bit firefox"
+	fi
+
+	update_mozilla_launcher_symlinks
+}
+
+pkg_postrm() {
+	update_mozilla_launcher_symlinks
+}