shr recipes: switch SRCREV->SRCPV, without PE bump

* as shr recipes weren't complete in oe.dev before, so if there was
  someone already building those before, please rebuild them

Signed-off-by: Klaus Kurzmann <mok@fluxnetz.de>

diff --git a/recipes/shr/alsa-scenarii-shr_git.bb b/recipes/shr/alsa-scenarii-shr_git.bb
index 97b4393459c09ff80541fe574cd1ced063aeeb1b..97b84984b6d84e2473e88e398adb55287b519ff0 100644 (file)
--- 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 64bd23fe90af01c2c9b18ab3e4a5c5ac001c1148..36154cef8e2126ed2402f6fcca5d6f0a4ed4bbd8 100644 (file)
--- 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 94529e335ac1843e1c79468e7cd6e683683f0b6e..1deef919fd7535b1bd4306331dd9653714ae3d50 100644 (file)
--- 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 293edaeba36874064f376df76fc854056df1899c..07508c9fbb02f6ea600bebdc454cb71d0c66afe2 100644 (file)
--- 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-niebiee_git.bb b/recipes/shr/e-wm-theme-illume-niebiee_git.bb
index bd3412d0ff5d8b33a067363138a7d9d53fbc0c27..76aaf6d23b29986628000ade09bb7a15b42e4317 100644 (file)
--- 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 0c59feb87624b32afa030b1e089e98339a9b86fd..af126dc92e8596184c95d55469725133b6d32761 100644 (file)
--- 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 5c3d65825e19eb77f08fa62ea525a0795b6aafbe..f164f0fc241edb16c62da07d7bac7196fae14b17 100644 (file)
--- 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-niebiee_git.bb b/recipes/shr/elementary-theme-niebiee_git.bb
index f58257d48cedc699f34583c7afe01641ee43cf7c..1736ad9a7ad95f848c9e6f9b8c795f7a256ed329 100644 (file)
--- 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 48cbc615fae1ff159461de8a2584c1d70f51c9ec..4eb43af7672c9ac2b158fbda84abd8205059216e 100644 (file)
--- 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-shr_git.bb b/recipes/shr/etk-theme-shr_git.bb
index d146765c94770dc077870777f928214a521c78c6..3a324e972842a4f6f954778513679bac1b5bcf49 100644 (file)
--- 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/frameworkd-config-shr_git.bb b/recipes/shr/frameworkd-config-shr_git.bb
index 0727091f0b38a4088cc515eb1f8969c712bacb10..c1d15b18c3aa937a6c5e8006f62586656e3daa5e 100644 (file)
--- 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/libframeworkd-phonegui-efl2_git.bb b/recipes/shr/libframeworkd-phonegui-efl2_git.bb
index 207658f807d53b5526f83db0ddacb462b28be25f..cb1feade68e417178e97511ee0cf3172bca8e2ea 100644 (file)
--- 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 f8adabf4150baaaa9fb899cb8a71e706f6385820..c4181cf345f24775cf792c7e06c122b5f00aaefb 100644 (file)
--- 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 50b546512a5c2192113e80e69e68c7a8decd05d4..aa1f10755565f2dede3404e0e09b8c7f64df5d11 100644 (file)
--- 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/libphone-utils_git.bb b/recipes/shr/libphone-utils_git.bb
index 7cf26ffec113294555ddcf3d6046b1c09094c3ed..e0a2e2c1107bb96e37641a267d95d219faddacd3 100644 (file)
--- 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/shr-contacts_git.bb b/recipes/shr/shr-contacts_git.bb
index 1b9a38313057b77d97d9b9a8618e908dd489fffd..6cfb87f43b0011a3f483854cca569fa4a3260a2f 100644 (file)
--- 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 796b96592ba15c3902fce721da52128b8cfb6cdf..f4813141e4b6c9aab9e640f83d9dbfcff3505199 100644 (file)
--- 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 1206d635d508cdad46fe94dd73a1cc0a66abe064..331c0f1e6aa9518c0011206f7289e8496a8df31b 100644 (file)
--- 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-messages_git.bb b/recipes/shr/shr-messages_git.bb
index 6fc0694c2932fd053888ec3ac6915b1e594a3c3a..b821545fac57a393f9c91b28ce3e6181d7c39888 100644 (file)
--- 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-splash-theme-dontpanic_git.bb b/recipes/shr/shr-splash-theme-dontpanic_git.bb
index 4bf41fbd2934d844f4ee52dd7d40171e98151224..f80df61f67509610127faac65f002bb3c036bc91 100644 (file)
--- 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 773d4f16db0e8bcbe36f87041310db3784af4e7e..3890a7f3838ee178a204c8ea3811794cdb5d104b 100644 (file)
--- 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-niebiee_git.bb b/recipes/shr/shr-splash-theme-niebiee_git.bb
index 40a0973f2b2ca375a9dd942ba1a76c1de5f90d82..e16cfa3fb448c26460f1d811474b7b51c6ff68ca 100644 (file)
--- 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 865e18fce7f97291eb086d1075542fee84d6c938..97ef436e6cd1d187b9a7229c01a2f6a5b620c4c7 100644 (file)
--- 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_git.bb b/recipes/shr/shr-splash_git.bb
index 1ce7373e82149ebc75da13a29e8fd1561dce8c62..9bf4ca12df49cc40dddecb80831f213cb14a1765 100644 (file)
--- 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_git.bb b/recipes/shr/shr-theme_git.bb
index 54803107a4cf4fddc5cb0b0358941e071f7a27a1..704072f8af998739f0a6de70fffd57fdcc6704ac 100644 (file)
--- 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 c6947cf3ca4bcd9eec40a6c7f2625622f7eaa80c..65bea257394f4f066a7b347dbea3a197eae0b704 100644 (file)
--- 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"