Merge branch 'org.openembedded.dev' of git.openembedded.org:openembedded into org.openembedded.dev

69 files changed, 641 insertions, 62 deletions

diff --git a/recipes/efl1/illume-keyboard-arabic_git.bb b/recipes/efl1/illume-keyboard-arabic_git.bb
index 41ea9e1cd4..900c745fe5 100644
--- a/recipes/efl1/illume-keyboard-arabic_git.bb
+++ b/recipes/efl1/illume-keyboard-arabic_git.bb
@@ -1,6 +1,7 @@
 AUTHOR = "Mohammad Fahmi / Tom Hacohen"
 DESCRIPTION = "Illume keyboard with arabic layout"
-PV = "0.0-gitr${SRCREV}"
+PV = "0.0+gitr${SRCPV}"
+PE = "1"
 PR = "r0"
 
 BASEDIR = "arabic"
diff --git a/recipes/efl1/illume-keyboard-browse_git.bb b/recipes/efl1/illume-keyboard-browse_git.bb
index 268140c75a..4eda497c4c 100644
--- a/recipes/efl1/illume-keyboard-browse_git.bb
+++ b/recipes/efl1/illume-keyboard-browse_git.bb
@@ -1,6 +1,7 @@
 AUTHOR = "Pander"
 DESCRIPTION = "Illume keyboard with a layout optimized for browsing"
-PV = "0.0-gitr${SRCREV}"
+PV = "0.0+gitr${SRCPV}"
+PE = "1"
 PR = "r0"
 
 BASEDIR = "browse"
diff --git a/recipes/efl1/illume-keyboard-danish_git.bb b/recipes/efl1/illume-keyboard-danish_git.bb
index 21f8ff954a..5a042d9c6b 100644
--- a/recipes/efl1/illume-keyboard-danish_git.bb
+++ b/recipes/efl1/illume-keyboard-danish_git.bb
@@ -1,6 +1,7 @@
 AUTHOR = "Esben Damgaard"
 DESCRIPTION = "Illume keyboard with danish layout"
-PV = "0.0-gitr${SRCREV}"
+PV = "0.0+gitr${SRCPV}"
+PE = "1"
 PR = "r0"
 
 BASEDIR = "danish"
diff --git a/recipes/efl1/illume-keyboard-default-alt_git.bb b/recipes/efl1/illume-keyboard-default-alt_git.bb
index 34c3c299bb..f367f11f79 100644
--- a/recipes/efl1/illume-keyboard-default-alt_git.bb
+++ b/recipes/efl1/illume-keyboard-default-alt_git.bb
@@ -1,6 +1,7 @@
 AUTHOR = "Pander"
 DESCRIPTION = "Illume keyboard with an alternative default layout"
-PV = "0.0-gitr${SRCREV}"
+PV = "0.0+gitr${SRCPV}"
+PE = "1"
 PR = "r0"
 
 BASEDIR = "default-alt"
diff --git a/recipes/efl1/illume-keyboard-dutch_git.bb b/recipes/efl1/illume-keyboard-dutch_git.bb
index 2300ac7101..2eb137db85 100644
--- a/recipes/efl1/illume-keyboard-dutch_git.bb
+++ b/recipes/efl1/illume-keyboard-dutch_git.bb
@@ -1,6 +1,7 @@
 AUTHOR = "Pander"
 DESCRIPTION = "Illume keyboard with dutch layout"
-PV = "0.0-gitr${SRCREV}"
+PV = "0.0+gitr${SRCPV}"
+PE = "1"
 PR = "r0"
 
 BASEDIR = "dutch"
diff --git a/recipes/efl1/illume-keyboard-dvorak_git.bb b/recipes/efl1/illume-keyboard-dvorak_git.bb
index 795d78dcc7..dd6b96c31e 100644
--- a/recipes/efl1/illume-keyboard-dvorak_git.bb
+++ b/recipes/efl1/illume-keyboard-dvorak_git.bb
@@ -1,6 +1,7 @@
 AUTHOR = "Gabor Adam TOTH"
 DESCRIPTION = "Illume keyboard with dvorak layout"
-PV = "0.0-gitr${SRCREV}"
+PV = "0.0+gitr${SRCPV}"
+PE = "1"
 PR = "r0"
 
 BASEDIR = "dvorak"
diff --git a/recipes/efl1/illume-keyboard-french_git.bb b/recipes/efl1/illume-keyboard-french_git.bb
index 205a6ad991..8c8041a9b1 100644
--- a/recipes/efl1/illume-keyboard-french_git.bb
+++ b/recipes/efl1/illume-keyboard-french_git.bb
@@ -1,5 +1,6 @@
 DESCRIPTION = "Illume keyboard with french layout"
-PV = "0.0-gitr${SRCREV}"
+PV = "0.0+gitr${SRCPV}"
+PE = "1"
 PR = "r0"
 
 BASEDIR = "french"
diff --git a/recipes/efl1/illume-keyboard-german_git.bb b/recipes/efl1/illume-keyboard-german_git.bb
index 0252932116..a1ad5481df 100644
--- a/recipes/efl1/illume-keyboard-german_git.bb
+++ b/recipes/efl1/illume-keyboard-german_git.bb
@@ -1,6 +1,7 @@
 AUTHOR = "Florian Hackenberger"
 DESCRIPTION = "Illume keyboard with german layout"
-PV = "0.0-gitr${SRCREV}"
+PV = "0.0+gitr${SRCPV}"
+PE = "1"
 PR = "r0"
 
 BASEDIR = "german"
diff --git a/recipes/efl1/illume-keyboard-hebrew_git.bb b/recipes/efl1/illume-keyboard-hebrew_git.bb
index 8d408b4a91..e7cda399f2 100644
--- a/recipes/efl1/illume-keyboard-hebrew_git.bb
+++ b/recipes/efl1/illume-keyboard-hebrew_git.bb
@@ -1,6 +1,7 @@
 AUTHOR = "Tom Hacohen"
 DESCRIPTION = "Illume keyboard with hebrew layout"
-PV = "0.0-gitr${SRCREV}"
+PV = "0.0+gitr${SRCPV}"
+PE = "1"
 PR = "r0"
 
 BASEDIR = "hebrew"
diff --git a/recipes/efl1/illume-keyboard-numeric-alt_git.bb b/recipes/efl1/illume-keyboard-numeric-alt_git.bb
index f2d2487386..92090d925d 100644
--- a/recipes/efl1/illume-keyboard-numeric-alt_git.bb
+++ b/recipes/efl1/illume-keyboard-numeric-alt_git.bb
@@ -1,6 +1,7 @@
 AUTHOR = "Pander"
 DESCRIPTION = "Illume keyboard with an alternative numeric layout"
-PV = "0.0-gitr${SRCREV}"
+PV = "0.0+gitr${SRCPV}"
+PE = "1"
 PR = "r0"
 
 BASEDIR = "numeric-alt"
diff --git a/recipes/efl1/illume-keyboard-russian-terminal_git.bb b/recipes/efl1/illume-keyboard-russian-terminal_git.bb
index f0a4508d98..7b126bbf09 100644
--- a/recipes/efl1/illume-keyboard-russian-terminal_git.bb
+++ b/recipes/efl1/illume-keyboard-russian-terminal_git.bb
@@ -1,6 +1,7 @@
 AUTHOR = "lucky"
 DESCRIPTION = "Illume keyboard with russian layout for the Terminal"
-PV = "0.0-gitr${SRCREV}"
+PV = "0.0+gitr${SRCPV}"
+PE = "1"
 PR = "r0"
 
 BASEDIR = "russian-terminal"
diff --git a/recipes/efl1/illume-keyboard-russian_git.bb b/recipes/efl1/illume-keyboard-russian_git.bb
index 517956bb2b..c067871848 100644
--- a/recipes/efl1/illume-keyboard-russian_git.bb
+++ b/recipes/efl1/illume-keyboard-russian_git.bb
@@ -1,6 +1,7 @@
 AUTHOR = "lucky"
 DESCRIPTION = "Illume keyboard with russian layout"
-PV = "0.0-gitr${SRCREV}"
+PV = "0.0+gitr${SRCPV}"
+PE = "1"
 PR = "r0"
 
 BASEDIR = "russian"
diff --git a/recipes/shr/alsa-scenarii-shr_git.bb b/recipes/shr/alsa-scenarii-shr_git.bb
index 97b4393459..97b84984b6 100644
--- a/recipes/shr/alsa-scenarii-shr_git.bb
+++ b/recipes/shr/alsa-scenarii-shr_git.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Package for the different scenarios used by Openmoko"
 SECTION = "openmoko/base"
-PV = "1.0+gitr${SRCREV}"
-PR = "r1"
+PV = "1.0+gitr${SRCPV}"
+PR = "r2"
 
 COMPATIBLE_MACHINE = "(om-gta01|om-gta02|om-3d7k)"
 
@@ -21,5 +21,5 @@ PACKAGE_ARCH_${PN} = "${MACHINE_ARCH}"
 FILES_${PN} += "${datadir}/shr"
 
 CONFFILES_${PN} += "${datadir}/shr/scenarii/*"
-RPROVIDES_${PN} = "openmoko-alsa-scenarios"
+RPROVIDES_${PN} = "openmoko-alsa-scenarios virtual/alsa-scenarios"
 
diff --git a/recipes/shr/e-wm-config-illume-shr_git.bb b/recipes/shr/e-wm-config-illume-shr_git.bb
index 64bd23fe90..36154cef8e 100644
--- a/recipes/shr/e-wm-config-illume-shr_git.bb
+++ b/recipes/shr/e-wm-config-illume-shr_git.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "illume SHR config"
 SECTION = "e/utils"
 DEPENDS = "eet"
 LICENSE = "MIT BSD"
-PV = "1.1-${EFL_SRCREV}-gitr${SRCREV}"
+PV = "1.1-${EFL_SRCREV}+gitr${SRCPV}"
 PR = "r6"
 
 inherit e
diff --git a/recipes/shr/e-wm-menu-shr_git.bb b/recipes/shr/e-wm-menu-shr_git.bb
index 94529e335a..1deef919fd 100644
--- a/recipes/shr/e-wm-menu-shr_git.bb
+++ b/recipes/shr/e-wm-menu-shr_git.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "illume SHR applications.menu config"
 SECTION = "e/utils"
 LICENSE = "MIT BSD"
-PV = "1.1-${EFL_SRCREV}-gitr${SRCREV}"
+PV = "1.1-${EFL_SRCREV}+gitr${SRCPV}"
 
 RPROVIDES_${PN} = "e-wm-menu"
 RCONFLICTS_${PN} = "e-wm-menu"
diff --git a/recipes/shr/e-wm-sysactions-shr_git.bb b/recipes/shr/e-wm-sysactions-shr_git.bb
index 293edaeba3..07508c9fbb 100644
--- a/recipes/shr/e-wm-sysactions-shr_git.bb
+++ b/recipes/shr/e-wm-sysactions-shr_git.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "illume SHR sysactions config"
 SECTION = "e/utils"
 LICENSE = "MIT BSD"
-PV = "1.1-${EFL_SRCREV}-gitr${SRCREV}"
+PV = "1.1-${EFL_SRCREV}+gitr${SRCPV}"
 PR = "r3"
 
 RPROVIDES_${PN} = "e-wm-sysactions"
diff --git a/recipes/shr/e-wm-theme-illume-gry_git.bb b/recipes/shr/e-wm-theme-illume-gry_git.bb
new file mode 100644
index 0000000000..e993cb6e37
--- /dev/null
+++ b/recipes/shr/e-wm-theme-illume-gry_git.bb
@@ -0,0 +1,25 @@
+DESCRIPTION = "gry* illume theme - a fast, shiny illume theme"
+SECTION = "e/utils"
+HOMEPAGE = "http://jmccloud.jm.funpic.de"
+AUTHOR = "Jesus McCloud <bernd.pruenster@gmail.com"
+DEPENDS = "edje-native"
+RRECOMMENDS = "elementary-theme-gry"
+LICENCE = "unknown"
+
+PV = "0.3-${EFL_SRCREV}+gitr${SRCPV}"
+PR = "r1"
+
+SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master"
+
+S = "${WORKDIR}/git/e-wm/${PN}"
+
+do_compile() {
+	${STAGING_BINDIR_NATIVE}/edje_cc -id ${S}/. -fd ${S}/. ${S}/gry.edc -o ${S}/gry.edj
+}
+
+do_install() {
+        install -d ${D}${datadir}/enlightenment/data/themes/
+        install -m 0644 ${S}/gry.edj ${D}${datadir}/enlightenment/data/themes/
+}
+
+FILES_${PN} = "${datadir}/enlightenment/data/themes/"
diff --git a/recipes/shr/e-wm-theme-illume-neo_git.bb b/recipes/shr/e-wm-theme-illume-neo_git.bb
new file mode 100644
index 0000000000..10a5016758
--- /dev/null
+++ b/recipes/shr/e-wm-theme-illume-neo_git.bb
@@ -0,0 +1,32 @@
+DESCRIPTION = "nEo illume theme - a very fast, high contrast illume theme"
+SECTION = "e/utils"
+HOMEPAGE = "http://jmccloud.jm.funpic.de"
+AUTHOR = "Jesus McCloud <bernd.pruenster@gmail.com"
+DEPENDS = "edje-native"
+RDEPENDS = "e-wm"
+RRECOMMENDS = "elementary-theme-neo gtk-theme-neo libframeworkd-phonegui-efl-theme-neo etk-theme-neo gpe-theme-neo icon-theme-neo"
+LICENCE = "unknown"
+
+PV = "0.1-${EFL_SRCREV}+gitr${SRCPV}"
+PR = "r1"
+
+SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master"
+
+S = "${WORKDIR}/git/e-wm/${PN}"
+
+do_compile() {
+	${STAGING_BINDIR_NATIVE}/edje_cc -id ${S}/. -fd ${S}/. ${S}/neo.edc -o ${S}/neo.edj
+}
+
+do_install() {
+        install -d ${D}${datadir}/enlightenment/data/themes/
+        install -m 0644 ${S}/neo.edj ${D}${datadir}/enlightenment/data/themes/
+}
+
+FILES_${PN} = "${datadir}/enlightenment/data/themes/"
+
+pkg_postinst() {
+        echo "To activate this theme make sure to set your enlightenment rendering engine to SOFTWARE or enlightenment will segfault."
+        echo "This theme also ships with an enlightenment bootscreen which can be activated by selecting it under STARTUP in the LOOK tab of enlightenment settings"
+        echo "After activating this theme be sure to switch to SOFTWARE_16 engine in enlightenment advanced settings to unleash the theme's full power ;-)"
+}
diff --git a/recipes/shr/e-wm-theme-illume-niebiee_git.bb b/recipes/shr/e-wm-theme-illume-niebiee_git.bb
index bd3412d0ff..76aaf6d23b 100644
--- a/recipes/shr/e-wm-theme-illume-niebiee_git.bb
+++ b/recipes/shr/e-wm-theme-illume-niebiee_git.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Extremely blue Illume theme - Niebiee"
 SECTION = "e/utils"
 DEPENDS = "edje-native"
 LICENSE = "MIT BSD"
-PV = "0.1-${EFL_SRCREV}-gitr${SRCREV}"
+PV = "0.1-${EFL_SRCREV}+gitr${SRCPV}"
 PR = "r0"
 
 SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master"
diff --git a/recipes/shr/e-wm-theme-illume-shr_git.bb b/recipes/shr/e-wm-theme-illume-shr_git.bb
index 0c59feb876..af126dc92e 100644
--- a/recipes/shr/e-wm-theme-illume-shr_git.bb
+++ b/recipes/shr/e-wm-theme-illume-shr_git.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "illume SHR theme"
 SECTION = "e/utils"
 DEPENDS = "edje-native"
 LICENSE = "MIT BSD"
-PV = "1.1-${EFL_SRCREV}-gitr${SRCREV}"
+PV = "1.1-${EFL_SRCREV}+gitr${SRCPV}"
 PR = "r6"
 
 SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master"
diff --git a/recipes/shr/e-wm-theme-illume-sixteen_git.bb b/recipes/shr/e-wm-theme-illume-sixteen_git.bb
index 5c3d65825e..f164f0fc24 100644
--- a/recipes/shr/e-wm-theme-illume-sixteen_git.bb
+++ b/recipes/shr/e-wm-theme-illume-sixteen_git.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "illume SHR theme"
 SECTION = "e/utils"
 DEPENDS = "edje-native"
 LICENSE = "MIT BSD"
-PV = "0.1-${EFL_SRCREV}-gitr${SRCREV}"
+PV = "0.1-${EFL_SRCREV}+gitr${SRCPV}"
 PR = "r0"
 
 SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master"
diff --git a/recipes/shr/elementary-theme-gry_git.bb b/recipes/shr/elementary-theme-gry_git.bb
new file mode 100644
index 0000000000..2b1dfaab3c
--- /dev/null
+++ b/recipes/shr/elementary-theme-gry_git.bb
@@ -0,0 +1,26 @@
+DESCRIPTION = "gry* elementary theme - a fast, shiny elementary theme"
+SECTION = "e/utils"
+HOMEPAGE = "http://jmccloud.jm.funpic.de"
+AUTHOR = "Jesus McCloud <bernd.pruenster@gmail.com"
+DEPENDS = "edje-native"
+RRECOMMENDS = "e-wm-theme-illume-gry"
+LICENSE = "unknown"
+
+PV = "0.8-${EFL_SRCREV}+gitr${SRCPV}"
+PR = "r1"
+
+SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master \
+          "
+
+S = "${WORKDIR}/git/elementary/${PN}"
+
+do_compile() {
+	${STAGING_BINDIR_NATIVE}/edje_cc -id ${S}/. -fd ${S}/. ${S}/gry.edc -o ${S}/gry.edj
+}
+
+do_install() {
+        install -d ${D}${datadir}/elementary/themes/
+        install -m 0644 ${S}/gry.edj ${D}${datadir}/elementary/themes/
+}
+
+FILES_${PN} = "${datadir}/elementary/themes/"
diff --git a/recipes/shr/elementary-theme-neo_git.bb b/recipes/shr/elementary-theme-neo_git.bb
new file mode 100644
index 0000000000..4701c220c6
--- /dev/null
+++ b/recipes/shr/elementary-theme-neo_git.bb
@@ -0,0 +1,26 @@
+DESCRIPTION = "nEo elementary theme - a very fast, high contrast etk theme"
+SECTION = "e/utils"
+HOMEPAGE = "http://jmccloud.jm.funpic.de"
+AUTHOR = "Jesus McCloud <bernd.pruenster@gmail.com"
+DEPENDS = "edje-native"
+RRECOMMENDS = "e-wm-theme-illume-neo gtk-theme-neo libframeworkd-phonegui-efl-theme-neo etk-theme-neo gpe-theme-neo icon-theme-neo"
+LICENSE = "unknown"
+
+PV = "0.2.1-${EFL_SRCREV}+gitr${SRCPV}"
+PR = "r3"
+
+SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master \
+          "
+
+S = "${WORKDIR}/git/elementary/${PN}"
+
+do_compile() {
+	${STAGING_BINDIR_NATIVE}/edje_cc -id ${S}/. -fd ${S}/. ${S}/neo.edc -o ${S}/neo.edj
+}
+
+do_install() {
+        install -d ${D}${datadir}/elementary/themes/
+        install -m 0644 ${S}/neo.edj ${D}${datadir}/elementary/themes/
+}
+
+FILES_${PN} = "${datadir}/elementary/themes/"
diff --git a/recipes/shr/elementary-theme-niebiee_git.bb b/recipes/shr/elementary-theme-niebiee_git.bb
index f58257d48c..1736ad9a7a 100644
--- a/recipes/shr/elementary-theme-niebiee_git.bb
+++ b/recipes/shr/elementary-theme-niebiee_git.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Extremely blue elementary theme - Niebiee"
 SECTION = "e/utils"
 DEPENDS = "edje-native"
 LICENSE = "MIT BSD"
-PV = "0.1-${EFL_SRCREV}-gitr${SRCREV}"
+PV = "0.1-${EFL_SRCREV}+gitr${SRCPV}"
 PR = "r0"
 
 SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master"
diff --git a/recipes/shr/elementary-theme-sixteen_git.bb b/recipes/shr/elementary-theme-sixteen_git.bb
index 48cbc615fa..4eb43af767 100644
--- a/recipes/shr/elementary-theme-sixteen_git.bb
+++ b/recipes/shr/elementary-theme-sixteen_git.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "elementary SHR theme"
 SECTION = "e/utils"
 DEPENDS = "edje-native"
 LICENSE = "MIT BSD"
-PV = "0.1-${EFL_SRCREV}-gitr${SRCREV}"
+PV = "0.1-${EFL_SRCREV}+gitr${SRCPV}"
 PR = "r2"
 
 SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master"
diff --git a/recipes/shr/etk-theme-neo_git.bb b/recipes/shr/etk-theme-neo_git.bb
new file mode 100644
index 0000000000..2c68bd29da
--- /dev/null
+++ b/recipes/shr/etk-theme-neo_git.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "nEo etk theme - a very fast, high contrast etk theme"
+HOMEPAGE = "http://jmccloud.jm.funpic.de"
+AUTHOR = "Jesus McCloud <bernd.pruenster@gmail.com"
+RRECOMMENDS = "elementary-theme-neo e-wm-theme-illume-neo gtk-theme-neo libframeworkd-phonegui-efl-theme-neo gpe-theme-neo icon-theme-neo"
+LICENSE = "unknown"
+
+PV = "0.2-${EFL_SRCREV}+gitr${SRCPV}"
+PR = "r2"
+
+SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master"
+
+require etk-theme.inc
diff --git a/recipes/shr/etk-theme-shr_git.bb b/recipes/shr/etk-theme-shr_git.bb
index d146765c94..3a324e9728 100644
--- a/recipes/shr/etk-theme-shr_git.bb
+++ b/recipes/shr/etk-theme-shr_git.bb
@@ -1,22 +1,8 @@
 DESCRIPTION = "etk SHR theme"
-SECTION = "e/utils"
-DEPENDS = "edje-native"
 LICENSE = "MIT BSD"
-PV = "1.1-${EFL_SRCREV}-gitr${SRCREV}"
+PV = "1.1.1-${EFL_SRCREV}+gitr${SRCPV}"
+PR = "r2"
 
 SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master"
 
-S = "${WORKDIR}/git/etk/${PN}"
-
-do_compile() {
-	${STAGING_BINDIR_NATIVE}/edje_cc -id ${S}/. -fd ${S}/. ${S}/default.edc -o ${S}/default.edj
-}
-
-do_install() {
-        install -d ${D}${datadir}/etk/themes/
-        install -m 0644 ${S}/default.edj ${D}${datadir}/etk/themes/
-}
-
-FILES_${PN} = "${datadir}/etk/themes/default.edj"
-
-
+require etk-theme.inc
diff --git a/recipes/shr/etk-theme.inc b/recipes/shr/etk-theme.inc
new file mode 100644
index 0000000000..6e8b33db27
--- /dev/null
+++ b/recipes/shr/etk-theme.inc
@@ -0,0 +1,34 @@
+SECTION = "e/utils"
+DEPENDS = "edje-native"
+RDEPENDS = "etk"
+
+S = "${WORKDIR}/git/etk/${PN}/"
+
+do_compile() {
+        ${STAGING_BINDIR_NATIVE}/edje_cc -id ${S}/. -fd ${S}/. ${S}/default.edc -o ${S}/default.edj
+}
+
+do_install() {
+        install -d ${D}${datadir}/etk/themes.${PN}/
+        install -m 0644 ${S}/default.edj ${D}${datadir}/etk/themes.${PN}/
+}
+
+FILES_${PN} = "${datadir}/etk/themes.${PN}"
+
+inherit update-alternatives
+
+ALTERNATIVE_NAME = "etk-theme"
+ALTERNATIVE_LINK = "${datadir}/etk/themes"
+ALTERNATIVE_PATH = "${datadir}/etk/themes.${PN}"
+ALTERNATIVE_PRIORITY ?= 1
+
+pkg_postinst() {
+        if [[ -e ${ALTERNATIVE_LINK} && ! -h ${ALTERNATIVE_LINK} ]] ; then
+                echo "warn: ${ALTERNATIVE_LINK} exists and it's not a link!"
+                echo "warn: It will be replaced with link managed by update-alternatives"
+                echo "warn: Moving ${ALTERNATIVE_LINK} to ${ALTERNATIVE_LINK}.old."
+                echo "warn: It should be empty but probably isn't!"
+                echo "warn: Check what's left there and remove it manually."
+                mv -f ${ALTERNATIVE_LINK} ${ALTERNATIVE_LINK}.old
+        fi
+}
diff --git a/recipes/shr/frameworkd-config-shr_git.bb b/recipes/shr/frameworkd-config-shr_git.bb
index 0727091f0b..c1d15b18c3 100644
--- a/recipes/shr/frameworkd-config-shr_git.bb
+++ b/recipes/shr/frameworkd-config-shr_git.bb
@@ -4,8 +4,8 @@ AUTHOR = "Michael 'Mickey' Lauer <mlauer@vanille-media.de> et. al."
 SECTION = "console/network"
 DEPENDS = "python-cython-native python-pyrex-native"
 LICENSE = "GPL"
-SRCREV_FORMAT = "gitrFSO_REV-SHR_REV"
-PV = "0.9.5.9+${SRCREV}"
+SRCREV_FORMAT = "FSO_REV-SHR_REV"
+PV = "0.9.5.9+gitr${SRCPV}"
 PR = "r7"
 
 SRC_URI = "${FREESMARTPHONE_GIT}/framework.git;protocol=git;branch=master;name=FSO_REV \
diff --git a/recipes/shr/gtk-theme-neo_git.bb b/recipes/shr/gtk-theme-neo_git.bb
new file mode 100644
index 0000000000..66caabf1cc
--- /dev/null
+++ b/recipes/shr/gtk-theme-neo_git.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = "nEo GTK theme - a very fast, high contrast GTK theme"
+HOMEPAGE = "http://jmccloud.jm.funpic.de"
+AUTHOR = "Jesus McCloud <bernd.pruenster@gmail.com"
+RDEPENDS += "icon-theme-neo"
+RRECOMMENDS = "elementary-theme-neo e-wm-theme-illume-neo libframeworkd-phonegui-efl-theme-neo etk-theme-neo gpe-theme-neo icon-theme-neo"
+LICENSE = "unknown"
+
+PV = "0.2-${EFL_SRCREV}+gitr${SRCPV}"
+PR = "r3"
+
+SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master"
+
+S = "${WORKDIR}/git/gtk/${PN}/"
+
+require gtk-theme.inc
diff --git a/recipes/shr/gtk-theme.inc b/recipes/shr/gtk-theme.inc
new file mode 100644
index 0000000000..449d0e0b28
--- /dev/null
+++ b/recipes/shr/gtk-theme.inc
@@ -0,0 +1,33 @@
+RPROVIDES_${PN} += "virtual/theme-gtk"
+RDEPENDS = "gtk+"
+SECTION = "gtk"
+
+inherit update-alternatives
+
+SRC_URI += "file://gtk-theme/gtkrc.${PN}"
+
+do_install() {
+	install -d "${D}${datadir}/themes/${PN}/gtk-2.0"
+	cp -r "${S}/./" "${D}${datadir}/themes/${PN}/gtk-2.0"
+        install -d ${D}${sysconfdir}/gtk-2.0/
+        install -m 0644 ${WORKDIR}/gtk-theme/gtkrc.${PN} ${D}${sysconfdir}/gtk-2.0/gtkrc.${PN}
+}
+
+FILES_${PN} = "${datadir}/themes/${PN}/ \
+               ${sysconfdir}/gtk-2.0/gtkrc.${PN} \
+              "
+
+ALTERNATIVE_NAME = "gtk-theme"
+ALTERNATIVE_LINK = "${sysconfdir}/gtk-2.0/gtkrc"
+ALTERNATIVE_PATH = "${sysconfdir}/gtk-2.0/gtkrc.${PN}"
+
+pkg_postinst() {
+        if [[ -e ${ALTERNATIVE_LINK} && ! -h ${ALTERNATIVE_LINK} ]] ; then
+                echo "warn: ${ALTERNATIVE_LINK} exists and it's not a link!"
+                echo "warn: It will be replaced with link managed by update-alternatives"
+                echo "warn: Moving ${ALTERNATIVE_LINK} to ${ALTERNATIVE_LINK}.old."
+                echo "warn: It should be empty but probably isn't!"
+                echo "warn: Check what's left there and remove it manually."
+                mv -f ${ALTERNATIVE_LINK} ${ALTERNATIVE_LINK}.old
+        fi
+}
diff --git a/recipes/shr/gtk-theme/gtkrc.gtk-theme-neo b/recipes/shr/gtk-theme/gtkrc.gtk-theme-neo
new file mode 100644
index 0000000000..c27c4c44a2
--- /dev/null
+++ b/recipes/shr/gtk-theme/gtkrc.gtk-theme-neo
@@ -0,0 +1,3 @@
+gtk-font-name = "Sans 5"
+gtk-theme-name = "gtk-theme-neo"
+gtk-icon-theme-name = "nEo"
diff --git a/recipes/shr/gtk-theme/gtkrc.shr-theme-gtk-e17lookalike b/recipes/shr/gtk-theme/gtkrc.shr-theme-gtk-e17lookalike
new file mode 100644
index 0000000000..c63cd733fb
--- /dev/null
+++ b/recipes/shr/gtk-theme/gtkrc.shr-theme-gtk-e17lookalike
@@ -0,0 +1,3 @@
+gtk-font-name = "Sans 5"
+gtk-theme-name = "shr-theme-gtk-e17lookalike"
+gtk-icon-theme-name = "openmoko-standard"
diff --git a/recipes/shr/icon-theme-neo_git.bb b/recipes/shr/icon-theme-neo_git.bb
new file mode 100644
index 0000000000..438ac238c9
--- /dev/null
+++ b/recipes/shr/icon-theme-neo_git.bb
@@ -0,0 +1,27 @@
+DESCRIPTION = "nEo icon theme - a high contrast icon theme which looks especially well when using all the other nEo themes"
+SECTION = "e/utils"
+HOMEPAGE = "http://jmccloud.jm.funpic.de"
+AUTHOR = "Jesus McCloud <bernd.pruenster@gmail.com"
+RDEPENDS = "e-wm"
+RRECOMMENDS = "elementary-theme-neo e-wm-theme-illume-neo gtk-theme-neo libframeworkd-phonegui-efl-theme-neo etk-theme-neo gpe-theme-neo"
+LICENSE = "unknown"
+
+PV = "0.2-${EFL_SRCREV}+gitr${SRCPV}"
+PR = "r1"
+
+SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master"
+
+S = "${WORKDIR}/git/icons/icon-theme-neo"
+
+do_install() {
+        install -d ${D}${datadir}/icons/
+        install -d ${D}${datadir}/icons/nEo/
+        cp -r ${S}/* "${D}${datadir}/icons/nEo/"
+}
+
+FILES_${PN} = "${datadir}/icons/nEo/"
+
+pkg_postinst() {
+        echo "To activate this theme select it under ICON THEME in the LOOK tab of enlightenment settings"
+        echo "Restart enlightenment for the changes to take affect"
+}
diff --git a/recipes/shr/initscripts-shr_git.bb b/recipes/shr/initscripts-shr_0.0.1.bb
index 46ea6529ba..23fa05fd74 100644
--- a/recipes/shr/initscripts-shr_git.bb
+++ b/recipes/shr/initscripts-shr_0.0.1.bb
@@ -4,7 +4,7 @@ PRIORITY = "required"
 DEPENDS = ""
 RDEPENDS = ""
 LICENSE = "GPL"
-PV = "0.0.1+${PR}-gitr${SRCREV}"
+PV = "0.0.1"
 PR = "r11"
 
 RPROVIDES_${PN} = "initscripts"
diff --git a/recipes/shr/libframeworkd-phonegui-efl-theme-neo_git.bb b/recipes/shr/libframeworkd-phonegui-efl-theme-neo_git.bb
new file mode 100644
index 0000000000..7f7f6b4fe1
--- /dev/null
+++ b/recipes/shr/libframeworkd-phonegui-efl-theme-neo_git.bb
@@ -0,0 +1,26 @@
+DESCRIPTION = "nEo libframeworkd-phonegui-efl - a very fast, high contrast etk theme"
+HOMEPAGE = "http://jmccloud.jm.funpic.de"
+AUTHOR = "Jesus McCloud <bernd.pruenster@gmail.com"
+RDEPENDS = "libframeworkd-phonegui-efl"
+RRECOMMENDS = "elementary-theme-neo e-wm-theme-illume-neo gtk-theme-neo etk-theme-neo gpe-theme-neo icon-theme-neo"
+LICENSE = "unknown"
+
+PV = "0.2-${EFL_SRCREV}+gitr${SRCPV}"
+PR = "r2"
+
+require libframeworkd-phonegui-efl-theme.inc
+
+SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master"
+
+S = "${WORKDIR}/git/libframeworkd-phonegui-efl/theme-neo"
+
+do_compile() {
+        for edc in call contacts dialer dialog elm-resizing-label incoming-message keypad messages sim-auth ussd ; do
+                ${STAGING_BINDIR_NATIVE}/edje_cc -id ${S}/${edc}/. -fd ${S}/${edc}. ${S}/${edc}/${edc}.edc -o ${S}/${edc}.edj
+        done
+}
+
+do_install() {
+        install -d ${D}${datadir}/libframeworkd-phonegui-efl.${PN}/
+        install -m 0644 ${S}/*.edj ${D}${datadir}/libframeworkd-phonegui-efl.${PN}/
+}
diff --git a/recipes/shr/libframeworkd-phonegui-efl-theme.inc b/recipes/shr/libframeworkd-phonegui-efl-theme.inc
new file mode 100644
index 0000000000..eab118f322
--- /dev/null
+++ b/recipes/shr/libframeworkd-phonegui-efl-theme.inc
@@ -0,0 +1,22 @@
+SECTION = "e/utils"
+DEPENDS += "edje-native"
+
+FILES_${PN} += "${datadir}/libframeworkd-phonegui-efl.${PN}"
+
+inherit update-alternatives
+
+ALTERNATIVE_NAME = "libframeworkd-phonegui-efl-theme"
+ALTERNATIVE_LINK = "${datadir}/libframeworkd-phonegui-efl"
+ALTERNATIVE_PATH = "${datadir}/libframeworkd-phonegui-efl.${PN}"
+ALTERNATIVE_PRIORITY ?= 1
+
+pkg_postinst() {
+        if [[ -e ${ALTERNATIVE_LINK} && ! -h ${ALTERNATIVE_LINK} ]] ; then
+                echo "warn: ${ALTERNATIVE_LINK} exists and it's not a link!"
+                echo "warn: It will be replaced with link managed by update-alternatives"
+                echo "warn: Moving ${ALTERNATIVE_LINK} to ${ALTERNATIVE_LINK}.old."
+                echo "warn: It should be empty but probably isn't!"
+                echo "warn: Check what's left there and remove it manually."
+                mv -f ${ALTERNATIVE_LINK} ${ALTERNATIVE_LINK}.old
+        fi
+}
diff --git a/recipes/shr/libframeworkd-phonegui-efl2_git.bb b/recipes/shr/libframeworkd-phonegui-efl2_git.bb
index 207658f807..cb1feade68 100644
--- a/recipes/shr/libframeworkd-phonegui-efl2_git.bb
+++ b/recipes/shr/libframeworkd-phonegui-efl2_git.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "frameworkd EFL phonegui 2"
 SECTION = "e/apps"
 DEPENDS += " dbus-glib libframeworkd-glib libframeworkd-phonegui etk evas ecore edje edje-native elementary"
-PV = "0.0.1+gitr${SRCREV}"
+PV = "0.0.1+gitr${SRCPV}"
 PR = "r1"
 
 SRC_URI = "git://shr.bearstech.com/repo/libframeworkd-phonegui-efl2.git;protocol=http;branch=master"
diff --git a/recipes/shr/libframeworkd-phonegui-efl_git.bb b/recipes/shr/libframeworkd-phonegui-efl_git.bb
index f8adabf415..c4181cf345 100644
--- a/recipes/shr/libframeworkd-phonegui-efl_git.bb
+++ b/recipes/shr/libframeworkd-phonegui-efl_git.bb
@@ -3,8 +3,10 @@ HOMEPAGE = "http://shr-project.org/"
 LICENSE = "GPL"
 SECTION = "e/apps"
 DEPENDS += " dbus-glib libframeworkd-glib libframeworkd-phonegui etk evas ecore edje edje-native elementary"
-PV = "0.0.2+gitr${SRCREV}"
-PR = "r33"
+PV = "0.0.3+gitr${SRCPV}"
+PR = "r35"
+
+require libframeworkd-phonegui-efl-theme.inc
 
 inherit pkgconfig autotools autotools_stage
 
@@ -14,6 +16,7 @@ S = "${WORKDIR}/git/${PN}"
 EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc"
 
 do_configure_prepend() {
+        sed -i "s|^filesdir = \$(datadir)/libframeworkd-phonegui-efl/|filesdir = \$(datadir)/libframeworkd-phonegui-efl.${PN}|g" data/Makefile.am
         autopoint --force
 }
 
diff --git a/recipes/shr/libframeworkd-phonegui_git.bb b/recipes/shr/libframeworkd-phonegui_git.bb
index 50b546512a..aa1f107555 100644
--- a/recipes/shr/libframeworkd-phonegui_git.bb
+++ b/recipes/shr/libframeworkd-phonegui_git.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Frameworkd phonegui library"
 HOMEPAGE = "http://shr-project.org/"
 LICENSE = "GPL"
 SECTION = "libs"
-PV = "0.0.2+gitr${SRCREV}"
+PV = "0.0.2+gitr${SRCPV}"
 PR = "r10"
 
 DEPENDS="glib-2.0 dbus-glib libframeworkd-glib libphone-utils"
diff --git a/recipes/shr/libmodulo_git.bb b/recipes/shr/libmodulo_git.bb
new file mode 100644
index 0000000000..dcf204c807
--- /dev/null
+++ b/recipes/shr/libmodulo_git.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "Modulo is a lightweight component container that supports Inversion Of Control, also commonly called Dependency Injection"
+SECTION = "libs"
+PV = "0.0.1+gitr${SRCPV}"
+PR = "r1"
+
+inherit autotools autotools_stage pkgconfig vala girepository
+
+DEPENDS = "glib-2.0 dbus-glib libxml2 libgee"
+
+SRC_URI = "git://git.shr-project.org/repo/libmodulo.git;protocol=http;branch=master"
+S = "${WORKDIR}/git"
+
+LEAD_SONAME = "libmodulo.so.0"
diff --git a/recipes/shr/libphone-ui-shr_git.bb b/recipes/shr/libphone-ui-shr_git.bb
new file mode 100644
index 0000000000..240c7f2046
--- /dev/null
+++ b/recipes/shr/libphone-ui-shr_git.bb
@@ -0,0 +1,20 @@
+DESCRIPTION = "SHR default module for the Phone UI daemon"
+SECTION = "e/apps"
+DEPENDS += " dbus-glib libframeworkd-glib libphone-ui etk evas ecore edje edje-native elementary"
+PV = "0.0.0+gitr${SRCPV}"
+PR = "r2"
+
+SRC_URI = "git://shr.bearstech.com/repo/libphone-ui-shr.git;protocol=http;branch=master"
+S = "${WORKDIR}/git"
+
+inherit pkgconfig autotools autotools_stage
+
+EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc"
+
+
+do_configure_prepend() {
+        autopoint --force
+}
+
+FILES_${PN} += "${libdir}/phoneui/modules/*"
+FILES_${PN}-dbg += "${libdir}/phoneui/modules/.debug"
\ No newline at end of file
diff --git a/recipes/shr/libphone-ui_git.bb b/recipes/shr/libphone-ui_git.bb
new file mode 100644
index 0000000000..84b04c5a60
--- /dev/null
+++ b/recipes/shr/libphone-ui_git.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = "A generic framework for phone ui"
+HOMEPAGE = "http://shr-project.org/"
+LICENSE = "GPL"
+SECTION = "libs"
+PV = "0.0.0+gitr${SRCPV}"
+PR = "r0"
+
+DEPENDS="glib-2.0 dbus-glib libframeworkd-glib libphone-utils alsa-lib"
+
+inherit pkgconfig autotools autotools_stage
+
+SRC_URI = "git://git.shr-project.org/repo/libphone-ui.git;protocol=http;branch=master"
+S="${WORKDIR}/git"
+
+CONFFILES_${PN} = "${sysconfdir}/libphoneui.conf"
diff --git a/recipes/shr/libphone-utils_git.bb b/recipes/shr/libphone-utils_git.bb
index 7cf26ffec1..e0a2e2c110 100644
--- a/recipes/shr/libphone-utils_git.bb
+++ b/recipes/shr/libphone-utils_git.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "phone-utils library"
 SECTION = "libs"
-PV = "0.0.2+gitr${SRCREV}"
+PV = "0.0.2+gitr${SRCPV}"
 PR = "r2"
 
 DEPENDS="glib-2.0"
diff --git a/recipes/shr/ologicd_git.bb b/recipes/shr/ologicd_git.bb
new file mode 100644
index 0000000000..105199a582
--- /dev/null
+++ b/recipes/shr/ologicd_git.bb
@@ -0,0 +1,9 @@
+DESCRIPTION = ""
+SECTION = "libs"
+PV = "0.0.1+gitr${SRCPV}"
+PR = "r0"
+
+inherit autotools
+
+SRC_URI = "git://shr.bearstech.com/repo/${PN}.git;protocol=http;branch=master"
+S = "${WORKDIR}/git"
diff --git a/recipes/shr/phonefsod_git.bb b/recipes/shr/phonefsod_git.bb
new file mode 100644
index 0000000000..bc443a11a5
--- /dev/null
+++ b/recipes/shr/phonefsod_git.bb
@@ -0,0 +1,31 @@
+DESCRIPTION = "SHR Phone FSO Daemon"
+HOMEPAGE = "http://shr-project.org/"
+LICENSE = "GPL"
+SECTION = "x11/applications"
+DEPENDS += " dbus-glib libframeworkd-glib sqlite3 shr-specs"
+PV = "0.0.0+gitr${SRCPV}"
+PR = "r2"
+
+SRC_URI = "git://git.shr-project.org/repo/phonefsod.git;protocol=http;branch=master"
+S = "${WORKDIR}/git"
+
+inherit autotools update-rc.d
+
+INITSCRIPT_NAME = "phonefsod"
+INITSCRIPT_PARAMS = "defaults 75"
+
+EXTRA_OECONF = "\
+	SPECS_PATH=${STAGING_DATADIR}/shr-specs \
+"
+
+
+do_install_append() {
+	install -d ${D}${sysconfdir}/init.d/
+        install -d ${D}${sysconfdir}/dbus-1/system.d/
+	install -m 0755 ${S}/data/phonefsod.init ${D}${sysconfdir}/init.d/phonefsod
+        install -m 0644 ${S}/data/phonefsod.conf ${D}${sysconfdir}/dbus-1/system.d/
+	install -m 0644 ${S}/data/etc-phonefsod.conf ${D}${sysconfdir}/phonefsod.conf
+}
+
+FILES_${PN} += "${datadir} ${sysconfdir}"
+
diff --git a/recipes/shr/phoneui-apps_git.bb b/recipes/shr/phoneui-apps_git.bb
new file mode 100644
index 0000000000..a1916df4a0
--- /dev/null
+++ b/recipes/shr/phoneui-apps_git.bb
@@ -0,0 +1,28 @@
+DESCRIPTION = "The PhoneUI app starters"
+HOMEPAGE = "http://shr-project.org/"
+LICENSE = "GPL"
+SECTION = "x11/applications"
+DEPENDS += "dbus-glib"
+PV = "0.0.0+gitr${SRCPV}"
+PR = "r0"
+
+inherit pkgconfig autotools
+
+SRC_URI = "git://git.shr-project.org/repo/phoneui-apps.git;protocol=http;branch=master"
+S = "${WORKDIR}/git"
+
+PACKAGES = "${PN}-dialer ${PN}-messages ${PN}-contacts"
+
+FILES_${PN}-dialer = "\
+	/usr/bin/phoneui-dialer \
+	/usr/share/applications/phoneui-dialer.desktop \
+"
+FILES_${PN}-messages = "\
+	/usr/bin/phoneui-messages \
+	/usr/share/applications/phoneui-messages.desktop \
+"
+FILES_${PN}-contacts = "\
+	/usr/bin/phoneui-contacts \
+	/usr/share/applications/phoneui-contacts.desktop \
+"
+
diff --git a/recipes/shr/phoneuid_git.bb b/recipes/shr/phoneuid_git.bb
new file mode 100644
index 0000000000..f86646275c
--- /dev/null
+++ b/recipes/shr/phoneuid_git.bb
@@ -0,0 +1,30 @@
+DESCRIPTION = "SHR Phone UI Daemon"
+HOMEPAGE = "http://shr-project.org/"
+LICENSE = "GPL"
+SECTION = "x11/applications"
+DEPENDS += " dbus-glib libframeworkd-glib libphone-ui sqlite3 shr-specs"
+PV = "0.0.0+gitr${SRCPV}"
+PR = "r2"
+
+SRC_URI = "git://git.shr-project.org/repo/phoneuid.git;protocol=http;branch=master"
+S = "${WORKDIR}/git"
+
+inherit autotools
+
+EXTRA_OECONF = "\
+       SPECS_PATH=${STAGING_DATADIR}/shr-specs \
+"
+
+
+do_install_append() {
+        install -d ${D}${sysconfdir}/dbus-1/system.d/
+	install -d ${D}${datadir}/dbus-1/system-services/
+	install -d ${D}${sysconfdir}/X11/Xsession.d/
+        install -m 0644 ${S}/data/phoneuid.conf ${D}${sysconfdir}/dbus-1/system.d/
+	install -m 0644 ${S}/data/phoneuid-*.service ${D}${datadir}/dbus-1/system-services/
+	install -m 0755 ${S}/data/80phoneuid ${D}${sysconfdir}/X11/Xsession.d/
+	install -m 0755 ${S}/data/phoneui-wrapper.sh ${D}${bindir}/phoneui-wrapper.sh
+}
+
+FILES_${PN} += "${datadir} ${sysconfdir}"
+
diff --git a/recipes/shr/shr-config_git.bb b/recipes/shr/shr-config_git.bb
new file mode 100644
index 0000000000..cc8d685a27
--- /dev/null
+++ b/recipes/shr/shr-config_git.bb
@@ -0,0 +1,14 @@
+DESCRIPTION = "Central settings app for FSO/SHR distros"
+HOMEPAGE = "http://git.freesmartphone.org"
+AUTHOR = "Sebastian Spaeth (see AUTHORS)"
+LICENSE  = "GPLv2"
+DEPENDS = "vala-native elementary libeflvala"
+SECTION = "x11/application"
+PV = "0.0.2+gitr${SRCPV}"
+PR = "r4"
+
+EXTRA_OECONF="--enable-vapidir=${STAGING_DATADIR}/vala/vapi"
+inherit autotools
+
+SRC_URI = "git://github.com/spaetz/shr-config.git;protocol=git;branch=master"
+S = "${WORKDIR}/git"
diff --git a/recipes/shr/shr-contacts_git.bb b/recipes/shr/shr-contacts_git.bb
index 1b9a383130..6cfb87f43b 100644
--- a/recipes/shr/shr-contacts_git.bb
+++ b/recipes/shr/shr-contacts_git.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://shr-project.org/"
 LICENSE = "GPL"
 SECTION = "x11/applications"
 DEPENDS += "dbus-glib libframeworkd-glib libframeworkd-phonegui"
-PV = "0.0.2+gitr${SRCREV}"
+PV = "0.0.2+gitr${SRCPV}"
 PR = "r6"
 
 inherit pkgconfig autotools
diff --git a/recipes/shr/shr-dialer_git.bb b/recipes/shr/shr-dialer_git.bb
index 796b96592b..f4813141e4 100644
--- a/recipes/shr/shr-dialer_git.bb
+++ b/recipes/shr/shr-dialer_git.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://shr-project.org/"
 LICENSE = "GPL"
 SECTION = "x11/applications"
 DEPENDS += "dbus-glib libframeworkd-glib libframeworkd-phonegui"
-PV = "0.0.2+gitr${SRCREV}"
+PV = "0.0.2+gitr${SRCPV}"
 PR = "r9"
 
 inherit pkgconfig autotools
diff --git a/recipes/shr/shr-installer_git.bb b/recipes/shr/shr-installer_git.bb
index 1206d635d5..331c0f1e6a 100644
--- a/recipes/shr/shr-installer_git.bb
+++ b/recipes/shr/shr-installer_git.bb
@@ -5,7 +5,7 @@ LICENSE ?= "GPL"
 RDEPENDS = "python-elementary python-dbus python-core python-edbus packagekit"
 SECTION = "x11/application"
 
-PV = "0.0.1-gitr${SRCREV}"
+PV = "0.0.1+gitr${SRCPV}"
 PR = "r0"
 
 inherit setuptools
diff --git a/recipes/shr/shr-launcher_svn.bb b/recipes/shr/shr-launcher_svn.bb
new file mode 100644
index 0000000000..ffd6161586
--- /dev/null
+++ b/recipes/shr/shr-launcher_svn.bb
@@ -0,0 +1,21 @@
+DESCRIPTION = "shr-launcher is a home app/launcher for openmoko phones"
+HOMEPAGE = "http://code.google.com/p/shr-launcher/"
+AUTHOR = "cchandel"
+LICENSE = "GPLv2"
+SECTION = "e/apps"
+DEPENDS = "elementary eina edbus"
+
+PV = "0.0.1+svnr${SRCPV}"
+PR = "r0"
+
+SRC_URI = "svn://shr-launcher.googlecode.com/svn/trunk;module=.;proto=http"
+
+do_configure_prepend() {
+  rm -f ${S}/config.log
+  rm -f ${S}/config.status
+}
+
+S = "${WORKDIR}"
+
+inherit autotools
+
diff --git a/recipes/shr/shr-messages_git.bb b/recipes/shr/shr-messages_git.bb
index 6fc0694c29..b821545fac 100644
--- a/recipes/shr/shr-messages_git.bb
+++ b/recipes/shr/shr-messages_git.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://shr-project.org/"
 LICENSE = "GPL"
 SECTION = "x11/applications"
 DEPENDS += "dbus-glib libframeworkd-glib libframeworkd-phonegui"
-PV = "0.0.2+gitr${SRCREV}"
+PV = "0.0.2+gitr${SRCPV}"
 PR = "r8"
 
 inherit pkgconfig autotools
diff --git a/recipes/shr/shr-settings_git.bb b/recipes/shr/shr-settings_git.bb
new file mode 100644
index 0000000000..747f6d7df5
--- /dev/null
+++ b/recipes/shr/shr-settings_git.bb
@@ -0,0 +1,32 @@
+DESCRIPTION = "Modular settings application for SHR based on python-elementary"
+HOMEPAGE = "http://shr-project.org"
+SHR_RELEASE ?= "shr"
+LICENSE ?= "GPL"
+RDEPENDS = "python-elementary python-dbus python-codecs python-shell python-pyrtc python python-core python-edbus dbus-x11 frameworkd python-phoneutils"
+SECTION = "x11/application"
+PE = "1"
+PV = "0.1.1+gitr${SRCPV}"
+PR = "r7"
+
+inherit setuptools
+
+PACKAGES =+ "\
+  ${PN}-addons-illume \
+  ${PN}-backup-configuration \
+"
+
+RRECOMMENDS_${PN} = "\
+  ${PN}-addons-illume \
+  ${PN}-backup-configuration \
+"
+
+PACKAGE_ARCH_${PN}-addons-illume = "all"
+PACKAGE_ARCH_${PN}-backup-configuration = "all"
+
+SRC_URI = "git://git.shr-project.org/repo/shr-settings.git;protocol=http;branch=master"
+S = "${WORKDIR}/git"
+FILES_${PN} += "${prefix}/share/pixmaps"
+FILES_${PN} += "${prefix}/share/applications"
+FILES_${PN}-addons-illume = "${prefix}/share/applications/shr-settings-addons-illume"
+FILES_${PN}-backup-configuration = "${sysconfdir}/shr-settings/"
+CONFFILES_${PN}-backup-configuration = "${sysconfdir}/shr-settings/*"
diff --git a/recipes/shr/shr-specs_git.bb b/recipes/shr/shr-specs_git.bb
new file mode 100644
index 0000000000..bc29ee5e27
--- /dev/null
+++ b/recipes/shr/shr-specs_git.bb
@@ -0,0 +1,22 @@
+DESCRIPTION = "The SHR DBus API Specification"
+HOMEPAGE = "http://shr-project.org/"
+LICENSE = "BSD"
+SECTION = "devel/specifications"
+PV = "0.0.0+gitr${SRCPV}"
+PR = "r0"
+
+SRC_URI = "git://git.shr-project.org/repo/shr-specs.git;protocol=http;branch=master"
+S = "${WORKDIR}/git"
+
+do_compile() {
+	make xml
+}
+
+do_stage() {
+	install -d "${STAGING_DATADIR}/shr-specs"
+	install -m 0644 xml/* "${STAGING_DATADIR}/shr-specs"
+}
+
+FILE_${PN}-dev += "${datadir}/shr-specs"
+
+
diff --git a/recipes/shr/shr-splash-theme-dontpanic_git.bb b/recipes/shr/shr-splash-theme-dontpanic_git.bb
index 4bf41fbd29..f80df61f67 100644
--- a/recipes/shr/shr-splash-theme-dontpanic_git.bb
+++ b/recipes/shr/shr-splash-theme-dontpanic_git.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "SHR splash screen - DON'T PANIC theme"
 SECTION = "x11/data"
 LICENSE = "MIT BSD"
-PV = "1.2-gitr${SRCREV}"
+PV = "1.2+gitr${SRCPV}"
 PR = "r6"
 
 SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master"
diff --git a/recipes/shr/shr-splash-theme-handy_git.bb b/recipes/shr/shr-splash-theme-handy_git.bb
index 773d4f16db..3890a7f383 100644
--- a/recipes/shr/shr-splash-theme-handy_git.bb
+++ b/recipes/shr/shr-splash-theme-handy_git.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "SHR splash screen - handy theme"
 SECTION = "x11/data"
 LICENSE = "MIT BSD"
-PV = "1.2-gitr${SRCREV}"
+PV = "1.2+gitr${SRCPV}"
 PR = "r3"
 
 SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master"
diff --git a/recipes/shr/shr-splash-theme-logo_git.bb b/recipes/shr/shr-splash-theme-logo_git.bb
new file mode 100644
index 0000000000..09ea014e79
--- /dev/null
+++ b/recipes/shr/shr-splash-theme-logo_git.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "SHR splash screen - SHR logo theme"
+SECTION = "x11/data"
+LICENSE = "MIT BSD"
+PV = "0.1+gitr${SRCPV}"
+PR = "r0"
+
+SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master"
+S = "${WORKDIR}/git/shr-splash/${PN}"
+
+ALTERNATIVE_PRIORITY = 3
+
+require shr-splash-theme.inc
+
diff --git a/recipes/shr/shr-splash-theme-niebiee_git.bb b/recipes/shr/shr-splash-theme-niebiee_git.bb
index 40a0973f2b..e16cfa3fb4 100644
--- a/recipes/shr/shr-splash-theme-niebiee_git.bb
+++ b/recipes/shr/shr-splash-theme-niebiee_git.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "SHR splash screen - extremely blue Niebiee theme"
 SECTION = "x11/data"
 LICENSE = "MIT BSD"
-PV = "1.2-gitr${SRCREV}"
+PV = "1.2+gitr${SRCPV}"
 PR = "r0"
 
 SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master"
diff --git a/recipes/shr/shr-splash-theme-simple_git.bb b/recipes/shr/shr-splash-theme-simple_git.bb
index 865e18fce7..97ef436e6c 100644
--- a/recipes/shr/shr-splash-theme-simple_git.bb
+++ b/recipes/shr/shr-splash-theme-simple_git.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "SHR splash screen - simple SHR theme"
 SECTION = "x11/data"
 LICENSE = "MIT BSD"
-PV = "1.2-gitr${SRCREV}"
+PV = "1.2+gitr${SRCPV}"
 PR = "r6"
 
 SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master"
diff --git a/recipes/shr/shr-splash-theme-tux_git.bb b/recipes/shr/shr-splash-theme-tux_git.bb
new file mode 100644
index 0000000000..743dacd2b4
--- /dev/null
+++ b/recipes/shr/shr-splash-theme-tux_git.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "SHR splash screen - SHR Tux theme"
+SECTION = "x11/data"
+LICENSE = "MIT BSD"
+PV = "0.1+gitr${SRCPV}"
+PR = "r0"
+
+SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master"
+S = "${WORKDIR}/git/shr-splash/${PN}"
+
+require shr-splash-theme.inc
+
diff --git a/recipes/shr/shr-splash_git.bb b/recipes/shr/shr-splash_git.bb
index 1ce7373e82..9bf4ca12df 100644
--- a/recipes/shr/shr-splash_git.bb
+++ b/recipes/shr/shr-splash_git.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "SHR splash screen"
 SECTION = "x11/data"
 LICENSE = "MIT BSD"
-PV = "1.2-gitr${SRCREV}"
+PV = "1.2+gitr${SRCPV}"
 PR = "r4"
 RRECOMMENDS_${PN} += "\
 	virtual/shr-splash-theme"
diff --git a/recipes/shr/shr-theme-gry.bb b/recipes/shr/shr-theme-gry.bb
new file mode 100644
index 0000000000..7a2e6e1728
--- /dev/null
+++ b/recipes/shr/shr-theme-gry.bb
@@ -0,0 +1,7 @@
+DESCRIPTION = "gry* - a fast, shiny theme"
+SECTION = "x11/data"
+RDEPENDS += "e-wm-theme-illume-gry elementary-theme-gry"
+PV = "0.1"
+PR = "r1"
+
+ALLOW_EMPTY = "1"
diff --git a/recipes/shr/shr-theme-gtk-e17lookalike_git.bb b/recipes/shr/shr-theme-gtk-e17lookalike_git.bb
new file mode 100644
index 0000000000..04ab37dc63
--- /dev/null
+++ b/recipes/shr/shr-theme-gtk-e17lookalike_git.bb
@@ -0,0 +1,10 @@
+DESCRIPTION = "A gtk theme that looks like e17"
+LICENSE = "MIT BSD"
+PV = "0.1.1+gitr${SRCPV}"
+PR = "r5"
+
+SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master"
+
+S = "${WORKDIR}/git/gtk/${PN}"
+
+require gtk-theme.inc
diff --git a/recipes/shr/shr-theme-neo.bb b/recipes/shr/shr-theme-neo.bb
new file mode 100644
index 0000000000..20186ffe31
--- /dev/null
+++ b/recipes/shr/shr-theme-neo.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "nEo shr theme - a very fast, high contrast shr theme"
+SECTION = "x11/data"
+HOMEPAGE = "http://jmccloud.jm.funpic.de"
+AUTHOR = "Jesus McCloud <bernd.pruenster@gmail.com"
+RDEPENDS = "elementary-theme-neo e-wm-theme-illume-neo gtk-theme-neo libframeworkd-phonegui-efl-theme-neo gpe-theme-neo icon-theme-neo"
+LICENSE = "unknown"
+
+PV = "0.2"
+PR = "r1"
+
+ALLOW_EMPTY = "1"
diff --git a/recipes/shr/shr-theme-sixteen.bb b/recipes/shr/shr-theme-sixteen.bb
new file mode 100644
index 0000000000..d7b789239d
--- /dev/null
+++ b/recipes/shr/shr-theme-sixteen.bb
@@ -0,0 +1,7 @@
+DESCRIPTION = "Sixteen SHR theme"
+SECTION = "x11/data"
+RDEPENDS += "e-wm-theme-illume-sixteen elementary-theme-sixteen"
+PV = "0.1"
+PR = "r1"
+
+ALLOW_EMPTY = "1"
diff --git a/recipes/shr/shr-theme_git.bb b/recipes/shr/shr-theme_git.bb
index 54803107a4..704072f8af 100644
--- a/recipes/shr/shr-theme_git.bb
+++ b/recipes/shr/shr-theme_git.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Standard icon theme for the SHR distribution"
 HOMEPAGE = "http://shr-project.org/"
 LICENSE = "GPL"
 SECTION = "x11/data"
-PV = "0.0.2+gitr${SRCREV}"
+PV = "0.0.2+gitr${SRCPV}"
 PR = "r2"
 
 inherit autotools
diff --git a/recipes/shr/shr-today_git.bb b/recipes/shr/shr-today_git.bb
index c6947cf3ca..65bea25739 100644
--- a/recipes/shr/shr-today_git.bb
+++ b/recipes/shr/shr-today_git.bb
@@ -2,13 +2,13 @@ DESCRIPTION = "python-elementary and opimd based lock and today screen for the S
 HOMEPAGE = "http://wiki.github.com/slyon/today"
 SHR_RELEASE ?= "shr"
 LICENSE ?= "GPL"
-RDEPENDS = "python-elementary python-dbus python-edbus python-ecore"
+RDEPENDS = "python-edje python-dbus python-edbus python-ecore"
 SECTION = "x11/applications"
 
-PV = "0.0.1-gitr${SRCREV}"
-PR = "r0"
+PV = "0.0.1+gitr${SRCPV}"
+PR = "r2"
 
-inherit setuptools
+inherit distutils
 
 SRC_URI = "git://github.com/slyon/today.git;protocol=http"
 S = "${WORKDIR}/git"