[oe-commits] Ricardo Salveti de Araujo : mamona-input-methods-git: bumping rev, fixing PV and using oe-stylize

[git version control]

Module: openembedded.git
Branch: holger/staging-branch
Commit: 50afe2c7077a4181823465a1866355ef264c8818
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=50afe2c7077a4181823465a1866355ef264c8818

Author: Ricardo Salveti de Araujo <ricardo.salveti at openbossa.org>
Date:   Mon Nov 23 08:06:25 2009 +0000

mamona-input-methods-git: bumping rev, fixing PV and using oe-stylize

Signed-off-by: Ricardo Salveti de Araujo <ricardo.salveti at openbossa.org>

---

 conf/distro/include/sane-srcrevs.inc       |    2 +-
 recipes/mamona/mamona-input-methods_git.bb |   58 ++++++++++++----------------
 2 files changed, 26 insertions(+), 34 deletions(-)

diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 8f3036a..f0119c1 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -157,7 +157,7 @@ SRCREV_pn-llvm-gcc4 ?= "374"
 SRCREV_pn-llvm-gcc4-cross ?= "374"
 SRCREV_pn-madbutterfly ?= "ecd1842714b5e982f3138cbdd358517d57be6aa3"
 SRCREV_pn-maemo-mapper ?= "118"
-SRCREV_pn-mamona_input_methods ?= "7e6a8cc947689a045d0fba90015da599275347d9"
+SRCREV_pn-mamona-input-methods ?= "4a8f11973021b8b4f157f5743e00f9f9a3c4802b"
 SRCREV_pn-mamonaim-e-applet ?= "a1ba7e8a388ffce3cca92bad059cd801e7733a7a"
 SRCREV_pn-matchbox-config-gtk ?= "1614"
 SRCREV_pn-matchbox-desktop-2 ?= "2096"
diff --git a/recipes/mamona/mamona-input-methods_git.bb b/recipes/mamona/mamona-input-methods_git.bb
index ca89453..6b82697 100644
--- a/recipes/mamona/mamona-input-methods_git.bb
+++ b/recipes/mamona/mamona-input-methods_git.bb
@@ -3,21 +3,30 @@
 
 DESCRIPTION = "Mamona input methods"
 HOMEPAGE = "http://dev.openbossa.org/trac/mamona/wiki"
-LICENSE = "GPL"
 SECTION = "libs/inputmethods"
+LICENSE = "GPL"
 DEPENDS = "ecore gtk+"
-PR = "r4"
-
-PV = "0.1+git"
-
-inherit autotools pkgconfig lib_package
+RPROVIDES_${PN} = "libmamona-im0"
+RPROVIDES_${PN}-ecore = "libmamona-im-ecore"
+RPROVIDES_${PN}-gtk = "libmamona-im-gtk"
+PV = "0.1-${PR}+gitr${SRCREV}"
+PR = "r5"
+PE = "1"
 
 SRC_URI = "git://dev.openbossa.org/mamona/projects/mamona_input_methods.git;protocol=http"
 
 S = "${WORKDIR}/git"
 
-# Mamona IM
-RPROVIDES_${PN} = "libmamona-im0"
+inherit autotools_stage pkgconfig lib_package
+
+EXTRA_OECONF = "\
+        --enable-ecore-im \
+        --enable-gtk-im \
+        "
+
+do_configure_prepend() {
+        ./autogen.sh
+}
 
 # Ecore
 PACKAGES += "\
@@ -25,10 +34,13 @@ PACKAGES += "\
             ${PN}-ecore-dev \
             ${PN}-ecore-dbg \
         "
-RPROVIDES_${PN}-ecore = "libmamona-im-ecore"
-EXTRA_OECONF = "\
-            --enable-ecore-im \
+# GTK
+PACKAGES += "\
+            ${PN}-gtk \
+            ${PN}-gtk-dev \
+            ${PN}-gtk-dbg \
         "
+
 FILES_${PN}-ecore = "\
             ${libdir}/ecore/immodules/mamona-im-ecore-module.so \
         "
@@ -39,17 +51,6 @@ FILES_${PN}-ecore-dev = "\
 FILES_${PN}-ecore-dbg = "\
             ${libdir}/ecore/immodules/.debug \
         "
-
-# GTK
-PACKAGES += "\
-            ${PN}-gtk \
-            ${PN}-gtk-dev \
-            ${PN}-gtk-dbg \
-        "
-RPROVIDES_${PN}-gtk = "libmamona-im-gtk"
-EXTRA_OECONF += "\
-            --enable-gtk-im \
-        "
 FILES_${PN}-gtk = "\
             ${libdir}/gtk-2.0/*/immodules/mamona-im-gtk-module.so \
         "
@@ -61,18 +62,9 @@ FILES_${PN}-gtk-dbg = "\
             ${libdir}/gtk-2.0/*/immodules/.debug \
         "
 
-do_configure_prepend() {
-    ./autogen.sh
-}
-
-do_stage() {
-    autotools_stage_all
-}
-
 pkg_postinst_${PN}-gtk() {
-    gtk-query-immodules-2.0 > ${sysconfdir}/gtk-2.0/gtk.immodules
+        gtk-query-immodules-2.0 > ${sysconfdir}/gtk-2.0/gtk.immodules
 }
-
 pkg_postrm_${PN}-gtk() {
-    gtk-query-immodules-2.0 > ${sysconfdir}/gtk-2.0/gtk.immodules
+        gtk-query-immodules-2.0 > ${sysconfdir}/gtk-2.0/gtk.immodules
 }