6 files changed, 39 insertions, 39 deletions
diff --git a/recipes/e17/e-tasks_svn.bb b/recipes/e17/e-tasks_svn.bb
index 9556e146d6..5c07a1bd3c 100644
--- a/recipes/e17/e-tasks_svn.bb
+++ b/recipes/e17/e-tasks_svn.bb
@@ -10,14 +10,8 @@ inherit autotools
 PV = "0.0.1+svnr${SRCPV}"
 PR = "r1"
 
-SRC_URI = "svn://e-tasks.googlecode.com/svn/trunk;module=.;proto=http"
-S = "${WORKDIR}"
-
-do_configure_prepend() {
-  # all links to /usr/share/automake-1.10/
-  rm -f ${S}/depcomp ${S}/config.guess ${S}/config.sub ${S}/INSTALL ${S}/install-sh ${S}/missing
-  touch ${S}/INSTALL
-}
+SRC_URI = "svn://e-tasks.googlecode.com/svn;module=trunk;proto=http"
+S = "${WORKDIR}/trunk"
 
 do_install_append() {
         install -d "${D}/${datadir}/pixmaps"
diff --git a/recipes/intone-video/intone-video_svn.bb b/recipes/intone-video/intone-video_svn.bb
index 30ac70acd2..0f7979f122 100644
--- a/recipes/intone-video/intone-video_svn.bb
+++ b/recipes/intone-video/intone-video_svn.bb
@@ -9,26 +9,15 @@ RDEPENDS = "mplayer lame libxv libsdl-x11"
 PV = "0.13+svnr${SRCPV}"
 PR = "r1"
 
-SRC_URI = "svn://intone-video.googlecode.com/svn/trunk;module=.;proto=http"
-S = "${WORKDIR}"
+SRC_URI = "svn://intone-video.googlecode.com/svn;module=trunk;proto=http"
+S = "${WORKDIR}/trunk"
 
 inherit autotools
 
-do_configure_prepend() {
-	rm -f "${S}/INSTALL"
-	touch "${S}/INSTALL"
-	sed -i 's/intone/intone-video/g' ${S}/configure.ac
-	sed -i 's/\/doc\/intone$/\/share\/doc\/intone-video/g' ${S}/Makefile.am
-	sed -i '/^EXTRA_DIST = $(glade_DATA)/d' ${S}/src/Makefile.am
-	sed -i '/^gladedir = $(datadir)\/intone\/glade/d' ${S}/src/Makefile.am
-	sed -i '/^glade_DATA = intone.glade/d' ${S}/src/Makefile.am
-}
-
 do_install_append() {
-	mv ${D}/${bindir}/intone ${D}/${bindir}/intone-video
-	mkdir -p "${D}/${datadir}/pixmaps"
+	install -d "${D}/${datadir}/pixmaps"
 	install -m 0644 "${S}/resources/intone-video.png" "${D}/${datadir}/pixmaps"
-	mkdir -p "${D}/${datadir}/applications"
+	install -d "${D}/${datadir}/applications"
 	install -m 0644 "${S}/resources/intone-video.desktop" "${D}/${datadir}/applications"
 }
 
diff --git a/recipes/intone/intone_svn.bb b/recipes/intone/intone_svn.bb
index e1af70d9aa..29773c2638 100644
--- a/recipes/intone/intone_svn.bb
+++ b/recipes/intone/intone_svn.bb
@@ -9,18 +9,12 @@ RDEPENDS = "mplayer lame libxv libsdl-x11"
 PV = "0.66+svnr${SRCPV}"
 PR = "r2"
 
-SRC_URI = "svn://intone.googlecode.com/svn/trunk;module=.;proto=http \
+SRC_URI = "svn://intone.googlecode.com/svn;module=trunk;proto=http \
 file://vorbis-include-id3tag.patch;pnum=1;patch=1;maxrev=18"
-S = "${WORKDIR}"
+S = "${WORKDIR}/trunk"
 
 inherit autotools
 
-do_configure_prepend() {
-	rm -f "${S}/INSTALL"
-	touch "${S}/INSTALL"
-	sed -i 's/{prefix}\/doc\/intone$/{prefix}\/share\/doc\/intone/g' ${S}/Makefile.am
-}
-
 do_install_append() {
 	mkdir -p "${D}/${datadir}/pixmaps"
 	install -m 0644 "${S}/resources/intone.png" "${D}/${datadir}/pixmaps"
diff --git a/recipes/openmoko-3rdparty/guitartune_svn.bb b/recipes/openmoko-3rdparty/guitartune_svn.bb
new file mode 100644
index 0000000000..37fbd5ffa3
--- /dev/null
+++ b/recipes/openmoko-3rdparty/guitartune_svn.bb
@@ -0,0 +1,28 @@
+DESCRIPTION = "guitar tuner for openmoko phones"
+HOMEPAGE = "http://code.google.com/p/guitartune"
+AUTHOR = "cchandel"
+LICENSE = "GPLv2"
+SECTION = "e/apps"
+DEPENDS = "gtk+ libglade fftw sqlite3"
+
+PV = "0.36+svnr${SRCPV}"
+
+SRC_URI = "svn://guitartune.googlecode.com/svn;module=trunk;proto=http"
+S = "${WORKDIR}/trunk"
+
+inherit autotools
+
+do_install_append() {
+        install -d "${D}/${datadir}/pixmaps"
+        install -m 0644 "${S}/resources/guitartune.png" "${D}/${datadir}/pixmaps"
+        install -d "${D}/${datadir}/applications"
+        install -m 0644 "${S}/resources/guitartune.desktop" "${D}/${datadir}/applications"
+        install -d "${D}/${datadir}/guitartune"
+        for ico in "${S}/resources/"*.png; do
+                if [ "$(basename $ico)" != "guitartune.png" ]; then
+                        install -m 0644 $ico "${D}/${datadir}/guitartune"
+                fi
+        done
+}
+
+FILES_${PN} += "/usr/share/guitartune/* /usr/share/applications/* /usr/share/pixmaps/*"
diff --git a/recipes/shr/shr-launcher_svn.bb b/recipes/shr/shr-launcher_svn.bb
index 807d3a2cea..481be9021b 100644
--- a/recipes/shr/shr-launcher_svn.bb
+++ b/recipes/shr/shr-launcher_svn.bb
@@ -8,15 +8,9 @@ DEPENDS = "elementary eina edbus"
 PV = "0.0.1+svnr${SRCPV}"
 PR = "r4"
 
-SRC_URI = "svn://shr-launcher.googlecode.com/svn/trunk;module=.;proto=http"
+SRC_URI = "svn://shr-launcher.googlecode.com/svn;module=trunk;proto=http"
 
-do_configure_prepend() {
-  # all links to /usr/share/automake-1.10/
-  rm -f ${S}/depcomp ${S}/config.guess ${S}/config.sub ${S}/INSTALL ${S}/install-sh ${S}/missing
-  touch ${S}/INSTALL
-}
-
-S = "${WORKDIR}"
+S = "${WORKDIR}/trunk"
 
 inherit autotools
 
diff --git a/recipes/tasks/task-shr-feed.bb b/recipes/tasks/task-shr-feed.bb
index 1e5706d777..4b3e764d5e 100644
--- a/recipes/tasks/task-shr-feed.bb
+++ b/recipes/tasks/task-shr-feed.bb
@@ -27,6 +27,7 @@ RDEPENDS_${PN} += "\
 		gpe-timesheet \
 		gpe-contacts \
 		gtkmm \
+		guitartune \
 		mc \
 		mplayer \
 		navit \