merge of '4b614ea9dfb14d8f67ed00b35c59a2f23b49e2da'

     and '9a0857ebdef17f18989f0702e43595ce522a7a24'

56 files changed, 1128 insertions, 508 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/boost/boost-jam-native_3.1.16.bb b/packages/boost/boost-jam-native_3.1.16.bb
index 955f7bfac8..2e92146a83 100644
--- a/packages/boost/boost-jam-native_3.1.16.bb
+++ b/packages/boost/boost-jam-native_3.1.16.bb
@@ -1,6 +1,4 @@
 include boost-jam-native.inc
 
-DEFAULT_PREFERENCE = "-1"
-
 SRC_URI = "${SOURCEFORGE_MIRROR}/boost/boost-jam-${PV}.tgz"
 
diff --git a/packages/classpath/classpath-native_0.97.2.bb b/packages/classpath/classpath-native_0.97.2.bb
index 3046ff44c1..81ffad3b14 100644
--- a/packages/classpath/classpath-native_0.97.2.bb
+++ b/packages/classpath/classpath-native_0.97.2.bb
@@ -21,7 +21,7 @@ do_unpackpost() {
 	mv external/w3c_dom/org/w3c/dom/html2 \
 			external/w3c_dom/org/w3c/dom/html
 
-	find gnu/classpath/examples/html gnu/xml/dom/html2 external/w3c_dom/org/w3c/dom/html -name "*.java" \
+	find examples/gnu/classpath/examples/html gnu/xml/dom/html2 external/w3c_dom/org/w3c/dom/html -name "*.java" \
 		-exec sed -i -e"s|org.w3c.dom.html2|org.w3c.dom.html|" {} \;
 
 	sed -i -e"s|org/w3c/dom/html2|org/w3c/dom/html|" external/w3c_dom/Makefile.am
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/portabase/beecrypt/.mtn2git_empty b/packages/e2fsprogs-libs/e2fsprogs-libs-1.41.2/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/portabase/beecrypt/.mtn2git_empty
+++ b/packages/e2fsprogs-libs/e2fsprogs-libs-1.41.2/.mtn2git_empty
diff --git a/packages/e2fsprogs-libs/e2fsprogs-libs-1.41.2/mkinstalldirs.patch b/packages/e2fsprogs-libs/e2fsprogs-libs-1.41.2/mkinstalldirs.patch
new file mode 100644
index 0000000000..29edaeb93c
--- /dev/null
+++ b/packages/e2fsprogs-libs/e2fsprogs-libs-1.41.2/mkinstalldirs.patch
@@ -0,0 +1,13 @@
+Index: e2fsprogs-libs-1.41.2/MCONFIG.in
+===================================================================
+--- e2fsprogs-libs-1.41.2.orig/MCONFIG.in	2008-09-12 15:28:13.000000000 +0200
++++ e2fsprogs-libs-1.41.2/MCONFIG.in	2008-10-08 01:01:49.539806918 +0200
+@@ -64,7 +64,7 @@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+-MKINSTALLDIRS = @MKINSTALLDIRS@
++MKINSTALLDIRS = @MKDIR_P@
+ 
+ #
+ # Library definitions
diff --git a/packages/e2fsprogs-libs/e2fsprogs-libs_1.41.2.bb b/packages/e2fsprogs-libs/e2fsprogs-libs_1.41.2.bb
new file mode 100644
index 0000000000..87bc2d7e6a
--- /dev/null
+++ b/packages/e2fsprogs-libs/e2fsprogs-libs_1.41.2.bb
@@ -0,0 +1,14 @@
+require e2fsprogs-libs.inc
+
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-libs-${PV}.tar.gz \
+	   file://mkinstalldirs.patch;patch=1 \
+	  "
+
+EXTRA_OECONF=" --enable-elf-shlibs "
+
+do_compile_prepend () {
+	find ./ -print|xargs chmod u=rwX
+	( cd util; ${BUILD_CC} subst.c -o subst )
+}
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/gettext/gettext-native_0.17.bb b/packages/gettext/gettext-native_0.17.bb
index c6daf7b782..5d44db5a62 100644
--- a/packages/gettext/gettext-native_0.17.bb
+++ b/packages/gettext/gettext-native_0.17.bb
@@ -1,4 +1,5 @@
 require gettext_${PV}.bb
+PR = "r2"
 
 DEPENDS = ""
 PROVIDES = ""
@@ -56,4 +57,11 @@ do_stage_append() {
 		fi
 		install -m 0644 $src ${STAGING_DATADIR}/aclocal/$i
 	done
+
+	# config.rpath is needed by some configure macros and needs to be autoinstalled.
+        # automake will do this but config.rpath needs to be visible to automake
+        for i in `ls -d ${STAGING_DATADIR}/automake*`
+        do
+                cp ${STAGING_DATADIR}/gettext/config.rpath $i
+        done
 }
diff --git a/packages/gettext/gettext_0.17.bb b/packages/gettext/gettext_0.17.bb
index 7beaee1294..3dac87a09b 100644
--- a/packages/gettext/gettext_0.17.bb
+++ b/packages/gettext/gettext_0.17.bb
@@ -3,7 +3,6 @@ HOMEPAGE = "http://www.gnu.org/software/gettext/gettext.html"
 SECTION = "libs"
 LICENSE = "GPL"
 PR = "r1"
-DEFAULT_PREFERENCE = "-1"
 DEPENDS = "gettext-native virtual/libiconv ncurses expat"
 PROVIDES = "virtual/libintl"
 
diff --git a/packages/gnuradio/gnuradio.inc b/packages/gnuradio/gnuradio.inc
index 9cb936a105..a084b1cae0 100644
--- a/packages/gnuradio/gnuradio.inc
+++ b/packages/gnuradio/gnuradio.inc
@@ -2,7 +2,7 @@ DESCRIPTION = "GNU Radio"
 SECTION =  "apps"
 PRIORITY = "optional"
 LICENSE = "GPL"
-DEPENDS = " guile-native fftwf python libusb-compat virtual/libsdl alsa-lib jack boost cppunit sdcc-native swig-native"
+DEPENDS = " guile-native fftwf python libusb virtual/libsdl alsa-lib jack boost cppunit sdcc-native swig-native"
 
 RDEPENDS_${PN} = "python-core python-audio python-threading python-codecs python-lang python-textutils"
 RDEPENDS_gnuradio-usrp = "python-core"
@@ -22,6 +22,7 @@ EXTRA_OECONF = " \
                 --enable-gr-audio-oss \
                 --enable-mblock \
 	        --disable-html-docs \
+                PYTHON_CPPFLAGS=-I${STAGING_INCDIR}/python2.5 \
 		"
 
 do_configure_append() {
@@ -55,7 +56,7 @@ FILES_${PN}-dbg += "${libdir}/python*/site-packages/gnuradio/.debug \
 		   "
 
 FILES_gnuradio-usrp = "${libdir}/python*/site-packages/usrpm/* \
-                       ${datadir}/usrp"
+                       ${datadir}/usrp/*/*"
 FILES_gnuradio-usrp-dbg = "${libdir}/python*/site-packages/usrpm/.debug"
 
 
diff --git a/packages/gnuradio/gnuradio/no-usrp2.patch b/packages/gnuradio/gnuradio/no-usrp2.patch
new file mode 100644
index 0000000000..fc9e2a736f
--- /dev/null
+++ b/packages/gnuradio/gnuradio/no-usrp2.patch
@@ -0,0 +1,12 @@
+--- gnuradio-trunk-work/configure.ac.orig	2008-10-06 13:38:45.000000000 -0400
++++ gnuradio-trunk-work/configure.ac	2008-10-06 13:39:02.000000000 -0400
+@@ -272,9 +272,7 @@
+ GRC_PMT
+ GRC_MBLOCK			dnl this must come after GRC_PMT
+ GRC_USRP
+-GRC_USRP2
+ GRC_GR_USRP			dnl this must come after GRC_USRP
+-GRC_GR_USRP2
+ GRC_GR_GCELL			dnl this must come after GRC_GCELL and GRC_GNURADIO_CORE
+ GRC_GR_MSDD6000	
+ GRC_GR_AUDIO_ALSA
diff --git a/packages/gnuradio/gnuradio_svn.bb b/packages/gnuradio/gnuradio_svn.bb
index f72cf2fb9a..3d4f12aa7d 100644
--- a/packages/gnuradio/gnuradio_svn.bb
+++ b/packages/gnuradio/gnuradio_svn.bb
@@ -2,13 +2,27 @@ require gnuradio.inc
 
 DEFAULT_PREFERENCE = "-1"
 
-PV = "3.0.4+svnr${SRCREV}"
+PV = "3.1.3+svnr${SRCREV}"
 PR = "r4"
 
-SRC_URI = "svn://gnuradio.org/svn/gnuradio;module=trunk;proto=http \
-	   file://no-trellis-doc.patch;patch=1 \
+EXTRA_OECONF += "--with-boost=${STAGING_DIR_TARGET}/usr CXXFLAGS=-DBOOST_SP_USE_PTHREADS --disable-usrp1 --disable--usrp2"
+
+SRC_URI = "svn://gnuradio.org/svn/gnuradio/;module=trunk;proto=http \
+    file://no-usrp2.patch;patch=1 \
+#   file://no-trellis-doc.patch;patch=1 \
+#           file://gnuradio-neon.patch;patch=1;pnum=0 \
 	   "
 
 S="${WORKDIR}/trunk"
 
+#do_configure() {
+#        ./bootstrap
+#        oe_runconf
+#}
+
+do_compile_append() {
+        sed -i -e s:${STAGING_DIR_TARGET}::g \
+               -e s:/${TARGET_SYS}::g \
+                  gnuradio-core/gnuradio-core.pc
+}
 
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/initscripts/initscripts-1.0/volatiles b/packages/initscripts/initscripts-1.0/volatiles
index b2ae2794dc..fbcc858226 100644
--- a/packages/initscripts/initscripts-1.0/volatiles
+++ b/packages/initscripts/initscripts-1.0/volatiles
@@ -33,6 +33,7 @@ l root root 0755 /var/run /var/volatile/run
 l root root 1777 /var/tmp /var/volatile/tmp
 d root root 0755 /var/lock/subsys none
 f root root 0664 /var/log/wtmp none
+f root root 0644 /var/log/lastlog none
 f root root 0664 /var/run/utmp none
 l root root 0644 /etc/resolv.conf /var/run/resolv.conf
 f root root 0644 /var/run/resolv.conf none
diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb
index 2ed20952f1..b1c43174e8 100644
--- a/packages/initscripts/initscripts_1.0.bb
+++ b/packages/initscripts/initscripts_1.0.bb
@@ -4,7 +4,7 @@ PRIORITY = "required"
 DEPENDS = "makedevs"
 RDEPENDS = "makedevs"
 LICENSE = "GPL"
-PR = "r108"
+PR = "r109"
 
 SRC_URI = "file://functions \
            file://halt \
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
+++