merge of '9a5df4f82194968b8ea8a94d7effc5bf61c1e650'

     and 'cb1970d64a9cdb9559e137f509557905fbc174b5'

25 files changed, 166 insertions, 312 deletions

diff --git a/packages/busybox/busybox_1.9.1.bb b/packages/busybox/busybox_1.9.1.bb
index 237f6a6dac..3f8184fcc0 100644
--- a/packages/busybox/busybox_1.9.1.bb
+++ b/packages/busybox/busybox_1.9.1.bb
@@ -2,6 +2,10 @@ require busybox.inc
 PR = "r2"
 
 SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
+           http://busybox.net/downloads/fixes-1.9.1/busybox-1.9.1-lineedit.patch;patch=1 \
+           file://udhcpscript.patch;patch=1 \
+           file://adduser-longops.patch;patch=1 \
+           file://sort-z-nul.patch;patch=1;status=upstream \
            file://busybox-cron \
            file://busybox-httpd \
            file://busybox-udhcpd \
@@ -10,17 +14,12 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
            file://mount.busybox \
            file://syslog \
            file://syslog.conf \
-           file://udhcpscript.patch;patch=1 \
-           file://adduser-longops.patch;patch=1 \
-           file://sort-z-nul.patch;patch=1;status=upstream \
            file://umount.busybox \
-           file://run_parts.c \
            file://defconfig"
 
 EXTRA_OEMAKE += "V=1 ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX}"
 
 do_configure () {
-	cp ${WORKDIR}/run_parts.c ${S}/debianutils/
 	install -m 0644 ${WORKDIR}/defconfig ${S}/.config
 	cml1_do_configure
 }
diff --git a/packages/dbus/dbus.inc b/packages/dbus/dbus.inc
index bbe7cb4fe4..b2ced23d99 100644
--- a/packages/dbus/dbus.inc
+++ b/packages/dbus/dbus.inc
@@ -25,7 +25,18 @@ DEBIANNAME_${PN} = "dbus-1"
 
 PACKAGES += "${PN}-lib"
 
-FILES_${PN} = "${bindir}/dbus-daemon* ${bindir}/dbus-uuidgen ${bindir}/dbus-launch ${bindir}/dbus-cleanup-sockets ${bindir}/dbus-send ${bindir}/dbus-monitor ${sysconfdir} ${datadir}/dbus-1/services"
+FILES_${PN} = "\
+${bindir}/dbus-daemon* \
+${bindir}/dbus-uuidgen \
+${bindir}/dbus-launch \
+${bindir}/dbus-cleanup-sockets \
+${bindir}/dbus-send \
+${bindir}/dbus-monitor \
+${libexecdir}/dbus* \
+${sysconfdir} \
+${datadir}/dbus-1/services \
+${datadir}/dbus-1/system-services \
+"
 FILES_${PN}-lib = "${libdir}/lib*.so.*"
 FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-glib-tool"
 
diff --git a/packages/dbus/dbus_1.1.4.bb b/packages/dbus/dbus_1.1.4.bb
index f331b140aa..8e3e329fde 100644
--- a/packages/dbus/dbus_1.1.4.bb
+++ b/packages/dbus/dbus_1.1.4.bb
@@ -1,3 +1,3 @@
 include dbus.inc
 
-PR = "r0"
+PR = "r1"
diff --git a/packages/e17/e-wm_cvs.bb b/packages/e17/e-wm_cvs.bb
index e7af400a1c..4dbacffe1b 100644
--- a/packages/e17/e-wm_cvs.bb
+++ b/packages/e17/e-wm_cvs.bb
@@ -21,9 +21,7 @@ EXTRA_OECONF = "\
 "
 
 do_configure_prepend() {
-	install -m 0644 ${WORKDIR}/Makefile.in.in po/
-	echo "install -d $*" >./mkinstalldirs
-	chmod a+rx ./mkinstalldirs
+	autopoint
 }
 
 do_stage() {
diff --git a/packages/gammu/gammu_1.17.0.bb b/packages/gammu/gammu_1.17.0.bb
index fc7adb1b79..65ab877495 100644
--- a/packages/gammu/gammu_1.17.0.bb
+++ b/packages/gammu/gammu_1.17.0.bb
@@ -3,6 +3,7 @@ SECTION = "console/network"
 DEPENDS = "bluez-libs cmake-native"
 LICENSE = "GPL"
 HOMEPAGE = "http://www.gammu.org/"
+PR = "r1"
 
 SRC_URI = "http://dl.cihar.com/gammu/releases/gammu-${PV}.tar.bz2 "
 
@@ -25,6 +26,7 @@ do_stage() {
         install -m 0644 build-configure/include/*.h ${STAGING_INCDIR}/gammu/
 
         oe_libinstall -so -C build-configure/common libGammu ${STAGING_LIBDIR}
+        rm -f ./build-configure/pkgconfig/gammu.pc
 }
 
 PACKAGES =+ "libgammu"
diff --git a/packages/images/openmoko-python-devel-image.bb b/packages/images/openmoko-python-devel-image.bb
index 9d2a8db2c6..615042f3b8 100644
--- a/packages/images/openmoko-python-devel-image.bb
+++ b/packages/images/openmoko-python-devel-image.bb
@@ -2,5 +2,6 @@ require openmoko-image.bb
 
 IMAGE_INSTALL += "\
   task-openmoko-python-devel \
+  task-python-efl-examples \
+  edje-viewer \
 "
-
diff --git a/packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb b/packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb
index 3101ecb3be..ba3c8ecd0c 100644
--- a/packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb
+++ b/packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb
@@ -1,7 +1,7 @@
 require ipkg-utils_${PV}.bb
 
 RDEPENDS = ""
-PR = "r15"
+PR = "r16"
 
 inherit native
 
diff --git a/packages/ipkg-utils/ipkg-utils/ipkg-make-index-track-stamps.patch b/packages/ipkg-utils/ipkg-utils/ipkg-make-index-track-stamps.patch
index 9f9b9359ce..ad6df4f2e9 100644
--- a/packages/ipkg-utils/ipkg-utils/ipkg-make-index-track-stamps.patch
+++ b/packages/ipkg-utils/ipkg-utils/ipkg-make-index-track-stamps.patch
@@ -86,12 +86,3 @@ Index: ipkg-utils/ipkg-make-index
  if opt_s:
       sys.exit(0)
  
-@@ -154,7 +177,7 @@ if packages_filename:
-      os.rename(tmp_packages_filename, packages_filename)
-      os.rename(tmp_gzip_filename, gzip_filename)
- 
--if verbose:	
-+if verbose:
-      sys.stderr.write("Generate Packages.filelist file\n")
- files = {}
- names = packages.packages.keys()
diff --git a/packages/ipkg-utils/ipkg-utils/ipkg-py-tarfile.patch b/packages/ipkg-utils/ipkg-utils/ipkg-py-tarfile.patch
index 25eb2cce6f..389a86018b 100644
--- a/packages/ipkg-utils/ipkg-utils/ipkg-py-tarfile.patch
+++ b/packages/ipkg-utils/ipkg-utils/ipkg-py-tarfile.patch
@@ -1,13 +1,6 @@
----
- arfile.py |  124 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- ipkg.py   |  106 ++++++++++++++++++++++++++---------------------------
- setup.py  |    2 -
- 3 files changed, 177 insertions(+), 55 deletions(-)
-
-Index: ipkg-utils/arfile.py
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ ipkg-utils/arfile.py	2007-05-26 23:46:59.000000000 +0100
+diff -r 720080c24d2f arfile.py
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/arfile.py	Sun Jan 27 23:26:35 2008 +0200
 @@ -0,0 +1,124 @@
 +"""
 +arfile - A module to parse GNU ar archives.
@@ -133,23 +126,10 @@ Index: ipkg-utils/arfile.py
 +
 +        f2 = tarf.extractfile("control")
 +        print f2.read()
-Index: ipkg-utils/setup.py
-===================================================================
---- ipkg-utils.orig/setup.py	2007-05-26 23:45:55.000000000 +0100
-+++ ipkg-utils/setup.py	2007-05-26 23:46:59.000000000 +0100
-@@ -16,6 +16,6 @@ distutils.core.setup( name = 'ipkg-utils
- 		      platforms = 'POSIX',
- 		      keywords = 'ipkg familiar',
-                       url = 'http://www.handhelds.org/sources.html/',
--                      py_modules = [ 'ipkg' ],
-+                      py_modules = [ 'ipkg', 'arfile' ],
- 		      scripts = ['ipkg-compare-indexes', 'ipkg-make-index', 'ipkg-update-index', 'ipkg-build', 'ipkg-unbuild', 'ipkg-upload']
-                       )
-Index: ipkg-utils/ipkg.py
-===================================================================
---- ipkg-utils.orig/ipkg.py	2007-05-26 23:46:55.000000000 +0100
-+++ ipkg-utils/ipkg.py	2007-05-26 23:45:20.000000000 +0100
-@@ -41,6 +41,8 @@ import re
+diff -r 720080c24d2f ipkg.py
+--- a/ipkg.py	Sun Jan 27 23:13:26 2008 +0200
++++ b/ipkg.py	Sun Jan 27 23:26:35 2008 +0200
+@@ -41,6 +41,8 @@ import string
  import string
  import commands
  from stat import ST_SIZE
@@ -158,7 +138,7 @@ Index: ipkg-utils/ipkg.py
  
  class Version:
      """A class for holding parsed package version information."""
-@@ -131,78 +133,61 @@ class Package:
+@@ -131,77 +133,61 @@ class Package:
  	self.section = None
          self.filename_header = None
  	self.file_list = []
@@ -198,8 +178,6 @@ Index: ipkg-utils/ipkg.py
 -            self.size = stat[ST_SIZE]
 +
              self.filename = os.path.basename(fn)
-+            assert self.isdeb == 1, "Old ipk format (non-deb) is unsupported"
-+
  	    ## sys.stderr.write("  extracting control.tar.gz from %s\n"% (fn,)) 
 -            if self.isdeb:
 -                control = os.popen("ar p "+fn+" control.tar.gz | tar xfzO - './control'","r")
@@ -227,15 +205,18 @@ Index: ipkg-utils/ipkg.py
 -                            self.__dict__[name] = value
 -                else:
 -                    line = control.readline()
++	    if self.isdeb:
++        	ar = arfile.ArFile(f)
++        	tarStream = ar.open("control.tar.gz")
++        	tarf = tarfile.open("control.tar.gz", "r", tarStream)
++
++        	try:
++        	    control = tarf.extractfile("control")
++        	except KeyError:
++        	    control = tarf.extractfile("./control")
++	    else:
++		control = os.popen("tar --wildcards -xzO -f " + fn + " '*control.tar.gz' | tar xfzO - './control'", "r")
 +
-+            ar = arfile.ArFile(f)
-+            tarStream = ar.open("control.tar.gz")
-+            tarf = tarfile.open("control.tar.gz", "r", tarStream)
-+
-+            try:
-+        	control = tarf.extractfile("control")
-+            except KeyError:
-+        	control = tarf.extractfile("./control")
 +            self.read_control(control)
              control.close()
 -            if self.isdeb:
@@ -251,7 +232,7 @@ Index: ipkg-utils/ipkg.py
  	self.scratch_dir = None
  	self.file_dir = None
  	self.meta_dir = None
- 
++
 +    def __getattr__(self, name):
 +        if name == "md5":
 +            self._computeFileMD5()
@@ -269,11 +250,10 @@ Index: ipkg-utils/ipkg.py
 +            sum.update(data)
 +        f.close()
 +        self.md5 = sum.hexdigest()
-+
+ 
      def read_control(self, control):
          import os
- 
-@@ -221,9 +203,15 @@ class Package:
+@@ -221,9 +207,15 @@ class Package:
                      value = value + '\n' + line
                  if name == 'size':
                      self.size = int(value)
@@ -290,20 +270,43 @@ Index: ipkg-utils/ipkg.py
                      return # consumes one blank line at end of package descriptoin
              else:
                  line = control.readline()
-@@ -314,6 +302,16 @@ class Package:
+@@ -314,7 +306,27 @@ class Package:
  	return self.section
  
      def get_file_list(self):
+-	return self.file_list
 +        if not self.fn:
 +            return []
-+        f = open(self.fn, "rb")
-+        ar = arfile.ArFile(f)
-+        tarStream = ar.open("data.tar.gz")
-+        tarf = tarfile.open("data.tar.gz", "r", tarStream)
-+        self.file_list = tarf.getnames()
++	
++	if self.isdeb:
++    	    f = open(self.fn, "rb")
++    	    ar = arfile.ArFile(f)
++    	    tarStream = ar.open("data.tar.gz")
++    	    tarf = tarfile.open("data.tar.gz", "r", tarStream)
++    	    self.file_list = tarf.getnames()
++    	    f.close()
++	else:
++            f = os.popen("tar xfzO " + self.fn + " '*data.tar.gz' | tar tfz -","r") 
++            while 1: 
++                line = f.readline() 
++                if not line: break 
++                self.file_list.append(string.rstrip(line)) 
++            f.close() 
++
++        # Make sure that filelist has consistent format regardless of tar version
 +        self.file_list = map(lambda a: ["./", ""][a.startswith("./")] + a, self.file_list)
-+
-+        f.close()
- 	return self.file_list
++        return self.file_list
  
      def write_package(self, dirname):
+         buf = self.render_control()
+diff -r 720080c24d2f setup.py
+--- a/setup.py	Sun Jan 27 23:13:26 2008 +0200
++++ b/setup.py	Sun Jan 27 23:26:35 2008 +0200
+@@ -16,6 +16,6 @@ distutils.core.setup( name = 'ipkg-utils
+ 		      platforms = 'POSIX',
+ 		      keywords = 'ipkg familiar',
+                       url = 'http://www.handhelds.org/sources.html/',
+-                      py_modules = [ 'ipkg' ],
++                      py_modules = [ 'ipkg', 'arfile' ],
+ 		      scripts = ['ipkg-compare-indexes', 'ipkg-make-index', 'ipkg-update-index', 'ipkg-build', 'ipkg-unbuild', 'ipkg-upload']
+                       )
diff --git a/packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb b/packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb
index c089796ccb..febecb0085 100644
--- a/packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb
+++ b/packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 CONFLICTS = "ipkg-link"
 RDEPENDS = "python"
 SRCDATE = "20050404"
-PR = "r17"
+PR = "r18"
 
 SRC_URI = "${HANDHELDS_CVS};module=ipkg-utils \
            file://ipkg-utils-fix.patch;patch=1 \
diff --git a/packages/libjson/.mtn2git_empty b/packages/libjson/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/libjson/.mtn2git_empty
diff --git a/packages/libjson/libjson_0.6.bb b/packages/libjson/libjson_0.6.bb
new file mode 100644
index 0000000000..4c93e82a0b
--- /dev/null
+++ b/packages/libjson/libjson_0.6.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = "A library for parsing and creating JSON files"
+HOMEPAGE = "http://oss.metaparadigm.com/json-c/"
+SECTION = "libs"
+PRIORITY = "optional"
+LICENSE = "BSD"
+PR = "r0"
+
+SRC_URI = "http://oss.metaparadigm.com/json-c/json-c-${PV}.tar.gz"
+S = "${WORKDIR}/json-c-${PV}"
+
+inherit autotools 
+
+do_stage() {
+	autotools_stage_all
+}
diff --git a/packages/libpng/libpng-native_1.2.19.bb b/packages/libpng/libpng-native_1.2.19.bb
deleted file mode 100644
index 231b956678..0000000000
--- a/packages/libpng/libpng-native_1.2.19.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-require libpng_${PV}.bb
-inherit native
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libpng-${PV}"
-DEPENDS = "zlib-native"
-
-INHIBIT_NATIVE_STAGE_INSTALL = "1"
-
-do_stage_append() {
-        cp libpng.pc libpng12.pc
-        install -m 644 png.h ${STAGING_INCDIR}/png.h
-        install -m 644 pngconf.h ${STAGING_INCDIR}/pngconf.h
-        oe_libinstall -so libpng12 ${STAGING_LIBDIR}/
-        ln -sf libpng12.so ${STAGING_LIBDIR}/libpng.so
-}
diff --git a/packages/libpng/libpng_1.2.19.bb b/packages/libpng/libpng_1.2.19.bb
deleted file mode 100644
index 3730f3d727..0000000000
--- a/packages/libpng/libpng_1.2.19.bb
+++ /dev/null
@@ -1,50 +0,0 @@
-DESCRIPTION = "PNG Library"
-HOMEPAGE = "http://www.libpng.org/"
-LICENSE = "libpng"
-SECTION = "libs"
-DEPENDS = "zlib"
-PRIORITY = "required"
-PR = "r0"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/libpng/libpng-${PV}.tar.bz2"
-S = "${WORKDIR}/libpng-${PV}"
-
-inherit autotools binconfig pkgconfig
-
-do_stage() {
-	cp libpng.pc libpng12.pc
-	install -m 644 png.h ${STAGING_INCDIR}/png.h
-	install -m 644 pngconf.h ${STAGING_INCDIR}/pngconf.h
-	oe_libinstall -so libpng ${STAGING_LIBDIR}/
-	oe_libinstall -so libpng12 ${STAGING_LIBDIR}/
-	ln -sf libpng12.so ${STAGING_LIBDIR}/libpng.so
-}
-
-do_install() {
-	install -d ${D}${bindir}
-	install -d ${D}${mandir}
-	install -d ${D}${libdir}
-	install -d ${D}${includedir}
-	unset LDFLAGS
-	oe_runmake 'prefix=${prefix}' 'DESTDIR=${D}' \
-		   'DB=${D}${bindir}' 'DI=${D}${includedir}' \
-		   'DL=${D}${libdir}' 'DM=${D}${mandir}' \
-		   install
-}
-
-python do_package() {
-        if bb.data.getVar('DEBIAN_NAMES', d, 1):
-            bb.data.setVar('PKG_${PN}', 'libpng12', d)
-        bb.build.exec_func('package_do_package', d)
-}
-
-PACKAGES =+ "${PN}12-dbg ${PN}12 ${PN}12-dev"
-
-FILES_${PN}12-dbg += "${libdir}/libpng12*.dbg"
-FILES_${PN}12 = "${libdir}/libpng12.so.*"
-FILES_${PN}12-dev = "${libdir}/libpng12.* ${includedir}/libpng12 ${libdir}/pkgconfig/libpng12.pc"
-FILES_${PN} = "${libdir}/lib*.so.*"
-FILES_${PN}-dev = "${includedir} ${libdir}/lib*.so ${libdir}/*.la \
-        ${libdir}/*.a ${libdir}/pkgconfig \
-        ${datadir}/aclocal ${bindir} ${sbindir}"
-
diff --git a/packages/libsdl/libsdl-qpe-1.2.9/explicit-extern-C.patch b/packages/libsdl/files/explicit-extern-C.patch
index 3dd44bea27..3dd44bea27 100644
--- a/packages/libsdl/libsdl-qpe-1.2.9/explicit-extern-C.patch
+++ b/packages/libsdl/files/explicit-extern-C.patch
diff --git a/packages/libsdl/libsdl-qpe-1.2.9/fixlibs-1.2.9.patch b/packages/libsdl/files/fixlibs-1.2.9.patch
index ebc6ec7769..ebc6ec7769 100644
--- a/packages/libsdl/libsdl-qpe-1.2.9/fixlibs-1.2.9.patch
+++ b/packages/libsdl/files/fixlibs-1.2.9.patch
diff --git a/packages/libsdl/libsdl-qpe-1.2.9/kill-stdc++-1.2.9.patch b/packages/libsdl/files/kill-stdc++-1.2.9.patch
index 884cb2191c..884cb2191c 100644
--- a/packages/libsdl/libsdl-qpe-1.2.9/kill-stdc++-1.2.9.patch
+++ b/packages/libsdl/files/kill-stdc++-1.2.9.patch
diff --git a/packages/libsdl/files/pagesize.patch b/packages/libsdl/files/pagesize.patch
new file mode 100644
index 0000000000..ea9ea9849b
--- /dev/null
+++ b/packages/libsdl/files/pagesize.patch
@@ -0,0 +1,15 @@
+Remove obsolete non-portable macro.
+
+Index: SDL-1.2.9/src/video/fbcon/SDL_fbvideo.c
+===================================================================
+--- SDL-1.2.9.orig/src/video/fbcon/SDL_fbvideo.c
++++ SDL-1.2.9/src/video/fbcon/SDL_fbvideo.c
+@@ -405,7 +405,7 @@ static int FB_VideoInit(_THIS, SDL_Pixel
+ 
+ 	/* Memory map the device, compensating for buggy PPC mmap() */
+ 	mapped_offset = (((long)finfo.smem_start) -
+-	                (((long)finfo.smem_start)&~(PAGE_SIZE-1)));
++	                (((long)finfo.smem_start)&~(getpagesize()-1)));
+ 	mapped_memlen = finfo.smem_len+mapped_offset;
+ 	mapped_mem = mmap(NULL, mapped_memlen,
+ 	                  PROT_READ|PROT_WRITE, MAP_SHARED, console_fd, 0);
diff --git a/packages/libsdl/libsdl-qpe-1.2.9/pygame-1.2.9.patch b/packages/libsdl/files/pygame-1.2.9.patch
index 4073de25bf..4073de25bf 100644
--- a/packages/libsdl/libsdl-qpe-1.2.9/pygame-1.2.9.patch
+++ b/packages/libsdl/files/pygame-1.2.9.patch
diff --git a/packages/libsdl/libsdl-directfb_1.2.9.bb b/packages/libsdl/libsdl-directfb_1.2.9.bb
index 73e94e9d22..7a9bd88ee2 100644
--- a/packages/libsdl/libsdl-directfb_1.2.9.bb
+++ b/packages/libsdl/libsdl-directfb_1.2.9.bb
@@ -1,28 +1,13 @@
-DESCRIPTION = "Simple DirectMedia Layer - DirectFB Edition"
-SECTION = "libs"
-PRIORITY = "optional"
-DEPENDS = "alsa-lib directfb"
-PROVIDES = "virtual/libsdl"
-LICENSE = "LGPL"
+require libsdl.inc
 
-PR = "r3"
+DEPENDS = "alsa-lib directfb"
 DEFAULT_PREFERENCE = "-1"
 
-SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \
-           file://agawa-piro-mickey-1.2.9.patch;patch=1 \
-           file://pygame-1.2.9.patch;patch=1 \
-           file://mouse-1.2.9.patch;patch=1 \
-	   file://kill-stdc++-1.2.9.patch;patch=1 \
-	   file://ipaq-1.2.9.patch;patch=1 \
-	   file://SDL-Akita-1.2.9.patch;patch=1 \
-	   file://fixlibs-1.2.9.patch;patch=1 \
-	   file://no-PAGE_SIZE.patch;patch=1 \
-	   file://explicit-extern-C.patch;patch=1 \
-	   file://acinclude.m4 \
-	   file://directfb_obsolete_calls.patch;patch=1"
-S = "${WORKDIR}/SDL-${PV}"
-
-inherit autotools binconfig
+SRC_URI += "\
+  file://explicit-extern-C.patch;patch=1 \
+  file://acinclude.m4 \
+  file://directfb_obsolete_calls.patch;patch=1 \
+"
 
 CFLAGS_append  += " -I${STAGING_INCDIR}/directfb -I${STAGING_INCDIR}/directfb-internal"
 
@@ -30,44 +15,7 @@ EXTRA_OECONF = "--disable-static --disable-debug --enable-cdrom --enable-threads
                 --enable-file --enable-oss --enable-alsa --disable-esd --disable-arts \
                 --disable-diskaudio --disable-nas --disable-esd-shared --disable-esdtest \
                 --disable-mintaudio --disable-nasm --disable-video-x11 --disable-video-dga \
-                --disable-video-fbcon --enable-video-directfb --disable-video-ps2gs \
+                --enable-video-fbcon --enable-video-directfb --disable-video-ps2gs \
                 --disable-video-xbios --disable-video-gem --disable-video-dummy \
                 --disable-video-opengl --enable-input-events --enable-pthreads \
                 --disable-video-picogui --disable-video-qtopia --enable-dlopen"
-
-FILES_${PN} = "${libdir}/lib*.so.*"
-FILES_${PN}-dev += "${bindir}/*config"
-
-do_configure_prepend() {
-	rm -f ${S}/acinclude.m4
-        cp ${WORKDIR}/acinclude.m4 ${S}/
-	if [ "${PALMTOP_USE_MULTITHREADED_QT}" == "yes" ]
-	then
-		sed -i s,-lqte,-lqte-mt, src/Makefile
-	fi	
-}
-do_configure_append () {
-	cd ${S}
-
-	# prevent libtool from linking libs against libstdc++, libgcc, ...
-	cat ${TARGET_PREFIX}libtool | sed -e 's/postdeps=".*"/postdeps=""/' > ${TARGET_PREFIX}libtool.tmp
-	mv ${TARGET_PREFIX}libtool.tmp ${TARGET_PREFIX}libtool
-    	find ${S} -type f | xargs sed -i 's:I/usr/include:I${STAGING_INCDIR}:g'
-
-}
-
-do_stage() {
-	oe_libinstall -so -C src libSDL ${STAGING_LIBDIR}
-	rm ${STAGING_LIBDIR}/libSDL.la
-	ln -sf libSDL.so ${STAGING_LIBDIR}/libSDL-1.2.so
-	#oe_libinstall -a -C src/main libSDLmain ${STAGING_LIBDIR}
-	install -m 0644 src/main/libSDLmain.a ${STAGING_LIBDIR}
-
-	install -d ${STAGING_INCDIR}/SDL
-	for f in include/*.h
-	do
-		install -m 0644 $f ${STAGING_INCDIR}/SDL/
-	done
-
-	install -m 0644 *.m4 ${STAGING_DATADIR}/aclocal/
-}
diff --git a/packages/libsdl/libsdl-qpe_1.2.9.bb b/packages/libsdl/libsdl-qpe_1.2.9.bb
index 2fbf66b5d8..3583f20cf0 100644
--- a/packages/libsdl/libsdl-qpe_1.2.9.bb
+++ b/packages/libsdl/libsdl-qpe_1.2.9.bb
@@ -1,69 +1,31 @@
-DESCRIPTION = "Simple DirectMedia Layer - QtE-based Palmtop Environments Edition"
+require libsdl.inc
+
 SECTION = "opie/libs"
-PRIORITY = "optional"
 DEPENDS = "virtual/libqpe1 libopie2"
-PROVIDES = "virtual/libsdl"
-LICENSE = "LGPL"
-
-# NOTE: make sure to keep PR in sync with libsdl-x11
-PR = "r1"
-
-SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \
-           file://agawa-piro-mickey-1.2.9.patch;patch=1 \
-           file://pygame-1.2.9.patch;patch=1 \
-           file://mouse-1.2.9.patch;patch=1 \
-	   file://kill-stdc++-1.2.9.patch;patch=1 \
-	   file://ipaq-1.2.9.patch;patch=1 \
-	   file://SDL-Akita-1.2.9.patch;patch=1 \
-	   file://fixlibs-1.2.9.patch;patch=1 \
-	   file://no-PAGE_SIZE.patch;patch=1 \
-	   file://explicit-extern-C.patch;patch=1 \
-	   file://acinclude.m4"
-S = "${WORKDIR}/SDL-${PV}"
 
-inherit autotools binconfig
+SRC_URI += "\
+  file://agawa-piro-mickey-1.2.9.patch;patch=1 \
+  file://pygame-1.2.9.patch;patch=1 \
+  file://mouse-1.2.9.patch;patch=1 \
+  file://kill-stdc++-1.2.9.patch;patch=1 \
+  file://ipaq-1.2.9.patch;patch=1 \
+  file://SDL-Akita-1.2.9.patch;patch=1 \
+  file://fixlibs-1.2.9.patch;patch=1 \
+  file://explicit-extern-C.patch;patch=1 \
+"
 
 EXTRA_OECONF = "--disable-static --disable-debug --enable-cdrom --enable-threads --enable-timers --enable-endian \
                 --enable-file --enable-oss --disable-alsa --disable-esd --disable-arts \
                 --disable-diskaudio --disable-nas --disable-esd-shared --disable-esdtest \
                 --disable-mintaudio --disable-nasm --disable-video-x11 --disable-video-dga \
-                --disable-video-fbcon --disable-video-directfb --disable-video-ps2gs \
+                --enable-video-fbcon --disable-video-directfb --disable-video-ps2gs \
                 --disable-video-xbios --disable-video-gem --disable-video-dummy \
                 --disable-video-opengl --enable-input-events --enable-pthreads \
                 --disable-video-picogui --enable-video-qtopia --enable-dlopen"
 
-FILES_${PN} = "${libdir}/lib*.so.*"
-FILES_${PN}-dev += "${bindir}/*config"
-
 do_compile_prepend() {
-        rm -f ${S}/acinclude.m4
-        cp ${WORKDIR}/acinclude.m4 ${S}/
 	if [ "${PALMTOP_USE_MULTITHREADED_QT}" == "yes" ]
 	then
 		sed -i s,-lqte,-lqte-mt, src/Makefile
 	fi
 }
-
-do_configure_append () {
-        cd ${S}
-
-        # prevent libtool from linking libs against libstdc++, libgcc, ...
-        cat ${TARGET_PREFIX}libtool | sed -e 's/postdeps=".*"/postdeps=""/' > ${TARGET_PREFIX}libtool.tmp
-        mv ${TARGET_PREFIX}libtool.tmp ${TARGET_PREFIX}libtool
-}
-
-do_stage() {
-	oe_libinstall -so -C src libSDL ${STAGING_LIBDIR}
-	rm ${STAGING_LIBDIR}/libSDL.la
-	ln -sf libSDL.so ${STAGING_LIBDIR}/libSDL-1.2.so
-	install -m 0655 src/main/libSDLmain.a src/main/.libs/
-	oe_libinstall -a -C src/main libSDLmain ${STAGING_LIBDIR}
-
-	install -d ${STAGING_INCDIR}/SDL
-	for f in include/*.h
-	do
-		install -m 0644 $f ${STAGING_INCDIR}/SDL/
-	done
-
-	install -m 0644 *.m4 ${STAGING_DATADIR}/aclocal/
-}
diff --git a/packages/libsdl/libsdl-x11_1.2.9.bb b/packages/libsdl/libsdl-x11_1.2.9.bb
index 42c0ad3579..43148d4b00 100644
--- a/packages/libsdl/libsdl-x11_1.2.9.bb
+++ b/packages/libsdl/libsdl-x11_1.2.9.bb
@@ -1,56 +1,11 @@
-DESCRIPTION = "Simple DirectMedia Layer - X11 Edition"
-SECTION = "libs"
-PRIORITY = "optional"
-DEPENDS = "alsa-lib mesa virtual/libx11 libxext"
-PROVIDES = "virtual/libsdl"
-LICENSE = "LGPL"
-
-PR = "r2"
-
-SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \
-	   file://extra-keys.patch;patch=1 \
-	   file://acinclude.m4"
-S = "${WORKDIR}/SDL-${PV}"
-
-inherit autotools binconfig
+require libsdl.inc
 
 EXTRA_OECONF = "--disable-static --disable-debug --enable-cdrom --enable-threads --enable-timers --enable-endian \
                 --enable-file --enable-oss --enable-alsa --disable-esd --disable-arts \
                 --disable-diskaudio --disable-nas --disable-esd-shared --disable-esdtest \
                 --disable-mintaudio --disable-nasm --enable-video-x11 --disable-video-dga \
-                --disable-video-fbcon --disable-video-directfb --disable-video-ps2gs \
+                --enable-video-fbcon --disable-video-directfb --disable-video-ps2gs \
                 --disable-video-xbios --disable-video-gem --disable-video-dummy \
                 --enable-video-opengl --enable-input-events --enable-pthreads \
                 --disable-video-picogui --disable-video-qtopia --enable-dlopen"
 
-FILES_${PN} = "${libdir}/lib*.so.*"
-FILES_${PN}-dev += "${bindir}/*config"
-
-do_configure_prepend() {
-	rm -f ${S}/acinclude.m4
-	cp ${WORKDIR}/acinclude.m4 ${S}/
-}
-
-do_configure_append () {
-	cd ${S}
-
-	# prevent libtool from linking libs against libstdc++, libgcc, ...
-	cat ${TARGET_PREFIX}libtool | sed -e 's/postdeps=".*"/postdeps=""/' > ${TARGET_PREFIX}libtool.tmp
-	mv ${TARGET_PREFIX}libtool.tmp ${TARGET_PREFIX}libtool
-}
-
-do_stage() {
-	oe_libinstall -so -C src libSDL ${STAGING_LIBDIR}
-	rm ${STAGING_LIBDIR}/libSDL.la
-	ln -sf libSDL.so ${STAGING_LIBDIR}/libSDL-1.2.so
-	#oe_libinstall -a -C src/main libSDLmain ${STAGING_LIBDIR}
-	install -m 0644 src/main/libSDLmain.a ${STAGING_LIBDIR}
-
-	install -d ${STAGING_INCDIR}/SDL
-	for f in include/*.h
-	do
-		install -m 0644 $f ${STAGING_INCDIR}/SDL/
-	done
-
-	install -m 0644 *.m4 ${STAGING_DATADIR}/aclocal/
-}
diff --git a/packages/libsdl/libsdl-x11_1.2.7.bb b/packages/libsdl/libsdl.inc
index 125aec5f36..a65efb51be 100644
--- a/packages/libsdl/libsdl-x11_1.2.7.bb
+++ b/packages/libsdl/libsdl.inc
@@ -1,28 +1,21 @@
 DESCRIPTION = "Simple DirectMedia Layer - X11 Edition"
 SECTION = "libs"
 PRIORITY = "optional"
-DEPENDS = "virtual/libx11 libxext"
+DEPENDS = "alsa-lib mesa virtual/libx11 libxext"
 PROVIDES = "virtual/libsdl"
 LICENSE = "LGPL"
+PR = "r3"
 
-# NOTE: make sure to keep PR in sync with libsdl-qpe
-PR = "r9"
-
-SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \
-	   file://extra-keys.patch;patch=1 \
-	   file://acinclude.m4"
+SRC_URI = "\
+  http://www.libsdl.org/release/SDL-${PV}.tar.gz \
+  file://extra-keys.patch;patch=1 \
+  file://pagesize.patch;patch=1 \
+  file://acinclude.m4"
 S = "${WORKDIR}/SDL-${PV}"
 
 inherit autotools binconfig
 
-EXTRA_OECONF = "--disable-static --disable-debug --enable-cdrom --enable-threads --enable-timers --enable-endian \
-                --enable-file --enable-oss --enable-alsa --disable-esd --disable-arts \
-                --disable-diskaudio --disable-nas --disable-esd-shared --disable-esdtest \
-                --disable-mintaudio --disable-nasm --enable-video-x11 --disable-video-dga \
-                --disable-video-fbcon --disable-video-directfb --disable-video-ps2gs \
-                --disable-video-xbios --disable-video-gem --disable-video-dummy \
-                --disable-video-opengl --enable-input-events --enable-pthreads \
-                --disable-video-picogui --disable-video-qtopia --enable-dlopen"
+EXTRA_OECONF = "<overwrite me>"
 
 FILES_${PN} = "${libdir}/lib*.so.*"
 FILES_${PN}-dev += "${bindir}/*config"
diff --git a/packages/tasks/task-python-efl-examples.bb b/packages/tasks/task-python-efl-examples.bb
index 0a4e32097f..e78a4cabae 100644
--- a/packages/tasks/task-python-efl-examples.bb
+++ b/packages/tasks/task-python-efl-examples.bb
@@ -2,9 +2,13 @@ DESCRIPTION = "Python Examples for the Enlightenment Foundation Libraries"
 LICENSE = "MIT"
 SECTION = "devel/python"
 RDEPENDS = "\
-  python-efl python-ecore-examples python-emotion-examples python-edje-examples python-epsilon-examples \
+  task-python-efl \
+  python-ecore-examples \
+  python-emotion-examples \
+  python-edje-examples \
+  python-epsilon-examples \
   python-math python-textutils \
 "
-PR = "ml2"
+PR = "ml3"
 
 ALLOW_EMPTY = "1"
diff --git a/packages/vnc/fbvncserver2_cvs.bb b/packages/vnc/fbvncserver2_cvs.bb
new file mode 100644
index 0000000000..29ce53274b
--- /dev/null
+++ b/packages/vnc/fbvncserver2_cvs.bb
@@ -0,0 +1,21 @@
+DESCRIPTION = "A Framebuffer VNC Server for PDA"
+AUTHOR = "Patrik Gfeller <gfellerpatrik@gmx.net>"
+HOMEPAGE = "http://fbvncserver.sourceforge.net/"
+SECTION = "console/utils"
+PRIORITY = "optional"
+LICENSE = "GPLv2"
+DEPENDS = "libvncserver jpeg zlib gmp tslib"
+RRECOMMENDS = "kernel-modules-uinput kernel-module-keybdev"
+RCONFLICTS = "fbvncserver, fbvncserver-kmodule"
+PV = "0.0.0+cvs${SRCDATE}"
+PR = "r0"
+
+SRC_URI = "cvs://anonymous@fbvncserver.cvs.sourceforge.net/cvsroot/fbvncserver;method=pserver;module=ipkg"
+S = "${WORKDIR}/ipkg/src/"
+
+inherit autotools
+
+EXTRA_OECONF = "--enable-debug"
+
+FILES_${PN} += "${datadir}"
+