propagate from branch 'org.openembedded.dev' (head ff70c4efdf949524471cddabffb7d724440d81d2)

            to branch 'org.openembedded.nslu2-linux' (head 7305e5331bf9bfa1cfc3616899548b90034a3ae3)

13 files changed, 225 insertions, 11 deletions

diff --git a/packages/e17/e-iconbar_20050810.bb b/packages/e17/e-iconbar_20050810.bb
index 0d3c14cc06..9eae8a37b2 100644
--- a/packages/e17/e-iconbar_20050810.bb
+++ b/packages/e17/e-iconbar_20050810.bb
@@ -13,4 +13,4 @@ inherit autotools
 
 EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR}/edje_cc"
 
-FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} /etc/* /usr/sbin/*"
+FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir} ${sbindir}"
diff --git a/packages/e17/e-modules_20050810.bb b/packages/e17/e-modules_20050810.bb
new file mode 100644
index 0000000000..1764c21450
--- /dev/null
+++ b/packages/e17/e-modules_20050810.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "Enlightenment Window Manager Extra Modules"
+DEPENDS = "virtual/ecore virtual/evas esmart edje eet e"
+LICENSE = "MIT"
+SECTION = "e/apps"
+MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
+CVSDATE = "${PV}"
+PR = "r0"
+
+inherit autotools
+
+SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/apps/e_modules"
+S = "${WORKDIR}/e_modules"
+
+EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR}/edje_cc"
+
+FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir}"
diff --git a/packages/e17/e-utils_20050810.bb b/packages/e17/e-utils_20050810.bb
index 273c7622e6..00fa240264 100644
--- a/packages/e17/e-utils_20050810.bb
+++ b/packages/e17/e-utils_20050810.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Enlightenment Window Manager Utilities"
-DEPENDS = "freetype eet evas-x11 ecore-x11 edje engrave esmart epsilon ewl imlib2-x11 e17"
+DEPENDS = "virtual/ecore virtual/evas esmart edje eet ewl engrave virtual/imlib2 e epsilon"
 LICENSE = "MIT"
 SECTION = "e/apps"
 MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
diff --git a/packages/e17/e-wm/fudge_screen_edges_for_menu.patch b/packages/e17/e-wm/fudge_screen_edges_for_menu.patch
new file mode 100644
index 0000000000..c203fd4ae0
--- /dev/null
+++ b/packages/e17/e-wm/fudge_screen_edges_for_menu.patch
@@ -0,0 +1,29 @@
+--- e/src/bin/e_menu.c.~1.38.~	2005-07-25 02:55:44.000000000 -0700
++++ e/src/bin/e_menu.c	2005-08-11 15:36:23.000000000 -0700
+@@ -1968,22 +1968,22 @@
+ 	E_Menu *m;
+ 
+ 	m = l->data;
+-	if (m->cur.x < m->zone->x)
++	if (m->cur.x < m->zone->x + 5)
+ 	  {
+ 	     i = m->zone->x - m->cur.x;
+ 	     if (i > outl) outl = i;
+ 	  }
+-	if (m->cur.y < m->zone->y)
++	if (m->cur.y < m->zone->y + 5)
+ 	  {
+ 	     i = m->zone->y - m->cur.y;
+ 	     if (i > outt) outt = i;
+ 	  }
+-	if ((m->cur.x + m->cur.w) > (m->zone->w))
++	if ((m->cur.x + m->cur.w) > (m->zone->w - 5))
+ 	  {
+ 	     i = m->cur.x + m->cur.w - (m->zone->x + m->zone->w);
+ 	     if (i > outr) outr = i;
+ 	  }
+-	if ((m->cur.y + m->cur.h) > (m->zone->h))
++	if ((m->cur.y + m->cur.h) > (m->zone->h - 5))
+ 	  {
+ 	     i = m->cur.y + m->cur.h - (m->zone->y + m->zone->h);
+ 	     if (i > outb) outb = i;
diff --git a/packages/e17/e-wm_20050810.bb b/packages/e17/e-wm_20050810.bb
index 2f6b3c3443..180f2f8c86 100644
--- a/packages/e17/e-wm_20050810.bb
+++ b/packages/e17/e-wm_20050810.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "E17 - the Enlightenment Window Mananger"
-DEPENDS = "freetype eet evas-x11 ecore-x11 embryo imlib2-x11 edje-native e"
+DEPENDS = "evas-x11 ecore-x11 edje eet embryo e"
 LICENSE = "MIT"
 SECTION = "e/apps"
 MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
@@ -7,7 +7,8 @@ CVSDATE = "${PV}"
 PR = "r0"
 
 SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/apps/e \
-           file://fix-configure.patch;patch=1"
+           file://fix-configure.patch;patch=1 \
+           file://fudge_screen_edges_for_menu.patch;patch=1"
 S = "${WORKDIR}/e"
 
 inherit autotools
diff --git a/packages/e17/eclair_20050810.bb b/packages/e17/eclair_20050810.bb
new file mode 100644
index 0000000000..ba1e8fb10d
--- /dev/null
+++ b/packages/e17/eclair_20050810.bb
@@ -0,0 +1,20 @@
+DESCRIPTION = "Eclair is the E17 multi media player"
+SECTION = "e/apps"
+DEPENDS = "freetype eet virtual/evas virtual/ecore embryo virtual/imlib2 edje-native edje emotion libxml2 sqlite3 taglibc"
+LICENSE = "MIT"
+HOMEPAGE = "http://www.enlightenment.org"
+MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
+CVSDATE = "${PV}"
+PR = "r0"
+
+SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/apps/eclair"
+S = "${WORKDIR}/eclair"
+
+inherit autotools
+
+BROKEN = "1"
+
+EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR}/edje_cc"
+
+FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir} ${sbindir}"
+
diff --git a/packages/e17/engage_20050810.bb b/packages/e17/engage_20050810.bb
new file mode 100644
index 0000000000..e8f9467239
--- /dev/null
+++ b/packages/e17/engage_20050810.bb
@@ -0,0 +1,21 @@
+DESCRIPTION = "Engage is the E17 icon dock"
+DEPENDS = "esmart virtual/imlib2 edje virtual/ecore virtual/evas ewl e-wm"
+LICENSE = "MIT"
+SECTION = "e"
+MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
+PR = "r0"
+
+SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=misc/engage"
+S = "${WORKDIR}/engage"
+
+inherit autotools pkgconfig binconfig
+
+EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR}/edje_cc"
+
+do_prepsources () {
+  make clean distclean || true
+}
+addtask prepsources after do_fetch before do_unpack
+
+FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir} ${sbindir}"
+
diff --git a/packages/e17/entice_20050810.bb b/packages/e17/entice_20050810.bb
index fc4d8c51af..667d3f4da8 100644
--- a/packages/e17/entice_20050810.bb
+++ b/packages/e17/entice_20050810.bb
@@ -1,6 +1,7 @@
-DESCRIPTION = "Entice is a picture viewer"
+DESCRIPTION = "Entice is the E17 picture viewer"
 SECTION = "e/apps"
-DEPENDS = "freetype eet virtual/evas virtual/ecore embryo virtual/imlib2 edje-native"
+# can also depend on GIMP for editing
+DEPENDS = "virtual/evas edb virtual/ecore edje"
 LICENSE = "MIT"
 HOMEPAGE = "http://www.enlightenment.org"
 MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
@@ -14,5 +15,5 @@ inherit autotools
 
 EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR}/edje_cc"
 
-FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} /etc/* /usr/sbin/*"
+FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir} ${sbindir}"
 
diff --git a/packages/e17/entrance/Xserver.patch b/packages/e17/entrance/Xserver.patch
new file mode 100644
index 0000000000..296a7bccf4
--- /dev/null
+++ b/packages/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/packages/e17/entrance/allow-missing-xsession.patch b/packages/e17/entrance/allow-missing-xsession.patch
new file mode 100644
index 0000000000..c475e46fe2
--- /dev/null
+++ b/packages/e17/entrance/allow-missing-xsession.patch
@@ -0,0 +1,19 @@
+--- entrance/configure.in.~1.42.~	2005-07-29 23:15:58.000000000 -0700
++++ entrance/configure.in	2005-08-13 03:11:41.000000000 -0700
+@@ -190,11 +190,11 @@
+ 	    fi
+ 	]
+ )
+-if test ! -x $xsession ; then
+-    AC_MSG_WARN([** no $xsession file on this system **])
+-    AC_MSG_WARN([** Perhaps you need to specify --with-xsession **])
+-    xsession="You should reconfigure --with-xsession"
+-fi
++#if test ! -x $xsession ; then
++#    AC_MSG_WARN([** no $xsession file on this system **])
++#    AC_MSG_WARN([** Perhaps you need to specify --with-xsession **])
++#    xsession="You should reconfigure --with-xsession"
++#fi
+ 
+ AC_DEFINE_UNQUOTED(ENTRANCE_XSESSION, "$xsession", [Xsession script])
+ AC_SUBST(xsession)
diff --git a/packages/e17/entrance/config-db.patch b/packages/e17/entrance/config-db.patch
new file mode 100644
index 0000000000..5e965057ba
--- /dev/null
+++ b/packages/e17/entrance/config-db.patch
@@ -0,0 +1,56 @@
+--- entrance/data/config/build_config.sh.in~	2005-08-13 02:56:11.000000000 -0700
++++ entrance/data/config/build_config.sh.in	2005-08-13 02:56:35.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
+ 
+ # uncomment the below to enable experimental OpenGL hardware acceleration
+ #edb_ed $DB add /entrance/engine int 1
+@@ -25,25 +25,25 @@
+ 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/7/title str "Failsafe"
+-edb_ed $DB add /entrance/session/7/icon str "failsafe.png"
++edb_ed $DB add /entrance/session/1/session str "/etc/X11/Session/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/2/session str "/etc/X11/Session/GPE"
++edb_ed $DB add /entrance/session/2/title str "GPE"
++edb_ed $DB add /entrance/session/2/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/3/session str "/etc/X11/Session/Failsafe"
++edb_ed $DB add /entrance/session/3/title str "Failsafe"
++edb_ed $DB add /entrance/session/3/icon str "failsafe.png"
+ edb_ed $DB add /entrance/system/reboot int 1
+ edb_ed $DB add /entrance/system/halt int 1
+ edb_ed $DB add /entrance/user/remember int 1
diff --git a/packages/e17/entrance_20050810.bb b/packages/e17/entrance_20050810.bb
index afc0e82825..251698c233 100644
--- a/packages/e17/entrance_20050810.bb
+++ b/packages/e17/entrance_20050810.bb
@@ -1,16 +1,24 @@
-DESCRIPTION = "Entrace is the Enlightenment login manager for X11"
+DESCRIPTION = "Entrace is the Enlightenment login manager"
 SECTION = "e/apps"
 LICENSE = "MIT"
-DEPENDS = "ecore-x11 edje-native embryo-native esmart"
+# can also use pam and crypt
+DEPENDS = "edb evas-x11 ecore-x11 edje esmart"
+RDEPENDS += "bash"
 HOMEPAGE = "http://www.enlightenment.org"
 MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
 CVSDATE = "${PV}"
+PR = "r0"
 
 SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/apps/entrance \
-           file://longer-sleep.patch;patch=1"
+           file://longer-sleep.patch;patch=1 \
+           file://Xserver.patch;patch=1 \
+           file://config-db.patch;patch=1 \
+           file://allow-missing-xsession.patch;patch=1"
 S = "${WORKDIR}/entrance"
 
 inherit autotools
 
-EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR}/edje_cc"
+EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR}/edje_cc \
+                --with-xsession=/etc/X11/Xsession"
 
+FILES += "${datadir}"
\ No newline at end of file
diff --git a/packages/e17/examine_20050810.bb b/packages/e17/examine_20050810.bb
new file mode 100644
index 0000000000..6e79fd946f
--- /dev/null
+++ b/packages/e17/examine_20050810.bb
@@ -0,0 +1,21 @@
+DESCRIPTION = "examine, the program configurator"
+DEPENDS = "virtual/ecore ewl"
+LICENSE = "MIT"
+SECTION = "e"
+MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
+PR = "r0"
+CVSDATE = "${PV}"
+
+SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/apps/examine"
+S = "${WORKDIR}/examine"
+
+EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR}/edje_cc"
+
+inherit autotools pkgconfig binconfig
+
+do_prepsources () {
+  make clean distclean || true
+}
+addtask prepsources after do_fetch before do_unpack
+
+FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir} ${sbindir}"