Bump to 3.0.12, also fix deps for noscript pkgmove

(Portage version: 2.2_rc33/cvs/Linux i686)

5 files changed, 184 insertions, 8 deletions

diff --git a/www-client/mozilla-firefox-bin/ChangeLog b/www-client/mozilla-firefox-bin/ChangeLog
index e9b63b696985..a9d0d229f9bf 100644
--- a/www-client/mozilla-firefox-bin/ChangeLog
+++ b/www-client/mozilla-firefox-bin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-client/mozilla-firefox-bin
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox-bin/ChangeLog,v 1.198 2009/07/20 13:36:27 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox-bin/ChangeLog,v 1.199 2009/07/22 09:37:11 nirbheek Exp $
+
+*mozilla-firefox-bin-3.0.12 (22 Jul 2009)
+
+  22 Jul 2009; Nirbheek Chauhan <nirbheek@gentoo.org>
+  mozilla-firefox-bin-2.0.0.19.ebuild, mozilla-firefox-bin-3.0.11.ebuild,
+  +mozilla-firefox-bin-3.0.12.ebuild, mozilla-firefox-bin-3.5.1.ebuild:
+  Bump to 3.0.12, also fix deps for noscript pkgmove
 
 *mozilla-firefox-bin-3.5.1 (20 Jul 2009)
 
diff --git a/www-client/mozilla-firefox-bin/mozilla-firefox-bin-2.0.0.19.ebuild b/www-client/mozilla-firefox-bin/mozilla-firefox-bin-2.0.0.19.ebuild
index 2b0866414a53..218e5f3c6f22 100644
--- a/www-client/mozilla-firefox-bin/mozilla-firefox-bin-2.0.0.19.ebuild
+++ b/www-client/mozilla-firefox-bin/mozilla-firefox-bin-2.0.0.19.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 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-2.0.0.19.ebuild,v 1.2 2008/12/20 21:13:30 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox-bin/mozilla-firefox-bin-2.0.0.19.ebuild,v 1.3 2009/07/22 09:37:11 nirbheek Exp $
 
 inherit eutils mozilla-launcher multilib mozextension
 
@@ -51,7 +51,7 @@ RDEPEND="x11-libs/libXrender
 	)
 	>=www-client/mozilla-launcher-1.41"
 
-PDEPEND="restrict-javascript? ( x11-plugins/noscript )"
+PDEPEND="restrict-javascript? ( www-plugins/noscript )"
 
 S="${WORKDIR}/firefox"
 
diff --git a/www-client/mozilla-firefox-bin/mozilla-firefox-bin-3.0.11.ebuild b/www-client/mozilla-firefox-bin/mozilla-firefox-bin-3.0.11.ebuild
index ba07ee4234fb..632f46aa0148 100644
--- a/www-client/mozilla-firefox-bin/mozilla-firefox-bin-3.0.11.ebuild
+++ b/www-client/mozilla-firefox-bin/mozilla-firefox-bin-3.0.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 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-3.0.11.ebuild,v 1.3 2009/07/01 20:19:50 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox-bin/mozilla-firefox-bin-3.0.11.ebuild,v 1.4 2009/07/22 09:37:11 nirbheek Exp $
 EAPI="2"
 
 inherit eutils mozilla-launcher multilib mozextension
@@ -48,7 +48,7 @@ RDEPEND="x11-libs/libXrender
 		app-emulation/emul-linux-x86-compat
 	)"
 
-PDEPEND="restrict-javascript? ( x11-plugins/noscript )"
+PDEPEND="restrict-javascript? ( www-plugins/noscript )"
 
 S="${WORKDIR}/firefox"
 
diff --git a/www-client/mozilla-firefox-bin/mozilla-firefox-bin-3.0.12.ebuild b/www-client/mozilla-firefox-bin/mozilla-firefox-bin-3.0.12.ebuild
new file mode 100644
index 000000000000..db797f122268
--- /dev/null
+++ b/www-client/mozilla-firefox-bin/mozilla-firefox-bin-3.0.12.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2009 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-3.0.12.ebuild,v 1.1 2009/07/22 09:37:11 nirbheek Exp $
+EAPI="2"
+
+inherit eutils mozilla-launcher multilib mozextension
+
+LANGS="af ar be bg bn-IN ca cs cy da de el en-GB en-US eo es-AR es-ES et eu fi fr fy-NL ga-IE gl gu-IN he hi-IN hu id is it ja ka kn ko ku lt lv mk mn mr nb-NO nl nn-NO oc pa-IN pl pt-BR pt-PT ro ru si sk sl sq sr sv-SE te th tr uk zh-CN zh-TW"
+NOSHORTLANGS="en-GB es-AR pt-BR zh-CN"
+
+DESCRIPTION="Firefox Web Browser"
+REL_URI="http://releases.mozilla.org/pub/mozilla.org/firefox/releases/"
+SRC_URI="${REL_URI}/${PV}/linux-i686/en-US/firefox-${PV}.tar.bz2"
+HOMEPAGE="http://www.mozilla.com/firefox"
+RESTRICT="strip"
+
+KEYWORDS="-* ~amd64 ~x86"
+SLOT="0"
+LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
+IUSE="restrict-javascript"
+
+for X in ${LANGS} ; do
+	if [ "${X}" != "en" ] && [ "${X}" != "en-US" ]; then
+		SRC_URI="${SRC_URI}
+			linguas_${X/-/_}? ( ${REL_URI}/${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}/${PV}/linux-i686/xpi/${X}.xpi -> ${P/-bin/}-${X}.xpi )"
+		fi
+		IUSE="${IUSE} linguas_${X%%-*}"
+	fi
+done
+
+DEPEND="app-arch/unzip"
+RDEPEND="x11-libs/libXrender
+	x11-libs/libXt
+	x11-libs/libXmu
+	x86? (
+		>=x11-libs/gtk+-2.2
+	)
+	amd64? (
+		>=app-emulation/emul-linux-x86-baselibs-1.0
+		>=app-emulation/emul-linux-x86-gtklibs-1.0
+		app-emulation/emul-linux-x86-compat
+	)"
+
+PDEPEND="restrict-javascript? ( www-plugins/noscript )"
+
+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"
+}
+
+linguas() {
+	local LANG SLANG
+	for LANG in ${LINGUAS}; do
+		if has ${LANG} en en_US; then
+			has en ${linguas} || linguas="${linguas:+"${linguas} "}en"
+			continue
+		elif has ${LANG} ${LANGS//-/_}; then
+			has ${LANG//_/-} ${linguas} || linguas="${linguas:+"${linguas} "}${LANG//_/-}"
+			continue
+		elif [[ " ${LANGS} " == *" ${LANG}-"* ]]; then
+			for X in ${LANGS}; do
+				if [[ "${X}" == "${LANG}-"* ]] && \
+					[[ " ${NOSHORTLANGS} " != *" ${X} "* ]]; then
+					has ${X} ${linguas} || linguas="${linguas:+"${linguas} "}${X}"
+					continue 2
+				fi
+			done
+		fi
+		ewarn "Sorry, but ${PN} does not support the ${LANG} LINGUA"
+	done
+}
+
+src_unpack() {
+	unpack firefox-${PV}.tar.bz2
+
+	linguas
+	for X in ${linguas}; do
+		[[ ${X} != "en" ]] && xpi_unpack "${P/-bin/}-${X}.xpi"
+	done
+	if [[ ${linguas} != "" && ${linguas} != "en" ]]; then
+		einfo "Selected language packs (first will be default): ${linguas}"
+	fi
+}
+
+src_install() {
+	declare MOZILLA_FIVE_HOME=/opt/firefox
+
+	# Install icon and .desktop for menu entry
+	newicon "${S}"/chrome/icons/default/default48.png ${PN}-icon.png
+	domenu "${FILESDIR}"/icon/${PN}.desktop
+
+	# Install firefox in /opt
+	dodir ${MOZILLA_FIVE_HOME%/*}
+	mv "${S}" "${D}"${MOZILLA_FIVE_HOME}
+
+	linguas
+	for X in ${linguas}; do
+		[[ ${X} != "en" ]] && xpi_install "${WORKDIR}"/"${P/-bin/}-${X}"
+	done
+
+	local LANG=${linguas%% *}
+	if [[ -n ${LANG} && ${LANG} != "en" ]]; then
+		elog "Setting default locale to ${LANG}"
+		dosed -e "s:general.useragent.locale\", \"en-US\":general.useragent.locale\", \"${LANG}\":" \
+			"${MOZILLA_FIVE_HOME}"/defaults/pref/firefox.js \
+			"${MOZILLA_FIVE_HOME}"/defaults/pref/firefox-l10n.js || \
+			die "sed failed to change locale"
+	fi
+
+		# Create /usr/bin/firefox-bin
+		dodir /usr/bin/
+		cat <<EOF >"${D}"/usr/bin/firefox-bin
+#!/bin/sh
+unset LD_PRELOAD
+exec /opt/firefox/firefox "\$@"
+EOF
+		fperms 0755 /usr/bin/firefox-bin
+
+	# revdep-rebuild entry
+	insinto /etc/revdep-rebuild
+	doins "${FILESDIR}"/10firefox-bin
+
+	# install ldpath env.d
+	doenvd "${FILESDIR}"/71firefox-bin
+
+	rm -rf "${D}"${MOZILLA_FIVE_HOME}/plugins
+	dosym /usr/"$(get_libdir)"/nsbrowser/plugins ${MOZILLA_FIVE_HOME}/plugins
+}
+
+pkg_postinst() {
+	if use x86; then
+		if ! has_version 'gnome-base/gconf' || ! has_version 'gnome-base/orbit' \
+			|| ! has_version 'net-misc/curl'; then
+			einfo
+			einfo "For using the crashreporter, you need gnome-base/gconf,"
+			einfo "gnome-base/orbit and net-misc/curl emerged."
+			einfo
+		fi
+		if has_version 'net-misc/curl' && built_with_use --missing \
+			true 'net-misc/curl' nss; then
+			einfo
+			einfo "Crashreporter won't be able to send reports"
+			einfo "if you have curl emerged with the nss USE-flag"
+			einfo
+		fi
+	else
+		einfo
+		einfo "NB: You just installed a 32-bit firefox"
+		einfo
+		einfo "Crashreporter won't work on amd64"
+		einfo
+	fi
+	update_mozilla_launcher_symlinks
+}
+
+pkg_postrm() {
+	update_mozilla_launcher_symlinks
+}
diff --git a/www-client/mozilla-firefox-bin/mozilla-firefox-bin-3.5.1.ebuild b/www-client/mozilla-firefox-bin/mozilla-firefox-bin-3.5.1.ebuild
index 62c8e073a674..52297f4dbde4 100644
--- a/www-client/mozilla-firefox-bin/mozilla-firefox-bin-3.5.1.ebuild
+++ b/www-client/mozilla-firefox-bin/mozilla-firefox-bin-3.5.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 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-3.5.1.ebuild,v 1.1 2009/07/20 13:36:27 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox-bin/mozilla-firefox-bin-3.5.1.ebuild,v 1.2 2009/07/22 09:37:11 nirbheek Exp $
 EAPI="2"
 
 inherit eutils mozilla-launcher multilib mozextension
@@ -54,7 +54,7 @@ RDEPEND="dev-libs/dbus-glib
 		app-emulation/emul-linux-x86-compat
 	)"
 
-PDEPEND="restrict-javascript? ( x11-plugins/noscript )"
+PDEPEND="restrict-javascript? ( www-plugins/noscript )"
 
 S="${WORKDIR}/firefox"