merge of 73a040e1292f94333eab9d73425b9fdecf4da694

     and f33cef327c300a5f666b9a3f79571edc4225cfe0

25 files changed, 263 insertions, 47 deletions

diff --git a/packages/ckermit/ckermit_211.bb b/packages/ckermit/ckermit_211.bb
index 9bf4c2859e..9a89c9fbbf 100644
--- a/packages/ckermit/ckermit_211.bb
+++ b/packages/ckermit/ckermit_211.bb
@@ -8,6 +8,7 @@ MAINTAINER = "Holger Schurig"
 HOMEPAGE = "http://www.columbia.edu/kermit/"
 SECTION = "console/network"
 SRC_URI = "ftp://kermit.columbia.edu/kermit/archives/cku${PV}.tar.gz"
+PR = "r1"
 
 #
 # From http://www.columbia.edu/kermit/ck80.html#license
@@ -63,6 +64,11 @@ export BINDIR = "${bindir}"
 export MANDIR = "${mandir}/man1"
 export INFODIR = "${infodir}"
 
+# Additional flags. For uclibc we add -DNOARROWKEYS which stops ckermit
+# trying to look inside the stdio headers.
+CKERMIT_ADDITIONAL = ""
+CKERMIT_ADDITIONAL_linux-uclibc = "-DNOARROWKEYS"
+
 do_compile () {
 	# The original makefile doesn't differentiate between CC and CC_FOR_BUILD,
 	# so we build wart manually. Note that you need a ckwart.o with the proper
@@ -83,7 +89,8 @@ do_compile () {
 		-DNOSERVER -DNOSEXP -DNORLOGIN -DNOOLDMODEMS -DNOSSH -DNOLISTEN \
 		-DNORESEND -DNOAUTODL -DNOSTREAMING -DNOHINTS -DNOCKXYZ -DNOLEARN \
 		-DNOMKDIR -DNOPERMS -DNOCKTIMERS -DNOCKREGEX -DNOREALPATH \
-		-DCK_SMALL -DNOLOGDIAL -DNORENAME -DNOWHATAMI"
+		-DCK_SMALL -DNOLOGDIAL -DNORENAME -DNOWHATAMI \
+		${CKERMIT_ADDITIONAL}"
 }
 
 do_install () {
diff --git a/packages/gimp/files/.mtn2git_empty b/packages/gimp/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gimp/files/.mtn2git_empty
diff --git a/packages/gimp/files/configure-libwmf.patch b/packages/gimp/files/configure-libwmf.patch
new file mode 100644
index 0000000000..ca3697cfa2
--- /dev/null
+++ b/packages/gimp/files/configure-libwmf.patch
@@ -0,0 +1,21 @@
+--- gimp-2.3.8/configure.in.orig	2006-05-31 10:16:40.000000000 +0100
++++ gimp-2.3.8/configure.in	2006-05-31 10:18:56.000000000 +0100
+@@ -1342,7 +1342,10 @@
+ # Check for libwmf2
+ ###################
+ 
++AC_ARG_WITH(libwmf, [  --without-libwmf          build without libwmf support])
++
+ have_libwmf=no
++if test "x$with_libwmf" != xno; then
+ AC_PATH_PROG(WMF_CONFIG, libwmf-config, no)
+ if test "x$WMF_CONFIG" != "xno" ; then
+   have_libwmf=yes
+@@ -1359,6 +1362,7 @@
+ else
+   have_libwmf="no (libwmf not found)"
+ fi
++fi
+ AC_SUBST(LIBWMF)
+ AC_SUBST(WMF_CFLAGS)
+ 
diff --git a/packages/gimp/gimp_2.3.8.bb b/packages/gimp/gimp_2.3.8.bb
index 89d9be3e8d..84b35b1e8d 100644
--- a/packages/gimp/gimp_2.3.8.bb
+++ b/packages/gimp/gimp_2.3.8.bb
@@ -3,7 +3,8 @@ 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"
+SRC_URI =	"ftp://ftp.gimp.org/pub/gimp/v2.3/gimp-${PV}.tar.bz2 \
+                 file://configure-libwmf.patch;patch=1"
 
 DEPENDS =	"sed-native libart-lgpl gtk+ jpeg libpng libexif tiff"
 
@@ -12,7 +13,8 @@ inherit autotools pkgconfig
 EXTRA_OECONF = 	" --disable-gtktest \
 		--disable-print \
 		--disable-python \
-		--enable-mp"
+		--enable-mp \
+		--without-libwmf"
 
 do_configure_append() {
 	find ${S} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g
diff --git a/packages/glibc/glibc_2.3.5+cvs20050627.bb b/packages/glibc/glibc_2.3.5+cvs20050627.bb
index 024ba1d901..ff434d2a1b 100644
--- a/packages/glibc/glibc_2.3.5+cvs20050627.bb
+++ b/packages/glibc/glibc_2.3.5+cvs20050627.bb
@@ -90,11 +90,6 @@ do_munge() {
 	# Integrate ports into tree
 	mv ${WORKDIR}/ports ${S}
 
-        # Need to copy some extra folder content for sh arch. - OE bug #954
-	case ${TARGET_ARCH} in
-		sh*) cp ${WORKDIR}/libc/sysdeps/sh/${TARGET_ARCH}/*.S ${WORKDIR}/libc/sysdeps/sh;;
-	esac
-
 	# http://www.handhelds.org/hypermail/oe/51/5135.html
 	# Some files were moved around between directories on
 	# 2005-12-21, which means that any attempt to check out
diff --git a/packages/gpe-today/gpe-today_cvs.bb b/packages/gpe-today/gpe-today_cvs.bb
index 33af763f07..47e9c01a66 100644
--- a/packages/gpe-today/gpe-today_cvs.bb
+++ b/packages/gpe-today/gpe-today_cvs.bb
@@ -8,7 +8,7 @@ PRIORITY = "optional"
 
 S = "${WORKDIR}/${PN}"
 #Remove the dash below when 0.10 changes in PV
-PV = "0.10+cvs-${SRCDATE}"
+PV = "0.11+cvs-${SRCDATE}"
 PR = "r0"
 
 inherit gpe
diff --git a/packages/libgpevtype/libgpevtype_cvs.bb b/packages/libgpevtype/libgpevtype_cvs.bb
index 301cb37a5e..31c900dd7e 100644
--- a/packages/libgpevtype/libgpevtype_cvs.bb
+++ b/packages/libgpevtype/libgpevtype_cvs.bb
@@ -8,7 +8,7 @@ DEPENDS = 	"libmimedir"
 DEFAULT_PREFERENCE = "-1"
 
 S = "${WORKDIR}/${PN}"
-PV = "0.16+cvs${SRCDATE}"
+PV = "0.17+cvs${SRCDATE}"
 PR = "r0"
 
 inherit pkgconfig gpe autotools
diff --git a/packages/libmatchbox/files/16bppfixes.patch b/packages/libmatchbox/files/16bppfixes.patch
new file mode 100644
index 0000000000..09a0347809
--- /dev/null
+++ b/packages/libmatchbox/files/16bppfixes.patch
@@ -0,0 +1,36 @@
+Index: libmb/mbpixbuf.c
+===================================================================
+--- libmatchbox/libmb.orig/mbpixbuf.c	2006-02-01 12:45:55.000000000 +0000
++++ libmatchbox/libmb/mbpixbuf.c	2006-03-11 15:20:47.000000000 +0000
+@@ -716,7 +716,13 @@
+ 	case 15:
+ 	  return ((r & 0xf8) << 7) | ((g & 0xf8) << 2) | ((b & 0xf8) >> 3);
+ 	case 16:
+-	  return ((r & 0xf8) << 8) | ((g & 0xfc) << 3) | ((b & 0xf8) >> 3);
++	  switch (pb->byte_order)
++	    {
++	    case BYTE_ORD_24_RGB:
++	      return ((r & 0xf8) << 8) | ((g & 0xfc) << 3) | ((b & 0xf8) >> 3);
++	    case BYTE_ORD_24_BGR:
++	      return ((b & 0xf8) << 8) | ((g & 0xfc) << 3) | ((r & 0xf8) >> 3);
++	    }
+ 	case 24:
+ 	case 32:
+ 	  switch (pb->byte_order)
+@@ -1880,12 +1886,11 @@
+ 	  for(y=0; y<img->height; y++)
+ 	    for(x=0; x<img->width; x++)
+ 	      {
+-		/* Below is potentially dangerous.  
+-		 */
+-		pixel =  ( *p | (*(p+1) << 8)); 
++		internal_16bpp_pixel_to_rgb(p, r, g, b);
++		internal_16bpp_pixel_next(p);
++		a = ((img->has_alpha) ?  *p++ : 0xff);
+ 
+-		p +=  ((img->has_alpha) ?  3 : 2);
+-		
++		pixel = mb_pixbuf_get_pixel(pb, r, g, b, a);
+ 		XPutPixel(img->ximg, x, y, pixel);
+ 	      }
+ 	}
diff --git a/packages/librsync/.mtn2git_empty b/packages/librsync/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/librsync/.mtn2git_empty
diff --git a/packages/librsync/librsync_0.9.7.bb b/packages/librsync/librsync_0.9.7.bb
new file mode 100644
index 0000000000..eb8bb2671c
--- /dev/null
+++ b/packages/librsync/librsync_0.9.7.bb
@@ -0,0 +1,23 @@
+DESCRIPTION = "librsync is a free software library that implements the rsync \
+remote-delta algorithm. This algorithm allows efficient remote updates of a \
+file, without requiring the old and new versions to both be present at the \
+sending end."
+HOMEPAGE = "http://librsync.sourceforge.net/"
+SECTION = "libs"
+LICENSE = "LGPL"
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/librsync/librsync-${PV}.tar.gz"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--disable-build-docs --enable-shared "
+
+do_stage() {
+    oe_libinstall -a -so -C .libs librsync ${STAGING_LIBDIR}
+    install -d ${STAGING_INCDIR}/
+    for i in librsync.h librsync-config.h
+    do
+        install -m 0644 ${S}/$i ${STAGING_INCDIR}/$i
+    done
+}
diff --git a/packages/matchbox-applet-volume/.mtn2git_empty b/packages/matchbox-applet-volume/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/matchbox-applet-volume/.mtn2git_empty
diff --git a/packages/matchbox-applet-volume/matchbox-applet-volume_0.1.bb b/packages/matchbox-applet-volume/matchbox-applet-volume_0.1.bb
new file mode 100644
index 0000000000..61b4756059
--- /dev/null
+++ b/packages/matchbox-applet-volume/matchbox-applet-volume_0.1.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "Matchbox Volume Applet"
+LICENSE = "GPL"
+DEPENDS = "matchbox-wm libmatchbox"
+SECTION = "x11/wm"
+
+SRC_URI = "http://projects.o-hand.com/matchbox/sources/mb-applet-volume/${PV}/mb-applet-volume-${PV}.tar.gz"
+S = "${WORKDIR}/mb-applet-volume-${PV}"
+
+inherit autotools pkgconfig
+
+FILES_${PN} = "${bindir} ${datadir}/applications ${datadir}/pixmaps"
+ 
diff --git a/packages/olsrd/olsrd.inc b/packages/olsrd/olsrd.inc
new file mode 100644
index 0000000000..bd511961cb
--- /dev/null
+++ b/packages/olsrd/olsrd.inc
@@ -0,0 +1,41 @@
+DESCRIPTION = "OLSR mesh routing daemon"
+HOMEPAGE = "http://www.olsr.org"
+DESCRIPTION_olsrd-libs = "OLSR mesh routing daemon -  optional libraries"
+MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
+SECTION = "console/network"
+PRIORITY = "optional"
+LICENSE = "BSD"
+RDEPENDS_olsrd = "olsrd-libs"
+
+SRC_URI="http://www.olsr.org/releases/0.4/olsrd-${PV}.tar.bz2 \
+	file://init \
+	file://olsrd.conf"
+
+PACKAGES =+ "olsrd-libs"
+FILES_olsrd-libs = "${libdir}"
+
+S = "${WORKDIR}/olsrd-${PV}"
+
+inherit update-rc.d
+
+INITSCRIPT_NAME = "olsrd"
+INITSCRIPT_PARAMS = "defaults"
+EXTRA_OEMAKE="MAKEFLAGS=-I${WORKDIR}/olsrd-${PV}"
+
+
+do_configure() {
+	oe_runmake OS=linux clean
+}
+
+do_compile() {
+        oe_runmake
+}
+
+do_install () {
+	oe_runmake OS=linux INSTALL_PREFIX=${D} install install_libs
+	install -d ${D}/${sysconfdir}/init.d
+	install -m 0755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/olsrd
+	install -m 644 ${WORKDIR}/olsrd.conf ${D}/${sysconfdir}
+}
+
+CONFFILES_${PN} = "${sysconfdir}/olsrd.conf"
diff --git a/packages/olsrd/olsrd_0.4.10.bb b/packages/olsrd/olsrd_0.4.10.bb
new file mode 100644
index 0000000000..4f4f70cbe3
--- /dev/null
+++ b/packages/olsrd/olsrd_0.4.10.bb
@@ -0,0 +1,2 @@
+include olsrd.inc
+PR = "r1"
diff --git a/packages/olsrd/olsrd_0.4.9.bb b/packages/olsrd/olsrd_0.4.9.bb
index 2fd3cecb4a..80e790d3df 100644
--- a/packages/olsrd/olsrd_0.4.9.bb
+++ b/packages/olsrd/olsrd_0.4.9.bb
@@ -1,31 +1,7 @@
-DESCRIPTION = "OLSR mesh routing daemon"
-HOMEPAGE = "http://www.olsr.org"
-DESCRIPTION_olsrd-libs = "OLSR mesh routing daemon -  optional libraries"
-MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
-SECTION = "console/network"
-PRIORITY = "optional"
-LICENSE = "BSD"
-RDEPENDS_olsrd = "olsrd-libs"
-PR = "r1"
+include olsrd.inc
+PR = "r2"
 
-SRC_URI="http://www.olsr.org/releases/0.4/olsrd-${PV}.tar.bz2 \
-	file://0.4.9-httpinfo-makefile.diff;patch=1 \
-	file://init \
-	file://olsrd.conf"
-
-PACKAGES =+ "olsrd-libs"
-FILES_olsrd-libs = "${libdir}"
-
-S = "${WORKDIR}/olsrd-${PV}"
-
-inherit update-rc.d
-
-INITSCRIPT_NAME = "olsrd"
-INITSCRIPT_PARAMS = "defaults"
-
-do_configure() {
-	oe_runmake OS=linux clean
-}
+SRC_URI += "file://0.4.9-httpinfo-makefile.diff;patch=1"
 
 do_compile() {
 	oe_runmake OS=linux clean
@@ -33,12 +9,3 @@ do_compile() {
 	touch src/cfgparser/.depend
 	oe_runmake OS=linux all libs
 }
-
-do_install () {
-	oe_runmake OS=linux INSTALL_PREFIX=${D} install install_libs
-	install -d ${D}/${sysconfdir}/init.d
-	install -m 0755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/olsrd
-	install -m 644 ${WORKDIR}/olsrd.conf ${D}/${sysconfdir}
-}
-
-CONFFILES_${PN} = "${sysconfdir}/olsrd.conf"
diff --git a/packages/pbltool/.mtn2git_empty b/packages/pbltool/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/pbltool/.mtn2git_empty
diff --git a/packages/pbltool/pbltool-native_0.2.bb b/packages/pbltool/pbltool-native_0.2.bb
new file mode 100644
index 0000000000..f6e8be560b
--- /dev/null
+++ b/packages/pbltool/pbltool-native_0.2.bb
@@ -0,0 +1,20 @@
+DESCRIPTION = "Loader tool for Amstrad Delta (E3)"
+LICENSE = "GPL"
+PR = "r0"
+
+SRC_URI = "http://the.earth.li/pub/e3/pbltool-${PV}.c"
+
+INHIBIT_NATIVE_STAGE_INSTALL = 1
+
+do_compile() {
+	${CC} -o pbltool ${WORKDIR}/pbltool-${PV}.c
+}
+
+do_deploy() {
+	install -d ${DEPLOY_DIR_IMAGE}
+	install -m 0755 pbltool ${DEPLOY_DIR_IMAGE}
+}
+
+addtask deploy before do_build after do_compile
+
+inherit native
diff --git a/packages/rdiff-backup/.mtn2git_empty b/packages/rdiff-backup/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/rdiff-backup/.mtn2git_empty
diff --git a/packages/rdiff-backup/rdiff-backup.inc b/packages/rdiff-backup/rdiff-backup.inc
new file mode 100644
index 0000000000..73d2f7db72
--- /dev/null
+++ b/packages/rdiff-backup/rdiff-backup.inc
@@ -0,0 +1,41 @@
+DESCRIPTION = "A python application that backs up one directory to \
+another, possibly over a network. It combines the best features of a \
+mirror and an incremental backup. The target directory ends up a copy \
+of the source directory, but extra reverse diffs are stored in a \
+special subdirectory of that target directory, so you can still \
+recover files lost some time ago. It is also able to preserve \
+subdirectories, hard links, dev files, permissions, uid/gid \
+ownership, modification times, extended attributes, acls, and \
+resource forks."
+HOMEPAGE = "http://www.nongnu.org/rdiff-backup/"
+SECTION = "network"
+LICENSE = "GPL"
+DEPENDS = "librsync"
+RDEPENDS_${PN} = "zlib python-re python-io python-lang python-datetime \
+		  python-pickle python-shell python-compression python-unixadmin \
+		  python-netclient"
+
+SRC_URI = "http://savannah.nongnu.org/download/rdiff-backup/rdiff-backup-${PV}.tar.gz"
+
+inherit distutils
+
+#
+# Without this the python interpreter path points to the staging area.
+#
+do_compile() {
+	BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
+	  ${STAGING_BINDIR}/python setup.py build --executable=${bindir}/python || \
+	  oefatal "python setup.py build execution failed."
+}
+
+#
+# The default do_install sets install-data to ${D}/${datadir} which
+# ends up with documentation in /usr/share/share/... instead of
+# /usr/share/... Modify the install data directory here to get it
+# into the correct place.
+#
+do_install() {
+	BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
+	  ${STAGING_BINDIR}/python setup.py install --prefix=${D}/${prefix} --install-data=${D}/${prefix} || \
+	  oefatal "python setup.py install execution failed."
+}
diff --git a/packages/rdiff-backup/rdiff-backup_1.0.4.bb b/packages/rdiff-backup/rdiff-backup_1.0.4.bb
new file mode 100644
index 0000000000..6cc6e28276
--- /dev/null
+++ b/packages/rdiff-backup/rdiff-backup_1.0.4.bb
@@ -0,0 +1,2 @@
+include rdiff-backup.inc
+PR = "r0"
diff --git a/packages/rdiff-backup/rdiff-backup_1.1.5.bb b/packages/rdiff-backup/rdiff-backup_1.1.5.bb
new file mode 100644
index 0000000000..99ddc95a9d
--- /dev/null
+++ b/packages/rdiff-backup/rdiff-backup_1.1.5.bb
@@ -0,0 +1,5 @@
+include rdiff-backup.inc
+PR = "r0"
+
+# 1.1.x added the use of sha which we get from python-crypt
+RDEPENDS_${PN} += "python-crypt"
diff --git a/packages/sylpheed/sylpheed_2.2.5.bb b/packages/sylpheed/sylpheed_2.2.5.bb
new file mode 100644
index 0000000000..315f46ea86
--- /dev/null
+++ b/packages/sylpheed/sylpheed_2.2.5.bb
@@ -0,0 +1,33 @@
+SECTION = "x11/network"
+DESCRIPTION = "Mail user agent"
+DEPENDS = "gtk+ gpgme gnutls"
+MAINTAINER = "Graeme Gregory <dp@xora.org.uk>"
+LICENSE = "GPL"
+PR = "r5"
+
+SRC_URI = "http://sylpheed.good-day.net/sylpheed/v2.2/sylpheed-${PV}.tar.bz2 \
+	file://sylpheed-2.2.2-libsylph-Makefile-am.patch;patch=1 \
+	file://sylpheed-2.2.2-src-Makefile-am.patch;patch=1 \
+	file://sylpheed-gnutls_2.2.4.patch;patch=1"
+
+
+FILES_${PN} = "${bindir} ${datadir}/pixmaps ${datadir}/applications"
+FILES_${PN}-doc += "${datadir}"
+
+EXTRA_OECONF = "--enable-gnutls"
+
+CFLAGS += "-D_GNU_SOURCE"
+
+do_configure_prepend() {
+	mkdir -p m4
+}
+
+inherit autotools 
+
+do_install_append() {
+	install -d ${D}${datadir}/applications
+	install -m 0644 sylpheed.desktop ${D}${datadir}/applications/
+	install -d ${D}${datadir}/pixmaps
+	install -m 0644 sylpheed.png ${D}${datadir}/pixmaps/
+}
+
diff --git a/packages/udev/files/amsdelta/.mtn2git_empty b/packages/udev/files/amsdelta/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/udev/files/amsdelta/.mtn2git_empty
diff --git a/packages/udev/files/amsdelta/mount.blacklist b/packages/udev/files/amsdelta/mount.blacklist
new file mode 100644
index 0000000000..7f43f17e41
--- /dev/null
+++ b/packages/udev/files/amsdelta/mount.blacklist
@@ -0,0 +1,6 @@
+# This is a grep pattern matched against the device name
+# Any matched pattern will _not_ be mounted / removed by udevd
+
+/dev/mtdblock
+/dev/loop
+/dev/ram
diff --git a/packages/wget/wget_1.9.1.bb b/packages/wget/wget_1.9.1.bb
index ec1f00d4ad..8521655477 100644
--- a/packages/wget/wget_1.9.1.bb
+++ b/packages/wget/wget_1.9.1.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "A console URL download utility featuring HTTP, FTP, and more."
 SECTION = "console/network"
 MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 DEPENDS = ""
-PR = "r4"
+PR = "r5"
 LICENSE = "GPL"
 
 SRC_URI = "${GNU_MIRROR}/wget/wget-${PV}.tar.gz \
@@ -19,6 +19,9 @@ EXTRA_OECONF_unslung = ""
 # SlugOS kernels do not support ipv6. Can be loaded as a module. 
 EXTRA_OECONF_slugos = ""
 
+# Disable checking for SSL since that searches the system paths
+EXTRA_OECONF += "--without-ssl"
+
 do_configure () {
 	if [ ! -e acinclude.m4 ]; then
 		mv aclocal.m4 acinclude.m4