merge of 5180d45d06f92e034b4c024f4f52e16d157aa0d9

     and 596b10cd24c63dccc9c168ee841040c9f8615e50

40 files changed, 139 insertions, 611 deletions

diff --git a/conf/distro/angstrom-2006.9.conf b/conf/distro/angstrom-2006.9.conf
index 2ff6e61e65..850b2e5f00 100644
--- a/conf/distro/angstrom-2006.9.conf
+++ b/conf/distro/angstrom-2006.9.conf
@@ -18,7 +18,7 @@ DISTRO_TYPE = "debug"
 
 
 FEED_URIS += " \
-		 base##${ANGSTROM_URI}/unstable/feed/base/"
+		 base##${ANGSTROM_URI}/unstable/feed/base"
 #        base##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/base \
 #        ${MACHINE}##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/${MACHINE} \
 #        updates##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/updates"
diff --git a/conf/distro/angstrom.conf b/conf/distro/angstrom.conf
index b368405939..13ac2b16bf 100644
--- a/conf/distro/angstrom.conf
+++ b/conf/distro/angstrom.conf
@@ -6,7 +6,7 @@ DISTRO = "angstrom"
 DISTRO_NAME = "Angstrom"
 
 #Use this variable in feeds and other parts that need a URI
-ANGSTROM_URI = "http://www.angstrom-distribution.org/"
+ANGSTROM_URI = "http://www.angstrom-distribution.org"
 
 #Set the default maintainer to angstrom-dev
 MAINTAINER = "Angstrom Developers <angstrom-dev@handhelds.org>"
diff --git a/packages/alsa/alsa-driver_0.9.6-hh4c.bb b/packages/alsa/alsa-driver_0.9.6-hh4c.bb
index dc84f17a3c..97d3f9ac31 100644
--- a/packages/alsa/alsa-driver_0.9.6-hh4c.bb
+++ b/packages/alsa/alsa-driver_0.9.6-hh4c.bb
@@ -1,3 +1,6 @@
+# needs a gcc4 fix
+BROKEN = "1"
+
 DESCRIPTION = "Alsa Drivers"
 MAINTAINER = "Pigi"
 SECTION = "base"
diff --git a/packages/alsa/alsa-lib_1.0.10.bb b/packages/alsa/alsa-lib_1.0.10.bb
deleted file mode 100644
index a5d5426316..0000000000
--- a/packages/alsa/alsa-lib_1.0.10.bb
+++ /dev/null
@@ -1,31 +0,0 @@
-DESCRIPTION = "Alsa sound library"
-MAINTAINER = "Lorn Potter <lpotter@trolltech.com>"
-SECTION = "libs/multimedia"
-LICENSE = "GPL"
-
-# 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,
-# (or replaced by a permitted #define).
-#FIXME: remove the following
-ARM_INSTRUCTION_SET = "arm"
-
-SRC_URI = "ftp://ftp.alsa-project.org/pub/lib/alsa-lib-${PV}.tar.bz2"
-
-inherit autotools pkgconfig
-
-EXTRA_OECONF = "--with-cards=pdaudiocf --with-oss=yes"
-
-do_stage () {
-	oe_libinstall -so -C src libasound ${STAGING_LIBDIR}/
-	install -d ${STAGING_INCDIR}/alsa/sound
-	install -m 0644 include/*.h ${STAGING_INCDIR}/alsa/
-	install -m 0644 include/sound/ainstr*.h ${STAGING_INCDIR}/alsa/sound/
-	install -d ${STAGING_DATADIR}/aclocal
-	install -m 0644 utils/alsa.m4 ${STAGING_DATADIR}/aclocal/
-}
-
-PACKAGES = "libasound alsa-server alsa-conf alsa-doc alsa-dev"
-FILES_libasound = "${libdir}/libasound.so*"
-FILES_alsa-server = "${bindir}"
-FILES_alsa-conf = "${datadir}"
-FILES_alsa-dev = "${libdir}/pkgconfig/ /usr/include/"
diff --git a/packages/alsa/alsa-lib_1.0.11.bb b/packages/alsa/alsa-lib_1.0.11.bb
index 5075db6273..0da364071b 100644
--- a/packages/alsa/alsa-lib_1.0.11.bb
+++ b/packages/alsa/alsa-lib_1.0.11.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Alsa sound library"
-MAINTAINER = "Lorn Potter <lpotter@trolltech.com>"
+HOMEPAGE = "http://www.alsa-project.org"
 SECTION = "libs/multimedia"
 LICENSE = "GPL"
 PR = "r0"
@@ -16,7 +16,7 @@ inherit autotools pkgconfig
 
 EXTRA_OECONF = "--with-cards=pdaudiocf --with-oss=yes"
 
-do_stage () {
+do_stage() {
 	oe_libinstall -so -C src libasound ${STAGING_LIBDIR}/
 	install -d ${STAGING_INCDIR}/alsa/sound
 	install -m 0644 include/*.h ${STAGING_INCDIR}/alsa/
diff --git a/packages/alsa/alsa-lib_1.0.8.bb b/packages/alsa/alsa-lib_1.0.8.bb
deleted file mode 100644
index 3b926b4853..0000000000
--- a/packages/alsa/alsa-lib_1.0.8.bb
+++ /dev/null
@@ -1,33 +0,0 @@
-DESCRIPTION = "Alsa sound library"
-MAINTAINER = "Lorn Potter <lpotter@trolltech.com>"
-SECTION = "libs/multimedia"
-LICENSE = "GPL"
-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,
-# (or replaced by a permitted #define).
-#FIXME: remove the following
-ARM_INSTRUCTION_SET = "arm"
-
-SRC_URI = "ftp://ftp.alsa-project.org/pub/lib/alsa-lib-${PV}.tar.bz2"
-
-inherit autotools pkgconfig
-
-EXTRA_OECONF = "--with-cards=pdaudiocf --with-oss=yes"
-
-do_stage () {
-	oe_libinstall -so -C src libasound ${STAGING_LIBDIR}/
-	install -d ${STAGING_INCDIR}/alsa/sound
-	install -m 0644 include/*.h ${STAGING_INCDIR}/alsa/
-	install -m 0644 include/sound/ainstr*.h ${STAGING_INCDIR}/alsa/sound/
-	install -d ${STAGING_DATADIR}/aclocal
-	install -m 0644 utils/alsa.m4 ${STAGING_DATADIR}/aclocal/
-}
-
-PACKAGES = "libasound alsa-server alsa-conf alsa-doc alsa-dev"
-FILES_libasound = "${libdir}/libasound.so*"
-FILES_alsa-server = "${bindir}"
-FILES_alsa-conf = "${datadir}"
-FILES_alsa-dev = "${libdir}/pkgconfig/ ${incdir}"
-
diff --git a/packages/alsa/alsa-oss_1.0.10.bb b/packages/alsa/alsa-oss_1.0.10.bb
deleted file mode 100644
index acf2ba7505..0000000000
--- a/packages/alsa/alsa-oss_1.0.10.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-DESCRIPTION = "Alsa OSS Compatibility Package"
-MAINTAINER = "Lorn Potter <lpotter@trolltech.com>"
-SECTION = "libs/multimedia"
-LICENSE = "GPL"
-DEPENDS = "alsa-lib"
-
-SRC_URI = "ftp://ftp.alsa-project.org/pub/oss-lib/alsa-oss-${PV}.tar.bz2"
-
-inherit autotools 
-
-do_configure_prepend () {
-	touch NEWS README AUTHORS ChangeLog
-}
-
-do_stage () {
-	oe_libinstall -C alsa -a -so libaoss ${STAGING_LIBDIR}
-	oe_libinstall -C alsa -a -so libalsatoss ${STAGING_LIBDIR}
-}
diff --git a/packages/alsa/alsa-oss_1.0.11.bb b/packages/alsa/alsa-oss_1.0.11.bb
index 7d388e679a..89cd378c38 100644
--- a/packages/alsa/alsa-oss_1.0.11.bb
+++ b/packages/alsa/alsa-oss_1.0.11.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Alsa OSS Compatibility Package"
-MAINTAINER = "Lorn Potter <lpotter@trolltech.com>"
+HOMEPAGE = "http://www.alsa-project.org"
 SECTION = "libs/multimedia"
 LICENSE = "GPL"
 DEPENDS = "alsa-lib"
diff --git a/packages/alsa/alsa-oss_1.0.8.bb b/packages/alsa/alsa-oss_1.0.8.bb
deleted file mode 100644
index f62550bb93..0000000000
--- a/packages/alsa/alsa-oss_1.0.8.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-DESCRIPTION = "Alsa OSS Compatibility Package"
-MAINTAINER = "Lorn Potter <lpotter@trolltech.com>"
-SECTION = "libs/multimedia"
-LICENSE = "GPL"
-DEPENDS = "alsa-lib"
-PR = "r1"
-
-SRC_URI = "ftp://ftp.alsa-project.org/pub/oss-lib/alsa-oss-${PV}.tar.bz2"
-
-inherit autotools 
-
-do_configure_prepend () {
-	touch NEWS README AUTHORS ChangeLog
-}
-
-do_stage () {
-	oe_libinstall -C alsa -a -so libaoss ${STAGING_LIBDIR}
-	oe_libinstall -C alsa -a -so libalsatoss ${STAGING_LIBDIR}
-}
diff --git a/packages/alsa/alsa-tools_1.0.10.bb b/packages/alsa/alsa-tools_1.0.10.bb
deleted file mode 100644
index eed86e5dba..0000000000
--- a/packages/alsa/alsa-tools_1.0.10.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-BROKEN = "1"
-
-DESCRIPTION = "Alsa Tools"
-SECTION = "console/utils"
-LICENSE = "GPL"
-DEPENDS = "alsa-lib"
-
-SRC_URI = "ftp://ftp.alsa-project.org/pub/tools/alsa-tools-${PV}.tar.bz2"
-
-inherit autotools
diff --git a/packages/alsa/alsa-tools_1.0.11.bb b/packages/alsa/alsa-tools_1.0.11.bb
deleted file mode 100644
index 9512ae8036..0000000000
--- a/packages/alsa/alsa-tools_1.0.11.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-BROKEN = "1"
-
-DESCRIPTION = "Alsa Tools"
-SECTION = "console/utils"
-LICENSE = "GPL"
-DEPENDS = "alsa-lib"
-PR = "r0"
-
-SRC_URI = "ftp://ftp.alsa-project.org/pub/tools/alsa-tools-${PV}.tar.bz2"
-
-inherit autotools
-
-# this bb file requires quite some work.
-# There is no top level makefile in tools
-# that is why install fails, but actually nothing is compiled
-# in order to fix this, the bb file needs heavy work 
-# (but the tools are not very useful for oe, so I'll leave it for now)
diff --git a/packages/alsa/alsa-tools_1.0.8.bb b/packages/alsa/alsa-tools_1.0.8.bb
deleted file mode 100644
index eed86e5dba..0000000000
--- a/packages/alsa/alsa-tools_1.0.8.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-BROKEN = "1"
-
-DESCRIPTION = "Alsa Tools"
-SECTION = "console/utils"
-LICENSE = "GPL"
-DEPENDS = "alsa-lib"
-
-SRC_URI = "ftp://ftp.alsa-project.org/pub/tools/alsa-tools-${PV}.tar.bz2"
-
-inherit autotools
diff --git a/packages/alsa/alsa-utils_1.0.10.bb b/packages/alsa/alsa-utils_1.0.10.bb
deleted file mode 100644
index 94e49ebf25..0000000000
--- a/packages/alsa/alsa-utils_1.0.10.bb
+++ /dev/null
@@ -1,55 +0,0 @@
-DESCRIPTION = "ALSA Utilities"
-MAINTAINER = "Lorn Potter <lpotter@trolltech.com>"
-SECTION = "console/utils"
-LICENSE = "GPL"
-DEPENDS = "alsa-lib ncurses"
-
-SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2"
-
-inherit autotools
-
-# This are all packages that we need to make. Also, the now empty alsa-utils
-# ipk depend on them.
-
-PACKAGES += "alsa-utils-alsamixer"
-PACKAGES += "alsa-utils-midi"
-PACKAGES += "alsa-utils-aplay"
-PACKAGES += "alsa-utils-amixer"
-PACKAGES += "alsa-utils-aconnect"
-PACKAGES += "alsa-utils-iecset"
-PACKAGES += "alsa-utils-speakertest"
-PACKAGES += "alsa-utils-aseqnet"
-PACKAGES += "alsa-utils-alsactl"
-
-
-# We omit alsaconf, because
-# a) this is a bash script
-# b) it creates config files for RedHat, Debian, Mandrake etc, but not
-#    for Familiar, OpenZaurus etc
-
-
-FILES_${PN} = ""
-FILES_alsa-utils-aplay       = "${bindir}/aplay ${bindir}/arecord"
-FILES_alsa-utils-amixer      = "${bindir}/amixer"
-FILES_alsa-utils-alsamixer   = "${bindir}/alsamixer"
-FILES_alsa-utils-speakertest = "${bindir}/speaker-test"
-FILES_alsa-utils-midi        = "${bindir}/aplaymidi ${bindir}/arecordmidi ${bindir}/amidi"
-FILES_alsa-utils-aconnect    = "${bindir}/aconnect"
-FILES_alsa-utils-aseqnet     = "${bindir}/aseqnet"
-FILES_alsa-utils-iecset      = "${bindir}/iecset"
-FILES_alsa-utils-alsactl     = "${sbindir}/alsactl"
-
-DESCRIPTION_alsa-utils-aplay        = "play (and record) sound files via ALSA"
-DESCRIPTION_alsa-utils-amixer       = "command-line based control for ALSA mixer and settings"
-DESCRIPTION_alsa-utils-alsamixer    = "ncurses based control for ALSA mixer and settings"
-#DESCRIPTION_alsa-utils-speaker-test= "??"
-DESCRIPTION_alsa-utils-midi         = "miscalleanous MIDI utilities for ALSA"
-DESCRIPTION_alsa-utils-aconnect     = "ALSA sequencer connection manager"
-DESCRIPTION_alsa-utils-aseqnet      = "network client/server on ALSA sequencer"
-DESCRIPTION_alsa-utils-alsactl      = "saves/restores ALSA-settings in /etc/asound.state"
-DESCRIPTION_alsa-utils-alsaconf     = "a bash script that creates ALSA configuration files"
-
-RDEPENDS_alsa-utils-aplay  += "alsa-conf"
-RDEPENDS_alsa-utils-amixer += "alsa-conf"
-
-ALLOW_EMPTY_alsa-utils = "1"
diff --git a/packages/alsa/alsa-utils_1.0.11.bb b/packages/alsa/alsa-utils_1.0.11.bb
index 3c5b964c16..83bc8c5c86 100644
--- a/packages/alsa/alsa-utils_1.0.11.bb
+++ b/packages/alsa/alsa-utils_1.0.11.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "ALSA Utilities"
-MAINTAINER = "Lorn Potter <lpotter@trolltech.com>"
+HOMEPAGE = "http://www.alsa-project.org"
 SECTION = "console/utils"
 LICENSE = "GPL"
 DEPENDS = "alsa-lib ncurses"
@@ -22,12 +22,9 @@ PACKAGES += "alsa-utils-speakertest"
 PACKAGES += "alsa-utils-aseqnet"
 PACKAGES += "alsa-utils-alsactl"
 
-
 # We omit alsaconf, because
 # a) this is a bash script
-# b) it creates config files for RedHat, Debian, Mandrake etc, but not
-#    for Familiar, OpenZaurus etc
-
+# b) it creates config files not suitable for OE-based distros
 
 FILES_${PN} = ""
 FILES_alsa-utils-aplay       = "${bindir}/aplay ${bindir}/arecord"
diff --git a/packages/alsa/alsa-utils_1.0.8.bb b/packages/alsa/alsa-utils_1.0.8.bb
deleted file mode 100644
index 0a93c32e3f..0000000000
--- a/packages/alsa/alsa-utils_1.0.8.bb
+++ /dev/null
@@ -1,56 +0,0 @@
-DESCRIPTION = "ALSA Utilities"
-MAINTAINER = "Lorn Potter <lpotter@trolltech.com>"
-SECTION = "console/utils"
-LICENSE = "GPL"
-DEPENDS = "alsa-lib ncurses"
-PR = "r3"
-
-SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2"
-SRC_URI += "file://alsa-utils-sys-siglist.patch;patch=108"
-
-inherit autotools
-
-# This are all packages that we need to make. Also, the now empty alsa-utils
-# ipk depend on them.
-
-PACKAGES += "alsa-utils-alsamixer"
-PACKAGES += "alsa-utils-midi"
-PACKAGES += "alsa-utils-aplay"
-PACKAGES += "alsa-utils-amixer"
-PACKAGES += "alsa-utils-aconnect"
-PACKAGES += "alsa-utils-iecset"
-PACKAGES += "alsa-utils-speakertest"
-PACKAGES += "alsa-utils-aseqnet"
-PACKAGES += "alsa-utils-alsactl"
-
-
-# We omit alsaconf, because
-# a) this is a bash script
-# b) it creates config files for RedHat, Debian, Mandrake etc, but not
-#    for Familiar, OpenZaurus etc
-
-
-FILES_${PN} = ""
-FILES_alsa-utils-aplay       = "${bindir}/aplay ${bindir}/arecord"
-FILES_alsa-utils-amixer      = "${bindir}/amixer"
-FILES_alsa-utils-alsamixer   = "${bindir}/alsamixer"
-FILES_alsa-utils-speakertest = "${bindir}/speaker-test"
-FILES_alsa-utils-midi        = "${bindir}/aplaymidi ${bindir}/arecordmidi ${bindir}/amidi"
-FILES_alsa-utils-aconnect    = "${bindir}/aconnect"
-FILES_alsa-utils-aseqnet     = "${bindir}/aseqnet"
-FILES_alsa-utils-iecset      = "${bindir}/iecset"
-FILES_alsa-utils-alsactl     = "${sbindir}/alsactl"
-
-DESCRIPTION_alsa-utils-aplay        = "play (and record) sound files via ALSA"
-DESCRIPTION_alsa-utils-amixer       = "command-line based control for ALSA mixer and settings"
-DESCRIPTION_alsa-utils-alsamixer    = "ncurses based control for ALSA mixer and settings"
-#DESCRIPTION_alsa-utils-speaker-test= "??"
-DESCRIPTION_alsa-utils-midi         = "miscalleanous MIDI utilities for ALSA"
-DESCRIPTION_alsa-utils-aconnect     = "ALSA sequencer connection manager"
-DESCRIPTION_alsa-utils-aseqnet      = "network client/server on ALSA sequencer"
-DESCRIPTION_alsa-utils-alsactl      = "saves/restores ALSA-settings in /etc/asound.state"
-DESCRIPTION_alsa-utils-alsaconf     = "a bash script that creates ALSA configuration files"
-
-RDEPENDS_alsa-utils-aplay  += "alsa-conf"
-RDEPENDS_alsa-utils-amixer += "alsa-conf"
-ALLOW_EMPTY_alsa-utils = "1"
diff --git a/packages/angstrom/task-angstrom.bb b/packages/angstrom/task-angstrom.bb
index 8174e173be..dc3d71040c 100644
--- a/packages/angstrom/task-angstrom.bb
+++ b/packages/angstrom/task-angstrom.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Task packages for the Angstrom distribution"
-PR = "r3"
+PR = "r4"
 ALLOW_EMPTY = "1"
 
 BOOTMODULES_RRECOMMENDS ?= ""
@@ -22,6 +22,7 @@ RDEPENDS_angstrom-base-depends = "\
     base-passwd tinylogin \ 
     busybox \
     udev \
+    update-modules module-init-tools \
     sysvinit initscripts sysvinit-pidof \
     netbase dropbear \
     angstrom-version \
diff --git a/packages/bitbake/bitbake_1.4.2.bb b/packages/bitbake/bitbake_1.4.2.bb
new file mode 100644
index 0000000000..9f8f054355
--- /dev/null
+++ b/packages/bitbake/bitbake_1.4.2.bb
@@ -0,0 +1,11 @@
+include bitbake.inc
+
+# We don't need a toolchain...
+INHIBIT_DEFAULT_DEPS = "1"
+
+SRC_URI = "svn://svn.berlios.de/bitbake/tags;module=bitbake-${PV}"
+S = "${WORKDIR}/bitbake-${PV}"
+
+inherit distutils
+
+include bitbake-package.inc
diff --git a/packages/dosfstools/dosfstools-native_2.10.bb b/packages/dosfstools/dosfstools-native_2.10.bb
index 78dde3e5e3..01aaae6aa4 100644
--- a/packages/dosfstools/dosfstools-native_2.10.bb
+++ b/packages/dosfstools/dosfstools-native_2.10.bb
@@ -7,7 +7,7 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/dosfstools-${PV}"
 
 S="${WORKDIR}/dosfstools-${PV}"
 
-PR="r2"
+PR="r3"
 
 SRC_URI = "ftp://ftp.uni-erlangen.de/pub/Linux/LOCAL/dosfstools/dosfstools-${PV}.src.tar.gz \
 	file://mkdosfs-bootcode.patch;patch=1 \
@@ -15,7 +15,8 @@ SRC_URI = "ftp://ftp.uni-erlangen.de/pub/Linux/LOCAL/dosfstools/dosfstools-${PV}
 	file://alignment_hack.patch;patch=1 \
 	file://dosfstools-2.10-kernel-2.6.patch;patch=1 \
 	file://msdos_fat12_undefined.patch;patch=1 \
-	file://dosfstools-msdos_fs-types.patch;patch=1"
+	file://dosfstools-msdos_fs-types.patch;patch=1 \
+	file://include-linux-types.patch;patch=1"
 
 inherit native
 
diff --git a/packages/dosfstools/dosfstools_2.10.bb b/packages/dosfstools/dosfstools_2.10.bb
index a683e4846b..ec06ae94fc 100644
--- a/packages/dosfstools/dosfstools_2.10.bb
+++ b/packages/dosfstools/dosfstools_2.10.bb
@@ -9,12 +9,13 @@ SECTION = "base"
 PRIORITY = "optional"
 LICENSE = "GPL"
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "ftp://ftp.uni-erlangen.de/pub/Linux/LOCAL/dosfstools/dosfstools-${PV}.src.tar.gz \
 	   file://alignment_hack.patch;patch=1 \
 	   file://dosfstools-2.10-kernel-2.6.patch;patch=1 \
-           file://msdos_fat12_undefined.patch;patch=1"
+           file://msdos_fat12_undefined.patch;patch=1 \
+	   file://include-linux-types.patch;patch=1"
 
 do_install () {
 	oe_runmake "PREFIX=${D}" "SBINDIR=${D}${sbindir}" \
diff --git a/packages/dosfstools/files/include-linux-types.patch b/packages/dosfstools/files/include-linux-types.patch
new file mode 100644
index 0000000000..4bbd4e76e4
--- /dev/null
+++ b/packages/dosfstools/files/include-linux-types.patch
@@ -0,0 +1,17 @@
+mkdsofs is using types of the style __u8, which it gets with some
+versions of libc headers via linux/hdreg.h including asm/types.h.
+Newer version of fedora (at least) have a hdreg.h whichdoes not
+include asm/types.h. To work around this patch mkdosfs.c to explicity
+include linux/types.h which will in turn pull in asm/types.h which
+defines these variables.
+
+--- dosfstools-2.10/mkdosfs/mkdosfs.c~	2006-07-12 18:46:21.000000000 +1000
++++ dosfstools-2.10/mkdosfs/mkdosfs.c	2006-07-12 18:46:21.000000000 +1000
+@@ -60,6 +60,7 @@
+ #include "../version.h"
+ 
+ #include <fcntl.h>
++#include <linux/types.h>
+ #include <linux/hdreg.h>
+ #include <linux/fs.h>
+ #include <linux/fd.h>
diff --git a/packages/konqueror/files/gcc4.patch b/packages/konqueror/files/gcc4.patch
new file mode 100644
index 0000000000..88735242cb
--- /dev/null
+++ b/packages/konqueror/files/gcc4.patch
@@ -0,0 +1,16 @@
+
+#
+# Signed off by Michael 'Mickey' Lauer <mickey@Vanille.de>
+#
+
+--- kdenox/konq-embed/dropin/kapplication.h~gcc4
++++ kdenox/konq-embed/dropin/kapplication.h
+@@ -122,7 +122,7 @@
+    // required since kdelibs 3.4
+    void updateUserTimestamp(unsigned long = 0) {}
+ 
+-   static int KApplication::startDragDistance();
++   static int startDragDistance();
+ 
+ signals:
+     // required by KHTMLView
diff --git a/packages/konqueror/konqueror-embedded-20050322/.mtn2git_empty b/packages/konqueror/konqueror-embedded-20050322/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/konqueror/konqueror-embedded-20050322/.mtn2git_empty
+++ /dev/null
diff --git a/packages/konqueror/konqueror-embedded-20050322/qt-embedded.patch b/packages/konqueror/konqueror-embedded-20050322/qt-embedded.patch
deleted file mode 100644
index cb0dc644c9..0000000000
--- a/packages/konqueror/konqueror-embedded-20050322/qt-embedded.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- konqueror3-embedded-0.2-20050322/konq-embed/kdesrc/kparts/browserextension.cpp~qt-embedded.patch
-+++ konqueror3-embedded-0.2-20050322/konq-embed/kdesrc/kparts/browserextension.cpp
-@@ -441,6 +441,7 @@
- 
- void BrowserExtension::pasteRequest()
- {
-+#ifndef QT_NO_CLIPBOARD
-     QCString plain("plain");
-     QString url = QApplication::clipboard()->text(plain, QClipboard::Selection).stripWhiteSpace();
-     // Remove linefeeds and any whitespace surrounding it.
-@@ -477,6 +478,7 @@
- 		    KStdGuiItem::cancel(), "MiddleClickSearch" ) == KMessageBox::Yes)
-           slotOpenURLRequest( filterData.uri(), KParts::URLArgs() );
-     }
-+#endif
- }
- 
- void BrowserExtension::slotOpenURLRequest( const KURL &url, const KParts::URLArgs &args )
---- konqueror3-embedded-0.2-20050322/konq-embed/kdesrc/khtml/khtmlview.cpp~qt-embedded.patch
-+++ konqueror3-embedded-0.2-20050322/konq-embed/kdesrc/khtml/khtmlview.cpp
-@@ -96,8 +96,10 @@
- 
- //#define DEBUG_PIXEL
- 
-+#ifdef THIS_DOESNT_WORK_WITH_QT_EMBEDDED
- #include <X11/Xlib.h>
- #include <fixx11h.h>
-+#endif
- 
- #define PAINT_BUFFER_HEIGHT 128
- 
-@@ -1182,9 +1184,11 @@
-         if( !d->cursor_icon_widget ) {
-             QPixmap icon_pixmap = KGlobal::iconLoader()->loadIcon( "mail_generic", KIcon::Small, 0, KIcon::DefaultState, 0, true );
-             d->cursor_icon_widget = new QWidget( NULL, NULL, WX11BypassWM );
-+#ifdef THIS_DOESNT_WORK_WITH_QT_EMBEDDED
-             XSetWindowAttributes attr;
-             attr.save_under = True;
-             XChangeWindowAttributes( qt_xdisplay(), d->cursor_icon_widget->winId(), CWSaveUnder, &attr );
-+#endif
-             d->cursor_icon_widget->resize( icon_pixmap.width(), icon_pixmap.height());
-             if( icon_pixmap.mask() )
-                 d->cursor_icon_widget->setMask( *icon_pixmap.mask());
-@@ -1195,8 +1199,10 @@
-         }
-         QPoint c_pos = QCursor::pos();
-         d->cursor_icon_widget->move( c_pos.x() + 15, c_pos.y() + 15 );
-+#ifdef THIS_DOESNT_WORK_WITH_QT_EMBEDDED
-         XRaiseWindow( qt_xdisplay(), d->cursor_icon_widget->winId());
-         QApplication::flushX();
-+#endif
-         d->cursor_icon_widget->show();
-     }
-     else if ( d->cursor_icon_widget )
---- konqueror3-embedded-0.2-20050322/acinclude.m4~qt-embedded.patch
-+++ konqueror3-embedded-0.2-20050322/acinclude.m4
-@@ -2131,9 +2131,9 @@
- save_CXXFLAGS="$CXXFLAGS"
- kde_safe_LIBS="$LIBS"
- LIBS="$LIBS $X_EXTRA_LIBS"
--if test "$GXX" = "yes"; then
--CXXFLAGS="$CXXFLAGS -pedantic-errors"
--fi
-+#if test "$GXX" = "yes"; then
-+#CXXFLAGS="$CXXFLAGS -pedantic-errors"
-+#fi
- AC_TRY_COMPILE([
- $2
- ],
-@@ -3012,7 +3012,7 @@
-   if test "$GXX" = "yes" || test "$CXX" = "KCC"; then
-     if test "$kde_use_debug_code" != "no"; then
-       if test "$CXX" = "KCC"; then
--        CXXFLAGS="+K0 -Wall -pedantic -W -Wpointer-arith -Wwrite-strings $CXXFLAGS"
-+        CXXFLAGS="+K0 -Wall -W -Wpointer-arith -Wwrite-strings $CXXFLAGS"
-       else
-         if test "$kde_use_debug_code" = "full"; then
-           CXXFLAGS="-g3 -fno-inline $CXXFLAGS"
-@@ -3052,7 +3052,7 @@
-         case $host in
-           *-*-linux-gnu)	
-             CFLAGS="-std=iso9899:1990 -W -Wall -Wchar-subscripts -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -D_XOPEN_SOURCE=500 -D_BSD_SOURCE $CFLAGS"
--            CXXFLAGS="-ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -Wchar-subscripts $CXXFLAGS"
-+            CXXFLAGS="-D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -Wchar-subscripts $CXXFLAGS"
-             KDE_CHECK_COMPILER_FLAG(Wmissing-format-attribute, [CXXFLAGS="$CXXFLAGS -Wformat-security -Wmissing-format-attribute"])
-             KDE_CHECK_C_COMPILER_FLAG(Wmissing-format-attribute, [CFLAGS="$CFLAGS -Wformat-security -Wmissing-format-attribute"])
-           ;;
diff --git a/packages/konqueror/konqueror-embedded_20050322.bb b/packages/konqueror/konqueror-embedded_20050322.bb
deleted file mode 100644
index 1fec1375c5..0000000000
--- a/packages/konqueror/konqueror-embedded_20050322.bb
+++ /dev/null
@@ -1,54 +0,0 @@
-DESCRIPTION = "KDE Web Browser Konqueror, QtE based Palmtop Environments Edition"
-BROKEN = "1"
-SECTION = "applications"
-PRIORITY = "optional"
-HOMEPAGE = "http://www.cirulla.net/kdenox-snapshots/"
-DEPENDS = "openssl pcre"
-LICENSE = "LGPL/GPL"
-PR = "r3"
-
-# Note if this .bb files fails with the error:
-# "No rule to make target `-lpcre', needed by `konqueror'.  Stop."
-# a workaround is to install the libpcre3-dev package onto your build
-# machine (Ubuntu/Debain) or your distro's equivalent (FC = pcre-devel).
-
-SRC_URI = "http://www.cirulla.net/kdenox-snapshots/snapshots/konqueror3-embedded-0.2-${PV}.tar.bz2 \
-           file://qt-embedded.patch;patch=1"
-S = "${WORKDIR}/konqueror3-embedded-0.2-${PV}"
-
-DEFAULT_PREFERENCE = "-1"
-
-inherit autotools
-
-FILES_${PN} = "${palmtopdir}"
-
-export QMAKE = "${STAGING_BINDIR}/qmake"
-export MOC = "${STAGING_BINDIR}/moc"
-export UIC = "${STAGING_BINDIR}/uic"
-export exec_prefix = "${STAGING_LIBDIR}/.."
-
-EXTRA_OECONF  = '--prefix=${palmtopdir} --exec-prefix=${palmtopdir}'
-EXTRA_OECONF += '--with-extra-includes=${STAGING_INCDIR} --with-extra-libs=${STAGING_LIBDIR}'
-EXTRA_OECONF += '--enable-static --disable-shared --disable-debug'
-EXTRA_OECONF += '--enable-qt-embedded --enable-embedded --without-arts'
-EXTRA_OECONF += '--with-javascript=static --with-gui=kiosk'
-EXTRA_OECONF += '--disable-selection --disable-scrollbars --disable-bookmarks'
-EXTRA_OECONF += '--with-ssl-version=0.9.7e --with-ssl-dir=${STAGING_LIBDIR}/..'
-EXTRA_OECONF += '--with-qt-includes=${STAGING_INCDIR}/qt3'
-EXTRA_OECONF += '--with-qt-libraries=${STAGING_LIBDIR}'
-
-MOC = "${STAGING_BINDIR}/moc3"
-UIC = "${STAGING_BINDIR}/uic3"
-
-do_compile_prepend() {
-	perl admin/am_edit
-}
-
-do_install() {
-    install -d ${D}${palmtopdir}/share/
-    install -d ${D}${palmtopdir}/share/config/
-    
-    install -m 0644 ${WORKDIR}/konq-embedrc ${D}${palmtopdir}/share/config/
-    
-    autotools_do_install
-}
diff --git a/packages/konqueror/konqueror-embedded_20060404.bb b/packages/konqueror/konqueror-embedded_20060404.bb
index e5f2901cb8..8ab25baf6e 100644
--- a/packages/konqueror/konqueror-embedded_20060404.bb
+++ b/packages/konqueror/konqueror-embedded_20060404.bb
@@ -4,14 +4,15 @@ PRIORITY = "optional"
 HOMEPAGE = "http://www.konqueror.org/"
 DEPENDS = "openssl pcre virtual/libqte2 dcopidl-native dcopidl2cpp-native"
 LICENSE = "LGPL/GPL"
-PR = "r2"
+PR = "r3"
 
 # this Konqueror needs the KDEDIR set and the font helvetica installed on the target
 
 inherit autotools
 
 SRC_URI = "svn://anonsvn.kde.org/home/kde/tags/KDE/3.5.1;module=kdelibs;date=${PV} \
-           svn://anonsvn.kde.org/home/kde/trunk;module=kdenox;date=${PV}"
+           svn://anonsvn.kde.org/home/kde/trunk;module=kdenox;date=${PV} \
+           file://gcc4.patch;patch=1"
 # uncomment this for a static build
 #          file://inject-extraflags.patch;patch=1"
 S = "${WORKDIR}/kdenox"
diff --git a/packages/libxml/libxml2_2.6.10.bb b/packages/libxml/libxml2_2.6.10.bb
deleted file mode 100644
index 9f789a499e..0000000000
--- a/packages/libxml/libxml2_2.6.10.bb
+++ /dev/null
@@ -1,40 +0,0 @@
-PR = "r0"
-DESCRIPTION = "GNOME XML library"
-SECTION = "libs"
-PRIORITY = "optional"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-LICENSE = "MIT"
-PACKAGES = "${PN}-dev ${PN}-utils ${PN} ${PN}-doc ${PN}-locale"
-
-FILES_${PN}-dev += "${bindir}/xml-config"
-FILES_${PN}-utils += "${bindir}"
-
-SRC_URI = "http://xmlsoft.org/sources/libxml2/old/libxml2-${PV}.tar.gz"
-
-inherit autotools pkgconfig 
-
-EXTRA_OECONF = "--without-python --without-debug --without-legacy --without-schemas --without-catalog --without-docbook --without-c14n"
-
-headers = "DOCBparser.h HTMLparser.h HTMLtree.h SAX.h SAX2.h c14n.h catalog.h chvalid.h debugXML.h dict.h encoding.h entities.h globals.h hash.h list.h nanoftp.h nanohttp.h parser.h parserInternals.h pattern.h relaxng.h schemasInternals.h threads.h tree.h uri.h valid.h xinclude.h xlink.h xmlIO.h xmlautomata.h xmlerror.h xmlexports.h xmlmemory.h xmlreader.h xmlregexp.h xmlschemas.h xmlschemastypes.h xmlstring.h xmlunicode.h xmlversion.h xmlwriter.h xpath.h xpathInternals.h xpointer.h"
-
-do_stage () {
-	oe_libinstall -so libxml2 ${STAGING_LIBDIR}
-
-	mkdir -p ${STAGING_INCDIR}/libxml2/libxml
-	for i in ${headers}; do
-		install -m 0644 include/libxml/$i ${STAGING_INCDIR}/libxml2/libxml/$i
-	done
-
-	cat xml2-config | sed -e "s,^prefix=.*,prefix=${STAGING_BINDIR}/..," \
-		       	     -e "s,^exec_prefix=.*,exec_prefix=${STAGING_BINDIR}/..," \
-			     -e "s,^includedir=.*,includedir=${STAGING_INCDIR}," \
-			     -e "s,^libdir=.*,libdir=${STAGING_LIBDIR}," > ${STAGING_BINDIR}/xml2-config
-	chmod a+rx ${STAGING_BINDIR}/xml2-config
-	install -m 0644 libxml.m4 ${STAGING_DATADIR}/aclocal/
-}
-
-python populate_packages_prepend () {
-	# autonamer would call this libxml2-2, but we don't want that
-	if bb.data.getVar('DEBIAN_NAMES', d, 1):
-		bb.data.setVar('PKG_libxml2', 'libxml2', d)
-}
diff --git a/packages/libxml/libxml2_2.6.22.bb b/packages/libxml/libxml2_2.6.22.bb
index fae00a6063..92f3dca661 100644
--- a/packages/libxml/libxml2_2.6.22.bb
+++ b/packages/libxml/libxml2_2.6.22.bb
@@ -1,34 +1,18 @@
-PR = "r1"
 DESCRIPTION = "GNOME XML library"
 SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "MIT"
-PACKAGES = "${PN}-dev ${PN}-utils ${PN} ${PN}-doc ${PN}-locale"
-
-FILES_${PN}-dev += "${bindir}/xml-config"
-FILES_${PN}-utils += "${bindir}"
+PR = "r2"
 
 SRC_URI = "http://xmlsoft.org/sources/libxml2/libxml2-${PV}.tar.gz \
 		   file://no-testapi.patch;patch=1"
-inherit autotools pkgconfig 
-
-EXTRA_OECONF = "--without-python --without-debug --without-legacy --without-catalog --without-docbook --without-c14n"
-
-headers = "DOCBparser.h HTMLparser.h HTMLtree.h SAX.h SAX2.h c14n.h catalog.h chvalid.h debugXML.h dict.h encoding.h entities.h globals.h hash.h list.h nanoftp.h nanohttp.h parser.h parserInternals.h pattern.h relaxng.h schemasInternals.h threads.h tree.h uri.h valid.h xinclude.h xlink.h xmlIO.h xmlautomata.h xmlerror.h xmlexports.h xmlmemory.h xmlreader.h xmlregexp.h xmlschemas.h xmlschemastypes.h xmlstring.h xmlunicode.h xmlversion.h xmlwriter.h xpath.h xpathInternals.h xpointer.h"
 
-do_stage () {
-	oe_libinstall -so libxml2 ${STAGING_LIBDIR}
+inherit autotools pkgconfig binconfig
 
-	mkdir -p ${STAGING_INCDIR}/libxml2/libxml
-	for i in ${headers}; do
-		install -m 0644 include/libxml/$i ${STAGING_INCDIR}/libxml2/libxml/$i
-	done
+EXTRA_OECONF = "--without-python --without-debug --without-legacy --without-catalog --without-docbook --without-c14n"
 
-	cat xml2-config | sed -e "s,^prefix=.*,prefix=${STAGING_BINDIR}/..," \
-		       	     -e "s,^exec_prefix=.*,exec_prefix=${STAGING_BINDIR}/..," \
-			     -e "s,^includedir=.*,includedir=${STAGING_INCDIR}," \
-			     -e "s,^libdir=.*,libdir=${STAGING_LIBDIR}," > ${STAGING_BINDIR}/xml2-config
-	chmod a+rx ${STAGING_BINDIR}/xml2-config
+do_stage() {
+	autotools_stage_all
 	install -m 0644 libxml.m4 ${STAGING_DATADIR}/aclocal/
 }
 
@@ -37,3 +21,8 @@ python populate_packages_prepend () {
 	if bb.data.getVar('DEBIAN_NAMES', d, 1):
 		bb.data.setVar('PKG_libxml2', 'libxml2', d)
 }
+
+PACKAGES = "${PN}-dev ${PN}-utils ${PN} ${PN}-doc ${PN}-locale"
+
+FILES_${PN}-dev += "${bindir}/*-config"
+FILES_${PN}-utils += "${bindir}"
diff --git a/packages/libxml/libxml2_2.6.7.bb b/packages/libxml/libxml2_2.6.7.bb
deleted file mode 100644
index b204351b7b..0000000000
--- a/packages/libxml/libxml2_2.6.7.bb
+++ /dev/null
@@ -1,40 +0,0 @@
-PR = "r1"
-DESCRIPTION = "GNOME XML library"
-SECTION = "libs"
-PRIORITY = "optional"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-LICENSE = "MIT"
-PACKAGES = "${PN}-dev ${PN}-utils ${PN} ${PN}-doc ${PN}-locale"
-
-FILES_${PN}-dev += "${bindir}/xml-config"
-FILES_${PN}-utils += "${bindir}"
-
-SRC_URI = "http://xmlsoft.org/sources/libxml2/old/libxml2-${PV}.tar.gz"
-
-inherit autotools pkgconfig 
-
-EXTRA_OECONF = "--without-python --without-debug --without-legacy --without-schemas --without-catalog --without-docbook --without-c14n"
-
-headers = "DOCBparser.h HTMLparser.h HTMLtree.h SAX.h SAX2.h c14n.h catalog.h chvalid.h debugXML.h dict.h encoding.h entities.h globals.h hash.h list.h nanoftp.h nanohttp.h parser.h parserInternals.h pattern.h relaxng.h schemasInternals.h threads.h tree.h uri.h valid.h xinclude.h xlink.h xmlIO.h xmlautomata.h xmlerror.h xmlexports.h xmlmemory.h xmlreader.h xmlregexp.h xmlschemas.h xmlschemastypes.h xmlstring.h xmlunicode.h xmlversion.h xmlwriter.h xpath.h xpathInternals.h xpointer.h"
-
-do_stage () {
-	oe_libinstall -so libxml2 ${STAGING_LIBDIR}
-
-	mkdir -p ${STAGING_INCDIR}/libxml2/libxml
-	for i in ${headers}; do
-		install -m 0644 include/libxml/$i ${STAGING_INCDIR}/libxml2/libxml/$i
-	done
-
-	cat xml2-config | sed -e "s,^prefix=.*,prefix=${STAGING_BINDIR}/..," \
-		       	     -e "s,^exec_prefix=.*,exec_prefix=${STAGING_BINDIR}/..," \
-			     -e "s,^includedir=.*,includedir=${STAGING_INCDIR}," \
-			     -e "s,^libdir=.*,libdir=${STAGING_LIBDIR}," > ${STAGING_BINDIR}/xml2-config
-	chmod a+rx ${STAGING_BINDIR}/xml2-config
-	install -m 0644 libxml.m4 ${STAGING_DATADIR}/aclocal/
-}
-
-python populate_packages_prepend () {
-	# autonamer would call this libxml2-2, but we don't want that
-	if bb.data.getVar('DEBIAN_NAMES', d, 1):
-		bb.data.setVar('PKG_libxml2', 'libxml2', d)
-}
diff --git a/packages/libxml/libxml2_2.6.9.bb b/packages/libxml/libxml2_2.6.9.bb
deleted file mode 100644
index 9f789a499e..0000000000
--- a/packages/libxml/libxml2_2.6.9.bb
+++ /dev/null
@@ -1,40 +0,0 @@
-PR = "r0"
-DESCRIPTION = "GNOME XML library"
-SECTION = "libs"
-PRIORITY = "optional"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-LICENSE = "MIT"
-PACKAGES = "${PN}-dev ${PN}-utils ${PN} ${PN}-doc ${PN}-locale"
-
-FILES_${PN}-dev += "${bindir}/xml-config"
-FILES_${PN}-utils += "${bindir}"
-
-SRC_URI = "http://xmlsoft.org/sources/libxml2/old/libxml2-${PV}.tar.gz"
-
-inherit autotools pkgconfig 
-
-EXTRA_OECONF = "--without-python --without-debug --without-legacy --without-schemas --without-catalog --without-docbook --without-c14n"
-
-headers = "DOCBparser.h HTMLparser.h HTMLtree.h SAX.h SAX2.h c14n.h catalog.h chvalid.h debugXML.h dict.h encoding.h entities.h globals.h hash.h list.h nanoftp.h nanohttp.h parser.h parserInternals.h pattern.h relaxng.h schemasInternals.h threads.h tree.h uri.h valid.h xinclude.h xlink.h xmlIO.h xmlautomata.h xmlerror.h xmlexports.h xmlmemory.h xmlreader.h xmlregexp.h xmlschemas.h xmlschemastypes.h xmlstring.h xmlunicode.h xmlversion.h xmlwriter.h xpath.h xpathInternals.h xpointer.h"
-
-do_stage () {
-	oe_libinstall -so libxml2 ${STAGING_LIBDIR}
-
-	mkdir -p ${STAGING_INCDIR}/libxml2/libxml
-	for i in ${headers}; do
-		install -m 0644 include/libxml/$i ${STAGING_INCDIR}/libxml2/libxml/$i
-	done
-
-	cat xml2-config | sed -e "s,^prefix=.*,prefix=${STAGING_BINDIR}/..," \
-		       	     -e "s,^exec_prefix=.*,exec_prefix=${STAGING_BINDIR}/..," \
-			     -e "s,^includedir=.*,includedir=${STAGING_INCDIR}," \
-			     -e "s,^libdir=.*,libdir=${STAGING_LIBDIR}," > ${STAGING_BINDIR}/xml2-config
-	chmod a+rx ${STAGING_BINDIR}/xml2-config
-	install -m 0644 libxml.m4 ${STAGING_DATADIR}/aclocal/
-}
-
-python populate_packages_prepend () {
-	# autonamer would call this libxml2-2, but we don't want that
-	if bb.data.getVar('DEBIAN_NAMES', d, 1):
-		bb.data.setVar('PKG_libxml2', 'libxml2', d)
-}
diff --git a/packages/libxslt/libxslt_1.1.8.bb b/packages/libxslt/libxslt_1.1.12.bb
index fd81cba5d2..b98a3c54e8 100644
--- a/packages/libxslt/libxslt_1.1.8.bb
+++ b/packages/libxslt/libxslt_1.1.12.bb
@@ -1,16 +1,10 @@
-PR = "r1"
 DESCRIPTION = "GNOME XSLT library"
 SECTION = "libs"
 PRIORITY = "optional"
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 DEPENDS = "libxml2"
 LICENSE = "MIT"
-PACKAGES = "${PN}-dev ${PN}-utils ${PN} ${PN}-doc ${PN}-locale"
 
-FILES_${PN}-dev += "${bindir}/xslt-config"
-FILES_${PN}-utils += "${bindir}"
-
-SRC_URI = "ftp://xmlsoft.org/libxml2/old/libxslt-${PV}.tar.gz"
+SRC_URI = "ftp://xmlsoft.org/libxml2/libxslt-${PV}.tar.gz"
 S = "${WORKDIR}/libxslt-${PV}"
 
 inherit autotools pkgconfig 
@@ -43,3 +37,8 @@ do_stage () {
 	chmod a+rx ${STAGING_BINDIR}/xslt-config
 	install -m 0644 libxslt.m4 ${STAGING_DATADIR}/aclocal/
 }
+
+PACKAGES = "${PN}-dev ${PN}-utils ${PN} ${PN}-doc ${PN}-locale"
+
+FILES_${PN}-dev += "${bindir}/xslt-config"
+FILES_${PN}-utils += "${bindir}"
diff --git a/packages/libxslt/libxslt_1.1.7.bb b/packages/libxslt/libxslt_1.1.7.bb
deleted file mode 100644
index fd81cba5d2..0000000000
--- a/packages/libxslt/libxslt_1.1.7.bb
+++ /dev/null
@@ -1,45 +0,0 @@
-PR = "r1"
-DESCRIPTION = "GNOME XSLT library"
-SECTION = "libs"
-PRIORITY = "optional"
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
-DEPENDS = "libxml2"
-LICENSE = "MIT"
-PACKAGES = "${PN}-dev ${PN}-utils ${PN} ${PN}-doc ${PN}-locale"
-
-FILES_${PN}-dev += "${bindir}/xslt-config"
-FILES_${PN}-utils += "${bindir}"
-
-SRC_URI = "ftp://xmlsoft.org/libxml2/old/libxslt-${PV}.tar.gz"
-S = "${WORKDIR}/libxslt-${PV}"
-
-inherit autotools pkgconfig 
-
-EXTRA_OECONF = "--without-python --without-debug --without-mem-debug"
-
-xsltheaders = "attributes.h documents.h extensions.h extra.h functions.h imports.h \
-               keys.h namespaces.h numbersInternals.h pattern.h preproc.h security.h \
-               templates.h transform.h variables.h xslt.h xsltInternals.h xsltconfig.h \
-               xsltexports.h xsltutils.h"
-exsltheaders = "exslt.h exsltconfig.h exsltexports.h"
-
-do_stage () {
-	oe_libinstall -C libxslt -so -a libxslt ${STAGING_LIBDIR}
-	oe_libinstall -C libexslt -so -a libexslt ${STAGING_LIBDIR}
-
-	mkdir -p ${STAGING_INCDIR}/libxslt
-	for i in ${xsltheaders}; do
-		install -m 0644 ${S}/libxslt/$i ${STAGING_INCDIR}/libxslt/$i
-	done
-	mkdir -p ${STAGING_INCDIR}/libexslt
-	for i in ${exsltheaders}; do
-		install -m 0644 ${S}/libexslt/$i ${STAGING_INCDIR}/libexslt/$i
-	done
-
-	cat xslt-config | sed -e "s,^prefix=.*,prefix=${STAGING_BINDIR}/..," \
-		       	     -e "s,^exec_prefix=.*,exec_prefix=${STAGING_BINDIR}/..," \
-			     -e "s,^includedir=.*,includedir=${STAGING_INCDIR}," \
-			     -e "s,^libdir=.*,libdir=${STAGING_LIBDIR}," > ${STAGING_BINDIR}/xslt-config
-	chmod a+rx ${STAGING_BINDIR}/xslt-config
-	install -m 0644 libxslt.m4 ${STAGING_DATADIR}/aclocal/
-}
diff --git a/packages/meta/task-python-everything_20060425.bb b/packages/meta/task-python-everything_20060425.bb
index ebcb80b007..7fd4c8f286 100644
--- a/packages/meta/task-python-everything_20060425.bb
+++ b/packages/meta/task-python-everything_20060425.bb
@@ -2,7 +2,7 @@ DESCRIPTION= "Everything Python"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 HOMEPAGE = "http://www.vanille.de/projects/python.spy"
 LICENSE = "MIT"
-PR = "ml9"
+PR = "ml10"
 
 BROKEN_BECAUSE_GCC4 = "\
 		python-egenix-mx-base"
@@ -25,6 +25,7 @@ RDEPENDS = "\
 		python-itools		\
 		python-logilab		\
 		python-libgmail		\
+		python-lxml		\
 		python-mad		\
 		python-native		\
 		python-numeric		\
diff --git a/packages/meta/task-python-sharprom_20060425.bb b/packages/meta/task-python-sharprom_20060425.bb
index a8fcca2df6..bb62a15472 100644
--- a/packages/meta/task-python-sharprom_20060425.bb
+++ b/packages/meta/task-python-sharprom_20060425.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Everything Python for SharpROM"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 HOMEPAGE = "http://www.vanille.de/projects/python.spy"
 LICENSE = "MIT"
-PR = "ml5"
+PR = "ml6"
 
 NONWORKING = "\
 		python-codes		\
@@ -30,6 +30,7 @@ RDEPENDS = "\
 		python-itools		\
 		python-libgmail		\
 		python-logilab		\
+		python-lxml		\
 		python-mad		\
 		python-native		\
 		python-numeric		\
diff --git a/packages/nslu2-binary-only/unslung-rootfs/NOTES b/packages/nslu2-binary-only/unslung-rootfs/NOTES
index d6d789a858..de4d8b00bf 100644
--- a/packages/nslu2-binary-only/unslung-rootfs/NOTES
+++ b/packages/nslu2-binary-only/unslung-rootfs/NOTES
@@ -539,3 +539,10 @@ Upgraded slingbox to v1.1.3 busybox base; enabled 'more' command
 Added network console debugging support:
  - patched netconsole driver,  added netconsole kernel module to image
  - updated /linuxrc (& misc files) for basic support of same
+
+Added ".nodisk" flag -- presence of the ".nodisk" file on the flash root
+will force a one-time-only boot to flash. This makes for easier testing and
+maintenance; easier than plugging and unplugging disks.
+
+Empty the /etc/win_share.info file on boot (fixes problem with multiple
+identical shares appearing on a system).
diff --git a/packages/nslu2-binary-only/unslung-rootfs/rc.sysinit-win_share.patch b/packages/nslu2-binary-only/unslung-rootfs/rc.sysinit-win_share.patch
new file mode 100644
index 0000000000..392a294588
--- /dev/null
+++ b/packages/nslu2-binary-only/unslung-rootfs/rc.sysinit-win_share.patch
@@ -0,0 +1,15 @@
+--- nslu2-linksys-ramdisk-2.3r63/etc/rc.d/rc.sysinit.orig     2006-07-11 01:36:28.000000000 -0500
++++ nslu2-linksys-ramdisk-2.3r63/etc/rc.d/rc.sysinit  2006-07-11 10:10:29.000000000 -0500
+@@ -43,6 +43,12 @@
+   > /var/log/wtmp
+ fi
+ 
++# Clean up /etc/win_share.info (fixes bug where shares appear
++# multiple times. Do not create the file if it doesn't exist, though.
++if ( [ -f /etc/win_share.info ] ) ; then
++  > /etc/win_share.info
++fi
++
+ /bin/echo  "Starting Hostname :"; hostname  ${HOSTNAME}; check_status
+ #/bin/echo  "Starting System Log :"; . /etc/rc.d/rc.syslogd
+ /bin/echo  "Starting Modules :"; . /etc/rc.d/rc.modules
diff --git a/packages/nslu2-binary-only/unslung-rootfs_2.3r63.bb b/packages/nslu2-binary-only/unslung-rootfs_2.3r63.bb
index c9ec1fbdde..73089bafeb 100644
--- a/packages/nslu2-binary-only/unslung-rootfs_2.3r63.bb
+++ b/packages/nslu2-binary-only/unslung-rootfs_2.3r63.bb
@@ -1,6 +1,6 @@
 SECTION = "base"
 
-PR = "r14"
+PR = "r15"
 
 DEPENDS = "nslu2-linksys-libs nslu2-linksys-sambacodepages"
 
@@ -46,6 +46,7 @@ SRC_URI = "http://nslu.sf.net/downloads/nslu2-linksys-ramdisk-2.3r63-2.tar.bz2 \
 	   file://security-fixes.patch;patch=1 \
 	   file://rc.sysinit-clean_var.patch;patch=1 \
 	   file://rc.sysinit-cpbug.patch;patch=1 \
+	   file://rc.sysinit-win_share.patch;patch=1 \
 	   file://rc.modules-nls.patch;patch=1 \
 	   file://telnet-passwd.patch;patch=1 \
 	   file://upgrade.htm \
diff --git a/packages/python/python-lxml_1.0.2.bb b/packages/python/python-lxml_1.0.2.bb
new file mode 100644
index 0000000000..e36379fed9
--- /dev/null
+++ b/packages/python/python-lxml_1.0.2.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "Python Bindings to the XML libraries libxml2 and libxslt"
+HOMEPAGE = "http://codespeak.net/lxml/"
+AUTHOR = "http://codespeak.net/mailman/listinfo/lxml-dev"
+LICENSE = "BSD"
+DEPENDS = "libxml2 libxslt"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+PR = "ml0"
+
+SRC_URI = "http://codespeak.net/lxml/lxml-${PV}.tgz"
+S = "${WORKDIR}/lxml-${PV}"
+
+inherit distutils
+
diff --git a/packages/qte/qte-common_2.3.10.inc b/packages/qte/qte-common_2.3.10.inc
index 3f497c9058..9cbdaed04d 100644
--- a/packages/qte/qte-common_2.3.10.inc
+++ b/packages/qte/qte-common_2.3.10.inc
@@ -124,9 +124,9 @@ export SYSCONF_LINK = "${CCLD}"
 export SYSCONF_SHLIB = "${CCLD}"
 export SYSCONF_CFLAGS = "${CFLAGS}"
 export SYSCONF_LINK_SHLIB = "${CCLD}"
-export SYSCONF_CXXFLAGS = "${CXXFLAGS} -pipe -DQWS -fno-exceptions -fno-rtti -DNO_DEBUG ${EXTRA_DEFINES} -DUSE_BIDI"
+export SYSCONF_CXXFLAGS = "${CXXFLAGS} -pipe -DQWS -fno-exceptions -frtti -DNO_DEBUG ${EXTRA_DEFINES} -DUSE_BIDI"
 # enable if gcc supports visibility
-#export SYSCONF_CXXFLAGS = "${CXXFLAGS} -pipe -DQWS -fno-exceptions -fno-rtti -fvisibility=hidden -DGCC_SUPPORTS_VISIBILITY -DNO_DEBUG ${EXTRA_DEFINES} -DUSE_BIDI"
+#export SYSCONF_CXXFLAGS = "${CXXFLAGS} -pipe -DQWS -fno-exceptions -frtti -fvisibility=hidden -DGCC_SUPPORTS_VISIBILITY -DNO_DEBUG ${EXTRA_DEFINES} -DUSE_BIDI"
 export SYSCONF_LFLAGS = "${LDFLAGS} -lts"
 export SYSCONF_LFLAGS_mnci = "${LDFLAGS}"
 export SYSCONF_MOC = "${STAGING_BINDIR}/moc"
diff --git a/packages/tinymail/tinymail_svn.bb b/packages/tinymail/tinymail_svn.bb
index 5b7d4c37a1..b1195af484 100644
--- a/packages/tinymail/tinymail_svn.bb
+++ b/packages/tinymail/tinymail_svn.bb
@@ -9,7 +9,7 @@ PR = "r1"
 
 EXTRA_OECONF=" --disable-gnome --with-platform=gpe --with-html-component=none"
 
-SRC_URI = "svn://svn.cronos.be/svn/tinymail;module=trunk;proto=https \
+SRC_URI = "svn://svn.tinymail.org/svn/tinymail/;module=trunk;proto=https \
            file://gtk-doc.m4 \
            file://gtk-doc.make"
 
diff --git a/packages/vim/gvim_7.0.bb b/packages/vim/gvim_7.0.bb
new file mode 100644
index 0000000000..d0185815e1
--- /dev/null
+++ b/packages/vim/gvim_7.0.bb
@@ -0,0 +1,14 @@
+VIMVER = "70"
+
+include vim.inc
+
+DEPENDS += "gtk+"
+FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/vim-7.0', '${FILE_DIRNAME}/vim', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
+
+EXTRA_OECONF = "--enable-gui=gtk2 --enable-gtk2-test --disable-gtktest \
+		--disable-xim --with-features=normal \
+		--disable-gpm --with-x --disable-netbeans \
+		--with-tlib=ncurses"
+
+#might needs RREPLACES as well
+RCONFLICTS_${PN} = "vim"