merge of '16141cfb7ddd939f1759a94546b737b35c0ece43'

     and 'c77de7a09c5852f1bfe63afbd011ef701c76bdf6'

66 files changed, 688 insertions, 243 deletions

diff --git a/classes/qt3x11.bbclass b/classes/qt3x11.bbclass
index 24e824d06f..95ed4f538a 100644
--- a/classes/qt3x11.bbclass
+++ b/classes/qt3x11.bbclass
@@ -11,5 +11,5 @@ export OE_QMAKE_INCDIR_QT = "${QTDIR}/include"
 export OE_QMAKE_LIBDIR_QT = "${QTDIR}/lib"
 export OE_QMAKE_LIBS_QT = "qt"
 export OE_QMAKE_LIBS_X11 = "-lXext -lX11 -lm"
-
-
+export OE_QMAKE_LIBS_OPENGL = "-lGLU -lGL -lXmu"
+export OE_QMAKE_LIBS_OPENGL_QT = "-lGL -lXmu"
diff --git a/classes/xfce.bbclass b/classes/xfce.bbclass
index 793348597f..8124dc877c 100644
--- a/classes/xfce.bbclass
+++ b/classes/xfce.bbclass
@@ -7,7 +7,13 @@
 HOMEPAGE = "http://www.xfce.org"
 LICENSE = "LGPL-2"
 
-SRC_URI = "http://www.us.xfce.org/archive/xfce-${PV}/src/${PN}-${PV}.tar.gz"
+def xfce_extension(ver):
+	ext = "gz"
+	if ver == "4.3.99.2":
+		ext = "bz2"
+	return ext
+
+SRC_URI = "http://www.us.xfce.org/archive/xfce-${PV}/src/${PN}-${PV}.tar.${@xfce_extension("${PV}")}"
 
 inherit autotools
 
diff --git a/classes/xorg-module.bbclass b/classes/xorg-module.bbclass
new file mode 100644
index 0000000000..135ca31c16
--- /dev/null
+++ b/classes/xorg-module.bbclass
@@ -0,0 +1,31 @@
+python populate_packages_prepend () {
+	import re, os.path
+
+	new_packages = []
+
+	def the_hook(file, pkg, pattern, format, basename):
+		new_packages.append(pkg)
+
+	do_split_packages(d, root=bb.data.expand('${libdir}/xorg/modules/drivers', d), file_regex='(.*)_drv\.so', output_pattern='xorg-driver-%s', description='xorg %s driver', extra_depends='xserver-xorg', hook=the_hook)
+
+	packages = bb.data.getVar('PACKAGES', d, 1).split()
+
+	so_to_la_re = "\.so$"
+
+	# fish out any debug or devel files corresponding to the new packages
+	for p in new_packages:
+		packages.append("%s-dbg" % p)
+		packages.append("%s-dev" % p)
+
+		files = bb.data.getVar("FILES_%s" % p, d).split()
+		dev_files = []
+		dbg_files = []
+		for f in files:
+			dev_files.append(re.sub(so_to_la_re, ".la", f))
+			(dir, file) = os.path.split(f)
+			dbg_files.append(os.path.join(dir, ".debug", file))
+		bb.data.setVar("FILES_%s-dbg" % p, " ".join(dbg_files), d)
+		bb.data.setVar("FILES_%s-dev" % p, " ".join(dev_files), d)
+	
+	bb.data.setVar('PACKAGES', ' '.join(packages), d)
+}
diff --git a/packages/ruby/ruby-1.8.5/.mtn2git_empty b/packages/alsa/alsa-lib/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/ruby/ruby-1.8.5/.mtn2git_empty
+++ b/packages/alsa/alsa-lib/.mtn2git_empty
diff --git a/packages/alsa/alsa-lib/fix-tstamp-declaration.patch b/packages/alsa/alsa-lib/fix-tstamp-declaration.patch
new file mode 100644
index 0000000000..59b3b6d150
--- /dev/null
+++ b/packages/alsa/alsa-lib/fix-tstamp-declaration.patch
@@ -0,0 +1,13 @@
+Index: alsa-lib-1.0.13/include/global.h
+===================================================================
+--- alsa-lib-1.0.13.orig/include/global.h
++++ alsa-lib-1.0.13/include/global.h
+@@ -29,6 +29,8 @@
+ #define __ALSA_GLOBAL_H_
+ 
+ /* for timeval and timespec */
++#define __need_timeval
++#define __need_timespec
+ #include <time.h>
+ 
+ #ifdef __cplusplus
diff --git a/packages/alsa/alsa-lib_1.0.13.bb b/packages/alsa/alsa-lib_1.0.13.bb
index 987a5901f4..8b6b7af409 100644
--- a/packages/alsa/alsa-lib_1.0.13.bb
+++ b/packages/alsa/alsa-lib_1.0.13.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Alsa sound library"
 HOMEPAGE = "http://www.alsa-project.org"
 SECTION = "libs/multimedia"
 LICENSE = "GPL"
-PR = "r0"
+PR = "r1"
 
 # configure.in sets -D__arm__ on the command line for any arm system
 # (not just those with the ARM instruction set), this should be removed,
@@ -10,7 +10,8 @@ PR = "r0"
 #FIXME: remove the following
 ARM_INSTRUCTION_SET = "arm"
 
-SRC_URI = "ftp://ftp.alsa-project.org/pub/lib/alsa-lib-${PV}.tar.bz2"
+SRC_URI = "ftp://ftp.alsa-project.org/pub/lib/alsa-lib-${PV}.tar.bz2 \
+           file://fix-tstamp-declaration.patch;patch=1"
 
 inherit autotools pkgconfig
 
diff --git a/packages/angstrom/task-angstrom-x11.bb b/packages/angstrom/task-angstrom-x11.bb
index c7ac97d2e5..95fb0cf0c6 100644
--- a/packages/angstrom/task-angstrom-x11.bb
+++ b/packages/angstrom/task-angstrom-x11.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Task packages for the Angstrom distribution"
-PR = "r26"
+PR = "r27"
 ALLOW_EMPTY = "1"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
@@ -52,6 +52,7 @@ RDEPENDS_angstrom-gpe-task-base := "\
     pango-module-basic-x \
     pango-module-basic-fc \
     ${@base_contains("COMBINED_FEATURES", "bluetooth", "gpe-bluetooth", "",d)} \
+    ${@base_contains("COMBINED_FEATURES", "bluetooth", "bluez-gnome", "",d)} \
     "
 
 RDEPENDS_angstrom-gpe-task-pim := "\
diff --git a/packages/bogofilter/bogofilter_0.96.0.bb b/packages/bogofilter/bogofilter_0.96.0.bb
index dba0893b2b..72cec9be3c 100644
--- a/packages/bogofilter/bogofilter_0.96.0.bb
+++ b/packages/bogofilter/bogofilter_0.96.0.bb
@@ -5,7 +5,7 @@ DESCRIPTION = "Bogofilter is a mail filter that classifies mail as spam or ham (
 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 = "r6"
+PR = "r7"
 PRIORITY = "optional"
 
 SRC_URI = "http://download.sourceforge.net/bogofilter/bogofilter-${PV}.tar.bz2 \
diff --git a/packages/bogofilter/files/volatiles b/packages/bogofilter/files/volatiles
index 04960ff2d3..f460c91fea 100644
--- a/packages/bogofilter/files/volatiles
+++ b/packages/bogofilter/files/volatiles
@@ -1 +1 @@
-d spam filter 0770 /var/spool/filter
+d spam filter 0770 /var/spool/filter none
diff --git a/packages/busybox/busybox_1.3.1.bb b/packages/busybox/busybox_1.3.1.bb
index b04cd86677..a42a87c50d 100644
--- a/packages/busybox/busybox_1.3.1.bb
+++ b/packages/busybox/busybox_1.3.1.bb
@@ -1,7 +1,6 @@
 require busybox.inc
 
 DEFAULT_PREFERENCE = "-1"
-DEFAULT_PREFERENCE_slugos = "1"
 
 SRC_URI = "file://defconfig"
 
diff --git a/packages/cyrus-imapd/cyrus-imapd_2.2.12.bb b/packages/cyrus-imapd/cyrus-imapd_2.2.12.bb
index 14fb728304..e72253d4eb 100644
--- a/packages/cyrus-imapd/cyrus-imapd_2.2.12.bb
+++ b/packages/cyrus-imapd/cyrus-imapd_2.2.12.bb
@@ -1,7 +1,7 @@
 SECTION = "console/network"
 DEPENDS = "cyrus-sasl virtual/db"
 LICENSE = "BSD"
-PR = "r9"
+PR = "r10"
 DEPENDS += "install-native"
 
 SRC_URI = "ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-imapd-${PV}.tar.gz \
diff --git a/packages/cyrus-imapd/files/volatiles b/packages/cyrus-imapd/files/volatiles
index e0a55493b3..a95841c53c 100644
--- a/packages/cyrus-imapd/files/volatiles
+++ b/packages/cyrus-imapd/files/volatiles
@@ -1,63 +1,63 @@
-d cyrus mail 0755 /var/lib/cyrus
-d cyrus root 0755 /var/lib/cyrus/db
-d cyrus mail 0755 /var/lib/cyrus/proc
-d cyrus mail 0755 /var/lib/cyrus/sieve
+d cyrus mail 0755 /var/lib/cyrus none
+d cyrus root 0755 /var/lib/cyrus/db none
+d cyrus mail 0755 /var/lib/cyrus/proc none
+d cyrus mail 0755 /var/lib/cyrus/sieve none
 # if only i could: d cyrus mail 0755 /var/lib/cyrus/sieve/{a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z}
-d cyrus mail 0755 /var/lib/cyrus/sieve/a
-d cyrus mail 0755 /var/lib/cyrus/sieve/b
-d cyrus mail 0755 /var/lib/cyrus/sieve/c
-d cyrus mail 0755 /var/lib/cyrus/sieve/d
-d cyrus mail 0755 /var/lib/cyrus/sieve/e
-d cyrus mail 0755 /var/lib/cyrus/sieve/f
-d cyrus mail 0755 /var/lib/cyrus/sieve/g
-d cyrus mail 0755 /var/lib/cyrus/sieve/h
-d cyrus mail 0755 /var/lib/cyrus/sieve/i
-d cyrus mail 0755 /var/lib/cyrus/sieve/j
-d cyrus mail 0755 /var/lib/cyrus/sieve/k
-d cyrus mail 0755 /var/lib/cyrus/sieve/l
-d cyrus mail 0755 /var/lib/cyrus/sieve/m
-d cyrus mail 0755 /var/lib/cyrus/sieve/n
-d cyrus mail 0755 /var/lib/cyrus/sieve/o
-d cyrus mail 0755 /var/lib/cyrus/sieve/p
-d cyrus mail 0755 /var/lib/cyrus/sieve/q
-d cyrus mail 0755 /var/lib/cyrus/sieve/r
-d cyrus mail 0755 /var/lib/cyrus/sieve/s
-d cyrus mail 0755 /var/lib/cyrus/sieve/t
-d cyrus mail 0755 /var/lib/cyrus/sieve/u
-d cyrus mail 0755 /var/lib/cyrus/sieve/v
-d cyrus mail 0755 /var/lib/cyrus/sieve/w
-d cyrus mail 0755 /var/lib/cyrus/sieve/x
-d cyrus mail 0755 /var/lib/cyrus/sieve/y
-d cyrus mail 0755 /var/lib/cyrus/sieve/z
-d cyrus root 0755 /var/lib/cyrus/socket
-d cyrus mail 0755 /var/lib/cyrus/user
+d cyrus mail 0755 /var/lib/cyrus/sieve/a none
+d cyrus mail 0755 /var/lib/cyrus/sieve/b none
+d cyrus mail 0755 /var/lib/cyrus/sieve/c none
+d cyrus mail 0755 /var/lib/cyrus/sieve/d none
+d cyrus mail 0755 /var/lib/cyrus/sieve/e none
+d cyrus mail 0755 /var/lib/cyrus/sieve/f none
+d cyrus mail 0755 /var/lib/cyrus/sieve/g none
+d cyrus mail 0755 /var/lib/cyrus/sieve/h none
+d cyrus mail 0755 /var/lib/cyrus/sieve/i none
+d cyrus mail 0755 /var/lib/cyrus/sieve/j none
+d cyrus mail 0755 /var/lib/cyrus/sieve/k none
+d cyrus mail 0755 /var/lib/cyrus/sieve/l none
+d cyrus mail 0755 /var/lib/cyrus/sieve/m none
+d cyrus mail 0755 /var/lib/cyrus/sieve/n none
+d cyrus mail 0755 /var/lib/cyrus/sieve/o none
+d cyrus mail 0755 /var/lib/cyrus/sieve/p none
+d cyrus mail 0755 /var/lib/cyrus/sieve/q none
+d cyrus mail 0755 /var/lib/cyrus/sieve/r none
+d cyrus mail 0755 /var/lib/cyrus/sieve/s none
+d cyrus mail 0755 /var/lib/cyrus/sieve/t none
+d cyrus mail 0755 /var/lib/cyrus/sieve/u none
+d cyrus mail 0755 /var/lib/cyrus/sieve/v none
+d cyrus mail 0755 /var/lib/cyrus/sieve/w none
+d cyrus mail 0755 /var/lib/cyrus/sieve/x none
+d cyrus mail 0755 /var/lib/cyrus/sieve/y none
+d cyrus mail 0755 /var/lib/cyrus/sieve/z none
+d cyrus root 0755 /var/lib/cyrus/socket none
+d cyrus mail 0755 /var/lib/cyrus/user none
 # if only i could: d cyrus mail 0755 /var/lib/cyrus/user/{a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z}
-d cyrus mail 0755 /var/lib/cyrus/user/a
-d cyrus mail 0755 /var/lib/cyrus/user/b
-d cyrus mail 0755 /var/lib/cyrus/user/c
-d cyrus mail 0755 /var/lib/cyrus/user/d
-d cyrus mail 0755 /var/lib/cyrus/user/e
-d cyrus mail 0755 /var/lib/cyrus/user/f
-d cyrus mail 0755 /var/lib/cyrus/user/g
-d cyrus mail 0755 /var/lib/cyrus/user/h
-d cyrus mail 0755 /var/lib/cyrus/user/i
-d cyrus mail 0755 /var/lib/cyrus/user/j
-d cyrus mail 0755 /var/lib/cyrus/user/k
-d cyrus mail 0755 /var/lib/cyrus/user/l
-d cyrus mail 0755 /var/lib/cyrus/user/m
-d cyrus mail 0755 /var/lib/cyrus/user/n
-d cyrus mail 0755 /var/lib/cyrus/user/o
-d cyrus mail 0755 /var/lib/cyrus/user/p
-d cyrus mail 0755 /var/lib/cyrus/user/q
-d cyrus mail 0755 /var/lib/cyrus/user/r
-d cyrus mail 0755 /var/lib/cyrus/user/s
-d cyrus mail 0755 /var/lib/cyrus/user/t
-d cyrus mail 0755 /var/lib/cyrus/user/u
-d cyrus mail 0755 /var/lib/cyrus/user/v
-d cyrus mail 0755 /var/lib/cyrus/user/w
-d cyrus mail 0755 /var/lib/cyrus/user/x
-d cyrus mail 0755 /var/lib/cyrus/user/y
-d cyrus mail 0755 /var/lib/cyrus/user/z
-d root root 0755 /var/spool/cyrus
-d cyrus mail 0750 /var/spool/cyrus/mail
-d cyrus mail 0750 /var/spool/cyrus/news
+d cyrus mail 0755 /var/lib/cyrus/user/a none
+d cyrus mail 0755 /var/lib/cyrus/user/b none
+d cyrus mail 0755 /var/lib/cyrus/user/c none
+d cyrus mail 0755 /var/lib/cyrus/user/d none
+d cyrus mail 0755 /var/lib/cyrus/user/e none
+d cyrus mail 0755 /var/lib/cyrus/user/f none
+d cyrus mail 0755 /var/lib/cyrus/user/g none
+d cyrus mail 0755 /var/lib/cyrus/user/h none
+d cyrus mail 0755 /var/lib/cyrus/user/i none
+d cyrus mail 0755 /var/lib/cyrus/user/j none
+d cyrus mail 0755 /var/lib/cyrus/user/k none
+d cyrus mail 0755 /var/lib/cyrus/user/l none
+d cyrus mail 0755 /var/lib/cyrus/user/m none
+d cyrus mail 0755 /var/lib/cyrus/user/n none
+d cyrus mail 0755 /var/lib/cyrus/user/o none
+d cyrus mail 0755 /var/lib/cyrus/user/p none
+d cyrus mail 0755 /var/lib/cyrus/user/q none
+d cyrus mail 0755 /var/lib/cyrus/user/r none
+d cyrus mail 0755 /var/lib/cyrus/user/s none
+d cyrus mail 0755 /var/lib/cyrus/user/t none
+d cyrus mail 0755 /var/lib/cyrus/user/u none
+d cyrus mail 0755 /var/lib/cyrus/user/v none
+d cyrus mail 0755 /var/lib/cyrus/user/w none
+d cyrus mail 0755 /var/lib/cyrus/user/x none
+d cyrus mail 0755 /var/lib/cyrus/user/y none
+d cyrus mail 0755 /var/lib/cyrus/user/z none
+d root root 0755 /var/spool/cyrus none
+d cyrus mail 0750 /var/spool/cyrus/mail none
+d cyrus mail 0750 /var/spool/cyrus/news none
diff --git a/packages/davfs2/davfs2_0.2.8.bb b/packages/davfs2/davfs2_0.2.8.bb
index ecb7034042..e49c4af424 100644
--- a/packages/davfs2/davfs2_0.2.8.bb
+++ b/packages/davfs2/davfs2_0.2.8.bb
@@ -6,7 +6,7 @@ DEPENDS = "neon-0.25.5"
 RDEPENDS_${PN} = "kernel-module-coda"
 LICENSE = "GPL"
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/dav/${P}.tar.gz \
            file://Makefile.in.patch;patch=1 \
diff --git a/packages/davfs2/files/volatiles b/packages/davfs2/files/volatiles
index 51405429d1..169fda7c3d 100644
--- a/packages/davfs2/files/volatiles
+++ b/packages/davfs2/files/volatiles
@@ -1 +1 @@
-d root users 0775 /var/run/mount.davfs
+d root users 0775 /var/run/mount.davfs none
diff --git a/packages/ezx/opentapi_svn.bb b/packages/ezx/opentapi_svn.bb
index a617f5b45b..ad42b0868b 100644
--- a/packages/ezx/opentapi_svn.bb
+++ b/packages/ezx/opentapi_svn.bb
@@ -2,6 +2,7 @@ DESCRIPTION = "Open implementation of motorola's tapisrc"
 LICENSE = "GPLv2"
 
 PV = "0.0+svn${SRCDATE}"
+PR = "r1"
 
 SRC_URI = "svn://svn.openezx.org/trunk/src/userspace/;module=opentapi;proto=http \
            file://opentapi.init \
@@ -10,7 +11,7 @@ SRC_URI = "svn://svn.openezx.org/trunk/src/userspace/;module=opentapi;proto=http
 inherit update-rc.d
 
 INITSCRIPT_NAME = "opentapi"
-INITSCRIPT_PARAMS = "defaults"
+INITSCRIPT_PARAMS = "start 04 S ."
 
 
 S = "${WORKDIR}/${PN}"
diff --git a/packages/initscripts/initscripts-1.0/populate-volatile.sh b/packages/initscripts/initscripts-1.0/populate-volatile.sh
index c5692fea7f..3bb3d94de6 100755
--- a/packages/initscripts/initscripts-1.0/populate-volatile.sh
+++ b/packages/initscripts/initscripts-1.0/populate-volatile.sh
@@ -114,7 +114,6 @@ apply_cfgfile() {
   cat ${CFGFILE} | grep -v "^#" | \
   while read LINE; do
 
-    # This is a hell of a lot faster than using cut or awk 5 times
     eval `echo "$LINE" | sed -n "s/\(.*\)\ \(.*\) \(.*\)\ \(.*\)\ \(.*\)\ \(.*\)/TTYPE=\1 ; TUSER=\2; TGROUP=\3; TMODE=\4; TNAME=\5 TLTARGET=\6/p"`
 
     [ "${VERBOSE}" != "no" ] && echo "Checking for -${TNAME}-."
diff --git a/packages/initscripts/initscripts-1.0/volatiles b/packages/initscripts/initscripts-1.0/volatiles
index 2bc7d82fbd..4320485663 100644
--- a/packages/initscripts/initscripts-1.0/volatiles
+++ b/packages/initscripts/initscripts-1.0/volatiles
@@ -3,14 +3,14 @@
 #
 # Every line must either be a comment starting with #
 # or a definition of format:
-# <type> <owner> <group> <mode> <path> [<linksource>]
+# <type> <owner> <group> <mode> <path> <linksource>
 # where the items are separated by whitespace !
 #
 # <type> : d|f|l : (d)irectory|(f)ile|(l)ink
 #
 # A linking example:
 # l root root 0777 /var/test /tmp/testfile
-# f root root 0644 /var/test
+# f root root 0644 /var/test none
 #
 # Understanding links:
 # When populate-volatile is to verify/create a directory or file, it will first
diff --git a/packages/lame/lame/Makefile-lm.patch b/packages/lame/lame/Makefile-lm.patch
new file mode 100644
index 0000000000..cbbb1706ce
--- /dev/null
+++ b/packages/lame/lame/Makefile-lm.patch
@@ -0,0 +1,22 @@
+--- lame-3.96.1/libmp3lame/Makefile.am.old	2007-01-16 13:41:48.000000000 +0000
++++ lame-3.96.1/libmp3lame/Makefile.am	2007-01-16 13:41:53.000000000 +0000
+@@ -18,7 +18,7 @@
+ decoder_ldadd =
+ endif
+ 
+-libmp3lame_la_LIBADD = $(nasm_ldadd) $(decoder_ldadd)
++libmp3lame_la_LIBADD = $(nasm_ldadd) $(decoder_ldadd) -lm
+ libmp3lame_la_LDFLAGS = -version-info @LIB_MAJOR_VERSION@:@LIB_MINOR_VERSION@ \
+ 			-no-undefined
+ 
+--- lame-3.96.1/libmp3lame/Makefile.in.old	2007-01-16 13:47:17.000000000 +0000
++++ lame-3.96.1/libmp3lame/Makefile.in	2007-01-16 13:47:29.000000000 +0000
+@@ -177,7 +177,7 @@
+ @LIB_WITH_DECODER_TRUE@decoder_ldadd = $(top_builddir)/mpglib/libmpgdecoder.la
+ @LIB_WITH_DECODER_FALSE@decoder_ldadd = 
+ 
+-libmp3lame_la_LIBADD = $(nasm_ldadd) $(de