merge of '2b710e1818e35c1ae6f03e19452a17638f3b8048'

and '9a039e377450d290fde23e8f83821bd022343fd4'
author: Paul Sokolovsky <pmiscml@gmail.com> 2007-06-21 08:49:48 +0000
committer: Paul Sokolovsky <pmiscml@gmail.com> 2007-06-21 08:49:48 +0000
commit: 7ebefcff1fdc6993a30d1d6789a90c54578068e4 (patch)
tree: 7f656e7b251105ed59088873071928d4fb1737ba /packages
parent: 11cd48c28ef8e701fc43b9905a3a4f7af4fb5c8f (diff)
parent: 35673b07fcb65e7109ed0430a9a4aa7e4313d437 (diff)
188 files changed, 1488 insertions, 1241 deletions
diff --git a/packages/classpath/classpath-gtk_0.93.bb b/packages/classpath/classpath-gtk_0.93.bb
index 137ee8ffb2..a3b39d92f8 100644
--- a/packages/classpath/classpath-gtk_0.93.bb
+++ b/packages/classpath/classpath-gtk_0.93.bb
@@ -4,15 +4,6 @@ DEPENDS = "glib-2.0 gtk+ cairo gconf libart-lgpl pango libxtst jikes-native zip-
 RDEPENDS_${PN} = "classpath-common (>= ${PV})"
 RCONFLICTS_${PN} = "classpath-minimal"
 
-SRC_URI += "file://gconf_version.patch;patch=1"
+SRC_URI += "file://disable-automake-checks-v2.patch;patch=1"
 
 EXTRA_OECONF = "--with-jikes --disable-plugin --disable-dssi"
-
-PACKAGES = "classpath-dev classpath-doc classpath-common classpath-examples classpath-tools ${PN}"
-
-FILES_classpath-doc = "${datadir}/info"
-FILES_classpath-dev = "${includedir}"
-FILES_${PN} = "${libdir} ${bindir}"
-FILES_classpath-common = "${datadir}/classpath/glibj.zip"
-FILES_classpath-examples = "${datadir}/classpath/examples"
-FILES_classpath-tools = "${datadir}/classpath/tools.zip"
diff --git a/packages/classpath/classpath-gtk_cvs.bb b/packages/classpath/classpath-gtk_cvs.bb
index 53f494ab15..18d79decae 100644
--- a/packages/classpath/classpath-gtk_cvs.bb
+++ b/packages/classpath/classpath-gtk_cvs.bb
@@ -1,14 +1,12 @@
-DESCRIPTION = "GNU Classpath standard Java libraries"
-HOMEPAGE = "http://www.gnu.org/software/classpath/"
-LICENSE = "Classpath"
-PRIORITY = "optional"
-SECTION = "libs"
-PR = "r1"
+require classpath.inc
+
+PR = "r2"
 
 SRCDATE_${PN} ?= "20070501"
 PV = "0.93+cvs${SRCDATE}"
 
-DEPENDS = "glib-2.0 gtk+ cairo gconf ecj-native zip-native"
+### note from Laibsch: bug 2523 has information on how to build this package
+DEPENDS = "glib-2.0 gtk+ cairo gconf ecj-native zip-native virtual/java-native libxtst"
 RDEPENDS_${PN} = "classpath-common (>= ${PV})"
 RCONFLICTS_${PN} = "classpath-minimal"
 
@@ -17,19 +15,8 @@ SRC_URI = "cvs://anonymous@cvs.savannah.gnu.org/sources/classpath;module=classpa
 
 S = "${WORKDIR}/classpath"
 
-inherit autotools
-
 EXTRA_OECONF = "--with-ecj=${STAGING_BINDIR_NATIVE}/ecj --with-ecj-jar=${STAGING_BINDIR_NATIVE}/ecj.jar --disable-plugin --disable-dssi --disable-alsa"
 
-PACKAGES = "classpath-dev classpath-doc classpath-common classpath-examples classpath-tools ${PN}"
-
-FILES_classpath-doc = "${datadir}/info ${datadir}/man"
-FILES_classpath-dev = "${includedir}"
-FILES_${PN} = "${libdir} ${bindir}"
-FILES_classpath-common = "${datadir}/classpath/glibj.zip"
-FILES_classpath-examples = "${datadir}/classpath/examples"
-FILES_classpath-tools = "${datadir}/classpath/tools.zip"
-
 do_stage() {
 	install -d ${STAGING_INCDIR}/classpath
 	install -m 0755 include/jni* ${STAGING_INCDIR}/classpath/
@@ -41,6 +28,3 @@ do_install() {
 	autotools_do_install
 	mv ${D}${libdir}/security ${D}${libdir}/${PN}
 }
-
-PROVIDES = "classpath"
-RPROVIDES = "classpath"
diff --git a/packages/classpath/classpath-minimal-native_0.93.bb b/packages/classpath/classpath-minimal-native_0.93.bb
index f8e88a0217..83cb60142c 100644
--- a/packages/classpath/classpath-minimal-native_0.93.bb
+++ b/packages/classpath/classpath-minimal-native_0.93.bb
@@ -3,6 +3,8 @@ require classpath.inc
 DEPENDS = "glib-2.0 libart-lgpl pango libxtst jikes-native zip-native"
 PR = "r1"
 
+SRC_URI += "file://disable-automake-checks-v2.patch;patch=1"
+
 S = "${WORKDIR}/classpath-${PV}"
 
 inherit native
diff --git a/packages/classpath/classpath-minimal_0.90.bb b/packages/classpath/classpath-minimal_0.90.bb
index 1339b2dbc8..8d9554c999 100644
--- a/packages/classpath/classpath-minimal_0.90.bb
+++ b/packages/classpath/classpath-minimal_0.90.bb
@@ -4,13 +4,6 @@ DEPENDS = "jikes-native zip-native"
 RDEPENDS_${PBN}-minimal = "${PBN}-common (>= ${PV})"
 RCONFLICTS_${PBN}-minimal = "${PBN}-gtk"
 
-EXTRA_OECONF = "--with-jikes --without-x --with-glibj --disable-gtk-peer --disable-alsa"
-
-PACKAGES = "${PBN}-dev ${PBN}-doc ${PBN}-common ${PBN}-examples ${PBN}-tools ${PN}"
+SRC_URI += "file://disable-automake-checks.patch;patch=1"
 
-FILES_${PBN}-doc = "${datadir}/info"
-FILES_${PBN}-dev = "${includedir}"
-FILES_${PN} = "${libdir}"
-FILES_${PBN}-common = "${datadir}/${PBN}/glibj.zip"
-FILES_${PBN}-examples = "${datadir}/${PBN}/examples"
-FILES_${PBN}-tools = "${datadir}/${PBN}/tools"
+EXTRA_OECONF = "--with-jikes --without-x --with-glibj --disable-gtk-peer --disable-alsa"
diff --git a/packages/classpath/classpath.inc b/packages/classpath/classpath.inc
index 1d684c0557..d9498c99d5 100644
--- a/packages/classpath/classpath.inc
+++ b/packages/classpath/classpath.inc
@@ -7,7 +7,6 @@ PROVIDES = "classpath"
 RPROVIDES = "classpath"
 
 SRC_URI = "${GNU_MIRROR}/classpath/classpath-${PV}.tar.gz \
-           file://disable-automake-checks.patch;patch=1 \
            file://gconf_version.patch;patch=1 \
            file://fix-endian-arm-floats.patch;patch=1"
 
@@ -28,3 +27,4 @@ FILES_classpath-common += "${datadir}/classpath/glibj.zip"
 FILES_classpath-examples += "${datadir}/classpath/examples"
 FILES_classpath-tools += "${datadir}/classpath/tools.zip ${datadir}/classpath/tools"
 FILES_classpath-dev += "${libdir}/*.so"
+FILES_classpath-dbg += "${libdir}/classpath/.debug"
diff --git a/packages/directfb/++dfb_0.9.25.bb b/packages/directfb/++dfb_1.0.0.bb
index f440e117ff..f440e117ff 100644
--- a/packages/directfb/++dfb_0.9.25.bb
+++ b/packages/directfb/++dfb_1.0.0.bb
diff --git a/packages/directfb/directfb-examples_0.9.25.bb b/packages/directfb/directfb-examples_1.0.0.bb
index 28de29c4a6..8a792b4ae4 100644
--- a/packages/directfb/directfb-examples_0.9.25.bb
+++ b/packages/directfb/directfb-examples_1.0.0.bb
@@ -1,10 +1,10 @@
-DESCRIPTION = "DirectFB examples"
+DESCRIPTION = "DirectFB extra providers"
 DEPENDS = "directfb"
-SECTION = "devel/examples"
+SECTION = "libs"
 LICENSE = "GPL"
 
-SRC_URI = "http://www.directfb.org/downloads/Extras/DirectFB-examples-${PV}.tar.gz"
-S = "${WORKDIR}/DirectFB-examples-${PV}"
+SRC_URI = "http://www.directfb.org/downloads/Extras/DirectFB-extra-${PV}.tar.gz"
+S = "${WORKDIR}/DirectFB-extra-${PV}"
 
 inherit autotools
 
@@ -13,3 +13,8 @@ do_configure_append() {
     find ${S} -type f | xargs sed -i 's:/usr/include:${STAGING_INCDIR}:'
 }
 
+do_stage() {
+	autotools_stage_all
+}
+
+
diff --git a/packages/directfb/directfb_1.0.0.bb b/packages/directfb/directfb_1.0.0.bb
index caa8dbee8f..669ed49283 100644
--- a/packages/directfb/directfb_1.0.0.bb
+++ b/packages/directfb/directfb_1.0.0.bb
@@ -7,7 +7,7 @@ SECTION = "libs"
 LICENSE = "LGPL"
 HOMEPAGE = "http://directfb.org"
 DEPENDS = "jpeg libpng freetype zlib tslib"
-PR = "r4"
+PR = "r5"
 RV = "1.0-0"
 
 SRC_URI = "http://www.directfb.org/download/DirectFB/DirectFB-${PV}.tar.gz \
@@ -38,18 +38,18 @@ do_install() {
 
 
 FILES_directfb-dbg_append = " ${libdir}/directfb-${RV}/*/*/.debug/*.so \
-			      ${libdir}/directfb-${RV}/*/.debug/*.so \
-			  "
+                            ${libdir}/directfb-${RV}/*/.debug/*.so \
+"
 
 FILES_directfb-dev_append = " ${libdir}/directfb-${RV}/systems/*.la \
                               ${libdir}/directfb-${RV}/inputdrivers/*.la \
                               ${libdir}/directfb-${RV}/interfaces/*/*.la \
-                              ${libdir}/directfb-${RV}/wm/*.la"
-
+                              ${libdir}/directfb-${RV}/wm/*.la \
+"
 
 FILES_directfb_append = " ${libdir}/directfb-${RV}/systems/*.so \
                           ${libdir}/directfb-${RV}/inputdrivers/*.so \
                           ${libdir}/directfb-${RV}/interfaces/*/*.so \
                           ${libdir}/directfb-${RV}/wm/*.so \
                           ${datadir}/directfb-1.0.0 \
-			  "
+"
diff --git a/packages/directfb/files/fix-includes.patch b/packages/directfb/files/fix-includes.patch
index 0c40cdb3a6..7b4a112582 100644
--- a/packages/directfb/files/fix-includes.patch
+++ b/packages/directfb/files/fix-includes.patch
@@ -1,7 +1,7 @@
 #
 # pkgconfig points to STAGING_INCDIR, hence
-# we need to append a directfb/ to make it
-# find its header files
+# we need to make this a local include
+# or else it doesn't find its own header files
 #
 # Signed-Off: mickey@openmoko.org
 #
@@ -14,11 +14,11 @@ Index: DirectFB-1.0.0/include/directfb.h
  #define __DIRECTFB_H__
  
 -#include <dfb_types.h>
-+#include <directfb/dfb_types.h>
++#include "dfb_types.h"
  #include <sys/time.h> /* struct timeval */
  
 -#include <directfb_keyboard.h>
-+#include <directfb/directfb_keyboard.h>
++#include "directfb_keyboard.h"
  
  #ifdef __cplusplus
  extern "C"
diff --git a/packages/directfb/files/fix-pkgconfig-specs.patch b/packages/directfb/files/fix-pkgconfig-specs.patch
index 0273b58ec5..c252dc1792 100644
--- a/packages/directfb/files/fix-pkgconfig-specs.patch
+++ b/packages/directfb/files/fix-pkgconfig-specs.patch
@@ -1,43 +1,48 @@
-diff -ur DirectFB-1.0.0~org/directfb-internal.pc.in DirectFB-1.0.0/directfb-internal.pc.in
---- DirectFB-1.0.0~org/directfb-internal.pc.in	2003-07-04 13:30:22.000000000 -0400
-+++ DirectFB-1.0.0/directfb-internal.pc.in	2007-03-16 22:34:17.000000000 -0400
-@@ -8,4 +8,4 @@
+Index: DirectFB-1.0.0/directfb-internal.pc.in
+===================================================================
+--- DirectFB-1.0.0.orig/directfb-internal.pc.in
++++ DirectFB-1.0.0/directfb-internal.pc.in
+@@ -8,4 +8,4 @@ Name: DirectFB-Internal
  Description: Third party module support package for DirectFB.
  Version: @VERSION@
  Requires: directfb = @VERSION@
 -Cflags: @DFB_INTERNAL_CFLAGS@ -I@INTERNALINCLUDEDIR@
-+Cflags: @DFB_INTERNAL_CFLAGS@ -I${includedir}
-diff -ur DirectFB-1.0.0~org/directfb.pc.in DirectFB-1.0.0/directfb.pc.in
---- DirectFB-1.0.0~org/directfb.pc.in	2004-08-04 12:28:20.000000000 -0400
-+++ DirectFB-1.0.0/directfb.pc.in	2007-03-16 22:31:33.000000000 -0400
-@@ -8,4 +8,4 @@
++Cflags: @DFB_INTERNAL_CFLAGS@ -I${includedir} -I${includedir}/../directfb
+Index: DirectFB-1.0.0/directfb.pc.in
+===================================================================
+--- DirectFB-1.0.0.orig/directfb.pc.in
++++ DirectFB-1.0.0/directfb.pc.in
+@@ -8,4 +8,4 @@ Description: Graphics and windowing libr
  Version: @VERSION@
  Requires: fusion direct
  Libs: -L${libdir} -ldirectfb @THREADLIB@ @DYNLIB@ @ZLIB_LIBS@ @OSX_LIBS@
 -Cflags: @THREADFLAGS@ -I@INCLUDEDIR@
 +Cflags: @THREADFLAGS@ -I${includedir}
-diff -ur DirectFB-1.0.0~org/lib/direct/direct.pc.in DirectFB-1.0.0/lib/direct/direct.pc.in
---- DirectFB-1.0.0~org/lib/direct/direct.pc.in	2005-11-23 09:18:59.000000000 -0500
-+++ DirectFB-1.0.0/lib/direct/direct.pc.in	2007-03-16 22:32:13.000000000 -0400
-@@ -7,4 +7,4 @@
+Index: DirectFB-1.0.0/lib/direct/direct.pc.in
+===================================================================
+--- DirectFB-1.0.0.orig/lib/direct/direct.pc.in
++++ DirectFB-1.0.0/lib/direct/direct.pc.in
+@@ -7,4 +7,4 @@ Name: Direct
  Description: DirectFB base development library
  Version: @VERSION@
  Libs: -L${libdir} -ldirect @THREADLIB@ @DYNLIB@
 -Cflags: @THREADFLAGS@ -I@INCLUDEDIR@
 +Cflags: @THREADFLAGS@ -I${includedir}
-diff -ur DirectFB-1.0.0~org/lib/fusion/fusion.pc.in DirectFB-1.0.0/lib/fusion/fusion.pc.in
---- DirectFB-1.0.0~org/lib/fusion/fusion.pc.in	2004-05-19 07:30:56.000000000 -0400
-+++ DirectFB-1.0.0/lib/fusion/fusion.pc.in	2007-03-16 22:32:34.000000000 -0400
-@@ -8,4 +8,4 @@
+Index: DirectFB-1.0.0/lib/fusion/fusion.pc.in
+===================================================================
+--- DirectFB-1.0.0.orig/lib/fusion/fusion.pc.in
++++ DirectFB-1.0.0/lib/fusion/fusion.pc.in
+@@ -8,4 +8,4 @@ Description: High Level IPC Mechanisms
  Version: @VERSION@
  Requires: direct
  Libs: -L${libdir} -lfusion
 -Cflags: -I@INCLUDEDIR@
 +Cflags: -I${includedir}
-diff -ur DirectFB-1.0.0~org/lib/voodoo/voodoo.pc.in DirectFB-1.0.0/lib/voodoo/voodoo.pc.in
---- DirectFB-1.0.0~org/lib/voodoo/voodoo.pc.in	2004-05-19 07:31:28.000000000 -0400
-+++ DirectFB-1.0.0/lib/voodoo/voodoo.pc.in	2007-03-16 22:32:55.000000000 -0400
-@@ -8,4 +8,4 @@
+Index: DirectFB-1.0.0/lib/voodoo/voodoo.pc.in
+===================================================================
+--- DirectFB-1.0.0.orig/lib/voodoo/voodoo.pc.in
++++ DirectFB-1.0.0/lib/voodoo/voodoo.pc.in
+@@ -8,4 +8,4 @@ Description: Interface based network tra
  Version: @VERSION@
  Requires: direct
  Libs: -L${libdir} -lvoodoo
diff --git a/packages/directfb/fusionsound_0.9.26+cvs20070207.bb b/packages/directfb/fusionsound_0.9.26+cvs20070207.bb
deleted file mode 100644
index fe04a195c1..0000000000
--- a/packages/directfb/fusionsound_0.9.26+cvs20070207.bb
+++ /dev/null
@@ -1,37 +0,0 @@
-DESCRIPTION = "FusionSound for DirectFB"
-DEPENDS = "directfb"
-SECTION = "libs"
-LICENSE = "LGPL"
-
-# this is a CVS only release
-
-SRC_URI = "cvs://anonymous@cvs.directfb.org/cvs/directfb;method=pserver;module=FusionSound;date=${@bb.data.getVar('PV', d, 1)[9:]}"
-
-S = "${WORKDIR}/FusionSound"
-
-inherit autotools pkgconfig
-
-do_configure_append() {
-    find ${S} -type f | xargs sed -i 's:I/usr/include:I${STAGING_INCDIR}:g'
-}
-
-do_stage() {
-        autotools_stage_all
-}
-
-do_install() {
-        oe_runmake 'DESTDIR=${D}' install
-}
-
-FILES_fusionsound-dbg_append = " ${libdir}/directfb-1.0-0/*/*/.debug/*.so \
-                              ${libdir}/directfb-1.0-0/*/.debug/*.so \
-                          "
-
-FILES_fusionsound-dev_append = " ${libdir}/directfb-1.0-0/interfaces/*/*.la \
-			         ${libdir}/directfb-1.0-0/snddrivers/*.la \
-			       "
-
-FILES_fusionsound_append = " ${libdir}/directfb-1.0-0/interfaces/*/*.so \
-                             ${libdir}/directfb-1.0-0/snddrivers/*.so \
-			   "
-
diff --git a/packages/directfb/fusionsound_1.0.0.bb b/packages/directfb/fusionsound_1.0.0.bb
new file mode 100644
index 0000000000..3cd4a385f6
--- /dev/null
+++ b/packages/directfb/fusionsound_1.0.0.bb
@@ -0,0 +1,37 @@
+DESCRIPTION = "FusionSound for DirectFB"
+DEPENDS = "directfb libmad libvorbis"
+SECTION = "libs"
+LICENSE = "LGPL"
+
+SRC_URI = "http://www.directfb.org/downloads/Core/FusionSound-${PV}.tar.gz"
+S = "${WORKDIR}/FusionSound-${PV}"
+
+inherit autotools pkgconfig
+
+do_configure_append() {
+    find ${S} -type f | xargs sed -i 's:I/usr/include:I${STAGING_INCDIR}/directfb:g'
+}
+
+do_stage() {
+        autotools_stage_all
+}
+
+do_install() {
+        oe_runmake 'DESTDIR=${D}' install
+}
+
+FILES_${PN} += "\
+  ${libdir}/directfb-1.0-0/interfaces/*/*.so \
+  ${libdir}/directfb-1.0-0/snddrivers/*.so \
+"
+
+FILES_${PN}-dbg += "\
+  ${libdir}/directfb-1.0-0/*/*/.debug/*.so \
+  ${libdir}/directfb-1.0-0/*/.debug/*.so \
+"
+
+FILES_${PN}-dev += "\
+  ${libdir}/directfb-1.0-0/interfaces/*/*.la \
+  ${libdir}/directfb-1.0-0/snddrivers/*.la \
+"
+
diff --git a/packages/e17/e-iconbar_20060128.bb b/packages/e17/e-iconbar_20060128.bb
deleted file mode 100644
index de639bfd3f..0000000000
--- a/packages/e17/e-iconbar_20060128.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-DESCRIPTION = "An Iconbar for the Enlightenment Window Manager"
-DEPENDS = "edb eet evas-x11 ecore-x11 edje esmart-x11 imlib2-x11"
-LICENSE = "MIT"
-PR = "r1"
-
-inherit e
-
-SRC_URI = "${E_CVS};module=e17/apps/iconbar;date=${PV}"
-S = "${WORKDIR}/iconbar"
-
-EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc"
-
-FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir} ${sbindir}"
diff --git a/packages/e17/e-utils_20060501.bb b/packages/e17/e-utils_20060501.bb
deleted file mode 100644
index fc94cd106f..0000000000
--- a/packages/e17/e-utils_20060501.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-DESCRIPTION = "Enlightenment Window Manager Utilities"
-DEPENDS = "virtual/ecore virtual/evas virtual/esmart edje eet ewl engrave virtual/imlib2 epsilon"
-LICENSE = "MIT"
-PR = "r1"
-
-inherit e
-
-SRC_URI = "${E_CVS};module=e17/apps/e_utils;date=${PV}"
-S = "${WORKDIR}/e_utils"
-
-FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir}"
diff --git a/packages/e17/e-utils_cvs.bb b/packages/e17/e-utils_cvs.bb
new file mode 100644
index 0000000000..ea27040ab2
--- /dev/null
+++ b/packages/e17/e-utils_cvs.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "Enlightenment Window Manager Utilities"
+DEPENDS = "eet evas ecore edje esmart ewl engrave"
+LICENSE = "MIT"
+PV = "0.0.0+cvs${SRCDATE}"
+PR = "r0"
+
+inherit e
+
+SRC_URI = "${E_CVS};module=e17/apps/e_utils"
+S = "${WORKDIR}/e_utils"
+
+FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir}"
diff --git a/packages/e17/e-wm_0.16.999.038.bb b/packages/e17/e-wm_0.16.999.038.bb
index cf25ad08e8..1204ed9ecc 100644
--- a/packages/e17/e-wm_0.16.999.038.bb
+++ b/packages/e17/e-wm_0.16.999.038.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "E17 - the Enlightenment Window Mananger"
-DEPENDS = "evas-x11 ecore-x11 edje eet embryo efreet"
+DEPENDS = "eet evas ecore edje efreet"
 LICENSE = "MIT"
-PR = "r5"
+PR = "r6"
 
 inherit e update-alternatives
 
@@ -28,8 +28,8 @@ FILES_${PN}-dev += "${libdir}/enlightenment/modules/*/*/*.a ${libdir}/enlightenm
 FILES_${PN}-dbg += "${libdir}/enlightenment/modules/*/*/.debug/ ${libdir}/enlightenment/preload/.debug/"
 
 do_compile_prepend() {
-        find ${S} -name Makefile | xargs sed -i 's:/usr/include:${STAGING_INCDIR}:'
-	find ${S} -name Makefile | xargs sed -i 's:/usr/X11R6/include:${STAGING_INCDIR}:'
+    find ${S} -name Makefile | xargs sed -i 's:/usr/include:${STAGING_INCDIR}:'
+    find ${S} -name Makefile | xargs sed -i 's:/usr/X11R6/include:${STAGING_INCDIR}:'
 }
 
 do_install_append() {
diff --git a/packages/e17/e17-gpe-menu-convert/e17-gpe-menu-convert.sh b/packages/e17/e17-gpe-menu-convert/e17-gpe-menu-convert.sh
deleted file mode 100644
index bbb5e12211..0000000000
--- a/packages/e17/e17-gpe-menu-convert/e17-gpe-menu-convert.sh
+++ /dev/null
@@ -1,162 +0,0 @@
-#!/bin/sh
-
-setVar() {
-    if [ ! "$value" = "" ]; then
-        name=`echo "$name" | sed 'y:-\[\]:_____:'`
-        value=`echo "$value" | sed 's:":\\\":g'`
-        export $name="$value"
-    fi
-}
-
-#convert true/false to 1/0
-bool() {
-    if [ ! "$1" = "" ]; then
-        if [ "$1" = "True" ]; then
-            cmd="$cmd $2 1"
-        else
-            cmd="$cmd $2 0"
-        fi
-    fi
-}
-
-str() {
-    if [ ! "$1" = "" ]; then
-        cmd="$cmd $2 \"$1"\"
-    fi
-}
-
-convert_desktop_to_eap() {
-    echo "Adding $1 to e menu"
-    for l in `cat $1`; do
-        #on empty line clear vars
-        if [ "$l" = "" ]; then
-
-            #grab previous var if it exists
-            setVar
-
-            name=""
-            value=""
-        else
-            #if an = is in the line it's a name/value pair
-            if echo "$l" | grep -q "="; then
-
-                #grab previous var if it exists
-                setVar
-
-                name=`echo "$l" | cut -d "=" -f 1`
-                value=`echo "$l" | cut -d "=" -f 2-`
-            else
-
-                #if previous value assume this is a continuation
-                if [ ! "$value" = "" ]; then
-                    value="$value $l"
-                fi
-            fi
-        fi
-    done
-    setVar
-
-    cmd=""
-
-    #set up options
-    bool "$StartupNotify" -set-startup-notify
-    str "$Name" -set-name
-    str "$Comment" -set-comment
-    str "$Exec" -set-exe
-
-    if [ ! "$cmd" = "" ]; then
-        eapFile="$PATH_TO_EAP/$2"
-        if [ -e $eapFile ]; then
-            echo "EAP file for $2 already created";
-        else
-            echo "Converting $1 to $2"
-            #cp ~/.e/e/applications/all/aterm.eap gpe-othello.eap
-            ##empty out eap file
-            ##enlightenment_eapp | grep -- -set- | cut -d " " -f 3 | xargs -iCMD enlightenment_eapp gpe-othello.eap CMD \"\"
-            #enlightenment_eapp gpe-othello.eap -del-all
-
-            cat <<EOF > /tmp/gpeEap.edc
-images {
-    image: "$Icon" COMP;
-}
-collections {
-    group {
-        name: "icon";
-        max: 48 48;
-        parts {
-            part {
-                name: "image";
-                mouse_events: 0;
-                description {
-                    state: "default" 0.0;
-                    aspect: 1.0 1.0;
-                    image.normal: "$Icon";
-                }
-            }
-        }
-    }
-}
-EOF
-
-            edje_cc --image_dir "$PATH_TO_PIXMAPS" /tmp/gpeEap.edc "$eapFile"
-            rm /tmp/gpeEap.edc
-
-            cmd="enlightenment_eapp \"$eapFile\" $cmd"
-
-            #pipe command in sh to allow it to re-interpret quotes
-            echo $cmd | /bin/sh -s
-        fi
-
-        if `echo "$Categories" | grep -q "SystemSettings"`; then
-            dir="Settings"
-        elif `echo "$Categories" | grep -q "PIM"`; then
-            dir="PIM"
-        elif `echo "$Categories" | grep -q "Network"`; then
-            dir="Network"
-        elif `echo "$Categories" | grep -q "Games"`; then
-            dir="Games"
-        elif `echo "$Categories" | grep -q "Game"`; then
-            dir="Games"
-        elif `echo "$Categories" | grep -q "AudioVideo"`; then
-            dir="Multimedia"
-        elif `echo "$Categories" | grep -q "Panel"`; then
-            dir="Utility/Panel"
-        elif `echo "$Categories" | grep -q "Utility"`; then
-            dir="Utlity"
-        else
-            dir=""
-        fi
-
-        #dir=`echo "$Categories" | sed 'y:;:/:'`
-        mkdir -p "$PATH_TO_E_GPE/$dir"
-        orderFile="$PATH_TO_E_GPE/$dir"/.order
-        add=1
-        if [ -e "$orderFile" ]; then
-            if grep -q "$2" "$orderFile"; then
-                echo "$2 is already in the $dir menu"
-                add=0
-            fi
-        fi
-        if [ "$add" -eq 1 ]; then
-            echo "Adding $2 to $dir menu"
-            echo "$2" >> "$orderFile"
-        fi
-    fi
-}
-
-PATH_TO_DESKTOP="/usr/share/applications"
-PATH_TO_PIXMAPS="/usr/share/pixmaps"
-PATH_TO_EAP="/home/root/.e/e/applications/all"
-PATH_TO_E_GPE="/home/root/.e/e/applications/favorite/GPE"
-
-if [ ! -d $PATH_TO_E_GPE ]; then
-    mkdir -p $PATH_TO_E_GPE
-fi
-if [ ! -d $PATH_TO_EAP ]; then
-    mkdir -p $PATH_TO_EAP
-fi
-cd "$PATH_TO_DESKTOP"
-for f in `ls *.desktop`; do
-    eap=`echo "$f" | cut -d . -f 1`
-    convert_desktop_to_eap "$PATH_TO_DESKTOP/$f" "$eap.eap"
-done
diff --git a/packages/e17/e17-gpe-menu-convert_0.2.bb b/packages/e17/e17-gpe-menu-convert_0.2.bb
deleted file mode 100644
index 5ec40cd761..0000000000
--- a/packages/e17/e17-gpe-menu-convert_0.2.bb
+++ /dev/null
@@ -1,20 +0,0 @@
-DESCRIPTION = "Shell script to convert GPE .desktop files into e17 eap files and menus"
-DEPENDS = "edje-utils e-wm"
-RDEPENDS += "edje-utils e-wm"
-LICENSE = "MIT"
-SECTION = "e/apps"
-PR = "r4"
-
-#this is a shell script
-PACKAGE_ARCH = "all"
-
-SRC_URI = "file://e17-gpe-menu-convert.sh"
-
-do_install() {
-	install -d ${D}/usr/bin/
-	install -m 755 ${WORKDIR}/e17-gpe-menu-convert.sh ${D}/usr/bin/e17-gpe-menu-convert.sh
-}
-
-pkg_postinst() {
-	/usr/bin/e17-gpe-menu-convert.sh
-}
diff --git a/packages/e17/e17genmenu_4.2.0.bb b/packages/e17/e17genmenu_4.2.0.bb
deleted file mode 100644
index baf399864d..0000000000
--- a/packages/e17/e17genmenu_4.2.0.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-DESCRIPTION = "Convert Gnome or KDE menus to e17 menus"
-DEPENDS = "virtual/ecore virtual/evas eet engrave"
-LICENSE = "GPL"
-HOMEPAGE = "http://sourceforge.net/projects/e17genmenu"
-PR = "r0"
-
-inherit e
-
-SECTION = "e/utils"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/e17genmenu/e17genmenu-${PV}.tar.gz"
-S = "${WORKDIR}/${PN}"
-
-PACKAGES += "${PN}-doc"
-
-FILES_${PN} = "${bindir} ${datadir}"
-FILES_${PN}-doc = "/usr/doc"
-\ No newline at end of file
diff --git a/packages/e17/eclair_20060128.bb b/packages/e17/eclair_20060128.bb
deleted file mode 100644
index d78e1322c2..0000000000
--- a/packages/e17/eclair_20060128.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-DESCRIPTION = "Eclair is the E17 multi media player"
-DEPENDS = "evas-x11 ecore-x11 embryo imlib2-x11 edje-native edje libxine-x11 emotion esmart-x11 libxml2 sqlite3 taglibc"
-LICENSE = "MIT"
-PR = "r1"
-
-inherit e
-
-SRC_URI = "${E_CVS};module=e17/apps/eclair;date=${PV}"
-S = "${WORKDIR}/eclair"
-
-EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc"
-
-FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir} ${sbindir}"
-
diff --git a/packages/e17/edje-viewer_cvs.bb b/packages/e17/edje-viewer_cvs.bb
new file mode 100644
index 0000000000..9b21c042a0
--- /dev/null
+++ b/packages/e17/edje-viewer_cvs.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "Edje_Viewer is just that."
+DEPENDS = "etk"
+LICENSE = "MIT"
+PV = "0.0.0+svn${SRCDATE}"
+PR = "r0"
+
+inherit e
+
+SRC_URI = "${E_CVS};module=e17/apps/edje_viewer"
+S = "${WORKDIR}/edje_viewer"
+
+FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir} ${sbindir}"
diff --git a/packages/e17/engage/no-local-includes.patch b/packages/e17/engage/no-local-includes.patch
deleted file mode 100644
index 09cc8da98d..0000000000
--- a/packages/e17/engage/no-local-includes.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- engage/src/module/Makefile.am~no-local-includes
-+++ engage/src/module/Makefile.am
-@@ -10,8 +10,7 @@
- 
- # the module .so file
- INCLUDES               = -I. \
--			 -I$(top_srcdir) \
--			 -I$(includedir) \
-+			 -I$(top_srcdir) \
- 			 @e_cflags@
- pkgdir                 = @e_modules@/engage/$(MODULE_ARCH)
- pkg_LTLIBRARIES        = module.la
diff --git a/packages/e17/engage_20060128.bb b/packages/e17/engage_20060128.bb
deleted file mode 100644
index ee71e1a0bb..0000000000
--- a/packages/e17/engage_20060128.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-DESCRIPTION = "Engage is the E17 icon dock"
-DEPENDS = "evas-x11 ecore-x11 esmart-x11 imlib2-x11 edje ewl e-wm"
-LICENSE = "MIT"
-PR = "r2"
-
-inherit e
-
-SRC_URI = "${E_CVS};module=misc/engage;date=${PV} \
-           file://no-local-includes.patch;patch=1"
-S = "${WORKDIR}/engage"
-
-EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc"
-
-FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir} ${sbindir}"
-
diff --git a/packages/e17/entice_20060128.bb b/packages/e17/entice_20060128.bb
deleted file mode 100644
index 5b433de015..0000000000
--- a/packages/e17/entice_20060128.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-DESCRIPTION = "Entice is the E17 picture viewer"
-# can also depend on GIMP for editing
-LICENSE = "MIT"
-DEPENDS = "edb evas-x11 ecore-x11 edje epsilon esmart-x11"
-PR = "r4"
-
-inherit e
-
-RDEPENDS += "libesmart-container-plugins libesmart-thumb0 libesmart-trans-x11-0 libesmart-file-dialog0"
-
-SRC_URI = "${E_CVS};module=e17/apps/entice;date=${PV}"
-S = "${WORKDIR}/entice"
-
-EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc"
-
-FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir} ${sbindir}"
-
diff --git a/packages/e17/entice_20060416.bb b/packages/e17/entice_cvs.bb
index 663ee97cd8..62a80ead47 100644
--- a/packages/e17/entice_20060416.bb
+++ b/packages/e17/entice_cvs.bb
@@ -1,17 +1,15 @@
 DESCRIPTION = "Entice is the E17 picture viewer"
 # can also depend on GIMP for editing
 LICENSE = "MIT"
-DEPENDS = "edb evas-x11 ecore-x11 edje epsilon esmart-x11"
-PR = "r1"
+DEPENDS = "edb evas ecore edje epsilon esmart"
+PV = "0.0.0+cvs${SRCDATE}"
+PR = "r0"
 
 inherit e
 
-RDEPENDS += "libesmart-container-plugins libesmart-thumb libesmart-trans-x11-0 libesmart-file-dialog"
-
-SRC_URI = "${E_CVS};module=e17/apps/entice;date=${PV}"
+SRC_URI = "${E_CVS};module=e17/apps/entice"
 S = "${WORKDIR}/entice"
 
 EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc"
 
 FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir} ${sbindir}"
-
diff --git a/packages/e17/entrance-0.9.0.009/Xserver.patch b/packages/e17/entrance-0.9.0.009/Xserver.patch
deleted file mode 100644
index 296a7bccf4..0000000000
--- a/packages/e17/entrance-0.9.0.009/Xserver.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- entrance/src/daemon/Entranced.h.~1.7.~	2004-05-19 21:02:09.000000000 -0700
-+++ entrance/src/daemon/Entranced.h	2005-08-13 02:00:02.000000000 -0700
-@@ -18,7 +18,7 @@
- 
- #define ENTRANCED_DEBUG 1
- 
--#define X_SERVER "/usr/X11R6/bin/X -quiet"
-+#define X_SERVER "/etc/X11/Xserver"
- //#define X_SERVER "/usr/X11R6/bin/Xnest -full"
- #define X_DISP ":0"             /* only used if DISPLAY variable is NOT set */
- #define ENTRANCE PREFIX "/bin/entrance_wrapper"
---- entrance/src/daemon/spawner.c.~1.25.~	2005-05-28 02:31:14.000000000 -0700
-+++ entrance/src/daemon/spawner.c	2005-08-13 02:20:13.000000000 -0700
-@@ -155,7 +155,7 @@
-         sigaction(SIGUSR1, &_entrance_x_sa, NULL);
-       /* FIXME: need to parse command and NOT go thru /bin/sh!!!! */
-       /* why? some /bin/sh's wont pass on this SIGUSR1 thing... */
--        execl("/bin/sh", "/bin/sh", "-c", x_cmd, NULL);
-+        execl("/bin/bash", "/bin/bash", "-c", x_cmd, NULL);
-         syslog(LOG_WARNING, "Could not execute X server.");
-         exit(1);
-      default:
diff --git a/packages/e17/entrance-0.9.0.009/allow-missing-xsession.patch b/packages/e17/entrance-0.9.0.009/allow-missing-xsession.patch
deleted file mode 100644
index 74289ad3c8..0000000000
--- a/packages/e17/entrance-0.9.0.009/allow-missing-xsession.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Index: entrance-0.9.0.009/configure.in
-===================================================================
---- entrance-0.9.0.009.orig/configure.in
-+++ entrance-0.9.0.009/configure.in
-@@ -184,10 +184,10 @@ AC_ARG_WITH(xsession,
- 	    fi
- 	]
- )
--if test ! -x "$xsession" ; then
--    AC_MSG_WARN([** $xsession does not exist or is not executable **])
--    AC_MSG_WARN([** Please consider overriding with --with-xsession **])
--fi
-+#if test ! -x "$xsession" ; then
-+#    AC_MSG_WARN([** $xsession does not exist or is not executable **])
-+#    AC_MSG_WARN([** Please consider overriding with --with-xsession **])
-+#fi
- 
- AC_DEFINE_UNQUOTED(ENTRANCE_XSESSION, "$xsession", [Xsession script])
- AC_SUBST(xsession)
diff --git a/packages/e17/entrance-0.9.0.009/config-db.patch b/packages/e17/entrance-0.9.0.009/config-db.patch
deleted file mode 100644
index aecbfb6867..0000000000
--- a/packages/e17/entrance-0.9.0.009/config-db.patch
+++ /dev/null
@@ -1,119 +0,0 @@
-Index: entrance-0.9.0.009/data/config/build_config.sh.in
-===================================================================
---- entrance-0.9.0.009.orig/data/config/build_config.sh.in
-+++ entrance-0.9.0.009/data/config/build_config.sh.in
-@@ -1,45 +1,45 @@
- #!/bin/sh -e
- 
--usage() {
--	cat <<-EOF
--	Usage: $0 [options]
--
--	Options:
--	  -d, --dir     Session directory to scan
--	  -c, --file    Config file (default: $DB)
--	  -h, --help    This help output :p
--	EOF
--
--	if [ "$1" = "1" ] ; then
--		echo ""
--		echo "ERROR: $2"
--	fi
--
--	exit $1
--}
--
--SESSION_DIR=""
--DB="./entrance_config.cfg"
--
--while [ -n "$1" ] ; do
--	case $1 in
--		-d) shift; SESSION_DIR=$1;;
--		-c) shift; DB=$1;;
--		-h) usage 0;;
--		*)  usage 1 "Unknown option: $1";;
--	esac
--	shift
--done
--
--if [ -z "$DB" ] || [ -d "$DB" ] ; then
--	usage 1 "Invalid DB argument"
--fi
--
--FROM=$SESSION_DIR
--if [ -z "$FROM" ] ; then
--	FROM="defaults"
--fi
--echo "Generating config file '$DB' from '$FROM' ..."
-+#usage() {
-+#	cat <<-EOF
-+#	Usage: $0 [options]
-+#
-+#	Options:
-+#	  -d, --dir     Session directory to scan
-+#	  -c, --file    Config file (default: $DB)
-+#	  -h, --help    This help output :p
-+#	EOF
-+#
-+#	if [ "$1" = "1" ] ; then
-+#		echo ""
-+#		echo "ERROR: $2"
-+#	fi
-+#
-+#	exit $1
-+#}
-+#
-+#SESSION_DIR=""
-+#DB="./entrance_config.cfg"
-+#
-+#while [ -n "$1" ] ; do
-+#	case $1 in
-+#		-d) shift; SESSION_DIR=$1;;
-+#		-c) shift; DB=$1;;
-+#		-h) usage 0;;
-+#		*)  usage 1 "Unknown option: $1";;
-+#	esac
-+#	shift
-+#done
-+#
-+#if [ -z "$DB" ] || [ -d "$DB" ] ; then
-+#	usage 1 "Invalid DB argument"
-+#fi
-+#
-+#FROM=$SESSION_DIR
-+#if [ -z "$FROM" ] ; then
-+#	FROM="defaults"
-+#fi
-+#echo "Generating config file '$DB' from '$FROM' ..."
- 
- rm -f $DB || exit 1
- 
-@@ -59,10 +59,10 @@ ecore_config -c $DB -k /entrance/time_fo
- #ecore_config -c $DB -k /entrance/fonts/0/-s -s "/usr/share/fonts/truetype/"
- #ecore_config -c $DB -k /entrance/fonts/1/-s -s "/usr/X11R6/lib/X11/fonts/Truetype/"
- ecore_config -c $DB -k /entrance/greeting/before -s "Welcome to"
--ecore_config -c $DB -k /entrance/greeting/after -s ""
-+ecore_config -c $DB -k /entrance/greeting/after -s " e17/OE"
- 
- count=0
--ecore_config -c $DB -k /entrance/session/0/session -s "default"
-+ecore_config -c $DB -k /entrance/session/0/session -s "/etc/X11/Sessions/Enlightenment"
- ecore_config -c $DB -k /entrance/session/0/title -s "Default"
- ecore_config -c $DB -k /entrance/session/0/icon -s "default.png"
- #if [ -z "$SESSION_DIR" ] ; then
-@@ -92,7 +92,7 @@ ecore_config -c $DB -k /entrance/session
- #	done
- #fi
- count=`(expr $count + 1)`
--ecore_config -c $DB -k /entrance/session/$count/session -s "failsafe"
-+ecore_config -c $DB -k /entrance/session/$count/session -s "/etc/X11/Sessions/Enlightenment"
- ecore_config -c $DB -k /entrance/session/$count/title -s "Failsafe"
- ecore_config -c $DB -k /entrance/session/$count/icon -s "failsafe.png"
- count=`(expr $count + 1)`
-@@ -107,5 +107,5 @@ ecore_config -c $DB -k /entrance/autolog
- ecore_config -c $DB -k /entrance/presel/mode -i 1
- 
- # for Entranced
--ecore_config -c $DB -k /entranced/xserver -s "@xbin@/X -quiet -nolisten tcp@ENTRANCE_VT_ARG@"
-+ecore_config -c $DB -k /entranced/xserver -s "/etc/X11/Xserver"
- ecore_config -c $DB -k /entranced/attempts -i 5
diff --git a/packages/e17/entrance-0.9.0.009/disable-autodetect.patch b/packages/e17/entrance-0.9.0.009/disable-autodetect.patch
deleted file mode 100644
index a0412b3706..0000000000
--- a/packages/e17/entrance-0.9.0.009/disable-autodetect.patch
+++ /dev/null
@@ -1,8 +0,0 @@
-diff -Nur entrance-0.9.0.007~/Makefile.am entrance-0.9.0.007/Makefile.am
---- entrance-0.9.0.007~/Makefile.am	2006-05-11 12:18:07.000000000 -0700
-+++ entrance-0.9.0.007/Makefile.am	2006-05-11 13:01:41.000000000 -0700
-@@ -23,4 +23,3 @@
- 	fi
- 
- install-data-am:
--	sh data/config/autodetect.sh || :
diff --git a/packages/e17/entrance-0.9.0.009/fix-auth-mode.patch b/packages/e17/entrance-0.9.0.009/fix-auth-mode.patch
deleted file mode 100644
index 46e530b256..0000000000
--- a/packages/e17/entrance-0.9.0.009/fix-auth-mode.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: entrance-0.9.0.009/data/config/build_config.sh.in
-===================================================================
---- entrance-0.9.0.009.orig/data/config/build_config.sh.in
-+++ entrance-0.9.0.009/data/config/build_config.sh.in
-@@ -44,7 +44,7 @@
- rm -f $DB || exit 1
- 
- # set auth to 1 for pam, 2 for shadow
--ecore_config -c $DB  -k /entrance/auth -i @auth_mode@
-+ecore_config -c $DB  -k /entrance/auth -i 0
- 
- # uncomment the below to enable experimental OpenGL hardware acceleration
- #ecore_config -c $DB -k /entrance/engine -i 1
diff --git a/packages/e17/entrance-0.9.0.009/run-Xinit.patch b/packages/e17/entrance-0.9.0.009/run-Xinit.patch
deleted file mode 100644
index 1d6c2307f7..0000000000
--- a/packages/e17/entrance-0.9.0.009/run-Xinit.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- entrance/src/daemon/entrance_wrapper.in.~1.1.~	2003-01-31 13:57:06.000000000 -0800
-+++ entrance/src/daemon/entrance_wrapper.in	2005-08-15 20:13:57.000000000 -0700
-@@ -5,8 +5,13 @@
- 
- test -f /etc/profile && . /etc/profile
- 
-+if [ -x /etc/X11/Xinit.d/99gpe-login ]; then
-+		chmod -x /etc/X11/Xinit.d/99gpe-login
-+fi
-+
-+/etc/X11/Xinit
-+
- exec @prefix@/bin/entrance "$@"
- 
- #fallback
- exec entrance "$@"
--
diff --git a/packages/e17/entrance-0.9.0.009/set-display-env.patch b/packages/e17/entrance-0.9.0.009/set-display-env.patch
deleted file mode 100644
index 37bfc1c2c8..0000000000
--- a/packages/e17/entrance-0.9.0.009/set-display-env.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nur entrance~/src/daemon/spawner.c entrance/src/daemon/spawner.c
---- entrance~/src/daemon/spawner.c	2005-09-02 14:00:29.000000000 -0700
-+++ entrance/src/daemon/spawner.c	2005-09-02 15:53:31.000000000 -0700
-@@ -199,6 +199,7 @@
-       free(d->client.homedir);
-    d->client.homedir = NULL;
- 
-+   setenv("DISPLAY", d->name, 1);
-    snprintf(entrance_cmd, PATH_MAX, "%s -d %s", ENTRANCE, d->name);
-    if (d->config)
-       snprintf(entrance_cmd, PATH_MAX, "%s -d %s -c \"%s\" -z %d", 
diff --git a/packages/e17/entrance-0.9.0.009/use-bash.patch b/packages/e17/entrance-0.9.0.009/use-bash.patch
deleted file mode 100644
index 7dfab83711..0000000000
--- a/packages/e17/entrance-0.9.0.009/use-bash.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-Index: entrance-0.9.0.009/src/client/entrance_session.c
-===================================================================
---- entrance-0.9.0.009.orig/src/client/entrance_session.c
-+++ entrance-0.9.0.009/src/client/entrance_session.c
-@@ -854,7 +854,7 @@ _entrance_session_execute_in_shell(char 
-    if (shell && (strlen(shell) > 0))
-       shell_cmd = shell;
-    else
--      shell_cmd = strdup("/bin/sh");
-+      shell_cmd = strdup("/bin/bash");
- 
-    if (session_name)
-       snprintf(buf, sizeof(buf), "%s %s", session_cmd, session_name);
-@@ -869,9 +869,9 @@ _entrance_session_execute_in_shell(char 
-    if (res == -1)
-       /* TODO: should actually hit the user in the face with this message */
-       syslog(LOG_NOTICE,
--             "Neither '%s' or '/bin/sh' are working login shells for user '%s'. Your session may not function properly. ",
-+             "Neither '%s' or '/bin/bash' are working login shells for user '%s'. Your session may not function properly. ",
-              shell, user);
--      shell_cmd = strdup("/bin/sh");
-+      shell_cmd = strdup("/bin/bash");
-    
-    res = execlp(shell_cmd, shell_cmd, "-c", buf, NULL);
- 
-Index: entrance-0.9.0.009/src/client/main.c
-===================================================================
---- entrance-0.9.0.009.orig/src/client/main.c
-+++ entrance-0.9.0.009/src/client/main.c
-@@ -453,7 +453,7 @@ reboot_cb(void *data, Evas_Object * o, c
-       {
-         case 0:
-            if (execl
--               ("/bin/sh", "/bin/sh", "-c", "/sbin/shutdown -r now", NULL))
-+               ("/bin/bash", "/bin/bash", "-c", "/sbin/shutdown -r now", NULL))
-            {
-               syslog(LOG_CRIT,
-                      "Reboot failed: Unable to execute /sbin/shutdown");
-@@ -495,7 +495,7 @@ shutdown_cb(void *data, Evas_Object * o,
-       {
-         case 0:
-            if (execl
--               ("/bin/sh", "/bin/sh", "-c", "/sbin/shutdown -h now", NULL))
-+               ("/bin/bash", "/bin/bash", "-c", "/sbin/shutdown -h now", NULL))
-            {
-               syslog(LOG_CRIT,
-                      "Shutdown failed: Unable to execute /sbin/shutdown");
-Index: entrance-0.9.0.009/src/daemon/entrance_wrapper.in
-===================================================================
---- entrance-0.9.0.009.orig/src/daemon/entrance_wrapper.in
-+++ entrance-0.9.0.009/src/daemon/entrance_wrapper.in
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/bin/bash
- # Wrapper script to set up login environment:
- # Load up all the junk in /etc/profile first, and then
- # pass control to entrance proper.
diff --git a/packages/e17/entrance/allow-missing-xsession.patch b/packages/e17/entrance/allow-missing-xsession.patch
index c475e46fe2..74289ad3c8 100644
--- a/packages/e17/entrance/allow-missing-xsession.patch
+++ b/packages/e17/entrance/allow-missing-xsession.patch
@@ -1,18 +1,18 @@
---- entrance/configure.in.~1.42.~	2005-07-29 23:15:58.000000000 -0700
-+++ entrance/configure.in	2005-08-13 03:11:41.000000000 -0700
-@@ -190,11 +190,11 @@
+Index: entrance-0.9.0.009/configure.in
+===================================================================
+--- entrance-0.9.0.009.orig/configure.in
++++ entrance-0.9.0.009/configure.in
+@@ -184,10 +184,10 @@ AC_ARG_WITH(xsession,
  	    fi
  	]
  )
--if test ! -x $xsession ; then
--    AC_MSG_WARN([** no $xsession file on this system **])
--    AC_MSG_WARN([** Perhaps you need to specify --with-xsession **])
--    xsession="You should reconfigure --with-xsession"
+-if test ! -x "$xsession" ; then
+-    AC_MSG_WARN([** $xsession does not exist or is not executable **])
+-    AC_MSG_WARN([** Please consider overriding with --with-xsession **])
 -fi
-+#if test ! -x $xsession ; then
-+#    AC_MSG_WARN([** no $xsession file on this system **])
-+#    AC_MSG_WARN([** Perhaps you need to specify --with-xsession **])
-+#    xsession="You should reconfigure --with-xsession"
++#if test ! -x "$xsession" ; then
++#    AC_MSG_WARN([** $xsession does not exist or is not executable **])
++#    AC_MSG_WARN([** Please consider overriding with --with-xsession **])
 +#fi
  
  AC_DEFINE_UNQUOTED(ENTRANCE_XSESSION, "$xsession", [Xsession script])
diff --git a/packages/e17/entrance/config-db.patch b/packages/e17/entrance/config-db.patch
index 83ed3acf84..aecbfb6867 100644
--- a/packages/e17/entrance/config-db.patch
+++ b/packages/e17/entrance/config-db.patch
@@ -1,43 +1,119 @@
---- entrance/data/config/build_config.sh.in.~1.18.~	2006-01-11 18:46:48.000000000 -0800
-+++ entrance/data/config/build_config.sh.in	2006-01-11 21:52:54.000000000 -0800
-@@ -18,29 +18,14 @@
+Index: entrance-0.9.0.009/data/config/build_config.sh.in
+===================================================================
+--- entrance-0.9.0.009.orig/data/config/build_config.sh.in
++++ entrance-0.9.0.009/data/config/build_config.sh.in
+@@ -1,45 +1,45 @@
+ #!/bin/sh -e
+ 
+-usage() {
+-	cat <<-EOF
+-	Usage: $0 [options]
+-
+-	Options:
+-	  -d, --dir     Session directory to scan
+-	  -c, --file    Config file (default: $DB)
+-	  -h, --help    This help output :p
+-	EOF
+-
+-	if [ "$1" = "1" ] ; then
+-		echo ""
+-		echo "ERROR: $2"
+-	fi
+-
+-	exit $1
+-}
+-
+-SESSION_DIR=""
+-DB="./entrance_config.cfg"
+-
+-while [ -n "$1" ] ; do
+-	case $1 in
+-		-d) shift; SESSION_DIR=$1;;
+-		-c) shift; DB=$1;;
+-		-h) usage 0;;
+-		*)  usage 1 "Unknown option: $1";;
+-	esac
+-	shift
+-done
+-
+-if [ -z "$DB" ] || [ -d "$DB" ] ; then
+-	usage 1 "Invalid DB argument"
+-fi
+-
+-FROM=$SESSION_DIR
+-if [ -z "$FROM" ] ; then
+-	FROM="defaults"
+-fi
+-echo "Generating config file '$DB' from '$FROM' ..."
++#usage() {
++#	cat <<-EOF
++#	Usage: $0 [options]
++#
++#	Options:
++#	  -d, --dir     Session directory to scan
++#	  -c, --file    Config file (default: $DB)
++#	  -h, --help    This help output :p
++#	EOF
++#
++#	if [ "$1" = "1" ] ; then
++#		echo ""
++#		echo "ERROR: $2"
++#	fi
++#
++#	exit $1
++#}
++#
++#SESSION_DIR=""
++#DB="./entrance_config.cfg"
++#
++#while [ -n "$1" ] ; do
++#	case $1 in
++#		-d) shift; SESSION_DIR=$1;;
++#		-c) shift; DB=$1;;
++#		-h) usage 0;;
++#		*)  usage 1 "Unknown option: $1";;
++#	esac
++#	shift
++#done
++#
++#if [ -z "$DB" ] || [ -d "$DB" ] ; then
++#	usage 1 "Invalid DB argument"
++#fi
++#
++#FROM=$SESSION_DIR
++#if [ -z "$FROM" ] ; then
++#	FROM="defaults"
++#fi
++#echo "Generating config file '$DB' from '$FROM' ..."
+ 
+ rm -f $DB || exit 1
+ 
+@@ -59,10 +59,10 @@ ecore_config -c $DB -k /entrance/time_fo
  #ecore_config -c $DB -k /entrance/fonts/0/-s -s "/usr/share/fonts/truetype/"
  #ecore_config -c $DB -k /entrance/fonts/1/-s -s "/usr/X11R6/lib/X11/fonts/Truetype/"
  ecore_config -c $DB -k /entrance/greeting/before -s "Welcome to"
 -ecore_config -c $DB -k /entrance/greeting/after -s ""
--ecore_config -c $DB -k /entrance/session/count -i 7
--ecore_config -c $DB -k /entrance/session/0/session -s "default"
 +ecore_config -c $DB -k /entrance/greeting/after -s " e17/OE"
-+ecore_config -c $DB -k /entrance/session/count -i 2
+ 
+ count=0
+-ecore_config -c $DB -k /entrance/session/0/session -s "default"
 +ecore_config -c $DB -k /entrance/session/0/session -s "/etc/X11/Sessions/Enlightenment"
  ecore_config -c $DB -k /entrance/session/0/title -s "Default"
  ecore_config -c $DB -k /entrance/session/0/icon -s "default.png"
- ecore_config -c $DB -k /entrance/session/1/icon -s "enlightenment.png"
- ecore_config -c $DB -k /entrance/session/1/title -s "E17"
--ecore_config -c $DB -k /entrance/session/1/session -s "@prefix@/bin/enlightenment"
--ecore_config -c $DB -k /entrance/session/2/session -s "kde"
--ecore_config -c $DB -k /entrance/session/2/title -s "KDE"
--ecore_config -c $DB -k /entrance/session/2/icon -s "kde.png"
--ecore_config -c $DB -k /entrance/session/3/session -s "gnome"
--ecore_config -c $DB -k /entrance/session/3/title -s "Gnome"
--ecore_config -c $DB -k /entrance/session/3/icon -s "gnome.png"
--ecore_config -c $DB -k /entrance/session/4/session -s "Enlightenment"
--ecore_config -c $DB -k /entrance/session/4/title -s "E16"
--ecore_config -c $DB -k /entrance/session/4/icon -s "enlightenment.png"
--ecore_config -c $DB -k /entrance/session/5/session -s "xfce"
--ecore_config -c $DB -k /entrance/session/5/title -s "XFce"
--ecore_config -c $DB -k /entrance/session/5/icon -s "xfce.png"
--ecore_config -c $DB -k /entrance/session/6/session -s "failsafe"
--ecore_config -c $DB -k /entrance/session/6/title -s "Failsafe"
--ecore_config -c $DB -k /entrance/session/6/icon -s "failsafe.png"
-+ecore_config -c $DB -k /entrance/session/1/session -s "/etc/X11/Sessions/Enlightenment"
- ecore_config -c $DB -k /entrance/system/reboot -i 1
- ecore_config -c $DB -k /entrance/system/halt -i 1
- ecore_config -c $DB -k /entrance/user/remember -i 1
-@@ -50,5 +35,5 @@
+ #if [ -z "$SESSION_DIR" ] ; then
+@@ -92,7 +92,7 @@ ecore_config -c $DB -k /entrance/session
+ #	done
+ #fi
+ count=`(expr $count + 1)`
+-ecore_config -c $DB -k /entrance/session/$count/session -s "failsafe"
++ecore_config -c $DB -k /entrance/session/$count/session -s "/etc/X11/Sessions/Enlightenment"
+ ecore_config -c $DB -k /entrance/session/$count/title -s "Failsafe"
+ ecore_config -c $DB -k /entrance/session/$count/icon -s "failsafe.png"
+ count=`(expr $count + 1)`
+@@ -107,5 +107,5 @@ ecore_config -c $DB -k /entrance/autolog
  ecore_config -c $DB -k /entrance/presel/mode -i 1
  
  # for Entranced
--ecore_config -c $DB -k /entranced/xserver -s "/usr/X11R6/bin/X -quiet -nolisten tcp"
+-ecore_config -c $DB -k /entranced/xserver -s "@xbin@/X -quiet -nolisten tcp@ENTRANCE_VT_ARG@"
 +ecore_config -c $DB -k /entranced/xserver -s "/etc/X11/Xserver"
  ecore_config -c $DB -k /entranced/attempts -i 5
diff --git a/packages/e17/entrance/fix-auth-mode.patch b/packages/e17/entrance/fix-auth-mode.patch
index 1ec520f768..46e530b256 100644
--- a/packages/e17/entrance/fix-auth-mode.patch
+++ b/packages/e17/entrance/fix-auth-mode.patch
@@ -1,7 +1,9 @@
---- entrance/data/config/build_config.sh.in~	2006-01-30 07:01:47.000000000 -0800
-+++ entrance/data/config/build_config.sh.in	2006-02-01 22:22:04.000000000 -0800
-@@ -3,7 +3,7 @@
- rm -f $DB
+Index: entrance-0.9.0.009/data/config/build_config.sh.in
+===================================================================
+--- entrance-0.9.0.009.orig/data/config/build_config.sh.in
++++ entrance-0.9.0.009/data/config/build_config.sh.in
+@@ -44,7 +44,7 @@
+ rm -f $DB || exit 1
  
  # set auth to 1 for pam, 2 for shadow
 -ecore_config -c $DB  -k /entrance/auth -i @auth_mode@
diff --git a/packages/e17/entrance/use-bash.patch b/packages/e17/entrance/use-bash.patch
index 58ef8f556f..7dfab83711 100644
--- a/packages/e17/entrance/use-bash.patch
+++ b/packages/e17/entrance/use-bash.patch
@@ -1,19 +1,33 @@
-diff -Nur entrance~/src/client/entrance_session.c entrance/src/client/entrance_session.c
---- entrance~/src/client/entrance_session.c	2006-02-02 19:51:40.000000000 -0800
-+++ entrance/src/client/entrance_session.c	2006-02-02 19:59:24.000000000 -0800
-@@ -495,7 +495,7 @@
-    entrance_session_free(e);
-    /* replace this process with a clean small one that just waits for its */
-    /* child to exit.. passed on the cmd-line */
--   execl("/bin/sh", "/bin/sh", "-l", "-c", buf, NULL);
-+   execl("/bin/bash", "/bin/bash", "-l", "-c", buf, NULL);
- }
+Index: entrance-0.9.0.009/src/client/entrance_session.c
+===================================================================
+--- entrance-0.9.0.009.orig/src/client/entrance_session.c
++++ entrance-0.9.0.009/src/client/entrance_session.c
+@@ -854,7 +854,7 @@ _entrance_session_execute_in_shell(char 
+    if (shell && (strlen(shell) > 0))
+       shell_cmd = shell;
+    else
+-      shell_cmd = strdup("/bin/sh");
++      shell_cmd = strdup("/bin/bash");
  
+    if (session_name)
+       snprintf(buf, sizeof(buf), "%s %s", session_cmd, session_name);
+@@ -869,9 +869,9 @@ _entrance_session_execute_in_shell(char 
+    if (res == -1)
+       /* TODO: should actually hit the user in the face with this message */
+       syslog(LOG_NOTICE,
+-             "Neither '%s' or '/bin/sh' are working login shells for user '%s'. Your session may not function properly. ",
++             "Neither '%s' or '/bin/bash' are working login shells for user '%s'. Your session may not function properly. ",
+              shell, user);
+-      shell_cmd = strdup("/bin/sh");
++      shell_cmd = strdup("/bin/bash");
+    
+    res = execlp(shell_cmd, shell_cmd, "-c", buf, NULL);
  
-diff -Nur entrance~/src/client/main.c entrance/src/client/main.c
---- entrance~/src/client/main.c	2006-02-02 19:51:40.000000000 -0800
-+++ entrance/src/client/main.c	2006-02-02 19:57:24.000000000 -0800
-@@ -392,7 +392,7 @@
+Index: entrance-0.9.0.009/src/client/main.c
+===================================================================
+--- entrance-0.9.0.009.orig/src/client/main.c
++++ entrance-0.9.0.009/src/client/main.c
+@@ -453,7 +453,7 @@ reboot_cb(void *data, Evas_Object * o, c
        {
          case 0:
             if (execl
@@ -22,7 +36,7 @@ diff -Nur entrance~/src/client/main.c entrance/src/client/main.c
             {
                syslog(LOG_CRIT,
                       "Reboot failed: Unable to execute /sbin/shutdown");
-@@ -434,7 +434,7 @@
+@@ -495,7 +495,7 @@ shutdown_cb(void *data, Evas_Object * o,
        {
          case 0:
             if (execl
@@ -31,24 +45,13 @@ diff -Nur entrance~/src/client/main.c entrance/src/client/main.c
             {
                syslog(LOG_CRIT,
                       "Shutdown failed: Unable to execute /sbin/shutdown");
-diff -Nur entrance~/src/daemon/entrance_wrapper.in entrance/src/daemon/entrance_wrapper.in
---- entrance~/src/daemon/entrance_wrapper.in	2006-02-02 19:51:40.000000000 -0800
-+++ entrance/src/daemon/entrance_wrapper.in	2006-02-02 19:56:43.000000000 -0800
+Index: entrance-0.9.0.009/src/daemon/entrance_wrapper.in
+===================================================================
+--- entrance-0.9.0.009.orig/src/daemon/entrance_wrapper.in
++++ entrance-0.9.0.009/src/daemon/entrance_wrapper.in
 @@ -1,4 +1,4 @@
 -#!/bin/sh
 +#!/bin/bash
  # Wrapper script to set up login environment:
  # Load up all the junk in /etc/profile first, and then
  # pass control to entrance proper.
-diff -Nur entrance~/src/daemon/spawner.c entrance/src/daemon/spawner.c
---- entrance~/src/daemon/spawner.c	2006-02-02 19:51:40.000000000 -0800
-+++ entrance/src/daemon/spawner.c	2006-02-02 19:57:10.000000000 -0800
-@@ -162,7 +162,7 @@
-         sigaction(SIGUSR1, &_entrance_x_sa, NULL);
-       /* FIXME: need to parse command and NOT go thru /bin/sh!!!! */
-       /* why? some /bin/sh's wont pass on this SIGUSR1 thing... */
--        execl("/bin/sh", "/bin/sh", "-c", x_cmd, NULL);
-+        execl("/bin/bash", "/bin/bash", "-c", x_cmd, NULL);
-         syslog(LOG_WARNING, "Could not execute X server.");
-         exit(1);
-      default:
diff --git a/packages/e17/entrance_0.9.0.009.bb b/packages/e17/entrance_0.9.0.009.bb
deleted file mode 100644
index 6e21926860..0000000000
--- a/packages/e17/entrance_0.9.0.009.bb
+++ /dev/null
@@ -1,40 +0,0 @@
-DESCRIPTION = "Entrance is the Enlightenment login manager"
-LICENSE = "MIT"
-# can also use pam and crypt
-DEPENDS = "evas-x11 ecore-x11 edje esmart-x11 bash keylaunch xserver-common login-manager"
-RDEPENDS += "bash keylaunch xserver-common glibc-gconv-iso8859-1 login-manager entrance-themes"
-HOMEPAGE = "http://www.enlightenment.org"
-PR = "r1"
-
-DEFAULT_PREFERENCE = "-1"
-
-inherit e
-
-SRC_URI = "${E_URI}/entrance-${PV}.tar.gz \
-           file://config-db.patch;patch=1 \
-           file://allow-missing-xsession.patch;patch=1 \
-           file://run-Xinit.patch;patch=1 \
-           file://fix-auth-mode.patch;patch=1 \
-           file://use-bash.patch;patch=1 \
-           file://Sessions"
-#           file://disable-autodetect.patch;patch=1 \
-#           file://set-display-env.patch;patch=1 \
-
-S = "${WORKDIR}/entrance-${PV}"
-
-EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc \
-                --with-xsession=/etc/X11/Xsession \
-                --with-auth-mode=0"
-
-FILES_${PN}-dbg += "${libexecdir}/entrance/.debug"
-FILES_${PN} += "${bindir} ${sbindir} /etc ${datadir} ${libexecdir}"
-
-do_install_append() {
-	install -d ${D}/etc/X11/Xsession.d
-	install -d ${D}/etc/X11/Sessions
-
-	install -m 755 ${WORKDIR}/Sessions/* ${D}/etc/X11/Sessions
-
-	install -d ${D}/etc/X11/login-managers/
-	mv ${D}/etc/init.d/entrance ${D}/etc/X11/login-managers/entrance
-}
diff --git a/packages/e17/entrance_0.9.0.007.bb b/packages/e17/entrance_0.9.0.010.bb
index 50126cb5a9..4c47f1d2ab 100644
--- a/packages/e17/entrance_0.9.0.007.bb
+++ b/packages/e17/entrance_0.9.0.010.bb
@@ -1,21 +1,18 @@
 DESCRIPTION = "Entrance is the Enlightenment login manager"
 LICENSE = "MIT"
 # can also use pam and crypt
-DEPENDS = "evas-x11 ecore-x11 edje esmart-x11 bash keylaunch xserver-common login-manager"
-RDEPENDS += "bash keylaunch xserver-common glibc-gconv-iso8859-1 login-manager entrance-themes"
-HOMEPAGE = "http://www.enlightenment.org"
-PR = "r14"
+DEPENDS = "evas ecore edje esmart bash keylaunch xserver-common login-manager"
+RDEPENDS += "glibc-gconv-iso8859-1 entrance-themes"
+PR = "r0"
 
 inherit e
 
-SRC_URI = "${E_URI}/entrance-${PV}.tar.gz \
+SRC_URI += "\
            file://config-db.patch;patch=1 \
            file://allow-missing-xsession.patch;patch=1 \
            file://run-Xinit.patch;patch=1 \
-           file://set-display-env.patch;patch=1 \
            file://fix-auth-mode.patch;patch=1 \
            file://use-bash.patch;patch=1 \
-           file://disable-autodetect.patch;patch=1 \
            file://Sessions"
 
 S = "${WORKDIR}/entrance-${PV}"
@@ -24,7 +21,7 @@ EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc \
                 --with-xsession=/etc/X11/Xsession \
                 --with-auth-mode=0"
 
-FILES_${PN} += "${bindir} ${sbindir} /etc ${datadir}"
+FILES_${PN}-dbg += "${libexecdir}/entrance/.debug/*"
 
 do_install_append() {
 	install -d ${D}/etc/X11/Xsession.d
diff --git a/packages/e17/examine_20060128.bb b/packages/e17/examine_cvs.bb
index b406ea3b5f..89d0dd5755 100644
--- a/packages/e17/examine_20060128.bb
+++ b/packages/e17/examine_cvs.bb
@@ -1,11 +1,12 @@
-DESCRIPTION = "examine, the program configurator"
-DEPENDS = "virtual/ecore ewl"
+DESCRIPTION = "Examine, the program configurator"
+DEPENDS = "ewl"
 LICENSE = "MIT"
+PV = "0.0.0+cvs${SRCDATE}"
 PR = "r0"
 
 inherit e
 
-SRC_URI = "${E_CVS};module=e17/apps/examine;date=${PV}"
+SRC_URI = "${E_CVS};module=e17/apps/examine"
 S = "${WORKDIR}/examine"
 
 EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc"
diff --git a/packages/e17/expedite_cvs.bb b/packages/e17/expedite_cvs.bb
index 69e0df9dbe..ea376c2442 100644
--- a/packages/e17/expedite_cvs.bb
+++ b/packages/e17/expedite_cvs.bb
@@ -1,13 +1,12 @@
 DESCRIPTION = "Expedite is a comprehensive benchmarking suite for evas"
-DEPENDS = "evas-x11"
+DEPENDS = "evas"
 LICENSE = "MIT"
-PV = "0.0+cvs${SRCDATE}"
+PV = "0.0.0+cvs${SRCDATE}"
 PR = "r0"
 
 inherit e
 
 SRC_URI = "cvs://anonymous@anoncvs.enlightenment.org/var/cvs/e;module=e17/apps/expedite"
-
 S = "${WORKDIR}/${PN}"
 
 do_configure_append() {
diff --git a/packages/e17/rage_0.2.0.003.bb b/packages/e17/rage_0.2.0.003.bb
new file mode 100644
index 0000000000..ab527e214b
--- /dev/null
+++ b/packages/e17/rage_0.2.0.003.bb
@@ -0,0 +1,10 @@
+DESCRIPTION = "rage is a media center application based on EFL"
+AUTHOR = "Carsten 'The Rasterman' Heitzler"
+HOMEPAGE = "http://www.rasterman.com"
+LICENSE = "GPL"
+DEPENDS = "evas ecore edje"
+SECTION = "x11/multimedia"
+
+SRC_URI = "http://download.enlightenment.org/snapshots/2007-06-17/rage-${PV}.tar.gz"
+
+inherit e
diff --git a/packages/efl/epsilon_0.3.0.008.bb b/packages/efl/epsilon_0.3.0.008.bb
deleted file mode 100644
index 1fd7c88744..0000000000
--- a/packages/efl/epsilon_0.3.0.008.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-DESCRIPTION = "Epsilon is a flexable and powerful image thumbnailing library \
-that is complient with the freedesktop.org Thumbnail Managing Standard."
-LICENSE = "GPL"
-DEPENDS = "virtual/imlib2 epeg libpng virtual/evas virtual/ecore perl-native edje"
-
-inherit efl
-
-PR = "r1"
-
-SRC_URI += "file://compile-fix.patch;patch=1 \
-            ${E_CVS};module=e17/libs/epsilon/m4;date=20060101"
-#            file://server-is-not-client.patch;patch=1 \
-
-do_configure_prepend() {
-	install -d "${S}/m4"
-	install "${WORKDIR}/m4/"*.m4 "${S}/m4"
-	aclocal -I m4
-}
diff --git a/packages/e17/e17-gpe-menu-convert/.mtn2git_empty b/packages/efl1/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/e17/e17-gpe-menu-convert/.mtn2git_empty
+++ b/packages/efl1/.mtn2git_empty
diff --git a/packages/efl1/ecore-native_0.9.9.038.bb b/packages/efl1/ecore-native_0.9.9.038.bb
new file mode 100644
index 0000000000..7b3212dc1a
--- /dev/null
+++ b/packages/efl1/ecore-native_0.9.9.038.bb
@@ -0,0 +1,28 @@
+require ecore.inc
+inherit native
+DEPENDS = "eet-native evas-native"
+
+EXTRA_OECONF = "\
+                --enable-ecore-txt \
+                --disable-ecore-x-xcb \
+                --enable-ecore-x \
+                --enable-ecore-job \
+                --enable-ecore-directfb \
+                --enable-ecore-fb \
+                --enable-ecore-evas \
+                --disable-ecore-evas-gl \
+                --disable-ecore-evas-xrender \
+                --disable-ecore-evas-dfb \
+                --disable-openssl \
+                --enable-abstract-sockets \
+                --enable-ecore-con \
+                --enable-ecore-ipc \
+                --enable-ecore-dbus \
+                --enable-ecore-file \
+                --enable-inotify \
+                --disable-poll \
+                --disable-curl \
+                --disable-ecore-desktop \
+                --x-includes=${STAGING_INCDIR}/X11 \
+                --x-libraries=${STAGING_LIBDIR} "
+
diff --git a/packages/efl1/ecore.inc b/packages/efl1/ecore.inc
new file mode 100644
index 0000000000..7f67d2f281
--- /dev/null
+++ b/packages/efl1/ecore.inc
@@ -0,0 +1,52 @@
+DESCRIPTION = "Ecore is the core event abstraction layer for the enlightenment \
+foundation libraries. It makes makes doing selections, drag and drop, event loops, \
+timeouts and idle handlers fast, optimized, and convenient."
+LICENSE = "MIT"
+DEPENDS = "curl dbus directfb eet evas tslib"
+# optional
+# DEPENDS += "openssl iconv"
+
+inherit efl1
+
+SRC_URI = "http://enlightenment.freedesktop.org/files/ecore-${PV}.tar.gz \
+           file://configure-abstract-sockets.patch;patch=1 \
+           file://fix-tslib-configure.patch;patch=1  \
+           file://fix-directfb-include.patch;patch=1"
+
+S = "${WORKDIR}/ecore-${PV}"
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/ecore"
+
+EXTRA_OECONF = "<override me>"
+
+do_stage() {
+    autotools_stage_all
+}
+
+PACKAGES += "\
+    ${PN}-con \
+    ${PN}-config \
+    ${PN}-dbus \
+    ${PN}-desktop \
+    ${PN}-directfb \
+    ${PN}-evas \
+    ${PN}-fb \
+    ${PN}-file \
+    ${PN}-ipc \
+    ${PN}-job \
+    ${PN}-txt \
+    ${PN}-x \
+    "
+FILES_${PN} = "${libdir}/libecore.so*"
+FILES_${PN}-con = "${libdir}/libecore_con.so*"
+FILES_${PN}-config = "${libdir}/libecore_config.so*"
+FILES_${PN}-dbus = "${libdir}/libecore_dbus.so*"
+FILES_${PN}-desktop = "${libdir}/libecore_desktop.so*"
+FILES_${PN}-directfb = "${libdir}/libecore_directfb.so*"
+FILES_${PN}-evas = "${libdir}/libecore_evas.so*"
+FILES_${PN}-fb = "${libdir}/libecore_fb.so*"
+FILES_${PN}-file = "${libdir}/libecore_file.so*"
+FILES_${PN}-ipc = "${libdir}/libecore_ipc.so*"
+FILES_${PN}-job = "${libdir}/libecore_job.so*"
+FILES_${PN}-txt = "${libdir}/libecore_txt.so*"
+FILES_${PN}-x = "${libdir}/libecore_x.so*"
+
diff --git a/packages/e17/engage/.mtn2git_empty b/packages/efl1/ecore/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/e17/engage/.mtn2git_empty
+++ b/packages/efl1/ecore/.mtn2git_empty
diff --git a/packages/efl/ecore/add-tslib-support.patch b/packages/efl1/ecore/add-tslib-support.patch
index c125122a91..c125122a91 100644
--- a/packages/efl/ecore/add-tslib-support.patch
+++ b/packages/efl1/ecore/add-tslib-support.patch
diff --git a/packages/efl/ecore/configure-abstract-sockets.patch b/packages/efl1/ecore/configure-abstract-sockets.patch
index 359203b163..359203b163 100644
--- a/packages/efl/ecore/configure-abstract-sockets.patch
+++ b/packages/efl1/ecore/configure-abstract-sockets.patch
diff --git a/packages/efl/ecore/configure.patch b/packages/efl1/ecore/configure.patch
index 23d8193b44..23d8193b44 100644
--- a/packages/efl/ecore/configure.patch
+++ b/packages/efl1/ecore/configure.patch
diff --git a/packages/efl/ecore/ecore_kernel_input_header.patch b/packages/efl1/ecore/ecore_kernel_input_header.patch
index 99f57ddcff..99f57ddcff 100644
--- a/packages/efl/ecore/ecore_kernel_input_header.patch
+++ b/packages/efl1/ecore/ecore_kernel_input_header.patch
diff --git a/packages/efl1/ecore/fix-directfb-include.patch b/packages/efl1/ecore/fix-directfb-include.patch
new file mode 100644
index 0000000000..b1c06f7f43
--- /dev/null
+++ b/packages/efl1/ecore/fix-directfb-include.patch
@@ -0,0 +1,13 @@
+Index: ecore-0.9.9.038/src/lib/ecore_directfb/Ecore_DirectFB.h
+===================================================================
+--- ecore-0.9.9.038.orig/src/lib/ecore_directfb/Ecore_DirectFB.h
++++ ecore-0.9.9.038/src/lib/ecore_directfb/Ecore_DirectFB.h
+@@ -23,7 +23,7 @@
+ #endif
+ 
+ #include <Ecore_Data.h>
+-#include <directfb.h>
++#include <directfb/directfb.h>
+ 
+ 
+ #ifdef __cplusplus
diff --git a/packages/efl1/ecore/fix-tslib-configure.patch b/packages/efl1/ecore/fix-tslib-configure.patch
new file mode 100644
index 0000000000..a1fbb21326
--- /dev/null
+++ b/packages/efl1/ecore/fix-tslib-configure.patch
@@ -0,0 +1,19 @@
+Index: ecore-0.9.9.038/configure.in
+===================================================================
+--- ecore-0.9.9.038.orig/configure.in
++++ ecore-0.9.9.038/configure.in
+@@ -1,4 +1,4 @@
+-dnl Process this file with autoconf to produce a configure script.
++<dnl Process this file with autoconf to produce a configure script.
+ 
+ AC_INIT(configure.in)
+ AC_CANONICAL_BUILD
+@@ -321,7 +321,7 @@ tslib_libs=""
+ if test "x$have_ecore_fb" = "xyes" ; then
+ AC_CHECK_HEADER(tslib.h,
+   [
+-   tslib_libs="-ltslib"
++   tslib_libs="-lts"
+    AC_DEFINE(HAVE_TSLIB, 1, [Build Ecore_FB Touchscreen Code])
+   ]
+ )
diff --git a/packages/efl/ecore/remove-bad-code.patch b/packages/efl1/ecore/remove-bad-code.patch
index 87a8d16bd6..87a8d16bd6 100644
--- a/packages/efl/ecore/remove-bad-code.patch
+++ b/packages/efl1/ecore/remove-bad-code.patch
diff --git a/packages/efl1/ecore_0.9.9.038.bb b/packages/efl1/ecore_0.9.9.038.bb
new file mode 100644
index 0000000000..d61aeab3a1
--- /dev/null
+++ b/packages/efl1/ecore_0.9.9.038.bb
@@ -0,0 +1,26 @@
+require ecore.inc
+PR = "r1"
+
+EXTRA_OECONF = "\
+		--enable-ecore-txt \
+		--disable-ecore-x-xcb \
+		--enable-ecore-x \
+		--enable-ecore-job \
+		--enable-ecore-directfb \
+		--enable-ecore-fb \
+		--enable-ecore-evas \
+		--disable-ecore-evas-gl \
+		--enable-ecore-evas-xrender \
+		--enable-ecore-evas-dfb \
+		--disable-openssl \
+		--enable-abstract-sockets \
+		--enable-ecore-con \
+		--enable-ecore-ipc \
+		--enable-ecore-dbus \
+		--enable-ecore-file \
+		--enable-inotify \
+		--disable-poll \
+		--enable-curl \
+		--enable-ecore-desktop \
+		--x-includes=${STAGING_INCDIR}/X11 \
+		--x-libraries=${STAGING_LIBDIR}	"
diff --git a/packages/efl1/edb_cvs.bb b/packages/efl1/edb_cvs.bb
new file mode 100644
index 0000000000..365f857e1c
--- /dev/null
+++ b/packages/efl1/edb_cvs.bb
@@ -0,0 +1,14 @@
+DESCRIPTION = "Edb is a database library"
+LICENSE = "MIT"
+PV = "0.0.0+cvs${SRCDATE}"
+
+inherit efl1
+
+SRC_URI = "${E_CVS};module=e17/libs/edb"
+S = "${WORKDIR}/edb"
+
+PACKAGES =+ "${PN}-tests"
+FILES_${PN}-tests = "${bindir}/*_* ${datadir}"
+FILES_${PN}-dev += "${bindir}/*-config"
+FILES_${PN} = "${libdir}/*.so*"
+
diff --git a/packages/efl1/edje-native_0.5.0.038.bb b/packages/efl1/edje-native_0.5.0.038.bb
new file mode 100644
index 0000000000..8f3ef51fa7
--- /dev/null
+++ b/packages/efl1/edje-native_0.5.0.038.bb
@@ -0,0 +1,16 @@
+require edje_${PV}.bb
+inherit native
+PR = "r4"
+
+DEPENDS = "evas-native ecore-native eet-native embryo-native"
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/edje"
+
+do_configure_prepend() {
+	sed -i 's:EMBRYO_PREFIX"/bin:"${STAGING_BINDIR}:' ${S}/src/bin/edje_cc_out.c
+	sed -i 's:cpp -I:/usr/bin/cpp -I:' ${S}/src/bin/edje_cc_parse.c
+	sed -i 's:gcc -I:/usr/bin/gcc -I:' ${S}/src/bin/edje_cc_parse.c
+}
+
+do_stage_append() {
+	efl_stage_bin
+}
diff --git a/packages/efl1/edje_0.5.0.038.bb b/packages/efl1/edje_0.5.0.038.bb
new file mode 100644
index 0000000000..7db9951e8d
--- /dev/null
+++ b/packages/efl1/edje_0.5.0.038.bb
@@ -0,0 +1,20 @@
+DESCRIPTION = "Edje is a complex graphical design & layout library."
+# can also install vim data files
+DEPENDS = "eet evas ecore embryo edje-native"
+LICENSE = "MIT"
+PR = "r7"
+
+inherit efl1 lib_package
+
+SRC_URI += "${E_CVS};module=e17/libs/edje/m4;date=20060101"
+
+do_configure_prepend() {
+	install -d "${S}/m4"
+	install "${WORKDIR}/m4/"*.m4 "${S}/m4"
+	aclocal -I m4
+}
+
+FILES_${PN}-dev =+ "${bindir} ${datadir}"
+FILES_${PN}-examples = ""
+FILES_${PN}-bin = ""
+
diff --git a/packages/efl/eet-native_0.9.10.038.bb b/packages/efl1/eet-native_0.9.10.038.bb
index 9e2426ca9f..9e2426ca9f 100644
--- a/packages/efl/eet-native_0.9.10.038.bb
+++ b/packages/efl1/eet-native_0.9.10.038.bb
diff --git a/packages/efl1/eet_0.9.10.038.bb b/packages/efl1/eet_0.9.10.038.bb
new file mode 100644
index 0000000000..08935df750
--- /dev/null
+++ b/packages/efl1/eet_0.9.10.038.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "EET is a tiny library designed to write an \
+arbitary set of chunks of data to a file and optionally compress \
+each chunk (very much like a zip file) and allow fast \
+random-access reading of the file later on."
+DEPENDS = "zlib jpeg"
+LICENSE = "BSD"
+PR = "r0"
+
+inherit efl1
+
+SRC_URI = "http://download.enlightenment.org/snapshots/2007-05-06/eet-${PV}.tar.gz"
diff --git a/packages/efl1/efreet_0.0.3.002.bb b/packages/efl1/efreet_0.0.3.002.bb
new file mode 100644
index 0000000000..b387ee89a0
--- /dev/null
+++ b/packages/efl1/efreet_0.0.3.002.bb
@@ -0,0 +1,10 @@
+DESCRIPTION = "An implementation of freedesktop.org specs for the \
+Enlightenment Foundation Libraries"
+DEPENDS = "ecore"
+LICENSE = "BSD"
+PR = "r0"
+
+inherit efl1
+
+PACKAGES =+ "efreet-tests"
+FILES_efreet-tests = "${bindir}/*_* ${datadir}"
diff --git a/packages/efl1/embryo-native_0.9.1.038.bb b/packages/efl1/embryo-native_0.9.1.038.bb
new file mode 100644
index 0000000000..2fc3faddfd
--- /dev/null
+++ b/packages/efl1/embryo-native_0.9.1.038.bb
@@ -0,0 +1,3 @@
+require embryo_${PV}.bb
+inherit native
+
diff --git a/packages/efl1/embryo_0.9.1.038.bb b/packages/efl1/embryo_0.9.1.038.bb
new file mode 100644
index 0000000000..0728ef563b
--- /dev/null
+++ b/packages/efl1/embryo_0.9.1.038.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "Embryo implements a C like scripting language used in various parts \
+of the Enlightenment project, namely Edje. Embryo's scripting language is based on \
+CompuPhase's Small language that was introduced in Dr Dobb's Journal in 1999. \
+Embryo allows scripting capabilities in places that otherwise wouldn't support \
+basic programming structures such as in Edje EDCs."
+LICENSE = "MIT"
+PR = "r0"
+
+inherit efl1 lib_package
+
+FILES_${PN}-examples = "${datadir}/${PN}/examples"
diff --git a/packages/efl1/emotion_0.0.1.006.bb b/packages/efl1/emotion_0.0.1.006.bb
new file mode 100644
index 0000000000..bdfcbebee1
--- /dev/null
+++ b/packages/efl1/emotion_0.0.1.006.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "Emotion is a multimedia library with backends: gstreamer and libxine"
+LICENSE = "MIT"
+# we no longer build the libxine backend, since the gstreamer backend seems more promising
+DEPENDS = "eet evas ecore edje gstreamer gst-plugins-base"
+RRECOMMENDS_${PN} = "emotion-backend-gstreamer"
+PR = "r0"
+
+inherit efl1
+
+SRC_URI = "http://download.enlightenment.org/snapshots/2007-06-17/emotion-${PV}.tar.gz"
+
+EXTRA_OECONF = "--disable-xine --enable-gstreamer"
+
+PACKAGES =+ "emotion-backend-gstreamer emotion-test"
+FILES_emotion-backend-gstreamer = "${libdir}/emotion/*.so"
+FILES_emotion-test = "${bindir}/emotion_test ${datadir}"
diff --git a/packages/efl1/engrave_cvs.bb b/packages/efl1/engrave_cvs.bb
new file mode 100644
index 0000000000..169ba856a7
--- /dev/null
+++ b/packages/efl1/engrave_cvs.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "Engrave is an Edje Editing Library"
+LICENSE = "MIT"
+# also requires yacc and lex on host
+DEPENDS = "evas ecore"
+PV = "0.0.0+cvs${SRCDATE}"
+
+inherit efl1
+
+SRC_URI = "${E_CVS};module=e17/libs/engrave"
+S = "${WORKDIR}/engrave"
+
+PACKAGES =+ "${PN}-tests"
+FILES_${PN}-tests = "${bindir}/*_* ${datadir}"
+FILES_${PN}-dev += "${bindir}/*-config"
+FILES_${PN} = "${libdir}/*.so*"
+
diff --git a/packages/efl1/enhance_cvs.bb b/packages/efl1/enhance_cvs.bb
new file mode 100644
index 0000000000..8e30cf0033
--- /dev/null
+++ b/packages/efl1/enhance_cvs.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = "Enhance translates between glade .xml files and ETK"
+LICENSE = "MIT"
+DEPENDS = "exml"
+PV = "0.0.0+cvs${SRCDATE}"
+
+inherit efl1
+
+SRC_URI = "${E_CVS};module=e17/libs/enhance"
+S = "${WORKDIR}/enhance"
+
+PACKAGES =+ "${PN}-tests"
+FILES_${PN}-tests = "${bindir}/*_* ${datadir}"
+FILES_${PN}-dev += "${bindir}/*-config"
+FILES_${PN} = "${libdir}/*.so*"
+
diff --git a/packages/efl1/epeg_0.9.0.009.bb b/packages/efl1/epeg_0.9.0.009.bb
new file mode 100644
index 0000000000..6a99269291
--- /dev/null
+++ b/packages/efl1/epeg_0.9.0.009.bb
@@ -0,0 +1,8 @@
+DESCRIPTION = "Epeg is a small library for handling thumbnails."
+LICENSE = "MIT"
+DEPENDS = "jpeg"
+
+inherit efl1
+
+FILES_${PN} = "${libdir}/lib*.so*"
+FILES_${PN}-dev += "${bindir}/*-config"
diff --git a/packages/e17/entrance-0.9.0.009/.mtn2git_empty b/packages/efl1/epsilon/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/e17/entrance-0.9.0.009/.mtn2git_empty
+++ b/packages/efl1/epsilon/.mtn2git_empty
diff --git a/packages/efl/epsilon/compile-fix.patch b/packages/efl1/epsilon/compile-fix.patch
index 1c42cc59c4..1c42cc59c4 100644
--- a/packages/efl/epsilon/compile-fix.patch
+++ b/packages/efl1/epsilon/compile-fix.patch
diff --git a/packages/efl/epsilon/server-is-not-client.patch b/packages/efl1/epsilon/server-is-not-client.patch
index e96e528b9e..e96e528b9e 100644
--- a/packages/efl/epsilon/server-is-not-client.patch
+++ b/packages/efl1/epsilon/server-is-not-client.patch
diff --git a/packages/efl1/epsilon_0.3.0.009.bb b/packages/efl1/epsilon_0.3.0.009.bb
new file mode 100644
index 0000000000..eba3a11e34
--- /dev/null
+++ b/packages/efl1/epsilon_0.3.0.009.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "Epsilon is a flexible and powerful image thumbnailing library \
+that is compliant with the freedesktop.org Thumbnail Managing Standard."
+LICENSE = "LGPL"
+DEPENDS = "imlib2 epeg libpng evas ecore edje perl-native"
+
+inherit efl1
+
+PR = "r0"
+
+PACKAGES =+ "epsilon-tests"
+FILES_epsilon-tests = "${bindir}/*_* ${datadir}"
+FILES_${PN} = "${libdir}/lib*.so*"
diff --git a/packages/efl1/esmart_0.9.0.009.bb b/packages/efl1/esmart_0.9.0.009.bb
new file mode 100644
index 0000000000..8d2ce2eb3e
--- /dev/null
+++ b/packages/efl1/esmart_0.9.0.009.bb
@@ -0,0 +1,23 @@
+DESCRIPTION = "ESmart is a collection of smart Evas objects"
+LICENSE = "MIT"
+DEPENDS = "evas ecore edje imlib2 epsilon libtool"
+
+inherit efl1
+
+S = "${WORKDIR}/esmart-${PV}"
+
+PACKAGES =+ "${PN}-textentry \
+             ${PN}-thumb \
+             ${PN}-container \
+             ${PN}-container-plugins \
+             ${PN}-file-dialog \
+             ${PN}-draggies \
+             ${PN}-trans-x11"
+FILES_${PN}-textentry = "${libdir}/libesmart_text_entry*.so*"
+FILES_${PN}-thumb = "${libdir}/libesmart_thumb*.so*"
+FILES_${PN}-container = "${libdir}/libesmart_container*"
+DEPENDS_${PN}-container += "${PN}-container-plugins"
+FILES_${PN}-container-plugins = "${libdir}/esmart/layout/*.so"
+FILES_${PN}-file-dialog = "${libdir}/libesmart_file_dialog*.so*"
+FILES_${PN}-draggies = "${libdir}/libesmart_draggies*.so*"
+FILES_${PN}-trans-x11 = "${libdir}/libesmart_trans_x11*.so*"
diff --git a/packages/efl1/etk_0.1.0.003.bb b/packages/efl1/etk_0.1.0.003.bb
new file mode 100644
index 0000000000..569b5c9242
--- /dev/null
+++ b/packages/efl1/etk_0.1.0.003.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "Etk is an advanced widget toolkit based on the Enlightenment Foundation Libraries."
+DEPENDS = "evas ecore edje"
+LICENSE = "MIT"
+PR = "r1"
+
+inherit efl1
+
+PACKAGES =+ "etk-engines"
+FILES_${PN} = "${libdir}/libetk.so*"
+FILES_${PN}-examples += "${bindir}"
+FILES_${PN}-engines = "${libdir}/etk/engines/*.so ${datadir}"
+FILES_${PN}-dev += "${libdir}/etk/engines/*.a ${libdir}/etk/engines/*.la"
+FILES_${PN}-dbg += "${libdir}/etk/engines/*/.debug/"
diff --git a/packages/efl1/evas-native_0.9.9.038.bb b/packages/efl1/evas-native_0.9.9.038.bb
new file mode 100644
index 0000000000..e79695c1f2
--- /dev/null
+++ b/packages/efl1/evas-native_0.9.9.038.bb
@@ -0,0 +1,60 @@
+require evas.inc
+inherit native
+DEPENDS = "freetype-native libpng-native jpeg-native eet-native"
+PR = "r9"
+
+EXTRA_OECONF = "\
+		--x-includes=${STAGING_INCDIR}/X11  \
+		--x-libraries=${STAGING_LIBDIR} \
+		--disable-fb					\
+		--disable-directfb			\
+		--enable-buffer				\
+		--disable-software-ddraw	\
+		--disable-software-qtopia	\
+		--disable-software-x11		\
+		--disable-software-16-x11	\
+		--disable-software-xcb		\
+		--disable-gl-x11			\
+		--disable-xrender-x11		\
+		--disable-xrender-xcb		\
+		--disable-glitz-x11			\
+		--enable-image-loader-eet	\
+		--disable-image-loader-edb	\
+		--disable-image-loader-gif	\
+		--enable-image-loader-png	\
+		--enable-image-loader-jpeg	\
+		--enable-image-loader-tiff	\
+		--enable-image-loader-xpm	\
+		--disable-image-loader-svg	\
+		--enable-cpu-c				\
+		--enable-fontconfig			\
+		--enable-font-loader-eet	\
+		--enable-scale-sample		\
+		--enable-scale-smooth		\
+		--enable-convert-yuv		\
+		--enable-small-dither-mask	\
+		--disable-no-dither-mask	\
+		--disable-convert-8-rgb-332	\
+		--disable-convert-8-rgb-666	\
+		--disable-convert-8-rgb-232	\
+		--disable-convert-8-rgb-222	\
+		--disable-convert-8-rgb-221	\
+		--disable-convert-8-rgb-121	\
+		--disable-convert-8-rgb-111	\
+		--enable-convert-16-rgb-565	\
+		--disable-convert-16-rgb-555	\
+		--disable-convert-16-rgb-444	\
+		--disable-convert-16-rgb-ipq	\
+		--enable-convert-16-rgb-rot-0	\
+		--disable-convert-16-rgb-rot-90	\
+		--enable-convert-16-rgb-rot-270	\
+		--disable-convert-24-rgb-888	\
+		--disable-convert-24-bgr-888	\
+		--disable-convert-32-rgb-8888	\
+		--disable-convert-32-rgbx-8888	\
+		--disable-convert-32-bgr-8888	\
+		--disable-convert-32-bgrx-8888	\
+		--disable-convert-32-rgb-rot-0	\
+		--disable-convert-32-rgb-rot-90	\
+		--disable-convert-32-rgb-rot-270"
+
diff --git a/packages/efl1/evas.inc b/packages/efl1/evas.inc
new file mode 100644
index 0000000000..f3d78f0255
--- /dev/null
+++ b/packages/efl1/evas.inc
@@ -0,0 +1,57 @@
+DESCRIPTION = "Evas is a hardware-accelerated canvas API that can draw \
+anti-aliased text, smooth super and sub-images, alpha-blend, as well as drop \
+down to using normal X11 primitives such as pixmaps, lines and rectangles if \
+your CPU or graphics hardware are too slow."
+LICENSE = "MIT"
+# can also depend on valgrind (?)
+DEPENDS = "directfb eet freetype jpeg virtual/libx11 libxext"
+
+inherit efl1
+
+export FREETYPE_CONFIG = "${STAGING_BINDIR_CROSS}/freetype-config"
+
+SRC_URI = "http://enlightenment.freedesktop.org/files/evas-${PV}.tar.gz \
+           file://fix-configure.patch;patch=1 \
+           ${E_CVS};module=e17/libs/evas/m4;date=20060101"
+
+S = "${WORKDIR}/evas-${PV}"
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/evas"
+
+EXTRA_OECONF = "<override me>"
+
+do_configure_prepend() {
+    if [ -e "${WORKDIR}/m4" ]; then
+        install -d "${S}/m4"
+        install "${WORKDIR}/m4/"*.m4 "${S}/m4"
+        aclocal -I m4
+    fi
+}
+
+python populate_packages_prepend () {
+        for plugin_type in "engines loaders savers".split():
+            bb.note( "splitting packages for evas %s..." % plugin_type )
+            basedir = bb.data.expand( '${libdir}/evas/modules/%s' % plugin_type, d )
+
+            do_split_packages(d, basedir, '^(.*)',
+            output_pattern = 'evas-' + plugin_type[:-1] + "-%s",
+            description = 'Evas module %s',
+            allow_dirs=True, recursive=False )
+}
+
+do_install_append() {
+    find "${D}" -name .debug -type d | xargs -iBLAH rm -rf "BLAH"
+}
+
+#do_stage_append() {
+#	cd src
+#	modules=`find modules -name ".libs"`
+#	for module in $modules
+#	do
+#		install -d ${STAGING_LIBDIR}/evas/`dirname $module`/${TARGET_OS}-gnu-${TARGET_ARCH}
+#		install -m 0755 $module/module.so ${STAGING_LIBDIR}/evas/`dirname $module`/${TARGET_OS}-gnu-${TARGET_ARCH}/module.so
+#	done
+#}
+
+FILES_${PN}-dev += "${libdir}/evas/modules/*/*/*/*.a ${libdir}/evas/modules/*/*/*/*.la"
+FILES_${PN}-dbg += "${libdir}/evas/modules/*/*/*/.debug/"
+FILES_${PN} = "${libdir}/libevas*.so*"
diff --git a/packages/efl/.mtn2git_empty b/packages/efl1/evas/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/efl/.mtn2git_empty
+++ b/packages/efl1/evas/.mtn2git_empty
diff --git a/packages/efl/evas/fix-configure.patch b/packages/efl1/evas/fix-configure.patch
index abf9b94bdf..abf9b94bdf 100644
--- a/packages/efl/evas/fix-configure.patch
+++ b/packages/efl1/evas/fix-configure.patch
diff --git a/packages/efl/evas/pagesize.patch b/packages/efl1/evas/pagesize.patch
index 5efd16a96e..5efd16a96e 100644
--- a/packages/efl/evas/pagesize.patch
+++ b/packages/efl1/evas/pagesize.patch
diff --git a/packages/efl1/evas_0.9.9.038.bb b/packages/efl1/evas_0.9.9.038.bb
new file mode 100644
index 0000000000..79fdd42173
--- /dev/null
+++ b/packages/efl1/evas_0.9.9.038.bb
@@ -0,0 +1,58 @@
+require evas.inc
+PR = "r9"
+
+EXTRA_OECONF = "\
+		--x-includes=${STAGING_INCDIR}/X11  \
+		--x-libraries=${STAGING_LIBDIR} \
+		--enable-fb					\
+		--enable-directfb			\
+		--enable-buffer				\
+		--disable-software-ddraw	\
+		--disable-software-qtopia	\
+		--enable-software-x11		\
+		--enable-software-16-x11	\
+		--disable-software-xcb		\
+		--disable-gl-x11			\
+		--enable-xrender-x11		\
+		--disable-xrender-xcb		\
+		--disable-glitz-x11			\
+		--enable-image-loader-eet	\
+		--disable-image-loader-edb	\
+		--disable-image-loader-gif	\
+		--enable-image-loader-png	\
+		--enable-image-loader-jpeg	\
+		--enable-image-loader-tiff	\
+		--enable-image-loader-xpm	\
+		--enable-image-loader-svg	\
+		--enable-cpu-c				\
+		--enable-fontconfig			\
+		--enable-font-loader-eet	\
+		--enable-scale-sample		\
+		--enable-scale-smooth		\
+		--enable-convert-yuv		\
+		--enable-small-dither-mask	\
+		--disable-no-dither-mask	\
+		--disable-convert-8-rgb-332	\
+		--disable-convert-8-rgb-666	\
+		--disable-convert-8-rgb-232	\
+		--disable-convert-8-rgb-222	\
+		--disable-convert-8-rgb-221	\
+		--disable-convert-8-rgb-121	\
+		--disable-convert-8-rgb-111	\
+		--enable-convert-16-rgb-565	\
+		--disable-convert-16-rgb-555	\
+		--disable-convert-16-rgb-444	\
+		--disable-convert-16-rgb-ipq	\
+		--enable-convert-16-rgb-rot-0	\
+		--disable-convert-16-rgb-rot-90	\
+		--enable-convert-16-rgb-rot-270	\
+		--disable-convert-24-rgb-888	\
+		--disable-convert-24-bgr-888	\
+		--disable-convert-32-rgb-8888	\
+		--disable-convert-32-rgbx-8888	\
+		--disable-convert-32-bgr-8888	\
+		--disable-convert-32-bgrx-8888	\
+		--disable-convert-32-rgb-rot-0	\
+		--disable-convert-32-rgb-rot-90	\
+		--disable-convert-32-rgb-rot-270"
+
diff --git a/packages/efl1/ewl_0.5.1.009.bb b/packages/efl1/ewl_0.5.1.009.bb
new file mode 100644
index 0000000000..9d60a67b82
--- /dev/null
+++ b/packages/efl1/ewl_0.5.1.009.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "The Enlightened Widget Library, \
+a simple-to-use general purpose widget library \
+based on the enlightenment foundation libraries."
+DEPENDS = "evas ecore edje emotion efreet"
+RSUGGESTS_${PN} += "ewl-themes"
+LICENSE = "MIT"
+PR = "r0"
+
+inherit efl1
+
+SRC_URI = "http://download.enlightenment.org/snapshots/2007-06-17/ewl-${PV}.tar.gz"
diff --git a/packages/efl1/exml_cvs.bb b/packages/efl1/exml_cvs.bb
new file mode 100644
index 0000000000..5ffdaef266
--- /dev/null
+++ b/packages/efl1/exml_cvs.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "Exml is a generic XML parser wrapper."
+LICENSE = "MIT"
+DEPENDS = "libxml2 libxslt ecore"
+
+inherit efl1
+
+SRC_URI = "${E_CVS};module=e17/libs/exml"
+S = "${WORKDIR}/exml"
+
+PACKAGES =+ "${PN}-tests"
+FILES_${PN}-tests = "${bindir}/*_* ${datadir}"
+FILES_${PN}-dev += "${bindir}/*-config"
+FILES_${PN} = "${libdir}/*.so*"
diff --git a/packages/efl1/imlib2_1.4.0.001.bb b/packages/efl1/imlib2_1.4.0.001.bb
new file mode 100644
index 0000000000..8b056b1ed2
--- /dev/null
+++ b/packages/efl1/imlib2_1.4.0.001.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "A graphic library for file loading, saving, rendering, and manipulation."
+LICENSE = "BSD"
+# can also depend on tiff34, ungif or gif, z, bz2, id3tag
+DEPENDS = "freetype libpng jpeg"
+
+inherit efl1
+
+PACKAGES =+ "imlib2-loaders-dbg imlib2-filters-dbg imlib2-loaders imlib2-filters"
+FILES_${PN} = "${libdir}/lib*.so.* ${libdir}/imlib2/*/*.so"
+FILES_${PN}-dbg = "${libdir}/.debug/"
+FILES_${PN}-dev += "${bindir}/imlib2-config ${libdir}/*.so ${includedir}"
+FILES_${PN}-bin = "${bindir}"
+FILES_imlib2-loaders = "${libdir}/imlib2/loaders/*.so"
+FILES_imlib2-filters = "${libdir}/imlib2/filters/*.so"
+FILES_imlib2-loaders-dbg += "${libdir}/imlib2/loaders/.debug"
+FILES_imlib2-filters-dbg += "${libdir}/imlib2/filters/.debug"
diff --git a/packages/elitaire/elitaire_0.0.5.bb b/packages/elitaire/elitaire_0.0.5.bb
deleted file mode 100644
index b33e9fa014..0000000000
--- a/packages/elitaire/elitaire_0.0.5.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-DESCRIPTION = "EFL-based solitaire"
-DEPENDS = "evas-x11 ecore-x11 edje esmart-x11 ewl"
-LICENSE = "MIT"
-SECTION = "e/apps"
-PR = "r0"
-
-SRC_URI = "http://www.mowem.de/elitaire/elitaire-${PV}.tar.bz2 \
-           file://fix-ewl-and-gettext.patch;patch=1 \
-           file://math.patch;patch=1"
-
-inherit autotools pkgconfig binconfig
-
diff --git a/packages/elitaire/files/fix-ewl-and-gettext.patch b/packages/elitaire/files/fix-ewl-and-gettext.patch
deleted file mode 100644
index f572124f94..0000000000
--- a/packages/elitaire/files/fix-ewl-and-gettext.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -Nur elitaire-0.0.4~/src/intl.h elitaire-0.0.4/src/intl.h
---- elitaire-0.0.4~/src/intl.h	2005-08-18 19:02:30.000000000 -0700
-+++ elitaire-0.0.4/src/intl.h	2005-08-18 19:06:05.000000000 -0700
-@@ -13,8 +13,12 @@
- 
- inline char * sgettext(const char *msgid)
- {
-+#ifdef ENABLE_NLS
- 	char *msgval = gettext (msgid);
- 	if (msgval == msgid)
-+#else
-+	  char *msgval;
-+#endif
- 		msgval = strrchr (msgid, '|') + 1;
- 	return msgval;
- }
diff --git a/packages/elitaire/files/math.patch b/packages/elitaire/files/math.patch
deleted file mode 100644
index 550507f370..0000000000
--- a/packages/elitaire/files/math.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- elitaire-0.0.4/src/Elitaire.h~	2005-08-15 06:32:32.000000000 -0700
-+++ elitaire-0.0.4/src/Elitaire.h	2005-09-29 19:19:25.000000000 -0700
-@@ -3,6 +3,11 @@
- #include<Evas.h>
- #include<Edje.h>
- #include"intl.h"
-+#include<tgmath.h>
-+
-+#ifndef ABS
-+#define ABS(x) ((x) >= 0 ? (x) : -(x))
-+#endif
- 
- struct Elitaire{
- 	
diff --git a/packages/esound/esound-gpe/audiofile-please.patch b/packages/esound/esound-gpe/audiofile-please.patch
deleted file mode 100644
index 0bfb629040..0000000000
--- a/packages/esound/esound-gpe/audiofile-please.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- esound/esd.h~	2002-07-19 13:36:44.000000000 +0100
-+++ esound/esd.h	2004-05-16 11:04:29.000000000 +0100
-@@ -1,6 +1,8 @@
- #ifndef ESD_H
- #define ESD_H
- 
-+#define SUPPORT_AUDIOFILE
-+
- #ifdef SUPPORT_AUDIOFILE
- #include <audiofile.h>
- #endif
---- esound/Makefile.am~	2002-07-19 13:36:44.000000000 +0100
-+++ esound/Makefile.am	2004-05-16 10:56:35.000000000 +0100
-@@ -26,8 +26,8 @@
- lib_LTLIBRARIES = libesd.la $(libesddsp_la)
- 
- libesd_la_LDFLAGS = -version-info $(ESD_VERSION_INFO)
--#libesd_la_LIBADD = $(AUDIOFILE_LIBS) $(SOUND_LIBS)
--libesd_la_LIBADD = $(SOUND_LIBS)
-+libesd_la_LIBADD = $(AUDIOFILE_LIBS) $(SOUND_LIBS)
-+#libesd_la_LIBADD = $(SOUND_LIBS)
- 
- libesd_la_SOURCES = \
- 	esdlib.c	\
-@@ -36,6 +36,7 @@
- 	audio.c		\
- 	genrand.c	\
- 	genrand.h	\
-+	esdfile.c	\
- 	util.c
- 
- # one of these gets included by audio.c
-@@ -79,7 +80,6 @@
- 	proto.c		\
- 	samples.c	\
- 	$(getopt_src)   \
--	util.c		\
- 	esd-server.h
- 
- esdcat_SOURCES = \
diff --git a/packages/esound/esound-gpe/configure.patch b/packages/esound/esound-gpe/configure.patch
deleted file mode 100644
index c6c33df11c..0000000000
--- a/packages/esound/esound-gpe/configure.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- esound/configure.in~	2002-07-19 13:14:01.000000000 +0100
-+++ esound/configure.in	2004-05-16 10:51:48.000000000 +0100
-@@ -352,17 +352,5 @@
- esound.spec
- esound.pc
- esddsp
--docs/Makefile
--docs/esd.1
--docs/esdcat.1
--docs/esd-config.1
--docs/esdctl.1
--docs/esddsp.1
--docs/esdfilt.1
--docs/esdloop.1
--docs/esdmon.1
--docs/esdplay.1
--docs/esdrec.1
--docs/esdsample.1
- ])
- dnl , [case "$CONFIG_FILES" in *esd-config*) chmod +x esd-config;; esac])
diff --git a/packages/esound/esound_0.2.36.bb b/packages/esound/esound_0.2.36.bb
index 1cf99ac90a..4797843acf 100644
--- a/packages/esound/esound_0.2.36.bb
+++ b/packages/esound/esound_0.2.36.bb
@@ -1,19 +1,19 @@
-DESCRIPTION = "Enlightened Sound Daemon - GPE version"
+DESCRIPTION = "Enlightened Sound Daemon"
 SECTION = "gpe/base"
 LICENSE = "GPL"
 DEPENDS = "audiofile"
-
-PR = "r1"
+PR = "r2"
 
 inherit gnome binconfig
 
-SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/esound/0.2/esound-0.2.36.tar.bz2"
+SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/esound/0.2/esound-0.2.36.tar.bz2 \
+           file://no-docs.patch;patch=1"
 
 EXTRA_OECONF = " \
-                --disable-alsa \
-		--disable-arts \
-		--disable-artstest \
-		"
+    --disable-alsa \
+    --disable-arts \
+    --disable-artstest \
+"
 do_configure_prepend() {
 	sed -i -e 's:/usr/include/mme:${STAGING_INCDIR}/mme:g' configure.ac
 }
diff --git a/packages/efl/e/.mtn2git_empty b/packages/esound/files/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/efl/e/.mtn2git_empty
+++ b/packages/esound/files/.mtn2git_empty
diff --git a/packages/esound/files/no-docs.patch b/packages/esound/files/no-docs.patch
new file mode 100644
index 0000000000..fc69f1a038
--- /dev/null
+++ b/packages/esound/files/no-docs.patch
@@ -0,0 +1,11 @@
+Index: esound-0.2.36/Makefile.am
+===================================================================
+--- esound-0.2.36.orig/Makefile.am
++++ esound-0.2.36/Makefile.am
+@@ -1,5 +1,5 @@
+ 
+-SUBDIRS = docs
++SUBDIRS = 
+ 
+ ACLOCAL_FLAGS = -I m4
+ 
diff --git a/packages/esound/old/esound-gpe_20020817.bb b/packages/esound/old/esound-gpe_20020817.bb
deleted file mode 100644
index a698211f7d..0000000000
--- a/packages/esound/old/esound-gpe_20020817.bb
+++ /dev/null
@@ -1,35 +0,0 @@
-DESCRIPTION = "Enlightened Sound Daemon - GPE version"
-SECTION = "gpe/base"
-LICENSE = "GPL"
-DEPENDS = "audiofile"
-PR = "r5"
-PROVIDES += "esound"
-RPROVIDES += "esound"
-
-SRCDATE := "${PV}"
-SRC_URI = "svn://projects.linuxtogo.org/svn/gpe/trunk/base/;module=esound;date=20061119 \
-	   file://audiofile-please.patch;patch=1 \
-	   file://configure.patch;patch=1"
-
-S = "${WORKDIR}/esound"
-
-inherit autotools binconfig pkgconfig
-
-EXTRA_OECONF = "--disable-alsa"
-
-SOV = "0.2.28"
-PV = "${SOV}+cvs${SRCDATE}"
-
-
-do_stage () {
-	install -m 0644 esd.h ${STAGING_INCDIR}/esd.h
-	oe_soinstall .libs/libesd.so.${SOV} ${STAGING_LIBDIR}
-	install -m 0644 .libs/libesd.lai ${STAGING_LIBDIR}/libesd.la
-	install -m 0644 esd.m4 ${STAGING_DATADIR}/aclocal
-}
-
-PACKAGES =+ "esddsp esd esd-utils"
-
-FILES_esddsp = "${bindir}/esddsp ${libdir}/libesddsp.so.*"
-FILES_esd = "${bindir}/esd"
-FILES_esd-utils = "${bindir}/*"
diff --git a/packages/esound/old/esound-gpe_20070109.bb b/packages/esound/old/esound-gpe_20070109.bb
deleted file mode 100644
index 850def76a0..0000000000
--- a/packages/esound/old/esound-gpe_20070109.bb
+++ /dev/null
@@ -1,34 +0,0 @@
-DESCRIPTION = "Enlightened Sound Daemon - GPE version"
-SECTION = "gpe/base"
-LICENSE = "GPL"
-DEPENDS = "audiofile"
-PR = "r0"
-PROVIDES += "esound"
-RPROVIDES += "esound"
-
-SRCDATE = "${PV}"
-SRC_URI = "svn://projects.linuxtogo.org/svn/gpe/trunk/;module=extra/esound;rev=8935 \
-	   file://audiofile-please.patch;patch=1 \
-	   file://configure.patch;patch=1"
-
-S = "${WORKDIR}/esound"
-
-inherit autotools binconfig pkgconfig
-
-EXTRA_OECONF = "--disable-alsa"
-
-SOV = "0.2.28"
-PV = "${SOV}+cvs${SRCDATE}"
-
-do_stage () {
-	install -m 0644 esd.h ${STAGING_INCDIR}/esd.h
-	oe_soinstall .libs/libesd.so.${SOV} ${STAGING_LIBDIR}
-	install -m 0644 .libs/libesd.lai ${STAGING_LIBDIR}/libesd.la
-	install -m 0644 esd.m4 ${STAGING_DATADIR}/aclocal
-}
-
-PACKAGES =+ "esddsp esd esd-utils"
-
-FILES_esddsp = "${bindir}/esddsp ${libdir}/libesddsp.so.*"
-FILES_esd = "${bindir}/esd"
-FILES_esd-utils = "${bindir}/*"
diff --git a/packages/fluxbox/fluxbox_0.99+1.0rc.bb b/packages/fluxbox/fluxbox_0.99+1.0rc.bb
index 3f271a57a4..68eeeb04b8 100644
--- a/packages/fluxbox/fluxbox_0.99+1.0rc.bb
+++ b/packages/fluxbox/fluxbox_0.99+1.0rc.bb
@@ -9,7 +9,7 @@ DESCRIPTION = "The Fluxbox WindowManager"
 HOMEPAGE = "http://fluxbox.sourceforge.net"
 LICENSE = "MIT"
 REALPV = "1.0rc"
-PR = "r4"
+PR = "r5"
 
 ######################################################################################
 
@@ -29,7 +29,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/fluxbox/fluxbox-${REALPV}.tar.gz \
 
 ######################################################################################
 
-PACKAGES = "${PN}-gpe ${PN}-styles ${PN}-doc ${PN}"
+PACKAGES = "${PN}-dbg ${PN}-gpe ${PN}-styles ${PN}-doc ${PN}"
 
 DESCRIPTION_${PN}-styles = "The default styles for fluxbox"
 DESCRIPTION_${PN}-gpe = "The Fluxbox WindowManager for use with GPE"
diff --git a/packages/fluxbox/fluxbox_svn.bb b/packages/fluxbox/fluxbox_svn.bb
index ffaa7da5b4..1034c386c4 100644
--- a/packages/fluxbox/fluxbox_svn.bb
+++ b/packages/fluxbox/fluxbox_svn.bb
@@ -10,7 +10,7 @@ HOMEPAGE = "http://fluxbox.sourceforge.net"
 LICENSE = "MIT"
 
 PV = "1.0+svn${SRCDATE}"
-PR = "r2"
+PR = "r3"
 
 ######################################################################################
 
@@ -30,7 +30,7 @@ SRC_URI = "svn://svn.berlios.de/fluxbox;module=trunk \
 
 ######################################################################################
 
-PACKAGES = "${PN}-gpe ${PN}-styles ${PN}-doc ${PN}"
+PACKAGES = "${PN}-dbg ${PN}-gpe ${PN}-styles ${PN}-doc ${PN}"
 
 DESCRIPTION_${PN}-styles = "The default styles for fluxbox"
 DESCRIPTION_${PN}-gpe = "The Fluxbox WindowManager for use with GPE"
diff --git a/packages/efl/ecore/.mtn2git_empty b/packages/freetype/freetype-2.3.4/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/efl/ecore/.mtn2git_empty
+++ b/packages/freetype/freetype-2.3.4/.mtn2git_empty
diff --git a/packages/freetype/freetype-2.3.3/fix-x86_64-build.patch b/packages/freetype/freetype-2.3.4/fix-x86_64-build.patch
index ae504dcb0b..ae504dcb0b 100644
--- a/packages/freetype/freetype-2.3.3/fix-x86_64-build.patch
+++ b/packages/freetype/freetype-2.3.4/fix-x86_64-build.patch
diff --git a/packages/freetype/freetype_2.3.3.bb b/packages/freetype/freetype_2.3.4.bb
index c1febe8a90..c1febe8a90 100644
--- a/packages/freetype/freetype_2.3.3.bb
+++ b/packages/freetype/freetype_2.3.4.bb
diff --git a/packages/gaim/pidgin/pidgin.desktop-set-icon.patch b/packages/gaim/pidgin/pidgin.desktop-set-icon.patch
new file mode 100644
index 0000000000..05f76895ba
--- /dev/null
+++ b/packages/gaim/pidgin/pidgin.desktop-set-icon.patch
@@ -0,0 +1,11 @@
+--- pidgin-2.0.1/pidgin.desktop.in.orig	2007-06-20 23:50:44.000000000 +0000
++++ pidgin-2.0.1/pidgin.desktop.in	2007-06-20 23:51:05.000000000 +0000
+@@ -4,7 +4,7 @@
+ _GenericName=Internet Messenger
+ _Comment=Send instant messages over multiple protocols
+ Exec=pidgin
+-Icon=pidgin
++Icon=/usr/share/icons/hicolor/48x48/apps/pidgin.png
+ StartupNotify=true
+ Terminal=false
+ Type=Application
diff --git a/packages/gaim/pidgin_2.0.1.bb b/packages/gaim/pidgin_2.0.1.bb
index 961467ad95..99bc3a34e9 100644
--- a/packages/gaim/pidgin_2.0.1.bb
+++ b/packages/gaim/pidgin_2.0.1.bb
@@ -3,6 +3,7 @@ require pidgin.inc
 SRC_URI = "${SOURCEFORGE_MIRROR}/pidgin/pidgin-${PV}.tar.bz2 \
            file://sanitize-configure.ac.patch;patch=1 \
            file://gconf-no-errors.patch;patch=1 \
+	   file://pidgin.desktop-set-icon.patch;patch=1 \
 	  " 
 
-PR = "r3"
+PR = "r4"
diff --git a/packages/jikes/jikes-native_1.21.bb b/packages/jikes/jikes-native_1.21.bb
index 7bea3e3cba..2996046639 100644
--- a/packages/jikes/jikes-native_1.21.bb
+++ b/packages/jikes/jikes-native_1.21.bb
@@ -1,6 +1,7 @@
-SECTION = "devel"
 inherit native
 require jikes_${PV}.bb
+
+PROVIDES = "virtual/javac-native"
 S = "${WORKDIR}/jikes-${PV}"
 
 do_stage() {
diff --git a/packages/linux/corgi-kernel-2.4-embedix.bb b/packages/linux/corgi-kernel-2.4-embedix.bb
index 5870ed54b9..986ee7ac40 100644
--- a/packages/linux/corgi-kernel-2.4-embedix.bb
+++ b/packages/linux/corgi-kernel-2.4-embedix.bb
@@ -1,3 +1,3 @@
 MACHINE = "corgi"
-
+COMPATIBLE_HOST = "arm.*-linux"
 require openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc
diff --git a/packages/linux/husky-kernel-2.4-embedix.bb b/packages/linux/husky-kernel-2.4-embedix.bb
index 19645079f1..81f859594c 100644
--- a/packages/linux/husky-kernel-2.4-embedix.bb
+++ b/packages/linux/husky-kernel-2.4-embedix.bb
@@ -1,3 +1,4 @@
+COMPATIBLE_HOST = "arm.*-linux"
 MACHINE = "husky"
 
 require openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc
diff --git a/packages/linux/poodle-kernel-2.4-embedix.bb b/packages/linux/poodle-kernel-2.4-embedix.bb
index 37845c4c96..2f26cbc863 100644
--- a/packages/linux/poodle-kernel-2.4-embedix.bb
+++ b/packages/linux/poodle-kernel-2.4-embedix.bb
@@ -1,4 +1,5 @@
 MACHINE = "poodle"
+COMPATIBLE_HOST = "arm.*-linux"
 
 require openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc
 
diff --git a/packages/linux/poodle-kernels-2.4-embedix.bb b/packages/linux/poodle-kernels-2.4-embedix.bb
index 7a714b7a12..21d334fec3 100644
--- a/packages/linux/poodle-kernels-2.4-embedix.bb
+++ b/packages/linux/poodle-kernels-2.4-embedix.bb
@@ -1,2 +1,3 @@
 COMPATIBLE_MACHINE = "poodle"
+COMPATIBLE_HOST = "arm.*-linux"
 DEPENDS = "poodle-kernel-2.4-embedix poodle255-kernel-2.4-embedix"
diff --git a/packages/linux/poodle255-kernel-2.4-embedix.bb b/packages/linux/poodle255-kernel-2.4-embedix.bb
index 2b58472185..f3044f4e67 100644
--- a/packages/linux/poodle255-kernel-2.4-embedix.bb
+++ b/packages/linux/poodle255-kernel-2.4-embedix.bb
@@ -1,4 +1,4 @@
 MACHINE = "poodle255"
-
+COMPATIBLE_HOST = "arm.*-linux"
 require openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc
 
diff --git a/packages/linux/shepherd-kernel-2.4-embedix.bb b/packages/linux/shepherd-kernel-2.4-embedix.bb
index 874c72e432..ac573fd14e 100644
--- a/packages/linux/shepherd-kernel-2.4-embedix.bb
+++ b/packages/linux/shepherd-kernel-2.4-embedix.bb
@@ -1,5 +1,6 @@
 MACHINE = "shepherd"
 COMPATIBLE_MACHINE = "shepherd"
+COMPATIBLE_HOST = "arm.*-linux"
 
 require openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc
 
diff --git a/packages/efl/edb-native/.mtn2git_empty b/packages/memedit/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/efl/edb-native/.mtn2git_empty
+++ b/packages/memedit/.mtn2git_empty
diff --git a/packages/memedit/memedit_0.7.bb b/packages/memedit/memedit_0.7.bb
new file mode 100644
index 0000000000..75fb676df8
--- /dev/null
+++ b/packages/memedit/memedit_0.7.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "Display and change memory content for testing purpose"
+HOMEPAGE = "http://www.pengutronix.de/software/memedit/downloads/"
+LICENSE = "GPLv2"
+SECTION = "devel"
+DEPENDS = "readline"
+
+PR = "r0"
+
+SRC_URI = "http://www.pengutronix.de/software/memedit/downloads/memedit-${PV}.tar.gz"
+
+inherit autotools
diff --git a/packages/mozilla/minimo_cvs.bb b/packages/mozilla/minimo_cvs.bb
index 9c29926100..c0e8edc747 100644
--- a/packages/mozilla/minimo_cvs.bb
+++ b/packages/mozilla/minimo_cvs.bb
@@ -4,7 +4,7 @@ LICENSE = "MPL GPL LGPL"
 HOMEPAGE = "http://www.mozilla.org/projects/minimo/"
 PRIORITY = "optional"
 
-DEPENDS = "libxrender xt xft fontconfig freetype libidl dbus-glib pango atk gtk+ libidl-native"
+DEPENDS = "libxrender xt xft fontconfig freetype libidl dbus-glib pango atk gtk+ libidl-native zip-native"
 
 CVSSVR="cvs-mirror.mozilla.org"
 BRTAG = "MOZILLA_1_8_BRANCH"
diff --git a/packages/efl/epsilon/.mtn2git_empty b/packages/nonworking/efl/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/efl/epsilon/.mtn2git_empty
+++ b/packages/nonworking/efl/.mtn2git_empty
diff --git a/packages/efl/esmart/.mtn2git_empty b/packages/nonworking/efl/e/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/efl/esmart/.mtn2git_empty
+++ b/packages/nonworking/efl/e/.mtn2git_empty
diff --git a/packages/efl/e/fix-configure.patch b/packages/nonworking/efl/e/fix-configure.patch
index 02560fd7ab..02560fd7ab 100644
--- a/packages/efl/e/fix-configure.patch
+++ b/packages/nonworking/efl/e/fix-configure.patch
diff --git a/packages/efl/ecore-fb_0.9.9.038.bb b/packages/nonworking/efl/ecore-fb_0.9.9.038.bb
index b856d38bd9..b856d38bd9 100644
--- a/packages/efl/ecore-fb_0.9.9.038.bb
+++ b/packages/nonworking/efl/ecore-fb_0.9.9.038.bb
diff --git a/packages/efl/ecore-native_0.9.9.038.bb b/packages/nonworking/efl/ecore-native_0.9.9.038.bb
index 7d7ed2370a..7d7ed2370a 100644
--- a/packages/efl/ecore-native_0.9.9.038.bb
+++ b/packages/nonworking/efl/ecore-native_0.9.9.038.bb
diff --git a/packages/efl/ecore-x11_0.9.9.038.bb b/packages/nonworking/efl/ecore-x11_0.9.9.038.bb
index 1deb641326..1deb641326 100644
--- a/packages/efl/ecore-x11_0.9.9.038.bb
+++ b/packages/nonworking/efl/ecore-x11_0.9.9.038.bb
diff --git a/packages/efl/ecore.inc b/packages/nonworking/efl/ecore.inc
index 60c18cacc3..60c18cacc3 100644
--- a/packages/efl/ecore.inc
+++ b/packages/nonworking/efl/ecore.inc
diff --git a/packages/efl/evas/.mtn2git_empty b/packages/nonworking/efl/ecore/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/efl/evas/.mtn2git_empty
+++ b/packages/nonworking/efl/ecore/.mtn2git_empty
diff --git a/packages/nonworking/efl/ecore/add-tslib-support.patch b/packages/nonworking/efl/ecore/add-tslib-support.patch
new file mode 100644
index 0000000000..c125122a91
--- /dev/null
+++ b/packages/nonworking/efl/ecore/add-tslib-support.patch
@@ -0,0 +1,104 @@
+
+#
+# tslib support for ecore, (C) Michael 'Mickey' Lauer <mickey@Vanille.de>
+#
+
+--- ecore/src/lib/ecore_fb/ecore_fb.c~add-tslib-support.patch
++++ ecore/src/lib/ecore_fb/ecore_fb.c
+@@ -4,6 +4,13 @@
+ #include "Ecore_Fb.h"
+ #include "ecore_private.h"
+ 
++
++#ifdef HAVE_TSLIB
++#include <tslib.h>
++#include <errno.h>
++#endif
++
++
+ #include <fcntl.h>
+ #include <unistd.h>
+ #include <stdio.h>
+@@ -77,6 +84,11 @@
+    unsigned char z;
+ };
+ 
++#ifdef HAVE_TSLIB
++struct tsdev *_ecore_fb_tslib_tsdev = NULL;
++struct ts_sample _ecore_fb_tslib_event;
++#endif
++
+ static void _ecore_fb_size_get(int *w, int *h);
+ static int _ecore_fb_ts_fd_handler(void *data, Ecore_Fd_Handler *fd_handler);
+ static int _ecore_fb_kbd_fd_handler(void *data, Ecore_Fd_Handler *fd_handler);
+@@ -269,10 +281,39 @@
+ ecore_fb_init(const char *name __UNUSED__)
+ {
+    int prev_flags;
++#ifdef HAVE_TSLIB
++   char *tslib_tsdevice = NULL;
++#endif
+ 
+    _ecore_fb_init_count++;
+    if (_ecore_fb_init_count > 1) return _ecore_fb_init_count;
++#ifdef HAVE_TSLIB
++    if ( ( tslib_tsdevice = getenv("TSLIB_TSDEVICE") ) != NULL )
++    {
++        printf( "ECORE_FB: TSLIB_TSDEVICE = '%s'\n", tslib_tsdevice );
++        _ecore_fb_tslib_tsdev = ts_open( tslib_tsdevice, 1 ); /* 1 = nonblocking, 0 = blocking */
++
++        if ( !_ecore_fb_tslib_tsdev )
++        {
++            printf( "ECORE_FB: Can't ts_open (%s)\n", strerror( errno ) );
++            return 0;
++        }
++
++        if ( ts_config( _ecore_fb_tslib_tsdev ) )
++        {
++            printf( "ECORE_FB: Can't ts_config (%s)\n", strerror( errno ) );
++            return 0;
++        }
++        _ecore_fb_ts_fd = ts_fd( _ecore_fb_tslib_tsdev );
++        if ( _ecore_fb_ts_fd < 0 )
++        {
++            printf( "ECORE_FB: Can't open touchscreen (%s)\n", strerror( errno ) );
++            return 0;
++        }
++    }
++#else
+    _ecore_fb_ts_fd = open("/dev/touchscreen/0", O_RDONLY);
++#endif
+    if (_ecore_fb_ts_fd >= 0)
+      {
+ 	prev_flags = fcntl(_ecore_fb_ts_fd, F_GETFL);
+@@ -790,7 +831,21 @@
+ 	char *ptr;
+ 	double t;
+ 	int did_triple = 0;
+-	
++
++#ifdef HAVE_TSLIB
++    if ( _ecore_fb_ts_apply_cal )
++        num = ts_read_raw( _ecore_fb_tslib_tsdev, &_ecore_fb_tslib_event, 1 );
++    else
++        num = ts_read( _ecore_fb_tslib_tsdev, &_ecore_fb_tslib_event, 1 );
++    if ( num != 1 )
++    {
++        return 1; /* no more samples at this time */
++    }
++    x = _ecore_fb_tslib_event.x;
++    y = _ecore_fb_tslib_event.y;
++    pressure = _ecore_fb_tslib_event.pressure;
++    v = 1; /* loop, there might be more samples */
++#else
+ 	ptr = (char *)&(_ecore_fb_ts_event);
+ 	ptr += _ecore_fb_ts_event_byte_count;
+ 	num = sizeof(Ecore_Fb_Ts_Event) - _ecore_fb_ts_event_byte_count;
+@@ -811,6 +866,7 @@
+ 	     y = _ecore_fb_ts_event.y;
+ 	  }
+ 	pressure = _ecore_fb_ts_event.pressure;
++#endif   
+ 	/* add event to queue */
+ 	/* always add a move event */
+ 	if ((pressure) || (prev_pressure))
diff --git a/packages/nonworking/efl/ecore/configure-abstract-sockets.patch b/packages/nonworking/efl/ecore/configure-abstract-sockets.patch
new file mode 100644
index 0000000000..359203b163
--- /dev/null
+++ b/packages/nonworking/efl/ecore/configure-abstract-sockets.patch
@@ -0,0 +1,16 @@
+Index: ecore-0.9.9.038/configure.in
+===================================================================
+--- ecore-0.9.9.038.orig/configure.in
++++ ecore-0.9.9.038/configure.in
+@@ -541,10 +541,7 @@ AC_ARG_ENABLE(abstract-sockets,
+   [ want_abstract_sockets="yes"]
+ )
+ if test "x$want_abstract_sockets" = "xyes"; then
+-  AC_ABSTRACT_SOCKET_TEST(
+-    [AC_DEFINE(HAVE_ABSTRACT_SOCKETS, 1, [Have abstract sockets namespace])],
+-    []
+-  )
++  HAVE_ABSTRACT_SOCKETS = 1
+ fi
+ 
+ ECORE_CHECK_MODULE([Con], [yes])
diff --git a/packages/nonworking/efl/ecore/configure.patch b/packages/nonworking/efl/ecore/configure.patch
new file mode 100644
index 0000000000..23d8193b44
--- /dev/null
+++ b/packages/nonworking/efl/ecore/configure.patch
@@ -0,0 +1,21 @@
+--- ecore-0.9.9.036/configure.in.bak	2006-11-13 14:01:10.000000000 -0800
++++ ecore-0.9.9.036/configure.in	2006-11-13 14:02:15.000000000 -0800
+@@ -16,7 +16,6 @@
+ AC_CHECK_SIZEOF(long, 4)
+ AM_ENABLE_SHARED
+ AM_PROG_LIBTOOL
+-AC_C___ATTRIBUTE__
+ 							
+ if test "x${bindir}" = 'xNONE'; then
+   if test "x${prefix}" = "xNONE"; then
+@@ -200,9 +199,7 @@
+       AM_CONDITIONAL(BUILD_ECORE_X, true)
+       AC_DEFINE(BUILD_ECORE_X, 1, [Build Ecore_X Module])
+       have_ecore_x="yes"
+-      x_dir=${x_dir:-/usr/X11R6}
+-      x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}}
+-      x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext"
++      x_libs="-lX11 -lXext"
+       ecore_x_libs="-lecore_x $x_libs";
+     ],[
+       AM_CONDITIONAL(BUILD_ECORE_X, false)
diff --git a/packages/nonworking/efl/ecore/ecore_kernel_input_header.patch b/packages/nonworking/efl/ecore/ecore_kernel_input_header.patch
new file mode 100644
index 0000000000..99f57ddcff
--- /dev/null
+++ b/packages/nonworking/efl/ecore/ecore_kernel_input_header.patch
@@ -0,0 +1,23 @@
+Index: ecore-0.9.9.036/src/lib/ecore_fb/ecore_fb_li.c
+===================================================================
+--- ecore-0.9.9.036.orig/src/lib/ecore_fb/ecore_fb_li.c	2006-09-05 01:36:43.000000000 +0100
++++ ecore-0.9.9.036/src/lib/ecore_fb/ecore_fb_li.c	2006-12-02 21:55:54.000000000 +0000
+@@ -1,6 +1,18 @@
+ #include "Ecore_Fb.h"
+ #include "ecore_fb_private.h"
+ 
++struct input_absinfo {
++	__s32 value;
++	__s32 minimum;
++	__s32 maximum;
++	__s32 fuzz;
++	__s32 flat;
++};
++
++
++#define EV_SYN			0x00
++#define EV_PWR			0x16
++#define EV_FF_STATUS		0x17
+ 
+ /* Copyright (C) Brad Hards (1999-2002).
+  * this macro is used to tell if "bit" is set in "array"
diff --git a/packages/efl/ecore/fix-tslib-configure.patch b/packages/nonworking/efl/ecore/fix-tslib-configure.patch
index 2c82b2741e..2c82b2741e 100644
--- a/packages/efl/ecore/fix-tslib-configure.patch
+++ b/packages/nonworking/efl/ecore/fix-tslib-configure.patch
diff --git a/packages/nonworking/efl/ecore/remove-bad-code.patch b/packages/nonworking/efl/ecore/remove-bad-code.patch
new file mode 100644
index 0000000000..87a8d16bd6
--- /dev/null
+++ b/packages/nonworking/efl/ecore/remove-bad-code.patch
@@ -0,0 +1,36 @@
+Index: ecore-0.9.9.037/src/lib/ecore_fb/ecore_fb_private.h
+===================================================================
+--- ecore-0.9.9.037.orig/src/lib/ecore_fb/ecore_fb_private.h
++++ ecore-0.9.9.037/src/lib/ecore_fb/ecore_fb_private.h
+@@ -19,8 +19,8 @@
+  #define kernel_ulong_t unsigned long 
+  #define BITS_PER_LONG 32
+  #include <linux/input.h>
+- #undef kernel_ulong_t <-added
+- #undef BITS_PER_LONG <-added
++ #undef kernel_ulong_t
++ #undef BITS_PER_LONG
+ #else
+  #include <linux/input.h>
+ #endif
+Index: ecore-0.9.9.037/src/lib/ecore_fb/ecore_fb_li.c
+===================================================================
+--- ecore-0.9.9.037.orig/src/lib/ecore_fb/ecore_fb_li.c
++++ ecore-0.9.9.037/src/lib/ecore_fb/ecore_fb_li.c
+@@ -1,6 +1,6 @@
+ #include "Ecore_Fb.h"
+ #include "ecore_fb_private.h"
+-
++/*
+ struct input_absinfo {
+ 	__s32 value;
+ 	__s32 minimum;
+@@ -8,7 +8,7 @@ struct input_absinfo {
+ 	__s32 fuzz;
+ 	__s32 flat;
+ };
+-
++*/
+ 
+ #define EV_SYN			0x00
+ #define EV_PWR			0x16
diff --git a/packages/efl/ecore/remove-tslib-configure.patch b/packages/nonworking/efl/ecore/remove-tslib-configure.patch
index 40ed1c2c33..40ed1c2c33 100644
--- a/packages/efl/ecore/remove-tslib-configure.patch
+++ b/packages/nonworking/efl/ecore/remove-tslib-configure.patch
diff --git a/packages/efl/ewl/.mtn2git_empty b/packages/nonworking/efl/edb-native/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/efl/ewl/.mtn2git_empty
+++ b/packages/nonworking/efl/edb-native/.mtn2git_empty
diff --git a/packages/efl/edb-native/no-gtk-forkbomb.patch b/packages/nonworking/efl/edb-native/no-gtk-forkbomb.patch
index 8fe226846e..8fe226846e 100644
--- a/packages/efl/edb-native/no-gtk-forkbomb.patch
+++ b/packages/nonworking/efl/edb-native/no-gtk-forkbomb.patch
diff --git a/packages/efl/edb-native_1.0.5.007.bb b/packages/nonworking/efl/edb-native_1.0.5.007.bb
index f3f94086ce..f3f94086ce 100644
--- a/packages/efl/edb-native_1.0.5.007.bb
+++ b/packages/nonworking/efl/edb-native_1.0.5.007.bb
diff --git a/packages/efl/edb-utils_1.0.5.007.bb b/packages/nonworking/efl/edb-utils_1.0.5.007.bb
index 8d47e068a7..8d47e068a7 100644
--- a/packages/efl/edb-utils_1.0.5.007.bb
+++ b/packages/nonworking/efl/edb-utils_1.0.5.007.bb
diff --git a/packages/efl/edb_1.0.5.007.bb b/packages/nonworking/efl/edb_1.0.5.007.bb
index 9632fc4acc..9632fc4acc 100644
--- a/packages/efl/edb_1.0.5.007.bb
+++ b/packages/nonworking/efl/edb_1.0.5.007.bb
diff --git a/packages/efl/edje-native_0.5.0.038.bb b/packages/nonworking/efl/edje-native_0.5.0.038.bb
index 4e878ab204..4e878ab204 100644
--- a/packages/efl/edje-native_0.5.0.038.bb
+++ b/packages/nonworking/efl/edje-native_0.5.0.038.bb
diff --git a/packages/efl/edje-utils_0.5.0.038.bb b/packages/nonworking/efl/edje-utils_0.5.0.038.bb
index f8eb917e4d..f8eb917e4d 100644
--- a/packages/efl/edje-utils_0.5.0.038.bb
+++ b/packages/nonworking/efl/edje-utils_0.5.0.038.bb
diff --git a/packages/efl/edje_0.5.0.038.bb b/packages/nonworking/efl/edje_0.5.0.038.bb
index d51dd119e4..d51dd119e4 100644
--- a/packages/efl/edje_0.5.0.038.bb
+++ b/packages/nonworking/efl/edje_0.5.0.038.bb
diff --git a/packages/nonworking/efl/eet-native_0.9.10.038.bb b/packages/nonworking/efl/eet-native_0.9.10.038.bb
new file mode 100644
index 0000000000..9e2426ca9f
--- /dev/null
+++ b/packages/nonworking/efl/eet-native_0.9.10.038.bb
@@ -0,0 +1,4 @@
+require eet_${PV}.bb
+inherit native
+DEPENDS = "zlib-native jpeg-native"
+
diff --git a/packages/efl/eet_0.9.10.038.bb b/packages/nonworking/efl/eet_0.9.10.038.bb
index 6e6032e098..6e6032e098 100644
--- a/packages/efl/eet_0.9.10.038.bb
+++ b/packages/nonworking/efl/eet_0.9.10.038.bb
diff --git a/packages/nonworking/efl/efl.bbclass b/packages/nonworking/efl/efl.bbclass
new file mode 100644
index 0000000000..808bf2eaae
--- /dev/null
+++ b/packages/nonworking/efl/efl.bbclass
@@ -0,0 +1,52 @@
+inherit e
+
+SECTION = "e/libs"
+
+SRCNAME = "${@bb.data.getVar('PN', d, 1).replace('-native', '')}"
+SRC_URI = "${E_URI}/${SRCNAME}-${PV}.tar.gz"
+S = "${WORKDIR}/${SRCNAME}-${PV}"
+
+INHIBIT_AUTO_STAGE_INCLUDES  = "1"
+INHIBIT_NATIVE_STAGE_INSTALL = "1"
+
+libdirectory = "src/lib"
+libraries = "lib${SRCNAME}"
+headers = "${@bb.data.getVar('SRCNAME',d,1).capitalize()}.h"
+
+def efl_is_native(d):
+    import bb
+    return ["","-native"][bb.data.inherits_class('native', d)]
+
+do_stage_append () {
+	for i in ${libraries}
+	do
+		oe_libinstall -C ${libdirectory} $i ${STAGING_LIBDIR}
+	done
+	for i in ${headers}
+	do
+		install -m 0644 ${libdirectory}/$i ${STAGING_INCDIR}
+	done
+
+	# Install binaries automatically for native builds
+	if [ "${@efl_is_native(d)}" = "-native" ]
+	then
+
+		# Most EFL binaries start with the package name
+		for i in src/bin/${SRCNAME}*
+		do
+			if [ -x $i -a -f $i ]
+			then
+
+				# Don't install anything with an extension (.so, etc)
+				if echo $i | grep -v \\.
+				then
+					${HOST_SYS}-libtool --mode=install install -m 0755 $i ${STAGING_BINDIR}
+				fi
+			fi
+		done
+	fi
+}
+
+PACKAGES = "${PN}-dbg ${PN} ${PN}-themes ${PN}-dev ${PN}-examples"
+FILES_${PN}-dev += "${bindir}/${PN}-config ${libdir}/pkgconfig ${libdir}/lib*.?a ${libdir}/lib*.a"
+FILES_${PN}-examples = "${bindir} ${datadir}"
diff --git a/packages/efl/efreet-native_0.0.3.002.bb b/packages/nonworking/efl/efreet-native_0.0.3.002.bb
index 470d9e2dab..470d9e2dab 100644
--- a/packages/efl/efreet-native_0.0.3.002.bb
+++ b/packages/nonworking/efl/efreet-native_0.0.3.002.bb
diff --git a/packages/efl/efreet_0.0.3.002.bb b/packages/nonworking/efl/efreet_0.0.3.002.bb
index 2ef049eed7..2ef049eed7 100644
--- a/packages/efl/efreet_0.0.3.002.bb
+++ b/packages/nonworking/efl/efreet_0.0.3.002.bb
diff --git a/packages/efl/embryo-native_0.9.1.038.bb b/packages/nonworking/efl/embryo-native_0.9.1.038.bb
index 76fe80fe3d..76fe80fe3d 100644
--- a/packages/efl/embryo-native_0.9.1.038.bb
+++ b/packages/nonworking/efl/embryo-native_0.9.1.038.bb
diff --git a/packages/efl/embryo-utils_0.9.1.038.bb b/packages/nonworking/efl/embryo-utils_0.9.1.038.bb
index d507c53cce..d507c53cce 100644
--- a/packages/efl/embryo-utils_0.9.1.038.bb
+++ b/packages/nonworking/efl/embryo-utils_0.9.1.038.bb
diff --git a/packages/efl/embryo_0.9.1.038.bb b/packages/nonworking/efl/embryo_0.9.1.038.bb
index 0009c0a149..0009c0a149 100644
--- a/packages/efl/embryo_0.9.1.038.bb
+++ b/packages/nonworking/efl/embryo_0.9.1.038.bb
diff --git a/packages/efl/emotion_20061116.bb b/packages/nonworking/efl/emotion_20061116.bb
index 59a3fa7269..59a3fa7269 100644
--- a/packages/efl/emotion_20061116.bb
+++ b/packages/nonworking/efl/emotion_20061116.bb
diff --git a/packages/efl/engrave_20060128.bb b/packages/nonworking/efl/engrave_20060128.bb
index 63eb24eb1f..63eb24eb1f 100644
--- a/packages/efl/engrave_20060128.bb
+++ b/packages/nonworking/efl/engrave_20060128.bb
diff --git a/packages/efl/epdf_20060418.bb b/packages/nonworking/efl/epdf_20060418.bb
index 9f7bd0a255..9f7bd0a255 100644
--- a/packages/efl/epdf_20060418.bb
+++ b/packages/nonworking/efl/epdf_20060418.bb
diff --git a/packages/efl/epeg_0.9.0.008.bb b/packages/nonworking/efl/epeg_0.9.0.008.bb
index c35ec63606..c35ec63606 100644
--- a/packages/efl/epeg_0.9.0.008.bb
+++ b/packages/nonworking/efl/epeg_0.9.0.008.bb
diff --git a/packages/efl/files/.mtn2git_empty b/packages/nonworking/efl/epsilon/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/efl/files/.mtn2git_empty
+++ b/packages/nonworking/efl/epsilon/.mtn2git_empty
diff --git a/packages/nonworking/efl/epsilon/compile-fix.patch b/packages/nonworking/efl/epsilon/compile-fix.patch
new file mode 100644
index 0000000000..1c42cc59c4
--- /dev/null
+++ b/packages/nonworking/efl/epsilon/compile-fix.patch
@@ -0,0 +1,15 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- epsilon-0.3.0.004/src/lib/exiftags/exif.c~compile-fix
++++ epsilon-0.3.0.004/src/lib/exiftags/exif.c
+@@ -48,7 +48,6 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <errno.h>
+-#include <math.h>
+ #include <float.h>
+ #include <ctype.h>
+ 
diff --git a/packages/nonworking/efl/epsilon/server-is-not-client.patch b/packages/nonworking/efl/epsilon/server-is-not-client.patch
new file mode 100644
index 0000000000..e96e528b9e
--- /dev/null
+++ b/packages/nonworking/efl/epsilon/server-is-not-client.patch
@@ -0,0 +1,11 @@
+--- /tmp/epsilon_private.h	2006-12-01 12:06:30.000000000 +0100
++++ epsilon-0.3.0.007/src/include/epsilon_private.h	2006-12-01 12:07:10.928254000 +0100
+@@ -41,7 +41,7 @@
+ Epsilon_Message *epsilon_message_new(int clientid, char *path, char *dst, int status);
+ 
+ int epsilon_ipc_client_send(Ecore_Con_Client *cl, Epsilon_Message *msg);
+-int epsilon_ipc_server_send(Ecore_Con_Client *cl, Epsilon_Message *msg);
++int epsilon_ipc_server_send(Ecore_Con_Server *srv, Epsilon_Message *msg);
+ 
+ Epsilon_Message *epsilon_ipc_consume(Epsilon_Ipc_End *end);
+ 
diff --git a/packages/nonworking/efl/epsilon_0.3.0.008.bb b/packages/nonworking/efl/epsilon_0.3.0.008.bb
new file mode 100644
index 0000000000..d3c1cba1e4
--- /dev/null
+++ b/packages/nonworking/efl/epsilon_0.3.0.008.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = "Epsilon is a flexable and powerful image thumbnailing library \
+that is complient with the freedesktop.org Thumbnail Managing Standard."
+LICENSE = "GPL"
+DEPENDS = "imlib2 epeg libpng evas ecore edje perl-native"
+PR = "r0"
+
+inherit efl1
+
+#SRC_URI += "file://compile-fix.patch;patch=1 \
+#            ${E_CVS};module=e17/libs/epsilon/m4;date=20060101"
+#            file://server-is-not-client.patch;patch=1 \
+
+#do_configure_prepend() {
+#	install -d "${S}/m4"
+#	install "${WORKDIR}/m4/"*.m4 "${S}/m4"
+#	aclocal -I m4
+#}
diff --git a/packages/efl/esmart-fb_0.9.0.008.bb b/packages/nonworking/efl/esmart-fb_0.9.0.008.bb
index a2fab3ca09..a2fab3ca09 100644
--- a/packages/efl/esmart-fb_0.9.0.008.bb
+++ b/packages/nonworking/efl/esmart-fb_0.9.0.008.bb
diff --git a/packages/efl/esmart-x11_0.9.0.008.bb b/packages/nonworking/efl/esmart-x11_0.9.0.008.bb
index 7b80b581a1..7b80b581a1 100644
--- a/packages/efl/esmart-x11_0.9.0.008.bb
+++ b/packages/nonworking/efl/esmart-x11_0.9.0.008.bb
diff --git a/packages/efl/esmart.inc b/packages/nonworking/efl/esmart.inc
index 9b8114de53..9b8114de53 100644
--- a/packages/efl/esmart.inc
+++ b/packages/nonworking/efl/esmart.inc
diff --git a/packages/elitaire/.mtn2git_empty b/packages/nonworking/efl/esmart/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/elitaire/.mtn2git_empty
+++ b/packages/nonworking/efl/esmart/.mtn2git_empty
diff --git a/packages/efl/esmart/compile-fix.patch b/packages/nonworking/efl/esmart/compile-fix.patch
index 08ca835aa7..08ca835aa7 100644
--- a/packages/efl/esmart/compile-fix.patch
+++ b/packages/nonworking/efl/esmart/compile-fix.patch
diff --git a/packages/efl/esmart/disable-x-only-features.patch b/packages/nonworking/efl/esmart/disable-x-only-features.patch
index 68dd363f74..68dd363f74 100644
--- a/packages/efl/esmart/disable-x-only-features.patch
+++ b/packages/nonworking/efl/esmart/disable-x-only-features.patch
diff --git a/packages/efl/esmart/ecore-fix.patch b/packages/nonworking/efl/esmart/ecore-fix.patch
index 94deff0b95..94deff0b95 100644
--- a/packages/efl/esmart/ecore-fix.patch
+++ b/packages/nonworking/efl/esmart/ecore-fix.patch
diff --git a/packages/efl/esmart/include-stdio.patch b/packages/nonworking/efl/esmart/include-stdio.patch
index 20a490f421..20a490f421 100644
--- a/packages/efl/esmart/include-stdio.patch
+++ b/packages/nonworking/efl/esmart/include-stdio.patch
diff --git a/packages/efl/etk_0.1.0.003.bb b/packages/nonworking/efl/etk_0.1.0.003.bb
index e283adef23..e283adef23 100644
--- a/packages/efl/etk_0.1.0.003.bb
+++ b/packages/nonworking/efl/etk_0.1.0.003.bb
diff --git a/packages/efl/evas-fb_0.9.9.038.bb b/packages/nonworking/efl/evas-fb_0.9.9.038.bb
index 4acc857982..4acc857982 100644
--- a/packages/efl/evas-fb_0.9.9.038.bb
+++ b/packages/nonworking/efl/evas-fb_0.9.9.038.bb
diff --git a/packages/efl/evas-native_0.9.9.038.bb b/packages/nonworking/efl/evas-native_0.9.9.038.bb
index 68dacbc809..68dacbc809 100644
--- a/packages/efl/evas-native_0.9.9.038.bb
+++ b/packages/nonworking/efl/evas-native_0.9.9.038.bb
diff --git a/packages/efl/evas-x11_0.9.9.038.bb b/packages/nonworking/efl/evas-x11_0.9.9.038.bb
index 765a8b73d4..4c5ef29515 100644
--- a/packages/efl/evas-x11_0.9.9.038.bb
+++ b/packages/nonworking/efl/evas-x11_0.9.9.038.bb
@@ -1,6 +1,6 @@
 require evas.inc
 DEPENDS += "edb virtual/libx11 libxext freetype"
-PR = "r8"
+PR = "r10"
 
 EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11  \
 		--x-libraries=${STAGING_LIBDIR} \
@@ -9,6 +9,7 @@ EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11  \
 		--enable-buffer			\
 		--disable-software-qtopia	\
 		--enable-software-x11		\
+		--enable-software-16-x11        \
 		--disable-gl-x11		\
 		--enable-image-loader-eet	\
 		--enable-image-loader-edb	\
@@ -20,7 +21,7 @@ EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11  \
 		--enable-scale-sample		\
 		--enable-scale-smooth		\
 		--enable-convert-yuv		\
-        --disable-image-loader-svg  \
+                --disable-image-loader-svg  \
 		--disable-convert-8-rgb-332	\
 		--disable-convert-8-rgb-666	\
 		--disable-convert-8-rgb-232	\
@@ -33,19 +34,20 @@ EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11  \
 		--disable-convert-16-rgb-444	\
 		--disable-convert-16-rgb-ipq	\
 		--enable-convert-16-rgb-rot-0	\
-		--disable-convert-16-rgb-rot-90	\
+		--enable-convert-16-rgb-rot-90	\
 		--enable-convert-16-rgb-rot-270	\
 		--disable-convert-24-rgb-888	\
 		--disable-convert-24-bgr-888	\
 		--disable-convert-32-rgb-8888	\
 		--disable-convert-32-rgbx-8888	\
-		--disable-convert-32-bgr-8888	\
-		--disable-convert-32-bgrx-8888	\
+		--enable-convert-32-bgr-8888	\
+		--enable-convert-32-bgrx-8888	\
 		--disable-convert-32-rgb-rot-0	\
 		--disable-convert-32-rgb-rot-90	\
 		--disable-convert-32-rgb-rot-270"
 
 headers = "../modules/engines/software_x11/Evas_Engine_Software_X11.h \
+           ../modules/engines/software_16_x11/Evas_Engine_Software_16_X11.h \
            ../modules/engines/xrender_x11/Evas_Engine_XRender_X11.h \
            ../modules/engines/buffer/Evas_Engine_Buffer.h \
            ../modules/engines/fb/Evas_Engine_FB.h \
diff --git a/packages/efl/evas.inc b/packages/nonworking/efl/evas.inc
index f708200071..a175099c31 100644
--- a/packages/efl/evas.inc
+++ b/packages/nonworking/efl/evas.inc
@@ -7,7 +7,7 @@ LICENSE = "MIT"
 DEPENDS = "freetype libpng jpeg eet"
 PROVIDES += "virtual/evas"
 
-inherit efl
+inherit efl lib_package
 
 export FREETYPE_CONFIG = "${STAGING_BINDIR_CROSS}/freetype-config"
 
@@ -47,4 +47,4 @@ headers = "<override me>"
 libraries = "libevas"
 FILES_${PN} += "/usr/lib/evas/modules/*/*/*/*.so"
 FILES_${PN}-dev += "/usr/lib/evas/modules/*/*/*/*.a /usr/lib/evas/modules/*/*/*/*.la"
-FILES_${PN}-dbg += "/usr/lib/evas/modules/*/*/*/.debug/"
-\ No newline at end of file
+FILES_${PN}-dbg += "/usr/lib/evas/modules/*/*/*/.debug/"
diff --git a/packages/elitaire/files/.mtn2git_empty b/packages/nonworking/efl/evas/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/elitaire/files/.mtn2git_empty
+++ b/packages/nonworking/efl/evas/.mtn2git_empty
diff --git a/packages/nonworking/efl/evas/fix-configure.patch b/packages/nonworking/efl/evas/fix-configure.patch
new file mode 100644
index 0000000000..abf9b94bdf
--- /dev/null
+++ b/packages/nonworking/efl/evas/fix-configure.patch
@@ -0,0 +1,36 @@
+diff -Nur evas-0.9.9.037~/configure.in evas-0.9.9.037/configure.in
+--- evas-0.9.9.037~/configure.in	2007-01-14 20:09:57.000000000 -0800
++++ evas-0.9.9.037/configure.in	2007-01-14 20:11:09.000000000 -0800
+@@ -161,9 +161,7 @@
+   AC_CHECK_HEADER(X11/X.h,
+     [
+       AC_DEFINE(BUILD_ENGINE_SOFTWARE_X11, 1, [Software X11 Rendering Backend])
+-      x_dir=${x_dir:-/usr/X11R6}
+-      x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}}
+-      x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext"
++      x_libs="-lX11 -lXext"
+     ],
+     [
+       AC_MSG_RESULT(disabling software X11 engine)
+@@ -407,10 +405,10 @@
+ 	      AC_DEFINE(BUILD_ENGINE_GL_X11, 1, [OpenGL X11 Rendering Backend])
+ 	      AM_CONDITIONAL(BUILD_ENGINE_GL_COMMON, true)
+ 	      AC_DEFINE(BUILD_ENGINE_GL_COMMON, 1, [Generic OpenGL Rendering Support])
+-	      x_dir=${x_dir:-/usr/X11R6};
++	      x_dir=${x_dir:-};
+ 	      x_cflags=${x_cflags:--I$x_dir/include}
+ 	      x_libs="${x_libs:--L$x_dir/lib -lX11 -lXext}"
+-	      gl_cflags="-I/usr/include"
++	      gl_cflags=""
+ 	      gl_libs="-lGL -lGLU -lpthread"
+ 	      gl_dir=""
+             ], [
+@@ -471,7 +469,7 @@
+       AC_DEFINE(BUILD_ENGINE_CAIRO_X11, 1, [Cairo X11 Rendering Backend])
+       AM_CONDITIONAL(BUILD_ENGINE_CAIRO_COMMON, true)
+       AC_DEFINE(BUILD_ENGINE_CAIRO_COMMON, 1, [Generic Cairo Rendering Support])
+-      x_dir="/usr/X11R6";
++      x_dir="";
+       x_cflags="-I"$x_dir"/include"
+       x_libs="-L"$x_dir"/lib -lX11 -lXext"
+     ], [
diff --git a/packages/nonworking/efl/evas/pagesize.patch b/packages/nonworking/efl/evas/pagesize.patch
new file mode 100644
index 0000000000..5efd16a96e
--- /dev/null
+++ b/packages/nonworking/efl/evas/pagesize.patch
@@ -0,0 +1,13 @@
+diff --git a/src/modules/engines/fb/evas_fb_main.c b/src/modules/engines/fb/evas_fb_main.c
+index e26c171..75e0743 100644
+--- a/src/modules/engines/fb/evas_fb_main.c
++++ b/src/modules/engines/fb/evas_fb_main.c
+@@ -530,7 +530,7 @@ fb_postinit(FB_Mode *mode)
+       fb_cleanup();
+       exit(1);
+     }
+-  mode->mem_offset = (unsigned)(fb_fix.smem_start) & (~PAGE_MASK);
++  mode->mem_offset = (unsigned)(fb_fix.smem_start) & (getpagesize()-1);
+   mode->mem = (unsigned char *)mmap(NULL, fb_fix.smem_len + mode->mem_offset,
+ 				 PROT_WRITE | PROT_READ, MAP_SHARED, fb, 0);
+   if ((int)mode->mem == -1)
diff --git a/packages/esound/esound-gpe/.mtn2git_empty b/packages/nonworking/efl/ewl/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/esound/esound-gpe/.mtn2git_empty
+++ b/packages/nonworking/efl/ewl/.mtn2git_empty
diff --git a/packages/efl/ewl/ewl-configure.patch b/packages/nonworking/efl/ewl/ewl-configure.patch
index a754e0f819..a754e0f819 100644
--- a/packages/efl/ewl/ewl-configure.patch
+++ b/packages/nonworking/efl/ewl/ewl-configure.patch
diff --git a/packages/efl/ewl/minmax.patch b/packages/nonworking/efl/ewl/minmax.patch
index cd8723e9a3..cd8723e9a3 100644
--- a/packages/efl/ewl/minmax.patch
+++ b/packages/nonworking/efl/ewl/minmax.patch
diff --git a/packages/efl/ewl/no-examples.patch b/packages/nonworking/efl/ewl/no-examples.patch
index 402c50894c..402c50894c 100644
--- a/packages/efl/ewl/no-examples.patch
+++ b/packages/nonworking/efl/ewl/no-examples.patch
diff --git a/packages/efl/ewl_0.5.1.008.bb b/packages/nonworking/efl/ewl_0.5.1.008.bb
index 3a9313cb59..3a9313cb59 100644
--- a/packages/efl/ewl_0.5.1.008.bb
+++ b/packages/nonworking/efl/ewl_0.5.1.008.bb
diff --git a/packages/esound/old/.mtn2git_empty b/packages/nonworking/efl/files/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/esound/old/.mtn2git_empty
+++ b/packages/nonworking/efl/files/.mtn2git_empty
diff --git a/packages/efl/files/pkg.m4 b/packages/nonworking/efl/files/pkg.m4
index c80e0acfc4..c80e0acfc4 100644
--- a/packages/efl/files/pkg.m4
+++ b/packages/nonworking/efl/files/pkg.m4
diff --git a/packages/efl/imlib2-fb_1.3.0.001.bb b/packages/nonworking/efl/imlib2-fb_1.3.0.001.bb
index f2ee48f5d9..f2ee48f5d9 100644
--- a/packages/efl/imlib2-fb_1.3.0.001.bb
+++ b/packages/nonworking/efl/imlib2-fb_1.3.0.001.bb
diff --git a/packages/efl/imlib2-native_1.3.0.001.bb b/packages/nonworking/efl/imlib2-native_1.3.0.001.bb
index 65c5b672b2..65c5b672b2 100644
--- a/packages/efl/imlib2-native_1.3.0.001.bb
+++ b/packages/nonworking/efl/imlib2-native_1.3.0.001.bb
diff --git a/packages/efl/imlib2-x11_1.3.0.001.bb b/packages/nonworking/efl/imlib2-x11_1.3.0.001.bb
index 67ed947e08..67ed947e08 100644
--- a/packages/efl/imlib2-x11_1.3.0.001.bb
+++ b/packages/nonworking/efl/imlib2-x11_1.3.0.001.bb
diff --git a/packages/efl/imlib2.inc b/packages/nonworking/efl/imlib2.inc
index 6a040c5386..6a040c5386 100644
--- a/packages/efl/imlib2.inc
+++ b/packages/nonworking/efl/imlib2.inc
diff --git a/packages/python/python-2.4.4-manifest.inc b/packages/python/python-2.4.4-manifest.inc
index 33f5bac2f2..d9c3229238 100644
--- a/packages/python/python-2.4.4-manifest.inc
+++ b/packages/python/python-2.4.4-manifest.inc
@@ -1,5 +1,5 @@
 ########################################################################################################################
-### AUTO-GENERATED by '/local/pkg/oe/org.openembedded.dev/contrib/python/generate-manifest.py' [(C) 2002-2007 Michael 'Mickey' Lauer <mickey@Vanille.de>] on Mon Dec 25 00:05:05 2006
+### AUTO-GENERATED by './generate-manifest.py' [(C) 2002-2007 Michael 'Mickey' Lauer <mickey@Vanille.de>] on Thu Jun 21 06:30:35 2007
 ###
 ### Visit THE Python for Embedded Systems Site => http://www.Vanille.de/projects/python.spy
 ###
@@ -8,273 +8,279 @@
 ########################################################################################################################
  
 
-PROVIDES+="python-profile python-threading python-distutils python-textutils python-codecs python-pickle python-datetime python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image python-resource python-devel python-math python-hotshot python-unixadmin python-tkinter python-gdbm python-fcntl python-netclient python-pprint python-netserver python-curses python-syslog python-html python-readline python-subprocess python-pydoc python-logging python-mailbox python-xml python-mime python-tests python-unittest python-stringold python-lib-old-and-deprecated python-compile python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio python-misc"
+PROVIDES+="python-profile python-threading python-distutils python-textutils python-codecs python-pickle python-datetime python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image python-resource python-devel python-math python-hotshot python-unixadmin python-syslog python-tkinter python-gdbm python-fcntl python-core-debug python-pprint python-netserver python-curses python-smtpd python-html python-readline python-subprocess python-pydoc python-logging python-mailbox python-xml python-mime python-tests python-unittest python-stringold python-robotparser python-lib-old-and-deprecated python-compile python-shell python-bsddb python-netclient python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio "
 
-PACKAGES="python-profile python-threading python-distutils python-textutils python-codecs python-pickle python-datetime python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image python-resource python-devel python-math python-hotshot python-unixadmin python-tkinter python-gdbm python-fcntl python-netclient python-pprint python-netserver python-curses python-syslog python-html python-readline python-subprocess python-pydoc python-logging python-mailbox python-xml python-mime python-tests python-unittest python-stringold python-lib-old-and-deprecated python-compile python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio python-misc-dbg python-misc"
-
-DESCRIPTION_python-misc-dbg="Misc Python debug files"
-FILES_python-misc-dbg="${libdir}/python2.4/lib-dynload/.debug"
-RDEPENDS_python-misc-dbg="python-core"
-
-DESCRIPTION_python-misc="Misc Python files"
-PR_python-misc="ml1"
-FILES_python-misc="${libdir}/python2.4/"
-RDEPENDS_python-misc="python-core"
+PACKAGES="python-profile python-threading python-distutils python-textutils python-codecs python-pickle python-datetime python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image python-resource python-devel python-math python-hotshot python-unixadmin python-syslog python-tkinter python-gdbm python-fcntl python-core-debug python-pprint python-netserver python-curses python-smtpd python-html python-readline python-subprocess python-pydoc python-logging python-mailbox python-xml python-mime python-tests python-unittest python-stringold python-robotparser python-lib-old-and-deprecated python-compile python-shell python-bsddb python-netclient python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio "
 
 DESCRIPTION_python-profile="Python Basic Profiling Support"
-PR_python-profile="ml0"
+PR_python-profile="ml1"
 RDEPENDS_python-profile="python-core"
 FILES_python-profile="${libdir}/python2.4/profile.* ${libdir}/python2.4/pstats.* "
 
 DESCRIPTION_python-threading="Python Threading & Synchronization Support"
-PR_python-threading="ml0"
+PR_python-threading="ml1"
 RDEPENDS_python-threading="python-core python-lang"
 FILES_python-threading="${libdir}/python2.4/_threading_local.* ${libdir}/python2.4/dummy_thread.* ${libdir}/python2.4/dummy_threading.* ${libdir}/python2.4/mutex.* ${libdir}/python2.4/threading.* ${libdir}/python2.4/Queue.* "
 
 DESCRIPTION_python-distutils="Python Distribution Utilities"
-PR_python-distutils="ml0"
+PR_python-distutils="ml1"
 RDEPENDS_python-distutils="python-core"
 FILES_python-distutils="${libdir}/python2.4/config ${libdir}/python2.4/distutils "
 
 DESCRIPTION_python-textutils="Python Option Parsing, Text Wrapping and Comma-Separated-Value Support"
-PR_python-textutils="ml0"
+PR_python-textutils="ml1"
 RDEPENDS_python-textutils="python-core python-io python-re python-stringold"
 FILES_python-textutils="${libdir}/python2.4/lib-dynload/_csv.so ${libdir}/python2.4/csv.* ${libdir}/python2.4/optparse.* ${libdir}/python2.4/textwrap.* "
 
 DESCRIPTION_python-codecs="Python Codecs, Encodings & i18n Support"
-PR_python-codecs="ml0"
+PR_python-codecs="ml1"
 RDEPENDS_python-codecs="python-core"
 FILES_python-codecs="${libdir}/python2.4/codecs.* ${libdir}/python2.4/encodings ${libdir}/python2.4/gettext.* ${libdir}/python2.4/locale.* ${libdir}/python2.4/lib-dynload/_locale.so ${libdir}/python2.4/lib-dynload/unicodedata.so ${libdir}/python2.4/stringprep.* ${libdir}/python2.4/xdrlib.* "
 
 DESCRIPTION_python-pickle="Python Persistence Support"
-PR_python-pickle="ml0"
+PR_python-pickle="ml1"
 RDEPENDS_python-pickle="python-core python-codecs python-io python-re"
 FILES_python-pickle="${libdir}/python2.4/pickle.* ${libdir}/python2.4/shelve.* ${libdir}/python2.4/lib-dynload/cPickle.so "
 
 DESCRIPTION_python-datetime="Python Calendar and Time support"
-PR_python-datetime="ml0"
+PR_python-datetime="ml1"
 RDEPENDS_python-datetime="python-core python-codecs"
 FILES_python-datetime="${libdir}/python2.4/_strptime.* ${libdir}/python2.4/calendar.* ${libdir}/python2.4/lib-dynload/datetime.so "
 
 DESCRIPTION_python-core="Python Interpreter and core modules (needed!)"
-PR_python-core="ml0"
+PR_python-core="ml3"
 RDEPENDS_python-core=""
-FILES_python-core="/usr/lib/python2.4/__future__.* /usr/lib/python2.4/copy.* /usr/lib/python2.4/copy_reg.* /usr/lib/python2.4/ConfigParser.py /usr/lib/python2.4/getopt.* /usr/lib/python2.4/linecache.* /usr/lib/python2.4/new.* /usr/lib/python2.4/os.* /usr/lib/python2.4/posixpath.* /usr/lib/python2.4/warnings.* /usr/lib/python2.4/site.* /usr/lib/python2.4/stat.* /usr/lib/python2.4/UserDict.* /usr/lib/python2.4/UserList.* /usr/lib/python2.4/UserString.* /usr/lib/python2.4/lib-dynload/binascii.so /usr/lib/python2.4/lib-dynload/struct.so /usr/lib/python2.4/lib-dynload/time.so /usr/lib/python2.4/lib-dynload/xreadlines.so /usr/lib/python2.4/types.* /usr/bin/python "
+FILES_python-core="/usr/lib/python2.4/__future__.* /usr/lib/python2.4/copy.* /usr/lib/python2.4/copy_reg.* /usr/lib/python2.4/ConfigParser.* /usr/lib/python2.4/getopt.* /usr/lib/python2.4/linecache.* /usr/lib/python2.4/new.* /usr/lib/python2.4/os.* /usr/lib/python2.4/posixpath.* /usr/lib/python2.4/warnings.* /usr/lib/python2.4/site.* /usr/lib/python2.4/stat.* /usr/lib/python2.4/UserDict.* /usr/lib/python2.4/UserList.* /usr/lib/python2.4/UserString.* /usr/lib/python2.4/lib-dynload/binascii.so /usr/lib/python2.4/lib-dynload/struct.so /usr/lib/python2.4/lib-dynload/time.so /usr/lib/python2.4/lib-dynload/xreadlines.so /usr/lib/python2.4/types.* /usr/bin/python* "
 
 DESCRIPTION_python-io="Python Low-Level I/O"
-PR_python-io="ml0"
+PR_python-io="ml1"
 RDEPENDS_python-io="python-core python-math"
 FILES_python-io="${libdir}/python2.4/lib-dynload/_socket.so ${libdir}/python2.4/lib-dynload/_ssl.so ${libdir}/python2.4/lib-dynload/select.so ${libdir}/python2.4/lib-dynload/termios.so ${libdir}/python2.4/lib-dynload/cStringIO.so ${libdir}/python2.4/pipes.* ${libdir}/python2.4/socket.* ${libdir}/python2.4/tempfile.* ${libdir}/python2.4/StringIO.* "
 
 DESCRIPTION_python-compiler="Python Compiler Support"
-PR_python-compiler="ml0"
+PR_python-compiler="ml1"
 RDEPENDS_python-compiler="python-core"
 FILES_python-compiler="${libdir}/python2.4/compiler "
 
 DESCRIPTION_python-compression="Python High Level Compression Support"
-PR_python-compression="ml0"
+PR_python-compression="ml1"
 RDEPENDS_python-compression="python-core python-zlib"
 FILES_python-compression="${libdir}/python2.4/gzip.* ${libdir}/python2.4/zipfile.* "
 
 DESCRIPTION_python-re="Python Regular Expression APIs"
-PR_python-re="ml0"
+PR_python-re="ml1"
 RDEPENDS_python-re="python-core"
 FILES_python-re="${libdir}/python2.4/re.* ${libdir}/python2.4/sre.* ${libdir}/python2.4/sre_compile.* ${libdir}/python2.4/sre_constants* ${libdir}/python2.4/sre_parse.* "
 
 DESCRIPTION_python-xmlrpc="Python XMLRPC Support"
-PR_python-xmlrpc="ml0"
+PR_python-xmlrpc="ml1"
 RDEPENDS_python-xmlrpc="python-core python-xml python-netserver python-lang"
 FILES_python-xmlrpc="${libdir}/python2.4/xmlrpclib.* ${libdir}/python2.4/SimpleXMLRPCServer.* "
 
 DESCRIPTION_python-terminal="Python Terminal Controlling Support"
-PR_python-terminal="ml0"
+PR_python-terminal="ml1"
 RDEPENDS_python-terminal="python-core python-io"
 FILES_python-terminal="${libdir}/python2.4/pty.* ${libdir}/python2.4/tty.* "
 
 DESCRIPTION_python-email="Python Email Support"
-PR_python-email="ml0"
-RDEPENDS_python-email="python-core python-io python-re"
+PR_python-email="ml1"
+RDEPENDS_python-email="python-core python-io python-re python-mime python-audio python-image"
 FILES_python-email="${libdir}/python2.4/email "
 
 DESCRIPTION_python-image="Python Graphical Image Handling"
-PR_python-image="ml0"
+PR_python-image="ml1"
 RDEPENDS_python-image="python-core"
 FILES_python-image="${libdir}/python2.4/colorsys.* ${libdir}/python2.4/imghdr.* ${libdir}/python2.4/lib-dynload/imageop.so ${libdir}/python2.4/lib-dynload/rgbimg.so "
 
 DESCRIPTION_python-resource="Python Resource Control Interface"
-PR_python-resource="ml0"
+PR_python-resource="ml1"
 RDEPENDS_python-resource="python-core"
 FILES_python-resource="${libdir}/python2.4/lib-dynload/resource.so "
 
 DESCRIPTION_python-devel="Python Development Package"
-PR_python-devel="ml0"
+PR_python-devel="ml1"
 RDEPENDS_python-devel="python-core"
 FILES_python-devel="/usr/include /usr/lib/python2.4/config "
 
 DESCRIPTION_python-math="Python Math Support"
-PR_python-math="ml0"
+PR_python-math="ml1"
 RDEPENDS_python-math="python-core"
 FILES_python-math="${libdir}/python2.4/lib-dynload/cmath.so ${libdir}/python2.4/lib-dynload/math.so ${libdir}/python2.4/lib-dynload/_random.so ${libdir}/python2.4/random.* ${libdir}/python2.4/sets.* "
 
 DESCRIPTION_python-hotshot="Python Hotshot Profiler"
-PR_python-hotshot="ml0"
+PR_python-hotshot="ml1"
 RDEPENDS_python-hotshot="python-core"
 FILES_python-hotshot="${libdir}/python2.4/hotshot ${libdir}/python2.4/lib-dynload/_hotshot.so "
 
 DESCRIPTION_python-unixadmin="Python Unix Administration Support"
-PR_python-unixadmin="ml0"
+PR_python-unixadmin="ml1"
 RDEPENDS_python-unixadmin="python-core"
 FILES_python-unixadmin="${libdir}/python2.4/lib-dynload/nis.so ${libdir}/python2.4/lib-dynload/grp.so ${libdir}/python2.4/lib-dynload/pwd.so ${libdir}/python2.4/getpass.* "
 
+DESCRIPTION_python-syslog="Python's syslog Interface"
+PR_python-syslog="ml1"
+RDEPENDS_python-syslog="python-core"
+FILES_python-syslog="${libdir}/python2.4/lib-dynload/syslog.so "
+
 DESCRIPTION_python-tkinter="Python Tcl/Tk Bindings"
-PR_python-tkinter="ml0"
+PR_python-tkinter="ml1"
 RDEPENDS_python-tkinter="python-core"
 FILES_python-tkinter="${libdir}/python2.4/lib-dynload/_tkinter.so ${libdir}/python2.4/lib-tk "
 
 DESCRIPTION_python-gdbm="Python GNU Database Support"
-PR_python-gdbm="ml0"
+PR_python-gdbm="ml1"
 RDEPENDS_python-gdbm="python-core"
 FILES_python-gdbm="${libdir}/python2.4/lib-dynload/gdbm.so "
 
 DESCRIPTION_python-fcntl="Python's fcntl Interface"
-PR_python-fcntl="ml0"
+PR_python-fcntl="ml1"
 RDEPENDS_python-fcntl="python-core"
 FILES_python-fcntl="${libdir}/python2.4/lib-dynload/fcntl.so "
 
-DESCRIPTION_python-netclient="Python Internet Protocol Clients"
-PR_python-netclient="ml0"
-RDEPENDS_python-netclient="python-core python-datetime python-io python-lang python-logging python-mime"
-FILES_python-netclient="${libdir}/python2.4/*Cookie*.* ${libdir}/python2.4/base64.* ${libdir}/python2.4/cookielib.* ${libdir}/python2.4/ftplib.* ${libdir}/python2.4/gopherlib.* ${libdir}/python2.4/hmac.* ${libdir}/python2.4/httplib.* ${libdir}/python2.4/mimetypes.* ${libdir}/python2.4/nntplib.* ${libdir}/python2.4/poplib.* ${libdir}/python2.4/smtplib.* ${libdir}/python2.4/telnetlib.* ${libdir}/python2.4/urllib.* ${libdir}/python2.4/urllib2.* ${libdir}/python2.4/urlparse.* "
+DESCRIPTION_python-core-debug="Python core module debug information"
+PR_python-core-debug="ml1"
+RDEPENDS_python-core-debug="python-core"
+FILES_python-core-debug="/usr/lib/python2.4/lib-dynload/.debug /usr/bin/.debug /usr/lib/.debug "
 
 DESCRIPTION_python-pprint="Python Pretty-Print Support"
-PR_python-pprint="ml0"
+PR_python-pprint="ml1"
 RDEPENDS_python-pprint="python-core"
 FILES_python-pprint="${libdir}/python2.4/pprint.* "
 
 DESCRIPTION_python-netserver="Python Internet Protocol Servers"
-PR_python-netserver="ml0"
+PR_python-netserver="ml1"
 RDEPENDS_python-netserver="python-core python-netclient"
 FILES_python-netserver="${libdir}/python2.4/cgi.* ${libdir}/python2.4/BaseHTTPServer.* ${libdir}/python2.4/SimpleHTTPServer.* ${libdir}/python2.4/SocketServer.* "
 
 DESCRIPTION_python-curses="Python Curses Support"
-PR_python-curses="ml0"
+PR_python-curses="ml1"
 RDEPENDS_python-curses="python-core"
 FILES_python-curses="${libdir}/python2.4/curses ${libdir}/python2.4/lib-dynload/_curses.so ${libdir}/python2.4/lib-dynload/_curses_panel.so "
 
-DESCRIPTION_python-syslog="Python's syslog Interface"
-PR_python-syslog="ml0"
-RDEPENDS_python-syslog="python-core"
-FILES_python-syslog="${libdir}/python2.4/lib-dynload/syslog.so "
+DESCRIPTION_python-smtpd="Python Simple Mail Transport Daemon"
+PR_python-smtpd="ml1"
+RDEPENDS_python-smtpd="python-core python-netserver python-email python-mime"
+FILES_python-smtpd="/usr/bin/smtpd.* "
 
 DESCRIPTION_python-html="Python HTML Processing"
-PR_python-html="ml0"
+PR_python-html="ml1"
 RDEPENDS_python-html="python-core"
 FILES_python-html="${libdir}/python2.4/formatter.* ${libdir}/python2.4/htmlentitydefs.* ${libdir}/python2.4/htmllib.* ${libdir}/python2.4/markupbase.* ${libdir}/python2.4/sgmllib.* "
 
 DESCRIPTION_python-readline="Python Readline Support"
-PR_python-readline="ml0"
+PR_python-readline="ml1"
 RDEPENDS_python-readline="python-core"
 FILES_python-readline="${libdir}/python2.4/lib-dynload/readline.so ${libdir}/python2.4/rlcompleter.* "
 
 DESCRIPTION_python-subprocess="Python Subprocess Support"
-PR_python-subprocess="ml0"
-RDEPENDS_python-subprocess="python-core python-io python-re"
+PR_python-subprocess="ml1"
+RDEPENDS_python-subprocess="python-core python-io python-re python-fcntl python-pickle"
 FILES_python-subprocess="${libdir}/python2.4/subprocess.* "
 
 DESCRIPTION_python-pydoc="Python Interactive Help Support"
-PR_python-pydoc="ml0"
+PR_python-pydoc="ml1"
 RDEPENDS_python-pydoc="python-core python-lang python-stringold python-re"
 FILES_python-pydoc="/usr/bin/pydoc /usr/lib/python2.4/pydoc.* "
 
 DESCRIPTION_python-logging="Python Logging Support"
-PR_python-logging="ml0"
+PR_python-logging="ml1"
 RDEPENDS_python-logging="python-core"
 FILES_python-logging="${libdir}/python2.4/logging "
 
 DESCRIPTION_python-mailbox="Python Mailbox Format Support"
-PR_python-mailbox="ml0"
+PR_python-mailbox="ml1"
 RDEPENDS_python-mailbox="python-core python-mime"
 FILES_python-mailbox="${libdir}/python2.4/mailbox.* "
 
 DESCRIPTION_python-xml="Python basic XML support."
-PR_python-xml="ml0"
+PR_python-xml="ml1"
 RDEPENDS_python-xml="python-core python-re"
 FILES_python-xml="${libdir}/python2.4/lib-dynload/pyexpat.so ${libdir}/python2.4/xml ${libdir}/python2.4/xmllib.* "
 
 DESCRIPTION_python-mime="Python MIME Handling APIs"
-PR_python-mime="ml0"
+PR_python-mime="ml1"
 RDEPENDS_python-mime="python-core python-io"
-FILES_python-mime="${libdir}/python2.4/mimetools.* ${libdir}/python2.4/quopri.* ${libdir}/python2.4/rfc822.* "
+FILES_python-mime="${libdir}/python2.4/mimetools.* ${libdir}/python2.4/uu.* ${libdir}/python2.4/quopri.* ${libdir}/python2.4/rfc822.* "
 
 DESCRIPTION_python-tests="Python Tests"
-PR_python-tests="ml0"
+PR_python-tests="ml1"
 RDEPENDS_python-tests="python-core"
 FILES_python-tests="${libdir}/python2.4/test "
 
 DESCRIPTION_python-unittest="Python Unit Testing Framework"
-PR_python-unittest="ml0"
+PR_python-unittest="ml1"
 RDEPENDS_python-unittest="python-core python-stringold python-lang"
 FILES_python-unittest="${libdir}/python2.4/unittest.* "
 
 DESCRIPTION_python-stringold="Python String APIs [deprecated]"
-PR_python-stringold="ml0"
+PR_python-stringold="ml1"
 RDEPENDS_python-stringold="python-core python-re"
 FILES_python-stringold="${libdir}/python2.4/lib-dynload/strop.so ${libdir}/python2.4/string.* "
 
+DESCRIPTION_python-robotparser="Python robots.txt parser"
+PR_python-robotparser="ml1"
+RDEPENDS_python-robotparser="python-core python-netclient"
+FILES_python-robotparser="${libdir}/python2.4/robotparser.* "
+
 DESCRIPTION_python-lib-old-and-deprecated="Python Deprecated Libraries"
-PR_python-lib-old-and-deprecated="ml0"
+PR_python-lib-old-and-deprecated="ml1"
 RDEPENDS_python-lib-old-and-deprecated="python-core"
 FILES_python-lib-old-and-deprecated="${libdir}/python2.4/lib-old "
 
 DESCRIPTION_python-compile="Python Bytecode Compilation Support"
-PR_python-compile="ml0"
+PR_python-compile="ml1"
 RDEPENDS_python-compile="python-core"
 FILES_python-compile="${libdir}/python2.4/py_compile.* ${libdir}/python2.4/compileall.* "
 
 DESCRIPTION_python-shell="Python Shell-Like Functionality"
-PR_python-shell="ml0"
+PR_python-shell="ml1"
 RDEPENDS_python-shell="python-core python-re"
 FILES_python-shell="${libdir}/python2.4/commands.* ${libdir}/python2.4/dircache.* ${libdir}/python2.4/fnmatch.* ${libdir}/python2.4/glob.* ${libdir}/python2.4/popen2.* ${libdir}/python2.4/shutil.* "
 
 DESCRIPTION_python-bsddb="Python Berkeley Database Bindings"
-PR_python-bsddb="ml0"
+PR_python-bsddb="ml1"
 RDEPENDS_python-bsddb="python-core"
 FILES_python-bsddb="${libdir}/python2.4/bsddb "
 
+DESCRIPTION_python-netclient="Python Internet Protocol Clients"
+PR_python-netclient="ml1"
+RDEPENDS_python-netclient="python-core python-datetime python-io python-lang python-logging python-mime"
+FILES_python-netclient="${libdir}/python2.4/*Cookie*.* ${libdir}/python2.4/base64.* ${libdir}/python2.4/cookielib.* ${libdir}/python2.4/ftplib.* ${libdir}/python2.4/gopherlib.* ${libdir}/python2.4/hmac.* ${libdir}/python2.4/httplib.* ${libdir}/python2.4/mimetypes.* ${libdir}/python2.4/nntplib.* ${libdir}/python2.4/poplib.* ${libdir}/python2.4/smtplib.* ${libdir}/python2.4/telnetlib.* ${libdir}/python2.4/urllib.* ${libdir}/python2.4/urllib2.* ${libdir}/python2.4/urlparse.* "
+
 DESCRIPTION_python-mmap="Python Memory-Mapped-File Support"
-PR_python-mmap="ml0"
+PR_python-mmap="ml1"
 RDEPENDS_python-mmap="python-core python-io"
 FILES_python-mmap="${libdir}/python2.4/lib-dynload/mmap.so "
 
 DESCRIPTION_python-zlib="Python zlib Support."
-PR_python-zlib="ml0"
+PR_python-zlib="ml1"
 RDEPENDS_python-zlib="python-core"
 FILES_python-zlib="${libdir}/python2.4/lib-dynload/zlib.so "
 
 DESCRIPTION_python-db="Python File-Based Database Support"
-PR_python-db="ml0"
+PR_python-db="ml1"
 RDEPENDS_python-db="python-core"
 FILES_python-db="${libdir}/python2.4/anydbm.* ${libdir}/python2.4/dumbdbm.* ${libdir}/python2.4/whichdb.* "
 
 DESCRIPTION_python-crypt="Python Basic Cryptographic and Hashing Support"
-PR_python-crypt="ml0"
+PR_python-crypt="ml1"
 RDEPENDS_python-crypt="python-core"
 FILES_python-crypt="${libdir}/python2.4/lib-dynload/crypt.so ${libdir}/python2.4/lib-dynload/md5.so ${libdir}/python2.4/lib-dynload/rotor.so ${libdir}/python2.4/lib-dynload/sha.so "
 
 DESCRIPTION_python-idle="Python Integrated Development Environment"
-PR_python-idle="ml0"
+PR_python-idle="ml1"
 RDEPENDS_python-idle="python-core python-tkinter"
 FILES_python-idle="/usr/bin/idle /usr/lib/python2.4/idlelib "
 
 DESCRIPTION_python-lang="Python Low-Level Language Support"
-PR_python-lang="ml0"
+PR_python-lang="ml1"
 RDEPENDS_python-lang="python-core"
 FILES_python-lang="${libdir}/python2.4/lib-dynload/array.so ${libdir}/python2.4/lib-dynload/parser.so ${libdir}/python2.4/lib-dynload/operator.so ${libdir}/python2.4/lib-dynload/_weakref.so ${libdir}/python2.4/lib-dynload/itertools.so ${libdir}/python2.4/lib-dynload/collections.so ${libdir}/python2.4/lib-dynload/_bisect.so ${libdir}/python2.4/lib-dynload/_heapq.so ${libdir}/python2.4/atexit.* ${libdir}/python2.4/bisect.* ${libdir}/python2.4/code.* ${libdir}/python2.4/codeop.* ${libdir}/python2.4/dis.* ${libdir}/python2.4/heapq.* ${libdir}/python2.4/inspect.* ${libdir}/python2.4/keyword.* ${libdir}/python2.4/opcode.* ${libdir}/python2.4/repr.* ${libdir}/python2.4/token.* ${libdir}/python2.4/tokenize.* ${libdir}/python2.4/traceback.* ${libdir}/python2.4/linecache.* ${libdir}/python2.4/weakref.* "
 
 DESCRIPTION_python-audio="Python Audio Handling"
-PR_python-audio="ml0"
+PR_python-audio="ml1"
 RDEPENDS_python-audio="python-core"
-FILES_python-audio="${libdir}/python2.4/wave.* ${libdir}/python2.4/chunk.* ${libdir}/python2.4/lib-dynload/ossaudiodev.so ${libdir}/python2.4/lib-dynload/audioop.so "
+FILES_python-audio="${libdir}/python2.4/wave.* ${libdir}/python2.4/chunk.* ${libdir}/python2.4/sndhdr.* ${libdir}/python2.4/lib-dynload/ossaudiodev.so ${libdir}/python2.4/lib-dynload/audioop.so "
 
 
 
diff --git a/packages/python/python-fam_1.1.1.bb b/packages/python/python-fam_1.1.1.bb
new file mode 100644
index 0000000000..cf74265aa3
--- /dev/null
+++ b/packages/python/python-fam_1.1.1.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "Python access to the File Alteration Monitor"
+HOMEPAGE = "http://python-fam.sourceforge.net/"
+SECTION = "devel/python"
+PRIORITY = "optional"
+LICENSE = "LGPL"
+DEPENDS = "fam"
+RDEPENDS = "fam python-core python-io"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${P}.tar.gz"
+
+inherit distutils
+
diff --git a/packages/python/python-pygtk2_2.6.3.bb b/packages/python/python-pygtk2_2.6.3.bb
index ffd837f0da..417de0a109 100644
--- a/packages/python/python-pygtk2_2.6.3.bb
+++ b/packages/python/python-pygtk2_2.6.3.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Python GTK+ Bindings"
 SECTION = "devel/python"
-# needs gtk+-2.6.x
-DEPENDS = "gtk+ libglade"
+DEPENDS = "gtk+-2.6.10 libglade"
 RDEPENDS = "python-shell"
 SRCNAME = "pygtk"
 LICENSE = "LGPL"
diff --git a/packages/python/python-pygtk2_2.8.6.bb b/packages/python/python-pygtk2_2.8.6.bb
index b3d8c93584..361737684c 100644
--- a/packages/python/python-pygtk2_2.8.6.bb
+++ b/packages/python/python-pygtk2_2.8.6.bb
@@ -1,7 +1,8 @@
 DESCRIPTION = "Python GTK+ Bindings"
 SECTION = "devel/python"
 PRIORITY = "optional"
-DEPENDS = "gtk+ libglade"
+# needs gtk+ 2.8.x
+DEPENDS = "gtk+-2.8.16 libglade"
 RDEPENDS = "python-shell"
 SRCNAME = "pygtk"
 LICENSE = "LGPL"
diff --git a/packages/python/python-setuptools_0.6c5.bb b/packages/python/python-setuptools_0.6c5.bb
new file mode 100644
index 0000000000..0ee3a02229
--- /dev/null
+++ b/packages/python/python-setuptools_0.6c5.bb
@@ -0,0 +1,26 @@
+DESCRIPTION = "Download, build, install, upgrade, and uninstall Python packages"
+HOMEPAGE = "http://cheeseshop.python.org/pypi/setuptools"
+SECTION = "devel/python"
+PRIORITY = "optional"
+LICENSE = "MIT-like"
+RDEPENDS = "python-core python-zlib"
+SRCNAME = "setuptools"
+PR = "r0"
+
+SRC_URI = "http://cheeseshop.python.org/packages/source/s/setuptools/${SRCNAME}-${PV}.tar.gz"
+S = "${WORKDIR}/${SRCNAME}-${PV}"
+
+inherit distutils
+
+do_install_prepend() {
+    install -d ${D}/${libdir}/${PYTHON_DIR}/site-packages
+}
+
+do_stage() {
+    BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
+      ${STAGING_BINDIR_NATIVE}/python setup.py install 
+}
+
+# Deal with .pth file error 
+export PYTHONPATH="${D}/${libdir}/${PYTHON_DIR}/site-packages"
+
diff --git a/packages/python/python-simplejson_1.7.1.bb b/packages/python/python-simplejson_1.7.1.bb
new file mode 100644
index 0000000000..e41d9085af
--- /dev/null
+++ b/packages/python/python-simplejson_1.7.1.bb
@@ -0,0 +1,24 @@
+DESCRIPTION = "Simple, fast, extensible JSON encoder/decoder for Python"
+HOMEPAGE = "http://cheeseshop.python.org/pypi/simplejson"
+SECTION = "devel/python"
+PRIORITY = "optional"
+LICENSE = "MIT"
+DEPENDS = "python-setuptools"
+# python-netserver is needed for cgi stuff
+# python-zlib is needed to unpack egg created by setuptools
+RDEPENDS = "python-core python-re python-io python-netserver python-zlib"
+SRCNAME = "simplejson"
+PR = "r0"
+
+SRC_URI = "http://cheeseshop.python.org/packages/source/s/simplejson/${SRCNAME}-${PV}.tar.gz"
+S = "${WORKDIR}/${SRCNAME}-${PV}"
+
+inherit distutils
+
+do_install_prepend() {
+    install -d ${D}/${libdir}/${PYTHON_DIR}/site-packages
+}
+
+# Deal with .pth file error
+export PYTHONPATH="${D}/${libdir}/python2.4/site-packages"
+
diff --git a/packages/python/python_2.4.4.bb b/packages/python/python_2.4.4.bb
index 303f956721..6ec186cb83 100644
--- a/packages/python/python_2.4.4.bb
+++ b/packages/python/python_2.4.4.bb
@@ -5,7 +5,7 @@ SECTION = "devel/python"
 PRIORITY = "optional"
 DEPENDS = "python-native readline zlib gdbm openssl tcl tk"
 DEPENDS_sharprom = "python-native readline zlib gdbm openssl"
-PR = "ml1"
+PR = "ml2"
 
 PYTHON_MAJMIN = "2.4"
 
@@ -68,3 +68,12 @@ RPROVIDES_python-core = "python"
 RPROVIDES_python-curses = "python"
 PACKAGES =+ "libpython2"
 FILES_libpython2 = "${libdir}/libpython*"
+
+# catch all the rest (unsorted)
+PACKAGES += "python-misc"
+FILES_python-misc = "${libdir}/python2.4"
+
+# catch manpage
+PACKAGES += "python-man"
+FILES_python-man = "${datadir}/man"
+
diff --git a/packages/tasks/task-python-everything_20060425.bb b/packages/tasks/task-python-everything_20060425.bb
index 5824ed39c7..5723a4294f 100644
--- a/packages/tasks/task-python-everything_20060425.bb
+++ b/packages/tasks/task-python-everything_20060425.bb
@@ -1,7 +1,7 @@
 DESCRIPTION= "Everything Python"
 HOMEPAGE = "http://www.vanille.de/projects/python.spy"
 LICENSE = "MIT"
-PR = "ml10"
+PR = "ml13"
 
 BROKEN_BECAUSE_GCC4 = "\
 		python-egenix-mx-base"
@@ -13,6 +13,7 @@ RDEPENDS = "\
 		python-crypto		\
 		python-dialog		\
 		python-pycurl		\
+		python-fam			\
 		python-fnorb		\
 		python-fpconst		\
 		python-gammu		\
@@ -56,6 +57,8 @@ RDEPENDS = "\
 		python-quicklauncher    \
 		python-scapy		\
 		python-scons		\
+		python-setuptools	\
+		python-simplejson	\
 		python-sip		\
 		python-sgmlop		\
 		python-snmplib		\
diff --git a/packages/freetype/freetype-2.3.3/.mtn2git_empty b/packages/uclibc/uclibc-0.9.29/arm/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/freetype/freetype-2.3.3/.mtn2git_empty
+++ b/packages/uclibc/uclibc-0.9.29/arm/.mtn2git_empty
diff --git a/packages/uclibc/uclibc-0.9.29/arm/uClibc.machine b/packages/uclibc/uclibc-0.9.29/arm/uClibc.machine
new file mode 100644
index 0000000000..898b73a33b
--- /dev/null
+++ b/packages/uclibc/uclibc-0.9.29/arm/uClibc.machine
@@ -0,0 +1,69 @@
+#
+# Automatically generated make config: don't edit
+# Mon May 14 10:23:14 2007
+#
+# TARGET_alpha is not set
+TARGET_arm=y
+# TARGET_bfin is not set
+# TARGET_cris is not set
+# TARGET_e1 is not set
+# TARGET_frv is not set
+# TARGET_h8300 is not set
+# TARGET_hppa is not set
+# TARGET_i386 is not set
+# TARGET_i960 is not set
+# TARGET_ia64 is not set
+# TARGET_m68k is not set
+# TARGET_microblaze is not set
+# TARGET_mips is not set
+# TARGET_nios is not set
+# TARGET_nios2 is not set
+# TARGET_powerpc is not set
+# TARGET_sh is not set
+# TARGET_sh64 is not set
+# TARGET_sparc is not set
+# TARGET_v850 is not set
+# TARGET_vax is not set
+# TARGET_x86_64 is not set
+
+#
+# Target Architecture Features and Options
+#
+TARGET_ARCH="arm"
+FORCE_OPTIONS_FOR_ARCH=y
+# CONFIG_ARM_OABI is not set
+CONFIG_ARM_EABI=y
+USE_BX=y
+# CONFIG_GENERIC_ARM is not set
+# CONFIG_ARM610 is not set
+# CONFIG_ARM710 is not set
+# CONFIG_ARM7TDMI is not set
+# CONFIG_ARM720T is not set
+CONFIG_ARM920T=y
+# CONFIG_ARM922T is not set
+# CONFIG_ARM926T is not set
+# CONFIG_ARM10T is not set
+# CONFIG_ARM1136JF_S is not set
+# CONFIG_ARM1176JZ_S is not set
+# CONFIG_ARM1176JZF_S is not set
+# CONFIG_ARM_SA110 is not set
+# CONFIG_ARM_SA1100 is not set
+# CONFIG_ARM_XSCALE is not set
+# CONFIG_ARM_IWMMXT is not set
+TARGET_SUBARCH=""
+
+#
+# Using ELF file format
+#
+ARCH_ANY_ENDIAN=y
+ARCH_LITTLE_ENDIAN=y
+# ARCH_WANTS_BIG_ENDIAN is not set
+ARCH_WANTS_LITTLE_ENDIAN=y
+ARCH_HAS_MMU=y
+ARCH_USE_MMU=y
+UCLIBC_HAS_FLOATS=y
+# UCLIBC_HAS_FPU is not set
+UCLIBC_HAS_SOFT_FLOAT=y
+KERNEL_HEADERS="/usr/include"
+HAVE_DOT_CONFIG=y
+
diff --git a/packages/uclibc/uclibc-0.9.29/ixp4xxbe/uClibc.machine b/packages/uclibc/uclibc-0.9.29/ixp4xxbe/uClibc.machine
index eec16b1b33..2d9f63e531 100644
--- a/packages/uclibc/uclibc-0.9.29/ixp4xxbe/uClibc.machine
+++ b/packages/uclibc/uclibc-0.9.29/ixp4xxbe/uClibc.machine
@@ -68,146 +68,3 @@ DO_C99_MATH=y
 KERNEL_HEADERS="/usr/include"
 HAVE_DOT_CONFIG=y
 
-#
-# General Library Settings
-#
-# HAVE_NO_PIC is not set
-# DOPIC is not set
-# HAVE_NO_SHARED is not set
-# ARCH_HAS_NO_LDSO is not set
-HAVE_SHARED=y
-# FORCE_SHAREABLE_TEXT_SEGMENTS is not set
-LDSO_LDD_SUPPORT=y
-LDSO_CACHE_SUPPORT=y
-# LDSO_PRELOAD_FILE_SUPPORT is not set
-LDSO_BASE_FILENAME="ld.so"
-# UCLIBC_STATIC_LDCONFIG is not set
-LDSO_RUNPATH=y
-UCLIBC_CTOR_DTOR=y
-# HAS_NO_THREADS is not set
-UCLIBC_HAS_THREADS=y
-PTHREADS_DEBUG_SUPPORT=y
-LINUXTHREADS_OLD=y
-UCLIBC_HAS_LFS=y
-# MALLOC is not set
-# MALLOC_SIMPLE is not set
-MALLOC_STANDARD=y
-MALLOC_GLIBC_COMPAT=y
-UCLIBC_DYNAMIC_ATEXIT=y
-COMPAT_ATEXIT=y
-# UCLIBC_SUSV3_LEGACY is not set
-# UCLIBC_SUSV3_LEGACY_MACROS is not set
-UCLIBC_HAS_SHADOW=y
-# UCLIBC_HAS_PROGRAM_INVOCATION_NAME is not set
-UCLIBC_HAS___PROGNAME=y
-UNIX98PTY_ONLY=y
-ASSUME_DEVPTS=y
-UCLIBC_HAS_TM_EXTENSIONS=y
-UCLIBC_HAS_TZ_CACHING=y
-UCLIBC_HAS_TZ_FILE=y
-UCLIBC_HAS_TZ_FILE_READ_MANY=y
-UCLIBC_TZ_FILE_PATH="/etc/TZ"
-
-#
-# Advanced Library Settings
-#
-UCLIBC_PWD_BUFFER_SIZE=256
-UCLIBC_GRP_BUFFER_SIZE=256
-
-#
-# Networking Support
-#
-UCLIBC_HAS_IPV6=y
-UCLIBC_HAS_RPC=y
-UCLIBC_HAS_FULL_RPC=y
-# UCLIBC_HAS_REENTRANT_RPC is not set
-# UCLIBC_USE_NETLINK is not set
-# UCLIBC_HAS_BSD_RES_CLOSE is not set
-
-#
-# String and Stdio Support
-#
-UCLIBC_HAS_STRING_GENERIC_OPT=y
-UCLIBC_HAS_STRING_ARCH_OPT=y
-UCLIBC_HAS_CTYPE_TABLES=y
-UCLIBC_HAS_CTYPE_SIGNED=y
-# UCLIBC_HAS_CTYPE_UNSAFE is not set
-UCLIBC_HAS_CTYPE_CHECKED=y
-# UCLIBC_HAS_CTYPE_ENFORCED is not set
-UCLIBC_HAS_WCHAR=y
-# UCLIBC_HAS_LOCALE is not set
-UCLIBC_HAS_HEXADECIMAL_FLOATS=y
-UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y
-UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9
-UCLIBC_HAS_SCANF_GLIBC_A_FLAG=y
-# UCLIBC_HAS_STDIO_BUFSIZ_NONE is not set
-UCLIBC_HAS_STDIO_BUFSIZ_256=y
-# UCLIBC_HAS_STDIO_BUFSIZ_512 is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_1024 is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_2048 is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_4096 is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_8192 is not set
-UCLIBC_HAS_STDIO_BUILTIN_BUFFER_NONE=y
-# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_4 is not set
-# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_8 is not set
-# UCLIBC_HAS_STDIO_SHUTDOWN_ON_ABORT is not set
-UCLIBC_HAS_STDIO_GETC_MACRO=y
-UCLIBC_HAS_STDIO_PUTC_MACRO=y
-UCLIBC_HAS_STDIO_AUTO_RW_TRANSITION=y
-# UCLIBC_HAS_FOPEN_LARGEFILE_MODE is not set
-UCLIBC_HAS_FOPEN_EXCLUSIVE_MODE=y
-UCLIBC_HAS_GLIBC_CUSTOM_STREAMS=y
-UCLIBC_HAS_PRINTF_M_SPEC=y
-UCLIBC_HAS_ERRNO_MESSAGES=y
-# UCLIBC_HAS_SYS_ERRLIST is not set
-UCLIBC_HAS_SIGNUM_MESSAGES=y
-# UCLIBC_HAS_SYS_SIGLIST is not set
-UCLIBC_HAS_GNU_GETOPT=y
-UCLIBC_HAS_GNU_GETSUBOPT=y
-
-#
-# Big and Tall
-#
-UCLIBC_HAS_REGEX=y
-# UCLIBC_HAS_REGEX_OLD is not set
-UCLIBC_HAS_FNMATCH=y
-# UCLIBC_HAS_FNMATCH_OLD is not set
-UCLIBC_HAS_WORDEXP=y
-UCLIBC_HAS_FTW=y
-UCLIBC_HAS_GLOB=y
-# UCLIBC_HAS_GNU_GLOB is not set
-
-#
-# Library Installation Options
-#
-SHARED_LIB_LOADER_PREFIX="/lib"
-RUNTIME_PREFIX="/"
-DEVEL_PREFIX="//usr"
-
-#
-# Security options
-#
-# UCLIBC_BUILD_PIE is not set
-# UCLIBC_HAS_ARC4RANDOM is not set
-# HAVE_NO_SSP is not set
-# UCLIBC_HAS_SSP is not set
-UCLIBC_BUILD_RELRO=y
-UCLIBC_BUILD_NOW=y
-UCLIBC_BUILD_NOEXECSTACK=y
-
-#
-# uClibc development/debugging options
-#
-CROSS_COMPILER_PREFIX=""
-UCLIBC_EXTRA_CFLAGS=""
-# DODEBUG is not set
-# DODEBUG_PT is not set
-DOSTRIP=y
-# DOASSERTS is not set
-# SUPPORT_LD_DEBUG is not set
-# SUPPORT_LD_DEBUG_EARLY is not set
-# UCLIBC_MALLOC_DEBUGGING is not set
-WARNINGS="-Wall"
-# EXTRA_WARNINGS is not set
-# DOMULTI is not set
-# UCLIBC_MJN3_ONLY is not set
diff --git a/packages/xchat/xchat_2.6.1.bb b/packages/xchat/xchat_2.6.1.bb
index ec058067c5..fc362a9c41 100644
--- a/packages/xchat/xchat_2.6.1.bb
+++ b/packages/xchat/xchat_2.6.1.bb
@@ -3,10 +3,11 @@ LICENSE = "GPL"
 HOMEPAGE = "http://www.xchat.org"
 SECTION = "x11/network"
 DEPENDS = "libgcrypt zlib gtk+"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "http://www.xchat.org/files/source/2.6/xchat-${PV}.tar.bz2"
 
 inherit autotools
 EXTRA_OECONF = " --disable-perl --disable-python    "
 
+FILES_${PN}-dbg += " /usr/lib/xchat/plugins/.debug"
diff --git a/packages/xchat/xchat_2.6.0.bb b/packages/xchat/xchat_2.6.8.bb
index 378a189db9..4c6dc732d4 100644
--- a/packages/xchat/xchat_2.6.0.bb
+++ b/packages/xchat/xchat_2.6.8.bb
@@ -3,10 +3,11 @@ LICENSE = "GPL"
 HOMEPAGE = "http://www.xchat.org"
 SECTION = "x11/network"
 DEPENDS = "libgcrypt zlib gtk+"
-PR = "r1"
+PR = "r0"
 
 SRC_URI = "http://www.xchat.org/files/source/2.6/xchat-${PV}.tar.bz2"
 
 inherit autotools
 EXTRA_OECONF = " --disable-perl --disable-python    "
 
+FILES_${PN}-dbg += " /usr/lib/xchat/plugins/.debug"
author	Paul Sokolovsky <pmiscml@gmail.com>	2007-06-21 08:49:48 +0000
committer	Paul Sokolovsky <pmiscml@gmail.com>	2007-06-21 08:49:48 +0000
commit	7ebefcff1fdc6993a30d1d6789a90c54578068e4 (patch)
tree	7f656e7b251105ed59088873071928d4fb1737ba /packages
parent	11cd48c28ef8e701fc43b9905a3a4f7af4fb5c8f (diff)
parent	35673b07fcb65e7109ed0430a9a4aa7e4313d437 (diff)