gconf-dbus: update svn version to rev 641, remove cvs version

* this makes it work with dbus 1.1.x

2 files changed, 16 insertions, 54 deletions

diff --git a/packages/gnome/gconf-dbus_cvs.bb b/packages/gnome/gconf-dbus_cvs.bb
deleted file mode 100644
index 6128eac3e2..0000000000
--- a/packages/gnome/gconf-dbus_cvs.bb
+++ /dev/null
@@ -1,37 +0,0 @@
-SECTION = "x11/utils"
-DEPENDS = "gtk+ glib-2.0 dbus libxml2 popt"
-DESCRIPTION = "Settings daemon using DBUS for communication."
-LICENSE = "GPL"
-PROVIDES = "gconf"
-RPROVIDES_${PN} = "gconf"
-RPROVIDES_${PN}-dev = "gconf-dev"
-
-PV = "0.0+cvs${SRCDATE}"
-PR = "r8"
-
-SRC_URI = "cvs://anonymous@anoncvs.gnome.org/cvs/gnome;module=gconf;tag=gconf-dbus-2-6 \
-           file://gconf-dbus-update.patch;patch=1;pnum=0 \
-	   file://69gconfd-dbus"
-
-inherit pkgconfig autotools
-S = "${WORKDIR}/gconf"
-
-FILES_${PN} += " ${libdir}/GConf/2/*.so ${libdir}/dbus-1.0 ${sysconfdir} ${datadir}/dbus*"
-
-EXTRA_OECONF = " --with-ipc=dbus --disable-gtk-doc --enable-gtk --host=${HOST_SYS} --enable-shared --disable-static"
-
-HEADERS = "gconf.h gconf-changeset.h gconf-listeners.h gconf-schema.h gconf-value.h gconf-error.h gconf-engine.h gconf-client.h gconf-enum-types.h"
-
-do_stage() {
-        oe_libinstall -so -C gconf libgconf-2 ${STAGING_LIBDIR}
-        install -d ${STAGING_INCDIR}/gconf/2/gconf/
-        ( cd gconf; for i in ${HEADERS}; do install -m 0644 $i ${STAGING_INCDIR}/gconf/2/gconf/$i; done )
-        install -m 0644 gconf.m4 ${STAGING_DATADIR}/aclocal/gconf-2.m4
-}
-
-do_install_append () {
-	install -d ${D}/${sysconfdir}/X11/Xsession.d
-	install -m 755 ${WORKDIR}/69gconfd-dbus ${D}/${sysconfdir}/X11/Xsession.d/
-	install -d ${D}/${datadir}/dbus-1.0/services/
-	install -m 644  gconf/gconf.service ${D}${datadir}/dbus-1.0/services/
-}
diff --git a/packages/gnome/gconf-dbus_svn.bb b/packages/gnome/gconf-dbus_svn.bb
index e7875dc72e..074b3015c2 100644
--- a/packages/gnome/gconf-dbus_svn.bb
+++ b/packages/gnome/gconf-dbus_svn.bb
@@ -1,39 +1,38 @@
-SECTION = "x11/utils"
+DESCRIPTION = "The GNOME Settings daemon using DBUS for communication."
 DEPENDS = "intltool-native virtual/libintl glib-2.0 dbus dbus-glib libxml2 popt gtk-doc-native"
-DESCRIPTION = "Settings daemon using DBUS for communication."
 LICENSE = "GPL"
+SECTION = "x11/utils"
 PROVIDES = "gconf"
 RPROVIDES_${PN} = "gconf"
 RPROVIDES_${PN}-dev = "gconf-dev"
-
 PV = "2.16.0+svnr${SRCREV}"
-PR = "r5"
+PR = "r0"
 
-SRC_URI = "svn://developer.imendio.com/svn/gconf-dbus;module=trunk;proto=http \
-	   file://69gconfd-dbus"
+inherit autotools pkgconfig
 
-inherit pkgconfig autotools 
+SRC_URI = "svn://developer.imendio.com/svn/gconf-dbus;module=trunk;proto=http \
+	file://69gconfd-dbus"
 S = "${WORKDIR}/trunk"
 
 PARALLEL_MAKE = ""
 
-FILES_${PN} = "${libdir}/GConf-dbus/2/*.so ${libdir}/dbus-1.0 ${sysconfdir} ${datadir}/dbus* ${libdir}/*.so.* ${bindir}/* ${libexecdir}/*"
-FILES_${PN}-dbg += " ${libdir}/GConf-dbus/2/.debug"
-FILES_${PN}-dev += "${libdir}/GConf-dbus/2/*.la ${datadir}/sgml/gconf/gconf-1.0.dtd"
-
-EXTRA_OECONF = " --with-ipc=dbus --disable-gtk-doc --disable-gtk --enable-shared --disable-static"
-
+EXTRA_OECONF = "--with-ipc=dbus --disable-gtk-doc --disable-gtk --enable-shared --disable-static"
 
 do_configure_prepend() {
-        touch gtk-doc.make
+	touch gtk-doc.make
 }
 
 do_stage() {
-        autotools_stage_all
-        install -m 0644 gconf-2.m4 ${STAGING_DATADIR}/aclocal/gconf-2.m4
+	autotools_stage_all
+	install -m 0644 gconf-2.m4 ${STAGING_DATADIR}/aclocal/gconf-2.m4
 }
 
-do_install_append () {
+do_install_append() {
 	install -d ${D}/${sysconfdir}/X11/Xsession.d
 	install -m 755 ${WORKDIR}/69gconfd-dbus ${D}/${sysconfdir}/X11/Xsession.d/
 }
+
+FILES_${PN} = "${libdir}/GConf-dbus/2/*.so ${libdir}/dbus-1.0 ${sysconfdir} ${datadir}/dbus* ${libdir}/*.so.* ${bindir}/* ${libexecdir}/*"
+FILES_${PN}-dbg += " ${libdir}/GConf-dbus/2/.debug"
+FILES_${PN}-dev += "${libdir}/GConf-dbus/2/*.la ${datadir}/sgml/gconf/gconf-1.0.dtd"
+