merge of 2b96ead32d1d5f15cc59a0f801a519f3bf4644cf

     and d34b6f078abca855ff8e570f35e7de8c121eebd0

23 files changed, 93 insertions, 33 deletions

diff --git a/classes/efl.bbclass b/classes/efl.bbclass
index f160ee8a90..752881314d 100644
--- a/classes/efl.bbclass
+++ b/classes/efl.bbclass
@@ -8,6 +8,11 @@ S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit autotools pkgconfig binconfig
 
+do_prepsources () {
+  make clean distclean || true
+}
+addtask prepsources after do_fetch before do_unpack
+
 INHIBIT_AUTO_STAGE_INCLUDES  = "1"
 INHIBIT_NATIVE_STAGE_INSTALL = "1"
 
@@ -42,11 +47,30 @@ do_stage_append () {
 	do
 		install -m 0644 ${libdirectory}/$i ${STAGING_INCDIR}
 	done
+
+	# Install binaries automatically for native builds
+	if [ "${@binconfig_suffix(d)}" = "-native" ]
+	then
+
+		# Most EFL binaries start with the package name
+		for i in src/bin/${SRCNAME}*
+		do
+			if [ -x $i -a -f $i ]
+			then
+
+				# Don't install anything with an extension (.so, etc)
+				if echo $i | grep -v \\.
+				then
+					${HOST_SYS}-libtool --mode=install install -m 0755 $i ${STAGING_BINDIR}
+				fi
+			fi
+		done
+	fi
 }
 
 PACKAGES = "${SRCNAME}-dev ${SRCNAME}-examples ${SRCNAME}-themes ${SRCNAME}"
 FILES_${SRCNAME} = "${libdir}"
-FILES_${SRCNAME}-theme = "${datadir}/${SRCNAME}/themes"
-FILES_${SRCNAME}-dev += "${bindir}/${SRCNAME}-config ${libdir}/pkgconfig"
+FILES_${SRCNAME}-theme = "${datadir}/${SRCNAME}/themes ${datadir}/${SRCNAME}/data ${datadir}/${SRCNAME}/fonts ${datadir}/${SRCNAME}/pointers ${datadir}/${SRCNAME}/images ${datadir}/${SRCNAME}/users ${datadir}/${SRCNAME}/images ${datadir}/${SRCNAME}/styles"
+FILES_${SRCNAME}-dev += "${bindir}/${SRCNAME}-config ${libdir}/pkgconfig ${datadir}/${SRCNAME}/include"
 FILES_${SRCNAME}-examples = "${bindir} ${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..b5b137eb16 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 = "virtual/evas virtual/ecore 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/entice_20050810.bb b/packages/e17/entice_20050810.bb
index fc4d8c51af..ac454e7189 100644
--- a/packages/e17/entice_20050810.bb
+++ b/packages/e17/entice_20050810.bb
@@ -1,6 +1,7 @@
 DESCRIPTION = "Entice is a 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>"
diff --git a/packages/e17/entrance_20050810.bb b/packages/e17/entrance_20050810.bb
index afc0e82825..471b7d31bb 100644
--- a/packages/e17/entrance_20050810.bb
+++ b/packages/e17/entrance_20050810.bb
@@ -1,7 +1,8 @@
-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 virtual/evas virtual/ecore edje esmart"
 HOMEPAGE = "http://www.enlightenment.org"
 MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
 CVSDATE = "${PV}"
diff --git a/packages/efl/e_20050810.bb b/packages/efl/e_20050810.bb
index 3451bd8d64..be10a5553a 100644
--- a/packages/efl/e_20050810.bb
+++ b/packages/efl/e_20050810.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Enlightenment Window Mananger Library"
-DEPENDS = "freetype eet evas-x11 ecore-x11 embryo imlib2-x11 edje-native edje"
+DEPENDS = "virtual/evas virtual/ecore edje eet embryo"
 LICENSE = "MIT"
 CVSDATE = "${PV}"
 PR = "r0"
diff --git a/packages/efl/ecore-native_0.9.9.013.bb b/packages/efl/ecore-native_0.9.9.013.bb
index 30b6f78370..6968415d34 100644
--- a/packages/efl/ecore-native_0.9.9.013.bb
+++ b/packages/efl/ecore-native_0.9.9.013.bb
@@ -1,3 +1,3 @@
 include ecore-fb_${PV}.bb
 inherit native
-DEPENDS = "curl-native edb-native eet-native evas-native freetype-native"
+DEPENDS = "curl-native eet-native evas-native"
diff --git a/packages/efl/ecore.inc b/packages/efl/ecore.inc
index 38c64e4615..ecd5fef642 100644
--- a/packages/efl/ecore.inc
+++ b/packages/efl/ecore.inc
@@ -3,7 +3,8 @@ foundation libraries. It makes makes doing selections, drag and drop, event loop
 timeouts and idle handlers fast, optimized, and convenient."
 LEAD_SONAME = "libecore.so"
 LICENSE = "MIT"
-DEPENDS = "curl edb eet virtual/evas freetype edb-native"
+# can also have openssl, dbus
+DEPENDS = "virtual/evas curl eet"
 
 inherit efl
 
diff --git a/packages/efl/edb-native_1.0.5.004.bb b/packages/efl/edb-native_1.0.5.004.bb
index 234b0e05e5..d83a3b77c6 100644
--- a/packages/efl/edb-native_1.0.5.004.bb
+++ b/packages/efl/edb-native_1.0.5.004.bb
@@ -2,6 +2,8 @@ include edb_${PV}.bb
 inherit native
 DEPENDS = "zlib-native"
 
+EXTRA_OECONF += "--disable-gtk --disable-ncurses"
+
 do_stage_append () {
 	install -m 0755 tools/.libs/edb_ed ${STAGING_BINDIR}
 }
diff --git a/packages/efl/edb_1.0.5.004.bb b/packages/efl/edb_1.0.5.004.bb
index 2dace0cb07..0a04a42844 100644
--- a/packages/efl/edb_1.0.5.004.bb
+++ b/packages/efl/edb_1.0.5.004.bb
@@ -1,12 +1,10 @@
 DESCRIPTION = "EDB is a database convenience library wrapped around the \
 Berkeley DB 2.7.7 by Sleepycat Software."
-DEPENDS = "zlib"
+DEPENDS = "zlib ncurses gtk+"
 LICENSE = "BSD"
 PR = "r0"
 
 inherit efl
 
-EXTRA_OECONF = "--disable-gtk --disable-ncurses"
-
 libdirectory = "src"
 
diff --git a/packages/efl/edje-native_0.5.0.013.bb b/packages/efl/edje-native_0.5.0.013.bb
index 8f15b4edab..d09bc2aaf0 100644
--- a/packages/efl/edje-native_0.5.0.013.bb
+++ b/packages/efl/edje-native_0.5.0.013.bb
@@ -1,6 +1,6 @@
 include edje_${PV}.bb
 inherit native
-DEPENDS = "freetype-native evas-native ecore-native embryo-native eet-native edb-native imlib2-native"
+DEPENDS = "evas-native ecore-native eet-native embryo-native imlib2-native"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/edje"
 
 EXTRA_OECONF = "--with-fb-only \
@@ -15,8 +15,8 @@ do_configure_prepend() {
 }
 
 do_stage_append() {
-	for i in ${BINARIES}
-	do
-		${HOST_SYS}-libtool --mode=install install -m 0755 src/bin/$i ${STAGING_BINDIR}
-	done
+	edje_data_dir=`${STAGING_BINDIR}/edje-config-native --datadir`
+	# could also use ${STAGING_DATADIR}/edje/include
+	install -d $edje_data_dir/include
+	install -m 0644 data/include/edje.inc $edje_data_dir/include
 }
diff --git a/packages/efl/edje_0.5.0.013.bb b/packages/efl/edje_0.5.0.013.bb
index 40c2002860..5cab345943 100644
--- a/packages/efl/edje_0.5.0.013.bb
+++ b/packages/efl/edje_0.5.0.013.bb
@@ -1,13 +1,13 @@
 DESCRIPTION = "Edje is a complex graphical design & layout library."
-DEPENDS = "freetype virtual/evas virtual/ecore embryo eet edb edje-native"
+# can also install vim data files
+DEPENDS = "virtual/evas virtual/ecore eet embryo edje-native virtual/imlib2"
 LICENSE = "MIT"
 PR = "r0"
 
 inherit efl
 
-EXTRA_OECONF = "--disable-edje-cc --enable-fb-only"
 LEAD_SONAME = "libedje.so"
 
-libraries += "libedje_edit"
+FILES_${PN}-dev += "${bindir}"
 
-BINARIES = "edje edje_ls edje_test edje_cc edje_decc edje_thumb"
+RDEPENDS_${PN}-dev += "cpp"
\ No newline at end of file
diff --git a/packages/efl/embryo-native_0.9.1.013.bb b/packages/efl/embryo-native_0.9.1.013.bb
index ba24e954bc..a33adb7bd2 100644
--- a/packages/efl/embryo-native_0.9.1.013.bb
+++ b/packages/efl/embryo-native_0.9.1.013.bb
@@ -2,5 +2,6 @@ include embryo_${PV}.bb
 inherit native
 
 do_stage_append() {
-	${HOST_SYS}-libtool --mode=install install -m 0755 src/bin/embryo_cc ${STAGING_BINDIR}
-}
+	install -d ${STAGING_DATADIR}/embryo/include
+	install -m 0644 include/default.inc ${STAGING_DATADIR}/embryo/include
+}
\ No newline at end of file
diff --git a/packages/efl/embryo_0.9.1.013.bb b/packages/efl/embryo_0.9.1.013.bb
index ee193e5c4d..54f3ddabad 100644
--- a/packages/efl/embryo_0.9.1.013.bb
+++ b/packages/efl/embryo_0.9.1.013.bb
@@ -7,4 +7,3 @@ LICENSE = "MIT"
 PR = "r0"
 
 inherit efl
-
diff --git a/packages/efl/emotion_0.0.1.004.bb b/packages/efl/emotion_0.0.1.004.bb
index 9fe32ce26b..5ca5214b94 100644
--- a/packages/efl/emotion_0.0.1.004.bb
+++ b/packages/efl/emotion_0.0.1.004.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Emotion is a multimedia library based on libxine"
 LICENSE = "MIT"
-DEPENDS = "libxine"
+DEPENDS = "eet virtual/evas edje virtual/ecore embryo libxine"
 
 inherit efl
diff --git a/packages/efl/engrave_20050810.bb b/packages/efl/engrave_20050810.bb
index 13e68259a9..8ee284fb19 100644
--- a/packages/efl/engrave_20050810.bb
+++ b/packages/efl/engrave_20050810.bb
@@ -1,6 +1,7 @@
 DESCRIPTION = "Engrave is an Edje Editing Library"
 LICENSE = "MIT"
-DEPENDS = "jpeg edb ecore-x11 evas-x11 edje imlib2-x11"
+# also requires yacc and lex on host
+DEPENDS = "virtual/evas virtual/ecore"
 
 inherit efl
 
diff --git a/packages/efl/epsilon_0.3.0.004.bb b/packages/efl/epsilon_0.3.0.004.bb
index d8dc08e11f..ab19043550 100644
--- a/packages/efl/epsilon_0.3.0.004.bb
+++ b/packages/efl/epsilon_0.3.0.004.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Epsilon is a flexable and powerful image thumbnailing library \
 that is complient with the freedesktop.org Thumbnail Managing Standard."
 LICENSE = "GPL"
-DEPENDS = "edje epeg libpng virtual/imlib2"
+DEPENDS = "virtual/imlib2 epeg libpng virtual/evas virtual/ecore perl-native edje"
 
 inherit efl
 
diff --git a/packages/efl/esmart_0.9.0.004.bb b/packages/efl/esmart_0.9.0.004.bb
index 90b8aca6f9..beb936e37b 100644
--- a/packages/efl/esmart_0.9.0.004.bb
+++ b/packages/efl/esmart_0.9.0.004.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "ESmart is a collection of smart Evas objects"
 LICENSE = "MIT"
-DEPENDS = "edje-native eet evas-x11 ecore-x11 epsilon embryo imlib2-x11 jpeg libtool"
+DEPENDS = "virtual/evas virtual/ecore virtual/imlib2 epsilon edje libtool"
 PR = "r1"
 
 inherit efl
diff --git a/packages/efl/evas-native_0.9.9.013.bb b/packages/efl/evas-native_0.9.9.013.bb
index a29967a051..3eaa12cf9e 100644
--- a/packages/efl/evas-native_0.9.9.013.bb
+++ b/packages/efl/evas-native_0.9.9.013.bb
@@ -1,3 +1,3 @@
 include evas-fb_${PV}.bb
 inherit native
-DEPENDS = "freetype-native"
+DEPENDS = "freetype-native libpng-native jpeg-native eet-native edb-native"
diff --git a/packages/efl/evas.inc b/packages/efl/evas.inc
index 0588d8e28c..60f60f3c82 100644
--- a/packages/efl/evas.inc
+++ b/packages/efl/evas.inc
@@ -3,7 +3,8 @@ anti-aliased text, smooth super and sub-images, alpha-blend, as well as drop \
 down to using normal X11 primitives such as pixmaps, lines and rectangles if \
 your CPU or graphics hardware are too slow."
 LICENSE = "MIT"
-DEPENDS = "libpng jpeg edb eet freetype"
+# can also depend on valgrind (?)
+DEPENDS = "freetype libpng jpeg eet edb"
 
 inherit efl
 
diff --git a/packages/efl/ewl_0.0.4.004.bb b/packages/efl/ewl_0.0.4.004.bb
index 36d8c5c860..92db160a25 100644
--- a/packages/efl/ewl_0.0.4.004.bb
+++ b/packages/efl/ewl_0.0.4.004.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "The Enlightened Widget Library, \
 a simple-to-use general purpose widget library based on the enlightenment foundation libraries."
-DEPENDS = "edb eet virtual/evas virtual/ecore etox edje"
+DEPENDS = "edb virtual/evas virtual/ecore edje emotion"
 LICENSE = "MIT"
 PR = "r0"
 
diff --git a/packages/efl/imlib2.inc b/packages/efl/imlib2.inc
index b4a2f267fc..a6982e21c7 100644
--- a/packages/efl/imlib2.inc
+++ b/packages/efl/imlib2.inc
@@ -1,5 +1,6 @@
 DESCRIPTION = "A graphic library for file loading, saving, rendering, and manipulation."
 LICENSE = "BSD"
+# can also depend on tiff34, ungif or gif, z, bz2, id3tag
 DEPENDS = "freetype libpng jpeg"
 
 inherit efl