From 4e7218c19775ef81caed27742e9d203af10b7416 Mon Sep 17 00:00:00 2001
From: Saul Wold <sgw@linux.intel.com>
Date: Thu, 25 Aug 2011 11:20:21 -0700
Subject: o-hand recipes: convert from svn.o-hand.org to git.yoctoproject.org

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-bsp/zaurusd/zaurusd_git.bb            | 22 +++++++
 meta/recipes-bsp/zaurusd/zaurusd_svn.bb            | 21 -------
 meta/recipes-core/dbus-wait/dbus-wait_git.bb       | 17 ++++++
 meta/recipes-core/dbus-wait/dbus-wait_svn.bb       | 16 -----
 meta/recipes-core/psplash/psplash_git.bb           | 33 ++++++++++
 meta/recipes-core/psplash/psplash_svn.bb           | 33 ----------
 meta/recipes-gnome/gtkhtml2/gtkhtml2_svn.bb        | 17 +++---
 meta/recipes-graphics/fstests/fstests_git.bb       | 25 ++++++++
 meta/recipes-graphics/fstests/fstests_svn.bb       | 24 --------
 .../matchbox-wm-2/matchbox-wm-2_git.bb             | 46 ++++++++++++++
 .../matchbox-wm-2/matchbox-wm-2_svn.bb             | 46 --------------
 .../xvideo-tests/xvideo-tests_git.bb               | 15 +++++
 .../xvideo-tests/xvideo-tests_svn.bb               | 15 -----
 meta/recipes-sato/gaku/gaku_git.bb                 | 26 ++++++++
 meta/recipes-sato/gaku/gaku_svn.bb                 | 27 ---------
 .../gtk-engines/gtk-sato-engine_git.bb             | 15 +++++
 .../gtk-engines/gtk-sato-engine_svn.bb             | 15 -----
 meta/recipes-sato/libowl/libowl_git.bb             | 21 +++++++
 meta/recipes-sato/libowl/libowl_svn.bb             | 21 -------
 .../matchbox-desktop-sato_git.bb                   | 22 +++++++
 .../matchbox-desktop-sato_svn.bb                   | 20 -------
 .../matchbox-theme-sato-2_git.bb                   | 12 ++++
 .../matchbox-theme-sato-2_svn.bb                   | 12 ----
 .../matchbox-theme-sato/matchbox-theme-sato_git.bb | 13 ++++
 .../matchbox-theme-sato/matchbox-theme-sato_svn.bb | 13 ----
 .../recipes-sato/owl-video-widget/libowl-av_git.bb | 26 ++++++++
 .../recipes-sato/owl-video-widget/libowl-av_svn.bb | 25 --------
 .../recipes-sato/owl-video-widget/owl-video_git.bb | 41 +++++++++++++
 .../recipes-sato/owl-video-widget/owl-video_svn.bb | 41 -------------
 meta/recipes-sato/puzzles/oh-puzzles_git.bb        | 70 ++++++++++++++++++++++
 meta/recipes-sato/puzzles/oh-puzzles_svn.bb        | 70 ----------------------
 meta/recipes-sato/screenshot/screenshot_git.bb     | 23 +++++++
 meta/recipes-sato/screenshot/screenshot_svn.bb     | 23 -------
 meta/recipes-sato/web/web-webkit_git.bb            | 32 ++++++++++
 meta/recipes-sato/web/web-webkit_svn.bb            | 32 ----------
 35 files changed, 466 insertions(+), 464 deletions(-)
 create mode 100644 meta/recipes-bsp/zaurusd/zaurusd_git.bb
 delete mode 100644 meta/recipes-bsp/zaurusd/zaurusd_svn.bb
 create mode 100644 meta/recipes-core/dbus-wait/dbus-wait_git.bb
 delete mode 100644 meta/recipes-core/dbus-wait/dbus-wait_svn.bb
 create mode 100644 meta/recipes-core/psplash/psplash_git.bb
 delete mode 100644 meta/recipes-core/psplash/psplash_svn.bb
 create mode 100644 meta/recipes-graphics/fstests/fstests_git.bb
 delete mode 100644 meta/recipes-graphics/fstests/fstests_svn.bb
 create mode 100644 meta/recipes-graphics/matchbox-wm-2/matchbox-wm-2_git.bb
 delete mode 100644 meta/recipes-graphics/matchbox-wm-2/matchbox-wm-2_svn.bb
 create mode 100644 meta/recipes-graphics/xvideo-tests/xvideo-tests_git.bb
 delete mode 100644 meta/recipes-graphics/xvideo-tests/xvideo-tests_svn.bb
 create mode 100644 meta/recipes-sato/gaku/gaku_git.bb
 delete mode 100644 meta/recipes-sato/gaku/gaku_svn.bb
 create mode 100644 meta/recipes-sato/gtk-engines/gtk-sato-engine_git.bb
 delete mode 100644 meta/recipes-sato/gtk-engines/gtk-sato-engine_svn.bb
 create mode 100644 meta/recipes-sato/libowl/libowl_git.bb
 delete mode 100644 meta/recipes-sato/libowl/libowl_svn.bb
 create mode 100644 meta/recipes-sato/matchbox-desktop-sato/matchbox-desktop-sato_git.bb
 delete mode 100644 meta/recipes-sato/matchbox-desktop-sato/matchbox-desktop-sato_svn.bb
 create mode 100644 meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato-2_git.bb
 delete mode 100644 meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato-2_svn.bb
 create mode 100644 meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato_git.bb
 delete mode 100644 meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato_svn.bb
 create mode 100644 meta/recipes-sato/owl-video-widget/libowl-av_git.bb
 delete mode 100644 meta/recipes-sato/owl-video-widget/libowl-av_svn.bb
 create mode 100644 meta/recipes-sato/owl-video-widget/owl-video_git.bb
 delete mode 100644 meta/recipes-sato/owl-video-widget/owl-video_svn.bb
 create mode 100644 meta/recipes-sato/puzzles/oh-puzzles_git.bb
 delete mode 100644 meta/recipes-sato/puzzles/oh-puzzles_svn.bb
 create mode 100644 meta/recipes-sato/screenshot/screenshot_git.bb
 delete mode 100644 meta/recipes-sato/screenshot/screenshot_svn.bb
 create mode 100644 meta/recipes-sato/web/web-webkit_git.bb
 delete mode 100644 meta/recipes-sato/web/web-webkit_svn.bb

diff --git a/meta/recipes-bsp/zaurusd/zaurusd_git.bb b/meta/recipes-bsp/zaurusd/zaurusd_git.bb
new file mode 100644
index 000000000..3b8cc43bc
--- /dev/null
+++ b/meta/recipes-bsp/zaurusd/zaurusd_git.bb
@@ -0,0 +1,22 @@
+DESCRIPTION = "Daemon to handle device specifc features."
+SECTION = "base"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
+DEPENDS = "tslib"
+RDEPENDS_${PN} = "xrandr"
+
+SRCREV = "82b30c7865f007fff81372c3cdc71b2ff6843ccc"
+PV = "0.1+git${SRCPV}"
+PR = "r0"
+
+SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git \
+	file://fix_makefile.patch"
+
+S = "${WORKDIR}/git"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+inherit autotools pkgconfig update-rc.d
+
+INITSCRIPT_NAME = "zaurusd"
+INITSCRIPT_PARAMS = "start 99 5 2 . stop 20 0 1 6 ."
diff --git a/meta/recipes-bsp/zaurusd/zaurusd_svn.bb b/meta/recipes-bsp/zaurusd/zaurusd_svn.bb
deleted file mode 100644
index eaac3034c..000000000
--- a/meta/recipes-bsp/zaurusd/zaurusd_svn.bb
+++ /dev/null
@@ -1,21 +0,0 @@
-DESCRIPTION = "Daemon to handle device specifc features."
-SECTION = "base"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
-DEPENDS = "tslib"
-RDEPENDS_${PN} = "xrandr"
-SRCREV = "426"
-PV = "0.0+svnr${SRCPV}"
-PR = "r3"
-
-SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=zaurusd;proto=http \
-	file://fix_makefile.patch"
-
-S = "${WORKDIR}/${BPN}"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-inherit autotools pkgconfig update-rc.d
-
-INITSCRIPT_NAME = "zaurusd"
-INITSCRIPT_PARAMS = "start 99 5 2 . stop 20 0 1 6 ."
diff --git a/meta/recipes-core/dbus-wait/dbus-wait_git.bb b/meta/recipes-core/dbus-wait/dbus-wait_git.bb
new file mode 100644
index 000000000..fb31662e8
--- /dev/null
+++ b/meta/recipes-core/dbus-wait/dbus-wait_git.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = "A simple tool to wait for a specific signal over DBus"
+HOMEPAGE = "http://git.yoctoproject.org/cgit/cgit.cgi/dbus-wait"
+SECTION = "base"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
+
+DEPENDS = "dbus"
+
+SRCREV = "1a3e1343761b30750bed70e0fd688f6d3c7b3717"
+PV = "0.1+git${SRCPV}"
+PR = "r2"
+
+SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git"
+
+S = "${WORKDIR}/git"
+
+inherit autotools
diff --git a/meta/recipes-core/dbus-wait/dbus-wait_svn.bb b/meta/recipes-core/dbus-wait/dbus-wait_svn.bb
deleted file mode 100644
index 127097363..000000000
--- a/meta/recipes-core/dbus-wait/dbus-wait_svn.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-DESCRIPTION = "A simple tool to wait for a specific signal over DBus"
-HOMEPAGE = "http://svn.o-hand.com/repos/misc/trunk"
-SECTION = "base"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
-
-SRCREV = "426"
-DEPENDS = "dbus"
-PV = "0.0+svnr${SRCPV}"
-PR = "r2"
-
-SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=dbus-wait;proto=http"
-
-S = "${WORKDIR}/${BPN}"
-
-inherit autotools
diff --git a/meta/recipes-core/psplash/psplash_git.bb b/meta/recipes-core/psplash/psplash_git.bb
new file mode 100644
index 000000000..9112aa916
--- /dev/null
+++ b/meta/recipes-core/psplash/psplash_git.bb
@@ -0,0 +1,33 @@
+SUMMARY = "Userspace framebuffer boot logo based on usplash."
+DESCRIPTION = "PSplash is a userspace graphical boot splash screen for mainly embedded Linux devices supporting a 16bpp or 32bpp framebuffer. It has few dependencies (just libc), supports basic images and text and handles rotation. Its visual look is configurable by basic source changes. Also included is a 'client' command utility for sending information to psplash such as boot progress information."
+HOMEPAGE = "http://git.yoctoproject.org/cgit/cgit.cgi/psplash"
+SECTION = "base"
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://psplash.h;md5=a87c39812c1e37f3451567cc29a29c8f"
+
+SRCREV = "e05374aae945bcfc6d962ed0d7b2774b77987e1d"
+PV = "0.1+git${SRCPV}"
+PR = "r0"
+
+SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git \
+           file://psplash-init \
+	   file://psplash-poky-img.h"
+
+S = "${WORKDIR}/git"
+
+inherit autotools pkgconfig update-rc.d
+
+FILES_${PN} += "/mnt/.psplash"
+
+do_configure_prepend () {
+	cp -f ${WORKDIR}/psplash-poky-img.h ${S}/
+}
+
+do_install_prepend() {
+	install -d ${D}/mnt/.psplash/
+	install -d ${D}${sysconfdir}/init.d/
+	install -m 0755 ${WORKDIR}/psplash-init ${D}${sysconfdir}/init.d/psplash.sh
+}
+
+INITSCRIPT_NAME = "psplash.sh"
+INITSCRIPT_PARAMS = "start 0 S . stop 20 0 1 6 ."
diff --git a/meta/recipes-core/psplash/psplash_svn.bb b/meta/recipes-core/psplash/psplash_svn.bb
deleted file mode 100644
index 477894ac0..000000000
--- a/meta/recipes-core/psplash/psplash_svn.bb
+++ /dev/null
@@ -1,33 +0,0 @@
-SUMMARY = "Userspace framebuffer boot logo based on usplash."
-DESCRIPTION = "PSplash is a userspace graphical boot splash screen for mainly embedded Linux devices supporting a 16bpp or 32bpp framebuffer. It has few dependencies (just libc), supports basic images and text and handles rotation. Its visual look is configurable by basic source changes. Also included is a 'client' command utility for sending information to psplash such as boot progress information."
-HOMEPAGE = "http://svn.o-hand.com/view/misc/trunk/psplash/"
-SECTION = "base"
-LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://psplash.h;md5=a87c39812c1e37f3451567cc29a29c8f"
-
-SRCREV = "424"
-PV = "0.0+svnr${SRCPV}"
-PR = "r6"
-
-SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=psplash;proto=http \
-           file://psplash-init \
-	   file://psplash-poky-img.h"
-
-S = "${WORKDIR}/psplash"
-
-inherit autotools pkgconfig update-rc.d
-
-FILES_${PN} += "/mnt/.psplash"
-
-do_configure_prepend () {
-	cp -f ${WORKDIR}/psplash-poky-img.h ${S}/
-}
-
-do_install_prepend() {
-	install -d ${D}/mnt/.psplash/
-	install -d ${D}${sysconfdir}/init.d/
-	install -m 0755 ${WORKDIR}/psplash-init ${D}${sysconfdir}/init.d/psplash.sh
-}
-
-INITSCRIPT_NAME = "psplash.sh"
-INITSCRIPT_PARAMS = "start 0 S . stop 20 0 1 6 ."
diff --git a/meta/recipes-gnome/gtkhtml2/gtkhtml2_svn.bb b/meta/recipes-gnome/gtkhtml2/gtkhtml2_svn.bb
index c5a84d602..f15cf2e91 100644
--- a/meta/recipes-gnome/gtkhtml2/gtkhtml2_svn.bb
+++ b/meta/recipes-gnome/gtkhtml2/gtkhtml2_svn.bb
@@ -6,18 +6,15 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=55ca817ccb7d5b5b66355690e9abc605"
 
 SRCREV = "1161"
 PV = "2.11.0+svnr${SRCPV}"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "svn://svn.gnome.org/svn/gtkhtml2/;module=trunk;proto=http \
-	http://svn.o-hand.com/repos/web/trunk/patches/at-import_box-pos.patch;striplevel=0;maxrev=1157;name=patch1 \
-	http://svn.o-hand.com/repos/web/trunk/patches/css-stylesheet-user.patch;striplevel=0;maxrev=1157;name=patch2 \
-	http://svn.o-hand.com/repos/web/trunk/patches/css-media.patch;striplevel=0;maxrev=1157;name=patch3 \
-	http://svn.o-hand.com/repos/web/trunk/patches/add-end-element-signal.patch;striplevel=0;maxrev=1157;name=patch4 \
-	http://svn.o-hand.com/repos/web/trunk/patches/add-dom-functions.patch;striplevel=0;maxrev=1157;name=patch5 \
-	http://svn.o-hand.com/repos/web/trunk/patches/iain-mem-leak.patch;striplevel=0;maxrev=1157;name=patch6"
-
-SRC_URI[patch1.md5sum] = "160c648e29637f2ed6301f4dfdecce21"
-SRC_URI[patch1.sha256sum] = "3ec786e6df9e1a935aff4848b6989cad8f87c1fa8813dc033b338e18b17138d8"
+           http://git.yoctoproject.org/cgit/cgit.cgi/web-patches/plain/css-stylesheet-user.patch;striplevel=0;name=patch2 \
+           http://git.yoctoproject.org/cgit/cgit.cgi/web-patches/plain/css-media.patch;striplevel=0;name=patch3 \
+           http://git.yoctoproject.org/cgit/cgit.cgi/web-patches/plain/add-end-element-signal.patch;striplevel=0;name=patch4 \
+           http://git.yoctoproject.org/cgit/cgit.cgi/web-patches/plain/add-dom-functions.patch;striplevel=0;name=patch5 \
+           http://git.yoctoproject.org/cgit/cgit.cgi/web-patches/plain/iain-mem-leak.patch;striplevel=0;name=patch6 \
+          "
 
 SRC_URI[patch2.md5sum] = "05fc3627ca364095702dc804f41c8391"
 SRC_URI[patch2.sha256sum] = "df5cca50a8f95333505d7920929fea251daea3be25be6834a1c50a742d9eb674"
diff --git a/meta/recipes-graphics/fstests/fstests_git.bb b/meta/recipes-graphics/fstests/fstests_git.bb
new file mode 100644
index 000000000..e1623f493
--- /dev/null
+++ b/meta/recipes-graphics/fstests/fstests_git.bb
@@ -0,0 +1,25 @@
+DESCRIPTION = "Various benchmarning tests for X"
+HOMEPAGE = "http://www.o-hand.com"
+SECTION = "devel"
+LICENSE = "Zlib"
+DEPENDS = "pango libxext libxft virtual/libx11 gtk+"
+
+SRCREV = "218b99d82b56011e3f1b909e6baf22ce25af6334"
+PV = "0.1+git${SRCPV}"
+PR = "r0"
+
+
+SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git \
+           file://dso_linking_change_build_fix.patch"
+
+S = "${WORKDIR}/git/tests"
+
+inherit autotools
+
+do_install() {
+    install -d ${D}${bindir}
+    find . -name "test-*" -type f -perm -755 -exec install -m 0755 {} ${D}${bindir} \;   
+}
+
+
+LIC_FILES_CHKSUM = "file://test-pango-gdk.c;endline=24;md5=1ee74ec851ecda57eb7ac6cc180f7655"
diff --git a/meta/recipes-graphics/fstests/fstests_svn.bb b/meta/recipes-graphics/fstests/fstests_svn.bb
deleted file mode 100644
index 2ffdc35cc..000000000
--- a/meta/recipes-graphics/fstests/fstests_svn.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-DESCRIPTION = "Various benchmarning tests for X"
-HOMEPAGE = "http://www.o-hand.com"
-SECTION = "devel"
-LICENSE = "Zlib"
-DEPENDS = "pango libxext libxft virtual/libx11 gtk+"
-
-SRCREV = "426"
-PV = "0.0+svnr${SRCPV}"
-PR = "r1"
-
-inherit autotools
-
-SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=fstests;proto=http \
-	file://dso_linking_change_build_fix.patch"
-
-S = "${WORKDIR}/fstests/tests"
-
-do_install() {
-    install -d ${D}${bindir}
-    find . -name "test-*" -type f -perm -755 -exec install -m 0755 {} ${D}${bindir} \;   
-}
-
-
-LIC_FILES_CHKSUM = "file://test-pango-gdk.c;endline=24;md5=1ee74ec851ecda57eb7ac6cc180f7655"
diff --git a/meta/recipes-graphics/matchbox-wm-2/matchbox-wm-2_git.bb b/meta/recipes-graphics/matchbox-wm-2/matchbox-wm-2_git.bb
new file mode 100644
index 000000000..c9498f7f9
--- /dev/null
+++ b/meta/recipes-graphics/matchbox-wm-2/matchbox-wm-2_git.bb
@@ -0,0 +1,46 @@
+SECTION = "x11/wm"
+DESCRIPTION = "Matchbox window manager"
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://matchbox/core/mb-wm.h;endline=21;md5=1b1d328a527906350ea7ce7ab1bb7564"
+
+DEPENDS = "virtual/libx11 libxext libxrender startup-notification expat gconf pango libxdamage libxcomposite gtk+"
+
+SRCREV = "18ab9c7e4ffcb066b25281172ea82947bd56cb86"
+PV = "0.1+git${SRCPV}"
+PR = "r0"
+
+SRC_URI = "git://git.yoctoproject.org/matchbox-window-manager-2;proto=git \
+	file://fix_makefile.patch \
+	  "
+
+S = "${WORKDIR}/git"
+
+inherit autotools pkgconfig update-alternatives
+
+# Change this to x-session-manager->matchbox-session and put in
+# matchbox-session, then change this to x-window-manager to
+# matchbox-window-manager-2.
+ALTERNATIVE_NAME = "x-window-manager"
+ALTERNATIVE_LINK = "${bindir}/x-window-manager"
+ALTERNATIVE_PATH = "${bindir}/matchbox-session"
+ALTERNATIVE_PRIORITY = "10"
+
+PACKAGES =+ "libmatchbox2"
+
+FILES_libmatchbox2 = "${libdir}/*${SOLIBS}"
+
+FILES_${PN} += "${datadir}/matchbox-2 \
+                ${sysconfdir}/matchbox-2 \
+                ${datadir}/themes/*"
+
+EXTRA_OECONF = 	"--enable-debug			\
+                 --enable-simple-manager \
+                 --enable-compositing-manager	\
+                 --enable-libmatchbox \
+                 --enable-png-theme \
+		"
+
+do_install_append () {
+	cd ${D}${bindir}
+	ln -s matchbox-window-manager-2-simple matchbox-window-manager
+}
diff --git a/meta/recipes-graphics/matchbox-wm-2/matchbox-wm-2_svn.bb b/meta/recipes-graphics/matchbox-wm-2/matchbox-wm-2_svn.bb
deleted file mode 100644
index 0b5e3f1e6..000000000
--- a/meta/recipes-graphics/matchbox-wm-2/matchbox-wm-2_svn.bb
+++ /dev/null
@@ -1,46 +0,0 @@
-SECTION = "x11/wm"
-DESCRIPTION = "Matchbox window manager"
-LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://matchbox/core/mb-wm.h;endline=21;md5=1b1d328a527906350ea7ce7ab1bb7564"
-
-DEPENDS = "virtual/libx11 libxext libxrender startup-notification expat gconf pango libxdamage libxcomposite gtk+"
-
-SRCREV = "2106"
-PV = "0.0+svnr${SRCPV}"
-PR = "r5"
-
-SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=matchbox-window-manager-2;proto=http \
-	file://fix_makefile.patch \
-	  "
-
-S = "${WORKDIR}/matchbox-window-manager-2"
-
-inherit autotools pkgconfig update-alternatives
-
-# Change this to x-session-manager->matchbox-session and put in
-# matchbox-session, then change this to x-window-manager to
-# matchbox-window-manager-2.
-ALTERNATIVE_NAME = "x-window-manager"
-ALTERNATIVE_LINK = "${bindir}/x-window-manager"
-ALTERNATIVE_PATH = "${bindir}/matchbox-session"
-ALTERNATIVE_PRIORITY = "10"
-
-PACKAGES =+ "libmatchbox2"
-
-FILES_libmatchbox2 = "${libdir}/*${SOLIBS}"
-
-FILES_${PN} += "${datadir}/matchbox-2 \
-                ${sysconfdir}/matchbox-2 \
-                ${datadir}/themes/*"
-
-EXTRA_OECONF = 	"--enable-debug			\
-                 --enable-simple-manager \
-                 --enable-compositing-manager	\
-                 --enable-libmatchbox \
-                 --enable-png-theme \
-		"
-
-do_install_append () {
-	cd ${D}${bindir}
-	ln -s matchbox-window-manager-2-simple matchbox-window-manager
-}
diff --git a/meta/recipes-graphics/xvideo-tests/xvideo-tests_git.bb b/meta/recipes-graphics/xvideo-tests/xvideo-tests_git.bb
new file mode 100644
index 000000000..166b50b9b
--- /dev/null
+++ b/meta/recipes-graphics/xvideo-tests/xvideo-tests_git.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = "Simple XVideo test application"
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
+                    file://src/test-xvideo.c;beginline=1;endline=20;md5=6ae3b4c3c2ff9e51dbbc35bb237afa00"
+DEPENDS = "libxv"
+
+SRCREV = "f8f320d0254c09ce483fc1d8ee99ecf5bc940965"
+PV = "0.1+git${SRCPV}"
+PR = "r0"
+
+SRC_URI = "git://git.yoctoproject.org/test-xvideo;protocol=git"
+
+S = "${WORKDIR}/git"
+
+inherit autotools
diff --git a/meta/recipes-graphics/xvideo-tests/xvideo-tests_svn.bb b/meta/recipes-graphics/xvideo-tests/xvideo-tests_svn.bb
deleted file mode 100644
index 0c6ca3fea..000000000
--- a/meta/recipes-graphics/xvideo-tests/xvideo-tests_svn.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-DESCRIPTION = "Simple XVideo test application"
-LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
-                    file://src/test-xvideo.c;beginline=1;endline=20;md5=6ae3b4c3c2ff9e51dbbc35bb237afa00"
-DEPENDS = "libxv"
-
-SRCREV = "270"
-PV = "0.0+svnr${SRCPV}"
-PR = "r0"
-
-SRC_URI="svn://svn.o-hand.com/repos/misc/trunk;module=test-xvideo;proto=http"
-
-S = "${WORKDIR}/test-xvideo"
-
-inherit autotools
diff --git a/meta/recipes-sato/gaku/gaku_git.bb b/meta/recipes-sato/gaku/gaku_git.bb
new file mode 100644
index 000000000..9f1bad205
--- /dev/null
+++ b/meta/recipes-sato/gaku/gaku_git.bb
@@ -0,0 +1,26 @@
+DESCRIPTION = "Music player"
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
+                    file://main.c;beginline=1;endline=20;md5=0c02b4ef945956832b37a036b9cc103a"
+DEPENDS = "gtk+ gstreamer libowl-av"
+
+RDEPENDS_${PN} = "gst-plugins-base-audioconvert \
+            gst-plugins-base-audioresample \
+            gst-plugins-base-typefindfunctions \
+            gst-plugins-base-playbin"
+
+RRECOMMENDS_${PN} = "gst-plugins-good-id3demux \
+               gst-plugins-base-vorbis \
+               gst-plugins-base-alsa \
+               gst-plugins-base-ogg \
+               ${COMMERCIAL_AUDIO_PLUGINS}"
+
+SRCREV = "a0be2fe4b5f12b8b07f4e3bd624b3729657f0ac5"
+PV = "0.1+git${SRCPV}"
+PR = "r0"
+
+SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git"
+
+S = "${WORKDIR}/git"
+
+inherit autotools pkgconfig
diff --git a/meta/recipes-sato/gaku/gaku_svn.bb b/meta/recipes-sato/gaku/gaku_svn.bb
deleted file mode 100644
index 3806021b0..000000000
--- a/meta/recipes-sato/gaku/gaku_svn.bb
+++ /dev/null
@@ -1,27 +0,0 @@
-DESCRIPTION = "Music player"
-LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
-                    file://main.c;beginline=1;endline=20;md5=0c02b4ef945956832b37a036b9cc103a"
-DEPENDS = "gtk+ gstreamer libowl-av"
-
-RDEPENDS_${PN} = "gst-plugins-base-audioconvert \
-            gst-plugins-base-audioresample \
-            gst-plugins-base-typefindfunctions \
-            gst-plugins-base-playbin"
-
-RRECOMMENDS_${PN} = "gst-plugins-good-id3demux \
-               gst-plugins-base-vorbis \
-               gst-plugins-base-alsa \
-               gst-plugins-base-ogg \
-               ${COMMERCIAL_AUDIO_PLUGINS}"
-
-SRCREV = "399"
-PV = "0.0+svnr${SRCPV}"
-
-PR = "r4"
-
-SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=${BPN};proto=http"
-
-S = "${WORKDIR}/${BPN}"
-
-inherit autotools pkgconfig
diff --git a/meta/recipes-sato/gtk-engines/gtk-sato-engine_git.bb b/meta/recipes-sato/gtk-engines/gtk-sato-engine_git.bb
new file mode 100644
index 000000000..224b6e132
--- /dev/null
+++ b/meta/recipes-sato/gtk-engines/gtk-sato-engine_git.bb
@@ -0,0 +1,15 @@
+require gtk-sato-engine.inc
+
+LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
+                    file://src/sato-utils.h;endline=24;md5=708f28cfe7fe028d497aaf4389b80b62 \
+                    file://src/sato-main.c;endline=24;md5=b5e5dddebca570275becb51b526e4c5a"
+
+SRCREV = "e4a29fbb7648f12fb3aefd8ea0120c3f54ba392a"
+PV = "0.3.3+git${SRCPV}"
+PR = "r0"
+
+SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git"
+
+S = "${WORKDIR}/git"
+
+EXTRA_OECONF += "${@base_contains('MACHINE_FEATURES', 'qvga', '--with-mode=qvga', '',d)}"
diff --git a/meta/recipes-sato/gtk-engines/gtk-sato-engine_svn.bb b/meta/recipes-sato/gtk-engines/gtk-sato-engine_svn.bb
deleted file mode 100644
index 6099ae406..000000000
--- a/meta/recipes-sato/gtk-engines/gtk-sato-engine_svn.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-require gtk-sato-engine.inc
-
-LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
-                    file://src/sato-utils.h;endline=24;md5=708f28cfe7fe028d497aaf4389b80b62 \
-                    file://src/sato-main.c;endline=24;md5=b5e5dddebca570275becb51b526e4c5a"
-
-SRCREV = "163"
-PV = "0.3.2+svnr${SRCPV}"
-PR = "r1"
-
-SRC_URI = "svn://svn.o-hand.com/repos/sato/trunk;module=gtk-engine;proto=http"
-
-EXTRA_OECONF += "${@base_contains('MACHINE_FEATURES', 'qvga', '--with-mode=qvga', '',d)}"
-
-S = "${WORKDIR}/gtk-engine"
diff --git a/meta/recipes-sato/libowl/libowl_git.bb b/meta/recipes-sato/libowl/libowl_git.bb
new file mode 100644
index 000000000..20bc0599d
--- /dev/null
+++ b/meta/recipes-sato/libowl/libowl_git.bb
@@ -0,0 +1,21 @@
+DESCRIPTION = "OpenedHand Widget Library"
+HOMEPAGE = "http://www.o-hand.com"
+BUGTRACKER = "http://bugzilla.openedhand.com/"
+
+LICENSE = "GPLv2 & LGPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
+                    file://libowl/owlpaned.h;endline=20;md5=7fef844c4cc01b10541a7ab6ab5971af \
+                    file://libowl/owltreemodelslice.h;endline=20;md5=a5421f2cdae8debe5e4c48c09a02beb9 \
+                    file://libowl/owlcolourswatch.h;endline=24;md5=063c415c58719d536990ca8f606b5730"
+
+SECTION = "libs"
+DEPENDS = "gtk+"
+SRCREV = "6ebc8ac8f8575278dd40a535cadefa26374e44b1"
+PV = "0.1+git${SRCPV}"
+PR = "r0"
+
+SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git"
+
+S = "${WORKDIR}/git"
+
+inherit autotools pkgconfig
diff --git a/meta/recipes-sato/libowl/libowl_svn.bb b/meta/recipes-sato/libowl/libowl_svn.bb
deleted file mode 100644
index 1500fad5c..000000000
--- a/meta/recipes-sato/libowl/libowl_svn.bb
+++ /dev/null
@@ -1,21 +0,0 @@
-DESCRIPTION = "OpenedHand Widget Library"
-HOMEPAGE = "http://www.o-hand.com"
-BUGTRACKER = "http://bugzilla.openedhand.com/"
-
-LICENSE = "GPLv2 & LGPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
-                    file://libowl/owlpaned.h;endline=20;md5=7fef844c4cc01b10541a7ab6ab5971af \
-                    file://libowl/owltreemodelslice.h;endline=20;md5=a5421f2cdae8debe5e4c48c09a02beb9 \
-                    file://libowl/owlcolourswatch.h;endline=24;md5=063c415c58719d536990ca8f606b5730"
-
-SECTION = "libs"
-DEPENDS = "gtk+"
-SRCREV = "408"
-PV = "0.0+svnr${SRCPV}"
-PR = "r6"
-
-SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=${BPN};proto=http"
-
-S = "${WORKDIR}/${BPN}"
-
-inherit autotools pkgconfig
diff --git a/meta/recipes-sato/matchbox-desktop-sato/matchbox-desktop-sato_git.bb b/meta/recipes-sato/matchbox-desktop-sato/matchbox-desktop-sato_git.bb
new file mode 100644
index 000000000..5daeb7276
--- /dev/null
+++ b/meta/recipes-sato/matchbox-desktop-sato/matchbox-desktop-sato_git.bb
@@ -0,0 +1,22 @@
+DESCRIPTION = "Sato desktop folders"
+HOMEPAGE = "http://matchbox-project.org"
+BUGTRACKER = "http://bugzilla.openedhand.com/"
+
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
+
+SECTION = "x11"
+DEPENDS = ""
+CONFLICTS = "matchbox-common"
+
+SRCREV = "810b0b08eb79e4685202da2ec347b990bb467e07"
+PV = "0.1+git${SRCPV}"
+PR = "r0"
+
+SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git"
+
+S = "${WORKDIR}/git"
+
+inherit autotools pkgconfig
+
+FILES_${PN} += "${datadir}"
diff --git a/meta/recipes-sato/matchbox-desktop-sato/matchbox-desktop-sato_svn.bb b/meta/recipes-sato/matchbox-desktop-sato/matchbox-desktop-sato_svn.bb
deleted file mode 100644
index 7a68138fc..000000000
--- a/meta/recipes-sato/matchbox-desktop-sato/matchbox-desktop-sato_svn.bb
+++ /dev/null
@@ -1,20 +0,0 @@
-DESCRIPTION = "Sato desktop folders"
-HOMEPAGE = "http://matchbox-project.org"
-BUGTRACKER = "http://bugzilla.openedhand.com/"
-
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
-
-SECTION = "x11"
-DEPENDS = ""
-CONFLICTS = "matchbox-common"
-SRCREV = "76"
-PV = "0.0+svnr${SRCPV}"
-PR = "r0"
-
-SRC_URI = "svn://svn.o-hand.com/repos/sato/trunk;module=desktop-folders;proto=http"
-S = "${WORKDIR}/desktop-folders"
-
-inherit autotools pkgconfig
-
-FILES_${PN} += "${datadir}"
diff --git a/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato-2_git.bb b/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato-2_git.bb
new file mode 100644
index 000000000..d6bfb2f8f
--- /dev/null
+++ b/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato-2_git.bb
@@ -0,0 +1,12 @@
+require matchbox-theme-sato.inc
+
+DEPENDS = "matchbox-wm-2"
+SRCREV = "f72cf4ed7d71ad9e47b0f2d3dbc593bc2f3e76f8"
+PV = "0.2+git${SRCPV}"
+
+SRC_URI = "git://git.yoctoproject.org/matchbox-sato;protocol=git \
+          file://png_rename.patch"
+
+S = "${WORKDIR}/git"
+
+EXTRA_OECONF = "--disable-matchbox-1 --enable-matchbox-2"
diff --git a/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato-2_svn.bb b/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato-2_svn.bb
deleted file mode 100644
index 89e01b148..000000000
--- a/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato-2_svn.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require matchbox-theme-sato.inc
-
-DEPENDS = "matchbox-wm-2"
-SRCREV = "164"
-PV = "0.1+svnr${SRCPV}"
-
-SRC_URI = "svn://svn.o-hand.com/repos/sato/trunk;module=matchbox-sato;proto=http \
-          file://png_rename.patch"
-
-S = "${WORKDIR}/matchbox-sato"
-
-EXTRA_OECONF = "--disable-matchbox-1 --enable-matchbox-2"
diff --git a/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato_git.bb b/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato_git.bb
new file mode 100644
index 000000000..bb41fdfea
--- /dev/null
+++ b/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato_git.bb
@@ -0,0 +1,13 @@
+require matchbox-theme-sato.inc
+
+SRCREV = "f72cf4ed7d71ad9e47b0f2d3dbc593bc2f3e76f8"
+PV = "0.2+git${SRCPV}"
+PR = "r0"
+
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI = "git://git.yoctoproject.org/matchbox-sato;protocol=git"
+
+EXTRA_OECONF += "${@base_contains('MACHINE_FEATURES', 'qvga', '--with-mode=qvga', '',d)}"
+
+S = "${WORKDIR}/git"
diff --git a/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato_svn.bb b/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato_svn.bb
deleted file mode 100644
index 776d802c4..000000000
--- a/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato_svn.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-require matchbox-theme-sato.inc
-
-SRCREV = "90"
-PV = "0.1+svnr${SRCPV}"
-PR = "r0"
-
-DEFAULT_PREFERENCE = "-1"
-
-SRC_URI = "svn://svn.o-hand.com/repos/sato/trunk;module=matchbox-sato;proto=http"
-
-EXTRA_OECONF += "${@base_contains('MACHINE_FEATURES', 'qvga', '--with-mode=qvga', '',d)}"
-
-S = "${WORKDIR}/matchbox-sato"
diff --git a/meta/recipes-sato/owl-video-widget/libowl-av_git.bb b/meta/recipes-sato/owl-video-widget/libowl-av_git.bb
new file mode 100644
index 000000000..176b61ffc
--- /dev/null
+++ b/meta/recipes-sato/owl-video-widget/libowl-av_git.bb
@@ -0,0 +1,26 @@
+DESCRIPTION = "OpenedHand Widget Library Audio/Video"
+HOMEPAGE = "http://www.o-hand.com"
+BUGTRACKER = "http://bugzilla.openedhand.com/"
+
+LICENSE = "LGPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=ac14b7ca45afea5af040da54db270eb0 \
+                    file://libowl-av/owl-video-widget.h;endline=22;md5=0d4caab10952acdf470086c25c7f70c8 \
+                    file://libowl-av/owl-audio-player.h;endline=22;md5=4af2d44f206a086f9f03881236f7390b"
+
+SECTION = "x11"
+DEPENDS = "gtk+ gstreamer gst-plugins-base"
+RDEPENDS_${PN} = "gst-meta-base"
+RRECOMMENDS_${PN} = "gst-meta-audio gst-meta-video"
+
+SRCREV = "1379fd230a32509e94971961183f1031f469737a"
+PV = "0.1+git${SRCPV}"
+PR = "r0"
+
+
+SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git \
+           file://gst_change_state.patch \
+	   file://make-382.patch"
+
+S = "${WORKDIR}/git"
+
+inherit autotools pkgconfig
diff --git a/meta/recipes-sato/owl-video-widget/libowl-av_svn.bb b/meta/recipes-sato/owl-video-widget/libowl-av_svn.bb
deleted file mode 100644
index 04928a4c3..000000000
--- a/meta/recipes-sato/owl-video-widget/libowl-av_svn.bb
+++ /dev/null
@@ -1,25 +0,0 @@
-DESCRIPTION = "OpenedHand Widget Library Audio/Video"
-HOMEPAGE = "http://www.o-hand.com"
-BUGTRACKER = "http://bugzilla.openedhand.com/"
-
-LICENSE = "LGPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=ac14b7ca45afea5af040da54db270eb0 \
-                    file://libowl-av/owl-video-widget.h;endline=22;md5=0d4caab10952acdf470086c25c7f70c8 \
-                    file://libowl-av/owl-audio-player.h;endline=22;md5=4af2d44f206a086f9f03881236f7390b"
-
-SECTION = "x11"
-DEPENDS = "gtk+ gstreamer gst-plugins-base"
-RDEPENDS_${PN} = "gst-meta-base"
-RRECOMMENDS_${PN} = "gst-meta-audio gst-meta-video"
-
-SRCREV = "416"
-PV = "0.0+svnr${SRCPV}"
-PR = "r6"
-
-S = "${WORKDIR}/${BPN}"
-
-SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=${BPN};proto=http \
-           file://gst_change_state.patch \
-	   file://make-382.patch"
-
-inherit autotools pkgconfig
diff --git a/meta/recipes-sato/owl-video-widget/owl-video_git.bb b/meta/recipes-sato/owl-video-widget/owl-video_git.bb
new file mode 100644
index 000000000..3ecb82e78
--- /dev/null
+++ b/meta/recipes-sato/owl-video-widget/owl-video_git.bb
@@ -0,0 +1,41 @@
+DESCRIPTION = "OpenedHand Widget Library video widget"
+HOMEPAGE = "http://o-hand.com/"
+BUGTRACKER = "http://bugzilla.o-hand.com/"
+LICENSE = "LGPLv2.1 & GPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=ac14b7ca45afea5af040da54db270eb0 \
+                    file://src/video.c;endline=22;md5=e8e9f23c3691c11af7d8fc03264ca9da \
+                    file://src/bacon-volume.c;endline=20;md5=798804562b24e30bac482ba91c45e46d"
+SECTION = "x11"
+DEPENDS = "libowl-av"
+
+SRCREV = "f133472318970796fae1ea3e98ac062156768baf"
+PV = "0.1+git${SRCPV}"
+PR = "r0"
+
+S = "${WORKDIR}/git"
+
+SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git \
+           file://gtk_multithread_safe.patch \
+           file://owl-video-widget.png \
+           file://stock_media-play.png \
+           file://stock_volume-0.png \
+           file://stock_volume-min.png \
+           file://stock_volume-med.png \
+           file://stock_volume-max.png \
+           file://owl-video-widget.desktop \
+	   file://make-382.patch"
+
+inherit autotools pkgconfig
+
+do_install_append () {
+	install -d ${D}/${datadir}/pixmaps
+	install -m 0644 ${WORKDIR}/stock_media-play.png ${D}/${datadir}/pixmaps
+	install -m 0644 ${WORKDIR}/stock_volume-0.png ${D}/${datadir}/pixmaps
+	install -m 0644 ${WORKDIR}/stock_volume-min.png ${D}/${datadir}/pixmaps
+	install -m 0644 ${WORKDIR}/stock_volume-med.png ${D}/${datadir}/pixmaps
+	install -m 0644 ${WORKDIR}/stock_volume-max.png ${D}/${datadir}/pixmaps
+	install -m 0644 ${WORKDIR}/owl-video-widget.png ${D}/${datadir}/pixmaps
+
+	install -d ${D}/${datadir}/applications
+	install -m 0644 ${WORKDIR}/owl-video-widget.desktop ${D}/${datadir}/applications
+}
diff --git a/meta/recipes-sato/owl-video-widget/owl-video_svn.bb b/meta/recipes-sato/owl-video-widget/owl-video_svn.bb
deleted file mode 100644
index 52883ce2c..000000000
--- a/meta/recipes-sato/owl-video-widget/owl-video_svn.bb
+++ /dev/null
@@ -1,41 +0,0 @@
-DESCRIPTION = "OpenedHand Widget Library video widget"
-HOMEPAGE = "http://o-hand.com/"
-BUGTRACKER = "http://bugzilla.o-hand.com/"
-LICENSE = "LGPLv2.1 & GPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=ac14b7ca45afea5af040da54db270eb0 \
-                    file://src/video.c;endline=22;md5=e8e9f23c3691c11af7d8fc03264ca9da \
-                    file://src/bacon-volume.c;endline=20;md5=798804562b24e30bac482ba91c45e46d"
-SECTION = "x11"
-DEPENDS = "libowl-av"
-
-SRCREV = "394"
-PV = "0.0+svnr${SRCPV}"
-PR = "r3"
-
-S = "${WORKDIR}/video"
-
-SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=video;proto=http \
-           file://gtk_multithread_safe.patch \
-           file://owl-video-widget.png \
-           file://stock_media-play.png \
-           file://stock_volume-0.png \
-           file://stock_volume-min.png \
-           file://stock_volume-med.png \
-           file://stock_volume-max.png \
-           file://owl-video-widget.desktop \
-	   file://make-382.patch"
-
-inherit autotools pkgconfig
-
-do_install_append () {
-	install -d ${D}/${datadir}/pixmaps
-	install -m 0644 ${WORKDIR}/stock_media-play.png ${D}/${datadir}/pixmaps
-	install -m 0644 ${WORKDIR}/stock_volume-0.png ${D}/${datadir}/pixmaps
-	install -m 0644 ${WORKDIR}/stock_volume-min.png ${D}/${datadir}/pixmaps
-	install -m 0644 ${WORKDIR}/stock_volume-med.png ${D}/${datadir}/pixmaps
-	install -m 0644 ${WORKDIR}/stock_volume-max.png ${D}/${datadir}/pixmaps
-	install -m 0644 ${WORKDIR}/owl-video-widget.png ${D}/${datadir}/pixmaps
-
-	install -d ${D}/${datadir}/applications
-	install -m 0644 ${WORKDIR}/owl-video-widget.desktop ${D}/${datadir}/applications
-}
diff --git a/meta/recipes-sato/puzzles/oh-puzzles_git.bb b/meta/recipes-sato/puzzles/oh-puzzles_git.bb
new file mode 100644
index 000000000..6d95d79e8
--- /dev/null
+++ b/meta/recipes-sato/puzzles/oh-puzzles_git.bb
@@ -0,0 +1,70 @@
+DESCRIPTION = "Portable Puzzle Collection"
+HOMEPAGE = "http://o-hand.com/"
+BUGTRACKER = "http://bugzilla.openedhand.com/"
+
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENCE;md5=f56ec6772dd1c7c367067bbea8ea1675 \
+                    file://src/tree234.h;endline=28;md5=a188e6d250430ca094a54a82f48472a7 \
+                    file://src/tree234.c;endline=28;md5=b4feb1976feebf8f1379093ed52f2945"
+
+SECTION = "x11"
+DEPENDS = "gtk+ gconf intltool-native librsvg"
+DEPENDS_append_poky = " libowl"
+
+SRCREV = "92f1a20e4b72eed7a35b00984d9793b51dc2fb3b"
+PV = "0.2+git${SRCPV}"
+PR = "r10"
+
+SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git"
+SRC_URI_append_poky = " file://oh-puzzles-owl-menu.patch;striplevel=0 "
+
+S = "${WORKDIR}/git"
+
+inherit autotools pkgconfig
+
+bindir = "/usr/games"
+
+EXTRA_OEMAKE += "GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1"
+
+do_install_append () {
+    install -d ${D}/${datadir}/applications/
+
+    cd ${D}/${prefix}/games
+    for prog in *; do
+	if [ -x $prog ]; then
+            # Convert prog to Title Case
+            title=$(echo $prog | sed 's/\(^\| \)./\U&/g')
+	    echo "making ${D}/${datadir}/applications/$prog.desktop"
+	    cat <<STOP > ${D}/${datadir}/applications/$prog.desktop
+[Desktop Entry]
+Name=$title
+Exec=${prefix}/games/$prog
+Icon=applications-games
+Terminal=false
+Type=Application
+Categories=Game;
+StartupNotify=true
+X-MB-SingleInstance=true
+Comment=Play $title.
+STOP
+        fi
+    done
+}
+
+PACKAGES += ${PN}-extra
+RDEPENDS_${PN}-extra += "oh-puzzles"
+
+FILES_${PN} = "/usr/share/pixmaps /usr/share/oh-puzzles/"
+FILES_${PN}-dbg += "/usr/games/.debug/*"
+FILES_${PN}-extra = "/usr/games/ /usr/share/applications /etc/gconf/schemas"
+
+python __anonymous () {
+    import bb
+    var = bb.data.expand("FILES_${PN}", d, 1)
+    data = bb.data.getVar(var, d, 1)
+    for name in ("bridges", "fifteen", "inertia", "map", "samegame", "slant"):
+        data = data + " /usr/games/%s" % name
+        data = data + " /usr/share/applications/%s.desktop" % name
+        data = data + " /etc/gconf/schemas/%s.schemas" % name
+    bb.data.setVar(var, data, d)
+}
diff --git a/meta/recipes-sato/puzzles/oh-puzzles_svn.bb b/meta/recipes-sato/puzzles/oh-puzzles_svn.bb
deleted file mode 100644
index b5e5b91b6..000000000
--- a/meta/recipes-sato/puzzles/oh-puzzles_svn.bb
+++ /dev/null
@@ -1,70 +0,0 @@
-DESCRIPTION = "Portable Puzzle Collection"
-HOMEPAGE = "http://o-hand.com/"
-BUGTRACKER = "http://bugzilla.openedhand.com/"
-
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENCE;md5=f56ec6772dd1c7c367067bbea8ea1675 \
-                    file://src/tree234.h;endline=28;md5=a188e6d250430ca094a54a82f48472a7 \
-                    file://src/tree234.c;endline=28;md5=b4feb1976feebf8f1379093ed52f2945"
-
-SECTION = "x11"
-DEPENDS = "gtk+ gconf intltool-native librsvg"
-DEPENDS_append_poky = " libowl"
-
-SRCREV = "23"
-PV = "0.1+svnr${SRCPV}"
-PR = "r10"
-
-bindir = "/usr/games"
-
-inherit autotools pkgconfig
-
-SRC_URI = "svn://svn.o-hand.com/repos/;module=oh-puzzles;proto=http"
-SRC_URI_append_poky = " file://oh-puzzles-owl-menu.patch;striplevel=0 "
-
-S = "${WORKDIR}/${BPN}"
-
-EXTRA_OEMAKE += "GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1"
-
-do_install_append () {
-    install -d ${D}/${datadir}/applications/
-
-    cd ${D}/${prefix}/games
-    for prog in *; do
-	if [ -x $prog ]; then
-            # Convert prog to Title Case
-            title=$(echo $prog | sed 's/\(^\| \)./\U&/g')
-	    echo "making ${D}/${datadir}/applications/$prog.desktop"
-	    cat <<STOP > ${D}/${datadir}/applications/$prog.desktop
-[Desktop Entry]
-Name=$title
-Exec=${prefix}/games/$prog
-Icon=applications-games
-Terminal=false
-Type=Application
-Categories=Game;
-StartupNotify=true
-X-MB-SingleInstance=true
-Comment=Play $title.
-STOP
-        fi
-    done
-}
-
-PACKAGES += ${PN}-extra
-RDEPENDS_${PN}-extra += "oh-puzzles"
-
-FILES_${PN} = "/usr/share/pixmaps /usr/share/oh-puzzles/"
-FILES_${PN}-dbg += "/usr/games/.debug/*"
-FILES_${PN}-extra = "/usr/games/ /usr/share/applications /etc/gconf/schemas"
-
-python __anonymous () {
-    import bb
-    var = bb.data.expand("FILES_${PN}", d, 1)
-    data = bb.data.getVar(var, d, 1)
-    for name in ("bridges", "fifteen", "inertia", "map", "samegame", "slant"):
-        data = data + " /usr/games/%s" % name
-        data = data + " /usr/share/applications/%s.desktop" % name
-        data = data + " /etc/gconf/schemas/%s.schemas" % name
-    bb.data.setVar(var, data, d)
-}
diff --git a/meta/recipes-sato/screenshot/screenshot_git.bb b/meta/recipes-sato/screenshot/screenshot_git.bb
new file mode 100644
index 000000000..917a27dc2
--- /dev/null
+++ b/meta/recipes-sato/screenshot/screenshot_git.bb
@@ -0,0 +1,23 @@
+DESCRIPTION = "An ultra-simple screen capture utility, aimed at handheld devices"
+HOMEPAGE = "http://www.o-hand.com"
+BUGTRACKER = "http://bugzilla.openedhand.com/"
+
+LICENSE = "GPLv2 & GPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
+                    file://main.c;endline=9;md5=023e14d6404d0a961eb97cbd011fc141 \
+                    file://screenshot-ui.h;endline=9;md5=638d9ffa83e9325a36df224166ed6ad0"
+
+DEPENDS = "matchbox-panel-2"
+SRCREV = "c792e4edc758bab21e0b01814979eacf0b1af945"
+PV = "0.1+git${SRCPV}"
+PR = "r0"
+
+SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git \
+           file://fix_ldadd_order.patch"
+
+S = "${WORKDIR}/git"
+
+inherit autotools pkgconfig
+
+FILES_${PN} += "${libdir}/matchbox-panel/*.so"
+FILES_${PN}-dbg += "${libdir}/matchbox-panel/.debug"
diff --git a/meta/recipes-sato/screenshot/screenshot_svn.bb b/meta/recipes-sato/screenshot/screenshot_svn.bb
deleted file mode 100644
index 825870d6d..000000000
--- a/meta/recipes-sato/screenshot/screenshot_svn.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-DESCRIPTION = "An ultra-simple screen capture utility, aimed at handheld devices"
-HOMEPAGE = "http://www.o-hand.com"
-BUGTRACKER = "http://bugzilla.openedhand.com/"
-
-LICENSE = "GPLv2 & GPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
-                    file://main.c;endline=9;md5=023e14d6404d0a961eb97cbd011fc141 \
-                    file://screenshot-ui.h;endline=9;md5=638d9ffa83e9325a36df224166ed6ad0"
-
-DEPENDS = "matchbox-panel-2"
-SRCREV = "292"
-PV = "0.0+svnr${SRCPV}"
-PR = "r2"
-
-SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=${BPN};proto=http \
-           file://fix_ldadd_order.patch"
-
-S = ${WORKDIR}/${BPN}
-
-inherit autotools pkgconfig
-
-FILES_${PN} += "${libdir}/matchbox-panel/*.so"
-FILES_${PN}-dbg += "${libdir}/matchbox-panel/.debug"
diff --git a/meta/recipes-sato/web/web-webkit_git.bb b/meta/recipes-sato/web/web-webkit_git.bb
new file mode 100644
index 000000000..2af12bc39
--- /dev/null
+++ b/meta/recipes-sato/web/web-webkit_git.bb
@@ -0,0 +1,32 @@
+DESCRIPTION = "Multi-platform web browsing application."
+HOMEPAGE = "http://o-hand.com/"
+BUGTRACKER = "http://bugzilla.openedhand.com/"
+
+LICENSE = "LGPLv2.1"
+LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34"
+
+SECTION = "x11"
+DEPENDS = "libxml2 glib-2.0 gtk+ libglade webkit-gtk curl gconf js libowl"
+
+# To access https web pages
+RRECOMMENDS_${PN} += "glib-networking"
+
+SRCREV = "0f7019acd9db5383c732d0524c7c3a5eaec9be2b"
+PV = "0.1+git${SRCPV}"
+PR = "r0"
+
+SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git \
+           file://link-with-g++.patch \
+	   file://make-382.patch"
+
+S = "${WORKDIR}/git"
+
+EXTRA_OECONF = "--enable-libowl"
+
+inherit autotools pkgconfig gconf
+
+do_configure_prepend() {
+    touch ${S}/src/dummy.cpp
+}
+
+FILES_${PN} += "${datadir}/web2"
diff --git a/meta/recipes-sato/web/web-webkit_svn.bb b/meta/recipes-sato/web/web-webkit_svn.bb
deleted file mode 100644
index 2f79e0ad1..000000000
--- a/meta/recipes-sato/web/web-webkit_svn.bb
+++ /dev/null
@@ -1,32 +0,0 @@
-DESCRIPTION = "Multi-platform web browsing application."
-HOMEPAGE = "http://o-hand.com/"
-BUGTRACKER = "http://bugzilla.openedhand.com/"
-
-LICENSE = "LGPLv2.1"
-LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34"
-
-SECTION = "x11"
-DEPENDS = "libxml2 glib-2.0 gtk+ libglade webkit-gtk curl gconf js libowl"
-
-# To access https web pages
-RRECOMMENDS_${PN} += "glib-networking"
-
-SRCREV = "130"
-PV = "0.0+svnr${SRCPV}"
-PR = "r4"
-
-SRC_URI = "svn://svn.o-hand.com/repos/web/branches;module=webkit;proto=http \
-           file://link-with-g++.patch \
-	   file://make-382.patch"
-
-S = "${WORKDIR}/webkit"
-
-EXTRA_OECONF = "--enable-libowl"
-
-inherit autotools pkgconfig gconf
-
-do_configure_prepend() {
-    touch ${S}/src/dummy.cpp
-}
-
-FILES_${PN} += "${datadir}/web2"
-- 
cgit v1.2.3