8 files changed, 13 insertions, 210 deletions
diff --git a/www-client/mozilla-bin/ChangeLog b/www-client/mozilla-bin/ChangeLog
index d0a37a93efef..80d323c7d4ef 100644
--- a/www-client/mozilla-bin/ChangeLog
+++ b/www-client/mozilla-bin/ChangeLog
@@ -1,6 +1,14 @@
 # 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.17 2005/07/25 02:53:46 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-bin/ChangeLog,v 1.18 2005/08/02 14:50:09 agriffis Exp $
+
+*mozilla-bin-1.7.10-r1 (02 Aug 2005)
+
+  02 Aug 2005; Aron Griffis <agriffis@gentoo.org> -mozilla-bin-1.7.7.ebuild,
+  -mozilla-bin-1.7.8.ebuild, -mozilla-bin-1.7.10.ebuild,
+  +mozilla-bin-1.7.10-r1.ebuild:
+  Bump rev to push out mozilla-launcher.eclass change which sets
+  MOZ_PLUGIN_PATH correctly in /usr/bin/mozilla-bin #100378
 
   25 Jul 2005; Aron Griffis <agriffis@gentoo.org> mozilla-bin-1.7.7.ebuild,
   mozilla-bin-1.7.8.ebuild, mozilla-bin-1.7.10.ebuild:
diff --git a/www-client/mozilla-bin/files/digest-mozilla-bin-1.7.10 b/www-client/mozilla-bin/files/digest-mozilla-bin-1.7.10-r1
index d8a2a285265d..d8a2a285265d 100644
--- a/www-client/mozilla-bin/files/digest-mozilla-bin-1.7.10
+++ b/www-client/mozilla-bin/files/digest-mozilla-bin-1.7.10-r1
diff --git a/www-client/mozilla-bin/files/digest-mozilla-bin-1.7.7 b/www-client/mozilla-bin/files/digest-mozilla-bin-1.7.7
deleted file mode 100644
index c5a41d57e986..000000000000
--- a/www-client/mozilla-bin/files/digest-mozilla-bin-1.7.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 aec83f475c3bf9232ae7dc3f0563d771 mozilla-i686-pc-linux-gnu-1.7.7.tar.gz 13888040
diff --git a/www-client/mozilla-bin/files/digest-mozilla-bin-1.7.8 b/www-client/mozilla-bin/files/digest-mozilla-bin-1.7.8
deleted file mode 100644
index 7f7471fcf586..000000000000
--- a/www-client/mozilla-bin/files/digest-mozilla-bin-1.7.8
+++ /dev/null
@@ -1 +0,0 @@
-MD5 115233cf01789cf3148b8d6c31b3a972 mozilla-i686-pc-linux-gnu-1.7.8.tar.gz 13890638
diff --git a/www-client/mozilla-bin/mozilla-bin-1.7.10.ebuild b/www-client/mozilla-bin/mozilla-bin-1.7.10-r1.ebuild
index ae8cc3135d14..22316cc6c602 100644
--- a/www-client/mozilla-bin/mozilla-bin-1.7.10.ebuild
+++ b/www-client/mozilla-bin/mozilla-bin-1.7.10-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-bin/mozilla-bin-1.7.10.ebuild,v 1.5 2005/07/25 02:53:46 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-bin/mozilla-bin-1.7.10-r1.ebuild,v 1.1 2005/08/02 14:50:09 agriffis Exp $
 
 inherit eutils mozilla-launcher multilib
 
diff --git a/www-client/mozilla-bin/mozilla-bin-1.7.7.ebuild b/www-client/mozilla-bin/mozilla-bin-1.7.7.ebuild
deleted file mode 100644
index dff8a56881e5..000000000000
--- a/www-client/mozilla-bin/mozilla-bin-1.7.7.ebuild
+++ /dev/null
@@ -1,96 +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-bin/mozilla-bin-1.7.7.ebuild,v 1.3 2005/07/25 02:53:46 agriffis Exp $
-
-inherit nsplugins eutils mozilla-launcher multilib
-
-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="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.28"
-
-# 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 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
-}
diff --git a/www-client/mozilla-bin/mozilla-bin-1.7.8.ebuild b/www-client/mozilla-bin/mozilla-bin-1.7.8.ebuild
deleted file mode 100644
index 9b3dd22334e9..000000000000
--- a/www-client/mozilla-bin/mozilla-bin-1.7.8.ebuild
+++ /dev/null
@@ -1,94 +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-bin/mozilla-bin-1.7.8.ebuild,v 1.4 2005/07/25 02:53:46 agriffis Exp $
-
-inherit nsplugins eutils mozilla-launcher multilib
-
-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"
-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.28"
-
-# 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 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
-}
diff --git a/www-client/mozilla-firefox-bin/Manifest b/www-client/mozilla-firefox-bin/Manifest
index 70bff9f05c68..2e23fb060baa 100644
--- a/www-client/mozilla-firefox-bin/Manifest
+++ b/www-client/mozilla-firefox-bin/Manifest
@@ -1,19 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 9a5ac50b16d787aadbbe4ea43081077d mozilla-firefox-bin-1.0.5-r1.ebuild 2429
-MD5 a46e4f935f1b81b377dff7a7f2c0009c ChangeLog 9866
+MD5 8f2ab03f2d4fda0b4b5b153577c5854a mozilla-firefox-bin-1.0.6-r2.ebuild 1853
+MD5 23f3d13b579d6d471e9d8edd1794ab15 ChangeLog 10244
 MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
-MD5 802f778778e1dde8dfa6945f94868e5b mozilla-firefox-bin-1.0.6-r1.ebuild 1853
-MD5 7b6378c14fc0f9bd858c2ac9abbca109 files/firefox-bin-0.9-init.tar.bz2 3327
-MD5 4b866b7683105489860f6352e8651be0 files/digest-mozilla-firefox-bin-1.0.5-r1 66
-MD5 a55b185b30df1647429525139fe29ec5 files/digest-mozilla-firefox-bin-1.0.6-r1 66
+MD5 a55b185b30df1647429525139fe29ec5 files/digest-mozilla-firefox-bin-1.0.6-r2 66
 MD5 dc62e3f15845b0343d1513abada402d7 files/icon/mozillafirefox-bin.desktop 203
 MD5 bff260036c5dcca45da3218517fb33d8 files/icon/mozillafirefox-bin-icon.png 3979
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFC5FSpBXaUFmZvwyMRAvueAJwIJ0APz7n2xCw7lQ6uDalUJA5NQwCg1Msr
-UwGHrO0felwQGIHuUyBEmsY=
-=wZub
------END PGP SIGNATURE-----