Update for crash fixes, remove stale ebuilds

(Portage version: 2.1.9.10/cvs/Linux x86_64)

2 files changed, 16 insertions, 8 deletions

diff --git a/www-client/firefox-bin/ChangeLog b/www-client/firefox-bin/ChangeLog
index 15373cc0ca4e..43166841c17a 100644
--- a/www-client/firefox-bin/ChangeLog
+++ b/www-client/firefox-bin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/firefox-bin
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/ChangeLog,v 1.32 2010/09/11 10:28:09 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/ChangeLog,v 1.33 2010/09/26 17:06:39 anarchy Exp $
+
+*firefox-bin-3.6.10 (26 Sep 2010)
+
+  26 Sep 2010; Jory A. Pratt <anarchy@gentoo.org> -firefox-bin-3.6.8.ebuild,
+  +firefox-bin-3.6.10.ebuild:
+  Update for crash fixes, remove stale ebuilds
 
   11 Sep 2010; Markos Chandras <hwoarang@gentoo.org>
   firefox-bin-3.6.9.ebuild:
diff --git a/www-client/firefox-bin/firefox-bin-3.6.8.ebuild b/www-client/firefox-bin/firefox-bin-3.6.10.ebuild
index ff8dee17bd6c..24d0b0b798ef 100644
--- a/www-client/firefox-bin/firefox-bin-3.6.8.ebuild
+++ b/www-client/firefox-bin/firefox-bin-3.6.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/firefox-bin-3.6.8.ebuild,v 1.3 2010/07/26 19:18:04 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/firefox-bin-3.6.10.ebuild,v 1.1 2010/09/26 17:06:39 anarchy Exp $
 EAPI="2"
 
 inherit eutils mozilla-launcher multilib mozextension
@@ -23,7 +23,7 @@ SRC_URI="${REL_URI}/${MY_PV}/linux-i686/en-US/${MY_P}.tar.bz2"
 HOMEPAGE="http://www.mozilla.com/firefox"
 RESTRICT="strip mirror"
 
-KEYWORDS="-* amd64 x86"
+KEYWORDS="-* ~amd64 ~x86"
 SLOT="0"
 LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
 IUSE="startup-notification"
@@ -31,14 +31,14 @@ IUSE="startup-notification"
 for X in ${LANGS} ; do
 	if [ "${X}" != "en" ] && [ "${X}" != "en-US" ]; then
 		SRC_URI="${SRC_URI}
-			linguas_${X/-/_}? ( ${REL_URI}/${MY_PV}/linux-i686/xpi/${X}.xpi -> mozilla-${MY_P}-${X}.xpi )"
+			linguas_${X/-/_}? ( ${REL_URI}/${MY_PV}/linux-i686/xpi/${X}.xpi -> ${P/-bin/}-${X}.xpi )"
 	fi
 	IUSE="${IUSE} linguas_${X/-/_}"
 	# english is handled internally
 	if [ "${#X}" == 5 ] && ! has ${X} ${NOSHORTLANGS}; then
 		if [ "${X}" != "en-US" ]; then
 			SRC_URI="${SRC_URI}
-				linguas_${X%%-*}? ( ${REL_URI}/${MY_PV}/linux-i686/xpi/${X}.xpi -> mozilla-${MY_P}-${X}.xpi )"
+				linguas_${X%%-*}? ( ${REL_URI}/${MY_PV}/linux-i686/xpi/${X}.xpi -> ${P/-bin/}-${X}.xpi )"
 		fi
 		IUSE="${IUSE} linguas_${X%%-*}"
 	fi
@@ -95,7 +95,7 @@ src_unpack() {
 
 	linguas
 	for X in ${linguas}; do
-		[[ ${X} != "en" ]] && xpi_unpack "mozilla-${MY_P}-${X}.xpi"
+		[[ ${X} != "en" ]] && xpi_unpack "${P/-bin/}-${X}.xpi"
 	done
 	if [[ ${linguas} != "" && ${linguas} != "en" ]]; then
 		einfo "Selected language packs (first will be default): ${linguas}"
@@ -120,7 +120,7 @@ src_install() {
 
 	linguas
 	for X in ${linguas}; do
-		[[ ${X} != "en" ]] && xpi_install "${WORKDIR}"/"mozilla-${MY_P}-${X}"
+		[[ ${X} != "en" ]] && xpi_install "${WORKDIR}"/"${P/-bin/}-${X}"
 	done
 
 	local LANG=${linguas%% *}
@@ -138,6 +138,9 @@ src_install() {
 #!/bin/sh
 unset LD_PRELOAD
 LD_LIBRARY_PATH="/opt/firefox/"
+if use amd64 ; then
+GTK_PATH=/usr/lib32/gtk-2.0/
+fi
 exec /opt/${MY_PN}/${MY_PN} "\$@"
 EOF
 		fperms 0755 /usr/bin/${PN}
@@ -172,7 +175,6 @@ pkg_postinst() {
 		einfo "Crashreporter won't work on amd64"
 		einfo
 	fi
-	update_mozilla_launcher_symlinks
 }
 
 pkg_postrm() {