dbus-glib: converted to BBCLASSEXTENDED and remove do_stage stuff

13 files changed, 137 insertions, 126 deletions

diff --git a/recipes/dbus/dbus-glib-native-0.74/run-with-tmp-session-bus.patch b/recipes/dbus/dbus-glib-0.74/run-with-tmp-session-bus.patch
index ba117d0309..ba117d0309 100644
--- a/recipes/dbus/dbus-glib-native-0.74/run-with-tmp-session-bus.patch
+++ b/recipes/dbus/dbus-glib-0.74/run-with-tmp-session-bus.patch
diff --git a/recipes/dbus/dbus-glib-native-0.76/run-with-tmp-session-bus.patch b/recipes/dbus/dbus-glib-0.76/run-with-tmp-session-bus.patch
index a04f404f75..a04f404f75 100644
--- a/recipes/dbus/dbus-glib-native-0.76/run-with-tmp-session-bus.patch
+++ b/recipes/dbus/dbus-glib-0.76/run-with-tmp-session-bus.patch
diff --git a/recipes/dbus/dbus-glib-0.78/run-with-tmp-session-bus.patch b/recipes/dbus/dbus-glib-0.78/run-with-tmp-session-bus.patch
new file mode 100644
index 0000000000..a04f404f75
--- /dev/null
+++ b/recipes/dbus/dbus-glib-0.78/run-with-tmp-session-bus.patch
@@ -0,0 +1,24 @@
+Index: dbus-glib-0.76/tools/run-with-tmp-session-bus.sh
+===================================================================
+--- dbus-glib-0.76.orig/tools/run-with-tmp-session-bus.sh	2008-06-13 16:31:54.000000000 +0100
++++ dbus-glib-0.76/tools/run-with-tmp-session-bus.sh	2008-06-13 16:32:54.000000000 +0100
+@@ -30,17 +30,15 @@
+ echo "escaped service dir is: $ESCAPED_SERVICE_DIR" >&2
+ 
+ ## create a configuration file based on the standard session.conf
+-cat $DBUS_TOP_SRCDIR/tools/session.conf |  \
++cat $datadir/tools/session.conf |  \
+     sed -e 's/<servicedir>.*$/<servicedir>'$ESCAPED_SERVICE_DIR'<\/servicedir>/g' |  \
+     sed -e 's/<include.*$//g'                \
+   > $CONFIG_FILE
+ 
+ echo "Created configuration file $CONFIG_FILE" >&2
+ 
+-PATH=$DBUS_TOP_BUILDDIR/bus:$PATH
+-export PATH
+ ## the libtool script found by the path search should already do this, but
+-LD_LIBRARY_PATH=$DBUS_TOP_BUILDDIR/dbus/.libs:$LD_LIBRARY_PATH
++LD_LIBRARY_PATH=$libdir:$LD_LIBRARY_PATH
+ export PATH
+ unset DBUS_SESSION_BUS_ADDRESS
+ unset DBUS_SESSION_BUS_PID
diff --git a/recipes/dbus/dbus-glib-0.82/run-with-tmp-session-bus.patch b/recipes/dbus/dbus-glib-0.82/run-with-tmp-session-bus.patch
new file mode 100644
index 0000000000..a04f404f75
--- /dev/null
+++ b/recipes/dbus/dbus-glib-0.82/run-with-tmp-session-bus.patch
@@ -0,0 +1,24 @@
+Index: dbus-glib-0.76/tools/run-with-tmp-session-bus.sh
+===================================================================
+--- dbus-glib-0.76.orig/tools/run-with-tmp-session-bus.sh	2008-06-13 16:31:54.000000000 +0100
++++ dbus-glib-0.76/tools/run-with-tmp-session-bus.sh	2008-06-13 16:32:54.000000000 +0100
+@@ -30,17 +30,15 @@
+ echo "escaped service dir is: $ESCAPED_SERVICE_DIR" >&2
+ 
+ ## create a configuration file based on the standard session.conf
+-cat $DBUS_TOP_SRCDIR/tools/session.conf |  \
++cat $datadir/tools/session.conf |  \
+     sed -e 's/<servicedir>.*$/<servicedir>'$ESCAPED_SERVICE_DIR'<\/servicedir>/g' |  \
+     sed -e 's/<include.*$//g'                \
+   > $CONFIG_FILE
+ 
+ echo "Created configuration file $CONFIG_FILE" >&2
+ 
+-PATH=$DBUS_TOP_BUILDDIR/bus:$PATH
+-export PATH
+ ## the libtool script found by the path search should already do this, but
+-LD_LIBRARY_PATH=$DBUS_TOP_BUILDDIR/dbus/.libs:$LD_LIBRARY_PATH
++LD_LIBRARY_PATH=$libdir:$LD_LIBRARY_PATH
+ export PATH
+ unset DBUS_SESSION_BUS_ADDRESS
+ unset DBUS_SESSION_BUS_PID
diff --git a/recipes/dbus/dbus-glib-0.86/run-with-tmp-session-bus.patch b/recipes/dbus/dbus-glib-0.86/run-with-tmp-session-bus.patch
new file mode 100644
index 0000000000..a04f404f75
--- /dev/null
+++ b/recipes/dbus/dbus-glib-0.86/run-with-tmp-session-bus.patch
@@ -0,0 +1,24 @@
+Index: dbus-glib-0.76/tools/run-with-tmp-session-bus.sh
+===================================================================
+--- dbus-glib-0.76.orig/tools/run-with-tmp-session-bus.sh	2008-06-13 16:31:54.000000000 +0100
++++ dbus-glib-0.76/tools/run-with-tmp-session-bus.sh	2008-06-13 16:32:54.000000000 +0100
+@@ -30,17 +30,15 @@
+ echo "escaped service dir is: $ESCAPED_SERVICE_DIR" >&2
+ 
+ ## create a configuration file based on the standard session.conf
+-cat $DBUS_TOP_SRCDIR/tools/session.conf |  \
++cat $datadir/tools/session.conf |  \
+     sed -e 's/<servicedir>.*$/<servicedir>'$ESCAPED_SERVICE_DIR'<\/servicedir>/g' |  \
+     sed -e 's/<include.*$//g'                \
+   > $CONFIG_FILE
+ 
+ echo "Created configuration file $CONFIG_FILE" >&2
+ 
+-PATH=$DBUS_TOP_BUILDDIR/bus:$PATH
+-export PATH
+ ## the libtool script found by the path search should already do this, but
+-LD_LIBRARY_PATH=$DBUS_TOP_BUILDDIR/dbus/.libs:$LD_LIBRARY_PATH
++LD_LIBRARY_PATH=$libdir:$LD_LIBRARY_PATH
+ export PATH
+ unset DBUS_SESSION_BUS_ADDRESS
+ unset DBUS_SESSION_BUS_PID
diff --git a/recipes/dbus/dbus-glib-native_0.74.bb b/recipes/dbus/dbus-glib-native_0.74.bb
deleted file mode 100644
index f41aec5a14..0000000000
--- a/recipes/dbus/dbus-glib-native_0.74.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-SECTION = "base"
-PR = "r1"
-HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
-DESCRIPTION = "Message bus system for applications to talk to one another"
-LICENSE = "GPL"
-
-SRC_URI = "http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-${PV}.tar.gz \
-	   file://run-with-tmp-session-bus.patch"
-
-inherit autotools pkgconfig gettext native
-
-S = "${WORKDIR}/dbus-glib-${PV}"
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/dbus-glib-${PV}"
-DEPENDS = "glib-2.0-native dbus-native"
-
-do_stage() {
-        oe_runmake install
-        install -d ${STAGING_DATADIR}/dbus
-        install -m 0644 tools/dbus-bus-introspect.xml ${STAGING_DATADIR}/dbus
-        install -m 0644 tools/dbus-glib-bindings.h ${STAGING_DATADIR}/dbus
-}
-
-SRC_URI[md5sum] = "0923d825a0aff2e4eb23338b630286fb"
-SRC_URI[sha256sum] = "e870d8cd619834eda066e37fe69b441d629f9ad3a871ef2854fbbcd753b3abe2"
diff --git a/recipes/dbus/dbus-glib-native_0.76.bb b/recipes/dbus/dbus-glib-native_0.76.bb
deleted file mode 100644
index a40e3fa24b..0000000000
--- a/recipes/dbus/dbus-glib-native_0.76.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-SECTION = "base"
-PR = "r1"
-HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
-DESCRIPTION = "message bus system for applications to talk to one another"
-LICENSE = "GPL"
-
-SRC_URI = "http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-${PV}.tar.gz \
-	   file://run-with-tmp-session-bus.patch"
-
-inherit autotools pkgconfig gettext native
-
-S = "${WORKDIR}/dbus-glib-${PV}"
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/dbus-glib-${PV}"
-DEPENDS = "glib-2.0-native dbus-native"
-
-do_stage() {
-        oe_runmake install
-        install -d ${STAGING_DATADIR}/dbus
-        install -m 0644 tools/dbus-bus-introspect.xml ${STAGING_DATADIR}/dbus
-        install -m 0644 tools/dbus-glib-bindings.h ${STAGING_DATADIR}/dbus
-}
-
-SRC_URI[md5sum] = "d3b716a7e798faa1c6a867675f00306a"
-SRC_URI[sha256sum] = "8bc083faaf3efdd444a8a44bbcbfea501a7b547736fda3c2d83bfdc9b5b672a3"
diff --git a/recipes/dbus/dbus-glib.inc b/recipes/dbus/dbus-glib.inc
index 54997c3845..b4e968cac8 100644
--- a/recipes/dbus/dbus-glib.inc
+++ b/recipes/dbus/dbus-glib.inc
@@ -2,28 +2,48 @@ DESCRIPTION = "GLib bindings for the dbus message bus system"
 HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
 SECTION = "libs"
 LICENSE = "GPL"
+
 DEPENDS = "expat glib-2.0 virtual/libintl dbus-glib-native dbus"
+DEPENDS_virtclass-native = "expat-native glib-2.0-native dbus-native"
+
 INC_PR = "r1"
 
+BBCLASSEXTEND = "native"
+
 SRC_URI = "\
-  http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-${PV}.tar.gz;name=archive \
-  file://no-introspect.patch \
-  file://no-examples.patch \
-"
+           http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-${PV}.tar.gz \
+           file://no-examples.patch \
+           file://no-introspect.patch \
+          "
+
+SRC_URI_virtclass-native = "http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-${PV}.tar.gz"
 
 inherit autotools pkgconfig gettext
 
 do_configure_prepend() {
-	install -m 0644 ${STAGING_DATADIR_NATIVE}/dbus/dbus-bus-introspect.xml ${S}/tools/
-	install -m 0644 ${STAGING_DATADIR_NATIVE}/dbus/dbus-glib-bindings.h ${S}/tools/
+        install -m 0644 ${STAGING_DATADIR_NATIVE}/dbus/dbus-bus-introspect.xml ${S}/tools/
+        install -m 0644 ${STAGING_DATADIR_NATIVE}/dbus/dbus-glib-bindings.h ${S}/tools/
+
+}
+
+do_configure_virtclass-native() {
+        autotools_do_configure
+}
+
+do_install_virtclass-native_prepend() {
+        install -d ${D}${datadir}/dbus
+        install -m 0644 tools/dbus-glib-bindings.h ${D}${datadir}/dbus
 }
 
 PACKAGES += "${PN}-bash-completion"
+
 FILES_${PN}-bash-completion = "\
   ${sysconfdir}/bash_completion.d \
   ${prefix}/libexec/dbus-bash-completion-helper \
 "
+
 FILES_${PN} = "${libdir}/lib*.so.*"
+
 FILES_${PN}-dev += "\
   ${libdir}/dbus-1.0/include \
   ${bindir}/dbus-glib-tool \
diff --git a/recipes/dbus/dbus-glib_0.74.bb b/recipes/dbus/dbus-glib_0.74.bb
index 149ebac702..e6822b13f4 100644
--- a/recipes/dbus/dbus-glib_0.74.bb
+++ b/recipes/dbus/dbus-glib_0.74.bb
@@ -1,31 +1,13 @@
-SECTION = "base"
-PR = "r1"
-HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
-DESCRIPTION = "Message bus system for applications to talk to one another"
-LICENSE = "GPL"
-DEPENDS = "expat glib-2.0 virtual/libintl dbus-glib-native dbus"
+require dbus-glib.inc
 
-SRC_URI = "http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-${PV}.tar.gz \
-	   file://no-examples.patch \
-	   file://no-introspect.patch"
+PR = "${INC_PR}.1"
 
-inherit autotools pkgconfig gettext
+SRC_URI_virtclass-native += "file://run-with-tmp-session-bus.patch"
 
-FILES_${PN} = "${libdir}/lib*.so.*"
-FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-glib-tool"
-
-do_configure_prepend() {
-	install -m 0644 ${STAGING_DATADIR_NATIVE}/dbus/dbus-bus-introspect.xml ${S}/tools/
-	install -m 0644 ${STAGING_DATADIR_NATIVE}/dbus/dbus-glib-bindings.h ${S}/tools/
+do_install_virtclass-native_prepend() {
+        install -d ${D}${datadir}/dbus
+        install -m 0644 tools/dbus-bus-introspect.xml ${D}${datadir}/dbus
 }
 
-do_stage () {
-	oe_libinstall -so -C dbus libdbus-glib-1 ${STAGING_LIBDIR}
-
-	autotools_stage_includes
-}
-
-FILES_${PN}-dev += "${bindir}/dbus-binding-tool"
-
 SRC_URI[md5sum] = "0923d825a0aff2e4eb23338b630286fb"
 SRC_URI[sha256sum] = "e870d8cd619834eda066e37fe69b441d629f9ad3a871ef2854fbbcd753b3abe2"
diff --git a/recipes/dbus/dbus-glib_0.76.bb b/recipes/dbus/dbus-glib_0.76.bb
index 35975c8f8c..b8c675aefb 100644
--- a/recipes/dbus/dbus-glib_0.76.bb
+++ b/recipes/dbus/dbus-glib_0.76.bb
@@ -1,31 +1,13 @@
-SECTION = "base"
-PR = "r1"
-HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
-DESCRIPTION = "message bus system for applications to talk to one another"
-LICENSE = "GPL"
-DEPENDS = "expat glib-2.0 virtual/libintl dbus-glib-native dbus"
+require dbus-glib.inc
 
-SRC_URI = "http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-${PV}.tar.gz \
-	   file://no-examples.patch \
-	   file://no-introspect.patch"
+PR = "${INC_PR}.1"
 
-inherit autotools pkgconfig gettext
+SRC_URI_virtclass-native += "file://run-with-tmp-session-bus.patch"
 
-FILES_${PN} = "${libdir}/lib*.so.*"
-FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-glib-tool"
-
-do_configure_prepend() {
-	install -m 0644 ${STAGING_DATADIR_NATIVE}/dbus/dbus-bus-introspect.xml ${S}/tools/
-	install -m 0644 ${STAGING_DATADIR_NATIVE}/dbus/dbus-glib-bindings.h ${S}/tools/
+do_install_virtclass-native_prepend() {
+        install -d ${D}${datadir}/dbus
+        install -m 0644 tools/dbus-bus-introspect.xml ${D}${datadir}/dbus
 }
 
-do_stage () {
-	oe_libinstall -so -C dbus libdbus-glib-1 ${STAGING_LIBDIR}
-
-	autotools_stage_includes
-}
-
-FILES_${PN}-dev += "${bindir}/dbus-binding-tool"
-
 SRC_URI[md5sum] = "d3b716a7e798faa1c6a867675f00306a"
 SRC_URI[sha256sum] = "8bc083faaf3efdd444a8a44bbcbfea501a7b547736fda3c2d83bfdc9b5b672a3"
diff --git a/recipes/dbus/dbus-glib_0.78.bb b/recipes/dbus/dbus-glib_0.78.bb
index 7cae6ad48c..30a5e0c78c 100644
--- a/recipes/dbus/dbus-glib_0.78.bb
+++ b/recipes/dbus/dbus-glib_0.78.bb
@@ -1,26 +1,13 @@
-SECTION = "base"
-PR = "r1"
-HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
-DESCRIPTION = "message bus system for applications to talk to one another"
-LICENSE = "GPL"
-DEPENDS = "expat glib-2.0 virtual/libintl dbus-glib-native dbus"
+require dbus-glib.inc
 
-SRC_URI = "http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-${PV}.tar.gz \
-	   file://no-examples.patch \
-	   file://no-introspect.patch"
+PR = "${INC_PR}.1"
 
-inherit autotools_stage gettext
-AUTOTOOLS_STAGE_PKGCONFIG = "1"
+SRC_URI_virtclass-native += "file://run-with-tmp-session-bus.patch"
 
-FILES_${PN} = "${libdir}/lib*.so.* ${libexecdir}/dbus* ${sysconfdir}/profile.d"
-FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-glib-tool"
-
-do_configure_prepend() {
-	install -m 0644 ${STAGING_DATADIR_NATIVE}/dbus/dbus-bus-introspect.xml ${S}/tools/
-	install -m 0644 ${STAGING_DATADIR_NATIVE}/dbus/dbus-glib-bindings.h ${S}/tools/
+do_install_virtclass-native_prepend() {
+        install -d ${D}${datadir}/dbus
+        install -m 0644 tools/dbus-bus-introspect.xml ${D}${datadir}/dbus
 }
 
-FILES_${PN}-dev += "${bindir}/dbus-binding-tool"
-
 SRC_URI[md5sum] = "d4aa04b9df35b4bd663be38e959941c8"
 SRC_URI[sha256sum] = "ca366fed6035f75c6ca038f99b780260a0e19f282067b2dd20243ba54105fc21"
diff --git a/recipes/dbus/dbus-glib_0.82.bb b/recipes/dbus/dbus-glib_0.82.bb
index cca1d45159..fabf574501 100644
--- a/recipes/dbus/dbus-glib_0.82.bb
+++ b/recipes/dbus/dbus-glib_0.82.bb
@@ -1,5 +1,13 @@
 require dbus-glib.inc
+
 PR = "${INC_PR}.1"
 
-SRC_URI[archive.md5sum] = "aa2a4517de0e9144be3bce2cf8cdd924"
-SRC_URI[archive.sha256sum] = "ddfb062797341b5c5a22555ffe80138953cc61a67ba805647b2746f519bfbde1"
+SRC_URI_virtclass-native += "file://run-with-tmp-session-bus.patch"
+
+do_install_virtclass-native_prepend() {
+        install -d ${D}${datadir}/dbus
+        install -m 0644 dbus-bus-introspect.xml ${D}${datadir}/dbus
+}
+
+SRC_URI[md5sum] = "aa2a4517de0e9144be3bce2cf8cdd924"
+SRC_URI[sha256sum] = "ddfb062797341b5c5a22555ffe80138953cc61a67ba805647b2746f519bfbde1"
diff --git a/recipes/dbus/dbus-glib_0.86.bb b/recipes/dbus/dbus-glib_0.86.bb
index abb555304d..ce87d5d43e 100644
--- a/recipes/dbus/dbus-glib_0.86.bb
+++ b/recipes/dbus/dbus-glib_0.86.bb
@@ -1,6 +1,14 @@
 require dbus-glib.inc
-PR = "${INC_PR}.0"
 
-SRC_URI[archive.md5sum] = "cd0ab148fb0c786fc88be49d19971f50"
-SRC_URI[archive.sha256sum] = "5351a6e7f38ffc641c34b4a4cdd9bed1c1dc7043a501096bac00a2876ea90bdc"
+PR = "${INC_PR}.1"
+
+SRC_URI_virtclass-native += "file://run-with-tmp-session-bus.patch"
+
+do_install_virtclass-native_prepend() {
+        install -d ${D}${datadir}/dbus
+        install -m 0644 dbus-bus-introspect.xml ${D}${datadir}/dbus
+}
+
+SRC_URI[md5sum] = "cd0ab148fb0c786fc88be49d19971f50"
+SRC_URI[sha256sum] = "5351a6e7f38ffc641c34b4a4cdd9bed1c1dc7043a501096bac00a2876ea90bdc"