merge of 325eef6ef0e12e5a9195df6e68307e029355d4bb

     and 62da1bc1858038e3bf6cd02fbd3e864b46a8d189

70 files changed, 1217 insertions, 172 deletions

diff --git a/conf/distro/openslug-packages.conf b/conf/distro/openslug-packages.conf
index 7f076a6c84..17755e35e9 100644
--- a/conf/distro/openslug-packages.conf
+++ b/conf/distro/openslug-packages.conf
@@ -11,8 +11,7 @@ ${PKGDIR}/packages/bash/*.bb \
 ${PKGDIR}/packages/bind/*.bb \
 ${PKGDIR}/packages/binutils/*.bb \
 ${PKGDIR}/packages/bison/*.bb \
-${PKGDIR}/packages/bluez-libs/*.bb \
-${PKGDIR}/packages/bluez-utils/*.bb \
+${PKGDIR}/packages/bluez/*.bb \
 ${PKGDIR}/packages/boost/*.bb \
 ${PKGDIR}/packages/bridge-utils/*.bb \
 ${PKGDIR}/packages/busybox/*.bb \
@@ -79,6 +78,7 @@ ${PKGDIR}/packages/libdvb/*.bb \
 ${PKGDIR}/packages/libexif/*.bb \
 ${PKGDIR}/packages/libgphoto2/*.bb \
 ${PKGDIR}/packages/libgsm/*.bb \
+${PKGDIR}/packages/libiconv/*.bb \
 ${PKGDIR}/packages/libid3tag/*.bb \
 ${PKGDIR}/packages/liblockfile/*.bb \
 ${PKGDIR}/packages/libmad/*.bb \
diff --git a/conf/distro/preferred-gpe-versions-2.7.inc b/conf/distro/preferred-gpe-versions-2.7.inc
index 6e6a07aa58..5919f351fb 100644
--- a/conf/distro/preferred-gpe-versions-2.7.inc
+++ b/conf/distro/preferred-gpe-versions-2.7.inc
@@ -39,7 +39,7 @@ PREFERRED_VERSION_xprop ?= "0.0cvs${CVSDATE}"
 PREFERRED_VERSION_xhost ?= "0.0cvs20040413"
 PREFERRED_VERSION_xrdb ?= "0.0cvs${CVSDATE}"
 PREFERRED_VERSION_gpe-login ?= "0.82"
-PREFERRED_VERSION_gpe-session-scripts ?= "0.65"
+PREFERRED_VERSION_gpe-session-scripts ?= "0.66"
 PREFERRED_VERSION_gpe-soundserver ?= "0.4-1"
 PREFERRED_VERSION_gpe-todo ?= "0.54"
 PREFERRED_VERSION_gpe-calendar ?= "0.65"
@@ -86,4 +86,7 @@ PREFERRED_VERSION_minimo ?= "0.0cvs${CVSDATE_minimo}"
 PREFERRED_VERSION_linphone-hh ?= "0.12.2.hh1"
 PREFERRED_VERSION_linphone ?= "0.12.2"
 PREFERRED_VERSION_firefox ?= "1.0"
+PREFERRED_VERSION_gaim ?= "2.0.0-cvs-mco1"
+PREFERRED_VERSION_poppler ?= "0.3.3"
+PREFERRED_VERSION_evince ?= "0.3.2"
 PREFERRED_VERSION_gpe_mini_browser ?= "0.15"
diff --git a/conf/distro/ucslugc-packages.conf b/conf/distro/ucslugc-packages.conf
index 5ecc44fb03..a45c396c8b 100644
--- a/conf/distro/ucslugc-packages.conf
+++ b/conf/distro/ucslugc-packages.conf
@@ -10,8 +10,7 @@ ${PKGDIR}/packages/bash/*.bb \
 ${PKGDIR}/packages/bind/*.bb \
 ${PKGDIR}/packages/binutils/*.bb \
 ${PKGDIR}/packages/bison/*.bb \
-${PKGDIR}/packages/bluez-libs/*.bb \
-${PKGDIR}/packages/bluez-utils/*.bb \
+${PKGDIR}/packages/bluez/*.bb \
 ${PKGDIR}/packages/boost/*.bb \
 ${PKGDIR}/packages/bridge-utils/*.bb \
 ${PKGDIR}/packages/busybox/*.bb \
@@ -102,7 +101,6 @@ ${PKGDIR}/packages/ncftp/*.bb \
 ${PKGDIR}/packages/ncurses/*.bb \
 ${PKGDIR}/packages/netbase/*.bb \
 ${PKGDIR}/packages/netpbm/*.bb \
-${PKGDIR}/packages/nslu2-binary-only/*.bb \
 ${PKGDIR}/packages/ntp/*.bb \
 ${PKGDIR}/packages/obexftp/*.bb \
 ${PKGDIR}/packages/openldap/*.bb \
@@ -136,7 +134,6 @@ ${PKGDIR}/packages/samba/*.bb \
 ${PKGDIR}/packages/sane-backends/*.bb \
 ${PKGDIR}/packages/sed/*.bb \
 ${PKGDIR}/packages/setpwc/*.bb \
-${PKGDIR}/packages/slugimage/*.bb \
 ${PKGDIR}/packages/strace/*.bb \
 ${PKGDIR}/packages/streamripper/*.bb \
 ${PKGDIR}/packages/sudo/*.bb \
@@ -148,7 +145,6 @@ ${PKGDIR}/packages/timezones/*.bb \
 ${PKGDIR}/packages/tinylogin/*.bb \
 ${PKGDIR}/packages/uclibc/*.bb \
 ${PKGDIR}/packages/unionfs/*.bb \
-${PKGDIR}/packages/unzip/*.bb \
 ${PKGDIR}/packages/update-modules/*.bb \
 ${PKGDIR}/packages/update-rc.d/*.bb \
 ${PKGDIR}/packages/util-linux/*.bb \
diff --git a/conf/distro/ucslugc.conf b/conf/distro/ucslugc.conf
index be2e54e917..9239e676c7 100644
--- a/conf/distro/ucslugc.conf
+++ b/conf/distro/ucslugc.conf
@@ -132,4 +132,6 @@ PREFERRED_VERSION_openslug-kernel ?= "2.6.12.2"
 PREFERRED_VERSION_ixp4xx-csr ?= "1.4"
 PREFERRED_VERSION_ixp425-eth ?= "1.1"
 
+PREFERRED_VERSION_samba ?= "3.0.14a"
+
 PREFERRED_VERSION_nslu2-linksys-firmware ?= "2.3r29"
diff --git a/conf/machine/ipaq-pxa270.conf b/conf/machine/ipaq-pxa270.conf
index 9e1b677ecf..0565b897b7 100644
--- a/conf/machine/ipaq-pxa270.conf
+++ b/conf/machine/ipaq-pxa270.conf
@@ -9,12 +9,14 @@ PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6"
 PREFERRED_VERSION_orinoco-modules = "0.15rc1"
 
 BOOTSTRAP_EXTRA_DEPENDS = "ipaq-boot-params"
-BOOTSTRAP_EXTRA_DEPENDS_append = " handhelds-pxa-2.6 udev modutils-collateral module-init-tools"
+BOOTSTRAP_EXTRA_DEPENDS_append = " handhelds-pxa-2.6 udev module-init-tools"
 
 BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params ${@linux_module_packages('${PXA270_MODULES}', d)}"
-BOOTSTRAP_EXTRA_RDEPENDS_append = " udev modutils-collateral module-init-tools"
+BOOTSTRAP_EXTRA_RDEPENDS_append = " udev module-init-tools"
 
-PXA270_MODULES = "g_ether pxa27x_udc"
+PXA270_MODULES = "g_ether g_file_storage g_serial pxa27x_udc \
+		  snd_pcm_oss snd_mixer_oss evdev mmc_block pcmcia hidp \
+		  nls_cp437 nls_utf8"
 
 SERIAL_CONSOLE = "115200 ttyS0"
 
@@ -29,5 +31,21 @@ GPE_EXTRA_INSTALL += "gaim sylpheed gpe-filemanager gpe-nmf evince"
 include conf/machine/tune-xscale.conf
 
 BOOTSTRAP_EXTRA_RDEPENDS += "${@linux_module_packages('${HX4700_MODULES}', d)}"
-HX4700_MODULES = "asic3_base asic3_mmc hx4700_bt hx4700_core hx4700_leds hx4700_navpt hx4700_pcmcia \
-                  hx4700_ts hx4700_wlan snd_pxa_i2sound_hx4700"
+HX4700_MODULES = "asic3_mmc hx4700_bt hx4700_leds hx4700_navpt hx4700_pcmcia \
+                  hx4700_ts hx4700_wlan snd_pxa_i2sound_hx4700 hx4700_power"
+
+module_autoload_hx4700_power = "hx4700_power"
+module_autoload_pcmcia = "pcmcia"
+module_autoload_hx4700_pcmcia = "hx4700_pcmcia"
+module_autoload_asic3_mmc = "asic3_mmc"
+module_autoload_mmc_block = "mmc_block"
+module_autoload_hx4700_ts = "hx4700_ts"
+module_autoload_hx4700_navpt = "hx4700_navpt"
+module_autoload_hx4700_bt = "hx4700_bt"
+module_autoload_snd-pxa-i2sound-hx4700 = "snd-pxa-i2sound-hx4700"
+module_autoload_snd-pcm-oss = "snd-pcm-oss"
+module_autoload_snd-pcm-oss = "snd-mixer-oss"
+module_autoload_pxa27x_udc = "pxa27x_udc"
+
+#FIXME: this should be controlled by a userspace utility later.
+module_autoload_g_ether = "g_ether"
diff --git a/files/device_table-openslug.txt b/files/device_table-openslug.txt
index b3ee0cb4dc..6cfc5fc5e0 100644
--- a/files/device_table-openslug.txt
+++ b/files/device_table-openslug.txt
@@ -27,7 +27,7 @@
 /dev/rbuttons	c	660	0	0	60	0	-	-	-
 /dev/rtc	c	644	0	0	10	135	-	-	-
 /dev/sda	b	664	0	0	8	0	-	-	-
-/dev/sda	b	664	0	0	8	1	1	1	5
+/dev/sda	b	664	0	0	8	1	1	1	10
 /dev/sdb	b	664	0	0	8	16	-	-	-
 /dev/sdb	b	664	0	0	8	17	1	1	5
 /dev/sdc	b	664	0	0	8	32	-	-	-
diff --git a/packages/avahi/avahi_0.2.bb b/packages/avahi/avahi_0.2.bb
index 00c4dbd599..8added4ed2 100644
--- a/packages/avahi/avahi_0.2.bb
+++ b/packages/avahi/avahi_0.2.bb
@@ -5,11 +5,10 @@ DEPENDS = "expat libdaemon dbus-0.34"
 RRECOMMENDS = "libnss-mdns"
 SECTION = "net"
 PRIORITY = "optional"
+PR = "r1"
 
 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.*"
@@ -35,10 +34,12 @@ inherit update-rc.d
 
 INITSCRIPT_PACKAGES = "avahi-daemon avahi-dnsconfd"
 INITSCRIPT_NAME_avahi-daemon = "avahi-daemon"
+INITSCRIPT_PARAMS_avahi-daemon = "defaults 21 19"
 INITSCRIPT_NAME_avahi-dnsconfd = "avahi-dnsconfd"
+INITSCRIPT_PARAMS_avahi-dnsconfd = "defaults 22 19"
 
 pkg_postinst_avahi-daemon () {
-	grep avahi /etc/passwd || adduser --disabled-password --system --home /var/run/avahi-daemon avahi
+	grep avahi /etc/passwd || adduser --disabled-password --system --home /var/run/avahi-daemon --no-create-home avahi -g Avahi
 }
 
 pkg_postrm_avahi-daemon () {
diff --git a/packages/e17/entrance/Xinit.d/.mtn2git_empty b/packages/bogofilter/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/e17/entrance/Xinit.d/.mtn2git_empty
+++ b/packages/bogofilter/.mtn2git_empty
diff --git a/packages/bogofilter/bogofilter-0.96.0/.mtn2git_empty b/packages/bogofilter/bogofilter-0.96.0/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/bogofilter/bogofilter-0.96.0/.mtn2git_empty
diff --git a/packages/bogofilter/bogofilter-0.96.0/configure.ac.patch b/packages/bogofilter/bogofilter-0.96.0/configure.ac.patch
new file mode 100644
index 0000000000..310eaaa16d
--- /dev/null
+++ b/packages/bogofilter/bogofilter-0.96.0/configure.ac.patch
@@ -0,0 +1,34 @@
+--- bogofilter-0.96.0/configure.ac.orig	2005-09-04 20:42:35.000000000 +0200
++++ bogofilter-0.96.0/configure.ac	2005-09-04 20:45:12.000000000 +0200
+@@ -460,6 +460,7 @@
+ 	dnl check if run-time link works
+ 	saveLIBS="$LIBS"
+ 	LIBS="$LIBS $LIBDB"
++	if test x$cross_compiling = xNO ; then
+ 	AC_MSG_CHECKING(if a program can be linked against Berkeley DB and run)
+ 	AC_RUN_IFELSE(
+ 	AC_LANG_PROGRAM([[
+@@ -500,6 +501,7 @@
+ 		   [AC_MSG_RESULT(no)
+ 		   AC_MSG_ERROR(db.h header file and db library version do not match.)],)
+ 	AC_MSG_RESULT(yes)
++	fi
+ 	AC_CHECK_DECLS(db_create,,
+ 	       AC_MSG_ERROR([[Can not locate a suitable Berkeley DB db.h header file.
+ Use --with-libdb-prefix=PATH to specify the path to a v3+ install directory.
+@@ -509,6 +511,7 @@
+ #endif
+ #include <db.h>]]
+ 	)
++	if test x$cross_compiling = xNO ; then
+ 	AC_MSG_CHECKING(if Berkeley DB supports shared environments)
+ 	if test "x$enable_dbshared_test" != xno && test "x$USE_TRANSACTIONS" != xNO ; then
+ 	AC_RUN_IFELSE(
+@@ -548,6 +551,7 @@
+     else
+ 	AC_MSG_RESULT(skipped)
+     fi
++	fi
+ 
+ 	AC_DEFINE(ENABLE_DB_DATASTORE,1, [Enable Berkeley DB datastore])
+ 	LIBS="$saveLIBS"
diff --git a/packages/bogofilter/bogofilter_0.96.0.bb b/packages/bogofilter/bogofilter_0.96.0.bb
new file mode 100644
index 0000000000..e552f1b8bd
--- /dev/null
+++ b/packages/bogofilter/bogofilter_0.96.0.bb
@@ -0,0 +1,17 @@
+SECTION = "console/network"
+DEPENDS = "db3"
+DESCRIPTION = "Bogofilter is a mail filter that classifies mail as spam or ham (non-spam) \
+by a statistical analysis of the message's header and content (body). \
+The program is able to learn from the user's classifications and corrections."
+LICENSE = "GPL"
+PR = "r1"
+PRIORITY = "optional"
+
+SRC_URI = "http://download.sourceforge.net/bogofilter/bogofilter-${PV}.tar.bz2 \
+           file://${FILESDIR}/configure.ac.patch;patch=1 \
+	   "
+
+inherit autotools
+
+EXTRA_OECONF = "--with-libdb-prefix=${libdir}"
+
diff --git a/packages/dbh/dbh_1.0-18.bb b/packages/dbh/dbh_1.0-18.bb
index 65ea98ca75..a84bd95dd4 100644
--- a/packages/dbh/dbh_1.0-18.bb
+++ b/packages/dbh/dbh_1.0-18.bb
@@ -1,15 +1,13 @@
-SECTION = "devel"
-# cramfs-native OE build file
 # Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
 # Released under the MIT license (see packages/COPYING)
+DESCRIPTION ="Disk based hashes is a method to create multidimensional binary trees on disk."
+HOMEPAGE = "http://dbh.sourceforge.net"
+LICENSE = "GPL"
+SECTION = "libs"
+SRC_URI = "${SOURCEFORGE_MIRROR}/dbh/dbh_${PV}.tar.bz2 \
+	   file://${FILESDIR}/configure.patch;patch=1"
 
-DESCRIPTION="Disk based hashes is a method to create multidimensional binary trees on disk."
-HOMEPAGE="http://dbh.sourceforge.net"
-LICENSE="QPL"
-SRC_URI="${SOURCEFORGE_MIRROR}/dbh/${PN}_${PV}.tar.bz2 \
-	file://${FILESDIR}/configure.patch;patch=1"
-
-S="${WORKDIR}/${PN}_${PV}"
+S="${WORKDIR}/dbh_${PV}"
 
 inherit autotools pkgconfig
 
@@ -18,6 +16,5 @@ do_stage() {
 	install -m 644 src/dbh_functions.h ${STAGING_INCDIR}
 	install -m 644 src/dbh.h ${STAGING_INCDIR}
 
-	oe_soinstall src/.libs/libdbh-1.0.so.1.0.0 ${STAGING_LIBDIR}
-	ln -s ${STAGING_LIBDIR}/libdbh-1.0.so.1.0.0 ${STAGING_LIBDIR}/libdbh.so
+	oe_libinstall -C src/.libs libdbh-1.0 ${STAGING_LIBDIR}
 }
diff --git a/packages/dbus/dbus-0.34/.mtn2git_empty b/packages/dbus/dbus-0.34/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/dbus/dbus-0.34/.mtn2git_empty
diff --git a/packages/dbus/dbus-0.34/dbus-1.init b/packages/dbus/dbus-0.34/dbus-1.init
new file mode 100644
index 0000000000..60440b7223
--- /dev/null
+++ b/packages/dbus/dbus-0.34/dbus-1.init
@@ -0,0 +1,86 @@
+#! /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
+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/packages/e17/entrance/Xinit.d/99entrance b/packages/e17/entrance/Xinit.d/99entrance
deleted file mode 100644
index 297cc909fe..0000000000
--- a/packages/e17/entrance/Xinit.d/99entrance
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-entrance
-
diff --git a/packages/e17/entrance/set-display-env.patch b/packages/e17/entrance/set-display-env.patch
new file mode 100644
index 0000000000..37bfc1c2c8
--- /dev/null
+++ b/packages/e17/entrance/set-display-env.patch
@@ -0,0 +1,11 @@
+diff -Nur entrance~/src/daemon/spawner.c entrance/src/daemon/spawner.c
+--- entrance~/src/daemon/spawner.c	2005-09-02 14:00:29.000000000 -0700
++++ entrance/src/daemon/spawner.c	2005-09-02 15:53:31.000000000 -0700
+@@ -199,6 +199,7 @@
+       free(d->client.homedir);
+    d->client.homedir = NULL;
+ 
++   setenv("DISPLAY", d->name, 1);
+    snprintf(entrance_cmd, PATH_MAX, "%s -d %s", ENTRANCE, d->name);
+    if (d->config)
+       snprintf(entrance_cmd, PATH_MAX, "%s -d %s -c \"%s\" -z %d", 
diff --git a/packages/e17/entrance_20050810.bb b/packages/e17/entrance_20050810.bb
index 8a7a08b881..1c27111f49 100644
--- a/packages/e17/entrance_20050810.bb
+++ b/packages/e17/entrance_20050810.bb
@@ -3,11 +3,11 @@ SECTION = "e/apps"
 LICENSE = "MIT"
 # can also use pam and crypt
 DEPENDS = "edb edb-native evas-x11 ecore-x11 edje esmart-x11 bash keylaunch detect-stylus xserver-common"
-RDEPENDS += "bash keylaunch detect-stylus x11-common glibc-gconv-iso8859-1"
+RDEPENDS += "bash keylaunch detect-stylus xserver-common glibc-gconv-iso8859-1"
 HOMEPAGE = "http://www.enlightenment.org"
 MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
 CVSDATE = "${PV}"
-PR = "r6"
+PR = "r9"
 
 SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/apps/entrance \
            file://Xserver.patch;patch=1 \
@@ -15,7 +15,7 @@ SRC_URI = "cvs://anonymous@cvs