remove stale version, fix bug #409747

Package-Manager: portage-2.1.10.51/cvs/Linux x86_64

4 files changed, 19 insertions, 361 deletions

diff --git a/www-client/firefox/ChangeLog b/www-client/firefox/ChangeLog
index 3ef6ab92a4c5..83444e084908 100644
--- a/www-client/firefox/ChangeLog
+++ b/www-client/firefox/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-client/firefox
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/ChangeLog,v 1.140 2012/03/25 15:33:06 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/ChangeLog,v 1.141 2012/03/28 01:04:29 anarchy Exp $
+
+  28 Mar 2012; Jory A. Pratt <anarchy@gentoo.org> -firefox-11.0.ebuild,
+  firefox-11.0-r1.ebuild:
+  remove stale version, fix bug #409747
 
   25 Mar 2012; Thomas Kahle <tomka@gentoo.org> firefox-10.0.3.ebuild:
   marked x86 per bug 408161
diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index 1cb5e53bfe38..1f6c74991cfd 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX firefox-default-prefs.js 95 RMD160 805cdfec6fb31c224322cb71125547ad7a515f49 SHA1 7fab69d85b12a9f1b0c87fbb1821bdafd7485ac9 SHA256 8bc4cb870bc402db1f20b135a689f8c5dbfa5de8f1755b1926198d627c12c5f1
 AUX firefox.1 2538 RMD160 4564007d7d5345e9ab09c941015e3cdb78913835 SHA1 8be1987451117820744ecc67fa411facdc653a12 SHA256 3483439a73c74b818bdde98c15223b6d3fcfe78e3ad974fb35f197cf3ad614e7
@@ -330,8 +330,7 @@ DIST firefox-11.0-nn-NO.xpi 248736 RMD160 c29ae718c2fcc3edb3f671c4ecf1cd5152b297
 DIST firefox-11.0-nso.xpi 252238 RMD160 946acb004132de3e4286382f6ee8c11c42d1f97b SHA1 a56c92fba28c0596c5e65728b98d7fba3391c52f SHA256 b6ceffec32257a509f7ff6de7934896460729db9d982f0199f477360c2060f27
 DIST firefox-11.0-or.xpi 287375 RMD160 7c872ac3e443a2cd16cf3f4910e5c26736849436 SHA1 92fc985a560f5acca7f48fcc1c1ecd20c36f979f SHA256 1ffb259a82f2095174169d8d11553218aee14304d23ce95d2e509e5e01e71e5d
 DIST firefox-11.0-pa-IN.xpi 288525 RMD160 367716e9976cf980f87626553d31d9ceee5468ac SHA1 42730879432c13783853846f21f0a8c87ebe5ef7 SHA256 020b7a8be1f602ae935b2df7dad3403d6a8d2a94f232ba531484d45e46f91a95
-DIST firefox-11.0-patches-0.1.tar.xz 12632 RMD160 2e579ed97910225eb42670b299177128374e9493 SHA1 c1a5a8cc3110406e7b1913cc99e7d1b601e88bf6 SHA256 0e073f0394d631346e273592e2c89879f6d47ecd58e7c8a25ff58d8510db4364
-DIST firefox-11.0-patches-0.3.tar.xz 15948 RMD160 f8e2a4e16800cc1c91812ca0f2bc7e1429f6d90d SHA1 a574bb5d39929ec7d78ae481af5c7bf5d2c6dcf3 SHA256 3be860dc7f82ef20814a259bdb731cc7c06956646b8de1fb48e88b0640dcf1f8
+DIST firefox-11.0-patches-0.4.tar.xz 16876 RMD160 2edf20116eee6c01153332cbcda2655860f53d9b SHA1 9a34c6e76b2590b1fa1791477b92cd054fa6bece SHA256 543cdba1fd9a75f41183b817b2fae44099bde52e503e34e130566d3ca51b3f49
 DIST firefox-11.0-pl.xpi 257895 RMD160 373d8852af406d835817d82022f52cd14ad6fd4b SHA1 9fddab38e625f18d7307c6fe4575500092df56fb SHA256 f473c68a4c994a570ea4056365dffd0ef0f94b8c3ffe8a12022e246784c5c764
 DIST firefox-11.0-pt-BR.xpi 253884 RMD160 3cd90ed1321a7a9977b3f17c147c1aca2ed0565b SHA1 2db82434954089a361a55c7e2b667717fe108c77 SHA256 c740b02c85f365a625b04d536b63c0ebd5b33634768f08b24a5f9d0dc26c6fee
 DIST firefox-11.0-pt-PT.xpi 252568 RMD160 f85dafecf9d9f6c5721083316cea3720c366fe60 SHA1 25a768c3e3fe2be52a99b0ae88c28caec034b87f SHA256 1b9233180b5a66d26122405aab8a16f12e5aba335b76430754d3d26218fcea0d
@@ -677,19 +676,22 @@ EBUILD firefox-10.0.1-r1.ebuild 10462 RMD160 cfb45435045bae33149ba6124231bfb60a8
 EBUILD firefox-10.0.1.ebuild 10508 RMD160 33d2e96c57a454c933ad8c2260a4f4eae02b5e0b SHA1 1183024d2355e112522e4082008f10dbc66c40b1 SHA256 598adca6027671c6013c439927487f9e670cd8ed67b32d715820520b2879e1ab
 EBUILD firefox-10.0.3.ebuild 10657 RMD160 29ee09dbe9241e549ce5c7423ebe35297a7ba9d4 SHA1 b36e55fc93371f5b61a13786bcbae47a3602edb7 SHA256 32cd6ac94c64c72ed3d089da999e90aec9b2c7dc11d8ff7f654971693004f3f0
 EBUILD firefox-10.0.ebuild 10343 RMD160 ffe2cd959c4fede80e00f2142a34062c9bd2e160 SHA1 16b6635de055213326e407cc48e527a4e6467067 SHA256 39556459253d106c8e3d50abc5190ef543ac7c4ab6895e13bae4eb3adcdf26d5
-EBUILD firefox-11.0-r1.ebuild 10708 RMD160 fc248af65bfdc3f6a5bde96ef6ea8d2c48e59d46 SHA1 2d3f6778e8b6836a7da40d031be3d74198f1a131 SHA256 4d1d59b5e99b1bd4fea6d9690a7e290dac91c65aa2227aa9650f4764098ca7a1
-EBUILD firefox-11.0.ebuild 10706 RMD160 fe9f02bd7b16fdeff7f14e77ccacc6acf58b457e SHA1 8b70bf5c97ddb6bd38dbac63f35974c2c05ef657 SHA256 7474e9dd7dac48c7b9f76158f4f47febbb5911401b7b23220339c99a9bc8253a
+EBUILD firefox-11.0-r1.ebuild 10707 RMD160 2b5810360b7e9dba94e2527634f29d79147323c9 SHA1 bf218e198d4cd0d187a3928a2c621cd43eef23cd SHA256 50790303636fecec8abeaea9ace8aa133fd4c9274fb6644519f0d75d0d16d1d9
 EBUILD firefox-3.6.20.ebuild 9443 RMD160 598a4b875d7ec39367750882dc8df9c77adf02f1 SHA1 2987918c26454a1dbd0b8b5a830f1440f68b14dd SHA256 c44ece9c3512785a7fb8b272b7690b13bbfb5e75e544cc8cc23f00f3197bb978
 EBUILD firefox-3.6.22.ebuild 9453 RMD160 0b3b6fdd5acd5c42813cd2451298f7066da72e5f SHA1 6e88d16611c5a18979fa7e446f6ec5243b13d316 SHA256 b44194eea13d067b5cc2cee77c4c887cb3231c9c6dcda4d186a003fd78ddad36
 EBUILD firefox-8.0.ebuild 11229 RMD160 f3aa105e0c840fa6c627774876e09848d3e6c7f7 SHA1 a57da399420139299fa6aa7de561bdaf9af1c2fe SHA256 b1905c68803035fec65b99ca2cb9b643462c9e2600ed9226dfb1e62044b5524b
 EBUILD firefox-9.0.ebuild 11797 RMD160 f8df3f2c95babcc07b7e335511404cc163d3cd8d SHA1 0f9853a409dbc15418418d1210763493739eee25 SHA256 3237880f8107f8dff10fc91a03bbc771ab63b19482122eba26388a12ebbc246b
-MISC ChangeLog 29180 RMD160 d093589f65605c87947b6d3a5311e812f16755f8 SHA1 5b94a3c7359b32543f73ab3da619638f699f0557 SHA256 963ff719dff812f0ab690094a511428533c24466e9bf741fdd2d31d0d63b40b8
+MISC ChangeLog 29321 RMD160 d3e3549e4c53ef656faacab001b0bec3b745d11b SHA1 43f472ae60b67fd29dcaaa74f75e82e0b9657d71 SHA256 55f500ad40cd72e70371cd769378edc11679634e3170ac8aa4cf4e5887b326b4
 MISC ChangeLog-2009 109736 RMD160 ae12e8bd2f6f9869d3aeb0e2b172016a16a8e38b SHA1 eed236ab9ea02cf4f3e234887f36935375a7fc6f SHA256 6a3f47a190cb2146174953971b193f7d75f408ea2cd1ad7d029fb848dd66f3c8
 MISC metadata.xml 1152 RMD160 6a8a637610be0a0c1766c9b6a19ecffb39568dab SHA1 f1ac580a01dbb6a4d34065312a6e6a91db3f3730 SHA256 35b283a48644ea59259a1da5217d300409c51e7ae251caea86e8de98a588173c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk9vOrcACgkQodBTJSDyo64angD/ePsnBhbd+xp9vqTJBp15XZWk
-5Uk6nm8NfhlovNl6rWkA/34CdnuQUvR0iIiVUXyVN2TiQcK4/8bz/9/YPo4Jratd
-=lVR2
+iQEcBAEBAgAGBQJPcmOBAAoJEIXV9xahDnCogtkH/A4J59pW4wzVC9qgAQNKdSoP
+FOb9BA9Q/25Uzra4No+N9t8w3wDmaoUCjw4SNpJcG5Rnyc7JLWMEEfmVRwQLg3G6
+NQhIFPe4E/pd72cUa9SxBa/FFKZUU4XDRrvPWaXjfo7U1ku8MFvHtzzaCYedKnon
+cxjkq0pr4r9LOeZwoxIipfXyxyEUOZwuKQmwqwDaoeZ19FWAoH0TaeeoHXvTvyym
+wgiU9pG+yLBHceR2IJkzgC+5/1KSOwAALifBAz1fb+/55rH6V6p0d282iFndYqi3
+S1F2qjfJRtis5rXkBKHH1lKeQaWHNmvaEv+WnYAovwfI1JU1/ziJgffl7RO6lHA=
+=J3Uv
 -----END PGP SIGNATURE-----
diff --git a/www-client/firefox/firefox-11.0-r1.ebuild b/www-client/firefox/firefox-11.0-r1.ebuild
index 131ba2fe4a2a..2aeb39353c48 100644
--- a/www-client/firefox/firefox-11.0-r1.ebuild
+++ b/www-client/firefox/firefox-11.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/firefox-11.0-r1.ebuild,v 1.1 2012/03/24 23:56:14 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/firefox-11.0-r1.ebuild,v 1.2 2012/03/28 01:04:29 anarchy Exp $
 
 EAPI="3"
 VIRTUALX_REQUIRED="pgo"
@@ -27,7 +27,7 @@ fi
 # Changeset for alpha snapshot
 CHANGESET="e56ecd8b3a68"
 # Patch version
-PATCH="${PN}-11.0-patches-0.3"
+PATCH="${PN}-11.0-patches-0.4"
 # 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/${PN}/releases/"
diff --git a/www-client/firefox/firefox-11.0.ebuild b/www-client/firefox/firefox-11.0.ebuild
deleted file mode 100644
index fa5c04da3370..000000000000
--- a/www-client/firefox/firefox-11.0.ebuild
+++ /dev/null
@@ -1,348 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/firefox-11.0.ebuild,v 1.2 2012/03/21 03:37:03 nirbheek Exp $
-
-EAPI="3"
-VIRTUALX_REQUIRED="pgo"
-WANT_AUTOCONF="2.1"
-MOZ_ESR="0"
-
-# This list can be updated with scripts/get_langs.sh from the 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/_alpha/a}" # Handle alpha for SRC_URI
-MOZ_PV="${MOZ_PV/_beta/b}" # Handle beta for SRC_URI
-MOZ_PV="${MOZ_PV/_rc/rc}" # Handle rc for SRC_URI
-
-if [[ ${MOZ_ESR} == 1 ]]; then
-	# ESR releases have slightly version numbers
-	MOZ_PV="${MOZ_PV}esr"
-fi
-
-# Changeset for alpha snapshot
-CHANGESET="e56ecd8b3a68"
-# Patch version
-PATCH="${PN}-11.0-patches-0.1"
-# 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/${PN}/releases/"
-
-inherit check-reqs flag-o-matic toolchain-funcs eutils gnome2-utils mozconfig-3 multilib pax-utils fdo-mime autotools python virtualx nsplugins mozlinguas
-
-DESCRIPTION="Firefox Web Browser"
-HOMEPAGE="http://www.mozilla.com/firefox"
-
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
-IUSE="bindist +crashreporter +ipc +minimal pgo selinux system-sqlite +webm"
-
-# More URIs appended below...
-SRC_URI="${SRC_URI}
-	http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.xz"
-
-ASM_DEPEND=">=dev-lang/yasm-1.1"
-
-# Mesa 7.10 needed for WebGL + bugfixes
-RDEPEND="
-	>=sys-devel/binutils-2.16.1
-	>=dev-libs/nss-3.13.3
-	>=dev-libs/nspr-4.9
-	>=dev-libs/glib-2.26:2
-	>=media-libs/mesa-7.10
-	media-libs/libpng[apng]
-	virtual/libffi
-	system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,threadsafe,unlock-notify,debug=] )
-	webm? ( >=media-libs/libvpx-1.0.0
-		media-libs/alsa-lib )
-	crashreporter? ( net-misc/curl )
-	selinux? ( sec-policy/selinux-mozilla )"
-# We don't use PYTHON_DEPEND/PYTHON_USE_WITH for some silly reason
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	pgo? (
-		=dev-lang/python-2*[sqlite]
-		>=sys-devel/gcc-4.5 )
-	webm? ( x86? ( ${ASM_DEPEND} )
-		amd64? ( ${ASM_DEPEND} )
-		virtual/opengl )"
-
-# No source releases for alpha|beta
-if [[ ${PV} =~ alpha ]]; then
-	SRC_URI="${SRC_URI}
-		http://dev.gentoo.org/~anarchy/mozilla/firefox/firefox-${MOZ_PV}_${CHANGESET}.source.tar.bz2"
-	S="${WORKDIR}/mozilla-central"
-elif [[ ${PV} =~ beta ]]; then
-	SRC_URI="${SRC_URI}
-		${MOZ_FTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.bz2"
-	S="${WORKDIR}/mozilla-beta"
-else
-	SRC_URI="${SRC_URI}
-		${MOZ_FTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.bz2"
-	if [[ ${MOZ_ESR} == 1 ]]; then
-		S="${WORKDIR}/mozilla-esr${PV%%.*}"
-	else
-		S="${WORKDIR}/mozilla-release"
-	fi
-fi
-
-QA_PRESTRIPPED="usr/$(get_libdir)/${PN}/firefox"
-
-pkg_setup() {
-	moz_pkgsetup
-
-	# Avoid PGO profiling problems due to enviroment leakage
-	# These should *always* be cleaned up anyway
-	unset DBUS_SESSION_BUS_ADDRESS \
-		DISPLAY \
-		ORBIT_SOCKETDIR \
-		SESSION_MANAGER \
-		XDG_SESSION_COOKIE \
-		XAUTHORITY
-
-	if ! use bindist; then
-		einfo
-		elog "You are enabling official branding. You may not redistribute this build"
-		elog "to any users on your network or the internet. Doing so puts yourself into"
-		elog "a legal problem with Mozilla Foundation"
-		elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag"
-	fi
-
-	if use pgo; then
-		einfo
-		ewarn "You will do a double build for profile guided optimization."
-		ewarn "This will result in your build taking at least twice as long as before."
-	fi
-
-	# Ensure we have enough disk space to compile
-	if use pgo || use debug || use test ; then
-		CHECKREQS_DISK_BUILD="8G"
-	else
-		CHECKREQS_DISK_BUILD="4G"
-	fi
-	check-reqs_pkg_setup
-}
-
-src_unpack() {
-	unpack ${A}
-
-	# Unpack language packs
-	mozlinguas_src_unpack
-}
-
-src_prepare() {
-	# Apply our patches
-	EPATCH_SUFFIX="patch" \
-	EPATCH_FORCE="yes" \
-	epatch "${WORKDIR}/firefox"
-
-	# Allow user to apply any additional patches without modifing ebuild
-	epatch_user
-
-	# Enable gnomebreakpad
-	if use debug ; then
-		sed -i -e "s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \
-			"${S}"/build/unix/run-mozilla.sh || die "sed failed!"
-	fi
-
-	# Disable gnomevfs extension
-	sed -i -e "s:gnomevfs::" "${S}/"browser/confvars.sh \
-		-e "s:gnomevfs::" "${S}/"xulrunner/confvars.sh \
-		|| die "Failed to remove gnomevfs extension"
-
-	# Ensure that are plugins dir is enabled as default
-	sed -i -e "s:/usr/lib/mozilla/plugins:/usr/$(get_libdir)/nsbrowser/plugins:" \
-		"${S}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path!"
-
-	# Fix sandbox violations during make clean, bug 372817
-	sed -e "s:\(/no-such-file\):${T}\1:g" \
-		-i "${S}"/config/rules.mk \
-		-i "${S}"/js/src/config/rules.mk \
-		-i "${S}"/nsprpub/configure{.in,} \
-		|| die
-
-	#Fix compilation with curl-7.21.7 bug 376027
-	sed -e '/#include <curl\/types.h>/d'  \
-		-i "${S}"/toolkit/crashreporter/google-breakpad/src/common/linux/http_upload.cc \
-		-i "${S}"/toolkit/crashreporter/google-breakpad/src/common/linux/libcurl_wrapper.cc \
-		-i "${S}"/config/system-headers \
-		-i "${S}"/js/src/config/system-headers || die "Sed failed"
-
-	eautoreconf
-}
-
-src_configure() {
-	MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
-	MEXTENSIONS="default"
-
-	####################################
-	#
-	# mozconfig, CFLAGS and CXXFLAGS setup
-	#
-	####################################
-
-	mozconfig_init
-	mozconfig_config
-
-	# It doesn't compile on alpha without this LDFLAGS
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	mozconfig_annotate '' --prefix="${EPREFIX}"/usr
-	mozconfig_annotate '' --libdir="${EPREFIX}"/usr/$(get_libdir)
-	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
-	mozconfig_annotate '' --disable-gconf
-	mozconfig_annotate '' --disable-mailnews
-	mozconfig_annotate '' --enable-canvas
-	mozconfig_annotate '' --enable-safe-browsing
-	mozconfig_annotate '' --with-system-png
-	mozconfig_annotate '' --enable-system-ffi
-
-	# Other ff-specific settings
-	mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
-	mozconfig_annotate '' --target="${CTARGET:-${CHOST}}"
-
-	mozconfig_use_enable system-sqlite
-
-	# Allow for a proper pgo build
-	if use pgo; then
-		echo "mk_add_options PROFILE_GEN_SCRIPT='\$(PYTHON) \$(OBJDIR)/_profile/pgo/profileserver.py'" >> "${S}"/.mozconfig
-	fi
-
-	# Finalize and report settings
-	mozconfig_final
-
-	if [[ $(gcc-major-version) -lt 4 ]]; then
-		append-cxxflags -fno-stack-protector
-	elif [[ $(gcc-major-version) -gt 4 || $(gcc-minor-version) -gt 3 ]]; then
-		if use amd64 || use x86; then
-			append-flags -mno-avx
-		fi
-	fi
-}
-
-src_compile() {
-	if use pgo; then
-		addpredict /root
-		addpredict /etc/gconf
-		# Reset and cleanup environment variables used by GNOME/XDG
-		gnome2_environment_reset
-
-		# Firefox tries to use dri stuff when it's run, see bug 380283
-		shopt -s nullglob
-		cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
-		if test -n "${cards}"; then
-			# FOSS drivers are fine
-			addpredict "${cards}"
-		else
-			cards=$(echo -n /dev/ati/card* /dev/nvidiactl* | sed 's/ /:/g')
-			if test -n "${cards}"; then
-				# Binary drivers seem to cause access violations anyway, so
-				# let's use indirect rendering so that the device files aren't
-				# touched at all. See bug 394715.
-				export LIBGL_ALWAYS_INDIRECT=1
-			fi
-		fi
-		shopt -u nullglob
-
-		CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
-		MOZ_MAKE_FLAGS="${MAKEOPTS}" \
-		Xemake -f client.mk profiledbuild || die "Xemake failed"
-	else
-		CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
-		MOZ_MAKE_FLAGS="${MAKEOPTS}" \
-		emake -f client.mk || die "emake failed"
-	fi
-
-}
-
-src_install() {
-	MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
-
-	# MOZ_BUILD_ROOT, and hence OBJ_DIR change depending on arch, compiler, pgo, etc.
-	local obj_dir="$(echo */config.log)"
-	obj_dir="${obj_dir%/*}"
-	cd "${S}/${obj_dir}"
-
-	# Pax mark xpcshell for hardened support, only used for startupcache creation.
-	pax-mark m "${S}/${obj_dir}"/dist/bin/xpcshell
-
-	# Add our default prefs for firefox + xulrunner
-	cp "${FILESDIR}"/gentoo-default-prefs.js-1 \
-		"${S}/${obj_dir}/dist/bin/defaults/pref/all-gentoo.js" || die
-
-	MOZ_MAKE_FLAGS="${MAKEOPTS}" \
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	# Install language packs
-	mozlinguas_src_install
-
-	local size sizes icon_path icon name
-	if use bindist; then
-		sizes="16 32 48"
-		icon_path="${S}/browser/branding/aurora"
-		# Firefox's new rapid release cycle means no more codenames
-		# Let's just stick with this one...
-		icon="aurora"
-		name="Aurora"
-	else
-		sizes="16 22 24 32 256"
-		icon_path="${S}/browser/branding/official"
-		icon="${PN}"
-		name="Mozilla Firefox"
-	fi
-
-	# 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}/mozicon128.png" "${icon}.png" || die
-	# Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
-	newicon "${icon_path}/content/icon48.png" "${icon}.png" || die
-	newmenu "${FILESDIR}/icon/${PN}.desktop" "${PN}.desktop" || die
-	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
-		echo "StartupNotify=true" >> "${ED}/usr/share/applications/${PN}.desktop"
-	fi
-
-	# Required in order to use plugins and even run firefox on hardened.
-	pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/{firefox,firefox-bin,plugin-container}
-
-	# Plugins dir
-	share_plugins_dir
-
-	if use minimal; then
-		rm -rf "${ED}"/usr/include "${ED}${MOZILLA_FIVE_HOME}"/{idl,include,lib,sdk} || \
-			die "Failed to remove sdk and headers"
-	fi
-
-	# very ugly hack to make firefox not sigbus on sparc
-	# FIXME: is this still needed??
-	use sparc && { sed -e 's/Firefox/FirefoxGentoo/g' \
-					 -i "${ED}/${MOZILLA_FIVE_HOME}/application.ini" || \
-					 die "sparc sed failed"; }
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	# Update mimedb for the new .desktop file
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}