Drop old firefox, xulrunner ebuild no more works with portage.

26 files changed, 0 insertions, 2249 deletions

diff --git a/net-libs/xulrunner/Manifest b/net-libs/xulrunner/Manifest
deleted file mode 100644
index da6879a..0000000
--- a/net-libs/xulrunner/Manifest
+++ /dev/null
@@ -1,14 +0,0 @@
-AUX arm-bug-644136.patch 472 RMD160 bda46fa7a4ca306ebfa3455d90c6e54a3f0d97e1 SHA1 f2eb5ab3ce793fc7d8c30d9f9db6be3a714f5c16 SHA256 3152f9c5b3f9cd75caf522e71d4105be8fbcc4def3e2f4162663799d78e03511
-AUX bug-606109.patch 1243 RMD160 ec262eed0480d8a13c914c4781329e3ea1c23b0f SHA1 0c0cc40ee0a663422b107cc3ae5d1412b8c45ac7 SHA256 266d9c7218cc04c3badadc54f8f31b1238326b9c3052aed057ffce40c69541dc
-AUX bug-626229.patch 4172 RMD160 d7ae0bc768b6951c249d640d7f0c079cd46f3adb SHA1 bd5d649948e0cb3a662bfa35f9ce6f1f60653067 SHA256 c61d16a56bcc7e333e8f47662d1ad9bc8468806bbf9d76c500d666bf645c1ddc
-AUX esr10.4 1701 RMD160 167b397bdf5cf21977cec1ef7f9f709346b3345e SHA1 88f0d7fbec21f61f9320cdf49ab7fd2c8f293f9a SHA256 65621c48364f5f1f2aa7d4525689c6c66ca9bb7034e43a9c500bea7d28188596
-AUX fix-animated-gifs.patch 7789 RMD160 a8889110a2daea27e07f92a70df6cb1e39e05546 SHA1 05b335feeefff4f06004a20182f821d998b44879 SHA256 6d85d3c103b0dcdbb073302a4041a37bea97c715384d04d299c1fb49a5da7443
-AUX libnotify-0.7.patch 1777 RMD160 1669210dd704fd4cb84be3fbb8ced8bd10133abb SHA1 981a0cf66608e1b441c21db73a7203711de56fe0 SHA256 153d129004e63baca57182ce2ec381a9103feef9e5fbdf631339bce25cde9489
-AUX mozilla-2.0_arm_respect_cflags.patch 3333 RMD160 d5f8b428a5a9cb0938e99666ac66d2abf3156b9b SHA1 17a5807b5f26a54ba80be7d0b64fbeb6d050364b SHA256 fb92269bcd700b257133875d5ecba063e99f33235282b251d4bb0eb37a73ba8f
-AUX mozilla-2.0_support_64bit_big_endian.patch 1668 RMD160 1013dbd09d7956162351f5209eb77f08d83d9a12 SHA1 83423a47c016bdefdac562c8d606868eb81d9e62 SHA256 041ffa768a680293f97b325573a91a2c63841cd25648294e7989fcfcaedc70f2
-AUX xulrunner-1.9.2-gtk+-2.21.patch 663 RMD160 20e2465da0e6c884527fd7cfebd3bdb2f8f015a9 SHA1 f2b9c26ed255bde672ccc8cb7ae4ae014f52d6f5 SHA256 79c11dc4304d748f3c2d6e451aa6d44dd1bb450d1db671e7fa4a83420c6f2c05
-AUX xulrunner-default-prefs.js 677 RMD160 73ec130da332c1d6517a6f838d5fab0cc134289a SHA1 b9efc3ef5e95ad3081f6b68d771e32e848b4b9ac SHA256 53493080276f221f1619153c114caf268206a6fa107972b33a4eb7f1c1cf6fe8
-DIST firefox-3.6.28.source.tar.bz2 51698958 RMD160 87cfca8e3f1df30e06eccffbf994825904eeedbc SHA1 adeaa9bdd367878c5b522766e681798178e31577 SHA256 a6c4bc52095194428cf3b17341b68ac473b7654984000c45d1be3eae55d78260
-DIST xulrunner-1.9.2-patches-0.9.tar.bz2 15320 RMD160 2dfb86650c0a9a1f0c5bf86df7434c7c286658d6 SHA1 a2276c708eec2e92611ac1e7a2eaf25c39263d30 SHA256 5cca685442f1ab920eb1ba86719a38a437ae05bd5cefc42ababc2556425ebf5a
-EBUILD xulrunner-1.9.2.28-r1.ebuild 8671 RMD160 285002c5bac3ec9b2940c4c8c5d7b7b1ecd52609 SHA1 5c424e767eb69bb5666ea81eebcb015b5f10dd27 SHA256 82ee825601309175528ede2af3c274673d18c0f67bb2d787e27f38890b96bd36
-EBUILD xulrunner-1.9.2.28.ebuild 8641 RMD160 ee844d4c0a91472938d67726688426e7eea2935a SHA1 bbf20a8058c2ac9e041e7ef14d9d9e80a9b73d28 SHA256 4c247917fa43fdbec753f407ea5098db7eca799b51f7cc240be0a614fbb93a91
diff --git a/net-libs/xulrunner/files/arm-bug-644136.patch b/net-libs/xulrunner/files/arm-bug-644136.patch
deleted file mode 100644
index 4183f74..0000000
--- a/net-libs/xulrunner/files/arm-bug-644136.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -r 4e4c7457e8f7 js/src/ctypes/libffi/src/arm/sysv.S
---- a/js/src/ctypes/libffi/src/arm/sysv.S	Sat Apr 02 11:48:22 2011 -0400
-+++ b/js/src/ctypes/libffi/src/arm/sysv.S	Sun Apr 03 04:55:15 2011 +0300
-@@ -229,6 +229,10 @@
-         .size    CNAME(ffi_call_SYSV),.ffi_call_SYSV_end-CNAME(ffi_call_SYSV)
- 
- 
-+/* Below are VFP hard-float ABI call and closure implementations.
-+   Add VFP FPU directive here. */
-+	.fpu	vfp
-+
- 	@ r0:   fn
- 	@ r1:   &ecif
- 	@ r2:   cif->bytes
diff --git a/net-libs/xulrunner/files/bug-606109.patch b/net-libs/xulrunner/files/bug-606109.patch
deleted file mode 100644
index 93f1142..0000000
--- a/net-libs/xulrunner/files/bug-606109.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-# HG changeset patch
-# User Jory A. Pratt <anarchy@gentoo.org>
-# Parent 74e4421e0a30c6e21b594675e32a8d9d663c309c
-Add missing ifde MOZ_MEDIA
-
-diff --git a/content/base/src/nsContentSink.cpp b/content/base/src/nsContentSink.cpp
---- a/content/base/src/nsContentSink.cpp
-+++ b/content/base/src/nsContentSink.cpp
-@@ -1860,17 +1860,19 @@ nsIAtom** const kDefaultAllowedTags [] =
-   &nsGkAtoms::nobr,
-   &nsGkAtoms::noscript,
-   &nsGkAtoms::ol,
-   &nsGkAtoms::optgroup,
-   &nsGkAtoms::option,
-   &nsGkAtoms::output,
-   &nsGkAtoms::p,
-   &nsGkAtoms::pre,
-+#ifdef MOZ_MEDIA
-   &nsGkAtoms::progress,
-+#endif
-   &nsGkAtoms::q,
-   &nsGkAtoms::rp,
-   &nsGkAtoms::rt,
-   &nsGkAtoms::ruby,
-   &nsGkAtoms::s,
-   &nsGkAtoms::samp,
-   &nsGkAtoms::section,
-   &nsGkAtoms::select,
-@@ -1952,17 +1954,19 @@ nsIAtom** const kDefaultAllowedAttribute
-   &nsGkAtoms::itemref,
-   &nsGkAtoms::itemscope,
-   &nsGkAtoms::itemtype,
-   &nsGkAtoms::kind,
-   &nsGkAtoms::label,
-   &nsGkAtoms::lang,
-   &nsGkAtoms::list,
-   &nsGkAtoms::longdesc,
-+#ifdef MOZ_MEDIA
-   &nsGkAtoms::loop,
-+#endif
-   &nsGkAtoms::low,
-   &nsGkAtoms::max,
-   &nsGkAtoms::maxlength,
-   &nsGkAtoms::media,
-   &nsGkAtoms::min,
-   &nsGkAtoms::mozdonotsend,
-   &nsGkAtoms::method,
-   &nsGkAtoms::multiple,
diff --git a/net-libs/xulrunner/files/bug-626229.patch b/net-libs/xulrunner/files/bug-626229.patch
deleted file mode 100644
index 27ee417..0000000
--- a/net-libs/xulrunner/files/bug-626229.patch
+++ /dev/null
@@ -1,177 +0,0 @@
-diff --git a/dom/ipc/ContentChild.cpp b/dom/ipc/ContentChild.cpp
---- a/dom/ipc/ContentChild.cpp
-+++ b/dom/ipc/ContentChild.cpp
-@@ -43,27 +43,31 @@
- 
- #ifdef MOZ_WIDGET_QT
- #include "nsQAppInstance.h"
- #endif
- 
- #include "ContentChild.h"
- #include "CrashReporterChild.h"
- #include "TabChild.h"
-+#if defined(MOZ_SYDNEYAUDIO)
- #include "AudioChild.h"
-+#endif
- 
- #include "mozilla/ipc/TestShellChild.h"
- #include "mozilla/net/NeckoChild.h"
- #include "mozilla/ipc/XPCShellEnvironment.h"
- #include "mozilla/jsipc/PContextWrapperChild.h"
- #include "mozilla/dom/ExternalHelperAppChild.h"
- #include "mozilla/dom/StorageChild.h"
- #include "mozilla/dom/PCrashReporterChild.h"
- 
-+#if defined(MOZ_SYDNEYAUDIO)
- #include "nsAudioStream.h"
-+#endif
- #include "nsIMemoryReporter.h"
- #include "nsIObserverService.h"
- #include "nsTObserverArray.h"
- #include "nsIObserver.h"
- #include "nsIPrefService.h"
- #include "nsServiceManagerUtils.h"
- #include "nsXULAppAPI.h"
- #include "nsWeakReference.h"
-@@ -379,26 +383,32 @@ ContentChild::RecvPTestShellConstructor(
-     return true;
- }
- 
- PAudioChild*
- ContentChild::AllocPAudio(const PRInt32& numChannels,
-                           const PRInt32& rate,
-                           const PRInt32& format)
- {
-+#if defined(MOZ_SYDNEYAUDIO)
-     AudioChild *child = new AudioChild();
-     NS_ADDREF(child);
-     return child;
-+#else
-+    return nsnull;
-+#endif
- }
- 
- bool
- ContentChild::DeallocPAudio(PAudioChild* doomed)
- {
-+#if defined(MOZ_SYDNEYAUDIO)
-     AudioChild *child = static_cast<AudioChild*>(doomed);
-     NS_RELEASE(child);
-+#endif
-     return true;
- }
- 
- PNeckoChild* 
- ContentChild::AllocPNecko()
- {
-     return new NeckoChild();
- }
-diff --git a/dom/ipc/ContentParent.cpp b/dom/ipc/ContentParent.cpp
---- a/dom/ipc/ContentParent.cpp
-+++ b/dom/ipc/ContentParent.cpp
-@@ -63,17 +63,19 @@
- #include "nsCExternalHandlerService.h"
- #include "nsFrameMessageManager.h"
- #include "nsIAlertsService.h"
- #include "nsToolkitCompsCID.h"
- #include "nsIDOMGeoGeolocation.h"
- #include "nsIConsoleService.h"
- #include "nsIScriptError.h"
- #include "nsConsoleMessage.h"
-+#if defined(MOZ_SYDNEYAUDIO)
- #include "AudioParent.h"
-+#endif
- 
- #if defined(ANDROID) || defined(LINUX)
- #include <sys/time.h>
- #include <sys/resource.h>
- #endif
- 
- #ifdef MOZ_PERMISSIONS
- #include "nsPermissionManager.h"
-@@ -682,26 +684,32 @@ ContentParent::DeallocPTestShell(PTestSh
-   return true;
- }
-  
- PAudioParent*
- ContentParent::AllocPAudio(const PRInt32& numChannels,
-                            const PRInt32& rate,
-                            const PRInt32& format)
- {
-+#if defined(MOZ_SYDNEYAUDIO)
-     AudioParent *parent = new AudioParent(numChannels, rate, format);
-     NS_ADDREF(parent);
-     return parent;
-+#else
-+    return nsnull;
-+#endif
- }
- 
- bool
- ContentParent::DeallocPAudio(PAudioParent* doomed)
- {
-+#if defined(MOZ_SYDNEYAUDIO)
-     AudioParent *parent = static_cast<AudioParent*>(doomed);
-     NS_RELEASE(parent);
-+#endif
-     return true;
- }
- 
- PNeckoParent* 
- ContentParent::AllocPNecko()
- {
-     return new NeckoParent();
- }
-diff --git a/dom/ipc/Makefile.in b/dom/ipc/Makefile.in
---- a/dom/ipc/Makefile.in
-+++ b/dom/ipc/Makefile.in
-@@ -51,38 +51,45 @@ DIRS = tests
- DIRS = tests
- endif
- 
- EXPORTS = TabMessageUtils.h PCOMContentPermissionRequestChild.h
- 
- EXPORTS_NAMESPACES = mozilla/dom
- 
- EXPORTS_mozilla/dom = \
--  AudioChild.h \
--  AudioParent.h \
-   ContentChild.h \
-   ContentParent.h \
-   ContentProcess.h \
-   CrashReporterChild.h \
-   CrashReporterParent.h \
-   TabParent.h \
-   TabChild.h \
-   $(NULL)
- 
- CPPSRCS = \
--  AudioChild.cpp \
--  AudioParent.cpp \
-   ContentProcess.cpp \
-   ContentParent.cpp \
-   ContentChild.cpp \
-   CrashReporterParent.cpp \
-   TabParent.cpp \
-   TabChild.cpp \
-   TabMessageUtils.cpp \
-   $(NULL)
-+
-+ifdef MOZ_SYDNEYAUDIO
-+EXPORTS_mozilla/dom += \
-+  AudioChild.h \
-+  AudioParent.h \
-+  $(NULL)
-+CPPSRCS += \
-+  AudioChild.cpp \
-+  AudioParent.cpp \
-+  $(NULL)
-+endif
- 
- include $(topsrcdir)/config/config.mk
- include $(topsrcdir)/ipc/chromium/chromium-config.mk
- include $(topsrcdir)/config/rules.mk
- 
- LOCAL_INCLUDES += \
- 		-I$(srcdir)/../../content/base/src \
- 		-I$(srcdir)/../../content/events/src \
diff --git a/net-libs/xulrunner/files/esr10.4 b/net-libs/xulrunner/files/esr10.4
deleted file mode 100644
index 292d150..0000000
--- a/net-libs/xulrunner/files/esr10.4
+++ /dev/null
@@ -1,54 +0,0 @@
-
-# HG changeset patch
-# User Mats Palmgren <matspal@gmail.com>
-# Date 1333489933 -7200
-# Node ID 076f467733b45aa2e058a3d2318d2eb956b449b3
-# Parent  f66c6b1c5ee647a22acf29b357bbf4284c6f7d55
-Bug 732941 - Deal with OOM when copying nsCOMArray.  r=bz a=akeybl
-
-diff --git a/layout/generic/nsSelection.cpp b/layout/generic/nsSelection.cpp
---- a/layout/generic/nsSelection.cpp
-+++ b/layout/generic/nsSelection.cpp
-@@ -5727,34 +5727,33 @@ nsTypedSelection::RemoveSelectionListene
- 
- 
- nsresult
- nsTypedSelection::NotifySelectionListeners()
- {
-   if (!mFrameSelection)
-     return NS_OK;//nothing to do
-  
--  if (mFrameSelection->GetBatching()){
-+  if (mFrameSelection->GetBatching()) {
-     mFrameSelection->SetDirty();
-     return NS_OK;
-   }
--  PRInt32 cnt = mSelectionListeners.Count();
-   nsCOMArray<nsISelectionListener> selectionListeners(mSelectionListeners);
--  
-+  PRInt32 cnt = selectionListeners.Count();
-+  if (cnt != mSelectionListeners.Count()) {
-+    return NS_ERROR_OUT_OF_MEMORY;  // nsCOMArray is fallible
-+  }
-   nsCOMPtr<nsIDOMDocument> domdoc;
-   nsCOMPtr<nsIPresShell> shell;
-   nsresult rv = GetPresShell(getter_AddRefs(shell));
-   if (NS_SUCCEEDED(rv) && shell)
-     domdoc = do_QueryInterface(shell->GetDocument());
-   short reason = mFrameSelection->PopReason();
--  for (PRInt32 i = 0; i < cnt; i++)
--  {
--    nsISelectionListener* thisListener = selectionListeners[i];
--    if (thisListener)
--      thisListener->NotifySelectionChanged(domdoc, this, reason);
-+  for (PRInt32 i = 0; i < cnt; i++) {
-+    selectionListeners[i]->NotifySelectionChanged(domdoc, this, reason);
-   }
-   return NS_OK;
- }
- 
- NS_IMETHODIMP
- nsTypedSelection::StartBatchChanges()
- {
-   if (mFrameSelection)
-
diff --git a/net-libs/xulrunner/files/fix-animated-gifs.patch b/net-libs/xulrunner/files/fix-animated-gifs.patch
deleted file mode 100644
index 58b994c..0000000
--- a/net-libs/xulrunner/files/fix-animated-gifs.patch
+++ /dev/null
@@ -1,246 +0,0 @@
-# HG changeset patch
-# User Rafał Mużyło <galtgendo@o2.pl>
-# Parent 69e253891ca3839b6d4b8f5cb7c0e6950bb66902
-Fix animated gif flickering bug 597174
-
-diff --git a/modules/libpr0n/decoders/gif/nsGIFDecoder2.cpp b/modules/libpr0n/decoders/gif/nsGIFDecoder2.cpp
---- a/modules/libpr0n/decoders/gif/nsGIFDecoder2.cpp
-+++ b/modules/libpr0n/decoders/gif/nsGIFDecoder2.cpp
-@@ -197,30 +197,29 @@ static NS_METHOD ReadDataOut(nsIInputStr
- }
- 
- // Push any new rows according to mCurrentPass/mLastFlushedPass and
- // mCurrentRow/mLastFlushedRow.  Note: caller is responsible for
- // updating mlastFlushed{Row,Pass}.
- nsresult
- nsGIFDecoder2::FlushImageData(PRUint32 fromRow, PRUint32 rows)
- {
--  nsIntRect r(0, fromRow, mGIFStruct.width, rows);
-+  nsIntRect r(mGIFStruct.x_offset, mGIFStruct.y_offset + fromRow, mGIFStruct.width, rows);
- 
-   // Update image  
-   nsresult rv = mImageContainer->FrameUpdated(mGIFStruct.images_decoded, r);
-   if (NS_FAILED(rv)) {
-     return rv;
-   }
- 
-   // Offset to the frame position
-   // Only notify observer(s) for first frame
-   if (!mGIFStruct.images_decoded && mObserver) {
-     PRUint32 imgCurFrame;
-     mImageContainer->GetCurrentFrameIndex(&imgCurFrame);
--    r.y += mGIFStruct.y_offset;
-     mObserver->OnDataAvailable(nsnull, imgCurFrame == PRUint32(mGIFStruct.images_decoded), &r);
-   }
-   return NS_OK;
- }
- 
- nsresult
- nsGIFDecoder2::FlushImageData()
- {
-diff --git a/modules/libpr0n/src/imgContainer.cpp b/modules/libpr0n/src/imgContainer.cpp
---- a/modules/libpr0n/src/imgContainer.cpp
-+++ b/modules/libpr0n/src/imgContainer.cpp
-@@ -415,16 +415,18 @@ nsresult imgContainer::InternalAddFrameH
- 
-   nsAutoPtr<imgFrame> frame(aFrame);
- 
-   if (paletteData && paletteLength)
-     frame->GetPaletteData(paletteData, paletteLength);
- 
-   frame->GetImageData(imageData, imageLength);
- 
-+  frame->LockImageData();
-+
-   mFrames.InsertElementAt(framenum, frame.forget());
-   mNumFrames++;
- 
-   return NS_OK;
- }
-                                   
- nsresult imgContainer::InternalAddFrame(PRUint32 framenum,
-                                         PRInt32 aX, PRInt32 aY,
-@@ -440,16 +442,21 @@ nsresult imgContainer::InternalAddFrame(
-     return NS_ERROR_INVALID_ARG;
- 
-   nsAutoPtr<imgFrame> frame(new imgFrame());
-   NS_ENSURE_TRUE(frame, NS_ERROR_OUT_OF_MEMORY);
- 
-   nsresult rv = frame->Init(aX, aY, aWidth, aHeight, aFormat, aPaletteDepth);
-   NS_ENSURE_SUCCESS(rv, rv);
- 
-+  if (mFrames.Length() > 0) {
-+    imgFrame *prevframe = mFrames.ElementAt(mFrames.Length() - 1);
-+    prevframe->UnlockImageData();
-+  }
-+
-   if (mFrames.Length() == 0) {
-     return InternalAddFrameHelper(framenum, frame.forget(), imageData, imageLength, 
-                                   paletteData, paletteLength);
-   }
- 
-   if (mFrames.Length() == 1) {
-     // Since we're about to add our second frame, initialize animation stuff
-     if (!ensureAnimExists())
-diff --git a/modules/libpr0n/src/imgFrame.cpp b/modules/libpr0n/src/imgFrame.cpp
---- a/modules/libpr0n/src/imgFrame.cpp
-+++ b/modules/libpr0n/src/imgFrame.cpp
-@@ -152,16 +152,17 @@ imgFrame::imgFrame() :
-   mBlendMethod(1), /* imgIContainer::kBlendOver */
-   mSinglePixel(PR_FALSE),
-   mNeverUseDeviceSurface(PR_FALSE),
-   mFormatChanged(PR_FALSE),
-   mCompositingFailed(PR_FALSE)
- #ifdef USE_WIN_SURFACE
-   , mIsDDBSurface(PR_FALSE)
- #endif
-+  , mLocked(PR_FALSE)
- {
-   static PRBool hasCheckedOptimize = PR_FALSE;
-   if (!hasCheckedOptimize) {
-     if (PR_GetEnv("MOZ_DISABLE_IMAGE_OPTIMIZE")) {
-       gDisableOptimize = PR_TRUE;
-     }
-     hasCheckedOptimize = PR_TRUE;
-   }
-@@ -413,18 +414,17 @@ void imgFrame::Draw(gfxContext *aContext
-   nsRefPtr<gfxASurface> surface;
-   gfxImageSurface::gfxImageFormat format;
- 
-   NS_ASSERTION(!sourceRect.Intersect(subimage).IsEmpty(),
-                "We must be allowed to sample *some* source pixels!");
- 
-   PRBool doTile = !imageRect.Contains(sourceRect);
-   if (doPadding || doPartialDecode) {
--    gfxRect available = gfxRect(mDecoded.x, mDecoded.y, mDecoded.width, mDecoded.height) +
--      gfxPoint(aPadding.left, aPadding.top);
-+    gfxRect available = gfxRect(mDecoded.x, mDecoded.y, mDecoded.width, mDecoded.height);
- 
-     if (!doTile && !mSinglePixel) {
-       // Not tiling, and we have a surface, so we can account for
-       // padding and/or a partial decode just by twiddling parameters.
-       // First, update our user-space fill rect.
-       sourceRect = sourceRect.Intersect(available);
-       gfxMatrix imageSpaceToUserSpace = userSpaceToImageSpace;
-       imageSpaceToUserSpace.Invert();
-@@ -708,17 +708,17 @@ nsresult imgFrame::ImageUpdated(const ns
-   mem->IsLowMemory(&lowMemory);
-   if (lowMemory)
-     return NS_ERROR_OUT_OF_MEMORY;
- 
-   mDecoded.UnionRect(mDecoded, aUpdateRect);
- 
-   // clamp to bounds, in case someone sends a bogus updateRect (I'm looking at
-   // you, gif decoder)
--  nsIntRect boundsRect(0, 0, mSize.width, mSize.height);
-+  nsIntRect boundsRect(mOffset, mSize);
-   mDecoded.IntersectRect(mDecoded, boundsRect);
- 
- #ifdef XP_MACOSX
-   if (mQuartzSurface)
-     mQuartzSurface->Flush();
- #endif
-   return NS_OK;
- }
-@@ -806,17 +806,23 @@ void imgFrame::GetPaletteData(PRUint32 *
-     *aPalette = (PRUint32 *) mPalettedImageData;
-     *length = PaletteDataLength();
-   }
- }
- 
- nsresult imgFrame::LockImageData()
- {
-   if (mPalettedImageData)
--    return NS_OK;
-+    return NS_ERROR_NOT_AVAILABLE;
-+
-+  NS_ABORT_IF_FALSE(!mLocked, "Trying to lock already locked image data.");
-+  if (mLocked) {
-+    return NS_ERROR_FAILURE;
-+  }
-+  mLocked = PR_TRUE;
- 
-   if ((mOptSurface || mSinglePixel) && !mImageSurface) {
-     // Recover the pixels
-     mImageSurface = new gfxImageSurface(gfxIntSize(mSize.width, mSize.height),
-                                         gfxImageSurface::ImageFormatARGB32);
-     if (!mImageSurface || mImageSurface->CairoStatus())
-       return NS_ERROR_OUT_OF_MEMORY;
- 
-@@ -832,23 +838,35 @@ nsresult imgFrame::LockImageData()
- #ifdef USE_WIN_SURFACE
-     mWinSurface = nsnull;
- #endif
- #ifdef XP_MACOSX
-     mQuartzSurface = nsnull;
- #endif
-   }
- 
-+  if (mImageSurface)
-+    mImageSurface->Flush();
-+
-   return NS_OK;
- }
- 
- nsresult imgFrame::UnlockImageData()
- {
-   if (mPalettedImageData)
--    return NS_OK;
-+    return NS_ERROR_NOT_AVAILABLE;
-+
-+  NS_ABORT_IF_FALSE(mLocked, "Unlocking an unlocked image!");
-+  if (!mLocked) {
-+    return NS_ERROR_FAILURE;
-+  }
-+  mLocked = PR_FALSE;
-+
-+  if (mImageSurface)
-+    mImageSurface->MarkDirty();
- 
- #ifdef XP_MACOSX
-   if (mQuartzSurface)
-     mQuartzSurface->Flush();
- #endif
-   return NS_OK;
- }
- 
-@@ -895,17 +913,17 @@ PRInt32 imgFrame::GetBlendMethod() const
- 
- void imgFrame::SetBlendMethod(PRInt32 aBlendMethod)
- {
-   mBlendMethod = (PRInt8)aBlendMethod;
- }
- 
- PRBool imgFrame::ImageComplete() const
- {
--  return mDecoded == nsIntRect(0, 0, mSize.width, mSize.height);
-+  return mDecoded == nsIntRect(mOffset, mSize);
- }
- 
- // A hint from the image decoders that this image has no alpha, even
- // though we created is ARGB32.  This changes our format to RGB24,
- // which in turn will cause us to Optimize() to RGB24.  Has no effect
- // after Optimize() is called, though in all cases it will be just a
- // performance win -- the pixels are still correct and have the A byte
- // set to 0xff.
-diff --git a/modules/libpr0n/src/imgFrame.h b/modules/libpr0n/src/imgFrame.h
---- a/modules/libpr0n/src/imgFrame.h
-+++ b/modules/libpr0n/src/imgFrame.h
-@@ -167,16 +167,17 @@ private: // data
- 
-   gfxASurface::gfxImageFormat mFormat;
-   PRInt8       mPaletteDepth;
-   PRInt8       mBlendMethod;
-   PRPackedBool mSinglePixel;
-   PRPackedBool mNeverUseDeviceSurface;
-   PRPackedBool mFormatChanged;
-   PRPackedBool mCompositingFailed;
-+  PRPackedBool mLocked;
- 
- #ifdef XP_WIN
-   PRPackedBool mIsDDBSurface;
- #endif
- 
- };
- 
- #endif /* imgFrame_h */
diff --git a/net-libs/xulrunner/files/libnotify-0.7.patch b/net-libs/xulrunner/files/libnotify-0.7.patch
deleted file mode 100644
index 0adbeaf..0000000
--- a/net-libs/xulrunner/files/libnotify-0.7.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-# HG changeset patch
-# User Priit Laes <plaes@plaes.org>
-# Parent 194dd9a57615185c998a87148fac65df51600758
-Bug 628222 - Add support for libnotify-0.7+. r=karlt
-
-diff --git a/toolkit/system/gnome/nsAlertsIconListener.cpp b/toolkit/system/gnome/nsAlertsIconListener.cpp
---- a/toolkit/system/gnome/nsAlertsIconListener.cpp
-+++ b/toolkit/system/gnome/nsAlertsIconListener.cpp
-@@ -42,16 +42,21 @@
- #include "nsNetUtil.h"
- #include "nsIImageToPixbuf.h"
- #include "nsIStringBundle.h"
- 
- #include <gdk-pixbuf/gdk-pixbuf.h>
- #include <libnotify/notify.h>
- #include <gdk/gdk.h>
- 
-+// Compatibility macro for <libnotify-0.7
-+#ifndef NOTIFY_CHECK_VERSION
-+#define NOTIFY_CHECK_VERSION(x,y,z) 0
-+#endif
-+
- static PRBool gHasActions = PR_FALSE;
- 
- static void notify_action_cb(NotifyNotification *notification,
-                              gchar *action, gpointer user_data)
- {
-   nsAlertsIconListener* alert = static_cast<nsAlertsIconListener*> (user_data);
-   alert->SendCallback();
- }
-@@ -199,17 +204,23 @@ nsAlertsIconListener::OnStopFrame(imgIRe
-   return NS_OK;
- }
- 
- nsresult
- nsAlertsIconListener::ShowAlert(GdkPixbuf* aPixbuf)
- {
-   NotifyNotification* notify = notify_notification_new(mAlertTitle.get(),
-                                                        mAlertText.get(),
--                                                       NULL, NULL);
-+                                          NULL
-+// >=libnotify-0.7.0 has no support for attaching to widgets
-+#if !NOTIFY_CHECK_VERSION(0,7,0)
-+                                          , NULL
-+#endif
-+                                          );
-+
-   if (!notify)
-     return NS_ERROR_OUT_OF_MEMORY;
- 
-   if (aPixbuf)
-     notify_notification_set_icon_from_pixbuf(notify, aPixbuf);
- 
-   NS_ADDREF(this);
-   if (mAlertHasAction) {
-
diff --git a/net-libs/xulrunner/files/mozilla-2.0_arm_respect_cflags.patch b/net-libs/xulrunner/files/mozilla-2.0_arm_respect_cflags.patch
deleted file mode 100644
index 46efe35..0000000
--- a/net-libs/xulrunner/files/mozilla-2.0_arm_respect_cflags.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-diff -ur mozilla-release.orig//configure.in mozilla-release/configure.in
---- mozilla-release.orig//configure.in	2011-07-17 13:44:12.000000000 +0200
-+++ mozilla-release/configure.in	2011-07-17 13:46:50.000000000 +0200
-@@ -7165,9 +7165,6 @@
-       if test "$GNU_CC"; then
-         AC_DEFINE(MOZ_THUMB2)
-         AC_DEFINE(MOZ_ARM_ARCH)
--        CFLAGS="$CFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
--        CXXFLAGS="$CXXFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
--        ASFLAGS="$ASFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
-       else
-         AC_MSG_ERROR([--enable-thumb2 is not supported for non-GNU toolchains])
-       fi
-@@ -7181,9 +7178,6 @@
-     arm*)
-       if test "$GNU_CC"; then
-         AC_DEFINE(MOZ_ARM_ARCH)
--        CFLAGS="$CFLAGS -march=armv7-a -marm -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
--        CXXFLAGS="$CXXFLAGS -march=armv7-a -marm -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
--        ASFLAGS="$ASFLAGS -march=armv7-a -marm -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
-       else
-         AC_MSG_ERROR([--with-cpu-arch=armv7 is not supported for non-GNU toolchains])
-       fi
-@@ -7192,16 +7186,6 @@
-       AC_MSG_ERROR([--with-cpu-arch=armv7 is not supported for non-ARM CPU architectures])
-     ;;
-   esac
--else
--  case "$target_cpu" in
--    arm*)
--      if test "$GNU_CC"; then
--        CFLAGS="$CFLAGS -march=armv5te -mthumb-interwork -msoft-float"
--        CXXFLAGS="$CXXFLAGS -march=armv5te -mthumb-interwork -msoft-float"
--        ASFLAGS="$ASFLAGS -march=armv5te -mthumb-interwork -msoft-float"
--      fi
--      ;;
--  esac
- fi
- 
- AC_SUBST(MOZ_THUMB2)
-diff -ur mozilla-release.orig//js/src/configure.in mozilla-release/js/src/configure.in
---- mozilla-release.orig//js/src/configure.in	2011-07-17 13:43:42.000000000 +0200
-+++ mozilla-release/js/src/configure.in	2011-07-17 13:47:39.000000000 +0200
-@@ -4607,9 +4607,6 @@
-       if test "$GNU_CC"; then
-         AC_DEFINE(MOZ_THUMB2)
-         AC_DEFINE(MOZ_ARM_ARCH)
--        CFLAGS="$CFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
--        CXXFLAGS="$CXXFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
--        ASFLAGS="$ASFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
-       else
-         AC_MSG_ERROR([--enable-thumb2 is not supported for non-GNU toolchains])
-       fi
-@@ -4623,9 +4620,6 @@
-     arm*)
-       if test "$GNU_CC"; then
-         AC_DEFINE(MOZ_ARM_ARCH)
--        CFLAGS="$CFLAGS -march=armv7-a -marm -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
--        CXXFLAGS="$CXXFLAGS -march=armv7-a -marm -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
--        ASFLAGS="$ASFLAGS -march=armv7-a -marm -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
-       else
-         AC_MSG_ERROR([--with-cpu-arch=armv7 is not supported for non-GNU toolchains])
-       fi
-@@ -4634,16 +4628,6 @@
-       AC_MSG_ERROR([--with-cpu-arch=armv7 is not supported for non-ARM CPU architectures])
-     ;;
-   esac
--else
--  case "$target_cpu" in
--    arm*)
--      if test "$GNU_CC"; then
--        CFLAGS="$CFLAGS -march=armv5te -mthumb-interwork -msoft-float"
--        CXXFLAGS="$CXXFLAGS -march=armv5te -mthumb-interwork -msoft-float"
--        ASFLAGS="$ASFLAGS -march=armv5te -mthumb-interwork -msoft-float"
--      fi
--      ;;
--  esac
- fi
- 
- AC_SUBST(MOZ_THUMB2)
\ No newline at end of file
diff --git a/net-libs/xulrunner/files/mozilla-2.0_support_64bit_big_endian.patch b/net-libs/xulrunner/files/mozilla-2.0_support_64bit_big_endian.patch
deleted file mode 100644
index 5c43e1a..0000000
--- a/net-libs/xulrunner/files/mozilla-2.0_support_64bit_big_endian.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-# HG changeset patch
-# User Mike Hommey <mh+mozilla@glandium.org>
-# Date 1303461188 -7200
-# Node ID 59771590e9203d48ef8cbcd7eaf2f8ae45dbb1c1
-# Parent  c4b82ec27d6d6e1c02ef0abb3b6e805bfdd092ec
-Bug 638056 - Avoid "The cacheFlush support is missing on this platform" error on exotic platforms. r=cdleary
-
-diff --git a/js/src/Makefile.in b/js/src/Makefile.in
---- a/js/src/Makefile.in
-+++ b/js/src/Makefile.in
-@@ -383,17 +383,17 @@ CPPSRCS += 	checks.cc \
- 		platform.cc \
- 		utils.cc \
- 		$(NONE)
- 
- #
- # END enclude sources for V8 dtoa
- #############################################
- 
--ifeq (,$(filter-out powerpc sparc,$(TARGET_CPU)))
-+ifeq (,$(filter arm% %86 x86_64,$(TARGET_CPU)))
- 
- VPATH +=	$(srcdir)/assembler \
- 		$(srcdir)/assembler/wtf \
- 		$(srcdir)/yarr/pcre \
- 		$(NULL)
- 
- CPPSRCS += 	pcre_compile.cpp \
-                 pcre_exec.cpp \
-
-# HG changeset patch
-# User Luke Wagner <lw@mozilla.com>
-# Date 1299520258 28800
-# Node ID 68203913d04cf5be53fd16278816183d5670ba5c
-# Parent  27e5814815491ebb68e474e453aff6c2ea908c43
-Bug 618485 - Add missing 64-bit big-endian jsval_layout field (r=luke)
-
-diff --git a/js/src/jsval.h b/js/src/jsval.h
---- a/js/src/jsval.h
-+++ b/js/src/jsval.h
-@@ -342,16 +342,17 @@ typedef union jsval_layout
-         JSValueTag         tag : 17;
-         uint64             payload47 : 47;
-     } debugView;
-     struct {
-         union {
-             int32          i32;
-             uint32         u32;
-             JSWhyMagic     why;
-+            jsuword        word;
-         } payload;
-     } s;
-     double asDouble;
-     void *asPtr;
- } jsval_layout;
- # endif /* JS_BITS_PER_WORD */
- #endif  /* defined(IS_LITTLE_ENDIAN) */
- 
-
-
diff --git a/net-libs/xulrunner/files/xulrunner-1.9.2-gtk+-2.21.patch b/net-libs/xulrunner/files/xulrunner-1.9.2-gtk+-2.21.patch
deleted file mode 100644
index 8a1e831..0000000
--- a/net-libs/xulrunner/files/xulrunner-1.9.2-gtk+-2.21.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-# HG changeset patch
-# User Jonathan Callen <abcd@gentoo.org>
-# Parent 2599ed882191d88a8e8f0cb68492a156163c5ca7
-pass MOZ_GTK_CFLAGS to ensure proper includes are avaliable.
-
-diff --git a/toolkit/system/gnome/Makefile.in b/toolkit/system/gnome/Makefile.in
---- a/toolkit/system/gnome/Makefile.in
-+++ b/toolkit/system/gnome/Makefile.in
-@@ -84,13 +84,14 @@ EXTRA_DSO_LDOPTS += \
- 		$(MOZ_LIBNOTIFY_LIBS) \
- 		$(NULL)
- 
- LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/components/build/
- 
- include $(topsrcdir)/config/rules.mk
- 
- CXXFLAGS += \
-+	$(MOZ_GTK2_CFLAGS) \
- 	$(MOZ_GCONF_CFLAGS) \
- 	$(MOZ_GNOMEVFS_CFLAGS) \
- 	$(GLIB_CFLAGS) \
- 	$(MOZ_LIBNOTIFY_CFLAGS) \
- 	$(NULL)
diff --git a/net-libs/xulrunner/files/xulrunner-default-prefs.js b/net-libs/xulrunner/files/xulrunner-default-prefs.js
deleted file mode 100644
index 4546d3f..0000000
--- a/net-libs/xulrunner/files/xulrunner-default-prefs.js
+++ /dev/null
@@ -1,14 +0,0 @@
-pref("app.update.enabled",                 false);
-pref("app.update.autoInstallEnabled",      false);
-pref("browser.display.use_system_colors",  true);
-pref("browser.link.open_external",         3);
-pref("general.smoothScroll",               true);
-pref("general.autoScroll",                 false);
-pref("browser.tabs.tabMinWidth",           15);
-pref("browser.backspace_action",           0);
-pref("browser.urlbar.hideGoButton",        true);
-pref("accessibility.typeaheadfind",        true);
-pref("browser.shell.checkDefaultBrowser",  false); 
-pref("browser.EULA.override",              true); 
-pref("general.useragent.vendor", "Gentoo");
-pref("intl.locale.matchOS", true);
diff --git a/net-libs/xulrunner/xulrunner-1.9.2.28-r1.ebuild b/net-libs/xulrunner/xulrunner-1.9.2.28-r1.ebuild
deleted file mode 100644
index bc939ec..0000000
--- a/net-libs/xulrunner/xulrunner-1.9.2.28-r1.ebuild
+++ /dev/null
@@ -1,264 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/xulrunner-1.9.2.22.ebuild,v 1.4 2012/01/28 05:21:42 nirbheek Exp $
-
-EAPI="3"
-WANT_AUTOCONF="2.1"
-
-inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib java-pkg-opt-2 autotools python prefix pax-utils
-
-MY_PV="${PV/_rc/rc}" # Handle beta
-MY_PV="${MY_PV/1.9.2/3.6}"
-MAJ_PV="1.9.2" # from mozilla-* branch name
-PATCH="${PN}-1.9.2-patches-0.9"
-
-DESCRIPTION="Mozilla runtime package that can be used to bootstrap XUL+XPCOM applications"
-HOMEPAGE="http://developer.mozilla.org/en/docs/XULRunner"
-#SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${MY_PV}/source/firefox-${MY_PV}.source.tar.bz2
-SRC_URI="ftp://archive.mozilla.org/pub/mozilla.org/firefox/releases/${MY_PV}/source/firefox-${MY_PV}.source.tar.bz2
-	http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.bz2"
-
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-SLOT="1.9"
-LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
-IUSE="+alsa debug gnome +ipc libnotify system-sqlite wifi"
-
-RDEPEND="
-	>=sys-devel/binutils-2.16.1
-	>=dev-libs/nss-3.12.8
-	>=dev-libs/nspr-4.8.6
-	system-sqlite? ( >=dev-db/sqlite-3.7.4[fts3,secure-delete] )
-	alsa? ( media-libs/alsa-lib )
-	>=app-text/hunspell-1.2
-	>=x11-libs/cairo-1.8.8[X]
-	x11-libs/libXt
-	x11-libs/pixman
-	>=dev-libs/libevent-1.4.7
-	gnome? ( >=gnome-base/gnome-vfs-2.16.3
-		>=gnome-base/libgnomeui-2.16.1
-		>=gnome-base/gconf-2.16.0
-		>=gnome-base/libgnome-2.16.0 )
-	wifi? ( net-wireless/wireless-tools )
-	libnotify? ( >=x11-libs/libnotify-0.4 )"
-
-DEPEND="java? ( >=virtual/jdk-1.4 )
-	${RDEPEND}
-	=dev-lang/python-2*[threads]
-	dev-util/pkgconfig"
-
-# virtual/jre should not be in DEPEND. bug 325981
-RDEPEND="java? ( >=virtual/jre-1.4 ) ${RDEPEND}"
-
-S="${WORKDIR}/mozilla-${MAJ_PV}"
-
-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
-
-	python_set_active_version 2
-}
-
-src_prepare() {
-	# Apply our patches
-	EPATCH_SUFFIX="patch" \
-	EPATCH_FORCE="yes" \
-	epatch "${WORKDIR}"
-
-	epatch "${FILESDIR}/bug-606109.patch"
-	epatch "${FILESDIR}/esr10.4"
-
-	eprefixify \
-		extensions/java/xpcom/interfaces/org/mozilla/xpcom/Mozilla.java \
-		xpcom/build/nsXPCOMPrivate.h \
-		xulrunner/installer/Makefile.in \
-		xulrunner/app/nsRegisterGREUnix.cpp
-
-	# fix double symbols due to double -ljemalloc
-	sed -i -e '/^LIBS += $(JEMALLOC_LIBS)/s/^/#/' \
-		xulrunner/stub/Makefile.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/libcurl_wrapper.cc \
-		-i "${S}"/toolkit/crashreporter/google-breakpad/src/common/linux/http_upload.cc \
-			|| die
-	sed -e '/curl\/types\.h/d' \
-		-i "${S}"/config/system-headers \
-		-i "${S}"/js/src/config/system-headers \
-			|| die
-
-	# Allow user to apply additional patches without modifing ebuild
-	epatch_user
-
-	# Same as in config/autoconf.mk.in
-	MOZLIBDIR="/usr/$(get_libdir)/${PN}-${MAJ_PV}"
-	SDKDIR="/usr/$(get_libdir)/${PN}-devel-${MAJ_PV}/sdk"
-
-	# Gentoo install dirs
-	sed -i -e "s:@PV@:${MAJ_PV}:" "${S}"/config/autoconf.mk.in \
-		|| die "${MAJ_PV} sed failed!"
-
-	# 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
-
-	eautoreconf
-
-	cd js/src
-	eautoreconf
-}
-
-src_configure() {
-	####################################
-	#
-	# mozconfig, CFLAGS and CXXFLAGS setup
-	#
-	####################################
-
-	mozconfig_init
-	mozconfig_config
-
-	MEXTENSIONS="default"
-
-	MOZLIBDIR="/usr/$(get_libdir)/${PN}-${MAJ_PV}"
-
-	# It doesn't compile on alpha without this LDFLAGS
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	mozconfig_annotate '' --enable-crypto
-	mozconfig_annotate '' --with-default-mozilla-five-home="${MOZLIBDIR}"
-	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
-	mozconfig_annotate '' --enable-application=xulrunner
-	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 --with-nspr-prefix="${EPREFIX}"/usr
-	mozconfig_annotate '' --with-system-nss --with-nss-prefix="${EPREFIX}"/usr
-	mozconfig_annotate '' --x-includes="${EPREFIX}"/usr/include --x-libraries="${EPREFIX}"/usr/$(get_libdir)
-	mozconfig_annotate '' --with-system-bz2
-	mozconfig_annotate '' --with-system-libevent="${EPREFIX}"/usr
-
-	mozconfig_use_enable gnome gnomevfs
-	mozconfig_use_enable gnome gnomeui
-	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
-
-	# Debug
-	if use debug ; then
-		mozconfig_annotate 'debug' --disable-optimize
-		mozconfig_annotate 'debug' --enable-debug=-ggdb
-		mozconfig_annotate 'debug' --enable-debug-modules=all
-		mozconfig_annotate 'debug' --enable-debugger-info-modules
-	fi
-
-	# Finalize and report settings
-	mozconfig_final
-
-	if [[ $(gcc-major-version) -lt 4 ]]; then
-		append-flags -fno-stack-protector
-	fi
-
-	####################################
-	#
-	#  Configure and build
-	#
-	####################################
-
-	# Disable no-print-directory
-	MAKEOPTS=${MAKEOPTS/--no-print-directory/}
-
-	# 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!"
-
-	# hack added to workaround bug 299905 on hosts with libc that doesn't
-	# support tls, (probably will only hit this condition with Gentoo Prefix)
-	tc-has-tls -l || export ac_cv_thread_keyword=no
-
-	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" PYTHON="$(PYTHON)" econf
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	rm "${ED}"/usr/bin/xulrunner
-
-	MOZLIBDIR="/usr/$(get_libdir)/${PN}-${MAJ_PV}"
-	SDKDIR="/usr/$(get_libdir)/${PN}-devel-${MAJ_PV}/sdk"
-
-	if has_multilib_profile; then
-		local config
-		for config in "${ED}"/etc/gre.d/*.system.conf ; do
-			mv "${config}" "${config%.conf}.${CHOST}.conf"
-		done
-	fi
-
-	dodir /usr/bin
-	dosym "${MOZLIBDIR}/xulrunner" "/usr/bin/xulrunner-${MAJ_PV}" || die
-
-	# env.d file for ld search path
-	dodir /etc/env.d
-	echo "LDPATH=${EPREFIX}/${MOZLIBDIR}" > "${ED}"/etc/env.d/08xulrunner || die "env.d failed"
-
-	# Add our defaults to xulrunner and out of firefox
-	cp "${FILESDIR}"/xulrunner-default-prefs.js \
-		"${ED}/${MOZLIBDIR}/defaults/pref/all-gentoo.js" || \
-			die "failed to cp xulrunner-default-prefs.js"
-
-	pax-mark m "${D}"/${MOZLIBDIR}/plugin-container
-
-	if use java ; then
-		java-pkg_regjar "${ED}/${MOZLIBDIR}/javaxpcom.jar"
-		java-pkg_regso "${ED}/${MOZLIBDIR}/libjavaxpcomglue.so"
-		java-pkg_regjar "${ED}/${SDKDIR}/lib/MozillaGlue.jar"
-		java-pkg_regjar "${ED}/${SDKDIR}/lib/MozillaInterfaces.jar"
-	fi
-}
-
-pkg_postinst() {
-	ewarn "If firefox fails to start with \"failed to load xpcom\", run revdep-rebuild"
-	ewarn "If that does not fix the problem, rebuild dev-libs/nss"
-	ewarn "Try dev-util/lafilefixer if you get build failures related to .la files"
-
-	einfo
-	einfo "All prefs can be overridden by the user. The preferences are to make"
-	einfo "use of xulrunner out of the box on an average system without the user"
-	einfo "having to go through and enable the basics."
-
-	einfo
-	ewarn "Any package that requires xulrunner:1.9 slot could and most likely will"
-	ewarn "have issues. These issues should be reported to maintainer, and mozilla herd"
-	ewarn "should be cc'd on the bug report. Thank you anarchy@gentoo.org ."
-}
diff --git a/net-libs/xulrunner/xulrunner-1.9.2.28.ebuild b/net-libs/xulrunner/xulrunner-1.9.2.28.ebuild
deleted file mode 100644
index 38b8dd7..0000000
--- a/net-libs/xulrunner/xulrunner-1.9.2.28.ebuild
+++ /dev/null
@@ -1,263 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/xulrunner-1.9.2.22.ebuild,v 1.4 2012/01/28 05:21:42 nirbheek Exp $
-
-EAPI="3"
-WANT_AUTOCONF="2.1"
-
-inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib java-pkg-opt-2 autotools python prefix pax-utils
-
-MY_PV="${PV/_rc/rc}" # Handle beta
-MY_PV="${MY_PV/1.9.2/3.6}"
-MAJ_PV="1.9.2" # from mozilla-* branch name
-PATCH="${PN}-1.9.2-patches-0.9"
-
-DESCRIPTION="Mozilla runtime package that can be used to bootstrap XUL+XPCOM applications"
-HOMEPAGE="http://developer.mozilla.org/en/docs/XULRunner"
-#SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${MY_PV}/source/firefox-${MY_PV}.source.tar.bz2
-SRC_URI="ftp://archive.mozilla.org/pub/mozilla.org/firefox/releases/${MY_PV}/source/firefox-${MY_PV}.source.tar.bz2
-	http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.bz2"
-
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-SLOT="1.9"
-LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
-IUSE="+alsa debug gnome +ipc libnotify system-sqlite wifi"
-
-RDEPEND="
-	>=sys-devel/binutils-2.16.1
-	>=dev-libs/nss-3.12.8
-	>=dev-libs/nspr-4.8.6
-	system-sqlite? ( >=dev-db/sqlite-3.7.4[fts3,secure-delete] )
-	alsa? ( media-libs/alsa-lib )
-	>=app-text/hunspell-1.2
-	>=x11-libs/cairo-1.8.8[X]
-	x11-libs/libXt
-	x11-libs/pixman
-	>=dev-libs/libevent-1.4.7
-	gnome? ( >=gnome-base/gnome-vfs-2.16.3
-		>=gnome-base/libgnomeui-2.16.1
-		>=gnome-base/gconf-2.16.0
-		>=gnome-base/libgnome-2.16.0 )
-	wifi? ( net-wireless/wireless-tools )
-	libnotify? ( >=x11-libs/libnotify-0.4 )"
-
-DEPEND="java? ( >=virtual/jdk-1.4 )
-	${RDEPEND}
-	=dev-lang/python-2*[threads]
-	dev-util/pkgconfig"
-
-# virtual/jre should not be in DEPEND. bug 325981
-RDEPEND="java? ( >=virtual/jre-1.4 ) ${RDEPEND}"
-
-S="${WORKDIR}/mozilla-${MAJ_PV}"
-
-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
-
-	python_set_active_version 2
-}
-
-src_prepare() {
-	# Apply our patches
-	EPATCH_SUFFIX="patch" \
-	EPATCH_FORCE="yes" \
-	epatch "${WORKDIR}"
-
-	epatch "${FILESDIR}/bug-606109.patch"
-
-	eprefixify \
-		extensions/java/xpcom/interfaces/org/mozilla/xpcom/Mozilla.java \
-		xpcom/build/nsXPCOMPrivate.h \
-		xulrunner/installer/Makefile.in \
-		xulrunner/app/nsRegisterGREUnix.cpp
-
-	# fix double symbols due to double -ljemalloc
-	sed -i -e '/^LIBS += $(JEMALLOC_LIBS)/s/^/#/' \
-		xulrunner/stub/Makefile.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/libcurl_wrapper.cc \
-		-i "${S}"/toolkit/crashreporter/google-breakpad/src/common/linux/http_upload.cc \
-			|| die
-	sed -e '/curl\/types\.h/d' \
-		-i "${S}"/config/system-headers \
-		-i "${S}"/js/src/config/system-headers \
-			|| die
-
-	# Allow user to apply additional patches without modifing ebuild
-	epatch_user
-
-	# Same as in config/autoconf.mk.in
-	MOZLIBDIR="/usr/$(get_libdir)/${PN}-${MAJ_PV}"
-	SDKDIR="/usr/$(get_libdir)/${PN}-devel-${MAJ_PV}/sdk"
-
-	# Gentoo install dirs
-	sed -i -e "s:@PV@:${MAJ_PV}:" "${S}"/config/autoconf.mk.in \
-		|| die "${MAJ_PV} sed failed!"
-
-	# 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
-
-	eautoreconf
-
-	cd js/src
-	eautoreconf
-}
-
-src_configure() {
-	####################################
-	#
-	# mozconfig, CFLAGS and CXXFLAGS setup
-	#
-	####################################
-
-	mozconfig_init
-	mozconfig_config
-
-	MEXTENSIONS="default"
-
-	MOZLIBDIR="/usr/$(get_libdir)/${PN}-${MAJ_PV}"
-
-	# It doesn't compile on alpha without this LDFLAGS
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	mozconfig_annotate '' --enable-crypto
-	mozconfig_annotate '' --with-default-mozilla-five-home="${MOZLIBDIR}"
-	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
-	mozconfig_annotate '' --enable-application=xulrunner
-	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 --with-nspr-prefix="${EPREFIX}"/usr
-	mozconfig_annotate '' --with-system-nss --with-nss-prefix="${EPREFIX}"/usr
-	mozconfig_annotate '' --x-includes="${EPREFIX}"/usr/include --x-libraries="${EPREFIX}"/usr/$(get_libdir)
-	mozconfig_annotate '' --with-system-bz2
-	mozconfig_annotate '' --with-system-libevent="${EPREFIX}"/usr
-
-	mozconfig_use_enable gnome gnomevfs
-	mozconfig_use_enable gnome gnomeui
-	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
-
-	# Debug
-	if use debug ; then
-		mozconfig_annotate 'debug' --disable-optimize
-		mozconfig_annotate 'debug' --enable-debug=-ggdb
-		mozconfig_annotate 'debug' --enable-debug-modules=all
-		mozconfig_annotate 'debug' --enable-debugger-info-modules
-	fi
-
-	# Finalize and report settings
-	mozconfig_final
-
-	if [[ $(gcc-major-version) -lt 4 ]]; then
-		append-flags -fno-stack-protector
-	fi
-
-	####################################
-	#
-	#  Configure and build
-	#
-	####################################
-
-	# Disable no-print-directory
-	MAKEOPTS=${MAKEOPTS/--no-print-directory/}
-
-	# 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!"
-
-	# hack added to workaround bug 299905 on hosts with libc that doesn't
-	# support tls, (probably will only hit this condition with Gentoo Prefix)
-	tc-has-tls -l || export ac_cv_thread_keyword=no
-
-	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" PYTHON="$(PYTHON)" econf
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	rm "${ED}"/usr/bin/xulrunner
-
-	MOZLIBDIR="/usr/$(get_libdir)/${PN}-${MAJ_PV}"
-	SDKDIR="/usr/$(get_libdir)/${PN}-devel-${MAJ_PV}/sdk"
-
-	if has_multilib_profile; then
-		local config
-		for config in "${ED}"/etc/gre.d/*.system.conf ; do
-			mv "${config}" "${config%.conf}.${CHOST}.conf"
-		done
-	fi
-
-	dodir /usr/bin
-	dosym "${MOZLIBDIR}/xulrunner" "/usr/bin/xulrunner-${MAJ_PV}" || die
-
-	# env.d file for ld search path
-	dodir /etc/env.d
-	echo "LDPATH=${EPREFIX}/${MOZLIBDIR}" > "${ED}"/etc/env.d/08xulrunner || die "env.d failed"
-
-	# Add our defaults to xulrunner and out of firefox
-	cp "${FILESDIR}"/xulrunner-default-prefs.js \
-		"${ED}/${MOZLIBDIR}/defaults/pref/all-gentoo.js" || \
-			die "failed to cp xulrunner-default-prefs.js"
-
-	pax-mark m "${D}"/${MOZLIBDIR}/plugin-container
-
-	if use java ; then
-		java-pkg_regjar "${ED}/${MOZLIBDIR}/javaxpcom.jar"
-		java-pkg_regso "${ED}/${MOZLIBDIR}/libjavaxpcomglue.so"
-		java-pkg_regjar "${ED}/${SDKDIR}/lib/MozillaGlue.jar"
-		java-pkg_regjar "${ED}/${SDKDIR}/lib/MozillaInterfaces.jar"
-	fi
-}
-
-pkg_postinst() {
-	ewarn "If firefox fails to start with \"failed to load xpcom\", run revdep-rebuild"
-	ewarn "If that does not fix the problem, rebuild dev-libs/nss"
-	ewarn "Try dev-util/lafilefixer if you get build failures related to .la files"
-
-	einfo
-	einfo "All prefs can be overridden by the user. The preferences are to make"
-	einfo "use of xulrunner out of the box on an average system without the user"
-	einfo "having to go through and enable the basics."
-
-	einfo
-	ewarn "Any package that requires xulrunner:1.9 slot could and most likely will"
-	ewarn "have issues. These issues should be reported to maintainer, and mozilla herd"
-	ewarn "should be cc'd on the bug report. Thank you anarchy@gentoo.org ."
-}
diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
deleted file mode 100644
index 4efad95..0000000
--- a/www-client/firefox/Manifest
+++ /dev/null
@@ -1,87 +0,0 @@
-AUX esr10.4 1701 RMD160 167b397bdf5cf21977cec1ef7f9f709346b3345e SHA1 88f0d7fbec21f61f9320cdf49ab7fd2c8f293f9a SHA256 65621c48364f5f1f2aa7d4525689c6c66ca9bb7034e43a9c500bea7d28188596
-AUX firefox-default-prefs.js 95 RMD160 805cdfec6fb31c224322cb71125547ad7a515f49 SHA1 7fab69d85b12a9f1b0c87fbb1821bdafd7485ac9 SHA256 8bc4cb870bc402db1f20b135a689f8c5dbfa5de8f1755b1926198d627c12c5f1
-AUX firefox.1 2538 RMD160 4564007d7d5345e9ab09c941015e3cdb78913835 SHA1 8be1987451117820744ecc67fa411facdc653a12 SHA256 3483439a73c74b818bdde98c15223b6d3fcfe78e3ad974fb35f197cf3ad614e7
-AUX fix-preferences-gentoo.patch 426 RMD160 83075ec3c2e4c39ba298096bd08447bb94cad34d SHA1 ffff69bcff712483d1962ce04a700748fdab24f5 SHA256 7edae5ea1efb042412d02ef00c51f5e55c4499751c240b48c7b07f69cc420d94
-AUX gentoo-default-prefs.js 677 RMD160 73ec130da332c1d6517a6f838d5fab0cc134289a SHA1 b9efc3ef5e95ad3081f6b68d771e32e848b4b9ac SHA256 53493080276f221f1619153c114caf268206a6fa107972b33a4eb7f1c1cf6fe8
-AUX gentoo-default-prefs.js-1 821 RMD160 13a7be3a165b7059e51fab2cc7fc8d31a82260eb SHA1 333339c4deb4fd41527fd87e1acf0af12cf1007c SHA256 16259ec24a231d1d60097c8d892caa80d2703ba5be72304f6da55cfce1b329de
-AUX icon/firefox-1.5-unbranded.desktop 303 RMD160 e9cb808302b7fbd7d4eb84aeb0a438e1f82f220b SHA1 cd5d0ce5162d9fd246360409b1af396b62c1bc6b SHA256 1d6ba1b322ba1bf3ab8e6ef92528bdbc1a2f5cbca3119df3f4380b8b73b5cb05
-AUX icon/firefox-1.5.desktop 300 RMD160 df437e79147897b0ec52b44edc42ad4ef270eda5 SHA1 b60d51629ba58992f6d9ae9ad8c29ffc6630de4d SHA256 bc6f84004032afab5c078d8dc7c4ffe36abc45738c119fad3fcfa5de89dd5dae
-AUX icon/firefox.desktop 276 RMD160 92a5671cd09e399b3330c4be31b7ac7583747031 SHA1 b757763670a00982f3cb38b8d41d7faa6eee3818 SHA256 06565ade11b6e4b448cf10339696c43f31e73cb6824491094bb6e0ab902c7cf5
-AUX xulrunner-1.9.2-gtk+-2.21.patch 663 RMD160 20e2465da0e6c884527fd7cfebd3bdb2f8f015a9 SHA1 f2b9c26ed255bde672ccc8cb7ae4ae014f52d6f5 SHA256 79c11dc4304d748f3c2d6e451aa6d44dd1bb450d1db671e7fa4a83420c6f2c05
-DIST firefox-3.6-patches-0.4.tar.bz2 5791 RMD160 17944b3605138c3b651b31fcad306a432b73b80c SHA1 4ddff9a613cc703b34667aab3aea993187405920 SHA256 39bbbe412f70b50e8870e11dbd3f9e74ed7cbeaa23ed47dea1ea6ff72f48e54f
-DIST firefox-3.6.28-af.xpi 121614 RMD160 c2efe40b9319b0e196ad66c78bacc3e03a7462ae SHA1 de8da4fba9e821576aabf0445b1ed3c6a9f16001 SHA256 f60d7c981b8f3e2b5454f51d9dd68bfd353421e0ecce9b2eed39c8c190f8cdc9
-DIST firefox-3.6.28-ar.xpi 132153 RMD160 c98f92ecba2ae124650768f6b47b23271d6e4518 SHA1 50e321fc07834064f76c318f273bfd9f9e12c1bc SHA256 d062039790fff5899d8be096e7b07425d5fd85c40a1d4f3f25f49804c74292a5
-DIST firefox-3.6.28-as.xpi 134296 RMD160 61adee18a77a196dd565693985820d794a206d85 SHA1 219bfb76ca5ead69347878268f74a286adf44ae3 SHA256 ee193dce65caf1d1e55a4187af6f008ab08254ef4fd303749c1b11a114fac2cd
-DIST firefox-3.6.28-be.xpi 122233 RMD160 ed09f1949994e625d7d2b7b38e0ef84c43cab213 SHA1 3c4446d8a03452dbe3c53328423979254d809860 SHA256 856cd46245c08794904c57bf567b67b253668c21d61d5837011fb5c5830b3561
-DIST firefox-3.6.28-bg.xpi 134105 RMD160 455a2b86e47be9e0e39057d2543fb40225d559e1 SHA1 2e30ba202e376885e44337292bd31f412ae03e6e SHA256 456ea746de1b3fb1a8e8570483e3a445b916567cd0e73ac3d57ccd0c7ac6238b
-DIST firefox-3.6.28-bn-BD.xpi 141178 RMD160 913af76600d523665a97a3c89414a5ae27a67ef8 SHA1 2e29bf0960d782ac5d66cfa35ed38c9556115d91 SHA256 f2164b9a9a9df12c814f97ea9b951462636e8f6208aeb0eb812b1964f920cec9
-DIST firefox-3.6.28-bn-IN.xpi 160077 RMD160 f1915d72bd9dfce9296300e1d506983ee00b01ed SHA1 32b24387d1fce237df902d0417729d25aa21b339 SHA256 05ee767c26a034847ec97a4240305ae070eac447bbebf51f67f1feab14fa42cf
-DIST firefox-3.6.28-ca.xpi 127962 RMD160 1bb40c4dd8eb54b8093c257dd2e9dc2b2f648d12 SHA1 11b01805df42eaac34894d8abca3b18ac4592288 SHA256 92c74c91db0ccfad5a21facfb567fb2046db9c231a239b6b3dde8f6f13a83f4a
-DIST firefox-3.6.28-cs.xpi 126731 RMD160 852c5ecff38e55c0ade9ff251837efb7a6a6e5f0 SHA1 763ef77f007de96e4cbd475361210a8016a60071 SHA256 fbf9f4bae5323b1d5782b17b9bfa7e5dec0a0d49b92fffb57129b46e2cdf5f43
-DIST firefox-3.6.28-cy.xpi 121947 RMD160 20be3d840ec406e4a702e1e0e650529fbce905cc SHA1 8c35c93899da143fe7aa9e073de5beca5a43edea SHA256 967be82bbae62dda323a7377c314d5ee57b39b6939b201023ca463d8f491b46e
-DIST firefox-3.6.28-da.xpi 125599 RMD160 2394b1a77d39edbb1d60e4ba9327bb31ee6a9b13 SHA1 733fa054e8897e0019938f42dcc4c2bd1e1d4945 SHA256 5feba1cbd42ad80bfec135595032b47f7efc2291183a79b7c95989ee00be7d84
-DIST firefox-3.6.28-de.xpi 128968 RMD160 38d854b3b4f50eaffe05d91f48b85292a84857a9 SHA1 29025d2b2c9b11477a79642b723b9ad09bad5a6a SHA256 85dc67635f04726e29b7507c5a6babdaa58bc88a49cdf75e19f1be539652f3a3
-DIST firefox-3.6.28-el.xpi 135182 RMD160 88f6b0a2c68081536a244ce454b2ede08a77d61e SHA1 6de3b17614ba87282bce1b9e97abf1ffd1efae42 SHA256 0a60dfc8ca0cc2708e1f2ce6522fdc8215f42f77e8a72b91ccc40dca40147110
-DIST firefox-3.6.28-en-GB.xpi 119207 RMD160 375546dfcfbf9755b0ca3b97a1d7060b08780f65 SHA1 69deec1cea6e1d70ac620e5076a273ccb038c28e SHA256 e57161378b07d5190a429d4c6cd6466947fea0370198229684b4f0843c073bc2
-DIST firefox-3.6.28-eo.xpi 121843 RMD160 43e547e653b31a0c9f165d2b29672a5ee08a10b8 SHA1 fdc237623e306e4349f089938af797aa13995917 SHA256 67212937971e1e77d9fe62c9dd508674c54ae7146b13b17273f9c900351ff114
-DIST firefox-3.6.28-es-AR.xpi 127758 RMD160 18e96c8fceee0eab8ff6d4de682ae083b6129416 SHA1 5a470d5afd561fc33cb0903ba88e841f4f3eb73a SHA256 ce0e11fd50f12b97670c9455621a9e2519284f4a05e318a5369dd8ded3627316
-DIST firefox-3.6.28-es-CL.xpi 129466 RMD160 9548a0b5b64a6a1cda3ba6043e6c82d671377e1e SHA1 84d54cbbbb5fdd4c36e778258864e13c77d8b8fc SHA256 d97b7c16f4cbb7bdbd4e6a73c615e4e053882d3d9a5f7616fbd1571917389ed5
-DIST firefox-3.6.28-es-ES.xpi 108666 RMD160 37551f645fec5017ee13d43f197d3346f015c68e SHA1 7b27c71387ca75008a9b38fa9e0867e7a4bef234 SHA256 7abef3bfc9229402face0a87ce23e0b61f3cefd911b25463c19b2823e3ee2fba
-DIST firefox-3.6.28-es-MX.xpi 127426 RMD160 67a5e389424728c8be462e26867b2b83a0d945b8 SHA1 3028fade3ea4b3887f142fce7a6c85f9a187ee01 SHA256 cd7d047bd61f71e040d08e56f3f3cc21910e7ab5b4ab2fa085c1c7646226ac04
-DIST firefox-3.6.28-et.xpi 127385 RMD160 6df65eede3da9e09c1cb1db2d495f86ff10e4ec8 SHA1 9735923acf0878b487a407a04fd01c063c0fe197 SHA256 a72709846e55ddeda3cf04d9f7e68bfe4d1b2357b94cb23a7161c9cf60ffeec4
-DIST firefox-3.6.28-eu.xpi 121828 RMD160 0216112a539fdabdf52dd4e04971e9d741407c9f SHA1 fe3cdb23c7a88ef91aee817326d2c94d3c63b008 SHA256 31cf512db002dbad880ecb845de86c1bee09f0eb5352dae801196a521546d2a8
-DIST firefox-3.6.28-fa.xpi 138377 RMD160 8c3d5dcc5f2b9261cd6667263b1b2622aaed822c SHA1 224f5e46ff63ec1dff01407df5296df33b849664 SHA256 76e384d1236adc9bb3a3cf6af3ed0373db5d0a803bada33364a0f1a910a14e19
-DIST firefox-3.6.28-fi.xpi 126821 RMD160 a956a1b2b22ffb8385014596caebf555968f844f SHA1 2e68aa5b1e4649e0838f1a1c5047fea79e1ab501 SHA256 13bbc96141910fd92c60de1b63ed48057385cd6e0a8202b8a368caaa9c61b577
-DIST firefox-3.6.28-fr.xpi 128980 RMD160 934d1fadd450933246057c6079766992bd700d2b SHA1 9325637fae8c376ba0cd22b14217ec9dd0717714 SHA256 5efef27657fd052ce798b8d344b4f803a14e25f90916096503b5c5c426c10a74
-DIST firefox-3.6.28-fy-NL.xpi 129160 RMD160 5ad2d075a19999a80529030452a6f4e8552b389f SHA1 035cf57e053665a0634dccf1f1cf1fd61ebe5126 SHA256 089d0929b1b9eb6c91ab65f38438ae0e5d8b3c4970ad66eeaf9a5960bb60b64d
-DIST firefox-3.6.28-ga-IE.xpi 127755 RMD160 53d15d66c0409a37ee597a87c61183d0d98c7451 SHA1 64c3a8c3785040e2543ea2d45e5babdad9d10293 SHA256 3a4675c5542bf61523d1f8564d69b027a250b59327e26b7ee27dcde111dd097b
-DIST firefox-3.6.28-gl.xpi 124792 RMD160 627cbf0a19bede802ffc7c064369da985f345437 SHA1 21967bfad93a8272baf875c7c108149f1b5e1cf4 SHA256 87bed1931f1d3d9483629e7847d7cd4e12f2b8e642ed53521c8b425c505da36f
-DIST firefox-3.6.28-gu-IN.xpi 146296 RMD160 5c27e4a0c288c1968bb0fee21813d64200bd1d76 SHA1 9174490530927e6bab51969c472ebd2b0777a0f1 SHA256 c9922b372ccc088122a07caa5321c1ff90702c94ecf66bcb1735a4aa32d6b444
-DIST firefox-3.6.28-he.xpi 123133 RMD160 792a1cc0f7efa3722e7debc2c405ecbde73e315d SHA1 168dc3d11881a03e4c2fe1a92acdcfaceb26d432 SHA256 ac16e3fc03b8571e766ec1b1ad2d1f26bb9e2de1a97947a76f06c8ec72d5caf3
-DIST firefox-3.6.28-hi-IN.xpi 141886 RMD160 dde53de70883c07cdc1cc0aa30b261f4e2bdfc2a SHA1 3e7c38b59a2023ed0e0b0f367018f564425d2117 SHA256 3c0baae91f2ce66b10b9f8b3af868acf970261c528d8eaceb80f30493218216e
-DIST firefox-3.6.28-hr.xpi 126980 RMD160 e4b077881efec78c423901767751260e29396ad0 SHA1 efb08b388686992d57107ad27048df9341f877c0 SHA256 68da9285cf67188a78e862c2d96513934478d5b382cfe14372c7476987d55f50
-DIST firefox-3.6.28-hu.xpi 131098 RMD160 4d740859d4e5c634188a25fc543685d38df41ffb SHA1 1df066d79bb0313b83387f39ee0dec91c2c72efa SHA256 e0c268f9c76cb6a8676de19482335dca640a78c7f9da10002f7abd8cbc539744
-DIST firefox-3.6.28-id.xpi 103922 RMD160 f90fa4036ceda628b612068351936ba864850409 SHA1 1bde5026a0a5e7e0243240c0860fce7792a0762c SHA256 a997ec41b0fda35e43086ef0c86f6941ac45e308f7c0739cf5450ba2c73c05f7
-DIST firefox-3.6.28-is.xpi 123422 RMD160 7e78b2d3fb7dd368d42897987975e5dc4c2fb490 SHA1 ab5073aab4d8bcee85dda513dbe19b38dcf67300 SHA256 0fb3dd25a89af2dc3cfc54b6338ac70068013a04de3ed9dd4020dd5e52017b53
-DIST firefox-3.6.28-it.xpi 107972 RMD160 255cca9cdb2432a1f80ee8f04d98c54547c6464e SHA1 489dc7b6170fe33e0418eea0b719565629419865 SHA256 bea66a201e71018ac997b5b4524921ead20ee45f4726ee43f1b02b3580221ca1
-DIST firefox-3.6.28-ja.xpi 136981 RMD160 5078ff4f88a580aaa468872f6ef08a708c57431d SHA1 45e285f7cd43eedd5d5726c0c377552dbd398b45 SHA256 7615ee115371c1384a706f06a6012390fcf3ca84ef03f38f055775e6284de404
-DIST firefox-3.6.28-ka.xpi 154115 RMD160 982cdcc85c083b32201112de4ba92ba405af0438 SHA1 e5484d1f7fd53e22954bbcbb547812c8faee4b31 SHA256 e72b2cf4f0bf8ca2b74bbfed40755178053e84caa4c13a88cdc5420c147afa9a
-DIST firefox-3.6.28-kk.xpi 137720 RMD160 edb37a7fead21b7c8882dd86e721da65afe41764 SHA1 2fd14350b85db210cbcc1b60e316918293533e34 SHA256 f9c0889abbf40f0ef9d6310e14269397c5983dd8a8b33cb84ae147f94f1e9a95
-DIST firefox-3.6.28-kn.xpi 148709 RMD160 feaff697f472b4f3a2db5e09c2e0e7645099488d SHA1 8f1cf46609941a049a87ee487bd4f15447f0f592 SHA256 bfe5d3d4fc993be502df16e13fb697b6f37eebadca7b9b736f829193f8f592bf
-DIST firefox-3.6.28-ko.xpi 115631 RMD160 0ec67a56f1022d1b1a853fb3fabdc61ec68fa420 SHA1 a95ace3f63c735f31f86862530ec43dcee08d35b SHA256 fd928bb25abdafea880a41dbabb30fd029044b429b193a4fce7913f493b45617
-DIST firefox-3.6.28-ku.xpi 130810 RMD160 874596231615ff65c0fbfb7f04e5620631bbfa4d SHA1 9225003dfc1a568dc8523e4d0460d595c16445df SHA256 74e6e7bd581c6639e9dbb2a57811899913520ba91be9be7c198acccd17872b6a
-DIST firefox-3.6.28-lt.xpi 139685 RMD160 0966a33612e50842b9c9f60c061e39f92839f713 SHA1 47de381829938bb45208225c454ddede68b1d369 SHA256 8d1c61769dcedceaacd4eed1c223f915865cf15480ac3c92e0aecdbd048404e8
-DIST firefox-3.6.28-lv.xpi 124830 RMD160 6929a7340cee2aaa0d15da438b3e19486be7a89a SHA1 ad238d79bff4f1b45d4a8df75a57f3e15139189d SHA256 c7b2d844fb7e7cd9a40180bf0b15bf2e79c510ce4cc700d40a3560fc77d649e6
-DIST firefox-3.6.28-mk.xpi 128267 RMD160 a9cfc7b15f0b43d562effa0c16adb7ac01c1dae8 SHA1 ed346596344754714dcc7d38ac881dd117d70514 SHA256 e0f1b9447c754ae718abf0c51ab6e7ae7357ad7a401b7ccef371c2eab2370f8a
-DIST firefox-3.6.28-ml.xpi 152202 RMD160 6bdfb0a3d9609091458dfddc8e4e26a2a37d8ea2 SHA1 9c18b1016ede74e037533fc3b47c73296c3e186f SHA256 dfbd2f16bf4d25f3b39a6301a4770d68087eaad9e23b3a9f82365de8fe6ab6d1
-DIST firefox-3.6.28-mr.xpi 141163 RMD160 f3293e5a2b137cb74fc3ade09fd4b1fe452bc757 SHA1 e8c1afed2d5612e4e6acf67eee44ddc2eef18f06 SHA256 5cd3aea84e5c09c71067a31c66a3ede42dd352fca2b35033be760b82ef62849d
-DIST firefox-3.6.28-nb-NO.xpi 124097 RMD160 464dc66fe1bb443a77483ca1fcb46b4af48874cc SHA1 3a71daba86f62b5de187e5881a16a50d50b1150d SHA256 1248ee095bdb6caf93e294451c88efe7be34a860a4ab4637a65d0d9c06ca9b30
-DIST firefox-3.6.28-nl.xpi 126407 RMD160 79f6359c1de62b9320dedea18a8460d7152ff139 SHA1 e82e7ad824e1e751ec109d4ebdde8169abbd7119 SHA256 321fe5ee206a23200d18005baf78e7113bb26508d620e880589d5e68f6dbb3a0
-DIST firefox-3.6.28-nn-NO.xpi 125103 RMD160 d4a9ca2f45bc40b13389d0016c80e042929cd455 SHA1 110ab5fe3e267e3df0e5dadfc9af55c988f48212 SHA256 27c3a8acbc8987e271625a2b04745a31811fa71e29ebf90c3bc032c403fd15ee
-DIST firefox-3.6.28-oc.xpi 108300 RMD160 3b93f1a07c80babce3342dabbac4250d68c093cc SHA1 74803d8c43a198bf18db9eb289335bf5772341b3 SHA256 3a24134eb436dc96213b7fc2ac63724618169461c94766b271b5293bdcff0071
-DIST firefox-3.6.28-or.xpi 142442 RMD160 f9e85128ce581e5363b11b8de8656ea02e99e9ad SHA1 3d50fe8f8d89f857c7a36431391f6b3875a01d57 SHA256 8ef87f4e149b0f811c814d816b5a4320d021afcd243af7f281d8343cf553e414
-DIST firefox-3.6.28-pa-IN.xpi 142076 RMD160 32105b5d3c1abd9d4acd2e67248b577b0912c9c3 SHA1 ddcfea338c36bd0e15159e99f19482f5e54135ee SHA256 367ef972993f7a4b39ea56f07ea3ba4eecea3b8165e6c13ae0f5aa7c4931d4af
-DIST firefox-3.6.28-pl.xpi 131011 RMD160 f291a95272d4091bd51eaab04a6c5f93979bdf2a SHA1 cd41f0976eb1918cd12063446158e589510c6094 SHA256 183e64c4e1648e252464f519440c65a988ea6550448526d39822f561a4419475
-DIST firefox-3.6.28-pt-BR.xpi 125380 RMD160 c911b1dc32d14116543a55a5211140ecc6eb3a70 SHA1 54989003bbcbdabab7544c0a923245da04268281 SHA256 0d279cb57365b07e111b304de16bd726d0bd261417d1ca0cfd8e37e39222e5bf
-DIST firefox-3.6.28-pt-PT.xpi 125419 RMD160 adea3f817b197e7687b1d89d0f506b4ddc16f655 SHA1 bef57b35142f72eee2ca6ec921a1d1c6a4a738b8 SHA256 a8be45aa450334af70f09e9cdcd4f061ac1044397d4c79d1973840b044f6bd69
-DIST firefox-3.6.28-rm.xpi 127397 RMD160 f5b306ed31e8dfb937966c07e648cc70e6af707e SHA1 3883f55bba5e603c3a97f98438d081a33ac6fe3a SHA256 5b512dcb6e302157f2e5dc873ba2d391404246383419f313264fdeb967eccd97
-DIST firefox-3.6.28-ro.xpi 129113 RMD160 2685366c512b64910eef9ab7fa93ec01e3b56e4c SHA1 700dbf902c6452eebeea98bea85ca17f0d7424e0 SHA256 d78cd42af0514267478d384d81f7a05f1994444ef9b0c1ff7521488c96e26178
-DIST firefox-3.6.28-ru.xpi 124905 RMD160 cab81c0d4219863da7e165fa5d3165bdb68604c8 SHA1 3adc390670e9d32973c77993c4b477133e19de57 SHA256 0c93bcda9f72a0b1e24b21419a257a300c39ede77fba9619ce0f294c87ab8ca8
-DIST firefox-3.6.28-si.xpi 142186 RMD160 a3b79d942fc20d7db406ad7e10ea4436ae18da5e SHA1 1e33bfb727eb3b72d9274137c353faeee3615615 SHA256 3de0f77175f2a98497179a17ca7ed3a695da729e5e224be613bc8e001ca6c6f6
-DIST firefox-3.6.28-sk.xpi 131138 RMD160 3bb8e1a40e8646990efb98e7c07ffa2f3deb0a78 SHA1 e3c28df214c80310fb5ac12eb051ae556c30e654 SHA256 fc85b30c11600618810c218f406e64719f686f2a83d9fc0adcda018e9d76a067
-DIST firefox-3.6.28-sl.xpi 124259 RMD160 a1498e797adea8f9bd2ecdf73264cce18008e6ce SHA1 f6c68447dbc20b457fb91249bc55e71bb8d5a9a8 SHA256 459a1eb278dc2461242edeadd362bc954b3eac0ce2e30255178238088e6a3c8e
-DIST firefox-3.6.28-sq.xpi 121257 RMD160 9195d9e9cb0eeaa59ae062d6a10ce119d4633eeb SHA1 29f0c42b63ab4e62c5137358b60545726d7b769b SHA256 b0f52dbc0ebc027f1d2bad7614c4d15b9bcc45d9ce409357b1d1473cf5d583ef
-DIST firefox-3.6.28-sr.xpi 135918 RMD160 e9998ebf20c0940ffc1367d57d7bebb2d0f57016 SHA1 a715554c8591cde9799a1b1a462b341b15636c7e SHA256 5717dfb15df2593ef86c00ee6298dc0dff20324605cdfa7741bfba1dc295b5f0
-DIST firefox-3.6.28-sv-SE.xpi 128407 RMD160 e7ee90e2f12ccf333ac750202525680319b97c55 SHA1 5a7ffe5376aaf7d94ca8158e7e217fb07346ed42 SHA256 d249c6594f11264cdd4bcc0794bd93b76ede304871a33346ad8c48b81d0bdc10
-DIST firefox-3.6.28-ta-LK.xpi 149316 RMD160 27bff6c55e56fe48fd1fbaad31d4eb3ecc861510 SHA1 8fc515a9107b5020c339f9116b2b7a5b572c6ed8 SHA256 be0bb502eff1f4f9d92958a110ec80718a4499ac087ed44be9b331b3bbc52239
-DIST firefox-3.6.28-ta.xpi 137229 RMD160 73cfcb988985fe26052f4f413f2bd40b5a0686a0 SHA1 0b9f477c615125615284ef9612ad82c6b6129111 SHA256 7f1230749f4680747712593e7f610934b659cc60b2ddd740c8e42ecce1c00aa4
-DIST firefox-3.6.28-te.xpi 147869 RMD160 47533372b0968912dbf755533d258ebac3f83828 SHA1 0a91dff4c4af35600ccd686e57268a68b668c07d SHA256 4008a74264bf7868f579fd60603331a8e17d903959a18f07e24ac2d85288c3cd
-DIST firefox-3.6.28-th.xpi 134362 RMD160 104d72b1546d0fe1662d3d1bd16d83470fab3d52 SHA1 cec4386597ded16c5560197061c5041d79c6156f SHA256 0edb6ddb8b4f0845d28ebf875726573f4b617cf5b56319c9e926f1ba87d3a52b
-DIST firefox-3.6.28-tr.xpi 125331 RMD160 ceeb441bd2a77dffd4a1d73544831dc64d9ee1cc SHA1 37d38c7b9b7dad54ce6887771db6488c09dc9641 SHA256 497ed0dfc89ab37a3fd25d1e6ff71cf48436d6684e42025f42e91480554ba1d6
-DIST firefox-3.6.28-uk.xpi 143220 RMD160 bc6ba9b542d3fd4250963305f11f5f649c96f6dd SHA1 4f5e97f482808486489cafe53260852d4750dd59 SHA256 55929d3d3203481ce6d9128b2ff3d23f9c475971278d8369766f28baae0f3a79
-DIST firefox-3.6.28-vi.xpi 129050 RMD160 a9e26532fb26dc7948d328645997898fa60f4df6 SHA1 cbbe75ec6ab50b7caae06f056f877aeb89ae5602 SHA256 ec9baa4eda233c3d761f2c6055258f9c50efa5bcfda4f374bedd8e8e5423b46c
-DIST firefox-3.6.28-zh-CN.xpi 127120 RMD160 b1392206eb2dc00de2015a2795512a88db100152 SHA1 f6bd91a6e8567cead3db517bf5991d540de47aca SHA256 1fbabdaabb77e3778724b7096e533629c4ddbd874daaa630b6e50f93aa0e3671
-DIST firefox-3.6.28-zh-TW.xpi 128540 RMD160 1ea21485aa2d5a88edb5ae5e4d4c29c18e7c55d6 SHA1 d54d398ead916fa913cb719e32b742c85c93733b SHA256 55967cbece083c3bde56176c5d69162fa1d54fe59b440e76140433757a318814
-DIST firefox-3.6.28.source.tar.bz2 51698958 RMD160 87cfca8e3f1df30e06eccffbf994825904eeedbc SHA1 adeaa9bdd367878c5b522766e681798178e31577 SHA256 a6c4bc52095194428cf3b17341b68ac473b7654984000c45d1be3eae55d78260
-EBUILD firefox-3.6.28-r1.ebuild 9553 RMD160 0845d1a69c444a01287e49263e069db3be5b8ef7 SHA1 26e53dbb1e07c305bfddf2dd6a4be0340428af54 SHA256 f58b8671703e71bb5300a6847b13c95b55bf06b797cc8ab09ac7cfed1e893e6f
-EBUILD firefox-3.6.28.ebuild 9523 RMD160 af34a0d8978f388cf1942bd6c8fc3ecfbc085839 SHA1 694c01f35aedb7b5e184ea88680c8969d0a24a55 SHA256 80098e0602421a674292e57f79718f8da318f63a60c925627b92704ed9d68355
diff --git a/www-client/firefox/files/esr10.4 b/www-client/firefox/files/esr10.4
deleted file mode 100644
index 292d150..0000000
--- a/www-client/firefox/files/esr10.4
+++ /dev/null
@@ -1,54 +0,0 @@
-
-# HG changeset patch
-# User Mats Palmgren <matspal@gmail.com>
-# Date 1333489933 -7200
-# Node ID 076f467733b45aa2e058a3d2318d2eb956b449b3
-# Parent  f66c6b1c5ee647a22acf29b357bbf4284c6f7d55
-Bug 732941 - Deal with OOM when copying nsCOMArray.  r=bz a=akeybl
-
-diff --git a/layout/generic/nsSelection.cpp b/layout/generic/nsSelection.cpp
---- a/layout/generic/nsSelection.cpp
-+++ b/layout/generic/nsSelection.cpp
-@@ -5727,34 +5727,33 @@ nsTypedSelection::RemoveSelectionListene
- 
- 
- nsresult
- nsTypedSelection::NotifySelectionListeners()
- {
-   if (!mFrameSelection)
-     return NS_OK;//nothing to do
-  
--  if (mFrameSelection->GetBatching()){
-+  if (mFrameSelection->GetBatching()) {
-     mFrameSelection->SetDirty();
-     return NS_OK;
-   }
--  PRInt32 cnt = mSelectionListeners.Count();
-   nsCOMArray<nsISelectionListener> selectionListeners(mSelectionListeners);
--  
-+  PRInt32 cnt = selectionListeners.Count();
-+  if (cnt != mSelectionListeners.Count()) {
-+    return NS_ERROR_OUT_OF_MEMORY;  // nsCOMArray is fallible
-+  }
-   nsCOMPtr<nsIDOMDocument> domdoc;
-   nsCOMPtr<nsIPresShell> shell;
-   nsresult rv = GetPresShell(getter_AddRefs(shell));
-   if (NS_SUCCEEDED(rv) && shell)
-     domdoc = do_QueryInterface(shell->GetDocument());
-   short reason = mFrameSelection->PopReason();
--  for (PRInt32 i = 0; i < cnt; i++)
--  {
--    nsISelectionListener* thisListener = selectionListeners[i];
--    if (thisListener)
--      thisListener->NotifySelectionChanged(domdoc, this, reason);
-+  for (PRInt32 i = 0; i < cnt; i++) {
-+    selectionListeners[i]->NotifySelectionChanged(domdoc, this, reason);
-   }
-   return NS_OK;
- }
- 
- NS_IMETHODIMP
- nsTypedSelection::StartBatchChanges()
- {
-   if (mFrameSelection)
-
diff --git a/www-client/firefox/files/firefox-default-prefs.js b/www-client/firefox/files/firefox-default-prefs.js
deleted file mode 100644
index f7c031e..0000000
--- a/www-client/firefox/files/firefox-default-prefs.js
+++ /dev/null
@@ -1,2 +0,0 @@
-pref("browser.tabs.tabMinWidth",           15);
-pref("browser.backspace_action",           0);
diff --git a/www-client/firefox/files/firefox.1 b/www-client/firefox/files/firefox.1
deleted file mode 100644
index 2086325..0000000
--- a/www-client/firefox/files/firefox.1
+++ /dev/null
@@ -1,125 +0,0 @@
-.TH FIREFOX 1 "August 07, 2001" firefox "Linux User's Manual"
-.SH NAME
-firefox \- a Web browser for X11 derived from the Mozilla browser
-
-.SH SYNOPSIS
-.B firefox
-[\fIOPTIONS\fR] [\fIURL\fR]
-
-.B firefox-bin
-[\fIOPTIONS\fR] [\fIURL\fR]
-
-.SH DESCRIPTION
-\fBMozilla Firefox\fR is an open-source web browser, designed for
-standards compliance, performance and portability.
-
-.SH USAGE
-\fBfirefox\fR is a simple shell script that will set up the
-environment for the actual executable, \fBfirefox-bin\fR.
-
-.SH OPTIONS
-A summary of the options supported by \fBfirefox\fR is included below.
-
-.SS "GTK options"
-\fB\-\-gdk-debug=\fR\fIFLAGS\fR
-Gdk debugging flags to set
-.TP
-\fB\-\-gdk-no-debug=\fR\fIFLAGS\fR
-Gdk debugging flags to unset
-.TP
-\fB\-\-gtk-debug=\fR\fIFLAGS\fR
-Gtk+ debugging flags to set
-.TP
-\fB\-\-gtk-no-debug=\fR\fIFLAGS\fR
-Gtk+ debugging flags to unset
-.TP
-\fB\-\-gtk-module=\fR\fIMODULE\fR
-Load an additional Gtk module
-
-.SS "X11 options"
-.TP
-.BI \-\-display= DISPLAY
-X display to use
-.TP
-.B \--sync
-Make X calls synchronous
-.TP
-.B \-\-no-xshm
-Don't use X shared memory extension
-.TP
-.BI \-\-xim-preedit= STYLE
-.TP
-.BI \-\-xim-status= STYLE
-.TP
-.B \-\-g-fatal-warnings
-Make all warnings fatal
-
-.SS "Firefox options"
-.TP
-\fB\-height\fR \fIvalue\fR
-Set height of startup window to \fIvalue\fR.
-.TP
-.B \-h, \-help
-Show summary of options.
-.TP
-.B \-installer
-Start with 4.x migration window.
-.TP
-\fB\-width\fR \fIvalue\fR
-Set width of startup window to \fIvalue\fR.
-.TP
-.B \-v, \-version
-Print \fB/usr/bin/firefox-bin\fR version.
-.TP
-\fB\-CreateProfile\fR \fIprofile\fR
-Create \fIprofile\fR.
-.TP
-\fB\-P\fR \fIprofile\fR
-Start with \fIprofile\fR.
-.TP
-.B \-ProfileWizard
-Start with profile wizard.
-.TP
-.B \-ProfileManager
-Start with profile manager.
-.TP
-.B \-SelectProfile
-Start with profile selection dialog.
-.TP
-\fB\-lang\fR \fIlang-region\fR
-Start with \fIlang-region\fR resources.
-.TP
-\fB\-remote\fR \fIcommand\fR
-Execute \fIcommand\fR in an already running Firefox process.  For more info,
-see: \fIhttp://www.mozilla.org/unix/remote.html\fR
-.TP
-.B \-splash
-Enable splash screen.
-.TP
-.B \-jsconsole
-Start with Javascript Console
-.TP
-\fB\-chrome\fR \fIurl\fR
-Load the specified chrome.
-.TP
-
-.SH FILES
-\fI/usr/bin/firefox\fR - shell script wrapping
-\fBfirefox\fR
-.br
-\fI/usr/lib/mozilla/firefox-bin\fR - \fBfirefox\fR
-executable
-
-.SH VERSION
-1.0
-
-.SH BUGS
-To report a bug, please visit \fIhttp://bugzilla.mozilla.org/\fR
-
-.SH "SEE ALSO"
-.BR mozilla(1)
-
-.SH AUTHORS
-.TP
-.B The Mozilla Organization
-.I http://www.mozilla.org/about.html
diff --git a/www-client/firefox/files/fix-preferences-gentoo.patch b/www-client/firefox/files/fix-preferences-gentoo.patch
deleted file mode 100644
index a8ba90f..0000000
--- a/www-client/firefox/files/fix-preferences-gentoo.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/browser/installer/package-manifest.in	2011-03-24 23:01:23.543000001 -0500
-+++ b/browser/installer/package-manifest.in	2011-03-24 23:02:01.927000001 -0500
-@@ -444,6 +444,7 @@
- 
- ; [Default Preferences]
- ; All the pref files must be part of base to prevent migration bugs
-+@BINPATH@/@PREF_DIR@/all-gentoo.js
- @BINPATH@/@PREF_DIR@/firefox.js
- @BINPATH@/@PREF_DIR@/firefox-branding.js
- @BINPATH@/@PREF_DIR@/channel-prefs.js
diff --git a/www-client/firefox/files/gentoo-default-prefs.js b/www-client/firefox/files/gentoo-default-prefs.js
deleted file mode 100644
index 4546d3f..0000000
--- a/www-client/firefox/files/gentoo-default-prefs.js
+++ /dev/null
@@ -1,14 +0,0 @@
-pref("app.update.enabled",                 false);
-pref("app.update.autoInstallEnabled",      false);
-pref("browser.display.use_system_colors",  true);
-pref("browser.link.open_external",         3);
-pref("general.smoothScroll",               true);
-pref("general.autoScroll",                 false);
-pref("browser.tabs.tabMinWidth",           15);
-pref("browser.backspace_action",           0);
-pref("browser.urlbar.hideGoButton",        true);
-pref("accessibility.typeaheadfind",        true);
-pref("browser.shell.checkDefaultBrowser",  false); 
-pref("browser.EULA.override",              true); 
-pref("general.useragent.vendor", "Gentoo");
-pref("intl.locale.matchOS", true);
diff --git a/www-client/firefox/files/gentoo-default-prefs.js-1 b/www-client/firefox/files/gentoo-default-prefs.js-1
deleted file mode 100644
index 22a51ff..0000000
--- a/www-client/firefox/files/gentoo-default-prefs.js-1
+++ /dev/null
@@ -1,17 +0,0 @@
-pref("app.update.enabled",                 false);
-pref("app.update.autoInstallEnabled",      false);
-pref("browser.display.use_system_colors",  true);
-pref("browser.link.open_external",         3);
-pref("general.smoothScroll",               true);
-pref("general.autoScroll",                 false);
-pref("browser.tabs.tabMinWidth",           15);
-pref("browser.backspace_action",           0);
-pref("browser.urlbar.hideGoButton",        true);
-pref("accessibility.typeaheadfind",        true);
-pref("browser.shell.checkDefaultBrowser",  false); 
-pref("browser.EULA.override",              true); 
-pref("general.useragent.vendor", "Gentoo");
-pref("intl.locale.matchOS", true);
-pref("general.useragent.locale", "chrome://global/locale/intl.properties");
-pref("extensions.autoDisableScopes", 0);
-pref("layout.css.dpi", 0);
diff --git a/www-client/firefox/files/icon/firefox-1.5-unbranded.desktop b/www-client/firefox/files/icon/firefox-1.5-unbranded.desktop
deleted file mode 100644
index 4c8fbda..0000000
--- a/www-client/firefox/files/icon/firefox-1.5-unbranded.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Bon Echo
-Comment=Web Browser
-Exec=/usr/bin/firefox %U
-Icon=firefox-icon-unbranded
-Terminal=false
-Type=Application
-MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https;
-Categories=Network;WebBrowser;
diff --git a/www-client/firefox/files/icon/firefox-1.5.desktop b/www-client/firefox/files/icon/firefox-1.5.desktop
deleted file mode 100644
index 742f947..0000000
--- a/www-client/firefox/files/icon/firefox-1.5.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Mozilla Firefox
-Comment=Web Browser
-Exec=/usr/bin/firefox %U
-Icon=firefox-icon
-Terminal=false
-Type=Application
-MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https;
-Categories=Network;WebBrowser;
diff --git a/www-client/firefox/files/icon/firefox.desktop b/www-client/firefox/files/icon/firefox.desktop
deleted file mode 100644
index 35999a8..0000000
--- a/www-client/firefox/files/icon/firefox.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=@NAME@
-Comment=Web Browser
-Exec=firefox %U
-Icon=@ICON@
-Terminal=false
-Type=Application
-MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https;
-Categories=Network;WebBrowser;
diff --git a/www-client/firefox/files/xulrunner-1.9.2-gtk+-2.21.patch b/www-client/firefox/files/xulrunner-1.9.2-gtk+-2.21.patch
deleted file mode 100644
index 8a1e831..0000000
--- a/www-client/firefox/files/xulrunner-1.9.2-gtk+-2.21.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-# HG changeset patch
-# User Jonathan Callen <abcd@gentoo.org>
-# Parent 2599ed882191d88a8e8f0cb68492a156163c5ca7
-pass MOZ_GTK_CFLAGS to ensure proper includes are avaliable.
-
-diff --git a/toolkit/system/gnome/Makefile.in b/toolkit/system/gnome/Makefile.in
---- a/toolkit/system/gnome/Makefile.in
-+++ b/toolkit/system/gnome/Makefile.in
-@@ -84,13 +84,14 @@ EXTRA_DSO_LDOPTS += \
- 		$(MOZ_LIBNOTIFY_LIBS) \
- 		$(NULL)
- 
- LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/components/build/
- 
- include $(topsrcdir)/config/rules.mk
- 
- CXXFLAGS += \
-+	$(MOZ_GTK2_CFLAGS) \
- 	$(MOZ_GCONF_CFLAGS) \
- 	$(MOZ_GNOMEVFS_CFLAGS) \
- 	$(GLIB_CFLAGS) \
- 	$(MOZ_LIBNOTIFY_CFLAGS) \
- 	$(NULL)
diff --git a/www-client/firefox/firefox-3.6.28-r1.ebuild b/www-client/firefox/firefox-3.6.28-r1.ebuild
deleted file mode 100644
index 19556cf..0000000
--- a/www-client/firefox/firefox-3.6.28-r1.ebuild
+++ /dev/null
@@ -1,289 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/firefox-3.6.22.ebuild,v 1.3 2011/12/11 14:33:51 armin76 Exp $
-EAPI="3"
-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 python
-
-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 ta-LK te th tr uk vi zh-CN zh-TW"
-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
-PATCH="${PN}-3.6-patches-0.4"
-
-DESCRIPTION="Firefox Web Browser"
-HOMEPAGE="http://www.mozilla.com/firefox"
-
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
-IUSE="+alsa bindist gnome +ipc java libnotify system-sqlite wifi"
-
-#REL_URI="http://releases.mozilla.org/pub/mozilla.org/firefox/releases"
-REL_URI="ftp://archive.mozilla.org/pub/mozilla.org/firefox/releases/"
-SRC_URI="${REL_URI}/${MY_PV}/source/firefox-${MY_PV}.source.tar.bz2
-	http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.bz2"
-
-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 -> ${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%%-*}? ( ${REL_URI}/${PV}/linux-i686/xpi/${X}.xpi -> ${P}-${X}.xpi )"
-		fi
-		IUSE="${IUSE} linguas_${X%%-*}"
-	fi
-done
-
-RDEPEND="
-	>=sys-devel/binutils-2.16.1
-	>=dev-libs/nss-3.12.8
-	>=dev-libs/nspr-4.8.6
-	>=app-text/hunspell-1.2
-	system-sqlite? ( >=dev-db/sqlite-3.7.4[fts3,secure-delete] )
-	alsa? ( media-libs/alsa-lib )
-	>=x11-libs/cairo-1.8.8[X]
-	gnome? ( >=gnome-base/gnome-vfs-2.16.3
-		>=gnome-base/libgnomeui-2.16.1
-		>=gnome-base/gconf-2.16.0
-		>=gnome-base/libgnome-2.16.0 )
-	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-lang/python-2*[threads]
-	dev-util/pkgconfig"
-
-RDEPEND="${RDEPEND} java? ( >=virtual/jre-1.4 )"
-
-S="${WORKDIR}/mozilla-1.9.2"
-
-# 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}/firefox"
-
-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
-}
-
-# XXX FIXME XXX: All refs to mozilla-${PN} need to become ${PN} with the next bump
-# Note that this WILL cause breakage for packages that use fx's libdir and includedir
-pkg_setup() {
-	# Ensure we always build with C locale.
-	export LANG="C"
-	export LC_ALL="C"
-	export LC_MESSAGES="C"
-	export LC_CTYPE="C"
-
-	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
-
-	java-pkg-opt-2_pkg_setup
-
-	python_set_active_version 2
-}
-
-src_unpack() {
-	unpack firefox-${MY_PV}.source.tar.bz2 ${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() {
-	# Apply our patches
-	EPATCH_SUFFIX="patch" \
-	EPATCH_FORCE="yes" \
-	epatch "${WORKDIR}"
-	epatch "${FILESDIR}/esr10.4"
-
-	# Allow user to apply additional patches without modifing ebuild
-	epatch_user
-
-	eautoreconf
-
-	cd js/src
-	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 '' --enable-crypto
-	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 --with-nspr-prefix="${EPREFIX}"/usr
-	mozconfig_annotate '' --with-system-nss --with-nss-prefix="${EPREFIX}"/usr
-	mozconfig_annotate '' --x-includes="${EPREFIX}"/usr/include	--x-libraries="${EPREFIX}"/usr/$(get_libdir)
-	mozconfig_annotate '' --with-system-bz2
-	mozconfig_annotate '' --with-system-libxul
-	mozconfig_annotate '' --with-libxul-sdk="${EPREFIX}"/usr/$(get_libdir)/xulrunner-devel-${MAJ_XUL_PV}
-
-	mozconfig_use_enable gnome gnomevfs
-	mozconfig_use_enable gnome gnomeui
-	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
-	mozconfig_use_enable !bindist official-branding
-
-	# Other ff-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)" PYTHON="$(PYTHON)" 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
-	if ! use bindist ; then
-		newicon "${S}"/other-licenses/branding/firefox/content/icon48.png ${PN}-icon.png
-		newmenu "${FILESDIR}"/icon/${PN}-1.5.desktop \
-			mozilla-${PN}-${DESKTOP_PV}.desktop
-	else
-		newicon "${S}"/browser/branding/unofficial/content/icon48.png ${PN}-icon-unbranded.png
-		newmenu "${FILESDIR}"/icon/${PN}-1.5-unbranded.desktop \
-			mozilla-${PN}-${DESKTOP_PV}.desktop
-		sed -i -e "s:Bon\ Echo:Namoroka:" \
-			"${ED}"/usr/share/applications/mozilla-${PN}-${DESKTOP_PV}.desktop || die "sed failed!"
-	fi
-
-	# Add StartupNotify=true bug 237317
-	if use startup-notification ; then
-		echo "StartupNotify=true" >> "${ED}"/usr/share/applications/mozilla-${PN}-${DESKTOP_PV}.desktop
-	fi
-
-	pax-mark m "${ED}"/${MOZILLA_FIVE_HOME}/firefox
-
-	# Enable very specific settings not inherited from xulrunner
-	cp "${FILESDIR}"/firefox-default-prefs.js \
-		"${ED}/${MOZILLA_FIVE_HOME}/defaults/preferences/all-gentoo.js" || \
-		die "failed to cp firefox-default-prefs.js"
-
-	# Plugins dir
-	dosym ../nsbrowser/plugins "${MOZILLA_FIVE_HOME}"/plugins \
-		|| die "failed to symlink"
-
-	# very ugly hack to make firefox not sigbus on sparc
-	use sparc && { sed -e 's/Firefox/FirefoxGentoo/g' \
-					 -i "${ED}/${MOZILLA_FIVE_HOME}/application.ini" || \
-					 die "sparc sed failed"; }
-}
-
-pkg_postinst() {
-	ewarn "We have finished moving away from mozilla-${PN}"
-	ewarn "to plain jane ${PN}. If for some reason you have a bug"
-	ewarn "that results please open a report and assign to maintainer"
-	ewarn "with mozilla@gentoo.org being CC'd on the bug report."
-	elog
-
-	# Update mimedb for the new .desktop file
-	fdo-mime_desktop_database_update
-}
diff --git a/www-client/firefox/firefox-3.6.28.ebuild b/www-client/firefox/firefox-3.6.28.ebuild
deleted file mode 100644
index fca2a43..0000000
--- a/www-client/firefox/firefox-3.6.28.ebuild
+++ /dev/null
@@ -1,288 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/firefox-3.6.22.ebuild,v 1.3 2011/12/11 14:33:51 armin76 Exp $
-EAPI="3"
-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 python
-
-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 ta-LK te th tr uk vi zh-CN zh-TW"
-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
-PATCH="${PN}-3.6-patches-0.4"
-
-DESCRIPTION="Firefox Web Browser"
-HOMEPAGE="http://www.mozilla.com/firefox"
-
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
-IUSE="+alsa bindist gnome +ipc java libnotify system-sqlite wifi"
-
-#REL_URI="http://releases.mozilla.org/pub/mozilla.org/firefox/releases"
-REL_URI="ftp://archive.mozilla.org/pub/mozilla.org/firefox/releases/"
-SRC_URI="${REL_URI}/${MY_PV}/source/firefox-${MY_PV}.source.tar.bz2
-	http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.bz2"
-
-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 -> ${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%%-*}? ( ${REL_URI}/${PV}/linux-i686/xpi/${X}.xpi -> ${P}-${X}.xpi )"
-		fi
-		IUSE="${IUSE} linguas_${X%%-*}"
-	fi
-done
-
-RDEPEND="
-	>=sys-devel/binutils-2.16.1
-	>=dev-libs/nss-3.12.8
-	>=dev-libs/nspr-4.8.6
-	>=app-text/hunspell-1.2
-	system-sqlite? ( >=dev-db/sqlite-3.7.4[fts3,secure-delete] )
-	alsa? ( media-libs/alsa-lib )
-	>=x11-libs/cairo-1.8.8[X]
-	gnome? ( >=gnome-base/gnome-vfs-2.16.3
-		>=gnome-base/libgnomeui-2.16.1
-		>=gnome-base/gconf-2.16.0
-		>=gnome-base/libgnome-2.16.0 )
-	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-lang/python-2*[threads]
-	dev-util/pkgconfig"
-
-RDEPEND="${RDEPEND} java? ( >=virtual/jre-1.4 )"
-
-S="${WORKDIR}/mozilla-1.9.2"
-
-# 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}/firefox"
-
-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
-}
-
-# XXX FIXME XXX: All refs to mozilla-${PN} need to become ${PN} with the next bump
-# Note that this WILL cause breakage for packages that use fx's libdir and includedir
-pkg_setup() {
-	# Ensure we always build with C locale.
-	export LANG="C"
-	export LC_ALL="C"
-	export LC_MESSAGES="C"
-	export LC_CTYPE="C"
-
-	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
-
-	java-pkg-opt-2_pkg_setup
-
-	python_set_active_version 2
-}
-
-src_unpack() {
-	unpack firefox-${MY_PV}.source.tar.bz2 ${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() {
-	# Apply our patches
-	EPATCH_SUFFIX="patch" \
-	EPATCH_FORCE="yes" \
-	epatch "${WORKDIR}"
-
-	# Allow user to apply additional patches without modifing ebuild
-	epatch_user
-
-	eautoreconf
-
-	cd js/src
-	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 '' --enable-crypto
-	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 --with-nspr-prefix="${EPREFIX}"/usr
-	mozconfig_annotate '' --with-system-nss --with-nss-prefix="${EPREFIX}"/usr
-	mozconfig_annotate '' --x-includes="${EPREFIX}"/usr/include	--x-libraries="${EPREFIX}"/usr/$(get_libdir)
-	mozconfig_annotate '' --with-system-bz2
-	mozconfig_annotate '' --with-system-libxul
-	mozconfig_annotate '' --with-libxul-sdk="${EPREFIX}"/usr/$(get_libdir)/xulrunner-devel-${MAJ_XUL_PV}
-
-	mozconfig_use_enable gnome gnomevfs
-	mozconfig_use_enable gnome gnomeui
-	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
-	mozconfig_use_enable !bindist official-branding
-
-	# Other ff-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)" PYTHON="$(PYTHON)" 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
-	if ! use bindist ; then
-		newicon "${S}"/other-licenses/branding/firefox/content/icon48.png ${PN}-icon.png
-		newmenu "${FILESDIR}"/icon/${PN}-1.5.desktop \
-			mozilla-${PN}-${DESKTOP_PV}.desktop
-	else
-		newicon "${S}"/browser/branding/unofficial/content/icon48.png ${PN}-icon-unbranded.png
-		newmenu "${FILESDIR}"/icon/${PN}-1.5-unbranded.desktop \
-			mozilla-${PN}-${DESKTOP_PV}.desktop
-		sed -i -e "s:Bon\ Echo:Namoroka:" \
-			"${ED}"/usr/share/applications/mozilla-${PN}-${DESKTOP_PV}.desktop || die "sed failed!"
-	fi
-
-	# Add StartupNotify=true bug 237317
-	if use startup-notification ; then
-		echo "StartupNotify=true" >> "${ED}"/usr/share/applications/mozilla-${PN}-${DESKTOP_PV}.desktop
-	fi
-
-	pax-mark m "${ED}"/${MOZILLA_FIVE_HOME}/firefox
-
-	# Enable very specific settings not inherited from xulrunner
-	cp "${FILESDIR}"/firefox-default-prefs.js \
-		"${ED}/${MOZILLA_FIVE_HOME}/defaults/preferences/all-gentoo.js" || \
-		die "failed to cp firefox-default-prefs.js"
-
-	# Plugins dir
-	dosym ../nsbrowser/plugins "${MOZILLA_FIVE_HOME}"/plugins \
-		|| die "failed to symlink"
-
-	# very ugly hack to make firefox not sigbus on sparc
-	use sparc && { sed -e 's/Firefox/FirefoxGentoo/g' \
-					 -i "${ED}/${MOZILLA_FIVE_HOME}/application.ini" || \
-					 die "sparc sed failed"; }
-}
-
-pkg_postinst() {
-	ewarn "We have finished moving away from mozilla-${PN}"
-	ewarn "to plain jane ${PN}. If for some reason you have a bug"
-	ewarn "that results please open a report and assign to maintainer"
-	ewarn "with mozilla@gentoo.org being CC'd on the bug report."
-	elog
-
-	# Update mimedb for the new .desktop file
-	fdo-mime_desktop_database_update
-}