merge of '061e46a6247ee375f1eb975b1700e93e10652cb9'

     and 'a8b3738fe9d7578507efdb8edd971c36ca53b159'

20 files changed, 182 insertions, 63 deletions

diff --git a/conf/distro/include/fso-autorev.inc b/conf/distro/include/fso-autorev.inc
index 7fa8cedaac..3c7778fac7 100644
--- a/conf/distro/include/fso-autorev.inc
+++ b/conf/distro/include/fso-autorev.inc
@@ -1,15 +1,10 @@
 SRCREV_pn-frameworkd = "${AUTOREV}"
+SRCREV_pn-fso-sounds = "${AUTOREV}"
 SRCREV_pn-gsm0710muxd = "${AUTOREV}"
 SRCREV_pn-gsmd2 = "${AUTOREV}"
+SRCREV_pn-illume = ${AUTOREV}"
 SRCREV_pn-illume-theme-freesmartphone = "${AUTOREV}"
-SRCREV_pn-pygsm = "${AUTOREV}"
 SRCREV_pn-mickeydbus = "${AUTOREV}"
 SRCREV_pn-mickeyterm = "${AUTOREV}"
-SRCREV_pn-pyneod = "${AUTOREV}"
-SRCREV_pn-pynoeg = "${AUTOREV}"
-SRCREV_pn-python-odeviced = "${AUTOREV}"
-SRCREV_pn-python-oeventd = "${AUTOREV}"
-SRCREV_pn-python-ophoned = "${AUTOREV}"
-SRCREV_pn-python-ousaged = "${AUTOREV}"
 SRCREV_pn-python-pytrc = "${AUTOREV}"
 SRCREV_pn-zhone = "${AUTOREV}"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index f136c638f4..eab831c2eb 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -53,7 +53,6 @@ SRCREV_pn-gsmd2 ?= "963f34df8fa3ff4b301079dcf86e9acea6b6fe0f"
 SRCREV_pn-gtkhtml2 ?= "1158"
 SRCREV_pn-gypsy ?= "134"
 SRCREV_pn-hildon-1 ?= "14429"
-SRCREV_pn-illume ?= "35605"
 SRCREV_pn-illume-theme-asu ?= "170"
 SRCREV_pn-illume-theme-freesmartphone ?= "fcadedec08294c5eebd176483695828959a76e0b"
 SRCREV_pn-kismet ?= "2285"
@@ -192,7 +191,7 @@ SRCREV_pn-zhone ?= "69e029bd85a1caaad4e5d61087836a8e1ea20dcc"
 # Enlightenment Foundation Libraries
 # Caution: This is not alphabetically, but (roughly) dependency-sorted.
 # Please leave it like that.
-EFL_SRCREV ?= "35592"
+EFL_SRCREV ?= "35727"
 SRCREV_pn-edb-native ?= "${EFL_SRCREV}"
 SRCREV_pn-edb ?= "${EFL_SRCREV}"
 SRCREV_pn-eet-native ?= "${EFL_SRCREV}"
diff --git a/packages/nonworking/clucene/.mtn2git_empty b/packages/clucene/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/nonworking/clucene/.mtn2git_empty
+++ b/packages/clucene/.mtn2git_empty
diff --git a/packages/clucene/clucene-core_0.9.21.bb b/packages/clucene/clucene-core_0.9.21.bb
new file mode 100644
index 0000000000..0416f9110e
--- /dev/null
+++ b/packages/clucene/clucene-core_0.9.21.bb
@@ -0,0 +1,23 @@
+DESCRIPTION = "CLucene is a C++ port of Lucene: the high-performance, full-featured text search engine written in Java."
+SECTION = "libs"
+LICENSE = "LGPL"
+
+DEPENDS = "libtool"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/clucene/clucene-core-${PV}.tar.bz2"
+
+inherit autotools
+
+EXTRA_OECONF = "--disable-multithreading dps_static_const_type=2"
+
+do_configure() {
+	gnu-configize
+	cp ${STAGING_DATADIR}/libtool/config.sub ${S}/config
+	oe_runconf
+}
+
+do_stage() {
+	autotools_stage_all
+}
+
+FILES_${PN}-dev += "${libdir}/CLucene"
diff --git a/packages/e17/e-wm_svn.bb b/packages/e17/e-wm_svn.bb
index 7c3e950569..5850183b89 100644
--- a/packages/e17/e-wm_svn.bb
+++ b/packages/e17/e-wm_svn.bb
@@ -6,6 +6,8 @@ PR = "r11"
 
 inherit e update-alternatives
 
+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 \
@@ -16,6 +18,7 @@ S = "${WORKDIR}/e"
 
 EXTRA_OECONF = "\
   --with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc \
+  --with-eet-eet=${STAGING_BINDIR_NATIVE}/eet \
   --x-includes=${STAGING_INCDIR}/X11 \
   --x-libraries=${STAGING_LIBDIR} \
   --enable-simple-x11 \
@@ -43,8 +46,6 @@ do_install_append() {
     install -m 644 ${WORKDIR}/applications.menu ${D}/${sysconfdir}/xdg/menus/
 }
 
-RDEPENDS += "shared-mime-info mime-support"
-
 FILES_${PN} = "\
   ${bindir}/* \
   ${libdir}/enlightenment/modules/*/*.* \
diff --git a/packages/e17/illume_svn.bb b/packages/e17/illume_svn.bb
index 19bb3958d4..2c1521c813 100644
--- a/packages/e17/illume_svn.bb
+++ b/packages/e17/illume_svn.bb
@@ -20,8 +20,7 @@ EXTRA_OECONF = "\
 "
 
 RRECOMMENDS_${PN} = "\
-  wamerican \
-  ${PN}-config \
+  ${PN}-config-illume \
   ${PN}-theme \
   ${PN}-dicts-english-us \
   ${PN}-keyboards-default \
@@ -30,18 +29,22 @@ RRECOMMENDS_${PN} = "\
 "
 
 PACKAGES =+ "\
-  ${PN}-config \
+  ${PN}-config-illume \
+  ${PN}-config-asu \
   ${PN}-dicts-english-us \
   ${PN}-keyboards-default \
   ${PN}-keyboards-numbers \
   ${PN}-keyboards-terminal \
 "
-PACKAGE_ARCH_${PN}-config = "all"
+PACKAGE_ARCH_${PN}-config-illume = "all"
+PACKAGE_ARCH_${PN}-config-asu = "all"
 PACKAGE_ARCH_${PN}-dicts-english-us = "all"
 PACKAGE_ARCH_${PN}-keyboards-default = "all"
 PACKAGE_ARCH_${PN}-keyboards-numbers = "all"
+PACKAGE_ARCH_${PN}-keyboards-terminal = "all"
 
-FILES_${PN}-config = "${datadir}/enlightenment/data/config/*/* ${datadir}/illume"
+FILES_${PN}-config-illume = "${datadir}/enlightenment/data/config/illume/*"
+FILES_${PN}-config-asu = "${datadir}/enlightenment/data/config/asu/*"
 FILES_${PN}-dicts-english-us = "${libdir}/enlightenment/modules/illume/dicts/English_*.dic"
 FILES_${PN}-keyboards-default = "${libdir}/enlightenment/modules/illume/keyboards/Default.kbd"
 FILES_${PN}-keyboards-numbers = "${libdir}/enlightenment/modules/illume/keyboards/Numbers.kbd"
diff --git a/packages/images/fso-image.bb b/packages/images/fso-image.bb
index d6eaecd9fa..eabe00b0e6 100644
--- a/packages/images/fso-image.bb
+++ b/packages/images/fso-image.bb
@@ -24,6 +24,11 @@ XSERVER ?= "xserver-kdrive-fbdev"
 X_INSTALL = "\
   e-wm \
   illume \
+  illume-config-illume \
+  illume-dicts-english-us \
+  illume-keyboards-default \
+  illume-keyboards-numbers \
+  illume-keyboards-terminal \
   illume-theme-freesmartphone \
   ${XSERVER} \
   xserver-kdrive-common \
@@ -113,6 +118,7 @@ IMAGE_INSTALL = "\
   ${TOOLS_INSTALL} \
   ${PYTHON_INSTALL} \
   ${ZHONE_INSTALL} \
+  tichy \
 "
 
 inherit image
@@ -140,6 +146,8 @@ fso_rootfs_postprocess() {
     # minimal gtk theme foo
     mkdir -p ./etc/gtk-2.0/
     echo 'gtk-font-name = "Sans 5"' >> ./etc/gtk-2.0/gtkrc
+    # fix strange iconv/gconf bug
+    ln -s libc.so.6 ./lib/libc.so
     cd $curdir
 }
 
diff --git a/packages/jpeg/jasper_1.900.1.bb b/packages/jpeg/jasper_1.900.1.bb
new file mode 100644
index 0000000000..a71dd684db
--- /dev/null
+++ b/packages/jpeg/jasper_1.900.1.bb
@@ -0,0 +1,14 @@
+DESCRIPTION = "Jpeg 2000 implementation"
+LICENSE = "MIT"
+
+SRC_URI = "http://www.ece.uvic.ca/~mdadams/jasper/software/jasper-${PV}.zip"
+
+inherit autotools lib_package
+
+EXTRA_OECONF = "--enable-shared"
+
+AUTOTOOLS_STAGE_PKGCONFIG = "1"
+do_stage() {
+        autotools_stage_all
+}
+
diff --git a/packages/nonworking/clucene/clucene-0.8.12-pre/.mtn2git_empty b/packages/kde4/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/nonworking/clucene/clucene-0.8.12-pre/.mtn2git_empty
+++ b/packages/kde4/.mtn2git_empty
diff --git a/packages/kde4/akonadi_1.0.bb b/packages/kde4/akonadi_1.0.bb
new file mode 100644
index 0000000000..2d361bfef2
--- /dev/null
+++ b/packages/kde4/akonadi_1.0.bb
@@ -0,0 +1,9 @@
+require kde4.inc
+
+DEPENDS += "automoc-native"
+
+PV = "1.0"
+SRC_URI = "svn://anonsvn.kde.org/home/kde/branches/akonadi;module=1.0;proto=svn"
+
+S= "${WORKDIR}/1.0"
+
diff --git a/packages/kde4/automoc-native_svn.bb b/packages/kde4/automoc-native_svn.bb
new file mode 100644
index 0000000000..c79e7d1df9
--- /dev/null
+++ b/packages/kde4/automoc-native_svn.bb
@@ -0,0 +1,8 @@
+require kde4.inc
+require kde4-native.inc
+inherit native
+
+SRC_URI = "svn://anonsvn.kde.org/home/kde/trunk/kdesupport;module=automoc;proto=svn"
+
+S = "${WORKDIR}/automoc" 
+
diff --git a/packages/kde4/gmm_3.0.bb b/packages/kde4/gmm_3.0.bb
new file mode 100644
index 0000000000..47cda16506
--- /dev/null
+++ b/packages/kde4/gmm_3.0.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "The Getfem++ project focuses on the development of a generic and efficient C++ library for finite element methods."
+LICENSE = "LGPLv2"
+
+inherit autotools
+
+SRC_URI = "http://download.gna.org/getfem/stable/gmm-3.0.tar.gz"
+
+AUTOTOOLS_STAGE_PKGCONFIG = "1"
+do_stage() {
+        autotools_stage_all
+}
+
diff --git a/packages/kde4/kde4-native.inc b/packages/kde4/kde4-native.inc
new file mode 100644
index 0000000000..247d13704a
--- /dev/null
+++ b/packages/kde4/kde4-native.inc
@@ -0,0 +1,14 @@
+
+# Ugly, use qt4 from the buildhost till someone adds a qt4-native recipe
+
+EXTRA_OECMAKE = "-DQT_LIBRARY_DIR=/usr/lib \
+                 -DQT_INSTALL_LIBS=/usr/lib \
+		 -DQT_INCLUDE_DIR=/usr/include/qt4 \
+		 -DQT_MOC_EXECUTABLE=${OE_QMAKE_MOC} \
+		 -DQT_UIC_EXECUTABLE=${OE_QMAKE_UIC} \
+		 -DQT_UIC3_EXECUTABLE=${OE_QMAKE_UIC3} \
+		 -DQT_RCC_EXECUTABLE=${OE_QMAKE_RCC} \
+		 -DQT_QMAKE_EXECUTABLE=${OE_QMAKE_QMAKE} \
+		 -DQT_QTCORE_INCLUDE_DIR=/usr/include/qt4/QtCore \
+		 "
+
diff --git a/packages/kde4/kde4.inc b/packages/kde4/kde4.inc
new file mode 100644
index 0000000000..a5ea173b5e
--- /dev/null
+++ b/packages/kde4/kde4.inc
@@ -0,0 +1,46 @@
+LICENSE = "GPL"
+
+inherit qt4x11 cmake
+
+PV = "4.1+svnr${SRCREV}"
+SRCREV = "856719"
+SRC_URI = "svn://anonsvn.kde.org/home/kde/branches/KDE/4.1;module=${PN};proto=svn"
+
+# OE lacks some native qt4 tools, so we use the ones form the host :/
+EXTRA_OECMAKE = "-DQT_LIBRARY_DIR=${OE_QMAKE_LIBDIR_QT} \
+                 -DQT_INSTALL_LIBS=${OE_QMAKE_LIBDIR_QT} \
+		 -DQT_INCLUDE_DIR=${OE_QMAKE_INCDIR_QT} \
+		 -DQT_MOC_EXECUTABLE=${OE_QMAKE_MOC} \
+		 -DQT_UIC_EXECUTABLE=${OE_QMAKE_UIC} \
+		 -DQT_UIC3_EXECUTABLE=${OE_QMAKE_UIC3} \
+		 -DQT_RCC_EXECUTABLE=${OE_QMAKE_RCC} \
+		 -DQT_QMAKE_EXECUTABLE=${OE_QMAKE_QMAKE} \
+		 -DQT_QTCORE_INCLUDE_DIR=${OE_QMAKE_INCDIR_QT}/QtCore \ 
+		 -DQT_DBUSXML2CPP_EXECUTABLE=/usr/bin/qdbusxml2cpp \
+		 -DQT_DBUSCPP2XML_EXECUTABLE=/usr/bin/qdbuscpp2xml \
+		"
+
+
+S = "${WORKDIR}/${PN}"
+
+
+do_install_append() {
+	install -d ${D}/${libdir}/qt4
+	mv ${D}/${STAGING_DIR_TARGET}/qt4/plugins* ${D}/${libdir}/qt4 || true
+}
+
+FILES_${PN} += "${libdir}/qt4 \
+                ${datadir}/mime \
+		${datadir}/dbus-1 \
+		${datadir}/config \
+               "
+
+FILES_${PN}-dbg += "${libdir}/qt4/.debug \
+                    ${libdir}/qt4/*/.debug \
+		    ${libdir}/qt4/*/*/.debug"
+
+
+AUTOTOOLS_STAGE_PKGCONFIG = "1"
+do_stage() {
+	autotools_stage_all
+}	
diff --git a/packages/kde4/qca_2.0.0.bb b/packages/kde4/qca_2.0.0.bb
new file mode 100644
index 0000000000..c2e7e3f371
--- /dev/null
+++ b/packages/kde4/qca_2.0.0.bb
@@ -0,0 +1,7 @@
+require kde4.inc
+
+PV = "2.0.0"
+SRC_URI = "svn://anonsvn.kde.org/home/kde/tags/qca;module=2.0.0;proto=svn"
+
+S= "${WORKDIR}/2.0.0"
+
diff --git a/packages/kde4/soprano_2.1.bb b/packages/kde4/soprano_2.1.bb
new file mode 100644
index 0000000000..f2393663c8
--- /dev/null
+++ b/packages/kde4/soprano_2.1.bb
@@ -0,0 +1,9 @@
+require kde4.inc
+
+DEPENDS += "automoc-native clucene-core"
+
+PV = "2.1"
+SRC_URI = "svn://anonsvn.kde.org/home/kde/branches/soprano;module=${PV};proto=svn"
+
+S= "${WORKDIR}/${PV}"
+
diff --git a/packages/kde4/strigi_0.5.10.bb b/packages/kde4/strigi_0.5.10.bb
new file mode 100644
index 0000000000..3dacbfa2f0
--- /dev/null
+++ b/packages/kde4/strigi_0.5.10.bb
@@ -0,0 +1,17 @@
+inherit qt4x11 cmake
+
+DEPENDS += "clucene-core pidgin expat gamin"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/strigi/strigi-${PV}.tar.bz2"
+
+EXTRA_OECMAKE = "-DENABLE_FAM:BOOL=ON \
+                 -DENABLE_EXPAT:BOOL=ON \
+                 -DENABLE_INOTIFY:BOOL=ON \
+                 -DGAMIN_LIBARIES:STRING=${STAGING_LIBDIR} \
+                 -DGAMIN_LIBRARIES:STRING=${STAGING_LIBDIR} \
+		"
+
+FILES_${PN} += "${datadir}/dbus-1 \
+               "
+
+
diff --git a/packages/nonworking/clucene/clucene-0.8.12-pre/compile-fix.patch b/packages/nonworking/clucene/clucene-0.8.12-pre/compile-fix.patch
deleted file mode 100644
index 5f6c8f1911..0000000000
--- a/packages/nonworking/clucene/clucene-0.8.12-pre/compile-fix.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- clucene-0.8.11-r0/src/CLucene/store/Lock.cpp~compile-fix	2004-04-13 15:43:21.000000000 +0200
-+++ clucene-0.8.11-r0/src/CLucene/store/Lock.cpp	2004-07-08 00:21:06.000000000 +0200
-@@ -1,6 +1,6 @@
- #include "CLucene/StdHeader.h"
- #include "Lock.h"
--
-+using namespace std;
- namespace lucene{ namespace store{
- 
- 		LuceneLockWith::~LuceneLockWith(){
---- clucene-0.8.11-r0/Makefile.am~compile-fix	2003-11-04 07:54:04.000000000 +0100
-+++ clucene-0.8.11-r0/Makefile.am	2004-07-08 00:22:43.000000000 +0200
-@@ -2,4 +2,4 @@
- 
- INCLUDES   =  -I$(top_srcdir)
- 
--SUBDIRS = src wrappers examples .
-+SUBDIRS = src wrappers .
diff --git a/packages/nonworking/clucene/clucene_0.8.12-pre.bb b/packages/nonworking/clucene/clucene_0.8.12-pre.bb
deleted file mode 100644
index 2c8122c921..0000000000
--- a/packages/nonworking/clucene/clucene_0.8.12-pre.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-DESCRIPTION = "CLucene is a C++ port of Lucene: the high-performance, full-featured text search engine written in Java."
-SECTION = "libs"
-LICENSE = "LGPL"
-PRIORITY = "optional"
-SRCDATE = "20040704"
-SRC_URI = "cvs://anonymous@clucene.cvs.sourceforge.net/cvsroot/clucene;module=. \
-	   file://compile-fix.patch;patch=1"
-S = "${WORKDIR}"
-
-inherit autotools
-
-do_stage() {
-	oe_libinstall -C src libclucene ${STAGING_LIBDIR}
-	install -d ${STAGING_INCDIR}/CLucene/
-	install src/CLucene.h ${STAGING_INCDIR}/CLucene/
-	cd src
-	headers=`find . -name "*.h"`
-	for f in $headers
-	do
-		install -d ${STAGING_INCDIR}/`dirname $f`
-		install -m 0644 $f ${STAGING_INCDIR}/$f
-	done
-	echo > ${STAGING_INCDIR}/CLucene/util/dirent.h
-}
diff --git a/packages/openmoko-projects/tichy_svn.bb b/packages/openmoko-projects/tichy_svn.bb
index 0b42fc6f70..4b8fe5eeb3 100644
--- a/packages/openmoko-projects/tichy_svn.bb
+++ b/packages/openmoko-projects/tichy_svn.bb
@@ -11,3 +11,4 @@ S = "${WORKDIR}/tichy"
 inherit distutils
 
 FILES_${PN} += "${datadir}"
+RDEPENDS_${PN} += "python-pygame"