More syncing with OE, remove old dbus versions and old avahi version

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

11 files changed, 3 insertions, 265 deletions

diff --git a/openembedded/packages/avahi/avahi_0.2.bb b/openembedded/packages/avahi/avahi_0.2.bb
deleted file mode 100644
index 6b77b7808..000000000
--- a/openembedded/packages/avahi/avahi_0.2.bb
+++ /dev/null
@@ -1,47 +0,0 @@
-DESCRIPTION = "Avahi implements the DNS-SD over Multicast DNS"
-HOMEPAGE = "http://www.freedesktop.org/Software/Avahi"
-LICENCE= "GPL"
-DEPENDS = "expat libdaemon dbus"
-RRECOMMENDS = "libnss-mdns"
-SECTION = "net"
-PRIORITY = "optional"
-
-SRC_URI = "http://www.freedesktop.org/~lennart/avahi-${PV}.tar.gz"
-
-#	   file://no-strict-ansi.patch;patch=1"
-
-PACKAGES = "avahi-daemon libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib avahi-dev avahi-doc"
-
-FILES_libavahi-common = "${libdir}/libavahi-common.so.*"
-FILES_libavahi-core= "${libdir}/libavahi-core.so.*"
-FILES_avahi-daemon = "${sbindir}/avahi-daemon \
-		      ${sysconfdir}/avahi/avahi-daemon.conf \
-		      ${sysconfdir}/avahi/services \
-		      ${sysconfdir}/dbus-1 \
-		      ${sysconfdir}/init.d/avahi-daemon \
-		      ${datadir}/avahi/introspection/*.introspect \
-		      ${datadir}/avahi/avahi-service.dtd"
-FILES_libavahi-client = "${libdir}/libavahi-client.so.*"
-FILES_avahi-dnsconfd = "${sbindir}/avahi-dnsconfd \
-			${sysconfdir}/avahi/avahi-dnsconfd.action \
-			${sysconfdir}/init.d/avahi-dnsconfd"
-FILES_libavahi-glib = "${libdir}/libavahi-glib.so.*"
-
-CONFFILES_avahi-daemon = "${sysconfdir}/avahi/avahi-daemon.conf"
-
-EXTRA_OECONF = "--with-distro=debian --disable-gtk --disable-python"
-inherit autotools
-inherit update-rc.d
-
-INITSCRIPT_PACKAGES = "avahi-daemon avahi-dnsconfd"
-INITSCRIPT_NAME_avahi-daemon = "avahi-daemon"
-INITSCRIPT_NAME_avahi-dnsconfd = "avahi-dnsconfd"
-
-pkg_postinst_avahi-daemon () {
-	grep avahi /etc/passwd || adduser --disabled-password --system --home /var/run/avahi-daemon avahi
-}
-
-pkg_postrm_avahi-daemon () {
-	deluser avahi || true
-}
-
diff --git a/openembedded/packages/dbus/dbus-0.36/cross.patch b/openembedded/packages/dbus/dbus-0.36/cross.patch
deleted file mode 100644
index 6d1d9d8e7..000000000
--- a/openembedded/packages/dbus/dbus-0.36/cross.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- dbus-0.20/configure.in~cross
-+++ dbus-0.20/configure.in
-@@ -466,6 +466,7 @@
-     exit (0);
- ]])],
-               [have_abstract_sockets=yes],
-+              [have_abstract_sockets=no],
-               [have_abstract_sockets=no])
- AC_LANG_POP(C)
- AC_MSG_RESULT($have_abstract_sockets)
diff --git a/openembedded/packages/dbus/dbus-0.36/dbus-1.init b/openembedded/packages/dbus/dbus-0.36/dbus-1.init
deleted file mode 100644
index adefe7c5b..000000000
--- a/openembedded/packages/dbus/dbus-0.36/dbus-1.init
+++ /dev/null
@@ -1,86 +0,0 @@
-#! /bin/sh
-# -*- coding: utf-8 -*-
-# Debian init.d script for D-BUS
-# Copyright © 2003 Colin Walters <walters@debian.org>
-
-set -e
-
-DAEMON=/usr/bin/dbus-daemon-1
-NAME=dbus-1
-DAEMONUSER=messagebus
-PIDDIR=/var/run/dbus
-PIDFILE=$PIDDIR/pid
-DESC="system message bus"
-EVENTDIR=/etc/dbus-1/event.d
-
-test -x $DAEMON || exit 0
-
-# Source defaults file; edit that file to configure this script.
-ENABLED=1
-PARAMS=""
-if [ -e /etc/default/dbus-1 ]; then
-  . /etc/default/dbus-1
-fi
-
-test "$ENABLED" != "0" || exit 0
-
-start_it_up()
-{
-  if [ ! -d $PIDDIR ]; then
-    mkdir -p $PIDDIR
-    chown $DAEMONUSER $PIDDIR
-    chgrp $DAEMONUSER $PIDDIR
-  fi
-  if [ -e $PIDFILE ]; then
-    PIDDIR=/proc/$(cat $PIDFILE)
-    if [ -d ${PIDDIR} -a  "$(readlink -f ${PIDDIR}/exe)" = "${DAEMON}" ]; then 
-      echo "$DESC already started; not starting."
-    else
-      echo "Removing stale PID file $PIDFILE."
-      rm -f $PIDFILE
-    fi
-  fi
-  echo -n "Starting $DESC: "
-  start-stop-daemon --start --quiet --pidfile $PIDFILE \
-    --user $DAEMONUSER --exec $DAEMON -- --system $PARAMS
-  echo "$NAME."
-  if [ -d $EVENTDIR ]; then
-      run-parts --arg=start $EVENTDIR
-  fi
-}
-
-shut_it_down()
-{
-  if [ -d $EVENTDIR ]; then
-      run-parts --reverse --arg=stop $EVENTDIR
-  fi
-  echo -n "Stopping $DESC: "
-  start-stop-daemon --stop  --quiet --pidfile $PIDFILE \
-    --user $DAEMONUSER
-  # We no longer include these arguments so that start-stop-daemon
-  # can do its job even given that we may have been upgraded.
-  # We rely on the pidfile being sanely managed
-  # --exec $DAEMON -- --system $PARAMS
-  echo "$NAME."
-  rm -f $PIDFILE
-}
-
-case "$1" in
-  start)
-    start_it_up
-  ;;
-  stop)
-    shut_it_down
-  ;;
-  restart|force-reload)
-    shut_it_down
-    sleep 1
-    start_it_up
-  ;;
-  *)
-    echo "Usage: /etc/init.d/$NAME {start|stop|restart|force-reload}" >&2
-    exit 1
-  ;;
-esac
-
-exit 0
diff --git a/openembedded/packages/dbus/dbus-0.36/no-bindings.patch b/openembedded/packages/dbus/dbus-0.36/no-bindings.patch
deleted file mode 100644
index 12ba00ff7..000000000
--- a/openembedded/packages/dbus/dbus-0.36/no-bindings.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- dbus-0.34/tools/Makefile.am.old	2005-06-27 21:48:44.000000000 +0100
-+++ dbus-0.34/tools/Makefile.am	2005-06-27 21:49:04.000000000 +0100
-@@ -6,9 +6,6 @@
- nodist_libdbus_glib_HEADERS = dbus-glib-bindings.h
- libdbus_glibdir = $(includedir)/dbus-1.0/dbus
- 
--dbus-glib-bindings.h: dbus-bus-introspect.xml $(top_builddir)/glib/dbus-binding-tool
--	$(top_builddir)/glib/dbus-binding-tool --mode=glib-client --output=dbus-glib-bindings.h dbus-bus-introspect.xml
--
- BUILT_SOURCES = dbus-glib-bindings.h dbus-bus-introspect.xml
- 
- else
diff --git a/openembedded/packages/dbus/dbus-0.36/no-examples.patch b/openembedded/packages/dbus/dbus-0.36/no-examples.patch
deleted file mode 100644
index 531646cfb..000000000
--- a/openembedded/packages/dbus/dbus-0.36/no-examples.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-Index: dbus-0.36/glib/Makefile.am
-===================================================================
---- dbus-0.36.orig/glib/Makefile.am	2005-08-04 15:49:30.000000000 +0000
-+++ dbus-0.36/glib/Makefile.am	2005-09-02 12:42:17.000000000 +0000
-@@ -1,4 +1,4 @@
--SUBDIRS = . examples
-+#SUBDIRS = . examples
- 
- INCLUDES=-I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) $(DBUS_GLIB_CFLAGS) $(DBUS_GLIB_TOOL_CFLAGS) -DDBUS_COMPILATION=1 -DDBUS_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\"
- 
diff --git a/openembedded/packages/dbus/dbus-0.36/no-introspect.patch b/openembedded/packages/dbus/dbus-0.36/no-introspect.patch
deleted file mode 100644
index 822afccf0..000000000
--- a/openembedded/packages/dbus/dbus-0.36/no-introspect.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: dbus-0.36/tools/Makefile.am
-===================================================================
---- dbus-0.36.orig/tools/Makefile.am	2005-07-08 16:25:28.000000000 +0000
-+++ dbus-0.36/tools/Makefile.am	2005-09-02 12:26:02.000000000 +0000
-@@ -21,11 +21,6 @@
- GTK_TOOLS=
- endif
- 
--if HAVE_GLIB
--dbus-bus-introspect.xml: $(top_builddir)/bus/dbus-daemon dbus-launch dbus-send $(top_builddir)/bus/dbus-daemon Makefile
--	DBUS_TOP_BUILDDIR=$(top_builddir) $(srcdir)/run-with-tmp-session-bus.sh ./dbus-send --print-reply=literal --dest=org.freedesktop.DBus /org/freedesktop/DBus org.freedesktop.DBus.Introspectable.Introspect > dbus-bus-introspect.xml.tmp && mv dbus-bus-introspect.xml.tmp dbus-bus-introspect.xml
--endif
--
- bin_PROGRAMS=dbus-send $(GLIB_TOOLS) dbus-launch dbus-cleanup-sockets $(GTK_TOOLS)
- 
- dbus_send_SOURCES=				\
diff --git a/openembedded/packages/dbus/dbus-0.36/tmpdir.patch b/openembedded/packages/dbus/dbus-0.36/tmpdir.patch
deleted file mode 100644
index 838b903f0..000000000
--- a/openembedded/packages/dbus/dbus-0.36/tmpdir.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- dbus-0.22/configure.in.orig	2004-08-13 00:57:16.000000000 +0200
-+++ dbus-0.22/configure.in	2004-12-30 21:15:57.000000000 +0100
-@@ -1047,15 +1048,18 @@
- AC_SUBST(ABSOLUTE_TOP_BUILDDIR)
- 
- #### Find socket directories
--if ! test -z "$TMPDIR" ; then
--   DEFAULT_SOCKET_DIR=$TMPDIR
--elif ! test -z "$TEMP" ; then
--   DEFAULT_SOCKET_DIR=$TEMP
--elif ! test -z "$TMP" ; then
--   DEFAULT_SOCKET_DIR=$TMP
--else
--   DEFAULT_SOCKET_DIR=/tmp
--fi
-+#if ! test -z "$TMPDIR" ; then
-+#   DEFAULT_SOCKET_DIR=$TMPDIR
-+#elif ! test -z "$TEMP" ; then
-+#   DEFAULT_SOCKET_DIR=$TEMP
-+#elif ! test -z "$TMP" ; then
-+#   DEFAULT_SOCKET_DIR=$TMP
-+#else
-+#   DEFAULT_SOCKET_DIR=/tmp
-+#fi
-+
-+# checks disabled to avoid expanding this at build time
-+DEFAULT_SOCKET_DIR=/tmp
- 
- if ! test -z "$with_test_socket_dir" ; then
-    TEST_SOCKET_DIR="$with_test_socket_dir"
diff --git a/openembedded/packages/dbus/dbus-native_0.34.bb b/openembedded/packages/dbus/dbus-native_0.34.bb
deleted file mode 100644
index a84530d4d..000000000
--- a/openembedded/packages/dbus/dbus-native_0.34.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-include dbus.inc
-
-SRC_URI_EXTRA=""
-
-inherit native
-
-S = "${WORKDIR}/dbus-${PV}"
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/dbus"
-DEPENDS = "glib-2.0-native"
-
-do_stage() {
-	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
-}
-
diff --git a/openembedded/packages/dbus/dbus_0.34.bb b/openembedded/packages/dbus/dbus_0.34.bb
deleted file mode 100644
index 35fed844e..000000000
--- a/openembedded/packages/dbus/dbus_0.34.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-include dbus.inc
-
-
-DEPENDS = "expat glib-2.0 virtual/libintl dbus-native"
-DEFAULT_PREFERENCE = "-1"
-SRC_URI_EXTRA = "file://no-introspect.patch;patch=1 file://no-bindings.patch;patch=1"
-
-FILES_${PN} += "${bindir}/dbus-daemon"
-FILES_${PN}-dev += "${bindir}/dbus-binding-tool"
-
-do_configure_prepend() {
-	install -m 0644 ${STAGING_DIR}/${BUILD_SYS}/share/dbus/dbus-bus-introspect.xml ${S}/tools/
-	install -m 0644 ${STAGING_DIR}/${BUILD_SYS}/share/dbus/dbus-glib-bindings.h ${S}/tools/
-}
diff --git a/openembedded/packages/dbus/dbus_0.36.bb b/openembedded/packages/dbus/dbus_0.36.bb
deleted file mode 100644
index a45396adb..000000000
--- a/openembedded/packages/dbus/dbus_0.36.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-include dbus.inc
-
-
-DEPENDS = "expat glib-2.0 virtual/libintl dbus-native"
-SRC_URI_EXTRA = " \
-    file://no-introspect.patch;patch=1 \
-    file://no-bindings.patch;patch=1 \
-    file://no-examples.patch;patch=1"
-
-FILES_${PN} += "${bindir}/dbus-daemon"
-FILES_${PN}-dev += "${bindir}/dbus-binding-tool"
-
-do_configure_prepend() {
-	install -m 0644 ${STAGING_DIR}/${BUILD_SYS}/share/dbus/dbus-bus-introspect.xml ${S}/tools/
-	install -m 0644 ${STAGING_DIR}/${BUILD_SYS}/share/dbus/dbus-glib-bindings.h ${S}/tools/
-}
diff --git a/openembedded/packages/settings-daemon/settings-daemon_svn.bb b/openembedded/packages/settings-daemon/settings-daemon_svn.bb
index 45b498da5..738ebd235 100644
--- a/openembedded/packages/settings-daemon/settings-daemon_svn.bb
+++ b/openembedded/packages/settings-daemon/settings-daemon_svn.bb
@@ -1,6 +1,7 @@
 DESCRIPTION = "Settings-daemon is a bridge between xst/gpe-confd and gconf"
 LICENSE = "GPL"
-DEPENDS = "gconf glib-2.0"
+DEPENDS = "gconf xst glib-2.0"
+SECTION = "gpe"
 
 SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \
 	   file://70settings-daemon"
@@ -9,10 +10,9 @@ S = "${WORKDIR}/${PN}"
 
 inherit autotools pkgconfig gettext
 
-FILES_${PN} = "${bindir} ${sysconfdir}"
+FILES_${PN} = 	"${bindir} ${sysconfdir}"
 
 do_install_append () {
 	install -d ${D}/${sysconfdir}/X11/Xsession.d
 	install -m 755 ${WORKDIR}/70settings-daemon ${D}/${sysconfdir}/X11/Xsession.d/
 }
-