gtk-sato-engine: unify recipes, bump PV in svn recipe

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4171 311d38ba-8fff-0310-9ca6-ca027cbcb966

3 files changed, 26 insertions, 43 deletions

diff --git a/meta/packages/gtk-engines/gtk-sato-engine.inc b/meta/packages/gtk-engines/gtk-sato-engine.inc
new file mode 100644
index 0000000000..5ac690d630
--- /dev/null
+++ b/meta/packages/gtk-engines/gtk-sato-engine.inc
@@ -0,0 +1,19 @@
+DESCRIPTION = "Sato theme engine for GTK"
+SECTION = "x11/base"
+LICENSE = "LGPL"
+DEPENDS = "gtk+"
+RDEPENDS_gtk-theme-sato = "gtk-sato-engine"
+
+PACKAGES += "gtk-theme-sato"
+FILES_${PN} = "${libdir}/gtk-2.0/*/engines/*.so "
+FILES_${PN}-dev = "${libdir}/gtk-2.0/*/engines/*"
+FILES_${PN}-dbg = "${libdir}/gtk-2.0/*/engines/.debug"
+FILES_gtk-theme-sato = "${datadir}/icons ${datadir}/themes"
+
+inherit autotools  pkgconfig
+
+do_configure_prepend() {
+        for i in `ls gtk-common`; do
+                ln -sf ../gtk-common/$i gtk2-engine/$i
+        done
+}
diff --git a/meta/packages/gtk-engines/gtk-sato-engine_0.3.1.bb b/meta/packages/gtk-engines/gtk-sato-engine_0.3.1.bb
index b742e71b17..2b12d2d9e8 100644
--- a/meta/packages/gtk-engines/gtk-sato-engine_0.3.1.bb
+++ b/meta/packages/gtk-engines/gtk-sato-engine_0.3.1.bb
@@ -1,24 +1,6 @@
-SECTION = "x11/base"
-DESCRIPTION = "Sato theme engine for GTK"
-LICENSE = "LGPL"
-DEPENDS = "gtk+"
-RDEPENDS_gtk-theme-sato = "gtk-sato-engine"
-PR = "r3"
+require gtk-sato-engine.inc
+
+PR = "r4"
 
 SRC_URI = "http://pokylinux.org/releases/sato/sato-engine-${PV}.tar.gz"
 S = "${WORKDIR}/sato-engine-${PV}"
-
-PACKAGES += "gtk-theme-sato"
-FILES_${PN} = "${libdir}/gtk-2.0/*/engines/*.so "
-FILES_${PN}-dev = "${libdir}/gtk-2.0/*/engines/*"
-FILES_${PN}-dbg = "${libdir}/gtk-2.0/*/engines/.debug"
-FILES_gtk-theme-sato = "${datadir}/icons ${datadir}/themes"
-
-inherit autotools  pkgconfig
-
-do_configure_prepend() {
-        for i in `ls gtk-common`; do
-                ln -sf ../gtk-common/$i gtk2-engine/$i
-        done
-}
-
diff --git a/meta/packages/gtk-engines/gtk-sato-engine_svn.bb b/meta/packages/gtk-engines/gtk-sato-engine_svn.bb
index 31db4e5a9e..9f7b96b236 100644
--- a/meta/packages/gtk-engines/gtk-sato-engine_svn.bb
+++ b/meta/packages/gtk-engines/gtk-sato-engine_svn.bb
@@ -1,25 +1,7 @@
-SECTION = "x11/base"
-DESCRIPTION = "Sato theme engine for GTK"
-LICENSE = "LGPL"
-DEPENDS = "gtk+"
-RDEPENDS_gtk-theme-sato = "gtk-sato-engine"
-PV = "0.2+svnr${SRCREV}"
-PR = "r1"
+require gtk-sato-engine.inc
 
-SRC_URI = "svn://svn.o-hand.com/repos/sato/trunk;module=gtk-engine;proto=http"
-S = "${WORKDIR}/gtk-engine"
-
-PACKAGES += "gtk-theme-sato"
-FILES_${PN} = "${libdir}/gtk-2.0/*/engines/*.so "
-FILES_${PN}-dev = "${libdir}/gtk-2.0/*/engines/*"
-FILES_${PN}-dbg = "${libdir}/gtk-2.0/*/engines/.debug"
-FILES_gtk-theme-sato = "${datadir}/icons ${datadir}/themes"
+PV = "0.3.1+svnr${SRCREV}"
 
-inherit autotools  pkgconfig
-
-do_configure_prepend() {
-        for i in `ls gtk-common`; do
-                ln -sf ../gtk-common/$i gtk2-engine/$i
-        done
-}
+SRC_URI = "svn://svn.o-hand.com/repos/sato/trunk;module=gtk-engine;proto=http"
 
+S = "${WORKDIR}/gtk-engine"