merge of 5ef8750d9a69c84b19f6d9bf623a45342b0b07b5

     and e965f050d16d0a1cfe49ed571b5f989a6b66b121

51 files changed, 530 insertions, 175 deletions

diff --git a/packages/e17/e-iconbar_20050810.bb b/packages/e17/e-iconbar_20050926.bb
index f0ca322f96..f0ca322f96 100644
--- a/packages/e17/e-iconbar_20050810.bb
+++ b/packages/e17/e-iconbar_20050926.bb
diff --git a/packages/e17/e-modules_20050810.bb b/packages/e17/e-modules_20050926.bb
index 9ab3330c97..9ab3330c97 100644
--- a/packages/e17/e-modules_20050810.bb
+++ b/packages/e17/e-modules_20050926.bb
diff --git a/packages/e17/e-utils_20050810.bb b/packages/e17/e-utils_20050926.bb
index 4d0ba6fa73..4d0ba6fa73 100644
--- a/packages/e17/e-utils_20050810.bb
+++ b/packages/e17/e-utils_20050926.bb
diff --git a/packages/e17/e-wm/disable-splash.patch b/packages/e17/e-wm/disable-splash.patch
new file mode 100644
index 0000000000..152a0a2895
--- /dev/null
+++ b/packages/e17/e-wm/disable-splash.patch
@@ -0,0 +1,11 @@
+--- enlightenment-0.16.999.015/src/bin/e_config.c~	2005-09-22 20:50:16.000000000 -0700
++++ enlightenment-0.16.999.015/src/bin/e_config.c	2005-09-30 10:51:02.000000000 -0700
+@@ -377,7 +377,7 @@
+ 	/* DEFAULT CONFIG */
+ 	e_config = E_NEW(E_Config, 1);
+ 	e_config->config_version = E_CONFIG_FILE_VERSION;
+-	e_config->show_splash = 1;
++	e_config->show_splash = 0;
+ 	e_config->desktop_default_background = strdup("");
+ 	e_config->desktop_default_name = strdup("Desktop %i, %i");
+ 	e_config->menus_scroll_speed = 1000.0;
diff --git a/packages/e17/e-wm/fix-configure.patch b/packages/e17/e-wm/fix-configure.patch
index d2ee47e014..02560fd7ab 100644
--- a/packages/e17/e-wm/fix-configure.patch
+++ b/packages/e17/e-wm/fix-configure.patch
@@ -1,10 +1,6 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- e/configure.in~fix-configure.patch
-+++ e/configure.in
+diff -Nur e~/configure.in e/configure.in
+--- e~/configure.in	2005-09-29 13:17:29.000000000 -0700
++++ e/configure.in	2005-09-29 13:19:35.000000000 -0700
 @@ -114,9 +114,7 @@
  AC_PATH_XTRA
  AC_CHECK_HEADER(X11/X.h,
@@ -16,8 +12,9 @@
    ],[
      AC_MSG_ERROR([Cannot find X headers and libraries.])
    ]
---- e/src/bin/Makefile.am~fix-configure.patch
-+++ e/src/bin/Makefile.am
+diff -Nur e~/src/bin/Makefile.am e/src/bin/Makefile.am
+--- e~/src/bin/Makefile.am	2005-09-29 13:17:29.000000000 -0700
++++ e/src/bin/Makefile.am	2005-09-29 13:19:35.000000000 -0700
 @@ -1,6 +1,5 @@
  MAINTAINERCLEANFILES = Makefile.in
 -INCLUDES = -I$(includedir) \
@@ -26,18 +23,20 @@
  	   -I$(top_srcdir)/src/bin \
  	   -I$(top_srcdir)/src/lib \
  	   @e_cflags@ \
---- e/src/lib/Makefile.am~fix-configure.patch
-+++ e/src/lib/Makefile.am
+diff -Nur e~/src/lib/Makefile.am e/src/lib/Makefile.am
+--- e~/src/lib/Makefile.am	2005-09-29 13:17:29.000000000 -0700
++++ e/src/lib/Makefile.am	2005-09-29 13:19:56.000000000 -0700
 @@ -1,6 +1,5 @@
  MAINTAINERCLEANFILES	= Makefile.in
 -INCLUDES		= -I$(includedir) \
 -			  -I$(top_srcdir)/src/bin \
 +INCLUDES		= -I$(top_srcdir)/src/bin \
- 			  @ecore_cflags@ \
- 			  @evas_cflags@
+ 			  @e_cflags@
  
---- e/src/preload/Makefile.am~fix-configure.patch
-+++ e/src/preload/Makefile.am
+ lib_LTLIBRARIES		= libe.la
+diff -Nur e~/src/preload/Makefile.am e/src/preload/Makefile.am
+--- e~/src/preload/Makefile.am	2005-09-29 13:17:29.000000000 -0700
++++ e/src/preload/Makefile.am	2005-09-29 13:19:35.000000000 -0700
 @@ -2,7 +2,6 @@
  
  INCLUDES               = -I. \
@@ -46,9 +45,3 @@
                           -I$(top_srcdir)src/preload \
                           @x_cflags@
  pkgdir                 = $(libdir)/enlightenment/preload
---- e/src/Makefile.am~fix-configure.patch
-+++ e/src/Makefile.am
-@@ -1,2 +1,2 @@
- MAINTAINERCLEANFILES = Makefile.in
--SUBDIRS = bin modules lib preload
-+SUBDIRS = bin modules preload
diff --git a/packages/e17/e-wm_0.16.999.015.bb b/packages/e17/e-wm_0.16.999.015.bb
new file mode 100644
index 0000000000..51d20ca387
--- /dev/null
+++ b/packages/e17/e-wm_0.16.999.015.bb
@@ -0,0 +1,46 @@
+DESCRIPTION = "E17 - the Enlightenment Window Mananger"
+DEPENDS = "evas-x11 ecore-x11 edje eet embryo e"
+LICENSE = "MIT"
+SECTION = "e/apps"
+MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
+CVSDATE = "${PV}"
+PR = "r3"
+
+SRC_URI = "http://enlightenment.freedesktop.org/files/enlightenment-${PV}.tar.gz \
+           file://fix-configure.patch;patch=1 \
+           file://remove-large-fonts.patch;patch=1 \
+           file://disable-splash.patch;patch=1 \
+           file://Xsession.d/98enlightenment \
+           http://cvs.sourceforge.net/viewcvs.py/*checkout*/enlightenment/e17/apps/e/data/themes/default_entry.edc?rev=1.1 \
+           http://cvs.sourceforge.net/viewcvs.py/*checkout*/enlightenment/e17/apps/e/data/themes/images/focus.png?rev=1.1 \
+           http://cvs.sourceforge.net/viewcvs.py/*checkout*/enlightenment/e17/apps/e/data/themes/images/entry.png?rev=1.1 \
+           http://cvs.sourceforge.net/viewcvs.py/*checkout*/enlightenment/e17/apps/e/data/themes/images/entry_focus.png?rev=1.1"
+
+S = "${WORKDIR}/enlightenment-${PV}"
+
+inherit autotools
+
+PROFILE = "LORES_PDA"
+PROFILE_c7x0 = "HIRES_PDA"
+PROFILE_tosa = "HIRES_PDA"
+PROFILE_spitz = "HIRES_PDA"
+PROFILE_akita = "HIRES_PDA"
+
+EXTRA_OECONF = "--with-profile=${PROFILE} \
+                --with-edje-cc=${STAGING_BINDIR}/edje_cc \
+                --x-includes=${STAGING_INCDIR}/X11 \
+                --x-libraries=${STAGING_LIBDIR}"
+
+FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir}"
+
+do_compile_prepend() {
+	mv "${WORKDIR}/default_entry.edc?rev=1.1" "${S}/data/themes/default_entry.edc"
+	mv "${WORKDIR}/focus.png?rev=1.1" "${S}/data/themes/images/focus.png"
+	mv "${WORKDIR}/entry.png?rev=1.1" "${S}/data/themes/images/entry.png"
+	mv "${WORKDIR}/entry_focus.png?rev=1.1" "${S}/data/themes/images/entry_focus.png"
+}
+
+do_install_append() {
+	install -d ${D}/${sysconfdir}/X11/Xsession.d
+	install -m 755 ${WORKDIR}/Xsession.d/98enlightenment ${D}/${sysconfdir}/X11/Xsession.d
+}
diff --git a/packages/e17/e-wm_20050810.bb b/packages/e17/e-wm_20050926.bb
index c6cbee4cd9..4f53a6e990 100644
--- a/packages/e17/e-wm_20050810.bb
+++ b/packages/e17/e-wm_20050926.bb
@@ -6,6 +6,8 @@ MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
 CVSDATE = "${PV}"
 PR = "r3"
 
+DEFAULT_PREFERENCE = "-1"
+
 SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/apps/e \
            file://Xsession.d/98enlightenment \
            file://fix-configure.patch;patch=1 \
diff --git a/packages/e17/eclair_20050810.bb b/packages/e17/eclair_20050926.bb
index 7138f06f88..7138f06f88 100644
--- a/packages/e17/eclair_20050810.bb
+++ b/packages/e17/eclair_20050926.bb
diff --git a/packages/e17/engage_20050810.bb b/packages/e17/engage_20050926.bb
index 077858d8eb..077858d8eb 100644
--- a/packages/e17/engage_20050810.bb
+++ b/packages/e17/engage_20050926.bb
diff --git a/packages/e17/entice_20050810.bb b/packages/e17/entice_20050926.bb
index 364e65cbbf..364e65cbbf 100644
--- a/packages/e17/entice_20050810.bb
+++ b/packages/e17/entice_20050926.bb
diff --git a/packages/e17/entrance/config-db.patch b/packages/e17/entrance/config-db.patch
index 874231b95b..e1ea209001 100644
--- a/packages/e17/entrance/config-db.patch
+++ b/packages/e17/entrance/config-db.patch
@@ -1,61 +1,52 @@
---- entrance/data/config/build_config.sh.in~	2005-08-15 23:24:39.000000000 -0700
-+++ entrance/data/config/build_config.sh.in	2005-08-15 23:25:15.000000000 -0700
+diff -Nur entrance~/data/config/build_config.sh.in entrance/data/config/build_config.sh.in
+--- entrance~/data/config/build_config.sh.in	2005-09-29 14:58:41.000000000 -0700
++++ entrance/data/config/build_config.sh.in	2005-09-29 15:01:04.000000000 -0700
 @@ -3,7 +3,7 @@
  rm -f $DB
  
  # set auth to 1 for pam, 2 for shadow
--edb_ed $DB add /entrance/auth int @auth_mode@
-+edb_ed $DB add /entrance/auth int 0
+-ecore_config $DB set /entrance/auth int @auth_mode@
++ecore_config $DB set /entrance/auth int 0
  
  # uncomment the below to enable experimental OpenGL hardware acceleration
- #edb_ed $DB add /entrance/engine int 1
-@@ -18,30 +18,30 @@
- #edb_ed $DB add /entrance/fonts/0/str str "/usr/share/fonts/truetype/"
- #edb_ed $DB add /entrance/fonts/1/str str "/usr/X11R6/lib/X11/fonts/Truetype/"
- edb_ed $DB add /entrance/greeting/before str "Welcome to "
--edb_ed $DB add /entrance/greeting/after str ""
-+edb_ed $DB add /entrance/greeting/after str " e17/OE"
- edb_ed $DB add /entrance/session/count int 8
--edb_ed $DB add /entrance/session/0/session str "default"
-+edb_ed $DB add /entrance/session/0/session str "/etc/X11/Sessions/Default"
- edb_ed $DB add /entrance/session/0/title str "Default"
- edb_ed $DB add /entrance/session/0/icon str "default.png"
- edb_ed $DB add /entrance/session/1/icon str "enlightenment.png"
- edb_ed $DB add /entrance/session/1/title str "Enlightenment"
--edb_ed $DB add /entrance/session/1/session str "Enlightenment"
--edb_ed $DB add /entrance/session/2/session str "kde"
--edb_ed $DB add /entrance/session/2/title str "KDE"
--edb_ed $DB add /entrance/session/2/icon str "kde.png"
--edb_ed $DB add /entrance/session/3/session str "gnome"
--edb_ed $DB add /entrance/session/3/title str "Gnome"
--edb_ed $DB add /entrance/session/3/icon str "gnome.png"
--edb_ed $DB add /entrance/session/4/session str "blackbox"
--edb_ed $DB add /entrance/session/4/title str "Blackbox"
--edb_ed $DB add /entrance/session/4/icon str "blackbox.png"
--edb_ed $DB add /entrance/session/5/session str "sawfish"
--edb_ed $DB add /entrance/session/5/title str "Sawfish"
--edb_ed $DB add /entrance/session/5/icon str "default.png"
--edb_ed $DB add /entrance/session/6/session str "xfce"
--edb_ed $DB add /entrance/session/6/title str "XFce"
--edb_ed $DB add /entrance/session/6/icon str "xfce.png"
--edb_ed $DB add /entrance/session/7/session str "failsafe"
-+edb_ed $DB add /entrance/session/2/session str "/etc/X11/Sessions/Enlightenment"
-+edb_ed $DB add /entrance/session/2/icon str "enlightenment.png"
-+edb_ed $DB add /entrance/session/2/title str "Enlightenment"
-+edb_ed $DB add /entrance/session/3/session str "/etc/X11/Sessions/Enlightenment"
-+edb_ed $DB add /entrance/session/3/icon str "enlightenment.png"
-+edb_ed $DB add /entrance/session/3/title str "Enlightenment"
-+edb_ed $DB add /entrance/session/4/session str "/etc/X11/Sessions/Enlightenment"
-+edb_ed $DB add /entrance/session/4/icon str "enlightenment.png"
-+edb_ed $DB add /entrance/session/4/title str "Enlightenment"
-+edb_ed $DB add /entrance/session/5/session str "/etc/X11/Sessions/Enlightenment"
-+edb_ed $DB add /entrance/session/5/icon str "enlightenment.png"
-+edb_ed $DB add /entrance/session/5/title str "Enlightenment"
-+edb_ed $DB add /entrance/session/6/session str "/etc/X11/Sessions/Enlightenment"
-+edb_ed $DB add /entrance/session/6/icon str "enlightenment.png"
-+edb_ed $DB add /entrance/session/6/title str "Enlightenment"
-+edb_ed $DB add /entrance/session/1/session str "/etc/X11/Sessions/Enlightenment"
-+edb_ed $DB add /entrance/session/7/session str "/etc/X11/Sessions/Failsafe"
- edb_ed $DB add /entrance/session/7/title str "Failsafe"
- edb_ed $DB add /entrance/session/7/icon str "failsafe.png"
- edb_ed $DB add /entrance/system/reboot int 1
+ #ecore_config $DB set /entrance/engine int 1
+@@ -18,32 +18,17 @@
+ #ecore_config $DB set /entrance/fonts/0/str str "/usr/share/fonts/truetype/"
+ #ecore_config $DB set /entrance/fonts/1/str str "/usr/X11R6/lib/X11/fonts/Truetype/"
+ ecore_config $DB set /entrance/greeting/before str "Welcome to"
+-ecore_config $DB set /entrance/greeting/after str ""
+-ecore_config $DB set /entrance/session/count int 8
+-ecore_config $DB set /entrance/session/0/session str "default"
++ecore_config $DB set /entrance/greeting/after str " e17/OE"
++ecore_config $DB set /entrance/session/count int 3
++ecore_config $DB set /entrance/session/0/session str "/etc/X11/Sessions/Default"
+ ecore_config $DB set /entrance/session/0/title str "Default"
+ ecore_config $DB set /entrance/session/0/icon str "default.png"
+ ecore_config $DB set /entrance/session/1/icon str "enlightenment.png"
+ ecore_config $DB set /entrance/session/1/title str "Enlightenment"
+-ecore_config $DB set /entrance/session/1/session str "Enlightenment"
+-ecore_config $DB set /entrance/session/2/session str "kde"
+-ecore_config $DB set /entrance/session/2/title str "KDE"
+-ecore_config $DB set /entrance/session/2/icon str "kde.png"
+-ecore_config $DB set /entrance/session/3/session str "gnome"
+-ecore_config $DB set /entrance/session/3/title str "Gnome"
+-ecore_config $DB set /entrance/session/3/icon str "gnome.png"
+-ecore_config $DB set /entrance/session/4/session str "blackbox"
+-ecore_config $DB set /entrance/session/4/title str "Blackbox"
+-ecore_config $DB set /entrance/session/4/icon str "blackbox.png"
+-ecore_config $DB set /entrance/session/5/session str "sawfish"
+-ecore_config $DB set /entrance/session/5/title str "Sawfish"
+-ecore_config $DB set /entrance/session/5/icon str "default.png"
+-ecore_config $DB set /entrance/session/6/session str "xfce"
+-ecore_config $DB set /entrance/session/6/title str "XFce"
+-ecore_config $DB set /entrance/session/6/icon str "xfce.png"
+-ecore_config $DB set /entrance/session/7/session str "failsafe"
+-ecore_config $DB set /entrance/session/7/title str "Failsafe"
+-ecore_config $DB set /entrance/session/7/icon str "failsafe.png"
++ecore_config $DB set /entrance/session/1/session str "/etc/X11/Sessions/Enlightenment"
++ecore_config $DB set /entrance/session/2/session str "/etc/X11/Sessions/Failsafe"
++ecore_config $DB set /entrance/session/2/title str "Failsafe"
++ecore_config $DB set /entrance/session/2/icon str "failsafe.png"
+ ecore_config $DB set /entrance/system/reboot int 1
+ ecore_config $DB set /entrance/system/halt int 1
+ ecore_config $DB set /entrance/user/remember int 1
diff --git a/packages/e17/entrance/use-bash.patch b/packages/e17/entrance/use-bash.patch
index 4d3b2f4aae..5c6d1992c8 100644
--- a/packages/e17/entrance/use-bash.patch
+++ b/packages/e17/entrance/use-bash.patch
@@ -1,9 +1,10 @@
---- entrance/src/client/entrance_session.c.~1.71.~	2005-05-28 02:31:14.000000000 -0700
-+++ entrance/src/client/entrance_session.c	2005-08-15 21:45:53.000000000 -0700
-@@ -451,7 +451,7 @@
+diff -Nur entrance~/src/client/entrance_session.c entrance/src/client/entrance_session.c
+--- entrance~/src/client/entrance_session.c	2005-09-29 15:03:26.000000000 -0700
++++ entrance/src/client/entrance_session.c	2005-09-29 15:04:11.000000000 -0700
+@@ -470,7 +470,7 @@
+            snprintf(buf, sizeof(buf), "%s/entrance_login %i", PACKAGE_BIN_DIR,
                      (int) pid);
          }
-         _entrance_session_user_list_fix(e);
 -        shell = strdup("/bin/sh");
 +        shell = strdup("/bin/bash");
          /* this bypasses a race condition where entrance loses its x
diff --git a/packages/e17/entrance_20050810.bb b/packages/e17/entrance_20050926.bb
index 1c27111f49..1c27111f49 100644
--- a/packages/e17/entrance_20050810.bb
+++ b/packages/e17/entrance_20050926.bb
diff --git a/packages/e17/evidence_20050810.bb b/packages/e17/evidence_20050926.bb
index 0950b590c6..0950b590c6 100644
--- a/packages/e17/evidence_20050810.bb
+++ b/packages/e17/evidence_20050926.bb
diff --git a/packages/e17/examine_20050810.bb b/packages/e17/examine_20050926.bb
index 244bf2bcaf..244bf2bcaf 100644
--- a/packages/e17/examine_20050810.bb
+++ b/packages/e17/examine_20050926.bb
diff --git a/packages/efl/e/fix-configure.patch b/packages/efl/e/fix-configure.patch
index 9b328de16c..02560fd7ab 100644
--- a/packages/efl/e/fix-configure.patch
+++ b/packages/efl/e/fix-configure.patch
@@ -1,10 +1,6 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- e/configure.in~fix-configure.patch
-+++ e/configure.in
+diff -Nur e~/configure.in e/configure.in
+--- e~/configure.in	2005-09-29 13:17:29.000000000 -0700
++++ e/configure.in	2005-09-29 13:19:35.000000000 -0700
 @@ -114,9 +114,7 @@
  AC_PATH_XTRA
  AC_CHECK_HEADER(X11/X.h,
@@ -16,8 +12,9 @@
    ],[
      AC_MSG_ERROR([Cannot find X headers and libraries.])
    ]
---- e/src/bin/Makefile.am~fix-configure.patch
-+++ e/src/bin/Makefile.am
+diff -Nur e~/src/bin/Makefile.am e/src/bin/Makefile.am
+--- e~/src/bin/Makefile.am	2005-09-29 13:17:29.000000000 -0700
++++ e/src/bin/Makefile.am	2005-09-29 13:19:35.000000000 -0700
 @@ -1,6 +1,5 @@
  MAINTAINERCLEANFILES = Makefile.in
 -INCLUDES = -I$(includedir) \
@@ -26,18 +23,20 @@
  	   -I$(top_srcdir)/src/bin \
  	   -I$(top_srcdir)/src/lib \
  	   @e_cflags@ \
---- e/src/lib/Makefile.am~fix-configure.patch
-+++ e/src/lib/Makefile.am
+diff -Nur e~/src/lib/Makefile.am e/src/lib/Makefile.am
+--- e~/src/lib/Makefile.am	2005-09-29 13:17:29.000000000 -0700
++++ e/src/lib/Makefile.am	2005-09-29 13:19:56.000000000 -0700
 @@ -1,6 +1,5 @@
  MAINTAINERCLEANFILES	= Makefile.in
 -INCLUDES		= -I$(includedir) \
 -			  -I$(top_srcdir)/src/bin \
 +INCLUDES		= -I$(top_srcdir)/src/bin \
- 			  @ecore_cflags@ \
- 			  @evas_cflags@
+ 			  @e_cflags@
  
---- e/src/preload/Makefile.am~fix-configure.patch
-+++ e/src/preload/Makefile.am
+ lib_LTLIBRARIES		= libe.la
+diff -Nur e~/src/preload/Makefile.am e/src/preload/Makefile.am
+--- e~/src/preload/Makefile.am	2005-09-29 13:17:29.000000000 -0700
++++ e/src/preload/Makefile.am	2005-09-29 13:19:35.000000000 -0700
 @@ -2,7 +2,6 @@
  
  INCLUDES               = -I. \
diff --git a/packages/efl/e_0.16.999.015.bb b/packages/efl/e_0.16.999.015.bb
new file mode 100644
index 0000000000..49b1b0b6bd
--- /dev/null
+++ b/packages/efl/e_0.16.999.015.bb
@@ -0,0 +1,31 @@
+DESCRIPTION = "Enlightenment Window Mananger Library"
+DEPENDS = "virtual/evas virtual/ecore edje eet embryo"
+LICENSE = "MIT"
+CVSDATE = "${PV}"
+PR = "r1"
+
+inherit efl
+
+SRC_URI = "http://enlightenment.freedesktop.org/files/enlightenment-${PV}.tar.gz"
+S = "${WORKDIR}/enlightenment-${PV}"
+
+PROFILE = "LORES_PDA"
+PROFILE_c7x0 = "HIRES_PDA"
+PROFILE_tosa = "HIRES_PDA"
+PROFILE_spitz = "HIRES_PDA"
+PROFILE_akita = "HIRES_PDA"
+
+EXTRA_OECONF = "--with-profile=${PROFILE} \
+                --with-edje-cc=${STAGING_BINDIR}/edje_cc \
+                --x-includes=${STAGING_INCDIR}/X11 \
+                --x-libraries=${STAGING_LIBDIR}"
+
+do_compile() {
+	oe_runmake -C src/lib
+}
+
+headers = "E_Lib.h ../bin/e*.h"
+
+do_install() {
+	oe_runmake -C src/lib install DESTDIR=${D}
+}
diff --git a/packages/efl/e_20050810.bb b/packages/efl/e_20050926.bb
index 8f4eacfc83..eb2282c06b 100644
--- a/packages/efl/e_20050810.bb
+++ b/packages/efl/e_20050926.bb
@@ -6,6 +6,8 @@ PR = "r1"
 
 inherit efl
 
+DEFAULT_PREFERENCE = "-1"
+
 SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/apps/e \
            file://fix-configure.patch;patch=1"
 S = "${WORKDIR}/e"
diff --git a/packages/efl/ecore-fb_0.9.9.013.bb b/packages/efl/ecore-fb_0.9.9.015.bb
index 1f3db9ddfe..1f3db9ddfe 100644
--- a/packages/efl/ecore-fb_0.9.9.013.bb
+++ b/packages/efl/ecore-fb_0.9.9.015.bb
diff --git a/packages/efl/ecore-native_0.9.9.013.bb b/packages/efl/ecore-native_0.9.9.015.bb
index 299470841c..299470841c 100644
--- a/packages/efl/ecore-native_0.9.9.013.bb
+++ b/packages/efl/ecore-native_0.9.9.015.bb
diff --git a/packages/efl/ecore-x11_0.9.9.013.bb b/packages/efl/ecore-x11_0.9.9.015.bb
index b6b452cb71..b6b452cb71 100644
--- a/packages/efl/ecore-x11_0.9.9.013.bb
+++ b/packages/efl/ecore-x11_0.9.9.015.bb
diff --git a/packages/efl/ecore.inc b/packages/efl/ecore.inc
index 441d780a47..575bb9e5ba 100644
--- a/packages/efl/ecore.inc
+++ b/packages/efl/ecore.inc
@@ -10,7 +10,13 @@ PROVIDES += "virtual/ecore"
 inherit efl
 
 SRC_URI = "http://enlightenment.freedesktop.org/files/ecore-${PV}.tar.gz \
-           file://configure.patch;patch=1"
+           file://configure.patch;patch=1 \
+           file://fix-tslib-configure.patch;patch=1 \
+           http://cvs.sourceforge.net/viewcvs.py/*checkout*/enlightenment/e17/libs/ecore/m4/ac_attribute.m4?rev=1.1 \
+           http://cvs.sourceforge.net/viewcvs.py/*checkout*/enlightenment/e17/libs/ecore/m4/ac_expand_dir.m4?rev=1.1 \
+           http://cvs.sourceforge.net/viewcvs.py/*checkout*/enlightenment/e17/libs/ecore/m4/ac_path_generic.m4?rev=1.2 \
+           http://cvs.sourceforge.net/viewcvs.py/*checkout*/enlightenment/e17/libs/ecore/m4/pkg.m4?rev=1.2"
+
 S = "${WORKDIR}/ecore-${PV}"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/ecore"
 
@@ -20,6 +26,14 @@ libraries = ""
 headers = ""
 parts = "<override me>"
 
+do_configure_prepend() {
+	install -D "${WORKDIR}/ac_attribute.m4?rev=1.1" "${S}/m4/ac_attribute.m4"
+	mv "${WORKDIR}/ac_expand_dir.m4?rev=1.1" "${S}/m4/ac_expand_dir.m4"
+	mv "${WORKDIR}/ac_path_generic.m4?rev=1.2" "${S}/m4/ac_path_generic.m4"
+	mv "${WORKDIR}/pkg.m4?rev=1.2" "${S}/m4/pkg.m4"
+	aclocal -I m4
+}
+
 do_stage_append() {
 	for p in ${parts}; do
 		dir=`echo $p|tr A-Z a-z`
diff --git a/packages/efl/ecore/configure.patch b/packages/efl/ecore/configure.patch
index a9ae62743d..cd38cb7218 100644
--- a/packages/efl/ecore/configure.patch
+++ b/packages/efl/ecore/configure.patch
@@ -1,27 +1,22 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- ecore-0.9.9.013/configure.in~configure.patch
-+++ ecore-0.9.9.013/configure.in
-@@ -15,7 +15,6 @@
- AC_CHECK_SIZEOF(int, 4)
+diff -Nur ecore-0.9.9.015~/configure.in ecore-0.9.9.015/configure.in
+--- ecore-0.9.9.015~/configure.in	2005-09-26 16:59:23.000000000 -0700
++++ ecore-0.9.9.015/configure.in	2005-09-26 17:01:02.000000000 -0700
+@@ -16,7 +16,6 @@
+ AC_CHECK_SIZEOF(long, 4)
  AM_ENABLE_SHARED
  AM_PROG_LIBTOOL
 -AC_C___ATTRIBUTE__
  
  if test "x${bindir}" = 'x${exec_prefix}/bin'; then
    if test "x${exec_prefix}" = "xNONE"; then
-@@ -247,10 +246,8 @@
+@@ -262,9 +261,7 @@
        AM_CONDITIONAL(BUILD_ECORE_X, true)
        AC_DEFINE(BUILD_ECORE_X, 1, [Build Ecore_X Module])
-       BUILD_ECORE_X=1
+       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_ldflags=" "$ecore_x_libs;
-+      x_libs="-lX11 -lXext";
++      x_libs="-lX11 -lXext"
        ecore_x_libs="-lecore_x";
      ],[
-       AM_CONDITIONAL(BUILD_ECORE_X, false)
diff --git a/packages/efl/ecore/fix-tslib-configure.patch b/packages/efl/ecore/fix-tslib-configure.patch
new file mode 100644
index 0000000000..5a23f904dc
--- /dev/null
+++ b/packages/efl/ecore/fix-tslib-configure.patch
@@ -0,0 +1,12 @@
+diff -Nur ecore-0.9.9.015~/configure.in ecore-0.9.9.015/configure.in
+--- ecore-0.9.9.015~/configure.in	2005-09-27 17:22:38.000000000 -0700
++++ ecore-0.9.9.015/configure.in	2005-09-27 17:23:40.000000000 -0700
+@@ -103,7 +102,7 @@
+ tslib_libs=""
+ AC_CHECK_HEADER(tslib.h,
+   [
+-    tslib_libs="-ltslib"
++    tslib_libs="-lts"
+     AC_DEFINE(HAVE_TSLIB, 1, [Build Ecore_X Module])
+   ],[
+     AC_MSG_RESULT("No tslib header found. No tslib support being built")
diff --git a/packages/efl/edje-native_0.5.0.013.bb b/packages/efl/edje-native_0.5.0.015.bb
index f99090969a..523c38ba46 100644
--- a/packages/efl/edje-native_0.5.0.013.bb
+++ b/packages/efl/edje-native_0.5.0.015.bb
@@ -16,8 +16,8 @@ EXTRA_OECONF = "--with-fb-only \
 
 do_configure_prepend() {
         sed -i 's:EMBRYO_PREFIX"/bin:"${STAGING_BINDIR}:' ${S}/src/bin/edje_cc_out.c
-	sed -i 's:/usr/bin/cpp:${STAGING_DIR}/cross/bin/${REAL_TARGET_SYS}-cpp:' ${S}/src/bin/edje_cc_parse.c
-	sed -i 's:/usr/bin/gcc:${STAGING_DIR}/cross/bin/${REAL_TARGET_SYS}-gcc:' ${S}/src/bin/edje_cc_parse.c
+#	sed -i 's:/usr/bin/cpp:${STAGING_DIR}/cross/bin/${REAL_TARGET_SYS}-cpp:' ${S}/src/bin/edje_cc_parse.c
+#	sed -i 's:/usr/bin/gcc:${STAGING_DIR}/cross/bin/${REAL_TARGET_SYS}-gcc:' ${S}/src/bin/edje_cc_parse.c
 }
 
 do_stage_append() {
diff --git a/packages/efl/edje_0.5.0.013.bb b/packages/efl/edje_0.5.0.013.bb
deleted file mode 100644
index e08e4407d1..0000000000
--- a/packages/efl/edje_0.5.0.013.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-DESCRIPTION = "Edje is a complex graphical design & layout library."
-# can also install vim data files
-DEPENDS = "virtual/evas virtual/ecore eet embryo edje-native virtual/imlib2"
-LICENSE = "MIT"
-PR = "r1"
-
-inherit efl
-
-LEAD_SONAME = "libedje.so"
-
-FILES_${PN}-dev += "${bindir}"
-
-RDEPENDS_${PN}-dev += "cpp"
\ No newline at end of file
diff --git a/packages/efl/edje_0.5.0.015.bb b/packages/efl/edje_0.5.0.015.bb
new file mode 100644
index 0000000000..a6fca4f55c
--- /dev/null
+++ b/packages/efl/edje_0.5.0.015.bb
@@ -0,0 +1,22 @@
+DESCRIPTION = "Edje is a complex graphical design & layout library."
+# can also install vim data files
+DEPENDS = "virtual/evas virtual/ecore eet embryo edje-native virtual/imlib2"
+LICENSE = "MIT"
+PR = "r1"
+
+inherit efl
+
+SRC_URI += "http://cvs.sourceforge.net/viewcvs.py/*checkout*/enlightenment/e17/libs/edje/m4/ac_expand_dir.m4?rev=1.1 \
+            http://cvs.sourceforge.net/viewcvs.py/*checkout*/enlightenment/e17/libs/edje/m4/ac_path_generic.m4?rev=1.2"
+
+LEAD_SONAME = "libedje.so"
+
+FILES_${PN}-dev += "${bindir}"
+
+RDEPENDS_${PN}-dev += "cpp"
+
+do_configure_prepend() {
+	install -D "${WORKDIR}/ac_expand_dir.m4?rev=1.1" "${S}/m4/ac_expand_dir.m4"
+	mv "${WORKDIR}/ac_path_generic.m4?rev=1.2" "${S}/m4/ac_path_generic.m4"
+	aclocal -I m4
+}
diff --git a/packages/efl/eet-native_0.9.10.013.bb b/packages/efl/eet-native_0.9.10.015.bb
index fa20c9fb30..fa20c9fb30 100644
--- a/packages/efl/eet-native_0.9.10.013.bb
+++ b/packages/efl/eet-native_0.9.10.015.bb
diff --git a/packages/efl/eet_0.9.10.013.bb b/packages/efl/eet_0.9.10.015.bb
index c0f89b1064..c0f89b1064 100644
--- a/packages/efl/eet_0.9.10.013.bb
+++ b/packages/efl/eet_0.9.10.015.bb
diff --git a/packages/efl/emotion_0.0.1.004.bb b/packages/efl/emotion_0.0.1.004.bb
index 3529db50e6..886f0e8b3f 100644
--- a/packages/efl/emotion_0.0.1.004.bb
+++ b/packages/efl/emotion_0.0.1.004.bb
@@ -10,3 +10,7 @@ inherit efl
 
 PACKAGES += "emotion-plugins"
 FILES_emotion-plugins = "${libdir}/xine/plugins/1.1.0/*.so ${libdir}/emotion/*.so"
+
+do_compile_prepend() {
+	find ${S} -type f -name "*.[ch]" | xargs sed -i 's:NULL:0:g'
+}
\ No newline at end of file
diff --git a/packages/efl/engrave_20050810.bb b/packages/efl/engrave_20050926.bb
index 8ee284fb19..8ee284fb19 100644
--- a/packages/efl/engrave_20050810.bb
+++ b/packages/efl/engrave_20050926.bb
diff --git a/packages/efl/esmart-x11_0.9.0.004.bb b/packages/efl/esmart-x11_0.9.0.004.bb
index a7c9f97584..7c6737dd55 100644
--- a/packages/efl/esmart-x11_0.9.0.004.bb
+++ b/packages/efl/esmart-x11_0.9.0.004.bb
@@ -1,6 +1,9 @@
 include esmart.inc
 PR = "r2"
 
+SRC_URI += "file://ecore-fix.patch;patch=1 \
+            file://include-stdio.patch;patch=1"
+
 myheaders = "esmart_container/Esmart_Container.h \
              esmart_draggies/Esmart_Draggies.h \
              esmart_file_dialog/Esmart_File_Dialog.h \
@@ -16,3 +19,7 @@ mylibraries = "esmart_container \
                esmart_textarea \
                esmart_thumb \
                esmart_trans_x11"
+
+do_compile_prepend() {
+	find ${S} -type f -name "*.[ch]" | xargs sed -i 's:NULL:0:g'
+}
\ No newline at end of file
diff --git a/packages/efl/esmart/ecore-fix.patch b/packages/efl/esmart/ecore-fix.patch
new file mode 100644
index 0000000000..94deff0b95
--- /dev/null
+++ b/packages/efl/esmart/ecore-fix.patch
@@ -0,0 +1,10 @@
+--- esmart-0.9.0.004/src/lib/esmart_trans_x11/esmart_trans_x11.c~	2004-11-10 07:18:23.000000000 -0800
++++ esmart-0.9.0.004/src/lib/esmart_trans_x11/esmart_trans_x11.c	2005-09-29 11:22:52.000000000 -0700
+@@ -9,6 +9,7 @@
+ #include <X11/Xlib.h>
+ #include <Imlib2.h>
+ #include <Ecore.h>
++#include <Ecore_Data.h>
+ #include <Ecore_X.h>
+ #include <assert.h>
+ 
diff --git a/packages/efl/esmart/include-stdio.patch b/packages/efl/esmart/include-stdio.patch
new file mode 100644
index 0000000000..20a490f421
--- /dev/null
+++ b/packages/efl/esmart/include-stdio.patch
@@ -0,0 +1,22 @@
+diff -Nur esmart-0.9.0.004~/src/bin/esmart_file_dialog_test.c esmart-0.9.0.004/src/bin/esmart_file_dialog_test.c
+--- esmart-0.9.0.004~/src/bin/esmart_file_dialog_test.c	2005-09-29 14:33:09.000000000 -0700
++++ esmart-0.9.0.004/src/bin/esmart_file_dialog_test.c	2005-09-29 14:33:48.000000000 -0700
+@@ -8,6 +8,7 @@
+  * $ esmart_file_dialog_test /path/to/my_custom/theme.eet 
+  * to test a custom theme you've written for it
+  */
++#include <stdio.h>
+ #include <Ecore.h>
+ #include <Edje.h>
+ #include <Ecore_Evas.h>
+diff -Nur esmart-0.9.0.004~/src/lib/esmart_trans_x11/esmart_trans_x11.c esmart-0.9.0.004/src/lib/esmart_trans_x11/esmart_trans_x11.c
+--- esmart-0.9.0.004~/src/lib/esmart_trans_x11/esmart_trans_x11.c	2005-09-29 14:33:09.000000000 -0700
++++ esmart-0.9.0.004/src/lib/esmart_trans_x11/esmart_trans_x11.c	2005-09-29 14:33:19.000000000 -0700
+@@ -4,6 +4,7 @@
+  *
+  ***************************************************************************/
+ 
++#include <stdio.h>
+ #include <stdlib.h>
+ #include "config.h"
+ #include <X11/Xlib.h>
diff --git a/packages/efl/evas-fb_0.9.9.013.bb b/packages/efl/evas-fb_0.9.9.015.bb
index 492a0badb1..492a0badb1 100644
--- a/packages/efl/evas-fb_0.9.9.013.bb
+++ b/packages/efl/evas-fb_0.9.9.015.bb
diff --git a/packages/efl/evas-native_0.9.9.013.bb b/packages/efl/evas-native_0.9.9.015.bb
index 60bf7f6ae5..60bf7f6ae5 100644
--- a/packages/efl/evas-native_0.9.9.013.bb
+++ b/packages/efl/evas-native_0.9.9.015.bb
diff --git a/packages/efl/evas-x11_0.9.9.013.bb b/packages/efl/evas-x11_0.9.9.015.bb
index 8e51a2a873..8e51a2a873 100644
--- a/packages/efl/evas-x11_0.9.9.013.bb
+++ b/packages/efl/evas-x11_0.9.9.015.bb
diff --git a/packages/efl/evas.inc b/packages/efl/evas.inc
index 521ecb9912..dee8f88d54 100644
--- a/packages/efl/evas.inc
+++ b/packages/efl/evas.inc
@@ -9,17 +9,30 @@ PROVIDES += "virtual/evas"
 
 inherit efl
 
+export FREETYPE_CONFIG		= "${STAGING_BINDIR}/freetype-config${@binconfig_suffix(d)}"
+
 SRC_URI = "http://enlightenment.freedesktop.org/files/evas-${PV}.tar.gz \
            file://fix-configure.patch;patch=1 \
-           file://pkg.m4"
+           http://cvs.sourceforge.net/viewcvs.py/*checkout*/enlightenment/e17/libs/evas/m4/ac_expand_dir.m4?rev=1.1 \
+           http://cvs.sourceforge.net/viewcvs.py/*checkout*/enlightenment/e17/libs/evas/m4/ac_path_generic.m4?rev=1.2 \
+           http://cvs.sourceforge.net/viewcvs.py/*checkout*/enlightenment/e17/libs/evas/m4/pkg.m4?rev=1.2"
+
 S = "${WORKDIR}/evas-${PV}"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/evas"
 
 EXTRA_OECONF = "<override me>"
 
+do_configure_prepend() {
+	install -D "${WORKDIR}/ac_expand_dir.m4?rev=1.1" "${S}/m4/ac_expand_dir.m4"
+	mv "${WORKDIR}/ac_path_generic.m4?rev=1.2" "${S}/m4/ac_path_generic.m4"
+	mv "${WORKDIR}/pkg.m4?rev=1.2" "${S}/m4/pkg.m4"
+	aclocal -I m4
+}
+
 do_configure () {
-	install -m 0644 ${WORKDIR}/pkg.m4 acinclude.m4
 	autotools_do_configure
+	#find ${S} -type f | xargs sed -i 's:@FREETYPE_CFLAGS@:-I${STAGING_INCDIR}/freetype2:'
+	#find ${S} -name Makefile | xargs sed -i 's:--tag=CC:-lfreetype --tag=CC:'
 }
 
 headers = "<override me>"
diff --git a/packages/efl/evas/fix-configure.patch b/packages/efl/evas/fix-configure.patch
index cc7462e72c..acd50c0282 100644
--- a/packages/efl/evas/fix-configure.patch
+++ b/packages/efl/evas/fix-configure.patch
@@ -1,11 +1,7 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- evas-0.9.9.013/configure.in~fix-configure
-+++ evas-0.9.9.013/configure.in
-@@ -157,9 +157,7 @@
+diff -Nur evas-0.9.9.015~/configure.in evas-0.9.9.015/configure.in
+--- evas-0.9.9.015~/configure.in	2005-09-28 15:12:03.000000000 -0700
++++ evas-0.9.9.015/configure.in	2005-09-28 15:13:05.000000000 -0700
+@@ -152,9 +152,7 @@
      [
        AM_CONDITIONAL(BUILD_ENGINE_SOFTWARE_X11, true)
        AC_DEFINE(BUILD_ENGINE_SOFTWARE_X11, 1, [Software X11 Rendering Backend])
@@ -16,7 +12,7 @@
        ENGINE_SOFTWARE_X11_PRG="evas_software_x11_test evas_software_x11_perf_test evas_software_x11_perf_load"
      ],
      [
-@@ -221,7 +219,7 @@
+@@ -216,7 +214,7 @@
          X11/X.h,
          [AM_CONDITIONAL(BUILD_ENGINE_SOFTWARE_XCB, true)
           AC_DEFINE(BUILD_ENGINE_SOFTWARE_XCB, 1, [Software XCB Rendering Backend])
@@ -25,20 +21,20 @@
           xcb_cflags="${x_cflags:--I${x_includes:-$x_dir/include}} $XCB_CFLAGS $XCB_ICCCM_CFLAGS"
           xcb_libs="${x_libs:--L${x_libraries:-$x_dir/lib}}  $XCB_LIBS $XCB_ICCCM_LIBS"
           ENGINE_SOFTWARE_XCB_PRG="evas_software_xcb_test evas_software_xcb_perf_test evas_software_xcb_perf_load"],
-@@ -433,10 +431,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=""
- 	  ENGINE_GL_X11_PRG="evas_gl_x11_test"
-@@ -490,7 +488,7 @@
+@@ -430,10 +428,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=""
+ 	      ENGINE_GL_X11_PRG="evas_gl_x11_test"
+@@ -496,7 +494,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])
diff --git a/packages/efl/ewl/ecore-flags.patch b/packages/efl/ewl/ecore-flags.patch
new file mode 100644
index 0000000000..9c4f5afc78
--- /dev/null
+++ b/packages/efl/ewl/ecore-flags.patch
@@ -0,0 +1,146 @@
+diff -Nur ewl-0.0.4.004~/src/lib/ewl_config.c ewl-0.0.4.004/src/lib/ewl_config.c
+--- ewl-0.0.4.004~/src/lib/ewl_config.c	2005-09-29 18:02:24.000000000 -0700
++++ ewl-0.0.4.004/src/lib/ewl_config.c	2005-09-29 18:03:10.000000000 -0700
+@@ -210,8 +210,8 @@
+ 
+ 		cc = ewl_config_int_get("/ewl/theme/color_classes/count");
+ 		prop = ecore_config_get("/ewl/theme/color_classes/count");
+-		prop->flags &= ~PF_MODIFIED;
+-		prop->flags |= PF_SYSTEM;
++		prop->flags &= ~ECORE_CONFIG_FLAG_MODIFIED;
++		prop->flags |= ECORE_CONFIG_FLAG_SYSTEM;
+ 
+ 		for (i = 0; i < cc; i++) {
+ 			char *name;
+@@ -221,8 +221,8 @@
+ 					"/ewl/theme/color_classes/%d/name", i);
+ 			name = ewl_config_str_get(key);
+ 			prop = ecore_config_get(key);
+-			prop->flags &= ~PF_MODIFIED;
+-			prop->flags |= PF_SYSTEM;
++			prop->flags &= ~ECORE_CONFIG_FLAG_MODIFIED;
++			prop->flags |= ECORE_CONFIG_FLAG_SYSTEM;
+ 
+ 			if (name) {
+ 				int r, g, b, a;
+@@ -233,85 +233,85 @@
+ 						"/ewl/theme/color_classes/%d/r", i);
+ 				r = ewl_config_int_get(key);
+ 				prop = ecore_config_get(key);
+-				prop->flags &= ~PF_MODIFIED;
+-				prop->flags |= PF_SYSTEM;
++				prop->flags &= ~ECORE_CONFIG_FLAG_MODIFIED;
++				prop->flags |= ECORE_CONFIG_FLAG_SYSTEM;
+ 
+ 				snprintf(key, PATH_MAX,
+ 						"/ewl/theme/color_classes/%d/g", i);
+ 				g = ewl_config_int_get(key);
+ 				prop = ecore_config_get(key);
+-				prop->flags &= ~PF_MODIFIED;
+-				prop->flags |= PF_SYSTEM;
++				prop->flags &= ~ECORE_CONFIG_FLAG_MODIFIED;
++				prop->flags |= ECORE_CONFIG_FLAG_SYSTEM;
+ 
+ 				snprintf(key, PATH_MAX,
+ 						"/ewl/theme/color_classes/%d/b", i);
+ 				b = ewl_config_int_get(key);
+ 				prop = ecore_config_get(key);
+-				prop->flags &= ~PF_MODIFIED;
+-				prop->flags |= PF_SYSTEM;
++				prop->flags &= ~ECORE_CONFIG_FLAG_MODIFIED;
++				prop->flags |= ECORE_CONFIG_FLAG_SYSTEM;
+ 
+ 				snprintf(key, PATH_MAX,
+ 						"/ewl/theme/color_classes/%d/a", i);
+ 				a = ewl_config_int_get(key);
+ 				prop = ecore_config_get(key);
+-				prop->flags &= ~PF_MODIFIED;
+-				prop->flags |= PF_SYSTEM;
++				prop->flags &= ~ECORE_CONFIG_FLAG_MODIFIED;
++				prop->flags |= ECORE_CONFIG_FLAG_SYSTEM;
+ 
+ 				snprintf(key, PATH_MAX,
+ 						"/ewl/theme/color_classes/%d/r2", i);
+ 				r2 = ewl_config_int_get(key);
+ 				prop = ecore_config_get(key);
+-				prop->flags &= ~PF_MODIFIED;
+-				prop->flags |= PF_SYSTEM;
++				prop->flags &= ~ECORE_CONFIG_FLAG_MODIFIED;
++				prop->flags |= ECORE_CONFIG_FLAG_SYSTEM;
+ 
+ 				snprintf(key, PATH_MAX,
+ 						"/ewl/theme/color_classes/%d/g2", i);
+ 				g2 = ewl_config_int_get(key);
+ 				prop = ecore_config_get(key);
+-				prop->flags &= ~PF_MODIFIED;
+-				prop->flags |= PF_SYSTEM;
++				prop->flags &= ~ECORE_CONFIG_FLAG_MODIFIED;
++				prop->flags |= ECORE_CONFIG_FLAG_SYSTEM;
+ 
+ 				snprintf(key, PATH_MAX,
+ 						"/ewl/theme/color_classes/%d/b2", i);
+ 				b2 = ewl_config_int_get(key);
+ 				prop = ecore_config_get(key);
+-				prop->flags &= ~PF_MODIFIED;
+-				prop->flags |= PF_SYSTEM;
++				prop->flags &= ~ECORE_CONFIG_FLAG_MODIFIED;
++				prop->flags |= ECORE_CONFIG_FLAG_SYSTEM;
+ 
+ 				snprintf(key, PATH_MAX,
+ 						"/ewl/theme/color_classes/%d/a2", i);
+ 				a2 = ewl_config_int_get(key);
+ 				prop = ecore_config_get(key);
+-				prop->flags &= ~PF_MODIFIED;
+-				prop->flags |= PF_SYSTEM;
++				prop->flags &= ~ECORE_CONFIG_FLAG_MODIFIED;
++				prop->flags |= ECORE_CONFIG_FLAG_SYSTEM;
+ 
+ 				snprintf(key, PATH_MAX,
+ 						"/ewl/theme/color_classes/%d/r3", i);
+ 				r3 = ewl_config_int_get(key);
+ 				prop = ecore_config_get(key);
+-				prop->flags &= ~PF_MODIFIED;
+-				prop->flags |= PF_SYSTEM;
++				prop->flags &= ~ECORE_CONFIG_FLAG_MODIFIED;
++				prop->flags |= ECORE_CONFIG_FLAG_SYSTEM;
+ 
+ 				snprintf(key, PATH_MAX,
+ 						"/ewl/theme/color_classes/%d/g3", i);
+ 				g3 = ewl_config_int_get(key);
+ 				prop = ecore_config_get(key);
+-				prop->flags &= ~PF_MODIFIED;
+-				prop->flags |= PF_SYSTEM;
++				prop->flags &= ~ECORE_CONFIG_FLAG_MODIFIED;
++				prop->flags |= ECORE_CONFIG_FLAG_SYSTEM;
+ 
+ 				snprintf(key, PATH_MAX,
+ 						"/ewl/theme/color_classes/%d/b3", i);
+ 				b3 = ewl_config_int_get(key);
+ 				prop = ecore_config_get(key);
+-				prop->flags &= ~PF_MODIFIED;
+-				prop->flags |= PF_SYSTEM;
++				prop->flags &= ~ECORE_CONFIG_FLAG_MODIFIED;
++				prop->flags |= ECORE_CONFIG_FLAG_SYSTEM;
+ 
+ 				snprintf(key, PATH_MAX,
+ 						"/ewl/theme/color_classes/%d/a3", i);
+ 				a3 = ewl_config_int_get(key);
+ 				prop = ecore_config_get(key);
+-				prop->flags &= ~PF_MODIFIED;
+-				prop->flags |= PF_SYSTEM;
++				prop->flags &= ~ECORE_CONFIG_FLAG_MODIFIED;
++				prop->flags |= ECORE_CONFIG_FLAG_SYSTEM;
+ 
+ 				edje_color_class_set(name, r, g, b, a,
+ 						r2, g2, b2, a2,
+@@ -389,8 +389,8 @@
+ 
+ 		for(i = 0; keys[i] != NULL; i++) {
+ 			prop = ecore_config_get(keys[i]);
+-			prop->flags &= ~PF_MODIFIED;
+-			prop->flags |= PF_SYSTEM;
++			prop->flags &= ~ECORE_CONFIG_FLAG_MODIFIED;
++			prop->flags |= ECORE_CONFIG_FLAG_SYSTEM;
+ 		}
+ 
+ 		ecore_config_listen("ewl_debug_enable", "/ewl/debug/enable",
diff --git a/packages/efl/ewl/fix-ecore.patch b/packages/efl/ewl/fix-ecore.patch
new file mode 100644
index 0000000000..7a514a1740
--- /dev/null
+++ b/packages/efl/ewl/fix-ecore.patch
@@ -0,0 +1,11 @@
+diff -Nur ewl-0.0.4.004~/src/lib/Ewl.h ewl-0.0.4.004/src/lib/Ewl.h
+--- ewl-0.0.4.004~/src/lib/Ewl.h.in	2005-09-29 17:44:59.000000000 -0700
++++ ewl-0.0.4.004/src/lib/Ewl.h.in	2005-09-29 17:46:57.000000000 -0700
+@@ -257,6 +257,7 @@
+ #include <Evas.h>
+ #include <Edje.h>
+ #include <Ecore.h>
++#include <Ecore_Data.h>
+ #include <Edb.h>
+ 
+ #include <stdio.h>
diff --git a/packages/efl/ewl/minmax.patch b/packages/efl/ewl/minmax.patch
new file mode 100644
index 0000000000..cd8723e9a3
--- /dev/null
+++ b/packages/efl/ewl/minmax.patch
@@ -0,0 +1,18 @@
+diff -Nur ewl-0.0.4.004~/src/lib/Ewl.h.in ewl-0.0.4.004/src/lib/Ewl.h.in
+--- ewl-0.0.4.004~/src/lib/Ewl.h.in	2005-09-29 18:26:11.000000000 -0700
++++ ewl-0.0.4.004/src/lib/Ewl.h.in	2005-09-29 18:26:55.000000000 -0700
+@@ -254,6 +254,14 @@
+ extern"C" {
+ #endif
+ 
++#ifndef MAX
++#define MAX(a, b) (a > b ? a : b)
++#endif
++
++#ifndef MIN
++#define MIN(a, b) (a < b ? a : b)
++#endif
++
+ #include <Evas.h>
+ #include <Edje.h>
+ #include <Ecore.h>
diff --git a/packages/efl/ewl/no-examples.patch b/packages/efl/ewl/no-examples.patch
new file mode 100644
index 0000000000..402c50894c
--- /dev/null
+++ b/packages/efl/ewl/no-examples.patch
@@ -0,0 +1,22 @@
+diff -Nur ewl-0.0.4.004~/src/Makefile.am ewl-0.0.4.004/src/Makefile.am
+--- ewl-0.0.4.004~/src/Makefile.am	2005-09-29 18:21:52.000000000 -0700
++++ ewl-0.0.4.004/src/Makefile.am	2005-09-29 18:22:17.000000000 -0700
+@@ -1,5 +1,5 @@
+ 
+-SUBDIRS = lib bin
++SUBDIRS = lib
+ 
+ MAINTAINERCLEANFILES = Makefile.in
+ 
+diff -Nur ewl-0.0.4.004~/src/Makefile.in ewl-0.0.4.004/src/Makefile.in
+--- ewl-0.0.4.004~/src/Makefile.in	2005-09-29 18:21:52.000000000 -0700
++++ ewl-0.0.4.004/src/Makefile.in	2005-09-29 18:22:07.000000000 -0700
+@@ -108,7 +108,7 @@
+ ewl_media_include = @ewl_media_include@
+ requirements = @requirements@
+ 
+-SUBDIRS = lib bin
++SUBDIRS = lib
+ 
+ MAINTAINERCLEANFILES = Makefile.in
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/packages/efl/ewl_0.0.4.004.bb b/packages/efl/ewl_0.0.4.004.bb
index 0205de4216..85b85e0c05 100644
--- a/packages/efl/ewl_0.0.4.004.bb
+++ b/packages/efl/ewl_0.0.4.004.bb
@@ -8,7 +8,11 @@ PR = "r1"
 
 inherit efl
 
-SRC_URI += "file://ewl-configure.patch;patch=1"
+SRC_URI += "file://ewl-configure.patch;patch=1 \
+            file://fix-ecore.patch;patch=1 \
+            file://ecore-flags.patch;patch=1 \
+            file://no-examples.patch;patch=1 \
+            file://minmax.patch;patch=1"
 
 do_stage_append() {
 	for i in src/lib/ewl_*.h
diff --git a/packages/efl/imlib2-fb_1.2.1.004.bb b/packages/efl/imlib2-fb_1.2.1.006.bb
index 09fecdaf8b..09fecdaf8b 100644
--- a/packages/efl/imlib2-fb_1.2.1.004.bb
+++ b/packages/efl/imlib2-fb_1.2.1.006.bb
diff --git a/packages/efl/imlib2-native_1.2.1.004.bb b/packages/efl/imlib2-native_1.2.1.006.bb
index 6f8ebe477a..6f8ebe477a 100644
--- a/packages/efl/imlib2-native_1.2.1.004.bb
+++ b/packages/efl/imlib2-native_1.2.1.006.bb
diff --git a/packages/efl/imlib2-x11_1.2.1.004.bb b/packages/efl/imlib2-x11_1.2.1.006.bb
index 165321355c..165321355c 100644
--- a/packages/efl/imlib2-x11_1.2.1.004.bb
+++ b/packages/efl/imlib2-x11_1.2.1.006.bb
diff --git a/packages/elitaire/elitaire_0.0.4.bb b/packages/elitaire/elitaire_0.0.5.bb
index 5891fba9ae..ac3aebebbf 100644
--- a/packages/elitaire/elitaire_0.0.4.bb
+++ b/packages/elitaire/elitaire_0.0.5.bb
@@ -5,8 +5,9 @@ SECTION = "e/apps"
 MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
 PR = "r0"
 
-SRC_URI = "http://www.mowem.de/elitaire/elitaire-0.0.4.tar.bz2 \
-           file://fix-ewl-and-gettext.patch;patch=1"
+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
index f84ec06d34..f572124f94 100644
--- a/packages/elitaire/files/fix-ewl-and-gettext.patch
+++ b/packages/elitaire/files/fix-ewl-and-gettext.patch
@@ -1,24 +1,3 @@
-diff -Nur elitaire-0.0.4~/src/Eli_App.h elitaire-0.0.4/src/Eli_App.h
---- elitaire-0.0.4~/src/Eli_App.h	2005-08-18 19:02:30.000000000 -0700
-+++ elitaire-0.0.4/src/Eli_App.h	2005-08-18 19:02:40.000000000 -0700
-@@ -3,7 +3,7 @@
- #include<Ecore_Config.h>
- #include<Ecore_File.h>
- #include<Esmart/Esmart_Container.h>
--#include<ewl/Ewl.h>
-+#include<Ewl.h>
- #include"ewl_context_menu.h"
- #include"Elitaire.h"
- 
-diff -Nur elitaire-0.0.4~/src/ewl_context_menu.c elitaire-0.0.4/src/ewl_context_menu.c
---- elitaire-0.0.4~/src/ewl_context_menu.c	2005-08-18 19:02:30.000000000 -0700
-+++ elitaire-0.0.4/src/ewl_context_menu.c	2005-08-18 19:02:40.000000000 -0700
-@@ -1,4 +1,4 @@
--#include<ewl/Ewl.h>
-+#include<Ewl.h>
- #include"ewl_context_menu.h"
- 
- void ewl_context_menu_expand_cb(Ewl_Widget *w, void *ev_data ,
 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
diff --git a/packages/elitaire/files/math.patch b/packages/elitaire/files/math.patch
new file mode 100644
index 0000000000..550507f370
--- /dev/null
+++ b/packages/elitaire/files/math.patch
@@ -0,0 +1,14 @@
+--- 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/meta/meta-e-x11.bb b/packages/meta/meta-e-x11.bb
index f0ed8b446c..cb375fe9d7 100644
--- a/packages/meta/meta-e-x11.bb
+++ b/packages/meta/meta-e-x11.bb
@@ -8,6 +8,8 @@ FEED_URIS += "x11##http://openzaurus.org/official/unstable/3.5.2/feed/x11 \
 
 ALLOW_EMPTY = 1
 
-DEPENDS              = "task-e-x11-core entice eclair examine evidence e-modules e-utils elitaire"
-RDEPENDS_task-e-x11  = "task-e-x11-core entice eclair examine evidence e-modules e-utils elitaire"
+DEPENDS              = "task-e-x11-core entice eclair examine evidence e-modules e-utils"
+# elitaire
+RDEPENDS_task-e-x11  = "task-e-x11-core entice eclair examine evidence e-modules e-utils"
+# elitaire