Security bump (bug #348316). Removed old.

(Portage version: 2.2.0_alpha8/cvs/Linux x86_64)

8 files changed, 17 insertions, 748 deletions

diff --git a/www-client/icecat/ChangeLog b/www-client/icecat/ChangeLog
index 41ccadbbd9c4..49ff498b9297 100644
--- a/www-client/icecat/ChangeLog
+++ b/www-client/icecat/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for www-client/icecat
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/icecat/ChangeLog,v 1.58 2010/11/28 14:16:47 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/icecat/ChangeLog,v 1.59 2010/12/14 10:33:28 polynomial-c Exp $
+
+*icecat-3.6.13 (14 Dec 2010)
+
+  14 Dec 2010; Lars Wendler <polynomial-c@gentoo.org>
+  -files/xulrunner-1.9.2-noalsa-fixup.patch,
+  -files/137-bz460917_reload_new_plugins-gentoo-update-3.6.4.patch,
+  -icecat-3.6.9.ebuild, -icecat-3.6.9-r1.ebuild,
+  -files/801-enable-x86_64-tracemonkey.patch, -icecat-3.6.11.ebuild,
+  +icecat-3.6.13.ebuild, -files/fix_blocklist_support.patch:
+  Security bump (bug #348316). Removed old. No language packs availabe for
+  3.6.13 yet so we gonna use those from 3.6.12 meanwhile.
 
   28 Nov 2010; Brent Baude <ranger@gentoo.org> icecat-3.6.12.ebuild:
   Marking icecat-3.6.12 ppc64 for bug 342847
diff --git a/www-client/icecat/files/137-bz460917_reload_new_plugins-gentoo-update-3.6.4.patch b/www-client/icecat/files/137-bz460917_reload_new_plugins-gentoo-update-3.6.4.patch
deleted file mode 100644
index 5d0c93c3dea0..000000000000
--- a/www-client/icecat/files/137-bz460917_reload_new_plugins-gentoo-update-3.6.4.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-This patch has been ported to 3.6.4, may not be entirely correct.
-
-Original patch was from bmo 460917, att 350845
-
----
---- browser/base/content/browser.js
-+++ browser/base/content/browser.js
-@@ -6009,9 +6009,18 @@
-     var pluginInfo = getPluginInfo(aEvent.target);
-     missingPluginsArray[pluginInfo.mimetype] = pluginInfo;
- 
-+ 
-+    gBrowser.selectedBrowser.addEventListener("NewPluginInstalled",
-+                                              gMissingPluginInstaller.refreshBrowser,
-+                                              false);
-+ 
-     openDialog("chrome://mozapps/content/plugins/pluginInstallerWizard.xul",
-                "PFSWindow", "chrome,centerscreen,resizable=yes",
-                {plugins: missingPluginsArray, browser: gBrowser.selectedBrowser});
-+
-+    gBrowser.selectedBrowser.removeEventListener("NewPluginInstalled",
-+                                                 gMissingPluginInstaller.refreshBrowser,
-+                                                 false);
-   },
- 
-   // Callback for user clicking on a disabled plugin
-@@ -6107,11 +6116,19 @@
-     function showPluginsMissing() {
-       // get the urls of missing plugins
-       var missingPluginsArray = gBrowser.selectedBrowser.missingPlugins;
-+ 
-+    gBrowser.selectedBrowser.addEventListener("NewPluginInstalled",
-+                                              gMissingPluginInstaller.refreshBrowser,
-+                                              false);
-+ 
-       if (missingPluginsArray) {
-         window.openDialog("chrome://mozapps/content/plugins/pluginInstallerWizard.xul",
-                           "PFSWindow", "chrome,centerscreen,resizable=yes",
-                           {plugins: missingPluginsArray, browser: gBrowser.selectedBrowser});
-       }
-+    gBrowser.selectedBrowser.removeEventListener("NewPluginInstalled",
-+                                                 gMissingPluginInstaller.refreshBrowser,
-+                                                 false);
-     }
- 
-     if (aEvent.type == "PluginBlocklisted") {
-@@ -6442,6 +6459,13 @@
-       notificationBox.removeNotification(notification);
-     }
-     // reload the browser to make the new plugin show.
-+  
-+    // reload plugins
-+    var pm = Components.classes["@mozilla.org/plugin/manager;1"]
-+                 .getService(Components.interfaces.nsIPluginManager);
-+    pm.reloadPlugins(false);
-+  
-+    // ... and reload the browser to activate new plugins available
-     browser.reload();
-   }
- };
diff --git a/www-client/icecat/files/801-enable-x86_64-tracemonkey.patch b/www-client/icecat/files/801-enable-x86_64-tracemonkey.patch
deleted file mode 100644
index b72ad76b450e..000000000000
--- a/www-client/icecat/files/801-enable-x86_64-tracemonkey.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- js/src/configure.in.old	2009-11-08 19:50:54.299642792 -0500
-+++ js/src/configure.in	2009-11-08 19:57:49.235621814 -0500
-@@ -2465,6 +2465,10 @@
-     ENABLE_JIT=1
-     NANOJIT_ARCH=i386
-     ;;
-+x86_64*-*)
-+    ENABLE_JIT=1
-+    NANOJIT_ARCH=X64
-+    ;;
- arm*-*)
-     ENABLE_JIT=1
-     NANOJIT_ARCH=ARM
-@@ -2488,7 +2492,10 @@
- i?86-*)
-     AC_DEFINE(AVMPLUS_IA32)
-     ;;
--
-+x86_64*-*)
-+    AC_DEFINE(AVMPLUS_AMD64)
-+    AC_DEFINE(AVMPLUS_64BIT)
-+    ;;
- arm*-*)
-     AC_DEFINE(AVMPLUS_ARM)
-     ;;
diff --git a/www-client/icecat/files/fix_blocklist_support.patch b/www-client/icecat/files/fix_blocklist_support.patch
deleted file mode 100644
index a6d1bb196b75..000000000000
--- a/www-client/icecat/files/fix_blocklist_support.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-diff --git a/browser/app/blocklist.xml b/browser/app/blocklist.xml
---- a/browser/app/blocklist.xml
-+++ b/browser/app/blocklist.xml
-@@ -1,4 +1,4 @@
--<?xml version="1.0" encoding="UTF-8"?>
-+<?xml version="1.0"?>
- <blocklist xmlns="http://www.mozilla.org/2006/addons-blocklist">
-   <emItems>
-     <emItem id="fdm_ffext@freedownloadmanager.org">
-@@ -11,16 +11,38 @@
-     <emItem id="langpack-vi-VN@firefox.mozilla.org">
-       <versionRange minVersion="2.0" maxVersion="2.0"/>
-     </emItem>
-+    <emItem id="masterfiler@gmail.com">
-+      <versionRange severity="3"/>
-+    </emItem>
-     <emItem id="mozilla_cc@internetdownloadmanager.com">
-+      <versionRange minVersion=" " maxVersion="6.9.8">
-+        <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}">
-+           <versionRange minVersion="3.7a1pre" maxVersion="*"/>
-+        </targetApplication>
-+      </versionRange>
-       <versionRange minVersion="2.1" maxVersion="3.3">
-         <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}">
-            <versionRange minVersion="3.0a1" maxVersion="*"/>
-         </targetApplication>
-       </versionRange>
-     </emItem>
-+    <emItem id="personas@christopher.beard">
-+      <versionRange minVersion="1.6" maxVersion="1.6">
-+        <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}">
-+           <versionRange minVersion="3.6" maxVersion="3.6.*"/>
-+        </targetApplication>
-+      </versionRange>
-+    </emItem>
-     <emItem id="support@daemon-tools.cc">
-       <versionRange minVersion=" " maxVersion="1.0.0.5"/>
-     </emItem>
-+    <emItem id="yslow@yahoo-inc.com">
-+      <versionRange minVersion="2.0.5" maxVersion="2.0.5">
-+        <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}">
-+           <versionRange minVersion="3.5.7" maxVersion="*"/>
-+        </targetApplication>
-+      </versionRange>
-+    </emItem>
-     <emItem id="{2224e955-00e9-4613-a844-ce69fccaae91}"/>
-     <emItem id="{3f963a5b-e555-4543-90e2-c3908898db71}">
-       <versionRange minVersion=" " maxVersion="8.5"/>
-@@ -32,9 +54,11 @@
-         </targetApplication>
-       </versionRange>
-     </emItem>
-+    <emItem id="{8CE11043-9A15-4207-A565-0C94C42D590D}"/>
-     <emItem id="{B13721C7-F507-4982-B2E5-502A71474FED}">
-       <versionRange minVersion=" " maxVersion="3.3.0.3970" severity="1"/>
-     </emItem>
-+    <emItem id="{E8E88AB0-7182-11DF-904E-6045E0D72085}"/>
-   </emItems>
- <pluginItems>
-   <pluginItem>
-@@ -61,5 +85,24 @@
-     <versionRange>
-     </versionRange>
-   </pluginItem>
-+  <pluginItem>
-+    <match name="filename" exp="NPMySrch.dll"/>
-+    <versionRange>
-+    </versionRange>
-+  </pluginItem>
-+  <pluginItem>
-+    <match name="filename" exp="npViewpoint.dll"/>
-+    <versionRange>
-+      <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}">
-+        <versionRange minVersion="3.0" maxVersion="*"/>
-+      </targetApplication>
-+    </versionRange>
-+  </pluginItem>
-+  <pluginItem>
-+    <match name="name" exp="[0-6]\.0\.[01]\d{2}\.\d+"/>
-+    <match name="filename" exp="npdeploytk.dll"/>
-+    <versionRange severity="1">
-+    </versionRange>
-+  </pluginItem>
- </pluginItems>
--</blocklist>
-\ No newline at end of file
-+</blocklist>
-
-
-
-
-
diff --git a/www-client/icecat/files/xulrunner-1.9.2-noalsa-fixup.patch b/www-client/icecat/files/xulrunner-1.9.2-noalsa-fixup.patch
deleted file mode 100644
index 1fc7b6f87e65..000000000000
--- a/www-client/icecat/files/xulrunner-1.9.2-noalsa-fixup.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -urN mozilla-1.9.2-orig/content/base/src/nsDocument.cpp mozilla-1.9.2/content/base/src/nsDocument.cpp
---- mozilla-1.9.2-orig/content/base/src/nsDocument.cpp	2010-01-28 22:16:08.683135912 -0600
-+++ mozilla-1.9.2/content/base/src/nsDocument.cpp	2010-01-28 22:17:57.605126833 -0600
-@@ -169,7 +169,9 @@
- #include "nsIPropertyBag2.h"
- #include "nsIDOMPageTransitionEvent.h"
- #include "nsFrameLoader.h"
-+#ifdef MOZ_MEDIA
- #include "nsHTMLMediaElement.h"
-+#endif
- 
- #include "mozAutoDocUpdate.h"
- 
-diff -urN mozilla-1.9.2-orig/content/base/src/nsNodeUtils.cpp mozilla-1.9.2/content/base/src/nsNodeUtils.cpp
---- mozilla-1.9.2-orig/content/base/src/nsNodeUtils.cpp	2010-01-28 22:16:08.686138846 -0600
-+++ mozilla-1.9.2/content/base/src/nsNodeUtils.cpp	2010-01-28 22:17:14.618150370 -0600
-@@ -55,7 +55,9 @@
- #endif
- #include "nsBindingManager.h"
- #include "nsGenericHTMLElement.h"
-+#ifdef MOZ_MEDIA
- #include "nsHTMLMediaElement.h"
-+#endif
- 
- // This macro expects the ownerDocument of content_ to be in scope as
- // |nsIDocument* doc|
diff --git a/www-client/icecat/icecat-3.6.11.ebuild b/www-client/icecat/icecat-3.6.13.ebuild
index a1b4914a0eb9..4a627f5f87dd 100644
--- a/www-client/icecat/icecat-3.6.11.ebuild
+++ b/www-client/icecat/icecat-3.6.13.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/icecat/icecat-3.6.11.ebuild,v 1.4 2010/10/28 15:58:01 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/icecat/icecat-3.6.13.ebuild,v 1.1 2010/12/14 10:33:28 polynomial-c Exp $
 EAPI="3"
 WANT_AUTOCONF="2.1"
 
@@ -26,14 +26,15 @@ PATCH="${FIREFOX_PN}-3.6-patches-0.2"
 DESCRIPTION="GNU project's edition of Mozilla Firefox"
 HOMEPAGE="http://www.gnu.org/software/gnuzilla/"
 
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 SLOT="0"
 LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
 IUSE="+alsa +ipc java libnotify system-sqlite wifi"
 
-SRC_URI="mirror://gnu/gnuzilla/${MY_PV}/${PN}-${MY_PV}.tar.xz
+SRC_URI="mirror://gnu/gnuzilla/${MY_PV}/${PN}-${MY_PV}.tar.bz2
 	http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.bz2"
-LANGPACK_URI="http://gnuzilla.gnu.org/download/langpacks/${MY_PV}"
+#LANGPACK_URI="http://gnuzilla.gnu.org/download/langpacks/${MY_PV}"
+LANGPACK_URI="http://gnuzilla.gnu.org/download/langpacks/3.6.12"
 
 for X in ${LANGS} ; do
 	if [ "${X}" != "en" ] && [ "${X}" != "en-US" ]; then
diff --git a/www-client/icecat/icecat-3.6.9-r1.ebuild b/www-client/icecat/icecat-3.6.9-r1.ebuild
deleted file mode 100644
index ca998a8c4cf4..000000000000
--- a/www-client/icecat/icecat-3.6.9-r1.ebuild
+++ /dev/null
@@ -1,271 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/icecat/icecat-3.6.9-r1.ebuild,v 1.3 2010/10/13 00:11:37 anarchy Exp $
-EAPI="2"
-WANT_AUTOCONF="2.1"
-
-inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib pax-utils fdo-mime autotools mozextension java-pkg-opt-2
-
-LANGS="af ar as be bg bn-BD bn-IN ca cs cy da de el en en-GB en-US eo es-AR
-es-CL es-ES es-MX et eu fa fi fr fy-NL ga-IE gl gu-IN he hi-IN hr hu id is it ja
-ka kk kn ko ku lt lv mk ml mr nb-NO nl nn-NO oc or pa-IN pl pt-BR pt-PT rm ro
-ru si sk sl sq sr sv-SE ta te th tr uk vi zh-CN zh-TW"
-# Malformed install.rdf: ta-LK
-
-NOSHORTLANGS="en-GB es-AR es-CL es-MX pt-BR zh-CN zh-TW"
-
-MAJ_XUL_PV="1.9.2"
-MAJ_PV="${PV/_*/}" # Without the _rc and _beta stuff
-DESKTOP_PV="3.6"
-MY_PV="${PV/_rc/rc}" # Handle beta for SRC_URI
-XUL_PV="${MAJ_XUL_PV}${MAJ_PV/${DESKTOP_PV}/}" # Major + Minor version no.s
-FIREFOX_PN="firefox"
-FIREFOX_P="${FIREFOX_PN}-${PV}"
-PATCH="${FIREFOX_PN}-3.6-patches-0.2"
-
-DESCRIPTION="GNU project's edition of Mozilla Firefox"
-HOMEPAGE="http://www.gnu.org/software/gnuzilla/"
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-SLOT="0"
-LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
-IUSE="+alsa +ipc java libnotify system-sqlite wifi"
-
-SRC_URI="mirror://gnu/gnuzilla/${MY_PV}/${PN}-${MY_PV}.tar.bz2
-	http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.bz2"
-LANGPACK_URI="http://gnuzilla.gnu.org/download/langpacks/"
-
-for X in ${LANGS} ; do
-	if [ "${X}" != "en" ] && [ "${X}" != "en-US" ]; then
-		SRC_URI="${SRC_URI}
-			linguas_${X/-/_}? ( ${LANGPACK_URI}/${MY_PV}/${X}.xpi -> ${P}-${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%%-*}? ( ${LANGPACK_URI}/${MY_PV}/${X}.xpi -> ${P}-${X}.xpi )"
-		fi
-		IUSE="${IUSE} linguas_${X%%-*}"
-	fi
-done
-
-RDEPEND="
-	>=sys-devel/binutils-2.16.1
-	>=dev-libs/nss-3.12.7
-	>=dev-libs/nspr-4.8.6
-	>=app-text/hunspell-1.2
-	system-sqlite? ( >=dev-db/sqlite-3.6.22-r2[fts3,secure-delete] )
-	alsa? ( media-libs/alsa-lib )
-	>=x11-libs/cairo-1.8.8[X]
-	x11-libs/pango[X]
-	wifi? ( net-wireless/wireless-tools )
-	libnotify? ( >=x11-libs/libnotify-0.4 )
-	~net-libs/xulrunner-${XUL_PV}[ipc=,java=,wifi=,libnotify=,system-sqlite=]"
-
-DEPEND="${RDEPEND}
-	java? ( >=virtual/jdk-1.4 )
-	dev-util/pkgconfig"
-
-RDEPEND="${RDEPEND} java? ( >=virtual/jre-1.4 )"
-
-# This is a copy of the launcher program installed as part of xulrunner, so has
-# already been stripped. Bug #332071 for details.
-QA_PRESTRIPPED="usr/$(get_libdir)/${PN}/${PN}"
-
-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
-}
-
-pkg_setup() {
-	# Ensure we always build with C locale.
-	export LANG="C"
-	export LC_ALL="C"
-	export LC_MESSAGES="C"
-	export LC_CTYPE="C"
-
-	java-pkg-opt-2_pkg_setup
-}
-
-src_unpack() {
-	#xz -dc -- "${DISTDIR}/icecat-${MY_PV}.tar.xz" | tar xof - || die "failed to unpack"
-	unpack ${A} #${PATCH}.tar.bz2
-
-	linguas
-	for X in ${linguas}; do
-		# FIXME: Add support for unpacking xpis to portage
-		[[ ${X} != "en" ]] && xpi_unpack "${P}-${X}.xpi"
-	done
-}
-
-src_prepare() {
-	# Integrate rebranding
-	sed -i "s|/firefox|/icecat|" \
-		"${WORKDIR}"/001-firefox_gentoo_install_dirs.patch
-
-	# Fix preferences location
-	sed -i 's|defaults/pref/|defaults/preferences/|' browser/installer/packages-static || die "sed failed"
-
-	# Apply our patches
-	EPATCH_SUFFIX="patch" \
-	EPATCH_FORCE="yes" \
-	epatch "${WORKDIR}"
-
-	epatch "${FILESDIR}/fix_blocklist_support.patch"
-
-	# Fix rebranding
-	sed -i 's|\$(DIST)/bin/firefox|\$(DIST)/bin/icecat|' browser/app/Makefile.in
-
-	eautoreconf
-
-	cd js/src
-	eautoreconf
-}
-
-src_configure() {
-	# We will build our own .mozconfig
-	rm "${S}"/.mozconfig
-
-	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"
-
-	# Specific settings for icecat
-	echo "export MOZ_PHOENIX=1" >> "${S}"/.mozconfig
-	echo "mk_add_options MOZ_PHOENIX=1" "${S}"/.mozconfig
-	mozconfig_annotate '' --with-branding=browser/branding/unofficial
-	mozconfig_annotate '' --disable-official-branding
-	mozconfig_annotate '' --with-user-appdir=.icecat
-
-	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
-	mozconfig_annotate '' --enable-application=browser
-	mozconfig_annotate '' --disable-mailnews
-	mozconfig_annotate 'broken' --disable-crashreporter
-	mozconfig_annotate '' --enable-image-encoder=all
-	mozconfig_annotate '' --enable-canvas
-	mozconfig_annotate 'gtk' --enable-default-toolkit=cairo-gtk2
-	# Bug 60668: Galeon doesn't build without oji enabled, so enable it
-	# regardless of java setting.
-	mozconfig_annotate '' --enable-oji --enable-mathml
-	mozconfig_annotate 'places' --enable-storage --enable-places
-	mozconfig_annotate '' --enable-safe-browsing
-
-	# Build mozdevelop permately
-	mozconfig_annotate ''  --enable-jsd --enable-xpctools
-
-	# System-wide install specs
-	mozconfig_annotate '' --disable-installer
-	mozconfig_annotate '' --disable-updater
-	mozconfig_annotate '' --disable-strip
-	mozconfig_annotate '' --disable-install-strip
-
-	# Use system libraries
-	mozconfig_annotate '' --enable-system-cairo
-	mozconfig_annotate '' --enable-system-hunspell
-	mozconfig_annotate '' --with-system-nspr
-	mozconfig_annotate '' --with-system-nss
-	mozconfig_annotate '' --with-system-bz2
-	mozconfig_annotate '' --with-system-libxul
-	mozconfig_annotate '' --with-libxul-sdk=/usr/$(get_libdir)/xulrunner-devel-${MAJ_XUL_PV}
-
-	mozconfig_use_enable ipc # +ipc, upstream default
-	mozconfig_use_enable libnotify
-	mozconfig_use_enable java javaxpcom
-	mozconfig_use_enable wifi necko-wifi
-	mozconfig_use_enable alsa ogg
-	mozconfig_use_enable alsa wave
-	mozconfig_use_enable system-sqlite
-
-	# Other browser-specific settings
-	mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
-
-	# Finalize and report settings
-	mozconfig_final
-
-	if [[ $(gcc-major-version) -lt 4 ]]; then
-		append-cxxflags -fno-stack-protector
-	fi
-
-	####################################
-	#
-	#  Configure and build
-	#
-	####################################
-
-	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" econf
-}
-
-src_compile() {
-	# Should the build use multiprocessing? Not enabled by default, as it tends to break
-	[ "${WANT_MP}" = "true" ] && jobs=${MAKEOPTS} || jobs="-j1"
-	emake ${jobs} || die
-}
-
-src_install() {
-	MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
-
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	linguas
-	for X in ${linguas}; do
-		[[ ${X} != "en" ]] && xpi_install "${WORKDIR}"/"${P}-${X}"
-	done
-
-	# Install icon and .desktop for menu entry
-	newicon "${S}"/browser/branding/unofficial/default48.png icecat-icon.png
-	newmenu "${FILESDIR}"/icon/icecat.desktop ${PN}-${DESKTOP_PV}.desktop
-
-	# Add StartupNotify=true bug 237317
-	if use startup-notification ; then
-		echo "StartupNotify=true" >> "${D}"/usr/share/applications/${PN}-${DESKTOP_PV}.desktop
-	fi
-
-	pax-mark m "${D}"/${MOZILLA_FIVE_HOME}/${PN}
-
-	# Enable very specific settings not inherited from xulrunner
-	cp "${FILESDIR}"/firefox-default-prefs.js \
-		"${D}/${MOZILLA_FIVE_HOME}/defaults/preferences/all-gentoo.js" || \
-		die "failed to cp icecat-default-prefs.js"
-	# Plugins dir
-	dosym ../nsbrowser/plugins "${MOZILLA_FIVE_HOME}"/plugins \
-		|| die "failed to symlink"
-}
-
-pkg_postinst() {
-	ewarn "All the packages built against ${PN} won't compile,"
-	ewarn "any package that fails to build warrants a bug report."
-	elog
-
-	# Update mimedb for the new .desktop file
-	fdo-mime_desktop_database_update
-}
diff --git a/www-client/icecat/icecat-3.6.9.ebuild b/www-client/icecat/icecat-3.6.9.ebuild
deleted file mode 100644
index dcd1743cd88b..000000000000
--- a/www-client/icecat/icecat-3.6.9.ebuild
+++ /dev/null
@@ -1,269 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/icecat/icecat-3.6.9.ebuild,v 1.9 2010/10/13 00:11:37 anarchy Exp $
-EAPI="2"
-WANT_AUTOCONF="2.1"
-
-inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib pax-utils fdo-mime autotools mozextension java-pkg-opt-2
-
-LANGS="af ar as be bg bn-BD bn-IN ca cs cy da de el en en-GB en-US eo es-AR
-es-CL es-ES es-MX et eu fa fi fr fy-NL ga-IE gl gu-IN he hi-IN hr hu id is it ja
-ka kk kn ko ku lt lv mk ml mr nb-NO nl nn-NO oc or pa-IN pl pt-BR pt-PT rm ro
-ru si sk sl sq sr sv-SE ta te th tr uk vi zh-CN zh-TW"
-# Malformed install.rdf: ta-LK
-
-NOSHORTLANGS="en-GB es-AR es-CL es-MX pt-BR zh-CN zh-TW"
-
-MAJ_XUL_PV="1.9.2"
-MAJ_PV="${PV/_*/}" # Without the _rc and _beta stuff
-DESKTOP_PV="3.6"
-MY_PV="${PV/_rc/rc}" # Handle beta for SRC_URI
-XUL_PV="${MAJ_XUL_PV}${MAJ_PV/${DESKTOP_PV}/}" # Major + Minor version no.s
-FIREFOX_PN="firefox"
-FIREFOX_P="${FIREFOX_PN}-${PV}"
-PATCH="${FIREFOX_PN}-3.6-patches-0.2"
-
-DESCRIPTION="GNU project's edition of Mozilla Firefox"
-HOMEPAGE="http://www.gnu.org/software/gnuzilla/"
-
-KEYWORDS="amd64 ppc ppc64 x86"
-SLOT="0"
-LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
-IUSE="+alsa +ipc java libnotify system-sqlite wifi"
-
-SRC_URI="mirror://gnu/gnuzilla/${MY_PV}/${PN}-${MY_PV}.tar.bz2
-	http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.bz2"
-LANGPACK_URI="http://gnuzilla.gnu.org/download/langpacks/"
-
-for X in ${LANGS} ; do
-	if [ "${X}" != "en" ] && [ "${X}" != "en-US" ]; then
-		SRC_URI="${SRC_URI}
-			linguas_${X/-/_}? ( ${LANGPACK_URI}/${MY_PV}/${X}.xpi -> ${P}-${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%%-*}? ( ${LANGPACK_URI}/${MY_PV}/${X}.xpi -> ${P}-${X}.xpi )"
-		fi
-		IUSE="${IUSE} linguas_${X%%-*}"
-	fi
-done
-
-RDEPEND="
-	>=sys-devel/binutils-2.16.1
-	>=dev-libs/nss-3.12.7
-	>=dev-libs/nspr-4.8.6
-	>=app-text/hunspell-1.2
-	system-sqlite? ( >=dev-db/sqlite-3.6.22-r2[fts3,secure-delete] )
-	alsa? ( media-libs/alsa-lib )
-	>=x11-libs/cairo-1.8.8[X]
-	x11-libs/pango[X]
-	wifi? ( net-wireless/wireless-tools )
-	libnotify? ( >=x11-libs/libnotify-0.4 )
-	~net-libs/xulrunner-${XUL_PV}[ipc=,java=,wifi=,libnotify=,system-sqlite=]"
-
-DEPEND="${RDEPEND}
-	java? ( >=virtual/jdk-1.4 )
-	dev-util/pkgconfig"
-
-RDEPEND="${RDEPEND} java? ( >=virtual/jre-1.4 )"
-
-# This is a copy of the launcher program installed as part of xulrunner, so has
-# already been stripped. Bug #332071 for details.
-QA_PRESTRIPPED="usr/$(get_libdir)/${PN}/${PN}"
-
-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
-}
-
-pkg_setup() {
-	# Ensure we always build with C locale.
-	export LANG="C"
-	export LC_ALL="C"
-	export LC_MESSAGES="C"
-	export LC_CTYPE="C"
-
-	java-pkg-opt-2_pkg_setup
-}
-
-src_unpack() {
-	#xz -dc -- "${DISTDIR}/icecat-${MY_PV}.tar.xz" | tar xof - || die "failed to unpack"
-	unpack ${A} #${PATCH}.tar.bz2
-
-	linguas
-	for X in ${linguas}; do
-		# FIXME: Add support for unpacking xpis to portage
-		[[ ${X} != "en" ]] && xpi_unpack "${P}-${X}.xpi"
-	done
-}
-
-src_prepare() {
-	# Integrate rebranding
-	sed -i "s|/firefox|/icecat|" \
-		"${WORKDIR}"/001-firefox_gentoo_install_dirs.patch
-
-	# Fix preferences location
-	sed -i 's|defaults/pref/|defaults/preferences/|' browser/installer/packages-static || die "sed failed"
-
-	# Apply our patches
-	EPATCH_SUFFIX="patch" \
-	EPATCH_FORCE="yes" \
-	epatch "${WORKDIR}"
-
-	# Fix rebranding
-	sed -i 's|\$(DIST)/bin/firefox|\$(DIST)/bin/icecat|' browser/app/Makefile.in
-
-	eautoreconf
-
-	cd js/src
-	eautoreconf
-}
-
-src_configure() {
-	# We will build our own .mozconfig
-	rm "${S}"/.mozconfig
-
-	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"
-
-	# Specific settings for icecat
-	echo "export MOZ_PHOENIX=1" >> "${S}"/.mozconfig
-	echo "mk_add_options MOZ_PHOENIX=1" "${S}"/.mozconfig
-	mozconfig_annotate '' --with-branding=browser/branding/unofficial
-	mozconfig_annotate '' --disable-official-branding
-	mozconfig_annotate '' --with-user-appdir=.icecat
-
-	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
-	mozconfig_annotate '' --enable-application=browser
-	mozconfig_annotate '' --disable-mailnews
-	mozconfig_annotate 'broken' --disable-crashreporter
-	mozconfig_annotate '' --enable-image-encoder=all
-	mozconfig_annotate '' --enable-canvas
-	mozconfig_annotate 'gtk' --enable-default-toolkit=cairo-gtk2
-	# Bug 60668: Galeon doesn't build without oji enabled, so enable it
-	# regardless of java setting.
-	mozconfig_annotate '' --enable-oji --enable-mathml
-	mozconfig_annotate 'places' --enable-storage --enable-places
-	mozconfig_annotate '' --enable-safe-browsing
-
-	# Build mozdevelop permately
-	mozconfig_annotate ''  --enable-jsd --enable-xpctools
-
-	# System-wide install specs
-	mozconfig_annotate '' --disable-installer
-	mozconfig_annotate '' --disable-updater
-	mozconfig_annotate '' --disable-strip
-	mozconfig_annotate '' --disable-install-strip
-
-	# Use system libraries
-	mozconfig_annotate '' --enable-system-cairo
-	mozconfig_annotate '' --enable-system-hunspell
-	mozconfig_annotate '' --with-system-nspr
-	mozconfig_annotate '' --with-system-nss
-	mozconfig_annotate '' --with-system-bz2
-	mozconfig_annotate '' --with-system-libxul
-	mozconfig_annotate '' --with-libxul-sdk=/usr/$(get_libdir)/xulrunner-devel-${MAJ_XUL_PV}
-
-	mozconfig_use_enable ipc # +ipc, upstream default
-	mozconfig_use_enable libnotify
-	mozconfig_use_enable java javaxpcom
-	mozconfig_use_enable wifi necko-wifi
-	mozconfig_use_enable alsa ogg
-	mozconfig_use_enable alsa wave
-	mozconfig_use_enable system-sqlite
-
-	# Other browser-specific settings
-	mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
-
-	# Finalize and report settings
-	mozconfig_final
-
-	if [[ $(gcc-major-version) -lt 4 ]]; then
-		append-cxxflags -fno-stack-protector
-	fi
-
-	####################################
-	#
-	#  Configure and build
-	#
-	####################################
-
-	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" econf
-}
-
-src_compile() {
-	# Should the build use multiprocessing? Not enabled by default, as it tends to break
-	[ "${WANT_MP}" = "true" ] && jobs=${MAKEOPTS} || jobs="-j1"
-	emake ${jobs} || die
-}
-
-src_install() {
-	MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
-
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	linguas
-	for X in ${linguas}; do
-		[[ ${X} != "en" ]] && xpi_install "${WORKDIR}"/"${P}-${X}"
-	done
-
-	# Install icon and .desktop for menu entry
-	newicon "${S}"/browser/branding/unofficial/default48.png icecat-icon.png
-	newmenu "${FILESDIR}"/icon/icecat.desktop ${PN}-${DESKTOP_PV}.desktop
-
-	# Add StartupNotify=true bug 237317
-	if use startup-notification ; then
-		echo "StartupNotify=true" >> "${D}"/usr/share/applications/${PN}-${DESKTOP_PV}.desktop
-	fi
-
-	pax-mark m "${D}"/${MOZILLA_FIVE_HOME}/${PN}
-
-	# Enable very specific settings not inherited from xulrunner
-	cp "${FILESDIR}"/firefox-default-prefs.js \
-		"${D}/${MOZILLA_FIVE_HOME}/defaults/preferences/all-gentoo.js" || \
-		die "failed to cp icecat-default-prefs.js"
-	# Plugins dir
-	dosym ../nsbrowser/plugins "${MOZILLA_FIVE_HOME}"/plugins \
-		|| die "failed to symlink"
-}
-
-pkg_postinst() {
-	ewarn "All the packages built against ${PN} won't compile,"
-	ewarn "any package that fails to build warrants a bug report."
-	elog
-
-	# Update mimedb for the new .desktop file
-	fdo-mime_desktop_database_update
-}