merge of '0ff974ee10065a85ea694230ce4da699e5a953b9'

     and '9a2e67d25c144816aef508c89a610ad38406853d'

27 files changed, 208 insertions, 54 deletions

diff --git a/packages/directfb/directfb_1.0.0.bb b/packages/directfb/directfb_1.0.0.bb
index cbeede90ab..caa8dbee8f 100644
--- a/packages/directfb/directfb_1.0.0.bb
+++ b/packages/directfb/directfb_1.0.0.bb
@@ -7,21 +7,22 @@ SECTION = "libs"
 LICENSE = "LGPL"
 HOMEPAGE = "http://directfb.org"
 DEPENDS = "jpeg libpng freetype zlib tslib"
-PR = "r3"
+PR = "r4"
 RV = "1.0-0"
 
 SRC_URI = "http://www.directfb.org/download/DirectFB/DirectFB-${PV}.tar.gz \
            file://fix-pkgconfig-specs.patch;patch=1 \
-	   file://mkdfiff.patch;patch=1 \
-	   file://getpagesize.patch;patch=1"
-
+           file://mkdfiff.patch;patch=1 \
+           file://getpagesize.patch;patch=1 \
+           file://fix-includes.patch;patch=1"
 S = "${WORKDIR}/DirectFB-1.0.0"
 
 LDFLAGS_append =" -lts -lm"
 
 inherit autotools pkgconfig
 
-EXTRA_OECONF = "--with-gfxdrivers=none \
+EXTRA_OECONF = "\
+		--with-gfxdrivers=none \
 		--enable-libmpeg3=no \
 		--enable-freetype=yes \
 		--enable-sdl=no \
diff --git a/packages/directfb/files/fix-includes.patch b/packages/directfb/files/fix-includes.patch
new file mode 100644
index 0000000000..0c40cdb3a6
--- /dev/null
+++ b/packages/directfb/files/fix-includes.patch
@@ -0,0 +1,24 @@
+#
+# pkgconfig points to STAGING_INCDIR, hence
+# we need to append a directfb/ to make it
+# find its header files
+#
+# Signed-Off: mickey@openmoko.org
+#
+Index: DirectFB-1.0.0/include/directfb.h
+===================================================================
+--- DirectFB-1.0.0.orig/include/directfb.h
++++ DirectFB-1.0.0/include/directfb.h
+@@ -29,10 +29,10 @@
+ #ifndef __DIRECTFB_H__
+ #define __DIRECTFB_H__
+ 
+-#include <dfb_types.h>
++#include <directfb/dfb_types.h>
+ #include <sys/time.h> /* struct timeval */
+ 
+-#include <directfb_keyboard.h>
++#include <directfb/directfb_keyboard.h>
+ 
+ #ifdef __cplusplus
+ extern "C"
diff --git a/packages/efl/etk_0.1.0.003.bb b/packages/efl/etk_0.1.0.003.bb
new file mode 100644
index 0000000000..e283adef23
--- /dev/null
+++ b/packages/efl/etk_0.1.0.003.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = "Etk is an advanced widget toolkit based on the Enlightenment Foundation Libraries."
+DEPENDS = "evas-x11 ecore-x11 edje"
+LICENSE = "MIT"
+PR = "r1"
+
+inherit efl
+
+SRC_URI = "http://enlightenment.freedesktop.org/files/etk-${PV}.tar.gz"
+
+do_stage() {
+	autotools_stage_all
+}
+
+FILES_${PN} += "${libdir}/etk/engines/*.so"
+FILES_${PN}-dev += "${libdir}/etk/engines/*.a ${libdir}/etk/engines/*.la"
+FILES_${PN}-dbg += "${libdir}/etk/engines/*/.debug/"
+
diff --git a/packages/efl/etk_20060418.bb b/packages/efl/etk_20060418.bb
deleted file mode 100644
index bf1f98d497..0000000000
--- a/packages/efl/etk_20060418.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-DESCRIPTION = "Etk is an advanced widget toolkit based on the Enlightenment Foundation Libraries."
-DEPENDS = "evas-x11 ecore-x11 edje"
-LICENSE = "MIT"
-PR = "r1"
-
-inherit efl
-
-SRC_URI = "${E_CVS};module=e17/proto/etk;date=${PV}"
-S = "${WORKDIR}/etk"
-
-do_stage_append() {
-        for i in src/lib/etk_*.h
-        do
-                install -m 0644 $i ${STAGING_INCDIR}
-        done
-}
diff --git a/packages/fbgrab/fbgrab-viewer-native_1.0.bb b/packages/fbgrab/fbgrab-viewer-native_1.0.bb
new file mode 100644
index 0000000000..2494918c31
--- /dev/null
+++ b/packages/fbgrab/fbgrab-viewer-native_1.0.bb
@@ -0,0 +1,31 @@
+DESCRIPTION = "Viewer for a network enabled fbgrab"
+HOMEPAGE = "http://svn.openezx.org/trunk/src/userspace/fbgrab/"
+LICENSE = "GPL"
+SECTION = "console/network"
+DEPENDS = "libpng-native"
+PV = "0.0+svn${SRCDATE}"
+PR = "r30"
+
+SRC_URI = "svn://svn.openezx.org/trunk/src/userspace;module=fbgrab;proto=http"
+S = "${WORKDIR}/fbgrab"
+
+inherit native
+
+do_compile() {
+	${CC} ${CFLAGS} ${LDFLAGS} -g -Wall -lpng -lX11 -o fbgrab-viewer fbgrab-viewer.c
+}
+
+do_deploy() {
+	install -d ${DEPLOY_DIR_IMAGE}
+	install -m 0755 fbgrab-viewer ${DEPLOY_DIR_IMAGE}/fbgrab-viewer
+}
+
+do_stage() {
+    :
+}
+
+do_install() {
+    :
+}
+
+addtask deploy before do_install after do_compile
diff --git a/packages/gpsd/gpsd.inc b/packages/gpsd/gpsd.inc
index 6e35227f41..9a9ef9119b 100644
--- a/packages/gpsd/gpsd.inc
+++ b/packages/gpsd/gpsd.inc
@@ -4,10 +4,10 @@ PRIORITY = "optional"
 LICENSE = "GPL"
 DEPENDS = "dbus-glib ncurses python"
 
-EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11  \
-		--x-libraries=${STAGING_LIBDIR} \
+EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \
+                --x-libraries=${STAGING_LIBDIR} \
                 --enable-dbus \
-		--disable-python  "
+                --enable-python"
 
 SRC_URI = "http://download.berlios.de/gpsd/gpsd-${PV}.tar.gz \
            file://gpsd-default \
@@ -45,8 +45,13 @@ do_install_append() {
         install -m 0644 ${WORKDIR}/gpsd-default ${D}/${sysconfdir}/default/gpsd
 }
 
-PACKAGES =+ "libgps"
+PACKAGES =+ "libgps python-pygps"
 
 FILES_${PN} += "${sysconfdir}"
 FILES_libgps = "${libdir}/*.so*"
 CONFFILES_${PN} = "${sysconfdir}/default/gpsd"
+
+DESCRIPTION_python-pygps = "Python bindings to gpsd"
+FILES_python-pygps = "${libdir}/*/site-packages/*"
+RDEPENDS_python-pygps = "python-core gpsd"
+
diff --git a/packages/gpsd/gpsd_2.32.bb b/packages/gpsd/gpsd_2.32.bb
deleted file mode 100644
index 12ef7f47a3..0000000000
--- a/packages/gpsd/gpsd_2.32.bb
+++ /dev/null
@@ -1,2 +0,0 @@
-require gpsd.inc
-PR = "r2"
diff --git a/packages/gpsd/gpsd_2.33.bb b/packages/gpsd/gpsd_2.33.bb
deleted file mode 100644
index a3b5b0bc25..0000000000
--- a/packages/gpsd/gpsd_2.33.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require gpsd.inc
-
-DEPENDS = "ncurses"
-
-PR = "r2"
diff --git a/packages/gpsd/gpsd_2.34.bb b/packages/gpsd/gpsd_2.34.bb
index 726ba42481..92b4d59bf1 100644
--- a/packages/gpsd/gpsd_2.34.bb
+++ b/packages/gpsd/gpsd_2.34.bb
@@ -1,3 +1,3 @@
 require gpsd.inc
 
-PR = "r2"
+PR = "r3"
diff --git a/packages/iproute2/iproute2.inc b/packages/iproute2/iproute2.inc
index e14bfdeefe..c417280cd6 100644
--- a/packages/iproute2/iproute2.inc
+++ b/packages/iproute2/iproute2.inc
@@ -12,15 +12,23 @@ SRC_URI = "http://developer.osdl.org/dev/iproute2/download/${P}-${DATE}.tar.gz"
 
 S = "${WORKDIR}/${DIRNAME}-${PV}-${DATE}"
 
+inherit update-alternatives
+
 EXTRA_OEMAKE = "CC='${CC}' \
                 KERNEL_INCLUDE=${STAGING_KERNEL_DIR}/include \
                 DOCDIR=${docdir}/iproute2 \
                 SUBDIRS='lib tc ip' \
-                SBINDIR=/sbin"
+                SBINDIR=${base_sbindir}"
 
 do_install () {
         oe_runmake DESTDIR=${D} install
+        mv ${D}${base_sbindir}/ip ${D}${base_sbindir}/ip.iproute2
 }
 
 FILES_${PN} += "/usr/lib/tc/*"
 FILES_${PN}-dbg += "/usr/lib/tc/.debug"
+
+ALTERNATIVE_NAME = "ip"
+ALTERNATIVE_PATH = "${base_sbindir}/ip.iproute2"
+ALTERNATIVE_LINK = "${base_bindir}/ip"
+ALTERNATIVE_PRIORITY = "100"
diff --git a/packages/iproute2/iproute2_2.6.16.bb b/packages/iproute2/iproute2_2.6.16.bb
index fc87b9e3b5..9d261927f6 100644
--- a/packages/iproute2/iproute2_2.6.16.bb
+++ b/packages/iproute2/iproute2_2.6.16.bb
@@ -1,4 +1,4 @@
-PR = "r2"
+PR = "r3"
 
 SRC_URI_append = " file://iproute2-2.6.15_no_strip.diff;patch=1;pnum=0 \
                    file://new-flex-fix.patch;patch=1"
diff --git a/packages/iproute2/iproute2_2.6.18.bb b/packages/iproute2/iproute2_2.6.18.bb
index 9d85126b68..ad62b5344a 100644
--- a/packages/iproute2/iproute2_2.6.18.bb
+++ b/packages/iproute2/iproute2_2.6.18.bb
@@ -1,4 +1,4 @@
-PR = "r1"
+PR = "r2"
 
 SRC_URI_append = " file://iproute2-2.6.15_no_strip.diff;patch=1;pnum=0 \
                    file://new-flex-fix.patch;patch=1"
diff --git a/packages/iproute2/iproute2_2.6.20.bb b/packages/iproute2/iproute2_2.6.20.bb
new file mode 100644
index 0000000000..5efdf98f2d
--- /dev/null
+++ b/packages/iproute2/iproute2_2.6.20.bb
@@ -0,0 +1,11 @@
+PR = "r2"
+
+SRC_URI_append = " file://new-flex-fix.patch;patch=1 \
+                   file://ip6tunnel.patch;patch=1 \
+                   file://man-pages-fix.patch;patch=1 \
+                   file://no-strip.patch;patch=1"
+
+require iproute2.inc
+
+DIRNAME = "iproute"
+DATE = "070313"
diff --git a/packages/jards/.mtn2git_empty b/packages/jards/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/jards/.mtn2git_empty
diff --git a/packages/jards/jards_1.0.bb b/packages/jards/jards_1.0.bb
new file mode 100644
index 0000000000..c536a2546b
--- /dev/null
+++ b/packages/jards/jards_1.0.bb
@@ -0,0 +1,57 @@
+DESCRIPTION = "Reference and training tool for students of Japanese"
+AUTHOR = "Johnny Andersson"
+HOMEPAGE = "http://gakusei.sf.net"
+SECTION = "opie/applications"
+PRIORITY = "optional"
+LICENSE = "GPL"
+RDEPENDS = "virtual/japanese-font qte-mt libpng (>= 1) kpengine"
+PR = "r7"
+
+#  stuff that still needs fixing
+#) is the RDEPENDS line correct and sufficient?
+#) upon execution there is a message that /usr/lib/libpng12.so.0 does not have version information
+#) desktop icon missing
+#) Desktop png file an falscher Stelle, daher kein Icon
+#) remove .debug dir
+#) es fehlen: ./opt/QtPalmtop/bin/kpengine, ./opt/QtPalmtop/jardsmob/edict.jardsdic, ./opt/QtPalmtop/jardsmob/kanjidic.jardskdic
+#) exec muß jardsmob_bin heißen
+#) Programm geht oft in 100% CPU schleife -> unbenutzbar
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/gakusei/jards_gakusei.cvs.sourceforge.net__20070212.tar.gz"
+#SRC_URI = "cvs://anonymous@gakusei.cvs.sourceforge.net/cvsroot/gakusei;method=pserver;module=jards"
+
+inherit opie
+
+OE_QMAKE_CXXFLAGS := "${@oe_filter_out('-fno-rtti', '${OE_QMAKE_CXXFLAGS}', d)}"
+OE_QMAKE_CXXFLAFS += " -L${STAGING_DIR}/pkgdata"
+CXXFLAFS += " -L${STAGING_DIR}/pkgdata"
+
+S = "${WORKDIR}/${PN}/"
+export OE_QMAKE_LINK="${CXX}"
+
+# read opie.bbclass
+#APPDESKTOP = "${S}"
+APPTYPE = "binary"
+APPNAME = "jardsmob"
+
+FILES_${PN}-dbg += "${D}${palmtopdir}/bin/.debug/"
+
+PARALLEL_MAKE = ""
+
+do_install() {
+	install -d ${D}${palmtopdir}/bin/
+	install -d ${D}${palmtopdir}/pics/
+	install -d ${D}${palmtopdir}/${APPNAME}/images
+        install -d ${D}${palmtopdir}/apps/Applications
+	install -m 0644 ${S}dat/images/jardsmob.png ${D}${palmtopdir}/pics/
+	install -m 0644 ${S}dat/images/*.png ${D}${palmtopdir}/${APPNAME}/images/
+	install -m 0755 ${S}jardsmob_bin ${D}${palmtopdir}/bin/
+	install -m 0644 ${WORKDIR}/jards/jards.desktop ${D}${palmtopdir}/apps/Applications/
+
+	# what about the following files: edict.jardsdic kanjidic.jardskdic?
+	for f in markers romkana.utf8 strokedata wordfreq_ck raddat.utf8
+	do
+		install -m 0644 ${S}dat/$f ${D}${palmtopdir}/${APPNAME}/
+	done
+}
+
diff --git a/packages/mpg123/.mtn2git_empty b/packages/mpg123/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/mpg123/.mtn2git_empty
diff --git a/packages/mpg123/mpg123_0.66.bb b/packages/mpg123/mpg123_0.66.bb
new file mode 100644
index 0000000000..a92cf877a9
--- /dev/null
+++ b/packages/mpg123/mpg123_0.66.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "mpg123 is a fast and free console based real time MPEG Audio Player \
+for Layer 1, 2 and 3. It uses floating point math (unlike libmad)."
+LICENSE = "LGPL"
+DESCRIPTION = "multimedia"
+HOMEPAGE = "http://www.mpg123.de"
+RCONFLICTS = "mpg321"
+RREPLACES = "mpg321"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/mpg123/mpg123-${PV}.tar.bz2"
+
+inherit autotools
diff --git a/packages/mpg321/mpg321_0.2.10.bb b/packages/mpg321/mpg321_0.2.10.bb
index ccd8ecd48e..018fb17b7b 100644
--- a/packages/mpg321/mpg321_0.2.10.bb
+++ b/packages/mpg321/mpg321_0.2.10.bb
@@ -1,12 +1,14 @@
-DESCRIPTION = "mpg321 is a Free replacement for mpg123, a very popular command-line mp3 player."
+DESCRIPTION = "mpg321 is a replacement for mpg123, a very popular command-line mp3 player."
 SECTION = "console/multimedia"
 DEPENDS = "libmad libao"
 LICENSE = "GPL"
 AUTHOR = "Joe Drew <hoserhead@woot.net>"
 HOMEPAGE = "http://mpg321.sourceforge.net/"
+RCONFLICTS = "mpg123"
+RREPLACES = "mpg123"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/mpg321/mpg321-0.2.10.tar.gz \
-file://libao.m4.patch;patch=1"
+           file://libao.m4.patch;patch=1"
 
 inherit autotools
 
diff --git a/packages/synaesthesia/.mtn2git_empty b/packages/synaesthesia/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/synaesthesia/.mtn2git_empty
diff --git a/packages/synaesthesia/synaesthesia_2.4.bb b/packages/synaesthesia/synaesthesia_2.4.bb
new file mode 100644
index 0000000000..14b96ea860
--- /dev/null
+++ b/packages/synaesthesia/synaesthesia_2.4.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "Synaesthesia is a program that gives a graphical accompanyment to music."
+SECTION = "x11/multimedia"
+HOMEPAGE = "http://www.logarithmic.net/pfh/synaesthesia"
+LICENSE = "GPL"
+DEPENDS = "libx11"
+# optional
+# DEPENDS += "libsdl-x11 directfb"
+
+SRC_URI = "http://www.logarithmic.net/pfh-files/synaesthesia/synaesthesia-${PV}.tar.gz"
+
+inherit autotools
+
+
diff --git a/packages/unionfs/unionfs.inc b/packages/unionfs/unionfs.inc
index 652d79cc83..4035937740 100644
--- a/packages/unionfs/unionfs.inc
+++ b/packages/unionfs/unionfs.inc
@@ -4,7 +4,7 @@ physical content separate."
 HOMEPAGE = "http://www.fsl.cs.sunysb.edu/project-unionfs.html"
 LICENSE = "GPL"
 
-SRC_URI = "ftp://ftp.fsl.cs.sunysb.edu/pub/unionfs/unionfs-${PV}.tar.gz \
+SRC_URI = "ftp://ftp.fsl.cs.sunysb.edu/pub/unionfs/unionfs-1.x/unionfs-${PV}.tar.gz \
 	   file://make.patch;patch=1"
 S = "${WORKDIR}/unionfs-${PV}"
 FILESPATH = "${FILE_DIRNAME}/unionfs-${PV}:${FILE_DIRNAME}/unionfs:${FILE_DIRNAME}/files:${FILE_DIRNAME}"
diff --git a/packages/xorg-app/mkfontdir-native_1.0.3.bb b/packages/xorg-app/mkfontdir-native_1.0.3.bb
index c4c5e5d259..2753b185ba 100644
--- a/packages/xorg-app/mkfontdir-native_1.0.3.bb
+++ b/packages/xorg-app/mkfontdir-native_1.0.3.bb
@@ -1,11 +1,11 @@
 DESCRIPTION = "X mkfontdir app"
 SECTION = "x11/applications"
 LICENSE = "MIT-X"
-
+DEPENDS = "util-macros-native mkfontscale-native"
+PR = "r1"
 PE = "1"
 
-S="${WORKDIR}/mkfontdir-${PV}"
+S = "${WORKDIR}/mkfontdir-${PV}"
 SRC_URI = "${XORG_MIRROR}/X11R7.1/src/app/mkfontdir-${PV}.tar.bz2"
 
-DEPENDS = "util-macros-native"
 inherit native autotools pkgconfig
diff --git a/packages/xorg-app/mkfontdir-native_X11R7.0-1.0.1.bb b/packages/xorg-app/mkfontdir-native_X11R7.0-1.0.1.bb
index 0787a7ced7..7bfea3e84c 100644
--- a/packages/xorg-app/mkfontdir-native_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/mkfontdir-native_X11R7.0-1.0.1.bb
@@ -1,9 +1,10 @@
 DESCRIPTION = "X mkfontdir app"
 SECTION = "x11/applications"
 LICENSE = "MIT-X"
+DEPENDS = "util-macros-native mkfontscale-native"
+PR = "r1"
 
-S="${WORKDIR}/mkfontdir-${PV}"
+S = "${WORKDIR}/mkfontdir-${PV}"
 SRC_URI = "${XORG_MIRROR}/X11R7.0/src/app/mkfontdir-${PV}.tar.bz2"
 
-DEPENDS = "util-macros-native"
 inherit native autotools pkgconfig
diff --git a/packages/xorg-app/mkfontdir-native_X11R7.1-1.0.2.bb b/packages/xorg-app/mkfontdir-native_X11R7.1-1.0.2.bb
index 0eb85010b9..ac6d19fd95 100644
--- a/packages/xorg-app/mkfontdir-native_X11R7.1-1.0.2.bb
+++ b/packages/xorg-app/mkfontdir-native_X11R7.1-1.0.2.bb
@@ -1,9 +1,10 @@
 DESCRIPTION = "X mkfontdir app"
 SECTION = "x11/applications"
 LICENSE = "MIT-X"
+DEPENDS = "util-macros-native mkfontscale-native"
+PR = "r1"
 
-S="${WORKDIR}/mkfontdir-${PV}"
+S = "${WORKDIR}/mkfontdir-${PV}"
 SRC_URI = "${XORG_MIRROR}/X11R7.1/src/app/mkfontdir-${PV}.tar.bz2"
 
-DEPENDS = "util-macros-native"
 inherit native autotools pkgconfig
diff --git a/packages/xorg-app/mkfontdir_1.0.3.bb b/packages/xorg-app/mkfontdir_1.0.3.bb
index cf7839586f..a65149408d 100644
--- a/packages/xorg-app/mkfontdir_1.0.3.bb
+++ b/packages/xorg-app/mkfontdir_1.0.3.bb
@@ -1,7 +1,6 @@
 require xorg-app-common.inc
 
 PE = "1"
-#DESCRIPTION = ""
 
-#DEPENDS += " "
+RDEPENDS += "mkfontscale"
 
diff --git a/packages/xorg-app/mkfontdir_X11R7.0-1.0.1.bb b/packages/xorg-app/mkfontdir_X11R7.0-1.0.1.bb
index 556afd2867..d721fd07b7 100644
--- a/packages/xorg-app/mkfontdir_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/mkfontdir_X11R7.0-1.0.1.bb
@@ -1,6 +1,4 @@
 require xorg-app-common.inc
 
-#DESCRIPTION = ""
-
-#DEPENDS += " "
+RDEPENDS += "mkfontscale"
 
diff --git a/packages/xorg-app/mkfontdir_X11R7.1-1.0.2.bb b/packages/xorg-app/mkfontdir_X11R7.1-1.0.2.bb
index 556afd2867..d721fd07b7 100644
--- a/packages/xorg-app/mkfontdir_X11R7.1-1.0.2.bb
+++ b/packages/xorg-app/mkfontdir_X11R7.1-1.0.2.bb
@@ -1,6 +1,4 @@
 require xorg-app-common.inc
 
-#DESCRIPTION = ""
-
-#DEPENDS += " "
+RDEPENDS += "mkfontscale"