packages: Separate out most of the remaining packages into recipes

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>

569 files changed, 0 insertions, 5161 deletions

diff --git a/meta/packages/libidl/libidl_0.8.12.bb b/meta/packages/libidl/libidl_0.8.12.bb
deleted file mode 100644
index 9cc9ea2ed8..0000000000
--- a/meta/packages/libidl/libidl_0.8.12.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-LICENSE = "LGPL"
-DESCRIPTION = "Library for parsing CORBA IDL files"
-SECTION = "gnome/libs"
-DEPENDS = "glib-2.0 flex"
-PR = "r4"
-
-SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/libIDL/0.8/libIDL-${PV}.tar.bz2"
-S = "${WORKDIR}/libIDL-${PV}"
-
-BINCONFIG_GLOB = "*-config-2"
-inherit autotools pkgconfig binconfig
-
-FILES_${PN} = "${libdir}/*.so.*"
-FILES_${PN}-dev += " ${bindir}" 
-
-BBCLASSEXTEND = "native"
diff --git a/meta/packages/librds/librds_0.0.1.bb b/meta/packages/librds/librds_0.0.1.bb
deleted file mode 100644
index 3c99ec1ba0..0000000000
--- a/meta/packages/librds/librds_0.0.1.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-DESCRIPTION = "A software library for accessing RDS data"
-HOMEPAGE = "http://rdsd.berlios.de/"
-SECTION = "libs"
-PROVIDES = "librds"
-LICENSE = "GPLv2"
-
-PR = "r1"
-
-SRC_URI = "http://download.berlios.de/rdsd/librds-${PV}.tar.gz"
-
-inherit autotools pkgconfig
diff --git a/meta/packages/mozilla-headless/mozilla-headless-services/confighack.patch b/meta/packages/mozilla-headless/mozilla-headless-services/confighack.patch
deleted file mode 100644
index dcfe11e0ff..0000000000
--- a/meta/packages/mozilla-headless/mozilla-headless-services/confighack.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: places-glib/configure.ac
-===================================================================
---- places-glib.orig/configure.ac       2009-04-17 10:29:15.000000000 +0100
-+++ places-glib/configure.ac    2009-04-17 10:29:44.000000000 +0100
-@@ -99,6 +99,8 @@
- PKG_CHECK_MODULES(GLIB, [glib-2.0])
- PKG_CHECK_MODULES(DBUS, [dbus-glib-1])
- 
-+XUL_LIBS="$XUL_LIBS -lmozjs"
-+
- MOZHOME=`${PKG_CONFIG} --variable=prefix mozilla-headless`"/lib/xulrunner-"`${PKG_CONFIG} --modversion mozilla-headless`
- AC_SUBST([MOZHOME])
- 
diff --git a/meta/packages/mozilla-headless/mozilla-headless-services_git.bb b/meta/packages/mozilla-headless/mozilla-headless-services_git.bb
deleted file mode 100644
index 14d64fa8c3..0000000000
--- a/meta/packages/mozilla-headless/mozilla-headless-services_git.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-SRC_URI = "git://git.moblin.org/mozilla-headless-services.git;protocol=git \
-           file://confighack.patch;patch=1"
-PV = "0.1+git${SRCPV}"
-PR = "r1"
-
-DEPENDS = "glib-2.0 dbus mozilla-headless json-glib"
-
-EXTRA_OECONF = "--enable-gnome-proxy"
-
-S = "${WORKDIR}/git"
-
-FILES_${PN} += "${datadir}/dbus-1/services"
-
-inherit autotools
diff --git a/meta/packages/mozilla-headless/mozilla-headless/0001-Adds-initial-Gtk-clipboard-support-to-moz-headless.patch b/meta/packages/mozilla-headless/mozilla-headless/0001-Adds-initial-Gtk-clipboard-support-to-moz-headless.patch
deleted file mode 100644
index db9e147990..0000000000
--- a/meta/packages/mozilla-headless/mozilla-headless/0001-Adds-initial-Gtk-clipboard-support-to-moz-headless.patch
+++ /dev/null
@@ -1,1478 +0,0 @@
-From fb41f028badb4dfddfc47fb2a1a68c1aa90dcef5 Mon Sep 17 00:00:00 2001
-From: Robert Bragg <robert@linux.intel.com>
-Date: Fri, 8 May 2009 13:57:22 +0100
-Subject: [PATCH] Adds initial Gtk clipboard support to moz-headless
-
-If build with MOZ_X11 enabled then this now builds the clipboard code taken
-from the gtk2 backend.  This doesn't provide any embedding API yet to expose
-the clipboard.
----
- widget/src/headless/Makefile.in         |    6 +
- widget/src/headless/nsClipboard.cpp     |  948 +++++++++++++++++++++++++++++++
- widget/src/headless/nsClipboard.h       |   93 +++
- widget/src/headless/nsIImageToPixbuf.h  |   62 ++
- widget/src/headless/nsImageToPixbuf.cpp |  196 +++++++
- widget/src/headless/nsImageToPixbuf.h   |   71 +++
- widget/src/headless/nsWidgetFactory.cpp |   18 +
- 7 files changed, 1394 insertions(+), 0 deletions(-)
- create mode 100644 widget/src/headless/nsClipboard.cpp
- create mode 100644 widget/src/headless/nsClipboard.h
- create mode 100644 widget/src/headless/nsIImageToPixbuf.h
- create mode 100644 widget/src/headless/nsImageToPixbuf.cpp
- create mode 100644 widget/src/headless/nsImageToPixbuf.h
-
-Index: offscreen/widget/src/headless/Makefile.in
-===================================================================
---- offscreen.orig/widget/src/headless/Makefile.in      2009-05-16 18:23:25.000000000 +0100
-+++ offscreen/widget/src/headless/Makefile.in   2009-06-12 14:14:05.000000000 +0100
-@@ -95,6 +95,12 @@
-                nsScreenManagerHeadless.cpp \
-                $(NULL)
- 
-+ifdef MOZ_X11
-+CPPSRCS +=      nsClipboard.cpp \
-+               nsImageToPixbuf.cpp \
-+                $(NULL)
-+endif
-+
- # build our subdirs, too
- SHARED_LIBRARY_LIBS = ../xpwidgets/libxpwidgets_s.a
- 
-Index: offscreen/widget/src/headless/nsClipboard.cpp
-===================================================================
---- /dev/null   1970-01-01 00:00:00.000000000 +0000
-+++ offscreen/widget/src/headless/nsClipboard.cpp       2009-06-12 14:14:05.000000000 +0100
-@@ -0,0 +1,948 @@
-+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-+/* vim:expandtab:shiftwidth=4:tabstop=4:
-+ */
-+/* ***** BEGIN LICENSE BLOCK *****
-+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
-+ *
-+ * The contents of this file are subject to the Mozilla Public License Version
-+ * 1.1 (the "License"); you may not use this file except in compliance with
-+ * the License. You may obtain a copy of the License at
-+ * http://www.mozilla.org/MPL/
-+ *
-+ * Software distributed under the License is distributed on an "AS IS" basis,
-+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-+ * for the specific language governing rights and limitations under the
-+ * License.
-+ *
-+ * The Original Code is mozilla.org code.
-+ *
-+ * The Initial Developer of the Original Code is Christopher Blizzard
-+ * <blizzard@mozilla.org>.  Portions created by the Initial Developer
-+ * are Copyright (C) 2001 the Initial Developer. All Rights Reserved.
-+ *
-+ * Contributor(s):
-+ *
-+ * Alternatively, the contents of this file may be used under the terms of
-+ * either the GNU General Public License Version 2 or later (the "GPL"), or
-+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-+ * in which case the provisions of the GPL or the LGPL are applicable instead
-+ * of those above. If you wish to allow use of your version of this file only
-+ * under the terms of either the GPL or the LGPL, and not to allow others to
-+ * use your version of this file under the terms of the MPL, indicate your
-+ * decision by deleting the provisions above and replace them with the notice
-+ * and other provisions required by the GPL or the LGPL. If you do not delete
-+ * the provisions above, a recipient may use your version of this file under
-+ * the terms of any one of the MPL, the GPL or the LGPL.
-+ *
-+ * ***** END LICENSE BLOCK ***** */
-+
-+#include "nsClipboard.h"
-+#include "nsSupportsPrimitives.h"
-+#include "nsString.h"
-+#include "nsReadableUtils.h"
-+#include "nsXPIDLString.h"
-+#include "nsPrimitiveHelpers.h"
-+#include "nsICharsetConverterManager.h"
-+#include "nsIServiceManager.h"
-+#include "nsIImage.h"
-+#include "nsImageToPixbuf.h"
-+#include "nsStringStream.h"
-+
-+#include <gtk/gtk.h>
-+
-+// For manipulation of the X event queue
-+#include <X11/Xlib.h>
-+#include <gdk/gdkx.h>
-+#include <sys/time.h>
-+#include <sys/types.h>
-+#include <unistd.h>
-+
-+#ifdef POLL_WITH_XCONNECTIONNUMBER
-+#include <poll.h>
-+#endif
-+
-+// Callback when someone asks us for the selection
-+void
-+invisible_selection_get_cb (GtkWidget          *aWidget,
-+                            GtkSelectionData   *aSelectionData,
-+                            guint               aTime,
-+                            guint               aInfo,
-+                            nsClipboard        *aClipboard);
-+
-+gboolean
-+selection_clear_event_cb   (GtkWidget          *aWidget,
-+                            GdkEventSelection  *aEvent,
-+                            nsClipboard        *aClipboard);
-+
-+static void
-+ConvertHTMLtoUCS2          (guchar             *data,
-+                            PRInt32             dataLength,
-+                            PRUnichar         **unicodeData,
-+                            PRInt32            &outUnicodeLen);
-+
-+static void
-+GetHTMLCharset             (guchar * data, PRInt32 dataLength, nsCString& str);
-+
-+
-+// Our own versions of gtk_clipboard_wait_for_contents and
-+// gtk_clipboard_wait_for_text, which don't run the event loop while
-+// waiting for the data.  This prevents a lot of problems related to
-+// dispatching events at unexpected times.
-+
-+static GtkSelectionData *
-+wait_for_contents          (GtkClipboard *clipboard, GdkAtom target);
-+
-+static gchar *
-+wait_for_text              (GtkClipboard *clipboard);
-+
-+static Bool
-+checkEventProc(Display *display, XEvent *event, XPointer arg);
-+
-+struct retrieval_context
-+{
-+    PRBool   completed;
-+    void    *data;
-+
-+    retrieval_context() : completed(PR_FALSE), data(nsnull) { }
-+};
-+
-+static void
-+wait_for_retrieval(GtkClipboard *clipboard, retrieval_context *transferData);
-+
-+static void
-+clipboard_contents_received(GtkClipboard     *clipboard,
-+                            GtkSelectionData *selection_data,
-+                            gpointer          data);
-+
-+static void
-+clipboard_text_received(GtkClipboard *clipboard,
-+                        const gchar  *text,
-+                        gpointer      data);
-+
-+nsClipboard::nsClipboard()
-+{
-+    mWidget = nsnull;
-+}
-+
-+nsClipboard::~nsClipboard()
-+{
-+    if (mWidget)
-+        gtk_widget_destroy(mWidget);
-+}
-+
-+NS_IMPL_ISUPPORTS1(nsClipboard, nsIClipboard)
-+
-+nsresult
-+nsClipboard::Init(void)
-+{
-+    mWidget = gtk_invisible_new();
-+    if (!mWidget)
-+        return NS_ERROR_FAILURE;
-+
-+    g_signal_connect(G_OBJECT(mWidget), "selection_get",
-+                     G_CALLBACK(invisible_selection_get_cb), this);
-+
-+    g_signal_connect(G_OBJECT(mWidget), "selection_clear_event",
-+                     G_CALLBACK(selection_clear_event_cb), this);
-+
-+    // XXX make sure to set up the selection_clear event
-+
-+    return NS_OK;
-+}
-+
-+NS_IMETHODIMP
-+nsClipboard::SetData(nsITransferable *aTransferable,
-+                     nsIClipboardOwner *aOwner, PRInt32 aWhichClipboard)
-+{
-+    // See if we can short cut
-+    if ((aWhichClipboard == kGlobalClipboard &&
-+         aTransferable == mGlobalTransferable.get() &&
-+         aOwner == mGlobalOwner.get()) ||
-+        (aWhichClipboard == kSelectionClipboard &&
-+         aTransferable == mSelectionTransferable.get() &&
-+         aOwner == mSelectionOwner.get())) {
-+        return NS_OK;
-+    }
-+
-+    nsresult rv;
-+    if (!mPrivacyHandler) {
-+        rv = NS_NewClipboardPrivacyHandler(getter_AddRefs(mPrivacyHandler));
-+        NS_ENSURE_SUCCESS(rv, rv);
-+    }
-+    rv = mPrivacyHandler->PrepareDataForClipboard(aTransferable);
-+    NS_ENSURE_SUCCESS(rv, rv);
-+
-+    // Clear out the clipboard in order to set the new data
-+    EmptyClipboard(aWhichClipboard);
-+
-+    if (aWhichClipboard == kSelectionClipboard) {
-+        mSelectionOwner = aOwner;
-+        mSelectionTransferable = aTransferable;
-+    }
-+    else {
-+        mGlobalOwner = aOwner;
-+        mGlobalTransferable = aTransferable;
-+    }
-+
-+    // Which selection are we about to claim, CLIPBOARD or PRIMARY?
-+    GdkAtom selectionAtom = GetSelectionAtom(aWhichClipboard);
-+
-+    // Make ourselves the owner.  If we fail to, return.
-+    if (!gtk_selection_owner_set(mWidget, selectionAtom, GDK_CURRENT_TIME))
-+        return NS_ERROR_FAILURE;
-+
-+    // Clear the old selection target list.
-+    gtk_selection_clear_targets(mWidget, selectionAtom);
-+
-+    // Get the types of supported flavors
-+    nsCOMPtr<nsISupportsArray> flavors;
-+
-+    rv = aTransferable->FlavorsTransferableCanExport(getter_AddRefs(flavors));
-+    if (!flavors || NS_FAILED(rv))
-+        return NS_ERROR_FAILURE;
-+
-+    // Add all the flavors to this widget's supported type.
-+    PRUint32 count;
-+    flavors->Count(&count);
-+    for (PRUint32 i=0; i < count; i++) {
-+        nsCOMPtr<nsISupports> tastesLike;
-+        flavors->GetElementAt(i, getter_AddRefs(tastesLike));
-+        nsCOMPtr<nsISupportsCString> flavor = do_QueryInterface(tastesLike);
-+
-+        if (flavor) {
-+            nsXPIDLCString flavorStr;
-+            flavor->ToString(getter_Copies(flavorStr));
-+
-+            // special case text/unicode since we can handle all of
-+            // the string types
-+            if (!strcmp(flavorStr, kUnicodeMime)) {
-+                AddTarget(gdk_atom_intern("UTF8_STRING", FALSE),
-+                          selectionAtom);
-+                AddTarget(gdk_atom_intern("COMPOUND_TEXT", FALSE),
-+                          selectionAtom);
-+                AddTarget(gdk_atom_intern("TEXT", FALSE), selectionAtom);
-+                AddTarget(GDK_SELECTION_TYPE_STRING, selectionAtom);
-+                // next loop iteration
-+                continue;
-+            }
-+
-+            // very special case for this one. since our selection mechanism doesn't work for images,
-+            // we must use GTK's clipboard utility functions
-+            if (!strcmp(flavorStr, kNativeImageMime) || !strcmp(flavorStr, kPNGImageMime) ||
-+                !strcmp(flavorStr, kJPEGImageMime) || !strcmp(flavorStr, kGIFImageMime)) {
-+                nsCOMPtr<nsISupports> item;
-+                PRUint32 len;
-+                rv = aTransferable->GetTransferData(flavorStr, getter_AddRefs(item), &len);
-+                nsCOMPtr<nsISupportsInterfacePointer> ptrPrimitive(do_QueryInterface(item));
-+                if (!ptrPrimitive)
-+                    continue;
-+
-+                nsCOMPtr<nsISupports> primitiveData;
-+                ptrPrimitive->GetData(getter_AddRefs(primitiveData));
-+                nsCOMPtr<nsIImage> image(do_QueryInterface(primitiveData));
-+                if (!image) // Not getting an image for an image mime type!?
-+                    continue;
-+
-+                if (NS_FAILED(image->LockImagePixels(PR_FALSE)))
-+                    continue;
-+                GdkPixbuf* pixbuf = nsImageToPixbuf::ImageToPixbuf(image);
-+                if (!pixbuf) {
-+                    image->UnlockImagePixels(PR_FALSE);
-+                    continue;
-+                }
-+
-+                GtkClipboard *aClipboard = gtk_clipboard_get(GetSelectionAtom(aWhichClipboard));
-+                gtk_clipboard_set_image(aClipboard, pixbuf);
-+                g_object_unref(pixbuf);
-+                image->UnlockImagePixels(PR_FALSE);
-+                continue;
-+            }
-+
-+            // Add this to our list of valid targets
-+            GdkAtom atom = gdk_atom_intern(flavorStr, FALSE);
-+            AddTarget(atom, selectionAtom);
-+        }
-+    }
-+
-+    return NS_OK;
-+}
-+
-+NS_IMETHODIMP
-+nsClipboard::GetData(nsITransferable *aTransferable, PRInt32 aWhichClipboard)
-+{
-+    if (!aTransferable)
-+        return NS_ERROR_FAILURE;
-+
-+    GtkClipboard *clipboard;
-+    clipboard = gtk_clipboard_get(GetSelectionAtom(aWhichClipboard));
-+
-+    guchar        *data = NULL;
-+    gint           length = 0;
-+    PRBool         foundData = PR_FALSE;
-+    nsCAutoString  foundFlavor;
-+
-+    // Get a list of flavors this transferable can import
-+    nsCOMPtr<nsISupportsArray> flavors;
-+    nsresult rv;
-+    rv = aTransferable->FlavorsTransferableCanImport(getter_AddRefs(flavors));
-+    if (!flavors || NS_FAILED(rv))
-+        return NS_ERROR_FAILURE;
-+
-+    PRUint32 count;
-+    flavors->Count(&count);
-+    for (PRUint32 i=0; i < count; i++) {
-+        nsCOMPtr<nsISupports> genericFlavor;
-+        flavors->GetElementAt(i, getter_AddRefs(genericFlavor));
-+
-+        nsCOMPtr<nsISupportsCString> currentFlavor;
-+        currentFlavor = do_QueryInterface(genericFlavor);
-+
-+        if (currentFlavor) {
-+            nsXPIDLCString flavorStr;
-+            currentFlavor->ToString(getter_Copies(flavorStr));
-+
-+            // Special case text/unicode since we can convert any
-+            // string into text/unicode
-+            if (!strcmp(flavorStr, kUnicodeMime)) {
-+                gchar* new_text = wait_for_text(clipboard);
-+                if (new_text) {
-+                    // Convert utf-8 into our unicode format.
-+                    NS_ConvertUTF8toUTF16 ucs2string(new_text);
-+                    data = (guchar *)ToNewUnicode(ucs2string);
-+                    length = ucs2string.Length() * 2;
-+                    g_free(new_text);
-+                    foundData = PR_TRUE;
-+                    foundFlavor = kUnicodeMime;
-+                    break;
-+                }
-+                // If the type was text/unicode and we couldn't get
-+                // text off the clipboard, run the next loop
-+                // iteration.
-+                continue;
-+            }
-+
-+            // For images, we must wrap the data in an nsIInputStream then return instead of break,
-+            // because that code below won't help us.
-+            if (!strcmp(flavorStr, kJPEGImageMime) || !strcmp(flavorStr, kPNGImageMime) || !strcmp(flavorStr, kGIFImageMime)) {
-+                GdkAtom atom;
-+                if (!strcmp(flavorStr, kJPEGImageMime)) // This is image/jpg, but X only understands image/jpeg
-+                    atom = gdk_atom_intern("image/jpeg", FALSE);
-+                else
-+                    atom = gdk_atom_intern(flavorStr, FALSE);
-+
-+                GtkSelectionData *selectionData = wait_for_contents(clipboard, atom);
-+                if (!selectionData)
-+                    continue;
-+
-+                nsCOMPtr<nsIInputStream> byteStream;
-+                NS_NewByteInputStream(getter_AddRefs(byteStream), (const char*)selectionData->data,
-+                                      selectionData->length, NS_ASSIGNMENT_COPY);
-+                aTransferable->SetTransferData(flavorStr, byteStream, sizeof(nsIInputStream*));
-+                gtk_selection_data_free(selectionData);
-+                return NS_OK;
-+            }
-+
-+            // Get the atom for this type and try to request it off
-+            // the clipboard.
-+            GdkAtom atom = gdk_atom_intern(flavorStr, FALSE);
-+            GtkSelectionData *selectionData;
-+            selectionData = wait_for_contents(clipboard, atom);
-+            if (selectionData) {
-+                length = selectionData->length;
-+                // Special case text/html since we can convert into UCS2
-+                if (!strcmp(flavorStr, kHTMLMime)) {
-+                    PRUnichar* htmlBody= nsnull;
-+                    PRInt32 htmlBodyLen = 0;
-+                    // Convert text/html into our unicode format
-+                    ConvertHTMLtoUCS2((guchar *)selectionData->data, length,
-+                                      &htmlBody, htmlBodyLen);
-+                    if (!htmlBodyLen)
-+                        break;
-+                    data = (guchar *)htmlBody;
-+                    length = htmlBodyLen * 2;
-+                } else {
-+                    data = (guchar *)nsMemory::Alloc(length);
-+                    if (!data)
-+                        break;
-+                    memcpy(data, selectionData->data, length);
-+                }
-+                foundData = PR_TRUE;
-+                foundFlavor = flavorStr;
-+                break;
-+            }
-+        }
-+    }
-+
-+    if (foundData) {
-+        nsCOMPtr<nsISupports> wrapper;
-+        nsPrimitiveHelpers::CreatePrimitiveForData(foundFlavor.get(),
-+                                                   data, length,
-+                                                   getter_AddRefs(wrapper));
-+        aTransferable->SetTransferData(foundFlavor.get(),
-+                                       wrapper, length);
-+    }
-+
-+    if (data)
-+        nsMemory::Free(data);
-+
-+    return NS_OK;
-+}
-+
-+NS_IMETHODIMP
-+nsClipboard::EmptyClipboard(PRInt32 aWhichClipboard)
-+{
-+    if (aWhichClipboard == kSelectionClipboard) {
-+        if (mSelectionOwner) {
-+            mSelectionOwner->LosingOwnership(mSelectionTransferable);
-+            mSelectionOwner = nsnull;
-+        }
-+        mSelectionTransferable = nsnull;
-+    }
-+    else {
-+        if (mGlobalOwner) {
-+            mGlobalOwner->LosingOwnership(mGlobalTransferable);
-+            mGlobalOwner = nsnull;
-+        }
-+        mGlobalTransferable = nsnull;
-+    }
-+
-+    return NS_OK;
-+}
-+
-+NS_IMETHODIMP
-+nsClipboard::HasDataMatchingFlavors(const char** aFlavorList, PRUint32 aLength,
-+                                    PRInt32 aWhichClipboard, PRBool *_retval)
-+{
-+    if (!aFlavorList || !_retval)
-+        return NS_ERROR_NULL_POINTER;
-+
-+    *_retval = PR_FALSE;
-+
-+    GtkSelectionData *selection_data =
-+        GetTargets(GetSelectionAtom(aWhichClipboard));
-+    if (!selection_data)
-+        return NS_OK;
-+
-+    gint n_targets = 0;
-+    GdkAtom *targets = NULL;
-+
-+    if (!gtk_selection_data_get_targets(selection_data, 
-+                                        &targets, &n_targets) ||
-+        !n_targets)
-+        return NS_OK;
-+
-+    // Walk through the provided types and try to match it to a
-+    // provided type.
-+    for (PRUint32 i = 0; i < aLength && !*_retval; i++) {
-+        // We special case text/unicode here.
-+        if (!strcmp(aFlavorList[i], kUnicodeMime) && 
-+            gtk_selection_data_targets_include_text(selection_data)) {
-+            *_retval = PR_TRUE;
-+            break;
-+        }
-+
-+        for (PRInt32 j = 0; j < n_targets; j++) {
-+            gchar *atom_name = gdk_atom_name(targets[j]);
-+            if (!strcmp(atom_name, aFlavorList[i]))
-+                *_retval = PR_TRUE;
-+
-+            // X clipboard wants image/jpeg, not image/jpg
-+            if (!strcmp(aFlavorList[i], kJPEGImageMime) && !strcmp(atom_name, "image/jpeg"))
-+                *_retval = PR_TRUE;
-+
-+            g_free(atom_name);
-+
-+            if (*_retval)
-+                break;
-+        }
-+    }
-+    gtk_selection_data_free(selection_data);
-+    g_free(targets);
-+
-+    return NS_OK;
-+}
-+
-+NS_IMETHODIMP
-+nsClipboard::SupportsSelectionClipboard(PRBool *_retval)
-+{
-+    *_retval = PR_TRUE; // yeah, unix supports the selection clipboard
-+    return NS_OK;
-+}
-+
-+/* static */
-+GdkAtom
-+nsClipboard::GetSelectionAtom(PRInt32 aWhichClipboard)
-+{
-+    if (aWhichClipboard == kGlobalClipboard)
-+        return GDK_SELECTION_CLIPBOARD;
-+
-+    return GDK_SELECTION_PRIMARY;
-+}
-+
-+/* static */
-+GtkSelectionData *
-+nsClipboard::GetTargets(GdkAtom aWhichClipboard)
-+{
-+    GtkClipboard *clipboard = gtk_clipboard_get(aWhichClipboard);
-+    return wait_for_contents(clipboard, gdk_atom_intern("TARGETS", FALSE));
-+}
-+
-+nsITransferable *
-+nsClipboard::GetTransferable(PRInt32 aWhichClipboard)
-+{
-+    nsITransferable *retval;
-+
-+    if (aWhichClipboard == kSelectionClipboard)
-+        retval = mSelectionTransferable.get();
-+    else
-+        retval = mGlobalTransferable.get();
-+        
-+    return retval;
-+}
-+
-+void
-+nsClipboard::AddTarget(GdkAtom aName, GdkAtom aClipboard)
-+{
-+    gtk_selection_add_target(mWidget, aClipboard, aName, 0);
-+}
-+
-+void
-+nsClipboard::SelectionGetEvent (GtkWidget        *aWidget,
-+                                GtkSelectionData *aSelectionData,
-+                                guint             aTime)
-+{
-+    // Someone has asked us to hand them something.  The first thing
-+    // that we want to do is see if that something includes text.  If
-+    // it does, try to give it text/unicode after converting it to
-+    // utf-8.
-+
-+    PRInt32 whichClipboard;
-+
-+    // which clipboard?
-+    if (aSelectionData->selection == GDK_SELECTION_PRIMARY)
-+        whichClipboard = kSelectionClipboard;
-+    else if (aSelectionData->selection == GDK_SELECTION_CLIPBOARD)
-+        whichClipboard = kGlobalClipboard;
-+    else
-+        return; // THAT AIN'T NO CLIPBOARD I EVER HEARD OF
-+
-+    nsCOMPtr<nsITransferable> trans = GetTransferable(whichClipboard);
-+    
-+    nsresult rv;
-+    nsCOMPtr<nsISupports> item;
-+    PRUint32 len;
-+
-+    // Check to see if the selection data includes any of the string
-+    // types that we support.
-+    if (aSelectionData->target == gdk_atom_intern ("STRING", FALSE) ||
-+        aSelectionData->target == gdk_atom_intern ("TEXT", FALSE) ||
-+        aSelectionData->target == gdk_atom_intern ("COMPOUND_TEXT", FALSE) ||
-+        aSelectionData->target == gdk_atom_intern ("UTF8_STRING", FALSE)) {
-+        // Try to convert our internal type into a text string.  Get
-+        // the transferable for this clipboard and try to get the
-+        // text/unicode type for it.
-+        rv = trans->GetTransferData("text/unicode", getter_AddRefs(item),
-+                                    &len);
-+        if (!item || NS_FAILED(rv))
-+            return;
-+        
-+        nsCOMPtr<nsISupportsString> wideString;
-+        wideString = do_QueryInterface(item);
-+        if (!wideString)
-+            return;
-+
-+        nsAutoString ucs2string;
-+        wideString->GetData(ucs2string);
-+        char *utf8string = ToNewUTF8String(ucs2string);
-+        if (!utf8string)
-+            return;
-+        
-+        gtk_selection_data_set_text (aSelectionData, utf8string,
-+                                     strlen(utf8string));
-+
-+        nsMemory::Free(utf8string);
-+        return;
-+    }
-+
-+    // Try to match up the selection data target to something our
-+    // transferable provides.
-+    gchar *target_name = gdk_atom_name(aSelectionData->target);
-+    if (!target_name)
-+        return;
-+
-+    rv = trans->GetTransferData(target_name, getter_AddRefs(item), &len);
-+    // nothing found?
-+    if (!item || NS_FAILED(rv)) {
-+        g_free(target_name);
-+        return;
-+    }
-+
-+    void *primitive_data = nsnull;
-+    nsPrimitiveHelpers::CreateDataFromPrimitive(target_name, item,
-+                                                &primitive_data, len);
-+
-+    if (primitive_data) {
-+        // Check to see if the selection data is text/html
-+        if (aSelectionData->target == gdk_atom_intern (kHTMLMime, FALSE)) {
-+            /*
-+             * "text/html" can be encoded UCS2. It is recommended that
-+             * documents transmitted as UCS2 always begin with a ZERO-WIDTH
-+             * NON-BREAKING SPACE character (hexadecimal FEFF, also called
-+             * Byte Order Mark (BOM)). Adding BOM can help other app to
-+             * detect mozilla use UCS2 encoding when copy-paste.
-+             */
-+            guchar *buffer = (guchar *)
-+                    nsMemory::Alloc((len * sizeof(guchar)) + sizeof(PRUnichar));
-+            if (!buffer)
-+                return;
-+            PRUnichar prefix = 0xFEFF;
-+            memcpy(buffer, &prefix, sizeof(prefix));
-+            memcpy(buffer + sizeof(prefix), primitive_data, len);
-+            nsMemory::Free((guchar *)primitive_data);
-+            primitive_data = (guchar *)buffer;
-+            len += sizeof(prefix);
-+        }
-+  
-+        gtk_selection_data_set(aSelectionData, aSelectionData->target,
-+                               8, /* 8 bits in a unit */
-+                               (const guchar *)primitive_data, len);
-+        nsMemory::Free(primitive_data);
-+    }
-+
-+    g_free(target_name);
-+                           
-+}
-+
-+void
-+nsClipboard::SelectionClearEvent (GtkWidget         *aWidget,
-+                                  GdkEventSelection *aEvent)
-+{
-+    PRInt32 whichClipboard;
-+
-+    // which clipboard?
-+    if (aEvent->selection == GDK_SELECTION_PRIMARY)
-+        whichClipboard = kSelectionClipboard;
-+    else if (aEvent->selection == GDK_SELECTION_CLIPBOARD)
-+        whichClipboard = kGlobalClipboard;
-+    else
-+        return; // THAT AIN'T NO CLIPBOARD I EVER HEARD OF
-+
-+    EmptyClipboard(whichClipboard);
-+}
-+
-+void
-+invisible_selection_get_cb (GtkWidget          *aWidget,
-+                            GtkSelectionData   *aSelectionData,
-+                            guint               aTime,
-+                            guint               aInfo,
-+                            nsClipboard        *aClipboard)
-+{
-+    aClipboard->SelectionGetEvent(aWidget, aSelectionData, aTime);
-+}
-+
-+gboolean
-+selection_clear_event_cb   (GtkWidget          *aWidget,
-+                            GdkEventSelection  *aEvent,
-+                            nsClipboard        *aClipboard)
-+{
-+    aClipboard->SelectionClearEvent(aWidget, aEvent);
-+    return TRUE;
-+}
-+
-+/*
-+ * when copy-paste, mozilla wants data encoded using UCS2,
-+ * other app such as StarOffice use "text/html"(RFC2854).
-+ * This function convert data(got from GTK clipboard)
-+ * to data mozilla wanted.
-+ *
-+ * data from GTK clipboard can be 3 forms:
-+ *  1. From current mozilla
-+ *     "text/html", charset = utf-16
-+ *  2. From old version mozilla or mozilla-based app
-+ *     content("body" only), charset = utf-16
-+ *  3. From other app who use "text/html" when copy-paste
-+ *     "text/html", has "charset" info
-+ *
-+ * data      : got from GTK clipboard
-+ * dataLength: got from GTK clipboard
-+ * body      : pass to Mozilla
-+ * bodyLength: pass to Mozilla
-+ */
-+void ConvertHTMLtoUCS2(guchar * data, PRInt32 dataLength,
-+                       PRUnichar** unicodeData, PRInt32& outUnicodeLen)
-+{
-+    nsCAutoString charset;
-+    GetHTMLCharset(data, dataLength, charset);// get charset of HTML
-+    if (charset.EqualsLiteral("UTF-16")) {//current mozilla
-+        outUnicodeLen = (dataLength / 2) - 1;
-+        *unicodeData = reinterpret_cast<PRUnichar*>
-+                                       (nsMemory::Alloc((outUnicodeLen + sizeof('\0')) *
-+                       sizeof(PRUnichar)));
-+        if (*unicodeData) {
-+            memcpy(*unicodeData, data + sizeof(PRUnichar),
-+                   outUnicodeLen * sizeof(PRUnichar));
-+            (*unicodeData)[outUnicodeLen] = '\0';
-+        }
-+    } else if (charset.EqualsLiteral("UNKNOWN")) {
-+        outUnicodeLen = 0;
-+        return;
-+    } else {
-+        // app which use "text/html" to copy&paste
-+        nsCOMPtr<nsIUnicodeDecoder> decoder;
-+        nsresult rv;
-+        // get the decoder
-+        nsCOMPtr<nsICharsetConverterManager> ccm =
-+            do_GetService(NS_CHARSETCONVERTERMANAGER_CONTRACTID, &rv);
-+        if (NS_FAILED(rv)) {
-+#ifdef DEBUG_CLIPBOARD
-+            g_print("        can't get CHARSET CONVERTER MANAGER service\n");
-+#endif
-+            outUnicodeLen = 0;
-+            return;
-+        }
-+        rv = ccm->GetUnicodeDecoder(charset.get(), getter_AddRefs(decoder));
-+        if (NS_FAILED(rv)) {
-+#ifdef DEBUG_CLIPBOARD
-+            g_print("        get unicode decoder error\n");
-+#endif
-+            outUnicodeLen = 0;
-+            return;
-+        }
-+        // converting
-+        decoder->GetMaxLength((const char *)data, dataLength, &outUnicodeLen);
-+        // |outUnicodeLen| is number of chars
-+        if (outUnicodeLen) {
-+            *unicodeData = reinterpret_cast<PRUnichar*>
-+                                           (nsMemory::Alloc((outUnicodeLen + sizeof('\0')) *
-+                           sizeof(PRUnichar)));
-+            if (*unicodeData) {
-+                PRInt32 numberTmp = dataLength;
-+                decoder->Convert((const char *)data, &numberTmp,
-+                                 *unicodeData, &outUnicodeLen);
-+#ifdef DEBUG_CLIPBOARD
-+                if (numberTmp != dataLength)
-+                    printf("didn't consume all the bytes\n");
-+#endif
-+                // null terminate. Convert() doesn't do it for us
-+                (*unicodeData)[outUnicodeLen] = '\0';
-+            }
-+        } // if valid length
-+    }
-+}
-+
-+/*
-+ * get "charset" information from clipboard data
-+ * return value can be:
-+ *  1. "UTF-16":      mozilla or "text/html" with "charset=utf-16"
-+ *  2. "UNKNOWN":     mozilla can't detect what encode it use
-+ *  3. other:         "text/html" with other charset than utf-16
-+ */
-+void GetHTMLCharset(guchar * data, PRInt32 dataLength, nsCString& str)
-+{
-+    // if detect "FFFE" or "FEFF", assume UTF-16
-+    PRUnichar* beginChar =  (PRUnichar*)data;
-+    if ((beginChar[0] == 0xFFFE) || (beginChar[0] == 0xFEFF)) {
-+        str.AssignLiteral("UTF-16");
-+        return;
-+    }
-+    // no "FFFE" and "FEFF", assume ASCII first to find "charset" info
-+    const nsDependentCString htmlStr((const char *)data, dataLength);
-+    nsACString::const_iterator start, end;
-+    htmlStr.BeginReading(start);
-+    htmlStr.EndReading(end);
-+    nsACString::const_iterator valueStart(start), valueEnd(start);
-+
-+    if (CaseInsensitiveFindInReadable(
-+        NS_LITERAL_CSTRING("CONTENT=\"text/html;"),
-+        start, end)) {
-+        start = end;
-+        htmlStr.EndReading(end);
-+
-+        if (CaseInsensitiveFindInReadable(
-+            NS_LITERAL_CSTRING("charset="),
-+            start, end)) {
-+            valueStart = end;
-+            start = end;
-+            htmlStr.EndReading(end);
-+          
-+            if (FindCharInReadable('"', start, end))
-+                valueEnd = start;
-+        }
-+    }
-+    // find "charset" in HTML
-+    if (valueStart != valueEnd) {
-+        str = Substring(valueStart, valueEnd);
-+        ToUpperCase(str);
-+#ifdef DEBUG_CLIPBOARD
-+        printf("Charset of HTML = %s\n", charsetUpperStr.get());
-+#endif
-+        return;
-+    }
-+    str.AssignLiteral("UNKNOWN");
-+}
-+
-+static void
-+DispatchSelectionNotifyEvent(GtkWidget *widget, XEvent *xevent)
-+{
-+    GdkEvent event;
-+    event.selection.type = GDK_SELECTION_NOTIFY;
-+    event.selection.window = widget->window;
-+    event.selection.selection = gdk_x11_xatom_to_atom(xevent->xselection.selection);
-+    event.selection.target = gdk_x11_xatom_to_atom(xevent->xselection.target);
-+    event.selection.property = gdk_x11_xatom_to_atom(xevent->xselection.property);
-+    event.selection.time = xevent->xselection.time;
-+
-+    gtk_widget_event(widget, &event);
-+}
-+
-+static void
-+DispatchPropertyNotifyEvent(GtkWidget *widget, XEvent *xevent)
-+{
-+    if (((GdkWindowObject *) widget->window)->event_mask & GDK_PROPERTY_CHANGE_MASK) {
-+        GdkEvent event;
-+        event.property.type = GDK_PROPERTY_NOTIFY;
-+        event.property.window = widget->window;
-+        event.property.atom = gdk_x11_xatom_to_atom(xevent->xproperty.atom);
-+        event.property.time = xevent->xproperty.time;
-+        event.property.state = xevent->xproperty.state;
-+
-+        gtk_widget_event(widget, &event);
-+    }
-+}
-+
-+struct checkEventContext
-+{
-+    GtkWidget *cbWidget;
-+    Atom       selAtom;
-+};
-+
-+static Bool
-+checkEventProc(Display *display, XEvent *event, XPointer arg)
-+{
-+    checkEventContext *context = (checkEventContext *) arg;
-+
-+    if (event->xany.type == SelectionNotify ||
-+        (event->xany.type == PropertyNotify &&
-+         event->xproperty.atom == context->selAtom)) {
-+
-+        GdkWindow *cbWindow = gdk_window_lookup(event->xany.window);
-+        if (cbWindow) {
-+            GtkWidget *cbWidget = NULL;
-+            gdk_window_get_user_data(cbWindow, (gpointer *)&cbWidget);
-+            if (cbWidget && GTK_IS_WIDGET(cbWidget)) {
-+                context->cbWidget = cbWidget;
-+                return True;
-+            }
-+        }
-+    }
-+
-+    return False;
-+}
-+
-+// Idle timeout for receiving selection and property notify events (microsec)
-+static const int kClipboardTimeout = 500000;
-+
-+static void
-+wait_for_retrieval(GtkClipboard *clipboard, retrieval_context *r_context)
-+{
-+    if (r_context->completed)  // the request completed synchronously
-+        return;
-+
-+    Display *xDisplay = GDK_DISPLAY();
-+    checkEventContext context;
-+    context.cbWidget = NULL;
-+    context.selAtom = gdk_x11_atom_to_xatom(gdk_atom_intern("GDK_SELECTION",
-+                                                            FALSE));
-+
-+    // Send X events which are relevant to the ongoing selection retrieval
-+    // to the clipboard widget.  Wait until either the operation completes, or
-+    // we hit our timeout.  All other X events remain queued.
-+
-+    int select_result;
-+
-+#ifdef POLL_WITH_XCONNECTIONNUMBER
-+    struct pollfd fds[1];
-+    fds[0].fd = XConnectionNumber(xDisplay);
-+    fds[0].events = POLLIN;
-+#else
-+    int cnumber = ConnectionNumber(xDisplay);
-+    fd_set select_set;
-+    FD_ZERO(&select_set);
-+    FD_SET(cnumber, &select_set);
-+    ++cnumber;
-+    struct timeval tv;
-+#endif
-+
-+    do {
-+        XEvent xevent;
-+
-+        while (XCheckIfEvent(xDisplay, &xevent, checkEventProc,
-+                             (XPointer) &context)) {
-+
-+            if (xevent.xany.type == SelectionNotify)
-+                DispatchSelectionNotifyEvent(context.cbWidget, &xevent);
-+            else
-+                DispatchPropertyNotifyEvent(context.cbWidget, &xevent);
-+
-+            if (r_context->completed)
-+                return;
-+        }
-+
-+#ifdef POLL_WITH_XCONNECTIONNUMBER
-+        select_result = poll(fds, 1, kClipboardTimeout / 1000);
-+#else
-+        tv.tv_sec = 0;
-+        tv.tv_usec = kClipboardTimeout;
-+        select_result = select(cnumber, &select_set, NULL, NULL, &tv);
-+#endif
-+    } while (select_result == 1);
-+
-+#ifdef DEBUG_CLIPBOARD
-+    printf("exceeded clipboard timeout\n");
-+#endif
-+}
-+
-+static void
-+clipboard_contents_received(GtkClipboard     *clipboard,
-+                            GtkSelectionData *selection_data,
-+                            gpointer          data)
-+{
-+    retrieval_context *context = static_cast<retrieval_context *>(data);
-+    context->completed = PR_TRUE;
-+
-+    if (selection_data->length >= 0)
-+        context->data = gtk_selection_data_copy(selection_data);
-+}
-+
-+
-+static GtkSelectionData *
-+wait_for_contents(GtkClipboard *clipboard, GdkAtom target)
-+{
-+    retrieval_context context;
-+    gtk_clipboard_request_contents(clipboard, target,
-+                                   clipboard_contents_received,
-+                                   &context);
-+
-+    wait_for_retrieval(clipboard, &context);
-+    return static_cast<GtkSelectionData *>(context.data);
-+}
-+
-+static void
-+clipboard_text_received(GtkClipboard *clipboard,
-+                        const gchar  *text,
-+                        gpointer      data)
-+{
-+    retrieval_context *context = static_cast<retrieval_context *>(data);
-+    context->completed = PR_TRUE;
-+    context->data = g_strdup(text);
-+}
-+
-+static gchar *
-+wait_for_text(GtkClipboard *clipboard)
-+{
-+    retrieval_context context;
-+    gtk_clipboard_request_text(clipboard, clipboard_text_received, &context);
-+
-+    wait_for_retrieval(clipboard, &context);
-+    return static_cast<gchar *>(context.data);
-+}
-Index: offscreen/widget/src/headless/nsClipboard.h
-===================================================================
---- /dev/null   1970-01-01 00:00:00.000000000 +0000
-+++ offscreen/widget/src/headless/nsClipboard.h 2009-06-12 14:14:05.000000000 +0100
-@@ -0,0 +1,93 @@
-+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-+/* vim:expandtab:shiftwidth=4:tabstop=4:
-+ */
-+/* ***** BEGIN LICENSE BLOCK *****
-+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
-+ *
-+ * The contents of this file are subject to the Mozilla Public License Version
-+ * 1.1 (the "License"); you may not use this file except in compliance with
-+ * the License. You may obtain a copy of the License at
-+ * http://www.mozilla.org/MPL/
-+ *
-+ * Software distributed under the License is distributed on an "AS IS" basis,
-+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-+ * for the specific language governing rights and limitations under the
-+ * License.
-+ *
-+ * The Original Code is mozilla.org code.
-+ *
-+ * The Initial Developer of the Original Code is Christopher Blizzard
-+ * <blizzard@mozilla.org>.  Portions created by the Initial Developer
-+ * are Copyright (C) 2001 the Initial Developer. All Rights Reserved.
-+ *
-+ * Contributor(s):
-+ *
-+ * Alternatively, the contents of this file may be used under the terms of
-+ * either the GNU General Public License Version 2 or later (the "GPL"), or
-+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-+ * in which case the provisions of the GPL or the LGPL are applicable instead
-+ * of those above. If you wish to allow use of your version of this file only
-+ * under the terms of either the GPL or the LGPL, and not to allow others to
-+ * use your version of this file under the terms of the MPL, indicate your
-+ * decision by deleting the provisions above and replace them with the notice
-+ * and other provisions required by the GPL or the LGPL. If you do not delete
-+ * the provisions above, a recipient may use your version of this file under
-+ * the terms of any one of the MPL, the GPL or the LGPL.
-+ *
-+ * ***** END LICENSE BLOCK ***** */
-+
-+#ifndef __nsClipboard_h_
-+#define __nsClipboard_h_
-+
-+#include "nsIClipboard.h"
-+#include "nsClipboardPrivacyHandler.h"
-+#include "nsAutoPtr.h"
-+#include <gtk/gtk.h>
-+
-+class nsClipboard : public nsIClipboard
-+{
-+public:
-+    nsClipboard();
-+    virtual ~nsClipboard();
-+    
-+    NS_DECL_ISUPPORTS
-+    
-+    NS_DECL_NSICLIPBOARD
-+
-+    // Make sure we are initialized, called from the factory
-+    // constructor
-+    nsresult  Init                (void);
-+    // Someone requested the selection from the hidden widget
-+    void      SelectionGetEvent   (GtkWidget         *aWidget,
-+                                   GtkSelectionData  *aSelectionData,
-+                                   guint              aTime);
-+    void      SelectionClearEvent (GtkWidget         *aWidget,
-+                                   GdkEventSelection *aEvent);
-+
-+
-+private:
-+    // Utility methods
-+    static GdkAtom               GetSelectionAtom (PRInt32 aWhichClipboard);
-+    static GtkSelectionData     *GetTargets       (GdkAtom aWhichClipboard);
-+
-+    // Get our hands on the correct transferable, given a specific
-+    // clipboard
-+    nsITransferable             *GetTransferable  (PRInt32 aWhichClipboard);
-+
-+    // Add a target type to the hidden widget
-+    void                         AddTarget        (GdkAtom aName,
-+                                                   GdkAtom aClipboard);
-+
-+    // The hidden widget where we do all of our operations
-+    GtkWidget                   *mWidget;
-+    // Hang on to our owners and transferables so we can transfer data
-+    // when asked.
-+    nsCOMPtr<nsIClipboardOwner>  mSelectionOwner;
-+    nsCOMPtr<nsIClipboardOwner>  mGlobalOwner;
-+    nsCOMPtr<nsITransferable>    mSelectionTransferable;
-+    nsCOMPtr<nsITransferable>    mGlobalTransferable;
-+    nsRefPtr<nsClipboardPrivacyHandler> mPrivacyHandler;
-+
-+};
-+
-+#endif /* __nsClipboard_h_ */
-Index: offscreen/widget/src/headless/nsIImageToPixbuf.h
-===================================================================
---- /dev/null   1970-01-01 00:00:00.000000000 +0000
-+++ offscreen/widget/src/headless/nsIImageToPixbuf.h    2009-06-12 14:14:05.000000000 +0100
-@@ -0,0 +1,62 @@
-+/* ***** BEGIN LICENSE BLOCK *****
-+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
-+ *
-+ * The contents of this file are subject to the Mozilla Public License Version
-+ * 1.1 (the "License"); you may not use this file except in compliance with
-+ * the License. You may obtain a copy of the License at
-+ * http://www.mozilla.org/MPL/
-+ *
-+ * Software distributed under the License is distributed on an "AS IS" basis,
-+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-+ * for the specific language governing rights and limitations under the
-+ * License.
-+ *
-+ * The Original Code is mozilla.org widget code.
-+ *
-+ * The Initial Developer of the Original Code is
-+ * Christian Biesinger <cbiesinger@web.de>.
-+ * Portions created by the Initial Developer are Copyright (C) 2006
-+ * the Initial Developer. All Rights Reserved.
-+ *
-+ * Contributor(s):
-+ *
-+ * Alternatively, the contents of this file may be used under the terms of
-+ * either the GNU General Public License Version 2 or later (the "GPL"), or
-+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-+ * in which case the provisions of the GPL or the LGPL are applicable instead
-+ * of those above. If you wish to allow use of your version of this file only
-+ * under the terms of either the GPL or the LGPL, and not to allow others to
-+ * use your version of this file under the terms of the MPL, indicate your
-+ * decision by deleting the provisions above and replace them with the notice
-+ * and other provisions required by the GPL or the LGPL. If you do not delete
-+ * the provisions above, a recipient may use your version of this file under
-+ * the terms of any one of the MPL, the GPL or the LGPL.
-+ *
-+ * ***** END LICENSE BLOCK ***** */
-+
-+#ifndef NSIIMAGETOPIXBUF_H_
-+#define NSIIMAGETOPIXBUF_H_
-+
-+#include "nsISupports.h"
-+
-+// dfa4ac93-83f2-4ab8-9b2a-0ff7022aebe2
-+#define NSIIMAGETOPIXBUF_IID \
-+{ 0xdfa4ac93, 0x83f2, 0x4ab8, \
-+  { 0x9b, 0x2a, 0x0f, 0xf7, 0x02, 0x2a, 0xeb, 0xe2 } }
-+
-+class nsIImage;
-+typedef struct _GdkPixbuf GdkPixbuf;
-+
-+/**
-+ * An interface that allows converting an nsIImage to a GdkPixbuf*.
-+ */
-+class nsIImageToPixbuf : public nsISupports {
-+    public:
-+        NS_DECLARE_STATIC_IID_ACCESSOR(NSIIMAGETOPIXBUF_IID)
-+
-+        NS_IMETHOD_(GdkPixbuf*) ConvertImageToPixbuf(nsIImage* aImage) = 0;
-+};
-+
-+NS_DEFINE_STATIC_IID_ACCESSOR(nsIImageToPixbuf, NSIIMAGETOPIXBUF_IID)
-+
-+#endif
-Index: offscreen/widget/src/headless/nsImageToPixbuf.cpp
-===================================================================
---- /dev/null   1970-01-01 00:00:00.000000000 +0000
-+++ offscreen/widget/src/headless/nsImageToPixbuf.cpp   2009-06-12 14:14:05.000000000 +0100
-@@ -0,0 +1,196 @@
-+/* vim:set sw=4 sts=4 et cin: */
-+/* ***** BEGIN LICENSE BLOCK *****
-+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
-+ *
-+ * The contents of this file are subject to the Mozilla Public License Version
-+ * 1.1 (the "License"); you may not use this file except in compliance with
-+ * the License. You may obtain a copy of the License at
-+ * http://www.mozilla.org/MPL/
-+ *
-+ * Software distributed under the License is distributed on an "AS IS" basis,
-+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-+ * for the specific language governing rights and limitations under the
-+ * License.
-+ *
-+ * The Original Code is mozilla.org widget code.
-+ *
-+ * The Initial Developer of the Original Code is
-+ * Christian Biesinger <cbiesinger@web.de>.
-+ * Portions created by the Initial Developer are Copyright (C) 2006
-+ * the Initial Developer. All Rights Reserved.
-+ *
-+ * Contributor(s):
-+ *
-+ * Alternatively, the contents of this file may be used under the terms of
-+ * either the GNU General Public License Version 2 or later (the "GPL"), or
-+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-+ * in which case the provisions of the GPL or the LGPL are applicable instead
-+ * of those above. If you wish to allow use of your version of this file only
-+ * under the terms of either the GPL or the LGPL, and not to allow others to
-+ * use your version of this file under the terms of the MPL, indicate your
-+ * decision by deleting the provisions above and replace them with the notice
-+ * and other provisions required by the GPL or the LGPL. If you do not delete
-+ * the provisions above, a recipient may use your version of this file under
-+ * the terms of any one of the MPL, the GPL or the LGPL.
-+ *
-+ * ***** END LICENSE BLOCK ***** */
-+
-+#include <gdk-pixbuf/gdk-pixbuf.h>
-+
-+#include "gfxASurface.h"
-+#include "gfxImageSurface.h"
-+#include "gfxContext.h"
-+
-+#include "nsIImage.h"
-+
-+#include "nsAutoPtr.h"
-+
-+#include "nsImageToPixbuf.h"
-+
-+NS_IMPL_ISUPPORTS1(nsImageToPixbuf, nsIImageToPixbuf)
-+
-+inline unsigned char
-+unpremultiply (unsigned char color,
-+               unsigned char alpha)
-+{
-+    if (alpha == 0)
-+        return 0;
-+    // plus alpha/2 to round instead of truncate
-+    return (color * 255 + alpha / 2) / alpha;
-+}
-+
-+NS_IMETHODIMP_(GdkPixbuf*)
-+nsImageToPixbuf::ConvertImageToPixbuf(nsIImage* aImage)
-+{
-+    return ImageToPixbuf(aImage);
-+}
-+
-+GdkPixbuf*
-+nsImageToPixbuf::ImageToPixbuf(nsIImage* aImage)
-+{
-+    PRInt32 width = aImage->GetWidth(),
-+            height = aImage->GetHeight();
-+
-+    nsRefPtr<gfxPattern> pattern;
-+    aImage->GetPattern(getter_AddRefs(pattern));
-+
-+    return PatternToPixbuf(pattern, width, height);
-+}
-+
-+GdkPixbuf*
-+nsImageToPixbuf::ImgSurfaceToPixbuf(gfxImageSurface* aImgSurface, PRInt32 aWidth, PRInt32 aHeight)
-+{
-+    GdkPixbuf* pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB, PR_TRUE, 8,
-+                                       aWidth, aHeight);
-+    if (!pixbuf)
-+        return nsnull;
-+
-+    PRUint32 rowstride = gdk_pixbuf_get_rowstride (pixbuf);
-+    guchar* pixels = gdk_pixbuf_get_pixels (pixbuf);
-+
-+    long cairoStride = aImgSurface->Stride();
-+    unsigned char* cairoData = aImgSurface->Data();
-+
-+    gfxASurface::gfxImageFormat format = aImgSurface->Format();
-+
-+    for (PRInt32 row = 0; row < aHeight; ++row) {
-+        for (PRInt32 col = 0; col < aWidth; ++col) {
-+            guchar* pixel = pixels + row * rowstride + 4 * col;
-+
-+            PRUint32* cairoPixel = reinterpret_cast<PRUint32*>
-+                                                   ((cairoData + row * cairoStride + 4 * col));
-+
-+            if (format == gfxASurface::ImageFormatARGB32) {
-+                const PRUint8 a = (*cairoPixel >> 24) & 0xFF;
-+                const PRUint8 r = unpremultiply((*cairoPixel >> 16) & 0xFF, a);
-+                const PRUint8 g = unpremultiply((*cairoPixel >>  8) & 0xFF, a);
-+                const PRUint8 b = unpremultiply((*cairoPixel >>  0) & 0xFF, a);
-+
-+                *pixel++ = r;
-+                *pixel++ = g;
-+                *pixel++ = b;
-+                *pixel++ = a;
-+            } else {
-+                NS_ASSERTION(format == gfxASurface::ImageFormatRGB24,
-+                             "unexpected format");
-+                const PRUint8 r = (*cairoPixel >> 16) & 0xFF;
-+                const PRUint8 g = (*cairoPixel >>  8) & 0xFF;
-+                const PRUint8 b = (*cairoPixel >>  0) & 0xFF;
-+
-+                *pixel++ = r;
-+                *pixel++ = g;
-+                *pixel++ = b;
-+                *pixel++ = 0xFF; // A
-+            }
-+        }
-+    }
-+
-+    return pixbuf;
-+}
-+
-+GdkPixbuf*
-+nsImageToPixbuf::SurfaceToPixbuf(gfxASurface* aSurface, PRInt32 aWidth, PRInt32 aHeight)
-+{
-+    if (aSurface->CairoStatus()) {
-+        NS_ERROR("invalid surface");
-+        return nsnull;
-+    }
-+
-+    nsRefPtr<gfxImageSurface> imgSurface;
-+    if (aSurface->GetType() == gfxASurface::SurfaceTypeImage) {
-+        imgSurface = static_cast<gfxImageSurface*>
-+                                (static_cast<gfxASurface*>(aSurface));
-+    } else {
-+        imgSurface = new gfxImageSurface(gfxIntSize(aWidth, aHeight),
-+                                        gfxImageSurface::ImageFormatARGB32);
-+                                       
-+        if (!imgSurface)
-+            return nsnull;
-+
-+        nsRefPtr<gfxContext> context = new gfxContext(imgSurface);
-+        if (!context)
-+            return nsnull;
-+
-+        context->SetOperator(gfxContext::OPERATOR_SOURCE);
-+        context->SetSource(aSurface);
-+        context->Paint();
-+    }
-+
-+    return ImgSurfaceToPixbuf(imgSurface, aWidth, aHeight);
-+}
-+  
-+GdkPixbuf*
-+nsImageToPixbuf::PatternToPixbuf(gfxPattern* aPattern, PRInt32 aWidth, PRInt32 aHeight)
-+{
-+    if (aPattern->CairoStatus()) {
-+        NS_ERROR("invalid pattern");
-+        return nsnull;
-+    }
-+
-+    nsRefPtr<gfxImageSurface> imgSurface;
-+    if (aPattern->GetType() == gfxPattern::PATTERN_SURFACE) {
-+        nsRefPtr<gfxASurface> surface = aPattern->GetSurface();
-+        if (surface->GetType() == gfxASurface::SurfaceTypeImage) {
-+            imgSurface = static_cast<gfxImageSurface*>
-+                                    (static_cast<gfxASurface*>(surface.get()));
-+        }
-+    } 
-+    
-+    if (!imgSurface) {
-+        imgSurface = new gfxImageSurface(gfxIntSize(aWidth, aHeight),
-+                                        gfxImageSurface::ImageFormatARGB32);
-+                                       
-+        if (!imgSurface)
-+            return nsnull;
-+
-+        nsRefPtr<gfxContext> context = new gfxContext(imgSurface);
-+        if (!context)
-+            return nsnull;
-+
-+        context->SetOperator(gfxContext::OPERATOR_SOURCE);
-+        context->SetPattern(aPattern);
-+        context->Paint();
-+    }
-+
-+    return ImgSurfaceToPixbuf(imgSurface, aWidth, aHeight);
-+}
-Index: offscreen/widget/src/headless/nsImageToPixbuf.h
-===================================================================
---- /dev/null   1970-01-01 00:00:00.000000000 +0000
-+++ offscreen/widget/src/headless/nsImageToPixbuf.h     2009-06-12 14:14:05.000000000 +0100
-@@ -0,0 +1,71 @@
-+/* vim:set sw=4 sts=4 et cin: */
-+/* ***** BEGIN LICENSE BLOCK *****
-+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
-+ *
-+ * The contents of this file are subject to the Mozilla Public License Version
-+ * 1.1 (the "License"); you may not use this file except in compliance with
-+ * the License. You may obtain a copy of the License at
-+ * http://www.mozilla.org/MPL/
-+ *
-+ * Software distributed under the License is distributed on an "AS IS" basis,
-+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-+ * for the specific language governing rights and limitations under the
-+ * License.
-+ *
-+ * The Original Code is mozilla.org widget code.
-+ *
-+ * The Initial Developer of the Original Code is
-+ * Christian Biesinger <cbiesinger@web.de>.
-+ * Portions created by the Initial Developer are Copyright (C) 2006
-+ * the Initial Developer. All Rights Reserved.
-+ *
-+ * Contributor(s):
-+ *
-+ * Alternatively, the contents of this file may be used under the terms of
-+ * either the GNU General Public License Version 2 or later (the "GPL"), or
-+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-+ * in which case the provisions of the GPL or the LGPL are applicable instead
-+ * of those above. If you wish to allow use of your version of this file only
-+ * under the terms of either the GPL or the LGPL, and not to allow others to
-+ * use your version of this file under the terms of the MPL, indicate your
-+ * decision by deleting the provisions above and replace them with the notice
-+ * and other provisions required by the GPL or the LGPL. If you do not delete
-+ * the provisions above, a recipient may use your version of this file under
-+ * the terms of any one of the MPL, the GPL or the LGPL.
-+ *
-+ * ***** END LICENSE BLOCK ***** */
-+
-+#ifndef NSIMAGETOPIXBUF_H_
-+#define NSIMAGETOPIXBUF_H_
-+
-+#include "nsIImageToPixbuf.h"
-+
-+class gfxASurface;
-+class gfxPattern;
-+class gfxImageSurface;
-+
-+class nsImageToPixbuf : public nsIImageToPixbuf {
-+    public:
-+        NS_DECL_ISUPPORTS
-+        NS_IMETHOD_(GdkPixbuf*) ConvertImageToPixbuf(nsIImage* aImage);
-+
-+        // Friendlier version of ConvertImageToPixbuf for callers inside of
-+        // widget
-+        static GdkPixbuf* ImageToPixbuf(nsIImage* aImage);
-+        static GdkPixbuf* SurfaceToPixbuf(gfxASurface* aSurface,
-+                                          PRInt32 aWidth, PRInt32 aHeight);
-+        static GdkPixbuf* PatternToPixbuf(gfxPattern* aPattern,
-+                                          PRInt32 aWidth, PRInt32 aHeight);
-+    private:
-+        static GdkPixbuf* ImgSurfaceToPixbuf(gfxImageSurface* aImgSurface,
-+                                             PRInt32 aWidth, PRInt32 aHeight);
-+        ~nsImageToPixbuf() {}
-+};
-+
-+
-+// fc2389b8-c650-4093-9e42-b05e5f0685b7
-+#define NS_IMAGE_TO_PIXBUF_CID \
-+{ 0xfc2389b8, 0xc650, 0x4093, \
-+  { 0x9e, 0x42, 0xb0, 0x5e, 0x5f, 0x06, 0x85, 0xb7 } }
-+
-+#endif
-Index: offscreen/widget/src/headless/nsWidgetFactory.cpp
-===================================================================
---- offscreen.orig/widget/src/headless/nsWidgetFactory.cpp      2009-06-12 14:08:56.000000000 +0100
-+++ offscreen/widget/src/headless/nsWidgetFactory.cpp   2009-06-12 14:15:24.000000000 +0100
-@@ -46,6 +46,10 @@
- #include "nsWindow.h"
- #include "nsTransferable.h"
- #include "nsHTMLFormatConverter.h"
-+#ifdef MOZ_X11
-+#include "nsClipboardHelper.h"
-+#include "nsClipboard.h"
-+#endif
- #include "nsSound.h"
- #include "nsBidiKeyboard.h"
- #include "nsScreenManagerHeadless.h"
-@@ -66,6 +70,10 @@
- NS_GENERIC_FACTORY_CONSTRUCTOR(nsTransferable)
- NS_GENERIC_FACTORY_CONSTRUCTOR(nsBidiKeyboard)
- NS_GENERIC_FACTORY_CONSTRUCTOR(nsHTMLFormatConverter)
-+#ifdef MOZ_X11
-+NS_GENERIC_FACTORY_CONSTRUCTOR(nsClipboardHelper)
-+NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsClipboard, Init)
-+#endif
- NS_GENERIC_FACTORY_CONSTRUCTOR(nsSound)
- NS_GENERIC_FACTORY_CONSTRUCTOR(nsScreenManagerHeadless)
- //NS_GENERIC_FACTORY_CONSTRUCTOR(nsImageToPixbuf)
-@@ -142,6 +150,16 @@
-     NS_TRANSFERABLE_CID,
-     "@mozilla.org/widget/transferable;1",
-     nsTransferableConstructor },
-+#ifdef MOZ_X11
-+  { "Gtk Clipboard",
-+    NS_CLIPBOARD_CID,
-+    "@mozilla.org/widget/clipboard;1",
-+    nsClipboardConstructor },
-+  { "Clipboard Helper",
-+    NS_CLIPBOARDHELPER_CID,
-+    "@mozilla.org/widget/clipboardhelper;1",
-+    nsClipboardHelperConstructor },
-+#endif
-   { "HTML Format Converter",
-     NS_HTMLFORMATCONVERTER_CID,
-     "@mozilla.org/widget/htmlformatconverter;1",
diff --git a/meta/packages/mozilla-headless/mozilla-headless/autoconffix.patch b/meta/packages/mozilla-headless/mozilla-headless/autoconffix.patch
deleted file mode 100644
index 2874b0d832..0000000000
--- a/meta/packages/mozilla-headless/mozilla-headless/autoconffix.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-Fixes to enable building with latest autoconf and automake
-
-RP 2/2/10
-
-Index: offscreen/js/ctypes/libffi/configure.ac
-===================================================================
---- offscreen.orig/js/ctypes/libffi/configure.ac        2010-02-02 19:53:16.753906134 +0000
-+++ offscreen/js/ctypes/libffi/configure.ac     2010-02-02 19:53:21.895155509 +0000
-@@ -17,10 +17,10 @@
- # the wrong, non-multilib-adjusted value will be used in multilibs.
- # As a side effect, we have to subst CFLAGS ourselves.
- 
--m4_rename([_AC_ARG_VAR_PRECIOUS],[real_PRECIOUS])
-+m4_rename_force([_AC_ARG_VAR_PRECIOUS],[real_PRECIOUS])
- m4_define([_AC_ARG_VAR_PRECIOUS],[])
- AC_PROG_CC
--m4_rename([real_PRECIOUS],[_AC_ARG_VAR_PRECIOUS])
-+m4_rename_force([real_PRECIOUS],[_AC_ARG_VAR_PRECIOUS])
- 
- AC_SUBST(CFLAGS)
- 
-Index: offscreen/modules/libpr0n/build/Makefile.in
-===================================================================
---- offscreen.orig/modules/libpr0n/build/Makefile.in    2010-02-02 19:53:16.783906873 +0000
-+++ offscreen/modules/libpr0n/build/Makefile.in 2010-02-02 19:53:21.895155509 +0000
-@@ -92,6 +92,7 @@
- 
- export::
-        @{ \
-+       \
-        $(foreach d,$(filter-out icon,$(MOZ_IMG_DECODERS)), \
-                echo "#define IMG_BUILD_DECODER_${d}";) \
-        $(foreach d,$(MOZ_IMG_ENCODERS), \
-Index: offscreen/configure.in
-===================================================================
---- offscreen.orig/configure.in 2010-02-02 19:53:28.493904163 +0000
-+++ offscreen/configure.in      2010-02-02 16:33:09.000000000 +0000
-@@ -3250,11 +3250,7 @@
-     dnl ========================================================
-     AC_CHECK_LIB(Xext, XShmCreateImage, _HAVE_XSHM_XEXT=1,,
-         $XLIBS $XEXT_LIBS)
--    AC_CHECK_HEADER(X11/extensions/XShm.h)
--    if test "$ac_cv_header_X11_extensions_XShm_h" = "yes" &&
--        test -n "$_HAVE_XSHM_XEXT"; then
--        AC_DEFINE(HAVE_XSHM)
--    fi
-+    AC_DEFINE(HAVE_XSHM)
- 
-     dnl ========================================================
-     dnl = Check for XIE
-@@ -8120,15 +8116,7 @@
- fi # COMPILE_ENVIRONMENT
- 
- if test "$USE_FC_FREETYPE"; then
--    if test "$COMPILE_ENVIRONMENT"; then
--       _SAVE_CPPFLAGS="$CPPFLAGS"
--       CPPFLAGS="$CPPFLAGS $FT2_CFLAGS"
--        AC_CHECK_HEADERS(fontconfig/fcfreetype.h, , 
--            [AC_MSG_ERROR(Can't find header fontconfig/fcfreetype.h.)])
--       CPPFLAGS="$_SAVE_CPPFLAGS"
--    else
-         AC_DEFINE(HAVE_FONTCONFIG_FCFREETYPE_H)
--    fi
- fi
- 
- dnl Set various defines and substitutions
diff --git a/meta/packages/mozilla-headless/mozilla-headless/buildfixhack.patch b/meta/packages/mozilla-headless/mozilla-headless/buildfixhack.patch
deleted file mode 100644
index 31fc40f28b..0000000000
--- a/meta/packages/mozilla-headless/mozilla-headless/buildfixhack.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -r ad8be5166ccd layout/generic/nsFrame.h
---- a/layout/generic/nsFrame.h  Tue Nov 17 19:24:56 2009 +0000
-+++ b/layout/generic/nsFrame.h  Thu Nov 19 12:33:38 2009 +0000
-@@ -151,7 +151,7 @@
-   // Left undefined; nsFrame objects are never allocated from the heap.
-   void* operator new(size_t sz) CPP_THROW_NEW;
- 
--protected:
-+public:
-   // Overridden to prevent the global delete from being called, since
-   // the memory came out of an arena instead of the heap.
-   //
-
-  
diff --git a/meta/packages/mozilla-headless/mozilla-headless/configurefix-1a622cb7c384.patch b/meta/packages/mozilla-headless/mozilla-headless/configurefix-1a622cb7c384.patch
deleted file mode 100644
index d31f91a42d..0000000000
--- a/meta/packages/mozilla-headless/mozilla-headless/configurefix-1a622cb7c384.patch
+++ /dev/null
@@ -1,764 +0,0 @@
-Index: offscreen/configure.in
-===================================================================
---- offscreen.orig/configure.in 2009-06-12 14:15:55.000000000 +0100
-+++ offscreen/configure.in      2009-06-12 14:15:55.000000000 +0100
-@@ -62,7 +62,6 @@
- 
- AC_PREREQ(2.13)
- AC_INIT(config/config.mk)
--AC_CONFIG_AUX_DIR(${srcdir}/build/autoconf)
- AC_CANONICAL_SYSTEM
- TARGET_CPU="${target_cpu}"
- TARGET_VENDOR="${target_vendor}"
-@@ -103,7 +102,6 @@
- _SUBDIR_HOST_CFLAGS="$HOST_CFLAGS"
- _SUBDIR_HOST_CXXFLAGS="$HOST_CXXFLAGS"
- _SUBDIR_HOST_LDFLAGS="$HOST_LDFLAGS"
--_SUBDIR_CONFIG_ARGS="$ac_configure_args"
- 
- dnl Set the version number of the libs included with mozilla
- dnl ========================================================
-@@ -135,6 +133,9 @@
- 
- MSMANIFEST_TOOL=
- 
-+ac_cv_have_usable_wchar_v2=no
-+ac_cv_have_usable_wchar_option_v2=no
-+
- dnl Set various checks
- dnl ========================================================
- MISSING_X=
-@@ -285,7 +286,7 @@
-     ;;
- esac
- 
--if test -n "$CROSS_COMPILE" && test "$target" != "$host"; then
-+
-     echo "cross compiling from $host to $target"
-     cross_compiling=yes
- 
-@@ -323,7 +324,7 @@
- 
-     AC_MSG_CHECKING([whether the host c compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works])
-     AC_TRY_COMPILE([], [return(0);], 
--       [ac_cv_prog_hostcc_works=1 AC_MSG_RESULT([yes])],
-+       [ac_cv_prog_hostcc_works=1; AC_MSG_RESULT([yes])],
-        AC_MSG_ERROR([installation or configuration problem: host compiler $HOST_CC cannot create executables.]) )
- 
-     CC="$HOST_CXX"
-@@ -331,7 +332,7 @@
- 
-     AC_MSG_CHECKING([whether the host c++ compiler ($HOST_CXX $HOST_CXXFLAGS $HOST_LDFLAGS) works])
-     AC_TRY_COMPILE([], [return(0);], 
--       [ac_cv_prog_hostcxx_works=1 AC_MSG_RESULT([yes])],
-+       [ac_cv_prog_hostcxx_works=1; AC_MSG_RESULT([yes])],
-        AC_MSG_ERROR([installation or configuration problem: host compiler $HOST_CXX cannot create executables.]) )
-     
-     CC=$_SAVE_CC
-@@ -352,7 +353,7 @@
-         ;;
-     esac
- 
--    AC_CHECK_PROGS(CC, $CC "${target_alias}-gcc" "${target}-gcc", :)
-+    CC="${target_alias}-gcc"
-     unset ac_cv_prog_CC
-     AC_PROG_CC
-     AC_CHECK_PROGS(CXX, $CXX "${target_alias}-g++" "${target}-g++", :)
-@@ -376,37 +377,6 @@
-     AC_CHECK_PROGS(STRIP, $STRIP "${target_alias}-strip" "${target}-strip", :)
-     AC_CHECK_PROGS(WINDRES, $WINDRES "${target_alias}-windres" "${target}-windres", :)
-     AC_DEFINE(CROSS_COMPILE)
--else
--    AC_PROG_CC
--    AC_PROG_CXX
--    AC_PROG_RANLIB
--    MOZ_PATH_PROGS(AS, $AS as, $CC)
--    AC_CHECK_PROGS(AR, ar, :)
--    AC_CHECK_PROGS(LD, ld, :)
--    AC_CHECK_PROGS(STRIP, strip, :)
--    AC_CHECK_PROGS(WINDRES, windres, :)
--    if test -z "$HOST_CC"; then
--        HOST_CC="$CC"
--    fi
--    if test -z "$HOST_CFLAGS"; then
--        HOST_CFLAGS="$CFLAGS"
--    fi
--    if test -z "$HOST_CXX"; then
--        HOST_CXX="$CXX"
--    fi
--    if test -z "$HOST_CXXFLAGS"; then
--        HOST_CXXFLAGS="$CXXFLAGS"
--    fi
--    if test -z "$HOST_LDFLAGS"; then
--        HOST_LDFLAGS="$LDFLAGS"
--    fi
--    if test -z "$HOST_RANLIB"; then
--        HOST_RANLIB="$RANLIB"
--    fi
--    if test -z "$HOST_AR"; then
--       HOST_AR="$AR"
--    fi
--fi
- 
- GNU_AS=
- GNU_LD=
-@@ -1606,6 +1576,7 @@
- '
- 
- dnl test that the macros actually work:
-+ac_cv_static_assertion_macros_work="yes"
- AC_MSG_CHECKING(that static assertion macros used in autoconf tests work)
- AC_CACHE_VAL(ac_cv_static_assertion_macros_work,
-  [AC_LANG_SAVE
-@@ -2767,9 +2738,13 @@
- AC_LANG_C
- AC_HEADER_STDC
- AC_C_CONST
-+ac_cv_type_mode_t=yes
- AC_TYPE_MODE_T
-+ac_cv_type_off_t=yes
- AC_TYPE_OFF_T
-+ac_cv_type_pid_t=yes
- AC_TYPE_PID_T
-+ac_cv_type_size_t=yes
- AC_TYPE_SIZE_T
- AC_STRUCT_ST_BLKSIZE
- AC_MSG_CHECKING(for siginfo_t)
-@@ -3152,19 +3127,9 @@
- dnl We don't want to link against libm or libpthread on Darwin since
- dnl they both are just symlinks to libSystem and explicitly linking
- dnl against libSystem causes issues when debugging (see bug 299601).
--case $target in
--*-darwin*)
--    ;;
--*-beos*)
--    ;;
--*)
-     AC_CHECK_LIB(m, atan)
-     AC_CHECK_LIB(dl, dlopen,
--    AC_CHECK_HEADER(dlfcn.h, 
--        LIBS="-ldl $LIBS"
--        AC_DEFINE(HAVE_LIBDL)))
--    ;;
--esac
-+        AC_DEFINE(HAVE_LIBDL))
- 
- _SAVE_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS -D_GNU_SOURCE"
-@@ -7007,18 +6972,13 @@
- 
- # Demangle only for debug or trace-malloc builds
- MOZ_DEMANGLE_SYMBOLS=
--if test "$HAVE_DEMANGLE" -a "$HAVE_GCC3_ABI" && test "$MOZ_DEBUG" -o "$NS_TRACE_MALLOC"; then
--    MOZ_DEMANGLE_SYMBOLS=1
--    AC_DEFINE(MOZ_DEMANGLE_SYMBOLS)
--fi
-+
- AC_SUBST(MOZ_DEMANGLE_SYMBOLS)
- 
- dnl ========================================================
- dnl = Support for gcc stack unwinding (from gcc 3.3)
- dnl ========================================================
--if test "$HAVE_GCC3_ABI" && test -z "$SKIP_LIBRARY_CHECKS"; then
--    AC_CHECK_HEADER(unwind.h, AC_CHECK_FUNCS(_Unwind_Backtrace))
--fi
-+
- 
- dnl ========================================================
- dnl =
-@@ -7530,10 +7490,7 @@
-     dnl if no gtk/libIDL1 or gtk2/libIDL2 combination was found, fall back
-     dnl to either libIDL1 or libIDL2.
-     if test -z "$_LIBIDL_FOUND"; then
--        AM_PATH_LIBIDL($LIBIDL_VERSION,_LIBIDL_FOUND=1)
--        if test -z "$_LIBIDL_FOUND"; then
-             PKG_CHECK_MODULES(LIBIDL, libIDL-2.0 >= 0.8.0,_LIBIDL_FOUND=1)
--        fi
-     fi
-     dnl
-     dnl If we don't have a libIDL config program & not cross-compiling, 
-@@ -7605,13 +7562,7 @@
- fi
- 
- if test -z "$SKIP_PATH_CHECKS"; then
--if test -z "${GLIB_CFLAGS}" || test -z "${GLIB_LIBS}" ; then
--    if test "$MOZ_ENABLE_GTK2" || test "$USE_ELF_DYNSTR_GC" || test "$MOZ_ENABLE_HEADLESS"; then
-         PKG_CHECK_MODULES(GLIB, glib-2.0 >= 1.3.7 gobject-2.0)
--    else
--        AM_PATH_GLIB(${GLIB_VERSION})
--    fi
--fi
- fi
- 
- if test -z "${GLIB_GMODULE_LIBS}" -a -n "${GLIB_CONFIG}"; then
-@@ -8457,10 +8408,7 @@
- HAVE_WCRTOMB
- "
- 
--AC_CONFIG_HEADER(
--netwerk/necko-config.h
--xpcom/xpcom-config.h
--xpcom/xpcom-private.h
-+AC_CONFIG_HEADER(netwerk/necko-config.h xpcom/xpcom-config.h xpcom/xpcom-private.h
- )
- 
- # Save the defines header file before autoconf removes it.
-@@ -8519,31 +8467,11 @@
- dnl   To add new Makefiles, edit allmakefiles.sh.
- dnl   allmakefiles.sh sets the variable, MAKEFILES.
- . ${srcdir}/allmakefiles.sh
--dnl 
--dnl Run a perl script to quickly create the makefiles.
--dnl If it succeeds, it outputs a shell command to set CONFIG_FILES
--dnl   for the files it cannot handle correctly. This way, config.status
--dnl   will handle these files.
--dnl If it fails, nothing is set and config.status will run as usual.
--dnl
--dnl This does not change the $MAKEFILES variable.
--dnl
--dnl OpenVMS gets a line overflow on the long eval command, so use a temp file.
--dnl
--if test -z "${AS_PERL}"; then
--echo $MAKEFILES | ${PERL} $srcdir/build/autoconf/acoutput-fast.pl > conftest.sh
--else
--echo $MAKEFILES | ${PERL} $srcdir/build/autoconf/acoutput-fast.pl -nowrap --cygwin-srcdir=$srcdir > conftest.sh
--fi
--. ./conftest.sh
--rm conftest.sh
- 
- echo $MAKEFILES > unallmakefiles
- 
- mv -f config/autoconf.mk config/autoconf.mk.orig 2> /dev/null
- 
--AC_OUTPUT($MAKEFILES)
--
- dnl Prevent the regeneration of cairo-features.h forcing rebuilds of gfx stuff
- if test "$CAIRO_FEATURES_H"; then
-   if cmp -s $CAIRO_FEATURES_H "$CAIRO_FEATURES_H".orig; then
-@@ -8569,14 +8497,14 @@
- HOST_LDFLAGS="$_SUBDIR_HOST_LDFLAGS"
- RC=
- 
--unset MAKEFILES
--unset CONFIG_FILES
-+#unset MAKEFILES
-+#unset CONFIG_FILES
- 
- # No need to run subconfigures when building with LIBXUL_SDK_DIR
- if test "$COMPILE_ENVIRONMENT" -a -z "$LIBXUL_SDK_DIR"; then
- 
- if test -z "$MOZ_NATIVE_NSPR"; then
--    ac_configure_args="$_SUBDIR_CONFIG_ARGS --with-dist-prefix=$MOZ_BUILD_ROOT/dist --with-mozilla"
-+    ac_configure_args="$ac_configure_args --with-dist-prefix=$MOZ_BUILD_ROOT/dist --with-mozilla"
-     if test -z "$MOZ_DEBUG"; then
-         ac_configure_args="$ac_configure_args --disable-debug"
-     fi
-@@ -8592,8 +8520,7 @@
-     if test -n "$USE_ARM_KUSER"; then
-         ac_configure_args="$ac_configure_args --with-arm-kuser"
-     fi
--    AC_OUTPUT_SUBDIRS(nsprpub)
--    ac_configure_args="$_SUBDIR_CONFIG_ARGS"
-+    AC_CONFIG_SUBDIRS(nsprpub)
- fi
- 
- if test -z "$MOZ_NATIVE_NSPR"; then
-@@ -8610,7 +8537,6 @@
- 
- # Run the SpiderMonkey 'configure' script.
- dist=$MOZ_BUILD_ROOT/dist
--ac_configure_args="$_SUBDIR_CONFIG_ARGS"
- ac_configure_args="$ac_configure_args --enable-threadsafe"
- if test -z "$MOZ_NATIVE_NSPR"; then
-     ac_configure_args="$ac_configure_args --with-nspr-cflags='$NSPR_CFLAGS'"
-@@ -8627,11 +8553,14 @@
-      export MOZ_MEMORY_LDFLAGS
-    fi
- fi
--AC_OUTPUT_SUBDIRS(js/src)
--ac_configure_args="$_SUBDIR_CONFIG_ARGS"
-+AC_CONFIG_SUBDIRS(js/src)
- 
- fi # COMPILE_ENVIRONMENT && !LIBXUL_SDK_DIR
- 
-+m4_pattern_allow(AS_BIN)
-+
-+AC_OUTPUT($MAKEFILES)
-+
- dnl Prevent the regeneration of autoconf.mk forcing rebuilds of the world
- dnl Needs to be at the end to respect possible changes from NSPR configure
- if cmp -s config/autoconf.mk config/autoconf.mk.orig; then
-Index: offscreen/js/src/configure.in
-===================================================================
---- offscreen.orig/js/src/configure.in  2009-06-12 14:15:55.000000000 +0100
-+++ offscreen/js/src/configure.in       2009-06-12 14:15:55.000000000 +0100
-@@ -62,7 +62,6 @@
- 
- AC_PREREQ(2.13)
- AC_INIT(jsapi.h)
--AC_CONFIG_AUX_DIR(${srcdir}/build/autoconf)
- AC_CONFIG_HEADER(js-config.h)
- AC_CANONICAL_SYSTEM
- TARGET_CPU="${target_cpu}"
-@@ -101,6 +100,9 @@
- _SUBDIR_HOST_LDFLAGS="$HOST_LDFLAGS"
- _SUBDIR_CONFIG_ARGS="$ac_configure_args"
- 
-+ac_cv_have_usable_wchar_v2=no
-+ac_cv_have_usable_wchar_option_v2=no
-+
- dnl Set the version number of the libs included with mozilla
- dnl ========================================================
- NSPR_VERSION=4
-@@ -113,6 +115,8 @@
- 
- MSMANIFEST_TOOL=
- 
-+m4_pattern_allow(AS_BIN)
-+
- dnl Set various checks
- dnl ========================================================
- MISSING_X=
-@@ -198,7 +202,7 @@
- 
- if test "$COMPILE_ENVIRONMENT"; then
- 
--if test "$target" != "$host"; then
-+
-     echo "cross compiling from $host to $target"
- 
-     _SAVE_CC="$CC"
-@@ -235,7 +239,7 @@
- 
-     AC_MSG_CHECKING([whether the host c compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works])
-     AC_TRY_COMPILE([], [return(0);], 
--       [ac_cv_prog_hostcc_works=1 AC_MSG_RESULT([yes])],
-+       [ac_cv_prog_hostcc_works=1; AC_MSG_RESULT([yes])],
-        AC_MSG_ERROR([installation or configuration problem: host compiler $HOST_CC cannot create executables.]) )
- 
-     CC="$HOST_CXX"
-@@ -243,7 +247,7 @@
- 
-     AC_MSG_CHECKING([whether the host c++ compiler ($HOST_CXX $HOST_CXXFLAGS $HOST_LDFLAGS) works])
-     AC_TRY_COMPILE([], [return(0);], 
--       [ac_cv_prog_hostcxx_works=1 AC_MSG_RESULT([yes])],
-+       [ac_cv_prog_hostcxx_works=1; AC_MSG_RESULT([yes])],
-        AC_MSG_ERROR([installation or configuration problem: host compiler $HOST_CXX cannot create executables.]) )
-     
-     CC=$_SAVE_CC
-@@ -298,7 +302,7 @@
-         ;;
-     esac
- 
--    AC_CHECK_PROGS(CC, $CC "${target_alias}-gcc" "${target}-gcc", :)
-+    CC="${target_alias}-gcc"
-     unset ac_cv_prog_CC
-     AC_PROG_CC
-     AC_CHECK_PROGS(CXX, $CXX "${target_alias}-g++" "${target}-g++", :)
-@@ -328,37 +332,6 @@
-     dnl able to run ppc code in a translated environment, making a cross
-     dnl compiler appear native.  So we override that here.
-     cross_compiling=yes
--else
--    AC_PROG_CC
--    AC_PROG_CXX
--    AC_PROG_RANLIB
--    MOZ_PATH_PROGS(AS, $AS as, $CC)
--    AC_CHECK_PROGS(AR, ar, :)
--    AC_CHECK_PROGS(LD, ld, :)
--    AC_CHECK_PROGS(STRIP, strip, :)
--    AC_CHECK_PROGS(WINDRES, windres, :)
--    if test -z "$HOST_CC"; then
--        HOST_CC="$CC"
--    fi
--    if test -z "$HOST_CFLAGS"; then
--        HOST_CFLAGS="$CFLAGS"
--    fi
--    if test -z "$HOST_CXX"; then
--        HOST_CXX="$CXX"
--    fi
--    if test -z "$HOST_CXXFLAGS"; then
--        HOST_CXXFLAGS="$CXXFLAGS"
--    fi
--    if test -z "$HOST_LDFLAGS"; then
--        HOST_LDFLAGS="$LDFLAGS"
--    fi
--    if test -z "$HOST_RANLIB"; then
--        HOST_RANLIB="$RANLIB"
--    fi
--    if test -z "$HOST_AR"; then
--       HOST_AR="$AR"
--    fi
--fi
- 
- GNU_AS=
- GNU_LD=
-@@ -1424,6 +1397,8 @@
- fi # GNU_CC
- fi # COMPILE_ENVIRONMENT
- 
-+ac_cv_static_assertion_macros_work=yes
-+
- dnl =================================================================
- dnl Set up and test static assertion macros used to avoid AC_TRY_RUN,
- dnl which is bad when cross compiling.
-@@ -2579,9 +2554,13 @@
- AC_LANG_C
- AC_HEADER_STDC
- AC_C_CONST
-+ac_cv_type_mode_t=yes
- AC_TYPE_MODE_T
-+ac_cv_type_off_t=yes
- AC_TYPE_OFF_T
-+ac_cv_type_pid_t=yes
- AC_TYPE_PID_T
-+ac_cv_type_size_t=yes
- AC_TYPE_SIZE_T
- AC_STRUCT_ST_BLKSIZE
- AC_MSG_CHECKING(for siginfo_t)
-@@ -2606,7 +2585,8 @@
- 
- AC_CHECK_HEADER(stdint.h)
- if test "$ac_cv_header_stdint_h" = yes; then
--    AC_DEFINE(JS_HAVE_STDINT_H)
-+    AC_DEFINE(JS_HAVE_STDINT_H, 1, [have stdint.h])
-+    AC_DEFINE(HAVE_STDINT_H)
- else
-     dnl We'll figure them out for ourselves.  List more likely types
-     dnl earlier.  If we ever really encounter a size for which none of
-@@ -3004,10 +2984,7 @@
-     ;;
- *)
-     AC_CHECK_LIB(m, atan)
--    AC_CHECK_LIB(dl, dlopen,
--    AC_CHECK_HEADER(dlfcn.h, 
--        LIBS="-ldl $LIBS"
--        AC_DEFINE(HAVE_LIBDL)))
-+    AC_CHECK_LIB(dl, dlopen, AC_DEFINE(HAVE_LIBDL))
-     ;;
- esac
- 
-@@ -3903,6 +3880,7 @@
- [  --with-nspr-libs=LIBS   Pass LIBS to LD when linking code that uses NSPR.
-                           See --with-nspr-cflags for more details.],
-     NSPR_LIBS=$withval)
-+$NSPR_LIBS="$NSPR_LIBS -L$(LIBXUL_DIST)/sdk/lib"
- AC_SUBST(NSPR_CFLAGS)
- AC_SUBST(NSPR_LIBS)
- 
-@@ -4512,18 +4490,11 @@
- 
- # Demangle only for debug or trace-malloc builds
- MOZ_DEMANGLE_SYMBOLS=
--if test "$HAVE_DEMANGLE" -a "$HAVE_GCC3_ABI" && test "$MOZ_DEBUG" -o "$NS_TRACE_MALLOC"; then
--    MOZ_DEMANGLE_SYMBOLS=1
--    AC_DEFINE(MOZ_DEMANGLE_SYMBOLS)
--fi
- AC_SUBST(MOZ_DEMANGLE_SYMBOLS)
- 
- dnl ========================================================
- dnl = Support for gcc stack unwinding (from gcc 3.3)
- dnl ========================================================
--if test "$HAVE_GCC3_ABI" && test -z "$SKIP_LIBRARY_CHECKS"; then
--    AC_CHECK_HEADER(unwind.h, AC_CHECK_FUNCS(_Unwind_Backtrace))
--fi
- 
- dnl ========================================================
- dnl =
-@@ -5231,6 +5202,8 @@
- done
- AC_SUBST(LIBS_PATH)
- 
-+
-+
- dnl ========================================================
- dnl JavaScript shell
- dnl ========================================================
-@@ -5371,3 +5344,4 @@
- # 'js-config' in Makefile.in.
- AC_MSG_RESULT(invoking make to create js-config script)
- $MAKE js-config
-+
-Index: offscreen/nsprpub/configure.in
-===================================================================
---- offscreen.orig/nsprpub/configure.in 2009-06-12 14:15:55.000000000 +0100
-+++ offscreen/nsprpub/configure.in      2009-06-12 14:15:55.000000000 +0100
-@@ -42,7 +42,6 @@
- AC_PREREQ(2.12)
- AC_INIT(config/libc_r.h)
- 
--AC_CONFIG_AUX_DIR(${srcdir}/build/autoconf)
- AC_CANONICAL_SYSTEM
- 
- dnl ========================================================
-@@ -396,7 +395,7 @@
- dnl ========================================================
- dnl Checks for compilers.
- dnl ========================================================
--if test "$target" != "$host"; then
-+
-     echo "cross compiling from $host to $target"
-     cross_compiling=yes
- 
-@@ -423,7 +422,7 @@
- 
-     AC_MSG_CHECKING([whether the $host compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works])
-     AC_TRY_COMPILE([], [return(0);], 
--        [ac_cv_prog_host_cc_works=1 AC_MSG_RESULT([yes])],
-+        [ac_cv_prog_host_cc_works=1; AC_MSG_RESULT([yes])],
-         AC_MSG_ERROR([installation or configuration problem: $host compiler $HOST_CC cannot create executables.]) )
- 
-     CC=$_SAVE_CC
-@@ -444,7 +443,7 @@
-         ;;        
-     esac            
- 
--    AC_CHECK_PROGS(CC, $CC "${target_alias}-gcc" "${target}-gcc", echo)
-+    CC="${target_alias}-gcc"
-     unset ac_cv_prog_CC
-     AC_PROG_CC
-     if test -n "$USE_CPLUS"; then
-@@ -470,30 +469,6 @@
-     AC_CHECK_PROGS(STRIP, $STRIP "${target_alias}-strip" "${target}-strip", echo)
-     AC_CHECK_PROGS(WINDRES, $WINDRES "${target_alias}-windres" "${target}-windres", echo)
- 
--else
--    AC_PROG_CC
--    if test -n "$USE_CPLUS"; then
--        if test "$CC" = "cl" -a -z "$CXX"; then
--            CXX=$CC
--        else        
--            AC_PROG_CXX
--        fi
--    fi
--    AC_PROG_CPP
--    AC_PROG_RANLIB
--    AC_PATH_PROGS(AS, as, $CC)
--    AC_PATH_PROGS(AR, ar, echo not_ar)
--    AC_PATH_PROGS(LD, ld link, echo not_ld)
--    AC_PATH_PROGS(STRIP, strip, echo not_strip)
--    AC_PATH_PROGS(WINDRES, windres, echo not_windres)
--    if test -z "$HOST_CC"; then
--        HOST_CC="$CC"
--    fi
--    if test -z "$HOST_CFLAGS"; then
--        HOST_CFLAGS="$CFLAGS"
--    fi
--fi
--
- if test "$GCC" = "yes"; then
-     GNU_CC=1
- fi
-@@ -514,11 +489,8 @@
-         ;;
- esac
- 
--if test "$cross_compiling"  = "yes"; then
-+
-     CROSS_COMPILE=1
--else
--    CROSS_COMPILE=
--fi
- 
- dnl ========================================================
- dnl Check for gcc -pipe support
-@@ -2283,10 +2255,7 @@
- *-darwin*|*-beos*)
-     ;;
- *)
--    AC_CHECK_LIB(dl, dlopen,
--        AC_CHECK_HEADER(dlfcn.h,
--            OS_LIBS="-ldl $OS_LIBS"))
--    ;;
-+    AC_CHECK_LIB(dl, dlopen)
- esac
- 
- 
-@@ -2904,6 +2873,8 @@
- dnl pr/tests/w16gui/Makefile
- dnl tools/Makefile
- 
-+m4_pattern_allow(AS_BIN)
-+
- if test -z "$USE_PTHREADS" && test -z "$USE_BTHREADS"; then
-     MAKEFILES="$MAKEFILES pr/src/threads/combined/Makefile"
- elif test -n "$USE_PTHREADS"; then
-@@ -2919,3 +2890,5 @@
- echo $MAKEFILES > unallmakefiles
- 
- AC_OUTPUT([$MAKEFILES], [chmod +x config/nspr-config])
-+
-+
-Index: offscreen/js/src/Makefile.in
-===================================================================
---- offscreen.orig/js/src/Makefile.in   2009-06-12 14:15:55.000000000 +0100
-+++ offscreen/js/src/Makefile.in        2009-06-12 14:15:55.000000000 +0100
-@@ -514,20 +514,8 @@
- 
- export:: jsautocfg.h
- 
--ifeq (,$(CROSS_COMPILE)$(GNU_CC)$(filter-out WINNT,$(OS_ARCH)))
- jsautocfg.h:
-        touch $@
--else
--ifeq ($(OS_ARCH),WINCE)
--jsautocfg.h:
--       touch $@
--else
--jsautocfg.h: jscpucfg$(HOST_BIN_SUFFIX)
--       @rm -f $@ jsautocfg.tmp
--       ./jscpucfg > jsautocfg.tmp
--       mv jsautocfg.tmp $@
--endif
--endif
- 
- # jscpucfg is a strange target
- # Needs to be built with the host compiler but needs to include
-@@ -557,7 +545,7 @@
-        echo no need to build jscpucfg $<
- else
- jscpucfg$(HOST_BIN_SUFFIX): jscpucfg.cpp Makefile.in
--       $(HOST_CXX) $(HOST_CXXFLAGS) $(JSCPUCFG_DEFINES) $(DEFINES) $(NSPR_CFLAGS) $(HOST_OUTOPTION)$@ $<
-+       $(HOST_CXX) $(HOST_CXXFLAGS) $(JSCPUCFG_DEFINES) $(DEFINES) -I$(DIST)/sdk/include $(NSPR_CFLAGS) $(HOST_OUTOPTION)$@ $<
- endif
- endif
- 
-Index: offscreen/js/src/xpconnect/loader/mozJSComponentLoader.cpp
-===================================================================
---- offscreen.orig/js/src/xpconnect/loader/mozJSComponentLoader.cpp     2009-06-12 14:15:55.000000000 +0100
-+++ offscreen/js/src/xpconnect/loader/mozJSComponentLoader.cpp  2009-06-12 14:15:55.000000000 +0100
-@@ -47,6 +47,8 @@
- 
- #include <stdarg.h>
- 
-+#include "mozilla-config.h"
-+
- #include "prlog.h"
- 
- #include "nsCOMPtr.h"
-Index: offscreen/js/src/xpconnect/loader/mozJSSubScriptLoader.cpp
-===================================================================
---- offscreen.orig/js/src/xpconnect/loader/mozJSSubScriptLoader.cpp     2009-06-12 14:15:55.000000000 +0100
-+++ offscreen/js/src/xpconnect/loader/mozJSSubScriptLoader.cpp  2009-06-12 14:15:55.000000000 +0100
-@@ -39,6 +39,8 @@
-  *
-  * ***** END LICENSE BLOCK ***** */
- 
-+#include "mozilla-config.h"
-+
- #if !defined(XPCONNECT_STANDALONE) && !defined(NO_SUBSCRIPT_LOADER)
- 
- #include "mozJSSubScriptLoader.h"
-Index: offscreen/modules/lcms/include/icc34.h
-===================================================================
---- offscreen.orig/modules/lcms/include/icc34.h 2009-06-12 14:15:55.000000000 +0100
-+++ offscreen/modules/lcms/include/icc34.h      2009-06-12 14:15:55.000000000 +0100
-@@ -144,7 +144,7 @@
-  */
- 
- 
--#ifdef PACKAGE_NAME
-+#if 0 
- /*
-   June 9, 2003, Adapted for use with configure by Bob Friesenhahn
-   Added the stupid check for autoconf by Marti Maria. 
-Index: offscreen/toolkit/mozapps/update/src/updater/Makefile.in
-===================================================================
---- offscreen.orig/toolkit/mozapps/update/src/updater/Makefile.in       2009-06-12 14:15:55.000000000 +0100
-+++ offscreen/toolkit/mozapps/update/src/updater/Makefile.in    2009-06-12 14:15:55.000000000 +0100
-@@ -60,7 +60,7 @@
- 
- LIBS += \
-        $(DEPTH)/modules/libmar/src/$(LIB_PREFIX)mar.$(LIB_SUFFIX) \
--       $(BZ2_LIBS) \
-+       $(BZ2_LIBS) -lpthread \
-        $(NULL)
- 
- ifeq ($(OS_ARCH),WINNT)
-Index: offscreen/xpcom/sample/program/Makefile.in
-===================================================================
---- offscreen.orig/xpcom/sample/program/Makefile.in     2009-06-12 14:15:55.000000000 +0100
-+++ offscreen/xpcom/sample/program/Makefile.in  2009-06-12 14:15:55.000000000 +0100
-@@ -57,7 +57,7 @@
- # that the application be linked against the XPCOM dynamic library or the NSPR
- # dynamic libraries.
- LIBS            = \
--               $(XPCOM_STANDALONE_GLUE_LDOPTS) \
-+               $(XPCOM_STANDALONE_GLUE_LDOPTS) -ldl \
-                $(NULL)
- 
- # Need to link with CoreFoundation on Mac
-Index: offscreen/xpcom/tools/registry/Makefile.in
-===================================================================
---- offscreen.orig/xpcom/tools/registry/Makefile.in     2009-06-12 14:15:55.000000000 +0100
-+++ offscreen/xpcom/tools/registry/Makefile.in  2009-06-12 14:15:55.000000000 +0100
-@@ -54,7 +54,7 @@
- SIMPLE_PROGRAMS        = $(CPPSRCS:.cpp=$(BIN_SUFFIX))
- 
- LIBS            = \
--               $(XPCOM_STANDALONE_GLUE_LDOPTS) \
-+               $(XPCOM_STANDALONE_GLUE_LDOPTS) -ldl \
-                $(NULL)
- 
- # Need to link with CoreFoundation on Mac
-Index: offscreen/xulrunner/app/Makefile.in
-===================================================================
---- offscreen.orig/xulrunner/app/Makefile.in    2009-06-12 14:15:55.000000000 +0100
-+++ offscreen/xulrunner/app/Makefile.in 2009-06-12 14:15:55.000000000 +0100
-@@ -184,7 +184,7 @@
- RCFLAGS += -DXULRUNNER_ICO=\"$(DIST)/branding/xulrunner.ico\" -DDOCUMENT_ICO=\"$(DIST)/branding/document.ico\"
- endif
- 
--LIBS += $(JEMALLOC_LIBS)
-+LIBS += $(JEMALLOC_LIBS) -lpthread -ldl
- 
- include $(topsrcdir)/config/rules.mk
- 
-Index: offscreen/xulrunner/stub/Makefile.in
-===================================================================
---- offscreen.orig/xulrunner/stub/Makefile.in   2009-06-12 14:15:55.000000000 +0100
-+++ offscreen/xulrunner/stub/Makefile.in        2009-06-12 14:15:55.000000000 +0100
-@@ -101,7 +101,7 @@
- endif
- endif
- 
--LIBS += $(JEMALLOC_LIBS)
-+LIBS += $(JEMALLOC_LIBS) -lpthread -ldl
- 
- include $(topsrcdir)/config/rules.mk
- 
-Index: offscreen/modules/plugin/test/testplugin/Makefile.in
-===================================================================
---- offscreen.orig/modules/plugin/test/testplugin/Makefile.in   2009-06-12 14:15:55.000000000 +0100
-+++ offscreen/modules/plugin/test/testplugin/Makefile.in        2009-06-12 14:15:55.000000000 +0100
-@@ -63,9 +63,7 @@
- CMMSRCS = nptest_macosx.mm
- endif
- 
--ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
- CPPSRCS += nptest_gtk2.cpp
--endif
- 
- ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
- CPPSRCS += nptest_os2.cpp
-Index: offscreen/js/src/aclocal.m4
-===================================================================
---- offscreen.orig/js/src/aclocal.m4    2009-06-12 14:15:55.000000000 +0100
-+++ offscreen/js/src/aclocal.m4 2009-06-12 14:15:55.000000000 +0100
-@@ -9,4 +9,3 @@
- builtin(include, build/autoconf/moznbytetype.m4)dnl
- builtin(include, build/autoconf/mozprog.m4)dnl
- 
--MOZ_PROG_CHECKMSYS()
-Index: offscreen/toolkit/toolkit-makefiles.sh
-===================================================================
---- offscreen.orig/toolkit/toolkit-makefiles.sh 2009-06-12 14:19:59.000000000 +0100
-+++ offscreen/toolkit/toolkit-makefiles.sh      2009-06-12 14:20:09.000000000 +0100
-@@ -342,7 +342,6 @@
-   modules/plugin/sdk/samples/Makefile
-   modules/plugin/sdk/samples/common/Makefile
-   modules/plugin/sdk/samples/basic/windows/Makefile
--  modules/plugin/sdk/samples/basic/unix/Makefile
-   modules/plugin/sdk/samples/winless/windows/Makefile
- "
- 
diff --git a/meta/packages/mozilla-headless/mozilla-headless/configurefix.patch b/meta/packages/mozilla-headless/mozilla-headless/configurefix.patch
deleted file mode 100644
index 7ee1211f1a..0000000000
--- a/meta/packages/mozilla-headless/mozilla-headless/configurefix.patch
+++ /dev/null
@@ -1,774 +0,0 @@
-Index: offscreen/configure.in
-===================================================================
---- offscreen.orig/configure.in 2009-12-09 13:10:12.000000000 +0000
-+++ offscreen/configure.in      2009-12-09 13:38:51.000000000 +0000
-@@ -64,7 +64,6 @@
- 
- AC_PREREQ(2.13)
- AC_INIT(config/config.mk)
--AC_CONFIG_AUX_DIR(${srcdir}/build/autoconf)
- AC_CANONICAL_SYSTEM
- TARGET_CPU="${target_cpu}"
- TARGET_VENDOR="${target_vendor}"
-@@ -106,7 +105,6 @@
- _SUBDIR_HOST_CFLAGS="$HOST_CFLAGS"
- _SUBDIR_HOST_CXXFLAGS="$HOST_CXXFLAGS"
- _SUBDIR_HOST_LDFLAGS="$HOST_LDFLAGS"
--_SUBDIR_CONFIG_ARGS="$ac_configure_args"
- 
- dnl Set the version number of the libs included with mozilla
- dnl ========================================================
-@@ -139,6 +137,9 @@
- 
- MSMANIFEST_TOOL=
- 
-+ac_cv_have_usable_wchar_v2=no
-+ac_cv_have_usable_wchar_option_v2=no
-+
- dnl Set various checks
- dnl ========================================================
- MISSING_X=
-@@ -308,7 +309,7 @@
-     ;;
- esac
- 
--if test -n "$CROSS_COMPILE" && test "$target" != "$host"; then
-+
-     echo "cross compiling from $host to $target"
-     cross_compiling=yes
- 
-@@ -346,7 +347,7 @@
- 
-     AC_MSG_CHECKING([whether the host c compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works])
-     AC_TRY_COMPILE([], [return(0);], 
--       [ac_cv_prog_hostcc_works=1 AC_MSG_RESULT([yes])],
-+       [ac_cv_prog_hostcc_works=1; AC_MSG_RESULT([yes])],
-        AC_MSG_ERROR([installation or configuration problem: host compiler $HOST_CC cannot create executables.]) )
- 
-     CC="$HOST_CXX"
-@@ -354,7 +355,7 @@
- 
-     AC_MSG_CHECKING([whether the host c++ compiler ($HOST_CXX $HOST_CXXFLAGS $HOST_LDFLAGS) works])
-     AC_TRY_COMPILE([], [return(0);], 
--       [ac_cv_prog_hostcxx_works=1 AC_MSG_RESULT([yes])],
-+       [ac_cv_prog_hostcxx_works=1; AC_MSG_RESULT([yes])],
-        AC_MSG_ERROR([installation or configuration problem: host compiler $HOST_CXX cannot create executables.]) )
-     
-     CC=$_SAVE_CC
-@@ -375,7 +376,7 @@
-         ;;
-     esac
- 
--    AC_CHECK_PROGS(CC, $CC "${target_alias}-gcc" "${target}-gcc", :)
-+    CC="${target_alias}-gcc"
-     unset ac_cv_prog_CC
-     AC_PROG_CC
-     AC_CHECK_PROGS(CXX, $CXX "${target_alias}-g++" "${target}-g++", :)
-@@ -399,37 +400,6 @@
-     AC_CHECK_PROGS(STRIP, $STRIP "${target_alias}-strip" "${target}-strip", :)
-     AC_CHECK_PROGS(WINDRES, $WINDRES "${target_alias}-windres" "${target}-windres", :)
-     AC_DEFINE(CROSS_COMPILE)
--else
--    AC_PROG_CC
--    AC_PROG_CXX
--    AC_PROG_RANLIB
--    MOZ_PATH_PROGS(AS, $AS as, $CC)
--    AC_CHECK_PROGS(AR, ar, :)
--    AC_CHECK_PROGS(LD, ld, :)
--    AC_CHECK_PROGS(STRIP, strip, :)
--    AC_CHECK_PROGS(WINDRES, windres, :)
--    if test -z "$HOST_CC"; then
--        HOST_CC="$CC"
--    fi
--    if test -z "$HOST_CFLAGS"; then
--        HOST_CFLAGS="$CFLAGS"
--    fi
--    if test -z "$HOST_CXX"; then
--        HOST_CXX="$CXX"
--    fi
--    if test -z "$HOST_CXXFLAGS"; then
--        HOST_CXXFLAGS="$CXXFLAGS"
--    fi
--    if test -z "$HOST_LDFLAGS"; then
--        HOST_LDFLAGS="$LDFLAGS"
--    fi
--    if test -z "$HOST_RANLIB"; then
--        HOST_RANLIB="$RANLIB"
--    fi
--    if test -z "$HOST_AR"; then
--       HOST_AR="$AR"
--    fi
--fi
- 
- GNU_AS=
- GNU_LD=
-@@ -1586,6 +1556,7 @@
- '
- 
- dnl test that the macros actually work:
-+ac_cv_static_assertion_macros_work="yes"
- AC_MSG_CHECKING(that static assertion macros used in autoconf tests work)
- AC_CACHE_VAL(ac_cv_static_assertion_macros_work,
-  [AC_LANG_SAVE
-@@ -2770,9 +2741,13 @@
- AC_LANG_C
- AC_HEADER_STDC
- AC_C_CONST
-+ac_cv_type_mode_t=yes
- AC_TYPE_MODE_T
-+ac_cv_type_off_t=yes
- AC_TYPE_OFF_T
-+ac_cv_type_pid_t=yes
- AC_TYPE_PID_T
-+ac_cv_type_size_t=yes
- AC_TYPE_SIZE_T
- AC_STRUCT_ST_BLKSIZE
- AC_MSG_CHECKING(for siginfo_t)
-@@ -3174,21 +3149,9 @@
- dnl We don't want to link against libm or libpthread on Darwin since
- dnl they both are just symlinks to libSystem and explicitly linking
- dnl against libSystem causes issues when debugging (see bug 299601).
--case $target in
--*-darwin*)
--    ;;
--*-beos*)
--    ;;
--*-os2*)
--    ;;
--*)
-     AC_CHECK_LIB(m, atan)
-     AC_CHECK_LIB(dl, dlopen,
--    AC_CHECK_HEADER(dlfcn.h, 
--        LIBS="-ldl $LIBS"
--        AC_DEFINE(HAVE_LIBDL)))
--    ;;
--esac
-+        AC_DEFINE(HAVE_LIBDL))
- 
- _SAVE_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS -D_GNU_SOURCE"
-@@ -6889,18 +6852,13 @@
- 
- # Demangle only for debug or trace-malloc builds
- MOZ_DEMANGLE_SYMBOLS=
--if test "$HAVE_DEMANGLE" -a "$HAVE_GCC3_ABI" && test "$MOZ_DEBUG" -o "$NS_TRACE_MALLOC"; then
--    MOZ_DEMANGLE_SYMBOLS=1
--    AC_DEFINE(MOZ_DEMANGLE_SYMBOLS)
--fi
-+
- AC_SUBST(MOZ_DEMANGLE_SYMBOLS)
- 
- dnl ========================================================
- dnl = Support for gcc stack unwinding (from gcc 3.3)
- dnl ========================================================
--if test "$HAVE_GCC3_ABI" && test -z "$SKIP_LIBRARY_CHECKS"; then
--    AC_CHECK_HEADER(unwind.h, AC_CHECK_FUNCS(_Unwind_Backtrace))
--fi
-+
- 
- dnl ========================================================
- dnl =
-@@ -7420,10 +7378,7 @@
-     dnl if no gtk/libIDL1 or gtk2/libIDL2 combination was found, fall back
-     dnl to either libIDL1 or libIDL2.
-     if test -z "$_LIBIDL_FOUND"; then
--        AM_PATH_LIBIDL($LIBIDL_VERSION,_LIBIDL_FOUND=1)
--        if test -z "$_LIBIDL_FOUND"; then
-             PKG_CHECK_MODULES(LIBIDL, libIDL-2.0 >= 0.8.0,_LIBIDL_FOUND=1)
--        fi
-     fi
-     dnl
-     dnl If we don't have a libIDL config program & not cross-compiling, 
-@@ -7495,13 +7450,7 @@
- fi
- 
- if test -z "$SKIP_PATH_CHECKS"; then
--if test -z "${GLIB_CFLAGS}" || test -z "${GLIB_LIBS}" ; then
--    if test "$MOZ_ENABLE_GTK2" || test "$USE_ELF_DYNSTR_GC" || test "$MOZ_ENABLE_HEADLESS"; then
-         PKG_CHECK_MODULES(GLIB, glib-2.0 >= 1.3.7 gobject-2.0)
--    else
--        AM_PATH_GLIB(${GLIB_VERSION})
--    fi
--fi
- fi
- 
- if test -z "${GLIB_GMODULE_LIBS}" -a -n "${GLIB_CONFIG}"; then
-@@ -8278,10 +8227,7 @@
- HAVE_WCRTOMB
- "
- 
--AC_CONFIG_HEADER(
--netwerk/necko-config.h
--xpcom/xpcom-config.h
--xpcom/xpcom-private.h
-+AC_CONFIG_HEADER(netwerk/necko-config.h xpcom/xpcom-config.h xpcom/xpcom-private.h
- )
- 
- # Save the defines header file before autoconf removes it.
-@@ -8340,31 +8286,11 @@
- dnl   To add new Makefiles, edit allmakefiles.sh.
- dnl   allmakefiles.sh sets the variable, MAKEFILES.
- . ${srcdir}/allmakefiles.sh
--dnl 
--dnl Run a perl script to quickly create the makefiles.
--dnl If it succeeds, it outputs a shell command to set CONFIG_FILES
--dnl   for the files it cannot handle correctly. This way, config.status
--dnl   will handle these files.
--dnl If it fails, nothing is set and config.status will run as usual.
--dnl
--dnl This does not change the $MAKEFILES variable.
--dnl
--dnl OpenVMS gets a line overflow on the long eval command, so use a temp file.
--dnl
--if test -z "${AS_PERL}"; then
--echo $MAKEFILES | ${PERL} $srcdir/build/autoconf/acoutput-fast.pl > conftest.sh
--else
--echo $MAKEFILES | ${PERL} $srcdir/build/autoconf/acoutput-fast.pl -nowrap --cygwin-srcdir=$srcdir > conftest.sh
--fi
--. ./conftest.sh
--rm conftest.sh
- 
- echo $MAKEFILES > unallmakefiles
- 
- mv -f config/autoconf.mk config/autoconf.mk.orig 2> /dev/null
- 
--AC_OUTPUT($MAKEFILES)
--
- dnl Prevent the regeneration of cairo-features.h forcing rebuilds of gfx stuff
- if test "$CAIRO_FEATURES_H"; then
-   if cmp -s $CAIRO_FEATURES_H "$CAIRO_FEATURES_H".orig; then
-@@ -8390,14 +8316,14 @@
- HOST_LDFLAGS="$_SUBDIR_HOST_LDFLAGS"
- RC=
- 
--unset MAKEFILES
--unset CONFIG_FILES
-+#unset MAKEFILES
-+#unset CONFIG_FILES
- 
- # No need to run subconfigures when building with LIBXUL_SDK_DIR
- if test "$COMPILE_ENVIRONMENT" -a -z "$LIBXUL_SDK_DIR"; then
- 
- if test -z "$MOZ_NATIVE_NSPR"; then
--    ac_configure_args="$_SUBDIR_CONFIG_ARGS --with-dist-prefix=$MOZ_BUILD_ROOT/dist --with-mozilla"
-+    ac_configure_args="$ac_configure_args --with-dist-prefix=$MOZ_BUILD_ROOT/dist --with-mozilla"
-     if test -z "$MOZ_DEBUG"; then
-         ac_configure_args="$ac_configure_args --disable-debug"
-     fi
-@@ -8413,8 +8339,7 @@
-     if test -n "$USE_ARM_KUSER"; then
-         ac_configure_args="$ac_configure_args --with-arm-kuser"
-     fi
--    AC_OUTPUT_SUBDIRS(nsprpub)
--    ac_configure_args="$_SUBDIR_CONFIG_ARGS"
-+    AC_CONFIG_SUBDIRS(nsprpub)
- fi
- 
- if test -z "$MOZ_NATIVE_NSPR"; then
-@@ -8431,7 +8356,6 @@
- 
- # Run the SpiderMonkey 'configure' script.
- dist=$MOZ_BUILD_ROOT/dist
--ac_configure_args="$_SUBDIR_CONFIG_ARGS"
- ac_configure_args="$ac_configure_args --enable-threadsafe"
- if test -z "$MOZ_NATIVE_NSPR"; then
-     ac_configure_args="$ac_configure_args --with-nspr-cflags='$NSPR_CFLAGS'"
-@@ -8448,8 +8372,7 @@
-      export MOZ_MEMORY_LDFLAGS
-    fi
- fi
--AC_OUTPUT_SUBDIRS(js/src)
--ac_configure_args="$_SUBDIR_CONFIG_ARGS"
-+AC_CONFIG_SUBDIRS(js/src)
- 
- # Build jsctypes on the platforms we can.
- if test "$BUILD_CTYPES"; then
-@@ -8465,20 +8388,14 @@
-     if test -n "$CROSS_COMPILE"; then
-       ac_configure_args="$ac_configure_args --build=$build --host=$target"
-     fi
--    if test "$SOLARIS_SUNPRO_CC"; then
--      # Always use gcc for libffi on Solaris
--      old_cache_file=$cache_file
--      cache_file=js/ctypes/libffi/config.cache
--      ac_configure_args="$ac_configure_args CC=gcc"
--      AC_OUTPUT_SUBDIRS(js/ctypes/libffi)
--      cache_file=$old_cache_file
--    else
--      AC_OUTPUT_SUBDIRS(js/ctypes/libffi)
--    fi
--    ac_configure_args="$_SUBDIR_CONFIG_ARGS"
-+    AC_CONFIG_SUBDIRS(js/ctypes/libffi)
-   fi
- fi
- 
-+m4_pattern_allow(AS_BIN)
-+
-+AC_OUTPUT($MAKEFILES)
-+
- fi # COMPILE_ENVIRONMENT && !LIBXUL_SDK_DIR
- 
- dnl Prevent the regeneration of autoconf.mk forcing rebuilds of the world
-Index: offscreen/js/src/configure.in
-===================================================================
---- offscreen.orig/js/src/configure.in  2009-12-09 13:10:12.000000000 +0000
-+++ offscreen/js/src/configure.in       2009-12-09 13:38:51.000000000 +0000
-@@ -62,7 +62,6 @@
- 
- AC_PREREQ(2.13)
- AC_INIT(jsapi.h)
--AC_CONFIG_AUX_DIR(${srcdir}/build/autoconf)
- AC_CONFIG_HEADER(js-config.h)
- AC_CANONICAL_SYSTEM
- TARGET_CPU="${target_cpu}"
-@@ -101,6 +100,9 @@
- _SUBDIR_HOST_LDFLAGS="$HOST_LDFLAGS"
- _SUBDIR_CONFIG_ARGS="$ac_configure_args"
- 
-+ac_cv_have_usable_wchar_v2=no
-+ac_cv_have_usable_wchar_option_v2=no
-+
- dnl Set the version number of the libs included with mozilla
- dnl ========================================================
- NSPR_VERSION=4
-@@ -113,6 +115,8 @@
- 
- MSMANIFEST_TOOL=
- 
-+m4_pattern_allow(AS_BIN)
-+
- dnl Set various checks
- dnl ========================================================
- MISSING_X=
-@@ -212,7 +216,7 @@
- 
- if test "$COMPILE_ENVIRONMENT"; then
- 
--if test "$target" != "$host"; then
-+
-     echo "cross compiling from $host to $target"
- 
-     _SAVE_CC="$CC"
-@@ -249,7 +253,7 @@
- 
-     AC_MSG_CHECKING([whether the host c compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works])
-     AC_TRY_COMPILE([], [return(0);], 
--       [ac_cv_prog_hostcc_works=1 AC_MSG_RESULT([yes])],
-+       [ac_cv_prog_hostcc_works=1; AC_MSG_RESULT([yes])],
-        AC_MSG_ERROR([installation or configuration problem: host compiler $HOST_CC cannot create executables.]) )
- 
-     CC="$HOST_CXX"
-@@ -257,7 +261,7 @@
- 
-     AC_MSG_CHECKING([whether the host c++ compiler ($HOST_CXX $HOST_CXXFLAGS $HOST_LDFLAGS) works])
-     AC_TRY_COMPILE([], [return(0);], 
--       [ac_cv_prog_hostcxx_works=1 AC_MSG_RESULT([yes])],
-+       [ac_cv_prog_hostcxx_works=1; AC_MSG_RESULT([yes])],
-        AC_MSG_ERROR([installation or configuration problem: host compiler $HOST_CXX cannot create executables.]) )
-     
-     CC=$_SAVE_CC
-@@ -312,7 +316,7 @@
-         ;;
-     esac
- 
--    AC_CHECK_PROGS(CC, $CC "${target_alias}-gcc" "${target}-gcc", :)
-+    CC="${target_alias}-gcc"
-     unset ac_cv_prog_CC
-     AC_PROG_CC
-     AC_CHECK_PROGS(CXX, $CXX "${target_alias}-g++" "${target}-g++", :)
-@@ -342,37 +346,6 @@
-     dnl able to run ppc code in a translated environment, making a cross
-     dnl compiler appear native.  So we override that here.
-     cross_compiling=yes
--else
--    AC_PROG_CC
--    AC_PROG_CXX
--    AC_PROG_RANLIB
--    MOZ_PATH_PROGS(AS, $AS as, $CC)
--    AC_CHECK_PROGS(AR, ar, :)
--    AC_CHECK_PROGS(LD, ld, :)
--    AC_CHECK_PROGS(STRIP, strip, :)
--    AC_CHECK_PROGS(WINDRES, windres, :)
--    if test -z "$HOST_CC"; then
--        HOST_CC="$CC"
--    fi
--    if test -z "$HOST_CFLAGS"; then
--        HOST_CFLAGS="$CFLAGS"
--    fi
--    if test -z "$HOST_CXX"; then
--        HOST_CXX="$CXX"
--    fi
--    if test -z "$HOST_CXXFLAGS"; then
--        HOST_CXXFLAGS="$CXXFLAGS"
--    fi
--    if test -z "$HOST_LDFLAGS"; then
--        HOST_LDFLAGS="$LDFLAGS"
--    fi
--    if test -z "$HOST_RANLIB"; then
--        HOST_RANLIB="$RANLIB"
--    fi
--    if test -z "$HOST_AR"; then
--       HOST_AR="$AR"
--    fi
--fi
- 
- GNU_AS=
- GNU_LD=
-@@ -1370,6 +1343,8 @@
- fi # GNU_CC
- fi # COMPILE_ENVIRONMENT
- 
-+ac_cv_static_assertion_macros_work=yes
-+
- dnl =================================================================
- dnl Set up and test static assertion macros used to avoid AC_TRY_RUN,
- dnl which is bad when cross compiling.
-@@ -2557,9 +2532,13 @@
- AC_LANG_C
- AC_HEADER_STDC
- AC_C_CONST
-+ac_cv_type_mode_t=yes
- AC_TYPE_MODE_T
-+ac_cv_type_off_t=yes
- AC_TYPE_OFF_T
-+ac_cv_type_pid_t=yes
- AC_TYPE_PID_T
-+ac_cv_type_size_t=yes
- AC_TYPE_SIZE_T
- AC_STRUCT_ST_BLKSIZE
- AC_MSG_CHECKING(for siginfo_t)
-@@ -2584,7 +2563,8 @@
- 
- AC_CHECK_HEADER(stdint.h)
- if test "$ac_cv_header_stdint_h" = yes; then
--    AC_DEFINE(JS_HAVE_STDINT_H)
-+    AC_DEFINE(JS_HAVE_STDINT_H, 1, [have stdint.h])
-+    AC_DEFINE(HAVE_STDINT_H)
- else
-     dnl We'll figure them out for ourselves.  List more likely types
-     dnl earlier.  If we ever really encounter a size for which none of
-@@ -2938,10 +2918,7 @@
-     ;;
- *)
-     AC_CHECK_LIB(m, atan)
--    AC_CHECK_LIB(dl, dlopen,
--    AC_CHECK_HEADER(dlfcn.h, 
--        LIBS="-ldl $LIBS"
--        AC_DEFINE(HAVE_LIBDL)))
-+    AC_CHECK_LIB(dl, dlopen, AC_DEFINE(HAVE_LIBDL))
-     ;;
- esac
- 
-@@ -3847,6 +3824,7 @@
- [  --with-nspr-libs=LIBS   Pass LIBS to LD when linking code that uses NSPR.
-                           See --with-nspr-cflags for more details.],
-     NSPR_LIBS=$withval)
-+$NSPR_LIBS="$NSPR_LIBS -L$(LIBXUL_DIST)/sdk/lib"
- AC_SUBST(NSPR_CFLAGS)
- AC_SUBST(NSPR_LIBS)
- 
-@@ -4386,18 +4364,11 @@
- 
- # Demangle only for debug or trace-malloc builds
- MOZ_DEMANGLE_SYMBOLS=
--if test "$HAVE_DEMANGLE" -a "$HAVE_GCC3_ABI" && test "$MOZ_DEBUG" -o "$NS_TRACE_MALLOC"; then
--    MOZ_DEMANGLE_SYMBOLS=1
--    AC_DEFINE(MOZ_DEMANGLE_SYMBOLS)
--fi
- AC_SUBST(MOZ_DEMANGLE_SYMBOLS)
- 
- dnl ========================================================
- dnl = Support for gcc stack unwinding (from gcc 3.3)
- dnl ========================================================
--if test "$HAVE_GCC3_ABI" && test -z "$SKIP_LIBRARY_CHECKS"; then
--    AC_CHECK_HEADER(unwind.h, AC_CHECK_FUNCS(_Unwind_Backtrace))
--fi
- 
- dnl ========================================================
- dnl =
-@@ -5097,6 +5068,8 @@
- 
- AC_HAVE_FUNCS(setlocale)
- 
-+
-+
- dnl ========================================================
- dnl Use cygwin wrapper for win32 builds, except MSYS/MinGW
- dnl ========================================================
-@@ -5234,3 +5207,4 @@
- # 'js-config' in Makefile.in.
- AC_MSG_RESULT(invoking make to create js-config script)
- $MAKE js-config
-+
-Index: offscreen/nsprpub/configure.in
-===================================================================
---- offscreen.orig/nsprpub/configure.in 2009-12-09 13:10:12.000000000 +0000
-+++ offscreen/nsprpub/configure.in      2009-12-09 13:10:12.000000000 +0000
-@@ -42,7 +42,6 @@
- AC_PREREQ(2.12)
- AC_INIT(config/libc_r.h)
- 
--AC_CONFIG_AUX_DIR(${srcdir}/build/autoconf)
- AC_CANONICAL_SYSTEM
- 
- dnl ========================================================
-@@ -396,7 +395,7 @@
- dnl ========================================================
- dnl Checks for compilers.
- dnl ========================================================
--if test "$target" != "$host"; then
-+
-     echo "cross compiling from $host to $target"
-     cross_compiling=yes
- 
-@@ -423,7 +422,7 @@
- 
-     AC_MSG_CHECKING([whether the $host compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works])
-     AC_TRY_COMPILE([], [return(0);], 
--        [ac_cv_prog_host_cc_works=1 AC_MSG_RESULT([yes])],
-+        [ac_cv_prog_host_cc_works=1; AC_MSG_RESULT([yes])],
-         AC_MSG_ERROR([installation or configuration problem: $host compiler $HOST_CC cannot create executables.]) )
- 
-     CC=$_SAVE_CC
-@@ -444,7 +443,7 @@
-         ;;        
-     esac            
- 
--    AC_CHECK_PROGS(CC, $CC "${target_alias}-gcc" "${target}-gcc", echo)
-+    CC="${target_alias}-gcc"
-     unset ac_cv_prog_CC
-     AC_PROG_CC
-     if test -n "$USE_CPLUS"; then
-@@ -470,30 +469,6 @@
-     AC_CHECK_PROGS(STRIP, $STRIP "${target_alias}-strip" "${target}-strip", echo)
-     AC_CHECK_PROGS(WINDRES, $WINDRES "${target_alias}-windres" "${target}-windres", echo)
- 
--else
--    AC_PROG_CC
--    if test -n "$USE_CPLUS"; then
--        if test "$CC" = "cl" -a -z "$CXX"; then
--            CXX=$CC
--        else        
--            AC_PROG_CXX
--        fi
--    fi
--    AC_PROG_CPP
--    AC_PROG_RANLIB
--    AC_PATH_PROGS(AS, as, $CC)
--    AC_PATH_PROGS(AR, ar, echo not_ar)
--    AC_PATH_PROGS(LD, ld link, echo not_ld)
--    AC_PATH_PROGS(STRIP, strip, echo not_strip)
--    AC_PATH_PROGS(WINDRES, windres, echo not_windres)
--    if test -z "$HOST_CC"; then
--        HOST_CC="$CC"
--    fi
--    if test -z "$HOST_CFLAGS"; then
--        HOST_CFLAGS="$CFLAGS"
--    fi
--fi
--
- if test "$GCC" = "yes"; then
-     GNU_CC=1
- fi
-@@ -514,11 +489,8 @@
-         ;;
- esac
- 
--if test "$cross_compiling"  = "yes"; then
-+
-     CROSS_COMPILE=1
--else
--    CROSS_COMPILE=
--fi
- 
- dnl ========================================================
- dnl Check for gcc -pipe support
-@@ -2286,10 +2258,7 @@
- *-darwin*|*-beos*|*-os2*)
-     ;;
- *)
--    AC_CHECK_LIB(dl, dlopen,
--        AC_CHECK_HEADER(dlfcn.h,
--            OS_LIBS="-ldl $OS_LIBS"))
--    ;;
-+    AC_CHECK_LIB(dl, dlopen)
- esac
- 
- 
-@@ -2907,6 +2876,8 @@
- dnl pr/tests/w16gui/Makefile
- dnl tools/Makefile
- 
-+m4_pattern_allow(AS_BIN)
-+
- if test -z "$USE_PTHREADS" && test -z "$USE_BTHREADS"; then
-     MAKEFILES="$MAKEFILES pr/src/threads/combined/Makefile"
- elif test -n "$USE_PTHREADS"; then
-@@ -2922,3 +2893,5 @@
- echo $MAKEFILES > unallmakefiles
- 
- AC_OUTPUT([$MAKEFILES], [chmod +x config/nspr-config])
-+
-+
-Index: offscreen/js/src/Makefile.in
-===================================================================
---- offscreen.orig/js/src/Makefile.in   2009-12-09 13:10:12.000000000 +0000
-+++ offscreen/js/src/Makefile.in        2009-12-09 13:10:12.000000000 +0000
-@@ -513,20 +513,8 @@
- 
- export:: jsautocfg.h
- 
--ifeq (,$(CROSS_COMPILE)$(GNU_CC)$(filter-out WINNT,$(OS_ARCH)))
- jsautocfg.h:
-        touch $@
--else
--ifeq ($(OS_ARCH),WINCE)
--jsautocfg.h:
--       touch $@
--else
--jsautocfg.h: jscpucfg$(HOST_BIN_SUFFIX)
--       @rm -f $@ jsautocfg.tmp
--       ./jscpucfg > jsautocfg.tmp
--       mv jsautocfg.tmp $@
--endif
--endif
- 
- # jscpucfg is a strange target
- # Needs to be built with the host compiler but needs to include
-@@ -556,7 +544,7 @@
-        echo no need to build jscpucfg $<
- else
- jscpucfg$(HOST_BIN_SUFFIX): jscpucfg.cpp Makefile.in
--       $(HOST_CXX) $(HOST_CXXFLAGS) $(JSCPUCFG_DEFINES) $(DEFINES) $(NSPR_CFLAGS) $(HOST_OUTOPTION)$@ $<
-+       $(HOST_CXX) $(HOST_CXXFLAGS) $(JSCPUCFG_DEFINES) $(DEFINES) -I$(DIST)/sdk/include $(NSPR_CFLAGS) $(HOST_OUTOPTION)$@ $<
- endif
- endif
- 
-Index: offscreen/js/src/xpconnect/loader/mozJSComponentLoader.cpp
-===================================================================
---- offscreen.orig/js/src/xpconnect/loader/mozJSComponentLoader.cpp     2009-12-09 13:10:12.000000000 +0000
-+++ offscreen/js/src/xpconnect/loader/mozJSComponentLoader.cpp  2009-12-09 13:10:12.000000000 +0000
-@@ -47,6 +47,8 @@
- 
- #include <stdarg.h>
- 
-+#include "mozilla-config.h"
-+
- #include "prlog.h"
- 
- #include "nsCOMPtr.h"
-Index: offscreen/js/src/xpconnect/loader/mozJSSubScriptLoader.cpp
-===================================================================
---- offscreen.orig/js/src/xpconnect/loader/mozJSSubScriptLoader.cpp     2009-12-09 13:10:12.000000000 +0000
-+++ offscreen/js/src/xpconnect/loader/mozJSSubScriptLoader.cpp  2009-12-09 13:10:12.000000000 +0000
-@@ -39,6 +39,8 @@
-  *
-  * ***** END LICENSE BLOCK ***** */
- 
-+#include "mozilla-config.h"
-+
- #if !defined(XPCONNECT_STANDALONE) && !defined(NO_SUBSCRIPT_LOADER)
- 
- #include "mozJSSubScriptLoader.h"
-Index: offscreen/toolkit/mozapps/update/src/updater/Makefile.in
-===================================================================
---- offscreen.orig/toolkit/mozapps/update/src/updater/Makefile.in       2009-12-09 13:10:12.000000000 +0000
-+++ offscreen/toolkit/mozapps/update/src/updater/Makefile.in    2009-12-09 13:10:12.000000000 +0000
-@@ -56,7 +56,7 @@
- 
- LIBS += \
-        $(DEPTH)/modules/libmar/src/$(LIB_PREFIX)mar.$(LIB_SUFFIX) \
--       $(BZ2_LIBS) \
-+       $(BZ2_LIBS) -lpthread \
-        $(NULL)
- 
- ifeq ($(OS_ARCH),WINNT)
-Index: offscreen/xpcom/sample/program/Makefile.in
-===================================================================
---- offscreen.orig/xpcom/sample/program/Makefile.in     2009-12-09 13:10:12.000000000 +0000
-+++ offscreen/xpcom/sample/program/Makefile.in  2009-12-09 13:10:12.000000000 +0000
-@@ -57,7 +57,7 @@
- # that the application be linked against the XPCOM dynamic library or the NSPR
- # dynamic libraries.
- LIBS            = \
--               $(XPCOM_STANDALONE_GLUE_LDOPTS) \
-+               $(XPCOM_STANDALONE_GLUE_LDOPTS) -ldl \
-                $(NULL)
- 
- # Need to link with CoreFoundation on Mac
-Index: offscreen/xpcom/tools/registry/Makefile.in
-===================================================================
---- offscreen.orig/xpcom/tools/registry/Makefile.in     2009-12-09 13:10:12.000000000 +0000
-+++ offscreen/xpcom/tools/registry/Makefile.in  2009-12-09 13:10:12.000000000 +0000
-@@ -54,7 +54,7 @@
- SIMPLE_PROGRAMS        = $(CPPSRCS:.cpp=$(BIN_SUFFIX))
- 
- LIBS            = \
--               $(XPCOM_STANDALONE_GLUE_LDOPTS) \
-+               $(XPCOM_STANDALONE_GLUE_LDOPTS) -ldl \
-                $(NULL)
- 
- # Need to link with CoreFoundation on Mac
-Index: offscreen/xulrunner/app/Makefile.in
-===================================================================
---- offscreen.orig/xulrunner/app/Makefile.in    2009-12-09 13:10:12.000000000 +0000
-+++ offscreen/xulrunner/app/Makefile.in 2009-12-09 13:10:12.000000000 +0000
-@@ -173,7 +173,7 @@
- RCFLAGS += -DXULRUNNER_ICO=\"$(DIST)/branding/xulrunner.ico\" -DDOCUMENT_ICO=\"$(DIST)/branding/document.ico\"
- endif
- 
--LIBS += $(JEMALLOC_LIBS)
-+LIBS += $(JEMALLOC_LIBS) -lpthread -ldl
- 
- include $(topsrcdir)/config/rules.mk
- 
-Index: offscreen/xulrunner/stub/Makefile.in
-===================================================================
---- offscreen.orig/xulrunner/stub/Makefile.in   2009-12-09 13:10:12.000000000 +0000
-+++ offscreen/xulrunner/stub/Makefile.in        2009-12-09 13:10:12.000000000 +0000
-@@ -100,7 +100,7 @@
- endif
- endif
- 
--LIBS += $(JEMALLOC_LIBS)
-+LIBS += $(JEMALLOC_LIBS) -lpthread -ldl
- 
- include $(topsrcdir)/config/rules.mk
- 
-Index: offscreen/modules/plugin/test/testplugin/Makefile.in
-===================================================================
---- offscreen.orig/modules/plugin/test/testplugin/Makefile.in   2009-12-09 13:10:12.000000000 +0000
-+++ offscreen/modules/plugin/test/testplugin/Makefile.in        2009-12-09 13:10:12.000000000 +0000
-@@ -60,9 +60,7 @@
- CMMSRCS = nptest_macosx.mm
- endif
- 
--ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
- CPPSRCS += nptest_gtk2.cpp
--endif
- 
- ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
- CPPSRCS += nptest_os2.cpp
-Index: offscreen/js/src/aclocal.m4
-===================================================================
---- offscreen.orig/js/src/aclocal.m4    2009-12-09 13:10:12.000000000 +0000
-+++ offscreen/js/src/aclocal.m4 2009-12-09 13:39:01.000000000 +0000
-@@ -8,6 +8,4 @@
- builtin(include, build/autoconf/altoptions.m4)dnl
- builtin(include, build/autoconf/moznbytetype.m4)dnl
- builtin(include, build/autoconf/mozprog.m4)dnl
--builtin(include, build/autoconf/acwinpaths.m4)dnl
- 
--MOZ_PROG_CHECKMSYS()
-Index: offscreen/toolkit/toolkit-makefiles.sh
-===================================================================
---- offscreen.orig/toolkit/toolkit-makefiles.sh 2009-12-09 13:10:12.000000000 +0000
-+++ offscreen/toolkit/toolkit-makefiles.sh      2009-12-09 13:10:12.000000000 +0000
-@@ -369,7 +369,6 @@
-   modules/plugin/sdk/samples/Makefile
-   modules/plugin/sdk/samples/common/Makefile
-   modules/plugin/sdk/samples/basic/windows/Makefile
--  modules/plugin/sdk/samples/basic/unix/Makefile
-   modules/plugin/sdk/samples/winless/windows/Makefile
- "
- 
diff --git a/meta/packages/mozilla-headless/mozilla-headless/i386/jsautocfg.h b/meta/packages/mozilla-headless/mozilla-headless/i386/jsautocfg.h
deleted file mode 100644
index 94b44f8e14..0000000000
--- a/meta/packages/mozilla-headless/mozilla-headless/i386/jsautocfg.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef js_cpucfg___
-#define js_cpucfg___
-
-/* AUTOMATICALLY GENERATED - DO NOT EDIT */
-
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-
-
-#define JS_BYTES_PER_WORD   4L
-#define JS_BYTES_PER_DOUBLE 8L
-#define JS_BITS_PER_WORD_LOG2   5L
-#define JS_ALIGN_OF_POINTER 4L
-
-#define JS_THREADSAFE 1
-
-#define JS_STACK_GROWTH_DIRECTION (-1)
-
-#define JS_HAVE_LONG_LONG
-
-#endif /* js_cpucfg___ */
diff --git a/meta/packages/mozilla-headless/mozilla-headless/i486/jsautocfg.h b/meta/packages/mozilla-headless/mozilla-headless/i486/jsautocfg.h
deleted file mode 100644
index 94b44f8e14..0000000000
--- a/meta/packages/mozilla-headless/mozilla-headless/i486/jsautocfg.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef js_cpucfg___
-#define js_cpucfg___
-
-/* AUTOMATICALLY GENERATED - DO NOT EDIT */
-
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-
-
-#define JS_BYTES_PER_WORD   4L
-#define JS_BYTES_PER_DOUBLE 8L
-#define JS_BITS_PER_WORD_LOG2   5L
-#define JS_ALIGN_OF_POINTER 4L
-
-#define JS_THREADSAFE 1
-
-#define JS_STACK_GROWTH_DIRECTION (-1)
-
-#define JS_HAVE_LONG_LONG
-
-#endif /* js_cpucfg___ */
diff --git a/meta/packages/mozilla-headless/mozilla-headless/i586/jsautocfg.h b/meta/packages/mozilla-headless/mozilla-headless/i586/jsautocfg.h
deleted file mode 100644
index 94b44f8e14..0000000000
--- a/meta/packages/mozilla-headless/mozilla-headless/i586/jsautocfg.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef js_cpucfg___
-#define js_cpucfg___
-
-/* AUTOMATICALLY GENERATED - DO NOT EDIT */
-
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-
-
-#define JS_BYTES_PER_WORD   4L
-#define JS_BYTES_PER_DOUBLE 8L
-#define JS_BITS_PER_WORD_LOG2   5L
-#define JS_ALIGN_OF_POINTER 4L
-
-#define JS_THREADSAFE 1
-
-#define JS_STACK_GROWTH_DIRECTION (-1)
-
-#define JS_HAVE_LONG_LONG
-
-#endif /* js_cpucfg___ */
diff --git a/meta/packages/mozilla-headless/mozilla-headless/i686/jsautocfg.h b/meta/packages/mozilla-headless/mozilla-headless/i686/jsautocfg.h
deleted file mode 100644
index 94b44f8e14..0000000000
--- a/meta/packages/mozilla-headless/mozilla-headless/i686/jsautocfg.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef js_cpucfg___
-#define js_cpucfg___
-
-/* AUTOMATICALLY GENERATED - DO NOT EDIT */
-
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-
-
-#define JS_BYTES_PER_WORD   4L
-#define JS_BYTES_PER_DOUBLE 8L
-#define JS_BITS_PER_WORD_LOG2   5L
-#define JS_ALIGN_OF_POINTER 4L
-
-#define JS_THREADSAFE 1
-
-#define JS_STACK_GROWTH_DIRECTION (-1)
-
-#define JS_HAVE_LONG_LONG
-
-#endif /* js_cpucfg___ */
diff --git a/meta/packages/mozilla-headless/mozilla-headless/mozconfig b/meta/packages/mozilla-headless/mozilla-headless/mozconfig
deleted file mode 100644
index 6123d11d27..0000000000
--- a/meta/packages/mozilla-headless/mozilla-headless/mozconfig
+++ /dev/null
@@ -1,23 +0,0 @@
-# this line sets the directory for all build output
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/../obj-headless-release
-
-# comment out the previous line and uncomment these two for a debug build
-#mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/../obj-headless-debug
-#ac_add_options --disable-optimize --enable-debug
-
-# this is the line that enables the headless implementation
-ac_add_options --enable-default-toolkit=cairo-headless
-
-# comment out the previous line and uncomment these two for a GTK build
-#ac_add_options --enable-system-cairo
-#ac_add_options --enable-default-toolkit=cairo-gtk2
-
-ac_add_options --disable-tests
-ac_add_options --disable-javaxpcom
-ac_add_options --enable-application=xulrunner
-ac_add_options --enable-pango
-ac_add_options --disable-printing
-ac_add_options --disable-crashreporter
-ac_add_options --enable-plugins
-ac_add_options --disable-accessibility
-mk_add_options MOZ_CO_PROJECT=xulrunner
diff --git a/meta/packages/mozilla-headless/mozilla-headless/mozilla-jemalloc.patch b/meta/packages/mozilla-headless/mozilla-headless/mozilla-jemalloc.patch
deleted file mode 100644
index aabd6906e8..0000000000
--- a/meta/packages/mozilla-headless/mozilla-headless/mozilla-jemalloc.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -r f1af606531f5 memory/jemalloc/jemalloc.h
---- a/memory/jemalloc/jemalloc.h        Sat Nov 22 20:22:22 2008 +0100
-+++ b/memory/jemalloc/jemalloc.h        Mon Dec 01 16:53:06 2008 -0500
-@@ -45,14 +45,14 @@
- } jemalloc_stats_t;
- 
- #ifndef MOZ_MEMORY_DARWIN
--void   *malloc(size_t size);
--void   *valloc(size_t size);
--void   *calloc(size_t num, size_t size);
--void   *realloc(void *ptr, size_t size);
--void   free(void *ptr);
-+void   *malloc(size_t size)  __THROW __attribute_malloc__ __wur;
-+void   *valloc(size_t size)  __THROW __attribute_malloc__ __wur;
-+void   *calloc(size_t num, size_t size)  __THROW __attribute_malloc__ __wur;
-+void   *realloc(void *ptr, size_t size)  __THROW __attribute_malloc__ __wur;
-+void   free(void *ptr)  __THROW __attribute_malloc__ __wur;
- #endif
- 
--int    posix_memalign(void **memptr, size_t alignment, size_t size);
-+int    posix_memalign(void **memptr, size_t alignment, size_t size)  __THROW __attribute_malloc__ __wur;
- void   *memalign(size_t alignment, size_t size);
- size_t malloc_usable_size(const void *ptr);
- void   jemalloc_stats(jemalloc_stats_t *stats);
diff --git a/meta/packages/mozilla-headless/mozilla-headless/removebadrpath-1a622cb7c384.patch b/meta/packages/mozilla-headless/mozilla-headless/removebadrpath-1a622cb7c384.patch
deleted file mode 100644
index 9409105780..0000000000
--- a/meta/packages/mozilla-headless/mozilla-headless/removebadrpath-1a622cb7c384.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: offscreen/js/src/configure.in
-===================================================================
---- offscreen.orig/js/src/configure.in  2009-06-17 14:31:40.000000000 +0100
-+++ offscreen/js/src/configure.in       2009-06-17 14:31:40.000000000 +0100
-@@ -880,7 +880,7 @@
- HOST_AR_FLAGS='$(AR_FLAGS)'
- 
- MOZ_JS_LIBS='-L$(libdir) -lmozjs'
--MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(PREFIX)/lib'
-+MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin'
- 
- MOZ_COMPONENT_NSPR_LIBS='-L$(LIBXUL_DIST)/bin $(NSPR_LIBS)'
- MOZ_XPCOM_OBSOLETE_LIBS='-L$(LIBXUL_DIST)/lib -lxpcom_compat'
-Index: offscreen/configure.in
-===================================================================
---- offscreen.orig/configure.in 2009-06-17 15:09:44.000000000 +0100
-+++ offscreen/configure.in      2009-06-17 15:10:00.000000000 +0100
-@@ -1060,7 +1060,7 @@
- 
- MOZ_JS_LIBS='-L$(LIBXUL_DIST)/bin -lmozjs'
- DYNAMIC_XPCOM_LIBS='-L$(LIBXUL_DIST)/bin -lxpcom -lxpcom_core'
--MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(prefix)/lib'
-+MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin'
- XPCOM_FROZEN_LDOPTS='-L$(LIBXUL_DIST)/bin -lxpcom'
- LIBXUL_LIBS='$(XPCOM_FROZEN_LDOPTS) -lxul'
- XPCOM_GLUE_LDOPTS='$(LIBXUL_DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) $(XPCOM_FROZEN_LDOPTS)'
diff --git a/meta/packages/mozilla-headless/mozilla-headless/removebadrpath.patch b/meta/packages/mozilla-headless/mozilla-headless/removebadrpath.patch
deleted file mode 100644
index 53ae6d3251..0000000000
--- a/meta/packages/mozilla-headless/mozilla-headless/removebadrpath.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Index: offscreen/js/src/configure.in
-===================================================================
---- offscreen.orig/js/src/configure.in  2009-12-09 13:38:51.000000000 +0000
-+++ offscreen/js/src/configure.in       2009-12-09 14:14:08.000000000 +0000
-@@ -858,7 +858,7 @@
- HOST_AR_FLAGS='$(AR_FLAGS)'
- 
- MOZ_JS_LIBS='-L$(libdir) -lmozjs'
--MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(PREFIX)/lib'
-+MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin'
- 
- MOZ_COMPONENT_NSPR_LIBS='-L$(LIBXUL_DIST)/bin $(NSPR_LIBS)'
- 
-@@ -3824,7 +3824,7 @@
- [  --with-nspr-libs=LIBS   Pass LIBS to LD when linking code that uses NSPR.
-                           See --with-nspr-cflags for more details.],
-     NSPR_LIBS=$withval)
--$NSPR_LIBS="$NSPR_LIBS -L$(LIBXUL_DIST)/sdk/lib"
-+NSPR_LIBS="$NSPR_LIBS -L$(LIBXUL_DIST)/sdk/lib"
- AC_SUBST(NSPR_CFLAGS)
- AC_SUBST(NSPR_LIBS)
- 
-Index: offscreen/configure.in
-===================================================================
---- offscreen.orig/configure.in 2009-12-09 13:38:51.000000000 +0000
-+++ offscreen/configure.in      2009-12-09 14:31:33.000000000 +0000
-@@ -1041,7 +1041,7 @@
- 
- MOZ_JS_LIBS='-L$(LIBXUL_DIST)/bin -lmozjs'
- DYNAMIC_XPCOM_LIBS='-L$(LIBXUL_DIST)/bin -lxpcom -lxpcom_core'
--MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(prefix)/lib'
-+MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin'
- XPCOM_FROZEN_LDOPTS='-L$(LIBXUL_DIST)/bin -lxpcom'
- LIBXUL_LIBS='$(XPCOM_FROZEN_LDOPTS) -lxul'
- XPCOM_GLUE_LDOPTS='$(LIBXUL_DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) $(XPCOM_FROZEN_LDOPTS)'
-@@ -8378,7 +8378,7 @@
- if test "$BUILD_CTYPES"; then
-   # Run the libffi 'configure' script on platforms that it supports.
-   if test -z "$_MSC_VER"; then
--    ac_configure_args="--disable-shared --enable-static --disable-raw-api"
-+    ac_configure_args="$ac_configure_args --disable-shared --enable-static --disable-raw-api"
-     if test "$MOZ_DEBUG"; then
-       ac_configure_args="$ac_configure_args --enable-debug"
-     fi
diff --git a/meta/packages/mozilla-headless/mozilla-headless_hg.bb b/meta/packages/mozilla-headless/mozilla-headless_hg.bb
deleted file mode 100644
index 669c526163..0000000000
--- a/meta/packages/mozilla-headless/mozilla-headless_hg.bb
+++ /dev/null
@@ -1,99 +0,0 @@
-
-#file://0001-Adds-initial-Gtk-clipboard-support-to-moz-headless.patch;patch=1 \
-SRC_URI = "hg://hg.mozilla.org/incubator;protocol=http;module=offscreen \
-           file://configurefix-1a622cb7c384.patch;patch=1;rev=1a622cb7c384 \
-           file://configurefix.patch;patch=1;notrev=1a622cb7c384 \
-           file://mozilla-jemalloc.patch;patch=1 \
-           file://removebadrpath-1a622cb7c384.patch;patch=1;rev=1a622cb7c384 \
-           file://removebadrpath.patch;patch=1;notrev=1a622cb7c384 \
-           file://buildfixhack.patch;patch=1;notrev=1a622cb7c384 \
-           file://autoconffix.patch;patch=1 \
-           file://jsautocfg.h \
-           file://mozconfig"
-PV = "0.2+hg-1.0+${SRCPV}"
-PR = "r10"
-
-S = "${WORKDIR}/offscreen"
-
-DEPENDS = "gconf gnome-vfs pango dbus-glib alsa-lib libidl-native sqlite3 libidl"
-
-FILES_${PN} += "${libdir}/xulrunner-${XULVERSION} ${libdir}/xulrunner-devel-${XULVERSION}/sdk/lib/*.so"
-FILES_${PN}-dev += "${libdir}/xulrunner-devel-${XULVERSION}"
-FILES_${PN}-dbg += "${libdir}/xulrunner-devel-${XULVERSION}/sdk/lib/.debug"
-
-# Mozilla's build rules search for -L paths to find libraries. Its
-# not clever enough to know where the sysroot is and hence finds host 
-# object files which is bad. We therefore tell pkg-config not to hide 
-# paths. See config/rules.mk and the LIBS_DEPS and _LIBDIRS variables.
-export PKG_CONFIG_ALLOW_SYSTEM_LIBS = "1"
-
-TARGET_CC_ARCH = ""
-
-CFLAGS = "${TARGET_CFLAGS}"
-TARGET_CFLAGS = "-Os -g -pipe -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -m32 -march=core2 -msse3 -mtune=generic -mfpmath=sse -fasynchronous-unwind-tables"
-
-LDFLAGS = "${TARGET_LDFLAGS}"
-TARGET_LDFLAGS = "-Wl,-rpath,${libdir}/xulrunner-${XULVERSION}"
-
-export target_alias=${TARGET_PREFIX}
-
-inherit autotools mozilla
-
-acpaths = "-I ${S}/build/autoconf "
-
-export topsrcdir = "${S}"
-
-do_configure () {
-        if [ "${SRCREV}" != "1a622cb7c384" ]; then
-                rm -rf ${S}/build/autoconf/acwinpaths.m4
-                rm -rf ${S}/js/src/build/autoconf/acwinpaths.m4
-                rm -rf ${S}/nsprpub/build/autoconf/acwinpaths.m4
-                mkdir -p ${S}/js/src/dist/include
-                ln -fs ../../../../nsprpub/dist/include/nspr ${S}/js/src/dist/include/nsprpub
-        fi
-        cp ${S}/build/autoconf/install-sh ${S}
-        autotools_do_configure
-        # Yes, we run this twice. The first pass sets up npsrpub-config which then 
-        # sets the values correctly on the second try. Ick.
-        autotools_do_configure
-}
-
-do_compile () {
-        cp ${WORKDIR}/jsautocfg.h ${S}/js/src/
-        #oe_runmake -f client.mk build_all
-        base_do_compile
-}
-
-XULVERSION = "1.9.3a1pre"
-
-do_install_append () {
-        install -d ${D}${sysconfdir}/ld.so.conf.d/
-        echo ${libdir}/xulrunner-${XULVERSION}/ > ${D}${sysconfdir}/ld.so.conf.d/mozilla-headless
-}
-
-EXTRA_OECONF =+ "--enable-application=xulrunner --enable-default-toolkit=cairo-headless --with-pthreads \
-                 --enable-pango --enable-optimize --disable-debug --disable-tests \
-                 --disable-printing --disable-crashreporter --disable-accessibility \
-                 --disable-javaxpcom --enable-plugins --enable-system-sqlite --disable-necko-wifi"
-
-export LIBXUL_DIST="${S}/dist"
-
-SYSROOT_PREPROCESS_FUNCS += "mozilla_sysroot_preprocess"
-
-mozilla_sysroot_preprocess () {
-        autotools_stage_dir ${D}/${libdir}/xulrunner-${XULVERSION} ${SYSROOT_DESTDIR}${STAGING_DIR_HOST}${libdir}/xulrunner-${XULVERSION}/
-        autotools_stage_dir ${D}/${libdir}/xulrunner-devel-${XULVERSION} ${SYSROOT_DESTDIR}${STAGING_DIR_HOST}${libdir}/xulrunner-devel-${XULVERSION}/
-
-        ln -fs ${STAGING_DIR_HOST}${libdir}/xulrunner-${XULVERSION}/ ${SYSROOT_DESTDIR}${STAGING_DIR_HOST}${libdir}/xulrunner-devel-${XULVERSION}/bin
-        ln -fs ${STAGING_DIR_HOST}${datadir}/xulrunner-${XULVERSION}/unstable/ ${SYSROOT_DESTDIR}${STAGING_DIR_HOST}${libdir}/xulrunner-devel-${XULVERSION}/idl
-        ln -fs ${STAGING_DIR_HOST}${includedir}/xulrunner-${XULVERSION}/unstable/ ${SYSROOT_DESTDIR}${STAGING_DIR_HOST}${libdir}/xulrunner-devel-${XULVERSION}/include
-        ln -fs ${STAGING_DIR_HOST}${libdir}/xulrunner-devel-${XULVERSION}/sdk/lib/ ${SYSROOT_DESTDIR}${STAGING_DIR_HOST}${libdir}/xulrunner-devel-${XULVERSION}/lib
-
-        install -d ${SYSROOT_DESTDIR}${STAGING_BINDIR_CROSS}
-        install -m 755 ${S}/dist/host/bin/host_xpidl ${SYSROOT_DESTDIR}${STAGING_BINDIR_CROSS}/xpidl
-}
-
-__anonymous () {
-        if bb.data.getVar("SRCREV", d, True) == "1a622cb7c384":
-                bb.data.setVar("XULVERSION", "1.9.2a1pre", d)
-}
diff --git a/meta/packages/mozilla/files/eabi-fix.patch b/meta/packages/mozilla/files/eabi-fix.patch
deleted file mode 100644
index fd3bb88683..0000000000
--- a/meta/packages/mozilla/files/eabi-fix.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-http://lists.debian.org/debian-arm/2007/05/msg00039.html
-
-From: Lennert Buytenhek <buytenh@wantstofly.org>
-
-Hi,
-
-The reason that building nss (i.e., firefox) would segfault on ARM EABI
-systems is an assumption about the layout of the jmp_buf structure in
-the nspr library (which nss depends on) that does hold on old-ABI but
-no longer holds on EABI.  The attached patch fixes this assumption,
-and fixes the shlibsign segfault during the building of nss (it also
-fixes a floating point byte order assumption.)
-
-Looks sane?
-
-It's of course a stupid idea to depend on a particular layout of the
-jmp_buf structure in application programs, but oh well.  People write
-ugly buggy code, film at 11.
-
-
---- mozilla/nsprpub/pr/src/misc/prdtoa.c.orig        2007-05-06 02:39:00.000000000 +0200
-+++ mozilla/nsprpub/pr/src/misc/prdtoa.c     2007-05-06 02:39:22.000000000 +0200
-@@ -59,8 +59,8 @@
-     /* FIXME: deal with freelist and p5s. */
- }
- 
--#if defined(__arm) || defined(__arm__) || defined(__arm26__) \
--    || defined(__arm32__)
-+#if (defined(__arm) || defined(__arm__) || defined(__arm26__) \
-+    || defined(__arm32__)) && !defined(__ARM_EABI__) && !defined(__ARMEB__)
- #define IEEE_ARM
- #elif defined(IS_LITTLE_ENDIAN)
- #define IEEE_8087
---- mozilla/nsprpub/pr/include/md/_linux.h.orig      2007-05-06 02:39:45.000000000 +0200
-+++ mozilla/nsprpub/pr/include/md/_linux.h   2007-05-06 02:40:57.000000000 +0200
-@@ -346,7 +346,7 @@
- #error "Linux/MIPS pre-glibc2 not supported yet"
- #endif /* defined(__GLIBC__) && __GLIBC__ >= 2 */
- 
--#elif defined(__arm__)
-+#elif defined(__arm__) && !defined(__ARM_EABI__)
- /* ARM/Linux */
- #if defined(__GLIBC__) && __GLIBC__ >= 2
- #define _MD_GET_SP(_t) (_t)->md.context[0].__jmpbuf[20]
-@@ -358,6 +358,18 @@
- #error "ARM/Linux pre-glibc2 not supported yet"
- #endif /* defined(__GLIBC__) && __GLIBC__ >= 2 */
- 
-+#elif defined(__arm__) && defined(__ARM_EABI__)
-+/* ARM/Linux */
-+#if defined(__GLIBC__) && __GLIBC__ >= 2
-+#define _MD_GET_SP(_t) (_t)->md.context[0].__jmpbuf[8]
-+#define _MD_SET_FP(_t, val) ((_t)->md.context[0].__jmpbuf[7] = (val))
-+#define _MD_GET_SP_PTR(_t) &(_MD_GET_SP(_t))
-+#define _MD_GET_FP_PTR(_t) (&(_t)->md.context[0].__jmpbuf[7])
-+#define _MD_SP_TYPE __ptr_t
-+#else
-+#error "ARM/Linux pre-glibc2 not supported yet"
-+#endif /* defined(__GLIBC__) && __GLIBC__ >= 2 */
-+
- #else
- 
- #error "Unknown CPU architecture"
-
-
-
diff --git a/meta/packages/mozilla/files/eabi-fix2.patch b/meta/packages/mozilla/files/eabi-fix2.patch
deleted file mode 100644
index 5f64e7f796..0000000000
--- a/meta/packages/mozilla/files/eabi-fix2.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-https://bugzilla.mozilla.org/show_bug.cgi?id=369722
-
-Index: js/src/jsnum.h
-===================================================================
-RCS file: /cvsroot/mozilla/js/src/jsnum.h,v
-retrieving revision 3.27
-diff -p -u -8 -r3.27 jsnum.h
---- mozilla/js/src/jsnum.h      21 Dec 2006 01:00:32 -0000      3.27
-+++ mozilla/js/src/jsnum.h      8 Feb 2007 12:13:01 -0000
-@@ -52,23 +52,24 @@ JS_BEGIN_EXTERN_C
- 
- /*
-  * Stefan Hanske <sh990154@mail.uni-greifswald.de> reports:
-  *  ARM is a little endian architecture but 64 bit double words are stored
-  * differently: the 32 bit words are in little endian byte order, the two words
-  * are stored in big endian`s way.
-  */
- 
--#if defined(__arm) || defined(__arm32__) || defined(__arm26__) || defined(__arm__)
--#define CPU_IS_ARM
-+#if !defined(__ARM_EABI__) && \
-+    (defined(__arm) || defined(__arm32__) || defined(__arm26__) || defined(__arm__))
-+#define IEEE_ARM
- #endif
- 
- typedef union jsdpun {
-     struct {
--#if defined(IS_LITTLE_ENDIAN) && !defined(CPU_IS_ARM)
-+#if defined(IS_LITTLE_ENDIAN) && !defined(IEEE_ARM)
-         uint32 lo, hi;
- #else
-         uint32 hi, lo;
- #endif
-     } s;
-     jsdouble d;
- } jsdpun;
- 
-@@ -87,17 +88,17 @@ typedef union jsdpun {
- 
- #else /* not or old GNUC */
- 
- /*
-  * We don't know of any non-gcc compilers that perform alias optimization,
-  * so this code should work.
-  */
- 
--#if defined(IS_LITTLE_ENDIAN) && !defined(CPU_IS_ARM)
-+#if defined(IS_LITTLE_ENDIAN) && !defined(IEEE_ARM)
- #define JSDOUBLE_HI32(x)        (((uint32 *)&(x))[1])
- #define JSDOUBLE_LO32(x)        (((uint32 *)&(x))[0])
- #else
- #define JSDOUBLE_HI32(x)        (((uint32 *)&(x))[0])
- #define JSDOUBLE_LO32(x)        (((uint32 *)&(x))[1])
- #endif
- 
- #define JSDOUBLE_SET_HI32(x, y) (JSDOUBLE_HI32(x)=(y))
diff --git a/meta/packages/mozilla/files/eabi-fix3.patch b/meta/packages/mozilla/files/eabi-fix3.patch
deleted file mode 100644
index 8bf8c2f4da..0000000000
--- a/meta/packages/mozilla/files/eabi-fix3.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-From: Marcin Juszkiewicz <openembedded@hrw.one.pl>
-
-Index: mozilla/extensions/transformiix/source/base/Double.cpp
-===================================================================
---- mozilla.orig/extensions/transformiix/source/base/Double.cpp 2007-05-09 11:21:34.000000000 +0200
-+++ mozilla/extensions/transformiix/source/base/Double.cpp      2007-05-09 11:23:59.000000000 +0200
-@@ -71,7 +71,7 @@
-  * are stored in big endian`s way.
-  */
- 
--#if defined(__arm) || defined(__arm32__) || defined(_arm26__) || defined(__arm__)
-+#if !defined(__ARM_EABI__) && defined(__arm) || defined(__arm32__) || defined(_arm26__) || defined(__arm__)
- #define CPU_IS_ARM
- #endif
- 
diff --git a/meta/packages/mozilla/files/minimo.desktop b/meta/packages/mozilla/files/minimo.desktop
deleted file mode 100644
index 5ef0f2075a..0000000000
--- a/meta/packages/mozilla/files/minimo.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Minimo
-Comment=Minimo web browser
-Exec=minimo http://www.mozilla.org/projects/minimo/home.html
-Terminal=0
-Type=Application
-Icon=minimo.png
-Categories=Application;Network;
-StartupNotify=True
diff --git a/meta/packages/mozilla/files/minimo.png b/meta/packages/mozilla/files/minimo.png
deleted file mode 100644
index f8b2e2192b..0000000000
--- a/meta/packages/mozilla/files/minimo.png
+++ /dev/null
diff --git a/meta/packages/mozilla/minimo/bug-322806.diff b/meta/packages/mozilla/minimo/bug-322806.diff
deleted file mode 100644
index e001e3fc67..0000000000
--- a/meta/packages/mozilla/minimo/bug-322806.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-See https://bugzilla.mozilla.org/show_bug.cgi?id=322806 and http://bugs.openembedded.org/show_bug.cgi?id=1600
-
---- /tmp/xptcinvoke_arm.cpp     2006-12-10 20:02:57.000000000 +0100
-+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm.cpp        2006-12-10 20:03:54.592227000 +0100
-@@ -212,7 +212,7 @@
-     "add       sp, sp, r4      \n\t"   /* restore stack pointer                */
-     "mov       %0, r0          \n\t"   /* the result...                        */
-     : "=r" (result)
--    : "r" (&my_params)
-+    : "r" (&my_params), "m" (my_params)
-     : "r0", "r1", "r2", "r3", "r4", "ip", "lr", "sp"
-     );
-     
diff --git a/meta/packages/mozilla/minimo/minimo b/meta/packages/mozilla/minimo/minimo
deleted file mode 100644
index d130173adf..0000000000
--- a/meta/packages/mozilla/minimo/minimo
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-export MOZILLA_FIVE_HOME=/usr/lib/mozilla-minimo
-export LD_LIBRARY_PATH=${MOZILLA_FIVE_HOME}
-exec ${MOZILLA_FIVE_HOME}/minimo "$@"
diff --git a/meta/packages/mozilla/minimo/minimo.patch b/meta/packages/mozilla/minimo/minimo.patch
deleted file mode 100644
index 8894ee7f45..0000000000
--- a/meta/packages/mozilla/minimo/minimo.patch
+++ /dev/null
@@ -1,356 +0,0 @@
-Index: mozilla/content/html/content/src/nsFormSubmission.cpp
-===================================================================
---- mozilla.orig/content/html/content/src/nsFormSubmission.cpp  2005-07-13 18:55:59.000000000 +0200
-+++ mozilla/content/html/content/src/nsFormSubmission.cpp       2007-05-10 12:11:20.000000000 +0200
-@@ -1315,11 +1315,6 @@
-   nsresult rv = NS_OK;
- 
-   nsCAutoString charset(aCharset);
--  // canonical name is passed so that we just have to check against
--  // *our* canonical names listed in charsetaliases.properties
--  if (charset.EqualsLiteral("ISO-8859-1")) {
--    charset.AssignLiteral("windows-1252");
--  }
- 
-   // use UTF-8 for UTF-16* and UTF-32* (per WHATWG and existing practice of
-   // MS IE/Opera). 
-Index: mozilla/embedding/base/Makefile.in
-===================================================================
---- mozilla.orig/embedding/base/Makefile.in     2006-02-14 06:28:31.000000000 +0100
-+++ mozilla/embedding/base/Makefile.in  2007-05-10 12:11:20.000000000 +0200
-@@ -43,6 +43,7 @@
- 
- MODULE          = embed_base
- LIBRARY_NAME    = embed_base_s
-+EXPORT_LIBRARY = 1
- XPIDL_MODULE   = embed_base
- 
- include $(DEPTH)/config/autoconf.mk
-Index: mozilla/js/src/Makefile.in
-===================================================================
---- mozilla.orig/js/src/Makefile.in     2006-07-28 00:56:20.000000000 +0200
-+++ mozilla/js/src/Makefile.in  2007-05-10 12:11:21.000000000 +0200
-@@ -46,6 +46,7 @@
- 
- MODULE         = js
- LIBRARY_NAME   = mozjs
-+EXPORT_LIBRARY = 1
- LIB_IS_C_ONLY  = 1
- GRE_MODULE     = 1
- 
-Index: mozilla/minimo/Makefile.in
-===================================================================
---- mozilla.orig/minimo/Makefile.in     2006-07-24 21:40:53.000000000 +0200
-+++ mozilla/minimo/Makefile.in  2007-05-10 12:13:46.000000000 +0200
-@@ -41,6 +41,6 @@
- 
- include $(DEPTH)/config/autoconf.mk
- 
--DIRS = config components chrome locales customization base extensions
-+DIRS = config chrome locales customization base extensions
- 
- include $(topsrcdir)/config/rules.mk
-Index: mozilla/minimo/base/Makefile.in
-===================================================================
---- mozilla.orig/minimo/base/Makefile.in        2006-08-09 17:42:26.000000000 +0200
-+++ mozilla/minimo/base/Makefile.in     2007-05-10 12:11:21.000000000 +0200
-@@ -96,7 +96,6 @@
- 
- # this should move into the toolkit!
- LOCAL_INCLUDES = -I$(srcdir) -I$(topsrcdir)/xpfe/browser/src/
--CPPSRCS    += nsBrowserStatusFilter.cpp nsBrowserInstance.cpp
- 
- ifdef WINCE
- RCINCLUDE  = wince/SplashScreen.rc
-@@ -143,10 +142,6 @@
- endif
- 
- 
--FINAL_LINK_COMPS=$(topsrcdir)/minimo/base/$(FINAL_PLATFORM)/minimo-link-comps
--FINAL_LINK_COMP_NAMES=$(topsrcdir)/minimo/base/$(FINAL_PLATFORM)/minimo-link-names
--FINAL_LINK_LIBS=$(topsrcdir)/minimo/base/$(FINAL_PLATFORM)/minimo-link-libs
--
- include $(topsrcdir)/config/static-config.mk
- 
- EXTRA_DEPS     += $(STATIC_EXTRA_DEPS)
-@@ -180,14 +175,11 @@
- # (same as in mozilla/js/src/Makefile.in)
- ifdef WINCE
- LDFLAGS         += -OPT:NOICF
-+else
-+# Hack to work around libxpcom_core.a / libunicharutil_s.a link order problem.
-+LDFLAGS                += -u NS_StringGetData_P -u NS_StringGetMutableData_P
- endif
- 
--export::
--       $(NSINSTALL) $(topsrcdir)/xpfe/browser/src/nsBrowserStatusFilter.cpp .
--       $(NSINSTALL) $(topsrcdir)/xpfe/browser/src/nsBrowserInstance.cpp .
--
--
--GARBAGE += nsBrowserStatusFilter.cpp nsBrowserInstance.cpp
- 
- ifdef WINCE
- package::
-Index: mozilla/minimo/base/Minimo.cpp
-===================================================================
---- mozilla.orig/minimo/base/Minimo.cpp 2006-10-27 22:30:36.000000000 +0200
-+++ mozilla/minimo/base/Minimo.cpp      2007-05-10 12:13:21.000000000 +0200
-@@ -813,6 +813,8 @@
- #ifdef MOZ_WIDGET_GTK2
-   gtk_set_locale();
-   gtk_init(&argc, &argv);
-+  gtk_widget_set_default_visual(gdk_rgb_get_visual());
-+  gtk_widget_set_default_colormap(gdk_rgb_get_cmap());
- #endif
-   
- #ifdef HACKY_PRE_LOAD_LIBRARY
-Index: mozilla/minimo/base/SplashScreen.cpp
-===================================================================
---- mozilla.orig/minimo/base/SplashScreen.cpp   2006-08-21 21:00:24.000000000 +0200
-+++ mozilla/minimo/base/SplashScreen.cpp        2007-05-10 12:11:22.000000000 +0200
-@@ -202,9 +202,24 @@
- void KillSplashScreen() {}
- void GetScreenSize(unsigned long* x, unsigned long* y)
- {
-+#ifdef MOZ_WIDGET_GTK2
-+  GdkDisplay* display = gdk_display_get_default();
-+  if (display != NULL)
-+  {
-+    GdkScreen *screen;
-+    screen = gdk_display_get_default_screen(display);
-+    *x = gdk_screen_get_width(screen);
-+    *y = gdk_screen_get_height(screen);
-+  }
-+  else
-+  {
-+#endif
-   // we need to figure this out.
-   *x = 240;
-   *y = 320;
-+#ifdef MOZ_WIDGET_GTK2
-+  }
-+#endif
- }
- 
- 
-Index: mozilla/minimo/config/linux_package.sh
-===================================================================
---- mozilla.orig/minimo/config/linux_package.sh 2006-06-30 18:35:19.000000000 +0200
-+++ mozilla/minimo/config/linux_package.sh      2007-05-10 12:11:22.000000000 +0200
-@@ -29,9 +29,7 @@
- cp -pRL bin/libnssckbi.so                                  minimo
- cp -pRL bin/libsmime3.so                                   minimo
- cp -pRL bin/libsoftokn3.so                                 minimo
--cp -pRL bin/libsoftokn3.chk                                minimo
- cp -pRL bin/libfreebl3.so                                  minimo
--cp -pRL bin/libfreebl3.chk                                 minimo
- cp -pRL bin/libssl3.so                                     minimo
- 
- mkdir -p minimo/chrome
-@@ -62,8 +60,6 @@
- cp -pRL bin/components/nsHelperAppDlg.js                   minimo/components
- cp -pRL bin/components/nsProgressDialog.js                 minimo/components
- 
--cp -pRL bin/extensions/spatial-navigation@extensions.mozilla.org/components/* minimo/components
--
- mkdir -p minimo/greprefs
- cp -pRL bin/greprefs/*                                     minimo/greprefs
- 
-@@ -80,7 +76,7 @@
- 
- echo Linking XPT files.
- 
--bin/xpt_link minimo/components/all.xpt          bin/components/*.xpt
-+host/bin/host_xpt_link minimo/components/all.xpt          bin/components/*.xpt
- 
- echo Chewing on chrome
- 
-Index: mozilla/profile/dirserviceprovider/src/Makefile.in
-===================================================================
---- mozilla.orig/profile/dirserviceprovider/src/Makefile.in     2005-04-06 05:35:21.000000000 +0200
-+++ mozilla/profile/dirserviceprovider/src/Makefile.in  2007-05-10 12:11:23.000000000 +0200
-@@ -44,6 +44,7 @@
- 
- MODULE         = profdirserviceprovider
- LIBRARY_NAME   = profdirserviceprovider_s
-+EXPORT_LIBRARY = 1
- MOZILLA_INTERNAL_API = 1
- 
- REQUIRES       = xpcom \
-Index: mozilla/security/coreconf/Linux.mk
-===================================================================
---- mozilla.orig/security/coreconf/Linux.mk     2006-02-03 23:26:36.000000000 +0100
-+++ mozilla/security/coreconf/Linux.mk  2007-05-10 12:11:23.000000000 +0200
-@@ -117,6 +117,10 @@
-        OS_REL_CFLAGS   = -DLINUX1_2 -D_XOPEN_SOURCE
-        CPU_ARCH        = mips
- else
-+ifeq ($(OS_TEST),arm)
-+       OS_REL_CFLAGS   = -DLINUX1_2 -D_XOPEN_SOURCE
-+       CPU_ARCH        = arm
-+else
-        OS_REL_CFLAGS   = -DLINUX1_2 -Di386 -D_XOPEN_SOURCE
-        CPU_ARCH        = x86
- endif
-@@ -133,6 +137,7 @@
- endif
- endif
- endif
-+endif
- 
- 
- LIBC_TAG               = _glibc
-Index: mozilla/security/coreconf/arch.mk
-===================================================================
---- mozilla.orig/security/coreconf/arch.mk      2006-02-03 23:26:36.000000000 +0100
-+++ mozilla/security/coreconf/arch.mk   2007-05-10 12:11:24.000000000 +0200
-@@ -60,18 +60,14 @@
-        64BIT_TAG=
- endif
- 
--OS_ARCH := $(subst /,_,$(shell uname -s))
-+OS_ARCH := Linux
- 
- #
- # Attempt to differentiate between sparc and x86 Solaris
- #
- 
--OS_TEST := $(shell uname -m)
--ifeq ($(OS_TEST),i86pc)
--    OS_RELEASE := $(shell uname -r)_$(OS_TEST)
--else
--    OS_RELEASE := $(shell uname -r)
--endif
-+OS_TEST := arm
-+OS_RELEASE := 2.6
- 
- #
- # Force the IRIX64 machines to use IRIX.
-Index: mozilla/toolkit/components/build/Makefile.in
-===================================================================
---- mozilla.orig/toolkit/components/build/Makefile.in   2006-07-13 22:08:29.000000000 +0200
-+++ mozilla/toolkit/components/build/Makefile.in        2007-05-10 12:11:27.000000000 +0200
-@@ -112,7 +112,6 @@
-        $(NULL)
- 
- SHARED_LIBRARY_LIBS = \
--       ../startup/src/$(LIB_PREFIX)appstartup_s.$(LIB_SUFFIX) \
-        $(NULL)
- 
- ifdef MOZ_XPINSTALL
-Index: mozilla/toolkit/components/startup/src/Makefile.in
-===================================================================
---- mozilla.orig/toolkit/components/startup/src/Makefile.in     2005-07-27 22:42:44.000000000 +0200
-+++ mozilla/toolkit/components/startup/src/Makefile.in  2007-05-10 12:11:27.000000000 +0200
-@@ -43,6 +43,7 @@
- 
- MODULE     = toolkitcomps
- LIBRARY_NAME = appstartup_s
-+EXPORT_LIBRARY = 1
- FORCE_STATIC_LIB = 1
- LIBXUL_LIBRARY = 1
- 
-Index: mozilla/toolkit/xre/Makefile.in
-===================================================================
---- mozilla.orig/toolkit/xre/Makefile.in        2007-02-06 08:13:20.000000000 +0100
-+++ mozilla/toolkit/xre/Makefile.in     2007-05-10 12:11:27.000000000 +0200
-@@ -45,7 +45,6 @@
- 
- MODULE = xulapp
- LIBRARY_NAME = xulapp_s
--EXPORT_LIBRARY = 1
- LIBXUL_LIBRARY = 1
- 
- REQUIRES = \
-@@ -180,14 +179,6 @@
- 
- include $(topsrcdir)/config/rules.mk
- 
--ifdef BUILD_STATIC_LIBS
--export::
--       @$(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/build-list.pl $(FINAL_LINK_COMP_NAMES) Apprunner
--#      embedding/browser/gtk/src/Makefile.in sucks! we need to add an empty line to 
--# FINAL_LINK_COMPS to keep the two lists in sync :-(
--       @$(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/build-list.pl $(FINAL_LINK_COMPS) ""
--endif
--
- LOCAL_INCLUDES += \
-        -I$(srcdir) \
-        -I$(topsrcdir)/xpfe/bootstrap \
-Index: mozilla/xpcom/build/Makefile.in
-===================================================================
---- mozilla.orig/xpcom/build/Makefile.in        2006-01-29 17:51:02.000000000 +0100
-+++ mozilla/xpcom/build/Makefile.in     2007-05-10 12:11:27.000000000 +0200
-@@ -61,7 +61,7 @@
- endif
- 
- # Do not set EXPORT_LIBRARY as we do not want xpcom in the static libs list
--#EXPORT_LIBRARY = 1
-+EXPORT_LIBRARY = 1
- GRE_MODULE     = 1
- MOZILLA_INTERNAL_API = 1
- 
-Index: mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp
-===================================================================
---- mozilla.orig/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp    2004-04-18 16:18:18.000000000 +0200
-+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp 2007-05-10 12:11:27.000000000 +0200
-@@ -45,9 +45,9 @@
- #endif
- 
- /* Specify explicitly a symbol for this function, don't try to guess the c++ mangled symbol.  */
--static nsresult PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint32* args) asm("_PrepareAndDispatch");
-+nsresult PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint32* args) asm("_PrepareAndDispatch");
- 
--static nsresult
-+nsresult
- PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint32* args)
- {
- #define PARAM_BUFFER_COUNT     16
-Index: mozilla/xpfe/browser/src/Makefile.in
-===================================================================
---- mozilla.orig/xpfe/browser/src/Makefile.in   2005-03-18 22:23:45.000000000 +0100
-+++ mozilla/xpfe/browser/src/Makefile.in        2007-05-10 12:11:27.000000000 +0200
-@@ -44,6 +44,7 @@
- 
- MODULE         = browser
- LIBRARY_NAME   = mozbrwsr_s
-+EXPORT_LIBRARY = 1
- FORCE_STATIC_LIB = 1
- LIBXUL_LIBRARY = 1
- MODULE_NAME    = nsBrowserModule
-Index: mozilla/xpfe/components/build/Makefile.in
-===================================================================
---- mozilla.orig/xpfe/components/build/Makefile.in      2005-09-27 02:15:25.000000000 +0200
-+++ mozilla/xpfe/components/build/Makefile.in   2007-05-10 12:11:27.000000000 +0200
-@@ -44,7 +44,6 @@
- 
- MODULE         = appcomps
- LIBRARY_NAME   = appcomps
--EXPORT_LIBRARY = 1
- IS_COMPONENT   = 1
- MODULE_NAME    = application
- LIBXUL_LIBRARY = 1
-Index: mozilla/xpfe/components/filepicker/src/Makefile.in
-===================================================================
---- mozilla.orig/xpfe/components/filepicker/src/Makefile.in     2006-05-22 18:29:32.000000000 +0200
-+++ mozilla/xpfe/components/filepicker/src/Makefile.in  2007-05-10 12:11:27.000000000 +0200
-@@ -47,7 +47,6 @@
- MODULE         = filepicker
- LIBRARY_NAME   = fileview
- SHORT_LIBNAME  = fileview
--EXPORT_LIBRARY = 1
- IS_COMPONENT   = 1
- MODULE_NAME    = nsFileViewModule
- MOZILLA_INTERNAL_API = 1
-Index: mozilla/xpfe/components/find/src/Makefile.in
-===================================================================
---- mozilla.orig/xpfe/components/find/src/Makefile.in   2005-03-18 22:23:46.000000000 +0100
-+++ mozilla/xpfe/components/find/src/Makefile.in        2007-05-10 12:11:27.000000000 +0200
-@@ -45,7 +45,6 @@
- MODULE         = appcomps
- XPIDL_MODULE   = mozfind
- LIBRARY_NAME   = mozfind
--EXPORT_LIBRARY = 1
- IS_COMPONENT   = 1
- MODULE_NAME    = nsFindComponent
- LIBXUL_LIBRARY = 1
diff --git a/meta/packages/mozilla/minimo/minimo.png b/meta/packages/mozilla/minimo/minimo.png
deleted file mode 100644
index f8b2e2192b..0000000000
--- a/meta/packages/mozilla/minimo/minimo.png
+++ /dev/null
diff --git a/meta/packages/mozilla/minimo/mozconfig b/meta/packages/mozilla/minimo/mozconfig
deleted file mode 100644
index 393981e9fa..0000000000
--- a/meta/packages/mozilla/minimo/mozconfig
+++ /dev/null
@@ -1,36 +0,0 @@
-# mozilla/configure: Features and packages:
-
-ac_add_options --enable-application=minimo
-ac_add_options --enable-default-toolkit=gtk2
-ac_add_options --disable-freetype2
-ac_add_options --enable-xft
-ac_add_options --disable-postscript
-ac_add_options --disable-xprint
-ac_add_options --disable-gnomevfs
-ac_add_options --disable-gnomeui
-ac_add_options --disable-jsd
-ac_add_options --disable-plugins
-ac_add_options --disable-view-source
-ac_add_options --disable-accessibility
-ac_add_options --disable-xpinstall
-ac_add_options --enable-single-profile
-ac_add_options --disable-jsloader
-ac_add_options --disable-printing
-ac_add_options --enable-native-uconv
-ac_add_options --enable-plaintext-editor-only
-ac_add_options --disable-xpcom-obsolete
-ac_add_options --disable-pref-extensions
-ac_add_options --disable-extensions
-ac_add_options --enable-image-decoders=png,gif,jpeg
-ac_add_options --disable-mathml
-ac_add_options --disable-installer
-ac_add_options --disable-updater
-ac_add_options --disable-tests
-ac_add_options --enable-optimize=-Os
-ac_add_options --disable-logging
-ac_add_options --enable-strip
-ac_add_options --enable-elf-dynstr-gc
-ac_add_options --disable-shared
-ac_add_options --enable-static
-ac_add_options --disable-profilesharing
-ac_add_options --disable-profilelocking
diff --git a/meta/packages/mozilla/minimo_cvs.bb b/meta/packages/mozilla/minimo_cvs.bb
deleted file mode 100644
index 5eec96d143..0000000000
--- a/meta/packages/mozilla/minimo_cvs.bb
+++ /dev/null
@@ -1,153 +0,0 @@
-DESCRIPTION = "A minimal version of the Mozilla web browser for mobile devices"
-SECTION = "x11/network"
-LICENSE = "MPL/GPL/LGPL"
-HOMEPAGE = "http://www.mozilla.org/projects/minimo/"
-PRIORITY = "optional"
-
-DEPENDS = "libxrender xt xft fontconfig freetype libidl dbus-glib pango atk gtk+ libidl-native"
-
-CVSSVR = "cvs-mirror.mozilla.org"
-BRTAG = "MOZILLA_1_8_BRANCH"
-MOZDATE = "20070510"
-
-PV = "0.02+cvs${MOZDATE}"
-PR = "r3"
-
-SRC_URI = "cvs://anonymous@${CVSSVR}/cvsroot;module=mozilla;tag=${BRTAG};date=${MOZDATE} \
-           file://minimo.patch;patch=1 \
-           file://bug-322806.diff;patch=1 \
-           file://mozconfig \
-           file://minimo \
-           file://eabi-fix.patch;patch=1 \
-           file://eabi-fix2.patch;patch=1 \
-           file://eabi-fix3.patch;patch=1 \
-           file://minimo.desktop \
-           file://minimo.png"
-
-inherit autotools
-
-S = "${WORKDIR}/mozilla"
-
-export MOZCONFIG = "${WORKDIR}/mozconfig"
-
-export CROSS_COMPILE="1"
-export ac_cv_prog_HOST_CC="${BUILD_CC}"
-export ac_cv_prog_HOST_CFLAGS="${BUILD_CFLAGS}"
-export ac_cv_prog_HOST_CXX="${BUILD_CXX}"
-export ac_cv_prog_HOST_CXXFLAGS="${BUILD_CXXFLAGS}"
-export HOST_LIBIDL_CONFIG = "${STAGING_BINDIR_NATIVE}/libIDL-config-2"
-
-mozdir="${libdir}/mozilla-minimo"
-
-EXTRA_OECONF += "--build=${BUILD_SYS} --host=${BUILD_SYS} --target=${TARGET_SYS} "
-
-do_configure() {
-        cd ${S}
-        oe_runmake -f client.mk CONFIGURE_ARGS="${EXTRA_OECONF}" configure
-        sed -i s:${TARGET_PREFIX}strip:echo:g config/autoconf.mk
-}
-
-do_compile() {
-        cd ${S}
-        oe_runmake -f client.mk build
-}
-
-do_install() {
-        cd ${WORKDIR}
-
-        install -d ${D}${bindir}
-        install -m 0755 minimo ${D}${bindir}
-
-        install -d ${D}${datadir}/applications
-        install -m 0644 minimo.desktop ${D}${datadir}/applications
-
-        install -d ${D}/${datadir}/pixmaps
-        install -m 0644 minimo.png ${D}${datadir}/pixmaps
-
-        cd ${S}
-
-        ./minimo/config/linux_package.sh ${S} ${S}/minimo/config
-
-        cd dist/minimo
-
-        install -d ${D}${mozdir}
-        install -m 0755 minimo ${D}${mozdir}
-        install -m 0755 libfreebl3.so ${D}${mozdir}
-        install -m 0755 libnspr4.so ${D}${mozdir}
-        install -m 0755 libnss3.so ${D}${mozdir}
-        install -m 0755 libnssckbi.so ${D}${mozdir}
-        install -m 0755 libplc4.so ${D}${mozdir}
-        install -m 0755 libplds4.so ${D}${mozdir}
-        install -m 0755 libsmime3.so ${D}${mozdir}
-        install -m 0755 libsoftokn3.so ${D}${mozdir}
-        install -m 0755 libssl3.so ${D}${mozdir}
-
-        install -d ${D}${mozdir}/chrome
-        install -m 0644 chrome/classic.jar ${D}${mozdir}/chrome
-        install -m 0644 chrome/classic.manifest ${D}${mozdir}/chrome
-        install -m 0644 chrome/en-US.jar ${D}${mozdir}/chrome
-        install -m 0644 chrome/en-US.manifest ${D}${mozdir}/chrome
-        install -m 0644 chrome/minimo-skin-vga.jar ${D}${mozdir}/chrome
-        install -m 0644 chrome/minimo-skin-vga.manifest ${D}${mozdir}/chrome
-        install -m 0644 chrome/minimo-skin.jar ${D}${mozdir}/chrome
-        install -m 0644 chrome/minimo-skin.manifest ${D}${mozdir}/chrome
-        install -m 0644 chrome/minimo.jar ${D}${mozdir}/chrome
-        install -m 0644 chrome/minimo.manifest ${D}${mozdir}/chrome
-        install -m 0644 chrome/pippki.jar ${D}${mozdir}/chrome
-        install -m 0644 chrome/pippki.manifest ${D}${mozdir}/chrome
-        install -m 0644 chrome/toolkit.jar ${D}${mozdir}/chrome
-        install -m 0644 chrome/toolkit.manifest ${D}${mozdir}/chrome
-
-        install -d ${D}${mozdir}/components
-        install -m 0644 components/all.xpt ${D}${mozdir}/components
-        install -m 0644 components/nsHelperAppDlg.js ${D}${mozdir}/components
-        install -m 0644 components/nsProgressDialog.js ${D}${mozdir}/components
-
-        install -d ${D}${mozdir}/greprefs
-        install -m 0644 greprefs/all.js ${D}${mozdir}/greprefs
-        install -m 0644 greprefs/security-prefs.js ${D}${mozdir}/greprefs
-
-        install -d ${D}${mozdir}/res
-        install -m 0644 res/forms.css ${D}${mozdir}/res
-        install -m 0644 res/html.css ${D}${mozdir}/res
-        install -m 0644 res/quirk.css ${D}${mozdir}/res
-        install -m 0644 res/ua.css ${D}${mozdir}/res
-        install -m 0644 res/arrow.gif ${D}${mozdir}/res
-        install -m 0644 res/arrowd.gif ${D}${mozdir}/res
-        install -m 0644 res/broken-image.gif ${D}${mozdir}/res
-        install -m 0644 res/loading-image.gif ${D}${mozdir}/res
-        install -m 0644 res/charsetData.properties ${D}${mozdir}/res
-        install -m 0644 res/charsetalias.properties ${D}${mozdir}/res
-        install -m 0644 res/langGroups.properties ${D}${mozdir}/res
-        install -m 0644 res/language.properties ${D}${mozdir}/res
-        install -m 0644 res/unixcharset.properties ${D}${mozdir}/res
-
-        install -d ${D}${mozdir}/res/dtd
-        install -m 0644 res/dtd/xhtml11.dtd ${D}${mozdir}/res/dtd
-
-        install -d ${D}${mozdir}/res/entityTables
-        install -m 0644 res/entityTables/html40Latin1.properties ${D}${mozdir}/res/entityTables
-        install -m 0644 res/entityTables/html40Special.properties ${D}${mozdir}/res/entityTables
-        install -m 0644 res/entityTables/html40Symbols.properties ${D}${mozdir}/res/entityTables
-        install -m 0644 res/entityTables/htmlEntityVersions.properties ${D}${mozdir}/res/entityTables
-        install -m 0644 res/entityTables/transliterate.properties ${D}${mozdir}/res/entityTables
-
-        install -d ${D}${mozdir}/res/fonts
-        install -m 0644 res/fonts/fontEncoding.properties ${D}${mozdir}/res/fonts
-        install -m 0644 res/fonts/pangoFontEncoding.properties ${D}${mozdir}/res/fonts
-
-        install -d ${D}${mozdir}/res/html
-        install -m 0644 res/html/gopher-audio.gif ${D}${mozdir}/res/html
-        install -m 0644 res/html/gopher-binary.gif ${D}${mozdir}/res/html
-        install -m 0644 res/html/gopher-find.gif ${D}${mozdir}/res/html
-        install -m 0644 res/html/gopher-image.gif ${D}${mozdir}/res/html
-        install -m 0644 res/html/gopher-menu.gif ${D}${mozdir}/res/html
-        install -m 0644 res/html/gopher-movie.gif ${D}${mozdir}/res/html
-        install -m 0644 res/html/gopher-sound.gif ${D}${mozdir}/res/html
-        install -m 0644 res/html/gopher-telnet.gif ${D}${mozdir}/res/html
-        install -m 0644 res/html/gopher-text.gif ${D}${mozdir}/res/html
-        install -m 0644 res/html/gopher-unknown.gif ${D}${mozdir}/res/html
-}
-
-FILES_${PN}-dbg += "${libdir}/mozilla-minimo/.debug*"
-FILES_${PN} += "${mozdir}"
diff --git a/meta/packages/networkmanager/files/70NetworkManagerApplet.shbg b/meta/packages/networkmanager/files/70NetworkManagerApplet.shbg
deleted file mode 100644
index 8858b3e7c2..0000000000
--- a/meta/packages/networkmanager/files/70NetworkManagerApplet.shbg
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-# Wait for the desktop to say its finished loading
-dbus-wait org.matchbox_project.desktop Loaded
-exec /usr/bin/nm-applet
diff --git a/meta/packages/networkmanager/files/99_networkmanager b/meta/packages/networkmanager/files/99_networkmanager
deleted file mode 100644
index 20cbcc1bca..0000000000
--- a/meta/packages/networkmanager/files/99_networkmanager
+++ /dev/null
@@ -1 +0,0 @@
-d root root 0700 /var/run/NetworkManager none
diff --git a/meta/packages/networkmanager/files/NetworkManager b/meta/packages/networkmanager/files/NetworkManager
deleted file mode 100644
index 4522e0107b..0000000000
--- a/meta/packages/networkmanager/files/NetworkManager
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/sh
-#
-### BEGIN INIT INFO
-# Provides:          NetworkManager
-# Required-Start:    $remote_fs dbus hal
-# Required-Stop:     $remote_fs dbus hal
-# Should-Start:      $syslog
-# Should-Stop:       $syslog
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: network connection manager
-# Description:       Daemon for automatically switching network 
-#                    connections to the best available connection.
-### END INIT INFO
-
-. /etc/profile
-
-case $1 in
-  'start')
-    echo -n "Starting NetworkManager daemon: NetworkManager"
-    /usr/sbin/NetworkManager 
-    /usr/sbin/NetworkManagerDispatcher
-    /usr/sbin/wpa_supplicant -u &
-    echo "."
-  ;;
-
-  'stop')
-    echo -n "Stopping NetworkManager daemon: NetworkManager"
-    kill `ps |grep  /usr/sbin/NetworkManagerDispatcher | grep -v grep | cut "-d " -f2`
-    kill `ps |grep  /usr/sbin/NetworkManager | grep -v grep | cut "-d " -f2`
-    kill `ps |grep  /usr/sbin/wpa_supplicant | grep -v grep | cut "-d " -f2`
-    echo "."
-  ;;
-
-  'restart')
-    $0 stop
-    $0 start
-  ;;
-
-  *)
-    echo "Usage: $0 { start | stop | restart }"
-  ;;
-esac
diff --git a/meta/packages/networkmanager/files/allow-disabling.patch b/meta/packages/networkmanager/files/allow-disabling.patch
deleted file mode 100644
index 10730e9fe5..0000000000
--- a/meta/packages/networkmanager/files/allow-disabling.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Allow interfaces to be ignored by networkmanager by creation of a
-/etc/network/nm-disabled-INTERFACENAME file.
-
-RP - 16/7/2008
-
-Index: trunk/src/backends/NetworkManagerDebian.c
-===================================================================
---- trunk.orig/src/backends/NetworkManagerDebian.c      2008-07-15 19:23:11.000000000 +0100
-+++ trunk/src/backends/NetworkManagerDebian.c   2008-07-15 19:37:05.000000000 +0100
-@@ -29,6 +29,7 @@
- 
- #include <stdio.h>
- #include <sys/types.h>
-+#include <sys/stat.h>
- #include <signal.h>
- #include <arpa/inet.h>
- #include "NetworkManagerGeneric.h"
-@@ -374,12 +375,25 @@
- /*
-  * nm_system_device_get_disabled
-  *
-- * Return whether the distro-specific system config tells us to use
-- * dhcp for this device.
-+ * Return whether the distro-specific system config tells us to interact
-+ * with this device.
-  *
-  */
- gboolean nm_system_device_get_disabled (NMDevice *dev)
- {
-+       struct stat statbuf;
-+       gchar *filepath;
-+
-+       g_return_val_if_fail (dev != NULL, FALSE);
-+
-+       filepath = g_strdup_printf (SYSCONFDIR"/network/nm-disabled-%s", nm_device_get_iface (dev));
-+
-+       if (stat(filepath, &statbuf) == 0) {
-+               g_free(filepath);
-+               return TRUE;
-+       }
-+
-+       g_free(filepath);
-        return FALSE;
- }
- 
diff --git a/meta/packages/networkmanager/files/applet-no-animation.patch b/meta/packages/networkmanager/files/applet-no-animation.patch
deleted file mode 100644
index d437fd0fc9..0000000000
--- a/meta/packages/networkmanager/files/applet-no-animation.patch
+++ /dev/null
@@ -1,234 +0,0 @@
-Index: trunk/src/applet.c
-===================================================================
---- trunk.orig/src/applet.c     2008-02-06 20:30:04.000000000 +0000
-+++ trunk/src/applet.c  2008-02-06 20:46:59.000000000 +0000
-@@ -111,8 +111,6 @@
- 
- static void nma_init (NMApplet *applet)
- {
--       applet->animation_id = 0;
--       applet->animation_step = 0;
-        applet->passphrase_dialog = NULL;
-        applet->icon_theme = NULL;
- #ifdef ENABLE_NOTIFY
-@@ -1006,20 +1004,6 @@
-        }
- }
- 
--static gboolean
--vpn_animation_timeout (gpointer data)
--{
--       NMApplet *applet = NM_APPLET (data);
--
--       foo_set_icon (applet, applet->vpn_connecting_icons[applet->animation_step], ICON_LAYER_VPN);
--
--       applet->animation_step++;
--       if (applet->animation_step >= NUM_VPN_CONNECTING_FRAMES)
--               applet->animation_step = 0;
--
--       return TRUE;
--}
--
- static void
- vpn_connection_state_changed (NMVPNConnection *connection,
-                               NMVPNConnectionState state,
-@@ -1030,10 +1014,6 @@
- 
-        switch (state) {
-        case NM_VPN_CONNECTION_STATE_ACTIVATED:
--               if (applet->animation_id) {
--                       g_source_remove (applet->animation_id);
--                       applet->animation_id = 0;
--               }
-                foo_set_icon (applet, applet->vpn_lock_icon, ICON_LAYER_VPN);
- //             vpn_connection_info_set_last_attempt_success (info, TRUE);
-                break;
-@@ -1041,10 +1021,7 @@
-        case NM_VPN_CONNECTION_STATE_NEED_AUTH:
-        case NM_VPN_CONNECTION_STATE_CONNECT:
-        case NM_VPN_CONNECTION_STATE_IP_CONFIG_GET:
--               if (applet->animation_id == 0) {
--                       applet->animation_step = 0;
--                       applet->animation_id = g_timeout_add (100, vpn_animation_timeout, applet);
--               }
-+               foo_set_icon (applet, applet->network_connecting_icon, ICON_LAYER_VPN);
-                break;
-        case NM_VPN_CONNECTION_STATE_FAILED:
- //             vpn_connection_info_set_last_attempt_success (info, FALSE);
-@@ -1053,10 +1030,6 @@
-                g_hash_table_remove (applet->vpn_connections, nm_vpn_connection_get_name (connection));
-                /* Fall through */
-        default:
--               if (applet->animation_id) {
--                       g_source_remove (applet->animation_id);
--                       applet->animation_id = 0;
--               }
-                foo_set_icon (applet, NULL, ICON_LAYER_VPN);
-                break;
-        }
-@@ -2295,45 +2268,6 @@
- } FooAnimationTimeoutInfo;
- 
- static void
--foo_animation_timeout_info_destroy (gpointer data)
--{
--       g_slice_free (FooAnimationTimeoutInfo, data);
--}
--
--static gboolean
--foo_animation_timeout (gpointer data)
--{
--       FooAnimationTimeoutInfo *info = (FooAnimationTimeoutInfo *) data;
--       NMApplet *applet = info->applet;
--       int stage = -1;
--
--       switch (info->state) {
--       case NM_DEVICE_STATE_PREPARE:
--               stage = 0;
--               break;
--       case NM_DEVICE_STATE_CONFIG:
--               stage = 1;
--               break;
--       case NM_DEVICE_STATE_IP_CONFIG:
--               stage = 2;
--               break;
--       default:
--               break;
--       }
--
--       if (stage >= 0)
--               foo_set_icon (applet,
--                                   applet->network_connecting_icons[stage][applet->animation_step],
--                                   ICON_LAYER_LINK);
--
--       applet->animation_step++;
--       if (applet->animation_step >= NUM_CONNECTING_FRAMES)
--               applet->animation_step = 0;
--
--       return TRUE;
--}
--
--static void
- foo_common_state_change (NMDevice *device, NMDeviceState state, NMApplet *applet)
- {
-        FooAnimationTimeoutInfo *info;
-@@ -2345,11 +2279,7 @@
-                info = g_slice_new (FooAnimationTimeoutInfo);
-                info->applet = applet;
-                info->state = state;
--               applet->animation_step = 0;
--               applet->animation_id = g_timeout_add_full (G_PRIORITY_DEFAULT_IDLE,
--                                                                                  100, foo_animation_timeout,
--                                                                                  info,
--                                                                                  foo_animation_timeout_info_destroy);
-+               foo_set_icon (applet, applet->network_connecting_icon, ICON_LAYER_LINK);
-                break;
-        case NM_DEVICE_STATE_ACTIVATED:
-                break;
-@@ -2602,12 +2532,6 @@
-        NMApplet *applet = NM_APPLET (user_data);
-        gboolean handled = FALSE;
- 
--       applet->animation_step = 0;
--       if (applet->animation_id) {
--               g_source_remove (applet->animation_id);
--               applet->animation_id = 0;
--       }
--
-        clear_active_connections (applet);
-        applet->active_connections = nm_client_get_active_connections (applet->nm_client);
- 
-@@ -3166,17 +3090,8 @@
-        if (applet->wireless_100_icon)
-                g_object_unref (applet->wireless_100_icon);
- 
--       for (i = 0; i < NUM_CONNECTING_STAGES; i++) {
--               int j;
--
--               for (j = 0; j < NUM_CONNECTING_FRAMES; j++)
--                       if (applet->network_connecting_icons[i][j])
--                               g_object_unref (applet->network_connecting_icons[i][j]);
--       }
--
--       for (i = 0; i < NUM_VPN_CONNECTING_FRAMES; i++)
--               if (applet->vpn_connecting_icons[i])
--                       g_object_unref (applet->vpn_connecting_icons[i]);
-+       if (applet->network_connecting_icon)
-+               g_object_unref (applet->network_connecting_icon);
- 
-        nma_icons_zero (applet);
- }
-@@ -3196,16 +3111,7 @@
-        applet->wireless_75_icon = NULL;
-        applet->wireless_100_icon = NULL;
- 
--       for (i = 0; i < NUM_CONNECTING_STAGES; i++)
--       {
--               int j;
--
--               for (j = 0; j < NUM_CONNECTING_FRAMES; j++)
--                       applet->network_connecting_icons[i][j] = NULL;
--       }
--
--       for (i = 0; i < NUM_VPN_CONNECTING_FRAMES; i++)
--               applet->vpn_connecting_icons[i] = NULL;
-+       applet->network_connecting_icon = NULL;
- 
-        applet->icons_loaded = FALSE;
- }
-@@ -3257,28 +3163,7 @@
-        ICON_LOAD(applet->wireless_75_icon, "nm-signal-75");
-        ICON_LOAD(applet->wireless_100_icon, "nm-signal-100");
- 
--       for (i = 0; i < NUM_CONNECTING_STAGES; i++)
--       {
--               int j;
--
--               for (j = 0; j < NUM_CONNECTING_FRAMES; j++)
--               {
--                       char *name;
--
--                       name = g_strdup_printf ("nm-stage%02d-connecting%02d", i+1, j+1);
--                       ICON_LOAD(applet->network_connecting_icons[i][j], name);
--                       g_free (name);
--               }
--       }
--
--       for (i = 0; i < NUM_VPN_CONNECTING_FRAMES; i++)
--       {
--               char *name;
--
--               name = g_strdup_printf ("nm-vpn-connecting%02d", i+1);
--               ICON_LOAD(applet->vpn_connecting_icons[i], name);
--               g_free (name);
--       }
-+       ICON_LOAD(applet->network_connecting_icon, "nm-connecting");
- 
-        success = TRUE;
- 
-Index: trunk/src/applet.h
-===================================================================
---- trunk.orig/src/applet.h     2008-02-06 20:30:06.000000000 +0000
-+++ trunk/src/applet.h  2008-02-06 20:46:05.000000000 +0000
-@@ -111,20 +111,12 @@
-        GdkPixbuf *             wireless_50_icon;
-        GdkPixbuf *             wireless_75_icon;
-        GdkPixbuf *             wireless_100_icon;
--#define NUM_CONNECTING_STAGES 3
--#define NUM_CONNECTING_FRAMES 11
--       GdkPixbuf *             network_connecting_icons[NUM_CONNECTING_STAGES][NUM_CONNECTING_FRAMES];
--#define NUM_VPN_CONNECTING_FRAMES 14
--       GdkPixbuf *             vpn_connecting_icons[NUM_VPN_CONNECTING_FRAMES];
-+       GdkPixbuf *             network_connecting_icon;
-        GdkPixbuf *             vpn_lock_icon;
- 
-        /* Active status icon pixbufs */
-        GdkPixbuf *             icon_layers[ICON_LAYER_MAX + 1];
- 
--       /* Animation stuff */
--       int                             animation_step;
--       guint                   animation_id;
--
-        /* Direct UI elements */
- #ifdef HAVE_STATUS_ICON
-        GtkStatusIcon *         status_icon;
diff --git a/meta/packages/networkmanager/files/applet-no-gnome.diff b/meta/packages/networkmanager/files/applet-no-gnome.diff
deleted file mode 100644
index e098e8c9ed..0000000000
--- a/meta/packages/networkmanager/files/applet-no-gnome.diff
+++ /dev/null
@@ -1,59 +0,0 @@
----
- configure.ac |    3 +--
- src/main.c   |    8 ++++++++
- 2 files changed, 9 insertions(+), 2 deletions(-)
-
-Index: src/main.c
-===================================================================
---- src/main.c.orig     2007-09-26 10:39:16.000000000 +0100
-+++ src/main.c  2007-09-26 10:39:37.000000000 +0100
-@@ -27,7 +27,9 @@
- 
- #include <string.h>
- #include <gtk/gtk.h>
-+#if 0
- #include <libgnomeui/libgnomeui.h>
-+#endif
- #include <glib/gi18n-lib.h>
- 
- #include "applet.h"
-@@ -36,11 +38,15 @@
- int main (int argc, char *argv[])
- {
-        NMApplet * applet;
-+#if 0
-        GnomeProgram * program;
- 
-        program = gnome_program_init ("nm-applet", VERSION, LIBGNOMEUI_MODULE,
-                                      argc, argv, 
-                                      GNOME_PARAM_NONE, GNOME_PARAM_NONE);
-+#else
-+       gtk_init (&argc, &argv);
-+#endif
- 
-        bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
-        bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
-@@ -53,7 +59,9 @@ int main (int argc, char *argv[])
-        gtk_main ();
- 
-        g_object_unref (applet);
-+#if 0
-        g_object_unref (program);
-+#endif
- 
-        exit (0);
- }
-Index: configure.ac
-===================================================================
---- configure.ac.orig   2007-09-26 10:39:30.000000000 +0100
-+++ configure.ac        2007-09-26 10:39:37.000000000 +0100
-@@ -65,8 +65,7 @@ PKG_CHECK_MODULES(NMA,
-                 gtk+-2.0 >= 2.6
-                 libglade-2.0
-                 gconf-2.0
--                gnome-keyring-1
--                libgnomeui-2.0])
-+                gnome-keyring-1])
- 
- ##### Find out the version of DBUS we're using
- dbus_version=`pkg-config --modversion dbus-1`
diff --git a/meta/packages/networkmanager/files/libnlfix.patch b/meta/packages/networkmanager/files/libnlfix.patch
deleted file mode 100644
index 69f4922ea0..0000000000
--- a/meta/packages/networkmanager/files/libnlfix.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Index: trunk/src/nm-netlink.c
-===================================================================
---- trunk.orig/src/nm-netlink.c 2007-09-25 22:37:50.000000000 +0100
-+++ trunk/src/nm-netlink.c      2009-05-16 12:44:26.000000000 +0100
-@@ -52,16 +52,20 @@
- struct nl_handle *
- nm_netlink_get_default_handle (void)
- {
-+       struct nl_cb *cb;
-+
-        if (def_nl_handle)
-                return def_nl_handle;
- 
--       def_nl_handle = nl_handle_alloc_nondefault (NL_CB_VERBOSE);
--       g_assert (def_nl_handle);
-+       cb = nl_cb_alloc(NL_CB_VERBOSE);
-+       def_nl_handle = nl_handle_alloc_cb (cb);
-+       if (!def_nl_handle) {
-+               nm_warning ("couldn't allocate netlink handle.");
-+               return NULL;
-+       }
- 
--       nl_handle_set_pid (def_nl_handle, (pthread_self () << 16 | getpid ()));
-        if (nl_connect (def_nl_handle, NETLINK_ROUTE) < 0) {
-                nm_error ("couldn't connect to netlink: %s", nl_geterror ());
--               nl_handle_destroy (def_nl_handle);
-                return NULL;
-        }
- 
diff --git a/meta/packages/networkmanager/files/makefile-fix.patch b/meta/packages/networkmanager/files/makefile-fix.patch
deleted file mode 100644
index 5fbbf3a74a..0000000000
--- a/meta/packages/networkmanager/files/makefile-fix.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-This line causes libtool to try and create a program which fails since there is no
-main(). This is hidden with libtool 1.5.10 but appears with 2.2.2.
-
-RP - 14/4/08
-
-Index: trunk/src/ppp-manager/Makefile.am
-===================================================================
---- trunk.orig/src/ppp-manager/Makefile.am      2008-04-14 23:00:54.000000000 +0100
-+++ trunk/src/ppp-manager/Makefile.am   2008-04-14 23:01:24.000000000 +0100
-@@ -25,7 +25,6 @@
-        $(top_builddir)/src/marshallers/libmarshallers.la
- 
- nm_pppd_plugindir = $(libdir)
--nm_pppd_plugin_PROGRAMS = nm-pppd-plugin.so
- 
- nm_pppd_plugin_so_SOURCES = \
-        nm-pppd-plugin.c        \
diff --git a/meta/packages/networkmanager/files/nmutil-fix.patch b/meta/packages/networkmanager/files/nmutil-fix.patch
deleted file mode 100644
index d8495bac40..0000000000
--- a/meta/packages/networkmanager/files/nmutil-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: trunk/configure.ac
-===================================================================
---- trunk.orig/configure.ac     2009-01-08 10:49:26.000000000 -0600
-+++ trunk/configure.ac  2009-01-08 12:00:34.000000000 -0600
-@@ -62,6 +62,7 @@
-                 glib-2.0 >= 2.10
-                 NetworkManager >= 0.7.0
-                 libnm_glib
-+                libnm-util
-                 gtk+-2.0 >= 2.6
-                 libglade-2.0
-                 gconf-2.0
diff --git a/meta/packages/networkmanager/files/no-restarts.diff b/meta/packages/networkmanager/files/no-restarts.diff
deleted file mode 100644
index 20bdf82aab..0000000000
--- a/meta/packages/networkmanager/files/no-restarts.diff
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: src/backends/NetworkManagerDebian.c
-===================================================================
---- src/backends/NetworkManagerDebian.c (revision 2881)
-+++ src/backends/NetworkManagerDebian.c (working copy)
-@@ -204,8 +204,6 @@
-  */
- void nm_system_update_dns (void)
- {
--       nm_spawn_process ("/usr/sbin/invoke-rc.d nscd restart");
--
- }
- 
- 
-@@ -218,7 +216,6 @@
-  */
- void nm_system_restart_mdns_responder (void)
- {
--       nm_spawn_process ("/usr/bin/killall -q -USR1 mDNSResponder");
- }
- 
- 
diff --git a/meta/packages/networkmanager/files/no_vpn.patch b/meta/packages/networkmanager/files/no_vpn.patch
deleted file mode 100644
index 49423e879f..0000000000
--- a/meta/packages/networkmanager/files/no_vpn.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: trunk/src/applet.c
-===================================================================
---- trunk.orig/src/applet.c     2008-02-29 17:47:39.000000000 +0000
-+++ trunk/src/applet.c  2008-02-29 17:48:38.000000000 +0000
-@@ -1783,7 +1783,7 @@
-        }
- 
-        nma_menu_add_devices (menu, applet);
--       nma_menu_add_vpn_submenu (menu, applet);
-+       //nma_menu_add_vpn_submenu (menu, applet);
- 
-        gtk_widget_show_all (applet->menu);
- 
diff --git a/meta/packages/networkmanager/networkmanager-applet_svn.bb b/meta/packages/networkmanager/networkmanager-applet_svn.bb
deleted file mode 100644
index 1f0987011f..0000000000
--- a/meta/packages/networkmanager/networkmanager-applet_svn.bb
+++ /dev/null
@@ -1,33 +0,0 @@
-DESCRIPTION = "GTK+ applet for NetworkManager" 
-HOMEPAGE = "http://projects.gnome.org/NetworkManager/"
-BUGTRACKER = "https://bugzilla.gnome.org/buglist.cgi?query_format=specific&order=relevance+desc&bug_status=__open__&product=NetworkManager&content="
-LICENSE = "GPLv2+ & LGPLv2.1+"
-DEPENDS = "networkmanager dbus-glib libglade gconf gnome-keyring"
-#TODO DEPENDS libnotify
-RDEPENDS = "networkmanager dbus-wait"
-PR = "r7"
-
-inherit gnome gtk-icon-cache
-
-SRC_URI = "svn://svn.gnome.org/svn/network-manager-applet/;module=trunk;proto=http \
-           file://applet-no-gnome.diff;patch=1;pnum=0 \
-           file://applet-no-animation.patch;patch=1 \
-           file://no_vpn.patch;patch=1 \
-           file://nmutil-fix.patch;patch=1 \
-           file://70NetworkManagerApplet.shbg"
-
-PV = "0.0+svnr${SRCREV}"
-
-S = "${WORKDIR}/trunk"
-
-FILES_${PN} += "${datadir}/nm-applet/ \
-                ${datadir}/gnome-vpn-properties/ \
-                ${datadir}/gnome/autostart/"
-
-do_install_append () {
-        install -d ${D}${sysconfdir}/X11/Xsession.d/
-        install -m 755 ${WORKDIR}/70NetworkManagerApplet.shbg ${D}${sysconfdir}/X11/Xsession.d/
-}
-
-#TODO: remove if libnotify in DEPENDS
-EXTRA_OECONF += "--without-libnotify"
diff --git a/meta/packages/networkmanager/networkmanager_svn.bb b/meta/packages/networkmanager/networkmanager_svn.bb
deleted file mode 100644
index 40f04e497c..0000000000
--- a/meta/packages/networkmanager/networkmanager_svn.bb
+++ /dev/null
@@ -1,51 +0,0 @@
-DESCRIPTION = "NetworkManager"
-HOMEPAGE = "http://projects.gnome.org/NetworkManager/"
-BUGTRACKER = "https://bugzilla.gnome.org/buglist.cgi?query_format=specific&order=relevance+desc&bug_status=__open__&product=NetworkManager&content="
-SECTION = "net/misc"
-LICENSE = "GPLv2+ & LGPLv2+"
-PRIORITY = "optional"
-DEPENDS = "libnl dbus dbus-glib hal gconf-dbus wireless-tools ppp gnome-common polkit"
-RDEPENDS = "hal wpa-supplicant iproute2 dhcp-client"
-
-PV = "0.7+svnr${SRCREV}"
-PR = "r10"
-
-SRC_URI="svn://svn.gnome.org/svn/NetworkManager/;module=trunk;proto=http \
-         file://no-restarts.diff;patch=1;pnum=0 \
-         file://libnlfix.patch;patch=1 \
-         file://makefile-fix.patch;patch=1 \
-         file://allow-disabling.patch;patch=1 \
-         file://NetworkManager \
-         file://99_networkmanager"
-
-EXTRA_OECONF = "--with-distro=debian \
-                --with-ip=/sbin/ip"
-# TODO: will /bin/ip from busybox do?
-
-S = "${WORKDIR}/trunk"
-
-inherit autotools pkgconfig update-rc.d
-
-INITSCRIPT_NAME = "NetworkManager"
-INITSCRIPT_PARAMS = "defaults 22"
-
-do_install_append () {
-        install -d ${D}/etc/default/volatiles
-        install -m 0644 ${WORKDIR}/99_networkmanager ${D}/etc/default/volatiles
-        # This overwrites the provided init script
-        install -m 0755 ${WORKDIR}/NetworkManager ${D}/etc/init.d/
-        rmdir ${D}/var/run/NetworkManager
-        rmdir ${D}/var/run
-}
-
-PACKAGES =+ "libnmutil libnmglib"
-
-FILES_libnmutil += "${libdir}/libnm-util.so.*"
-
-FILES_libnmglib += "${libdir}/libnm_glib.so.*"
-
-FILES_${PN}-dev = "${includedir}/* \
-                   ${libdir}/*.so \
-                   ${libdir}/*.a \
-                   ${libdir}/pkgconfig/*.pc \
-                   ${datadir}/NetworkManager/gdb-cmd"
diff --git a/meta/packages/smart/smart_1.1.bb b/meta/packages/smart/smart_1.1.bb
deleted file mode 100644
index 8f89eb3e00..0000000000
--- a/meta/packages/smart/smart_1.1.bb
+++ /dev/null
@@ -1,29 +0,0 @@
-DESCRIPTION = "Next generation package handling tool."
-HOMEPAGE = "http://labix.org/smart/"
-LICENSE = "GPL v2+"
-DEPENDS = "zlib python desktop-file-utils-native python-pygtk rpm"
-
-SRC_URI = "http://labix.org/download/smart/smart-1.1.tar.bz2"
-
-S = "${WORKDIR}/smart-${PV}"
-
-inherit distutils
-
-FILES_${PN} += "/usr/share/lib/${PYTHON_DIR}/site-packages/smart/interfaces/images/*.png \
-                /usr/share/lib/${PYTHON_DIR/site-packages/smart/backends/"
-
-FILES_${PN}-doc += "/usr/share/share/man/man8/smart.8"
-
-FILES_${PN}-locale += "/usr/share/share/locale/es_ES/LC_MESSAGES/smart.mo \
-                       /usr/share/share/locale/it/LC_MESSAGES/smart.mo \
-                       /usr/share/share/locale/de/LC_MESSAGES/smart.mo \
-                       /usr/share/share/locale/ru/LC_MESSAGES/smart.mo \
-                       /usr/share/share/locale/sv/LC_MESSAGES/smart.mo \
-                       /usr/share/share/locale/fr/LC_MESSAGES/smart.mo \
-                       /usr/share/share/locale/hu/LC_MESSAGES/smart.mo \
-                       /usr/share/share/locale/zh_TW/LC_MESSAGES/smart.mo \
-                       /usr/share/share/locale/pt_BR/LC_MESSAGES/smart.mo \
-                       /usr/share/share/locale/zh_CN/LC_MESSAGES/smart.mo"
-
-FILES_${PN}-dbg += "/usr/lib/${PYTHON_DIR}/site-packages/smart/backends/rpm/.debug \
-                    /usr/lib/${PYTHON_DIR}/site-packages/smart/backends/deb/.debug \"
\ No newline at end of file
diff --git a/meta/packages/tar/tar-1.17/m4extensions.patch b/meta/packages/tar/tar-1.17/m4extensions.patch
deleted file mode 100644
index 11b981aa92..0000000000
--- a/meta/packages/tar/tar-1.17/m4extensions.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-# Define AC_USE_SYSTEM_EXTENSIONS only if it was previously undefined.
-# This is needed to configure correctly with newer versions of autoconf.
-
---- tar-1.17/m4/extensions.m4.orig      2010-07-22 22:21:35.000000000 -0700
-+++ tar-1.17/m4/extensions.m4   2010-07-22 22:23:41.000000000 -0700
-@@ -1,4 +1,4 @@
--# serial 4  -*- Autoconf -*-
-+# serial 5  -*- Autoconf -*-
- # Enable extensions on systems that normally disable them.
- 
- # Copyright (C) 2003, 2006 Free Software Foundation, Inc.
-@@ -16,6 +16,7 @@
- # ------------------------
- # Enable extensions on systems that normally disable them,
- # typically due to standards-conformance issues.
-+m4_ifdef([AC_USE_SYSTEM_EXTENSIONS], [], [
- AC_DEFUN([AC_USE_SYSTEM_EXTENSIONS],
- [
-   AC_BEFORE([$0], [AC_COMPILE_IFELSE])
-@@ -48,7 +49,7 @@
-     AC_DEFINE([__EXTENSIONS__])
-   AC_DEFINE([_POSIX_PTHREAD_SEMANTICS])
-   AC_DEFINE([_TANDEM_SOURCE])
--])
-+])])
- 
- # gl_USE_SYSTEM_EXTENSIONS
- # ------------------------
diff --git a/meta/packages/tar/tar.inc b/meta/packages/tar/tar.inc
deleted file mode 100644
index cf72d4893b..0000000000
--- a/meta/packages/tar/tar.inc
+++ /dev/null
@@ -1,25 +0,0 @@
-DESCRIPTION = "GNU tar saves many files together into a single tape \
-or disk archive, and can restore individual files from the archive."
-HOMEPAGE = "http://www.gnu.org/software/tar/"
-SECTION = "base"
-
-SRC_URI = "${GNU_MIRROR}/tar/tar-${PV}.tar.bz2"
-
-inherit autotools gettext
-
-do_install () {
-    autotools_do_install
-    install -d ${D}${base_bindir}
-    mv ${D}${bindir}/tar ${D}${base_bindir}/tar.${PN}
-    mv ${D}${libexecdir}/rmt ${D}${libexecdir}/rmt.${PN}
-}
-
-pkg_postinst_${PN} () {
-    update-alternatives --install ${base_bindir}/tar tar tar.${PN} 100
-    update-alternatives --install ${libexecdir}/rmt rmt rmt.${PN} 100
-}
-
-pkg_prerm_${PN} () {
-    update-alternatives --remove tar tar.${PN}
-    update-alternatives --remove rmt rmt.${PN}
-}
diff --git a/meta/packages/tar/tar_1.17.bb b/meta/packages/tar/tar_1.17.bb
deleted file mode 100644
index 729aecc984..0000000000
--- a/meta/packages/tar/tar_1.17.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-require tar.inc
-
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
-
-PR = "r0"
-
-SRC_URI += "file://m4extensions.patch"
-
-SRC_URI[md5sum] = "c6c4f1c075dbf0f75c29737faa58f290"
-SRC_URI[sha256sum] = "19f9021dda51a16295e4706e80870e71f87107675e51c176a491eba0fc4ca492"
-
-# Required to build with gcc 4.3 and later:
-CFLAGS += "-fgnu89-inline"
diff --git a/meta/packages/tar/tar_1.23.bb b/meta/packages/tar/tar_1.23.bb
deleted file mode 100644
index 093c0b43ce..0000000000
--- a/meta/packages/tar/tar_1.23.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require tar.inc
-
-LICENSE = "GPLv3"
-LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949"
-
-PR = "r0"
-
-SRC_URI[md5sum] = "41e2ca4b924ec7860e51b43ad06cdb7e"
-SRC_URI[sha256sum] = "c9328372db62fbb1d94c9e4e3cefc961111af46de47085b635359c00a0eebe36"
diff --git a/meta/packages/apmd/apmd-3.2.2-14/apmd_proxy b/meta/recipes-bsp/apmd/apmd-3.2.2-14/apmd_proxy
index c48ee4e5d5..c48ee4e5d5 100644
--- a/meta/packages/apmd/apmd-3.2.2-14/apmd_proxy
+++ b/meta/recipes-bsp/apmd/apmd-3.2.2-14/apmd_proxy
diff --git a/meta/packages/apmd/apmd-3.2.2-14/apmd_proxy.conf b/meta/recipes-bsp/apmd/apmd-3.2.2-14/apmd_proxy.conf
index 751145c522..751145c522 100644
--- a/meta/packages/apmd/apmd-3.2.2-14/apmd_proxy.conf
+++ b/meta/recipes-bsp/apmd/apmd-3.2.2-14/apmd_proxy.conf
diff --git a/meta/packages/apmd/apmd-3.2.2-14/default b/meta/recipes-bsp/apmd/apmd-3.2.2-14/default
index 4b7965abf8..4b7965abf8 100644
--- a/meta/packages/apmd/apmd-3.2.2-14/default
+++ b/meta/recipes-bsp/apmd/apmd-3.2.2-14/default
diff --git a/meta/packages/apmd/apmd-3.2.2-14/init b/meta/recipes-bsp/apmd/apmd-3.2.2-14/init
index 268d4b26b7..268d4b26b7 100755
--- a/meta/packages/apmd/apmd-3.2.2-14/init
+++ b/meta/recipes-bsp/apmd/apmd-3.2.2-14/init
diff --git a/meta/packages/apmd/apmd-3.2.2-14/libtool.patch b/meta/recipes-bsp/apmd/apmd-3.2.2-14/libtool.patch
index 711e777084..711e777084 100644
--- a/meta/packages/apmd/apmd-3.2.2-14/libtool.patch
+++ b/meta/recipes-bsp/apmd/apmd-3.2.2-14/libtool.patch
diff --git a/meta/packages/apmd/apmd-3.2.2-14/unlinux.patch b/meta/recipes-bsp/apmd/apmd-3.2.2-14/unlinux.patch
index c64e7df524..c64e7df524 100644
--- a/meta/packages/apmd/apmd-3.2.2-14/unlinux.patch
+++ b/meta/recipes-bsp/apmd/apmd-3.2.2-14/unlinux.patch
diff --git a/meta/packages/apmd/apmd-3.2.2-14/workaround.patch b/meta/recipes-bsp/apmd/apmd-3.2.2-14/workaround.patch
index d37380397c..d37380397c 100644
--- a/meta/packages/apmd/apmd-3.2.2-14/workaround.patch
+++ b/meta/recipes-bsp/apmd/apmd-3.2.2-14/workaround.patch
diff --git a/meta/packages/apmd/apmd_3.2.2-14.bb b/meta/recipes-bsp/apmd/apmd_3.2.2-14.bb
index 2778cc69e8..2778cc69e8 100644
--- a/meta/packages/apmd/apmd_3.2.2-14.bb
+++ b/meta/recipes-bsp/apmd/apmd_3.2.2-14.bb
diff --git a/meta/packages/hostap/files/hostap-fw-load.patch b/meta/recipes-bsp/hostap/files/hostap-fw-load.patch
index 88adee2bc9..88adee2bc9 100644
--- a/meta/packages/hostap/files/hostap-fw-load.patch
+++ b/meta/recipes-bsp/hostap/files/hostap-fw-load.patch
diff --git a/meta/packages/hostap/files/hostap_cs.conf b/meta/recipes-bsp/hostap/files/hostap_cs.conf
index 8dda82aad3..8dda82aad3 100644
--- a/meta/packages/hostap/files/hostap_cs.conf
+++ b/meta/recipes-bsp/hostap/files/hostap_cs.conf
diff --git a/meta/packages/hostap/files/hostap_cs.conf-upstream b/meta/recipes-bsp/hostap/files/hostap_cs.conf-upstream
index 5b7385a7cb..5b7385a7cb 100644
--- a/meta/packages/hostap/files/hostap_cs.conf-upstream
+++ b/meta/recipes-bsp/hostap/files/hostap_cs.conf-upstream
diff --git a/meta/packages/hostap/files/hostap_cs.modalias b/meta/recipes-bsp/hostap/files/hostap_cs.modalias
index cb9efab271..cb9efab271 100644
--- a/meta/packages/hostap/files/hostap_cs.modalias
+++ b/meta/recipes-bsp/hostap/files/hostap_cs.modalias
diff --git a/meta/packages/hostap/hostap-conf_1.0.bb b/meta/recipes-bsp/hostap/hostap-conf_1.0.bb
index ce069662c7..ce069662c7 100644
--- a/meta/packages/hostap/hostap-conf_1.0.bb
+++ b/meta/recipes-bsp/hostap/hostap-conf_1.0.bb
diff --git a/meta/packages/hostap/hostap-utils.inc b/meta/recipes-bsp/hostap/hostap-utils.inc
index 16880f1196..16880f1196 100644
--- a/meta/packages/hostap/hostap-utils.inc
+++ b/meta/recipes-bsp/hostap/hostap-utils.inc
diff --git a/meta/packages/hostap/hostap-utils_0.4.7.bb b/meta/recipes-bsp/hostap/hostap-utils_0.4.7.bb
index 9fe362b19f..9fe362b19f 100644
--- a/meta/packages/hostap/hostap-utils_0.4.7.bb
+++ b/meta/recipes-bsp/hostap/hostap-utils_0.4.7.bb
diff --git a/meta/packages/lrzsz/lrzsz-0.12.20/autotools.patch b/meta/recipes-bsp/lrzsz/lrzsz-0.12.20/autotools.patch
index 73f5a062ef..73f5a062ef 100644
--- a/meta/packages/lrzsz/lrzsz-0.12.20/autotools.patch
+++ b/meta/recipes-bsp/lrzsz/lrzsz-0.12.20/autotools.patch
diff --git a/meta/packages/lrzsz/lrzsz-0.12.20/gettext.patch b/meta/recipes-bsp/lrzsz/lrzsz-0.12.20/gettext.patch
index 241ffd90ba..241ffd90ba 100644
--- a/meta/packages/lrzsz/lrzsz-0.12.20/gettext.patch
+++ b/meta/recipes-bsp/lrzsz/lrzsz-0.12.20/gettext.patch
diff --git a/meta/packages/lrzsz/lrzsz-0.12.20/makefile.patch b/meta/recipes-bsp/lrzsz/lrzsz-0.12.20/makefile.patch
index c553c8bf34..c553c8bf34 100644
--- a/meta/packages/lrzsz/lrzsz-0.12.20/makefile.patch
+++ b/meta/recipes-bsp/lrzsz/lrzsz-0.12.20/makefile.patch
diff --git a/meta/packages/lrzsz/lrzsz_0.12.20.bb b/meta/recipes-bsp/lrzsz/lrzsz_0.12.20.bb
index af2db23102..af2db23102 100644
--- a/meta/packages/lrzsz/lrzsz_0.12.20.bb
+++ b/meta/recipes-bsp/lrzsz/lrzsz_0.12.20.bb
diff --git a/meta/packages/pm-utils/pm-utils_1.3.0.bb b/meta/recipes-bsp/pm-utils/pm-utils_1.3.0.bb
index cb90f87acc..cb90f87acc 100644
--- a/meta/packages/pm-utils/pm-utils_1.3.0.bb
+++ b/meta/recipes-bsp/pm-utils/pm-utils_1.3.0.bb
diff --git a/meta/packages/oh/qemu-config.bb b/meta/recipes-bsp/qemu-config/qemu-config.bb
index fc59320282..fc59320282 100644
--- a/meta/packages/oh/qemu-config.bb
+++ b/meta/recipes-bsp/qemu-config/qemu-config.bb
diff --git a/meta/packages/oh/qemu-config/anjuta-remote-run b/meta/recipes-bsp/qemu-config/qemu-config/anjuta-remote-run
index 620e3a705b..620e3a705b 100644
--- a/meta/packages/oh/qemu-config/anjuta-remote-run
+++ b/meta/recipes-bsp/qemu-config/qemu-config/anjuta-remote-run
diff --git a/meta/packages/oh/qemu-config/distcc.sh b/meta/recipes-bsp/qemu-config/qemu-config/distcc.sh
index a2b543d6b8..a2b543d6b8 100644
--- a/meta/packages/oh/qemu-config/distcc.sh
+++ b/meta/recipes-bsp/qemu-config/qemu-config/distcc.sh
diff --git a/meta/packages/oh/qemu-config/exports b/meta/recipes-bsp/qemu-config/qemu-config/exports
index b7257aa008..b7257aa008 100644
--- a/meta/packages/oh/qemu-config/exports
+++ b/meta/recipes-bsp/qemu-config/qemu-config/exports
diff --git a/meta/packages/oh/qemu-config/qemu-autostart b/meta/recipes-bsp/qemu-config/qemu-config/qemu-autostart
index db2668eb4e..db2668eb4e 100755
--- a/meta/packages/oh/qemu-config/qemu-autostart
+++ b/meta/recipes-bsp/qemu-config/qemu-config/qemu-autostart
diff --git a/meta/packages/oh/qemu-config/qemuarm/shutdown.desktop b/meta/recipes-bsp/qemu-config/qemu-config/qemuarm/shutdown.desktop
index b973d4318e..b973d4318e 100644
--- a/meta/packages/oh/qemu-config/qemuarm/shutdown.desktop
+++ b/meta/recipes-bsp/qemu-config/qemu-config/qemuarm/shutdown.desktop
diff --git a/meta/packages/oh/qemu-config/shutdown.desktop b/meta/recipes-bsp/qemu-config/qemu-config/shutdown.desktop
index 272688922c..272688922c 100644
--- a/meta/packages/oh/qemu-config/shutdown.desktop
+++ b/meta/recipes-bsp/qemu-config/qemu-config/shutdown.desktop
diff --git a/meta/packages/setserial/setserial_2.17.bb b/meta/recipes-bsp/setserial/setserial_2.17.bb
index 4e0d1b66e4..4e0d1b66e4 100644
--- a/meta/packages/setserial/setserial_2.17.bb
+++ b/meta/recipes-bsp/setserial/setserial_2.17.bb
diff --git a/meta/packages/uboot/files/fix-arm920t-eabi.patch b/meta/recipes-bsp/uboot/files/fix-arm920t-eabi.patch
index 69cb75891d..69cb75891d 100644
--- a/meta/packages/uboot/files/fix-arm920t-eabi.patch
+++ b/meta/recipes-bsp/uboot/files/fix-arm920t-eabi.patch
diff --git a/meta/packages/uboot/u-boot-mkimage-native_1.3.2.bb b/meta/recipes-bsp/uboot/u-boot-mkimage-native_1.3.2.bb
index fcba0d5662..fcba0d5662 100644
--- a/meta/packages/uboot/u-boot-mkimage-native_1.3.2.bb
+++ b/meta/recipes-bsp/uboot/u-boot-mkimage-native_1.3.2.bb
diff --git a/meta/packages/uboot/u-boot-mkimage_2009.08.bb b/meta/recipes-bsp/uboot/u-boot-mkimage_2009.08.bb
index bf07198beb..bf07198beb 100644
--- a/meta/packages/uboot/u-boot-mkimage_2009.08.bb
+++ b/meta/recipes-bsp/uboot/u-boot-mkimage_2009.08.bb
diff --git a/meta/packages/uboot/u-boot-omap3-git/beagleboard/name.patch b/meta/recipes-bsp/uboot/u-boot-omap3-git/beagleboard/name.patch
index ac03e47774..ac03e47774 100644
--- a/meta/packages/uboot/u-boot-omap3-git/beagleboard/name.patch
+++ b/meta/recipes-bsp/uboot/u-boot-omap3-git/beagleboard/name.patch
diff --git a/meta/packages/uboot/u-boot-omap3_git.bb b/meta/recipes-bsp/uboot/u-boot-omap3_git.bb
index 480780ebfc..480780ebfc 100644
--- a/meta/packages/uboot/u-boot-omap3_git.bb
+++ b/meta/recipes-bsp/uboot/u-boot-omap3_git.bb
diff --git a/meta/packages/uboot/u-boot.inc b/meta/recipes-bsp/uboot/u-boot.inc
index 889f6215ed..889f6215ed 100644
--- a/meta/packages/uboot/u-boot.inc
+++ b/meta/recipes-bsp/uboot/u-boot.inc
diff --git a/meta/packages/oh/usbinit.bb b/meta/recipes-bsp/usbinit/usbinit.bb
index 1d4575bddb..1d4575bddb 100644
--- a/meta/packages/oh/usbinit.bb
+++ b/meta/recipes-bsp/usbinit/usbinit.bb
diff --git a/meta/packages/oh/usbinit/usb-gether b/meta/recipes-bsp/usbinit/usbinit/usb-gether
index e80a0bb30e..e80a0bb30e 100755
--- a/meta/packages/oh/usbinit/usb-gether
+++ b/meta/recipes-bsp/usbinit/usbinit/usb-gether
diff --git a/meta/packages/usbutils/usbutils_0.86.bb b/meta/recipes-bsp/usbutils/usbutils_0.86.bb
index 8e4a3da453..8e4a3da453 100644
--- a/meta/packages/usbutils/usbutils_0.86.bb
+++ b/meta/recipes-bsp/usbutils/usbutils_0.86.bb
diff --git a/meta/packages/dhcp/dhcp-4.1.1-P1/dhcp-3.0.3-dhclient-dbus.patch b/meta/recipes-connectivity/dhcp/dhcp-4.1.1-P1/dhcp-3.0.3-dhclient-dbus.patch
index 579d72f484..579d72f484 100644
--- a/meta/packages/dhcp/dhcp-4.1.1-P1/dhcp-3.0.3-dhclient-dbus.patch
+++ b/meta/recipes-connectivity/dhcp/dhcp-4.1.1-P1/dhcp-3.0.3-dhclient-dbus.patch
diff --git a/meta/packages/dhcp/dhcp-4.1.1-P1/fix-client-path.patch b/meta/recipes-connectivity/dhcp/dhcp-4.1.1-P1/fix-client-path.patch
index f6a7be1d81..f6a7be1d81 100644
--- a/meta/packages/dhcp/dhcp-4.1.1-P1/fix-client-path.patch
+++ b/meta/recipes-connectivity/dhcp/dhcp-4.1.1-P1/fix-client-path.patch
diff --git a/meta/packages/dhcp/dhcp-4.1.1-P1/fixincludes.patch b/meta/recipes-connectivity/dhcp/dhcp-4.1.1-P1/fixincludes.patch
index 91d99cce22..91d99cce22 100644
--- a/meta/packages/dhcp/dhcp-4.1.1-P1/fixincludes.patch
+++ b/meta/recipes-connectivity/dhcp/dhcp-4.1.1-P1/fixincludes.patch
diff --git a/meta/packages/dhcp/dhcp-4.1.1-P1/noattrmode.patch b/meta/recipes-connectivity/dhcp/dhcp-4.1.1-P1/noattrmode.patch
index 5c766d6c06..5c766d6c06 100644
--- a/meta/packages/dhcp/dhcp-4.1.1-P1/noattrmode.patch
+++ b/meta/recipes-connectivity/dhcp/dhcp-4.1.1-P1/noattrmode.patch
diff --git a/meta/packages/dhcp/dhcp-4.1.1-P1/site.h b/meta/recipes-connectivity/dhcp/dhcp-4.1.1-P1/site.h
index 2289554ef3..2289554ef3 100644
--- a/meta/packages/dhcp/dhcp-4.1.1-P1/site.h
+++ b/meta/recipes-connectivity/dhcp/dhcp-4.1.1-P1/site.h
diff --git a/meta/packages/dhcp/dhcp3.inc b/meta/recipes-connectivity/dhcp/dhcp3.inc
index 3f68f452d2..3f68f452d2 100644
--- a/meta/packages/dhcp/dhcp3.inc
+++ b/meta/recipes-connectivity/dhcp/dhcp3.inc
diff --git a/meta/packages/dhcp/dhcp4.inc b/meta/recipes-connectivity/dhcp/dhcp4.inc
index 7652b948f0..7652b948f0 100644
--- a/meta/packages/dhcp/dhcp4.inc
+++ b/meta/recipes-connectivity/dhcp/dhcp4.inc
diff --git a/meta/packages/dhcp/dhcp_4.1.1-P1.bb b/meta/recipes-connectivity/dhcp/dhcp_4.1.1-P1.bb
index e9759de56f..e9759de56f 100644
--- a/meta/packages/dhcp/dhcp_4.1.1-P1.bb
+++ b/meta/recipes-connectivity/dhcp/dhcp_4.1.1-P1.bb
diff --git a/meta/packages/dhcp/files/default-relay b/meta/recipes-connectivity/dhcp/files/default-relay
index 59249db283..59249db283 100644
--- a/meta/packages/dhcp/files/default-relay
+++ b/meta/recipes-connectivity/dhcp/files/default-relay
diff --git a/meta/packages/dhcp/files/default-server b/meta/recipes-connectivity/dhcp/files/default-server
index 0385d16992..0385d16992 100644
--- a/meta/packages/dhcp/files/default-server
+++ b/meta/recipes-connectivity/dhcp/files/default-server
diff --git a/meta/packages/dhcp/files/dhclient.conf b/meta/recipes-connectivity/dhcp/files/dhclient.conf
index 0e6dcf96c2..0e6dcf96c2 100644
--- a/meta/packages/dhcp/files/dhclient.conf
+++ b/meta/recipes-connectivity/dhcp/files/dhclient.conf
diff --git a/meta/packages/dhcp/files/dhcpd.conf b/meta/recipes-connectivity/dhcp/files/dhcpd.conf
index 0001c0f00e..0001c0f00e 100644
--- a/meta/packages/dhcp/files/dhcpd.conf
+++ b/meta/recipes-connectivity/dhcp/files/dhcpd.conf
diff --git a/meta/packages/dhcp/files/init-relay b/meta/recipes-connectivity/dhcp/files/init-relay
index 019a7e84cf..019a7e84cf 100644
--- a/meta/packages/dhcp/files/init-relay
+++ b/meta/recipes-connectivity/dhcp/files/init-relay
diff --git a/meta/packages/dhcp/files/init-server b/meta/recipes-connectivity/dhcp/files/init-server
index 34c20852b9..34c20852b9 100644
--- a/meta/packages/dhcp/files/init-server
+++ b/meta/recipes-connectivity/dhcp/files/init-server
diff --git a/meta/packages/farsight/farsight2_0.0.9.bb b/meta/recipes-connectivity/farsight/farsight2_0.0.9.bb
index 06c85f1cf0..06c85f1cf0 100644
--- a/meta/packages/farsight/farsight2_0.0.9.bb
+++ b/meta/recipes-connectivity/farsight/farsight2_0.0.9.bb
diff --git a/meta/packages/farsight/libnice_0.0.6.bb b/meta/recipes-connectivity/farsight/libnice_0.0.6.bb
index 809b691af7..809b691af7 100644
--- a/meta/packages/farsight/libnice_0.0.6.bb
+++ b/meta/recipes-connectivity/farsight/libnice_0.0.6.bb
diff --git a/meta/packages/gsm/files/0001-Introduce-ports.patch b/meta/recipes-connectivity/gsm/files/0001-Introduce-ports.patch
index b3ba3cb957..b3ba3cb957 100644
--- a/meta/packages/gsm/files/0001-Introduce-ports.patch
+++ b/meta/recipes-connectivity/gsm/files/0001-Introduce-ports.patch
diff --git a/meta/packages/gsm/files/0002-Flush-all-pending-commands-before-restarting-the-mod.patch b/meta/recipes-connectivity/gsm/files/0002-Flush-all-pending-commands-before-restarting-the-mod.patch
index 3683596389..3683596389 100644
--- a/meta/packages/gsm/files/0002-Flush-all-pending-commands-before-restarting-the-mod.patch
+++ b/meta/recipes-connectivity/gsm/files/0002-Flush-all-pending-commands-before-restarting-the-mod.patch
diff --git a/meta/packages/gsm/files/0003-Correctly-segment-incoming-usock-data-into-packets.patch b/meta/recipes-connectivity/gsm/files/0003-Correctly-segment-incoming-usock-data-into-packets.patch
index 984acc9369..984acc9369 100644
--- a/meta/packages/gsm/files/0003-Correctly-segment-incoming-usock-data-into-packets.patch
+++ b/meta/recipes-connectivity/gsm/files/0003-Correctly-segment-incoming-usock-data-into-packets.patch
diff --git a/meta/packages/gsm/files/0004-Handle-read-and-write-return-values.patch b/meta/recipes-connectivity/gsm/files/0004-Handle-read-and-write-return-values.patch
index f5e7a7902d..f5e7a7902d 100644
--- a/meta/packages/gsm/files/0004-Handle-read-and-write-return-values.patch
+++ b/meta/recipes-connectivity/gsm/files/0004-Handle-read-and-write-return-values.patch
diff --git a/meta/packages/gsm/files/0005-Add-ask-ds-option-forSMS.patch b/meta/recipes-connectivity/gsm/files/0005-Add-ask-ds-option-forSMS.patch
index e9f49bd7d2..e9f49bd7d2 100644
--- a/meta/packages/gsm/files/0005-Add-ask-ds-option-forSMS.patch
+++ b/meta/recipes-connectivity/gsm/files/0005-Add-ask-ds-option-forSMS.patch
diff --git a/meta/packages/gsm/files/024_sms-text-in-bracket.patch b/meta/recipes-connectivity/gsm/files/024_sms-text-in-bracket.patch
index 32a1ca33ff..32a1ca33ff 100644
--- a/meta/packages/gsm/files/024_sms-text-in-bracket.patch
+++ b/meta/recipes-connectivity/gsm/files/024_sms-text-in-bracket.patch
diff --git a/meta/packages/gsm/files/025_sms-status-report.patch b/meta/recipes-connectivity/gsm/files/025_sms-status-report.patch
index 560e72e380..560e72e380 100644
--- a/meta/packages/gsm/files/025_sms-status-report.patch
+++ b/meta/recipes-connectivity/gsm/files/025_sms-status-report.patch
diff --git a/meta/packages/gsm/files/027_phonebook-find-and-read-range-support.patch b/meta/recipes-connectivity/gsm/files/027_phonebook-find-and-read-range-support.patch
index ea0f12daac..ea0f12daac 100644
--- a/meta/packages/gsm/files/027_phonebook-find-and-read-range-support.patch
+++ b/meta/recipes-connectivity/gsm/files/027_phonebook-find-and-read-range-support.patch
diff --git a/meta/packages/gsm/files/028_shell-phonebook-find-and-read-range-support.patch b/meta/recipes-connectivity/gsm/files/028_shell-phonebook-find-and-read-range-support.patch
index db07a5df35..db07a5df35 100644
--- a/meta/packages/gsm/files/028_shell-phonebook-find-and-read-range-support.patch
+++ b/meta/recipes-connectivity/gsm/files/028_shell-phonebook-find-and-read-range-support.patch
diff --git a/meta/packages/gsm/files/default b/meta/recipes-connectivity/gsm/files/default
index 6ef4f6db57..6ef4f6db57 100644
--- a/meta/packages/gsm/files/default
+++ b/meta/recipes-connectivity/gsm/files/default
diff --git a/meta/packages/gsm/files/fix_machine_init.patch b/meta/recipes-connectivity/gsm/files/fix_machine_init.patch
index 808bb17b42..808bb17b42 100644
--- a/meta/packages/gsm/files/fix_machine_init.patch
+++ b/meta/recipes-connectivity/gsm/files/fix_machine_init.patch
diff --git a/meta/packages/gsm/files/gsmd b/meta/recipes-connectivity/gsm/files/gsmd
index dc10e63098..dc10e63098 100644
--- a/meta/packages/gsm/files/gsmd
+++ b/meta/recipes-connectivity/gsm/files/gsmd
diff --git a/meta/packages/gsm/files/install-ts-headers.patch b/meta/recipes-connectivity/gsm/files/install-ts-headers.patch
index 88e3b6dd1f..88e3b6dd1f 100644
--- a/meta/packages/gsm/files/install-ts-headers.patch
+++ b/meta/recipes-connectivity/gsm/files/install-ts-headers.patch
diff --git a/meta/packages/gsm/files/lgsm_send_fix_return_value.patch b/meta/recipes-connectivity/gsm/files/lgsm_send_fix_return_value.patch
index 00ba3a4549..00ba3a4549 100644
--- a/meta/packages/gsm/files/lgsm_send_fix_return_value.patch
+++ b/meta/recipes-connectivity/gsm/files/lgsm_send_fix_return_value.patch
diff --git a/meta/packages/gsm/gsmd.inc b/meta/recipes-connectivity/gsm/gsmd.inc
index a69fdd90f1..a69fdd90f1 100644
--- a/meta/packages/gsm/gsmd.inc
+++ b/meta/recipes-connectivity/gsm/gsmd.inc
diff --git a/meta/packages/gsm/libgsmd_svn.bb b/meta/recipes-connectivity/gsm/libgsmd_svn.bb
index 9d3ca19c04..9d3ca19c04 100644
--- a/meta/packages/gsm/libgsmd_svn.bb
+++ b/meta/recipes-connectivity/gsm/libgsmd_svn.bb
diff --git a/meta/packages/iproute2/iproute2-2.6.34/configure-cross.patch b/meta/recipes-connectivity/iproute2/iproute2-2.6.34/configure-cross.patch
index 67dc6f5a30..67dc6f5a30 100644
--- a/meta/packages/iproute2/iproute2-2.6.34/configure-cross.patch
+++ b/meta/recipes-connectivity/iproute2/iproute2-2.6.34/configure-cross.patch
diff --git a/meta/packages/iproute2/iproute2.inc b/meta/recipes-connectivity/iproute2/iproute2.inc
index 7246b87e9b..7246b87e9b 100644
--- a/meta/packages/iproute2/iproute2.inc
+++ b/meta/recipes-connectivity/iproute2/iproute2.inc
diff --git a/meta/packages/iproute2/iproute2_2.6.34.bb b/meta/recipes-connectivity/iproute2/iproute2_2.6.34.bb
index c5e0ef6e56..c5e0ef6e56 100644
--- a/meta/packages/iproute2/iproute2_2.6.34.bb
+++ b/meta/recipes-connectivity/iproute2/iproute2_2.6.34.bb
diff --git a/meta/packages/libetpan/files/cxx-is-here.patch b/meta/recipes-connectivity/libetpan/files/cxx-is-here.patch
index d910daab17..d910daab17 100644
--- a/meta/packages/libetpan/files/cxx-is-here.patch
+++ b/meta/recipes-connectivity/libetpan/files/cxx-is-here.patch
diff --git a/meta/packages/libetpan/libetpan_0.54.bb b/meta/recipes-connectivity/libetpan/libetpan_0.54.bb
index 5666ea0ded..5666ea0ded 100644
--- a/meta/packages/libetpan/libetpan_0.54.bb
+++ b/meta/recipes-connectivity/libetpan/libetpan_0.54.bb
diff --git a/meta/packages/libnss-mdns/files/alignment-fix.patch b/meta/recipes-connectivity/libnss-mdns/files/alignment-fix.patch
index 11d4655e1f..11d4655e1f 100644
--- a/meta/packages/libnss-mdns/files/alignment-fix.patch
+++ b/meta/recipes-connectivity/libnss-mdns/files/alignment-fix.patch
diff --git a/meta/packages/libnss-mdns/libnss-mdns_0.10.bb b/meta/recipes-connectivity/libnss-mdns/libnss-mdns_0.10.bb
index 69eaa33d60..69eaa33d60 100644
--- a/meta/packages/libnss-mdns/libnss-mdns_0.10.bb
+++ b/meta/recipes-connectivity/libnss-mdns/libnss-mdns_0.10.bb
diff --git a/meta/packages/libpcap/libpcap-1.1.1/aclocal.patch b/meta/recipes-connectivity/libpcap/libpcap-1.1.1/aclocal.patch
index 71fd8b989b..71fd8b989b 100644
--- a/meta/packages/libpcap/libpcap-1.1.1/aclocal.patch
+++ b/meta/recipes-connectivity/libpcap/libpcap-1.1.1/aclocal.patch
diff --git a/meta/packages/libpcap/libpcap-1.1.1/ieee80215-arphrd.patch b/meta/recipes-connectivity/libpcap/libpcap-1.1.1/ieee80215-arphrd.patch
index f29c7cb54c..f29c7cb54c 100644
--- a/meta/packages/libpcap/libpcap-1.1.1/ieee80215-arphrd.patch
+++ b/meta/recipes-connectivity/libpcap/libpcap-1.1.1/ieee80215-arphrd.patch
diff --git a/meta/packages/libpcap/libpcap.inc b/meta/recipes-connectivity/libpcap/libpcap.inc
index 2025d84c0d..2025d84c0d 100644
--- a/meta/packages/libpcap/libpcap.inc
+++ b/meta/recipes-connectivity/libpcap/libpcap.inc
diff --git a/meta/packages/libpcap/libpcap_1.1.1.bb b/meta/recipes-connectivity/libpcap/libpcap_1.1.1.bb
index 58ab5e6c95..58ab5e6c95 100644
--- a/meta/packages/libpcap/libpcap_1.1.1.bb
+++ b/meta/recipes-connectivity/libpcap/libpcap_1.1.1.bb
diff --git a/meta/packages/network-suspend-scripts/network-suspend-scripts.bb b/meta/recipes-connectivity/network-suspend-scripts/network-suspend-scripts.bb
index dc22ed85f6..dc22ed85f6 100644
--- a/meta/packages/network-suspend-scripts/network-suspend-scripts.bb
+++ b/meta/recipes-connectivity/network-suspend-scripts/network-suspend-scripts.bb
diff --git a/meta/packages/network-suspend-scripts/network-suspend-scripts/ifupdown b/meta/recipes-connectivity/network-suspend-scripts/network-suspend-scripts/ifupdown
index d458da6866..d458da6866 100644
--- a/meta/packages/network-suspend-scripts/network-suspend-scripts/ifupdown
+++ b/meta/recipes-connectivity/network-suspend-scripts/network-suspend-scripts/ifupdown
diff --git a/meta/packages/network-suspend-scripts/network-suspend-scripts/usbnet b/meta/recipes-connectivity/network-suspend-scripts/network-suspend-scripts/usbnet
index 3731f6339f..3731f6339f 100644
--- a/meta/packages/network-suspend-scripts/network-suspend-scripts/usbnet
+++ b/meta/recipes-connectivity/network-suspend-scripts/network-suspend-scripts/usbnet
diff --git a/meta/packages/nfs-utils/libnfsidmap_0.23.bb b/meta/recipes-connectivity/nfs-utils/libnfsidmap_0.23.bb
index c6b02fe19a..c6b02fe19a 100644
--- a/meta/packages/nfs-utils/libnfsidmap_0.23.bb
+++ b/meta/recipes-connectivity/nfs-utils/libnfsidmap_0.23.bb
diff --git a/meta/packages/nfs-utils/nfs-utils/nfs-utils-1.0.6-uclibc.patch b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-1.0.6-uclibc.patch
index 336dc0e267..336dc0e267 100644
--- a/meta/packages/nfs-utils/nfs-utils/nfs-utils-1.0.6-uclibc.patch
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-1.0.6-uclibc.patch
diff --git a/meta/packages/nfs-utils/nfs-utils/nfsserver b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfsserver
index 9d02e85848..9d02e85848 100644
--- a/meta/packages/nfs-utils/nfs-utils/nfsserver
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfsserver
diff --git a/meta/packages/nfs-utils/nfs-utils_1.2.2.bb b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.2.bb
index fafedd17b5..fafedd17b5 100644
--- a/meta/packages/nfs-utils/nfs-utils_1.2.2.bb
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.2.bb
diff --git a/meta/packages/openssl/openssl-0.9.8o/configure-targets.patch b/meta/recipes-connectivity/openssl/openssl-0.9.8o/configure-targets.patch
index b68123a233..b68123a233 100644
--- a/meta/packages/openssl/openssl-0.9.8o/configure-targets.patch
+++ b/meta/recipes-connectivity/openssl/openssl-0.9.8o/configure-targets.patch
diff --git a/meta/packages/openssl/openssl-0.9.8o/debian/ca.patch b/meta/recipes-connectivity/openssl/openssl-0.9.8o/debian/ca.patch
index 761eebe510..761eebe510 100644
--- a/meta/packages/openssl/openssl-0.9.8o/debian/ca.patch
+++ b/meta/recipes-connectivity/openssl/openssl-0.9.8o/debian/ca.patch
diff --git a/meta/packages/openssl/openssl-0.9.8o/debian/config-hurd.patch b/meta/recipes-connectivity/openssl/openssl-0.9.8o/debian/config-hurd.patch
index 21b7935dde..21b7935dde 100644
--- a/meta/packages/openssl/openssl-0.9.8o/debian/config-hurd.patch
+++ b/meta/recipes-connectivity/openssl/openssl-0.9.8o/debian/config-hurd.patch
diff --git a/meta/packages/openssl/openssl-0.9.8o/debian/debian-targets.patch b/meta/recipes-connectivity/openssl/openssl-0.9.8o/debian/debian-targets.patch
index fed47341ea..fed47341ea 100644
--- a/meta/packages/openssl/openssl-0.9.8o/debian/debian-targets.patch
+++ b/meta/recipes-connectivity/openssl/openssl-0.9.8o/debian/debian-targets.patch
diff --git a/meta/packages/openssl/openssl-0.9.8o/debian/engines-path.patch b/meta/recipes-connectivity/openssl/openssl-0.9.8o/debian/engines-path.patch
index 49400ff6e1..49400ff6e1 100644
--- a/meta/packages/openssl/openssl-0.9.8o/debian/engines-path.patch
+++ b/meta/recipes-connectivity/openssl/openssl-0.9.8o/debian/engines-path.patch
diff --git a/meta/packages/openssl/openssl-0.9.8o/debian/kfreebsd-pipe.patch b/meta/recipes-connectivity/openssl/openssl-0.9.8o/debian/kfreebsd-pipe.patch
index da97186886..da97186886 100644
--- a/meta/packages/openssl/openssl-0.9.8o/debian/kfreebsd-pipe.patch
+++ b/meta/recipes-connectivity/openssl/openssl-0.9.8o/debian/kfreebsd-pipe.patch
diff --git a/meta/packages/openssl/openssl-0.9.8o/debian/make-targets.patch b/meta/recipes-connectivity/openssl/openssl-0.9.8o/debian/make-targets.patch
index b1239728e7..b1239728e7 100644
--- a/meta/packages/openssl/openssl-0.9.8o/debian/make-targets.patch
+++ b/meta/recipes-connectivity/openssl/openssl-0.9.8o/debian/make-targets.patch
diff --git a/meta/packages/openssl/openssl-0.9.8o/debian/man-dir.patch b/meta/recipes-connectivity/openssl/openssl-0.9.8o/debian/man-dir.patch
index 29563ecf59..29563ecf59 100644
--- a/meta/packages/openssl/openssl-0.9.8o/debian/man-dir.patch
+++ b/meta/recipes-connectivity/openssl/openssl-0.9.8o/debian/man-dir.patch
diff --git a/meta/packages/openssl/openssl-0.9.8o/debian/man-section.patch b/meta/recipes-connectivity/openssl/openssl-0.9.8o/debian/man-section.patch
index fe20ab0444..fe20ab0444 100644
--- a/meta/packages/openssl/openssl-0.9.8o/debian/man-section.patch
+++ b/meta/recipes-connectivity/openssl/openssl-0.9.8o/debian/man-section.patch
diff --git a/meta/packages/openssl/openssl-0.9.8o/debian/no-rpath.patch b/meta/recipes-connectivity/openssl/openssl-0.9.8o/debian/no-rpath.patch
index 3ebc9accca..3ebc9accca 100644
--- a/meta/packages/openssl/openssl-0.9.8o/debian/no-rpath.patch
+++ b/meta/recipes-connectivity/openssl/openssl-0.9.8o/debian/no-rpath.patch
diff --git a/meta/packages/openssl/openssl-0.9.8o/debian/no-symbolic.patch b/meta/recipes-connectivity/openssl/openssl-0.9.8o/debian/no-symbolic.patch
index 2504fa791e..2504fa791e 100644
--- a/meta/packages/openssl/openssl-0.9.8o/debian/no-symbolic.patch
+++ b/meta/recipes-connectivity/openssl/openssl-0.9.8o/debian/no-symbolic.patch
diff --git a/meta/packages/openssl/openssl-0.9.8o/debian/perl-path.diff b/meta/recipes-connectivity/openssl/openssl-0.9.8o/debian/perl-path.diff
index a72f938d82..a72f938d82 100644
--- a/meta/packages/openssl/openssl-0.9.8o/debian/perl-path.diff
+++ b/meta/recipes-connectivity/openssl/openssl-0.9.8o/debian/perl-path.diff
diff --git a/meta/packages/openssl/openssl-0.9.8o/debian/pic.patch b/meta/recipes-connectivity/openssl/openssl-0.9.8o/debian/pic.patch
index b534afa66c..b534afa66c 100644
--- a/meta/packages/openssl/openssl-0.9.8o/debian/pic.patch
+++ b/meta/recipes-connectivity/openssl/openssl-0.9.8o/debian/pic.patch
diff --git a/meta/packages/openssl/openssl-0.9.8o/debian/pkg-config.patch b/meta/recipes-connectivity/openssl/openssl-0.9.8o/debian/pkg-config.patch
index 38923b08bf..38923b08bf 100644
--- a/meta/packages/openssl/openssl-0.9.8o/debian/pkg-config.patch
+++ b/meta/recipes-connectivity/openssl/openssl-0.9.8o/debian/pkg-config.patch
diff --git a/meta/packages/openssl/openssl-0.9.8o/debian/rc4-amd64.patch b/meta/recipes-connectivity/openssl/openssl-0.9.8o/debian/rc4-amd64.patch
index 6f0421a014..6f0421a014 100644
--- a/meta/packages/openssl/openssl-0.9.8o/debian/rc4-amd64.patch
+++ b/meta/recipes-connectivity/openssl/openssl-0.9.8o/debian/rc4-amd64.patch
diff --git a/meta/packages/openssl/openssl-0.9.8o/debian/rehash-crt.patch b/meta/recipes-connectivity/openssl/openssl-0.9.8o/debian/rehash-crt.patch
index a8ff28c6f3..a8ff28c6f3 100644
--- a/meta/packages/openssl/openssl-0.9.8o/debian/rehash-crt.patch
+++ b/meta/recipes-connectivity/openssl/openssl-0.9.8o/debian/rehash-crt.patch
diff --git a/meta/packages/openssl/openssl-0.9.8o/debian/rehash_pod.patch b/meta/recipes-connectivity/openssl/openssl-0.9.8o/debian/rehash_pod.patch
index 94792c48e5..94792c48e5 100644
--- a/meta/packages/openssl/openssl-0.9.8o/debian/rehash_pod.patch
+++ b/meta/recipes-connectivity/openssl/openssl-0.9.8o/debian/rehash_pod.patch
diff --git a/meta/packages/openssl/openssl-0.9.8o/debian/series b/meta/recipes-connectivity/openssl/openssl-0.9.8o/debian/series
index b764c0414d..b764c0414d 100644
--- a/meta/packages/openssl/openssl-0.9.8o/debian/series
+++ b/meta/recipes-connectivity/openssl/openssl-0.9.8o/debian/series
diff --git a/meta/packages/openssl/openssl-0.9.8o/debian/shared-lib-ext.patch b/meta/recipes-connectivity/openssl/openssl-0.9.8o/debian/shared-lib-ext.patch
index d27e9b2398..d27e9b2398 100644
--- a/meta/packages/openssl/openssl-0.9.8o/debian/shared-lib-ext.patch
+++ b/meta/recipes-connectivity/openssl/openssl-0.9.8o/debian/shared-lib-ext.patch
diff --git a/meta/packages/openssl/openssl-0.9.8o/debian/stddef.patch b/meta/recipes-connectivity/openssl/openssl-0.9.8o/debian/stddef.patch
index bb65b23319..bb65b23319 100644
--- a/meta/packages/openssl/openssl-0.9.8o/debian/stddef.patch
+++ b/meta/recipes-connectivity/openssl/openssl-0.9.8o/debian/stddef.patch
diff --git a/meta/packages/openssl/openssl-0.9.8o/debian/valgrind.patch b/meta/recipes-connectivity/openssl/openssl-0.9.8o/debian/valgrind.patch
index e9f86eabbf..e9f86eabbf 100644
--- a/meta/packages/openssl/openssl-0.9.8o/debian/valgrind.patch
+++ b/meta/recipes-connectivity/openssl/openssl-0.9.8o/debian/valgrind.patch
diff --git a/meta/packages/openssl/openssl-0.9.8o/debian/version-script.patch b/meta/recipes-connectivity/openssl/openssl-0.9.8o/debian/version-script.patch
index 64d8fc7fa2..64d8fc7fa2 100644
--- a/meta/packages/openssl/openssl-0.9.8o/debian/version-script.patch
+++ b/meta/recipes-connectivity/openssl/openssl-0.9.8o/debian/version-script.patch
diff --git a/meta/packages/openssl/openssl-0.9.8o/shared-libs.patch b/meta/recipes-connectivity/openssl/openssl-0.9.8o/shared-libs.patch
index 10d9146dc9..10d9146dc9 100644
--- a/meta/packages/openssl/openssl-0.9.8o/shared-libs.patch
+++ b/meta/recipes-connectivity/openssl/openssl-0.9.8o/shared-libs.patch
diff --git a/meta/packages/openssl/openssl.inc b/meta/recipes-connectivity/openssl/openssl.inc
index 2482585c64..2482585c64 100644
--- a/meta/packages/openssl/openssl.inc
+++ b/meta/recipes-connectivity/openssl/openssl.inc
diff --git a/meta/packages/openssl/openssl_0.9.8o.bb b/meta/recipes-connectivity/openssl/openssl_0.9.8o.bb
index 31c5568ba1..31c5568ba1 100644
--- a/meta/packages/openssl/openssl_0.9.8o.bb
+++ b/meta/recipes-connectivity/openssl/openssl_0.9.8o.bb
diff --git a/meta/packages/openswan/openswan-2.4.7/installflags.patch b/meta/recipes-connectivity/openswan/openswan-2.4.7/installflags.patch
index e6da2eaa5f..e6da2eaa5f 100644
--- a/meta/packages/openswan/openswan-2.4.7/installflags.patch
+++ b/meta/recipes-connectivity/openswan/openswan-2.4.7/installflags.patch
diff --git a/meta/packages/openswan/openswan-2.4.7/ld-library-path-breakage.patch b/meta/recipes-connectivity/openswan/openswan-2.4.7/ld-library-path-breakage.patch
index e3cc8762cc..e3cc8762cc 100644
--- a/meta/packages/openswan/openswan-2.4.7/ld-library-path-breakage.patch
+++ b/meta/recipes-connectivity/openswan/openswan-2.4.7/ld-library-path-breakage.patch
diff --git a/meta/packages/openswan/openswan-2.4.7/openswan-2.4.7-gentoo.patch b/meta/recipes-connectivity/openswan/openswan-2.4.7/openswan-2.4.7-gentoo.patch
index b3863a584b..b3863a584b 100644
--- a/meta/packages/openswan/openswan-2.4.7/openswan-2.4.7-gentoo.patch
+++ b/meta/recipes-connectivity/openswan/openswan-2.4.7/openswan-2.4.7-gentoo.patch
diff --git a/meta/packages/openswan/openswan_2.4.7.bb b/meta/recipes-connectivity/openswan/openswan_2.4.7.bb
index 4ebb9c7a45..4ebb9c7a45 100644
--- a/meta/packages/openswan/openswan_2.4.7.bb
+++ b/meta/recipes-connectivity/openswan/openswan_2.4.7.bb
diff --git a/meta/packages/opensync/libopensync-0.37/build-in-src.patch b/meta/recipes-connectivity/opensync/libopensync-0.37/build-in-src.patch
index 1810b339a6..1810b339a6 100644
--- a/meta/packages/opensync/libopensync-0.37/build-in-src.patch
+++ b/meta/recipes-connectivity/opensync/libopensync-0.37/build-in-src.patch
diff --git a/meta/packages/opensync/libopensync-0.37/cmake.patch b/meta/recipes-connectivity/opensync/libopensync-0.37/cmake.patch
index 7ea4613548..7ea4613548 100644
--- a/meta/packages/opensync/libopensync-0.37/cmake.patch
+++ b/meta/recipes-connectivity/opensync/libopensync-0.37/cmake.patch
diff --git a/meta/packages/opensync/libopensync-0.37/no-python-check.patch b/meta/recipes-connectivity/opensync/libopensync-0.37/no-python-check.patch
index 04257bc623..04257bc623 100644
--- a/meta/packages/opensync/libopensync-0.37/no-python-check.patch
+++ b/meta/recipes-connectivity/opensync/libopensync-0.37/no-python-check.patch
diff --git a/meta/packages/opensync/libopensync-plugin-evolution2/0.37-fixes.patch b/meta/recipes-connectivity/opensync/libopensync-plugin-evolution2/0.37-fixes.patch
index 4a1802ce17..4a1802ce17 100644
--- a/meta/packages/opensync/libopensync-plugin-evolution2/0.37-fixes.patch
+++ b/meta/recipes-connectivity/opensync/libopensync-plugin-evolution2/0.37-fixes.patch
diff --git a/meta/packages/opensync/libopensync-plugin-evolution2_0.36.bb b/meta/recipes-connectivity/opensync/libopensync-plugin-evolution2_0.36.bb
index a1c4cb1887..a1c4cb1887 100644
--- a/meta/packages/opensync/libopensync-plugin-evolution2_0.36.bb
+++ b/meta/recipes-connectivity/opensync/libopensync-plugin-evolution2_0.36.bb
diff --git a/meta/packages/opensync/libopensync-plugin-file_0.37.bb b/meta/recipes-connectivity/opensync/libopensync-plugin-file_0.37.bb
index 33a049b7d6..33a049b7d6 100644
--- a/meta/packages/opensync/libopensync-plugin-file_0.37.bb
+++ b/meta/recipes-connectivity/opensync/libopensync-plugin-file_0.37.bb
diff --git a/meta/packages/opensync/libopensync-plugin-google-calendar_0.36.bb b/meta/recipes-connectivity/opensync/libopensync-plugin-google-calendar_0.36.bb
index 33a049b7d6..33a049b7d6 100644
--- a/meta/packages/opensync/libopensync-plugin-google-calendar_0.36.bb
+++ b/meta/recipes-connectivity/opensync/libopensync-plugin-google-calendar_0.36.bb
diff --git a/meta/packages/opensync/libopensync-plugin-irmc_0.36.bb b/meta/recipes-connectivity/opensync/libopensync-plugin-irmc_0.36.bb
index c06de2fde8..c06de2fde8 100644
--- a/meta/packages/opensync/libopensync-plugin-irmc_0.36.bb
+++ b/meta/recipes-connectivity/opensync/libopensync-plugin-irmc_0.36.bb
diff --git a/meta/packages/opensync/libopensync-plugin-syncml/fixerror.patch b/meta/recipes-connectivity/opensync/libopensync-plugin-syncml/fixerror.patch
index 7dad889422..7dad889422 100644
--- a/meta/packages/opensync/libopensync-plugin-syncml/fixerror.patch
+++ b/meta/recipes-connectivity/opensync/libopensync-plugin-syncml/fixerror.patch
diff --git a/meta/packages/opensync/libopensync-plugin-syncml_0.38.bb b/meta/recipes-connectivity/opensync/libopensync-plugin-syncml_0.38.bb
index d32d62de47..d32d62de47 100644
--- a/meta/packages/opensync/libopensync-plugin-syncml_0.38.bb
+++ b/meta/recipes-connectivity/opensync/libopensync-plugin-syncml_0.38.bb
diff --git a/meta/packages/opensync/libopensync-plugin-vformat_0.37.bb b/meta/recipes-connectivity/opensync/libopensync-plugin-vformat_0.37.bb
index 84a48f21fe..84a48f21fe 100644
--- a/meta/packages/opensync/libopensync-plugin-vformat_0.37.bb
+++ b/meta/recipes-connectivity/opensync/libopensync-plugin-vformat_0.37.bb
diff --git a/meta/packages/opensync/libopensync-plugin_0.36.inc b/meta/recipes-connectivity/opensync/libopensync-plugin_0.36.inc
index db6b1fa73a..db6b1fa73a 100644
--- a/meta/packages/opensync/libopensync-plugin_0.36.inc
+++ b/meta/recipes-connectivity/opensync/libopensync-plugin_0.36.inc
diff --git a/meta/packages/opensync/libopensync_0.37.bb b/meta/recipes-connectivity/opensync/libopensync_0.37.bb
index e9b8ce202e..e9b8ce202e 100644
--- a/meta/packages/opensync/libopensync_0.37.bb
+++ b/meta/recipes-connectivity/opensync/libopensync_0.37.bb
diff --git a/meta/packages/sync/libsync_svn.bb b/meta/recipes-connectivity/opensync/libsync_svn.bb
index 660b39aa42..660b39aa42 100644
--- a/meta/packages/sync/libsync_svn.bb
+++ b/meta/recipes-connectivity/opensync/libsync_svn.bb
diff --git a/meta/packages/opensync/libsyncml/build-in-src.patch b/meta/recipes-connectivity/opensync/libsyncml/build-in-src.patch
index d8106bdfc7..d8106bdfc7 100644
--- a/meta/packages/opensync/libsyncml/build-in-src.patch
+++ b/meta/recipes-connectivity/opensync/libsyncml/build-in-src.patch
diff --git a/meta/packages/opensync/libsyncml_0.5.4.bb b/meta/recipes-connectivity/opensync/libsyncml_0.5.4.bb
index 7feb5e0f18..7feb5e0f18 100644
--- a/meta/packages/opensync/libsyncml_0.5.4.bb
+++ b/meta/recipes-connectivity/opensync/libsyncml_0.5.4.bb
diff --git a/meta/packages/opensync/msynctool_0.37.bb b/meta/recipes-connectivity/opensync/msynctool_0.37.bb
index 773166b3be..773166b3be 100644
--- a/meta/packages/opensync/msynctool_0.37.bb
+++ b/meta/recipes-connectivity/opensync/msynctool_0.37.bb
diff --git a/meta/packages/portmap/portmap-6.0/destdir-no-strip.patch b/meta/recipes-connectivity/portmap/portmap-6.0/destdir-no-strip.patch
index a1563c7141..a1563c7141 100644
--- a/meta/packages/portmap/portmap-6.0/destdir-no-strip.patch
+++ b/meta/recipes-connectivity/portmap/portmap-6.0/destdir-no-strip.patch
diff --git a/meta/packages/portmap/portmap-6.0/tcpd-config.patch b/meta/recipes-connectivity/portmap/portmap-6.0/tcpd-config.patch
index da55f3799d..da55f3799d 100644
--- a/meta/packages/portmap/portmap-6.0/tcpd-config.patch
+++ b/meta/recipes-connectivity/portmap/portmap-6.0/tcpd-config.patch
diff --git a/meta/packages/portmap/portmap.inc b/meta/recipes-connectivity/portmap/portmap.inc
index d563ad5b5a..d563ad5b5a 100644
--- a/meta/packages/portmap/portmap.inc
+++ b/meta/recipes-connectivity/portmap/portmap.inc
diff --git a/meta/packages/portmap/portmap/portmap.init b/meta/recipes-connectivity/portmap/portmap/portmap.init
index e46513e115..e46513e115 100755
--- a/meta/packages/portmap/portmap/portmap.init
+++ b/meta/recipes-connectivity/portmap/portmap/portmap.init
diff --git a/meta/packages/portmap/portmap_6.0.bb b/meta/recipes-connectivity/portmap/portmap_6.0.bb
index 49ac1d8332..49ac1d8332 100644
--- a/meta/packages/portmap/portmap_6.0.bb
+++ b/meta/recipes-connectivity/portmap/portmap_6.0.bb
diff --git a/meta/packages/ppp-dialin/files/host-peer b/meta/recipes-connectivity/ppp-dialin/files/host-peer
index e7e2e11d49..e7e2e11d49 100644
--- a/meta/packages/ppp-dialin/files/host-peer
+++ b/meta/recipes-connectivity/ppp-dialin/files/host-peer
diff --git a/meta/packages/ppp-dialin/files/ppp-dialin b/meta/recipes-connectivity/ppp-dialin/files/ppp-dialin
index ea2771311a..ea2771311a 100644
--- a/meta/packages/ppp-dialin/files/ppp-dialin
+++ b/meta/recipes-connectivity/ppp-dialin/files/ppp-dialin
diff --git a/meta/packages/ppp-dialin/ppp-dialin_0.1.bb b/meta/recipes-connectivity/ppp-dialin/ppp-dialin_0.1.bb
index 6861d8ad44..6861d8ad44 100644
--- a/meta/packages/ppp-dialin/ppp-dialin_0.1.bb
+++ b/meta/recipes-connectivity/ppp-dialin/ppp-dialin_0.1.bb
diff --git a/meta/packages/ppp/ppp-2.4.5/08setupdns b/meta/recipes-connectivity/ppp/ppp-2.4.5/08setupdns
index 998219de97..998219de97 100644
--- a/meta/packages/ppp/ppp-2.4.5/08setupdns
+++ b/meta/recipes-connectivity/ppp/ppp-2.4.5/08setupdns
diff --git a/meta/packages/ppp/ppp-2.4.5/92removedns b/meta/recipes-connectivity/ppp/ppp-2.4.5/92removedns
index 2eadec6899..2eadec6899 100644
--- a/meta/packages/ppp/ppp-2.4.5/92removedns
+++ b/meta/recipes-connectivity/ppp/ppp-2.4.5/92removedns
diff --git a/meta/packages/ppp/ppp-2.4.5/cifdefroute.patch b/meta/recipes-connectivity/ppp/ppp-2.4.5/cifdefroute.patch
index 6473a08bc7..6473a08bc7 100644
--- a/meta/packages/ppp/ppp-2.4.5/cifdefroute.patch
+++ b/meta/recipes-connectivity/ppp/ppp-2.4.5/cifdefroute.patch
diff --git a/meta/packages/ppp/ppp-2.4.5/enable-ipv6.patch b/meta/recipes-connectivity/ppp/ppp-2.4.5/enable-ipv6.patch
index daa7f2ecc6..daa7f2ecc6 100644
--- a/meta/packages/ppp/ppp-2.4.5/enable-ipv6.patch
+++ b/meta/recipes-connectivity/ppp/ppp-2.4.5/enable-ipv6.patch
diff --git a/meta/packages/ppp/ppp-2.4.5/init b/meta/recipes-connectivity/ppp/ppp-2.4.5/init
index 5b3b7abe2f..5b3b7abe2f 100755
--- a/meta/packages/ppp/ppp-2.4.5/init
+++ b/meta/recipes-connectivity/ppp/ppp-2.4.5/init
diff --git a/meta/packages/ppp/ppp-2.4.5/ip-down b/meta/recipes-connectivity/ppp/ppp-2.4.5/ip-down
index 06d35487a5..06d35487a5 100755
--- a/meta/packages/ppp/ppp-2.4.5/ip-down
+++ b/meta/recipes-connectivity/ppp/ppp-2.4.5/ip-down
diff --git a/meta/packages/ppp/ppp-2.4.5/ip-up b/meta/recipes-connectivity/ppp/ppp-2.4.5/ip-up
index fc2fae9fe0..fc2fae9fe0 100755
--- a/meta/packages/ppp/ppp-2.4.5/ip-up
+++ b/meta/recipes-connectivity/ppp/ppp-2.4.5/ip-up
diff --git a/meta/packages/ppp/ppp-2.4.5/makefile-remove-hard-usr-reference.patch b/meta/recipes-connectivity/ppp/ppp-2.4.5/makefile-remove-hard-usr-reference.patch
index 9ba868839e..9ba868839e 100644
--- a/meta/packages/ppp/ppp-2.4.5/makefile-remove-hard-usr-reference.patch
+++ b/meta/recipes-connectivity/ppp/ppp-2.4.5/makefile-remove-hard-usr-reference.patch
diff --git a/meta/packages/ppp/ppp-2.4.5/makefile.patch b/meta/recipes-connectivity/ppp/ppp-2.4.5/makefile.patch
index 94af5af6de..94af5af6de 100644
--- a/meta/packages/ppp/ppp-2.4.5/makefile.patch
+++ b/meta/recipes-connectivity/ppp/ppp-2.4.5/makefile.patch
diff --git a/meta/packages/ppp/ppp-2.4.5/poff b/meta/recipes-connectivity/ppp/ppp-2.4.5/poff
index 0521a9406a..0521a9406a 100644
--- a/meta/packages/ppp/ppp-2.4.5/poff
+++ b/meta/recipes-connectivity/ppp/ppp-2.4.5/poff
diff --git a/meta/packages/ppp/ppp-2.4.5/pon b/meta/recipes-connectivity/ppp/ppp-2.4.5/pon
index 91c059501a..91c059501a 100644
--- a/meta/packages/ppp/ppp-2.4.5/pon
+++ b/meta/recipes-connectivity/ppp/ppp-2.4.5/pon
diff --git a/meta/packages/ppp/ppp-2.4.5/pppd-resolv-varrun.patch b/meta/recipes-connectivity/ppp/ppp-2.4.5/pppd-resolv-varrun.patch
index c4e61fdd28..c4e61fdd28 100644
--- a/meta/packages/ppp/ppp-2.4.5/pppd-resolv-varrun.patch
+++ b/meta/recipes-connectivity/ppp/ppp-2.4.5/pppd-resolv-varrun.patch
diff --git a/meta/packages/ppp/ppp_2.4.5.bb b/meta/recipes-connectivity/ppp/ppp_2.4.5.bb
index e9caf3d13e..e9caf3d13e 100644
--- a/meta/packages/ppp/ppp_2.4.5.bb
+++ b/meta/recipes-connectivity/ppp/ppp_2.4.5.bb
diff --git a/meta/packages/resolvconf/resolvconf_1.43.bb b/meta/recipes-connectivity/resolvconf/resolvconf_1.43.bb
index f751f17e0e..f751f17e0e 100644
--- a/meta/packages/resolvconf/resolvconf_1.43.bb
+++ b/meta/recipes-connectivity/resolvconf/resolvconf_1.43.bb
diff --git a/meta/packages/wbxml/files/no-doc-install.patch b/meta/recipes-connectivity/wbxml/files/no-doc-install.patch
index 16084e60e6..16084e60e6 100644
--- a/meta/packages/wbxml/files/no-doc-install.patch
+++ b/meta/recipes-connectivity/wbxml/files/no-doc-install.patch
diff --git a/meta/packages/wbxml/wbxml2_0.9.2.bb b/meta/recipes-connectivity/wbxml/wbxml2_0.9.2.bb
index b8ba8c747f..b8ba8c747f 100644
--- a/meta/packages/wbxml/wbxml2_0.9.2.bb
+++ b/meta/recipes-connectivity/wbxml/wbxml2_0.9.2.bb
diff --git a/meta/packages/coreutils/coreutils-6.9/futimens.patch b/meta/recipes-core/coreutils/coreutils-6.9/futimens.patch
index 953c2d17a9..953c2d17a9 100644
--- a/meta/packages/coreutils/coreutils-6.9/futimens.patch
+++ b/meta/recipes-core/coreutils/coreutils-6.9/futimens.patch
diff --git a/meta/packages/coreutils/coreutils-6.9/gnulib_m4.patch b/meta/recipes-core/coreutils/coreutils-6.9/gnulib_m4.patch
index b42f5c9faa..b42f5c9faa 100644
--- a/meta/packages/coreutils/coreutils-6.9/gnulib_m4.patch
+++ b/meta/recipes-core/coreutils/coreutils-6.9/gnulib_m4.patch
diff --git a/meta/packages/coreutils/coreutils-6.9/man-touch.patch b/meta/recipes-core/coreutils/coreutils-6.9/man-touch.patch
index 95a9638921..95a9638921 100644
--- a/meta/packages/coreutils/coreutils-6.9/man-touch.patch
+++ b/meta/recipes-core/coreutils/coreutils-6.9/man-touch.patch
diff --git a/meta/packages/coreutils/coreutils_6.9.bb b/meta/recipes-core/coreutils/coreutils_6.9.bb
index 6a23f4f65f..6a23f4f65f 100644
--- a/meta/packages/coreutils/coreutils_6.9.bb
+++ b/meta/recipes-core/coreutils/coreutils_6.9.bb
diff --git a/meta/packages/coreutils/coreutils_8.5.bb b/meta/recipes-core/coreutils/coreutils_8.5.bb
index 5213fa2937..5213fa2937 100644
--- a/meta/packages/coreutils/coreutils_8.5.bb
+++ b/meta/recipes-core/coreutils/coreutils_8.5.bb
diff --git a/meta/packages/ncurses/ncurses.inc b/meta/recipes-core/ncurses/ncurses.inc
index 259750cb46..259750cb46 100644
--- a/meta/packages/ncurses/ncurses.inc
+++ b/meta/recipes-core/ncurses/ncurses.inc
diff --git a/meta/packages/ncurses/ncurses/makefile_tweak.patch b/meta/recipes-core/ncurses/ncurses/makefile_tweak.patch
index 480855bcc6..480855bcc6 100644
--- a/meta/packages/ncurses/ncurses/makefile_tweak.patch
+++ b/meta/recipes-core/ncurses/ncurses/makefile_tweak.patch
diff --git a/meta/packages/ncurses/ncurses/visibility.patch b/meta/recipes-core/ncurses/ncurses/visibility.patch
index 29cac5f1b8..29cac5f1b8 100644
--- a/meta/packages/ncurses/ncurses/visibility.patch
+++ b/meta/recipes-core/ncurses/ncurses/visibility.patch
diff --git a/meta/packages/ncurses/ncurses_5.4.bb b/meta/recipes-core/ncurses/ncurses_5.4.bb
index e69c1c0673..e69c1c0673 100644
--- a/meta/packages/ncurses/ncurses_5.4.bb
+++ b/meta/recipes-core/ncurses/ncurses_5.4.bb
diff --git a/meta/packages/readline/files/acinclude.m4 b/meta/recipes-core/readline/files/acinclude.m4
index 8a45f99084..8a45f99084 100644
--- a/meta/packages/readline/files/acinclude.m4
+++ b/meta/recipes-core/readline/files/acinclude.m4
diff --git a/meta/packages/readline/files/configure-fix.patch b/meta/recipes-core/readline/files/configure-fix.patch
index 4100fe42a7..4100fe42a7 100644
--- a/meta/packages/readline/files/configure-fix.patch
+++ b/meta/recipes-core/readline/files/configure-fix.patch
diff --git a/meta/packages/readline/readline.inc b/meta/recipes-core/readline/readline.inc
index 35bc7ed946..35bc7ed946 100644
--- a/meta/packages/readline/readline.inc
+++ b/meta/recipes-core/readline/readline.inc
diff --git a/meta/packages/readline/readline_5.2.bb b/meta/recipes-core/readline/readline_5.2.bb
index a62345c45e..a62345c45e 100644
--- a/meta/packages/readline/readline_5.2.bb
+++ b/meta/recipes-core/readline/readline_5.2.bb
diff --git a/meta/packages/readline/readline_6.1.bb b/meta/recipes-core/readline/readline_6.1.bb
index c32755669c..c32755669c 100644
--- a/meta/packages/readline/readline_6.1.bb
+++ b/meta/recipes-core/readline/readline_6.1.bb
diff --git a/meta/packages/sysfsutils/sysfsutils_2.1.0.bb b/meta/recipes-core/sysfsutils/sysfsutils_2.1.0.bb
index 5b513211dc..5b513211dc 100644
--- a/meta/packages/sysfsutils/sysfsutils_2.1.0.bb
+++ b/meta/recipes-core/sysfsutils/sysfsutils_2.1.0.bb
diff --git a/meta/packages/util-linux/files/MCONFIG b/meta/recipes-core/util-linux/files/MCONFIG
index 3fea2c02d7..3fea2c02d7 100644
--- a/meta/packages/util-linux/files/MCONFIG
+++ b/meta/recipes-core/util-linux/files/MCONFIG
diff --git a/meta/packages/util-linux/files/debian-bug392236.patch b/meta/recipes-core/util-linux/files/debian-bug392236.patch
index fcd2046e34..fcd2046e34 100644
--- a/meta/packages/util-linux/files/debian-bug392236.patch
+++ b/meta/recipes-core/util-linux/files/debian-bug392236.patch
diff --git a/meta/packages/util-linux/files/defines.h b/meta/recipes-core/util-linux/files/defines.h
index 6ce6b86df5..6ce6b86df5 100644
--- a/meta/packages/util-linux/files/defines.h
+++ b/meta/recipes-core/util-linux/files/defines.h
diff --git a/meta/packages/util-linux/files/fdiskbsdlabel_thumb.diff b/meta/recipes-core/util-linux/files/fdiskbsdlabel_thumb.diff
index e6f82b5b46..e6f82b5b46 100644
--- a/meta/packages/util-linux/files/fdiskbsdlabel_thumb.diff
+++ b/meta/recipes-core/util-linux/files/fdiskbsdlabel_thumb.diff
diff --git a/meta/packages/util-linux/files/fix-make-c.patch b/meta/recipes-core/util-linux/files/fix-make-c.patch
index bf1082e85c..bf1082e85c 100644
--- a/meta/packages/util-linux/files/fix-make-c.patch
+++ b/meta/recipes-core/util-linux/files/fix-make-c.patch
diff --git a/meta/packages/util-linux/files/gcc34.patch b/meta/recipes-core/util-linux/files/gcc34.patch
index 8c4a20cdca..8c4a20cdca 100644
--- a/meta/packages/util-linux/files/gcc34.patch
+++ b/meta/recipes-core/util-linux/files/gcc34.patch
diff --git a/meta/packages/util-linux/files/glibc-fix.patch b/meta/recipes-core/util-linux/files/glibc-fix.patch
index 6d0c2fcefa..6d0c2fcefa 100644
--- a/meta/packages/util-linux/files/glibc-fix.patch
+++ b/meta/recipes-core/util-linux/files/glibc-fix.patch
diff --git a/meta/packages/util-linux/files/make_include b/meta/recipes-core/util-linux/files/make_include
index e6abcd91f7..e6abcd91f7 100644
--- a/meta/packages/util-linux/files/make_include
+++ b/meta/recipes-core/util-linux/files/make_include
diff --git a/meta/packages/util-linux/files/optional-uuid.patch b/meta/recipes-core/util-linux/files/optional-uuid.patch
index 2d0ea43cd2..2d0ea43cd2 100644
--- a/meta/packages/util-linux/files/optional-uuid.patch
+++ b/meta/recipes-core/util-linux/files/optional-uuid.patch
diff --git a/meta/packages/util-linux/files/swapargs.h b/meta/recipes-core/util-linux/files/swapargs.h
index e960eef05f..e960eef05f 100644
--- a/meta/packages/util-linux/files/swapargs.h
+++ b/meta/recipes-core/util-linux/files/swapargs.h
diff --git a/meta/packages/util-linux/files/umount.diff b/meta/recipes-core/util-linux/files/umount.diff
index 78330789ef..78330789ef 100644
--- a/meta/packages/util-linux/files/umount.diff
+++ b/meta/recipes-core/util-linux/files/umount.diff
diff --git a/meta/packages/util-linux/files/uuid.patch b/meta/recipes-core/util-linux/files/uuid.patch
index 3208e0a865..3208e0a865 100644
--- a/meta/packages/util-linux/files/uuid.patch
+++ b/meta/recipes-core/util-linux/files/uuid.patch
diff --git a/meta/packages/util-linux/util-linux-2.17.2/tls.patch b/meta/recipes-core/util-linux/util-linux-2.17.2/tls.patch
index bdb29cae1f..bdb29cae1f 100644
--- a/meta/packages/util-linux/util-linux-2.17.2/tls.patch
+++ b/meta/recipes-core/util-linux/util-linux-2.17.2/tls.patch
diff --git a/meta/packages/util-linux/util-linux-2.17.2/uclibc-compile.patch b/meta/recipes-core/util-linux/util-linux-2.17.2/uclibc-compile.patch
index b2e8a8b95a..b2e8a8b95a 100644
--- a/meta/packages/util-linux/util-linux-2.17.2/uclibc-compile.patch
+++ b/meta/recipes-core/util-linux/util-linux-2.17.2/uclibc-compile.patch
diff --git a/meta/packages/util-linux/util-linux-2.17.2/util-linux-ng-replace-siginterrupt.patch b/meta/recipes-core/util-linux/util-linux-2.17.2/util-linux-ng-replace-siginterrupt.patch
index 4b5eb73760..4b5eb73760 100644
--- a/meta/packages/util-linux/util-linux-2.17.2/util-linux-ng-replace-siginterrupt.patch
+++ b/meta/recipes-core/util-linux/util-linux-2.17.2/util-linux-ng-replace-siginterrupt.patch
diff --git a/meta/packages/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index 571b53c99c..571b53c99c 100644
--- a/meta/packages/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
diff --git a/meta/packages/util-linux/util-linux_2.17.2.bb b/meta/recipes-core/util-linux/util-linux_2.17.2.bb
index 9efe64a6c6..9efe64a6c6 100644
--- a/meta/packages/util-linux/util-linux_2.17.2.bb
+++ b/meta/recipes-core/util-linux/util-linux_2.17.2.bb
diff --git a/meta/packages/exmap-console/exmap-console.inc b/meta/recipes-devtools/exmap-console/exmap-console.inc
index efbd79fce1..efbd79fce1 100644
--- a/meta/packages/exmap-console/exmap-console.inc
+++ b/meta/recipes-devtools/exmap-console/exmap-console.inc
diff --git a/meta/packages/exmap-console/exmap-console_0.4.1.bb b/meta/recipes-devtools/exmap-console/exmap-console_0.4.1.bb
index c76c5c3b4c..c76c5c3b4c 100644
--- a/meta/packages/exmap-console/exmap-console_0.4.1.bb
+++ b/meta/recipes-devtools/exmap-console/exmap-console_0.4.1.bb
diff --git a/meta/packages/exmap-console/exmap-console_svn.bb b/meta/recipes-devtools/exmap-console/exmap-console_svn.bb
index ce222854e2..ce222854e2 100644
--- a/meta/packages/exmap-console/exmap-console_svn.bb
+++ b/meta/recipes-devtools/exmap-console/exmap-console_svn.bb
diff --git a/meta/packages/insserv/files/40_segfault_virtprov.dpatch b/meta/recipes-devtools/insserv/files/40_segfault_virtprov.dpatch
index 9b0081307a..9b0081307a 100644
--- a/meta/packages/insserv/files/40_segfault_virtprov.dpatch
+++ b/meta/recipes-devtools/insserv/files/40_segfault_virtprov.dpatch
diff --git a/meta/packages/insserv/files/42_loopnochangemsg.dpatch b/meta/recipes-devtools/insserv/files/42_loopnochangemsg.dpatch
index 4a15f58312..4a15f58312 100644
--- a/meta/packages/insserv/files/42_loopnochangemsg.dpatch
+++ b/meta/recipes-devtools/insserv/files/42_loopnochangemsg.dpatch
diff --git a/meta/packages/insserv/files/crosscompile_fix.patch b/meta/recipes-devtools/insserv/files/crosscompile_fix.patch
index 14d8db468f..14d8db468f 100644
--- a/meta/packages/insserv/files/crosscompile_fix.patch
+++ b/meta/recipes-devtools/insserv/files/crosscompile_fix.patch
diff --git a/meta/packages/insserv/files/insserv.conf b/meta/recipes-devtools/insserv/files/insserv.conf
index 4858f85b69..4858f85b69 100644
--- a/meta/packages/insserv/files/insserv.conf
+++ b/meta/recipes-devtools/insserv/files/insserv.conf
diff --git a/meta/packages/insserv/files/make.patch b/meta/recipes-devtools/insserv/files/make.patch
index bb3b51a8ca..bb3b51a8ca 100644
--- a/meta/packages/insserv/files/make.patch
+++ b/meta/recipes-devtools/insserv/files/make.patch
diff --git a/meta/packages/insserv/insserv_1.11.0.bb b/meta/recipes-devtools/insserv/insserv_1.11.0.bb
index a45ccda48f..a45ccda48f 100644
--- a/meta/packages/insserv/insserv_1.11.0.bb
+++ b/meta/recipes-devtools/insserv/insserv_1.11.0.bb
diff --git a/meta/packages/intltool/intltool-0.40.6/intltool-nowarn-0.40.0.patch b/meta/recipes-devtools/intltool/intltool-0.40.6/intltool-nowarn-0.40.0.patch
index 61ecba266e..61ecba266e 100644
--- a/meta/packages/intltool/intltool-0.40.6/intltool-nowarn-0.40.0.patch
+++ b/meta/recipes-devtools/intltool/intltool-0.40.6/intltool-nowarn-0.40.0.patch
diff --git a/meta/packages/intltool/intltool.inc b/meta/recipes-devtools/intltool/intltool.inc
index f9bdf93b7b..f9bdf93b7b 100644
--- a/meta/packages/intltool/intltool.inc
+++ b/meta/recipes-devtools/intltool/intltool.inc
diff --git a/meta/packages/intltool/intltool_0.40.6.bb b/meta/recipes-devtools/intltool/intltool_0.40.6.bb
index 1f23a41f89..1f23a41f89 100644
--- a/meta/packages/intltool/intltool_0.40.6.bb
+++ b/meta/recipes-devtools/intltool/intltool_0.40.6.bb
diff --git a/meta/packages/nasm/nasm_2.07.bb b/meta/recipes-devtools/nasm/nasm_2.07.bb
index 4e482a04d6..4e482a04d6 100644
--- a/meta/packages/nasm/nasm_2.07.bb
+++ b/meta/recipes-devtools/nasm/nasm_2.07.bb
diff --git a/meta/packages/rsync/rsync-2.6.9/rsyncd.conf b/meta/recipes-devtools/rsync/rsync-2.6.9/rsyncd.conf
index 845f5b33f5..845f5b33f5 100644
--- a/meta/packages/rsync/rsync-2.6.9/rsyncd.conf
+++ b/meta/recipes-devtools/rsync/rsync-2.6.9/rsyncd.conf
diff --git a/meta/packages/strace/strace_4.5.20.bb b/meta/recipes-devtools/strace/strace_4.5.20.bb
index cc2ae1a964..cc2ae1a964 100644
--- a/meta/packages/strace/strace_4.5.20.bb
+++ b/meta/recipes-devtools/strace/strace_4.5.20.bb
diff --git a/meta/packages/tcf-agent/tcf-agent/fix_tcf-agent.init.patch b/meta/recipes-devtools/tcf-agent/tcf-agent/fix_tcf-agent.init.patch
index fa9e458714..fa9e458714 100644
--- a/meta/packages/tcf-agent/tcf-agent/fix_tcf-agent.init.patch
+++ b/meta/recipes-devtools/tcf-agent/tcf-agent/fix_tcf-agent.init.patch
diff --git a/meta/packages/tcf-agent/tcf-agent/terminals_agent.patch b/meta/recipes-devtools/tcf-agent/tcf-agent/terminals_agent.patch
index b88b5e70cd..b88b5e70cd 100644
--- a/meta/packages/tcf-agent/tcf-agent/terminals_agent.patch
+++ b/meta/recipes-devtools/tcf-agent/tcf-agent/terminals_agent.patch
diff --git a/meta/packages/tcf-agent/tcf-agent_svn.bb b/meta/recipes-devtools/tcf-agent/tcf-agent_svn.bb
index b4c70ec8b8..b4c70ec8b8 100644
--- a/meta/packages/tcf-agent/tcf-agent_svn.bb
+++ b/meta/recipes-devtools/tcf-agent/tcf-agent_svn.bb
diff --git a/meta/packages/ubootchart/files/sysvinit.patch b/meta/recipes-devtools/ubootchart/files/sysvinit.patch
index de9fb0b17d..de9fb0b17d 100644
--- a/meta/packages/ubootchart/files/sysvinit.patch
+++ b/meta/recipes-devtools/ubootchart/files/sysvinit.patch
diff --git a/meta/packages/ubootchart/files/ubootchart-stop b/meta/recipes-devtools/ubootchart/files/ubootchart-stop
index 3444069c9a..3444069c9a 100644
--- a/meta/packages/ubootchart/files/ubootchart-stop
+++ b/meta/recipes-devtools/ubootchart/files/ubootchart-stop
diff --git a/meta/packages/ubootchart/files/ubootchart.desktop b/meta/recipes-devtools/ubootchart/files/ubootchart.desktop
index 5552b3bc6f..5552b3bc6f 100644
--- a/meta/packages/ubootchart/files/ubootchart.desktop
+++ b/meta/recipes-devtools/ubootchart/files/ubootchart.desktop
diff --git a/meta/packages/ubootchart/ubootchart_svn.bb b/meta/recipes-devtools/ubootchart/ubootchart_svn.bb
index cd292b6943..cd292b6943 100644
--- a/meta/packages/ubootchart/ubootchart_svn.bb
+++ b/meta/recipes-devtools/ubootchart/ubootchart_svn.bb
diff --git a/meta/packages/yaffs2/files/mkyaffs2image.patch b/meta/recipes-devtools/yaffs2/files/mkyaffs2image.patch
index 521f1ba9a0..521f1ba9a0 100644
--- a/meta/packages/yaffs2/files/mkyaffs2image.patch
+++ b/meta/recipes-devtools/yaffs2/files/mkyaffs2image.patch
diff --git a/meta/packages/yaffs2/files/yaffs2-unioob.patch b/meta/recipes-devtools/yaffs2/files/yaffs2-unioob.patch
index c894528ca1..c894528ca1 100644
--- a/meta/packages/yaffs2/files/yaffs2-unioob.patch
+++ b/meta/recipes-devtools/yaffs2/files/yaffs2-unioob.patch
diff --git a/meta/packages/yaffs2/yaffs2-utils.inc b/meta/recipes-devtools/yaffs2/yaffs2-utils.inc
index b25cc3b590..b25cc3b590 100644
--- a/meta/packages/yaffs2/yaffs2-utils.inc
+++ b/meta/recipes-devtools/yaffs2/yaffs2-utils.inc
diff --git a/meta/packages/yaffs2/yaffs2-utils_cvs.bb b/meta/recipes-devtools/yaffs2/yaffs2-utils_cvs.bb
index 6171fe55bd..6171fe55bd 100644
--- a/meta/packages/yaffs2/yaffs2-utils_cvs.bb
+++ b/meta/recipes-devtools/yaffs2/yaffs2-utils_cvs.bb
diff --git a/meta/packages/blktool/blktool_4-6.bb b/meta/recipes-extended/blktool/blktool_4-6.bb
index 3313b039ce..3313b039ce 100644
--- a/meta/packages/blktool/blktool_4-6.bb
+++ b/meta/recipes-extended/blktool/blktool_4-6.bb
diff --git a/meta/packages/bzip2/bzip2-1.0.5/Makefile.am b/meta/recipes-extended/bzip2/bzip2-1.0.5/Makefile.am
index 070d57b243..070d57b243 100644
--- a/meta/packages/bzip2/bzip2-1.0.5/Makefile.am
+++ b/meta/recipes-extended/bzip2/bzip2-1.0.5/Makefile.am
diff --git a/meta/packages/bzip2/bzip2-1.0.5/configure.ac b/meta/recipes-extended/bzip2/bzip2-1.0.5/configure.ac
index 14b1d1809d..14b1d1809d 100644
--- a/meta/packages/bzip2/bzip2-1.0.5/configure.ac
+++ b/meta/recipes-extended/bzip2/bzip2-1.0.5/configure.ac
diff --git a/meta/packages/bzip2/bzip2_1.0.5.bb b/meta/recipes-extended/bzip2/bzip2_1.0.5.bb
index c6339c0676..c6339c0676 100644
--- a/meta/packages/bzip2/bzip2_1.0.5.bb
+++ b/meta/recipes-extended/bzip2/bzip2_1.0.5.bb
diff --git a/meta/packages/devicekit/devicekit-power_014.bb b/meta/recipes-extended/devicekit/devicekit-power_014.bb
index f69a060ef2..f69a060ef2 100644
--- a/meta/packages/devicekit/devicekit-power_014.bb
+++ b/meta/recipes-extended/devicekit/devicekit-power_014.bb
diff --git a/meta/packages/devicekit/devicekit/volatile b/meta/recipes-extended/devicekit/devicekit/volatile
index 1e399642e0..1e399642e0 100644
--- a/meta/packages/devicekit/devicekit/volatile
+++ b/meta/recipes-extended/devicekit/devicekit/volatile
diff --git a/meta/packages/devicekit/devicekit_003.bb b/meta/recipes-extended/devicekit/devicekit_003.bb
index af812935cd..af812935cd 100644
--- a/meta/packages/devicekit/devicekit_003.bb
+++ b/meta/recipes-extended/devicekit/devicekit_003.bb
diff --git a/meta/packages/devicekit/devicekit_git.bb b/meta/recipes-extended/devicekit/devicekit_git.bb
index 74b639f6c1..74b639f6c1 100644
--- a/meta/packages/devicekit/devicekit_git.bb
+++ b/meta/recipes-extended/devicekit/devicekit_git.bb
diff --git a/meta/packages/diffutils/diffutils_2.8.1.bb b/meta/recipes-extended/diffutils/diffutils_2.8.1.bb
index 86b46aafec..86b46aafec 100644
--- a/meta/packages/diffutils/diffutils_2.8.1.bb
+++ b/meta/recipes-extended/diffutils/diffutils_2.8.1.bb
diff --git a/meta/packages/findutils/findutils-4.2.31/gnulib-extension.patch b/meta/recipes-extended/findutils/findutils-4.2.31/gnulib-extension.patch
index 2bc54e9290..2bc54e9290 100644
--- a/meta/packages/findutils/findutils-4.2.31/gnulib-extension.patch
+++ b/meta/recipes-extended/findutils/findutils-4.2.31/gnulib-extension.patch
diff --git a/meta/packages/findutils/findutils-4.4.2/01-27017.patch b/meta/recipes-extended/findutils/findutils-4.4.2/01-27017.patch
index b61f67b12d..b61f67b12d 100644
--- a/meta/packages/findutils/findutils-4.4.2/01-27017.patch
+++ b/meta/recipes-extended/findutils/findutils-4.4.2/01-27017.patch
diff --git a/meta/packages/findutils/findutils-4.4.2/02-28824.patch b/meta/recipes-extended/findutils/findutils-4.4.2/02-28824.patch
index 3469712d90..3469712d90 100644
--- a/meta/packages/findutils/findutils-4.4.2/02-28824.patch
+++ b/meta/recipes-extended/findutils/findutils-4.4.2/02-28824.patch
diff --git a/meta/packages/findutils/findutils-4.4.2/03-28872.patch b/meta/recipes-extended/findutils/findutils-4.4.2/03-28872.patch
index 8bede38920..8bede38920 100644
--- a/meta/packages/findutils/findutils-4.4.2/03-28872.patch
+++ b/meta/recipes-extended/findutils/findutils-4.4.2/03-28872.patch
diff --git a/meta/packages/findutils/findutils.inc b/meta/recipes-extended/findutils/findutils.inc
index 08ca2022ee..08ca2022ee 100644
--- a/meta/packages/findutils/findutils.inc
+++ b/meta/recipes-extended/findutils/findutils.inc
diff --git a/meta/packages/findutils/findutils_4.2.31.bb b/meta/recipes-extended/findutils/findutils_4.2.31.bb
index 2804a3ba3a..2804a3ba3a 100644
--- a/meta/packages/findutils/findutils_4.2.31.bb
+++ b/meta/recipes-extended/findutils/findutils_4.2.31.bb
diff --git a/meta/packages/findutils/findutils_4.4.2.bb b/meta/recipes-extended/findutils/findutils_4.4.2.bb
index 18514f36ea..18514f36ea 100644
--- a/meta/packages/findutils/findutils_4.4.2.bb
+++ b/meta/recipes-extended/findutils/findutils_4.4.2.bb
diff --git a/meta/packages/gperf/gperf.inc b/meta/recipes-extended/gperf/gperf.inc
index a521e0943b..a521e0943b 100644
--- a/meta/packages/gperf/gperf.inc
+++ b/meta/recipes-extended/gperf/gperf.inc
diff --git a/meta/packages/gperf/gperf_3.0.3.bb b/meta/recipes-extended/gperf/gperf_3.0.3.bb
index 5cccdf1adb..5cccdf1adb 100644
--- a/meta/packages/gperf/gperf_3.0.3.bb
+++ b/meta/recipes-extended/gperf/gperf_3.0.3.bb
diff --git a/meta/packages/gperf/gperf_3.0.4.bb b/meta/recipes-extended/gperf/gperf_3.0.4.bb
index ee532c98d8..ee532c98d8 100644
--- a/meta/packages/gperf/gperf_3.0.4.bb
+++ b/meta/recipes-extended/gperf/gperf_3.0.4.bb
diff --git a/meta/packages/grep/grep-2.5.1a/uclibc-fix.patch b/meta/recipes-extended/grep/grep-2.5.1a/uclibc-fix.patch
index 8fc7c4852f..8fc7c4852f 100644
--- a/meta/packages/grep/grep-2.5.1a/uclibc-fix.patch
+++ b/meta/recipes-extended/grep/grep-2.5.1a/uclibc-fix.patch
diff --git a/meta/packages/grep/grep_2.5.1a.bb b/meta/recipes-extended/grep/grep_2.5.1a.bb
index d50d5a374e..d50d5a374e 100644
--- a/meta/packages/grep/grep_2.5.1a.bb
+++ b/meta/recipes-extended/grep/grep_2.5.1a.bb
diff --git a/meta/packages/gzip/gzip-1.3.12/dup-def-fix.patch b/meta/recipes-extended/gzip/gzip-1.3.12/dup-def-fix.patch
index 8308865a25..8308865a25 100644
--- a/meta/packages/gzip/gzip-1.3.12/dup-def-fix.patch
+++ b/meta/recipes-extended/gzip/gzip-1.3.12/dup-def-fix.patch
diff --git a/meta/packages/gzip/gzip-1.3.12/m4-extensions-fix.patch b/meta/recipes-extended/gzip/gzip-1.3.12/m4-extensions-fix.patch
index 927377286f..927377286f 100644
--- a/meta/packages/gzip/gzip-1.3.12/m4-extensions-fix.patch
+++ b/meta/recipes-extended/gzip/gzip-1.3.12/m4-extensions-fix.patch
diff --git a/meta/packages/gzip/gzip.inc b/meta/recipes-extended/gzip/gzip.inc
index 28df4d4a5d..28df4d4a5d 100644
--- a/meta/packages/gzip/gzip.inc
+++ b/meta/recipes-extended/gzip/gzip.inc
diff --git a/meta/packages/gzip/gzip_1.3.12.bb b/meta/recipes-extended/gzip/gzip_1.3.12.bb
index c111e2e24d..c111e2e24d 100644
--- a/meta/packages/gzip/gzip_1.3.12.bb
+++ b/meta/recipes-extended/gzip/gzip_1.3.12.bb
diff --git a/meta/packages/gzip/gzip_1.4.bb b/meta/recipes-extended/gzip/gzip_1.4.bb
index 93020ba50b..93020ba50b 100644
--- a/meta/packages/gzip/gzip_1.4.bb
+++ b/meta/recipes-extended/gzip/gzip_1.4.bb
diff --git a/meta/packages/hdparm/hdparm-6.3/bswap.patch b/meta/recipes-extended/hdparm/hdparm-6.3/bswap.patch
index 37fbcb7b38..37fbcb7b38 100644
--- a/meta/packages/hdparm/hdparm-6.3/bswap.patch
+++ b/meta/recipes-extended/hdparm/hdparm-6.3/bswap.patch
diff --git a/meta/packages/hdparm/hdparm-6.3/uclibc.patch b/meta/recipes-extended/hdparm/hdparm-6.3/uclibc.patch
index 495d7491bb..495d7491bb 100644
--- a/meta/packages/hdparm/hdparm-6.3/uclibc.patch
+++ b/meta/recipes-extended/hdparm/hdparm-6.3/uclibc.patch
diff --git a/meta/packages/hdparm/hdparm_6.3.bb b/meta/recipes-extended/hdparm/hdparm_6.3.bb
index 94d1e6e9bf..94d1e6e9bf 100644
--- a/meta/packages/hdparm/hdparm_6.3.bb
+++ b/meta/recipes-extended/hdparm/hdparm_6.3.bb
diff --git a/meta/packages/libidn/libidn_0.6.14.bb b/meta/recipes-extended/libidn/libidn_0.6.14.bb
index 17bb103d9e..17bb103d9e 100644
--- a/meta/packages/libidn/libidn_0.6.14.bb
+++ b/meta/recipes-extended/libidn/libidn_0.6.14.bb
diff --git a/meta/packages/libidn/libidn_1.19.bb b/meta/recipes-extended/libidn/libidn_1.19.bb
index 2e29ade14c..2e29ade14c 100644
--- a/meta/packages/libidn/libidn_1.19.bb
+++ b/meta/recipes-extended/libidn/libidn_1.19.bb
diff --git a/meta/packages/lsof/lsof_4.83.bb b/meta/recipes-extended/lsof/lsof_4.83.bb
index 078da64305..078da64305 100644
--- a/meta/packages/lsof/lsof_4.83.bb
+++ b/meta/recipes-extended/lsof/lsof_4.83.bb
diff --git a/meta/packages/pam/libpam-1.1.1/99_pam b/meta/recipes-extended/pam/libpam-1.1.1/99_pam
index 97e990d10b..97e990d10b 100644
--- a/meta/packages/pam/libpam-1.1.1/99_pam
+++ b/meta/recipes-extended/pam/libpam-1.1.1/99_pam
diff --git a/meta/packages/pam/libpam-1.1.1/disable_crossbinary.patch b/meta/recipes-extended/pam/libpam-1.1.1/disable_crossbinary.patch
index 43359b08fe..43359b08fe 100644
--- a/meta/packages/pam/libpam-1.1.1/disable_crossbinary.patch
+++ b/meta/recipes-extended/pam/libpam-1.1.1/disable_crossbinary.patch
diff --git a/meta/packages/pam/libpam-1.1.1/pam.d/common-account b/meta/recipes-extended/pam/libpam-1.1.1/pam.d/common-account
index 316b17337b..316b17337b 100644
--- a/meta/packages/pam/libpam-1.1.1/pam.d/common-account
+++ b/meta/recipes-extended/pam/libpam-1.1.1/pam.d/common-account
diff --git a/meta/packages/pam/libpam-1.1.1/pam.d/common-auth b/meta/recipes-extended/pam/libpam-1.1.1/pam.d/common-auth
index 460b69f198..460b69f198 100644
--- a/meta/packages/pam/libpam-1.1.1/pam.d/common-auth
+++ b/meta/recipes-extended/pam/libpam-1.1.1/pam.d/common-auth
diff --git a/meta/packages/pam/libpam-1.1.1/pam.d/common-password b/meta/recipes-extended/pam/libpam-1.1.1/pam.d/common-password
index 3896057328..3896057328 100644
--- a/meta/packages/pam/libpam-1.1.1/pam.d/common-password
+++ b/meta/recipes-extended/pam/libpam-1.1.1/pam.d/common-password
diff --git a/meta/packages/pam/libpam-1.1.1/pam.d/common-session b/meta/recipes-extended/pam/libpam-1.1.1/pam.d/common-session
index a594dd9d90..a594dd9d90 100644
--- a/meta/packages/pam/libpam-1.1.1/pam.d/common-session
+++ b/meta/recipes-extended/pam/libpam-1.1.1/pam.d/common-session
diff --git a/meta/packages/pam/libpam-1.1.1/pam.d/common-session-noninteractive b/meta/recipes-extended/pam/libpam-1.1.1/pam.d/common-session-noninteractive
index b110bb2b49..b110bb2b49 100644
--- a/meta/packages/pam/libpam-1.1.1/pam.d/common-session-noninteractive
+++ b/meta/recipes-extended/pam/libpam-1.1.1/pam.d/common-session-noninteractive
diff --git a/meta/packages/pam/libpam-1.1.1/pam.d/other b/meta/recipes-extended/pam/libpam-1.1.1/pam.d/other
index 6e40cd0c02..6e40cd0c02 100644
--- a/meta/packages/pam/libpam-1.1.1/pam.d/other
+++ b/meta/recipes-extended/pam/libpam-1.1.1/pam.d/other
diff --git a/meta/packages/pam/libpam_1.1.1.bb b/meta/recipes-extended/pam/libpam_1.1.1.bb
index 536a0f5ce9..536a0f5ce9 100644
--- a/meta/packages/pam/libpam_1.1.1.bb
+++ b/meta/recipes-extended/pam/libpam_1.1.1.bb
diff --git a/meta/packages/parted/parted-1.9.0/no_check.patch b/meta/recipes-extended/parted/parted-1.9.0/no_check.patch
index 24a328ceea..24a328ceea 100644
--- a/meta/packages/parted/parted-1.9.0/no_check.patch
+++ b/meta/recipes-extended/parted/parted-1.9.0/no_check.patch
diff --git a/meta/packages/parted/parted-1.9.0/syscalls.patch b/meta/recipes-extended/parted/parted-1.9.0/syscalls.patch
index 6be49968f3..6be49968f3 100644
--- a/meta/packages/parted/parted-1.9.0/syscalls.patch
+++ b/meta/recipes-extended/parted/parted-1.9.0/syscalls.patch
diff --git a/meta/packages/parted/parted_1.9.0.bb b/meta/recipes-extended/parted/parted_1.9.0.bb
index f2a265187f..f2a265187f 100644
--- a/meta/packages/parted/parted_1.9.0.bb
+++ b/meta/recipes-extended/parted/parted_1.9.0.bb
diff --git a/meta/packages/polkit/polkit-gnome_0.96.bb b/meta/recipes-extended/polkit/polkit-gnome_0.96.bb
index e103e631c8..e103e631c8 100644
--- a/meta/packages/polkit/polkit-gnome_0.96.bb
+++ b/meta/recipes-extended/polkit/polkit-gnome_0.96.bb
diff --git a/meta/packages/polkit/polkit_0.96.bb b/meta/recipes-extended/polkit/polkit_0.96.bb
index e6e030b19a..e6e030b19a 100644
--- a/meta/packages/polkit/polkit_0.96.bb
+++ b/meta/recipes-extended/polkit/polkit_0.96.bb
diff --git a/meta/packages/psmisc/files/libintl-link.patch b/meta/recipes-extended/psmisc/files/libintl-link.patch
index d9cdd90d71..d9cdd90d71 100644
--- a/meta/packages/psmisc/files/libintl-link.patch
+++ b/meta/recipes-extended/psmisc/files/libintl-link.patch
diff --git a/meta/packages/psmisc/psmisc.inc b/meta/recipes-extended/psmisc/psmisc.inc
index d489891d64..d489891d64 100644
--- a/meta/packages/psmisc/psmisc.inc
+++ b/meta/recipes-extended/psmisc/psmisc.inc
diff --git a/meta/packages/psmisc/psmisc_22.2.bb b/meta/recipes-extended/psmisc/psmisc_22.2.bb
index 62327fa4d6..62327fa4d6 100644
--- a/meta/packages/psmisc/psmisc_22.2.bb
+++ b/meta/recipes-extended/psmisc/psmisc_22.2.bb
diff --git a/meta/packages/sed/sed-4.1.2/fix_return_type.patch b/meta/recipes-extended/sed/sed-4.1.2/fix_return_type.patch
index d91960b3ee..d91960b3ee 100644
--- a/meta/packages/sed/sed-4.1.2/fix_return_type.patch
+++ b/meta/recipes-extended/sed/sed-4.1.2/fix_return_type.patch
diff --git a/meta/packages/sed/sed_4.1.2.bb b/meta/recipes-extended/sed/sed_4.1.2.bb
index 09bd3e18cc..09bd3e18cc 100644
--- a/meta/packages/sed/sed_4.1.2.bb
+++ b/meta/recipes-extended/sed/sed_4.1.2.bb
diff --git a/meta/packages/sudo/files/autofoo.patch b/meta/recipes-extended/sudo/files/autofoo.patch
index 4f24737610..4f24737610 100644
--- a/meta/packages/sudo/files/autofoo.patch
+++ b/meta/recipes-extended/sudo/files/autofoo.patch
diff --git a/meta/packages/sudo/files/noexec-link.patch b/meta/recipes-extended/sudo/files/noexec-link.patch
index e0d35d0e25..e0d35d0e25 100644
--- a/meta/packages/sudo/files/noexec-link.patch
+++ b/meta/recipes-extended/sudo/files/noexec-link.patch
diff --git a/meta/packages/sudo/files/nostrip.patch b/meta/recipes-extended/sudo/files/nostrip.patch
index 3c71b4fd86..3c71b4fd86 100644
--- a/meta/packages/sudo/files/nostrip.patch
+++ b/meta/recipes-extended/sudo/files/nostrip.patch
diff --git a/meta/packages/sudo/site/bit-32 b/meta/recipes-extended/sudo/site/bit-32
index 9b7ca5c81b..9b7ca5c81b 100644
--- a/meta/packages/sudo/site/bit-32
+++ b/meta/recipes-extended/sudo/site/bit-32
diff --git a/meta/packages/sudo/site/bit-64 b/meta/recipes-extended/sudo/site/bit-64
index 05846ff0aa..05846ff0aa 100644
--- a/meta/packages/sudo/site/bit-64
+++ b/meta/recipes-extended/sudo/site/bit-64
diff --git a/meta/packages/sudo/sudo.inc b/meta/recipes-extended/sudo/sudo.inc
index 2add94bef4..2add94bef4 100644
--- a/meta/packages/sudo/sudo.inc
+++ b/meta/recipes-extended/sudo/sudo.inc
diff --git a/meta/packages/sudo/sudo_1.7.2p7.bb b/meta/recipes-extended/sudo/sudo_1.7.2p7.bb
index 3dd6cdf059..3dd6cdf059 100644
--- a/meta/packages/sudo/sudo_1.7.2p7.bb
+++ b/meta/recipes-extended/sudo/sudo_1.7.2p7.bb
diff --git a/meta/packages/tcp-wrappers/tcp-wrappers-7.6/00_man_quoting.diff b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/00_man_quoting.diff
index ff60a843e4..ff60a843e4 100644
--- a/meta/packages/tcp-wrappers/tcp-wrappers-7.6/00_man_quoting.diff
+++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/00_man_quoting.diff
diff --git a/meta/packages/tcp-wrappers/tcp-wrappers-7.6/01_man_portability.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/01_man_portability.patch
index 4963f82eb8..4963f82eb8 100644
--- a/meta/packages/tcp-wrappers/tcp-wrappers-7.6/01_man_portability.patch
+++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/01_man_portability.patch
diff --git a/meta/packages/tcp-wrappers/tcp-wrappers-7.6/05_wildcard_matching.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/05_wildcard_matching.patch
index a168f6d5a5..a168f6d5a5 100644
--- a/meta/packages/tcp-wrappers/tcp-wrappers-7.6/05_wildcard_matching.patch
+++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/05_wildcard_matching.patch
diff --git a/meta/packages/tcp-wrappers/tcp-wrappers-7.6/06_fix_gethostbyname.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/06_fix_gethostbyname.patch
index d06aaef13b..d06aaef13b 100644
--- a/meta/packages/tcp-wrappers/tcp-wrappers-7.6/06_fix_gethostbyname.patch
+++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/06_fix_gethostbyname.patch
diff --git a/meta/packages/tcp-wrappers/tcp-wrappers-7.6/10_usagi-ipv6.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/10_usagi-ipv6.patch
index 5c8be5c27c..5c8be5c27c 100644
--- a/meta/packages/tcp-wrappers/tcp-wrappers-7.6/10_usagi-ipv6.patch
+++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/10_usagi-ipv6.patch
diff --git a/meta/packages/tcp-wrappers/tcp-wrappers-7.6/11_tcpd_blacklist.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/11_tcpd_blacklist.patch
index 0238e35208..0238e35208 100644
--- a/meta/packages/tcp-wrappers/tcp-wrappers-7.6/11_tcpd_blacklist.patch
+++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/11_tcpd_blacklist.patch
diff --git a/meta/packages/tcp-wrappers/tcp-wrappers-7.6/11_usagi_fix.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/11_usagi_fix.patch
index 88a2b5e43b..88a2b5e43b 100644
--- a/meta/packages/tcp-wrappers/tcp-wrappers-7.6/11_usagi_fix.patch
+++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/11_usagi_fix.patch
diff --git a/meta/packages/tcp-wrappers/tcp-wrappers-7.6/12_makefile_config.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/12_makefile_config.patch
index 60ca594bee..60ca594bee 100644
--- a/meta/packages/tcp-wrappers/tcp-wrappers-7.6/12_makefile_config.patch
+++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/12_makefile_config.patch
diff --git a/meta/packages/tcp-wrappers/tcp-wrappers-7.6/13_shlib_weaksym.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/13_shlib_weaksym.patch
index c089b33257..c089b33257 100644
--- a/meta/packages/tcp-wrappers/tcp-wrappers-7.6/13_shlib_weaksym.patch
+++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/13_shlib_weaksym.patch
diff --git a/meta/packages/tcp-wrappers/tcp-wrappers-7.6/14_cidr_support.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/14_cidr_support.patch
index 0e1ecf5b4a..0e1ecf5b4a 100644
--- a/meta/packages/tcp-wrappers/tcp-wrappers-7.6/14_cidr_support.patch
+++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/14_cidr_support.patch
diff --git a/meta/packages/tcp-wrappers/tcp-wrappers-7.6/15_match_clarify.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/15_match_clarify.patch
index 913ed987d6..913ed987d6 100644
--- a/meta/packages/tcp-wrappers/tcp-wrappers-7.6/15_match_clarify.patch
+++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/15_match_clarify.patch
diff --git a/meta/packages/tcp-wrappers/tcp-wrappers-7.6/expand_remote_port.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/expand_remote_port.patch
index e35fc7ecd9..e35fc7ecd9 100644
--- a/meta/packages/tcp-wrappers/tcp-wrappers-7.6/expand_remote_port.patch
+++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/expand_remote_port.patch
diff --git a/meta/packages/tcp-wrappers/tcp-wrappers-7.6/have_strerror.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/have_strerror.patch
index 31c2b92278..31c2b92278 100644
--- a/meta/packages/tcp-wrappers/tcp-wrappers-7.6/have_strerror.patch
+++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/have_strerror.patch
diff --git a/meta/packages/tcp-wrappers/tcp-wrappers-7.6/ldflags.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/ldflags.patch
index 2e897650e0..2e897650e0 100644
--- a/meta/packages/tcp-wrappers/tcp-wrappers-7.6/ldflags.patch
+++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/ldflags.patch
diff --git a/meta/packages/tcp-wrappers/tcp-wrappers-7.6/man_fromhost.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/man_fromhost.patch
index afaa9c8ac3..afaa9c8ac3 100644
--- a/meta/packages/tcp-wrappers/tcp-wrappers-7.6/man_fromhost.patch
+++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/man_fromhost.patch
diff --git a/meta/packages/tcp-wrappers/tcp-wrappers-7.6/restore_sigalarm.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/restore_sigalarm.patch
index ece7da35fe..ece7da35fe 100644
--- a/meta/packages/tcp-wrappers/tcp-wrappers-7.6/restore_sigalarm.patch
+++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/restore_sigalarm.patch
diff --git a/meta/packages/tcp-wrappers/tcp-wrappers-7.6/rfc931.diff b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/rfc931.diff
index a926d0edfd..a926d0edfd 100644
--- a/meta/packages/tcp-wrappers/tcp-wrappers-7.6/rfc931.diff
+++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/rfc931.diff
diff --git a/meta/packages/tcp-wrappers/tcp-wrappers-7.6/safe_finger.8 b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/safe_finger.8
index 875616b9ea..875616b9ea 100644
--- a/meta/packages/tcp-wrappers/tcp-wrappers-7.6/safe_finger.8
+++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/safe_finger.8
diff --git a/meta/packages/tcp-wrappers/tcp-wrappers-7.6/safe_finger.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/safe_finger.patch
index 5c8c9a1548..5c8c9a1548 100644
--- a/meta/packages/tcp-wrappers/tcp-wrappers-7.6/safe_finger.patch
+++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/safe_finger.patch
diff --git a/meta/packages/tcp-wrappers/tcp-wrappers-7.6/sig_fix.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/sig_fix.patch
index f286605bfd..f286605bfd 100644
--- a/meta/packages/tcp-wrappers/tcp-wrappers-7.6/sig_fix.patch
+++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/sig_fix.patch
diff --git a/meta/packages/tcp-wrappers/tcp-wrappers-7.6/siglongjmp.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/siglongjmp.patch
index 71be340a07..71be340a07 100644
--- a/meta/packages/tcp-wrappers/tcp-wrappers-7.6/siglongjmp.patch
+++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/siglongjmp.patch
diff --git a/meta/packages/tcp-wrappers/tcp-wrappers-7.6/size_t.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/size_t.patch
index 4db40f4c7b..4db40f4c7b 100644
--- a/meta/packages/tcp-wrappers/tcp-wrappers-7.6/size_t.patch
+++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/size_t.patch
diff --git a/meta/packages/tcp-wrappers/tcp-wrappers-7.6/tcpdchk_libwrapped.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/tcpdchk_libwrapped.patch
index 3beae39306..3beae39306 100644
--- a/meta/packages/tcp-wrappers/tcp-wrappers-7.6/tcpdchk_libwrapped.patch
+++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/tcpdchk_libwrapped.patch
diff --git a/meta/packages/tcp-wrappers/tcp-wrappers-7.6/try-from.8 b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/try-from.8
index 9c8f30543e..9c8f30543e 100644
--- a/meta/packages/tcp-wrappers/tcp-wrappers-7.6/try-from.8
+++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/try-from.8
diff --git a/meta/packages/tcp-wrappers/tcp-wrappers_7.6.bb b/meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb
index 308a8b63b4..308a8b63b4 100644
--- a/meta/packages/tcp-wrappers/tcp-wrappers_7.6.bb
+++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb
diff --git a/meta/packages/tzcode/tzcode-native_2009r.bb b/meta/recipes-extended/tzcode/tzcode-native_2009r.bb
index c9a213b4f8..c9a213b4f8 100644
--- a/meta/packages/tzcode/tzcode-native_2009r.bb
+++ b/meta/recipes-extended/tzcode/tzcode-native_2009r.bb
diff --git a/meta/packages/tzdata/tzdata_2010j.bb b/meta/recipes-extended/tzdata/tzdata_2010j.bb
index 97eb1173c1..97eb1173c1 100644
--- a/meta/packages/tzdata/tzdata_2010j.bb
+++ b/meta/recipes-extended/tzdata/tzdata_2010j.bb
diff --git a/meta/packages/unzip/unzip_6.0.bb b/meta/recipes-extended/unzip/unzip_6.0.bb
index 069dfb8781..069dfb8781 100644
--- a/meta/packages/unzip/unzip_6.0.bb
+++ b/meta/recipes-extended/unzip/unzip_6.0.bb
diff --git a/meta/packages/watchdog/watchdog_5.9.bb b/meta/recipes-extended/watchdog/watchdog_5.9.bb
index c768077f1d..c768077f1d 100644
--- a/meta/packages/watchdog/watchdog_5.9.bb
+++ b/meta/recipes-extended/watchdog/watchdog_5.9.bb
diff --git a/meta/packages/zile/files/for_build.patch b/meta/recipes-extended/zile/files/for_build.patch
index 96380fa220..96380fa220 100644
--- a/meta/packages/zile/files/for_build.patch
+++ b/meta/recipes-extended/zile/files/for_build.patch
diff --git a/meta/packages/zile/zile_1.7+2.0beta6.bb b/meta/recipes-extended/zile/zile_1.7+2.0beta6.bb
index 74d832eef3..74d832eef3 100644
--- a/meta/packages/zile/zile_1.7+2.0beta6.bb
+++ b/meta/recipes-extended/zile/zile_1.7+2.0beta6.bb
diff --git a/meta/packages/zip/zip.inc b/meta/recipes-extended/zip/zip.inc
index 9550447264..9550447264 100644
--- a/meta/packages/zip/zip.inc
+++ b/meta/recipes-extended/zip/zip.inc
diff --git a/meta/packages/zip/zip_3.0.bb b/meta/recipes-extended/zip/zip_3.0.bb
index c5df637a38..c5df637a38 100644
--- a/meta/packages/zip/zip_3.0.bb
+++ b/meta/recipes-extended/zip/zip_3.0.bb
diff --git a/meta/packages/libffi/libffi_3.0.8.bb b/meta/recipes-gnome/libffi/libffi_3.0.8.bb
index 06106279b0..06106279b0 100644
--- a/meta/packages/libffi/libffi_3.0.8.bb
+++ b/meta/recipes-gnome/libffi/libffi_3.0.8.bb
diff --git a/meta/packages/libgsf/libgsf_1.14.5.bb b/meta/recipes-gnome/libgsf/libgsf_1.14.5.bb
index 10b6390722..10b6390722 100644
--- a/meta/packages/libgsf/libgsf_1.14.5.bb
+++ b/meta/recipes-gnome/libgsf/libgsf_1.14.5.bb
diff --git a/meta/packages/libgtkstylus/files/gtkstylus.sh b/meta/recipes-gnome/libgtkstylus/files/gtkstylus.sh
index b1302ede0e..b1302ede0e 100644
--- a/meta/packages/libgtkstylus/files/gtkstylus.sh
+++ b/meta/recipes-gnome/libgtkstylus/files/gtkstylus.sh
diff --git a/meta/packages/libgtkstylus/libgtkstylus_0.5.bb b/meta/recipes-gnome/libgtkstylus/libgtkstylus_0.5.bb
index f614048a16..f614048a16 100644
--- a/meta/packages/libgtkstylus/libgtkstylus_0.5.bb
+++ b/meta/recipes-gnome/libgtkstylus/libgtkstylus_0.5.bb
diff --git a/meta/packages/librsvg/librsvg_2.18.2.bb b/meta/recipes-gnome/librsvg/librsvg_2.18.2.bb
index fb68c8ba70..fb68c8ba70 100644
--- a/meta/packages/librsvg/librsvg_2.18.2.bb
+++ b/meta/recipes-gnome/librsvg/librsvg_2.18.2.bb
diff --git a/meta/packages/librsvg/librsvg_2.22.3.bb b/meta/recipes-gnome/librsvg/librsvg_2.22.3.bb
index fb68c8ba70..fb68c8ba70 100644
--- a/meta/packages/librsvg/librsvg_2.22.3.bb
+++ b/meta/recipes-gnome/librsvg/librsvg_2.22.3.bb
diff --git a/meta/packages/librsvg/librsvg_2.26.3.bb b/meta/recipes-gnome/librsvg/librsvg_2.26.3.bb
index 41e23b1d7d..41e23b1d7d 100644
--- a/meta/packages/librsvg/librsvg_2.26.3.bb
+++ b/meta/recipes-gnome/librsvg/librsvg_2.26.3.bb
diff --git a/meta/packages/wv/wv-1.2.0/pkgconfig.patch b/meta/recipes-gnome/wv/wv-1.2.0/pkgconfig.patch
index 136d89341f..136d89341f 100644
--- a/meta/packages/wv/wv-1.2.0/pkgconfig.patch
+++ b/meta/recipes-gnome/wv/wv-1.2.0/pkgconfig.patch
diff --git a/meta/packages/wv/wv_1.2.0.bb b/meta/recipes-gnome/wv/wv_1.2.0.bb
index c4c115b90e..c4c115b90e 100644
--- a/meta/packages/wv/wv_1.2.0.bb
+++ b/meta/recipes-gnome/wv/wv_1.2.0.bb
diff --git a/meta/recipes-graphics/clutter/clutter-helix.inc b/meta/recipes-graphics/clutter/clutter-helix.inc
deleted file mode 100644
index 6bbbb244d7..0000000000
--- a/meta/recipes-graphics/clutter/clutter-helix.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-DESCRIPTION = "Clutter Helix"
-HOMEPAGE = "http://www.clutter-project.org/"
-LICENSE = "LGPL"
-
-DEPENDS = "helix-libs"
-
-FILESPATH = "${FILE_DIRNAME}/clutter-helix"
-
-COMPATIBLE_HOST = '(x86_64|i.86.*)-linux'
-
-PACKAGES =+ "${PN}-examples"
-FILES_${PN}-examples = "${bindir}/video-player ${bindir}/audio-player"
-
-inherit autotools pkgconfig gtk-doc
-
diff --git a/meta/recipes-graphics/clutter/clutter-helix_git.bb b/meta/recipes-graphics/clutter/clutter-helix_git.bb
deleted file mode 100644
index 1c272306bf..0000000000
--- a/meta/recipes-graphics/clutter/clutter-helix_git.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require clutter-helix.inc
-
-PV = "0.8.0+git${SRCPV}"
-PR = "r0"
-
-SRC_URI = "git://git.clutter-project.org/clutter-helix.git;protocol=git"
-
-S = "${WORKDIR}/git"
diff --git a/meta/recipes-graphics/clutter/clutter-mozembed.inc b/meta/recipes-graphics/clutter/clutter-mozembed.inc
deleted file mode 100644
index 72c9412d04..0000000000
--- a/meta/recipes-graphics/clutter/clutter-mozembed.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-DESCRIPTION = "Clutter Mozilla Embedded"
-HOMEPAGE = "http://www.clutter-project.org/"
-LICENSE = "LGPL"
-
-DEPENDS = "mozilla-headless mozilla-headless-services clutter-1.0"
-
-FILESPATH = "${FILE_DIRNAME}/clutter-mozembed"
-
-FILES_${PN} =+ "${datadir}/cluttermozembed/chrome/"
-
-EXTRA_OECONF = "--enable-plugins"
-
-inherit autotools pkgconfig gtk-doc
-
diff --git a/meta/recipes-graphics/clutter/clutter-mozembed_git.bb b/meta/recipes-graphics/clutter/clutter-mozembed_git.bb
deleted file mode 100644
index e2da2d6a7d..0000000000
--- a/meta/recipes-graphics/clutter/clutter-mozembed_git.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-require clutter-mozembed.inc
-
-PV = "0.8.0+git${SRCPV}"
-PR = "r7"
-
-SRC_URI = "git://git.clutter-project.org/clutter-mozembed.git;protocol=git \
-           file://link-with-g++-da7632f3e2c8d1a70ab01cc7adb63760d8718b41.patch;patch=1;rev=da7632f3e2c8d1a70ab01cc7adb63760d8718b41 \
-           file://link-with-g++.patch;patch=1;notrev=da7632f3e2c8d1a70ab01cc7adb63760d8718b41"
-S = "${WORKDIR}/git"
-
-do_configure_prepend () {
-        touch ${S}/clutter-mozembed/dummy.cpp
-        touch ${S}/clutter-mozembed/dummy2.cpp
-}
diff --git a/meta/packages/fstests/fstests_svn.bb b/meta/recipes-graphics/fstests/fstests_svn.bb
index b4075212ee..b4075212ee 100644
--- a/meta/packages/fstests/fstests_svn.bb
+++ b/meta/recipes-graphics/fstests/fstests_svn.bb
diff --git a/meta/packages/libsdl/files/acinclude.m4 b/meta/recipes-graphics/libsdl/files/acinclude.m4
index ca2df9d5e5..ca2df9d5e5 100644
--- a/meta/packages/libsdl/files/acinclude.m4
+++ b/meta/recipes-graphics/libsdl/files/acinclude.m4
diff --git a/meta/packages/libsdl/files/configure_tweak.patch b/meta/recipes-graphics/libsdl/files/configure_tweak.patch
index 90a2888e57..90a2888e57 100644
--- a/meta/packages/libsdl/files/configure_tweak.patch
+++ b/meta/recipes-graphics/libsdl/files/configure_tweak.patch
diff --git a/meta/packages/libsdl/files/directfb_obsolete_calls.patch b/meta/recipes-graphics/libsdl/files/directfb_obsolete_calls.patch
index f3f422cde3..f3f422cde3 100644
--- a/meta/packages/libsdl/files/directfb_obsolete_calls.patch
+++ b/meta/recipes-graphics/libsdl/files/directfb_obsolete_calls.patch
diff --git a/meta/packages/libsdl/files/extra-keys.patch b/meta/recipes-graphics/libsdl/files/extra-keys.patch
index f12f0c7efb..f12f0c7efb 100644
--- a/meta/packages/libsdl/files/extra-keys.patch
+++ b/meta/recipes-graphics/libsdl/files/extra-keys.patch
diff --git a/meta/packages/libsdl/files/kernel-asm-page.patch b/meta/recipes-graphics/libsdl/files/kernel-asm-page.patch
index 42bceadfdc..42bceadfdc 100644
--- a/meta/packages/libsdl/files/kernel-asm-page.patch
+++ b/meta/recipes-graphics/libsdl/files/kernel-asm-page.patch
diff --git a/meta/packages/libsdl/libsdl-nativesdk_1.2.11.bb b/meta/recipes-graphics/libsdl/libsdl-nativesdk_1.2.11.bb
index 633a4c284b..633a4c284b 100644
--- a/meta/packages/libsdl/libsdl-nativesdk_1.2.11.bb
+++ b/meta/recipes-graphics/libsdl/libsdl-nativesdk_1.2.11.bb
diff --git a/meta/packages/pong-clock/pong-clock/pong-clock-no-flicker.c b/meta/recipes-graphics/pong-clock/pong-clock/pong-clock-no-flicker.c
index 41cebc58a7..41cebc58a7 100644
--- a/meta/packages/pong-clock/pong-clock/pong-clock-no-flicker.c
+++ b/meta/recipes-graphics/pong-clock/pong-clock/pong-clock-no-flicker.c
diff --git a/meta/packages/pong-clock/pong-clock_1.0.bb b/meta/recipes-graphics/pong-clock/pong-clock_1.0.bb
index 571a90dbd3..571a90dbd3 100644
--- a/meta/packages/pong-clock/pong-clock_1.0.bb
+++ b/meta/recipes-graphics/pong-clock/pong-clock_1.0.bb
diff --git a/meta/packages/x11vnc/x11vnc_0.9.3.bb b/meta/recipes-graphics/x11vnc/x11vnc_0.9.3.bb
index 5269ff3091..5269ff3091 100644
--- a/meta/packages/x11vnc/x11vnc_0.9.3.bb
+++ b/meta/recipes-graphics/x11vnc/x11vnc_0.9.3.bb
diff --git a/meta/packages/xrestop/xrestop_0.4.bb b/meta/recipes-graphics/xrestop/xrestop_0.4.bb
index 1fd24503a7..1fd24503a7 100644
--- a/meta/packages/xrestop/xrestop_0.4.bb
+++ b/meta/recipes-graphics/xrestop/xrestop_0.4.bb
diff --git a/meta/packages/xvideo-tests/xvideo-tests_svn.bb b/meta/recipes-graphics/xvideo-tests/xvideo-tests_svn.bb
index 0aa861f688..0aa861f688 100644
--- a/meta/packages/xvideo-tests/xvideo-tests_svn.bb
+++ b/meta/recipes-graphics/xvideo-tests/xvideo-tests_svn.bb
diff --git a/meta/packages/fuse/fuse-2.7.2/not-run-updaterc.d-on-host.patch b/meta/recipes-kernel/fuse/fuse-2.7.2/not-run-updaterc.d-on-host.patch
index 903a8baa9e..903a8baa9e 100644
--- a/meta/packages/fuse/fuse-2.7.2/not-run-updaterc.d-on-host.patch
+++ b/meta/recipes-kernel/fuse/fuse-2.7.2/not-run-updaterc.d-on-host.patch
diff --git a/meta/packages/fuse/fuse.inc b/meta/recipes-kernel/fuse/fuse.inc
index c6755ac7c7..c6755ac7c7 100644
--- a/meta/packages/fuse/fuse.inc
+++ b/meta/recipes-kernel/fuse/fuse.inc
diff --git a/meta/packages/fuse/fuse_2.7.2.bb b/meta/recipes-kernel/fuse/fuse_2.7.2.bb
index d284a25f5f..d284a25f5f 100644
--- a/meta/packages/fuse/fuse_2.7.2.bb
+++ b/meta/recipes-kernel/fuse/fuse_2.7.2.bb
diff --git a/meta/packages/libomxil/libomxil_0.3.3.bb b/meta/recipes-multimedia/libomxil/libomxil_0.3.3.bb
index 016aed5149..016aed5149 100644
--- a/meta/packages/libomxil/libomxil_0.3.3.bb
+++ b/meta/recipes-multimedia/libomxil/libomxil_0.3.3.bb
diff --git a/meta/packages/speex/speex_1.2rc1.bb b/meta/recipes-multimedia/speex/speex_1.2rc1.bb
index 6f1b133f24..6f1b133f24 100644
--- a/meta/packages/speex/speex_1.2rc1.bb
+++ b/meta/recipes-multimedia/speex/speex_1.2rc1.bb
diff --git a/meta/recipes-qt/qmake/qmake2-cross/0001-fix-mkspecs.patch b/meta/recipes-qt/qmake/qmake2-cross/0001-fix-mkspecs.patch
deleted file mode 100644
index 4ebc3dea8d..0000000000
--- a/meta/recipes-qt/qmake/qmake2-cross/0001-fix-mkspecs.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-From 594157753a24d0575aaf948dc0e9500f6bdb2178 Mon Sep 17 00:00:00 2001
-From: Michael Krelin <hacker@klever.net>
-Date: Sat, 2 Jun 2007 16:39:58 +0200
-Subject: [PATCH] fix mkspecs
-
----
- mkspecs/common/g++.conf   |   18 +++++++++---------
- mkspecs/common/linux.conf |   26 +++++++++++++-------------
- 2 files changed, 22 insertions(+), 22 deletions(-)
-
-Index: qt-embedded-linux-opensource-src-4.5.3/mkspecs/common/g++.conf
-===================================================================
---- qt-embedded-linux-opensource-src-4.5.3.orig/mkspecs/common/g++.conf
-+++ qt-embedded-linux-opensource-src-4.5.3/mkspecs/common/g++.conf
-@@ -2,12 +2,12 @@
- # qmake configuration for common gcc
- #
- 
--QMAKE_CC               = gcc
--QMAKE_CFLAGS           += -pipe
-+QMAKE_CC               = $(OE_QMAKE_CC)
-+QMAKE_CFLAGS           += -pipe $(OE_QMAKE_CFLAGS)
- QMAKE_CFLAGS_DEPS      += -M
- QMAKE_CFLAGS_WARN_ON   += -Wall -W
- QMAKE_CFLAGS_WARN_OFF  += -w
--QMAKE_CFLAGS_RELEASE   += -O2
-+QMAKE_CFLAGS_RELEASE   += -O2 
- QMAKE_CFLAGS_DEBUG     += -g
- QMAKE_CFLAGS_SHLIB     += -fPIC
- QMAKE_CFLAGS_STATIC_LIB        += -fPIC
-@@ -16,8 +16,8 @@ QMAKE_CFLAGS_HIDESYMS   += -fvisibility=
- QMAKE_CFLAGS_PRECOMPILE += -x c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
- QMAKE_CFLAGS_USE_PRECOMPILE += -include ${QMAKE_PCH_OUTPUT_BASE}
- 
--QMAKE_CXX              = g++
--QMAKE_CXXFLAGS         += $$QMAKE_CFLAGS
-+QMAKE_CXX              = $(OE_QMAKE_CXX)
-+QMAKE_CXXFLAGS         += $$QMAKE_CFLAGS $(OE_QMAKE_CXXFLAGS)
- QMAKE_CXXFLAGS_DEPS    += $$QMAKE_CFLAGS_DEPS
- QMAKE_CXXFLAGS_WARN_ON += $$QMAKE_CFLAGS_WARN_ON
- QMAKE_CXXFLAGS_WARN_OFF        += $$QMAKE_CFLAGS_WARN_OFF
-@@ -30,11 +30,11 @@ QMAKE_CXXFLAGS_HIDESYMS += $$QMAKE_CFLAG
- QMAKE_CXXFLAGS_PRECOMPILE += -x c++-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
- QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE
- 
--QMAKE_LINK             = g++
--QMAKE_LINK_SHLIB       = g++
--QMAKE_LINK_C           = gcc
--QMAKE_LINK_C_SHLIB     = gcc
--QMAKE_LFLAGS           +=
-+QMAKE_LINK             = $(OE_QMAKE_LINK)
-+QMAKE_LINK_SHLIB       = $(OE_QMAKE_LINK)
-+QMAKE_LINK_C           = $(OE_QMAKE_CC)
-+QMAKE_LINK_C_SHLIB     = $(OE_QMAKE_CC)
-+QMAKE_LFLAGS           += $(OE_QMAKE_LDFLAGS)
- QMAKE_LFLAGS_RELEASE   += -Wl,-O1
- QMAKE_LFLAGS_DEBUG     +=
- QMAKE_LFLAGS_APP       +=
-@@ -43,7 +43,7 @@ QMAKE_LFLAGS_PLUGIN   += $$QMAKE_LFLAGS_SH
- QMAKE_LFLAGS_SONAME    += -Wl,-soname,
- QMAKE_LFLAGS_THREAD    +=
- QMAKE_LFLAGS_NOUNDEF   += -Wl,--no-undefined
--QMAKE_RPATH            = -Wl,-rpath,
-+QMAKE_RPATH            = -Wl,-rpath-link,
- 
- QMAKE_PCH_OUTPUT_EXT    = .gch
- 
-Index: qt-embedded-linux-opensource-src-4.5.3/mkspecs/common/linux.conf
-===================================================================
---- qt-embedded-linux-opensource-src-4.5.3.orig/mkspecs/common/linux.conf
-+++ qt-embedded-linux-opensource-src-4.5.3/mkspecs/common/linux.conf
-@@ -7,27 +7,27 @@ QMAKE_CXXFLAGS_THREAD += $$QMAKE_CFLAGS_
- 
- QMAKE_INCDIR          =
- QMAKE_LIBDIR          =
--QMAKE_INCDIR_X11      = /usr/X11R6/include
--QMAKE_LIBDIR_X11      = /usr/X11R6/lib
--QMAKE_INCDIR_QT       = $$[QT_INSTALL_HEADERS]
--QMAKE_LIBDIR_QT       = $$[QT_INSTALL_LIBS]
--QMAKE_INCDIR_OPENGL   = /usr/X11R6/include
--QMAKE_LIBDIR_OPENGL   = /usr/X11R6/lib
-+QMAKE_INCDIR_X11      = 
-+QMAKE_LIBDIR_X11      = 
-+QMAKE_INCDIR_QT       = $(OE_QMAKE_INCDIR_QT)
-+QMAKE_LIBDIR_QT       = $(OE_QMAKE_LIBDIR_QT)
-+QMAKE_INCDIR_OPENGL   = 
-+QMAKE_LIBDIR_OPENGL   = 
- 
- QMAKE_LIBS            =
- QMAKE_LIBS_DYNLOAD    = -ldl
--QMAKE_LIBS_X11        = -lXext -lX11 -lm
--QMAKE_LIBS_X11SM      = -lSM -lICE
-+QMAKE_LIBS_X11        = $(OE_QMAKE_LIBS_X11)
-+QMAKE_LIBS_X11SM      = $(OE_QMAKE_LIBS_X11SM)
- QMAKE_LIBS_NIS        = -lnsl
- QMAKE_LIBS_OPENGL     = -lGLU -lGL
- QMAKE_LIBS_OPENGL_QT  = -lGL
- QMAKE_LIBS_THREAD     = -lpthread
- 
--QMAKE_MOC             = $$[QT_INSTALL_BINS]/moc
--QMAKE_UIC             = $$[QT_INSTALL_BINS]/uic
-+QMAKE_MOC             = $(OE_QMAKE_MOC)
-+QMAKE_UIC             = $(OE_QMAKE_UIC)
- 
--QMAKE_AR              = ar cqs
--QMAKE_OBJCOPY         = objcopy
-+QMAKE_AR              = $(OE_QMAKE_AR) cqs
-+QMAKE_OBJCOPY         = $(OE_QMAKE_OBJCOPY)
- QMAKE_RANLIB          =
- 
- QMAKE_TAR             = tar -cf
-@@ -39,7 +39,7 @@ QMAKE_COPY_DIR        = $(COPY) -r
- QMAKE_MOVE            = mv -f
- QMAKE_DEL_FILE        = rm -f
- QMAKE_DEL_DIR         = rmdir
--QMAKE_STRIP           = strip
-+QMAKE_STRIP           = $(OE_QMAKE_STRIP)
- QMAKE_STRIPFLAGS_LIB += --strip-unneeded
- QMAKE_CHK_DIR_EXISTS  = test -d
- QMAKE_MKDIR           = mkdir -p
diff --git a/meta/recipes-qt/qmake/qmake2-cross/linux-oe-qmake.conf b/meta/recipes-qt/qmake/qmake2-cross/linux-oe-qmake.conf
deleted file mode 100644
index f58481a693..0000000000
--- a/meta/recipes-qt/qmake/qmake2-cross/linux-oe-qmake.conf
+++ /dev/null
@@ -1 +0,0 @@
-include(../linux-g++/qmake.conf)
diff --git a/meta/recipes-qt/qmake/qmake2-cross/use-lflags-last.patch b/meta/recipes-qt/qmake/qmake2-cross/use-lflags-last.patch
deleted file mode 100644
index 4197dbbf64..0000000000
--- a/meta/recipes-qt/qmake/qmake2-cross/use-lflags-last.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: qtopia-core-opensource-src-4.3.1/qmake/generators/unix/unixmake2.cpp
-===================================================================
---- qtopia-core-opensource-src-4.3.1.orig/qmake/generators/unix/unixmake2.cpp   2007-10-07 13:45:26.000000000 +0200
-+++ qtopia-core-opensource-src-4.3.1/qmake/generators/unix/unixmake2.cpp        2007-10-07 13:57:09.000000000 +0200
-@@ -416,7 +416,7 @@
-                 t << "\n\t" << mkdir_p_asstring(destdir) << "\n\t";
-             if(!project->isEmpty("QMAKE_PRE_LINK"))
-                 t << var("QMAKE_PRE_LINK") << "\n\t";
--            t << "$(LINK) $(LFLAGS) -o $(TARGET) " << incr_deps << " " << incr_objs << " $(OBJCOMP) $(LIBS)";
-+            t << "$(LINK) -o $(TARGET) " << incr_deps << " " << incr_objs << " $(OBJCOMP) $(LIBS) $(LFLAGS)";
-             if(!project->isEmpty("QMAKE_POST_LINK"))
-                 t << "\n\t" << var("QMAKE_POST_LINK");
-             t << endl << endl;
-@@ -430,7 +430,7 @@
-                 t << mkdir_p_asstring(destdir) << "\n\t";
-             if(!project->isEmpty("QMAKE_PRE_LINK"))
-                 t << var("QMAKE_PRE_LINK") << "\n\t";
--            t << "$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS)";
-+            t << "$(LINK) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS) $(LFLAGS)";
-             if(!project->isEmpty("QMAKE_POST_LINK"))
-                 t << "\n\t" << var("QMAKE_POST_LINK");
-             t << endl << endl;
diff --git a/meta/recipes-qt/qmake/qmake2-cross_2.10a.bb b/meta/recipes-qt/qmake/qmake2-cross_2.10a.bb
deleted file mode 100644
index 60f738b9ce..0000000000
--- a/meta/recipes-qt/qmake/qmake2-cross_2.10a.bb
+++ /dev/null
@@ -1,74 +0,0 @@
-DESCRIPTION = "TrollTech Makefile Generator"
-PRIORITY = "optional"
-HOMEPAGE = "http://www.trolltech.com"
-SECTION = "devel"
-LICENSE = "GPL"
-PR = "r2"
-
-QTVER = "qt-embedded-linux-opensource-src-4.5.3"
-
-SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/${QTVER}.tar.gz \
-           file://0001-fix-mkspecs.patch;patch=1 \
-           file://use-lflags-last.patch;patch=1 \
-           file://linux-oe-qmake.conf"
-S = "${WORKDIR}/${QTVER}"
-
-# we need the real target system here
-CROSS_SYS := "${TARGET_SYS}"
-CROSS_BINDIR := "${STAGING_BINDIR_CROSS}"
-inherit autotools cross
-
-export QTDIR = "${S}"
-EXTRA_OEMAKE = "-e"
-EXTRA_OECONF = "-opensource"
-
-do_configure() {
-        # Install the OE build templates
-        for template in linux-oe-g++ linux-uclibc-oe-g++ linux-gnueabi-oe-g++
-        do
-                install -d ${S}/mkspecs/$template
-                install -m 0644 ${WORKDIR}/linux-oe-qmake.conf ${S}/mkspecs/$template/qmake.conf
-                ln -sf ../linux-g++/qplatformdefs.h ${S}/mkspecs/$template/qplatformdefs.h
-        done
-
-        QMAKESPEC=
-        PLATFORM=${HOST_OS}-oe-g++
-        export PLATFORM
-        # yes, TARGET_SYS is correct, because this is a 'cross'-qmake-native :) :M:
-        export OE_QMAKE_CC="${CC}"
-        export OE_QMAKE_CFLAGS="${CFLAGS}"
-        export OE_QMAKE_CXX="${CXX}"
-        export OE_QMAKE_CXXFLAGS="-fno-exceptions -fno-rtti ${CXXFLAGS}"
-        export OE_QMAKE_LDFLAGS="${LDFLAGS}"
-        export OE_QMAKE_LINK="${CCLD}"
-        export OE_QMAKE_AR="${AR}"
-        export OE_QMAKE_OBJCOPY="${OBJCOPY}"
-        export OE_QMAKE_STRIP="${STRIP}"
-        export OE_QMAKE_UIC="${STAGING_BINDIR_NATIVE}/uic"
-        export OE_QMAKE_MOC="${STAGING_BINDIR_NATIVE}/moc"
-        export OE_QMAKE_RCC="non-existant"
-        export OE_QMAKE_QMAKE="${STAGING_BINDIR_NATIVE}/qmake"
-        export OE_QMAKE_RPATH="-Wl,-rpath-link,"
-        echo yes | ./configure -prefix ${STAGING_DIR}/${CROSS_SYS}/qt4 ${EXTRA_OECONF} || die "Configuring qt failed"
-}
-
-do_compile() {
-        :
-}
-
-do_install() {
-        install -d ${D}${CROSS_BINDIR}/
-        install -m 0755 bin/qmake ${D}${CROSS_BINDIR}/qmake2
-        install -m 0755 bin/qmake ${D}${CROSS_BINDIR}/qmake-qt4
-        install -d ${D}${STAGING_DIR}/${CROSS_SYS}/qt4/
-        cp -PfR mkspecs ${D}${STAGING_DIR}/${CROSS_SYS}/qt4/
-        install -d ${D}${STAGING_DIR}/${HOST_SYS}/qt4/
-        cp -PfR mkspecs ${D}${STAGING_DIR}/${HOST_SYS}/qt4/
-}
-
-sysroot_stage_all_append() {
-        sysroot_stage_dir ${D}/${STAGING_DIR_NATIVE}/qt4 ${SYSROOT_DESTDIR}/${STAGING_DIR_NATIVE}/qt4
-        sysroot_stage_dir ${D}/${STAGING_DIR_TARGET}/qt4 ${SYSROOT_DESTDIR}/${STAGING_DIR_TARGET}/qt4
-}
-
-
diff --git a/meta/recipes-qt/uicmoc/uicmoc4-native.inc b/meta/recipes-qt/uicmoc/uicmoc4-native.inc
deleted file mode 100644
index b6933628d9..0000000000
--- a/meta/recipes-qt/uicmoc/uicmoc4-native.inc
+++ /dev/null
@@ -1,67 +0,0 @@
-DESCRIPTION = "User-Interface-, Meta-Object-, and Resource Compiler for Qt/[X11|Mac|Embedded] version 4.x"
-DEPENDS = "zlib-native"
-SECTION = "libs"
-HOMEPAGE = "http://www.trolltech.com"
-PRIORITY = "optional"
-LICENSE = "GPL"
-PR = "r1"
-
-SRC_URI = "ftp://ftp.trolltech.com/qt/source/qtopia-core-opensource-src-${PV}.tar.gz"
-S = "${WORKDIR}/qtopia-core-opensource-src-${PV}"
-
-inherit native
-
-EXTRA_OECONF = "-prefix ${STAGING_DIR_NATIVE}/qt4 \
-                -qt-libjpeg -qt-gif -system-zlib \
-                -no-nis -no-cups -no-exceptions  \
-                -no-accessibility -no-libjpeg    \
-                -no-nas-sound -no-sm             \
-                -no-xshape    -no-xinerama       \
-                -no-xcursor   -no-xrandr         \
-                -no-xrender   -no-fontconfig     \
-                -no-tablet    -no-xkb            \
-                -no-libpng                       \
-                -verbose -release  -fast -static \
-                -L ${STAGING_LIBDIR_NATIVE}      \
-                -qt3support "
-# yank default -e
-EXTRA_OEMAKE = " "
-
-do_configure() {
-        sed -i 's:^QT += xml qt3support$:QT += xml qt3support network:' "${S}"/src/tools/uic3/uic3.pro
-        echo yes | ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}"
-}
-
-TOBUILD = "\
-  src/tools/moc \
-  src/corelib \
-  src/sql \
-  src/qt3support \
-  src/xml \
-  src/tools/uic \
-  src/tools/rcc \
-  src/network \
-  src/gui \
-  src/tools/uic3 \
-"
-
-do_compile() {
-        unset CC CXX CFLAGS LFLAGS CXXFLAGS CPPFLAGS
-        for i in ${TOBUILD}; do
-                cd ${S}/$i && oe_runmake CC="${CC}" CXX="${CXX}"
-        done
-}
-
-do_install() {
-        install -d ${D}${bindir}/
-        install -m 0755 bin/moc ${D}${bindir}//moc4
-        install -m 0755 bin/uic ${D}${bindir}/uic4
-        install -m 0755 bin/uic3 ${D}${bindir}/uic34
-        install -m 0755 bin/rcc $${D}${bindir}/rcc4
-        install -d ${D}/qt4/
-        install -m 0644 tools/porting/src/q3porting.xml ${D}/qt4/
-}
-
-sysroot_stage_all_append() {
-        sysroot_stage_dir ${D}/qt4 ${SYSROOT_DESTDIR}/${STAGING_DIR_TARGET}/qt4
-}
diff --git a/meta/recipes-qt/uicmoc/uicmoc4-native_4.3.2.bb b/meta/recipes-qt/uicmoc/uicmoc4-native_4.3.2.bb
deleted file mode 100644
index 1950f63068..0000000000
--- a/meta/recipes-qt/uicmoc/uicmoc4-native_4.3.2.bb
+++ /dev/null
@@ -1 +0,0 @@
-require uicmoc4-native.inc
diff --git a/meta/packages/claws-mail/claws-mail.inc b/meta/recipes-sato/claws-mail/claws-mail.inc
index 04401df2f5..04401df2f5 100644
--- a/meta/packages/claws-mail/claws-mail.inc
+++ b/meta/recipes-sato/claws-mail/claws-mail.inc
diff --git a/meta/packages/claws-mail/claws-mail_2.9.1.bb b/meta/recipes-sato/claws-mail/claws-mail_2.9.1.bb
index f8a8396b95..f8a8396b95 100644
--- a/meta/packages/claws-mail/claws-mail_2.9.1.bb
+++ b/meta/recipes-sato/claws-mail/claws-mail_2.9.1.bb
diff --git a/meta/packages/claws-mail/claws-plugin-gtkhtml2-viewer_0.15.bb b/meta/recipes-sato/claws-mail/claws-plugin-gtkhtml2-viewer_0.15.bb
index 82918173e4..82918173e4 100644
--- a/meta/packages/claws-mail/claws-plugin-gtkhtml2-viewer_0.15.bb
+++ b/meta/recipes-sato/claws-mail/claws-plugin-gtkhtml2-viewer_0.15.bb
diff --git a/meta/packages/claws-mail/claws-plugin-maildir_0.24.4.bb b/meta/recipes-sato/claws-mail/claws-plugin-maildir_0.24.4.bb
index 4351d1e5de..4351d1e5de 100644
--- a/meta/packages/claws-mail/claws-plugin-maildir_0.24.4.bb
+++ b/meta/recipes-sato/claws-mail/claws-plugin-maildir_0.24.4.bb
diff --git a/meta/packages/claws-mail/claws-plugin-mailmbox_1.13.bb b/meta/recipes-sato/claws-mail/claws-plugin-mailmbox_1.13.bb
index fe7041494f..fe7041494f 100644
--- a/meta/packages/claws-mail/claws-plugin-mailmbox_1.13.bb
+++ b/meta/recipes-sato/claws-mail/claws-plugin-mailmbox_1.13.bb
diff --git a/meta/packages/claws-mail/claws-plugin-rssyl_0.13.bb b/meta/recipes-sato/claws-mail/claws-plugin-rssyl_0.13.bb
index de0705c7fd..de0705c7fd 100644
--- a/meta/packages/claws-mail/claws-plugin-rssyl_0.13.bb
+++ b/meta/recipes-sato/claws-mail/claws-plugin-rssyl_0.13.bb
diff --git a/meta/packages/claws-mail/files/desktop.patch b/meta/recipes-sato/claws-mail/files/desktop.patch
index c5ed7a9c7d..c5ed7a9c7d 100644
--- a/meta/packages/claws-mail/files/desktop.patch
+++ b/meta/recipes-sato/claws-mail/files/desktop.patch
diff --git a/meta/packages/claws-mail/files/fix-build.patch b/meta/recipes-sato/claws-mail/files/fix-build.patch
index 2f30899fe1..2f30899fe1 100644
--- a/meta/packages/claws-mail/files/fix-build.patch
+++ b/meta/recipes-sato/claws-mail/files/fix-build.patch
diff --git a/meta/packages/claws-mail/files/owl-window-menu.patch b/meta/recipes-sato/claws-mail/files/owl-window-menu.patch
index 54c61668a9..54c61668a9 100644
--- a/meta/packages/claws-mail/files/owl-window-menu.patch
+++ b/meta/recipes-sato/claws-mail/files/owl-window-menu.patch
diff --git a/meta/packages/claws-mail/files/streamline-ui.patch b/meta/recipes-sato/claws-mail/files/streamline-ui.patch
index 29a52ff795..29a52ff795 100644
--- a/meta/packages/claws-mail/files/streamline-ui.patch
+++ b/meta/recipes-sato/claws-mail/files/streamline-ui.patch
diff --git a/meta/packages/libical/libical_0.44.bb b/meta/recipes-sato/libical/libical_0.44.bb
index 0b016a0b8f..0b016a0b8f 100644
--- a/meta/packages/libical/libical_0.44.bb
+++ b/meta/recipes-sato/libical/libical_0.44.bb
diff --git a/meta/packages/rxvt-unicode/files/makefile.patch b/meta/recipes-sato/rxvt-unicode/files/makefile.patch
index 86f82eeb4c..86f82eeb4c 100644
--- a/meta/packages/rxvt-unicode/files/makefile.patch
+++ b/meta/recipes-sato/rxvt-unicode/files/makefile.patch
diff --git a/meta/packages/rxvt-unicode/files/rxvt.desktop b/meta/recipes-sato/rxvt-unicode/files/rxvt.desktop
index a419c98a13..a419c98a13 100644
--- a/meta/packages/rxvt-unicode/files/rxvt.desktop
+++ b/meta/recipes-sato/rxvt-unicode/files/rxvt.desktop
diff --git a/meta/packages/rxvt-unicode/files/rxvt.png b/meta/recipes-sato/rxvt-unicode/files/rxvt.png
index e56fa2e9cd..e56fa2e9cd 100644
--- a/meta/packages/rxvt-unicode/files/rxvt.png
+++ b/meta/recipes-sato/rxvt-unicode/files/rxvt.png
diff --git a/meta/packages/rxvt-unicode/files/signedchar.patch b/meta/recipes-sato/rxvt-unicode/files/signedchar.patch
index 6faa175143..6faa175143 100644
--- a/meta/packages/rxvt-unicode/files/signedchar.patch
+++ b/meta/recipes-sato/rxvt-unicode/files/signedchar.patch
diff --git a/meta/packages/rxvt-unicode/files/xwc.patch b/meta/recipes-sato/rxvt-unicode/files/xwc.patch
index 7cf59656ce..7cf59656ce 100644
--- a/meta/packages/rxvt-unicode/files/xwc.patch
+++ b/meta/recipes-sato/rxvt-unicode/files/xwc.patch
diff --git a/meta/packages/rxvt-unicode/rxvt-unicode-5.6/xwc.patch b/meta/recipes-sato/rxvt-unicode/rxvt-unicode-5.6/xwc.patch
index eb87b84b25..eb87b84b25 100644
--- a/meta/packages/rxvt-unicode/rxvt-unicode-5.6/xwc.patch
+++ b/meta/recipes-sato/rxvt-unicode/rxvt-unicode-5.6/xwc.patch
diff --git a/meta/packages/rxvt-unicode/rxvt-unicode_5.6.bb b/meta/recipes-sato/rxvt-unicode/rxvt-unicode_5.6.bb
index d13089501f..d13089501f 100644
--- a/meta/packages/rxvt-unicode/rxvt-unicode_5.6.bb
+++ b/meta/recipes-sato/rxvt-unicode/rxvt-unicode_5.6.bb
diff --git a/meta/packages/webkit/files/GNUmakefile.am b/meta/recipes-sato/webkit/files/GNUmakefile.am
index 39817f1dd5..39817f1dd5 100644
--- a/meta/packages/webkit/files/GNUmakefile.am
+++ b/meta/recipes-sato/webkit/files/GNUmakefile.am
diff --git a/meta/packages/webkit/files/Makefile b/meta/recipes-sato/webkit/files/Makefile
index 1e50d1d358..1e50d1d358 100644
--- a/meta/packages/webkit/files/Makefile
+++ b/meta/recipes-sato/webkit/files/Makefile
diff --git a/meta/packages/webkit/files/Makefile.shared b/meta/recipes-sato/webkit/files/Makefile.shared
index aa9fa728d6..aa9fa728d6 100644
--- a/meta/packages/webkit/files/Makefile.shared
+++ b/meta/recipes-sato/webkit/files/Makefile.shared
diff --git a/meta/packages/webkit/files/WebKit.pri b/meta/recipes-sato/webkit/files/WebKit.pri
index d12423beb2..d12423beb2 100644
--- a/meta/packages/webkit/files/WebKit.pri
+++ b/meta/recipes-sato/webkit/files/WebKit.pri
diff --git a/meta/packages/webkit/files/WebKit.pro b/meta/recipes-sato/webkit/files/WebKit.pro
index bc14feb5f6..bc14feb5f6 100644
--- a/meta/packages/webkit/files/WebKit.pro
+++ b/meta/recipes-sato/webkit/files/WebKit.pro
diff --git a/meta/packages/webkit/files/autogen.sh b/meta/recipes-sato/webkit/files/autogen.sh
index 97beb209d2..97beb209d2 100755
--- a/meta/packages/webkit/files/autogen.sh
+++ b/meta/recipes-sato/webkit/files/autogen.sh
diff --git a/meta/packages/webkit/files/configure.ac b/meta/recipes-sato/webkit/files/configure.ac
index d4f3e749fc..d4f3e749fc 100644
--- a/meta/packages/webkit/files/configure.ac
+++ b/meta/recipes-sato/webkit/files/configure.ac
diff --git a/meta/packages/webkit/files/fix_im.patch b/meta/recipes-sato/webkit/files/fix_im.patch
index e69de29bb2..e69de29bb2 100644
--- a/meta/packages/webkit/files/fix_im.patch
+++ b/meta/recipes-sato/webkit/files/fix_im.patch
diff --git a/meta/packages/webkit/files/gtk-doc.make b/meta/recipes-sato/webkit/files/gtk-doc.make
index 354ffb7c66..354ffb7c66 100644
--- a/meta/packages/webkit/files/gtk-doc.make
+++ b/meta/recipes-sato/webkit/files/gtk-doc.make
diff --git a/meta/packages/webkit/webkit-gtk_svn.bb b/meta/recipes-sato/webkit/webkit-gtk_svn.bb
index fe31b9c24c..fe31b9c24c 100644
--- a/meta/packages/webkit/webkit-gtk_svn.bb
+++ b/meta/recipes-sato/webkit/webkit-gtk_svn.bb
diff --git a/meta/packages/apr/apr-util/configfix.patch b/meta/recipes-support/apr/apr-util/configfix.patch
index a8953e5244..a8953e5244 100644
--- a/meta/packages/apr/apr-util/configfix.patch
+++ b/meta/recipes-support/apr/apr-util/configfix.patch
diff --git a/meta/packages/apr/apr-util/configure_fixes.patch b/meta/recipes-support/apr/apr-util/configure_fixes.patch
index 0b2a0903e1..0b2a0903e1 100644
--- a/meta/packages/apr/apr-util/configure_fixes.patch
+++ b/meta/recipes-support/apr/apr-util/configure_fixes.patch
diff --git a/meta/packages/apr/apr-util/configure_fixes.patch.old b/meta/recipes-support/apr/apr-util/configure_fixes.patch.old
index 16f88b3bba..16f88b3bba 100644
--- a/meta/packages/apr/apr-util/configure_fixes.patch.old
+++ b/meta/recipes-support/apr/apr-util/configure_fixes.patch.old
diff --git a/meta/packages/apr/apr-util_1.3.4.bb b/meta/recipes-support/apr/apr-util_1.3.4.bb
index 2e608e8a5c..2e608e8a5c 100644
--- a/meta/packages/apr/apr-util_1.3.4.bb
+++ b/meta/recipes-support/apr/apr-util_1.3.4.bb
diff --git a/meta/packages/apr/apr/cleanup.patch b/meta/recipes-support/apr/apr/cleanup.patch
index fd74826480..fd74826480 100644
--- a/meta/packages/apr/apr/cleanup.patch
+++ b/meta/recipes-support/apr/apr/cleanup.patch
diff --git a/meta/packages/apr/apr/configfix.patch b/meta/recipes-support/apr/apr/configfix.patch
index 995555e8ba..995555e8ba 100644
--- a/meta/packages/apr/apr/configfix.patch
+++ b/meta/recipes-support/apr/apr/configfix.patch
diff --git a/meta/packages/apr/apr/configure_fixes.patch b/meta/recipes-support/apr/apr/configure_fixes.patch
index 86ceb8cf08..86ceb8cf08 100644
--- a/meta/packages/apr/apr/configure_fixes.patch
+++ b/meta/recipes-support/apr/apr/configure_fixes.patch
diff --git a/meta/packages/apr/apr_1.3.3.bb b/meta/recipes-support/apr/apr_1.3.3.bb
index a193a18a2e..a193a18a2e 100644
--- a/meta/packages/apr/apr_1.3.3.bb
+++ b/meta/recipes-support/apr/apr_1.3.3.bb
diff --git a/meta/packages/aspell/aspell_0.60.6.bb b/meta/recipes-support/aspell/aspell_0.60.6.bb
index 8d43a707d2..8d43a707d2 100644
--- a/meta/packages/aspell/aspell_0.60.6.bb
+++ b/meta/recipes-support/aspell/aspell_0.60.6.bb
diff --git a/meta/packages/atk/atk.inc b/meta/recipes-support/atk/atk.inc
index 899d360e1a..899d360e1a 100644
--- a/meta/packages/atk/atk.inc
+++ b/meta/recipes-support/atk/atk.inc
diff --git a/meta/packages/atk/atk_1.30.0.bb b/meta/recipes-support/atk/atk_1.30.0.bb
index e85ef9040c..e85ef9040c 100644
--- a/meta/packages/atk/atk_1.30.0.bb
+++ b/meta/recipes-support/atk/atk_1.30.0.bb
diff --git a/meta/packages/attr/acl.inc b/meta/recipes-support/attr/acl.inc
index 68745dd728..68745dd728 100644
--- a/meta/packages/attr/acl.inc
+++ b/meta/recipes-support/attr/acl.inc
diff --git a/meta/packages/attr/acl_2.2.49.bb b/meta/recipes-support/attr/acl_2.2.49.bb
index e5d5509de1..e5d5509de1 100644
--- a/meta/packages/attr/acl_2.2.49.bb
+++ b/meta/recipes-support/attr/acl_2.2.49.bb
diff --git a/meta/packages/attr/attr-2.4.44/double-free.patch b/meta/recipes-support/attr/attr-2.4.44/double-free.patch
index 6fc684f6c2..6fc684f6c2 100644
--- a/meta/packages/attr/attr-2.4.44/double-free.patch
+++ b/meta/recipes-support/attr/attr-2.4.44/double-free.patch
diff --git a/meta/packages/attr/attr-2.4.44/memory-leak-in-copy.patch b/meta/recipes-support/attr/attr-2.4.44/memory-leak-in-copy.patch
index 966632d87e..966632d87e 100644
--- a/meta/packages/attr/attr-2.4.44/memory-leak-in-copy.patch
+++ b/meta/recipes-support/attr/attr-2.4.44/memory-leak-in-copy.patch
diff --git a/meta/packages/attr/attr-2.4.44/memory-leak2.patch b/meta/recipes-support/attr/attr-2.4.44/memory-leak2.patch
index 03395423da..03395423da 100644
--- a/meta/packages/attr/attr-2.4.44/memory-leak2.patch
+++ b/meta/recipes-support/attr/attr-2.4.44/memory-leak2.patch
diff --git a/meta/packages/attr/attr-2.4.44/pull-in-string.h.patch b/meta/recipes-support/attr/attr-2.4.44/pull-in-string.h.patch
index ccbc236284..ccbc236284 100644
--- a/meta/packages/attr/attr-2.4.44/pull-in-string.h.patch
+++ b/meta/recipes-support/attr/attr-2.4.44/pull-in-string.h.patch
diff --git a/meta/packages/attr/attr-2.4.44/thinko-in-restore.patch b/meta/recipes-support/attr/attr-2.4.44/thinko-in-restore.patch
index a84de94ed0..a84de94ed0 100644
--- a/meta/packages/attr/attr-2.4.44/thinko-in-restore.patch
+++ b/meta/recipes-support/attr/attr-2.4.44/thinko-in-restore.patch
diff --git a/meta/packages/attr/attr.inc b/meta/recipes-support/attr/attr.inc
index da7924631e..da7924631e 100644
--- a/meta/packages/attr/attr.inc
+++ b/meta/recipes-support/attr/attr.inc
diff --git a/meta/packages/attr/attr_2.4.44.bb b/meta/recipes-support/attr/attr_2.4.44.bb
index 0b21b33dcf..0b21b33dcf 100644
--- a/meta/packages/attr/attr_2.4.44.bb
+++ b/meta/recipes-support/attr/attr_2.4.44.bb
diff --git a/meta/packages/attr/ea-acl.inc b/meta/recipes-support/attr/ea-acl.inc
index 77fa2b4fd6..77fa2b4fd6 100644
--- a/meta/packages/attr/ea-acl.inc
+++ b/meta/recipes-support/attr/ea-acl.inc
diff --git a/meta/packages/attr/files/relative-libdir.patch b/meta/recipes-support/attr/files/relative-libdir.patch
index f989dd0ccc..f989dd0ccc 100644
--- a/meta/packages/attr/files/relative-libdir.patch
+++ b/meta/recipes-support/attr/files/relative-libdir.patch
diff --git a/meta/packages/beecrypt/beecrypt/disable-icu-check.patch b/meta/recipes-support/beecrypt/beecrypt/disable-icu-check.patch
index 3e18a87c3f..3e18a87c3f 100644
--- a/meta/packages/beecrypt/beecrypt/disable-icu-check.patch
+++ b/meta/recipes-support/beecrypt/beecrypt/disable-icu-check.patch
diff --git a/meta/packages/beecrypt/beecrypt/fix-security.patch b/meta/recipes-support/beecrypt/beecrypt/fix-security.patch
index 6103562e0a..6103562e0a 100644
--- a/meta/packages/beecrypt/beecrypt/fix-security.patch
+++ b/meta/recipes-support/beecrypt/beecrypt/fix-security.patch
diff --git a/meta/packages/beecrypt/beecrypt/x64fix.patch b/meta/recipes-support/beecrypt/beecrypt/x64fix.patch
index ac02425d51..ac02425d51 100644
--- a/meta/packages/beecrypt/beecrypt/x64fix.patch
+++ b/meta/recipes-support/beecrypt/beecrypt/x64fix.patch
diff --git a/meta/packages/beecrypt/beecrypt_4.1.2.bb b/meta/recipes-support/beecrypt/beecrypt_4.1.2.bb
index 6eb40e5d5d..6eb40e5d5d 100644
--- a/meta/packages/beecrypt/beecrypt_4.1.2.bb
+++ b/meta/recipes-support/beecrypt/beecrypt_4.1.2.bb
diff --git a/meta/packages/boost/boost-36.inc b/meta/recipes-support/boost/boost-36.inc
index 5d2d1280be..5d2d1280be 100644
--- a/meta/packages/boost/boost-36.inc
+++ b/meta/recipes-support/boost/boost-36.inc
diff --git a/meta/packages/boost/boost-jam-native.inc b/meta/recipes-support/boost/boost-jam-native.inc
index fe181ad00f..fe181ad00f 100644
--- a/meta/packages/boost/boost-jam-native.inc
+++ b/meta/recipes-support/boost/boost-jam-native.inc
diff --git a/meta/packages/boost/boost-jam-native_3.1.18.bb b/meta/recipes-support/boost/boost-jam-native_3.1.18.bb
index 2e92146a83..2e92146a83 100644
--- a/meta/packages/boost/boost-jam-native_3.1.18.bb
+++ b/meta/recipes-support/boost/boost-jam-native_3.1.18.bb
diff --git a/meta/packages/boost/boost_1.44.0.bb b/meta/recipes-support/boost/boost_1.44.0.bb
index 81a2e53ba3..81a2e53ba3 100644
--- a/meta/packages/boost/boost_1.44.0.bb
+++ b/meta/recipes-support/boost/boost_1.44.0.bb
diff --git a/meta/packages/boost/files/1.34.1-gcc43.patch b/meta/recipes-support/boost/files/1.34.1-gcc43.patch
index 4670ac4295..4670ac4295 100644
--- a/meta/packages/boost/files/1.34.1-gcc43.patch
+++ b/meta/recipes-support/boost/files/1.34.1-gcc43.patch
diff --git a/meta/packages/boost/files/arm-intrinsics.patch b/meta/recipes-support/boost/files/arm-intrinsics.patch
index 3f9c620ebe..3f9c620ebe 100644
--- a/meta/packages/boost/files/arm-intrinsics.patch
+++ b/meta/recipes-support/boost/files/arm-intrinsics.patch
diff --git a/meta/packages/boost/files/atomic_count_gcc_atomicity.patch b/meta/recipes-support/boost/files/atomic_count_gcc_atomicity.patch
index 7d08e73550..7d08e73550 100644
--- a/meta/packages/boost/files/atomic_count_gcc_atomicity.patch
+++ b/meta/recipes-support/boost/files/atomic_count_gcc_atomicity.patch
diff --git a/meta/packages/boost/files/gcc41.patch b/meta/recipes-support/boost/files/gcc41.patch
index f91d1adf2b..f91d1adf2b 100644
--- a/meta/packages/boost/files/gcc41.patch
+++ b/meta/recipes-support/boost/files/gcc41.patch
diff --git a/meta/packages/boost/files/gcc43.patch b/meta/recipes-support/boost/files/gcc43.patch
index aefe0800c3..aefe0800c3 100644
--- a/meta/packages/boost/files/gcc43.patch
+++ b/meta/recipes-support/boost/files/gcc43.patch
diff --git a/meta/packages/boost/files/linux-uclibc.patch b/meta/recipes-support/boost/files/linux-uclibc.patch
index 79f14dea88..79f14dea88 100644
--- a/meta/packages/boost/files/linux-uclibc.patch
+++ b/meta/recipes-support/boost/files/linux-uclibc.patch
diff --git a/meta/packages/boost/files/unit_test_log10f.patch b/meta/recipes-support/boost/files/unit_test_log10f.patch
index b235e12446..b235e12446 100644
--- a/meta/packages/boost/files/unit_test_log10f.patch
+++ b/meta/recipes-support/boost/files/unit_test_log10f.patch
diff --git a/meta/packages/curl/curl/noldlibpath.patch b/meta/recipes-support/curl/curl/noldlibpath.patch
index a3319a23e3..a3319a23e3 100644
--- a/meta/packages/curl/curl/noldlibpath.patch
+++ b/meta/recipes-support/curl/curl/noldlibpath.patch
diff --git a/meta/packages/curl/curl/pkgconfig_fix.patch b/meta/recipes-support/curl/curl/pkgconfig_fix.patch
index a59d39b8b1..a59d39b8b1 100644
--- a/meta/packages/curl/curl/pkgconfig_fix.patch
+++ b/meta/recipes-support/curl/curl/pkgconfig_fix.patch
diff --git a/meta/packages/curl/curl_7.21.0.bb b/meta/recipes-support/curl/curl_7.21.0.bb
index 1e11222897..1e11222897 100644
--- a/meta/packages/curl/curl_7.21.0.bb
+++ b/meta/recipes-support/curl/curl_7.21.0.bb
diff --git a/meta/packages/db/db/arm-thumb-mutex.patch b/meta/recipes-support/db/db/arm-thumb-mutex.patch
index acd446fcd8..acd446fcd8 100644
--- a/meta/packages/db/db/arm-thumb-mutex.patch
+++ b/meta/recipes-support/db/db/arm-thumb-mutex.patch
diff --git a/meta/packages/db/db/configure_fixes.patch b/meta/recipes-support/db/db/configure_fixes.patch
index 80aa0e7c1c..80aa0e7c1c 100644
--- a/meta/packages/db/db/configure_fixes.patch
+++ b/meta/recipes-support/db/db/configure_fixes.patch
diff --git a/meta/packages/db/db_4.2.52.bb b/meta/recipes-support/db/db_4.2.52.bb
index b3ca493a01..b3ca493a01 100644
--- a/meta/packages/db/db_4.2.52.bb
+++ b/meta/recipes-support/db/db_4.2.52.bb
diff --git a/meta/packages/db/db_4.3.29.bb b/meta/recipes-support/db/db_4.3.29.bb
index 04a6680f07..04a6680f07 100644
--- a/meta/packages/db/db_4.3.29.bb
+++ b/meta/recipes-support/db/db_4.3.29.bb
diff --git a/meta/packages/enchant/enchant_1.6.0.bb b/meta/recipes-support/enchant/enchant_1.6.0.bb
index 92b4686545..92b4686545 100644
--- a/meta/packages/enchant/enchant_1.6.0.bb
+++ b/meta/recipes-support/enchant/enchant_1.6.0.bb
diff --git a/meta/packages/gdbm/gdbm-1.8.3/libtool-mode.patch b/meta/recipes-support/gdbm/gdbm-1.8.3/libtool-mode.patch
index c56bac2ca9..c56bac2ca9 100644
--- a/meta/packages/gdbm/gdbm-1.8.3/libtool-mode.patch
+++ b/meta/recipes-support/gdbm/gdbm-1.8.3/libtool-mode.patch
diff --git a/meta/packages/gdbm/gdbm-1.8.3/makefile.patch b/meta/recipes-support/gdbm/gdbm-1.8.3/makefile.patch
index 5350c53729..5350c53729 100644
--- a/meta/packages/gdbm/gdbm-1.8.3/makefile.patch
+++ b/meta/recipes-support/gdbm/gdbm-1.8.3/makefile.patch
diff --git a/meta/packages/gdbm/gdbm_1.8.3.bb b/meta/recipes-support/gdbm/gdbm_1.8.3.bb
index e8369fd725..e8369fd725 100644
--- a/meta/packages/gdbm/gdbm_1.8.3.bb
+++ b/meta/recipes-support/gdbm/gdbm_1.8.3.bb
diff --git a/meta/recipes-devtools/gmp/gmp-4.2.1/disable-stdc.patch b/meta/recipes-support/gmp/gmp-4.2.1/disable-stdc.patch
index 83c9eae36a..83c9eae36a 100644
--- a/meta/recipes-devtools/gmp/gmp-4.2.1/disable-stdc.patch
+++ b/meta/recipes-support/gmp/gmp-4.2.1/disable-stdc.patch
diff --git a/meta/recipes-devtools/gmp/gmp.inc b/meta/recipes-support/gmp/gmp.inc
index 6b56f7e7c8..6b56f7e7c8 100644
--- a/meta/recipes-devtools/gmp/gmp.inc
+++ b/meta/recipes-support/gmp/gmp.inc
diff --git a/meta/recipes-devtools/gmp/gmp/amd64.patch b/meta/recipes-support/gmp/gmp/amd64.patch
index 67be9dd350..67be9dd350 100644
--- a/meta/recipes-devtools/gmp/gmp/amd64.patch
+++ b/meta/recipes-support/gmp/gmp/amd64.patch
diff --git a/meta/recipes-devtools/gmp/gmp/configure.patch b/meta/recipes-support/gmp/gmp/configure.patch
index ed0c02d86c..ed0c02d86c 100644
--- a/meta/recipes-devtools/gmp/gmp/configure.patch
+++ b/meta/recipes-support/gmp/gmp/configure.patch
diff --git a/meta/recipes-devtools/gmp/gmp/sh4-asmfix.patch b/meta/recipes-support/gmp/gmp/sh4-asmfix.patch
index 1a01f61533..1a01f61533 100644
--- a/meta/recipes-devtools/gmp/gmp/sh4-asmfix.patch
+++ b/meta/recipes-support/gmp/gmp/sh4-asmfix.patch
diff --git a/meta/recipes-devtools/gmp/gmp/use-includedir.patch b/meta/recipes-support/gmp/gmp/use-includedir.patch
index ee3891f807..ee3891f807 100644
--- a/meta/recipes-devtools/gmp/gmp/use-includedir.patch
+++ b/meta/recipes-support/gmp/gmp/use-includedir.patch
diff --git a/meta/recipes-devtools/gmp/gmp_4.2.1.bb b/meta/recipes-support/gmp/gmp_4.2.1.bb
index d70dcf2665..d70dcf2665 100644
--- a/meta/recipes-devtools/gmp/gmp_4.2.1.bb
+++ b/meta/recipes-support/gmp/gmp_4.2.1.bb
diff --git a/meta/recipes-devtools/gmp/gmp_5.0.1.bb b/meta/recipes-support/gmp/gmp_5.0.1.bb
index dd908bd7ca..dd908bd7ca 100644
--- a/meta/recipes-devtools/gmp/gmp_5.0.1.bb
+++ b/meta/recipes-support/gmp/gmp_5.0.1.bb
diff --git a/meta/packages/gnutls/gnutls-2.8.6/configure-fix.patch b/meta/recipes-support/gnutls/gnutls-2.8.6/configure-fix.patch
index 247e324564..247e324564 100644
--- a/meta/packages/gnutls/gnutls-2.8.6/configure-fix.patch
+++ b/meta/recipes-support/gnutls/gnutls-2.8.6/configure-fix.patch
diff --git a/meta/packages/gnutls/gnutls-2.8.6/gnutls-openssl.patch b/meta/recipes-support/gnutls/gnutls-2.8.6/gnutls-openssl.patch
index 413de06472..413de06472 100644
--- a/meta/packages/gnutls/gnutls-2.8.6/gnutls-openssl.patch
+++ b/meta/recipes-support/gnutls/gnutls-2.8.6/gnutls-openssl.patch
diff --git a/meta/packages/gnutls/gnutls-2.8.6/gnutls-texinfo-euro.patch b/meta/recipes-support/gnutls/gnutls-2.8.6/gnutls-texinfo-euro.patch
index a2d2f03870..a2d2f03870 100644
--- a/meta/packages/gnutls/gnutls-2.8.6/gnutls-texinfo-euro.patch
+++ b/meta/recipes-support/gnutls/gnutls-2.8.6/gnutls-texinfo-euro.patch
diff --git a/meta/packages/gnutls/gnutls.inc b/meta/recipes-support/gnutls/gnutls.inc
index 76f4ca63fd..76f4ca63fd 100644
--- a/meta/packages/gnutls/gnutls.inc
+++ b/meta/recipes-support/gnutls/gnutls.inc
diff --git a/meta/packages/gnutls/gnutls_2.8.6.bb b/meta/recipes-support/gnutls/gnutls_2.8.6.bb
index d8adc6ba17..d8adc6ba17 100644
--- a/meta/packages/gnutls/gnutls_2.8.6.bb
+++ b/meta/recipes-support/gnutls/gnutls_2.8.6.bb
diff --git a/meta/packages/gnutls/libtasn1_2.7.bb b/meta/recipes-support/gnutls/libtasn1_2.7.bb
index 11a7dc5055..11a7dc5055 100644
--- a/meta/packages/gnutls/libtasn1_2.7.bb
+++ b/meta/recipes-support/gnutls/libtasn1_2.7.bb
diff --git a/meta/packages/gpgme/gpgme-1.3.0/disable_gpgconf_check.patch b/meta/recipes-support/gpgme/gpgme-1.3.0/disable_gpgconf_check.patch
index f56f35b9ed..f56f35b9ed 100644
--- a/meta/packages/gpgme/gpgme-1.3.0/disable_gpgconf_check.patch
+++ b/meta/recipes-support/gpgme/gpgme-1.3.0/disable_gpgconf_check.patch
diff --git a/meta/packages/gpgme/gpgme_1.3.0.bb b/meta/recipes-support/gpgme/gpgme_1.3.0.bb
index 1c665b5ea4..1c665b5ea4 100644
--- a/meta/packages/gpgme/gpgme_1.3.0.bb
+++ b/meta/recipes-support/gpgme/gpgme_1.3.0.bb
diff --git a/meta/packages/hal/files/20hal b/meta/recipes-support/hal/files/20hal
index 5b97c4f9e6..5b97c4f9e6 100755
--- a/meta/packages/hal/files/20hal
+++ b/meta/recipes-support/hal/files/20hal
diff --git a/meta/packages/hal/files/autoconf.diff b/meta/recipes-support/hal/files/autoconf.diff
index eb30cccdbe..eb30cccdbe 100644
--- a/meta/packages/hal/files/autoconf.diff
+++ b/meta/recipes-support/hal/files/autoconf.diff
diff --git a/meta/packages/hal/files/hal-right-input-h.patch b/meta/recipes-support/hal/files/hal-right-input-h.patch
index f820b7790a..f820b7790a 100644
--- a/meta/packages/hal/files/hal-right-input-h.patch
+++ b/meta/recipes-support/hal/files/hal-right-input-h.patch
diff --git a/meta/packages/hal/files/sg-inhibit.patch b/meta/recipes-support/hal/files/sg-inhibit.patch
index f0cc41448a..f0cc41448a 100644
--- a/meta/packages/hal/files/sg-inhibit.patch
+++ b/meta/recipes-support/hal/files/sg-inhibit.patch
diff --git a/meta/packages/hal/hal-info.inc b/meta/recipes-support/hal/hal-info.inc
index adba83fb28..adba83fb28 100644
--- a/meta/packages/hal/hal-info.inc
+++ b/meta/recipes-support/hal/hal-info.inc
diff --git a/meta/packages/hal/hal-info_20091130.bb b/meta/recipes-support/hal/hal-info_20091130.bb
index e6d50e3981..e6d50e3981 100644
--- a/meta/packages/hal/hal-info_20091130.bb
+++ b/meta/recipes-support/hal/hal-info_20091130.bb
diff --git a/meta/packages/hal/hal-info_git.bb b/meta/recipes-support/hal/hal-info_git.bb
index 3fff5e0a7d..3fff5e0a7d 100644
--- a/meta/packages/hal/hal-info_git.bb
+++ b/meta/recipes-support/hal/hal-info_git.bb
diff --git a/meta/packages/hal/hal.inc b/meta/recipes-support/hal/hal.inc
index 839dfd0652..839dfd0652 100644
--- a/meta/packages/hal/hal.inc
+++ b/meta/recipes-support/hal/hal.inc
diff --git a/meta/packages/hal/hal/configure_fix.patch b/meta/recipes-support/hal/hal/configure_fix.patch
index e8417040de..e8417040de 100644
--- a/meta/packages/hal/hal/configure_fix.patch
+++ b/meta/recipes-support/hal/hal/configure_fix.patch
diff --git a/meta/packages/hal/hal_0.5.14.bb b/meta/recipes-support/hal/hal_0.5.14.bb
index a12be729cb..a12be729cb 100644
--- a/meta/packages/hal/hal_0.5.14.bb
+++ b/meta/recipes-support/hal/hal_0.5.14.bb
diff --git a/meta/packages/hal/hal_git.bb b/meta/recipes-support/hal/hal_git.bb
index baed472375..baed472375 100644
--- a/meta/packages/hal/hal_git.bb
+++ b/meta/recipes-support/hal/hal_git.bb
diff --git a/meta/packages/icu/files/gccfix.patch b/meta/recipes-support/icu/files/gccfix.patch
index 9291e921d3..9291e921d3 100644
--- a/meta/packages/icu/files/gccfix.patch
+++ b/meta/recipes-support/icu/files/gccfix.patch
diff --git a/meta/packages/icu/files/noldlibpath.patch b/meta/recipes-support/icu/files/noldlibpath.patch
index eba3d805d4..eba3d805d4 100644
--- a/meta/packages/icu/files/noldlibpath.patch
+++ b/meta/recipes-support/icu/files/noldlibpath.patch
diff --git a/meta/packages/icu/files/use-g++-for-linking.patch b/meta/recipes-support/icu/files/use-g++-for-linking.patch
index 4702abc065..4702abc065 100644
--- a/meta/packages/icu/files/use-g++-for-linking.patch
+++ b/meta/recipes-support/icu/files/use-g++-for-linking.patch
diff --git a/meta/packages/icu/icu-3.6.inc b/meta/recipes-support/icu/icu-3.6.inc
index 1c611bdf36..1c611bdf36 100644
--- a/meta/packages/icu/icu-3.6.inc
+++ b/meta/recipes-support/icu/icu-3.6.inc
diff --git a/meta/packages/icu/icu_3.6.bb b/meta/recipes-support/icu/icu_3.6.bb
index 5042116009..5042116009 100644
--- a/meta/packages/icu/icu_3.6.bb
+++ b/meta/recipes-support/icu/icu_3.6.bb
diff --git a/meta/packages/iso-codes/iso-codes_3.3.bb b/meta/recipes-support/iso-codes/iso-codes_3.3.bb
index 23d025f4d2..23d025f4d2 100644
--- a/meta/packages/iso-codes/iso-codes_3.3.bb
+++ b/meta/recipes-support/iso-codes/iso-codes_3.3.bb
diff --git a/meta/packages/js/files/buildcc.patch b/meta/recipes-support/js/files/buildcc.patch
index 26eef218d6..26eef218d6 100644
--- a/meta/packages/js/files/buildcc.patch
+++ b/meta/recipes-support/js/files/buildcc.patch
diff --git a/meta/packages/js/files/configure.ac b/meta/recipes-support/js/files/configure.ac
index 41af298455..41af298455 100644
--- a/meta/packages/js/files/configure.ac
+++ b/meta/recipes-support/js/files/configure.ac
diff --git a/meta/packages/js/files/jsautocfg.h b/meta/recipes-support/js/files/jsautocfg.h
index 16e38bf8d6..16e38bf8d6 100644
--- a/meta/packages/js/files/jsautocfg.h
+++ b/meta/recipes-support/js/files/jsautocfg.h
diff --git a/meta/packages/js/files/link_with_gcc.patch b/meta/recipes-support/js/files/link_with_gcc.patch
index d74b94f378..d74b94f378 100644
--- a/meta/packages/js/files/link_with_gcc.patch
+++ b/meta/recipes-support/js/files/link_with_gcc.patch
diff --git a/meta/packages/js/files/usepic.patch b/meta/recipes-support/js/files/usepic.patch
index ddd31be9cb..ddd31be9cb 100644
--- a/meta/packages/js/files/usepic.patch
+++ b/meta/recipes-support/js/files/usepic.patch
diff --git a/meta/packages/js/js_1.7.0+1.8.0rc1.bb b/meta/recipes-support/js/js_1.7.0+1.8.0rc1.bb
index 97cba90d03..97cba90d03 100644
--- a/meta/packages/js/js_1.7.0+1.8.0rc1.bb
+++ b/meta/recipes-support/js/js_1.7.0+1.8.0rc1.bb
diff --git a/meta/packages/libassuan/libassuan_2.0.0.bb b/meta/recipes-support/libassuan/libassuan_2.0.0.bb
index 11934013ce..11934013ce 100644
--- a/meta/packages/libassuan/libassuan_2.0.0.bb
+++ b/meta/recipes-support/libassuan/libassuan_2.0.0.bb
diff --git a/meta/packages/libcap/libcap.inc b/meta/recipes-support/libcap/libcap.inc
index 16eaae690c..16eaae690c 100644
--- a/meta/packages/libcap/libcap.inc
+++ b/meta/recipes-support/libcap/libcap.inc
diff --git a/meta/packages/libcap/libcap_2.19.bb b/meta/recipes-support/libcap/libcap_2.19.bb
index eb861535e9..eb861535e9 100644
--- a/meta/packages/libcap/libcap_2.19.bb
+++ b/meta/recipes-support/libcap/libcap_2.19.bb
diff --git a/meta/packages/libcheck/libcheck_0.9.8.bb b/meta/recipes-support/libcheck/libcheck_0.9.8.bb
index 048b8ce622..048b8ce622 100644
--- a/meta/packages/libcheck/libcheck_0.9.8.bb
+++ b/meta/recipes-support/libcheck/libcheck_0.9.8.bb
diff --git a/meta/packages/libcroco/files/croco.patch b/meta/recipes-support/libcroco/files/croco.patch
index 572f9de59f..572f9de59f 100644
--- a/meta/packages/libcroco/files/croco.patch
+++ b/meta/recipes-support/libcroco/files/croco.patch
diff --git a/meta/packages/libcroco/libcroco_0.6.2.bb b/meta/recipes-support/libcroco/libcroco_0.6.2.bb
index 2ea33b155b..2ea33b155b 100644
--- a/meta/packages/libcroco/libcroco_0.6.2.bb
+++ b/meta/recipes-support/libcroco/libcroco_0.6.2.bb
diff --git a/meta/packages/libdaemon/libdaemon_0.14.bb b/meta/recipes-support/libdaemon/libdaemon_0.14.bb
index b4092fdbb9..b4092fdbb9 100644
--- a/meta/packages/libdaemon/libdaemon_0.14.bb
+++ b/meta/recipes-support/libdaemon/libdaemon_0.14.bb
diff --git a/meta/packages/libevent/libevent_1.4.14b.bb b/meta/recipes-support/libevent/libevent_1.4.14b.bb
index 4209305512..4209305512 100644
--- a/meta/packages/libevent/libevent_1.4.14b.bb
+++ b/meta/recipes-support/libevent/libevent_1.4.14b.bb
diff --git a/meta/packages/libfm/libfm_0.1.12.bb b/meta/recipes-support/libfm/libfm_0.1.12.bb
index 83e6af8523..83e6af8523 100644
--- a/meta/packages/libfm/libfm_0.1.12.bb
+++ b/meta/recipes-support/libfm/libfm_0.1.12.bb
diff --git a/meta/packages/libfribidi/files/libtool-update.patch b/meta/recipes-support/libfribidi/files/libtool-update.patch
index c7031008fd..c7031008fd 100644
--- a/meta/packages/libfribidi/files/libtool-update.patch
+++ b/meta/recipes-support/libfribidi/files/libtool-update.patch
diff --git a/meta/packages/libfribidi/libfribidi_0.10.4.bb b/meta/recipes-support/libfribidi/libfribidi_0.10.4.bb
index a9850fe52d..a9850fe52d 100644
--- a/meta/packages/libfribidi/libfribidi_0.10.4.bb
+++ b/meta/recipes-support/libfribidi/libfribidi_0.10.4.bb
diff --git a/meta/packages/libgcrypt/files/add-pkgconfig-support.patch b/meta/recipes-support/libgcrypt/files/add-pkgconfig-support.patch
index 24a59787a2..24a59787a2 100644
--- a/meta/packages/libgcrypt/files/add-pkgconfig-support.patch
+++ b/meta/recipes-support/libgcrypt/files/add-pkgconfig-support.patch
diff --git a/meta/packages/libgcrypt/libgcrypt.inc b/meta/recipes-support/libgcrypt/libgcrypt.inc
index 08fe7992fa..08fe7992fa 100644
--- a/meta/packages/libgcrypt/libgcrypt.inc
+++ b/meta/recipes-support/libgcrypt/libgcrypt.inc
diff --git a/meta/packages/libgcrypt/libgcrypt_1.4.6.bb b/meta/recipes-support/libgcrypt/libgcrypt_1.4.6.bb
index a592437913..a592437913 100644
--- a/meta/packages/libgcrypt/libgcrypt_1.4.6.bb
+++ b/meta/recipes-support/libgcrypt/libgcrypt_1.4.6.bb
diff --git a/meta/packages/libgdbus/libgdbus_git.bb b/meta/recipes-support/libgdbus/libgdbus_git.bb
index f0101f9925..f0101f9925 100644
--- a/meta/packages/libgdbus/libgdbus_git.bb
+++ b/meta/recipes-support/libgdbus/libgdbus_git.bb
diff --git a/meta/packages/libgpg-error/libgpg-error-1.8/pkgconfig.patch b/meta/recipes-support/libgpg-error/libgpg-error-1.8/pkgconfig.patch
index 49e47d874e..49e47d874e 100644
--- a/meta/packages/libgpg-error/libgpg-error-1.8/pkgconfig.patch
+++ b/meta/recipes-support/libgpg-error/libgpg-error-1.8/pkgconfig.patch
diff --git a/meta/packages/libgpg-error/libgpg-error_1.8.bb b/meta/recipes-support/libgpg-error/libgpg-error_1.8.bb
index 120feecafa..120feecafa 100644
--- a/meta/packages/libgpg-error/libgpg-error_1.8.bb
+++ b/meta/recipes-support/libgpg-error/libgpg-error_1.8.bb
diff --git a/meta/packages/libiconv/libiconv_1.9.2.bb b/meta/recipes-support/libiconv/libiconv_1.9.2.bb
index d427dcef83..d427dcef83 100644
--- a/meta/packages/libiconv/libiconv_1.9.2.bb
+++ b/meta/recipes-support/libiconv/libiconv_1.9.2.bb
diff --git a/meta/packages/libmpc/libmpc.inc b/meta/recipes-support/libmpc/libmpc.inc
index 6e18e588be..6e18e588be 100644
--- a/meta/packages/libmpc/libmpc.inc
+++ b/meta/recipes-support/libmpc/libmpc.inc
diff --git a/meta/packages/libmpc/libmpc_0.8.2.bb b/meta/recipes-support/libmpc/libmpc_0.8.2.bb
index 1792066e77..1792066e77 100644
--- a/meta/packages/libmpc/libmpc_0.8.2.bb
+++ b/meta/recipes-support/libmpc/libmpc_0.8.2.bb
diff --git a/meta/packages/libnl/libnl/compilefix.patch b/meta/recipes-support/libnl/libnl/compilefix.patch
index f75ff282af..f75ff282af 100644
--- a/meta/packages/libnl/libnl/compilefix.patch
+++ b/meta/recipes-support/libnl/libnl/compilefix.patch
diff --git a/meta/packages/libnl/libnl/local-includes.patch b/meta/recipes-support/libnl/libnl/local-includes.patch
index 5af463004b..5af463004b 100644
--- a/meta/packages/libnl/libnl/local-includes.patch
+++ b/meta/recipes-support/libnl/libnl/local-includes.patch
diff --git a/meta/packages/libnl/libnl_1.1.bb b/meta/recipes-support/libnl/libnl_1.1.bb
index 683df9159f..683df9159f 100644
--- a/meta/packages/libnl/libnl_1.1.bb
+++ b/meta/recipes-support/libnl/libnl_1.1.bb
diff --git a/meta/packages/liboil/liboil-0.3.17/no-tests.patch b/meta/recipes-support/liboil/liboil-0.3.17/no-tests.patch
index 00cf5d7431..00cf5d7431 100644
--- a/meta/packages/liboil/liboil-0.3.17/no-tests.patch
+++ b/meta/recipes-support/liboil/liboil-0.3.17/no-tests.patch
diff --git a/meta/packages/liboil/liboil_0.3.17.bb b/meta/recipes-support/liboil/liboil_0.3.17.bb
index 8ba303069d..8ba303069d 100644
--- a/meta/packages/liboil/liboil_0.3.17.bb
+++ b/meta/recipes-support/liboil/liboil_0.3.17.bb
diff --git a/meta/packages/libpcre/files/pcre-cross.patch b/meta/recipes-support/libpcre/files/pcre-cross.patch
index 0626fb347a..0626fb347a 100644
--- a/meta/packages/libpcre/files/pcre-cross.patch
+++ b/meta/recipes-support/libpcre/files/pcre-cross.patch
diff --git a/meta/packages/libpcre/libpcre_8.10.bb b/meta/recipes-support/libpcre/libpcre_8.10.bb
index 840d74a658..840d74a658 100644
--- a/meta/packages/libpcre/libpcre_8.10.bb
+++ b/meta/recipes-support/libpcre/libpcre_8.10.bb
diff --git a/meta/packages/libproxy/libproxy_0.4.3.bb b/meta/recipes-support/libproxy/libproxy_0.4.3.bb
index 6c0b7a50c6..6c0b7a50c6 100644
--- a/meta/packages/libproxy/libproxy_0.4.3.bb
+++ b/meta/recipes-support/libproxy/libproxy_0.4.3.bb
diff --git a/meta/packages/libsoup/libsoup-2.4_2.31.2.bb b/meta/recipes-support/libsoup/libsoup-2.4_2.31.2.bb
index 9a00e07da0..9a00e07da0 100644
--- a/meta/packages/libsoup/libsoup-2.4_2.31.2.bb
+++ b/meta/recipes-support/libsoup/libsoup-2.4_2.31.2.bb
diff --git a/meta/packages/libsoup/libsoup-2.4_2.4.1.bb b/meta/recipes-support/libsoup/libsoup-2.4_2.4.1.bb
index f48ac3d6c9..f48ac3d6c9 100644
--- a/meta/packages/libsoup/libsoup-2.4_2.4.1.bb
+++ b/meta/recipes-support/libsoup/libsoup-2.4_2.4.1.bb
diff --git a/meta/packages/libsoup/libsoup_2.2.100.bb b/meta/recipes-support/libsoup/libsoup_2.2.100.bb
index 94efb7f676..94efb7f676 100644
--- a/meta/packages/libsoup/libsoup_2.2.100.bb
+++ b/meta/recipes-support/libsoup/libsoup_2.2.100.bb
diff --git a/meta/packages/liburcu/liburcu_0.4.6.bb b/meta/recipes-support/liburcu/liburcu_0.4.6.bb
index 503b561d37..503b561d37 100644
--- a/meta/packages/liburcu/liburcu_0.4.6.bb
+++ b/meta/recipes-support/liburcu/liburcu_0.4.6.bb
diff --git a/meta/packages/libusb/libusb-compat-0.1.3/0.1.0-beta1-gcc3.4-fix.patch b/meta/recipes-support/libusb/libusb-compat-0.1.3/0.1.0-beta1-gcc3.4-fix.patch
index 501ba3fb29..501ba3fb29 100644
--- a/meta/packages/libusb/libusb-compat-0.1.3/0.1.0-beta1-gcc3.4-fix.patch
+++ b/meta/recipes-support/libusb/libusb-compat-0.1.3/0.1.0-beta1-gcc3.4-fix.patch
diff --git a/meta/packages/libusb/libusb-compat_0.1.3.bb b/meta/recipes-support/libusb/libusb-compat_0.1.3.bb
index e8d6338e57..e8d6338e57 100644
--- a/meta/packages/libusb/libusb-compat_0.1.3.bb
+++ b/meta/recipes-support/libusb/libusb-compat_0.1.3.bb
diff --git a/meta/packages/libusb/libusb1_1.0.8.bb b/meta/recipes-support/libusb/libusb1_1.0.8.bb
index 26a535ab4e..26a535ab4e 100644
--- a/meta/packages/libusb/libusb1_1.0.8.bb
+++ b/meta/recipes-support/libusb/libusb1_1.0.8.bb
diff --git a/meta/packages/libxslt/libxslt/pkgconfig_fix.patch b/meta/recipes-support/libxslt/libxslt/pkgconfig_fix.patch
index d21663896f..d21663896f 100644
--- a/meta/packages/libxslt/libxslt/pkgconfig_fix.patch
+++ b/meta/recipes-support/libxslt/libxslt/pkgconfig_fix.patch
diff --git a/meta/packages/libxslt/libxslt_1.1.26.bb b/meta/recipes-support/libxslt/libxslt_1.1.26.bb
index b5726974f1..b5726974f1 100644
--- a/meta/packages/libxslt/libxslt_1.1.26.bb
+++ b/meta/recipes-support/libxslt/libxslt_1.1.26.bb
diff --git a/meta/packages/lzo/lzo-2.03/acinclude.m4 b/meta/recipes-support/lzo/lzo-2.03/acinclude.m4
index c4d2ccd5b5..c4d2ccd5b5 100644
--- a/meta/packages/lzo/lzo-2.03/acinclude.m4
+++ b/meta/recipes-support/lzo/lzo-2.03/acinclude.m4
diff --git a/meta/packages/lzo/lzo-2.03/autofoo.patch b/meta/recipes-support/lzo/lzo-2.03/autofoo.patch
index 5762f4c6e2..5762f4c6e2 100644
--- a/meta/packages/lzo/lzo-2.03/autofoo.patch
+++ b/meta/recipes-support/lzo/lzo-2.03/autofoo.patch
diff --git a/meta/packages/lzo/lzo_2.03.bb b/meta/recipes-support/lzo/lzo_2.03.bb
index 9657d97e59..9657d97e59 100644
--- a/meta/packages/lzo/lzo_2.03.bb
+++ b/meta/recipes-support/lzo/lzo_2.03.bb
diff --git a/meta/recipes-devtools/mpfr/mpfr.inc b/meta/recipes-support/mpfr/mpfr.inc
index dbb859fe3e..dbb859fe3e 100644
--- a/meta/recipes-devtools/mpfr/mpfr.inc
+++ b/meta/recipes-support/mpfr/mpfr.inc
diff --git a/meta/recipes-devtools/mpfr/mpfr_3.0.0.bb b/meta/recipes-support/mpfr/mpfr_3.0.0.bb
index 188a5d95cd..188a5d95cd 100644
--- a/meta/recipes-devtools/mpfr/mpfr_3.0.0.bb
+++ b/meta/recipes-support/mpfr/mpfr_3.0.0.bb
diff --git a/meta/packages/neon/neon-0.29.3/pkgconfig.patch b/meta/recipes-support/neon/neon-0.29.3/pkgconfig.patch
index 6256d9ab2b..6256d9ab2b 100644
--- a/meta/packages/neon/neon-0.29.3/pkgconfig.patch
+++ b/meta/recipes-support/neon/neon-0.29.3/pkgconfig.patch
diff --git a/meta/packages/neon/neon_0.29.3.bb b/meta/recipes-support/neon/neon_0.29.3.bb
index bb18893f9e..bb18893f9e 100644
--- a/meta/packages/neon/neon_0.29.3.bb
+++ b/meta/recipes-support/neon/neon_0.29.3.bb
diff --git a/meta/packages/ohm/ohm/fix_configure.patch b/meta/recipes-support/ohm/ohm/fix_configure.patch
index e4b774e785..e4b774e785 100644
--- a/meta/packages/ohm/ohm/fix_configure.patch
+++ b/meta/recipes-support/ohm/ohm/fix_configure.patch
diff --git a/meta/packages/ohm/ohm_git.bb b/meta/recipes-support/ohm/ohm_git.bb
index 2ba78b35ab..2ba78b35ab 100644
--- a/meta/packages/ohm/ohm_git.bb
+++ b/meta/recipes-support/ohm/ohm_git.bb
diff --git a/meta/packages/openobex/files/disable-cable-test.patch b/meta/recipes-support/openobex/files/disable-cable-test.patch
index 95b636dd8f..95b636dd8f 100644
--- a/meta/packages/openobex/files/disable-cable-test.patch
+++ b/meta/recipes-support/openobex/files/disable-cable-test.patch
diff --git a/meta/packages/openobex/files/libusb_crosscompile_check.patch b/meta/recipes-support/openobex/files/libusb_crosscompile_check.patch
index 20ac70bd1e..20ac70bd1e 100644
--- a/meta/packages/openobex/files/libusb_crosscompile_check.patch
+++ b/meta/recipes-support/openobex/files/libusb_crosscompile_check.patch
diff --git a/meta/packages/openobex/openobex_1.5.bb b/meta/recipes-support/openobex/openobex_1.5.bb
index dc07ae1353..dc07ae1353 100644
--- a/meta/packages/openobex/openobex_1.5.bb
+++ b/meta/recipes-support/openobex/openobex_1.5.bb
diff --git a/meta/packages/popt/popt_1.16.bb b/meta/recipes-support/popt/popt_1.16.bb
index 347c0fc4a4..347c0fc4a4 100644
--- a/meta/packages/popt/popt_1.16.bb
+++ b/meta/recipes-support/popt/popt_1.16.bb
diff --git a/meta/packages/pth/pth_2.0.7.bb b/meta/recipes-support/pth/pth_2.0.7.bb
index 8ee3cd4cd1..8ee3cd4cd1 100644
--- a/meta/packages/pth/pth_2.0.7.bb
+++ b/meta/recipes-support/pth/pth_2.0.7.bb
diff --git a/meta/packages/shared-mime-info/shared-mime-info.inc b/meta/recipes-support/shared-mime-info/shared-mime-info.inc
index c2e5487019..c2e5487019 100644
--- a/meta/packages/shared-mime-info/shared-mime-info.inc
+++ b/meta/recipes-support/shared-mime-info/shared-mime-info.inc
diff --git a/meta/packages/shared-mime-info/shared-mime-info_0.71.bb b/meta/recipes-support/shared-mime-info/shared-mime-info_0.71.bb
index fc64c2b0e0..fc64c2b0e0 100644
--- a/meta/packages/shared-mime-info/shared-mime-info_0.71.bb
+++ b/meta/recipes-support/shared-mime-info/shared-mime-info_0.71.bb
diff --git a/meta/packages/sqlite/sqlite3.inc b/meta/recipes-support/sqlite/sqlite3.inc
index 709e3016b8..709e3016b8 100644
--- a/meta/packages/sqlite/sqlite3.inc
+++ b/meta/recipes-support/sqlite/sqlite3.inc
diff --git a/meta/packages/sqlite/sqlite3/libtool.patch b/meta/recipes-support/sqlite/sqlite3/libtool.patch
index ccf9993ed2..ccf9993ed2 100644
--- a/meta/packages/sqlite/sqlite3/libtool.patch
+++ b/meta/recipes-support/sqlite/sqlite3/libtool.patch
diff --git a/meta/packages/sqlite/sqlite3_3.6.23.1.bb b/meta/recipes-support/sqlite/sqlite3_3.6.23.1.bb
index 5075dd35b7..5075dd35b7 100644
--- a/meta/packages/sqlite/sqlite3_3.6.23.1.bb
+++ b/meta/recipes-support/sqlite/sqlite3_3.6.23.1.bb
diff --git a/meta/packages/vte/vte.inc b/meta/recipes-support/vte/vte.inc
index 6138f8ca01..6138f8ca01 100644
--- a/meta/packages/vte/vte.inc
+++ b/meta/recipes-support/vte/vte.inc
diff --git a/meta/packages/vte/vte_0.24.3.bb b/meta/recipes-support/vte/vte_0.24.3.bb
index 1953101f82..1953101f82 100644
--- a/meta/packages/vte/vte_0.24.3.bb
+++ b/meta/recipes-support/vte/vte_0.24.3.bb
diff --git a/meta/packages/poppler/poppler-data_0.1.bb b/meta/recipes-tbd/poppler/poppler-data_0.1.bb
index ca22e4dba0..ca22e4dba0 100644
--- a/meta/packages/poppler/poppler-data_0.1.bb
+++ b/meta/recipes-tbd/poppler/poppler-data_0.1.bb
diff --git a/meta/packages/poppler/poppler-fpu.inc b/meta/recipes-tbd/poppler/poppler-fpu.inc
index a26273020a..a26273020a 100644
--- a/meta/packages/poppler/poppler-fpu.inc
+++ b/meta/recipes-tbd/poppler/poppler-fpu.inc
diff --git a/meta/packages/poppler/poppler.inc b/meta/recipes-tbd/poppler/poppler.inc
index 645e734e8b..645e734e8b 100644
--- a/meta/packages/poppler/poppler.inc
+++ b/meta/recipes-tbd/poppler/poppler.inc
diff --git a/meta/packages/poppler/poppler_0.9.2.bb b/meta/recipes-tbd/poppler/poppler_0.9.2.bb
index 92c25bc0ac..92c25bc0ac 100644
--- a/meta/packages/poppler/poppler_0.9.2.bb
+++ b/meta/recipes-tbd/poppler/poppler_0.9.2.bb
diff --git a/meta/packages/xournal/files/ldflags.patch b/meta/recipes-tbd/xournal/files/ldflags.patch
index 7f6585befb..7f6585befb 100644
--- a/meta/packages/xournal/files/ldflags.patch
+++ b/meta/recipes-tbd/xournal/files/ldflags.patch
diff --git a/meta/packages/xournal/files/no-printing.diff b/meta/recipes-tbd/xournal/files/no-printing.diff
index 7a4724e696..7a4724e696 100644
--- a/meta/packages/xournal/files/no-printing.diff
+++ b/meta/recipes-tbd/xournal/files/no-printing.diff
diff --git a/meta/packages/xournal/xournal_0.2.bb b/meta/recipes-tbd/xournal/xournal_0.2.bb
index 1ca6e1ed7c..1ca6e1ed7c 100644
--- a/meta/packages/xournal/xournal_0.2.bb
+++ b/meta/recipes-tbd/xournal/xournal_0.2.bb