propagate from branch 'org.openembedded.dev' (head 47c2f7f436790105a8af32ec352907b8ff53aba1)

            to branch 'org.openembedded.nslu2-linux' (head a69b542d88fdbf378cd19a8ef701895615c143f7)

78 files changed, 1409 insertions, 2455 deletions

diff --git a/conf/machine/ipaq-common.conf b/conf/machine/ipaq-common.conf
index 24a1e202f1..791abd2103 100644
--- a/conf/machine/ipaq-common.conf
+++ b/conf/machine/ipaq-common.conf
@@ -1,7 +1,9 @@
 IPAQ_MODULES = "apm h3600_generic_sleeve ipaq-sleeve ipaq-mtd-asset nvrd atmelwlandriver sa1100-rtc ipaq-hal h3600_ts usb-eth wavelan_cs keybdev" 
 
-BOOTSTRAP_EXTRA_DEPENDS += "kbdd bl hostap-modules orinoco-modules mipv6 atmelwlandriver"
-BOOTSTRAP_EXTRA_RRECOMMENDS += "kbdd bl hostap-modules-cs orinoco-modules-cs mipv6 atmelwlandriver ${@linux_module_packages('${IPAQ_MODULES}', d)}"
+BOOTSTRAP_EXTRA_DEPENDS += "kbdd bl hostap-modules orinoco-modules atmelwlandriver"
+BOOTSTRAP_EXTRA_DEPENDS_append_kernel24 += "mipv6"
+BOOTSTRAP_EXTRA_RRECOMMENDS += "kbdd bl hostap-modules-cs orinoco-modules-cs atmelwlandriver ${@linux_module_packages('${IPAQ_MODULES}', d)}"
+BOOTSTRAP_EXTRA_RRECOMMENDS_append_kernel24 += "mipv6"
 
 PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
 
diff --git a/conf/machine/netvista.conf b/conf/machine/netvista.conf
index 567cee8ba1..fc61ba4f6a 100644
--- a/conf/machine/netvista.conf
+++ b/conf/machine/netvista.conf
@@ -3,7 +3,7 @@
 #@DESCRIPTION: Machine configuration for the IBM Netvista thin client
 
 TARGET_ARCH = "i386"
-IPKG_ARCHS = "all i386 ${MACHINE}"
+IPKG_ARCHS = "all i386"
 PREFERRED_PROVIDER_xserver = "xserver-xorg"
 PREFERRED_PROVIDER_virtual/kernel = "linux-netvista"
 BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel pciutils module-init-tools strace"
@@ -17,6 +17,8 @@ TARGET_VENDOR = "-oe"
 PREFERRED_PROVIDERS_append = " virtual/kernel:linux-netvista"
 IMAGE_FSTYPE = "ext2"
 GUI_MACHINE_CLASS = "bigscreen"
+GPE_EXTRA_DEPENDS += "gaim sylpheed gpe-mini-browser"
+GPE_EXTRA_INSTALL += "gaim sylpheed gpe-mini-browser"
 
 #BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel pciutils udev module-init-tools strace"
 #BOOTSTRAP_EXTRA_RDEPENDS = "pciutils udev module-init-tools kernel-modules strace
diff --git a/packages/dbus/dbus_0.23.4.bb b/packages/dbus/dbus_0.23.4.bb
index 30e694f08e..dc3f6f2e72 100644
--- a/packages/dbus/dbus_0.23.4.bb
+++ b/packages/dbus/dbus_0.23.4.bb
@@ -1,5 +1,5 @@
 SECTION = "base"
-PR = "r0"
+PR = "r1"
 HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
 DESCRIPTION = "message bus system for applications to talk to one another"
 LICENSE = "GPL"
diff --git a/packages/dhclient/dhclient_2.0pl5.bb b/packages/dhclient/dhclient_2.0pl5.bb
index cee9cdece2..20b0dfc440 100644
--- a/packages/dhclient/dhclient_2.0pl5.bb
+++ b/packages/dhclient/dhclient_2.0pl5.bb
@@ -2,7 +2,7 @@ SECTION = "console/network"
 DESCRIPTION = "ISC DHCP Distribution (client and server)."
 LICENSE = "BSD"
 
-SRC_URI = "ftp://ftp.isc.org/isc/dhcp/dhcp-${PV}.tar.gz \
+SRC_URI = "ftp://ftp.isc.org/isc/dhcp/dhcp-2.0-history/dhcp-${PV}.tar.gz \
 	   file://make.patch;patch=1"
 S = "${WORKDIR}/dhcp-${PV}"
 
diff --git a/packages/dhcp/dhcp_3.0.2.bb b/packages/dhcp/dhcp_3.0.2.bb
index 3dbf803106..c734af1534 100644
--- a/packages/dhcp/dhcp_3.0.2.bb
+++ b/packages/dhcp/dhcp_3.0.2.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "http://www.isc.org/"
 MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
 LICENSE = "BSD"
 PR = "r1"
-SRC_URI = "ftp://ftp.isc.org/isc/dhcp/dhcp-${PV}.tar.gz \
+SRC_URI = "ftp://ftp.isc.org/isc/dhcp/dhcp-3.0-history/dhcp-${PV}.tar.gz \
 	   file://noattrmode.patch;patch=1 \
 	   file://init-relay file://default-relay \
 	   file://init-server file://default-server \
diff --git a/packages/dpkg/dpkg_1.10.23.bb b/packages/dpkg/dpkg_1.10.23.bb
deleted file mode 100644
index 21d2a9b2b3..0000000000
--- a/packages/dpkg/dpkg_1.10.23.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-include dpkg.inc
-
-SRC_URI += "file://autofoo.patch;patch=1"
-
-inherit autotools gettext
-
-EXTRA_OECONF = "--without-static-progs \
-		--without-dselect \
-		--with-start-stop-daemon \
-		--with-zlib \
-		--without-sgml-doc"
diff --git a/packages/dpkg/dpkg_1.10.27.bb b/packages/dpkg/dpkg_1.10.28.bb
index ec8a887300..ec8a887300 100644
--- a/packages/dpkg/dpkg_1.10.27.bb
+++ b/packages/dpkg/dpkg_1.10.28.bb
diff --git a/packages/fbvncserver/fbvncserver_0.9.4.bb b/packages/fbvncserver/fbvncserver_0.9.4.bb
index bc66c5c8ac..fd2a1e6138 100644
--- a/packages/fbvncserver/fbvncserver_0.9.4.bb
+++ b/packages/fbvncserver/fbvncserver_0.9.4.bb
@@ -9,6 +9,7 @@ SRC_URI = "http://sdgsystems.com/download/fbvncserver-${PV}.tar.gz \
            file://libvncs0.6.patch;patch=1 \
            file://paths.patch;patch=1 \
            file://kernelinclude.patch;patch=1 \
+	   file://buildfix.patch;patch=1 \
            file://zaurus_panel.jpg \
            file://init"
 	  
diff --git a/packages/fbvncserver/files/buildfix.patch b/packages/fbvncserver/files/buildfix.patch
new file mode 100644
index 0000000000..302dbd9e8e
--- /dev/null
+++ b/packages/fbvncserver/files/buildfix.patch
@@ -0,0 +1,31 @@
+--- fbvncserver-0.9.4/fbvncserver.c.orig	2005-07-31 15:01:32.552177176 +0200
++++ fbvncserver-0.9.4/fbvncserver.c	2005-07-31 15:02:47.287366483 +0200
+@@ -574,7 +574,6 @@
+   rfbScreen                  = rfbGetScreen(&argc,argv,rfb_width,rfb_height,5,2,2);
+   rfbScreen->desktopName     = DESKTOP_NAME;
+   rfbScreen->frameBuffer     = (char *)rfbbuf;
+-  rfbScreen->rfbAlwaysShared = TRUE;
+   rfbScreen->ptrAddEvent     = ptrevent;
+   rfbScreen->kbdAddEvent     = keyevent;
+   rfbScreen->newClientHook   = newclient;
+@@ -595,18 +594,12 @@
+   varblock.b_offset = vscrinfo.blue.offset+vscrinfo.blue.length-5;
+   varblock.rfb_xres = vscrinfo.yres;
+   varblock.rfb_maxy = vscrinfo.xres-1;
+-  while(1)
++  while(1) 
+   {
+-      /* If no clients are connected, just wait for events and don't bother
+-         updating the rfb, to save CPU */
+-      while(rfbScreen->rfbClientHead==NULL) {
+-          rfbProcessEvents(rfbScreen,100000);       /* We still run a tight loop
+-                                                       so http clients don't wait */
+-      }
+       /* Process events for a while */
+       do
+       {
+-          got_event=0;
++          got_event=0; 
+           rfbProcessEvents(rfbScreen,30000);
+       }
+       while(got_event);
diff --git a/packages/hdparm/hdparm-5.4/.mtn2git_empty b/packages/flex/files/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/hdparm/hdparm-5.4/.mtn2git_empty
+++ b/packages/flex/files/.mtn2git_empty
diff --git a/packages/flex/files/fix-gen.patch b/packages/flex/files/fix-gen.patch
new file mode 100644
index 0000000000..55f4f6fdf5
--- /dev/null
+++ b/packages/flex/files/fix-gen.patch
@@ -0,0 +1,17 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- flex-2.5.31/gen.c~fix-gen
++++ flex-2.5.31/gen.c
+@@ -1812,8 +1812,7 @@
+ 			if (yytext_is_array) {
+ 				if (!reentrant){
+     				indent_puts ("static int yy_more_offset = 0;");
+-                }else{
+-                    indent_puts ("static int yy_prev_more_offset = 0;");
++                                indent_puts ("static int yy_prev_more_offset = 0;");
+                 }
+ 			}
+ 			else if (!reentrant) {
diff --git a/packages/flex/flex-native_2.5.31.bb b/packages/flex/flex-native_2.5.31.bb
index fa125d6be7..ff8a42772b 100644
--- a/packages/flex/flex-native_2.5.31.bb
+++ b/packages/flex/flex-native_2.5.31.bb
@@ -1,7 +1,6 @@
 include flex.inc
 inherit native
-
-PR = "r1"
+PR = "r2"
 
 do_stage () {
 	install -m 0755 flex ${STAGING_BINDIR}
diff --git a/packages/flex/flex.inc b/packages/flex/flex.inc
index b28ad9e055..6e605ac9be 100644
--- a/packages/flex/flex.inc
+++ b/packages/flex/flex.inc
@@ -2,7 +2,8 @@ DESCRIPTION = "Flex is a tool for generating programs that recognize lexical pat
 SECTION = "devel"
 LICENSE = "BSD"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/lex/flex-2.5.31.tar.bz2"
+SRC_URI = "${SOURCEFORGE_MIRROR}/lex/flex-2.5.31.tar.bz2 \
+           file://fix-gen.patch;patch=1"
 S = "${WORKDIR}/flex-${PV}"
 
 inherit autotools
diff --git a/packages/flex/flex_2.5.31.bb b/packages/flex/flex_2.5.31.bb
index 2263d8f7c1..b96c645136 100644
--- a/packages/flex/flex_2.5.31.bb
+++ b/packages/flex/flex_2.5.31.bb
@@ -1,5 +1,5 @@
 include flex.inc
-PR = "r3"
+PR = "r4"
 
 SRC_URI += "file://include.patch;patch=1"
 
diff --git a/packages/hdparm/hdparm-5.8/.mtn2git_empty b/packages/gcc/gcc-cross-kernel-3.4.4/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/hdparm/hdparm-5.8/.mtn2git_empty
+++ b/packages/gcc/gcc-cross-kernel-3.4.4/.mtn2git_empty
diff --git a/packages/gcc/gcc-cross-kernel-3.4.4/gcc-3.4.4-makefile-fix.patch b/packages/gcc/gcc-cross-kernel-3.4.4/gcc-3.4.4-makefile-fix.patch
new file mode 100644
index 0000000000..74c1f26833
--- /dev/null
+++ b/packages/gcc/gcc-cross-kernel-3.4.4/gcc-3.4.4-makefile-fix.patch
@@ -0,0 +1,29 @@
+--- gcc-3.4.4/gcc/Makefile.in.orig	2005-07-25 21:00:37 +0200
++++ gcc-3.4.4/gcc/Makefile.in	2005-07-25 21:01:19 +0200
+@@ -304,7 +304,7 @@
+     if [ "$(host)" = "$(target)" ] ; then \
+       echo ar; \
+     else \
+-       t='$(program_transform_name)'; echo ar | sed -e $$t ; \
++       t='$(program_transform_name)'; echo ar | sed -e "$$t" ; \
+     fi; \
+   fi`
+ AR_FLAGS_FOR_TARGET =
+@@ -317,7 +317,7 @@
+     if [ "$(host)" = "$(target)" ] ; then \
+       echo $(RANLIB); \
+     else \
+-       t='$(program_transform_name)'; echo ranlib | sed -e $$t ; \
++       t='$(program_transform_name)'; echo ranlib | sed -e "$$t" ; \
+     fi; \
+   fi`
+ NM_FOR_TARGET = ` \
+@@ -329,7 +329,7 @@
+     if [ "$(host)" = "$(target)" ] ; then \
+       echo nm; \
+     else \
+-       t='$(program_transform_name)'; echo nm | sed -e $$t ; \
++       t='$(program_transform_name)'; echo nm | sed -e "$$t" ; \
+     fi; \
+   fi`
+ 
diff --git a/packages/gcc/gcc-cross-kernel-3.4.4_3.4.4.bb b/packages/gcc/gcc-cross-kernel-3.4.4_3.4.4.bb
new file mode 100644
index 0000000000..368cbb1e47
--- /dev/null
+++ b/packages/gcc/gcc-cross-kernel-3.4.4_3.4.4.bb
@@ -0,0 +1,19 @@
+SECTION = "devel"
+# cut-down gcc for kernel builds
+# only installs ${TARGET_PREFIX}gcc-${PV}, not ${TARGET_PREFIX}gcc.
+
+include gcc-cross-initial_${PV}.bb
+
+PROVIDES = "virtual/${TARGET_PREFIX}gcc-${PV}"
+
+SRC_URI += "file://gcc-3.4.4-makefile-fix.patch;patch=1"
+
+do_install () {
+	:
+}
+
+do_stage () {
+	cd gcc
+	oe_runmake install-common install-headers install-libgcc
+	install -m 0755 xgcc ${CROSS_DIR}/bin/${TARGET_PREFIX}gcc-${PV}
+}
diff --git a/packages/gchub/gchub-module_svn.bb b/packages/gchub/gchub-module_svn.bb
index 0da37b0eb7..be8bd7a88c 100644
--- a/packages/gchub/gchub-module_svn.bb
+++ b/packages/gchub/gchub-module_svn.bb
@@ -5,7 +5,8 @@ DEPENDS = "virtual/kernel"
 MAINTAINER = "Micah Dowty <micah@navi.cx>"
 LICENSE = "GPL"
 PV = "svn-${CVSDATE}"
-SRC_URI = "svn://navi.cx/svn/misc/trunk/wasabi/devices;module=gchub"
+
+SRC_URI = "svn://svn.navi.cx/misc/trunk/wasabi/devices;module=gchub;proto=http"
 
 S = "${WORKDIR}/gchub/kernel"
 
diff --git a/packages/gimp/gimp_2.3.2.bb b/packages/gimp/gimp_2.3.2.bb
new file mode 100644
index 0000000000..98237579d0
--- /dev/null
+++ b/packages/gimp/gimp_2.3.2.bb
@@ -0,0 +1,19 @@
+DESCRIPTION =	"The GIMP is the GNU Image Manipulation Program."
+HOMEPAGE = 	"http://www.gimp.org"
+LICENSE =	"GPL"
+MAINTAINER =	"Koen Kooi <koen@handhelds.org>"
+
+SRC_URI =	"ftp://ftp.gimp.org/pub/gimp/v2.3/gimp-${PV}.tar.bz2"
+
+DEPENDS =	"sed-native gtk+ jpeg libpng libexif tiff"
+
+inherit autotools pkgconfig
+#Don't laugh, this just builds a threaded gimp
+EXTRA_OECONF = 	" --disable-gtktest \
+		--disable-print \
+		--disable-python \
+		--enable-mp"
+
+do_configure_append() {
+	find ${S} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g
+}
diff --git a/packages/gnome/goffice_0.0.2.bb b/packages/gnome/goffice_0.0.2.bb
new file mode 100644
index 0000000000..db26a617a5
--- /dev/null
+++ b/packages/gnome/goffice_0.0.2.bb
@@ -0,0 +1,21 @@
+DESCRIPTION="Gnome Office Library"
+LICENSE="GPLv2"
+PR="r0"
+
+DEPENDS="glib-2.0 gtk+ pango libgnomeprint libgsf libglade libxml2 libart-lgpl"
+
+inherit gnome pkgconfig
+
+
+
+do_stage() {
+        gnome_stage_includes
+	oe_libinstall -so -C goffice libgoffice-1 ${STAGING_LIBDIR}
+}
+
+python populate_packages_prepend () {
+        goffice_libdir = bb.data.expand('${libdir}/goffice/${PV}/plugins', d)
+
+        do_split_packages(d, goffice_libdir, '(.*)', 'goffice-plugin-%s', 'Goffice plugin for %s', allow_dirs=True)
+}
+
diff --git a/packages/nonworking/tetex/.mtn2git_empty b/packages/gnumeric/gnumeric-1.5.2/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/nonworking/tetex/.mtn2git_empty
+++ b/packages/gnumeric/gnumeric-1.5.2/.mtn2git_empty
diff --git a/packages/gnumeric/gnumeric-1.5.2/remove-docs.patch b/packages/gnumeric/gnumeric-1.5.2/remove-docs.patch
new file mode 100644
index 0000000000..4a9108bd4e
--- /dev/null
+++ b/packages/gnumeric/gnumeric-1.5.2/remove-docs.patch