Major layout change to the packages directory

Having one monolithic packages directory makes it hard to find things
and is generally overwhelming. This commit splits it into several
logical sections roughly based on function, recipes.txt gives more
information about the classifications used.

The opportunity is also used to switch from "packages" to "recipes"
as used in OpenEmbedded as the term "packages" can be confusing to
people and has many different meanings.

Not all recipes have been classified yet, this is just a first pass
at separating things out. Some packages are moved to meta-extras as
they're no longer actively used or maintained.

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

53 files changed, 0 insertions, 948 deletions

diff --git a/meta/packages/clutter/aaina.inc b/meta/packages/clutter/aaina.inc
deleted file mode 100644
index afbc022cdb..0000000000
--- a/meta/packages/clutter/aaina.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-DESCRIPTION = "Aaina Clutter Demo"
-HOMEPAGE = "http://www.clutter-project.org/"
-LICENSE = "GPL"
-
-DEPENDS = "clutter-0.6 libxml2 gtk+ neon"
-
-inherit autotools pkgconfig
diff --git a/meta/packages/clutter/aaina_git.bb b/meta/packages/clutter/aaina_git.bb
deleted file mode 100644
index a348cd3d4d..0000000000
--- a/meta/packages/clutter/aaina_git.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require aaina.inc
-
-PV = "0.3.0+git${SRCPV}"
-
-SRC_URI = "git://git.clutter-project.org/toys.git;protocol=git"
-
-S = "${WORKDIR}/git/aaina"
diff --git a/meta/packages/clutter/clutter-0.6_git.bb b/meta/packages/clutter/clutter-0.6_git.bb
deleted file mode 100644
index 5a8ccec164..0000000000
--- a/meta/packages/clutter/clutter-0.6_git.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-require clutter.inc
-
-PV = "0.6.0+gitr${SRCPV}"
-PR = "r5"
-
-PACKAGES =+ "clutter-examples-0.6"
-FILES_clutter-examples-0.6 = "${bindir}/test-* ${pkgdatadir}/redhand.png"
-
-
-SRC_URI = "git://git.clutter-project.org/clutter.git;protocol=git;branch=clutter-0-6 \
-           file://symconflict.patch;patch=1 \
-	   file://enable_tests-0.6.patch;patch=1 "
-
-S = "${WORKDIR}/git"
-
diff --git a/meta/packages/clutter/clutter-0.8_git.bb b/meta/packages/clutter/clutter-0.8_git.bb
deleted file mode 100644
index 71e6198030..0000000000
--- a/meta/packages/clutter/clutter-0.8_git.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-require clutter.inc
-
-PV = "0.8.0+gitr${SRCREV}"
-PR = "r2"
-
-PACKAGES =+ "clutter-examples-0.8"
-FILES_clutter-examples-0.8 = "${bindir}/test-* ${pkgdatadir}/redhand.png"
-
-SRC_URI = "git://git.clutter-project.org/clutter.git;protocol=git;branch=clutter-0-8 \
-	   file://enable_tests-0.8.patch;patch=1 \
-     file://build-fix.patch;patch=1"
-
-S = "${WORKDIR}/git"
diff --git a/meta/packages/clutter/clutter-1.0_git.bb b/meta/packages/clutter/clutter-1.0_git.bb
deleted file mode 100644
index 7e62954ee5..0000000000
--- a/meta/packages/clutter/clutter-1.0_git.bb
+++ /dev/null
@@ -1,20 +0,0 @@
-require clutter.inc
-
-PV = "1.0+git${SRCPV}"
-PR = "r3"
-
-PACKAGES =+ "clutter-examples-1.0"
-FILES_clutter-examples-1.0 = "${bindir}/test-* ${pkgdatadir}/redhand.png"
-
-SRC_URI = "git://git.clutter-project.org/clutter.git;protocol=git;branch=clutter-1.0 \
-           file://enable_tests-1.0.patch;patch=1 "
-
-S = "${WORKDIR}/git"
-
-BASE_CONF += "--disable-introspection"
-
-
-do_configure_prepend () {
-	# Disable DOLT
-	sed -i -e 's/^DOLT//' ${S}/configure.ac
-}
diff --git a/meta/packages/clutter/clutter-box2d.inc b/meta/packages/clutter/clutter-box2d.inc
deleted file mode 100644
index 1a107c3993..0000000000
--- a/meta/packages/clutter/clutter-box2d.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-DESCRIPTION = "Clutter Box2D"
-HOMEPAGE = "http://www.clutter-project.org/"
-LICENSE = "GPLv2"
-
-DEPENDS = "clutter-0.8"
-
-# The main clutter lib is machine specific so we need to be too
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-inherit autotools pkgconfig gtk-doc
-
-do_install_append () {
-	install -d ${D}${bindir}
-	install ${S}/examples/.libs/blockbox ${D}${bindir}
-}
diff --git a/meta/packages/clutter/clutter-box2d_git.bb b/meta/packages/clutter/clutter-box2d_git.bb
deleted file mode 100644
index 4c74ffeb44..0000000000
--- a/meta/packages/clutter/clutter-box2d_git.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require clutter-box2d.inc
-
-PV = "0.0+git${SRCPV}"
-PR = "r3"
-
-SRC_URI = "git://git.clutter-project.org/clutter-box2d.git;protocol=git"
-
-S = "${WORKDIR}/git"
-
-
diff --git a/meta/packages/clutter/clutter-cairo-0.6_git.bb b/meta/packages/clutter/clutter-cairo-0.6_git.bb
deleted file mode 100644
index 3b7f6a9be5..0000000000
--- a/meta/packages/clutter/clutter-cairo-0.6_git.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-require clutter-cairo.inc
-
-PV = "0.6.0+git${SRCREV}"
-PR = "r1"
-
-DEPENDS += "clutter-0.6"
-
-SRC_URI = "git://git.clutter-project.org/clutter-cairo.git;protocol=git;branch=clutter-cairo-0-6 \
-           file://enable_examples-0.6.patch;patch=1"
-
-S = "${WORKDIR}/git"
-
-
diff --git a/meta/packages/clutter/clutter-cairo-0.8_git.bb b/meta/packages/clutter/clutter-cairo-0.8_git.bb
deleted file mode 100644
index cb8482b742..0000000000
--- a/meta/packages/clutter/clutter-cairo-0.8_git.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require clutter-cairo.inc
-
-PV = "0.8.0+git${SRCPV}"
-
-DEPENDS += "clutter-0.8"
-
-SRC_URI = "git://git.clutter-project.org/clutter-cairo.git;protocol=git;branch=clutter-cairo-0-8 \
-           file://enable_examples.patch;patch=1"
-
-S = "${WORKDIR}/git"
-
-
diff --git a/meta/packages/clutter/clutter-cairo.inc b/meta/packages/clutter/clutter-cairo.inc
deleted file mode 100644
index ff889899e7..0000000000
--- a/meta/packages/clutter/clutter-cairo.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-DESCRIPTION = "Clutter Cairo"
-HOMEPAGE = "http://www.clutter-project.org/"
-LICENSE = "LGPL"
-
-DEPENDS = "cairo"
-
-FILESPATH = "${FILE_DIRNAME}/clutter-cairo"
-
-PACKAGES =+ "${PN}-examples"
-FILES_${PN}-examples = "${bindir}/flowers ${bindir}/clock"
-
-inherit autotools pkgconfig
-
diff --git a/meta/packages/clutter/clutter-cairo/enable_examples-0.6.patch b/meta/packages/clutter/clutter-cairo/enable_examples-0.6.patch
deleted file mode 100644
index 3baea4c5c9..0000000000
--- a/meta/packages/clutter/clutter-cairo/enable_examples-0.6.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Index: clutter-cairo-0-6/examples/Makefile.am
-===================================================================
---- clutter-cairo-0-6.orig/examples/Makefile.am	2008-10-02 22:03:18.000000000 +0100
-+++ clutter-cairo-0-6/examples/Makefile.am	2008-10-02 22:03:31.000000000 +0100
-@@ -1,4 +1,4 @@
--noinst_PROGRAMS = clock flowers
-+bin_PROGRAMS = clock flowers
- 
- INCLUDES = -I$(top_srcdir)/ @GCC_FLAGS@ @DEPS_CFLAGS@
- AM_LDFLAGS = @DEPS_LIBS@ $(top_builddir)/libclutter-cairo-@CLUTTER_CAIRO_MAJORMINOR@.la 
-Index: clutter-cairo-0-6/examples/flowers.c
-===================================================================
---- clutter-cairo-0-6.orig/examples/flowers.c	2008-10-02 22:03:23.000000000 +0100
-+++ clutter-cairo-0-6/examples/flowers.c	2008-10-02 22:03:39.000000000 +0100
-@@ -11,7 +11,7 @@
- 
- #define PETAL_MIN 20
- #define PETAL_VAR 40
--#define N_FLOWERS 40 /* reduce if you have a small card */
-+#define N_FLOWERS 8 /* reduce if you have a small card */
- 
- typedef struct Flower
- {
diff --git a/meta/packages/clutter/clutter-cairo/enable_examples.patch b/meta/packages/clutter/clutter-cairo/enable_examples.patch
deleted file mode 100644
index c5ed63ff12..0000000000
--- a/meta/packages/clutter/clutter-cairo/enable_examples.patch
+++ /dev/null
@@ -1,28 +0,0 @@
----
- examples/Makefile.am |    2 +-
- examples/flowers.c   |    2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-Index: clutter-cairo/examples/Makefile.am
-===================================================================
---- clutter-cairo.orig/examples/Makefile.am	2008-08-11 16:30:04.000000000 +0100
-+++ clutter-cairo/examples/Makefile.am	2008-08-11 16:30:24.000000000 +0100
-@@ -1,4 +1,4 @@
--noinst_PROGRAMS = clock flowers bubbles
-+bin_PROGRAMS = clock flowers bubbles
- 
- INCLUDES = -I$(top_srcdir)/ @GCC_FLAGS@ @DEPS_CFLAGS@
- AM_LDFLAGS = @DEPS_LIBS@ $(top_builddir)/libclutter-cairo-@CLUTTER_CAIRO_MAJORMINOR@.la 
-Index: clutter-cairo/examples/flowers.c
-===================================================================
---- clutter-cairo.orig/examples/flowers.c	2008-08-11 16:30:04.000000000 +0100
-+++ clutter-cairo/examples/flowers.c	2008-08-11 16:30:10.000000000 +0100
-@@ -11,7 +11,7 @@
- 
- #define PETAL_MIN 20
- #define PETAL_VAR 40
--#define N_FLOWERS 40 /* reduce if you have a small card */
-+#define N_FLOWERS 8 /* reduce if you have a small card */
- 
- typedef struct Flower
- {
diff --git a/meta/packages/clutter/clutter-fpu.inc b/meta/packages/clutter/clutter-fpu.inc
deleted file mode 100644
index 21a16feac2..0000000000
--- a/meta/packages/clutter/clutter-fpu.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-
-def get_clutter_fpu_setting(bb, d):
-	if bb.data.getVar('TARGET_FPU', d, 1) in [ 'soft' ]:
-		return "--without-fpu"
-	return ""
-
diff --git a/meta/packages/clutter/clutter-gst-0.10_git.bb b/meta/packages/clutter/clutter-gst-0.10_git.bb
deleted file mode 100644
index a0f874db25..0000000000
--- a/meta/packages/clutter/clutter-gst-0.10_git.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-require clutter-gst.inc
-
-PV = "0.10.0+git${SRCPV}"
-
-DEPENDS += "clutter-1.0"
-
-SRC_URI = "git://git.clutter-project.org/clutter-gst.git;protocol=git;branch=clutter-gst-0.10"
-
-S = "${WORKDIR}/git"
-
-do_configure_prepend () {
-       # Disable DOLT
-       sed -i -e 's/^DOLT//' ${S}/configure.ac
-}
diff --git a/meta/packages/clutter/clutter-gst-0.6_git.bb b/meta/packages/clutter/clutter-gst-0.6_git.bb
deleted file mode 100644
index 09979f9e0c..0000000000
--- a/meta/packages/clutter/clutter-gst-0.6_git.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require clutter-gst.inc
-
-PV = "0.6.0+git${SRCPV}"
-
-DEPENDS += "clutter-0.6"
-
-SRC_URI = "git://git.clutter-project.org/clutter-gst.git;protocol=git;branch=clutter-gst-0-6"
-
-S = "${WORKDIR}/git"
diff --git a/meta/packages/clutter/clutter-gst-0.8_git.bb b/meta/packages/clutter/clutter-gst-0.8_git.bb
deleted file mode 100644
index c5348ecefe..0000000000
--- a/meta/packages/clutter/clutter-gst-0.8_git.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require clutter-gst.inc
-
-PV = "0.8.0+git${SRCPV}"
-
-DEPENDS += "clutter-0.8"
-
-SRC_URI = "git://git.clutter-project.org/clutter-gst.git;protocol=git;branch=clutter-gst-0-8"
-
-S = "${WORKDIR}/git"
diff --git a/meta/packages/clutter/clutter-gst-1.0_git.bb b/meta/packages/clutter/clutter-gst-1.0_git.bb
deleted file mode 100644
index 5580596f09..0000000000
--- a/meta/packages/clutter/clutter-gst-1.0_git.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-require clutter-gst.inc
-
-PV = "0.11.0+git${SRCPV}"
-
-DEPENDS += "clutter-1.0"
-
-SRC_URI = "git://git.clutter-project.org/clutter-gst.git;protocol=git;branch=master"
-
-S = "${WORKDIR}/git"
-
-do_configure_prepend () {
-       # Disable DOLT
-       sed -i -e 's/^DOLT//' ${S}/configure.ac
-}
diff --git a/meta/packages/clutter/clutter-gst.inc b/meta/packages/clutter/clutter-gst.inc
deleted file mode 100644
index 0a2f261531..0000000000
--- a/meta/packages/clutter/clutter-gst.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-DESCRIPTION = "Clutter GStreamer"
-HOMEPAGE = "http://www.clutter-project.org/"
-LICENSE = "LGPL"
-
-DEPENDS = "clutter-1.0 gstreamer gst-plugins-base"
-
-FILESPATH = "${FILE_DIRNAME}/clutter-gst"
-
-PACKAGES =+ "${PN}-examples"
-FILES_${PN}-examples = "${bindir}/video-player ${bindir}/video-sink ${bindir}/audio"
-
-inherit autotools pkgconfig gtk-doc
-
diff --git a/meta/packages/clutter/clutter-gst/autofoo-0.4.patch b/meta/packages/clutter/clutter-gst/autofoo-0.4.patch
deleted file mode 100644
index 54df63d297..0000000000
--- a/meta/packages/clutter/clutter-gst/autofoo-0.4.patch
+++ /dev/null
@@ -1,15 +0,0 @@
----
- doc/reference/Makefile.am |    2 +-
- examples/Makefile.am      |    2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-Index: clutter-gst/examples/Makefile.am
-===================================================================
---- clutter-gst.orig/examples/Makefile.am	2007-11-06 12:31:36.000000000 +0000
-+++ clutter-gst/examples/Makefile.am	2007-11-06 18:53:59.000000000 +0000
-@@ -1,4 +1,4 @@
--noinst_PROGRAMS = video-player video-sink audio
-+bin_PROGRAMS = video-player video-sink audio
- 
- INCLUDES = -I$(top_srcdir)/
- 
diff --git a/meta/packages/clutter/clutter-gst/autofoo-9db4a61a25677764bb927369c5c68ada958fb65c.patch b/meta/packages/clutter/clutter-gst/autofoo-9db4a61a25677764bb927369c5c68ada958fb65c.patch
deleted file mode 100644
index 569b0d8be9..0000000000
--- a/meta/packages/clutter/clutter-gst/autofoo-9db4a61a25677764bb927369c5c68ada958fb65c.patch
+++ /dev/null
@@ -1,25 +0,0 @@
----
- doc/reference/Makefile.am |    2 +-
- examples/Makefile.am      |    2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-Index: clutter-gst/examples/Makefile.am
-===================================================================
---- clutter-gst.orig/examples/Makefile.am	2007-11-06 12:31:36.000000000 +0000
-+++ clutter-gst/examples/Makefile.am	2007-11-06 18:53:59.000000000 +0000
-@@ -1,4 +1,4 @@
--noinst_PROGRAMS = video-player video-sink audio
-+bin_PROGRAMS = video-player video-sink audio
- 
- INCLUDES = -I$(top_srcdir)/
- 
-Index: clutter-gst/doc/reference/Makefile.am
-===================================================================
---- clutter-gst.orig/doc/reference/Makefile.am	2007-11-06 19:36:56.000000000 +0000
-+++ clutter-gst/doc/reference/Makefile.am	2007-11-06 19:37:02.000000000 +0000
-@@ -77,4 +77,4 @@ include $(top_srcdir)/gtk-doc.make
- 
- # Other files to distribute
- # e.g. EXTRA_DIST += version.xml.in
--EXTRA_DIST += version.xml.in
-+EXTRA_DIST = version.xml.in
diff --git a/meta/packages/clutter/clutter-gst/autofoo.patch b/meta/packages/clutter/clutter-gst/autofoo.patch
deleted file mode 100644
index ad77d636c1..0000000000
--- a/meta/packages/clutter/clutter-gst/autofoo.patch
+++ /dev/null
@@ -1,27 +0,0 @@
----
- doc/reference/Makefile.am |    2 +-
- examples/Makefile.am      |    2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-Index: git/examples/Makefile.am
-===================================================================
---- git.orig/examples/Makefile.am	2009-06-30 16:41:53.000000000 +0100
-+++ git/examples/Makefile.am	2009-06-30 16:43:00.000000000 +0100
-@@ -1,6 +1,6 @@
- NULL = #
- 
--noinst_PROGRAMS = video-player video-sink audio-player
-+bin_PROGRAMS = video-player video-sink audio-player
- 
- INCLUDES = -I$(top_srcdir) \
- 	   $(MAINTAINER_CFLAGS) \
-Index: git/doc/reference/Makefile.am
-===================================================================
---- git.orig/doc/reference/Makefile.am	2009-06-30 16:41:53.000000000 +0100
-+++ git/doc/reference/Makefile.am	2009-06-30 16:41:53.000000000 +0100
-@@ -77,4 +77,4 @@
- 
- # Other files to distribute
- # e.g. EXTRA_DIST += version.xml.in
--EXTRA_DIST += version.xml.in
-+EXTRA_DIST = version.xml.in
diff --git a/meta/packages/clutter/clutter-gtk-0.10_git.bb b/meta/packages/clutter/clutter-gtk-0.10_git.bb
deleted file mode 100644
index d0613277a7..0000000000
--- a/meta/packages/clutter/clutter-gtk-0.10_git.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require clutter-gtk.inc
-
-PV = "0.10.3+git${SRCPV}"
-PR = "r1"
-
-SRC_URI = "git://git.clutter-project.org/clutter-gtk.git;protocol=git;branch=clutter-gtk-0.10"
-
-S = "${WORKDIR}/git"
-
-DEPENDS += "clutter-1.0"
-
-EXTRA_OECONF += "--disable-introspection"
diff --git a/meta/packages/clutter/clutter-gtk-0.6_git.bb b/meta/packages/clutter/clutter-gtk-0.6_git.bb
deleted file mode 100644
index d2633ff2d4..0000000000
--- a/meta/packages/clutter/clutter-gtk-0.6_git.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require clutter-gtk.inc
-
-PV = "0.6.0+git${SRCPV}"
-
-DEPENDS += "clutter-0.6"
-
-SRC_URI = "git://git.clutter-project.org/clutter-gtk.git;protocol=git;branch=clutter-gtk-0-6"
-
-S = "${WORKDIR}/git"
diff --git a/meta/packages/clutter/clutter-gtk-0.8_git.bb b/meta/packages/clutter/clutter-gtk-0.8_git.bb
deleted file mode 100644
index 506d3fb156..0000000000
--- a/meta/packages/clutter/clutter-gtk-0.8_git.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require clutter-gtk.inc
-
-PV = "0.8.0+git${SRCPV}"
-
-DEPENDS += "clutter-0.8"
-
-SRC_URI = "git://git.clutter-project.org/clutter-gtk.git;protocol=git;branch=clutter-gtk-0-8"
-
-S = "${WORKDIR}/git"
diff --git a/meta/packages/clutter/clutter-gtk-1.0_git.bb b/meta/packages/clutter/clutter-gtk-1.0_git.bb
deleted file mode 100644
index dfabbd56cc..0000000000
--- a/meta/packages/clutter/clutter-gtk-1.0_git.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require clutter-gtk.inc
-
-PV = "0.90.0+git${SRCPV}"
-PR = "r1"
-
-SRC_URI = "git://git.clutter-project.org/clutter-gtk.git;protocol=git;branch=master"
-
-S = "${WORKDIR}/git"
-
-DEPENDS += "clutter-1.0"
-
-EXTRA_OECONF += "--disable-introspection"
diff --git a/meta/packages/clutter/clutter-gtk.inc b/meta/packages/clutter/clutter-gtk.inc
deleted file mode 100644
index 89ae3e53ca..0000000000
--- a/meta/packages/clutter/clutter-gtk.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-DESCRIPTION = "Clutter GTK+"
-HOMEPAGE = "http://www.clutter-project.org/"
-LICENSE = "LGPL"
-
-DEPENDS = "gtk+"
-
-FILESPATH = "${FILE_DIRNAME}/clutter-gtk"
-
-PACKAGES =+ "${PN}-examples"
-FILES_${PN}-examples = "${bindir}/gtk-clutter-test ${bindir}/gtk-clutter-events ${bindir}/gtk-clutter-multistage"
-
-inherit autotools pkgconfig gtk-doc
-
diff --git a/meta/packages/clutter/clutter-helix.inc b/meta/packages/clutter/clutter-helix.inc
deleted file mode 100644
index 6bbbb244d7..0000000000
--- a/meta/packages/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/packages/clutter/clutter-helix_git.bb b/meta/packages/clutter/clutter-helix_git.bb
deleted file mode 100644
index 1c272306bf..0000000000
--- a/meta/packages/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/packages/clutter/clutter-mozembed.inc b/meta/packages/clutter/clutter-mozembed.inc
deleted file mode 100644
index 72c9412d04..0000000000
--- a/meta/packages/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/packages/clutter/clutter-mozembed/link-with-g++-da7632f3e2c8d1a70ab01cc7adb63760d8718b41.patch b/meta/packages/clutter/clutter-mozembed/link-with-g++-da7632f3e2c8d1a70ab01cc7adb63760d8718b41.patch
deleted file mode 100644
index 135b9e79f0..0000000000
--- a/meta/packages/clutter/clutter-mozembed/link-with-g++-da7632f3e2c8d1a70ab01cc7adb63760d8718b41.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: git/cluttermozembed/Makefile.am
-===================================================================
---- git.orig/cluttermozembed/Makefile.am	2009-06-10 15:04:54.000000000 +0100
-+++ git/cluttermozembed/Makefile.am	2009-06-10 15:10:12.000000000 +0100
-@@ -61,7 +61,7 @@
- 	clutter-mozembed-private.h
- source_c = \
- 	clutter-mozembed.c \
--	clutter-mozembed-download.c
-+	clutter-mozembed-download.c dummy.cpp
- 
- bin_PROGRAMS = clutter-mozheadless
- 
diff --git a/meta/packages/clutter/clutter-mozembed/link-with-g++.patch b/meta/packages/clutter/clutter-mozembed/link-with-g++.patch
deleted file mode 100644
index cc9d43a674..0000000000
--- a/meta/packages/clutter/clutter-mozembed/link-with-g++.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: git/cluttermozembed/Makefile.am
-===================================================================
---- git.orig/clutter-mozembed/Makefile.am	2009-07-24 16:58:24.000000000 +0100
-+++ git/clutter-mozembed/Makefile.am	2009-07-24 17:00:53.000000000 +0100
-@@ -66,7 +66,7 @@
- 	clutter-mozembed.c \
- 	clutter-mozembed-comms.c \
- 	clutter-mozembed-comms.h \
--	clutter-mozembed-download.c
-+	clutter-mozembed-download.c dummy.cpp
- 
- bin_PROGRAMS = clutter-mozheadless
- 
diff --git a/meta/packages/clutter/clutter-mozembed_git.bb b/meta/packages/clutter/clutter-mozembed_git.bb
deleted file mode 100644
index e2da2d6a7d..0000000000
--- a/meta/packages/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/clutter/clutter-package.inc b/meta/packages/clutter/clutter-package.inc
deleted file mode 100644
index 22993ffd01..0000000000
--- a/meta/packages/clutter/clutter-package.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-PACKAGES =+ "clutter-examples"
-FILES_clutter-examples = "${bindir}/test-* ${pkgdatadir}/redhand.png"
diff --git a/meta/packages/clutter/clutter.inc b/meta/packages/clutter/clutter.inc
deleted file mode 100644
index c099309bbb..0000000000
--- a/meta/packages/clutter/clutter.inc
+++ /dev/null
@@ -1,57 +0,0 @@
-DESCRIPTION = "Clutter graphics library"
-HOMEPAGE = "http://www.clutter-project.org/"
-LICENSE = "LGPL"
-
-COMPATIBLE_MACHINE = "(zylonite|mx31litekit|omap-3430ldp|omap-3430sdp|mx31ads|qemuarm|qemux86|ipodtouch|netbook|menlow)"
-
-STDDEPENDS = "virtual/libx11 gtk-doc-native pango glib-2.0 libxfixes gtk+ libxi"
-BASE_CONF = "--disable-gtk-doc ${@get_clutter_fpu_setting(bb, d)}"
-
-DEPENDS = "${STDDEPENDS} virtual/libgl"
-EXTRA_OECONF = "${BASE_CONF} --with-flavour=glx"
-
-DEPENDS_zylonite = "${STDDEPENDS} libgles-zylonite tslib"
-EXTRA_OECONF_zylonite = "${BASE_CONF} --with-flavour=eglnative"
-PACKAGE_ARCH_zylonite = "${MACHINE_ARCH}"
-LDFLAGS_append_zylonite = " -lnws -lstdc++ "
-
-DEPENDS_mx31litekit = "${STDDEPENDS} libgles-mx31 tslib"
-EXTRA_OECONF_mx31litekit = "${BASE_CONF} --with-flavour=eglnative"
-PACKAGE_ARCH_mx31litekit = "${MACHINE_ARCH}"
-LDFLAGS_append_mx31litekit = " -lpvrNULLWSEGL -lstdc++ "
-
-DEPENDS_omap-3430ldp = "${STDDEPENDS} libgles-omap3 tslib"
-# The eglx drivers are pretty dire, use eglnative
-EXTRA_OECONF_omap-3430ldp = "${BASE_CONF} --with-flavour=eglnative"
-PACKAGE_ARCH_omap-3430ldp = "${MACHINE_ARCH}"
-
-DEPENDS_omap-3430sdp = "${STDDEPENDS} libgles-omap3 tslib"
-# The eglx drivers are pretty dire, use eglnative
-EXTRA_OECONF_omap-3430sdp = "${BASE_CONF} --with-flavour=eglnative"
-PACKAGE_ARCH_omap-3430sdp = "${MACHINE_ARCH}"
-
-DEPENDS_mx31ads = "${STDDEPENDS} libgles-mx31 tslib"
-EXTRA_OECONF_mx31ads = "${BASE_CONF} --with-flavour=eglnative"
-PACKAGE_ARCH_mx31ads = "${MACHINE_ARCH}"
-LDFLAGS_append_mx31ads = " -lpvrNULLWSEGL -lstdc++ "
-
-DEPENDS_netbook = "${STDDEPENDS} virtual/xserver-xf86 virtual/libgl"
-EXTRA_OECONF_netbook = "${BASE_CONF} --with-flavour=glx"
-PACKAGE_ARCH_netbook = "${MACHINE_ARCH}"
-
-DEPENDS_menlow = "${STDDEPENDS} virtual/xserver-xf86 virtual/libgl"
-EXTRA_OECONF_menlow = "${BASE_CONF} --with-flavour=glx"
-PACKAGE_ARCH_menlow = "${MACHINE_ARCH}"
-
-FILESPATH = "${FILE_DIRNAME}/clutter"
-
-inherit autotools pkgconfig gtk-doc
-
-#check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points
-require clutter-fpu.inc
-
-#Fix up some weirdness in the docs
-do_configure_prepend() {
-        sed -i s:doc/reference/Makefile::g ${S}/configure.ac
-        sed -i s:doc::g ${S}/Makefile.am
-}
diff --git a/meta/packages/clutter/clutter/build-fix.patch b/meta/packages/clutter/clutter/build-fix.patch
deleted file mode 100644
index 68cf84ec22..0000000000
--- a/meta/packages/clutter/clutter/build-fix.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Installing the same file twice causes an error in Automake 1.11
-
-JL 19/03/10
-
-Index: git/clutter/Makefile.am
-===================================================================
---- git.orig/clutter/Makefile.am	2010-03-19 11:37:51.000000000 +0000
-+++ git/clutter/Makefile.am	2010-03-19 11:50:46.744042007 +0000
-@@ -219,7 +219,6 @@
- 	$(source_h) \
- 	clutter-json.h \
- 	clutter-enum-types.h \
--	clutter-version.h \
- 	clutter.h
- 
- DISTCLEANFILES = \
diff --git a/meta/packages/clutter/clutter/enable_tests-0.6.patch b/meta/packages/clutter/clutter/enable_tests-0.6.patch
deleted file mode 100644
index 544a7e588c..0000000000
--- a/meta/packages/clutter/clutter/enable_tests-0.6.patch
+++ /dev/null
@@ -1,40 +0,0 @@
----
- tests/Makefile.am   |    7 ++++++-
- tests/test-actors.c |    2 +-
- tests/test-text.c   |    2 +-
- 3 files changed, 8 insertions(+), 3 deletions(-)
-
-Index: clutter-0-6/tests/Makefile.am
-===================================================================
---- clutter.orig/tests/Makefile.am	2007-11-06 12:29:17.000000000 +0000
-+++ clutter-0-6/tests/Makefile.am	2007-11-06 12:30:11.000000000 +0000
-@@ -1,4 +1,4 @@
--noinst_PROGRAMS = test-textures test-events test-offscreen test-scale \
-+bin_PROGRAMS = test-textures test-events test-offscreen test-scale \
-                   test-actors test-behave test-text test-entry test-project \
- 		  test-boxes test-perspective test-rotate test-depth \
- 		  test-threads test-timeline test-score test-script
-@@ -26,4 +26,9 @@ test_timeline_SOURCES  = test-timeline.c
- test_score_SOURCES     = test-score.c
- test_script_SOURCES    = test-script.c
- 
-+test_textdir           = $(pkgdatadir)
-+test_text_DATA         = test-text.c
-+test_actorsdir         = $(pkgdatadir)
-+test_actors_DATA       = redhand.png
-+
- EXTRA_DIST = redhand.png test-script.json
-Index: clutter-0-6/tests/test-actors.c
-===================================================================
---- clutter.orig/tests/test-actors.c	2007-11-06 12:29:17.000000000 +0000
-+++ clutter-0-6/tests/test-actors.c	2007-11-06 12:29:21.000000000 +0000
-@@ -143,7 +143,7 @@ main (int argc, char *argv[])
-   stage = clutter_stage_get_default ();
-   clutter_actor_set_size (stage, 800, 600);
- 
--  pixbuf = gdk_pixbuf_new_from_file ("redhand.png", NULL);
-+  pixbuf = gdk_pixbuf_new_from_file ("/usr/share/clutter/redhand.png", NULL);
- 
-   if (!pixbuf)
-     g_error("pixbuf load failed");
-
diff --git a/meta/packages/clutter/clutter/enable_tests-0.8.patch b/meta/packages/clutter/clutter/enable_tests-0.8.patch
deleted file mode 100644
index 4f449b1177..0000000000
--- a/meta/packages/clutter/clutter/enable_tests-0.8.patch
+++ /dev/null
@@ -1,50 +0,0 @@
----
- tests/Makefile.am   |    7 ++++++-
- tests/test-actors.c |    2 +-
- tests/test-text.c   |    2 +-
- 3 files changed, 8 insertions(+), 3 deletions(-)
-
-Index: clutter/tests/Makefile.am
-===================================================================
---- clutter.orig/tests/Makefile.am	2008-06-26 16:46:26.000000000 +0100
-+++ clutter/tests/Makefile.am	2008-06-26 16:46:50.000000000 +0100
-@@ -1,4 +1,4 @@
--noinst_PROGRAMS = test-textures test-events test-offscreen test-scale \
-+bin_PROGRAMS = test-textures test-events test-offscreen test-scale \
-                   test-actors test-behave test-text test-entry test-project \
- 		  test-perspective test-rotate test-depth \
- 		  test-threads test-timeline test-timeline-dup-frames \
-@@ -17,8 +17,8 @@
- 		  test-invariants
- 
- if X11_TESTS
--noinst_PROGRAMS += test-pixmap
--noinst_PROGRAMS += test-devices
-+bin_PROGRAMS += test-pixmap
-+bin_PROGRAMS += test-devices
- endif
- 
- INCLUDES = -I$(top_srcdir)/ -I$(top_srcdir)/clutter -I$(top_builddir)/clutter
-@@ -73,4 +73,9 @@
- test_invariants_SOURCES           = test-invariants.c
- test_devices_SOURCES              = test-devices.c
- 
-+test_textdir           = $(pkgdatadir)
-+test_text_DATA         = test-text.c
-+test_actorsdir         = $(pkgdatadir)
-+test_actors_DATA       = redhand.png
-+
- EXTRA_DIST = redhand.png test-script.json
-Index: clutter/tests/test-actors.c
-===================================================================
---- clutter.orig/tests/test-actors.c	2008-06-26 16:46:26.000000000 +0100
-+++ clutter/tests/test-actors.c	2008-06-26 16:46:31.000000000 +0100
-@@ -195,7 +195,7 @@
-       /* Create a texture from file, then clone in to same resources */
-       if (i == 0)
- 	{
--	  if ((oh->hand[i] = clutter_texture_new_from_file ("redhand.png",
-+	  if ((oh->hand[i] = clutter_texture_new_from_file ("/usr/share/clutter/redhand.png",
- 							    &error)) == NULL)
- 	    {
- 	      g_error ("image load failed: %s", error->message);
diff --git a/meta/packages/clutter/clutter/enable_tests-1.0.patch b/meta/packages/clutter/clutter/enable_tests-1.0.patch
deleted file mode 100644
index 953edf6bbc..0000000000
--- a/meta/packages/clutter/clutter/enable_tests-1.0.patch
+++ /dev/null
@@ -1,32 +0,0 @@
----
- tests/Makefile.am   |    7 ++++++-
- tests/test-actors.c |    2 +-
- tests/test-text.c   |    2 +-
- 3 files changed, 8 insertions(+), 3 deletions(-)
-
-Index: git/tests/interactive/Makefile.am
-===================================================================
---- git.orig/tests/interactive/Makefile.am	2009-03-12 11:01:36.000000000 +0000
-+++ git/tests/interactive/Makefile.am	2009-03-12 11:04:12.000000000 +0000
-@@ -77,7 +77,7 @@
- AM_CFLAGS = $(CLUTTER_CFLAGS) $(MAINTAINER_CFLAGS)
- AM_LDFLAGS = $(CLUTTER_LIBS)
- 
--noinst_PROGRAMS = test-interactive
-+bin_PROGRAMS = test-interactive
- 
- test_interactive_SOURCES = \
- 	test-main.c \
-Index: git/tests/interactive/test-actors.c
-===================================================================
---- git.orig/tests/interactive/test-actors.c	2009-03-12 11:01:36.000000000 +0000
-+++ git/tests/interactive/test-actors.c	2009-03-12 11:06:32.000000000 +0000
-@@ -182,7 +182,7 @@
-   oh->scaler_1 = clutter_behaviour_scale_new (alpha, 0.5, 0.5, 1.0, 1.0);
-   oh->scaler_2 = clutter_behaviour_scale_new (alpha, 1.0, 1.0, 0.5, 0.5);
- 
--  real_hand = clutter_texture_new_from_file ("redhand.png", &error);
-+  real_hand = clutter_texture_new_from_file ("/usr/share/clutter/redhand.png", &error);
-   if (real_hand == NULL)
-     {
-       g_error ("image load failed: %s", error->message);
diff --git a/meta/packages/clutter/clutter/enable_tests-654c26a1301c9bc5f8e3e5e3b68af5eb1b2e0673.patch b/meta/packages/clutter/clutter/enable_tests-654c26a1301c9bc5f8e3e5e3b68af5eb1b2e0673.patch
deleted file mode 100644
index 953edf6bbc..0000000000
--- a/meta/packages/clutter/clutter/enable_tests-654c26a1301c9bc5f8e3e5e3b68af5eb1b2e0673.patch
+++ /dev/null
@@ -1,32 +0,0 @@
----
- tests/Makefile.am   |    7 ++++++-
- tests/test-actors.c |    2 +-
- tests/test-text.c   |    2 +-
- 3 files changed, 8 insertions(+), 3 deletions(-)
-
-Index: git/tests/interactive/Makefile.am
-===================================================================
---- git.orig/tests/interactive/Makefile.am	2009-03-12 11:01:36.000000000 +0000
-+++ git/tests/interactive/Makefile.am	2009-03-12 11:04:12.000000000 +0000
-@@ -77,7 +77,7 @@
- AM_CFLAGS = $(CLUTTER_CFLAGS) $(MAINTAINER_CFLAGS)
- AM_LDFLAGS = $(CLUTTER_LIBS)
- 
--noinst_PROGRAMS = test-interactive
-+bin_PROGRAMS = test-interactive
- 
- test_interactive_SOURCES = \
- 	test-main.c \
-Index: git/tests/interactive/test-actors.c
-===================================================================
---- git.orig/tests/interactive/test-actors.c	2009-03-12 11:01:36.000000000 +0000
-+++ git/tests/interactive/test-actors.c	2009-03-12 11:06:32.000000000 +0000
-@@ -182,7 +182,7 @@
-   oh->scaler_1 = clutter_behaviour_scale_new (alpha, 0.5, 0.5, 1.0, 1.0);
-   oh->scaler_2 = clutter_behaviour_scale_new (alpha, 1.0, 1.0, 0.5, 0.5);
- 
--  real_hand = clutter_texture_new_from_file ("redhand.png", &error);
-+  real_hand = clutter_texture_new_from_file ("/usr/share/clutter/redhand.png", &error);
-   if (real_hand == NULL)
-     {
-       g_error ("image load failed: %s", error->message);
diff --git a/meta/packages/clutter/clutter/enable_tests.patch b/meta/packages/clutter/clutter/enable_tests.patch
deleted file mode 100644
index f4af7c94f6..0000000000
--- a/meta/packages/clutter/clutter/enable_tests.patch
+++ /dev/null
@@ -1,32 +0,0 @@
----
- tests/Makefile.am   |    7 ++++++-
- tests/test-actors.c |    2 +-
- tests/test-text.c   |    2 +-
- 3 files changed, 8 insertions(+), 3 deletions(-)
-
-Index: git/tests/interactive/Makefile.am
-===================================================================
---- git.orig/tests/interactive/Makefile.am	2009-11-30 17:39:46.000000000 +0000
-+++ git/tests/interactive/Makefile.am	2009-11-30 17:42:30.000000000 +0000
-@@ -88,7 +88,7 @@
- 
- common_ldadd = $(top_builddir)/clutter/libclutter-@CLUTTER_WINSYS@-@CLUTTER_API_VERSION@.la
- 
--noinst_PROGRAMS = test-interactive
-+bin_PROGRAMS = test-interactive
- 
- test_interactive_SOURCES = test-main.c $(UNIT_TESTS)
- test_interactive_CFLAGS = $(CLUTTER_CFLAGS) $(MAINTAINER_CFLAGS)
-Index: git/tests/interactive/test-actors.c
-===================================================================
---- git.orig/tests/interactive/test-actors.c	2009-11-30 17:39:46.000000000 +0000
-+++ git/tests/interactive/test-actors.c	2009-11-30 17:43:03.000000000 +0000
-@@ -178,7 +178,7 @@
-   oh->scaler_1 = clutter_behaviour_scale_new (alpha, 0.5, 0.5, 1.0, 1.0);
-   oh->scaler_2 = clutter_behaviour_scale_new (alpha, 1.0, 1.0, 0.5, 0.5);
- 
--  file = g_build_filename (TESTS_DATADIR, "redhand.png", NULL);
-+  file = g_build_filename (TESTS_DATADIR, "/usr/share/clutter/redhand.png", NULL);
-   real_hand = clutter_texture_new_from_file (file, &error);
-   if (real_hand == NULL)
-     g_error ("image load failed: %s", error->message);
diff --git a/meta/packages/clutter/clutter/symconflict.patch b/meta/packages/clutter/clutter/symconflict.patch
deleted file mode 100644
index 7685c21161..0000000000
--- a/meta/packages/clutter/clutter/symconflict.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Index: git/tests/test-depth.c
-===================================================================
---- git.orig/tests/test-depth.c	2009-05-24 14:54:40.000000000 +0100
-+++ git/tests/test-depth.c	2009-05-24 14:55:13.000000000 +0100
-@@ -11,13 +11,13 @@
-   clutter_timeline_start (timeline);
- }
- 
--static ClutterActor *raise[2];
-+static ClutterActor *clutterraise[2];
- static gboolean raise_no = 0;
- 
- static gboolean
- raise_top (gpointer ignored)
- {
--  clutter_actor_raise_top (raise[raise_no]);
-+  clutter_actor_raise_top (clutterraise[raise_no]);
-   raise_no = !raise_no;
-   return TRUE;
- }
-@@ -202,8 +202,8 @@
- 
-   clutter_timeline_start (timeline);
- 
--  raise[0] = rect;
--  raise[1] = hand;
-+  clutterraise[0] = rect;
-+  clutterraise[1] = hand;
-   g_timeout_add (2000, raise_top, NULL);
- 
-   clutter_main ();
diff --git a/meta/packages/clutter/clutter_git.bb b/meta/packages/clutter/clutter_git.bb
deleted file mode 100644
index a20515ec5e..0000000000
--- a/meta/packages/clutter/clutter_git.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-require clutter.inc
-require clutter-package.inc
-
-PV = "1.0.0+git${SRCPV}"
-PR = "r8"
-
-SRC_URI = "git://git.clutter-project.org/clutter.git;protocol=git;branch=master \
-           file://enable_tests-654c26a1301c9bc5f8e3e5e3b68af5eb1b2e0673.patch;patch=1;rev=654c26a1301c9bc5f8e3e5e3b68af5eb1b2e0673 \
-           file://enable_tests.patch;patch=1;notrev=654c26a1301c9bc5f8e3e5e3b68af5eb1b2e0673 "
-S = "${WORKDIR}/git"
-
-BASE_CONF += "--disable-introspection"
-
-do_configure_prepend () {
-	# Disable DOLT
-	sed -i -e 's/^DOLT//' ${S}/configure.ac
-}
\ No newline at end of file
diff --git a/meta/packages/clutter/moblin-proto/fix-shader-and-callbacks.patch b/meta/packages/clutter/moblin-proto/fix-shader-and-callbacks.patch
deleted file mode 100644
index 4a3eddb8cd..0000000000
--- a/meta/packages/clutter/moblin-proto/fix-shader-and-callbacks.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff --git a/Makefile b/Makefile
-index e05b5b7..c348a1e 100644
---- a/Makefile
-+++ b/Makefile
-@@ -64,7 +64,7 @@ HFILES  = $(wildcard *.h)
- %.o: %.c $(HFILES)
- 	$(CC) -g $(CFLAGS) $(INCS) -c $< -o$@
- $(BINARY): $(OBJECTS)
--	$(CXX) -o $@ $(OBJECTS) $(LIBS)
-+	$(CXX) -rdynamic -o $@ $(OBJECTS) $(LIBS)
- 
- #$(BINARY): $(CFILES)
- #	$(LD) $(CFLAGS) $(INCS) $(CFILES) $(LIBS) -o $@
-diff --git a/moblin-desktop.c b/moblin-desktop.c
-index 6dd4f2c..fb9d231 100644
---- a/moblin-desktop.c
-+++ b/moblin-desktop.c
-@@ -103,6 +103,8 @@ void moblin_blur (void)
-   if (desktop->maincopy)
-     return;
- 
-+  if (clutter_feature_available (CLUTTER_FEATURE_SHADERS_GLSL))
-+    {
- #if 0
-   desktop->maincopy = clutter_texture_new_from_actor (desktop->mainstuff);
- #else
-@@ -158,6 +160,17 @@ void moblin_blur (void)
-                                     1.0f / moblin_desktop_width ());
-   }
-  clutter_actor_set_shader_param (desktop->maincopy, "radius", 3.0);
-+    }
-+  else
-+    {
-+      ClutterColor clr= { 0x44, 0x44, 0x44, 0x77 };
-+      guint w, h;
-+
-+      desktop->maincopy = clutter_rectangle_new_with_color (&clr);
-+      clutter_actor_get_size (desktop->mainstuff, &w, &h);
-+      clutter_actor_set_size (desktop->maincopy, w, h);
-+      clutter_group_add (desktop->copyholder, desktop->maincopy);
-+    }
- }
- 
- void moblin_unblur (void)
diff --git a/meta/packages/clutter/moblin-proto/fix.patch b/meta/packages/clutter/moblin-proto/fix.patch
deleted file mode 100644
index 8bde67762c..0000000000
--- a/meta/packages/clutter/moblin-proto/fix.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: git/Makefile
-===================================================================
---- git.orig/Makefile	2008-08-11 22:49:48.000000000 +0100
-+++ git/Makefile	2008-08-12 12:16:52.000000000 +0100
-@@ -15,7 +15,7 @@
- 
- SCP_DESTINATION=pug.vpn:tmp
- 
--BINARY=$(shell basename `pwd`)#
-+BINARY=moblin-proto
- PACKAGE=../$(BINARY).tar.bz2 # you can use both .gz and .bz2 as extension here
- 
- #CFLAGS= -Wall -I /home/pippin/src/clutter-box2d/clutter-box2d
-@@ -61,7 +61,7 @@
- %.o: %.c $(HFILES)
- 	$(CC) -g $(CFLAGS) $(INCS) -c $< -o$@
- $(BINARY): $(OBJECTS)
--	$(CC) -o $@ $(OBJECTS) $(LIBS)
-+	$(CXX) -o $@ $(OBJECTS) $(LIBS)
- 
- #$(BINARY): $(CFILES)
- #	$(LD) $(CFLAGS) $(INCS) $(CFILES) $(LIBS) -o $@
diff --git a/meta/packages/clutter/moblin-proto/paths.patch b/meta/packages/clutter/moblin-proto/paths.patch
deleted file mode 100644
index d241c8ff71..0000000000
--- a/meta/packages/clutter/moblin-proto/paths.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/moblin-desktop.h b/moblin-desktop.h
-index 880a9ad..3d51a14 100644
---- a/moblin-desktop.h
-+++ b/moblin-desktop.h
-@@ -29,8 +29,8 @@
- #define __MAIN_H__
- 
- 
--#define ASSET_ROOT "./assets/"
--#define JSON_ROOT "./layouts/"
-+#define ASSET_ROOT "/usr/share/moblin-proto/assets/"
-+#define JSON_ROOT "/usr/share/moblin-proto/layouts/"
- 
- typedef struct
- {
diff --git a/meta/packages/clutter/moblin-proto_git.bb b/meta/packages/clutter/moblin-proto_git.bb
deleted file mode 100644
index b86d622385..0000000000
--- a/meta/packages/clutter/moblin-proto_git.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-DEPENDS = "clutter-box2d"
-
-PV = "0.0+git${SRCPV}"
-PR = "r2"
-
-SRC_URI = "git://moblin.org/repos/users/pippin/prototype.git/;protocol=http \
-           file://paths.patch;patch=1 \
-	   file://fix-shader-and-callbacks.patch;patch=1"
-
-S = "${WORKDIR}/git"
-
-do_install () {
-	install -d ${D}${bindir}
-	install ${S}/moblin-proto ${D}${bindir}
-
-	install -d ${D}${datadir}/moblin-proto/
-        cp -a ${S}/assets ${D}${datadir}/moblin-proto/
-        cp -a ${S}/layouts ${D}${datadir}/moblin-proto/
-}
diff --git a/meta/packages/clutter/table.inc b/meta/packages/clutter/table.inc
deleted file mode 100644
index dc949172b5..0000000000
--- a/meta/packages/clutter/table.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-DESCRIPTION = "Table Clutter Demo"
-HOMEPAGE = "http://www.clutter-project.org/"
-LICENSE = "LGPL"
-
-DEPENDS = "clutter-gst-0.6 gnome-vfs"
-
-inherit autotools pkgconfig
-
-do_install() {
-	install -d ${D}${bindir}
-	install -m 0755 ${S}/table ${D}${bindir}/table
-}
-
diff --git a/meta/packages/clutter/table/fixes.patch b/meta/packages/clutter/table/fixes.patch
deleted file mode 100644
index a7cdc43713..0000000000
--- a/meta/packages/clutter/table/fixes.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: table/Makefile
-===================================================================
---- table.orig/Makefile	2007-07-10 13:24:18.000000000 +0100
-+++ table/Makefile	2007-07-10 13:28:10.000000000 +0100
-@@ -8,7 +8,7 @@ all: table
- 
- 
- table: table.o clutter-dominatrix.o clutter-video-player.o
--	$(CC) -g -Wall $(CFLAGS) -o $@ table.o clutter-dominatrix.o clutter-video-player.o $(LIBS)
-+	$(CC) -g -Wall $(CFLAGS) $(LDFLAGS) -o $@ table.o clutter-dominatrix.o clutter-video-player.o $(LIBS)
- 
- clean:
- 	rm -fr *.o table
-\ No newline at end of file
diff --git a/meta/packages/clutter/table_git.bb b/meta/packages/clutter/table_git.bb
deleted file mode 100644
index 5aa4153c1a..0000000000
--- a/meta/packages/clutter/table_git.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-require table.inc
-
-PV = "0.3.0+git${SRCPV}"
-PR = "r1"
-
-SRC_URI = "git://git.clutter-project.org/toys.git;protocol=git \
-           file://fixes.patch;patch=1"
-
-S = "${WORKDIR}/git/table"
-
-
diff --git a/meta/packages/clutter/tidy.inc b/meta/packages/clutter/tidy.inc
deleted file mode 100644
index 3fa387c049..0000000000
--- a/meta/packages/clutter/tidy.inc
+++ /dev/null
@@ -1,20 +0,0 @@
-DESCRIPTION = "Tidy library"
-HOMEPAGE = "http://www.clutter-project.org/"
-LICENSE = "LGPL"
-
-STDDEPENDS = "clutter-0.8"
-BASE_CONF = "--disable-gtk-doc"
-
-DEPENDS = "${STDDEPENDS}"
-EXTRA_OECONF = "${BASE_CONF}"
-
-inherit autotools pkgconfig
-
-PACKAGES =+ "tidy-examples"
-FILES_tidy-examples = "${bindir}/test-*"
-
-do_configure_prepend() {
-        touch ${S}/gtk-doc.make
-        sed -i s:docs/reference/Makefile::g ${S}/configure.ac
-        sed -i s:docs::g ${S}/Makefile.am
-}
diff --git a/meta/packages/clutter/tidy/autofoo.patch b/meta/packages/clutter/tidy/autofoo.patch
deleted file mode 100644
index 7f54a3372a..0000000000
--- a/meta/packages/clutter/tidy/autofoo.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-Index: tidy/doc/reference/Makefile.am
-===================================================================
---- tidy.orig/doc/reference/Makefile.am  2007-11-06 19:36:56.000000000 +0000
-+++ tidy/doc/reference/Makefile.am       2007-11-06 19:37:02.000000000 +0000
-@@ -77,4 +77,4 @@ include $(top_srcdir)/gtk-doc.make
- 
- # Other files to distribute
- # e.g. EXTRA_DIST += version.xml.in
--EXTRA_DIST += version.xml.in
-+EXTRA_DIST = version.xml.in
-
diff --git a/meta/packages/clutter/tidy/tidy-enable-tests.patch b/meta/packages/clutter/tidy/tidy-enable-tests.patch
deleted file mode 100644
index c5e1660c54..0000000000
--- a/meta/packages/clutter/tidy/tidy-enable-tests.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: trunk/tests/Makefile.am
-===================================================================
---- trunk.orig/tests/Makefile.am	2008-03-04 12:22:10.000000000 +0000
-+++ trunk/tests/Makefile.am	2008-03-04 12:23:46.000000000 +0000
-@@ -1,4 +1,4 @@
--noinst_PROGRAMS = \
-+bin_PROGRAMS = \
- 	test-button \
- 	test-finger-scroll \
- 	test-list-view \
-@@ -14,6 +14,9 @@
- 	test-grow \
- 	test-viewport
- 
-+test_texture_framedir = $(pkgdatadir)
-+test_texture_frame_DATA = frame.png
-+
- INCLUDES = -I$(top_srcdir)
- LDADD = $(top_builddir)/tidy/libtidy-1.0.la
- 
diff --git a/meta/packages/clutter/tidy_git.bb b/meta/packages/clutter/tidy_git.bb
deleted file mode 100644
index 178526027e..0000000000
--- a/meta/packages/clutter/tidy_git.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require tidy.inc
-
-PV = "0.1.0+git${SRCPV}"
-PR = "r7"
-
-SRC_URI = "git://git.clutter-project.org/tidy.git;protocol=git \
-           file://tidy-enable-tests.patch;patch=1"
-
-S = "${WORKDIR}/git"
-