Security bump (bug #485258). Removed old

(Portage version: 2.2.6/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)

4 files changed, 46 insertions, 169 deletions

diff --git a/www-client/firefox-bin/ChangeLog b/www-client/firefox-bin/ChangeLog
index 6fc3bb44f46b..72e64e146bab 100644
--- a/www-client/firefox-bin/ChangeLog
+++ b/www-client/firefox-bin/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for www-client/firefox-bin
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/ChangeLog,v 1.165 2013/08/12 22:20:03 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/ChangeLog,v 1.166 2013/09/18 13:37:07 polynomial-c Exp $
+
+*firefox-bin-24.0 (18 Sep 2013)
+*firefox-bin-17.0.9 (18 Sep 2013)
+
+  18 Sep 2013; Lars Wendler <polynomial-c@gentoo.org>
+  -firefox-bin-17.0.5-r1.ebuild, -firefox-bin-17.0.6.ebuild,
+  -firefox-bin-17.0.7.ebuild, +firefox-bin-17.0.9.ebuild,
+  +firefox-bin-24.0.ebuild:
+  Security bump (bug #485258). Removed old.
 
   12 Aug 2013; Agostino Sarubbo <ago@gentoo.org> firefox-bin-17.0.8.ebuild:
   Stable for x86, wrt bug #479968
diff --git a/www-client/firefox-bin/firefox-bin-17.0.7.ebuild b/www-client/firefox-bin/firefox-bin-17.0.7.ebuild
deleted file mode 100644
index 04fb9ed4d6b7..000000000000
--- a/www-client/firefox-bin/firefox-bin-17.0.7.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/firefox-bin-17.0.7.ebuild,v 1.3 2013/06/27 20:49:01 ago Exp $
-
-EAPI="4"
-MOZ_ESR="1"
-
-# Can be updated using scripts/get_langs.sh from mozilla overlay
-MOZ_LANGS=(af ak ar as ast be bg bn-BD bn-IN br bs ca cs csb cy da de el en
-en-GB en-US en-ZA eo es-AR es-CL es-ES es-MX et eu fa fi fr fy-NL ga-IE gd gl
-gu-IN he hi-IN hr hu hy-AM id is it ja kk kn ko ku lg lt lv mai mk ml mr nb-NO
-nl nn-NO nso or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta ta-LK
-te th tr uk vi zh-CN zh-TW zu)
-
-# Convert the ebuild version to the upstream mozilla version, used by mozlinguas
-MOZ_PV="${PV/_beta/b}" # Handle beta for SRC_URI
-MOZ_PV="${MOZ_PV/_rc/rc}" # Handle rc for SRC_URI
-MOZ_PN="${PN/-bin}"
-
-if [[ ${MOZ_ESR} == 1 ]]; then
-	# ESR releases have slightly version numbers
-	MOZ_PV="${MOZ_PV}esr"
-fi
-
-MOZ_P="${MOZ_PN}-${MOZ_PV}"
-
-# Upstream ftp release URI that's used by mozlinguas.eclass
-# We don't use the http mirror because it deletes old tarballs.
-MOZ_FTP_URI="ftp://ftp.mozilla.org/pub/mozilla.org/${MOZ_PN}/releases/"
-
-inherit eutils multilib pax-utils fdo-mime gnome2-utils mozlinguas nsplugins
-
-DESCRIPTION="Firefox Web Browser"
-MOZ_FTP_URI="ftp://ftp.mozilla.org/pub/mozilla.org/${MOZ_PN}/releases"
-SRC_URI="${SRC_URI}
-	amd64? ( ${MOZ_FTP_URI}/${MOZ_PV}/linux-x86_64/en-US/${MOZ_P}.tar.bz2 -> ${PN}_x86_64-${PV}.tar.bz2 )
-	x86? ( ${MOZ_FTP_URI}/${MOZ_PV}/linux-i686/en-US/${MOZ_P}.tar.bz2 -> ${PN}_i686-${PV}.tar.bz2 )"
-HOMEPAGE="http://www.mozilla.com/firefox"
-RESTRICT="strip mirror binchecks"
-
-KEYWORDS="-* amd64 x86"
-SLOT="0"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="startup-notification"
-
-DEPEND="app-arch/unzip"
-RDEPEND="dev-libs/dbus-glib
-	gnome-base/gconf
-	gnome-base/orbit
-	virtual/freedesktop-icon-theme
-	x11-libs/libXrender
-	x11-libs/libXt
-	x11-libs/libXmu
-
-	>=x11-libs/gtk+-2.2:2
-	>=media-libs/alsa-lib-1.0.16
-	!net-libs/libproxy[spidermonkey]
-"
-
-S="${WORKDIR}/${MOZ_PN}"
-
-src_unpack() {
-	unpack ${A}
-
-	# Unpack language packs
-	mozlinguas_src_unpack
-}
-
-src_install() {
-	declare MOZILLA_FIVE_HOME=/opt/${MOZ_PN}
-
-	# Install icon and .desktop for menu entry
-	newicon "${S}"/chrome/icons/default/default48.png ${PN}-icon.png
-	domenu "${FILESDIR}"/${PN}.desktop
-
-	# Add StartupNotify=true bug 237317
-	if use startup-notification; then
-		echo "StartupNotify=true" >> "${D}"/usr/share/applications/${PN}.desktop
-	fi
-
-	# Install firefox in /opt
-	dodir ${MOZILLA_FIVE_HOME%/*}
-	mv "${S}" "${D}"${MOZILLA_FIVE_HOME} || die
-
-	# Fix prefs that make no sense for a system-wide install
-	insinto ${MOZILLA_FIVE_HOME}/defaults/pref/
-	doins "${FILESDIR}"/local-settings.js
-	insinto ${MOZILLA_FIVE_HOME}/
-	doins "${FILESDIR}"/all-gentoo.js
-
-	# Install language packs
-	mozlinguas_src_install
-
-	local LANG=${linguas%% *}
-	if [[ -n ${LANG} && ${LANG} != "en" ]]; then
-		elog "Setting default locale to ${LANG}"
-		echo "pref(\"general.useragent.locale\", \"${LANG}\");" \
-			>> "${D}${MOZILLA_FIVE_HOME}"/defaults/pref/${PN}-prefs.js || \
-			die "sed failed to change locale"
-	fi
-
-	# Create /usr/bin/firefox-bin
-	dodir /usr/bin/
-	cat <<-EOF >"${D}"/usr/bin/${PN}
-	#!/bin/sh
-	unset LD_PRELOAD
-	LD_LIBRARY_PATH="/opt/firefox/"
-	GTK_PATH=/usr/lib/gtk-2.0/
-	exec /opt/${MOZ_PN}/${MOZ_PN} "\$@"
-	EOF
-	fperms 0755 /usr/bin/${PN}
-
-	# revdep-rebuild entry
-	insinto /etc/revdep-rebuild
-	doins "${FILESDIR}"/10${PN} || die
-
-	# Plugins dir
-	share_plugins_dir
-
-	# Required in order to use plugins and even run firefox on hardened.
-	pax-mark mr "${ED}"/${MOZILLA_FIVE_HOME}/{firefox,firefox-bin,plugin-container}
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	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
-	# Drop requirement of curl not built with nss as it's not necessary anymore
-	#if has_version '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
-
-	# Update mimedb for the new .desktop file
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/www-client/firefox-bin/firefox-bin-17.0.5-r1.ebuild b/www-client/firefox-bin/firefox-bin-17.0.9.ebuild
index 4f4750cfa902..63a8db0da728 100644
--- a/www-client/firefox-bin/firefox-bin-17.0.5-r1.ebuild
+++ b/www-client/firefox-bin/firefox-bin-17.0.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/firefox-bin-17.0.5-r1.ebuild,v 1.4 2013/04/11 02:59:29 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/firefox-bin-17.0.9.ebuild,v 1.1 2013/09/18 13:37:07 polynomial-c Exp $
 
 EAPI="4"
 MOZ_ESR="1"
@@ -38,7 +38,7 @@ SRC_URI="${SRC_URI}
 HOMEPAGE="http://www.mozilla.com/firefox"
 RESTRICT="strip mirror binchecks"
 
-KEYWORDS="-* amd64 x86"
+KEYWORDS="-* ~amd64 ~x86"
 SLOT="0"
 LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
 IUSE="startup-notification"
diff --git a/www-client/firefox-bin/firefox-bin-17.0.6.ebuild b/www-client/firefox-bin/firefox-bin-24.0.ebuild
index c866bfbffbf1..275c898e0d0d 100644
--- a/www-client/firefox-bin/firefox-bin-17.0.6.ebuild
+++ b/www-client/firefox-bin/firefox-bin-24.0.ebuild
@@ -1,9 +1,8 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/firefox-bin-17.0.6.ebuild,v 1.3 2013/05/17 10:06:14 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/firefox-bin-24.0.ebuild,v 1.1 2013/09/18 13:37:07 polynomial-c Exp $
 
-EAPI="4"
-MOZ_ESR="1"
+EAPI="5"
 
 # Can be updated using scripts/get_langs.sh from mozilla overlay
 MOZ_LANGS=(af ak ar as ast be bg bn-BD bn-IN br bs ca cs csb cy da de el en
@@ -16,12 +15,6 @@ te th tr uk vi zh-CN zh-TW zu)
 MOZ_PV="${PV/_beta/b}" # Handle beta for SRC_URI
 MOZ_PV="${MOZ_PV/_rc/rc}" # Handle rc for SRC_URI
 MOZ_PN="${PN/-bin}"
-
-if [[ ${MOZ_ESR} == 1 ]]; then
-	# ESR releases have slightly version numbers
-	MOZ_PV="${MOZ_PV}esr"
-fi
-
 MOZ_P="${MOZ_PN}-${MOZ_PV}"
 
 # Upstream ftp release URI that's used by mozlinguas.eclass
@@ -36,17 +29,15 @@ SRC_URI="${SRC_URI}
 	amd64? ( ${MOZ_FTP_URI}/${MOZ_PV}/linux-x86_64/en-US/${MOZ_P}.tar.bz2 -> ${PN}_x86_64-${PV}.tar.bz2 )
 	x86? ( ${MOZ_FTP_URI}/${MOZ_PV}/linux-i686/en-US/${MOZ_P}.tar.bz2 -> ${PN}_i686-${PV}.tar.bz2 )"
 HOMEPAGE="http://www.mozilla.com/firefox"
-RESTRICT="strip mirror binchecks"
+RESTRICT="strip mirror"
 
-KEYWORDS="-* amd64 x86"
+KEYWORDS="-* ~amd64 ~x86"
 SLOT="0"
 LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
 IUSE="startup-notification"
 
 DEPEND="app-arch/unzip"
 RDEPEND="dev-libs/dbus-glib
-	gnome-base/gconf
-	gnome-base/orbit
 	virtual/freedesktop-icon-theme
 	x11-libs/libXrender
 	x11-libs/libXt
@@ -54,9 +45,21 @@ RDEPEND="dev-libs/dbus-glib
 
 	>=x11-libs/gtk+-2.2:2
 	>=media-libs/alsa-lib-1.0.16
+
 	!net-libs/libproxy[spidermonkey]
 "
 
+QA_PREBUILT="
+	opt/${MOZ_PN}/*.so
+	opt/${MOZ_PN}/${MOZ_PN}
+	opt/${MOZ_PN}/${PN}
+	opt/${MOZ_PN}/crashreporter
+	opt/${MOZ_PN}/webapprt-stub
+	opt/${MOZ_PN}/plugin-container
+	opt/${MOZ_PN}/mozilla-xremote-client
+	opt/${MOZ_PN}/updater
+"
+
 S="${WORKDIR}/${MOZ_PN}"
 
 src_unpack() {
@@ -69,9 +72,25 @@ src_unpack() {
 src_install() {
 	declare MOZILLA_FIVE_HOME=/opt/${MOZ_PN}
 
-	# Install icon and .desktop for menu entry
-	newicon "${S}"/chrome/icons/default/default48.png ${PN}-icon.png
+	local size sizes icon_path icon name
+	sizes="16 32 48"
+	icon_path="${S}/browser/chrome/icons/default"
+	icon="${PN}"
+	name="Mozilla Firefox"
+
+	# Install icons and .desktop for menu entry
+	for size in ${sizes}; do
+		insinto "/usr/share/icons/hicolor/${size}x${size}/apps"
+		newins "${icon_path}/default${size}.png" "${icon}.png" || die
+	done
+	# The 128x128 icon has a different name
+	insinto "/usr/share/icons/hicolor/128x128/apps"
+	newins "${icon_path}/../../../icons/mozicon128.png" "${icon}.png" || die
+	# Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
+	newicon "${S}"/browser/chrome/icons/default/default48.png ${PN}-icon.png
 	domenu "${FILESDIR}"/${PN}.desktop
+	sed -i -e "s:@NAME@:${name}:" -e "s:@ICON@:${icon}:" \
+		"${ED}/usr/share/applications/${PN}.desktop" || die
 
 	# Add StartupNotify=true bug 237317
 	if use startup-notification; then