merge of 0a90fa3f8e7b85f79fe8930a1969aff12f3553b8

     and f207b08f6d852f81f78ab6a6c3ed4502fc88f898

12 files changed, 85 insertions, 23 deletions

diff --git a/packages/efl/e_0.16.999.023.bb b/packages/efl/e_0.16.999.023.bb
index 35bb776269..0f400d51cc 100644
--- a/packages/efl/e_0.16.999.023.bb
+++ b/packages/efl/e_0.16.999.023.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Enlightenment Window Mananger Library"
 DEPENDS = "virtual/evas virtual/ecore edje eet embryo"
 LICENSE = "MIT"
-PR = "r1"
+PR = "r2"
 
 inherit efl
 
diff --git a/packages/efl/ecore-x11_0.9.9.023.bb b/packages/efl/ecore-x11_0.9.9.023.bb
index 0927b59e03..40527561aa 100644
--- a/packages/efl/ecore-x11_0.9.9.023.bb
+++ b/packages/efl/ecore-x11_0.9.9.023.bb
@@ -1,6 +1,6 @@
 include ecore.inc
 DEPENDS += "evas-x11"
-PR = "r2"
+PR = "r3"
 
 SRC_URI += "file://evas-x11-include.patch;patch=1"
 
diff --git a/packages/efl/edb-utils_1.0.5.005.bb b/packages/efl/edb-utils_1.0.5.005.bb
new file mode 100644
index 0000000000..401d0e7e46
--- /dev/null
+++ b/packages/efl/edb-utils_1.0.5.005.bb
@@ -0,0 +1,19 @@
+DESCRIPTION = "EDB is a database convenience library wrapped around the \
+Berkeley DB 2.7.7 by Sleepycat Software."
+DEPENDS = "zlib ncurses"
+LICENSE = "BSD"
+PR = "r4"
+
+inherit efl
+
+EXTRA_OECONF += "--disable-gtk"
+
+PACKAGES = "edb-utils"
+FILES_${PN} = "${bindir}/edb_ed ${bindir}/edb_vt_ed ${bindir}/edb_gtk_ed"
+RDEPENDS_${PN} += "ncurses"
+
+SRC_URI = "http://enlightenment.freedesktop.org/files/edb-${PV}.tar.gz"
+S = "${WORKDIR}/edb-${PV}"
+
+libraries = ""
+headers = ""
diff --git a/packages/efl/edb_1.0.5.005.bb b/packages/efl/edb_1.0.5.005.bb
index 30c14d3d58..a152530b47 100644
--- a/packages/efl/edb_1.0.5.005.bb
+++ b/packages/efl/edb_1.0.5.005.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "EDB is a database convenience library wrapped around the \
 Berkeley DB 2.7.7 by Sleepycat Software."
 DEPENDS = "zlib ncurses"
 LICENSE = "BSD"
-PR = "r1"
+PR = "r4"
 
 inherit efl
 
@@ -10,5 +10,4 @@ EXTRA_OECONF += "--disable-gtk"
 
 libdirectory = "src"
 
-FILES_${PN}-dev += "${bindir}/edb_ed ${bindir}/edb_vt_ed ${bindir}/edb_gtk_ed"
-RDEPENDS_${PN}-dev += "ncurses"
\ No newline at end of file
+FILES_${PN}-examples = ""
\ No newline at end of file
diff --git a/packages/efl/edje-utils_0.5.0.023.bb b/packages/efl/edje-utils_0.5.0.023.bb
new file mode 100644
index 0000000000..837157ee3e
--- /dev/null
+++ b/packages/efl/edje-utils_0.5.0.023.bb
@@ -0,0 +1,23 @@
+DESCRIPTION = "Edje is a complex graphical design & layout library."
+DEPENDS = "edje embryo-utils gcc"
+LICENSE = "MIT"
+PR = "r6"
+
+inherit efl
+
+PACKAGES = "edje-utils"
+FILES_${PN} = "${bindir}/edje ${bindir}/edje_* ${datadir}/edje/data/template ${datadir}/edje/include"
+RDEPENDS_${PN} += "embryo-utils cpp cpp-symlinks gcc gcc-symlinks"
+
+SRC_URI = "http://enlightenment.freedesktop.org/files/edje-${PV}.tar.gz \
+           cvs://anonymous@thinktux.net/root;module=e17/libs/edje/m4;date=20060101"
+S = "${WORKDIR}/edje-${PV}"
+
+libraries = ""
+headers = ""
+
+do_configure_prepend() {
+	install -d "${S}/m4"
+	install "${WORKDIR}/m4/"*.m4 "${S}/m4"
+	aclocal -I m4
+}
diff --git a/packages/efl/edje_0.5.0.023.bb b/packages/efl/edje_0.5.0.023.bb
index 9315639af2..43e135ac5d 100644
--- a/packages/efl/edje_0.5.0.023.bb
+++ b/packages/efl/edje_0.5.0.023.bb
@@ -2,17 +2,25 @@ 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"
+PR = "r6"
+
+## package.bbclass kills packages when there are duplicates, this means
+##  that efl.bbclass can't have PACKAGES += and so the FILES for previous
+##  packages take precedence over -utils
+#PACKAGES = "edje-utils"
+#RPROVIDES_edje-utils += "libedje-utils"
+#FILES_edje-utils = "${bindir}/edje ${bindir}/edje_* ${datadir}/edje/data/template ${datadir}/edje/include"
+#RDEPENDS_edje-utils += "libembryo-utils cpp cpp-symlinks gcc gcc-symlinks"
 
 inherit efl
 
-SRC_URI += "cvs://anonymous@thinktux.net/root;module=e17/libs/edje/m4;date=20060101"
+FILES_${PN}-examples = "${datadir}/edje/data/images ${datadir}/edje/data/src ${datadir}/edje/data/test ${datadir}/edje/data/*.sh"
 
-LEAD_SONAME = "libedje.so"
+FILES_${SRCNAME}-themes = ""
 
-FILES_${PN}-dev += "${bindir}"
+SRC_URI += "cvs://anonymous@thinktux.net/root;module=e17/libs/edje/m4;date=20060101"
 
-RDEPENDS_${PN}-dev += "cpp"
+LEAD_SONAME = "libedje.so"
 
 do_configure_prepend() {
 	install -d "${S}/m4"
diff --git a/packages/efl/eet_0.9.10.023.bb b/packages/efl/eet_0.9.10.023.bb
index c0f89b1064..6e6032e098 100644
--- a/packages/efl/eet_0.9.10.023.bb
+++ b/packages/efl/eet_0.9.10.023.bb
@@ -4,6 +4,6 @@ each chunk (very much like a zip file) and allow fast \
 random-access reading of the file later on."
 DEPENDS = "zlib jpeg"
 LICENSE = "BSD"
-PR = "r1"
+PR = "r2"
 
 inherit efl
diff --git a/packages/efl/embryo-utils_0.9.1.023.bb b/packages/efl/embryo-utils_0.9.1.023.bb
new file mode 100644
index 0000000000..7899e4aa2f
--- /dev/null
+++ b/packages/efl/embryo-utils_0.9.1.023.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = "Embryo implements a C like scripting language used in various parts \
+of the Enlightenment project, namely Edje. Embryo's scripting language is based on \
+CompuPhase's Small language that was introduced in Dr Dobb's Journal in 1999. \
+Embryo allows scripting capabilities in places that otherwise wouldn't support \
+basic programming structures such as in Edje EDCs."
+LICENSE = "MIT"
+PR = "r4"
+
+inherit efl
+
+SRC_URI = "http://enlightenment.freedesktop.org/files/embryo-${PV}.tar.gz"
+S = "${WORKDIR}/embryo-${PV}"
+
+PACKAGES = "embryo-utils"
+FILES_${PN} = "${bindir}/embryo ${bindir}/embryo_* ${datadir}/embryo/include"
+
+libraries = ""
+headers = ""
diff --git a/packages/efl/embryo_0.9.1.023.bb b/packages/efl/embryo_0.9.1.023.bb
index 1802da1bca..0009c0a149 100644
--- a/packages/efl/embryo_0.9.1.023.bb
+++ b/packages/efl/embryo_0.9.1.023.bb
@@ -4,6 +4,8 @@ CompuPhase's Small language that was introduced in Dr Dobb's Journal in 1999. \
 Embryo allows scripting capabilities in places that otherwise wouldn't support \
 basic programming structures such as in Edje EDCs."
 LICENSE = "MIT"
-PR = "r1"
+PR = "r4"
 
 inherit efl
+
+FILES_${PN}-examples = "${datadir}/${PN}/examples"
\ No newline at end of file
diff --git a/packages/efl/evas-x11_0.9.9.023.bb b/packages/efl/evas-x11_0.9.9.023.bb
index 75a080a26c..ba8b74aae2 100644
--- a/packages/efl/evas-x11_0.9.9.023.bb
+++ b/packages/efl/evas-x11_0.9.9.023.bb
@@ -1,12 +1,12 @@
 include evas.inc
 DEPENDS += "x11 xext freetype"
-PR = "r3"
+PR = "r4"
 
 EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11  \
 		--x-libraries=${STAGING_LIBDIR} \
 		--enable-fb			\
 		--disable-directfb		\
-		--disable-buffer		\
+		--enable-buffer			\
 		--disable-software-qtopia	\
 		--enable-software-x11		\
 		--disable-gl-x11		\
diff --git a/packages/efl/evas.inc b/packages/efl/evas.inc
index 37f0efaab1..a8b4e85f4f 100644
--- a/packages/efl/evas.inc
+++ b/packages/efl/evas.inc
@@ -29,13 +29,5 @@ do_configure_prepend() {
 	fi
 }
 
-do_configure () {
-	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>"
-libraries = "libevas"
-
+libraries = "libevas"
\ No newline at end of file
diff --git a/packages/efl/imlib2-x11_1.2.1.010.bb b/packages/efl/imlib2-x11_1.2.1.010.bb
index 165321355c..d13d24165a 100644
--- a/packages/efl/imlib2-x11_1.2.1.010.bb
+++ b/packages/efl/imlib2-x11_1.2.1.010.bb
@@ -1,5 +1,6 @@
 include imlib2.inc
 DEPENDS += "x11 xext"
+PR = "r1"
 
 EXTRA_OECONF = "--disable-mmx \
                 --with-x \