merge of '30fdc7758a8b7a86b7d59101eff9bd0011257d00'

     and '9ecb8a369d6f726cbe984f8c91972f2c6bc34f1f'

100 files changed, 4867 insertions, 716 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 7375ac5f50..20892a9ffd 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -178,6 +178,7 @@ Distros:    Ångström
 Machines:   collie, spitz
 Recipes:    anthy, nunome, uim*, granule, qpobox*, qte-font-unifont*
 Recipes:    qpf-unismall, qpobox, poboxserver, imkit*, scim, zten
+Recipes:    eb, eblook
 
 Person:     Shane Volpe
 Mail:       shanevolpe@gmail.com
diff --git a/classes/icecc.bbclass b/classes/icecc.bbclass
index 5fadee4ab6..446e78ae1a 100644
--- a/classes/icecc.bbclass
+++ b/classes/icecc.bbclass
@@ -253,10 +253,11 @@ def icc_path(bb,d,compile):
 
     #"system" package blacklist contains a list of packages that can not distribute compile tasks
     #for one reason or the other
-    system_package_blacklist = [ "uclibc", "glibc", "qemu" ]
+    system_package_blacklist = [ "uclibc", "glibc-intermediate", "qemu" ]
 
     for black in system_package_blacklist:
       if black in package_tmp:
+         bb.data.setVar('PARALLEL_MAKE' , '', d) 
          return ""
 
     #user defined exclusion list
@@ -265,6 +266,7 @@ def icc_path(bb,d,compile):
 
     for black in user_package_blacklist:
       if black in package_tmp:
+         bb.data.setVar('PARALLEL_MAKE' , '', d) 
          return ""
 
 
diff --git a/conf/checksums.ini b/conf/checksums.ini
index 953b5a14ea..dba0f2839d 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -854,9 +854,9 @@ sha256=2d7af8211cda81abde3e0bb8ccedbd18924a27b244ff35d4eacafcf899038c56
 md5=183f6d46e8fa5e4b2aff240ab1586c2e
 sha256=80c38a005325e7539012bd665fb8e06af9ee9bfc74efb236ebff121265bfd463
 
-[ftp://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.9.2.tar.gz]
-md5=6bc300365053c815b10b800a21e0bc7e
-sha256=fdb726c5d3761d4c1569e702b74cf9561dc07c6a5f48af3e3fd18685f50d490c
+[ftp://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.11.tar.gz]
+md5=b77a17e4a5a817100ad4b2613935055e
+sha256=fbf5b9a63ea6e3abebfabc04506f0e18a2860071031e34ea4ad4f450b8c43d4b
 
 [ftp://ftp.gnupg.org/gcrypt/alpha/libassuan/libassuan-0.6.7.tar.gz]
 md5=db4e6939fafbaae80cab11a67f28771d
diff --git a/conf/distro/hentges-2.0.conf b/conf/distro/hentges-2.0.conf
new file mode 100644
index 0000000000..5f23949d2d
--- /dev/null
+++ b/conf/distro/hentges-2.0.conf
@@ -0,0 +1,42 @@
+#! /bin/sh
+#
+# Copyright Matthias Hentges <devel@hentges.net> (c) 2007
+# License: MIT (see http://www.opensource.org/licenses/mit-license.php 
+#               for a copy of the license)
+#
+# Filename: hentges-2.0.conf
+# Date: 20070521 (YMD)
+
+DESCRIPTION = "Distribution configuration for the Hentges ROM based on Angstrom"
+MAINTAINER = "Matthias 'CoreDump' Hentges <oe@hentges.net>"
+HOMEPAGE = "http://www.hentges.net"
+LICENSE = "MIT"
+
+######################################################################################
+
+require conf/distro/angstrom-2007.1.conf
+
+######################################################################################
+
+require conf/machine/hentges-2.0_common.conf
+require conf/machine/hentges-2.0_${MACHINE}.conf
+
+######################################################################################
+
+DISTRO_VERSION = "1.9+WIP-${DATE}"
+DISTRO_REVISION = "1"
+
+DISTRO = "hentges-2.0"
+DISTRO_NAME = "Hentges"
+
+######################################################################################
+
+# Override FEED_URIS here
+
+######################################################################################
+
+HENTGES_PV = "${DISTRO_VERSION}"
+HENTGES_PR = "${DISTRO_REVISION}"
+
+######################################################################################
+
diff --git a/conf/distro/slugos.conf b/conf/distro/slugos.conf
index 980c158181..564a2d0cfb 100644
--- a/conf/distro/slugos.conf
+++ b/conf/distro/slugos.conf
@@ -14,3 +14,8 @@ ARM_INSTRUCTION_SET = "arm"
 TARGET_OS = "linux"
 
 require conf/distro/include/slugos.inc
+
+# glibc:
+PREFERRED_PROVIDER_virtual/libiconv ?= "glibc"
+PREFERRED_PROVIDER_virtual/libintl ?= "glibc"
+PREFERRED_PROVIDER_virtual/libc ?= "glibc"
diff --git a/conf/machine/hentges-2.0_common.conf b/conf/machine/hentges-2.0_common.conf
new file mode 100644
index 0000000000..e7e1d5b2b7
--- /dev/null
+++ b/conf/machine/hentges-2.0_common.conf
@@ -0,0 +1,40 @@
+#! /bin/sh
+#
+# Copyright Matthias Hentges <devel@hentges.net> (c) 2007
+# License: MIT (see http://www.opensource.org/licenses/mit-license.php 
+#               for a copy of the license)
+#
+# Filename: hentges-2.0_common.conf
+# Date: 20070521 (YMD)
+
+DESCRIPTION = "Hentges common dependency description"
+MAINTAINER = "Matthias 'CoreDump' Hentges <oe@hentges.net>"
+LICENSE = "MIT"
+
+######################################################################################
+
+HENTGES_BASE_DEPENDS = "task-base-wifi"
+HENTGES_BASE_RDEPENDS = "task-base-wifi"
+
+######################################################################################
+
+# Handled via task-base:
+
+DISTRO_SSH_DAEMON ?= "dropbear"
+
+######################################################################################
+
+# Handled via task-base:
+
+DISTRO_EXTRA_RDEPENDS = "\
+    update-modules \
+    ${@base_contains("MACHINE_FEATURES", "screen", "psplash", "",d)} \   
+    angstrom-version \
+    ipkg ipkg-collateral \
+    util-linux-mount util-linux-umount \
+    ${EXTRA_STUFF} \
+    ${DEBUG_APPS} \
+    "
+    
+HENTGES_X11_DEPENDS += "angstrom-x11-base-depends \
+			angstrom-gpe-task-base"
diff --git a/conf/machine/hentges-2.0_spitz.conf b/conf/machine/hentges-2.0_spitz.conf
new file mode 100644
index 0000000000..cffa01de92
--- /dev/null
+++ b/conf/machine/hentges-2.0_spitz.conf
@@ -0,0 +1,39 @@
+#! /bin/sh
+#
+# Copyright Matthias Hentges <devel@hentges.net> (c) 2007
+# License: MIT (see http://www.opensource.org/licenses/mit-license.php 
+#               for a copy of the license)
+#
+# Filename: hentges-2.0_spitz.conf
+# Date: 20070521 (YMD)
+
+DESCRIPTION = "Hentges dependency description for Spitz aka SL-C3x00"
+MAINTAINER = "Matthias 'CoreDump' Hentges <oe@hentges.net>"
+HOMEPAGE = "<homepage>"
+LICENSE = "MIT"
+
+######################################################################################
+
+DISTRO_SSH_DAEMON_spitz = "openssh"
+
+XSERVER = "xserver-kdrive-fbdev"
+
+######################################################################################
+
+HENTGES_BASE_RDEPENDS += "tar bash"
+
+######################################################################################
+
+# In the future I plan to replace the angstrom-*task* stuff with custom
+# hentges tasks, replacing the angstrom defaults where needed
+
+HENTGES_X11_RDEPENDS += "${XSERVER} \
+			angstrom-gpe-task-pim \
+			angstrom-ohand-task-pim \
+			angstrom-gpe-task-settings \
+			angstrom-gpe-task-apps \
+			angstrom-gpe-task-games \
+			angstrom-task-office \
+			angstrom-task-printing \
+			angstrom-task-sectest \
+			firefox gftp"
diff --git a/conf/machine/kb9202.conf b/conf/machine/kb9202.conf
new file mode 100644
index 0000000000..0e9c0d3b92
--- /dev/null
+++ b/conf/machine/kb9202.conf
@@ -0,0 +1,20 @@
+#@TYPE: Machine
+#@Name: KwikByte KB9202 devboard
+#@DESCRIPTION: Machine configuration for KwikByte KB9202 devboard
+
+TARGET_ARCH = "arm"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux"
+PACKAGE_EXTRA_ARCHS = "armv4 armv4t"
+
+require conf/machine/include/tune-arm920t.conf
+
+# used by sysvinit_2
+# Needs at91 serial port
+#SERIAL_CONSOLE = "57600 ttyAM0"
+ 
+# used by some images
+# 16MB nor + 32MB nand
+ROOT_FLASH_SIZE = "12"
+
+MACHINE_FEATURES = "kernel26 usbhost usbgadget irda"
diff --git a/packages/abiword/abiword.inc b/packages/abiword/abiword.inc
index 8569845394..58f712aca9 100644
--- a/packages/abiword/abiword.inc
+++ b/packages/abiword/abiword.inc
@@ -3,8 +3,9 @@ HOMEPAGE = "http://www.abiword.org""
 SECTION = "x11/office"
 LICENSE = "GPLv2"
 DEPENDS     = "perl-native libgsf libgnomeprint libgnomeprintui li