merge of '132be09ee353f798eadc984f8f09e27e68180850'

     and 'c0e1d74b2a331789caaf72b458b57924d21c7da3'

981 files changed, 3066 insertions, 2946 deletions

diff --git a/packages/aalib/aalib_1.4rc5.bb b/packages/aalib/aalib_1.4rc5.bb
index 1bea8a864d..c2afe0856c 100644
--- a/packages/aalib/aalib_1.4rc5.bb
+++ b/packages/aalib/aalib_1.4rc5.bb
@@ -7,7 +7,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/aa-project/aalib-${PV}.tar.gz \
 	   file://configure.patch;patch=1"
 S = "${WORKDIR}/aalib-1.4.0"
 
-inherit autotools 
+inherit autotools
 
 EXTRA_OECONF = '--without-x11-driver --without-slang-driver \
 		--with-curses-driver --without-gpm \
diff --git a/packages/addons/devshell.bb b/packages/addons/devshell.bb
index cf10afeefe..9ac6821e0e 100644
--- a/packages/addons/devshell.bb
+++ b/packages/addons/devshell.bb
@@ -38,7 +38,7 @@ python do_compile() {
 
 	workdir = bb.data.getVar('WORKDIR', d, 1)
 	shellfile = os.path.join(workdir, bb.data.expand("${TARGET_PREFIX}${DISTRO}-${MACHINE}-devshell", d))
-	
+
 	f = open(shellfile, "w")
 
 	# emit variables and shell functions
@@ -63,7 +63,7 @@ do_deploy() {
 	cp $shellfile tmpfile
 	echo "#!/bin/bash --rcfile" > $shellfile
 	sed -e "s:${S}:.:g" -e "s:exit 1:true:" tmpfile >> $shellfile
-	
+
 	echo "export PS1='[OE::${TARGET_PREFIX}${DISTRO}-${MACHINE}]:\w\$ '" >> $shellfile
 	echo "alias ./configure=oe_runconf" >> $shellfile
 	echo "alias make=oe_runmake" >> $shellfile
diff --git a/packages/alp/hiker_0.9.bb b/packages/alp/hiker_0.9.bb
index 17e34efceb..ce5994ebcc 100644
--- a/packages/alp/hiker_0.9.bb
+++ b/packages/alp/hiker_0.9.bb
@@ -7,7 +7,7 @@ SRC_URI = "http://www.access-company.com/downloads/${P}.tar.gz"
 
 inherit autotools pkgconfig lib_package
 
-export CFLAGS += "-DALP_BUILD=ALP_BUILD_DEBUG" 
+export CFLAGS += "-DALP_BUILD=ALP_BUILD_DEBUG"
 export CXXFLAGS += "-DALP_BUILD=ALP_BUILD_DEBUG"
 
 do_configure_prepend() {
diff --git a/packages/alsa/alsa-driver_0.9.6-hh4c.bb b/packages/alsa/alsa-driver_0.9.6-hh4c.bb
index f8b3f6fab7..53d898d030 100644
--- a/packages/alsa/alsa-driver_0.9.6-hh4c.bb
+++ b/packages/alsa/alsa-driver_0.9.6-hh4c.bb
@@ -31,7 +31,7 @@ midi_modules = "snd-seq-midi-emul.o \
 	snd-seq-midi-event.o \
 	snd-seq-midi.o \
 	snd-seq-virmidi.o \
-	snd-seq-oss.o" 
+	snd-seq-oss.o"
 FILES_${PN}-midi = "${@' '.join(map ((lambda x: '/lib/modules/*/misc/%s' % x), bb.data.getVar('midi_modules', d).split()))}"
 misc_modules = "snd-gus-synth.o \
 	snd-emu8000-synth.o \
@@ -72,9 +72,9 @@ if grep "CONFIG_ARCH_H3900=y" "${STAGING_KERNEL_DIR}/.config" ; then
   familiar_arch=ipaqpxa
 fi
 
-      fakeroot make -k NODEPMOD=yes DESTDIR=${D} install; 
+      fakeroot make -k NODEPMOD=yes DESTDIR=${D} install;
 
-      if [ -d ${D}${sysconfdir}/modutils/ ] ; then 
+      if [ -d ${D}${sysconfdir}/modutils/ ] ; then
          rm -r ${D}${sysconfdir}/modutils/ ;
       fi
       mkdir -p ${D}${sysconfdir}/modutils/
diff --git a/packages/alsa/alsa-oss_1.0.11.bb b/packages/alsa/alsa-oss_1.0.11.bb
index 89cd378c38..9a7751ee6b 100644
--- a/packages/alsa/alsa-oss_1.0.11.bb
+++ b/packages/alsa/alsa-oss_1.0.11.bb
@@ -7,7 +7,7 @@ PR = "r0"
 
 SRC_URI = "ftp://ftp.alsa-project.org/pub/oss-lib/alsa-oss-${PV}.tar.bz2"
 
-inherit autotools 
+inherit autotools
 
 do_configure_prepend () {
 	touch NEWS README AUTHORS ChangeLog
diff --git a/packages/altboot/altboot_0.0.0.bb b/packages/altboot/altboot_0.0.0.bb
index be73b0caed..0df86ad794 100644
--- a/packages/altboot/altboot_0.0.0.bb
+++ b/packages/altboot/altboot_0.0.0.bb
@@ -53,7 +53,7 @@ do_install() {
 	install -d ${D}/etc/altboot-menu/Advanced
 	install -d ${D}/etc/altboot.rc
 	install -d ${D}/usr/share/doc/altboot
-	install -d ${D}/usr/share/sounds		
+	install -d ${D}/usr/share/sounds
 
 	install -m 0644 ${WORKDIR}/beep.raw ${D}/usr/share/sounds
 	install -m 0644 ${WORKDIR}/altboot*.cfg ${D}/etc
@@ -61,14 +61,14 @@ do_install() {
 	install -m 0644 ${WORKDIR}/altbootctl.conf ${D}/etc
 	install -m 0755 ${WORKDIR}/init.altboot ${D}/sbin
 	install -m 0755 ${WORKDIR}/altbootctl ${D}/sbin
-	
+
 	install -m 0755 ${WORKDIR}/altboot-menu/*-* ${D}/etc/altboot-menu
 
 	install -m 0755 ${WORKDIR}/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced
-	
+
 	install -m 0755 ${WORKDIR}/altboot.rc/*.sh ${D}/etc/altboot.rc
-	install -m 0644 ${WORKDIR}/altboot.rc/*.txt ${D}/etc/altboot.rc	
-}		
+	install -m 0644 ${WORKDIR}/altboot.rc/*.txt ${D}/etc/altboot.rc
+}
 
 ######################################################################################
 
diff --git a/packages/altboot/altboot_1.0.5.bb b/packages/altboot/altboot_1.0.5.bb
index 8c9b21e232..2762001dbd 100644
--- a/packages/altboot/altboot_1.0.5.bb
+++ b/packages/altboot/altboot_1.0.5.bb
@@ -32,18 +32,18 @@ do_install() {
 	install -d ${D}/etc/altboot-menu/Advanced
 	install -d ${D}/etc/altboot.rc
 	install -d ${D}/usr/share/doc/altboot
-	
+
 	if test -d ${WORKDIR}/altboot/${MACHINE}
 	then
 		install -m 0644 ${WORKDIR}/altboot/${MACHINE}/altboot*.cfg ${D}/etc
 	else
 		install -m 0644 ${WORKDIR}/altboot/altboot*.cfg ${D}/etc
 	fi
-	
+
 	install -m 0644 ${WORKDIR}/altboot/altboot.func ${D}/etc
 	install -m 0755 ${WORKDIR}/altboot/init.altboot ${D}/sbin
-	
-	if test -d ${WORKDIR}/altboot/${MACHINE}/altboot-menu/	
+
+	if test -d ${WORKDIR}/altboot/${MACHINE}/altboot-menu/
 	then
 		install -m 0755 ${WORKDIR}/altboot/${MACHINE}/altboot-menu/*-* ${D}/etc/altboot-menu
 	else
@@ -56,10 +56,10 @@ do_install() {
 	else
 		install -m 0755 ${WORKDIR}/altboot/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced
 	fi
-	
+
 	install -m 0755 ${WORKDIR}/altboot/altboot.rc/*.sh ${D}/etc/altboot.rc
-	install -m 0644 ${WORKDIR}/altboot/altboot.rc/*.txt ${D}/etc/altboot.rc	
-}		
+	install -m 0644 ${WORKDIR}/altboot/altboot.rc/*.txt ${D}/etc/altboot.rc
+}
 
 ######################################################################################
 
diff --git a/packages/altboot/altboot_1.0.8.bb b/packages/altboot/altboot_1.0.8.bb
index 4c214796d7..c52c0972a3 100644
--- a/packages/altboot/altboot_1.0.8.bb
+++ b/packages/altboot/altboot_1.0.8.bb
@@ -51,7 +51,7 @@ do_install() {
 	install -d ${D}/etc/altboot.rc
 	install -d ${D}/usr/share/doc/altboot
 	install -d ${D}/usr/share/sounds
-	
+
 	if test -d ${WORKDIR}/altboot/${MACHINE}
 	then
 		install -m 0644 ${WORKDIR}/altboot/${MACHINE}/altboot*.cfg ${D}/etc
@@ -62,14 +62,14 @@ do_install() {
 	install -m 0644 ${WORKDIR}/altboot/beep.raw ${D}/usr/share/sounds
 	install -m 0644 ${WORKDIR}/altboot/altboot.func ${D}/etc
 	install -m 0755 ${WORKDIR}/altboot/init.altboot ${D}/sbin
-	
+
 	install -m 0755 ${WORKDIR}/altboot/altboot-menu/*-* ${D}/etc/altboot-menu
 
 	install -m 0755 ${WORKDIR}/altboot/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced
-	
+
 	install -m 0755 ${WORKDIR}/altboot/altboot.rc/*.sh ${D}/etc/altboot.rc
-	install -m 0644 ${WORKDIR}/altboot/altboot.rc/*.txt ${D}/etc/altboot.rc	
-}		
+	install -m 0644 ${WORKDIR}/altboot/altboot.rc/*.txt ${D}/etc/altboot.rc
+}
 
 ######################################################################################
 
diff --git a/packages/altboot/altboot_wip.bb b/packages/altboot/altboot_wip.bb
index 7e6d06e943..714a3d1d2b 100644
--- a/packages/altboot/altboot_wip.bb
+++ b/packages/altboot/altboot_wip.bb
@@ -56,7 +56,7 @@ do_install() {
 	install -d ${D}/usr/share/doc/altboot
 	install -d ${D}/usr/share/sounds
 	install -d ${D}/etc/skel/altboot
-	
+
 	if test -d ${WORKDIR}/altboot/${MACHINE}
 	then
 		install -m 0644 ${WORKDIR}/altboot/${MACHINE}/altboot*.cfg ${D}/etc/
@@ -66,17 +66,17 @@ do_install() {
 
 	install -m 0644 ${WORKDIR}/altboot/beep.raw ${D}/usr/share/sounds
 	install -m 0644 ${WORKDIR}/altboot/altboot.func ${D}/etc
-	install -m 0644 ${WORKDIR}/altboot/altbootctl.conf ${D}/etc	
+	install -m 0644 ${WORKDIR}/altboot/altbootctl.conf ${D}/etc
 	install -m 0755 ${WORKDIR}/altboot/init.altboot ${D}/sbin
 	install -m 0755 ${WORKDIR}/altboot/altbootctl ${D}/sbin
-	
+
 	install -m 0755 ${WORKDIR}/altboot/altboot-menu/*-* ${D}/etc/altboot-menu
 
 	install -m 0755 ${WORKDIR}/altboot/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced
-	
+
 	install -m 0755 ${WORKDIR}/altboot/altboot.rc/*.sh ${D}/etc/altboot.rc
-	install -m 0644 ${WORKDIR}/altboot/altboot.rc/*.txt ${D}/etc/altboot.rc	
-}		
+	install -m 0644 ${WORKDIR}/altboot/altboot.rc/*.txt ${D}/etc/altboot.rc
+}
 
 ######################################################################################
 
diff --git a/packages/angstrom/angstrom-bootmanager-image.bb b/packages/angstrom/angstrom-bootmanager-image.bb
index 9a0bf12a08..43c25eb1ba 100644
--- a/packages/angstrom/angstrom-bootmanager-image.bb
+++ b/packages/angstrom/angstrom-bootmanager-image.bb
@@ -7,9 +7,9 @@ RDEPENDS = "angstrom-base-depends angstrom-bootmanager"
 
 export IMAGE_BASENAME = "bootmanager-image"
 export IMAGE_LINGUAS = ""
-export IPKG_INSTALL = "${RDEPENDS}"
+export PACKAGE_INSTALL = "${RDEPENDS}"
 
-inherit image_ipk
+inherit image
 
 
 
diff --git a/packages/angstrom/angstrom-bootstrap-image.bb b/packages/angstrom/angstrom-bootstrap-image.bb
index d4ce272558..3977e223af 100644
--- a/packages/angstrom/angstrom-bootstrap-image.bb
+++ b/packages/angstrom/angstrom-bootstrap-image.bb
@@ -12,7 +12,7 @@ RDEPENDS = "task-base-core-default \
 
 export IMAGE_BASENAME = "bootstrap-image"
 export IMAGE_LINGUAS = ""
-export IPKG_INSTALL = "${RDEPENDS}"
+export PACKAGE_INSTALL = "${RDEPENDS}"
 
-inherit image_ipk
+inherit image
 
diff --git a/packages/angstrom/angstrom-gpe-image.bb b/packages/angstrom/angstrom-gpe-image.bb
index c0678431b2..d366a62bf7 100644
--- a/packages/angstrom/angstrom-gpe-image.bb
+++ b/packages/angstrom/angstrom-gpe-image.bb
@@ -25,9 +25,9 @@ RDEPENDS = "\
     ${ANGSTROM_EXTRA_INSTALL}"
 
 
-export IPKG_INSTALL = "${RDEPENDS}"
+export PACKAGE_INSTALL = "${RDEPENDS}"
 
 #zap root password for release images
-ROOTFS_POSTPROCESS_COMMAND += '${@base_conditional("DISTRO_TYPE", "release", "zap_root_password; ", "",d)}' 
+ROOTFS_POSTPROCESS_COMMAND += '${@base_conditional("DISTRO_TYPE", "release", "zap_root_password; ", "",d)}'
 
-inherit image_ipk
+inherit image
diff --git a/packages/angstrom/task-angstrom-x11.bb b/packages/angstrom/task-angstrom-x11.bb
index 817ac81f19..c7ac97d2e5 100644
--- a/packages/angstrom/task-angstrom-x11.bb
+++ b/packages/angstrom/task-angstrom-x11.bb
@@ -42,7 +42,7 @@ RDEPENDS_angstrom-gpe-task-base := "\
     gpe-autostarter \
     ${@base_contains("MACHINE_FEATURES", "touchscreen", "libgtkstylus", "",d)} \
     ${@base_contains("MACHINE_FEATURES", "keyboard", "", "libgtkinput",d)} \
-    ${@base_contains("MACHINE_FEATURES", "touchscreen", "detect-stylus", "",d)} \	
+    ${@base_contains("MACHINE_FEATURES", "touchscreen", "detect-stylus", "",d)} \
     suspend-desktop \
     teleport \
     xauth \
diff --git a/packages/apache/apache_2.0.54.bb b/packages/apache/apache_2.0.54.bb
index e988a97a24..2522658d32 100644
--- a/packages/apache/apache_2.0.54.bb
+++ b/packages/apache/apache_2.0.54.bb
@@ -75,9 +75,9 @@ do_install_append () {
 		    -e 's,/etc/,${sysconfdir}/,g' \
 		    -e 's,/usr/,${prefix}/,g' > ${D}/${sysconfdir}/init.d/apache
 	chmod 755 ${D}/${sysconfdir}/init.d/apache
-	
+
 	install -m 0644 ${FILESDIR}/httpd.conf ${D}/${sysconfdir}/apache/httpd.conf
-	
+
 	rm ${D}/${libdir}/libexpat.*
 }
 
diff --git a/packages/apache2/apache2-native_2.2.3.bb b/packages/apache2/apache2-native_2.2.3.bb
index 9c6c862ad7..b58aa41756 100644
--- a/packages/apache2/apache2-native_2.2.3.bb
+++ b/packages/apache2/apache2-native_2.2.3.bb
@@ -29,9 +29,9 @@ do_populate_staging () {
 	cp build/instdso.sh ${STAGING_DIR}/build
 	cp .libs/httpd ${STAGING_BINDIR}
 
-	(cd srclib/apr/.libs; tar -cf - libapr-*.so* ) | 
+	(cd srclib/apr/.libs; tar -cf - libapr-*.so* ) |
 	  (cd ${STAGING_LIBDIR}; tar -xf - )
-	(cd srclib/apr-util/.libs; tar -cf - libaprutil-*.so* ) | 
+	(cd srclib/apr-util/.libs; tar -cf - libaprutil-*.so* ) |
 	  (cd ${STAGING_LIBDIR}; tar -xf - )
 
     	mkdir -p ${STAGING_INCDIR}/apache2
diff --git a/packages/apache2/apache2_2.2.3.bb b/packages/apache2/apache2_2.2.3.bb
index 4c95a25477..aaf5ab4298 100644
--- a/packages/apache2/apache2_2.2.3.bb
+++ b/packages/apache2/apache2_2.2.3.bb
@@ -19,7 +19,7 @@ S = "${WORKDIR}/httpd-${PV}"
 #
 # implications - autotools defines suitable do_configure, do_install, etc.
 # update-rc.d adds hooks for rc-update.
-# 
+#
 #
 inherit autotools update-rc.d
 
@@ -60,7 +60,7 @@ FILES_${PN} =  "${bindir} ${sbindir} ${libexecdir} ${libdir}/lib*.so.* ${sysconf
 		${sharedstatedir} ${localstatedir} /bin /sbin /lib/*.so* \
 		${libdir}/${PN}"
 
-# we want htdocs and cgi-bin to go with the binary 
+# we want htdocs and cgi-bin to go with the binary
 FILES_${PN} += "${datadir}/${PN}/htdocs ${datadir}/${PN}/cgi-bin"
 
 #make sure the lone .so links also get wrapped in the base package
diff --git a/packages/apmd/apmd_3.2.2.bb b/packages/apmd/apmd_3.2.2.bb
index 94541581d3..4313115c91 100644
--- a/packages/apmd/apmd_3.2.2.bb
+++ b/packages/apmd/apmd_3.2.2.bb
@@ -3,7 +3,7 @@ SECTION = "base"
 PRIORITY = "required"
 DEPENDS = "libtool-cross"
 LICENSE = "GPL"
-PR = "r7"
+PR = "r8"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/a/apmd/apmd_${PV}.orig.tar.gz; \
            file://debian.patch;patch=1 \
@@ -44,6 +44,7 @@ do_install() {
 	install -d ${D}${bindir}
 	install -d ${D}${libdir}
 	install -d ${D}${datadir}/apmd
+	install -d ${D}${includedir}
 
 	install -m 4755 ${S}/.libs/apm ${D}${bindir}/apm
 	install -m 0755 ${S}/.libs/apmd ${D}${sbindir}/apmd
diff --git a/packages/application-registry/application-registry_0.1.bb b/packages/application-registry/application-registry_0.1.bb
index 9fe339d566..1ebfbdd907 100644
--- a/packages/application-registry/application-registry_0.1.bb
+++ b/packages/application-registry/application-registry_0.1.bb
@@ -11,7 +11,7 @@ SRC_URI = "file://abiword.applications \
            file://gnumeric.applications \
            file://gpe-calendar.applications \
            file://gpe-contacts.applications \
-           file://ipkg.applications" 
+           file://ipkg.applications"
 
 
 do_install_append () {
diff --git a/packages/appweb/appweb_1.2.0.bb b/packages/appweb/appweb_1.2.0.bb
index 8bd6d778f0..9c1b9d94f0 100644
--- a/packages/appweb/appweb_1.2.0.bb
+++ b/packages/appweb/appweb_1.2.0.bb
@@ -55,10 +55,10 @@ require appweb.inc
 #  --with-esp               Include the ESP handler.
 #  --with-ssl               Build support for the SSL protocol.
 #  --with-upload            Build with the file upload handler
-#  --with-xdb               Build with XDB 
+#  --with-xdb               Build with XDB
 #  Supported PACKAGE names: openssl, php4, php5
-#  --with-PACKAGE=[builtin|, module]       
-#                           Include support for the PACKAGE. Link into appWeb 
+#  --with-PACKAGE=[builtin|, module]
+#                           Include support for the PACKAGE. Link into appWeb
 #                           statically and/or build as a module
 #  --with-PACKAGE-dir=DIR   Set the source directory of the package
 #  --with-PACKAGE-libs=libs Set a list of libraries to use when linking with
diff --git a/packages/appweb/appweb_2.0.4.bb b/packages/appweb/appweb_2.0.4.bb
index 7f7941012a..59682840a3 100644
--- a/packages/appweb/appweb_2.0.4.bb
+++ b/packages/appweb/appweb_2.0.4.bb
@@ -56,10 +56,10 @@ require appweb.inc
 #  --with-esp               Include the ESP handler.
 #  --with-ssl               Build support for the SSL protocol.
 #  --with-upload            Build with the file upload handler
-#  --with-xdb               Build with XDB 
+#  --with-xdb               Build with XDB
 #  Supported PACKAGE names: openssl, php4, php5
-#  --with-PACKAGE=[builtin|, module]       
-#                           Include support for the PACKAGE. Link into appWeb 
+#  --with-PACKAGE=[builtin|, module]
+#                           Include support for the PACKAGE. Link into appWeb
 #                           statically and/or build as a module
 #  --with-PACKAGE-dir=DIR   Set the source directory of the package
 #  --with-PACKAGE-libs=libs Set a list of libraries to use when linking with
diff --git a/packages/apr/apr-util_0.9.12.bb b/packages/apr/apr-util_0.9.12.bb
index 776fd03bfe..b726f2adf1 100644
--- a/packages/apr/apr-util_0.9.12.bb
+++ b/packages/apr/apr-util_0.9.12.bb
@@ -14,7 +14,7 @@ EXTRA_OECONF = "--with-apr=${STAGING_BINDIR_CROSS} --with-dbm=gdbm --with-gdbm=$
 inherit autotools lib_package binconfig
 
 do_configure() {
-	cp ${S}/../uri_delims.h ${S}/uri/. 
+	cp ${S}/../uri_delims.h ${S}/uri/.
 	oe_runconf
 }
 
diff --git a/packages/ark3116/ark3116_0.4.1.bb b/packages/ark3116/ark3116_0.4.1.bb
index efcadfaf94..89bcfa85d9 100644
--- a/packages/ark3116/ark3116_0.4.1.bb
+++ b/packages/ark3116/ark3116_0.4.1.bb
@@ -5,10 +5,10 @@ SECTION = "kernel/modules"
 LICENSE = "GPL"
 PR = "r2"
 RRECOMMENDS = "kernel-module-usbserial"
- 
+
 SRC_URI = "http://avr.auctionant.de/ark3116_linux_driver/releases/ark3116-0.4.1.tgz \
            file://ark3116.c.patch;patch=1 \
-           file://Makefile.patch;patch=1" 
+           file://Makefile.patch;patch=1"
 
 S = "${WORKDIR}/ark3116"
 
@@ -23,12 +23,12 @@ CFLAGS_append_armeb = " '-D__LINUX_ARM_ARCH__=5' "
 EXTRA_OEMAKE = "'V=1' 'CFLAGS=${CFLAGS}' \
                 'CC=${KERNEL_CC}' \
                 'LD=${KERNEL_LD}' \
-                'KDIR=${STAGING_KERNEL_DIR}'" 
+                'KDIR=${STAGING_KERNEL_DIR}'"
 
 export TARGET_LDFLAGS = "-L${STAGING_DIR}/${TARGET_SYS}/lib \
                          -Wl,-rpath-link,${STAGING_DIR}/${TARGET_SYS}/lib"
 
-do_install() {   
+do_install() {
         install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/serial
         install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/serial
 }
diff --git a/packages/asterisk-sounds/asterisk-sounds_1.2.1.bb b/packages/asterisk-sounds/asterisk-sounds_1.2.1.bb
index 3a07f2cb0d..2a0dbbc82f 100644
--- a/packages/asterisk-sounds/asterisk-sounds_1.2.1.bb
+++ b/packages/asterisk-sounds/asterisk-sounds_1.2.1.bb
@@ -4,7 +4,7 @@ LICENSE="GPL"
 DEPENDS="asterisk"
 PR = "r1"
 
-SRC_URI="http://ftp.digium.com/pub/asterisk/releases/asterisk-sounds-${PV}.tar.gz" 
+SRC_URI="http://ftp.digium.com/pub/asterisk/releases/asterisk-sounds-${PV}.tar.gz"
 
 do_install() {
         oe_runmake DESTDIR=${D} install
diff --git a/packages/atmelwlandriver/atmelwlandriver_3.3.5.6.bb b/packages/atmelwlandriver/atmelwlandriver_3.3.5.6.bb
index ad07c26b53..18df2e860b 100644
--- a/packages/atmelwlandriver/atmelwlandriver_3.3.5.6.bb
+++ b/packages/atmelwlandriver/atmelwlandriver_3.3.5.6.bb
@@ -19,7 +19,7 @@ do_compile() {
 	export OBJDIR="${D}${base_libdir}/modules/${KERNEL_VERSION}/drivers/net/wireless/atmel/"
 	export KERNEL_PATH="${STAGING_KERNEL_DIR}"
 	export KERNEL_SRC="${STAGING_KERNEL_DIR}"
-	export CC="${KERNEL_CC}" 
+	export CC="${KERNEL_CC}"
 	export LD="${KERNEL_LD}"
 	export KERNEL_VERSION="${KERNEL_VERSION}"
 	export TOPDIR="${S}"
diff --git a/packages/atmelwlandriver/atmelwlandriver_3.4.1.0.bb b/packages/atmelwlandriver/atmelwlandriver_3.4.1.0.bb
index 333d8f12ec..705ab532fc 100644
--- a/packages/atmelwlandriver/atmelwlandriver_3.4.1.0.bb
+++ b/packages/atmelwlandriver/atmelwlandriver_3.4.1.0.bb
@@ -29,8 +29,8 @@ do_compile() {
 	export OBJDIR="${D}${base_libdir}/modules/${KERNEL_VERSION}/drivers/net/wireless/atmel/"
 	export KERNEL_PATH="${STAGING_KERNEL_DIR}"
 	export KERNEL_SRC="${STAGING_KERNEL_DIR}"
-	export CC="${KERNEL_CC}" 
-	export CCC="${KERNEL_CC}" 
+	export CC="${KERNEL_CC}"
+	export CCC="${KERNEL_CC}"
 	export LD="${KERNEL_LD}"
 	export KERNEL_VERSION="${KERNEL_VERSION}"
 	export TOPDIR="${S}"
diff --git a/packages/audiofile/audiofile_0.2.6.bb b/packages/audiofile/audiofile_0.2.6.bb
index d87e62cbec..bfa113dc2d 100644
--- a/packages/audiofile/audiofile_0.2.6.bb
+++ b/packages/audiofile/audiofile_0.2.6.bb
@@ -4,7 +4,7 @@ LICENSE = "LGPL GPL"
 DESCRIPTION = "The Audio File Library provides a uniform and elegant \
 API for accessing a variety of audio file formats, such as AIFF/AIFF-C, \
 WAVE, NeXT/Sun .snd/.au, Berkeley/IRCAM/CARL Sound File, Audio Visual \
-Research, Amiga IFF/8SVX, and NIST SPHERE." 
+Research, Amiga IFF/8SVX, and NIST SPHERE."
 
 PACKAGES += "${PN}-bin"
 FILES_${PN} = "${libdir}/libaudiofile*.so.*"
diff --git a/packages/avetanabt/avetanabt_20060413.bb b/packages/avetanabt/avetanabt_20060413.bb
index 5140b07874..be88139319 100644
--- a/packages/avetanabt/avetanabt_20060413.bb
+++ b/packages/avetanabt/avetanabt_20060413.bb
@@ -34,7 +34,7 @@ do_compile() {
   # move classes into jar archive
   # jar -> fastjar
   ${STAGING_BINDIR_NATIVE}/fastjar -v -cf avetanaBT.jar -C build de -C build javax -C build com -C build version.xml
-  
+
   # JNI generated header file - de_avetana_bluetooth_stack_BlueZ.h
   # javah -> kaffeh
   ${STAGING_BINDIR_NATIVE}/kaffeh -jni -classpath avetanaBT.jar:${STAGING_DIR}/${BUILD_SYS}/share/kaffeh/rt.jar -d c de.avetana.bluetooth.stack.BlueZ
@@ -58,5 +58,5 @@ do_install() {
 
   install -d ${D}${datadir}/avetanabt
   install avetanaBT.jar ${D}${datadir}/avetanabt/
- 
+
 }
diff --git a/packages/avetanabt/avetanabt_cvs.bb b/packages/avetanabt/avetanabt_cvs.bb
index 66ee81d99a..a5c9ce0ac7 100644
--- a/packages/avetanabt/avetanabt_cvs.bb
+++ b/packages/avetanabt/avetanabt_cvs.bb
@@ -37,7 +37,7 @@ do_compile() {
   # move classes into jar archive
   # jar -> fastjar
   ${STAGING_BINDIR_NATIVE}/fastjar -v -cf avetanaBT.jar -C build de -C build javax -C build com -C build version.xml
-  
+
   # JNI generated header file - de_avetana_bluetooth_stack_BlueZ.h
   # javah -> kaffeh
   ${STAGING_BINDIR_NATIVE}/kaffeh -jni -classpath avetanaBT.jar:${STAGING_DIR}/${BUILD_SYS}/share/kaffeh/rt.jar -d c de.avetana.bluetooth.stack.BlueZ
@@ -61,5 +61,5 @@ do_install() {
 
   install -d ${D}${datadir}/avetanabt
   install avetanaBT.jar ${D}${datadir}/avetanabt/
- 
+
 }
diff --git a/packages/base-passwd/base-passwd_3.5.9.bb b/packages/base-passwd/base-passwd_3.5.9.bb
index 6fcb211bda..051b8d6a3f 100644
--- a/packages/base-passwd/base-passwd_3.5.9.bb
+++ b/packages/base-passwd/base-passwd_3.5.9.bb
@@ -51,7 +51,7 @@ pkg_postinst () {
 	if [ ! -e $D${sysconfdir}/passwd ] ; then
 		cp $D${datadir}/base-passwd/passwd.master $D${sysconfdir}/passwd
 	fi
-	
+
 	if [ ! -e $D${sysconfdir}/group ] ; then
 		cp $D${datadir}/base-passwd/group.master $D${sysconfdir}/group
 	fi
diff --git a/packages/beepmp/beepmp_0.9.7.bb b/packages/beepmp/beepmp_0.9.7.bb
index c02c2f8675..e83237a18b 100644
--- a/packages/beepmp/beepmp_0.9.7.bb
+++ b/packages/beepmp/beepmp_0.9.7.bb
@@ -17,10 +17,10 @@ S = "${WORKDIR}/bmp-0.9.7"
 
 FILES_${PN} += " ${libdir}/bmp/Output/*.so ${libdir}/bmp/Input/*.so \
 	${libdir}/bmp/Visualization/*.so ${datadir}/bmp"
-	
+
 EXTRA_OECONF = "--disable-esd --disable-alsa --enable-simd"
 
 do_configure() {
 	rm -rf  m4/libtool.m4
-	autotools_do_configure	
+	autotools_do_configure
 }
diff --git a/packages/billiardz/billiardz_0.1.4.bb b/packages/billiardz/billiardz_0.1.4.bb
index 34b79ec1e9..3e7502fa67 100644
--- a/packages/billiardz/billiardz_0.1.4.bb
+++ b/packages/billiardz/billiardz_0.1.4.bb
@@ -12,7 +12,7 @@ SRC_URI = "http://www.chipx86.com/packages/ipkg/billiardz-${PV}.tar.gz \
 inherit palmtop
 
 QMAKE_PROFILES = "billiardz.arm.pro"
-EXTRA_QMAKEVARS_POST += "DEFINES-=FPM_INTEL" 
+EXTRA_QMAKEVARS_POST += "DEFINES-=FPM_INTEL"
 
 do_install() {
         install -d ${D}${palmtopdir}/bin \
diff --git a/packages/binutils/binutils-cross-sdk_2.16.91.0.6.bb b/packages/binutils/binutils-cross-sdk_2.16.91.0.6.bb
index 9161a520ff..7d3bb6c09c 100644
--- a/packages/binutils/binutils-cross-sdk_2.16.91.0.6.bb
+++ b/packages/binutils/binutils-cross-sdk_2.16.91.0.6.bb
@@ -12,7 +12,7 @@ do_stage() {
 
 do_install () {
         autotools_do_install
-                                                                               
+
         # Install the libiberty header
         install -d ${D}${includedir}
         install -m 644 ${S}/include/ansidecl.h ${D}${includedir}
diff --git a/packages/binutils/binutils-cross-sdk_2.16.91.0.7.bb b/packages/binutils/binutils-cross-sdk_2.16.91.0.7.bb
index 9161a520ff..7d3bb6c09c 100644
--- a/packages/binutils/binutils-cross-sdk_2.16.91.0.7.bb
+++ b/packages/binutils/binutils-cross-sdk_2.16.91.0.7.bb
@@ -12,7 +12,7 @@ do_stage() {
 
 do_install () {
         autotools_do_install
-                                                                               
+
         # Install the libiberty header
         install -d ${D}${includedir}
         install -m 644 ${S}/include/ansidecl.h ${D}${includedir}
diff --git a/packages/binutils/binutils_2.17.50.0.5.bb b/packages/binutils/binutils_2.17.50.0.5.bb
index 2e61a3c7b2..dc73dc6909 100644
--- a/packages/binutils/binutils_2.17.50.0.5.bb
+++ b/packages/binutils/binutils_2.17.50.0.5.bb
@@ -10,4 +10,4 @@ SRC_URI = \
      file://binutils-uclibc-300-001_ld_makefile_patch.patch;patch=1 \
      file://binutils-uclibc-300-006_better_file_error.patch;patch=1 \
      file://binutils-uclibc-300-012_check_ldrunpath_length.patch;patch=1 \
-     "	
+     "
diff --git a/packages/binutils/binutils_2.17.50.0.8.bb b/packages/binutils/binutils_2.17.50.0.8.bb
index 49bacac9c5..f832d97cd1 100644
--- a/packages/binutils/binutils_2.17.50.0.8.bb
+++ b/packages/binutils/binutils_2.17.50.0.8.bb
@@ -9,4 +9,4 @@ SRC_URI = \
      file://binutils-uclibc-300-001_ld_makefile_patch.patch;patch=1 \
      file://binutils-uclibc-300-006_better_file_error.patch;patch=1 \
      file://binutils-uclibc-300-012_check_ldrunpath_length.patch;patch=1 \
-     "	
+     "
diff --git a/packages/bl/bl_cvs.bb b/packages/bl/bl_cvs.bb
index 11d338bb6e..2072ea10e5 100644
--- a/packages/bl/bl_cvs.bb
+++ b/packages/bl/bl_cvs.bb
@@ -7,7 +7,7 @@ SRC_URI = "${HANDHELDS_CVS};module=apps/h3600_test \
            file://nokernelheader.patch;patch=1;pnum=0 \
 	   file://zaurus-hinge.bl-on \
 	   file://zaurus-hinge.bl-off"
-	   
+
 
 S = "${WORKDIR}/h3600_test"
 PR = "r1"
@@ -24,17 +24,17 @@ do_compile (){
 }
 
 do_install () {
-        install -d ${D}${bindir}	
+        install -d ${D}${bindir}
         install -d ${D}/etc/apm/resume.d
 	install -d ${D}/etc/zaurusd/hinge-close.d
-	install -d ${D}/etc/zaurusd/hinge-portrait.d	
-	install -d ${D}/etc/zaurusd/hinge-landscape.d	
+	install -d ${D}/etc/zaurusd/hinge-portrait.d
+	install -d ${D}/etc/zaurusd/hinge-landscape.d
 
         install -m 4755 ${S}/bl ${D}${bindir}/bl
-	
-	install -m 0755 "${WORKDIR}/zaurus-hinge.bl-on" "${D}/etc/apm/resume.d/00-backlight-on"		
-	install -m 0755 "${WORKDIR}/zaurus-hinge.bl-on" "${D}/etc/zaurusd/hinge-landscape.d/00-backlight-on"	
-	install -m 0755 "${WORKDIR}/zaurus-hinge.bl-on" "${D}/etc/zaurusd/hinge-portrait.d/00-backlight-on"	
-	install -m 0755 "${WORKDIR}/zaurus-hinge.bl-off" "${D}/etc/zaurusd/hinge-close.d/00-backlight-off"	
-	
-}	
+
+	install -m 0755 "${WORKDIR}/zaurus-hinge.bl-on" "${D}/etc/apm/resume.d/00-backlight-on"
+	install -m 0755 "${WORKDIR}/zaurus-hinge.bl-on" "${D}/etc/zaurusd/hinge-landscape.d/00-backlight-on"
+	install -m 0755 "${WORKDIR}/zaurus-hinge.bl-on" "${D}/etc/zaurusd/hinge-portrait.d/00-backlight-on"
+	install -m 0755 "${WORKDIR}/zaurus-hinge.bl-off" "${D}/etc/zaurusd/hinge-close.d/00-backlight-off"
+
+}
diff --git a/packages/boost/boost_1.33.0.bb b/packages/boost/boost_1.33.0.bb
index 4c709e6842..0a72d360d6 100644
--- a/packages/boost/boost_1.33.0.bb
+++ b/packages/boost/boost_1.33.0.bb
@@ -93,7 +93,7 @@ FILES_${PN}-dev = "${includedir} ${libdir}/libboost_*.so ${libdir}/libboost_*.a"
 # it.  The problem is that the user.hpp configuration file must receive a
 # pre-processor macro defined as the appropriate string - complete with "'s
 # around it.  (<> is a possibility here but the danger to that is that the
-# failure case interprets the < and > as shell redirections, creating 
+# failure case interprets the < and > as shell redirections, creating
 # random files in the source tree.)
 #
 #bjam: '-DBOOST_PLATFORM_CONFIG=\"config\"'
diff --git a/packages/boost/boost_1.33.1.bb b/packages/boost/boost_1.33.1.bb
index 61233d21c5..4de97661d3 100644
--- a/packages/boost/boost_1.33.1.bb
+++ b/packages/boost/boost_1.33.1.bb
@@ -93,7 +93,7 @@ FILES_${PN}-dev = "${includedir} ${libdir}/libboost_*.so ${libdir}/libboost_*.a"
 # it.  The problem is that the user.hpp configuration file must receive a
 # pre-processor macro defined as the appropriate string - complete with "'s
 # around it.  (<> is a possibility here but the danger to that is that the
-# failure case interprets the < and > as shell redirections, creating 
+# failure case interprets the < and > as shell redirections, creating
 # random files in the source tree.)
 #
 #bjam: '-DBOOST_PLATFORM_CONFIG=\"config\"'
diff --git a/packages/bootchart/bootchart_0.9.bb b/packages/bootchart/bootchart_0.9.bb
index 44fd3f45fa..98ff0c204d 100644
--- a/packages/bootchart/bootchart_0.9.bb
+++ b/packages/bootchart/bootchart_0.9.bb
@@ -3,7 +3,7 @@ LICENSE = "GPLv2"
 HOMEPAGE = "http://www.bootchart.org/"
 PR = "r1"
 
-#this only installs the loggers, you will need to run the renderers on your workstation 
+#this only installs the loggers, you will need to run the renderers on your workstation
 #boot with 'init=/sbin/bootchartd' and do '/sbin/bootchartd stop' to end the logging
 
 #needed for a real /bin/sh and /bin/sleep
@@ -16,7 +16,7 @@ PACKAGE_ARCH = "all"
 SRC_URI = "${SOURCEFORGE_MIRROR}/bootchart/bootchart-${PV}.tar.bz2\
            file://handheld.patch;patch=1"
 
- 		
+
 do_install() {
 	install -d ${D}/sbin
 	install -d ${D}/etc
diff --git a/packages/btsco/btsco_0.42.bb b/packages/btsco/btsco_0.42.bb
index 1a8061ce07..3fa6b0636b 100644
--- a/packages/btsco/btsco_0.42.bb
+++ b/packages/btsco/btsco_0.42.bb
@@ -3,7 +3,7 @@ require btsco.inc
 #there are some bogus macros putting -I/usr/include into C(PP)FLAGS, lets fix that
 do_configure() {
 	libtoolize --force
-	gnu-configize 
+	gnu-configize
 	sed -i 's:-I${bluez_prefix}/include::g' configure
 	oe_runconf
-}	
+}
diff --git a/packages/busybox/busybox_1.00.bb b/packages/busybox/busybox_1.00.bb
index 76c487be04..073a561e22 100644
--- a/packages/busybox/busybox_1.00.bb
+++ b/packages/busybox/busybox_1.00.bb
@@ -46,36 +46,36 @@ do_install () {
 
 	install -m 0755 ${WORKDIR}/syslog ${D}${sysconfdir}/init.d/
 	install -m 644 ${WORKDIR}/syslog.conf ${D}${sysconfdir}/
-	if grep "CONFIG_CROND=y" ${WORKDIR}/defconfig; then 
+	if grep "CONFIG_CROND=y" ${WORKDIR}/defconfig; then
 		# Move crond back to /usr/sbin/crond
 		install -d ${D}${sbindir}
 		mv ${D}/busybox${sbindir}/crond ${D}${sbindir}/
 
 		install -m 0755 ${WORKDIR}/busybox-cron ${D}${sysconfdir}/init.d/
 	fi
-	if grep "CONFIG_HTTPD=y" ${WORKDIR}/defconfig; then 
+	if grep "CONFIG_HTTPD=y" ${WORKDIR}/defconfig; then
 		# Move httpd back to /usr/sbin/httpd
 		install -d ${D}${sbindir}
 		mv ${D}/busybox${sbindir}/httpd ${D}${sbindir}/
-					
+
 		install -m 0755 ${WORKDIR}/busybox-httpd ${D}${sysconfdir}/init.d/
 		install -d ${D}/srv/www
 	fi
-	if grep "CONFIG_UDHCPD=y" ${WORKDIR}/defconfig; then 
+	if grep "CONFIG_UDHCPD=y" ${WORKDIR}/defconfig; then
 		# Move udhcpd back to /usr/sbin/udhcpd
 		install -d ${D}${sbindir}
 		mv ${D}/busybox${sbindir}/udhcpd ${D}${sbindir}/
-					
+
 		install -m 0755 ${WORKDIR}/busybox-udhcpd ${D}${sysconfdir}/init.d/
 	fi
-	if grep "CONFIG_HWCLOCK=y" ${WORKDIR}/defconfig; then 
+	if grep "CONFIG_HWCLOCK=y" ${WORKDIR}/defconfig; then
 		# Move hwclock back to /sbin/hwclock
 		install -d ${D}${base_sbindir}
 		mv ${D}/busybox${base_sbindir}/hwclock ${D}${base_sbindir}/
-					
+
 		install -m 0755 ${WORKDIR}/hwclock.sh ${D}${sysconfdir}/init.d/
 	fi
-	if grep "CONFIG_UDHCPC=y" ${WORKDIR}/defconfig; then 
+	if grep "CONFIG_UDHCPC=y" ${WORKDIR}/defconfig; then
 		# Move dhcpc back to /usr/sbin/udhcpc
 		install -d ${D}${base_sbindir}
 		mv ${D}/busybox${base_sbindir}/udhcpc ${D}${base_sbindir}/
diff --git a/packages/busybox/busybox_1.01.bb b/packages/busybox/busybox_1.01.bb
index 49766ef243..22e7e064a5 100644
--- a/packages/busybox/busybox_1.01.bb
+++ b/packages/busybox/busybox_1.01.bb
@@ -42,36 +42,36 @@ do_install () {
 
 	install -m 0755 ${WORKDIR}/syslog ${D}${sysconfdir}/init.d/
 	install -m 644 ${WORKDIR}/syslog.conf ${D}${sysconfdir}/
-	if grep "CONFIG_CROND=y" ${WORKDIR}/defconfig; then 
+	if grep "CONFIG_CROND=y" ${WORKDIR}/defconfig; then
 		# Move crond back to /usr/sbin/crond
 		install -d ${D}${sbindir}
 		mv ${D}/busybox${sbindir}/crond ${D}${sbindir}/
 
 		install -m 0755 ${WORKDIR}/busybox-cron ${D}${sysconfdir}/init.d/
 	fi
-	if grep "CONFIG_HTTPD=y" ${WORKDIR}/defconfig; then 
+	if grep "CONFIG_HTTPD=y" ${WORKDIR}/defconfig; then
 		# Move httpd back to /usr/sbin/httpd
 		install -d ${D}${sbindir}
 		mv ${D}/busybox${sbindir}/httpd ${D}${sbindir}/
-					
+
 		install -m 0755 ${WORKDIR}/busybox-httpd ${D}${sysconfdir}/init.d/
 		install -d ${D}/srv/www
 	fi
-	if grep "CONFIG_UDHCPD=y" ${WORKDIR}/defconfig; then 
+	if grep "CONFIG_UDHCPD=y" ${WORKDIR}/defconfig; then
 		# Move udhcpd back to /usr/sbin/udhcpd
 		install -d ${D}${sbindir}
 		mv ${D}/busybox${sbindir}/udhcpd ${D}${sbindir}/
-					
+
 		install -m 0755 ${WORKDIR}/busybox-udhcpd ${D}${sysconfdir}/init.d/
 	fi
-	if grep "CONFIG_HWCLOCK=y" ${WORKDIR}/defconfig; then 
+	if grep "CONFIG_HWCLOCK=y" ${WORKDIR}/defconfig; then
 		# Move hwclock back to /sbin/hwclock
 		install -d ${D}${base_sbindir}
 		mv ${D}/busybox${base_sbindir}/hwclock ${D}${base_sbindir}/
-					
+
 		install -m 0755 ${WORKDIR}/hwclock.sh ${D}${sysconfdir}/init.d/
 	fi
-	if grep "CONFIG_UDHCPC=y" ${WORKDIR}/defconfig; then 
+	if grep "CONFIG_UDHCPC=y" ${WORKDIR}/defconfig; then
 		# Move dhcpc back to /usr/sbin/udhcpc
 		install -d ${D}${base_sbindir}
 		mv ${D}/busybox${base_sbindir}/udhcpc ${D}${base_sbindir}/
diff --git a/packages/busybox/busybox_1.2.0.bb b/packages/busybox/busybox_1.2.0.bb
index a4157082e8..db8dd68c01 100644
--- a/packages/busybox/busybox_1.2.0.bb
+++ b/packages/busybox/busybox_1.2.0.bb
@@ -36,36 +36,36 @@ do_install () {
 
 	install -m 0755 ${WORKDIR}/syslog ${D}${sysconfdir}/init.d/
 	install -m 644 ${WORKDIR}/syslog.conf ${D}${sysconfdir}/
-	if grep "CONFIG_CROND=y" ${WORKDIR}/defconfig; then 
+	if grep "CONFIG_CROND=y" ${WORKDIR}/defconfig; then
 		# Move crond back to /usr/sbin/crond
 		install -d ${D}${sbindir}
 		mv ${D}/busybox${sbindir}/crond ${D}${sbindir}/
 
 		install -m 0755 ${WORKDIR}/busybox-cron ${D}${sysconfdir}/init.d/
 	fi
-	if grep "CONFIG_HTTPD=y" ${WORKDIR}/defconfig; then 
+	if grep "CONFIG_HTTPD=y" ${WORKDIR}/defconfig; then
 		# Move httpd back to /usr/sbin/httpd
 		install -d ${D}${sbindir}
 		mv ${D}/busybox${sbindir}/httpd ${D}${sbindir}/
-					
+
 		install -m 0755 ${WORKDIR}/busybox-httpd ${D}${sysconfdir}/init.d/
 		install -d ${D}/srv/www
 	fi
-	if grep "CONFIG_APP_UDHCPD=y" ${WORKDIR}/defconfig; then 
+	if grep "CONFIG_APP_UDHCPD=y" ${WORKDIR}/defconfig; then
 		# Move udhcpd back to /usr/sbin/udhcpd
 		install -d ${D}${sbindir}
 		mv ${D}/busybox${sbindir}/udhcpd ${D}${sbindir}/
-					
+
 		install -m 0755 ${WORKDIR}/busybox-udhcpd ${D}${sysconfdir}/init.d/
 	fi
-	if grep "CONFIG_HWCLOCK=y" ${WORKDIR}/defconfig; then 
+	if grep "CONFIG_HWCLOCK=y" ${WORKDIR}/defconfig; then
 		# Move hwclock back to /sbin/hwclock
 		install -d ${D}${base_sbindir}
 		mv ${D}/busybox${base_sbindir}/hwclock ${D}${base_sbindir}/
-					
+
 		install -m 0755 ${WORKDIR}/hwclock.sh ${D}${sysconfdir}/init.d/
 	fi
-	if grep "CONFIG_APP_UDHCPC=y" ${WORKDIR}/defconfig; then 
+	if grep "CONFIG_APP_UDHCPC=y" ${WORKDIR}/defconfig; then
 		# Move dhcpc back to /usr/sbin/udhcpc
 		install -d ${D}${base_sbindir}
 		mv ${D}/busybox${base_sbindir}/udhcpc ${D}${base_sbindir}/
diff --git a/packages/busybox/busybox_1.2.1.bb b/packages/busybox/busybox_1.2.1.bb
index 9205b57d6f..d7d28ffeb2 100644
--- a/packages/busybox/busybox_1.2.1.bb
+++ b/packages/busybox/busybox_1.2.1.bb
@@ -36,36 +36,36 @@ do_install () {
 
 	install -m 0755 ${WORKDIR}/syslog ${D}${sysconfdir}/init.d/
 	install -m 644 ${WORKDIR}/syslog.conf ${D}${sysconfdir}/
-	if grep "CONFIG_CROND=y" ${WORKDIR}/defconfig; then 
+	if grep "CONFIG_CROND=y" ${WORKDIR}/defconfig; then
 		# Move crond back to /usr/sbin/crond
 		install -d ${D}${sbindir}
 		mv ${D}/busybox${sbindir}/crond ${D}${sbindir}/
 
 		install -m 0755 ${WORKDIR}/busybox-cron ${D}${sysconfdir}/init.d/
 	fi
-	if grep "CONFIG_HTTPD=y" ${WORKDIR}/defconfig; then 
+	if grep "CONFIG_HTTPD=y" ${WORKDIR}/defconfig; then
 		# Move httpd back to /usr/sbin/httpd
 		install -d ${D}${sbindir}
 		mv ${D}/busybox${sbindir}/httpd ${D}${sbindir}/
-					
+
 		install -m 0755 ${WORKDIR}/busybox-httpd ${D}${sysconfdir}/init.d/
 		install -d ${D}/srv/www
 	fi
-	if grep "CONFIG_APP_UDHCPD=y" ${WORKDIR}/defconfig; then 
+	if grep "CONFIG_APP_UDHCPD=y" ${WORKDIR}/defconfig; then
 		# Move udhcpd back to /usr/sbin/udhcpd
 		install -d ${D}${sbindir}
 		mv ${D}/busybox${sbindir}/udhcpd ${D}${sbindir}/
-					
+
 		install -m 0755 ${WORKDIR}/busybox-udhcpd ${D}${sysconfdir}/init.d/
 	fi
-	if grep "CONFIG_HWCLOCK=y" ${WORKDIR}/defconfig; then 
+	if grep "CONFIG_HWCLOCK=y" ${WORKDIR}/defconfig; then
 		# Move hwclock back to /sbin/hwclock
 		install -d ${D}${base_sbindir}
 		mv ${D}/busybox${base_sbindir}/hwclock ${D}${base_sbindir}/
-					
+
 		install -m 0755 ${WORKDIR}/hwclock.sh ${D}${sysconfdir}/init.d/
 	fi
-	if grep "CONFIG_APP_UDHCPC=y" ${WORKDIR}/defconfig; then 
+	if grep "CONFIG_APP_UDHCPC=y" ${WORKDIR}/defconfig; then
 		# Move dhcpc back to /usr/sbin/udhcpc
 		install -d ${D}${base_sbindir}
 		mv ${D}/busybox${base_sbindir}/udhcpc ${D}${base_sbindir}/
diff --git a/packages/busybox/busybox_1.2.2.bb b/packages/busybox/busybox_1.2.2.bb
index 5206d60ccc..59aa5f07fc 100644
--- a/packages/busybox/busybox_1.2.2.bb
+++ b/packages/busybox/busybox_1.2.2.bb
@@ -35,36 +35,36 @@ do_install () {
 
 	install -m 0755 ${WORKDIR}/syslog ${D}${sysconfdir}/init.d/
 	install -m 644 ${WORKDIR}/syslog.conf ${D}${sysconfdir}/
-	if grep "CONFIG_CROND=y" ${WORKDIR}/defconfig; then 
+	if grep "CONFIG_CROND=y" ${WORKDIR}/defconfig; then
 		# Move crond back to /usr/sbin/crond
 		install -d ${D}${sbindir}
 		mv ${D}/busybox${sbindir}/crond ${D}${sbindir}/
 
 		install -m 0755 ${WORKDIR}/busybox-cron ${D}${sysconfdir}/init.d/
 	fi
-	if grep "CONFIG_HTTPD=y" ${WORKDIR}/defconfig; then 
+	if grep "CONFIG_HTTPD=y" ${WORKDIR}/defconfig; then
 		# Move httpd back to /usr/sbin/httpd
 		install -d ${D}${sbindir}
 		mv ${D}/busybox${sbindir}/httpd ${D}${sbindir}/
-					
+
 		install -m 0755 ${WORKDIR}/busybox-httpd ${D}${sysconfdir}/init.d/
 		install -d ${D}/srv/www
 	fi
-	if grep "CONFIG_APP_UDHCPD=y" ${WORKDIR}/defconfig; then 
+	if grep "CONFIG_APP_UDHCPD=y" ${WORKDIR}/defconfig; then
 		# Move udhcpd back to /usr/sbin/udhcpd
 		install -d ${D}${sbindir}
 		mv ${D}/busybox${sbindir}/udhcpd ${D}${sbindir}/
-					
+
 		install -m 0755 ${WORKDIR}/busybox-udhcpd ${D}${sysconfdir}/init.d/
 	fi
-	if grep "CONFIG_HWCLOCK=y" ${WORKDIR}/defconfig; then 
+	if grep "CONFIG_HWCLOCK=y" ${WORKDIR}/defconfig; then
 		# Move hwclock back to /sbin/hwclock
 		install -d ${D}${base_sbindir}
 		mv ${D}/busybox${base_sbindir}/hwclock ${D}${base_sbindir}/
-					
+
 		install -m 0755 ${WORKDIR}/hwclock.sh ${D}${sysconfdir}/init.d/
 	fi
-	if grep "CONFIG_APP_UDHCPC=y" ${WORKDIR}/defconfig; then 
+	if grep "CONFIG_APP_UDHCPC=y" ${WORKDIR}/defconfig; then
 		# Move dhcpc back to /usr/sbin/udhcpc
 		install -d ${D}${base_sbindir}
 		mv ${D}/busybox${base_sbindir}/udhcpc ${D}${base_sbindir}/
diff --git a/packages/tslib/tslib-maemo/.mtn2git_empty b/packages/busybox/slingbox-1.3.1/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/tslib/tslib-maemo/.mtn2git_empty
+++ b/packages/busybox/slingbox-1.3.1/.mtn2git_empty
diff --git a/packages/busybox/slingbox-1.3.1/defconfig b/packages/busybox/slingbox-1.3.1/defconfig
new file mode 100644
index 0000000000..7e1f0787cf
--- /dev/null
+++ b/packages/busybox/slingbox-1.3.1/defconfig
@@ -0,0 +1,675 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 1.3.1
+# Fri Dec 29 23:14:34 2006
+#
+CONFIG_HAVE_DOT_CONFIG=y
+
+#
+# Busybox Settings
+#
+
+#
+# General Configuration
+#
+# CONFIG_NITPICK is not set
+# CONFIG_DESKTOP is not set
+# CONFIG_FEATURE_BUFFERS_USE_MALLOC is not set
+# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set
+# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
+CONFIG_SHOW_USAGE=y
+CONFIG_FEATURE_VERBOSE_USAGE=y
+CONFIG_FEATURE_COMPRESS_USAGE=y
+# CONFIG_FEATURE_INSTALLER is not set
+# CONFIG_LOCALE_SUPPORT is not set
+CONFIG_GETOPT_LONG=y
+# CONFIG_FEATURE_DEVPTS is not set
+# CONFIG_FEATURE_CLEAN_UP is not set
+# CONFIG_FEATURE_SUID is not set
+CONFIG_FEATURE_SYSLOG=y
+# CONFIG_FEATURE_SUID_CONFIG is not set
+# CONFIG_FEATURE_SUID_CONFIG_QUIET is not set
+CONFIG_FEATURE_HAVE_RPC=y
+# CONFIG_SELINUX is not set
+CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe"
+
+#
+# Build Options
+#
+# CONFIG_STATIC is not set
+# CONFIG_BUILD_LIBBUSYBOX is not set
+# CONFIG_FEATURE_FULL_LIBBUSYBOX is not set
+# CONFIG_FEATURE_SHARED_BUSYBOX is not set
+CONFIG_LFS=y
+# CONFIG_BUILD_AT_ONCE is not set
+
+#
+# Debugging Options
+#
+# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_PESSIMIZE is not set
+# CONFIG_NO_DEBUG_LIB is not set
+# CONFIG_DMALLOC is not set
+# CONFIG_EFENCE is not set
+CONFIG_DEBUG_YANK_SUSv2=y
+
+#
+# Installation Options
+#
+# CONFIG_INSTALL_NO_USR is not set
+CONFIG_INSTALL_APPLET_SYMLINKS=y
+# CONFIG_INSTALL_APPLET_HARDLINKS is not set
+# CONFIG_INSTALL_APPLET_DONT is not set
+CONFIG_PREFIX="./_install"
+
+#
+# Busybox Library Tuning
+#
+CONFIG_PASSWORD_MINLEN=6
+CONFIG_MD5_SIZE_VS_SPEED=2
+
+#
+# Applets
+#
+
+#
+# Archival Utilities
+#
+# CONFIG_AR is not set
+# CONFIG_FEATURE_AR_LONG_FILENAMES is not set
+CONFIG_BUNZIP2=y
+CONFIG_CPIO=y
+# CONFIG_DPKG is not set
+# CONFIG_DPKG_DEB is not set
+# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set
+CONFIG_GUNZIP=y
+CONFIG_FEATURE_GUNZIP_UNCOMPRESS=y
+CONFIG_GZIP=y
+# CONFIG_RPM2CPIO is not set
+# CONFIG_RPM is not set
+CONFIG_TAR=y
+CONFIG_FEATURE_TAR_CREATE=y
+CONFIG_FEATURE_TAR_BZIP2=y
+# CONFIG_FEATURE_TAR_LZMA is not set
+CONFIG_FEATURE_TAR_FROM=y
+CONFIG_FEATURE_TAR_GZIP=y
+CONFIG_FEATURE_TAR_COMPRESS=y
+# CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY is not set
+CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y
+# CONFIG_FEATURE_TAR_LONG_OPTIONS is not set
+CONFIG_UNCOMPRESS=y
+# CONFIG_UNLZMA is not set
+# CONFIG_FEATURE_LZMA_FAST is not set
+CONFIG_UNZIP=y
+
+#
+# Common options for cpio and tar
+#
+# CONFIG_FEATURE_UNARCHIVE_TAPE is not set
+# CONFIG_FEATURE_DEB_TAR_GZ is not set
+# CONFIG_FEATURE_DEB_TAR_BZ2 is not set
+# CONFIG_FEATURE_DEB_TAR_LZMA is not set
+
+#
+# Coreutils
+#
+CONFIG_BASENAME=y
+# CONFIG_CAL is not set
+CONFIG_CAT=y
+# CONFIG_CATV is not set
+CONFIG_CHGRP=y
+CONFIG_CHMOD=y
+CONFIG_CHOWN=y
+CONFIG_CHROOT=y
+# CONFIG_CKSUM is not set
+# CONFIG_CMP is not set
+# CONFIG_COMM is not set
+CONFIG_CP=y
+CONFIG_CUT=y
+# CONFIG_DATE is not set
+# CONFIG_FEATURE_DATE_ISOFMT is not set
+CONFIG_DD=y
+# CONFIG_FEATURE_DD_SIGNAL_HANDLING is not set
+# CONFIG_FEATURE_DD_IBS_OBS is not set
+CONFIG_DF=y
+# CONFIG_DIFF is not set
+# CONFIG_FEATURE_DIFF_BINARY is not set
+# CONFIG_FEATURE_DIFF_DIR is not set
+# CONFIG_FEATURE_DIFF_MINIMAL is not set
+CONFIG_DIRNAME=y
+CONFIG_DOS2UNIX=y
+CONFIG_UNIX2DOS=y
+CONFIG_DU=y
+CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K=y
+CONFIG_ECHO=y
+CONFIG_FEATURE_FANCY_ECHO=y
+# CONFIG_ENV is not set
+# CONFIG_FEATURE_ENV_LONG_OPTIONS is not set
+CONFIG_EXPR=y
+# CONFIG_EXPR_MATH_SUPPORT_64 is not set
+# CONFIG_FALSE is not set
+# CONFIG_FOLD is not set
+CONFIG_HEAD=y
+CONFIG_FEATURE_FANCY_HEAD=y
+# CONFIG_HOSTID is not set
+CONFIG_ID=y
+# CONFIG_INSTALL is not set
+# CONFIG_FEATURE_INSTALL_LONG_OPTIONS is not set
+# CONFIG_LENGTH is not set
+CONFIG_LN=y
+# CONFIG_LOGNAME is not set
+CONFIG_LS=y
+CONFIG_FEATURE_LS_FILETYPES=y
+CONFIG_FEATURE_LS_FOLLOWLINKS=y
+CONFIG_FEATURE_LS_RECURSIVE=y
+CONFIG_FEATURE_LS_SORTFILES=y
+CONFIG_FEATURE_LS_TIMESTAMPS=y
+CONFIG_FEATURE_LS_USERNAME=y
+# CONFIG_FEATURE_LS_COLOR is not set
+# CONFIG_FEATURE_LS_COLOR_IS_DEFAULT is not set
+CONFIG_MD5SUM=y
+CONFIG_MKDIR=y
+# CONFIG_FEATURE_MKDIR_LONG_OPTIONS is not set
+CONFIG_MKFIFO=y
+CONFIG_MKNOD=y
+CONFIG_MV=y
+# CONFIG_FEATURE_MV_LONG_OPTIONS is not set
+# CONFIG_NICE is not set
+# CONFIG_NOHUP is not set
+# CONFIG_OD is not set
+# CONFIG_PRINTENV is not set
+# CONFIG_PRINTF is not set
+CONFIG_PWD=y
+# CONFIG_REALPATH is not set
+CONFIG_RM=y
+CONFIG_RMDIR=y
+# CONFIG_SEQ is not set
+# CONFIG_SHA1SUM is not set
+CONFIG_SLEEP=y
+# CONFIG_FEATURE_FANCY_SLEEP is not set
+CONFIG_SORT=y
+# CONFIG_FEATURE_SORT_BIG is not set
+# CONFIG_STAT is not set
+# CONFIG_FEATURE_STAT_FORMAT is not set
+# CONFIG_STTY is not set
+# CONFIG_SUM is not set
+CONFIG_SYNC=y
+CONFIG_TAIL=y
+CONFIG_FEATURE_FANCY_TAIL=y
+CONFIG_TEE=y
+# CONFIG_FEATURE_TEE_USE_BLOCK_IO is not set
+CONFIG_TEST=y
+# CONFIG_FEATURE_TEST_64 is not set
+CONFIG_TOUCH=y
+# CONFIG_TR is not set
+# CONFIG_FEATURE_TR_CLASSES is not set
+# CONFIG_FEATURE_TR_EQUIV is not set
+# CONFIG_TRUE is not set
+# CONFIG_TTY is not set
+CONFIG_UNAME=y
+CONFIG_UNIQ=y
+# CONFIG_USLEEP is not set
+# CONFIG_UUDECODE is not set
+# CONFIG_UUENCODE is not set
+# CONFIG_WATCH is not set
+# CONFIG_WC is not set
+# CONFIG_FEATURE_WC_LARGE is not set
+# CONFIG_WHO is not set
+# CONFIG_WHOAMI is not set
+# CONFIG_YES is not set
+
+#
+# Common options for cp and mv
+#
+CONFIG_FEATURE_PRESERVE_HARDLINKS=y
+
+#
+# Common options for ls, more and telnet
+#
+CONFIG_FEATURE_AUTOWIDTH=y
+
+#
+# Common options for df, du, ls
+#
+CONFIG_FEATURE_HUMAN_READABLE=y
+
+#
+# Common options for md5sum, sha1sum
+#
+CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y
+
+#
+# Console Utilities
+#
+# CONFIG_CHVT is not set
+# CONFIG_CLEAR is not set
+# CONFIG_DEALLOCVT is not set
+# CONFIG_DUMPKMAP is not set
+# CONFIG_LOADFONT is not set
+# CONFIG_LOADKMAP is not set
+# CONFIG_OPENVT is not set
+# CONFIG_RESET is not set
+# CONFIG_RESIZE is not set
+# CONFIG_FEATURE_RESIZE_PRINT is not set
+# CONFIG_SETCONSOLE is not set
+# CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set
+# CONFIG_SETKEYCODES is not set
+# CONFIG_SETLOGCONS is not set
+
+#
+# Debian Utilities
+#
+CONFIG_MKTEMP=y
+# CONFIG_PIPE_PROGRESS is not set
+# CONFIG_READLINK is not set
+# CONFIG_FEATURE_READLINK_FOLLOW is not set
+# CONFIG_RUN_PARTS is not set
+# CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS is not set
+# CONFIG_START_STOP_DAEMON is not set
+# CONFIG_FEATURE_START_STOP_DAEMON_FANCY is not set
+# CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS is not set
+# CONFIG_WHICH is not set
+
+#
+# Editors
+#
+# CONFIG_AWK is not set
+# CONFIG_FEATURE_AWK_MATH is not set
+# CONFIG_ED is not set
+# CONFIG_PATCH is not set
+CONFIG_SED=y
+CONFIG_VI=y
+CONFIG_FEATURE_VI_COLON=y
+CONFIG_FEATURE_VI_YANKMARK=y
+CONFIG_FEATURE_VI_SEARCH=y
+# CONFIG_FEATURE_VI_USE_SIGNALS is not set
+# CONFIG_FEATURE_VI_DOT_CMD is not set
+# CONFIG_FEATURE_VI_READONLY is not set
+# CONFIG_FEATURE_VI_SETOPTS is not set
+# CONFIG_FEATURE_VI_SET is not set
+# CONFIG_FEATURE_VI_WIN_RESIZE is not set
+CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y
+
+#
+# Finding Utilities
+#
+CONFIG_FIND=y
+# CONFIG_FEATURE_FIND_PRINT0 is not set
+# CONFIG_FEATURE_FIND_MTIME is not set
+# CONFIG_FEATURE_FIND_MMIN is not set
+# CONFIG_FEATURE_FIND_PERM is not set
+CONFIG_FEATURE_FIND_TYPE=y
+CONFIG_FEATURE_FIND_XDEV=y
+# CONFIG_FEATURE_FIND_NEWER is not set
+# CONFIG_FEATURE_FIND_INUM is not set
+# CONFIG_FEATURE_FIND_EXEC is not set
+CONFIG_GREP=y
+CONFIG_FEATURE_GREP_EGREP_ALIAS=y
+CONFIG_FEATURE_GREP_FGREP_ALIAS=y
+# CONFIG_FEATURE_GREP_CONTEXT is not set
+# CONFIG_XARGS is not set
+# CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION is not set
+# CONFIG_FEATURE_XARGS_SUPPORT_QUOTES is not set
+# CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT is not set
+# CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM is not set
+
+#
+# Init Utilities
+#
+# CONFIG_INIT is not set
+# CONFIG_DEBUG_INIT is not set
+# CONFIG_FEATURE_USE_INITTAB is not set
+# CONFIG_FEATURE_INIT_SCTTY is not set
+# CONFIG_FEATURE_EXTRA_QUIET is not set
+# CONFIG_FEATURE_INIT_COREDUMPS is not set
+# CONFIG_FEATURE_INITRD is not set
+CONFIG_HALT=y
+# CONFIG_MESG is not set
+
+#
+# Login/Password Management Utilities
+#
+# CONFIG_FEATURE_SHADOWPASSWDS is not set
+# CONFIG_USE_BB_SHADOW is not set
+# CONFIG_USE_BB_PWD_GRP is not set
+# CONFIG_ADDGROUP is not set
+# CONFIG_DELGROUP is not set
+# CONFIG_ADDUSER is not set
+# CONFIG_DELUSER is not set
+# CONFIG_GETTY is not set
+# CONFIG_FEATURE_UTMP is not set
+# CONFIG_FEATURE_WTMP is not set
+# CONFIG_LOGIN is not set
+# CONFIG_LOGIN_SCRIPTS is not set
+# CONFIG_FEATURE_SECURETTY is not set
+# CONFIG_PASSWD is not set
+# CONFIG_SU is not set
+# CONFIG_SU_SYSLOG is not set
+# CONFIG_SULOGIN is not set
+# CONFIG_VLOCK is not set
+
+#
+# Linux Ext2 FS Progs
+#
+# CONFIG_CHATTR is not set
+# CONFIG_E2FSCK is not set
+# CONFIG_FSCK is not set
+# CONFIG_LSATTR is not set
+# CONFIG_MKE2FS is not set
+# CONFIG_TUNE2FS is not set
+# CONFIG_E2LABEL is not set
+# CONFIG_FINDFS is not set
+
+#
+# Linux Module Utilities
+#
+CONFIG_INSMOD=y
+# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
+# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set
+# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set
+# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set
+# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set
+CONFIG_RMMOD=y
+CONFIG_LSMOD=y
+# CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT is not set
+# CONFIG_MODPROBE is not set
+# CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS is not set
+# CONFIG_FEATURE_MODPROBE_FANCY_ALIAS is not set
+
+#
+# Options common to multiple modutils
+#
+CONFIG_FEATURE_CHECK_TAINTED_MODULE=y
+CONFIG_FEATURE_2_4_MODULES=y
+# CONFIG_FEATURE_2_6_MODULES is not set
+CONFIG_FEATURE_QUERY_MODULE_INTERFACE=y
+
+#
+# Linux System Utilities
+#
+CONFIG_DMESG=y
+CONFIG_FEATURE_DMESG_PRETTY=y
+# CONFIG_FBSET is not set
+# CONFIG_FEATURE_FBSET_FANCY is not set
+# CONFIG_FEATURE_FBSET_READMODE is not set
+# CONFIG_FDFLUSH is not set
+# CONFIG_FDFORMAT is not set
+CONFIG_FDISK=y
+CONFIG_FDISK_SUPPORT_LARGE_DISKS=y
+CONFIG_FEATURE_FDISK_WRITABLE=y
+# CONFIG_FEATURE_AIX_LABEL is not set
+# CONFIG_FEATURE_SGI_LABEL is not set
+# CONFIG_FEATURE_SUN_LABEL is not set
+# CONFIG_FEATURE_OSF_LABEL is not set
+# CONFIG_FEATURE_FDISK_ADVANCED is not set
+CONFIG_FREERAMDISK=y
+# CONFIG_FSCK_MINIX is not set
+# CONFIG_MKFS_MINIX is not set
+# CONFIG_FEATURE_MINIX2 is not set
+# CONFIG_GETOPT is not set
+CONFIG_HEXDUMP=y
+# CONFIG_HWCLOCK is not set
+# CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS is not set
+# CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS is not set
+# CONFIG_IPCRM is not set
+# CONFIG_IPCS is not set
+CONFIG_LOSETUP=y
+# CONFIG_MDEV is not set
+# CONFIG_FEATURE_MDEV_CONF is not set
+# CONFIG_FEATURE_MDEV_EXEC is not set
+CONFIG_MKSWAP=y
+# CONFIG_FEATURE_MKSWAP_V0 is not set
+CONFIG_MORE=y
+CONFIG_FEATURE_USE_TERMIOS=y
+CONFIG_MOUNT=y
+CONFIG_FEATURE_MOUNT_NFS=y
+# CONFIG_FEATURE_MOUNT_CIFS is not set
+CONFIG_FEATURE_MOUNT_FLAGS=y
+CONFIG_FEATURE_MOUNT_FSTAB=y
+CONFIG_PIVOT_ROOT=y
+# CONFIG_RDATE is not set
+# CONFIG_READPROFILE is not set
+# CONFIG_SETARCH is not set
+CONFIG_SWAPONOFF=y
+# CONFIG_SWITCH_ROOT is not set
+CONFIG_UMOUNT=y
+CONFIG_FEATURE_UMOUNT_ALL=y
+
+#
+# Common options for mount/umount
+#
+CONFIG_FEATURE_MOUNT_LOOP=y
+# CONFIG_FEATURE_MTAB_SUPPORT is not set
+
+#
+# Miscellaneous Utilities
+#
+# CONFIG_ADJTIMEX is not set
+# CONFIG_BBCONFIG is not set
+# CONFIG_CROND is not set
+# CONFIG_DEBUG_CROND_OPTION is not set
+# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set
+# CONFIG_CRONTAB is not set
+# CONFIG_DC is not set
+# CONFIG_DEVFSD is not set
+# CONFIG_DEVFSD_MODLOAD is not set
+# CONFIG_DEVFSD_FG_NP is not set
+# CONFIG_DEVFSD_VERBOSE is not set
+# CONFIG_FEATURE_DEVFS is not set
+# CONFIG_EJECT is not set
+# CONFIG_LAST is not set
+# CONFIG_LESS is not set
+# CONFIG_FEATURE_LESS_BRACKETS is not set
+# CONFIG_FEATURE_LESS_FLAGS is not set
+# CONFIG_FEATURE_LESS_FLAGCS is not set
+# CONFIG_FEATURE_LESS_MARKS is not set
+# CONFIG_FEATURE_LESS_REGEXP is not set
+# CONFIG_HDPARM is not set
+# CONFIG_FEATURE_HDPARM_GET_IDENTITY is not set
+# CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set
+# CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF is not set
+# CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set
+# CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set
+# CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA is not set
+# CONFIG_MAKEDEVS is not set
+# CONFIG_FEATURE_MAKEDEVS_LEAF is not set
+# CONFIG_FEATURE_MAKEDEVS_TABLE is not set
+# CONFIG_MOUNTPOINT is not set
+# CONFIG_MT is not set
+# CONFIG_NMETER is not set
+# CONFIG_RAIDAUTORUN is not set
+# CONFIG_READAHEAD is not set
+# CONFIG_RUNLEVEL is not set
+# CONFIG_RX is not set
+CONFIG_STRINGS=y
+# CONFIG_SETSID is not set
+# CONFIG_TASKSET is not set
+# CONFIG_FEATURE_TASKSET_FANCY is not set
+# CONFIG_TIME is not set
+# CONFIG_WATCHDOG is not set
+
+#
+# Networking Utilities
+#
+# CONFIG_FEATURE_IPV6 is not set
+# CONFIG_ARPING is not set
+# CONFIG_DNSD is not set
+# CONFIG_ETHER_WAKE is not set
+# CONFIG_FAKEIDENTD is not set
+# CONFIG_FTPGET is not set
+# CONFIG_FTPPUT is not set
+# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set
+CONFIG_HOSTNAME=y
+# CONFIG_HTTPD is not set
+# CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP is not set
+# CONFIG_FEATURE_HTTPD_SETUID is not set
+# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set
+# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set
+# CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES is not set
+# CONFIG_FEATURE_HTTPD_CGI is not set
+# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set
+# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set
+# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set
+CONFIG_IFCONFIG=y
+CONFIG_FEATURE_IFCONFIG_STATUS=y
+# CONFIG_FEATURE_IFCONFIG_SLIP is not set
+# CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ is not set
+CONFIG_FEATURE_IFCONFIG_HW=y
+CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS=y
+# CONFIG_IFUPDOWN is not set
+# CONFIG_FEATURE_IFUPDOWN_IP is not set
+# CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN is not set
+# CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN is not set
+# CONFIG_FEATURE_IFUPDOWN_IPV4 is not set
+# CONFIG_FEATURE_IFUPDOWN_IPV6 is not set
+# CONFIG_FEATURE_IFUPDOWN_IPX is not set
+# CONFIG_FEATURE_IFUPDOWN_MAPPING is not set
+# CONFIG_INETD is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN is not set
+# CONFIG_FEATURE_INETD_RPC is not set
+# CONFIG_IP is not set
+# CONFIG_FEATURE_IP_ADDRESS is not set
+# CONFIG_FEATURE_IP_LINK is not set
+# CONFIG_FEATURE_IP_ROUTE is not set
+# CONFIG_FEATURE_IP_TUNNEL is not set
+# CONFIG_FEATURE_IP_RULE is not set
+# CONFIG_FEATURE_IP_SHORT_FORMS is not set
+# CONFIG_IPADDR is not set
+# CONFIG_IPLINK is not set
+# CONFIG_IPROUTE is not set
+# CONFIG_IPTUNNEL is not set
+# CONFIG_IPRULE is not set
+# CONFIG_IPCALC is not set
+# CONFIG_FEATURE_IPCALC_FANCY is not set
+# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set
+# CONFIG_NAMEIF is not set
+CONFIG_NC=y
+# CONFIG_NC_SERVER is not set
+# CONFIG_NC_EXTRA is not set
+# CONFIG_NETSTAT is not set
+# CONFIG_NSLOOKUP is not set
+CONFIG_PING=y
+CONFIG_FEATURE_FANCY_PING=y
+# CONFIG_PING6 is not set
+# CONFIG_FEATURE_FANCY_PING6 is not set
+CONFIG_ROUTE=y
+# CONFIG_TELNET is not set
+# CONFIG_FEATURE_TELNET_TTYPE is not set
+# CONFIG_FEATURE_TELNET_AUTOLOGIN is not set
+# CONFIG_TELNETD is not set
+# CONFIG_FEATURE_TELNETD_STANDALONE is not set
+# CONFIG_TFTP is not set
+# CONFIG_FEATURE_TFTP_GET is not set
+# CONFIG_FEATURE_TFTP_PUT is not set
+# CONFIG_FEATURE_TFTP_BLOCKSIZE is not set
+# CONFIG_DEBUG_TFTP is not set
+# CONFIG_TRACEROUTE is not set
+# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set
+# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set
+# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set
+# CONFIG_APP_UDHCPD is not set
+# CONFIG_APP_DHCPRELAY is not set
+# CONFIG_APP_DUMPLEASES is not set
+# CONFIG_APP_UDHCPC is not set
+# CONFIG_FEATURE_UDHCP_SYSLOG is not set
+# CONFIG_FEATURE_UDHCP_DEBUG is not set
+# CONFIG_VCONFIG is not set
+CONFIG_WGET=y
+# CONFIG_FEATURE_WGET_STATUSBAR is not set
+# CONFIG_FEATURE_WGET_AUTHENTICATION is not set
+# CONFIG_FEATURE_WGET_IP6_LITERAL is not set
+CONFIG_FEATURE_WGET_LONG_OPTIONS=y
+# CONFIG_ZCIP is not set
+
+#
+# Process Utilities
+#
+CONFIG_FREE=y
+# CONFIG_FUSER is not set
+CONFIG_KILL=y
+CONFIG_KILLALL=y
+# CONFIG_KILLALL5 is not set
+CONFIG_PIDOF=y
+# CONFIG_FEATURE_PIDOF_SINGLE is not set
+# CONFIG_FEATURE_PIDOF_OMIT is not set
+CONFIG_PS=y
+# CONFIG_FEATURE_PS_WIDE is not set
+# CONFIG_RENICE is not set
+# CONFIG_BB_SYSCTL is not set
+# CONFIG_TOP is not set
+# CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE is not set
+# CONFIG_UPTIME is not set
+
+#
+# Shells
+#
+CONFIG_FEATURE_SH_IS_ASH=y
+# CONFIG_FEATURE_SH_IS_HUSH is not set
+# CONFIG_FEATURE_SH_IS_LASH is not set
+# CONFIG_FEATURE_SH_IS_MSH is not set
+# CONFIG_FEATURE_SH_IS_NONE is not set
+CONFIG_ASH=y
+
+#
+# Ash Shell Options
+#
+CONFIG_ASH_JOB_CONTROL=y
+# CONFIG_ASH_READ_NCHARS is not set
+# CONFIG_ASH_READ_TIMEOUT is not set
+# CONFIG_ASH_ALIAS is not set
+CONFIG_ASH_MATH_SUPPORT=y
+# CONFIG_ASH_MATH_SUPPORT_64 is not set
+# CONFIG_ASH_GETOPTS is not set
+# CONFIG_ASH_BUILTIN_ECHO is not set
+# CONFIG_ASH_BUILTIN_TEST is not set
+# CONFIG_ASH_CMDCMD is not set
+# CONFIG_ASH_MAIL is not set
+CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
+# CONFIG_ASH_RANDOM_SUPPORT is not set
+# CONFIG_ASH_EXPAND_PRMT is not set
+# CONFIG_HUSH is not set
+# CONFIG_LASH is not set
+# CONFIG_MSH is not set
+
+#
+# Bourne Shell Options
+#
+# CONFIG_FEATURE_SH_EXTRA_QUIET is not set
+# CONFIG_FEATURE_SH_STANDALONE_SHELL is not set
+CONFIG_FEATURE_COMMAND_EDITING=y
+# CONFIG_FEATURE_COMMAND_EDITING_VI is not set
+CONFIG_FEATURE_COMMAND_HISTORY=15
+# CONFIG_FEATURE_COMMAND_SAVEHISTORY is not set
+CONFIG_FEATURE_COMMAND_TAB_COMPLETION=y
+# CONFIG_FEATURE_COMMAND_USERNAME_COMPLETION is not set
+# CONFIG_FEATURE_SH_FANCY_PROMPT is not set
+
+#
+# System Logging Utilities
+#
+CONFIG_SYSLOGD=y
+CONFIG_FEATURE_ROTATE_LOGFILE=y
+# CONFIG_FEATURE_REMOTE_LOG is not set
+# CONFIG_FEATURE_IPC_SYSLOG is not set
+CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=
+# CONFIG_LOGREAD is not set
+# CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set
+CONFIG_KLOGD=y
+# CONFIG_LOGGER is not set
+
+#
+# Runit Utilities
+#
+# CONFIG_RUNSV is not set
+# CONFIG_RUNSVDIR is not set
+# CONFIG_SV is not set
+# CONFIG_SVLOGD is not set
+# CONFIG_CHPST is not set
+# CONFIG_SETUIDGID is not set
+# CONFIG_ENVUIDGID is not set
+# CONFIG_ENVDIR is not set
+# CONFIG_SOFTLIMIT is not set
diff --git a/packages/busybox/slingbox-1.3.1/df_rootfs.patch b/packages/busybox/slingbox-1.3.1/df_rootfs.patch
new file mode 100644
index 0000000000..3819b59106
--- /dev/null
+++ b/packages/busybox/slingbox-1.3.1/df_rootfs.patch
@@ -0,0 +1,44 @@
+--- busybox-1.3.1.orig/coreutils/df.c	2006-12-26 22:54:50.000000000 -0600
++++ busybox-1.3.1/coreutils/df.c	2006-12-30 00:45:10.000000000 -0600
+@@ -47,6 +47,7 @@
+ 	struct statfs s;
+ 	static const char hdr_1k[] = "1k-blocks"; /* default display is kilobytes */
+ 	const char *disp_units_hdr = hdr_1k;
++	int root_done = 0;
+ 
+ #ifdef CONFIG_FEATURE_HUMAN_READABLE
+ 	opt_complementary = "h-km:k-hm:m-hk";
+@@ -77,7 +78,7 @@
+ 
+ 	do {
+ 		const char *device;
+-		const char *mount_point;
++		char *mount_point;
+ 
+ 		if (mount_table) {
+ 			mount_entry = getmntent(mount_table);
+@@ -116,17 +117,20 @@
+ 						) / (blocks_used + s.f_bavail);
+ 			}
+ 
+-			if (strcmp(device, "rootfs") == 0) {
+-				continue;
+-			} else if (strcmp(device, "/dev/root") == 0) {
++			if (strcmp(device, "/dev/root") == 0 || strcmp(device, "rootfs") == 0) {
+ 				/* Adjusts device to be the real root device,
+ 				* or leaves device alone if it can't find it */
+-				device = find_block_device("/");
++				device = find_block_device(mount_point);
+ 				if (!device) {
+ 					goto SET_ERROR;
+ 				}
+ 			}
+ 
++			if (strcmp(mount_point, "/") == 0) {
++				if (root_done) continue;
++				root_done = 1;
++			}
++
+ #ifdef CONFIG_FEATURE_HUMAN_READABLE
+ 			printf("%-20s %9s ", device,
+ 				make_human_readable_str(s.f_blocks, s.f_bsize, df_disp_hr));
diff --git a/packages/busybox/slingbox-1.3.1/halt.patch b/packages/busybox/slingbox-1.3.1/halt.patch
new file mode 100644
index 0000000000..729c3b7ecd
--- /dev/null
+++ b/packages/busybox/slingbox-1.3.1/halt.patch
@@ -0,0 +1,40 @@
+diff -Naur busybox-1.3.1.orig/init/halt.c busybox-1.3.1/init/halt.c
+--- busybox-1.3.1.orig/init/halt.c	2006-12-26 22:56:38.000000000 -0600
++++ busybox-1.3.1/init/halt.c	2006-12-29 22:48:18.000000000 -0600
+@@ -10,6 +10,8 @@
+ #include "busybox.h"
+ #include <sys/reboot.h>
+ 
++#include "init_shared.h"  /* Linksys mods */
++
+ int halt_main(int argc, char *argv[])
+ {
+ 	static const int magic[] = {
+@@ -38,6 +40,12 @@
+ 	if (flags & 1) sleep(xatou(delay));
+ 	if (!(flags & 2)) sync();
+ 
++/* Linksys Halt code - adapted from the Linksys source for Busybox. */
++	rc = bb_shutdown_system(magic[which]);
++	if (rc) bb_error_msg("No.");
++	return rc; /* Shrug */
++/* End of Linksys code */
++
+ 	/* Perform action. */
+ 	if (ENABLE_INIT && !(flags & 4)) {
+ 		if (ENABLE_FEATURE_INITRD) {
+diff -Naur busybox-1.3.1.orig/init/init_shared.c busybox-1.3.1/init/init_shared.c
+--- busybox-1.3.1.orig/init/init_shared.c	2006-12-26 22:56:38.000000000 -0600
++++ busybox-1.3.1/init/init_shared.c	2006-12-29 22:48:18.000000000 -0600
+@@ -57,6 +57,11 @@
+ 
+ 	sync();
+ 
++/* Linksys Halt code - if poweroff or halt, invoke an external program
++   to do actually turn off the power. */
++	if (magic != 0x01234567) system("/usr/bin/Set_Led power_off");
++/* End of Linksys Halt code */
++
+ 	reboot(magic);
+ 	return 0; /* Shrug */
+ }
diff --git a/packages/busybox/slingbox-1.3.1/lazy_umount.patch b/packages/busybox/slingbox-1.3.1/lazy_umount.patch
new file mode 100644
index 0000000000..0a38d1f098
--- /dev/null
+++ b/packages/busybox/slingbox-1.3.1/lazy_umount.patch
@@ -0,0 +1,27 @@
+--- busybox-1.3.1.orig/util-linux/umount.c	2006-12-26 22:57:04.000000000 -0600
++++ busybox-1.3.1/util-linux/umount.c	2006-12-29 22:48:08.000000000 -0600
+@@ -12,13 +12,14 @@
+ #include <mntent.h>
+ #include <getopt.h>
+ 
+-#define OPTION_STRING		"flDnravd"
++#define OPTION_STRING		"flDnravdL"
+ #define OPT_FORCE			1
+ #define OPT_LAZY			2
+ #define OPT_DONTFREELOOP	4
+ #define OPT_NO_MTAB			8
+ #define OPT_REMOUNT			16
+ #define OPT_ALL				(ENABLE_FEATURE_UMOUNT_ALL ? 32 : 0)
++#define OPT_LINKSYS_LAZY		256
+ 
+ int umount_main(int argc, char **argv)
+ {
+@@ -41,6 +42,8 @@
+ 	argc -= optind;
+ 	argv += optind;
+ 
++	if (opt & OPT_LINKSYS_LAZY) opt |= OPT_LAZY; /* -L same as -l */
++
+ 	doForce = MAX((opt & OPT_FORCE), (opt & OPT_LAZY));
+ 
+ 	/* Get a list of mount points from mtab.  We read them all in now mostly
diff --git a/packages/busybox/slingbox-1.3.1/shadow_h_is_required.patch b/packages/busybox/slingbox-1.3.1/shadow_h_is_required.patch
new file mode 100644
index 0000000000..8012b584e4
--- /dev/null
+++ b/packages/busybox/slingbox-1.3.1/shadow_h_is_required.patch
@@ -0,0 +1,14 @@
+--- busybox-1.3.1/include/libbb.h~	2006-12-26 22:56:18.000000000 -0600
++++ busybox-1.3.1/include/libbb.h	2006-12-30 01:13:51.000000000 -0600
+@@ -51,9 +51,9 @@
+ 
+ #include "pwd_.h"
+ #include "grp_.h"
+-#if ENABLE_FEATURE_SHADOWPASSWDS
++//#if ENABLE_FEATURE_SHADOWPASSWDS
+ #include "shadow_.h"
+-#endif
++//#endif
+ 
+ /* Try to pull in PATH_MAX */
+ #include <limits.h>
diff --git a/packages/busybox/slingbox-1.3.1/slingbox.patch b/packages/busybox/slingbox-1.3.1/slingbox.patch
new file mode 100644
index 0000000000..d0af78596a
--- /dev/null
+++ b/packages/busybox/slingbox-1.3.1/slingbox.patch
@@ -0,0 +1,49 @@
+--- busybox-1.3.1.orig/applets/install.sh	2006-12-26 22:56:43.000000000 -0600
++++ busybox-1.3.1/applets/install.sh	2006-12-29 22:47:42.000000000 -0600
+@@ -39,8 +39,8 @@
+ 	done
+ fi
+ 
+-if [ "$cleanup" = "1" ] && [ -e "$prefix/bin/busybox" ]; then
+-	inode=`ls -i "$prefix/bin/busybox" | awk '{print $1}'`
++if [ "$cleanup" = "1" ] && [ -e "$prefix/bin/slingbox" ]; then
++	inode=`ls -i "$prefix/bin/slingbox" | awk '{print $1}'`
+ 	sub_shell_it=`
+ 	cd "$prefix"
+ 	for d in usr/sbin usr/bin sbin bin ; do
+@@ -54,28 +54,28 @@
+ 	`
+ fi
+ 
+-rm -f $prefix/bin/busybox || exit 1
++rm -f $prefix/bin/slingbox || exit 1
+ mkdir -p $prefix/bin || exit 1
+-install -m 755 busybox $prefix/bin/busybox || exit 1
++install -m 755 busybox $prefix/bin/slingbox || exit 1
+ 
+ for i in $h ; do
+ 	appdir=`dirname $i`
+ 	mkdir -p $prefix/$appdir || exit 1
+ 	if [ "$2" = "--hardlinks" ]; then
+-		bb_path="$prefix/bin/busybox"
++		bb_path="$prefix/bin/slingbox"
+ 	else
+ 		case "$appdir" in
+ 		/)
+-			bb_path="bin/busybox"
++			bb_path="bin/slingbox"
+ 		;;
+ 		/bin)
+-			bb_path="busybox"
++			bb_path="slingbox"
+ 		;;
+ 		/sbin)
+-			bb_path="../bin/busybox"
++			bb_path="../bin/slingbox"
+ 		;;
+ 		/usr/bin|/usr/sbin)
+-			bb_path="../../bin/busybox"
++			bb_path="../../bin/slingbox"
+ 		;;
+ 		*)
+ 		echo "Unknown installation directory: $appdir"
diff --git a/packages/busybox/slingbox-1.3.1/slingbox_name.patch b/packages/busybox/slingbox-1.3.1/slingbox_name.patch
new file mode 100644
index 0000000000..96652c1920
--- /dev/null
+++ b/packages/busybox/slingbox-1.3.1/slingbox_name.patch
@@ -0,0 +1,10 @@
+--- busybox-1.3.1.orig/applets/applets.c	2006-12-26 22:56:43.000000000 -0600
++++ busybox-1.3.1/applets/applets.c	2006-12-29 22:52:31.000000000 -0600
+@@ -472,6 +472,7 @@
+ 	if (ENABLE_FEATURE_SUID_CONFIG) parse_config_file();
+ 
+ 	if (!strncmp(name, "busybox", 7)) busybox_main(argc, argv);
++	if (!strncmp(name, "slingbox", 8)) busybox_main(argc, argv);
+ 	/* Do a binary search to find the applet entry given the name. */
+ 	applet_using = find_applet_by_name(name);
+ 	if (applet_using) {
diff --git a/packages/busybox/slingbox_1.3.1.bb b/packages/busybox/slingbox_1.3.1.bb
new file mode 100644
index 0000000000..89b189e325
--- /dev/null
+++ b/packages/busybox/slingbox_1.3.1.bb
@@ -0,0 +1,52 @@
+DESCRIPTION = "SlingBox is a minimal version of BusyBox with just enough functionality \
+to enable ipkg to run on an Unslung NSLU2 device."
+HOMEPAGE = "http://www.busybox.net"
+LICENSE = "GPL"
+SECTION = "base"
+PRIORITY = "required"
+PR = "r0"
+COMPATIBLE_MACHINE = "nslu2"
+
+SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
+           file://defconfig \
+           file://shadow_h_is_required.patch;patch=1 \
+           file://df_rootfs.patch;patch=1 \
+           file://lazy_umount.patch;patch=1 \
+           file://halt.patch;patch=1" \
+           file://slingbox_name.patch;patch=1 \
+           file://slingbox.patch;patch=1"
+
+#           file://wget-long-options.patch;patch=1 \
+
+S = "${WORKDIR}/busybox-${PV}"
+
+export EXTRA_CFLAGS = "${CFLAGS}"
+EXTRA_OEMAKE_append = " V=1 ARCH=arm CROSS_COMPILE=${TARGET_PREFIX}"
+
+PACKAGES = "${PN}"
+FILES_${PN} = "/"
+FILES_${PN}-doc = ""
+FILES_${PN}-dev = ""
+FILES_${PN}-locale = ""
+
+inherit cml1
+
+do_configure () {
+	install -m 0644 ${WORKDIR}/defconfig ${S}/.config
+	cml1_do_configure
+}
+
+do_compile () {
+	unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
+	base_do_compile
+}
+
+do_install () {
+	unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
+	oe_runmake "PREFIX=${D}" install
+
+	# Just in case fdisk is compiled in, do not overwrite the Linksys one
+	rm -f ${S}/_install/sbin/fdisk
+
+	cp -pPR ${S}/_install/* ${D}/
+}
diff --git a/packages/cairo/cairo_1.2.2.bb b/packages/cairo/cairo_1.2.2.bb
index 762ee405b4..f6667eae1b 100644
--- a/packages/cairo/cairo_1.2.2.bb
+++ b/packages/cairo/cairo_1.2.2.bb
@@ -6,7 +6,7 @@ LICENSE = "MPL LGPL"
 
 SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz"
 
-inherit autotools pkgconfig 
+inherit autotools pkgconfig
 
 do_stage () {
 autotools_stage_all
diff --git a/packages/cairo/cairo_1.2.4.bb b/packages/cairo/cairo_1.2.4.bb
index f23e376d1c..e274387195 100644
--- a/packages/cairo/cairo_1.2.4.bb
+++ b/packages/cairo/cairo_1.2.4.bb
@@ -10,7 +10,7 @@ SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz \
 	   file://0002-Change-_cairo_fixed_from_double-to-use-the-magic-number-technique.diff;patch=1 \
   	   "
 
-inherit autotools pkgconfig 
+inherit autotools pkgconfig
 
 do_stage () {
 	autotools_stage_all
diff --git a/packages/cairo/cairo_1.3.4.bb b/packages/cairo/cairo_1.3.4.bb
index 6d9a7c43ab..19e3f7a872 100644
--- a/packages/cairo/cairo_1.3.4.bb
+++ b/packages/cairo/cairo_1.3.4.bb
@@ -10,7 +10,7 @@ LICENSE = "MPL LGPL"
 SRC_URI = "http://cairographics.org/snapshots/cairo-${PV}.tar.gz \
            file://configure.in_requires_pkg-config-0.15.diff;patch=1;pnum=2"
 
-inherit autotools pkgconfig 
+inherit autotools pkgconfig
 
 do_stage () {
  	autotools_stage_all
diff --git a/packages/cairo/cairo_git.bb b/packages/cairo/cairo_git.bb
index 9d11c2685f..55bdc019f0 100644
--- a/packages/cairo/cairo_git.bb
+++ b/packages/cairo/cairo_git.bb
@@ -11,7 +11,7 @@ PV = "1.3.11+git${SRCDATE}"
 
 SRC_URI = "git://git.cairographics.org/git/cairo;protocol=git \
 	  "
-inherit autotools pkgconfig 
+inherit autotools pkgconfig
 
 S = "${WORKDIR}/git"
 
diff --git a/packages/cairo/libsvg-cairo_0.1.5.bb b/packages/cairo/libsvg-cairo_0.1.5.bb
index 438a630064..9cee27bf29 100644
--- a/packages/cairo/libsvg-cairo_0.1.5.bb
+++ b/packages/cairo/libsvg-cairo_0.1.5.bb
@@ -6,7 +6,7 @@ DESCRIPTION = "SVG rendering library"
 
 SRC_URI = "http://cairographics.org/snapshots/libsvg-cairo-${PV}.tar.gz"
 
-inherit autotools pkgconfig 
+inherit autotools pkgconfig
 
 do_stage () {
 	oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR}
diff --git a/packages/cairo/libsvg-cairo_0.1.6.bb b/packages/cairo/libsvg-cairo_0.1.6.bb
index 438a630064..9cee27bf29 100644
--- a/packages/cairo/libsvg-cairo_0.1.6.bb
+++ b/packages/cairo/libsvg-cairo_0.1.6.bb
@@ -6,7 +6,7 @@ DESCRIPTION = "SVG rendering library"
 
 SRC_URI = "http://cairographics.org/snapshots/libsvg-cairo-${PV}.tar.gz"
 
-inherit autotools pkgconfig 
+inherit autotools pkgconfig
 
 do_stage () {
 	oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR}
diff --git a/packages/cairo/libsvg-cairo_20050601.bb b/packages/cairo/libsvg-cairo_20050601.bb
index 7a1f35135a..55e439a3c5 100644
--- a/packages/cairo/libsvg-cairo_20050601.bb
+++ b/packages/cairo/libsvg-cairo_20050601.bb
@@ -10,7 +10,7 @@ DEFAULT_PREFERENCE = "1"
 SRC_URI = "cvs://anoncvs:anoncvs@cvs.cairographics.org/cvs/cairo;module=libsvg-cairo;date=${FIXEDSRCDATE}"
 S = "${WORKDIR}/libsvg-cairo"
 
-inherit autotools pkgconfig 
+inherit autotools pkgconfig
 
 do_stage () {
 	autotools_stage_all
diff --git a/packages/cairo/libsvg-cairo_cvs.bb b/packages/cairo/libsvg-cairo_cvs.bb
index a90447a1df..6f9111e31b 100644
--- a/packages/cairo/libsvg-cairo_cvs.bb
+++ b/packages/cairo/libsvg-cairo_cvs.bb
@@ -8,7 +8,7 @@ DEFAULT_PREFERENCE = "-1"
 SRC_URI = "cvs://anoncvs:anoncvs@cvs.cairographics.org/cvs/cairo;module=libsvg-cairo"
 S = "${WORKDIR}/libsvg-cairo"
 
-inherit autotools pkgconfig 
+inherit autotools pkgconfig
 
 do_stage () {
 	autotools_stage_all
diff --git a/packages/cairo/libsvg_0.1.4.bb b/packages/cairo/libsvg_0.1.4.bb
index 730f427c08..21127b77ff 100644
--- a/packages/cairo/libsvg_0.1.4.bb
+++ b/packages/cairo/libsvg_0.1.4.bb
@@ -10,7 +10,7 @@ SRC_URI = "http://cairographics.org/snapshots/libsvg-${PV}.tar.gz \
 
 EXTRA_OECONF = "--with-expat"
 
-inherit autotools pkgconfig 
+inherit autotools pkgconfig
 
 do_stage () {
 	autotools_stage_all
diff --git a/packages/cairo/libsvg_cvs.bb b/packages/cairo/libsvg_cvs.bb
index 2f4bd8aaad..95b360c041 100644
--- a/packages/cairo/libsvg_cvs.bb
+++ b/packages/cairo/libsvg_cvs.bb
@@ -10,7 +10,7 @@ PR = "r2"
 
 EXTRA_OECONF = "--with-expat"
 
-inherit autotools pkgconfig 
+inherit autotools pkgconfig
 
 do_stage () {
 	autotools_stage_all
diff --git a/packages/cairo/xsvg_cvs.bb b/packages/cairo/xsvg_cvs.bb
index 89677d01fc..8f4f4bfdc4 100644
--- a/packages/cairo/xsvg_cvs.bb
+++ b/packages/cairo/xsvg_cvs.bb
@@ -11,7 +11,7 @@ S = "${WORKDIR}/xsvg"
 # FIXME: add xcursor
 BROKEN = "1"
 
-inherit autotools pkgconfig 
+inherit autotools pkgconfig
 
 do_stage () {
 	oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR}
diff --git a/packages/camera-assistant/camera-assistant_0.2.0.bb b/packages/camera-assistant/camera-assistant_0.2.0.bb
index db117e102c..fb5b6e1f4e 100644
--- a/packages/camera-assistant/camera-assistant_0.2.0.bb
+++ b/packages/camera-assistant/camera-assistant_0.2.0.bb
@@ -19,13 +19,13 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/cameraassistant/camera-assistant_0.2.0.tar.gz \
 	  file://g++-3.4-compile-fixes.patch;patch=1 \
 	  file://ca.desktop \
 	  file://ca.png "
-	  
+
 
 S = "${WORKDIR}/CameraAssistant"
 
 APPNAME = "ca"
 APPTYPE = "binary"
-APPDESKTOP = "${WORKDIR}" 
+APPDESKTOP = "${WORKDIR}"
 
 do_install() {
     install -d ${D}${palmtopdir}/pics/${APPNAME}/
diff --git a/packages/cbrpager/cbrpager_0.9.14.bb b/packages/cbrpager/cbrpager_0.9.14.bb
index e0daf425ba..ccf2658f82 100644
--- a/packages/cbrpager/cbrpager_0.9.14.bb
+++ b/packages/cbrpager/cbrpager_0.9.14.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 PR = "r2"
 
 DEPENDS = "gtk+ libgnomeui"
-RDEPENDS = "unzip" 
+RDEPENDS = "unzip"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${P}.tar.gz"
 
diff --git a/packages/cdparanoia/cdparanoia_9.8alpha.bb b/packages/cdparanoia/cdparanoia_9.8alpha.bb
index 4e9b00ee20..10c1f06511 100644
--- a/packages/cdparanoia/cdparanoia_9.8alpha.bb
+++ b/packages/cdparanoia/cdparanoia_9.8alpha.bb
@@ -15,12 +15,12 @@ inherit autotools
 
 do_install() {
 	oe_runmake BINDIR="${D}/usr/bin" MANDIR="${D}/usr/share/man/" \
-		   INCLUDEDIR="${D}/usr/include/" LIBDIR="${D}/usr/lib" install 
+		   INCLUDEDIR="${D}/usr/include/" LIBDIR="${D}/usr/lib" install
 }
 
 do_stage() {
 	install -d ${STAGING_INCDIR} ${STAGING_LIBDIR}
-	
+
 	install -m 0644 paranoia/cdda_paranoia.h ${STAGING_INCDIR}
 	install -m 0644 interface/cdda_interface.h ${STAGING_INCDIR}
 
diff --git a/packages/cdrtools/cdrtools-native_2.01.bb b/packages/cdrtools/cdrtools-native_2.01.bb
index cd9aa7c431..9b148517d2 100644
--- a/packages/cdrtools/cdrtools-native_2.01.bb
+++ b/packages/cdrtools/cdrtools-native_2.01.bb
@@ -17,7 +17,7 @@ STAGE_TEMP="${WORKDIR}/stage_temp"
 do_stage() {
 	install -d ${STAGE_TEMP}
 	make install INS_BASE=${STAGE_TEMP}
-	
+
 	install -d ${STAGING_BINDIR}
 	install ${STAGE_TEMP}/bin/* ${STAGING_BINDIR}
 }
diff --git a/packages/changedfiles/changedfiles-daemon_1.0-rc1.bb b/packages/changedfiles/changedfiles-daemon_1.0-rc1.bb
index 00ad9743fd..28cc1bf277 100644
--- a/packages/changedfiles/changedfiles-daemon_1.0-rc1.bb
+++ b/packages/changedfiles/changedfiles-daemon_1.0-rc1.bb
@@ -3,7 +3,7 @@ PR = "r1"
 
 SRC_URI += "file://autofoo.patch;patch=1"
 
-inherit autotools 
+inherit autotools
 
 do_compile() {
 	oe_runmake daemon
diff --git a/packages/clucene/clucene_0.8.12-pre.bb b/packages/clucene/clucene_0.8.12-pre.bb
index 3bfbac9ed7..2c8122c921 100644
--- a/packages/clucene/clucene_0.8.12-pre.bb
+++ b/packages/clucene/clucene_0.8.12-pre.bb
@@ -7,7 +7,7 @@ SRC_URI = "cvs://anonymous@clucene.cvs.sourceforge.net/cvsroot/clucene;module=.
 	   file://compile-fix.patch;patch=1"
 S = "${WORKDIR}"
 
-inherit autotools 
+inherit autotools
 
 do_stage() {
 	oe_libinstall -C src libclucene ${STAGING_LIBDIR}
diff --git a/packages/console-tools/console-tools_0.3.2.bb b/packages/console-tools/console-tools_0.3.2.bb
index 01c2e42a31..cd8021d9ef 100644
--- a/packages/console-tools/console-tools_0.3.2.bb
+++ b/packages/console-tools/console-tools_0.3.2.bb
@@ -25,7 +25,7 @@ do_compile () {
 	oe_runmake 'SUBDIRS=${SUBDIRS}'
 }
 
-inherit autotools 
+inherit autotools
 
 do_install () {
 	autotools_do_install
diff --git a/packages/coreutils/coreutils_5.0.bb b/packages/coreutils/coreutils_5.0.bb
index 84fa38cef2..74e27a8d70 100644
--- a/packages/coreutils/coreutils_5.0.bb
+++ b/packages/coreutils/coreutils_5.0.bb
@@ -1,4 +1,4 @@
-require coreutils.inc 
+require coreutils.inc
 
 PR = "r1"
 
diff --git a/packages/coreutils/coreutils_5.1.1.bb b/packages/coreutils/coreutils_5.1.1.bb
index 40b9fe4744..e8ae798691 100644
--- a/packages/coreutils/coreutils_5.1.1.bb
+++ b/packages/coreutils/coreutils_5.1.1.bb
@@ -1,4 +1,4 @@
-require coreutils.inc 
+require coreutils.inc
 
 PR = "r1"
 
diff --git a/packages/coreutils/coreutils_5.1.3.bb b/packages/coreutils/coreutils_5.1.3.bb
index 2277ae6bc7..da9b214af5 100644
--- a/packages/coreutils/coreutils_5.1.3.bb
+++ b/packages/coreutils/coreutils_5.1.3.bb
@@ -1,4 +1,4 @@
-require coreutils.inc 
+require coreutils.inc
 
 PR = "r8"
 
@@ -26,10 +26,10 @@ sbindir_progs= "chroot"
 
 do_install () {
 	autotools_do_install
-	
+
 	# Renaming the utilities that should go in /usr/bin
 	for i in ${bindir_progs}; do mv ${D}${bindir}/$i ${D}${bindir}/$i.${PN}; done
-	
+
 	# Renaming and moving the utilities that should go in /bin (FHS)
 	install -d ${D}${base_bindir}
 	for i in ${base_bindir_progs}; do mv ${D}${bindir}/$i ${D}${base_bindir}/$i.${PN}; done
@@ -45,7 +45,7 @@ do_install () {
 	# hostname and uptime separated. busybox's versions are preferred
 	mv ${D}${bindir}/hostname ${D}${base_bindir}/hostname.${PN}
 	mv ${D}${bindir}/uptime ${D}${bindir}/uptime.${PN}
-					
+
 }
 
 pkg_postinst_${PN} () {
@@ -54,11 +54,11 @@ pkg_postinst_${PN} () {
 
 	# The utilities in /bin
 	for i in ${base_bindir_progs}; do update-alternatives --install ${base_bindir}/$i $i $i.${PN} 100; done
-	
+
 	# The utilities in /usr/sbin
 	for i in ${sbindir_progs}; do update-alternatives --install ${sbindir}/$i $i $i.${PN} 100; done
 
-	# Special cases. uptime and hostname is broken, prefer busybox's version. [ needs to be treated separately. 
+	# Special cases. uptime and hostname is broken, prefer busybox's version. [ needs to be treated separately.
 	update-alternatives --install ${bindir}/uptime uptime uptime.${PN} 10
 	update-alternatives --install ${base_bindir}/hostname hostname hostname.${PN} 10
 	update-alternatives --install '${bindir}/[' '[' 'lbracket.${PN}' 100
diff --git a/packages/coreutils/coreutils_5.3.0.bb b/packages/coreutils/coreutils_5.3.0.bb
index 6c2289b8f7..61d25543ab 100644
--- a/packages/coreutils/coreutils_5.3.0.bb
+++ b/packages/coreutils/coreutils_5.3.0.bb
@@ -1,4 +1,4 @@
-require coreutils.inc 
+require coreutils.inc
 
 PR = "r1"
 
@@ -27,10 +27,10 @@ sbindir_progs= "chroot"
 
 do_install () {
 	autotools_do_install
-	
+
 	# Renaming the utilities that should go in /usr/bin
 	for i in ${bindir_progs}; do mv ${D}${bindir}/$i ${D}${bindir}/$i.${PN}; done
-	
+
 	# Renaming and moving the utilities that should go in /bin (FHS)
 	install -d ${D}${base_bindir}
 	for i in ${base_bindir_progs}; do mv ${D}${bindir}/$i ${D}${base_bindir}/$i.${PN}; done
@@ -46,7 +46,7 @@ do_install () {
 	# hostname and uptime separated. busybox's versions are preferred
 	mv ${D}${bindir}/hostname ${D}${base_bindir}/hostname.${PN}
 	mv ${D}${bindir}/uptime ${D}${bindir}/uptime.${PN}
-					
+
 }
 
 pkg_postinst_${PN} () {
@@ -55,11 +55,11 @@ pkg_postinst_${PN} () {
 
 	# The utilities in /bin
 	for i in ${base_bindir_progs}; do update-alternatives --install ${base_bindir}/$i $i $i.${PN} 100; done
-	
+
 	# The utilities in /usr/sbin
 	for i in ${sbindir_progs}; do update-alternatives --install ${sbindir}/$i $i $i.${PN} 100; done
 
-	# Special cases. uptime and hostname is broken, prefer busybox's version. [ needs to be treated separately. 
+	# Special cases. uptime and hostname is broken, prefer busybox's version. [ needs to be treated separately.
 	update-alternatives --install ${bindir}/uptime uptime uptime.${PN} 10
 	update-alternatives --install ${base_bindir}/hostname hostname hostname.${PN} 10
 	update-alternatives --install '${bindir}/[' '[' 'lbracket.${PN}' 100
diff --git a/packages/cpuburn/cpuburn_1.4.bb b/packages/cpuburn/cpuburn_1.4.bb
index 9e85b6d6b7..a3d1264212 100644
--- a/packages/cpuburn/cpuburn_1.4.bb
+++ b/packages/cpuburn/cpuburn_1.4.bb
@@ -21,5 +21,5 @@ cpuburn_do_unpack () {
 do_install () {
 	oe_runmake install DESTDIR=${D}
 }
-			
+
 
diff --git a/packages/cpufreqd/cpufreqd_1.1.2.bb b/packages/cpufreqd/cpufreqd_1.1.2.bb
index 7cad9af62f..25573b832d 100644
--- a/packages/cpufreqd/cpufreqd_1.1.2.bb
+++ b/packages/cpufreqd/cpufreqd_1.1.2.bb
@@ -8,7 +8,7 @@ LICENSE = "GPL"
 SRC_URI = "${SOURCEFORGE_MIRROR}/cpufreqd/cpufreqd-${PV}.tar.gz \
 	   file://nonrootinstall.patch;patch=1"
 
-inherit autotools 
+inherit autotools
 
 FILES_${PN} = "${sbindir} ${sysconfdir} ${libdir}/libsys_*.so"
 FILES_${PN}-dev = "${libdir}/*.la ${libdir}/*.a"
diff --git a/packages/crimsonfields/crimsonfields_0.4.8.bb b/packages/crimsonfields/crimsonfields_0.4.8.bb
index 102b72fb10..6c36c1fca6 100644
--- a/packages/crimsonfields/crimsonfields_0.4.8.bb
+++ b/packages/crimsonfields/crimsonfields_0.4.8.bb
@@ -8,7 +8,7 @@ SRC_URI = "http://crimson.seul.org/files/crimson-${PV}.tar.bz2 \
            file://native-tools.patch;patch=1"
 S = "${WORKDIR}/crimson-${PV}"
 
-inherit autotools 
+inherit autotools
 
 HOST_TOOLS = "cfed mkdatafile mklocale mktileset mkunitset"
 
diff --git a/packages/cron/cron_3.0pl1.bb b/packages/cron/cron_3.0pl1.bb
index 36bfe5d89d..4d543de6c7 100644
--- a/packages/cron/cron_3.0pl1.bb
+++ b/packages/cron/cron_3.0pl1.bb
@@ -30,5 +30,5 @@ pkg_postinst() {
 pkg_postrm() {
 	update-rc.d cron remove
 }
-		
+
 
diff --git a/packages/ctrlproxy/ctrlproxy_2.6.2.bb b/packages/ctrlproxy/ctrlproxy_2.6.2.bb
index 4cdbd6bd38..53be0cef76 100644
--- a/packages/ctrlproxy/ctrlproxy_2.6.2.bb
+++ b/packages/ctrlproxy/ctrlproxy_2.6.2.bb
@@ -13,7 +13,7 @@ inherit autotools
 
 #INITSCRIPT_NAME = "ctrlproxy"
 #INITSCRIPT_PARAMS = "defaults 84"
-# CONFFILES_${PN} = "${sysconfdir}/foo.conf" 
+# CONFFILES_${PN} = "${sysconfdir}/foo.conf"
 
 # To fix this error in autotools_do_configure (which arises after a
 # change to pkg-config pkg.m4):
diff --git a/packages/cumulus/cumulus_1.2.1.bb b/packages/cumulus/cumulus_1.2.1.bb
index 28367139eb..1bafeb9d9b 100644
--- a/packages/cumulus/cumulus_1.2.1.bb
+++ b/packages/cumulus/cumulus_1.2.1.bb
@@ -22,7 +22,7 @@ do_compile() {
 	echo "#define SHARP_PDA_WARNSOUND 4" >sharp_char.h
 	qmake -makefile -spec ${QMAKESPEC} -after ${EXTRA_QMAKEVARS_POST} cumulus.pro
 	oe_runmake
-	qmake -makefile -spec ${QMAKESPEC} -after ${EXTRA_QMAKEVARS_POST} gpsClient.pro 
+	qmake -makefile -spec ${QMAKESPEC} -after ${EXTRA_QMAKEVARS_POST} gpsClient.pro
 	oe_runmake
 }
 
diff --git a/packages/cumulus/cumulus_cvs.bb b/packages/cumulus/cumulus_cvs.bb
index a56ad5e15d..133e0e704f 100644
--- a/packages/cumulus/cumulus_cvs.bb
+++ b/packages/cumulus/cumulus_cvs.bb
@@ -25,7 +25,7 @@ do_compile() {
 	echo "#define SHARP_PDA_WARNSOUND 4" >sharp_char.h
 	qmake -makefile -spec ${QMAKESPEC} -after ${EXTRA_QMAKEVARS_POST} cumulus.pro
 	oe_runmake
-	qmake -makefile -spec ${QMAKESPEC} -after ${EXTRA_QMAKEVARS_POST} gpsClient.pro 
+	qmake -makefile -spec ${QMAKESPEC} -after ${EXTRA_QMAKEVARS_POST} gpsClient.pro
 	oe_runmake
 }
 
diff --git a/packages/cups/cups_1.2.7.bb b/packages/cups/cups_1.2.7.bb
index e49a4466a5..acd735705c 100644
--- a/packages/cups/cups_1.2.7.bb
+++ b/packages/cups/cups_1.2.7.bb
@@ -24,7 +24,7 @@ do_configure() {
 	gnu-configize
 	libtoolize --force
 	oe_runconf
-}	
+}
 
 do_compile () {
 	sed -i s:STRIP:NOSTRIP: Makedefs
diff --git a/packages/cxcrypt/cxcrypt_1.0.bb b/packages/cxcrypt/cxcrypt_1.0.bb
index 11fbadae0c..705859319b 100644
--- a/packages/cxcrypt/cxcrypt_1.0.bb
+++ b/packages/cxcrypt/cxcrypt_1.0.bb
@@ -10,7 +10,7 @@ CFLAGS_prepend = "-g -Wall -ansi -pedantic "
 LDFLAGS_prepend = "-L. -lcxio "
 
 do_compile() {
-	oe_runmake 
+	oe_runmake
 }
 
 do_install() {
diff --git a/packages/cyrus-sasl/cyrus-sasl_2.1.17.bb b/packages/cyrus-sasl/cyrus-sasl_2.1.17.bb
index 381486bc81..81bac22855 100644
--- a/packages/cyrus-sasl/cyrus-sasl_2.1.17.bb
+++ b/packages/cyrus-sasl/cyrus-sasl_2.1.17.bb
@@ -6,7 +6,7 @@ LICENSE = "BSD"
 SRC_URI = "ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/OLD-VERSIONS/sasl/cyrus-sasl-${PV}.tar.gz \
 	   file://configure.patch;patch=1"
 
-inherit autotools 
+inherit autotools
 
 acpaths = "-I ${S}/cmulocal -I ${S}/config -I ."
 CFLAGS_append = " -I${S}/include -I${S}/saslauthd/include"
diff --git a/packages/cyrus-sasl/cyrus-sasl_2.1.18.bb b/packages/cyrus-sasl/cyrus-sasl_2.1.18.bb
index 0295b2eb09..e95dceee39 100644
--- a/packages/cyrus-sasl/cyrus-sasl_2.1.18.bb
+++ b/packages/cyrus-sasl/cyrus-sasl_2.1.18.bb
@@ -5,7 +5,7 @@ LICENSE = "BSD"
 
 SRC_URI = "ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/OLD-VERSIONS/sasl/cyrus-sasl-${PV}.tar.gz"
 
-inherit autotools 
+inherit autotools
 
 acpaths = "-I ${S}/cmulocal -I ${S}/config -I ."
 CFLAGS_append = " -I${S}/include -I${S}/saslauthd/include"
diff --git a/packages/cyrus-sasl/cyrus-sasl_2.1.19.bb b/packages/cyrus-sasl/cyrus-sasl_2.1.19.bb
index f3148233e5..cf7ce75b99 100644
--- a/packages/cyrus-sasl/cyrus-sasl_2.1.19.bb
+++ b/packages/cyrus-sasl/cyrus-sasl_2.1.19.bb
@@ -8,7 +8,7 @@ SRC_URI = "ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-${PV}.tar.gz \
 	   file://berkdb.m4.patch;patch=1 \
 	   file://client.c.patch;patch=1"
 
-inherit autotools 
+inherit autotools
 
 acpaths = "-I ${S}/cmulocal -I ${S}/config -I ."
 CFLAGS_append = " -I${S}/include -I${S}/saslauthd/include"
diff --git a/packages/davfs2/davfs2_0.2.7.bb b/packages/davfs2/davfs2_0.2.7.bb
index 5ed112087c..310ccabb32 100644
--- a/packages/davfs2/davfs2_0.2.7.bb
+++ b/packages/davfs2/davfs2_0.2.7.bb
@@ -19,7 +19,7 @@ inherit autotools
 ALTERNATIVE_NAME = "mount.davfs"
 ALTERNATIVE_PATH = "${sbindir}/${ALTERNATIVE_NAME}"
 ALTERNATIVE_PRIORITY = "90"
-ALTERNATIVE_LINK = "${base_sbindir}/${ALTERNATIVE_NAME}" 
+ALTERNATIVE_LINK = "${base_sbindir}/${ALTERNATIVE_NAME}"
 
 EXTRA_OECONF = "--with-neon"
 
diff --git a/packages/davfs2/davfs2_0.2.8.bb b/packages/davfs2/davfs2_0.2.8.bb
index f5a6f3458d..ecb7034042 100644
--- a/packages/davfs2/davfs2_0.2.8.bb
+++ b/packages/davfs2/davfs2_0.2.8.bb
@@ -17,7 +17,7 @@ inherit autotools
 ALTERNATIVE_NAME = "mount.davfs"
 ALTERNATIVE_PATH = "${sbindir}/${ALTERNATIVE_NAME}"
 ALTERNATIVE_PRIORITY = "90"
-ALTERNATIVE_LINK = "${base_sbindir}/${ALTERNATIVE_NAME}" 
+ALTERNATIVE_LINK = "${base_sbindir}/${ALTERNATIVE_NAME}"
 
 EXTRA_OECONF = "--with-neon"
 
diff --git a/packages/dcop/dcopidl-native_3.5.4.bb b/packages/dcop/dcopidl-native_3.5.4.bb
index 928b6b6ab3..820700d56e 100644
--- a/packages/dcop/dcopidl-native_3.5.4.bb
+++ b/packages/dcop/dcopidl-native_3.5.4.bb
@@ -7,7 +7,7 @@ DEPENDS     = "uicmoc3-native"
 
 SRC_URI     = "svn://anonsvn.kde.org/home/kde/branches/KDE/3.5/kdelibs/dcop/;module=dcopidl \
 	      file://dcopidl-compile.patch;patch=1 "
-S           = "${WORKDIR}/dcopidl" 
+S           = "${WORKDIR}/dcopidl"
 
 
 inherit native qmake qt3e
diff --git a/packages/dcop/dcopidl2cpp-native_3.5.4.bb b/packages/dcop/dcopidl2cpp-native_3.5.4.bb
index e520d3f97c..29a4f71d3c 100644
--- a/packages/dcop/dcopidl2cpp-native_3.5.4.bb
+++ b/packages/dcop/dcopidl2cpp-native_3.5.4.bb
@@ -8,7 +8,7 @@ DEPENDS     = "uicmoc3-native"
 SRC_URI     = "svn://anonsvn.kde.org/home/kde/branches/KDE/3.5/kdelibs/dcop/;module=dcopidl2cpp "
 #\
 #	      file://dcopidl-compile.patch;patch=1 "
-S           = "${WORKDIR}/dcopidl2cpp" 
+S           = "${WORKDIR}/dcopidl2cpp"
 
 
 inherit native qmake qt3e
diff --git a/packages/desktop-file-utils/desktop-file-utils_0.3.bb b/packages/desktop-file-utils/desktop-file-utils_0.3.bb
index 0e77f64942..9bb74caf46 100644
--- a/packages/desktop-file-utils/desktop-file-utils_0.3.bb
+++ b/packages/desktop-file-utils/desktop-file-utils_0.3.bb
@@ -7,4 +7,4 @@ DEPENDS = "popt glib-2.0"
 SRC_URI = "http://freedesktop.org/Software/desktop-file-utils/releases/desktop-file-utils-${PV}.tar.gz \
 	   file://m4.patch;patch=1"
 
-inherit autotools 
+inherit autotools
diff --git a/packages/desktop-file-utils/desktop-file-utils_0.6.bb b/packages/desktop-file-utils/desktop-file-utils_0.6.bb
index 34f7b73451..f68dfa7423 100644
--- a/packages/desktop-file-utils/desktop-file-utils_0.6.bb
+++ b/packages/desktop-file-utils/desktop-file-utils_0.6.bb
@@ -6,4 +6,4 @@ DEPENDS = "popt glib-2.0 gnome-vfs"
 
 SRC_URI = "http://freedesktop.org/Software/desktop-file-utils/releases/desktop-file-utils-${PV}.tar.gz"
 
-inherit autotools 
+inherit autotools
diff --git a/packages/dhcp-forwarder/dhcp-forwarder_0.6.bb b/packages/dhcp-forwarder/dhcp-forwarder_0.6.bb
index aefbf882d9..8cf060e287 100644
--- a/packages/dhcp-forwarder/dhcp-forwarder_0.6.bb
+++ b/packages/dhcp-forwarder/dhcp-forwarder_0.6.bb
@@ -5,7 +5,7 @@ DESCRIPTION = "This program is used to forward DHCP and BOOTP messages between t
  dhcp-relay from ISC and has a smaller foot print."
 HOMEPAGE = "http://www.nongnu.org/dhcp-fwd/"
 LICENSE = "GPLv2"
- 
+
 SRC_URI = "http://savannah.nongnu.org/download/dhcp-fwd/dhcp-forwarder-${PV}.tar.bz2 \
 	file://init \
 	file://dhcp-fwd.cfg"
diff --git a/packages/dhcp-forwarder/dhcp-forwarder_0.7.bb b/packages/dhcp-forwarder/dhcp-forwarder_0.7.bb
index aefbf882d9..8cf060e287 100644
--- a/packages/dhcp-forwarder/dhcp-forwarder_0.7.bb
+++ b/packages/dhcp-forwarder/dhcp-forwarder_0.7.bb
@@ -5,7 +5,7 @@ DESCRIPTION = "This program is used to forward DHCP and BOOTP messages between t
  dhcp-relay from ISC and has a smaller foot print."
 HOMEPAGE = "http://www.nongnu.org/dhcp-fwd/"
 LICENSE = "GPLv2"
- 
+
 SRC_URI = "http://savannah.nongnu.org/download/dhcp-fwd/dhcp-forwarder-${PV}.tar.bz2 \
 	file://init \
 	file://dhcp-fwd.cfg"
diff --git a/packages/dillo/dillo_0.8.6.bb b/packages/dillo/dillo_0.8.6.bb
index 8150e16214..8eff692026 100644
--- a/packages/dillo/dillo_0.8.6.bb
+++ b/packages/dillo/dillo_0.8.6.bb
@@ -7,7 +7,7 @@ SRC_URI="http://www.dillo.org/download/dillo-${PV}.tar.bz2 \
          file://dillo-i18n.diff;patch=1 \
          file://dillo.desktop \
          file://dillo.png"
-	 
+
 
 PRIORITY = "optional"
 
diff --git a/packages/dosbox/dosbox_0.63.bb b/packages/dosbox/dosbox_0.63.bb
index decb3e5f07..9d68e27515 100644
--- a/packages/dosbox/dosbox_0.63.bb
+++ b/packages/dosbox/dosbox_0.63.bb
@@ -8,5 +8,5 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/dosbox/dosbox-${PV}.tar.gz \
 	file://nocdrom.patch;patch=1"
 CXXFLAGS_append = " -DC_SDL_NOCDROM"
 
-inherit autotools 
+inherit autotools
 
diff --git a/packages/e17/entrance_0.9.0.007.bb b/packages/e17/entrance_0.9.0.007.bb
index 9f15c72282..7f0a9a181e 100644
--- a/packages/e17/entrance_0.9.0.007.bb
+++ b/packages/e17/entrance_0.9.0.007.bb
@@ -29,9 +29,9 @@ FILES_${PN} += "${bindir} ${sbindir} /etc ${datadir}"
 do_install_append() {
 	install -d ${D}/etc/X11/Xsession.d
 	install -d ${D}/etc/X11/Sessions
-	
+
 	install -m 755 ${WORKDIR}/Sessions/* ${D}/etc/X11/Sessions
 
 	install -d ${D}/etc/X11/login-managers/
-	mv ${D}/etc/init.d/entrance ${D}/etc/X11/login-managers/entrance	
+	mv ${D}/etc/init.d/entrance ${D}/etc/X11/login-managers/entrance
 }
diff --git a/packages/e2fsprogs/e2fsprogs/e2fsprogs_1.34.bb b/packages/e2fsprogs/e2fsprogs/e2fsprogs_1.34.bb
index 875dafdc4a..a0a449042f 100644
--- a/packages/e2fsprogs/e2fsprogs/e2fsprogs_1.34.bb
+++ b/packages/e2fsprogs/e2fsprogs/e2fsprogs_1.34.bb
@@ -2,7 +2,7 @@ DESCRIPTION="EXT2 Filesystem Utilities"
 SECTION="base"
 PRIORITY="optional"
 RDEPENDS="libc6"
-DEPENDS=virtual/libc 
+DEPENDS=virtual/libc
 
 SRC_URI=${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-${PV}.tar.gz \
 	file://${FILESDIR}/ln.patch;patch=1 \
diff --git a/packages/eel/eel_2.6.1.bb b/packages/eel/eel_2.6.1.bb
index a9a50cf172..f123a4aa93 100644
--- a/packages/eel/eel_2.6.1.bb
+++ b/packages/eel/eel_2.6.1.bb
@@ -37,9 +37,9 @@ headers="eel-accessibility.h              eel-graphic-effects.h \
 
 do_stage() {
 	install -d ${edir}
-	for file in ${headers}; do 
+	for file in ${headers}; do
 		install -m 0644 eel/$file ${edir}/$file
 	done
- 
+
 	oe_libinstall -C eel libeel-2 ${STAGING_LIBDIR}
 }
diff --git a/packages/efl/ecore.inc b/packages/efl/ecore.inc
index cea3114dc7..e0e65b69c0 100644
--- a/packages/efl/ecore.inc
+++ b/packages/efl/ecore.inc
@@ -12,6 +12,7 @@ inherit efl
 SRC_URI = "http://enlightenment.freedesktop.org/files/ecore-${PV}.tar.gz \
            file://configure.patch;patch=1 \
            file://fix-tslib-configure.patch;patch=1 \
+           file://ecore_kernel_input_header.patch;patch=1 \
            ${E_CVS};module=e17/libs/ecore/m4;date=20060101"
 
 S = "${WORKDIR}/ecore-${PV}"
diff --git a/packages/efl/ecore/ecore_kernel_input_header.patch b/packages/efl/ecore/ecore_kernel_input_header.patch
new file mode 100644
index 0000000000..99f57ddcff
--- /dev/null
+++ b/packages/efl/ecore/ecore_kernel_input_header.patch
@@ -0,0 +1,23 @@
+Index: ecore-0.9.9.036/src/lib/ecore_fb/ecore_fb_li.c
+===================================================================
+--- ecore-0.9.9.036.orig/src/lib/ecore_fb/ecore_fb_li.c	2006-09-05 01:36:43.000000000 +0100
++++ ecore-0.9.9.036/src/lib/ecore_fb/ecore_fb_li.c	2006-12-02 21:55:54.000000000 +0000
+@@ -1,6 +1,18 @@
+ #include "Ecore_Fb.h"
+ #include "ecore_fb_private.h"
+ 
++struct input_absinfo {
++	__s32 value;
++	__s32 minimum;
++	__s32 maximum;
++	__s32 fuzz;
++	__s32 flat;
++};
++
++
++#define EV_SYN			0x00
++#define EV_PWR			0x16
++#define EV_FF_STATUS		0x17
+ 
+ /* Copyright (C) Brad Hards (1999-2002).
+  * this macro is used to tell if "bit" is set in "array"
diff --git a/packages/efl/edje-native_0.5.0.036.bb b/packages/efl/edje-native_0.5.0.036.bb
index 9909811448..c66639d25e 100644
--- a/packages/efl/edje-native_0.5.0.036.bb
+++ b/packages/efl/edje-native_0.5.0.036.bb
@@ -6,11 +6,6 @@ inherit native
 DEPENDS = "evas-native ecore-native eet-native embryo-native"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/edje"
 
-EXTRA_OECONF = "--with-evas-config=${STAGING_BINDIR}/evas-config-native	\
-  --with-ecore-config=${STAGING_BINDIR}/ecore-config-native	\
-  --with-eet-config=${STAGING_BINDIR}/eet-config-native		\
-  --with-embryo-config=${STAGING_BINDIR}/embryo-config-native"
-
 do_configure_prepend() {
 	sed -i 's:EMBRYO_PREFIX"/bin:"${STAGING_BINDIR}:' ${S}/src/bin/edje_cc_out.c
 	sed -i 's:cpp -I:/usr/bin/cpp -I:' ${S}/src/bin/edje_cc_parse.c
diff --git a/packages/efl/evas.inc b/packages/efl/evas.inc
index 4577535aaa..f065d944f8 100644
--- a/packages/efl/evas.inc
+++ b/packages/efl/evas.inc
@@ -9,7 +9,7 @@ PROVIDES += "virtual/evas"
 
 inherit efl
 
-export FREETYPE_CONFIG		= "${STAGING_BINDIR}/freetype-config${@binconfig_suffix(d)}"
+export FREETYPE_CONFIG = "${STAGING_BINDIR_CROSS}/freetype-config"
 
 SRC_URI = "http://enlightenment.freedesktop.org/files/evas-${PV}.tar.gz \
            file://fix-configure.patch;patch=1 \
diff --git a/packages/emelfm2/emelfm2_0.0.8.bb b/packages/emelfm2/emelfm2_0.0.8.bb
index 092488d5ea..dfc80895c2 100644
--- a/packages/emelfm2/emelfm2_0.0.8.bb
+++ b/packages/emelfm2/emelfm2_0.0.8.bb
@@ -13,7 +13,7 @@ DEPENDS="gtk+"
 FILES_${PN} += " /usr/lib/emelfm2/plugins/ /usr/share/pixmaps/emelfm2/"
 
 do_compile() {
-	oe_runmake PREFIX=/usr all 
+	oe_runmake PREFIX=/usr all
 }
 
 do_install() {
diff --git a/packages/enca/enca_1.9.bb b/packages/enca/enca_1.9.bb
index adc6e5fef7..8151c86865 100644
--- a/packages/enca/enca_1.9.bb
+++ b/packages/enca/enca_1.9.bb
@@ -9,7 +9,7 @@ SRC_URI = "http://trific.ath.cx/Ftp//enca/enca-${PV}.tar.bz2 \
 	file://configure-hack.patch;patch=1 \
 	file://dont-run-tests.patch;patch=1 "
 
-inherit autotools 
+inherit autotools
 
 do_configure_append() {
 	sed -i s:-I/usr/include::g Makefile
diff --git a/packages/ezx/ezx-boot-usb-native_0.1.0.bb b/packages/ezx/ezx-boot-usb-native_0.1.0.bb
new file mode 100644
index 0000000000..5919f28a11
--- /dev/null
+++ b/packages/ezx/ezx-boot-usb-native_0.1.0.bb
@@ -0,0 +1,30 @@
+DESCRIPTION = "Boots an EZX device with a user supplied kernel zImage"
+DEPENDS = "libusb-native"
+SECTION = "devel"
+AUTHOR = "Harald Welte"
+LICENSE = "GPL"
+PR = "r0"
+
+SRC_URI = "http://www.openezx.org/download/boot_usb-${PV}.tar.bz2"
+S = "${WORKDIR}/boot_usb-${PV}"
+
+inherit native
+
+do_compile() {
+	${CC} ${CFLAGS} ${LDFLAGS} -lusb -o ezx-boot-usb boot_usb.c
+}
+
+do_deploy() {
+        install -d ${DEPLOY_DIR_IMAGE}
+        install -m 0755 ezx-boot-usb ${DEPLOY_DIR_IMAGE}/ezx-boot-usb
+}
+
+do_stage() {
+	:
+}
+
+do_install() {
+	:
+}
+
+addtask deploy before do_build after do_compile
diff --git a/packages/ezx/ezx-boot-usb-native_1877.bb b/packages/ezx/ezx-boot-usb-native_svn.bb
index 5fe3294fee..64e8a486e0 100644
--- a/packages/ezx/ezx-boot-usb-native_1877.bb
+++ b/packages/ezx/ezx-boot-usb-native_svn.bb
@@ -5,7 +5,12 @@ AUTHOR = "Harald Welte"
 LICENSE = "GPL"
 PR = "r1"
 
-SRC_URI = "svn://svn.openezx.org/trunk/src/host;module=boot_usb;proto=http;rev=${PV}"
+DEFAULT_PREFERENCE = "-1"
+
+REV = "1922"
+PV = "0.1.0+r${REV}"
+
+SRC_URI = "svn://svn.openezx.org/trunk/src/host;module=boot_usb;proto=http;rev=${REV}"
 S = "${WORKDIR}/boot_usb"
 
 inherit native
diff --git a/packages/ezx/opentapi_svn.bb b/packages/ezx/opentapi_svn.bb
index c932aeaf22..e27aa68b97 100644
--- a/packages/ezx/opentapi_svn.bb
+++ b/packages/ezx/opentapi_svn.bb
@@ -9,6 +9,6 @@ S = "${WORKDIR}/${PN}"
 
 do_install() {
 	install -d ${D}${bindir}
-	install -m 755 opentapi ${D}${bindir}	
-}	
+	install -m 755 opentapi ${D}${bindir}
+}
 
diff --git a/packages/faac/faac_1.24.bb b/packages/faac/faac_1.24.bb
index ceee00931d..253310d1c5 100644
--- a/packages/faac/faac_1.24.bb
+++ b/packages/faac/faac_1.24.bb
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}"
 PACKAGES = "${PN} lib${PN} lib${PN}-dev"
 
 FILES_${PN} = " ${bindir}/faac "
-FILES_lib${PN} = " ${libdir}/libfaac.so.0 ${libdir}/libfaac.so.0.0.0 " 
+FILES_lib${PN} = " ${libdir}/libfaac.so.0 ${libdir}/libfaac.so.0.0.0 "
 FILES_lib${PN}-dev = " ${includedir}/faac.h ${includedir}/faaccfg.h ${libdir}/libfaac.so ${libdir}/libfaac.la ${libdir}/libfaac.a "
 
 do_stage() {
diff --git a/packages/faad2/faad2_2.0.bb b/packages/faad2/faad2_2.0.bb
index a856a1e45f..363da9d144 100644
--- a/packages/faad2/faad2_2.0.bb
+++ b/packages/faad2/faad2_2.0.bb
@@ -18,7 +18,7 @@ do_configure_prepend() {
         mv ${WORKDIR}/Makefile.am ${S}/
 }
 
-PACKAGES =+ "libfaad libfaad-dev libmp4ff libmp4ff-dev" 
+PACKAGES =+ "libfaad libfaad-dev libmp4ff libmp4ff-dev"
 
 FILES_${PN} = "${bindir}/faad"
 
diff --git a/packages/fam/fam_2.6.10.bb b/packages/fam/fam_2.6.10.bb
index 60f9ac901e..870c67719f 100644
--- a/packages/fam/fam_2.6.10.bb
+++ b/packages/fam/fam_2.6.10.bb
@@ -6,7 +6,7 @@ LICENSE = "GPL LGPL"
 SRC_URI = "ftp://oss.sgi.com/projects/fam/download/stable/fam-${PV}.tar.gz \
 	   file://rpcsvc.patch;patch=1"
 
-inherit autotools 
+inherit autotools
 
 CPPFLAGS_append = " -DNDEBUG"
 
diff --git a/packages/fam/fam_2.7.0.bb b/packages/fam/fam_2.7.0.bb
index b3265bbd96..653aea6d3c 100644
--- a/packages/fam/fam_2.7.0.bb
+++ b/packages/fam/fam_2.7.0.bb
@@ -6,7 +6,7 @@ LICENSE = "GPL LGPL"
 SRC_URI = "ftp://oss.sgi.com/projects/fam/download/stable/fam-${PV}.tar.gz \
 	   file://compile-fix.patch;patch=1"
 
-inherit autotools 
+inherit autotools
 
 CPPFLAGS_append = " -DNDEBUG"
 
diff --git a/packages/fbpanel/fbpanel_4.3.bb b/packages/fbpanel/fbpanel_4.3.bb
index 09abb86dc8..b849df0c6f 100644
--- a/packages/fbpanel/fbpanel_4.3.bb
+++ b/packages/fbpanel/fbpanel_4.3.bb
@@ -23,7 +23,7 @@ do_install () {
 	install -m 0755 fbpanel ${D}${bindir}
 	install -d ${D}${datadir}/fbpanel/
 	install -d ${D}${datadir}/fbpanel/plugins
-	install -m 644 plugins/*.so ${D}${datadir}/fbpanel/plugins 
+	install -m 644 plugins/*.so ${D}${datadir}/fbpanel/plugins
 	install -m 644 systray/tray.so ${D}${datadir}/fbpanel/plugins
 	install -m 644 config/default ${D}${datadir}/fbpanel/default
 	install -d ${D}${datadir}/fbpanel/images
diff --git a/packages/fbset/fbset_2.1.bb b/packages/fbset/fbset_2.1.bb
index c03096102b..28161f7636 100644
--- a/packages/fbset/fbset_2.1.bb
+++ b/packages/fbset/fbset_2.1.bb
@@ -21,13 +21,13 @@ PARALLEL_MAKE=""
 
 ######################################################################################
 
-inherit autotools 
+inherit autotools
 
 ######################################################################################
 
 do_install() {
 	install -d ${D}/usr/sbin ${D}/usr/share/man/man8 ${D}/usr/share/man/man5
-	
+
 	install -m 0755 ${WORKDIR}/${P}/fbset ${D}/usr/sbin/fbset.real
 
 	install -m 0644 ${WORKDIR}/${P}/*.5 ${D}/usr/share/man/man5
@@ -37,9 +37,9 @@ do_install() {
 ######################################################################################
 
 pkg_postinst_${PN}() {
-	update-alternatives --install /usr/sbin/fbset fbset /usr/sbin/fbset.real 55	
+	update-alternatives --install /usr/sbin/fbset fbset /usr/sbin/fbset.real 55
 }
 
-pkg_postrm_${PN}() { 
+pkg_postrm_${PN}() {
 	update-alternatives --remove fbset /usr/sbin/fbset.real
-}                                                                               
+}
diff --git a/packages/fbvncserver/fbvncserver-kmodule_0.9.4.bb b/packages/fbvncserver/fbvncserver-kmodule_0.9.4.bb
index 44bdd9b04f..9e1fc13da6 100644
--- a/packages/fbvncserver/fbvncserver-kmodule_0.9.4.bb
+++ b/packages/fbvncserver/fbvncserver-kmodule_0.9.4.bb
@@ -8,7 +8,7 @@ SRC_URI = "http://sdgsystems.com/download/fbvncserver-${PV}.tar.gz \
 	   file://paths.patch;patch=1 \
 	   file://kernelinclude.patch;patch=1 \
            file://ipaq.patch;patch=1"
-	  
+
 S = "${WORKDIR}/fbvncserver-${PV}"
 
 inherit module
diff --git a/packages/fbvncserver/fbvncserver_0.9.4.bb b/packages/fbvncserver/fbvncserver_0.9.4.bb
index 66b7349df7..e7c8151e18 100644
--- a/packages/fbvncserver/fbvncserver_0.9.4.bb
+++ b/packages/fbvncserver/fbvncserver_0.9.4.bb
@@ -16,7 +16,7 @@ SRC_URI = "http://sdgsystems.com/download/fbvncserver-${PV}.tar.gz \
 	   file://buildfix.patch;patch=1 \
 	   file://ipaq.patch;patch=1 \
            file://init"
-	  
+
 S = "${WORKDIR}/fbvncserver-${PV}"
 
 export INCLUDES = "-I${STAGING_INCDIR}"
@@ -43,10 +43,10 @@ do_install () {
 	install -d ${D}${bindir}
 	install -m 0755 ${FBVNCSERVER_SYSTEM}_fbvncserver ${D}${bindir}/fbvncserver
 	install -m 0755 ${FBVNCSERVER_SYSTEM}_tssimd ${D}${bindir}/tssimd
-	
+
 	install -d ${D}${datadir}/fbvncserver
 	install -m 0644 ${FBVNCSERVER_SYSTEM}_panel.jpg ${D}${datadir}/fbvncserver/
-	
+
 	install -d ${D}${sysconfdir}/init.d
 	install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/fbvncinput
 }
diff --git a/packages/fdclock/fdclock_cvs.bb b/packages/fdclock/fdclock_cvs.bb
index 61d9a018cd..6705039555 100644
--- a/packages/fdclock/fdclock_cvs.bb
+++ b/packages/fdclock/fdclock_cvs.bb
@@ -8,4 +8,4 @@ DESCRIPTION = "The freedesktop.org clock"
 SRC_URI = "${FREEDESKTOP_CVS}/xapps;module=fdclock"
 S = "${WORKDIR}/fdclock"
 
-inherit autotools 
+inherit autotools
diff --git a/packages/fget/fget_1.3.3.bb b/packages/fget/fget_1.3.3.bb
index fe1f71ce88..165167e6dc 100644
--- a/packages/fget/fget_1.3.3.bb
+++ b/packages/fget/fget_1.3.3.bb
@@ -9,7 +9,7 @@ PRIORITY = "optional"
 
 SRC_URI = "ftp://ftp.feep.net/pub/software/fget/fget-${PV}.tar.gz"
 
-inherit autotools 
+inherit autotools
 
 do_configure() {
 	oe_runconf
diff --git a/packages/file/file_4.16.bb b/packages/file/file_4.16.bb
index 3e579c5ef4..b2c2e6ed91 100644
--- a/packages/file/file_4.16.bb
+++ b/packages/file/file_4.16.bb
@@ -7,7 +7,7 @@ DEPENDS = "file-native"
 SRC_URI = "ftp://ftp.astron.com/pub/file/file-${PV}.tar.gz"
 S = "${WORKDIR}/file-${PV}"
 
-inherit autotools 
+inherit autotools
 
 do_configure_prepend() {
 	sed -i -e 's,$(top_builddir)/src/file,file,' ${S}/magic/Makefile.am
diff --git a/packages/file/file_4.18.bb b/packages/file/file_4.18.bb
index 697d4ffb9f..a98c68009e 100644
--- a/packages/file/file_4.18.bb
+++ b/packages/file/file_4.18.bb
@@ -9,7 +9,7 @@ SRC_URI = "ftp://ftp.astron.com/pub/file/file-${PV}.tar.gz \
            file://filesystems"
 S = "${WORKDIR}/file-${PV}"
 
-inherit autotools 
+inherit autotools
 
 do_configure_prepend() {
 	sed -i -e 's,$(top_builddir)/src/file,file,' ${S}/magic/Makefile.am
diff --git a/packages/flac/flac_1.1.2.bb b/packages/flac/flac_1.1.2.bb
index 293455f2e1..cdd96bbf2d 100644
--- a/packages/flac/flac_1.1.2.bb
+++ b/packages/flac/flac_1.1.2.bb
@@ -7,7 +7,7 @@ PR = "r5"
 SRC_URI = "${SOURCEFORGE_MIRROR}/flac/flac-${PV}.tar.gz \
 	   file://disable-xmms-plugin.patch;patch=1 \
 	   file://xmms.m4"
-	   
+
 S = "${WORKDIR}/flac-${PV}"
 
 inherit autotools
@@ -39,7 +39,7 @@ do_stage () {
 	oe_libinstall -a -so -C src/libOggFLAC libOggFLAC ${STAGING_LIBDIR}/
 	install -d ${STAGING_INCDIR}/OggFLAC
 	install -m 0644 ${S}/include/OggFLAC/export.h ${STAGING_INCDIR}/OggFLAC/export.h
-	
+
 	install -m 0644 ${S}/include/OggFLAC/all.h ${STAGING_INCDIR}/OggFLAC/all.h
 	install -m 0644 ${S}/include/OggFLAC/stream_encoder.h ${STAGING_INCDIR}/OggFLAC/stream_encoder.h
 	install -m 0644 ${S}/include/OggFLAC/stream_decoder.h ${STAGING_INCDIR}/OggFLAC/stream_decoder.h
diff --git a/packages/flite/flite_1.2.bb b/packages/flite/flite_1.2.bb
index 42051d5014..556cd2b47c 100644
--- a/packages/flite/flite_1.2.bb
+++ b/packages/flite/flite_1.2.bb
@@ -12,7 +12,7 @@ SRC_URI = "http://www.speech.cs.cmu.edu/flite/packed/flite-${PV}/flite-${PV}-rel
            file://fix-read-only-assignments.patch;patch=1"
 S = "${WORKDIR}/flite-${PV}-release"
 
-inherit autotools 
+inherit autotools
 
 EXTRA_OECONF = "--with-audio=oss --enable-shared"
 
diff --git a/packages/fluxbox/fluxbox_0.99+1.0rc.bb b/packages/fluxbox/fluxbox_0.99+1.0rc.bb
index 81d2952e23..3f271a57a4 100644
--- a/packages/fluxbox/fluxbox_0.99+1.0rc.bb
+++ b/packages/fluxbox/fluxbox_0.99+1.0rc.bb
@@ -70,25 +70,25 @@ do_install_append() {
 	install -d ${D}/usr/share/fluxbox
 	install -d ${D}/usr/share/fluxbox/styles
 	install -d ${D}/etc
-	
+
 	install -m 0644 ${WORKDIR}/apps.gpe.* ${D}/usr/share/fluxbox
 	install -m 0644 ${WORKDIR}/keys.* ${D}/usr/share/fluxbox
 	install -m 0755 ${WORKDIR}/fluxbox-gpe.session ${D}/usr/share/fluxbox/session
 	install -m 0644 ${WORKDIR}/style.gpe-default ${D}/usr/share/fluxbox/styles/gpe-default
 	install -m 0755 ${WORKDIR}/fluxbox-gpe-session ${D}/usr/bin
-	install -m 0755 ${WORKDIR}/gpe-logout.fluxbox ${D}/usr/bin	
-	install -m 0644 ${WORKDIR}/keylaunchrc.fluxbox ${D}/etc	
+	install -m 0755 ${WORKDIR}/gpe-logout.fluxbox ${D}/usr/bin
+	install -m 0644 ${WORKDIR}/keylaunchrc.fluxbox ${D}/etc
 }
 
 ######################################################################################
 
-pkg_postinst_${PN}-gpe() { 
+pkg_postinst_${PN}-gpe() {
        update-alternatives --install /usr/bin/x-window-manager x-window-manager /usr/bin/fluxbox-gpe-session 15
        update-alternatives --install /usr/bin/gpe-logout gpe-logout /usr/bin/gpe-logout.fluxbox  15
        update-alternatives --install /etc/keylaunchrc keylaunchrc /etc/keylaunchrc.fluxbox 15
 }
 
-pkg_postrm_${PN}-gpe() {   
+pkg_postrm_${PN}-gpe() {
        update-alternatives --remove x-window-manager /usr/bin/fluxbox-gpe-session
        update-alternatives --remove gpe-logout /usr/bin/gpe-logout.fluxbox
        update-alternatives --remove keylaunchrc /etc/keylaunchrc.fluxbox
diff --git a/packages/fluxbox/fluxbox_svn.bb b/packages/fluxbox/fluxbox_svn.bb
index 56e799a272..ffaa7da5b4 100644
--- a/packages/fluxbox/fluxbox_svn.bb
+++ b/packages/fluxbox/fluxbox_svn.bb
@@ -71,25 +71,25 @@ do_install_append() {
 	install -d ${D}/usr/share/fluxbox
 	install -d ${D}/usr/share/fluxbox/styles
 	install -d ${D}/etc
-	
+
 	install -m 0644 ${WORKDIR}/apps.gpe.* ${D}/usr/share/fluxbox
 	install -m 0644 ${WORKDIR}/keys.* ${D}/usr/share/fluxbox
 	install -m 0755 ${WORKDIR}/fluxbox-gpe.session ${D}/usr/share/fluxbox/session
 	install -m 0644 ${WORKDIR}/style.gpe-default ${D}/usr/share/fluxbox/styles/gpe-default
 	install -m 0755 ${WORKDIR}/fluxbox-gpe-session ${D}/usr/bin
-	install -m 0755 ${WORKDIR}/gpe-logout.fluxbox ${D}/usr/bin	
-	install -m 0644 ${WORKDIR}/keylaunchrc.fluxbox ${D}/etc	
+	install -m 0755 ${WORKDIR}/gpe-logout.fluxbox ${D}/usr/bin
+	install -m 0644 ${WORKDIR}/keylaunchrc.fluxbox ${D}/etc
 }
 
 ######################################################################################
 
-pkg_postinst_${PN}-gpe() { 
+pkg_postinst_${PN}-gpe() {
        update-alternatives --install /usr/bin/x-window-manager x-window-manager /usr/bin/fluxbox-gpe-session 15
        update-alternatives --install /usr/bin/gpe-logout gpe-logout /usr/bin/gpe-logout.fluxbox  15
        update-alternatives --install /etc/keylaunchrc keylaunchrc /etc/keylaunchrc.fluxbox 15
 }
 
-pkg_postrm_${PN}-gpe() {   
+pkg_postrm_${PN}-gpe() {
        update-alternatives --remove x-window-manager /usr/bin/fluxbox-gpe-session
        update-alternatives --remove gpe-logout /usr/bin/gpe-logout.fluxbox
        update-alternatives --remove keylaunchrc /etc/keylaunchrc.fluxbox
diff --git a/packages/fontconfig/fontconfig-native_2.2.95.bb b/packages/fontconfig/fontconfig-native_2.2.95.bb
index 58589ae124..541b74634c 100644
--- a/packages/fontconfig/fontconfig-native_2.2.95.bb
+++ b/packages/fontconfig/fontconfig-native_2.2.95.bb
@@ -6,7 +6,7 @@ DEPENDS = "freetype-native expat-native zlib-native"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/fontconfig-${PV}"
 
 EXTRA_OEMAKE = ""
-EXTRA_OECONF = "${@[' --disable-docs',' --disable-docs --with-freetype-config=%s/freetype-config-native' % bb.data.getVar('STAGING_BINDIR', d, 1)][os.path.isfile('%s/freetype-config-native' % bb.data.getVar('STAGING_BINDIR', d, 1))]}"
+EXTRA_OECONF = "${@[' --disable-docs',' --disable-docs --with-freetype-config=%s/freetype-config' % bb.data.getVar('STAGING_BINDIR', d, 1)][os.path.isfile('%s/freetype-config' % bb.data.getVar('STAGING_BINDIR', d, 1))]}"
 
 do_stage () {
 	oe_runmake install
diff --git a/packages/fontconfig/fontconfig-native_2.3.91.bb b/packages/fontconfig/fontconfig-native_2.3.91.bb
index 58589ae124..541b74634c 100644
--- a/packages/fontconfig/fontconfig-native_2.3.91.bb
+++ b/packages/fontconfig/fontconfig-native_2.3.91.bb
@@ -6,7 +6,7 @@ DEPENDS = "freetype-native expat-native zlib-native"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/fontconfig-${PV}"
 
 EXTRA_OEMAKE = ""
-EXTRA_OECONF = "${@[' --disable-docs',' --disable-docs --with-freetype-config=%s/freetype-config-native' % bb.data.getVar('STAGING_BINDIR', d, 1)][os.path.isfile('%s/freetype-config-native' % bb.data.getVar('STAGING_BINDIR', d, 1))]}"
+EXTRA_OECONF = "${@[' --disable-docs',' --disable-docs --with-freetype-config=%s/freetype-config' % bb.data.getVar('STAGING_BINDIR', d, 1)][os.path.isfile('%s/freetype-config' % bb.data.getVar('STAGING_BINDIR', d, 1))]}"
 
 do_stage () {
 	oe_runmake install
diff --git a/packages/freedoom/freedoom_0.3.bb b/packages/freedoom/freedoom_0.3.bb
index 0bdc05def8..daef13fc8a 100644
--- a/packages/freedoom/freedoom_0.3.bb
+++ b/packages/freedoom/freedoom_0.3.bb
@@ -12,17 +12,17 @@ PR = "r1"
 
 FILES_${PN} = "/usr/share/games/doom/*"
 FILES_${PN}-doc = "/usr/share/doc/freedoom/*"
-			       
-do_install() {		
+
+do_install() {
 	install -d ${D}/usr/share/games/doom
 	install -d ${D}/usr/share/doc/freedoom
-	
+
 	install -m 0644 ${WORKDIR}/freedoom-iwad-${PV}/doom2.wad ${D}/usr/share/games/doom/
 	install -m 0644 ${WORKDIR}/freedoom-iwad-${PV}/* ${D}/usr/share/doc/freedoom
 	rm ${D}/usr/share/doc/freedoom/*.wad
-	
-	
-	
-	
+
+
+
+
 }
 
diff --git a/packages/frodo/frodo_4.1b.bb b/packages/frodo/frodo_4.1b.bb
index c048751d59..669187e0c7 100644
--- a/packages/frodo/frodo_4.1b.bb
+++ b/packages/frodo/frodo_4.1b.bb
@@ -12,7 +12,7 @@ SRC_URI = "http://wwwthep.physik.uni-mainz.de/~cbauer/FrodoV4_1b.Src.tar.gz \
            file://frodo.desktop"
 S = "${WORKDIR}/Frodo-${PV}/Src"
 
-inherit autotools 
+inherit autotools
 
 EXTRA_OECONF = "--disable-sdltest --enable-qtopia"
 
diff --git a/packages/frodo/frodo_4.2.bb b/packages/frodo/frodo_4.2.bb
index 0c7772d729..b3a4463451 100644
--- a/packages/frodo/frodo_4.2.bb
+++ b/packages/frodo/frodo_4.2.bb
@@ -12,7 +12,7 @@ SRC_URI = "cvs://anoncvs:anoncvs@cvs.cebix.net/home/cvs/cebix;module=Frodo4 \
            file://frodorc \
            file://Frodo.png \
            file://frodo.desktop"
-	   
+
 S = "${WORKDIR}/Frodo4/Src"
 
 inherit autotools
diff --git a/packages/fs/fs_cvs.bb b/packages/fs/fs_cvs.bb
index 2a6722c422..8e2724ce4b 100644
--- a/packages/fs/fs_cvs.bb
+++ b/packages/fs/fs_cvs.bb
@@ -7,7 +7,7 @@ DEPENDS = "libxfont xtrans"
 SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=FS"
 S = "${WORKDIR}/FS"
 
-inherit autotools pkgconfig 
+inherit autotools pkgconfig
 
 do_stage() {
 	oe_runmake install prefix=${STAGING_DIR} \
diff --git a/packages/fstests/fstests.bb b/packages/fstests/fstests.bb
index f4ec5ca919..a84237f263 100644
--- a/packages/fstests/fstests.bb
+++ b/packages/fstests/fstests.bb
@@ -14,5 +14,5 @@ S = "${WORKDIR}/fstests/tests"
 
 do_install() {
     install -d ${D}${bindir}
-    find . -name "test-*" -type f -perm -755 -exec install -m 0755 {} ${D}${bindir} \;   
+    find . -name "test-*" -type f -perm -755 -exec install -m 0755 {} ${D}${bindir} \;
 }
diff --git a/packages/fuse/fuse_2.5.3.bb b/packages/fuse/fuse_2.5.3.bb
index 1f43ac8859..5f5ce701d3 100644
--- a/packages/fuse/fuse_2.5.3.bb
+++ b/packages/fuse/fuse_2.5.3.bb
@@ -2,7 +2,7 @@ require fuse.inc
 
 PR = "r1"
 
-#package utils in a sperate package and stop debian.bbclass renaming it to libfuse-utils, we want it to be fuse-utils 
+#package utils in a sperate package and stop debian.bbclass renaming it to libfuse-utils, we want it to be fuse-utils
 PACKAGES += "fuse-utils"
 FILES_${PN} = "${libdir}/*.so*"
 FILES_${PN}-dev += "${libdir}/*.la"
diff --git a/packages/fuse/fuse_2.6.0.bb b/packages/fuse/fuse_2.6.0.bb
index 2d5809cd00..7eff4dce46 100644
--- a/packages/fuse/fuse_2.6.0.bb
+++ b/packages/fuse/fuse_2.6.0.bb
@@ -1,6 +1,6 @@
 require fuse.inc
 
-SRC_URI += "file://not-run-updaterc.d-on-host.patch;patch=1" 
+SRC_URI += "file://not-run-updaterc.d-on-host.patch;patch=1"
 
 EXTRA_OECONF = " --disable-kernel-module"
 
diff --git a/packages/fuse/sshfs-fuse_1.3.bb b/packages/fuse/sshfs-fuse_1.3.bb
index 2980a63ea8..adb0b3586f 100644
--- a/packages/fuse/sshfs-fuse_1.3.bb
+++ b/packages/fuse/sshfs-fuse_1.3.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "This is a filesystem client based on the SSH File Transfer Protoc
 
 LICENSE_${PN} = "LGPL"
 
-DEPENDS = "fakeroot-native fuse" 
+DEPENDS = "fakeroot-native fuse"
 RRECOMMENDS_${PN} = "fuse-module"
 
 SRC_URI="${SOURCEFORGE_MIRROR}/fuse/${P}.tar.gz"
diff --git a/packages/galculator/galculator_1.2.3.bb b/packages/galculator/galculator_1.2.3.bb
index 7cc87ebfc1..3348b9ece4 100644
--- a/packages/galculator/galculator_1.2.3.bb
+++ b/packages/galculator/galculator_1.2.3.bb
@@ -13,7 +13,7 @@ PRIORITY = "optional"
 SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.bz2 \
         file://desktop-categories.patch;patch=1 \
         file://Makefile.am.patch;patch=1 \
-        file://src-ui.c.patch;patch=1;pnum=0" 
+        file://src-ui.c.patch;patch=1;pnum=0"
 
 LDFLAGS += '-Wl,--export-dynamic'
 
diff --git a/packages/gallery/gallery_1.5.5.bb b/packages/gallery/gallery_1.5.5.bb
index 95a39c376d..9aba2a2f0a 100644
--- a/packages/gallery/gallery_1.5.5.bb
+++ b/packages/gallery/gallery_1.5.5.bb
@@ -8,7 +8,7 @@ SRC_URI = "http://easynews.dl.sourceforge.net/sourceforge/gallery/gallery-${PV}-
 
 S = "${WORKDIR}/gallery"
 
-inherit autotools 
+inherit autotools
 
 HTTPCONF = "/etc/apache2/httpd.conf"
 DEST_DIR = "/usr/share/apache2/htdocs/"
diff --git a/packages/gammu/gammu_1.07.00.bb b/packages/gammu/gammu_1.07.00.bb
index 04b5a25caa..49a2f21399 100644
--- a/packages/gammu/gammu_1.07.00.bb
+++ b/packages/gammu/gammu_1.07.00.bb
@@ -32,28 +32,28 @@ do_stage() {
         oe_libinstall -so -C common libGammu ${STAGING_LIBDIR}
 
         install -m 0644 common/*.h                      ${STAGING_INCDIR}/gammu/
-        install -m 0644 common/misc/*.h                 ${STAGING_INCDIR}/gammu/misc 
-        install -m 0644 common/misc/coding/*.h          ${STAGING_INCDIR}/gammu/misc/coding 
-        install -m 0644 common/phone/*.h                ${STAGING_INCDIR}/gammu/phone 
-        install -m 0644 common/phone/at/*.h             ${STAGING_INCDIR}/gammu/phone/at 
-        install -m 0644 common/phone/obex/*.h           ${STAGING_INCDIR}/gammu/phone/obex 
-        install -m 0644 common/phone/nokia/*.h          ${STAGING_INCDIR}/gammu/phone/nokia 
-        install -m 0644 common/phone/nokia/dct3/*.h     ${STAGING_INCDIR}/gammu/phone/nokia/dct3 
+        install -m 0644 common/misc/*.h                 ${STAGING_INCDIR}/gammu/misc
+        install -m 0644 common/misc/coding/*.h          ${STAGING_INCDIR}/gammu/misc/coding
+        install -m 0644 common/phone/*.h                ${STAGING_INCDIR}/gammu/phone
+        install -m 0644 common/phone/at/*.h             ${STAGING_INCDIR}/gammu/phone/at
+        install -m 0644 common/phone/obex/*.h           ${STAGING_INCDIR}/gammu/phone/obex
+        install -m 0644 common/phone/nokia/*.h          ${STAGING_INCDIR}/gammu/phone/nokia
+        install -m 0644 common/phone/nokia/dct3/*.h     ${STAGING_INCDIR}/gammu/phone/nokia/dct3
         install -m 0644 common/phone/nokia/dct4tiku/*.h     ${STAGING_INCDIR}/gammu/phone/nokia/dct4tiku
-        install -m 0644 common/phone/symbian/*.h        ${STAGING_INCDIR}/gammu/phone/symbian 
-        install -m 0644 common/phone/alcatel/*.h        ${STAGING_INCDIR}/gammu/phone/alcatel 
-        install -m 0644 common/service/*.h              ${STAGING_INCDIR}/gammu/service 
-        install -m 0644 common/service/sms/*.h          ${STAGING_INCDIR}/gammu/service/sms 
-        install -m 0644 common/service/backup/*.h       ${STAGING_INCDIR}/gammu/service/backup 
-        install -m 0644 common/device/*.h               ${STAGING_INCDIR}/gammu/device 
-        install -m 0644 common/device/irda/*.h          ${STAGING_INCDIR}/gammu/device/irda 
-        install -m 0644 common/device/bluetoth/*.h      ${STAGING_INCDIR}/gammu/device/bluetoth 
-        install -m 0644 common/device/serial/*.h        ${STAGING_INCDIR}/gammu/device/serial 
-        install -m 0644 common/protocol/*.h             ${STAGING_INCDIR}/gammu/protocol 
-        install -m 0644 common/protocol/at/*.h          ${STAGING_INCDIR}/gammu/protocol/at 
-        install -m 0644 common/protocol/obex/*.h        ${STAGING_INCDIR}/gammu/protocol/obex 
-        install -m 0644 common/protocol/nokia/*.h       ${STAGING_INCDIR}/gammu/protocol/nokia 
-        install -m 0644 common/protocol/symbian/*.h     ${STAGING_INCDIR}/gammu/protocol/symbian 
+        install -m 0644 common/phone/symbian/*.h        ${STAGING_INCDIR}/gammu/phone/symbian
+        install -m 0644 common/phone/alcatel/*.h        ${STAGING_INCDIR}/gammu/phone/alcatel
+        install -m 0644 common/service/*.h              ${STAGING_INCDIR}/gammu/service
+        install -m 0644 common/service/sms/*.h          ${STAGING_INCDIR}/gammu/service/sms
+        install -m 0644 common/service/backup/*.h       ${STAGING_INCDIR}/gammu/service/backup
+        install -m 0644 common/device/*.h               ${STAGING_INCDIR}/gammu/device
+        install -m 0644 common/device/irda/*.h          ${STAGING_INCDIR}/gammu/device/irda
+        install -m 0644 common/device/bluetoth/*.h      ${STAGING_INCDIR}/gammu/device/bluetoth
+        install -m 0644 common/device/serial/*.h        ${STAGING_INCDIR}/gammu/device/serial
+        install -m 0644 common/protocol/*.h             ${STAGING_INCDIR}/gammu/protocol
+        install -m 0644 common/protocol/at/*.h          ${STAGING_INCDIR}/gammu/protocol/at
+        install -m 0644 common/protocol/obex/*.h        ${STAGING_INCDIR}/gammu/protocol/obex
+        install -m 0644 common/protocol/nokia/*.h       ${STAGING_INCDIR}/gammu/protocol/nokia
+        install -m 0644 common/protocol/symbian/*.h     ${STAGING_INCDIR}/gammu/protocol/symbian
         install -m 0644 common/protocol/alcatel/*.h     ${STAGING_INCDIR}/gammu/protocol/alcatel
 }
 
@@ -70,6 +70,6 @@ PACKAGES_DYNAMIC = "gammu-locale-*"
 
 python populate_packages_prepend () {
         help_dir = bb.data.expand('${datadir}/gammu/', d)
-        
+
         do_split_packages(d, help_dir, file_regex='^gammu_(.*)\.txt$', output_pattern='gammu-locale-%s', description='%s translation for Gammu')
 }
diff --git a/packages/gcc/gcc_4.1.0.bb b/packages/gcc/gcc_4.1.0.bb
index 862a1dfe5b..47253cc8d5 100644
--- a/packages/gcc/gcc_4.1.0.bb
+++ b/packages/gcc/gcc_4.1.0.bb
@@ -24,4 +24,4 @@ FORTRAN = ""
 HAS_GFORTRAN = ""
 HAS_G2C = "no"
 
-  
+
diff --git a/packages/gcc/gcc_4.1.1.bb b/packages/gcc/gcc_4.1.1.bb
index e32353325a..ee8bfb00d9 100644
--- a/packages/gcc/gcc_4.1.1.bb
+++ b/packages/gcc/gcc_4.1.1.bb
@@ -36,13 +36,13 @@ SRC_URI = "http://ftp.gnu.org/pub/gnu/gcc/gcc-4.1.1/gcc-4.1.1.tar.bz2 \
 SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
 
 #Set the fortran bits
-# 'fortran' or '', not 'f77' like gcc3 had 
-FORTRAN = "" 
+# 'fortran' or '', not 'f77' like gcc3 had
+FORTRAN = ""
 HAS_GFORTRAN = "no"
 HAS_G2C = "no"
 
 #Set the java bits
-JAVA_arm = ""  
+JAVA_arm = ""
 JAVA = ""
 
 LANGUAGES = "c,c++${FORTRAN}${JAVA}"
@@ -50,4 +50,4 @@ require gcc3-build.inc
 
 
 EXTRA_OECONF += " --disable-libssp "
-  
+
diff --git a/packages/gcc/gcc_4.2-20060513.bb b/packages/gcc/gcc_4.2-20060513.bb
index 8960469a18..85fe468bc0 100644
--- a/packages/gcc/gcc_4.2-20060513.bb
+++ b/packages/gcc/gcc_4.2-20060513.bb
@@ -24,4 +24,4 @@ FORTRAN = ""
 HAS_GFORTRAN = ""
 HAS_G2C = "no"
 
-  
+
diff --git a/packages/gdal/gdal_1.3.2.bb b/packages/gdal/gdal_1.3.2.bb
index 70f435603c..2a97cfe81d 100644
--- a/packages/gdal/gdal_1.3.2.bb
+++ b/packages/gdal/gdal_1.3.2.bb
@@ -34,5 +34,5 @@ do_compile() {
 do_package_prepend() {
 	# the brokenness....
 	os.system('cp -pPR ${D}${D}* ${D}../')
-}	
+}
 
diff --git a/packages/gdb/gdb-cross_6.1.bb b/packages/gdb/gdb-cross_6.1.bb
deleted file mode 100644
index f3e480042a..0000000000
--- a/packages/gdb/gdb-cross_6.1.bb
+++ /dev/null
@@ -1,33 +0,0 @@
-require gdb.inc
-
-DEPENDS = "ncurses-native"
-
-inherit autotools sdk
-
-S = "${WORKDIR}/gdb-${PV}"
-SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.gz \
-	file://sim-install.patch;patch=1"
-
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gdb-${PV}"
-
-export CC_FOR_BUILD = "${BUILD_CC}"
-export CXX_FOR_BUILD = "${BUILD_CXX}"
-export CPP_FOR_BUILD = "${BUILD_CPP}"
-export CFLAGS_FOR_BUILD = "${BUILD_CFLAGS}"
-export CXXFLAGS_FOR_BUILD = "${BUILD_CXXFLAGS}"
-export CPPFLAGS_FOR_BUILD = "${BUILD_CPPFLAGS}"
-
-EXTRA_OEMAKE = "'SUBDIRS=intl mmalloc libiberty opcodes bfd sim gdb etc utils' LDFLAGS='${BUILD_LDFLAGS}'"
-
-EXTRA_OECONF = "--with-curses --with-readline"
-
-do_configure () {
-# override this function to avoid the autoconf/automake/aclocal/autoheader
-# calls for now
-	gnu-configize
-	oe_runconf
-}
-
-do_stage() {
-	:	
-}
diff --git a/packages/gdb/gdb-cross_6.2.bb b/packages/gdb/gdb-cross_6.2.bb
deleted file mode 100644
index f3e480042a..0000000000
--- a/packages/gdb/gdb-cross_6.2.bb
+++ /dev/null
@@ -1,33 +0,0 @@
-require gdb.inc
-
-DEPENDS = "ncurses-native"
-
-inherit autotools sdk
-
-S = "${WORKDIR}/gdb-${PV}"
-SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.gz \
-	file://sim-install.patch;patch=1"
-
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gdb-${PV}"
-
-export CC_FOR_BUILD = "${BUILD_CC}"
-export CXX_FOR_BUILD = "${BUILD_CXX}"
-export CPP_FOR_BUILD = "${BUILD_CPP}"
-export CFLAGS_FOR_BUILD = "${BUILD_CFLAGS}"
-export CXXFLAGS_FOR_BUILD = "${BUILD_CXXFLAGS}"
-export CPPFLAGS_FOR_BUILD = "${BUILD_CPPFLAGS}"
-
-EXTRA_OEMAKE = "'SUBDIRS=intl mmalloc libiberty opcodes bfd sim gdb etc utils' LDFLAGS='${BUILD_LDFLAGS}'"
-
-EXTRA_OECONF = "--with-curses --with-readline"
-
-do_configure () {
-# override this function to avoid the autoconf/automake/aclocal/autoheader
-# calls for now
-	gnu-configize
-	oe_runconf
-}
-
-do_stage() {
-	:	
-}
diff --git a/packages/gdb/gdb-cross_6.2.1.bb b/packages/gdb/gdb-cross_6.6.bb
index 0aba890eef..32076b529e 100644
--- a/packages/gdb/gdb-cross_6.2.1.bb
+++ b/packages/gdb/gdb-cross_6.6.bb
@@ -1,6 +1,7 @@
-require gdb.inc
-
+LICENSE = "GPL"
+DESCRIPTION = "gdb - GNU debugger"
 SECTION = "base"
+PRIORITY = "optional"
 DEPENDS = "ncurses-native"
 
 inherit autotools sdk
diff --git a/packages/gdb/gdb_6.1.bb b/packages/gdb/gdb_6.1.bb
deleted file mode 100644
index 6191061d16..0000000000
--- a/packages/gdb/gdb_6.1.bb
+++ /dev/null
@@ -1,51 +0,0 @@
-require gdb.inc
-
-DEPENDS = "ncurses readline"
-
-PACKAGES =+ 'gdbserver '
-FILES_gdbserver = '${bindir}/gdbserver'
-
-inherit autotools gettext
-
-SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.gz \
-	   file://uclibc.patch;patch=1"
-
-LDFLAGS_append = " -s"
-export CC_FOR_BUILD = "${BUILD_CC}"
-export CXX_FOR_BUILD = "${BUILD_CXX}"
-export CPP_FOR_BUILD = "${BUILD_CPP}"
-export CFLAGS_FOR_BUILD = "${BUILD_CFLAGS}"
-export CXXFLAGS_FOR_BUILD = "${BUILD_CXXFLAGS}"
-export CPPFLAGS_FOR_BUILD = "${BUILD_CPPFLAGS}"
-export CFLAGS_append=" -L${STAGING_LIBDIR}"
-EXTRA_OEMAKE = "'SUBDIRS=intl mmalloc libiberty opcodes bfd sim gdb etc utils'"
-
-EXTRA_OECONF = "--disable-gdbtk --disable-tui --disable-x \
-                --with-curses --with-readline --disable-sim \
-                --program-prefix=''"
-
-do_configure () {
-# override this function to avoid the autoconf/automake/aclocal/autoheader
-# calls for now
-	gnu-configize
-	oe_runconf
-}
-
-do_install () {
-	make -C bfd/doc chew LDFLAGS= CFLAGS=-O2
-	oe_runmake install \
-	    'prefix=${D}${prefix}' 'exec_prefix=${D}${prefix}' 'bindir=${D}${bindir}' \
-	    'sbindir=${D}${sbindir}' 'infodir=${D}${infodir}' 'libdir=${D}${libdir}' \
-	    'mandir=${D}${mandir}' 'includedir=${D}${includedir}'
-	install -d ${D}${bindir}
-	install -m 0755 gdb/gdbserver/gdbserver ${D}${bindir}
-}
-
-#
-# patch description
-#
-# readline.patch:
-#   gdb 5.3 provides its own readline source which tends to conflict with
-#   readline package. we override readline included from gdb source
-#   with packaged readline and fix up extern tilde_expand in gdb/defs.h
-#
diff --git a/packages/gdb/gdb_6.2.bb b/packages/gdb/gdb_6.2.bb
deleted file mode 100644
index 75a08972a5..0000000000
--- a/packages/gdb/gdb_6.2.bb
+++ /dev/null
@@ -1,46 +0,0 @@
-require gdb.inc
-
-PR = "r1"
-DEPENDS = "ncurses readline"
-
-PACKAGES =+ 'gdbserver '
-FILES_gdbserver = '${bindir}/gdbserver'
-
-inherit autotools gettext
-
-SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.gz \
-	   file://uclibc.patch;patch=1"
-
-LDFLAGS_append = " -s"
-export CC_FOR_BUILD = "${BUILD_CC}"
-export CXX_FOR_BUILD = "${BUILD_CXX}"
-export CPP_FOR_BUILD = "${BUILD_CPP}"
-export CFLAGS_FOR_BUILD = "${BUILD_CFLAGS}"
-export CXXFLAGS_FOR_BUILD = "${BUILD_CXXFLAGS}"
-export CPPFLAGS_FOR_BUILD = "${BUILD_CPPFLAGS}"
-export CFLAGS_append=" -L${STAGING_LIBDIR}"
-EXTRA_OEMAKE = "'SUBDIRS=intl mmalloc libiberty opcodes bfd sim gdb etc utils'"
-
-EXTRA_OECONF = "--disable-gdbtk --disable-tui --disable-x \
-                --with-curses --disable-multilib --with-readline --disable-sim \
-                --program-prefix=''"
-
-S = "${WORKDIR}/gdb-${PV}"
-B = "${WORKDIR}/build-${TARGET_SYS}"
-
-do_configure () {
-# override this function to avoid the autoconf/automake/aclocal/autoheader
-# calls for now
-	(cd ${S} && gnu-configize) || die "failure in running gnu-configize"
-        CPPFLAGS="" oe_runconf
-}
-
-do_install () {
-	make -C bfd/doc chew LDFLAGS= CFLAGS=-O2
-	oe_runmake install \
-	    'prefix=${D}' 'exec_prefix=${D}' 'bindir=${D}${base_bindir}' \
-	    'sbindir=${D}${base_sbindir}' 'infodir=${D}/share/info' 'libdir=${D}${base_libdir}' \
-	    'mandir=${D}/share/man' 'includedir=${D}/include'
-	install -d ${D}${bindir}
-	install -m 0755 gdb/gdbserver/gdbserver ${D}${bindir}
-}
diff --git a/packages/gdb/gdb_6.2.1.bb b/packages/gdb/gdb_6.6.bb
index 641cd927b1..1bfe3dfecf 100644
--- a/packages/gdb/gdb_6.2.1.bb
+++ b/packages/gdb/gdb_6.6.bb
@@ -1,14 +1,21 @@
-require gdb.inc
-
+DESCRIPTION = "gdb - GNU debugger"
+HOMEPAGE = "http://www.gnu.org/software/gdb/"
+LICENSE="GPL"
+SECTION = "devel"
+PRIORITY = "optional"
 DEPENDS = "ncurses readline"
+PR = "r0"
 
 PACKAGES =+ 'gdbserver '
 FILES_gdbserver = '${bindir}/gdbserver'
 
+RRECOMMENDS_gdb = "glibc-thread-db"
+
 inherit autotools gettext
 
 SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.gz \
-	   file://uclibc.patch;patch=1 \
+#FIXME	   file://uclibc.patch;patch=1 \
+	   file://kill_arm_map_symbols.patch;patch=1 \
 	   file://gdbserver-cflags-last.diff;patch=1;pnum=0"
 
 LDFLAGS_append = " -s"
diff --git a/packages/gdbm/gdbm_1.8.3.bb b/packages/gdbm/gdbm_1.8.3.bb
index 22d1285e8d..f3beb47b41 100644
--- a/packages/gdbm/gdbm_1.8.3.bb
+++ b/packages/gdbm/gdbm_1.8.3.bb
@@ -10,7 +10,7 @@ SRC_URI = "${GNU_MIRROR}/gdbm/gdbm-${PV}.tar.gz \
 	   file://makefile.patch;patch=1 \
            file://libtool-mode.patch;patch=1"
 
-inherit autotools 
+inherit autotools
 
 do_stage () {
 	oe_libinstall -so -a libgdbm ${STAGING_LIBDIR}
diff --git a/packages/genext2fs/genext2fs_1.3.bb b/packages/genext2fs/genext2fs_1.3.bb
index ab74a76a25..e57f78ae50 100644
--- a/packages/genext2fs/genext2fs_1.3.bb
+++ b/packages/genext2fs/genext2fs_1.3.bb
@@ -8,7 +8,7 @@ S = "${WORKDIR}/genext2fs-${PV}.orig"
 
 do_compile () {
 	oe_runmake
-}	
+}
 
 do_install () {
 	oe_runmake 'DESTDIR=${D}' install
diff --git a/packages/geoclue/geoclue_svn.bb b/packages/geoclue/geoclue_svn.bb
index e07b01d2ca..f0d8bc16d8 100644
--- a/packages/geoclue/geoclue_svn.bb
+++ b/packages/geoclue/geoclue_svn.bb
@@ -13,7 +13,7 @@ S = "${WORKDIR}/trunk"
 
 do_install_append() {
 	mkdir -p ${D}/usr/share/
-	cp -pPr ${D}${STAGING_DATADIR}/* ${D}/usr/share  
+	cp -pPr ${D}${STAGING_DATADIR}/* ${D}/usr/share
 	rm -rf ${D}${STAGING_DATADIR}/
 }
 
diff --git a/packages/geode-drivers/geode-aeslx_2.6.11.bb b/packages/geode-drivers/geode-aeslx_2.6.11.bb
index 85fffc1cdf..fdcbdbf20b 100644
--- a/packages/geode-drivers/geode-aeslx_2.6.11.bb
+++ b/packages/geode-drivers/geode-aeslx_2.6.11.bb
@@ -13,7 +13,7 @@ require geode-modules.inc
 
 FILES_${PN} += " /etc"
 
-do_install_append(){ 
+do_install_append(){
         install -d ${D}/etc/modules.d
         echo options geodeaes rsvd_mem=0x200000 > ${D}/etc/modules.d/aes
 }
diff --git a/packages/gif2png/gif2png_2.5.1.bb b/packages/gif2png/gif2png_2.5.1.bb
index 1cc27b62d8..9ba886ecbd 100644
--- a/packages/gif2png/gif2png_2.5.1.bb
+++ b/packages/gif2png/gif2png_2.5.1.bb
@@ -6,5 +6,5 @@ DEPENDS = "zlib libpng"
 
 SRC_URI = "http://www.catb.org/~esr/gif2png/gif2png-${PV}.tar.gz"
 
-inherit autotools 
+inherit autotools
 
diff --git a/packages/gift/gift_0.11.4.bb b/packages/gift/gift_0.11.4.bb
index bca8d60006..6446398311 100644
--- a/packages/gift/gift_0.11.4.bb
+++ b/packages/gift/gift_0.11.4.bb
@@ -8,7 +8,7 @@ FILES_gift_append = " ${datadir}/giFT"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/gift/gift-${PV}.tar.bz2"
 
-inherit autotools 
+inherit autotools
 
 EXTRA_OECONF = "--with-vorbis-libraries=${STAGING_LIBDIR} \
 		--with-vorbis-includes=${STAGING_INCDIR}"
diff --git a/packages/gift/gift_0.11.5.bb b/packages/gift/gift_0.11.5.bb
index bca8d60006..6446398311 100644
--- a/packages/gift/gift_0.11.5.bb
+++ b/packages/gift/gift_0.11.5.bb
@@ -8,7 +8,7 @@ FILES_gift_append = " ${datadir}/giFT"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/gift/gift-${PV}.tar.bz2"
 
-inherit autotools 
+inherit autotools
 
 EXTRA_OECONF = "--with-vorbis-libraries=${STAGING_LIBDIR} \
 		--with-vorbis-includes=${STAGING_INCDIR}"
diff --git a/packages/gimp/gimp_2.2.10.bb b/packages/gimp/gimp_2.2.10.bb
index eb6e385201..10242e23df 100644
--- a/packages/gimp/gimp_2.2.10.bb
+++ b/packages/gimp/gimp_2.2.10.bb
@@ -13,9 +13,9 @@ inherit autotools pkgconfig
 EXTRA_OECONF = 	" --disable-gtktest \
 		--without-libtiff \
 		--disable-print \
-		--enable-mp" 
+		--enable-mp"
 
 do_configure_append() {
     find ${S} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g
 }
-	
+
diff --git a/packages/gkdial/gkdial_1.8.1.bb b/packages/gkdial/gkdial_1.8.1.bb
index c5b23c4939..3208a06f00 100644
--- a/packages/gkdial/gkdial_1.8.1.bb
+++ b/packages/gkdial/gkdial_1.8.1.bb
@@ -18,7 +18,7 @@ SRC_URI = "http://familiar.handhelds.org/source/v0.8.2/${PN}-${PV}.tar.gz \
 
 FILES_${PN} = "${sysconfdir}/chatscripts ${bindir} ${datadir}/pixmaps ${datadir}/applications"
 FILES_${PN} += " ${datadir}/gkdial ${datadir}/gkdial/glade ${sysconfdir}/gconf/schemas"
- 
+
 CFLAGS_append = " -I${STAGING_KERNEL_DIR}/include -D_GNU_SOURCE"
 LDFLAGS_append = " -Wl,--export-dynamic"
 
diff --git a/packages/glib-2.0/glib-2.0_2.12.6.bb b/packages/glib-2.0/glib-2.0_2.12.6.bb
index aae16bf2f5..4d8e59b355 100644
--- a/packages/glib-2.0/glib-2.0_2.12.6.bb
+++ b/packages/glib-2.0/glib-2.0_2.12.6.bb
@@ -3,4 +3,4 @@ require glib.inc
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.12/glib-${PV}.tar.bz2 \
            file://glibconfig-sysdefs.h \
            file://configure-libtool.patch;patch=1"
-		      
+
diff --git a/packages/glibc/glibc-initial_2.2.5.bb b/packages/glibc/glibc-initial_2.2.5.bb
index 882684e9b7..752164d968 100644
--- a/packages/glibc/glibc-initial_2.2.5.bb
+++ b/packages/glibc/glibc-initial_2.2.5.bb
@@ -18,7 +18,7 @@ do_configure () {
 		--enable-hacker-mode
 	if grep -q GLIBC_2.3 ${S}/ChangeLog; then
 		# glibc-2.3.x passes cross options to $(CC) when generating errlist-compat.c, which fails without a real cross-compiler.
-		# Fortunately, we don't need errlist-compat.c, since we just need .h files, 
+		# Fortunately, we don't need errlist-compat.c, since we just need .h files,
 		# so work around this by creating a fake errlist-compat.c and satisfying its dependencies.
 		# Another workaround might be to tell configure to not use any cross options to $(CC).
 		# The real fix would be to get install-headers to not generate errlist-compat.c.
diff --git a/packages/glibc/glibc-initial_2.3.2+cvs20040726.bb b/packages/glibc/glibc-initial_2.3.2+cvs20040726.bb
index 78bdaadd9a..389c4616d6 100644
--- a/packages/glibc/glibc-initial_2.3.2+cvs20040726.bb
+++ b/packages/glibc/glibc-initial_2.3.2+cvs20040726.bb
@@ -17,7 +17,7 @@ do_configure () {
 		--enable-hacker-mode
 	if grep -q GLIBC_2.3 ${S}/ChangeLog; then
 		# glibc-2.3.x passes cross options to $(CC) when generating errlist-compat.c, which fails without a real cross-compiler.
-		# Fortunately, we don't need errlist-compat.c, since we just need .h files, 
+		# Fortunately, we don't need errlist-compat.c, since we just need .h files,
 		# so work around this by creating a fake errlist-compat.c and satisfying its dependencies.
 		# Another workaround might be to tell configure to not use any cross options to $(CC).
 		# The real fix would be to get install-headers to not generate errlist-compat.c.
diff --git a/packages/glibc/glibc-initial_2.3.2.bb b/packages/glibc/glibc-initial_2.3.2.bb
index 4433ced868..261f87b288 100644
--- a/packages/glibc/glibc-initial_2.3.2.bb
+++ b/packages/glibc/glibc-initial_2.3.2.bb
@@ -17,7 +17,7 @@ do_configure () {
 		--enable-hacker-mode
 	if grep -q GLIBC_2.3 ${S}/ChangeLog; then
 		# glibc-2.3.x passes cross options to $(CC) when generating errlist-compat.c, which fails without a real cross-compiler.
-		# Fortunately, we don't need errlist-compat.c, since we just need .h files, 
+		# Fortunately, we don't need errlist-compat.c, since we just need .h files,
 		# so work around this by creating a fake errlist-compat.c and satisfying its dependencies.
 		# Another workaround might be to tell configure to not use any cross options to $(CC).
 		# The real fix would be to get install-headers to not generate errlist-compat.c.
diff --git a/packages/glibc/glibc-initial_2.4.bb b/packages/glibc/glibc-initial_2.4.bb
index f13419a413..b6bf3ece51 100644
--- a/packages/glibc/glibc-initial_2.4.bb
+++ b/packages/glibc/glibc-initial_2.4.bb
@@ -15,7 +15,7 @@ do_configure () {
 		--enable-hacker-mode
 	if grep -q GLIBC_2.3 ${S}/ChangeLog; then
 		# glibc-2.3.x passes cross options to $(CC) when generating errlist-compat.c, which fails without a real cross-compiler.
-		# Fortunately, we don't need errlist-compat.c, since we just need .h files, 
+		# Fortunately, we don't need errlist-compat.c, since we just need .h files,
 		# so work around this by creating a fake errlist-compat.c and satisfying its dependencies.
 		# Another workaround might be to tell configure to not use any cross options to $(CC).
 		# The real fix would be to get install-headers to not generate errlist-compat.c.
diff --git a/packages/glibc/glibc-initial_2.5.bb b/packages/glibc/glibc-initial_2.5.bb
index f13419a413..b6bf3ece51 100644
--- a/packages/glibc/glibc-initial_2.5.bb
+++ b/packages/glibc/glibc-initial_2.5.bb
@@ -15,7 +15,7 @@ do_configure () {
 		--enable-hacker-mode
 	if grep -q GLIBC_2.3 ${S}/ChangeLog; then
 		# glibc-2.3.x passes cross options to $(CC) when generating errlist-compat.c, which fails without a real cross-compiler.
-		# Fortunately, we don't need errlist-compat.c, since we just need .h files, 
+		# Fortunately, we don't need errlist-compat.c, since we just need .h files,
 		# so work around this by creating a fake errlist-compat.c and satisfying its dependencies.
 		# Another workaround might be to tell configure to not use any cross options to $(CC).
 		# The real fix would be to get install-headers to not generate errlist-compat.c.
diff --git a/packages/glibc/glibc-initial_cvs.bb b/packages/glibc/glibc-initial_cvs.bb
index 70c7e161a4..1a3dfe84d1 100644
--- a/packages/glibc/glibc-initial_cvs.bb
+++ b/packages/glibc/glibc-initial_cvs.bb
@@ -16,7 +16,7 @@ do_configure () {
 		--enable-hacker-mode
 	if grep -q GLIBC_2.3 ${S}/ChangeLog; then
 		# glibc-2.3.x passes cross options to $(CC) when generating errlist-compat.c, which fails without a real cross-compiler.
-		# Fortunately, we don't need errlist-compat.c, since we just need .h files, 
+		# Fortunately, we don't need errlist-compat.c, since we just need .h files,
 		# so work around this by creating a fake errlist-compat.c and satisfying its dependencies.
 		# Another workaround might be to tell configure to not use any cross options to $(CC).
 		# The real fix would be to get install-headers to not generate errlist-compat.c.
diff --git a/packages/glibc/glibc_2.2.5.bb b/packages/glibc/glibc_2.2.5.bb
index de6765b77e..6f00011d00 100644
--- a/packages/glibc/glibc_2.2.5.bb
+++ b/packages/glibc/glibc_2.2.5.bb
@@ -131,8 +131,8 @@ glibc_do_unpack () {
 }
 
 python do_unpack () {
-	bb.build.exec_func('base_do_unpack', d)	
-	bb.build.exec_func('glibc_do_unpack', d)	
+	bb.build.exec_func('base_do_unpack', d)
+	bb.build.exec_func('glibc_do_unpack', d)
 }
 
 do_configure () {
diff --git a/packages/gnet/gnet_cvs.bb b/packages/gnet/gnet_cvs.bb
index 42a216f1db..b36df17c18 100644
--- a/packages/gnet/gnet_cvs.bb
+++ b/packages/gnet/gnet_cvs.bb
@@ -15,4 +15,4 @@ inherit autotools pkgconfig
 
 do_stage() {
 	autotools_stage_all
-}	
+}
diff --git a/packages/gnome/gconf-dbus_cvs.bb b/packages/gnome/gconf-dbus_cvs.bb
index 865379b71c..6128eac3e2 100644
--- a/packages/gnome/gconf-dbus_cvs.bb
+++ b/packages/gnome/gconf-dbus_cvs.bb
@@ -33,5 +33,5 @@ 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/ 
+	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 d4d9cde477..87daa1d227 100644
--- a/packages/gnome/gconf-dbus_svn.bb
+++ b/packages/gnome/gconf-dbus_svn.bb
@@ -43,5 +43,5 @@ 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/ 
+	install -m 644  gconf/gconf.service ${D}${datadir}/dbus-1.0/services/
 }
diff --git a/packages/gnome/gdm_2.14.9.bb b/packages/gnome/gdm_2.14.9.bb
index 76a6a1028d..8af27fd407 100644
--- a/packages/gnome/gdm_2.14.9.bb
+++ b/packages/gnome/gdm_2.14.9.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Graphical login manager"
 LICENSE = "GPL"
 
-DEPENDS = "gnome-doc-utils gtk+ libglade libgnomecanvas librsvg libxml2 libart-lgpl" 
+DEPENDS = "gnome-doc-utils gtk+ libglade libgnomecanvas librsvg libxml2 libart-lgpl"
 
 inherit gnome
 
diff --git a/packages/gnome/gnome-desktop_2.7.90.bb b/packages/gnome/gnome-desktop_2.7.90.bb
index d385068c59..54a6559d05 100644
--- a/packages/gnome/gnome-desktop_2.7.90.bb
+++ b/packages/gnome/gnome-desktop_2.7.90.bb
@@ -19,6 +19,6 @@ do_stage () {
 #	install -m 0644 libgnome-desktop/libgnomeui/gnome-ditem-edit.h ${STAGING_INCDIR}/gnome-desktop-2.0/libgnomeui/
 #	install -m 0644 libgnome-desktop/libgnomeui/gnome-hint.h ${STAGING_INCDIR}/gnome-desktop-2.0/libgnomeui/
 	oe_libinstall -C libgnome-desktop/.libs -so libgnome-desktop-2 ${STAGING_LIBDIR}
-	
- 
+
+
 }
diff --git a/packages/gnome/kanjipad_svn.bb b/packages/gnome/kanjipad_svn.bb
new file mode 100644
index 0000000000..95bd174b6d
--- /dev/null
+++ b/packages/gnome/kanjipad_svn.bb
@@ -0,0 +1,19 @@
+DESCRIPTION = "KanjiPad is a very simple program for handwriting recognition"
+LICENSE = "GPLv2"
+
+DEPENDS = "gtk perl-native"
+
+PV = "2.0.0+svn${SRCDATE}"
+
+inherit pkgconfig 
+
+SRC_URI = "svn://svn.gnome.org/svn/${PN}/;module=trunk"
+
+S = "${WORKDIR}/trunk"
+
+do_compile_prepend() {
+	export CFLAGS='${TARGET_CFLAGS}  -DFOR_PILOT_COMPAT -DKP_LIBDIR="${libdir}/kanjipad" -DBINDIR="${bindir}" `pkg-config --cflags gtk+-2.0` `pkg-config --cflags glib-2.0`'
+}
+
+
+
diff --git a/packages/gnome/libbacon_cvs.bb b/packages/gnome/libbacon_svn.bb
index cbe1a9ad47..2f36c3d808 100644
--- a/packages/gnome/libbacon_cvs.bb
+++ b/packages/gnome/libbacon_svn.bb
@@ -3,17 +3,17 @@ LICENSE = "GPLv2"
 
 DEPENDS = "glib-2.0"
 
-PV = "0.0+cvs${SRCDATE}"
+PV = "0.0+svn${SRCDATE}"
 
 inherit gnome
 
-SRC_URI = "cvs://anonymous@anoncvs.gnome.org/cvs/gnome;module=${PN}"
+SRC_URI = "svn://svn.gnome.org/svn/${PN}/;module=trunk"
 
-S = "${WORKDIR}/${PN}"
+S = "${WORKDIR}/trunk"
 
 do_stage() {
 	autotools_stage_all
-}	
+}
 
 
 
diff --git a/packages/gnome/libwnck_2.10.2.bb b/packages/gnome/libwnck_2.10.2.bb
index b07bc09b86..17f5c673d6 100644
--- a/packages/gnome/libwnck_2.10.2.bb
+++ b/packages/gnome/libwnck_2.10.2.bb
@@ -4,6 +4,6 @@ HOMEPAGE =	""
 
 inherit gnome
 
-do_stage() {        
-	autotools_stage_all      
+do_stage() {
+	autotools_stage_all
 }
diff --git a/packages/gnome/libwnck_2.12.1.bb b/packages/gnome/libwnck_2.12.1.bb
index 46d5a868a5..1830a7540a 100644
--- a/packages/gnome/libwnck_2.12.1.bb
+++ b/packages/gnome/libwnck_2.12.1.bb
@@ -5,6 +5,6 @@ HOMEPAGE =	""
 
 inherit gnome
 
-do_stage() {        
-	autotools_stage_all      
+do_stage() {
+	autotools_stage_all
 }
diff --git a/packages/gnome/libwnck_2.8.1.bb b/packages/gnome/libwnck_2.8.1.bb
index 82a7004fbe..052e20fe32 100644
--- a/packages/gnome/libwnck_2.8.1.bb
+++ b/packages/gnome/libwnck_2.8.1.bb
@@ -4,8 +4,8 @@ HOMEPAGE =	""
 
 inherit gnome
 
-do_stage() {        
-	autotools_stage_includes        
-	install -d ${STAGING_LIBDIR}        
+do_stage() {
+	autotools_stage_includes
+	install -d ${STAGING_LIBDIR}
 	install -m 755 libwnck/.libs/libwnck-1.so.4.9.0 ${STAGING_LIBDIR}/libwnck-1.so
 }
diff --git a/packages/gnupg/gnupg2.inc b/packages/gnupg/gnupg2.inc
index c4aadb55eb..d362981f3c 100644
--- a/packages/gnupg/gnupg2.inc
+++ b/packages/gnupg/gnupg2.inc
@@ -24,12 +24,6 @@ FILES_${PN} += "${datadir}/gnupg"
 
 EXTRA_OECONF = "--disable-ldap \
 		--with-zlib=${STAGING_LIBDIR}/.. \
-		--with-gpg-error-prefix=${STAGING_BINDIR}/.. \
-		--with-libgcrypt-prefix=${STAGING_BINDIR}/.. \
-		--with-libassuan-prefix=${STAGING_BINDIR}/.. \
-		--with-pth-prefix=${STAGING_BINDIR}/.. \
-		--with-opensc-prefix=${STAGING_BINDIR}/.. \
-		--with-ksba-prefix=${STAGING_BINDIR}/.. \
 		--disable-threads \
 		--disable-gpgsm \
 		--disable-scdaemon"
diff --git a/packages/gnuplot/gnuplot_4.0.0.bb b/packages/gnuplot/gnuplot_4.0.0.bb
index ae97097e15..150fc8d6e5 100644
--- a/packages/gnuplot/gnuplot_4.0.0.bb
+++ b/packages/gnuplot/gnuplot_4.0.0.bb
@@ -15,7 +15,7 @@ SRC_URI = "ftp://ftp.gnuplot.info/pub/gnuplot/gnuplot-${PV}.tar.gz \
 	   file://gnuplot.desktop \
 	   file://gnuplot.png"
 
-inherit autotools 
+inherit autotools
 
 PACKAGES =+ "${PN}-x11"
 DESCRIPTION_${PN}-x11 = "X11 display terminal for Gnuplot."
diff --git a/packages/gnuplot/qtplot_0.2.bb b/packages/gnuplot/qtplot_0.2.bb
index 0bacbddf47..8b22c0e5d5 100644
--- a/packages/gnuplot/qtplot_0.2.bb
+++ b/packages/gnuplot/qtplot_0.2.bb
@@ -17,7 +17,7 @@ APPDESKTOP = "${S}"
 inherit opie
 
 do_install_prepend() {
-	install -d ${D}${palmtopdir}/pics 
+	install -d ${D}${palmtopdir}/pics
         install -d ${D}${palmtopdir}/help/html
 
         install -m 644 Qtplot.png ${D}${palmtopdir}/pics/
diff --git a/packages/gpe-autostarter/gpe-autostarter_0.11.bb b/packages/gpe-autostarter/gpe-autostarter_0.11.bb
index 326fae9257..b228b3d7b2 100644
--- a/packages/gpe-autostarter/gpe-autostarter_0.11.bb
+++ b/packages/gpe-autostarter/gpe-autostarter_0.11.bb
@@ -4,5 +4,5 @@ RDEPENDS = "hotplug-dbus"
 LICENSE = "GPL"
 
 inherit gpe
-	
+
 SRC_URI += " file://dbus-new-api.patch;patch=1"
diff --git a/packages/gpe-bootsplash/gpe-bootsplash-theme-e.bb b/packages/gpe-bootsplash/gpe-bootsplash-theme-e.bb
index 0cdafb7275..9790d8ebad 100644
--- a/packages/gpe-bootsplash/gpe-bootsplash-theme-e.bb
+++ b/packages/gpe-bootsplash/gpe-bootsplash-theme-e.bb
@@ -15,7 +15,7 @@ SRC_URI = "file://splash-e-portrait.svg \
 #FIXME: please use an gpe-bootsplash-theme.inc to reduce duplication
 
 do_install() {
-	install -d "${D}/usr/share/gpe"	
+	install -d "${D}/usr/share/gpe"
 	install -m 0644 ${WORKDIR}/splash-${THEME}* ${D}/usr/share/gpe
 }
 
@@ -26,7 +26,7 @@ pkg_postinst() {
 
 pkg_postrm() {
 	update-alternatives --remove bootsplash-l /usr/share/gpe/splash-${THEME}-landscape.svg
-	update-alternatives --remove bootsplash-p /usr/share/gpe/splash-${THEME}-portrait.svg	
+	update-alternatives --remove bootsplash-p /usr/share/gpe/splash-${THEME}-portrait.svg
 }
 
 FILES_${PN} = "/usr/share/gpe/splash-${THEME}-*"
diff --git a/packages/gpe-bootsplash/gpe-bootsplash-theme-opie.bb b/packages/gpe-bootsplash/gpe-bootsplash-theme-opie.bb
index c19ed49e69..293766a0b6 100644
--- a/packages/gpe-bootsplash/gpe-bootsplash-theme-opie.bb
+++ b/packages/gpe-bootsplash/gpe-bootsplash-theme-opie.bb
@@ -15,7 +15,7 @@ SRC_URI = "file://*.svg \
 #FIXME: please use an gpe-bootsplash-theme.inc to reduce duplication
 
 do_install(){
-	install -d "${D}/usr/share/gpe"	
+	install -d "${D}/usr/share/gpe"
 	install -m 0644 ${WORKDIR}/splash-${THEME}* ${D}/usr/share/gpe
 	install -m 0644 ${WORKDIR}/${THEME}-logo.png ${D}/usr/share/gpe
 }
@@ -27,7 +27,7 @@ pkg_postinst() {
 
 pkg_postrm() {
 	update-alternatives --remove bootsplash-l /usr/share/gpe/splash-${THEME}-landscape.svg
-	update-alternatives --remove bootsplash-p /usr/share/gpe/splash-${THEME}-portrait.svg	
+	update-alternatives --remove bootsplash-p /usr/share/gpe/splash-${THEME}-portrait.svg
 }
 
 FILES_${PN} = "/usr/share/gpe/splash-${THEME}-* \
diff --git a/packages/gpe-bootsplash/gpe-bootsplash_1.15.bb b/packages/gpe-bootsplash/gpe-bootsplash_1.15.bb
index c07ef46363..d9b4141204 100644
--- a/packages/gpe-bootsplash/gpe-bootsplash_1.15.bb
+++ b/packages/gpe-bootsplash/gpe-bootsplash_1.15.bb
@@ -26,5 +26,5 @@ pkg_postinst() {
 
 pkg_postrm() {
 	update-alternatives --remove bootsplash-l /usr/share/gpe/splash-gpe-landscape.svg
-	update-alternatives --remove bootsplash-p /usr/share/gpe/splash-gpe-portrait.svg	
+	update-alternatives --remove bootsplash-p /usr/share/gpe/splash-gpe-portrait.svg
 }
diff --git a/packages/gpe-buttonbox/gpe-buttonbox_0.5.bb b/packages/gpe-buttonbox/gpe-buttonbox_0.5.bb
index ededb292e8..08ef7af2d7 100644
--- a/packages/gpe-buttonbox/gpe-buttonbox_0.5.bb
+++ b/packages/gpe-buttonbox/gpe-buttonbox_0.5.bb
@@ -4,7 +4,7 @@ DESCRIPTION =	"Buttonbox for gpe"
 DEPENDS =	"libgpewidget libgpelaunch"
 
 GPE_TARBALL_SUFFIX= "bz2"
-inherit gpe autotools 
+inherit gpe autotools
 
 FILES_${PN} +=	"${datadir}/gpe"
 
diff --git a/packages/gpe-ownerinfo/gpe-ownerinfo_0.23.bb b/packages/gpe-ownerinfo/gpe-ownerinfo_0.23.bb
index 373a3fec75..2eb1b947a8 100644
--- a/packages/gpe-ownerinfo/gpe-ownerinfo_0.23.bb
+++ b/packages/gpe-ownerinfo/gpe-ownerinfo_0.23.bb
@@ -9,5 +9,5 @@ PR = "r1"
 
 do_stage () {
 	oe_libinstall -a libgpe-ownerinfo ${STAGING_LIBDIR}
-	install -m 0644 gpe-ownerinfo.h ${STAGING_INCDIR}/ 
+	install -m 0644 gpe-ownerinfo.h ${STAGING_INCDIR}/
 }
diff --git a/packages/gpe-ownerinfo/gpe-ownerinfo_0.24.bb b/packages/gpe-ownerinfo/gpe-ownerinfo_0.24.bb
index 0b83e82397..e0709fe1ed 100644
--- a/packages/gpe-ownerinfo/gpe-ownerinfo_0.24.bb
+++ b/packages/gpe-ownerinfo/gpe-ownerinfo_0.24.bb
@@ -11,5 +11,5 @@ SRC_URI += "file://fixloop.patch;patch=1;pnum=0"
 
 do_stage () {
 	oe_libinstall -a libgpe-ownerinfo ${STAGING_LIBDIR}
-	install -m 0644 gpe-ownerinfo.h ${STAGING_INCDIR}/ 
+	install -m 0644 gpe-ownerinfo.h ${STAGING_INCDIR}/
 }
diff --git a/packages/gpe-ownerinfo/gpe-ownerinfo_0.25.bb b/packages/gpe-ownerinfo/gpe-ownerinfo_0.25.bb
index f0a57bd29f..f04b9c19be 100644
--- a/packages/gpe-ownerinfo/gpe-ownerinfo_0.25.bb
+++ b/packages/gpe-ownerinfo/gpe-ownerinfo_0.25.bb
@@ -9,5 +9,5 @@ PR = "r0"
 
 do_stage () {
 	oe_libinstall -a libgpe-ownerinfo ${STAGING_LIBDIR}
-	install -m 0644 gpe-ownerinfo.h ${STAGING_INCDIR}/ 
+	install -m 0644 gpe-ownerinfo.h ${STAGING_INCDIR}/
 }
diff --git a/packages/gpe-ownerinfo/gpe-ownerinfo_0.26.bb b/packages/gpe-ownerinfo/gpe-ownerinfo_0.26.bb
index f0a57bd29f..f04b9c19be 100644
--- a/packages/gpe-ownerinfo/gpe-ownerinfo_0.26.bb
+++ b/packages/gpe-ownerinfo/gpe-ownerinfo_0.26.bb
@@ -9,5 +9,5 @@ PR = "r0"
 
 do_stage () {
 	oe_libinstall -a libgpe-ownerinfo ${STAGING_LIBDIR}
-	install -m 0644 gpe-ownerinfo.h ${STAGING_INCDIR}/ 
+	install -m 0644 gpe-ownerinfo.h ${STAGING_INCDIR}/
 }
diff --git a/packages/gpe-ownerinfo/gpe-ownerinfo_0.27.bb b/packages/gpe-ownerinfo/gpe-ownerinfo_0.27.bb
index f0a57bd29f..f04b9c19be 100644
--- a/packages/gpe-ownerinfo/gpe-ownerinfo_0.27.bb
+++ b/packages/gpe-ownerinfo/gpe-ownerinfo_0.27.bb
@@ -9,5 +9,5 @@ PR = "r0"
 
 do_stage () {
 	oe_libinstall -a libgpe-ownerinfo ${STAGING_LIBDIR}
-	install -m 0644 gpe-ownerinfo.h ${STAGING_INCDIR}/ 
+	install -m 0644 gpe-ownerinfo.h ${STAGING_INCDIR}/
 }
diff --git a/packages/gpe-ownerinfo/gpe-ownerinfo_0.28.bb b/packages/gpe-ownerinfo/gpe-ownerinfo_0.28.bb
index f0a57bd29f..f04b9c19be 100644
--- a/packages/gpe-ownerinfo/gpe-ownerinfo_0.28.bb
+++ b/packages/gpe-ownerinfo/gpe-ownerinfo_0.28.bb
@@ -9,5 +9,5 @@ PR = "r0"
 
 do_stage () {
 	oe_libinstall -a libgpe-ownerinfo ${STAGING_LIBDIR}
-	install -m 0644 gpe-ownerinfo.h ${STAGING_INCDIR}/ 
+	install -m 0644 gpe-ownerinfo.h ${STAGING_INCDIR}/
 }
diff --git a/packages/gpe-session-scripts/gpe-session-scripts_0.67.bb b/packages/gpe-session-scripts/gpe-session-scripts_0.67.bb
index cb5ea6c5c6..2cf63737bd 100644
--- a/packages/gpe-session-scripts/gpe-session-scripts_0.67.bb
+++ b/packages/gpe-session-scripts/gpe-session-scripts_0.67.bb
@@ -24,7 +24,7 @@ SRC_URI_append_nokia770 = " file://highdpifontfix.patch;patch=1"
 do_configure_append_angstrom() {
 	sed -i s:Default:Clearlooks:g X11/xsettings.default
 	sed -i s:Industrial:Clearlooks:g X11/xsettings.default
-}	
+}
 
 do_install_append() {
 	install -d ${D}${sysconfdir}/gpe/xsettings-default.d
@@ -36,16 +36,16 @@ do_install_append() {
 
 	install -d ${D}${sysconfdir}/gpe/xsettings-default.d
 	install -m 0644 ${WORKDIR}/disable-composite.xsettings ${D}${sysconfdir}/gpe/xsettings-default.d/disable-composite
-	
+
 	mv ${D}/usr/bin/gpe-logout ${D}/usr/bin/gpe-logout.matchbox
 }
 
-pkg_postinst_${PN}() { 
+pkg_postinst_${PN}() {
 	update-alternatives --install /usr/bin/gpe-logout gpe-logout /usr/bin/gpe-logout.matchbox 10
 }
 
-pkg_postrm_${PN}() {   
-       update-alternatives --remove gpe-logout /usr/bin/gpe-logout.matchbox 
+pkg_postrm_${PN}() {
+       update-alternatives --remove gpe-logout /usr/bin/gpe-logout.matchbox
 }
 
 # This makes use of GUI_MACHINE_CLASS, so set PACKAGE_ARCH appropriately
diff --git a/packages/gpe-themes/gpe-theme-clearlooks_0.2.bb b/packages/gpe-themes/gpe-theme-clearlooks_0.2.bb
index 1b59f29f62..796fc0ccae 100644
--- a/packages/gpe-themes/gpe-theme-clearlooks_0.2.bb
+++ b/packages/gpe-themes/gpe-theme-clearlooks_0.2.bb
@@ -12,7 +12,7 @@ SRC_URI =		"http://dominion.kabel.utwente.nl/koen/pda/files/${P}.tar.gz"
 
 do_install() {
 install -d ${D}${datadir}/themes/
-cp -PpR ${WORKDIR}/Clearlooks ${D}${datadir}/themes/ 
+cp -PpR ${WORKDIR}/Clearlooks ${D}${datadir}/themes/
 }
 
 
diff --git a/packages/gpe-themes/gpe-theme-clearlooks_0.3.bb b/packages/gpe-themes/gpe-theme-clearlooks_0.3.bb
index 3c9403d08d..8af15beb94 100644
--- a/packages/gpe-themes/gpe-theme-clearlooks_0.3.bb
+++ b/packages/gpe-themes/gpe-theme-clearlooks_0.3.bb
@@ -12,7 +12,7 @@ SRC_URI =		"http://dominion.kabel.utwente.nl/koen/pda/files/${P}.tar.gz"
 
 do_install() {
 install -d ${D}${datadir}/themes/
-cp -PpR ${WORKDIR}/Clearlooks ${D}${datadir}/themes/ 
+cp -PpR ${WORKDIR}/Clearlooks ${D}${datadir}/themes/
 }
 
 
diff --git a/packages/gpe-themes/gpe-theme-e17_0.1.bb b/packages/gpe-themes/gpe-theme-e17_0.1.bb
index b509e3d4ec..3c3752af46 100644
--- a/packages/gpe-themes/gpe-theme-e17_0.1.bb
+++ b/packages/gpe-themes/gpe-theme-e17_0.1.bb
@@ -10,7 +10,7 @@ SRC_URI =		"http://linuxtogo.org/~koen/gpe/themes/${P}.tar.gz"
 
 do_install() {
 install -d ${D}${datadir}/themes/
-cp -R ${WORKDIR}/usr/share/themes/e17-bling/  ${D}${datadir}/themes/ 
+cp -R ${WORKDIR}/usr/share/themes/e17-bling/  ${D}${datadir}/themes/
 }
 
 
diff --git a/packages/gpe-themes/gpe-theme-industrial_0.1.bb b/packages/gpe-themes/gpe-theme-industrial_0.1.bb
index 5d0a4b8da9..1a57e03d03 100644
--- a/packages/gpe-themes/gpe-theme-industrial_0.1.bb
+++ b/packages/gpe-themes/gpe-theme-industrial_0.1.bb
@@ -11,7 +11,7 @@ SRC_URI =		"http://dominion.kabel.utwente.nl/koen/pda/files/${P}.tar.gz"
 
 do_install() {
 install -d ${D}${datadir}/themes/
-cp -R ${WORKDIR}/Industrial ${D}${datadir}/themes/ 
+cp -R ${WORKDIR}/Industrial ${D}${datadir}/themes/
 }
 
 
diff --git a/packages/gpe-themes/gpe-theme-industrial_0.2.bb b/packages/gpe-themes/gpe-theme-industrial_0.2.bb
index 79941664b8..1a0b8f49a8 100644
--- a/packages/gpe-themes/gpe-theme-industrial_0.2.bb
+++ b/packages/gpe-themes/gpe-theme-industrial_0.2.bb
@@ -12,7 +12,7 @@ SRC_URI =		"http://dominion.kabel.utwente.nl/koen/pda/files/${P}.tar.gz"
 
 do_install() {
 install -d ${D}${datadir}/themes/
-cp -R ${WORKDIR}/Industrial ${D}${datadir}/themes/ 
+cp -R ${WORKDIR}/Industrial ${D}${datadir}/themes/
 }
 
 
diff --git a/packages/gpsdrive/gpsdrive_2.10pre2.bb b/packages/gpsdrive/gpsdrive_2.10pre2.bb
index d16d8df590..d0aa30477a 100644
--- a/packages/gpsdrive/gpsdrive_2.10pre2.bb
+++ b/packages/gpsdrive/gpsdrive_2.10pre2.bb
@@ -18,7 +18,7 @@ FILES_${PN} = "${bindir}/gpsdrive ${bindir}/wpcvt ${bindir}/wpget ${datadir}/pix
 FILES_${PN} += "${datadir}/${PN}"
 
 FILES_gpsdrive-add = "${libdir}"
- 
+
 EXTRA_OECONF = "--disable-garmin"
 
 do_install_append () {
diff --git a/packages/gpsdrive/gpsdrive_2.10pre3.bb b/packages/gpsdrive/gpsdrive_2.10pre3.bb
index 6fbba4be15..cb651aaf39 100644
--- a/packages/gpsdrive/gpsdrive_2.10pre3.bb
+++ b/packages/gpsdrive/gpsdrive_2.10pre3.bb
@@ -20,7 +20,7 @@ FILES_${PN} = "${bindir}/gpsdrive ${bindir}/wpcvt ${bindir}/wpget ${datadir}/pix
 FILES_${PN} += "${datadir}/${PN}"
 
 FILES_gpsdrive-add = "${libdir}"
- 
+
 EXTRA_OECONF = "--disable-garmin"
 
 do_install_append () {
diff --git a/packages/gpsdrive/gpsdrive_cvs.bb b/packages/gpsdrive/gpsdrive_cvs.bb
index 430a0f52fb..6cb78065ea 100644
--- a/packages/gpsdrive/gpsdrive_cvs.bb
+++ b/packages/gpsdrive/gpsdrive_cvs.bb
@@ -23,7 +23,7 @@ FILES_${PN} = "${bindir}/gpsdrive ${bindir}/wpcvt ${bindir}/wpget ${datadir}/pix
 FILES_${PN} += "${datadir}/${PN}"
 
 FILES_gpsdrive-add = "${libdir}"
- 
+
 EXTRA_OECONF = "--disable-garmin"
 
 do_install_append () {
diff --git a/packages/grip/grip_3.2.0.bb b/packages/grip/grip_3.2.0.bb
index 710624d584..063803138d 100644
--- a/packages/grip/grip_3.2.0.bb
+++ b/packages/grip/grip_3.2.0.bb
@@ -8,4 +8,4 @@ LICENSE="GPL"
 SRC_URI="${SOURCEFORGE_MIRROR}/grip/grip-${PV}.tar.gz"
 DEPENDS="libgnomeui vte curl cdparanoia id3lib"
 
-inherit autotools 
+inherit autotools
diff --git a/packages/groff/groff_1.19.1.bb b/packages/groff/groff_1.19.1.bb
index 55dcfbf8cb..42b0d80d15 100644
--- a/packages/groff/groff_1.19.1.bb
+++ b/packages/groff/groff_1.19.1.bb
@@ -7,7 +7,7 @@ SRC_URI = "http://ftp.gnu.org/gnu/groff/groff-${PV}.tar.gz \
 	           file://groff.patch;patch=1"
 
 PARALLEL_MAKE = ""
-# prefix and exec-prefix are broken and the .in file is broken too 
+# prefix and exec-prefix are broken and the .in file is broken too
 # and can't be autoreconf'ed, so specify every dir
 EXTRA_OECONF="--prefix=${D} --exec-prefix=${D} --bindir=${D}${bindir} --datadir=${D}${datadir} --mandir=${D}${datadir}/man --infodir=${D}${datadir}/info"
 
diff --git a/packages/groff/groff_1.19.2.bb b/packages/groff/groff_1.19.2.bb
index 1099714686..e6046ae189 100644
--- a/packages/groff/groff_1.19.2.bb
+++ b/packages/groff/groff_1.19.2.bb
@@ -9,7 +9,7 @@ SRC_URI = "http://ftp.gnu.org/gnu/groff/groff-${PV}.tar.gz \
 	           file://groff.patch;patch=1"
 
 PARALLEL_MAKE = ""
-# prefix and exec-prefix are broken and the .in file is broken too 
+# prefix and exec-prefix are broken and the .in file is broken too
 # and can't be autoreconf'ed, so specify every dir
 EXTRA_OECONF="--prefix=${D} --exec-prefix=${D} --bindir=${D}${bindir} --datadir=${D}${datadir} --mandir=${D}${datadir}/man --infodir=${D}${datadir}/info"
 inherit autotools
diff --git a/packages/gstreamer/gstreamer_0.10.11.bb b/packages/gstreamer/gstreamer_0.10.11.bb
index d44630fbe2..59e224eab5 100644
--- a/packages/gstreamer/gstreamer_0.10.11.bb
+++ b/packages/gstreamer/gstreamer_0.10.11.bb
@@ -7,7 +7,7 @@ HOMEPAGE = "http://www.gstreamer.net/"
 DEPENDS = "libxml2 glib-2.0 gettext-native popt"
 
 PR = "r0"
-# until we have decided a final naming scheme, 
+# until we have decided a final naming scheme,
 # don't use this package as a replacement for
 # version 0.8
 DEFAULT_PREFERENCE = "-1"
diff --git a/packages/gtk+/gtk+_2.10.3.bb b/packages/gtk+/gtk+_2.10.3.bb
index 95de5f56a6..51a79598dd 100644
--- a/packages/gtk+/gtk+_2.10.3.bb
+++ b/packages/gtk+/gtk+_2.10.3.bb
@@ -8,7 +8,7 @@ DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt c
 PR = "r3"
 
 # disable per default - untested and not all patches included.
-DEFAULT_PREFERENCE = "-1" 
+DEFAULT_PREFERENCE = "-1"
 
 SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.10/gtk+-${PV}.tar.bz2 \
            file://no-xwc.patch;patch=1 \
diff --git a/packages/gtk+/gtk+_2.10.6.bb b/packages/gtk+/gtk+_2.10.6.bb
index 82549b028b..33be0019cb 100644
--- a/packages/gtk+/gtk+_2.10.6.bb
+++ b/packages/gtk+/gtk+_2.10.6.bb
@@ -8,7 +8,7 @@ DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt c
 PR = "r7"
 
 # disable per default - untested and not all patches included.
-DEFAULT_PREFERENCE = "-1" 
+DEFAULT_PREFERENCE = "-1"
 
 SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.10/gtk+-${PV}.tar.bz2 \
            file://no-xwc.patch;patch=1 \
@@ -28,7 +28,7 @@ SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.10/gtk+-${PV}.tar.bz2 \
            file://spinbutton.patch;patch=1 \
            file://gtk+-handhelds.patch;patch=1"
 
-inherit autotools pkgconfig 
+inherit autotools pkgconfig
 
 FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \
 	${bindir}/gtk-update-icon-cache \
diff --git a/packages/gtk-webcore/osb-jscore_0.5.0.bb b/packages/gtk-webcore/osb-jscore_0.5.0.bb
index 6f4f3df5b7..434c39fde3 100644
--- a/packages/gtk-webcore/osb-jscore_0.5.0.bb
+++ b/packages/gtk-webcore/osb-jscore_0.5.0.bb
@@ -28,7 +28,7 @@ do_stage () {
 	oe_libinstall -so -C kjs libjscore ${STAGING_LIBDIR}
 
 	autotools_stage_includes
-	
+
 	install -d ${STAGING_INCDIR}/osb/JavaScriptCore
 	for i in ${S}/kjs/*.h ${S}/kjs/new; do
 		install -m 0644 $i ${STAGING_INCDIR}/osb/JavaScriptCore
diff --git a/packages/gtk-webcore/osb-jscore_20050430.bb b/packages/gtk-webcore/osb-jscore_20050430.bb
index ce97046c84..f024bbfa02 100644
--- a/packages/gtk-webcore/osb-jscore_20050430.bb
+++ b/packages/gtk-webcore/osb-jscore_20050430.bb
@@ -30,7 +30,7 @@ do_stage () {
 	oe_libinstall -so -C kjs libjscore ${STAGING_LIBDIR}
 
 	autotools_stage_includes
-	
+
 	install -d ${STAGING_INCDIR}/osb/JavaScriptCore
 	for i in ${S}/kjs/*.h ${S}/kjs/new; do
 		install -m 0644 $i ${STAGING_INCDIR}/osb/JavaScriptCore
diff --git a/packages/gtk-webcore/osb-jscore_20060212.bb b/packages/gtk-webcore/osb-jscore_20060212.bb
index 6900dc392a..b5aa879a18 100644
--- a/packages/gtk-webcore/osb-jscore_20060212.bb
+++ b/packages/gtk-webcore/osb-jscore_20060212.bb
@@ -32,7 +32,7 @@ do_stage () {
 	oe_libinstall -so -C kjs libjscore ${STAGING_LIBDIR}
 
 	autotools_stage_includes
-	
+
 	install -d ${STAGING_INCDIR}/osb/JavaScriptCore
 	for i in ${S}/kjs/*.h ${S}/kjs/new; do
 		install -m 0644 $i ${STAGING_INCDIR}/osb/JavaScriptCore
diff --git a/packages/gtk-webcore/osb-nrcit_0.5.0.bb b/packages/gtk-webcore/osb-nrcit_0.5.0.bb
index 34607b02c4..ca0a845c2a 100644
--- a/packages/gtk-webcore/osb-nrcit_0.5.0.bb
+++ b/packages/gtk-webcore/osb-nrcit_0.5.0.bb
@@ -23,7 +23,7 @@ do_stage () {
 	oe_libinstall -so -C src libnrcit ${STAGING_LIBDIR}
 
 	autotools_stage_includes
-	
+
 	install -d ${STAGING_INCDIR}/osb
 	install -m 0644 ${S}/src/gtk/gtk-khtml.h ${STAGING_INCDIR}/osb
 	install -m 0644 ${S}/src/osb.h ${STAGING_INCDIR}/osb
diff --git a/packages/gtk-webcore/osb-nrcit_20050430.bb b/packages/gtk-webcore/osb-nrcit_20050430.bb
index 1b9183a492..261b52f01b 100644
--- a/packages/gtk-webcore/osb-nrcit_20050430.bb
+++ b/packages/gtk-webcore/osb-nrcit_20050430.bb
@@ -32,7 +32,7 @@ do_stage () {
 	oe_libinstall -so -C src libnrcit ${STAGING_LIBDIR}
 
 	autotools_stage_includes
-	
+
 	install -d ${STAGING_INCDIR}/osb
 	install -m 0644 ${S}/src/gtk/gtk-khtml.h ${STAGING_INCDIR}/osb
 	install -m 0644 ${S}/src/osb.h ${STAGING_INCDIR}/osb
diff --git a/packages/gtk-webcore/osb-nrcit_20060212.bb b/packages/gtk-webcore/osb-nrcit_20060212.bb
index 7449d0d845..3bfec98924 100644
--- a/packages/gtk-webcore/osb-nrcit_20060212.bb
+++ b/packages/gtk-webcore/osb-nrcit_20060212.bb
@@ -32,7 +32,7 @@ do_stage () {
 	oe_libinstall -so -C src libnrcit ${STAGING_LIBDIR}
 
 	autotools_stage_includes
-	
+
 	install -d ${STAGING_INCDIR}/osb
 	install -m 0644 ${S}/src/gtk/gtk-khtml.h ${STAGING_INCDIR}/osb
 	install -m 0644 ${S}/src/osb.h ${STAGING_INCDIR}/osb
diff --git a/packages/gtkextra/gtk+extra_2.1.1.bb b/packages/gtkextra/gtk+extra_2.1.1.bb
index 60b34544ed..bc822f7176 100644
--- a/packages/gtkextra/gtk+extra_2.1.1.bb
+++ b/packages/gtkextra/gtk+extra_2.1.1.bb
@@ -6,4 +6,4 @@ SRC_URI		= "${SOURCEFORGE_MIRROR}/scigraphica/gtk+extra-${PV}.tar.gz"
 DEPENDS		= "gtk+"
 
 inherit autotools
- 
+
diff --git a/packages/gtkhtml/gtkhtml-lite-3.0_3.0.10.bb b/packages/gtkhtml/gtkhtml-lite-3.0_3.0.10.bb
index 7af6879042..14e6818e7b 100644
--- a/packages/gtkhtml/gtkhtml-lite-3.0_3.0.10.bb
+++ b/packages/gtkhtml/gtkhtml-lite-3.0_3.0.10.bb
@@ -6,7 +6,7 @@ PR = "r1"
 
 inherit gnome
 
-SRC_URI = "http://stag.mind.be/gtkhtml-lite-3.0.10.tar.bz2" 
+SRC_URI = "http://stag.mind.be/gtkhtml-lite-3.0.10.tar.bz2"
 FILES_${PN} += "${datadir}/gtkhtml-3.0 ${libdir}/gtkhtml/*.so"
 FILES_${PN}-dev += "${libdir}/gtkhtml"
 S = "${WORKDIR}/gtkhtml-${PV}"
diff --git a/packages/gxine/gxine_0.4.1.bb b/packages/gxine/gxine_0.4.1.bb
index 7f2bfedf3b..057b8a48eb 100644
--- a/packages/gxine/gxine_0.4.1.bb
+++ b/packages/gxine/gxine_0.4.1.bb
@@ -28,7 +28,7 @@ RDEPENDS = "libxine-plugin-vo-out-xshm \
 	    libxine-plugin-dmx-ogg \
 	    libxine-plugin-dmx-image \
 	    libxine-plugin-dmx-avi"
-	    
+
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/xine/${PN}-${PV}.tar.gz \
 	   file://disable-browser-plugin.patch;patch=1"
diff --git a/packages/gxine/gxine_0.4.1enhanced.bb b/packages/gxine/gxine_0.4.1enhanced.bb
index ee0d50126b..7245d1de13 100644
--- a/packages/gxine/gxine_0.4.1enhanced.bb
+++ b/packages/gxine/gxine_0.4.1enhanced.bb
@@ -26,7 +26,7 @@ RDEPENDS = "libxine-plugin-vo-out-xshm \
 	    libxine-plugin-dmx-ogg \
 	    libxine-plugin-dmx-image \
 	    libxine-plugin-dmx-avi"
-	    
+
 S = "${WORKDIR}/${PN}-0.4.1/"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/xine/${PN}-0.4.1.tar.gz \
diff --git a/packages/havp/havp_0.82.bb b/packages/havp/havp_0.82.bb
index f4298d9d07..9ec5fb5539 100644
--- a/packages/havp/havp_0.82.bb
+++ b/packages/havp/havp_0.82.bb
@@ -26,7 +26,7 @@ do_configure_append () {
         sed -e 's:ENABLECLAMLIB false:ENABLECLAMLIB true:' \
             -e 's:/usr/local/etc:/etc:' \
             etc/havp/havp.config > etc/havp/havp.config.oe
-}	
+}
 do_install () {
         install -m 0755 -d ${D}${sbindir} ${D}${sysconfdir}/havp \
                 ${D}${sysconfdir}/init.d ${D}${docdir}/havp \
diff --git a/packages/hibernate-script/hibernate-script_1.12.bb b/packages/hibernate-script/hibernate-script_1.12.bb
index e5c912d3d9..3d6f428d90 100644
--- a/packages/hibernate-script/hibernate-script_1.12.bb
+++ b/packages/hibernate-script/hibernate-script_1.12.bb
@@ -23,7 +23,7 @@ do_install () {
 		${S}/install.sh
 
 	ln -s ./hibernate ${D}/usr/sbin/hibernate-standby
-	ln -s ./hibernate ${D}/usr/sbin/hibernate-ram 
+	ln -s ./hibernate ${D}/usr/sbin/hibernate-ram
 
 	#Override conf files from ${WORKDIR}
 	install -m 0644 ${WORKDIR}/hibernate.conf ${D}/etc/hibernate/
diff --git a/packages/horizon/horizon_cvs.bb b/packages/horizon/horizon_cvs.bb
index c6a33cbac7..bfa26b54a1 100644
--- a/packages/horizon/horizon_cvs.bb
+++ b/packages/horizon/horizon_cvs.bb
@@ -18,11 +18,11 @@ CFLAGS += " -I${STAGING_INCDIR} -I${STAGING_INCDIR}/SDL -I. -Isrc -L${STAGING_LI
 
 do_compile() {
 	#yes, this is a hack to work around a faulty makefile
-	oe_runmake horizon 
-}	
+	oe_runmake horizon
+}
 
 do_install() {
 	install -d ${D}${bindir}
 	install -m 755 horizon ${D}${bindir}
-}	
+}
 
diff --git a/packages/hostap/hostap-conf_1.0.bb b/packages/hostap/hostap-conf_1.0.bb
index b95b3dd2c4..dc40be49d7 100644
--- a/packages/hostap/hostap-conf_1.0.bb
+++ b/packages/hostap/hostap-conf_1.0.bb
@@ -12,7 +12,7 @@ SRC_URI = "file://hostap_cs.conf \
 do_compile() {
 }
 
-do_install() {   
+do_install() {
         install -d ${D}${sysconfdir}/pcmcia
         install -d ${D}${sysconfdir}/modutils
 
diff --git a/packages/hotplug-qcop/hotplug-qcop_cvs.bb b/packages/hotplug-qcop/hotplug-qcop_cvs.bb
index f8692f352f..5c0d238453 100644
--- a/packages/hotplug-qcop/hotplug-qcop_cvs.bb
+++ b/packages/hotplug-qcop/hotplug-qcop_cvs.bb
@@ -14,7 +14,7 @@ sbindir="/sbin"
 do_install() {
 	install -d ${D}${sbindir}
 	install -m 0755 hotplug-qcop ${D}${sbindir}
-	
+
 	install -d ${D}${sysconfdir}/hotplug.d/default/
 	ln -sf /sbin/hotplug-qcop ${D}${sysconfdir}/hotplug.d/default/11-qcop.hotplug
 }
diff --git a/packages/httppc/httppc_0.8.5.bb b/packages/httppc/httppc_0.8.5.bb
index a96cafbaa6..5dd5742686 100644
--- a/packages/httppc/httppc_0.8.5.bb
+++ b/packages/httppc/httppc_0.8.5.bb
@@ -10,4 +10,4 @@ LICENSE = "GPL"
 SRC_URI = "${SOURCEFORGE_MIRROR}/httppc/httppc-${PV}.tar.gz \
 	   file://install.patch;patch=1"
 
-inherit autotools 
+inherit autotools
diff --git a/packages/ica/ica-bin_8.0.bb b/packages/ica/ica-bin_8.0.bb
index 8ed18620b2..ede48ffe3b 100644
--- a/packages/ica/ica-bin_8.0.bb
+++ b/packages/ica/ica-bin_8.0.bb
@@ -6,7 +6,7 @@ DEPENDS = "virtual/libx11 libxaw rpm2cpio-native"
 
 HOMEPAGE="www.citrix.com/download/"
 
-SRC_URI="file://${DL_DIR}/ICAClient-8.0-1.i386.rpm" 
+SRC_URI="file://${DL_DIR}/ICAClient-8.0-1.i386.rpm"
 
 S="${WORKDIR}"
 PACKAGES= "${PN}"
@@ -17,9 +17,9 @@ python ica_do_fetch() {
 	def dowarn(str,d):
 		out = bb.data.expand(str, d)
 		bb.note(out)
-	
+
 	file = bb.data.getVar('A', d)
-	basen = os.path.basename(file)	
+	basen = os.path.basename(file)
 
 	if not os.path.exists(file):
 		dowarn('You need to perform the following steps to build this package:',d)
@@ -44,7 +44,7 @@ do_compile() {
 DDIR="${D}/usr/lib/ICAClient"
 
 do_install () {
-	for file in `find usr/lib/ICAClient/ -type d`; do 
+	for file in `find usr/lib/ICAClient/ -type d`; do
 		install -d ${D}/$file
 	done
 
diff --git a/packages/icewm/icewm_1.2.20.bb b/packages/icewm/icewm_1.2.20.bb
index 76fa2abf79..4da5da5146 100644
--- a/packages/icewm/icewm_1.2.20.bb
+++ b/packages/icewm/icewm_1.2.20.bb
@@ -2,7 +2,7 @@ SECTION = "x11/wm"
 DESCRIPTION = "IceWM Window Manager"
 LICENSE = "GPL"
 DEPENDS = "virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender libxinerama libxpm xrandr xft mkfontdir-native"
-PR = "r1" 
+PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/icewm/icewm-${PV}.tar.gz \
 	   file://makefile.patch;patch=1 \
diff --git a/packages/icewm/icewm_1.2.26.bb b/packages/icewm/icewm_1.2.26.bb
index 1454ae00f0..47d4fc8189 100644
--- a/packages/icewm/icewm_1.2.26.bb
+++ b/packages/icewm/icewm_1.2.26.bb
@@ -2,7 +2,7 @@ SECTION = "x11/wm"
 DESCRIPTION = "IceWM Window Manager"
 LICENSE = "GPL"
 DEPENDS = "virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender libxinerama libxpm xrandr xft mkfontdir-native"
-PR = "r0" 
+PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/icewm/icewm-${PV}.tar.gz \
 	   file://makefile.patch;patch=1 \
diff --git a/packages/ifupdown/ifupdown_0.6.4.bb b/packages/ifupdown/ifupdown_0.6.4.bb
index 0d37223eaf..bf0c82634f 100644
--- a/packages/ifupdown/ifupdown_0.6.4.bb
+++ b/packages/ifupdown/ifupdown_0.6.4.bb
@@ -1,4 +1,4 @@
-BROKEN = "1" 
+BROKEN = "1"
 # Debian moved to 0.6.7
 
 DESCRIPTION = "High level tools to configure network interfaces \
diff --git a/packages/images/bootstrap-image-bootchart.bb b/packages/images/bootstrap-image-bootchart.bb
index 00a1e391c6..dea254eaa5 100644
--- a/packages/images/bootstrap-image-bootchart.bb
+++ b/packages/images/bootstrap-image-bootchart.bb
@@ -1,10 +1,10 @@
 export IMAGE_BASENAME = "bootstrap-image-bootchart"
 export IMAGE_LINGUAS = ""
-export IPKG_INSTALL = "${MACHINE_TASK_PROVIDER} bootchart acct"
+export PACKAGE_INSTALL = "${MACHINE_TASK_PROVIDER} bootchart acct"
 
 DEPENDS = "${MACHINE_TASK_PROVIDER} bootchart"
 RDEPENDS = "acct"
 
-inherit image_ipk
+inherit image
 
 LICENSE = "MIT"
diff --git a/packages/images/bootstrap-image.bb b/packages/images/bootstrap-image.bb
index 5731d94159..1ff60e60e1 100644
--- a/packages/images/bootstrap-image.bb
+++ b/packages/images/bootstrap-image.bb
@@ -1,10 +1,10 @@
 export IMAGE_BASENAME = "bootstrap-image"
 export IMAGE_LINGUAS = ""
-export IPKG_INSTALL = "${MACHINE_TASK_PROVIDER}"
+export PACKAGE_INSTALL = "${MACHINE_TASK_PROVIDER}"
 
 DEPENDS = "${MACHINE_TASK_PROVIDER}"
 
-inherit image_ipk
+inherit image
 
 FEED_URIS_append_familiar   = " x11##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/x11 \
                                opie##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/opie"
diff --git a/packages/images/dvb-image.bb b/packages/images/dvb-image.bb
index a6687d2f46..c4636b12aa 100644
--- a/packages/images/dvb-image.bb
+++ b/packages/images/dvb-image.bb
@@ -4,8 +4,8 @@ IMAGE_LINGUAS = ""
 
 DVB_PACKAGES = "${MACHINE_TASK_PROVIDER} task-dvb"
 
-export IPKG_INSTALL = "${DVB_PACKAGES}"
+export PACKAGE_INSTALL = "${DVB_PACKAGES}"
 DEPENDS = "${DVB_PACKAGES}"
 
-inherit image_ipk
+inherit image
 LICENSE = "MIT"
diff --git a/packages/images/e-image-core.bb b/packages/images/e-image-core.bb
index f41f04ee23..c713437361 100644
--- a/packages/images/e-image-core.bb
+++ b/packages/images/e-image-core.bb
@@ -16,6 +16,6 @@ PREFERRED_PROVIDER_virtual/imlib2 = "imlib2-x11"
 PREFERRED_PROVIDER_virtual/libxine = "libxine-x11"
 PREFERRED_PROVIDER_libx11 = "libx11"
 
-export IPKG_INSTALL = "${MACHINE_TASK_PROVIDER} task-e-x11-core xserver-kdrive-fbdev glibc-charmap-utf-8 glibc-localedata-i18n"
+export PACKAGE_INSTALL = "${MACHINE_TASK_PROVIDER} task-e-x11-core xserver-kdrive-fbdev glibc-charmap-utf-8 glibc-localedata-i18n"
 
-inherit image_ipk
+inherit image
diff --git a/packages/images/e-image.bb b/packages/images/e-image.bb
index e42df3f35b..2f0bef98ef 100644
--- a/packages/images/e-image.bb
+++ b/packages/images/e-image.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "An X11-based distribution with the Enlightenment Window Manager a
 PR = "r5"
 
 export IMAGE_BASENAME = "e-image"
-export IPKG_INSTALL += "task-e-x11-core \
+export PACKAGE_INSTALL += "task-e-x11-core \
                         gpe-task-pim \
                         gpe-task-settings \
                         gpe-task-apps \
@@ -32,4 +32,4 @@ export IPKG_INSTALL += "task-e-x11-core \
 
 DEPENDS += "task-e-x11-core task-gpe figment xhost gpe-soundserver gpe-confd xauth"
 
-RDEPENDS = "${IPKG_INSTALL}"
+RDEPENDS = "${PACKAGE_INSTALL}"
diff --git a/packages/images/essential-image.bb b/packages/images/essential-image.bb
index 2388a0e3f7..9544b82ead 100644
--- a/packages/images/essential-image.bb
+++ b/packages/images/essential-image.bb
@@ -15,7 +15,7 @@ PR = "r0"
 
 ######################################################################################
 
-inherit image_ipk
+inherit image
 
 ######################################################################################
 
@@ -25,4 +25,4 @@ DEPENDS = "task-essential-to-boot"
 
 export IMAGE_BASENAME = "essential-image"
 export IMAGE_LINGUAS = ""
-export IPKG_INSTALL = "task-essential-to-boot"
+export PACKAGE_INSTALL = "task-essential-to-boot"
diff --git a/packages/images/essential-machine-image.bb b/packages/images/essential-machine-image.bb
index 04f74aacf5..70ce1e119a 100644
--- a/packages/images/essential-machine-image.bb
+++ b/packages/images/essential-machine-image.bb
@@ -15,7 +15,7 @@ PR = "r0"
 
 ######################################################################################
 
-inherit image_ipk
+inherit image
 
 ######################################################################################
 
@@ -28,9 +28,9 @@ MACHINE_TASKS_akita = "task-essential-to-boot \
 		       task-essential-usbhost task-essential-usbclient \
 		       task-essential-sound task-essential-irda \
 		       task-essential-sd"
-		       
+
 ######################################################################################
 
 export IMAGE_BASENAME = "essential-image"
 export IMAGE_LINGUAS = ""
-export IPKG_INSTALL = "${MACHINE_TASKS}"
+export PACKAGE_INSTALL = "${MACHINE_TASKS}"
diff --git a/packages/images/gpe-image.bb b/packages/images/gpe-image.bb
index 53c6d5f8f9..b448c0a9b1 100644
--- a/packages/images/gpe-image.bb
+++ b/packages/images/gpe-image.bb
@@ -25,9 +25,9 @@ GPE_EXTRA_INSTALL += "${GPE_BIGFLASH_INSTALL}"
 XSERVER ?= "xserver-kdrive-fbdev"
 
 DEPENDS = "${MACHINE_TASK_PROVIDER} task-gpe"
-RDEPENDS = "${IPKG_INSTALL}"
+RDEPENDS = "${PACKAGE_INSTALL}"
 
-export IPKG_INSTALL = "\
+export PACKAGE_INSTALL = "\
     ${MACHINE_TASK_PROVIDER} \
     gpe-task-base \
     gpe-task-pim \
@@ -38,5 +38,5 @@ export IPKG_INSTALL = "\
 
 #ROOTFS_POSTPROCESS_COMMAND += "zap_root_password; "
 
-inherit image_ipk
+inherit image
 LICENSE = "MIT"
diff --git a/packages/meta/jlime-opie.bb b/packages/images/jlime-opie.bb
index 0d81066778..a6f8b7989a 100644
--- a/packages/meta/jlime-opie.bb
+++ b/packages/images/jlime-opie.bb
@@ -17,7 +17,7 @@ INSTALL_PACKAGES = "task-bootstrap task-opie-base task-opie-base-applets \
 		    task-opie-bluetooth task-opie-irda \
 		    ${extra_stuff}"
 
-export IPKG_INSTALL = "${INSTALL_PACKAGES}"
+export PACKAGE_INSTALL = "${INSTALL_PACKAGES}"
 
 # merge feed-sources into ipkg.conf for opie-aqpkg as it can't handle feed-sources outside of ipkg.conf.
 merge_feeds() {
@@ -30,11 +30,11 @@ merge_feeds() {
                         echo "[${IMAGE_ROOTFS}/etc/ipkg.conf] is missing!"
                         exit 1
                 fi
-                
+
                 # comment out existing feed-sources inserted by ipkg-collateral
                 cat ${IMAGE_ROOTFS}/etc/ipkg.conf | sed "s/^src\ /#src\ /" > ${IMAGE_ROOTFS}/etc/ipkg.conf_
                 rm ${IMAGE_ROOTFS}/etc/ipkg.conf && mv ${IMAGE_ROOTFS}/etc/ipkg.conf_ ${IMAGE_ROOTFS}/etc/ipkg.conf
-                
+
                 # extract, then delete destinations
                 cat ${IMAGE_ROOTFS}/etc/ipkg.conf | egrep "^dest\ " > ${IMAGE_ROOTFS}/etc/ipkg.conf.dest
                 cat ${IMAGE_ROOTFS}/etc/ipkg.conf | egrep -v "^dest\ " > ${IMAGE_ROOTFS}/etc/ipkg.conf_
@@ -46,23 +46,23 @@ merge_feeds() {
                         # strip leading and trailing spaces/tabs, then split into name and uri
                         line_clean="`echo "$line"|sed 's/^[ \t]*//;s/[ \t]*$//'`"
                         feed_name="`echo "$line_clean" | sed -n 's/\(.*\)##\(.*\)/\1/p'`"
-                        feed_uri="`echo "$line_clean" | sed -n 's/\(.*\)##\(.*\)/\2/p'`"                
+                        feed_uri="`echo "$line_clean" | sed -n 's/\(.*\)##\(.*\)/\2/p'`"
 
                         # insert new feed-sources
                         echo "src/gz $feed_name $feed_uri" >> ${IMAGE_ROOTFS}/etc/ipkg.conf
                 done
-                
+
                 # remove temporary files and rebuild ipkg.conf
                 echo "" >> ${IMAGE_ROOTFS}/etc/ipkg.conf
                 cat ${IMAGE_ROOTFS}/etc/ipkg.conf.dest >> ${IMAGE_ROOTFS}/etc/ipkg.conf
                 rm ${IMAGE_ROOTFS}/etc/ipkg.conf.dest
-                
+
                 # remove -feed.conf files which are no longer needed
-                cd ${IMAGE_ROOTFS}/etc/ipkg/ && rm -- *-feed.conf                               
+                cd ${IMAGE_ROOTFS}/etc/ipkg/ && rm -- *-feed.conf
         fi
 }
 
 # merge feed-sources into ipkg.conf and create /etc/timestamp from build date
 IMAGE_PREPROCESS_COMMAND = "merge_feeds; create_etc_timestamp"
 
-inherit image_ipk
+inherit image
diff --git a/packages/images/maemo-image.bb b/packages/images/maemo-image.bb
index d0368cb025..2153e427c1 100644
--- a/packages/images/maemo-image.bb
+++ b/packages/images/maemo-image.bb
@@ -19,9 +19,9 @@ DEPENDS = "${MACHINE_TASK_PROVIDER} \
 	   meta-maemo \
 	   ${MAEMO_EXTRA_DEPENDS}"
 
-export IPKG_INSTALL = "${MACHINE_TASK_PROVIDER} maemo-task-base maemo-task-theme \
+export PACKAGE_INSTALL = "${MACHINE_TASK_PROVIDER} maemo-task-base maemo-task-theme \
 	               maemo-task-apps ${MAEMO_EXTRA_INSTALL} \
 		       ${XSERVER}"
 
-inherit image_ipk
+inherit image
 LICENSE = "MIT"
diff --git a/packages/images/mythfront-image.bb b/packages/images/mythfront-image.bb
index 9bfedcf222..49e6b5ae2b 100644
--- a/packages/images/mythfront-image.bb
+++ b/packages/images/mythfront-image.bb
@@ -6,8 +6,8 @@ IMAGE_LINGUAS = ""
 
 MYTHFRONT_PACKAGES = "${MACHINE_TASK_PROVIDER} task-mythfront"
 
-export IPKG_INSTALL = "${MYTHFRONT_PACKAGES}"
+export PACKAGE_INSTALL = "${MYTHFRONT_PACKAGES}"
 DEPENDS = "${MYTHFRONT_PACKAGES}"
 
-inherit image_ipk
+inherit image
 LICENSE = "MIT"
diff --git a/packages/images/nslu2-linksys-image.bb b/packages/images/nslu2-linksys-image.bb
index 18329c913c..7cfad432a3 100644
--- a/packages/images/nslu2-linksys-image.bb
+++ b/packages/images/nslu2-linksys-image.bb
@@ -3,12 +3,12 @@ USE_DEVFS = "1"
 
 IMAGE_BASENAME = "nslu2-linksys"
 
-IPKG_INSTALL = "nslu2-linksys-ramdisk"
+PACKAGE_INSTALL = "nslu2-linksys-ramdisk"
 
-DEPENDS = "nslu2-linksys-kernel ${IPKG_INSTALL}"
+DEPENDS = "nslu2-linksys-kernel ${PACKAGE_INSTALL}"
 
 NSLU2_DEVICE_TABLE = "${@bb.which(bb.data.getVar('BBPATH', d, 1), 'files/device_table-nslu2.txt')}"
 EXTRA_IMAGECMD_ext2.gz = "-f ${NSLU2_DEVICE_TABLE}"
 
-inherit image_ipk
+inherit image
 LICENSE = "MIT"
diff --git a/packages/images/nylon-image-base.bb b/packages/images/nylon-image-base.bb
index c87e669532..120cff5822 100644
--- a/packages/images/nylon-image-base.bb
+++ b/packages/images/nylon-image-base.bb
@@ -1,4 +1,4 @@
-inherit image_ipk 
+inherit image
 inherit nylon-image
 LICENSE = "MIT"
 
@@ -21,7 +21,7 @@ RDEPENDS_append_mtx-2 = " modutils modutils-initscripts modutils-depmod modutils
 ## kernel 2.6 ##
 RDEPENDS_append_mtx-3 = " module-init-tools udev"
 
-export IPKG_INSTALL = "${RDEPENDS}" 
+export PACKAGE_INSTALL = "${RDEPENDS}"
 
 IMAGE_LINGUAS = ""
 
diff --git a/packages/images/nylon-image-mini.bb b/packages/images/nylon-image-mini.bb
index e3ac80720d..e6acd1f2dc 100644
--- a/packages/images/nylon-image-mini.bb
+++ b/packages/images/nylon-image-mini.bb
@@ -1,5 +1,5 @@
 export IMAGE_BASENAME = "nylon-mini"
- 
+
 NYLON_BASE = "base-files base-passwd busybox \
 	dropbear \
 	miniinit \
@@ -11,9 +11,9 @@ NYLON_BASE = "base-files base-passwd busybox \
 RDEPENDS = "kernel \
 	${NYLON_BASE} ${BOOTSTRAP_EXTRA_RDEPENDS}"
 
-export IPKG_INSTALL = "${RDEPENDS}" 
+export PACKAGE_INSTALL = "${RDEPENDS}"
 
 IMAGE_LINGUAS = ""
 
-inherit image_ipk
+inherit image
 LICENSE = "MIT"
diff --git a/packages/images/nylon-image-standard.bb b/packages/images/nylon-image-standard.bb
index 4bd7b2b99e..29e29cd1eb 100644
--- a/packages/images/nylon-image-standard.bb
+++ b/packages/images/nylon-image-standard.bb
@@ -23,6 +23,6 @@ NYLON_STANDARD = "\
 
 DEPENDS += "hostap-modules ntp \
 	${NYLON_STANDARD}"
-	
+
 RDEPENDS += "hostap-modules-pci ntpdate nano elvis-tiny \
 	${NYLON_STANDARD}"
diff --git a/packages/images/openprotium-image.bb b/packages/images/openprotium-image.bb
index 5efb401386..faec2664ca 100644
--- a/packages/images/openprotium-image.bb
+++ b/packages/images/openprotium-image.bb
@@ -18,7 +18,7 @@ USE_DEVFS = "1"
 # dev entries!)
 SLUGOS_DEVICE_TABLE = "${@bb.which(bb.data.getVar('BBPATH', d, 1), 'files/device_table-slugos.txt')}"
 
-# IMAGE_PREPROCESS_COMMAND is run before making the image.  
+# IMAGE_PREPROCESS_COMMAND is run before making the image.
 # We use this to do a few things:
 # . remove the uImage, which is in a separate part of the flash already.
 # . adjust the default run level (sysvinit is 5 by default, we like 3)
@@ -103,9 +103,9 @@ RDEPENDS = " \
 	${OPENPROTIUM_KERNEL} "
 #	${SLUGOS_EXTRA_RDEPENDS}"
 
-IPKG_INSTALL = "${RDEPENDS}"
+PACKAGE_INSTALL = "${RDEPENDS}"
 
-inherit image_ipk
+inherit image
 
 storcenter_pack_image() {
 	# find latest kernel
diff --git a/packages/images/opie-image.bb b/packages/images/opie-image.bb
index e22200abc5..3613ccafde 100644
--- a/packages/images/opie-image.bb
+++ b/packages/images/opie-image.bb
@@ -17,7 +17,7 @@ INSTALL_PACKAGES = "${MACHINE_TASK_PROVIDER} task-opie-base task-opie-base-apple
 INSTALL_PACKAGES_spitz_append = "task-opie-extra-games task-opie-extra-apps task-opie-extra-styles"
 INSTALL_PACKAGES_akita_append = "task-opie-extra-games task-opie-extra-apps task-opie-extra-styles"
 
-export IPKG_INSTALL = "${INSTALL_PACKAGES}"
+export PACKAGE_INSTALL = "${INSTALL_PACKAGES}"
 
 # merge feed-sources into ipkg.conf for opie-aqpkg as it can't handle feed-sources outside of ipkg.conf.
 merge_feeds() {
@@ -30,11 +30,11 @@ merge_feeds() {
                         echo "[${IMAGE_ROOTFS}/etc/ipkg.conf] is missing!"
                         exit 1
                 fi
-                
+
                 # comment out existing feed-sources inserted by ipkg-collateral
                 cat ${IMAGE_ROOTFS}/etc/ipkg.conf | sed "s/^src\ /#src\ /" > ${IMAGE_ROOTFS}/etc/ipkg.conf_
                 rm ${IMAGE_ROOTFS}/etc/ipkg.conf && mv ${IMAGE_ROOTFS}/etc/ipkg.conf_ ${IMAGE_ROOTFS}/etc/ipkg.conf
-                
+
                 # extract, then delete destinations
                 cat ${IMAGE_ROOTFS}/etc/ipkg.conf | egrep "^dest\ " > ${IMAGE_ROOTFS}/etc/ipkg.conf.dest
                 cat ${IMAGE_ROOTFS}/etc/ipkg.conf | egrep -v "^dest\ " > ${IMAGE_ROOTFS}/etc/ipkg.conf_
@@ -46,23 +46,23 @@ merge_feeds() {
                         # strip leading and trailing spaces/tabs, then split into name and uri
                         line_clean="`echo "$line"|sed 's/^[ \t]*//;s/[ \t]*$//'`"
                         feed_name="`echo "$line_clean" | sed -n 's/\(.*\)##\(.*\)/\1/p'`"
-                        feed_uri="`echo "$line_clean" | sed -n 's/\(.*\)##\(.*\)/\2/p'`"                
+                        feed_uri="`echo "$line_clean" | sed -n 's/\(.*\)##\(.*\)/\2/p'`"
 
                         # insert new feed-sources
                         echo "src/gz $feed_name $feed_uri" >> ${IMAGE_ROOTFS}/etc/ipkg.conf
                 done
-                
+
                 # remove temporary files and rebuild ipkg.conf
                 echo "" >> ${IMAGE_ROOTFS}/etc/ipkg.conf
                 cat ${IMAGE_ROOTFS}/etc/ipkg.conf.dest >> ${IMAGE_ROOTFS}/etc/ipkg.conf
                 rm ${IMAGE_ROOTFS}/etc/ipkg.conf.dest
-                
+
                 # remove -feed.conf files which are no longer needed
-                cd ${IMAGE_ROOTFS}/etc/ipkg/ && rm -- *-feed.conf                               
+                cd ${IMAGE_ROOTFS}/etc/ipkg/ && rm -- *-feed.conf
         fi
 }
 
 # merge feed-sources into ipkg.conf and create /etc/timestamp from build date
 IMAGE_PREPROCESS_COMMAND = "merge_feeds; create_etc_timestamp"
 
-inherit image_ipk
+inherit image
diff --git a/packages/images/opie-kdepim-image.bb b/packages/images/opie-kdepim-image.bb
index 7fdc22126b..477d924c2c 100644
--- a/packages/images/opie-kdepim-image.bb
+++ b/packages/images/opie-kdepim-image.bb
@@ -7,4 +7,4 @@ export IMAGE_BASENAME = "opie-kdepim-image"
 
 INSTALL_PACKAGES += "kopi kapi kammu kopi-applet"
 
-export IPKG_INSTALL = "${INSTALL_PACKAGES}"
+export PACKAGE_INSTALL = "${INSTALL_PACKAGES}"
diff --git a/packages/images/ossie-image.bb b/packages/images/ossie-image.bb
index 59f49cf06c..7f7cfbd2e0 100644
--- a/packages/images/ossie-image.bb
+++ b/packages/images/ossie-image.bb
@@ -1,6 +1,6 @@
 export IMAGE_BASENAME = "ossie-image"
 export IMAGE_LINGUAS = ""
-export IPKG_INSTALL = "${MACHINE_TASK_PROVIDER} task-ossie"
+export PACKAGE_INSTALL = "${MACHINE_TASK_PROVIDER} task-ossie"
 
 DEPENDS = "${MACHINE_TASK_PROVIDER} task-ossie"
 
@@ -14,6 +14,6 @@ FEED_URIS += " \
                 ${MACHINE}##${OSSIE_URI}/unstable/feed/${TARGET_ARCH}/machine/${MACHINE}"
 
 
-inherit image_ipk
+inherit image
 
 LICENSE = "MIT"
diff --git a/packages/images/pivotboot-image.bb b/packages/images/pivotboot-image.bb
index 50634e0353..78c3d7a6e9 100644
--- a/packages/images/pivotboot-image.bb
+++ b/packages/images/pivotboot-image.bb
@@ -1,11 +1,11 @@
 export IMAGE_BASENAME = "pivotboot-image"
 export IMAGE_LINGUAS = ""
-export IPKG_INSTALL = "task-pivotboot"
+export PACKAGE_INSTALL = "task-pivotboot"
 
 DEPENDS = "task-pivotboot"
 PR = "r1"
 
-inherit image_ipk
+inherit image
 
 FEED_URIS_append_familiar   = " x11##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/x11 \
                                opie##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/opie"
diff --git a/packages/images/sdl-image.bb b/packages/images/sdl-image.bb
index 0e8f8567f5..d6a0b4b881 100644
--- a/packages/images/sdl-image.bb
+++ b/packages/images/sdl-image.bb
@@ -4,6 +4,6 @@ export IMAGE_BASENAME = "sdl-image"
 
 DEPENDS = "${MACHINE_TASK_PROVIDER} task-sdl"
 
-export IPKG_INSTALL = "${MACHINE_TASK_PROVIDER} sdl-base"
+export PACKAGE_INSTALL = "${MACHINE_TASK_PROVIDER} sdl-base"
 
-inherit image_ipk
+inherit image
diff --git a/packages/images/sectest-gpe-image.bb b/packages/images/sectest-gpe-image.bb
index 9a068bf9db..fa16437662 100644
--- a/packages/images/sectest-gpe-image.bb
+++ b/packages/images/sectest-gpe-image.bb
@@ -21,9 +21,9 @@ GPE_EXTRA_INSTALL += "${GPE_EXTRA_INSTALL_${GUI_MACHINE_CLASS}}"
 XSERVER ?= "xserver-kdrive-fbdev"
 
 DEPENDS = "${MACHINE_TASK_PROVIDER} task-gpe"
-RDEPENDS = "${IPKG_INSTALL}"
+RDEPENDS = "${PACKAGE_INSTALL}"
 
-export IPKG_INSTALL = "\
+export PACKAGE_INSTALL = "\
     ${MACHINE_TASK_PROVIDER} \
     gpe-task-base \
     gpe-task-pim \
@@ -34,5 +34,5 @@ export IPKG_INSTALL = "\
 
 ROOTFS_POSTPROCESS_COMMAND += "zap_root_password; "
 
-inherit image_ipk
+inherit image
 
diff --git a/packages/images/slugos-image.bb b/packages/images/slugos-image.bb
index 0e034005e7..cf7d580928 100644
--- a/packages/images/slugos-image.bb
+++ b/packages/images/slugos-image.bb
@@ -91,9 +91,9 @@ RDEPENDS = "kernel ixp4xx-npe \
 	${SLUGOS_KERNEL} \
 	${SLUGOS_EXTRA_RDEPENDS}"
 
-IPKG_INSTALL = "${RDEPENDS}"
+PACKAGE_INSTALL = "${RDEPENDS}"
 
-inherit image_ipk
+inherit image
 
 python () {
     # Don't build slugos images unless the configuration is set up
diff --git a/packages/images/twin-image.bb b/packages/images/twin-image.bb
index b2f3ec4c43..a0e68c9bb8 100644
--- a/packages/images/twin-image.bb
+++ b/packages/images/twin-image.bb
@@ -7,12 +7,12 @@ DEPENDS = '${MACHINE_TASK_PROVIDER} \
 	  vim \
 	  mutt'
 
-export IPKG_INSTALL = '${MACHINE_TASK_PROVIDER} \
+export PACKAGE_INSTALL = '${MACHINE_TASK_PROVIDER} \
 		       twin \
 		       orpheus \
 		       nano \
 		       vim \
 		       mutt'
 
-inherit image_ipk
+inherit image
 LICENSE = "MIT"
diff --git a/packages/images/uml-image.bb b/packages/images/uml-image.bb
index 1983d03849..43afa3059d 100644
--- a/packages/images/uml-image.bb
+++ b/packages/images/uml-image.bb
@@ -6,7 +6,7 @@ OPIE_LIBS = "qte qpf-bitstream-vera libqpe-opie libopie2"
 OPIE_BASE = "opie-qcop opie-quicklauncher opie-taskbar"
 
 DEPENDS = "${MACHINE_TASK_PROVIDER}"
-export IPKG_INSTALL = "${DEPENDS}"
+export PACKAGE_INSTALL = "${DEPENDS}"
 
-inherit image_ipk
+inherit image
 LICENSE = "MIT"
diff --git a/packages/images/unslung-image.bb b/packages/images/unslung-image.bb
index ce946e7677..b56f007523 100644
--- a/packages/images/unslung-image.bb
+++ b/packages/images/unslung-image.bb
@@ -18,7 +18,7 @@ RDEPENDS  = "kernel update-modules unslung-rootfs \
 #	findutils \
 	${UNSLUNG_EXTRA_RDEPENDS}"
 
-IPKG_INSTALL = "kernel update-modules unslung-rootfs \
+PACKAGE_INSTALL = "kernel update-modules unslung-rootfs \
 	libc6-unslung slingbox ipkg \
 	libipkg \
 #	cpio \
@@ -27,8 +27,8 @@ IPKG_INSTALL = "kernel update-modules unslung-rootfs \
 	${UNSLUNG_EXTRA_INSTALL}"
 
 IMAGE_PREPROCESS_COMMAND += "unslung_clean_image; "
-		
-inherit image_ipk
+
+inherit image
 
 # Note that anything in this function must be repeatable without having to rebuild the rootfs
 unslung_clean_image () {
diff --git a/packages/images/xfce-image.bb b/packages/images/xfce-image.bb
index a681428aa6..42b0907b2b 100644
--- a/packages/images/xfce-image.bb
+++ b/packages/images/xfce-image.bb
@@ -8,8 +8,8 @@ X_RDEPENDS = "xserver-kdrive-fbdev"
 XFCE_DEPENDS = "${MACHINE_TASK_PROVIDER} task-xfce-base"
 XFCE_RDEPENDS = "${XFCE_DEPENDS}"
 
-export IPKG_INSTALL = "${X_RDEPENDS} ${XFCE_RDEPENDS}"
+export PACKAGE_INSTALL = "${X_RDEPENDS} ${XFCE_RDEPENDS}"
 DEPENDS = "${X_DEPENDS} ${XFCE_DEPENDS}"
 
-inherit image_ipk
+inherit image
 LICENSE = "MIT"
diff --git a/packages/images/xterminal-image.bb b/packages/images/xterminal-image.bb
index 174766edfa..3b4576e5bb 100644
--- a/packages/images/xterminal-image.bb
+++ b/packages/images/xterminal-image.bb
@@ -4,8 +4,8 @@ IMAGE_LINGUAS = ""
 
 XTERMINAL_PACKAGES = "${MACHINE_TASK_PROVIDER} task-xterminal"
 
-export IPKG_INSTALL = "${XTERMINAL_PACKAGES}"
+export PACKAGE_INSTALL = "${XTERMINAL_PACKAGES}"
 DEPENDS = "${XTERMINAL_PACKAGES}"
 
-inherit image_ipk
+inherit image
 LICENSE = "MIT"
diff --git a/packages/imposter/imposter_0.3.bb b/packages/imposter/imposter_0.3.bb
index 209dd93220..1e742190c8 100644
--- a/packages/imposter/imposter_0.3.bb
+++ b/packages/imposter/imposter_0.3.bb
@@ -4,4 +4,4 @@ LICENSE =	"GPLv2"
 SRC_URI	=	"${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.gz"
 DEPENDS =	"gtk+"
 
-inherit autotools pkgconfig  
+inherit autotools pkgconfig
diff --git a/packages/initscripts/initscripts-openprotium_1.0.bb b/packages/initscripts/initscripts-openprotium_1.0.bb
index 31f25ce230..83e89ef7a1 100644
--- a/packages/initscripts/initscripts-openprotium_1.0.bb
+++ b/packages/initscripts/initscripts-openprotium_1.0.bb
@@ -57,7 +57,7 @@ do_install_append() {
 #	rm	${D}${sysconfdir}/rc6.d/S30urandom
 	rm	${D}${sysconfdir}/rc6.d/S31umountnfs.sh
 	rm	${D}${sysconfdir}/rc6.d/S40umountfs
-	rm      ${D}${sysconfdir}/rcS.d/S30ramdisk 
+	rm      ${D}${sysconfdir}/rcS.d/S30ramdisk
 	rm	${D}${sysconfdir}/rc6.d/S90reboot
 	rm	${D}${sysconfdir}/rc0.d/S20sendsigs
 #	rm	${D}${sysconfdir}/rc0.d/S30urandom
@@ -134,7 +134,7 @@ do_install_append() {
 	# urandom is currently disabled from S 55 (and won't work with tmpfs /var)
 
 	# ipkg-cl configure runs at S 98
-	update-rc.d -r ${D} finish		start 99 S . 
+	update-rc.d -r ${D} finish		start 99 S .
 
 	#
 	# User (2-5) links - UNCHANGED
@@ -142,7 +142,7 @@ do_install_append() {
 	update-rc.d -r ${D} rmnologin		start 99 2 3 4 5 .
 	update-rc.d -r ${D} flashclean		start 99 5 .
 
-	# 
+	#
 	# Shutdown (0,6) links - !!!CHANGED!!!
 	#
 	# The problem here is that netbase installs K40networking but portmap
diff --git a/packages/initscripts/initscripts-slugos_1.0.bb b/packages/initscripts/initscripts-slugos_1.0.bb
index b73eed2b20..ed5f37f348 100644
--- a/packages/initscripts/initscripts-slugos_1.0.bb
+++ b/packages/initscripts/initscripts-slugos_1.0.bb
@@ -43,7 +43,7 @@ do_install_append() {
 #	rm	${D}${sysconfdir}/rc6.d/S30urandom
 	rm	${D}${sysconfdir}/rc6.d/S31umountnfs.sh
 	rm	${D}${sysconfdir}/rc6.d/S40umountfs
-	rm      ${D}${sysconfdir}/rcS.d/S30ramdisk 
+	rm      ${D}${sysconfdir}/rcS.d/S30ramdisk
 	rm	${D}${sysconfdir}/rc6.d/S90reboot
 	rm	${D}${sysconfdir}/rc0.d/S20sendsigs
 #	rm	${D}${sysconfdir}/rc0.d/S30urandom
@@ -120,14 +120,14 @@ do_install_append() {
 	# urandom is currently disabled from S 55 (and won't work with tmpfs /var)
 
 	# ipkg-cl configure runs at S 98
-	update-rc.d -r ${D} finish		start 99 S . 
+	update-rc.d -r ${D} finish		start 99 S .
 
 	#
 	# User (2-5) links - UNCHANGED
 	# rmnologin is the only thing added to user levels
 	update-rc.d -r ${D} rmnologin		start 99 2 3 4 5 .
 
-	# 
+	#
 	# Shutdown (0,6) links - !!!CHANGED!!!
 	#
 	# The problem here is that netbase installs K40networking but portmap
diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb
index 39662eb31a..838c479cb1 100644
--- a/packages/initscripts/initscripts_1.0.bb
+++ b/packages/initscripts/initscripts_1.0.bb
@@ -82,7 +82,7 @@ do_install () {
 	install -m 0755    ${WORKDIR}/devpts		${D}${sysconfdir}/default
 	install -m 0755    ${WORKDIR}/sysfs.sh		${D}${sysconfdir}/init.d
 	install -m 0755    ${WORKDIR}/populate-volatile.sh ${D}${sysconfdir}/init.d
-	install -m 0755    ${WORKDIR}/save-rtc.sh	${D}${sysconfdir}/init.d	
+	install -m 0755    ${WORKDIR}/save-rtc.sh	${D}${sysconfdir}/init.d
 	install -m 0644    ${WORKDIR}/volatiles		${D}${sysconfdir}/default/volatiles/00_core
 	if [ "${TARGET_ARCH}" = "arm" ]; then
 		install -m 0755 ${WORKDIR}/alignment.sh	${D}${sysconfdir}/init.d
@@ -112,7 +112,7 @@ do_install () {
 	ln -sf		../init.d/umountnfs.sh	${D}${sysconfdir}/rc6.d/S31umountnfs.sh
 	ln -sf		../init.d/umountfs	${D}${sysconfdir}/rc6.d/S40umountfs
 	# udev will run at S55 if installed
-	ln -sf          ../init.d/ramdisk       ${D}${sysconfdir}/rcS.d/S30ramdisk 
+	ln -sf          ../init.d/ramdisk       ${D}${sysconfdir}/rcS.d/S30ramdisk
 	ln -sf		../init.d/reboot	${D}${sysconfdir}/rc6.d/S90reboot
 	ln -sf		../init.d/sendsigs	${D}${sysconfdir}/rc0.d/S20sendsigs
 #	ln -sf		../init.d/urandom	${D}${sysconfdir}/rc0.d/S30urandom
@@ -121,7 +121,7 @@ do_install () {
 	# udev will run at S55 if installed
 	ln -sf		../init.d/halt		${D}${sysconfdir}/rc0.d/S90halt
 	ln -sf		../init.d/save-rtc.sh	${D}${sysconfdir}/rc0.d/S25save-rtc.sh
-	ln -sf		../init.d/save-rtc.sh	${D}${sysconfdir}/rc6.d/S25save-rtc.sh		
+	ln -sf		../init.d/save-rtc.sh	${D}${sysconfdir}/rc6.d/S25save-rtc.sh
 	ln -sf		../init.d/banner	${D}${sysconfdir}/rcS.d/S02banner
 	ln -sf		../init.d/checkroot.sh	${D}${sysconfdir}/rcS.d/S10checkroot.sh
 #	ln -sf		../init.d/checkfs.sh	${D}${sysconfdir}/rcS.d/S30checkfs.sh
diff --git a/packages/iozone3/iozone3_263.bb b/packages/iozone3/iozone3_263.bb
index 9389386afc..c32e1daf4e 100644
--- a/packages/iozone3/iozone3_263.bb
+++ b/packages/iozone3/iozone3_263.bb
@@ -40,10 +40,10 @@ FILES_${PN} += "${datadir}/doc/${PN}/copyright.txt"
 # LICENSE:
 #
 #  Copyright 1991, 1992, 1994, 1998, 1999, 2002   William D. Norcott
-# 
-#  License to freely use and distribute this software is hereby granted 
-#  by the author, subject to the condition that this copyright notice 
-#  remains intact.  The author retains the exclusive right to publish 
+#
+#  License to freely use and distribute this software is hereby granted
+#  by the author, subject to the condition that this copyright notice
+#  remains intact.  The author retains the exclusive right to publish
 #  derivative works based on this work, including, but not limited to
 #  revised versions of this work.
 #
@@ -55,25 +55,25 @@ FILES_${PN} += "${datadir}/doc/${PN}/copyright.txt"
 # ========================================================================
 #
 # Marcin,
-# 
+#
 #         Re-distribution is permitted as long as the copyright is
 #     maintained and the source code is not changed. I do not
 #     see a problem with your mods to enable fileop for Linux-arm,
 #     as these mods have been returned to the Iozone folks,
 #     and they have been accepted for inclusion in the next
 #     release :-)
-# 
+#
 # Thank you for your contribution,
 # Don Capps
-# 
-# ----- Original Message ----- 
+#
+# ----- Original Message -----
 # From: "Marcin Juszkiewicz" <firma@hrw.one.pl>
-# To: "Don Capps" <don.capps2@verizon.net>; "William D. Norcott" 
+# To: "Don Capps" <don.capps2@verizon.net>; "William D. Norcott"
 # <wnorcott@us.oracle.com>
 # Sent: Sunday, October 29, 2006 4:55 PM
 # Subject: iozone3 263 patch for arm and License question
-# 
-# 
+#
+#
 # > Morning
 # >
 # > I want to include iozone3 in OpenEmbedded [1] metadata to give it for
@@ -95,6 +95,6 @@ FILES_${PN} += "${datadir}/doc/${PN}/copyright.txt"
 # > 1. http://www.openembedded.org/
 # >
 # > Regards
-# > -- 
+# > --
 # > JID: hrw-jabber.org
 # > OpenEmbedded developer/consultant
diff --git a/packages/ipkg/ipkg_0.99.163.bb b/packages/ipkg/ipkg_0.99.163.bb
index 5d8a834b20..02509aa962 100644
--- a/packages/ipkg/ipkg_0.99.163.bb
+++ b/packages/ipkg/ipkg_0.99.163.bb
@@ -10,9 +10,9 @@ SRC_URI = "http://www.handhelds.org/pub/packages/ipkg/ipkg-${PV}.tar.gz \
 do_stage() {
 	oe_libinstall -so libipkg ${STAGING_LIBDIR}
 	install -d ${STAGING_INCDIR}/libipkg/
-	for f in *.h  
-	do   
-		install -m 0644 $f ${STAGING_INCDIR}/libipkg/   
+	for f in *.h
+	do
+		install -m 0644 $f ${STAGING_INCDIR}/libipkg/
 	done
 }
 
diff --git a/packages/iproute2/iproute2_2.6.8.bb b/packages/iproute2/iproute2_2.6.8.bb
index d904ea5a97..339471d62d 100644
--- a/packages/iproute2/iproute2_2.6.8.bb
+++ b/packages/iproute2/iproute2_2.6.8.bb
@@ -6,7 +6,7 @@ SRC_URI="http://developer.osdl.org/dev/iproute2/download/iproute2-2.6.8-ss040730
 	file://iproute2-2.6.8_no_strip.diff;patch=1;pnum=0"
 
 PR="r1"
-	
+
 EXTRA_OEMAKE = "CC='${CC}' KERNEL_INCLUDE=${STAGING_KERNEL_DIR}/include DOCDIR=${docdir}/iproute2 SUBDIRS='lib tc ip' SBINDIR=/sbin"
 
 do_install () {
diff --git a/packages/irda-utils/irdadump_0.9.16.bb b/packages/irda-utils/irdadump_0.9.16.bb
index 98d28b60a3..5c64b2dd96 100644
--- a/packages/irda-utils/irdadump_0.9.16.bb
+++ b/packages/irda-utils/irdadump_0.9.16.bb
@@ -10,7 +10,7 @@ S="${WORKDIR}/irda-utils-${PV}/irdadump"
 EXTRA_CFLAGS += "-I${STAGING_INCDIR}/glib-1.2/"
 EXTRA_LDFLAGS += "-lglib"
 
-inherit autotools 
+inherit autotools
 
 do_compile() {
     oe_runmake CFLAGS="${CFLAGS} ${EXTRA_CFLAGS}" LDFLAGS="${LDFLAGS} ${EXTRA_LDFLAGS}"
diff --git a/packages/irssi/irssi_0.8.10.bb b/packages/irssi/irssi_0.8.10.bb
index 729c756e47..2c8b226d0e 100644
--- a/packages/irssi/irssi_0.8.10.bb
+++ b/packages/irssi/irssi_0.8.10.bb
@@ -33,18 +33,18 @@ do_configure () {
 	# create help files
 	echo "Creating help files..."
 	perl syntax.pl
-	
+
 	files=`echo docs/help/in/*.in|sed -e 's,docs/help/in/Makefile.in ,,' -e 's,docs/help/in/,!,g' -e 's/\.in /.in ?/g'`
 	cat docs/help/in/Makefile.am.gen|sed "s/@HELPFILES@/$files/g"|sed 's/?/\\?/g'|tr '!?' '\t\n' > docs/help/in/Makefile.am
-	
+
 	files=`echo $files|sed 's/\.in//g'`
 	cat docs/help/Makefile.am.gen|sed "s/@HELPFILES@/$files/g"|sed 's/?/\\?/g'|tr '!?' '\t\n' > docs/help/Makefile.am
-	
+
 	# .HTML -> .txt with lynx
 	# echo "Documentation: html -> txt..."
 	# lynx -dump -nolist docs/faq.html|perl -pe 's/^ *//; if ($_ eq "\n" && $state eq "Q") { $_ = ""; } elsif (/^([QA]):/) { $state = $1 } elsif ($_ ne "\n") { $_ = "   $_"; };' > docs/faq.txt
 	> docs/faq.txt
-	
+
 	autotools_do_configure
 }
 
diff --git a/packages/irssi/irssi_svn.bb b/packages/irssi/irssi_svn.bb
index 1fe2619ca1..38f4d3fb26 100644
--- a/packages/irssi/irssi_svn.bb
+++ b/packages/irssi/irssi_svn.bb
@@ -35,18 +35,18 @@ do_configure () {
 	# create help files
 	echo "Creating help files..."
 	perl syntax.pl
-	
+
 	files=`echo docs/help/in/*.in|sed -e 's,docs/help/in/Makefile.in ,,' -e 's,docs/help/in/,!,g' -e 's/\.in /.in ?/g'`
 	cat docs/help/in/Makefile.am.gen|sed "s/@HELPFILES@/$files/g"|sed 's/?/\\?/g'|tr '!?' '\t\n' > docs/help/in/Makefile.am
-	
+
 	files=`echo $files|sed 's/\.in//g'`
 	cat docs/help/Makefile.am.gen|sed "s/@HELPFILES@/$files/g"|sed 's/?/\\?/g'|tr '!?' '\t\n' > docs/help/Makefile.am
-	
+
 	# .HTML -> .txt with lynx
 	# echo "Documentation: html -> txt..."
 	# lynx -dump -nolist docs/faq.html|perl -pe 's/^ *//; if ($_ eq "\n" && $state eq "Q") { $_ = ""; } elsif (/^([QA]):/) { $state = $1 } elsif ($_ ne "\n") { $_ = "   $_"; };' > docs/faq.txt
 	> docs/faq.txt
-	
+
 	autotools_do_configure
 }
 
diff --git a/packages/jack/jack_0.99.0.bb b/packages/jack/jack_0.99.0.bb
index 12d5bff0e0..a4988fdef0 100644
--- a/packages/jack/jack_0.99.0.bb
+++ b/packages/jack/jack_0.99.0.bb
@@ -4,7 +4,7 @@ device, as well as allowing them to share audio between \
 themselves."
 SECTION = "libs/multimedia"
 PRIORITY = "optional"
-LICENSE = "GPL LGPL" 
+LICENSE = "GPL LGPL"
 PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/jackit/jack-audio-connection-kit-${PV}.tar.gz"
diff --git a/packages/jhead/jhead_2.6.0.bb b/packages/jhead/jhead_2.6.0.bb
index 126e92c909..d37dc0c733 100644
--- a/packages/jhead/jhead_2.6.0.bb
+++ b/packages/jhead/jhead_2.6.0.bb
@@ -6,7 +6,7 @@ SRC_URI = "http://www.sentex.net/~mwandel/jhead/jhead-2.6.tar.gz \
 
 S = "${WORKDIR}/jhead-2.6"
 
-inherit autotools 
+inherit autotools
 
 do_configure() {
 	:
diff --git a/packages/jpeg/jpeg_6b.bb b/packages/jpeg/jpeg_6b.bb
index 978ae10be5..d725284694 100644
--- a/packages/jpeg/jpeg_6b.bb
+++ b/packages/jpeg/jpeg_6b.bb
@@ -13,7 +13,7 @@ SRC_URI = "http://www.ijg.org/files/jpegsrc.v${PV}.tar.gz \
 	   file://paths.patch;patch=1"
 S = "${WORKDIR}/jpeg-${PV}"
 
-inherit autotools 
+inherit autotools
 
 EXTRA_OECONF="--enable-static --enable-shared"
 EXTRA_OEMAKE='"LIBTOOL=${STAGING_BINDIR_NATIVE}/${HOST_SYS}-libtool"'
diff --git a/packages/kbdd/kbdd_svn.bb b/packages/kbdd/kbdd_svn.bb
index 5a1d8d5858..b9468593da 100644
--- a/packages/kbdd/kbdd_svn.bb
+++ b/packages/kbdd/kbdd_svn.bb
@@ -13,7 +13,7 @@ SRC_URI = "svn://projects.linuxtogo.org/svn/kbdd;module=trunk;proto=svn \
            file://kbdd-modules"
 S = "${WORKDIR}/trunk"
 
-inherit update-rc.d 
+inherit update-rc.d
 
 INITSCRIPT_NAME = "kbdd"
 INITSCRIPT_PARAMS = "defaults"
diff --git a/packages/keylaunch/keylaunch_2.0.10.bb b/packages/keylaunch/keylaunch_2.0.10.bb
index e5f0b35b22..8b6d2b5aa2 100644
--- a/packages/keylaunch/keylaunch_2.0.10.bb
+++ b/packages/keylaunch/keylaunch_2.0.10.bb
@@ -28,10 +28,10 @@ do_install_append() {
 
 export CVSBUILD="no"
 
-pkg_postinst_${PN}() { 
+pkg_postinst_${PN}() {
 	update-alternatives --install /etc/keylaunchrc keylaunchrc /etc/keylaunchrc.matchbox 10
 }
 
-pkg_postrm_${PN}() {   
+pkg_postrm_${PN}() {
        update-alternatives --remove keylaunchrc /etc/keylaunchrc.matchbox
 }
diff --git a/packages/keymap-locales/keymap-locales.bb b/packages/keymap-locales/keymap-locales.bb
index c219ed7641..8303672240 100644
--- a/packages/keymap-locales/keymap-locales.bb
+++ b/packages/keymap-locales/keymap-locales.bb
@@ -20,6 +20,6 @@ FILES_keymap-extension-fi = "/etc/*-fi.map"
 
 do_install() {
 	install -d ${D}/${sysconfdir}
-	
+
 	install -m 0644 ${WORKDIR}/*.map ${D}/${sysconfdir}
 }
diff --git a/packages/keyring/keyring_0.6.8.bb b/packages/keyring/keyring_0.6.8.bb
index 0756ca80e6..02403bc2e1 100644
--- a/packages/keyring/keyring_0.6.8.bb
+++ b/packages/keyring/keyring_0.6.8.bb
@@ -15,7 +15,7 @@ QPEDIR = "${OPIEDIR}"
 do_install() {
         install -d ${D}${palmtopdir}/bin \
         	   ${D}${palmtopdir}/apps/Applications \
-        	   ${D}${palmtopdir}/pics/keyring 
+        	   ${D}${palmtopdir}/pics/keyring
         install -m 0755 keyring ${D}${palmtopdir}/bin/
         install -m 0644 keyring.desktop \
 			${D}${palmtopdir}/apps/Applications/
diff --git a/packages/kismet/kismet_2005-04-R1.bb b/packages/kismet/kismet_2005-04-R1.bb
index 752789a0ba..2b29af51df 100644
--- a/packages/kismet/kismet_2005-04-R1.bb
+++ b/packages/kismet/kismet_2005-04-R1.bb
@@ -8,7 +8,7 @@ SRC_URI = "http://www.kismetwireless.net/code/kismet-2005-04-R1.tar.gz \
 	file://no-strip.diff;patch=1;pnum=0 \
 	file://no-chmod.diff;patch=1;pnum=0 \
 	file://glibc3.3.2-getopt-throw.diff;patch=1;pnum=0"
-	
+
 
 EXTRA_OECONF = "--with-pcap=linux --disable-setuid --with-linuxheaders=${STAGING_KERNEL_DIR}/include"
 
diff --git a/packages/kismet/kismet_2005-08-R1.bb b/packages/kismet/kismet_2005-08-R1.bb
index 9c8c444991..c5e58b6edb 100644
--- a/packages/kismet/kismet_2005-08-R1.bb
+++ b/packages/kismet/kismet_2005-08-R1.bb
@@ -8,7 +8,7 @@ SRC_URI = "http://www.kismetwireless.net/code/kismet-2005-08-R1.tar.gz \
 	file://no-strip.diff;patch=1;pnum=0 \
 	file://no-chmod.diff;patch=1;pnum=0 \
 	file://glibc3.3.2-getopt-throw.diff;patch=1;pnum=0"
-	
+
 
 EXTRA_OECONF = "--with-pcap=linux --disable-setuid --with-linuxheaders=${STAGING_KERNEL_DIR}/include"
 
diff --git a/packages/kismet/kismet_2006-04-R1.bb b/packages/kismet/kismet_2006-04-R1.bb
index ac32560286..aa51f2afa9 100644
--- a/packages/kismet/kismet_2006-04-R1.bb
+++ b/packages/kismet/kismet_2006-04-R1.bb
@@ -6,7 +6,7 @@ DEPENDS = "expat gmp"
 
 SRC_URI = "http://www.kismetwireless.net/code/kismet-2006-04-R1.tar.gz \
            file://no-chmod.patch;patch=1"
-	
+
 
 EXTRA_OECONF = "--with-pcap=linux --disable-setuid --with-linuxheaders=${STAGING_KERNEL_DIR}/include"
 
diff --git a/packages/klibc/klibc.inc b/packages/klibc/klibc.inc
index 29ca1685c1..4e86824eac 100644
--- a/packages/klibc/klibc.inc
+++ b/packages/klibc/klibc.inc
@@ -66,6 +66,8 @@ do_stage() {
 	# use the staged libraries and include files.
 	sed -i -e 's@^\$prefix = .*$@\$prefix = "${STAGING_KLIBC_DIR}/lib/klibc";@' \
 		'${STAGING_BINDIR}/${TARGET_PREFIX}klcc'
+        # Perhaps other binaries need to be moved to cross?
+	mv '${STAGING_BINDIR}/${TARGET_PREFIX}klcc' '${STAGING_BINDIR_CROSS}'
 }
 
 do_install() {
diff --git a/packages/konqueror/konqueror-embedded_20030705.bb b/packages/konqueror/konqueror-embedded_20030705.bb
index 4cc1f8d4fe..e73a0e206d 100644
--- a/packages/konqueror/konqueror-embedded_20030705.bb
+++ b/packages/konqueror/konqueror-embedded_20030705.bb
@@ -8,7 +8,7 @@ PR = "r5"
 
 # 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 
+# 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://devel-home.kde.org/~hausmann/snapshots/Attic/konqueror-embedded-snapshot-${PV}.tar.gz \
@@ -50,8 +50,8 @@ do_compile_prepend() {
 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 0b7e0aff8b..159b6dd625 100644
--- a/packages/konqueror/konqueror-embedded_20060404.bb
+++ b/packages/konqueror/konqueror-embedded_20060404.bb
@@ -71,7 +71,7 @@ do_configure_prepend() {
 	then
 	    ln -s ../kdelibs/admin admin
 	fi
-	make -f Makefile.cvs 
+	make -f Makefile.cvs
 }
 
 do_compile_prepend() {
diff --git a/packages/kphonepi/kphonepi_1.0.0.bb b/packages/kphonepi/kphonepi_1.0.0.bb
index 6eb3249821..1f8a5d8196 100644
--- a/packages/kphonepi/kphonepi_1.0.0.bb
+++ b/packages/kphonepi/kphonepi_1.0.0.bb
@@ -21,7 +21,7 @@ do_configure_prepend() {
 do_install() {
     install -d ${D}${palmtopdir}/bin \
                ${D}${palmtopdir}/apps/Applications \
-               ${D}${palmtopdir}/pics/kphone/ 
+               ${D}${palmtopdir}/pics/kphone/
 
     install -m 0644 ${S}/bin/kdepim/kphone/*.png ${D}${palmtopdir}/pics/kphone/
     install -m 0644 ${S}/kphone.desktop ${D}${palmtopdir}/apps/Applications/
diff --git a/packages/liba52/liba52_0.7.4.bb b/packages/liba52/liba52_0.7.4.bb
index f6894ab4d4..3093f57a6a 100644
--- a/packages/liba52/liba52_0.7.4.bb
+++ b/packages/liba52/liba52_0.7.4.bb
@@ -14,7 +14,7 @@ EXTRA_OECONF = " --enable-shared "
 
 PACKAGES = "${PN} ${PN}-dev a52dec a52dec-doc"
 
-FILES_${PN} = " ${libdir}/liba52.so.0 ${libdir}/liba52.so.0.0.0 " 
+FILES_${PN} = " ${libdir}/liba52.so.0 ${libdir}/liba52.so.0.0.0 "
 FILES_${PN}-dev = " ${includedir}/a52dec/*.h ${libdir}/liba52.so ${libdir}/liba52.la ${libdir}/liba52.a "
 FILES_a52dec = " ${bindir}/* "
 FILES_a52dec-doc = " ${mandir}/man1/* "
diff --git a/packages/libaio/libaio-oracle_0.3.0.bb b/packages/libaio/libaio-oracle_0.3.0.bb
index d5a6c300fd..04cacae4fd 100644
--- a/packages/libaio/libaio-oracle_0.3.0.bb
+++ b/packages/libaio/libaio-oracle_0.3.0.bb
@@ -31,4 +31,4 @@ do_stage() {
 	rm -f ${STAGE_TEMP}/usr/lib/*.la
 	oe_libinstall -a -so -C ${STAGE_TEMP}/usr/lib libaio-oracle ${STAGING_LIBDIR}
 }
-							
+
diff --git a/packages/libaio/libaio_0.3.103.bb b/packages/libaio/libaio_0.3.103.bb
index 15991b3212..b0bc73617e 100644
--- a/packages/libaio/libaio_0.3.103.bb
+++ b/packages/libaio/libaio_0.3.103.bb
@@ -18,7 +18,7 @@ inherit kernel-arch
 DEPENDS_append = " rpm2cpio-native"
 
 do_unpack() {
-	
+
 	if ! test -f libaio-${PV}.tar.gz ; then
 		rpm2cpio.pl ${DL_DIR}/${P}-3.src.rpm | cpio -i --make-directories
 		tar xzvf libaio-${PV}.tar.gz
@@ -26,12 +26,12 @@ do_unpack() {
 }
 
 do_stage () {
-	#make install prefix='${STAGING_DIR}/${TARGET_SYS}' 
+	#make install prefix='${STAGING_DIR}/${TARGET_SYS}'
         install -D -m 644 src/libaio.h ${STAGING_DIR}/${TARGET_SYS}/include/libaio.h
 	oe_libinstall -so -C src libaio ${STAGING_LIBDIR}
-					
+
 }
 
 do_install () {
-	make install prefix='${D}/usr' 
+	make install prefix='${D}/usr'
 }
diff --git a/packages/libassuan/libassuan_0.6.7.bb b/packages/libassuan/libassuan_0.6.7.bb
index 5682022acc..f423502043 100644
--- a/packages/libassuan/libassuan_0.6.7.bb
+++ b/packages/libassuan/libassuan_0.6.7.bb
@@ -7,7 +7,7 @@ inherit autotools binconfig
 
 do_stage() {
 	autotools_stage_includes
-	
+
 	install -d ${STAGING_LIBDIR}
 	oe_libinstall -C src -a libassuan ${STAGING_LIBDIR}
 
diff --git a/packages/libassuan/libassuan_0.6.9.bb b/packages/libassuan/libassuan_0.6.9.bb
index 6080600073..d20d8371bf 100644
--- a/packages/libassuan/libassuan_0.6.9.bb
+++ b/packages/libassuan/libassuan_0.6.9.bb
@@ -6,7 +6,7 @@ inherit autotools binconfig
 
 do_stage() {
 	autotools_stage_includes
-	
+
 	install -d ${STAGING_LIBDIR}
 	oe_libinstall -C src -a libassuan ${STAGING_LIBDIR}
 
diff --git a/packages/libchm/chmlib_0.38.bb b/packages/libchm/chmlib_0.38.bb
index ed55bd3306..2baf7eaac9 100644
--- a/packages/libchm/chmlib_0.38.bb
+++ b/packages/libchm/chmlib_0.38.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "CHMLIB is a library for dealing with Microsoft ITSS/CHM format files." 
+DESCRIPTION = "CHMLIB is a library for dealing with Microsoft ITSS/CHM format files."
 LICENSE = "GPLv2"
 HOMEPAGE = "http://66.93.236.84/~jedwin/projects/chmlib/"
 
diff --git a/packages/libdbi/libdbi-drivers_0.7.1.bb b/packages/libdbi/libdbi-drivers_0.7.1.bb
index 2d1d057be8..d36643dc22 100644
--- a/packages/libdbi/libdbi-drivers_0.7.1.bb
+++ b/packages/libdbi/libdbi-drivers_0.7.1.bb
@@ -26,7 +26,7 @@ FILES_libdbd-sqlite = "/usr/lib/dbd/libsqlite.so \
                        /usr/lib/dbd/libsqlite.a"
 
 DESCRIPTION_libdbd-sqlite = "SQLite database driver for libdbi"
-        
+
 do_configure_old () {
   ./configure \
 		    --build=${BUILD_SYS} \
@@ -37,4 +37,4 @@ do_configure_old () {
 		    --with-sqlite-libdir=${STAGING_LIBDIR} \
 		    --with-sqlite-incdir=${STAGING_INCDIR}
 }
-        
\ No newline at end of file
+
diff --git a/packages/libfakekey/libfakekey_svn.bb b/packages/libfakekey/libfakekey_svn.bb
index 0a10054eb3..74947ab0ff 100644
--- a/packages/libfakekey/libfakekey_svn.bb
+++ b/packages/libfakekey/libfakekey_svn.bb
@@ -12,8 +12,8 @@ S = "${WORKDIR}/${PN}"
 inherit autotools pkgconfig gettext
 
 do_stage () {
-	   install -d ${STAGING_INCDIR}/fakekey	
+	   install -d ${STAGING_INCDIR}/fakekey
            install -m 0644 ${S}/fakekey/fakekey.h ${STAGING_INCDIR}/fakekey
-	    oe_libinstall -so -C src libfakekey ${STAGING_LIBDIR}		
+	    oe_libinstall -so -C src libfakekey ${STAGING_LIBDIR}
 }
 
diff --git a/packages/libflv/libflv_0.2.bb b/packages/libflv/libflv_0.2.bb
index e8e64f0d0b..a9456f2188 100644
--- a/packages/libflv/libflv_0.2.bb
+++ b/packages/libflv/libflv_0.2.bb
@@ -10,7 +10,7 @@ S = "${WORKDIR}/${PN}/src"
 CFLAGS += " -L${STAGING_LIBDIR} "
 
 do_compile() {
-        oe_runmake 
+        oe_runmake
 }
 
 do_install() {
diff --git a/packages/libgc/libgc_6.5.bb b/packages/libgc/libgc_6.5.bb
index 143b62dcec..e99a38f396 100644
--- a/packages/libgc/libgc_6.5.bb
+++ b/packages/libgc/libgc_6.5.bb
@@ -4,7 +4,7 @@ HOMEPAGE	= "http://www.hpl.hp.com/personal/Hans_Boehm/gc/"
 
 DEPENDS		= "sed-native"
 SRC_URI 	= "http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc6.5.tar.gz"
-S 		= "${WORKDIR}/gc6.5" 
+S 		= "${WORKDIR}/gc6.5"
 FILES_${PN}-doc += "/usr/share/gc/"
 
 inherit autotools
diff --git a/packages/libgc/libgc_6.7.bb b/packages/libgc/libgc_6.7.bb
index 243bff39e7..1182f93191 100644
--- a/packages/libgc/libgc_6.7.bb
+++ b/packages/libgc/libgc_6.7.bb
@@ -4,7 +4,7 @@ HOMEPAGE	= "http://www.hpl.hp.com/personal/Hans_Boehm/gc/"
 
 DEPENDS		= "sed-native"
 SRC_URI 	= "http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc6.7.tar.gz"
-S 		= "${WORKDIR}/gc6.7" 
+S 		= "${WORKDIR}/gc6.7"
 FILES_${PN}-doc += "/usr/share/gc/"
 
 inherit autotools
diff --git a/packages/libglade/libglade_2.0.1.bb b/packages/libglade/libglade_2.0.1.bb
index a923f38c30..535396c5a0 100644
--- a/packages/libglade/libglade_2.0.1.bb
+++ b/packages/libglade/libglade_2.0.1.bb
@@ -8,7 +8,7 @@ SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/libglade/2.0/libglade-${PV}.tar
            file://glade-cruft.patch;patch=1;pnum=0 \
            file://gtk-2.0.m4"
 
-inherit autotools pkgconfig 
+inherit autotools pkgconfig
 
 headers = "glade-build.h glade-init.h glade-parser.h glade-xml.h glade.h"
 
diff --git a/packages/libgmime/libgmime_2.1.7.bb b/packages/libgmime/libgmime_2.1.7.bb
index 64ce486dd6..39a682eb73 100644
--- a/packages/libgmime/libgmime_2.1.7.bb
+++ b/packages/libgmime/libgmime_2.1.7.bb
@@ -10,7 +10,7 @@ PR = "r1"
 SRC_URI = "http://spruce.sourceforge.net/gmime/sources/v2.1/gmime-${PV}.tar.gz \
 	   file://skip-iconv-detect.patch;patch=1 \
 	   file://configure-ldflags-cross.patch;patch=1"
-	   
+
 S = "${WORKDIR}/gmime-${PV}"
 
 PACKAGES += " ${PN}-bin"
diff --git a/packages/libgpelaunch/libgpelaunch_0.14.bb b/packages/libgpelaunch/libgpelaunch_0.14.bb
index e6d82c1ee0..24ee20a1c6 100644
--- a/packages/libgpelaunch/libgpelaunch_0.14.bb
+++ b/packages/libgpelaunch/libgpelaunch_0.14.bb
@@ -9,7 +9,7 @@ inherit autotools pkgconfig
 SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.bz2"
 
 
-FILES_${PN}-dbg += "/usr/libexec/libgpelaunch/.debug" 
+FILES_${PN}-dbg += "/usr/libexec/libgpelaunch/.debug"
 
 do_stage() {
 	autotools_stage_all
diff --git a/packages/libgpeplugin/libgpeplugin_cvs.bb b/packages/libgpeplugin/libgpeplugin_cvs.bb
index 0fa3b84cc6..e00a1142c6 100644
--- a/packages/libgpeplugin/libgpeplugin_cvs.bb
+++ b/packages/libgpeplugin/libgpeplugin_cvs.bb
@@ -5,7 +5,7 @@ DEPENDS = "gtk+ libgpewidget"
 PV = "0.0+cvs${SRCDATE}"
 PR = "r0"
 
-#put examples in a seperate package 
+#put examples in a seperate package
 PACKAGES += "${PN}-examples"
 FILES_${PN}-examples = "${bindir}/* ${libexecdir}/*"
 FILES_${PN} = "${libdir}/*.so.*"
diff --git a/packages/libgpewidget/libgpewidget_0.114.bb b/packages/libgpewidget/libgpewidget_0.114.bb
index b062efb51b..059ec61fc1 100644
--- a/packages/libgpewidget/libgpewidget_0.114.bb
+++ b/packages/libgpewidget/libgpewidget_0.114.bb
@@ -15,7 +15,7 @@ FILES_libgpewidget-bin = "${bindir}/*"
 
 EXTRA_OECONF = "--enable-cairo"
 
-LDFLAGS += " -L${STAGING_LIBDIR}" 
+LDFLAGS += " -L${STAGING_LIBDIR}"
 
 do_stage () {
 	autotools_stage_all
diff --git a/packages/libid3tag/libid3tag_0.15.0b.bb b/packages/libid3tag/libid3tag_0.15.0b.bb
index 840c7f8ae7..226a3cca5f 100644
--- a/packages/libid3tag/libid3tag_0.15.0b.bb
+++ b/packages/libid3tag/libid3tag_0.15.0b.bb
@@ -8,7 +8,7 @@ PR = "r2"
 SRC_URI = "ftp://ftp.mars.org/pub/mpeg/libid3tag-${PV}.tar.gz "
 S = "${WORKDIR}/libid3tag-${PV}"
 
-inherit autotools 
+inherit autotools
 
 EXTRA_OECONF = "-enable-speed"
 
diff --git a/packages/libidl/libidl_0.8.3.bb b/packages/libidl/libidl_0.8.3.bb
index e743247390..2ca114be2c 100644
--- a/packages/libidl/libidl_0.8.3.bb
+++ b/packages/libidl/libidl_0.8.3.bb
@@ -20,10 +20,14 @@ do_stage() {
 		libdir=${STAGING_LIBDIR} \
 		datadir=${STAGING_DATADIR} \
 		infodir=${STAGING_INFODIR}
-	
+
 	cp ${STAGING_BINDIR}/libIDL-config-2 ${STAGING_BINDIR}/libIDL-config-2.orig
 	cat ${STAGING_BINDIR}/libIDL-config-2.orig | sed -e 's:${includedir}:${STAGING_INCDIR}:' > ${STAGING_BINDIR}/libIDL-config-2
+
+	if [ "${STAGING_BINDIR}" != "${STAGING_BINDIR_CROSS}" ]; then
+		mv ${STAGING_BINDIR}/libIDL-config-2 ${STAGING_BINDIR_CROSS}/libIDL-config-2
+	fi
 }
 
 FILES_${PN} = "${libdir}/*.so.*"
-FILES_${PN}-dev += " ${bindir}" 
+FILES_${PN}-dev += " ${bindir}"
diff --git a/packages/libidl/libidl_0.8.6.bb b/packages/libidl/libidl_0.8.6.bb
index 16e95ac3d6..916bfb6e5f 100644
--- a/packages/libidl/libidl_0.8.6.bb
+++ b/packages/libidl/libidl_0.8.6.bb
@@ -16,7 +16,12 @@ do_stage() {
 	autotools_stage_all
 
 	cat ${S}/libIDL-config-2 | sed -e 's:${includedir}:${STAGING_INCDIR}:' > ${STAGING_BINDIR}/libIDL-config-2
+
+	if [ "${STAGING_BINDIR}" != "${STAGING_BINDIR_CROSS}" ]; then
+		mv ${STAGING_BINDIR}/libIDL-config-2 ${STAGING_BINDIR_CROSS}/libIDL-config-2
+	fi
+			 
 }
 
 FILES_${PN} = "${libdir}/*.so.*"
-FILES_${PN}-dev += " ${bindir}" 
+FILES_${PN}-dev += " ${bindir}"
diff --git a/packages/libmad/libmad_0.15.0b.bb b/packages/libmad/libmad_0.15.0b.bb
index d6e6dda1d6..005e89eb5e 100644
--- a/packages/libmad/libmad_0.15.0b.bb
+++ b/packages/libmad/libmad_0.15.0b.bb
@@ -8,7 +8,7 @@ PR = "r2"
 SRC_URI = "ftp://ftp.mars.org/pub/mpeg/libmad-${PV}.tar.gz"
 S = "${WORKDIR}/libmad-${PV}"
 
-inherit autotools 
+inherit autotools
 
 EXTRA_OECONF = "-enable-speed --enable-shared"
 # The ASO's don't take any account of thumb...
diff --git a/packages/libmad/libmad_0.15.1b.bb b/packages/libmad/libmad_0.15.1b.bb
index aac3736135..9de296635e 100644
--- a/packages/libmad/libmad_0.15.1b.bb
+++ b/packages/libmad/libmad_0.15.1b.bb
@@ -7,7 +7,7 @@ LICENSE = "GPL"
 SRC_URI = "ftp://ftp.mars.org/pub/mpeg/libmad-${PV}.tar.gz"
 S = "${WORKDIR}/libmad-${PV}"
 
-inherit autotools 
+inherit autotools
 
 EXTRA_OECONF = "-enable-speed --enable-shared"
 # The ASO's don't take any account of thumb...
diff --git a/packages/libmailwrapper/libmailwrapper_1.2.2.bb b/packages/libmailwrapper/libmailwrapper_1.2.2.bb
index 31793f9e16..3df2fb149b 100644
--- a/packages/libmailwrapper/libmailwrapper_1.2.2.bb
+++ b/packages/libmailwrapper/libmailwrapper_1.2.2.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
 
- 
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/mail/libmailwrapper "
diff --git a/packages/libmikey/libmikey0_0.3.2.bb b/packages/libmikey/libmikey0_0.3.2.bb
index 2f8ce60834..214faef40f 100644
--- a/packages/libmikey/libmikey0_0.3.2.bb
+++ b/packages/libmikey/libmikey0_0.3.2.bb
@@ -13,7 +13,7 @@ S="${WORKDIR}/libmikey-${PV}"
 
 PACKAGES = "${PN}"
 
-FILES_${PN} = " ${libdir}/libmikey.so.0 ${libdir}/libmikey.so.0.0.0 " 
+FILES_${PN} = " ${libdir}/libmikey.so.0 ${libdir}/libmikey.so.0.0.0 "
 
 do_stage() {
 	oe_libinstall -a -so libmikey ${STAGING_LIBDIR}
diff --git a/packages/libmikey/libmikey0_svn.bb b/packages/libmikey/libmikey0_svn.bb
index 112c117dcd..663b639b3d 100644
--- a/packages/libmikey/libmikey0_svn.bb
+++ b/packages/libmikey/libmikey0_svn.bb
@@ -16,7 +16,7 @@ S = "${WORKDIR}/libmikey"
 
 PACKAGES = "${PN}"
 
-FILES_${PN} = " ${libdir}/libmikey.so.0 ${libdir}/libmikey.so.0.0.0 " 
+FILES_${PN} = " ${libdir}/libmikey.so.0 ${libdir}/libmikey.so.0.0.0 "
 
 do_stage() {
 	oe_libinstall -a -so libmikey ${STAGING_LIBDIR}
diff --git a/packages/libmikey/libmikey_0.1a.bb b/packages/libmikey/libmikey_0.1a.bb
index a9389eaab7..e00ce25594 100644
--- a/packages/libmikey/libmikey_0.1a.bb
+++ b/packages/libmikey/libmikey_0.1a.bb
@@ -8,7 +8,7 @@ DEPENDS = "openssl"
 SRC_URI = "http://minisip.org/source/libmikey-${PV}.tar.gz"
 S = "${WORKDIR}/libmikey-0.1"
 
-inherit autotools 
+inherit autotools
 
 do_configure() {
 	gnu-configize
diff --git a/packages/libmikmod/libmikmod_3.1.11.bb b/packages/libmikmod/libmikmod_3.1.11.bb
index ad3f895db8..6c8dc8e064 100644
--- a/packages/libmikmod/libmikmod_3.1.11.bb
+++ b/packages/libmikmod/libmikmod_3.1.11.bb
@@ -6,7 +6,7 @@ SRC_URI = "http://mikmod.raphnet.net/files/libmikmod-${PV}.tar.gz \
 	   file://m4.patch;patch=1 \
 	   file://autofoo.patch;patch=1"
 
-inherit autotools 
+inherit autotools
 
 EXTRA_OECONF = "--disable-af --disable-alsa --disable-esd \
 --enable-oss --disable-sam9407 --disable-ultra \
diff --git a/packages/libmnetutil/libmnetutil0_0.2.2.bb b/packages/libmnetutil/libmnetutil0_0.2.2.bb
index e201bf806b..a7866b35ec 100644
--- a/packages/libmnetutil/libmnetutil0_0.2.2.bb
+++ b/packages/libmnetutil/libmnetutil0_0.2.2.bb
@@ -13,7 +13,7 @@ S="${WORKDIR}/libmnetutil-${PV}"
 
 PACKAGES = "${PN}"
 
-FILES_${PN} = " ${libdir}/libmnetutil.so.0 ${libdir}/libmnetutil.so.0.0.0 " 
+FILES_${PN} = " ${libdir}/libmnetutil.so.0 ${libdir}/libmnetutil.so.0.0.0 "
 
 do_stage() {
 	oe_libinstall -a -so libmnetutil ${STAGING_LIBDIR}
diff --git a/packages/libmnetutil/libmnetutil0_svn.bb b/packages/libmnetutil/libmnetutil0_svn.bb
index ad75634000..a8e156bc13 100644
--- a/packages/libmnetutil/libmnetutil0_svn.bb
+++ b/packages/libmnetutil/libmnetutil0_svn.bb
@@ -15,7 +15,7 @@ S="${WORKDIR}/libmnetutil"
 
 PACKAGES = "${PN}"
 
-FILES_${PN} = " ${libdir}/libmnetutil.so.0 ${libdir}/libmnetutil.so.0.0.0 " 
+FILES_${PN} = " ${libdir}/libmnetutil.so.0 ${libdir}/libmnetutil.so.0.0.0 "
 
 do_stage() {
 	oe_libinstall -a -so libmnetutil ${STAGING_LIBDIR}
diff --git a/packages/libmsip/libmsip0_0.2.2.bb b/packages/libmsip/libmsip0_0.2.2.bb
index 64b5ae49c3..8d8bb905db 100644
--- a/packages/libmsip/libmsip0_0.2.2.bb
+++ b/packages/libmsip/libmsip0_0.2.2.bb
@@ -13,7 +13,7 @@ S="${WORKDIR}/libmsip-${PV}"
 
 PACKAGES = "${PN}"
 
-FILES_${PN} = " ${libdir}/libmsip.so.0 ${libdir}/libmsip.so.0.0.0 " 
+FILES_${PN} = " ${libdir}/libmsip.so.0 ${libdir}/libmsip.so.0.0.0 "
 
 do_stage() {
 	oe_libinstall -a -so libmsip ${STAGING_LIBDIR}
diff --git a/packages/libmsip/libmsip0_svn.bb b/packages/libmsip/libmsip0_svn.bb
index f27c05ca14..4418757ba2 100644
--- a/packages/libmsip/libmsip0_svn.bb
+++ b/packages/libmsip/libmsip0_svn.bb
@@ -15,7 +15,7 @@ S="${WORKDIR}/libmsip"
 
 PACKAGES = "${PN}"
 
-FILES_${PN} = " ${libdir}/libmsip.so.0 ${libdir}/libmsip.so.0.0.0 " 
+FILES_${PN} = " ${libdir}/libmsip.so.0 ${libdir}/libmsip.so.0.0.0 "
 
 do_stage() {
 	oe_libinstall -a -so libmsip ${STAGING_LIBDIR}
diff --git a/packages/libol/libol_0.3.16.bb b/packages/libol/libol_0.3.16.bb
index 18bc4aa66e..2dc33b6f2a 100644
--- a/packages/libol/libol_0.3.16.bb
+++ b/packages/libol/libol_0.3.16.bb
@@ -12,4 +12,4 @@ do_stage() {
 	ln -fs ${STAGING_LIBDIR}/libol.so.0.0.0 ${STAGING_LIBDIR}/libol.so.0
 	install ${S}/src/*.h ${STAGING_INCDIR}/libol/
 }
-	
+
diff --git a/packages/libopie/libopie2_1.2.2.bb b/packages/libopie/libopie2_1.2.2.bb
index 6ae22316c5..8fcc2fba0a 100644
--- a/packages/libopie/libopie2_1.2.2.bb
+++ b/packages/libopie/libopie2_1.2.2.bb
@@ -5,5 +5,5 @@ SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/libopie2 \
            file://include.pro \
            file://odevice.h-jornada-fixup.patch;patch=1 \
 	   file://odevice_jornada.cpp-fixup.patch;patch=1"
-	   
+
 SRC_URI_append_poodle = " file://poodle-2.6-hotkeys.patch;patch=1"
diff --git a/packages/libpcre/libpcre-native_4.4.bb b/packages/libpcre/libpcre-native_4.4.bb
index a1813423c0..8a4211384a 100644
--- a/packages/libpcre/libpcre-native_4.4.bb
+++ b/packages/libpcre/libpcre-native_4.4.bb
@@ -5,4 +5,4 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libpcre-${PV}"
 
 # NOTE: multiple providers are available (libpcre, libpcre-native);
 # NOTE: consider defining PREFERRED_PROVIDER_pcre
-PROVIDES = "" 
+PROVIDES = ""
diff --git a/packages/libpixman/libpixman_0.1.5.bb b/packages/libpixman/libpixman_0.1.5.bb
index a9bff9d2f6..6cedbf480d 100644
--- a/packages/libpixman/libpixman_0.1.5.bb
+++ b/packages/libpixman/libpixman_0.1.5.bb
@@ -5,7 +5,7 @@ DESCRIPTION = "Cairo support library"
 LICENSE = "X11"
 SRC_URI = "http://cairographics.org/snapshots/libpixman-${PV}.tar.gz"
 
-inherit autotools pkgconfig 
+inherit autotools pkgconfig
 
 do_stage () {
 	oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR}
diff --git a/packages/libpixman/libpixman_0.1.6.bb b/packages/libpixman/libpixman_0.1.6.bb
index a9bff9d2f6..6cedbf480d 100644
--- a/packages/libpixman/libpixman_0.1.6.bb
+++ b/packages/libpixman/libpixman_0.1.6.bb
@@ -5,7 +5,7 @@ DESCRIPTION = "Cairo support library"
 LICENSE = "X11"
 SRC_URI = "http://cairographics.org/snapshots/libpixman-${PV}.tar.gz"
 
-inherit autotools pkgconfig 
+inherit autotools pkgconfig
 
 do_stage () {
 	oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR}
diff --git a/packages/libpixman/libpixman_cvs.bb b/packages/libpixman/libpixman_cvs.bb
index 62ffdc94f3..956f652454 100644
--- a/packages/libpixman/libpixman_cvs.bb
+++ b/packages/libpixman/libpixman_cvs.bb
@@ -9,7 +9,7 @@ S = "${WORKDIR}/libpixman"
 
 DEFAULT_PREFERENCE = "-1"
 
-inherit autotools pkgconfig 
+inherit autotools pkgconfig
 
 do_stage () {
 	oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR}
diff --git a/packages/libqpe/libqpe-opie_1.2.2.bb b/packages/libqpe/libqpe-opie_1.2.2.bb
index f2ea872158..21ffea194e 100644
--- a/packages/libqpe/libqpe-opie_1.2.2.bb
+++ b/packages/libqpe/libqpe-opie_1.2.2.bb
@@ -1,7 +1,7 @@
 require ${PN}.inc
 
 PR = "r1"
-TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}" 
+TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/library \
 	file://fix-titleheight.patch;patch=1"
diff --git a/packages/libqtaux/libqtaux2_1.2.2.bb b/packages/libqtaux/libqtaux2_1.2.2.bb
index c05c40f5ae..5d971e35d1 100644
--- a/packages/libqtaux/libqtaux2_1.2.2.bb
+++ b/packages/libqtaux/libqtaux2_1.2.2.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/libqtaux"
diff --git a/packages/libqtaux/libqtaux2_cvs.bb b/packages/libqtaux/libqtaux2_cvs.bb
index 4813ef3d1d..aaf01d8a17 100644
--- a/packages/libqtaux/libqtaux2_cvs.bb
+++ b/packages/libqtaux/libqtaux2_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/libqtaux"
diff --git a/packages/libschedule/libschedule_0.15.bb b/packages/libschedule/libschedule_0.15.bb
index ef57a74a90..77c6a97f81 100644
--- a/packages/libschedule/libschedule_0.15.bb
+++ b/packages/libschedule/libschedule_0.15.bb
@@ -6,7 +6,7 @@ PRIORITY = "optional"
 DEPENDS = "glib-2.0 sqlite"
 GPE_TARBALL_SUFFIX = "gz"
 
-inherit autotools pkgconfig gpe 
+inherit autotools pkgconfig gpe
 
 
 do_stage () {
diff --git a/packages/libsidplay/libsidplay_1.36.59.bb b/packages/libsidplay/libsidplay_1.36.59.bb
index dcb7be2056..5dbc34c158 100644
--- a/packages/libsidplay/libsidplay_1.36.59.bb
+++ b/packages/libsidplay/libsidplay_1.36.59.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 
 SRC_URI = "http://www.geocities.com/SiliconValley/Lakes/5147/sidplay/packages/libsidplay-${PV}.tgz"
 
-inherit autotools 
+inherit autotools
 
 do_stage() {
 	oe_libinstall -so -C src libsidplay ${STAGING_LIBDIR}
diff --git a/packages/libtiff/tiff_3.7.2.bb b/packages/libtiff/tiff_3.7.2.bb
index 8ef0556377..baf8feab67 100644
--- a/packages/libtiff/tiff_3.7.2.bb
+++ b/packages/libtiff/tiff_3.7.2.bb
@@ -7,9 +7,9 @@ SRC_URI =	"http://dl.maptools.org/dl/libtiff/old/tiff-${PV}.tar.gz"
 
 inherit autotools
 
-do_stage() {        
-	autotools_stage_includes        
-	install -d ${STAGING_LIBDIR}        
-	install -m 755 libtiff/.libs/libtiff.so.3.7.2 ${STAGING_LIBDIR}/libtiff.so       
+do_stage() {
+	autotools_stage_includes
+	install -d ${STAGING_LIBDIR}
+	install -m 755 libtiff/.libs/libtiff.so.3.7.2 ${STAGING_LIBDIR}/libtiff.so
 	install -m 755 ./libtiff/.libs/libtiffxx.so.3.7.2 ${STAGING_LIBDIR}/libtiffxx.so
-}	
+}
diff --git a/packages/libtool/libtool-cross_1.5.10.bb b/packages/libtool/libtool-cross_1.5.10.bb
index 81a4990d28..fdc8f6ffaf 100644
--- a/packages/libtool/libtool-cross_1.5.10.bb
+++ b/packages/libtool/libtool-cross_1.5.10.bb
@@ -13,6 +13,7 @@ S = "${WORKDIR}/libtool-${PV}"
 
 prefix = "${STAGING_DIR}"
 exec_prefix = "${prefix}/${BUILD_SYS}"
+bindir = "${STAGING_BINDIR_NATIVE}"
 
 do_compile () {
 	:
diff --git a/packages/libtool/libtool_1.5.10.bb b/packages/libtool/libtool_1.5.10.bb
index 1202279524..20929a7fa2 100644
--- a/packages/libtool/libtool_1.5.10.bb
+++ b/packages/libtool/libtool_1.5.10.bb
@@ -10,7 +10,7 @@ PR = "r3"
 SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \
            file://autotools.patch;patch=1 \
 	   file://uclibc.patch;patch=1 \
-	   file://3figures.patch;patch=1" 
+	   file://3figures.patch;patch=1"
 S = "${WORKDIR}/libtool-${PV}"
 
 PACKAGES = "libltdl libltdl-dev ${PN}"
diff --git a/packages/libusb/libusb_0.1.10a.bb b/packages/libusb/libusb_0.1.10a.bb
index a62d9ae83e..8648f96571 100644
--- a/packages/libusb/libusb_0.1.10a.bb
+++ b/packages/libusb/libusb_0.1.10a.bb
@@ -22,6 +22,11 @@ do_stage() {
 	install -m 755 ${S}/libusb-config ${STAGING_BINDIR}
 	perl -pi -e 's:\-L${libdir} :-L${STAGING_LIBDIR} :' ${STAGING_BINDIR}/libusb-config
 
+	if [ "${STAGING_BINDIR}" != "${STAGING_BINDIR_CROSS}" ]; then
+	        install -d ${STAGING_BINDIR_CROSS}/
+		mv ${STAGING_BINDIR}/libusb-config ${STAGING_BINDIR_CROSS}/libusb-config
+	fi
+
         install -d ${STAGING_INCDIR}/
         for X in usb.h
         do
diff --git a/packages/libusb/libusb_0.1.12.bb b/packages/libusb/libusb_0.1.12.bb
index fea8e57ccf..43c6ea92bd 100644
--- a/packages/libusb/libusb_0.1.12.bb
+++ b/packages/libusb/libusb_0.1.12.bb
@@ -9,24 +9,25 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-${PV}.tar.gz"
 
 S = "${WORKDIR}/libusb-${PV}"
 
-inherit autotools pkgconfig
+inherit autotools pkgconfig binconfig lib_package
 
 PARALLEL_MAKE = ""
 EXTRA_OECONF = "--disable-build-docs"
 
+export CXXFLAGS += "-lstdc++"
+
 do_stage() {
-	oe_libinstall -a -so libusb ${STAGING_LIBDIR}
 
-        install -d ${STAGING_BINDIR}
+	autotools_stage_all
 	install -m 755 ${S}/libusb-config ${STAGING_BINDIR}
 	# can we get rid of that? wouldn't a sed statement do as well?
-	perl -pi -e 's:\-L${libdir} :-L${STAGING_LIBDIR} :' ${STAGING_BINDIR}/libusb-config
+	sed -i 's:\-L${libdir} :-L${STAGING_LIBDIR} :' ${STAGING_BINDIR}/libusb-config
+
+	if [ "${STAGING_BINDIR}" != "${STAGING_BINDIR_CROSS}" ]; then
+	        install -d ${STAGING_BINDIR_CROSS}/
+		mv ${STAGING_BINDIR}/libusb-config ${STAGING_BINDIR_CROSS}/libusb-config
+	fi
 
-        install -d ${STAGING_INCDIR}/
-        for X in usb.h
-        do
-                install -m 0644 ${S}/$X ${STAGING_INCDIR}/$X
-        done
 }
 
 PACKAGES =+ "libusbpp"
diff --git a/packages/libxine/libxine-x11_1.0.bb b/packages/libxine/libxine-x11_1.0.bb
index 692c55cf9f..1115b6e961 100644
--- a/packages/libxine/libxine-x11_1.0.bb
+++ b/packages/libxine/libxine-x11_1.0.bb
@@ -37,7 +37,7 @@ EXTRA_OECONF="-with-zlib-path=${STAGING_DIR}/${HOST_SYS} \
 	--without-v4l --without-arts --without-sdl \
 	--without-xv  --without-xxmc --without-xvmc \
 	--with-x --x-includes=${STAGING_INCDIR}/X11 --x-libraries=${STAGING_LIBDIR}"
-			      
+
 do_compile() {
 	oe_runmake LIBTOOL=${S}/${TARGET_SYS}-libtool
 }
diff --git a/packages/libxml/libxml2-native_2.6.10.bb b/packages/libxml/libxml2-native_2.6.10.bb
index 3f4b1ca11b..df3ab07460 100644
--- a/packages/libxml/libxml2-native_2.6.10.bb
+++ b/packages/libxml/libxml2-native_2.6.10.bb
@@ -5,7 +5,7 @@ SRC_URI = "ftp://xmlsoft.org/libxml2/old/libxml2-${PV}.tar.gz"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libxml2-${PV}"
 S = "${WORKDIR}/libxml2-${PV}"
 
-inherit autotools native pkgconfig 
+inherit autotools native pkgconfig
 
 EXTRA_OECONF = "--without-python --without-debug --without-legacy --without-schemas --without-catalog --without-docbook --without-c14n"
 
diff --git a/packages/libxml/libxml2-native_2.6.9.bb b/packages/libxml/libxml2-native_2.6.9.bb
index dcbb181de4..f83d974538 100644
--- a/packages/libxml/libxml2-native_2.6.9.bb
+++ b/packages/libxml/libxml2-native_2.6.9.bb
@@ -5,7 +5,7 @@ SRC_URI = "http://xmlsoft.org/sources/libxml2-${PV}.tar.gz"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libxml2-${PV}"
 S = "${WORKDIR}/libxml2-${PV}"
 
-inherit autotools native pkgconfig 
+inherit autotools native pkgconfig
 
 EXTRA_OECONF = "--without-python --without-debug --without-legacy --without-schemas --without-catalog --without-docbook --without-c14n"
 
diff --git a/packages/libxsettings-client/libxsettings-client_0.16.bb b/packages/libxsettings-client/libxsettings-client_0.16.bb
index 7707d91761..cfec0904e9 100644
--- a/packages/libxsettings-client/libxsettings-client_0.16.bb
+++ b/packages/libxsettings-client/libxsettings-client_0.16.bb
@@ -2,7 +2,7 @@ SECTION = "gpe/libs"
 LICENSE = "BSD-X"
 PRIORITY = "optional"
 DEPENDS = "libxsettings virtual/libx11 libxt"
-# libxt is required to stop configure breaking builds by 
+# libxt is required to stop configure breaking builds by
 # including system paths to find it if it isn't present.
 PR="r1"
 
diff --git a/packages/libxsettings-client/libxsettings-client_0.17.bb b/packages/libxsettings-client/libxsettings-client_0.17.bb
index 0643c5f14d..41f3e8f6e4 100644
--- a/packages/libxsettings-client/libxsettings-client_0.17.bb
+++ b/packages/libxsettings-client/libxsettings-client_0.17.bb
@@ -2,7 +2,7 @@ SECTION = "gpe/libs"
 LICENSE = "BSD-X"
 PRIORITY = "optional"
 DEPENDS = "libxsettings virtual/libx11 libxt gtk-doc"
-# libxt is required to stop configure breaking builds by 
+# libxt is required to stop configure breaking builds by
 # including system paths to find it if it isn't present.
 PR="r1"
 
diff --git a/packages/libxslt/libxslt_1.1.12.bb b/packages/libxslt/libxslt_1.1.12.bb
index 816b3fdd04..9c59407ebf 100644
--- a/packages/libxslt/libxslt_1.1.12.bb
+++ b/packages/libxslt/libxslt_1.1.12.bb
@@ -8,7 +8,7 @@ PR = "r2"
 SRC_URI = "ftp://xmlsoft.org/libxml2/libxslt-${PV}.tar.gz"
 S = "${WORKDIR}/libxslt-${PV}"
 
-inherit autotools pkgconfig 
+inherit autotools pkgconfig
 
 EXTRA_OECONF = "--without-python --without-debug --without-mem-debug --without-crypto"
 
@@ -31,11 +31,11 @@ do_stage () {
 		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}/..," \
+	cat xslt-config | sed -e "s,^prefix=.*,prefix=${STAGING_DIR}/${HOST_SYS}," \
+		       	     -e "s,^exec_prefix=.*,exec_prefix=${STAGING_DIR}/${HOST_SYS}," \
 			     -e "s,^includedir=.*,includedir=${STAGING_INCDIR}," \
-			     -e "s,^libdir=.*,libdir=${STAGING_LIBDIR}," > ${STAGING_BINDIR}/xslt-config
-	chmod a+rx ${STAGING_BINDIR}/xslt-config
+			     -e "s,^libdir=.*,libdir=${STAGING_LIBDIR}," > ${STAGING_BINDIR_CROSS}/xslt-config
+	chmod a+rx ${STAGING_BINDIR_CROSS}/xslt-config
 	install -m 0644 libxslt.m4 ${STAGING_DATADIR}/aclocal/
 }
 
diff --git a/packages/libxslt/libxslt_1.1.17.bb b/packages/libxslt/libxslt_1.1.17.bb
index 816b3fdd04..9c59407ebf 100644
--- a/packages/libxslt/libxslt_1.1.17.bb
+++ b/packages/libxslt/libxslt_1.1.17.bb
@@ -8,7 +8,7 @@ PR = "r2"
 SRC_URI = "ftp://xmlsoft.org/libxml2/libxslt-${PV}.tar.gz"
 S = "${WORKDIR}/libxslt-${PV}"
 
-inherit autotools pkgconfig 
+inherit autotools pkgconfig
 
 EXTRA_OECONF = "--without-python --without-debug --without-mem-debug --without-crypto"
 
@@ -31,11 +31,11 @@ do_stage () {
 		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}/..," \
+	cat xslt-config | sed -e "s,^prefix=.*,prefix=${STAGING_DIR}/${HOST_SYS}," \
+		       	     -e "s,^exec_prefix=.*,exec_prefix=${STAGING_DIR}/${HOST_SYS}," \
 			     -e "s,^includedir=.*,includedir=${STAGING_INCDIR}," \
-			     -e "s,^libdir=.*,libdir=${STAGING_LIBDIR}," > ${STAGING_BINDIR}/xslt-config
-	chmod a+rx ${STAGING_BINDIR}/xslt-config
+			     -e "s,^libdir=.*,libdir=${STAGING_LIBDIR}," > ${STAGING_BINDIR_CROSS}/xslt-config
+	chmod a+rx ${STAGING_BINDIR_CROSS}/xslt-config
 	install -m 0644 libxslt.m4 ${STAGING_DATADIR}/aclocal/
 }
 
diff --git a/packages/linux-atm/linux-atm_2.4.1.bb b/packages/linux-atm/linux-atm_2.4.1.bb
index ed88f3227b..2643c742d5 100644
--- a/packages/linux-atm/linux-atm_2.4.1.bb
+++ b/packages/linux-atm/linux-atm_2.4.1.bb
@@ -22,7 +22,7 @@ binarys_bin="test/aread maint/atmdiag maint/atmdump test/awrite maint/saaldump m
 
 
 do_compile_prepend() {
-	oe_runmake -C ${S}/src/qgen AR='${BUILD_AR}' CPP='${BUILD_CPP}' CC='${BUILD_CC}' CFLAGS='${BUILD_CFLAGS}' DEFS='-I${S}/src -I. -I../.. -DHAVE_CONFIG_H' CPPFLAGS='${BUILD_CPPFLAGS}' LD='${BUILD_LD}' LDFLAGS='${BUILD_LDFLAGS}' qgen q.dump  
+	oe_runmake -C ${S}/src/qgen AR='${BUILD_AR}' CPP='${BUILD_CPP}' CC='${BUILD_CC}' CFLAGS='${BUILD_CFLAGS}' DEFS='-I${S}/src -I. -I../.. -DHAVE_CONFIG_H' CPPFLAGS='${BUILD_CPPFLAGS}' LD='${BUILD_LD}' LDFLAGS='${BUILD_LDFLAGS}' qgen q.dump
 	oe_runmake -C ${S}/src/qgen DEFS='-I${S}/src -I. -I../.. -DHAVE_CONFIG_H' all
 }
 
@@ -37,11 +37,11 @@ do_stage () {
 		install -m 0644 src/arpd/$i ${STAGING_INCDIR}/$i
 	done
 
-	for i in ${binarys_sbin}; do 
+	for i in ${binarys_sbin}; do
 		install -m 0755 src/$i ${STAGING_BINDIR}/`basename $i`
 	done
 
-	for i in ${binarys_bin}; do 
+	for i in ${binarys_bin}; do
 		install -m 0755 src/$i ${STAGING_BINDIR}/`basename $i`
 	done
 }
diff --git a/packages/linux-libc-headers/linux-libc-headers_2.6.11.1.bb b/packages/linux-libc-headers/linux-libc-headers_2.6.11.1.bb
index c43664094d..dadb0409cb 100644
--- a/packages/linux-libc-headers/linux-libc-headers_2.6.11.1.bb
+++ b/packages/linux-libc-headers/linux-libc-headers_2.6.11.1.bb
@@ -1,10 +1,10 @@
 SECTION = "devel"
 DESCRIPTION = "Sanitized set of 2.6 kernel headers for the C library's use."
 HOMEPAGE = "http://ep09.pld-linux.org/~mmazur/linux-libc-headers/"
-# license note from the package: 
+# license note from the package:
 #   Linux-libc-headers are derived from linux kernel headers. For license of a
 #   particular header, check it's content, and if copyright notice isn't present,
-#   standard linux kernel license applies. 
+#   standard linux kernel license applies.
 # since we assume GPL for linux i think we can also assume it here
 LICENSE = "GPL"
 INHIBIT_DEFAULT_DEPS = "1"
diff --git a/packages/linux-libc-headers/linux-libc-headers_2.6.15.99.bb b/packages/linux-libc-headers/linux-libc-headers_2.6.15.99.bb
index 28926f0264..f9d15bcbc2 100644
--- a/packages/linux-libc-headers/linux-libc-headers_2.6.15.99.bb
+++ b/packages/linux-libc-headers/linux-libc-headers_2.6.15.99.bb
@@ -2,14 +2,14 @@ SECTION = "devel"
 DESCRIPTION = "Sanitized set of 2.6 kernel headers for the C library's use."
 # This package is derived from the original linux-libc-headers at
 #   http://ep09.pld-linux.org/~mmazur/linux-libc-headers/
-# More specifically, llh-2.6.12.0 was patched up to 2.6.16-rc6 with 
+# More specifically, llh-2.6.12.0 was patched up to 2.6.16-rc6 with
 # the official linux patches (where applicable) and then fixed up just
 # enough to build glibc-2.4. BEWARE!
 #
-# license note from the linux-libc-headers package: 
+# license note from the linux-libc-headers package:
 #   Linux-libc-headers are derived from linux kernel headers. For license of a
 #   particular header, check it's content, and if copyright notice isn't present,
-#   standard linux kernel license applies. 
+#   standard linux kernel license applies.
 # since we assume GPL for linux i think we can also assume it here
 LICENSE = "GPL"
 DEFAULT_PREFERENCE = "-1"
diff --git a/packages/linux-libc-headers/linux-libc-headers_2.6.8.1.bb b/packages/linux-libc-headers/linux-libc-headers_2.6.8.1.bb
index cb04c92192..025eeb966d 100644
--- a/packages/linux-libc-headers/linux-libc-headers_2.6.8.1.bb
+++ b/packages/linux-libc-headers/linux-libc-headers_2.6.8.1.bb
@@ -1,10 +1,10 @@
 SECTION = "devel"
 DESCRIPTION = "Sanitized set of 2.6 kernel headers for the C library's use."
 HOMEPAGE = "http://ep09.pld-linux.org/~mmazur/linux-libc-headers/"
-# license note from the package: 
+# license note from the package:
 #   Linux-libc-headers are derived from linux kernel headers. For license of a
 #   particular header, check it's content, and if copyright notice isn't present,
-#   standard linux kernel license applies. 
+#   standard linux kernel license applies.
 # since we assume GPL for linux i think we can also assume it here
 LICENSE = "GPL"
 INHIBIT_DEFAULT_DEPS = "1"
@@ -16,7 +16,7 @@ PACKAGES = ""
 SRC_URI = "http://ep09.pld-linux.org/~mmazur/linux-libc-headers/linux-libc-headers-${PV}.tar.bz2 \
 	file://mips-asm-atomic-system.diff;patch=1;pnum=0 \
 	file://keyboard.patch;patch=1"
-	
+
 S = "${WORKDIR}/linux-libc-headers-${PV}"
 
 do_configure () {
diff --git a/packages/linux/ep93xx-kernel_2.6.17+2.6.18-rc1.bb b/packages/linux/ep93xx-kernel_2.6.17+2.6.18-rc1.bb
index 09926ce5c0..7fd152ab40 100644
--- a/packages/linux/ep93xx-kernel_2.6.17+2.6.18-rc1.bb
+++ b/packages/linux/ep93xx-kernel_2.6.17+2.6.18-rc1.bb
@@ -22,24 +22,24 @@ KERNEL_IMAGETYPE = "zImage"
 
 do_configure() {
         rm -f ${S}/.config
-        
+
         if [ ! -e ${WORKDIR}/defconfig ]; then
                 die "No default configuration for ${MACHINE} available."
         fi
 
-        
+
         if [ "${TARGET_OS}" == "linux-gnueabi" -o  "${TARGET_OS}" == "linux-uclibcgnueabi" ]; then
 		echo "CONFIG_AEABI=y"                   >> ${S}/.config
                 echo "CONFIG_OABI_COMPAT=y"             >> ${S}/.config
-        else    
+        else
                 echo "# CONFIG_AEABI is not set"        >> ${S}/.config
                 echo "# CONFIG_OABI_COMPAT is not set"  >> ${S}/.config
         fi
-        
+
         sed -e '/CONFIG_AEABI/d' \
             -e '/CONFIG_OABI_COMPAT=/d' \
             '${WORKDIR}/defconfig' >>'${S}/.config'
-        
+
         yes '' | oe_runmake oldconfig
 
 
diff --git a/packages/linux/gumstix_2.6.5-gnalm1-gum0.bb b/packages/linux/gumstix_2.6.5-gnalm1-gum0.bb
index 875f47c99c..f17f3168c0 100644
--- a/packages/linux/gumstix_2.6.5-gnalm1-gum0.bb
+++ b/packages/linux/gumstix_2.6.5-gnalm1-gum0.bb
@@ -1,5 +1,5 @@
 BROKEN = "1"
-#linux-2.6.5-gnalm1-gum0.patch is not fetchable 
+#linux-2.6.5-gnalm1-gum0.patch is not fetchable
 
 SECTION = "kernel"
 DESCRIPTION = "Linux kernel for OMAP processors"
diff --git a/packages/linux/ixp4xx-kernel_2.6.18.bb b/packages/linux/ixp4xx-kernel_2.6.18.bb
index a75beee997..69e2098055 100644
--- a/packages/linux/ixp4xx-kernel_2.6.18.bb
+++ b/packages/linux/ixp4xx-kernel_2.6.18.bb
@@ -1,7 +1,7 @@
 # Kernel for IXP4xx
 #
-# This bitbake file pulls patches and the defconfig straight  
-# from the NSLU2-Linux SVN repository. Information about this 
+# This bitbake file pulls patches and the defconfig straight
+# from the NSLU2-Linux SVN repository. Information about this
 # repository can be found at:
 # http://trac.nslu2-linux.org/kernel/
 #
diff --git a/packages/linux/ixp4xx-kernel_2.6.19.bb b/packages/linux/ixp4xx-kernel_2.6.19.bb
index a06403c5f4..6ee29d3d9a 100644
--- a/packages/linux/ixp4xx-kernel_2.6.19.bb
+++ b/packages/linux/ixp4xx-kernel_2.6.19.bb
@@ -1,12 +1,12 @@
 # Kernel for IXP4xx
 #
-# This bitbake file pulls patches and the defconfig straight  
-# from the NSLU2-Linux SVN repository. Information about this 
+# This bitbake file pulls patches and the defconfig straight
+# from the NSLU2-Linux SVN repository. Information about this
 # repository can be found at:
 # http://trac.nslu2-linux.org/kernel/
 #
 # The revision that is pulled from SVN is specified below
-IXP4XX_KERNEL_SVN_REV = "644"
+IXP4XX_KERNEL_SVN_REV = "647"
 #
 # The directory containing the patches to be applied is
 # specified below
diff --git a/packages/linux/linux-dht-walnut_2.6.12.bb b/packages/linux/linux-dht-walnut_2.6.12.bb
index cdf0c62561..7d362ea659 100644
--- a/packages/linux/linux-dht-walnut_2.6.12.bb
+++ b/packages/linux/linux-dht-walnut_2.6.12.bb
@@ -30,7 +30,7 @@ KERNEL_OUTPUT = "arch/ppc/boot/images/zImage.elf"
 
 do_configure_prepend() {
 	install -m 0644 ${WORKDIR}/dht-walnut_defconfig ${S}/.config
-#        oe_machinstall -m 0644 ${S}/arch/ppc/configs/dht-walnut_defconfig ${S}/.config || die "no default configuration for ${MACHINE} available."       
+#        oe_machinstall -m 0644 ${S}/arch/ppc/configs/dht-walnut_defconfig ${S}/.config || die "no default configuration for ${MACHINE} available."
 #        oe_runmake oldconfig
 }
 
diff --git a/packages/linux/linux-ezx_2.6.16.13.bb b/packages/linux/linux-ezx_2.6.16.13.bb
index 58d98c37f1..0f4863e125 100644
--- a/packages/linux/linux-ezx_2.6.16.13.bb
+++ b/packages/linux/linux-ezx_2.6.16.13.bb
@@ -68,7 +68,7 @@ do_configure() {
 	if [ "${TARGET_OS}" == "linux-gnueabi" -o  "${TARGET_OS}" == "linux-uclibcgnueabi" ]; then
 		echo "CONFIG_AEABI=y"                   >> ${S}/.config
 		echo "CONFIG_OABI_COMPAT=y"             >> ${S}/.config
-	else 
+	else
 		echo "# CONFIG_AEABI is not set"        >> ${S}/.config
 		echo "# CONFIG_OABI_COMPAT is not set"  >> ${S}/.config
 	fi
@@ -90,7 +90,7 @@ do_configure() {
 #
 do_compile_append() {
 	size=`ls -l arch/${ARCH}/boot/${KERNEL_IMAGETYPE} | awk '{ print $5}'`
-	if [ $size -ge 1294336 ]; then	
+	if [ $size -ge 1294336 ]; then
 		rm arch/${ARCH}/boot/${KERNEL_IMAGETYPE}
 		echo "Size is $size"
 		die "This kernel is too big for your EZX Phone. Please reduce the size of the kernel by making more of it modular."
@@ -103,7 +103,7 @@ do_compile_append() {
 do_deploy() {
         install -d ${DEPLOY_DIR_IMAGE}
         install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}.bin
-        tar -cvzf ${DEPLOY_DIR_IMAGE}/modules-${KERNEL_RELEASE}-${MACHINE}.tgz -C ${D} lib	
+        tar -cvzf ${DEPLOY_DIR_IMAGE}/modules-${KERNEL_RELEASE}-${MACHINE}.tgz -C ${D} lib
 }
 
 do_deploy[dirs] = "${S}"
diff --git a/packages/linux/linux-geodegx_2.4.24.bb b/packages/linux/linux-geodegx_2.4.24.bb
index c58e0d46bc..70cb5f4fd7 100644
--- a/packages/linux/linux-geodegx_2.4.24.bb
+++ b/packages/linux/linux-geodegx_2.4.24.bb
@@ -14,12 +14,12 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.4/linux-${KV}.tar.bz2 \
 
 S = "${WORKDIR}/linux-${KV}"
 
-inherit kernel 
+inherit kernel
 
 ARCH = "i386"
 KERNEL_IMAGETYPE = "bzImage"
 
 do_configure_prepend() {
-	install -m 0644 ${WORKDIR}/defconfig ${S}/.config 
+	install -m 0644 ${WORKDIR}/defconfig ${S}/.config
         oe_runmake oldconfig
 }
diff --git a/packages/linux/linux-geodelx_2.6.11.bb b/packages/linux/linux-geodelx_2.6.11.bb
index f84ceb7f1e..890aa9483a 100644
--- a/packages/linux/linux-geodelx_2.6.11.bb
+++ b/packages/linux/linux-geodelx_2.6.11.bb
@@ -14,7 +14,7 @@ KV = "${PV}"
 
 S = "${WORKDIR}/linux-${KV}"
 
-inherit kernel 
+inherit kernel
 
 ARCH = "i386"
 KERNEL_IMAGETYPE = "bzImage"
@@ -24,6 +24,6 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${KV}.tar.bz2 \
 	file://defconfig"
 
 do_configure_prepend() {
-	
-	install -m 0644 ${WORKDIR}/defconfig ${S}/.config 
+
+	install -m 0644 ${WORKDIR}/defconfig ${S}/.config
 }
diff --git a/packages/linux/linux-jlime-jornada6xx_2.6.17.bb b/packages/linux/linux-jlime-jornada6xx_2.6.17.bb
index bbdb696a48..1c22e230e1 100644
--- a/packages/linux/linux-jlime-jornada6xx_2.6.17.bb
+++ b/packages/linux/linux-jlime-jornada6xx_2.6.17.bb
@@ -12,7 +12,7 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.17.tar.gz \
 	   file://unexpected-int-fix.patch;patch=0 \
 	   file://keymap-fix.patch;patch=0 \
 	   file://io.h-fix.patch;patch=0"
-	   	            
+
 S = "${WORKDIR}/linux-${PV}"
 
 inherit kernel
diff --git a/packages/linux/linux-jlime-jornada7xx_2.6.17.bb b/packages/linux/linux-jlime-jornada7xx_2.6.17.bb
index 900191ae2b..eea3ceab7e 100644
--- a/packages/linux/linux-jlime-jornada7xx_2.6.17.bb
+++ b/packages/linux/linux-jlime-jornada7xx_2.6.17.bb
@@ -21,7 +21,7 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.17.tar.gz \
 	   file://Newfile-Epson1356fb.patch;patch=0 \
 	   file://Newfile-Jornada720_kbd.patch;patch=0 \
 	   file://Newfile-Jornada720_ts.patch;patch=0"
-	   	            
+
 S = "${WORKDIR}/linux-${PV}"
 
 inherit kernel
diff --git a/packages/linux/linux-jlime-jornada7xx_2.6.18.bb b/packages/linux/linux-jlime-jornada7xx_2.6.18.bb
index 4f0349e326..80b1e51a50 100644
--- a/packages/linux/linux-jlime-jornada7xx_2.6.18.bb
+++ b/packages/linux/linux-jlime-jornada7xx_2.6.18.bb
@@ -9,7 +9,7 @@ COMPATIBLE_MACHINE = "jornada7xx"
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.18.tar.gz \
            file://defconf_jlime \
 	   file://linux-2.6.18-jornada7xx.patch;patch=0"
-	   	            
+
 S = "${WORKDIR}/linux-${PV}"
 
 inherit kernel
diff --git a/packages/linux/linux-mtx-3_2.6.15.4.bb b/packages/linux/linux-mtx-3_2.6.15.4.bb
index b2375950e8..034f6d93d1 100644
--- a/packages/linux/linux-mtx-3_2.6.15.4.bb
+++ b/packages/linux/linux-mtx-3_2.6.15.4.bb
@@ -47,14 +47,14 @@ do_configure_prepend() {
 }
 
 do_compile() {
-	
+
 	kernel_do_compile
 
 	# set CONFIG_XIP_KERNEL=y and CONFIG_XIP_PHYS_ADDR=xxxx if commented out, else append it
 #        sed -i -e "s/^[#        ]*CONFIG_XIP_KERNEL.*/CONFIG_XIP_KERNEL=y/" \
 #                -e "s/^[#       ]*CONFIG_XIP_PHYS_ADDR.*/CONFIG_XIP_PHYS_ADDR=${XIP_PHYS_ADDR}/" .config
 #	grep -q "^CONFIG_XIP_PHYS_ADDR=" .config || echo "CONFIG_XIP_PHYS_ADDR=${XIP_PHYS_ADDR}" >>.config
-	
+
 #        oe_runmake xipImage CC="arm-linux-gcc " LD="arm-linux-ld " ARCH="arm"
 }
 
diff --git a/packages/linux/linux-navman_2.6.18.bb b/packages/linux/linux-navman_2.6.18.bb
index 47042bfec7..7cdb0b76a9 100644
--- a/packages/linux/linux-navman_2.6.18.bb
+++ b/packages/linux/linux-navman_2.6.18.bb
@@ -21,24 +21,24 @@ KERNEL_IMAGETYPE = "zImage"
 
 do_configure() {
         rm -f ${S}/.config
-        
+
         if [ ! -e ${WORKDIR}/defconfig ]; then
                 die "No default configuration for ${MACHINE} available."
         fi
 
-        
+
         if [ "${TARGET_OS}" == "linux-gnueabi" -o  "${TARGET_OS}" == "linux-uclibcgnueabi" ]; then
 		echo "CONFIG_AEABI=y"                   >> ${S}/.config
                 echo "CONFIG_OABI_COMPAT=y"             >> ${S}/.config
-        else    
+        else
                 echo "# CONFIG_AEABI is not set"        >> ${S}/.config
                 echo "# CONFIG_OABI_COMPAT is not set"  >> ${S}/.config
         fi
-        
+
         sed -e '/CONFIG_AEABI/d' \
             -e '/CONFIG_OABI_COMPAT=/d' \
             '${WORKDIR}/defconfig' >>'${S}/.config'
-        
+
         yes '' | oe_runmake oldconfig
 }
 
diff --git a/packages/linux/linux-rp-2.6.19+git/defconfig-hx2000 b/packages/linux/linux-rp-2.6.19+git/defconfig-hx2000
index ea56989b75..296c462641 100644
--- a/packages/linux/linux-rp-2.6.19+git/defconfig-hx2000
+++ b/packages/linux/linux-rp-2.6.19+git/defconfig-hx2000
@@ -1,20 +1,28 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.15-rc1-git7
-# Sat Nov 19 23:13:51 2005
+# Linux kernel version: 2.6.20-rc2
+# Mon Jan  1 01:49:04 2007
 #
 CONFIG_ARM=y
+# CONFIG_GENERIC_TIME is not set
 CONFIG_MMU=y
-CONFIG_UID16=y
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+CONFIG_HARDIRQS_SW_RESEND=y
+CONFIG_GENERIC_IRQ_PROBE=y
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
+# CONFIG_ARCH_HAS_ILOG2_U32 is not set
+# CONFIG_ARCH_HAS_ILOG2_U64 is not set
+CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_ARCH_MTD_XIP=y
+CONFIG_VECTORS_BASE=0xffff0000
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 
 #
 # Code maturity level options
 #
 CONFIG_EXPERIMENTAL=y
-# CONFIG_CLEAN_COMPILE is not set
-CONFIG_BROKEN=y
 CONFIG_BROKEN_ON_SMP=y
 CONFIG_LOCK_KERNEL=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
@@ -25,32 +33,39 @@ CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_LOCALVERSION=""
 CONFIG_LOCALVERSION_AUTO=y
 # CONFIG_SWAP is not set
-# CONFIG_SYSVIPC is not set
+CONFIG_SYSVIPC=y
+# CONFIG_IPC_NS is not set
 # CONFIG_POSIX_MQUEUE is not set
 # CONFIG_BSD_PROCESS_ACCT is not set
-CONFIG_SYSCTL=y
+# CONFIG_TASKSTATS is not set
+# CONFIG_UTS_NS is not set
 # CONFIG_AUDIT is not set
-CONFIG_HOTPLUG=y
-CONFIG_KOBJECT_UEVENT=y
 # CONFIG_IKCONFIG is not set
+CONFIG_SYSFS_DEPRECATED=y
+# CONFIG_RELAY is not set
 CONFIG_INITRAMFS_SOURCE=""
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_SYSCTL=y
 CONFIG_EMBEDDED=y
+CONFIG_UID16=y
+CONFIG_SYSCTL_SYSCALL=y
 CONFIG_KALLSYMS=y
 # CONFIG_KALLSYMS_ALL is not set
 # CONFIG_KALLSYMS_EXTRA_PASS is not set
+CONFIG_HOTPLUG=y
 CONFIG_PRINTK=y
 CONFIG_BUG=y
+CONFIG_ELF_CORE=y
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
 CONFIG_EPOLL=y
-CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_SHMEM=y
-CONFIG_CC_ALIGN_FUNCTIONS=0
-CONFIG_CC_ALIGN_LABELS=0
-CONFIG_CC_ALIGN_LOOPS=0
-CONFIG_CC_ALIGN_JUMPS=0
+CONFIG_SLAB=y
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
+# CONFIG_SLOB is not set
 
 #
 # Loadable module support
@@ -58,7 +73,6 @@ CONFIG_BASE_SMALL=0
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 # CONFIG_MODULE_FORCE_UNLOAD is not set
-CONFIG_OBSOLETE_MODPARM=y
 # CONFIG_MODVERSIONS is not set
 # CONFIG_MODULE_SRCVERSION_ALL is not set
 # CONFIG_KMOD is not set
@@ -66,6 +80,10 @@ CONFIG_OBSOLETE_MODPARM=y
 #
 # Block layer
 #
+CONFIG_BLOCK=y
+# CONFIG_LBD is not set
+# CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_LSF is not set
 
 #
 # IO Schedulers
@@ -83,17 +101,28 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
 #
 # System Type
 #
+# CONFIG_ARCH_AAEC2000 is not set
+# CONFIG_ARCH_INTEGRATOR is not set
+# CONFIG_ARCH_REALVIEW is not set
+# CONFIG_ARCH_VERSATILE is not set
+# CONFIG_ARCH_AT91 is not set
 # CONFIG_ARCH_CLPS7500 is not set
 # CONFIG_ARCH_CLPS711X is not set
 # CONFIG_ARCH_CO285 is not set
 # CONFIG_ARCH_EBSA110 is not set
-# CONFIG_ARCH_CAMELOT is not set
+# CONFIG_ARCH_EP93XX is not set
 # CONFIG_ARCH_FOOTBRIDGE is not set
-# CONFIG_ARCH_INTEGRATOR is not set
-# CONFIG_ARCH_IOP3XX is not set
+# CONFIG_ARCH_NETX is not set
+# CONFIG_ARCH_H720X is not set
+# CONFIG_ARCH_IMX is not set
+# CONFIG_ARCH_IOP32X is not set
+# CONFIG_ARCH_IOP33X is not set
+# CONFIG_ARCH_IOP13XX is not set
 # CONFIG_ARCH_IXP4XX is not set
 # CONFIG_ARCH_IXP2000 is not set
+# CONFIG_ARCH_IXP23XX is not set
 # CONFIG_ARCH_L7200 is not set
+# CONFIG_ARCH_PNX4008 is not set
 CONFIG_ARCH_PXA=y
 # CONFIG_ARCH_RPC is not set
 # CONFIG_ARCH_SA1100 is not set
@@ -101,23 +130,20 @@ CONFIG_ARCH_PXA=y
 # CONFIG_ARCH_SHARK is not set
 # CONFIG_ARCH_LH7A40X is not set
 # CONFIG_ARCH_OMAP is not set
-# CONFIG_ARCH_VERSATILE is not set
-# CONFIG_ARCH_REALVIEW is not set
-# CONFIG_ARCH_IMX is not set
-# CONFIG_ARCH_H720X is not set
-# CONFIG_ARCH_AAEC2000 is not set
 
 #
 # Intel PXA2xx Implementations
 #
 # CONFIG_ARCH_LUBBOCK is not set
+# CONFIG_MACH_LOGICPD_PXA270 is not set
 # CONFIG_MACH_MAINSTONE is not set
 # CONFIG_ARCH_PXA_IDP is not set
 # CONFIG_PXA_SHARPSL is not set
+# CONFIG_MACH_TRIZEPS4 is not set
 CONFIG_MACH_HX2750=y
 CONFIG_PXA27x=y
-CONFIG_PXA_KEYS=y
 CONFIG_PXA_SSP=y
+CONFIG_PXA_KEYS=y
 
 #
 # Processor Type
@@ -128,17 +154,20 @@ CONFIG_CPU_32v5=y
 CONFIG_CPU_ABRT_EV5T=y
 CONFIG_CPU_CACHE_VIVT=y
 CONFIG_CPU_TLB_V4WBI=y
+CONFIG_CPU_CP15=y
+CONFIG_CPU_CP15_MMU=y
 
 #
 # Processor Features
 #
 CONFIG_ARM_THUMB=y
+# CONFIG_CPU_DCACHE_DISABLE is not set
+CONFIG_IWMMXT=y
 CONFIG_XSCALE_PMU=y
 
 #
 # Bus support
 #
-CONFIG_ISA_DMA_API=y
 
 #
 # PCCARD (PCMCIA/CardBus) support
@@ -159,6 +188,9 @@ CONFIG_PCMCIA_PXA2XX=y
 #
 CONFIG_PREEMPT=y
 CONFIG_NO_IDLE_HZ=y
+CONFIG_HZ=100
+CONFIG_AEABI=y
+CONFIG_OABI_COMPAT=y
 # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
 CONFIG_SELECT_MEMORY_MODEL=y
 CONFIG_FLATMEM_MANUAL=y
@@ -168,6 +200,7 @@ CONFIG_FLATMEM=y
 CONFIG_FLAT_NODE_MEM_MAP=y
 # CONFIG_SPARSEMEM_STATIC is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4096
+# CONFIG_RESOURCES_64BIT is not set
 CONFIG_ALIGNMENT_TRAP=y
 
 #
@@ -175,7 +208,9 @@ CONFIG_ALIGNMENT_TRAP=y
 #
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
+CONFIG_CMDLINE="console=ttyS0,115200n8 console=tty1 noinitrd root=/dev/mtdblock2 rootfstype=jffs2   dyntick=enable debug"
 # CONFIG_XIP_KERNEL is not set
+# CONFIG_KEXEC is not set
 
 #
 # CPU Frequency scaling
@@ -199,14 +234,15 @@ CONFIG_FPE_NWFPE=y
 CONFIG_BINFMT_ELF=y
 # CONFIG_BINFMT_AOUT is not set
 # CONFIG_BINFMT_MISC is not set
-# CONFIG_ARTHUR is not set
 
 #
 # Power management options
 #
 CONFIG_PM=y
 # CONFIG_PM_LEGACY is not set
-# CONFIG_PM_DEBUG is not set
+CONFIG_PM_DEBUG=y
+# CONFIG_DISABLE_CONSOLE_SUSPEND is not set
+# CONFIG_PM_SYSFS_DEPRECATED is not set
 CONFIG_APM=y
 
 #
@@ -217,9 +253,13 @@ CONFIG_NET=y
 #
 # Networking options
 #
+# CONFIG_NETDEBUG is not set
 CONFIG_PACKET=y
 CONFIG_PACKET_MMAP=y
 CONFIG_UNIX=y
+CONFIG_XFRM=y
+# CONFIG_XFRM_USER is not set
+# CONFIG_XFRM_SUB_POLICY is not set
 # CONFIG_NET_KEY is not set
 CONFIG_INET=y
 # CONFIG_IP_MULTICAST is not set
@@ -233,12 +273,21 @@ CONFIG_SYN_COOKIES=y
 # CONFIG_INET_AH is not set
 # CONFIG_INET_ESP is not set
 # CONFIG_INET_IPCOMP is not set
+# CONFIG_INET_XFRM_TUNNEL is not set
 # CONFIG_INET_TUNNEL is not set
+CONFIG_INET_XFRM_MODE_TRANSPORT=y
+CONFIG_INET_XFRM_MODE_TUNNEL=y
+CONFIG_INET_XFRM_MODE_BEET=y
 CONFIG_INET_DIAG=m
 CONFIG_INET_TCP_DIAG=m
 # CONFIG_TCP_CONG_ADVANCED is not set
-CONFIG_TCP_CONG_BIC=y
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
+# CONFIG_INET6_XFRM_TUNNEL is not set
+# CONFIG_INET6_TUNNEL is not set
+# CONFIG_NETWORK_SECMARK is not set
 # CONFIG_NETFILTER is not set
 
 #
@@ -250,6 +299,11 @@ CONFIG_TCP_CONG_BIC=y
 # SCTP Configuration (EXPERIMENTAL)
 #
 # CONFIG_IP_SCTP is not set
+
+#
+# TIPC Configuration (EXPERIMENTAL)
+#
+# CONFIG_TIPC is not set
 # CONFIG_ATM is not set
 # CONFIG_BRIDGE is not set
 # CONFIG_VLAN_8021Q is not set
@@ -259,7 +313,6 @@ CONFIG_TCP_CONG_BIC=y
 # CONFIG_ATALK is not set
 # CONFIG_X25 is not set
 # CONFIG_LAPB is not set
-# CONFIG_NET_DIVERT is not set
 # CONFIG_ECONET is not set
 # CONFIG_WAN_ROUTER is not set
 
@@ -280,6 +333,8 @@ CONFIG_IEEE80211=m
 CONFIG_IEEE80211_CRYPT_WEP=m
 # CONFIG_IEEE80211_CRYPT_CCMP is not set
 # CONFIG_IEEE80211_CRYPT_TKIP is not set
+# CONFIG_IEEE80211_SOFTMAC is not set
+CONFIG_WIRELESS_EXT=y
 
 #
 # Device Drivers
@@ -292,6 +347,7 @@ CONFIG_STANDALONE=y
 # CONFIG_PREVENT_FIRMWARE_BUILD is not set
 CONFIG_FW_LOADER=y
 # CONFIG_DEBUG_DRIVER is not set
+# CONFIG_SYS_HYPERVISOR is not set
 
 #
 # Connector - unified userspace <-> kernelspace linker
@@ -318,6 +374,7 @@ CONFIG_MTD_BLOCK=y
 # CONFIG_NFTL is not set
 # CONFIG_INFTL is not set
 # CONFIG_RFD_FTL is not set
+# CONFIG_SSFDC is not set
 
 #
 # RAM/ROM/Flash chip drivers
@@ -366,7 +423,6 @@ CONFIG_MTD_CFI_UTIL=y
 # CONFIG_MTD_SLRAM is not set
 # CONFIG_MTD_PHRAM is not set
 # CONFIG_MTD_MTDRAM is not set
-# CONFIG_MTD_BLKMTD is not set
 # CONFIG_MTD_BLOCK2MTD is not set
 
 #
@@ -405,6 +461,7 @@ CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_COUNT=16
 CONFIG_BLK_DEV_RAM_SIZE=8192
+CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 CONFIG_BLK_DEV_INITRD=y
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
@@ -413,6 +470,7 @@ CONFIG_BLK_DEV_INITRD=y
 # ATA/ATAPI/MFM/RLL support
 #
 CONFIG_IDE=y
+CONFIG_IDE_MAX_HWIFS=4
 CONFIG_BLK_DEV_IDE=y
 
 #
@@ -441,18 +499,17 @@ CONFIG_IDE_GENERIC=y
 #
 # CONFIG_RAID_ATTRS is not set
 # CONFIG_SCSI is not set
+# CONFIG_SCSI_NETLINK is not set
+
+#
+# Serial ATA (prod) and Parallel ATA (experimental) drivers
+#
+# CONFIG_ATA is not set
 
 #
 # Multi-device support (RAID and LVM)
 #
-CONFIG_MD=y
-CONFIG_BLK_DEV_DM=m
-CONFIG_DM_CRYPT=m
-CONFIG_DM_SNAPSHOT=m
-CONFIG_DM_MIRROR=m
-CONFIG_DM_ZERO=m
-CONFIG_DM_MULTIPATH=m
-CONFIG_DM_MULTIPATH_EMC=m
+# CONFIG_MD is not set
 
 #
 # Fusion MPT device support
@@ -462,7 +519,6 @@ CONFIG_DM_MULTIPATH_EMC=m
 #
 # IEEE 1394 (FireWire) support
 #
-# CONFIG_IEEE1394 is not set
 
 #
 # I2O device support
@@ -489,6 +545,7 @@ CONFIG_NET_ETHERNET=y
 CONFIG_MII=m
 # CONFIG_SMC91X is not set
 # CONFIG_DM9000 is not set
+# CONFIG_SMC911X is not set
 
 #
 # Ethernet (1000 Mbit)
@@ -506,6 +563,7 @@ CONFIG_MII=m
 # Wireless LAN (non-hamradio)
 #
 CONFIG_NET_RADIO=y
+# CONFIG_NET_WIRELESS_RTNETLINK is not set
 
 #
 # Obsolete Wireless cards support (pre-802.11)
@@ -522,7 +580,6 @@ CONFIG_NET_RADIO=y
 #
 # Wireless 802.11b ISA/PCI cards support
 #
-# CONFIG_AIRO is not set
 CONFIG_HERMES=m
 # CONFIG_ATMEL is not set
 
@@ -535,6 +592,7 @@ CONFIG_PCMCIA_SPECTRUM=m
 # CONFIG_PCMCIA_WL3501 is not set
 CONFIG_HOSTAP=m
 CONFIG_HOSTAP_FIRMWARE=y
+# CONFIG_HOSTAP_FIRMWARE_NVRAM is not set
 CONFIG_HOSTAP_CS=m
 CONFIG_NET_WIRELESS=y
 
@@ -565,6 +623,7 @@ CONFIG_PPP_BSDCOMP=m
 # CONFIG_PPP_MPPE is not set
 # CONFIG_PPPOE is not set
 # CONFIG_SLIP is not set
+CONFIG_SLHC=m
 # CONFIG_SHAPER is not set
 # CONFIG_NETCONSOLE is not set
 # CONFIG_NETPOLL is not set
@@ -579,11 +638,12 @@ CONFIG_PPP_BSDCOMP=m
 # Input device support
 #
 CONFIG_INPUT=y
+# CONFIG_INPUT_FF_MEMLESS is not set
 
 #
 # Userland interfaces
 #
-CONFIG_INPUT_MOUSEDEV=y
+CONFIG_INPUT_MOUSEDEV=m
 # CONFIG_INPUT_MOUSEDEV_PSAUX is not set
 CONFIG_INPUT_MOUSEDEV_SCREEN_X=240
 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=320
@@ -591,7 +651,7 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=320
 # CONFIG_INPUT_TSDEV is not set
 CONFIG_INPUT_EVDEV=y
 # CONFIG_INPUT_EVBUG is not set
-# CONFIG_INPUT_POWER is not set
+CONFIG_INPUT_POWER=y
 
 #
 # Input Device Drivers
@@ -604,6 +664,10 @@ CONFIG_INPUT_TOUCHSCREEN=y
 # CONFIG_TOUCHSCREEN_ELO is not set
 # CONFIG_TOUCHSCREEN_MTOUCH is not set
 # CONFIG_TOUCHSCREEN_MK712 is not set
+# CONFIG_TOUCHSCREEN_PENMOUNT is not set
+# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
+# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
+# CONFIG_TOUCHSCREEN_UCB1400 is not set
 CONFIG_TOUCHSCREEN_TSC2101=y
 # CONFIG_INPUT_MISC is not set
 
@@ -619,6 +683,7 @@ CONFIG_TOUCHSCREEN_TSC2101=y
 CONFIG_VT=y
 CONFIG_VT_CONSOLE=y
 CONFIG_HW_CONSOLE=y
+# CONFIG_VT_HW_CONSOLE_BINDING is not set
 # CONFIG_SERIAL_NONSTANDARD is not set
 
 #
@@ -645,16 +710,12 @@ CONFIG_UNIX98_PTYS=y
 # Watchdog Cards
 #
 # CONFIG_WATCHDOG is not set
+CONFIG_HW_RANDOM=m
 # CONFIG_NVRAM is not set
-# CONFIG_SA1100_RTC is not set
 # CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
 
 #
-# Ftape, the floppy tape device driver
-#
-
-#
 # PCMCIA character devices
 #
 # CONFIG_SYNCLINK_CS is not set
@@ -666,7 +727,6 @@ CONFIG_UNIX98_PTYS=y
 # TPM devices
 #
 # CONFIG_TCG_TPM is not set
-# CONFIG_TELCLOCK is not set
 
 #
 # I2C support
@@ -674,22 +734,44 @@ CONFIG_UNIX98_PTYS=y
 # CONFIG_I2C is not set
 
 #
+# SPI support
+#
+# CONFIG_SPI is not set
+# CONFIG_SPI_MASTER is not set
+
+#
+# Dallas's 1-wire bus
+#
+# CONFIG_W1 is not set
+
+#
 # Hardware Monitoring support
 #
 # CONFIG_HWMON is not set
+# CONFIG_HWMON_VID is not set
 
 #
 # Misc devices
 #
+# CONFIG_TIFM_CORE is not set
 
 #
-# Multimedia Capabilities Port drivers
+# Multi-Function Devices
 #
+CONFIG_MFD_TSC2101=y
 
 #
-# Multi-Function Devices
+# LED devices
+#
+# CONFIG_NEW_LEDS is not set
+
+#
+# LED drivers
+#
+
+#
+# LED Triggers
 #
-CONFIG_MFD_TSC2101=y
 
 #
 # Multimedia devices
@@ -704,16 +786,22 @@ CONFIG_MFD_TSC2101=y
 #
 # Graphics support
 #
+CONFIG_FIRMWARE_EDID=y
 CONFIG_FB=y
 CONFIG_FB_CFB_FILLRECT=y
 CONFIG_FB_CFB_COPYAREA=y
 CONFIG_FB_CFB_IMAGEBLIT=y
 # CONFIG_FB_MACMODES is not set
+# CONFIG_FB_BACKLIGHT is not set
 # CONFIG_FB_MODE_HELPERS is not set
 # CONFIG_FB_TILEBLITTING is not set
 # CONFIG_FB_S1D13XXX is not set
 CONFIG_FB_PXA=y
+CONFIG_FB_PXA_LCD_QVGA=y
+# CONFIG_FB_PXA_LCD_VGA is not set
+# CONFIG_FB_PXA_OVERLAY is not set
 # CONFIG_FB_PXA_PARAMETERS is not set
+# CONFIG_FB_MBX is not set
 # CONFIG_FB_VIRTUAL is not set
 
 #
@@ -730,7 +818,14 @@ CONFIG_FONT_8x16=y
 #
 # Logo configuration
 #
-# CONFIG_LOGO is not set
+CONFIG_LOGO=y
+CONFIG_LOGO_LINUX_MONO=y
+CONFIG_LOGO_LINUX_VGA16=y
+# CONFIG_LOGO_LINUX_CLUT224 is not set
+CONFIG_LOGO_OHAND_CLUT224=y
+# CONFIG_LOGO_OZ240_CLUT224 is not set
+# CONFIG_LOGO_OZ480_CLUT224 is not set
+# CONFIG_LOGO_OZ640_CLUT224 is not set
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
 CONFIG_BACKLIGHT_DEVICE=y
@@ -744,10 +839,16 @@ CONFIG_BACKLIGHT_HX2750=y
 # CONFIG_SOUND is not set
 
 #
+# HID Devices
+#
+CONFIG_HID=y
+
+#
 # USB support
 #
 CONFIG_USB_ARCH_HAS_HCD=y
 CONFIG_USB_ARCH_HAS_OHCI=y
+# CONFIG_USB_ARCH_HAS_EHCI is not set
 # CONFIG_USB is not set
 
 #
@@ -766,14 +867,16 @@ CONFIG_MMC=y
 # CONFIG_MMC_DEBUG is not set
 CONFIG_MMC_BLOCK=y
 CONFIG_MMC_PXA=y
-# CONFIG_MMC_WBSD is not set
+# CONFIG_MMC_TIFM_SD is not set
 
 #
 # Real Time Clock
 #
+CONFIG_RTC_LIB=y
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_HCTOSYS=y
 CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+# CONFIG_RTC_DEBUG is not set
 
 #
 # RTC interfaces
@@ -781,15 +884,17 @@ CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
 CONFIG_RTC_INTF_SYSFS=y
 CONFIG_RTC_INTF_PROC=y
 CONFIG_RTC_INTF_DEV=y
+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
 
 #
 # RTC drivers
 #
-# CONFIG_RTC_DRV_X1205 is not set
-# CONFIG_RTC_DRV_DS1672 is not set
-# CONFIG_RTC_DRV_PCF8563 is not set
+# CONFIG_RTC_DRV_DS1553 is not set
+# CONFIG_RTC_DRV_DS1742 is not set
+# CONFIG_RTC_DRV_M48T86 is not set
 CONFIG_RTC_DRV_SA1100=y
 # CONFIG_RTC_DRV_TEST is not set
+# CONFIG_RTC_DRV_V3020 is not set
 
 #
 # File systems
@@ -798,14 +903,17 @@ CONFIG_EXT2_FS=y
 # CONFIG_EXT2_FS_XATTR is not set
 # CONFIG_EXT2_FS_XIP is not set
 # CONFIG_EXT3_FS is not set
-# CONFIG_JBD is not set
+# CONFIG_EXT4DEV_FS is not set
 # CONFIG_REISERFS_FS is not set
 # CONFIG_JFS_FS is not set
 # CONFIG_FS_POSIX_ACL is not set
 # CONFIG_XFS_FS is not set
+# CONFIG_GFS2_FS is not set
+# CONFIG_OCFS2_FS is not set
 # CONFIG_MINIX_FS is not set
 # CONFIG_ROMFS_FS is not set
 CONFIG_INOTIFY=y
+CONFIG_INOTIFY_USER=y
 # CONFIG_QUOTA is not set
 CONFIG_DNOTIFY=y
 # CONFIG_AUTOFS_FS is not set
@@ -832,12 +940,13 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
 # Pseudo filesystems
 #
 CONFIG_PROC_FS=y
+CONFIG_PROC_SYSCTL=y
 CONFIG_SYSFS=y
-# CONFIG_TMPFS is not set
-# CONFIG_HUGETLBFS is not set
+CONFIG_TMPFS=y
+# CONFIG_TMPFS_POSIX_ACL is not set
 # CONFIG_HUGETLB_PAGE is not set
 CONFIG_RAMFS=y
-# CONFIG_RELAYFS_FS is not set
+# CONFIG_CONFIGFS_FS is not set
 
 #
 # Miscellaneous filesystems
@@ -849,15 +958,14 @@ CONFIG_RAMFS=y
 # CONFIG_BEFS_FS is not set
 # CONFIG_BFS_FS is not set
 # CONFIG_EFS_FS is not set
-# CONFIG_JFFS_FS is not set
 CONFIG_JFFS2_FS=y
 CONFIG_JFFS2_FS_DEBUG=0
 CONFIG_JFFS2_FS_WRITEBUFFER=y
 # CONFIG_JFFS2_SUMMARY is not set
+# CONFIG_JFFS2_FS_XATTR is not set
 # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
 CONFIG_JFFS2_ZLIB=y
 CONFIG_JFFS2_RTIME=y
-CONFIG_JFFS2_SUMMARY=y
 # CONFIG_JFFS2_RUBIN is not set
 CONFIG_CRAMFS=y
 CONFIG_SQUASHFS=m
@@ -900,6 +1008,7 @@ CONFIG_MSDOS_PARTITION=y
 # CONFIG_SGI_PARTITION is not set
 # CONFIG_ULTRIX_PARTITION is not set
 # CONFIG_SUN_PARTITION is not set
+# CONFIG_KARMA_PARTITION is not set
 # CONFIG_EFI_PARTITION is not set
 
 #
@@ -947,6 +1056,11 @@ CONFIG_NLS_ISO8859_1=y
 CONFIG_NLS_UTF8=y
 
 #
+# Distributed Lock Manager
+#
+# CONFIG_DLM is not set
+
+#
 # Profiling support
 #
 # CONFIG_PROFILING is not set
@@ -955,24 +1069,33 @@ CONFIG_NLS_UTF8=y
 # Kernel hacking
 #
 # CONFIG_PRINTK_TIME is not set
-CONFIG_DEBUG_KERNEL=y
+CONFIG_ENABLE_MUST_CHECK=y
 # CONFIG_MAGIC_SYSRQ is not set
+# CONFIG_UNUSED_SYMBOLS is not set
+# CONFIG_DEBUG_FS is not set
+# CONFIG_HEADERS_CHECK is not set
+CONFIG_DEBUG_KERNEL=y
 CONFIG_LOG_BUF_SHIFT=14
 CONFIG_DETECT_SOFTLOCKUP=y
 # CONFIG_SCHEDSTATS is not set
 # CONFIG_DEBUG_SLAB is not set
 CONFIG_DEBUG_PREEMPT=y
+# CONFIG_DEBUG_RT_MUTEXES is not set
+# CONFIG_RT_MUTEX_TESTER is not set
 # CONFIG_DEBUG_SPINLOCK is not set
+# CONFIG_DEBUG_MUTEXES is not set
+# CONFIG_DEBUG_RWSEMS is not set
 # CONFIG_DEBUG_SPINLOCK_SLEEP is not set
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
 # CONFIG_DEBUG_KOBJECT is not set
 # CONFIG_DEBUG_BUGVERBOSE is not set
 # CONFIG_DEBUG_INFO is not set
-# CONFIG_DEBUG_FS is not set
 # CONFIG_DEBUG_VM is not set
+# CONFIG_DEBUG_LIST is not set
 CONFIG_FRAME_POINTER=y
+CONFIG_FORCED_INLINING=y
 # CONFIG_RCU_TORTURE_TEST is not set
 # CONFIG_DEBUG_USER is not set
-# CONFIG_DEBUG_WAITQ is not set
 CONFIG_DEBUG_ERRORS=y
 CONFIG_DEBUG_LL=y
 # CONFIG_DEBUG_ICEDCC is not set
@@ -987,7 +1110,11 @@ CONFIG_DEBUG_LL=y
 # Cryptographic options
 #
 CONFIG_CRYPTO=y
+CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_BLKCIPHER=m
+CONFIG_CRYPTO_MANAGER=m
 # CONFIG_CRYPTO_HMAC is not set
+# CONFIG_CRYPTO_XCBC is not set
 # CONFIG_CRYPTO_NULL is not set
 # CONFIG_CRYPTO_MD4 is not set
 # CONFIG_CRYPTO_MD5 is not set
@@ -996,6 +1123,10 @@ CONFIG_CRYPTO=y
 # CONFIG_CRYPTO_SHA512 is not set
 # CONFIG_CRYPTO_WP512 is not set
 # CONFIG_CRYPTO_TGR192 is not set
+# CONFIG_CRYPTO_GF128MUL is not set
+CONFIG_CRYPTO_ECB=m
+CONFIG_CRYPTO_CBC=m
+# CONFIG_CRYPTO_LRW is not set
 # CONFIG_CRYPTO_DES is not set
 # CONFIG_CRYPTO_BLOWFISH is not set
 # CONFIG_CRYPTO_TWOFISH is not set
@@ -1019,10 +1150,12 @@ CONFIG_CRYPTO_CRC32C=y
 #
 # Library routines
 #
+CONFIG_BITREVERSE=y
 CONFIG_CRC_CCITT=m
 # CONFIG_CRC16 is not set
 CONFIG_CRC32=y
 CONFIG_LIBCRC32C=y
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=y
-
+CONFIG_PLIST=y
+CONFIG_IOMAP_COPY=y
diff --git a/packages/linux/linux-rp_2.6.16.bb b/packages/linux/linux-rp_2.6.16.bb
index 6ce8ba1ab6..f1de99d452 100644
--- a/packages/linux/linux-rp_2.6.16.bb
+++ b/packages/linux/linux-rp_2.6.16.bb
@@ -8,9 +8,9 @@ PR = "r47"
 # http://www.kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.15-rc1.bz2;patch=1 \
 # http://www.kernel.org/pub/linux/kernel/v2.6/snapshots/patch-2.6.15-rc2-git1.bz2;patch=1 \
 # http://www.kernel.org/pub/linux/kernel/people/alan/linux-2.6/2.6.10/patch-2.6.10-ac8.gz;patch=1 \
-# http://www.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.14-rc2/2.6.14-rc2-mm1/2.6.14-rc2-mm1.bz2;patch=1 \	   
+# http://www.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.14-rc2/2.6.14-rc2-mm1/2.6.14-rc2-mm1.bz2;patch=1 \
 
-# Patches submitted upstream are towards top of this list 
+# Patches submitted upstream are towards top of this list
 # Hacks should clearly named and at the bottom
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2 \
            file://rmk-mmc1.patch;patch=1;status=merged \
@@ -119,12 +119,12 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2 \
 # Disabled until I find the reason this gives issues with cdc_subset
 #            ${RPSRC}/usb_rndis_tweaks-r0.patch;patch=1 \
 
-# These patches would really help collie/poodle but we 
+# These patches would really help collie/poodle but we
 # need someone to maintain them
-# ${JLSRC}/zaurus-lcd-2.6.11.diff.gz;patch=1 
+# ${JLSRC}/zaurus-lcd-2.6.11.diff.gz;patch=1
 #   (Pavel Machek's git tree has updated versions of this?)
 #   Also parts were recently committed to mainline by rmk (drivers/mfd/)
-# ${JLSRC}/zaurus-base-2.6.11.diff.gz;patch=1 
+# ${JLSRC}/zaurus-base-2.6.11.diff.gz;patch=1
 #   (This is mostly in mainline now?)
 # ${JLSRC}/zaurus-local-2.6.11.diff.gz;patch=1 \
 # ${JLSRC}/zaurus-leds-2.6.11.diff.gz;patch=1 \
diff --git a/packages/linux/linux-rp_2.6.17.bb b/packages/linux/linux-rp_2.6.17.bb
index f2579db66f..fceb547e16 100644
--- a/packages/linux/linux-rp_2.6.17.bb
+++ b/packages/linux/linux-rp_2.6.17.bb
@@ -8,9 +8,9 @@ PR = "r32"
 # http://www.kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.15-rc1.bz2;patch=1 \
 # http://www.kernel.org/pub/linux/kernel/v2.6/snapshots/patch-2.6.15-rc2-git1.bz2;patch=1 \
 # http://www.kernel.org/pub/linux/kernel/people/alan/linux-2.6/2.6.10/patch-2.6.10-ac8.gz;patch=1 \
-# http://www.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.14-rc2/2.6.14-rc2-mm1/2.6.14-rc2-mm1.bz2;patch=1 \	   
+# http://www.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.14-rc2/2.6.14-rc2-mm1/2.6.14-rc2-mm1.bz2;patch=1 \
 
-# Patches submitted upstream are towards top of this list 
+# Patches submitted upstream are towards top of this list
 # Hacks should clearly named and at the bottom
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.17.tar.bz2 \
            ${RPSRC}/poodle_partsize-r0.patch;patch=1;status=merged \
@@ -48,7 +48,7 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.17.tar.bz2 \
            ${RPSRC}/poodle_audio-r7.patch;patch=1 \
            ${RPSRC}/pxa27x_overlay-r2.patch;patch=1 \
            ${RPSRC}/w100_extaccel-r0.patch;patch=1 \
-           ${RPSRC}/xscale_cache_workaround-r0.patch;patch=1 \
+           ${RPSRC}/xscale_cache_workaround-r1.patch;patch=1 \
            file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;patch=1 \
            file://hrw-pcmcia-ids-r5.patch;patch=1 \
            ${RPSRC}/logo_oh-r0.patch.bz2;patch=1;status=unmergable \
@@ -85,7 +85,7 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.17.tar.bz2 \
 
 # Is anything out of this still needed? Parts were commited to mainline by rmk (drivers/mfd/)
 # (Pavel Machek's git tree has updated versions of this?)
-#  ${JLSRC}/zaurus-lcd-2.6.11.diff.gz;patch=1 
+#  ${JLSRC}/zaurus-lcd-2.6.11.diff.gz;patch=1
 
 # These patches are extracted from Pavel Machek's git tree
 # (diff against vanilla kernel)
diff --git a/packages/linux/linux-rp_2.6.18.bb b/packages/linux/linux-rp_2.6.18.bb
index 2248f88ae0..a4d7813f53 100644
--- a/packages/linux/linux-rp_2.6.18.bb
+++ b/packages/linux/linux-rp_2.6.18.bb
@@ -10,7 +10,7 @@ PR = "r7"
 # http://www.kernel.org/pub/linux/kernel/people/alan/linux-2.6/2.6.10/patch-2.6.10-ac8.gz;patch=1
 # http://www.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.14-rc2/2.6.14-rc2-mm1/2.6.14-rc2-mm1.bz2;patch=1
 
-# Patches submitted upstream are towards top of this list 
+# Patches submitted upstream are towards top of this list
 # Hacks should clearly named and at the bottom
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.18.tar.bz2 \
            http://opensource.wolfsonmicro.com/~lg/asoc/asoc-v0.12.4.patch;patch=1 \
@@ -34,7 +34,7 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.18.tar.bz2 \
            ${RPSRC}/pxafb_changeres-r2.patch;patch=1 \
            ${RPSRC}/pxa27x_overlay-r2.patch;patch=1 \
            ${RPSRC}/w100_extaccel-r0.patch;patch=1 \
-           ${RPSRC}/xscale_cache_workaround-r0.patch;patch=1 \
+           ${RPSRC}/xscale_cache_workaround-r1.patch;patch=1 \
            file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;patch=1 \
            file://hrw-pcmcia-ids-r5.patch;patch=1 \
            ${RPSRC}/logo_oh-r0.patch.bz2;patch=1;status=unmergable \
@@ -67,7 +67,7 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.18.tar.bz2 \
 
 # Is anything out of this still needed? Parts were commited to mainline by rmk (drivers/mfd/)
 # (Pavel Machek's git tree has updated versions of this?)
-#  ${JLSRC}/zaurus-lcd-2.6.11.diff.gz;patch=1 
+#  ${JLSRC}/zaurus-lcd-2.6.11.diff.gz;patch=1
 
 # These patches are extracted from Pavel Machek's git tree
 # (diff against vanilla kernel)
diff --git a/packages/linux/linux-rp_2.6.19+git.bb b/packages/linux/linux-rp_2.6.19+git.bb
index e8393c398f..4620537aa1 100644
--- a/packages/linux/linux-rp_2.6.19+git.bb
+++ b/packages/linux/linux-rp_2.6.19+git.bb
@@ -1,6 +1,6 @@
 require linux-rp.inc
 
-PR = "r2"
+PR = "r4"
 
 DEFAULT_PREFERENCE = "-1"
 
@@ -14,15 +14,16 @@ DEFAULT_PREFERENCE = "-1"
 
 # Patches submitted upstream are towards top of this list 
 # Hacks should clearly named and at the bottom
-SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=v2.6.20-rc1 \
-           http://opensource.wolfsonmicro.com/~lg/asoc/asoc-v0.12.4.patch;patch=1 \
-           ${RPSRC}/pxafb_fix_params-r1.patch;patch=1 \
-           ${RPSRC}/hx2750_base-r27.patch;patch=1 \
-           ${RPSRC}/hx2750_bl-r7.patch;patch=1 \
+SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=v2.6.20-rc2 \
+           http://opensource.wolfsonmicro.com/~lg/asoc/asoc-v0.12.4.patch;patch=1;status=merged \
+           ${RPSRC}/xscale_cache_workaround-r1.patch;patch=1;status=merged \
+           ${RPSRC}/backlight_parameter_fix-r0.patch;patch=1;status=pending \
+           ${RPSRC}/hx2750_base-r28.patch;patch=1 \
+           ${RPSRC}/hx2750_bl-r8.patch;patch=1 \
            ${RPSRC}/hx2750_pcmcia-r2.patch;patch=1 \
-           ${RPSRC}/pxa_keys-r6.patch;patch=1 \
-           ${RPSRC}/tsc2101-r15.patch;patch=1 \
-           ${RPSRC}/hx2750_test1-r4.patch;patch=1 \
+           ${RPSRC}/pxa_keys-r7.patch;patch=1 \
+           ${RPSRC}/tsc2101-r16.patch;patch=1 \
+           ${RPSRC}/hx2750_test1-r6.patch;patch=1 \
            ${RPSRC}/pxa_timerfix-r0.patch;patch=1 \
            ${RPSRC}/input_power-r6.patch;patch=1 \
            ${RPSRC}/pxa25x_cpufreq-r2.patch;patch=1 \
@@ -30,12 +31,11 @@ SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;
            ${RPSRC}/pm_changes-r1.patch;patch=1 \
            ${RPSRC}/usb_add_epalloc-r3.patch;patch=1 \
            ${RPSRC}/usb_pxa27x_udc-r3.patch;patch=1 \
-           ${DOSRC}/kexec-arm-r3.patch;patch=1 \
+           ${DOSRC}/kexec-arm-r4.patch;patch=1 \
            ${RPSRC}/locomo_kbd_tweak-r1.patch;patch=1 \
            ${RPSRC}/poodle_pm-r3.patch;patch=1 \
            ${RPSRC}/pxa27x_overlay-r5.patch;patch=1 \
            ${RPSRC}/w100_extaccel-r0.patch;patch=1 \
-           ${RPSRC}/xscale_cache_workaround-r0.patch;patch=1 \
            file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;patch=1 \
            ${RPSRC}/logo_oh-r0.patch.bz2;patch=1;status=unmergable \
            ${RPSRC}/logo_oz-r2.patch.bz2;patch=1;status=unmergable \
@@ -65,7 +65,7 @@ SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;
 
 # Is anything out of this still needed? Parts were commited to mainline by rmk (drivers/mfd/)
 # (Pavel Machek's git tree has updated versions of this?)
-#  ${JLSRC}/zaurus-lcd-2.6.11.diff.gz;patch=1 
+#  ${JLSRC}/zaurus-lcd-2.6.11.diff.gz;patch=1
 
 # These patches are extracted from Pavel Machek's git tree
 # (diff against vanilla kernel)
diff --git a/packages/linux/linux-rp_2.6.19.bb b/packages/linux/linux-rp_2.6.19.bb
index 96307e0f92..41212f3c92 100644
--- a/packages/linux/linux-rp_2.6.19.bb
+++ b/packages/linux/linux-rp_2.6.19.bb
@@ -12,7 +12,7 @@ DEFAULT_PREFERENCE = "-1"
 # http://www.kernel.org/pub/linux/kernel/people/alan/linux-2.6/2.6.10/patch-2.6.10-ac8.gz;patch=1
 # http://www.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.14-rc2/2.6.14-rc2-mm1/2.6.14-rc2-mm1.bz2;patch=1
 
-# Patches submitted upstream are towards top of this list 
+# Patches submitted upstream are towards top of this list
 # Hacks should clearly named and at the bottom
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.19.tar.bz2 \
            http://opensource.wolfsonmicro.com/~lg/asoc/asoc-v0.12.4.patch;patch=1 \
@@ -36,7 +36,7 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.19.tar.bz2 \
            ${RPSRC}/poodle_pm-r3.patch;patch=1 \
            ${RPSRC}/pxa27x_overlay-r4.patch;patch=1 \
            ${RPSRC}/w100_extaccel-r0.patch;patch=1 \
-           ${RPSRC}/xscale_cache_workaround-r0.patch;patch=1 \
+           ${RPSRC}/xscale_cache_workaround-r1.patch;patch=1 \
            file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;patch=1 \
            ${RPSRC}/logo_oh-r0.patch.bz2;patch=1;status=unmergable \
            ${RPSRC}/logo_oz-r2.patch.bz2;patch=1;status=unmergable \
@@ -67,7 +67,7 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.19.tar.bz2 \
 
 # Is anything out of this still needed? Parts were commited to mainline by rmk (drivers/mfd/)
 # (Pavel Machek's git tree has updated versions of this?)
-#  ${JLSRC}/zaurus-lcd-2.6.11.diff.gz;patch=1 
+#  ${JLSRC}/zaurus-lcd-2.6.11.diff.gz;patch=1
 
 # These patches are extracted from Pavel Machek's git tree
 # (diff against vanilla kernel)
diff --git a/packages/linux/linux-storcenter_2.6.12.6.bb b/packages/linux/linux-storcenter_2.6.12.6.bb
index d949e13324..efbef7e937 100644
--- a/packages/linux/linux-storcenter_2.6.12.6.bb
+++ b/packages/linux/linux-storcenter_2.6.12.6.bb
@@ -13,7 +13,7 @@ PR = "r0"
 # QFMT_V2
 # DNOTIFY?
 # MSDOS_FS, VFAT_FS, NTFS_FS?
-# 
+#
 # USB_GADGET? - USB_GADGET_NET2280, USB_ETH, USB_ETH_RNDIS
 #
 #
diff --git a/packages/linux/linux-wrt_2.4.30.bb b/packages/linux/linux-wrt_2.4.30.bb
index cf67784af4..4bcdf9d81d 100644
--- a/packages/linux/linux-wrt_2.4.30.bb
+++ b/packages/linux/linux-wrt_2.4.30.bb
@@ -97,8 +97,8 @@ addtask unpack_extra after do_unpack before do_patch
 do_configure_prepend() {
 	install -m 0644 ${WORKDIR}/linux.config ${S}/.config
 	echo "CONFIG_CMDLINE=\"${CMDLINE}\"" >> ${S}/.config
-	
-	sed -i -e 's/@expr length/@-expr length/' ${S}/Makefile 
+
+	sed -i -e 's/@expr length/@-expr length/' ${S}/Makefile
 	sed -i -e "s,\-mcpu=,\-mtune=,g;" ${S}/arch/mips/Makefile
 }
 
diff --git a/packages/linux/netbook-pro-kernel_2.6.17.bb b/packages/linux/netbook-pro-kernel_2.6.17.bb
index 126485b10f..8c04f75779 100644
--- a/packages/linux/netbook-pro-kernel_2.6.17.bb
+++ b/packages/linux/netbook-pro-kernel_2.6.17.bb
@@ -22,24 +22,24 @@ KERNEL_IMAGETYPE = "zImage"
 
 do_configure() {
         rm -f ${S}/.config
-        
+
         if [ ! -e ${WORKDIR}/defconfig ]; then
                 die "No default configuration for ${MACHINE} available."
         fi
 
-        
+
         if [ "${TARGET_OS}" == "linux-gnueabi" -o  "${TARGET_OS}" == "linux-uclibcgnueabi" ]; then
                 echo "CONFIG_AEABI=y"                   >> ${S}/.config
                 echo "CONFIG_OABI_COMPAT=y"             >> ${S}/.config
-        else    
+        else
                 echo "# CONFIG_AEABI is not set"        >> ${S}/.config
                 echo "# CONFIG_OABI_COMPAT is not set"  >> ${S}/.config
         fi
-        
+
         sed -e '/CONFIG_AEABI/d' \
             -e '/CONFIG_OABI_COMPAT=/d' \
             '${WORKDIR}/defconfig' >>'${S}/.config'
-        
+
         yes '' | oe_runmake oldconfig
 
 
diff --git a/packages/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.bb b/packages/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.bb
index cb33b2d172..547010996d 100644
--- a/packages/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.bb
+++ b/packages/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.bb
@@ -53,7 +53,7 @@ module_conf_sa1100_ir = "alias irda0 sa1100_ir"
 
 do_configure() {
         install -m 0644 ${WORKDIR}/defconfig-${MACHINE} ${S}/.config || die "No default configuration for ${MACHINE} available."
-              
+
 	mem=${SIMPAD_MEM}
 	rd=${SIMPAD_RD}
         mempos=`echo "obase=16; $mem * 1024 * 1024" | bc`
diff --git a/packages/linux/opensimpad_2.4.27-vrs1-pxa1-jpm1.bb b/packages/linux/opensimpad_2.4.27-vrs1-pxa1-jpm1.bb
index 24fc3bf149..d9324e9883 100644
--- a/packages/linux/opensimpad_2.4.27-vrs1-pxa1-jpm1.bb
+++ b/packages/linux/opensimpad_2.4.27-vrs1-pxa1-jpm1.bb
@@ -60,9 +60,9 @@ export CMDLINE = '${@bb.data.getVar("SIMPAD_CMDLINE",d,1) or  "mtdparts=sa1100:5
 
 module_conf_sa1100_ir = "alias irda0 sa1100_ir"
 
-do_configure() { 
+do_configure() {
        install -m 0644 ${WORKDIR}/defconfig-${MACHINE} ${S}/.config || die "No default configuration for ${MACHINE} available."
-              
+
 	mem=${SIMPAD_MEM}
 	rd=${SIMPAD_RD}
         mempos=`echo "obase=16; $mem * 1024 * 1024" | bc`
diff --git a/packages/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb b/packages/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb
index 85f65b519b..d4c93b7b6c 100644
--- a/packages/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb
+++ b/packages/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb
@@ -39,7 +39,7 @@ SRC_URI = "http://www.openzaurus.org/mirror/linux-sl5500-${SHARPV}-rom3_10.tar.b
 
 # that patch allow to use buzzer as sound device but it removes alarms,
 # touchclicks etc so it is removed until be fixed
-#           file://sound-2.4.18r2.patch;patch=1 
+#           file://sound-2.4.18r2.patch;patch=1
 
 # apply this when we have a patch that allows building with gcc 3.x:
 # SRC_URI_append = file://gcc-3.3.patch;patch=1
@@ -93,7 +93,7 @@ do_configure_prepend() {
 }
 
 do_deploy() {
-        install -d ${DEPLOY_DIR_IMAGE} 
+        install -d ${DEPLOY_DIR_IMAGE}
         install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} \
 	${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}-${COLLIE_MEMORY_SIZE}-${COLLIE_RAMDISK_SIZE}-${DATETIME}.bin
 }
diff --git a/packages/linux/triton-kernel_2.6.11.bb b/packages/linux/triton-kernel_2.6.11.bb
index 81c24eda13..09c9c3cbad 100644
--- a/packages/linux/triton-kernel_2.6.11.bb
+++ b/packages/linux/triton-kernel_2.6.11.bb
@@ -9,7 +9,7 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
            ${KERNELORG_MIRROR}/pub/linux/kernel/people/akpm/patches/2.6/${PV}/${PV}-mm2/${PV}-mm2.bz2;patch=1 \
 		   file://patch-2.6.11-mm2-karo9.bz2;patch=1 \
 		   file://defconfig"
- 
+
 S = "${WORKDIR}/linux-${PV}"
 
 COMPATIBLE_HOST = 'arm.*-linux'
diff --git a/packages/linux/unslung-kernel/defconfig b/packages/linux/unslung-kernel/defconfig
index afecd24561..a5ad6094ae 100644
--- a/packages/linux/unslung-kernel/defconfig
+++ b/packages/linux/unslung-kernel/defconfig
@@ -1155,7 +1155,7 @@ CONFIG_USB_SCANNER=m
 # CONFIG_USB_IBMCAM is not set
 # CONFIG_USB_KONICAWC is not set
 CONFIG_USB_OV511=m
-# CONFIG_USB_PWC is not set
+CONFIG_USB_PWC=m
 # CONFIG_USB_SE401 is not set
 # CONFIG_USB_STV680 is not set
 # CONFIG_USB_W9968CF is not set
diff --git a/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb b/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb
index e35ceb884b..6a22591795 100644
--- a/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb
+++ b/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb
@@ -4,7 +4,7 @@ COMPATIBLE_MACHINE = "nslu2"
 require nslu2-linksys-kernel_2.4.22.bb
 
 DESCRIPTION = "Unslung kernel for the Linksys NSLU2 device"
-PR = "r16"
+PR = "r17"
 
 KERNEL_SUFFIX = "unslung"
 
diff --git a/packages/lisa/lisa_0.2.2.bb b/packages/lisa/lisa_0.2.2.bb
index 7758744161..a238b7e726 100644
--- a/packages/lisa/lisa_0.2.2.bb
+++ b/packages/lisa/lisa_0.2.2.bb
@@ -7,7 +7,7 @@ SRC_URI = "http://lisa-home.sourceforge.net/src/lisa-${PV}.tar.bz2 \
 	   file://configure.patch;patch=1 \
 	   file://head-n.patch;patch=1"
 LICENSE = "GPL"
-inherit autotools 
+inherit autotools
 
 do_configure_prepend () {
 	set -e
diff --git a/packages/login-manager/login-manager.bb b/packages/login-manager/login-manager.bb
index 9f5d8cd2b0..ada7c364e7 100644
--- a/packages/login-manager/login-manager.bb
+++ b/packages/login-manager/login-manager.bb
@@ -14,5 +14,5 @@ SRC_URI = "file://login-manager"
 do_install() {
 	install -d ${D}/etc/init.d
 	install -m 0755 ${WORKDIR}/login-manager ${D}/etc/init.d/
-}		
+}
 
diff --git a/packages/lttng/lttng-control_0.12.bb b/packages/lttng/lttng-control_0.12.bb
index 937aa4f309..0cfdc03ab5 100644
--- a/packages/lttng/lttng-control_0.12.bb
+++ b/packages/lttng/lttng-control_0.12.bb
@@ -12,4 +12,4 @@ inherit autotools
 
 export KERNELDIR="${STAGING_KERNEL_DIR}"
 
-FILES_${PN} += "${datadir}/ltt-control/facilities/*"	    
\ No newline at end of file
+FILES_${PN} += "${datadir}/ltt-control/facilities/*"
diff --git a/packages/lzo/lzo_1.08.bb b/packages/lzo/lzo_1.08.bb
index c9a8a1384e..a01912da0f 100644
--- a/packages/lzo/lzo_1.08.bb
+++ b/packages/lzo/lzo_1.08.bb
@@ -7,7 +7,7 @@ PR = "r14"
 
 SRC_URI = "http://www.oberhumer.com/opensource/lzo/download/lzo-${PV}.tar.gz"
 
-inherit autotools 
+inherit autotools
 
 EXTRA_OECONF = "--enable-shared"
 
diff --git a/packages/madwifi/madwifi-modules_cvs-bsd.bb b/packages/madwifi/madwifi-modules_cvs-bsd.bb
index 74e976c34c..033fe7edd4 100644
--- a/packages/madwifi/madwifi-modules_cvs-bsd.bb
+++ b/packages/madwifi/madwifi-modules_cvs-bsd.bb
@@ -27,7 +27,7 @@ do_compile() {
 do_install() {
 	oe_runmake DESTDIR=${D} install
 	install -d ${D}${sbindir}
-	cd tools; 
+	cd tools;
 	oe_runmake DESTDIR=${D} BINDIR=${sbindir} install
 	install -m 755 athchans athctrl athkey ${D}${sbindir}
 }
diff --git a/packages/madwifi/madwifi-modules_cvs.bb b/packages/madwifi/madwifi-modules_cvs.bb
index f2e9a94299..6df39671db 100644
--- a/packages/madwifi/madwifi-modules_cvs.bb
+++ b/packages/madwifi/madwifi-modules_cvs.bb
@@ -28,7 +28,7 @@ do_compile() {
 do_install() {
 	oe_runmake DESTDIR=${D} install
 	install -d ${D}/${sbindir}
-	cd tools; 
+	cd tools;
 	oe_runmake DESTDIR=${D} BINDIR=${sbindir} install
 	install -m 755 athchans athctrl athkey ${D}/${sbindir}
 }
diff --git a/packages/maemo/hildon-lgpl_0.9.14-2.bb b/packages/maemo/hildon-lgpl_0.9.14-2.bb
index 63d29b7ea1..c4ec3a50cf 100644
--- a/packages/maemo/hildon-lgpl_0.9.14-2.bb
+++ b/packages/maemo/hildon-lgpl_0.9.14-2.bb
@@ -10,7 +10,7 @@ EXTRA_OECONF =	"--enable-shared --disable-gtk-doc"
 
 inherit pkgconfig autotools
 
-FILES_${PN} += " ${libdir}/outo/*.so" 
+FILES_${PN} += " ${libdir}/outo/*.so"
 
 do_install_prepend() {
 	install -d ${D}/${libdir}
diff --git a/packages/maemo/hildon-navigator_0.9.6-2.bb b/packages/maemo/hildon-navigator_0.9.6-2.bb
index 569733831b..6772dbd118 100644
--- a/packages/maemo/hildon-navigator_0.9.6-2.bb
+++ b/packages/maemo/hildon-navigator_0.9.6-2.bb
@@ -10,4 +10,4 @@ S = "${WORKDIR}/hildon-navigator-0.9.6"
 
 inherit autotools pkgconfig
 
-#FILES_${PN} += " ${libdir}/outo/*.so" 
+#FILES_${PN} += " ${libdir}/outo/*.so"
diff --git a/packages/maemo/lessertunjo_0.0.10.bb b/packages/maemo/lessertunjo_0.0.10.bb
index c15ff958ac..e084d1e050 100644
--- a/packages/maemo/lessertunjo_0.0.10.bb
+++ b/packages/maemo/lessertunjo_0.0.10.bb
@@ -10,7 +10,7 @@ LDFLAGS += " -losso -L${STAGING_LIBDIR} -I${STAGING_INCDIR}  -I${STAGING_LIBDIR}
 
 
 do_install() {
-	install -d ${D}${libdir}        
+	install -d ${D}${libdir}
 	install -m 755 *so.0.0.10  ${D}${libdir}
 }
 
diff --git a/packages/maemo/osso-gwconnect_0.70.1.bb b/packages/maemo/osso-gwconnect_0.70.1.bb
index 7759e99e9c..9d5626d375 100644
--- a/packages/maemo/osso-gwconnect_0.70.1.bb
+++ b/packages/maemo/osso-gwconnect_0.70.1.bb
@@ -15,4 +15,4 @@ do_stage() {
     install -d ${STAGING_INCDIR}
     install -m 644 src/*.h ${STAGING_INCDIR}
 }
-	
+
diff --git a/packages/maemo/osso-gwobex_0.26.1.bb b/packages/maemo/osso-gwobex_0.26.1.bb
index 374f589457..38011800c9 100644
--- a/packages/maemo/osso-gwobex_0.26.1.bb
+++ b/packages/maemo/osso-gwobex_0.26.1.bb
@@ -12,6 +12,6 @@ do_stage() {
 	install -d ${STAGING_LIBDIR}
 	install -m 644 src/*.h ${STAGING_INCDIR}
 	install -m 755 src/.libs/*.so* ${STAGING_LIBDIR}
-} 
+}
 
 
diff --git a/packages/maemo/outo_0.1.1.bb b/packages/maemo/outo_0.1.1.bb
index 79789f5105..7fe0343691 100644
--- a/packages/maemo/outo_0.1.1.bb
+++ b/packages/maemo/outo_0.1.1.bb
@@ -10,5 +10,5 @@ inherit pkgconfig autotools
 
 do_stage() {
 		install -d ${STAGING_INCDIR}
-		install -m 644 include/outo.h ${STAGING_INCDIR} 
+		install -m 644 include/outo.h ${STAGING_INCDIR}
 }
diff --git a/packages/maemo/xpext_1.0-5.bb b/packages/maemo/xpext_1.0-5.bb
index d56581dcde..5deee48af1 100644
--- a/packages/maemo/xpext_1.0-5.bb
+++ b/packages/maemo/xpext_1.0-5.bb
@@ -9,7 +9,7 @@ SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/x/${PN}/${PN}_${PV
            file://auxdir.patch;patch=1;pnum=0"
 S = "${WORKDIR}/xpext-1.0"
 
-inherit autotools pkgconfig 
+inherit autotools pkgconfig
 
 do_configure_prepend () {
   cd ${S}
diff --git a/packages/maemo/xsp_1.0.0-8.bb b/packages/maemo/xsp_1.0.0-8.bb
index 7c54931b03..cb368f83cc 100644
--- a/packages/maemo/xsp_1.0.0-8.bb
+++ b/packages/maemo/xsp_1.0.0-8.bb
@@ -8,7 +8,7 @@ DEPENDS = "virtual/libx11 xextensions libxext xpext"
 SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/x/xsp/${PN}_${PV}.tar.gz"
 S = "${WORKDIR}/Xsp"
 
-inherit autotools pkgconfig 
+inherit autotools pkgconfig
 
 do_stage() {
 	oe_runmake install prefix=${STAGING_DIR} \
diff --git a/packages/mailutils/mailutils_0.3.1.bb b/packages/mailutils/mailutils_0.3.1.bb
index b863b03f62..97101913ff 100644
--- a/packages/mailutils/mailutils_0.3.1.bb
+++ b/packages/mailutils/mailutils_0.3.1.bb
@@ -5,6 +5,6 @@ LICENSE = "GPL LGPL"
 SRC_URI = "${GNU_MIRROR}/mailutils/mailutils-${PV}.tar.bz2 \
 	   file://configure.patch;patch=1"
 
-inherit autotools 
+inherit autotools
 
 EXTRA_OECONF = "--disable-pam --without-guile"
diff --git a/packages/makedevs/makedevs-native_1.0.0.bb b/packages/makedevs/makedevs-native_1.0.0.bb
index 28544e12f2..004a71374d 100644
--- a/packages/makedevs/makedevs-native_1.0.0.bb
+++ b/packages/makedevs/makedevs-native_1.0.0.bb
@@ -1,6 +1,6 @@
 SECTION = "base"
 require makedevs_${PV}.bb
-inherit native 
+inherit native
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/makedevs-${PV}"
 
diff --git a/packages/maradns/maradns_1.0.39.bb b/packages/maradns/maradns_1.0.39.bb
index d89bcf849d..a8bed6f05e 100644
--- a/packages/maradns/maradns_1.0.39.bb
+++ b/packages/maradns/maradns_1.0.39.bb
@@ -20,7 +20,7 @@ do_install() {
 	sed -i -e "s:PREFIX/man:PREFIX/share/man:" \
                 -e "s:PREFIX/doc/maradns-\$VERSION:PREFIX/share/doc/${PF}:" \
                 build/install.locations
-	
+
 	oe_runmake \
                 TOPLEVEL=${S} \
                 BUILDDIR=${S}/build \
@@ -30,7 +30,7 @@ do_install() {
                 MAN5=${D}${mandir}/man5 \
                 MAN8=${D}${mandir}/man8 \
                 install
-	
+
 	mv ${D}${sysconfdir}/mararc/example_mararc ${D}${sysconfdir}/maradns/mararc
 	rm -r ${D}${sysconfdir}/mararc/
 	install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/maradns
diff --git a/packages/matchbox-applet-inputmanager/matchbox-applet-inputmanager_0.5.bb b/packages/matchbox-applet-inputmanager/matchbox-applet-inputmanager_0.5.bb
index 00bb761433..e758350dad 100644
--- a/packages/matchbox-applet-inputmanager/matchbox-applet-inputmanager_0.5.bb
+++ b/packages/matchbox-applet-inputmanager/matchbox-applet-inputmanager_0.5.bb
@@ -9,4 +9,4 @@ S = "${WORKDIR}/mb-applet-input-manager-${PV}"
 inherit autotools pkgconfig
 
 FILES_${PN} = "${bindir} ${datadir}/applications ${datadir}/pixmaps"
- 
+
diff --git a/packages/matchbox-applet-inputmanager/matchbox-applet-inputmanager_0.6.bb b/packages/matchbox-applet-inputmanager/matchbox-applet-inputmanager_0.6.bb
index 69fe062178..4afdd426db 100644
--- a/packages/matchbox-applet-inputmanager/matchbox-applet-inputmanager_0.6.bb
+++ b/packages/matchbox-applet-inputmanager/matchbox-applet-inputmanager_0.6.bb
@@ -16,4 +16,4 @@ S = "${WORKDIR}/mb-applet-input-manager-${PV}"
 inherit autotools pkgconfig
 
 FILES_${PN} = "${bindir}/* ${datadir}/applications ${datadir}/pixmaps"
- 
+
diff --git a/packages/matchbox-applet-startup-monitor/matchbox-applet-startup-monitor_0.1.bb b/packages/matchbox-applet-startup-monitor/matchbox-applet-startup-monitor_0.1.bb
index 11eb87636a..e95665041e 100644
--- a/packages/matchbox-applet-startup-monitor/matchbox-applet-startup-monitor_0.1.bb
+++ b/packages/matchbox-applet-startup-monitor/matchbox-applet-startup-monitor_0.1.bb
@@ -11,4 +11,4 @@ S = "${WORKDIR}/mb-applet-startup-monitor-${PV}"
 inherit autotools pkgconfig
 
 FILES_${PN} = "${bindir}/* ${datadir}/applications ${datadir}/pixmaps"
- 
+
diff --git a/packages/matchbox-applet-volume/matchbox-applet-volume_0.1.bb b/packages/matchbox-applet-volume/matchbox-applet-volume_0.1.bb
index 61b4756059..1f09c3e7dc 100644
--- a/packages/matchbox-applet-volume/matchbox-applet-volume_0.1.bb
+++ b/packages/matchbox-applet-volume/matchbox-applet-volume_0.1.bb
@@ -9,4 +9,4 @@ S = "${WORKDIR}/mb-applet-volume-${PV}"
 inherit autotools pkgconfig
 
 FILES_${PN} = "${bindir} ${datadir}/applications ${datadir}/pixmaps"
- 
+
diff --git a/packages/matchbox-wm/matchbox-wm_0.9.2.bb b/packages/matchbox-wm/matchbox-wm_0.9.2.bb
index 9123b0ffca..a46073b924 100644
--- a/packages/matchbox-wm/matchbox-wm_0.9.2.bb
+++ b/packages/matchbox-wm/matchbox-wm_0.9.2.bb
@@ -2,7 +2,7 @@ require matchbox-wm.inc
 
 DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common"
 RDEPENDS = "matchbox-common"
-PR = "r1" 
+PR = "r1"
 
 
 SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-window-manager/0.9/matchbox-window-manager-${PV}.tar.gz"
diff --git a/packages/matchbox-wm/matchbox-wm_0.9.3.bb b/packages/matchbox-wm/matchbox-wm_0.9.3.bb
index 390ecf53ad..2363801cb2 100644
--- a/packages/matchbox-wm/matchbox-wm_0.9.3.bb
+++ b/packages/matchbox-wm/matchbox-wm_0.9.3.bb
@@ -2,7 +2,7 @@ require matchbox-wm.inc
 
 DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common"
 RDEPENDS = "matchbox-common"
-PR = "r2" 
+PR = "r2"
 
 
 SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-window-manager/0.9/matchbox-window-manager-${PV}.tar.gz \
diff --git a/packages/mdev/mdev_1.2.1.bb b/packages/mdev/mdev_1.2.1.bb
index b67d4deccf..9391263d00 100644
--- a/packages/mdev/mdev_1.2.1.bb
+++ b/packages/mdev/mdev_1.2.1.bb
@@ -27,7 +27,7 @@ INITSCRIPT_NAME_${PN} = "mdev.sh"
 INITSCRIPT_PARAMS_${PN} = "start 04 S ."
 CONFFILES_${PN} = "${sysconfdir}/mdev.conf"
 
-inherit cml1 update-rc.d  
+inherit cml1 update-rc.d
 
 do_configure () {
 	install -m 0644 ${WORKDIR}/defconfig ${S}/.config.oe
@@ -48,14 +48,14 @@ do_compile () {
 
 do_install () {
 	mv ${S}/busybox ${S}/mdev
-	
+
 	install -d ${D}${base_sbindir}
 	install -m 0755 ${S}/mdev ${D}${base_sbindir}/
-	
+
 	install -d ${D}${sysconfdir}/init.d
 	install -m 644 ${WORKDIR}/mdev.conf ${D}${sysconfdir}/
 	install -m 0755 ${WORKDIR}/mdev.sh ${D}${sysconfdir}/init.d/
-	
+
 	install -d ${D}${base_libdir}/mdev
 	install -m 0755 ${WORKDIR}/firmware ${D}${base_libdir}/mdev/firmware
 }
diff --git a/packages/mesa/mesa_6.4.1+cvs20060101.bb b/packages/mesa/mesa_6.4.1+cvs20060101.bb
index 6e9a99144b..0e9f99684f 100644
--- a/packages/mesa/mesa_6.4.1+cvs20060101.bb
+++ b/packages/mesa/mesa_6.4.1+cvs20060101.bb
@@ -9,7 +9,7 @@ S = "${WORKDIR}/Mesa"
 
 LICENSE = "LGPL"
 
-RDEPENDS = "expat" 
+RDEPENDS = "expat"
 DEPENDS = "makedepend-native xf86vidmodeproto glproto virtual/libx11 libxext libxxf86vm libxi libxmu libice"
 
 # gcc-3.4 blows up in gtktext with -frename-registers on arm-linux
diff --git a/packages/meta/meta-sdk.bb b/packages/meta/meta-sdk.bb
index 4894e6659c..7bf8606418 100644
--- a/packages/meta/meta-sdk.bb
+++ b/packages/meta/meta-sdk.bb
@@ -51,7 +51,7 @@ EOF
 
 	rm -r ${SDK_OUTPUT}
 	mkdir -p ${SDK_OUTPUT}
-	
+
 	${IPKG_HOST} update
 	${IPKG_HOST} -nodeps install ${HOST_INSTALL}
 
diff --git a/packages/meta/meta-toolchain.bb b/packages/meta/meta-toolchain.bb
index 3f51644c68..7995ac3cb8 100644
--- a/packages/meta/meta-toolchain.bb
+++ b/packages/meta/meta-toolchain.bb
@@ -48,7 +48,7 @@ EOF
 
 	rm -r ${SDK_OUTPUT}
 	mkdir -p ${SDK_OUTPUT}
-	
+
 	${IPKG_HOST} update
 	${IPKG_HOST} -nodeps install ${HOST_INSTALL}
 
diff --git a/packages/mikmod/mikmod_3.2.2-beta1.bb b/packages/mikmod/mikmod_3.2.2-beta1.bb
index e021f6776f..d9d4595c2e 100644
--- a/packages/mikmod/mikmod_3.2.2-beta1.bb
+++ b/packages/mikmod/mikmod_3.2.2-beta1.bb
@@ -7,6 +7,6 @@ LICENSE = "GPL"
 SRC_URI = "http://mikmod.raphnet.net/files/mikmod-${PV}.tar.bz2 \
            file://m4.patch;patch=1"
 
-inherit autotools 
+inherit autotools
 
 LDFLAGS_append = " -lm"
diff --git a/packages/miniinit/miniinit.bb b/packages/miniinit/miniinit.bb
index ede7432c19..054c1bdae9 100644
--- a/packages/miniinit/miniinit.bb
+++ b/packages/miniinit/miniinit.bb
@@ -13,10 +13,10 @@ do_install() {
 		   ${D}${sysconfdir}/rcS.d \
 		   ${D}${sysconfdir}/rc2.d \
 		   ${D}${sysconfdir}/init.d
-	
+
 	install -m 0644 ${WORKDIR}/inittab ${D}${sysconfdir}/inittab
 	install -m 0755 ${WORKDIR}/rcS ${D}${sysconfdir}/init.d
-	
+
 	if [ ! -z "${SERIAL_CONSOLE}" ]; then
 		echo "${SERIAL_CONSOLE}::askfirst:/bin/sh --login" >> ${D}${sysconfdir}/inittab
 	fi
diff --git a/packages/misc-binary-only/prism2-firmware-update_1.7.4.bb b/packages/misc-binary-only/prism2-firmware-update_1.7.4.bb
index c26a714ee7..e37cfd6562 100644
--- a/packages/misc-binary-only/prism2-firmware-update_1.7.4.bb
+++ b/packages/misc-binary-only/prism2-firmware-update_1.7.4.bb
@@ -19,7 +19,7 @@ if test "x$D" != "x"; then
 	exit 1
 else
 	FW_VERSION="v${PV}";
-	
+
 	fw_upgrade() {
 		IF=$1;
 		echo "firmware upgrade on $IF"
@@ -29,13 +29,13 @@ else
 			if [[ `hostap_diag $IF | grep STAID | awk '{print $3}'` < $FW_VERSION ]]; then
 				echo "  - upgrading to version $FW_VERSION"
 				prism2_srec -f $IF /tmp/sf010704.hex /tmp/pk010101.hex
-			else 
+			else
 				echo "  - upgrade not necessary"
 			fi
 		fi
 		echo "done".
 	}
-	
+
 	for i in `ls /proc/net/hostap`; do
 		fw_upgrade $i;
 	done;
diff --git a/packages/misc-binary-only/tda1004x-firmware.bb b/packages/misc-binary-only/tda1004x-firmware.bb
index 317a980852..1e4d68532f 100644
--- a/packages/misc-binary-only/tda1004x-firmware.bb
+++ b/packages/misc-binary-only/tda1004x-firmware.bb
@@ -12,7 +12,7 @@ python do_unpack() {
 	if not overrides:
 		raise bb.build.FuncFailed('OVERRIDES not defined')
 	bb.data.setVar('OVERRIDES', overrides+':'+bb.data.getVar('PN', localdata, 1), localdata)
-	
+
 	bb.data.update_data(localdata)
 
 	src_uri = bb.data.getVar('SRC_URI', localdata)
diff --git a/packages/modutils/modutils_2.4.27.bb b/packages/modutils/modutils_2.4.27.bb
index 8e6fc8c544..4ea93282de 100644
--- a/packages/modutils/modutils_2.4.27.bb
+++ b/packages/modutils/modutils_2.4.27.bb
@@ -66,7 +66,7 @@ pkg_postinst_modutils-depmod() {
 update-alternatives --install /sbin/depmod depmod /sbin/depmod.24 10
 }
 
-pkg_postinst_modutils-modinfo() { 
+pkg_postinst_modutils-modinfo() {
 #!/bin/sh
 update-alternatives --install /sbin/modinfo modinfo /sbin/modinfo.24 10
 }
diff --git a/packages/monotone/monotone-6_0.26.bb b/packages/monotone/monotone-6_0.26.bb
index f879336c2a..2cb59c608f 100644
--- a/packages/monotone/monotone-6_0.26.bb
+++ b/packages/monotone/monotone-6_0.26.bb
@@ -15,7 +15,7 @@ EXTRA_OECONF = "--disable-ipv6 \
                 --with-gnu-ld \
                 --with-bundled-lua --with-bundled-sqlite"
 
-inherit autotools 
+inherit autotools
 
 # Release 0.22 reveals bugs in g++ for thumb (g++ generates
 # relocations which the linker cannot represent)
diff --git a/packages/monotone/monotone-6_0.27.bb b/packages/monotone/monotone-6_0.27.bb
index f879336c2a..2cb59c608f 100644
--- a/packages/monotone/monotone-6_0.27.bb
+++ b/packages/monotone/monotone-6_0.27.bb
@@ -15,7 +15,7 @@ EXTRA_OECONF = "--disable-ipv6 \
                 --with-gnu-ld \
                 --with-bundled-lua --with-bundled-sqlite"
 
-inherit autotools 
+inherit autotools
 
 # Release 0.22 reveals bugs in g++ for thumb (g++ generates
 # relocations which the linker cannot represent)
diff --git a/packages/monotone/monotone-6_0.31.bb b/packages/monotone/monotone-6_0.31.bb
index 7629ff6e61..103c10d2e4 100644
--- a/packages/monotone/monotone-6_0.31.bb
+++ b/packages/monotone/monotone-6_0.31.bb
@@ -15,7 +15,7 @@ EXTRA_OECONF = "--disable-ipv6 \
                 --with-gnu-ld \
                 --with-bundled-lua --with-bundled-sqlite"
 
-inherit autotools 
+inherit autotools
 
 # Release 0.22 reveals bugs in g++ for thumb (g++ generates
 # relocations which the linker cannot represent)
diff --git a/packages/mozilla/minimo_0.016+cvs.bb b/packages/mozilla/minimo_0.016+cvs.bb
index dcd22b3dd9..a5f8c73094 100644
--- a/packages/mozilla/minimo_0.016+cvs.bb
+++ b/packages/mozilla/minimo_0.016+cvs.bb
@@ -19,7 +19,7 @@ SRC_URI = "cvs://anonymous@${CVSSVR}/cvsroot;module=mozilla;tag=${BRTAG};date=${
 	   file://mozconfig file://minimo \
            file://minimo.desktop file://minimo.png"
 
-inherit autotools 
+inherit autotools
 
 S = "${WORKDIR}/mozilla"
 
diff --git a/packages/mpfr/mpfr_2.1.1.bb b/packages/mpfr/mpfr_2.1.1.bb
index 59b9965aa4..10383b1caa 100644
--- a/packages/mpfr/mpfr_2.1.1.bb
+++ b/packages/mpfr/mpfr_2.1.1.bb
@@ -15,5 +15,5 @@ do_stage() {
 	       includedir=${STAGING_INCDIR} \
 	       libdir=${STAGING_LIBDIR} \
 	       datadir=${STAGING_DATADIR} \
-	       infodir=${STAGING_DIR}/${HOST_SYS}/info 
+	       infodir=${STAGING_DIR}/${HOST_SYS}/info
 }
diff --git a/packages/mplayer/mplayer-common.bb b/packages/mplayer/mplayer-common.bb
index 3506b1c7a7..4b9570abbf 100644
--- a/packages/mplayer/mplayer-common.bb
+++ b/packages/mplayer/mplayer-common.bb
@@ -25,6 +25,6 @@ FILES_${PN} = "/usr/etc/mplayer"
 
 do_install() {
 	install -d "${D}/usr/etc/mplayer"
-	
+
 	install -m 0644 ${WORKDIR}/mplayer.conf "${D}/usr/etc/mplayer"
 }
diff --git a/packages/mysql/mysql_4.1.18.bb b/packages/mysql/mysql_4.1.18.bb
index 527629d413..17fa33ac1c 100644
--- a/packages/mysql/mysql_4.1.18.bb
+++ b/packages/mysql/mysql_4.1.18.bb
@@ -53,9 +53,9 @@ pkg_postinst_mysql-server () {
 	test -d /usr/bin || mkdir -p /usr/bin
 	test -e /usr/bin/hostname || ln -s /bin/hostname /usr/bin/hostname
 	chmod go+rw /var/run
-	
+
 	mysql_install_db
-	
+
 }
 
 pkg_postrm_mysql-server () {
diff --git a/packages/nail/nail_11.21.bb b/packages/nail/nail_11.21.bb
index 8c19adfd0d..9fa59ada55 100644
--- a/packages/nail/nail_11.21.bb
+++ b/packages/nail/nail_11.21.bb
@@ -7,7 +7,7 @@ LICENSE = "GPL"
 
 SRC_URI = "http://optusnet.dl.sourceforge.net/sourceforge/nail/nail-11.21.tar.bz2 \
 	   file://nail.spec.diff;patch=1"
-	   
+
 S = "${WORKDIR}/nail-11.21/"
 
 inherit autotools
diff --git a/packages/nautilus/nautilus_2.6.1.bb b/packages/nautilus/nautilus_2.6.1.bb
index 0e40c86675..66139eeb2f 100644
--- a/packages/nautilus/nautilus_2.6.1.bb
+++ b/packages/nautilus/nautilus_2.6.1.bb
@@ -32,14 +32,14 @@ nextdir="${STAGING_INCDIR}/nautilus/libnautilus-extension"
 
 do_stage() {
 	install -d ${libndir} ${nextdir}
-	for file in ${libnheaders}; do 
+	for file in ${libnheaders}; do
 		install -m 0644 libnautilus/$file ${libndir}/$file
-	done	
+	done
 
 	for file in ${nextheaders}; do
 		install -m 0644 libnautilus-extension/$file ${nextdir}/$file
 	done
-	
+
 	oe_libinstall -C libnautilus-adapter libnautilus-adapter ${STAGING_LIBDIR}
 	oe_libinstall -C libnautilus-extension libnautilus-extension ${STAGING_LIBDIR}
 	oe_libinstall -C libnautilus-private libnautilus-private ${STAGING_LIBDIR}
diff --git a/packages/net-snmp/net-snmp_5.1.2.bb b/packages/net-snmp/net-snmp_5.1.2.bb
index f0330ed149..302e7eed52 100644
--- a/packages/net-snmp/net-snmp_5.1.2.bb
+++ b/packages/net-snmp/net-snmp_5.1.2.bb
@@ -9,11 +9,11 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/net-snmp/net-snmp-${PV}.tar.gz \
 	file://init \
 	file://snmpd.conf \
 	file://snmptrapd.conf"
-	
+
 inherit autotools
 
 PARALLEL_MAKE = ""
-EXTRA_OECONF = "--enable-shared --disable-manuals" 
+EXTRA_OECONF = "--enable-shared --disable-manuals"
 EXTRA_OEMAKE = "INSTALL_PREFIX=${D}"
 
 do_configure() {
diff --git a/packages/netpbm/netpbm_10.28.bb b/packages/netpbm/netpbm_10.28.bb
index 2d986666f1..dde0d17d57 100644
--- a/packages/netpbm/netpbm_10.28.bb
+++ b/packages/netpbm/netpbm_10.28.bb
@@ -2,14 +2,14 @@
 # data) processing package derived from PBMPlus
 #
 # For documentation see: http://netpbm.sourceforge.net/doc/
-LICENSE = "GPL MIT Artistic" 
+LICENSE = "GPL MIT Artistic"
 # NOTE: individual command line utilities are covered by different
 # licenses.  The compiled and linked command line utilties are
 # subject to the licenses of the libraries they use too - including
 # libpng libz, IJG, and libtiff licenses
 
-SECTION = "console/utils" 
-DEPENDS = "jpeg zlib libpng tiff install-native flex-native" 
+SECTION = "console/utils"
+DEPENDS = "jpeg zlib libpng tiff install-native flex-native"
 RDEPENDS = "perl\
 	perl-module-cwd\
 	perl-module-english\
@@ -25,7 +25,7 @@ RDEPENDS = "perl\
 RDEPENDS += "perl-module-exporter-heavy"
 RDEPENDS += "perl-module-file-spec-unix"
 
-HOMEPAGE = "http://netpbm.sourceforge.net" 
+HOMEPAGE = "http://netpbm.sourceforge.net"
 DESCRIPTION = "Netpbm is a toolkit for manipulation of graphic images, including\
 conversion of images between a variety of different formats.  There\
 are over 220 separate tools in the package including converters for\
@@ -35,11 +35,11 @@ PR = "r3"
 SRC_URI = "${SOURCEFORGE_MIRROR}/netpbm/netpbm-${PV}.tgz \
 	   file://ppmtojpeg.patch;patch=42 \
 	   file://Makefile.config \
-	   file://oeendiangen" 
+	   file://oeendiangen"
 
 EXTRA_OEMAKE = "ENDIANGEN=${S}/buildtools/oeendiangen TARGET_LD=${LD}"
 
-do_configure() { 
+do_configure() {
 	install -c -m 644 ../Makefile.config .
 	# The following stops the host endiangen program being run and uses
 	# the target endian.h header instead.
@@ -50,8 +50,8 @@ do_compile() {
 	# need all to get the static library too
 	oe_runmake all default
 }
-	    
-do_install() { 
+
+do_install() {
 	# netpbm makes its own installation package, which must then be
 	# installed to form the dummy installation for ipkg
 	rm -rf ${WORKDIR}/netpbm-package
@@ -90,4 +90,4 @@ do_install() {
 				exit 1;;
 		esac
 	done
-} 
+}
diff --git a/packages/netperf/netperf_2.4.2.bb b/packages/netperf/netperf_2.4.2.bb
index e10d1c0094..8a6dbdba0f 100644
--- a/packages/netperf/netperf_2.4.2.bb
+++ b/packages/netperf/netperf_2.4.2.bb
@@ -22,7 +22,7 @@ do_install() {
         install -m 4755 src/netperf ${D}${bindir}
         install -m 4755 src/netserver ${D}${sbindir}
         install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/netperf
-    
+
         # man
         install -d ${D}${mandir}/man1/
         install -m 0644 doc/netserver.man ${D}${mandir}/man1/netserver.1
@@ -31,7 +31,7 @@ do_install() {
         # move scripts to examples directory
         install -d ${D}${docdir}/netperf/examples
         install -m 0644 doc/examples/*_script ${D}${docdir}/netperf/examples/
-        
+
         # docs ..
         install -m 0644 COPYING ${D}${docdir}/netperf
         install -m 0644 Release_Notes ${D}${docdir}/netperf
diff --git a/packages/network-suspend-scripts/network-suspend-scripts.bb b/packages/network-suspend-scripts/network-suspend-scripts.bb
index 1161f641ee..2e3c0c3fbe 100644
--- a/packages/network-suspend-scripts/network-suspend-scripts.bb
+++ b/packages/network-suspend-scripts/network-suspend-scripts.bb
@@ -5,7 +5,7 @@ PV = "1.1"
 PR = "r2"
 
 SRC_URI = "file://ifupdown \
-           file://usbnet"  
+           file://usbnet"
 
 do_install() {
 	install -d ${D}${sysconfdir}/apm/scripts.d
diff --git a/packages/nfs-utils/nfs-utils_1.0.6.bb b/packages/nfs-utils/nfs-utils_1.0.6.bb
index 08b630737a..2072bd3157 100644
--- a/packages/nfs-utils/nfs-utils_1.0.6.bb
+++ b/packages/nfs-utils/nfs-utils_1.0.6.bb
@@ -58,7 +58,7 @@ do_install() {
 	install -m 0755 ${S}/utils/rquotad/rquotad ${D}${sbindir}/rquotad
 	install -m 0755 ${S}/utils/showmount/showmount ${D}${sbindir}/showmount
 	install -m 0755 ${S}/utils/statd/statd ${D}${sbindir}/statd
-	
+
 	install -d ${D}${mandir}/man8
 	install -m 0644 ${S}/utils/exportfs/exportfs.man ${D}${mandir}/man8/exportfs.8
 	install -m 0644 ${S}/utils/lockd/lockd.man ${D}${mandir}/man8/lockd.8
diff --git a/packages/ngrep/ngrep_1.42.bb b/packages/ngrep/ngrep_1.42.bb
index 7ff9aa1e6b..6f90965860 100644
--- a/packages/ngrep/ngrep_1.42.bb
+++ b/packages/ngrep/ngrep_1.42.bb
@@ -10,7 +10,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/ngrep/ngrep-${PV}.tar.bz2 \
 EXTRA_OECONF = "--with-restart --enable-pcre --with-pcap-includes=${STAGING_INCDIR}"
 EXTRA_OEMAKE = "INCLUDES=${S}"
 
-inherit autotools 
+inherit autotools
 
 CFLAGS += '-DDROPPRIVS_ONLY_ROOT=0 -DDROPPRIVS_USER=\""nobody\"" -DUSE_DROPPRIVS=1'
 
diff --git a/packages/nmap/nmap_3.81.bb b/packages/nmap/nmap_3.81.bb
index 62bb86e7ba..478474645b 100644
--- a/packages/nmap/nmap_3.81.bb
+++ b/packages/nmap/nmap_3.81.bb
@@ -20,7 +20,7 @@ EXTRA_OECONF = "--with-pcap=linux \
 EXTRA_OEMAKE = "STRIPPROG=${STRIP}"
 
 CXXFLAGS_append = " -fpermissive"
-# Ugly hack follows -- their configure.ac doesnt match their configure .. 
+# Ugly hack follows -- their configure.ac doesnt match their configure ..
 # doesnt include a check for the length type in recvfrom, so we hack it here
 CPPFLAGS_append = " -Drecvfrom6_t=socklen_t"
 
diff --git a/packages/nmixer/nmixer_2.0.bb b/packages/nmixer/nmixer_2.0.bb
index f6fe47fc8f..88b38e06e5 100644
--- a/packages/nmixer/nmixer_2.0.bb
+++ b/packages/nmixer/nmixer_2.0.bb
@@ -5,7 +5,7 @@ DEPENDS = "ncurses"
 LICENSE = "GPL"
 SRC_URI = "http://www.stack.nl/~brama/projects/nmixer/src/nmixer-${PV}.tar.gz"
 
-inherit autotools 
+inherit autotools
 
 do_compile() {
 	oe_runmake nmixer INCLUDES=-I${STAGING_INCDIR}/
diff --git a/packages/nonworking/freenx/nxproxy_1.5.0-9.bb b/packages/nonworking/freenx/nxproxy_1.5.0-9.bb
index 59585d15b2..08b189d142 100644
--- a/packages/nonworking/freenx/nxproxy_1.5.0-9.bb
+++ b/packages/nonworking/freenx/nxproxy_1.5.0-9.bb
@@ -1,4 +1,4 @@
-LICENSE	=	""	
+LICENSE	=	""
 
 DEPENDS =	"nxcomp"
 
diff --git a/packages/nonworking/greader/greader_0.61.bb b/packages/nonworking/greader/greader_0.61.bb
index d43609de26..2df07f5361 100644
--- a/packages/nonworking/greader/greader_0.61.bb
+++ b/packages/nonworking/greader/greader_0.61.bb
@@ -7,4 +7,4 @@ SECTION = "gpe/applications"
 
 SRC_URI = "http://handhelds.org/~gberenfield/${PN}_${PV}_src.tgz \
            file://greader.patch;patch=1;pnum=1"
-S = "${WORKDIR}/greader/" 
+S = "${WORKDIR}/greader/"
diff --git a/packages/nonworking/libconfig++/libconfig++_0.7a.bb b/packages/nonworking/libconfig++/libconfig++_0.7a.bb
index 5666c8d8ef..05e977d12b 100644
--- a/packages/nonworking/libconfig++/libconfig++_0.7a.bb
+++ b/packages/nonworking/libconfig++/libconfig++_0.7a.bb
@@ -6,7 +6,7 @@ PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/config-plus/config-plus-${PV}.tar.gz"
 S = "${WORKDIR}/config-plus-${PV}"
- 
+
 inherit autotools
 
 
diff --git a/packages/nonworking/pixdev/pixdev-stable_0.1.bb b/packages/nonworking/pixdev/pixdev-stable_0.1.bb
index f182036cb8..4c7eccf659 100644
--- a/packages/nonworking/pixdev/pixdev-stable_0.1.bb
+++ b/packages/nonworking/pixdev/pixdev-stable_0.1.bb
@@ -16,13 +16,13 @@ do_compile() {
 
 	if [ -z "$CONFIG" ]; then CONFIG=defconfig; fi
 
-	oe_runmake $CONFIG    
+	oe_runmake $CONFIG
 	oe_runmake MWDIR=${STAGING_DIR}/target/ "TARGET_CROSS=${TARGET_PREFIX}" all
 }
 
 do_install() {
 	install -d ${D}/${prefix}/pixil
-	
+
 	oe_runmake "TARGET_CROSS=${TARGET_PREFIX}" INSTALL_DIR=${D}/${prefix}/pixil \
 	DEST_DIR=/${prefix}/pixil install
 }
diff --git a/packages/nonworking/xfree86/xfree86_4.3.0.bb b/packages/nonworking/xfree86/xfree86_4.3.0.bb
index c4971a24ea..8fc7a0868b 100644
--- a/packages/nonworking/xfree86/xfree86_4.3.0.bb
+++ b/packages/nonworking/xfree86/xfree86_4.3.0.bb
@@ -13,24 +13,24 @@ S=${WORKDIR}/xc
 
 
 do_configure() {
-    rm -fr ${WORKDIR}/XXcompiler; 
-    mkdir -p ${WORKDIR}/XXcompiler 
-    pushd ./ 
-    cd ${CROSS_DIR}/bin/; 
+    rm -fr ${WORKDIR}/XXcompiler;
+    mkdir -p ${WORKDIR}/XXcompiler
+    pushd ./
+    cd ${CROSS_DIR}/bin/;
     echo ${CC}
-    for i in *; do  
-       echo " linking ${WORKDIR}/XXcompiler/$i to $i"; 
-            ln -s ${CROSS_DIR}/bin/$i ${WORKDIR}/XXcompiler/$i ; 
+    for i in *; do
+       echo " linking ${WORKDIR}/XXcompiler/$i to $i";
+            ln -s ${CROSS_DIR}/bin/$i ${WORKDIR}/XXcompiler/$i ;
             toolname=`echo $i | sed s/${TARGET_ARCH}-${TARGET_OS}-//`
             echo `echo $i | sed s/${TARGET_ARCH}-${TARGET_OS}-//`
-            echo " linking ${WORKDIR}/XXcompiler/$i to $toolname"; 
-            ln -s ${CROSS_DIR}/bin/$i ${WORKDIR}/XXcompiler/$toolname; 
-    done                                   
+            echo " linking ${WORKDIR}/XXcompiler/$i to $toolname";
+            ln -s ${CROSS_DIR}/bin/$i ${WORKDIR}/XXcompiler/$toolname;
+    done
     echo "#!/bin/sh" >  ${WORKDIR}/XXcompiler/cc
     echo "${CC} \$*" >> ${WORKDIR}/XXcompiler/cc
     chmod 755 ${WORKDIR}/XXcompiler/cc
     popd ;
-        
+
 
 }
 
@@ -40,7 +40,7 @@ EXTRA_OEMAKE="-C ${S} CC='${BUILD_CC}' \
 	      EXTRA_LDOPTIONS='${LDFLAGS}' \
 	      EXTRA_INCLUDES='-I${STAGING_DIR}/target/include' "
 do_compile() {
-    sed -e "s/^\#define KdriveServerExtraDefines -DITSY -DMAXSCREENS=2 -DXResExtension.*/\#define KdriveServerExtraDefines -DITSY -DMAXSCREENS=2 -DXResExtension ${FULL_OPTIMIZATION}/" < ${FILESDIR}/host.def > ${S}/config/cf/host.def; 
+    sed -e "s/^\#define KdriveServerExtraDefines -DITSY -DMAXSCREENS=2 -DXResExtension.*/\#define KdriveServerExtraDefines -DITSY -DMAXSCREENS=2 -DXResExtension ${FULL_OPTIMIZATION}/" < ${FILESDIR}/host.def > ${S}/config/cf/host.def;
 
     oe_runmake  World
 
diff --git a/packages/nonworking/zaurss/zaurss_0.4.2.bb b/packages/nonworking/zaurss/zaurss_0.4.2.bb
index 4ed8897050..7898eb437c 100644
--- a/packages/nonworking/zaurss/zaurss_0.4.2.bb
+++ b/packages/nonworking/zaurss/zaurss_0.4.2.bb
@@ -26,5 +26,5 @@ do_configure_prepend() {
 do_install () {
 	install -d ${D}/${palmtopdir}/pics/${APPNAME}/
 	install -m 0644 ${WORKDIR}/*.png ${D}/${palmtopdir}/pics/
-	
+
 }
diff --git a/packages/ntp/ntp_4.1.2.bb b/packages/ntp/ntp_4.1.2.bb
index 4af70599f0..dc2d203690 100644
--- a/packages/ntp/ntp_4.1.2.bb
+++ b/packages/ntp/ntp_4.1.2.bb
@@ -39,10 +39,10 @@ else
 		test -d /etc/cron/crontabs || mkdir -p /etc/cron/crontabs
 		echo "30 * * * *    ${bindir}/ntpdate -s -u pool.ntp.org" >> /etc/cron/crontabs/root
 	fi
-	
+
 	# Dunno why this is here, ask the "nylon" guys :)
 	test -x /etc/init.d/busybox-cron && update-rc.d -s busybox-cron defaults
-	
+
 	update-rc.d -s ntpdate defaults 30
 fi
 }
diff --git a/packages/ntp/ntp_4.2.0.bb b/packages/ntp/ntp_4.2.0.bb
index 26d3664518..0ce7e10ac9 100644
--- a/packages/ntp/ntp_4.2.0.bb
+++ b/packages/ntp/ntp_4.2.0.bb
@@ -38,7 +38,7 @@ FILES_ntpdate = "${bindir}/ntpdate ${sysconfdir}/init.d/ntpdate"
 #perl scripts, and installing perl is an enormous overhead for a user who only
 #needs ntpq
 #RDEPENDS_ntp-bin = perl
-# ntp originally includes tickadj. It's split off for inclusion in small firmware images on platforms 
+# ntp originally includes tickadj. It's split off for inclusion in small firmware images on platforms
 # with wonky clocks (e.g. OpenSlug)
 RDEPENDS_${PN} = "${PN}-tickadj"
 FILES_${PN}-bin = "${bindir}/ntp-wait ${bindir}/ntpdc ${bindir}/ntpq ${bindir}/ntptime ${bindir}/ntptrace"
diff --git a/packages/ntp/ntp_4.2.2p3.bb b/packages/ntp/ntp_4.2.2p3.bb
index 679f666b46..de755824c9 100644
--- a/packages/ntp/ntp_4.2.2p3.bb
+++ b/packages/ntp/ntp_4.2.2p3.bb
@@ -31,7 +31,7 @@ PACKAGES += "ntpdate ntp-bin ntp-tickadj ntp-utils"
 # This should use rc.update
 FILES_ntpdate = "${bindir}/ntpdate ${sysconfdir}/init.d/ntpdate"
 
-# ntp originally includes tickadj. It's split off for inclusion in small firmware images on platforms 
+# ntp originally includes tickadj. It's split off for inclusion in small firmware images on platforms
 # with wonky clocks (e.g. OpenSlug)
 RDEPENDS_${PN} = "${PN}-tickadj"
 FILES_${PN}-bin = "${bindir}/ntp-wait ${bindir}/ntpdc ${bindir}/ntpq ${bindir}/ntptime ${bindir}/ntptrace"
diff --git a/packages/nunome/nunome_1.0.1.bb b/packages/nunome/nunome_1.0.1.bb
index d3af648813..373f30f571 100644
--- a/packages/nunome/nunome_1.0.1.bb
+++ b/packages/nunome/nunome_1.0.1.bb
@@ -13,6 +13,7 @@ S = "${WORKDIR}/nunome"
 inherit opie
 
 EXTRA_QMAKEVARS_POST += "INCLUDEPATH+=${S}/Nnmlib INCLUDEPATH+=${S}/ui LIBS+=-L${S}"
+OE_QMAKE_CXXFLAGS := "${@oe_filter_out('-fno-rtti', '${OE_QMAKE_CXXFLAGS}', d)}"
 PARALLEL_MAKE = ""
 
 do_configure_prepend() {
diff --git a/packages/nvidia-drivers/nvidia-display_1.0-8756.bb b/packages/nvidia-drivers/nvidia-display_1.0-8756.bb
index dd83eec800..a255025e0c 100644
--- a/packages/nvidia-drivers/nvidia-display_1.0-8756.bb
+++ b/packages/nvidia-drivers/nvidia-display_1.0-8756.bb
@@ -32,13 +32,13 @@ do_install() {
 	for dir in bin include lib share ; do
 		cp -pPR ${WORKDIR}/${PKG_BASENAME}/usr/$dir ${D}/usr/
 	done
-	
+
 	#X11R7.0 style...
 	install -d ${D}/usr/lib/xorg/
 	cp ${WORKDIR}/${PKG_BASENAME}/usr/X11R6/lib/lib* ${D}/usr/lib/
 	cp -pPR ${WORKDIR}/${PKG_BASENAME}/usr/X11R6/lib/modules ${D}/usr/lib/xorg/
 	ln -s libglx.so.1.0.8756 ${D}/usr/lib/xorg/modules/extensions/libglx.so
-	
+
 }
 
 do_stage() {
diff --git a/packages/nvidia-drivers/nvidia-nforce_1.0-0310.bb b/packages/nvidia-drivers/nvidia-nforce_1.0-0310.bb
index 42b928f38a..0005b24d39 100644
--- a/packages/nvidia-drivers/nvidia-nforce_1.0-0310.bb
+++ b/packages/nvidia-drivers/nvidia-nforce_1.0-0310.bb
@@ -24,7 +24,7 @@ do_compile() {
 		KERNEL_VERSION=${KERNEL_VERSION}    \
 		CC="${KERNEL_CC}" LD="${KERNEL_LD}" \
 		${MAKE_TARGETS}
-									   
+
 	cd ../nvsound/main
 	oe_runmake KERNEL_PATH=${STAGING_KERNEL_DIR}   \
 		KERNEL_SRC=${STAGING_KERNEL_DIR}    \
@@ -37,7 +37,7 @@ do_compile() {
 do_configure() {
 	rm -f ${S}/nvnet/makefile
 	rm -f ${S}/nvsound/main/makefile
-	
+
 	if [ "${KERNEL_PATCHLEVEL}" != "4" ] ; then
 		ln -sf Makefile.kbuild ${S}/nvnet/Makefile
 		ln -sf Makefile.kbuild ${S}/nvsound/main/Makefile
@@ -61,7 +61,7 @@ do_install() {
 	for dir in usr/bin nvsound/lib ; do
 		cp -pPR ${S}/$dir ${D}/usr/
 	done
-	
+
 }
 
 do_stage() {
diff --git a/packages/nylon/nylon-scripts_cvs.bb b/packages/nylon/nylon-scripts_cvs.bb
index 2840bc8adb..650bd1a8e8 100644
--- a/packages/nylon/nylon-scripts_cvs.bb
+++ b/packages/nylon/nylon-scripts_cvs.bb
@@ -28,13 +28,13 @@ else
 	update-rc.d -s emergency-ip defaults 98
 	update-rc.d -s flash-backup start 38 S . stop 38 0 6 .
 	update-rc.d -s dummydate start 50 S . stop 50 0 6 .
-	
+
 	if ! grep -q flash-backup /etc/cron/crontabs/root; then
 		echo "adding flash-backup crontab"
 		test -d /etc/cron/crontabs || mkdir -p /etc/cron/crontabs
 		echo "0 * * * *    /etc/init.d/flash-backup backup" >> /etc/cron/crontabs/root
 	fi
-	 
+
 	if ! grep -q reset-wlan /etc/cron/crontabs/root; then
 		echo "adding reset-wlan crontab"
 		test -d /etc/cron/crontabs || mkdir -p /etc/cron/crontabs
diff --git a/packages/nylon/nylon-statistics.bb b/packages/nylon/nylon-statistics.bb
index 883a5961f1..ef79bc6d31 100644
--- a/packages/nylon/nylon-statistics.bb
+++ b/packages/nylon/nylon-statistics.bb
@@ -33,9 +33,9 @@ else
 	/etc/init.d/busybox-cron reload
 	if [ ! -e /etc/httpd.conf ]; then
 		echo "A:*" > /etc/httpd.conf
-	fi	
+	fi
 	update-rc.d -s busybox-httpd defaults
-	
+
 	if ! grep -q "/var/lib/rrd/" /etc/nylon/backup.list; then
 		echo "adding to backup list"
 		echo "/var/lib/rrd/" >> /etc/nylon/backup.list
diff --git a/packages/obexftp/obexftp_0.20.bb b/packages/obexftp/obexftp_0.20.bb
index aa100bab36..23e360bbae 100644
--- a/packages/obexftp/obexftp_0.20.bb
+++ b/packages/obexftp/obexftp_0.20.bb
@@ -9,7 +9,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/openobex/obexftp-${PV}.tar.gz \
            file://i-hate-libtool.patch;patch=1 \
 	   file://m4.patch;patch=1"
 
-inherit autotools 
+inherit autotools
 
 EXTRA_OECONF = "--enable-bluetooth --disable-swig --disable-perl --disable-python --disable-tcl --disable-builddocs"
 
@@ -18,4 +18,4 @@ PARALLEL_MAKE = ""
 do_stage() {
 	autotools_stage_all
 }
-	
+
diff --git a/packages/obsolete/freedesktop-premodular-xlibs/libx11_6.2.1.bb b/packages/obsolete/freedesktop-premodular-xlibs/libx11_6.2.1.bb
index 4ce6871947..4ed4c6dd0c 100644
--- a/packages/obsolete/freedesktop-premodular-xlibs/libx11_6.2.1.bb
+++ b/packages/obsolete/freedesktop-premodular-xlibs/libx11_6.2.1.bb
@@ -14,7 +14,7 @@ SRC_URI = "${XLIBS_MIRROR}/libX11-${PV}.tar.bz2 \
 	   file://autofoo.patch;patch=1"
 S = "${WORKDIR}/libX11-${PV}"
 
-inherit autotools pkgconfig 
+inherit autotools pkgconfig
 
 do_compile() {
 	(
diff --git a/packages/obsolete/freedesktop-premodular-xlibs/libxau_0.1.1.bb b/packages/obsolete/freedesktop-premodular-xlibs/libxau_0.1.1.bb
index 00fbc92db6..c1b47cb77a 100644
--- a/packages/obsolete/freedesktop-premodular-xlibs/libxau_0.1.1.bb
+++ b/packages/obsolete/freedesktop-premodular-xlibs/libxau_0.1.1.bb
@@ -10,7 +10,7 @@ SRC_URI = "${XLIBS_MIRROR}/libXau-${PV}.tar.bz2 \
 	   file://autofoo.patch;patch=1"
 S = "${WORKDIR}/libXau-${PV}"
 
-inherit autotools pkgconfig 
+inherit autotools pkgconfig
 
 do_stage() {
 	autotools_stage_all
diff --git a/packages/obsolete/freedesktop-premodular-xlibs/libxcursor_1.1.2.bb b/packages/obsolete/freedesktop-premodular-xlibs/libxcursor_1.1.2.bb
index 8ed426fec3..2571939b54 100644
--- a/packages/obsolete/freedesktop-premodular-xlibs/libxcursor_1.1.2.bb
+++ b/packages/obsolete/freedesktop-premodular-xlibs/libxcursor_1.1.2.bb
@@ -10,7 +10,7 @@ SRC_URI = "${XLIBS_MIRROR}/libXcursor-${PV}.tar.bz2 \
 S = "${WORKDIR}/libXcursor-${PV}"
 FILES_${PN} += "${libdir}/libXcursor.so"
 
-inherit autotools pkgconfig 
+inherit autotools pkgconfig
 
 do_stage() {
 	autotools_stage_all
diff --git a/packages/obsolete/freedesktop-premodular-xlibs/libxdmcp_0.1.3.bb b/packages/obsolete/freedesktop-premodular-xlibs/libxdmcp_0.1.3.bb
index f7ea15ea0c..d5f01f4e36 100644
--- a/packages/obsolete/freedesktop-premodular-xlibs/libxdmcp_0.1.3.bb
+++ b/packages/obsolete/freedesktop-premodular-xlibs/libxdmcp_0.1.3.bb
@@ -10,7 +10,7 @@ S = "${WORKDIR}/libXdmcp-${PV}"
 SRC_URI = "${XLIBS_MIRROR}/libXdmcp-${PV}.tar.bz2 \
 	   file://autofoo.patch;patch=1"
 
-inherit autotools pkgconfig 
+inherit autotools pkgconfig
 
 do_stage() {
 	autotools_stage_all
diff --git a/packages/obsolete/freedesktop-premodular-xlibs/libxext_cvs.bb b/packages/obsolete/freedesktop-premodular-xlibs/libxext_cvs.bb
index 3e1ff1ab05..d5343fd798 100644
--- a/packages/obsolete/freedesktop-premodular-xlibs/libxext_cvs.bb
+++ b/packages/obsolete/freedesktop-premodular-xlibs/libxext_cvs.bb
@@ -11,7 +11,7 @@ PROVIDES = "xext"
 SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xext"
 S = "${WORKDIR}/Xext"
 
-inherit autotools pkgconfig 
+inherit autotools pkgconfig
 do_stage() {
 	autotools_stage_all
 }
diff --git a/packages/obsolete/freedesktop-premodular-xlibs/libxfixes_2.0.1.bb b/packages/obsolete/freedesktop-premodular-xlibs/libxfixes_2.0.1.bb
index 14174bf9a1..58643ed470 100644
--- a/packages/obsolete/freedesktop-premodular-xlibs/libxfixes_2.0.1.bb
+++ b/packages/obsolete/freedesktop-premodular-xlibs/libxfixes_2.0.1.bb
@@ -8,7 +8,7 @@ SRC_URI = "${XLIBS_MIRROR}/libXfixes-${PV}.tar.bz2 \
 	   file://autofoo.patch;patch=1"
 S = "${WORKDIR}/libXfixes-${PV}"
 
-inherit autotools pkgconfig 
+inherit autotools pkgconfig
 
 do_stage() {
 	autotools_stage_all
diff --git a/packages/obsolete/freedesktop-premodular-xlibs/libxft_2.1.6.bb b/packages/obsolete/freedesktop-premodular-xlibs/libxft_2.1.6.bb
index d6b51ca55d..f0116aca4b 100644
--- a/packages/obsolete/freedesktop-premodular-xlibs/libxft_2.1.6.bb
+++ b/packages/obsolete/freedesktop-premodular-xlibs/libxft_2.1.6.bb
@@ -14,7 +14,7 @@ FILES_${PN}-dev = ${includedir} ${libdir}/lib*.so ${libdir}/*.la \
 		${libdir}/*.a ${libdir}/pkgconfig \
 		${datadir}/aclocal ${bindir} ${sbindir}
 
-inherit autotools pkgconfig 
+inherit autotools pkgconfig
 
 do_stage() {
 	autotools_stage_all
diff --git a/packages/obsolete/freedesktop-premodular-xlibs/libxrender_0.8.4.bb b/packages/obsolete/freedesktop-premodular-xlibs/libxrender_0.8.4.bb
index 58d2ab33f6..9da41bfe75 100644
--- a/packages/obsolete/freedesktop-premodular-xlibs/libxrender_0.8.4.bb
+++ b/packages/obsolete/freedesktop-premodular-xlibs/libxrender_0.8.4.bb
@@ -8,7 +8,7 @@ SRC_URI = "${XLIBS_MIRROR}/libXrender-${PV}.tar.bz2 \
 	   file://autofoo.patch;patch=1"
 S = "${WORKDIR}/libXrender-${PV}"
 
-inherit autotools pkgconfig 
+inherit autotools pkgconfig
 
 do_stage() {
 	autotools_stage_all
diff --git a/packages/octave/octave_2.1.71.bb b/packages/octave/octave_2.1.71.bb
index 462eccbf65..22c4d69393 100644
--- a/packages/octave/octave_2.1.71.bb
+++ b/packages/octave/octave_2.1.71.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "GNU Octave is a high-level language, primarily intended for numerical computations. \
 It provides a convenient command line interface for solving linear and nonlinear problems numerically, \
 and for performing other numerical experiments using a language that is mostly compatible with Matlab. \
-It may also be used as a batch-oriented language." 
+It may also be used as a batch-oriented language."
 SECTION = "console/utils"
 LICENSE = "GPL"
 DEPENDS = "readline ncurses"
diff --git a/packages/openjade/openjade_1.3.2.bb b/packages/openjade/openjade_1.3.2.bb
index b99a6dee10..7b1272ba4f 100644
--- a/packages/openjade/openjade_1.3.2.bb
+++ b/packages/openjade/openjade_1.3.2.bb
@@ -8,7 +8,7 @@ LICENSE = "BSD"
 SRC_URI = "${SOURCEFORGE_MIRROR}/openjade/openjade-${PV}.tar.gz \
 	   file://configure.patch;patch=1"
 
-inherit autotools 
+inherit autotools
 
 EXTRA_OECONF = "--enable-spincludedir=${STAGING_INCDIR}/OpenSP \
                 --enable-splibdir=${STAGING_LIBDIR}"
diff --git a/packages/openocd/openocd_svn.bb b/packages/openocd/openocd_svn.bb
index 26ab365b0e..3523cfce33 100644
--- a/packages/openocd/openocd_svn.bb
+++ b/packages/openocd/openocd_svn.bb
@@ -9,6 +9,6 @@ inherit autotools
 SRC_URI = "svn://svn.berlios.de/;module=${PN}"
 
 S = "${WORKDIR}/${PN}/trunk"
-EXTRA_OECONF = "  --disable-ftdi2232 --disable-ftd2xx"  
+EXTRA_OECONF = "  --disable-ftdi2232 --disable-ftd2xx"
 
 
diff --git a/packages/openprotium-init/openprotium-init_0.10.bb b/packages/openprotium-init/openprotium-init_0.10.bb
index 5ec63b1dfd..92c9d789cb 100644
--- a/packages/openprotium-init/openprotium-init_0.10.bb
+++ b/packages/openprotium-init/openprotium-init_0.10.bb
@@ -63,7 +63,7 @@ do_install() {
 		   ${D}${base_sbindir} \
 		   ${D}/initrd \
 		   ${D}/boot
-		  
+
 	# linuxrc
 	rm -f ${D}/linuxrc
 	ln -s boot/flash ${D}/linuxrc
@@ -87,7 +87,7 @@ do_install() {
 	#
 	# Init scripts
 	install -m 0644 functions ${D}${sysconfdir}/default
-	install -m 0644 modulefunctions ${D}${sysconfdir}/default	
+	install -m 0644 modulefunctions ${D}${sysconfdir}/default
 	for s in ${INITSCRIPTS}
 	do
 		install -m 0755 initscripts/$s ${D}${sysconfdir}/init.d/
diff --git a/packages/opensp/opensp_1.5.bb b/packages/opensp/opensp_1.5.bb
index 7cb164a770..5d6ad639af 100644
--- a/packages/opensp/opensp_1.5.bb
+++ b/packages/opensp/opensp_1.5.bb
@@ -8,7 +8,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/openjade/OpenSP-${PV}.tar.gz \
 	   file://attributevalue.patch;patch=1"
 S = "${WORKDIR}/OpenSP-${PV}"
 
-inherit autotools 
+inherit autotools
 
 do_stage () {
 	oe_libinstall -a -so -C lib libosp ${STAGING_LIBDIR}
diff --git a/packages/openssh/openssh_3.8p1.bb b/packages/openssh/openssh_3.8p1.bb
index 2c830982ee..dc365f5eac 100644
--- a/packages/openssh/openssh_3.8p1.bb
+++ b/packages/openssh/openssh_3.8p1.bb
@@ -31,7 +31,7 @@ EXTRA_OECONF = "--disable-suid-ssh --with-ssl=${STAGING_LIBDIR}/ssl \
 	        --without-zlib-version-check \
 		--with-privsep-path=/var/run/sshd \
 		--sysconfdir=${sysconfdir}/ssh"
-		
+
 EXTRA_OEMAKE = "'STRIP_OPT='"
 
 do_configure_prepend () {
diff --git a/packages/openssh/openssh_4.0p1.bb b/packages/openssh/openssh_4.0p1.bb
index 86763a9275..ae3092ff10 100644
--- a/packages/openssh/openssh_4.0p1.bb
+++ b/packages/openssh/openssh_4.0p1.bb
@@ -35,7 +35,7 @@ EXTRA_OECONF = "--disable-suid-ssh --with-ssl=${STAGING_LIBDIR}/ssl \
 		--with-privsep-path=/var/run/sshd \
 		--sysconfdir=${sysconfdir}/ssh \
 		--with-xauth=/usr/bin/xauth"
-		
+
 EXTRA_OEMAKE = "'STRIP_OPT='"
 
 do_configure_prepend () {
diff --git a/packages/openssh/openssh_4.3p2.bb b/packages/openssh/openssh_4.3p2.bb
index 810810acb6..114657536a 100644
--- a/packages/openssh/openssh_4.3p2.bb
+++ b/packages/openssh/openssh_4.3p2.bb
@@ -34,7 +34,7 @@ EXTRA_OECONF = "--disable-suid-ssh --with-ssl=${STAGING_LIBDIR}/ssl \
 		--with-privsep-path=/var/run/sshd \
 		--sysconfdir=${sysconfdir}/ssh \
 		--with-xauth=/usr/bin/xauth"
-		
+
 EXTRA_OEMAKE = "'STRIP_OPT='"
 
 do_configure_prepend () {
diff --git a/packages/opensync/libsyncml_0.4.0.bb b/packages/opensync/libsyncml_0.4.0.bb
index 19bc91c382..dbc7404f50 100644
--- a/packages/opensync/libsyncml_0.4.0.bb
+++ b/packages/opensync/libsyncml_0.4.0.bb
@@ -12,7 +12,7 @@ EXTRA_OECONF = " --enable-http \
   		 --enable-obex \
   		 --enable-bluetooth \
     		 --enable-tools \
-		 --with-wbxml"      
+		 --with-wbxml"
 
 CFLAGS += "-I${STAGING_INCDIR}/libsoup-2.2"
 
diff --git a/packages/opensync/syncml-client_0.1.bb b/packages/opensync/syncml-client_0.1.bb
index 7a99236d90..729ac9a559 100644
--- a/packages/opensync/syncml-client_0.1.bb
+++ b/packages/opensync/syncml-client_0.1.bb
@@ -3,6 +3,6 @@ SRC_URI = "http://hem.bredband.net/miko22/${P}.tar.gz"
 LICENSE = "GPL"
 DEPENDS = "gtk+ curl gconf"
 HOMEPAGE = "http://hem.bredband.net/miko22/"
-DESCRIPTION = "Linux port of the Funambol C++ SyncML client connector." 
+DESCRIPTION = "Linux port of the Funambol C++ SyncML client connector."
 
 inherit autotools pkgconfig
diff --git a/packages/opie-aboutapplet/opie-aboutapplet_cvs.bb b/packages/opie-aboutapplet/opie-aboutapplet_cvs.bb
index 668697dd6b..a1172a5cc0 100644
--- a/packages/opie-aboutapplet/opie-aboutapplet_cvs.bb
+++ b/packages/opie-aboutapplet/opie-aboutapplet_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/aboutapplet"
diff --git a/packages/opie-addressbook/opie-addressbook_1.2.2.bb b/packages/opie-addressbook/opie-addressbook_1.2.2.bb
index e32ef1b348..5667f05ba2 100644
--- a/packages/opie-addressbook/opie-addressbook_1.2.2.bb
+++ b/packages/opie-addressbook/opie-addressbook_1.2.2.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/pim/addressbook \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-addressbook/opie-addressbook_cvs.bb b/packages/opie-addressbook/opie-addressbook_cvs.bb
index f0db7f32fc..e66a3b2faa 100644
--- a/packages/opie-addressbook/opie-addressbook_cvs.bb
+++ b/packages/opie-addressbook/opie-addressbook_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/pim/addressbook \
diff --git a/packages/opie-advancedfm/opie-advancedfm_1.2.2.bb b/packages/opie-advancedfm/opie-advancedfm_1.2.2.bb
index eb2011e5f3..1df77dc9be 100644
--- a/packages/opie-advancedfm/opie-advancedfm_1.2.2.bb
+++ b/packages/opie-advancedfm/opie-advancedfm_1.2.2.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/${APPNAME} \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-advancedfm/opie-advancedfm_cvs.bb b/packages/opie-advancedfm/opie-advancedfm_cvs.bb
index 2d365c68a6..ca2955fb0b 100644
--- a/packages/opie-advancedfm/opie-advancedfm_cvs.bb
+++ b/packages/opie-advancedfm/opie-advancedfm_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/${APPNAME} \
diff --git a/packages/opie-alarm/opie-alarm_1.2.2.bb b/packages/opie-alarm/opie-alarm_1.2.2.bb
index 7ae0b195a9..c656e87e98 100644
--- a/packages/opie-alarm/opie-alarm_1.2.2.bb
+++ b/packages/opie-alarm/opie-alarm_1.2.2.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/opiealarm \
            file://01opiealarm "
diff --git a/packages/opie-alarm/opie-alarm_cvs.bb b/packages/opie-alarm/opie-alarm_cvs.bb
index 22b8f92bbd..0dd6254dbe 100644
--- a/packages/opie-alarm/opie-alarm_cvs.bb
+++ b/packages/opie-alarm/opie-alarm_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/opiealarm \
diff --git a/packages/opie-appearance/opie-appearance_cvs.bb b/packages/opie-appearance/opie-appearance_cvs.bb
index db634523f8..ecb74d91df 100644
--- a/packages/opie-appearance/opie-appearance_cvs.bb
+++ b/packages/opie-appearance/opie-appearance_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/settings/appearance2 \
diff --git a/packages/opie-aqpkg/opie-aqpkg_1.2.2.bb b/packages/opie-aqpkg/opie-aqpkg_1.2.2.bb
index 7eff025ffc..4de0ec4958 100644
--- a/packages/opie-aqpkg/opie-aqpkg_1.2.2.bb
+++ b/packages/opie-aqpkg/opie-aqpkg_1.2.2.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/aqpkg \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-aqpkg/opie-aqpkg_cvs.bb b/packages/opie-aqpkg/opie-aqpkg_cvs.bb
index cbbdc6d306..3a372b698a 100644
--- a/packages/opie-aqpkg/opie-aqpkg_cvs.bb
+++ b/packages/opie-aqpkg/opie-aqpkg_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/settings/aqpkg \
diff --git a/packages/opie-autorotateapplet/opie-autorotateapplet_1.2.2.bb b/packages/opie-autorotateapplet/opie-autorotateapplet_1.2.2.bb
index cc37c5e1bd..c2a43d1108 100644
--- a/packages/opie-autorotateapplet/opie-autorotateapplet_1.2.2.bb
+++ b/packages/opie-autorotateapplet/opie-autorotateapplet_1.2.2.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/applets/autorotateapplet \
 	   ${HANDHELDS_CVS};tag=${TAG};module=opie/pics"
diff --git a/packages/opie-autorotateapplet/opie-autorotateapplet_cvs.bb b/packages/opie-autorotateapplet/opie-autorotateapplet_cvs.bb
index d8a3b4a0a8..6c1e0a212f 100644
--- a/packages/opie-autorotateapplet/opie-autorotateapplet_cvs.bb
+++ b/packages/opie-autorotateapplet/opie-autorotateapplet_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/applets/autorotateapplet \
diff --git a/packages/opie-backgammon/opie-backgammon_1.2.2.bb b/packages/opie-backgammon/opie-backgammon_1.2.2.bb
index 892ed19759..1dffa307bb 100644
--- a/packages/opie-backgammon/opie-backgammon_1.2.2.bb
+++ b/packages/opie-backgammon/opie-backgammon_1.2.2.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/backgammon \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-backgammon/opie-backgammon_cvs.bb b/packages/opie-backgammon/opie-backgammon_cvs.bb
index d532ac1478..42559202a0 100644
--- a/packages/opie-backgammon/opie-backgammon_cvs.bb
+++ b/packages/opie-backgammon/opie-backgammon_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/backgammon \
diff --git a/packages/opie-backup/opie-backup_cvs.bb b/packages/opie-backup/opie-backup_cvs.bb
index 59d32bf8cd..a0ed96cc64 100644
--- a/packages/opie-backup/opie-backup_cvs.bb
+++ b/packages/opie-backup/opie-backup_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/settings/backup \
diff --git a/packages/opie-bartender/opie-bartender_1.2.2.bb b/packages/opie-bartender/opie-bartender_1.2.2.bb
index d91e2179bd..67e07df39a 100644
--- a/packages/opie-bartender/opie-bartender_1.2.2.bb
+++ b/packages/opie-bartender/opie-bartender_1.2.2.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/opie-bartender \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-bartender/opie-bartender_cvs.bb b/packages/opie-bartender/opie-bartender_cvs.bb
index c7ab8583fa..0ba1b88e70 100644
--- a/packages/opie-bartender/opie-bartender_cvs.bb
+++ b/packages/opie-bartender/opie-bartender_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/opie-bartender \
diff --git a/packages/opie-bluepin/opie-bluepin_cvs.bb b/packages/opie-bluepin/opie-bluepin_cvs.bb
index c4083ec846..0548fa8b6b 100644
--- a/packages/opie-bluepin/opie-bluepin_cvs.bb
+++ b/packages/opie-bluepin/opie-bluepin_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/opietooth/blue-pin"
diff --git a/packages/opie-bluetoothapplet/opie-bluetoothapplet_1.2.2.bb b/packages/opie-bluetoothapplet/opie-bluetoothapplet_1.2.2.bb
index c75a50a9e5..6db4ec5af6 100644
--- a/packages/opie-bluetoothapplet/opie-bluetoothapplet_1.2.2.bb
+++ b/packages/opie-bluetoothapplet/opie-bluetoothapplet_1.2.2.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/opietooth/applet \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics/bluetoothapplet"
diff --git a/packages/opie-bluetoothapplet/opie-bluetoothapplet_cvs.bb b/packages/opie-bluetoothapplet/opie-bluetoothapplet_cvs.bb
index 9387c04409..bf9cc5689b 100644
--- a/packages/opie-bluetoothapplet/opie-bluetoothapplet_cvs.bb
+++ b/packages/opie-bluetoothapplet/opie-bluetoothapplet_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/opietooth/applet \
diff --git a/packages/opie-bounce/opie-bounce_1.2.2.bb b/packages/opie-bounce/opie-bounce_1.2.2.bb
index f3e587b59a..990c40296e 100644
--- a/packages/opie-bounce/opie-bounce_1.2.2.bb
+++ b/packages/opie-bounce/opie-bounce_1.2.2.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/bounce \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-bounce/opie-bounce_cvs.bb b/packages/opie-bounce/opie-bounce_cvs.bb
index c50e1adba6..8215c5baed 100644
--- a/packages/opie-bounce/opie-bounce_cvs.bb
+++ b/packages/opie-bounce/opie-bounce_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/bounce \
diff --git a/packages/opie-brightnessapplet/opie-brightnessapplet_1.2.2.bb b/packages/opie-brightnessapplet/opie-brightnessapplet_1.2.2.bb
index 2d573375ec..ed74ebd446 100644
--- a/packages/opie-brightnessapplet/opie-brightnessapplet_1.2.2.bb
+++ b/packages/opie-brightnessapplet/opie-brightnessapplet_1.2.2.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/applets/brightnessapplet \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics"
diff --git a/packages/opie-brightnessapplet/opie-brightnessapplet_cvs.bb b/packages/opie-brightnessapplet/opie-brightnessapplet_cvs.bb
index 511df2f502..a364980c1a 100644
--- a/packages/opie-brightnessapplet/opie-brightnessapplet_cvs.bb
+++ b/packages/opie-brightnessapplet/opie-brightnessapplet_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/applets/brightnessapplet \
diff --git a/packages/opie-button-settings/opie-button-settings_cvs.bb b/packages/opie-button-settings/opie-button-settings_cvs.bb
index cd77a862fb..d340e98bd1 100644
--- a/packages/opie-button-settings/opie-button-settings_cvs.bb
+++ b/packages/opie-button-settings/opie-button-settings_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/settings/button \
diff --git a/packages/opie-buzzword/opie-buzzword_1.2.2.bb b/packages/opie-buzzword/opie-buzzword_1.2.2.bb
index d1560d811e..64b24d8a65 100644
--- a/packages/opie-buzzword/opie-buzzword_1.2.2.bb
+++ b/packages/opie-buzzword/opie-buzzword_1.2.2.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/buzzword \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-buzzword/opie-buzzword_cvs.bb b/packages/opie-buzzword/opie-buzzword_cvs.bb
index e35f855098..3ac46958a8 100644
--- a/packages/opie-buzzword/opie-buzzword_cvs.bb
+++ b/packages/opie-buzzword/opie-buzzword_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/buzzword \
diff --git a/packages/opie-camera/opie-camera_1.2.2.bb b/packages/opie-camera/opie-camera_1.2.2.bb
index d6906dd80a..f1e7a230f1 100644
--- a/packages/opie-camera/opie-camera_1.2.2.bb
+++ b/packages/opie-camera/opie-camera_1.2.2.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/multimedia/${APPNAME} \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-camera/opie-camera_cvs.bb b/packages/opie-camera/opie-camera_cvs.bb
index 571689673f..9c6b059ca9 100644
--- a/packages/opie-camera/opie-camera_cvs.bb
+++ b/packages/opie-camera/opie-camera_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/multimedia/${APPNAME} \
diff --git a/packages/opie-cardmon/opie-cardmon_1.2.2.bb b/packages/opie-cardmon/opie-cardmon_1.2.2.bb
index c5da07532f..607f2ff497 100644
--- a/packages/opie-cardmon/opie-cardmon_1.2.2.bb
+++ b/packages/opie-cardmon/opie-cardmon_1.2.2.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/cardmon \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-cardmon/opie-cardmon_cvs.bb b/packages/opie-cardmon/opie-cardmon_cvs.bb
index 2168baffda..b1e69fb619 100644
--- a/packages/opie-cardmon/opie-cardmon_cvs.bb
+++ b/packages/opie-cardmon/opie-cardmon_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/cardmon \
diff --git a/packages/opie-checkbook/opie-checkbook_1.2.2.bb b/packages/opie-checkbook/opie-checkbook_1.2.2.bb
index eb2011e5f3..1df77dc9be 100644
--- a/packages/opie-checkbook/opie-checkbook_1.2.2.bb
+++ b/packages/opie-checkbook/opie-checkbook_1.2.2.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/${APPNAME} \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-checkbook/opie-checkbook_cvs.bb b/packages/opie-checkbook/opie-checkbook_cvs.bb
index 2d365c68a6..ca2955fb0b 100644
--- a/packages/opie-checkbook/opie-checkbook_cvs.bb
+++ b/packages/opie-checkbook/opie-checkbook_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/${APPNAME} \
diff --git a/packages/opie-citytime/opie-citytime_1.2.2.bb b/packages/opie-citytime/opie-citytime_1.2.2.bb
index 94fde31e6a..01fb34b795 100644
--- a/packages/opie-citytime/opie-citytime_1.2.2.bb
+++ b/packages/opie-citytime/opie-citytime_1.2.2.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/settings/citytime \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-citytime/opie-citytime_cvs.bb b/packages/opie-citytime/opie-citytime_cvs.bb
index 457b9e2bb8..e4d9c1729e 100644
--- a/packages/opie-citytime/opie-citytime_cvs.bb
+++ b/packages/opie-citytime/opie-citytime_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/settings/citytime \
diff --git a/packages/opie-clock/opie-clock_1.2.2.bb b/packages/opie-clock/opie-clock_1.2.2.bb
index da30def9ca..a83184a46f 100644
--- a/packages/opie-clock/opie-clock_1.2.2.bb
+++ b/packages/opie-clock/opie-clock_1.2.2.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/tools/clock \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-clock/opie-clock_cvs.bb b/packages/opie-clock/opie-clock_cvs.bb
index ef670bb7a8..ec38d84e8b 100644
--- a/packages/opie-clock/opie-clock_cvs.bb
+++ b/packages/opie-clock/opie-clock_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/tools/clock \
diff --git a/packages/opie-confeditor/opie-confeditor_1.2.2.bb b/packages/opie-confeditor/opie-confeditor_1.2.2.bb
index c6f7ff7612..60141c7ba9 100644
--- a/packages/opie-confeditor/opie-confeditor_1.2.2.bb
+++ b/packages/opie-confeditor/opie-confeditor_1.2.2.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/confedit \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-confeditor/opie-confeditor_cvs.bb b/packages/opie-confeditor/opie-confeditor_cvs.bb
index e945ad6de2..3431c6a1fd 100644
--- a/packages/opie-confeditor/opie-confeditor_cvs.bb
+++ b/packages/opie-confeditor/opie-confeditor_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/confedit \
diff --git a/packages/opie-dagger/opie-dagger_1.2.2.bb b/packages/opie-dagger/opie-dagger_1.2.2.bb
index 36a938634f..74589fbb96 100644
--- a/packages/opie-dagger/opie-dagger_1.2.2.bb
+++ b/packages/opie-dagger/opie-dagger_1.2.2.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/dagger \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-dagger/opie-dagger_cvs.bb b/packages/opie-dagger/opie-dagger_cvs.bb
index 59f2d5a943..6649fd81a0 100644
--- a/packages/opie-dagger/opie-dagger_cvs.bb
+++ b/packages/opie-dagger/opie-dagger_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/dagger \
diff --git a/packages/opie-dasher/opie-dasher_1.2.2.bb b/packages/opie-dasher/opie-dasher_1.2.2.bb
index 0f19139b0a..3a2e814fe1 100644
--- a/packages/opie-dasher/opie-dasher_1.2.2.bb
+++ b/packages/opie-dasher/opie-dasher_1.2.2.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/inputmethods/dasher \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/share "
diff --git a/packages/opie-dasher/opie-dasher_cvs.bb b/packages/opie-dasher/opie-dasher_cvs.bb
index 58a051e2fa..d53cfc9e1b 100644
--- a/packages/opie-dasher/opie-dasher_cvs.bb
+++ b/packages/opie-dasher/opie-dasher_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/inputmethods/dasher \
diff --git a/packages/opie-datebook-birthdayplugin/opie-datebook-birthdayplugin_1.2.2.bb b/packages/opie-datebook-birthdayplugin/opie-datebook-birthdayplugin_1.2.2.bb
index c9ba827803..397bb5239d 100644
--- a/packages/opie-datebook-birthdayplugin/opie-datebook-birthdayplugin_1.2.2.bb
+++ b/packages/opie-datebook-birthdayplugin/opie-datebook-birthdayplugin_1.2.2.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/pim/datebook/holiday/birthday "
diff --git a/packages/opie-datebook-birthdayplugin/opie-datebook-birthdayplugin_cvs.bb b/packages/opie-datebook-birthdayplugin/opie-datebook-birthdayplugin_cvs.bb
index a4007d5a2c..2ade3c9e51 100644
--- a/packages/opie-datebook-birthdayplugin/opie-datebook-birthdayplugin_cvs.bb
+++ b/packages/opie-datebook-birthdayplugin/opie-datebook-birthdayplugin_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/pim/datebook/holiday/birthday "
diff --git a/packages/opie-datebook-chrisholidayplugin/opie-datebook-chrisholidayplugin_1.2.2.bb b/packages/opie-datebook-chrisholidayplugin/opie-datebook-chrisholidayplugin_1.2.2.bb
index f2912d602c..b95ca154fd 100644
--- a/packages/opie-datebook-chrisholidayplugin/opie-datebook-chrisholidayplugin_1.2.2.bb
+++ b/packages/opie-datebook-chrisholidayplugin/opie-datebook-chrisholidayplugin_1.2.2.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/pim/datebook/holiday/christian "
diff --git a/packages/opie-datebook-chrisholidayplugin/opie-datebook-chrisholidayplugin_cvs.bb b/packages/opie-datebook-chrisholidayplugin/opie-datebook-chrisholidayplugin_cvs.bb
index 707c2e94f0..d9d0c07932 100644
--- a/packages/opie-datebook-chrisholidayplugin/opie-datebook-chrisholidayplugin_cvs.bb
+++ b/packages/opie-datebook-chrisholidayplugin/opie-datebook-chrisholidayplugin_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/pim/datebook/holiday/christian "
diff --git a/packages/opie-datebook-nationalholidayplugin/opie-datebook-nationalholidayplugin_1.2.2.bb b/packages/opie-datebook-nationalholidayplugin/opie-datebook-nationalholidayplugin_1.2.2.bb
index 56f2112b29..3e663fbe38 100644
--- a/packages/opie-datebook-nationalholidayplugin/opie-datebook-nationalholidayplugin_1.2.2.bb
+++ b/packages/opie-datebook-nationalholidayplugin/opie-datebook-nationalholidayplugin_1.2.2.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/pim/datebook/holiday/national \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/etc/nationaldays "
diff --git a/packages/opie-datebook-nationalholidayplugin/opie-datebook-nationalholidayplugin_cvs.bb b/packages/opie-datebook-nationalholidayplugin/opie-datebook-nationalholidayplugin_cvs.bb
index 38927d1564..b396f38a01 100644
--- a/packages/opie-datebook-nationalholidayplugin/opie-datebook-nationalholidayplugin_cvs.bb
+++ b/packages/opie-datebook-nationalholidayplugin/opie-datebook-nationalholidayplugin_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/pim/datebook/holiday/national \
diff --git a/packages/opie-datebook/opie-datebook_cvs.bb b/packages/opie-datebook/opie-datebook_cvs.bb
index e5e5a0e558..bbde94d59d 100644
--- a/packages/opie-datebook/opie-datebook_cvs.bb
+++ b/packages/opie-datebook/opie-datebook_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/pim/datebook \
diff --git a/packages/opie-deco-flat/opie-deco-flat_1.2.2.bb b/packages/opie-deco-flat/opie-deco-flat_1.2.2.bb
index 14dc7ce512..f0564654a8 100644
--- a/packages/opie-deco-flat/opie-deco-flat_1.2.2.bb
+++ b/packages/opie-deco-flat/opie-deco-flat_1.2.2.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/decorations/flat "
diff --git a/packages/opie-deco-flat/opie-deco-flat_cvs.bb b/packages/opie-deco-flat/opie-deco-flat_cvs.bb
index 7cd4c8bf1a..aeeccfc956 100644
--- a/packages/opie-deco-flat/opie-deco-flat_cvs.bb
+++ b/packages/opie-deco-flat/opie-deco-flat_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/decorations/flat "
diff --git a/packages/opie-deco-liquid/opie-deco-liquid_1.2.2.bb b/packages/opie-deco-liquid/opie-deco-liquid_1.2.2.bb
index b4f9ff39b7..fbe8119992 100644
--- a/packages/opie-deco-liquid/opie-deco-liquid_1.2.2.bb
+++ b/packages/opie-deco-liquid/opie-deco-liquid_1.2.2.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/decorations/liquid "
diff --git a/packages/opie-deco-liquid/opie-deco-liquid_cvs.bb b/packages/opie-deco-liquid/opie-deco-liquid_cvs.bb
index 5a379e0087..d807dc67be 100644
--- a/packages/opie-deco-liquid/opie-deco-liquid_cvs.bb
+++ b/packages/opie-deco-liquid/opie-deco-liquid_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/decorations/liquid "
diff --git a/packages/opie-deco-polished/opie-deco-polished_1.2.2.bb b/packages/opie-deco-polished/opie-deco-polished_1.2.2.bb
index 77ca1c864f..583cfb179f 100644
--- a/packages/opie-deco-polished/opie-deco-polished_1.2.2.bb
+++ b/packages/opie-deco-polished/opie-deco-polished_1.2.2.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/decorations/polished "
diff --git a/packages/opie-deco-polished/opie-deco-polished_cvs.bb b/packages/opie-deco-polished/opie-deco-polished_cvs.bb
index 506d11f26e..ab6d8bf304 100644
--- a/packages/opie-deco-polished/opie-deco-polished_cvs.bb
+++ b/packages/opie-deco-polished/opie-deco-polished_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/decorations/polished "
diff --git a/packages/opie-doctab/opie-doctab_1.2.2.bb b/packages/opie-doctab/opie-doctab_1.2.2.bb
index 656c10eca3..ec714a00e8 100644
--- a/packages/opie-doctab/opie-doctab_1.2.2.bb
+++ b/packages/opie-doctab/opie-doctab_1.2.2.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/doctab \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \
diff --git a/packages/opie-doctab/opie-doctab_cvs.bb b/packages/opie-doctab/opie-doctab_cvs.bb
index cc2c7819d1..3e7a8519a8 100644
--- a/packages/opie-doctab/opie-doctab_cvs.bb
+++ b/packages/opie-doctab/opie-doctab_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/settings/doctab \
diff --git a/packages/opie-drawpad/opie-drawpad_1.2.2.bb b/packages/opie-drawpad/opie-drawpad_1.2.2.bb
index 7d3084f05f..c6055d1525 100644
--- a/packages/opie-drawpad/opie-drawpad_1.2.2.bb
+++ b/packages/opie-drawpad/opie-drawpad_1.2.2.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/graphics/drawpad \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-drawpad/opie-drawpad_cvs.bb b/packages/opie-drawpad/opie-drawpad_cvs.bb
index 23e2674f9f..8d2cf708af 100644
--- a/packages/opie-drawpad/opie-drawpad_cvs.bb
+++ b/packages/opie-drawpad/opie-drawpad_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/graphics/drawpad \
diff --git a/packages/opie-dvorak/opie-dvorak_1.2.2.bb b/packages/opie-dvorak/opie-dvorak_1.2.2.bb
index 39ae44e08e..a958f6cc88 100644
--- a/packages/opie-dvorak/opie-dvorak_1.2.2.bb
+++ b/packages/opie-dvorak/opie-dvorak_1.2.2.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/inputmethods/dvorak \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/inputmethods/pickboard"
diff --git a/packages/opie-dvorak/opie-dvorak_cvs.bb b/packages/opie-dvorak/opie-dvorak_cvs.bb
index 33c9345763..bf38334b0c 100644
--- a/packages/opie-dvorak/opie-dvorak_cvs.bb
+++ b/packages/opie-dvorak/opie-dvorak_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/inputmethods/dvorak \
diff --git a/packages/opie-euroconv/opie-euroconv_1.2.2.bb b/packages/opie-euroconv/opie-euroconv_1.2.2.bb
index 9053e62f5f..69999abdcb 100644
--- a/packages/opie-euroconv/opie-euroconv_1.2.2.bb
+++ b/packages/opie-euroconv/opie-euroconv_1.2.2.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/tools/euroconv \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-euroconv/opie-euroconv_cvs.bb b/packages/opie-euroconv/opie-euroconv_cvs.bb
index 56af9ca0ee..2578d52026 100644
--- a/packages/opie-euroconv/opie-euroconv_cvs.bb
+++ b/packages/opie-euroconv/opie-euroconv_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/tools/euroconv \
diff --git a/packages/opie-examples/opie-examples_1.2.2.bb b/packages/opie-examples/opie-examples_1.2.2.bb
index 7f601d9744..69cf92abe7 100644
--- a/packages/opie-examples/opie-examples_1.2.2.bb
+++ b/packages/opie-examples/opie-examples_1.2.2.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/examples \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-examples/opie-examples_cvs.bb b/packages/opie-examples/opie-examples_cvs.bb
index a468b68ec4..67018bce33 100644
--- a/packages/opie-examples/opie-examples_cvs.bb
+++ b/packages/opie-examples/opie-examples_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/examples \
diff --git a/packages/opie-eye/opie-eye_1.2.2.bb b/packages/opie-eye/opie-eye_1.2.2.bb
index f67489075a..c7676389ce 100644
--- a/packages/opie-eye/opie-eye_1.2.2.bb
+++ b/packages/opie-eye/opie-eye_1.2.2.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/graphics/opie-eye \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-eye/opie-eye_cvs.bb b/packages/opie-eye/opie-eye_cvs.bb
index 9997125ac9..6eee0c6d8e 100644
--- a/packages/opie-eye/opie-eye_cvs.bb
+++ b/packages/opie-eye/opie-eye_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/graphics/opie-eye \
diff --git a/packages/opie-fifteen/opie-fifteen_1.2.2.bb b/packages/opie-fifteen/opie-fifteen_1.2.2.bb
index 1463d942ee..817415710a 100644
--- a/packages/opie-fifteen/opie-fifteen_1.2.2.bb
+++ b/packages/opie-fifteen/opie-fifteen_1.2.2.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/fifteen \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-fifteen/opie-fifteen_cvs.bb b/packages/opie-fifteen/opie-fifteen_cvs.bb
index 0a2b7e078e..56644933b9 100644
--- a/packages/opie-fifteen/opie-fifteen_cvs.bb
+++ b/packages/opie-fifteen/opie-fifteen_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/fifteen \
diff --git a/packages/opie-formatter/opie-formatter_1.2.2.bb b/packages/opie-formatter/opie-formatter_1.2.2.bb
index 9665187811..3fe511399d 100644
--- a/packages/opie-formatter/opie-formatter_1.2.2.bb
+++ b/packages/opie-formatter/opie-formatter_1.2.2.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/tools/formatter \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-formatter/opie-formatter_cvs.bb b/packages/opie-formatter/opie-formatter_cvs.bb
index 8b83f84df1..03c83a1542 100644
--- a/packages/opie-formatter/opie-formatter_cvs.bb
+++ b/packages/opie-formatter/opie-formatter_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/tools/formatter \
diff --git a/packages/opie-ftp/opie-ftp_1.2.2.bb b/packages/opie-ftp/opie-ftp_1.2.2.bb
index f74b9eefcf..b0dd7aed5d 100644
--- a/packages/opie-ftp/opie-ftp_1.2.2.bb
+++ b/packages/opie-ftp/opie-ftp_1.2.2.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/opieftp \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-ftp/opie-ftp_cvs.bb b/packages/opie-ftp/opie-ftp_cvs.bb
index 0217273ef6..2d0b8d9199 100644
--- a/packages/opie-ftp/opie-ftp_cvs.bb
+++ b/packages/opie-ftp/opie-ftp_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/opieftp \
diff --git a/packages/opie-ftplib/opie-ftplib_1.2.2.bb b/packages/opie-ftplib/opie-ftplib_1.2.2.bb
index d614b14595..27b6d9b535 100644
--- a/packages/opie-ftplib/opie-ftplib_1.2.2.bb
+++ b/packages/opie-ftplib/opie-ftplib_1.2.2.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/ftplib"
diff --git a/packages/opie-ftplib/opie-ftplib_cvs.bb b/packages/opie-ftplib/opie-ftplib_cvs.bb
index 29d9a5e8fe..1275355f92 100644
--- a/packages/opie-ftplib/opie-ftplib_cvs.bb
+++ b/packages/opie-ftplib/opie-ftplib_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/ftplib"
diff --git a/packages/opie-go/opie-go_1.2.2.bb b/packages/opie-go/opie-go_1.2.2.bb
index fa01fa9b04..049bc2feb6 100644
--- a/packages/opie-go/opie-go_1.2.2.bb
+++ b/packages/opie-go/opie-go_1.2.2.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/go \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-go/opie-go_cvs.bb b/packages/opie-go/opie-go_cvs.bb
index 62609e923c..a23d2ee45c 100644
--- a/packages/opie-go/opie-go_cvs.bb
+++ b/packages/opie-go/opie-go_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/go \
diff --git a/packages/opie-gutenbrowser/opie-gutenbrowser_1.2.2.bb b/packages/opie-gutenbrowser/opie-gutenbrowser_1.2.2.bb
index a322ae5301..a6fe8ae305 100644
--- a/packages/opie-gutenbrowser/opie-gutenbrowser_1.2.2.bb
+++ b/packages/opie-gutenbrowser/opie-gutenbrowser_1.2.2.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/opie-gutenbrowser \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-gutenbrowser/opie-gutenbrowser_cvs.bb b/packages/opie-gutenbrowser/opie-gutenbrowser_cvs.bb
index 72349585ad..6e64fef216 100644
--- a/packages/opie-gutenbrowser/opie-gutenbrowser_cvs.bb
+++ b/packages/opie-gutenbrowser/opie-gutenbrowser_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/opie-gutenbrowser \
diff --git a/packages/opie-handwriting/opie-handwriting_1.2.2.bb b/packages/opie-handwriting/opie-handwriting_1.2.2.bb
index 46f832bc8d..01e2c3fc4e 100644
--- a/packages/opie-handwriting/opie-handwriting_1.2.2.bb
+++ b/packages/opie-handwriting/opie-handwriting_1.2.2.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/inputmethods/handwriting \
 	${HANDHELDS_CVS};tag=${TAG};module=opie/etc/qimpen"
diff --git a/packages/opie-handwriting/opie-handwriting_cvs.bb b/packages/opie-handwriting/opie-handwriting_cvs.bb
index aaeaf94489..a607b32c69 100644
--- a/packages/opie-handwriting/opie-handwriting_cvs.bb
+++ b/packages/opie-handwriting/opie-handwriting_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/inputmethods/handwriting \
diff --git a/packages/opie-help-en/opie-help-en_cvs.bb b/packages/opie-help-en/opie-help-en_cvs.bb
index 445963634c..787b40833f 100644
--- a/packages/opie-help-en/opie-help-en_cvs.bb
+++ b/packages/opie-help-en/opie-help-en_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 # Remove the dash below when 1.2.1 changes in PV
 PV = "1.2.2+cvs-${SRCDATE}"
 
diff --git a/packages/opie-helpbrowser/opie-helpbrowser_1.2.2.bb b/packages/opie-helpbrowser/opie-helpbrowser_1.2.2.bb
index bc31fcdf72..b69c2837d7 100644
--- a/packages/opie-helpbrowser/opie-helpbrowser_1.2.2.bb
+++ b/packages/opie-helpbrowser/opie-helpbrowser_1.2.2.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/${APPNAME} \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-helpbrowser/opie-helpbrowser_cvs.bb b/packages/opie-helpbrowser/opie-helpbrowser_cvs.bb
index a9089f0ffc..8e0e398a30 100644
--- a/packages/opie-helpbrowser/opie-helpbrowser_cvs.bb
+++ b/packages/opie-helpbrowser/opie-helpbrowser_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/${APPNAME} \
diff --git a/packages/opie-homeapplet/opie-homeapplet_1.2.2.bb b/packages/opie-homeapplet/opie-homeapplet_1.2.2.bb
index 91c462268b..3870da10b2 100644
--- a/packages/opie-homeapplet/opie-homeapplet_1.2.2.bb
+++ b/packages/opie-homeapplet/opie-homeapplet_1.2.2.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/homeapplet \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-homeapplet/opie-homeapplet_cvs.bb b/packages/opie-homeapplet/opie-homeapplet_cvs.bb
index 22447dd621..b0c092c719 100644
--- a/packages/opie-homeapplet/opie-homeapplet_cvs.bb
+++ b/packages/opie-homeapplet/opie-homeapplet_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/homeapplet \
diff --git a/packages/opie-icon-reload/opie-icon-reload_0.0.1.bb b/packages/opie-icon-reload/opie-icon-reload_0.0.1.bb
index a398b21c44..9d87f74817 100644
--- a/packages/opie-icon-reload/opie-icon-reload_0.0.1.bb
+++ b/packages/opie-icon-reload/opie-icon-reload_0.0.1.bb
@@ -11,13 +11,13 @@ SRC_URI = "file://icon-reload.desktop \
 
 FILES_${PN} += "/opt"
 
-do_install() {		
+do_install() {
 	install -d ${D}${palmtopdir}/apps/Settings
 	install -d ${D}${palmtopdir}/bin
 	install -d ${D}${palmtopdir}/pics
-	
+
 	install -m 0644 ${WORKDIR}/icon-reload.desktop ${D}${palmtopdir}/apps/Settings
 	install -m 0755 ${WORKDIR}/icon-reload.sh ${D}${palmtopdir}/bin
-	install -m 0644 ${WORKDIR}/reload.png ${D}${palmtopdir}/pics	
+	install -m 0644 ${WORKDIR}/reload.png ${D}${palmtopdir}/pics
 }
 
diff --git a/packages/opie-icon-reload/opie-icon-reload_1.2.2.bb b/packages/opie-icon-reload/opie-icon-reload_1.2.2.bb
index 52118fe625..07196d1827 100644
--- a/packages/opie-icon-reload/opie-icon-reload_1.2.2.bb
+++ b/packages/opie-icon-reload/opie-icon-reload_1.2.2.bb
@@ -1,4 +1,4 @@
 require ${PN}.inc
-    
- 
+
+
 
diff --git a/packages/opie-icon-reload/opie-icon-reload_cvs.bb b/packages/opie-icon-reload/opie-icon-reload_cvs.bb
index b61a4df306..7c49fdd77b 100644
--- a/packages/opie-icon-reload/opie-icon-reload_cvs.bb
+++ b/packages/opie-icon-reload/opie-icon-reload_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
 
-#Remove the dash below when 1.2.1 changes    
+#Remove the dash below when 1.2.1 changes
 PV = "1.2.2+cvs-${SRCDATE}"
 
diff --git a/packages/opie-irc/opie-irc_1.2.2.bb b/packages/opie-irc/opie-irc_1.2.2.bb
index 374c388ecf..f8e1e7818b 100644
--- a/packages/opie-irc/opie-irc_1.2.2.bb
+++ b/packages/opie-irc/opie-irc_1.2.2.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/opieirc \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/help \
diff --git a/packages/opie-irc/opie-irc_cvs.bb b/packages/opie-irc/opie-irc_cvs.bb
index 4a8aa181f4..f1ad3901c2 100644
--- a/packages/opie-irc/opie-irc_cvs.bb
+++ b/packages/opie-irc/opie-irc_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/opieirc \
diff --git a/packages/opie-jumpx/opie-jumpx_1.2.2.bb b/packages/opie-jumpx/opie-jumpx_1.2.2.bb
index 0e8284c672..cd335aea01 100644
--- a/packages/opie-jumpx/opie-jumpx_1.2.2.bb
+++ b/packages/opie-jumpx/opie-jumpx_1.2.2.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/inputmethods/jumpx \
 	   ${HANDHELDS_CVS};tag=${TAG};module=opie/pics"
diff --git a/packages/opie-jumpx/opie-jumpx_cvs.bb b/packages/opie-jumpx/opie-jumpx_cvs.bb
index 61ef6a73e2..6da41fef17 100644
--- a/packages/opie-jumpx/opie-jumpx_cvs.bb
+++ b/packages/opie-jumpx/opie-jumpx_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/inputmethods/jumpx \
diff --git a/packages/opie-kbill/opie-kbill_1.2.2.bb b/packages/opie-kbill/opie-kbill_1.2.2.bb
index 38c9276ce1..e5c6161aea 100644
--- a/packages/opie-kbill/opie-kbill_1.2.2.bb
+++ b/packages/opie-kbill/opie-kbill_1.2.2.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/kbill \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-kbill/opie-kbill_cvs.bb b/packages/opie-kbill/opie-kbill_cvs.bb
index d0856b9648..208220cc00 100644
--- a/packages/opie-kbill/opie-kbill_cvs.bb
+++ b/packages/opie-kbill/opie-kbill_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/kbill \
diff --git a/packages/opie-kcheckers/opie-kcheckers_1.2.2.bb b/packages/opie-kcheckers/opie-kcheckers_1.2.2.bb
index f1b74f25a1..33f01a4b03 100644
--- a/packages/opie-kcheckers/opie-kcheckers_1.2.2.bb
+++ b/packages/opie-kcheckers/opie-kcheckers_1.2.2.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/kcheckers \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-kcheckers/opie-kcheckers_cvs.bb b/packages/opie-kcheckers/opie-kcheckers_cvs.bb
index e5329f28cc..a1c47e7c54 100644
--- a/packages/opie-kcheckers/opie-kcheckers_cvs.bb
+++ b/packages/opie-kcheckers/opie-kcheckers_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/kcheckers \
diff --git a/packages/opie-keyboard/opie-keyboard_1.2.2.bb b/packages/opie-keyboard/opie-keyboard_1.2.2.bb
index c2b29cd64a..5fe068c320 100644
--- a/packages/opie-keyboard/opie-keyboard_1.2.2.bb
+++ b/packages/opie-keyboard/opie-keyboard_1.2.2.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/inputmethods/keyboard "
diff --git a/packages/opie-keyboard/opie-keyboard_cvs.bb b/packages/opie-keyboard/opie-keyboard_cvs.bb
index b3ed6e71eb..0e6f66710e 100644
--- a/packages/opie-keyboard/opie-keyboard_cvs.bb
+++ b/packages/opie-keyboard/opie-keyboard_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/inputmethods/keyboard "
diff --git a/packages/opie-keypebble/opie-keypebble_1.2.2.bb b/packages/opie-keypebble/opie-keypebble_1.2.2.bb
index 5a8e3c5508..782bc5f797 100644
--- a/packages/opie-keypebble/opie-keypebble_1.2.2.bb
+++ b/packages/opie-keypebble/opie-keypebble_1.2.2.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/comm/${APPNAME} \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics                    \
diff --git a/packages/opie-keypebble/opie-keypebble_cvs.bb b/packages/opie-keypebble/opie-keypebble_cvs.bb
index 92faa6c52c..56d0408c60 100644
--- a/packages/opie-keypebble/opie-keypebble_cvs.bb
+++ b/packages/opie-keypebble/opie-keypebble_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/comm/${APPNAME} \
diff --git a/packages/opie-keytabs/opie-keytabs_1.2.2.bb b/packages/opie-keytabs/opie-keytabs_1.2.2.bb
index b07033a4ce..2244f0153a 100644
--- a/packages/opie-keytabs/opie-keytabs_1.2.2.bb
+++ b/packages/opie-keytabs/opie-keytabs_1.2.2.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/etc"
diff --git a/packages/opie-keyview/opie-keyview_1.2.2.bb b/packages/opie-keyview/opie-keyview_1.2.2.bb
index 0f8c1c7cd4..172ad700a0 100644
--- a/packages/opie-keyview/opie-keyview_1.2.2.bb
+++ b/packages/opie-keyview/opie-keyview_1.2.2.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/development/keyview "
diff --git a/packages/opie-keyview/opie-keyview_cvs.bb b/packages/opie-keyview/opie-keyview_cvs.bb
index f59904d193..f8bfff4b4b 100644
--- a/packages/opie-keyview/opie-keyview_cvs.bb
+++ b/packages/opie-keyview/opie-keyview_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/development/keyview "
diff --git a/packages/opie-kjumpx/opie-kjumpx_1.2.2.bb b/packages/opie-kjumpx/opie-kjumpx_1.2.2.bb
index ddba3e4cfe..b558970ce5 100644
--- a/packages/opie-kjumpx/opie-kjumpx_1.2.2.bb
+++ b/packages/opie-kjumpx/opie-kjumpx_1.2.2.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/inputmethods/kjumpx \
 	   ${HANDHELDS_CVS};tag=${TAG};module=opie/pics"
diff --git a/packages/opie-kjumpx/opie-kjumpx_cvs.bb b/packages/opie-kjumpx/opie-kjumpx_cvs.bb
index 2e8bb23ab7..70520aed36 100644
--- a/packages/opie-kjumpx/opie-kjumpx_cvs.bb
+++ b/packages/opie-kjumpx/opie-kjumpx_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/inputmethods/kjumpx \
diff --git a/packages/opie-kpacman/opie-kpacman_1.2.2.bb b/packages/opie-kpacman/opie-kpacman_1.2.2.bb
index 7ae8b103c7..6508932193 100644
--- a/packages/opie-kpacman/opie-kpacman_1.2.2.bb
+++ b/packages/opie-kpacman/opie-kpacman_1.2.2.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/kpacman \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-kpacman/opie-kpacman_cvs.bb b/packages/opie-kpacman/opie-kpacman_cvs.bb
index d86df42d17..8461547fa6 100644
--- a/packages/opie-kpacman/opie-kpacman_cvs.bb
+++ b/packages/opie-kpacman/opie-kpacman_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/kpacman \
diff --git a/packages/opie-language/opie-language_1.2.2.bb b/packages/opie-language/opie-language_1.2.2.bb
index 77a4908293..dc46d457f0 100644
--- a/packages/opie-language/opie-language_1.2.2.bb
+++ b/packages/opie-language/opie-language_1.2.2.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/language \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-language/opie-language_cvs.bb b/packages/opie-language/opie-language_cvs.bb
index 8af7b7ea3f..f2b6619fdc 100644
--- a/packages/opie-language/opie-language_cvs.bb
+++ b/packages/opie-language/opie-language_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/settings/language \
diff --git a/packages/opie-libqrsync/opie-libqrsync_1.2.2.bb b/packages/opie-libqrsync/opie-libqrsync_1.2.2.bb
index 1a13c13720..291818ffc1 100644
--- a/packages/opie-libqrsync/opie-libqrsync_1.2.2.bb
+++ b/packages/opie-libqrsync/opie-libqrsync_1.2.2.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/rsync"
diff --git a/packages/opie-libqrsync/opie-libqrsync_cvs.bb b/packages/opie-libqrsync/opie-libqrsync_cvs.bb
index d529b6e7c5..6befafb953 100644
--- a/packages/opie-libqrsync/opie-libqrsync_cvs.bb
+++ b/packages/opie-libqrsync/opie-libqrsync_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/rsync"
diff --git a/packages/opie-light-and-power/opie-light-and-power_1.2.2.bb b/packages/opie-light-and-power/opie-light-and-power_1.2.2.bb
index 1f0f54d7eb..d7041aa4a9 100644
--- a/packages/opie-light-and-power/opie-light-and-power_1.2.2.bb
+++ b/packages/opie-light-and-power/opie-light-and-power_1.2.2.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/settings/light-and-power \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-light-and-power/opie-light-and-power_cvs.bb b/packages/opie-light-and-power/opie-light-and-power_cvs.bb
index 92c78e5c2e..bc94b4806e 100644
--- a/packages/opie-light-and-power/opie-light-and-power_cvs.bb
+++ b/packages/opie-light-and-power/opie-light-and-power_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/settings/light-and-power \
diff --git a/packages/opie-login/opie-login_1.2.2.bb b/packages/opie-login/opie-login_1.2.2.bb
index 29be64cc81..c9c6c5f5e0 100644
--- a/packages/opie-login/opie-login_1.2.2.bb
+++ b/packages/opie-login/opie-login_1.2.2.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/${APPNAME} \
 	   ${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/calibrate \
diff --git a/packages/opie-login/opie-login_cvs.bb b/packages/opie-login/opie-login_cvs.bb
index d5c65b70ac..f009d24b4f 100644
--- a/packages/opie-login/opie-login_cvs.bb
+++ b/packages/opie-login/opie-login_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/${APPNAME} \
diff --git a/packages/opie-logoutapplet/opie-logoutapplet_1.2.2.bb b/packages/opie-logoutapplet/opie-logoutapplet_1.2.2.bb
index b2fe4f905b..e8bf673c99 100644
--- a/packages/opie-logoutapplet/opie-logoutapplet_1.2.2.bb
+++ b/packages/opie-logoutapplet/opie-logoutapplet_1.2.2.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/logoutapplet \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-logoutapplet/opie-logoutapplet_cvs.bb b/packages/opie-logoutapplet/opie-logoutapplet_cvs.bb
index 8a51c37040..9b30c7dfe5 100644
--- a/packages/opie-logoutapplet/opie-logoutapplet_cvs.bb
+++ b/packages/opie-logoutapplet/opie-logoutapplet_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/logoutapplet \
diff --git a/packages/opie-mail/opie-mail_1.2.2.bb b/packages/opie-mail/opie-mail_1.2.2.bb
index 058e949a56..e7da9190f4 100644
--- a/packages/opie-mail/opie-mail_1.2.2.bb
+++ b/packages/opie-mail/opie-mail_1.2.2.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/mail \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \
diff --git a/packages/opie-mail/opie-mail_cvs.bb b/packages/opie-mail/opie-mail_cvs.bb
index 3da24143c3..5c8a18acc3 100644
--- a/packages/opie-mail/opie-mail_cvs.bb
+++ b/packages/opie-mail/opie-mail_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/mail \
diff --git a/packages/opie-mailapplet/opie-mailapplet_1.2.2.bb b/packages/opie-mailapplet/opie-mailapplet_1.2.2.bb
index ac7c6d311b..06f572a7fe 100644
--- a/packages/opie-mailapplet/opie-mailapplet_1.2.2.bb
+++ b/packages/opie-mailapplet/opie-mailapplet_1.2.2.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/mail/taskbarapplet \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-mailapplet/opie-mailapplet_cvs.bb b/packages/opie-mailapplet/opie-mailapplet_cvs.bb
index ad7bcfc5c1..75785868ef 100644
--- a/packages/opie-mailapplet/opie-mailapplet_cvs.bb
+++ b/packages/opie-mailapplet/opie-mailapplet_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/mail/taskbarapplet \
diff --git a/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_1.2.2.bb b/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_1.2.2.bb
index be7dd3f433..8c8ea5f9fb 100644
--- a/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_1.2.2.bb
+++ b/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_1.2.2.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/multimedia/opieplayer \
 	   file://libmadplugin.pro"
diff --git a/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_cvs.bb b/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_cvs.bb
index 97ca074890..c30822ab46 100644
--- a/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_cvs.bb
+++ b/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/multimedia/opieplayer \
diff --git a/packages/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_1.2.2.bb b/packages/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_1.2.2.bb
index d145c140d7..d5702318c9 100644
--- a/packages/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_1.2.2.bb
+++ b/packages/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_1.2.2.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/multimedia/opieplayer "
diff --git a/packages/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_cvs.bb b/packages/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_cvs.bb
index cfccd3db0e..4cf1ac926d 100644
--- a/packages/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_cvs.bb
+++ b/packages/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/multimedia/opieplayer "
diff --git a/packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_1.2.2.bb b/packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_1.2.2.bb
index c929d7c0a5..e49bc44f41 100644
--- a/packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_1.2.2.bb
+++ b/packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_1.2.2.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/multimedia/opieplayer \
 	   file://vorbis.pro "
diff --git a/packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_cvs.bb b/packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_cvs.bb
index 46f8851741..f1a3d8a92e 100644
--- a/packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_cvs.bb
+++ b/packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/multimedia/opieplayer \
diff --git a/packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_1.2.2.bb b/packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_1.2.2.bb
index d145c140d7..d5702318c9 100644
--- a/packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_1.2.2.bb
+++ b/packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_1.2.2.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/multimedia/opieplayer "
diff --git a/packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_cvs.bb b/packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_cvs.bb
index cfccd3db0e..4cf1ac926d 100644
--- a/packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_cvs.bb
+++ b/packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/multimedia/opieplayer "
diff --git a/packages/opie-mediummount/opie-mediummount_cvs.bb b/packages/opie-mediummount/opie-mediummount_cvs.bb
index a78f5679b4..27f2b4d618 100644
--- a/packages/opie-mediummount/opie-mediummount_cvs.bb
+++ b/packages/opie-mediummount/opie-mediummount_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/settings/mediummount \
diff --git a/packages/opie-mindbreaker/opie-mindbreaker_1.2.2.bb b/packages/opie-mindbreaker/opie-mindbreaker_1.2.2.bb
index 82c879a392..9246b06e01 100644
--- a/packages/opie-mindbreaker/opie-mindbreaker_1.2.2.bb
+++ b/packages/opie-mindbreaker/opie-mindbreaker_1.2.2.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/mindbreaker \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-mindbreaker/opie-mindbreaker_cvs.bb b/packages/opie-mindbreaker/opie-mindbreaker_cvs.bb
index 25cc6d4523..e72a5ab7b6 100644
--- a/packages/opie-mindbreaker/opie-mindbreaker_cvs.bb
+++ b/packages/opie-mindbreaker/opie-mindbreaker_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/mindbreaker \
diff --git a/packages/opie-minesweep/opie-minesweep_1.2.2.bb b/packages/opie-minesweep/opie-minesweep_1.2.2.bb
index f67fb457f1..c150529904 100644
--- a/packages/opie-minesweep/opie-minesweep_1.2.2.bb
+++ b/packages/opie-minesweep/opie-minesweep_1.2.2.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/minesweep \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-minesweep/opie-minesweep_cvs.bb b/packages/opie-minesweep/opie-minesweep_cvs.bb
index 6292c661e8..6201cee393 100644
--- a/packages/opie-minesweep/opie-minesweep_cvs.bb
+++ b/packages/opie-minesweep/opie-minesweep_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/minesweep \
diff --git a/packages/opie-multikey/opie-multikey_1.2.2.bb b/packages/opie-multikey/opie-multikey_1.2.2.bb
index 41f2c79cf7..7cd1ac6914 100644
--- a/packages/opie-multikey/opie-multikey_1.2.2.bb
+++ b/packages/opie-multikey/opie-multikey_1.2.2.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/inputmethods/multikey \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/share"
diff --git a/packages/opie-multikey/opie-multikey_cvs.bb b/packages/opie-multikey/opie-multikey_cvs.bb
index 38eccd4a33..93d37edfac 100644
--- a/packages/opie-multikey/opie-multikey_cvs.bb
+++ b/packages/opie-multikey/opie-multikey_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/inputmethods/multikey \
diff --git a/packages/opie-networkapplet/opie-networkapplet_1.2.2.bb b/packages/opie-networkapplet/opie-networkapplet_1.2.2.bb
index 786efe8d21..e05bf122c9 100644
--- a/packages/opie-networkapplet/opie-networkapplet_1.2.2.bb
+++ b/packages/opie-networkapplet/opie-networkapplet_1.2.2.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/applets/networkapplet \
 	   ${HANDHELDS_CVS};tag=${TAG};module=opie/pics"
diff --git a/packages/opie-networkapplet/opie-networkapplet_cvs.bb b/packages/opie-networkapplet/opie-networkapplet_cvs.bb
index 72975f88f2..d81ff2c915 100644
--- a/packages/opie-networkapplet/opie-networkapplet_cvs.bb
+++ b/packages/opie-networkapplet/opie-networkapplet_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/applets/networkapplet \
diff --git a/packages/opie-networksettings/opie-networksettings_1.2.2.bb b/packages/opie-networksettings/opie-networksettings_1.2.2.bb
index c1d5ecfcf9..bc25163d03 100644
--- a/packages/opie-networksettings/opie-networksettings_1.2.2.bb
+++ b/packages/opie-networksettings/opie-networksettings_1.2.2.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/networksettings \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-networksettings/opie-networksettings_cvs.bb b/packages/opie-networksettings/opie-networksettings_cvs.bb
index accde9871b..47eecac791 100644
--- a/packages/opie-networksettings/opie-networksettings_cvs.bb
+++ b/packages/opie-networksettings/opie-networksettings_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/settings/networksettings \
diff --git a/packages/opie-notesapplet/opie-notesapplet_1.2.2.bb b/packages/opie-notesapplet/opie-notesapplet_1.2.2.bb
index 49b176d432..a9a2a57203 100644
--- a/packages/opie-notesapplet/opie-notesapplet_1.2.2.bb
+++ b/packages/opie-notesapplet/opie-notesapplet_1.2.2.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/applets/notesapplet"
diff --git a/packages/opie-notesapplet/opie-notesapplet_cvs.bb b/packages/opie-notesapplet/opie-notesapplet_cvs.bb
index 0a11f79919..5a81637d56 100644
--- a/packages/opie-notesapplet/opie-notesapplet_cvs.bb
+++ b/packages/opie-notesapplet/opie-notesapplet_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/applets/notesapplet"
diff --git a/packages/opie-odict/opie-odict_1.2.2.bb b/packages/opie-odict/opie-odict_1.2.2.bb
index d7f85ef55c..0e31a758d8 100644
--- a/packages/opie-odict/opie-odict_1.2.2.bb
+++ b/packages/opie-odict/opie-odict_1.2.2.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/odict \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-odict/opie-odict_cvs.bb b/packages/opie-odict/opie-odict_cvs.bb
index 907ef18c9e..922c8313f1 100644
--- a/packages/opie-odict/opie-odict_cvs.bb
+++ b/packages/opie-odict/opie-odict_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/odict \
diff --git a/packages/opie-oxygen/opie-oxygen_1.2.2.bb b/packages/opie-oxygen/opie-oxygen_1.2.2.bb
index d94985dc6f..329b1ae9a6 100644
--- a/packages/opie-oxygen/opie-oxygen_1.2.2.bb
+++ b/packages/opie-oxygen/opie-oxygen_1.2.2.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/${APPNAME} \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-oxygen/opie-oxygen_cvs.bb b/packages/opie-oxygen/opie-oxygen_cvs.bb
index 99dae6e239..3b40f47c42 100644
--- a/packages/opie-oxygen/opie-oxygen_cvs.bb
+++ b/packages/opie-oxygen/opie-oxygen_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/${APPNAME} \
diff --git a/packages/opie-oyatzee/opie-oyatzee_1.2.2.bb b/packages/opie-oyatzee/opie-oyatzee_1.2.2.bb
index bc6264d383..48ee0a135c 100644
--- a/packages/opie-oyatzee/opie-oyatzee_1.2.2.bb
+++ b/packages/opie-oyatzee/opie-oyatzee_1.2.2.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/oyatzee \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-oyatzee/opie-oyatzee_cvs.bb b/packages/opie-oyatzee/opie-oyatzee_cvs.bb
index 51269ca473..c0a0c19789 100644
--- a/packages/opie-oyatzee/opie-oyatzee_cvs.bb
+++ b/packages/opie-oyatzee/opie-oyatzee_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/oyatzee \
diff --git a/packages/opie-packagemanager/opie-packagemanager_cvs.bb b/packages/opie-packagemanager/opie-packagemanager_cvs.bb
index 8f162caa09..5be7333846 100644
--- a/packages/opie-packagemanager/opie-packagemanager_cvs.bb
+++ b/packages/opie-packagemanager/opie-packagemanager_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/settings/${APPNAME};cvsdate=${SRCDATE} \
diff --git a/packages/opie-parashoot/opie-parashoot_1.2.2.bb b/packages/opie-parashoot/opie-parashoot_1.2.2.bb
index 655282ca67..f7099c895c 100644
--- a/packages/opie-parashoot/opie-parashoot_1.2.2.bb
+++ b/packages/opie-parashoot/opie-parashoot_1.2.2.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/parashoot \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-parashoot/opie-parashoot_cvs.bb b/packages/opie-parashoot/opie-parashoot_cvs.bb
index 85fc6cff9a..2a29dfa2d6 100644
--- a/packages/opie-parashoot/opie-parashoot_cvs.bb
+++ b/packages/opie-parashoot/opie-parashoot_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/parashoot \
diff --git a/packages/opie-pcmciaapplet/opie-pcmciaapplet_1.2.2.bb b/packages/opie-pcmciaapplet/opie-pcmciaapplet_1.2.2.bb
index bf73361ebf..c058534f61 100644
--- a/packages/opie-pcmciaapplet/opie-pcmciaapplet_1.2.2.bb
+++ b/packages/opie-pcmciaapplet/opie-pcmciaapplet_1.2.2.bb
@@ -1,4 +1,4 @@
-require ${PN}.inc    
+require ${PN}.inc
 
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/applets/pcmcia \
diff --git a/packages/opie-pickboard/opie-pickboard_1.2.2.bb b/packages/opie-pickboard/opie-pickboard_1.2.2.bb
index 227e179f0a..c220323d81 100644
--- a/packages/opie-pickboard/opie-pickboard_1.2.2.bb
+++ b/packages/opie-pickboard/opie-pickboard_1.2.2.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/inputmethods/pickboard"
diff --git a/packages/opie-pickboard/opie-pickboard_cvs.bb b/packages/opie-pickboard/opie-pickboard_cvs.bb
index ec86d1c169..4f778f135d 100644
--- a/packages/opie-pickboard/opie-pickboard_cvs.bb
+++ b/packages/opie-pickboard/opie-pickboard_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/inputmethods/pickboard"
diff --git a/packages/opie-pics/opie-pics_1.2.2.bb b/packages/opie-pics/opie-pics_1.2.2.bb
index 7638dc9ce2..5ca408ea5e 100644
--- a/packages/opie-pics/opie-pics_1.2.2.bb
+++ b/packages/opie-pics/opie-pics_1.2.2.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-powerchord/opie-powerchord_1.2.2.bb b/packages/opie-powerchord/opie-powerchord_1.2.2.bb
index 756d2cf170..4e458943e0 100644
--- a/packages/opie-powerchord/opie-powerchord_1.2.2.bb
+++ b/packages/opie-powerchord/opie-powerchord_1.2.2.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/multimedia/powerchord \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-powerchord/opie-powerchord_cvs.bb b/packages/opie-powerchord/opie-powerchord_cvs.bb
index 2825308e51..1ee8132651 100644
--- a/packages/opie-powerchord/opie-powerchord_cvs.bb
+++ b/packages/opie-powerchord/opie-powerchord_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/multimedia/powerchord \
diff --git a/packages/opie-qasteroids/opie-qasteroids_1.2.2.bb b/packages/opie-qasteroids/opie-qasteroids_1.2.2.bb
index 91c09fa8e9..6ab6bae411 100644
--- a/packages/opie-qasteroids/opie-qasteroids_1.2.2.bb
+++ b/packages/opie-qasteroids/opie-qasteroids_1.2.2.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/qasteroids \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-qasteroids/opie-qasteroids_cvs.bb b/packages/opie-qasteroids/opie-qasteroids_cvs.bb
index f4a52e68c6..3449dd850c 100644
--- a/packages/opie-qasteroids/opie-qasteroids_cvs.bb
+++ b/packages/opie-qasteroids/opie-qasteroids_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/qasteroids \
diff --git a/packages/opie-qcop/opie-qcop_1.2.2.bb b/packages/opie-qcop/opie-qcop_1.2.2.bb
index 945811abd1..f2ba1e4701 100644
--- a/packages/opie-qcop/opie-qcop_1.2.2.bb
+++ b/packages/opie-qcop/opie-qcop_1.2.2.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/qcop"
diff --git a/packages/opie-qcop/opie-qcop_cvs.bb b/packages/opie-qcop/opie-qcop_cvs.bb
index 9f97581b8c..13f2a817d0 100644
--- a/packages/opie-qcop/opie-qcop_cvs.bb
+++ b/packages/opie-qcop/opie-qcop_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/qcop"
diff --git a/packages/opie-qss/opie-qss_1.2.2.bb b/packages/opie-qss/opie-qss_1.2.2.bb
index 3db0f278be..ccf7704683 100644
--- a/packages/opie-qss/opie-qss_1.2.2.bb
+++ b/packages/opie-qss/opie-qss_1.2.2.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/qss"
diff --git a/packages/opie-qss/opie-qss_cvs.bb b/packages/opie-qss/opie-qss_cvs.bb
index 19b7b8da7c..765849976e 100644
--- a/packages/opie-qss/opie-qss_cvs.bb
+++ b/packages/opie-qss/opie-qss_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/qss"
diff --git a/packages/opie-quicklauncher/opie-quicklauncher_1.2.2.bb b/packages/opie-quicklauncher/opie-quicklauncher_1.2.2.bb
index 9d54ec91ed..f7826ee71f 100644
--- a/packages/opie-quicklauncher/opie-quicklauncher_1.2.2.bb
+++ b/packages/opie-quicklauncher/opie-quicklauncher_1.2.2.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/tools/quicklauncher"
diff --git a/packages/opie-quicklauncher/opie-quicklauncher_cvs.bb b/packages/opie-quicklauncher/opie-quicklauncher_cvs.bb
index e3a7155a6a..992279d24a 100644
--- a/packages/opie-quicklauncher/opie-quicklauncher_cvs.bb
+++ b/packages/opie-quicklauncher/opie-quicklauncher_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/tools/quicklauncher"
diff --git a/packages/opie-rdesktop/opie-rdesktop_1.2.2.bb b/packages/opie-rdesktop/opie-rdesktop_1.2.2.bb
index 75c6686ce2..29d159b541 100644
--- a/packages/opie-rdesktop/opie-rdesktop_1.2.2.bb
+++ b/packages/opie-rdesktop/opie-rdesktop_1.2.2.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/opierdesktop \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \
diff --git a/packages/opie-rdesktop/opie-rdesktop_cvs.bb b/packages/opie-rdesktop/opie-rdesktop_cvs.bb
index d2a73bcfbf..d615dfedd7 100644
--- a/packages/opie-rdesktop/opie-rdesktop_cvs.bb
+++ b/packages/opie-rdesktop/opie-rdesktop_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/opierdesktop \
diff --git a/packages/opie-recorder/opie-recorder_1.2.2.bb b/packages/opie-recorder/opie-recorder_1.2.2.bb
index a71079f7c9..2c0a378001 100644
--- a/packages/opie-recorder/opie-recorder_1.2.2.bb
+++ b/packages/opie-recorder/opie-recorder_1.2.2.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/multimedia/opierec \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-recorder/opie-recorder_cvs.bb b/packages/opie-recorder/opie-recorder_cvs.bb
index 7e09748f10..7e5697574d 100644
--- a/packages/opie-recorder/opie-recorder_cvs.bb
+++ b/packages/opie-recorder/opie-recorder_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/multimedia/opierec \
diff --git a/packages/opie-remote/opie-remote_1.2.2.bb b/packages/opie-remote/opie-remote_1.2.2.bb
index f988f29125..52284d9c59 100644
--- a/packages/opie-remote/opie-remote_1.2.2.bb
+++ b/packages/opie-remote/opie-remote_1.2.2.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/tools/remote \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-remote/opie-remote_cvs.bb b/packages/opie-remote/opie-remote_cvs.bb
index cf9afb6bf0..7c4ec466b2 100644
--- a/packages/opie-remote/opie-remote_cvs.bb
+++ b/packages/opie-remote/opie-remote_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/tools/remote \
diff --git a/packages/opie-restartapplet/opie-restartapplet_1.2.2.bb b/packages/opie-restartapplet/opie-restartapplet_1.2.2.bb
index 97520564a1..341f6d3637 100644
--- a/packages/opie-restartapplet/opie-restartapplet_1.2.2.bb
+++ b/packages/opie-restartapplet/opie-restartapplet_1.2.2.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/restartapplet \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-restartapplet/opie-restartapplet_cvs.bb b/packages/opie-restartapplet/opie-restartapplet_cvs.bb
index f8d5b7d564..65ca2e23bd 100644
--- a/packages/opie-restartapplet/opie-restartapplet_cvs.bb
+++ b/packages/opie-restartapplet/opie-restartapplet_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/restartapplet \
diff --git a/packages/opie-restartapplet2/opie-restartapplet2_1.2.2.bb b/packages/opie-restartapplet2/opie-restartapplet2_1.2.2.bb
index 450eab5b24..797eb0eaf4 100644
--- a/packages/opie-restartapplet2/opie-restartapplet2_1.2.2.bb
+++ b/packages/opie-restartapplet2/opie-restartapplet2_1.2.2.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/restartapplet2 \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-restartapplet2/opie-restartapplet2_cvs.bb b/packages/opie-restartapplet2/opie-restartapplet2_cvs.bb
index 107d2fc348..f0c970c5ab 100644
--- a/packages/opie-restartapplet2/opie-restartapplet2_cvs.bb
+++ b/packages/opie-restartapplet2/opie-restartapplet2_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/restartapplet2 \
diff --git a/packages/opie-rotateapplet/opie-rotateapplet_1.2.2.bb b/packages/opie-rotateapplet/opie-rotateapplet_1.2.2.bb
index c8c986d687..0e1239b33b 100644
--- a/packages/opie-rotateapplet/opie-rotateapplet_1.2.2.bb
+++ b/packages/opie-rotateapplet/opie-rotateapplet_1.2.2.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/rotateapplet \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-rotateapplet/opie-rotateapplet_cvs.bb b/packages/opie-rotateapplet/opie-rotateapplet_cvs.bb
index 5b7377f4ec..98b1175f9d 100644
--- a/packages/opie-rotateapplet/opie-rotateapplet_cvs.bb
+++ b/packages/opie-rotateapplet/opie-rotateapplet_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/rotateapplet \
diff --git a/packages/opie-search/opie-search_1.2.2.bb b/packages/opie-search/opie-search_1.2.2.bb
index 202e925aaa..d8d6a1b659 100644
--- a/packages/opie-search/opie-search_1.2.2.bb
+++ b/packages/opie-search/opie-search_1.2.2.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/pim/osearch \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-search/opie-search_cvs.bb b/packages/opie-search/opie-search_cvs.bb
index 5141028b54..1bfe154839 100644
--- a/packages/opie-search/opie-search_cvs.bb
+++ b/packages/opie-search/opie-search_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/pim/osearch \
diff --git a/packages/opie-sfcave/opie-sfcave_1.2.2.bb b/packages/opie-sfcave/opie-sfcave_1.2.2.bb
index db57345b94..72f7ba3bd4 100644
--- a/packages/opie-sfcave/opie-sfcave_1.2.2.bb
+++ b/packages/opie-sfcave/opie-sfcave_1.2.2.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/sfcave \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-sfcave/opie-sfcave_cvs.bb b/packages/opie-sfcave/opie-sfcave_cvs.bb
index a5f3a6b2da..0698cda1da 100644
--- a/packages/opie-sfcave/opie-sfcave_cvs.bb
+++ b/packages/opie-sfcave/opie-sfcave_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/sfcave \
diff --git a/packages/opie-sh-snes/opie-sh-snes_0.2.bb b/packages/opie-sh-snes/opie-sh-snes_0.2.bb
index 289a1cd01e..4701e1aeeb 100644
--- a/packages/opie-sh-snes/opie-sh-snes_0.2.bb
+++ b/packages/opie-sh-snes/opie-sh-snes_0.2.bb
@@ -13,7 +13,7 @@ FILES_${PN} = "/opt/QtPalmtop"
 SRC_URI = "file://snes.desktop \
            file://snes.png \
 	   file://opie-sh-snes.sh"
-	   
+
 
 do_install() {
 
@@ -21,8 +21,8 @@ do_install() {
 	do
 		install -d ${D}${palmtopdir}/$dir
 	done
-	
+
 	install -m 755 ${WORKDIR}/opie-sh-snes.sh ${D}${palmtopdir}/bin
 	install -m 644 ${WORKDIR}/*.png ${D}${palmtopdir}/pics
 	install -m 644 ${WORKDIR}/*.desktop ${D}${palmtopdir}/apps/Games
-}	   
+}
diff --git a/packages/opie-sh-snes/opie-sh-snes_1.2.2.bb b/packages/opie-sh-snes/opie-sh-snes_1.2.2.bb
index 52118fe625..07196d1827 100644
--- a/packages/opie-sh-snes/opie-sh-snes_1.2.2.bb
+++ b/packages/opie-sh-snes/opie-sh-snes_1.2.2.bb
@@ -1,4 +1,4 @@
 require ${PN}.inc
-    
- 
+
+
 
diff --git a/packages/opie-sh-snes/opie-sh-snes_cvs.bb b/packages/opie-sh-snes/opie-sh-snes_cvs.bb
index b61a4df306..7c49fdd77b 100644
--- a/packages/opie-sh-snes/opie-sh-snes_cvs.bb
+++ b/packages/opie-sh-snes/opie-sh-snes_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
 
-#Remove the dash below when 1.2.1 changes    
+#Remove the dash below when 1.2.1 changes
 PV = "1.2.2+cvs-${SRCDATE}"
 
diff --git a/packages/opie-sheet/opie-sheet_1.2.2.bb b/packages/opie-sheet/opie-sheet_1.2.2.bb
index bc90e3709d..f71dbb9415 100644
--- a/packages/opie-sheet/opie-sheet_1.2.2.bb
+++ b/packages/opie-sheet/opie-sheet_1.2.2.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/opie-sheet \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-sheet/opie-sheet_cvs.bb b/packages/opie-sheet/opie-sheet_cvs.bb
index c695558c3f..ec5200c17a 100644
--- a/packages/opie-sheet/opie-sheet_cvs.bb
+++ b/packages/opie-sheet/opie-sheet_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/opie-sheet \
diff --git a/packages/opie-snake/opie-snake_1.2.2.bb b/packages/opie-snake/opie-snake_1.2.2.bb
index 8d422568f5..26fd77fa53 100644
--- a/packages/opie-snake/opie-snake_1.2.2.bb
+++ b/packages/opie-snake/opie-snake_1.2.2.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/snake \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-snake/opie-snake_cvs.bb b/packages/opie-snake/opie-snake_cvs.bb
index cee76c6c70..8bffd63a1d 100644
--- a/packages/opie-snake/opie-snake_cvs.bb
+++ b/packages/opie-snake/opie-snake_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/snake \
diff --git a/packages/opie-solitaire/opie-solitaire_1.2.2.bb b/packages/opie-solitaire/opie-solitaire_1.2.2.bb
index 5074934c63..c8c3b8c2f3 100644
--- a/packages/opie-solitaire/opie-solitaire_1.2.2.bb
+++ b/packages/opie-solitaire/opie-solitaire_1.2.2.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/solitaire \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-solitaire/opie-solitaire_cvs.bb b/packages/opie-solitaire/opie-solitaire_cvs.bb
index b9428ef04c..b3dd70cd9f 100644
--- a/packages/opie-solitaire/opie-solitaire_cvs.bb
+++ b/packages/opie-solitaire/opie-solitaire_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/solitaire \
diff --git a/packages/opie-sshkeys/opie-sshkeys_1.2.2.bb b/packages/opie-sshkeys/opie-sshkeys_1.2.2.bb
index a731009a7c..6a9732fa96 100644
--- a/packages/opie-sshkeys/opie-sshkeys_1.2.2.bb
+++ b/packages/opie-sshkeys/opie-sshkeys_1.2.2.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/sshkeys \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-sshkeys/opie-sshkeys_cvs.bb b/packages/opie-sshkeys/opie-sshkeys_cvs.bb
index b669870373..4a1c99746b 100644
--- a/packages/opie-sshkeys/opie-sshkeys_cvs.bb
+++ b/packages/opie-sshkeys/opie-sshkeys_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/settings/sshkeys \
diff --git a/packages/opie-style-flat/opie-style-flat_1.2.2.bb b/packages/opie-style-flat/opie-style-flat_1.2.2.bb
index 91641bfd6d..17b022f789 100644
--- a/packages/opie-style-flat/opie-style-flat_1.2.2.bb
+++ b/packages/opie-style-flat/opie-style-flat_1.2.2.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/styles/flat "
diff --git a/packages/opie-style-flat/opie-style-flat_cvs.bb b/packages/opie-style-flat/opie-style-flat_cvs.bb
index ac045b599e..f007a4b9b2 100644
--- a/packages/opie-style-flat/opie-style-flat_cvs.bb
+++ b/packages/opie-style-flat/opie-style-flat_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/styles/flat "
diff --git a/packages/opie-style-fresh/opie-style-fresh_1.2.2.bb b/packages/opie-style-fresh/opie-style-fresh_1.2.2.bb
index 223e7067f7..80a77e2144 100644
--- a/packages/opie-style-fresh/opie-style-fresh_1.2.2.bb
+++ b/packages/opie-style-fresh/opie-style-fresh_1.2.2.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/styles/fresh "
diff --git a/packages/opie-style-fresh/opie-style-fresh_cvs.bb b/packages/opie-style-fresh/opie-style-fresh_cvs.bb
index 6e571ef451..d68f8ef83f 100644
--- a/packages/opie-style-fresh/opie-style-fresh_cvs.bb
+++ b/packages/opie-style-fresh/opie-style-fresh_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/styles/fresh "
diff --git a/packages/opie-style-liquid/opie-style-liquid_1.2.2.bb b/packages/opie-style-liquid/opie-style-liquid_1.2.2.bb
index ea307ee9a5..597be07ec5 100644
--- a/packages/opie-style-liquid/opie-style-liquid_1.2.2.bb
+++ b/packages/opie-style-liquid/opie-style-liquid_1.2.2.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/styles/liquid "
diff --git a/packages/opie-style-liquid/opie-style-liquid_cvs.bb b/packages/opie-style-liquid/opie-style-liquid_cvs.bb
index 1b76a1fb66..02ba287dee 100644
--- a/packages/opie-style-liquid/opie-style-liquid_cvs.bb
+++ b/packages/opie-style-liquid/opie-style-liquid_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/styles/liquid "
diff --git a/packages/opie-style-metal/opie-style-metal_1.2.2.bb b/packages/opie-style-metal/opie-style-metal_1.2.2.bb
index 9fadf8ab7f..f4c582d92b 100644
--- a/packages/opie-style-metal/opie-style-metal_1.2.2.bb
+++ b/packages/opie-style-metal/opie-style-metal_1.2.2.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/styles/metal "
diff --git a/packages/opie-style-metal/opie-style-metal_cvs.bb b/packages/opie-style-metal/opie-style-metal_cvs.bb
index b21797e5bd..966c733259 100644
--- a/packages/opie-style-metal/opie-style-metal_cvs.bb
+++ b/packages/opie-style-metal/opie-style-metal_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/styles/metal "
diff --git a/packages/opie-style-phase/opie-style-phase_1.2.2.bb b/packages/opie-style-phase/opie-style-phase_1.2.2.bb
index 47235dd14d..c9654633b4 100644
--- a/packages/opie-style-phase/opie-style-phase_1.2.2.bb
+++ b/packages/opie-style-phase/opie-style-phase_1.2.2.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/styles/phase"
diff --git a/packages/opie-style-phase/opie-style-phase_cvs.bb b/packages/opie-style-phase/opie-style-phase_cvs.bb
index cd047a2254..09e90748bd 100644
--- a/packages/opie-style-phase/opie-style-phase_cvs.bb
+++ b/packages/opie-style-phase/opie-style-phase_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/styles/phase"
diff --git a/packages/opie-style-web/opie-style-web_1.2.2.bb b/packages/opie-style-web/opie-style-web_1.2.2.bb
index b92edb8804..9c8af9a4df 100644
--- a/packages/opie-style-web/opie-style-web_1.2.2.bb
+++ b/packages/opie-style-web/opie-style-web_1.2.2.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/styles/web"
diff --git a/packages/opie-style-web/opie-style-web_cvs.bb b/packages/opie-style-web/opie-style-web_cvs.bb
index a43db5557c..8bf3cb2b57 100644
--- a/packages/opie-style-web/opie-style-web_cvs.bb
+++ b/packages/opie-style-web/opie-style-web_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/styles/web"
diff --git a/packages/opie-suspendapplet/opie-suspendapplet_1.2.2.bb b/packages/opie-suspendapplet/opie-suspendapplet_1.2.2.bb
index 46fe78b358..ed4d6b037a 100644
--- a/packages/opie-suspendapplet/opie-suspendapplet_1.2.2.bb
+++ b/packages/opie-suspendapplet/opie-suspendapplet_1.2.2.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/suspendapplet \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-suspendapplet/opie-suspendapplet_cvs.bb b/packages/opie-suspendapplet/opie-suspendapplet_cvs.bb
index f517498690..f18b4300e7 100644
--- a/packages/opie-suspendapplet/opie-suspendapplet_cvs.bb
+++ b/packages/opie-suspendapplet/opie-suspendapplet_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/suspendapplet \
diff --git a/packages/opie-symlinker/opie-symlinker_1.2.2.bb b/packages/opie-symlinker/opie-symlinker_1.2.2.bb
index ac98fb73f9..1f46355811 100644
--- a/packages/opie-symlinker/opie-symlinker_1.2.2.bb
+++ b/packages/opie-symlinker/opie-symlinker_1.2.2.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/symlinker "
diff --git a/packages/opie-symlinker/opie-symlinker_cvs.bb b/packages/opie-symlinker/opie-symlinker_cvs.bb
index 31c3954ffa..01cc735823 100644
--- a/packages/opie-symlinker/opie-symlinker_cvs.bb
+++ b/packages/opie-symlinker/opie-symlinker_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/symlinker "
diff --git a/packages/opie-sysinfo/opie-sysinfo_1.2.2.bb b/packages/opie-sysinfo/opie-sysinfo_1.2.2.bb
index 6517203c8e..597f28970d 100644
--- a/packages/opie-sysinfo/opie-sysinfo_1.2.2.bb
+++ b/packages/opie-sysinfo/opie-sysinfo_1.2.2.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/sysinfo \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-sysinfo/opie-sysinfo_cvs.bb b/packages/opie-sysinfo/opie-sysinfo_cvs.bb
index e75c4e73d9..a553ce6f33 100644
--- a/packages/opie-sysinfo/opie-sysinfo_cvs.bb
+++ b/packages/opie-sysinfo/opie-sysinfo_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/settings/sysinfo \
diff --git a/packages/opie-systemtime/opie-systemtime_1.2.2.bb b/packages/opie-systemtime/opie-systemtime_1.2.2.bb
index 78e22ae536..11ec29c45f 100644
--- a/packages/opie-systemtime/opie-systemtime_1.2.2.bb
+++ b/packages/opie-systemtime/opie-systemtime_1.2.2.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/netsystemtime \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-systemtime/opie-systemtime_cvs.bb b/packages/opie-systemtime/opie-systemtime_cvs.bb
index c58c5509d1..ca4f7ab00e 100644
--- a/packages/opie-systemtime/opie-systemtime_cvs.bb
+++ b/packages/opie-systemtime/opie-systemtime_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/settings/netsystemtime \
diff --git a/packages/opie-tableviewer/opie-tableviewer_1.2.2.bb b/packages/opie-tableviewer/opie-tableviewer_1.2.2.bb
index 35397627d1..b78bf3388a 100644
--- a/packages/opie-tableviewer/opie-tableviewer_1.2.2.bb
+++ b/packages/opie-tableviewer/opie-tableviewer_1.2.2.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/tableviewer \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-tableviewer/opie-tableviewer_cvs.bb b/packages/opie-tableviewer/opie-tableviewer_cvs.bb
index b97f7265d7..044d249d7e 100644
--- a/packages/opie-tableviewer/opie-tableviewer_cvs.bb
+++ b/packages/opie-tableviewer/opie-tableviewer_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/tableviewer \
diff --git a/packages/opie-tetrix/opie-tetrix_1.2.2.bb b/packages/opie-tetrix/opie-tetrix_1.2.2.bb
index c3a36f09de..bb9052066d 100644
--- a/packages/opie-tetrix/opie-tetrix_1.2.2.bb
+++ b/packages/opie-tetrix/opie-tetrix_1.2.2.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/tetrix \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-tetrix/opie-tetrix_cvs.bb b/packages/opie-tetrix/opie-tetrix_cvs.bb
index dfb057879c..bf315fd7ce 100644
--- a/packages/opie-tetrix/opie-tetrix_cvs.bb
+++ b/packages/opie-tetrix/opie-tetrix_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/tetrix \
diff --git a/packages/opie-textedit/opie-textedit_1.2.2.bb b/packages/opie-textedit/opie-textedit_1.2.2.bb
index bc31fcdf72..b69c2837d7 100644
--- a/packages/opie-textedit/opie-textedit_1.2.2.bb
+++ b/packages/opie-textedit/opie-textedit_1.2.2.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/${APPNAME} \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-textedit/opie-textedit_cvs.bb b/packages/opie-textedit/opie-textedit_cvs.bb
index a9089f0ffc..8e0e398a30 100644
--- a/packages/opie-textedit/opie-textedit_cvs.bb
+++ b/packages/opie-textedit/opie-textedit_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/${APPNAME} \
diff --git a/packages/opie-theme/opie-theme_1.2.2.bb b/packages/opie-theme/opie-theme_1.2.2.bb
index 5aa0a4315f..d765a9ffc4 100644
--- a/packages/opie-theme/opie-theme_1.2.2.bb
+++ b/packages/opie-theme/opie-theme_1.2.2.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/styles/theme \
 	${HANDHELDS_CVS};tag=${TAG};module=opie/plugins/styles "
diff --git a/packages/opie-tictac/opie-tictac_1.2.2.bb b/packages/opie-tictac/opie-tictac_1.2.2.bb
index 6d018524ee..7ff217e1eb 100644
--- a/packages/opie-tictac/opie-tictac_1.2.2.bb
+++ b/packages/opie-tictac/opie-tictac_1.2.2.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/tictac \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-tictac/opie-tictac_cvs.bb b/packages/opie-tictac/opie-tictac_cvs.bb
index 2ee752587c..a685ad6ea4 100644
--- a/packages/opie-tictac/opie-tictac_cvs.bb
+++ b/packages/opie-tictac/opie-tictac_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/tictac \
diff --git a/packages/opie-tinykate/opie-tinykate_1.2.2.bb b/packages/opie-tinykate/opie-tinykate_1.2.2.bb
index 3618a15804..e964a4886e 100644
--- a/packages/opie-tinykate/opie-tinykate_1.2.2.bb
+++ b/packages/opie-tinykate/opie-tinykate_1.2.2.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/tinykate \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-tinykate/opie-tinykate_cvs.bb b/packages/opie-tinykate/opie-tinykate_cvs.bb
index 1f49465a5a..1a4283ac86 100644
--- a/packages/opie-tinykate/opie-tinykate_cvs.bb
+++ b/packages/opie-tinykate/opie-tinykate_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/tinykate \
diff --git a/packages/opie-today-addressbookplugin/opie-today-addressbookplugin_1.2.2.bb b/packages/opie-today-addressbookplugin/opie-today-addressbookplugin_1.2.2.bb
index 2648340536..1ebcab1886 100644
--- a/packages/opie-today-addressbookplugin/opie-today-addressbookplugin_1.2.2.bb
+++ b/packages/opie-today-addressbookplugin/opie-today-addressbookplugin_1.2.2.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/pim/today/plugins/addressbook "
diff --git a/packages/opie-today-addressbookplugin/opie-today-addressbookplugin_cvs.bb b/packages/opie-today-addressbookplugin/opie-today-addressbookplugin_cvs.bb
index 10b53b92a6..fad571b599 100644
--- a/packages/opie-today-addressbookplugin/opie-today-addressbookplugin_cvs.bb
+++ b/packages/opie-today-addressbookplugin/opie-today-addressbookplugin_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/pim/today/plugins/addressbook "
diff --git a/packages/opie-today-datebookplugin/opie-today-datebookplugin_1.2.2.bb b/packages/opie-today-datebookplugin/opie-today-datebookplugin_1.2.2.bb
index f05a82c1cd..b9b978586b 100644
--- a/packages/opie-today-datebookplugin/opie-today-datebookplugin_1.2.2.bb
+++ b/packages/opie-today-datebookplugin/opie-today-datebookplugin_1.2.2.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/pim/today/plugins/datebook "
diff --git a/packages/opie-today-datebookplugin/opie-today-datebookplugin_cvs.bb b/packages/opie-today-datebookplugin/opie-today-datebookplugin_cvs.bb
index 7abf53e4d7..1f71be5147 100644
--- a/packages/opie-today-datebookplugin/opie-today-datebookplugin_cvs.bb
+++ b/packages/opie-today-datebookplugin/opie-today-datebookplugin_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/pim/today/plugins/datebook "
diff --git a/packages/opie-today-fortuneplugin/opie-today-fortuneplugin_1.2.2.bb b/packages/opie-today-fortuneplugin/opie-today-fortuneplugin_1.2.2.bb
index 558cb028cd..b8dcf1d2a0 100644
--- a/packages/opie-today-fortuneplugin/opie-today-fortuneplugin_1.2.2.bb
+++ b/packages/opie-today-fortuneplugin/opie-today-fortuneplugin_1.2.2.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/todayplugins/fortune "
diff --git a/packages/opie-today-fortuneplugin/opie-today-fortuneplugin_cvs.bb b/packages/opie-today-fortuneplugin/opie-today-fortuneplugin_cvs.bb
index bde03ddfa8..4d54cdc259 100644
--- a/packages/opie-today-fortuneplugin/opie-today-fortuneplugin_cvs.bb
+++ b/packages/opie-today-fortuneplugin/opie-today-fortuneplugin_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/todayplugins/fortune "
diff --git a/packages/opie-today-mailplugin/opie-today-mailplugin_1.2.2.bb b/packages/opie-today-mailplugin/opie-today-mailplugin_1.2.2.bb
index 7be824499f..ea01493fc2 100644
--- a/packages/opie-today-mailplugin/opie-today-mailplugin_1.2.2.bb
+++ b/packages/opie-today-mailplugin/opie-today-mailplugin_1.2.2.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/pim/today/plugins/mail "
diff --git a/packages/opie-today-mailplugin/opie-today-mailplugin_cvs.bb b/packages/opie-today-mailplugin/opie-today-mailplugin_cvs.bb
index ae38b4acf4..00f951f34d 100644
--- a/packages/opie-today-mailplugin/opie-today-mailplugin_cvs.bb
+++ b/packages/opie-today-mailplugin/opie-today-mailplugin_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/pim/today/plugins/mail "
diff --git a/packages/opie-today-stocktickerplugin/opie-today-stocktickerplugin_1.2.2.bb b/packages/opie-today-stocktickerplugin/opie-today-stocktickerplugin_1.2.2.bb
index 993d247cd3..c34565c4fa 100644
--- a/packages/opie-today-stocktickerplugin/opie-today-stocktickerplugin_1.2.2.bb
+++ b/packages/opie-today-stocktickerplugin/opie-today-stocktickerplugin_1.2.2.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/todayplugins/stockticker \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-today-stocktickerplugin/opie-today-stocktickerplugin_cvs.bb b/packages/opie-today-stocktickerplugin/opie-today-stocktickerplugin_cvs.bb
index 2fd397e8c8..fb9d16bed0 100644
--- a/packages/opie-today-stocktickerplugin/opie-today-stocktickerplugin_cvs.bb
+++ b/packages/opie-today-stocktickerplugin/opie-today-stocktickerplugin_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/todayplugins/stockticker \
diff --git a/packages/opie-today-todolistplugin/opie-today-todolistplugin_1.2.2.bb b/packages/opie-today-todolistplugin/opie-today-todolistplugin_1.2.2.bb
index 53ca61146b..002152f7e2 100644
--- a/packages/opie-today-todolistplugin/opie-today-todolistplugin_1.2.2.bb
+++ b/packages/opie-today-todolistplugin/opie-today-todolistplugin_1.2.2.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/pim/today/plugins/todolist "
diff --git a/packages/opie-today-todolistplugin/opie-today-todolistplugin_cvs.bb b/packages/opie-today-todolistplugin/opie-today-todolistplugin_cvs.bb
index 6ccc6481a4..3c6875404d 100644
--- a/packages/opie-today-todolistplugin/opie-today-todolistplugin_cvs.bb
+++ b/packages/opie-today-todolistplugin/opie-today-todolistplugin_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/pim/today/plugins/todolist "
diff --git a/packages/opie-today-weatherplugin/opie-today-weatherplugin_1.2.2.bb b/packages/opie-today-weatherplugin/opie-today-weatherplugin_1.2.2.bb
index 878ac811b1..8daa8273d2 100644
--- a/packages/opie-today-weatherplugin/opie-today-weatherplugin_1.2.2.bb
+++ b/packages/opie-today-weatherplugin/opie-today-weatherplugin_1.2.2.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/todayplugins/weather \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics"
diff --git a/packages/opie-today-weatherplugin/opie-today-weatherplugin_cvs.bb b/packages/opie-today-weatherplugin/opie-today-weatherplugin_cvs.bb
index 5bda2fa8ae..0c73984428 100644
--- a/packages/opie-today-weatherplugin/opie-today-weatherplugin_cvs.bb
+++ b/packages/opie-today-weatherplugin/opie-today-weatherplugin_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/todayplugins/weather \
diff --git a/packages/opie-today/opie-today_1.2.2.bb b/packages/opie-today/opie-today_1.2.2.bb
index 8cdd4e4cd6..1039d274b1 100644
--- a/packages/opie-today/opie-today_1.2.2.bb
+++ b/packages/opie-today/opie-today_1.2.2.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/pim/today \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-today/opie-today_cvs.bb b/packages/opie-today/opie-today_cvs.bb
index d0730ac974..fc7f2d808e 100644
--- a/packages/opie-today/opie-today_cvs.bb
+++ b/packages/opie-today/opie-today_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/pim/today \
diff --git a/packages/opie-todo/opie-todo_1.2.2.bb b/packages/opie-todo/opie-todo_1.2.2.bb
index ea24060b02..5b50255d43 100644
--- a/packages/opie-todo/opie-todo_1.2.2.bb
+++ b/packages/opie-todo/opie-todo_1.2.2.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/pim/todo \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-todo/opie-todo_cvs.bb b/packages/opie-todo/opie-todo_cvs.bb
index 525ab0ee8d..dabbdfd4fb 100644
--- a/packages/opie-todo/opie-todo_cvs.bb
+++ b/packages/opie-todo/opie-todo_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/pim/todo \
diff --git a/packages/opie-tonleiter/opie-tonleiter_1.2.2.bb b/packages/opie-tonleiter/opie-tonleiter_1.2.2.bb
index f471360ced..9dbbdba2ff 100644
--- a/packages/opie-tonleiter/opie-tonleiter_1.2.2.bb
+++ b/packages/opie-tonleiter/opie-tonleiter_1.2.2.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/multimedia/tonleiter \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-tonleiter/opie-tonleiter_cvs.bb b/packages/opie-tonleiter/opie-tonleiter_cvs.bb
index 7536f8db7e..b413c24297 100644
--- a/packages/opie-tonleiter/opie-tonleiter_cvs.bb
+++ b/packages/opie-tonleiter/opie-tonleiter_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/multimedia/tonleiter \
diff --git a/packages/opie-ttf-support/opie-ttf-support_1.1.bb b/packages/opie-ttf-support/opie-ttf-support_1.1.bb
index f012af4a72..139c842c90 100644
--- a/packages/opie-ttf-support/opie-ttf-support_1.1.bb
+++ b/packages/opie-ttf-support/opie-ttf-support_1.1.bb
@@ -6,7 +6,7 @@ SRC_URI = "file://update-qtttffontdir.c"
 S = "${WORKDIR}"
 
 do_compile() {
-	${CC} ${CFLAGS} ${LDFLAGS} -I${STAGING_INCDIR}/freetype2 -lfreetype -o update-qtttffontdir update-qtttffontdir.c 
+	${CC} ${CFLAGS} ${LDFLAGS} -I${STAGING_INCDIR}/freetype2 -lfreetype -o update-qtttffontdir update-qtttffontdir.c
 }
 
 do_install() {
diff --git a/packages/opie-unikeyboard/opie-unikeyboard_1.2.2.bb b/packages/opie-unikeyboard/opie-unikeyboard_1.2.2.bb
index c505e360de..b9a85ce275 100644
--- a/packages/opie-unikeyboard/opie-unikeyboard_1.2.2.bb
+++ b/packages/opie-unikeyboard/opie-unikeyboard_1.2.2.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/inputmethods/unikeyboard "
diff --git a/packages/opie-unikeyboard/opie-unikeyboard_cvs.bb b/packages/opie-unikeyboard/opie-unikeyboard_cvs.bb
index d173bd7de7..c85a6ad7e2 100644
--- a/packages/opie-unikeyboard/opie-unikeyboard_cvs.bb
+++ b/packages/opie-unikeyboard/opie-unikeyboard_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/inputmethods/unikeyboard "
diff --git a/packages/opie-usermanager/opie-usermanager_1.2.2.bb b/packages/opie-usermanager/opie-usermanager_1.2.2.bb
index ccc9c52cbe..2233f1349f 100644
--- a/packages/opie-usermanager/opie-usermanager_1.2.2.bb
+++ b/packages/opie-usermanager/opie-usermanager_1.2.2.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/usermanager \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-usermanager/opie-usermanager_cvs.bb b/packages/opie-usermanager/opie-usermanager_cvs.bb
index 10f1528934..1f481f7461 100644
--- a/packages/opie-usermanager/opie-usermanager_cvs.bb
+++ b/packages/opie-usermanager/opie-usermanager_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/settings/usermanager \
diff --git a/packages/opie-vmemo-settings/opie-vmemo-settings_1.2.2.bb b/packages/opie-vmemo-settings/opie-vmemo-settings_1.2.2.bb
index 9bcf900b85..f70855361b 100644
--- a/packages/opie-vmemo-settings/opie-vmemo-settings_1.2.2.bb
+++ b/packages/opie-vmemo-settings/opie-vmemo-settings_1.2.2.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/sound \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-vmemo-settings/opie-vmemo-settings_cvs.bb b/packages/opie-vmemo-settings/opie-vmemo-settings_cvs.bb
index 2965355f57..834e65c526 100644
--- a/packages/opie-vmemo-settings/opie-vmemo-settings_cvs.bb
+++ b/packages/opie-vmemo-settings/opie-vmemo-settings_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/settings/sound \
diff --git a/packages/opie-vmemo/opie-vmemo_1.2.2.bb b/packages/opie-vmemo/opie-vmemo_1.2.2.bb
index fcb988f085..10e11d82d6 100644
--- a/packages/opie-vmemo/opie-vmemo_1.2.2.bb
+++ b/packages/opie-vmemo/opie-vmemo_1.2.2.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/vmemo \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-vmemo/opie-vmemo_cvs.bb b/packages/opie-vmemo/opie-vmemo_cvs.bb
index 5d17175393..2ea90ed3e2 100644
--- a/packages/opie-vmemo/opie-vmemo_cvs.bb
+++ b/packages/opie-vmemo/opie-vmemo_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/vmemo \
diff --git a/packages/opie-vtapplet/opie-vtapplet_1.2.2.bb b/packages/opie-vtapplet/opie-vtapplet_1.2.2.bb
index 423f676470..6aa925b63a 100644
--- a/packages/opie-vtapplet/opie-vtapplet_1.2.2.bb
+++ b/packages/opie-vtapplet/opie-vtapplet_1.2.2.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/vtapplet \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-vtapplet/opie-vtapplet_cvs.bb b/packages/opie-vtapplet/opie-vtapplet_cvs.bb
index cf7a023c5c..9e1817220b 100644
--- a/packages/opie-vtapplet/opie-vtapplet_cvs.bb
+++ b/packages/opie-vtapplet/opie-vtapplet_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/vtapplet \
diff --git a/packages/opie-wellenreiter/opie-wellenreiter_cvs.bb b/packages/opie-wellenreiter/opie-wellenreiter_cvs.bb
index 13e10e9dfa..782f2cbb7d 100644
--- a/packages/opie-wellenreiter/opie-wellenreiter_cvs.bb
+++ b/packages/opie-wellenreiter/opie-wellenreiter_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/wellenreiter \
diff --git a/packages/opie-wirelessapplet/opie-wirelessapplet_1.2.2.bb b/packages/opie-wirelessapplet/opie-wirelessapplet_1.2.2.bb
index 62e07c3a1e..fcd2794595 100644
--- a/packages/opie-wirelessapplet/opie-wirelessapplet_1.2.2.bb
+++ b/packages/opie-wirelessapplet/opie-wirelessapplet_1.2.2.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/applets/wirelessapplet"
diff --git a/packages/opie-wirelessapplet/opie-wirelessapplet_cvs.bb b/packages/opie-wirelessapplet/opie-wirelessapplet_cvs.bb
index 1928692898..76a2b2f340 100644
--- a/packages/opie-wirelessapplet/opie-wirelessapplet_cvs.bb
+++ b/packages/opie-wirelessapplet/opie-wirelessapplet_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/applets/wirelessapplet"
diff --git a/packages/opie-wordgame/opie-wordgame_1.2.2.bb b/packages/opie-wordgame/opie-wordgame_1.2.2.bb
index 694822c3ab..93897ec99f 100644
--- a/packages/opie-wordgame/opie-wordgame_1.2.2.bb
+++ b/packages/opie-wordgame/opie-wordgame_1.2.2.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/wordgame \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-wordgame/opie-wordgame_cvs.bb b/packages/opie-wordgame/opie-wordgame_cvs.bb
index e827b5bb05..9d557d6880 100644
--- a/packages/opie-wordgame/opie-wordgame_cvs.bb
+++ b/packages/opie-wordgame/opie-wordgame_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/wordgame \
diff --git a/packages/opie-write/opie-write_1.2.2.bb b/packages/opie-write/opie-write_1.2.2.bb
index eb2011e5f3..1df77dc9be 100644
--- a/packages/opie-write/opie-write_1.2.2.bb
+++ b/packages/opie-write/opie-write_1.2.2.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/${APPNAME} \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-write/opie-write_cvs.bb b/packages/opie-write/opie-write_cvs.bb
index 2d365c68a6..ca2955fb0b 100644
--- a/packages/opie-write/opie-write_cvs.bb
+++ b/packages/opie-write/opie-write_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/${APPNAME} \
diff --git a/packages/opie-zkbapplet/opie-zkbapplet_1.2.2.bb b/packages/opie-zkbapplet/opie-zkbapplet_1.2.2.bb
index cec152e3fe..db2f29d7d4 100644
--- a/packages/opie-zkbapplet/opie-zkbapplet_1.2.2.bb
+++ b/packages/opie-zkbapplet/opie-zkbapplet_1.2.2.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/applets/zkbapplet \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/share \
diff --git a/packages/opie-zkbapplet/opie-zkbapplet_cvs.bb b/packages/opie-zkbapplet/opie-zkbapplet_cvs.bb
index f861726632..260552de7a 100644
--- a/packages/opie-zkbapplet/opie-zkbapplet_cvs.bb
+++ b/packages/opie-zkbapplet/opie-zkbapplet_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/applets/zkbapplet \
diff --git a/packages/opie-zlines/opie-zlines_1.2.2.bb b/packages/opie-zlines/opie-zlines_1.2.2.bb
index 4f65bb9537..2e7f2dc774 100644
--- a/packages/opie-zlines/opie-zlines_1.2.2.bb
+++ b/packages/opie-zlines/opie-zlines_1.2.2.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/zlines \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-zlines/opie-zlines_cvs.bb b/packages/opie-zlines/opie-zlines_cvs.bb
index 00956b4a0c..c2810d68fe 100644
--- a/packages/opie-zlines/opie-zlines_cvs.bb
+++ b/packages/opie-zlines/opie-zlines_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/zlines \
diff --git a/packages/opie-zsafe/opie-zsafe_1.2.2.bb b/packages/opie-zsafe/opie-zsafe_1.2.2.bb
index d9c5e75c68..80e53c3882 100644
--- a/packages/opie-zsafe/opie-zsafe_1.2.2.bb
+++ b/packages/opie-zsafe/opie-zsafe_1.2.2.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/zsafe \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-zsafe/opie-zsafe_cvs.bb b/packages/opie-zsafe/opie-zsafe_cvs.bb
index 8b7aaacbc0..51c15f7711 100644
--- a/packages/opie-zsafe/opie-zsafe_cvs.bb
+++ b/packages/opie-zsafe/opie-zsafe_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/zsafe \
diff --git a/packages/opie-zsame/opie-zsame_1.2.2.bb b/packages/opie-zsame/opie-zsame_1.2.2.bb
index bb18cc23bd..a318d0a1cc 100644
--- a/packages/opie-zsame/opie-zsame_1.2.2.bb
+++ b/packages/opie-zsame/opie-zsame_1.2.2.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
-    
- 
+
+
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/zsame \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-zsame/opie-zsame_cvs.bb b/packages/opie-zsame/opie-zsame_cvs.bb
index 5dc7427fb5..a25478fabf 100644
--- a/packages/opie-zsame/opie-zsame_cvs.bb
+++ b/packages/opie-zsame/opie-zsame_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-    
+
 PV = "${OPIE_CVS_PV}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/games/zsame \
diff --git a/packages/orinoco/orinoco-conf_1.0.bb b/packages/orinoco/orinoco-conf_1.0.bb
index 6fb90970a7..97b860f2cf 100644
--- a/packages/orinoco/orinoco-conf_1.0.bb
+++ b/packages/orinoco/orinoco-conf_1.0.bb
@@ -9,9 +9,9 @@ SRC_URI = "file://spectrum.conf \
            file://hermes.conf \
 	   file://orinoco_cs.conf"
 
-do_install() {   
+do_install() {
         install -d ${D}${sysconfdir}/pcmcia
-        install -d ${D}${sysconfdir}/modutils	
+        install -d ${D}${sysconfdir}/modutils
         install -m 0644 ${WORKDIR}/spectrum.conf ${D}${sysconfdir}/pcmcia/
         install -m 0644 ${WORKDIR}/hermes.conf ${D}${sysconfdir}/pcmcia/
         install -m 0644 ${WORKDIR}/orinoco_cs.conf ${D}${sysconfdir}/modutils/
diff --git a/packages/orinoco/orinoco-modules_0.13e.bb b/packages/orinoco/orinoco-modules_0.13e.bb
index 102a6f6aa1..9c5cc2f776 100644
--- a/packages/orinoco/orinoco-modules_0.13e.bb
+++ b/packages/orinoco/orinoco-modules_0.13e.bb
@@ -20,7 +20,7 @@ do_compile_prepend() {
 	cp -f ${WORKDIR}/spectrum* ${S}/
 }
 
-do_install() {   
+do_install() {
         install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/net/
         install -d ${D}${sysconfdir}/pcmcia
         install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/net/
@@ -31,7 +31,7 @@ do_install() {
 }
 
 PACKAGES = "orinoco-modules-cs orinoco-modules-pci orinoco-modules-usb orinoco-modules-nortel orinoco-modules"
-FILES_orinoco-modules-cs = "/lib/modules/${KERNEL_VERSION}/net/*_cs${KERNEL_OBJECT_SUFFIX} /${sysconfdir}"        
+FILES_orinoco-modules-cs = "/lib/modules/${KERNEL_VERSION}/net/*_cs${KERNEL_OBJECT_SUFFIX} /${sysconfdir}"
 FILES_orinoco-modules-pci = "/lib/modules/${KERNEL_VERSION}/net/orinoco_p*${KERNEL_OBJECT_SUFFIX}"
 FILES_orinoco-modules-usb = "/lib/modules/${KERNEL_VERSION}/net/*_usb${KERNEL_OBJECT_SUFFIX}"
 FILES_orinoco-modules-nortel = "/lib/modules/${KERNEL_VERSION}/net/orinoco_tmd${KERNEL_OBJECT_SUFFIX} \
diff --git a/packages/orinoco/orinoco-modules_0.15rc1.bb b/packages/orinoco/orinoco-modules_0.15rc1.bb
index b2abc152f7..ebf0f03bbf 100644
--- a/packages/orinoco/orinoco-modules_0.15rc1.bb
+++ b/packages/orinoco/orinoco-modules_0.15rc1.bb
@@ -17,13 +17,13 @@ S = "${WORKDIR}/orinoco-${PV}"
 
 inherit module
 
-do_install() {   
+do_install() {
         install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/net/
         install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/net/
 }
 
 PACKAGES = "orinoco-modules-cs orinoco-modules-pci orinoco-modules-usb orinoco-modules-nortel orinoco-modules"
-FILES_orinoco-modules-cs = "/lib/modules/${KERNEL_VERSION}/net/*_cs${KERNEL_OBJECT_SUFFIX}"        
+FILES_orinoco-modules-cs = "/lib/modules/${KERNEL_VERSION}/net/*_cs${KERNEL_OBJECT_SUFFIX}"
 FILES_orinoco-modules-pci = "/lib/modules/${KERNEL_VERSION}/net/orinoco_p*${KERNEL_OBJECT_SUFFIX}"
 FILES_orinoco-modules-usb = "/lib/modules/${KERNEL_VERSION}/net/*_usb${KERNEL_OBJECT_SUFFIX}"
 FILES_orinoco-modules-nortel = "/lib/modules/${KERNEL_VERSION}/net/orinoco_tmd${KERNEL_OBJECT_SUFFIX} \
diff --git a/packages/orinoco/orinoco-modules_0.15rc2.bb b/packages/orinoco/orinoco-modules_0.15rc2.bb
index b31f1bf6c2..4153e8c4fc 100644
--- a/packages/orinoco/orinoco-modules_0.15rc2.bb
+++ b/packages/orinoco/orinoco-modules_0.15rc2.bb
@@ -19,13 +19,13 @@ S = "${WORKDIR}/orinoco-${PV}"
 
 inherit module
 
-do_install() {   
+do_install() {
         install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/net/
         install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/net/
 }
 
 PACKAGES = "orinoco-modules-cs orinoco-modules-pci orinoco-modules-usb orinoco-modules-nortel orinoco-modules"
-FILES_orinoco-modules-cs = "/lib/modules/${KERNEL_VERSION}/net/*_cs${KERNEL_OBJECT_SUFFIX}"        
+FILES_orinoco-modules-cs = "/lib/modules/${KERNEL_VERSION}/net/*_cs${KERNEL_OBJECT_SUFFIX}"
 FILES_orinoco-modules-pci = "/lib/modules/${KERNEL_VERSION}/net/orinoco_p*${KERNEL_OBJECT_SUFFIX}"
 FILES_orinoco-modules-usb = "/lib/modules/${KERNEL_VERSION}/net/*_usb${KERNEL_OBJECT_SUFFIX}"
 FILES_orinoco-modules-nortel = "/lib/modules/${KERNEL_VERSION}/net/orinoco_tmd${KERNEL_OBJECT_SUFFIX} \
diff --git a/packages/pango/pango_1.10.2.bb b/packages/pango/pango_1.10.2.bb
index d9273e0b78..fa91b2bd28 100644
--- a/packages/pango/pango_1.10.2.bb
+++ b/packages/pango/pango_1.10.2.bb
@@ -6,7 +6,7 @@ Open Source framework for the layout and rendering of \
 internationalized text."
 PR = "r2"
 
-RRECOMMENDS_${PN} = "pango-module-basic-x pango-module-basic-fc" 
+RRECOMMENDS_${PN} = "pango-module-basic-x pango-module-basic-fc"
 
 # seems to go wrong with default cflags
 FULL_OPTIMIZATION_arm = "-O2"
diff --git a/packages/pango/pango_1.12.0.bb b/packages/pango/pango_1.12.0.bb
index 6e07832f34..ae8f597bc1 100644
--- a/packages/pango/pango_1.12.0.bb
+++ b/packages/pango/pango_1.12.0.bb
@@ -6,7 +6,7 @@ Open Source framework for the layout and rendering of \
 internationalized text."
 PR = "r2"
 
-RRECOMMENDS_${PN} = "pango-module-basic-x pango-module-basic-fc" 
+RRECOMMENDS_${PN} = "pango-module-basic-x pango-module-basic-fc"
 
 # seems to go wrong with default cflags
 FULL_OPTIMIZATION_arm = "-O2"
diff --git a/packages/pango/pango_1.13.3.bb b/packages/pango/pango_1.13.3.bb
index ba0e606c42..90e4acbf50 100644
--- a/packages/pango/pango_1.13.3.bb
+++ b/packages/pango/pango_1.13.3.bb
@@ -6,7 +6,7 @@ Open Source framework for the layout and rendering of \
 internationalized text."
 PR = "r2"
 
-RRECOMMENDS_${PN} = "pango-module-basic-x pango-module-basic-fc" 
+RRECOMMENDS_${PN} = "pango-module-basic-x pango-module-basic-fc"
 
 # seems to go wrong with default cflags
 FULL_OPTIMIZATION_arm = "-O2"
diff --git a/packages/pango/pango_1.14.0.bb b/packages/pango/pango_1.14.0.bb
index b98e241af5..caa09c610a 100644
--- a/packages/pango/pango_1.14.0.bb
+++ b/packages/pango/pango_1.14.0.bb
@@ -8,7 +8,7 @@ PR = "r2"
 
 PACKAGES_DYNAMIC = "pango-module-*"
 
-RRECOMMENDS_${PN} = "pango-module-basic-x pango-module-basic-fc" 
+RRECOMMENDS_${PN} = "pango-module-basic-x pango-module-basic-fc"
 
 # seems to go wrong with default cflags
 FULL_OPTIMIZATION_arm = "-O2"
diff --git a/packages/pango/pango_1.14.8.bb b/packages/pango/pango_1.14.8.bb
index dd2afb09d4..aec8219efa 100644
--- a/packages/pango/pango_1.14.8.bb
+++ b/packages/pango/pango_1.14.8.bb
@@ -8,7 +8,7 @@ PR = "r0"
 
 PACKAGES_DYNAMIC = "pango-module-*"
 
-RRECOMMENDS_${PN} = "pango-module-basic-x pango-module-basic-fc" 
+RRECOMMENDS_${PN} = "pango-module-basic-x pango-module-basic-fc"
 
 # seems to go wrong with default cflags
 FULL_OPTIMIZATION_arm = "-O2"
diff --git a/packages/pango/pango_1.15.1.bb b/packages/pango/pango_1.15.1.bb
index 8847b88549..82d1ad2b66 100644
--- a/packages/pango/pango_1.15.1.bb
+++ b/packages/pango/pango_1.15.1.bb
@@ -10,7 +10,7 @@ PR = "r0"
 
 PACKAGES_DYNAMIC = "pango-module-*"
 
-RRECOMMENDS_${PN} = "pango-module-basic-x pango-module-basic-fc" 
+RRECOMMENDS_${PN} = "pango-module-basic-x pango-module-basic-fc"
 
 # seems to go wrong with default cflags
 FULL_OPTIMIZATION_arm = "-O2"
diff --git a/packages/pango/pango_1.8.2.bb b/packages/pango/pango_1.8.2.bb
index 11cfdec40f..c80f7326a3 100644
--- a/packages/pango/pango_1.8.2.bb
+++ b/packages/pango/pango_1.8.2.bb
@@ -1,7 +1,7 @@
 LICENSE = "LGPL"
 SECTION = "x11/libs"
 DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libx11 libxft gtk-doc"
-RRECOMMENDS_${PN} = "pango-module-basic-x pango-module-basic-fc" 
+RRECOMMENDS_${PN} = "pango-module-basic-x pango-module-basic-fc"
 DESCRIPTION = "The goal of the Pango project is to provide an \
 Open Source framework for the layout and rendering of \
 internationalized text."
diff --git a/packages/pango/pango_1.9.1.bb b/packages/pango/pango_1.9.1.bb
index c0b5b04b98..66a6a84d22 100644
--- a/packages/pango/pango_1.9.1.bb
+++ b/packages/pango/pango_1.9.1.bb
@@ -1,7 +1,7 @@
 LICENSE = "LGPL"
 SECTION = "x11/libs"
 DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libx11 libxft gtk-doc"
-RRECOMMENDS_${PN} = "pango-module-basic-x pango-module-basic-fc" 
+RRECOMMENDS_${PN} = "pango-module-basic-x pango-module-basic-fc"
 DESCRIPTION = "The goal of the Pango project is to provide an \
 Open Source framework for the layout and rendering of \
 internationalized text."
diff --git a/packages/panoramixext/panoramixext_1.1.bb b/packages/panoramixext/panoramixext_1.1.bb
index c2627c5bc1..2da504779f 100644
--- a/packages/panoramixext/panoramixext_1.1.bb
+++ b/packages/panoramixext/panoramixext_1.1.bb
@@ -5,7 +5,7 @@ DESCRIPTION = "PanoramiX extension headers"
 
 SRC_URI = "${XLIBS_MIRROR}/panoramixext-${PV}.tar.bz2"
 
-inherit autotools pkgconfig 
+inherit autotools pkgconfig
 
 do_stage() {
 	oe_runmake install prefix=${STAGING_DIR} \
diff --git a/packages/panoramixext/panoramixext_cvs.bb b/packages/panoramixext/panoramixext_cvs.bb
index e8dbe1e082..08cc0cc51e 100644
--- a/packages/panoramixext/panoramixext_cvs.bb
+++ b/packages/panoramixext/panoramixext_cvs.bb
@@ -7,7 +7,7 @@ DESCRIPTION = "PanoramiX extension headers"
 SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=PanoramiXExt"
 S = "${WORKDIR}/PanoramiXExt"
 
-inherit autotools pkgconfig 
+inherit autotools pkgconfig
 
 do_stage() {
 	oe_runmake install prefix=${STAGING_DIR} \
diff --git a/packages/pciutils/pciutils_2.1.11.bb b/packages/pciutils/pciutils_2.1.11.bb
index 22bf67d03a..59c076280a 100644
--- a/packages/pciutils/pciutils_2.1.11.bb
+++ b/packages/pciutils/pciutils_2.1.11.bb
@@ -31,4 +31,4 @@ do_install_append () {
 	install -d ${D}/${prefix}/share
 	install -m 6440 ${WORKDIR}/${PN}-${PV}/pci.ids ${D}/${prefix}/share
 }
-		
+
diff --git a/packages/pcmcia-cs/pcmcia-cs_3.2.8.bb b/packages/pcmcia-cs/pcmcia-cs_3.2.8.bb
index 0bf20745d1..3f4472b501 100644
--- a/packages/pcmcia-cs/pcmcia-cs_3.2.8.bb
+++ b/packages/pcmcia-cs/pcmcia-cs_3.2.8.bb
@@ -85,7 +85,7 @@ do_install() {
 
 	# ensure that config.opts always exists, albeit empty
 	echo >> ${D}${sysconfdir}/pcmcia/config.opts
-	
+
 	install -m 0644 ${WORKDIR}/ide.opts ${D}${sysconfdir}/pcmcia/
 	install -m 0644 ${WORKDIR}/wireless.opts ${D}${sysconfdir}/pcmcia/
 	for i in etc/cis/*; do
diff --git a/packages/perl/perl-native_5.8.4.bb b/packages/perl/perl-native_5.8.4.bb
index f3486307b5..69555e0fac 100644
--- a/packages/perl/perl-native_5.8.4.bb
+++ b/packages/perl/perl-native_5.8.4.bb
@@ -27,7 +27,7 @@ do_configure () {
     -Ud_csh					\
     -Uusesfio					\
     -Uusenm -des
-    sed 's!${STAGING_DIR}/bin!${STAGING_BINDIR}!; 
+    sed 's!${STAGING_DIR}/bin!${STAGING_BINDIR}!;
          s!${STAGING_DIR}/lib!${STAGING_LIBDIR}!' < config.sh > config.sh.new
     mv config.sh.new config.sh
 }
diff --git a/packages/perl/perl-native_5.8.7.bb b/packages/perl/perl-native_5.8.7.bb
index 338d1617cc..eeef2a2bc4 100644
--- a/packages/perl/perl-native_5.8.7.bb
+++ b/packages/perl/perl-native_5.8.7.bb
@@ -31,7 +31,7 @@ do_configure () {
     -Ud_csh					\
     -Uusesfio					\
     -Uusenm -des
-    sed 's!${STAGING_DIR}/bin!${STAGING_BINDIR}!; 
+    sed 's!${STAGING_DIR}/bin!${STAGING_BINDIR}!;
          s!${STAGING_DIR}/lib!${STAGING_LIBDIR}!' < config.sh > config.sh.new
     mv config.sh.new config.sh
 }
diff --git a/packages/perl/perl_5.8.7.bb b/packages/perl/perl_5.8.7.bb
index 12450fbe74..2f37e6ccbe 100644
--- a/packages/perl/perl_5.8.7.bb
+++ b/packages/perl/perl_5.8.7.bb
@@ -43,7 +43,7 @@ do_configure() {
 	cp ${WORKDIR}/config.sh-sh3-linux .
 	cp ${WORKDIR}/config.sh-sh4-linux .
 	#perl insists on an extra config.sh for arm EABI
-	cp config.sh-arm-linux config.sh-arm-linux-gnueabi 
+	cp config.sh-arm-linux config.sh-arm-linux-gnueabi
 	# nslu2 LE uclibc builds do not work with the default config.sh
 	if test "${MACHINE}" = nslu2
 	then
diff --git a/packages/pine/pine_4.64.bb b/packages/pine/pine_4.64.bb
index a69f1c5a96..22a5cae098 100644
--- a/packages/pine/pine_4.64.bb
+++ b/packages/pine/pine_4.64.bb
@@ -11,7 +11,7 @@ S = "${WORKDIR}/pine${PV}"
 inherit autotools
 
 #
-# ~lart Pine's build structure... 
+# ~lart Pine's build structure...
 #
 PARALLEL_MAKE = ""
 EXTRA_OEMAKE = "-e"
diff --git a/packages/pkgconfig/pkgconfig_0.15.0.bb b/packages/pkgconfig/pkgconfig_0.15.0.bb
index 31fc7820fe..68d6a9917d 100644
--- a/packages/pkgconfig/pkgconfig_0.15.0.bb
+++ b/packages/pkgconfig/pkgconfig_0.15.0.bb
@@ -12,7 +12,7 @@ SRC_URI = "http://www.freedesktop.org/software/pkgconfig/releases/pkgconfig-${PV
            file://pkg.m4 \
            file://glibconfig-sysdefs.h"
 
-inherit autotools 
+inherit autotools
 
 acpaths = "-I ."
 do_configure_prepend () {
diff --git a/packages/pme/pme_1.0.3.bb b/packages/pme/pme_1.0.3.bb
index 2e1cab6117..75269c3432 100644
--- a/packages/pme/pme_1.0.3.bb
+++ b/packages/pme/pme_1.0.3.bb
@@ -5,7 +5,7 @@ DESCRIPTION = "PME is a C++ wrapper around the PCRE library."
 SRC_URI = "http://xaxxon.slackworks.com/pme/pme-${PV}.tar.gz"
 PR = "r1"
 
-inherit autotools 
+inherit autotools
 
 do_stage () {
 	oe_libinstall -a -so libpme ${STAGING_LIBDIR}
diff --git a/packages/poboxserver/poboxserver_1.2.5.bb b/packages/poboxserver/poboxserver_1.2.5.bb
index f9cbdf11e8..6278c920be 100644
--- a/packages/poboxserver/poboxserver_1.2.5.bb
+++ b/packages/poboxserver/poboxserver_1.2.5.bb
@@ -25,7 +25,7 @@ do_compile() {
 	oe_runmake
 	cp ${S}/dict/data/fugodic ${WORKDIR}/pbserver/fugodic.txt
 	oe_runmake -C ${WORKDIR}/pbserver dic
-	#patch -p1 
+	#patch -p1
 }
 
 do_install() {
diff --git a/packages/pocketcellar/pocketcellar_1.1.bb b/packages/pocketcellar/pocketcellar_1.1.bb
index 31f15dab59..84fc53fa87 100644
--- a/packages/pocketcellar/pocketcellar_1.1.bb
+++ b/packages/pocketcellar/pocketcellar_1.1.bb
@@ -21,7 +21,7 @@ do_install() {
         	   ${D}${palmtopdir}/apps/Applications \
         	   ${D}${palmtopdir}/pics \
 		   ${D}${palmtopdir}/data/PocketCellar
-			   
+
 	install -m 644 pkg-pcellar/home/QtPalmtop/data/PocketCellar/* ${D}${palmtopdir}/data/PocketCellar/
         install -m 755 pkg-cellar/home/QtPalmtop/bin/pocketcellar ${D}${palmtopdir}/bin/
         install -m 644 pocketcellar.desktop ${D}${palmtopdir}/apps/Applications/
diff --git a/packages/poppler/poppler_0.5.1.bb b/packages/poppler/poppler_0.5.1.bb
index f39e7fe8d9..d18a99f733 100644
--- a/packages/poppler/poppler_0.5.1.bb
+++ b/packages/poppler/poppler_0.5.1.bb
@@ -7,7 +7,7 @@ SRC_URI = "http://poppler.freedesktop.org/${PN}-${PV}.tar.gz"
 
 inherit autotools pkgconfig
 
-EXTRA_OECONF = "--enable-xpdf-headers  --disable-gtk-test --disable-poppler-qt"  
+EXTRA_OECONF = "--enable-xpdf-headers  --disable-gtk-test --disable-poppler-qt"
 
 do_stage() {
 	autotools_stage_all
diff --git a/packages/poppler/poppler_0.5.3.bb b/packages/poppler/poppler_0.5.3.bb
index f39e7fe8d9..d18a99f733 100644
--- a/packages/poppler/poppler_0.5.3.bb
+++ b/packages/poppler/poppler_0.5.3.bb
@@ -7,7 +7,7 @@ SRC_URI = "http://poppler.freedesktop.org/${PN}-${PV}.tar.gz"
 
 inherit autotools pkgconfig
 
-EXTRA_OECONF = "--enable-xpdf-headers  --disable-gtk-test --disable-poppler-qt"  
+EXTRA_OECONF = "--enable-xpdf-headers  --disable-gtk-test --disable-poppler-qt"
 
 do_stage() {
 	autotools_stage_all
diff --git a/packages/poppler/poppler_20060418.bb b/packages/poppler/poppler_20060418.bb
index 358e1df842..842536eda3 100644
--- a/packages/poppler/poppler_20060418.bb
+++ b/packages/poppler/poppler_20060418.bb
@@ -9,7 +9,7 @@ S = "${WORKDIR}/poppler"
 
 inherit autotools pkgconfig
 
-EXTRA_OECONF = "--enable-xpdf-headers  --disable-gtk-test --disable-poppler-qt"  
+EXTRA_OECONF = "--enable-xpdf-headers  --disable-gtk-test --disable-poppler-qt"
 
 do_stage() {
 	autotools_stage_all
diff --git a/packages/popt/popt_1.7.bb b/packages/popt/popt_1.7.bb
index 6f4dfd7acf..137b6744dc 100644
--- a/packages/popt/popt_1.7.bb
+++ b/packages/popt/popt_1.7.bb
@@ -9,7 +9,7 @@ SRC_URI = "ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.1.x/popt-${PV}.tar.gz \
 	   file://m4.patch;patch=1 \
 	   file://intl.patch;patch=1"
 
-inherit autotools 
+inherit autotools
 
 do_stage () {
 	oe_libinstall -a -so libpopt ${STAGING_LIBDIR}
diff --git a/packages/poptop/poptop_1.3.0.bb b/packages/poptop/poptop_1.3.0.bb
index a8bd12a31f..0ad4588ac4 100644
--- a/packages/poptop/poptop_1.3.0.bb
+++ b/packages/poptop/poptop_1.3.0.bb
@@ -4,12 +4,12 @@ This enables administrators to leverage the considerable benefits of both Micros
 The current release version supports Windows 95/98/Me/NT/2000/XP PPTP clients and Linux PPTP clients \
 For more info visit http://www.poptop.org/"
 
-HOMEPAGE    = "http://www.poptop.org/"	
+HOMEPAGE    = "http://www.poptop.org/"
 LICENSE     = "GPL"
 SECTION     = "network"
 PRIORITY    = "optional"
 DEPENDS     = "ppp"
-RDEPENDS    = "ppp"	
+RDEPENDS    = "ppp"
 
 PR = "r0"
 
@@ -20,7 +20,7 @@ S = "${WORKDIR}/pptpd-${PV}"
 
 
 
-do_install() {	
+do_install() {
 	install -d ${D}${sbindir}
 	install -d ${D}/${sysconfdir}
 	install -d ${D}/${sysconfdir}/ppp/
diff --git a/packages/portabase/beecrypt_3.1.0.bb b/packages/portabase/beecrypt_3.1.0.bb
index 734c7acfb3..bd61bad88e 100644
--- a/packages/portabase/beecrypt_3.1.0.bb
+++ b/packages/portabase/beecrypt_3.1.0.bb
@@ -21,7 +21,7 @@ cp ${WORKDIR}/config.m4 ${S}/gas/
 
 
 do_stage() {
-	
+
 #	oe_libinstall  -a  -C .libs libbeecrypt  ${STAGING_LIBDIR}
 	cp .libs/libbeecrypt.a ${STAGING_LIBDIR}/
 	install -d ${STAGING_INCDIR}/
diff --git a/packages/portabase/metakit_2.4.9.3.bb b/packages/portabase/metakit_2.4.9.3.bb
index c1ead5c0be..51aec57012 100644
--- a/packages/portabase/metakit_2.4.9.3.bb
+++ b/packages/portabase/metakit_2.4.9.3.bb
@@ -13,7 +13,7 @@ PR = "r1"
 do_configure_prepend() {
 
 	cp ${STAGING_DATADIR}/libtool/*.* ${S}/unix/scripts/
-	
+
 }
 do_configure () {
 
@@ -38,7 +38,7 @@ do_configure () {
                     --mandir=${mandir} \
                         ${EXTRA_OECONF} \
                     $@;
-	
+
 }
 
 
@@ -56,11 +56,11 @@ do_stage() {
 
 
 do_compile () {
-	cd builds	
+	cd builds
 	oe_runmake
 }
 
 do_install() {
-	
+
 	:
 }
diff --git a/packages/portabase/portabase_1.9.bb b/packages/portabase/portabase_1.9.bb
index 4ba5108a31..e6eb9716ff 100644
--- a/packages/portabase/portabase_1.9.bb
+++ b/packages/portabase/portabase_1.9.bb
@@ -15,7 +15,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/portabase/portabase_${PV}.tar.gz \
 
 S = "${WORKDIR}/portabase"
 
-inherit palmtop 
+inherit palmtop
 
 do_configure_prepend() {
 	find . -name "Makefile"|xargs rm -f
@@ -34,15 +34,15 @@ do_install() {
 			${D}${palmtopdir}/help/en
 	install -D -m 0755 ${APPNAME} ${D}${palmtopdir}/bin/${APPNAME}
 	install -m 0644 package/${APPNAME}.desktop ${D}${palmtopdir}/apps/Applications/${APPNAME}.desktop
-	 
+
 	install -D -m 0644 pics/PortaBase.png ${D}${palmtopdir}/pics/PortaBase.png
 	for f in calculator.png checked.png image.png note.png save.png save_disabled.png unchecked.png calendar.xpm QtaDatePickerNext.xpm QtaDatePickerPrev.xpm
 	do
 		install -D -m 0644 pics/$f ${D}${palmtopdir}/pics/${APPNAME}/$f
-	done         
+	done
 
 	install -D -m 0644 help/html/${APPNAME}.html ${D}${palmtopdir}/help/en/html/${APPNAME}.html
-} 
+}
 
 
 pkg_postinst() {
@@ -124,6 +124,6 @@ grep  $EXT $QPEDIR/etc/mime.types |
         echo >&2 "$EXT already assigned to $TYPE"
         exit 1
     fi
-) 
-} 
+)
+}
 
diff --git a/packages/portaudio/portaudio_0.0.19.bb b/packages/portaudio/portaudio_0.0.19.bb
index 3b4871ba17..e5bb5e850f 100644
--- a/packages/portaudio/portaudio_0.0.19.bb
+++ b/packages/portaudio/portaudio_0.0.19.bb
@@ -21,7 +21,7 @@ do_configure_prepend() {
     echo "SUBDIRS = lib tests" >>portaudio.pro
 
     mkdir -p lib
-    cat <<EOF >lib/lib.pro    
+    cat <<EOF >lib/lib.pro
 TEMPLATE = lib
 CONFIG = console debug warn_on
 TARGET = portaudio
@@ -51,7 +51,7 @@ EOF
     mkdir -p tests
     echo "TEMPLATE = subdirs" >tests/tests.pro
     echo "SUBDIRS = \\" >>tests/tests.pro
-    
+
     for test in ${TESTS}
     do
         mkdir -p tests/$test
diff --git a/packages/postfix/postfix_2.0.20.bb b/packages/postfix/postfix_2.0.20.bb
index c64afeea03..117fd2fc61 100644
--- a/packages/postfix/postfix_2.0.20.bb
+++ b/packages/postfix/postfix_2.0.20.bb
@@ -71,7 +71,7 @@ pkg_postinst () {
 }
 
 pkg_postrm () {
-	update-alternatives --remove sendmail ${sbindir}/sendmail 
+	update-alternatives --remove sendmail ${sbindir}/sendmail
 }
 
 # Exclude .debug directories from the main package
diff --git a/packages/postgresql/postgresql_8.1.4.bb b/packages/postgresql/postgresql_8.1.4.bb
index df6131161e..5843b2b3df 100644
--- a/packages/postgresql/postgresql_8.1.4.bb
+++ b/packages/postgresql/postgresql_8.1.4.bb
@@ -10,7 +10,7 @@ SRC_URI = "ftp://ftp.nl.postgresql.org/pub/mirror/postgresql/source/v${PV}/${P}.
 
 inherit autotools pkgconfig
 
-FILES_${PN}-doc += "${prefix}/doc/" 
+FILES_${PN}-doc += "${prefix}/doc/"
 
 do_compile_append() {
 cp /usr/sbin/zic ${S}/src/timezone/
diff --git a/packages/povray/povray_3.6.1.bb b/packages/povray/povray_3.6.1.bb
index 12e0a043b3..914d2eaad6 100644
--- a/packages/povray/povray_3.6.1.bb
+++ b/packages/povray/povray_3.6.1.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "The Persistence of Vision Raytracer is a high-quality, totally free tool for creating stunning three-dimensional graphics. "
 HOMEPAGE = "http://www.povray.org"
 SECTION = "console/graphics"
-#Make this a weak assigment to allow branding of the povray binary 
+#Make this a weak assigment to allow branding of the povray binary
 LICENSE = "povray"
 
 DEPENDS = "virtual/libx11 zlib jpeg libpng tiff"
@@ -20,7 +20,7 @@ PARALLEL_MAKE = ""
 #autoreconf breaks, so we'll skip that. The added advantage is that the patch to ./configure actually has effect
 do_configure() {
 	oe_runconf
-}	
+}
 
 PACKAGES += "${PN}-scenes ${PN}-ini ${PN}-icons ${PN}-scripts ${PN}-includes"
 
diff --git a/packages/ppp/ppp_2.4.3.bb b/packages/ppp/ppp_2.4.3.bb
index 535d7854da..ee41bcc646 100644
--- a/packages/ppp/ppp_2.4.3.bb
+++ b/packages/ppp/ppp_2.4.3.bb
@@ -20,7 +20,7 @@ SRC_URI = "http://ppp.samba.org/ftp/ppp/ppp-${PV}.tar.gz \
 	file://ip-down \
 	file://08setupdns \
 	file://92removedns"
-	
+
 SRC_URI_append_nylon = " file://ppp-tdbread.patch;patch=1"
 
 inherit autotools
diff --git a/packages/pptp-linux/pptp-linux_1.5.0.bb b/packages/pptp-linux/pptp-linux_1.5.0.bb
index d98478d780..7fdcd4d316 100644
--- a/packages/pptp-linux/pptp-linux_1.5.0.bb
+++ b/packages/pptp-linux/pptp-linux_1.5.0.bb
@@ -22,7 +22,7 @@ do_compile() {
 	oe_runmake
 }
 
-do_install() {	
+do_install() {
 	install -d ${D}${sbindir}
 	install -d ${D}/etc/
 	install -d ${D}/etc/ppp/
diff --git a/packages/prboom/prboom-devconfig.bb b/packages/prboom/prboom-devconfig.bb
index 602adcd444..063742ce97 100644
--- a/packages/prboom/prboom-devconfig.bb
+++ b/packages/prboom/prboom-devconfig.bb
@@ -12,6 +12,6 @@ FILES_${PN} = "/usr/share/games/doom/prboom.cfg"
 
 do_install() {
 	install -d ${D}/usr/share/games/doom/
-	
+
 	install -m 644 ${WORKDIR}/prboom.cfg ${D}/usr/share/games/doom/
 }
diff --git a/packages/prboom/prboom_2.2.6.bb b/packages/prboom/prboom_2.2.6.bb
index 15a0482d2e..f20aae2b64 100644
--- a/packages/prboom/prboom_2.2.6.bb
+++ b/packages/prboom/prboom_2.2.6.bb
@@ -9,12 +9,11 @@ PR = "r1"
 SRC_URI = "${SOURCEFORGE_MIRROR}/prboom/prboom-${PV}.tar.gz \
            file://m4.patch;patch=1"
 
-inherit autotools 
+inherit autotools
 
 EXTRA_OECONF = " --without-x --disable-sdltest --with-sdl-exec-prefix=${STAGING_DIR}/${BUILD_SYS} "
 
 do_configure() {
-	PATH=${STAGING_BINDIR}:$PATH
 	gnu-configize
 	oe_runconf
 }
@@ -22,7 +21,7 @@ do_configure() {
 do_install() {
         install -d ${D}${bindir} \
 		   ${D}${datadir}/games/doom
-		   
+
 	install -m 0755 src/prboom ${D}${bindir}/prboom
 	install -m 0644 data/prboom.wad ${D}${datadir}/games/doom/
 }
diff --git a/packages/prboom/prboom_2.3.1.bb b/packages/prboom/prboom_2.3.1.bb
index c14e733656..88d1f6a183 100644
--- a/packages/prboom/prboom_2.3.1.bb
+++ b/packages/prboom/prboom_2.3.1.bb
@@ -14,12 +14,11 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/prboom/prboom-${PV}.tar.gz \
            file://prboom.png \
            file://prboom.desktop"
 
-inherit autotools 
+inherit autotools
 
 EXTRA_OECONF = " --without-x --disable-sdltest --with-sdl-exec-prefix=${STAGING_DIR}/${BUILD_SYS} "
 
 do_configure() {
-	PATH=${STAGING_BINDIR}:$PATH
 	gnu-configize
 	oe_runconf
 }
diff --git a/packages/prelink/prelink_20060712.bb b/packages/prelink/prelink_20060712.bb
index a83ff1b61f..fcf990b7a0 100644
--- a/packages/prelink/prelink_20060712.bb
+++ b/packages/prelink/prelink_20060712.bb
@@ -19,7 +19,7 @@ S = "${WORKDIR}/prelink-0.0.${PV}"
 
 EXTRA_OECONF = "--disable-64bit"
 
-inherit autotools 
+inherit autotools
 
 do_install_append () {
 	install -d ${D}${sysconfdir}/cron.daily ${D}${sysconfdir}/default
diff --git a/packages/prism54/prism54-module_1.2.bb b/packages/prism54/prism54-module_1.2.bb
index f7b0c17fa9..41285fb412 100644
--- a/packages/prism54/prism54-module_1.2.bb
+++ b/packages/prism54/prism54-module_1.2.bb
@@ -27,7 +27,7 @@ do_compile() {
 do_install() {
 	unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
 	oe_runmake install
-	
+
 }
 
 FILES_${PN} = "/lib/modules/"
diff --git a/packages/privoxy/privoxy_3.0.3.bb b/packages/privoxy/privoxy_3.0.3.bb
index e475182f54..55580b1aa5 100644
--- a/packages/privoxy/privoxy_3.0.3.bb
+++ b/packages/privoxy/privoxy_3.0.3.bb
@@ -29,14 +29,14 @@ do_install() {
         mkdir -p ${D}/${sbindir}
         install -m 0755 ${S}/privoxy ${D}/${sbindir}
 
-        # Documentation        
+        # Documentation
         mkdir -p ${D}/${docdir}
         install -m 0755 -d ${S}/doc ${D}/${docdir}
 
         # Install man page
         mkdir -p ${D}/${mandir}
         install -m 0755 ${S}/privoxy.1 ${D}/${mandir}
-}           
+}
 
 
 do_install_append() {
diff --git a/packages/procps/procps_3.2.5.bb b/packages/procps/procps_3.2.5.bb
index 0aaf82a92a..5101874a5b 100644
--- a/packages/procps/procps_3.2.5.bb
+++ b/packages/procps/procps_3.2.5.bb
@@ -15,7 +15,7 @@ SRC_URI = "http://procps.sourceforge.net/procps-${PV}.tar.gz \
 
 
 
-inherit autotools 
+inherit autotools
 FILES = "${bindir}/top.${PN} ${base_bindir}/ps.${PN} ${bindir}/uptime.${PN} ${base_bindir}/kill.${PN} \
 	 ${bindir}/free.${PN} ${bindir}/w ${bindir}/watch ${bindir}/pgrep ${bindir}/pmap ${bindir}/pwdx \
 	 ${bindir}/snice ${bindir}/vmstat ${bindir}/slabtop ${bindir}/pkill ${bindir}/skill ${bindir}/tload \
@@ -35,7 +35,7 @@ do_install_append () {
 	mv ${D}${base_bindir}/ps ${D}${base_bindir}/ps.${PN}
 	mv ${D}${bindir}/free ${D}${bindir}/free.${PN}
 	mv ${D}${base_sbindir}/sysctl ${D}${base_sbindir}/sysctl.${PN}
-}	
+}
 
 pkg_postinst() {
 	update-alternatives --install ${bindir}/top top top.${PN} 90
diff --git a/packages/procps/procps_3.2.7.bb b/packages/procps/procps_3.2.7.bb
index 0aaf82a92a..5101874a5b 100644
--- a/packages/procps/procps_3.2.7.bb
+++ b/packages/procps/procps_3.2.7.bb
@@ -15,7 +15,7 @@ SRC_URI = "http://procps.sourceforge.net/procps-${PV}.tar.gz \
 
 
 
-inherit autotools 
+inherit autotools
 FILES = "${bindir}/top.${PN} ${base_bindir}/ps.${PN} ${bindir}/uptime.${PN} ${base_bindir}/kill.${PN} \
 	 ${bindir}/free.${PN} ${bindir}/w ${bindir}/watch ${bindir}/pgrep ${bindir}/pmap ${bindir}/pwdx \
 	 ${bindir}/snice ${bindir}/vmstat ${bindir}/slabtop ${bindir}/pkill ${bindir}/skill ${bindir}/tload \
@@ -35,7 +35,7 @@ do_install_append () {
 	mv ${D}${base_bindir}/ps ${D}${base_bindir}/ps.${PN}
 	mv ${D}${bindir}/free ${D}${bindir}/free.${PN}
 	mv ${D}${base_sbindir}/sysctl ${D}${base_sbindir}/sysctl.${PN}
-}	
+}
 
 pkg_postinst() {
 	update-alternatives --install ${bindir}/top top top.${PN} 90
diff --git a/packages/proj4/proj-4_4.9.bb b/packages/proj4/proj-4_4.9.bb
index cb8dcc5eea..1f7ea8c0b9 100644
--- a/packages/proj4/proj-4_4.9.bb
+++ b/packages/proj4/proj-4_4.9.bb
@@ -10,5 +10,5 @@ S = "${WORKDIR}/proj-4.${PV}"
 
 do_stage() {
 	autotools_stage_all
-}	
+}
 
diff --git a/packages/pth/pth_2.0.0.bb b/packages/pth/pth_2.0.0.bb
index a0c3056157..8c7f5772a4 100644
--- a/packages/pth/pth_2.0.0.bb
+++ b/packages/pth/pth_2.0.0.bb
@@ -6,7 +6,7 @@ PR = "r1"
 
 SRC_URI = "ftp://ftp.ossp.org/pkg/lib/pth/pth-${PV}.tar.gz"
 
-inherit autotools 
+inherit autotools
 
 do_configure() {
 	gnu-configize
diff --git a/packages/pth/pth_2.0.2.bb b/packages/pth/pth_2.0.2.bb
index 282db55b26..78c06bfd93 100644
--- a/packages/pth/pth_2.0.2.bb
+++ b/packages/pth/pth_2.0.2.bb
@@ -8,7 +8,7 @@ SRC_URI = "${GNU_MIRROR}/pth/pth-${PV}.tar.gz"
 
 PARALLEL_MAKE=""
 
-inherit autotools 
+inherit autotools
 
 do_configure() {
 	gnu-configize
diff --git a/packages/puzzles/puzzles_r6915.bb b/packages/puzzles/puzzles_r6915.bb
index 2c1d17dca8..4349a4154b 100644
--- a/packages/puzzles/puzzles_r6915.bb
+++ b/packages/puzzles/puzzles_r6915.bb
@@ -19,14 +19,14 @@ do_install () {
     install -d ${D}/${prefix}/
     install -d ${D}/${prefix}/games/
     oe_runmake install
-    
+
     install -d ${D}/${datadir}/
     install -d ${D}/${datadir}/applications/
     install -d ${D}/${datadir}/pixmaps/
 
     install ${WORKDIR}/game.png ${D}/${datadir}/pixmaps/
 
-    cd ${D}/${prefix}/games 
+    cd ${D}/${prefix}/games
     for prog in *; do
 	if [ -x $prog ]; then
 	    echo "making ${D}/${datadir}/applications/$prog.desktop"
diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20050911.bb b/packages/pvrusb2-mci/pvrusb2-mci_20050911.bb
index af89c52d3b..93fa743e53 100644
--- a/packages/pvrusb2-mci/pvrusb2-mci_20050911.bb
+++ b/packages/pvrusb2-mci/pvrusb2-mci_20050911.bb
@@ -2,9 +2,9 @@ require pvrusb2-mci.inc
 
 # It in fact requires these modules, but for now is using the local ones.
 # RDEPENDS = "kernel-module-tveeprom kernel-module-tuner kernel-module-msp3400 kernel-module-saa7115"
- 
+
 SRC_URI = "http://www.isely.net/downloads/pvrusb2-mci-20050911.tar.bz2 \
-           file://Makefile.patch;patch=1" 
+           file://Makefile.patch;patch=1"
 
 S = "${WORKDIR}/pvrusb2-mci-20050911/driver"
 
@@ -16,9 +16,9 @@ CFLAGS = "'-I${KERNEL_SOURCE}/include' \
 EXTRA_OEMAKE = "'CFLAGS=${CFLAGS}' \
                 'CC=${KERNEL_CC}' \
                 'LD=${KERNEL_LD}' \
-                'KDIR=${STAGING_KERNEL_DIR}'" 
+                'KDIR=${STAGING_KERNEL_DIR}'"
 
-do_install() {   
+do_install() {
         install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media
         install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media
 }
diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20050921.bb b/packages/pvrusb2-mci/pvrusb2-mci_20050921.bb
index 5939b10005..a62c6f3d42 100644
--- a/packages/pvrusb2-mci/pvrusb2-mci_20050921.bb
+++ b/packages/pvrusb2-mci/pvrusb2-mci_20050921.bb
@@ -18,7 +18,7 @@ EXTRA_OEMAKE = "'CFLAGS=${CFLAGS}' \
                 'LD=${KERNEL_LD}' \
                 'KDIR=${STAGING_KERNEL_DIR}'"
 
-do_install() {   
+do_install() {
         install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media
         install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media
 }
diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20051016.bb b/packages/pvrusb2-mci/pvrusb2-mci_20051016.bb
index 4cc77a9634..bd8070708e 100644
--- a/packages/pvrusb2-mci/pvrusb2-mci_20051016.bb
+++ b/packages/pvrusb2-mci/pvrusb2-mci_20051016.bb
@@ -3,9 +3,9 @@ require pvrusb2-mci.inc
 PR = "r1"
 # It in fact requires these modules, but for now is using the local ones.
 # RDEPENDS = "kernel-module-tveeprom kernel-module-tuner kernel-module-msp3400 kernel-module-saa7115"
- 
+
 SRC_URI = "http://www.isely.net/downloads/pvrusb2-mci-20051016.tar.bz2 \
-           file://Makefile.patch;patch=1" 
+           file://Makefile.patch;patch=1"
 
 S = "${WORKDIR}/pvrusb2-mci-20051016/driver"
 
@@ -17,9 +17,9 @@ CFLAGS = "'-I${KERNEL_SOURCE}/include' \
 EXTRA_OEMAKE = "'CFLAGS=${CFLAGS}' \
                 'CC=${KERNEL_CC}' \
                 'LD=${KERNEL_LD}' \
-                'KDIR=${STAGING_KERNEL_DIR}'" 
+                'KDIR=${STAGING_KERNEL_DIR}'"
 
-do_install() {   
+do_install() {
         install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media
         install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media
 }
diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20051113.bb b/packages/pvrusb2-mci/pvrusb2-mci_20051113.bb
index 4fc41c15d1..25a08d9bff 100644
--- a/packages/pvrusb2-mci/pvrusb2-mci_20051113.bb
+++ b/packages/pvrusb2-mci/pvrusb2-mci_20051113.bb
@@ -3,11 +3,11 @@ require pvrusb2-mci.inc
 PR = "r1"
 # It in fact requires these modules, but for now is using the local ones.
 # RDEPENDS = "kernel-module-tveeprom kernel-module-tuner kernel-module-msp3400 kernel-module-saa7115"
- 
+
 SRC_URI = "http://www.isely.net/downloads/pvrusb2-mci-20051113.tar.bz2"
 
 #SRC_URI = "http://www.isely.net/downloads/pvrusb2-mci-20051113.tar.bz2 \
-#           file://Makefile.patch;patch=1" 
+#           file://Makefile.patch;patch=1"
 
 S = "${WORKDIR}/pvrusb2-mci-20051113"
 
@@ -19,18 +19,18 @@ CFLAGS = "'-I${KERNEL_SOURCE}/include' \
 EXTRA_OEMAKE = "'CFLAGS=${CFLAGS}' \
                 'CC=${KERNEL_CC}' \
                 'LD=${KERNEL_LD}' \
-                'KDIR=${STAGING_KERNEL_DIR}'" 
+                'KDIR=${STAGING_KERNEL_DIR}'"
 
 export TARGET_LDFLAGS = "-L${STAGING_DIR}/${TARGET_SYS}/lib \
                          -Wl,-rpath-link,${STAGING_DIR}/${TARGET_SYS}/lib"
 
 
-do_compile() {   
+do_compile() {
 	cd ivtv; oe_runmake
-	cd ../driver; oe_runmake 
+	cd ../driver; oe_runmake
 }
 
-do_install() {   
+do_install() {
         install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media
         install -m 0644 ivtv/*${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media
         install -m 0644 driver/*${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media
diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20060101.bb b/packages/pvrusb2-mci/pvrusb2-mci_20060101.bb
index a3808d38d8..9f91a111ad 100644
--- a/packages/pvrusb2-mci/pvrusb2-mci_20060101.bb
+++ b/packages/pvrusb2-mci/pvrusb2-mci_20060101.bb
@@ -4,7 +4,7 @@ PR = "r1"
 # It in fact requires these modules, but for now is using the local ones.
 # RRECOMMEND = "kernel-module-tveeprom kernel-module-tuner kernel-module-msp3400 kernel-module-saa7115"
 RRECOMMEND = "kernel-module-tda9887"
- 
+
 SRC_URI = "http://www.isely.net/downloads/pvrusb2-mci-20060101.tar.bz2"
 
 S = "${WORKDIR}/pvrusb2-mci-20060101"
@@ -17,18 +17,18 @@ CFLAGS = "'-I${KERNEL_SOURCE}/include' \
 EXTRA_OEMAKE = "'CFLAGS=${CFLAGS}' \
                 'CC=${KERNEL_CC}' \
                 'LD=${KERNEL_LD}' \
-                'KDIR=${STAGING_KERNEL_DIR}'" 
+                'KDIR=${STAGING_KERNEL_DIR}'"
 
 export TARGET_LDFLAGS = "-L${STAGING_DIR}/${TARGET_SYS}/lib \
                          -Wl,-rpath-link,${STAGING_DIR}/${TARGET_SYS}/lib"
 
 
-do_compile() {   
+do_compile() {
 	cd ivtv; oe_runmake
-	cd ../driver; oe_runmake 
+	cd ../driver; oe_runmake
 }
 
-do_install() {   
+do_install() {
         install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media
         install -m 0644 ivtv/*${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media
         install -m 0644 driver/*${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media
diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20060103.bb b/packages/pvrusb2-mci/pvrusb2-mci_20060103.bb
index cc0bedd545..d8c17cbde6 100644
--- a/packages/pvrusb2-mci/pvrusb2-mci_20060103.bb
+++ b/packages/pvrusb2-mci/pvrusb2-mci_20060103.bb
@@ -4,7 +4,7 @@ PR = "r1"
 # It in fact requires these modules, but for now is using the local ones.
 # RRECOMMEND = "kernel-module-tveeprom kernel-module-tuner kernel-module-msp3400 kernel-module-saa7115"
 RRECOMMEND = "kernel-module-tda9887"
- 
+
 SRC_URI = "http://www.isely.net/downloads/pvrusb2-mci-20060103.tar.bz2"
 
 S = "${WORKDIR}/pvrusb2-mci-20060103"
@@ -17,18 +17,18 @@ CFLAGS = "'-I${KERNEL_SOURCE}/include' \
 EXTRA_OEMAKE = "'CFLAGS=${CFLAGS}' \
                 'CC=${KERNEL_CC}' \
                 'LD=${KERNEL_LD}' \
-                'KDIR=${STAGING_KERNEL_DIR}'" 
+                'KDIR=${STAGING_KERNEL_DIR}'"
 
 export TARGET_LDFLAGS = "-L${STAGING_DIR}/${TARGET_SYS}/lib \
                          -Wl,-rpath-link,${STAGING_DIR}/${TARGET_SYS}/lib"
 
 
-do_compile() {   
+do_compile() {
 	cd ivtv; oe_runmake
-	cd ../driver; oe_runmake 
+	cd ../driver; oe_runmake
 }
 
-do_install() {   
+do_install() {
         install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media
         install -m 0644 ivtv/*${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media
         install -m 0644 driver/*${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media
diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20060121.bb b/packages/pvrusb2-mci/pvrusb2-mci_20060121.bb
index 9a32e497f4..fa8a68432d 100644
--- a/packages/pvrusb2-mci/pvrusb2-mci_20060121.bb
+++ b/packages/pvrusb2-mci/pvrusb2-mci_20060121.bb
@@ -4,7 +4,7 @@ PR = "r1"
 # It in fact requires these modules, but for now is using the local ones.
 # RRECOMMEND = "kernel-module-tveeprom kernel-module-tuner kernel-module-msp3400 kernel-module-saa7115"
 RRECOMMEND = "kernel-module-tda9887"
- 
+
 SRC_URI = "http://www.isely.net/downloads/pvrusb2-mci-20060121.tar.bz2"
 
 S = "${WORKDIR}/pvrusb2-mci-20060121"
@@ -17,18 +17,18 @@ CFLAGS = "'-I${KERNEL_SOURCE}/include' \
 EXTRA_OEMAKE = "'CFLAGS=${CFLAGS}' \
                 'CC=${KERNEL_CC}' \
                 'LD=${KERNEL_LD}' \
-                'KDIR=${STAGING_KERNEL_DIR}'" 
+                'KDIR=${STAGING_KERNEL_DIR}'"
 
 export TARGET_LDFLAGS = "-L${STAGING_DIR}/${TARGET_SYS}/lib \
                          -Wl,-rpath-link,${STAGING_DIR}/${TARGET_SYS}/lib"
 
 
-do_compile() {   
+do_compile() {
 	cd ivtv; oe_runmake
-	cd ../driver; oe_runmake 
+	cd ../driver; oe_runmake
 }
 
-do_install() {   
+do_install() {
         install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media
         install -m 0644 ivtv/*${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media
         install -m 0644 driver/*${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media
diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20060209.bb b/packages/pvrusb2-mci/pvrusb2-mci_20060209.bb
index 1f32dc3f4b..e80430f7d0 100644
--- a/packages/pvrusb2-mci/pvrusb2-mci_20060209.bb
+++ b/packages/pvrusb2-mci/pvrusb2-mci_20060209.bb
@@ -2,9 +2,9 @@ require pvrusb2-mci.inc
 
 PR = "r2"
 RRECOMMENDS = "kernel-module-tveeprom kernel-module-tuner kernel-module-msp3400 kernel-module-saa7115 kernel-module-tda9887"
- 
+
 SRC_URI = "http://www.isely.net/downloads/pvrusb2-mci-${PV}.tar.bz2 \
-           file://Makefile.patch;patch=1" 
+           file://Makefile.patch;patch=1"
 
 S = "${WORKDIR}/pvrusb2-mci-${PV}/driver"
 
@@ -17,12 +17,12 @@ CFLAGS = "'-I${KERNEL_SOURCE}/include' \
 EXTRA_OEMAKE = "'V=1' 'CFLAGS=${CFLAGS}' \
                 'CC=${KERNEL_CC}' \
                 'LD=${KERNEL_LD}' \
-                'KDIR=${STAGING_KERNEL_DIR}'" 
+                'KDIR=${STAGING_KERNEL_DIR}'"
 
 export TARGET_LDFLAGS = "-L${STAGING_DIR}/${TARGET_SYS}/lib \
                          -Wl,-rpath-link,${STAGING_DIR}/${TARGET_SYS}/lib"
 
-do_install() {   
+do_install() {
         install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media
         install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media
 }
diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20060326.bb b/packages/pvrusb2-mci/pvrusb2-mci_20060326.bb
index 190002cb7b..ac5b82be94 100644
--- a/packages/pvrusb2-mci/pvrusb2-mci_20060326.bb
+++ b/packages/pvrusb2-mci/pvrusb2-mci_20060326.bb
@@ -2,9 +2,9 @@ require pvrusb2-mci.inc
 
 PR = "r1"
 RRECOMMENDS = "kernel-module-tveeprom kernel-module-tuner kernel-module-msp3400 kernel-module-saa7115 kernel-module-tda9887"
- 
+
 SRC_URI = "http://www.isely.net/downloads/pvrusb2-mci-${PV}.tar.bz2 \
-           file://Makefile.patch;patch=1" 
+           file://Makefile.patch;patch=1"
 
 S = "${WORKDIR}/pvrusb2-mci-${PV}/driver"
 
@@ -17,12 +17,12 @@ CFLAGS = "'-I${KERNEL_SOURCE}/include' \
 EXTRA_OEMAKE = "'V=1' 'CFLAGS=${CFLAGS}' \
                 'CC=${KERNEL_CC}' \
                 'LD=${KERNEL_LD}' \
-                'KDIR=${STAGING_KERNEL_DIR}'" 
+                'KDIR=${STAGING_KERNEL_DIR}'"
 
 export TARGET_LDFLAGS = "-L${STAGING_DIR}/${TARGET_SYS}/lib \
                          -Wl,-rpath-link,${STAGING_DIR}/${TARGET_SYS}/lib"
 
-do_install() {   
+do_install() {
         install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media
         install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media
 }
diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20060329.bb b/packages/pvrusb2-mci/pvrusb2-mci_20060329.bb
index de86b31f1b..8f1cc4465b 100644
--- a/packages/pvrusb2-mci/pvrusb2-mci_20060329.bb
+++ b/packages/pvrusb2-mci/pvrusb2-mci_20060329.bb
@@ -2,9 +2,9 @@ require pvrusb2-mci.inc
 
 PR = "r1"
 RRECOMMENDS = "kernel-module-tveeprom kernel-module-tuner kernel-module-msp3400 kernel-module-saa7115 kernel-module-tda9887"
- 
+
 SRC_URI = "http://www.isely.net/downloads/pvrusb2-mci-${PV}.tar.bz2 \
-           file://Makefile.patch;patch=1" 
+           file://Makefile.patch;patch=1"
 
 S = "${WORKDIR}/pvrusb2-mci-${PV}/driver"
 
@@ -20,12 +20,12 @@ CFLAGS_append_armeb = " '-D__LINUX_ARM_ARCH__=5' "
 EXTRA_OEMAKE = "'V=1' 'CFLAGS=${CFLAGS}' \
                 'CC=${KERNEL_CC}' \
                 'LD=${KERNEL_LD}' \
-                'KDIR=${STAGING_KERNEL_DIR}'" 
+                'KDIR=${STAGING_KERNEL_DIR}'"
 
 export TARGET_LDFLAGS = "-L${STAGING_DIR}/${TARGET_SYS}/lib \
                          -Wl,-rpath-link,${STAGING_DIR}/${TARGET_SYS}/lib"
 
-do_install() {   
+do_install() {
         install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media
         install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media
 }
diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20060423.bb b/packages/pvrusb2-mci/pvrusb2-mci_20060423.bb
index de86b31f1b..8f1cc4465b 100644
--- a/packages/pvrusb2-mci/pvrusb2-mci_20060423.bb
+++ b/packages/pvrusb2-mci/pvrusb2-mci_20060423.bb
@@ -2,9 +2,9 @@ require pvrusb2-mci.inc
 
 PR = "r1"
 RRECOMMENDS = "kernel-module-tveeprom kernel-module-tuner kernel-module-msp3400 kernel-module-saa7115 kernel-module-tda9887"
- 
+
 SRC_URI = "http://www.isely.net/downloads/pvrusb2-mci-${PV}.tar.bz2 \
-           file://Makefile.patch;patch=1" 
+           file://Makefile.patch;patch=1"
 
 S = "${WORKDIR}/pvrusb2-mci-${PV}/driver"
 
@@ -20,12 +20,12 @@ CFLAGS_append_armeb = " '-D__LINUX_ARM_ARCH__=5' "
 EXTRA_OEMAKE = "'V=1' 'CFLAGS=${CFLAGS}' \
                 'CC=${KERNEL_CC}' \
                 'LD=${KERNEL_LD}' \
-                'KDIR=${STAGING_KERNEL_DIR}'" 
+                'KDIR=${STAGING_KERNEL_DIR}'"
 
 export TARGET_LDFLAGS = "-L${STAGING_DIR}/${TARGET_SYS}/lib \
                          -Wl,-rpath-link,${STAGING_DIR}/${TARGET_SYS}/lib"
 
-do_install() {   
+do_install() {
         install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media
         install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media
 }
diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20060517.bb b/packages/pvrusb2-mci/pvrusb2-mci_20060517.bb
index de86b31f1b..8f1cc4465b 100644
--- a/packages/pvrusb2-mci/pvrusb2-mci_20060517.bb
+++ b/packages/pvrusb2-mci/pvrusb2-mci_20060517.bb
@@ -2,9 +2,9 @@ require pvrusb2-mci.inc
 
 PR = "r1"
 RRECOMMENDS = "kernel-module-tveeprom kernel-module-tuner kernel-module-msp3400 kernel-module-saa7115 kernel-module-tda9887"
- 
+
 SRC_URI = "http://www.isely.net/downloads/pvrusb2-mci-${PV}.tar.bz2 \
-           file://Makefile.patch;patch=1" 
+           file://Makefile.patch;patch=1"
 
 S = "${WORKDIR}/pvrusb2-mci-${PV}/driver"
 
@@ -20,12 +20,12 @@ CFLAGS_append_armeb = " '-D__LINUX_ARM_ARCH__=5' "
 EXTRA_OEMAKE = "'V=1' 'CFLAGS=${CFLAGS}' \
                 'CC=${KERNEL_CC}' \
                 'LD=${KERNEL_LD}' \
-                'KDIR=${STAGING_KERNEL_DIR}'" 
+                'KDIR=${STAGING_KERNEL_DIR}'"
 
 export TARGET_LDFLAGS = "-L${STAGING_DIR}/${TARGET_SYS}/lib \
                          -Wl,-rpath-link,${STAGING_DIR}/${TARGET_SYS}/lib"
 
-do_install() {   
+do_install() {
         install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media
         install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media
 }
diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20060607.bb b/packages/pvrusb2-mci/pvrusb2-mci_20060607.bb
index de86b31f1b..8f1cc4465b 100644
--- a/packages/pvrusb2-mci/pvrusb2-mci_20060607.bb
+++ b/packages/pvrusb2-mci/pvrusb2-mci_20060607.bb
@@ -2,9 +2,9 @@ require pvrusb2-mci.inc
 
 PR = "r1"
 RRECOMMENDS = "kernel-module-tveeprom kernel-module-tuner kernel-module-msp3400 kernel-module-saa7115 kernel-module-tda9887"
- 
+
 SRC_URI = "http://www.isely.net/downloads/pvrusb2-mci-${PV}.tar.bz2 \
-           file://Makefile.patch;patch=1" 
+           file://Makefile.patch;patch=1"
 
 S = "${WORKDIR}/pvrusb2-mci-${PV}/driver"
 
@@ -20,12 +20,12 @@ CFLAGS_append_armeb = " '-D__LINUX_ARM_ARCH__=5' "
 EXTRA_OEMAKE = "'V=1' 'CFLAGS=${CFLAGS}' \
                 'CC=${KERNEL_CC}' \
                 'LD=${KERNEL_LD}' \
-                'KDIR=${STAGING_KERNEL_DIR}'" 
+                'KDIR=${STAGING_KERNEL_DIR}'"
 
 export TARGET_LDFLAGS = "-L${STAGING_DIR}/${TARGET_SYS}/lib \
                          -Wl,-rpath-link,${STAGING_DIR}/${TARGET_SYS}/lib"
 
-do_install() {   
+do_install() {
         install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media
         install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media
 }
diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20060626.bb b/packages/pvrusb2-mci/pvrusb2-mci_20060626.bb
index dae4ee5bb3..b2ad76d007 100644
--- a/packages/pvrusb2-mci/pvrusb2-mci_20060626.bb
+++ b/packages/pvrusb2-mci/pvrusb2-mci_20060626.bb
@@ -10,11 +10,11 @@ RRECOMMENDS = "kernel-module-tveeprom \
 	kernel-module-v4l1-compat \
 	kernel-module-v4l2-common \
 	kernel-module-videodev"
- 
+
 SRC_URI = "http://www.isely.net/downloads/pvrusb2-mci-${PV}.tar.bz2 \
            file://hotplug.functions \
            file://firmware.hotplug \
-           file://Makefile.patch;patch=1" 
+           file://Makefile.patch;patch=1"
 
 S = "${WORKDIR}/pvrusb2-mci-${PV}/driver"
 
@@ -30,12 +30,12 @@ CFLAGS_append_armeb = " '-D__LINUX_ARM_ARCH__=5' "
 EXTRA_OEMAKE = "'V=1' 'CFLAGS=${CFLAGS}' \
                 'CC=${KERNEL_CC}' \
                 'LD=${KERNEL_LD}' \
-                'KDIR=${STAGING_KERNEL_DIR}'" 
+                'KDIR=${STAGING_KERNEL_DIR}'"
 
 export TARGET_LDFLAGS = "-L${STAGING_DIR}/${TARGET_SYS}/lib \
                          -Wl,-rpath-link,${STAGING_DIR}/${TARGET_SYS}/lib"
 
-do_install() {   
+do_install() {
         install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media
         install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media
 	mkdir -p ${D}/etc/hotplug.d/firmware
diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20060702.bb b/packages/pvrusb2-mci/pvrusb2-mci_20060702.bb
index dae4ee5bb3..b2ad76d007 100644
--- a/packages/pvrusb2-mci/pvrusb2-mci_20060702.bb
+++ b/packages/pvrusb2-mci/pvrusb2-mci_20060702.bb
@@ -10,11 +10,11 @@ RRECOMMENDS = "kernel-module-tveeprom \
 	kernel-module-v4l1-compat \
 	kernel-module-v4l2-common \
 	kernel-module-videodev"
- 
+
 SRC_URI = "http://www.isely.net/downloads/pvrusb2-mci-${PV}.tar.bz2 \
            file://hotplug.functions \
            file://firmware.hotplug \
-           file://Makefile.patch;patch=1" 
+           file://Makefile.patch;patch=1"
 
 S = "${WORKDIR}/pvrusb2-mci-${PV}/driver"
 
@@ -30,12 +30,12 @@ CFLAGS_append_armeb = " '-D__LINUX_ARM_ARCH__=5' "
 EXTRA_OEMAKE = "'V=1' 'CFLAGS=${CFLAGS}' \
                 'CC=${KERNEL_CC}' \
                 'LD=${KERNEL_LD}' \
-                'KDIR=${STAGING_KERNEL_DIR}'" 
+                'KDIR=${STAGING_KERNEL_DIR}'"
 
 export TARGET_LDFLAGS = "-L${STAGING_DIR}/${TARGET_SYS}/lib \
                          -Wl,-rpath-link,${STAGING_DIR}/${TARGET_SYS}/lib"
 
-do_install() {   
+do_install() {
         install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media
         install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media
 	mkdir -p ${D}/etc/hotplug.d/firmware
diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20060726.bb b/packages/pvrusb2-mci/pvrusb2-mci_20060726.bb
index dae4ee5bb3..b2ad76d007 100644
--- a/packages/pvrusb2-mci/pvrusb2-mci_20060726.bb
+++ b/packages/pvrusb2-mci/pvrusb2-mci_20060726.bb
@@ -10,11 +10,11 @@ RRECOMMENDS = "kernel-module-tveeprom \
 	kernel-module-v4l1-compat \
 	kernel-module-v4l2-common \
 	kernel-module-videodev"
- 
+
 SRC_URI = "http://www.isely.net/downloads/pvrusb2-mci-${PV}.tar.bz2 \
            file://hotplug.functions \
            file://firmware.hotplug \
-           file://Makefile.patch;patch=1" 
+           file://Makefile.patch;patch=1"
 
 S = "${WORKDIR}/pvrusb2-mci-${PV}/driver"
 
@@ -30,12 +30,12 @@ CFLAGS_append_armeb = " '-D__LINUX_ARM_ARCH__=5' "
 EXTRA_OEMAKE = "'V=1' 'CFLAGS=${CFLAGS}' \
                 'CC=${KERNEL_CC}' \
                 'LD=${KERNEL_LD}' \
-                'KDIR=${STAGING_KERNEL_DIR}'" 
+                'KDIR=${STAGING_KERNEL_DIR}'"
 
 export TARGET_LDFLAGS = "-L${STAGING_DIR}/${TARGET_SYS}/lib \
                          -Wl,-rpath-link,${STAGING_DIR}/${TARGET_SYS}/lib"
 
-do_install() {   
+do_install() {
         install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media
         install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media
 	mkdir -p ${D}/etc/hotplug.d/firmware
diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20060903.bb b/packages/pvrusb2-mci/pvrusb2-mci_20060903.bb
index 298c529924..adf2fe6c5e 100644
--- a/packages/pvrusb2-mci/pvrusb2-mci_20060903.bb
+++ b/packages/pvrusb2-mci/pvrusb2-mci_20060903.bb
@@ -34,7 +34,7 @@ EXTRA_OEMAKE = "'V=1' 'CFLAGS=${CFLAGS}' \
 export TARGET_LDFLAGS = "-L${STAGING_DIR}/${TARGET_SYS}/lib \
                          -Wl,-rpath-link,${STAGING_DIR}/${TARGET_SYS}/lib"
 
-do_install() {   
+do_install() {
         install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media
         install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media
 	mkdir -p ${D}/etc/hotplug.d/firmware
diff --git a/packages/pwc/pwc_10.0.12-rc1.bb b/packages/pwc/pwc_10.0.12-rc1.bb
index f70640c27f..626a8ef47a 100644
--- a/packages/pwc/pwc_10.0.12-rc1.bb
+++ b/packages/pwc/pwc_10.0.12-rc1.bb
@@ -6,7 +6,7 @@ LICENSE = "GPL"
 PR = "r0"
 
 SRC_URI = "http://www.saillard.org/linux/pwc/files/pwc-${PV}.tar.bz2 \
-           file://Makefile.patch;patch=1" 
+           file://Makefile.patch;patch=1"
 
 S = "${WORKDIR}/pwc-${PV}"
 
@@ -21,12 +21,12 @@ CFLAGS_append_armeb = " '-D__LINUX_ARM_ARCH__=5' "
 EXTRA_OEMAKE = "'V=1' 'CFLAGS=${CFLAGS}' \
                 'CC=${KERNEL_CC}' \
                 'LD=${KERNEL_LD}' \
-                'KDIR=${STAGING_KERNEL_DIR}'" 
+                'KDIR=${STAGING_KERNEL_DIR}'"
 
 export TARGET_LDFLAGS = "-L${STAGING_DIR}/${TARGET_SYS}/lib \
                          -rpath-link ${STAGING_DIR}/${TARGET_SYS}/lib"
 
-do_install() {   
+do_install() {
         install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media
         install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media
 }
diff --git a/packages/pwc/pwc_10.0.6a.bb b/packages/pwc/pwc_10.0.6a.bb
index 9777a14955..26213ee84a 100644
--- a/packages/pwc/pwc_10.0.6a.bb
+++ b/packages/pwc/pwc_10.0.6a.bb
@@ -20,10 +20,10 @@ do_compile () {
         unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
         oe_runmake 'KDIR=${STAGING_KERNEL_DIR}' \
                    'CC=${KERNEL_CC}' \
-                   'LD=${KERNEL_LD}' 
+                   'LD=${KERNEL_LD}'
 }
 
-do_install() {   
+do_install() {
         install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media
         install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media
 }
diff --git a/packages/pwc/pwc_10.0.7a.bb b/packages/pwc/pwc_10.0.7a.bb
index f5a876afc2..b3adc80ee5 100644
--- a/packages/pwc/pwc_10.0.7a.bb
+++ b/packages/pwc/pwc_10.0.7a.bb
@@ -19,10 +19,10 @@ do_compile () {
         unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
         oe_runmake 'KDIR=${STAGING_KERNEL_DIR}' \
                    'CC=${KERNEL_CC}' \
-                   'LD=${KERNEL_LD}' 
+                   'LD=${KERNEL_LD}'
 }
 
-do_install() {   
+do_install() {
         install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media
         install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media
 }
diff --git a/packages/pwc/pwc_10.0.9-rc1.bb b/packages/pwc/pwc_10.0.9-rc1.bb
index 7632ba5ebd..6067c0b1aa 100644
--- a/packages/pwc/pwc_10.0.9-rc1.bb
+++ b/packages/pwc/pwc_10.0.9-rc1.bb
@@ -19,10 +19,10 @@ do_compile () {
         unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
         oe_runmake 'KDIR=${STAGING_KERNEL_DIR}' \
                    'CC=${KERNEL_CC}' \
-                   'LD=${KERNEL_LD}' 
+                   'LD=${KERNEL_LD}'
 }
 
-do_install() {   
+do_install() {
         install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media
         install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media
 }
diff --git a/packages/pwlib/pwlib_1.6.6.4.bb b/packages/pwlib/pwlib_1.6.6.4.bb
index efb88b35ee..c41400c001 100644
--- a/packages/pwlib/pwlib_1.6.6.4.bb
+++ b/packages/pwlib/pwlib_1.6.6.4.bb
@@ -100,9 +100,9 @@ do_stage() {
 	done
 
 	install -d ${STAGING_LIBDIR}
-	
+
 	oe_libinstall -C lib libpt_linux_x86_r ${STAGING_LIBDIR}
-	
+
 	ln -sf ${STAGING_LIBDIR}/libpt_linux_x86_r.so ${STAGING_LIBDIR}/libpt.so
 
 	install -d ${STAGING_DATADIR}/pwlib/make
diff --git a/packages/python/python-imaging_1.1.5.bb b/packages/python/python-imaging_1.1.5.bb
index 6814287768..11b0705593 100644
--- a/packages/python/python-imaging_1.1.5.bb
+++ b/packages/python/python-imaging_1.1.5.bb
@@ -26,7 +26,7 @@ do_install() {
 
     export STAGING_LIBDIR=${STAGING_LIBDIR}
     export STAGING_INCDIR=${STAGING_INCDIR}
-    
+
     distutils_do_install
 
     install -d ${D}${datadir}/doc/${PN}/html/
diff --git a/packages/python/python-pyqwt_3.10.bb b/packages/python/python-pyqwt_3.10.bb
index 6c603df852..d78bba7e8a 100644
--- a/packages/python/python-pyqwt_3.10.bb
+++ b/packages/python/python-pyqwt_3.10.bb
@@ -18,7 +18,7 @@ inherit palmtop sip distutils-base
 QMAKE_PROFILES = "pyqwt.pro"
 EXTRA_SIPTAGS = "-tWS_QWS -tQtPE_1_6_0 -tQt_2_3_1"
 SIP_MODULES = "qwt"
-SIP_FEATURES = "${WORKDIR}/features"   
+SIP_FEATURES = "${WORKDIR}/features"
 EXTRA_OEMAKE = " MAKEFLAGS= "
 
 EXTRA_QMAKEVARS_POST += "TARGET=qwt \
@@ -34,7 +34,7 @@ EXTRA_QMAKEVARS_POST += "TARGET=qwt \
 
 do_generate_prepend() {
     echo -e "TEMPLATE=subdirs\nSUBDIRS=qwt\n" >pyqwt.pro
-    
+
     echo "%Makefile qwt.pro.in" >>sip/qwtmod.sip
     echo "TEMPLATE=lib" >>sip/qwtmod.sip
     echo 'SOURCES = $B' >>sip/qwtmod.sip
diff --git a/packages/python/python-pyzeroconf_0.12.bb b/packages/python/python-pyzeroconf_0.12.bb
index d2efbbddf2..a5e439feb6 100644
--- a/packages/python/python-pyzeroconf_0.12.bb
+++ b/packages/python/python-pyzeroconf_0.12.bb
@@ -10,7 +10,7 @@ S = "${WORKDIR}/pyzeroconf-${PV}"
 inherit distutils-base
 
 do_install() {
-	
+
    install -d ${D}${libdir}
    install -d ${D}${libdir}/${PYTHON_DIR}
    install -d ${D}${libdir}/${PYTHON_DIR}/site-packages
diff --git a/packages/python/python-quicklauncher_0.0.1.bb b/packages/python/python-quicklauncher_0.0.1.bb
index 33609dfe08..10ee54deb1 100644
--- a/packages/python/python-quicklauncher_0.0.1.bb
+++ b/packages/python/python-quicklauncher_0.0.1.bb
@@ -22,5 +22,5 @@ do_install() {
 	install -d ${D}${libdir}/${PYTHON_DIR}/site-packages/quicklauncher/
 	install -m 0755 testapp.py ${D}${libdir}/${PYTHON_DIR}/site-packages/quicklauncher/
 }
- 
+
 
diff --git a/packages/qc-usb/qc-usb-messenger_0.8.bb b/packages/qc-usb/qc-usb-messenger_0.8.bb
index 3353af97f7..18c3e64d73 100644
--- a/packages/qc-usb/qc-usb-messenger_0.8.bb
+++ b/packages/qc-usb/qc-usb-messenger_0.8.bb
@@ -18,10 +18,10 @@ do_compile () {
                    'CC="${KERNEL_CC}"' \
                    'LD="${KERNEL_LD}"' \
 		   'LINUX_DIR=${STAGING_KERNEL_DIR}' \
-		   all 
+		   all
 }
 
-do_install() {   
+do_install() {
         install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/misc
         install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/misc
 }
diff --git a/packages/qc-usb/qc-usb-messenger_1.1.bb b/packages/qc-usb/qc-usb-messenger_1.1.bb
index 311f572f0f..19f0e766ff 100644
--- a/packages/qc-usb/qc-usb-messenger_1.1.bb
+++ b/packages/qc-usb/qc-usb-messenger_1.1.bb
@@ -17,10 +17,10 @@ do_compile () {
                    'CC="${KERNEL_CC}"' \
                    'LD="${KERNEL_LD}"' \
 		   'LINUX_DIR=${STAGING_KERNEL_DIR}' \
-		   all 
+		   all
 }
 
-do_install() {   
+do_install() {
         install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/misc
         install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/misc
 }
diff --git a/packages/qclockchange/qclockchange_0.1a.bb b/packages/qclockchange/qclockchange_0.1a.bb
index c04da5335a..0061c830c9 100644
--- a/packages/qclockchange/qclockchange_0.1a.bb
+++ b/packages/qclockchange/qclockchange_0.1a.bb
@@ -18,5 +18,5 @@ do_install() {
 
 	install -m 0755 qclockchange ${D}${palmtopdir}/bin/qclockchange
 	install -m 0644 ipkg/opt/QtPalmtop/pics/qclockchange.png ${D}${palmtopdir}/pics/qclockchange.png
-	install -m 0644 ipkg/opt/QtPalmtop/apps/Settings/qclockchange.desktop ${D}${palmtopdir}/apps/Settings/qclockchange.desktop	
+	install -m 0644 ipkg/opt/QtPalmtop/apps/Settings/qclockchange.desktop ${D}${palmtopdir}/apps/Settings/qclockchange.desktop
 }
diff --git a/packages/qemu/qemu-native.inc b/packages/qemu/qemu-native.inc
index d0d6604ec5..4adc4cb4c0 100644
--- a/packages/qemu/qemu-native.inc
+++ b/packages/qemu/qemu-native.inc
@@ -2,10 +2,6 @@ FILESPATH =. "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/qemu-${PV}:"
 # prefix = "${STAGING_DIR}/${BUILD_SYS}"
 DEPENDS = "libsdl-native"
 
-do_configure_prepend() {
-	sed -i -e s,sdl-config,sdl-config-native, configure
-}
-
 python __anonymous() {
     from bb import which, data
 	
diff --git a/packages/qmake/qmake2-native_2.00a.bb b/packages/qmake/qmake2-native_2.00a.bb
index 5b30fa07bc..2dcabe3261 100644
--- a/packages/qmake/qmake2-native_2.00a.bb
+++ b/packages/qmake/qmake2-native_2.00a.bb
@@ -19,12 +19,12 @@ export QTDIR = "${S}"
 EXTRA_OEMAKE = "-e"
 
 do_configure() {
-        # Install the OE build templates                      
+        # Install the OE build templates
         for template in linux-oe-g++ linux-uclibc-oe-g++ linux-gnueabi-oe-g++
-        do      
-                install -d ${S}/mkspecs/$template   
+        do
+                install -d ${S}/mkspecs/$template
                 install -m 0644 ${WORKDIR}/linux-oe-qmake.conf ${S}/mkspecs/$template/qmake.conf
-                ln -sf ../linux-g++/qplatformdefs.h ${S}/mkspecs/$template/qplatformdefs.h    
+                ln -sf ../linux-g++/qplatformdefs.h ${S}/mkspecs/$template/qplatformdefs.h
         done
 
 	QMAKESPEC=
diff --git a/packages/qmatrix/qmatrix_1.1.0.bb b/packages/qmatrix/qmatrix_1.1.0.bb
index a47d00fa56..057701e9b5 100644
--- a/packages/qmatrix/qmatrix_1.1.0.bb
+++ b/packages/qmatrix/qmatrix_1.1.0.bb
@@ -14,7 +14,7 @@ MACHTYPE_c7x0    = "sl700"
 MACHTYPE_tosa    = "sl700"
 
 do_configure_append() {
-        ln -v -f -s config/config-${MACHTYPE}.h config.h  
+        ln -v -f -s config/config-${MACHTYPE}.h config.h
         ln -v -f -s config/config.mk-${MACHTYPE} config.mk
         if [ "${MACHTYPE}" = "sl300" ]
         then
diff --git a/packages/qpe-gaim/qpe-libgaim_1.5.0.bb b/packages/qpe-gaim/qpe-libgaim_1.5.0.bb
index ab756470cc..4483b8cce7 100644
--- a/packages/qpe-gaim/qpe-libgaim_1.5.0.bb
+++ b/packages/qpe-gaim/qpe-libgaim_1.5.0.bb
@@ -33,7 +33,7 @@ do_stage() {
 	for header in account.h accountopt.h away.h blist.h buddyicon.h cmds.h config.h connection.h conversation.h core.h debug.h eventloop.h ft.h gaim.h imgstore.h log.h md5.h network.h notify.h plugin.h pluginpref.h pounce.h prefix.h prefs.h privacy.h proxy.h prpl.h request.h roomlist.h server.h sha.h signals.h sound.h sslconn.h status.h stringref.h util.h value.h version.h xmlnode.h
 	do
 		if [ -e ${S}/src/$header ]; then
-			install -m 0644 ${S}/src/$header $GAIM_DIR	
+			install -m 0644 ${S}/src/$header $GAIM_DIR
 		fi
 		if [ -e ${S}/$header ]; then
 			install -m 0644 ${S}/$header $GAIM_DIR
diff --git a/packages/qpe-games/aliens-qt_1.0.0.bb b/packages/qpe-games/aliens-qt_1.0.0.bb
index 9ee17f935b..77099bfe15 100644
--- a/packages/qpe-games/aliens-qt_1.0.0.bb
+++ b/packages/qpe-games/aliens-qt_1.0.0.bb
@@ -24,7 +24,7 @@ do_compile_prepend () {
 do_install () {
 	install -d ${D}${palmtopdir}/pics/${APPNAME}/
 	install -m 0644 ${S}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
-	
+
 }
 
 inherit opie
diff --git a/packages/qpe-games/atomic_1.0.1.bb b/packages/qpe-games/atomic_1.0.1.bb
index 4b6910544b..33e8aa2dff 100644
--- a/packages/qpe-games/atomic_1.0.1.bb
+++ b/packages/qpe-games/atomic_1.0.1.bb
@@ -29,7 +29,7 @@ do_compile_prepend() {
 do_install () {
 	install -d ${D}${palmtopdir}/pics/${APPNAME}/
 	install -m 0644 ${S}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
-	
+
 }
 
 inherit opie
diff --git a/packages/qpe-games/checkers_1.0.5ern.bb b/packages/qpe-games/checkers_1.0.5ern.bb
index d27b5f9832..c01b10b206 100644
--- a/packages/qpe-games/checkers_1.0.5ern.bb
+++ b/packages/qpe-games/checkers_1.0.5ern.bb
@@ -19,7 +19,7 @@ APPDESKTOP = "${S}"
 do_install () {
 	install -d ${D}${palmtopdir}/pics/${APPNAME}/
 	install -m 0644 ${S}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
-	
+
 }
 
 
diff --git a/packages/qpe-games/crossword_0.0.3.bb b/packages/qpe-games/crossword_0.0.3.bb
index 74adbf68b7..b46c0d92f2 100644
--- a/packages/qpe-games/crossword_0.0.3.bb
+++ b/packages/qpe-games/crossword_0.0.3.bb
@@ -18,7 +18,7 @@ APPDESKTOP = "${S}"
 do_install () {
 	install -d ${D}${palmtopdir}/pics/${APPNAME}/
 	install -m 0644 ${S}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
-	
+
 }
 
 pkg_postinst() {
diff --git a/packages/qpe-games/fish_1.1.0.bb b/packages/qpe-games/fish_1.1.0.bb
index 74990e824a..e2d4083510 100644
--- a/packages/qpe-games/fish_1.1.0.bb
+++ b/packages/qpe-games/fish_1.1.0.bb
@@ -26,7 +26,7 @@ do_compile_prepend() {
 do_install () {
 	install -d ${D}${palmtopdir}/pics/${APPNAME}/
 	install -m 0644 ${S}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
-	
+
 }
 
 inherit opie
diff --git a/packages/qpe-games/glider_1.0.0.bb b/packages/qpe-games/glider_1.0.0.bb
index e2cbe15c65..681d5abb43 100644
--- a/packages/qpe-games/glider_1.0.0.bb
+++ b/packages/qpe-games/glider_1.0.0.bb
@@ -24,7 +24,7 @@ do_compile_prepend() {
 do_install () {
 	install -d ${D}${palmtopdir}/pics/${APPNAME}/
 	install -m 0644 ${S}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
-	
+
 }
 
 inherit opie
diff --git a/packages/qpe-games/icebloxx_1.0.0.bb b/packages/qpe-games/icebloxx_1.0.0.bb
index 8c88eb0f74..64706ab56f 100644
--- a/packages/qpe-games/icebloxx_1.0.0.bb
+++ b/packages/qpe-games/icebloxx_1.0.0.bb
@@ -24,7 +24,7 @@ do_compile_prepend() {
 do_install () {
 	install -d ${D}${palmtopdir}/pics/${APPNAME}/
 	install -m 0644 ${S}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
-	
+
 }
 
 inherit opie
diff --git a/packages/qpe-games/mahjongg_1.0.0.bb b/packages/qpe-games/mahjongg_1.0.0.bb
index 50dd78ba76..869721dfa5 100644
--- a/packages/qpe-games/mahjongg_1.0.0.bb
+++ b/packages/qpe-games/mahjongg_1.0.0.bb
@@ -29,7 +29,7 @@ do_compile_prepend() {
 do_install () {
 	install -d ${D}${palmtopdir}/pics/${APPNAME}/
 	install -m 0644 ${S}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
-	
+
 }
 
 inherit opie
diff --git a/packages/qpe-games/maki_1.0.4ern.bb b/packages/qpe-games/maki_1.0.4ern.bb
index 3d72ea9742..da14c23548 100644
--- a/packages/qpe-games/maki_1.0.4ern.bb
+++ b/packages/qpe-games/maki_1.0.4ern.bb
@@ -20,7 +20,7 @@ APPDESKTOP = "${S}"
 do_install () {
 	install -d ${D}${palmtopdir}/pics/${APPNAME}/
 	install -m 0644 ${S}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
-	
+
 }
 
 inherit opie
diff --git a/packages/qpe-games/nmm_0.0.2.bb b/packages/qpe-games/nmm_0.0.2.bb
index 7a37244d24..72f89a97eb 100644
--- a/packages/qpe-games/nmm_0.0.2.bb
+++ b/packages/qpe-games/nmm_0.0.2.bb
@@ -18,13 +18,13 @@ APPDESKTOP = "${S}"
 
 
 do_compile_prepend() {
-	oe_runmake -C images	
+	oe_runmake -C images
 }
 
 do_install () {
 	install -d ${D}${palmtopdir}/pics/${APPNAME}/
 	install -m 0644 ${S}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
-	
+
 }
 
 inherit opie
diff --git a/packages/qpe-games/pairs_1.1.1.bb b/packages/qpe-games/pairs_1.1.1.bb
index 28ccf9bebf..22a248b346 100644
--- a/packages/qpe-games/pairs_1.1.1.bb
+++ b/packages/qpe-games/pairs_1.1.1.bb
@@ -16,14 +16,14 @@ APPTYPE = "binary"
 APPDESKTOP = "${S}"
 
 do_compile_prepend() {
-	oe_runmake -C images	
+	oe_runmake -C images
 }
 
 
 do_install () {
 	install -d ${D}${palmtopdir}/pics/${APPNAME}/
 	install -m 0644 ${S}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
-	
+
 }
 
 
diff --git a/packages/qpe-games/pdamaze_1.0.0.bb b/packages/qpe-games/pdamaze_1.0.0.bb
index ffc847413c..8e4443946d 100644
--- a/packages/qpe-games/pdamaze_1.0.0.bb
+++ b/packages/qpe-games/pdamaze_1.0.0.bb
@@ -17,13 +17,13 @@ APPTYPE = "binary"
 APPDESKTOP = "${S}"
 
 do_compile_prepend() {
-	oe_runmake -C images	
+	oe_runmake -C images
 }
 
 do_install () {
 	install -d ${D}${palmtopdir}/pics/${APPNAME}/
 	install -m 0644 ${S}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
-	
+
 }
 
 inherit opie
diff --git a/packages/qpe-games/pipeman_1.0.0.bb b/packages/qpe-games/pipeman_1.0.0.bb
index b0d661eae6..61fa122f67 100644
--- a/packages/qpe-games/pipeman_1.0.0.bb
+++ b/packages/qpe-games/pipeman_1.0.0.bb
@@ -18,13 +18,13 @@ APPDESKTOP = "${S}"
 
 
 do_compile_prepend() {
-	oe_runmake -C images	
+	oe_runmake -C images
 }
 
 do_install () {
 	install -d ${D}${palmtopdir}/pics/${APPNAME}/
 	install -m 0644 ${S}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
-	
+
 }
 
 inherit opie
diff --git a/packages/qpe-games/shisensho_1.0.0.bb b/packages/qpe-games/shisensho_1.0.0.bb
index 70cd759942..a72d3d8444 100644
--- a/packages/qpe-games/shisensho_1.0.0.bb
+++ b/packages/qpe-games/shisensho_1.0.0.bb
@@ -17,13 +17,13 @@ APPDESKTOP = "${S}"
 
 
 do_compile_prepend() {
-	oe_runmake -C images	
+	oe_runmake -C images
 }
 
 do_install () {
 	install -d ${D}${palmtopdir}/pics/${APPNAME}/
 	install -m 0644 ${S}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
-	
+
 }
 
 inherit opie
diff --git a/packages/qpe-games/sokoban_1.3.8ern.bb b/packages/qpe-games/sokoban_1.3.8ern.bb
index a8fe6c6226..b284ca23f4 100644
--- a/packages/qpe-games/sokoban_1.3.8ern.bb
+++ b/packages/qpe-games/sokoban_1.3.8ern.bb
@@ -17,14 +17,14 @@ APPTYPE = "binary"
 APPDESKTOP = "${S}"
 
 do_compile_prepend() {
-	oe_runmake -C images	
+	oe_runmake -C images
 	oe_runmake -C levels
 }
 
 do_install () {
 	install -d ${D}${palmtopdir}/pics/${APPNAME}/
 	install -m 0644 ${S}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
-	
+
 }
 
 inherit opie
diff --git a/packages/qpe-games/tron_1.0.0.bb b/packages/qpe-games/tron_1.0.0.bb
index 2438fa8d45..3f0ac867ad 100644
--- a/packages/qpe-games/tron_1.0.0.bb
+++ b/packages/qpe-games/tron_1.0.0.bb
@@ -20,7 +20,7 @@ APPDESKTOP = "${S}"
 do_install () {
 	install -d ${D}${palmtopdir}/pics/${APPNAME}/
 	install -m 0644 ${S}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
-	
+
 }
 
 
diff --git a/packages/qpe-games/win4_1.0.1.bb b/packages/qpe-games/win4_1.0.1.bb
index d7573691f6..3541ac9610 100644
--- a/packages/qpe-games/win4_1.0.1.bb
+++ b/packages/qpe-games/win4_1.0.1.bb
@@ -18,7 +18,7 @@ APPDESKTOP = "${S}"
 
 
 do_compile_prepend() {
-	oe_runmake -C images		
+	oe_runmake -C images
 }
 
 do_install () {
diff --git a/packages/qpe-games/zrev7_1.0.1.bb b/packages/qpe-games/zrev7_1.0.1.bb
index 5bf5f47eb6..3a2b3c5e46 100644
--- a/packages/qpe-games/zrev7_1.0.1.bb
+++ b/packages/qpe-games/zrev7_1.0.1.bb
@@ -17,7 +17,7 @@ APPDESKTOP = "${S}"
 inherit opie
 
 do_compile_prepend() {
-	oe_runmake -C images	
+	oe_runmake -C images
 }
 
 do_install () {
diff --git a/packages/qpenmapfe/qpenmapfe_1.0.0.bb b/packages/qpenmapfe/qpenmapfe_1.0.0.bb
index a99ec2559a..f3bcc9948b 100644
--- a/packages/qpenmapfe/qpenmapfe_1.0.0.bb
+++ b/packages/qpenmapfe/qpenmapfe_1.0.0.bb
@@ -18,5 +18,5 @@ inherit opie
 do_install () {
 	install -d ${D}${palmtopdir}/pics/${APPNAME}/
 	install -m 0644 ${WORKDIR}/*.png ${D}${palmtopdir}/pics/
-	
+
 }
diff --git a/packages/qpf-fonts/qpf-arabic_1.0.bb b/packages/qpf-fonts/qpf-arabic_1.0.bb
index 5198829604..1d73f880c8 100644
--- a/packages/qpf-fonts/qpf-arabic_1.0.bb
+++ b/packages/qpf-fonts/qpf-arabic_1.0.bb
@@ -8,11 +8,11 @@ PR = "r0"
 SRC_URI = "${SOURCEFORGE_MIRROR}/arabeyes/arabic-fonts-${PV}.tar.gz"
 S = "${WORKDIR}"
 
-do_install () { 
-        install -d ${D}${palmqtdir}/lib/fonts/ 
-        for i in *.qpf; do 
-                install -m 644 $i ${D}${palmqtdir}/lib/fonts/${i} 
-        done 
-} 
+do_install () {
+        install -d ${D}${palmqtdir}/lib/fonts/
+        for i in *.qpf; do
+                install -m 644 $i ${D}${palmqtdir}/lib/fonts/${i}
+        done
+}
 
 inherit qpf
diff --git a/packages/qpf-fonts/qpf-freemono_1.0.bb b/packages/qpf-fonts/qpf-freemono_1.0.bb
index aebe58337f..d10fda6117 100644
--- a/packages/qpf-fonts/qpf-freemono_1.0.bb
+++ b/packages/qpf-fonts/qpf-freemono_1.0.bb
@@ -9,11 +9,11 @@ SRC_URI = "http://ewi546.ewi.utwente.nl/mirror/hrw-oe-sources/${PN}-${PV}.tar.bz
 
 S = "${WORKDIR}/${PN}"
 
-do_install () { 
-        install -d ${D}${palmqtdir}/lib/fonts/ 
-        for i in *.qpf; do 
-                install -m 644 $i ${D}${palmqtdir}/lib/fonts/${i} 
-        done 
-} 
+do_install () {
+        install -d ${D}${palmqtdir}/lib/fonts/
+        for i in *.qpf; do
+                install -m 644 $i ${D}${palmqtdir}/lib/fonts/${i}
+        done
+}
 
 inherit qpf
diff --git a/packages/qpf-fonts/qpf-freeserif_1.0.bb b/packages/qpf-fonts/qpf-freeserif_1.0.bb
index 3044981176..116c48d5d1 100644
--- a/packages/qpf-fonts/qpf-freeserif_1.0.bb
+++ b/packages/qpf-fonts/qpf-freeserif_1.0.bb
@@ -10,11 +10,11 @@ SRC_URI = "http://ewi546.ewi.utwente.nl/mirror/hrw-oe-sources/${PN}-${PV}.tar.bz
 
 S = "${WORKDIR}/${PN}"
 
-do_install () { 
-        install -d ${D}${palmqtdir}/lib/fonts/ 
-        for i in *.qpf; do 
-                install -m 644 $i ${D}${palmqtdir}/lib/fonts/${i} 
-        done 
-} 
+do_install () {
+        install -d ${D}${palmqtdir}/lib/fonts/
+        for i in *.qpf; do
+                install -m 644 $i ${D}${palmqtdir}/lib/fonts/${i}
+        done
+}
 
 inherit qpf
diff --git a/packages/qpf-fonts/qpf-helvetica_1.0.bb b/packages/qpf-fonts/qpf-helvetica_1.0.bb
index bd44bb60a0..9607030393 100644
--- a/packages/qpf-fonts/qpf-helvetica_1.0.bb
+++ b/packages/qpf-fonts/qpf-helvetica_1.0.bb
@@ -8,11 +8,11 @@ PR = "r1"
 SRC_URI = "http://ewi546.ewi.utwente.nl/mirror/hrw-oe-sources/qpf-helvetica.tar.bz2"
 S = "${WORKDIR}/helvetica"
 
-do_install () { 
-        install -d ${D}${palmqtdir}/lib/fonts/ 
-        for font in *.qpf; do 
+do_install () {
+        install -d ${D}${palmqtdir}/lib/fonts/
+        for font in *.qpf; do
                 install -m 644 $font ${D}${palmqtdir}/lib/fonts/
-        done 
-} 
+        done
+}
 
 inherit qpf
diff --git a/packages/qpf-fonts/qpf-hunkysans_0.3.0.bb b/packages/qpf-fonts/qpf-hunkysans_0.3.0.bb
index aa0804cadd..f4c50faf71 100644
--- a/packages/qpf-fonts/qpf-hunkysans_0.3.0.bb
+++ b/packages/qpf-fonts/qpf-hunkysans_0.3.0.bb
@@ -10,11 +10,11 @@ SRC_URI = "http://ewi546.ewi.utwente.nl/mirror/hrw-oe-sources/${PN}-${PV}-r4.tar
 
 S = "${WORKDIR}/${PN}"
 
-do_install () { 
-        install -d ${D}${palmqtdir}/lib/fonts/ 
-        for i in *.qpf; do 
-                install -m 644 $i ${D}${palmqtdir}/lib/fonts/${i} 
-        done 
-} 
+do_install () {
+        install -d ${D}${palmqtdir}/lib/fonts/
+        for i in *.qpf; do
+                install -m 644 $i ${D}${palmqtdir}/lib/fonts/${i}
+        done
+}
 
 inherit qpf
diff --git a/packages/qpf-fonts/qpf-hunkyserif_0.3.0.bb b/packages/qpf-fonts/qpf-hunkyserif_0.3.0.bb
index 861690ee0f..8c1d8d02bc 100644
--- a/packages/qpf-fonts/qpf-hunkyserif_0.3.0.bb
+++ b/packages/qpf-fonts/qpf-hunkyserif_0.3.0.bb
@@ -10,11 +10,11 @@ SRC_URI = "http://ewi546.ewi.utwente.nl/mirror/hrw-oe-sources/${PN}-${PV}-r4.tar
 
 S = "${WORKDIR}/${PN}"
 
-do_install () { 
-        install -d ${D}${palmqtdir}/lib/fonts/ 
-        for i in *.qpf; do 
-                install -m 644 $i ${D}${palmqtdir}/lib/fonts/${i} 
-        done 
-} 
+do_install () {
+        install -d ${D}${palmqtdir}/lib/fonts/
+        for i in *.qpf; do
+                install -m 644 $i ${D}${palmqtdir}/lib/fonts/${i}
+        done
+}
 
 inherit qpf
diff --git a/packages/qpf-fonts/qpf-unifont_1.0.bb b/packages/qpf-fonts/qpf-unifont_1.0.bb
index f5101f5b47..6eefff1c20 100644
--- a/packages/qpf-fonts/qpf-unifont_1.0.bb
+++ b/packages/qpf-fonts/qpf-unifont_1.0.bb
@@ -8,11 +8,11 @@ PR = "r1"
 SRC_URI = "http://www.openzaurus.org/mirror/qpf-unifont.tar.bz2"
 S = "${WORKDIR}"
 
-do_install () { 
-        install -d ${D}${palmqtdir}/lib/fonts/ 
-        for i in *.qpf; do 
-                install -m 644 $i ${D}${palmqtdir}/lib/fonts/${i} 
-        done 
-} 
+do_install () {
+        install -d ${D}${palmqtdir}/lib/fonts/
+        for i in *.qpf; do
+                install -m 644 $i ${D}${palmqtdir}/lib/fonts/${i}
+        done
+}
 
 inherit qpf
diff --git a/packages/qpf-fonts/qpf-unismall_1.0.0.bb b/packages/qpf-fonts/qpf-unismall_1.0.0.bb
index 8b9dd5dbd6..9c5600cb9d 100644
--- a/packages/qpf-fonts/qpf-unismall_1.0.0.bb
+++ b/packages/qpf-fonts/qpf-unismall_1.0.0.bb
@@ -4,20 +4,21 @@ PRIORITY = "optional"
 LICENSE = "GPL"
 HOMEPAGE = "http://sourceforge.jp/projects/zaurus-ja/"
 RPROVIDES = "virtual/japanese-font"
+PR = "r1"
 
 SRC_URI = "http://prdownloads.sourceforge.jp/zaurus-ja/773/unismall-1.0.0.tar.gz"
 
 S = "${WORKDIR}"
 
-do_install () { 
-        install -d ${D}${palmqtdir}/lib/fonts/ 
+do_install () {
+        install -d ${D}${palmqtdir}/lib/fonts/
 	cd unismall*
-	for i in *_100_*.qpf; do 
+	for i in *_100_*.qpf; do
 		ln -sf $i $(echo $i | sed 's/_100_/_160_/')
 	done
-	for i in *.qpf; do 
-		install -m 644 $i ${D}${palmqtdir}/lib/fonts/${i} 
+	for i in *.qpf; do
+		install -m 644 $i ${D}${palmqtdir}/lib/fonts/${i}
 	done
-} 
+}
 
 inherit qpf
diff --git a/packages/qpf-fonts/qpf-utopia_1.0.bb b/packages/qpf-fonts/qpf-utopia_1.0.bb
index d1fff823fe..87cb4d758b 100644
--- a/packages/qpf-fonts/qpf-utopia_1.0.bb
+++ b/packages/qpf-fonts/qpf-utopia_1.0.bb
@@ -9,11 +9,11 @@ PR = "r1"
 SRC_URI = "http://ewi546.ewi.utwente.nl/mirror/hrw-oe-sources/qpf-utopia.tar.bz2"
 S = "${WORKDIR}/utopia"
 
-do_install () { 
-        install -d ${D}${palmqtdir}/lib/fonts/ 
-        for i in *.qpf; do 
-                install -m 644 $i ${D}${palmqtdir}/lib/fonts/${i} 
-        done 
-} 
+do_install () {
+        install -d ${D}${palmqtdir}/lib/fonts/
+        for i in *.qpf; do
+                install -m 644 $i ${D}${palmqtdir}/lib/fonts/${i}
+        done
+}
 
 inherit qpf
diff --git a/packages/qpphoto/qpphoto_1.0.2.bb b/packages/qpphoto/qpphoto_1.0.2.bb
index 9cd1314bb0..9ef9b4ef3a 100644
--- a/packages/qpphoto/qpphoto_1.0.2.bb
+++ b/packages/qpphoto/qpphoto_1.0.2.bb
@@ -30,7 +30,7 @@ do_install() {
 #	install -d ${D}${bindir}
 
 	install -m 0644 qpPhoto.png ${D}${palmtopdir}/pics
-#	install -m 0644 qpPhoto.desktop ${D}${palmtopdir}/apps/Applications		
+#	install -m 0644 qpPhoto.desktop ${D}${palmtopdir}/apps/Applications
 #	install -m 0755 qpPhoto ${D}${bindir}
 }
 
diff --git a/packages/qt/qt4-x11-free_4.1.2.bb b/packages/qt/qt4-x11-free_4.1.2.bb
index dfefd444b7..25c64379d9 100644
--- a/packages/qt/qt4-x11-free_4.1.2.bb
+++ b/packages/qt/qt4-x11-free_4.1.2.bb
@@ -60,7 +60,7 @@ do_configure() {
 	unset QMAKESPEC
 	ln -sf ${STAGING_BINDIR_NATIVE}/qmake2 bin/qmake
 	ln -sf ./linux-g++ mkspecs/linux-gnueabi-g++
-	#export QMAKESPEC="linux-oe-g++" 
+	#export QMAKESPEC="linux-oe-g++"
 	#rm -rf ./mkspecs
 	#ln -sf ${QMAKE_MKSPEC_PATH} ./mkspecs
 	echo yes | ./configure -prefix / -platform ${TARGET_OS}-g++ -crossarch ${QT_ARCH} ${QT_CONFIG_FLAGS} -fast \
diff --git a/packages/quake/quake1_0.0.1.bb b/packages/quake/quake1_0.0.1.bb
index c28052df0c..86210e4621 100644
--- a/packages/quake/quake1_0.0.1.bb
+++ b/packages/quake/quake1_0.0.1.bb
@@ -14,7 +14,7 @@ SRC_URI = "http://mirror1.pdaXrom.org/rc9/src/quake1src.tar.bz2 \
 
 S = "${WORKDIR}/quake1src"
 
-inherit autotools 
+inherit autotools
 
 EXTRA_OEMAKE = "-e"
 
diff --git a/packages/rdesktop/rdesktop_1.3.1.bb b/packages/rdesktop/rdesktop_1.3.1.bb
index ed19483d6b..12ff1c5bcd 100644
--- a/packages/rdesktop/rdesktop_1.3.1.bb
+++ b/packages/rdesktop/rdesktop_1.3.1.bb
@@ -25,11 +25,11 @@ do_configure() {
 	--with-x=${STAGING_DIR}/${HOST_SYS} \
 	--with-openssl=${STAGING_DIR}/${HOST_SYS} \
 	--with-oss \
-	--without-debug	 
+	--without-debug
 }
 
 do_compile() {
-	oe_runmake 'KEYMAP_PATH=${datadir}/keymaps/' 
+	oe_runmake 'KEYMAP_PATH=${datadir}/keymaps/'
 }
 
 do_install() {
diff --git a/packages/readline/readline_4.3.bb b/packages/readline/readline_4.3.bb
index d0ff2a8d7c..6dfce726fe 100644
--- a/packages/readline/readline_4.3.bb
+++ b/packages/readline/readline_4.3.bb
@@ -15,7 +15,7 @@ SRC_URI = "ftp://ftp.cwru.edu/pub/bash/readline-${PV}.tar.gz \
 	   file://acinclude.m4"
 S = "${WORKDIR}/readline-${PV}"
 
-inherit autotools 
+inherit autotools
 
 do_configure () {
 	install -m 0644 ${WORKDIR}/acinclude.m4 ${S}/
diff --git a/packages/resistorui/resistorui_0.9.bb b/packages/resistorui/resistorui_0.9.bb
index 44d464e8a4..41e50c01e4 100644
--- a/packages/resistorui/resistorui_0.9.bb
+++ b/packages/resistorui/resistorui_0.9.bb
@@ -16,5 +16,5 @@ inherit opie
 do_install () {
 	install -d ${D}${palmtopdir}/pics/
 	install -m 0644 resistorUI.png ${D}${palmtopdir}/pics/
-	
+
 }
diff --git a/packages/rox/rox-filer_2.5.bb b/packages/rox/rox-filer_2.5.bb
index 0518ef08eb..d698d5b958 100644
--- a/packages/rox/rox-filer_2.5.bb
+++ b/packages/rox/rox-filer_2.5.bb
@@ -15,7 +15,7 @@ S = "${WORKDIR}/${P}/ROX-Filer/src/"
 
 do_compile() {
 	../AppRun --compile
-}	
+}
 
 do_install() {
 	install -d ${D}${bindir}
@@ -32,13 +32,13 @@ do_install() {
 	cp -r ${WORKDIR}/${P}/Choices ${D}${datadir}/rox
 	rm -rf ${D}${datadir}rox/Choices/MIME-info/
 	cp ${WORKDIR}/${P}/ROX-Filer/*.xml ${D}${datadir}/rox
-	
+
 	cp ${WORKDIR}/${P}/ROX-Filer/Help/{Changes,README*,TODO} ${D}${datadir}/doc/rox
 	cp ${WORKDIR}/${P}/ROX-Filer/Help/*html ${D}${datadir}/doc/rox/html
 	cp ${WORKDIR}/${P}/ROX-Filer/style.css ${D}${datadir}/doc/rox/html
 	cp -r ${WORKDIR}/${P}/ROX-Filer/images ${D}${datadir}/rox
 	cp -r ${WORKDIR}/${P}/ROX-Filer/ROX ${D}${datadir}/rox
-	
+
 #	cp ROX-Filer/ROX-Filer ${D}/usr/bin/rox
 	cp ${WORKDIR}/${P}/ROX-Filer/.DirIcon ${D}${datadir}/rox/.DirIcon
 	cp ${WORKDIR}/${P}/rox.xml ${D}${datadir}/mime/packages
diff --git a/packages/rpm2cpio/rpm2cpio-native_1.2_2.bb b/packages/rpm2cpio/rpm2cpio-native_1.2_2.bb
index 23d6fead53..3a12fba3ca 100644
--- a/packages/rpm2cpio/rpm2cpio-native_1.2_2.bb
+++ b/packages/rpm2cpio/rpm2cpio-native_1.2_2.bb
@@ -20,6 +20,6 @@ do_stage() {
 
 	my_PERL="/usr/bin/env perl"
 	sed -e "s%/[a-zA-Z0-9/]*/bin/perl%$my_PERL%g" -i ${STAGING_BINDIR}/rpm2cpio.pl
-	
-	chmod 0755 ${STAGING_BINDIR}/rpm2cpio.pl 
+
+	chmod 0755 ${STAGING_BINDIR}/rpm2cpio.pl
 }
diff --git a/packages/rsync/rsync_2.6.9.bb b/packages/rsync/rsync_2.6.9.bb
index 78e2d6eef7..ab7ae43428 100644
--- a/packages/rsync/rsync_2.6.9.bb
+++ b/packages/rsync/rsync_2.6.9.bb
@@ -13,5 +13,5 @@ do_install_append() {
 	install -d ${D}/etc
 	install -m 0644 ${WORKDIR}/rsyncd.conf ${D}/etc
 }
-		
+
 EXTRA_OEMAKE='STRIP=""'
diff --git a/packages/rxvt-unicode/rxvt-unicode_7.7.bb b/packages/rxvt-unicode/rxvt-unicode_7.7.bb
index 7eaf109312..f80984bc7a 100644
--- a/packages/rxvt-unicode/rxvt-unicode_7.7.bb
+++ b/packages/rxvt-unicode/rxvt-unicode_7.7.bb
@@ -12,7 +12,7 @@ FILES_${PN}-control = "${bindir}/rxvtc"
 
 SRC_URI = "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${PV}.tar.bz2 \
            file://xwc.patch;patch=1 \
-           file://signedchar.patch;patch=1" 
+           file://signedchar.patch;patch=1"
 PR = "r0"
 
 DEFAULT_PREFERENCE = "-1"
diff --git a/packages/rxvt-unicode/rxvt-unicode_7.9.bb b/packages/rxvt-unicode/rxvt-unicode_7.9.bb
index 5903d08d62..72d686bffd 100644
--- a/packages/rxvt-unicode/rxvt-unicode_7.9.bb
+++ b/packages/rxvt-unicode/rxvt-unicode_7.9.bb
@@ -12,7 +12,7 @@ FILES_${PN}-control = "${bindir}/rxvtc"
 
 SRC_URI = "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${PV}.tar.bz2 \
            file://xwc.patch;patch=1 \
-           file://signedchar.patch;patch=1" 
+           file://signedchar.patch;patch=1"
 PR = "r0"
 
 inherit autotools update-alternatives
diff --git a/packages/samba/samba-essential_3.0.20.bb b/packages/samba/samba-essential_3.0.20.bb
index e5ff6a3025..365d208028 100644
--- a/packages/samba/samba-essential_3.0.20.bb
+++ b/packages/samba/samba-essential_3.0.20.bb
@@ -43,27 +43,27 @@ do_install_append() {
 	rmdir ${D}/sbin
 	install -d "${D}${sysconfdir}/init.d"
 	install -d "${D}${sysconfdir}/samba/private"
-	
+
 	install -c -m 755 ${WORKDIR}/init-essential ${D}${sysconfdir}/init.d/samba
-	
-	install -d "${D}${sysconfdir}/samba"	
-	install -d "${D}/usr/share/samba/help"	
-	
+
+	install -d "${D}${sysconfdir}/samba"
+	install -d "${D}/usr/share/samba/help"
+
 	install -m 0644 ${WORKDIR}/smb-essential-inactive.conf "${D}${sysconfdir}/samba/"
 	install -m 0644 ${WORKDIR}/smb-essential.conf "${D}${sysconfdir}/samba/smb.conf"
 
 	install -m 0644 ${WORKDIR}/Managing-Samba.txt  ${D}/usr/share/samba/help
-	
+
 }
 
 do_configure_append() {
 	distro_up="`echo "${DISTRO}" | awk '{printf("%s\n",toupper($0))}'`"
-	
+
 	cat ${WORKDIR}/smb-essential-inactive.conf | sed "s/MYWORKGROUP/${distro_up}/" > ${WORKDIR}/smb-essential-inactive.conf_
-	mv  ${WORKDIR}/smb-essential-inactive.conf_ ${WORKDIR}/smb-essential-inactive.conf 
+	mv  ${WORKDIR}/smb-essential-inactive.conf_ ${WORKDIR}/smb-essential-inactive.conf
 
 	cat ${WORKDIR}/smb-essential.conf | sed "s/MYWORKGROUP/${distro_up}/" > ${WORKDIR}/smb-essential.conf_
-	mv  ${WORKDIR}/smb-essential.conf_ ${WORKDIR}/smb-essential.conf 	
+	mv  ${WORKDIR}/smb-essential.conf_ ${WORKDIR}/smb-essential.conf
 }
 
 FILES_${PN} = "${bindir}/smbpasswd \
diff --git a/packages/sane-backends/sane-backends_1.0.15.bb b/packages/sane-backends/sane-backends_1.0.15.bb
index f034aed6eb..838a958a66 100644
--- a/packages/sane-backends/sane-backends_1.0.15.bb
+++ b/packages/sane-backends/sane-backends_1.0.15.bb
@@ -8,7 +8,7 @@ SRC_URI = "ftp://ftp.sane-project.org/pub/sane/old-versions/sane-backends-${PV}/
 	file://Makefile.in.patch;patch=1 \
 	file://saned.xinetd \
 	"
-	
+
 EXTRA_OECONF = "--disable-translations"
 
 inherit autotools
diff --git a/packages/sapwood/sapwood_svn.bb b/packages/sapwood/sapwood_svn.bb
index 11a26319de..9651ff3916 100644
--- a/packages/sapwood/sapwood_svn.bb
+++ b/packages/sapwood/sapwood_svn.bb
@@ -7,7 +7,7 @@ PV = "2.43+svn${SRCDATE}"
 
 SRC_URI = "svn://stage.maemo.org/svn/maemo/projects/haf/trunk/;module=sapwood;proto=https \
 	   file://sockets.patch;patch=1 \
-	  " 
+	  "
 
 S = "${WORKDIR}/${PN}"
 
diff --git a/packages/schroedinger/schroedinger_0.2.0.0.bb b/packages/schroedinger/schroedinger_0.2.0.0.bb
index 1fea3339be..7812f30da7 100644
--- a/packages/schroedinger/schroedinger_0.2.0.0.bb
+++ b/packages/schroedinger/schroedinger_0.2.0.0.bb
@@ -1,5 +1,5 @@
 HOMEPAGE = "http://schrodinger.sourceforge.net/"
-LICENSE = "MPL/GPL/LGPL and MIT" 
+LICENSE = "MPL/GPL/LGPL and MIT"
 DEPENDS = "liboil gstreamer gst-plugins-base"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/schrodinger/${P}.tar.gz"
diff --git a/packages/scsi-idle/scsi-idle_2.4.23.bb b/packages/scsi-idle/scsi-idle_2.4.23.bb
index 38cd739e9d..6085112c63 100644
--- a/packages/scsi-idle/scsi-idle_2.4.23.bb
+++ b/packages/scsi-idle/scsi-idle_2.4.23.bb
@@ -11,7 +11,7 @@ PR = "r1"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/s/scsi-idle/scsi-idle_${PV}-5.tar.gz \
 	file://makefile.patch;patch=1 \
-	file://scsi-idle.init.patch;patch=1"	
+	file://scsi-idle.init.patch;patch=1"
 
 S = "${WORKDIR}/scsi-idle-${PV}"
 
diff --git a/packages/scummvm/scummvm-qpe_0.6.1b.bb b/packages/scummvm/scummvm-qpe_0.6.1b.bb
index f23cccae70..44035e633c 100644
--- a/packages/scummvm/scummvm-qpe_0.6.1b.bb
+++ b/packages/scummvm/scummvm-qpe_0.6.1b.bb
@@ -1,4 +1,4 @@
-require scummvm.inc 
+require scummvm.inc
 DEPENDS = "libsdl-qpe libmad tremor libogg zlib libmpeg2"
 
 S="${WORKDIR}/scummvm-${PV}/"
diff --git a/packages/scummvm/scummvm_0.6.0.bb b/packages/scummvm/scummvm_0.6.0.bb
index 38f0c7ea98..1aecd20bc4 100644
--- a/packages/scummvm/scummvm_0.6.0.bb
+++ b/packages/scummvm/scummvm_0.6.0.bb
@@ -9,16 +9,17 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/scummvm/scummvm-${PV}.tar.bz2 \
 			file://tremor.patch;patch=1 \
 			file://mouse.patch;patch=1 "
 
-inherit autotools 
+inherit autotools
+
+export SDL_CONFIG = "${STAGING_BINDIR_CROSS}/sdl-config"
 
 EXTRA_OECONF = "--host=${HOST_SYS} \
 		--backend=sdl \
-		--with-sdl-prefix=${STAGING_BINDIR}/.. \
 		--disable-alsa \
 		--with-ogg-prefix=${STAGING_LIBDIR}/.. \
 		--with-vorbis-prefix=${STAGING_LIBDIR}/.. \
 		--with-mpeg2-prefix=${STAGING_LIBDIR}/.. \
-		--with-mad-prefix=${STAGING_BINDIR}/.. "
+		--with-mad-prefix=${STAGING_BINDIR_CROSS}/.. "
 
 do_configure() {
 	./configure ${EXTRA_OECONF}
diff --git a/packages/sharp-binary-only/sharp-aticore-oss_1.0.1.bb b/packages/sharp-binary-only/sharp-aticore-oss_1.0.1.bb
index f7a04cf6f2..bc015e3d52 100644
--- a/packages/sharp-binary-only/sharp-aticore-oss_1.0.1.bb
+++ b/packages/sharp-binary-only/sharp-aticore-oss_1.0.1.bb
@@ -19,10 +19,10 @@ do_install() {
 	install -d ${D}${bindir}
 	install -m 0755 testcore ${D}${bindir}/testcore
 	install -m 0755 atitest ${D}${bindir}/atitest
-	
+
 	install -d ${D}${libdir}
 	install -m 0755 libaticore.so.1.0.1 ${D}${libdir}/libaticore.so.1.0.1
-	
+
 	install -d ${D}${includedir}
 	install -m 0644 aticore.h ${D}${includedir}/aticore.h
 
diff --git a/packages/sharp-binary-only/sharp-compat-libs_0.5.bb b/packages/sharp-binary-only/sharp-compat-libs_0.5.bb
index 538d25e80d..3fa80452f6 100644
--- a/packages/sharp-binary-only/sharp-compat-libs_0.5.bb
+++ b/packages/sharp-binary-only/sharp-compat-libs_0.5.bb
@@ -29,39 +29,39 @@ do_install() {
 	install -d ${D}${palmtopdir}/bin/
 	install -d ${D}${palmtopdir}/etc/
 	install -d ${D}${palmtopdir}/pics/
-	
+
 	install -d ${D}/opt/QtPalmtop.compat/bin
 	install -d ${D}/opt/QtPalmtop.compat/binlib
 	install -d ${D}/opt/QtPalmtop.compat/lib
-	
+
 	install -d ${D}${sysconfdir}/init.d
-	
-	install -m 0644 ${WORKDIR}/oz-compat-0.5/opt/QtPalmtop/apps/Settings/makecompat.desktop ${D}${palmtopdir}/apps/Settings		
+
+	install -m 0644 ${WORKDIR}/oz-compat-0.5/opt/QtPalmtop/apps/Settings/makecompat.desktop ${D}${palmtopdir}/apps/Settings
 	install -m 0644 ${WORKDIR}/oz-compat-0.5/opt/QtPalmtop/etc/quickexec.libs ${D}${palmtopdir}/etc/quickexec.libs
 	install -m 0644 ${WORKDIR}/oz-compat-0.5/opt/QtPalmtop/pics/libraries.png ${D}${palmtopdir}/pics/libraries.png
-	
+
 	install -m 0755 ${WORKDIR}/oz-compat-0.5/opt/QtPalmtop.compat/bin/* ${D}/opt/QtPalmtop.compat/bin
 	install -m 0644 ${WORKDIR}/oz-compat-0.5/opt/QtPalmtop.compat/lib/* ${D}/opt/QtPalmtop.compat/lib
-	
+
 	install -m 0755 ${WORKDIR}/oz-compat-0.5/etc/init.d/quickexec ${D}${sysconfdir}/init.d
-			
+
 	cd ${D}${palmtopdir}/bin
 	for file in chkhinge makecompat qeserver quickexec runcompat
 	do
 		ln -s /opt/QtPalmtop.compat/bin/$file
 	done
-	
+
 	cd ${D}/opt/QtPalmtop.compat/lib
 	ln -s libqpe.so.1.5.0 libqpe.so.1.5
 	ln -s libqpe.so.1.5.0 libqpe.so.1
 	ln -s libqpe.so.1.5.0 libqpe.so
-	
+
 	ln -s libqte.so.2.3.7 libqte.so.2.3.2
-	ln -s libqte.so.2.3.7 libqte.so.2.3	
+	ln -s libqte.so.2.3.7 libqte.so.2.3
 	ln -s libqte.so.2.3.7 libqte.so.2
 	ln -s libqte.so.2.3.7 libqte.so
-		
-	
+
+
 }
 
 pkg_postinst() {
diff --git a/packages/sharp-binary-only/sharp-sdmmc-support.bb b/packages/sharp-binary-only/sharp-sdmmc-support.bb
index 2ac73c6042..7fc60aa250 100644
--- a/packages/sharp-binary-only/sharp-sdmmc-support.bb
+++ b/packages/sharp-binary-only/sharp-sdmmc-support.bb
@@ -35,7 +35,7 @@ do_install() {
                    ${D}${sysconfdir}/default \
                    ${D}${base_sbindir} \
                    ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/block/
-                   
+
         install -m 0755 ${WORKDIR}/sdmgr ${D}${base_sbindir}/
         install -m 0755 ${WORKDIR}/sdcontrol ${D}${sysconfdir}
         install -m 0755 ${WORKDIR}/sd ${D}${sysconfdir}/init.d/
diff --git a/packages/sidplayer/sidplayer_1.5.0.bb b/packages/sidplayer/sidplayer_1.5.0.bb
index d41282942a..9929aa8c9f 100644
--- a/packages/sidplayer/sidplayer_1.5.0.bb
+++ b/packages/sidplayer/sidplayer_1.5.0.bb
@@ -20,5 +20,5 @@ do_install() {
         install -d ${D}${palmtopdir}/bin \
         	   ${D}${palmtopdir}/apps/Applications \
         	   ${D}${palmtopdir}/pics
-	cp -pPR ../apps ../bin ../pics ${D}${palmtopdir}/        
+	cp -pPR ../apps ../bin ../pics ${D}${palmtopdir}/
 }
diff --git a/packages/silo/silo_1.4.8.bb b/packages/silo/silo_1.4.8.bb
index ee107edeed..41a3d3aaf5 100644
--- a/packages/silo/silo_1.4.8.bb
+++ b/packages/silo/silo_1.4.8.bb
@@ -9,7 +9,8 @@ do_compile() {
 	oe_runmake CC="${CC} -m32" LD="${LD}" HOSTCC="${BUILD_CC}" HOSTCFLAGS="${BUILD_CFLAGS}" OECFLAGS="${CFLAGS}" OELDFLAGS="-L${STAGING_LIBDIR} -rpath-link ${STAGING_LIBDIR}" NM="${TARGET_SYS}-nm"
 }
 
+# Should this package be installing into native? - not good... RP 
 do_stage() {
-	install tilo/maketilo ${STAGING_BINDIR}
-	install tilo/tilo.sh ${STAGING_BINDIR}
+	install tilo/maketilo ${STAGING_BINDIR_NATIVE}
+	install tilo/tilo.sh ${STAGING_BINDIR_NATIVE}
 }
diff --git a/packages/simpad-utilities/genboot-native.bb b/packages/simpad-utilities/genboot-native.bb
index 3e98947eca..47b9b34640 100644
--- a/packages/simpad-utilities/genboot-native.bb
+++ b/packages/simpad-utilities/genboot-native.bb
@@ -11,7 +11,7 @@ inherit native
 
 do_compile() {
 	cp ${WORKDIR}/*.h ${WORKDIR}/*.c .
-	${CC} -I. -o genboot gen_boot.c 
+	${CC} -I. -o genboot gen_boot.c
 }
 
 do_stage() {
diff --git a/packages/slang/slang_1.4.9.bb b/packages/slang/slang_1.4.9.bb
index 5cb3629cf9..492bd7d9a0 100644
--- a/packages/slang/slang_1.4.9.bb
+++ b/packages/slang/slang_1.4.9.bb
@@ -6,7 +6,7 @@ LICENSE = "GPL Artistic"
 SRC_URI = "ftp://space.mit.edu/pub/davis/slang/v1.4/slang-${PV}.tar.bz2 \
            file://configure.patch;patch=1 \
            file://Makefile.patch;patch=1"
-inherit autotools 
+inherit autotools
 
 acpaths = "-I ${S}/autoconf"
 EXTRA_OECONF="--enable-warnings"
diff --git a/packages/slugos-init/slugos-init_0.10.bb b/packages/slugos-init/slugos-init_0.10.bb
index 4b9235e0f9..b75511ec67 100644
--- a/packages/slugos-init/slugos-init_0.10.bb
+++ b/packages/slugos-init/slugos-init_0.10.bb
@@ -66,7 +66,7 @@ do_install() {
 		   ${D}${base_sbindir} \
 		   ${D}/initrd \
 		   ${D}/boot
-		  
+
 	# linuxrc
 	rm -f ${D}/linuxrc
 	ln -s boot/flash ${D}/linuxrc
@@ -90,7 +90,7 @@ do_install() {
 	#
 	# Init scripts
 	install -m 0644 functions ${D}${sysconfdir}/default
-	install -m 0644 modulefunctions ${D}${sysconfdir}/default	
+	install -m 0644 modulefunctions ${D}${sysconfdir}/default
 	for s in ${INITSCRIPTS}
 	do
 		install -m 0755 initscripts/$s ${D}${sysconfdir}/init.d/
diff --git a/packages/smpeg/smpeg_0.4.4+0.4.5cvs20040311.bb b/packages/smpeg/smpeg_0.4.4+0.4.5cvs20040311.bb
index fdd9419bc4..af849a7778 100644
--- a/packages/smpeg/smpeg_0.4.4+0.4.5cvs20040311.bb
+++ b/packages/smpeg/smpeg_0.4.4+0.4.5cvs20040311.bb
@@ -10,13 +10,13 @@ SRC_URI = "cvs://anonymous:anonymous@cvs.icculus.org/cvs/cvsroot;module=smpeg;da
 	   file://compile.patch;patch=1"
 S = "${WORKDIR}/smpeg"
 
-inherit autotools 
+inherit autotools
+
+export SDL_CONFIG = "${STAGING_BINDIR_CROSS}/sdl-config"
 
 CFLAGS_append = " -I${STAGING_INCDIR}/SDL"
 EXTRA_OECONF = "--disable-gtktest --disable-opengl-player --without-x \
-		--without-gtk --disable-gtk-player \
-		--with-sdl-prefix=${STAGING_LIBDIR}/.. \
-		--with-sdl-exec-prefix=${STAGING_BINDIR}/.."
+		--without-gtk --disable-gtk-player"
 
 do_configure_prepend () {
 	touch NEWS AUTHORS ChangeLog
@@ -35,8 +35,8 @@ do_stage() {
         cat smpeg-config | sed -e "s,-I/usr/include/SDL,-I${STAGING_INCDIR}/SDL," \
                          | sed -e "s,-I/usr/include/smpeg, ," \
                          | sed -e "s,libdirs ,mickey_is_cool ," \
-                         | sed -e "s,-lSDL ,-lSDL-1.2 , "> ${STAGING_BINDIR}/smpeg-config
-        chmod a+rx ${STAGING_BINDIR}/smpeg-config
+                         | sed -e "s,-lSDL ,-lSDL-1.2 , "> ${STAGING_BINDIR_CROSS}/smpeg-config
+        chmod a+rx ${STAGING_BINDIR_CROSS}/smpeg-config
 }
 
 PACKAGES =+ "plaympeg "
diff --git a/packages/sofia-sip/sofia-sip_1.11.7.bb b/packages/sofia-sip/sofia-sip_1.11.7.bb
index 357a097b0f..50f4e1d617 100644
--- a/packages/sofia-sip/sofia-sip_1.11.7.bb
+++ b/packages/sofia-sip/sofia-sip_1.11.7.bb
@@ -5,7 +5,7 @@ LICENSE = "LGPL"
 SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${P}.tar.gz"
 
 inherit autotools pkgconfig
- 
+
 do_stage() {
 autotools_stage_all
 }
diff --git a/packages/sox/sox_12.17.5.bb b/packages/sox/sox_12.17.5.bb
index a3cd84e726..6c70eaad7b 100644
--- a/packages/sox/sox_12.17.5.bb
+++ b/packages/sox/sox_12.17.5.bb
@@ -4,7 +4,7 @@
 
 DESCRIPTION="SoX is the Swiss Army knife of sound processing tools. \
 It converts audio files among various standard audio file formats \
-and can apply different effects and filters to the audio data." 
+and can apply different effects and filters to the audio data."
 LICENSE="GPL"
 HOMEPAGE="http://sox.sourceforge.net"
 
diff --git a/packages/spca5xx/spca5xx_20060501.bb b/packages/spca5xx/spca5xx_20060501.bb
index 1a9b528178..3e523c83a8 100644
--- a/packages/spca5xx/spca5xx_20060501.bb
+++ b/packages/spca5xx/spca5xx_20060501.bb
@@ -15,10 +15,10 @@ do_compile () {
         unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
         oe_runmake 'KERNELDIR=${STAGING_KERNEL_DIR}' \
                    'CC=${KERNEL_CC}' \
-                   'LD=${KERNEL_LD}' 
+                   'LD=${KERNEL_LD}'
 }
 
-do_install() {   
+do_install() {
         install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media
         install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media
 }
diff --git a/packages/tslib/tslib-maemo/nokia770/.mtn2git_empty b/packages/squeezeclient/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/tslib/tslib-maemo/nokia770/.mtn2git_empty
+++ b/packages/squeezeclient/.mtn2git_empty
diff --git a/packages/tslib/tslib/akita/.mtn2git_empty b/packages/squeezeclient/files/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/tslib/tslib/akita/.mtn2git_empty
+++ b/packages/squeezeclient/files/.mtn2git_empty
diff --git a/packages/squeezeclient/files/makefile.patch b/packages/squeezeclient/files/makefile.patch
new file mode 100644
index 0000000000..8e64a70399
--- /dev/null
+++ b/packages/squeezeclient/files/makefile.patch
@@ -0,0 +1,57 @@
+---
+ makefile.linux |   30 +++++++++++++++++-------------
+ 1 file changed, 17 insertions(+), 13 deletions(-)
+
+Index: SlimProtoLib/makefile.linux
+===================================================================
+--- SlimProtoLib.orig/makefile.linux	2006-12-31 11:09:10.000000000 +0000
++++ SlimProtoLib/makefile.linux	2006-12-31 12:34:11.000000000 +0000
+@@ -1,6 +1,4 @@
+-CC=gcc
+-
+-CFLAGS=-Wall -Werror -DSLIMPROTO_DEBUG -g
++CFLAGS+=-Wall  -DSLIMPROTO_DEBUG -g
+ 
+ INCLUDE=-Ilib/portaudio_v18/pa_common -Ilib/portaudio_v18/pablio -Ilib/portmixer/px_common -Isrc
+ 
+@@ -20,24 +18,30 @@ SQUEEZESLAVEFILES:=src/squeezeslave/sque
+ 
+ all : bin/squeezeslave
+ 
+-lib/libportaudio.a: $(PORTAUDIOFILES:.c=.o)
+-	ar cru lib/libportaudio.a $^
+-	ranlib lib/libportaudio.a
++LIBVERSION:=3.0.0
+ 
+-lib/libslimproto.a: $(SLIMPROTOFILES:.c=.o)
+-	ar cru lib/libslimproto.a $^
+-	ranlib lib/libslimproto.a
++lib/libportaudio.so.$(LIBVERSION): $(PORTAUDIOFILES:.c=.o)
++	${CC} $^ $(CFLAGS) $(LDFLAGS) $(INCLUDE) -shared -Wl,-soname,$(@F) -Wl,--as-needed -o $@
++	ln -s $(@F) lib/libportaudio.so 
+ 
+-bin/squeezeslave : $(SQUEEZESLAVEFILES:.c=.o) $(PORTMIXERFILES:.c=.o) lib/libslimproto.a lib/libportaudio.a
+-	${CC} -o bin/squeezeslave $^ /usr/local/lib/libmad.a /usr/local/lib/libFLAC.a /usr/lib/libvorbisfile.a /usr/lib/libvorbis.a /usr/lib/libogg.a -lpthread -lm
++lib/libslimproto.so.$(LIBVERSION): $(SLIMPROTOFILES:.c=.o)
++	${CC} $^ $(CFLAGS) $(LDFLAGS) $(INCLUDE) -shared -Wl,-soname,$(@F) -Wl,--as-needed -o $@
++	ln -s $(@F) lib/libslimproto.so
+ 
++lib/libportmixer.so.$(LIBVERSION): $(PORTMIXERFILES:.c=.o)
++	${CC} $^ $(CFLAGS) $(LDFLAGS) $(INCLUDE) -shared -Wl,-soname,$(@F) -Wl,--as-needed -o $@
++	ln -s $(@F) lib/libportmixer.so
++
++bin/squeezeslave: $(SQUEEZESLAVEFILES:.c=.o) lib/libportaudio.so.$(LIBVERSION) lib/libportmixer.so.$(LIBVERSION) lib/libslimproto.so.$(LIBVERSION)
++	${CC} -o bin/squeezeslave $(LDFLAGS) $(LDFLAGS) $^ -Llib -lmad -lFLAC -lvorbisfile -lvorbis -logg -lpthread -lm -lslimproto -lportaudio -lportmixer
+ 
+ clean:
+ 	@{ for FILE in $(PORTAUDIOFILES:.c=.o) \
+ 	               $(SLIMPROTOFILES:.c=.o) \
+ 	               $(SQUEEZESLAVEFILES:.c=.o) \
+-	               lib/libportaudio.a \
+-	               lib/libslimproto.a \
++	               lib/libportaudio*.so \
++	               lib/libportmixer*.so \
++	               lib/libslimproto*.so \
+ 	               bin/squeezeslave; do \
+ 	  test -e $$FILE && echo $$FILE || true; \
+ 	  test -e $$FILE && $(RM) $$FILE 2>/dev/null || true; \
diff --git a/packages/squeezeclient/files/runfix.patch b/packages/squeezeclient/files/runfix.patch
new file mode 100644
index 0000000000..c2c48095a2
--- /dev/null
+++ b/packages/squeezeclient/files/runfix.patch
@@ -0,0 +1,17 @@
+---
+ src/squeezeslave/squeezeslave.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: SlimProtoLib/src/squeezeslave/squeezeslave.c
+===================================================================
+--- SlimProtoLib.orig/src/squeezeslave/squeezeslave.c	2006-12-31 11:09:09.000000000 +0000
++++ SlimProtoLib/src/squeezeslave/squeezeslave.c	2006-12-31 13:44:04.000000000 +0000
+@@ -41,7 +41,7 @@ char macaddress[6] = { 1, 1, 1, 1, 1, 1 
+ int main(int argc, char *argv[]) {

+ 	char *slimserver_address = "127.0.0.1";

+ 	int output_device_id = -1;

+-	char c;

++	int c;

+ 	int i;

+ 	

+ 	while (1) {

diff --git a/packages/squeezeclient/files/varinit.patch b/packages/squeezeclient/files/varinit.patch
new file mode 100644
index 0000000000..5844dc67b5
--- /dev/null
+++ b/packages/squeezeclient/files/varinit.patch
@@ -0,0 +1,17 @@
+---
+ src/slimaudio/slimaudio_http.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: SlimProtoLib/src/slimaudio/slimaudio_http.c
+===================================================================
+--- SlimProtoLib.orig/src/slimaudio/slimaudio_http.c	2006-12-31 11:09:09.000000000 +0000
++++ SlimProtoLib/src/slimaudio/slimaudio_http.c	2006-12-31 11:16:37.000000000 +0000
+@@ -91,7 +91,7 @@ int slimaudio_http_close(slimaudio_t *au
+ static void *http_thread(void *ptr) {

+ 	slimaudio_t *audio = (slimaudio_t *) ptr;

+ #ifdef SLIMPROTO_DEBUG				

+-	int last_state;

++	int last_state=0;

+ #endif

+ 

+ 	pthread_mutex_lock(&audio->http_mutex);

diff --git a/packages/squeezeclient/squeezeslave_svn.bb b/packages/squeezeclient/squeezeslave_svn.bb
new file mode 100644
index 0000000000..03fbb0ede0
--- /dev/null
+++ b/packages/squeezeclient/squeezeslave_svn.bb
@@ -0,0 +1,31 @@
+SECTION = "console/multimedia"
+DESCRIPTION = "command line audio playback client for SlimServer"
+LICENSE = "GPL"
+DEPENDS += "libmad flac libvorbis"
+PV = "3.0+svn-${SRCDATE}"
+PR = "r0"
+
+SRC_URI = "svn://svn.slimdevices.com/repos/slim/trunk/;module=softsqueeze;proto=http \
+           file://varinit.patch;patch=1 \
+           file://runfix.patch;patch=1 \
+           file://makefile.patch;patch=1"
+
+
+S = "${WORKDIR}/softsqueeze/SlimProtoLib"
+
+CFLAGS += "-D_GNU_SOURCE"
+
+inherit autotools
+
+do_compile() {
+        oe_runmake LDFLAGS=${TARGET_LDFLAGS} -f makefile.linux
+}
+
+do_install() {
+        install -d ${D}/${bindir}
+        install -m 0755 bin/squeezeslave ${D}/${bindir}
+    	oe_libinstall -C lib -so libslimproto ${D}${libdir}
+    	oe_libinstall -C lib -so libportaudio ${D}${libdir}
+    	oe_libinstall -C lib -so libportmixer ${D}${libdir}
+}
+
diff --git a/packages/ssmtp/ssmtp_2.61.bb b/packages/ssmtp/ssmtp_2.61.bb
index a177f91ac3..c8461ab29c 100644
--- a/packages/ssmtp/ssmtp_2.61.bb
+++ b/packages/ssmtp/ssmtp_2.61.bb
@@ -35,5 +35,5 @@ pkg_postinst () {
 }
 
 pkg_postrm () {
-        update-alternatives --remove ${sbindir}/sendmail sendmail 
+        update-alternatives --remove ${sbindir}/sendmail sendmail
 }
diff --git a/packages/startup-monitor/startup-monitor_0.18-2.bb b/packages/startup-monitor/startup-monitor_0.18-2.bb
index 1d93789adf..34e76566cd 100644
--- a/packages/startup-monitor/startup-monitor_0.18-2.bb
+++ b/packages/startup-monitor/startup-monitor_0.18-2.bb
@@ -4,6 +4,6 @@ SECTION = "libs"
 PRIORITY = "optional"
 DEPENDS = "virtual/libx11 startup-notification glib-2.0 libmatchbox"
 
-inherit gpe pkgconfig 
+inherit gpe pkgconfig
 
 #SRC_URI = "http://www.freedesktop.org/software/startup-notification/releases/${P}.tar.gz"
diff --git a/packages/startup-notification/startup-notification_0.5.bb b/packages/startup-notification/startup-notification_0.5.bb
index 42a3f13735..c48e89ce0b 100644
--- a/packages/startup-notification/startup-notification_0.5.bb
+++ b/packages/startup-notification/startup-notification_0.5.bb
@@ -4,7 +4,7 @@ SECTION = "libs"
 PRIORITY = "optional"
 DEPENDS = "virtual/libx11"
 
-inherit autotools pkgconfig 
+inherit autotools pkgconfig
 
 SRC_URI = "http://freedesktop.org/Software/startup-notification/releases/startup-notification-${PV}.tar.gz"
 
diff --git a/packages/startup-notification/startup-notification_0.8.bb b/packages/startup-notification/startup-notification_0.8.bb
index bccabba5ec..0be545d0fc 100644
--- a/packages/startup-notification/startup-notification_0.8.bb
+++ b/packages/startup-notification/startup-notification_0.8.bb
@@ -4,7 +4,7 @@ SECTION = "libs"
 PRIORITY = "optional"
 DEPENDS = "virtual/libx11"
 
-inherit autotools pkgconfig 
+inherit autotools pkgconfig
 
 SRC_URI = "http://www.freedesktop.org/software/startup-notification/releases/startup-notification-0.8.tar.gz"
 
diff --git a/packages/supertux/supertux_0.1.2.bb b/packages/supertux/supertux_0.1.2.bb
index 59acb5767b..42ea6039fa 100644
--- a/packages/supertux/supertux_0.1.2.bb
+++ b/packages/supertux/supertux_0.1.2.bb
@@ -11,6 +11,6 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/super-tux/supertux-${PV}.tar.bz2 \
 
 export SDL_CONFIG = "${STAGING_BINDIR_CROSS}/sdl-config"
 
-inherit autotools 
+inherit autotools
 
 # FIXME: Add .desktop file for Opie/Qtopia
diff --git a/packages/sword/sword_1.5.7.bb b/packages/sword/sword_1.5.7.bb
index 1c12334d37..e20dadc23f 100644
--- a/packages/sword/sword_1.5.7.bb
+++ b/packages/sword/sword_1.5.7.bb
@@ -9,7 +9,7 @@ PR = "r5"
 
 SRC_URI = "http://www.crosswire.org/~dglassey/sword-1.5.7a.tar.gz"
 
-inherit autotools 
+inherit autotools
 
 EXTRA_OECONF = "--without-clucene --without-curl"
 
diff --git a/packages/sylpheed/sylpheed-claws-plugin-mailmbox_1.12.1.bb b/packages/sylpheed/sylpheed-claws-plugin-mailmbox_1.12.1.bb
index 39ed9152aa..29ba157c89 100644
--- a/packages/sylpheed/sylpheed-claws-plugin-mailmbox_1.12.1.bb
+++ b/packages/sylpheed/sylpheed-claws-plugin-mailmbox_1.12.1.bb
@@ -1,5 +1,5 @@
 require sylpheed-claws-extra-plugins.inc
 
 SRC_URI = "http://www.sylpheed-claws.net/downloads/plugins/mailmbox-1.12.1.tar.gz"
-S = "${WORKDIR}/mailmbox-1.12.1" 
+S = "${WORKDIR}/mailmbox-1.12.1"
 
diff --git a/packages/sylpheed/sylpheed_2.2.7.bb b/packages/sylpheed/sylpheed_2.2.7.bb
index 6223624fc5..b22512b32f 100644
--- a/packages/sylpheed/sylpheed_2.2.7.bb
+++ b/packages/sylpheed/sylpheed_2.2.7.bb
@@ -21,7 +21,7 @@ do_configure_prepend() {
 	mkdir -p m4
 }
 
-inherit autotools 
+inherit autotools
 
 do_install_append() {
 	install -d ${D}${datadir}/applications
diff --git a/packages/sylpheed/sylpheed_2.2.9.bb b/packages/sylpheed/sylpheed_2.2.9.bb
index 6223624fc5..b22512b32f 100644
--- a/packages/sylpheed/sylpheed_2.2.9.bb
+++ b/packages/sylpheed/sylpheed_2.2.9.bb
@@ -21,7 +21,7 @@ do_configure_prepend() {
 	mkdir -p m4
 }
 
-inherit autotools 
+inherit autotools
 
 do_install_append() {
 	install -d ${D}${datadir}/applications
diff --git a/packages/synergy/synergy_1.2.7.bb b/packages/synergy/synergy_1.2.7.bb
index d5dd98e1fc..2aa7152425 100644
--- a/packages/synergy/synergy_1.2.7.bb
+++ b/packages/synergy/synergy_1.2.7.bb
@@ -9,7 +9,7 @@ PR = "r2"
 SRC_URI = "${SOURCEFORGE_MIRROR}/synergy2/synergy-${PV}.tar.gz"
 
 do_configure_prepend() {
-	grep -l -- -Werror "${S}/"* | xargs sed -i 's:-Werror::' 
+	grep -l -- -Werror "${S}/"* | xargs sed -i 's:-Werror::'
 }
 
 inherit autotools
diff --git a/packages/syslinux/syslinux-native_2.11.bb b/packages/syslinux/syslinux-native_2.11.bb
index a255ad15c3..3d0c5e5ad8 100644
--- a/packages/syslinux/syslinux-native_2.11.bb
+++ b/packages/syslinux/syslinux-native_2.11.bb
@@ -13,7 +13,7 @@ file://edx_assume_zero.patch;patch=1"
 
 S="${WORKDIR}/syslinux-${PV}"
 
-# If you really want to run syslinux, you need mtools.  We just want the 
+# If you really want to run syslinux, you need mtools.  We just want the
 # ldlinux.* stuff for now, so skip mtools-native
 
 DEPENDS="nasm-native"
diff --git a/packages/syslinux/syslinux-native_3.11.bb b/packages/syslinux/syslinux-native_3.11.bb
index 4cf7873f36..90395a7ab2 100644
--- a/packages/syslinux/syslinux-native_3.11.bb
+++ b/packages/syslinux/syslinux-native_3.11.bb
@@ -12,7 +12,7 @@ SRC_URI="${KERNELORG_MIRROR}/pub/linux/utils/boot/syslinux/syslinux-${PV}.tar.bz
 
 S="${WORKDIR}/syslinux-${PV}"
 
-# If you really want to run syslinux, you need mtools.  We just want the 
+# If you really want to run syslinux, you need mtools.  We just want the
 # ldlinux.* stuff for now, so skip mtools-native
 
 DEPENDS="nasm-native"
diff --git a/packages/taglib/taglibc_1.4.bb b/packages/taglib/taglibc_1.4.bb
index 87f85da430..ecfc27fafb 100644
--- a/packages/taglib/taglibc_1.4.bb
+++ b/packages/taglib/taglibc_1.4.bb
@@ -12,7 +12,7 @@ S = "${WORKDIR}/taglib-${PV}"
 inherit autotools qmake-base pkgconfig binconfig
 
 do_configure() {
-	echo running oe_runconf to get pkgconfig and binconfig files created          
+	echo running oe_runconf to get pkgconfig and binconfig files created
 	oe_runconf
 	cd ${S}/bindings/c && rm -f Makefile* && qmake -project -o tag_c.pro -t lib && \
 	qmake -spec ${QMAKESPEC} -after CONFIG=console INCLUDEPATH+=${STAGING_INCDIR}/taglib LIBS+=-ltag
diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb
index 4898e84a33..09908b1f23 100644
--- a/packages/tasks/task-base.bb
+++ b/packages/tasks/task-base.bb
@@ -44,7 +44,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 DISTRO_CORE_PACKAGE ?= "task-base-core-default"
 
 #
-# task-base 
+# task-base
 #
 RDEPENDS_task-base = "\
     ${DISTRO_CORE_PACKAGE} \
@@ -117,7 +117,7 @@ RDEPENDS_task-base-core-default = '\
     fuser \
     setserial'
 # Lets see if we can kill off hotplug...
-#    ${HOTPLUG} 
+#    ${HOTPLUG}
 #    ${@bootstrap_modutils_rdepends(d)}
 
 
@@ -289,22 +289,22 @@ task-distro-nfs-rrecommends = "\
 
 
 # Tosort
-# kernel-module-ipv6 
+# kernel-module-ipv6
 # kernel-module-nvrd
 # kernel-module-mip6-mn
 # kernel-module-tun
-# kernel-module-ide-disk 
+# kernel-module-ide-disk
 # kernel-module-ide-probe-mo
 # kernel-module-loop
-# kernel-module-vfat 
+# kernel-module-vfat
 # kernel-module-ext2
-# kernel-module-sco 
+# kernel-module-sco
 # kernel-module-af_packet
-# kernel-module-ip-gre 
-# kernel-module-ip-tables 
+# kernel-module-ip-gre
+# kernel-module-ip-tables
 # kernel-module-ipip
-# kernel-module-des 
+# kernel-module-des
 # kernel-module-md5
 # kernel-module-8250
-# Should be DISTRO_EXTRA_RRECOMMENDS: lrzsz 
+# Should be DISTRO_EXTRA_RRECOMMENDS: lrzsz
 
diff --git a/packages/tasks/task-opie.bb b/packages/tasks/task-opie.bb
index 984fa61584..616968ea36 100644
--- a/packages/tasks/task-opie.bb
+++ b/packages/tasks/task-opie.bb
@@ -170,7 +170,7 @@ RDEPENDS_task-opie-extra-apps = "opie-calculator opie-checkbook opie-mail opie-e
                         opie-rdesktop opie-wellenreiter opie-irc \
                         opie-mediaplayer2 \
                         qpdf2"
-# konqueror-embedded 
+# konqueror-embedded
 
 RDEPENDS_task-opie-extra-games = "opie-parashoot opie-mindbreaker opie-fifteen opie-tictac \
                          opie-tetrix"
diff --git a/packages/tasks/task-ossie.bb b/packages/tasks/task-ossie.bb
index 98f0a2d368..cd050342aa 100644
--- a/packages/tasks/task-ossie.bb
+++ b/packages/tasks/task-ossie.bb
@@ -7,7 +7,7 @@ PACKAGES = "task-ossie"
 
 ALLOW_EMPTY = "1"
 
-IPKG_INSTALL = "${OSSIE_BASE} ${OSSIE_PLATFORM} ${OSSIE_COMPONENTS} ${OSSIE_WAVEFORMS}"
+PACKAGE_INSTALL = "${OSSIE_BASE} ${OSSIE_PLATFORM} ${OSSIE_COMPONENTS} ${OSSIE_WAVEFORMS}"
 
 OSSIE_BASE = "screen procps xerces-c omniorb usrp"
 OSSIE_PLATFORM = "ossiecf ossie-standardinterfaces ossie-nodebooter ossie-c-wavloader"
diff --git a/packages/tasks/task-self-hosting.bb b/packages/tasks/task-self-hosting.bb
index 566e0956a0..87604a2dab 100644
--- a/packages/tasks/task-self-hosting.bb
+++ b/packages/tasks/task-self-hosting.bb
@@ -13,15 +13,15 @@ RDEPENDS = "cpp gcc-symlinks binutils-symlinks \
 #
 # bitbake will fetch all needed python modules
 #
-# toolchain: 
+# toolchain:
 # - gcc-symlinks will fetch gcc
 # - binutils-symlinks will fetch binutils
 # - glibc-utils REQ cpp
-# 
+#
 # problems:
 # - binutils-symlinks conflict with busybox
 # - glibc-dev conflict with libc-linux-headers-dev
-# - perl is so granulated that it is probably impossible 
+# - perl is so granulated that it is probably impossible
 #   to find out which packages are needed
 #
 
diff --git a/packages/tcpdump/tcpdump_3.9.3.bb b/packages/tcpdump/tcpdump_3.9.3.bb
index 0e52268cfd..7ffcc9a37f 100644
--- a/packages/tcpdump/tcpdump_3.9.3.bb
+++ b/packages/tcpdump/tcpdump_3.9.3.bb
@@ -9,7 +9,7 @@ PR = "r2"
 SRC_URI = "http://www.tcpdump.org/release/tcpdump-${PV}.tar.gz \
            file://tcpdump_configure_no_-O2.patch;patch=1"
 
-inherit autotools 
+inherit autotools
 
 EXTRA_OECONF = "--without-crypto"
 
diff --git a/packages/tetex/tetex_3.0.bb b/packages/tetex/tetex_3.0.bb
index f38bab7c10..68e5184439 100644
--- a/packages/tetex/tetex_3.0.bb
+++ b/packages/tetex/tetex_3.0.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "teTeX is a complete (pdf)(La)TeX distribution for UNIX compatible systems"
-HOMEPAGE = "http://www.tug.org/tetex" 
+HOMEPAGE = "http://www.tug.org/tetex"
 LICENSE = "GPL"
 SECTION = "console/utils"
 DEPENDS = "tetex-native flex gd ncurses libpng t1lib virtual/libx11 libxau libxext libxt zlib"
diff --git a/packages/thc/thcrut_1.2.5.bb b/packages/thc/thcrut_1.2.5.bb
index 57e91d3417..2efec91167 100644
--- a/packages/thc/thcrut_1.2.5.bb
+++ b/packages/thc/thcrut_1.2.5.bb
@@ -6,11 +6,11 @@ LICENSE = "GPL"
 PR = "r1"
 
 SRC_URI = "http://packetstorm.linuxsecurity.com/groups/thc/thcrut-1.2.5.tar.gz \
-	   file://configure_in.patch;patch=1;pnum=0" 
+	   file://configure_in.patch;patch=1;pnum=0"
 
 S = "${WORKDIR}/thcrut-${PV}"
 
-inherit autotools 
+inherit autotools
 
 EXTRA_OECONF = "--with-ssl=${STAGING_LIBDIR}/.."
 
diff --git a/packages/tickypip/tickypip-levels_1.1.bb b/packages/tickypip/tickypip-levels_1.1.bb
index 4e090db80a..c24044a168 100644
--- a/packages/tickypip/tickypip-levels_1.1.bb
+++ b/packages/tickypip/tickypip-levels_1.1.bb
@@ -19,7 +19,7 @@ S = "${WORKDIR}/"
 # packs in PalmGear.
 #
 # Packs available on PalmGear: Pak1, Pak3, Pak8, Pak9, Pak10
-# 
+#
 # URL: http://palmgear.com/index.cfm?fuseaction=software.developer&userID=862314499
 #
 # I also got permission to distribute rest of levelpacks which was available
diff --git a/packages/timesleuth/timesleuth_1.0.5.bb b/packages/timesleuth/timesleuth_1.0.5.bb
index 386695d5a9..655e9fd50c 100644
--- a/packages/timesleuth/timesleuth_1.0.5.bb
+++ b/packages/timesleuth/timesleuth_1.0.5.bb
@@ -18,7 +18,7 @@ APPDESKTOP = "${S}"
 do_install () {
 	install -d ${D}${palmtopdir}/pics/
 	install -m 0644 ${S}/*.png ${D}${palmtopdir}/pics/
-	
+
 }
 
 inherit opie
diff --git a/packages/timezones/timezones_1.2.0.bb b/packages/timezones/timezones_1.2.0.bb
index 676da9859f..8efe72d45c 100644
--- a/packages/timezones/timezones_1.2.0.bb
+++ b/packages/timezones/timezones_1.2.0.bb
@@ -20,7 +20,7 @@ python populate_packages_prepend() {
         pkgpattern = "timezone-%s"
         pkgdescription = "Timezone for %s"
 
-        do_split_packages(d, root=bb.data.expand('${datadir}/zoneinfo/', d), file_regex=pkgregex, output_pattern=pkgpattern, 
+        do_split_packages(d, root=bb.data.expand('${datadir}/zoneinfo/', d), file_regex=pkgregex, output_pattern=pkgpattern,
                           description=pkgdescription,allow_dirs=True )
 }
 
diff --git a/packages/tin/tin_1.7.3.bb b/packages/tin/tin_1.7.3.bb
index 3383f74757..58726d7a27 100644
--- a/packages/tin/tin_1.7.3.bb
+++ b/packages/tin/tin_1.7.3.bb
@@ -9,7 +9,7 @@ SRC_URI = "ftp://ftp.tin.org/pub/news/clients/tin/unstable/tin-${PV}.tar.gz \
 	   file://m4.patch;patch=1 \
 	   file://configure.patch;patch=1"
 
-inherit autotools 
+inherit autotools
 
 EXTRA_OECONF = "--with-screen=ncurses"
 CFLAGS += "-DM_UNIX"
diff --git a/packages/tin/tin_1.9.1.bb b/packages/tin/tin_1.9.1.bb
index 560184f413..dcf53bd8b5 100644
--- a/packages/tin/tin_1.9.1.bb
+++ b/packages/tin/tin_1.9.1.bb
@@ -7,7 +7,7 @@ PR = "r0"
 SRC_URI = "ftp://ftp.tin.org/pub/news/clients/tin/unstable/tin-${PV}.tar.gz \
 	   file://m4.patch;patch=1"
 
-inherit autotools 
+inherit autotools
 
 PARALLEL_MAKE = ""
 EXTRA_OECONF = "--with-screen=ncurses --with-pcre=${STAGING_LIBDIR}/.."
diff --git a/packages/tinymail/tinymail_svn.bb b/packages/tinymail/tinymail_svn.bb
index 68e6899756..2a379d9343 100644
--- a/packages/tinymail/tinymail_svn.bb
+++ b/packages/tinymail/tinymail_svn.bb
@@ -15,7 +15,7 @@ SRC_URI = "svn://svn.tinymail.org/svn/tinymail/;module=trunk;proto=http \
 	   file://gtk-doc.m4 \
            file://gtk-doc.make"
 
-inherit pkgconfig autotools 
+inherit pkgconfig autotools
 S = "${WORKDIR}/trunk"
 
 do_configure_prepend() {
@@ -50,7 +50,7 @@ FILES_tinymail-camel-lite-dev +=  "${libdir}/libcamel-lite*.so \
 				   ${libdir}/libcamel-lite*.a \
 				   ${libdir}/libcamel-lite*.la \
 				   ${libdir}/camel-lite-1.2/camel-providers/*.la \
-				   ${libdir}/camel-lite-1.2/camel-providers/*.a "			      
+				   ${libdir}/camel-lite-1.2/camel-providers/*.a "
 FILES_tinymail-camel-lite-dbg +=  "${libdir}/camel-lite-1.2/camel-providers/.debug"
 
 
diff --git a/packages/totem/totem_0.99.15.bb b/packages/totem/totem_0.99.15.bb
index 028a0d66fe..3defdaebe6 100644
--- a/packages/totem/totem_0.99.15.bb
+++ b/packages/totem/totem_0.99.15.bb
@@ -23,7 +23,7 @@ LDFLAGS_append = " -Wl,--export-dynamic"
 
 pkg_postinst_totem() {
 #!/bin/sh
-if [ -n "$D"  ]; then exit 1; fi; 
+if [ -n "$D"  ]; then exit 1; fi;
 SOURCE=`gconftool-2 --get-default-source`
 GCONF_CONFIG_SOURCE=$SOURCE gconftool-2 --makefile-install-rule \
 /etc/gconf/schemas/totem.schemas > /dev/null
diff --git a/packages/totem/totem_1.0.4.bb b/packages/totem/totem_1.0.4.bb
index 617b4aa9d0..a12f307ffa 100644
--- a/packages/totem/totem_1.0.4.bb
+++ b/packages/totem/totem_1.0.4.bb
@@ -26,7 +26,7 @@ LDFLAGS_append = " -Wl,--export-dynamic"
 
 pkg_postinst_totem() {
 #!/bin/sh
-if [ -n "$D"  ]; then exit 1; fi; 
+if [ -n "$D"  ]; then exit 1; fi;
 SOURCE=`gconftool-2 --get-default-source`
 GCONF_CONFIG_SOURCE=$SOURCE gconftool-2 --makefile-install-rule \
 /etc/gconf/schemas/totem.schemas > /dev/null
diff --git a/packages/transconnect/transconnect_1.3-beta.bb b/packages/transconnect/transconnect_1.3-beta.bb
index 807943daf8..45d9f87b61 100644
--- a/packages/transconnect/transconnect_1.3-beta.bb
+++ b/packages/transconnect/transconnect_1.3-beta.bb
@@ -9,7 +9,7 @@ S = "${WORKDIR}/transconnect-1.3-Beta"
 LDFLAGS_append = " -shared"
 do_compile () {
 	# build with local resolv.conf and dns over tcp support
-	oe_runmake localtcp 
+	oe_runmake localtcp
 }
 
 do_install () {
diff --git a/packages/tsclient/tsclient_0.132.bb b/packages/tsclient/tsclient_0.132.bb
index b6a73c0728..9f7955f5ee 100644
--- a/packages/tsclient/tsclient_0.132.bb
+++ b/packages/tsclient/tsclient_0.132.bb
@@ -13,7 +13,7 @@ SRC_URI="http://www.gnomepro.com/tsclient/tsclient-${PV}.tar.gz \
 
 DEPENDS="gtk+ intltool-native"
 
-inherit autotools 
+inherit autotools
 
 EXTRA_OECONF=" --without-applet --without-ica"
 
@@ -26,4 +26,4 @@ FILES_${PN}="${bindir}  \
 	${datadir}/pixmaps/tsclient/colors.png \
 	${datadir}/pixmaps/tsclient/keyboard.png \
 	${datadir}/pixmaps/tsclient/program.png \
-	${datadir}/pixmaps/tsclient/sound.png"	
+	${datadir}/pixmaps/tsclient/sound.png"
diff --git a/packages/tslib/tslib-maemo/multievent.patch b/packages/tslib/tslib-maemo/multievent.patch
deleted file mode 100644
index 854e7af5dd..0000000000
--- a/packages/tslib/tslib-maemo/multievent.patch
+++ /dev/null
@@ -1,843 +0,0 @@
---- tslib/plugins/linear.c~multievent
-+++ tslib/plugins/linear.c
-@@ -39,14 +39,12 @@
- linear_read(struct tslib_module_info *info, struct ts_sample *samp, int nr)
- {
- 	struct tslib_linear *lin = (struct tslib_linear *)info;
--	int ret;
-+	int ret, i = 0;
- 	int xtemp,ytemp;
- 
- 	ret = info->next->ops->read(info->next, samp, nr);
- 	if (ret >= 0) {
--		int nr;
--
--		for (nr = 0; nr < ret; nr++, samp++) {
-+		for (i = 0; i < ret; i++, samp++) {
- #ifdef DEBUG
- 			fprintf(stderr,"BEFORE CALIB--------------------> %d %d %d\n",samp->x, samp->y, samp->pressure);
- #endif /*DEBUG*/
-@@ -66,6 +64,7 @@
- 				samp->y = tmp;
- 			}
- 		}
-+		ret = i;
- 	}
- 
- 	return ret;
---- tslib/plugins/dejitter.c~multievent
-+++ tslib/plugins/dejitter.c
-@@ -24,7 +24,6 @@
- 
- struct tslib_threshold {
- 	struct tslib_module_info	module;
--	int			pthreshold;
- 	int			xdelta;
- 	int			ydelta;
- 	int			delta2;
-@@ -36,40 +35,28 @@
- static int threshold_read(struct tslib_module_info *info, struct ts_sample *samp, int nr)
- {
- 	struct tslib_threshold *thr = (struct tslib_threshold *)info;
--	struct ts_sample *s;
--	int ret;
-+	struct ts_sample *src = samp, *dest = samp;
-+	int ret, i = 0;
- 
- 	ret = info->next->ops->read(info->next, samp, nr);
- 	if (ret >= 0) {
--		int nr = 0;
--
--		for (s = samp; s < samp + ret; s++) {
-+		for (i = 0; i < ret; i++, samp++) {
- 			int dr2;
- #ifdef DEBUG
--			fprintf(stderr,"BEFORE DEJITTER---------------> %d %d %d\n",s->x,s->y,s->pressure);
-+			fprintf(stderr,"BEFORE DEJITTER---------------> %d %d %d\n", samp->x, samp->y, samp->pressure);
- #endif /*DEBUG*/
--			thr->down = (s->pressure >= thr->pthreshold);
--			if (thr->down) {
--				dr2 = (thr->x - s->x)*(thr->x - s->x) 
--					+ (thr->y - s->y)*(thr->y - s->y);
--				if(dr2 < thr->delta2) {
--					s->x = thr->x;
--					s->y = thr->y;
--				} else {
--					thr->x = s->x;
--					thr->y = s->y;
--				}
--
-+			dr2 = (thr->x - samp->x)*(thr->x - samp->x) 
-+				+ (thr->y - samp->y)*(thr->y - samp->y);
-+			if(dr2 < thr->delta2) {
-+				samp->x = thr->x;
-+				samp->y = thr->y;
- 			} else {
--				s->x = thr->x;
--				s->y = thr->y;
-+				thr->x = samp->x;
-+				thr->y = samp->y;
- 			}
--
--
--			samp[nr++] = *s;
- 		}
- 
--		ret = nr;
-+		ret = i;
- 	}
- 	return ret;
- }
-@@ -106,10 +93,6 @@
- 		thr->ydelta = v;
- 		break;
- 
--	case 3:
--		thr->pthreshold = v;
--		break;
--
- 	default:
- 		return -1;
- 	}
-@@ -120,7 +103,6 @@
- {
- 	{ "xdelta",	(void *)1, threshold_limit },
- 	{ "ydelta",	(void *)2, threshold_limit },
--	{ "pthreshold",	(void *)3, threshold_limit }
- };
- 
- //#define NR_VARS (sizeof(threshold_vars) / sizeof(threshold_vars[0]))
-@@ -138,7 +120,6 @@
- 
- 	thr->xdelta = 10;
- 	thr->ydelta = 10;
--	thr->pthreshold = 100;
- 
- 	if (tslib_parse_vars(&thr->module, threshold_vars, NR_VARS, params)) {
- 		free(thr);
---- tslib/plugins/variance.c~multievent
-+++ tslib/plugins/variance.c
-@@ -9,25 +9,36 @@
-  * $Id: variance.c,v 1.3 2002/11/08 23:28:55 dlowder Exp $
-  *
-  * Variance filter for touchscreen values
-+ *
-+ * Policy question (applies to all tslib modules that consume events):
-+ * 	1) User requests a read of 5 events using nr.
-+ * 	2) Lower layers return us 4 events.
-+ * 	3) Perform variance calculation, we now only have _1_ event.
-+ * 	4) Do we, a) duplicate this data across the user requested 4 events,
-+ * 		  b) push up the single event
-+ * 		  c) loop on the read from the lower layers to obtain
-+ * 		     the user's requested number of events, unless we hit
-+ * 		     a pen_up.
-  */
-+
- #include <errno.h>
- #include <stdlib.h>
- #include <string.h>
- #include <limits.h>
--
- #include <stdio.h>
- 
- #include "tslib.h"
- #include "tslib-filter.h"
- 
-+#define NR_INIT -1
- #define NR_LAST	4
- 
- struct tslib_variance {
- 	struct tslib_module_info	module;
- 	int				nr;
--	unsigned int			pthreshold;
- 	unsigned int			xlimit;
- 	unsigned int			ylimit;
-+	unsigned int			pthreshold;
- 	struct ts_sample		last[NR_LAST];
- };
- 
-@@ -37,8 +48,7 @@
-  * least variance, and average them.
-  */
- static int
--variance_calculate(struct tslib_variance *var, struct ts_sample *samp,
--		   struct ts_sample *s)
-+variance_calculate(struct tslib_variance *var, struct ts_sample *dest, struct ts_sample *src)
- {
- 	int i, j;
- 	int diff_x, min_x, i_x, j_x;
-@@ -100,11 +110,11 @@
- 		}
- 	}
- 
--	samp->x		 = (var->last[i_x].x + var->last[j_x].x) / 2;
--	samp->y		 = (var->last[i_y].y + var->last[j_y].y) / 2;
--	samp->pressure   = (var->last[i_p].pressure + var->last[j_p].pressure) / 2;
--	samp->tv.tv_sec  = s->tv.tv_sec;
--	samp->tv.tv_usec = s->tv.tv_usec;
-+	dest->x		 = (var->last[i_x].x + var->last[j_x].x) / 2;
-+	dest->y		 = (var->last[i_y].y + var->last[j_y].y) / 2;
-+	dest->pressure   = (var->last[i_p].pressure + var->last[j_p].pressure) / 2;
-+	dest->tv.tv_sec  = src->tv.tv_sec;
-+	dest->tv.tv_usec = src->tv.tv_usec;
- 
- 	return 1;
- }
-@@ -112,55 +122,57 @@
- static int variance_read(struct tslib_module_info *info, struct ts_sample *samp, int nr)
- {
- 	struct tslib_variance *var = (struct tslib_variance *)info;
--	struct ts_sample *s;
--	int ret;
--
--	ret = info->next->ops->read(info->next, samp, nr);
--	if (ret >= 0) {
--		int nr = 0;
--
--		for (s = samp; s < samp + ret; s++) {
--			if (s->pressure < var->pthreshold) {
--				/*
--				 * Pen was released.  Reset our state and
--				 * pass up the release information.
--				 */
--//				samp[nr].x = 0;
--//				samp[nr].y = 0;
--				samp[nr].pressure = s->pressure;
--				samp[nr].tv.tv_sec = s->tv.tv_sec;
--				samp[nr].tv.tv_usec = s->tv.tv_usec;
--
--				nr++;
--
--				var->nr = 0;
--				continue;
--			} else if (var->nr == -1) {
--				/*
--				 * Pen was pressed.  Inform upper layers
--				 * immediately.
--				 */
--				samp[nr] = *s;
--				nr++;
--			}
--
--			if (var->nr >= 0) {
--				var->last[var->nr].x = s->x;
--				var->last[var->nr].y = s->y;
--				var->last[var->nr].pressure = s->pressure;
--			}
--
--			var->nr++;
-+	struct ts_sample *src = samp, *dest = samp;
-+	int ret, i = 0;
- 
--			if (var->nr == NR_LAST) {
--				if (variance_calculate(var, samp + nr, s))
--					nr++;
--				var->nr = 0;
-+	/*
-+	 * NOTES:
-+	 *
-+	 * Loop on read, collecting events until we hit nr, unless
-+	 * we hit a pen up or encounter a failure.
-+	 */
-+	while ((i < nr) && (ret != -1)) {
-+		ret = info->next->ops->read(info->next, dest + i, nr - i);
-+		if (ret >= 0) {
-+			for (src = dest + i; src < dest + ret; src++) {
-+				if (src->pressure < var->pthreshold) {
-+					/* pen released, reset var->nr,
-+					 * do a calc based on what we have so
-+					 * far, and let this event flow up */
-+					if (variance_calculate(var, dest + i, src))
-+						i++;
-+					var->nr = NR_INIT;
-+					ret = -1; /* break outer loop, push up event */
-+					break;
-+				} else if (var->nr == NR_INIT) {
-+					/*
-+					 * First pen down event. Inform upper layers
-+					 * immediately for responsiveness.
-+					 */
-+					var->nr = 0;
-+					i++;
-+					ret = -1; /* break outer loop */
-+					break;
-+				}
-+	
-+				if (var->nr >= 0) {
-+					var->last[var->nr].x = src->x;
-+					var->last[var->nr].y = src->y;
-+					var->last[var->nr].pressure = src->pressure;
-+				}
-+	
-+				var->nr++;
-+	
-+				if (var->nr == NR_LAST) {
-+					if (variance_calculate(var, dest + i, src))
-+						i++;
-+					var->nr = 0;
-+				}
- 			}
- 		}
--
--		ret = nr;
- 	}
-+	/* if we've collected at least one event, send it up */
-+	if (i != 0) ret = i;
- 	return ret;
- }
- 
-@@ -196,10 +208,6 @@
- 		var->ylimit = v;
- 		break;
- 
--	case 3:
--		var->pthreshold = v;
--		break;
--
- 	default:
- 		return -1;
- 	}
-@@ -210,7 +218,6 @@
- {
- 	{ "xlimit",	(void *)1, variance_limit },
- 	{ "ylimit",	(void *)2, variance_limit },
--	{ "pthreshold",	(void *)3, variance_limit }
- };
- 
- #define NR_VARS (sizeof(variance_vars) / sizeof(variance_vars[0]))
-@@ -218,6 +225,7 @@
- struct tslib_module_info *mod_init(struct tsdev *dev, const char *params)
- {
- 	struct tslib_variance *var;
-+	char *pthresvar;
- 
- 	var = malloc(sizeof(struct tslib_variance));
- 	if (var == NULL)
-@@ -225,10 +233,15 @@
- 
- 	var->module.ops = &variance_ops;
- 
--	var->nr = -1;
-+	var->nr = NR_INIT;
- 	var->xlimit = 160;
- 	var->ylimit = 160;
- 	var->pthreshold = 100;
-+	pthresvar = getenv("TSLIB_PTHRES");
-+	if (pthresvar != NULL) {
-+		int p = strtol(pthresvar, (char **)NULL, 10);
-+		if (p != -1) var->pthreshold = p;
-+	}
- 
- 	if (tslib_parse_vars(&var->module, variance_vars, NR_VARS, params)) {
- 		free(var);
---- tslib/README~multievent
-+++ tslib/README
-@@ -36,6 +36,19 @@
- usages.  They are by no means exhaustive, nor probably even good examples.
- They are basically the programs I used to test this library.
- 
-+Module Creation Notes
-+=====================
-+
-+For those creating tslib modules, it is important to note a couple things with
-+regard to handling of the ability for a user to request more than one ts event
-+at a time.  The first thing to note is that the lower layers may send up less
-+events than the user requested, but only if that was a result of a pen release.
-+Next, your module should send up just as many events as the user requested in
-+nr.  If your module is one that consumes events, such as variance, then you
-+loop on the read from the lower layers, and only send the events up when
-+1) you have the number of events requested by the user, or 2) one of the events
-+from the lower layers was a pen release.
-+
- 
- Module Parameters
- =================
---- tslib/src/ts_read_raw.c~multievent
-+++ tslib/src/ts_read_raw.c
-@@ -14,10 +14,10 @@
-  *
-  * Read raw pressure, x, y, and timestamp from a touchscreen device.
-  */
-+
- #include "config.h"
- 
- #include <stdio.h>
--
- #include <stdlib.h>
- #ifdef HAVE_UNISTD_H
- #include <unistd.h>
-@@ -25,79 +25,27 @@
- #include <sys/time.h>
- #include <sys/types.h>
- 
--#ifdef USE_INPUT_API
--#include <linux/input.h>
--#else
--struct ts_event  {   /* Used in UCB1x00 style touchscreens (the default) */
--	unsigned short pressure;
--	unsigned short x;
--	unsigned short y;
--	unsigned short pad;
--	struct timeval stamp;
--};
--struct h3600_ts_event { /* Used in the Compaq IPAQ */
--	unsigned short pressure;
--	unsigned short x;
--	unsigned short y;
--	unsigned short pad;
--};
--struct mk712_ts_event { /* Used in the Hitachi Webpad */
--	unsigned int header;
--	unsigned int x;
--	unsigned int y;
--	unsigned int reserved;
--};
--struct arctic2_ts_event { /* Used in the IBM Arctic II */
--	signed short pressure;
--	signed int x;
--	signed int y;
--	int millisecs;
--	int flags;
--};
--struct collie_ts_event { /* Used in the Sharp Zaurus SL-5000d and SL-5500 */
--	long y;
--	long x;
--	long pressure;
--	long long millisecs;
--};
--struct corgi_ts_event { /* Used in the Sharp Zaurus SL-C700 */
--	short pressure;
--	short x;
--	short y;
--	short millisecs;
--};
--#endif /* USE_INPUT_API */
--
- #include "tslib-private.h"
- 
--int ts_read_raw(struct tsdev *ts, struct ts_sample *samp, int nr)
--{
- #ifdef USE_INPUT_API
-+#include <linux/input.h>
-+
-+static inline int get_input_event(struct tsdev *ts, struct ts_sample *samp) {
- 	struct input_event ev;
--#else
--	struct ts_event *evt;
--	struct h3600_ts_event *hevt;
--	struct mk712_ts_event *mevt;
--	struct arctic2_ts_event *aevt;
--	struct collie_ts_event *collie_evt;
--	struct corgi_ts_event *corgi_evt;
--#endif /* USE_INPUT_API */
--	int ret;
--	int total = 0;
-+	struct timeval tv = {0, 0};
-+	fd_set fdset;
-+	int ret = 0;
- 
--	char *tseventtype=NULL;
--	char *defaulttseventtype="UCB1x00";
-+	/* event vars */
-+	static int curr_x = 0, curr_y = 0;
-+	int curr_p = 0, next_x = 0, next_y = 0;
- 
--#ifdef USE_INPUT_API
--	/* warning: maybe those static vars should be part of the tsdev struct? */
--	static int curr_x = 0, curr_y = 0, curr_p = 0;
--	static int got_curr_x = 0, got_curr_y = 0;
--	int got_curr_p = 0;
--	int next_x, next_y;
-+	/* state variables */
-+	int got_curr_x = 0, got_curr_y = 0, got_curr_p = 0;
- 	int got_next_x = 0, got_next_y = 0;
- 	int got_tstamp = 0;
- 
--	while (total < nr) {
-+	while (1) {
- 		ret = read(ts->fd, &ev, sizeof(struct input_event));
- 		if (ret < sizeof(struct input_event)) break;
- 
-@@ -146,177 +94,231 @@
- 			samp->tv = ev.time;
- 		}
- 
--		if ( (!got_curr_x || !got_curr_y) && !got_curr_p &&
--		     !got_next_x && !got_next_y ) {
--			/*
--			 * The current event is not complete yet.
--			 * Give the kernel a chance to feed us more.
--			 */
--			struct timeval tv = {0, 0};
--			fd_set fdset;
--			FD_ZERO(&fdset);
--			FD_SET(ts->fd, &fdset);
--			ret = select(ts->fd+1, &fdset, NULL, NULL, &tv);
--		       	if (ret == 1) continue;
--			if (ret == -1) break;
-+		if (got_curr_x && got_curr_y && got_curr_p) {
-+			/* we have a complete event */
-+			samp->x = curr_x;
-+			samp->y = curr_y;
-+			samp->pressure = curr_p;
-+			ret = 0; /* indicate success */
-+			if (got_next_x) curr_x = next_x;
-+			if (got_next_y) curr_y = next_y;
-+			break;
- 		}
- 
--		/* We consider having a complete ts event */
--		samp->x = curr_x;
--		samp->y = curr_y;
--		samp->pressure = curr_p;
--#ifdef DEBUG
--        fprintf(stderr,"RAW---------------------------> %d %d %d\n",samp->x,samp->y,samp->pressure);
--#endif /*DEBUG*/
--		samp++;
--		total++;
--        
--		/* get ready for next event */
--		if (got_next_x) curr_x = next_x; else got_curr_x = 0;
--		if (got_next_y) curr_y = next_y; else got_curr_y = 0;
--		got_next_x = got_next_y = got_tstamp = 0;
-+		/*
-+		 * The current event is not complete yet.
-+		 * Give the kernel a chance to feed us more.
-+		 */
-+		FD_ZERO(&fdset);
-+		FD_SET(ts->fd, &fdset);
-+		ret = select(ts->fd+1, &fdset, NULL, NULL, &tv);
-+	       	if (ret == 1) continue;
-+		if (ret == -1) break;
- 	}
- 
--	if (ret) ret = -1;
--	if (total) ret = total;
-+//	fprintf(stdout, "%s: returning %d\n", __FUNCTION__, ret);
-+	if (ret != 0) ret = -1;
-+	return ret;
-+}
-+
- #else
-+
-+struct ucb1x00_ts_event  {   /* Used in UCB1x00 style touchscreens (the default) */
-+	unsigned short pressure;
-+	unsigned short x;
-+	unsigned short y;
-+	unsigned short pad;
-+	struct timeval stamp;
-+};
-+struct h3600_ts_event { /* Used in the Compaq IPAQ */
-+	unsigned short pressure;
-+	unsigned short x;
-+	unsigned short y;
-+	unsigned short pad;
-+};
-+struct mk712_ts_event { /* Used in the Hitachi Webpad */
-+	unsigned int header;
-+	unsigned int x;
-+	unsigned int y;
-+	unsigned int reserved;
-+};
-+struct arctic2_ts_event { /* Used in the IBM Arctic II */
-+	signed short pressure;
-+	signed int x;
-+	signed int y;
-+	int millisecs;
-+	int flags;
-+};
-+struct collie_ts_event { /* Used in the Sharp Zaurus SL-5000d and SL-5500 */
-+	long y;
-+	long x;
-+	long pressure;
-+	long long millisecs;
-+};
-+struct corgi_ts_event { /* Used in the Sharp Zaurus SL-C700 */
-+	short pressure;
-+	short x;
-+	short y;
-+	short millisecs;
-+};
-+
-+static inline int get_ucb1x00_event(struct tsdev *ts, struct ts_sample *samp) {
-+	struct ucb1x00_ts_event evt;
-+	int ret = read(ts->fd, &evt, sizeof(struct ucb1x00_ts_event));
-+	if (ret > 0) {
-+		samp->x = evt.x;
-+		samp->y = evt.y;
-+		samp->pressure = evt.pressure;
-+		samp->tv.tv_usec = evt.stamp.tv_usec;
-+		samp->tv.tv_sec = evt.stamp.tv_sec;
-+		ret = 0; /* success */
-+	}
-+	return ret;
-+}
-+
-+static inline int get_h3600_event(struct tsdev *ts, struct ts_sample *samp) {
-+	struct h3600_ts_event evt;
-+	int ret = read(ts->fd, &evt, sizeof(struct h3600_ts_event));
-+	if (ret > 0) {
-+		samp->x = evt.x;
-+		samp->y = evt.y;
-+		samp->pressure = evt.pressure;
-+		gettimeofday(&samp->tv, NULL);
-+		ret = 0; /* success */
-+	}
-+	return ret;
-+}
-+
-+static inline int get_mk712_event(struct tsdev *ts, struct ts_sample *samp) {
-+	struct mk712_ts_event evt;
-+	int ret = read(ts->fd, &evt, sizeof(struct mk712_ts_event));
-+	if (ret > 0) {
-+		samp->x = (short)evt.x;
-+		samp->y = (short)evt.y;
-+		if(evt.header==0)
-+			samp->pressure=1;
-+		else
-+			samp->pressure=0;
-+		gettimeofday(&samp->tv, NULL);
-+		ret = 0; /* success */
-+	}
-+	return ret;
-+}
-+
-+static inline int get_arctic2_event(struct tsdev *ts, struct ts_sample *samp) {
-+	struct arctic2_ts_event evt;
-+	int ret = read(ts->fd, &evt, sizeof(struct arctic2_ts_event));
-+	if (ret > 0) {
-+		samp->x = (short)evt.x;
-+		samp->y = (short)evt.y;
-+		samp->pressure = evt.pressure;
-+		gettimeofday(&samp->tv, NULL);
-+		ret = 0; /* success */
-+	}
-+	return ret;
-+}
-+
-+static inline int get_collie_event(struct tsdev *ts, struct ts_sample *samp) {
-+	struct collie_ts_event evt;
-+	int ret = read(ts->fd, &evt, sizeof(struct collie_ts_event));
-+	if (ret > 0) {
-+		samp->x = evt.x;
-+		samp->y = evt.y;
-+		samp->pressure = evt.pressure;
-+		samp->tv.tv_usec = evt.millisecs % 1000;
-+		samp->tv.tv_sec = evt.millisecs / 1000;
-+		ret = 0; /* success */
-+	}
-+	return ret;
-+}
-+
-+static inline int get_corgi_event(struct tsdev *ts, struct ts_sample *samp) {
-+	struct corgi_ts_event evt;
-+	int ret = read(ts->fd, &evt, sizeof(struct corgi_ts_event));
-+	if (ret > 0) {
-+		samp->x = evt.x;
-+		samp->y = evt.y;
-+		samp->pressure = evt.pressure;
-+		samp->tv.tv_usec = evt.millisecs % 1000;
-+		samp->tv.tv_sec = evt.millisecs / 1000;
-+		ret = 0; /* success */
-+	}
-+	return ret;
-+}
-+
-+#endif
-+
-+int ts_read_raw(struct tsdev *ts, struct ts_sample *samp, int nr)
-+{
-+	int ret;
-+	int total = 0;
-+	int pen_down = 1;
-+	static short x_save = 0, y_save = 0;
-+	static int pthres = -1;
-+
-+#ifndef USE_INPUT_API
-+	char *tseventtype=NULL;
-+	char *defaulttseventtype="UCB1x00";
- 	tseventtype = getenv("TSLIB_TSEVENTTYPE");
- 	if(tseventtype==NULL) tseventtype=defaulttseventtype;
-+#endif
- 
--	if( strcmp(tseventtype,"H3600") == 0) { /* iPAQ style h3600 touchscreen events */
--		hevt = alloca(sizeof(*hevt) * nr);
--		ret = read(ts->fd, hevt, sizeof(*hevt) * nr);
--		if(ret > 0) {
--			int nr = ret / sizeof(*hevt);
--			while(ret >= sizeof(*hevt)) {
--				samp->x = hevt->x;
--				samp->y = hevt->y;
--				samp->pressure = hevt->pressure;
--#ifdef DEBUG
--        fprintf(stderr,"RAW---------------------------> %d %d %d\n",samp->x,samp->y,samp->pressure);
--#endif /*DEBUG*/
--				gettimeofday(&samp->tv,NULL);
--				samp++;
--				hevt++;
--				ret -= sizeof(*hevt);
--			}
--		} else {
--			return -1;
--		}
--	} else if( strcmp(tseventtype,"MK712") == 0) { /* Hitachi Webpad events */
--		mevt = alloca(sizeof(*mevt) * nr);
--		ret = read(ts->fd, mevt, sizeof(*mevt) * nr);
--		if(ret > 0) {
--			int nr = ret / sizeof(*mevt);
--			while(ret >= sizeof(*mevt)) {
--				samp->x = (short)mevt->x;
--				samp->y = (short)mevt->y;
--				if(mevt->header==0)
--					samp->pressure=1;
--				else
--					samp->pressure=0;
--#ifdef DEBUG
--        fprintf(stderr,"RAW---------------------------> %d %d %d\n",samp->x,samp->y,samp->pressure);
--#endif /*DEBUG*/
--				gettimeofday(&samp->tv,NULL);
--				samp++;
--				mevt++;
--				ret -= sizeof(*mevt);
--			}
--		} else {
--			return -1;
--		}
--
--	} else if( strcmp(tseventtype,"ARCTIC2") == 0) { /* IBM Arctic II events */
--		aevt = alloca(sizeof(*aevt) * nr);
--		ret = read(ts->fd, aevt, sizeof(*aevt) * nr);
--		if(ret > 0) {
--			int nr = ret / sizeof(*aevt);
--			while(ret >= sizeof(*aevt)) {
--				samp->x = (short)aevt->x;
--				samp->y = (short)aevt->y;
--				samp->pressure = aevt->pressure;
--#ifdef DEBUG
--        fprintf(stderr,"RAW---------------------------> %d %d %d\n",samp->x,samp->y,samp->pressure);
--#endif /*DEBUG*/
--				gettimeofday(&samp->tv,NULL);
--				samp++;
--				aevt++;
--				ret -= sizeof(*aevt);
--			}
-+	while ((total < nr) && pen_down) {
-+//		fprintf(stdout, "total: %d, nr: %d\n", total, nr);
-+#ifdef USE_INPUT_API
-+		ret = get_input_event(ts, samp);
-+#else
-+		if (strcmp(tseventtype, "H3600") == 0) {
-+			/* iPAQ style h3600 touchscreen events */
-+			ret = get_h3600_event(ts, samp);
-+		} else if (strcmp(tseventtype, "MK712") == 0) {
-+			/* Hitachi Webpad events */
-+			ret = get_mk712_event(ts, samp);
-+		} else if (strcmp(tseventtype, "ARCTIC2") == 0) {
-+			/* IBM Arctic II events */
-+			ret = get_arctic2_event(ts, samp);
-+		} else if (strcmp(tseventtype, "COLLIE") == 0) {
-+			/* Sharp Zaurus SL-5000d/5500 events */
-+			ret = get_collie_event(ts, samp);
-+		} else if (strcmp(tseventtype,"CORGI") == 0) {
-+			/* Sharp Zaurus SL-C700 events */
-+			ret = get_corgi_event(ts, samp);
- 		} else {
--			return -1;
-+			/* Use normal UCB1x00 type events */
-+			ret = get_ucb1x00_event(ts, samp);
- 		}
-+#endif
-+		if (ret != 0) break;
- 
--	} else if( strcmp(tseventtype,"COLLIE") == 0) { /* Sharp Zaurus SL-5000d/5500 events */
--		collie_evt = alloca(sizeof(*collie_evt) * nr);
--		ret = read(ts->fd, collie_evt, sizeof(*collie_evt) * nr);
--		if(ret > 0) {
--			int nr = ret / sizeof(*collie_evt);
--			while(ret >= sizeof(*collie_evt)) {
--				samp->x = collie_evt->x;
--				samp->y = collie_evt->y;
--				samp->pressure = collie_evt->pressure;
--#ifdef DEBUG
--        fprintf(stderr,"RAW---------------------------> %d %d %d\n",samp->x,samp->y,samp->pressure);
--#endif /*DEBUG*/
--				samp->tv.tv_usec = collie_evt->millisecs % 1000;
--				samp->tv.tv_sec = collie_evt->millisecs / 1000;
--				samp++;
--				collie_evt++;
--				ret -= sizeof(*collie_evt);
-+		if (pthres == -1) {
-+			char *pthresvar = getenv("TSLIB_PTHRES");
-+			pthres = 100;
-+			if (pthresvar != NULL) {
-+				int p = strtol(pthresvar, (char **)NULL, 10);
-+				if (p != -1) pthres = p;
- 			}
--		} else {
--			return -1;
- 		}
- 
--	} else if( strcmp(tseventtype,"CORGI") == 0) { /* Sharp Zaurus SL-C700 events */
--		corgi_evt = alloca(sizeof(*corgi_evt) * nr);
--		ret = read(ts->fd, corgi_evt, sizeof(*corgi_evt) * nr);
--		if(ret > 0) {
--			int nr = ret / sizeof(*corgi_evt);
--			while(ret >= sizeof(*corgi_evt)) {
--				samp->x = corgi_evt->x;
--				samp->y = corgi_evt->y;
--				samp->pressure = corgi_evt->pressure;
--#ifdef DEBUG
--        fprintf(stderr,"RAW---------------------------> %d %d %d\n",samp->x,samp->y,samp->pressure);
--#endif /*DEBUG*/
--				samp->tv.tv_usec = corgi_evt->millisecs % 1000;
--				samp->tv.tv_sec = corgi_evt->millisecs / 1000;
--				samp++;
--				corgi_evt++;
--				ret -= sizeof(*corgi_evt);
--			}
-+		if (samp->pressure < pthres) {
-+			/* pen released, send events up */
-+			pen_down = 0;
-+			/* set x and y to previous values */
-+			samp->x = x_save;
-+			samp->y = y_save;
- 		} else {
--			return -1;
-+			pen_down = 1;
-+			x_save = samp->x;
-+			y_save = samp->y;
- 		}
--
--	} else { /* Use normal UCB1x00 type events */
--		evt = alloca(sizeof(*evt) * nr);
--		ret = read(ts->fd, evt, sizeof(*evt) * nr);
--		if(ret > 0) {
--			int nr = ret / sizeof(*evt);
--			while(ret >= sizeof(*evt)) {
--				samp->x = evt->x;
--				samp->y = evt->y;
--				samp->pressure = evt->pressure;
- #ifdef DEBUG
--        fprintf(stderr,"RAW---------------------------> %d %d %d\n",samp->x,samp->y,samp->pressure);
-+	        fprintf(stderr,"RAW---------------------------> %d %d %d\n",samp->x, samp->y, samp->pressure);
- #endif /*DEBUG*/
--				samp->tv.tv_usec = evt->stamp.tv_usec;
--				samp->tv.tv_sec = evt->stamp.tv_sec;
--				samp++;
--				evt++;
--				ret -= sizeof(*evt);
--			}
--		} else {
--			return -1;
--		}
-+		samp++;
-+		total++;
- 	}
--	ret = nr;
--#endif /* USE_INPUT_API */
- 
-+	if (ret != 0) ret = -1;
-+	if (total) ret = total;
- 	return ret;
- }
- 
diff --git a/packages/tslib/tslib/akita/tslib.sh b/packages/tslib/tslib/akita/tslib.sh
deleted file mode 100644
index 0ff219b31f..0000000000
--- a/packages/tslib/tslib/akita/tslib.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-TSLIB_TSDEVICE=/dev/input/touchscreen0
-TSLIB_CONFFILE=/etc/ts.conf
-
-case `uname -r` in
-2.4*)
-	TSLIB_TSDEVICE=/dev/ts
-	TSLIB_CONFFILE=/usr/share/tslib/ts.conf-corgi-2.4
-	;;
-esac
-
-export TSLIB_TSDEVICE TSLIB_CONFFILE
diff --git a/packages/tslib/tslib/c7x0/.mtn2git_empty b/packages/tslib/tslib/c7x0/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/tslib/tslib/c7x0/.mtn2git_empty
+++ /dev/null
diff --git a/packages/tslib/tslib/c7x0/tslib.sh b/packages/tslib/tslib/c7x0/tslib.sh
deleted file mode 100644
index 0ff219b31f..0000000000
--- a/packages/tslib/tslib/c7x0/tslib.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-TSLIB_TSDEVICE=/dev/input/touchscreen0
-TSLIB_CONFFILE=/etc/ts.conf
-
-case `uname -r` in
-2.4*)
-	TSLIB_TSDEVICE=/dev/ts
-	TSLIB_CONFFILE=/usr/share/tslib/ts.conf-corgi-2.4
-	;;
-esac
-
-export TSLIB_TSDEVICE TSLIB_CONFFILE
diff --git a/packages/tslib/tslib/h1940/.mtn2git_empty b/packages/tslib/tslib/h1940/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/tslib/tslib/h1940/.mtn2git_empty
+++ /dev/null
diff --git a/packages/tslib/tslib/h1940/tslib.sh b/packages/tslib/tslib/h1940/tslib.sh
deleted file mode 100644
index f73e39c5d9..0000000000
--- a/packages/tslib/tslib/h1940/tslib.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-TSLIB_TSDEVICE=/dev/input/touchscreen0
-TSLIB_CONFFILE=/etc/ts.conf
-
-export TSLIB_TSDEVICE TSLIB_CONFFILE
-
diff --git a/packages/tslib/tslib/h2200/.mtn2git_empty b/packages/tslib/tslib/h2200/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/tslib/tslib/h2200/.mtn2git_empty
+++ /dev/null
diff --git a/packages/tslib/tslib/h2200/tslib.sh b/packages/tslib/tslib/h2200/tslib.sh
deleted file mode 100644
index 586d5c7deb..0000000000
--- a/packages/tslib/tslib/h2200/tslib.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-TSLIB_TSDEVICE=/dev/input/touchscreen0
-TSLIB_CONFFILE=/etc/ts.conf
-
-export TSLIB_TSDEVICE TSLIB_CONFFILE
diff --git a/packages/tslib/tslib/h3600/.mtn2git_empty b/packages/tslib/tslib/h3600/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/tslib/tslib/h3600/.mtn2git_empty
+++ /dev/null
diff --git a/packages/tslib/tslib/h3600/tslib.sh b/packages/tslib/tslib/h3600/tslib.sh
deleted file mode 100644
index f73e39c5d9..0000000000
--- a/packages/tslib/tslib/h3600/tslib.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-TSLIB_TSDEVICE=/dev/input/touchscreen0
-TSLIB_CONFFILE=/etc/ts.conf
-
-export TSLIB_TSDEVICE TSLIB_CONFFILE
-
diff --git a/packages/tslib/tslib/h3900/.mtn2git_empty b/packages/tslib/tslib/h3900/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/tslib/tslib/h3900/.mtn2git_empty
+++ /dev/null
diff --git a/packages/tslib/tslib/h3900/tslib.sh b/packages/tslib/tslib/h3900/tslib.sh
deleted file mode 100644
index f73e39c5d9..0000000000
--- a/packages/tslib/tslib/h3900/tslib.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-TSLIB_TSDEVICE=/dev/input/touchscreen0
-TSLIB_CONFFILE=/etc/ts.conf
-
-export TSLIB_TSDEVICE TSLIB_CONFFILE
-
diff --git a/packages/tslib/tslib/h4000/.mtn2git_empty b/packages/tslib/tslib/h4000/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/tslib/tslib/h4000/.mtn2git_empty
+++ /dev/null
diff --git a/packages/tslib/tslib/h4000/tslib.sh b/packages/tslib/tslib/h4000/tslib.sh
deleted file mode 100644
index f73e39c5d9..0000000000
--- a/packages/tslib/tslib/h4000/tslib.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-TSLIB_TSDEVICE=/dev/input/touchscreen0
-TSLIB_CONFFILE=/etc/ts.conf
-
-export TSLIB_TSDEVICE TSLIB_CONFFILE
-
diff --git a/packages/tslib/tslib/h5000/.mtn2git_empty b/packages/tslib/tslib/h5000/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/tslib/tslib/h5000/.mtn2git_empty
+++ /dev/null
diff --git a/packages/tslib/tslib/h5000/tslib.sh b/packages/tslib/tslib/h5000/tslib.sh
deleted file mode 100644
index 586d5c7deb..0000000000
--- a/packages/tslib/tslib/h5000/tslib.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-TSLIB_TSDEVICE=/dev/input/touchscreen0
-TSLIB_CONFFILE=/etc/ts.conf
-
-export TSLIB_TSDEVICE TSLIB_CONFFILE
diff --git a/packages/tslib/tslib/h6300/.mtn2git_empty b/packages/tslib/tslib/h6300/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/tslib/tslib/h6300/.mtn2git_empty
+++ /dev/null
diff --git a/packages/tslib/tslib/h6300/tslib.sh b/packages/tslib/tslib/h6300/tslib.sh
deleted file mode 100644
index 586d5c7deb..0000000000
--- a/packages/tslib/tslib/h6300/tslib.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-TSLIB_TSDEVICE=/dev/input/touchscreen0
-TSLIB_CONFFILE=/etc/ts.conf
-
-export TSLIB_TSDEVICE TSLIB_CONFFILE
diff --git a/packages/tslib/tslib/htcblueangel/.mtn2git_empty b/packages/tslib/tslib/htcblueangel/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/tslib/tslib/htcblueangel/.mtn2git_empty
+++ /dev/null
diff --git a/packages/tslib/tslib/htcblueangel/tslib.sh b/packages/tslib/tslib/htcblueangel/tslib.sh
deleted file mode 100644
index 586d5c7deb..0000000000
--- a/packages/tslib/tslib/htcblueangel/tslib.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-TSLIB_TSDEVICE=/dev/input/touchscreen0
-TSLIB_CONFFILE=/etc/ts.conf
-
-export TSLIB_TSDEVICE TSLIB_CONFFILE
diff --git a/packages/tslib/tslib/htcuniversal/.mtn2git_empty b/packages/tslib/tslib/htcuniversal/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/tslib/tslib/htcuniversal/.mtn2git_empty
+++ /dev/null
diff --git a/packages/tslib/tslib/htcuniversal/tslib.sh b/packages/tslib/tslib/htcuniversal/tslib.sh
deleted file mode 100644
index 586d5c7deb..0000000000
--- a/packages/tslib/tslib/htcuniversal/tslib.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-TSLIB_TSDEVICE=/dev/input/touchscreen0
-TSLIB_CONFFILE=/etc/ts.conf
-
-export TSLIB_TSDEVICE TSLIB_CONFFILE
diff --git a/packages/tslib/tslib/hx2000/.mtn2git_empty b/packages/tslib/tslib/hx2000/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/tslib/tslib/hx2000/.mtn2git_empty
+++ /dev/null
diff --git a/packages/tslib/tslib/hx2000/tslib.sh b/packages/tslib/tslib/hx2000/tslib.sh
deleted file mode 100644
index 586d5c7deb..0000000000
--- a/packages/tslib/tslib/hx2000/tslib.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-TSLIB_TSDEVICE=/dev/input/touchscreen0
-TSLIB_CONFFILE=/etc/ts.conf
-
-export TSLIB_TSDEVICE TSLIB_CONFFILE
diff --git a/packages/tslib/tslib/hx4700/.mtn2git_empty b/packages/tslib/tslib/hx4700/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/tslib/tslib/hx4700/.mtn2git_empty
+++ /dev/null
diff --git a/packages/tslib/tslib/hx4700/tslib.sh b/packages/tslib/tslib/hx4700/tslib.sh
deleted file mode 100644
index 586d5c7deb..0000000000
--- a/packages/tslib/tslib/hx4700/tslib.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-TSLIB_TSDEVICE=/dev/input/touchscreen0
-TSLIB_CONFFILE=/etc/ts.conf
-
-export TSLIB_TSDEVICE TSLIB_CONFFILE
diff --git a/packages/tslib/tslib/nokia770/.mtn2git_empty b/packages/tslib/tslib/nokia770/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/tslib/tslib/nokia770/.mtn2git_empty
+++ /dev/null
diff --git a/packages/tslib/tslib/nokia770/tslib.sh b/packages/tslib/tslib/nokia770/tslib.sh
deleted file mode 100644
index b7acc274c0..0000000000
--- a/packages/tslib/tslib/nokia770/tslib.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-TSLIB_TSDEVICE=/dev/input/touchscreen0
-
-export TSLIB_TSDEVICE
diff --git a/packages/tslib/tslib/poodle/.mtn2git_empty b/packages/tslib/tslib/poodle/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/tslib/tslib/poodle/.mtn2git_empty
+++ /dev/null
diff --git a/packages/tslib/tslib/poodle/tslib.sh b/packages/tslib/tslib/poodle/tslib.sh
deleted file mode 100644
index 664bda426a..0000000000
--- a/packages/tslib/tslib/poodle/tslib.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-TSLIB_TSDEVICE=/dev/input/touchscreen0
-TSLIB_CONFFILE=/etc/ts.conf
-
-case `uname -r` in
-2.4*)
-	TSLIB_TSDEVICE=/dev/ts
-	TSLIB_CONFFILE=/usr/share/tslib/ts.conf-collie-2.4
-	;;
-esac
-
-export TSLIB_TSDEVICE TSLIB_CONFFILE
diff --git a/packages/tslib/tslib/qemuarm/.mtn2git_empty b/packages/tslib/tslib/qemuarm/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/tslib/tslib/qemuarm/.mtn2git_empty
+++ /dev/null
diff --git a/packages/tslib/tslib/qemuarm/tslib.sh b/packages/tslib/tslib/qemuarm/tslib.sh
deleted file mode 100644
index b7acc274c0..0000000000
--- a/packages/tslib/tslib/qemuarm/tslib.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-TSLIB_TSDEVICE=/dev/input/touchscreen0
-
-export TSLIB_TSDEVICE
diff --git a/packages/tslib/tslib/smdk2440/.mtn2git_empty b/packages/tslib/tslib/smdk2440/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/tslib/tslib/smdk2440/.mtn2git_empty
+++ /dev/null
diff --git a/packages/tslib/tslib/smdk2440/tslib.sh b/packages/tslib/tslib/smdk2440/tslib.sh
deleted file mode 100644
index 586d5c7deb..0000000000
--- a/packages/tslib/tslib/smdk2440/tslib.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-TSLIB_TSDEVICE=/dev/input/touchscreen0
-TSLIB_CONFFILE=/etc/ts.conf
-
-export TSLIB_TSDEVICE TSLIB_CONFFILE
diff --git a/packages/tslib/tslib/spitz/.mtn2git_empty b/packages/tslib/tslib/spitz/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/tslib/tslib/spitz/.mtn2git_empty
+++ /dev/null
diff --git a/packages/tslib/tslib/spitz/tslib.sh b/packages/tslib/tslib/spitz/tslib.sh
deleted file mode 100644
index 0ff219b31f..0000000000
--- a/packages/tslib/tslib/spitz/tslib.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-TSLIB_TSDEVICE=/dev/input/touchscreen0
-TSLIB_CONFFILE=/etc/ts.conf
-
-case `uname -r` in
-2.4*)
-	TSLIB_TSDEVICE=/dev/ts
-	TSLIB_CONFFILE=/usr/share/tslib/ts.conf-corgi-2.4
-	;;
-esac
-
-export TSLIB_TSDEVICE TSLIB_CONFFILE
diff --git a/packages/tslib/tslib/tosa/.mtn2git_empty b/packages/tslib/tslib/tosa/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/tslib/tslib/tosa/.mtn2git_empty
+++ /dev/null
diff --git a/packages/tslib/tslib/tosa/tslib.sh b/packages/tslib/tslib/tosa/tslib.sh
deleted file mode 100644
index 0ff219b31f..0000000000
--- a/packages/tslib/tslib/tosa/tslib.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-TSLIB_TSDEVICE=/dev/input/touchscreen0
-TSLIB_CONFFILE=/etc/ts.conf
-
-case `uname -r` in
-2.4*)
-	TSLIB_TSDEVICE=/dev/ts
-	TSLIB_CONFFILE=/usr/share/tslib/ts.conf-corgi-2.4
-	;;
-esac
-
-export TSLIB_TSDEVICE TSLIB_CONFFILE
diff --git a/packages/tslib/tslib/ts.conf-corgi-2.4 b/packages/tslib/tslib/ts.conf-corgi-2.4
deleted file mode 100644
index 07fbbea2a8..0000000000
--- a/packages/tslib/tslib/ts.conf-corgi-2.4
+++ /dev/null
@@ -1,5 +0,0 @@
-module_raw corgi
-module pthres pmin=1
-module variance delta=30
-module dejitter delta=100
-module linear
diff --git a/packages/tslib/tslib/ts.conf-h3600-2.4 b/packages/tslib/tslib/ts.conf-h3600-2.4
deleted file mode 100644
index 20729b6154..0000000000
--- a/packages/tslib/tslib/ts.conf-h3600-2.4
+++ /dev/null
@@ -1,5 +0,0 @@
-module_raw h3600
-module pthres pmin=1
-module variance delta=30
-module dejitter delta=100
-module linear
diff --git a/packages/tslib/tslib/tslib.sh b/packages/tslib/tslib/tslib.sh
index e69de29bb2..5221b05b8a 100644
--- a/packages/tslib/tslib/tslib.sh
+++ b/packages/tslib/tslib/tslib.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+TSLIB_TSDEVICE=/dev/input/touchscreen0
+
+export TSLIB_TSDEVICE
+
diff --git a/packages/tslib/tslib_1.0.bb b/packages/tslib/tslib_1.0.bb
index 579a8ee51a..0ece5b0331 100644
--- a/packages/tslib/tslib_1.0.bb
+++ b/packages/tslib/tslib_1.0.bb
@@ -4,13 +4,11 @@ AUTHOR = "Russell King w/ plugins by Chris Larson et. al."
 SECTION = "base"
 LICENSE = "LGPL"
 
-PR = "r6"
+PR = "r7"
 
 SRC_URI = "http://download.berlios.de/tslib/tslib-1.0.tar.bz2 \
            file://ts.conf \
-           file://ts.conf-h3600-2.4 \
            file://ts.conf-simpad-2.4 \
-           file://ts.conf-corgi-2.4 \
            file://ts.conf-collie-2.4 \
            file://tslib.sh"
 SRC_URI_append_mnci += " file://devfs.patch;patch=1"
@@ -33,19 +31,10 @@ do_install_append() {
 	install -d ${D}${sysconfdir}/profile.d/
 	install -m 0755 ${WORKDIR}/tslib.sh ${D}${sysconfdir}/profile.d/
 	case ${MACHINE} in
-	a780 | e680 )
-		install -d ${D}${datadir}/tslib
-		install -m 0644 ${WORKDIR}/ts.conf-h3600-2.4 ${D}${datadir}/tslib/
-		;;
-	c7x0 | spitz | akita | tosa )
-		install -d ${D}${datadir}/tslib
-		install -m 0644 ${WORKDIR}/ts.conf-corgi-2.4 ${D}${datadir}/tslib/
-		;;
-	collie | poodle )
+	collie )
 		install -d ${D}${datadir}/tslib
 		install -m 0644 ${WORKDIR}/ts.conf-collie-2.4 ${D}${datadir}/tslib/
 		;;
-
 	simpad )
 		install -d ${D}${datadir}/tslib
 		install -m 0644 ${WORKDIR}/ts.conf-simpad-2.4 ${D}${datadir}/tslib/
@@ -57,13 +46,24 @@ do_install_append() {
 
 SRC_URI_OVERRIDES_PACKAGE_ARCH = "0"
 
-# People should consider using udev's /dev/input/touchscreen0 symlink 
+# People should consider using udev's /dev/input/touchscreen0 symlink
 # instead of detect-stylus
 #RDEPENDS_tslib-conf_weird-machine = "detect-stylus"
 RPROVIDES_tslib-conf = "libts-0.0-conf"
 
-PACKAGE_ARCH_tslib-conf = "${MACHINE_ARCH}"
+# Machines with machine specific patches
 PACKAGE_ARCH_mnci = "${MACHINE_ARCH}"
+# Machines with machine specific config files (tslib.sh)
+PACKAGE_ARCH_tslib-conf_a780 = "${MACHINE_ARCH}"
+PACKAGE_ARCH_tslib-conf_collie = "${MACHINE_ARCH}"
+PACKAGE_ARCH_tslib-conf_e680 = "${MACHINE_ARCH}"
+PACKAGE_ARCH_tslib-conf_jornada56x = "${MACHINE_ARCH}"
+PACKAGE_ARCH_tslib-conf_jornada6xx = "${MACHINE_ARCH}"
+PACKAGE_ARCH_tslib-conf_jornada7xx = "${MACHINE_ARCH}"
+PACKAGE_ARCH_tslib-conf_netbook-pro = "${MACHINE_ARCH}"
+PACKAGE_ARCH_tslib-conf_omap1610h2 = "${MACHINE_ARCH}"
+PACKAGE_ARCH_tslib-conf_omap5912osk = "${MACHINE_ARCH}"
+PACKAGE_ARCH_tslib-conf_simpad = "${MACHINE_ARCH}"
 
 PACKAGES =+ "tslib-conf libts-dev tslib-tests tslib-calibrate"
 DEBIAN_NOAUTONAME_tslib-conf = "1"
diff --git a/packages/ttf-fonts/ttf-gentium_1.02.bb b/packages/ttf-fonts/ttf-gentium_1.02.bb
index 1515edab9d..5bedf5aafc 100644
--- a/packages/ttf-fonts/ttf-gentium_1.02.bb
+++ b/packages/ttf-fonts/ttf-gentium_1.02.bb
@@ -33,95 +33,95 @@ FILES_${PN} = "${datadir}/fonts/truetype/GenI*.ttf \
 
 #
 # License
-# 
+#
 # Gentium is released under the SIL Open Font License - please read it carefully
 # and do not download the fonts unless you agree to the terms of the license:
-# 
+#
 # This Font Software is Copyright (c) 2003-2005, SIL International
 # (http://scripts.sil.org/). All Rights Reserved.
-# 
+#
 # "Gentium" is a Reserved Font Name for this Font Software. "SIL" is a Reserved
 # Font Name for this Font Software.
-# 
+#
 # This Font Software is licensed under the SIL Open Font License, Version 1.0. No
 # modification of the license is permitted, only verbatim copy is allowed. This
 # license is copied below, and is also available with a FAQ
 # at:http://scripts.sil.org/OFL SIL OPEN FONT LICENSE
-# 
-# Version 1.0 - 22 November 2005 
+#
+# Version 1.0 - 22 November 2005
 #
 # PREAMBLE
-# 
+#
 # The goals of the Open Font License (OFL) are to stimulate worldwide development
 # of cooperative font projects, to support the font creation efforts of academic
 # and linguistic communities, and to provide an open framework in which fonts may
 # be shared and improved in partnership with others.
-# 
+#
 # The OFL allows the licensed fonts to be used, studied, modified and
 # redistributed freely as long as they are not sold by themselves. The fonts,
 # including any derivative works, can be bundled, embedded, redistributed and
 # sold with any software provided that the font names of derivative works are
 # changed. The fonts and derivatives, however, cannot be released under any other
-# type of license. 
+# type of license.
 #
 # DEFINITIONS
-# 
+#
 # "Font Software" refers to any and all of the following:
-# 
+#
 #     * font files data files source code build scripts documentation
-# 
+#
 # "Reserved Font Name" refers to the Font Software name as seen by users and any
 # other names as specified after the copyright statement.
-# 
+#
 # "Standard Version" refers to the collection of Font Software components as
 # distributed by the Copyright Holder.
-# 
+#
 # "Modified Version" refers to any derivative font software made by adding to,
 # deleting, or substituting -- in part or in whole -- any of the components of
 # the Standard Version, by changing formats or by porting the Font Software to a
 # new environment.
-# 
+#
 # "Author" refers to any designer, engineer, programmer, technical writer or
-# other person who contributed to the Font Software. 
+# other person who contributed to the Font Software.
 #
 # PERMISSION & CONDITIONS
-# 
+#
 # Permission is hereby granted, free of charge, to any person obtaining a copy of
 # the Font Software, to use, study, copy, merge, embed, modify, redistribute, and
 # sell modified and unmodified copies of the Font Software, subject to the
 # following conditions:
-# 
+#
 # 1) Neither the Font Software nor any of its individual components, in Standard
 # or Modified Versions, may be sold by itself.
-# 
+#
 # 2) Standard or Modified Versions of the Font Software may be bundled,
 # redistributed and sold with any software, provided that each copy contains the
 # above copyright notice and this license. These can be included either as
 # stand-alone text files, human-readable headers or in the appropriate
 # machine-readable metadata fields within text or binary files as long as those
 # fields can be easily viewed by the user.
-# 
+#
 # 3) No Modified Version of the Font Software may use the Reserved Font Name(s),
 # in part or in whole, unless explicit written permission is granted by the
 # Copyright Holder. This restriction applies to all references stored in the Font
 # Software, such as the font menu name and other font description fields, which
 # are used to differentiate the font from others.
-# 
+#
 # 4) The name(s) of the Copyright Holder or the Author(s) of the Font Software
 # shall not be used to promote, endorse or advertise any Modified Version, except
 # to acknowledge the contribution(s) of the Copyright Holder and the Author(s) or
 # with their explicit written permission.
-# 
+#
 # 5) The Font Software, modified or unmodified, in part or in whole, must be
 # distributed using this license, and may not be distributed under any other
-# license. 
+# license.
 #
 # TERMINATION
-# 
+#
 # This license becomes null and void if any of the above conditions are not met.
 #
 # DISCLAIMER
-# 
+#
 # THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 # IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY,
 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT,
diff --git a/packages/uae/e-uae_0.8.28.bb b/packages/uae/e-uae_0.8.28.bb
index cb59f88957..f8f95e846a 100644
--- a/packages/uae/e-uae_0.8.28.bb
+++ b/packages/uae/e-uae_0.8.28.bb
@@ -8,13 +8,13 @@ PR = "r0"
 SRC_URI = "http://rcdrummond.net/uae/e-uae-${PV}/e-uae-${PV}.tar.bz2 \
            file://configure.patch;patch=1"
 
-inherit autotools 
+inherit autotools
+
+export SDL_CONFIG = "${STAGING_BINDIR_CROSS}/sdl-config"
 
 EXTRA_OECONF = "--with-hostcc=gcc --disable-ui --without-x \
 		--without-gtk --enable-jit --disable-natmem \
-		--with-zlib=${STAGING_LIBDIR}/.. \
-		--with-sdl-exec-prefix=${STAGING_BINDIR}/.. \
-		--with-sdl-prefix=${STAGING_LIBDIR}/.."
+		--with-zlib=${STAGING_LIBDIR}/.."
 
 CFLAGS_append = " -DSTAT_STATFS2_BSIZE=1 "
 CXXFLAGS_append = " -DSTAT_STATFS2_BSIZE=1 "
diff --git a/packages/uclibc++/uclibc++_0.1.9.bb b/packages/uclibc++/uclibc++_0.1.9.bb
index fff6daf691..aaa9447f92 100644
--- a/packages/uclibc++/uclibc++_0.1.9.bb
+++ b/packages/uclibc++/uclibc++_0.1.9.bb
@@ -12,10 +12,10 @@ SRC_URI = "http://cxx.uclibc.org/src/uClibc++-${PV}.tbz2 \
 	   file://defconfig"
 S = "${WORKDIR}/uClibc++"
 
-# uClibc++ runtime prefix directory (UCLIBCXX_RUNTIME_PREFIX) [/usr/$(TARGET_ARCH)-linux-uclibc] (NEW) 
-# uClibc++ header file subdirectory (UCLIBCXX_RUNTIME_INCLUDE_SUBDIR) [/include] (NEW) 
+# uClibc++ runtime prefix directory (UCLIBCXX_RUNTIME_PREFIX) [/usr/$(TARGET_ARCH)-linux-uclibc] (NEW)
+# uClibc++ header file subdirectory (UCLIBCXX_RUNTIME_INCLUDE_SUBDIR) [/include] (NEW)
 # uClibc++ library subdirectory (UCLIBCXX_RUNTIME_LIB_SUBDIR) [/lib] (NEW)
-# uClibc++ application file subdirectory (UCLIBCXX_RUNTIME_BIN_SUBDIR) [/bin] (NEW) 
+# uClibc++ application file subdirectory (UCLIBCXX_RUNTIME_BIN_SUBDIR) [/bin] (NEW)
 
 do_unpack_real () {
 	bzcat uClibc++-${PV}.tbz2 | tar -xvf -
diff --git a/packages/uclibc/uclibc_svn.bb b/packages/uclibc/uclibc_svn.bb
index 10855e6749..48b1785a14 100644
--- a/packages/uclibc/uclibc_svn.bb
+++ b/packages/uclibc/uclibc_svn.bb
@@ -1,6 +1,6 @@
 # UCLIBC_BASE should be the latest released revision of uclibc (that way
 # the config files will typically be correct!)  uclibc-cvs takes precedence
-# over uclibc-${UCLIBC_BASE}, if a config file in uclibc-cvs is out of date 
+# over uclibc-${UCLIBC_BASE}, if a config file in uclibc-cvs is out of date
 # try removing it
 #
 # UCLIBC_BASE can be set in a distro file, but whether this works depends
@@ -17,7 +17,7 @@ require uclibc.inc
 
 PROVIDES += "virtual/${TARGET_PREFIX}libc-for-gcc"
 
-#recent versions uclibc require real kernel headers 
+#recent versions uclibc require real kernel headers
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/uclibc-cvs', '${FILE_DIRNAME}/uclibc-${UCLIBC_BASE}', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
 
diff --git a/packages/udev/udev_092.bb b/packages/udev/udev_092.bb
index 053da707c4..92e37de4f7 100644
--- a/packages/udev/udev_092.bb
+++ b/packages/udev/udev_092.bb
@@ -59,10 +59,10 @@ do_install_append_h2200() {
 }
 
 pkg_postinst_append() {
-	
+
 	# Add the root partition to mount.blacklist to avoid a bug in the auto-mounter,
 	# causing confusion with fsck on boot
-	
+
         while read dev mp fs junk
         do
                 if test "$mp" = "/"
@@ -71,6 +71,6 @@ pkg_postinst_append() {
                         echo "$root_partition" >> /etc/udev/mount.blacklist
                 fi
         done < /etc/fstab
-	
+
 }
 
diff --git a/packages/udev/udev_097.bb b/packages/udev/udev_097.bb
index 436cd6fe80..84c414fd0d 100644
--- a/packages/udev/udev_097.bb
+++ b/packages/udev/udev_097.bb
@@ -59,10 +59,10 @@ do_install_append_h2200() {
 }
 
 pkg_postinst_append() {
-	
+
 	# Add the root partition to mount.blacklist to avoid a bug in the auto-mounter,
 	# causing confusion with fsck on boot
-	
+
         while read dev mp fs junk
         do
                 if test "$mp" = "/"
@@ -71,7 +71,7 @@ pkg_postinst_append() {
                         echo "$root_partition" >> /etc/udev/mount.blacklist
                 fi
         done < /etc/fstab
-	
+
 }
 
 
diff --git a/packages/udev/udev_100.bb b/packages/udev/udev_100.bb
index d44dd9c6a2..288157ef3f 100644
--- a/packages/udev/udev_100.bb
+++ b/packages/udev/udev_100.bb
@@ -60,10 +60,10 @@ do_install_append_h2200() {
 }
 
 pkg_postinst_append() {
-	
+
 	# Add the root partition to mount.blacklist to avoid a bug in the auto-mounter,
 	# causing confusion with fsck on boot
-	
+
         while read dev mp fs junk
         do
                 if test "$mp" = "/"
@@ -72,6 +72,6 @@ pkg_postinst_append() {
                         echo "$root_partition" >> /etc/udev/mount.blacklist
                 fi
         done < /etc/fstab
-	
+
 }
 
diff --git a/packages/usbutils/usbutils_0.70.bb b/packages/usbutils/usbutils_0.70.bb
index 4e68f26d3b..0dbd799993 100644
--- a/packages/usbutils/usbutils_0.70.bb
+++ b/packages/usbutils/usbutils_0.70.bb
@@ -8,7 +8,7 @@ DEFAULT_PREFERENCE = "1"
 SRC_URI = "${SOURCEFORGE_MIRROR}/linux-usb/usbutils-${PV}.tar.gz"
 S = "${WORKDIR}/usbutils-${PV}"
 
-inherit autotools 
+inherit autotools
 
 EXTRA_OECONF = "--program-prefix="
 sbindir = "/sbin"
diff --git a/packages/usbutils/usbutils_cvs.bb b/packages/usbutils/usbutils_cvs.bb
index 45209b6bf4..4b084eb58c 100644
--- a/packages/usbutils/usbutils_cvs.bb
+++ b/packages/usbutils/usbutils_cvs.bb
@@ -9,7 +9,7 @@ PR = "r3"
 SRC_URI = "cvs://anonymous@linux-usb.cvs.sourceforge.net/cvsroot/linux-usb;module=usbutils"
 S = "${WORKDIR}/usbutils"
 
-inherit autotools 
+inherit autotools
 
 EXTRA_OECONF = "--program-prefix="
 sbindir = "/sbin"
diff --git a/packages/util-linux/util-linux-native_2.12r.bb b/packages/util-linux/util-linux-native_2.12r.bb
index d6c60786de..27c053000d 100644
--- a/packages/util-linux/util-linux-native_2.12r.bb
+++ b/packages/util-linux/util-linux-native_2.12r.bb
@@ -23,7 +23,7 @@ do_compile () {
 	install ${WORKDIR}/make_include ${S}/make_include
 	install ${WORKDIR}/swapargs.h ${S}/mount/swapargs.h
 	install ${WORKDIR}/defines.h ${S}/defines.h
-	oe_runmake 
+	oe_runmake
 }
 
 do_stage () {
diff --git a/packages/vera-fonts/qpf-bitstream-vera-sans-mono_1.10.bb b/packages/vera-fonts/qpf-bitstream-vera-sans-mono_1.10.bb
index 3e797bd80d..10d2d4acdd 100644
--- a/packages/vera-fonts/qpf-bitstream-vera-sans-mono_1.10.bb
+++ b/packages/vera-fonts/qpf-bitstream-vera-sans-mono_1.10.bb
@@ -14,15 +14,15 @@ S = "${WORKDIR}/verasansmono"
 
 FILES_${PN} += "/opt"
 
-do_install () { 
-        install -d ${D}${palmqtdir}/lib/fonts/ 
-	
+do_install () {
+        install -d ${D}${palmqtdir}/lib/fonts/
+
 	cd ${WORKDIR}
 	files=`find . -name "*.qpf"`
-        for i in $files; do 
+        for i in $files; do
                 install -m 644 $i ${D}${palmqtdir}/lib/fonts/
-        done 
-} 
+        done
+}
 
 pkg_postinst () {
 #!/bin/sh
diff --git a/packages/vera-fonts/qpf-bitstream-vera_1.10.bb b/packages/vera-fonts/qpf-bitstream-vera_1.10.bb
index 07ca7bda9a..86f2ef9446 100644
--- a/packages/vera-fonts/qpf-bitstream-vera_1.10.bb
+++ b/packages/vera-fonts/qpf-bitstream-vera_1.10.bb
@@ -10,12 +10,12 @@ PROVIDES = "qpf-bitstream-vera-small qpf-bitstream-vera-large"
 SRC_URI = "http://openzaurus.org/mirror/vera-qpf_1.10-3.tar.gz"
 S = "${WORKDIR}/vera-qpf"
 
-do_install () { 
-        install -d ${D}${palmqtdir}/lib/fonts/ 
-        for i in *.qpf; do 
-                install -m 644 $i ${D}${palmqtdir}/lib/fonts/${i} 
-        done 
-} 
+do_install () {
+        install -d ${D}${palmqtdir}/lib/fonts/
+        for i in *.qpf; do
+                install -m 644 $i ${D}${palmqtdir}/lib/fonts/${i}
+        done
+}
 
 pkg_postinst () {
 #!/bin/sh
diff --git a/packages/vera-fonts/ttf-bitstream-vera_1.10.bb b/packages/vera-fonts/ttf-bitstream-vera_1.10.bb
index a6f4cd62fb..871bc1d37c 100644
--- a/packages/vera-fonts/ttf-bitstream-vera_1.10.bb
+++ b/packages/vera-fonts/ttf-bitstream-vera_1.10.bb
@@ -6,24 +6,24 @@ PACKAGE_ARCH = "all"
 PR = "r3"
 RDEPENDS = "fontconfig-utils"
 
-SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/ttf-bitstream-vera/1.10/ttf-bitstream-vera-${PV}.tar.bz2" 
+SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/ttf-bitstream-vera/1.10/ttf-bitstream-vera-${PV}.tar.bz2"
 
-do_install () { 
-        install -d ${D}${prefix}/share/fonts/ttf/ 
-        for i in *.ttf; do 
-                install -m 644 $i ${D}${prefix}/share/fonts/ttf/${i} 
-        done 
+do_install () {
+        install -d ${D}${prefix}/share/fonts/ttf/
+        for i in *.ttf; do
+                install -m 644 $i ${D}${prefix}/share/fonts/ttf/${i}
+        done
 
 	# fontconfig ships this too.  not sure what to do about it.
-        #install -d ${D}${sysconfdir}/fonts 
-        #install -m 644 local.conf ${D}${sysconfdir}/fonts/local.conf 
+        #install -d ${D}${sysconfdir}/fonts
+        #install -m 644 local.conf ${D}${sysconfdir}/fonts/local.conf
 
 
-        install -d ${D}${prefix}/share/doc/${PN}/ 
-        for i in *.TXT; do 
-                install -m 644 $i ${D}${prefix}/share/doc/${PN}/$i 
-        done 
-} 
+        install -d ${D}${prefix}/share/doc/${PN}/
+        for i in *.TXT; do
+                install -m 644 $i ${D}${prefix}/share/doc/${PN}/$i
+        done
+}
 
 pkg_postinst () {
 #!/bin/sh
diff --git a/packages/vino/vino_2.16.0.bb b/packages/vino/vino_2.16.0.bb
index 0780d0d409..a7639a248d 100644
--- a/packages/vino/vino_2.16.0.bb
+++ b/packages/vino/vino_2.16.0.bb
@@ -9,5 +9,5 @@ do_configure() {
 	libtoolize --force
 	gnu-configize
 	oe_runconf
-}	
+}
 
diff --git a/packages/visual-boot/visual-boot.bb b/packages/visual-boot/visual-boot.bb
index e3bad2a4aa..1336971c54 100644
--- a/packages/visual-boot/visual-boot.bb
+++ b/packages/visual-boot/visual-boot.bb
@@ -25,17 +25,17 @@ do_install() {
 	install -d ${D}/etc/init.d
 	install -d ${D}/etc/rcS.d
 	install -d ${D}/etc/rc5.d
-	
+
 	install -m 0644 ${WORKDIR}/*.raw.gz ${D}/usr/share/visual-boot
 	install -m 0755 ${WORKDIR}/visual-boot.init ${D}/etc/init.d/visual-boot
-	
+
 	# We can not use update-rc.d to enable visual-boot right after flashing
 	ln -s /etc/init.d/visual-boot ${D}/etc/rcS.d/S34visual-boot-mountall
 	ln -s /etc/init.d/visual-boot ${D}/etc/rcS.d/S39visual-boot-networking
-	ln -s /etc/init.d/visual-boot ${D}/etc/rc5.d/S19visual-boot-apm	
-	ln -s /etc/init.d/visual-boot ${D}/etc/rc5.d/S22visual-boot-bt	
+	ln -s /etc/init.d/visual-boot ${D}/etc/rc5.d/S19visual-boot-apm
+	ln -s /etc/init.d/visual-boot ${D}/etc/rc5.d/S22visual-boot-bt
 	ln -s /etc/init.d/visual-boot ${D}/etc/rc5.d/S98visual-boot-x11
-	ln -s /etc/init.d/visual-boot ${D}/etc/rc5.d/S99visual-boot-zaurusd	
-	
+	ln -s /etc/init.d/visual-boot ${D}/etc/rc5.d/S99visual-boot-zaurusd
+
 }
 
diff --git a/packages/vnc/vnc_3.3.7.bb b/packages/vnc/vnc_3.3.7.bb
index 06fa0fedf2..f0060e383d 100644
--- a/packages/vnc/vnc_3.3.7.bb
+++ b/packages/vnc/vnc_3.3.7.bb
@@ -18,4 +18,4 @@ do_install() {
 	install -d ${D}/usr/bin/
 	install -m 0755 vncviewer/vncviewer ${D}/usr/bin/vncviewer
 }
-	
+
diff --git a/packages/vorbis-tools/vorbis-tools_1.0.1.bb b/packages/vorbis-tools/vorbis-tools_1.0.1.bb
index 14f10afa5f..7b8a75dd3b 100644
--- a/packages/vorbis-tools/vorbis-tools_1.0.1.bb
+++ b/packages/vorbis-tools/vorbis-tools_1.0.1.bb
@@ -9,7 +9,7 @@ SECTION = "console/multimedia"
 SRC_URI = "http://www.vorbis.com/files/${PV}/unix/vorbis-tools-${PV}.tar.gz \
 	   file://m4.patch;patch=1"
 
-inherit autotools 
+inherit autotools
 
 EXTRA_OECONF = "--without-flac --without-speex \
 		--with-ogg-libraries=${STAGING_LIBDIR}/ \
diff --git a/packages/wget/wget_1.9.1.bb b/packages/wget/wget_1.9.1.bb
index cc5f8bc5b8..2e576bd2e4 100644
--- a/packages/wget/wget_1.9.1.bb
+++ b/packages/wget/wget_1.9.1.bb
@@ -16,7 +16,7 @@ EXTRA_OECONF = "--enable-ipv6 --without-ssl"
 
 # The unslung kernel does not support ipv6
 EXTRA_OECONF_unslung = "--without-ssl"
-# SlugOS kernels do not support ipv6. Can be loaded as a module. 
+# SlugOS kernels do not support ipv6. Can be loaded as a module.
 EXTRA_OECONF_slugos = "--without-ssl"
 
 do_configure () {
diff --git a/packages/wlan-ng/wlan-ng-modules_0.2.1-pre26.bb b/packages/wlan-ng/wlan-ng-modules_0.2.1-pre26.bb
index 92f3375cda..60b29999ef 100644
--- a/packages/wlan-ng/wlan-ng-modules_0.2.1-pre26.bb
+++ b/packages/wlan-ng/wlan-ng-modules_0.2.1-pre26.bb
@@ -49,7 +49,7 @@ do_install() {
 
         # Listen closely... sssshhh... can you hear the wlan-ng build system suck?
         rm -f ${KERNEL_SOURCE}/../config.mk
-        rm -f ${KERNEL_SOURCE}/../../config.mk	
+        rm -f ${KERNEL_SOURCE}/../../config.mk
 }
 
 FILES_${PN} = "/lib"
diff --git a/packages/wpa-supplicant/wpa-supplicant_0.5.5.bb b/packages/wpa-supplicant/wpa-supplicant_0.5.5.bb
index c3fb8f8767..46ff13e3f0 100644
--- a/packages/wpa-supplicant/wpa-supplicant_0.5.5.bb
+++ b/packages/wpa-supplicant/wpa-supplicant_0.5.5.bb
@@ -34,7 +34,7 @@ export HAS_PCI = "${@base_contains('COMBINED_FEATURES', 'pci', 1, 0,d)}"
 
 do_configure () {
         install -m 0755 ${WORKDIR}/defconfig-gnutls  .config
- 
+
         if [ "x$HAS_PCI" == "x1" ] ; then
                 echo "CONFIG_DRIVER_MADWIFI=y" >> .config
                 echo "CFLAGS += -I${STAGING_INCDIR}/madwifi-ng" >> .config
diff --git a/packages/wrt/wrt-init.bb b/packages/wrt/wrt-init.bb
index bae51c6816..b3ea137f1a 100644
--- a/packages/wrt/wrt-init.bb
+++ b/packages/wrt/wrt-init.bb
@@ -8,12 +8,12 @@ do_install() {
 	install -d ${D}${sysconfdir}/rcS.d \
 		   ${D}${sysconfdir}/rc2.d \
 		   ${D}${sysconfdir}/init.d
-	
+
 	install -m 0755 ${WORKDIR}/mount ${D}${sysconfdir}/init.d
 	install -m 0755 ${WORKDIR}/wrtboot ${D}${sysconfdir}/init.d
 	install -m 0755 ${WORKDIR}/wrtvlans ${D}${sysconfdir}/init.d
 	install -m 0755 ${WORKDIR}/finished ${D}${sysconfdir}/init.d
-	
+
 	ln -s ../init.d/mount ${D}${sysconfdir}/rcS.d/S05mount
 	ln -s ../init.d/wrtboot ${D}${sysconfdir}/rcS.d/S10wrtboot
 	ln -s ../init.d/wrtvlans ${D}${sysconfdir}/rcS.d/S30wrtvlans
diff --git a/packages/wrt/wrt-utils.bb b/packages/wrt/wrt-utils.bb
index d1cd4c9cc5..42a7460412 100644
--- a/packages/wrt/wrt-utils.bb
+++ b/packages/wrt/wrt-utils.bb
@@ -15,11 +15,11 @@ TARGET_CFLAGS =+ "-I${STAGING_KERNEL_DIR}/include"
 do_compile() {
 	make -C libshared TARGET_CC="${CC}"
 	make -C libnvram TARGET_CC="${CC}"
-	
+
 	${CC} ${CFLAGS} -Iinclude -o wlc wlc.c -L./libshared -lshared
 	${CC} ${CFLAGS} -o jffs2root jffs2root.c
 	${CC} ${CFLAGS} -o mtd mtd.c
-	
+
 	make -C ../linksys-wlconf TOP=${S} SRCBASE=${S} LDFLAGS="-L${S}/libnvram -lnvram -L${S}/libshared -lshared"
 
 	${KERNEL_CC} -D__KERNEL__ -fno-strict-aliasing -fno-common -fomit-frame-pointer -G 0 \
@@ -34,11 +34,11 @@ do_install() {
 	install -m 644 libshared/libshared.so ${D}/${libdir}
 	install -m 755 libnvram/nvram ${D}/usr/sbin/
 	install -m 644 libnvram/libnvram.so ${D}/${libdir}
-	
+
 	install -m 755 wlc ${D}/usr/sbin/
 	install -m 755 jffs2root ${D}/sbin/
 	install -m 755 mtd ${D}/sbin/
-	
+
 	install -m 755 ../linksys-wlconf/wlconf ${D}/usr/sbin/
 	install -m 644 wlcompat.o ${D}/lib/modules/${KERNEL_VERSION}/
 }
diff --git a/packages/wxbase/wxbase_2.6.2.bb b/packages/wxbase/wxbase_2.6.2.bb
index d1a054f1b6..07d9199ae1 100644
--- a/packages/wxbase/wxbase_2.6.2.bb
+++ b/packages/wxbase/wxbase_2.6.2.bb
@@ -15,7 +15,7 @@ inherit autotools pkgconfig
 
 EXTRA_OECONF = "--enable-largefile"
 
-LEAD_SONAME = "libwx_base-2.6.so*" 
+LEAD_SONAME = "libwx_base-2.6.so*"
 
 do_configure() {
        oe_runconf
@@ -23,17 +23,17 @@ do_configure() {
 
 do_stage() {
        install -d ${STAGING_INCDIR}/wx-2.6/wx
-       cp -pR include/wx ${STAGING_INCDIR}/wx-2.6	
+       cp -pR include/wx ${STAGING_INCDIR}/wx-2.6
        cp -pR lib/libwx* ${STAGING_LIBDIR}
        cp -pR lib/wx     ${STAGING_LIBDIR}
        cp -pR build/bakefiles/wxpresets/presets  ${STAGING_DATADIR}/bakefile
-       cp -pR wxwin.m4                           ${STAGING_DATADIR}/aclocal		
+       cp -pR wxwin.m4                           ${STAGING_DATADIR}/aclocal
        ln -sf ${STAGING_LIBDIR}/wx/config/${TARGET_PREFIX}base-ansi-release-2.6 ${STAGING_BINDIR_CROSS}/wx-config
        sed -e s,'wxconfdir=".*"','wxconfigdir="${STAGING_LIBDIR}/wx/config"', \
            -e s,'bindir=".*"','bindir="${STAGING_BINDIR}"', \
            -e s,'libdir=".*"','libdir="${STAGING_LIBDIR}"', \
            -e s,'includedir=".*"','includedir="${STAGING_INCDIR}"', \
-           -i ${STAGING_LIBDIR}/wx/config/${TARGET_PREFIX}base-ansi-release-2.6	       
+           -i ${STAGING_LIBDIR}/wx/config/${TARGET_PREFIX}base-ansi-release-2.6
 }
 
 FILES_${PN} += " \
diff --git a/packages/wxbase/wxbase_2.7+cvs.bb b/packages/wxbase/wxbase_2.7+cvs.bb
index 79dcc46b6e..772ea4e27f 100644
--- a/packages/wxbase/wxbase_2.7+cvs.bb
+++ b/packages/wxbase/wxbase_2.7+cvs.bb
@@ -16,7 +16,7 @@ inherit autotools pkgconfig
 
 EXTRA_OECONF = "--disable-gui --enable-largefile"
 
-LEAD_SONAME = "libwx_base-2.7*" 
+LEAD_SONAME = "libwx_base-2.7*"
 
 do_configure() {
        oe_runconf
@@ -24,7 +24,7 @@ do_configure() {
 
 do_stage() {
        install -d ${STAGING_INCDIR}/wx-2.7/wx
-       cp -pR include/wx ${STAGING_INCDIR}/wx-2.7	
+       cp -pR include/wx ${STAGING_INCDIR}/wx-2.7
        cp -pR lib/libwx* ${STAGING_LIBDIR}
        cp -pR lib/wx     ${STAGING_LIBDIR}
        cp -pR build/bakefiles/wxpresets/presets  ${STAGING_DATADIR}/bakefile
@@ -49,5 +49,5 @@ do_install() {
        ln -sf ${libdir}/wx/config/${TARGET_PREFIX}base-ansi-release-2.7 ${D}${bindir}/wx-config
        install -d ${D}${docdir}/${PN}-${PV}
        install -m 644 -p docs/*.txt      ${D}${docdir}/${PN}-${PV}
-       install -m 644 -p docs/*.htm      ${D}${docdir}/${PN}-${PV}	
+       install -m 644 -p docs/*.htm      ${D}${docdir}/${PN}-${PV}
 }
diff --git a/packages/xcalibrate/xcalibrate_20060312.bb b/packages/xcalibrate/xcalibrate_20060312.bb
index 1de87c04eb..a5855dff08 100644
--- a/packages/xcalibrate/xcalibrate_20060312.bb
+++ b/packages/xcalibrate/xcalibrate_20060312.bb
@@ -10,7 +10,7 @@ SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=XCalibrate \
 	   file://xextproto.patch;patch=1"
 S = "${WORKDIR}/XCalibrate"
 
-inherit autotools pkgconfig 
+inherit autotools pkgconfig
 
 do_stage() {
 	autotools_stage_all
diff --git a/packages/xcalibrate/xcalibrate_cvs.bb b/packages/xcalibrate/xcalibrate_cvs.bb
index a5b435795a..c3eeffc478 100644
--- a/packages/xcalibrate/xcalibrate_cvs.bb
+++ b/packages/xcalibrate/xcalibrate_cvs.bb
@@ -9,7 +9,7 @@ SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=XCalibrate \
 	   file://xextproto.patch;patch=1"
 S = "${WORKDIR}/XCalibrate"
 
-inherit autotools pkgconfig 
+inherit autotools pkgconfig
 
 do_stage() {
 	autotools_stage_all
diff --git a/packages/xcalibrate/xcalibrate_git.bb b/packages/xcalibrate/xcalibrate_git.bb
index 6448eedd5b..7b2b4d3b63 100644
--- a/packages/xcalibrate/xcalibrate_git.bb
+++ b/packages/xcalibrate/xcalibrate_git.bb
@@ -8,7 +8,7 @@ DESCRIPTION = "XCalibrate client-side library"
 SRC_URI = "git://anongit.freedesktop.org/xorg/lib/libXCalibrate;protocol=git"
 S = "${WORKDIR}/git"
 
-inherit autotools pkgconfig 
+inherit autotools pkgconfig
 
 do_stage() {
 	autotools_stage_all
diff --git a/packages/xcompmgr/xcompmgr_cvs.bb b/packages/xcompmgr/xcompmgr_cvs.bb
index 2c1d6ae9f5..44d1b92e2f 100644
--- a/packages/xcompmgr/xcompmgr_cvs.bb
+++ b/packages/xcompmgr/xcompmgr_cvs.bb
@@ -8,4 +8,4 @@ DESCRIPTION = "X Compositing Manager"
 SRC_URI = "${FREEDESKTOP_CVS}/xapps;module=xcompmgr"
 S = "${WORKDIR}/xcompmgr"
 
-inherit autotools 
+inherit autotools
diff --git a/packages/xfwm4-themes/xfwm4-themes_4.2.0.bb b/packages/xfwm4-themes/xfwm4-themes_4.2.0.bb
index c60edc5b83..f133e9524c 100644
--- a/packages/xfwm4-themes/xfwm4-themes_4.2.0.bb
+++ b/packages/xfwm4-themes/xfwm4-themes_4.2.0.bb
@@ -7,7 +7,7 @@ SECTION = "x11/wm"
 
 inherit xfce
 
-# No ${PN} for this one 
+# No ${PN} for this one
 PACKAGES=""
 
 PACKAGES_DYNAMIC = "xfwm4-theme-*"
diff --git a/packages/xorg-app/xterm_207.bb b/packages/xorg-app/xterm_207.bb
index ce84d5dde1..b1291037b4 100644
--- a/packages/xorg-app/xterm_207.bb
+++ b/packages/xorg-app/xterm_207.bb
@@ -19,8 +19,8 @@ EXTRA_OECONF = " --x-includes=${STAGING_INCDIR} --x-libraries=${STAGING_LIBDIR}
 do_configure() {
 
 	sed -e "s%/usr/contrib/X11R6%${STAGING_LIBDIR}%g" -i configure
-	
-	oe_runconf 
+
+	oe_runconf
 }
 
 do_stage() {
diff --git a/packages/xorg-font/font-util-native_X11R7.0-1.0.0.bb b/packages/xorg-font/font-util-native_X11R7.0-1.0.0.bb
index 07a5659300..e12d658230 100644
--- a/packages/xorg-font/font-util-native_X11R7.0-1.0.0.bb
+++ b/packages/xorg-font/font-util-native_X11R7.0-1.0.0.bb
@@ -8,4 +8,4 @@ DEPENDS = "bdftopcf-native"
 
 SRC_URI = "${XORG_MIRROR}/X11R7.0/src/font/font-util-${PV}.tar.gz"
 
-inherit native autotools pkgconfig 
+inherit native autotools pkgconfig
diff --git a/packages/xorg-font/font-util-native_X11R7.1-1.0.1.bb b/packages/xorg-font/font-util-native_X11R7.1-1.0.1.bb
index d633a9c6d1..86e7b62b63 100644
--- a/packages/xorg-font/font-util-native_X11R7.1-1.0.1.bb
+++ b/packages/xorg-font/font-util-native_X11R7.1-1.0.1.bb
@@ -8,4 +8,4 @@ DEPENDS = "bdftopcf-native"
 
 SRC_URI = "${XORG_MIRROR}/X11R7.1/src/font/font-util-${PV}.tar.gz"
 
-inherit native autotools pkgconfig 
+inherit native autotools pkgconfig
diff --git a/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb b/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb
index 6a8e43ec9c..7ed04075c8 100644
--- a/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb
+++ b/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb
@@ -17,7 +17,7 @@ FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale"
 do_compile() {
 	(
 	 unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS
-	 cd src/util; touch makekeys-makekeys.o ; ${BUILD_CC} makekeys.c -o makekeys	
+	 cd src/util; touch makekeys-makekeys.o ; ${BUILD_CC} makekeys.c -o makekeys
 	) || exit 1
 		rm -f ${STAGING_INCDIR}/X11/Xlib.h
 	oe_runmake
diff --git a/packages/xorg-lib/libxft_X11R7.0-2.1.12.bb b/packages/xorg-lib/libxft_X11R7.0-2.1.12.bb
new file mode 100644
index 0000000000..5ae8247296
--- /dev/null
+++ b/packages/xorg-lib/libxft_X11R7.0-2.1.12.bb
@@ -0,0 +1,23 @@
+require xorg-lib-common.inc
+
+SRC_URI = "${XORG_MIRROR}/individual/lib/libXft-2.1.12.tar.bz2" 
+S = "${WORKDIR}/${XORG_PN}-2.1.12"
+
+
+DESCRIPTION = "X FreeType library. Client-side fonts with FreeType."
+
+DEPENDS += " libxrender freetype fontconfig"
+PROVIDES = "xft"
+
+XORG_PN = "libXft"
+
+FILES_${PN} = "${libdir}/lib*.so.*"
+FILES_${PN}-dev = "${includedir} ${libdir}/lib*.so ${libdir}/*.la \
+		${libdir}/*.a ${libdir}/pkgconfig \
+		${datadir}/aclocal ${bindir} ${sbindir}"
+
+python do_package() {
+        if bb.data.getVar('DEBIAN_NAMES', d, 1):
+            bb.data.setVar('PKG_${PN}', 'libxft2', d)
+        bb.build.exec_func('package_do_package', d)
+}
diff --git a/packages/xorg-xserver/xserver-kdrive-omap_6.6.3.bb b/packages/xorg-xserver/xserver-kdrive-omap_6.6.3.bb
index b7e192dc76..d4a184b484 100644
--- a/packages/xorg-xserver/xserver-kdrive-omap_6.6.3.bb
+++ b/packages/xorg-xserver/xserver-kdrive-omap_6.6.3.bb
@@ -17,7 +17,7 @@ SRC_URI = " http://stage.maemo.org/pool/maemo/ossw/source/x/xserver-kdrive/xserv
 
 S = "${WORKDIR}/xserver"
 
-inherit autotools pkgconfig 
+inherit autotools pkgconfig
 
 EXTRA_OECONF = "--enable-composite --disable-xinerama --enable-xomapserver \
                 --enable-xsp --disable-xlocale --disable-rpath --prefix=/usr"
diff --git a/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb b/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb
index 38172cc425..64a49aed68 100644
--- a/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb
+++ b/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb
@@ -52,7 +52,7 @@ PACKAGE_ARCH_poodle = "poodle"
 
 S = "${WORKDIR}/xorg-server-X11R7.1-1.1.0"
 
-inherit autotools pkgconfig 
+inherit autotools pkgconfig
 
 ARM_INSTRUCTION_SET = "arm"
 
diff --git a/packages/xorg-xserver/xserver-kdrive_git.bb b/packages/xorg-xserver/xserver-kdrive_git.bb
index 48f5212806..0fc9ec1997 100644
--- a/packages/xorg-xserver/xserver-kdrive_git.bb
+++ b/packages/xorg-xserver/xserver-kdrive_git.bb
@@ -54,7 +54,7 @@ PACKAGE_ARCH_poodle = "poodle"
 
 S = "${WORKDIR}/git"
 
-inherit autotools pkgconfig 
+inherit autotools pkgconfig
 
 W100_OECONF = "--disable-w100"
 W100_OECONF_arm = "--enable-w100"
diff --git a/packages/xqt/xqt_0.0.9.bb b/packages/xqt/xqt_0.0.9.bb
index d1b5f7ff0f..3fc071ec28 100644
--- a/packages/xqt/xqt_0.0.9.bb
+++ b/packages/xqt/xqt_0.0.9.bb
@@ -15,39 +15,39 @@ do_configure() {
 	#general config
 	echo "#define BuildServersOnly YES" > config/cf/host.def
 	echo "#define ProjectRoot /usr" >> config/cf/host.def
-	
+
 	# do not build these XServers
 	echo "#define XnestServer NO"  >> config/cf/host.def
 	echo "#define XdmxServer NO"  >> config/cf/host.def
-	
+
 	# build commands
 	echo "#define CcCmd ${CC}" >> config/cf/host.def
 	echo "#define CplusplusCmd ${CXX}" >> config/cf/host.def
 	echo "#define LdCmd ${LD}" >> config/cf/host.def
-	
+
 	# Qt defines
 	echo "#define QtCmnDefs -fno-exceptions -fno-rtti" >> config/cf/host.def
 	echo "#define QtDir ${QTDIR}" >> config/cf/host.def
 	echo "#define QtLibs -lqpe -lqte -lm -lpng -ljpeg -lts -lsupc++" >> config/cf/host.def
 	echo "#define MocBin ${STAGING_BINDIR_NATIVE}/moc" >> config/cf/host.def
 	echo "#define QtDefs -DQWS -DOPIE_NEW_MALLOC -DOPIE_NO_ERASE_RECT_HACKFIX  QtCmnDefs" >> config/cf/host.def
-	
+
 	# Build these XServers
 	echo "#define XqtXServer  YES" >> config/cf/host.def
 	echo "#define XF86Server  NO"  >> config/cf/host.def
 	echo "#define TinyXServer YES" >> config/cf/host.def
 	echo "#define KDriveXServer YES" >> config/cf/host.def
 	echo "#define KdriveServerExtraDefines -DDDXOSFATALERROR -DDDXOSVERRORF" >> config/cf/host.def
-	
+
 	# General Config
 	echo "#define SystemUsrIncDir ${STAGING_INCDIR}" >> config/cf/host.def
 	echo "#define IncRoot ${STAGING_INCDIR}" >> config/cf/host.def
 	echo "#define LdPostLib -L${STAGING_LIBDIR}" >> config/cf/host.def
-	
+
 	echo "#undef BuildRandR " >> config/cf/host.def
 	echo "#define BuildRandR YES" >> config/cf/host.def
 	echo "#define BuildLBX YES" >> config/cf/host.def
-	
+
 	# change standard defines
 	if [ ${TARGET_ARCH} == "arm" ]; then
 		echo "#define StandardDefines -Dlinux -D__arm__ -D_POSIX_SOURCE -D_BSD_SOURCE -D_GNU_SOURCE" >> config/cf/host.def
@@ -72,12 +72,12 @@ do_compile() {
 do_install() {
 	make -C programs/Xserver DESTDIR="${D}" CC="${CC}" LD="${LD}" CC_STAGING="-I${STAGING_INCDIR}" LD_STAGING="-L${STAGING_LIBDIR}" INSTALLED_LIBS="" install
 	make -C lib/font DESTDIR="${D}" CC="${CC}" LD="${LD}" CC_STAGING="-I${STAGING_INCDIR}" LD_STAGING="-L${STAGING_LIBDIR}" INSTALLED_LIBS="" install
-	
+
 	install -d ${D}${palmtopdir}/apps/Applications
 	install -d ${D}${palmtopdir}/pics/Xqt
-	
+
 	install -m 0644 programs/Xserver/hw/xqt/Xqt.png ${D}${palmtopdir}/pics/Xqt
-	install -m 0644 IPKG/Xqt.desktop ${D}${palmtopdir}/apps/Applications		
+	install -m 0644 IPKG/Xqt.desktop ${D}${palmtopdir}/apps/Applications
 }
 
 do_stage() {
diff --git a/packages/xqt2/xqt2_20060509.bb b/packages/xqt2/xqt2_20060509.bb
index ec6c6a176b..7f49cccb17 100644
--- a/packages/xqt2/xqt2_20060509.bb
+++ b/packages/xqt2/xqt2_20060509.bb
@@ -31,39 +31,39 @@ do_configure() {
 	#general config
 	echo "#define BuildServersOnly YES" > config/cf/host.def
 	echo "#define ProjectRoot /usr" >> config/cf/host.def
-	
+
 	# do not build these XServers
 	echo "#define XnestServer NO"  >> config/cf/host.def
 	echo "#define XdmxServer NO"  >> config/cf/host.def
-	
+
 	# build commands
 	echo "#define CcCmd ${CC}" >> config/cf/host.def
 	echo "#define CplusplusCmd ${CXX}" >> config/cf/host.def
 	echo "#define LdCmd ${LD}" >> config/cf/host.def
-	
+
 	# Qt defines
 	echo "#define QtCmnDefs -fno-exceptions -fno-rtti" >> config/cf/host.def
 	echo "#define QtDir ${QTDIR}" >> config/cf/host.def
 	echo "#define QtLibs -lqpe -l${QT_LIBRARY} -lm -lpng -ljpeg -lts -lsupc++" >> config/cf/host.def
 	echo "#define MocBin ${STAGING_BINDIR_NATIVE}/moc" >> config/cf/host.def
 	echo "#define QtDefs -DQWS -DOPIE_NEW_MALLOC -DOPIE_NO_ERASE_RECT_HACKFIX  QtCmnDefs" >> config/cf/host.def
-	
+
 	# Build these XServers
 	echo "#define XqtXServer  YES" >> config/cf/host.def
 	echo "#define XF86Server  NO"  >> config/cf/host.def
 	echo "#define TinyXServer YES" >> config/cf/host.def
 	echo "#define KDriveXServer YES" >> config/cf/host.def
 	echo "#define KdriveServerExtraDefines -DDDXOSFATALERROR -DDDXOSVERRORF" >> config/cf/host.def
-	
+
 	# General Config
 	echo "#define SystemUsrIncDir ${STAGING_INCDIR}" >> config/cf/host.def
 	echo "#define IncRoot ${STAGING_INCDIR}" >> config/cf/host.def
 	echo "#define LdPostLib -L${STAGING_LIBDIR}" >> config/cf/host.def
-	
+
 	echo "#undef BuildRandR " >> config/cf/host.def
 	echo "#define BuildRandR YES" >> config/cf/host.def
 	echo "#define BuildLBX YES" >> config/cf/host.def
-	
+
 	# change standard defines
 	if [ ${TARGET_ARCH} == "arm" ]; then
 		echo "#define StandardDefines -Dlinux -D__arm__ -D_POSIX_SOURCE -D_BSD_SOURCE -D_GNU_SOURCE" >> config/cf/host.def
diff --git a/packages/xscreensaver/xscreensaver_4.16.bb b/packages/xscreensaver/xscreensaver_4.16.bb
index e007029b9b..9b424461ba 100644
--- a/packages/xscreensaver/xscreensaver_4.16.bb
+++ b/packages/xscreensaver/xscreensaver_4.16.bb
@@ -26,7 +26,7 @@ inherit autotools
 export INTLTOOL_PERL="/usr/bin/env perl"
 
 EXTRA_OECONF="--with-xml --with-gtk --disable-locking --without-pixbuf \
-	--with-jpeg --with-xpm" 
+	--with-jpeg --with-xpm"
 
 PACKAGES =+  " xscreensaver-demo xscreensaver-extra"
 
diff --git a/packages/xscreensaver/xscreensaver_4.22.bb b/packages/xscreensaver/xscreensaver_4.22.bb
index d3b8e20022..3b951fdeeb 100644
--- a/packages/xscreensaver/xscreensaver_4.22.bb
+++ b/packages/xscreensaver/xscreensaver_4.22.bb
@@ -23,7 +23,7 @@ inherit autotools
 export INTLTOOL_PERL="/usr/bin/env perl"
 
 EXTRA_OECONF="--with-xml --with-gtk --disable-locking --without-pixbuf \
-	--with-jpeg --with-xpm" 
+	--with-jpeg --with-xpm"
 
 PACKAGES =+  " xscreensaver-demo xscreensaver-extra"
 
diff --git a/packages/xscrnsaverh/xscrnsaverh_1.0.bb b/packages/xscrnsaverh/xscrnsaverh_1.0.bb
index 77be70e9b1..7fc7e6e15a 100644
--- a/packages/xscrnsaverh/xscrnsaverh_1.0.bb
+++ b/packages/xscrnsaverh/xscrnsaverh_1.0.bb
@@ -8,6 +8,6 @@ DESCRIPTION = "missing header"
 
 SRC_URI = "file://scrnsaver.h"
 
-do_stage() { 
-	install -m 0644 ${WORKDIR}/scrnsaver.h ${STAGING_INCDIR}/X11/extensions/ 
+do_stage() {
+	install -m 0644 ${WORKDIR}/scrnsaver.h ${STAGING_INCDIR}/X11/extensions/
 }
diff --git a/packages/xstroke/xstroke_0.6.bb b/packages/xstroke/xstroke_0.6.bb
index eb3e23df8b..7e0d11cc98 100644
--- a/packages/xstroke/xstroke_0.6.bb
+++ b/packages/xstroke/xstroke_0.6.bb
@@ -8,4 +8,4 @@ PR = "r2"
 SRC_URI = "http://www.oesources.org/source/current/xstroke-0.6.tar.gz \
 	file://auto-disable.patch;patch=1;pnum=0"
 
-inherit autotools pkgconfig 
+inherit autotools pkgconfig
diff --git a/packages/zauralign/zauralign_1.0.2.bb b/packages/zauralign/zauralign_1.0.2.bb
index 75f565816b..063873db83 100644
--- a/packages/zauralign/zauralign_1.0.2.bb
+++ b/packages/zauralign/zauralign_1.0.2.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Zauralign - a game for one player. The player has to align pieces to remove them from the \
-board fighting against new pieces which appear after each move." 
+board fighting against new pieces which appear after each move."
 SECTION = "opie/games"
 PRIORITY = "optional"
 LICENSE = "GPL"
diff --git a/packages/zaurusd/zaurusd_svn.bb b/packages/zaurusd/zaurusd_svn.bb
index f650126c58..d536122eca 100644
--- a/packages/zaurusd/zaurusd_svn.bb
+++ b/packages/zaurusd/zaurusd_svn.bb
@@ -10,8 +10,8 @@ SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=zaurusd;proto=http \
            file://zaurus-hinge.in \
 	   file://add-poodle.patch;patch=1 \
 	   file://zaurus-hinge.matchbox-portrait \
-	   file://zaurus-hinge.matchbox-landscape" 
-	   
+	   file://zaurus-hinge.matchbox-landscape"
+
 
 S = "${WORKDIR}/${PN}"
 
@@ -25,7 +25,7 @@ do_install_append() {
 	install -d "${D}/etc/zaurusd/hinge-landscape.d"
 	install -d "${D}/etc/zaurusd/hinge-portrait.d"
 	install -d "${D}/etc/zaurusd/hinge-close.d"
-	
+
 	install -m 0755 "${WORKDIR}/zaurus-hinge.matchbox-landscape" "${D}/etc/zaurusd/hinge-landscape.d/20-matchbox-landscape"
 	install -m 0755 "${WORKDIR}/zaurus-hinge.matchbox-portrait" "${D}/etc/zaurusd/hinge-portrait.d/20-matchbox-portrait"
 }
diff --git a/packages/zd1211/zd1211_r77.bb b/packages/zd1211/zd1211_r77.bb
index 7214671de0..4755f01538 100644
--- a/packages/zd1211/zd1211_r77.bb
+++ b/packages/zd1211/zd1211_r77.bb
@@ -7,7 +7,7 @@ RDEPENDS = "wireless-tools"
 
 SRC_URI = "http://zd1211.ath.cx/download/zd1211-driver-${PV}.tgz \
 	file://makefile.patch;patch=1 \
-	" 
+	"
 
 SRC_URI_unslung = "http://zd1211.ath.cx/download/zd1211-driver-${PV}.tgz \
        	file://makefile-unslung.patch;patch=1 \
@@ -26,10 +26,10 @@ do_compile () {
 		   'KDIR=${STAGING_KERNEL_DIR}' \
 		   'KERNEL_VERSION=${KERNEL_VERSION}' \
                    'CC=${KERNEL_CC}' \
-                   'LD=${KERNEL_LD}' 
+                   'LD=${KERNEL_LD}'
 }
 
-do_install() {   
+do_install() {
         install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/net
         install -m 0644 ${S}/zd1211*${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/net
 }
diff --git a/packages/zshopi/zshopi_0.2.bb b/packages/zshopi/zshopi_0.2.bb
index 61b92e2c1c..154ea8c313 100644
--- a/packages/zshopi/zshopi_0.2.bb
+++ b/packages/zshopi/zshopi_0.2.bb
@@ -31,12 +31,12 @@ do_configure_prepend() {
 
 do_install() {
 
-	cd "${WORKDIR}/${PN}_${PV}/zshopi"	
+	cd "${WORKDIR}/${PN}_${PV}/zshopi"
 	opie-lrelease zshopi.de.ts
 
-	
-	install -d ${D}${palmtopdir}/i18n/de	
+
+	install -d ${D}${palmtopdir}/i18n/de
 	install -d ${D}${palmtopdir}/pics/
-	install -m 0644 ${WORKDIR}/zshopi.png ${D}${palmtopdir}/pics/	
+	install -m 0644 ${WORKDIR}/zshopi.png ${D}${palmtopdir}/pics/
 	install -m 0644 ${WORKDIR}/${PN}_${PV}/zshopi/zshopi.de.qm ${D}${palmtopdir}/i18n/de/zshopi.qm
 }