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/e