fixes regressions made in 1.7.10

(Portage version: 2.0.51.22-r2)

4 files changed, 83 insertions, 13 deletions

diff --git a/www-client/mozilla-bin/ChangeLog b/www-client/mozilla-bin/ChangeLog
index a863ee846f06..1a071e255ac3 100644
--- a/www-client/mozilla-bin/ChangeLog
+++ b/www-client/mozilla-bin/ChangeLog
@@ -1,6 +1,12 @@
 # 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.19 2005/08/11 20:22:54 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-bin/ChangeLog,v 1.20 2005/08/20 16:41:35 anarchy Exp $
+
+*mozilla-bin-1.7.11 (20 Aug 2005)
+
+  20 Aug 2005; Jory A. Pratt <anarchy@gentoo.org>
+  +mozilla-bin-1.7.11.ebuild:
+  fixes for regressions in 1.7.10
 
   11 Aug 2005; Diego Pettenò <flameeyes@gentoo.org>
   mozilla-bin-1.7.10-r1.ebuild:
diff --git a/www-client/mozilla-bin/Manifest b/www-client/mozilla-bin/Manifest
index fba9c9fa1528..eca6b5460a3b 100644
--- a/www-client/mozilla-bin/Manifest
+++ b/www-client/mozilla-bin/Manifest
@@ -1,16 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 6a6fb070b3d26d8430bed87a7c973e42 ChangeLog 4674
-MD5 f4ce3c87d2aca0320c4fb74cef58e610 mozilla-bin-1.7.10-r1.ebuild 1803
 MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
-MD5 d364a8d78e0bde072fc1b38931778760 files/mozilla-bin.desktop 188
+MD5 f4ce3c87d2aca0320c4fb74cef58e610 mozilla-bin-1.7.10-r1.ebuild 1803
+MD5 8c8871231f037bdf7f2397f4819fabc7 mozilla-bin-1.7.11.ebuild 1805
 MD5 6d52ff4ce4567db1cad08ea40157a65d files/mozilla-bin-icon.png 2350
+MD5 d364a8d78e0bde072fc1b38931778760 files/mozilla-bin.desktop 188
 MD5 95b88f89e551260cea8f775e958cdc35 files/digest-mozilla-bin-1.7.10-r1 86
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFC+7O8j5H05b2HAEkRAvs9AKCZfnKaU5zUPBFzyRCHcK11o97vhwCglyVQ
-8ZQqdEi6OpEKa0pwuyv+e/Q=
-=fspW
------END PGP SIGNATURE-----
+MD5 95574882cd8d5d6daa2fe6b01f72d346 files/digest-mozilla-bin-1.7.11 86
diff --git a/www-client/mozilla-bin/files/digest-mozilla-bin-1.7.11 b/www-client/mozilla-bin/files/digest-mozilla-bin-1.7.11
new file mode 100644
index 000000000000..38cf137e6bd8
--- /dev/null
+++ b/www-client/mozilla-bin/files/digest-mozilla-bin-1.7.11
@@ -0,0 +1 @@
+MD5 4f129f45321f2b37c5313418560c7838 mozilla-i686-pc-linux-gnu-1.7.11.tar.gz 13886209
diff --git a/www-client/mozilla-bin/mozilla-bin-1.7.11.ebuild b/www-client/mozilla-bin/mozilla-bin-1.7.11.ebuild
new file mode 100644
index 000000000000..04593cb286ff
--- /dev/null
+++ b/www-client/mozilla-bin/mozilla-bin-1.7.11.ebuild
@@ -0,0 +1,71 @@
+# 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.11.ebuild,v 1.1 2005/08/20 16:41:35 anarchy Exp $
+
+inherit eutils mozilla-launcher multilib
+
+IUSE=""
+
+DESCRIPTION="Mozilla Application Suite - web browser, email, HTML editor, IRC"
+HOMEPAGE="http://www.mozilla.org"
+SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/mozilla${PV}/mozilla-i686-pc-linux-gnu-${PV}.tar.gz"
+RESTRICT="nostrip"
+
+KEYWORDS="~amd64 ~x86"
+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
+	>=www-client/mozilla-launcher-1.41"
+
+S=${WORKDIR}/mozilla
+
+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/mozilla
+
+	# Install mozilla in /opt
+	dodir ${MOZILLA_FIVE_HOME%/*}
+	mv ${S} ${D}${MOZILLA_FIVE_HOME}
+
+	# Install /usr/bin/mozilla-bin
+	install_mozilla_launcher_stub mozilla-bin ${MOZILLA_FIVE_HOME}
+
+	# 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() {
+	declare MOZILLA_FIVE_HOME=/opt/mozilla
+
+	# Remove entire installed instance to prevent all kinds of
+	# problems... see bug 44772 for example
+	rm -rf "${ROOT}${MOZILLA_FIVE_HOME}"
+}
+
+pkg_postinst() {
+	update_mozilla_launcher_symlinks
+}
+
+pkg_postrm() {
+	update_mozilla_launcher_symlinks
+}