35 files changed, 176 insertions, 176 deletions

diff --git a/meta/conf/distro/include/poky-fixed-revisions.inc b/meta/conf/distro/include/poky-fixed-revisions.inc
index 7e54a3b676..80f672d208 100644
--- a/meta/conf/distro/include/poky-fixed-revisions.inc
+++ b/meta/conf/distro/include/poky-fixed-revisions.inc
@@ -20,20 +20,20 @@ SRCDATE_yaffs2-utils = "20071107"
 PV_pn-calibrateproto ?= "0.0-poky1-${SRCREV}"
 SRCREV_pn-calibrateproto ?= "1da6fd1e2c7a49648245c98481fabea8b9690a8c"
 SRCREV_pn-clipboard-manager ?= "14994"
-SRCREV_pn-clutter-box2d = "3326"
-SRCREV_pn-clutter-cairo-0.6 ?= "2754"
-SRCREV_pn-clutter-cairo-0.8 ?= "3322"
-SRCREV_pn-clutter-cairo ?= "3313"
-SRCREV_pn-clutter-gst-0.6 ?= "2961"
-SRCREV_pn-clutter-gst-0.8 ?= "3351"
-SRCREV_pn-clutter-gst ?= "3349"
-SRCREV_pn-clutter-helix ?= "3390"
-SRCREV_pn-clutter-gtk-0.6 ?= "2961"
-SRCREV_pn-clutter-gtk-0.8 ?= "3350"
-SRCREV_pn-clutter-gtk ?= "3349"
-SRCREV_pn-clutter-0.6 ?= "2816"
-SRCREV_pn-clutter-0.8 ?= "3323"
-SRCREV_pn-clutter ?= "3334"
+SRCREV_pn-clutter-box2d = "2bcf5b836548dc4909e13b8ae7f60dc64c93d559"
+SRCREV_pn-clutter-cairo-0.6 ?= "4dc4ef712ddc890d828a1cb65a69a835285af548"
+SRCREV_pn-clutter-cairo-0.8 ?= "e27e507dedddec3f279a2902ecee0da1011c78eb"
+SRCREV_pn-clutter-cairo ?= "7b45e0de2d4b9f1cd47486e5de71a1a26e8fdf27"
+SRCREV_pn-clutter-gst-0.6 ?= "1c3dc539057dbcd6dd75f2cb5b4ba39b741892bd"
+SRCREV_pn-clutter-gst-0.8 ?= "7a60a435fb0930d911e26158928ab53bda090f3e"
+SRCREV_pn-clutter-gst ?= "77ff800de204e4f529761b2bcfc3db54e71834bd"
+SRCREV_pn-clutter-helix ?= "b4514a7bae2a059f4e63de64245238a246ed10bd"
+SRCREV_pn-clutter-gtk-0.6 ?= "2ba362a1a223c2b28541030a80aa11191615340a"
+SRCREV_pn-clutter-gtk-0.8 ?= "7d3c3230376e731c06c21afa9d8c1d44dbea27cd"
+SRCREV_pn-clutter-gtk ?= "70f4b0cbd568dfa265484a03be3bd08ad15ed12e"
+SRCREV_pn-clutter-0.6 ?= "62e852a51e29dd42c84d6b34fe23b80b2542be59"
+SRCREV_pn-clutter-0.8 ?= "da0c2a46b5028350af0cd1b9562bfadd8461c666"
+SRCREV_pn-clutter ?= "  2bf815131af32b8c5239425b8dacbacf29d503cf"
 SRCREV_pn-connman ?= "e952851502277cc41cd2a54ef5386cca7a8843dd"
 SRCREV_pn-connman-gnome ?= "b589f4f89bff20d54682cc6b49efa86feac8adb4"
 SRCREV_pn-dialer ?= "42a2b4dd62cf94dc905caeb087f5e7e9f418bf93"
diff --git a/meta/packages/clutter/aaina_git.bb b/meta/packages/clutter/aaina_git.bb
new file mode 100644
index 0000000000..75406a4778
--- /dev/null
+++ b/meta/packages/clutter/aaina_git.bb
@@ -0,0 +1,7 @@
+require aaina.inc
+
+PV = "0.3.0+git${SRCREV}"
+
+SRC_URI = "git://git.clutter-project.org/toys.git;protocol=git"
+
+S = "${WORKDIR}/git/aaina"
diff --git a/meta/packages/clutter/aaina_svn.bb b/meta/packages/clutter/aaina_svn.bb
deleted file mode 100644
index 52a2b3ae0e..0000000000
--- a/meta/packages/clutter/aaina_svn.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require aaina.inc
-
-PV = "0.3.0+svnr${SRCREV}"
-
-SRC_URI = "svn://svn.o-hand.com/repos/clutter/trunk/toys;module=aaina;proto=http"
-
-S = "${WORKDIR}/aaina"
diff --git a/meta/packages/clutter/clutter-0.6_git.bb b/meta/packages/clutter/clutter-0.6_git.bb
new file mode 100644
index 0000000000..2deca8766c
--- /dev/null
+++ b/meta/packages/clutter/clutter-0.6_git.bb
@@ -0,0 +1,10 @@
+require clutter.inc
+
+PV = "0.6.0+gitr${SRCREV}"
+PR = "r3"
+
+SRC_URI = "git://git.clutter-project.org/clutter.git;protocol=git;branch=clutter-0-6 \
+           file://enable_tests-0.6.patch;patch=1 "
+
+S = "${WORKDIR}/git"
+
diff --git a/meta/packages/clutter/clutter-0.6_svn.bb b/meta/packages/clutter/clutter-0.6_svn.bb
deleted file mode 100644
index 60f09dc76a..0000000000
--- a/meta/packages/clutter/clutter-0.6_svn.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require clutter.inc
-
-PV = "0.6.0+svnr${SRCREV}"
-
-SRC_URI = "svn://svn.o-hand.com/repos/clutter/branches;module=clutter-0-6;proto=http \
-           file://enable_tests-0.6.patch;patch=1 "
-
-S = "${WORKDIR}/clutter-0-6"
-
-PR = "r3"
diff --git a/meta/packages/clutter/clutter-0.8_git.bb b/meta/packages/clutter/clutter-0.8_git.bb
new file mode 100644
index 0000000000..ddfa2b68f7
--- /dev/null
+++ b/meta/packages/clutter/clutter-0.8_git.bb
@@ -0,0 +1,9 @@
+require clutter.inc
+
+PV = "0.8.0+gitr${SRCREV}"
+PR = "r1"
+
+SRC_URI = "git://git.clutter-project.org/clutter.git;protocol=git;branch=clutter-0-8 \
+           file://enable_tests-0.8.patch;patch=1 "
+
+S = "${WORKDIR}/git"
diff --git a/meta/packages/clutter/clutter-0.8_svn.bb b/meta/packages/clutter/clutter-0.8_svn.bb
deleted file mode 100644
index 02f7206c7b..0000000000
--- a/meta/packages/clutter/clutter-0.8_svn.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require clutter.inc
-
-PE = "1"
-PR = "r1"
-PV = "0.8.0+svnr${SRCREV}"
-
-SRC_URI = "svn://svn.o-hand.com/repos/clutter/branches;module=clutter-0-8;proto=http \
-           file://enable_tests-0.8.patch;patch=1 "
-
-S = "${WORKDIR}/clutter-0-8"
diff --git a/meta/packages/clutter/clutter-box2d_git.bb b/meta/packages/clutter/clutter-box2d_git.bb
new file mode 100644
index 0000000000..2d722f0cc3
--- /dev/null
+++ b/meta/packages/clutter/clutter-box2d_git.bb
@@ -0,0 +1,10 @@
+require clutter-box2d.inc
+
+PV = "0.0+git${SRCREV}"
+PR = "r3"
+
+SRC_URI = "git://git.clutter-project.org/clutter-box2d.git;protocol=git"
+
+S = "${WORKDIR}/git"
+
+
diff --git a/meta/packages/clutter/clutter-box2d_svn.bb b/meta/packages/clutter/clutter-box2d_svn.bb
deleted file mode 100644
index f241622a50..0000000000
--- a/meta/packages/clutter/clutter-box2d_svn.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require clutter-box2d.inc
-
-PV = "0.0+svnr${SRCREV}"
-PR = "r3"
-
-SRC_URI = "svn://svn.o-hand.com/repos/clutter/trunk;module=${PN};proto=http"
-
-S = "${WORKDIR}/${PN}"
-
-
diff --git a/meta/packages/clutter/clutter-cairo-0.6_git.bb b/meta/packages/clutter/clutter-cairo-0.6_git.bb
new file mode 100644
index 0000000000..3b7f6a9be5
--- /dev/null
+++ b/meta/packages/clutter/clutter-cairo-0.6_git.bb
@@ -0,0 +1,13 @@
+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.6_svn.bb b/meta/packages/clutter/clutter-cairo-0.6_svn.bb
deleted file mode 100644
index fcfed27d42..0000000000
--- a/meta/packages/clutter/clutter-cairo-0.6_svn.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require clutter-cairo.inc
-
-PV = "0.6.0+svnr${SRCREV}"
-
-DEPENDS += "clutter-0.6"
-
-SRC_URI = "svn://svn.o-hand.com/repos/clutter/branches;module=clutter-cairo-0-6;proto=http \
-           file://enable_examples-0.6.patch;patch=1"
-
-S = "${WORKDIR}/clutter-cairo-0-6"
-
-PR = "r1"
diff --git a/meta/packages/clutter/clutter-cairo-0.8_git.bb b/meta/packages/clutter/clutter-cairo-0.8_git.bb
new file mode 100644
index 0000000000..49c513540d
--- /dev/null
+++ b/meta/packages/clutter/clutter-cairo-0.8_git.bb
@@ -0,0 +1,12 @@
+require clutter-cairo.inc
+
+PV = "0.8.0+git${SRCREV}"
+
+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-0.8_svn.bb b/meta/packages/clutter/clutter-cairo-0.8_svn.bb
deleted file mode 100644
index 495ea566c7..0000000000
--- a/meta/packages/clutter/clutter-cairo-0.8_svn.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require clutter-cairo.inc
-
-PV = "0.8.0+svnr${SRCREV}"
-
-DEPENDS += "clutter-0.8"
-
-SRC_URI = "svn://svn.o-hand.com/repos/clutter/branches;module=clutter-cairo-0-8;proto=http \
-           file://enable_examples.patch;patch=1"
-
-S = "${WORKDIR}/clutter-cairo-0-8"
-
-
diff --git a/meta/packages/clutter/clutter-cairo_git.bb b/meta/packages/clutter/clutter-cairo_git.bb
new file mode 100644
index 0000000000..d6dee759f7
--- /dev/null
+++ b/meta/packages/clutter/clutter-cairo_git.bb
@@ -0,0 +1,11 @@
+require clutter-cairo.inc
+
+PV = "0.8.0+git${SRCREV}"
+PR = "r1"
+
+SRC_URI = "git://git.clutter-project.org/clutter-cairo.git;protocol=git \
+           file://enable_examples.patch;patch=1"
+
+S = "${WORKDIR}/git"
+
+
diff --git a/meta/packages/clutter/clutter-cairo_svn.bb b/meta/packages/clutter/clutter-cairo_svn.bb
deleted file mode 100644
index 5059bb518f..0000000000
--- a/meta/packages/clutter/clutter-cairo_svn.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-require clutter-cairo.inc
-
-PV = "0.8.0+svnr${SRCREV}"
-PR = "r1"
-
-SRC_URI = "svn://svn.o-hand.com/repos/clutter/trunk;module=${PN};proto=http \
-           file://enable_examples.patch;patch=1"
-
-S = "${WORKDIR}/${PN}"
-
-
diff --git a/meta/packages/clutter/clutter-gst-0.6_git.bb b/meta/packages/clutter/clutter-gst-0.6_git.bb
new file mode 100644
index 0000000000..34e381ad19
--- /dev/null
+++ b/meta/packages/clutter/clutter-gst-0.6_git.bb
@@ -0,0 +1,9 @@
+require clutter-gst.inc
+
+PV = "0.6.0+git${SRCREV}"
+
+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.6_svn.bb b/meta/packages/clutter/clutter-gst-0.6_svn.bb
deleted file mode 100644
index 75f6019f5d..0000000000
--- a/meta/packages/clutter/clutter-gst-0.6_svn.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require clutter-gst.inc
-
-PV = "0.6.0+svnr${SRCREV}"
-
-DEPENDS += "clutter-0.6"
-
-SRC_URI = "svn://svn.o-hand.com/repos/clutter/branches;module=clutter-gst-0-6;proto=http"
-
-
-S = "${WORKDIR}/clutter-gst-0-6"
diff --git a/meta/packages/clutter/clutter-gst-0.8_git.bb b/meta/packages/clutter/clutter-gst-0.8_git.bb
new file mode 100644
index 0000000000..43a62f38fb
--- /dev/null
+++ b/meta/packages/clutter/clutter-gst-0.8_git.bb
@@ -0,0 +1,9 @@
+require clutter-gst.inc
+
+PV = "0.8.0+git${SRCREV}"
+
+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-0.8_svn.bb b/meta/packages/clutter/clutter-gst-0.8_svn.bb
deleted file mode 100644
index 0f175b2b1d..0000000000
--- a/meta/packages/clutter/clutter-gst-0.8_svn.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require clutter-gst.inc
-
-PV = "0.8.0+svnr${SRCREV}"
-
-DEPENDS += "clutter-0.8"
-
-SRC_URI = "svn://svn.o-hand.com/repos/clutter/branches;module=clutter-gst-0-8;proto=http"
-
-
-S = "${WORKDIR}/clutter-gst-0-8"
diff --git a/meta/packages/clutter/clutter-gst_git.bb b/meta/packages/clutter/clutter-gst_git.bb
new file mode 100644
index 0000000000..e7e7a27508
--- /dev/null
+++ b/meta/packages/clutter/clutter-gst_git.bb
@@ -0,0 +1,9 @@
+require clutter-gst.inc
+
+PV = "0.8.0+git${SRCREV}"
+PR = "r1"
+
+SRC_URI = "git://git.clutter-project.org/clutter-gst.git;protocol=git \
+           file://autofoo.patch;patch=1"
+
+S = "${WORKDIR}/git"
diff --git a/meta/packages/clutter/clutter-gst_svn.bb b/meta/packages/clutter/clutter-gst_svn.bb
deleted file mode 100644
index b41e28c8d9..0000000000
--- a/meta/packages/clutter/clutter-gst_svn.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require clutter-gst.inc
-
-PV = "0.8.0+svnr${SRCREV}"
-PR = "r1"
-
-SRC_URI = "svn://svn.o-hand.com/repos/clutter/trunk;module=${PN};proto=http \
-           file://autofoo.patch;patch=1"
-
-S = "${WORKDIR}/${PN}"
diff --git a/meta/packages/clutter/clutter-gtk-0.6_git.bb b/meta/packages/clutter/clutter-gtk-0.6_git.bb
new file mode 100644
index 0000000000..89f2592bfc
--- /dev/null
+++ b/meta/packages/clutter/clutter-gtk-0.6_git.bb
@@ -0,0 +1,9 @@
+require clutter-gtk.inc
+
+PV = "0.6.0+git${SRCREV}"
+
+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.6_svn.bb b/meta/packages/clutter/clutter-gtk-0.6_svn.bb
deleted file mode 100644
index d89c2873f3..0000000000
--- a/meta/packages/clutter/clutter-gtk-0.6_svn.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require clutter-gtk.inc
-
-PV = "0.6.0+svnr${SRCREV}"
-
-DEPENDS += "clutter-0.6"
-
-SRC_URI = "svn://svn.o-hand.com/repos/clutter/branches;module=clutter-gtk-0-6;proto=http"
-
-
-S = "${WORKDIR}/clutter-gtk-0-6"
diff --git a/meta/packages/clutter/clutter-gtk-0.8_git.bb b/meta/packages/clutter/clutter-gtk-0.8_git.bb
new file mode 100644
index 0000000000..2e0260bb89
--- /dev/null
+++ b/meta/packages/clutter/clutter-gtk-0.8_git.bb
@@ -0,0 +1,9 @@
+require clutter-gtk.inc
+
+PV = "0.8.0+git${SRCREV}"
+
+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-0.8_svn.bb b/meta/packages/clutter/clutter-gtk-0.8_svn.bb
deleted file mode 100644
index 1767942e5b..0000000000
--- a/meta/packages/clutter/clutter-gtk-0.8_svn.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require clutter-gtk.inc
-
-PV = "0.8.0+svnr${SRCREV}"
-
-DEPENDS += "clutter-0.8"
-
-SRC_URI = "svn://svn.o-hand.com/repos/clutter/branches;module=clutter-gtk-0-8;proto=http"
-
-
-S = "${WORKDIR}/clutter-gtk-0-8"
diff --git a/meta/packages/clutter/clutter-gtk_git.bb b/meta/packages/clutter/clutter-gtk_git.bb
new file mode 100644
index 0000000000..fea9a92942
--- /dev/null
+++ b/meta/packages/clutter/clutter-gtk_git.bb
@@ -0,0 +1,8 @@
+require clutter-gst.inc
+
+PV = "0.8.0+git${SRCREV}"
+PR = "r0"
+
+SRC_URI = "git://git.clutter-project.org/clutter-gtk.git;protocol=git"
+
+S = "${WORKDIR}/git"
diff --git a/meta/packages/clutter/clutter-gtk_svn.bb b/meta/packages/clutter/clutter-gtk_svn.bb
deleted file mode 100644
index 24c0479f79..0000000000
--- a/meta/packages/clutter/clutter-gtk_svn.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require clutter-gst.inc
-
-PV = "0.8.0+svnr${SRCREV}"
-PR = "r0"
-
-SRC_URI = "svn://svn.o-hand.com/repos/clutter/trunk;module=${PN};proto=http"
-
-S = "${WORKDIR}/${PN}"
diff --git a/meta/packages/clutter/clutter-helix_git.bb b/meta/packages/clutter/clutter-helix_git.bb
new file mode 100644
index 0000000000..462b4ca2ed
--- /dev/null
+++ b/meta/packages/clutter/clutter-helix_git.bb
@@ -0,0 +1,8 @@
+require clutter-helix.inc
+
+PV = "0.8.0+git${SRCREV}"
+PR = "r0"
+
+SRC_URI = "git://git.clutter-project.org/clutter-helix.git;protocol=git"
+
+S = "${WORKDIR}/git"
diff --git a/meta/packages/clutter/clutter-helix_svn.bb b/meta/packages/clutter/clutter-helix_svn.bb
deleted file mode 100644
index 36206685e4..0000000000
--- a/meta/packages/clutter/clutter-helix_svn.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require clutter-helix.inc
-
-PV = "0.8.0+svnr${SRCREV}"
-PR = "r0"
-
-SRC_URI = "svn://svn.o-hand.com/repos/clutter/trunk;module=${PN};proto=http"
-
-S = "${WORKDIR}/${PN}"
diff --git a/meta/packages/clutter/clutter.inc b/meta/packages/clutter/clutter.inc
index 0b8b6a6b43..1caa1c74e9 100644
--- a/meta/packages/clutter/clutter.inc
+++ b/meta/packages/clutter/clutter.inc
@@ -2,7 +2,7 @@ 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)"
+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)}"
@@ -39,6 +39,10 @@ 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
diff --git a/meta/packages/clutter/clutter_svn.bb b/meta/packages/clutter/clutter_git.bb
index 2b65f23794..28b03a4899 100644
--- a/meta/packages/clutter/clutter_svn.bb
+++ b/meta/packages/clutter/clutter_git.bb
@@ -1,12 +1,12 @@
 require clutter.inc
 
-PV = "0.8.0+svnr${SRCREV}"
+PV = "0.8.0+git${SRCREV}"
 PR = "r2"
 
-SRC_URI = "svn://svn.o-hand.com/repos/clutter/trunk;module=clutter;proto=http \
+SRC_URI = "git://git.clutter-project.org/clutter.git;protocol=git;branch=master \
            file://enable_tests.patch;patch=1;maxrev=2989 \
            file://enable-tests-r2990.patch;patch=1;minrev=2990"
 
-S = "${WORKDIR}/clutter"
+S = "${WORKDIR}/git"
 
 
diff --git a/meta/packages/clutter/table_git.bb b/meta/packages/clutter/table_git.bb
new file mode 100644
index 0000000000..b652462031
--- /dev/null
+++ b/meta/packages/clutter/table_git.bb
@@ -0,0 +1,11 @@
+require table.inc
+
+PV = "0.3.0+git${SRCREV}"
+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/table_svn.bb b/meta/packages/clutter/table_svn.bb
deleted file mode 100644
index e293ff3ca2..0000000000
--- a/meta/packages/clutter/table_svn.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-require table.inc
-
-PV = "0.3.0+svnr${SRCREV}"
-PR = "r1"
-
-SRC_URI = "svn://svn.o-hand.com/repos/clutter/trunk/toys;module=table;proto=http \
-           file://fixes.patch;patch=1"
-
-S = "${WORKDIR}/table"
-
-
diff --git a/meta/packages/clutter/tidy_git.bb b/meta/packages/clutter/tidy_git.bb
new file mode 100644
index 0000000000..5b0c266583
--- /dev/null
+++ b/meta/packages/clutter/tidy_git.bb
@@ -0,0 +1,10 @@
+require tidy.inc
+
+PV = "0.1.0+git${SRCREV}"
+PR = "r7"
+
+SRC_URI = "git://git.clutter-project.org/tidy.git;protocol=git \
+           file://tidy-enable-tests.patch;patch=1"
+
+S = "${WORKDIR}/git"
+
diff --git a/meta/packages/clutter/tidy_svn.bb b/meta/packages/clutter/tidy_svn.bb
deleted file mode 100644
index 8d9f3ac516..0000000000
--- a/meta/packages/clutter/tidy_svn.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require tidy.inc
-
-PV = "0.1.0+svnr${SRCREV}"
-PR = "r7"
-
-SRC_URI = "svn://svn.o-hand.com/repos/tidy;module=trunk;proto=http \
-           file://tidy-enable-tests.patch;patch=1"
-
-S = "${WORKDIR}/trunk"
-