rename packages/ to recipes/ per earlier agreement

See links below for more details:
http://thread.gmane.org/gmane.comp.handhelds.openembedded/21326
http://thread.gmane.org/gmane.comp.handhelds.openembedded/21816

Signed-off-by: Denys Dmytriyenko <denis@denix.org>
Acked-by: Mike Westerhof <mwester@dls.net>
Acked-by: Philip Balister <philip@balister.org>
Acked-by: Khem Raj <raj.khem@gmail.com>
Acked-by: Marcin Juszkiewicz <hrw@openembedded.org>
Acked-by: Koen Kooi <koen@openembedded.org>
Acked-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>

42 files changed, 1327 insertions, 0 deletions

diff --git a/recipes/e17/e-module.inc b/recipes/e17/e-module.inc
new file mode 100644
index 0000000000..d275b0a267
--- /dev/null
+++ b/recipes/e17/e-module.inc
@@ -0,0 +1,16 @@
+DESCRIPTION = "E17 ${PN} module"
+SECTION = "x11/multimedia"
+DEPENDS = "e-wm"
+
+SRCREV = "${EFL_SRCREV}"
+
+SRCNAME = "E-MODULES-EXTRA/${PN}"
+
+inherit e
+
+EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc"
+
+FILES_${PN} += "${libdir}/enlightenment/modules/${PN}"
+FILES_${PN}-dbg += "${libdir}/enlightenment/modules/${PN}/*/.debug"
+
+
diff --git a/recipes/e17/e-wm/applications.menu b/recipes/e17/e-wm/applications.menu
new file mode 100644
index 0000000000..77c6f0429c
--- /dev/null
+++ b/recipes/e17/e-wm/applications.menu
@@ -0,0 +1,105 @@
+<?xml version="1.0"?>
+<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN" "http://standards.freedesktop.org/menu-spec/menu-1.0.dtd">
+<Menu>
+  <Name>Applications</Name>
+  <!--   <Directory>Applications.directory</Directory> -->
+
+  <!-- Read standard .directory and .desktop file locations -->
+  <DefaultAppDirs>/usr/share/applications</DefaultAppDirs>
+  <DefaultDirectoryDirs/>
+
+  <Menu>
+    <Name>Office</Name>
+    <Directory>Office.directory</Directory>
+    <Include>
+      <And>
+        <Category>Office</Category>
+      </And>
+    </Include>
+  </Menu>
+  
+  <Menu>
+    <Name>Multimedia</Name>
+    <Directory>Multimedia.directory</Directory>
+    <Include>
+      <And>
+        <Category>AudioVideo</Category>
+      </And>
+    </Include>
+  </Menu>
+
+  <Menu>
+    <Name>Graphics</Name>
+    <Directory>Graphics.directory</Directory>
+    <Include>
+      <And>
+        <Category>Graphics</Category>
+      </And>
+    </Include>
+  </Menu>
+
+  <Menu>
+    <Name>Games</Name>
+    <Directory>Games.directory</Directory>
+    <Include>
+      <And>
+        <Or>
+         <Category>Game</Category>
+         <Category>Games</Category>
+        </Or>
+      </And>
+    </Include>
+  </Menu>
+
+  <Menu>
+    <Name>Internet</Name>
+    <Directory>Internet.directory</Directory>
+    <Include>
+      <And>
+        <Or>
+         <Category>Internet</Category>
+         <Category>Network</Category>
+        </Or>
+      </And>
+    </Include>
+  </Menu>
+
+  <Menu>
+    <Name>Settings</Name>
+    <Directory>Settings.directory</Directory>
+    <Include>
+      <And>
+        <Or>
+          <Category>SystemSettings</Category>
+          <Category>Settings</Category>
+        </Or>
+        <Not>
+          <Category>System</Category>
+        </Not>
+      </And>
+    </Include>
+  </Menu>
+
+  <Menu>
+    <Name>Accessories</Name>
+    <Directory>Accessories.directory</Directory>
+    <Include>
+      <And>
+	<Or>
+          <Category>Applications</Category>
+	  <Category>Utility</Category>
+	</Or>
+        <Not>
+          <Category>System</Category>
+          <Category>Office</Category>
+          <Category>Internet</Category>
+          <Category>AudioVideo</Category>
+          <Category>Graphics</Category>
+          <Category>Games</Category>
+        </Not>
+      </And>
+    </Include>
+  </Menu>
+  
+</Menu>
+
diff --git a/recipes/e17/e-wm/disable-e-cursor.patch b/recipes/e17/e-wm/disable-e-cursor.patch
new file mode 100644
index 0000000000..51618434a5
--- /dev/null
+++ b/recipes/e17/e-wm/disable-e-cursor.patch
@@ -0,0 +1,277 @@
+Index: e/src/bin/e_config.c
+===================================================================
+--- e.orig/src/bin/e_config.c
++++ e/src/bin/e_config.c
+@@ -461,6 +461,7 @@ e_config_init(void)
+    E_CONFIG_VAL(D, T, focus_last_focused_per_desktop, INT); /**/
+    E_CONFIG_VAL(D, T, focus_revert_on_hide_or_close, INT); /**/
+    E_CONFIG_VAL(D, T, pointer_slide, INT); /**/
++   E_CONFIG_VAL(D, T, show_cursor, INT); /**/
+    E_CONFIG_VAL(D, T, use_e_cursor, INT); /**/
+    E_CONFIG_VAL(D, T, cursor_size, INT); /**/
+    E_CONFIG_VAL(D, T, menu_autoscroll_margin, INT); /**/
+@@ -705,6 +706,7 @@ e_config_init(void)
+    e_config->focus_last_focused_per_desktop = 1;
+    e_config->focus_revert_on_hide_or_close = 1;
+    e_config->pointer_slide = 1;
++   e_config->show_cursor = 1;
+    e_config->use_e_cursor = 1;
+    e_config->cursor_size = 32;
+    e_config->menu_autoscroll_margin = 0;
+@@ -1570,6 +1572,7 @@ e_config_init(void)
+    E_CONFIG_LIMIT(e_config->focus_last_focused_per_desktop, 0, 1);
+    E_CONFIG_LIMIT(e_config->focus_revert_on_hide_or_close, 0, 1);
+    E_CONFIG_LIMIT(e_config->pointer_slide, 0, 1);
++   E_CONFIG_LIMIT(e_config->show_cursor, 0, 1);
+    E_CONFIG_LIMIT(e_config->use_e_cursor, 0, 1);
+    E_CONFIG_LIMIT(e_config->cursor_size, 0, 1024);
+    E_CONFIG_LIMIT(e_config->menu_autoscroll_margin, 0, 50);
+Index: e/src/modules/conf_mouse_cursor/e_int_config_cursor.c
+===================================================================
+--- e.orig/src/modules/conf_mouse_cursor/e_int_config_cursor.c
++++ e/src/modules/conf_mouse_cursor/e_int_config_cursor.c
+@@ -3,16 +3,25 @@
+ static void        *_create_data(E_Config_Dialog *cfd);
+ static void        _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
+ static int         _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
++static void        _basic_show_cursor_cb_change(void *data, Evas_Object *obj);
+ static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
+ static int         _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
++static void        _advanced_show_cursor_cb_change(void *data, Evas_Object *obj);
+ static Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
+ 
+ struct _E_Config_Dialog_Data 
+ {
++   int show_cursor;
+    int use_e_cursor;
+ 
+    /* Advanced */
+    int cursor_size;
++
++   struct
++     {
++         Evas_Object *radio_use_e_cursor;
++         Evas_Object *slider_cursor_size;
++     } gui;
+ };
+ 
+ EAPI E_Config_Dialog *
+@@ -41,6 +50,7 @@ e_int_config_cursor(E_Container *con, co
+ static void
+ _fill_data(E_Config_Dialog_Data *cfdata) 
+ {
++   cfdata->show_cursor = e_config->show_cursor;
+    cfdata->use_e_cursor = e_config->use_e_cursor;
+    cfdata->cursor_size = e_config->cursor_size;
+ }
+@@ -66,9 +76,11 @@ _basic_apply_data(E_Config_Dialog *cfd, 
+ {
+    int changed = 0;
+    
++   if (e_config->show_cursor != cfdata->show_cursor) changed = 1;
+    if (e_config->use_e_cursor != cfdata->use_e_cursor) changed = 1;
+    
+    e_config->use_e_cursor = cfdata->use_e_cursor;
++   e_config->show_cursor = cfdata->show_cursor;
+    e_config_save_queue();
+    
+    if (changed) 
+@@ -79,6 +91,11 @@ _basic_apply_data(E_Config_Dialog *cfd, 
+ 	  {
+ 	     E_Manager *man;
+ 	     man = l->data;
++         if (man->pointer && !e_config->show_cursor)
++           {
++               e_pointer_hide(man->pointer);
++               continue;
++           }
+ 	     if (man->pointer) e_object_del(E_OBJECT(man->pointer));
+ 	     man->pointer = e_pointer_window_new(man->root, 1);
+ 	  }
+@@ -86,6 +103,17 @@ _basic_apply_data(E_Config_Dialog *cfd, 
+    return 1;
+ }
+ 
++static void
++_basic_show_cursor_cb_change(void *data, Evas_Object *obj)
++{
++   E_Config_Dialog_Data *cfdata;
++
++   cfdata = data;
++   if (!cfdata) return;
++
++   e_widget_disabled_set(cfdata->gui.radio_use_e_cursor, !cfdata->show_cursor);
++}
++
+ static Evas_Object *
+ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) 
+ {
+@@ -94,8 +122,14 @@ _basic_create_widgets(E_Config_Dialog *c
+    
+    o = e_widget_list_add(evas, 0, 0);
+       
++   ob = e_widget_check_add(evas, _("Show Cursor"), &(cfdata->show_cursor));
++   e_widget_on_change_hook_set(ob, _basic_show_cursor_cb_change, cfdata);
++   e_widget_list_object_append(o, ob, 1, 1, 0.5);
++
+    of = e_widget_framelist_add(evas, _("Cursor Settings"), 0);
+    rg = e_widget_radio_group_new(&cfdata->use_e_cursor);
++   cfdata->gui.radio_use_e_cursor = rg;
++
+    ob = e_widget_radio_add(evas, _("Use Enlightenment Cursor"), 1, rg);   
+    e_widget_framelist_object_append(of, ob);
+    ob = e_widget_radio_add(evas, _("Use X Cursor"), 0, rg);   
+@@ -111,9 +145,11 @@ _advanced_apply_data(E_Config_Dialog *cf
+ {
+    int changed = 0;
+    
++   if (e_config->show_cursor != cfdata->show_cursor) changed = 1;
+    if (e_config->use_e_cursor != cfdata->use_e_cursor) changed = 1;
+    if (e_config->cursor_size != cfdata->cursor_size) changed = 1;
+-   
++
++   e_config->show_cursor = cfdata->show_cursor;
+    e_config->use_e_cursor = cfdata->use_e_cursor;
+    if (cfdata->cursor_size <= 0) cfdata->cursor_size = 1;
+    e_config->cursor_size = cfdata->cursor_size;
+@@ -128,6 +164,11 @@ _advanced_apply_data(E_Config_Dialog *cf
+ 	  {
+ 	     E_Manager *man;
+ 	     man = l->data;
++         if (man->pointer && !e_config->show_cursor)
++           {
++               e_pointer_hide(man->pointer);
++               continue;
++           }
+ 	     if (man->pointer) e_object_del(E_OBJECT(man->pointer));
+ 	     man->pointer = e_pointer_window_new(man->root, 1);
+ 	  }	
+@@ -135,6 +176,18 @@ _advanced_apply_data(E_Config_Dialog *cf
+    return 1;
+ }
+ 
++static void
++_advanced_show_cursor_cb_change(void *data, Evas_Object *obj)
++{
++   E_Config_Dialog_Data *cfdata;
++
++   cfdata = data;
++   if (!cfdata) return;
++
++   e_widget_disabled_set(cfdata->gui.radio_use_e_cursor, !cfdata->show_cursor);
++   e_widget_disabled_set(cfdata->gui.slider_cursor_size, !cfdata->show_cursor);
++}
++
+ static Evas_Object *
+ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) 
+ {
+@@ -143,16 +196,27 @@ _advanced_create_widgets(E_Config_Dialog
+       
+    o = e_widget_list_add(evas, 0, 0);
+ 
++   ob = e_widget_check_add(evas, _("Show Cursor"), &(cfdata->show_cursor));
++   e_widget_on_change_hook_set(ob, _advanced_show_cursor_cb_change, cfdata);
++   e_widget_list_object_append(o, ob, 1, 1, 0.5);
++
+    of = e_widget_framelist_add(evas, _("Cursor Settings"), 0);
+    rg = e_widget_radio_group_new(&cfdata->use_e_cursor);
++   cfdata->gui.radio_use_e_cursor = rg;
++
+    ob = e_widget_radio_add(evas, _("Use Enlightenment Cursor"), 1, rg);   
+    e_widget_framelist_object_append(of, ob);
+    ob = e_widget_radio_add(evas, _("Use X Cursor"), 0, rg);   
+    e_widget_framelist_object_append(of, ob);
+    ob = e_widget_label_add(evas, _("Cursor Size"));
+    e_widget_framelist_object_append(of, ob);
++
+    ob = e_widget_slider_add(evas, 1, 0, _("%1.0f pixels"), 8, 128, 4, 0, NULL, &(cfdata->cursor_size), 150);
++   cfdata->gui.slider_cursor_size = ob;
++
+    e_widget_framelist_object_append(of, ob);
++
+    e_widget_list_object_append(o, of, 1, 1, 0.5);   
++
+    return o;
+ }
+Index: e/src/bin/e_pointer.c
+===================================================================
+--- e.orig/src/bin/e_pointer.c
++++ e/src/bin/e_pointer.c
+@@ -94,6 +94,8 @@ e_pointers_size_set(int size)
+ {
+    Evas_List *l;
+ 
++   if (!e_config->show_cursor) return;
++
+    for (l = _e_pointers; l; l = l->next)
+      {
+ 	E_Pointer *p;
+@@ -136,6 +138,13 @@ e_pointers_size_set(int size)
+ }
+ 
+ EAPI void
++e_pointer_hide(E_Pointer *p)
++{
++    if (p->win) ecore_x_window_cursor_set(p->win, 0);
++    if (p->evas) _e_pointer_canvas_del(p);
++}
++
++EAPI void
+ e_pointer_type_push(E_Pointer *p, void *obj, const char *type)
+ {
+    E_Pointer_Stack *stack;
+@@ -199,6 +208,7 @@ EAPI void
+ e_pointer_idler_before(void)
+ {
+    Evas_List *l;
++   if (!e_config->show_cursor) return;
+ 
+    for (l = _e_pointers; l; l = l->next)
+      {
+@@ -305,6 +315,8 @@ _e_pointer_cb_move(void *data, Evas *e _
+    E_Pointer *p;
+    Evas_Coord x, y;
+ 
++   if (!e_config->show_cursor) return;
++
+    p = data;
+    if (!p->e_cursor) return;
+    evas_object_geometry_get(p->hot_object, &x, &y, NULL, NULL);
+@@ -353,6 +365,13 @@ _e_pointer_type_set(E_Pointer *p, const 
+    if (p->type) evas_stringshare_del(p->type);
+    p->type = evas_stringshare_add(type);
+    
++   /* Do not set type if in "hidden mode" */
++   if (!e_config->show_cursor)
++     {
++	ecore_x_window_cursor_set(p->win, 0);
++	return 1;
++     }
++
+    if (p->e_cursor)
+      {
+ 	Evas_Object *o;
+Index: e/src/bin/e_config.h
+===================================================================
+--- e.orig/src/bin/e_config.h
++++ e/src/bin/e_config.h
+@@ -166,6 +166,7 @@ struct _E_Config
+    int         focus_last_focused_per_desktop; // GUI
+    int         focus_revert_on_hide_or_close; // GUI
+    int         pointer_slide; // GUI
++   int         show_cursor; // GUI
+    int         use_e_cursor; // GUI
+    int         cursor_size; // GUI
+    int         menu_autoscroll_margin; // GUI
+Index: e/src/bin/e_pointer.h
+===================================================================
+--- e.orig/src/bin/e_pointer.h
++++ e/src/bin/e_pointer.h
+@@ -42,6 +42,7 @@ struct _E_Pointer
+ EAPI int        e_pointer_init(void);
+ EAPI int        e_pointer_shutdown(void);    
+ EAPI E_Pointer *e_pointer_window_new(Ecore_X_Window win, int filled);
++EAPI void	e_pointer_hide(E_Pointer *p);
+ EAPI void       e_pointer_type_push(E_Pointer *p, void *obj, const char *type);
+ EAPI void       e_pointer_type_pop(E_Pointer *p, void *obj, const char *type);
+ EAPI void       e_pointers_size_set(int size);
diff --git a/recipes/e17/e-wm/disable-splash.patch b/recipes/e17/e-wm/disable-splash.patch
new file mode 100644
index 0000000000..152a0a2895
--- /dev/null
+++ b/recipes/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/recipes/e17/e-wm/enlightenment_start.oe b/recipes/e17/e-wm/enlightenment_start.oe
new file mode 100644
index 0000000000..e5a65025cb
--- /dev/null
+++ b/recipes/e17/e-wm/enlightenment_start.oe
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+E_PROFILE=""
+if [ -r /etc/enlightenment/default_profile ]; then
+  . /etc/enlightenment/default_profile
+fi
+
+renice -10 -p $$
+exec enlightenment_start $E_PROFILE
diff --git a/recipes/e17/e-wm/fix-configure.patch b/recipes/e17/e-wm/fix-configure.patch
new file mode 100644
index 0000000000..13e663949c
--- /dev/null
+++ b/recipes/e17/e-wm/fix-configure.patch
@@ -0,0 +1,14 @@
+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,
+   [
+-    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_ERROR([Cannot find X headers and libraries.])
+   ]
diff --git a/recipes/e17/e-wm/gsm-segfault-fix.patch b/recipes/e17/e-wm/gsm-segfault-fix.patch
new file mode 100644
index 0000000000..0bed84a26e
--- /dev/null
+++ b/recipes/e17/e-wm/gsm-segfault-fix.patch
@@ -0,0 +1,28 @@
+Index: e/src/modules/illume/e_mod_gad_gsm.c
+===================================================================
+--- e/src/modules/illume/e_mod_gad_gsm.c	(revision 37617)
++++ e/src/modules/illume/e_mod_gad_gsm.c	(revision 37618)
+@@ -353,7 +353,7 @@
+ {
+    /* We care only about the provider name right now. All the other status
+     * informations get ingnored for the gadget for now */
+-   const char *provider, *name, *reg_stat;
++   const char *provider = 0 , *name = 0, *reg_stat = 0;
+    DBusMessageIter iter, a_iter, s_iter, v_iter;
+    
+    if (!dbus_message_has_signature(msg, "a{sv}")) return NULL;
+@@ -380,10 +380,13 @@
+ 	dbus_message_iter_next(&a_iter);
+      }
+    
++   if (!reg_stat) return NULL;
+    if (strcmp(reg_stat, "unregistered") == 0) provider = "No Service";
+    else if (strcmp(reg_stat, "busy") == 0) provider = "Searching...";
+    else if (strcmp(reg_stat, "denied") == 0) provider = "SOS only";
+-   
++
++   if (!provider) return NULL;
++
+    return strdup(provider);
+ }
+ 
diff --git a/recipes/e17/e-wm/illume-disable-screensaver.patch b/recipes/e17/e-wm/illume-disable-screensaver.patch
new file mode 100644
index 0000000000..984895cf59
--- /dev/null
+++ b/recipes/e17/e-wm/illume-disable-screensaver.patch
@@ -0,0 +1,13 @@
+Index: e/config/illume/e.src
+===================================================================
+--- e.orig/config/illume/e.src	2009-01-30 23:34:37.000000000 +0100
++++ e/config/illume/e.src	2009-01-30 23:34:54.000000000 +0100
+@@ -665,7 +665,7 @@
+   value "display_res_height" int: 1;
+   value "display_res_hz" int: 0;
+   value "display_res_rotation" int: 0;
+-  value "screensaver_enable" int: 1;
++  value "screensaver_enable" int: 0;
+   value "screensaver_timeout" int: 30;
+   value "screensaver_interval" int: 5;
+   value "screensaver_blanking" int: 2;
diff --git a/recipes/e17/e-wm/pkgconfig-fix.patch b/recipes/e17/e-wm/pkgconfig-fix.patch
new file mode 100644
index 0000000000..9ea929da27
--- /dev/null
+++ b/recipes/e17/e-wm/pkgconfig-fix.patch
@@ -0,0 +1,18 @@
+Index: enlightenment.pc.in
+===================================================================
+--- enlightenment.pc.in.orig	2008-03-28 22:33:51.000000000 +0100
++++ enlightenment.pc.in	2008-03-29 17:22:30.000000000 +0100
+@@ -1,11 +1,12 @@
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ libdir=@libdir@
+-includedir=@includedir@
++includedir=@includedir@/@PACKAGE@
+ 
+ Name: enlightenment
+ Description: Enlightenmnt Window Manager
+ Version: @VERSION@
++Requires: efreet >= 0.0.3.042
+ Libs: @libdir@/@PACKAGE@/modules
+ Libs.private: 
+ Cflags: -I${includedir}
diff --git a/recipes/e17/e-wm/profile-search.patch b/recipes/e17/e-wm/profile-search.patch
new file mode 100644
index 0000000000..7f3e9e2e29
--- /dev/null
+++ b/recipes/e17/e-wm/profile-search.patch
@@ -0,0 +1,41 @@
+? .e_border.c.swn
+? .e_border.c.swo
+? .e_border.c.swp
+? .e_border.h.swp
+? .e_config.c.swp
+? .e_int_menus.c.swp
+? .e_main.c.swp
+? .e_popup.c.swp
+? .e_prefix.c.swp
+? .e_shelf.c.swo
+? .e_shelf.c.swp
+Index: e_config.c
+===================================================================
+RCS file: /var/cvs/e/e17/apps/e/src/bin/e_config.c,v
+retrieving revision 1.282
+diff -u -r1.282 e_config.c
+--- e/src/bin/e_config.c	20 Feb 2008 04:12:58 -0000	1.282
++++ e/src/bin/e_config.c	31 Mar 2008 01:57:00 -0000
+@@ -1827,7 +1827,22 @@
+      {
+ 	data = eet_data_read(ef, edd, "config");
+ 	eet_close(ef);
++        return data;
+      }
++
++   /* fallback to a system directory
++    * FIXME proper $PATH like handling might be wanted
++    */ 
++   snprintf(buf, sizeof(buf), "%s/data/config/%s/%s.cfg",
++	    e_prefix_data_get(), _e_config_profile, domain);
++   ef = eet_open(buf, EET_FILE_MODE_READ);
++   if (ef)
++     {
++	data = eet_data_read(ef, edd, "config");
++	eet_close(ef);
++        return data;
++     }
++
+    return data;
+ }
+ 
diff --git a/recipes/e17/e-wm/set-autoscroll-defaults.patch b/recipes/e17/e-wm/set-autoscroll-defaults.patch
new file mode 100644
index 0000000000..2d24ea69c6
--- /dev/null
+++ b/recipes/e17/e-wm/set-autoscroll-defaults.patch
@@ -0,0 +1,13 @@
+--- enlightenment-0.16.999.032/src/bin/e_config.c~	2006-08-05 10:46:53.000000000 -0700
++++ enlightenment-0.16.999.032/src/bin/e_config.c	2006-08-05 10:43:14.000000000 -0700
+@@ -595,8 +595,8 @@
+    e_config->focus_revert_on_hide_or_close = 1;
+    e_config->use_e_cursor = 1;
+    e_config->cursor_size = 32;
+-   e_config->menu_autoscroll_margin = 0;
+-   e_config->menu_autoscroll_cursor_margin = 1;
++   e_config->menu_autoscroll_margin = 10;
++   e_config->menu_autoscroll_cursor_margin = 10;
+    e_config->transient.move = 1;
+    e_config->transient.resize = 0;
+    e_config->transient.raise = 1;
diff --git a/recipes/e17/e-wm_svn.bb b/recipes/e17/e-wm_svn.bb
new file mode 100644
index 0000000000..e82cf6904e
--- /dev/null
+++ b/recipes/e17/e-wm_svn.bb
@@ -0,0 +1,155 @@
+DESCRIPTION = "The Enlightenment Window Manager Version 17"
+DEPENDS = "eet evas ecore edje efreet edbus"
+LICENSE = "MIT BSD"
+PV = "0.16.999.050+svnr${SRCREV}"
+PR = "r3"
+
+inherit e update-alternatives
+
+RDEPENDS_${PN} += "\
+  shared-mime-info \
+  mime-support \
+  edje-utils \
+  ${PN}-utils \
+"
+
+# Uclibc build don't have 'glibc-utils'
+# I suspect the workaround below breaks eglibc, though. Koen - 20081125
+RDEPENDS_${PN}_append_linux = " glibc-utils "
+RDEPENDS_${PN}_append_linux-gnueabi = " glibc-utils "
+RDEPENDS_${PN}_append_linux-uclibc = " uclibc-utils "
+RDEPENDS_${PN}_append_linux-uclibcgnueabi = " uclibc-utils "
+
+PACKAGES =+ "\
+  ${PN}-config-default \
+  ${PN}-config-illume \
+  ${PN}-config-minimalist \
+  ${PN}-config-netbook \
+  ${PN}-config-scaleable \
+  ${PN}-config-standard \
+  ${PN}-theme-default \
+  ${PN}-theme-illume \
+  ${PN}-background-dark-gradient \
+  ${PN}-background-light-gradient \
+  ${PN}-images \
+  ${PN}-icons \
+  ${PN}-other \
+  ${PN}-input-methods \
+  ${PN}-sysactions \
+  ${PN}-utils \
+"
+
+RRECOMMENDS_${PN} = "\
+  ${PN}-config-default \
+  ${PN}-images \
+  ${PN}-icons \
+  ${PN}-other \
+  ${PN}-input-methods \
+  ${PN}-sysactions \
+"
+
+PACKAGE_ARCH_${PN}-config-default = "all"
+PACKAGE_ARCH_${PN}-config-illume = "all"
+PACKAGE_ARCH_${PN}-config-minimalist = "all"
+PACKAGE_ARCH_${PN}-config-netbook = "all"
+PACKAGE_ARCH_${PN}-config-scaleable = "all"
+PACKAGE_ARCH_${PN}-config-standard = "all"
+PACKAGE_ARCH_${PN}-theme-default = "all"
+PACKAGE_ARCH_${PN}-theme-illume = "all"
+PACKAGE_ARCH_${PN}-background-dark-gradient = "all"
+PACKAGE_ARCH_${PN}-background-light-gradient = "all"
+PACKAGE_ARCH_${PN}-images = "all"
+PACKAGE_ARCH_${PN}-icons = "all"
+PACKAGE_ARCH_${PN}-other = "all"
+PACKAGE_ARCH_${PN}-input-methods = "all"
+PACKAGE_ARCH_${PN}-sysactions = "all"
+
+SRC_URI = "\
+  svn://svn.enlightenment.org/svn/e/trunk;module=e;proto=http \
+  file://enlightenment_start.oe \
+  file://applications.menu \
+  file://gsm-segfault-fix.patch;patch=1;maxrev=37617 \
+"
+
+SRC_URI_append_openmoko = " file://illume-disable-screensaver.patch;patch=1 "
+
+S = "${WORKDIR}/e"
+
+EXTRA_OECONF = "\
+  --with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc \
+  --with-eet-eet=${STAGING_BINDIR_NATIVE}/eet \
+  --x-includes=${STAGING_INCDIR}/X11 \
+  --x-libraries=${STAGING_LIBDIR} \
+  --enable-simple-x11 \
+"
+
+do_configure_prepend() {
+	autopoint
+}
+
+do_stage() {
+    autotools_stage_all
+    for I in `find ${STAGING_LIBDIR}/enlightenment -name "*.la" -print`; do rm -f $I; done
+    for I in `find ${STAGING_LIBDIR}/enlightenment -name "*.a" -print`; do rm -f $I; done
+    for I in `find ${STAGING_LIBDIR_CROSS}/enlightenment -name "*.la" -print`; do rm -f $I; done
+    for I in `find ${STAGING_LIBDIR_CROSS}/enlightenment -name "*.a" -print`; do rm -f $I; done
+}
+
+do_install_append() {
+    # customising - should rather make this simple upstream
+    install -m 755 ${WORKDIR}/enlightenment_start.oe ${D}/${bindir}
+    install -d ${D}/${sysconfdir}/xdg/menus
+    install -m 644 ${WORKDIR}/applications.menu ${D}/${sysconfdir}/xdg/menus/
+    for I in `find ${D}/${libdir}/enlightenment -name "*.a" -print`; do rm -f $I; done
+    for I in `find ${D}/${libdir}/enlightenment -name "*.la" -print`; do rm -f $I; done
+}
+
+FILES_${PN} = "\
+  ${bindir}/* \
+  ${libdir}/enlightenment/modules/*/*.* \
+  ${libdir}/enlightenment/modules/*/*/* \
+  ${datadir}/locale \
+  ${datadir}/enlightenment/data/icons \
+  ${datadir}/enlightenment/data/input_methods \
+  ${datadir}/enlightenment/data/config/profile.cfg \
+  ${datadir}/enlightenment/AUTHORS \
+  ${datadir}/enlightenment/COPYING \
+  ${sysconfdir}/xdg \
+"
+FILES_${PN}-config-default = "${datadir}/enlightenment/data/config/default"
+FILES_${PN}-config-illume = "${datadir}/enlightenment/data/config/illume"
+FILES_${PN}-config-minimalist = "${datadir}/enlightenment/data/config/minimalist"
+FILES_${PN}-config-netbook = "${datadir}/enlightenment/data/config/netbook"
+FILES_${PN}-config-scaleable = "${datadir}/enlightenment/data/config/scaleable"
+FILES_${PN}-config-standard = "${datadir}/enlightenment/data/config/standard"
+FILES_${PN}-theme-default = "${datadir}/enlightenment/data/themes/default.edj"
+FILES_${PN}-theme-illume = "${datadir}/enlightenment/data/themes/illume.edj"
+FILES_${PN}-theme-default = "${datadir}/enlightenment/data/themes/default.edj"
+FILES_${PN}-background-dark-gradient = "${datadir}/enlightenment/data/backgrounds/Dark_Gradient.edj"
+FILES_${PN}-background-light-gradient = "${datadir}/enlightenment/data/backgrounds/Light_Gradient.edj"
+FILES_${PN}-images = "${datadir}/enlightenment/data/images"
+FILES_${PN}-icons = "${datadir}/enlightenment/data/icons"
+FILES_${PN}-other = "${datadir}/enlightenment/data/other"
+FILES_${PN}-input-methods = "${datadir}/enlightenment/data/input_methods"
+FILES_${PN}-sysactions = "${sysconfdir}/enlightenment/sysactions.conf"
+FILES_${PN}-utils = "${libdir}/enlightenment/utils/*"
+
+RRECOMMENDS_${PN}-config-default = "${PN}-theme-default"
+RRECOMMENDS_${PN}-config-illume = "${PN}-theme-illume"
+RRECOMMENDS_${PN}-config-minimalist = "${PN}-background-light-gradient \
+${PN}-theme-default"
+RRECOMMENDS_${PN}-config-netbook = "${PN}-background-dark-gradient \
+${PN}-theme-default"
+RRECOMMENDS_${PN}-config-scaleable = "${PN}-theme-default"
+RRECOMMENDS_${PN}-config-standard = "${PN}-theme-default"
+
+FILES_${PN}-dbg += "\
+  ${libdir}/enlightenment/modules/*/*/.debug/ \
+  ${libdir}/enlightenment/preload/.debug/ \
+"
+CONFFILES_${PN} = "/etc/xdg/menus/applications.menu"
+
+ALTERNATIVE_PATH = "${bindir}/enlightenment_start.oe"
+ALTERNATIVE_NAME = "x-window-manager"
+ALTERNATIVE_LINK = "${bindir}/x-window-manager"
+ALTERNATIVE_PRIORITY = "16"
diff --git a/recipes/e17/edje-editor_svn.bb b/recipes/e17/edje-editor_svn.bb
new file mode 100644
index 0000000000..44e0158d6b
--- /dev/null
+++ b/recipes/e17/edje-editor_svn.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "Edje-Editor is just that."
+SECTION = "x11/devel"
+LICENSE = "MIT BSD"
+DEPENDS = "etk"
+SRCNAME = "edje_editor"
+
+PV = "0.0.0+svnr${SRCREV}"
+PR = "r1"
+
+inherit e
+
+FILES_${PN} += "${datadir}"
diff --git a/recipes/e17/edje-player_svn.bb b/recipes/e17/edje-player_svn.bb
new file mode 100644
index 0000000000..7cddee41a0
--- /dev/null
+++ b/recipes/e17/edje-player_svn.bb
@@ -0,0 +1,14 @@
+DESCRIPTION = "Edje-Player is just that."
+SECTION = "x11/devel"
+LICENSE = "MIT BSD"
+DEPENDS = "etk"
+SRCNAME = "edje_editor"
+PV = "0.0.0+svnr${SRCREV}"
+PR = "r0"
+
+inherit e
+
+SRC_URI = "svn://svn.enlightenment.org/svn/e/trunk/PROTO;module=edje_player;proto=http"
+S = "${WORKDIR}/edje_player"
+
+FILES_${PN} += "${datadir}"
diff --git a/recipes/e17/edje-viewer_svn.bb b/recipes/e17/edje-viewer_svn.bb
new file mode 100644
index 0000000000..bf3ab00e10
--- /dev/null
+++ b/recipes/e17/edje-viewer_svn.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "Edje_Viewer is just that."
+DEPENDS = "etk"
+LICENSE = "MIT BSD"
+PV = "0.0.0+svnr${SRCREV}"
+PR = "r2"
+
+inherit e
+
+SRC_URI = "svn://svn.enlightenment.org/svn/e/trunk;module=edje_viewer;proto=http"
+S = "${WORKDIR}/edje_viewer"
+
+FILES_${PN} += "${datadir}"
diff --git a/recipes/e17/elementary-alarm_svn.bb b/recipes/e17/elementary-alarm_svn.bb
new file mode 100644
index 0000000000..4294f2fad1
--- /dev/null
+++ b/recipes/e17/elementary-alarm_svn.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = "An Elementary based Alarm app"
+LICENSE = "GPL"
+DEPENDS = "elementary"
+SECTION = "x11"
+PV = "0.0.0+svnr${SRCREV}"
+PR = "r1"
+
+inherit e
+
+SRC_URI = "svn://svn.enlightenment.org/svn/e/trunk/TMP/st;module=elementary-alarm;proto=http"
+S = "${WORKDIR}/elementary-alarm"
+
+RDEPENDS = "waker"
+FILES_${PN} += "${bindir}/*"
+FILES_${PN} += "${datadir}/${PN}"
+FILES_${PN} += "${datadir}/icons/*"
+FILES_${PN} += "${datadir}/applications/*"
+FILES_${PN} += "${datadir}/${PN}/sounds/*"
diff --git a/recipes/e17/enna/.mtn2git_empty b/recipes/e17/enna/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/recipes/e17/enna/.mtn2git_empty
diff --git a/recipes/e17/enna_svn.bb b/recipes/e17/enna_svn.bb
new file mode 100644
index 0000000000..d365d63435
--- /dev/null
+++ b/recipes/e17/enna_svn.bb
@@ -0,0 +1,14 @@
+DESCRIPTION = "Enna is a media center application based on EFL"
+LICENSE = "GPL"
+DEPENDS = "curl dbus eet evas edje ecore edbus emotion"
+DEPENDS += "libmusicbrainz lightmediascanner libxml2 taglib"
+SECTION = "x11/multimedia"
+PV = "0.2.0+svnr${SRCREV}"
+PR = "r1"
+
+inherit e
+
+SRC_URI = "svn://svn.enlightenment.org/svn/e/trunk/MISC;module=enna;proto=http"
+S = "${WORKDIR}/enna"
+
+FILES_${PN}-dbg += "${libdir}/${PN}/modules/.debug"
diff --git a/recipes/e17/entrance/Sessions/Enlightenment b/recipes/e17/entrance/Sessions/Enlightenment
new file mode 100644
index 0000000000..61498c2c6c
--- /dev/null
+++ b/recipes/e17/entrance/Sessions/Enlightenment
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+enlightenment_start
diff --git a/recipes/e17/entrance/Sessions/Failsafe b/recipes/e17/entrance/Sessions/Failsafe
new file mode 100644
index 0000000000..cf4fcced12
--- /dev/null
+++ b/recipes/e17/entrance/Sessions/Failsafe
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+rxvt
\ No newline at end of file
diff --git a/recipes/e17/entrance/Xserver.patch b/recipes/e17/entrance/Xserver.patch
new file mode 100644
index 0000000000..296a7bccf4
--- /dev/null
+++ b/recipes/e17/entrance/Xserver.patch
@@ -0,0 +1,22 @@
+--- 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/recipes/e17/entrance/allow-missing-xsession.patch b/recipes/e17/entrance/allow-missing-xsession.patch
new file mode 100644
index 0000000000..e0ebe6e0e9
--- /dev/null
+++ b/recipes/e17/entrance/allow-missing-xsession.patch
@@ -0,0 +1,19 @@
+Index: entrance/configure.ac
+===================================================================
+--- entrance.orig/configure.ac	2009-02-17 10:59:20.000000000 +0000
++++ entrance/configure.ac	2009-02-17 13:09:51.000000000 +0000
+@@ -198,10 +198,10 @@
+ 	    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/recipes/e17/entrance/config-db.patch b/recipes/e17/entrance/config-db.patch
new file mode 100644
index 0000000000..89e18ccff4
--- /dev/null
+++ b/recipes/e17/entrance/config-db.patch
@@ -0,0 +1,118 @@
+Index: entrance/data/config/build_config.sh.in
+===================================================================
+--- entrance.orig/data/config/build_config.sh.in	2009-02-17 10:59:01.000000000 +0000
++++ entrance/data/config/build_config.sh.in	2009-02-17 13:45:06.000000000 +0000
+@@ -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=""
++#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' ..."
++#
++#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' ..."
+ 
+ rm -f $DB || exit 1
+ 
+@@ -59,10 +59,10 @@
+ #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 @@
+ #	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/presel/mode -i 1
+ 
+ # for Entranced
+-ecore_config -c $DB -k /entranced/xserver -s "@xbin@/X -quiet -br -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/recipes/e17/entrance/disable-autodetect.patch b/recipes/e17/entrance/disable-autodetect.patch
new file mode 100644
index 0000000000..a0412b3706
--- /dev/null
+++ b/recipes/e17/entrance/disable-autodetect.patch
@@ -0,0 +1,8 @@
+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/recipes/e17/entrance/fix-auth-mode.patch b/recipes/e17/entrance/fix-auth-mode.patch
new file mode 100644
index 0000000000..46e530b256
--- /dev/null
+++ b/recipes/e17/entrance/fix-auth-mode.patch
@@ -0,0 +1,13 @@
+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/recipes/e17/entrance/run-Xinit.patch b/recipes/e17/entrance/run-Xinit.patch
new file mode 100644
index 0000000000..1d6c2307f7
--- /dev/null
+++ b/recipes/e17/entrance/run-Xinit.patch
@@ -0,0 +1,17 @@
+--- 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/recipes/e17/entrance/set-display-env.patch b/recipes/e17/entrance/set-display-env.patch
new file mode 100644
index 0000000000..37bfc1c2c8
--- /dev/null
+++ b/recipes/e17/entrance/set-display-env.patch
@@ -0,0 +1,11 @@
+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/recipes/e17/entrance/use-bash.patch b/recipes/e17/entrance/use-bash.patch
new file mode 100644
index 0000000000..7dfab83711
--- /dev/null
+++ b/recipes/e17/entrance/use-bash.patch
@@ -0,0 +1,57 @@
+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/recipes/e17/entrance_0.9.0.010.bb b/recipes/e17/entrance_0.9.0.010.bb
new file mode 100644
index 0000000000..f9dd5e49ce
--- /dev/null
+++ b/recipes/e17/entrance_0.9.0.010.bb
@@ -0,0 +1,34 @@
+DESCRIPTION = "Entrance is the Enlightenment login manager"
+LICENSE = "MIT BSD"
+# can also use pam and crypt
+DEPENDS = "evas ecore edje esmart bash keylaunch xserver-common login-manager"
+RDEPENDS += "glibc-gconv-iso8859-1 entrance-themes"
+PR = "r2"
+
+inherit e
+
+SRC_URI += "\
+           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"
+
+S = "${WORKDIR}/entrance"
+
+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/*"
+
+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/recipes/e17/essential-dialer_svn.bb b/recipes/e17/essential-dialer_svn.bb
new file mode 100644
index 0000000000..e0c81293e9
--- /dev/null
+++ b/recipes/e17/essential-dialer_svn.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "Simple Dialer based on Elementary and FSO"
+SECTION = "x11"
+LICENSE = "GPLv2"
+DEPENDS = "ecore edbus elementary libefso"
+PV = "0.0.0+svnr${SRCREV}"
+PR = "r2"
+
+SRC_URI = "svn://svn.om.vptt.ch/trunk/;proto=http;module=essential-dialer"
+S = "${WORKDIR}/essential-dialer"
+
+inherit autotools pkgconfig
diff --git a/recipes/e17/exhibit_svn.bb b/recipes/e17/exhibit_svn.bb
new file mode 100644
index 0000000000..2035bc193e
--- /dev/null
+++ b/recipes/e17/exhibit_svn.bb
@@ -0,0 +1,7 @@
+DESCRIPTION = "Exhibit is the ETK picture viewer"
+LICENSE = "MIT BSD"
+DEPENDS = "evas ecore epsilon edje eet etk efreet"
+PV = "0.1.1+svnr${SRCREV}"
+PR = "r1"
+
+inherit e
diff --git a/recipes/e17/expedite_svn.bb b/recipes/e17/expedite_svn.bb
new file mode 100644
index 0000000000..1337487623
--- /dev/null
+++ b/recipes/e17/expedite_svn.bb
@@ -0,0 +1,27 @@
+DESCRIPTION = "Expedite is a comprehensive benchmarking suite for Evas"
+DEPENDS = "eet evas"
+RDEPENDS = "libevas-engine-buffer libevas-engine-fb libevas-engine-software-generic libevas-engine-software-x11 libevas-loader-png"
+LICENSE = "MIT BSD"
+PV = "0.6.0+svnr${SRCREV}"
+PR = "r0"
+
+inherit e
+
+EXTRA_OECONF = "\
+  --x-includes=${STAGING_INCDIR}/X11 \
+  --x-libraries=${STAGING_LIBDIR} \
+  --enable-simple-x11 \
+\
+  --disable-opengl-glew \
+  --disable-opengl-x11 \
+  --enable-software-x11 \
+  --enable-xrender-x11 \
+  --enable-software-16-x11 \
+  --enable-fb \
+  --disable-software-ddraw \
+  --disable-software-16-ddraw \
+  --disable-direct3d \
+  --disable-software-sdl \
+"
+
+FILES_${PN} += "${datadir}"
diff --git a/recipes/e17/exquisite-theme-illume.bb b/recipes/e17/exquisite-theme-illume.bb
new file mode 100644
index 0000000000..242ef5a3bf
--- /dev/null
+++ b/recipes/e17/exquisite-theme-illume.bb
@@ -0,0 +1,31 @@
+DDESCRIPTION = "A theme for exquisite"
+HOMEPAGE = "http://www.enlightenment.org"
+LICENSE = "MIT/BSD"
+SECTION = "x11"
+PV = "1.0+svnr${SRCREV}"
+PR = "r6"
+
+inherit update-alternatives
+
+ALTERNATIVE_NAME = "exquisite-config"
+ALTERNATIVE_LINK = "${sysconfdir}/exquisite/config"
+ALTERNATIVE_PATH = "${sysconfdir}/exquisite/config-illume"
+ALTERNATIVE_PRIORITY = "10"
+
+SRC_URI = "svn://svn.enlightenment.org/svn/e/trunk;module=THEMES/b_and_w;proto=http"
+S = "${WORKDIR}/THEMES/b_and_w"
+
+do_compile() {
+   edje_cc exquisite.edc illume.edj
+}
+
+do_install() {
+    install -d ${D}${sysconfdir}/exquisite
+    install -d ${D}${datadir}/exquisite/data/themes
+    install -m 0644 ${S}/illume.edj ${D}${datadir}/exquisite/data/themes/
+    echo 'THEME="-t illume"' > ${D}${sysconfdir}/exquisite/config-illume
+}
+
+PACKAGE_ARCH = "all"
+CONFFILES_${PN} = "${sysconfdir}/exquisite/config-illume"
+FILES_${PN} = "${sysconfdir}/exquisite ${datadir}/exquisite/data/themes"
diff --git a/recipes/e17/exquisite/exquisite-init b/recipes/e17/exquisite/exquisite-init
new file mode 100644
index 0000000000..1750184842
--- /dev/null
+++ b/recipes/e17/exquisite/exquisite-init
@@ -0,0 +1,40 @@
+#!/bin/sh
+
+for x in $(cat /proc/cmdline); do
+  case $x in
+    splash=false)
+      echo "Splash Disabled"
+      exit 0;
+      ;;
+  esac
+done
+
+. /etc/init.d/functions
+
+### Default config here - gets overriden later
+THEME="-t default"
+FPS="-fps 30"
+### Override config - if there is a config file - load it.
+if test -f /etc/exquisite/config; then
+  . /etc/exquisite/config
+fi
+
+args=''
+case `machine_id` in
+  "hp_ipaq_h3100"|"hp_ipaq_h3800")
+     args='-rot 90' ;;
+  "hp_ipaq_3600"|"hp_ipaq_3700"|"hp_ipaq_h3900"|"htc_universal"|*collie|*poodle|*akita|*spitz|*borzoi)
+     args='-rot 270' ;;
+esac
+args=$args" $FPS $THEME"
+
+export EXDIR=/mnt/.exquisite
+export EXQUISITE_IPC=$EXDIR/exquisite
+mount tmpfs -t tmpfs $EXDIR -o,size=40k
+exquisite -fb -fs $args &
+
+exquisite-write -wait 40
+exquisite-write "PULSATE"
+
+# kill off exquisite in 300 seconds if its not gone yet
+(sleep 300; exquisite-write "QUIT")&
diff --git a/recipes/e17/exquisite_svn.bb b/recipes/e17/exquisite_svn.bb
new file mode 100644
index 0000000000..e303600d58
--- /dev/null
+++ b/recipes/e17/exquisite_svn.bb
@@ -0,0 +1,33 @@
+DESCRIPTION = "A psplash replacement for display"
+LICENSE = "MIT BSD"
+DEPENDS = "eet evas ecore embryo edje"
+PV = "0.0.1+svnr${SRCREV}"
+PR = "r3"
+RDEPENDS = "initscripts"
+RRECOMMENDS_${PN} = "exquisite-themes"
+
+SRCNAME = "exquisite"
+
+inherit e
+
+EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc"
+
+SRC_URI += "file://exquisite-init"
+
+inherit update-rc.d
+
+do_install_prepend() {
+  install -d ${D}/mnt/.exquisite/
+  install -d ${D}${sysconfdir}/init.d/
+  install -m 0755 ${WORKDIR}/exquisite-init ${D}${sysconfdir}/init.d/exquisite
+}
+
+
+do_install_append() {
+  rm -rf ${D}${datadir}/exquisite/data/fonts/*
+}
+
+INITSCRIPT_NAME = "exquisite"
+INITSCRIPT_PARAMS = "start 01 S . stop 20 0 1 6 ."
+
+FILES_${PN} += "/mnt/.exquisite/"
diff --git a/recipes/e17/flame_svn.bb b/recipes/e17/flame_svn.bb
new file mode 100644
index 0000000000..2a4f82ed33
--- /dev/null
+++ b/recipes/e17/flame_svn.bb
@@ -0,0 +1,12 @@
+LICENSE = "MIT"
+PV = "0.0.3+svnr${SRCREV}"
+
+require e-module.inc
+
+do_configure_prepend() {
+    sed -i -e /po/d configure.ac
+    sed -i -e s:\ po::g Makefile.am
+}
+
+
+
diff --git a/recipes/e17/illume/gsm-segfault.patch b/recipes/e17/illume/gsm-segfault.patch
new file mode 100644
index 0000000000..f9fc2645b6
--- /dev/null
+++ b/recipes/e17/illume/gsm-segfault.patch
@@ -0,0 +1,27 @@
+Index: illume/src/e_mod_gad_gsm.c
+===================================================================
+--- illume.orig/src/e_mod_gad_gsm.c	2008-11-10 16:15:08.000000000 +0000
++++ illume/src/e_mod_gad_gsm.c	2008-11-10 16:16:23.000000000 +0000
+@@ -357,7 +357,7 @@
+ {
+    /* We care only about the provider name right now. All the other status
+     * informations get ingnored for the gadget for now */
+-   const char *provider, *name, *reg_stat;
++   const char *provider = 0 , *name = 0, *reg_stat = 0;
+    DBusMessageIter iter, a_iter, s_iter, v_iter;
+    
+    if (!dbus_message_has_signature(msg, "a{sv}")) return NULL;
+@@ -384,10 +384,13 @@
+ 	dbus_message_iter_next(&a_iter);
+      }
+    
++   if (!reg_stat) return NULL;
+    if (strcmp(reg_stat, "unregistered") == 0) provider = "No Service";
+    else if (strcmp(reg_stat, "busy") == 0) provider = "Searching...";
+    else if (strcmp(reg_stat, "denied") == 0) provider = "SOS only";
+    
++   if (!provider) return NULL;
++
+    return strdup(provider);
+ }
+ 
diff --git a/recipes/e17/news_svn.bb b/recipes/e17/news_svn.bb
new file mode 100644
index 0000000000..daef22a0f4
--- /dev/null
+++ b/recipes/e17/news_svn.bb
@@ -0,0 +1,12 @@
+LICENSE = "MIT"
+PV = "0.1.0+svnr${SRCREV}"
+
+require e-module.inc
+
+do_configure_prepend() {
+	sed -i -e /po/d configure.ac 
+	sed -i -e s:\ po::g Makefile.am
+}
+
+
+
diff --git a/recipes/e17/places_svn.bb b/recipes/e17/places_svn.bb
new file mode 100644
index 0000000000..9d0090dd36
--- /dev/null
+++ b/recipes/e17/places_svn.bb
@@ -0,0 +1,17 @@
+LICENSE = "GPLv3 LGPLv3"
+PV = "0.1.0+svnr${SRCREV}"
+
+PR = "r1"
+
+require e-module.inc
+
+# Calls /usr/bin/eject for media
+RRECOMMENDS_${PN} += "eject"
+
+do_configure_prepend() {
+	sed -i -e /po/d configure.ac 
+	sed -i -e s:\ po::g Makefile.am
+}
+
+
+
diff --git a/recipes/e17/rage_svn.bb b/recipes/e17/rage_svn.bb
new file mode 100644
index 0000000000..526744e681
--- /dev/null
+++ b/recipes/e17/rage_svn.bb
@@ -0,0 +1,9 @@
+DESCRIPTION = "Rage is a media center application based on EFL"
+AUTHOR = "Carsten 'The Rasterman' Haitzler"
+HOMEPAGE = "http://www.rasterman.com"
+LICENSE = "MIT BSD"
+DEPENDS = "evas ecore edje"
+SECTION = "x11/multimedia"
+PV = "0.3.0.042+svnr${SRCREV}"
+
+inherit e
diff --git a/recipes/e17/rain_svn.bb b/recipes/e17/rain_svn.bb
new file mode 100644
index 0000000000..a3e58de299
--- /dev/null
+++ b/recipes/e17/rain_svn.bb
@@ -0,0 +1,12 @@
+LICENSE = "MIT"
+PV = "0.0.3+svnr${SRCREV}"
+
+require e-module.inc
+
+do_configure_prepend() {
+	sed -i -e /po/d configure.ac 
+	sed -i -e s:\ po::g Makefile.am
+}
+
+
+
diff --git a/recipes/e17/waker_svn.bb b/recipes/e17/waker_svn.bb
new file mode 100644
index 0000000000..aba6187ad4
--- /dev/null
+++ b/recipes/e17/waker_svn.bb
@@ -0,0 +1,14 @@
+DESCRIPTION = "An EFL base at/alarm wakeup daemon"
+LICENSE = "LGPL"
+DEPENDS = "ecore edbus"
+SECTION = "console"
+PV = "0.0.0+svnr${SRCREV}"
+PR = "r1"
+
+inherit efl
+
+SRC_URI = "svn://svn.enlightenment.org/svn/e/trunk/TMP/st;module=waker;proto=http"
+S = "${WORKDIR}/waker"
+
+FILES_${PN} += "${bindir}/* ${libdir}/lib*.so.*"
+FILES_${PN} += "/etc/X11/Xsession.d/80x-enlightenment-wakerd"