merge of '2164eb62b60f233738ed0300039cc4c534e16a14'

     and 'e330aca99df7101ab377267e761f56c0df7ef4ae'

66 files changed, 924 insertions, 314 deletions

diff --git a/contrib/angstrom/build-feeds.sh b/contrib/angstrom/build-feeds.sh
index cdfd58852d..657e4d9693 100755
--- a/contrib/angstrom/build-feeds.sh
+++ b/contrib/angstrom/build-feeds.sh
@@ -37,22 +37,23 @@ do_report_success() {
 	echo "$(date -u +%s) $target $BUILD_MODE $machine" >> autobuilder-feed.log
 }
 
-for machine in gumstix-connex gumstix-verdex efika dht-walnut omap5912osk ixp4xxle ixp4xxbe c7x0 poodle tosa akita spitz collie simpad om-gta01 om-gta02 a780 at91sam9263ek qemuarm h2200 h3900 h4000 hx4700  
+for machine in efika dht-walnut omap5912osk ixp4xxle ixp4xxbe c7x0 poodle tosa akita spitz collie simpad om-gta01 om-gta02 a780 at91sam9263ek qemuarm h2200 h3900 h4000 hx4700 nokia800 
 do
         BUILD_MACHINE=$machine
-	BUILD_CLEAN="libtool-cross qmake-native qmake2-native"
+	BUILD_CLEAN="qmake-native qmake2-native"
         BUILD_TARGETS="texinfo flex bison gperf gcc binutils make automake autoconf m4 pkgconfig distcc \
-                       usbutils pciutils mtd-utils usbview hal setserial \
+                       gdb gdbserver strace \
+		       usbutils pciutils mtd-utils usbview hal setserial \
                        task-proper-tools mc screen findutils \
 	               mono jamvm perl python ruby \
 		       gtk+ qt-x11-free qt4-x11-free \
 		       gpe-mini-browser gpe-mini-browser2 netsurf midori firefox epiphany fennec minimo openmoko-browser2 \
 		       samba meta-nas-server \
 		       apache2 boa cherokee lighttpd thttpd \
-		       gpe-gallery gpe-scap notecase task-gpe-pim \
+		       gpe-sketchbook gpe-gallery gpe-scap notecase task-gpe-pim \
 		       pidgin irssi \
 		       roadmap-gtk2 gpsdrive navit viking \
-		       xmms totem mplayer quasar vlc-gpe gnome-mplayer \
+		       ffmpeg xmms totem mplayer quasar vlc-gpe gnome-mplayer \
 		       wpa-gui wifi-radar kismet aircrack-ng dsniff \
 		       nmap iptables iperf openvpn vpnc \
 		       gpe-login ipaq-sleep \
@@ -68,12 +69,16 @@ do
 		       xserver-kdrive xserver-xorg \
 		       xf86-video-fbdev xf86-video-ati xf86-video-vesa \
 		       xf86-input-evdev xf86-input-keyboard xf86-input-mouse \
-		       task-opie \
+		       task-opie task-opie-all \
 		       task-openmoko-base task-openmoko-debug task-openmoko-examples task-openmoko-feed task-openmoko-games task-openmoko-linux task-openmoko-native-sdk task-openmoko-net task-openmoko-phone task-openmoko-pim task-openmoko-ui \
 		       gsm0710muxd frameworkd zhone \
                gnome-games \
                mythtv \
-	       "
+	           ioquake3 quake2 quetoo sdlquake \
+               prboom openredalert \		
+               e-wm \
+               angstrom-x11-base-depends angstrom-zeroconf-audio angstrom-gpe-task-settings \
+"
 	do_build
 done
 
diff --git a/packages/boost/boost_1.34.1.bb b/packages/boost/boost_1.34.1.bb
new file mode 100644
index 0000000000..68afcafea5
--- /dev/null
+++ b/packages/boost/boost_1.34.1.bb
@@ -0,0 +1,41 @@
+# This needs bjam (boost-jam-native) 3.1.16
+#
+# Warning! The build system for boost seems to have changed
+# significantly since 1.33 (again).
+
+include boost.inc
+
+DEFAULT_PREFERENCE = "-1"
+
+DEPENDS += "bzip2"
+
+SRC_URI = "\
+	${SOURCEFORGE_MIRROR}/boost/${BOOST_P}.tar.bz2 \
+	file://linux-uclibc.patch;patch=1 \
+	file://${PV}-gcc43.patch;patch=1 \
+	"
+
+PR = "r0"
+
+BJAM_TOOLS   = "--toolset=gcc \
+		'-sGCC=${CC} '${BJAM_CONF} \
+		'-sGXX=${CXX} '${BJAM_CONF} \
+		'-sGCC_INCLUDE_DIRECTORY=${STAGING_INCDIR}' \
+		'-sGCC_STDLIB_DIRECTORY=${STAGING_LIBDIR}' \
+		'-sBUILD=release <optimization>space <inlining>on <debug-symbols>off' \
+		'-sPYTHON_VERSION=${PYTHON_VERSION}' \
+		'-sPYTHON=${STAGING_BINDIR_NATIVE}/python' \
+    '-sPYTHON_ROOT=${PYTHON_ROOT}' \
+		'-sBZIP2_LIBPATH=${STAGING_LIBDIR}' \
+		'-sZLIB_LIBPATH=${STAGING_LIBDIR}' \
+		'--layout=system' \
+		"
+
+BJAM_OPTS    = '${BJAM_TOOLS} \
+    --builddir=${S}/${TARGET_SYS} \
+    ${BJAM_EXTRA}'
+
+do_configure() {
+  echo "import toolset : using ;" > tools/build/v2/user-config.jam
+	echo "using gcc : : ${CC} : <cflags>${CFLAGS} <cxxflags>${CXXFLAGS} <linkflags>${LDFLAGS} ;" >> tools/build/v2/user-config.jam
+}
diff --git a/packages/boost/files/1.34.1-gcc43.patch b/packages/boost/files/1.34.1-gcc43.patch
new file mode 100644
index 0000000000..4670ac4295
--- /dev/null
+++ b/packages/boost/files/1.34.1-gcc43.patch
@@ -0,0 +1,224 @@
+Index: boost_1_34_1/boost/archive/polymorphic_iarchive.hpp
+===================================================================
+--- boost_1_34_1.orig/boost/archive/polymorphic_iarchive.hpp	2005-12-11 07:12:51.000000000 +0100
++++ boost_1_34_1/boost/archive/polymorphic_iarchive.hpp	2008-09-20 20:55:21.000000000 +0200
+@@ -17,6 +17,7 @@
+ //  See http://www.boost.org for updates, documentation, and revision history.
+ 
+ #include <cstddef> // std::size_t
++#include <climits>
+ #include <boost/config.hpp>
+ 
+ #if defined(BOOST_NO_STDC_NAMESPACE)
+Index: boost_1_34_1/boost/archive/polymorphic_oarchive.hpp
+===================================================================
+--- boost_1_34_1.orig/boost/archive/polymorphic_oarchive.hpp	2006-02-12 06:43:06.000000000 +0100
++++ boost_1_34_1/boost/archive/polymorphic_oarchive.hpp	2008-09-20 20:55:21.000000000 +0200
+@@ -17,6 +17,7 @@
+ //  See http://www.boost.org for updates, documentation, and revision history.
+ 
+ #include <cstddef> // size_t
++#include <climits>
+ #include <string>
+ 
+ #include <boost/config.hpp>
+Index: boost_1_34_1/boost/date_time/date_facet.hpp
+===================================================================
+--- boost_1_34_1.orig/boost/date_time/date_facet.hpp	2005-09-05 23:10:50.000000000 +0200
++++ boost_1_34_1/boost/date_time/date_facet.hpp	2008-09-20 20:55:21.000000000 +0200
+@@ -429,7 +429,7 @@
+     typedef std::basic_string<CharT> string_type;
+     typedef CharT                    char_type;
+     typedef boost::date_time::period_parser<date_type, CharT>  period_parser_type;
+-    typedef special_values_parser<date_type,CharT> special_values_parser_type; 
++    typedef boost::date_time::special_values_parser<date_type,CharT> special_values_parser_type; 
+     typedef std::vector<std::basic_string<CharT> > input_collection_type;
+     typedef format_date_parser<date_type, CharT> format_date_parser_type;
+     // date_generators stuff goes here
+Index: boost_1_34_1/boost/mpl/zip_view.hpp
+===================================================================
+--- boost_1_34_1.orig/boost/mpl/zip_view.hpp	2004-09-02 17:40:42.000000000 +0200
++++ boost_1_34_1/boost/mpl/zip_view.hpp	2008-09-20 20:55:21.000000000 +0200
+@@ -37,7 +37,7 @@
+     typedef zip_iterator<
+           typename transform1<
+                 IteratorSeq
+-              , next<_1>
++              , boost::mpl::next<_1>
+             >::type
+         > next;
+ };
+@@ -48,8 +48,8 @@
+ struct zip_view
+ {
+  private:
+-    typedef typename transform1< Sequences, begin<_1> >::type first_ones_;
+-    typedef typename transform1< Sequences, end<_1> >::type last_ones_;
++    typedef typename transform1< Sequences, boost::mpl::begin<_1> >::type first_ones_;
++    typedef typename transform1< Sequences, boost::mpl::end<_1> >::type last_ones_;
+     
+  public:
+     typedef nested_begin_end_tag tag;
+Index: boost_1_34_1/boost/python/detail/def_helper.hpp
+===================================================================
+--- boost_1_34_1.orig/boost/python/detail/def_helper.hpp	2004-09-16 03:00:28.000000000 +0200
++++ boost_1_34_1/boost/python/detail/def_helper.hpp	2008-09-20 20:55:21.000000000 +0200
+@@ -155,7 +155,7 @@
+           , T3 const&
+           , T4 const&
+           , default_call_policies
+-          , keywords<0>
++          , boost::python::detail::keywords<0>
+           , char const*
+           , void(not_specified::*)()   // A function pointer type which is never an
+                                        // appropriate default implementation
+Index: boost_1_34_1/boost/regex/v4/basic_regex_creator.hpp
+===================================================================
+--- boost_1_34_1.orig/boost/regex/v4/basic_regex_creator.hpp	2006-07-16 18:06:38.000000000 +0200
++++ boost_1_34_1/boost/regex/v4/basic_regex_creator.hpp	2008-09-20 20:55:21.000000000 +0200
+@@ -24,6 +24,8 @@
+ #  include BOOST_ABI_PREFIX
+ #endif
+ 
++#include <climits>
++
+ namespace boost{
+ 
+ namespace re_detail{
+Index: boost_1_34_1/boost/regex/v4/basic_regex.hpp
+===================================================================
+--- boost_1_34_1.orig/boost/regex/v4/basic_regex.hpp	2007-06-05 19:28:18.000000000 +0200
++++ boost_1_34_1/boost/regex/v4/basic_regex.hpp	2008-09-20 20:55:21.000000000 +0200
+@@ -23,6 +23,8 @@
+ #  include BOOST_ABI_PREFIX
+ #endif
+ 
++#include <climits>
++
+ namespace boost{
+ #ifdef BOOST_MSVC
+ #pragma warning(push)
+Index: boost_1_34_1/boost/regex/v4/basic_regex_parser.hpp
+===================================================================
+--- boost_1_34_1.orig/boost/regex/v4/basic_regex_parser.hpp	2006-12-20 18:19:05.000000000 +0100
++++ boost_1_34_1/boost/regex/v4/basic_regex_parser.hpp	2008-09-20 20:55:21.000000000 +0200
+@@ -23,6 +23,8 @@
+ #  include BOOST_ABI_PREFIX
+ #endif
+ 
++#include <climits>
++
+ namespace boost{
+ namespace re_detail{
+ 
+Index: boost_1_34_1/boost/regex/v4/cpp_regex_traits.hpp
+===================================================================
+--- boost_1_34_1.orig/boost/regex/v4/cpp_regex_traits.hpp	2007-01-15 12:09:44.000000000 +0100
++++ boost_1_34_1/boost/regex/v4/cpp_regex_traits.hpp	2008-09-20 20:55:21.000000000 +0200
+@@ -41,6 +41,7 @@
+ 
+ #include <istream>
+ #include <ios>
++#include <climits>
+ 
+ #ifdef BOOST_HAS_ABI_HEADERS
+ #  include BOOST_ABI_PREFIX
+Index: boost_1_34_1/boost/regex/v4/perl_matcher.hpp
+===================================================================
+--- boost_1_34_1.orig/boost/regex/v4/perl_matcher.hpp	2006-10-18 14:55:30.000000000 +0200
++++ boost_1_34_1/boost/regex/v4/perl_matcher.hpp	2008-09-20 20:55:21.000000000 +0200
+@@ -18,6 +18,8 @@
+ #  include BOOST_ABI_PREFIX
+ #endif
+ 
++#include <climits>
++
+ namespace boost{
+ namespace re_detail{
+ 
+Index: boost_1_34_1/boost/regex/v4/regex_split.hpp
+===================================================================
+--- boost_1_34_1.orig/boost/regex/v4/regex_split.hpp	2005-01-21 18:22:38.000000000 +0100
++++ boost_1_34_1/boost/regex/v4/regex_split.hpp	2008-09-20 20:55:21.000000000 +0200
+@@ -21,6 +21,8 @@
+ #ifndef BOOST_REGEX_SPLIT_HPP
+ #define BOOST_REGEX_SPLIT_HPP
+ 
++#include <climits>
++
+ namespace boost{
+ 
+ #ifdef BOOST_HAS_ABI_HEADERS
+Index: boost_1_34_1/boost/regex/v4/states.hpp
+===================================================================
+--- boost_1_34_1.orig/boost/regex/v4/states.hpp	2005-09-20 14:01:25.000000000 +0200
++++ boost_1_34_1/boost/regex/v4/states.hpp	2008-09-20 20:55:21.000000000 +0200
+@@ -23,6 +23,8 @@
+ #  include BOOST_ABI_PREFIX
+ #endif
+ 
++#include <climits>
++
+ namespace boost{
+ namespace re_detail{
+ 
+Index: boost_1_34_1/boost/serialization/collection_traits.hpp
+===================================================================
+--- boost_1_34_1.orig/boost/serialization/collection_traits.hpp	2005-06-21 07:19:04.000000000 +0200
++++ boost_1_34_1/boost/serialization/collection_traits.hpp	2008-09-20 20:55:21.000000000 +0200
+@@ -22,6 +22,7 @@
+ // compiles recognize the same set of primitive types, the possibility
+ // exists for archives to be non-portable if class information for primitive
+ // types is included.  This is addressed by the following macros.
++#include <climits>
+ #include <boost/config.hpp>
+ #include <boost/mpl/integral_c.hpp>
+ #include <boost/mpl/integral_c_tag.hpp>
+Index: boost_1_34_1/boost/spirit/phoenix/operators.hpp
+===================================================================
+--- boost_1_34_1.orig/boost/spirit/phoenix/operators.hpp	2006-08-25 18:27:30.000000000 +0200
++++ boost_1_34_1/boost/spirit/phoenix/operators.hpp	2008-09-20 20:55:21.000000000 +0200
+@@ -24,6 +24,7 @@
+ #include <boost/spirit/phoenix/composite.hpp>
+ #include <boost/config.hpp>
+ #include <boost/mpl/if.hpp>
++#include <climits>
+ 
+ ///////////////////////////////////////////////////////////////////////////////
+ namespace phoenix {
+Index: boost_1_34_1/boost/test/test_tools.hpp
+===================================================================
+--- boost_1_34_1.orig/boost/test/test_tools.hpp	2007-02-22 18:57:29.000000000 +0100
++++ boost_1_34_1/boost/test/test_tools.hpp	2008-09-20 20:55:21.000000000 +0200
+@@ -42,6 +42,7 @@
+ #include <boost/mpl/or.hpp>
+ 
+ // STL
++#include <climits>
+ #include <cstddef>          // for std::size_t
+ #include <iosfwd>
+ 
+Index: boost_1_34_1/boost/wave/cpplexer/re2clex/cpp_re2c_lexer.hpp
+===================================================================
+--- boost_1_34_1.orig/boost/wave/cpplexer/re2clex/cpp_re2c_lexer.hpp	2006-12-20 17:38:24.000000000 +0100
++++ boost_1_34_1/boost/wave/cpplexer/re2clex/cpp_re2c_lexer.hpp	2008-09-20 20:55:21.000000000 +0200
+@@ -16,6 +16,7 @@
+ #include <string>
+ #include <cstdio>
+ #include <cstdarg>
++#include <cstring>
+ #if defined(BOOST_SPIRIT_DEBUG)
+ #include <iostream>
+ #endif // defined(BOOST_SPIRIT_DEBUG)
+Index: boost_1_34_1/boost/wave/util/flex_string.hpp
+===================================================================
+--- boost_1_34_1.orig/boost/wave/util/flex_string.hpp	2006-04-25 19:21:01.000000000 +0200
++++ boost_1_34_1/boost/wave/util/flex_string.hpp	2008-09-20 20:55:21.000000000 +0200
+@@ -94,6 +94,7 @@
+ #include <limits>
+ #include <stdexcept>
+ #include <cstddef>
++#include <cstring>
+ 
+ // this must occur after all of the includes and before any code appears
+ #ifdef BOOST_HAS_ABI_HEADERS
diff --git a/packages/cacao/cacao-native_0.99.2.bb b/packages/cacao/cacao-native_0.99.3.bb
index 1fd4ed8296..0e4d9e5935 100644
--- a/packages/cacao/cacao-native_0.99.2.bb
+++ b/packages/cacao/cacao-native_0.99.3.bb
@@ -2,6 +2,6 @@ require cacao-native.inc
 
 PR = "r0"
 
-SRC_URI = "http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-${PV}/cacao-${PV}.tar.bz2;md5sum=912e353a26c88ba5f5f59ebb9f688e2f"
+SRC_URI = "http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-${PV}/cacao-${PV}.tar.bz2"
 
 
diff --git a/packages/cacao/cacao.inc b/packages/cacao/cacao.inc
index e08cd5ec80..cd4d8c6f3f 100644
--- a/packages/cacao/cacao.inc
+++ b/packages/cacao/cacao.inc
@@ -10,7 +10,6 @@ DEPENDS = "zlib libtool classpath cacaoh-native virtual/javac-native"
 # and cannot be satisfied with a package that provides classpath.
 RDEPENDS = "classpath"
 
-PROVIDES = "cacao virtual/java"
 RPROVIDES_cacao = "java2-runtime"
 
 inherit java autotools update-alternatives
diff --git a/packages/cacao/cacao_0.98+hg20071001.bb b/packages/cacao/cacao_0.98+hg20071001.bb
index e897cfad41..9de8eddce9 100644
--- a/packages/cacao/cacao_0.98+hg20071001.bb
+++ b/packages/cacao/cacao_0.98+hg20071001.bb
@@ -1,6 +1,6 @@
 require cacao.inc
 
-PR = "r9"
+PR = "r10"
 
 SRC_URI = "\
         http://jalimo.evolvis.org/repository/sources/cacao-${PV}.tar.bz2;md5sum=9ff10c929bd0cbf15909107c1aff7518 \
diff --git a/packages/cacao/cacao_0.98+hg20080519.bb b/packages/cacao/cacao_0.98+hg20080519.bb
index 0cd5132ef7..aa9cc2ed1d 100644
--- a/packages/cacao/cacao_0.98+hg20080519.bb
+++ b/packages/cacao/cacao_0.98+hg20080519.bb
@@ -1,6 +1,6 @@
 require cacao.inc
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "\
   http://downloads.openmoko.org/sources/cacao-0.98+hg20080519.tar.gz;md5sum=1c6e0530be63ec8a4c0ab2935c2fdc8f \
diff --git a/packages/cacao/cacao_0.99.2.bb b/packages/cacao/cacao_0.99.3.bb
index e9a80781bc..9817a7ceed 100644
--- a/packages/cacao/cacao_0.99.2.bb
+++ b/packages/cacao/cacao_0.99.3.bb
@@ -1,8 +1,9 @@
 require cacao.inc
 
-PR = "r1"
+PR = "r0"
 
-SRC_URI = "http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-${PV}/cacao-${PV}.tar.bz2;md5sum=912e353a26c88ba5f5f59ebb9f688e2f \
+SRC_URI = "http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-${PV}/cacao-${PV}.tar.bz2 \
 	   file://cacao-codegen-arm1.patch;patch=1 \
 	   file://cacao-codegen-arm2.patch;patch=1 \
-          "
+     "
+
diff --git a/packages/cacao/cacaoh-native_0.99.2.bb b/packages/cacao/cacaoh-native_0.99.3.bb
index 594e79f7de..d2d833dff3 100644
--- a/packages/cacao/cacaoh-native_0.99.2.bb
+++ b/packages/cacao/cacaoh-native_0.99.3.bb
@@ -2,4 +2,4 @@ require cacaoh-native.inc
 
 PR = "r0"
 
-SRC_URI = "http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-${PV}/cacao-${PV}.tar.bz2;md5sum=912e353a26c88ba5f5f59ebb9f688e2f"
+SRC_URI = "http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-${PV}/cacao-${PV}.tar.bz2"
diff --git a/packages/php/php-5.1.4/.mtn2git_empty b/packages/cnc/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/php/php-5.1.4/.mtn2git_empty
+++ b/packages/cnc/.mtn2git_empty
diff --git a/packages/cnc/openredalert/.mtn2git_empty b/packages/cnc/openredalert/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/cnc/openredalert/.mtn2git_empty
diff --git a/packages/cnc/openredalert/openredalert-launcher b/packages/cnc/openredalert/openredalert-launcher
new file mode 100755
index 0000000000..4e5dad4bb6
--- /dev/null
+++ b/packages/cnc/openredalert/openredalert-launcher
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+( cd /usr/share/games/redalert && ./openredalert )
diff --git a/packages/cnc/openredalert_r438.bb b/packages/cnc/openredalert_r438.bb
new file mode 100644
index 0000000000..4da245614a
--- /dev/null
+++ b/packages/cnc/openredalert_r438.bb
@@ -0,0 +1,28 @@
+DESCRIPTION = "Game engine to run Red Alert 1"
+LICENSE = "GPLv2"
+
+DEPENDS = "virtual/libsdl libsdl-mixer" 
+
+SRC_URI = "http://openredalert.googlecode.com/files/openredalert-${PV}-src.tar.gz \