merge of b387bb17fbe66898242adaa29f44ed4c12eaea1e

     and ccbffbb600e43462f6435f1404be257286d4909d

92 files changed, 976 insertions, 2225 deletions

diff --git a/classes/qt4x11.bbclass b/classes/qt4x11.bbclass
index f0844d81e1..afa840f5db 100644
--- a/classes/qt4x11.bbclass
+++ b/classes/qt4x11.bbclass
@@ -6,6 +6,7 @@ export OE_QMAKE_UIC="${STAGING_BINDIR}/uic4"
 export OE_QMAKE_MOC="${STAGING_BINDIR}/moc4"
 export OE_QMAKE_RCC="${STAGING_BINDIR}/rcc4"
 export OE_QMAKE_QMAKE="${STAGING_BINDIR}/qmake2"
+export OE_QMAKE_LINK="${CXX}"
 export OE_QMAKE_CXXFLAGS="${CXXFLAGS}"
 export OE_QMAKE_INCDIR_QT="${QTDIR}/include"
 export OE_QMAKE_LIBDIR_QT="${QTDIR}/lib"
diff --git a/conf/distro/angstrom.conf b/conf/distro/angstrom.conf
index e9e05201e8..daa85d5bda 100644
--- a/conf/distro/angstrom.conf
+++ b/conf/distro/angstrom.conf
@@ -18,6 +18,7 @@ INHERIT += "package_ipk debian"
 include conf/distro/include/multimachine.conf
 
 #Generate locales on the buildsystem instead of on the target. Speeds up first boot, set to "1" to enable
+PREFERRED_PROVIDER_qemu-native = "qemu-qop-nogfx-native"
 ENABLE_BINARY_LOCALE_GENERATION ?= ""
 
 
@@ -31,8 +32,8 @@ TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1)=='arm']}"
 FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os"
 BUILD_OPTIMIZATION = "-Os"
 
-#EABI is softfloat by default, but let's make sure :)
-TARGET_FPU = "soft"
+#ARM EABI is softfloat by default, but let's make sure :)
+TARGET_FPU_arm = "soft"
 
 PARALLEL_INSTALL_MODULES = "1"
 
diff --git a/conf/distro/unslung.conf b/conf/distro/unslung.conf
index a26e790fd5..7a147d8cf1 100644
--- a/conf/distro/unslung.conf
+++ b/conf/distro/unslung.conf
@@ -3,12 +3,12 @@
 #@DESCRIPTION: Unslung Linux Distribution for the NSLU2
 
 DISTRO_NAME = "Unslung"
-DISTRO_VERSION = "6.8-beta"
+DISTRO_VERSION = "6.9-alpha"
 DISTRO_TYPE = "beta"
 
 FEED_URIS  = "cross##http://ipkg.nslu2-linux.org/feeds/optware/nslu2/cross/stable"
 FEED_URIS += "native##http://ipkg.nslu2-linux.org/feeds/optware/nslu2/native/stable"
-FEED_URIS += "oe##http://ipkg.nslu2-linux.org/feeds/unslung/modules/cross/6.8-beta"
+FEED_URIS += "oe##http://ipkg.nslu2-linux.org/feeds/unslung/modules/cross/stable"
 
 # pull in the frozen list of bbfiles
 UNSLUNG_EXTRA_BBFILES ?= ""
diff --git a/packages/abiword/abiword-2.3.6/cdump-hack.patch b/packages/abiword/abiword-2.3.6/cdump-hack.patch
deleted file mode 100644
index afe75287e5..0000000000
--- a/packages/abiword/abiword-2.3.6/cdump-hack.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- abi/src/wp/ap/xp/GNUmakefile.am.orig	2005-05-09 21:33:34.915201456 +0000
-+++ abi/src/wp/ap/xp/GNUmakefile.am	2005-05-09 21:33:49.341008400 +0000
-@@ -107,7 +107,7 @@
- 		ap_wp_sidebar.cpp
- 
- CDUMP=$(top_srcdir)/src/tools/cdump/xp/cdump.c
--CDUMPAPP=$(top_builddir)/src/tools/cdump/xp/cdump
-+CDUMPAPP=cdump
- 
- ap_wp_splash.cpp: $(CDUMP) $(srcdir)/splash.png
- 	$(CDUMPAPP) $(srcdir)/splash.png g_pngSplash > ap_wp_splash.cpp
diff --git a/packages/abiword/abiword-plugins_2.4.4.bb b/packages/abiword/abiword-plugins_2.4.4.bb
new file mode 100644
index 0000000000..085a0f506b
--- /dev/null
+++ b/packages/abiword/abiword-plugins_2.4.4.bb
@@ -0,0 +1,24 @@
+DESCRIPTION ="AbiWord is free word processing program similar to Microsoft(r) Word""
+HOMEPAGE="http://www.abiword.org""
+MAINTAINER="Koen Kooi <koen@dominion.kabel.utwente.nl>"
+LICENSE="GPLv2"
+
+DEPENDS     = "abiword libwpd gtkmathview librsvg goffice poppler"
+PR="r0"
+
+SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz"
+S = "${WORKDIR}/abiword-${PV}/abiword-plugins"
+
+FILES_${PN} += " ${datadir}/icons/* \
+${datadir}/AbiSuite-2.4/ \
+${libdir}/AbiWord-2.4/plugins/*.so \
+"
+
+inherit autotools
+
+PARALLEL_MAKE=""
+
+EXTRA_OECONF = ""
+
+
+
diff --git a/packages/abiword/abiword_2.2.7.bb b/packages/abiword/abiword_2.2.7.bb
deleted file mode 100644
index de857a4abc..0000000000
--- a/packages/abiword/abiword_2.2.7.bb
+++ /dev/null
@@ -1,52 +0,0 @@
-DESCRIPTION ="AbiWord is free word processing program similar to Microsoft(r) Word""
-HOMEPAGE="http://www.abiword.org""
-MAINTAINER="Koen Kooi <koen@handhelds.org>"
-LICENSE="GPLv2"
-
-DEPENDS     = "cdump-native libglade libfribidi enchant jpeg libpng perl glibc libxml2"
-RDEPENDS    = "enchant glibc-gconv-ibm850 glibc-gconv-cp1252 \
-               glibc-gconv-iso8859-15 glibc-gconv-iso8859-1"
-PR="r3"
-
-SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz \
-	file://cdump-hack.patch;patch=1"
-S = "${WORKDIR}/abiword-${PV}/abi"
-
-FILES_${PN} += " ${datadir}/icons/* \
-${datadir}/AbiSuite-2.2/AbiWord/glade \
-${datadir}/AbiSuite-2.2/AbiWord/scripts \
-${datadir}/AbiSuite-2.2/AbiWord/system.profile-en \
-${datadir}/AbiSuite-2.2/AbiWord/system.profile-en_GB \
-#${datadir}/AbiSuite-2.2/templates/A4.awt \
-#${datadir}/AbiSuite-2.2/templates/US-Letter.awt \
-${datadir}/AbiSuite-2.2/templates/normal.awt \
-${datadir}/AbiSuite-2.2/templates/normal.awt-en_GB \
-${datadir}/AbiSuite-2.2/templates/Employee-Directory.awt \
-${datadir}/AbiSuite-2.2/templates/Business-Report.awt \
-${datadir}/AbiSuite-2.2/templates/Fax-Coversheet.awt \
-${datadir}/AbiSuite-2.2/templates/Resume.awt \
-${datadir}/AbiSuite-2.2/templates/Two-Columns.awt \
-${datadir}/AbiSuite-2.2/templates/Memo.awt \
-${datadir}/AbiSuite-2.2/templates/Press-Release.awt "
-
-inherit autotools
-
-#abiword needs this native tool
-export BUILD_CDUMPTOOL="${STAGING_BINDIR}/cdump"
-
-PARALLEL_MAKE=""
-
-do_configure () {
-        cd ${S}
-        ./autogen.sh
-        ./configure --prefix=/usr --host=${TARGET_SYS} --disable-pspell --enable-enchant
-#       --enable-debug
-	cp -f ${STAGING_BINDIR}/cdump src/tools/cdump/xp/
-}
-
-do_install_append() {
-        install -d ${D}${datadir}/pixmaps/
-        mv ${D}${datadir}/icons/* ${D}${datadir}/pixmaps/
-}
-
-
diff --git a/packages/abiword/abiword_2.3.6.bb b/packages/abiword/abiword_2.3.6.bb
deleted file mode 100644
index 76b569db29..0000000000
--- a/packages/abiword/abiword_2.3.6.bb
+++ /dev/null
@@ -1,52 +0,0 @@
-DESCRIPTION ="AbiWord is free word processing program similar to Microsoft(r) Word""
-HOMEPAGE="http://www.abiword.org""
-MAINTAINER="Koen Kooi <koen@handhelds.org>"
-LICENSE="GPLv2"
-
-DEPENDS     = "cdump-native libgsf libgnomeprint libgnomeprintui libglade libfribidi enchant jpeg libpng perl glibc libxml2"
-RDEPENDS    = "enchant glibc-gconv-ibm850 glibc-gconv-cp1252 \
-               glibc-gconv-iso8859-15 glibc-gconv-iso8859-1"
-PR="r4"
-
-SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz \
-	file://cdump-hack.patch;patch=1"
-S = "${WORKDIR}/abiword-${PV}/abi"
-
-FILES_${PN} += " ${datadir}/icons/* \
-${datadir}/AbiSuite-2.2/AbiWord/glade \
-${datadir}/AbiSuite-2.2/AbiWord/scripts \
-${datadir}/AbiSuite-2.2/AbiWord/system.profile-en \
-${datadir}/AbiSuite-2.2/AbiWord/system.profile-en_GB \
-#${datadir}/AbiSuite-2.2/templates/A4.awt \
-#${datadir}/AbiSuite-2.2/templates/US-Letter.awt \
-${datadir}/AbiSuite-2.2/templates/normal.awt \
-${datadir}/AbiSuite-2.2/templates/normal.awt-en_GB \
-${datadir}/AbiSuite-2.2/templates/Employee-Directory.awt \
-${datadir}/AbiSuite-2.2/templates/Business-Report.awt \
-${datadir}/AbiSuite-2.2/templates/Fax-Coversheet.awt \
-${datadir}/AbiSuite-2.2/templates/Resume.awt \
-${datadir}/AbiSuite-2.2/templates/Two-Columns.awt \
-${datadir}/AbiSuite-2.2/templates/Memo.awt \
-${datadir}/AbiSuite-2.2/templates/Press-Release.awt "
-
-inherit autotools
-
-#abiword needs this native tool
-export BUILD_CDUMPTOOL="${STAGING_BINDIR}/cdump"
-
-PARALLEL_MAKE=""
-
-do_configure () {
-        cd ${S}
-        ./autogen.sh
-        ./configure --prefix=/usr --host=${TARGET_SYS} --disable-p