merge of 58569a0e47bb26450c7e67d5aa0b20806e2b2a50

     and 5ae0815fd4186ce653535a78ab0e482e9a7c24f4

34 files changed, 779 insertions, 12 deletions

diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 2043a500eb..54815cd0a0 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -239,9 +239,9 @@ EXTRA_OEMAKE = "-e MAKEFLAGS="
 # Build flags and options.
 ##################################################################
 
-export BUILD_CPPFLAGS = "-I${STAGING_DIR}/${BUILD_SYS}/include"
+export BUILD_CPPFLAGS = "-isystem${STAGING_DIR}/${BUILD_SYS}/include"
 export CPPFLAGS = "${TARGET_CPPFLAGS}"
-export TARGET_CPPFLAGS = "-I${STAGING_DIR}/${TARGET_SYS}/include"
+export TARGET_CPPFLAGS = "-isystem${STAGING_DIR}/${TARGET_SYS}/include"
 
 export BUILD_CFLAGS = "${BUILD_CPPFLAGS} ${BUILD_OPTIMIZATION}"
 export CFLAGS = "${TARGET_CFLAGS}"
@@ -383,6 +383,8 @@ AUTO_LIBNAME_PKGS = "${PACKAGES}"
 #
 # This works for  functions as well, they are really just environment variables.
 OVERRIDES = "local:${MACHINE}:${DISTRO}:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}"
+# Alternative OVERRIDES to make compilation fail fast, we will enable it by default soon
+#OVERRIDES = "local:${MACHINE}:${DISTRO}:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:fail-fast"
 
 ##################################################################
 # Include the rest of the config files.
diff --git a/conf/distro/angstrom-2006.9.conf b/conf/distro/angstrom-2006.9.conf
index 58d6c2ad38..405a48721f 100644
--- a/conf/distro/angstrom-2006.9.conf
+++ b/conf/distro/angstrom-2006.9.conf
@@ -23,7 +23,7 @@ FEED_URIS += " \
 #        updates##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/updates"
 
 SRCDATE = "20060425"
-SRCDATE_handhelds-pxa-2.6 = "20060506"
+SRCDATE_handhelds-pxa-2.6 = "20060516"
 
 CVS_TARBALL_STASH = "\
 http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/3.5.4/sources/ \
diff --git a/conf/distro/angstrom.conf b/conf/distro/angstrom.conf
index a94fcee140..403b13934f 100644
--- a/conf/distro/angstrom.conf
+++ b/conf/distro/angstrom.conf
@@ -5,8 +5,8 @@
 DISTRO = "angstrom"
 DISTRO_NAME = "Angstrom"
 
-#we'll use this till we get a real domain
-ANGSTROM_URI = "http://ewi546.ewi.utwente.nl/angstrom"
+#Use this variable in feeds and other parts that need a URI
+ANGSTROM_URI = "http://www.angstrom-distribution.org/"
 
 #Set the default maintainer to angstrom-dev
 MAINTAINER = "Angstrom Developers <angstrom-dev@handhelds.org>"
diff --git a/packages/epdfview/epdfview_0.1.4.bb b/packages/epdfview/epdfview_0.1.4.bb
new file mode 100644
index 0000000000..357129c16b
--- /dev/null
+++ b/packages/epdfview/epdfview_0.1.4.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "A minimal PDF viewer based on gtk and poppler"
+MAINTAINER = "Graeme Gregory <dp@xora.org.uk>"
+HOMEPAGE = "http://www.emma-soft.com/projects/epdfview/"
+LICENSE = "GPLv2"
+DEPENDS = "poppler gtk+"
+
+SRC_URI = "http://www.emma-soft.com/projects/epdfview/chrome/site/releases/epdfview-${PV}.tar.bz2"
+
+PR="r0"
+
+inherit autotools
+
+do_compile_append () {
+	sed -i 's|\$.*prefix./|/usr/|' data/epdfview.desktop
+}
+
diff --git a/packages/gcc/gcc-3.4.4/zecke-no-host-includes.patch b/packages/gcc/gcc-3.4.4/zecke-no-host-includes.patch
new file mode 100644
index 0000000000..069a965012
--- /dev/null
+++ b/packages/gcc/gcc-3.4.4/zecke-no-host-includes.patch
@@ -0,0 +1,32 @@
+Index: gcc-3.4.4/gcc/c-incpath.c
+===================================================================
+--- gcc-3.4.4.orig/gcc/c-incpath.c	2004-05-31 12:37:47.000000000 +0200
++++ gcc-3.4.4/gcc/c-incpath.c	2006-05-15 20:07:31.000000000 +0200
+@@ -328,6 +328,27 @@
+   else
+     heads[chain] = p;
+   tails[chain] = p;
++
++
++#ifdef CROSS_COMPILE
++    /* A common error when cross compiling is including
++    host headers. This code below will try to fail fast
++    for cross compiling. Currently we consider /usr/include,
++    /opt/include and /sw/include as harmful.  */
++	{
++		/* printf("Adding Path: %s\n", p->name ); */
++		if( strstr(p->name, "/usr/include" ) == p->name ) {
++			fprintf(stderr, _("CROSS COMPILE Badness: /usr/include in INCLUDEPATH: %s\n"), p->name);
++			abort();
++		} else if( strstr(p->name, "/sw/include") == p->name ) {
++			fprintf(stderr, _("CROSS COMPILE Badness: /sw/include in INCLUDEPATH: %s\n"), p->name);
++			abort();
++		} else if( strstr(p->name, "/opt/include") == p->name ) {
++			fprintf(stderr, _("CROSS COMPILE Badness: /opt/include in INCLUDEPATH: %s\n"), p->name);
++			abort();
++		}
++	}
++#endif
+ }
+ 
+ /* Exported function to handle include chain merging, duplicate
diff --git a/packages/gcc/gcc-4.0.0/zecke-no-host-includes.patch b/packages/gcc/gcc-4.0.0/zecke-no-host-includes.patch
new file mode 100644
index 0000000000..6afb10d6ef
--- /dev/null
+++ b/packages/gcc/gcc-4.0.0/zecke-no-host-includes.patch
@@ -0,0 +1,31 @@
+Index: gcc-4.0.2/gcc/c-incpath.c
+===================================================================
+--- gcc-4.0.2.orig/gcc/c-incpath.c	2005-01-23 16:05:27.000000000 +0100
++++ gcc-4.0.2/gcc/c-incpath.c	2006-05-15 21:23:02.000000000 +0200
+@@ -350,6 +350,26 @@
+   p->construct = 0;
+   p->user_supplied_p = user_supplied_p;
+ 
++#ifdef CROSS_COMPILE
++    /* A common error when cross compiling is including
++    host headers. This code below will try to fail fast
++    for cross compiling. Currently we consider /usr/include,
++    /opt/include and /sw/include as harmful.  */
++	{
++		/* printf("Adding Path: %s\n", p->name ); */
++		if( strstr(p->name, "/usr/include" ) == p->name ) {
++			fprintf(stderr, _("CROSS COMPILE Badness: /usr/include in INCLUDEPATH: %s\n"), p->name);
++			abort();
++		} else if( strstr(p->name, "/sw/include") == p->name ) {
++			fprintf(stderr, _("CROSS COMPILE Badness: /sw/include in INCLUDEPATH: %s\n"), p->name);
++			abort();
++		} else if( strstr(p->name, "/opt/include") == p->name ) {
++			fprintf(stderr, _("CROSS COMPILE Badness: /opt/include in INCLUDEPATH: %s\n"), p->name);
++			abort();
++		 }
++	}
++#endif
++
+   add_cpp_dir_path (p, chain);
+ }
+ 
diff --git a/packages/gcc/gcc-4.0.2/zecke-no-host-includes.patch b/packages/gcc/gcc-4.0.2/zecke-no-host-includes.patch
new file mode 100644
index 0000000000..6afb10d6ef
--- /dev/null
+++ b/packages/gcc/gcc-4.0.2/zecke-no-host-includes.patch
@@ -0,0 +1,31 @@
+Index: gcc-4.0.2/gcc/c-incpath.c
+===================================================================
+--- gcc-4.0.2.orig/gcc/c-incpath.c	2005-01-23 16:05:27.000000000 +0100
++++ gcc-4.0.2/gcc/c-incpath.c	2006-05-15 21:23:02.000000000 +0200
+@@ -350,6 +350,26 @@
+   p->construct = 0;
+   p->user_supplied_p = user_supplied_p;
+ 
++#ifdef CROSS_COMPILE
++    /* A common error when cross compiling is including
++    host headers. This code below will try to fail fast
++    for cross compiling. Currently we consider /usr/include,
++    /opt/include and /sw/include as harmful.  */
++	{
++		/* printf("Adding Path: %s\n", p->name ); */
++		if( strstr(p->name, "/usr/include" ) == p->name ) {
++			fprintf(stderr, _("CROSS COMPILE Badness: /usr/include in INCLUDEPATH: %s\n"), p->name);
++			abort();
++		} else if( strstr(p->name, "/sw/include") == p->name ) {
++			fprintf(stderr, _("CROSS COMPILE Badness: /sw/include in INCLUDEPATH: %s\n"), p->name);
++			abort();
++		} else if( strstr(p->name, "/opt/include") == p->name ) {
++			fprintf(stderr, _("CROSS COMPILE Badness: /opt/include in INCLUDEPATH: %s\n"), p->name);
++			abort();
++		 }
++	}
++#endif
++
+   add_cpp_dir_path (p, chain);
+ }
+ 
diff --git a/packages/gcc/gcc-4.1-20060217/zecke-no-host-includes.patch b/packages/gcc/gcc-4.1-20060217/zecke-no-host-includes.patch
new file mode 100644
index 0000000000..6afb10d6ef
--- /dev/null
+++ b/packages/gcc/gcc-4.1-20060217/zecke-no-host-includes.patch
@@ -0,0 +1,31 @@
+Index: gcc-4.0.2/gcc/c-incpath.c
+===================================================================
+--- gcc-4.0.2.orig/gcc/c-incpath.c	2005-01-23 16:05:27.000000000 +0100
++++ gcc-4.0.2/gcc/c-incpath.c	2006-05-15 21:23:02.000000000 +0200
+@@ -350,6 +350,26 @@
+   p->construct = 0;
+   p->user_supplied_p = user_supplied_p;
+ 
++#ifdef CROSS_COMPILE
++    /* A common error when cross compiling is including
++    host headers. This code below will try to fail fast
++    for cross compiling. Currently we consider /usr/include,
++    /opt/include and /sw/include as harmful.  */
++	{
++		/* printf("Adding Path: %s\n", p->name ); */
++		if( strstr(p->name, "/usr/include" ) == p->name ) {
++			fprintf(stderr, _("CROSS COMPILE Badness: /usr/include in INCLUDEPATH: %s\n"), p->name);
++			abort();
++		} else if( strstr(p->name, "/sw/include") == p->name ) {
++			fprintf(stderr, _("CROSS COMPILE Badness: /sw/include in INCLUDEPATH: %s\n"), p->name);
++			abort();
++		} else if( strstr(p->name, "/opt/include") == p->name ) {
++			fprintf(stderr, _("CROSS COMPILE Badness: /opt/include in INCLUDEPATH: %s\n"), p->name);
++			abort();
++		 }
++	}
++#endif
++
+   add_cpp_dir_path (p, chain);
+ }
+ 
diff --git a/packages/gcc/gcc-4.1.0/zecke-no-host-includes.patch b/packages/gcc/gcc-4.1.0/zecke-no-host-includes.patch
new file mode 100644
index 0000000000..6afb10d6ef
--- /dev/null
+++ b/packages/gcc/gcc-4.1.0/zecke-no-host-includes.patch
@@ -0,0 +1,31 @@
+Index: gcc-4.0.2/gcc/c-incpath.c
+===================================================================
+--- gcc-4.0.2.orig/gcc/c-incpath.c	2005-01-23 16:05:27.000000000 +0100
++++ gcc-4.0.2/gcc/c-incpath.c	2006-05-15 21:23:02.000000000 +0200
+@@ -350,6 +350,26 @@
+   p->construct = 0;
+   p->user_supplied_p = user_supplied_p;
+ 
++#ifdef CROSS_COMPILE
++    /* A common error when cross compiling is including
++    host headers. This code below will try to fail fast
++    for cross compiling. Currently we consider /usr/include,
++    /opt/include and /sw/include as harmful.  */
++	{
++		/* printf("Adding Path: %s\n", p->name ); */
++		if( strstr(p->name, "/usr/include" ) == p->name ) {
++			fprintf(stderr, _("CROSS COMPILE Badness: /usr/include in INCLUDEPATH: %s\n"), p->name);
++			abort();
++		} else if( strstr(p->name, "/sw/include") == p->name ) {
++			fprintf(stderr, _("CROSS COMPILE Badness: /sw/include in INCLUDEPATH: %s\n"), p->name);
++			abort();
++		} else if( strstr(p->name, "/opt/include") == p->name ) {
++			fprintf(stderr, _("CROSS COMPILE Badness: /opt/include in INCLUDEPATH: %s\n"), p->name);
++			abort();
++		 }
++	}
++#endif
++
+   add_cpp_dir_path (p, chain);
+ }
+ 
diff --git a/packages/gcc/gcc-4.2-20060513/zecke-no-host-includes.patch b/packages/gcc/gcc-4.2-20060513/zecke-no-host-includes.patch
new file mode 100644
index 0000000000..6afb10d6ef
--- /dev/null
+++ b/packages/gcc/gcc-4.2-20060513/zecke-no-host-includes.patch
@@ -0,0 +1,31 @@
+Index: gcc-4.0.2/gcc/c-incpath.c
+===================================================================
+--- gcc-4.0.2.orig/gcc/c-incpath.c	2005-01-23 16:05:27.000000000 +0100
++++ gcc-4.0.2/gcc/c-incpath.c	2006-05-15 21:23:02.000000000 +0200
+@@ -350,6 +350,26 @@
+   p->construct = 0;
+   p->user_supplied_p = user_supplied_p;
+ 
++#ifdef CROSS_COMPILE
++    /* A common error when cross compiling is including
++    host headers. This code below will try to fail fast
++    for cross compiling. Currently we consider /usr/include,
++    /opt/include and /sw/include as harmful.  */
++	{
++		/* printf("Adding Path: %s\n", p->name ); */
++		if( strstr(p->name, "/usr/include" ) == p->name ) {
++			fprintf(stderr, _("CROSS COMPILE Badness: /usr/include in INCLUDEPATH: %s\n"), p->name);
++			abort();
++		} else if( strstr(p->name, "/sw/include") == p->name ) {
++			fprintf(stderr, _("CROSS COMPILE Badness: /sw/include in INCLUDEPATH: %s\n"), p->name);
++			abort();
++		} else if( strstr(p->name, "/opt/include") == p->name ) {
++			fprintf(stderr, _("CROSS COMPILE Badness: /opt/include in INCLUDEPATH: %s\n"), p->name);
++			abort();
++		 }
++	}
++#endif
++
+   add_cpp_dir_path (p, chain);
+ }
+ 
diff --git a/packages/gcc/gcc_3.4.4.bb b/packages/gcc/gcc_3.4.4.bb
index 5be603f2ca..2d04b0ed08 100644
--- a/packages/gcc/gcc_3.4.4.bb
+++ b/packages/gcc/gcc_3.4.4.bb
@@ -26,5 +26,6 @@ SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
 
 SRC_URI += "file://gcc34-configure.in.patch;patch=1"
 SRC_URI += "file://gcc34-thumb-support.patch;patch=1"
+SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
 
 include gcc3-build.inc
diff --git a/packages/gcc/gcc_4.0.0.bb b/packages/gcc/gcc_4.0.0.bb
index cb7bfeae1c..af54c17fb8 100644
--- a/packages/gcc/gcc_4.0.0.bb
+++ b/packages/gcc/gcc_4.0.0.bb
@@ -11,5 +11,6 @@ include gcc-package.inc
 
 SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
 	file://ldflags.patch;patch=1"
+SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
 
 include gcc4-build.inc
diff --git a/packages/gcc/gcc_4.0.2.bb b/packages/gcc/gcc_4.0.2.bb
index 540af1cb39..7a8eba47ee 100644
--- a/packages/gcc/gcc_4.0.2.bb
+++ b/packages/gcc/gcc_4.0.2.bb
@@ -23,5 +23,7 @@ SRC_URI_append = " file://100-uclibc-conf.patch;patch=1   \
                    file://800-arm-bigendian.patch;patch=1 \
                    file://zecke-host-cpp-ac-hack.patch;patch=1 "
 
+SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
+
 
 include gcc4-build.inc
diff --git a/packages/gcc/gcc_4.1-20060217.bb b/packages/gcc/gcc_4.1-20060217.bb
index da2c80782d..66880d752b 100644
--- a/packages/gcc/gcc_4.1-20060217.bb
+++ b/packages/gcc/gcc_4.1-20060217.bb
@@ -14,4 +14,6 @@ SRC_URI = "http://ftp.nluug.nl/languages/gcc/snapshots/4.1-20060217/gcc-4.1-2006
 	file://arm-softfloat.patch;patch=1 \
 	file://ldflags.patch;patch=1"
 
+SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
+
 include gcc4-build.inc
diff --git a/packages/gcc/gcc_4.1.0.bb b/packages/gcc/gcc_4.1.0.bb
index 27f6870d23..4d44978dab 100644
--- a/packages/gcc/gcc_4.1.0.bb
+++ b/packages/gcc/gcc_4.1.0.bb
@@ -14,6 +14,8 @@ SRC_URI = "http://ftp.gnu.org/pub/gnu/gcc/gcc-4.1.0/gcc-4.1.0.tar.bz2 \
 	file://arm-softfloat.patch;patch=1 \
 	file://ldflags.patch;patch=1"
 
+SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
+
 include gcc4-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 9eb54654da..68fa6d8d06 100644
--- a/packages/gcc/gcc_4.2-20060513.bb
+++ b/packages/gcc/gcc_4.2-20060513.bb
@@ -14,6 +14,8 @@ SRC_URI = "http://ftp.nluug.nl/languages/gcc/snapshots/${PV}/gcc-${PV}.tar.bz2 \
 	file://arm-softfloat.patch;patch=1 \
 	file://ldflags.patch;patch=1"
 
+SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
+
 include gcc4-build.inc
 EXTRA_OECONF += "--disable-libssp"
 
diff --git a/packages/glibc/glibc-cvs-2.3.5/superh-fcntl.patch b/packages/glibc/glibc-cvs-2.3.5/superh-fcntl.patch
new file mode 100644
index 0000000000..364b9e1b32
--- /dev/null
+++ b/packages/glibc/glibc-cvs-2.3.5/superh-fcntl.patch
@@ -0,0 +1,40 @@
+--- sysdeps/unix/sysv/linux/sh/bits/fcntl.h_orig	2006-05-16 16:58:30.000000000 +0000
++++ sysdeps/unix/sysv/linux/sh/bits/fcntl.h	2006-05-16 16:58:49.000000000 +0000
+@@ -90,6 +90,12 @@
+ # define F_GETSIG	11	/* Get number of signal to be sent.  */
+ #endif
+ 
++#ifdef __USE_GNU
++# define F_SETLEASE   1024      /* Set a lease. */
++# define F_GETLEASE   1025      /* Enquire what lease is active. */
++# define F_NOTIFY     1026      /* Request notifications on a directory */
++#endif
++
+ /* For F_[GET|SET]FL.  */
+ #define FD_CLOEXEC	1	/* actually anything with low bit set goes */
+ 
+@@ -111,6 +117,24 @@
+ # define LOCK_UN	8	/* remove lock */
+ #endif
+ 
++#ifdef __USE_GNU
++# define LOCK_MAND      32      /* this is a mandatory flock:  */
++# define LOCK_READ      64      /* ...which allows concurrent read operations. */
++# define LOCK_WRITE    128      /* ...which allows concurrent write operations. */
++# define LOCK_RW       192      /* ...which allows concurrent read & write operations. */
++#endif
++
++#ifdef __USE_GNU
++/* Types of directory notifications that may be requested with F_NOTIFY. */
++# define DN_ACCESS 0x00000001     /* File Acessed. */
++# define DN_MODIFY 0x00000002     /* File Modified. */
++# define DN_CREATE 0x00000004     /* File created. */
++# define DN_DELETE 0x00000008     /* File removed. */
++# define DN_RENAME 0x00000010     /* File renamed. */
++# define DN_ATTRIB 0x00000020     /* File changed attributes. */
++# define DN_MULTISHOT 0x80000000  /* Don't remove notifier. */
++#endif
++
+ struct flock
+   {
+     short int l_type;	/* Type of lock: F_RDLCK, F_WRLCK, or F_UNLCK.  */
diff --git a/packages/glibc/glibc_2.3.5+cvs20050627.bb b/packages/glibc/glibc_2.3.5+cvs20050627.bb
index 61e3e84d6d..86ddc91fd0 100644
--- a/packages/glibc/glibc_2.3.5+cvs20050627.bb
+++ b/packages/glibc/glibc_2.3.5+cvs20050627.bb
@@ -7,7 +7,7 @@ MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs-2.3.5"
 SRCDATE = "20050627"
-PR = "r4"
+PR = "r6"
 
 GLIBC_ADDONS ?= "ports,linuxthreads"
 GLIBC_EXTRA_OECONF ?= ""
@@ -60,8 +60,11 @@ SRC_URI = "http://familiar.handhelds.org/source/v0.8.3/stash_libc_sources.redhat
 # seems to fail on tls platforms
 SRC_URI_append_arm = " file://dyn-ldconfig-20041128.patch;patch=1"
 
-# Build fails on sh4 unless no-z-defs is defined
-SRC_URI_append_sh4 = " file://no-z-defs.patch;patch=1"
+# Build fails on sh3 and sh4 without additional patches
+SRC_URI_append_sh3 = " file://no-z-defs.patch;patch=1 \
+                       file://superh-fcntl.patch;patch=1;pnum=0"
+SRC_URI_append_sh4 = " file://no-z-defs.patch;patch=1 \ 
+                       file://superh-fcntl.patch;patch=1;pnum=0"
 
 S = "${WORKDIR}/libc"
 B = "${WORKDIR}/build-${TARGET_SYS}"
diff --git a/packages/jamvm/jamvm/sh3sh4-support.patch b/packages/jamvm/jamvm/sh3sh4-support.patch
new file mode 100644
index 0000000000..8fa0d8c161
--- /dev/null
+++ b/packages/jamvm/jamvm/sh3sh4-support.patch
@@ -0,0 +1,11 @@
+--- configure.ac_orig	2006-05-10 21:48:31.000000000 +0000
++++ configure.ac	2006-05-10 21:49:56.000000000 +0000
+@@ -66,6 +66,8 @@
+ arm*-*-linux*) host_cpu=arm host_os=linux ;;
+ arm*-*-openbsd*) host_cpu=arm host_os=linux libdl_needed=no ;;
+ arm*-*-freebsd*) host_cpu=arm host_os=linux libdl_needed=no ;;
++sh3-*-linux*) host_cpu=sh3 host_os=linux libdl_needed=no ;;
++sh4-*-linux*) host_cpu=sh4 host_os=linux libdl_needed=no ;;
+ powerpc*-*-linux*) host_cpu=powerpc host_os=linux ;;
+ powerpc*-*-openbsd*) host_cpu=powerpc host_os=linux libdl_needed=no ;;
+ powerpc*-*-freebsd*) host_cpu=powerpc host_os=linux libdl_needed=no ;;
diff --git a/packages/lua/lua-gtk2/.mtn2git_empty b/packages/lua/lua-gtk2/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/lua/lua-gtk2/.mtn2git_empty
diff --git a/packages/lua/lua-gtk2/lua-gtk2-0.3_fixbuild.patch b/packages/lua/lua-gtk2/lua-gtk2-0.3_fixbuild.patch
new file mode 100644
index 0000000000..1115b6ffb6
--- /dev/null
+++ b/packages/lua/lua-gtk2/lua-gtk2-0.3_fixbuild.patch
@@ -0,0 +1,352 @@
+diff -NbBur lua-gtk2-0.3_orig/configure lua-gtk2-0.3/configure
+--- lua-gtk2-0.3_orig/configure	2005-08-16 19:32:07.000000000 +0200
++++ lua-gtk2-0.3/configure	2006-05-14 02:52:39.000000000 +0200
+@@ -2,25 +2,19 @@
+ 
+ # examine system
+ 
+-CFLAGS="$(pkg-config gtk+-2.0 --cflags) $(pkg-config lua50 --cflags) -I build-linux -I src"
++CFLAGS="-g -Wall -DLINUX -Os -fomit-frame-pointer -Wall $(pkg-config gtk+-2.0 --cflags) $(pkg-config lua50 --cflags) -I build-linux -I src"
+ VERSION="0.3"
+-
+-if which gcc-4.0 > /dev/null; then
+-	GCC=gcc-4.0
+-elif which gcc > /dev/null; then
+-	GCC=gcc
+-else
+-	@echo "No GCC found."
+-	exit 1
+-fi
+-
+-if true; then
+-	CFLAGS2="-DLINUX"
+-	LIBS="" # -lgtk-x11-2.0"
+-else
+-	CFLAGS2="-DWIN32"
+-	LIBS=""
+-fi
++PREFIX="/usr/local"
++GCC=arm-linux-gcc
++HGCC=gcc
++
++#if true; then
++#	CFLAGS2="-DLINUX"
++#	LIBS="" # -lgtk-x11-2.0"
++#else
++#	CFLAGS2="-DWIN32"
++#	LIBS=""
++#fi
+ 
+ 
+ # build makefile
+@@ -28,13 +22,14 @@
+ cat > Makefile <<EOF
+ # automatically generated makefile
+ 
+-# CFLAGS	:=-DLINUX -Os -fomit-frame-pointer -Wall $CFLAGS
++#CFLAGS	:= \-DLINUX -Os -fomit-frame-pointer -Wall $CFLAGS
+ # CFLAGS	:=-DLINUX -O2 -fomit-frame-pointer -Wall $CFLAGS
+-CFLAGS	:=$CFLAGS2 -g -Wall $CFLAGS
++CFLAGS	=$CFLAGS 
+ HASH	:=hash2
+ ODIR	:=build-linux/
+ VERSION	:=$VERSION
+ CC	:=$GCC
++HGCC	:=$HGCC
+ 
+ all: \${ODIR}libluagtk2.so \${ODIR}main
+ 
+@@ -46,6 +41,8 @@
+ 	@\${CC} -shared -o \$@ $^ /usr/lib/libffi.a $LIBS
+ 
+ \${ODIR}generate: \${ODIR}generate.o \${ODIR}\${HASH}.o
++	@echo \$@
++	@\${HGCC} -Wall -c -g -o \$@ $^
+ 
+ \${ODIR}main.o: src/main.c
+ 	@echo \$@
+@@ -99,9 +96,9 @@
+ 	rm -f \${ODIR}file2c \${ODIR}override.luac \${ODIR}main
+ 
+ install: all
+-	mkdir -p ~/.lua50
+-	cp gtk2.lua ~/.lua50
+-	ln -sf \$(PWD)/build-linux/libluagtk2.so ~/.lua50
++	install -d \$(DESTDIR)/\$(PREFIX)/lib/lua50
++	install gtk2.lua \$(DESTDIR)/\$(PREFIX)/lib/lua50
++	install \$(PWD)/build-linux/libluagtk2.so \$(DESTDIR)/\$(PREFIX)/lib/lua50
+ 
+ tar:
+ 	(cd ..; ln -s lua-gtk2 lua-gtk2-\${VERSION}; tar czvhf lua-gtk2-\${VERSION}.tar.gz \\
+diff -NbBur lua-gtk2-0.3_orig/configure_orig lua-gtk2-0.3/configure_orig
+--- lua-gtk2-0.3_orig/configure_orig	1970-01-01 01:00:00.000000000 +0100
++++ lua-gtk2-0.3/configure_orig	2006-05-13 18:22:03.000000000 +0200
+@@ -0,0 +1,114 @@
++#! /bin/sh
++
++# examine system
++
++CFLAGS="$(pkg-config gtk+-2.0 --cflags) $(pkg-config lua50 --cflags) -I build-linux -I src"
++VERSION="0.3"
++
++if which gcc-4.0 > /dev/null; then
++	GCC=gcc-4.0
++elif which gcc > /dev/null; then
++	GCC=gcc
++else
++	@echo "No GCC found."
++	exit 1
++fi
++
++if true; then
++	CFLAGS2="-DLINUX"
++	LIBS="" # -lgtk-x11-2.0"
++else
++	CFLAGS2="-DWIN32"
++	LIBS=""
++fi
++
++
++# build makefile
++
++cat > Makefile <<EOF
++# automatically generated makefile
++
++# CFLAGS	:=-DLINUX -Os -fomit-frame-pointer -Wall $CFLAGS
++# CFLAGS	:=-DLINUX -O2 -fomit-frame-pointer -Wall $CFLAGS
++CFLAGS	:=$CFLAGS2 -g -Wall $CFLAGS
++HASH	:=hash2
++ODIR	:=build-linux/
++VERSION	:=$VERSION
++CC	:=$GCC
++
++all: \${ODIR}libluagtk2.so \${ODIR}main
++
++Makefile: configure
++	./configure
++
++\${ODIR}libluagtk2.so: \${ODIR}libluagtk2.o \${ODIR}\${HASH}.o \${ODIR}hash.o \${ODIR}_funclist.o \${ODIR}_structlist.o \${ODIR}_enumlist.o \${ODIR}_override.o
++	@echo \$@
++	@\${CC} -shared -o \$@ $^ /usr/lib/libffi.a $LIBS
++
++\${ODIR}generate: \${ODIR}generate.o \${ODIR}\${HASH}.o
++
++\${ODIR}main.o: src/main.c
++	@echo \$@
++	@\${CC} -Wall -c -g -o \$@ $^ -I /usr/include/lua50
++
++\${ODIR}main: \${ODIR}main.o
++	@echo \$@
++	@\${CC} -o \$@ $^ -llua50 -llualib50
++
++\${ODIR}libluagtk2.o: src/libluagtk2.c \${ODIR}_typelist.c src/structinfo.h src/hash.h
++
++\${ODIR}_funclist.c: data/gtkdata.funcs \${ODIR}generate
++	@echo \$@
++	@\${ODIR}generate -s 4096 -o \$@ -p funclist_ -d $<
++
++\${ODIR}_structlist.c: data/gtkdata.structs.c
++	cp -f \$< \$@
++
++\${ODIR}_typelist.c: data/gtkdata.types.c
++	cp -f \$< \$@
++
++\${ODIR}_enumlist.c: data/gtkdata.enums src/extra_enum
++	@echo \$@
++	@cat $^ | \${ODIR}generate -s 1201 -o \$@ -p enumlist_ -d -f -
++
++\${ODIR}_override.c: \${ODIR}override.luac \${ODIR}file2c
++	@echo \$@
++	@\${ODIR}file2c < \$^ > \$@
++	
++data/gtkdata.structs.c:
++	(cd data; ../script/gen-list.pl)
++
++build-linux/%.o: build-linux/%.c
++	@echo \$@
++	@\${CC} \${CFLAGS} -c -o \$@ \$<
++
++build-linux/%.o: src/%.c
++	@echo \$@
++	@\${CC} \${CFLAGS} -c -o \$@ \$<
++
++build-linux/%.s: src/%.c
++	@echo \$@
++	@\${CC} \${CFLAGS} -S -o \$@ \$<
++
++build-linux/%.luac: src/%.lua
++	@echo \$@
++	@luac -s -o \$@ \$<
++
++clean:
++	rm -f \${ODIR}libluagtk2.so \${ODIR}generate \${ODIR}_*.c \${ODIR}*.o
++	rm -f \${ODIR}file2c \${ODIR}override.luac \${ODIR}main
++
++install: all
++	mkdir -p ~/.lua50
++	cp gtk2.lua ~/.lua50
++	ln -sf \$(PWD)/build-linux/libluagtk2.so ~/.lua50
++
++tar:
++	(cd ..; ln -s lua-gtk2 lua-gtk2-\${VERSION}; tar czvhf lua-gtk2-\${VERSION}.tar.gz \\
++	lua-gtk2-\${VERSION} --exclude old --exclude "build-*" --exclude foreign --exclude lua50 \\
++	--exclude test-dll; rm lua-gtk2-\${VERSION})
++
++EOF
++
++mkdir -p build-linux build-win32
++
+diff -NbBur lua-gtk2-0.3_orig/gtk2.lua lua-gtk2-0.3/gtk2.lua
+--- lua-gtk2-0.3_orig/gtk2.lua	2005-08-16 19:26:14.000000000 +0200
++++ lua-gtk2-0.3/gtk2.lua	1970-01-01 01:00:00.000000000 +0100
+@@ -1,16 +0,0 @@
+-
+--- if compiled in, _gtk is set.
+-if _gtk == nil then
+-
+-	local init, err = loadlib(os.getenv("HOME") .. "/.lua50/libluagtk2.so",
+-		"luaopen_gtk2")
+-	if err then
+-	    print(err)
+-	    return
+-	end
+-	gtk = init()
+-
+-else
+-	gtk = _gtk
+-end
+-
+diff -NbBur lua-gtk2-0.3_orig/gtk2.lua.in lua-gtk2-0.3/gtk2.lua.in
+--- lua-gtk2-0.3_orig/gtk2.lua.in	1970-01-01 01:00:00.000000000 +0100
++++ lua-gtk2-0.3/gtk2.lua.in	2006-05-15 01:20:24.000000000 +0200
+@@ -0,0 +1,16 @@
++
++-- if compiled in, _gtk is set.
++if _gtk == nil then
++
++	local init, err = loadlib("PREFIX/lib/lua50/libluagtk2.so",</