merge of 'ea367d406c83c35493f3e8c93c52fad15e9eac1e'

     and 'f2ebdb1826372581987a96a662d30d97b544c438'

30 files changed, 282 insertions, 478 deletions

diff --git a/packages/beecrypt/beecrypt_3.1.0.bb b/packages/beecrypt/beecrypt_3.1.0.bb
index 3187b9b12a..f9a45e74df 100644
--- a/packages/beecrypt/beecrypt_3.1.0.bb
+++ b/packages/beecrypt/beecrypt_3.1.0.bb
@@ -6,7 +6,23 @@ DESCRIPTION="Beecrypt is a general-purpose cryptography library."
 HOMEPAGE="http://sourceforge.net/projects/beecrypt"
 SRC_URI="${SOURCEFORGE_MIRROR}/beecrypt/beecrypt-${PV}.tar.gz"
 
+PR = "r2"
+
 inherit autotools
 acpaths=""
 
 EXTRA_OECONF="--with-arch=${TARGET_ARCH} --enable-shared --enable-static"
+
+do_stage() {
+
+#	oe_libinstall  -a  -C .libs libbeecrypt  ${STAGING_LIBDIR}
+	cp .libs/libbeecrypt.a ${STAGING_LIBDIR}/
+	install -d ${STAGING_INCDIR}/
+	install -d ${STAGING_INCDIR}/beecrypt
+	for X in beecrypt.h beecrypt.api.h memchunk.h mpnumber.h beecrypt.gnu.h mp.h mpopt.h blockmode.h endianness.h
+	do
+		install -m 0644 ${X} ${STAGING_INCDIR}/beecrypt/${X}
+	done
+
+}
+
diff --git a/packages/e17/e-wm_svn.bb b/packages/e17/e-wm_svn.bb
index 46ade701a3..e16cad051d 100644
--- a/packages/e17/e-wm_svn.bb
+++ b/packages/e17/e-wm_svn.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "The Enlightenment Window Mananger Version 17"
 DEPENDS = "eet evas ecore edje efreet edbus"
 LICENSE = "MIT BSD"
 PV = "0.16.999.043+svnr${SRCREV}"
-PR = "r13"
+PR = "r14"
 
 inherit e update-alternatives
 
@@ -10,7 +10,6 @@ RDEPENDS += "shared-mime-info mime-support"
 
 SRC_URI = "\
   svn://svn.enlightenment.org/svn/e/trunk;module=e;proto=http \
-  file://disable-e-cursor.patch;patch=1 \
   file://enlightenment_start.oe \
   file://applications.menu \
 "
diff --git a/packages/freesmartphone/frameworkd_git.bb b/packages/freesmartphone/frameworkd_git.bb
index 74ec3615a9..63da1dffa2 100644
--- a/packages/freesmartphone/frameworkd_git.bb
+++ b/packages/freesmartphone/frameworkd_git.bb
@@ -4,8 +4,8 @@ AUTHOR = "Michael 'Mickey' Lauer <mlauer@vanille-media.de> et. al."
 SECTION = "console/network"
 DEPENDS = "python-cython-native python-pyrex-native"
 LICENSE = "GPL"
-PV = "0.8.2+${PR}-gitr${SRCREV}"
-PR = "r2"
+PV = "0.8.3+${PR}-gitr${SRCREV}"
+PR = "r0"
 
 inherit distutils update-rc.d
 
@@ -26,6 +26,7 @@ do_install_append() {
 RDEPENDS_${PN} += "\
   python-dbus \
   python-datetime \
+  python-pprint \
   python-pygobject \
   python-pyrtc \
   python-pyserial \
diff --git a/packages/freesmartphone/mickeydbus_git.bb b/packages/freesmartphone/mickeydbus_git.bb
index cbd90e5030..648cc48f91 100644
--- a/packages/freesmartphone/mickeydbus_git.bb
+++ b/packages/freesmartphone/mickeydbus_git.bb
@@ -2,8 +2,8 @@ DESCRIPTION = "Mickey's DBus introspection and calling Program"
 AUTHOR = "Michael 'Mickey' Lauer <mlauer@vanille-media.de>"
 SECTION = "console/network"
 LICENSE = "GPLv2"
-PV = "0.9.0+gitr${SRCREV}"
-PR = "r0"
+PV = "0.9.1+gitr${SRCREV}"
+PR = "r1"
 
 SRC_URI = "${FREESMARTPHONE_GIT}/python-helpers.git;protocol=git;branch=master"
 S = "${WORKDIR}/git"
@@ -15,4 +15,8 @@ do_install() {
 
 RDEPENDS_${PN} = "\
   python-dbus \
+  python-pprint \
 "
+
+PACKAGE_ARCH_${PN} = "all"
+
diff --git a/packages/freesmartphone/mickeyterm_git.bb b/packages/freesmartphone/mickeyterm_git.bb
index 243354cc91..0ecc8bbbea 100644
--- a/packages/freesmartphone/mickeyterm_git.bb
+++ b/packages/freesmartphone/mickeyterm_git.bb
@@ -2,8 +2,8 @@ DESCRIPTION = "Mickey's Terminal Program"
 AUTHOR = "Michael 'Mickey' Lauer <mlauer@vanille-media.de>"
 SECTION = "console/network"
 LICENSE = "GPLv2"
-PV = "2.9.0+gitr${SRCREV}"
-PR = "r0"
+PV = "2.9.1+gitr${SRCREV}"
+PR = "r1"
 
 SRC_URI = "${FREESMARTPHONE_GIT}/python-helpers.git;protocol=git;branch=master"
 S = "${WORKDIR}/git"
@@ -23,3 +23,6 @@ RRECOMMENDS_${PN} += "\
   gsm0710muxd \
   python-dbus \
 "
+
+PACKAGE_ARCH_${PN} = "all"
+
diff --git a/packages/freesmartphone/zhone_git.bb b/packages/freesmartphone/zhone_git.bb
index 1bd275d7e7..d8c678ce59 100644
--- a/packages/freesmartphone/zhone_git.bb
+++ b/packages/freesmartphone/zhone_git.bb
@@ -2,9 +2,8 @@ DESCRIPTION = "Zhone: Zen Phone"
 LICENSE = "GPL"
 SECTION = "x11"
 DEPENDS = "edje-native python-pyrex-native python-cython-native"
-RDEPENDS = "task-python-efl python-textutils python-dbus python-pycairo"
 PV = "0.0.0+${PR}-gitr${SRCREV}"
-PR = "r9"
+PR = "r10"
 
 SRC_URI = "${FREESMARTPHONE_GIT}/zhone.git;protocol=git;branch=master \
            file://80zhone"
@@ -18,3 +17,10 @@ do_install_append() {
 }
 
 FILES_${PN} += "${datadir} ${sysconfdir}"
+
+RDEPENDS = "\
+  task-python-efl \
+  python-textutils \
+  python-dbus \
+  python-pycairo \
+"
diff --git a/packages/gpe-sketchbook/gpe-sketchbook_0.2.8.bb b/packages/gpe-sketchbook/gpe-sketchbook_0.2.8.bb
index b4878406de..b04cfc39bf 100644
--- a/packages/gpe-sketchbook/gpe-sketchbook_0.2.8.bb
+++ b/packages/gpe-sketchbook/gpe-sketchbook_0.2.8.bb
@@ -1,15 +1,10 @@
+DEPENDS = "libgpewidget sqlite"
 LICENSE = "GPL"
-PR = "r4"
-
-inherit gpe pkgconfig
-
-DEPENDS = "libgpewidget"
-SECTION = "gpe"
-SECTION = "gpe"
-PRIORITY = "optional"
 DESCRIPTION = "A GPE notebook to sketch your notes"
 export CVSBUILD = "no"
 
+inherit gpe pkgconfig
+
 CFLAGS +="-D_GNU_SOURCE"
 
 SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.gz \
diff --git a/packages/gpe-sketchbook/gpe-sketchbook_0.2.9.bb b/packages/gpe-sketchbook/gpe-sketchbook_0.2.9.bb
index 60bb1b3d76..488e32f55b 100644
--- a/packages/gpe-sketchbook/gpe-sketchbook_0.2.9.bb
+++ b/packages/gpe-sketchbook/gpe-sketchbook_0.2.9.bb
@@ -1,14 +1,10 @@
+DEPENDS = "libgpewidget sqlite"
 LICENSE = "GPL"
-
-inherit gpe pkgconfig
-
-DEPENDS = "libgpewidget"
-SECTION = "gpe"
-SECTION = "gpe"
-PRIORITY = "optional"
 DESCRIPTION = "A GPE notebook to sketch your notes"
 export CVSBUILD = "no"
 
+inherit gpe pkgconfig
+
 CFLAGS +="-D_GNU_SOURCE"
 
 SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.gz"
diff --git a/packages/gpe-sketchbook/gpe-sketchbook_svn.bb b/packages/gpe-sketchbook/gpe-sketchbook_svn.bb
index 8884746136..929d622a51 100644
--- a/packages/gpe-sketchbook/gpe-sketchbook_svn.bb
+++ b/packages/gpe-sketchbook/gpe-sketchbook_svn.bb
@@ -1,18 +1,23 @@
 DESCRIPTION = "A GPE notebook to sketch your notes"
 SECTION = "gpe"
-SECTION = "gpe"
 PRIORITY = "optional"
 LICENSE = "GPL"
-DEPENDS = "libgpewidget"
-PV = "0.2.9+svn-${SRCDATE}"
+DEPENDS = "libgpewidget sqlite"
+PV = "0.2.9+svnr${SRCREV}"
 
-inherit pkgconfig autotools
+DEFAULT_PREFERENCE = "-1"
 
-SRC_URI = "${GPE_SVN} \
-	   file://svn-build.patch;patch=1"
+inherit pkgconfig autotools
 
+SRC_URI = "\
+  ${GPE_SVN} \
+  file://svn-build.patch;patch=1 \
+"
 S = "${WORKDIR}/${PN}"
 
+export CVSBUILD = "no"
+CFLAGS += "-D_GNU_SOURCE"
+
 do_compile () {
         oe_runmake PREFIX=${prefix}
         oe_runmake all-desktop PREFIX=${prefix}
@@ -23,10 +28,3 @@ do_install () {
 
 FILES_${PN} = "${bindir} ${datadir}/pixmaps ${datadir}/applications"
 FILES_${PN} += " ${datadir}/gpe/pixmaps"
-
-export CVSBUILD = "no"
-
-CFLAGS += "-D_GNU_SOURCE"
-
-DEFAULT_PREFERENCE = "-1"
-
diff --git a/packages/linux/linux-omap/dvb-fix-dma.diff b/packages/linux/linux-omap/dvb-fix-dma.diff
new file mode 100644
index 0000000000..e05473fc7f
--- /dev/null
+++ b/packages/linux/linux-omap/dvb-fix-dma.diff
@@ -0,0 +1,60 @@
+Hi,
+I post this patch that fixes a kernel crash that happens when using a dvb
+usb stick on a mips platform and I think even on other platforms on which
+the dma access in not cache-coherent.
+
+The problem's origin is that, inside the method usb_bulk_urb_init of file
+drivers/media/dvb/dvb-usb/usb-urb.c, stream->urb_list[i]->transfer_buffer
+points to a memory area that has been allocated to be dma-coherent but
+stream->urb_list[i]->transfer_flags doesn't include the
+URB_NO_TRANSFER_DMA_MAP flag and stream->urb_list[i]->transfer_dma is not
+set.
+When later on the stream->urb_list[i]->transfer_buffer pointer is used
+inside function usb_hcd_submit_urb of file drivers/usb/core/hcd.c since the
+flag URB_NO_TRANSFER_DMA_MAP is not set the urb->transfer_buffer pointer is
+passed to the dma_map_single function that since the address is dma-coherent
+returns a wrong tranfer_dma address that later on leads to the kernel crash.
+
+The problem is solved by setting the URB_NO_TRANSFER_DMA_MAP flag and the
+stream->urb_list[i]->transfer_dma address.
+
+Perhaps to be more safe the URB_NO_TRANSFER_DMA_MAP flag can be set only
+if stream->urb_list[i]->transfer_dma != 0.
+
+I don't know if half of the fault can be of the dma_map_single function that
+should anyway returns a valid address both for a not dma-coherent and a
+dma-coherent address.
+
+Just to be clear:
+I've done this patch to solve my problem and I tested it only on a mips 
+platform
+but I think it should not cause any problems on other platforms.
+I posted it here to help someone else that can have my same problem and to 
+point it out
+to the mantainer of this part of code.
+You can use it at your own risk and I'm not resposible in any way for any 
+problem or
+damage that it can cause.
+I'm available to discuss about it
+
+Bye
+
+Michele Scorcia
+
+--------------------
+
+
+
+
+--- /tmp/usb-urb.c	2008-10-08 09:53:23.000000000 +0200
++++ git/drivers/media/dvb/dvb-usb/usb-urb.c	2008-10-08 09:54:16.000000000 +0200
+@@ -152,7 +152,8 @@
+ 				stream->props.u.bulk.buffersize,
+ 				usb_urb_complete, stream);
+ 
+-		stream->urb_list[i]->transfer_flags = 0;
++		stream->urb_list[i]->transfer_flags = URB_NO_TRANSFER_DMA_MAP;
++		stream->urb_list[i]->transfer_dma = stream->dma_addr[i];	
+ 		stream->urbs_initialized++;
+ 	}
+ 	return 0;
diff --git a/packages/linux/linux-omap_git.bb b/packages/linux/linux-omap_git.bb
index 290d90084b..a81cec89aa 100644
--- a/packages/linux/linux-omap_git.bb
+++ b/packages/linux/linux-omap_git.bb
@@ -9,7 +9,7 @@ COMPATIBLE_MACHINE = "omap5912osk|omap1710h3|omap2430sdp|omap2420h4|beagleboard|
 SRCREV = "e1c49d7d22af768188e2a54c167ed79919361e55"
 
 PV = "2.6.26+2.6.27-rc7+${PR}+git${SRCREV}"
-PR = "r12"
+PR = "r13"
 
 SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git;protocol=git \
 	   file://defconfig"
@@ -34,6 +34,7 @@ SRC_URI_append = " \
            file://musb-fix-multiple-bulk-transfers.diff;patch=1 \
            file://mru-256MB.diff;patch=1 \
            file://musb-fix-endpoints.diff;patch=1 \
+           file://dvb-fix-dma.diff;patch=1 \
 "
 
 
diff --git a/packages/miglayout/miglayout_3.0.3.bb b/packages/miglayout/miglayout_3.0.3.bb
new file mode 100644
index 0000000000..2450a7e01f
--- /dev/null
+++ b/packages/miglayout/miglayout_3.0.3.bb
@@ -0,0 +1,34 @@
+DESCRIPTION = "Flexible layout classes for Swing and SWT"
+LICENSE = "BSD"
+
+AUTHOR = "Mikael Grev"
+HOMEPAGE = "http://www.migcalendar.com/miglayout"
+
+SRC_URI = "http://www.migcalendar.com/${PN}/versions/${P}.zip"
+
+S = "${WORKDIR}"
+
+inherit java-library
+
+DEPENDS = "unzip-native fastjar-native classpath swt3.4-gtk"
+
+do_unpackpost() {
+	find -name "*.jar" -exec rm {} \;
+
+	mkdir sources
+	unzip miglayout-src.zip -d sources
+}
+
+addtask unpackpost after do_unpack before do_patch
+
+do_compile() {
+  oe_makeclasspath cp -s swt
+
+  javac \
+    -source 5.0 -sourcepath sources -cp $cp \
+    -d build \
+    `find sources -name "*.java" -and -not -wholename "*demo*"` \
+
+  fastjar -C build -c -f ${JARFILENAME} .
+}
+
diff --git a/packages/portabase/beecrypt/.mtn2git_empty b/packages/portabase/beecrypt/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/portabase/beecrypt/.mtn2git_empty
+++ /dev/null
diff --git a/packages/portabase/beecrypt/config.m4 b/packages/portabase/beecrypt/config.m4
deleted file mode 100644
index 05d2d1593d..0000000000
--- a/packages/portabase/beecrypt/config.m4
+++ /dev/null
@@ -1,16 +0,0 @@
-dnl config.m4
-ifdef(`__CONFIG_M4_INCLUDED__',,`
-define(`CONFIG_TOP_SRCDIR',`/home/hrw/zaurus/oe/build/0930/tmp/work/beecrypt-3.1.0-r0/beecrypt-3.1.0')
-define(`ASM_OS',`linux-gnu')
-define(`ASM_CPU',`arm')
-define(`ASM_ARCH',`arm')
-define(`ASM_BIGENDIAN',`no')
-define(`ASM_SRCDIR',`/home/hrw/zaurus/oe/build/0930/tmp/work/beecrypt-3.1.0-r0/beecrypt-3.1.0/gas')
-define(`TEXTSEG',`.text')
-define(`GLOBL',`.globl')
-define(`GSYM_PREFIX',`')
-define(`LSYM_PREFIX',`.L')
-define(`ALIGN',`')
-define(`__CONFIG_M4_INCLUDED__')
-include(asmdefs.m4)
-')
diff --git a/packages/portabase/beecrypt/gas.patch b/packages/portabase/beecrypt/gas.patch
deleted file mode 100644
index bdb20944d3..0000000000
--- a/packages/portabase/beecrypt/gas.patch
+++ /dev/null
@@ -1,166 +0,0 @@
-diff -ur beecrypt-3.1.0/gas.orig/aesopt.ppc.m4 beecrypt-3.1.0/gas/aesopt.ppc.m4
---- beecrypt-3.1.0/gas.orig/aesopt.ppc.m4	2003-06-09 08:03:21 +0200
-+++ beecrypt-3.1.0/gas/aesopt.ppc.m4	2004-10-06 17:59:31 +0200
-@@ -21,7 +21,7 @@
- dnl  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- 
- include(config.m4)
--include(ASM_SRCDIR/ppc.m4)
-+include(ppc.m4)
- 
- define(`s0',`r24')
- define(`s1',`r25')
-diff -ur beecrypt-3.1.0/gas.orig/aesopt.x86.m4 beecrypt-3.1.0/gas/aesopt.x86.m4
---- beecrypt-3.1.0/gas.orig/aesopt.x86.m4	2003-06-09 10:35:39 +0200
-+++ beecrypt-3.1.0/gas/aesopt.x86.m4	2004-10-06 17:54:36 +0200
-@@ -1,5 +1,5 @@
- include(config.m4)
--include(ASM_SRCDIR/x86.m4)
-+include(x86.m4)
- 
- ifdef(`USE_MMX',`
- 
-diff -ur beecrypt-3.1.0/gas.orig/blowfishopt.i586.m4 beecrypt-3.1.0/gas/blowfishopt.i586.m4
---- beecrypt-3.1.0/gas.orig/blowfishopt.i586.m4	2003-06-09 10:25:11 +0200
-+++ beecrypt-3.1.0/gas/blowfishopt.i586.m4	2004-10-06 17:54:58 +0200
-@@ -19,7 +19,7 @@
- dnl  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- 
- include(config.m4)
--include(ASM_SRCDIR/x86.m4)
-+include(x86.m4)
- 
- dnl during this macro we assume:
- dnl	bp in %esi, xl and xr in %ecx and %edx, %eax and %ebx clear
-diff -ur beecrypt-3.1.0/gas.orig/blowfishopt.ppc.m4 beecrypt-3.1.0/gas/blowfishopt.ppc.m4
---- beecrypt-3.1.0/gas.orig/blowfishopt.ppc.m4	2003-06-04 19:39:57 +0200
-+++ beecrypt-3.1.0/gas/blowfishopt.ppc.m4	2004-10-06 17:59:36 +0200
-@@ -21,7 +21,7 @@
- dnl  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- 
- include(config.m4)
--include(ASM_SRCDIR/ppc.m4)
-+include(ppc.m4)
- 
- define(`round',`
- 	lwz r9,$3(r3)
-diff -ur beecrypt-3.1.0/gas.orig/mpopt.alpha.m4 beecrypt-3.1.0/gas/mpopt.alpha.m4
---- beecrypt-3.1.0/gas.orig/mpopt.alpha.m4	2003-05-29 10:44:37 +0200
-+++ beecrypt-3.1.0/gas/mpopt.alpha.m4	2004-10-06 17:57:20 +0200
-@@ -19,7 +19,7 @@
- dnl  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- 
- include(config.m4)
--include(ASM_SRCDIR/alpha.m4)
-+include(alpha.m4)
- 
- 
- C_FUNCTION_BEGIN(mpadd)
-diff -ur beecrypt-3.1.0/gas.orig/mpopt.ia64.m4 beecrypt-3.1.0/gas/mpopt.ia64.m4
---- beecrypt-3.1.0/gas.orig/mpopt.ia64.m4	2003-05-28 10:40:44 +0200
-+++ beecrypt-3.1.0/gas/mpopt.ia64.m4	2004-10-06 17:57:32 +0200
-@@ -19,7 +19,7 @@
- dnl  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- 
- include(config.m4)
--include(ASM_SRCDIR/ia64.m4)
-+include(ia64.m4)
- 
- define(`sze',`r14')
- define(`dst',`r15')
-diff -ur beecrypt-3.1.0/gas.orig/mpopt.m68k.m4 beecrypt-3.1.0/gas/mpopt.m68k.m4
---- beecrypt-3.1.0/gas.orig/mpopt.m68k.m4	2003-04-26 14:01:57 +0200
-+++ beecrypt-3.1.0/gas/mpopt.m68k.m4	2004-10-06 17:57:38 +0200
-@@ -19,7 +19,7 @@
- dnl  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-  
- include(config.m4)
--include(ASM_SRCDIR/m68k.m4)
-+include(m68k.m4)
- 
- dnl works
- C_FUNCTION_BEGIN(mpadd)
-diff -ur beecrypt-3.1.0/gas.orig/mpopt.ppc64.m4 beecrypt-3.1.0/gas/mpopt.ppc64.m4
---- beecrypt-3.1.0/gas.orig/mpopt.ppc64.m4	2003-04-19 18:05:43 +0200
-+++ beecrypt-3.1.0/gas/mpopt.ppc64.m4	2004-10-06 17:57:54 +0200
-@@ -19,7 +19,7 @@
- dnl  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-  
- include(config.m4)
--include(ASM_SRCDIR/ppc64.m4)
-+include(ppc64.m4)
- 
- 
- C_FUNCTION_BEGIN(mpaddw)
-diff -ur beecrypt-3.1.0/gas.orig/mpopt.ppc.m4 beecrypt-3.1.0/gas/mpopt.ppc.m4
---- beecrypt-3.1.0/gas.orig/mpopt.ppc.m4	2003-04-19 18:05:43 +0200
-+++ beecrypt-3.1.0/gas/mpopt.ppc.m4	2004-10-06 17:57:50 +0200
-@@ -19,7 +19,7 @@
- dnl  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-  
- include(config.m4)
--include(ASM_SRCDIR/ppc.m4)
-+include(ppc.m4)
- 
- 
- C_FUNCTION_BEGIN(mpaddw)
-diff -ur beecrypt-3.1.0/gas.orig/mpopt.sparcv8.m4 beecrypt-3.1.0/gas/mpopt.sparcv8.m4
---- beecrypt-3.1.0/gas.orig/mpopt.sparcv8.m4	2003-04-19 18:05:43 +0200
-+++ beecrypt-3.1.0/gas/mpopt.sparcv8.m4	2004-10-06 17:56:54 +0200
-@@ -19,7 +19,7 @@
- dnl  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- 
- include(config.m4)
--include(ASM_SRCDIR/sparc.m4)
-+include(sparc.m4)
- 
- 
- C_FUNCTION_BEGIN(mpsetmul)
-diff -ur beecrypt-3.1.0/gas.orig/mpopt.sparcv8plus.m4 beecrypt-3.1.0/gas/mpopt.sparcv8plus.m4
---- beecrypt-3.1.0/gas.orig/mpopt.sparcv8plus.m4	2003-04-19 18:05:43 +0200
-+++ beecrypt-3.1.0/gas/mpopt.sparcv8plus.m4	2004-10-06 17:57:04 +0200
-@@ -19,7 +19,7 @@
- dnl  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- 
- include(config.m4)
--include(ASM_SRCDIR/sparc.m4)
-+include(sparc.m4)
- 
- 
- C_FUNCTION_BEGIN(mpaddw)
-diff -ur beecrypt-3.1.0/gas.orig/mpopt.x86_64.m4 beecrypt-3.1.0/gas/mpopt.x86_64.m4
---- beecrypt-3.1.0/gas.orig/mpopt.x86_64.m4	2003-05-29 14:40:37 +0200
-+++ beecrypt-3.1.0/gas/mpopt.x86_64.m4	2004-10-06 17:56:14 +0200
-@@ -21,7 +21,7 @@
- 	.file "mpopt.s"
- 
- include(config.m4)
--include(ASM_SRCDIR/x86_64.m4)
-+include(x86_64.m4)
- 
- 
- C_FUNCTION_BEGIN(mpzero)
-diff -ur beecrypt-3.1.0/gas.orig/mpopt.x86.m4 beecrypt-3.1.0/gas/mpopt.x86.m4
---- beecrypt-3.1.0/gas.orig/mpopt.x86.m4	2003-06-04 19:39:58 +0200
-+++ beecrypt-3.1.0/gas/mpopt.x86.m4	2004-10-06 17:56:27 +0200
-@@ -19,7 +19,7 @@
- dnl  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-  
- include(config.m4)
--include(ASM_SRCDIR/x86.m4)
-+include(x86.m4)
- 
- 
- C_FUNCTION_BEGIN(mpzero)
-diff -ur beecrypt-3.1.0/gas.orig/sha1opt.x86.m4 beecrypt-3.1.0/gas/sha1opt.x86.m4
---- beecrypt-3.1.0/gas.orig/sha1opt.x86.m4	2003-05-08 19:52:54 +0200
-+++ beecrypt-3.1.0/gas/sha1opt.x86.m4	2004-10-06 17:55:20 +0200
-@@ -19,7 +19,7 @@
- dnl  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- 
- include(config.m4)
--include(ASM_SRCDIR/x86.m4)
-+include(x86.m4)
- 
- 	.equ	K00,	0x5a827999
- 	.equ	K20,	0x6ed9eba1
diff --git a/packages/portabase/beecrypt/m4.diff b/packages/portabase/beecrypt/m4.diff
deleted file mode 100644
index 0d07f75cb2..0000000000
--- a/packages/portabase/beecrypt/m4.diff
+++ /dev/null
@@ -1,155 +0,0 @@
---- beecrypt-3.1.0/acinclude.m4.orig	2004-10-06 17:09:25.000000000 +0200
-+++ beecrypt-3.1.0/acinclude.m4	2004-10-06 17:12:22.000000000 +0200
-@@ -9,7 +9,7 @@
- 
- 
- dnl  BEECRYPT_INT_TYPES
--AC_DEFUN(BEECRYPT_INT_TYPES,[
-+AC_DEFUN([BEECRYPT_INT_TYPES],[
-   AC_TYPE_SIZE_T
-   bc_typedef_size_t=
-   if test $ac_cv_type_size_t != yes; then
-@@ -112,7 +112,7 @@
- 
- 
- dnl  BEECRYPT_CPU_BITS
--AC_DEFUN(BEECRYPT_CPU_BITS,[
-+AC_DEFUN([BEECRYPT_CPU_BITS],[
-   AC_CHECK_SIZEOF([unsigned long])
-   if test $ac_cv_sizeof_unsigned_long -eq 8; then
-     AC_SUBST(MP_WBITS,64U)
-@@ -125,7 +125,7 @@
- 
- 
- dnl  BEECRYPT_WORKING_AIO
--AC_DEFUN(BEECRYPT_WORKING_AIO,[
-+AC_DEFUN([BEECRYPT_WORKING_AIO],[
-   AC_CHECK_HEADERS(aio.h)
-   if test "$ac_cv_header_aio_h" = yes; then
-     AC_SEARCH_LIBS([aio_read],[c rt aio posix4],[
-@@ -228,7 +228,7 @@
- 
- 
- dnl  BEECRYPT_CFLAGS_REM
--AC_DEFUN(BEECRYPT_CFLAGS_REM,[
-+AC_DEFUN([BEECRYPT_CFLAGS_REM],[
-   if test "$CFLAGS" != ""; then
-     CFLAGS_save=""
-     for flag in $CFLAGS
-@@ -243,7 +243,7 @@
- 
- 
- dnl  BEECRYPT_GNU_CC
--AC_DEFUN(BEECRYPT_GNU_CC,[
-+AC_DEFUN([BEECRYPT_GNU_CC],[
-   AC_REQUIRE([AC_PROG_CC])
-   case $bc_target_arch in
-   ia64)
-@@ -331,7 +331,7 @@
- 
- 
- dnl  BEECRYPT_COMPAQ_CC
--AC_DEFUN(BEECRYPT_COMPAQ_CC,[
-+AC_DEFUN([BEECRYPT_COMPAQ_CC],[
-   AC_REQUIRE([AC_PROG_CC])
-   AC_REQUIRE([AC_PROG_CPP])
-   AC_CACHE_CHECK([whether we are using Compaq's C compiler],bc_cv_prog_COMPAQ_CC,[
-@@ -355,7 +355,7 @@
- 
- 
- dnl  BEECRYPT_HPUX_CC
--AC_DEFUN(BEECRYPT_HPUX_CC,[
-+AC_DEFUN([BEECRYPT_HPUX_CC],[
-   if test "$ac_enable_debug" != yes; then
-     BEECRYPT_CFLAGS_REM([-g])
-     CFLAGS="$CFLAGS -fast"
-@@ -364,7 +364,7 @@
- 
- 
- dnl  BEECRYPT_IBM_CC
--AC_DEFUN(BEECRYPT_IBM_CC,[
-+AC_DEFUN([BEECRYPT_IBM_CC],[
-   AC_REQUIRE([AC_PROG_CC])
-   AC_REQUIRE([AC_PROG_CPP])
-   AC_CACHE_CHECK([whether we are using IBM C],bc_cv_prog_IBM_CC,[
-@@ -398,7 +398,7 @@
- 
- 
- dnl  BEECRYPT_INTEL_CC
--AC_DEFUN(BEECRYPT_INTEL_CC,[
-+AC_DEFUN([BEECRYPT_INTEL_CC],[
-   AC_REQUIRE([AC_PROG_CC])
-   AC_REQUIRE([AC_PROG_CPP])
-   AC_CACHE_CHECK([whether we are using Intel C++],bc_cv_prog_INTEL_CC,[
-@@ -448,7 +448,7 @@
- 
- 
- dnl  BEECRYPT_SUN_FORTE_CC
--AC_DEFUN(BEECRYPT_SUN_FORTE_CC,[
-+AC_DEFUN([BEECRYPT_SUN_FORTE_CC],[
-   AC_REQUIRE([AC_PROG_CC])
-   AC_REQUIRE([AC_PROG_CPP])
-   AC_CACHE_CHECK([whether we are using Sun Forte C],bc_cv_prog_SUN_FORTE_CC,[
-@@ -485,7 +485,7 @@
- 
- 
- dnl  BEECRYPT_ASM_DEFS
--AC_DEFUN(BEECRYPT_ASM_DEFS,[
-+AC_DEFUN([BEECRYPT_ASM_DEFS],[
-   AC_SUBST(ASM_OS,$target_os)
-   AC_SUBST(ASM_CPU,$bc_target_cpu)
-   AC_SUBST(ASM_ARCH,$bc_target_arch)
-@@ -494,7 +494,7 @@
- 
- 
- dnl  BEECRYPT_ASM_TEXTSEG
--AC_DEFUN(BEECRYPT_ASM_TEXTSEG,[
-+AC_DEFUN([BEECRYPT_ASM_TEXTSEG],[
-   AC_CACHE_CHECK([how to switch to text segment],
-     bc_cv_asm_textseg,[
-       case $target_os in
-@@ -516,7 +516,7 @@
- 
- 
- dnl  BEECRYPT_ASM_GLOBL
--AC_DEFUN(BEECRYPT_ASM_GLOBL,[
-+AC_DEFUN([BEECRYPT_ASM_GLOBL],[
-   AC_CACHE_CHECK([how to declare a global symbol],
-     bc_cv_asm_globl,[
-       case $target_os in
-@@ -529,7 +529,7 @@
- 
- 
- dnl  BEECRYPT_ASM_GSYM_PREFIX
--AC_DEFUN(BEECRYPT_ASM_GSYM_PREFIX,[
-+AC_DEFUN([BEECRYPT_ASM_GSYM_PREFIX],[
-   AC_CACHE_CHECK([if global symbols need leading underscore],
-     bc_cv_asm_gsym_prefix,[
-       case $target_os in
-@@ -542,7 +542,7 @@
- 
- 
- dnl  BEECRYPT_ASM_LSYM_PREFIX
--AC_DEFUN(BEECRYPT_ASM_LSYM_PREFIX,[
-+AC_DEFUN([BEECRYPT_ASM_LSYM_PREFIX],[
-   AC_CACHE_CHECK([how to declare a local symbol],
-     bc_cv_asm_lsym_prefix,[
-       case $target_os in
-@@ -562,7 +562,7 @@
- 
- 
- dnl  BEECRYPT_ASM_ALIGN
--AC_DEFUN(BEECRYPT_ASM_ALIGN,[
-+AC_DEFUN([BEECRYPT_ASM_ALIGN],[
-   AC_CACHE_CHECK([how to align symbols],
-     bc_cv_asm_align,[
-       case $target_cpu in
-@@ -587,7 +587,7 @@
- 
- 
- dnl  BEECRYPT_ASM_SOURCES
--AC_DEFUN(BEECRYPT_ASM_SOURCES,[
-+AC_DEFUN([BEECRYPT_ASM_SOURCES],[
-   echo > mpopt.s
-   echo > aesopt.s
-   echo > blowfishopt.s
diff --git a/packages/portabase/beecrypt_3.1.0.bb b/packages/portabase/beecrypt_3.1.0.bb
deleted file mode 100644
index bd61bad88e..0000000000
--- a/packages/portabase/beecrypt_3.1.0.bb
+++ /dev/null
@@ -1,34 +0,0 @@
-SECTION = "console/utils"
-DESCRIPTION = "BeeCrypt is an ongoing project to provide a strong and fast cryptography \
-toolkit. Includes entropy sources, random generators, block ciphers, hash functions, \
-message authentication codes, multiprecision integer routines, and public key primitives."
-
-HOMEPAGE = "http://sourceforge.net/projects/beecrypt/"
-LICENSE = "LGPL"
-SRC_URI = "${SOURCEFORGE_MIRROR}/beecrypt/beecrypt-${PV}.tar.gz \
-file://config.m4 \
-file://gas.patch;patch=1 \
-file://m4.diff;patch=1"
-PR = "r1"
-
-inherit autotools
-
-do_configure_prepend() {
-
-cp ${WORKDIR}/config.m4 ${S}/gas/
-
-}
-
-
-do_stage() {
-
-#	oe_libinstall  -a  -C .libs libbeecrypt  ${STAGING_LIBDIR}
-	cp .libs/libbeecrypt.a ${STAGING_LIBDIR}/
-	install -d ${STAGING_INCDIR}/
-	install -d ${STAGING_INCDIR}/beecrypt
-	for X in beecrypt.h beecrypt.api.h memchunk.h mpnumber.h beecrypt.gnu.h mp.h mpopt.h blockmode.h endianness.h
-	do
-		install -m 0644 ${X} ${STAGING_INCDIR}/beecrypt/${X}
-	done
-
-}
diff --git a/packages/portabase/metakit_2.4.9.3.bb b/packages/portabase/metakit_2.4.9.3.bb
index 43794f3e6f..404dfcfe1e 100644
--- a/packages/portabase/metakit_2.4.9.3.bb
+++ b/packages/portabase/metakit_2.4.9.3.bb
@@ -8,13 +8,16 @@ HOMEPAGE = "http://www.equi4.com/metakit.html"
 
 SRC_URI = "http://www.equi4.com/pub/mk/metakit-${PV}.tar.gz \
 	   file://metakit-2.4.9.3.patch;patch=1"
-PR = "r2"
+PR = "r3"
+
+FILES_${PN} += " ${libdir}/*.so"
 
 do_configure_prepend() {
 
 #	cp ${STAGING_DATADIR}/libtool/*.* ${S}/unix/scripts/
 
 }
+
 do_configure () {
 
 	cd builds
@@ -41,10 +44,8 @@ do_configure () {
 
 }
 
-
 do_stage() {
-#	oe_libinstall  -a  -C builds/.libs libmk4  ${STAGING_LIBDIR}
-	cp builds/.libs/libmk4.a ${STAGING_LIBDIR}
+	oe_libinstall -a -so -C builds/.libs libmk4 ${STAGING_LIBDIR}
 	install -d ${STAGING_INCDIR}/
 	for X in mk4.h mk4.inl
 	do
@@ -53,14 +54,12 @@ do_stage() {
 
 }
 
-
-
 do_compile () {
 	cd builds
 	oe_runmake
 }
 
 do_install() {
-
-	:
+	oe_libinstall -so -C builds/.libs libmk4 ${D}${libdir}
 }
+
diff --git a/packages/python/python-native_2.5.1.bb b/packages/python/python-native_2.5.1.bb
index d43cb520cb..be8fc35a5a 100644
--- a/packages/python/python-native_2.5.1.bb
+++ b/packages/python/python-native_2.5.1.bb
@@ -26,8 +26,8 @@ exec_prefix = "${STAGING_DIR_NATIVE}/${layout_exec_prefix}"
 
 EXTRA_OECONF = "--with-threads --with-pymalloc --with-cyclic-gc \
                 --without-cxx --with-signal-module --with-wctype-functions"
-EXTRA_OEMAKE = 'BUILD_SYS="" HOST_SYS="" STAGING_LIBDIR=${STAGING_LIBDIR} \
-		STAGING_INCDIR=${STAGING_INCDIR}'
+EXTRA_OEMAKE = 'BUILD_SYS="" HOST_SYS="" STAGING_LIBDIR=${STAGING_LIBDIR_NATIVE} \
+		STAGING_INCDIR=${STAGING_INCDIR_NATIVE}'
 
 do_stage_append() {
 	install -m 0755 Parser/pgen ${STAGING_BINDIR_NATIVE}/
diff --git a/packages/swt/files/Makefile b/packages/swt/files/Makefile
index 2eb3557cdd..4835f1410d 100644
--- a/packages/swt/files/Makefile
+++ b/packages/swt/files/Makefile
@@ -5,8 +5,8 @@ CLEANFILES=*.files *.jar *.so* *-stamp
 RELEASE=OE_SWT_RELEASE
 SONAME_VERSION=OE_SWT_API_VERSION
 
-GCJ=gcj
-JAR=gjar
+GCJ=false
+JAR=fastjar
 JAVAC=javac -classpath .
 LDCONFIG=/sbin/ldconfig
 LN_S=ln -s
diff --git a/packages/swt/files/swt-hildon.patch b/packages/swt/files/swt-hildon.patch
index 5f095e08fc..90ceb1ee0e 100644
--- a/packages/swt/files/swt-hildon.patch
+++ b/packages/swt/files/swt-hildon.patch
@@ -1,7 +1,7 @@
-Index: swt/swt-source/make_linux.mak
+Index: swt-source/make_linux.mak
 ===================================================================
---- swt.orig/swt-source/make_linux.mak	2007-06-20 12:01:22.000000000 +0200
-+++ swt/swt-source/make_linux.mak	2008-02-14 11:32:49.000000000 +0100
+--- swt-source.orig/make_linux.mak	2007-06-20 12:01:22.000000000 +0200
++++ swt-source/make_linux.mak	2008-10-08 01:36:56.000000000 +0200
 @@ -45,8 +45,8 @@
  CAIROLIBS = `pkg-config --libs-only-L cairo` -lcairo
  
@@ -31,10 +31,10 @@ Index: swt/swt-source/make_linux.mak
  		-fPIC \
  		${SWT_PTR_CFLAGS}
  LIBS = -shared -fPIC
-Index: swt/swt-source/os.c
+Index: swt-source/os.c
 ===================================================================
---- swt.orig/swt-source/os.c	2007-10-30 16:24:28.000000000 +0100
-+++ swt/swt-source/os.c	2008-02-14 09:32:49.000000000 +0100
+--- swt-source.orig/os.c	2008-06-05 13:31:52.000000000 +0200
++++ swt-source/os.c	2008-10-08 01:36:56.000000000 +0200
 @@ -17,6 +17,9 @@
  #include "os_structs.h"
  #include "os_stats.h"
@@ -45,7 +45,7 @@ Index: swt/swt-source/os.c
  #define OS_NATIVE(func) Java_org_eclipse_swt_internal_gtk_OS_##func
  
  #ifndef NO_Call
-@@ -7015,9 +7018,18 @@
+@@ -7133,9 +7136,18 @@
  JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1container_1add)
  	(JNIEnv *env, jclass that, jint arg0, jint arg1)
  {
@@ -66,7 +66,7 @@ Index: swt/swt-source/os.c
  }
  #endif
  
-@@ -9121,9 +9133,12 @@
+@@ -9375,9 +9387,12 @@
  JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1menu_1bar_1new)
  	(JNIEnv *env, jclass that)
  {
@@ -80,7 +80,7 @@ Index: swt/swt-source/os.c
  	OS_NATIVE_EXIT(env, that, _1gtk_1menu_1bar_1new_FUNC);
  	return rc;
  }
-@@ -15464,8 +15479,23 @@
+@@ -15849,8 +15864,23 @@
  	(JNIEnv *env, jclass that, jint arg0)
  {
  	jint rc = 0;
@@ -105,11 +105,11 @@ Index: swt/swt-source/os.c
  	OS_NATIVE_EXIT(env, that, _1gtk_1window_1new_FUNC);
  	return rc;
  }
-Index: swt/swt-source/org/eclipse/swt/widgets/Menu.java
+Index: swt-source/org/eclipse/swt/widgets/Menu.java
 ===================================================================
---- swt.orig/swt-source/org/eclipse/swt/widgets/Menu.java	2007-05-31 18:03:50.000000000 +0200
-+++ swt/swt-source/org/eclipse/swt/widgets/Menu.java	2008-02-14 09:05:04.000000000 +0100
-@@ -259,9 +259,17 @@
+--- swt-source.orig/org/eclipse/swt/widgets/Menu.java	2008-06-05 13:31:08.000000000 +0200
++++ swt-source/org/eclipse/swt/widgets/Menu.java	2008-10-08 01:36:56.000000000 +0200
+@@ -287,9 +287,17 @@
  	if ((style & SWT.BAR) != 0) {
  		handle = OS.gtk_menu_bar_new ();
  		if (handle == 0) error (SWT.ERROR_NO_HANDLES);
@@ -127,11 +127,11 @@ Index: swt/swt-source/org/eclipse/swt/widgets/Menu.java
  	} else {
  		handle = OS.gtk_menu_new ();
  		if (handle == 0) error (SWT.ERROR_NO_HANDLES);
-Index: swt/swt-source/org/eclipse/swt/internal/gtk/OS.java
+Index: swt-source/org/eclipse/swt/internal/gtk/OS.java
 ===================================================================
---- swt.orig/swt-source/org/eclipse/swt/internal/gtk/OS.java	2007-10-30 16:06:36.000000000 +0100
-+++ swt/swt-source/org/eclipse/swt/internal/gtk/OS.java	2008-02-14 09:05:04.000000000 +0100
-@@ -471,6 +471,11 @@
+--- swt-source.orig/org/eclipse/swt/internal/gtk/OS.java	2008-06-05 13:32:08.000000000 +0200
++++ swt-source/org/eclipse/swt/internal/gtk/OS.java	2008-10-08 01:36:56.000000000 +0200
+@@ -473,6 +473,11 @@
  	public static final byte[] window_state_event = ascii("window-state-event");
  	
  	/** Properties */
@@ -143,11 +143,11 @@ Index: swt/swt-source/org/eclipse/swt/internal/gtk/OS.java
  	public static final byte[] active = ascii("active");
  	public static final byte[] background_gdk = ascii("background-gdk");
  	public static final byte[] button_relief = ascii("button-relief");
-Index: swt/swt-source/org/eclipse/swt/widgets/Shell.java
+Index: swt-source/org/eclipse/swt/widgets/Shell.java
 ===================================================================
---- swt.orig/swt-source/org/eclipse/swt/widgets/Shell.java	2007-11-01 11:31:12.000000000 +0100
-+++ swt/swt-source/org/eclipse/swt/widgets/Shell.java	2008-02-14 10:51:37.000000000 +0100
-@@ -1028,6 +1028,14 @@
+--- swt-source.orig/org/eclipse/swt/widgets/Shell.java	2008-06-05 13:31:10.000000000 +0200
++++ swt-source/org/eclipse/swt/widgets/Shell.java	2008-10-08 01:36:56.000000000 +0200
+@@ -1067,6 +1067,14 @@
  int /*long*/ gtk_size_allocate (int /*long*/ widget, int /*long*/ allocation) {
  	int width = OS.GTK_WIDGET_WIDTH (shellHandle);
  	int height = OS.GTK_WIDGET_HEIGHT (shellHandle);
@@ -162,7 +162,7 @@ Index: swt/swt-source/org/eclipse/swt/widgets/Shell.java
  	if (!resized || oldWidth != width || oldHeight != height) {
  		oldWidth = width;
  		oldHeight = height;
-@@ -1384,14 +1392,53 @@
+@@ -1472,14 +1480,53 @@
  	if ((state & FOREIGN_HANDLE) != 0) return;
  	Monitor monitor = getMonitor ();
  	Rectangle rect = monitor.getClientArea ();
@@ -216,10 +216,10 @@ Index: swt/swt-source/org/eclipse/swt/widgets/Shell.java
  public void setMaximized (boolean maximized) {
  	checkWidget();
  	super.setMaximized (maximized);
-Index: swt/swt-source/os_custom.c
+Index: swt-source/os_custom.c
 ===================================================================
---- swt.orig/swt-source/os_custom.c	2007-05-31 18:04:22.000000000 +0200
-+++ swt/swt-source/os_custom.c	2008-02-14 13:55:49.000000000 +0100
+--- swt-source.orig/os_custom.c	2008-06-05 13:31:50.000000000 +0200
++++ swt-source/os_custom.c	2008-10-08 01:36:56.000000000 +0200
 @@ -13,6 +13,8 @@
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
diff --git a/packages/swt/swt-gtk.inc b/packages/swt/swt-gtk.inc
index 0bdaaab932..a5e62b7155 100644
--- a/packages/swt/swt-gtk.inc
+++ b/packages/swt/swt-gtk.inc
@@ -3,7 +3,7 @@ LICENSE = "CPL MPL LGPL"
 
 inherit java-library
 
-DEPENDS = "classpath-tools-native cairo gtk+ atk libxtst"
+DEPENDS = "fastjar-native cairo gtk+ atk libxtst"
 
 S = "${WORKDIR}/swt-source"
 
diff --git a/packages/swt/swt3.4-gtk-hildon_3.3+3.4M5.bb b/packages/swt/swt3.4-gtk-hildon_3.3+3.4M5.bb
deleted file mode 100644
index 9a74844f59..0000000000
--- a/packages/swt/swt3.4-gtk-hildon_3.3+3.4M5.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require swt3.4-gtk_${PV}.bb
-
-PR = "r1"
-
-DEPENDS += "libhildon libhildonfm"
-
-SRC_URI += "file://swt-hildon.patch;patch=1;pnum=2"
diff --git a/packages/swt/swt3.4-gtk-hildon_3.3+3.4M3.bb b/packages/swt/swt3.4-gtk-hildon_3.4.bb
index 7033d0c854..667e516fa0 100644
--- a/packages/swt/swt3.4-gtk-hildon_3.3+3.4M3.bb
+++ b/packages/swt/swt3.4-gtk-hildon_3.4.bb
@@ -1,7 +1,7 @@
 require swt3.4-gtk_${PV}.bb
 
-PR = "r3"
+PR = "r0"
 
 DEPENDS += "libhildon libhildonfm"
 
-SRC_URI += "file://swt-hildon.patch;patch=1;pnum=2"
+SRC_URI += "file://swt-hildon.patch;patch=1"
diff --git a/packages/swt/swt3.4-gtk_3.3+3.4M3.bb b/packages/swt/swt3.4-gtk_3.3+3.4M3.bb
deleted file mode 100644
index eda136b329..0000000000
--- a/packages/swt/swt3.4-gtk_3.3+3.4M3.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-require swt-gtk.inc
-
-PR = "r1"
-
-SRC_URI = "http://ftp.wh2.tu-dresden.de/pub/mirrors/eclipse/eclipse/downloads/drops/S-3.4M3-200711012000/swt-3.4M3-gtk-linux-x86.zip \
-           file://Makefile \
-	   file://make_linux-fix.patch;patch=1"
-
-# A number which is used by SWT to mark the shared libraries.
-SWTVERSION = "3416"
-SWT_API_VERSION = "3.4"
-
-PROVIDES = "swt3.4-gtk"
-
-RCONFLICTS = "libswt3.3-gtk-java"
diff --git a/packages/swt/swt3.4-gtk_3.3+3.4M5.bb b/packages/swt/swt3.4-gtk_3.4.bb
index 4cdd7c0f94..b6eafcad8c 100644
--- a/packages/swt/swt3.4-gtk_3.3+3.4M5.bb
+++ b/packages/swt/swt3.4-gtk_3.4.bb
@@ -1,12 +1,12 @@
 require swt-gtk.inc
 
-PR = "r1"
+PR = "r0"
 
-SRC_URI = "http://ftp.wh2.tu-dresden.de/pub/mirrors/eclipse/eclipse/downloads/drops/S-3.4M5-200802071530/swt-3.4M5-gtk-linux-x86.zip \
+SRC_URI = "http://ftp.wh2.tu-dresden.de/pub/mirrors/eclipse/eclipse/downloads/drops/R-3.4-200806172000/swt-3.4-gtk-linux-x86.zip \
            file://Makefile"
 
 # A number which is used by SWT to mark the shared libraries.
-SWTVERSION = "3428"
+SWTVERSION = "3448"
 SWT_API_VERSION = "3.4"
 
 PROVIDES = "swt3.4-gtk"
diff --git a/packages/totem/totem-pl-parser_2.24.1.bb b/packages/totem/totem-pl-parser_2.24.1.bb
new file mode 100644
index 0000000000..7f3cd861e9
--- /dev/null
+++ b/packages/totem/totem-pl-parser_2.24.1.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = "Playlist parser for Totem, a GTK2 based media player"
+HOMEPAGE = "http://www.gnome.org/projects/totem/"
+LICENSE = "GPL"
+
+DEPENDS = "eds-dbus"
+
+inherit gnome
+
+AUTOTOOLS_STAGE_PKGCONFIG = "1"
+
+do_stage() {
+        autotools_stage_all
+}
+
+
diff --git a/packages/totem/totem_2.24.2.bb b/packages/totem/totem_2.24.2.bb
new file mode 100644
index 0000000000..a0de5705cf
--- /dev/null
+++ b/packages/totem/totem_2.24.2.bb
@@ -0,0 +1,70 @@
+# totem OE build file
+# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
+
+DESCRIPTION = "A GTK2 based media player"
+HOMEPAGE = "http://www.gnome.org/projects/totem/"
+LICENSE = "GPL"
+
+DEPENDS = " totem-pl-parser gtk+ dbus bluez-libs libglade gconf libxml2 gst-ffmpeg gst-plugins-bad  gst-plugins-base" 
+RDEPENDS_${PN} += "iso-codes"
+RRECOMMENDS_${PN} += "gst-plugin-playbin \
+                      gst-plugin-gconfelements \
+		      gst-plugin-decodebin \
+		      gst-plugin-decodebin2 \
+		      gst-ffmpeg \
+		      gst-plugin-audioresample \
+		      gst-plugin-ximagesink \
+		      gst-plugin-xvimagesink \
+		      gst-plugin-alsa \
+		      gst-plugin-avi \
+		      gst-plugin-ffmpegcolorspace \
+		      gst-plugin-flvdemux \
+		      gst-plugin-nuvdemux \
+		      gst-plugin-videoscale \
+		      gst-plugin-a52dec \
+		      gst-plugin-mpegaudioparse \
+		      gst-plugin-ossaudio \
+		      gst-plugin-pulse \
+		      gst-plugin-autodetect \
+		      "
+
+inherit gnome
+
+SRC_URI += "file://gst-detect.diff;patch=1"
+
+EXTRA_OECONF=" --disable-schemas-install \
+               --enable-gtk \
+	       --disable-iso-codes \
+	       --disable-debug \
+               --enable-gstreamer \
+               --enable-browser-plugins \
+	       --disable-run-in-source-tree \
+	       --disable-python \
+	       --disable-vala \
+	       --with-dbus \
+	       "
+
+do_configure_prepend() {
+	sed -i -e s:help::g ${S}/Makefile.am
+}
+
+PACKAGES += "totem-plugin-bemused totem-plugin-gromit totem-plugin-lirc totem-plugin-media-player-keys totem-plugin-mythtv totem-plugin-ontop totem-plugin-properties totem-plugin-screensaver totem-plugin-skipto totem-plugin-thumbnail totem-plugin-youtube totem-browser-plugin-dbg totem-browser-plugin"
+
+FILES_totem-plugin-bemused += "${libdir}/totem/plugins/bemused/*"
+FILES_totem-plugin-gromit += "${libdir}/totem/plugins/gromit/*"
+FILES_totem-plugin-lirc += "${libdir}/totem/plugins/lirc/*"
+FILES_totem-plugin-media-player-keys += "${libdir}/totem/plugins/media-player-keys/*"
+FILES_totem-plugin-mythtv += "${libdir}/totem/plugins/mythtv/*"
+FILES_totem-plugin-ontop += "${libdir}/totem/plugins/ontop/*"
+FILES_totem-plugin-properties += "${libdir}/totem/plugins/properties/*"
+FILES_totem-plugin-screensaver += "${libdir}/totem/plugins/screensaver/*"
+FILES_totem-plugin-skipto += "${libdir}/totem/plugins/skipto/*"
+FILES_totem-plugin-thumbnail += "${libdir}/totem/plugins/thumbnail/*"
+FILES_totem-plugin-youtube += "${libdir}/totem/plugins/youtube/*"
+
+FILES_${PN} = "${bindir}/* ${sysconfdir} ${libdir}/lib*.so.* ${libexecdir} ${datadir}/icons ${datadir}/totem ${datadir}/applications"
+FILES_${PN}-dbg += "${libdir}/totem/plugins/*/.debug"
+FILES_${PN}-dev += "${libdir}/totem/plugins/*/*a"
+FILES_totem-browser-plugin-dbg += "${libdir}/mozilla/plugins/.debug"
+FILES_totem-browser-plugin += "${libdir}/mozilla/plugins/"
diff --git a/packages/ttf-fonts/ttf-liberation_0.2.bb b/packages/ttf-fonts/ttf-liberation_0.2.bb
index 95e33daff3..c9737152da 100644
--- a/packages/ttf-fonts/ttf-liberation_0.2.bb
+++ b/packages/ttf-fonts/ttf-liberation_0.2.bb
@@ -5,7 +5,7 @@ HOMEPAGE = "https://www.redhat.com/promo/fonts/"
 LICENSE = "Liberation"
 PR = "r3"
 
-SRC_URI = "http://www.redhat.com/f/fonts/liberation-fonts-ttf-3.tar.gz"
+SRC_URI = "http://fedorahosted.org/liberation-fonts/export/807b6dfd069b998cd9b4d3158da98817ef23c79d/F-9/liberation-fonts-ttf-3.tar.gz"
 S = "${WORKDIR}/liberation-fonts-${PV}"
 
 PACKAGES = "${PN}-dbg ttf-liberation-mono ttf-liberation-sans ttf-liberation-serif"
diff --git a/packages/xorg-driver/xf86-video-omapfb_git.bb b/packages/xorg-driver/xf86-video-omapfb_git.bb
index b222ef8fef..9a6e4d382a 100644
--- a/packages/xorg-driver/xf86-video-omapfb_git.bb
+++ b/packages/xorg-driver/xf86-video-omapfb_git.bb
@@ -2,9 +2,9 @@ require xorg-driver-video.inc
 
 DESCRIPTION = "X.Org X server -- OMAP display driver"
 
-PR ="r3"
+PR ="r4"
 
-SRCREV = "afb03099adc621fa7857a9bf26342d6380cbc2eb"
+SRCREV = "fc5958ba70ad76aadcf2993d7713ee13fe262b33"
 PV = "0.0.1+${PR}+git${SRCREV}"
 
 SRC_URI = "git://git.pingu.fi/xf86-video-omapfb.git;protocol=http"